From 091b5194e7bfc6049931202d9712541083fd61cd Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 27 Nov 2018 11:21:48 -0500 Subject: frontier pike and pyramid data --- .../battle_pyramid_level_50_wild_mons.inc | 1003 ------------------ .../battle_pyramid_open_level_wild_mons.inc | 1003 ------------------ data/battle_frontier_2.s | 104 -- data/battle_frontier_3.s | 97 -- data/battle_pike.s | 212 ---- data/createsprite.py | 85 ++ data/mossdeep_gym.s | 47 + include/battle_pyramid.h | 42 + include/strings.h | 44 + ld_script.txt | 4 +- src/battle_pike.c | 383 ++++++- src/battle_pyramid.c | 42 - .../battle_pyramid_level_50_wild_mons.h | 1064 ++++++++++++++++++++ .../battle_pyramid_open_level_wild_mons.h | 1064 ++++++++++++++++++++ src/frontier_data.c | 237 +++++ src/frontier_util.c | 146 ++- src/strings.c | 15 +- 17 files changed, 3106 insertions(+), 2486 deletions(-) delete mode 100644 data/battle_frontier/battle_pyramid_level_50_wild_mons.inc delete mode 100644 data/battle_frontier/battle_pyramid_open_level_wild_mons.inc delete mode 100644 data/battle_frontier_2.s delete mode 100644 data/battle_pike.s create mode 100644 data/createsprite.py create mode 100644 data/mossdeep_gym.s create mode 100644 src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h create mode 100644 src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h create mode 100644 src/frontier_data.c diff --git a/data/battle_frontier/battle_pyramid_level_50_wild_mons.inc b/data/battle_frontier/battle_pyramid_level_50_wild_mons.inc deleted file mode 100644 index 251a1aeae..000000000 --- a/data/battle_frontier/battle_pyramid_level_50_wild_mons.inc +++ /dev/null @@ -1,1003 +0,0 @@ - .align 2 -gBattlePyramidLevel50WildMons_Round1:: @ 86126B0 -@ 0 - .2byte SPECIES_PLUSLE - .byte 35 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE - -@ 1 - .2byte SPECIES_MINUN - .byte 35 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE - -@ 2 - .2byte SPECIES_PIKACHU - .byte 37 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE - -@ 3 - .2byte SPECIES_ELECTABUZZ - .byte 37 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE - -@ 4 - .2byte SPECIES_VILEPLUME - .byte 39 @ base level - .byte 2 @ unknown - .2byte MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE - -@ 5 - .2byte SPECIES_MANECTRIC - .byte 39 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE - -@ 6 - .2byte SPECIES_BRELOOM - .byte 40 @ base level - .byte 2 @ unknown - .2byte MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH - -@ 7 - .2byte SPECIES_JOLTEON - .byte 40 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK - -gBattlePyramidLevel50WildMons_Round2:: @ 8612710 -@ 0 - .2byte SPECIES_GULPIN - .byte 36 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_ROSELIA - .byte 36 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE - -@ 2 - .2byte SPECIES_BUTTERFREE - .byte 38 @ base level - .byte 2 @ unknown - .2byte MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE - -@ 3 - .2byte SPECIES_SEVIPER - .byte 38 @ base level - .byte 2 @ unknown - .2byte MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL - -@ 4 - .2byte SPECIES_SKARMORY - .byte 40 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE - -@ 5 - .2byte SPECIES_LUDICOLO - .byte 40 @ base level - .byte 1 @ unknown - .2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE - -@ 6 - .2byte SPECIES_CROBAT - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE - -@ 7 - .2byte SPECIES_GENGAR - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round3:: @ 8612770 -@ 0 - .2byte SPECIES_GROWLITHE - .byte 37 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_VULPIX - .byte 37 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_MAGCARGO - .byte 39 @ base level - .byte 1 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE - -@ 3 - .2byte SPECIES_NINETALES - .byte 39 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE - -@ 4 - .2byte SPECIES_MEDICHAM - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_WEEZING - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_DUSCLOPS - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH - -@ 7 - .2byte SPECIES_HOUNDOOM - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT - -gBattlePyramidLevel50WildMons_Round4:: @ 86127D0 -@ 0 - .2byte SPECIES_DUNSPARCE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_BANETTE - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE - -@ 2 - .2byte SPECIES_MISDREAVUS - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE - -@ 3 - .2byte SPECIES_NINETALES - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE - -@ 4 - .2byte SPECIES_ABSOL - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 5 - .2byte SPECIES_DUSCLOPS - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL - -@ 6 - .2byte SPECIES_SHEDINJA - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE - -@ 7 - .2byte SPECIES_GENGAR - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round5:: @ 8612830 -@ 0 - .2byte SPECIES_HAUNTER - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE - -@ 1 - .2byte SPECIES_CHIMECHO - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT - -@ 2 - .2byte SPECIES_SOLROCK - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC - -@ 3 - .2byte SPECIES_MISDREAVUS - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT - -@ 4 - .2byte SPECIES_CLAYDOL - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC - -@ 5 - .2byte SPECIES_WEEZING - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_FLYGON - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH - -@ 7 - .2byte SPECIES_GENGAR - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE - -gBattlePyramidLevel50WildMons_Round6:: @ 8612890 -@ 0 - .2byte SPECIES_DIGLETT - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE - -@ 1 - .2byte SPECIES_TRAPINCH - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE - -@ 2 - .2byte SPECIES_WYNAUT - .byte 42 @ base level - .byte 0 @ unknown - .2byte MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT - -@ 3 - .2byte SPECIES_DIGLETT - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC - -@ 4 - .2byte SPECIES_TRAPINCH - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT - -@ 5 - .2byte SPECIES_WYNAUT - .byte 44 @ base level - .byte 0 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE - -@ 6 - .2byte SPECIES_WOBBUFFET - .byte 45 @ base level - .byte 0 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE - -@ 7 - .2byte SPECIES_DUGTRIO - .byte 45 @ base level - .byte 1 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT - -gBattlePyramidLevel50WildMons_Round7:: @ 86128F0 -@ 0 - .2byte SPECIES_GLALIE - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_SNEASEL - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE - -@ 2 - .2byte SPECIES_DEWGONG - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_PILOSWINE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE - -@ 4 - .2byte SPECIES_JYNX - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE - -@ 5 - .2byte SPECIES_CLOYSTER - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_WALREIN - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE - -@ 7 - .2byte SPECIES_LAPRAS - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC - -gBattlePyramidLevel50WildMons_Round8:: @ 8612950 -@ 0 - .2byte SPECIES_WEEZING - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE - -@ 1 - .2byte SPECIES_ELECTRODE - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE - -@ 2 - .2byte SPECIES_GENGAR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE - -@ 3 - .2byte SPECIES_GOLEM - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE - -@ 4 - .2byte SPECIES_PINECO - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE - -@ 5 - .2byte SPECIES_SOLROCK - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE - -@ 6 - .2byte SPECIES_FORRETRESS - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 7 - .2byte SPECIES_SHIFTRY - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT - -gBattlePyramidLevel50WildMons_Round9:: @ 86129B0 -@ 0 - .2byte SPECIES_WOBBUFFET - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND - -@ 1 - .2byte SPECIES_METANG - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC - -@ 2 - .2byte SPECIES_EXEGGUTOR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE - -@ 3 - .2byte SPECIES_SLOWKING - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER - -@ 4 - .2byte SPECIES_XATU - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING - -@ 5 - .2byte SPECIES_ALAKAZAM - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC - -@ 6 - .2byte SPECIES_STARMIE - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM - -@ 7 - .2byte SPECIES_ESPEON - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round10:: @ 8612A10 -@ 0 - .2byte SPECIES_GOLEM - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_STEELIX - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE - -@ 2 - .2byte SPECIES_OMASTAR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE - -@ 3 - .2byte SPECIES_LUNATONE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE - -@ 4 - .2byte SPECIES_SHUCKLE - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE - -@ 5 - .2byte SPECIES_ARMALDO - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE - -@ 6 - .2byte SPECIES_CRADILY - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE - -@ 7 - .2byte SPECIES_AERODACTYL - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round11:: @ 8612A70 -@ 0 - .2byte SPECIES_POLIWRATH - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE - -@ 1 - .2byte SPECIES_HARIYAMA - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE - -@ 2 - .2byte SPECIES_BRELOOM - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE - -@ 3 - .2byte SPECIES_MEDICHAM - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH - -@ 4 - .2byte SPECIES_HITMONCHAN - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH - -@ 5 - .2byte SPECIES_HITMONLEE - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE - -@ 6 - .2byte SPECIES_HERACROSS - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE - -@ 7 - .2byte SPECIES_MACHAMP - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS - -gBattlePyramidLevel50WildMons_Round12:: @ 8612AD0 -@ 0 - .2byte SPECIES_QUAGSIRE - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_TROPIUS - .byte 41 @ base level - .byte 2 @ unknown - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_PUPITAR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 3 - .2byte SPECIES_LAPRAS - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_CACTURNE - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE - -@ 5 - .2byte SPECIES_FLAREON - .byte 44 @ base level - .byte 2 @ unknown - .2byte MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_WALREIN - .byte 45 @ base level - .byte 2 @ unknown - .2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 7 - .2byte SPECIES_GYARADOS - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round13:: @ 8612B30 -@ 0 - .2byte SPECIES_PINECO - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_SHUCKLE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 2 - .2byte SPECIES_VENOMOTH - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC - -@ 3 - .2byte SPECIES_SCIZOR - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT - -@ 4 - .2byte SPECIES_HERACROSS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - -@ 5 - .2byte SPECIES_FORRETRESS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_ARMALDO - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 7 - .2byte SPECIES_SHEDINJA - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE - -gBattlePyramidLevel50WildMons_Round14:: @ 8612B90 -@ 0 - .2byte SPECIES_SABLEYE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE - -@ 1 - .2byte SPECIES_SNEASEL - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK - -@ 2 - .2byte SPECIES_CRAWDAUNT - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_SHIFTRY - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN - -@ 4 - .2byte SPECIES_CACTURNE - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE - -@ 5 - .2byte SPECIES_ABSOL - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE - -@ 6 - .2byte SPECIES_HOUNDOOM - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 7 - .2byte SPECIES_UMBREON - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK - -gBattlePyramidLevel50WildMons_Round15:: @ 8612BF0 -@ 0 - .2byte SPECIES_OCTILLERY - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE - -@ 1 - .2byte SPECIES_DEWGONG - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE - -@ 2 - .2byte SPECIES_PELIPPER - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_QUAGSIRE - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE - -@ 4 - .2byte SPECIES_LUDICOLO - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM - -@ 5 - .2byte SPECIES_SLOWKING - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE - -@ 6 - .2byte SPECIES_STARMIE - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD - -@ 7 - .2byte SPECIES_BLASTOISE - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE - -gBattlePyramidLevel50WildMons_Round16:: @ 8612C50 -@ 0 - .2byte SPECIES_DUSKULL - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 1 - .2byte SPECIES_HAUNTER - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL - -@ 2 - .2byte SPECIES_BANETTE - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE - -@ 3 - .2byte SPECIES_MISDREAVUS - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE - -@ 4 - .2byte SPECIES_SABLEYE - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE - -@ 5 - .2byte SPECIES_DUSCLOPS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE - -@ 6 - .2byte SPECIES_SHEDINJA - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT - -@ 7 - .2byte SPECIES_GENGAR - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE - -gBattlePyramidLevel50WildMons_Round17:: @ 8612CB0 -@ 0 - .2byte SPECIES_MAWILE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE - -@ 1 - .2byte SPECIES_MAGNETON - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_STEELIX - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE - -@ 3 - .2byte SPECIES_SCIZOR - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_FORRETRESS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_SKARMORY - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT - -@ 6 - .2byte SPECIES_AGGRON - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM - -@ 7 - .2byte SPECIES_METAGROSS - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK - -gBattlePyramidLevel50WildMons_Round18:: @ 8612D10 -@ 0 - .2byte SPECIES_DRAGONAIR - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE - -@ 1 - .2byte SPECIES_VIBRAVA - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING - -@ 2 - .2byte SPECIES_ALTARIA - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT - -@ 3 - .2byte SPECIES_FLYGON - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE - -@ 4 - .2byte SPECIES_AERODACTYL - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE - -@ 5 - .2byte SPECIES_GYARADOS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE - -@ 6 - .2byte SPECIES_KINGDRA - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE - -@ 7 - .2byte SPECIES_CHARIZARD - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL - -gBattlePyramidLevel50WildMons_Round19:: @ 8612D70 -@ 0 - .2byte SPECIES_ARCANINE - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_POLIWRATH - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_RAICHU - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE - -@ 3 - .2byte SPECIES_VAPOREON - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_JOLTEON - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_FLAREON - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE - -@ 6 - .2byte SPECIES_NINETALES - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE - -@ 7 - .2byte SPECIES_STARMIE - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC - -gBattlePyramidLevel50WildMons_Round20:: @ 8612DD0 -@ 0 - .2byte SPECIES_KANGASKHAN - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH - -@ 1 - .2byte SPECIES_SWELLOW - .byte 42 @ base level - .byte 2 @ unknown - .2byte MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE - -@ 2 - .2byte SPECIES_URSARING - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT - -@ 3 - .2byte SPECIES_PORYGON2 - .byte 46 @ base level - .byte 2 @ unknown - .2byte MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM - -@ 4 - .2byte SPECIES_TAUROS - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT - -@ 5 - .2byte SPECIES_FEAROW - .byte 48 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT - -@ 6 - .2byte SPECIES_SNORLAX - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE - -@ 7 - .2byte SPECIES_SLAKING - .byte 50 @ base level - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM - - .align 2 -gBattlePyramidLevel50WildMonPointers:: @ 8612E30 - .4byte gBattlePyramidLevel50WildMons_Round1 - .4byte gBattlePyramidLevel50WildMons_Round2 - .4byte gBattlePyramidLevel50WildMons_Round3 - .4byte gBattlePyramidLevel50WildMons_Round4 - .4byte gBattlePyramidLevel50WildMons_Round5 - .4byte gBattlePyramidLevel50WildMons_Round6 - .4byte gBattlePyramidLevel50WildMons_Round7 - .4byte gBattlePyramidLevel50WildMons_Round8 - .4byte gBattlePyramidLevel50WildMons_Round9 - .4byte gBattlePyramidLevel50WildMons_Round10 - .4byte gBattlePyramidLevel50WildMons_Round11 - .4byte gBattlePyramidLevel50WildMons_Round12 - .4byte gBattlePyramidLevel50WildMons_Round13 - .4byte gBattlePyramidLevel50WildMons_Round14 - .4byte gBattlePyramidLevel50WildMons_Round15 - .4byte gBattlePyramidLevel50WildMons_Round16 - .4byte gBattlePyramidLevel50WildMons_Round17 - .4byte gBattlePyramidLevel50WildMons_Round18 - .4byte gBattlePyramidLevel50WildMons_Round19 - .4byte gBattlePyramidLevel50WildMons_Round20 diff --git a/data/battle_frontier/battle_pyramid_open_level_wild_mons.inc b/data/battle_frontier/battle_pyramid_open_level_wild_mons.inc deleted file mode 100644 index 0ae67a44b..000000000 --- a/data/battle_frontier/battle_pyramid_open_level_wild_mons.inc +++ /dev/null @@ -1,1003 +0,0 @@ - .align 2 -gBattlePyramidOpenLevelWildMons_Round1:: @ 8612E80 -@ 0 - .2byte SPECIES_PLUSLE - .byte 15 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE - -@ 1 - .2byte SPECIES_MINUN - .byte 15 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE - -@ 2 - .2byte SPECIES_PIKACHU - .byte 13 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE - -@ 3 - .2byte SPECIES_ELECTABUZZ - .byte 13 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE - -@ 4 - .2byte SPECIES_VILEPLUME - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE - -@ 5 - .2byte SPECIES_MANECTRIC - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE - -@ 6 - .2byte SPECIES_BRELOOM - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH - -@ 7 - .2byte SPECIES_JOLTEON - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK - -gBattlePyramidOpenLevelWildMons_Round2:: @ 8612EE0 -@ 0 - .2byte SPECIES_GULPIN - .byte 14 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_ROSELIA - .byte 14 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE - -@ 2 - .2byte SPECIES_BUTTERFREE - .byte 12 @ base level difference - .byte 2 @ unknown - .2byte MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE - -@ 3 - .2byte SPECIES_SEVIPER - .byte 12 @ base level difference - .byte 2 @ unknown - .2byte MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL - -@ 4 - .2byte SPECIES_SKARMORY - .byte 7 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE - -@ 5 - .2byte SPECIES_LUDICOLO - .byte 7 @ base level difference - .byte 1 @ unknown - .2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE - -@ 6 - .2byte SPECIES_CROBAT - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE - -@ 7 - .2byte SPECIES_GENGAR - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round3:: @ 8612F40 -@ 0 - .2byte SPECIES_GROWLITHE - .byte 13 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_VULPIX - .byte 13 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_MAGCARGO - .byte 11 @ base level difference - .byte 1 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE - -@ 3 - .2byte SPECIES_NINETALES - .byte 11 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE - -@ 4 - .2byte SPECIES_MEDICHAM - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_WEEZING - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_DUSCLOPS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH - -@ 7 - .2byte SPECIES_HOUNDOOM - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT - -gBattlePyramidOpenLevelWildMons_Round4:: @ 8612FA0 -@ 0 - .2byte SPECIES_DUNSPARCE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_BANETTE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE - -@ 2 - .2byte SPECIES_MISDREAVUS - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE - -@ 3 - .2byte SPECIES_NINETALES - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE - -@ 4 - .2byte SPECIES_ABSOL - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 5 - .2byte SPECIES_DUSCLOPS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL - -@ 6 - .2byte SPECIES_SHEDINJA - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE - -@ 7 - .2byte SPECIES_GENGAR - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round5:: @ 8613000 -@ 0 - .2byte SPECIES_HAUNTER - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE - -@ 1 - .2byte SPECIES_CHIMECHO - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT - -@ 2 - .2byte SPECIES_SOLROCK - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC - -@ 3 - .2byte SPECIES_MISDREAVUS - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT - -@ 4 - .2byte SPECIES_CLAYDOL - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC - -@ 5 - .2byte SPECIES_WEEZING - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_FLYGON - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH - -@ 7 - .2byte SPECIES_GENGAR - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE - -gBattlePyramidOpenLevelWildMons_Round6:: @ 8613060 -@ 0 - .2byte SPECIES_DIGLETT - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE - -@ 1 - .2byte SPECIES_TRAPINCH - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE - -@ 2 - .2byte SPECIES_WYNAUT - .byte 8 @ base level difference - .byte 0 @ unknown - .2byte MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT - -@ 3 - .2byte SPECIES_DIGLETT - .byte 8 @ base level difference - .byte 1 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC - -@ 4 - .2byte SPECIES_TRAPINCH - .byte 6 @ base level difference - .byte 1 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT - -@ 5 - .2byte SPECIES_WYNAUT - .byte 6 @ base level difference - .byte 0 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE - -@ 6 - .2byte SPECIES_WOBBUFFET - .byte 5 @ base level difference - .byte 0 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE - -@ 7 - .2byte SPECIES_DUGTRIO - .byte 5 @ base level difference - .byte 1 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT - -gBattlePyramidOpenLevelWildMons_Round7:: @ 86130C0 -@ 0 - .2byte SPECIES_GLALIE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_SNEASEL - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE - -@ 2 - .2byte SPECIES_DEWGONG - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_PILOSWINE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE - -@ 4 - .2byte SPECIES_JYNX - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE - -@ 5 - .2byte SPECIES_CLOYSTER - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_WALREIN - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE - -@ 7 - .2byte SPECIES_LAPRAS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC - -gBattlePyramidOpenLevelWildMons_Round8:: @ 8613120 -@ 0 - .2byte SPECIES_WEEZING - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE - -@ 1 - .2byte SPECIES_ELECTRODE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE - -@ 2 - .2byte SPECIES_GENGAR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE - -@ 3 - .2byte SPECIES_GOLEM - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE - -@ 4 - .2byte SPECIES_PINECO - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE - -@ 5 - .2byte SPECIES_SOLROCK - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE - -@ 6 - .2byte SPECIES_FORRETRESS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 7 - .2byte SPECIES_SHIFTRY - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT - -gBattlePyramidOpenLevelWildMons_Round9:: @ 8613180 -@ 0 - .2byte SPECIES_WOBBUFFET - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND - -@ 1 - .2byte SPECIES_METANG - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC - -@ 2 - .2byte SPECIES_EXEGGUTOR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE - -@ 3 - .2byte SPECIES_SLOWKING - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER - -@ 4 - .2byte SPECIES_XATU - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING - -@ 5 - .2byte SPECIES_ALAKAZAM - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC - -@ 6 - .2byte SPECIES_STARMIE - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM - -@ 7 - .2byte SPECIES_ESPEON - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round10:: @ 86131E0 -@ 0 - .2byte SPECIES_GOLEM - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_STEELIX - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE - -@ 2 - .2byte SPECIES_OMASTAR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE - -@ 3 - .2byte SPECIES_LUNATONE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE - -@ 4 - .2byte SPECIES_SHUCKLE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE - -@ 5 - .2byte SPECIES_ARMALDO - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE - -@ 6 - .2byte SPECIES_CRADILY - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE - -@ 7 - .2byte SPECIES_AERODACTYL - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round11:: @ 8613240 -@ 0 - .2byte SPECIES_POLIWRATH - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE - -@ 1 - .2byte SPECIES_HARIYAMA - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE - -@ 2 - .2byte SPECIES_BRELOOM - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE - -@ 3 - .2byte SPECIES_MEDICHAM - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH - -@ 4 - .2byte SPECIES_HITMONCHAN - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH - -@ 5 - .2byte SPECIES_HITMONLEE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE - -@ 6 - .2byte SPECIES_HERACROSS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE - -@ 7 - .2byte SPECIES_MACHAMP - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS - -gBattlePyramidOpenLevelWildMons_Round12:: @ 86132A0 -@ 0 - .2byte SPECIES_QUAGSIRE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE - -@ 1 - .2byte SPECIES_TROPIUS - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_PUPITAR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 3 - .2byte SPECIES_LAPRAS - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_CACTURNE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE - -@ 5 - .2byte SPECIES_FLAREON - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_WALREIN - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 7 - .2byte SPECIES_GYARADOS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round13:: @ 8613300 -@ 0 - .2byte SPECIES_PINECO - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_SHUCKLE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 2 - .2byte SPECIES_VENOMOTH - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC - -@ 3 - .2byte SPECIES_SCIZOR - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT - -@ 4 - .2byte SPECIES_HERACROSS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - -@ 5 - .2byte SPECIES_FORRETRESS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE - -@ 6 - .2byte SPECIES_ARMALDO - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE - -@ 7 - .2byte SPECIES_SHEDINJA - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE - -gBattlePyramidOpenLevelWildMons_Round14:: @ 8613360 -@ 0 - .2byte SPECIES_SABLEYE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE - -@ 1 - .2byte SPECIES_SNEASEL - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK - -@ 2 - .2byte SPECIES_CRAWDAUNT - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_SHIFTRY - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN - -@ 4 - .2byte SPECIES_CACTURNE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE - -@ 5 - .2byte SPECIES_ABSOL - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE - -@ 6 - .2byte SPECIES_HOUNDOOM - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 7 - .2byte SPECIES_UMBREON - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK - -gBattlePyramidOpenLevelWildMons_Round15:: @ 86133C0 -@ 0 - .2byte SPECIES_OCTILLERY - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE - -@ 1 - .2byte SPECIES_DEWGONG - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE - -@ 2 - .2byte SPECIES_PELIPPER - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE - -@ 3 - .2byte SPECIES_QUAGSIRE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE - -@ 4 - .2byte SPECIES_LUDICOLO - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM - -@ 5 - .2byte SPECIES_SLOWKING - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE - -@ 6 - .2byte SPECIES_STARMIE - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD - -@ 7 - .2byte SPECIES_BLASTOISE - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE - -gBattlePyramidOpenLevelWildMons_Round16:: @ 8613420 -@ 0 - .2byte SPECIES_DUSKULL - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT - -@ 1 - .2byte SPECIES_HAUNTER - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL - -@ 2 - .2byte SPECIES_BANETTE - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE - -@ 3 - .2byte SPECIES_MISDREAVUS - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE - -@ 4 - .2byte SPECIES_SABLEYE - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE - -@ 5 - .2byte SPECIES_DUSCLOPS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE - -@ 6 - .2byte SPECIES_SHEDINJA - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT - -@ 7 - .2byte SPECIES_GENGAR - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE - -gBattlePyramidOpenLevelWildMons_Round17:: @ 8613480 -@ 0 - .2byte SPECIES_MAWILE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE - -@ 1 - .2byte SPECIES_MAGNETON - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_STEELIX - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE - -@ 3 - .2byte SPECIES_SCIZOR - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_FORRETRESS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_SKARMORY - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT - -@ 6 - .2byte SPECIES_AGGRON - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM - -@ 7 - .2byte SPECIES_METAGROSS - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK - -gBattlePyramidOpenLevelWildMons_Round18:: @ 86134E0 -@ 0 - .2byte SPECIES_DRAGONAIR - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE - -@ 1 - .2byte SPECIES_VIBRAVA - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING - -@ 2 - .2byte SPECIES_ALTARIA - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT - -@ 3 - .2byte SPECIES_FLYGON - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE - -@ 4 - .2byte SPECIES_AERODACTYL - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE - -@ 5 - .2byte SPECIES_GYARADOS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE - -@ 6 - .2byte SPECIES_KINGDRA - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE - -@ 7 - .2byte SPECIES_CHARIZARD - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL - -gBattlePyramidOpenLevelWildMons_Round19:: @ 8613540 -@ 0 - .2byte SPECIES_ARCANINE - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE - -@ 1 - .2byte SPECIES_POLIWRATH - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 2 - .2byte SPECIES_RAICHU - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE - -@ 3 - .2byte SPECIES_VAPOREON - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE - -@ 4 - .2byte SPECIES_JOLTEON - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE - -@ 5 - .2byte SPECIES_FLAREON - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE - -@ 6 - .2byte SPECIES_NINETALES - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE - -@ 7 - .2byte SPECIES_STARMIE - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC - -gBattlePyramidOpenLevelWildMons_Round20:: @ 86135A0 -@ 0 - .2byte SPECIES_KANGASKHAN - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH - -@ 1 - .2byte SPECIES_SWELLOW - .byte 10 @ base level difference - .byte 2 @ unknown - .2byte MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE - -@ 2 - .2byte SPECIES_URSARING - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT - -@ 3 - .2byte SPECIES_PORYGON2 - .byte 8 @ base level difference - .byte 2 @ unknown - .2byte MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM - -@ 4 - .2byte SPECIES_TAUROS - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT - -@ 5 - .2byte SPECIES_FEAROW - .byte 6 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT - -@ 6 - .2byte SPECIES_SNORLAX - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE - -@ 7 - .2byte SPECIES_SLAKING - .byte 5 @ base level difference - .byte 2 @ unknown - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM - - .align 2 -gBattlePyramidOpenLevelWildMonPointers:: @ 8613600 - .4byte gBattlePyramidOpenLevelWildMons_Round1 - .4byte gBattlePyramidOpenLevelWildMons_Round2 - .4byte gBattlePyramidOpenLevelWildMons_Round3 - .4byte gBattlePyramidOpenLevelWildMons_Round4 - .4byte gBattlePyramidOpenLevelWildMons_Round5 - .4byte gBattlePyramidOpenLevelWildMons_Round6 - .4byte gBattlePyramidOpenLevelWildMons_Round7 - .4byte gBattlePyramidOpenLevelWildMons_Round8 - .4byte gBattlePyramidOpenLevelWildMons_Round9 - .4byte gBattlePyramidOpenLevelWildMons_Round10 - .4byte gBattlePyramidOpenLevelWildMons_Round11 - .4byte gBattlePyramidOpenLevelWildMons_Round12 - .4byte gBattlePyramidOpenLevelWildMons_Round13 - .4byte gBattlePyramidOpenLevelWildMons_Round14 - .4byte gBattlePyramidOpenLevelWildMons_Round15 - .4byte gBattlePyramidOpenLevelWildMons_Round16 - .4byte gBattlePyramidOpenLevelWildMons_Round17 - .4byte gBattlePyramidOpenLevelWildMons_Round18 - .4byte gBattlePyramidOpenLevelWildMons_Round19 - .4byte gBattlePyramidOpenLevelWildMons_Round20 diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s deleted file mode 100644 index 2b1eab991..000000000 --- a/data/battle_frontier_2.s +++ /dev/null @@ -1,104 +0,0 @@ -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08611CB0:: @ 8611CB0 - .4byte gText_BattleTower2 - .4byte gUnknown_085ED164 - .4byte gText_BattleTower2 - .4byte gUnknown_085ED170 - .4byte gText_BattleTower2 - .4byte gUnknown_085ED17C - .4byte gText_BattleDome - .4byte gUnknown_085ED164 - .4byte gText_BattlePalace - .4byte gUnknown_085ED164 - .4byte gText_BattleArena - .4byte gUnknown_085ED190 - .4byte gText_BattleFactory - .4byte gUnknown_085ED164 - .4byte gText_BattlePike - .4byte gUnknown_085ED190 - .4byte gText_BattlePyramid - .4byte gUnknown_085ED190 - .4byte gText_BattleTower2 - .4byte gUnknown_085ED188 - - .align 2 -gUnknown_08611D00:: @ 8611D00 - .4byte gUnknown_085EE3B0 - .4byte gUnknown_085EE3B8 - - .align 2 -gUnknown_08611D08:: @ 8611D08 - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3D4 - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3FC - .4byte gUnknown_085EE3C4 - .4byte gUnknown_085EE3E8 - .4byte gUnknown_085EE410 - .4byte gUnknown_085EE3C4 - - .align 1 -gFacilityToBrainTrainerId:: @ 8611D30 - .2byte TRAINER_ANABEL, TRAINER_TUCKER, TRAINER_SPENSER - .2byte TRAINER_GRETA, TRAINER_NOLAND, TRAINER_LUCY - .2byte TRAINER_BRANDON - - .align 2 -gUnknown_08611D40:: @ 8611D40 - .4byte gText_082C843F - .4byte gText_082C848B - .4byte gText_082C8628 - .4byte gText_082C85B4 - .4byte gText_082C8512 - .4byte gText_082C859D - .4byte gText_082C86C3 - - .align 2 -gUnknown_08611D5C:: @ 8611D5C - .4byte gText_082C8458 - .4byte gText_082C84C1 - .4byte gText_082C8662 - .4byte gText_082C85E3 - .4byte gText_082C853B - .4byte gText_082C85A4 - .4byte gText_082C86FE - - .align 2 -gUnknown_08611D78:: @ 8611D78 - .4byte gText_082C846C - .4byte gText_082C84D0 - .4byte gText_082C8682 - .4byte gText_082C85F5 - .4byte gText_082C8561 - .4byte gText_082C85A9 - .4byte gText_082C8739 - - .align 2 -gUnknown_08611D94:: @ 8611D94 - .4byte gText_082C8480 - .4byte gText_082C84F7 - .4byte gText_082C86B3 - .4byte gText_082C8611 - .4byte gText_082C8589 - .4byte gText_082C85AE - .4byte gText_082C877B - - .align 2 -gUnknown_08611DB0:: @ 8611DB0 - .4byte gUnknown_08611D40 - .4byte gUnknown_08611D78 - - .align 2 -gUnknown_08611DB8:: @ 8611DB8 - .4byte gUnknown_08611D5C - .4byte gUnknown_08611D94 diff --git a/data/battle_frontier_3.s b/data/battle_frontier_3.s index fc5a45e37..b83af6f28 100644 --- a/data/battle_frontier_3.s +++ b/data/battle_frontier_3.s @@ -6,103 +6,6 @@ .section .rodata -gUnknown_08612698:: @ 8612698 - store_lock_anim - walk_right - free_unlock_anim - step_end - -gUnknown_0861269C:: @ 861269C - store_lock_anim - walk_down - free_unlock_anim - step_end - -gUnknown_086126A0:: @ 86126A0 - store_lock_anim - walk_left - free_unlock_anim - step_end - -gUnknown_086126A4:: @ 86126A4 - store_lock_anim - walk_up - free_unlock_anim - step_end - -gUnknown_086126A8:: @ 86126A8 - face_right - step_end - -gUnknown_086126AA:: @ 86126AA - face_down - step_end - -gUnknown_086126AC:: @ 86126AC - face_left - step_end - -gUnknown_086126AE:: @ 86126AE - face_up - step_end - -@ 86126B0 - .include "data/battle_frontier/battle_pyramid_level_50_wild_mons.inc" - -@ 8612E80 - .include "data/battle_frontier/battle_pyramid_open_level_wild_mons.inc" - - .align 2 -gUnknown_08613650:: @ 8613650 - .byte 0x07, 0x03, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x00, 0x00, 0x00, 0x06, 0x03, 0x00, 0x00, 0x80, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x00 - .byte 0x05, 0x03, 0x00, 0x00, 0x78, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x78, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x00, 0x00, 0x00 - .byte 0x04, 0x04, 0x00, 0x01, 0x70, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x00, 0x00, 0x00, 0x03, 0x05, 0x00, 0x02, 0x70, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x00, 0x00 - .byte 0x03, 0x05, 0x00, 0x00, 0x68, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x01, 0x68, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x00, 0x00, 0x00 - .byte 0x04, 0x05, 0x00, 0x02, 0x60, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00, 0x03, 0x06, 0x00, 0x04, 0x60, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 0x00, 0x00 - .byte 0x02, 0x03, 0x00, 0x00, 0x58, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x00, 0x00, 0x00, 0x04, 0x05, 0x00, 0x00, 0x58, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x00, 0x00, 0x00 - .byte 0x03, 0x07, 0x00, 0x00, 0x50, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, 0x50, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x00, 0x00, 0x00 - .byte 0x03, 0x06, 0x00, 0x00, 0x50, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x03, 0x08, 0x00, 0x00, 0x50, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00 - -gUnknown_08613750:: @ 8613750 - .byte 0x28, 0x00, 0x46, 0x01, 0x5a, 0x02, 0x64, 0x03, 0x23, 0x01, 0x37, 0x02, 0x4b, 0x03, 0x5a, 0x04, 0x64, 0x0a, 0x23, 0x02, 0x37, 0x03, 0x4b, 0x04, 0x5a, 0x05, 0x64, 0x0b, 0x23, 0x03, 0x37, 0x04 - .byte 0x4b, 0x05, 0x5a, 0x06, 0x64, 0x0c, 0x23, 0x04, 0x37, 0x05, 0x4b, 0x06, 0x5a, 0x07, 0x64, 0x0d, 0x23, 0x05, 0x37, 0x06, 0x4b, 0x07, 0x5a, 0x08, 0x64, 0x0e, 0x23, 0x06, 0x37, 0x07, 0x4b, 0x08 - .byte 0x5a, 0x09, 0x64, 0x0f - -gUnknown_08613794:: @ 8613794 - .byte 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00 - - .align 1 -sPickupItemsLvl50:: @ 861379C - .2byte 0x0015, 0x0051, 0x0085, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x0087, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x0088, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x0086, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db - .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 - .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db - .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 - .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - - .align 1 -sPickupItemsLvlOpen:: @ 861392C - .2byte 0x0015, 0x0051, 0x0085, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x0087, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x0088, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x0086, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db - .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 - .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025, 0x0015, 0x004d, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db - .2byte 0x0019, 0x002d, 0x0015, 0x004e, 0x008d, 0x0022, 0x008a, 0x0018, 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004f, 0x008d, 0x0022 - .2byte 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x0049, 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - .2byte 0x0015, 0x0051, 0x008d, 0x0022, 0x008d, 0x0018, 0x00b3, 0x00db, 0x0019, 0x002d, 0x0015, 0x004a, 0x008d, 0x0022, 0x008a, 0x0018 - .2byte 0x00c8, 0x00ba, 0x0013, 0x0025, 0x0015, 0x004b, 0x008d, 0x0022, 0x008d, 0x0018, 0x00c6, 0x00c4, 0x0019, 0x002d, 0x0015, 0x004c - .2byte 0x008d, 0x0022, 0x008a, 0x0018, 0x00b7, 0x00bb, 0x0013, 0x0025 - gUnknown_08613ABC:: @ 8613ABC .byte 0x1f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x0f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06 .byte 0x61, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04 diff --git a/data/battle_pike.s b/data/battle_pike.s deleted file mode 100644 index 88f040f17..000000000 --- a/data/battle_pike.s +++ /dev/null @@ -1,212 +0,0 @@ -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_086121D4:: @ 86121D4 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x016a, 0x0005, 0x0105, 0x00d4 - .2byte 0x005c, 0x0145 - - .align 1 -gUnknown_086121F8:: @ 86121F8 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x0065, 0x0005, 0x0099, 0x0078 - .2byte 0x0057, 0x005c - - .align 1 -gUnknown_0861221C:: @ 861221C - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x0133, 0x0005, 0x0093, 0x004e - .2byte 0x004d, 0x00ed - - .align 1 -gUnknown_08612240:: @ 8612240 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0022, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x0039, 0x00ca, 0x0005, 0x0044, 0x00f3 - .2byte 0x00db, 0x00c2 - - .align 2 -gUnknown_08612264:: @ 8612264 - .4byte gUnknown_086121D4 - .4byte gUnknown_086121F8 - .4byte gUnknown_0861221C - .4byte gUnknown_08612240 - - .align 1 -gUnknown_08612274:: @ 8612274 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x016a, 0x0005, 0x0105, 0x00d4 - .2byte 0x005c, 0x003a - - .align 1 -gUnknown_08612298:: @ 8612298 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x0065, 0x0005, 0x0099, 0x0078 - .2byte 0x0057, 0x005c - - .align 1 -gUnknown_086122BC:: @ 86122BC - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x0133, 0x0005, 0x0093, 0x004e - .2byte 0x004d, 0x00ed - - .align 1 -gUnknown_086122E0:: @ 86122E0 - .2byte 0x017b, 0x0004, 0x005c, 0x0089, 0x0131, 0x00bc, 0x0149, 0x0004, 0x005c, 0x005f, 0x0022, 0x003a, 0x00ca, 0x0005, 0x0044, 0x00f3 - .2byte 0x00db, 0x00e3 - - .align 2 -gUnknown_08612304:: @ 8612304 - .4byte gUnknown_08612274 - .4byte gUnknown_08612298 - .4byte gUnknown_086122BC - .4byte gUnknown_086122E0 - - .align 2 -gUnknown_08612314:: @ 8612314 - .4byte gUnknown_08612264 - .4byte gUnknown_08612304 - - .align 2 -gUnknown_0861231C:: @ 861231C - .2byte 0x0012 - .byte 0x03, 0x05, 0x06 - - .align 2 - .2byte 0x0005 - .byte 0x0d, 0x20, 0x25 - - .align 2 - .2byte 0x0011 - .byte 0x08, 0x0b, 0x0c - - .align 2 - .2byte 0x0024 - .byte 0x22, 0x1e, 0x21 - - .align 2 - .2byte 0x0015 - .byte 0x00, 0x00, 0x00 - - .align 2 - .2byte 0x001e - .byte 0x01, 0x01, 0x01 - - .align 2 - .2byte 0x002c - .byte 0x16, 0x17, 0x1b - - .align 2 - .2byte 0x0037 - .byte 0x08, 0x16, 0x1f - - .align 2 - .2byte 0x000e - .byte 0x0d, 0x27, 0x15 - - .align 2 - .2byte 0x0014 - .byte 0x02, 0x04, 0x11 - - .align 2 - .2byte 0x0038 - .byte 0x1e, 0x14, 0x24 - - .align 2 - .2byte 0x0042 - .byte 0x1c, 0x22, 0x19 - - .align 2 - .2byte 0x0026 - .byte 0x17, 0x26, 0x1a - - .align 2 - .2byte 0x0032 - .byte 0x17, 0x1e, 0x0b - - .align 2 - .2byte 0x002f - .byte 0x0f, 0x13, 0x0e - - .align 2 - .2byte 0x0027 - .byte 0x02, 0x1d, 0x1a - - .align 2 - .2byte 0x0033 - .byte 0x25, 0x0c, 0x20 - - .align 2 - .2byte 0x0021 - .byte 0x18, 0x17, 0x26 - - .align 2 - .2byte 0x0018 - .byte 0x05, 0x16, 0x04 - - .align 2 - .2byte 0x000b - .byte 0x29, 0x25, 0x23 - - .align 2 - .2byte 0x0035 - .byte 0x27, 0x0e, 0x0d - - .align 2 - .2byte 0x0030 - .byte 0x0a, 0x07, 0x09 - - .align 2 - .2byte 0x000c - .byte 0x28, 0x14, 0x10 - - .align 2 - .2byte 0x0034 - .byte 0x12, 0x0d, 0x15 - - .align 2 - .2byte 0x0013 - .byte 0x16, 0x1f, 0x1b - - .align 2 -gUnknown_086123E4:: @ 86123E4 - .byte 0x29, 0x0a, 0x30, 0x06, 0x01, 0x0a, 0x0f, 0x14, 0x20, 0x10, 0x0e, 0x27 - .byte 0x2a, 0x0a, 0x1d, 0x08, 0x1b, 0x06, 0x34, 0x10, 0x20, 0x1e, 0x29, 0x0a - .byte 0x22, 0x1e, 0x31, 0x12, 0x01, 0x0a, 0x18, 0x10, 0x1a, 0x1c, 0x03, 0x0c - .byte 0x0f, 0x1e, 0x0b, 0x10, 0x39, 0x10, 0x0f, 0x20, 0x2b, 0x10, 0x14, 0x0a - .byte 0x3b, 0x10, 0x02, 0x0a, 0x1e, 0x16, 0x20, 0x10, 0x3e, 0x14, 0x03, 0x0c - .byte 0x31, 0x0a, 0x02, 0x0e, 0x15, 0x0e, 0x36, 0x14, 0x37, 0x10, 0x0a, 0x1e - .byte 0x29, 0x0a, 0x25, 0x10, 0x2a, 0x14, 0x34, 0x10, 0x0f, 0x1e, 0x1b, 0x0a - .byte 0x01, 0x0a, 0x07, 0x0e, 0x2a, 0x12, 0x0f, 0x1e, 0x1f, 0x06, 0xff, 0xff - .byte 0x35, 0x1a, 0x36, 0x10, 0x0f, 0x0e, 0x01, 0x0a, 0x21, 0x26, 0x0f, 0x1e - .byte 0x25, 0x0e, 0x2f, 0x10, 0x2d, 0x06, 0x1e, 0x20, 0x03, 0x0c, 0xff, 0xff - .byte 0x1d, 0x0c, 0x1d, 0x08, 0x2b, 0x0a, 0x0f, 0x10, 0x02, 0x0a, 0x03, 0x0c - .byte 0x2a, 0x0a, 0x3e, 0x0a, 0x00, 0x20, 0x27, 0x10, 0x08, 0x1c, 0x04, 0x0c - .byte 0x01, 0x0a, 0x12, 0x12, 0x01, 0x0a, 0x00, 0x10, 0x2d, 0x06, 0xff, 0xff - .byte 0x22, 0x1e, 0x31, 0x12, 0x01, 0x0a, 0x18, 0x10, 0x1c, 0x1c, 0x03, 0x0c - .byte 0x01, 0x0a, 0x0b, 0x06, 0x30, 0x10, 0x28, 0x0a, 0x49, 0x25, 0x24, 0x06 - .byte 0x14, 0x10, 0x2c, 0x0a, 0x15, 0x04, 0x42, 0x16, 0x1b, 0x1e, 0x03, 0x0c - .byte 0x28, 0x06, 0x0f, 0x1a, 0x0b, 0x10, 0x17, 0x20, 0x00, 0x0c, 0xff, 0xff - .byte 0x01, 0x0a, 0x15, 0x10, 0x47, 0x16, 0x0f, 0x1e, 0x39, 0x0e, 0x36, 0x0e - .byte 0x01, 0x0a, 0x17, 0x10, 0x20, 0x16, 0x19, 0x0e, 0x31, 0x0a, 0x38, 0x0c - .byte 0x1d, 0x0c, 0x1d, 0x08, 0x00, 0x0c, 0x22, 0x10, 0x12, 0x1c, 0x0b, 0x02 - .byte 0x29, 0x10, 0x04, 0x14, 0x2f, 0x10, 0x06, 0x10, 0x28, 0x1e, 0x1c, 0x1c - .byte 0x29, 0x10, 0x20, 0x0e, 0x28, 0x10, 0x16, 0x1c, 0x29, 0x1e, 0x03, 0x0c - .byte 0x0f, 0x1e, 0x0b, 0x10, 0x2f, 0x0e, 0x38, 0x06, 0x0c, 0x10, 0xff, 0xff - .byte 0x29, 0x0a, 0x08, 0x14, 0x2f, 0x10, 0x1e, 0x06, 0x2c, 0x10, 0xff, 0xff - .byte 0x23, 0x10, 0x0b, 0x10, 0x1d, 0x08, 0x2d, 0x06, 0x37, 0x10, 0x14, 0x0a - .byte 0x29, 0x0a, 0x22, 0x10, 0x08, 0x14, 0x2f, 0x10, 0x1e, 0x16, 0x29, 0x10 - .byte 0x01, 0x06, 0x2c, 0x10, 0x01, 0x0a, 0x15, 0x10, 0x39, 0x0e, 0x36, 0x0e - .byte 0x20, 0x10, 0x0b, 0x02, 0x3f, 0x10, 0x12, 0x1c, 0x04, 0x0c, 0xff, 0xff - .byte 0x18, 0x10, 0x02, 0x0a, 0x3a, 0x10, 0x46, 0x04, 0x0e, 0x02, 0x03, 0x0c - .byte 0x10, 0x1e, 0x0b, 0x02, 0x0a, 0x1e, 0x0b, 0x10, 0x3a, 0x06, 0xff, 0xff - .byte 0x02, 0x0a, 0x12, 0x12, 0x0f, 0x1e, 0x0b, 0x10, 0x38, 0x06, 0x03, 0x0c - .byte 0x22, 0x1e, 0x00, 0x10, 0x1b, 0x16, 0x3f, 0x10, 0x0f, 0x1e, 0x03, 0x0c - .byte 0x29, 0x0a, 0x1e, 0x0e, 0x25, 0x10, 0x26, 0x1e, 0x00, 0x0c, 0xff, 0xff - .byte 0x01, 0x0a, 0x1e, 0x0e, 0x36, 0x12, 0x2f, 0x10, 0x0b, 0x12, 0x04, 0x0c - .byte 0x05, 0x28, 0x0f, 0x1e, 0x1b, 0x0a, 0x0b, 0x10, 0x20, 0x10, 0x3b, 0x06 - .byte 0x01, 0x0a, 0x1f, 0x10, 0x3e, 0x0a, 0x37, 0x10, 0x20, 0x10, 0x28, 0x06 - .byte 0x26, 0x10, 0x31, 0x0a, 0x29, 0x1e, 0x1c, 0x1c, 0x01, 0x0a, 0x12, 0x12 - .byte 0x0a, 0x0c, 0x00, 0x0c, 0x29, 0x10, 0x1c, 0x10, 0x0f, 0x1e, 0x23, 0x0c - .byte 0x28, 0x0a, 0x0e, 0x02, 0x0f, 0x10, 0x39, 0x10, 0x2a, 0x14, 0x04, 0x0c - .byte 0x28, 0x0a, 0x0e, 0x02, 0x0f, 0x10, 0x20, 0x06, 0x2f, 0x10, 0x3c, 0x04 - .byte 0x39, 0x0c, 0x39, 0x0c, 0x00, 0x0c, 0x29, 0x0a, 0x17, 0x20, 0x39, 0x0c - .byte 0x5c, 0x26, 0x0b, 0x10, 0x20, 0x10, 0x30, 0x12, 0x05, 0x1e, 0x0c, 0x10 diff --git a/data/createsprite.py b/data/createsprite.py new file mode 100644 index 000000000..8af44aa55 --- /dev/null +++ b/data/createsprite.py @@ -0,0 +1,85 @@ +import math + +inFile = "battle_anim_scripts.s" +#outFile = "createsprite.txt" +outFile = "battle_anim_scripts.s" + +fIN = open(inFile, 'r') + +ANIM_BANK_ATTACKER = 0b00000000 +ANIM_BANK_TARGET = 0b10000000 +ONE = 0b1111111 + +# +inLines = fIN.readlines() + +text = "" + +count = 0 + +uniques = set() + +def lsb(n): + return 0 + +# createsprite2 gBattleAnimSpriteTemplate_83D96F8, ANIM_BANK_ATTACKER, 40, 200, -32, 0, 100, 0 +# createsprite gBattleAnimSpriteTemplate_83D96F8, 40, 200, -32, 0, 100, 0 + +# createsprite2 gBattleAnimSpriteTemplate_83DAC10, ANIM_BANK_ATTACKER, 66, 0 +# createsprite gBattleAnimSpriteTemplate_83DAC10, 66, 0 + +# line 3891 +for line in inLines: + count += 1 + if (not line.startswith("\tcreatesprite")):# or (count > 500): # 3890 < x < 3899 + text += line + + else: + split = line.replace(',','').strip().split() + #print(split[3:-1]) + + text += '\t' + text += "createsprite2 " + split[1] + ', ' + + #try: + combined = int(split[2], 0) + #except: + # combined = int(split[2], 0) + + battler = combined + uniques.add((battler, battler & ONE)) + #priority = str(lsb(battler)) + + if battler & ANIM_BANK_TARGET: + battler_txt = "ANIM_BANK_TARGET" + priority_txt = str(battler & ONE) + + else: + battler_txt = "ANIM_BANK_ATTACKER" #split[2] | battler + priority_txt = str(battler & ONE) + + text += battler_txt + ', ' + priority_txt + ', ' + + # createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + # createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BANK_ATTACKER, 2, 0, 0, 1, 2 + + # .if battler == ANIM_BANK_TARGET + # .byte 0x80 | (subpriority_offset & 0x3F) + # .else + # .byte (subpriority_offset & 0x3F) + + if len(split) > 3: + for item in split[3:-1]: + text += item + ', ' + text += split[-1] + '\n' + + else: + text = text[:-2] + '\n' + +print(uniques) + +fOUT = open(outFile, 'w') +fOUT.write(text) + +fIN.close() +fOUT.close() diff --git a/data/mossdeep_gym.s b/data/mossdeep_gym.s new file mode 100644 index 000000000..59698dea6 --- /dev/null +++ b/data/mossdeep_gym.s @@ -0,0 +1,47 @@ +#include "constants/moves.h" +#include "constants/species.h" +#include "constants/trainers.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_08612698:: @ 8612698 + store_lock_anim + walk_right + free_unlock_anim + step_end + +gUnknown_0861269C:: @ 861269C + store_lock_anim + walk_down + free_unlock_anim + step_end + +gUnknown_086126A0:: @ 86126A0 + store_lock_anim + walk_left + free_unlock_anim + step_end + +gUnknown_086126A4:: @ 86126A4 + store_lock_anim + walk_up + free_unlock_anim + step_end + +gUnknown_086126A8:: @ 86126A8 + face_right + step_end + +gUnknown_086126AA:: @ 86126AA + face_down + step_end + +gUnknown_086126AC:: @ 86126AC + face_left + step_end + +gUnknown_086126AE:: @ 86126AE + face_up + step_end diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index 5d38e9f35..8d8e01bfb 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -1,6 +1,33 @@ #ifndef GUARD_BATTLE_PYRAMID_H #define GUARD_BATTLE_PYRAMID_H +#define TOTAL_ROUNDS 20 +#define PICKUP_ITEMS_PER_ROUND 10 + +struct PyramidWildMon +{ + u16 species; + u8 lvl; + u8 abilityBit; + u16 moves[4]; +}; + +struct Struct_08613650 +{ + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u8 runMultiplier; + u8 unk5[8]; +}; + +struct ClassMusic +{ + u8 class; + u8 music; +}; + void CallBattlePyramidFunction(void); u16 LocalIdToPyramidTrainerId(u8 localId); bool8 GetBattlePyramidTrainerFlag(u8 eventId); @@ -21,4 +48,19 @@ void sub_81AA2F8(void); u8 sub_81AAA40(void); u16 GetBattlePyramidPickupItemId(void); +// Const rom data. +extern const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; +extern const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; +extern const u8 gUnknown_08613ABC[63][2]; +extern const u8 gUnknown_08613B3A[]; +extern const u16 gUnknown_08D856C8[][16]; +extern const u8 gUnknown_08613C1C[50][2]; +extern const u8 *const *const *const gUnknown_08613EC0[]; +extern const struct ClassMusic gUnknown_08613B44[54]; +extern const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[]; +extern const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[]; +extern const struct Struct_08613650 gUnknown_08613650[]; +extern const u8 gUnknown_08613750[34][2]; +extern const u8 gUnknown_08613794[]; + #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/strings.h b/include/strings.h index 3746e459a..c4af6f5b2 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1181,4 +1181,48 @@ extern const u8 gText_Are[]; extern const u8 gText_Are2[]; extern const u8 gText_123Dot[][3]; +// Frontier util. +extern const u8 gUnknown_085ED164[]; +extern const u8 gUnknown_085ED170[]; +extern const u8 gUnknown_085ED17C[]; +extern const u8 gUnknown_085ED188[]; +extern const u8 gUnknown_085ED190[]; + +extern const u8 gText_RecordsLv50[]; +extern const u8 gText_RecordsOpenLevel[]; +extern const u8 gText_FrontierFacilityWinStreak[]; +extern const u8 gText_FrontierFacilityClearStreak[]; +extern const u8 gText_FrontierFacilityRoomsCleared[]; +extern const u8 gText_FrontierFacilityKOsStreak[]; +extern const u8 gText_FrontierFacilityFloorsCleared[]; + +extern const u8 gText_082C843F[]; +extern const u8 gText_082C848B[]; +extern const u8 gText_082C8628[]; +extern const u8 gText_082C85B4[]; +extern const u8 gText_082C8512[]; +extern const u8 gText_082C859D[]; +extern const u8 gText_082C86C3[]; +extern const u8 gText_082C8458[]; +extern const u8 gText_082C84C1[]; +extern const u8 gText_082C8662[]; +extern const u8 gText_082C85E3[]; +extern const u8 gText_082C853B[]; +extern const u8 gText_082C85A4[]; +extern const u8 gText_082C86FE[]; +extern const u8 gText_082C846C[]; +extern const u8 gText_082C84D0[]; +extern const u8 gText_082C8682[]; +extern const u8 gText_082C85F5[]; +extern const u8 gText_082C8561[]; +extern const u8 gText_082C85A9[]; +extern const u8 gText_082C8739[]; +extern const u8 gText_082C8480[]; +extern const u8 gText_082C84F7[]; +extern const u8 gText_082C86B3[]; +extern const u8 gText_082C8611[]; +extern const u8 gText_082C8589[]; +extern const u8 gText_082C85AE[]; +extern const u8 gText_082C877B[]; + #endif //GUARD_STRINGS_H diff --git a/ld_script.txt b/ld_script.txt index 486562547..0307d4361 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -574,11 +574,11 @@ SECTIONS { src/battle_factory_screen.o(.rodata); src/apprentice.o(.rodata); src/frontier_util.o(.rodata); - data/battle_frontier_2.o(.rodata); src/battle_arena.o(.rodata); src/battle_factory.o(.rodata); - data/battle_pike.o(.rodata); src/battle_pike.o(.rodata); + data/mossdeep_gym.o(.rodata); + src/frontier_data.o(.rodata); data/battle_frontier_3.o(.rodata); src/battle_pyramid.o(.rodata); src/item_menu.o(.rodata); diff --git a/src/battle_pike.c b/src/battle_pike.c index a0a50d86e..21e7a0614 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -19,6 +19,7 @@ #include "constants/rgb.h" #include "constants/trainers.h" #include "constants/species.h" +#include "constants/moves.h" #define PIKE_ROOM_SINGLE_BATTLE 0 #define PIKE_ROOM_HEAL_FULL 1 @@ -40,7 +41,7 @@ struct Unk0861231C u8 unk2; u8 unk3; u8 unk4; - u8 unk5; + u8 unk5;//? unused ? }; struct PikeWildMon @@ -50,9 +51,6 @@ struct PikeWildMon u16 moves[4]; }; -extern const struct Unk0861231C gUnknown_0861231C[]; -extern const struct PikeWildMon *const *const gUnknown_08612314[2]; -extern const u16 gUnknown_086123E4[][6]; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; // IWRAM bss @@ -106,6 +104,383 @@ static bool8 sub_81A7D8C(struct Task *task); static bool8 sub_81A7DE8(struct Task *task); // Const rom data. + +// extern const struct PikeWildMon *const *const gUnknown_08612314[2]; + +const struct PikeWildMon gUnknown_086121D4[] = +{ + { + .species = SPECIES_SEVIPER, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_BODY_SLAM, MOVE_SLUDGE_BOMB} + }, + { + .species = SPECIES_MILOTIC, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_SURF} + }, + { + .species = SPECIES_DUSCLOPS, + .levelDelta = 5, + .moves = {MOVE_WILL_O_WISP, MOVE_MEAN_LOOK, MOVE_TOXIC, MOVE_SHADOW_PUNCH} + } +}; + +const struct PikeWildMon gUnknown_086121F8[] = +{ + { + .species = SPECIES_SEVIPER, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_BODY_SLAM, MOVE_SLUDGE_BOMB} + }, + { + .species = SPECIES_MILOTIC, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_SURF} + }, + { + .species = SPECIES_ELECTRODE, + .levelDelta = 5, + .moves = {MOVE_EXPLOSION, MOVE_SELF_DESTRUCT, MOVE_THUNDER, MOVE_TOXIC} + } +}; + +const struct PikeWildMon gUnknown_0861221C[] = +{ + { + .species = SPECIES_SEVIPER, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_BODY_SLAM, MOVE_SLUDGE_BOMB} + }, + { + .species = SPECIES_MILOTIC, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_SURF} + }, + { + .species = SPECIES_BRELOOM, + .levelDelta = 5, + .moves = {MOVE_SPORE, MOVE_STUN_SPORE, MOVE_POISON_POWDER, MOVE_HIDDEN_POWER} + } +}; + +const struct PikeWildMon gUnknown_08612240[] = +{ + { + .species = SPECIES_SEVIPER, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_BODY_SLAM, MOVE_SLUDGE_BOMB} + }, + { + .species = SPECIES_MILOTIC, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_SURF} + }, + { + .species = SPECIES_WOBBUFFET, + .levelDelta = 5, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND} + } +}; + +const struct PikeWildMon *const gUnknown_08612264[] = +{ + gUnknown_086121D4, + gUnknown_086121F8, + gUnknown_0861221C, + gUnknown_08612240 +}; + +const struct PikeWildMon gUnknown_08612274[] = +{ + { + .species = SPECIES_SEVIPER, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SLUDGE_BOMB} + }, + { + .species = SPECIES_MILOTIC, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_DUSCLOPS, + .levelDelta = 5, + .moves = {MOVE_WILL_O_WISP, MOVE_MEAN_LOOK, MOVE_TOXIC, MOVE_ICE_BEAM} + } +}; + +const struct PikeWildMon gUnknown_08612298[] = +{ + { + .species = SPECIES_SEVIPER, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SLUDGE_BOMB} + }, + { + .species = SPECIES_MILOTIC, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_ELECTRODE, + .levelDelta = 5, + .moves = {MOVE_EXPLOSION, MOVE_SELF_DESTRUCT, MOVE_THUNDER, MOVE_TOXIC} + } +}; + +const struct PikeWildMon gUnknown_086122BC[] = +{ + { + .species = SPECIES_SEVIPER, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SLUDGE_BOMB} + }, + { + .species = SPECIES_MILOTIC, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_BRELOOM, + .levelDelta = 5, + .moves = {MOVE_SPORE, MOVE_STUN_SPORE, MOVE_POISON_POWDER, MOVE_HIDDEN_POWER} + } +}; + +const struct PikeWildMon gUnknown_086122E0[] = +{ + { + .species = SPECIES_SEVIPER, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SLUDGE_BOMB} + }, + { + .species = SPECIES_MILOTIC, + .levelDelta = 4, + .moves = {MOVE_TOXIC, MOVE_HYPNOSIS, MOVE_BODY_SLAM, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_WOBBUFFET, + .levelDelta = 5, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_ENCORE} + } +}; + +const struct PikeWildMon *const gUnknown_08612304[] = +{ + gUnknown_08612274, + gUnknown_08612298, + gUnknown_086122BC, + gUnknown_086122E0 +}; + +const struct PikeWildMon *const *const gUnknown_08612314[2] = +{ + gUnknown_08612264, + gUnknown_08612304 +}; + +const struct Unk0861231C gUnknown_0861231C[] = +{ + { + .unk0 = 0x0012, + .unk2 = 0x03, + .unk3 = 0x05, + .unk4 = 0x06 + }, + { + .unk0 = 0x0005, + .unk2 = 0x0d, + .unk3 = 0x20, + .unk4 = 0x25 + }, + { + .unk0 = 0x0011, + .unk2 = 0x08, + .unk3 = 0x0b, + .unk4 = 0x0c + }, + { + .unk0 = 0x0024, + .unk2 = 0x22, + .unk3 = 0x1e, + .unk4 = 0x21 + }, + { + .unk0 = 0x0015, + .unk2 = 0x00, + .unk3 = 0x00, + .unk4 = 0x00 + }, + { + .unk0 = 0x001e, + .unk2 = 0x01, + .unk3 = 0x01, + .unk4 = 0x01 + }, + { + .unk0 = 0x002c, + .unk2 = 0x16, + .unk3 = 0x17, + .unk4 = 0x1b + }, + { + .unk0 = 0x0037, + .unk2 = 0x08, + .unk3 = 0x16, + .unk4 = 0x1f + }, + { + .unk0 = 0x000e, + .unk2 = 0x0d, + .unk3 = 0x27, + .unk4 = 0x15 + }, + { + .unk0 = 0x0014, + .unk2 = 0x02, + .unk3 = 0x04, + .unk4 = 0x11 + }, + { + .unk0 = 0x0038, + .unk2 = 0x1e, + .unk3 = 0x14, + .unk4 = 0x24 + }, + { + .unk0 = 0x0042, + .unk2 = 0x1c, + .unk3 = 0x22, + .unk4 = 0x19 + }, + { + .unk0 = 0x0026, + .unk2 = 0x17, + .unk3 = 0x26, + .unk4 = 0x1a + }, + { + .unk0 = 0x0032, + .unk2 = 0x17, + .unk3 = 0x1e, + .unk4 = 0x0b + }, + { + .unk0 = 0x002f, + .unk2 = 0x0f, + .unk3 = 0x13, + .unk4 = 0x0e + }, + { + .unk0 = 0x0027, + .unk2 = 0x02, + .unk3 = 0x1d, + .unk4 = 0x1a + }, + { + .unk0 = 0x0033, + .unk2 = 0x25, + .unk3 = 0x0c, + .unk4 = 0x20 + }, + { + .unk0 = 0x0021, + .unk2 = 0x18, + .unk3 = 0x17, + .unk4 = 0x26 + }, + { + .unk0 = 0x0018, + .unk2 = 0x05, + .unk3 = 0x16, + .unk4 = 0x04 + }, + { + .unk0 = 0x000b, + .unk2 = 0x29, + .unk3 = 0x25, + .unk4 = 0x23 + }, + { + .unk0 = 0x0035, + .unk2 = 0x27, + .unk3 = 0x0e, + .unk4 = 0x0d + }, + { + .unk0 = 0x0030, + .unk2 = 0x0a, + .unk3 = 0x07, + .unk4 = 0x09 + }, + { + .unk0 = 0x000c, + .unk2 = 0x28, + .unk3 = 0x14, + .unk4 = 0x10 + }, + { + .unk0 = 0x0034, + .unk2 = 0x12, + .unk3 = 0x0d, + .unk4 = 0x15 + }, + { + .unk0 = 0x0013, + .unk2 = 0x16, + .unk3 = 0x1f, + .unk4 = 0x1b + } +}; + +const u16 gUnknown_086123E4[][6] = +{ + {0x0a29, 0x0630, 0x0a01, 0x140f, 0x1020, 0x270e}, + {0x0a2a, 0x081d, 0x061b, 0x1034, 0x1e20, 0x0a29}, + {0x1e22, 0x1231, 0x0a01, 0x1018, 0x1c1a, 0x0c03}, + {0x1e0f, 0x100b, 0x1039, 0x200f, 0x102b, 0x0a14}, + {0x103b, 0x0a02, 0x161e, 0x1020, 0x143e, 0x0c03}, + {0x0a31, 0x0e02, 0x0e15, 0x1436, 0x1037, 0x1e0a}, + {0x0a29, 0x1025, 0x142a, 0x1034, 0x1e0f, 0x0a1b}, + {0x0a01, 0x0e07, 0x122a, 0x1e0f, 0x061f, 0xffff}, + {0x1a35, 0x1036, 0x0e0f, 0x0a01, 0x2621, 0x1e0f}, + {0x0e25, 0x102f, 0x062d, 0x201e, 0x0c03, 0xffff}, + {0x0c1d, 0x081d, 0x0a2b, 0x100f, 0x0a02, 0x0c03}, + {0x0a2a, 0x0a3e, 0x2000, 0x1027, 0x1c08, 0x0c04}, + {0x0a01, 0x1212, 0x0a01, 0x1000, 0x062d, 0xffff}, + {0x1e22, 0x1231, 0x0a01, 0x1018, 0x1c1c, 0x0c03}, + {0x0a01, 0x060b, 0x1030, 0x0a28, 0x2549, 0x0624}, + {0x1014, 0x0a2c, 0x0415, 0x1642, 0x1e1b, 0x0c03}, + {0x0628, 0x1a0f, 0x100b, 0x2017, 0x0c00, 0xffff}, + {0x0a01, 0x1015, 0x1647, 0x1e0f, 0x0e39, 0x0e36}, + {0x0a01, 0x1017, 0x1620, 0x0e19, 0x0a31, 0x0c38}, + {0x0c1d, 0x081d, 0x0c00, 0x1022, 0x1c12, 0x020b}, + {0x1029, 0x1404, 0x102f, 0x1006, 0x1e28, 0x1c1c}, + {0x1029, 0x0e20, 0x1028, 0x1c16, 0x1e29, 0x0c03}, + {0x1e0f, 0x100b, 0x0e2f, 0x0638, 0x100c, 0xffff}, + {0x0a29, 0x1408, 0x102f, 0x061e, 0x102c, 0xffff}, + {0x1023, 0x100b, 0x081d, 0x062d, 0x1037, 0x0a14}, + {0x0a29, 0x1022, 0x1408, 0x102f, 0x161e, 0x1029}, + {0x0601, 0x102c, 0x0a01, 0x1015, 0x0e39, 0x0e36}, + {0x1020, 0x020b, 0x103f, 0x1c12, 0x0c04, 0xffff}, + {0x1018, 0x0a02, 0x103a, 0x0446, 0x020e, 0x0c03}, + {0x1e10, 0x020b, 0x1e0a, 0x100b, 0x063a, 0xffff}, + {0x0a02, 0x1212, 0x1e0f, 0x100b, 0x0638, 0x0c03}, + {0x1e22, 0x1000, 0x161b, 0x103f, 0x1e0f, 0x0c03}, + {0x0a29, 0x0e1e, 0x1025, 0x1e26, 0x0c00, 0xffff}, + {0x0a01, 0x0e1e, 0x1236, 0x102f, 0x120b, 0x0c04}, + {0x2805, 0x1e0f, 0x0a1b, 0x100b, 0x1020, 0x063b}, + {0x0a01, 0x101f, 0x0a3e, 0x1037, 0x1020, 0x0628}, + {0x1026, 0x0a31, 0x1e29, 0x1c1c, 0x0a01, 0x1212}, + {0x0c0a, 0x0c00, 0x1029, 0x101c, 0x1e0f, 0x0c23}, + {0x0a28, 0x020e, 0x100f, 0x1039, 0x142a, 0x0c04}, + {0x0a28, 0x020e, 0x100f, 0x0620, 0x102f, 0x043c}, + {0x0c39, 0x0c39, 0x0c00, 0x0a29, 0x2017, 0x0c39}, + {0x265c, 0x100b, 0x1020, 0x1230, 0x1e05, 0x100c}, +}; + static const u8 gUnknown_086125DC[][4] = { {0x23, 0x46, 0x23, 0x01}, diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 01f138925..dabaf20d0 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -34,33 +34,6 @@ extern void door_upload_tiles(void); extern const struct MapLayout *const gMapLayouts[]; -#define TOTAL_ROUNDS 20 -#define PICKUP_ITEMS_PER_ROUND 10 - -struct Struct_08613650 -{ - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 runMultiplier; - u8 unk5[8]; -}; - -struct PyramidWildMon -{ - u16 species; - u8 lvl; - u8 abilityBit; - u16 moves[4]; -}; - -struct ClassMusic -{ - u8 class; - u8 music; -}; - extern const u16 gBattleFrontierHeldItems[]; extern const struct FacilityMon gBattleFrontierMons[]; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; @@ -101,21 +74,6 @@ static bool8 sub_81AA648(u8, u8); static bool8 sub_81AA760(u8 arg0, u8 *mapNums, u8 whichMap, u8 id); static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *mapNums, u8 whichMap, u8 id); -// Const rom data. -extern const struct Struct_08613650 gUnknown_08613650[]; -extern const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; -extern const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; -extern const u8 gUnknown_08613ABC[63][2]; -extern const u8 gUnknown_08613B3A[]; -extern const u16 gUnknown_08D856C8[][16]; -extern const u8 gUnknown_08613C1C[50][2]; -extern const u8 *const *const *const gUnknown_08613EC0[]; -extern const struct ClassMusic gUnknown_08613B44[54]; -extern const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[]; -extern const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[]; -extern const u8 gUnknown_08613794[]; -extern const u8 gUnknown_08613750[34][2]; - static const u8 gUnknown_08613ED8[] = {3, 4, 5, 6, 7, 8, 3, 4}; static void (* const sBattlePyramidFunctions[])(void) = diff --git a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h new file mode 100644 index 000000000..0248ce958 --- /dev/null +++ b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h @@ -0,0 +1,1064 @@ + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round1[] = +{ + { + .species = SPECIES_PLUSLE, + .lvl = 35, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE} + }, + { + .species = SPECIES_MINUN, + .lvl = 35, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE} + }, + { + .species = SPECIES_PIKACHU, + .lvl = 37, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE} + }, + { + .species = SPECIES_ELECTABUZZ, + .lvl = 37, + .abilityBit = 2, + .moves = {MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE} + }, + { + .species = SPECIES_VILEPLUME, + .lvl = 39, + .abilityBit = 2, + .moves = {MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_MANECTRIC, + .lvl = 39, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE} + }, + { + .species = SPECIES_BRELOOM, + .lvl = 40, + .abilityBit = 2, + .moves = {MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH} + }, + { + .species = SPECIES_JOLTEON, + .lvl = 40, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round2[] = +{ + { + .species = SPECIES_GULPIN, + .lvl = 36, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_ROSELIA, + .lvl = 36, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE} + }, + { + .species = SPECIES_BUTTERFREE, + .lvl = 38, + .abilityBit = 2, + .moves = {MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE} + }, + { + .species = SPECIES_SEVIPER, + .lvl = 38, + .abilityBit = 2, + .moves = {MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL} + }, + { + .species = SPECIES_SKARMORY, + .lvl = 40, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE} + }, + { + .species = SPECIES_LUDICOLO, + .lvl = 40, + .abilityBit = 1, + .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE} + }, + { + .species = SPECIES_CROBAT, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE} + }, + { + .species = SPECIES_GENGAR, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round3[] = +{ + { + .species = SPECIES_GROWLITHE, + .lvl = 37, + .abilityBit = 2, + .moves = {MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_VULPIX, + .lvl = 37, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_MAGCARGO, + .lvl = 39, + .abilityBit = 1, + .moves = {MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_NINETALES, + .lvl = 39, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE} + }, + { + .species = SPECIES_MEDICHAM, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_WEEZING, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_DUSCLOPS, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH} + }, + { + .species = SPECIES_HOUNDOOM, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round4[] = +{ + { + .species = SPECIES_DUNSPARCE, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_BANETTE, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE} + }, + { + .species = SPECIES_MISDREAVUS, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE} + }, + { + .species = SPECIES_NINETALES, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE} + }, + { + .species = SPECIES_ABSOL, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT} + }, + { + .species = SPECIES_DUSCLOPS, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL} + }, + { + .species = SPECIES_SHEDINJA, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE} + }, + { + .species = SPECIES_GENGAR, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round5[] = +{ + { + .species = SPECIES_HAUNTER, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE} + }, + { + .species = SPECIES_CHIMECHO, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT} + }, + { + .species = SPECIES_SOLROCK, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC} + }, + { + .species = SPECIES_MISDREAVUS, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT} + }, + { + .species = SPECIES_CLAYDOL, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC} + }, + { + .species = SPECIES_WEEZING, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_FLYGON, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH} + }, + { + .species = SPECIES_GENGAR, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round6[] = +{ + { + .species = SPECIES_DIGLETT, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE} + }, + { + .species = SPECIES_TRAPINCH, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE} + }, + { + .species = SPECIES_WYNAUT, + .lvl = 42, + .abilityBit = 0, + .moves = {MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT} + }, + { + .species = SPECIES_DIGLETT, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC} + }, + { + .species = SPECIES_TRAPINCH, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT} + }, + { + .species = SPECIES_WYNAUT, + .lvl = 44, + .abilityBit = 0, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE} + }, + { + .species = SPECIES_WOBBUFFET, + .lvl = 45, + .abilityBit = 0, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE} + }, + { + .species = SPECIES_DUGTRIO, + .lvl = 45, + .abilityBit = 1, + .moves = {MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round7[] = +{ + { + .species = SPECIES_GLALIE, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_SNEASEL, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE} + }, + { + .species = SPECIES_DEWGONG, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_PILOSWINE, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE} + }, + { + .species = SPECIES_JYNX, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE} + }, + { + .species = SPECIES_CLOYSTER, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_WALREIN, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_LAPRAS, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round8[] = +{ + { + .species = SPECIES_WEEZING, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE} + }, + { + .species = SPECIES_ELECTRODE, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE} + }, + { + .species = SPECIES_GENGAR, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE} + }, + { + .species = SPECIES_GOLEM, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE} + }, + { + .species = SPECIES_PINECO, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE} + }, + { + .species = SPECIES_SOLROCK, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE} + }, + { + .species = SPECIES_FORRETRESS, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE} + }, + { + .species = SPECIES_SHIFTRY, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round9[] = +{ + { + .species = SPECIES_WOBBUFFET, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND} + }, + { + .species = SPECIES_METANG, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC} + }, + { + .species = SPECIES_EXEGGUTOR, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE} + }, + { + .species = SPECIES_SLOWKING, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER} + }, + { + .species = SPECIES_XATU, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING} + }, + { + .species = SPECIES_ALAKAZAM, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC} + }, + { + .species = SPECIES_STARMIE, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_ESPEON, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round10[] = +{ + { + .species = SPECIES_GOLEM, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_STEELIX, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE} + }, + { + .species = SPECIES_OMASTAR, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE} + }, + { + .species = SPECIES_LUNATONE, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE} + }, + { + .species = SPECIES_SHUCKLE, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE} + }, + { + .species = SPECIES_ARMALDO, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE} + }, + { + .species = SPECIES_CRADILY, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE} + }, + { + .species = SPECIES_AERODACTYL, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round11[] = +{ + { + .species = SPECIES_POLIWRATH, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_HARIYAMA, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE} + }, + { + .species = SPECIES_BRELOOM, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_MEDICHAM, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} + }, + { + .species = SPECIES_HITMONCHAN, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} + }, + { + .species = SPECIES_HITMONLEE, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_HERACROSS, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE} + }, + { + .species = SPECIES_MACHAMP, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round12[] = +{ + { + .species = SPECIES_QUAGSIRE, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_TROPIUS, + .lvl = 41, + .abilityBit = 2, + .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_PUPITAR, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE} + }, + { + .species = SPECIES_LAPRAS, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_CACTURNE, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE} + }, + { + .species = SPECIES_FLAREON, + .lvl = 44, + .abilityBit = 2, + .moves = {MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_WALREIN, + .lvl = 45, + .abilityBit = 2, + .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_GYARADOS, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round13[] = +{ + { + .species = SPECIES_PINECO, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_SHUCKLE, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_VENOMOTH, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC} + }, + { + .species = SPECIES_SCIZOR, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT} + }, + { + .species = SPECIES_HERACROSS, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE} + }, + { + .species = SPECIES_FORRETRESS, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_ARMALDO, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE} + }, + { + .species = SPECIES_SHEDINJA, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round14[] = +{ + { + .species = SPECIES_SABLEYE, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE} + }, + { + .species = SPECIES_SNEASEL, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK} + }, + { + .species = SPECIES_CRAWDAUNT, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_SHIFTRY, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN} + }, + { + .species = SPECIES_CACTURNE, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE} + }, + { + .species = SPECIES_ABSOL, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE} + }, + { + .species = SPECIES_HOUNDOOM, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT} + }, + { + .species = SPECIES_UMBREON, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round15[] = +{ + { + .species = SPECIES_OCTILLERY, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE} + }, + { + .species = SPECIES_DEWGONG, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE} + }, + { + .species = SPECIES_PELIPPER, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_QUAGSIRE, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_LUDICOLO, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_SLOWKING, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE} + }, + { + .species = SPECIES_STARMIE, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD} + }, + { + .species = SPECIES_BLASTOISE, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round16[] = +{ + { + .species = SPECIES_DUSKULL, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT} + }, + { + .species = SPECIES_HAUNTER, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL} + }, + { + .species = SPECIES_BANETTE, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE} + }, + { + .species = SPECIES_MISDREAVUS, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE} + }, + { + .species = SPECIES_SABLEYE, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE} + }, + { + .species = SPECIES_DUSCLOPS, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE} + }, + { + .species = SPECIES_SHEDINJA, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT} + }, + { + .species = SPECIES_GENGAR, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round17[] = +{ + { + .species = SPECIES_MAWILE, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} + }, + { + .species = SPECIES_MAGNETON, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_STEELIX, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE} + }, + { + .species = SPECIES_SCIZOR, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_FORRETRESS, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_SKARMORY, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT} + }, + { + .species = SPECIES_AGGRON, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_METAGROSS, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round18[] = +{ + { + .species = SPECIES_DRAGONAIR, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} + }, + { + .species = SPECIES_VIBRAVA, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING} + }, + { + .species = SPECIES_ALTARIA, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT} + }, + { + .species = SPECIES_FLYGON, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE} + }, + { + .species = SPECIES_AERODACTYL, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE} + }, + { + .species = SPECIES_GYARADOS, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE} + }, + { + .species = SPECIES_KINGDRA, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_CHARIZARD, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round19[] = +{ + { + .species = SPECIES_ARCANINE, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_POLIWRATH, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_RAICHU, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE} + }, + { + .species = SPECIES_VAPOREON, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_JOLTEON, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_FLAREON, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_NINETALES, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_STARMIE, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC} + } +}; + +const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round20[] = +{ + { + .species = SPECIES_KANGASKHAN, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH} + }, + { + .species = SPECIES_SWELLOW, + .lvl = 42, + .abilityBit = 2, + .moves = {MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE} + }, + { + .species = SPECIES_URSARING, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT} + }, + { + .species = SPECIES_PORYGON2, + .lvl = 46, + .abilityBit = 2, + .moves = {MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_TAUROS, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT} + }, + { + .species = SPECIES_FEAROW, + .lvl = 48, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT} + }, + { + .species = SPECIES_SNORLAX, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE} + }, + { + .species = SPECIES_SLAKING, + .lvl = 50, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} + } +}; + +const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[] = +{ + gBattlePyramidLevel50WildMons_Round1, + gBattlePyramidLevel50WildMons_Round2, + gBattlePyramidLevel50WildMons_Round3, + gBattlePyramidLevel50WildMons_Round4, + gBattlePyramidLevel50WildMons_Round5, + gBattlePyramidLevel50WildMons_Round6, + gBattlePyramidLevel50WildMons_Round7, + gBattlePyramidLevel50WildMons_Round8, + gBattlePyramidLevel50WildMons_Round9, + gBattlePyramidLevel50WildMons_Round10, + gBattlePyramidLevel50WildMons_Round11, + gBattlePyramidLevel50WildMons_Round12, + gBattlePyramidLevel50WildMons_Round13, + gBattlePyramidLevel50WildMons_Round14, + gBattlePyramidLevel50WildMons_Round15, + gBattlePyramidLevel50WildMons_Round16, + gBattlePyramidLevel50WildMons_Round17, + gBattlePyramidLevel50WildMons_Round18, + gBattlePyramidLevel50WildMons_Round19, + gBattlePyramidLevel50WildMons_Round20 +}; diff --git a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h new file mode 100644 index 000000000..154a92799 --- /dev/null +++ b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h @@ -0,0 +1,1064 @@ + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round1[] = +{ + { + .species = SPECIES_PLUSLE, + .lvl = 15, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_ENCORE, MOVE_NONE} + }, + { + .species = SPECIES_MINUN, + .lvl = 15, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_NONE} + }, + { + .species = SPECIES_PIKACHU, + .lvl = 13, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_SLAM, MOVE_NONE} + }, + { + .species = SPECIES_ELECTABUZZ, + .lvl = 13, + .abilityBit = 2, + .moves = {MOVE_THUNDER_PUNCH, MOVE_SWIFT, MOVE_SCREECH, MOVE_NONE} + }, + { + .species = SPECIES_VILEPLUME, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_STUN_SPORE, MOVE_GIGA_DRAIN, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_MANECTRIC, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_NONE} + }, + { + .species = SPECIES_BRELOOM, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_STUN_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_MACH_PUNCH} + }, + { + .species = SPECIES_JOLTEON, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PIN_MISSILE, MOVE_QUICK_ATTACK} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round2[] = +{ + { + .species = SPECIES_GULPIN, + .lvl = 14, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_SLUDGE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_ROSELIA, + .lvl = 14, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_PETAL_DANCE} + }, + { + .species = SPECIES_BUTTERFREE, + .lvl = 12, + .abilityBit = 2, + .moves = {MOVE_POISON_POWDER, MOVE_GUST, MOVE_PSYBEAM, MOVE_NONE} + }, + { + .species = SPECIES_SEVIPER, + .lvl = 12, + .abilityBit = 2, + .moves = {MOVE_POISON_FANG, MOVE_SWAGGER, MOVE_CRUNCH, MOVE_POISON_TAIL} + }, + { + .species = SPECIES_SKARMORY, + .lvl = 7, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_FLY, MOVE_STEEL_WING, MOVE_NONE} + }, + { + .species = SPECIES_LUDICOLO, + .lvl = 7, + .abilityBit = 1, + .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_DIVE, MOVE_RAIN_DANCE} + }, + { + .species = SPECIES_CROBAT, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_BITE} + }, + { + .species = SPECIES_GENGAR, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_SHADOW_PUNCH, MOVE_NIGHT_SHADE, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round3[] = +{ + { + .species = SPECIES_GROWLITHE, + .lvl = 13, + .abilityBit = 2, + .moves = {MOVE_FLAME_WHEEL, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_VULPIX, + .lvl = 13, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_MAGCARGO, + .lvl = 11, + .abilityBit = 1, + .moves = {MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_NINETALES, + .lvl = 11, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER, MOVE_NONE} + }, + { + .species = SPECIES_MEDICHAM, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_FIRE_PUNCH, MOVE_HI_JUMP_KICK, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_WEEZING, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_DUSCLOPS, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_MEAN_LOOK, MOVE_SHADOW_PUNCH} + }, + { + .species = SPECIES_HOUNDOOM, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_SOLAR_BEAM, MOVE_OVERHEAT} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round4[] = +{ + { + .species = SPECIES_DUNSPARCE, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_SPITE, MOVE_TOXIC, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_BANETTE, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_NONE} + }, + { + .species = SPECIES_MISDREAVUS, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_NONE} + }, + { + .species = SPECIES_NINETALES, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_OVERHEAT, MOVE_NONE} + }, + { + .species = SPECIES_ABSOL, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_BITE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_PROTECT} + }, + { + .species = SPECIES_DUSCLOPS, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_TOXIC, MOVE_SHADOW_BALL} + }, + { + .species = SPECIES_SHEDINJA, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_TOXIC, MOVE_SPITE, MOVE_NONE} + }, + { + .species = SPECIES_GENGAR, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_GRUDGE, MOVE_SPITE, MOVE_NIGHT_SHADE, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round5[] = +{ + { + .species = SPECIES_HAUNTER, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_NIGHT_SHADE, MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_NONE} + }, + { + .species = SPECIES_CHIMECHO, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_DOUBLE_EDGE, MOVE_TOXIC, MOVE_PSYCHIC, MOVE_PROTECT} + }, + { + .species = SPECIES_SOLROCK, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_TOXIC} + }, + { + .species = SPECIES_MISDREAVUS, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_SPITE, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT} + }, + { + .species = SPECIES_CLAYDOL, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SELF_DESTRUCT, MOVE_PSYCHIC} + }, + { + .species = SPECIES_WEEZING, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_SLUDGE_BOMB, MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_FLYGON, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH} + }, + { + .species = SPECIES_GENGAR, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_NIGHT_SHADE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round6[] = +{ + { + .species = SPECIES_DIGLETT, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_ROCK_SLIDE, MOVE_SLASH, MOVE_DIG, MOVE_NONE} + }, + { + .species = SPECIES_TRAPINCH, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_NONE} + }, + { + .species = SPECIES_WYNAUT, + .lvl = 8, + .abilityBit = 0, + .moves = {MOVE_DESTINY_BOND, MOVE_SPLASH, MOVE_COUNTER, MOVE_MIRROR_COAT} + }, + { + .species = SPECIES_DIGLETT, + .lvl = 8, + .abilityBit = 1, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_MAGNITUDE, MOVE_TOXIC} + }, + { + .species = SPECIES_TRAPINCH, + .lvl = 6, + .abilityBit = 1, + .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_PROTECT} + }, + { + .species = SPECIES_WYNAUT, + .lvl = 6, + .abilityBit = 0, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE} + }, + { + .species = SPECIES_WOBBUFFET, + .lvl = 5, + .abilityBit = 0, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND, MOVE_NONE} + }, + { + .species = SPECIES_DUGTRIO, + .lvl = 5, + .abilityBit = 1, + .moves = {MOVE_ROCK_SLIDE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_PROTECT} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round7[] = +{ + { + .species = SPECIES_GLALIE, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_SNEASEL, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_CRUSH_CLAW, MOVE_SPITE, MOVE_NONE} + }, + { + .species = SPECIES_DEWGONG, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_PILOSWINE, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_NONE} + }, + { + .species = SPECIES_JYNX, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_BLIZZARD, MOVE_LOVELY_KISS, MOVE_PSYCHIC, MOVE_NONE} + }, + { + .species = SPECIES_CLOYSTER, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_WALREIN, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_LAPRAS, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_SING, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_PSYCHIC} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round8[] = +{ + { + .species = SPECIES_WEEZING, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB, MOVE_FIRE_BLAST, MOVE_NONE} + }, + { + .species = SPECIES_ELECTRODE, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_SELF_DESTRUCT, MOVE_THUNDERBOLT, MOVE_ROLLOUT, MOVE_NONE} + }, + { + .species = SPECIES_GENGAR, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_DESTINY_BOND, MOVE_LICK, MOVE_SHADOW_BALL, MOVE_NONE} + }, + { + .species = SPECIES_GOLEM, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_SELF_DESTRUCT, MOVE_PROTECT, MOVE_EARTHQUAKE, MOVE_NONE} + }, + { + .species = SPECIES_PINECO, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_DOUBLE_EDGE, MOVE_GIGA_DRAIN, MOVE_NONE} + }, + { + .species = SPECIES_SOLROCK, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_FIRE_SPIN, MOVE_PSYWAVE, MOVE_NONE} + }, + { + .species = SPECIES_FORRETRESS, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_ROCK_SLIDE, MOVE_NONE} + }, + { + .species = SPECIES_SHIFTRY, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_PROTECT} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round9[] = +{ + { + .species = SPECIES_WOBBUFFET, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND} + }, + { + .species = SPECIES_METANG, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SLUDGE_BOMB, MOVE_PSYCHIC} + }, + { + .species = SPECIES_EXEGGUTOR, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_EGG_BOMB, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NONE} + }, + { + .species = SPECIES_SLOWKING, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER} + }, + { + .species = SPECIES_XATU, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_STEEL_WING} + }, + { + .species = SPECIES_ALAKAZAM, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_TOXIC} + }, + { + .species = SPECIES_STARMIE, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_ESPEON, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_DIG, MOVE_SHADOW_BALL, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round10[] = +{ + { + .species = SPECIES_GOLEM, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_SELF_DESTRUCT, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_STEELIX, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_IRON_TAIL, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_NONE} + }, + { + .species = SPECIES_OMASTAR, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_SURF, MOVE_MUD_SHOT, MOVE_ANCIENT_POWER, MOVE_NONE} + }, + { + .species = SPECIES_LUNATONE, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_HYPNOSIS, MOVE_PSYWAVE, MOVE_EXPLOSION, MOVE_NONE} + }, + { + .species = SPECIES_SHUCKLE, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_PROTECT, MOVE_WRAP, MOVE_NONE} + }, + { + .species = SPECIES_ARMALDO, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_ANCIENT_POWER, MOVE_PROTECT, MOVE_AERIAL_ACE, MOVE_NONE} + }, + { + .species = SPECIES_CRADILY, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_NONE} + }, + { + .species = SPECIES_AERODACTYL, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_ROCK_SLIDE, MOVE_BITE, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round11[] = +{ + { + .species = SPECIES_POLIWRATH, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_SUBMISSION, MOVE_FOCUS_PUNCH, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_HARIYAMA, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_FAKE_OUT, MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_NONE} + }, + { + .species = SPECIES_BRELOOM, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_MEDICHAM, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} + }, + { + .species = SPECIES_HITMONCHAN, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_FOCUS_PUNCH} + }, + { + .species = SPECIES_HITMONLEE, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_HERACROSS, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE} + }, + { + .species = SPECIES_MACHAMP, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_SEISMIC_TOSS} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round12[] = +{ + { + .species = SPECIES_QUAGSIRE, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_TROPIUS, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_PUPITAR, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_SANDSTORM, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_NONE} + }, + { + .species = SPECIES_LAPRAS, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_CACTURNE, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_SANDSTORM, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_NONE} + }, + { + .species = SPECIES_FLAREON, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_SUNNY_DAY, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_WALREIN, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_HAIL, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_GYARADOS, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_RAIN_DANCE, MOVE_THUNDER, MOVE_HYDRO_PUMP, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round13[] = +{ + { + .species = SPECIES_PINECO, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_SHUCKLE, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_VENOMOTH, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_SILVER_WIND, MOVE_POISON_POWDER, MOVE_SLEEP_POWDER, MOVE_PSYCHIC} + }, + { + .species = SPECIES_SCIZOR, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_QUICK_ATTACK, MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_PURSUIT} + }, + { + .species = SPECIES_HERACROSS, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE} + }, + { + .species = SPECIES_FORRETRESS, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_ARMALDO, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_WATER_PULSE, MOVE_PROTECT, MOVE_ROCK_SLIDE, MOVE_NONE} + }, + { + .species = SPECIES_SHEDINJA, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_SPITE, MOVE_GRUDGE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round14[] = +{ + { + .species = SPECIES_SABLEYE, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_NIGHT_SHADE, MOVE_PSYCHIC, MOVE_AERIAL_ACE, MOVE_NONE} + }, + { + .species = SPECIES_SNEASEL, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_TAUNT, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK} + }, + { + .species = SPECIES_CRAWDAUNT, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_CRABHAMMER, MOVE_ICE_BEAM, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_SHIFTRY, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_GIGA_DRAIN} + }, + { + .species = SPECIES_CACTURNE, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_NEEDLE_ARM, MOVE_NONE} + }, + { + .species = SPECIES_ABSOL, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_BITE, MOVE_PROTECT, MOVE_SLASH, MOVE_NONE} + }, + { + .species = SPECIES_HOUNDOOM, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_OVERHEAT, MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_PROTECT} + }, + { + .species = SPECIES_UMBREON, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_IRON_TAIL, MOVE_QUICK_ATTACK} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round15[] = +{ + { + .species = SPECIES_OCTILLERY, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_OCTAZOOKA, MOVE_ICE_BEAM, MOVE_FIRE_BLAST, MOVE_NONE} + }, + { + .species = SPECIES_DEWGONG, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_WATER_PULSE, MOVE_ICE_BEAM, MOVE_HEADBUTT, MOVE_NONE} + }, + { + .species = SPECIES_PELIPPER, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_PROTECT, MOVE_SUPERSONIC, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_QUAGSIRE, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SURF, MOVE_NONE} + }, + { + .species = SPECIES_LUDICOLO, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_TOXIC, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_SLOWKING, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_HEADBUTT, MOVE_SWAGGER, MOVE_NONE} + }, + { + .species = SPECIES_STARMIE, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_WATER_PULSE, MOVE_THUNDERBOLT, MOVE_CONFUSE_RAY, MOVE_BLIZZARD} + }, + { + .species = SPECIES_BLASTOISE, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_HYDRO_PUMP, MOVE_BITE, MOVE_ICE_BEAM, MOVE_NONE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round16[] = +{ + { + .species = SPECIES_DUSKULL, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_PROTECT} + }, + { + .species = SPECIES_HAUNTER, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_TOXIC, MOVE_SPITE, MOVE_HYPNOSIS, MOVE_SHADOW_BALL} + }, + { + .species = SPECIES_BANETTE, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_NONE} + }, + { + .species = SPECIES_MISDREAVUS, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_PERISH_SONG, MOVE_SPITE, MOVE_MEAN_LOOK, MOVE_NONE} + }, + { + .species = SPECIES_SABLEYE, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_MEAN_LOOK, MOVE_DIG, MOVE_NIGHT_SHADE} + }, + { + .species = SPECIES_DUSCLOPS, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_WILL_O_WISP, MOVE_TOXIC, MOVE_SHADOW_BALL, MOVE_NONE} + }, + { + .species = SPECIES_SHEDINJA, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_GRUDGE, MOVE_PROTECT} + }, + { + .species = SPECIES_GENGAR, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_PSYCHIC, MOVE_DESTINY_BOND, MOVE_SPITE, MOVE_NIGHT_SHADE} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round17[] = +{ + { + .species = SPECIES_MAWILE, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_CRUNCH, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} + }, + { + .species = SPECIES_MAGNETON, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_STEELIX, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_ROCK_THROW, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_NONE} + }, + { + .species = SPECIES_SCIZOR, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_METAL_CLAW, MOVE_SLASH, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_FORRETRESS, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_EXPLOSION, MOVE_TOXIC, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_SKARMORY, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_STEEL_WING, MOVE_TOXIC, MOVE_FLY, MOVE_PROTECT} + }, + { + .species = SPECIES_AGGRON, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_TAKE_DOWN, MOVE_SURF, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_METAGROSS, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round18[] = +{ + { + .species = SPECIES_DRAGONAIR, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_THUNDER_WAVE, MOVE_TOXIC, MOVE_ICE_BEAM, MOVE_NONE} + }, + { + .species = SPECIES_VIBRAVA, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_STEEL_WING} + }, + { + .species = SPECIES_ALTARIA, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_SING, MOVE_PROTECT} + }, + { + .species = SPECIES_FLYGON, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FIRE_BLAST, MOVE_NONE} + }, + { + .species = SPECIES_AERODACTYL, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_CLAW, MOVE_NONE} + }, + { + .species = SPECIES_GYARADOS, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_SURF, MOVE_THRASH, MOVE_BITE} + }, + { + .species = SPECIES_KINGDRA, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_CHARIZARD, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH, MOVE_FIRE_BLAST, MOVE_IRON_TAIL} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round19[] = +{ + { + .species = SPECIES_ARCANINE, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_FIRE_BLAST, MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_POLIWRATH, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_RAICHU, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_SLAM, MOVE_NONE} + }, + { + .species = SPECIES_VAPOREON, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_JOLTEON, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_THUNDERBOLT, MOVE_PIN_MISSILE, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_FLAREON, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_NONE, MOVE_NONE} + }, + { + .species = SPECIES_NINETALES, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_FLAMETHROWER, MOVE_WILL_O_WISP, MOVE_PROTECT, MOVE_NONE} + }, + { + .species = SPECIES_STARMIE, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC} + } +}; + +const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round20[] = +{ + { + .species = SPECIES_KANGASKHAN, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_SURF, MOVE_DIZZY_PUNCH} + }, + { + .species = SPECIES_SWELLOW, + .lvl = 10, + .abilityBit = 2, + .moves = {MOVE_AERIAL_ACE, MOVE_HYPER_BEAM, MOVE_TOXIC, MOVE_NONE} + }, + { + .species = SPECIES_URSARING, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_PROTECT} + }, + { + .species = SPECIES_PORYGON2, + .lvl = 8, + .abilityBit = 2, + .moves = {MOVE_PSYBEAM, MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} + }, + { + .species = SPECIES_TAUROS, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF, MOVE_THUNDERBOLT} + }, + { + .species = SPECIES_FEAROW, + .lvl = 6, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_FLY, MOVE_MIRROR_MOVE, MOVE_PROTECT} + }, + { + .species = SPECIES_SNORLAX, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE} + }, + { + .species = SPECIES_SLAKING, + .lvl = 5, + .abilityBit = 2, + .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_BEAM} + } +}; + +const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[] = +{ + gBattlePyramidOpenLevelWildMons_Round1, + gBattlePyramidOpenLevelWildMons_Round2, + gBattlePyramidOpenLevelWildMons_Round3, + gBattlePyramidOpenLevelWildMons_Round4, + gBattlePyramidOpenLevelWildMons_Round5, + gBattlePyramidOpenLevelWildMons_Round6, + gBattlePyramidOpenLevelWildMons_Round7, + gBattlePyramidOpenLevelWildMons_Round8, + gBattlePyramidOpenLevelWildMons_Round9, + gBattlePyramidOpenLevelWildMons_Round10, + gBattlePyramidOpenLevelWildMons_Round11, + gBattlePyramidOpenLevelWildMons_Round12, + gBattlePyramidOpenLevelWildMons_Round13, + gBattlePyramidOpenLevelWildMons_Round14, + gBattlePyramidOpenLevelWildMons_Round15, + gBattlePyramidOpenLevelWildMons_Round16, + gBattlePyramidOpenLevelWildMons_Round17, + gBattlePyramidOpenLevelWildMons_Round18, + gBattlePyramidOpenLevelWildMons_Round19, + gBattlePyramidOpenLevelWildMons_Round20 +}; diff --git a/src/frontier_data.c b/src/frontier_data.c new file mode 100644 index 000000000..8a78bb57b --- /dev/null +++ b/src/frontier_data.c @@ -0,0 +1,237 @@ +#include "global.h" + +#include "battle_pyramid.h" + +#include "constants/moves.h" +#include "constants/species.h" +#include "constants/items.h" + + + +#include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h" +#include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h" + + + +const struct Struct_08613650 gUnknown_08613650[] = +{ + { + .unk0 = 0x07, + .unk1 = 0x03, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x80, + .unk5 = {0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03} + }, + { + .unk0 = 0x06, + .unk1 = 0x03, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x80, + .unk5 = {0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04} + }, + { + .unk0 = 0x05, + .unk1 = 0x03, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x78, + .unk5 = {0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05} + }, + { + .unk0 = 0x04, + .unk1 = 0x04, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x78, + .unk5 = {0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06} + }, + { + .unk0 = 0x04, + .unk1 = 0x04, + .unk2 = 0x00, + .unk3 = 0x01, + .runMultiplier = 0x70, + .unk5 = {0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07} + }, + { + .unk0 = 0x03, + .unk1 = 0x05, + .unk2 = 0x00, + .unk3 = 0x02, + .runMultiplier = 0x70, + .unk5 = {0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c} + }, + { + .unk0 = 0x03, + .unk1 = 0x05, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x68, + .unk5 = {0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d} + }, + { + .unk0 = 0x02, + .unk1 = 0x04, + .unk2 = 0x00, + .unk3 = 0x01, + .runMultiplier = 0x68, + .unk5 = {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e} + }, + { + .unk0 = 0x04, + .unk1 = 0x05, + .unk2 = 0x00, + .unk3 = 0x02, + .runMultiplier = 0x60, + .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f} + }, + { + .unk0 = 0x03, + .unk1 = 0x06, + .unk2 = 0x00, + .unk3 = 0x04, + .runMultiplier = 0x60, + .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f} + }, + { + .unk0 = 0x02, + .unk1 = 0x03, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x58, + .unk5 = {0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d} + }, + { + .unk0 = 0x04, + .unk1 = 0x05, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x58, + .unk5 = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b} + }, + { + .unk0 = 0x03, + .unk1 = 0x07, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x50, + .unk5 = {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c} + }, + { + .unk0 = 0x02, + .unk1 = 0x04, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x50, + .unk5 = {0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d} + }, + { + .unk0 = 0x03, + .unk1 = 0x06, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x50, + .unk5 = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e} + }, + { + .unk0 = 0x03, + .unk1 = 0x08, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x50, + .unk5 = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f} + } +}; + +const u8 gUnknown_08613750[34][2] = +{ + {0x28, 0x00}, + {0x46, 0x01}, + {0x5a, 0x02}, + {0x64, 0x03}, + {0x23, 0x01}, + {0x37, 0x02}, + {0x4b, 0x03}, + {0x5a, 0x04}, + {0x64, 0x0a}, + {0x23, 0x02}, + {0x37, 0x03}, + {0x4b, 0x04}, + {0x5a, 0x05}, + {0x64, 0x0b}, + {0x23, 0x03}, + {0x37, 0x04}, + {0x4b, 0x05}, + {0x5a, 0x06}, + {0x64, 0x0c}, + {0x23, 0x04}, + {0x37, 0x05}, + {0x4b, 0x06}, + {0x5a, 0x07}, + {0x64, 0x0d}, + {0x23, 0x05}, + {0x37, 0x06}, + {0x4b, 0x07}, + {0x5a, 0x08}, + {0x64, 0x0e}, + {0x23, 0x06}, + {0x37, 0x07}, + {0x4b, 0x08}, + {0x5a, 0x09}, + {0x64, 0x0f} +}; + +const u8 gUnknown_08613794[] = +{ + 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00 +}; + +const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = +{ + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, +}; + +const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = +{ + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, +}; diff --git a/src/frontier_util.c b/src/frontier_util.c index a65d14784..7ac2e6fa7 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -49,12 +49,8 @@ struct FrontierBrainMon }; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; -extern const u8 *const gUnknown_08611D08[]; -extern const u8 *const gUnknown_08611CB0[][2]; -extern const u8 *const gUnknown_08611D00[]; -extern const u8 *const *const gUnknown_08611DB0[]; -extern const u8 *const *const gUnknown_08611DB8[]; -extern const u16 gFacilityToBrainTrainerId[]; +//extern const u8 *const *const gUnknown_08611DB0[]; +//extern const u8 *const *const gUnknown_08611DB8[]; extern void sub_81B8558(void); @@ -689,6 +685,132 @@ const u16 gFrontierBannedSpecies[] = SPECIES_MEW, SPECIES_MEWTWO, SPECIES_HO_OH, SPECIES_LUGIA, SPECIES_CELEBI, SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF }; + +const u8 *const gUnknown_08611CB0[][2] = +{ + {gText_BattleTower2, gUnknown_085ED164}, + {gText_BattleTower2, gUnknown_085ED170}, + {gText_BattleTower2, gUnknown_085ED17C}, + {gText_BattleDome, gUnknown_085ED164}, + {gText_BattlePalace, gUnknown_085ED164}, + {gText_BattleArena, gUnknown_085ED190}, + {gText_BattleFactory, gUnknown_085ED164}, + {gText_BattlePike, gUnknown_085ED190}, + {gText_BattlePyramid, gUnknown_085ED190}, + {gText_BattleTower2, gUnknown_085ED188}, +}; + +const u8 *const gLevelModeText[] = +{ + gText_RecordsLv50, + gText_RecordsOpenLevel, +}; + +const u8 *const gFacilityToRecordsText[] = +{ + gText_FrontierFacilityWinStreak, + gText_FrontierFacilityWinStreak, + gText_FrontierFacilityWinStreak, + gText_FrontierFacilityClearStreak, + gText_FrontierFacilityWinStreak, + gText_FrontierFacilityKOsStreak, + gText_FrontierFacilityWinStreak, + gText_FrontierFacilityRoomsCleared, + gText_FrontierFacilityFloorsCleared, + gText_FrontierFacilityWinStreak, +}; + +const u16 gFacilityToBrainTrainerId[] = +{ + [FRONTIER_FACILITY_TOWER] = TRAINER_ANABEL, + [FRONTIER_FACILITY_DOME] = TRAINER_TUCKER, + [FRONTIER_FACILITY_PALACE] = TRAINER_SPENSER, + [FRONTIER_FACILITY_ARENA] = TRAINER_GRETA, + [FRONTIER_FACILITY_FACTORY] = TRAINER_NOLAND, + [FRONTIER_FACILITY_PIKE] = TRAINER_LUCY, + [FRONTIER_FACILITY_PYRAMID] = TRAINER_BRANDON, +}; + +const u8 *const gUnknown_08611D40[] = +{ + gText_082C843F, + gText_082C848B, + gText_082C8628, + gText_082C85B4, + gText_082C8512, + gText_082C859D, + gText_082C86C3, +}; + +const u8 *const gUnknown_08611D5C[] = +{ + gText_082C8458, + gText_082C84C1, + gText_082C8662, + gText_082C85E3, + gText_082C853B, + gText_082C85A4, + gText_082C86FE, +}; + +const u8 *const gUnknown_08611D78[] = +{ + gText_082C846C, + gText_082C84D0, + gText_082C8682, + gText_082C85F5, + gText_082C8561, + gText_082C85A9, + gText_082C8739, +}; + +const u8 *const gUnknown_08611D94[] = +{ + gText_082C8480, + gText_082C84F7, + gText_082C86B3, + gText_082C8611, + gText_082C8589, + gText_082C85AE, + gText_082C877B, +}; + +const u8 *const *const gUnknown_08611DB0[] = +{ + gUnknown_08611D40, + gUnknown_08611D78, +}; + +const u8 *const *const gUnknown_08611DB8[] = +{ + gUnknown_08611D5C, + gUnknown_08611D94, +}; + + + + + + + + + + + + + + + + + + + + + + + + + // code void CallFrontierUtilFunc(void) @@ -2129,8 +2251,8 @@ static void Print1PRecord(s32 position, s32 x, s32 y, struct RankingHall1P *hall if (winStreak > 9999) winStreak = 9999; ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gUnknown_08611D08[hallFacilityId]); - AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gUnknown_08611D08[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL); + StringExpandPlaceholders(gStringVar4, gFacilityToRecordsText[hallFacilityId]); + AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL); } } @@ -2156,8 +2278,8 @@ static void Print2PRecord(s32 position, s32 x, s32 y, struct RankingHall2P *hall if (winStreak > 9999) winStreak = 9999; ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gUnknown_08611D08[9]); - AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gUnknown_08611D08[9], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL); + StringExpandPlaceholders(gStringVar4, gFacilityToRecordsText[9]); + AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gFacilityToRecordsText[9], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL); } } @@ -2239,8 +2361,8 @@ static void PrintHallRecords(s32 hallFacilityId, s32 lvlMode) StringCopy(gStringVar1, gUnknown_08611CB0[hallFacilityId][0]); StringExpandPlaceholders(gStringVar4, gUnknown_08611CB0[hallFacilityId][1]); AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, NULL); - x = GetStringRightAlignXOffset(1, gUnknown_08611D00[lvlMode], 0xD0); - AddTextPrinterParameterized(gRecordsWindowId, 1, gUnknown_08611D00[lvlMode], x, 1, TEXT_SPEED_FF, NULL); + x = GetStringRightAlignXOffset(1, gLevelModeText[lvlMode], 0xD0); + AddTextPrinterParameterized(gRecordsWindowId, 1, gLevelModeText[lvlMode], x, 1, TEXT_SPEED_FF, NULL); if (hallFacilityId == HALL_FACILITIES_COUNT) { gSaveBlock2Ptr->frontier.field_EE1[0][PLAYER_NAME_LENGTH] = EOS; diff --git a/src/strings.c b/src/strings.c index 9cb384e70..72aedde6e 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1265,6 +1265,7 @@ const u8 gUnknown_085ED188[] = _("{STR_VAR_1} LINK"); asm(".align 2"); const u8 gUnknown_085ED190[] = _("{STR_VAR_1}"); + const u8 gText_Give[] = _("Give"); const u8 gText_NoNeed[] = _("No need"); const u8 gText_ColorLightShadowDarkGrey[] = _("{COLOR LIGHT_GREY}{SHADOW DARK_GREY}"); @@ -1548,25 +1549,25 @@ const u8 gText_TimesVar1[] = _("Times: {STR_VAR_1}"); const u8 gText_FloorsCleared[] = _("Floors cleared: {STR_VAR_1}"); asm(".align 2"); -const u8 gUnknown_085EE3B0[] = _("LV. 50"); +const u8 gText_RecordsLv50[] = _("LV. 50"); asm(".align 2"); -const u8 gUnknown_085EE3B8[] = _("OPEN LEVEL"); +const u8 gText_RecordsOpenLevel[] = _("OPEN LEVEL"); asm(".align 2"); -const u8 gUnknown_085EE3C4[] = _("Win streak: {STR_VAR_2}"); +const u8 gText_FrontierFacilityWinStreak[] = _("Win streak: {STR_VAR_2}"); asm(".align 2"); -const u8 gUnknown_085EE3D4[] = _("Clear streak: {STR_VAR_2}"); +const u8 gText_FrontierFacilityClearStreak[] = _("Clear streak: {STR_VAR_2}"); asm(".align 2"); -const u8 gUnknown_085EE3E8[] = _("Rooms cleared: {STR_VAR_2}"); +const u8 gText_FrontierFacilityRoomsCleared[] = _("Rooms cleared: {STR_VAR_2}"); asm(".align 2"); -const u8 gUnknown_085EE3FC[] = _("KOs in a row: {STR_VAR_2}"); +const u8 gText_FrontierFacilityKOsStreak[] = _("KOs in a row: {STR_VAR_2}"); asm(".align 2"); -const u8 gUnknown_085EE410[] = _("Floors cleared: {STR_VAR_2}"); +const u8 gText_FrontierFacilityFloorsCleared[] = _("Floors cleared: {STR_VAR_2}"); asm(".align 2"); const u8 gText_123Dot[][3] = {_("1."), _("2."), _("3.")}; -- cgit v1.2.3 From a636005066c59741f571af977c7677810273b8bf Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 27 Nov 2018 11:40:29 -0500 Subject: delete createsprite.py --- data/createsprite.py | 85 ---------------------------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 data/createsprite.py diff --git a/data/createsprite.py b/data/createsprite.py deleted file mode 100644 index 8af44aa55..000000000 --- a/data/createsprite.py +++ /dev/null @@ -1,85 +0,0 @@ -import math - -inFile = "battle_anim_scripts.s" -#outFile = "createsprite.txt" -outFile = "battle_anim_scripts.s" - -fIN = open(inFile, 'r') - -ANIM_BANK_ATTACKER = 0b00000000 -ANIM_BANK_TARGET = 0b10000000 -ONE = 0b1111111 - -# -inLines = fIN.readlines() - -text = "" - -count = 0 - -uniques = set() - -def lsb(n): - return 0 - -# createsprite2 gBattleAnimSpriteTemplate_83D96F8, ANIM_BANK_ATTACKER, 40, 200, -32, 0, 100, 0 -# createsprite gBattleAnimSpriteTemplate_83D96F8, 40, 200, -32, 0, 100, 0 - -# createsprite2 gBattleAnimSpriteTemplate_83DAC10, ANIM_BANK_ATTACKER, 66, 0 -# createsprite gBattleAnimSpriteTemplate_83DAC10, 66, 0 - -# line 3891 -for line in inLines: - count += 1 - if (not line.startswith("\tcreatesprite")):# or (count > 500): # 3890 < x < 3899 - text += line - - else: - split = line.replace(',','').strip().split() - #print(split[3:-1]) - - text += '\t' - text += "createsprite2 " + split[1] + ', ' - - #try: - combined = int(split[2], 0) - #except: - # combined = int(split[2], 0) - - battler = combined - uniques.add((battler, battler & ONE)) - #priority = str(lsb(battler)) - - if battler & ANIM_BANK_TARGET: - battler_txt = "ANIM_BANK_TARGET" - priority_txt = str(battler & ONE) - - else: - battler_txt = "ANIM_BANK_ATTACKER" #split[2] | battler - priority_txt = str(battler & ONE) - - text += battler_txt + ', ' + priority_txt + ', ' - - # createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - # createsprite2 gBasicHitSplatSpriteTemplate, ANIM_BANK_ATTACKER, 2, 0, 0, 1, 2 - - # .if battler == ANIM_BANK_TARGET - # .byte 0x80 | (subpriority_offset & 0x3F) - # .else - # .byte (subpriority_offset & 0x3F) - - if len(split) > 3: - for item in split[3:-1]: - text += item + ', ' - text += split[-1] + '\n' - - else: - text = text[:-2] + '\n' - -print(uniques) - -fOUT = open(outFile, 'w') -fOUT.write(text) - -fIN.close() -fOUT.close() -- cgit v1.2.3 From 2707bd9b91f374fc0747a8e42670ec5c3292cddb Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 27 Nov 2018 13:27:49 -0500 Subject: clean frontier data --- data/mossdeep_gym.s | 4 ---- src/battle_pike.c | 3 --- src/frontier_data.c | 4 ---- src/frontier_util.c | 27 --------------------------- 4 files changed, 38 deletions(-) diff --git a/data/mossdeep_gym.s b/data/mossdeep_gym.s index 59698dea6..01eb792b7 100644 --- a/data/mossdeep_gym.s +++ b/data/mossdeep_gym.s @@ -1,8 +1,4 @@ -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" .include "asm/macros.inc" - .include "constants/constants.inc" .section .rodata diff --git a/src/battle_pike.c b/src/battle_pike.c index 21e7a0614..c11850285 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -104,9 +104,6 @@ static bool8 sub_81A7D8C(struct Task *task); static bool8 sub_81A7DE8(struct Task *task); // Const rom data. - -// extern const struct PikeWildMon *const *const gUnknown_08612314[2]; - const struct PikeWildMon gUnknown_086121D4[] = { { diff --git a/src/frontier_data.c b/src/frontier_data.c index 8a78bb57b..e79bf07fb 100644 --- a/src/frontier_data.c +++ b/src/frontier_data.c @@ -6,13 +6,9 @@ #include "constants/species.h" #include "constants/items.h" - - #include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h" #include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h" - - const struct Struct_08613650 gUnknown_08613650[] = { { diff --git a/src/frontier_util.c b/src/frontier_util.c index d90628184..7ba8746a1 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -49,8 +49,6 @@ struct FrontierBrainMon }; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; -//extern const u8 *const *const gUnknown_08611DB0[]; -//extern const u8 *const *const gUnknown_08611DB8[]; extern void sub_81B8558(void); @@ -787,31 +785,6 @@ const u8 *const *const gUnknown_08611DB8[] = gUnknown_08611D94, }; - - - - - - - - - - - - - - - - - - - - - - - - - // code void CallFrontierUtilFunc(void) { -- cgit v1.2.3 From 7cfe0342f0d56022e882324a06aaf129d621647c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 27 Nov 2018 22:45:50 +0100 Subject: Finish frontier data --- data/battle_frontier_3.s | 411 ------------ include/battle_pyramid.h | 42 -- include/event_scripts.h | 11 +- include/frontier_util.h | 2 + include/strings.h | 128 ++++ ld_script.txt | 2 - src/battle_pike.c | 49 +- src/battle_pyramid.c | 696 ++++++++++++++++++++- .../battle_pyramid_level_50_wild_mons.h | 82 +-- .../battle_pyramid_open_level_wild_mons.h | 82 +-- src/frontier_data.c | 233 ------- src/frontier_util.c | 32 +- 12 files changed, 948 insertions(+), 822 deletions(-) delete mode 100644 data/battle_frontier_3.s delete mode 100644 src/frontier_data.c diff --git a/data/battle_frontier_3.s b/data/battle_frontier_3.s deleted file mode 100644 index b83af6f28..000000000 --- a/data/battle_frontier_3.s +++ /dev/null @@ -1,411 +0,0 @@ -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_08613ABC:: @ 8613ABC - .byte 0x1f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x0f, 0x00, 0x2e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06 - .byte 0x61, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3d, 0x02, 0x47, 0x03, 0x51, 0x04, 0x5b, 0x05, 0x5e, 0x06, 0x61, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04 - .byte 0x58, 0x05, 0x5c, 0x07, 0x60, 0x08, 0x64, 0x09, 0x0f, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x07, 0x64, 0x09, 0x0f, 0x00, 0x1e, 0x01, 0x3a, 0x02 - .byte 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x07, 0x64, 0x08, 0x1c, 0x00, 0x2b, 0x01, 0x3a, 0x02, 0x44, 0x03, 0x4e, 0x04, 0x58, 0x05, 0x5c, 0x06, 0x60, 0x08, 0x64, 0x09 - -gUnknown_08613B3A:: @ 8613B3A - .byte 0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_08613B44:: @ 8613B44 - .byte 0x03, 0x06 - - .align 2 - .byte 0x0b, 0x06 - - .align 2 - .byte 0x0d, 0x06 - - .align 2 - .byte 0x0f, 0x01 - - .align 2 - .byte 0x2b, 0x04 - - .align 2 - .byte 0x2d, 0x01 - - .align 2 - .byte 0x24, 0x09 - - .align 2 - .byte 0x29, 0x04 - - .align 2 - .byte 0x05, 0x05 - - .align 2 - .byte 0x18, 0x04 - - .align 2 - .byte 0x2f, 0x00 - - .align 2 - .byte 0x2e, 0x09 - - .align 2 - .byte 0x11, 0x0c - - .align 2 - .byte 0x10, 0x0b - - .align 2 - .byte 0x1e, 0x0d - - .align 2 - .byte 0x08, 0x01 - - .align 2 - .byte 0x17, 0x03 - - .align 2 - .byte 0x0c, 0x04 - - .align 2 - .byte 0x38, 0x04 - - .align 2 - .byte 0x1c, 0x03 - - .align 2 - .byte 0x1a, 0x00 - - .align 2 - .byte 0x19, 0x0b - - .align 2 - .byte 0x09, 0x07 - - .align 2 - .byte 0x31, 0x07 - - .align 2 - .byte 0x35, 0x07 - - .align 2 - .byte 0x36, 0x01 - - .align 2 - .byte 0x33, 0x00 - - .align 2 - .byte 0x2a, 0x03 - - .align 2 - .byte 0x16, 0x0d - - .align 2 - .byte 0x0e, 0x03 - - .align 2 - .byte 0x15, 0x01 - - .align 2 - .byte 0x14, 0x01 - - .align 2 - .byte 0x2c, 0x01 - - .align 2 - .byte 0x1b, 0x02 - - .align 2 - .byte 0x04, 0x01 - - .align 2 - .byte 0x07, 0x03 - - .align 2 - .byte 0x34, 0x05 - - .align 2 - .byte 0x32, 0x00 - - .align 2 - .byte 0x37, 0x02 - - .align 2 - .byte 0x1d, 0x04 - - .align 2 - .byte 0x22, 0x09 - - .align 2 - .byte 0x1f, 0x01 - - .align 2 - .byte 0x25, 0x00 - - .align 2 - .byte 0x0a, 0x04 - - .align 2 - .byte 0x28, 0x00 - - .align 2 - .byte 0x06, 0x05 - - .align 2 - .byte 0x27, 0x0b - - .align 2 - .byte 0x26, 0x00 - - .align 2 - .byte 0x13, 0x00 - - .align 2 - .byte 0x12, 0x02 - - .align 2 - .byte 0x39, 0x08 - - .align 2 - .byte 0x02, 0x0b - - .align 2 - .byte 0x20, 0x01 - - .align 2 - .byte 0x21, 0x00 - - .align 2 -gUnknown_08613C1C:: @ 8613C1C - .byte 0x0d, 0x03, 0x0e, 0x04, 0x10, 0x01, 0x11, 0x00, 0x03, 0x02, 0x12, 0x03, 0x0c, 0x03, 0x13, 0x03, 0x14, 0x03, 0x15, 0x02, 0x17, 0x02, 0x07, 0x02, 0x0a, 0x04, 0x19, 0x02, 0x1a, 0x02, 0x1b, 0x00 - .byte 0x1d, 0x02, 0x1e, 0x02, 0x1f, 0x03, 0x20, 0x04, 0x26, 0x00, 0x27, 0x01, 0x29, 0x04, 0x2a, 0x05, 0x09, 0x04, 0x16, 0x05, 0x2b, 0x00, 0x2d, 0x04, 0x2e, 0x02, 0x30, 0x02, 0x32, 0x02, 0x31, 0x03 - .byte 0x2f, 0x03, 0x33, 0x03, 0x34, 0x02, 0x04, 0x02, 0x35, 0x00, 0x36, 0x03, 0x37, 0x03, 0x38, 0x03, 0x1c, 0x01, 0x3a, 0x02, 0x05, 0x02, 0x42, 0x02, 0x02, 0x03, 0x44, 0x02, 0x45, 0x03, 0x47, 0x03 - .byte 0x43, 0x00, 0x00, 0x04 - - .align 2 -gUnknown_08613C80:: @ 8613C80 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D2D - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D57 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252D81 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252DAB - - .align 2 -gUnknown_08613C90:: @ 8613C90 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25330B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2532CC - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25328B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253248 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253206 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2531C4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253183 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253140 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530FD - - .align 2 -gUnknown_08613CB4:: @ 8613CB4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2544A6 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25445A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25440B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2543BA - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25436A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25431A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2542CB - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25427A - - .align 2 -gUnknown_08613CD4:: @ 8613CD4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252DD5 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E03 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E31 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E5F - - .align 2 -gUnknown_08613CE4:: @ 8613CE4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25362E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2535D4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253578 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25351A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2534BD - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253460 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253404 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2533A6 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25334D - - .align 2 -gUnknown_08613D08:: @ 8613D08 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25471E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2546CC - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25467C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25462A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2545D9 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254588 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254538 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2544E6 - - .align 2 -gUnknown_08613D28:: @ 8613D28 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252E8D - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EAA - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EC7 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252EE4 - - .align 2 -gUnknown_08613D38:: @ 8613D38 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2539EC - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253980 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253915 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2538A8 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25383C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2537D0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253765 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2536F8 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25368B - - .align 2 -gUnknown_08613D5C:: @ 8613D5C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A0B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2549AE - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25494D - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2548EB - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25488A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254829 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2547C9 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254767 - - .align 2 -gUnknown_08613D7C:: @ 8613D7C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F01 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F3A - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252F73 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252FAC - - .align 2 -gUnknown_08613D8C:: @ 8613D8C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253D3E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253CE0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253C87 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253C2C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253BD2 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253B78 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253B1F - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253AC4 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253A69 - - .align 2 -gUnknown_08613DB0:: @ 8613DB0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254C3E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254BF1 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254BAE - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254B69 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254B25 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254AE1 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A9E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254A59 - - .align 2 -gUnknown_08613DD0:: @ 8613DD0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_252FE5 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253000 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25301B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253036 - - .align 2 -gUnknown_08613DE0:: @ 8613DE0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253F6C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253F34 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253EFA - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253EBE - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E83 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E48 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253E0E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253DD2 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253D96 - - .align 2 -gUnknown_08613E04:: @ 8613E04 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254E6E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254E27 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254DE0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D97 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D4F - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254D07 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254CC0 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254C77 - - .align 2 -gUnknown_08613E24:: @ 8613E24 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253051 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25307C - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530A7 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2530D2 - - .align 2 -gUnknown_08613E34:: @ 8613E34 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25422B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2541DD - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25418D - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25413B - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_2540EA - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254099 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254049 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253FF7 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_253FA5 - - .align 2 -gUnknown_08613E58:: @ 8613E58 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_255068 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_25502F - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254FF6 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254FBB - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F81 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F47 - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254F0E - .4byte BattleFrontier_BattlePyramidEmptySquare_Text_254ED3 - - .align 2 -gUnknown_08613E78:: @ 8613E78 - .4byte gUnknown_08613C80 - .4byte gUnknown_08613C90 - .4byte gUnknown_08613CB4 - - .align 2 -gUnknown_08613E84:: @ 8613E84 - .4byte gUnknown_08613CD4 - .4byte gUnknown_08613CE4 - .4byte gUnknown_08613D08 - - .align 2 -gUnknown_08613E90:: @ 8613E90 - .4byte gUnknown_08613D28 - .4byte gUnknown_08613D38 - .4byte gUnknown_08613D5C - - .align 2 -gUnknown_08613E9C:: @ 8613E9C - .4byte gUnknown_08613D7C - .4byte gUnknown_08613D8C - .4byte gUnknown_08613DB0 - - .align 2 -gUnknown_08613EA8:: @ 8613EA8 - .4byte gUnknown_08613DD0 - .4byte gUnknown_08613DE0 - .4byte gUnknown_08613E04 - - .align 2 -gUnknown_08613EB4:: @ 8613EB4 - .4byte gUnknown_08613E24 - .4byte gUnknown_08613E34 - .4byte gUnknown_08613E58 - - .align 2 -gUnknown_08613EC0:: @ 8613EC0 - .4byte gUnknown_08613E78 - .4byte gUnknown_08613E84 - .4byte gUnknown_08613E90 - .4byte gUnknown_08613E9C - .4byte gUnknown_08613EA8 - .4byte gUnknown_08613EB4 diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index 8d8e01bfb..5d38e9f35 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -1,33 +1,6 @@ #ifndef GUARD_BATTLE_PYRAMID_H #define GUARD_BATTLE_PYRAMID_H -#define TOTAL_ROUNDS 20 -#define PICKUP_ITEMS_PER_ROUND 10 - -struct PyramidWildMon -{ - u16 species; - u8 lvl; - u8 abilityBit; - u16 moves[4]; -}; - -struct Struct_08613650 -{ - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 runMultiplier; - u8 unk5[8]; -}; - -struct ClassMusic -{ - u8 class; - u8 music; -}; - void CallBattlePyramidFunction(void); u16 LocalIdToPyramidTrainerId(u8 localId); bool8 GetBattlePyramidTrainerFlag(u8 eventId); @@ -48,19 +21,4 @@ void sub_81AA2F8(void); u8 sub_81AAA40(void); u16 GetBattlePyramidPickupItemId(void); -// Const rom data. -extern const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; -extern const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND]; -extern const u8 gUnknown_08613ABC[63][2]; -extern const u8 gUnknown_08613B3A[]; -extern const u16 gUnknown_08D856C8[][16]; -extern const u8 gUnknown_08613C1C[50][2]; -extern const u8 *const *const *const gUnknown_08613EC0[]; -extern const struct ClassMusic gUnknown_08613B44[54]; -extern const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[]; -extern const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[]; -extern const struct Struct_08613650 gUnknown_08613650[]; -extern const u8 gUnknown_08613750[34][2]; -extern const u8 gUnknown_08613794[]; - #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/event_scripts.h b/include/event_scripts.h index dd0eca12f..058cec39b 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1,7 +1,3 @@ -// -// Created by scott on 9/12/2017. -// - #ifndef GUARD_EVENT_SCRIPTS_H #define GUARD_EVENT_SCRIPTS_H @@ -578,4 +574,9 @@ extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[]; extern const u8 SSTidalCorridor_EventScript_23C050[]; extern const u8 gUnknown_082A8350[]; -#endif //GUARD_EVENT_SCRIPTS_H +// Battle Pyramid. +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[]; + +#endif // GUARD_EVENT_SCRIPTS_H diff --git a/include/frontier_util.h b/include/frontier_util.h index 6b6a2ea39..9464ba91c 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -29,4 +29,6 @@ u8 GetFrontierBrainMonNature(u8 monId); u8 GetFrontierBrainMonEvs(u8 monId, u8 evStatId); s32 GetFronterBrainSymbol(void); +extern const u16 gFrontierBannedSpecies[]; + #endif // GUARD_FRONTIER_UTIL_H diff --git a/include/strings.h b/include/strings.h index 1649910cc..887ccdfe6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1275,4 +1275,132 @@ extern const u8 gText_082C8589[]; extern const u8 gText_082C85AE[]; extern const u8 gText_082C877B[]; +// Battle Pyramid. +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D81[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DAB[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25330B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2532CC[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25328B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253248[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253206[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2531C4[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253183[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253140[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530FD[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544A6[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25445A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25440B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2543BA[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25436A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25431A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2542CB[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25427A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DD5[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E03[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E31[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E5F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25362E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2535D4[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253578[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25351A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2534BD[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253460[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253404[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2533A6[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25334D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25471E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2546CC[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25467C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25462A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2545D9[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254588[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254538[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544E6[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E8D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EAA[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EC7[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EE4[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2539EC[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253980[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253915[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2538A8[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25383C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2537D0[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253765[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2536F8[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25368B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A0B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2549AE[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25494D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2548EB[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25488A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254829[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2547C9[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254767[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F01[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F3A[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F73[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FAC[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D3E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253CE0[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C87[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C2C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253BD2[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B78[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B1F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253AC4[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253A69[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C3E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BF1[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BAE[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B69[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B25[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254AE1[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A9E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A59[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FE5[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253000[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25301B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253036[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F6C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F34[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EFA[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EBE[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E83[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E48[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E0E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253DD2[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D96[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E6E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E27[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254DE0[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D97[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D4F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D07[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254CC0[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C77[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253051[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25307C[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530A7[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530D2[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25422B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2541DD[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25418D[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25413B[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2540EA[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254099[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254049[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FF7[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FA5[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_255068[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25502F[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FF6[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FBB[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F81[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F47[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F0E[]; +extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254ED3[]; + #endif //GUARD_STRINGS_H diff --git a/ld_script.txt b/ld_script.txt index c385ba2c1..4a8032174 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -577,8 +577,6 @@ SECTIONS { src/battle_factory.o(.rodata); src/battle_pike.o(.rodata); data/mossdeep_gym.o(.rodata); - src/frontier_data.o(.rodata); - data/battle_frontier_3.o(.rodata); src/battle_pyramid.o(.rodata); src/item_menu.o(.rodata); src/list_menu.o(.rodata); diff --git a/src/battle_pike.c b/src/battle_pike.c index c11850285..38d3e7d4a 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -41,7 +41,6 @@ struct Unk0861231C u8 unk2; u8 unk3; u8 unk4; - u8 unk5;//? unused ? }; struct PikeWildMon @@ -104,7 +103,7 @@ static bool8 sub_81A7D8C(struct Task *task); static bool8 sub_81A7DE8(struct Task *task); // Const rom data. -const struct PikeWildMon gUnknown_086121D4[] = +static const struct PikeWildMon sLvl50_Mons1[] = { { .species = SPECIES_SEVIPER, @@ -123,7 +122,7 @@ const struct PikeWildMon gUnknown_086121D4[] = } }; -const struct PikeWildMon gUnknown_086121F8[] = +static const struct PikeWildMon sLvl50_Mons2[] = { { .species = SPECIES_SEVIPER, @@ -142,7 +141,7 @@ const struct PikeWildMon gUnknown_086121F8[] = } }; -const struct PikeWildMon gUnknown_0861221C[] = +static const struct PikeWildMon sLvl50_Mons3[] = { { .species = SPECIES_SEVIPER, @@ -161,7 +160,7 @@ const struct PikeWildMon gUnknown_0861221C[] = } }; -const struct PikeWildMon gUnknown_08612240[] = +static const struct PikeWildMon sLvl50_Mons4[] = { { .species = SPECIES_SEVIPER, @@ -180,15 +179,15 @@ const struct PikeWildMon gUnknown_08612240[] = } }; -const struct PikeWildMon *const gUnknown_08612264[] = +static const struct PikeWildMon *const sLvl50Mons[] = { - gUnknown_086121D4, - gUnknown_086121F8, - gUnknown_0861221C, - gUnknown_08612240 + sLvl50_Mons1, + sLvl50_Mons2, + sLvl50_Mons3, + sLvl50_Mons4 }; -const struct PikeWildMon gUnknown_08612274[] = +static const struct PikeWildMon sLvlOpen_Mons1[] = { { .species = SPECIES_SEVIPER, @@ -207,7 +206,7 @@ const struct PikeWildMon gUnknown_08612274[] = } }; -const struct PikeWildMon gUnknown_08612298[] = +static const struct PikeWildMon sLvlOpen_Mons2[] = { { .species = SPECIES_SEVIPER, @@ -226,7 +225,7 @@ const struct PikeWildMon gUnknown_08612298[] = } }; -const struct PikeWildMon gUnknown_086122BC[] = +static const struct PikeWildMon sLvlOpen_Mons3[] = { { .species = SPECIES_SEVIPER, @@ -245,7 +244,7 @@ const struct PikeWildMon gUnknown_086122BC[] = } }; -const struct PikeWildMon gUnknown_086122E0[] = +static const struct PikeWildMon sLvlOpen_Mons4[] = { { .species = SPECIES_SEVIPER, @@ -264,21 +263,21 @@ const struct PikeWildMon gUnknown_086122E0[] = } }; -const struct PikeWildMon *const gUnknown_08612304[] = +static const struct PikeWildMon *const sLvlOpenMons[] = { - gUnknown_08612274, - gUnknown_08612298, - gUnknown_086122BC, - gUnknown_086122E0 + sLvlOpen_Mons1, + sLvlOpen_Mons2, + sLvlOpen_Mons3, + sLvlOpen_Mons4 }; -const struct PikeWildMon *const *const gUnknown_08612314[2] = +static const struct PikeWildMon *const *const sWildMons[2] = { - gUnknown_08612264, - gUnknown_08612304 + [FRONTIER_LVL_50] = sLvl50Mons, + [FRONTIER_LVL_OPEN] = sLvlOpenMons }; -const struct Unk0861231C gUnknown_0861231C[] = +static const struct Unk0861231C gUnknown_0861231C[] = { { .unk0 = 0x0012, @@ -432,7 +431,7 @@ const struct Unk0861231C gUnknown_0861231C[] = } }; -const u16 gUnknown_086123E4[][6] = +static const u16 gUnknown_086123E4[][6] = { {0x0a29, 0x0630, 0x0a01, 0x140f, 0x1020, 0x270e}, {0x0a2a, 0x081d, 0x061b, 0x1034, 0x1e20, 0x0a29}, @@ -1104,7 +1103,7 @@ bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate) s32 monLevel; u8 headerId = GetBattlePikeWildMonHeaderId(); u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - const struct PikeWildMon *const *const wildMons = gUnknown_08612314[lvlMode]; + const struct PikeWildMon *const *const wildMons = sWildMons[lvlMode]; u32 abilityBit; s32 pikeMonId = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL); pikeMonId = SpeciesToPikeMonId(pikeMonId); diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 29176db7a..23343ba20 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -6,6 +6,7 @@ #include "battle_setup.h" #include "battle_tower.h" #include "save.h" +#include "strings.h" #include "fieldmap.h" #include "palette.h" #include "field_message_box.h" @@ -22,25 +23,50 @@ #include "script.h" #include "malloc.h" #include "overworld.h" +#include "event_scripts.h" #include "constants/battle_frontier.h" #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" #include "constants/maps.h" #include "constants/moves.h" +#include "constants/species.h" extern u8 gSelectedOrderFromParty[3]; extern void door_upload_tiles(void); extern const struct MapLayout *const gMapLayouts[]; - +extern const u16 gUnknown_08D856C8[][16]; extern const u16 gBattleFrontierHeldItems[]; extern const struct FacilityMon gBattleFrontierMons[]; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[]; -extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[]; +#define TOTAL_ROUNDS 20 +#define PICKUP_ITEMS_PER_ROUND 10 + +struct PyramidWildMon +{ + u16 species; + u8 lvl; + u8 abilityBit; + u16 moves[4]; +}; + +struct Struct_08613650 +{ + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u8 runMultiplier; + u8 unk5[8]; +}; + +struct ClassMusic +{ + u8 class; + u8 music; +}; // This file's functions. static void sub_81A8E9C(void); @@ -74,6 +100,664 @@ static bool8 sub_81AA648(u8, u8); static bool8 sub_81AA760(u8 arg0, u8 *mapNums, u8 whichMap, u8 id); static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *mapNums, u8 whichMap, u8 id); +// Const rom data. +#include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h" +#include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h" + +static const struct Struct_08613650 gUnknown_08613650[] = +{ + { + .unk0 = 0x07, + .unk1 = 0x03, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x80, + .unk5 = {0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03} + }, + { + .unk0 = 0x06, + .unk1 = 0x03, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x80, + .unk5 = {0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04} + }, + { + .unk0 = 0x05, + .unk1 = 0x03, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x78, + .unk5 = {0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05} + }, + { + .unk0 = 0x04, + .unk1 = 0x04, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x78, + .unk5 = {0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06} + }, + { + .unk0 = 0x04, + .unk1 = 0x04, + .unk2 = 0x00, + .unk3 = 0x01, + .runMultiplier = 0x70, + .unk5 = {0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07} + }, + { + .unk0 = 0x03, + .unk1 = 0x05, + .unk2 = 0x00, + .unk3 = 0x02, + .runMultiplier = 0x70, + .unk5 = {0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c} + }, + { + .unk0 = 0x03, + .unk1 = 0x05, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x68, + .unk5 = {0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d} + }, + { + .unk0 = 0x02, + .unk1 = 0x04, + .unk2 = 0x00, + .unk3 = 0x01, + .runMultiplier = 0x68, + .unk5 = {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e} + }, + { + .unk0 = 0x04, + .unk1 = 0x05, + .unk2 = 0x00, + .unk3 = 0x02, + .runMultiplier = 0x60, + .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f} + }, + { + .unk0 = 0x03, + .unk1 = 0x06, + .unk2 = 0x00, + .unk3 = 0x04, + .runMultiplier = 0x60, + .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f} + }, + { + .unk0 = 0x02, + .unk1 = 0x03, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x58, + .unk5 = {0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d} + }, + { + .unk0 = 0x04, + .unk1 = 0x05, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x58, + .unk5 = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b} + }, + { + .unk0 = 0x03, + .unk1 = 0x07, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x50, + .unk5 = {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c} + }, + { + .unk0 = 0x02, + .unk1 = 0x04, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x50, + .unk5 = {0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d} + }, + { + .unk0 = 0x03, + .unk1 = 0x06, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x50, + .unk5 = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e} + }, + { + .unk0 = 0x03, + .unk1 = 0x08, + .unk2 = 0x00, + .unk3 = 0x00, + .runMultiplier = 0x50, + .unk5 = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f} + } +}; + +static const u8 gUnknown_08613750[34][2] = +{ + {0x28, 0x00}, + {0x46, 0x01}, + {0x5a, 0x02}, + {0x64, 0x03}, + {0x23, 0x01}, + {0x37, 0x02}, + {0x4b, 0x03}, + {0x5a, 0x04}, + {0x64, 0x0a}, + {0x23, 0x02}, + {0x37, 0x03}, + {0x4b, 0x04}, + {0x5a, 0x05}, + {0x64, 0x0b}, + {0x23, 0x03}, + {0x37, 0x04}, + {0x4b, 0x05}, + {0x5a, 0x06}, + {0x64, 0x0c}, + {0x23, 0x04}, + {0x37, 0x05}, + {0x4b, 0x06}, + {0x5a, 0x07}, + {0x64, 0x0d}, + {0x23, 0x05}, + {0x37, 0x06}, + {0x4b, 0x07}, + {0x5a, 0x08}, + {0x64, 0x0e}, + {0x23, 0x06}, + {0x37, 0x07}, + {0x4b, 0x08}, + {0x5a, 0x09}, + {0x64, 0x0f} +}; + +static const u8 gUnknown_08613794[] = +{ + 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00 +}; + +static const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = +{ + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, +}; + +static const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = +{ + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, + {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, + {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, +}; + +static const u8 gUnknown_08613ABC[63][2] = +{ + {0x1f, 0x00}, + {0x2e, 0x01}, + {0x3d, 0x02}, + {0x47, 0x03}, + {0x51, 0x04}, + {0x5b, 0x05}, + {0x5e, 0x06}, + {0x61, 0x07}, + {0x64, 0x08}, + {0x0f, 0x00}, + {0x2e, 0x01}, + {0x3d, 0x02}, + {0x47, 0x03}, + {0x51, 0x04}, + {0x5b, 0x05}, + {0x5e, 0x06}, + {0x61, 0x08}, + {0x64, 0x09}, + {0x0f, 0x00}, + {0x1e, 0x01}, + {0x3d, 0x02}, + {0x47, 0x03}, + {0x51, 0x04}, + {0x5b, 0x05}, + {0x5e, 0x06}, + {0x61, 0x07}, + {0x64, 0x08}, + {0x1c, 0x00}, + {0x2b, 0x01}, + {0x3a, 0x02}, + {0x44, 0x03}, + {0x4e, 0x04}, + {0x58, 0x05}, + {0x5c, 0x07}, + {0x60, 0x08}, + {0x64, 0x09}, + {0x0f, 0x00}, + {0x2b, 0x01}, + {0x3a, 0x02}, + {0x44, 0x03}, + {0x4e, 0x04}, + {0x58, 0x05}, + {0x5c, 0x06}, + {0x60, 0x07}, + {0x64, 0x09}, + {0x0f, 0x00}, + {0x1e, 0x01}, + {0x3a, 0x02}, + {0x44, 0x03}, + {0x4e, 0x04}, + {0x58, 0x05}, + {0x5c, 0x06}, + {0x60, 0x07}, + {0x64, 0x08}, + {0x1c, 0x00}, + {0x2b, 0x01}, + {0x3a, 0x02}, + {0x44, 0x03}, + {0x4e, 0x04}, + {0x58, 0x05}, + {0x5c, 0x06}, + {0x60, 0x08}, + {0x64, 0x09}, +}; + +static const u8 gUnknown_08613B3A[] = {0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36}; + +static const struct ClassMusic gUnknown_08613B44[54] = +{ + {0x03, 0x06}, + {0x0b, 0x06}, + {0x0d, 0x06}, + {0x0f, 0x01}, + {0x2b, 0x04}, + {0x2d, 0x01}, + {0x24, 0x09}, + {0x29, 0x04}, + {0x05, 0x05}, + {0x18, 0x04}, + {0x2f, 0x00}, + {0x2e, 0x09}, + {0x11, 0x0c}, + {0x10, 0x0b}, + {0x1e, 0x0d}, + {0x08, 0x01}, + {0x17, 0x03}, + {0x0c, 0x04}, + {0x38, 0x04}, + {0x1c, 0x03}, + {0x1a, 0x00}, + {0x19, 0x0b}, + {0x09, 0x07}, + {0x31, 0x07}, + {0x35, 0x07}, + {0x36, 0x01}, + {0x33, 0x00}, + {0x2a, 0x03}, + {0x16, 0x0d}, + {0x0e, 0x03}, + {0x15, 0x01}, + {0x14, 0x01}, + {0x2c, 0x01}, + {0x1b, 0x02}, + {0x04, 0x01}, + {0x07, 0x03}, + {0x34, 0x05}, + {0x32, 0x00}, + {0x37, 0x02}, + {0x1d, 0x04}, + {0x22, 0x09}, + {0x1f, 0x01}, + {0x25, 0x00}, + {0x0a, 0x04}, + {0x28, 0x00}, + {0x06, 0x05}, + {0x27, 0x0b}, + {0x26, 0x00}, + {0x13, 0x00}, + {0x12, 0x02}, + {0x39, 0x08}, + {0x02, 0x0b}, + {0x20, 0x01}, + {0x21, 0x00}, +}; + +static const u8 gUnknown_08613C1C[50][2] = +{ + {0x0d, 0x03}, + {0x0e, 0x04}, + {0x10, 0x01}, + {0x11, 0x00}, + {0x03, 0x02}, + {0x12, 0x03}, + {0x0c, 0x03}, + {0x13, 0x03}, + {0x14, 0x03}, + {0x15, 0x02}, + {0x17, 0x02}, + {0x07, 0x02}, + {0x0a, 0x04}, + {0x19, 0x02}, + {0x1a, 0x02}, + {0x1b, 0x00}, + {0x1d, 0x02}, + {0x1e, 0x02}, + {0x1f, 0x03}, + {0x20, 0x04}, + {0x26, 0x00}, + {0x27, 0x01}, + {0x29, 0x04}, + {0x2a, 0x05}, + {0x09, 0x04}, + {0x16, 0x05}, + {0x2b, 0x00}, + {0x2d, 0x04}, + {0x2e, 0x02}, + {0x30, 0x02}, + {0x32, 0x02}, + {0x31, 0x03}, + {0x2f, 0x03}, + {0x33, 0x03}, + {0x34, 0x02}, + {0x04, 0x02}, + {0x35, 0x00}, + {0x36, 0x03}, + {0x37, 0x03}, + {0x38, 0x03}, + {0x1c, 0x01}, + {0x3a, 0x02}, + {0x05, 0x02}, + {0x42, 0x02}, + {0x02, 0x03}, + {0x44, 0x02}, + {0x45, 0x03}, + {0x47, 0x03}, + {0x43, 0x00}, + {0x00, 0x04}, +}; + +static const u8 *const gUnknown_08613C80[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_252D2D, + BattleFrontier_BattlePyramidEmptySquare_Text_252D57, + BattleFrontier_BattlePyramidEmptySquare_Text_252D81, + BattleFrontier_BattlePyramidEmptySquare_Text_252DAB, +}; + +static const u8 *const gUnknown_08613C90[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_25330B, + BattleFrontier_BattlePyramidEmptySquare_Text_2532CC, + BattleFrontier_BattlePyramidEmptySquare_Text_25328B, + BattleFrontier_BattlePyramidEmptySquare_Text_253248, + BattleFrontier_BattlePyramidEmptySquare_Text_253206, + BattleFrontier_BattlePyramidEmptySquare_Text_2531C4, + BattleFrontier_BattlePyramidEmptySquare_Text_253183, + BattleFrontier_BattlePyramidEmptySquare_Text_253140, + BattleFrontier_BattlePyramidEmptySquare_Text_2530FD, +}; + +static const u8 *const gUnknown_08613CB4[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_2544A6, + BattleFrontier_BattlePyramidEmptySquare_Text_25445A, + BattleFrontier_BattlePyramidEmptySquare_Text_25440B, + BattleFrontier_BattlePyramidEmptySquare_Text_2543BA, + BattleFrontier_BattlePyramidEmptySquare_Text_25436A, + BattleFrontier_BattlePyramidEmptySquare_Text_25431A, + BattleFrontier_BattlePyramidEmptySquare_Text_2542CB, + BattleFrontier_BattlePyramidEmptySquare_Text_25427A, +}; + +static const u8 *const gUnknown_08613CD4[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_252DD5, + BattleFrontier_BattlePyramidEmptySquare_Text_252E03, + BattleFrontier_BattlePyramidEmptySquare_Text_252E31, + BattleFrontier_BattlePyramidEmptySquare_Text_252E5F, +}; + +static const u8 *const gUnknown_08613CE4[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_25362E, + BattleFrontier_BattlePyramidEmptySquare_Text_2535D4, + BattleFrontier_BattlePyramidEmptySquare_Text_253578, + BattleFrontier_BattlePyramidEmptySquare_Text_25351A, + BattleFrontier_BattlePyramidEmptySquare_Text_2534BD, + BattleFrontier_BattlePyramidEmptySquare_Text_253460, + BattleFrontier_BattlePyramidEmptySquare_Text_253404, + BattleFrontier_BattlePyramidEmptySquare_Text_2533A6, + BattleFrontier_BattlePyramidEmptySquare_Text_25334D, +}; + +static const u8 *const gUnknown_08613D08[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_25471E, + BattleFrontier_BattlePyramidEmptySquare_Text_2546CC, + BattleFrontier_BattlePyramidEmptySquare_Text_25467C, + BattleFrontier_BattlePyramidEmptySquare_Text_25462A, + BattleFrontier_BattlePyramidEmptySquare_Text_2545D9, + BattleFrontier_BattlePyramidEmptySquare_Text_254588, + BattleFrontier_BattlePyramidEmptySquare_Text_254538, + BattleFrontier_BattlePyramidEmptySquare_Text_2544E6, +}; + +static const u8 *const gUnknown_08613D28[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_252E8D, + BattleFrontier_BattlePyramidEmptySquare_Text_252EAA, + BattleFrontier_BattlePyramidEmptySquare_Text_252EC7, + BattleFrontier_BattlePyramidEmptySquare_Text_252EE4, +}; + +static const u8 *const gUnknown_08613D38[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_2539EC, + BattleFrontier_BattlePyramidEmptySquare_Text_253980, + BattleFrontier_BattlePyramidEmptySquare_Text_253915, + BattleFrontier_BattlePyramidEmptySquare_Text_2538A8, + BattleFrontier_BattlePyramidEmptySquare_Text_25383C, + BattleFrontier_BattlePyramidEmptySquare_Text_2537D0, + BattleFrontier_BattlePyramidEmptySquare_Text_253765, + BattleFrontier_BattlePyramidEmptySquare_Text_2536F8, + BattleFrontier_BattlePyramidEmptySquare_Text_25368B, +}; + +static const u8 *const gUnknown_08613D5C[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_254A0B, + BattleFrontier_BattlePyramidEmptySquare_Text_2549AE, + BattleFrontier_BattlePyramidEmptySquare_Text_25494D, + BattleFrontier_BattlePyramidEmptySquare_Text_2548EB, + BattleFrontier_BattlePyramidEmptySquare_Text_25488A, + BattleFrontier_BattlePyramidEmptySquare_Text_254829, + BattleFrontier_BattlePyramidEmptySquare_Text_2547C9, + BattleFrontier_BattlePyramidEmptySquare_Text_254767, +}; + +static const u8 *const gUnknown_08613D7C[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_252F01, + BattleFrontier_BattlePyramidEmptySquare_Text_252F3A, + BattleFrontier_BattlePyramidEmptySquare_Text_252F73, + BattleFrontier_BattlePyramidEmptySquare_Text_252FAC, +}; + +static const u8 *const gUnknown_08613D8C[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_253D3E, + BattleFrontier_BattlePyramidEmptySquare_Text_253CE0, + BattleFrontier_BattlePyramidEmptySquare_Text_253C87, + BattleFrontier_BattlePyramidEmptySquare_Text_253C2C, + BattleFrontier_BattlePyramidEmptySquare_Text_253BD2, + BattleFrontier_BattlePyramidEmptySquare_Text_253B78, + BattleFrontier_BattlePyramidEmptySquare_Text_253B1F, + BattleFrontier_BattlePyramidEmptySquare_Text_253AC4, + BattleFrontier_BattlePyramidEmptySquare_Text_253A69, +}; + +static const u8 *const gUnknown_08613DB0[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_254C3E, + BattleFrontier_BattlePyramidEmptySquare_Text_254BF1, + BattleFrontier_BattlePyramidEmptySquare_Text_254BAE, + BattleFrontier_BattlePyramidEmptySquare_Text_254B69, + BattleFrontier_BattlePyramidEmptySquare_Text_254B25, + BattleFrontier_BattlePyramidEmptySquare_Text_254AE1, + BattleFrontier_BattlePyramidEmptySquare_Text_254A9E, + BattleFrontier_BattlePyramidEmptySquare_Text_254A59, +}; + +static const u8 *const gUnknown_08613DD0[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_252FE5, + BattleFrontier_BattlePyramidEmptySquare_Text_253000, + BattleFrontier_BattlePyramidEmptySquare_Text_25301B, + BattleFrontier_BattlePyramidEmptySquare_Text_253036, +}; + +static const u8 *const gUnknown_08613DE0[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_253F6C, + BattleFrontier_BattlePyramidEmptySquare_Text_253F34, + BattleFrontier_BattlePyramidEmptySquare_Text_253EFA, + BattleFrontier_BattlePyramidEmptySquare_Text_253EBE, + BattleFrontier_BattlePyramidEmptySquare_Text_253E83, + BattleFrontier_BattlePyramidEmptySquare_Text_253E48, + BattleFrontier_BattlePyramidEmptySquare_Text_253E0E, + BattleFrontier_BattlePyramidEmptySquare_Text_253DD2, + BattleFrontier_BattlePyramidEmptySquare_Text_253D96, +}; + +static const u8 *const gUnknown_08613E04[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_254E6E, + BattleFrontier_BattlePyramidEmptySquare_Text_254E27, + BattleFrontier_BattlePyramidEmptySquare_Text_254DE0, + BattleFrontier_BattlePyramidEmptySquare_Text_254D97, + BattleFrontier_BattlePyramidEmptySquare_Text_254D4F, + BattleFrontier_BattlePyramidEmptySquare_Text_254D07, + BattleFrontier_BattlePyramidEmptySquare_Text_254CC0, + BattleFrontier_BattlePyramidEmptySquare_Text_254C77, +}; + +static const u8 *const gUnknown_08613E24[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_253051, + BattleFrontier_BattlePyramidEmptySquare_Text_25307C, + BattleFrontier_BattlePyramidEmptySquare_Text_2530A7, + BattleFrontier_BattlePyramidEmptySquare_Text_2530D2, +}; + +static const u8 *const gUnknown_08613E34[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_25422B, + BattleFrontier_BattlePyramidEmptySquare_Text_2541DD, + BattleFrontier_BattlePyramidEmptySquare_Text_25418D, + BattleFrontier_BattlePyramidEmptySquare_Text_25413B, + BattleFrontier_BattlePyramidEmptySquare_Text_2540EA, + BattleFrontier_BattlePyramidEmptySquare_Text_254099, + BattleFrontier_BattlePyramidEmptySquare_Text_254049, + BattleFrontier_BattlePyramidEmptySquare_Text_253FF7, + BattleFrontier_BattlePyramidEmptySquare_Text_253FA5, +}; + +static const u8 *const gUnknown_08613E58[] = +{ + BattleFrontier_BattlePyramidEmptySquare_Text_255068, + BattleFrontier_BattlePyramidEmptySquare_Text_25502F, + BattleFrontier_BattlePyramidEmptySquare_Text_254FF6, + BattleFrontier_BattlePyramidEmptySquare_Text_254FBB, + BattleFrontier_BattlePyramidEmptySquare_Text_254F81, + BattleFrontier_BattlePyramidEmptySquare_Text_254F47, + BattleFrontier_BattlePyramidEmptySquare_Text_254F0E, + BattleFrontier_BattlePyramidEmptySquare_Text_254ED3, +}; + +static const u8 *const *const gUnknown_08613E78[] = +{ + gUnknown_08613C80, + gUnknown_08613C90, + gUnknown_08613CB4, +}; + +static const u8 *const *const gUnknown_08613E84[] = +{ + gUnknown_08613CD4, + gUnknown_08613CE4, + gUnknown_08613D08, +}; + +static const u8 *const *const gUnknown_08613E90[] = +{ + gUnknown_08613D28, + gUnknown_08613D38, + gUnknown_08613D5C, +}; + +static const u8 *const *const gUnknown_08613E9C[] = +{ + gUnknown_08613D7C, + gUnknown_08613D8C, + gUnknown_08613DB0, +}; + +static const u8 *const *const gUnknown_08613EA8[] = +{ + gUnknown_08613DD0, + gUnknown_08613DE0, + gUnknown_08613E04, +}; + +static const u8 *const *const gUnknown_08613EB4[] = +{ + gUnknown_08613E24, + gUnknown_08613E34, + gUnknown_08613E58, +}; + +static const u8 *const *const *const gUnknown_08613EC0[] = +{ + gUnknown_08613E78, + gUnknown_08613E84, + gUnknown_08613E90, + gUnknown_08613E9C, + gUnknown_08613EA8, + gUnknown_08613EB4, +}; + static const u8 gUnknown_08613ED8[] = {3, 4, 5, 6, 7, 8, 3, 4}; static void (* const sBattlePyramidFunctions[])(void) = @@ -637,9 +1321,9 @@ void GenerateBattlePyramidWildMon(void) round = TOTAL_ROUNDS - 1; if (lvl != FRONTIER_LVL_50) - wildMons = gBattlePyramidOpenLevelWildMonPointers[round]; + wildMons = sOpenLevelWildMonPointers[round]; else - wildMons = gBattlePyramidLevel50WildMonPointers[round]; + wildMons = sLevel50WildMonPointers[round]; id = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL) - 1; SetMonData(&gEnemyParty[0], MON_DATA_SPECIES, &wildMons[id].species); diff --git a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h index 0248ce958..50bc1c856 100644 --- a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h @@ -1,5 +1,5 @@ -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round1[] = +static const struct PyramidWildMon sLevel50WildMons_Round1[] = { { .species = SPECIES_PLUSLE, @@ -51,7 +51,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round1[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round2[] = +static const struct PyramidWildMon sLevel50WildMons_Round2[] = { { .species = SPECIES_GULPIN, @@ -103,7 +103,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round2[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round3[] = +static const struct PyramidWildMon sLevel50WildMons_Round3[] = { { .species = SPECIES_GROWLITHE, @@ -155,7 +155,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round3[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round4[] = +static const struct PyramidWildMon sLevel50WildMons_Round4[] = { { .species = SPECIES_DUNSPARCE, @@ -207,7 +207,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round4[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round5[] = +static const struct PyramidWildMon sLevel50WildMons_Round5[] = { { .species = SPECIES_HAUNTER, @@ -259,7 +259,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round5[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round6[] = +static const struct PyramidWildMon sLevel50WildMons_Round6[] = { { .species = SPECIES_DIGLETT, @@ -311,7 +311,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round6[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round7[] = +static const struct PyramidWildMon sLevel50WildMons_Round7[] = { { .species = SPECIES_GLALIE, @@ -363,7 +363,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round7[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round8[] = +static const struct PyramidWildMon sLevel50WildMons_Round8[] = { { .species = SPECIES_WEEZING, @@ -415,7 +415,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round8[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round9[] = +static const struct PyramidWildMon sLevel50WildMons_Round9[] = { { .species = SPECIES_WOBBUFFET, @@ -467,7 +467,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round9[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round10[] = +static const struct PyramidWildMon sLevel50WildMons_Round10[] = { { .species = SPECIES_GOLEM, @@ -519,7 +519,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round10[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round11[] = +static const struct PyramidWildMon sLevel50WildMons_Round11[] = { { .species = SPECIES_POLIWRATH, @@ -571,7 +571,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round11[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round12[] = +static const struct PyramidWildMon sLevel50WildMons_Round12[] = { { .species = SPECIES_QUAGSIRE, @@ -623,7 +623,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round12[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round13[] = +static const struct PyramidWildMon sLevel50WildMons_Round13[] = { { .species = SPECIES_PINECO, @@ -675,7 +675,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round13[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round14[] = +static const struct PyramidWildMon sLevel50WildMons_Round14[] = { { .species = SPECIES_SABLEYE, @@ -727,7 +727,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round14[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round15[] = +static const struct PyramidWildMon sLevel50WildMons_Round15[] = { { .species = SPECIES_OCTILLERY, @@ -779,7 +779,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round15[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round16[] = +static const struct PyramidWildMon sLevel50WildMons_Round16[] = { { .species = SPECIES_DUSKULL, @@ -831,7 +831,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round16[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round17[] = +static const struct PyramidWildMon sLevel50WildMons_Round17[] = { { .species = SPECIES_MAWILE, @@ -883,7 +883,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round17[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round18[] = +static const struct PyramidWildMon sLevel50WildMons_Round18[] = { { .species = SPECIES_DRAGONAIR, @@ -935,7 +935,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round18[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round19[] = +static const struct PyramidWildMon sLevel50WildMons_Round19[] = { { .species = SPECIES_ARCANINE, @@ -987,7 +987,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round19[] = } }; -const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round20[] = +static const struct PyramidWildMon sLevel50WildMons_Round20[] = { { .species = SPECIES_KANGASKHAN, @@ -1039,26 +1039,26 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round20[] = } }; -const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[] = +static const struct PyramidWildMon *const sLevel50WildMonPointers[] = { - gBattlePyramidLevel50WildMons_Round1, - gBattlePyramidLevel50WildMons_Round2, - gBattlePyramidLevel50WildMons_Round3, - gBattlePyramidLevel50WildMons_Round4, - gBattlePyramidLevel50WildMons_Round5, - gBattlePyramidLevel50WildMons_Round6, - gBattlePyramidLevel50WildMons_Round7, - gBattlePyramidLevel50WildMons_Round8, - gBattlePyramidLevel50WildMons_Round9, - gBattlePyramidLevel50WildMons_Round10, - gBattlePyramidLevel50WildMons_Round11, - gBattlePyramidLevel50WildMons_Round12, - gBattlePyramidLevel50WildMons_Round13, - gBattlePyramidLevel50WildMons_Round14, - gBattlePyramidLevel50WildMons_Round15, - gBattlePyramidLevel50WildMons_Round16, - gBattlePyramidLevel50WildMons_Round17, - gBattlePyramidLevel50WildMons_Round18, - gBattlePyramidLevel50WildMons_Round19, - gBattlePyramidLevel50WildMons_Round20 + sLevel50WildMons_Round1, + sLevel50WildMons_Round2, + sLevel50WildMons_Round3, + sLevel50WildMons_Round4, + sLevel50WildMons_Round5, + sLevel50WildMons_Round6, + sLevel50WildMons_Round7, + sLevel50WildMons_Round8, + sLevel50WildMons_Round9, + sLevel50WildMons_Round10, + sLevel50WildMons_Round11, + sLevel50WildMons_Round12, + sLevel50WildMons_Round13, + sLevel50WildMons_Round14, + sLevel50WildMons_Round15, + sLevel50WildMons_Round16, + sLevel50WildMons_Round17, + sLevel50WildMons_Round18, + sLevel50WildMons_Round19, + sLevel50WildMons_Round20 }; diff --git a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h index 154a92799..6409e73b1 100644 --- a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h @@ -1,5 +1,5 @@ -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round1[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round1[] = { { .species = SPECIES_PLUSLE, @@ -51,7 +51,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round1[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round2[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round2[] = { { .species = SPECIES_GULPIN, @@ -103,7 +103,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round2[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round3[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round3[] = { { .species = SPECIES_GROWLITHE, @@ -155,7 +155,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round3[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round4[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round4[] = { { .species = SPECIES_DUNSPARCE, @@ -207,7 +207,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round4[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round5[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round5[] = { { .species = SPECIES_HAUNTER, @@ -259,7 +259,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round5[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round6[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round6[] = { { .species = SPECIES_DIGLETT, @@ -311,7 +311,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round6[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round7[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round7[] = { { .species = SPECIES_GLALIE, @@ -363,7 +363,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round7[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round8[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round8[] = { { .species = SPECIES_WEEZING, @@ -415,7 +415,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round8[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round9[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round9[] = { { .species = SPECIES_WOBBUFFET, @@ -467,7 +467,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round9[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round10[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round10[] = { { .species = SPECIES_GOLEM, @@ -519,7 +519,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round10[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round11[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round11[] = { { .species = SPECIES_POLIWRATH, @@ -571,7 +571,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round11[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round12[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round12[] = { { .species = SPECIES_QUAGSIRE, @@ -623,7 +623,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round12[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round13[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round13[] = { { .species = SPECIES_PINECO, @@ -675,7 +675,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round13[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round14[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round14[] = { { .species = SPECIES_SABLEYE, @@ -727,7 +727,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round14[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round15[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round15[] = { { .species = SPECIES_OCTILLERY, @@ -779,7 +779,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round15[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round16[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round16[] = { { .species = SPECIES_DUSKULL, @@ -831,7 +831,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round16[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round17[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round17[] = { { .species = SPECIES_MAWILE, @@ -883,7 +883,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round17[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round18[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round18[] = { { .species = SPECIES_DRAGONAIR, @@ -935,7 +935,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round18[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round19[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round19[] = { { .species = SPECIES_ARCANINE, @@ -987,7 +987,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round19[] = } }; -const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round20[] = +static const struct PyramidWildMon sOpenLevelWildMons_Round20[] = { { .species = SPECIES_KANGASKHAN, @@ -1039,26 +1039,26 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round20[] = } }; -const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[] = +static const struct PyramidWildMon *const sOpenLevelWildMonPointers[] = { - gBattlePyramidOpenLevelWildMons_Round1, - gBattlePyramidOpenLevelWildMons_Round2, - gBattlePyramidOpenLevelWildMons_Round3, - gBattlePyramidOpenLevelWildMons_Round4, - gBattlePyramidOpenLevelWildMons_Round5, - gBattlePyramidOpenLevelWildMons_Round6, - gBattlePyramidOpenLevelWildMons_Round7, - gBattlePyramidOpenLevelWildMons_Round8, - gBattlePyramidOpenLevelWildMons_Round9, - gBattlePyramidOpenLevelWildMons_Round10, - gBattlePyramidOpenLevelWildMons_Round11, - gBattlePyramidOpenLevelWildMons_Round12, - gBattlePyramidOpenLevelWildMons_Round13, - gBattlePyramidOpenLevelWildMons_Round14, - gBattlePyramidOpenLevelWildMons_Round15, - gBattlePyramidOpenLevelWildMons_Round16, - gBattlePyramidOpenLevelWildMons_Round17, - gBattlePyramidOpenLevelWildMons_Round18, - gBattlePyramidOpenLevelWildMons_Round19, - gBattlePyramidOpenLevelWildMons_Round20 + sOpenLevelWildMons_Round1, + sOpenLevelWildMons_Round2, + sOpenLevelWildMons_Round3, + sOpenLevelWildMons_Round4, + sOpenLevelWildMons_Round5, + sOpenLevelWildMons_Round6, + sOpenLevelWildMons_Round7, + sOpenLevelWildMons_Round8, + sOpenLevelWildMons_Round9, + sOpenLevelWildMons_Round10, + sOpenLevelWildMons_Round11, + sOpenLevelWildMons_Round12, + sOpenLevelWildMons_Round13, + sOpenLevelWildMons_Round14, + sOpenLevelWildMons_Round15, + sOpenLevelWildMons_Round16, + sOpenLevelWildMons_Round17, + sOpenLevelWildMons_Round18, + sOpenLevelWildMons_Round19, + sOpenLevelWildMons_Round20 }; diff --git a/src/frontier_data.c b/src/frontier_data.c deleted file mode 100644 index e79bf07fb..000000000 --- a/src/frontier_data.c +++ /dev/null @@ -1,233 +0,0 @@ -#include "global.h" - -#include "battle_pyramid.h" - -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/items.h" - -#include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h" -#include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h" - -const struct Struct_08613650 gUnknown_08613650[] = -{ - { - .unk0 = 0x07, - .unk1 = 0x03, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x80, - .unk5 = {0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03} - }, - { - .unk0 = 0x06, - .unk1 = 0x03, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x80, - .unk5 = {0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04} - }, - { - .unk0 = 0x05, - .unk1 = 0x03, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x78, - .unk5 = {0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05} - }, - { - .unk0 = 0x04, - .unk1 = 0x04, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x78, - .unk5 = {0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06} - }, - { - .unk0 = 0x04, - .unk1 = 0x04, - .unk2 = 0x00, - .unk3 = 0x01, - .runMultiplier = 0x70, - .unk5 = {0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07} - }, - { - .unk0 = 0x03, - .unk1 = 0x05, - .unk2 = 0x00, - .unk3 = 0x02, - .runMultiplier = 0x70, - .unk5 = {0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c} - }, - { - .unk0 = 0x03, - .unk1 = 0x05, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x68, - .unk5 = {0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d} - }, - { - .unk0 = 0x02, - .unk1 = 0x04, - .unk2 = 0x00, - .unk3 = 0x01, - .runMultiplier = 0x68, - .unk5 = {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e} - }, - { - .unk0 = 0x04, - .unk1 = 0x05, - .unk2 = 0x00, - .unk3 = 0x02, - .runMultiplier = 0x60, - .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f} - }, - { - .unk0 = 0x03, - .unk1 = 0x06, - .unk2 = 0x00, - .unk3 = 0x04, - .runMultiplier = 0x60, - .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f} - }, - { - .unk0 = 0x02, - .unk1 = 0x03, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x58, - .unk5 = {0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d} - }, - { - .unk0 = 0x04, - .unk1 = 0x05, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x58, - .unk5 = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b} - }, - { - .unk0 = 0x03, - .unk1 = 0x07, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x50, - .unk5 = {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c} - }, - { - .unk0 = 0x02, - .unk1 = 0x04, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x50, - .unk5 = {0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d} - }, - { - .unk0 = 0x03, - .unk1 = 0x06, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x50, - .unk5 = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e} - }, - { - .unk0 = 0x03, - .unk1 = 0x08, - .unk2 = 0x00, - .unk3 = 0x00, - .runMultiplier = 0x50, - .unk5 = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f} - } -}; - -const u8 gUnknown_08613750[34][2] = -{ - {0x28, 0x00}, - {0x46, 0x01}, - {0x5a, 0x02}, - {0x64, 0x03}, - {0x23, 0x01}, - {0x37, 0x02}, - {0x4b, 0x03}, - {0x5a, 0x04}, - {0x64, 0x0a}, - {0x23, 0x02}, - {0x37, 0x03}, - {0x4b, 0x04}, - {0x5a, 0x05}, - {0x64, 0x0b}, - {0x23, 0x03}, - {0x37, 0x04}, - {0x4b, 0x05}, - {0x5a, 0x06}, - {0x64, 0x0c}, - {0x23, 0x04}, - {0x37, 0x05}, - {0x4b, 0x06}, - {0x5a, 0x07}, - {0x64, 0x0d}, - {0x23, 0x05}, - {0x37, 0x06}, - {0x4b, 0x07}, - {0x5a, 0x08}, - {0x64, 0x0e}, - {0x23, 0x06}, - {0x37, 0x07}, - {0x4b, 0x08}, - {0x5a, 0x09}, - {0x64, 0x0f} -}; - -const u8 gUnknown_08613794[] = -{ - 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00 -}; - -const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = -{ - {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, -}; - -const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = -{ - {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, - {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, - {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, -}; diff --git a/src/frontier_util.c b/src/frontier_util.c index 7ba8746a1..5af7b3db7 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -44,7 +44,7 @@ struct FrontierBrainMon u16 heldItem; u8 fixedIV; u8 nature; - u8 evs[6]; + u8 evs[NUM_STATS]; u16 moves[4]; }; @@ -684,7 +684,7 @@ const u16 gFrontierBannedSpecies[] = SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF }; -const u8 *const gUnknown_08611CB0[][2] = +static const u8 *const gUnknown_08611CB0[][2] = { {gText_BattleTower2, gUnknown_085ED164}, {gText_BattleTower2, gUnknown_085ED170}, @@ -698,13 +698,13 @@ const u8 *const gUnknown_08611CB0[][2] = {gText_BattleTower2, gUnknown_085ED188}, }; -const u8 *const gLevelModeText[] = +static const u8 *const gLevelModeText[] = { gText_RecordsLv50, gText_RecordsOpenLevel, }; -const u8 *const gFacilityToRecordsText[] = +static const u8 *const gHallFacilityToRecordsText[] = { gText_FrontierFacilityWinStreak, gText_FrontierFacilityWinStreak, @@ -718,7 +718,7 @@ const u8 *const gFacilityToRecordsText[] = gText_FrontierFacilityWinStreak, }; -const u16 gFacilityToBrainTrainerId[] = +static const u16 gFacilityToBrainTrainerId[] = { [FRONTIER_FACILITY_TOWER] = TRAINER_ANABEL, [FRONTIER_FACILITY_DOME] = TRAINER_TUCKER, @@ -729,7 +729,7 @@ const u16 gFacilityToBrainTrainerId[] = [FRONTIER_FACILITY_PYRAMID] = TRAINER_BRANDON, }; -const u8 *const gUnknown_08611D40[] = +static const u8 *const gUnknown_08611D40[] = { gText_082C843F, gText_082C848B, @@ -740,7 +740,7 @@ const u8 *const gUnknown_08611D40[] = gText_082C86C3, }; -const u8 *const gUnknown_08611D5C[] = +static const u8 *const gUnknown_08611D5C[] = { gText_082C8458, gText_082C84C1, @@ -751,7 +751,7 @@ const u8 *const gUnknown_08611D5C[] = gText_082C86FE, }; -const u8 *const gUnknown_08611D78[] = +static const u8 *const gUnknown_08611D78[] = { gText_082C846C, gText_082C84D0, @@ -762,7 +762,7 @@ const u8 *const gUnknown_08611D78[] = gText_082C8739, }; -const u8 *const gUnknown_08611D94[] = +static const u8 *const gUnknown_08611D94[] = { gText_082C8480, gText_082C84F7, @@ -773,13 +773,13 @@ const u8 *const gUnknown_08611D94[] = gText_082C877B, }; -const u8 *const *const gUnknown_08611DB0[] = +static const u8 *const *const gUnknown_08611DB0[] = { gUnknown_08611D40, gUnknown_08611D78, }; -const u8 *const *const gUnknown_08611DB8[] = +static const u8 *const *const gUnknown_08611DB8[] = { gUnknown_08611D5C, gUnknown_08611D94, @@ -2224,8 +2224,8 @@ static void Print1PRecord(s32 position, s32 x, s32 y, struct RankingHall1P *hall if (winStreak > 9999) winStreak = 9999; ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gFacilityToRecordsText[hallFacilityId]); - AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL); + StringExpandPlaceholders(gStringVar4, gHallFacilityToRecordsText[hallFacilityId]); + AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gHallFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL); } } @@ -2251,8 +2251,8 @@ static void Print2PRecord(s32 position, s32 x, s32 y, struct RankingHall2P *hall if (winStreak > 9999) winStreak = 9999; ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4); - StringExpandPlaceholders(gStringVar4, gFacilityToRecordsText[9]); - AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gFacilityToRecordsText[9], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL); + StringExpandPlaceholders(gStringVar4, gHallFacilityToRecordsText[9]); + AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gHallFacilityToRecordsText[9], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL); } } @@ -2510,7 +2510,7 @@ void CreateFrontierBrainPokemon(void) TRUE, j, TRUE, FRONTIER_BRAIN_OTID); SetMonData(&gEnemyParty[monPartyId], MON_DATA_HELD_ITEM, &sFrontierBrainsMons[facility][symbol][i].heldItem); - for (j = 0; j < 6; j++) + for (j = 0; j < NUM_STATS; j++) SetMonData(&gEnemyParty[monPartyId], MON_DATA_HP_EV + j, &sFrontierBrainsMons[facility][symbol][i].evs[j]); friendship = 0xFF; for (j = 0; j < 4; j++) -- cgit v1.2.3 From 9fafa637438b45a48de36a4a7bf898111951ec92 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 27 Nov 2018 17:21:23 -0600 Subject: Finish decompiling internation_string_util.c --- asm/international_string_util.s | 355 ------------------------------------ include/international_string_util.h | 29 +-- include/pokedex.h | 25 ++- include/text.h | 10 +- ld_script.txt | 1 - src/international_string_util.c | 208 +++++++++++++++++++-- src/pokedex.c | 13 -- src/record_mixing.c | 2 +- src/text.c | 26 +-- 9 files changed, 249 insertions(+), 420 deletions(-) delete mode 100644 asm/international_string_util.s diff --git a/asm/international_string_util.s b/asm/international_string_util.s deleted file mode 100644 index 469d88787..000000000 --- a/asm/international_string_util.s +++ /dev/null @@ -1,355 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start sub_81DB41C -sub_81DB41C: @ 81DB41C - push {r4-r7,lr} - adds r4, r0, 0 - ldr r1, [r4] - movs r7, 0 - movs r6, 0 - ldrh r0, [r4, 0xC] - cmp r7, r0 - bge _081DB44C - adds r5, r1, 0 -_081DB42E: - ldrb r0, [r4, 0x17] - lsls r0, 26 - lsrs r0, 26 - ldr r1, [r5] - movs r2, 0 - bl GetStringWidth - cmp r0, r7 - ble _081DB442 - adds r7, r0, 0 -_081DB442: - adds r5, 0x8 - adds r6, 0x1 - ldrh r0, [r4, 0xC] - cmp r6, r0 - blt _081DB42E -_081DB44C: - ldrb r0, [r4, 0x12] - adds r1, r7, r0 - adds r0, r1, 0 - adds r0, 0x9 - cmp r0, 0 - bge _081DB45A - adds r0, 0x7 -_081DB45A: - asrs r0, 3 - cmp r0, 0x1C - ble _081DB462 - movs r0, 0x1C -_081DB462: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81DB41C - - thumb_func_start CopyMonCategoryText -CopyMonCategoryText: @ 81DB468 - push {lr} - adds r2, r0, 0 - adds r0, r1, 0 - lsls r2, 5 - ldr r1, =gPokedexEntries - adds r2, r1 - adds r1, r2, 0 - bl StringCopy - movs r1, 0 - strb r1, [r0] - adds r0, 0x1 - ldr r1, =gText_Pokemon - bl StringCopy - pop {r0} - bx r0 - .pool - thumb_func_end CopyMonCategoryText - - thumb_func_start sub_81DB494 -sub_81DB494: @ 81DB494 - push {r4-r7,lr} - adds r6, r1, 0 - adds r5, r2, 0 - adds r7, r3, 0 - cmp r5, 0 - beq _081DB4B6 - adds r1, r5, 0 - bl StringCopy - adds r4, r0, 0 - lsls r0, r6, 24 - lsrs r0, 24 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - b _081DB4BA -_081DB4B6: - adds r4, r0, 0 - movs r0, 0 -_081DB4BA: - subs r3, r7, r0 - cmp r3, 0 - ble _081DB4D4 - movs r0, 0xFC - strb r0, [r4] - adds r4, 0x1 - movs r0, 0x11 - strb r0, [r4] - adds r4, 0x1 - strb r3, [r4] - adds r4, 0x1 - movs r0, 0xFF - strb r0, [r4] -_081DB4D4: - adds r0, r4, 0 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81DB494 - - thumb_func_start PadNameString -PadNameString: @ 81DB4DC - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - bl StripExtCtrlCodes - adds r0, r4, 0 - bl StringLength - lsls r0, 24 - lsrs r1, r0, 24 - cmp r5, 0xFC - bne _081DB51A - cmp r1, 0x5 - bhi _081DB51E - movs r3, 0xFC - movs r2, 0x7 -_081DB4FE: - adds r0, r4, r1 - strb r3, [r0] - strb r2, [r0, 0x1] - adds r0, r1, 0x2 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x5 - bls _081DB4FE - b _081DB51E -_081DB510: - adds r0, r4, r1 - strb r5, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 -_081DB51A: - cmp r1, 0x5 - bls _081DB510 -_081DB51E: - adds r1, r4, r1 - movs r0, 0xFF - strb r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end PadNameString - - thumb_func_start sub_81DB52C -sub_81DB52C: @ 81DB52C - push {r4,lr} - adds r4, r0, 0 - bl StringLength - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bhi _081DB546 - adds r0, r4, 0 - movs r1, 0x1 - bl ConvertInternationalString - b _081DB54C -_081DB546: - adds r0, r4, 0 - bl StripExtCtrlCodes -_081DB54C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81DB52C - - thumb_func_start sub_81DB554 -sub_81DB554: @ 81DB554 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - bl StringLength - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bhi _081DB572 - adds r0, r4, 0 - movs r1, 0x1 - bl ConvertInternationalString - b _081DB5A4 -_081DB572: - cmp r5, 0xFC - bne _081DB57E - adds r0, r4, 0 - bl StripExtCtrlCodes - b _081DB5A4 -_081DB57E: - adds r1, r4, 0 - b _081DB584 -_081DB582: - adds r1, 0x1 -_081DB584: - ldrb r0, [r1, 0x1] - cmp r0, 0xFF - bne _081DB582 - cmp r1, r4 - bcc _081DB5A4 - ldrb r0, [r1] - cmp r0, r5 - bne _081DB5A4 - movs r2, 0xFF -_081DB596: - strb r2, [r1] - subs r1, 0x1 - cmp r1, r4 - bcc _081DB5A4 - ldrb r0, [r1] - cmp r0, r5 - beq _081DB596 -_081DB5A4: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81DB554 - - thumb_func_start sub_81DB5AC -sub_81DB5AC: @ 81DB5AC - push {lr} - adds r2, r0, 0 - ldrb r0, [r2] - adds r2, 0x1 - cmp r0, 0xFC - bne _081DB5E4 - ldrb r0, [r2] - adds r2, 0x1 - cmp r0, 0x15 - bne _081DB5E4 - b _081DB5CE -_081DB5C2: - cmp r1, 0xFC - bne _081DB5CC - ldrb r0, [r2, 0x1] - cmp r0, 0x16 - beq _081DB5E4 -_081DB5CC: - adds r2, 0x1 -_081DB5CE: - ldrb r1, [r2] - adds r0, r1, 0 - cmp r0, 0xFF - bne _081DB5C2 - movs r0, 0xFC - strb r0, [r2] - adds r2, 0x1 - movs r0, 0x16 - strb r0, [r2] - movs r0, 0xFF - strb r0, [r2, 0x1] -_081DB5E4: - pop {r0} - bx r0 - thumb_func_end sub_81DB5AC - - thumb_func_start TVShowConvertInternationalString -TVShowConvertInternationalString: @ 81DB5E8 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r2, 0 - bl StringCopy - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl ConvertInternationalString - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end TVShowConvertInternationalString - - thumb_func_start sub_81DB604 -sub_81DB604: @ 81DB604 - push {lr} - adds r1, r0, 0 - ldrb r0, [r1] - cmp r0, 0xFC - bne _081DB618 - ldrb r0, [r1, 0x1] - cmp r0, 0x15 - bne _081DB618 - movs r0, 0x1 - b _081DB61A -_081DB618: - movs r0, 0x2 -_081DB61A: - pop {r1} - bx r1 - thumb_func_end sub_81DB604 - - thumb_func_start sub_81DB620 -sub_81DB620: @ 81DB620 - push {r4-r7,lr} - sub sp, 0x4 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 2 - ldr r0, =gWindows - adds r4, r0 - lsls r7, r3, 5 - ldrb r0, [r4, 0x3] - lsls r6, r0, 5 - muls r2, r6 - ldr r0, [r4, 0x8] - adds r0, r2 - lsls r1, 5 - adds r5, r0, r1 - ldr r0, [sp, 0x18] - cmp r0, 0 - ble _081DB66C - adds r4, r0, 0 -_081DB646: - ldr r0, =0x11111111 - str r0, [sp] - adds r2, r7, 0 - cmp r2, 0 - bge _081DB652 - adds r2, 0x3 -_081DB652: - lsls r2, 9 - lsrs r2, 11 - movs r0, 0x80 - lsls r0, 17 - orrs r2, r0 - mov r0, sp - adds r1, r5, 0 - bl CpuFastSet - adds r5, r6 - subs r4, 0x1 - cmp r4, 0 - bne _081DB646 -_081DB66C: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81DB620 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/international_string_util.h b/include/international_string_util.h index 343c5453c..2d5b1c871 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -2,22 +2,23 @@ #define GUARD_INTERNATIONAL_STRING_UTIL_H #include "menu.h" +#include "list_menu.h" -void sub_81DB52C(const u8 *src); -void TVShowConvertInternationalString(u8 *dest, const u8 *src, u8 language); -s32 GetStringCenterAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth); -s32 GetStringRightAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth); -s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); -s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); -s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1); -s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2); -// sub_81DB41C -// CopyMonCategoryText -// sub_81DB494 -void PadNameString(u8 *dst, u8 padWith); +void sub_81DB52C(u8 *src); +void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language); +int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth); +int GetStringRightAlignXOffset(int fontId, const u8 *str, int totalWidth); +int GetStringCenterAlignXOffsetWithLetterSpacing(int fontId, const u8 *str, int totalWidth, int letterSpacing); +int GetStringWidthDifference(int fontId, const u8 *str, int totalWidth, int letterSpacing); +int GetMaxWidthInMenuTable(const struct MenuAction *str, int arg1); +int sub_81DB3D8(const struct MenuAction *str, const u8* arg1, int arg2); +int sub_81DB41C(const struct ListMenuTemplate *listMenu); +void CopyMonCategoryText(int dexNum, u8 *dest); +u8 *sub_81DB494(u8 *str, int fontId, u8 *str2, int totalStringWidth); +void PadNameString(u8 *dest, u8 padChar); void sub_81DB554(u8 *, u8); void sub_81DB5AC(u8 *); -u32 sub_81DB604(const u8 *); -// sub_81DB620 +int sub_81DB604(u8 *); +void sub_81DB620(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows); #endif // GUARD_INTERNATIONAL_STRING_UTIL_H diff --git a/include/pokedex.h b/include/pokedex.h index 11e39997c..3f90e9508 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -4,13 +4,6 @@ extern u8 gUnknown_030060B0; extern void (*gUnknown_030060B4)(void); -void ResetPokedex(void); -void CopyMonCategoryText(u32 species, u8 *dst); -u16 GetPokedexHeightWeight(u16 dexNum, u8 data); -u16 GetNationalPokedexCount(u8); -u16 GetHoennPokedexCount(u8); -u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); - enum { FLAG_GET_SEEN, @@ -19,6 +12,24 @@ enum FLAG_SET_CAUGHT }; +struct PokedexEntry +{ + /*0x00*/ u8 categoryName[12]; + /*0x0C*/ u16 height; //in decimeters + /*0x0E*/ u16 weight; //in hectograms + /*0x10*/ const u8 *description; + /*0x14*/ u16 unused; + /*0x16*/ u16 pokemonScale; + /*0x18*/ u16 pokemonOffset; + /*0x1A*/ u16 trainerScale; + /*0x1C*/ u16 trainerOffset; +}; /*size = 0x20*/ + +void ResetPokedex(void); +u16 GetPokedexHeightWeight(u16 dexNum, u8 data); +u16 GetNationalPokedexCount(u8); +u16 GetHoennPokedexCount(u8); +u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); u16 sub_80C0E9C(u16, s16, s16, u16); diff --git a/include/text.h b/include/text.h index 27a6364bb..69cbb87ed 100644 --- a/include/text.h +++ b/include/text.h @@ -89,6 +89,13 @@ #define EXT_CTRL_CODE_COLOR 0x1 #define EXT_CTRL_CODE_HIGHLIGHT 0x2 #define EXT_CTRL_CODE_SHADOW 0x3 +// +#define EXT_CTRL_CODE_UNKNOWN_7 0x7 +// +#define EXT_CTRL_CODE_CLEAR 0x11 +// +#define EXT_CTRL_CODE_JPN 0x15 +#define EXT_CTRL_CODE_ENG 0x16 #define TEXT_COLOR_TRANSPARENT 0x0 #define TEXT_COLOR_WHITE 0x1 @@ -102,9 +109,6 @@ // battle placeholders are located in battle_message.h -#define EXT_CTRL_CODE_JPN 0x15 -#define EXT_CTRL_CODE_ENG 0x16 - #define NUM_TEXT_PRINTERS 32 #define TEXT_SPEED_FF 0xFF diff --git a/ld_script.txt b/ld_script.txt index 4a8032174..c03573534 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -297,7 +297,6 @@ SECTIONS { src/gym_leader_rematch.o(.text); src/unk_transition.o(.text); src/international_string_util.o(.text); - asm/international_string_util.o(.text); } =0 script_data : diff --git a/src/international_string_util.c b/src/international_string_util.c index 9de338c59..a7c42c39e 100644 --- a/src/international_string_util.c +++ b/src/international_string_util.c @@ -1,40 +1,46 @@ #include "global.h" -#include "text.h" #include "international_string_util.h" +#include "list_menu.h" +#include "pokedex.h" +#include "script_menu.h" +#include "string_util.h" +#include "strings.h" +#include "text.h" +#include "window.h" -extern s32 convert_pixel_width_to_tile_width(s32 a0); // script menu +extern const struct PokedexEntry gPokedexEntries[]; -s32 GetStringCenterAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth) +int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth) { return GetStringCenterAlignXOffsetWithLetterSpacing(fontId, str, totalWidth, 0); } -s32 GetStringRightAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth) +int GetStringRightAlignXOffset(int fontId, const u8 *str, int totalWidth) { return GetStringWidthDifference(fontId, str, totalWidth, 0); } -s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing) +int GetStringCenterAlignXOffsetWithLetterSpacing(int fontId, const u8 *str, int totalWidth, int letterSpacing) { return GetStringWidthDifference(fontId, str, totalWidth, letterSpacing) / 2; } -s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing) +int GetStringWidthDifference(int fontId, const u8 *str, int totalWidth, int letterSpacing) { - s32 stringWidth = GetStringWidth(fontId, str, letterSpacing); + int stringWidth = GetStringWidth(fontId, str, letterSpacing); if (totalWidth > stringWidth) return totalWidth - stringWidth; else return 0; } -s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1) +int GetMaxWidthInMenuTable(const struct MenuAction *str, int arg1) { - s32 i, var; + int i, var; for (var = 0, i = 0; i < arg1; i++) { - s32 stringWidth = GetStringWidth(1, str[i].text, 0); + int stringWidth = GetStringWidth(1, str[i].text, 0); if (stringWidth > var) var = stringWidth; } @@ -42,16 +48,192 @@ s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1) return convert_pixel_width_to_tile_width(var); } -s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2) +int sub_81DB3D8(const struct MenuAction *str, const u8* arg1, int arg2) { - s32 i, var; + int i, var; for (var = 0, i = 0; i < arg2; i++) { - s32 stringWidth = GetStringWidth(1, str[arg1[i]].text, 0); + int stringWidth = GetStringWidth(1, str[arg1[i]].text, 0); if (stringWidth > var) var = stringWidth; } return convert_pixel_width_to_tile_width(var); } + +int sub_81DB41C(const struct ListMenuTemplate *listMenu) +{ + int i, maxWidth, finalWidth; + const struct ListMenuItem *items = listMenu->items; + + maxWidth = 0; + for (i = 0; i < listMenu->totalItems; i++) + { + int width = GetStringWidth(listMenu->fontId, items[i].name, 0); + if (width > maxWidth) + maxWidth = width; + } + + finalWidth = maxWidth + listMenu->item_X + 9; + if (finalWidth < 0) + finalWidth += 7; + + finalWidth >>= 3; + if (finalWidth > 28) + finalWidth = 28; + + return finalWidth; +} + +void CopyMonCategoryText(int dexNum, u8 *dest) +{ + u8 *str = StringCopy(dest, gPokedexEntries[dexNum].categoryName); + *str = CHAR_SPACE; + StringCopy(str + 1, gText_Pokemon); +} + +u8 *sub_81DB494(u8 *str, int fontId, u8 *str2, int totalStringWidth) +{ + u8 *buffer; + int width; + int clearWidth; + + if (str2) + { + buffer = StringCopy(str, str2); + width = GetStringWidth(fontId, str2, 0); + } + else + { + buffer = str; + width = 0; + } + + clearWidth = totalStringWidth - width; + if (clearWidth > 0) + { + *buffer = EXT_CTRL_CODE_BEGIN; + buffer++; + *buffer = EXT_CTRL_CODE_CLEAR; + buffer++; + *buffer = clearWidth; + buffer++; + *buffer = EOS; + } + + return buffer; +} + +void PadNameString(u8 *dest, u8 padChar) +{ + u8 length; + + StripExtCtrlCodes(dest); + length = StringLength(dest); + if (padChar == EXT_CTRL_CODE_BEGIN) + { + while (length < PLAYER_NAME_LENGTH - 1) + { + dest[length] = EXT_CTRL_CODE_BEGIN; + dest[length + 1] = EXT_CTRL_CODE_UNKNOWN_7; + length += 2; + } + } + else + { + while (length < PLAYER_NAME_LENGTH - 1) + { + dest[length] = padChar; + length++; + } + } + + dest[length] = EOS; +} + +void sub_81DB52C(u8 *str) +{ + if (StringLength(str) < PLAYER_NAME_LENGTH - 1) + ConvertInternationalString(str, LANGUAGE_JAPANESE); + else + StripExtCtrlCodes(str); +} + +void sub_81DB554(u8 *str, u8 arg1) +{ + u8 *buffer; + if (StringLength(str) < PLAYER_NAME_LENGTH - 1) + { + ConvertInternationalString(str, LANGUAGE_JAPANESE); + } + else if (arg1 == EXT_CTRL_CODE_BEGIN) + { + StripExtCtrlCodes(str); + } + else + { + buffer = str; + while (buffer[1] != EOS) + buffer++; + + while (buffer >= str && buffer[0] == arg1) + { + buffer[0] = EOS; + buffer--; + } + } +} + +void sub_81DB5AC(u8 *str) +{ + if (*str++ == EXT_CTRL_CODE_BEGIN && *str++ == EXT_CTRL_CODE_JPN) + { + while (*str != EOS) + { + if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_ENG) + return; + + str++; + } + + *str++ = EXT_CTRL_CODE_BEGIN; + *str++ = EXT_CTRL_CODE_ENG; + *str = EOS; + } +} + +void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language) +{ + StringCopy(dest, src); + ConvertInternationalString(dest, language); +} + +int sub_81DB604(u8 *str) +{ + if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_JPN) + return LANGUAGE_JAPANESE; + else + return LANGUAGE_ENGLISH; +} + +void sub_81DB620(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows) +{ + u8 *windowTileData; + int fillSize, windowRowSize, rowsToFill; + struct Window *window = &gWindows[windowId]; + + fillSize = numFillTiles * TILE_SIZE_4BPP; + windowRowSize = window->window.width * TILE_SIZE_4BPP; + windowTileData = window->tileData + (rowStart * windowRowSize) + (columnStart * TILE_SIZE_4BPP); + if (numRows > 0) + { + rowsToFill = numRows; + while (rowsToFill) + { + CpuFastFill8(0x11, windowTileData, fillSize); + windowTileData += windowRowSize; + rowsToFill--; + } + } +} diff --git a/src/pokedex.c b/src/pokedex.c index 66a68f0bd..fa3faab84 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -42,19 +42,6 @@ static EWRAM_DATA struct PokedexListItem *gUnknown_02039B54 = NULL; u8 gUnknown_030060B0; void (*gUnknown_030060B4)(void); -struct PokedexEntry -{ - /*0x00*/ u8 categoryName[12]; - /*0x0C*/ u16 height; //in decimeters - /*0x0E*/ u16 weight; //in hectograms - /*0x10*/ const u8 *description; - /*0x14*/ u16 unused; - /*0x16*/ u16 pokemonScale; - /*0x18*/ u16 pokemonOffset; - /*0x1A*/ u16 trainerScale; - /*0x1C*/ u16 trainerOffset; -}; /*size = 0x20*/ - struct UnknownStruct2 { const u8 *text1; diff --git a/src/record_mixing.c b/src/record_mixing.c index 5f1aef1df..df4a1a720 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1848,7 +1848,7 @@ static void SanitizeDayCareMailForRuby(struct RecordMixingDayCareMail *src) if (mail->message.itemId != 0) { if (mail->gameLanguage != LANGUAGE_JAPANESE) - PadNameString(mail->OT_name, 0xFC); + PadNameString(mail->OT_name, EXT_CTRL_CODE_BEGIN); ConvertInternationalString(mail->monName, mail->monLanguage); } diff --git a/src/text.c b/src/text.c index ecd3a3095..07c15596e 100644 --- a/src/text.c +++ b/src/text.c @@ -1539,7 +1539,7 @@ u16 RenderText(struct TextPrinter *textPrinter) subStruct->glyphId = *textPrinter->printerTemplate.currentChar; textPrinter->printerTemplate.currentChar++; return 2; - case 7: + case EXT_CTRL_CODE_UNKNOWN_7: return 2; case 8: textPrinter->delayCounter = *textPrinter->printerTemplate.currentChar; @@ -1591,7 +1591,7 @@ u16 RenderText(struct TextPrinter *textPrinter) case 24: m4aMPlayContinue(&gMPlayInfo_BGM); return 2; - case 17: + case EXT_CTRL_CODE_CLEAR: width = *textPrinter->printerTemplate.currentChar; textPrinter->printerTemplate.currentChar++; if (width > 0) @@ -1622,10 +1622,10 @@ u16 RenderText(struct TextPrinter *textPrinter) case 20: textPrinter->minLetterSpacing = *textPrinter->printerTemplate.currentChar++; return 2; - case 21: + case EXT_CTRL_CODE_JPN: textPrinter->japanese = 1; return 2; - case 22: + case EXT_CTRL_CODE_ENG: textPrinter->japanese = 0; return 2; } @@ -1810,12 +1810,12 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) case 0x14: ++strPos; break; - case 0x7: + case EXT_CTRL_CODE_UNKNOWN_7: case 0x9: case 0xA: case 0xF: - case 0x15: - case 0x16: + case EXT_CTRL_CODE_JPN: + case EXT_CTRL_CODE_ENG: default: break; } @@ -1970,13 +1970,13 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) case 0x14: minGlyphWidth = *++str; break; - case 0x15: + case EXT_CTRL_CODE_JPN: isJapanese = 1; break; - case 0x16: + case EXT_CTRL_CODE_ENG: isJapanese = 0; break; - case 0x7: + case EXT_CTRL_CODE_UNKNOWN_7: case 0x9: case 0xA: case 0xF: @@ -2096,12 +2096,12 @@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str) case 0x14: ++strPos; break; - case 0x7: + case EXT_CTRL_CODE_UNKNOWN_7: case 0x9: case 0xA: case 0xF: - case 0x15: - case 0x16: + case EXT_CTRL_CODE_JPN: + case EXT_CTRL_CODE_ENG: default: continue; } -- cgit v1.2.3 From 0148e389738d857d473a54d612115cd51fbb8606 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 28 Nov 2018 10:14:32 -0600 Subject: Decompile pokedex_cry_screen.c (#406) --- asm/pokedex_cry_screen.s | 1010 ------------------------------------------ data/pokedex_cry_screen.s | 110 ----- graphics/pokedex/85B8BF0.pal | 19 - graphics/pokedex/85B8C10.png | Bin 0 -> 135 bytes include/main.h | 2 +- include/pokedex_cry_screen.h | 2 +- ld_script.txt | 4 +- src/main.c | 2 +- src/pokedex.c | 6 +- src/pokedex_cry_screen.c | 511 +++++++++++++++++++++ sym_common.txt | 2 +- sym_ewram.txt | 10 +- 12 files changed, 521 insertions(+), 1157 deletions(-) delete mode 100644 asm/pokedex_cry_screen.s delete mode 100644 data/pokedex_cry_screen.s delete mode 100644 graphics/pokedex/85B8BF0.pal create mode 100755 graphics/pokedex/85B8C10.png create mode 100755 src/pokedex_cry_screen.c diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s deleted file mode 100644 index 846b20881..000000000 --- a/asm/pokedex_cry_screen.s +++ /dev/null @@ -1,1010 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8145354 -sub_8145354: @ 8145354 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - lsls r1, 24 - lsrs r7, r1, 24 - movs r0, 0 - mov r8, r0 - ldr r0, =gUnknown_030061EC - ldrb r0, [r0] - cmp r0, 0x1 - beq _081453F8 - cmp r0, 0x1 - bgt _0814537C - cmp r0, 0 - beq _08145382 - b _0814544A - .pool -_0814537C: - cmp r0, 0x2 - beq _08145434 - b _0814544A -_08145382: - ldr r5, =gUnknown_0203AB90 - ldr r0, [r5] - cmp r0, 0 - bne _0814539E - movs r0, 0x1C - bl AllocZeroed - str r0, [r5] - ldr r4, =gUnknown_0203AB94 - adds r0, r7, 0 - movs r1, 0x7 - bl GetWindowAttribute - str r0, [r4] -_0814539E: - ldr r1, [r5] - ldrh r0, [r6] - movs r2, 0 - strh r0, [r1, 0x14] - ldrb r0, [r6, 0x5] - strb r0, [r1, 0x16] - ldr r0, [r5] - strb r2, [r0, 0x1A] - ldr r0, [r5] - strb r2, [r0, 0x1B] - ldr r0, [r5] - strb r2, [r0, 0x10] - ldr r1, [r5] - movs r0, 0x1C - strb r0, [r1, 0x12] - ldr r0, [r5] - strb r2, [r0, 0x11] - ldrb r1, [r6, 0x4] - lsls r1, 19 - negs r1, r1 - asrs r1, 16 - adds r0, r7, 0 - movs r2, 0x1 - bl sub_8145824 - movs r4, 0 -_081453D2: - adds r0, r7, 0 - ldr r1, =gUnknown_085B8C10 - movs r2, 0x20 - adds r3, r4, 0 - bl CopyToWindowPixelBuffer - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xDF - bls _081453D2 - b _08145420 - .pool -_081453F8: - movs r4, 0 - ldr r1, =gUnknown_0203AB90 - ldr r0, [r1] - ldrb r0, [r0, 0x16] - lsls r0, 3 - cmp r8, r0 - bge _08145420 - adds r5, r1, 0 -_08145408: - adds r0, r4, 0 - movs r1, 0 - bl sub_81456A8 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, [r5] - ldrb r0, [r0, 0x16] - lsls r0, 3 - cmp r4, r0 - blt _08145408 -_08145420: - ldr r1, =gUnknown_030061EC - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _0814544A - .pool -_08145434: - adds r0, r7, 0 - bl sub_8145814 - ldr r0, =gUnknown_085B8BF0 - ldrb r1, [r6, 0x3] - lsls r1, 4 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x1 - mov r8, r0 -_0814544A: - mov r0, r8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8145354 - - thumb_func_start sub_814545C -sub_814545C: @ 814545C - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl sub_8145814 - adds r0, r4, 0 - bl sub_8145648 - ldr r2, =gUnknown_0203AB90 - ldr r1, [r2] - ldrb r0, [r1, 0x1B] - cmp r0, 0 - beq _0814547E - subs r0, 0x1 - strb r0, [r1, 0x1B] -_0814547E: - ldr r1, [r2] - ldrb r0, [r1, 0x1A] - cmp r0, 0 - beq _081454A4 - subs r0, 0x1 - strb r0, [r1, 0x1A] - ldr r1, [r2] - ldrb r0, [r1, 0x1A] - cmp r0, 0 - bne _081454A4 - ldrh r0, [r1, 0x18] - bl sub_8145588 - bl sub_814560C - b _0814552A - .pool -_081454A4: - ldr r5, =gUnknown_0203AB90 - ldr r0, [r5] - ldrb r0, [r0, 0x10] - cmp r0, 0 - bne _081454B8 - bl sub_814560C - b _0814552A - .pool -_081454B8: - cmp r0, 0x1 - bne _081454C2 - bl sub_81455A8 - b _081454E6 -_081454C2: - cmp r0, 0x8 - bls _081454E6 - bl IsCryPlaying - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _081454DC - bl sub_814560C - ldr r0, [r5] - strb r4, [r0, 0x10] - b _0814552A -_081454DC: - bl sub_81455A8 - ldr r1, [r5] - movs r0, 0x1 - strb r0, [r1, 0x10] -_081454E6: - ldr r5, =gUnknown_0203AB90 - ldr r1, [r5] - ldrb r4, [r1, 0x10] - subs r4, 0x1 - lsls r4, 25 - lsrs r4, 24 - ldrb r0, [r1, 0x16] - lsls r0, 3 - ldrb r2, [r1, 0x11] - adds r0, r2 - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - adds r1, r4 - ldrb r1, [r1] - bl sub_81456A8 - ldr r1, [r5] - ldrb r0, [r1, 0x16] - lsls r0, 3 - ldrb r2, [r1, 0x11] - adds r0, r2 - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - adds r4, 0x1 - adds r1, r4 - ldrb r1, [r1] - bl sub_81456A8 - ldr r1, [r5] - ldrb r0, [r1, 0x10] - adds r0, 0x1 - strb r0, [r1, 0x10] -_0814552A: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814545C - - thumb_func_start sub_8145534 -sub_8145534: @ 8145534 - push {r4-r6,lr} - lsls r0, 16 - lsrs r4, r0, 16 - adds r5, r4, 0 - ldr r0, =gMPlayInfo_BGM - ldr r0, [r0, 0x4] - cmp r0, 0 - bge _08145582 - ldr r6, =gUnknown_0203AB90 - ldr r1, [r6] - ldrb r0, [r1, 0x1A] - cmp r0, 0 - bne _08145582 - ldrb r0, [r1, 0x1B] - cmp r0, 0 - bne _08145582 - movs r0, 0x4 - strb r0, [r1, 0x1B] - bl IsCryPlaying - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0814557C - bl StopCry - ldr r1, [r6] - strh r4, [r1, 0x18] - movs r0, 0x2 - strb r0, [r1, 0x1A] - b _08145582 - .pool -_0814557C: - adds r0, r5, 0 - bl sub_8145588 -_08145582: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8145534 - - thumb_func_start sub_8145588 -sub_8145588: @ 8145588 - push {lr} - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - movs r2, 0x7D - movs r3, 0xA - bl PlayCry2 - ldr r0, =gUnknown_0203AB90 - ldr r1, [r0] - movs r0, 0x1 - strb r0, [r1, 0x10] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8145588 - - thumb_func_start sub_81455A8 -sub_81455A8: @ 81455A8 - push {r4,lr} - ldr r3, =gPcmDmaCounter - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r0, 0x1 - bgt _081455C0 - ldr r0, =gSoundInfo + 0x350 - b _081455D8 - .pool -_081455C0: - ldr r2, =gSoundInfo - ldrb r1, [r2, 0xB] - movs r0, 0 - ldrsb r0, [r3, r0] - subs r0, 0x1 - subs r1, r0 - ldr r0, [r2, 0x10] - muls r0, r1 - movs r1, 0xD4 - lsls r1, 2 - adds r2, r1 - adds r0, r2 -_081455D8: - movs r1, 0xC6 - lsls r1, 3 - adds r3, r0, r1 - movs r2, 0 - ldr r4, =gUnknown_0203AB90 -_081455E2: - ldr r1, [r4] - adds r1, r2 - lsls r0, r2, 1 - adds r0, r3 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 1 - strb r0, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xF - bls _081455E2 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81455A8 - - thumb_func_start sub_814560C -sub_814560C: @ 814560C - push {r4,lr} - ldr r4, =gUnknown_0203AB90 - ldr r1, [r4] - ldrb r0, [r1, 0x16] - lsls r0, 3 - ldrb r1, [r1, 0x11] - adds r0, r1 - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl sub_81456A8 - ldr r1, [r4] - ldrb r0, [r1, 0x16] - lsls r0, 3 - ldrb r1, [r1, 0x11] - adds r0, r1 - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl sub_81456A8 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814560C - - thumb_func_start sub_8145648 -sub_8145648: @ 8145648 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r4, =gUnknown_0203AB90 - ldr r0, [r4] - ldrb r1, [r0, 0x11] - adds r0, r6, 0 - movs r2, 0 - bl sub_8145824 - ldr r1, [r4] - ldrb r0, [r1, 0x11] - adds r0, 0x2 - strb r0, [r1, 0x11] - ldr r1, [r4] - ldrb r0, [r1, 0x11] - lsrs r0, 3 - ldrb r1, [r1, 0x16] - adds r1, r0, r1 - adds r2, r1, 0x1 - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - lsls r0, 16 - lsrs r5, r0, 16 - movs r4, 0 -_0814567E: - lsls r3, r4, 5 - adds r3, r5, r3 - lsls r3, 16 - lsrs r3, 16 - adds r0, r6, 0 - ldr r1, =gUnknown_085B8C10 - movs r2, 0x20 - bl CopyToWindowPixelBuffer - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x6 - bls _0814567E - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8145648 - - thumb_func_start sub_81456A8 -sub_81456A8: @ 81456A8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r7, r0, 24 - lsrs r4, r7, 24 - lsls r1, 24 - movs r0, 0xFE - lsls r0, 23 - adds r1, r0 - lsrs r1, 16 - adds r0, r1, 0 - bl __floatsidf - ldr r3, _08145768 - ldr r2, _08145764 - bl __divdf3 - bl __fixunsdfsi - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x37 - bls _081456DE - movs r5, 0x37 -_081456DE: - str r5, [sp] - movs r6, 0x1 - ands r6, r4 - ldr r0, _0814576C - ldr r1, [r0] - lsrs r7, 27 - mov r8, r7 - ldr r0, _08145770 - ldrb r1, [r1, 0x12] - cmp r5, r1 - bls _08145780 - ldr r3, _08145774 - adds r0, r6, r0 - ldrb r0, [r0] - mov r9, r0 - movs r7, 0x7 - ands r7, r4 -_08145700: - lsls r1, r5, 1 - lsls r0, r7, 3 - adds r0, r7 - lsls r0, 4 - adds r1, r0 - ldr r2, _08145778 - adds r1, r2 - mov r4, r8 - lsls r0, r4, 5 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 - ldr r1, [r3] - adds r1, r2 - ldrb r0, [r1] - mov r4, r9 - ands r0, r4 - strb r0, [r1] - ldr r4, [r3] - adds r4, r2 - adds r0, r5, 0 - movs r1, 0x3 - str r3, [sp, 0x4] - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - movs r1, 0xF - ands r0, r1 - lsls r1, r6, 4 - adds r0, r1 - ldr r1, _0814577C - adds r0, r1 - ldrb r1, [r4] - ldrb r0, [r0] - orrs r1, r0 - strb r1, [r4] - subs r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r2, _0814576C - ldr r0, [r2] - ldr r3, [sp, 0x4] - ldrb r0, [r0, 0x12] - cmp r5, r0 - bhi _08145700 - b _081457EA - .align 2, 0 -_08145764: .4byte 0x40920000 -_08145768: .4byte 0x00000000 -_0814576C: .4byte gUnknown_0203AB90 -_08145770: .4byte gUnknown_085B8C30 -_08145774: .4byte gUnknown_0203AB94 -_08145778: .4byte gUnknown_085B8770 -_0814577C: .4byte gUnknown_085B8C32 -_08145780: - lsls r3, r6, 4 - mov r10, r3 - ldr r7, _08145804 - adds r0, r6, r0 - ldrb r0, [r0] - mov r9, r0 - movs r6, 0x7 - ands r6, r4 -_08145790: - lsls r1, r5, 1 - lsls r0, r6, 3 - adds r0, r6 - lsls r0, 4 - adds r1, r0 - ldr r4, _08145808 - adds r1, r4 - mov r2, r8 - lsls r0, r2, 5 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 - ldr r1, [r7] - adds r1, r2 - ldrb r0, [r1] - mov r3, r9 - ands r0, r3 - strb r0, [r1] - ldr r4, [r7] - adds r4, r2 - adds r0, r5, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - movs r1, 0xF - ands r0, r1 - add r0, r10 - ldr r1, _0814580C - adds r0, r1 - ldrb r1, [r4] - ldrb r0, [r0] - orrs r1, r0 - strb r1, [r4] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r2, _08145810 - ldr r0, [r2] - ldrb r0, [r0, 0x12] - cmp r5, r0 - bcc _08145790 -_081457EA: - ldr r3, _08145810 - ldr r0, [r3] - mov r4, sp - ldrb r4, [r4] - strb r4, [r0, 0x12] - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08145804: .4byte gUnknown_0203AB94 -_08145808: .4byte gUnknown_085B8770 -_0814580C: .4byte gUnknown_085B8C32 -_08145810: .4byte gUnknown_0203AB90 - thumb_func_end sub_81456A8 - - thumb_func_start sub_8145814 -sub_8145814: @ 8145814 - push {lr} - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x2 - bl CopyWindowToVram - pop {r0} - bx r0 - thumb_func_end sub_8145814 - - thumb_func_start sub_8145824 -sub_8145824: @ 8145824 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 16 - lsrs r4, r1, 16 - lsls r2, 24 - cmp r2, 0 - bne _08145848 - movs r1, 0 - bl GetWindowAttribute - lsls r0, 24 - lsrs r0, 24 - lsls r1, r4, 16 - asrs r1, 8 - movs r2, 0 - bl ChangeBgX -_08145848: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8145824 - - thumb_func_start sub_8145850 -sub_8145850: @ 8145850 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - lsls r1, 24 - lsrs r7, r1, 24 - movs r0, 0 - mov r8, r0 - ldr r6, =gUnknown_030061EC - ldrb r0, [r6] - cmp r0, 0 - beq _08145874 - cmp r0, 0x1 - beq _081458B0 - b _081458F8 - .pool -_08145874: - ldr r5, =gUnknown_0203AB98 - ldr r0, [r5] - cmp r0, 0 - bne _08145884 - movs r0, 0x8 - bl AllocZeroed - str r0, [r5] -_08145884: - ldr r1, =gUnknown_085B8438 - adds r0, r7, 0 - movs r2, 0 - movs r3, 0 - bl CopyToWindowPixelBuffer - ldr r0, =gUnknown_085B8418 - ldrb r1, [r4, 0x3] - lsls r1, 4 - movs r2, 0x20 - bl LoadPalette - ldrb r0, [r6] - adds r0, 0x1 - strb r0, [r6] - b _081458F8 - .pool -_081458B0: - ldr r0, =gCryMeterNeedleSpriteSheets - bl LoadSpriteSheets - ldr r0, =gCryMeterNeedleSpritePalettes - bl LoadSpritePalettes - ldr r0, =gUnknown_085B8C68 - ldrb r1, [r4, 0x4] - lsls r1, 19 - movs r2, 0xA0 - lsls r2, 14 - adds r1, r2 - asrs r1, 16 - ldrb r2, [r4, 0x5] - lsls r2, 19 - movs r3, 0xE0 - lsls r3, 14 - adds r2, r3 - asrs r2, 16 - movs r3, 0x1 - bl CreateSprite - ldr r2, =gUnknown_0203AB98 - ldr r3, [r2] - lsls r0, 24 - lsrs r0, 24 - movs r4, 0 - strh r0, [r3, 0x4] - movs r1, 0x20 - strb r1, [r3] - ldr r0, [r2] - strb r1, [r0, 0x1] - ldr r0, [r2] - strb r4, [r0, 0x2] - movs r0, 0x1 - mov r8, r0 -_081458F8: - mov r0, r8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8145850 - - thumb_func_start sub_8145914 -sub_8145914: @ 8145914 - push {r4-r6,lr} - ldr r4, =gSprites - ldr r6, =gUnknown_0203AB98 - ldr r0, [r6] - ldrh r1, [r0, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x5] - lsrs r0, 4 - bl GetSpritePaletteTagByPaletteNum - lsls r0, 16 - lsrs r0, 16 - bl FreeSpritePaletteByTag - ldr r0, [r6] - ldrh r1, [r0, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl DestroySprite - ldr r4, =gUnknown_0203AB90 - ldr r0, [r4] - bl Free - movs r5, 0 - str r5, [r4] - ldr r0, [r6] - bl Free - str r5, [r6] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8145914 - - thumb_func_start sub_814596C -sub_814596C: @ 814596C - push {r4-r7,lr} - sub sp, 0x14 - adds r7, r0, 0 - ldr r3, =gSprites - ldr r4, =gUnknown_0203AB98 - ldr r0, [r4] - ldrh r1, [r0, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrb r2, [r0, 0x1] - movs r1, 0x4 - negs r1, r1 - ands r1, r2 - movs r2, 0x1 - orrs r1, r2 - strb r1, [r0, 0x1] - ldr r2, [r4] - ldrh r1, [r2, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - movs r1, 0 - strh r1, [r0, 0x6] - ldr r0, =gUnknown_0203AB90 - ldr r0, [r0] - ldrb r1, [r0, 0x10] - cmp r1, 0x2 - beq _081459E8 - cmp r1, 0x2 - bgt _081459C0 - cmp r1, 0 - beq _081459C6 - b _08145A2E - .pool -_081459C0: - cmp r1, 0x6 - beq _08145A20 - b _08145A2E -_081459C6: - movs r0, 0x20 - strb r0, [r2, 0x1] - ldr r1, [r4] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - ble _081459E2 - ldrb r0, [r1, 0x2] - add r4, sp, 0xC - cmp r0, 0x1 - beq _08145A30 - subs r0, 0x1 - strb r0, [r1, 0x2] - b _08145A30 -_081459E2: - movs r0, 0x5 - strb r0, [r1, 0x2] - b _08145A2E -_081459E8: - movs r3, 0 - movs r2, 0 - add r4, sp, 0xC - adds r5, r0, 0 -_081459F0: - lsls r1, r3, 24 - asrs r1, 24 - adds r0, r5, r2 - ldrb r0, [r0] - cmp r1, r0 - bge _081459FE - adds r3, r0, 0 -_081459FE: - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0xF - bls _081459F0 - lsls r0, r3, 24 - asrs r0, 24 - movs r1, 0xD0 - muls r0, r1 - cmp r0, 0 - bge _08145A16 - adds r0, 0xFF -_08145A16: - lsls r0, 16 - asrs r0, 24 - bl sub_8145B24 - b _08145A30 -_08145A20: - ldrb r1, [r0, 0xA] - movs r0, 0xD0 - muls r0, r1 - lsls r0, 16 - asrs r0, 24 - bl sub_8145B24 -_08145A2E: - add r4, sp, 0xC -_08145A30: - ldr r0, =gUnknown_0203AB98 - ldr r2, [r0] - ldrb r5, [r2] - movs r1, 0 - ldrsb r1, [r2, r1] - movs r3, 0x1 - ldrsb r3, [r2, r3] - adds r6, r0, 0 - cmp r1, r3 - beq _08145A82 - cmp r1, r3 - bge _08145A64 - ldrb r0, [r2, 0x2] - adds r0, r5, r0 - strb r0, [r2] - ldr r2, [r6] - movs r1, 0 - ldrsb r1, [r2, r1] - ldrb r3, [r2, 0x1] - movs r0, 0x1 - ldrsb r0, [r2, r0] - cmp r1, r0 - ble _08145A82 - b _08145A7A - .pool -_08145A64: - ldrb r0, [r2, 0x2] - subs r0, r5, r0 - strb r0, [r2] - ldr r2, [r6] - movs r1, 0 - ldrsb r1, [r2, r1] - ldrb r3, [r2, 0x1] - movs r0, 0x1 - ldrsb r0, [r2, r0] - cmp r1, r0 - bge _08145A82 -_08145A7A: - strb r3, [r2] - ldr r1, [r6] - movs r0, 0 - strb r0, [r1, 0x1] -_08145A82: - ldr r2, =0xffff0000 - ldr r0, [sp, 0x4] - ands r0, r2 - movs r1, 0x80 - lsls r1, 1 - orrs r0, r1 - ldr r1, =0x0000ffff - ands r0, r1 - movs r1, 0x80 - lsls r1, 17 - orrs r0, r1 - str r0, [sp, 0x4] - ldr r0, [r6] - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r1, 24 - lsrs r1, 16 - ldr r0, [sp, 0x8] - ands r0, r2 - orrs r0, r1 - str r0, [sp, 0x8] - add r0, sp, 0x4 - adds r1, r4, 0 - movs r2, 0x1 - movs r3, 0x2 - bl ObjAffineSet - add r0, sp, 0xC - ldrh r1, [r0] - ldrh r2, [r4, 0x2] - ldrh r3, [r4, 0x4] - ldrh r0, [r4, 0x6] - str r0, [sp] - movs r0, 0 - bl SetOamMatrix - ldr r2, =gSineTable - ldr r0, [r6] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x7F - movs r1, 0xFF - ands r0, r1 - lsls r1, r0, 1 - adds r1, r2 - adds r0, 0x40 - lsls r0, 1 - adds r0, r2 - ldrh r2, [r0] - movs r0, 0 - ldrsh r1, [r1, r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - cmp r0, 0 - bge _08145AF6 - adds r0, 0xFF -_08145AF6: - asrs r0, 8 - strh r0, [r7, 0x24] - lsls r1, r2, 16 - asrs r1, 16 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - cmp r0, 0 - bge _08145B0A - adds r0, 0xFF -_08145B0A: - asrs r0, 8 - strh r0, [r7, 0x26] - add sp, 0x14 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814596C - - thumb_func_start sub_8145B24 -sub_8145B24: @ 8145B24 - push {lr} - lsls r0, 24 - asrs r0, 24 - movs r1, 0x20 - subs r2, r1, r0 - movs r0, 0xFF - ands r2, r0 - adds r0, r2, 0 - subs r0, 0x21 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xBE - bhi _08145B40 - movs r2, 0xE0 -_08145B40: - ldr r1, =gUnknown_0203AB98 - ldr r0, [r1] - strb r2, [r0, 0x1] - ldr r1, [r1] - movs r0, 0x5 - strb r0, [r1, 0x2] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8145B24 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s deleted file mode 100644 index 4b84c3ece..000000000 --- a/data/pokedex_cry_screen.s +++ /dev/null @@ -1,110 +0,0 @@ - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -CryMeterNeedlePalette: @ 85B7B58 - .incbin "graphics/pokedex/cry_meter_needle.gbapal" - - .align 2 -CryMeterNeedleTiles: @ 85B7B78 - .incbin "graphics/pokedex/cry_meter_needle.4bpp" - - .align 1 -gUnknown_085B8378:: @ 85B8378 - .incbin "graphics/pokedex/cry_meter_map.bin" - - .align 1 -gUnknown_085B8418:: @ 85B8418 - .incbin "graphics/pokedex/cry_meter.gbapal" - - .align 2 -gUnknown_085B8438:: @ 85B8438 - .incbin "graphics/pokedex/cry_meter.4bpp.lz" - - .align 1 -gUnknown_085B8770:: @ 85B8770 - .2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C - .2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C - .2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D - .2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D - .2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E - .2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E - .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F - .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F - - .align 1 -gUnknown_085B8BF0:: @ 85B8BF0 - .incbin "graphics/pokedex/85B8BF0.gbapal" - -gUnknown_085B8C10:: @ 85B8C10 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x11 - .byte 0x22 - .byte 0x22 - .byte 0x22 - .byte 0x22 - -gUnknown_085B8C30:: @ 85B8C30 - .byte 0xF0, 0x0F - -gUnknown_085B8C32:: @ 85B8C32 - .byte 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F - .byte 0xF0,0xE0,0xD0,0xC0,0xB0,0xA0,0x90,0x80,0x80,0x90,0xA0,0xB0,0xC0,0xD0,0xE0,0xF0 - - .align 2 -gSpriteAnim_85B8C54:: @ 85B8C54 - obj_image_anim_frame 0, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_85B8C5C:: @ 85B8C5C - .4byte gSpriteAnim_85B8C54 - - .align 2 -gOamData_85B8C60:: @ 85B8C60 - .2byte 0x01A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gUnknown_085B8C68:: @ 85B8C68 - spr_template 8192, 8192, gOamData_85B8C60, gSpriteAnimTable_85B8C5C, NULL, gDummySpriteAffineAnimTable, sub_814596C - - .align 2 -gCryMeterNeedleSpriteSheets:: @ 85B8C80 - obj_tiles CryMeterNeedleTiles, 0x800, 8192 - null_obj_tiles - - .align 2 -gCryMeterNeedleSpritePalettes:: @ 85B8C90 - obj_pal CryMeterNeedlePalette, 8192 - null_obj_pal diff --git a/graphics/pokedex/85B8BF0.pal b/graphics/pokedex/85B8BF0.pal deleted file mode 100644 index 969c38cbd..000000000 --- a/graphics/pokedex/85B8BF0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 148 -0 131 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -148 148 255 -156 156 255 -172 172 255 -189 189 255 -205 205 255 -222 222 255 -238 238 255 -255 255 255 diff --git a/graphics/pokedex/85B8C10.png b/graphics/pokedex/85B8C10.png new file mode 100755 index 000000000..ef52a4138 Binary files /dev/null and b/graphics/pokedex/85B8C10.png differ diff --git a/include/main.h b/include/main.h index 47b26b1c7..0d441035d 100644 --- a/include/main.h +++ b/include/main.h @@ -51,7 +51,7 @@ extern bool8 gSoftResetDisabled; extern IntrFunc gIntrTable[]; extern u8 gLinkVSyncDisabled; extern u32 IntrMain_Buffer[]; -extern u8 gPcmDmaCounter; +extern s8 gPcmDmaCounter; void AgbMain(void); void SetMainCallback2(MainCallback callback); diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h index 6b5cc13f2..392e80a6d 100755 --- a/include/pokedex_cry_screen.h +++ b/include/pokedex_cry_screen.h @@ -13,7 +13,7 @@ struct CryRelatedStruct bool8 sub_8145354(struct CryRelatedStruct*, u8); void sub_814545C(u8); void sub_8145534(u16); -void sub_8145914(void); bool8 sub_8145850(struct CryRelatedStruct*, u8); +void sub_8145914(void); #endif diff --git a/ld_script.txt b/ld_script.txt index c03573534..31a9c3aac 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -206,7 +206,7 @@ SECTIONS { asm/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); asm/roulette.o(.text); - asm/pokedex_cry_screen.o(.text); + src/pokedex_cry_screen.o(.text); src/coins.o(.text); src/landmark.o(.text); src/fldeff_strength.o(.text); @@ -522,7 +522,7 @@ SECTIONS { data/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); data/roulette.o(.rodata); - data/pokedex_cry_screen.o(.rodata); + src/pokedex_cry_screen.o(.rodata); src/landmark.o(.rodata); src/battle_transition.o(.rodata); src/battle_controller_link_partner.o(.rodata); diff --git a/src/main.c b/src/main.c index 4c71ed1f9..d069ab3bc 100644 --- a/src/main.c +++ b/src/main.c @@ -69,7 +69,7 @@ bool8 gSoftResetDisabled; IntrFunc gIntrTable[INTR_COUNT]; u8 gLinkVSyncDisabled; u32 IntrMain_Buffer[0x200]; -u8 gPcmDmaCounter; +s8 gPcmDmaCounter; static EWRAM_DATA u16 gTrainerId = 0; diff --git a/src/pokedex.c b/src/pokedex.c index fa3faab84..3d06a0417 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -30,7 +30,7 @@ #include "constants/songs.h" #include "constants/species.h" -extern u8 gUnknown_030061EC; +extern u8 gDexCryScreenState; // EWRAM static EWRAM_DATA struct PokedexView *gUnknown_02039B4C = NULL; @@ -3232,7 +3232,7 @@ void sub_80BF250(u8 taskId) case 5: gTasks[taskId].data[4] = sub_80C0E9C(gUnknown_02039B54->dexNum, 48, 56, 0); gSprites[gTasks[taskId].data[4]].oam.priority = 0; - gUnknown_030061EC = 0; + gDexCryScreenState = 0; gMain.state++; break; case 6: @@ -3247,7 +3247,7 @@ void sub_80BF250(u8 taskId) if (sub_8145354(&sp4, 2) != 0) { gMain.state++; - gUnknown_030061EC = 0; + gDexCryScreenState = 0; } } break; diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c new file mode 100755 index 000000000..f3eeeed07 --- /dev/null +++ b/src/pokedex_cry_screen.c @@ -0,0 +1,511 @@ +#include "global.h" +#include "bg.h" +#include "m4a.h" +#include "main.h" +#include "malloc.h" +#include "palette.h" +#include "pokedex_cry_screen.h" +#include "sound.h" +#include "trig.h" +#include "window.h" + +struct PokedexCryVolumeMeter { + s8 unk0; + s8 unk1; + u8 unk2; + u16 needleSpriteId; +}; + +struct PokedexCryScreen +{ + u8 unk0[16]; + u8 unk10; + u8 unk11; + u8 unk12; + u16 unk14; + u8 unk16; + u16 species; + u8 unk1A; + u8 unk1B; +}; + +static void sub_8145588(u16); +static void sub_81455A8(void); +static void sub_814560C(void); +static void sub_8145648(u8); +static void sub_81456A8(u8, u8); +static void sub_8145814(u8); +static void sub_8145824(u8, s16, u8); +static void sub_814596C(struct Sprite *); +static void sub_8145B24(s8); + +extern u8 gDexCryScreenState; +static EWRAM_DATA struct PokedexCryScreen *sDexCryScreen = NULL; +static EWRAM_DATA u8 *sCryWaveformWindowTiledata = NULL; +static EWRAM_DATA struct PokedexCryVolumeMeter *sCryVolumeMeter = NULL; + +const u16 CryMeterNeedlePalette[] = INCBIN_U16("graphics/pokedex/cry_meter_needle.gbapal"); +const u8 CryMeterNeedleTiles[] = INCBIN_U8("graphics/pokedex/cry_meter_needle.4bpp"); + +const u16 gUnknown_085B8378[] = INCBIN_U16("graphics/pokedex/cry_meter_map.bin"); +const u16 gUnknown_085B8418[] = INCBIN_U16("graphics/pokedex/cry_meter.gbapal"); +const u8 gUnknown_085B8438[] = INCBIN_U8("graphics/pokedex/cry_meter.4bpp.lz"); + +const u16 gUnknown_085B8770[][72] = { + { + 0x0000, 0x0004, 0x0008, 0x000C, 0x0010, 0x0014, 0x0018, 0x001C, + 0x0400, 0x0404, 0x0408, 0x040C, 0x0410, 0x0414, 0x0418, 0x041C, + 0x0800, 0x0804, 0x0808, 0x080C, 0x0810, 0x0814, 0x0818, 0x081C, + 0x0C00, 0x0C04, 0x0C08, 0x0C0C, 0x0C10, 0x0C14, 0x0C18, 0x0C1C, + 0x1000, 0x1004, 0x1008, 0x100C, 0x1010, 0x1014, 0x1018, 0x101C, + 0x1400, 0x1404, 0x1408, 0x140C, 0x1410, 0x1414, 0x1418, 0x141C, + 0x1800, 0x1804, 0x1808, 0x180C, 0x1810, 0x1814, 0x1818, 0x181C, + 0x1C00, 0x1C04, 0x1C08, 0x1C0C, 0x1C10, 0x1C14, 0x1C18, 0x1C1C, + 0x2000, 0x2004, 0x2008, 0x200C, 0x2010, 0x2014, 0x2018, 0x201C + }, { + 0x0000, 0x0004, 0x0008, 0x000C, 0x0010, 0x0014, 0x0018, 0x001C, + 0x0400, 0x0404, 0x0408, 0x040C, 0x0410, 0x0414, 0x0418, 0x041C, + 0x0800, 0x0804, 0x0808, 0x080C, 0x0810, 0x0814, 0x0818, 0x081C, + 0x0C00, 0x0C04, 0x0C08, 0x0C0C, 0x0C10, 0x0C14, 0x0C18, 0x0C1C, + 0x1000, 0x1004, 0x1008, 0x100C, 0x1010, 0x1014, 0x1018, 0x101C, + 0x1400, 0x1404, 0x1408, 0x140C, 0x1410, 0x1414, 0x1418, 0x141C, + 0x1800, 0x1804, 0x1808, 0x180C, 0x1810, 0x1814, 0x1818, 0x181C, + 0x1C00, 0x1C04, 0x1C08, 0x1C0C, 0x1C10, 0x1C14, 0x1C18, 0x1C1C, + 0x2000, 0x2004, 0x2008, 0x200C, 0x2010, 0x2014, 0x2018, 0x201C + }, { + 0x0001, 0x0005, 0x0009, 0x000D, 0x0011, 0x0015, 0x0019, 0x001D, + 0x0401, 0x0405, 0x0409, 0x040D, 0x0411, 0x0415, 0x0419, 0x041D, + 0x0801, 0x0805, 0x0809, 0x080D, 0x0811, 0x0815, 0x0819, 0x081D, + 0x0C01, 0x0C05, 0x0C09, 0x0C0D, 0x0C11, 0x0C15, 0x0C19, 0x0C1D, + 0x1001, 0x1005, 0x1009, 0x100D, 0x1011, 0x1015, 0x1019, 0x101D, + 0x1401, 0x1405, 0x1409, 0x140D, 0x1411, 0x1415, 0x1419, 0x141D, + 0x1801, 0x1805, 0x1809, 0x180D, 0x1811, 0x1815, 0x1819, 0x181D, + 0x1C01, 0x1C05, 0x1C09, 0x1C0D, 0x1C11, 0x1C15, 0x1C19, 0x1C1D, + 0x2001, 0x2005, 0x2009, 0x200D, 0x2011, 0x2015, 0x2019, 0x201D + }, { + 0x0001, 0x0005, 0x0009, 0x000D, 0x0011, 0x0015, 0x0019, 0x001D, + 0x0401, 0x0405, 0x0409, 0x040D, 0x0411, 0x0415, 0x0419, 0x041D, + 0x0801, 0x0805, 0x0809, 0x080D, 0x0811, 0x0815, 0x0819, 0x081D, + 0x0C01, 0x0C05, 0x0C09, 0x0C0D, 0x0C11, 0x0C15, 0x0C19, 0x0C1D, + 0x1001, 0x1005, 0x1009, 0x100D, 0x1011, 0x1015, 0x1019, 0x101D, + 0x1401, 0x1405, 0x1409, 0x140D, 0x1411, 0x1415, 0x1419, 0x141D, + 0x1801, 0x1805, 0x1809, 0x180D, 0x1811, 0x1815, 0x1819, 0x181D, + 0x1C01, 0x1C05, 0x1C09, 0x1C0D, 0x1C11, 0x1C15, 0x1C19, 0x1C1D, + 0x2001, 0x2005, 0x2009, 0x200D, 0x2011, 0x2015, 0x2019, 0x201D + }, { + 0x0002, 0x0006, 0x000A, 0x000E, 0x0012, 0x0016, 0x001A, 0x001E, + 0x0402, 0x0406, 0x040A, 0x040E, 0x0412, 0x0416, 0x041A, 0x041E, + 0x0802, 0x0806, 0x080A, 0x080E, 0x0812, 0x0816, 0x081A, 0x081E, + 0x0C02, 0x0C06, 0x0C0A, 0x0C0E, 0x0C12, 0x0C16, 0x0C1A, 0x0C1E, + 0x1002, 0x1006, 0x100A, 0x100E, 0x1012, 0x1016, 0x101A, 0x101E, + 0x1402, 0x1406, 0x140A, 0x140E, 0x1412, 0x1416, 0x141A, 0x141E, + 0x1802, 0x1806, 0x180A, 0x180E, 0x1812, 0x1816, 0x181A, 0x181E, + 0x1C02, 0x1C06, 0x1C0A, 0x1C0E, 0x1C12, 0x1C16, 0x1C1A, 0x1C1E, + 0x2002, 0x2006, 0x200A, 0x200E, 0x2012, 0x2016, 0x201A, 0x201E + }, { + 0x0002, 0x0006, 0x000A, 0x000E, 0x0012, 0x0016, 0x001A, 0x001E, + 0x0402, 0x0406, 0x040A, 0x040E, 0x0412, 0x0416, 0x041A, 0x041E, + 0x0802, 0x0806, 0x080A, 0x080E, 0x0812, 0x0816, 0x081A, 0x081E, + 0x0C02, 0x0C06, 0x0C0A, 0x0C0E, 0x0C12, 0x0C16, 0x0C1A, 0x0C1E, + 0x1002, 0x1006, 0x100A, 0x100E, 0x1012, 0x1016, 0x101A, 0x101E, + 0x1402, 0x1406, 0x140A, 0x140E, 0x1412, 0x1416, 0x141A, 0x141E, + 0x1802, 0x1806, 0x180A, 0x180E, 0x1812, 0x1816, 0x181A, 0x181E, + 0x1C02, 0x1C06, 0x1C0A, 0x1C0E, 0x1C12, 0x1C16, 0x1C1A, 0x1C1E, + 0x2002, 0x2006, 0x200A, 0x200E, 0x2012, 0x2016, 0x201A, 0x201E + }, { + 0x0003, 0x0007, 0x000B, 0x000F, 0x0013, 0x0017, 0x001B, 0x001F, + 0x0403, 0x0407, 0x040B, 0x040F, 0x0413, 0x0417, 0x041B, 0x041F, + 0x0803, 0x0807, 0x080B, 0x080F, 0x0813, 0x0817, 0x081B, 0x081F, + 0x0C03, 0x0C07, 0x0C0B, 0x0C0F, 0x0C13, 0x0C17, 0x0C1B, 0x0C1F, + 0x1003, 0x1007, 0x100B, 0x100F, 0x1013, 0x1017, 0x101B, 0x101F, + 0x1403, 0x1407, 0x140B, 0x140F, 0x1413, 0x1417, 0x141B, 0x141F, + 0x1803, 0x1807, 0x180B, 0x180F, 0x1813, 0x1817, 0x181B, 0x181F, + 0x1C03, 0x1C07, 0x1C0B, 0x1C0F, 0x1C13, 0x1C17, 0x1C1B, 0x1C1F, + 0x2003, 0x2007, 0x200B, 0x200F, 0x2013, 0x2017, 0x201B, 0x201F + }, { + 0x0003, 0x0007, 0x000B, 0x000F, 0x0013, 0x0017, 0x001B, 0x001F, + 0x0403, 0x0407, 0x040B, 0x040F, 0x0413, 0x0417, 0x041B, 0x041F, + 0x0803, 0x0807, 0x080B, 0x080F, 0x0813, 0x0817, 0x081B, 0x081F, + 0x0C03, 0x0C07, 0x0C0B, 0x0C0F, 0x0C13, 0x0C17, 0x0C1B, 0x0C1F, + 0x1003, 0x1007, 0x100B, 0x100F, 0x1013, 0x1017, 0x101B, 0x101F, + 0x1403, 0x1407, 0x140B, 0x140F, 0x1413, 0x1417, 0x141B, 0x141F, + 0x1803, 0x1807, 0x180B, 0x180F, 0x1813, 0x1817, 0x181B, 0x181F, + 0x1C03, 0x1C07, 0x1C0B, 0x1C0F, 0x1C13, 0x1C17, 0x1C1B, 0x1C1F, + 0x2003, 0x2007, 0x200B, 0x200F, 0x2013, 0x2017, 0x201B, 0x201F + } +}; + +const u16 gUnknown_085B8BF0[] = INCBIN_U16("graphics/pokedex/85B8C10.gbapal"); +const u8 gUnknown_085B8C10[] = INCBIN_U8("graphics/pokedex/85B8C10.4bpp"); + +const u8 gUnknown_085B8C30[] = {0xF0, 0x0F}; +const u8 gUnknown_085B8C32[][16] = { + { + 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, + 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F + }, { + 0xF0, 0xE0, 0xD0, 0xC0, 0xB0, 0xA0, 0x90, 0x80, + 0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0 + } +}; + +const union AnimCmd gSpriteAnim_85B8C54[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_END +}; + +const union AnimCmd *const gSpriteAnimTable_85B8C5C[] = { + gSpriteAnim_85B8C54 +}; + +const struct OamData gOamData_85B8C60 = { + .y = 160, + .affineMode = ST_OAM_AFFINE_NORMAL, + .size = 3, + .priority = 1 +}; + +const struct SpriteTemplate gUnknown_085B8C68 = { + 0x2000, + 0x2000, + &gOamData_85B8C60, + gSpriteAnimTable_85B8C5C, + NULL, + gDummySpriteAffineAnimTable, + sub_814596C +}; + +const struct SpriteSheet gCryMeterNeedleSpriteSheets[] = { + {CryMeterNeedleTiles, 0x800, 0x2000}, + {} +}; + +const struct SpritePalette gCryMeterNeedleSpritePalettes[] = { + {CryMeterNeedlePalette, 0x2000}, + {} +}; + +bool8 sub_8145354(struct CryRelatedStruct *arg0, u8 windowId) +{ + u8 i; + u8 retVal = FALSE; + + switch (gDexCryScreenState) + { + case 0: + if (!sDexCryScreen) + { + sDexCryScreen = AllocZeroed(sizeof(*sDexCryScreen)); + sCryWaveformWindowTiledata = (u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA); + } + + sDexCryScreen->unk14 = arg0->unk0; + sDexCryScreen->unk16 = arg0->yPos; + sDexCryScreen->unk1A = 0; + sDexCryScreen->unk1B = 0; + sDexCryScreen->unk10 = 0; + sDexCryScreen->unk12 = 28; + sDexCryScreen->unk11 = 0; + sub_8145824(windowId, -8 * arg0->xPos, 1); + for (i = 0; i < 224; i++) + CopyToWindowPixelBuffer(windowId, gUnknown_085B8C10, TILE_SIZE_4BPP, i); + + gDexCryScreenState++; + break; + case 1: + for (i = 0; i < sDexCryScreen->unk16 * 8; i++) + sub_81456A8(i, 0); + + gDexCryScreenState++; + break; + case 2: + sub_8145814(windowId); + LoadPalette(gUnknown_085B8BF0, arg0->paletteNo * 16, 32); + retVal = TRUE; + break; + } + + return retVal; +} + +void sub_814545C(u8 windowId) +{ + u8 var0; + + sub_8145814(windowId); + sub_8145648(windowId); + if (sDexCryScreen->unk1B) + sDexCryScreen->unk1B--; + + if (sDexCryScreen->unk1A) + { + sDexCryScreen->unk1A--; + if (!sDexCryScreen->unk1A) + { + sub_8145588(sDexCryScreen->species); + sub_814560C(); + return; + } + } + + if (sDexCryScreen->unk10 == 0) + { + sub_814560C(); + return; + } + + if (sDexCryScreen->unk10 == 1) + { + sub_81455A8(); + } + else if (sDexCryScreen->unk10 > 8) + { + if (!IsCryPlaying()) + { + sub_814560C(); + sDexCryScreen->unk10 = 0; + return; + } + + sub_81455A8(); + sDexCryScreen->unk10 = 1; + } + + var0 = 2 * (sDexCryScreen->unk10 - 1); + sub_81456A8(sDexCryScreen->unk16 * 8 + sDexCryScreen->unk11 - 2, sDexCryScreen->unk0[var0]); + sub_81456A8(sDexCryScreen->unk16 * 8 + sDexCryScreen->unk11 - 1, sDexCryScreen->unk0[var0 + 1]); + sDexCryScreen->unk10++; +} + +void sub_8145534(u16 species) +{ + if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE && !sDexCryScreen->unk1A) + { + if (!sDexCryScreen->unk1B) + { + sDexCryScreen->unk1B = 4; + if (IsCryPlaying() == TRUE) + { + StopCry(); + sDexCryScreen->species = species; + sDexCryScreen->unk1A = 2; + } + else + { + sub_8145588(species); + } + } + } +} + +static void sub_8145588(u16 species) +{ + PlayCry2(species, 0, 0x7d, 10); + sDexCryScreen->unk10 = 1; +} + +static void sub_81455A8(void) +{ + u8 i; + s8 *baseBuffer; + s8 *buffer; + + if (gPcmDmaCounter < 2) + baseBuffer = gSoundInfo.pcmBuffer; + else + baseBuffer = gSoundInfo.pcmBuffer + (gSoundInfo.pcmDmaPeriod + 1 - gPcmDmaCounter) * gSoundInfo.pcmSamplesPerVBlank; + + buffer = baseBuffer + 0x630; + for (i = 0; i < 16; i++) + sDexCryScreen->unk0[i] = buffer[i * 2] * 2; +} + +static void sub_814560C(void) +{ + sub_81456A8(sDexCryScreen->unk16 * 8 + sDexCryScreen->unk11 - 2, 0); + sub_81456A8(sDexCryScreen->unk16 * 8 + sDexCryScreen->unk11 - 1, 0); +} + +static void sub_8145648(u8 windowId) +{ + u8 i; + u16 offset; + + sub_8145824(windowId, sDexCryScreen->unk11, 0); + sDexCryScreen->unk11 += 2; + offset = (sDexCryScreen->unk11 / 8 + sDexCryScreen->unk16 + 1) % 32; + for (i = 0; i < 7; i++) + CopyToWindowPixelBuffer(windowId, gUnknown_085B8C10, TILE_SIZE_4BPP, offset + (i * TILE_SIZE_4BPP)); +} + +static void sub_81456A8(u8 a0, u8 a1) +{ + u8 sp0; + u8 r6; + u8 r8; + u16 offset; + u16 r1; + u8 i; + + r1 = (a1 + 127) * 256; + i = r1 / 1152.0; + if (i > 55) + i = 55; + sp0 = i; + r6 = a0 & 1; + if (i > sDexCryScreen->unk12) + { + do + { + offset = gUnknown_085B8770[a0 & 0x7][i] + (a0 / 8) * TILE_SIZE_4BPP; + sCryWaveformWindowTiledata[offset] &= gUnknown_085B8C30[r6]; + sCryWaveformWindowTiledata[offset] |= gUnknown_085B8C32[r6][((i / 3) - 1) & 0x0F]; + i--; + } while (i > sDexCryScreen->unk12); + } + else + { + do + { + offset = gUnknown_085B8770[a0 & 0x7][i] + (a0 / 8) * TILE_SIZE_4BPP; + sCryWaveformWindowTiledata[offset] &= gUnknown_085B8C30[r6]; + sCryWaveformWindowTiledata[offset] |= gUnknown_085B8C32[r6][((i / 3) - 1) & 0x0F]; + i++; + } while (i < sDexCryScreen->unk12); + } + + sDexCryScreen->unk12 = sp0; +} + +static void sub_8145814(u8 windowId) +{ + CopyWindowToVram(windowId, 2); +} + +static void sub_8145824(u8 windowId, s16 arg1, u8 arg2) +{ + if (!arg2) + { + u8 bg = GetWindowAttribute(windowId, WINDOW_BG); + ChangeBgX(bg, arg1 << 8, 0); + } +} + +bool8 sub_8145850(struct CryRelatedStruct *arg0, u8 windowId) +{ + int retVal = FALSE; + + switch (gDexCryScreenState) + { + case 0: + if (!sCryVolumeMeter) + sCryVolumeMeter = AllocZeroed(sizeof(*sCryVolumeMeter)); + + CopyToWindowPixelBuffer(windowId, gUnknown_085B8438, 0, 0); + LoadPalette(gUnknown_085B8418, arg0->paletteNo * 16, 32); + gDexCryScreenState++; + break; + case 1: + LoadSpriteSheets(gCryMeterNeedleSpriteSheets); + LoadSpritePalettes(gCryMeterNeedleSpritePalettes); + sCryVolumeMeter->needleSpriteId = CreateSprite(&gUnknown_085B8C68, 40 + arg0->xPos * 8, 56 + arg0->yPos * 8, 1); + sCryVolumeMeter->unk0 = 0x20; + sCryVolumeMeter->unk1 = 0x20; + sCryVolumeMeter->unk2 = 0; + retVal = TRUE; + break; + } + + return retVal; +} + +void sub_8145914(void) +{ + FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[sCryVolumeMeter->needleSpriteId].oam.paletteNum)); + DestroySprite(gSprites + sCryVolumeMeter->needleSpriteId); + FREE_AND_SET_NULL(sDexCryScreen); + FREE_AND_SET_NULL(sCryVolumeMeter); +} + +static void sub_814596C(struct Sprite *sprite) +{ + u16 i; + s8 r3; + s16 x; + s16 y; + struct ObjAffineSrcData affine; + struct OamMatrix matrix; + u8 *var0; + + gSprites[sCryVolumeMeter->needleSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; + gSprites[sCryVolumeMeter->needleSpriteId].oam.affineParam = 0; + switch (sDexCryScreen->unk10) + { + case 0: + sCryVolumeMeter->unk1 = 0x20; + if (sCryVolumeMeter->unk0 > 0) + { + if (sCryVolumeMeter->unk2 != 1) + sCryVolumeMeter->unk2--; + } + else + sCryVolumeMeter->unk2 = 5; + break; + case 2: + r3 = 0; + for (i = 0; i < 16; i++) + { + if (r3 < sDexCryScreen->unk0[i]) + r3 = sDexCryScreen->unk0[i]; + } + sub_8145B24(r3 * 0xd0 / 0x100); + break; + case 6: + var0 = &sDexCryScreen->unk0[10]; + sub_8145B24(*var0 * 0xd0 / 0x100); + break; + } + + if (sCryVolumeMeter->unk0 == sCryVolumeMeter->unk1) + { + // empty block + } + else if (sCryVolumeMeter->unk0 < sCryVolumeMeter->unk1) + { + sCryVolumeMeter->unk0 += sCryVolumeMeter->unk2; + if (sCryVolumeMeter->unk0 > sCryVolumeMeter->unk1) + { + sCryVolumeMeter->unk0 = sCryVolumeMeter->unk1; + sCryVolumeMeter->unk1 = 0; + } + } + else + { + sCryVolumeMeter->unk0 -= sCryVolumeMeter->unk2; + if (sCryVolumeMeter->unk0 < sCryVolumeMeter->unk1) + { + sCryVolumeMeter->unk0 = sCryVolumeMeter->unk1; + sCryVolumeMeter->unk1 = 0; + } + } + + affine.xScale = 0x100; + affine.yScale = 0x100; + affine.rotation = sCryVolumeMeter->unk0 * 256; + ObjAffineSet(&affine, &matrix, 1, 2); + SetOamMatrix(0, matrix.a, matrix.b, matrix.c, matrix.d); + x = gSineTable[((sCryVolumeMeter->unk0 + 0x7F) & 0xFF)]; + y = gSineTable[((sCryVolumeMeter->unk0 + 0x7F) & 0xFF) + 0x40]; + sprite->pos2.x = x * 24 / 256; + sprite->pos2.y = y * 24 / 256; +} + +static void sub_8145B24(s8 a0) +{ + u16 r2 = (0x20 - a0) & 0xff; + if (r2 > 0x20 && r2 < 0xe0) + r2 = 0xe0; + + sCryVolumeMeter->unk1 = r2; + sCryVolumeMeter->unk2 = 5; +} diff --git a/sym_common.txt b/sym_common.txt index fd04883b7..20d87f877 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -71,7 +71,7 @@ gUnknown_030061C4: @ 30061C4 gCB2_AfterEvolution: @ 30061E8 .space 0x4 -gUnknown_030061EC: @ 30061EC +gDexCryScreenState: @ 30061EC .space 0x4 .include "save.o" diff --git a/sym_ewram.txt b/sym_ewram.txt index ba06a3dc1..1cfb54156 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -365,15 +365,7 @@ gUnknown_0203AB88: @ 203AB88 gUnknown_0203AB8C: @ 203AB8C .space 0x4 -gUnknown_0203AB90: @ 203AB90 - .space 0x4 - -gUnknown_0203AB94: @ 203AB94 - .space 0x4 - -gUnknown_0203AB98: @ 203AB98 - .space 0x4 - + .include "src/pokedex_cry_screen.o" .include "src/coins.o" .include "src/battle_transition.o" .include "src/battle_message.o" -- cgit v1.2.3 From 0ed2f54d6131b8f4d9dc00aa40413c121eea8a01 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 28 Nov 2018 21:08:22 +0100 Subject: Use MAX_SPRITES define --- src/field_effect.c | 41 +++++++++++----------- src/mon_markings.c | 10 +++--- src/overworld.c | 2 +- src/player_pc.c | 100 ++++++++++++++++++++++++++--------------------------- 4 files changed, 76 insertions(+), 77 deletions(-) diff --git a/src/field_effect.c b/src/field_effect.c index a26d43030..3068c495b 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -773,7 +773,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); if (spriteId == 0xFFFF) - return 0x40; + return MAX_SPRITES; else return spriteId; } @@ -3469,13 +3469,12 @@ static void sub_80B957C(struct Sprite *sprite) static void sub_80B963C(struct Sprite *sprite) { - struct Sprite *sprite1; sprite->pos2.x = Cos(sprite->data[2], 0x8c); sprite->pos2.y = Sin(sprite->data[2], 0x48); sprite->data[2] = (sprite->data[2] + 4) & 0xff; - if (sprite->data[6] != 0x40) + if (sprite->data[6] != MAX_SPRITES) { - sprite1 = &gSprites[sprite->data[6]]; + struct Sprite *sprite1 = &gSprites[sprite->data[6]]; sprite1->coordOffsetEnabled = 0; sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x; sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8; @@ -3855,7 +3854,7 @@ void sub_80B9D24(struct Sprite* sprite) for (i = 0; i < 4; i++) { u8 spriteId = CreateSprite(&gUnknown_0855C5EC, xPos, yPos, 0); - if (spriteId != 0x40) + if (spriteId != MAX_SPRITES) { StartSpriteAnim(&gSprites[spriteId], i); gSprites[spriteId].data[0] = i; @@ -3868,22 +3867,22 @@ static void sub_80B9DB8(struct Sprite* sprite) { switch (sprite->data[0]) { - case 0: - sprite->pos1.x -= 16; - sprite->pos1.y -= 12; - break; - case 1: - sprite->pos1.x += 16; - sprite->pos1.y -= 12; - break; - case 2: - sprite->pos1.x -= 16; - sprite->pos1.y += 12; - break; - case 3: - sprite->pos1.x += 16; - sprite->pos1.y += 12; - break; + case 0: + sprite->pos1.x -= 16; + sprite->pos1.y -= 12; + break; + case 1: + sprite->pos1.x += 16; + sprite->pos1.y -= 12; + break; + case 2: + sprite->pos1.x -= 16; + sprite->pos1.y += 12; + break; + case 3: + sprite->pos1.x += 16; + sprite->pos1.y += 12; + break; } if ((u16)(sprite->pos1.x + 4) > 0xF8 || sprite->pos1.y < -4 || sprite->pos1.y > 0xA4) DestroySprite(sprite); diff --git a/src/mon_markings.c b/src/mon_markings.c index 7f320002d..30015dbef 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -479,7 +479,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) for (i = 0; i < 2; i++) { spriteId = CreateSprite(&sprTemplate, x + 32, y + 32, 1); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { sMenu->menuWindowSprites[i] = &gSprites[spriteId]; StartSpriteAnim(&gSprites[spriteId], i); @@ -502,7 +502,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) for (i = 0; i < 4; i++) { spriteId = CreateSprite(&sprTemplate, x + 32, y + 16 + 16 * i, 0); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { sMenu->menuMarkingSprites[i] = &gSprites[spriteId]; gSprites[spriteId].data[0] = i; @@ -518,7 +518,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) spriteId = CreateSprite(&sprTemplate, 0, 0, 0); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { sMenu->menuTextSprite = &gSprites[spriteId]; sMenu->menuTextSprite->oam.shape = ST_OAM_SQUARE; @@ -535,7 +535,7 @@ static void sub_811FC80(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) sprTemplate.callback = sub_811FF7C; spriteId = CreateSprite(&sprTemplate, x + 12, 0, 0); - if(spriteId != 64) + if (spriteId != MAX_SPRITES) { sMenu->unkSprite = &gSprites[spriteId]; sMenu->unkSprite->data[0] = y + 16; @@ -600,7 +600,7 @@ static struct Sprite *sub_811FFD4(u16 tileTag, u16 paletteTag, const u16 *palett LoadSpritePalette(&sprPalette); spriteId = CreateSprite(&sprTemplate, 0, 0, 0); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) return &gSprites[spriteId]; else return NULL; diff --git a/src/overworld.c b/src/overworld.c index 10f2ebd26..3193ec0d3 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -2955,7 +2955,7 @@ static void sub_808780C(u8 linkPlayerId) struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; u8 eventObjId = linkPlayerEventObj->eventObjId; struct EventObject *eventObj = &gEventObjects[eventObjId]; - if (eventObj->spriteId != 64 ) + if (eventObj->spriteId != MAX_SPRITES) DestroySprite(&gSprites[eventObj->spriteId]); linkPlayerEventObj->active = 0; eventObj->active = 0; diff --git a/src/player_pc.c b/src/player_pc.c index d21ffdb62..59ba36350 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -332,7 +332,7 @@ static void InitPlayerPCMenu(u8 taskId) struct WindowTemplate windowTemplate; data = gTasks[taskId].data; - if(gPcItemMenuOptionsNum == 3) + if (gPcItemMenuOptionsNum == 3) windowTemplate = gUnknown_085DFF24[0]; else windowTemplate = gUnknown_085DFF24[1]; @@ -351,7 +351,7 @@ static void PlayerPCProcessMenuInput(u8 taskId) s8 inputOptionId; data = gTasks[taskId].data; - if(gPcItemMenuOptionsNum > 3) + if (gPcItemMenuOptionsNum > 3) inputOptionId = Menu_ProcessInput(); else inputOptionId = Menu_ProcessInputNoWrap(); @@ -402,7 +402,7 @@ static void PlayerPC_Mailbox(u8 taskId) playerPCItemPageInfo.scrollIndicatorId = 0xFF; Mailbox_UpdateMailList(); ItemStorage_SetItemAndMailCount(taskId); - if(sub_81D1C44(playerPCItemPageInfo.count) == TRUE) + if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE) { sub_8197434(0, 0); Mailbox_DrawMailboxMenu(taskId); @@ -595,7 +595,7 @@ static u8 GetMailboxMailCount(void) u8 i, j; for(i = 0, j = 6; j < 16; j++) - if(gSaveBlock1Ptr->mail[j].itemId != 0) + if (gSaveBlock1Ptr->mail[j].itemId != 0) i++; return i; @@ -637,7 +637,7 @@ static void Mailbox_ProcessInput(u8 taskId) u16 *data = gTasks[taskId].data; s32 inputOptionId; - if(!gPaletteFade.active) + if (!gPaletteFade.active) { inputOptionId = ListMenuHandleInputGetItemId(data[5]); ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); @@ -721,7 +721,7 @@ static void Mailbox_DoMailRead(u8 taskId) static void Mailbox_FadeAndReadMail(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { sub_81D1EC0(); overworld_free_bg_tilemaps(); @@ -742,7 +742,7 @@ static void pal_fill_for_maplights_or_black(void) sub_81973A4(); taskId = CreateTask(Mailbox_HandleReturnToProcessInput, 0); - if(sub_81D1C44(playerPCItemPageInfo.count) == TRUE) + if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE) Mailbox_DrawMailboxMenu(taskId); else DestroyTask(taskId); @@ -751,7 +751,7 @@ static void pal_fill_for_maplights_or_black(void) static void Mailbox_HandleReturnToProcessInput(u8 taskId) { - if(IsWeatherNotFadingIn() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) gTasks[taskId].func = Mailbox_ProcessInput; } @@ -787,7 +787,7 @@ static void Mailbox_MoveToBagYesNoPrompt(u8 taskId) static void Mailbox_DoMailMoveToBag(u8 taskId) { struct MailStruct *mailStruct = &(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos]); - if(!AddBagItem(mailStruct->itemId, 1)) + if (!AddBagItem(mailStruct->itemId, 1)) { DisplayItemMessageOnField(taskId, gText_BagIsFull, Mailbox_Cancel); } @@ -797,7 +797,7 @@ static void Mailbox_DoMailMoveToBag(u8 taskId) ClearMailStruct(mailStruct); Mailbox_UpdateMailList(); playerPCItemPageInfo.count--; - if(playerPCItemPageInfo.count < (playerPCItemPageInfo.pageItems + playerPCItemPageInfo.itemsAbove) && playerPCItemPageInfo.itemsAbove != 0) + if (playerPCItemPageInfo.count < (playerPCItemPageInfo.pageItems + playerPCItemPageInfo.itemsAbove) && playerPCItemPageInfo.itemsAbove != 0) playerPCItemPageInfo.itemsAbove--; ItemStorage_SetItemAndMailCount(taskId); } @@ -810,7 +810,7 @@ static void Mailbox_CancelMoveToBag(u8 taskId) static void Mailbox_Give(u8 taskId) { - if(CalculatePlayerPartyCount() == 0) + if (CalculatePlayerPartyCount() == 0) Mailbox_NoPokemonForMail(taskId); else { @@ -821,7 +821,7 @@ static void Mailbox_Give(u8 taskId) static void Mailbox_DoGiveMailPokeMenu(u8 taskId) { - if(!gPaletteFade.active) + if (!gPaletteFade.active) { sub_81D1EC0(); overworld_free_bg_tilemaps(); @@ -844,12 +844,12 @@ static void Mailbox_UpdateMailListAfterDeposit(void) prevCount = playerPCItemPageInfo.count; playerPCItemPageInfo.count = GetMailboxMailCount(); Mailbox_UpdateMailList(); - if(prevCount != playerPCItemPageInfo.count && (playerPCItemPageInfo.count < (playerPCItemPageInfo.pageItems + playerPCItemPageInfo.itemsAbove)) + if (prevCount != playerPCItemPageInfo.count && (playerPCItemPageInfo.count < (playerPCItemPageInfo.pageItems + playerPCItemPageInfo.itemsAbove)) && playerPCItemPageInfo.itemsAbove != 0) playerPCItemPageInfo.itemsAbove--; ItemStorage_SetItemAndMailCount(taskId); sub_81973A4(); - if(sub_81D1C44(playerPCItemPageInfo.count) == TRUE) + if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE) Mailbox_DrawMailboxMenu(taskId); else DestroyTask(taskId); @@ -890,7 +890,7 @@ static void sub_816BC58(void) static u8 sub_816BC7C(u8 a) { u8 *windowIdLoc = &(gUnknown_0203BCC4->windowIds[a]); - if(*windowIdLoc == 0xFF) + if (*windowIdLoc == 0xFF) { *windowIdLoc = AddWindow(&gUnknown_085DFF5C[a]); SetWindowBorderStyle(*windowIdLoc, FALSE, 0x214, 0xE); @@ -902,7 +902,7 @@ static u8 sub_816BC7C(u8 a) static void sub_816BCC4(u8 a) { u8 *windowIdLoc = &(gUnknown_0203BCC4->windowIds[a]); - if(*windowIdLoc != 0xFF) + if (*windowIdLoc != 0xFF) { sub_8198070(*windowIdLoc, FALSE); ClearWindowTilemap(*windowIdLoc); @@ -939,12 +939,12 @@ void CopyItemName_PlayerPC(u8 *string, u16 itemId) static void ItemStorage_MoveCursor(s32 id, bool8 b, struct ListMenu *thisMenu) { - if(b != TRUE) + if (b != TRUE) PlaySE(SE_SELECT); - if(gUnknown_0203BCC4->unk666 == 0xFF) + if (gUnknown_0203BCC4->unk666 == 0xFF) { sub_816C0C8(); - if(id != -2) + if (id != -2) sub_816C060(gSaveBlock1Ptr->pcItems[id].itemId); else sub_816C060(ITEMPC_GO_BACK_TO_PREV); @@ -954,11 +954,11 @@ static void ItemStorage_MoveCursor(s32 id, bool8 b, struct ListMenu *thisMenu) static void fish4_goto_x5_or_x6(u8 windowId, s32 id, u8 yOffset) { - if(id != -2) + if (id != -2) { - if(gUnknown_0203BCC4->unk666 != 0xFF) + if (gUnknown_0203BCC4->unk666 != 0xFF) { - if(gUnknown_0203BCC4->unk666 == (u8)id) + if (gUnknown_0203BCC4->unk666 == (u8)id) sub_816BFE0(yOffset, 0, 0xFF); else sub_816BFE0(yOffset, 0xFF, 0xFF); @@ -974,7 +974,7 @@ static void sub_816BEF0(s32 id) const u8* description; u8 windowId = gUnknown_0203BCC4->windowIds[1]; - if(id != -2) + if (id != -2) description = (u8 *)ItemId_GetDescription(gSaveBlock1Ptr->pcItems[id].itemId); else description = ItemStorage_GetItemPcResponse(ITEMPC_GO_BACK_TO_PREV); @@ -984,13 +984,13 @@ static void sub_816BEF0(s32 id) static void ItemStorage_StartScrollIndicator(void) { - if(playerPCItemPageInfo.scrollIndicatorId == 0xFF) + if (playerPCItemPageInfo.scrollIndicatorId == 0xFF) playerPCItemPageInfo.scrollIndicatorId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 0xC, 0x94, playerPCItemPageInfo.count - playerPCItemPageInfo.pageItems, 0x13F8, 0x13F8, &(playerPCItemPageInfo.itemsAbove)); } static void ItemStorage_RemoveScrollIndicator(void) { - if(playerPCItemPageInfo.scrollIndicatorId != 0xFF) + if (playerPCItemPageInfo.scrollIndicatorId != 0xFF) { RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorId); playerPCItemPageInfo.scrollIndicatorId = 0xFF; @@ -1005,7 +1005,7 @@ static void sub_816BFB8(u8 a, u8 b, u8 speed) static void sub_816BFE0(u8 y, u8 b, u8 speed) { u8 windowId = gUnknown_0203BCC4->windowIds[0]; - if(b == 0xFF) + if (b == 0xFF) FillWindowPixelRect(windowId, 17, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else AddTextPrinterParameterized4(windowId, 1, 0, y, 0, 0, gUnknown_085DFF8C, speed, gText_SelectorArrow2); @@ -1016,12 +1016,12 @@ static void sub_816C060(u16 itemId) u8 spriteId; u8* spriteIdLoc = &(gUnknown_0203BCC4->spriteId); - if(*spriteIdLoc == 0xFF) + if (*spriteIdLoc == 0xFF) { FreeSpriteTilesByTag(0x13F6); FreeSpritePaletteByTag(0x13F6); spriteId = AddItemIconSprite(0x13F6, 0x13F6, itemId); - if(spriteId != 64) + if (spriteId != MAX_SPRITES) { *spriteIdLoc = spriteId; gSprites[spriteId].oam.priority = 0; @@ -1034,7 +1034,7 @@ static void sub_816C060(u16 itemId) static void sub_816C0C8(void) { u8* spriteIdLoc = &(gUnknown_0203BCC4->spriteId); - if(*spriteIdLoc != 0xFF) + if (*spriteIdLoc != 0xFF) { FreeSpriteTilesByTag(0x13F6); FreeSpritePaletteByTag(0x13F6); @@ -1067,7 +1067,7 @@ static void ItemStorage_ProcessWithdrawTossInput(u8 taskId) sub_816BC7C(i); toss = data[3]; text = gText_TossItem; - if(!toss) + if (!toss) text = gText_WithdrawItem; x = GetStringCenterAlignXOffset(1, text, 104); AddTextPrinterParameterized(gUnknown_0203BCC4->windowIds[3], 1, text, x, 1, 0, NULL); @@ -1135,10 +1135,10 @@ static void ItemStorage_ProcessInput(u8 taskId) s32 id; data = gTasks[taskId].data; - if(gMain.newKeys & SELECT_BUTTON) + if (gMain.newKeys & SELECT_BUTTON) { ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); - if((playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos) != (playerPCItemPageInfo.count - 1)) + if ((playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos) != (playerPCItemPageInfo.count - 1)) { PlaySE(SE_SELECT); ItemStorage_ItemSwapChoosePrompt(taskId); @@ -1169,10 +1169,10 @@ static void ItemStorage_GoBackToPlayerPCMenu_InitStorage(u8 taskId) s16 *data; data = gTasks[taskId].data; - if(!IsDma3ManagerBusyWithBgCopy()) + if (!IsDma3ManagerBusyWithBgCopy()) { NewMenuHelpers_DrawDialogueFrame(0, 0); - if(!data[3]) + if (!data[3]) InitItemStorageMenu(taskId, ITEMPC_MENU_WITHDRAW); else InitItemStorageMenu(taskId, ITEMPC_MENU_TOSS); @@ -1213,7 +1213,7 @@ static void sub_816C4FC(u8 taskId) s32 id; data = gTasks[taskId].data; - if(gMain.newKeys & SELECT_BUTTON) + if (gMain.newKeys & SELECT_BUTTON) { ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); ItemStorage_DoItemSwap(taskId, FALSE); @@ -1228,7 +1228,7 @@ static void sub_816C4FC(u8 taskId) case -1: break; case -2: - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { ItemStorage_DoItemSwap(taskId, FALSE); } @@ -1251,12 +1251,12 @@ static void ItemStorage_DoItemSwap(u8 taskId, bool8 a) b = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos); PlaySE(SE_SELECT); DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); - if(!a) + if (!a) { c = gUnknown_0203BCC4->unk666; - if(c != b) + if (c != b) { - if(c != b - 1) + if (c != b - 1) { MoveItemSlotInList(gSaveBlock1Ptr->pcItems, c, b); ItemStorage_RefreshListMenu(); @@ -1296,9 +1296,9 @@ static void ItemStorage_DoItemAction(u8 taskId) b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove); ItemStorage_RemoveScrollIndicator(); data[2] = 1; - if(!data[3]) + if (!data[3]) { - if(gSaveBlock1Ptr->pcItems[b].quantity == 1) + if (gSaveBlock1Ptr->pcItems[b].quantity == 1) { ItemStorage_DoItemWithdraw(taskId); return; @@ -1308,7 +1308,7 @@ static void ItemStorage_DoItemAction(u8 taskId) } else { - if(gSaveBlock1Ptr->pcItems[b].quantity == 1) + if (gSaveBlock1Ptr->pcItems[b].quantity == 1) { ItemStorage_DoItemToss(taskId); return; @@ -1327,20 +1327,20 @@ static void ItemStorage_HandleQuantityRolling(u8 taskId) data = gTasks[taskId].data; b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove); - if(AdjustQuantityAccordingToDPadInput(&(data[2]), gSaveBlock1Ptr->pcItems[b].quantity) == TRUE) + if (AdjustQuantityAccordingToDPadInput(&(data[2]), gSaveBlock1Ptr->pcItems[b].quantity) == TRUE) sub_816C6BC(sub_816BC7C(4), data[2], STR_CONV_MODE_LEADING_ZEROS, 8, 1, 3); else { - if(gMain.newKeys & A_BUTTON) + if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); sub_816BCC4(4); - if(!data[3]) + if (!data[3]) ItemStorage_DoItemWithdraw(taskId); else ItemStorage_DoItemToss(taskId); } - else if(gMain.newKeys & B_BUTTON) + else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); sub_816BCC4(4); @@ -1357,7 +1357,7 @@ static void ItemStorage_DoItemWithdraw(u8 taskId) data = gTasks[taskId].data; b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove); - if(AddBagItem(gSaveBlock1Ptr->pcItems[b].itemId, data[2]) == TRUE) + if (AddBagItem(gSaveBlock1Ptr->pcItems[b].itemId, data[2]) == TRUE) { CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[2], STR_CONV_MODE_LEFT_ALIGN, 3); @@ -1379,7 +1379,7 @@ static void ItemStorage_DoItemToss(u8 taskId) data = gTasks[taskId].data; b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove); - if(!ItemId_GetImportance(gSaveBlock1Ptr->pcItems[b].itemId)) + if (!ItemId_GetImportance(gSaveBlock1Ptr->pcItems[b].itemId)) { CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[2], STR_CONV_MODE_LEFT_ALIGN, 3); @@ -1411,7 +1411,7 @@ static void ItemStorage_HandleRemoveItem(u8 taskId) s16 *data; data = gTasks[taskId].data; - if(gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { RemovePCItem((playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove), data[2]); DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos)); @@ -1428,7 +1428,7 @@ static void ItemStorage_WaitPressHandleResumeProcessInput(u8 taskId) s16 *data; data = gTasks[taskId].data; - if(gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(gSaveBlock1Ptr->pcItems[(playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos)].itemId)); ItemStorage_StartScrollIndicatorAndProcessInput(taskId); -- cgit v1.2.3 From f54f5b3531cb494c54104abf0ed1dbc0e8b197bb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 28 Nov 2018 23:08:20 +0100 Subject: Match 3 link rfu functions --- src/link_rfu.c | 873 +++++++++++++-------------------------------------------- 1 file changed, 188 insertions(+), 685 deletions(-) diff --git a/src/link_rfu.c b/src/link_rfu.c index 7d46fec2d..e85cc7dc3 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -2020,20 +2020,17 @@ void ASCIIToPkmnStr(u8 *q1, const u8 *q2) u8 sub_800DD1C(u8 maxFlags) { u8 flagCount = 0; - u8 flags = gUnknown_03007890->unk_02; + u32 flags = gUnknown_03007890->unk_02; u8 i; if (gUnknown_03007890->unk_00 == 1) { - i = 0; for (i = 0; i < 4; flags >>= 1, i++) { if (flags & 1) { if (maxFlags == flagCount + 1) - { return gUnknown_03007890->unk_0a[i]; - } flagCount++; } } @@ -2043,9 +2040,7 @@ u8 sub_800DD1C(u8 maxFlags) for (i = 0; i < 4; flags >>= 1, i++) { if (flags & 1) - { return gUnknown_03007890->unk_0a[i]; - } } } return 0; @@ -3203,13 +3198,11 @@ bool32 sub_800F4F0(void) return sub_800F0B8(); } -#ifdef NONMATCHING void sub_800F638(u8 unused, u32 flags) { - int i; - int j; + int i, j; - u8 *r10 = gUnknown_03005000.unk_6c.unk_04; + const u8 *r10 = gUnknown_03005000.unk_6c.unk_04; for (i = 0; i < gUnknown_03005000.unk_6c.unk_02; i++) { if (!(flags & 1)) @@ -3220,11 +3213,11 @@ void sub_800F638(u8 unused, u32 flags) gUnknown_03000D90[j + 1] = (r10[12 * i + (j << 1) + 1] << 8) | r10[12 * i + (j << 1) + 0]; } for (j = 0; j < 7; j++) - // This should be an ascending loop. - // GCC compiles this as descending. { gUnknown_03000D80[2 * j + 1] = gUnknown_03000D90[j] >> 8; gUnknown_03000D80[2 * j + 0] = gUnknown_03000D90[j]; + + j++;j--; // Needed to match; } sub_800D888(&gUnknown_03005000.unk_9e8, gUnknown_03000D80); gUnknown_03005000.unk_6c.unk_0c |= (1 << i); @@ -3232,101 +3225,6 @@ void sub_800F638(u8 unused, u32 flags) flags >>= 1; } } -#else -NAKED void sub_800F638(u8 unused, u32 flags) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmov r7, r10\n" - "\tmov r6, r9\n" - "\tmov r5, r8\n" - "\tpush {r5-r7}\n" - "\tldr r0, =gUnknown_03005000\n" - "\tldr r2, [r0, 0x70]\n" - "\tmov r10, r2\n" - "\tmovs r5, 0\n" - "\tadds r2, r0, 0\n" - "\tadds r2, 0x6E\n" - "\tldrh r3, [r2]\n" - "\tcmp r5, r3\n" - "\tbge _0800F6D4\n" - "\tmov r9, r0\n" - "\tldr r0, =gUnknown_03000D90\n" - "\tmov r8, r0\n" - "_0800F65A:\n" - "\tmovs r0, 0x1\n" - "\tands r0, r1\n" - "\tlsrs r7, r1, 1\n" - "\tadds r6, r5, 0x1\n" - "\tcmp r0, 0\n" - "\tbne _0800F6C8\n" - "\tldr r1, =0xffff8900\n" - "\tadds r0, r1, 0\n" - "\tadds r1, r5, 0\n" - "\torrs r1, r0\n" - "\tmov r2, r8\n" - "\tstrh r1, [r2]\n" - "\tmovs r4, 0\n" - "\tlsls r0, r5, 1\n" - "\tldr r3, =gUnknown_03000D80\n" - "\tmov r12, r3\n" - "\tadds r0, r5\n" - "\tlsls r0, 2\n" - "\tmov r1, r10\n" - "\tadds r2, r0, r1\n" - "\tmov r3, r8\n" - "\tadds r3, 0x2\n" - "_0800F686:\n" - "\tldrb r1, [r2, 0x1]\n" - "\tlsls r1, 8\n" - "\tldrb r0, [r2]\n" - "\torrs r0, r1\n" - "\tstrh r0, [r3]\n" - "\tadds r2, 0x2\n" - "\tadds r3, 0x2\n" - "\tadds r4, 0x1\n" - "\tcmp r4, 0x6\n" - "\tble _0800F686\n" - "\tmovs r4, 0\n" - "\tldr r2, =gUnknown_03000D90\n" - "\tldr r1, =gUnknown_03000D80\n" - "_0800F6A0:\n" - "\tldrh r0, [r2]\n" - "\tlsrs r0, 8\n" - "\tstrb r0, [r1, 0x1]\n" - "\tldrh r0, [r2]\n" - "\tstrb r0, [r1]\n" - "\tadds r2, 0x2\n" - "\tadds r1, 0x2\n" - "\tadds r4, 0x1\n" - "\tcmp r4, 0x6\n" - "\tble _0800F6A0\n" - "\tldr r0, =gUnknown_03005000+0x9E8\n" - "\tmov r1, r12\n" - "\tbl sub_800D888\n" - "\tmovs r1, 0x1\n" - "\tlsls r1, r5\n" - "\tmov r2, r9\n" - "\tldr r0, [r2, 0x78]\n" - "\torrs r0, r1\n" - "\tstr r0, [r2, 0x78]\n" - "_0800F6C8:\n" - "\tadds r1, r7, 0\n" - "\tadds r5, r6, 0\n" - "\tldr r3, =gUnknown_03005000+0x6E\n" - "\tldrh r3, [r3]\n" - "\tcmp r5, r3\n" - "\tblt _0800F65A\n" - "_0800F6D4:\n" - "\tpop {r3-r5}\n" - "\tmov r8, r3\n" - "\tmov r9, r4\n" - "\tmov r10, r5\n" - "\tpop {r4-r7}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.pool"); -} -#endif void sub_800F6FC(u8 a0) { @@ -3408,89 +3306,89 @@ static void sub_800F86C(u8 unused) { switch (gRecvCmds[i][0] & 0xff00) { - case 0x7800: - if (gUnknown_03005000.unk_0c == 0 && gReceivedRemoteLinkPlayers != 0) - return; - // fallthrough - case 0x7700: - if (gUnknown_03007890->unk_00 == 0) - { - gUnknown_03005000.playerCount = gRecvCmds[i][1]; - gUnknown_03005000.unk_cce = sub_800F74C((u8 *)(gRecvCmds[i] + 2)); - } - break; - case 0x8800: - if (gUnknown_03005000.unk_80[i].unk_12 == 0) - { - gUnknown_03005000.unk_80[i].unk_00 = 0; - gUnknown_03005000.unk_80[i].unk_02 = gRecvCmds[i][1]; - gUnknown_03005000.unk_80[i].unk_11 = gRecvCmds[i][2]; - gUnknown_03005000.unk_80[i].unk_08 = 0; - gUnknown_03005000.unk_80[i].unk_12 = 1; - gUnknown_03005000.unk_5c[i] = 0; - } - break; - case 0x8900: - if (gUnknown_03005000.unk_80[i].unk_12 == 1) + case 0x7800: + if (gUnknown_03005000.unk_0c == 0 && gReceivedRemoteLinkPlayers != 0) + return; + // fallthrough + case 0x7700: + if (gUnknown_03007890->unk_00 == 0) + { + gUnknown_03005000.playerCount = gRecvCmds[i][1]; + gUnknown_03005000.unk_cce = sub_800F74C((u8 *)(gRecvCmds[i] + 2)); + } + break; + case 0x8800: + if (gUnknown_03005000.unk_80[i].unk_12 == 0) + { + gUnknown_03005000.unk_80[i].unk_00 = 0; + gUnknown_03005000.unk_80[i].unk_02 = gRecvCmds[i][1]; + gUnknown_03005000.unk_80[i].unk_11 = gRecvCmds[i][2]; + gUnknown_03005000.unk_80[i].unk_08 = 0; + gUnknown_03005000.unk_80[i].unk_12 = 1; + gUnknown_03005000.unk_5c[i] = 0; + } + break; + case 0x8900: + if (gUnknown_03005000.unk_80[i].unk_12 == 1) + { + gUnknown_03005000.unk_80[i].unk_00 = gRecvCmds[i][0] & 0xff; + gUnknown_03005000.unk_80[i].unk_08 |= (1 << gUnknown_03005000.unk_80[i].unk_00); + for (j = 0; j < 6; j++) + gBlockRecvBuffer[i][gUnknown_03005000.unk_80[i].unk_00 * 6 + j] = gRecvCmds[i][j + 1]; + if (gUnknown_03005000.unk_80[i].unk_08 == gUnknown_082ED628[gUnknown_03005000.unk_80[i].unk_02]) { - gUnknown_03005000.unk_80[i].unk_00 = gRecvCmds[i][0] & 0xff; - gUnknown_03005000.unk_80[i].unk_08 |= (1 << gUnknown_03005000.unk_80[i].unk_00); - for (j = 0; j < 6; j++) - gBlockRecvBuffer[i][gUnknown_03005000.unk_80[i].unk_00 * 6 + j] = gRecvCmds[i][j + 1]; - if (gUnknown_03005000.unk_80[i].unk_08 == gUnknown_082ED628[gUnknown_03005000.unk_80[i].unk_02]) - { - gUnknown_03005000.unk_80[i].unk_12 = 2; - sub_800F6FC(i); - if (sub_800F7DC()->unk_0a_0 == 0x45 && gReceivedRemoteLinkPlayers != 0 && gUnknown_03005000.unk_0c == 0) - sub_8010A70(gBlockRecvBuffer); - } + gUnknown_03005000.unk_80[i].unk_12 = 2; + sub_800F6FC(i); + if (sub_800F7DC()->unk_0a_0 == 0x45 && gReceivedRemoteLinkPlayers != 0 && gUnknown_03005000.unk_0c == 0) + sub_8010A70(gBlockRecvBuffer); } - break; - case 0xa100: - sub_800FE84(gUnknown_082ED6B8[gRecvCmds[i][1]].buffer, (u16)gUnknown_082ED6B8[gRecvCmds[i][1]].size); - break; - case 0x5f00: - gUnknown_03005000.unk_e4[i] = 1; - break; - case 0x6600: - if (gUnknown_03005000.unk_100 == gRecvCmds[i][1]) - gUnknown_03005000.unk_e9[i] = 1; - break; - case 0xed00: - if (gUnknown_03005000.unk_0c == 0) + } + break; + case 0xa100: + sub_800FE84(gUnknown_082ED6B8[gRecvCmds[i][1]].buffer, (u16)gUnknown_082ED6B8[gRecvCmds[i][1]].size); + break; + case 0x5f00: + gUnknown_03005000.unk_e4[i] = 1; + break; + case 0x6600: + if (gUnknown_03005000.unk_100 == gRecvCmds[i][1]) + gUnknown_03005000.unk_e9[i] = 1; + break; + case 0xed00: + if (gUnknown_03005000.unk_0c == 0) + { + if (gReceivedRemoteLinkPlayers != 0) { - if (gReceivedRemoteLinkPlayers != 0) + if (gRecvCmds[i][1] & gUnknown_03007890->unk_02) { - if (gRecvCmds[i][1] & gUnknown_03007890->unk_02) - { - gReceivedRemoteLinkPlayers = 0; - sub_800D630(); - gUnknown_03005000.unk_ce4 = gRecvCmds[i][2]; - } - gUnknown_03005000.playerCount = gRecvCmds[i][3]; - sub_80109E8(gRecvCmds[i][1]); + gReceivedRemoteLinkPlayers = 0; + sub_800D630(); + gUnknown_03005000.unk_ce4 = gRecvCmds[i][2]; } - } - else - { - sub_800FD14(0xee00); - gSendCmd[1] = gRecvCmds[i][1]; - gSendCmd[2] = gRecvCmds[i][2]; - gSendCmd[3] = gRecvCmds[i][3]; - } - break; - case 0xee00: - if (gUnknown_03005000.unk_0c == 1) - { - gUnknown_03005000.unk_ce3 |= gRecvCmds[i][1]; - gUnknown_03005000.unk_ce4 = gRecvCmds[i][2]; + gUnknown_03005000.playerCount = gRecvCmds[i][3]; sub_80109E8(gRecvCmds[i][1]); } - break; - case 0x4400: - case 0xbe00: - gLinkPartnersHeldKeys[i] = gRecvCmds[i][1]; - break; + } + else + { + sub_800FD14(0xee00); + gSendCmd[1] = gRecvCmds[i][1]; + gSendCmd[2] = gRecvCmds[i][2]; + gSendCmd[3] = gRecvCmds[i][3]; + } + break; + case 0xee00: + if (gUnknown_03005000.unk_0c == 1) + { + gUnknown_03005000.unk_ce3 |= gRecvCmds[i][1]; + gUnknown_03005000.unk_ce4 = gRecvCmds[i][2]; + sub_80109E8(gRecvCmds[i][1]); + } + break; + case 0x4400: + case 0xbe00: + gLinkPartnersHeldKeys[i] = gRecvCmds[i][1]; + break; } if (gUnknown_03005000.unk_0c == 1 && gUnknown_03005000.unk_61[i]) { @@ -3555,8 +3453,6 @@ u8 sub_800FCD8(void) return flags; } -#ifdef NONMATCHING -// The switch tree is incorrect void sub_800FD14(u16 command) { u8 i; @@ -3566,195 +3462,44 @@ void sub_800FD14(u16 command) gSendCmd[0] = command; switch (command) { - case 0x8800: - gSendCmd[1] = gUnknown_03005000.unk_6c.unk_02; - gSendCmd[2] = gUnknown_03005000.unk_6c.unk_11 + 0x80; - break; - case 0xa100: - if (sub_800FC60()) - gSendCmd[1] = gUnknown_03005000.unk_5a; - break; - case 0x7800: - case 0x7700: - tmp = gUnknown_03005000.unk_ce2 ^ gUnknown_03005000.unk_ce3; - gUnknown_03005000.playerCount = gUnknown_082ED695[tmp] + 1; - gSendCmd[1] = gUnknown_03005000.playerCount; - buff = (u8 *)(gSendCmd + 2); - for (i = 0; i < 4; i++) - buff[i] = gUnknown_03005000.unk_cde[i]; - break; - case 0x6600: - case 0x5f00: - gSendCmd[1] = gUnknown_03005000.unk_100; - break; - case 0x4400: - gSendCmd[0] = 0x4400; - gSendCmd[1] = gMain.heldKeys; - break; - case 0x2f00: - for (i = 0; i < 6; i++) - gSendCmd[1 + i] = gUnknown_03005000.unk_f2[i]; - break; - case 0xbe00: - gSendCmd[1] = gUnknown_03005DA8; - break; + case 0x8800: + gSendCmd[1] = gUnknown_03005000.unk_6c.unk_02; + gSendCmd[2] = gUnknown_03005000.unk_6c.unk_11 + 0x80; + break; + case 0xa100: + if (sub_800FC60()) + gSendCmd[1] = gUnknown_03005000.unk_5a; + break; + case 0x7700: + case 0x7800: + tmp = gUnknown_03005000.unk_ce2 ^ gUnknown_03005000.unk_ce3; + gUnknown_03005000.playerCount = gUnknown_082ED695[tmp] + 1; + gSendCmd[1] = gUnknown_03005000.playerCount; + buff = (u8 *)(gSendCmd + 2); + for (i = 0; i < 4; i++) + buff[i] = gUnknown_03005000.unk_cde[i]; + break; + case 0x6600: + case 0x5f00: + gSendCmd[1] = gUnknown_03005000.unk_100; + break; + case 0x4400: + gSendCmd[0] = command; + gSendCmd[1] = gMain.heldKeys; + break; + case 0x2f00: + for (i = 0; i < 6; i++) + gSendCmd[1 + i] = gUnknown_03005000.unk_f2[i]; + break; + case 0xbe00: + gSendCmd[1] = gUnknown_03005DA8; + break; + case 0xee00: + break; + case 0xed00: + break; } } -#else -NAKED void sub_800FD14(u16 command) -{ - asm_unified("\tpush {r4,r5,lr}\n" - "\tlsls r0, 16\n" - "\tlsrs r1, r0, 16\n" - "\tldr r5, =gSendCmd\n" - "\tstrh r1, [r5]\n" - "\tmovs r0, 0xF0\n" - "\tlsls r0, 7\n" - "\tadds r4, r5, 0\n" - "\tcmp r1, r0\n" - "\tbeq _0800FDB0_case_7700_case_7800\n" - "\tcmp r1, r0\n" - "\tbgt _0800FD62\n" - "\tmovs r0, 0xBE\n" - "\tlsls r0, 7\n" - "\tcmp r1, r0\n" - "\tbeq _0800FE00_case_5f00_case_6600\n" - "\tcmp r1, r0\n" - "\tbgt _0800FD50\n" - "\tmovs r0, 0xBC\n" - "\tlsls r0, 6\n" - "\tcmp r1, r0\n" - "\tbeq _0800FE20_case_2f00\n" - "\tmovs r0, 0x88\n" - "\tlsls r0, 7\n" - "\tcmp r1, r0\n" - "\tbeq _0800FE14_case_4400\n" - "\tb _0800FE46_break\n" - "\t.pool\n" - "_0800FD50:\n" - "\tmovs r0, 0xCC\n" - "\tlsls r0, 7\n" - "\tcmp r1, r0\n" - "\tbeq _0800FE00_case_5f00_case_6600\n" - "\tmovs r0, 0xEE\n" - "\tlsls r0, 7\n" - "\tcmp r1, r0\n" - "\tbeq _0800FDB0_case_7700_case_7800\n" - "\tb _0800FE46_break\n" - "_0800FD62:\n" - "\tmovs r0, 0xBE\n" - "\tlsls r0, 8\n" - "\tcmp r1, r0\n" - "\tbeq _0800FE40_case_be00\n" - "\tcmp r1, r0\n" - "\tbgt _0800FE46_break\n" - "\tmovs r0, 0x88\n" - "\tlsls r0, 8\n" - "\tcmp r1, r0\n" - "\tbeq _0800FD80_case_8800\n" - "\tmovs r0, 0xA1\n" - "\tlsls r0, 8\n" - "\tcmp r1, r0\n" - "\tbeq _0800FD98_case_a100\n" - "\tb _0800FE46_break\n" - "_0800FD80_case_8800:\n" - "\tldr r0, =gUnknown_03005000\n" - "\tadds r1, r0, 0\n" - "\tadds r1, 0x6E\n" - "\tldrh r1, [r1]\n" - "\tstrh r1, [r5, 0x2]\n" - "\tadds r0, 0x7D\n" - "\tldrb r0, [r0]\n" - "\tadds r0, 0x80\n" - "\tstrh r0, [r5, 0x4]\n" - "\tb _0800FE46_break\n" - "\t.pool\n" - "_0800FD98_case_a100:\n" - "\tbl sub_800FC60\n" - "\tlsls r0, 24\n" - "\tcmp r0, 0\n" - "\tbeq _0800FE46_break\n" - "\tldr r0, =gUnknown_03005000\n" - "\tadds r0, 0x5A\n" - "\tldrb r0, [r0]\n" - "\tb _0800FE44_str_break\n" - "\t.pool\n" - "_0800FDB0_case_7700_case_7800:\n" - "\tldr r3, =gUnknown_03005000\n" - "\tldr r1, =0x00000ce2\n" - "\tadds r0, r3, r1\n" - "\tldr r2, =0x00000ce3\n" - "\tadds r1, r3, r2\n" - "\tldrb r2, [r0]\n" - "\tldrb r0, [r1]\n" - "\teors r0, r2\n" - "\tldr r1, =gUnknown_082ED695\n" - "\tadds r0, r1\n" - "\tldrb r0, [r0]\n" - "\tadds r0, 0x1\n" - "\tstrb r0, [r3, 0xD]\n" - "\tldrb r0, [r3, 0xD]\n" - "\tstrh r0, [r4, 0x2]\n" - "\tadds r2, r4, 0x4\n" - "\tmovs r4, 0\n" - "\tldr r0, =0x00000cde\n" - "\tadds r3, r0\n" - "_0800FDD6:\n" - "\tadds r1, r2, r4\n" - "\tadds r0, r4, r3\n" - "\tldrb r0, [r0]\n" - "\tstrb r0, [r1]\n" - "\tadds r0, r4, 0x1\n" - "\tlsls r0, 24\n" - "\tlsrs r4, r0, 24\n" - "\tcmp r4, 0x3\n" - "\tbls _0800FDD6\n" - "\tb _0800FE46_break\n" - "\t.pool\n" - "_0800FE00_case_5f00_case_6600:\n" - "\tldr r0, =gUnknown_03005000\n" - "\tmovs r1, 0x80\n" - "\tlsls r1, 1\n" - "\tadds r0, r1\n" - "\tldrh r0, [r0]\n" - "\tstrh r0, [r4, 0x2]\n" - "\tb _0800FE46_break\n" - "\t.pool\n" - "_0800FE14_case_4400:\n" - "\tstrh r1, [r5]\n" - "\tldr r0, =gMain\n" - "\tldrh r0, [r0, 0x2C]\n" - "\tb _0800FE44_str_break\n" - "\t.pool\n" - "_0800FE20_case_2f00:\n" - "\tmovs r4, 0\n" - "\tldr r3, =gUnknown_03005000+0xF2\n" - "_0800FE24:\n" - "\tadds r2, r4, 0x1\n" - "\tlsls r1, r2, 1\n" - "\tadds r1, r5\n" - "\tlsls r0, r4, 1\n" - "\tadds r0, r3\n" - "\tldrh r0, [r0]\n" - "\tstrh r0, [r1]\n" - "\tlsls r2, 24\n" - "\tlsrs r4, r2, 24\n" - "\tcmp r4, 0x5\n" - "\tbls _0800FE24\n" - "\tb _0800FE46_break\n" - "\t.pool\n" - "_0800FE40_case_be00:\n" - "\tldr r0, =gUnknown_03005DA8\n" - "\tldrh r0, [r0]\n" - "_0800FE44_str_break:\n" - "\tstrh r0, [r5, 0x2]\n" - "_0800FE46_break:\n" - "\tpop {r4,r5}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.pool"); -} -#endif void sub_800FE50(u16 *a0) { @@ -4614,329 +4359,87 @@ void sub_80111FC(void) gUnknown_03005000.unk_00 = sub_80111DC; } -#ifdef NONMATCHING void sub_801120C(u8 a0) { u8 i; u8 r6 = 0; - struct RfuUnk5Sub *unk5Sub; switch (a0) { - case 0x00: - gUnknown_03005000.unk_04 = 2; - break; - case 0x10: - break; - case 0x11: - sub_80115EC(gUnknown_03004140.unk_14); - for (i = 0; i < 4; i++) + case 0x00: + gUnknown_03005000.unk_04 = 2; + break; + case 0x10: + break; + case 0x11: + sub_80115EC(gUnknown_03004140.unk_14); + for (i = 0; i < 4; i++) + { + if ((gUnknown_03004140.unk_14 >> i) & 1) { - if ((gUnknown_03004140.unk_14 >> i) & 1) + struct UnkLinkRfuStruct_02022B14 *structPtr = &gUnknown_03007890->unk_14[i].unk_06; + if (structPtr->unk_0a_0 == sub_800F7DC()->unk_0a_0) { - unk5Sub = &gUnknown_03007890->unk_14[i]; - if (unk5Sub->unk_06.unk_0a_0 == sub_800F7DC()->unk_0a_0) - { - gUnknown_03005000.unk_cd1[i] = 0; - gUnknown_03005000.unk_cd5[i] = 0; - rfu_setRecvBuffer(0x20, i, gUnknown_03005000.unk_cd5 + i, 1); - } - else - { - r6 |= (1 << i); - } + gUnknown_03005000.unk_cd1[i] = 0; + gUnknown_03005000.unk_cd5[i] = 0; + rfu_setRecvBuffer(0x20, i, gUnknown_03005000.unk_cd5 + i, 1); } - } - if (r6) - { - rfu_REQ_disconnect(r6); - rfu_waitREQComplete(); - } - break; - case 0x12: - break; - case 0x13: - break; - case 0x14: - if (gUnknown_03005000.unk_ce7 != gUnknown_03004140.unk_00) - { - rfu_REQ_disconnect(gUnknown_03005000.unk_ce7 ^ gUnknown_03004140.unk_00); - rfu_waitREQComplete(); - } - gUnknown_03005000.unk_04 = 0x11; - break; - case 0x31: - gUnknown_03005000.unk_f0 = 1; - break; - case 0x32: - gUnknown_03005000.unk_f0 = 3; - break; - case 0x30: - case 0x33: - gUnknown_03005000.unk_f0 = 4; - gUnknown_03005000.unk_ce2 &= ~gUnknown_03004140.unk_14; - if (gReceivedRemoteLinkPlayers == 1) - { - if (gUnknown_03005000.unk_ce2 == 0) - sub_8011170(a0); else - sub_80111FC(); + { + r6 |= (1 << i); + } } - sub_8011A64(2, a0); - break; - case 0x42 ... 0x44: - break; - case 0xf3: - sub_8011A64(1, a0); - sub_8011170(a0); - gUnknown_03005000.unk_ef = 1; - break; - case 0xf0 ... 0xf2: - case 0xff: - sub_8011170(a0); - sub_8011A64(1, a0); - gUnknown_03005000.unk_cdb = 1; - break; + } + if (r6) + { + rfu_REQ_disconnect(r6); + rfu_waitREQComplete(); + } + break; + case 0x12: + break; + case 0x13: + break; + case 0x14: + if (gUnknown_03005000.unk_ce7 != gUnknown_03004140.unk_00) + { + rfu_REQ_disconnect(gUnknown_03005000.unk_ce7 ^ gUnknown_03004140.unk_00); + rfu_waitREQComplete(); + } + gUnknown_03005000.unk_04 = 0x11; + break; + case 0x31: + gUnknown_03005000.unk_f0 = 1; + break; + case 0x32: + gUnknown_03005000.unk_f0 = 3; + break; + case 0x30: + case 0x33: + gUnknown_03005000.unk_f0 = 4; + gUnknown_03005000.unk_ce2 &= ~gUnknown_03004140.unk_14; + if (gReceivedRemoteLinkPlayers == 1) + { + if (gUnknown_03005000.unk_ce2 == 0) + sub_8011170(a0); + else + sub_80111FC(); + } + sub_8011A64(2, a0); + break; + case 0x34: + break; + case 0x42 ... 0x44: + break; + case 0xf3: + sub_8011A64(1, a0); + sub_8011170(a0); + gUnknown_03005000.unk_ef = 1; + break; + case 0xf0 ... 0xf2: + case 0xff: + sub_8011170(a0); + sub_8011A64(1, a0); + gUnknown_03005000.unk_cdb = 1; + break; } } -#else -NAKED void sub_801120C(u8 a0) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmov r7, r10\n" - "\tmov r6, r9\n" - "\tmov r5, r8\n" - "\tpush {r5-r7}\n" - "\tlsls r0, 24\n" - "\tlsrs r4, r0, 24\n" - "\tmovs r6, 0\n" - "\tcmp r4, 0x32\n" - "\tbne _08011222\n" - "\tb _08011360_case_32\n" - "_08011222:\n" - "\tcmp r4, 0x32\n" - "\tbgt _08011252\n" - "\tcmp r4, 0x13\n" - "\tbgt _08011240\n" - "\tcmp r4, 0x12\n" - "\tblt _08011230\n" - "\tb _080113EE_break\n" - "_08011230:\n" - "\tcmp r4, 0x10\n" - "\tbne _08011236\n" - "\tb _080113EE_break\n" - "_08011236:\n" - "\tcmp r4, 0x10\n" - "\tbgt _0801128C_case_11\n" - "\tcmp r4, 0\n" - "\tbeq _0801127E_case_00\n" - "\tb _080113EE_break\n" - "_08011240:\n" - "\tcmp r4, 0x30\n" - "\tbne _08011246\n" - "\tb _0801136C_case_30_case_33\n" - "_08011246:\n" - "\tcmp r4, 0x30\n" - "\tble _0801124C\n" - "\tb _08011354_case_31\n" - "_0801124C:\n" - "\tcmp r4, 0x14\n" - "\tbeq _08011328_case_14\n" - "\tb _080113EE_break\n" - "_08011252:\n" - "\tcmp r4, 0x44\n" - "\tbgt _08011264\n" - "\tcmp r4, 0x42\n" - "\tblt _0801125C\n" - "\tb _080113EE_break\n" - "_0801125C:\n" - "\tcmp r4, 0x33\n" - "\tbne _08011262\n" - "\tb _0801136C_case_30_case_33\n" - "_08011262:\n" - "\tb _080113EE_break\n" - "_08011264:\n" - "\tcmp r4, 0xF3\n" - "\tbne _0801126A\n" - "\tb _080113BA_case_f3\n" - "_0801126A:\n" - "\tcmp r4, 0xF3\n" - "\tbgt _08011276\n" - "\tcmp r4, 0xF0\n" - "\tbge _08011274\n" - "\tb _080113EE_break\n" - "_08011274:\n" - "\tb _080113D4_case_f0_f1_f2_ff\n" - "_08011276:\n" - "\tcmp r4, 0xFF\n" - "\tbne _0801127C\n" - "\tb _080113D4_case_f0_f1_f2_ff\n" - "_0801127C:\n" - "\tb _080113EE_break\n" - "_0801127E_case_00:\n" - "\tldr r1, =gUnknown_03005000\n" - "\tmovs r0, 0x2\n" - "\tstrh r0, [r1, 0x4]\n" - "\tb _080113EE_break\n" - "\t.pool\n" - "_0801128C_case_11:\n" - "\tldr r0, =gUnknown_03004140\n" - "\tldrh r0, [r0, 0x14]\n" - "\tbl sub_80115EC\n" - "\tmovs r5, 0\n" - "\tmovs r0, 0x1\n" - "\tmov r8, r0\n" - "\tldr r1, =gUnknown_03005000\n" - "\tmov r9, r1\n" - "\tldr r3, =0x00000cd5\n" - "\tadd r3, r9\n" - "\tmov r10, r3\n" - "\tmovs r7, 0x7F\n" - "_080112A6:\n" - "\tldr r0, =gUnknown_03004140\n" - "\tldrh r0, [r0, 0x14]\n" - "\tasrs r0, r5\n" - "\tmov r1, r8\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbeq _0801130E\n" - "\tldr r0, =gUnknown_03007890\n" - "\tlsls r1, r5, 5\n" - "\tadds r1, 0x14\n" - "\tldr r0, [r0]\n" - "\tadds r0, r1\n" - "\tldrb r0, [r0, 0x10]\n" - "\tadds r4, r7, 0\n" - "\tands r4, r0\n" - "\tbl sub_800F7DC\n" - "\tldrb r1, [r0, 0xA]\n" - "\tadds r0, r7, 0\n" - "\tands r0, r1\n" - "\tcmp r4, r0\n" - "\tbne _08011304\n" - "\tldr r0, =0x00000cd1\n" - "\tadd r0, r9\n" - "\tadds r0, r5, r0\n" - "\tmovs r1, 0\n" - "\tstrb r1, [r0]\n" - "\tmov r3, r10\n" - "\tadds r2, r5, r3\n" - "\tstrb r1, [r2]\n" - "\tmovs r0, 0x20\n" - "\tadds r1, r5, 0\n" - "\tmovs r3, 0x1\n" - "\tbl rfu_setRecvBuffer\n" - "\tb _0801130E\n" - "\t.pool\n" - "_08011304:\n" - "\tmov r0, r8\n" - "\tlsls r0, r5\n" - "\torrs r6, r0\n" - "\tlsls r0, r6, 24\n" - "\tlsrs r6, r0, 24\n" - "_0801130E:\n" - "\tadds r0, r5, 0x1\n" - "\tlsls r0, 24\n" - "\tlsrs r5, r0, 24\n" - "\tcmp r5, 0x3\n" - "\tbls _080112A6\n" - "\tcmp r6, 0\n" - "\tbeq _080113EE_break\n" - "\tadds r0, r6, 0\n" - "\tbl rfu_REQ_disconnect\n" - "\tbl rfu_waitREQComplete\n" - "\tb _080113EE_break\n" - "_08011328_case_14:\n" - "\tldr r4, =gUnknown_03005000\n" - "\tldr r1, =0x00000ce7\n" - "\tadds r0, r4, r1\n" - "\tldr r1, =gUnknown_03004140\n" - "\tldrb r2, [r0]\n" - "\tldrb r0, [r1]\n" - "\tcmp r2, r0\n" - "\tbeq _08011342\n" - "\teors r0, r2\n" - "\tbl rfu_REQ_disconnect\n" - "\tbl rfu_waitREQComplete\n" - "_08011342:\n" - "\tmovs r0, 0x11\n" - "\tstrh r0, [r4, 0x4]\n" - "\tb _080113EE_break\n" - "\t.pool\n" - "_08011354_case_31:\n" - "\tldr r0, =gUnknown_03005000\n" - "\tadds r0, 0xF0\n" - "\tb _080113EA\n" - "\t.pool\n" - "_08011360_case_32:\n" - "\tldr r0, =gUnknown_03005000\n" - "\tadds r0, 0xF0\n" - "\tmovs r1, 0x3\n" - "\tb _080113EC\n" - "\t.pool\n" - "_0801136C_case_30_case_33:\n" - "\tldr r1, =gUnknown_03005000\n" - "\tadds r2, r1, 0\n" - "\tadds r2, 0xF0\n" - "\tmovs r0, 0x4\n" - "\tstrb r0, [r2]\n" - "\tldr r3, =0x00000ce2\n" - "\tadds r1, r3\n" - "\tldr r0, =gUnknown_03004140\n" - "\tldrb r2, [r0, 0x14]\n" - "\tldrb r0, [r1]\n" - "\tadds r3, r0, 0\n" - "\tbics r3, r2\n" - "\tadds r2, r3, 0\n" - "\tstrb r2, [r1]\n" - "\tldr r0, =gReceivedRemoteLinkPlayers\n" - "\tldrb r0, [r0]\n" - "\tcmp r0, 0x1\n" - "\tbne _080113B0\n" - "\tcmp r2, 0\n" - "\tbne _080113AC\n" - "\tadds r0, r4, 0\n" - "\tbl sub_8011170\n" - "\tb _080113B0\n" - "\t.pool\n" - "_080113AC:\n" - "\tbl sub_80111FC\n" - "_080113B0:\n" - "\tmovs r0, 0x2\n" - "\tadds r1, r4, 0\n" - "\tbl sub_8011A64\n" - "\tb _080113EE_break\n" - "_080113BA_case_f3:\n" - "\tmovs r0, 0x1\n" - "\tmovs r1, 0xF3\n" - "\tbl sub_8011A64\n" - "\tmovs r0, 0xF3\n" - "\tbl sub_8011170\n" - "\tldr r0, =gUnknown_03005000\n" - "\tadds r0, 0xEF\n" - "\tb _080113EA\n" - "\t.pool\n" - "_080113D4_case_f0_f1_f2_ff:\n" - "\tadds r0, r4, 0\n" - "\tbl sub_8011170\n" - "\tmovs r0, 0x1\n" - "\tadds r1, r4, 0\n" - "\tbl sub_8011A64\n" - "\tldr r0, =gUnknown_03005000\n" - "\tldr r1, =0x00000cdb\n" - "\tadds r0, r1\n" - "\tldrb r1, [r0]\n" - "_080113EA:\n" - "\tmovs r1, 0x1\n" - "_080113EC:\n" - "\tstrb r1, [r0]\n" - "_080113EE_break:\n" - "\tpop {r3-r5}\n" - "\tmov r8, r3\n" - "\tmov r9, r4\n" - "\tmov r10, r5\n" - "\tpop {r4-r7}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.pool"); -} -#endif -- cgit v1.2.3 From f87e68379c09fbd34e14f0271922ac1599a76439 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 29 Nov 2018 21:19:00 +0100 Subject: match 2 field functions --- src/field_effect_helpers.c | 139 ++++---------------------------------- src/field_specials.c | 165 +++++---------------------------------------- 2 files changed, 27 insertions(+), 277 deletions(-) diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 1f90c02b9..a68a72c76 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1547,150 +1547,35 @@ void WaitFieldEffectSpriteAnim(struct Sprite *sprite) UpdateEventObjectSpriteVisibility(sprite, FALSE); } -#ifdef NONMATCHING -static void sub_81561FC(struct Sprite *sprite /*r6*/, u8 z, u8 offset) +static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset) { u8 i; - s16 xlo; - s16 xhi; - s16 lx; - s16 lyhi; - s16 ly; - s16 ylo; - s16 yhi; - struct EventObject *eventObject; // r4 - const struct EventObjectGraphicsInfo *graphicsInfo; // destroyed - struct Sprite *linkedSprite; // r5 + s16 var, xhi, lyhi, yhi, ylo; + const struct EventObjectGraphicsInfo *graphicsInfo; // Unused Variable + struct Sprite *linkedSprite; SetObjectSubpriorityByZCoord(z, sprite, offset); - for (i = 0; i < 16; i ++) + for (i = 0; i < EVENT_OBJECTS_COUNT; i ++) { - eventObject = &gEventObjects[i]; + struct EventObject *eventObject = &gEventObjects[i]; if (eventObject->active) { graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); linkedSprite = &gSprites[eventObject->spriteId]; xhi = sprite->pos1.x + sprite->centerToCornerVecX; - xlo = sprite->pos1.x - sprite->centerToCornerVecX; - lx = linkedSprite->pos1.x; - if (xhi < lx && xlo > lx) + var = sprite->pos1.x - sprite->centerToCornerVecX; + if (xhi < linkedSprite->pos1.x && var > linkedSprite->pos1.x) { lyhi = linkedSprite->pos1.y + linkedSprite->centerToCornerVecY; - ly = linkedSprite->pos1.y; + var = linkedSprite->pos1.y; ylo = sprite->pos1.y - sprite->centerToCornerVecY; yhi = ylo + linkedSprite->centerToCornerVecY; - if ((lyhi < yhi || lyhi < ylo) && ly > yhi) + if ((lyhi < yhi || lyhi < ylo) && var > yhi && sprite->subpriority <= linkedSprite->subpriority) { - if (sprite->subpriority <= linkedSprite->subpriority) - { - sprite->subpriority = linkedSprite->subpriority + 2; - break; - } + sprite->subpriority = linkedSprite->subpriority + 2; + break; } } } } } -#else -NAKED void sub_81561FC(struct Sprite *sprite /*r6*/, u8 z, u8 offset) -{ - asm_unified("push {r4-r7,lr}\n\ - adds r6, r0, 0\n\ - adds r0, r1, 0\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - adds r1, r6, 0\n\ - bl SetObjectSubpriorityByZCoord\n\ - movs r7, 0\n\ -_08156212:\n\ - lsls r0, r7, 3\n\ - adds r0, r7\n\ - lsls r0, 2\n\ - ldr r1, =gEventObjects\n\ - adds r4, r0, r1\n\ - ldrb r0, [r4]\n\ - lsls r0, 31\n\ - cmp r0, 0\n\ - beq _081562B4\n\ - ldrb r0, [r4, 0x5]\n\ - bl GetEventObjectGraphicsInfo\n\ - ldrb r1, [r4, 0x4]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - ldr r1, =gSprites\n\ - adds r5, r0, r1\n\ - adds r0, r6, 0\n\ - adds r0, 0x28\n\ - movs r2, 0\n\ - ldrsb r2, [r0, r2]\n\ - ldrh r0, [r6, 0x20]\n\ - adds r1, r0, r2\n\ - subs r0, r2\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - lsls r1, 16\n\ - asrs r1, 16\n\ - movs r0, 0x20\n\ - ldrsh r2, [r5, r0]\n\ - cmp r1, r2\n\ - bge _081562B4\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - cmp r0, r2\n\ - ble _081562B4\n\ - adds r0, r5, 0\n\ - adds r0, 0x29\n\ - movs r3, 0\n\ - ldrsb r3, [r0, r3]\n\ - ldrh r2, [r5, 0x22]\n\ - adds r2, r3\n\ - ldrh r4, [r5, 0x22]\n\ - adds r0, r6, 0\n\ - adds r0, 0x29\n\ - movs r1, 0\n\ - ldrsb r1, [r0, r1]\n\ - ldrh r0, [r6, 0x22]\n\ - subs r0, r1\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - adds r3, r0, r3\n\ - lsls r2, 16\n\ - asrs r2, 16\n\ - lsls r3, 16\n\ - asrs r3, 16\n\ - cmp r2, r3\n\ - blt _0815628C\n\ - cmp r2, r0\n\ - bge _081562B4\n\ -_0815628C:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - cmp r0, r3\n\ - ble _081562B4\n\ - adds r2, r6, 0\n\ - adds r2, 0x43\n\ - adds r0, r5, 0\n\ - adds r0, 0x43\n\ - ldrb r1, [r0]\n\ - ldrb r0, [r2]\n\ - cmp r0, r1\n\ - bhi _081562B4\n\ - adds r0, r1, 0x2\n\ - strb r0, [r2]\n\ - b _081562BE\n\ - .pool\n\ -_081562B4:\n\ - adds r0, r7, 0x1\n\ - lsls r0, 24\n\ - lsrs r7, r0, 24\n\ - cmp r7, 0xF\n\ - bls _08156212\n\ -_081562BE:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0"); -} -#endif diff --git a/src/field_specials.c b/src/field_specials.c index 562127890..4da751b27 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1709,8 +1709,18 @@ const u8 *const gElevatorFloorsTable[] = { gText_Rooftop }; -const u16 gUnknown_085B2BF4[] = { 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b }; -const u16 gUnknown_085B2C06[] = { 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a }; +const u16 gUnknown_085B2BF4[][3] = +{ + {0x0329, 0x032a, 0x032b}, + {0x0331, 0x0332, 0x0333}, + {0x0339, 0x033a, 0x033b}, +}; +const u16 gUnknown_085B2C06[][3] = +{ + {0x0329, 0x032b, 0x032a}, + {0x0331, 0x0333, 0x0332}, + {0x0339, 0x033b, 0x033a}, +}; void SetDepartmentStoreFloorVar(void) { @@ -1866,9 +1876,6 @@ static void sub_8139C2C(u16 a1, u8 a2) } } -// Annoyingly close but compiler wants to add all the parts of the index into the arrays -// first and then shift by one, whereas we need each individual part to shift and then be added. -#ifdef NONMATCHING static void sub_8139C80(u8 taskId) { u8 x, y; @@ -1883,7 +1890,7 @@ static void sub_8139C80(u8 taskId) { for (x = 0; x < 3; x++) { - MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y * 3 + data[0] % 3] | 0xC00); + MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y][data[0] % 3] | 0xC00); } } } @@ -1893,7 +1900,7 @@ static void sub_8139C80(u8 taskId) { for (x = 0; x < 3; x++) { - MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y * 3 + data[0] % 3] | 0xC00); + MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y][data[0] % 3] | 0xC00); } } } @@ -1906,148 +1913,6 @@ static void sub_8139C80(u8 taskId) } data[1]++; } -#else -NAKED -static void sub_8139C80(u8 taskId) -{ - asm_unified("push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x4\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - str r0, [sp]\n\ - lsls r0, 2\n\ - ldr r1, [sp]\n\ - adds r0, r1\n\ - lsls r0, 3\n\ - ldr r1, =gTasks + 0x8\n\ - adds r6, r0, r1\n\ - movs r2, 0x2\n\ - ldrsh r0, [r6, r2]\n\ - cmp r0, 0x6\n\ - bne _08139D7C\n\ - ldrh r0, [r6]\n\ - adds r0, 0x1\n\ - strh r0, [r6]\n\ - movs r1, 0x4\n\ - ldrsh r0, [r6, r1]\n\ - cmp r0, 0\n\ - bne _08139D10\n\ - movs r1, 0\n\ - ldr r2, =gUnknown_085B2BF4\n\ - mov r10, r2\n\ -_08139CBA:\n\ - movs r5, 0\n\ - adds r7, r1, 0x7\n\ - lsls r0, r1, 1\n\ - adds r2, r1, 0x1\n\ - mov r8, r2\n\ - adds r0, r1\n\ - lsls r0, 1\n\ - mov r9, r0\n\ -_08139CCA:\n\ - adds r4, r5, 0\n\ - adds r4, 0x8\n\ - movs r1, 0\n\ - ldrsh r0, [r6, r1]\n\ - movs r1, 0x3\n\ - bl __modsi3\n\ - lsls r0, 16\n\ - asrs r0, 15\n\ - add r0, r9\n\ - add r0, r10\n\ - ldrh r0, [r0]\n\ - movs r1, 0xC0\n\ - lsls r1, 4\n\ - adds r2, r1, 0\n\ - orrs r2, r0\n\ - adds r0, r4, 0\n\ - adds r1, r7, 0\n\ - bl MapGridSetMetatileIdAt\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - cmp r5, 0x2\n\ - bls _08139CCA\n\ - mov r2, r8\n\ - lsls r0, r2, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, 0x2\n\ - bls _08139CBA\n\ - b _08139D62\n\ - .pool\n\ -_08139D10:\n\ - movs r1, 0\n\ - ldr r0, =gUnknown_085B2C06\n\ - mov r10, r0\n\ -_08139D16:\n\ - movs r5, 0\n\ - adds r7, r1, 0x7\n\ - lsls r0, r1, 1\n\ - adds r2, r1, 0x1\n\ - mov r8, r2\n\ - adds r0, r1\n\ - lsls r0, 1\n\ - mov r9, r0\n\ -_08139D26:\n\ - adds r4, r5, 0\n\ - adds r4, 0x8\n\ - movs r1, 0\n\ - ldrsh r0, [r6, r1]\n\ - movs r1, 0x3\n\ - bl __modsi3\n\ - lsls r0, 16\n\ - asrs r0, 15\n\ - add r0, r9\n\ - add r0, r10\n\ - ldrh r0, [r0]\n\ - movs r1, 0xC0\n\ - lsls r1, 4\n\ - adds r2, r1, 0\n\ - orrs r2, r0\n\ - adds r0, r4, 0\n\ - adds r1, r7, 0\n\ - bl MapGridSetMetatileIdAt\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - cmp r5, 0x2\n\ - bls _08139D26\n\ - mov r2, r8\n\ - lsls r0, r2, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, 0x2\n\ - bls _08139D16\n\ -_08139D62:\n\ - bl DrawWholeMapView\n\ - movs r0, 0\n\ - strh r0, [r6, 0x2]\n\ - movs r0, 0\n\ - ldrsh r1, [r6, r0]\n\ - movs r2, 0x6\n\ - ldrsh r0, [r6, r2]\n\ - cmp r1, r0\n\ - bne _08139D7C\n\ - ldr r0, [sp]\n\ - bl DestroyTask\n\ -_08139D7C:\n\ - ldrh r0, [r6, 0x2]\n\ - adds r0, 0x1\n\ - strh r0, [r6, 0x2]\n\ - add sp, 0x4\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool"); -} -#endif // NAKED void sub_8139D98(void) { @@ -2069,7 +1934,7 @@ void sub_8139D98(void) } gSpecialVar_0x8006 = 0; - gSpecialVar_0x8007 = ivStorage[STAT_HP]; + gSpecialVar_0x8007 = ivStorage[STAT_HP]; for (i = 1; i < NUM_STATS; i++) { -- cgit v1.2.3 From 9dd7f8f2147ffcaa0b5a347a937b269a946717b3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 30 Nov 2018 10:41:03 -0600 Subject: Decompile pokedex_area_screen.c (#412) --- asm/pokedex_area_screen.s | 1892 ------------------------------ data/pokedex_area_screen.s | 92 -- include/graphics.h | 4 + include/pokedex_area_screen.h | 2 +- include/region_map.h | 14 + include/unk_pokedex_area_screen_helper.h | 17 + ld_script.txt | 4 +- src/pokedex.c | 2 +- src/pokedex_area_screen.c | 720 ++++++++++++ src/region_map.c | 9 - src/unk_pokedex_area_screen_helper.c | 11 +- sym_bss.txt | 19 +- sym_ewram.txt | 5 +- 13 files changed, 763 insertions(+), 2028 deletions(-) delete mode 100644 asm/pokedex_area_screen.s delete mode 100644 data/pokedex_area_screen.s create mode 100755 include/unk_pokedex_area_screen_helper.h create mode 100755 src/pokedex_area_screen.c diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s deleted file mode 100644 index 579788e14..000000000 --- a/asm/pokedex_area_screen.s +++ /dev/null @@ -1,1892 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_813CA54 -sub_813CA54: @ 813CA54 - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - movs r1, 0x8A - lsls r1, 1 - adds r0, r1 - movs r1, 0 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_813CA54 - - thumb_func_start sub_813CA68 -sub_813CA68: @ 813CA68 - push {lr} - sub sp, 0x4 - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - movs r1, 0x8A - lsls r1, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0x4 - bhi _0813CB20 - lsls r0, 2 - ldr r1, =_0813CA90 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813CA90: - .4byte _0813CAA4 - .4byte _0813CAB4 - .4byte _0813CABA - .4byte _0813CAEC - .4byte _0813CB10 -_0813CAA4: - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - ldrh r0, [r0, 0xE] - bl sub_813CB40 - b _0813CB24 - .pool -_0813CAB4: - bl sub_813CF0C - b _0813CB24 -_0813CABA: - ldr r1, =gUnknown_085B3DB4 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl decompress_and_copy_tile_data_to_vram - ldr r0, =gUnknown_0203AB7C - ldr r1, [r0] - movs r0, 0x8B - lsls r0, 1 - adds r1, r0 - movs r2, 0xA0 - lsls r2, 3 - movs r0, 0x2 - movs r3, 0 - bl LoadBgTilemap - b _0813CB24 - .pool -_0813CAEC: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - cmp r0, 0 - bne _0813CB34 - ldr r0, =gUnknown_085B3D94 - ldr r1, =gPlttBufferUnfaded + 0x140 - ldr r2, =0x04000008 - bl CpuSet - b _0813CB24 - .pool -_0813CB10: - ldr r1, =0xfffff800 - movs r0, 0x2 - movs r2, 0 - bl ChangeBgY - b _0813CB24 - .pool -_0813CB20: - movs r0, 0 - b _0813CB36 -_0813CB24: - ldr r0, =gUnknown_0203AB7C - ldr r1, [r0] - movs r0, 0x8A - lsls r0, 1 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_0813CB34: - movs r0, 0x1 -_0813CB36: - add sp, 0x4 - pop {r1} - bx r1 - .pool - thumb_func_end sub_813CA68 - - thumb_func_start sub_813CB40 -sub_813CB40: @ 813CB40 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 16 - lsrs r7, r0, 16 - ldr r5, =gUnknown_0203AB7C - ldr r0, [r5] - ldr r1, =0x000006e2 - adds r0, r1 - movs r4, 0 - strh r4, [r0] - ldr r0, =0x0000403e - bl VarGet - ldr r1, [r5] - ldr r2, =0x000006e4 - adds r1, r2 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x8 - bls _0813CB70 - strh r4, [r1] -_0813CB70: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, =0x000031dc - adds r0, r3 - ldrh r1, [r0, 0x8] - cmp r7, r1 - bne _0813CB80 - b _0813CCB8 -_0813CB80: - ldr r1, [r5] - movs r2, 0x88 - lsls r2, 1 - adds r0, r1, r2 - strh r4, [r0] - movs r3, 0x89 - lsls r3, 1 - adds r0, r1, r3 - strh r4, [r0] - movs r6, 0 - ldr r1, =gUnknown_085B3EE8 -_0813CB96: - lsls r0, r6, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r7 - bne _0813CBA2 - b _0813CCF8 -_0813CBA2: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0 - beq _0813CB96 - movs r6, 0 - ldr r4, =gUnknown_085B3EF0 - ldrh r0, [r4] - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _0813CC44 - mov r8, r4 - adds r5, r4, 0x4 - mov r9, r1 -_0813CBC0: - lsls r0, r6, 1 - adds r1, r0, r6 - lsls r2, r1, 1 - mov r3, r8 - adds r1, r2, r3 - adds r3, r0, 0 - ldrh r1, [r1] - cmp r7, r1 - bne _0813CC2E - adds r0, r4, 0x2 - adds r0, r2, r0 - ldrh r0, [r0] - cmp r0, 0x18 - beq _0813CC1A - cmp r0, 0x18 - bgt _0813CC08 - cmp r0, 0 - beq _0813CC0E - b _0813CC2E - .pool -_0813CC08: - cmp r0, 0x1A - beq _0813CC1A - b _0813CC2E -_0813CC0E: - adds r0, r2, r5 - ldrh r1, [r0] - movs r0, 0 - bl sub_813CD04 - b _0813CC2E -_0813CC1A: - adds r1, r3, r6 - lsls r1, 1 - mov r0, r8 - adds r0, 0x2 - adds r0, r1, r0 - ldrh r0, [r0] - adds r1, r5 - ldrh r1, [r1] - bl sub_813CD64 -_0813CC2E: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r4, =gUnknown_085B3EF0 - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 1 - adds r0, r4 - ldrh r0, [r0] - cmp r0, r9 - bne _0813CBC0 -_0813CC44: - movs r6, 0 - ldr r1, =gWildMonHeaders - ldrb r0, [r1] - cmp r0, 0xFF - beq _0813CCF8 -_0813CC4E: - lsls r4, r6, 2 - adds r0, r4, r6 - lsls r0, 2 - adds r5, r0, r1 - adds r0, r5, 0 - adds r1, r7, 0 - bl sub_813CE48 - lsls r0, 24 - cmp r0, 0 - beq _0813CC9C - ldrb r0, [r5] - cmp r0, 0x18 - beq _0813CC8C - cmp r0, 0x18 - bgt _0813CC7C - cmp r0, 0 - beq _0813CC82 - b _0813CC9C - .pool -_0813CC7C: - cmp r0, 0x1A - beq _0813CC8C - b _0813CC9C -_0813CC82: - ldrb r1, [r5, 0x1] - movs r0, 0 - bl sub_813CD04 - b _0813CC9C -_0813CC8C: - ldr r0, =gWildMonHeaders - adds r1, r4, r6 - lsls r1, 2 - adds r1, r0 - ldrb r0, [r1] - ldrb r1, [r1, 0x1] - bl sub_813CD64 -_0813CC9C: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r1, =gWildMonHeaders - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0xFF - bne _0813CC4E - b _0813CCF8 - .pool -_0813CCB8: - ldr r2, [r5] - movs r3, 0x89 - lsls r3, 1 - adds r1, r2, r3 - strh r4, [r1] - ldrb r1, [r0, 0x13] - cmp r1, 0 - beq _0813CCF0 - adds r0, r2, 0 - adds r0, 0x10 - adds r1, r2, 0 - adds r1, 0x11 - bl GetRoamerLocation - ldr r1, [r5] - ldrb r0, [r1, 0x10] - ldrb r1, [r1, 0x11] - bl Overworld_GetMapHeaderByGroupAndId - ldr r1, [r5] - ldrb r0, [r0, 0x14] - strh r0, [r1, 0x12] - movs r0, 0x88 - lsls r0, 1 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1] - b _0813CCF8 -_0813CCF0: - movs r3, 0x88 - lsls r3, 1 - adds r0, r2, r3 - strh r1, [r0] -_0813CCF8: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_813CB40 - - thumb_func_start sub_813CD04 -sub_813CD04: @ 813CD04 - push {r4,r5,lr} - lsls r0, 16 - lsrs r5, r0, 16 - lsls r1, 16 - lsrs r3, r1, 16 - ldr r4, =gUnknown_0203AB7C - ldr r2, [r4] - movs r0, 0x88 - lsls r0, 1 - adds r1, r2, r0 - ldrh r0, [r1] - cmp r0, 0x3F - bhi _0813CD58 - lsls r0, 2 - adds r0, r2, r0 - strb r5, [r0, 0x10] - ldr r1, [r4] - movs r2, 0x88 - lsls r2, 1 - adds r0, r1, r2 - ldrh r0, [r0] - lsls r0, 2 - adds r1, r0 - strb r3, [r1, 0x11] - adds r0, r5, 0 - adds r1, r3, 0 - bl Overworld_GetMapHeaderByGroupAndId - ldrb r0, [r0, 0x14] - bl CorrectSpecialMapSecId - ldr r2, [r4] - movs r1, 0x88 - lsls r1, 1 - adds r3, r2, r1 - ldrh r1, [r3] - lsls r1, 2 - adds r2, r1 - strh r0, [r2, 0x12] - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r3] -_0813CD58: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813CD04 - - thumb_func_start sub_813CD64 -sub_813CD64: @ 813CD64 - push {r4-r7,lr} - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 16 - lsrs r1, 16 - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - movs r3, 0x89 - lsls r3, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, 0x1F - bhi _0813CE22 - lsls r0, r2, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - bl sub_813CE34 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0xD4 - bhi _0813CE22 - movs r3, 0 - ldr r0, =gUnknown_085B3EEA -_0813CD96: - ldrh r4, [r0] - cmp r5, r4 - beq _0813CE22 - adds r0, 0x2 - adds r3, 0x1 - cmp r3, 0x2 - bls _0813CD96 - ldr r1, =gUnknown_085B3EFC - ldrh r0, [r1] - cmp r0, 0xD5 - beq _0813CDD2 - adds r4, r1, 0 - adds r7, r4, 0 - movs r6, 0 -_0813CDB2: - ldrh r0, [r4] - cmp r5, r0 - bne _0813CDC8 - adds r0, r7, 0x2 - adds r0, r6, r0 - ldrh r0, [r0] - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0813CE22 -_0813CDC8: - adds r4, 0x4 - adds r6, 0x4 - ldrh r0, [r4] - cmp r0, 0xD5 - bne _0813CDB2 -_0813CDD2: - movs r3, 0 - ldr r0, =gUnknown_0203AB7C - ldr r2, [r0] - movs r4, 0x89 - lsls r4, 1 - adds r1, r2, r4 - ldrh r4, [r1] - adds r1, r0, 0 - cmp r3, r4 - bge _0813CE02 - movs r6, 0xC4 - lsls r6, 3 - adds r0, r2, r6 - ldrh r0, [r0] - cmp r0, r5 - beq _0813CE02 - adds r2, r6 -_0813CDF4: - adds r2, 0x2 - adds r3, 0x1 - cmp r3, r4 - bge _0813CE02 - ldrh r0, [r2] - cmp r0, r5 - bne _0813CDF4 -_0813CE02: - ldr r1, [r1] - movs r0, 0x89 - lsls r0, 1 - adds r2, r1, r0 - ldrh r4, [r2] - cmp r3, r4 - bne _0813CE22 - lsls r0, r3, 1 - movs r6, 0xC4 - lsls r6, 3 - adds r1, r6 - adds r1, r0 - strh r5, [r1] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] -_0813CE22: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813CD64 - - thumb_func_start sub_813CE34 -sub_813CE34: @ 813CE34 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - bl Overworld_GetMapHeaderByGroupAndId - ldrb r0, [r0, 0x14] - pop {r1} - bx r1 - thumb_func_end sub_813CE34 - - thumb_func_start sub_813CE48 -sub_813CE48: @ 813CE48 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r5, r1, 16 - ldrb r0, [r4] - ldrb r1, [r4, 0x1] - bl sub_813CE34 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xD2 - bne _0813CE7C - ldr r0, =gUnknown_0203AB7C - ldr r2, [r0] - ldr r0, =0x000006e2 - adds r1, r2, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - ldrh r1, [r1] - ldr r0, =0x000006e4 - adds r2, r0 - ldrh r0, [r2] - adds r0, 0x1 - cmp r1, r0 - bne _0813CEBC -_0813CE7C: - ldr r0, [r4, 0x4] - adds r1, r5, 0 - movs r2, 0xC - bl sub_813CED4 - lsls r0, 24 - cmp r0, 0 - bne _0813CECC - ldr r0, [r4, 0x8] - adds r1, r5, 0 - movs r2, 0x5 - bl sub_813CED4 - lsls r0, 24 - cmp r0, 0 - bne _0813CECC - ldr r0, [r4, 0x10] - adds r1, r5, 0 - movs r2, 0xC - bl sub_813CED4 - lsls r0, 24 - cmp r0, 0 - bne _0813CECC - ldr r0, [r4, 0xC] - adds r1, r5, 0 - movs r2, 0x5 - bl sub_813CED4 - lsls r0, 24 - cmp r0, 0 - bne _0813CECC -_0813CEBC: - movs r0, 0 - b _0813CECE - .pool -_0813CECC: - movs r0, 0x1 -_0813CECE: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_813CE48 - - thumb_func_start sub_813CED4 -sub_813CED4: @ 813CED4 - push {r4,lr} - lsls r1, 16 - lsrs r4, r1, 16 - lsls r2, 16 - lsrs r2, 16 - cmp r0, 0 - beq _0813CF02 - movs r3, 0 - cmp r3, r2 - bcs _0813CF02 - ldr r1, [r0, 0x4] -_0813CEEA: - lsls r0, r3, 2 - adds r0, r1 - ldrh r0, [r0, 0x2] - cmp r0, r4 - bne _0813CEF8 - movs r0, 0x1 - b _0813CF04 -_0813CEF8: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r2 - bcc _0813CEEA -_0813CF02: - movs r0, 0 -_0813CF04: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_813CED4 - - thumb_func_start sub_813CF0C -sub_813CF0C: @ 813CF0C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - movs r4, 0 - ldr r2, =gUnknown_0203AB7C - adds r7, r2, 0 - movs r6, 0x8B - lsls r6, 1 - movs r5, 0 - ldr r3, =0x0000027f -_0813CF26: - ldr r0, [r7] - lsls r1, r4, 1 - adds r0, r6 - adds r0, r1 - strh r5, [r0] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r3 - bls _0813CF26 - movs r4, 0 - ldr r0, [r2] - movs r1, 0x88 - lsls r1, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r4, r0 - bcs _0813CFB2 - adds r3, r2, 0 -_0813CF4C: - movs r5, 0 - movs r6, 0 - adds r2, r4, 0x1 - mov r8, r2 - lsls r4, 2 - mov r9, r4 -_0813CF58: - movs r4, 0 -_0813CF5A: - adds r0, r4, 0 - adds r1, r6, 0 - str r3, [sp] - bl GetRegionMapSectionIdAt - ldr r3, [sp] - ldr r2, [r3] - mov r7, r9 - adds r1, r2, r7 - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r1, 0x12] - cmp r0, r1 - bne _0813CF84 - lsls r0, r5, 1 - movs r7, 0x8B - lsls r7, 1 - adds r1, r2, r7 - adds r1, r0 - ldr r0, =0x0000ffff - strh r0, [r1] -_0813CF84: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1F - bls _0813CF5A - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x13 - bls _0813CF58 - mov r1, r8 - lsls r0, r1, 16 - lsrs r4, r0, 16 - ldr r0, [r3] - movs r2, 0x88 - lsls r2, 1 - adds r0, r2 - ldrh r0, [r0] - cmp r4, r0 - bcc _0813CF4C -_0813CFB2: - movs r5, 0 - movs r6, 0 - ldr r7, =gUnknown_0203AB7C - mov r12, r7 - movs r7, 0x8B - lsls r7, 1 - ldr r3, =0x0000ffff -_0813CFC0: - movs r4, 0 - adds r1, r6, 0x1 - mov r9, r1 -_0813CFC6: - mov r2, r12 - ldr r0, [r2] - lsls r1, r5, 1 - adds r2, r0, r7 - adds r1, r2, r1 - ldrh r0, [r1] - adds r1, r5, 0x1 - mov r8, r1 - cmp r0, r3 - bne _0813D0D2 - cmp r4, 0 - beq _0813CFF0 - subs r0, r5, 0x1 - lsls r0, 1 - adds r1, r2, r0 - ldrh r2, [r1] - cmp r2, r3 - beq _0813CFF0 - movs r0, 0x2 - orrs r0, r2 - strh r0, [r1] -_0813CFF0: - adds r2, r5, 0x1 - mov r8, r2 - cmp r4, 0x1F - beq _0813D00E - mov r1, r12 - ldr r0, [r1] - lsls r1, r2, 1 - adds r0, r7 - adds r2, r0, r1 - ldrh r1, [r2] - cmp r1, r3 - beq _0813D00E - movs r0, 0x1 - orrs r0, r1 - strh r0, [r2] -_0813D00E: - cmp r6, 0 - beq _0813D02C - mov r2, r12 - ldr r1, [r2] - adds r0, r5, 0 - subs r0, 0x20 - lsls r0, 1 - adds r1, r7 - adds r1, r0 - ldrh r2, [r1] - cmp r2, r3 - beq _0813D02C - movs r0, 0x8 - orrs r0, r2 - strh r0, [r1] -_0813D02C: - cmp r6, 0x13 - beq _0813D04A - mov r0, r12 - ldr r1, [r0] - adds r0, r5, 0 - adds r0, 0x20 - lsls r0, 1 - adds r1, r7 - adds r1, r0 - ldrh r2, [r1] - cmp r2, r3 - beq _0813D04A - movs r0, 0x4 - orrs r0, r2 - strh r0, [r1] -_0813D04A: - cmp r4, 0 - beq _0813D06C - cmp r6, 0 - beq _0813D06C - mov r2, r12 - ldr r1, [r2] - adds r0, r5, 0 - subs r0, 0x21 - lsls r0, 1 - adds r1, r7 - adds r1, r0 - ldrh r2, [r1] - cmp r2, r3 - beq _0813D06C - movs r0, 0x10 - orrs r0, r2 - strh r0, [r1] -_0813D06C: - cmp r4, 0x1F - beq _0813D08E - cmp r6, 0 - beq _0813D08E - mov r0, r12 - ldr r1, [r0] - adds r0, r5, 0 - subs r0, 0x1F - lsls r0, 1 - adds r1, r7 - adds r1, r0 - ldrh r2, [r1] - cmp r2, r3 - beq _0813D08E - movs r0, 0x40 - orrs r0, r2 - strh r0, [r1] -_0813D08E: - cmp r4, 0 - beq _0813D0B0 - cmp r6, 0x13 - beq _0813D0B0 - mov r2, r12 - ldr r1, [r2] - adds r0, r5, 0 - adds r0, 0x1F - lsls r0, 1 - adds r1, r7 - adds r1, r0 - ldrh r2, [r1] - cmp r2, r3 - beq _0813D0B0 - movs r0, 0x20 - orrs r0, r2 - strh r0, [r1] -_0813D0B0: - cmp r4, 0x1F - beq _0813D0D2 - cmp r6, 0x13 - beq _0813D0D2 - mov r0, r12 - ldr r1, [r0] - adds r0, r5, 0 - adds r0, 0x21 - lsls r0, 1 - adds r1, r7 - adds r1, r0 - ldrh r2, [r1] - cmp r2, r3 - beq _0813D0D2 - movs r0, 0x80 - orrs r0, r2 - strh r0, [r1] -_0813D0D2: - mov r1, r8 - lsls r0, r1, 16 - lsrs r5, r0, 16 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1F - bhi _0813D0E4 - b _0813CFC6 -_0813D0E4: - mov r2, r9 - lsls r0, r2, 16 - lsrs r6, r0, 16 - cmp r6, 0x13 - bhi _0813D0F0 - b _0813CFC0 -_0813D0F0: - movs r4, 0 - ldr r6, =gUnknown_0203AB7C - movs r5, 0x8B - lsls r5, 1 - ldr r7, =0x0000ffff - mov r12, r7 - movs r0, 0xA0 - lsls r0, 8 - mov r9, r0 - ldr r7, =0x0000a010 - ldr r1, =0x0000ffcf - mov r8, r1 -_0813D108: - ldr r0, [r6] - lsls r3, r4, 1 - adds r0, r5 - adds r2, r0, r3 - ldrh r1, [r2] - adds r0, r1, 0 - cmp r0, r12 - bne _0813D130 - strh r7, [r2] - b _0813D198 - .pool -_0813D130: - cmp r0, 0 - beq _0813D198 - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0813D142 - mov r0, r8 - ands r0, r1 - strh r0, [r2] -_0813D142: - ldr r0, [r6] - adds r0, r5 - adds r2, r0, r3 - ldrh r1, [r2] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0813D158 - ldr r0, =0x0000ff3f - ands r0, r1 - strh r0, [r2] -_0813D158: - ldr r0, [r6] - adds r0, r5 - adds r2, r0, r3 - ldrh r1, [r2] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0813D16E - ldr r0, =0x0000ffaf - ands r0, r1 - strh r0, [r2] -_0813D16E: - ldr r0, [r6] - adds r0, r5 - adds r2, r0, r3 - ldrh r1, [r2] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0813D184 - ldr r0, =0x0000ff5f - ands r0, r1 - strh r0, [r2] -_0813D184: - ldr r1, [r6] - adds r1, r5 - adds r1, r3 - ldr r2, =gUnknown_085B3F18 - ldrh r0, [r1] - adds r0, r2 - ldrb r0, [r0] - mov r2, r9 - orrs r0, r2 - strh r0, [r1] -_0813D198: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =0x0000027f - cmp r4, r0 - bls _0813D108 - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813CF0C - - thumb_func_start sub_813D1C8 -sub_813D1C8: @ 813D1C8 - push {lr} - ldr r1, =gUnknown_0203AB7C - ldr r2, [r1] - movs r3, 0x89 - lsls r3, 1 - adds r0, r2, r3 - ldrh r0, [r0] - adds r3, r1, 0 - cmp r0, 0 - beq _0813D1FC - movs r1, 0x88 - lsls r1, 1 - adds r0, r2, r1 - ldrh r0, [r0] - cmp r0, 0 - bne _0813D1FC - ldr r0, =0x0000061e - adds r1, r2, r0 - movs r0, 0x1 - strb r0, [r1] - b _0813D206 - .pool -_0813D1FC: - ldr r0, [r3] - ldr r1, =0x0000061e - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_0813D206: - ldr r1, [r3] - ldr r2, =0x00000616 - adds r0, r1, r2 - movs r2, 0 - strh r2, [r0] - movs r3, 0xC3 - lsls r3, 3 - adds r0, r1, r3 - strh r2, [r0] - adds r3, 0x2 - adds r0, r1, r3 - strh r2, [r0] - ldr r0, =0x0000061c - adds r2, r1, r0 - movs r0, 0x40 - strh r0, [r2] - ldr r2, =0x0000061f - adds r1, r2 - movs r0, 0x1 - strb r0, [r1] - ldr r1, =0x00003f44 - movs r0, 0x50 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 5 - movs r0, 0x52 - bl SetGpuReg - bl sub_813D25C - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D1C8 - - thumb_func_start sub_813D25C -sub_813D25C: @ 813D25C - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r0, =gUnknown_0203AB7C - ldr r2, [r0] - ldr r3, =0x0000061e - adds r1, r2, r3 - ldrb r1, [r1] - adds r7, r0, 0 - cmp r1, 0 - bne _0813D32A - ldr r0, =0x00000616 - adds r1, r2, r0 - ldrh r0, [r1] - cmp r0, 0 - bne _0813D324 - movs r1, 0xC3 - lsls r1, 3 - adds r0, r2, r1 - ldrh r1, [r0] - adds r1, 0x1 - strh r1, [r0] - movs r0, 0x1 - ands r1, r0 - cmp r1, 0 - beq _0813D2A4 - subs r3, 0x4 - adds r0, r2, r3 - b _0813D2A8 - .pool -_0813D2A4: - ldr r1, =0x0000061c - adds r0, r2, r1 -_0813D2A8: - ldrh r1, [r0] - adds r1, 0x4 - movs r2, 0x7F - ands r1, r2 - strh r1, [r0] - ldr r3, =gSineTable - ldr r1, [r7] - ldr r2, =0x0000061a - adds r0, r1, r2 - ldrh r0, [r0] - lsls r0, 1 - adds r0, r3 - ldrh r2, [r0] - lsls r2, 16 - asrs r2, 20 - lsls r2, 16 - ldr r0, =0x0000061c - adds r1, r0 - ldrh r0, [r1] - lsls r0, 1 - adds r0, r3 - ldrh r1, [r0] - lsls r1, 16 - asrs r1, 20 - lsls r1, 24 - orrs r1, r2 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - ldr r1, [r7] - ldr r2, =0x00000616 - adds r0, r1, r2 - movs r3, 0 - strh r3, [r0] - movs r0, 0xC3 - lsls r0, 3 - adds r2, r1, r0 - ldrh r0, [r2] - cmp r0, 0x40 - bne _0813D3C6 - strh r3, [r2] - movs r2, 0x89 - lsls r2, 1 - adds r0, r1, r2 - ldrh r0, [r0] - cmp r0, 0 - beq _0813D3C6 - ldr r3, =0x0000061e - adds r1, r3 - movs r0, 0x1 - b _0813D3C4 - .pool -_0813D324: - subs r0, 0x1 - strh r0, [r1] - b _0813D3C6 -_0813D32A: - ldr r0, =0x00000616 - adds r1, r2, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xC - bls _0813D3C6 - movs r0, 0 - strh r0, [r1] - ldr r3, =0x0000061f - adds r1, r2, r3 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - movs r4, 0 - ldr r0, [r7] - movs r6, 0x89 - lsls r6, 1 - adds r0, r6 - ldrh r0, [r0] - cmp r4, r0 - bcs _0813D3A0 - adds r5, r7, 0 - movs r0, 0x1 - mov r12, r0 - movs r1, 0x5 - negs r1, r1 - mov r8, r1 -_0813D366: - ldr r1, [r5] - lsls r2, r4, 2 - movs r3, 0xCC - lsls r3, 3 - adds r0, r1, r3 - adds r0, r2 - ldr r3, [r0] - ldr r0, =0x0000061f - adds r1, r0 - ldrb r0, [r1] - movs r1, 0x1 - adds r3, 0x3E - ands r1, r0 - mov r2, r12 - ands r1, r2 - lsls r1, 2 - ldrb r2, [r3] - mov r0, r8 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, [r5] - adds r0, r6 - ldrh r0, [r0] - cmp r4, r0 - bcc _0813D366 -_0813D3A0: - ldr r0, [r7] - ldr r3, =0x0000061f - adds r1, r0, r3 - ldrb r0, [r1] - cmp r0, 0x4 - bls _0813D3C6 - movs r0, 0x1 - strb r0, [r1] - ldr r1, [r7] - movs r2, 0x88 - lsls r2, 1 - adds r0, r1, r2 - ldrh r0, [r0] - cmp r0, 0 - beq _0813D3C6 - subs r3, 0x1 - adds r1, r3 - movs r0, 0 -_0813D3C4: - strb r0, [r1] -_0813D3C6: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D25C - - thumb_func_start sub_813D3D8 -sub_813D3D8: @ 813D3D8 - push {r4-r6,lr} - adds r4, r0, 0 - adds r6, r1, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r5, =gUnknown_0203AB7C - ldr r0, =0x000015bc - bl AllocZeroed - str r0, [r5] - movs r1, 0 - movs r5, 0 - strh r4, [r0, 0xE] - movs r2, 0xDD - lsls r2, 3 - adds r0, r2 - str r6, [r0] - strb r1, [r6] - ldr r0, =sub_813D42C - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r5, [r1, 0x8] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D3D8 - - thumb_func_start sub_813D42C -sub_813D42C: @ 813D42C - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - adds r2, r1, 0 - cmp r0, 0xB - bls _0813D44A - b _0813D584 -_0813D44A: - lsls r0, 2 - ldr r1, =_0813D45C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813D45C: - .4byte _0813D48C - .4byte _0813D4A8 - .4byte _0813D4D4 - .4byte _0813D4E6 - .4byte _0813D4EC - .4byte _0813D4F8 - .4byte _0813D520 - .4byte _0813D526 - .4byte _0813D52C - .4byte _0813D532 - .4byte _0813D544 - .4byte _0813D56C -_0813D48C: - bl ResetSpriteData - bl FreeAllSpritePalettes - movs r0, 0x3 - bl HideBg - movs r0, 0x2 - bl HideBg - movs r0, 0 - bl HideBg - b _0813D584 -_0813D4A8: - movs r0, 0x3 - movs r1, 0x1 - movs r2, 0x3 - bl SetBgAttribute - ldr r0, =gUnknown_085B4018 - bl sub_81C4D70 - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - movs r1, 0xF7 - lsls r1, 4 - adds r0, r1 - movs r1, 0 - movs r2, 0x10 - bl StringFill - b _0813D584 - .pool -_0813D4D4: - bl sub_81C4E90 - cmp r0, 0x1 - beq _0813D594 - movs r0, 0x8 - negs r0, r0 - bl sub_81C4ED0 - b _0813D584 -_0813D4E6: - bl sub_813CA54 - b _0813D584 -_0813D4EC: - bl sub_813CA68 - lsls r0, 24 - cmp r0, 0 - bne _0813D594 - b _0813D584 -_0813D4F8: - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - ldr r2, =0x000006ec - adds r0, r2 - bl sub_8122D88 - movs r0, 0x1 - movs r1, 0x1 - bl CreateRegionMapPlayerIcon - movs r1, 0x8 - negs r1, r1 - movs r0, 0 - bl PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs - b _0813D584 - .pool -_0813D520: - bl sub_813D6D0 - b _0813D584 -_0813D526: - bl sub_813D8A8 - b _0813D584 -_0813D52C: - bl sub_813D8E8 - b _0813D584 -_0813D532: - movs r0, 0x15 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _0813D584 -_0813D544: - ldr r1, =0x00003f41 - movs r0, 0x50 - bl SetGpuReg - bl sub_813D1C8 - movs r0, 0x2 - bl ShowBg - movs r0, 0x3 - bl ShowBg - movs r1, 0x80 - lsls r1, 5 - movs r0, 0 - bl SetGpuRegBits - b _0813D584 - .pool -_0813D56C: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r2 - ldr r1, =sub_813D5A0 - str r1, [r0] - movs r1, 0 - strh r1, [r0, 0x8] - b _0813D594 - .pool -_0813D584: - ldr r0, =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_0813D594: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D42C - - thumb_func_start sub_813D5A0 -sub_813D5A0: @ 813D5A0 - push {r4-r7,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - bl sub_813D25C - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r6, r0, r1 - movs r0, 0x8 - ldrsh r1, [r6, r0] - cmp r1, 0x1 - beq _0813D5F8 - cmp r1, 0x1 - bgt _0813D5CC - cmp r1, 0 - beq _0813D5E2 - b _0813D5D4 - .pool -_0813D5CC: - cmp r1, 0x2 - beq _0813D640 - cmp r1, 0x3 - beq _0813D652 -_0813D5D4: - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - movs r0, 0 - strh r0, [r1, 0x8] -_0813D5E2: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0813D6A8 - b _0813D698 - .pool -_0813D5F8: - ldr r0, =gMain - ldrh r2, [r0, 0x2E] - movs r3, 0x2 - adds r0, r3, 0 - ands r0, r2 - cmp r0, 0 - beq _0813D614 - strh r1, [r6, 0xA] - movs r0, 0x3 - bl PlaySE - b _0813D698 - .pool -_0813D614: - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - bne _0813D630 - movs r0, 0x80 - lsls r0, 1 - ands r0, r2 - cmp r0, 0 - beq _0813D6A8 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x13] - cmp r0, 0x1 - bne _0813D6A8 -_0813D630: - strh r3, [r6, 0xA] - movs r0, 0x6D - bl PlaySE - b _0813D698 - .pool -_0813D640: - movs r0, 0x15 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _0813D698 -_0813D652: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _0813D6A8 - bl sub_813D824 - ldr r4, =gUnknown_0203AB7C - ldr r0, [r4] - movs r1, 0xDD - lsls r1, 3 - adds r0, r1 - ldr r1, [r0] - ldrh r0, [r6, 0xA] - strb r0, [r1] - bl sub_813D6B4 - adds r0, r5, 0 - bl DestroyTask - bl sub_81C4EB4 - ldr r0, [r4] - bl Free - str r7, [r4] - b _0813D6A8 - .pool -_0813D698: - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_0813D6A8: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D5A0 - - thumb_func_start sub_813D6B4 -sub_813D6B4: @ 813D6B4 - push {lr} - movs r0, 0x3 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r0, 0x3 - movs r1, 0x4 - movs r2, 0 - bl SetBgAttribute - pop {r0} - bx r0 - thumb_func_end sub_813D6B4 - - thumb_func_start sub_813D6D0 -sub_813D6D0: @ 813D6D0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, =gUnknown_085B401C - bl LoadSpriteSheet - ldr r0, =gUnknown_085B4024 - bl LoadSpritePalette - ldr r0, =gUnknown_03001204 - movs r1, 0 - strh r1, [r0] - ldr r2, =gUnknown_03001200 - strh r1, [r2] - ldr r1, =gUnknown_0203AB7C - ldr r0, [r1] - movs r3, 0x89 - lsls r3, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, 0 - beq _0813D7D8 - ldr r5, =gUnknown_03001202 - mov r10, r1 - adds r7, r2, 0 - ldr r0, =gUnknown_030011FC - mov r9, r0 - ldr r6, =gRegionMapEntries - ldr r1, =gUnknown_030011FE - mov r8, r1 -_0813D710: - mov r2, r10 - ldr r1, [r2] - movs r3, 0 - ldrsh r0, [r7, r3] - lsls r0, 1 - movs r2, 0xC4 - lsls r2, 3 - adds r1, r2 - adds r1, r0 - ldrh r0, [r1] - strh r0, [r5] - movs r3, 0 - ldrsh r0, [r5, r3] - lsls r0, 3 - adds r0, r6 - ldrb r1, [r0] - adds r1, 0x1 - lsls r1, 3 - adds r1, 0x4 - mov r0, r9 - strh r1, [r0] - movs r2, 0 - ldrsh r0, [r5, r2] - lsls r0, 3 - adds r0, r6 - ldrb r2, [r0, 0x1] - lsls r2, 3 - adds r2, 0x1C - mov r3, r8 - strh r2, [r3] - movs r3, 0 - ldrsh r0, [r5, r3] - lsls r0, 3 - adds r0, r6 - ldrb r0, [r0, 0x2] - subs r0, 0x1 - lsls r0, 2 - adds r1, r0 - mov r0, r9 - strh r1, [r0] - movs r1, 0 - ldrsh r0, [r5, r1] - lsls r0, 3 - adds r0, r6 - ldrb r0, [r0, 0x3] - subs r0, 0x1 - lsls r0, 2 - adds r2, r0 - mov r3, r8 - strh r2, [r3] - mov r0, r9 - movs r2, 0 - ldrsh r1, [r0, r2] - movs r0, 0 - ldrsh r2, [r3, r0] - ldr r0, =gUnknown_085B4034 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0813D7BE - ldr r0, =gSprites - lsls r2, r1, 4 - adds r2, r1 - lsls r2, 2 - adds r2, r0 - adds r3, r2, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3] - mov r1, r10 - ldr r3, [r1] - ldr r4, =gUnknown_03001204 - ldrh r1, [r4] - adds r0, r1, 0x1 - strh r0, [r4] - lsls r1, 16 - asrs r1, 14 - movs r0, 0xCC - lsls r0, 3 - adds r3, r0 - adds r3, r1 - str r2, [r3] -_0813D7BE: - ldrh r0, [r7] - adds r0, 0x1 - strh r0, [r7] - movs r2, 0 - ldrsh r1, [r7, r2] - mov r3, r10 - ldr r0, [r3] - movs r2, 0x89 - lsls r2, 1 - adds r0, r2 - ldrh r0, [r0] - cmp r1, r0 - blt _0813D710 -_0813D7D8: - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - ldr r1, =gUnknown_03001204 - ldrh r1, [r1] - movs r3, 0xDC - lsls r3, 3 - adds r0, r3 - strh r1, [r0] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D6D0 - - thumb_func_start sub_813D824 -sub_813D824: @ 813D824 - push {r4,r5,lr} - movs r0, 0x2 - bl FreeSpriteTilesByTag - movs r0, 0x2 - bl FreeSpritePaletteByTag - movs r4, 0 - ldr r1, =gUnknown_0203AB7C - ldr r0, [r1] - movs r2, 0xDC - lsls r2, 3 - adds r0, r2 - ldrh r0, [r0] - cmp r4, r0 - bcs _0813D86C - adds r5, r1, 0 -_0813D846: - ldr r0, [r5] - lsls r1, r4, 2 - movs r2, 0xCC - lsls r2, 3 - adds r0, r2 - adds r0, r1 - ldr r0, [r0] - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, [r5] - movs r1, 0xDC - lsls r1, 3 - adds r0, r1 - ldrh r0, [r0] - cmp r4, r0 - bcc _0813D846 -_0813D86C: - movs r0, 0x3 - bl FreeSpriteTilesByTag - movs r0, 0x3 - bl FreeSpritePaletteByTag - movs r4, 0 -_0813D87A: - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - lsls r1, r4, 2 - movs r2, 0xFB - lsls r2, 4 - adds r0, r2 - adds r0, r1 - ldr r0, [r0] - cmp r0, 0 - beq _0813D892 - bl DestroySprite -_0813D892: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x2 - bls _0813D87A - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D824 - - thumb_func_start sub_813D8A8 -sub_813D8A8: @ 813D8A8 - push {lr} - sub sp, 0x8 - ldr r0, =gUnknown_0203AB7C - ldr r1, [r0] - ldr r0, =0x00000fbc - adds r1, r0 - str r1, [sp] - ldr r0, =0x00030600 - str r0, [sp, 0x4] - ldr r0, =gPokedexAreaScreenAreaUnknown_Gfx - bl LZ77UnCompWram - mov r0, sp - bl LoadSpriteSheet - ldr r0, =gUnknown_085B40EC - bl LoadSpritePalette - add sp, 0x8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D8A8 - - thumb_func_start sub_813D8E8 -sub_813D8E8: @ 813D8E8 - push {r4-r6,lr} - ldr r1, =gUnknown_0203AB7C - ldr r0, [r1] - movs r2, 0x88 - lsls r2, 1 - adds r0, r2 - ldr r0, [r0] - cmp r0, 0 - beq _0813D920 - movs r4, 0 - adds r5, r1, 0 - movs r3, 0xFB - lsls r3, 4 - movs r2, 0 -_0813D904: - ldr r0, [r5] - lsls r1, r4, 2 - adds r0, r3 - adds r0, r1 - str r2, [r0] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x2 - bls _0813D904 - b _0813D9A4 - .pool -_0813D920: - movs r4, 0 - ldr r5, =gSprites -_0813D924: - lsls r1, r4, 21 - movs r6, 0xA0 - lsls r6, 16 - adds r1, r6 - asrs r1, 16 - ldr r0, =gSpriteTemplate_85B40FC - movs r2, 0x8C - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _0813D988 - lsls r3, r0, 4 - adds r3, r0 - lsls r3, 2 - adds r3, r5 - ldrh r2, [r3, 0x4] - lsls r0, r2, 22 - lsrs r0, 22 - lsls r1, r4, 4 - adds r0, r1 - ldr r6, =0x000003ff - adds r1, r6, 0 - ands r0, r1 - ldr r6, =0xfffffc00 - adds r1, r6, 0 - ands r2, r1 - orrs r2, r0 - strh r2, [r3, 0x4] - ldr r0, =gUnknown_0203AB7C - ldr r0, [r0] - lsls r1, r4, 2 - movs r2, 0xFB - lsls r2, 4 - adds r0, r2 - adds r0, r1 - str r3, [r0] - b _0813D99A - .pool -_0813D988: - ldr r0, =gUnknown_0203AB7C - ldr r1, [r0] - lsls r0, r4, 2 - movs r6, 0xFB - lsls r6, 4 - adds r1, r6 - adds r1, r0 - movs r0, 0 - str r0, [r1] -_0813D99A: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x2 - bls _0813D924 -_0813D9A4: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813D8E8 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s deleted file mode 100644 index 77d17a047..000000000 --- a/data/pokedex_area_screen.s +++ /dev/null @@ -1,92 +0,0 @@ -#include "constants/flags.h" -#include "constants/region_map_sections.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085B3D94:: @ 85B3D94 - .incbin "graphics/pokedex/area_glow.gbapal" - - .align 2 -gUnknown_085B3DB4:: @ 85B3DB4 - .incbin "graphics/pokedex/area_glow.4bpp.lz" - - .align 1 -gUnknown_085B3EE8:: @ 85B3EE8 - .2byte 0x0168 - - .align 1 -gUnknown_085B3EEA:: @ 85B3EEA - .2byte MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE - - .align 1 -gUnknown_085B3EF0:: @ 85B3EF0 - .2byte SPECIES_FEEBAS, 0x0000, 0x0022 - .2byte SPECIES_EGG, 0x0000, 0x0000 - - .align 1 -gUnknown_085B3EFC:: @ 85B3EFC - .2byte MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR - .2byte MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN - .2byte MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE - .2byte MAPSEC_MIRAGE_TOWER, FLAG_LANDMARK_MIRAGE_TOWER - .2byte MAPSEC_DESERT_UNDERPASS, FLAG_LANDMARK_DESERT_UNDERPASS - .2byte MAPSEC_ARTISAN_CAVE, FLAG_0x8DF - .2byte MAPSEC_NONE, 0x0000 - -gUnknown_085B3F18:: @ 85B3F18 - .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x12, 0x21, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x13, 0x22, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x14, 0x01, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x15, 0x20, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x16, 0x21, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x17, 0x22, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x18, 0x01, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x19, 0x20, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x1a, 0x21, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1b, 0x22, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x1c, 0x01, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1d, 0x20, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - .byte 0x1e, 0x21, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x1f, 0x22, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f - - .align 2 -gUnknown_085B4018:: @ 85B4018 - .4byte 0x00002003 - - .align 2 -gUnknown_085B401C:: @ 85B401C - obj_tiles AreaMarkerTiles, 0x0080, 0x0002 - - .align 2 -gUnknown_085B4024:: @ 85B4024 - obj_pal AreaMarkerPalette, 0x0002 - - .align 2 -gUnknown_085B402C:: @ 85B402C - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gUnknown_085B4034:: @ 85B4034 - spr_template 0x0002, 0x0002, gUnknown_085B402C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -AreaMarkerPalette:: @ 85B404C - .incbin "graphics/pokedex/area_marker.gbapal" - - .align 2 -AreaMarkerTiles:: @ 85B406C - .incbin "graphics/pokedex/area_marker.4bpp" - - .align 2 -gUnknown_085B40EC:: @ 85B40EC - obj_pal gPokedexAreaScreenAreaUnknown_Pal, 0x0003 - - .align 2 -gOamData_85B40F4:: @ 85B40F4 - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteTemplate_85B40FC:: @ 85B40FC - spr_template 0x0003, 0x0003, gOamData_85B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/include/graphics.h b/include/graphics.h index 0620ea551..18ff8c693 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4736,4 +4736,8 @@ extern const u32 gSlotMachineReelTime_Gfx[]; extern const u32 gUnknown_08D8D410[]; extern const u32 gUnknown_08D8D58C[]; +// Pokedex Area Screen +extern const u32 gPokedexAreaScreenAreaUnknown_Gfx[]; +extern const u16 gPokedexAreaScreenAreaUnknown_Pal[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/pokedex_area_screen.h b/include/pokedex_area_screen.h index 2fb5ade51..027d3e4a7 100755 --- a/include/pokedex_area_screen.h +++ b/include/pokedex_area_screen.h @@ -1,6 +1,6 @@ #ifndef GUARD_POKEDEX_AREA_SCREEN_H #define GUARD_POKEDEX_AREA_SCREEN_H -void sub_813D3D8(u16, u8*); +void ShowPokedexAreaScreen(u16, u8*); #endif // GUARD_POKEDEX_AREA_SCREEN_H diff --git a/include/region_map.h b/include/region_map.h index 6339f7a88..0c82232cf 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -78,6 +78,15 @@ struct RegionMap { /*0x284*/ u8 cursorLargeImage[0x600]; }; // size = 0x884 +struct RegionMapLocation +{ + u8 x; + u8 y; + u8 width; + u8 height; + const u8 *name; +}; + // Exported RAM declarations // Exported ROM declarations @@ -95,5 +104,10 @@ u8 *GetMapName(u8 *, u16, u16); bool32 sub_8124668(u8 mapSecId); u8 *sub_81245DC(u8 *dest, u16 mapSecId); u8 *sub_8124610(u8 *dest, u16 mapSecId); +u16 CorrectSpecialMapSecId(u16 mapSecId); +void sub_8122D88(struct RegionMap *regionMap); +void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y); + +extern const struct RegionMapLocation gRegionMapEntries[]; #endif //GUARD_REGION_MAP_H diff --git a/include/unk_pokedex_area_screen_helper.h b/include/unk_pokedex_area_screen_helper.h new file mode 100755 index 000000000..45beed70e --- /dev/null +++ b/include/unk_pokedex_area_screen_helper.h @@ -0,0 +1,17 @@ +#ifndef GUARD_UNK_POKEDEX_AREA_SCREEN_HELPER_H +#define GUARD_UNK_POKEDEX_AREA_SCREEN_HELPER_H + +struct UnkStruct_1C4D70 +{ + u32 bg:2; + u32 unk2:8; + u32 unk10:2; + u32 unk12:20; +}; + +void sub_81C4D70(const struct UnkStruct_1C4D70 *); +bool32 sub_81C4E90(void); +void sub_81C4ED0(u32); +void sub_81C4EB4(void); + +#endif // GUARD_UNK_POKEDEX_AREA_SCREEN_HELPER_H diff --git a/ld_script.txt b/ld_script.txt index 31a9c3aac..df26da50d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -203,7 +203,7 @@ SECTIONS { src/hof_pc.o(.text); src/field_specials.o(.text); src/battle_records.o(.text); - asm/pokedex_area_screen.o(.text); + src/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); asm/roulette.o(.text); src/pokedex_cry_screen.o(.text); @@ -519,7 +519,7 @@ SECTIONS { src/time_events.o(.rodata); src/field_specials.o(.rodata); src/battle_records.o(.rodata); - data/pokedex_area_screen.o(.rodata); + src/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); data/roulette.o(.rodata); src/pokedex_cry_screen.o(.rodata); diff --git a/src/pokedex.c b/src/pokedex.c index 3d06a0417..e234c355f 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -3156,7 +3156,7 @@ void sub_80BF0AC(u8 taskId) gMain.state++; break; case 2: - sub_813D3D8(NationalPokedexNumToSpecies(gUnknown_02039B54->dexNum), &gUnknown_02039B4C->unk64E); + ShowPokedexAreaScreen(NationalPokedexNumToSpecies(gUnknown_02039B54->dexNum), &gUnknown_02039B4C->unk64E); SetVBlankCallback(gUnknown_030060B4); gUnknown_02039B4C->unk64E = 0; gMain.state = 0; diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c new file mode 100755 index 000000000..843812723 --- /dev/null +++ b/src/pokedex_area_screen.c @@ -0,0 +1,720 @@ +#include "global.h" +#include "bg.h" +#include "event_data.h" +#include "gpu_regs.h" +#include "graphics.h" +#include "main.h" +#include "malloc.h" +#include "menu.h" +#include "overworld.h" +#include "palette.h" +#include "pokedex_area_screen.h" +#include "region_map.h" +#include "roamer.h" +#include "sound.h" +#include "string_util.h" +#include "trig.h" +#include "unk_pokedex_area_screen_helper.h" +#include "wild_encounter.h" +#include "constants/maps.h" +#include "constants/region_map_sections.h" +#include "constants/rgb.h" +#include "constants/songs.h" +#include "constants/species.h" +#include "constants/vars.h" + +struct PokeDexAreaScreenMapIdentity +{ + u8 mapGroup; + u8 mapNum; + u16 regionMapSectionId; +}; + +struct PokeDexAreaScreen +{ + /*0x000*/ void (*callback)(void); // unused + /*0x004*/ MainCallback prev; // unused + /*0x008*/ MainCallback next; // unused + /*0x00C*/ u16 state; // unused + /*0x00E*/ u16 species; + /*0x010*/ struct PokeDexAreaScreenMapIdentity overworldAreasWithMons[0x40]; + /*0x110*/ u16 numOverworldAreas; + /*0x112*/ u16 numSpecialAreas; + /*0x114*/ u16 drawAreaGlowState; + /*0x116*/ u16 areaGlowTilemap[0x280]; + /*0x616*/ u16 areaShadeOrMarkerFrameCounter; + /*0x618*/ u16 areaShadeFrameCounter; + /*0x61A*/ u16 areaShadeBldArgLo; + /*0x61C*/ u16 areaShadeBldArgHi; + /*0x61E*/ u8 whichMarkersFlashing; + /*0x61F*/ u8 specialMarkerCycleCounter; + /*0x620*/ u16 specialAreaRegionMapSectionIds[0x20]; + /*0x660*/ struct Sprite *areaMarkerSprites[0x20]; + /*0x6E0*/ u16 numAreaMarkerSprites; + /*0x6E2*/ u16 unk6E2; + /*0x6E4*/ u16 unk6E4; + /*0x6E8*/ u8 *errno; + /*0x6EC*/ struct RegionMap regionMap; + /*0xF70*/ u8 charBuffer[0x40]; + /*0xFB0*/ struct Sprite * areaUnknownSprites[3]; + /*0xFBC*/ u8 areaUnknownGraphicsBuffer[0x600]; +}; + +static EWRAM_DATA struct PokeDexAreaScreen *sPokedexAreaScreen = NULL; + +static void FindMapsWithMon(u16); +static void BuildAreaGlowTilemap(void); +static void SetAreaHasMon(u16, u16); +static void SetSpecialMapHasMon(u16, u16); +static u16 GetRegionMapSectionId(u8, u8); +static bool8 MapHasMon(const struct WildPokemonHeader *, u16); +static bool8 MonListHasMon(const struct WildPokemonInfo *, u16, u16); +static void DoAreaGlow(void); +static void Task_PokedexAreaScreen_0(u8); +static void CreateAreaMarkerSprites(void); +static void LoadAreaUnknownGraphics(void); +static void CreateAreaUnknownSprites(void); +static void Task_PokedexAreaScreen_1(u8); +static void sub_813D6B4(void); +static void DestroyAreaMarkerSprites(void); + +static const u32 sAreaGlow_Pal[] = INCBIN_U32("graphics/pokedex/area_glow.gbapal"); +static const u32 sAreaGlow_Gfx[] = INCBIN_U32("graphics/pokedex/area_glow.4bpp.lz"); + +static const u16 sSpeciesHiddenFromAreaScreen[] = { SPECIES_WYNAUT }; + +static const u16 sMovingRegionMapSections[3] = { MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE }; + +static const u16 sFeebasData[][3] = { + {SPECIES_FEEBAS, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119)}, + {NUM_SPECIES} +}; + +static const u16 sLandmarkData[][2] = { + {MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR}, + {MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN}, + {MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE}, + {MAPSEC_MIRAGE_TOWER, FLAG_LANDMARK_MIRAGE_TOWER}, + {MAPSEC_DESERT_UNDERPASS, FLAG_LANDMARK_DESERT_UNDERPASS}, + {MAPSEC_ARTISAN_CAVE, FLAG_0x8DF}, + {MAPSEC_NONE} +}; + +static const u8 sAreaGlowTilemapMapping[] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x12, 0x21, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x13, 0x22, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x14, 0x01, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x15, 0x20, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x16, 0x21, 0x23, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x17, 0x22, 0x23, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x18, 0x01, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x19, 0x20, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x1a, 0x21, 0x24, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x1b, 0x22, 0x24, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x1c, 0x01, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x1d, 0x20, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x29, 0x09, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x1e, 0x21, 0x25, 0x03, 0x26, 0x05, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x1f, 0x22, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, +}; + +static const struct UnkStruct_1C4D70 sUnknown_085B4018 = { + .bg = 3, + .unk2 = 0, + .unk10 = 0, + .unk12 = 2, +}; + +static const u8 sAreaMarkerTiles[]; +static const struct SpriteSheet sAreaMarkerSpriteSheet = { + sAreaMarkerTiles, 0x80, 2 +}; + +static const u16 sAreaMarkerPalette[]; +static const struct SpritePalette sAreaMarkerSpritePalette = { + sAreaMarkerPalette, 2 +}; + +static const struct OamData sAreaMarkerOamData = { + .size = 1, + .priority = 1 +}; + +static const struct SpriteTemplate sAreaMarkerSpriteTemplate = { + 2, + 2, + &sAreaMarkerOamData, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +static const u16 sAreaMarkerPalette[] = INCBIN_U16("graphics/pokedex/area_marker.gbapal"); +static const u8 sAreaMarkerTiles[] = INCBIN_U8("graphics/pokedex/area_marker.4bpp"); + +static const struct SpritePalette sAreaUnknownSpritePalette = { + gPokedexAreaScreenAreaUnknown_Pal, 3 +}; + +static const struct OamData sAreaUnknownOamData = { + .size = 2, + .priority = 1 +}; + +static const struct SpriteTemplate sAreaUnknownSpriteTemplate = { + 3, + 3, + &sAreaUnknownOamData, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +static void ResetDrawAreaGlowState(void) +{ + sPokedexAreaScreen->drawAreaGlowState = 0; +} + +static bool8 DrawAreaGlow(void) +{ + switch (sPokedexAreaScreen->drawAreaGlowState) + { + case 0: + FindMapsWithMon(sPokedexAreaScreen->species); + break; + case 1: + BuildAreaGlowTilemap(); + break; + case 2: + decompress_and_copy_tile_data_to_vram(2, sAreaGlow_Gfx, 0, 0, 0); + LoadBgTilemap(2, sPokedexAreaScreen->areaGlowTilemap, 0x500, 0); + break; + case 3: + if (!free_temp_tile_data_buffers_if_possible()) + { + CpuCopy32(sAreaGlow_Pal, gPlttBufferUnfaded + 0xA0, 0x20); + sPokedexAreaScreen->drawAreaGlowState++; + } + return TRUE; + case 4: + ChangeBgY(2, -0x800, 0); + break; + default: + return FALSE; + } + + sPokedexAreaScreen->drawAreaGlowState++; + return TRUE; +} + +static void FindMapsWithMon(u16 species) +{ + u16 i; + struct Roamer *roamer; + + sPokedexAreaScreen->unk6E2 = 0; + sPokedexAreaScreen->unk6E4 = VarGet(VAR_ALTERING_CAVE_WILD_SET); + if (sPokedexAreaScreen->unk6E4 > 8) + sPokedexAreaScreen->unk6E4 = 0; + + roamer = &gSaveBlock1Ptr->roamer; + if (species != roamer->species) + { + sPokedexAreaScreen->numOverworldAreas = 0; + sPokedexAreaScreen->numSpecialAreas = 0; + for (i = 0; i < ARRAY_COUNT(sSpeciesHiddenFromAreaScreen); i++) + { + if (sSpeciesHiddenFromAreaScreen[i] == species) + return; + } + + for (i = 0; sFeebasData[i][0] != NUM_SPECIES; i++) + { + if (species == sFeebasData[i][0]) + { + switch (sFeebasData[i][1]) + { + case MAP_GROUP(PETALBURG_CITY): + SetAreaHasMon(sFeebasData[i][1], sFeebasData[i][2]); + break; + case MAP_GROUP(METEOR_FALLS_1F_1R): + case MAP_GROUP(SAFARI_ZONE_NORTHWEST): + SetSpecialMapHasMon(sFeebasData[i][1], sFeebasData[i][2]); + break; + } + } + } + + for (i = 0; gWildMonHeaders[i].mapGroup != 0xFF; i++) + { + if (MapHasMon(gWildMonHeaders + i, species)) + { + switch (gWildMonHeaders[i].mapGroup) + { + case MAP_GROUP(PETALBURG_CITY): + SetAreaHasMon(gWildMonHeaders[i].mapGroup, gWildMonHeaders[i].mapNum); + break; + case MAP_GROUP(METEOR_FALLS_1F_1R): + case MAP_GROUP(SAFARI_ZONE_NORTHWEST): + SetSpecialMapHasMon(gWildMonHeaders[i].mapGroup, gWildMonHeaders[i].mapNum); + break; + } + } + } + } + else + { + sPokedexAreaScreen->numSpecialAreas = 0; + if (roamer->active) + { + GetRoamerLocation(&sPokedexAreaScreen->overworldAreasWithMons[0].mapGroup, &sPokedexAreaScreen->overworldAreasWithMons[0].mapNum); + sPokedexAreaScreen->overworldAreasWithMons[0].regionMapSectionId = Overworld_GetMapHeaderByGroupAndId(sPokedexAreaScreen->overworldAreasWithMons[0].mapGroup, sPokedexAreaScreen->overworldAreasWithMons[0].mapNum)->regionMapSectionId; + sPokedexAreaScreen->numOverworldAreas = 1; + } + else + { + sPokedexAreaScreen->numOverworldAreas = 0; + } + } +} + +static void SetAreaHasMon(u16 mapGroup, u16 mapNum) +{ + if (sPokedexAreaScreen->numOverworldAreas < 0x40) + { + sPokedexAreaScreen->overworldAreasWithMons[sPokedexAreaScreen->numOverworldAreas].mapGroup = mapGroup; + sPokedexAreaScreen->overworldAreasWithMons[sPokedexAreaScreen->numOverworldAreas].mapNum = mapNum; + sPokedexAreaScreen->overworldAreasWithMons[sPokedexAreaScreen->numOverworldAreas].regionMapSectionId = CorrectSpecialMapSecId(Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum)->regionMapSectionId); + sPokedexAreaScreen->numOverworldAreas++; + } +} + +static void SetSpecialMapHasMon(u16 mapGroup, u16 mapNum) +{ + int i; + + if (sPokedexAreaScreen->numSpecialAreas < 0x20) + { + u16 regionMapSectionId = GetRegionMapSectionId(mapGroup, mapNum); + if (regionMapSectionId < MAPSEC_NONE) + { + for (i = 0; i < ARRAY_COUNT(sMovingRegionMapSections); i++) + { + if (regionMapSectionId == sMovingRegionMapSections[i]) + return; + } + + for (i = 0; sLandmarkData[i][0] != MAPSEC_NONE; i++) + { + if (regionMapSectionId == sLandmarkData[i][0] && !FlagGet(sLandmarkData[i][1])) + return; + } + + for (i = 0; i < sPokedexAreaScreen->numSpecialAreas; i++) + { + if (sPokedexAreaScreen->specialAreaRegionMapSectionIds[i] == regionMapSectionId) + break; + } + + if (i == sPokedexAreaScreen->numSpecialAreas) + { + sPokedexAreaScreen->specialAreaRegionMapSectionIds[i] = regionMapSectionId; + sPokedexAreaScreen->numSpecialAreas++; + } + } + } +} + +static u16 GetRegionMapSectionId(u8 mapGroup, u8 mapNum) +{ + return Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum)->regionMapSectionId; +} + +static bool8 MapHasMon(const struct WildPokemonHeader *info, u16 species) +{ + if (GetRegionMapSectionId(info->mapGroup, info->mapNum) == MAPSEC_ALTERING_CAVE_2) + { + sPokedexAreaScreen->unk6E2++; + if (sPokedexAreaScreen->unk6E2 != sPokedexAreaScreen->unk6E4 + 1) + return FALSE; + } + + if (MonListHasMon(info->landMonsInfo, species, 12)) + return TRUE; + if (MonListHasMon(info->waterMonsInfo, species, 5)) + return TRUE; + if (MonListHasMon(info->fishingMonsInfo, species, 12)) + return TRUE; + if (MonListHasMon(info->rockSmashMonsInfo, species, 5)) + return TRUE; + return FALSE; +} + +static bool8 MonListHasMon(const struct WildPokemonInfo *info, u16 species, u16 size) +{ + u16 i; + if (info != NULL) + { + for (i = 0; i < size; i++) + { + if (info->wildPokemon[i].species == species) + return TRUE; + } + } + return FALSE; +} + +static void BuildAreaGlowTilemap(void) +{ + u16 i, y, x, j; + u16 val; + + for (i = 0; i < 0x280; i++) + sPokedexAreaScreen->areaGlowTilemap[i] = 0; + + for (i = 0; i < sPokedexAreaScreen->numOverworldAreas; i++) + { + j = 0; + for (y = 0; y < 20; y++) + { + for (x = 0; x < 32; x++) + { + if (GetRegionMapSectionIdAt(x, y) == sPokedexAreaScreen->overworldAreasWithMons[i].regionMapSectionId) + sPokedexAreaScreen->areaGlowTilemap[j] = 0xFFFF; + + j++; + } + } + } + + j = 0; + for (y = 0; y < 20; y++) + { + for (x = 0; x < 32; x++) + { + if (sPokedexAreaScreen->areaGlowTilemap[j] == 0xFFFF) + { + if (x != 0 && sPokedexAreaScreen->areaGlowTilemap[j - 1] != 0xFFFF) + sPokedexAreaScreen->areaGlowTilemap[j - 1] |= 0x02; + if (x != 31 && sPokedexAreaScreen->areaGlowTilemap[j + 1] != 0xFFFF) + sPokedexAreaScreen->areaGlowTilemap[j + 1] |= 0x01; + if (y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - 32] != 0xFFFF) + sPokedexAreaScreen->areaGlowTilemap[j - 32] |= 0x08; + if (y != 19 && sPokedexAreaScreen->areaGlowTilemap[j + 32] != 0xFFFF) + sPokedexAreaScreen->areaGlowTilemap[j + 32] |= 0x04; + if (x != 0 && y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - 33] != 0xFFFF) + sPokedexAreaScreen->areaGlowTilemap[j - 33] |= 0x10; + if (x != 31 && y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - 31] != 0xFFFF) + sPokedexAreaScreen->areaGlowTilemap[j - 31] |= 0x40; + if (x != 0 && y != 19 && sPokedexAreaScreen->areaGlowTilemap[j + 31] != 0xFFFF) + sPokedexAreaScreen->areaGlowTilemap[j + 31] |= 0x20; + if (x != 31 && y != 19 && sPokedexAreaScreen->areaGlowTilemap[j + 33] != 0xFFFF) + sPokedexAreaScreen->areaGlowTilemap[j + 33] |= 0x80; + } + + j++; + } + } + + for (i = 0; i < 0x280; i++) + { + if (sPokedexAreaScreen->areaGlowTilemap[i] == 0xFFFF) + { + sPokedexAreaScreen->areaGlowTilemap[i] = 0x10; + sPokedexAreaScreen->areaGlowTilemap[i] |= 0xA000; + } + else if (sPokedexAreaScreen->areaGlowTilemap[i]) + { + if (sPokedexAreaScreen->areaGlowTilemap[i] & 0x02) + sPokedexAreaScreen->areaGlowTilemap[i] &= 0xFFCF; + if (sPokedexAreaScreen->areaGlowTilemap[i] & 0x01) + sPokedexAreaScreen->areaGlowTilemap[i] &= 0xFF3F; + if (sPokedexAreaScreen->areaGlowTilemap[i] & 0x08) + sPokedexAreaScreen->areaGlowTilemap[i] &= 0xFFAF; + if (sPokedexAreaScreen->areaGlowTilemap[i] & 0x04) + sPokedexAreaScreen->areaGlowTilemap[i] &= 0xFF5F; + + sPokedexAreaScreen->areaGlowTilemap[i] = sAreaGlowTilemapMapping[sPokedexAreaScreen->areaGlowTilemap[i]]; + sPokedexAreaScreen->areaGlowTilemap[i] |= 0xA000; + } + } +} + +static void StartAreaGlow(void) +{ + if (sPokedexAreaScreen->numSpecialAreas && sPokedexAreaScreen->numOverworldAreas == 0) + sPokedexAreaScreen->whichMarkersFlashing = 1; + else + sPokedexAreaScreen->whichMarkersFlashing = 0; + + sPokedexAreaScreen->areaShadeOrMarkerFrameCounter = 0; + sPokedexAreaScreen->areaShadeFrameCounter = 0; + sPokedexAreaScreen->areaShadeBldArgLo = 0; + sPokedexAreaScreen->areaShadeBldArgHi = 0x40; + sPokedexAreaScreen->specialMarkerCycleCounter = 1; + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); + DoAreaGlow(); +} + +static void DoAreaGlow(void) +{ + u16 x, y; + u16 i; + + if (sPokedexAreaScreen->whichMarkersFlashing == 0) + { + if (sPokedexAreaScreen->areaShadeOrMarkerFrameCounter == 0) + { + sPokedexAreaScreen->areaShadeFrameCounter++; + if (sPokedexAreaScreen->areaShadeFrameCounter & 1) + sPokedexAreaScreen->areaShadeBldArgLo = (sPokedexAreaScreen->areaShadeBldArgLo + 4) & 0x7f; + else + sPokedexAreaScreen->areaShadeBldArgHi = (sPokedexAreaScreen->areaShadeBldArgHi + 4) & 0x7f; + + x = gSineTable[sPokedexAreaScreen->areaShadeBldArgLo] >> 4; + y = gSineTable[sPokedexAreaScreen->areaShadeBldArgHi] >> 4; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(x, y)); + sPokedexAreaScreen->areaShadeOrMarkerFrameCounter = 0; + if (sPokedexAreaScreen->areaShadeFrameCounter == 0x40) + { + sPokedexAreaScreen->areaShadeFrameCounter = 0; + if (sPokedexAreaScreen->numSpecialAreas != 0) + sPokedexAreaScreen->whichMarkersFlashing = 1; + } + } + else + sPokedexAreaScreen->areaShadeOrMarkerFrameCounter--; + } + else + { + sPokedexAreaScreen->areaShadeOrMarkerFrameCounter++; + if (sPokedexAreaScreen->areaShadeOrMarkerFrameCounter > 12) + { + sPokedexAreaScreen->areaShadeOrMarkerFrameCounter = 0; + sPokedexAreaScreen->specialMarkerCycleCounter++; + for (i = 0; i < sPokedexAreaScreen->numSpecialAreas; i++) + sPokedexAreaScreen->areaMarkerSprites[i]->invisible = sPokedexAreaScreen->specialMarkerCycleCounter & 1; + + if (sPokedexAreaScreen->specialMarkerCycleCounter > 4) + { + sPokedexAreaScreen->specialMarkerCycleCounter = 1; + if (sPokedexAreaScreen->numOverworldAreas != 0) + sPokedexAreaScreen->whichMarkersFlashing = 0; + } + } + } +} + +void ShowPokedexAreaScreen(u16 species, u8 *errno) +{ + u8 taskId; + + sPokedexAreaScreen = AllocZeroed(sizeof(*sPokedexAreaScreen)); + sPokedexAreaScreen->species = species; + sPokedexAreaScreen->errno = errno; + errno[0] = 0; + taskId = CreateTask(Task_PokedexAreaScreen_0, 0); + gTasks[taskId].data[0] = 0; +} + +static void Task_PokedexAreaScreen_0(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + ResetSpriteData(); + FreeAllSpritePalettes(); + HideBg(3); + HideBg(2); + HideBg(0); + break; + case 1: + SetBgAttribute(3, BG_CTRL_ATTR_VISIBLE, 3); + sub_81C4D70(&sUnknown_085B4018); + StringFill(sPokedexAreaScreen->charBuffer, CHAR_SPACE, 16); + break; + case 2: + if (sub_81C4E90() == TRUE) + return; + sub_81C4ED0(-8); + break; + case 3: + ResetDrawAreaGlowState(); + break; + case 4: + if (DrawAreaGlow()) + return; + break; + case 5: + sub_8122D88(&sPokedexAreaScreen->regionMap); + CreateRegionMapPlayerIcon(1, 1); + PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(0, -8); + break; + case 6: + CreateAreaMarkerSprites(); + break; + case 7: + LoadAreaUnknownGraphics(); + break; + case 8: + CreateAreaUnknownSprites(); + break; + case 9: + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); + break; + case 10: + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_ALL); + StartAreaGlow(); + ShowBg(2); + ShowBg(3); + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON); + break; + case 11: + gTasks[taskId].func = Task_PokedexAreaScreen_1; + gTasks[taskId].data[0] = 0; + return; + } + + gTasks[taskId].data[0]++; +} + +static void Task_PokedexAreaScreen_1(u8 taskId) +{ + DoAreaGlow(); + switch (gTasks[taskId].data[0]) + { + default: + gTasks[taskId].data[0] = 0; + // fall through + case 0: + if (gPaletteFade.active) + return; + break; + case 1: + if (gMain.newKeys & B_BUTTON) + { + gTasks[taskId].data[1] = 1; + PlaySE(SE_PC_OFF); + } + else if (gMain.newKeys & DPAD_RIGHT || (gMain.newKeys & R_BUTTON && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) + { + gTasks[taskId].data[1] = 2; + PlaySE(SE_Z_PAGE); + } + else + return; + break; + case 2: + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); + break; + case 3: + if (gPaletteFade.active) + return; + DestroyAreaMarkerSprites(); + sPokedexAreaScreen->errno[0] = gTasks[taskId].data[1]; + sub_813D6B4(); + DestroyTask(taskId); + sub_81C4EB4(); + FREE_AND_SET_NULL(sPokedexAreaScreen); + return; + } + + gTasks[taskId].data[0]++; +} + +static void sub_813D6B4(void) +{ + SetBgAttribute(3, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(3, BG_CTRL_ATTR_SCREENSIZE, 0); +} + +static void CreateAreaMarkerSprites(void) +{ + u8 spriteId; + static IWRAM_DATA s16 x; + static IWRAM_DATA s16 y; + static IWRAM_DATA s16 i; + static IWRAM_DATA s16 mapSecId; + static IWRAM_DATA s16 numSprites; + + LoadSpriteSheet(&sAreaMarkerSpriteSheet); + LoadSpritePalette(&sAreaMarkerSpritePalette); + numSprites = 0; + for (i = 0; i < sPokedexAreaScreen->numSpecialAreas; i++) + { + mapSecId = sPokedexAreaScreen->specialAreaRegionMapSectionIds[i]; + x = 8 * (gRegionMapEntries[mapSecId].x + 1) + 4; + y = 8 * (gRegionMapEntries[mapSecId].y) + 28; + x += 4 * (gRegionMapEntries[mapSecId].width - 1); + y += 4 * (gRegionMapEntries[mapSecId].height - 1); + spriteId = CreateSprite(&sAreaMarkerSpriteTemplate, x, y, 0); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].invisible = TRUE; + sPokedexAreaScreen->areaMarkerSprites[numSprites++] = &gSprites[spriteId]; + } + } + + sPokedexAreaScreen->numAreaMarkerSprites = numSprites; +} + +static void DestroyAreaMarkerSprites(void) +{ + u16 i; + FreeSpriteTilesByTag(2); + FreeSpritePaletteByTag(2); + for (i = 0; i < sPokedexAreaScreen->numAreaMarkerSprites; i++) + DestroySprite(sPokedexAreaScreen->areaMarkerSprites[i]); + + FreeSpriteTilesByTag(3); + FreeSpritePaletteByTag(3); + for (i = 0; i < 3; i++) + { + if (sPokedexAreaScreen->areaUnknownSprites[i]) + DestroySprite(sPokedexAreaScreen->areaUnknownSprites[i]); + } +} + +static void LoadAreaUnknownGraphics(void) +{ + struct SpriteSheet spriteSheet = { + .data = sPokedexAreaScreen->areaUnknownGraphicsBuffer, + .size = 0x600, + .tag = 3, + }; + LZ77UnCompWram(gPokedexAreaScreenAreaUnknown_Gfx, sPokedexAreaScreen->areaUnknownGraphicsBuffer); + LoadSpriteSheet(&spriteSheet); + LoadSpritePalette(&sAreaUnknownSpritePalette); +} + +static void CreateAreaUnknownSprites(void) +{ + u16 i; + u8 spriteId; + + if (sPokedexAreaScreen->numOverworldAreas || sPokedexAreaScreen->numSpecialAreas) + { + for (i = 0; i < 3; i++) + sPokedexAreaScreen->areaUnknownSprites[i] = NULL; + } + else + { + for (i = 0; i < 3; i++) + { + spriteId = CreateSprite(&sAreaUnknownSpriteTemplate, i * 32 + 0xa0, 0x8c, 0); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.tileNum += i * 16; + sPokedexAreaScreen->areaUnknownSprites[i] = gSprites + spriteId; + } + else + { + sPokedexAreaScreen->areaUnknownSprites[i] = NULL; + } + } + } +} diff --git a/src/region_map.c b/src/region_map.c index c5bcd424b..262a7d020 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -34,15 +34,6 @@ // Static type declarations -struct RegionMapLocation -{ - u8 x; - u8 y; - u8 width; - u8 height; - const u8 *name; -}; - // Static RAM declarations static EWRAM_DATA struct RegionMap *gRegionMap = NULL; diff --git a/src/unk_pokedex_area_screen_helper.c b/src/unk_pokedex_area_screen_helper.c index 9e97321df..6b88069bb 100644 --- a/src/unk_pokedex_area_screen_helper.c +++ b/src/unk_pokedex_area_screen_helper.c @@ -4,6 +4,7 @@ #include "bg.h" #include "malloc.h" #include "palette.h" +#include "unk_pokedex_area_screen_helper.h" EWRAM_DATA u8 *gUnknown_0203CF28 = NULL; @@ -13,15 +14,7 @@ static const u32 gUnknown_0861DEF4[] = INCBIN_U32("graphics/interface/region_map static const u32 gUnknown_0861E208[] = INCBIN_U32("graphics/interface/region_map_affine.8bpp.lz"); static const u32 gUnknown_0861EF64[] = INCBIN_U32("graphics/interface/region_map_affine.bin.lz"); -struct UnkStruct_1C4D70 -{ - u32 bg:2; - u32 unk2:8; - u32 unk10:2; - u32 unk12:20; -}; - -void sub_81C4D70(struct UnkStruct_1C4D70 *template) +void sub_81C4D70(const struct UnkStruct_1C4D70 *template) { u8 unk; gUnknown_0203CF28 = Alloc(4); diff --git a/sym_bss.txt b/sym_bss.txt index 7c1161528..d006e1364 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -34,24 +34,7 @@ .include "src/slot_machine.o" .include "src/contest_painting.o" .include "src/starter_choose.o" - - .align 0x2 - -gUnknown_030011FC: @ 30011FC - .space 0x2 - -gUnknown_030011FE: @ 30011FE - .space 0x2 - -gUnknown_03001200: @ 3001200 - .space 0x2 - -gUnknown_03001202: @ 3001202 - .space 0x2 - -gUnknown_03001204: @ 3001204 - .space 0x4 - + .include "src/pokedex_area_screen.o" .include "src/battle_transition.o" .include "src/pokemon_animation.o" .include "src/recorded_battle.o" diff --git a/sym_ewram.txt b/sym_ewram.txt index 1cfb54156..4830343e8 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -353,10 +353,7 @@ gPlayerFacingPosition: @ 203AB40 .include "src/pokeblock.o" .include "src/field_specials.o" .include "src/battle_records.o" - -gUnknown_0203AB7C: @ 203AB7C - .space 0x4 - + .include "src/pokedex_area_screen.o" .include "src/evolution_scene.o" gUnknown_0203AB88: @ 203AB88 -- cgit v1.2.3 From 0ad4795e69812d9c1e938922eee34b4d9208bf5d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 30 Nov 2018 23:16:15 +0100 Subject: Match 2 field effect functions --- src/battle_script_commands.c | 2 +- src/field_effect.c | 313 +++++-------------------------------------- 2 files changed, 35 insertions(+), 280 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 5bd7de072..6a7ca1725 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -942,7 +942,7 @@ static void atk00_attackcanceler(void) return; if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0)) return; - if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200) + if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING)) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) { gBattlescriptCurrInstr = BattleScript_NoPPForMove; diff --git a/src/field_effect.c b/src/field_effect.c index 3068c495b..935501130 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2501,10 +2501,8 @@ static void sub_80B8584(struct Task *task) static void sub_80B85F8(struct Task *task) { - u16 offset; - u16 delta; - offset = ((REG_BG0CNT >> 2) << 14); - delta = ((REG_BG0CNT >> 8) << 11); + u16 offset = ((REG_BG0CNT >> 2) << 14); + u16 delta = ((REG_BG0CNT >> 8) << 11); CpuCopy16(gFieldMoveStreaksTiles, (void *)(VRAM + offset), 0x200); CpuFill32(0, (void *)(VRAM + delta), 0x800); LoadPalette(gFieldMoveStreaksPalette, 0xf0, 0x20); @@ -2580,8 +2578,7 @@ static void sub_80B871C(struct Task *task) static void sub_80B8770(struct Task *task) { - u16 bg0cnt; - bg0cnt = (REG_BG0CNT >> 8) << 11; + u16 bg0cnt = (REG_BG0CNT >> 8) << 11; CpuFill32(0, (void *)VRAM + bg0cnt, 0x800); task->data[1] = 0xf1; task->data[2] = 0xa1; @@ -2603,9 +2600,8 @@ static void overworld_bg_setup_2(struct Task *task) static void sub_80B880C(void) { - struct Task *task; IntrCallback callback; - task = &gTasks[FindTaskIdByFunc(sub_80B8554)]; + struct Task *task = &gTasks[FindTaskIdByFunc(sub_80B8554)]; LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback); callback(); SetGpuReg(REG_OFFSET_WIN0H, task->data[1]); @@ -2735,7 +2731,6 @@ static void sub_80B8B28(struct Task *task) task->data[3] += 16; } -#ifdef NONMATCHING static bool8 sub_80B8B38(struct Task *task) { u16 i; @@ -2752,116 +2747,18 @@ static bool8 sub_80B8B38(struct Task *task) dstOffs = (32 - dstOffs) & 0x1f; srcOffs = (32 - task->data[4]) & 0x1f; dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]); - for (i=0; i<10; i++) + for (i = 0; i < 10; i++) { - dest[dstOffs + i * 32] = gDarknessFieldMoveStreaksTilemap[srcOffs + i * 32] | 0xf000; + dest[dstOffs + i * 32] = gDarknessFieldMoveStreaksTilemap[srcOffs + i * 32]; + dest[dstOffs + i * 32] |= 0xf000; + dest[((dstOffs + 1) & 0x1f) + i * 32] = gDarknessFieldMoveStreaksTilemap[((srcOffs + 1) & 0x1f) + i * 32] | 0xf000; + dest[((dstOffs + 1) & 0x1f) + i * 32] |= 0xf000; } task->data[4] += 2; } return FALSE; } -#else -NAKED -static bool8 sub_80B8B38(struct Task *task) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmov r7, r10\n" - "\tmov r6, r9\n" - "\tmov r5, r8\n" - "\tpush {r5-r7}\n" - "\tsub sp, 0x4\n" - "\tadds r5, r0, 0\n" - "\tldrh r2, [r5, 0x10]\n" - "\tmovs r1, 0x10\n" - "\tldrsh r0, [r5, r1]\n" - "\tcmp r0, 0x1F\n" - "\tble _08088724\n" - "\tmovs r0, 0x1\n" - "\tb _080887A8\n" - "_08088724:\n" - "\tldrh r0, [r5, 0xE]\n" - "\tlsls r0, 16\n" - "\tasrs r3, r0, 19\n" - "\tmovs r1, 0x1F\n" - "\tands r3, r1\n" - "\tmovs r4, 0x10\n" - "\tldrsh r0, [r5, r4]\n" - "\tcmp r3, r0\n" - "\tblt _080887A6\n" - "\tmovs r0, 0x20\n" - "\tsubs r3, r0, r3\n" - "\tands r3, r1\n" - "\tsubs r0, r2\n" - "\tmov r12, r0\n" - "\tmov r7, r12\n" - "\tands r7, r1\n" - "\tmov r12, r7\n" - "\tldrh r0, [r5, 0x20]\n" - "\tldr r1, _080887B8 @ =0x06000140\n" - "\tadds r1, r0\n" - "\tmov r8, r1\n" - "\tmovs r4, 0\n" - "\tldr r7, _080887BC @ =gDarknessFieldMoveStreaksTilemap\n" - "\tmov r10, r7\n" - "\tmovs r0, 0xF0\n" - "\tlsls r0, 8\n" - "\tmov r9, r0\n" - "\tadds r1, r3, 0x1\n" - "\tmovs r0, 0x1F\n" - "\tands r1, r0\n" - "\tstr r1, [sp]\n" - "\tmov r6, r12\n" - "\tadds r6, 0x1\n" - "\tands r6, r0\n" - "_08088768:\n" - "\tlsls r1, r4, 5\n" - "\tadds r2, r1, r3\n" - "\tlsls r2, 1\n" - "\tadd r2, r8\n" - "\tmov r7, r12\n" - "\tadds r0, r7, r1\n" - "\tlsls r0, 1\n" - "\tadd r0, r10\n" - "\tldrh r0, [r0]\n" - "\tmov r7, r9\n" - "\torrs r0, r7\n" - "\tstrh r0, [r2]\n" - "\tldr r0, [sp]\n" - "\tadds r2, r1, r0\n" - "\tlsls r2, 1\n" - "\tadd r2, r8\n" - "\tadds r1, r6, r1\n" - "\tlsls r1, 1\n" - "\tadd r1, r10\n" - "\tldrh r0, [r1]\n" - "\tmov r1, r9\n" - "\torrs r0, r1\n" - "\tstrh r0, [r2]\n" - "\tadds r0, r4, 0x1\n" - "\tlsls r0, 16\n" - "\tlsrs r4, r0, 16\n" - "\tcmp r4, 0x9\n" - "\tbls _08088768\n" - "\tldrh r0, [r5, 0x10]\n" - "\tadds r0, 0x2\n" - "\tstrh r0, [r5, 0x10]\n" - "_080887A6:\n" - "\tmovs r0, 0\n" - "_080887A8:\n" - "\tadd sp, 0x4\n" - "\tpop {r3-r5}\n" - "\tmov r8, r3\n" - "\tmov r9, r4\n" - "\tmov r10, r5\n" - "\tpop {r4-r7}\n" - "\tpop {r1}\n" - "\tbx r1\n" - "\t.align 2, 0\n" - "_080887B8: .4byte 0x06000140\n" - "_080887BC: .4byte gDarknessFieldMoveStreaksTilemap"); -} -#endif static bool8 sub_80B8BF0(struct Task *task) { @@ -2877,7 +2774,7 @@ static bool8 sub_80B8BF0(struct Task *task) { dstOffs = (task->data[1] >> 3) & 0x1f; dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]); - for (i=0; i<10; i++) + for (i = 0; i < 10; i++) { dest[dstOffs + i * 32] = 0xf000; dest[((dstOffs + 1) & 0x1f) + i * 32] = 0xf000; @@ -2913,7 +2810,8 @@ static void sub_80B8CC0(struct Sprite *sprite) if (sprite->data[6]) { PlayCry2(sprite->data[0], 0, 0x7d, 0xa); - } else + } + else { PlayCry1(sprite->data[0], 0); } @@ -2933,7 +2831,8 @@ static void sub_80B8D20(struct Sprite *sprite) if (sprite->pos1.x < -0x40) { sprite->data[7] = 1; - } else + } + else { sprite->pos1.x -= 20; } @@ -2941,8 +2840,7 @@ static void sub_80B8D20(struct Sprite *sprite) u8 FldEff_UseSurf(void) { - u8 taskId; - taskId = CreateTask(sub_80B8D84, 0xff); + u8 taskId = CreateTask(sub_80B8D84, 0xff); gTasks[taskId].data[15] = gFieldEffectArguments[0]; Overworld_ClearSavedMusic(); Overworld_ChangeMusicTo(MUS_NAMINORI); @@ -3031,13 +2929,12 @@ static void sub_80B8F24(struct Task *task) } } -#ifdef NONMATCHING u8 sub_80B8F98(void) { - u8 spriteId, i, j, k, l; - struct Sprite *sprite; - spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[36], 0x78, -0x18, 1); - sprite = &gSprites[spriteId]; + u8 i, j, k; + u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[36], 0x78, -0x18, 1); + struct Sprite *sprite = &gSprites[spriteId]; + sprite->oam.priority = 1; sprite->oam.paletteNum = 4; sprite->data[0] = 0; @@ -3048,7 +2945,7 @@ u8 sub_80B8F98(void) sprite->data[5] = 0; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(14, 14)); - SetGpuReg(REG_OFFSET_WININ, 0x3F3F); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); LoadPalette(gUnknown_0855B610, 0xC0, sizeof(gUnknown_0855B610)); SetGpuReg(REG_OFFSET_BG0VOFS, 120); for (i = 3; i < 15; i++) @@ -3060,156 +2957,20 @@ u8 sub_80B8F98(void) } for (k = 0; k < 90; k++) { - for (l = 0; l < 8; l++) + for (i = 0; i < 8; i++) { - *(u16*)(VRAM + 0x8000 + (k + 1) * 32 + l * 4) = (gUnknown_0855B630[k * 32 + l * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + l * 4]; - *(u16*)(VRAM + 0x8000 + (k + 1) * 32 + l * 4 + 2) = (gUnknown_0855B630[k * 32 + l * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + l * 4 + 2]; + *(u16*)(VRAM + 0x8000 + (k + 1) * 32 + i * 4) = (gUnknown_0855B630[k * 32 + i * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + i * 4]; + *(u16*)(VRAM + 0x8000 + (k + 1) * 32 + i * 4 + 2) = (gUnknown_0855B630[k * 32 + i * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + i * 4 + 2]; } } return spriteId; } -#else -NAKED -u8 sub_80B8F98(void) -{ - asm_unified("push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - ldr r0, =gFieldEffectObjectTemplatePointers\n\ - adds r0, 0x90\n\ - ldr r0, [r0]\n\ - movs r2, 0x18\n\ - negs r2, r2\n\ - movs r1, 0x78\n\ - movs r3, 0x1\n\ - bl CreateSprite\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ - lsls r1, r0, 4\n\ - add r1, r8\n\ - lsls r1, 2\n\ - ldr r0, =gSprites\n\ - adds r1, r0\n\ - ldrb r2, [r1, 0x5]\n\ - movs r0, 0xD\n\ - negs r0, r0\n\ - ands r0, r2\n\ - movs r2, 0x4\n\ - orrs r0, r2\n\ - movs r2, 0xF\n\ - ands r0, r2\n\ - movs r2, 0x40\n\ - orrs r0, r2\n\ - strb r0, [r1, 0x5]\n\ - movs r2, 0\n\ - strh r2, [r1, 0x2E]\n\ - strh r2, [r1, 0x30]\n\ - strh r2, [r1, 0x32]\n\ - ldr r0, =0x0000ffff\n\ - strh r0, [r1, 0x34]\n\ - ldrh r0, [r1, 0x22]\n\ - strh r0, [r1, 0x36]\n\ - strh r2, [r1, 0x38]\n\ - ldr r1, =0x00003e41\n\ - movs r0, 0x50\n\ - bl SetGpuReg\n\ - ldr r1, =0x00000e0e\n\ - movs r0, 0x52\n\ - bl SetGpuReg\n\ - ldr r1, =0x00003f3f\n\ - movs r0, 0x48\n\ - bl SetGpuReg\n\ - ldr r0, =gUnknown_0855B610\n\ - movs r1, 0xC0\n\ - movs r2, 0x20\n\ - bl LoadPalette\n\ - movs r0, 0x12\n\ - movs r1, 0x78\n\ - bl SetGpuReg\n\ - movs r4, 0x3\n\ - ldr r7, =0x0600f800\n\ - ldr r0, =0x0000bff4\n\ - adds r6, r0, 0\n\ -_080B901A:\n\ - movs r2, 0xC\n\ - lsls r0, r4, 1\n\ - lsls r5, r4, 5\n\ - adds r0, r4\n\ - lsls r3, r0, 1\n\ -_080B9024:\n\ - adds r0, r5, r2\n\ - lsls r0, 1\n\ - adds r0, r7\n\ - adds r1, r2, r6\n\ - adds r1, r3, r1\n\ - adds r1, 0x1\n\ - strh r1, [r0]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - cmp r2, 0x11\n\ - bls _080B9024\n\ - adds r0, r4, 0x1\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - cmp r4, 0xE\n\ - bls _080B901A\n\ - movs r0, 0\n\ - ldr r5, =gUnknown_0855B630\n\ -_080B904A:\n\ - movs r4, 0\n\ - adds r7, r0, 0x1\n\ - lsls r6, r0, 5\n\ -_080B9050:\n\ - lsls r1, r4, 2\n\ - adds r1, r6, r1\n\ - ldr r0, =0x06008020\n\ - adds r3, r1, r0\n\ - adds r0, r1, 0x1\n\ - adds r0, r5\n\ - ldrb r2, [r0]\n\ - lsls r2, 8\n\ - adds r0, r1, r5\n\ - ldrb r0, [r0]\n\ - adds r0, r2\n\ - strh r0, [r3]\n\ - ldr r0, =0x06008022\n\ - adds r3, r1, r0\n\ - adds r0, r1, 0x3\n\ - adds r0, r5\n\ - ldrb r2, [r0]\n\ - lsls r2, 8\n\ - adds r1, 0x2\n\ - adds r1, r5\n\ - ldrb r0, [r1]\n\ - adds r0, r2\n\ - strh r0, [r3]\n\ - adds r0, r4, 0x1\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - cmp r4, 0x7\n\ - bls _080B9050\n\ - lsls r0, r7, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x59\n\ - bls _080B904A\n\ - mov r0, r8\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .pool"); -} -#endif // NONMATCHING u8 FldEff_NPCFlyOut(void) { - u8 spriteId; - struct Sprite *sprite; - spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0x78, 0, 1); - sprite = &gSprites[spriteId]; + u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0x78, 0, 1); + struct Sprite *sprite = &gSprites[spriteId]; + sprite->oam.paletteNum = 0; sprite->oam.priority = 1; sprite->callback = sub_80B9128; @@ -3221,6 +2982,7 @@ u8 FldEff_NPCFlyOut(void) static void sub_80B9128(struct Sprite *sprite) { struct Sprite *npcSprite; + sprite->pos2.x = Cos(sprite->data[2], 0x8c); sprite->pos2.y = Sin(sprite->data[2], 0x48); sprite->data[2] = (sprite->data[2] + 4) & 0xff; @@ -3241,8 +3003,7 @@ static void sub_80B9128(struct Sprite *sprite) u8 FldEff_UseFly(void) { - u8 taskId; - taskId = CreateTask(sub_80B91D4, 0xfe); + u8 taskId = CreateTask(sub_80B91D4, 0xfe); gTasks[taskId].data[1] = gFieldEffectArguments[0]; return 0; } @@ -3266,8 +3027,7 @@ static void sub_80B91D4(u8 taskId) static void sub_80B9204(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) { task->data[15] = gPlayerAvatar.flags; @@ -3281,8 +3041,7 @@ static void sub_80B9204(struct Task *task) static void sub_80B925C(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (EventObjectClearHeldMovementIfFinished(eventObject)) { task->data[0]++; @@ -3293,10 +3052,9 @@ static void sub_80B925C(struct Task *task) static void sub_80B92A0(struct Task *task) { - struct EventObject *eventObject; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (task->data[15] & 0x08) { sub_81555AC(eventObject->fieldEffectSpriteId, 2); @@ -3320,8 +3078,7 @@ static void sub_80B92F8(struct Task *task) static void sub_80B933C(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject)) { task->data[0]++; @@ -3332,10 +3089,9 @@ static void sub_80B933C(struct Task *task) static void sub_80B9390(struct Task *task) { - struct EventObject *eventObject; if ((++task->data[2]) >= 8) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); eventObject->inanimate = 1; @@ -3351,10 +3107,9 @@ static void sub_80B9390(struct Task *task) static void sub_80B9418(struct Task *task) { - struct EventObject *eventObject; if ((++task->data[2]) >= 10) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; EventObjectClearHeldMovementIfActive(eventObject); eventObject->inanimate = 0; eventObject->hasShadow = 0; -- cgit v1.2.3 From 0e32a3adf3e333f2271957379b568284da1a552d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 30 Nov 2018 17:29:55 -0600 Subject: Decompile normal.c (#414) --- asm/normal.s | 1876 --------------------------------------- include/battle_anim.h | 3 +- ld_script.txt | 2 +- src/battle_anim_utility_funcs.c | 6 +- src/normal.c | 765 +++++++++++++++- 5 files changed, 757 insertions(+), 1895 deletions(-) delete mode 100644 asm/normal.s diff --git a/asm/normal.s b/asm/normal.s deleted file mode 100644 index 3ee1308c9..000000000 --- a/asm/normal.s +++ /dev/null @@ -1,1876 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_811572C -sub_811572C: @ 811572C - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimArgs - ldrh r0, [r5] - ldrh r1, [r4, 0x20] - adds r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r5, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2E] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - beq _0811576C - ldrh r0, [r5, 0x6] - negs r0, r0 - strh r0, [r4, 0x30] - movs r0, 0x1 - strh r0, [r4, 0x36] - b _0811577A - .pool -_0811576C: - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x30] - strh r1, [r4, 0x36] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAnim -_0811577A: - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x8] - strh r0, [r4, 0x34] - ldr r1, =sub_8115798 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811572C - - thumb_func_start sub_8115798 -sub_8115798: @ 8115798 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x1E - bl Cos - strh r0, [r4, 0x24] - movs r2, 0x2E - ldrsh r0, [r4, r2] - movs r1, 0xA - bl Sin - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x2E] - cmp r0, 0x7F - bhi _081157CA - ldrb r0, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r0 - movs r0, 0x4 - orrs r1, r0 - strb r1, [r4, 0x5] - b _081157D2 -_081157CA: - ldrb r0, [r4, 0x5] - movs r1, 0xC - orrs r0, r1 - strb r0, [r4, 0x5] -_081157D2: - ldrh r0, [r4, 0x30] - ldrh r1, [r4, 0x2E] - adds r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x34 - ldrsh r1, [r4, r2] - cmp r0, r1 - bne _081157F6 - adds r0, r4, 0 - bl DestroyAnimSprite -_081157F6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8115798 - - thumb_func_start sub_81157FC -sub_81157FC: @ 81157FC - push {r4,r5,lr} - sub sp, 0x4 - adds r5, r0, 0 - ldr r4, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r4, r1] - bl sub_811583C - movs r1, 0x2 - ldrsb r1, [r4, r1] - ldrb r2, [r4, 0x4] - ldrb r3, [r4, 0x6] - ldrh r4, [r4, 0x8] - str r4, [sp] - bl BeginNormalPaletteFade - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_8115884 - str r0, [r5, 0x1C] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81157FC - - thumb_func_start sub_811583C -sub_811583C: @ 811583C - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0xC - lsls r0, 16 - lsrs r0, 16 - movs r4, 0x1 - mov r8, r0 - mov r1, r8 - ands r1, r4 - mov r8, r1 - lsls r0, 16 - asrs r1, r0, 17 - ands r1, r4 - asrs r2, r0, 18 - ands r2, r4 - asrs r3, r0, 19 - ands r3, r4 - asrs r6, r0, 20 - ands r6, r4 - asrs r5, r0, 21 - ands r5, r4 - asrs r0, 22 - ands r0, r4 - str r6, [sp] - str r5, [sp, 0x4] - str r0, [sp, 0x8] - mov r0, r8 - bl sub_80A75AC - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_811583C - - thumb_func_start sub_8115884 -sub_8115884: @ 8115884 - push {lr} - adds r2, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0811589A - adds r0, r2, 0 - bl DestroyAnimSprite -_0811589A: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115884 - - thumb_func_start sub_81158A4 -sub_81158A4: @ 81158A4 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =gBattleAnimArgs - ldrh r0, [r4, 0x2] - strh r0, [r5, 0x2E] - strh r0, [r5, 0x30] - ldrh r0, [r4, 0x4] - strh r0, [r5, 0x32] - ldrh r0, [r4, 0x6] - strh r0, [r5, 0x34] - ldrh r0, [r4, 0x8] - strh r0, [r5, 0x36] - ldrh r0, [r4, 0xA] - strh r0, [r5, 0x38] - ldrh r0, [r4, 0xC] - strh r0, [r5, 0x3A] - ldrh r0, [r4] - strh r0, [r5, 0x3C] - movs r1, 0x3C - ldrsh r0, [r5, r1] - bl sub_811583C - ldrb r1, [r4, 0x8] - ldrh r2, [r4, 0x6] - bl BlendPalettes - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_81158F8 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81158A4 - - thumb_func_start sub_81158F8 -sub_81158F8: @ 81158F8 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _0811590C - subs r0, r1, 0x1 - strh r0, [r4, 0x2E] - b _0811597C -_0811590C: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0811597C - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08115930 - ldr r0, =sub_8115984 - str r0, [r4, 0x1C] - b _0811597C - .pool -_08115930: - movs r2, 0x3C - ldrsh r0, [r4, r2] - bl sub_811583C - adds r3, r0, 0 - ldrh r1, [r4, 0x30] - movs r0, 0x80 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _08115956 - ldrh r1, [r4, 0x36] - lsls r1, 24 - lsrs r1, 24 - ldrh r2, [r4, 0x34] - adds r0, r3, 0 - bl BlendPalettes - b _08115964 -_08115956: - ldrh r1, [r4, 0x3A] - lsls r1, 24 - lsrs r1, 24 - ldrh r2, [r4, 0x38] - adds r0, r3, 0 - bl BlendPalettes -_08115964: - ldrh r0, [r4, 0x30] - movs r2, 0x80 - lsls r2, 1 - adds r1, r2, 0 - eors r0, r1 - strh r0, [r4, 0x30] - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x32] - subs r0, 0x1 - strh r0, [r4, 0x32] -_0811597C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81158F8 - - thumb_func_start sub_8115984 -sub_8115984: @ 8115984 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081159AA - movs r1, 0x3C - ldrsh r0, [r4, r1] - bl sub_811583C - movs r1, 0 - movs r2, 0 - bl BlendPalettes - adds r0, r4, 0 - bl DestroyAnimSprite -_081159AA: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115984 - - thumb_func_start sub_81159B4 -sub_81159B4: @ 81159B4 - push {r4,lr} - adds r4, r0, 0 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r4, 0x20] - adds r0, r2 - movs r2, 0 - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - strh r2, [r4, 0x2E] - movs r0, 0xA - strh r0, [r4, 0x30] - movs r0, 0x8 - strh r0, [r4, 0x32] - movs r0, 0x28 - strh r0, [r4, 0x34] - movs r0, 0x70 - strh r0, [r4, 0x36] - strh r2, [r4, 0x38] - ldr r1, =move_anim_8074EE0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r1, =sub_80A634C - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81159B4 - - thumb_func_start sub_8115A04 -sub_8115A04: @ 8115A04 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - ldr r3, =gBattleAnimArgs - ldrh r1, [r3] - movs r5, 0 - strh r1, [r4, 0x8] - ldrh r1, [r3, 0x2] - strh r1, [r4, 0xA] - ldrh r1, [r3, 0x4] - strh r1, [r4, 0xC] - ldrh r1, [r3, 0x6] - strh r1, [r4, 0xE] - ldrh r2, [r3, 0x8] - strh r2, [r4, 0x10] - ldrh r1, [r3, 0xA] - strh r1, [r4, 0x12] - strh r5, [r4, 0x18] - lsls r2, 24 - lsrs r2, 24 - movs r1, 0 - bl sub_8115A54 - ldr r0, =sub_8115AA4 - str r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115A04 - - thumb_func_start sub_8115A54 -sub_8115A54: @ 8115A54 - push {r4-r6,lr} - sub sp, 0x4 - adds r5, r1, 0 - adds r6, r2, 0 - lsls r0, 24 - lsrs r0, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - ldr r1, =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - bl sub_811583C - movs r1, 0xA - ldrsb r1, [r4, r1] - ldrh r2, [r4, 0x12] - str r2, [sp] - adds r2, r5, 0 - adds r3, r6, 0 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0xC] - subs r0, 0x1 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x18] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0x18] - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115A54 - - thumb_func_start sub_8115AA4 -sub_8115AA4: @ 8115AA4 - push {r4-r6,lr} - lsls r0, 24 - lsrs r3, r0, 24 - adds r4, r3, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08115B06 - ldr r1, =gTasks - lsls r2, r3, 2 - adds r0, r2, r3 - lsls r0, 3 - adds r3, r0, r1 - movs r5, 0xC - ldrsh r0, [r3, r5] - adds r6, r1, 0 - adds r5, r2, 0 - cmp r0, 0 - ble _08115B00 - movs r1, 0x18 - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _08115AE4 - ldrb r1, [r3, 0xE] - ldrb r2, [r3, 0x10] - b _08115AE8 - .pool -_08115AE4: - ldrb r1, [r3, 0x10] - ldrb r2, [r3, 0xE] -_08115AE8: - adds r0, r5, r4 - lsls r0, 3 - adds r0, r6 - movs r3, 0xC - ldrsh r0, [r0, r3] - cmp r0, 0x1 - bne _08115AF8 - movs r2, 0 -_08115AF8: - adds r0, r4, 0 - bl sub_8115A54 - b _08115B06 -_08115B00: - adds r0, r4, 0 - bl DestroyAnimVisualTask -_08115B06: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8115AA4 - - thumb_func_start sub_8115B0C -sub_8115B0C: @ 8115B0C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r6, r0, 24 - movs r5, 0 - ldr r3, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r0, r3 - ldr r2, =gBattleAnimArgs - ldrh r1, [r2] - strh r1, [r0, 0x8] - ldrh r1, [r2, 0x2] - strh r1, [r0, 0xA] - ldrh r1, [r2, 0x4] - strh r1, [r0, 0xC] - ldrh r1, [r2, 0x6] - strh r1, [r0, 0xE] - ldrh r1, [r2, 0x8] - strh r1, [r0, 0x10] - ldrh r1, [r2, 0xA] - strh r1, [r0, 0x12] - strh r5, [r0, 0x18] - movs r4, 0 - ldr r0, =gBattlersCount - ldrb r1, [r0] - mov r9, r3 - mov r8, r2 - cmp r5, r1 - bge _08115B74 - ldr r0, =gBattleAnimAttacker - ldrb r3, [r0] - ldr r7, =gBattleAnimTarget - movs r0, 0x1 - mov r12, r0 - adds r2, r1, 0 -_08115B5A: - cmp r4, r3 - beq _08115B6E - ldrb r1, [r7] - cmp r4, r1 - beq _08115B6E - adds r1, r4, 0 - adds r1, 0x10 - mov r0, r12 - lsls r0, r1 - orrs r5, r0 -_08115B6E: - adds r4, 0x1 - cmp r4, r2 - blt _08115B5A -_08115B74: - mov r2, r8 - movs r1, 0 - ldrsh r0, [r2, r1] - cmp r0, 0x1 - bne _08115B82 - movs r0, 0xE - orrs r5, r0 -_08115B82: - lsls r4, r6, 2 - adds r4, r6 - lsls r4, 3 - add r4, r9 - lsrs r0, r5, 16 - strh r0, [r4, 0x1A] - movs r0, 0xFF - ands r5, r0 - strh r5, [r4, 0x1C] - ldrb r2, [r4, 0x10] - adds r0, r6, 0 - movs r1, 0 - bl sub_8115BC8 - ldr r0, =sub_8115C18 - str r0, [r4] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115B0C - - thumb_func_start sub_8115BC8 -sub_8115BC8: @ 8115BC8 - push {r4,r5,lr} - sub sp, 0x4 - adds r5, r1, 0 - adds r3, r2, 0 - lsls r0, 24 - lsrs r0, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r3, 24 - lsrs r3, 24 - ldr r1, =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - ldrh r0, [r4, 0x1A] - lsls r0, 16 - ldrh r1, [r4, 0x1C] - orrs r0, r1 - movs r1, 0xA - ldrsb r1, [r4, r1] - ldrh r2, [r4, 0x12] - str r2, [sp] - adds r2, r5, 0 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0xC] - subs r0, 0x1 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x18] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0x18] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115BC8 - - thumb_func_start sub_8115C18 -sub_8115C18: @ 8115C18 - push {r4-r6,lr} - lsls r0, 24 - lsrs r3, r0, 24 - adds r4, r3, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08115C7A - ldr r1, =gTasks - lsls r2, r3, 2 - adds r0, r2, r3 - lsls r0, 3 - adds r3, r0, r1 - movs r5, 0xC - ldrsh r0, [r3, r5] - adds r6, r1, 0 - adds r5, r2, 0 - cmp r0, 0 - ble _08115C74 - movs r1, 0x18 - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _08115C58 - ldrb r1, [r3, 0xE] - ldrb r2, [r3, 0x10] - b _08115C5C - .pool -_08115C58: - ldrb r1, [r3, 0x10] - ldrb r2, [r3, 0xE] -_08115C5C: - adds r0, r5, r4 - lsls r0, 3 - adds r0, r6 - movs r3, 0xC - ldrsh r0, [r0, r3] - cmp r0, 0x1 - bne _08115C6C - movs r2, 0 -_08115C6C: - adds r0, r4, 0 - bl sub_8115BC8 - b _08115C7A -_08115C74: - adds r0, r4, 0 - bl DestroyAnimVisualTask -_08115C7A: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8115C18 - - thumb_func_start sub_8115C80 -sub_8115C80: @ 8115C80 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - ldr r3, =gBattleAnimArgs - ldrh r1, [r3] - movs r5, 0 - strh r1, [r4, 0x8] - ldrh r1, [r3, 0x2] - strh r1, [r4, 0xA] - ldrh r1, [r3, 0x4] - strh r1, [r4, 0xC] - ldrh r1, [r3, 0x6] - strh r1, [r4, 0xE] - ldrh r2, [r3, 0x8] - strh r2, [r4, 0x10] - ldrh r1, [r3, 0xA] - strh r1, [r4, 0x12] - strh r5, [r4, 0x18] - lsls r2, 24 - lsrs r2, 24 - movs r1, 0 - bl sub_8115CD0 - ldr r0, =sub_8115D2C - str r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115C80 - - thumb_func_start sub_8115CD0 -sub_8115CD0: @ 8115CD0 - push {r4-r6,lr} - sub sp, 0x4 - adds r5, r1, 0 - adds r6, r2, 0 - lsls r0, 24 - lsrs r0, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - ldr r1, =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - ldrh r0, [r4, 0x8] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x10 - movs r2, 0x1 - lsls r2, r0 - movs r1, 0xA - ldrsb r1, [r4, r1] - ldrh r0, [r4, 0x12] - str r0, [sp] - adds r0, r2, 0 - adds r2, r5, 0 - adds r3, r6, 0 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0xC] - subs r0, 0x1 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x18] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0x18] - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115CD0 - - thumb_func_start sub_8115D2C -sub_8115D2C: @ 8115D2C - push {r4-r6,lr} - lsls r0, 24 - lsrs r3, r0, 24 - adds r4, r3, 0 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08115D8E - ldr r1, =gTasks - lsls r2, r3, 2 - adds r0, r2, r3 - lsls r0, 3 - adds r3, r0, r1 - movs r5, 0xC - ldrsh r0, [r3, r5] - adds r6, r1, 0 - adds r5, r2, 0 - cmp r0, 0 - ble _08115D88 - movs r1, 0x18 - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _08115D6C - ldrb r1, [r3, 0xE] - ldrb r2, [r3, 0x10] - b _08115D70 - .pool -_08115D6C: - ldrb r1, [r3, 0x10] - ldrb r2, [r3, 0xE] -_08115D70: - adds r0, r5, r4 - lsls r0, 3 - adds r0, r6 - movs r3, 0xC - ldrsh r0, [r0, r3] - cmp r0, 0x1 - bne _08115D80 - movs r2, 0 -_08115D80: - adds r0, r4, 0 - bl sub_8115CD0 - b _08115D8E -_08115D88: - adds r0, r4, 0 - bl DestroyAnimVisualTask -_08115D8E: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8115D2C - - thumb_func_start sub_8115D94 -sub_8115D94: @ 8115D94 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - ldr r5, =gBattleAnimArgs - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x8] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0xA] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0xC] - ldrh r0, [r5, 0x6] - strh r0, [r4, 0xE] - ldrh r0, [r5, 0x8] - strh r0, [r4, 0x10] - ldrh r0, [r5, 0xA] - strh r0, [r4, 0x12] - ldrh r0, [r5, 0xC] - strh r0, [r4, 0x14] - ldrh r0, [r5] - strh r0, [r4, 0x16] - ldrh r0, [r5] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x10 - movs r1, 0x1 - lsls r1, r0 - ldrb r3, [r5, 0x8] - ldrh r0, [r5, 0x6] - str r0, [sp] - adds r0, r1, 0 - movs r1, 0 - adds r2, r3, 0 - bl BeginNormalPaletteFade - ldr r0, =sub_8115E00 - str r0, [r4] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115D94 - - thumb_func_start sub_8115E00 -sub_8115E00: @ 8115E00 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r1, [r4, 0x8] - movs r2, 0x8 - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _08115E28 - subs r0, r1, 0x1 - strh r0, [r4, 0x8] - b _08115EAC - .pool -_08115E28: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08115EAC - movs r3, 0xC - ldrsh r0, [r4, r3] - cmp r0, 0 - bne _08115E4C - ldr r0, =sub_8115EB8 - str r0, [r4] - b _08115EAC - .pool -_08115E4C: - ldrh r0, [r4, 0x16] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x10 - movs r2, 0x1 - lsls r2, r0 - ldrh r1, [r4, 0xA] - movs r0, 0x80 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _08115E7A - ldrb r3, [r4, 0x10] - ldrh r0, [r4, 0xE] - str r0, [sp] - adds r0, r2, 0 - movs r1, 0 - adds r2, r3, 0 - bl BeginNormalPaletteFade - b _08115E8A -_08115E7A: - ldrb r3, [r4, 0x14] - ldrh r0, [r4, 0x12] - str r0, [sp] - adds r0, r2, 0 - movs r1, 0 - adds r2, r3, 0 - bl BeginNormalPaletteFade -_08115E8A: - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0xA] - movs r3, 0x80 - lsls r3, 1 - adds r2, r3, 0 - eors r0, r2 - strh r0, [r1, 0xA] - movs r2, 0xFF - ands r0, r2 - strh r0, [r1, 0x8] - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] -_08115EAC: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115E00 - - thumb_func_start sub_8115EB8 -sub_8115EB8: @ 8115EB8 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _08115EFE - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldrh r0, [r0, 0x16] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x10 - movs r1, 0x1 - lsls r1, r0 - str r5, [sp] - adds r0, r1, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl BeginNormalPaletteFade - adds r0, r4, 0 - bl DestroyAnimVisualTask -_08115EFE: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115EB8 - - thumb_func_start sub_8115F10 -sub_8115F10: @ 8115F10 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r2, 0 - ldr r0, =gBattleAnimAttacker - ldrb r6, [r0] - ldr r0, =gBattleAnimTarget - ldrb r7, [r0] - ldr r4, =gBattleAnimArgs - ldrh r1, [r4] - movs r5, 0x80 - lsls r5, 1 - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - beq _08115F4A - str r2, [sp] - str r2, [sp, 0x4] - str r2, [sp, 0x8] - movs r0, 0x1 - movs r1, 0 - movs r3, 0 - bl sub_80A75AC - adds r2, r0, 0 -_08115F4A: - ldrh r1, [r4, 0x2] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - beq _08115F5C - movs r0, 0x80 - lsls r0, 9 - lsls r0, r6 - orrs r2, r0 -_08115F5C: - ldrh r1, [r4, 0x4] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0 - beq _08115F6E - movs r0, 0x80 - lsls r0, 9 - lsls r0, r7 - orrs r2, r0 -_08115F6E: - adds r0, r2, 0 - bl InvertPlttBuffer - mov r0, r8 - bl DestroyAnimVisualTask - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115F10 - - thumb_func_start sub_8115F94 -sub_8115F94: @ 8115F94 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r5, 0 - ldr r1, =gTasks - lsls r0, 2 - add r0, r8 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08115FD6 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - strh r0, [r4, 0xC] - ldrh r0, [r1, 0x2] - strh r0, [r4, 0xE] - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x10] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0xA] - ldrh r0, [r1, 0x8] - strh r0, [r4, 0x12] - ldrh r0, [r1, 0xA] - strh r0, [r4, 0x14] - ldrh r0, [r1, 0xC] - strh r0, [r4, 0x16] -_08115FD6: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - mov r9, r0 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - mov r10, r0 - ldrh r1, [r4, 0xC] - movs r7, 0x80 - lsls r7, 1 - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _08115FF8 - ldr r5, =0x0000ffff -_08115FF8: - movs r6, 0x1 - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - beq _08116028 - ldr r2, =gSprites - ldr r0, =gHealthboxSpriteIds - add r0, r9 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x14 - adds r0, r2 - ldr r0, [r0] - ldrh r0, [r0, 0x2] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - adds r1, r6, 0 - lsls r1, r0 - lsls r1, 16 - orrs r5, r1 -_08116028: - ldrh r1, [r4, 0xE] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _0811603C - adds r0, r6, 0 - mov r2, r9 - lsls r0, r2 - lsls r0, 16 - orrs r5, r0 -_0811603C: - ldrh r1, [r4, 0x10] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _08116050 - adds r0, r6, 0 - mov r1, r10 - lsls r0, r1 - lsls r0, 16 - orrs r5, r0 -_08116050: - movs r1, 0x12 - ldrsb r1, [r4, r1] - movs r2, 0x14 - ldrsb r2, [r4, r2] - movs r3, 0x16 - ldrsb r3, [r4, r3] - adds r0, r5, 0 - bl TintPlttBuffer - movs r2, 0x8 - ldrsh r1, [r4, r2] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _0811607A - adds r0, r5, 0 - bl UnfadePlttBuffer - mov r0, r8 - bl DestroyAnimVisualTask -_0811607A: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8115F94 - - thumb_func_start sub_81160A4 -sub_81160A4: @ 81160A4 - push {r4,lr} - adds r4, r0, 0 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - negs r0, r0 - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x2] - strh r0, [r4, 0x30] - strh r0, [r4, 0x32] - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x34] - movs r2, 0x6 - ldrsh r0, [r1, r2] - cmp r0, 0x1 - beq _081160EC - cmp r0, 0x1 - bgt _081160DC - cmp r0, 0 - beq _081160E2 - b _08116104 - .pool -_081160DC: - cmp r0, 0x2 - beq _081160F4 - b _08116104 -_081160E2: - ldr r1, =gBattle_BG3_X - b _081160F6 - .pool -_081160EC: - ldr r1, =gBattle_BG3_Y - b _081160F6 - .pool -_081160F4: - ldr r1, =gSpriteCoordOffsetX -_081160F6: - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - b _0811610C - .pool -_08116104: - ldr r1, =gSpriteCoordOffsetY - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 -_0811610C: - movs r0, 0x3A - ldrsh r1, [r4, r0] - movs r2, 0x3C - ldrsh r0, [r4, r2] - lsls r0, 16 - orrs r1, r0 - ldrh r0, [r1] - strh r0, [r4, 0x36] - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x6] - strh r0, [r4, 0x38] - subs r0, 0x2 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _08116130 - bl sub_81161F4 -_08116130: - ldr r0, =sub_8116148 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81160A4 - - thumb_func_start sub_8116148 -sub_8116148: @ 8116148 - push {r4-r7,lr} - adds r3, r0, 0 - ldrh r1, [r3, 0x34] - movs r2, 0x34 - ldrsh r0, [r3, r2] - cmp r0, 0 - ble _0811618A - subs r0, r1, 0x1 - strh r0, [r3, 0x34] - ldrh r1, [r3, 0x30] - movs r2, 0x30 - ldrsh r0, [r3, r2] - cmp r0, 0 - ble _0811616A - subs r0, r1, 0x1 - strh r0, [r3, 0x30] - b _081161E2 -_0811616A: - ldrh r0, [r3, 0x32] - strh r0, [r3, 0x30] - movs r0, 0x3A - ldrsh r1, [r3, r0] - movs r2, 0x3C - ldrsh r0, [r3, r2] - lsls r0, 16 - orrs r1, r0 - ldrh r0, [r3, 0x2E] - ldrh r2, [r1] - adds r0, r2 - strh r0, [r1] - ldrh r0, [r3, 0x2E] - negs r0, r0 - strh r0, [r3, 0x2E] - b _081161E2 -_0811618A: - movs r0, 0x3A - ldrsh r1, [r3, r0] - movs r2, 0x3C - ldrsh r0, [r3, r2] - lsls r0, 16 - orrs r1, r0 - ldrh r0, [r3, 0x36] - strh r0, [r1] - ldrh r0, [r3, 0x38] - subs r0, 0x2 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _081161DC - movs r4, 0 - ldr r5, =gBattlersCount - ldrb r0, [r5] - cmp r4, r0 - bcs _081161DC - ldr r2, =gSprites - mov r12, r2 - ldr r6, =gBattlerSpriteIds - movs r7, 0x3 - negs r7, r7 -_081161BA: - adds r0, r4, r6 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - add r1, r12 - adds r1, 0x3E - ldrb r2, [r1] - adds r0, r7, 0 - ands r0, r2 - strb r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldrb r0, [r5] - cmp r4, r0 - bcc _081161BA -_081161DC: - adds r0, r3, 0 - bl DestroyAnimSprite -_081161E2: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8116148 - - thumb_func_start sub_81161F4 -sub_81161F4: @ 81161F4 - push {r4-r6,lr} - ldr r6, =gSprites - ldr r4, =gBattlerSpriteIds - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - adds r0, r4 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - adds r1, 0x3E - ldrb r3, [r1] - movs r2, 0x3 - negs r2, r2 - adds r0, r2, 0 - ands r0, r3 - strb r0, [r1] - ldr r3, =gBattleAnimTarget - ldrb r0, [r3] - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - ands r2, r1 - strb r2, [r0] - ldr r0, =gBattleAnimArgs - movs r1, 0x8 - ldrsh r0, [r0, r1] - cmp r0, 0x2 - bne _0811627C - ldrb r0, [r5] - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] - ldrb r0, [r3] - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - b _08116298 - .pool -_0811627C: - cmp r0, 0 - bne _08116284 - ldrb r0, [r5] - b _08116286 -_08116284: - ldrb r0, [r3] -_08116286: - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x2 -_08116298: - orrs r1, r2 - strb r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81161F4 - - thumb_func_start sub_81162A4 -sub_81162A4: @ 81162A4 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gTasks - lsls r2, r0, 2 - adds r2, r0 - lsls r2, 3 - adds r2, r1 - ldr r3, =gBattleAnimArgs - ldrh r1, [r3] - strh r1, [r2, 0x8] - ldrh r1, [r3, 0x2] - strh r1, [r2, 0xA] - ldrh r1, [r3, 0x4] - strh r1, [r2, 0xC] - ldrh r1, [r3, 0x6] - strh r1, [r2, 0xE] - ldrh r1, [r3, 0x6] - strh r1, [r2, 0x18] - ldr r4, =gBattle_BG3_X - ldrh r1, [r3] - strh r1, [r4] - ldr r4, =gBattle_BG3_Y - ldrh r1, [r3, 0x2] - strh r1, [r4] - ldr r1, =sub_81162F8 - str r1, [r2] - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81162A4 - - thumb_func_start sub_81162F8 -sub_81162F8: @ 81162F8 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r3, r0, r1 - ldrh r2, [r3, 0xE] - movs r4, 0xE - ldrsh r0, [r3, r4] - mov r12, r1 - cmp r0, 0 - bne _0811637E - ldr r0, =gBattle_BG3_X - ldrh r2, [r0] - movs r7, 0x8 - ldrsh r1, [r3, r7] - adds r6, r0, 0 - cmp r2, r1 - bne _08116330 - ldrh r0, [r3, 0x8] - negs r0, r0 - b _08116332 - .pool -_08116330: - ldrh r0, [r3, 0x8] -_08116332: - strh r0, [r6] - ldr r2, =gBattle_BG3_Y - ldrh r3, [r2] - lsls r1, r5, 2 - adds r0, r1, r5 - lsls r0, 3 - mov r7, r12 - adds r4, r0, r7 - movs r7, 0xA - ldrsh r0, [r4, r7] - cmn r3, r0 - bne _08116354 - movs r0, 0 - b _08116358 - .pool -_08116354: - ldrh r0, [r4, 0xA] - negs r0, r0 -_08116358: - strh r0, [r2] - adds r0, r1, r5 - lsls r0, 3 - add r0, r12 - ldrh r1, [r0, 0x18] - strh r1, [r0, 0xE] - ldrh r1, [r0, 0xC] - subs r1, 0x1 - strh r1, [r0, 0xC] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0 - bne _08116382 - strh r1, [r6] - strh r1, [r2] - adds r0, r5, 0 - bl DestroyAnimVisualTask - b _08116382 -_0811637E: - subs r0, r2, 0x1 - strh r0, [r3, 0xE] -_08116382: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81162F8 - - thumb_func_start sub_8116388 -sub_8116388: @ 8116388 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =gBattleAnimArgs - ldrb r1, [r4, 0x6] - bl StartSpriteAffineAnim - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081163AC - adds r0, r5, 0 - movs r1, 0x1 - bl InitAnimSpritePos - b _081163B4 - .pool -_081163AC: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80A6980 -_081163B4: - ldr r0, =sub_80A67BC - str r0, [r5, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8116388 - - thumb_func_start sub_81163D0 -sub_81163D0: @ 81163D0 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =gBattleAnimArgs - ldrb r1, [r4, 0x6] - bl StartSpriteAffineAnim - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081163F4 - adds r0, r5, 0 - movs r1, 0x1 - bl InitAnimSpritePos - b _081163FC - .pool -_081163F4: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80A6980 -_081163FC: - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x8] - strh r0, [r5, 0x2E] - ldr r0, =sub_80A67BC - str r0, [r5, 0x1C] - ldr r1, =sub_810E2C8 - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81163D0 - - thumb_func_start sub_8116420 -sub_8116420: @ 8116420 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08116444 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _08116444 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x2] - negs r0, r0 - strh r0, [r1, 0x2] -_08116444: - adds r0, r4, 0 - bl sub_8116388 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8116420 - - thumb_func_start sub_8116458 -sub_8116458: @ 8116458 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimArgs - movs r0, 0x2 - ldrsh r1, [r5, r0] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _08116474 - bl Random2 - movs r1, 0x3 - ands r1, r0 - strh r1, [r5, 0x2] -_08116474: - ldrb r1, [r5, 0x2] - adds r0, r4, 0 - bl StartSpriteAffineAnim - movs r1, 0 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _08116494 - adds r0, r4, 0 - movs r1, 0 - bl InitAnimSpritePos - b _0811649C - .pool -_08116494: - adds r0, r4, 0 - movs r1, 0 - bl sub_80A6980 -_0811649C: - bl Random2 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x30 - bl __umodsi3 - ldr r1, =0x0000ffe8 - adds r0, r1 - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - bl Random2 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x18 - bl __umodsi3 - ldr r1, =0x0000fff4 - adds r0, r1 - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - ldr r1, =move_anim_8074EE0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67BC - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8116458 - - thumb_func_start sub_81164F0 -sub_81164F0: @ 81164F0 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimArgs - ldrb r0, [r5] - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x2E] - ldr r2, =gSprites - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x24] - ldrh r0, [r0, 0x20] - adds r1, r0 - strh r1, [r4, 0x20] - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x26] - ldrh r0, [r0, 0x22] - adds r1, r0 - strh r1, [r4, 0x22] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x24] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x26] - ldrb r1, [r5, 0x6] - adds r0, r4, 0 - bl StartSpriteAffineAnim - ldr r1, =move_anim_8074EE0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67BC - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81164F0 - - thumb_func_start sub_8116560 -sub_8116560: @ 8116560 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0811657C - adds r0, r4, 0 - movs r1, 0x1 - bl InitAnimSpritePos - b _08116584 - .pool -_0811657C: - adds r0, r4, 0 - movs r1, 0x1 - bl sub_80A6980 -_08116584: - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x6] - strh r0, [r4, 0x2E] - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =WaitAnimForDuration - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8116560 - - thumb_func_start sub_81165A8 -sub_81165A8: @ 81165A8 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =gBattleAnimArgs - ldrb r1, [r4, 0x6] - bl StartSpriteAffineAnim - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081165CC - adds r0, r5, 0 - movs r1, 0x1 - bl InitAnimSpritePos - b _081165D4 - .pool -_081165CC: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80A6980 -_081165D4: - ldr r0, =sub_81165E4 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81165A8 - - thumb_func_start sub_81165E4 -sub_81165E4: @ 81165E4 - push {lr} - adds r3, r0, 0 - movs r0, 0x3E - adds r0, r3 - mov r12, r0 - ldrb r2, [r0] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldrh r0, [r3, 0x2E] - adds r1, r0, 0x1 - strh r1, [r3, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xC - ble _0811661A - adds r0, r3, 0 - bl DestroyAnimSprite -_0811661A: - pop {r0} - bx r0 - thumb_func_end sub_81165E4 - - .align 2, 0 diff --git a/include/battle_anim.h b/include/battle_anim.h index 16e9de0ac..c3601bbd9 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -123,6 +123,7 @@ u8 sub_80A89C8(int, u8, int); void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); void sub_80A6CC0(u32, const void*, u32); void sub_80A6DAC(bool8); +void sub_80A634C(struct Sprite *); enum { @@ -166,7 +167,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); // battle_anim_utility_funcs.s void sub_8116EB4(u8); -u32 sub_811583C(s16); +u32 UnpackSelectedBattleAnimPalettes(s16); u8 GetBattlerSpriteFinal_Y(u8, u16, u8); diff --git a/ld_script.txt b/ld_script.txt index df26da50d..628475264 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -172,7 +172,7 @@ SECTIONS { src/dragon.o(.text); asm/dark.o(.text); src/ground.o(.text); - asm/normal.o(.text); + src/normal.o(.text); src/battle_anim_utility_funcs.o(.text); asm/battle_intro.o(.text); src/bike.o(.text); diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 11cf46ab5..6dfebe77f 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -47,7 +47,7 @@ const u8 gUnknown_0859741E[] = {0x08, 0x0a, 0x0c, 0x0e}; void sub_8116620(u8 taskId) { - u32 selectedPalettes = sub_811583C(gBattleAnimArgs[0]); + u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]); selectedPalettes |= sub_80A76C4((gBattleAnimArgs[0] >> 7) & 1, (gBattleAnimArgs[0] >> 8) & 1, (gBattleAnimArgs[0] >> 9) & 1, @@ -62,7 +62,7 @@ void sub_8116664(u8 taskId) u8 animBattlers[2]; animBattlers[1] = 0xFF; - selectedPalettes = sub_811583C(1); + selectedPalettes = UnpackSelectedBattleAnimPalettes(1); switch (gBattleAnimArgs[0]) { case 2: @@ -105,7 +105,7 @@ void sub_8116664(u8 taskId) void AnimTask_SetCamouflageBlend(u8 taskId) { - u32 selectedPalettes = sub_811583C(gBattleAnimArgs[0]); + u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]); switch (gBattleTerrain) { case BATTLE_TERRAIN_GRASS: diff --git a/src/normal.c b/src/normal.c index a4ed5edca..3de8b1157 100644 --- a/src/normal.c +++ b/src/normal.c @@ -1,19 +1,42 @@ #include "global.h" #include "battle_anim.h" +#include "palette.h" +#include "random.h" +#include "task.h" +#include "trig.h" #include "constants/rgb.h" -extern void sub_811572C(struct Sprite *); -extern void sub_81157FC(struct Sprite *); -extern void sub_81158A4(struct Sprite *); -extern void sub_81159B4(struct Sprite *); -extern void sub_81160A4(struct Sprite *); -extern void sub_8116388(struct Sprite *); -extern void sub_8116420(struct Sprite *); -extern void sub_8116458(struct Sprite *); -extern void sub_81164F0(struct Sprite *); -extern void sub_8116560(struct Sprite *); -extern void sub_81165A8(struct Sprite *); -extern void sub_81163D0(struct Sprite *); +void AnimConfusionDuck(struct Sprite *); +void AnimSimplePaletteBlend(struct Sprite *); +u32 UnpackSelectedBattleAnimPalettes(s16); +void sub_81158A4(struct Sprite *); +void sub_81159B4(struct Sprite *); +void sub_81160A4(struct Sprite *); +void sub_8116388(struct Sprite *); +void sub_8116420(struct Sprite *); +void sub_8116458(struct Sprite *); +void sub_81164F0(struct Sprite *); +void sub_8116560(struct Sprite *); +void sub_81165A8(struct Sprite *); +static void AnimConfusionDuckStep(struct Sprite *); +static void AnimSimplePaletteBlendStep(struct Sprite *); +static void sub_81158F8(struct Sprite *); +static void sub_8115984(struct Sprite *); +static void sub_8115A54(u8, u8, u8); +static void sub_8115AA4(u8); +static void sub_8115BC8(u8, u8, u8); +static void sub_8115C18(u8); +static void sub_8115CD0(u8, u8, u8); +static void sub_8115D2C(u8); +static void sub_8115E00(u8); +static void sub_8115EB8(u8); +static void sub_8116148(struct Sprite *); +static void sub_81161F4(void); +static void sub_81162F8(u8); +static void sub_81163D0(struct Sprite *); +static void sub_81165E4(struct Sprite *); + +extern void sub_810E2C8(struct Sprite *); const union AnimCmd gUnknown_0859722C[] = { @@ -47,7 +70,7 @@ const struct SpriteTemplate gConfusionDuckSpriteTemplate = .anims = gUnknown_08597254, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_811572C, + .callback = AnimConfusionDuck, }; const struct SpriteTemplate gSimplePaletteBlendSpriteTemplate = @@ -58,7 +81,7 @@ const struct SpriteTemplate gSimplePaletteBlendSpriteTemplate = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81157FC, + .callback = AnimSimplePaletteBlend, }; const struct SpriteTemplate gComplexPaletteBlendSpriteTemplate = @@ -231,3 +254,717 @@ const struct SpriteTemplate gUnknown_08597400 = .affineAnims = gUnknown_08597348, .callback = sub_81163D0, }; + +// Moves a spinning duck around the mon's head. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: initial wave offset +// arg 3: wave period (higher means faster wave) +// arg 4: duration +void AnimConfusionDuck(struct Sprite *sprite) +{ + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + { + sprite->data[1] = -gBattleAnimArgs[3]; + sprite->data[4] = 1; + } + else + { + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[4] = 0; + StartSpriteAnim(sprite, 1); + } + + sprite->data[3] = gBattleAnimArgs[4]; + sprite->callback = AnimConfusionDuckStep; + sprite->callback(sprite); +} + +static void AnimConfusionDuckStep(struct Sprite *sprite) +{ + sprite->pos2.x = Cos(sprite->data[0], 30); + sprite->pos2.y = Sin(sprite->data[0], 10); + + if ((u16)sprite->data[0] < 128) + sprite->oam.priority = 1; + else + sprite->oam.priority = 3; + + sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; + if (++sprite->data[2] == sprite->data[3]) + DestroyAnimSprite(sprite); +} + +// Performs a simple color blend on a specified sprite. +// arg 0: palette selector +// arg 1: delay +// arg 2: start blend amount +// arg 3: end blend amount +// arg 4: blend color +void AnimSimplePaletteBlend(struct Sprite *sprite) +{ + u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]); + BeginNormalPaletteFade(selectedPalettes, gBattleAnimArgs[1], gBattleAnimArgs[2], gBattleAnimArgs[3], gBattleAnimArgs[4]); + sprite->invisible = 1; + sprite->callback = AnimSimplePaletteBlendStep; +} + +// Unpacks a bitfield and returns a bitmask of its selected palettes. +// Bits 0-6 of the selector parameter result in the following palettes being selected: +// 0: battle background palettes (BG palettes 1, 2, and 3) +// 1: gBattleAnimAttacker OBJ palette +// 2: gBattleAnimTarget OBJ palette +// 3: gBattleAnimAttacker partner OBJ palette +// 4: gBattleAnimTarget partner OBJ palette +// 5: BG palette 4 +// 6: BG palette 5 +u32 UnpackSelectedBattleAnimPalettes(s16 selector) +{ + u8 arg0 = selector & 1; + u8 arg1 = (selector >> 1) & 1; + u8 arg2 = (selector >> 2) & 1; + u8 arg3 = (selector >> 3) & 1; + u8 arg4 = (selector >> 4) & 1; + u8 arg5 = (selector >> 5) & 1; + u8 arg6 = (selector >> 6) & 1; + return sub_80A75AC(arg0, arg1, arg2, arg3, arg4, arg5, arg6); +} + +static void AnimSimplePaletteBlendStep(struct Sprite *sprite) +{ + if (!gPaletteFade.active) + DestroyAnimSprite(sprite); +} + +void sub_81158A4(struct Sprite *sprite) +{ + u32 selectedPalettes; + + sprite->data[0] = gBattleAnimArgs[1]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[2]; + sprite->data[3] = gBattleAnimArgs[3]; + sprite->data[4] = gBattleAnimArgs[4]; + sprite->data[5] = gBattleAnimArgs[5]; + sprite->data[6] = gBattleAnimArgs[6]; + sprite->data[7] = gBattleAnimArgs[0]; + + selectedPalettes = UnpackSelectedBattleAnimPalettes(sprite->data[7]); + BlendPalettes(selectedPalettes, gBattleAnimArgs[4], gBattleAnimArgs[3]); + sprite->invisible = 1; + sprite->callback = sub_81158F8; +} + +static void sub_81158F8(struct Sprite *sprite) +{ + u32 selectedPalettes; + + if (sprite->data[0] > 0) + { + sprite->data[0]--; + return; + } + + if (gPaletteFade.active) + return; + + if (sprite->data[2] == 0) + { + sprite->callback = sub_8115984; + return; + } + + selectedPalettes = UnpackSelectedBattleAnimPalettes(sprite->data[7]); + if (sprite->data[1] & 0x100) + BlendPalettes(selectedPalettes, sprite->data[4], sprite->data[3]); + else + BlendPalettes(selectedPalettes, sprite->data[6], sprite->data[5]); + + sprite->data[1] ^= 0x100; + sprite->data[0] = sprite->data[1] & 0xFF; + sprite->data[2]--; +} + +static void sub_8115984(struct Sprite *sprite) +{ + u32 selectedPalettes; + + if (!gPaletteFade.active) + { + selectedPalettes = UnpackSelectedBattleAnimPalettes(sprite->data[7]); + BlendPalettes(selectedPalettes, 0, 0); + DestroyAnimSprite(sprite); + } +} + +void sub_81159B4(struct Sprite *sprite) +{ + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = 0; + sprite->data[1] = 10; + sprite->data[2] = 8; + sprite->data[3] = 40; + sprite->data[4] = 112; + sprite->data[5] = 0; + StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + sprite->callback = sub_80A634C; + sprite->callback(sprite); +} + +void sub_8115A04(u8 taskId) +{ + gTasks[taskId].data[0] = gBattleAnimArgs[0]; + gTasks[taskId].data[1] = gBattleAnimArgs[1]; + gTasks[taskId].data[2] = gBattleAnimArgs[2]; + gTasks[taskId].data[3] = gBattleAnimArgs[3]; + gTasks[taskId].data[4] = gBattleAnimArgs[4]; + gTasks[taskId].data[5] = gBattleAnimArgs[5]; + gTasks[taskId].data[8] = 0; + sub_8115A54(taskId, 0, gTasks[taskId].data[4]); + gTasks[taskId].func = sub_8115AA4; +} + +static void sub_8115A54(u8 taskId, u8 initialBlendAmount, u8 targetBlendAmount) +{ + u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gTasks[taskId].data[0]); + BeginNormalPaletteFade( + selectedPalettes, + gTasks[taskId].data[1], + initialBlendAmount, + targetBlendAmount, + gTasks[taskId].data[5]); + + gTasks[taskId].data[2]--; + gTasks[taskId].data[8] ^= 1; +} + +static void sub_8115AA4(u8 taskId) +{ + u8 initialBlendAmount, targetBlendAmount; + if (!gPaletteFade.active) + { + if (gTasks[taskId].data[2] > 0) + { + if (gTasks[taskId].data[8] == 0) + { + initialBlendAmount = gTasks[taskId].data[3]; + targetBlendAmount = gTasks[taskId].data[4]; + } + else + { + initialBlendAmount = gTasks[taskId].data[4]; + targetBlendAmount = gTasks[taskId].data[3]; + } + + if (gTasks[taskId].data[2] == 1) + targetBlendAmount = 0; + + sub_8115A54(taskId, initialBlendAmount, targetBlendAmount); + } + else + { + DestroyAnimVisualTask(taskId); + } + } +} + +void sub_8115B0C(u8 taskId) +{ + int battler; + u32 selectedPalettes = 0; + + gTasks[taskId].data[0] = gBattleAnimArgs[0]; + gTasks[taskId].data[1] = gBattleAnimArgs[1]; + gTasks[taskId].data[2] = gBattleAnimArgs[2]; + gTasks[taskId].data[3] = gBattleAnimArgs[3]; + gTasks[taskId].data[4] = gBattleAnimArgs[4]; + gTasks[taskId].data[5] = gBattleAnimArgs[5]; + gTasks[taskId].data[8] = 0; + + for (battler = 0; battler < gBattlersCount; battler++) + { + if (battler != gBattleAnimAttacker && battler != gBattleAnimTarget) + selectedPalettes |= 1 << (battler + 16); + } + + if (gBattleAnimArgs[0] == 1) + selectedPalettes |= 0xE; + + gTasks[taskId].data[9] = selectedPalettes >> 16; + gTasks[taskId].data[10] = selectedPalettes & 0xFF; + sub_8115BC8(taskId, 0, gTasks[taskId].data[4]); + gTasks[taskId].func = sub_8115C18; +} + +static void sub_8115BC8(u8 taskId, u8 initialBlendAmount, u8 targetBlendAmount) +{ + u32 selectedPalettes = ((u16)gTasks[taskId].data[9] << 16) | (u16)gTasks[taskId].data[10]; + BeginNormalPaletteFade( + selectedPalettes, + gTasks[taskId].data[1], + initialBlendAmount, + targetBlendAmount, + gTasks[taskId].data[5]); + + gTasks[taskId].data[2]--; + gTasks[taskId].data[8] ^= 1; +} + +static void sub_8115C18(u8 taskId) +{ + u8 initialBlendAmount, targetBlendAmount; + if (!gPaletteFade.active) + { + if (gTasks[taskId].data[2] > 0) + { + if (gTasks[taskId].data[8] == 0) + { + initialBlendAmount = gTasks[taskId].data[3]; + targetBlendAmount = gTasks[taskId].data[4]; + } + else + { + initialBlendAmount = gTasks[taskId].data[4]; + targetBlendAmount = gTasks[taskId].data[3]; + } + + if (gTasks[taskId].data[2] == 1) + targetBlendAmount = 0; + + sub_8115BC8(taskId, initialBlendAmount, targetBlendAmount); + } + else + { + DestroyAnimVisualTask(taskId); + } + } +} + +void sub_8115C80(u8 taskId) +{ + u8 paletteIndex; + + gTasks[taskId].data[0] = gBattleAnimArgs[0]; + gTasks[taskId].data[1] = gBattleAnimArgs[1]; + gTasks[taskId].data[2] = gBattleAnimArgs[2]; + gTasks[taskId].data[3] = gBattleAnimArgs[3]; + gTasks[taskId].data[4] = gBattleAnimArgs[4]; + gTasks[taskId].data[5] = gBattleAnimArgs[5]; + gTasks[taskId].data[8] = 0; + + sub_8115CD0(taskId, 0, gTasks[taskId].data[4]); + gTasks[taskId].func = sub_8115D2C; +} + +static void sub_8115CD0(u8 taskId, u8 initialBlendAmount, u8 targetBlendAmount) +{ + u8 paletteIndex = IndexOfSpritePaletteTag(gTasks[taskId].data[0]); + BeginNormalPaletteFade( + 1 << (paletteIndex + 16), + gTasks[taskId].data[1], + initialBlendAmount, + targetBlendAmount, + gTasks[taskId].data[5]); + + gTasks[taskId].data[2]--; + gTasks[taskId].data[8] ^= 1; +} + +static void sub_8115D2C(u8 taskId) +{ + u8 initialBlendAmount, targetBlendAmount; + if (!gPaletteFade.active) + { + if (gTasks[taskId].data[2] > 0) + { + if (gTasks[taskId].data[8] == 0) + { + initialBlendAmount = gTasks[taskId].data[3]; + targetBlendAmount = gTasks[taskId].data[4]; + } + else + { + initialBlendAmount = gTasks[taskId].data[4]; + targetBlendAmount = gTasks[taskId].data[3]; + } + + if (gTasks[taskId].data[2] == 1) + targetBlendAmount = 0; + + sub_8115CD0(taskId, initialBlendAmount, targetBlendAmount); + } + else + { + DestroyAnimVisualTask(taskId); + } + } +} + +void sub_8115D94(u8 taskId) +{ + u8 paletteIndex; + + gTasks[taskId].data[0] = gBattleAnimArgs[1]; + gTasks[taskId].data[1] = gBattleAnimArgs[1]; + gTasks[taskId].data[2] = gBattleAnimArgs[2]; + gTasks[taskId].data[3] = gBattleAnimArgs[3]; + gTasks[taskId].data[4] = gBattleAnimArgs[4]; + gTasks[taskId].data[5] = gBattleAnimArgs[5]; + gTasks[taskId].data[6] = gBattleAnimArgs[6]; + gTasks[taskId].data[7] = gBattleAnimArgs[0]; + + paletteIndex = IndexOfSpritePaletteTag(gBattleAnimArgs[0]); + BeginNormalPaletteFade( + 1 << (paletteIndex + 16), + 0, + gBattleAnimArgs[4], + gBattleAnimArgs[4], + gBattleAnimArgs[3]); + + gTasks[taskId].func = sub_8115E00; +} + +static void sub_8115E00(u8 taskId) +{ + u32 selectedPalettes; + + if (gTasks[taskId].data[0] > 0) + { + gTasks[taskId].data[0]--; + return; + } + + if (gPaletteFade.active) + return; + + if (gTasks[taskId].data[2] == 0) + { + gTasks[taskId].func = sub_8115EB8; + return; + } + + selectedPalettes = 1 << (IndexOfSpritePaletteTag(gTasks[taskId].data[7]) + 16); + if (gTasks[taskId].data[1] & 0x100) + { + BeginNormalPaletteFade( + selectedPalettes, + 0, + gTasks[taskId].data[4], + gTasks[taskId].data[4], + gTasks[taskId].data[3]); + } + else + { + BeginNormalPaletteFade( + selectedPalettes, + 0, + gTasks[taskId].data[6], + gTasks[taskId].data[6], + gTasks[taskId].data[5]); + } + + gTasks[taskId].data[1] ^= 0x100; + gTasks[taskId].data[0] = gTasks[taskId].data[1] & 0xFF; + gTasks[taskId].data[2]--; +} + +static void sub_8115EB8(u8 taskId) +{ + u32 selectedPalettes; + + if (!gPaletteFade.active) + { + selectedPalettes = 1 << (IndexOfSpritePaletteTag(gTasks[taskId].data[7]) + 16); + BeginNormalPaletteFade(selectedPalettes, 0, 0, 0, RGB(0, 0, 0)); + DestroyAnimVisualTask(taskId); + } +} + +void sub_8115F10(u8 taskId) +{ + u32 selectedPalettes = 0; + u8 attackerBattler = gBattleAnimAttacker; + u8 targetBattler = gBattleAnimTarget; + + if (gBattleAnimArgs[0] & 0x100) + selectedPalettes = sub_80A75AC(1, 0, 0, 0, 0, 0, 0); + + if (gBattleAnimArgs[1] & 0x100) + selectedPalettes |= (0x10000 << attackerBattler); + + if (gBattleAnimArgs[2] & 0x100) + selectedPalettes |= (0x10000 << targetBattler); + + InvertPlttBuffer(selectedPalettes); + DestroyAnimVisualTask(taskId); +} + +void sub_8115F94(u8 taskId) +{ + u8 attackerBattler; + u8 targetBattler; + u8 paletteIndex; + u32 selectedPalettes = 0; + + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[2] = gBattleAnimArgs[0]; + gTasks[taskId].data[3] = gBattleAnimArgs[1]; + gTasks[taskId].data[4] = gBattleAnimArgs[2]; + gTasks[taskId].data[1] = gBattleAnimArgs[3]; + gTasks[taskId].data[5] = gBattleAnimArgs[4]; + gTasks[taskId].data[6] = gBattleAnimArgs[5]; + gTasks[taskId].data[7] = gBattleAnimArgs[6]; + } + + gTasks[taskId].data[0]++; + attackerBattler = gBattleAnimAttacker; + targetBattler = gBattleAnimTarget; + + if (gTasks[taskId].data[2] & 0x100) + selectedPalettes = 0x0000FFFF; + + if (gTasks[taskId].data[2] & 0x1) + { + paletteIndex = IndexOfSpritePaletteTag(gSprites[gHealthboxSpriteIds[attackerBattler]].template->paletteTag); + selectedPalettes |= (1 << paletteIndex) << 16; + } + + if (gTasks[taskId].data[3] & 0x100) + selectedPalettes |= (1 << attackerBattler) << 16; + + if (gTasks[taskId].data[4] & 0x100) + selectedPalettes |= (1 << targetBattler) << 16; + + TintPlttBuffer(selectedPalettes, gTasks[taskId].data[5], gTasks[taskId].data[6], gTasks[taskId].data[7]); + if (gTasks[taskId].data[0] == gTasks[taskId].data[1]) + { + UnfadePlttBuffer(selectedPalettes); + DestroyAnimVisualTask(taskId); + } +} + +void sub_81160A4(struct Sprite *sprite) +{ + u16 var0; + + sprite->invisible = 1; + sprite->data[0] = -gBattleAnimArgs[0]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[3] = gBattleAnimArgs[2]; + + switch (gBattleAnimArgs[3]) + { + case 0: + StoreSpriteCallbackInData6(sprite, (void *)&gBattle_BG3_X); + break; + case 1: + StoreSpriteCallbackInData6(sprite, (void *)&gBattle_BG3_Y); + break; + case 2: + StoreSpriteCallbackInData6(sprite, (void *)&gSpriteCoordOffsetX); + break; + default: + StoreSpriteCallbackInData6(sprite, (void *)&gSpriteCoordOffsetY); + break; + } + + sprite->data[4] = *(u16 *)(sprite->data[6] | (sprite->data[7] << 16)); + sprite->data[5] = gBattleAnimArgs[3]; + var0 = sprite->data[5] - 2; + if (var0 < 2) + sub_81161F4(); + + sprite->callback = sub_8116148; +} + +static void sub_8116148(struct Sprite *sprite) +{ + u8 i; + u16 var0; + + if (sprite->data[3] > 0) + { + sprite->data[3]--; + if (sprite->data[1] > 0) + { + sprite->data[1]--; + } + else + { + sprite->data[1] = sprite->data[2]; + *(u16 *)(sprite->data[6] | (sprite->data[7] << 16)) += sprite->data[0]; + sprite->data[0] = -sprite->data[0]; + } + } + else + { + *(u16 *)(sprite->data[6] | (sprite->data[7] << 16)) = sprite->data[4]; + var0 = sprite->data[5] - 2; + if (var0 < 2) + { + for (i = 0; i < gBattlersCount; i++) + gSprites[gBattlerSpriteIds[i]].coordOffsetEnabled = 0; + } + + DestroyAnimSprite(sprite); + } +} + +static void sub_81161F4(void) +{ + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 0; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 0; + + if (gBattleAnimArgs[4] == 2) + { + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1; + } + else + { + if (gBattleAnimArgs[4] == 0) + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1; + else + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1; + } +} + +void sub_81162A4(u8 taskId) +{ + gTasks[taskId].data[0] = gBattleAnimArgs[0]; + gTasks[taskId].data[1] = gBattleAnimArgs[1]; + gTasks[taskId].data[2] = gBattleAnimArgs[2]; + gTasks[taskId].data[3] = gBattleAnimArgs[3]; + gTasks[taskId].data[8] = gBattleAnimArgs[3]; + gBattle_BG3_X = gBattleAnimArgs[0]; + gBattle_BG3_Y = gBattleAnimArgs[1]; + gTasks[taskId].func = sub_81162F8; + gTasks[taskId].func(taskId); +} + +static void sub_81162F8(u8 taskId) +{ + if (gTasks[taskId].data[3] == 0) + { + if (gBattle_BG3_X == gTasks[taskId].data[0]) + gBattle_BG3_X = -gTasks[taskId].data[0]; + else + gBattle_BG3_X = gTasks[taskId].data[0]; + + if (gBattle_BG3_Y == -gTasks[taskId].data[1]) + gBattle_BG3_Y = 0; + else + gBattle_BG3_Y = -gTasks[taskId].data[1]; + + gTasks[taskId].data[3] = gTasks[taskId].data[8]; + if (--gTasks[taskId].data[2] == 0) + { + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; + DestroyAnimVisualTask(taskId); + } + } + else + { + gTasks[taskId].data[3]--; + } +} + +void sub_8116388(struct Sprite *sprite) +{ + StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); + if (gBattleAnimArgs[2] == 0) + InitAnimSpritePos(sprite, 1); + else + sub_80A6980(sprite, TRUE); + + sprite->callback = sub_80A67BC; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +static void sub_81163D0(struct Sprite *sprite) +{ + StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); + if (gBattleAnimArgs[2] == 0) + InitAnimSpritePos(sprite, 1); + else + sub_80A6980(sprite, TRUE); + + sprite->data[0] = gBattleAnimArgs[4]; + sprite->callback = sub_80A67BC; + StoreSpriteCallbackInData6(sprite, sub_810E2C8); +} + +void sub_8116420(struct Sprite *sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER && !IsContest()) + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + + sub_8116388(sprite); +} + +void sub_8116458(struct Sprite *sprite) +{ + if (gBattleAnimArgs[1] == -1) + gBattleAnimArgs[1] = Random2() & 3; + + StartSpriteAffineAnim(sprite, gBattleAnimArgs[1]); + if (gBattleAnimArgs[0] == 0) + InitAnimSpritePos(sprite, 0); + else + sub_80A6980(sprite, FALSE); + + sprite->pos2.x += (Random2() % 48) - 24; + sprite->pos2.y += (Random2() % 24) - 12; + + StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + sprite->callback = sub_80A67BC; +} + +void sub_81164F0(struct Sprite *sprite) +{ + sprite->data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); + sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x; + sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + gSprites[sprite->data[0]].pos2.y; + sprite->pos2.x = gBattleAnimArgs[1]; + sprite->pos2.y = gBattleAnimArgs[2]; + StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); + StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + sprite->callback = sub_80A67BC; +} + +void sub_8116560(struct Sprite *sprite) +{ + if (gBattleAnimArgs[2] == 0) + InitAnimSpritePos(sprite, 1); + else + sub_80A6980(sprite, TRUE); + + sprite->data[0] = gBattleAnimArgs[3]; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + sprite->callback = WaitAnimForDuration; +} + +void sub_81165A8(struct Sprite *sprite) +{ + StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); + if (gBattleAnimArgs[2] == 0) + InitAnimSpritePos(sprite, 1); + else + sub_80A6980(sprite, TRUE); + + sprite->callback = sub_81165E4; +} + +static void sub_81165E4(struct Sprite *sprite) +{ + sprite->invisible ^= 1; + if (sprite->data[0]++ > 12) + DestroyAnimSprite(sprite); +} -- cgit v1.2.3 From b082f000afee689eb6a73ba7a938c4f371c09225 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 1 Dec 2018 18:54:59 +0100 Subject: Start working on link rfu --- asm/link_rfu.s | 1503 +--------------------------------------------------- include/librfu.h | 9 +- include/link_rfu.h | 27 +- src/librfu_stwi.c | 34 +- src/link_rfu.c | 602 ++++++++++++++++++++- 5 files changed, 617 insertions(+), 1558 deletions(-) diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 1179b9866..4060c4959 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -5,1508 +5,7 @@ .text - thumb_func_start sub_8011404 -sub_8011404: @ 8011404 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x31 - bne _08011410 - b _08011570 -_08011410: - cmp r4, 0x31 - bgt _0801143E - cmp r4, 0x22 - beq _08011494 - cmp r4, 0x22 - bgt _0801142C - cmp r4, 0x20 - beq _0801147C - cmp r4, 0x20 - ble _08011426 - b _080115DE -_08011426: - cmp r4, 0 - beq _0801146E - b _080115DE -_0801142C: - cmp r4, 0x24 - beq _080114BA - cmp r4, 0x24 - blt _080114B0 - cmp r4, 0x25 - beq _08011504 - cmp r4, 0x30 - beq _0801150E - b _080115DE -_0801143E: - cmp r4, 0x44 - bgt _08011454 - cmp r4, 0x42 - blt _08011448 - b _080115DE -_08011448: - cmp r4, 0x33 - beq _08011522 - cmp r4, 0x33 - bge _08011452 - b _0801158C -_08011452: - b _080115DE -_08011454: - cmp r4, 0xF3 - bne _0801145A - b _080115AC -_0801145A: - cmp r4, 0xF3 - bgt _08011466 - cmp r4, 0xF0 - bge _08011464 - b _080115DE -_08011464: - b _080115C4 -_08011466: - cmp r4, 0xFF - bne _0801146C - b _080115C4 -_0801146C: - b _080115DE -_0801146E: - ldr r1, =gUnknown_03005000 - movs r0, 0x6 - strh r0, [r1, 0x4] - b _080115DE - .pool -_0801147C: - ldr r0, =gUnknown_03005000 - ldr r1, =gUnknown_03004140 - ldrh r1, [r1, 0x14] - ldr r2, =0x00000ccd - adds r0, r2 - b _080115DC - .pool -_08011494: - ldr r0, =gUnknown_03005000 - ldr r1, =gUnknown_03004140 - ldrh r1, [r1, 0x14] - ldr r2, =0x00000c3e - adds r0, r2 - ldrb r2, [r0] - b _080115DC - .pool -_080114B0: - movs r0, 0x2 - adds r1, r4, 0 - bl sub_8011A64 - b _080115DE -_080114BA: - ldr r4, =gUnknown_03005000 - movs r1, 0 - movs r0, 0xB - strh r0, [r4, 0x4] - ldr r2, =0x00000c85 - adds r0, r4, r2 - strb r1, [r0] - ldr r0, =0x00000c86 - adds r2, r4, r0 - strb r1, [r2] - ldr r1, =0x00000c3e - adds r5, r4, r1 - ldrb r1, [r5] - movs r0, 0x20 - movs r3, 0x1 - bl rfu_setRecvBuffer - ldrb r1, [r5] - ldr r2, =0x00000c3f - adds r4, r2 - movs r0, 0x10 - adds r2, r4, 0 - movs r3, 0x46 - bl rfu_setRecvBuffer - b _080115DE - .pool -_08011504: - movs r0, 0x2 - movs r1, 0x25 - bl sub_8011A64 - b _080115DE -_0801150E: - ldr r0, =gUnknown_03005000 - adds r2, r0, 0 - adds r2, 0xF0 - movs r1, 0x2 - strb r1, [r2] - ldr r1, =0x00000c86 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x6 - beq _080115DE -_08011522: - ldr r2, =gUnknown_03005000 - adds r1, r2, 0 - adds r1, 0xF0 - ldrb r0, [r1] - cmp r0, 0x2 - beq _08011532 - movs r0, 0x4 - strb r0, [r1] -_08011532: - ldr r1, =0x00000c86 - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0x9 - beq _08011544 - movs r0, 0x2 - adds r1, r4, 0 - bl sub_8011A64 -_08011544: - ldr r0, =gUnknown_082ED7FC - movs r1, 0x5 - movs r2, 0x5 - bl nullsub_5 - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0x1 - bne _080115DE - adds r0, r4, 0 - bl sub_8011170 - b _080115DE - .pool -_08011570: - ldr r0, =gUnknown_03005000 - adds r0, 0xF0 - movs r1, 0x1 - strb r1, [r0] - ldr r0, =gUnknown_082ED814 - movs r1, 0x5 - movs r2, 0x5 - bl nullsub_5 - b _080115DE - .pool -_0801158C: - ldr r1, =gUnknown_03005000 - adds r2, r1, 0 - adds r2, 0xF0 - movs r0, 0x3 - strb r0, [r2] - ldr r2, =0x00000c3c - adds r1, r2 - ldrb r0, [r1] - movs r0, 0x1 - strb r0, [r1] - b _080115DE - .pool -_080115AC: - movs r0, 0x1 - movs r1, 0xF3 - bl sub_8011A64 - movs r0, 0xF3 - bl sub_8011170 - ldr r0, =gUnknown_03005000 - adds r0, 0xEF - b _080115DA - .pool -_080115C4: - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8011A64 - adds r0, r4, 0 - bl sub_8011170 - ldr r0, =gUnknown_03005000 - ldr r1, =0x00000cdb - adds r0, r1 - ldrb r1, [r0] -_080115DA: - movs r1, 0x1 -_080115DC: - strb r1, [r0] -_080115DE: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011404 - - thumb_func_start sub_80115EC -sub_80115EC: @ 80115EC - push {r4-r6,lr} - adds r3, r0, 0 - movs r2, 0 - movs r6, 0x1 - ldr r0, =gUnknown_03005000 - ldr r4, =0x00000cea - adds r1, r0, r4 - movs r5, 0 - movs r4, 0xFF -_080115FE: - adds r0, r3, 0 - asrs r0, r2 - ands r0, r6 - cmp r0, 0 - beq _08011610 - strb r5, [r1] - ldrb r0, [r1, 0x4] - orrs r0, r4 - strb r0, [r1, 0x4] -_08011610: - adds r1, 0x1 - adds r2, 0x1 - cmp r2, 0x3 - ble _080115FE - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80115EC - thumb_func_start sub_8011628 -sub_8011628: @ 8011628 - push {r4-r7,lr} - adds r5, r0, 0 - movs r3, 0 - movs r2, 0 - movs r4, 0x1 - ldr r6, =gUnknown_03007890 - movs r7, 0x7F -_08011636: - adds r0, r5, 0 - asrs r0, r2 - ands r0, r4 - cmp r0, 0 - beq _0801165C - lsls r1, r2, 5 - adds r1, 0x14 - ldr r0, [r6] - adds r0, r1 - ldrb r1, [r0, 0x10] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0x45 - bne _0801165C - adds r0, r4, 0 - lsls r0, r2 - orrs r3, r0 - lsls r0, r3, 24 - lsrs r3, r0, 24 -_0801165C: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _08011636 - adds r0, r3, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8011628 - - thumb_func_start sub_8011674 -sub_8011674: @ 8011674 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x25 - bne _08011680 - b _080118EC -_08011680: - cmp r4, 0x25 - bgt _080116C2 - cmp r4, 0x14 - bne _0801168A - b _08011804 -_0801168A: - cmp r4, 0x14 - bgt _080116A2 - cmp r4, 0x11 - beq _08011722 - cmp r4, 0x11 - ble _08011698 - b _08011A42 -_08011698: - cmp r4, 0 - beq _0801170C - cmp r4, 0x10 - beq _08011718 - b _08011A42 -_080116A2: - cmp r4, 0x22 - bne _080116A8 - b _08011868 -_080116A8: - cmp r4, 0x22 - bgt _080116B4 - cmp r4, 0x20 - bne _080116B2 - b _08011850 -_080116B2: - b _08011A42 -_080116B4: - cmp r4, 0x23 - bne _080116BA - b _08011884 -_080116BA: - cmp r4, 0x24 - bne _080116C0 - b _080118BA -_080116C0: - b _08011A42 -_080116C2: - cmp r4, 0x44 - bgt _080116F2 - cmp r4, 0x42 - blt _080116CC - b _08011A42 -_080116CC: - cmp r4, 0x32 - bne _080116D2 - b _08011914 -_080116D2: - cmp r4, 0x32 - bgt _080116E4 - cmp r4, 0x30 - bne _080116DC - b _08011940 -_080116DC: - cmp r4, 0x31 - bne _080116E2 - b _080118F6 -_080116E2: - b _08011A42 -_080116E4: - cmp r4, 0x33 - bne _080116EA - b _08011948 -_080116EA: - cmp r4, 0x40 - bne _080116F0 - b _080119FC -_080116F0: - b _08011A42 -_080116F2: - cmp r4, 0xF3 - bne _080116F8 - b _08011A0C -_080116F8: - cmp r4, 0xF3 - bgt _08011704 - cmp r4, 0xF0 - bge _08011702 - b _08011A42 -_08011702: - b _08011A28 -_08011704: - cmp r4, 0xFF - bne _0801170A - b _08011A28 -_0801170A: - b _08011A42 -_0801170C: - ldr r1, =gUnknown_03005000 - movs r0, 0x11 - strh r0, [r1, 0x4] - b _08011A42 - .pool -_08011718: - movs r0, 0x4 - movs r1, 0 - bl sub_8011A64 - b _08011A42 -_08011722: - bl sub_800F7DC - ldrb r1, [r0, 0xA] - movs r0, 0x7F - ands r0, r1 - cmp r0, 0x45 - bne _080117DC - ldr r5, =gUnknown_03005000 - ldr r1, =0x00000cd9 - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080117DC - ldr r0, =gUnknown_03004140 - ldrh r0, [r0, 0x14] - bl sub_8011628 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - beq _080117A6 - adds r0, r4, 0 - bl sub_800E87C - movs r2, 0x1 - mov r12, r2 - mov r1, r12 - lsls r1, r0 - lsls r1, 24 - lsrs r1, 24 - ldr r7, =0x00000ce6 - adds r6, r5, r7 - ldrb r2, [r6] - cmp r2, 0 - bne _08011798 - ldr r0, =0x00000ce8 - adds r3, r5, r0 - ldrb r0, [r3] - cmp r0, 0 - bne _08011798 - subs r7, 0x1 - adds r0, r5, r7 - strb r1, [r0] - eors r1, r4 - orrs r1, r2 - strb r1, [r6] - mov r0, r12 - strb r0, [r3] - b _080117A6 - .pool -_08011798: - ldr r0, =gUnknown_03005000 - ldr r1, =0x00000ce6 - adds r0, r1 - ldrb r2, [r0] - adds r1, r4, 0 - orrs r1, r2 - strb r1, [r0] -_080117A6: - ldr r0, =gUnknown_03004140 - ldrh r1, [r0, 0x14] - cmp r4, r1 - beq _080117F6 - ldr r2, =gUnknown_03005000 - ldr r7, =0x00000ce3 - adds r3, r2, r7 - adds r0, r4, 0 - eors r0, r1 - ldrb r1, [r3] - orrs r0, r1 - strb r0, [r3] - ldr r0, =0x00000ce4 - adds r2, r0 - movs r0, 0x2 - strb r0, [r2] - b _080117F6 - .pool -_080117DC: - bl sub_800F7DC - ldrb r1, [r0, 0xA] - movs r0, 0x7F - ands r0, r1 - cmp r0, 0x54 - bne _080117F6 - ldr r0, =gUnknown_03004140 - ldrb r0, [r0] - bl rfu_REQ_disconnect - bl rfu_waitREQComplete -_080117F6: - ldr r0, =gUnknown_03004140 - ldrh r0, [r0, 0x14] - bl sub_80115EC - b _08011A42 - .pool -_08011804: - bl sub_800F7DC - ldrb r1, [r0, 0xA] - movs r0, 0x7F - ands r0, r1 - cmp r0, 0x45 - beq _08011836 - ldr r4, =gUnknown_03004140 - ldrb r0, [r4, 0x1] - cmp r0, 0x1 - bls _08011836 - ldrb r0, [r4, 0x14] - bl sub_800E87C - movs r1, 0x80 - lsls r1, 17 - lsls r1, r0 - lsrs r1, 24 - ldrb r0, [r4] - eors r1, r0 - adds r0, r1, 0 - bl rfu_REQ_disconnect - bl rfu_waitREQComplete -_08011836: - ldr r1, =gUnknown_03005000 - ldrh r0, [r1, 0x4] - cmp r0, 0xF - beq _08011840 - b _08011A42 -_08011840: - movs r0, 0x10 - strh r0, [r1, 0x4] - b _08011A42 - .pool -_08011850: - ldr r0, =gUnknown_03005000 - ldr r1, =gUnknown_03004140 - ldrh r1, [r1, 0x14] - ldr r2, =0x00000ccd - adds r0, r2 - b _08011A40 - .pool -_08011868: - ldr r0, =gUnknown_03005000 - ldr r1, =gUnknown_03004140 - ldrh r1, [r1, 0x14] - ldr r7, =0x00000c3e - adds r0, r7 - ldrb r2, [r0] - b _08011A40 - .pool -_08011884: - ldr r1, =gUnknown_03005000 - movs r0, 0x12 - strh r0, [r1, 0x4] - ldr r0, =0x00000ccf - adds r1, r0 - ldrb r0, [r1] - cmp r0, 0x1 - bhi _080118B0 - adds r0, 0x1 - strb r0, [r1] - ldr r0, =sub_801209C - movs r1, 0x2 - bl CreateTask - b _08011A42 - .pool -_080118B0: - movs r0, 0x2 - movs r1, 0x23 - bl sub_8011A64 - b _08011A42 -_080118BA: - ldr r4, =gUnknown_03005000 - movs r0, 0xD - strh r0, [r4, 0x4] - movs r0, 0x3 - movs r1, 0 - bl sub_8011A64 - ldr r1, =0x00000c3e - adds r0, r4, r1 - ldrb r1, [r0] - ldr r2, =0x00000c3f - adds r4, r2 - movs r0, 0x10 - adds r2, r4, 0 - movs r3, 0x46 - bl rfu_setRecvBuffer - b _08011A42 - .pool -_080118EC: - movs r0, 0x2 - movs r1, 0x25 - bl sub_8011A64 - b _08011A42 -_080118F6: - ldr r0, =gUnknown_03004140 - ldrb r1, [r0] - ldrh r0, [r0, 0x14] - ands r1, r0 - cmp r1, 0 - bne _08011904 - b _08011A42 -_08011904: - ldr r0, =gUnknown_03005000 - adds r0, 0xF0 - movs r1, 0x1 - b _08011A40 - .pool -_08011914: - ldr r2, =gUnknown_03005000 - adds r1, r2, 0 - adds r1, 0xF0 - movs r0, 0x3 - strb r0, [r1] - ldr r0, =gUnknown_03007890 - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0 - beq _0801192A - b _08011A42 -_0801192A: - ldr r7, =0x00000c3c - adds r0, r2, r7 - ldrb r1, [r0] - movs r1, 0x1 - b _08011A40 - .pool -_08011940: - ldr r0, =gUnknown_03005000 - adds r0, 0xF0 - movs r1, 0x2 - strb r1, [r0] -_08011948: - ldr r2, =gUnknown_03005000 - adds r1, r2, 0 - adds r1, 0xF0 - ldrb r0, [r1] - cmp r0, 0x2 - beq _08011958 - movs r0, 0x4 - strb r0, [r1] -_08011958: - ldrb r0, [r2, 0xC] - cmp r0, 0x1 - bne _08011996 - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0x1 - bne _080119B4 - ldr r0, =0x00000ce2 - adds r2, r0 - ldr r0, =gUnknown_03004140 - ldrb r1, [r0, 0x14] - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - cmp r0, 0 - bne _08011990 - adds r0, r4, 0 - bl sub_8011170 - b _080119B4 - .pool -_08011990: - bl sub_80111FC - b _080119B4 -_08011996: - ldr r1, =0x00000ce4 - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0x2 - beq _080119B4 - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0x1 - bne _080119B4 - adds r0, r4, 0 - bl sub_8011170 - movs r0, 0 - bl sub_800C27C -_080119B4: - ldr r0, =gUnknown_03007890 - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0xFF - bne _080119DA - ldr r0, =gUnknown_03004140 - ldrb r0, [r0, 0x7] - cmp r0, 0 - bne _080119DA - ldr r0, =sub_800EB44 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080119DA - ldr r1, =gUnknown_03005000 - movs r0, 0x11 - strh r0, [r1, 0x4] -_080119DA: - movs r0, 0x2 - adds r1, r4, 0 - bl sub_8011A64 - b _08011A42 - .pool -_080119FC: - ldr r0, =gUnknown_03005000 - ldr r2, =0x00000ce3 - adds r0, r2 - b _08011A3E - .pool -_08011A0C: - movs r0, 0x1 - movs r1, 0xF3 - bl sub_8011A64 - movs r0, 0xF3 - bl sub_8011170 - ldr r0, =gUnknown_03005000 - adds r0, 0xEF - movs r1, 0x1 - b _08011A40 - .pool -_08011A28: - adds r0, r4, 0 - bl sub_8011170 - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8011A64 - ldr r0, =gUnknown_03005000 - ldr r7, =0x00000cdb - adds r0, r7 - ldrb r1, [r0] -_08011A3E: - movs r1, 0 -_08011A40: - strb r1, [r0] -_08011A42: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011674 - - thumb_func_start sub_8011A50 -sub_8011A50: @ 8011A50 - ldr r0, =gUnknown_03005000 - ldr r1, =0x00000ce4 - adds r0, r1 - movs r1, 0x2 - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_8011A50 - - thumb_func_start sub_8011A64 -sub_8011A64: @ 8011A64 - ldr r2, =gUnknown_03005000 - adds r3, r2, 0 - adds r3, 0xF1 - strb r0, [r3] - strh r1, [r2, 0xA] - bx lr - .pool - thumb_func_end sub_8011A64 - - thumb_func_start sub_8011A74 -sub_8011A74: @ 8011A74 - ldr r0, =gUnknown_03005000 - adds r0, 0xF1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_8011A74 - - thumb_func_start sub_8011A80 -sub_8011A80: @ 8011A80 - push {lr} - bl sub_8011A74 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - cmp r0, 0x1 - bls _08011A94 - movs r0, 0 - b _08011A96 -_08011A94: - movs r0, 0x1 -_08011A96: - pop {r1} - bx r1 - thumb_func_end sub_8011A80 - - thumb_func_start sub_8011A9C -sub_8011A9C: @ 8011A9C - ldr r0, =gUnknown_03005000 - ldr r1, =0x00000ce8 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_8011A9C - - thumb_func_start Rfu_IsMaster -Rfu_IsMaster: @ 8011AB0 - ldr r0, =gUnknown_03005000 - ldrb r0, [r0, 0xC] - bx lr - .pool - thumb_func_end Rfu_IsMaster - - thumb_func_start RfuVSync -RfuVSync: @ 8011ABC - push {lr} - bl rfu_syncVBlank_ - pop {r0} - bx r0 - thumb_func_end RfuVSync - - thumb_func_start sub_8011AC8 -sub_8011AC8: @ 8011AC8 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r1, =gRecvCmds - ldr r2, =0x05000014 - mov r0, sp - bl CpuSet - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011AC8 - - thumb_func_start sub_8011AE8 -sub_8011AE8: @ 8011AE8 - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_8011AE8 - - thumb_func_start sub_8011AFC -sub_8011AFC: @ 8011AFC - push {r4,lr} - bl ResetSpriteData - bl FreeAllSpritePalettes - bl ResetTasks - bl ResetPaletteFade - ldr r0, =sub_8011AE8 - bl SetVBlankCallback - bl IsWirelessAdapterConnected - lsls r0, 24 - cmp r0, 0 - beq _08011B70 - ldr r1, =gLinkType - ldr r2, =0x00001111 - adds r0, r2, 0 - strh r0, [r1] - bl sub_800B488 - bl OpenLink - ldr r0, =gMain - ldrh r0, [r0, 0x24] - bl SeedRng - movs r4, 0 -_08011B38: - bl Random - ldr r1, =gSaveBlock2Ptr - ldr r1, [r1] - adds r1, 0xA - adds r1, r4 - strb r0, [r1] - adds r4, 0x1 - cmp r4, 0x3 - ble _08011B38 - movs r1, 0xAA - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - bl sub_8011BA4 - ldr r0, =sub_8011BF8 - bl SetMainCallback2 -_08011B70: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011AFC - - thumb_func_start sub_8011B90 -sub_8011B90: @ 8011B90 - push {lr} - ldr r0, =sub_800EB44 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8011B90 - - thumb_func_start sub_8011BA4 -sub_8011BA4: @ 8011BA4 - push {r4,lr} - ldr r4, =nullsub_89 - adds r0, r4, 0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - bne _08011BC2 - adds r0, r4, 0 - movs r1, 0 - bl CreateTask - ldr r1, =gUnknown_03005000 - adds r1, 0x66 - strb r0, [r1] -_08011BC2: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011BA4 - - thumb_func_start sub_8011BD0 -sub_8011BD0: @ 8011BD0 - push {lr} - ldr r0, =nullsub_89 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08011BEA - ldr r0, =gUnknown_03005000 - adds r0, 0x66 - ldrb r0, [r0] - bl DestroyTask -_08011BEA: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011BD0 - - thumb_func_start sub_8011BF8 -sub_8011BF8: @ 8011BF8 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_8011BF8 - - thumb_func_start sub_8011C10 -sub_8011C10: @ 8011C10 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r1, =gUnknown_03005000 - movs r0, 0x1 - strb r0, [r1, 0xC] - bl sub_8010F48 - ldr r0, =sub_801120C - movs r1, 0 - bl sub_800BF4C - ldr r2, =gUnknown_02022B2C - adds r1, r2, 0 - ldr r0, =gUnknown_082ED608 - ldm r0!, {r3,r5,r6} - stm r1!, {r3,r5,r6} - ldm r0!, {r3,r5,r6} - stm r1!, {r3,r5,r6} - ldr r0, =gUnknown_082ED620 - subs r4, 0x1 - adds r4, r0 - ldrb r0, [r4] - strh r0, [r2, 0x2] - bl sub_800EE78 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011C10 - - thumb_func_start sub_8011C5C -sub_8011C5C: @ 8011C5C - push {lr} - ldr r1, =gUnknown_03005000 - movs r0, 0 - strb r0, [r1, 0xC] - bl sub_8010F48 - ldr r0, =sub_8011404 - ldr r1, =sub_800ED34 - bl sub_800BF4C - bl sub_800EF00 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011C5C - - thumb_func_start sub_8011C84 -sub_8011C84: @ 8011C84 - push {r4-r7,lr} - ldr r4, =gUnknown_03005000 - movs r5, 0 - movs r0, 0x2 - strb r0, [r4, 0xC] - bl sub_8010F48 - ldr r0, =sub_8011674 - movs r1, 0 - bl sub_800BF4C - ldr r2, =gUnknown_02022B2C - adds r1, r2, 0 - ldr r0, =gUnknown_082ED608 - ldm r0!, {r3,r6,r7} - stm r1!, {r3,r6,r7} - ldm r0!, {r3,r6,r7} - stm r1!, {r3,r6,r7} - strb r5, [r2, 0x11] - movs r0, 0x96 - lsls r0, 2 - strh r0, [r2, 0x12] - ldr r0, =sub_800EB44 - movs r1, 0x1 - bl CreateTask - adds r4, 0x67 - strb r0, [r4] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011C84 - - thumb_func_start sub_8011CD8 -sub_8011CD8: @ 8011CD8 - ldrb r1, [r0, 0x1] - lsls r1, 8 - ldrb r0, [r0] - orrs r0, r1 - bx lr - thumb_func_end sub_8011CD8 - - thumb_func_start sub_8011CE4 -sub_8011CE4: @ 8011CE4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - str r0, [sp] - lsls r1, 16 - lsrs r1, 16 - mov r10, r1 - movs r0, 0xFF - mov r9, r0 - movs r7, 0 - ldr r1, =gUnknown_03007890 - mov r8, r1 -_08011D02: - lsls r4, r7, 5 - adds r5, r4, 0 - adds r5, 0x14 - mov r1, r8 - ldr r0, [r1] - adds r0, r5 - adds r0, 0x8 - bl sub_8011CD8 - lsls r0, 16 - lsrs r6, r0, 16 - mov r1, r8 - ldr r0, [r1] - adds r0, r4 - ldrh r0, [r0, 0x18] - bl sub_8010454 - cmp r0, 0 - beq _08011D4C - mov r0, r8 - ldr r1, [r0] - adds r1, r5 - adds r1, 0x15 - ldr r0, [sp] - bl StringCompare - cmp r0, 0 - bne _08011D4C - cmp r10, r6 - bne _08011D4C - mov r9, r7 - mov r1, r8 - ldr r0, [r1] - adds r0, r4 - ldrb r0, [r0, 0x16] - cmp r0, 0xFF - bne _08011D56 -_08011D4C: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x3 - bls _08011D02 -_08011D56: - mov r0, r9 - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8011CE4 - - thumb_func_start sub_8011D6C -sub_8011D6C: @ 8011D6C - push {r4-r6,lr} - adds r6, r0, 0 - lsls r0, r6, 24 - lsrs r0, 24 - bl rfu_REQ_disconnect - bl rfu_waitREQComplete - ldr r4, =gUnknown_03005000 - ldr r0, =0x00000ce2 - adds r5, r4, r0 - ldrb r0, [r5] - bics r0, r6 - strb r0, [r5] - ldr r1, =0x00000cda - adds r6, r4, r1 - ldrb r1, [r6] - movs r0, 0x1 - bl rfu_clearSlot - ldrb r0, [r5] - ldr r1, =0x00000c87 - adds r4, r1 - adds r1, r4, 0 - movs r2, 0x46 - bl rfu_UNI_setSendData - ldrb r0, [r5] - bl sub_800E87C - strb r0, [r6] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011D6C - - thumb_func_start sub_8011DC0 -sub_8011DC0: @ 8011DC0 - push {lr} - lsls r1, 16 - lsrs r1, 16 - bl sub_8011CE4 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xFF - beq _08011DDA - movs r0, 0x1 - lsls r0, r1 - bl sub_8011D6C -_08011DDA: - pop {r0} - bx r0 - thumb_func_end sub_8011DC0 - - thumb_func_start sub_8011DE0 -sub_8011DE0: @ 8011DE0 - push {r4-r6,lr} - adds r4, r0, 0 - cmp r4, 0 - beq _08011E20 - movs r3, 0 - movs r2, 0 - ldr r5, =gUnknown_03005000+0xCDE - adds r6, r5, 0x4 -_08011DF0: - adds r0, r2, r5 - ldrb r0, [r0] - cmp r0, r4 - bne _08011E0E - ldrb r0, [r6] - asrs r0, r2 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08011E0E - adds r0, r1, 0 - lsls r0, r2 - orrs r3, r0 - lsls r0, r3, 24 - lsrs r3, r0, 24 -_08011E0E: - adds r2, 0x1 - cmp r2, 0x3 - ble _08011DF0 - cmp r3, 0 - beq _08011E20 - adds r0, r3, 0 - movs r1, 0x2 - bl sub_8011E94 -_08011E20: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011DE0 - - thumb_func_start sub_8011E2C -sub_8011E2C: @ 8011E2C - push {r4-r6,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r6, =gSendCmd - ldrh r0, [r6] - cmp r0, 0 - bne _08011E7A - ldr r5, =gUnknown_03005000 - ldr r1, =0x00000ce8 - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _08011E7A - movs r0, 0xED - lsls r0, 8 - bl sub_800FD14 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - strh r1, [r6, 0x2] - ldrh r1, [r0, 0xA] - strh r1, [r6, 0x4] - ldr r1, =gUnknown_082ED695 - movs r2, 0x8 - ldrsh r0, [r0, r2] - adds r0, r1 - ldrb r1, [r5, 0xD] - ldrb r0, [r0] - subs r1, r0 - strb r1, [r5, 0xD] - ldrb r0, [r5, 0xD] - strh r0, [r6, 0x6] - adds r0, r4, 0 - bl DestroyTask -_08011E7A: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011E2C - - thumb_func_start sub_8011E94 -sub_8011E94: @ 8011E94 - push {r4-r6,lr} - adds r4, r0, 0 - adds r6, r1, 0 - ldr r5, =sub_8011E2C - adds r0, r5, 0 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - bne _08011ECC - adds r0, r5, 0 - movs r1, 0x5 - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - strh r4, [r0, 0x8] - b _08011EDC - .pool -_08011ECC: - ldr r0, =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - orrs r4, r0 - strh r4, [r1, 0x8] -_08011EDC: - ldr r1, =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - strh r6, [r0, 0xA] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011E94 - - thumb_func_start sub_8011EF4 -sub_8011EF4: @ 8011EF4 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - bl sub_800EE94 - lsls r0, 24 - cmp r0, 0 - beq _08011FA4 - adds r0, r4, 0 - adds r0, 0x10 - bl sub_8011CD8 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - bl sub_8011CE4 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - beq _08011F8C - ldr r0, =gUnknown_03007890 - ldr r0, [r0] - lsls r1, r2, 5 - adds r0, r1 - ldrb r0, [r0, 0x16] - cmp r0, 0xFF - beq _08011F5C - ldr r0, =gUnknown_03005000 - ldr r1, =0x00000c3d - adds r0, r1 - strb r2, [r0] - bl sub_800EEBC - cmp r0, 0 - beq _08011FAA - b _08011F84 - .pool -_08011F5C: - bl sub_800F7DC - ldrb r1, [r0, 0xA] - movs r5, 0x7F - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0x15 - beq _08011FA4 - bl sub_800F7DC - ldrb r1, [r0, 0xA] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0x16 - beq _08011FA4 - movs r1, 0xE0 - lsls r1, 7 - movs r0, 0x2 - bl sub_8011A64 -_08011F84: - adds r0, r6, 0 - bl DestroyTask - b _08011FAA -_08011F8C: - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - strh r0, [r4, 0x1E] - ldr r0, =gUnknown_03005000 - ldr r1, =0x00000c3d - adds r0, r1 - strb r2, [r0] - b _08011FAA - .pool -_08011FA4: - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - strh r0, [r4, 0x1E] -_08011FAA: - movs r1, 0x1E - ldrsh r0, [r4, r1] - cmp r0, 0xF0 - ble _08011FC2 - movs r1, 0xE0 - lsls r1, 7 - movs r0, 0x2 - bl sub_8011A64 - adds r0, r6, 0 - bl DestroyTask -_08011FC2: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8011EF4 - - thumb_func_start sub_8011FC8 -sub_8011FC8: @ 8011FC8 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r5, r1, 16 - lsrs r5, 16 - ldr r0, =gUnknown_03005000 - adds r0, 0xF1 - movs r1, 0 - strb r1, [r0] - ldr r0, =sub_8011EF4 - movs r1, 0x3 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, =gTasks + 0x8 - adds r4, r0 - adds r0, r4, 0 - adds r1, r6, 0 - bl StringCopy - strh r5, [r4, 0x10] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8011FC8 - - thumb_func_start sub_801200C -sub_801200C: @ 801200C - push {r4,r5,lr} - adds r4, r1, 0 - lsls r0, 16 - lsrs r5, r0, 16 - bl sub_800F7DC - ldrb r1, [r0, 0xA] - movs r2, 0x7F - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0x45 - bne _08012032 - ldrb r1, [r4, 0xA] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0x45 - beq _08012092 -_0801202E: - movs r0, 0x1 - b _08012094 -_08012032: - ldrb r1, [r4, 0xA] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0x40 - bne _0801202E - cmp r5, 0x44 - bne _08012092 - ldr r5, =gUnknown_03005000+0x10A - ldrh r0, [r5, 0x8] - ldr r3, =0x000003ff - adds r2, r3, 0 - ands r2, r0 - movs r0, 0xCE - lsls r0, 1 - cmp r2, r0 - bne _08012068 - ldrh r1, [r4, 0x8] - adds r0, r3, 0 - ands r0, r1 - cmp r0, r2 - beq _08012092 - b _0801202E - .pool -_08012068: - ldrh r1, [r4, 0x8] - adds r0, r3, 0 - ands r0, r1 - cmp r0, r2 - bne _0801202E - ldrb r2, [r4, 0xB] - movs r0, 0xFE - ldrb r3, [r5, 0xB] - adds r1, r0, 0 - ands r1, r2 - ands r0, r3 - cmp r1, r0 - bne _0801202E - ldrb r2, [r4, 0x9] - movs r0, 0xFC - ldrb r3, [r5, 0x9] - adds r1, r0, 0 - ands r1, r2 - ands r0, r3 - cmp r1, r0 - bne _0801202E -_08012092: - movs r0, 0 -_08012094: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_801200C thumb_func_start sub_801209C sub_801209C: @ 801209C @@ -1557,7 +56,7 @@ _080120E4: movs r2, 0x86 lsls r2, 1 adds r0, r6, r2 - bl sub_8011CD8 + bl ReadU16 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 diff --git a/include/librfu.h b/include/librfu.h index 9d131f027..ba6e535d4 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -81,7 +81,7 @@ struct UnkLinkRfuStruct_02022B14Substruct u8 playerTrainerId[2]; }; -struct __attribute__((packed)) UnkLinkRfuStruct_02022B14 +struct __attribute__((packed, aligned(2))) UnkLinkRfuStruct_02022B14 { struct UnkLinkRfuStruct_02022B14Substruct unk_00; u8 unk_04[4]; @@ -169,13 +169,14 @@ struct RfuUnk3 u32 unk_dc; }; -struct RfuUnk5Sub { +struct RfuUnk5Sub +{ u16 unk_00; u8 unk_02; u16 unk_04; struct UnkLinkRfuStruct_02022B14 unk_06; - u8 fill_13[2]; - u8 unk_15[8]; + u8 fill_13[1]; + u8 playerName[PLAYER_NAME_LENGTH + 1]; }; struct RfuUnk5 diff --git a/include/link_rfu.h b/include/link_rfu.h index c3ca75604..eb24addbe 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -32,7 +32,8 @@ struct UnkLinkRfuStruct_02022B44 u8 fill_84[0x58]; }; -struct UnkRfuStruct_1 { +struct UnkRfuStruct_1 +{ /* 0x000 */ u8 unk_00; /* 0x001 */ u8 unk_01; /* 0x002 */ vu8 unk_02; @@ -75,7 +76,8 @@ struct UnkRfuStruct_1 { /* 0xeb4 */ u8 filler_e64[12]; }; -struct UnkRfuStruct_2_Sub_6c { +struct UnkRfuStruct_2_Sub_6c +{ /* 0x00 */ u16 unk_00; /* 0x02 */ u16 unk_02; /* 0x04 */ const u8 *unk_04; @@ -86,7 +88,8 @@ struct UnkRfuStruct_2_Sub_6c { /* 0x12 */ u8 unk_12; }; -struct UnkRfuStruct_2_Sub_124 { +struct UnkRfuStruct_2_Sub_124 +{ /* 0x000 */ u8 unk_00[32][70]; /* 0x8c0 */ vu8 unk_8c0; /* 0x8c1 */ vu8 unk_8c1; @@ -94,7 +97,8 @@ struct UnkRfuStruct_2_Sub_124 { /* 0x8c3 */ vu8 unk_8c3; }; -struct UnkRfuStruct_2_Sub_9e8 { +struct UnkRfuStruct_2_Sub_9e8 +{ /* 0x000 */ u8 unk_00[40][14]; /* 0x230 */ vu8 unk_230; /* 0x231 */ vu8 unk_231; @@ -102,14 +106,16 @@ struct UnkRfuStruct_2_Sub_9e8 { /* 0x233 */ vu8 unk_233; }; -struct UnkRfuStruct_2_Sub_c1c { +struct UnkRfuStruct_2_Sub_c1c +{ /* 0x00 */ u8 unk_00[2][14]; /* 0x1c */ vu8 unk_1c; /* 0x1d */ vu8 unk_1d; /* 0x1e */ vu8 unk_1e; }; -struct UnkRfuStruct_Sub_Unused { +struct UnkRfuStruct_Sub_Unused +{ /* 0x000 */ u8 unk_00[2][256]; /* 0x200 */ vu8 unk_200; /* 0x201 */ vu8 unk_201; @@ -117,7 +123,8 @@ struct UnkRfuStruct_Sub_Unused { /* 0x203 */ vu8 unk_203; }; -struct UnkRfuStruct_2 { +struct UnkRfuStruct_2 +{ /* 0x000 */ void (*unk_00)(void); /* 0x004 */ u16 unk_04; /* 0x006 */ u8 filler_06[4]; @@ -149,7 +156,9 @@ struct UnkRfuStruct_2 { /* 0x0fe */ u16 unk_fe; /* 0x100 */ u16 unk_100; /* 0x102 */ u8 unk_102; - /* 0x103 */ u8 filler_103[0x21]; + /* 0x103 */ u8 filler_103[0x10A - 0x103]; + /* 0x10A */ struct UnkLinkRfuStruct_02022B14 unk_10A; + u8 filler_120[12]; /* 0x124 */ struct UnkRfuStruct_2_Sub_124 unk_124; /* 0x9e8 */ struct UnkRfuStruct_2_Sub_9e8 unk_9e8; /* 0xc1c */ struct UnkRfuStruct_2_Sub_c1c unk_c1c; @@ -252,7 +261,7 @@ void sub_800E3A8(void); void sub_800ED10(void); void sub_800ED28(void); void sub_8011090(u8 a0, u32 a1, u32 a2); -void sub_8011FC8(u8 *a0, u16 a1); +void sub_8011FC8(const u8 *src, u16 trainerId); void sub_8010FA0(bool32 a0, bool32 a1); void sub_8010F60(void); void sub_8010FCC(u32 a0, u32 a1, u32 a2); diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c index 21d38bb38..556b79bf8 100644 --- a/src/librfu_stwi.c +++ b/src/librfu_stwi.c @@ -246,7 +246,7 @@ void STWI_send_SystemConfigREQ(u16 unk1, u8 unk2, u8 unk3) if (!STWI_init(RFU_SYSTEM_CONFIG)) { u8 *packetBytes; - + gRfuState->txParams = 1; packetBytes = gRfuState->txPacket->rfuPacket8.data; @@ -348,7 +348,7 @@ void STWI_send_DataTxREQ(void *in, u8 size) u8 txParams = (size / sizeof(u32)); if (size & (sizeof(u32) - 1)) txParams += 1; - + gRfuState->txParams = txParams; CpuCopy32(in, gRfuState->txPacket->rfuPacket32.data, gRfuState->txParams * sizeof(u32)); STWI_start_Command(); @@ -469,11 +469,11 @@ void STWI_send_CPR_StartREQ(u16 unk0, u16 unk1, u8 unk2) { u32 *packetData; u32 arg1; - + if (!STWI_init(RFU_CPR_START)) { gRfuState->txParams = 2; - + arg1 = unk1 | (unk0 << 16); packetData = gRfuState->txPacket->rfuPacket32.data; packetData[0] = arg1; @@ -569,7 +569,7 @@ void STWI_set_timer(u8 unk) void STWI_stop_timer(void) { gRfuState->timerState = 0; - + REG_TMCNT_L(gRfuState->timerSelect) = 0; REG_TMCNT_H(gRfuState->timerSelect) = 0; } @@ -612,7 +612,7 @@ u16 STWI_init(u8 request) gRfuState->timerActive = 0; gRfuState->unk_12 = 0; gRfuState->unk_15 = 0; - + REG_RCNT = 0x100; REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS; return FALSE; @@ -622,22 +622,22 @@ u16 STWI_init(u8 request) int STWI_start_Command() { u16 imeTemp; - + // Yes, it matters that it's casted to a u32... *(u32*)gRfuState->txPacket->rfuPacket8.data = 0x99660000 | (gRfuState->txParams << 8) | gRfuState->activeCommand; REG_SIODATA32 = gRfuState->txPacket->rfuPacket32.command; - + gRfuState->unk_0 = 0; gRfuState->unk_5 = 1; - + imeTemp = REG_IME; REG_IME = 0; REG_IE |= (INTR_FLAG_TIMER0 << gRfuState->timerSelect); REG_IE |= INTR_FLAG_SERIAL; REG_IME = imeTemp; - + REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_MULTI_BUSY | SIO_115200_BPS; - + return 0; } @@ -654,7 +654,7 @@ int STWI_restart_Command(void) { gRfuState->unk_12 = 1; gRfuState->unk_2c = 0; - + if (gRfuState->callbackM) gRfuState->callbackM(gRfuState->activeCommand, gRfuState->unk_12); } @@ -662,18 +662,18 @@ int STWI_restart_Command(void) { gRfuState->unk_12 = 1; gRfuState->unk_2c = 0; - + if (gRfuState->callbackM) gRfuState->callbackM(gRfuState->activeCommand, gRfuState->unk_12); - + gRfuState->unk_0 = 4; //TODO: what's 4 } } - + return 0; } -int STWI_reset_ClockCounter() +int STWI_reset_ClockCounter(void) { gRfuState->unk_0 = 5; //TODO: what is 5 gRfuState->txParams = 0; @@ -682,6 +682,6 @@ int STWI_reset_ClockCounter() REG_SIOCNT = 0; REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS; REG_SIOCNT = (SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS) + 0x7F; - + return 0; } diff --git a/src/link_rfu.c b/src/link_rfu.c index e85cc7dc3..f026ca3c3 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -1,5 +1,3 @@ - -// Includes #include "global.h" #include "malloc.h" #include "battle.h" @@ -15,12 +13,12 @@ #include "librfu.h" #include "rom_8011DC0.h" #include "link_rfu.h" +#include "palette.h" +#include "gpu_regs.h" +#include "constants/species.h" extern u16 gUnknown_03005DA8; - -// Static type declarations - -// Static RAM declarations +extern void nullsub_89(u8 taskId); struct UnkRfuStruct_1 gUnknown_03004140; struct UnkRfuStruct_2 gUnknown_03005000; @@ -32,12 +30,11 @@ IWRAM_DATA u16 gUnknown_03000D90[8]; EWRAM_DATA u8 gWirelessStatusIndicatorSpriteId = 0; EWRAM_DATA ALIGNED(4) struct UnkLinkRfuStruct_02022B14 gUnknown_02022B14 = {}; -EWRAM_DATA ALIGNED(2) u8 gUnknown_02022B22[8] = {}; +EWRAM_DATA ALIGNED(2) u8 gUnknown_02022B22[PLAYER_NAME_LENGTH + 1] = {}; EWRAM_DATA struct UnkLinkRfuStruct_02022B2C gUnknown_02022B2C = {}; EWRAM_DATA struct UnkLinkRfuStruct_02022B44 gUnknown_02022B44 = {}; // Static ROM declarations - static void sub_800C000(void); static void sub_800C7B4(u16 r8, u16 r6); static void sub_800C744(u32 a0); @@ -74,12 +71,15 @@ void sub_80109E8(u16 a0); void sub_8010A70(void *a0); void sub_8010AAC(u8 taskId); void sub_8010D0C(u8 taskId); -void sub_80115EC(u16 a0); +void sub_80115EC(s32 a0); u8 sub_8011CE4(const u8 *a0, u16 a1); -void sub_8011D6C(u8 a0); -void sub_8011E94(u8 a0, u8 a1); +void sub_8011D6C(u32 a0); +void sub_8011E94(u32 a0, u32 a1); u8 sub_8012224(void); void sub_801227C(void); +void sub_801209C(u8 taskId); +void sub_8011BF8(void); +void sub_8011BA4(void); // .rodata @@ -474,7 +474,6 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6) u8 sub_800C12C(u16 r6, u16 r8) { u8 i; - struct RfuUnk5 *tmp; if (gUnknown_03004140.unk_04 != 0 && (gUnknown_03004140.unk_04 < 9 || gUnknown_03004140.unk_04 > 11)) { @@ -2151,12 +2150,12 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) if (sub_8010454(gUnknown_03007890->unk_14[idx].unk_04) && ((gUnknown_03007890->unk_07 >> idx) & 1)) { memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD); - memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); + memcpy(buff2, gUnknown_03007890->unk_14[idx].playerName, PLAYER_NAME_LENGTH + 1); } else { memset(buff1, 0, 0xD); - memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); + memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].playerName)); } } else @@ -2165,12 +2164,12 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) if (sub_8010454(gUnknown_03007890->unk_14[idx].unk_04)) { memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD); - memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); + memcpy(buff2, gUnknown_03007890->unk_14[idx].playerName, PLAYER_NAME_LENGTH + 1); } else { memset(buff1, 0, 0xD); - memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_15)); + memset(buff2, 0, PLAYER_NAME_LENGTH + 1); } } return retVal; @@ -2181,13 +2180,13 @@ bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) bool8 retVal = FALSE; if (gUnknown_03007890->unk_14[idx].unk_04 == 0x7F7D) { - *buff1 = gUnknown_03007890->unk_14[idx].unk_06; - memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, 8); + memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD); + memcpy(buff2, gUnknown_03007890->unk_14[idx].playerName, 8); retVal = TRUE; } else { - *buff1 = (struct UnkLinkRfuStruct_02022B14){}; + memset(buff1, 0, 0xD); memset(buff2, 0, 8); } return retVal; @@ -2195,7 +2194,7 @@ bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx) void sub_800DF90(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2) { - *buff1 = gUnknown_02022B14; + memcpy(buff1, &gUnknown_02022B14, 0xD); memcpy(buff2, gUnknown_02022B22, 8); } @@ -2441,7 +2440,7 @@ void sub_800E5AC(void) } } -void nullsub_5(void *unused_0, u8 unused_1, u8 unused_2) +void nullsub_5(const char *unused_0, u8 unused_1, u8 unused_2) { // debug? } @@ -2537,7 +2536,7 @@ void sub_800E748(u8 taskId) } } -u8 sub_800E87C(u8 idx) +s32 sub_800E87C(u8 idx) { return gUnknown_082ED6A5[idx]; } @@ -2815,7 +2814,7 @@ bool8 sub_800EE94(void) return FALSE; } -bool8 sub_800EEBC(void) +bool32 sub_800EEBC(void) { if (gUnknown_03005000.unk_04 == 7 && !sub_800C12C(gUnknown_03007890->unk_14[gUnknown_03005000.unk_c3d].unk_00, 240)) { @@ -3503,7 +3502,7 @@ void sub_800FD14(u16 command) void sub_800FE50(u16 *a0) { - if (gSendCmd[0] == 0 && sub_8011A80() == 0) + if (gSendCmd[0] == 0 && !sub_8011A80()) { memcpy(gUnknown_03005000.unk_f2, a0, sizeof(gUnknown_03005000.unk_f2)); sub_800FD14(0x2f00); @@ -4246,7 +4245,7 @@ void sub_8010F48(void) void sub_8010F60(void) { - gUnknown_02022B14 = (struct UnkLinkRfuStruct_02022B14){}; + memset(&gUnknown_02022B14, 0, 0xD); sub_800DD94(&gUnknown_02022B14, 0, 0, 0); } @@ -4359,7 +4358,7 @@ void sub_80111FC(void) gUnknown_03005000.unk_00 = sub_80111DC; } -void sub_801120C(u8 a0) +void sub_801120C(u8 a0, u8 unused1) { u8 i; u8 r6 = 0; @@ -4443,3 +4442,554 @@ void sub_801120C(u8 a0) break; } } + +void sub_8011404(u8 a0, u8 unused1) +{ + switch (a0) + { + case 0x00: + gUnknown_03005000.unk_04 = 6; + break; + case 0x20: + gUnknown_03005000.unk_ccd = gUnknown_03004140.unk_14; + break; + case 0x21: + break; + case 0x22: + gUnknown_03005000.unk_c3e = gUnknown_03004140.unk_14; + break; + case 0x23: + sub_8011A64(2, a0); + break; + case 0x24: + gUnknown_03005000.unk_04 = 11; + gUnknown_03005000.unk_c85 = 0; + gUnknown_03005000.unk_c86 = 0; + rfu_setRecvBuffer(0x20, gUnknown_03005000.unk_c3e, &gUnknown_03005000.unk_c86, 1); + rfu_setRecvBuffer(0x10, gUnknown_03005000.unk_c3e, gUnknown_03005000.unk_c3f, 70); + break; + case 0x25: + sub_8011A64(2, 0x25); + break; + case 0x30: + gUnknown_03005000.unk_f0 = 2; + if (gUnknown_03005000.unk_c86 == 6) + break; + case 0x33: + if (gUnknown_03005000.unk_f0 != 2) + gUnknown_03005000.unk_f0 = 4; + if (gUnknown_03005000.unk_c86 != 9) + sub_8011A64(2, a0); + nullsub_5(gUnknown_082ED7FC, 5, 5); + if (gReceivedRemoteLinkPlayers == 1) + sub_8011170(a0); + break; + case 0x31: + gUnknown_03005000.unk_f0 = 1; + nullsub_5(gUnknown_082ED814, 5, 5); + break; + case 0x32: + gUnknown_03005000.unk_f0 = 3; + gUnknown_03005000.unk_c3c = 1; + break; + case 0x34: + break; + case 0x42 ... 0x44: + break; + case 0xF3: + sub_8011A64(1, a0); + sub_8011170(a0); + gUnknown_03005000.unk_ef = 1; + break; + case 0xF0 ... 0xF2: + case 0xFF: + sub_8011A64(1, a0); + sub_8011170(a0); + gUnknown_03005000.unk_cdb = 1; + break; + } +} + +void sub_80115EC(s32 a0) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + if ((a0 >> i) & 1) + { + gUnknown_03005000.unk_cea[i] = 0; + gUnknown_03005000.unk_cee[i] |= 0xFF; + } + } +} + +u8 sub_8011628(s32 a0) +{ + u8 ret = 0; + u8 i; + + for (i = 0; i < 4; i++) + { + if ((a0 >> i) & 1) + { + struct UnkLinkRfuStruct_02022B14 *structPtr = &gUnknown_03007890->unk_14[i].unk_06; + if (structPtr->unk_0a_0 == 0x45) + ret |= (1 << i); + } + } + + return ret; +} + +void sub_8011674(u8 a0, u8 unused1) +{ + u8 r1; + + switch (a0) + { + case 0x00: + gUnknown_03005000.unk_04 = 0x11; + break; + case 0x10: + sub_8011A64(4, 0); + break; + case 0x11: + if (sub_800F7DC()->unk_0a_0 == 0x45 && gUnknown_03005000.unk_cd9 == 0) + { + u8 idx = sub_8011628(gUnknown_03004140.unk_14); + if (idx != 0) + { + r1 = 1 << sub_800E87C(idx); + if (gUnknown_03005000.unk_ce6 == 0 && gUnknown_03005000.unk_ce8 == 0) + { + gUnknown_03005000.unk_ce5 = r1; + gUnknown_03005000.unk_ce6 |= (r1 ^ idx); + gUnknown_03005000.unk_ce8 = 1; + } + else + { + gUnknown_03005000.unk_ce6 |= idx; + } + } + if (idx != gUnknown_03004140.unk_14) + { + gUnknown_03005000.unk_ce3 |= (idx ^ gUnknown_03004140.unk_14); + gUnknown_03005000.unk_ce4 = 2; + } + } + else if (sub_800F7DC()->unk_0a_0 == 0x54) + { + rfu_REQ_disconnect(gUnknown_03004140.unk_00); + rfu_waitREQComplete(); + } + sub_80115EC(gUnknown_03004140.unk_14); + break; + case 0x12: + break; + case 0x13: + break; + case 0x14: + if (sub_800F7DC()->unk_0a_0 != 0x45 && gUnknown_03004140.unk_01 > 1) + { + r1 = 1 << sub_800E87C(gUnknown_03004140.unk_14); + rfu_REQ_disconnect(gUnknown_03004140.unk_00 ^ r1); + rfu_waitREQComplete(); + } + if (gUnknown_03005000.unk_04 == 0xF) + gUnknown_03005000.unk_04 = 0x10; + break; + break; + case 0x20: + gUnknown_03005000.unk_ccd = gUnknown_03004140.unk_14; + break; + case 0x21: + break; + case 0x22: + gUnknown_03005000.unk_c3e = gUnknown_03004140.unk_14; + break; + case 0x23: + gUnknown_03005000.unk_04 = 0x12; + if (gUnknown_03005000.unk_ccf < 2) + { + gUnknown_03005000.unk_ccf++; + CreateTask(sub_801209C, 2); + } + else + { + sub_8011A64(2, a0); + } + break; + case 0x24: + gUnknown_03005000.unk_04 = 0xD; + sub_8011A64(3, 0); + rfu_setRecvBuffer(0x10, gUnknown_03005000.unk_c3e, gUnknown_03005000.unk_c3f, 70); + break; + case 0x25: + sub_8011A64(2, a0); + break; + case 0x31: + if (gUnknown_03004140.unk_00 & gUnknown_03004140.unk_14) + gUnknown_03005000.unk_f0 = 1; + break; + case 0x32: + gUnknown_03005000.unk_f0 = 3; + if (gUnknown_03007890->unk_00 == 0) + gUnknown_03005000.unk_c3c = 1; + break; + case 0x30: + gUnknown_03005000.unk_f0 = 2; + case 0x33: + if (gUnknown_03005000.unk_f0 != 2) + gUnknown_03005000.unk_f0 = 4; + if (gUnknown_03005000.unk_0c == 1) + { + if (gReceivedRemoteLinkPlayers == 1) + { + gUnknown_03005000.unk_ce2 &= ~(gUnknown_03004140.unk_14); + if (gUnknown_03005000.unk_ce2 == 0) + sub_8011170(a0); + else + sub_80111FC(); + } + } + else if (gUnknown_03005000.unk_ce4 != 2 && gReceivedRemoteLinkPlayers == 1) + { + sub_8011170(a0); + sub_800C27C(0); + } + + if (gUnknown_03007890->unk_00 == 0xFF && gUnknown_03004140.unk_07 == 0 && FuncIsActiveTask(sub_800EB44) == TRUE) + gUnknown_03005000.unk_04 = 0x11; + + sub_8011A64(2, a0); + break; + case 0x40: + gUnknown_03005000.unk_ce3 = 0; + break; + case 0x42 ... 0x44: + break; + case 0xF3: + sub_8011A64(1, a0); + sub_8011170(a0); + gUnknown_03005000.unk_ef = 1; + break; + case 0xF0 ... 0xF2: + case 0xFF: + sub_8011170(a0); + sub_8011A64(1, a0); + gUnknown_03005000.unk_cdb = 0; + break; + } +} + +void sub_8011A50(void) +{ + gUnknown_03005000.unk_ce4 = 2; +} + +void sub_8011A64(u8 a0, u16 a1) +{ + gUnknown_03005000.unk_f1 = a0; + gUnknown_03005000.unk_0a = a1; +} + +u8 sub_8011A74(void) +{ + return gUnknown_03005000.unk_f1; +} + +bool32 sub_8011A80(void) +{ + u32 var = sub_8011A74() - 1; + if (var < 2) + return TRUE; + else + return FALSE; +} + +u8 sub_8011A9C(void) +{ + return gUnknown_03005000.unk_ce8; +} + +bool8 Rfu_IsMaster(void) +{ + return gUnknown_03005000.unk_0c; +} + +void RfuVSync(void) +{ + rfu_syncVBlank_(); +} + +void sub_8011AC8(void) +{ + CpuFill32(0, gRecvCmds, sizeof(gRecvCmds)); +} + +void sub_8011AE8(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +void sub_8011AFC(void) +{ + s32 i; + + ResetSpriteData(); + FreeAllSpritePalettes(); + ResetTasks(); + ResetPaletteFade(); + SetVBlankCallback(sub_8011AE8); + if (IsWirelessAdapterConnected()) + { + gLinkType = 0x1111; + sub_800B488(); + OpenLink(); + SeedRng(gMain.vblankCounter2); + for (i = 0; i < 4; i++) + gSaveBlock2Ptr->playerTrainerId[i] = Random() % 256; + + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_1D_MAP); + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); + sub_8011BA4(); + SetMainCallback2(sub_8011BF8); + } +} + +bool32 sub_8011B90(void) +{ + return FuncIsActiveTask(sub_800EB44); +} + +void sub_8011BA4(void) +{ + if (!FuncIsActiveTask(nullsub_89)) + gUnknown_03005000.unk_66 = CreateTask(nullsub_89, 0); +} + +void sub_8011BD0(void) +{ + if (FuncIsActiveTask(nullsub_89) == TRUE) + DestroyTask(gUnknown_03005000.unk_66); +} + +void sub_8011BF8(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); +} + +void sub_8011C10(u32 a0) +{ + gUnknown_03005000.unk_0c = 1; + sub_8010F48(); + sub_800BF4C(sub_801120C, NULL); + gUnknown_02022B2C = gUnknown_082ED608; + gUnknown_02022B2C.unk_02 = gUnknown_082ED620[a0 - 1]; + sub_800EE78(); +} + +void sub_8011C5C(void) +{ + gUnknown_03005000.unk_0c = 0; + sub_8010F48(); + sub_800BF4C(sub_8011404, sub_800ED34); + sub_800EF00(); +} + +void sub_8011C84(void) +{ + gUnknown_03005000.unk_0c = 2; + sub_8010F48(); + sub_800BF4C(sub_8011674, NULL); + gUnknown_02022B2C = gUnknown_082ED608; + gUnknown_02022B2C.unk_11 = 0; + gUnknown_02022B2C.unk_12 = 0x258; + gUnknown_03005000.unk_67 = CreateTask(sub_800EB44, 1); +} + +u16 ReadU16(const void *ptr) +{ + const u8 *ptr_ = ptr; + return (ptr_[1] << 8) | (ptr_[0]); +} + +u8 sub_8011CE4(const u8 *a0, u16 a1) +{ + u8 i; + u8 ret = 0xFF; + + for (i = 0; i < 4; i++) + { + u16 trainerId = ReadU16(gUnknown_03007890->unk_14[i].unk_06.unk_00.playerTrainerId); + if (sub_8010454(gUnknown_03007890->unk_14[i].unk_04) + && !StringCompare(a0, gUnknown_03007890->unk_14[i].playerName) + && a1 == trainerId) + { + ret = i; + if (gUnknown_03007890->unk_14[i].unk_02 != 0xFF) + break; + } + } + + return ret; +} + +void sub_8011D6C(u32 a0) +{ + rfu_REQ_disconnect(a0); + rfu_waitREQComplete(); + gUnknown_03005000.unk_ce2 &= ~(a0); + rfu_clearSlot(1, gUnknown_03005000.unk_cda); + rfu_UNI_setSendData(gUnknown_03005000.unk_ce2, gUnknown_03005000.unk_c87, 70); + gUnknown_03005000.unk_cda = sub_800E87C(gUnknown_03005000.unk_ce2); +} + +void sub_8011DC0(const u8 *ptr, u16 a1) +{ + u8 var = sub_8011CE4(ptr, a1); + if (var != 0xFF) + sub_8011D6C(1 << var); +} + +void sub_8011DE0(u32 a0) +{ + if (a0 != 0) + { + s32 i; + u8 var = 0; + + for (i = 0; i < 4; i++) + { + if (gUnknown_03005000.unk_cde[i] == a0 && (gUnknown_03005000.unk_ce2 >> i) & 1) + var |= 1 << i; + } + if (var) + sub_8011E94(var, 2); + } +} + +void sub_8011E2C(u8 taskId) +{ + if (gSendCmd[0] == 0 && gUnknown_03005000.unk_ce8 == 0) + { + sub_800FD14(0xED00); + gSendCmd[1] = gTasks[taskId].data[0]; + gSendCmd[2] = gTasks[taskId].data[1]; + gUnknown_03005000.playerCount -= gUnknown_082ED695[gTasks[taskId].data[0]]; + gSendCmd[3] = gUnknown_03005000.playerCount; + DestroyTask(taskId); + } +} + +void sub_8011E94(u32 a0, u32 a1) +{ + u8 taskId = FindTaskIdByFunc(sub_8011E2C); + if (taskId == 0xFF) + { + taskId = CreateTask(sub_8011E2C, 5); + gTasks[taskId].data[0] = a0; + } + else + { + gTasks[taskId].data[0] |= a0; + } + + gTasks[taskId].data[1] = a1; +} + +void sub_8011EF4(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + if (sub_800EE94()) + { + u8 id = sub_8011CE4((u8*)data, ReadU16(&data[8])); + if (id != 0xFF) + { + if (gUnknown_03007890->unk_14[id].unk_02 != 0xFF) + { + gUnknown_03005000.unk_c3d = id; + if (sub_800EEBC()) + DestroyTask(taskId); + } + else if (sub_800F7DC()->unk_0a_0 == 0x15 || sub_800F7DC()->unk_0a_0 == 0x16) + { + data[15]++; + } + else + { + sub_8011A64(2, 0x7000); + DestroyTask(taskId); + } + } + else + { + data[15]++; + gUnknown_03005000.unk_c3d = id; + } + } + else + { + data[15]++; + } + + if (data[15] > 240) + { + sub_8011A64(2, 0x7000); + DestroyTask(taskId); + } +} + +void sub_8011FC8(const u8 *src, u16 trainerId) +{ + u8 taskId; + s16 *data; + + gUnknown_03005000.unk_f1 = 0; + taskId = CreateTask(sub_8011EF4, 3); + data = gTasks[taskId].data; + StringCopy((u8*)(data), src); + data[8] = trainerId; +} + +bool32 sub_801200C(u16 a1, struct UnkLinkRfuStruct_02022B14 *structPtr) +{ + if (sub_800F7DC()->unk_0a_0 == 0x45) + { + if (structPtr->unk_0a_0 != 0x45) + return TRUE; + } + else if (structPtr->unk_0a_0 != 0x40) + { + return TRUE; + } + else if (a1 == 0x44) + { + struct UnkLinkRfuStruct_02022B14 *structPtr2 = &gUnknown_03005000.unk_10A; + if (structPtr2->species == SPECIES_EGG) + { + if (structPtr->species == structPtr2->species) + return FALSE; + else + return TRUE; + } + else if (structPtr->species != structPtr2->species + || structPtr->unk_0b_1 != structPtr2->unk_0b_1 + || structPtr->type != structPtr2->type) + { + return TRUE; + } + } + + return FALSE; +} -- cgit v1.2.3 From c7f52c4203287a88a07376c3e967acf2a231061d Mon Sep 17 00:00:00 2001 From: Melody Date: Sat, 1 Dec 2018 22:49:33 -0500 Subject: cleans up trainer name defines --- src/data/text/trainer_class_names.h | 134 ++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 66 deletions(-) diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index 7a126a128..62529d06e 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -1,73 +1,75 @@ +#include "constants/trainers.h" + #ifndef GUARD_TRAINER_CLASS_NAMES_H #define GUARD_TRAINER_CLASS_NAMES_H const u8 gTrainerClassNames[][13] = { - _("{PKMN} TRAINER"), - _("{PKMN} TRAINER"), - _("HIKER"), - _("TEAM AQUA"), - _("{PKMN} BREEDER"), - _("COOLTRAINER"), - _("BIRD KEEPER"), - _("COLLECTOR"), - _("SWIMMER♂"), - _("TEAM MAGMA"), - _("EXPERT"), - _("AQUA ADMIN"), - _("BLACK BELT"), - _("AQUA LEADER"), - _("HEX MANIAC"), - _("AROMA LADY"), - _("RUIN MANIAC"), - _("INTERVIEWER"), - _("TUBER"), - _("TUBER"), - _("LADY"), - _("BEAUTY"), - _("RICH BOY"), - _("POKéMANIAC"), - _("GUITARIST"), - _("KINDLER"), - _("CAMPER"), - _("PICNICKER"), - _("BUG MANIAC"), - _("PSYCHIC"), - _("GENTLEMAN"), - _("ELITE FOUR"), - _("LEADER"), - _("SCHOOL KID"), - _("SR. AND JR."), - _("WINSTRATE"), - _("POKéFAN"), - _("YOUNGSTER"), - _("CHAMPION"), - _("FISHERMAN"), - _("TRIATHLETE"), - _("DRAGON TAMER"), - _("NINJA BOY"), - _("BATTLE GIRL"), - _("PARASOL LADY"), - _("SWIMMER♀"), - _("TWINS"), - _("SAILOR"), - _("COOLTRAINER"), - _("MAGMA ADMIN"), - _("{PKMN} TRAINER"), - _("BUG CATCHER"), - _("{PKMN} RANGER"), - _("MAGMA LEADER"), - _("LASS"), - _("YOUNG COUPLE"), - _("OLD COUPLE"), - _("SIS AND BRO"), - _("SALON MAIDEN"), - _("DOME ACE"), - _("PALACE MAVEN"), - _("ARENA TYCOON"), - _("FACTORY HEAD"), - _("PIKE QUEEN"), - _("PYRAMID KING"), - _("{PKMN} TRAINER"), + [TRAINER_CLASS_PKMN_TRAINER_1] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_PKMN_TRAINER_2] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_HIKER] = _("HIKER"), + [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"), + [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"), + [TRAINER_CLASS_COOLTRAINER_1] = _("COOLTRAINER"), + [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"), + [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"), + [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"), + [TRAINER_CLASS_TEAM_MAGMA] = _("TEAM MAGMA"), + [TRAINER_CLASS_EXPERT] = _("EXPERT"), + [TRAINER_CLASS_AQUA_ADMIN] = _("AQUA ADMIN"), + [TRAINER_CLASS_BLACK_BELT] = _("BLACK BELT"), + [TRAINER_CLASS_AQUA_LEADER] = _("AQUA LEADER"), + [TRAINER_CLASS_HEX_MANIAC] = _("HEX MANIAC"), + [TRAINER_CLASS_AROMA_LADY] = _("AROMA LADY"), + [TRAINER_CLASS_RUIN_MANIAC] = _("RUIN MANIAC"), + [TRAINER_CLASS_INTERVIEWER] = _("INTERVIEWER"), + [TRAINER_CLASS_TUBER_1] = _("TUBER"), + [TRAINER_CLASS_TUBER_2] = _("TUBER"), + [TRAINER_CLASS_LADY] = _("LADY"), + [TRAINER_CLASS_BEAUTY] = _("BEAUTY"), + [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"), + [TRAINER_CLASS_POKEMANIAC] = _("POKéMANIAC"), + [TRAINER_CLASS_GUITARIST] = _("GUITARIST"), + [TRAINER_CLASS_KINDLER] = _("KINDLER"), + [TRAINER_CLASS_CAMPER] = _("CAMPER"), + [TRAINER_CLASS_PICNICKER] = _("PICNICKER"), + [TRAINER_CLASS_BUG_MANIAC] = _("BUG MANIAC"), + [TRAINER_CLASS_PSYCHIC] = _("PSYCHIC"), + [TRAINER_CLASS_GENTLEMAN] = _("GENTLEMAN"), + [TRAINER_CLASS_ELITE_FOUR] = _("ELITE FOUR"), + [TRAINER_CLASS_LEADER] = _("LEADER"), + [TRAINER_CLASS_SCHOOL_KID] = _("SCHOOL KID"), + [TRAINER_CLASS_SR_AND_JR] = _("SR. AND JR."), + [TRAINER_CLASS_WINSTRATE] = _("WINSTRATE"), + [TRAINER_CLASS_POKEFAN] = _("POKéFAN"), + [TRAINER_CLASS_YOUNGSTER] = _("YOUNGSTER"), + [TRAINER_CLASS_CHAMPION] = _("CHAMPION"), + [TRAINER_CLASS_FISHERMAN] = _("FISHERMAN"), + [TRAINER_CLASS_TRIATHLETE] = _("TRIATHLETE"), + [TRAINER_CLASS_DRAGON_TAMER] = _("DRAGON TAMER"), + [TRAINER_CLASS_NINJA_BOY] = _("NINJA BOY"), + [TRAINER_CLASS_BATTLE_GIRL] = _("BATTLE GIRL"), + [TRAINER_CLASS_PARASOL_LADY] = _("PARASOL LADY"), + [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), + [TRAINER_CLASS_TWINS] = _("TWINS"), + [TRAINER_CLASS_SAILOR] = _("SAILOR"), + [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"), + [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), + [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"), + [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), + [TRAINER_CLASS_PKMN_RANGER] = _("{PKMN} RANGER"), + [TRAINER_CLASS_MAGMA_LEADER] = _("MAGMA LEADER"), + [TRAINER_CLASS_LASS] = _("LASS"), + [TRAINER_CLASS_YOUNG_COUPLE] = _("YOUNG COUPLE"), + [TRAINER_CLASS_OLD_COUPLE] = _("OLD COUPLE"), + [TRAINER_CLASS_SIS_AND_BRO] = _("SIS AND BRO"), + [TRAINER_CLASS_SALON_MAIDEN] = _("SALON MAIDEN"), + [TRAINER_CLASS_DOME_ACE] = _("DOME ACE"), + [TRAINER_CLASS_PALACE_MAVEN] = _("PALACE MAVEN"), + [TRAINER_CLASS_ARENA_TYCOON] = _("ARENA TYCOON"), + [TRAINER_CLASS_FACTORY_HEAD] = _("FACTORY HEAD"), + [TRAINER_CLASS_PIKE_QUEEN] = _("PIKE QUEEN"), + [TRAINER_CLASS_PYRAMID_KING] = _("PYRAMID KING"), + [TRAINER_CLASS_PKMN_TRAINER_4] = _("{PKMN} TRAINER"), }; #endif -- cgit v1.2.3 From b9cf4f27b5361408ff11e19e11921d0beb12050c Mon Sep 17 00:00:00 2001 From: Melody Date: Sat, 1 Dec 2018 22:56:42 -0500 Subject: renames the winstrate graphics names to pokefan --- .../trainers/front_pics/pokefan_f_front_pic.png | Bin 0 -> 849 bytes .../trainers/front_pics/pokefan_m_front_pic.png | Bin 0 -> 786 bytes .../trainers/front_pics/winstrate_f_front_pic.png | Bin 849 -> 0 bytes .../trainers/front_pics/winstrate_m_front_pic.png | Bin 786 -> 0 bytes graphics/trainers/palettes/pokefan_f.pal | 19 +++ graphics/trainers/palettes/pokefan_m.pal | 19 +++ graphics/trainers/palettes/winstrate_f.pal | 19 --- graphics/trainers/palettes/winstrate_m.pal | 19 --- include/constants/trainers.h | 4 +- include/graphics.h | 8 +- src/data/graphics/trainers.h | 8 +- src/data/pokemon/trainer_class_lookups.h | 4 +- src/data/trainer_graphics/front_pic_anims.h | 190 ++++++++++----------- src/data/trainer_graphics/front_pic_tables.h | 8 +- src/data/trainers.h | 34 ++-- 15 files changed, 166 insertions(+), 166 deletions(-) create mode 100644 graphics/trainers/front_pics/pokefan_f_front_pic.png create mode 100644 graphics/trainers/front_pics/pokefan_m_front_pic.png delete mode 100644 graphics/trainers/front_pics/winstrate_f_front_pic.png delete mode 100644 graphics/trainers/front_pics/winstrate_m_front_pic.png create mode 100644 graphics/trainers/palettes/pokefan_f.pal create mode 100644 graphics/trainers/palettes/pokefan_m.pal delete mode 100644 graphics/trainers/palettes/winstrate_f.pal delete mode 100644 graphics/trainers/palettes/winstrate_m.pal diff --git a/graphics/trainers/front_pics/pokefan_f_front_pic.png b/graphics/trainers/front_pics/pokefan_f_front_pic.png new file mode 100644 index 000000000..4d4f9cffe Binary files /dev/null and b/graphics/trainers/front_pics/pokefan_f_front_pic.png differ diff --git a/graphics/trainers/front_pics/pokefan_m_front_pic.png b/graphics/trainers/front_pics/pokefan_m_front_pic.png new file mode 100644 index 000000000..a6dc4a18e Binary files /dev/null and b/graphics/trainers/front_pics/pokefan_m_front_pic.png differ diff --git a/graphics/trainers/front_pics/winstrate_f_front_pic.png b/graphics/trainers/front_pics/winstrate_f_front_pic.png deleted file mode 100644 index 4d4f9cffe..000000000 Binary files a/graphics/trainers/front_pics/winstrate_f_front_pic.png and /dev/null differ diff --git a/graphics/trainers/front_pics/winstrate_m_front_pic.png b/graphics/trainers/front_pics/winstrate_m_front_pic.png deleted file mode 100644 index a6dc4a18e..000000000 Binary files a/graphics/trainers/front_pics/winstrate_m_front_pic.png and /dev/null differ diff --git a/graphics/trainers/palettes/pokefan_f.pal b/graphics/trainers/palettes/pokefan_f.pal new file mode 100644 index 000000000..09728f005 --- /dev/null +++ b/graphics/trainers/palettes/pokefan_f.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 222 205 +238 180 148 +197 139 106 +98 65 57 +90 172 189 +65 123 180 +255 0 255 +32 57 82 +197 205 213 +180 139 90 +131 90 41 +255 98 90 +197 65 65 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/pokefan_m.pal b/graphics/trainers/palettes/pokefan_m.pal new file mode 100644 index 000000000..1d1f48875 --- /dev/null +++ b/graphics/trainers/palettes/pokefan_m.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 197 164 +255 230 205 +222 189 148 +197 156 115 +156 123 82 +49 57 49 +230 90 41 +131 172 222 +172 49 32 +82 123 172 +255 238 74 +213 189 41 +205 205 213 +98 98 74 +255 255 255 +0 0 0 diff --git a/graphics/trainers/palettes/winstrate_f.pal b/graphics/trainers/palettes/winstrate_f.pal deleted file mode 100644 index 09728f005..000000000 --- a/graphics/trainers/palettes/winstrate_f.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -98 65 57 -90 172 189 -65 123 180 -255 0 255 -32 57 82 -197 205 213 -180 139 90 -131 90 41 -255 98 90 -197 65 65 -255 255 255 -0 0 0 diff --git a/graphics/trainers/palettes/winstrate_m.pal b/graphics/trainers/palettes/winstrate_m.pal deleted file mode 100644 index 1d1f48875..000000000 --- a/graphics/trainers/palettes/winstrate_m.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 230 205 -222 189 148 -197 156 115 -156 123 82 -49 57 49 -230 90 41 -131 172 222 -172 49 32 -82 123 172 -255 238 74 -213 189 41 -205 205 213 -98 98 74 -255 255 255 -0 0 0 diff --git a/include/constants/trainers.h b/include/constants/trainers.h index 2ea9f7c62..a87624eb6 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -65,8 +65,8 @@ #define TRAINER_PIC_SCHOOL_KID_M 48 #define TRAINER_PIC_SCHOOL_KID_F 49 #define TRAINER_PIC_SR_AND_JR 50 -#define TRAINER_PIC_WINSTRATE_M 51 -#define TRAINER_PIC_WINSTRATE_F 52 +#define TRAINER_PIC_POKEFAN_M 51 +#define TRAINER_PIC_POKEFAN_F 52 #define TRAINER_PIC_YOUNGSTER 53 #define TRAINER_PIC_CHAMPION_WALLACE 54 #define TRAINER_PIC_FISHERMAN 55 diff --git a/include/graphics.h b/include/graphics.h index 18ff8c693..6ec5c44b2 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2920,8 +2920,8 @@ extern const u32 gTrainerFrontPic_LeaderJuan[]; extern const u32 gTrainerFrontPic_SchoolKidM[]; extern const u32 gTrainerFrontPic_SchoolKidF[]; extern const u32 gTrainerFrontPic_SrAndJr[]; -extern const u32 gTrainerFrontPic_WinstrateM[]; -extern const u32 gTrainerFrontPic_WinstrateF[]; +extern const u32 gTrainerFrontPic_PokefanM[]; +extern const u32 gTrainerFrontPic_PokefanF[]; extern const u32 gTrainerFrontPic_Youngster[]; extern const u32 gTrainerFrontPic_ChampionWallace[]; extern const u32 gTrainerFrontPic_Fisherman[]; @@ -3014,8 +3014,8 @@ extern const u32 gTrainerPalette_LeaderJuan[]; extern const u32 gTrainerPalette_SchoolKidM[]; extern const u32 gTrainerPalette_SchoolKidF[]; extern const u32 gTrainerPalette_SrAndJr[]; -extern const u32 gTrainerPalette_WinstrateM[]; -extern const u32 gTrainerPalette_WinstrateF[]; +extern const u32 gTrainerPalette_PokefanM[]; +extern const u32 gTrainerPalette_PokefanF[]; extern const u32 gTrainerPalette_Youngster[]; extern const u32 gTrainerPalette_ChampionWallace[]; extern const u32 gTrainerPalette_Fisherman[]; diff --git a/src/data/graphics/trainers.h b/src/data/graphics/trainers.h index 79ba703ba..3de77d6ec 100644 --- a/src/data/graphics/trainers.h +++ b/src/data/graphics/trainers.h @@ -151,11 +151,11 @@ const u32 gTrainerPalette_SchoolKidF[] = INCBIN_U32("graphics/trainers/palettes/ const u32 gTrainerFrontPic_SrAndJr[] = INCBIN_U32("graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"); const u32 gTrainerPalette_SrAndJr[] = INCBIN_U32("graphics/trainers/palettes/sr_and_jr.gbapal.lz"); -const u32 gTrainerFrontPic_WinstrateM[] = INCBIN_U32("graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz"); -const u32 gTrainerPalette_WinstrateM[] = INCBIN_U32("graphics/trainers/palettes/winstrate_m.gbapal.lz"); +const u32 gTrainerFrontPic_PokefanM[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_m_front_pic.4bpp.lz"); +const u32 gTrainerPalette_PokefanM[] = INCBIN_U32("graphics/trainers/palettes/pokefan_m.gbapal.lz"); -const u32 gTrainerFrontPic_WinstrateF[] = INCBIN_U32("graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz"); -const u32 gTrainerPalette_WinstrateF[] = INCBIN_U32("graphics/trainers/palettes/winstrate_f.gbapal.lz"); +const u32 gTrainerFrontPic_PokefanF[] = INCBIN_U32("graphics/trainers/front_pics/pokefan_f_front_pic.4bpp.lz"); +const u32 gTrainerPalette_PokefanF[] = INCBIN_U32("graphics/trainers/palettes/pokefan_f.gbapal.lz"); const u32 gTrainerFrontPic_Youngster[] = INCBIN_U32("graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"); const u32 gTrainerPalette_Youngster[] = INCBIN_U32("graphics/trainers/palettes/youngster.gbapal.lz"); diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 02b2016c1..90ceec811 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -44,8 +44,8 @@ const u8 gFacilityClassToPicIndex[] = TRAINER_PIC_SCHOOL_KID_M, // FACILITY_CLASS_SCHOOL_KID_M TRAINER_PIC_SCHOOL_KID_F, // FACILITY_CLASS_SCHOOL_KID_F TRAINER_PIC_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR - TRAINER_PIC_WINSTRATE_M, // FACILITY_CLASS_POKEFAN_1 - TRAINER_PIC_WINSTRATE_F, // FACILITY_CLASS_POKEFAN_2 + TRAINER_PIC_POKEFAN_M, // FACILITY_CLASS_POKEFAN_1 + TRAINER_PIC_POKEFAN_F, // FACILITY_CLASS_POKEFAN_2 TRAINER_PIC_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER TRAINER_PIC_CHAMPION_WALLACE, // FACILITY_CLASS_CHAMPION TRAINER_PIC_FISHERMAN, // FACILITY_CLASS_FISHERMAN diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h index b72726506..537cd557c 100644 --- a/src/data/trainer_graphics/front_pic_anims.h +++ b/src/data/trainer_graphics/front_pic_anims.h @@ -202,11 +202,11 @@ const union AnimCmd *const gTrainerFrontAnims_SrAndJr[] ={ gAnimCmd_General_Frame0, }; -const union AnimCmd *const gTrainerFrontAnims_WinstrateM[] ={ +const union AnimCmd *const gTrainerFrontAnims_PokefanM[] ={ gAnimCmd_General_Frame0, }; -const union AnimCmd *const gTrainerFrontAnims_WinstrateF[] ={ +const union AnimCmd *const gTrainerFrontAnims_PokefanF[] ={ gAnimCmd_General_Frame0, }; @@ -372,97 +372,97 @@ const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = { - gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER - gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M - gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F - gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOL_TRAINER_M - gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER - gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR - gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F - gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M - gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M - gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M - gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M - gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT - gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F - gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE - gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC - gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY - gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC - gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER - gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F - gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M - gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOL_TRAINER_F - gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY - gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY - gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY - gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F - gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC - gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F - gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST - gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER - gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER - gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER - gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC - gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M - gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M - gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F - gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN - gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY - gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE - gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA - gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE - gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE - gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY - gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON - gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY - gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN - gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA - gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA - gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN - gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M - gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F - gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR - gTrainerFrontAnims_WinstrateM, // TRAINER_PIC_WINSTRATE_M - gTrainerFrontAnims_WinstrateF, // TRAINER_PIC_WINSTRATE_F - gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER - gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE - gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN - gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M - gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F - gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M - gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F - gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M - gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F - gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER - gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY - gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL - gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY - gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F - gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS - gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR - gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN - gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY - gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN - gTrainerFrontAnims_May, // TRAINER_PIC_MAY - gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER - gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M - gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F - gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE - gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS - gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE - gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE - gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO - gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN - gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL - gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER - gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER - gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA - gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND - gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY - gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON - gTrainerFrontAnims_Red, // TRAINER_PIC_RED - gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF - gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN - gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RUBY_SAPPHIRE_MAY + gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER + gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M + gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F + gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOL_TRAINER_M + gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER + gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR + gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F + gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M + gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M + gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M + gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M + gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT + gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F + gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE + gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC + gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY + gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC + gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER + gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F + gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M + gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOL_TRAINER_F + gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY + gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY + gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY + gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F + gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC + gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F + gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST + gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER + gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER + gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER + gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC + gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M + gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M + gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F + gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN + gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY + gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE + gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA + gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE + gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE + gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY + gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON + gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY + gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN + gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA + gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA + gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN + gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M + gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F + gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR + gTrainerFrontAnims_PokefanM, // TRAINER_PIC_POKEFAN_M + gTrainerFrontAnims_PokefanF, // TRAINER_PIC_POKEFAN_F + gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER + gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE + gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN + gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M + gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F + gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M + gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F + gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M + gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F + gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER + gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY + gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL + gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY + gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F + gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS + gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR + gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN + gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY + gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN + gTrainerFrontAnims_May, // TRAINER_PIC_MAY + gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER + gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M + gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F + gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE + gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS + gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE + gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE + gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO + gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN + gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL + gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER + gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER + gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA + gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND + gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY + gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON + gTrainerFrontAnims_Red, // TRAINER_PIC_RED + gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF + gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN + gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RUBY_SAPPHIRE_MAY }; diff --git a/src/data/trainer_graphics/front_pic_tables.h b/src/data/trainer_graphics/front_pic_tables.h index db80c9d4f..d8f8c2492 100644 --- a/src/data/trainer_graphics/front_pic_tables.h +++ b/src/data/trainer_graphics/front_pic_tables.h @@ -148,8 +148,8 @@ const struct CompressedSpriteSheet gTrainerFrontPicTable[] = gTrainerFrontPic_SchoolKidM, 0x800, 48, gTrainerFrontPic_SchoolKidF, 0x800, 49, gTrainerFrontPic_SrAndJr, 0x1000, 50, - gTrainerFrontPic_WinstrateM, 0x1000, 51, - gTrainerFrontPic_WinstrateF, 0x800, 52, + gTrainerFrontPic_PokefanM, 0x1000, 51, + gTrainerFrontPic_PokefanF, 0x800, 52, gTrainerFrontPic_Youngster, 0x800, 53, gTrainerFrontPic_ChampionWallace, 0x1000, 54, gTrainerFrontPic_Fisherman, 0x800, 55, @@ -245,8 +245,8 @@ const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[] = gTrainerPalette_SchoolKidM, 48, gTrainerPalette_SchoolKidF, 49, gTrainerPalette_SrAndJr, 50, - gTrainerPalette_WinstrateM, 51, - gTrainerPalette_WinstrateF, 52, + gTrainerPalette_PokefanM, 51, + gTrainerPalette_PokefanF, 52, gTrainerPalette_Youngster, 53, gTrainerPalette_ChampionWallace, 54, gTrainerPalette_Fisherman, 55, diff --git a/src/data/trainers.h b/src/data/trainers.h index 214a72df1..fe087d166 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -4092,7 +4092,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("VICTOR"), .items = {}, .doubleBattle = FALSE, @@ -4106,7 +4106,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4120,7 +4120,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("COLTON"), .items = {}, .doubleBattle = FALSE, @@ -4134,7 +4134,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4148,7 +4148,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4162,7 +4162,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4176,7 +4176,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("MIGUEL"), .items = {}, .doubleBattle = FALSE, @@ -4190,7 +4190,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("VICTORIA"), .items = {}, .doubleBattle = FALSE, @@ -4204,7 +4204,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("VANESSA"), .items = {}, .doubleBattle = FALSE, @@ -4218,7 +4218,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("BETHANY"), .items = {}, .doubleBattle = FALSE, @@ -4232,7 +4232,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -4246,7 +4246,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -4260,7 +4260,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -4274,7 +4274,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -4288,7 +4288,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ISABEL"), .items = {}, .doubleBattle = FALSE, @@ -7032,7 +7032,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_F, + .trainerPic = TRAINER_PIC_POKEFAN_F, .trainerName = _("ANNIKA"), .items = {}, .doubleBattle = FALSE, @@ -9790,7 +9790,7 @@ const struct Trainer gTrainers[] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS, - .trainerPic = TRAINER_PIC_WINSTRATE_M, + .trainerPic = TRAINER_PIC_POKEFAN_M, .trainerName = _("KALEB"), .items = {}, .doubleBattle = FALSE, -- cgit v1.2.3 From c557ac61aef788f1630d3960dd2366bf000db8e0 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 03:37:46 -0500 Subject: adds constants, cleans up callstd and msgbox code * adds some constants for standard script names and messagebox types * replaces some callstd calls with msgbox calls where equivalent * replaces msgbox and callstd calls using raw digits with versions that use the constants --- asm/macros/event.inc | 24 +- data/event_scripts.s | 568 ++++++++++----------- data/maps/AbandonedShip_CaptainsOffice/scripts.inc | 6 +- data/maps/AbandonedShip_Corridors_1F/scripts.inc | 4 +- data/maps/AbandonedShip_Corridors_B1F/scripts.inc | 10 +- .../AbandonedShip_HiddenFloorCorridors/scripts.inc | 18 +- .../AbandonedShip_HiddenFloorRooms/scripts.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/scripts.inc | 20 +- data/maps/AbandonedShip_Rooms2_B1F/scripts.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/scripts.inc | 12 +- data/maps/AbandonedShip_Rooms_B1F/scripts.inc | 2 +- data/maps/AncientTomb/scripts.inc | 2 +- data/maps/AquaHideout_1F/scripts.inc | 16 +- data/maps/AquaHideout_B1F/scripts.inc | 12 +- data/maps/AquaHideout_B2F/scripts.inc | 14 +- .../scripts.inc | 48 +- .../BattleFrontier_BattleArenaCorridor/scripts.inc | 2 +- .../BattleFrontier_BattleArenaLobby/scripts.inc | 46 +- .../scripts.inc | 48 +- .../BattleFrontier_BattleDomeLobby/scripts.inc | 66 ++- .../scripts.inc | 30 +- .../scripts.inc | 20 +- .../BattleFrontier_BattleFactoryLobby/scripts.inc | 44 +- .../scripts.inc | 78 +-- .../scripts.inc | 30 +- .../scripts.inc | 10 +- .../BattleFrontier_BattlePalaceLobby/scripts.inc | 54 +- .../BattleFrontier_BattlePikeCorridor/scripts.inc | 2 +- .../BattleFrontier_BattlePikeLobby/scripts.inc | 42 +- .../scripts.inc | 66 +-- .../scripts.inc | 2 +- .../scripts.inc | 42 +- .../scripts.inc | 84 +-- .../scripts.inc | 3 +- .../BattleFrontier_BattlePyramidLobby/scripts.inc | 102 ++-- .../BattleFrontier_BattlePyramidTop/scripts.inc | 26 +- .../scripts.inc | 24 +- .../scripts.inc | 8 +- .../BattleFrontier_BattleTowerLobby/scripts.inc | 110 ++-- .../scripts.inc | 6 +- data/maps/BattleFrontier_Lounge1/scripts.inc | 40 +- data/maps/BattleFrontier_Lounge2/scripts.inc | 16 +- data/maps/BattleFrontier_Lounge3/scripts.inc | 30 +- data/maps/BattleFrontier_Lounge4/scripts.inc | 6 +- data/maps/BattleFrontier_Lounge5/scripts.inc | 12 +- data/maps/BattleFrontier_Lounge6/scripts.inc | 10 +- data/maps/BattleFrontier_Lounge7/scripts.inc | 24 +- data/maps/BattleFrontier_Lounge8/scripts.inc | 6 +- data/maps/BattleFrontier_Mart/scripts.inc | 8 +- data/maps/BattleFrontier_OutsideEast/scripts.inc | 66 +-- data/maps/BattleFrontier_OutsideWest/scripts.inc | 68 +-- .../BattleFrontier_PokemonCenter_1F/scripts.inc | 8 +- data/maps/BattleFrontier_RankingHall/scripts.inc | 14 +- data/maps/BattleFrontier_ReceptionGate/scripts.inc | 66 +-- data/maps/BattleFrontier_ScottsHouse/scripts.inc | 32 +- data/maps/BirthIsland_Harbor/scripts.inc | 6 +- data/maps/CaveOfOrigin_B1F/scripts.inc | 4 +- data/maps/DesertRuins/scripts.inc | 2 +- data/maps/DewfordTown/scripts.inc | 48 +- data/maps/DewfordTown_Gym/scripts.inc | 32 +- data/maps/DewfordTown_Hall/scripts.inc | 52 +- data/maps/DewfordTown_House1/scripts.inc | 6 +- data/maps/DewfordTown_House2/scripts.inc | 8 +- data/maps/DewfordTown_PokemonCenter_1F/scripts.inc | 4 +- data/maps/EverGrandeCity/scripts.inc | 6 +- data/maps/EverGrandeCity_ChampionsRoom/scripts.inc | 24 +- data/maps/EverGrandeCity_DrakesRoom/scripts.inc | 6 +- data/maps/EverGrandeCity_GlaciasRoom/scripts.inc | 6 +- data/maps/EverGrandeCity_HallOfFame/scripts.inc | 4 +- data/maps/EverGrandeCity_PhoebesRoom/scripts.inc | 6 +- .../EverGrandeCity_PokemonCenter_1F/scripts.inc | 6 +- .../EverGrandeCity_PokemonLeague_1F/scripts.inc | 6 +- data/maps/EverGrandeCity_SidneysRoom/scripts.inc | 6 +- data/maps/FallarborTown/scripts.inc | 16 +- .../FallarborTown_BattleTentBattleRoom/scripts.inc | 12 +- .../maps/FallarborTown_BattleTentLobby/scripts.inc | 52 +- data/maps/FallarborTown_House1/scripts.inc | 22 +- data/maps/FallarborTown_House2/scripts.inc | 16 +- data/maps/FallarborTown_Mart/scripts.inc | 8 +- .../FallarborTown_PokemonCenter_1F/scripts.inc | 6 +- data/maps/FarawayIsland_Entrance/scripts.inc | 8 +- data/maps/FarawayIsland_Interior/scripts.inc | 2 +- data/maps/FortreeCity/scripts.inc | 24 +- data/maps/FortreeCity_DecorationShop/scripts.inc | 8 +- data/maps/FortreeCity_Gym/scripts.inc | 32 +- data/maps/FortreeCity_House1/scripts.inc | 14 +- data/maps/FortreeCity_House2/scripts.inc | 16 +- data/maps/FortreeCity_House3/scripts.inc | 4 +- data/maps/FortreeCity_House4/scripts.inc | 12 +- data/maps/FortreeCity_House5/scripts.inc | 6 +- data/maps/FortreeCity_Mart/scripts.inc | 8 +- data/maps/FortreeCity_PokemonCenter_1F/scripts.inc | 6 +- data/maps/GraniteCave_1F/scripts.inc | 6 +- data/maps/GraniteCave_StevensRoom/scripts.inc | 12 +- data/maps/InsideOfTruck/scripts.inc | 2 +- data/maps/IslandCave/scripts.inc | 2 +- data/maps/JaggedPass/scripts.inc | 28 +- data/maps/LavaridgeTown/scripts.inc | 36 +- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 36 +- data/maps/LavaridgeTown_HerbShop/scripts.inc | 8 +- data/maps/LavaridgeTown_House/scripts.inc | 4 +- data/maps/LavaridgeTown_Mart/scripts.inc | 6 +- .../LavaridgeTown_PokemonCenter_1F/scripts.inc | 6 +- data/maps/LilycoveCity/scripts.inc | 112 ++-- data/maps/LilycoveCity_ContestHall/scripts.inc | 72 +-- data/maps/LilycoveCity_ContestLobby/scripts.inc | 104 ++-- .../maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc | 14 +- .../maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc | 16 +- .../scripts.inc | 26 +- .../LilycoveCity_DepartmentStore_1F/scripts.inc | 40 +- .../LilycoveCity_DepartmentStore_2F/scripts.inc | 10 +- .../LilycoveCity_DepartmentStore_3F/scripts.inc | 10 +- .../LilycoveCity_DepartmentStore_4F/scripts.inc | 10 +- .../LilycoveCity_DepartmentStore_5F/scripts.inc | 16 +- data/maps/LilycoveCity_Harbor/scripts.inc | 50 +- data/maps/LilycoveCity_House1/scripts.inc | 4 +- data/maps/LilycoveCity_House2/scripts.inc | 6 +- data/maps/LilycoveCity_House3/scripts.inc | 16 +- data/maps/LilycoveCity_House4/scripts.inc | 4 +- .../LilycoveCity_LilycoveMuseum_1F/scripts.inc | 44 +- .../LilycoveCity_LilycoveMuseum_2F/scripts.inc | 46 +- .../LilycoveCity_MoveDeletersHouse/scripts.inc | 18 +- .../maps/LilycoveCity_PokemonCenter_1F/scripts.inc | 6 +- .../LilycoveCity_PokemonTrainerFanClub/scripts.inc | 92 ++-- data/maps/LittlerootTown/scripts.inc | 42 +- .../LittlerootTown_BrendansHouse_1F/scripts.inc | 6 +- .../LittlerootTown_BrendansHouse_2F/scripts.inc | 18 +- data/maps/LittlerootTown_MaysHouse_1F/scripts.inc | 16 +- data/maps/LittlerootTown_MaysHouse_2F/scripts.inc | 26 +- .../LittlerootTown_ProfessorBirchsLab/scripts.inc | 106 ++-- data/maps/MagmaHideout_1F/scripts.inc | 4 +- data/maps/MagmaHideout_2F_1R/scripts.inc | 8 +- data/maps/MagmaHideout_2F_2R/scripts.inc | 8 +- data/maps/MagmaHideout_3F_1R/scripts.inc | 4 +- data/maps/MagmaHideout_3F_2R/scripts.inc | 2 +- data/maps/MagmaHideout_4F/scripts.inc | 16 +- data/maps/MauvilleCity/scripts.inc | 64 +-- data/maps/MauvilleCity_BikeShop/scripts.inc | 28 +- data/maps/MauvilleCity_GameCorner/scripts.inc | 82 +-- data/maps/MauvilleCity_Gym/scripts.inc | 32 +- data/maps/MauvilleCity_House1/scripts.inc | 6 +- data/maps/MauvilleCity_House2/scripts.inc | 10 +- data/maps/MauvilleCity_Mart/scripts.inc | 6 +- .../maps/MauvilleCity_PokemonCenter_1F/scripts.inc | 6 +- .../maps/MauvilleCity_PokemonCenter_2F/scripts.inc | 2 +- data/maps/MeteorFalls_1F_1R/scripts.inc | 20 +- data/maps/MeteorFalls_1F_2R/scripts.inc | 24 +- data/maps/MeteorFalls_StevensCave/scripts.inc | 6 +- data/maps/MirageTower_4F/scripts.inc | 8 +- data/maps/MossdeepCity/scripts.inc | 38 +- data/maps/MossdeepCity_GameCorner_1F/scripts.inc | 2 +- data/maps/MossdeepCity_Gym/scripts.inc | 44 +- data/maps/MossdeepCity_House1/scripts.inc | 8 +- data/maps/MossdeepCity_House2/scripts.inc | 6 +- data/maps/MossdeepCity_House3/scripts.inc | 10 +- data/maps/MossdeepCity_House4/scripts.inc | 10 +- data/maps/MossdeepCity_Mart/scripts.inc | 8 +- .../maps/MossdeepCity_PokemonCenter_1F/scripts.inc | 4 +- .../maps/MossdeepCity_PokemonCenter_2F/scripts.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 46 +- data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | 46 +- data/maps/MossdeepCity_StevensHouse/scripts.inc | 18 +- data/maps/MtChimney/scripts.inc | 84 +-- data/maps/MtChimney_CableCarStation/scripts.inc | 6 +- data/maps/MtPyre_1F/scripts.inc | 8 +- data/maps/MtPyre_2F/scripts.inc | 14 +- data/maps/MtPyre_3F/scripts.inc | 12 +- data/maps/MtPyre_4F/scripts.inc | 2 +- data/maps/MtPyre_5F/scripts.inc | 2 +- data/maps/MtPyre_6F/scripts.inc | 10 +- data/maps/MtPyre_Summit/scripts.inc | 32 +- data/maps/NavelRock_Harbor/scripts.inc | 6 +- data/maps/NewMauville_Entrance/scripts.inc | 6 +- data/maps/NewMauville_Inside/scripts.inc | 6 +- data/maps/OldaleTown/scripts.inc | 24 +- data/maps/OldaleTown_House1/scripts.inc | 2 +- data/maps/OldaleTown_House2/scripts.inc | 4 +- data/maps/OldaleTown_Mart/scripts.inc | 10 +- data/maps/OldaleTown_PokemonCenter_1F/scripts.inc | 8 +- data/maps/PacifidlogTown/scripts.inc | 8 +- data/maps/PacifidlogTown_House1/scripts.inc | 4 +- data/maps/PacifidlogTown_House2/scripts.inc | 26 +- data/maps/PacifidlogTown_House3/scripts.inc | 12 +- data/maps/PacifidlogTown_House4/scripts.inc | 10 +- data/maps/PacifidlogTown_House5/scripts.inc | 6 +- .../PacifidlogTown_PokemonCenter_1F/scripts.inc | 6 +- data/maps/PetalburgCity/scripts.inc | 32 +- data/maps/PetalburgCity_Gym/scripts.inc | 116 ++--- data/maps/PetalburgCity_House1/scripts.inc | 4 +- data/maps/PetalburgCity_House2/scripts.inc | 4 +- data/maps/PetalburgCity_Mart/scripts.inc | 10 +- .../PetalburgCity_PokemonCenter_1F/scripts.inc | 12 +- data/maps/PetalburgCity_WallysHouse/scripts.inc | 16 +- data/maps/PetalburgWoods/scripts.inc | 60 +-- data/maps/Route101/scripts.inc | 18 +- data/maps/Route102/scripts.inc | 28 +- data/maps/Route103/scripts.inc | 54 +- data/maps/Route104/scripts.inc | 128 ++--- data/maps/Route104_MrBrineysHouse/scripts.inc | 16 +- .../Route104_PrettyPetalFlowerShop/scripts.inc | 24 +- data/maps/Route105/scripts.inc | 20 +- data/maps/Route106/scripts.inc | 16 +- data/maps/Route107/scripts.inc | 20 +- data/maps/Route108/scripts.inc | 18 +- data/maps/Route109/scripts.inc | 68 +-- data/maps/Route109_SeashoreHouse/scripts.inc | 24 +- data/maps/Route110/scripts.inc | 134 ++--- .../scripts.inc | 4 +- .../scripts.inc | 4 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 58 +-- data/maps/Route110_TrickHouseEntrance/scripts.inc | 80 +-- data/maps/Route110_TrickHousePuzzle1/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle2/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle3/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle4/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle5/scripts.inc | 48 +- data/maps/Route110_TrickHousePuzzle6/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle7/scripts.inc | 12 +- data/maps/Route110_TrickHousePuzzle8/scripts.inc | 6 +- data/maps/Route111/scripts.inc | 112 ++-- data/maps/Route111_OldLadysRestStop/scripts.inc | 8 +- .../Route111_WinstrateFamilysHouse/scripts.inc | 12 +- data/maps/Route112/scripts.inc | 34 +- data/maps/Route112_CableCarStation/scripts.inc | 6 +- data/maps/Route113/scripts.inc | 46 +- data/maps/Route113_GlassWorkshop/scripts.inc | 40 +- data/maps/Route114/scripts.inc | 58 +-- data/maps/Route114_FossilManiacsHouse/scripts.inc | 8 +- data/maps/Route114_FossilManiacsTunnel/scripts.inc | 8 +- data/maps/Route114_LanettesHouse/scripts.inc | 14 +- data/maps/Route115/scripts.inc | 44 +- data/maps/Route116/scripts.inc | 84 +-- data/maps/Route116_TunnelersRestHouse/scripts.inc | 8 +- data/maps/Route117/scripts.inc | 68 +-- data/maps/Route118/scripts.inc | 44 +- data/maps/Route119/scripts.inc | 76 +-- data/maps/Route119_House/scripts.inc | 4 +- data/maps/Route119_WeatherInstitute_1F/scripts.inc | 16 +- data/maps/Route119_WeatherInstitute_2F/scripts.inc | 30 +- data/maps/Route120/scripts.inc | 68 +-- data/maps/Route121/scripts.inc | 48 +- data/maps/Route121_SafariZoneEntrance/scripts.inc | 26 +- data/maps/Route123/scripts.inc | 64 +-- data/maps/Route123_BerryMastersHouse/scripts.inc | 30 +- data/maps/Route124/scripts.inc | 38 +- .../scripts.inc | 20 +- data/maps/Route125/scripts.inc | 24 +- data/maps/Route126/scripts.inc | 22 +- data/maps/Route127/scripts.inc | 22 +- data/maps/Route128/scripts.inc | 42 +- data/maps/Route129/scripts.inc | 10 +- data/maps/Route130/scripts.inc | 6 +- data/maps/Route131/scripts.inc | 16 +- data/maps/Route132/scripts.inc | 16 +- data/maps/Route133/scripts.inc | 14 +- data/maps/Route134/scripts.inc | 18 +- data/maps/RustboroCity/scripts.inc | 100 ++-- data/maps/RustboroCity_CuttersHouse/scripts.inc | 8 +- data/maps/RustboroCity_DevonCorp_1F/scripts.inc | 22 +- data/maps/RustboroCity_DevonCorp_2F/scripts.inc | 42 +- data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 28 +- data/maps/RustboroCity_Flat1_1F/scripts.inc | 4 +- data/maps/RustboroCity_Flat1_2F/scripts.inc | 30 +- data/maps/RustboroCity_Flat2_1F/scripts.inc | 4 +- data/maps/RustboroCity_Flat2_2F/scripts.inc | 6 +- data/maps/RustboroCity_Flat2_3F/scripts.inc | 4 +- data/maps/RustboroCity_Gym/scripts.inc | 24 +- data/maps/RustboroCity_House1/scripts.inc | 12 +- data/maps/RustboroCity_House2/scripts.inc | 4 +- data/maps/RustboroCity_House3/scripts.inc | 6 +- data/maps/RustboroCity_Mart/scripts.inc | 10 +- .../maps/RustboroCity_PokemonCenter_1F/scripts.inc | 6 +- data/maps/RustboroCity_PokemonSchool/scripts.inc | 38 +- data/maps/RusturfTunnel/scripts.inc | 24 +- data/maps/SSTidalCorridor/scripts.inc | 40 +- data/maps/SSTidalLowerDeck/scripts.inc | 4 +- data/maps/SSTidalRooms/scripts.inc | 22 +- data/maps/SafariZone_North/scripts.inc | 4 +- data/maps/SafariZone_Northwest/scripts.inc | 2 +- data/maps/SafariZone_RestHouse/scripts.inc | 6 +- data/maps/SafariZone_South/scripts.inc | 32 +- data/maps/SafariZone_Southwest/scripts.inc | 4 +- data/maps/SeafloorCavern_Entrance/scripts.inc | 4 +- data/maps/SeafloorCavern_Room1/scripts.inc | 4 +- data/maps/SeafloorCavern_Room3/scripts.inc | 4 +- data/maps/SeafloorCavern_Room4/scripts.inc | 4 +- data/maps/SeafloorCavern_Room9/scripts.inc | 28 +- data/maps/SealedChamber_InnerRoom/scripts.inc | 2 +- data/maps/SealedChamber_OuterRoom/scripts.inc | 2 +- .../maps/ShoalCave_LowTideEntranceRoom/scripts.inc | 14 +- data/maps/ShoalCave_LowTideInnerRoom/scripts.inc | 4 +- data/maps/ShoalCave_LowTideLowerRoom/scripts.inc | 6 +- data/maps/ShoalCave_LowTideStairsRoom/scripts.inc | 2 +- data/maps/SkyPillar_Outside/scripts.inc | 10 +- data/maps/SkyPillar_Top/scripts.inc | 4 +- data/maps/SlateportCity/scripts.inc | 166 +++--- .../SlateportCity_BattleTentBattleRoom/scripts.inc | 2 +- .../SlateportCity_BattleTentCorridor/scripts.inc | 12 +- .../maps/SlateportCity_BattleTentLobby/scripts.inc | 42 +- data/maps/SlateportCity_Harbor/scripts.inc | 48 +- data/maps/SlateportCity_House1/scripts.inc | 18 +- data/maps/SlateportCity_House2/scripts.inc | 4 +- data/maps/SlateportCity_Mart/scripts.inc | 6 +- .../SlateportCity_OceanicMuseum_1F/scripts.inc | 54 +- .../SlateportCity_OceanicMuseum_2F/scripts.inc | 48 +- .../SlateportCity_PokemonCenter_1F/scripts.inc | 4 +- data/maps/SlateportCity_PokemonFanClub/scripts.inc | 54 +- .../SlateportCity_SternsShipyard_1F/scripts.inc | 18 +- .../SlateportCity_SternsShipyard_2F/scripts.inc | 4 +- data/maps/SootopolisCity/scripts.inc | 112 ++-- data/maps/SootopolisCity_Gym_1F/scripts.inc | 22 +- data/maps/SootopolisCity_Gym_B1F/scripts.inc | 20 +- data/maps/SootopolisCity_House1/scripts.inc | 8 +- data/maps/SootopolisCity_House2/scripts.inc | 6 +- data/maps/SootopolisCity_House3/scripts.inc | 8 +- data/maps/SootopolisCity_House4/scripts.inc | 6 +- data/maps/SootopolisCity_House5/scripts.inc | 4 +- data/maps/SootopolisCity_House6/scripts.inc | 12 +- data/maps/SootopolisCity_House7/scripts.inc | 4 +- .../SootopolisCity_LotadAndSeedotHouse/scripts.inc | 28 +- data/maps/SootopolisCity_Mart/scripts.inc | 10 +- .../scripts.inc | 20 +- .../scripts.inc | 4 +- .../SootopolisCity_PokemonCenter_1F/scripts.inc | 8 +- data/maps/SouthernIsland_Exterior/scripts.inc | 8 +- data/maps/SouthernIsland_Interior/scripts.inc | 2 +- data/maps/TrainerHill_Elevator/scripts.inc | 2 +- data/maps/TrainerHill_Entrance/scripts.inc | 36 +- data/maps/TrainerHill_Roof/scripts.inc | 18 +- data/maps/Underwater_SeafloorCavern/scripts.inc | 2 +- data/maps/VerdanturfTown/scripts.inc | 20 +- .../scripts.inc | 6 +- .../VerdanturfTown_BattleTentLobby/scripts.inc | 62 +-- .../scripts.inc | 18 +- data/maps/VerdanturfTown_House/scripts.inc | 4 +- data/maps/VerdanturfTown_Mart/scripts.inc | 8 +- .../VerdanturfTown_PokemonCenter_1F/scripts.inc | 4 +- data/maps/VerdanturfTown_WandasHouse/scripts.inc | 26 +- data/maps/VictoryRoad_1F/scripts.inc | 20 +- data/maps/VictoryRoad_B1F/scripts.inc | 10 +- data/maps/VictoryRoad_B2F/scripts.inc | 12 +- data/scripts/berry_tree.inc | 6 +- data/scripts/cable_club.inc | 114 ++--- data/scripts/contest_hall.inc | 66 +-- data/scripts/day_care.inc | 70 +-- data/scripts/field_move_scripts.inc | 40 +- data/scripts/gabby_and_ty.inc | 48 +- data/scripts/mauville_man.inc | 72 +-- data/scripts/mystery_event_club.inc | 24 +- data/scripts/players_house.inc | 68 +-- data/scripts/pokeblocks.inc | 112 ++-- data/scripts/safari_zone.inc | 4 +- data/scripts/secret_power_tm.inc | 8 +- data/scripts/tv.inc | 8 +- 354 files changed, 4538 insertions(+), 4531 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 6b9227442..a1b0b0c62 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -50,6 +50,12 @@ .byte \function .endm + @ callstd function names + STD_OBTAIN_ITEM = 0 + STD_FIND_ITEM = 1 + STD_OBTAIN_DECORATION = 7 + STD_REGISTER_MATCH_CALL = 8 + @ Calls the standard function at index function. .macro callstd function .byte 0x09 @@ -262,7 +268,7 @@ .2byte \output .2byte SPECIAL_\function .endm - + @ temporary solution .macro specialvar_ output, functionId .byte 0x26 @@ -1523,17 +1529,21 @@ goto_eq \dest .endm - .macro msgbox text, type=4 - loadword 0, \text - callstd \type - .endm - @ Message box types + MSGBOX_NPC = 2 + MSGBOX_SIGN = 3 + MSGBOX_DEFAULT = 4 MSGBOX_YESNO = 5 + MSGBOX_AUTOCLOSE = 6 YES = 1 NO = 0 + .macro msgbox text, type=MSGBOX_DEFAULT + loadword 0, \text + callstd \type + .endm + .macro giveitem_std item, amount=1, function=0 setorcopyvar 0x8000, \item setorcopyvar 0x8001, \amount @@ -1542,5 +1552,5 @@ .macro givedecoration_std decoration setorcopyvar 0x8000, \decoration - callstd 7 + callstd STD_OBTAIN_DECORATION .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index 115c9921a..b16e1942e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -47,11 +47,11 @@ gSpecialVars:: @ 81DBA0C gStdScripts:: @ 81DC2A0 .4byte Std_ObtainItem .4byte Std_FindItem - .4byte Std_2 - .4byte Std_3 - .4byte Std_4 - .4byte Std_5 - .4byte Std_6 + .4byte Std_MsgboxNPC + .4byte Std_MsgboxSign + .4byte Std_MsgboxDefault + .4byte Std_MsgboxYesNo + .4byte Std_MsgboxAutoclose .4byte Std_ObtainDecoration .4byte Std_RegisteredInMatchCall .4byte Std_9 @@ -478,7 +478,7 @@ EventScript_23B531:: @ 823B531 end EventScript_23B568:: @ 823B568 - msgbox Text_2766AA, 5 + msgbox Text_2766AA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_23B4D3 closemessage @@ -530,34 +530,34 @@ EventScript_23B5F0:: @ 823B5F0 compare VAR_RESULT, 2 goto_eq EventScript_23B652 special sub_80E980C - msgbox Text_276707, 5 + msgbox Text_276707, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_23B5A1 - msgbox Text_2767D1, 3 + msgbox Text_2767D1, MSGBOX_SIGN special sub_80E9C2C special sub_80FA57C releaseall end EventScript_23B62F:: @ 823B62F - msgbox Text_276731, 5 + msgbox Text_276731, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_23B5A1 - msgbox Text_2767E9, 3 + msgbox Text_2767E9, MSGBOX_SIGN special sub_80E9C2C special sub_80FA57C releaseall end EventScript_23B652:: @ 823B652 - msgbox Text_27676F, 3 + msgbox Text_27676F, MSGBOX_SIGN special sub_80FA57C closemessage releaseall end EventScript_23B660:: @ 823B660 - msgbox Text_276835, 4 + msgbox Text_276835, MSGBOX_DEFAULT goto EventScript_23B5A1 end @@ -602,19 +602,19 @@ EventScript_SecretBaseShieldOrToyTV:: @ 823B68C end EventScript_23B6BC:: @ 823B6BC - msgbox Text_27692B, 3 + msgbox Text_27692B, MSGBOX_SIGN end EventScript_23B6C5:: @ 823B6C5 - msgbox Text_276974, 3 + msgbox Text_276974, MSGBOX_SIGN end EventScript_23B6CE:: @ 823B6CE - msgbox Text_2769B8, 3 + msgbox Text_2769B8, MSGBOX_SIGN end EventScript_23B6D7:: @ 823B6D7 - msgbox Text_2769FF, 3 + msgbox Text_2769FF, MSGBOX_SIGN end gText_23B6E0:: @ 823B6E0 @@ -779,7 +779,7 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/Route119_House/scripts.inc" .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc" -Std_2: @ 8271315 +Std_MsgboxNPC: @ 8271315 lock faceplayer message 0x0 @@ -788,7 +788,7 @@ Std_2: @ 8271315 release return -Std_3: @ 8271320 +Std_MsgboxSign: @ 8271320 lockall message 0x0 waitmessage @@ -796,13 +796,13 @@ Std_3: @ 8271320 releaseall return -Std_4: @ 827132A +Std_MsgboxDefault: @ 827132A message 0x0 waitmessage waitbuttonpress return -Std_5: @ 8271332 +Std_MsgboxYesNo: @ 8271332 message 0x0 waitmessage yesnobox 20, 8 @@ -981,7 +981,7 @@ EventScript_271491:: @ 8271491 releaseall end -Std_6:: @ 8271494 +Std_MsgboxAutoclose:: @ 8271494 message 0x0 waitmessage waitbuttonpress @@ -1401,7 +1401,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E specialvar VAR_RESULT, sub_80C2E40 compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 - msgbox gUnknown_082726EB, 5 + msgbox gUnknown_082726EB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_27195A compare VAR_RESULT, 0 @@ -1476,7 +1476,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A03:: @ 8271A03 OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 checkflag FLAG_0x880 goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 - msgbox gUnknown_08272798, 4 + msgbox gUnknown_08272798, MSGBOX_DEFAULT setflag FLAG_0x880 message OldaleTown_PokemonCenter_1F_Text_278A48 waitmessage @@ -1502,20 +1502,20 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 checkflag FLAG_0x159 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AAC setflag FLAG_0x159 - msgbox gUnknown_082727F5, 4 + msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_272598 waitmovement 0 applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_27259A waitmovement 0 - msgbox gUnknown_08272860, 5 + msgbox gUnknown_08272860, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 return OldaleTown_PokemonCenter_1F_EventScript_271AAC:: @ 8271AAC - msgbox gUnknown_08272982, 5 + msgbox gUnknown_08272982, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 @@ -1589,7 +1589,7 @@ EventScript_271B85:: @ 8271B85 EventScript_271B95:: @ 8271B95 message gUnknown_08272A78 waitfanfare - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -1623,7 +1623,7 @@ EventScript_271BE0:: @ 8271BE0 playfanfare MUS_FANFA4 message gUnknown_08272B09 waitfanfare - msgbox gUnknown_08272B48, 4 + msgbox gUnknown_08272B48, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -1665,11 +1665,11 @@ EventScript_271C3A:: @ 8271C3A special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_eq EventScript_271C86 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT return EventScript_271C86:: @ 8271C86 - msgbox gUnknown_08272AEA, 4 + msgbox gUnknown_08272AEA, MSGBOX_DEFAULT return EventScript_271C8F:: @ 8271C8F @@ -1682,8 +1682,8 @@ EventScript_271C9B:: @ 8271C9B return EventScript_271CA1:: @ 8271CA1 - msgbox gUnknown_08272A78, 4 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272A78, MSGBOX_DEFAULT + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -1727,15 +1727,15 @@ EventScript_271D2A:: @ 8271D2A waitfanfare bufferitemnameplural 1, VAR_0x8004, 1 copyvar VAR_0x8004, VAR_0x8008 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT special sub_80EDCE8 special SetFlagInVar releaseall end EventScript_271D47:: @ 8271D47 - msgbox gUnknown_08272ABF, 4 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272ABF, MSGBOX_DEFAULT + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT setvar VAR_RESULT, 0 releaseall end @@ -1743,7 +1743,7 @@ EventScript_271D47:: @ 8271D47 EventScript_271D5E:: @ 8271D5E lock faceplayer - msgbox Text_27260D, 5 + msgbox Text_27260D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_271D83 compare VAR_RESULT, 0 @@ -1768,7 +1768,7 @@ EventScript_PC:: @ 8271D92 setvar VAR_0x8004, 0 special DoPCTurnOnEffect playse SE_PC_ON - msgbox Text_27265A, 4 + msgbox Text_27265A, MSGBOX_DEFAULT goto EventScript_271DAC end @@ -1791,7 +1791,7 @@ EventScript_271DBC:: @ 8271DBC EventScript_271DF9:: @ 8271DF9 playse SE_PC_LOGIN - msgbox gUnknown_082726C2, 4 + msgbox gUnknown_082726C2, MSGBOX_DEFAULT special PlayerPC waitstate goto EventScript_271DAC @@ -1803,18 +1803,18 @@ EventScript_271E0E:: @ 8271E0E call_if 0, EventScript_271E35 checkflag FLAG_SYS_PC_LANETTE call_if 1, EventScript_271E3E - msgbox gUnknown_082726A3, 4 + msgbox gUnknown_082726A3, MSGBOX_DEFAULT special ShowPokemonStorageSystem waitstate goto EventScript_271DAC end EventScript_271E35:: @ 8271E35 - msgbox gUnknown_0827268C, 4 + msgbox gUnknown_0827268C, MSGBOX_DEFAULT return EventScript_271E3E:: @ 8271E3E - msgbox gUnknown_082726D4, 4 + msgbox gUnknown_082726D4, MSGBOX_DEFAULT return EventScript_271E47:: @ 8271E47 @@ -1845,7 +1845,7 @@ RustboroCity_EventScript_271E6A:: @ 8271E6A SlateportCity_EventScript_271E6A:: @ 8271E6A SootopolisCity_EventScript_271E6A:: @ 8271E6A VerdanturfTown_EventScript_271E6A:: @ 8271E6A - msgbox gUnknown_08272B6A, 3 + msgbox gUnknown_08272B6A, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_271E73:: @ 8271E73 @@ -1864,7 +1864,7 @@ RustboroCity_EventScript_271E73:: @ 8271E73 SlateportCity_EventScript_271E73:: @ 8271E73 SootopolisCity_EventScript_271E73:: @ 8271E73 VerdanturfTown_EventScript_271E73:: @ 8271E73 - msgbox gUnknown_08272B9E, 3 + msgbox gUnknown_08272B9E, MSGBOX_SIGN end BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C @@ -1911,10 +1911,10 @@ EventScript_UseSurf:: @ 8271EA0 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT lockall - msgbox gUnknown_08272FD6, 5 + msgbox gUnknown_08272FD6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_271ED5 - msgbox gUnknown_0827300D, 4 + msgbox gUnknown_0827300D, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_SURF EventScript_271ED5:: @ 8271ED5 @@ -2129,7 +2129,7 @@ SootopolisCity_EventScript_272054:: @ 8272054 SootopolisCity_Gym_1F_EventScript_272054:: @ 8272054 SootopolisCity_House1_EventScript_272054:: @ 8272054 VerdanturfTown_BattleTentLobby_EventScript_272054:: @ 8272054 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT release end @@ -2146,11 +2146,11 @@ Route110_TrickHouseEnd_EventScript_27205E:: @ 827205E Route110_TrickHouseEntrance_EventScript_27205E:: @ 827205E Route113_GlassWorkshop_EventScript_27205E:: @ 827205E SootopolisCity_Gym_1F_EventScript_27205E:: @ 827205E - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT return Route114_LanettesHouse_EventScript_272067:: @ 8272067 - msgbox gUnknown_08272B1A, 4 + msgbox gUnknown_08272B1A, MSGBOX_DEFAULT release end @@ -2159,7 +2159,7 @@ MauvilleCity_GameCorner_EventScript_272071:: @ 8272071 Route110_TrickHouseEnd_EventScript_272071:: @ 8272071 Route110_TrickHouseEntrance_EventScript_272071:: @ 8272071 Route113_GlassWorkshop_EventScript_272071:: @ 8272071 - msgbox gUnknown_08272B1A, 4 + msgbox gUnknown_08272B1A, MSGBOX_DEFAULT return EverGrandeCity_EventScript_27207A:: @ 827207A @@ -2205,7 +2205,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083 EventScript_RegionMap:: @ 827208F lockall - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, MSGBOX_DEFAULT fadescreen 1 special FieldShowRegionMap waitstate @@ -2283,7 +2283,7 @@ Route103_EventScript_272141:: @ 8272141 goto_if 0, Route101_EventScript_1FA2D2 Route101_EventScript_272155:: @ 8272155 - msgbox gUnknown_082A5C9C, 5 + msgbox gUnknown_082A5C9C, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route101_EventScript_27216F call Route101_EventScript_272184 @@ -2291,7 +2291,7 @@ Route101_EventScript_272155:: @ 8272155 end Route101_EventScript_27216F:: @ 827216F - msgbox Route101_Text_2A5CEB, 4 + msgbox Route101_Text_2A5CEB, MSGBOX_DEFAULT release end @@ -2311,7 +2311,7 @@ Route101_EventScript_272184:: @ 8272184 copyvar VAR_0x800A, VAR_RESULT buffernumberstring 0, VAR_0x8008 buffernumberstring 1, VAR_0x8009 - msgbox gUnknown_082A5D2C, 4 + msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT call Route101_EventScript_272179 compare VAR_0x800A, 0 goto_eq Route101_EventScript_27374E @@ -2321,7 +2321,7 @@ Route101_EventScript_272184:: @ 8272184 copyvar VAR_0x8009, VAR_0x8006 buffernumberstring 0, VAR_0x8008 buffernumberstring 1, VAR_0x8009 - msgbox gUnknown_082A633D, 4 + msgbox gUnknown_082A633D, MSGBOX_DEFAULT return BattleFrontier_OutsideWest_EventScript_2721E2:: @ 82721E2 @@ -2494,19 +2494,19 @@ Route120_EventScript_272336:: @ 8272336 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 goto_eq Route119_EventScript_272350 - msgbox Route119_Text_1F5D00, 4 + msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT release end Route119_EventScript_272350:: @ 8272350 - msgbox Route119_Text_1F5D23, 5 + msgbox Route119_Text_1F5D23, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route119_EventScript_272365 release end Route119_EventScript_272365:: @ 8272365 - msgbox Route119_Text_1F5D63, 4 + msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route119_Movement_27259E waitmovement 0 @@ -3077,31 +3077,31 @@ Movement_2725CB:: @ 82725CB step_end EventScript_PictureBookShelf:: @ 82725CE - msgbox Text_2A81E5, 3 + msgbox Text_2A81E5, MSGBOX_SIGN end EventScript_BookShelf:: @ 82725D7 - msgbox Text_2A820D, 3 + msgbox Text_2A820D, MSGBOX_SIGN end EventScript_PokemonCenterBookshelf:: @ 82725E0 - msgbox Text_2A8232, 3 + msgbox Text_2A8232, MSGBOX_SIGN end EventScript_Vase:: @ 82725E9 - msgbox Text_2A8276, 3 + msgbox Text_2A8276, MSGBOX_SIGN end EventScript_TrashCan:: @ 82725F2 - msgbox Text_2A82B3, 3 + msgbox Text_2A82B3, MSGBOX_SIGN end EventScript_ShopShelf:: @ 82725FB - msgbox Text_2A82BF, 3 + msgbox Text_2A82BF, MSGBOX_SIGN end EventScript_Blueprint:: @ 8272604 - msgbox Text_2A82F7, 3 + msgbox Text_2A82F7, MSGBOX_SIGN end Text_27260D: @ 827260D @@ -3321,7 +3321,7 @@ gUnknown_08273684:: @ 8273684 .string "The intense sunshine appears to\nhave subsided…$" EventScript_2736B3:: @ 82736B3 - msgbox gUnknown_08272C98, 3 + msgbox gUnknown_08272C98, MSGBOX_SIGN end EventScript_Poison:: @ 82736BC @@ -3497,7 +3497,7 @@ TerraCave_End_EventScript_273776:: @ 8273776 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 bufferspeciesname 0, VAR_0x8004 - msgbox gUnknown_08273204, 4 + msgbox gUnknown_08273204, MSGBOX_DEFAULT release end @@ -3537,39 +3537,39 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB specialvar VAR_RESULT, sub_813B21C compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 - msgbox gText_PkmnTransferredSomeonesPC, 4 + msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 specialvar VAR_RESULT, get_unknown_box_id bufferboxname 2, 32781 - msgbox gText_PkmnBoxSomeonesPCFull, 4 + msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 specialvar VAR_RESULT, sub_813B21C compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF - msgbox gText_PkmnTransferredLanettesPC, 4 + msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF specialvar VAR_RESULT, get_unknown_box_id bufferboxname 2, 32781 - msgbox gText_PkmnBoxLanettesPCFull, 4 + msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_273811:: @ 8273811 MossdeepCity_StevensHouse_EventScript_273811:: @ 8273811 Route119_WeatherInstitute_2F_EventScript_273811:: @ 8273811 RustboroCity_DevonCorp_2F_EventScript_273811:: @ 8273811 - msgbox gUnknown_0827331C, 4 + msgbox gUnknown_0827331C, MSGBOX_DEFAULT release end EventScript_Questionnaire:: @ 827381B lockall - msgbox gUnknown_0827339F, 5 + msgbox gUnknown_0827339F, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_2738FD setvar VAR_0x8004, 20 @@ -3599,9 +3599,9 @@ EventScript_27386D:: @ 827386D waitmovement 0 applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A waitmovement 0 - msgbox gUnknown_08273506, 4 + msgbox gUnknown_08273506, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_EVENT_ENABLE - msgbox gUnknown_08273559, 4 + msgbox gUnknown_08273559, MSGBOX_DEFAULT releaseall end @@ -3617,9 +3617,9 @@ EventScript_2738B5:: @ 82738B5 waitmovement 0 applymovement VAR_0x8008, BattleFrontier_ReceptionGate_Movement_27259A waitmovement 0 - msgbox gUnknown_08273446, 4 + msgbox gUnknown_08273446, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_GIFT_ENABLE - msgbox gUnknown_082734CC, 4 + msgbox gUnknown_082734CC, MSGBOX_DEFAULT releaseall end @@ -3630,7 +3630,7 @@ EventScript_2738FD:: @ 82738FD EventScript_2738FF:: @ 82738FF applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 - msgbox gUnknown_082733D8, 4 + msgbox gUnknown_082733D8, MSGBOX_DEFAULT releaseall end @@ -3843,12 +3843,12 @@ Route105_EventScript_273D31:: @ 8273D31 end Route105_EventScript_273D51:: @ 8273D51 - msgbox gUnknown_08273656, 4 + msgbox gUnknown_08273656, MSGBOX_DEFAULT goto Route105_EventScript_273D31 end Route105_EventScript_273D5F:: @ 8273D5F - msgbox gUnknown_08273684, 4 + msgbox gUnknown_08273684, MSGBOX_DEFAULT goto Route105_EventScript_273D31 end @@ -4085,7 +4085,7 @@ Std_RegisteredInMatchCall:: @ 82742C9 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox gUnknown_08272E0F, 4 + msgbox gUnknown_08272E0F, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -4443,10 +4443,10 @@ EventScript_275A50:: @ 8275A50 compare VAR_RESULT, 6 goto_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT - msgbox gText_23B704, 5 + msgbox gText_23B704, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE waitstate @@ -4461,12 +4461,12 @@ EventScript_275A86:: @ 8275A86 end EventScript_275A91:: @ 8275A91 - msgbox gText_23B6E0, 4 + msgbox gText_23B6E0, MSGBOX_DEFAULT releaseall end EventScript_275A9B:: @ 8275A9B - msgbox gText_23B73E, 4 + msgbox gText_23B73E, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -4475,10 +4475,10 @@ EventScript_275AA9:: @ 8275AA9 compare VAR_RESULT, 6 goto_eq EventScript_275AEA bufferpartymonnick 0, VAR_RESULT - msgbox Text_274779, 5 + msgbox Text_274779, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_TREE waitstate @@ -4493,12 +4493,12 @@ EventScript_275ADF:: @ 8275ADF end EventScript_275AEA:: @ 8275AEA - msgbox Text_274746, 4 + msgbox Text_274746, MSGBOX_DEFAULT releaseall end EventScript_275AF4:: @ 8275AF4 - msgbox Text_2747C2, 4 + msgbox Text_2747C2, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -4507,10 +4507,10 @@ EventScript_275B02:: @ 8275B02 compare VAR_RESULT, 6 goto_eq EventScript_275B43 bufferpartymonnick 0, VAR_RESULT - msgbox Text_274825, 5 + msgbox Text_274825, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB waitstate @@ -4525,12 +4525,12 @@ EventScript_275B38:: @ 8275B38 end EventScript_275B43:: @ 8275B43 - msgbox Text_2747DD, 4 + msgbox Text_2747DD, MSGBOX_DEFAULT releaseall end EventScript_275B4D:: @ 8275B4D - msgbox Text_274883, 4 + msgbox Text_274883, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -4552,7 +4552,7 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 applymovement 255, SecretBase_RedCave1_Movement_275BB4 waitmovement 0 setvar VAR_0x4097, 1 - msgbox SecretBase_RedCave1_Text_23B759, 5 + msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275BAB closemessage @@ -4600,22 +4600,22 @@ EventScript_275BE8:: @ 8275BE8 setorcopyvar VAR_0x8004, VAR_RESULT lockall special GetSecretBaseNearbyMapName - msgbox Text_276A3D, 5 + msgbox Text_276A3D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE - msgbox Text_2766AA, 5 + msgbox Text_2766AA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE fadescreenswapbuffers 1 special sub_80E9B70 closemessage fadescreenswapbuffers 0 - msgbox Text_276A95, 5 + msgbox Text_276A95, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_275CDE bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage closemessage compare VAR_0x8007, 1 @@ -4763,7 +4763,7 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 goto_if 0, SecretBase_RedCave1_EventScript_275E25 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275E44 - msgbox SecretBase_RedCave1_Text_2748A0, 5 + msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275E2F setvar VAR_RESULT, 1 @@ -4771,12 +4771,12 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275E2F - msgbox SecretBase_RedCave1_Text_274939, 4 + msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_275E25:: @ 8275E25 - msgbox SecretBase_RedCave1_Text_2749ED, 4 + msgbox SecretBase_RedCave1_Text_2749ED, MSGBOX_DEFAULT release end @@ -4784,12 +4784,12 @@ SecretBase_RedCave1_EventScript_275E2F:: @ 8275E2F special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27494D, 4 + msgbox SecretBase_RedCave1_Text_27494D, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 - msgbox SecretBase_RedCave1_Text_2749AA, 4 + msgbox SecretBase_RedCave1_Text_2749AA, MSGBOX_DEFAULT release end @@ -4800,7 +4800,7 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E goto_if 0, SecretBase_RedCave1_EventScript_275E9D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275EBC - msgbox SecretBase_RedCave1_Text_274C13, 5 + msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275EA7 setvar VAR_RESULT, 1 @@ -4808,12 +4808,12 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275EA7 - msgbox SecretBase_RedCave1_Text_274CB0, 4 + msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_275E9D:: @ 8275E9D - msgbox SecretBase_RedCave1_Text_274D69, 4 + msgbox SecretBase_RedCave1_Text_274D69, MSGBOX_DEFAULT release end @@ -4821,12 +4821,12 @@ SecretBase_RedCave1_EventScript_275EA7:: @ 8275EA7 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274CDA, 4 + msgbox SecretBase_RedCave1_Text_274CDA, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC - msgbox SecretBase_RedCave1_Text_274D34, 4 + msgbox SecretBase_RedCave1_Text_274D34, MSGBOX_DEFAULT release end @@ -4837,7 +4837,7 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 goto_if 0, SecretBase_RedCave1_EventScript_275F15 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275F34 - msgbox SecretBase_RedCave1_Text_274F39, 5 + msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F1F setvar VAR_RESULT, 1 @@ -4845,12 +4845,12 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F1F - msgbox SecretBase_RedCave1_Text_274FCA, 4 + msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_275F15:: @ 8275F15 - msgbox SecretBase_RedCave1_Text_2750A4, 4 + msgbox SecretBase_RedCave1_Text_2750A4, MSGBOX_DEFAULT release end @@ -4858,12 +4858,12 @@ SecretBase_RedCave1_EventScript_275F1F:: @ 8275F1F special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274FDA, 4 + msgbox SecretBase_RedCave1_Text_274FDA, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 - msgbox SecretBase_RedCave1_Text_27502A, 4 + msgbox SecretBase_RedCave1_Text_27502A, MSGBOX_DEFAULT release end @@ -4874,7 +4874,7 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E goto_if 0, SecretBase_RedCave1_EventScript_275F8D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275FAC - msgbox SecretBase_RedCave1_Text_275287, 5 + msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F97 setvar VAR_RESULT, 1 @@ -4882,12 +4882,12 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F97 - msgbox SecretBase_RedCave1_Text_275315, 4 + msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_275F8D:: @ 8275F8D - msgbox SecretBase_RedCave1_Text_2753AB, 4 + msgbox SecretBase_RedCave1_Text_2753AB, MSGBOX_DEFAULT release end @@ -4895,12 +4895,12 @@ SecretBase_RedCave1_EventScript_275F97:: @ 8275F97 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275330, 4 + msgbox SecretBase_RedCave1_Text_275330, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC - msgbox SecretBase_RedCave1_Text_275374, 4 + msgbox SecretBase_RedCave1_Text_275374, MSGBOX_DEFAULT release end @@ -4911,7 +4911,7 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 goto_if 0, SecretBase_RedCave1_EventScript_276005 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276024 - msgbox SecretBase_RedCave1_Text_2755D2, 5 + msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_27600F setvar VAR_RESULT, 1 @@ -4919,12 +4919,12 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_27600F - msgbox SecretBase_RedCave1_Text_275679, 4 + msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_276005:: @ 8276005 - msgbox SecretBase_RedCave1_Text_27571E, 4 + msgbox SecretBase_RedCave1_Text_27571E, MSGBOX_DEFAULT release end @@ -4932,12 +4932,12 @@ SecretBase_RedCave1_EventScript_27600F:: @ 827600F special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275696, 4 + msgbox SecretBase_RedCave1_Text_275696, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_276024:: @ 8276024 - msgbox SecretBase_RedCave1_Text_2756EF, 4 + msgbox SecretBase_RedCave1_Text_2756EF, MSGBOX_DEFAULT release end @@ -4948,7 +4948,7 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E goto_if 0, SecretBase_RedCave1_EventScript_27607D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27609C - msgbox SecretBase_RedCave1_Text_274A64, 5 + msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276087 setvar VAR_RESULT, 1 @@ -4956,12 +4956,12 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276087 - msgbox SecretBase_RedCave1_Text_274AFA, 4 + msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_27607D:: @ 827607D - msgbox SecretBase_RedCave1_Text_274BA2, 4 + msgbox SecretBase_RedCave1_Text_274BA2, MSGBOX_DEFAULT release end @@ -4969,12 +4969,12 @@ SecretBase_RedCave1_EventScript_276087:: @ 8276087 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274B0B, 4 + msgbox SecretBase_RedCave1_Text_274B0B, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_27609C:: @ 827609C - msgbox SecretBase_RedCave1_Text_274B6C, 4 + msgbox SecretBase_RedCave1_Text_274B6C, MSGBOX_DEFAULT release end @@ -4985,7 +4985,7 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 goto_if 0, SecretBase_RedCave1_EventScript_2760F5 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276114 - msgbox SecretBase_RedCave1_Text_274DD2, 5 + msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2760FF setvar VAR_RESULT, 1 @@ -4993,12 +4993,12 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2760FF - msgbox SecretBase_RedCave1_Text_274E41, 4 + msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_2760F5:: @ 82760F5 - msgbox SecretBase_RedCave1_Text_274EF1, 4 + msgbox SecretBase_RedCave1_Text_274EF1, MSGBOX_DEFAULT release end @@ -5006,12 +5006,12 @@ SecretBase_RedCave1_EventScript_2760FF:: @ 82760FF special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274E5A, 4 + msgbox SecretBase_RedCave1_Text_274E5A, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_276114:: @ 8276114 - msgbox SecretBase_RedCave1_Text_274EB3, 4 + msgbox SecretBase_RedCave1_Text_274EB3, MSGBOX_DEFAULT release end @@ -5022,7 +5022,7 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E goto_if 0, SecretBase_RedCave1_EventScript_27616D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27618C - msgbox SecretBase_RedCave1_Text_275114, 5 + msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276177 setvar VAR_RESULT, 1 @@ -5030,12 +5030,12 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276177 - msgbox SecretBase_RedCave1_Text_2751AF, 4 + msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_27616D:: @ 827616D - msgbox SecretBase_RedCave1_Text_275226, 4 + msgbox SecretBase_RedCave1_Text_275226, MSGBOX_DEFAULT release end @@ -5043,12 +5043,12 @@ SecretBase_RedCave1_EventScript_276177:: @ 8276177 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2751CA, 4 + msgbox SecretBase_RedCave1_Text_2751CA, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_27618C:: @ 827618C - msgbox SecretBase_RedCave1_Text_2751EC, 4 + msgbox SecretBase_RedCave1_Text_2751EC, MSGBOX_DEFAULT release end @@ -5059,7 +5059,7 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196 goto_if 0, SecretBase_RedCave1_EventScript_2761E5 compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276204 - msgbox SecretBase_RedCave1_Text_275405, 5 + msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2761EF setvar VAR_RESULT, 1 @@ -5067,12 +5067,12 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196 call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2761EF - msgbox SecretBase_RedCave1_Text_2754B2, 4 + msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_2761E5:: @ 82761E5 - msgbox SecretBase_RedCave1_Text_275546, 4 + msgbox SecretBase_RedCave1_Text_275546, MSGBOX_DEFAULT release end @@ -5080,12 +5080,12 @@ SecretBase_RedCave1_EventScript_2761EF:: @ 82761EF special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2754D8, 4 + msgbox SecretBase_RedCave1_Text_2754D8, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_276204:: @ 8276204 - msgbox SecretBase_RedCave1_Text_27550C, 4 + msgbox SecretBase_RedCave1_Text_27550C, MSGBOX_DEFAULT release end @@ -5096,7 +5096,7 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E goto_if 0, SecretBase_RedCave1_EventScript_27625D compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27627C - msgbox SecretBase_RedCave1_Text_2757B5, 5 + msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276267 setvar VAR_RESULT, 1 @@ -5104,12 +5104,12 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276267 - msgbox SecretBase_RedCave1_Text_275884, 4 + msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end SecretBase_RedCave1_EventScript_27625D:: @ 827625D - msgbox SecretBase_RedCave1_Text_275944, 4 + msgbox SecretBase_RedCave1_Text_275944, MSGBOX_DEFAULT release end @@ -5117,12 +5117,12 @@ SecretBase_RedCave1_EventScript_276267:: @ 8276267 special sub_80EB300 setvar VAR_RESULT, 0 special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27589D, 4 + msgbox SecretBase_RedCave1_Text_27589D, MSGBOX_DEFAULT release end SecretBase_RedCave1_EventScript_27627C:: @ 827627C - msgbox SecretBase_RedCave1_Text_275909, 4 + msgbox SecretBase_RedCave1_Text_275909, MSGBOX_DEFAULT release end @@ -5511,7 +5511,7 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C879 copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280674, 5 + msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C827 compare VAR_RESULT, 0 @@ -5519,7 +5519,7 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 end SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 - msgbox SlateportCity_PokemonFanClub_Text_28073B, 4 + msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT setvar VAR_0x8004, 5 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 @@ -5533,18 +5533,18 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 end SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C - msgbox SlateportCity_PokemonFanClub_Text_2805E2, 4 + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866 - msgbox SlateportCity_PokemonFanClub_Text_280789, 4 + msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT setvar VAR_0x8005, 1 goto SlateportCity_PokemonFanClub_EventScript_28C7E9 end SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 - msgbox SlateportCity_PokemonFanClub_Text_28062E, 4 + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT release end @@ -5559,7 +5559,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 checkflag FLAG_0x069 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 setflag FLAG_0x069 - msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, 5 + msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 compare VAR_RESULT, 0 @@ -5567,7 +5567,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 end SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 - msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, 5 + msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 compare VAR_RESULT, 0 @@ -5575,7 +5575,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 end SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 - msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT setvar VAR_0x8004, 5 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 @@ -5589,18 +5589,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 end SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C - msgbox SlateportCity_OceanicMuseum_1F_Text_281367, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT release end SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926 - msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT setvar VAR_0x8005, 2 goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 end SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 - msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT release end @@ -5615,7 +5615,7 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA4F copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280270, 5 + msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C98C compare VAR_RESULT, 0 @@ -5623,7 +5623,7 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 end SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C - msgbox SlateportCity_PokemonFanClub_Text_28034F, 4 + msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT random 3 copyvar VAR_0x800A, VAR_RESULT switch VAR_RESULT @@ -5633,17 +5633,17 @@ SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C end SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3 - msgbox SlateportCity_PokemonFanClub_Text_280393, 4 + msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_28C9ED end SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1 - msgbox SlateportCity_PokemonFanClub_Text_2803EF, 4 + msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_28C9ED end SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF - msgbox SlateportCity_PokemonFanClub_Text_280454, 4 + msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_28C9ED end @@ -5656,26 +5656,26 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED faceplayer compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_2804AC, 4 + msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT setvar VAR_0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_280523, 4 + msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT copyvar VAR_0x8007, VAR_0x800A setvar VAR_0x8005, 3 goto SlateportCity_PokemonFanClub_EventScript_28C7E9 end SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45 - msgbox SlateportCity_PokemonFanClub_Text_2805E2, 4 + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F - msgbox SlateportCity_PokemonFanClub_Text_28062E, 4 + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT release end @@ -5689,7 +5689,7 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 copyvar VAR_0x8009, VAR_0x8006 - msgbox LilycoveCity_ContestLobby_Text_27EF15, 5 + msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_28CA9B compare VAR_RESULT, 0 @@ -5697,7 +5697,7 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 end LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B - msgbox LilycoveCity_ContestLobby_Text_27EFE7, 4 + msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT setvar VAR_0x8004, 11 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 0 @@ -5711,14 +5711,14 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B end LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F1EF, 4 + msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA setvar VAR_0x8004, 24 special SetContestCategoryStringVarForInterview - msgbox LilycoveCity_ContestLobby_Text_27F03E, 4 + msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT setvar VAR_0x8004, 11 copyvar VAR_0x8005, VAR_0x8009 setvar VAR_0x8006, 1 @@ -5727,14 +5727,14 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA faceplayer compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F0EC, 4 + msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT setflag FLAG_TEMP_2 setvar VAR_0x8005, 6 goto LilycoveCity_ContestLobby_EventScript_28C7E9 end LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 - msgbox LilycoveCity_ContestLobby_Text_27F23F, 4 + msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT release end @@ -5771,7 +5771,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A copyvar VAR_0x8009, VAR_0x8006 - msgbox BattleFrontier_BattleTowerLobby_Text_27F704, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 compare VAR_RESULT, 0 @@ -5787,7 +5787,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC38 compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT setvar VAR_0x8004, 12 copyvar VAR_0x8005, VAR_0x8009 call BattleFrontier_BattleTowerLobby_EventScript_271E7C @@ -5800,22 +5800,22 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 end BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E - msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 - msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F921, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT setflag FLAG_TEMP_2 copyvar VAR_0x8004, VAR_0x8008 setvar VAR_0x8005, 7 @@ -5823,12 +5823,12 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A end BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A - msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT release end @@ -5862,7 +5862,7 @@ EventScript_2926F8:: @ 82926F8 .include "data/scripts/players_house.inc" EventScript_RunningShoesManual:: @ 8292DE5 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, 3 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, MSGBOX_SIGN end .include "data/scripts/pokeblocks.inc" @@ -5933,7 +5933,7 @@ gUnknown_082944D5:: @ 82944D5 .include "data/text/trainers.inc" EventScript_RepelWoreOff:: @ 82A4B2A - msgbox Text_RepelWoreOff, 3 + msgbox Text_RepelWoreOff, MSGBOX_SIGN end Text_RepelWoreOff: @ 82A4B33 @@ -6059,7 +6059,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818DBE8 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 @@ -6070,13 +6070,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 end LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 special sub_818DC2C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818DC60 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 @@ -6095,17 +6095,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 end LilycoveCity_PokemonCenter_1F_EventScript_2A8419:: @ 82A8419 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 end LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 end LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 compare VAR_RESULT, 1 @@ -6113,12 +6113,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 end LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A845E:: @ 82A845E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A846C end @@ -6134,7 +6134,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C end LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 compare VAR_RESULT, 0 @@ -6151,7 +6151,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 special sub_818DC2C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, MSGBOX_DEFAULT release end @@ -6165,20 +6165,20 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2 special sub_818DC2C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A84FF:: @ 82A84FF special sub_818DC2C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8510 end LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 setvar VAR_0x8004, 0 specialvar VAR_0x8004, sub_818DEA0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT giveitem_std VAR_0x8004 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 @@ -6187,7 +6187,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 end LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, MSGBOX_DEFAULT release end @@ -6199,7 +6199,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A854F:: @ 82A854F LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E038 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 @@ -6228,23 +6228,23 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC end LilycoveCity_PokemonCenter_1F_EventScript_2A85C8:: @ 82A85C8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A85D2:: @ 82A85D2 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE end LilycoveCity_PokemonCenter_1F_EventScript_2A85E0:: @ 82A85E0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE end LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE setvar VAR_0x8004, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C compare VAR_RESULT, 0 @@ -6252,7 +6252,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE end LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, MSGBOX_DEFAULT release end @@ -6283,7 +6283,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 end LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F compare VAR_RESULT, 0 @@ -6291,13 +6291,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 end LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 special sub_818E37C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E308 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 @@ -6309,7 +6309,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86B0:: @ 82A86B0 playse SE_SEIKAI delay 10 playse SE_SEIKAI - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A86EC end @@ -6319,8 +6319,8 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 playse SE_HAZURE delay 10 playse SE_HAZURE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90A5, 4 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90CD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90A5, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90CD, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 end @@ -6333,12 +6333,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC end LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 end LilycoveCity_PokemonCenter_1F_EventScript_2A8716:: @ 82A8716 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 end @@ -6353,13 +6353,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724 end LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, MSGBOX_DEFAULT special sub_818E39C release end LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 compare VAR_RESULT, 0 @@ -6368,12 +6368,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778 special sub_818E3EC - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A8785:: @ 82A8785 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, MSGBOX_DEFAULT LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D fadescreen 1 @@ -6387,7 +6387,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D end LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 compare VAR_RESULT, 0 @@ -6395,7 +6395,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF end LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, MSGBOX_DEFAULT special sub_818E430 special sub_818E3BC setvar VAR_0x8004, 16 @@ -6410,7 +6410,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1 end LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 compare VAR_RESULT, 0 @@ -6421,14 +6421,14 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817 special sub_818E490 special sub_818E4A4 special sub_818E510 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E8B4 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 @@ -6445,17 +6445,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 end LilycoveCity_PokemonCenter_1F_EventScript_2A886C:: @ 82A886C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 special sub_818E914 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 compare VAR_RESULT, 1 @@ -6463,7 +6463,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 end LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, MSGBOX_DEFAULT release end @@ -6478,7 +6478,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA end LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, 5 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 compare VAR_RESULT, 0 @@ -6486,7 +6486,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 end LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, MSGBOX_DEFAULT special sub_818E940 special sub_818E960 goto LilycoveCity_PokemonCenter_1F_EventScript_2A890A @@ -6524,13 +6524,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C end LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F end LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E special sub_818E914 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F end @@ -6542,13 +6542,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F end LilycoveCity_PokemonCenter_1F_EventScript_2A89A1:: @ 82A89A1 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, MSGBOX_DEFAULT special PutLilycoveContestLadyShowOnTheAir release end LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, MSGBOX_DEFAULT release end @@ -6598,7 +6598,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, MSGBOX_DEFAULT waitmoncry release end @@ -6608,7 +6608,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D:: @ 82A8A1D faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, MSGBOX_DEFAULT waitmoncry release end @@ -6618,7 +6618,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A30:: @ 82A8A30 faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, MSGBOX_DEFAULT waitmoncry release end @@ -6628,7 +6628,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A43:: @ 82A8A43 faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, MSGBOX_DEFAULT waitmoncry release end @@ -6638,7 +6638,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A56:: @ 82A8A56 faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, MSGBOX_DEFAULT waitmoncry release end @@ -9856,7 +9856,7 @@ gText_MrStone_Pokenav_2B67ED:: @ 82B67ED .string "sometime!$" .include "data/scripts/apprentice.inc" - + gBattleDomeOpponentPotential1:: .string "The best candidate to be a champ!$" @@ -9865,7 +9865,7 @@ gBattleDomeOpponentPotential2:: gBattleDomeOpponentPotential3:: .string "A likely top-three finisher.$" - + gBattleDomeOpponentPotential4:: .string "A candidate to finish first.$" @@ -9908,7 +9908,7 @@ gBattleDomeOpponentPotential16:: gBattleDomeOpponentPotential17:: .string "The perfect, invincible superstar!$" -gBattleDomeOpponentStyle1:: +gBattleDomeOpponentStyle1:: .string "Willing to risk total disaster at times.$" gBattleDomeOpponentStyle2:: @@ -10350,7 +10350,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT closemessage end @@ -10363,7 +10363,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT closemessage end @@ -10472,7 +10472,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D setvar VAR_TEMP_3, 0 setvar VAR_TEMP_2, 0 lockall - msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, 4 + msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT closemessage end @@ -11332,13 +11332,13 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 faceplayer checkflag FLAG_0x1B1 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6E37, 5 + msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A call SlateportCity_PokemonFanClub_EventScript_2C832D compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F66, 4 + msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT setvar VAR_0x8005, 23 call SlateportCity_PokemonFanClub_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11348,12 +11348,12 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 end SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F33, 4 + msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, 4 + msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT release end @@ -11362,13 +11362,13 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E faceplayer checkflag FLAG_0x1B2 goto_eq MauvilleCity_EventScript_2C7FDC - msgbox MauvilleCity_Text_2C6FDB, 5 + msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_2C7FD2 call MauvilleCity_EventScript_2C832D compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_2C7FD2 - msgbox MauvilleCity_Text_2C70F3, 4 + msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT setvar VAR_0x8005, 16 call MauvilleCity_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11378,12 +11378,12 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E end MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2 - msgbox MauvilleCity_Text_2C70C4, 4 + msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT release end MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC - msgbox MauvilleCity_Text_2C7133, 4 + msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT release end @@ -11392,13 +11392,13 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 faceplayer checkflag FLAG_0x1B3 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, 5 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, 4 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT setvar VAR_0x8005, 29 call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11408,12 +11408,12 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 end VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, 4 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT release end VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, 4 + msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT release end @@ -11422,13 +11422,13 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E faceplayer checkflag FLAG_0x1B4 goto_eq LavaridgeTown_House_EventScript_2C80AC - msgbox LavaridgeTown_House_Text_2C72B6, 5 + msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LavaridgeTown_House_EventScript_2C80A2 call LavaridgeTown_House_EventScript_2C832D compare VAR_RESULT, 0 goto_eq LavaridgeTown_House_EventScript_2C80A2 - msgbox LavaridgeTown_House_Text_2C73B1, 4 + msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT setvar VAR_0x8005, 7 call LavaridgeTown_House_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11438,12 +11438,12 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E end LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2 - msgbox LavaridgeTown_House_Text_2C737F, 4 + msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT release end LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC - msgbox LavaridgeTown_House_Text_2C73F6, 4 + msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT release end @@ -11452,13 +11452,13 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 faceplayer checkflag FLAG_0x1B5 goto_eq FallarborTown_Mart_EventScript_2C8114 - msgbox FallarborTown_Mart_Text_2C7449, 5 + msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FallarborTown_Mart_EventScript_2C810A call FallarborTown_Mart_EventScript_2C832D compare VAR_RESULT, 0 goto_eq FallarborTown_Mart_EventScript_2C810A - msgbox FallarborTown_Mart_Text_2C7582, 4 + msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT setvar VAR_0x8005, 8 call FallarborTown_Mart_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11468,12 +11468,12 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 end FallarborTown_Mart_EventScript_2C810A:: @ 82C810A - msgbox FallarborTown_Mart_Text_2C7556, 4 + msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT release end FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 - msgbox FallarborTown_Mart_Text_2C75B5, 4 + msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT release end @@ -11482,13 +11482,13 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E faceplayer checkflag FLAG_0x1B6 goto_eq FortreeCity_House2_EventScript_2C817C - msgbox FortreeCity_House2_Text_2C7637, 5 + msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_2C8172 call FortreeCity_House2_EventScript_2C832D compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_2C8172 - msgbox FortreeCity_House2_Text_2C7721, 4 + msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT setvar VAR_0x8005, 24 call FortreeCity_House2_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11498,12 +11498,12 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E end FortreeCity_House2_EventScript_2C8172:: @ 82C8172 - msgbox FortreeCity_House2_Text_2C76E2, 4 + msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_2C817C:: @ 82C817C - msgbox FortreeCity_House2_Text_2C775A, 4 + msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT release end @@ -11512,13 +11512,13 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 faceplayer checkflag FLAG_0x1B7 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, 5 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT setvar VAR_0x8005, 14 call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11528,12 +11528,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 end LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT release end @@ -11542,13 +11542,13 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE faceplayer checkflag FLAG_0x1B8 goto_eq MossdeepCity_EventScript_2C824C - msgbox MossdeepCity_Text_2C79A6, 5 + msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_2C8242 call MossdeepCity_EventScript_2C832D compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_2C8242 - msgbox MossdeepCity_Text_2C7B0D, 4 + msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT setvar VAR_0x8005, 15 call MossdeepCity_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11558,12 +11558,12 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE end MossdeepCity_EventScript_2C8242:: @ 82C8242 - msgbox MossdeepCity_Text_2C7AD4, 4 + msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT release end MossdeepCity_EventScript_2C824C:: @ 82C824C - msgbox MossdeepCity_Text_2C7B4F, 4 + msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT release end @@ -11572,13 +11572,13 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 faceplayer checkflag FLAG_0x1B9 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, 5 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA call SootopolisCity_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT setvar VAR_0x8005, 4 call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11588,12 +11588,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 end SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT release end @@ -11602,13 +11602,13 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE faceplayer checkflag FLAG_0x1BA goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, 5 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, 4 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT setvar VAR_0x8005, 12 call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 @@ -11618,12 +11618,12 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE end PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, 4 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT release end PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, 4 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT release end @@ -11653,7 +11653,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D - msgbox MauvilleCity_Text_2C6E05, 5 + msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO return TrainerHill_1F_MapScript1_2C8336: @ 82C8336 @@ -11697,7 +11697,7 @@ EventScript_TrainerHillTimer:: @ 82C8393 lockall setvar VAR_0x8004, 7 special sp194_trainer_tower - msgbox TrainerHill_Entrance_Text_268D47, 4 + msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT releaseall end @@ -11747,7 +11747,7 @@ Text_ThisIsATestSignpostMsg:: @ 82C840A .string "This is a signpost.$" EventScript_TestSignpostMsg:: @ 82C8436 - msgbox Text_ThisIsATestSignpostMsg, 3 + msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN end gText_082C843F:: @ 82C843F diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index ee4b69f24..0cec9f04e 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -11,17 +11,17 @@ AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A - msgbox AbandonedShip_CaptainsOffice_Text_238824, 4 + msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT release end AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810 - msgbox AbandonedShip_CaptainsOffice_Text_23889D, 4 + msgbox AbandonedShip_CaptainsOffice_Text_23889D, MSGBOX_DEFAULT release end AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A - msgbox AbandonedShip_CaptainsOffice_Text_238918, 4 + msgbox AbandonedShip_CaptainsOffice_Text_238918, MSGBOX_DEFAULT release end diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 39c7861a1..bf40bcae5 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -2,12 +2,12 @@ AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4 .byte 0 AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 - msgbox AbandonedShip_Corridors_1F_Text_237A60, 2 + msgbox AbandonedShip_Corridors_1F_Text_237A60, MSGBOX_NPC end AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 - msgbox AbandonedShip_Corridors_1F_Text_237A1B, 6 + msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE end AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index f19dfe322..c1106048f 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -23,7 +23,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5 return AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF - msgbox AbandonedShip_Corridors_B1F_Text_237F03, 2 + msgbox AbandonedShip_Corridors_B1F_Text_237F03, MSGBOX_NPC end AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 @@ -33,7 +33,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 checkitem ITEM_STORAGE_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_0x0EF @@ -43,18 +43,18 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 end AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F15, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237F15, MSGBOX_DEFAULT releaseall end AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 - msgbox AbandonedShip_Corridors_B1F_Text_237FA5, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237FA5, MSGBOX_DEFAULT releaseall end AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 - msgbox AbandonedShip_Corridors_B1F_Text_237E92, 6 + msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE end AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 2cd278f91..e3c3ced5c 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -65,7 +65,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 checkitem ITEM_ROOM_1_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_0x0F0 @@ -81,7 +81,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 checkitem ITEM_ROOM_2_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_0x0F1 @@ -97,7 +97,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 checkitem ITEM_ROOM_4_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_0x0F2 @@ -113,7 +113,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE checkitem ITEM_ROOM_6_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_0x0F3 @@ -123,27 +123,27 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE end AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D - msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 628c9cece..2cc0806ec 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -138,7 +138,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 lockall - msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, 4 + msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 2ffe3afc7..c6eb6779b 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -6,22 +6,22 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 - msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4 + msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT release end AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 + msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT setvar VAR_0x8004, 642 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 642 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 - msgbox AbandonedShip_Rooms2_1F_Text_238491, 6 + msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B @@ -29,32 +29,32 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 - msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4 + msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT release end AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 + msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT setvar VAR_0x8004, 642 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 642 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 - msgbox AbandonedShip_Rooms2_1F_Text_23860B, 6 + msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 - msgbox AbandonedShip_Rooms2_1F_Text_238708, 6 + msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 - msgbox AbandonedShip_Rooms2_1F_Text_2387A9, 6 + msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc index 00b3d0fb9..0a3671f04 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024 .byte 0 AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 - msgbox AbandonedShip_Rooms2_B1F_Text_23802E, 2 + msgbox AbandonedShip_Rooms2_B1F_Text_23802E, MSGBOX_NPC end AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 2a6bc36b6..ad036da3b 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -2,12 +2,12 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92 .byte 0 AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 - msgbox AbandonedShip_Rooms_1F_Text_237B15, 2 + msgbox AbandonedShip_Rooms_1F_Text_237B15, MSGBOX_NPC end AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C trainerbattle 0, TRAINER_DEMETRIUS, 0, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A - msgbox AbandonedShip_Rooms_1F_Text_237D41, 6 + msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 @@ -15,24 +15,24 @@ AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE - msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4 + msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT release end AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF special sub_80B4808 waitmovement 0 - msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4 + msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT setvar VAR_0x8004, 144 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 144 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE trainerbattle 5, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 - msgbox AbandonedShip_Rooms_1F_Text_237CC9, 6 + msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15 diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index d4a5c9233..d2937cd2d 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD end AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 - msgbox AbandonedShip_Rooms_B1F_Text_237FCF, 2 + msgbox AbandonedShip_Rooms_B1F_Text_237FCF, MSGBOX_NPC end AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 18361bca5..f3c42b690 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -51,7 +51,7 @@ AncientTomb_EventScript_239033:: @ 8239033 end AncientTomb_EventScript_239046:: @ 8239046 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 9172c3927..c9acfd669 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -8,17 +8,17 @@ AquaHideout_1F_EventScript_233494:: @ 8233494 goto_eq AquaHideout_1F_EventScript_2334BC checkflag FLAG_0x0D4 goto_eq AquaHideout_1F_EventScript_2334B2 - msgbox AquaHideout_1F_Text_23351D, 4 + msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334B2:: @ 82334B2 - msgbox AquaHideout_1F_Text_2335E3, 4 + msgbox AquaHideout_1F_Text_2335E3, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334BC:: @ 82334BC - msgbox AquaHideout_1F_Text_23367D, 4 + msgbox AquaHideout_1F_Text_23367D, MSGBOX_DEFAULT release end @@ -29,27 +29,27 @@ AquaHideout_1F_EventScript_2334C6:: @ 82334C6 goto_eq AquaHideout_1F_EventScript_2334EE checkflag FLAG_0x0D4 goto_eq AquaHideout_1F_EventScript_2334E4 - msgbox AquaHideout_1F_Text_233739, 4 + msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334E4:: @ 82334E4 - msgbox AquaHideout_1F_Text_2337FA, 4 + msgbox AquaHideout_1F_Text_2337FA, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334EE:: @ 82334EE - msgbox AquaHideout_1F_Text_233884, 4 + msgbox AquaHideout_1F_Text_233884, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334F8:: @ 82334F8 trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 - msgbox AquaHideout_1F_Text_233977, 6 + msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE end AquaHideout_1F_EventScript_233513:: @ 8233513 - msgbox AquaHideout_1F_Text_233977, 4 + msgbox AquaHideout_1F_Text_233977, MSGBOX_DEFAULT release end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 22c3406c5..569ce99dc 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -86,34 +86,34 @@ AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C AquaHideout_B1F_EventScript_233A85:: @ 8233A85 trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 - msgbox AquaHideout_B1F_Text_233B5E, 6 + msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 special sub_80B4808 waitmovement 0 - msgbox AquaHideout_B1F_Text_233B5E, 4 + msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_DEFAULT release end AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB - msgbox AquaHideout_B1F_Text_233C41, 6 + msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB - msgbox AquaHideout_B1F_Text_233C41, 4 + msgbox AquaHideout_B1F_Text_233C41, MSGBOX_DEFAULT release end AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA - msgbox AquaHideout_B1F_Text_233CDC, 6 + msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E - msgbox AquaHideout_B1F_Text_233D84, 6 + msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE end AquaHideout_B1F_Text_233B03: @ 8233B03 diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 7fbf55b51..48e7d3556 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -25,7 +25,7 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 AquaHideout_B2F_EventScript_233E09:: @ 8233E09 trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 - msgbox AquaHideout_B2F_Text_233FF2, 4 + msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 delay 20 applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E waitmovement 0 - msgbox AquaHideout_B2F_Text_233FA6, 4 + msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 @@ -46,7 +46,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 delay 20 applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E waitmovement 0 - msgbox AquaHideout_B2F_Text_233FF2, 4 + msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT setflag FLAG_0x070 setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS release @@ -68,22 +68,22 @@ AquaHideout_B2F_Movement_233E85: @ 8233E85 AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 - msgbox AquaHideout_B2F_Text_234112, 6 + msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 - msgbox AquaHideout_B2F_Text_234112, 4 + msgbox AquaHideout_B2F_Text_234112, MSGBOX_DEFAULT release end AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE - msgbox AquaHideout_B2F_Text_2341FE, 6 + msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC - msgbox AquaHideout_B2F_Text_2342FF, 6 + msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE end AquaHideout_B2F_Text_233EDD: @ 8233EDD diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 84f0ebeea..60329d24f 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -64,7 +64,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 waitmovement 0 @@ -74,7 +74,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E waitmovement 0 setvar VAR_0x8004, 6 special CallBattleArenaFunction - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 @@ -82,14 +82,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 setvar VAR_0x8004, 5 special CallBattlePalaceFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -106,7 +106,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB waitmovement 0 setvar VAR_0x8004, 6 special CallBattleArenaFunction - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 setvar VAR_0x8004, 2 @@ -135,7 +135,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty setvar VAR_0x8004, 3 @@ -199,7 +199,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0 goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, 5 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A @@ -277,7 +277,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 @@ -311,7 +311,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE4 waitmovement 0 @@ -319,7 +319,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, MSGBOX_DEFAULT closemessage addobject 7 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF4 @@ -335,21 +335,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C @@ -363,14 +363,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25819C waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 @@ -379,21 +379,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 @@ -407,18 +407,18 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25835B waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C return @@ -451,7 +451,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 playse SE_BAN waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA return diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index a353379c2..5ffb5de3d 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -14,7 +14,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 waitmovement 0 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 waitmovement 0 - msgbox BattleFrontier_BattleArenaCorridor_Text_257449, 3 + msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 waitmovement 0 applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 19976c855..406d9f37d 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -27,7 +27,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256811, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256811, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -51,21 +51,21 @@ BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 - msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_257353, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9 message BattleFrontier_BattleArenaLobby_Text_256931 waitmessage call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256A74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -80,7 +80,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B setvar VAR_0x8006, 0 special CallBattleArenaFunction call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256A74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -135,7 +135,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 setvar VAR_FRONTIER_FACILITY, 3 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256166, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B message BattleFrontier_BattleArenaLobby_Text_2561EA @@ -162,7 +162,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256573, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleArenaLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -171,7 +171,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 - msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5 + msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8 case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8 @@ -209,7 +209,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -224,7 +224,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 end BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F - msgbox BattleFrontier_BattleArenaLobby_Text_25624C, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_25624C, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255E0B BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC @@ -233,11 +233,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC case 1, BattleFrontier_BattleArenaLobby_EventScript_255FD4 BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7 - msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_256003 BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4 - msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_256003 BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 @@ -251,7 +251,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8 special LoadPlayerParty BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB - msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_25621F, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 release @@ -353,24 +353,24 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 end BattleFrontier_BattleArenaLobby_EventScript_2560A6:: @ 82560A6 - msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560AF:: @ 82560AF - msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560B8:: @ 82560B8 - msgbox BattleFrontier_BattleArenaLobby_Text_256C19, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256C19, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560C1:: @ 82560C1 - msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end @@ -388,22 +388,22 @@ BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9 end BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C - msgbox BattleFrontier_BattleArenaLobby_Text_256E02, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256E02, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_25613A:: @ 825613A - msgbox BattleFrontier_BattleArenaLobby_Text_256F43, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256F43, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_256148:: @ 8256148 - msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_256156:: @ 8256156 - msgbox BattleFrontier_BattleArenaLobby_Text_257202, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_257202, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 9b1a77fae..c8338d110 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -46,7 +46,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT closemessage showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 @@ -73,7 +73,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 4 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT closemessage applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789 @@ -81,7 +81,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 5 special CallBattleDomeFunction @@ -94,7 +94,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_TEMP_2, 1 BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, MSGBOX_DEFAULT closemessage playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -199,11 +199,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 special CallFrontierUtilFunc switch VAR_RESULT case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96:: @ 824BF96 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, MSGBOX_DEFAULT BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E special sub_8175280 @@ -217,11 +217,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 @@ -340,11 +340,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C151:: @ 824C151 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C158:: @ 824C158 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C161:: @ 824C161 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A:: @ 824C16A @@ -390,11 +390,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C211 BattleFrontier_BattleDomeBattleRoom_EventScript_24C209:: @ 824C209 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, MSGBOX_DEFAULT BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 closemessage @@ -431,19 +431,19 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, MSGBOX_DEFAULT call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 switch VAR_RESULT case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 special CallBattleDomeFunction @@ -454,14 +454,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 @@ -470,19 +470,19 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, MSGBOX_DEFAULT call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 switch VAR_RESULT case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 special CallBattleDomeFunction @@ -493,18 +493,18 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D522 waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, MSGBOX_DEFAULT closemessage applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C787 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C829 @@ -513,7 +513,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, MSGBOX_DEFAULT playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitse diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 669deeeaa..f66674444 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -34,7 +34,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -63,14 +63,14 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 - msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1 - msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, MSGBOX_DEFAULT BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 - msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9 @@ -100,7 +100,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, MSGBOX_DEFAULT message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage special LoadPlayerParty @@ -141,7 +141,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4 call BattleFrontier_BattleDomeLobby_EventScript_23E8B4 BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 - msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -149,7 +149,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT message BattleFrontier_BattleDomeLobby_Text_24A61A waitmessage setvar VAR_0x8004, 13 @@ -215,7 +215,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleDomeLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -224,7 +224,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 - msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5 + msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61 case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60 @@ -262,7 +262,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 special CallFrontierUtilFunc setvar VAR_0x8004, 15 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E special HealPlayerParty @@ -284,11 +284,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30 - msgbox BattleFrontier_BattleDomeLobby_Text_24A353, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A353, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249C6C BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D - msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249C6C BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A @@ -302,7 +302,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61 special LoadPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64 - msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C release @@ -350,11 +350,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5 return BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD - msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06 - msgbox BattleFrontier_BattleDomeLobby_Text_24A664, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A664, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F @@ -366,11 +366,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15 return BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B - msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24 - msgbox BattleFrontier_BattleDomeLobby_Text_24A721, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A721, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D @@ -449,56 +449,54 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 end BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9 - msgbox BattleFrontier_BattleDomeLobby_Text_24A966, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A966, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2 - msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB - msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4 - msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED setvar VAR_0x8004, 20 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE - msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07 - msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10 - msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19 - msgbox BattleFrontier_OutsideWest_Text_24AB06, 2 + msgbox BattleFrontier_OutsideWest_Text_24AB06, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22 - loadword 0, BattleFrontier_OutsideWest_Text_24AB44 - callstd 2 + msgbox BattleFrontier_OutsideWest_Text_24AB44, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B - loadword 0, BattleFrontier_OutsideWest_Text_24AB75 - callstd 2 + msgbox BattleFrontier_OutsideWest_Text_24AB75, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end @@ -515,17 +513,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43 end BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B - msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99 - msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7 - msgbox BattleFrontier_BattleDomeLobby_Text_24B073, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24B073, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index d870ee8ea..ee23f919e 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -69,7 +69,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, 5 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB @@ -104,7 +104,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB end BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 6 special CallBattleDomeFunction @@ -131,19 +131,19 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D @@ -167,7 +167,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D special CallBattleDomeFunction setvar VAR_0x8004, 9 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F waitmovement 0 @@ -221,28 +221,28 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B checkflag FLAG_TEMP_1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 checkflag FLAG_TEMP_1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 setvar VAR_TEMP_0, 1 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 @@ -268,15 +268,15 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 74b10e0f0..8e08404cd 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -51,7 +51,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 .2byte 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, MSGBOX_DEFAULT closemessage applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B @@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 setvar VAR_0x8004, 5 special CallBattlePalaceFunction lockall - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_0x8004, 2 @@ -153,13 +153,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C @@ -170,7 +170,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 @@ -180,7 +180,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 @@ -189,13 +189,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B @@ -206,7 +206,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT waitmessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 @@ -216,7 +216,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 6ea24b81f..0c6c35071 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -27,7 +27,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A lockall - msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 8 special CallBattleFactoryFunction @@ -57,16 +57,16 @@ BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD - msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6 BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD - msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, MSGBOX_DEFAULT waitmessage BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 - msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9 @@ -116,7 +116,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4 BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582 - msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -184,7 +184,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5 + msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9 @@ -216,7 +216,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A special SavePlayerParty - msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT closemessage compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C @@ -256,7 +256,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A special LoadPlayerParty BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D - msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT release end @@ -275,11 +275,11 @@ BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC step_end BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1 - msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587BA:: @ 82587BA - msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587C3:: @ 82587C3 @@ -291,11 +291,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587C9:: @ 82587C9 return BattleFrontier_BattleFactoryLobby_EventScript_2587CF:: @ 82587CF - msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8 - msgbox BattleFrontier_BattleFactoryLobby_Text_259058, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259058, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 @@ -321,26 +321,26 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA end BattleFrontier_BattleFactoryLobby_EventScript_258813:: @ 8258813 - msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_25881C:: @ 825881C - msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_258825:: @ 8258825 lock - msgbox BattleFrontier_BattleFactoryLobby_Text_259547, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259547, MSGBOX_DEFAULT release end BattleFrontier_BattleFactoryLobby_EventScript_258830:: @ 8258830 - msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839 lockall - msgbox BattleFrontier_BattleFactoryLobby_Text_259721, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259721, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end @@ -359,27 +359,27 @@ BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6 - msgbox BattleFrontier_BattleFactoryLobby_Text_259766, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259766, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588B4:: @ 82588B4 - msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588C2:: @ 82588C2 - msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588D0:: @ 82588D0 - msgbox BattleFrontier_BattleFactoryLobby_Text_259920, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259920, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588DE:: @ 82588DE - msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index d99fed1b2..e41efdc85 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -43,7 +43,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 setorcopyvar VAR_0x8006, VAR_RESULT call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 8 special CallBattleFactoryFunction @@ -52,7 +52,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 waitstate BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 compare VAR_RESULT, 0 @@ -69,7 +69,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 special CallBattleFactoryFunction setvar VAR_0x8004, 16 special CallBattleFactoryFunction - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -79,15 +79,15 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 waitse - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF waitmovement 0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3 waitmovement 0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, MSGBOX_DEFAULT closemessage delay 16 goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 @@ -148,7 +148,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47 @@ -174,7 +174,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 setorcopyvar VAR_0x8006, VAR_RESULT call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 @@ -189,7 +189,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 setvar VAR_0x8004, 8 special CallBattleFactoryFunction - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D:: @ 8259E1D @@ -248,7 +248,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 compare VAR_0x8005, 1 @@ -288,75 +288,75 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B:: @ 8259F6B - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74:: @ 8259F74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D:: @ 8259F7D - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86:: @ 8259F86 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F:: @ 8259F8F - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98:: @ 8259F98 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1:: @ 8259FA1 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA:: @ 8259FAA - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3:: @ 8259FB3 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC:: @ 8259FBC - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5:: @ 8259FC5 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE:: @ 8259FCE - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7:: @ 8259FD7 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0:: @ 8259FE0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9:: @ 8259FE9 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2:: @ 8259FF2 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 @@ -381,39 +381,39 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 - msgbox Text_StyleUnrestrained, 4 + msgbox Text_StyleUnrestrained, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071 - msgbox Text_StyleTotalPreparation, 4 + msgbox Text_StyleTotalPreparation, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A - msgbox Text_StyleSlowAndSteady, 4 + msgbox Text_StyleSlowAndSteady, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083 - msgbox Text_StyleEndurance, 4 + msgbox Text_StyleEndurance, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C - msgbox Text_StyleHighRisk, 4 + msgbox Text_StyleHighRisk, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095 - msgbox Text_StyleWeakenFoe, 4 + msgbox Text_StyleWeakenFoe, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E - msgbox Text_StyleImpossibleToPredict, 4 + msgbox Text_StyleImpossibleToPredict, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7 - msgbox Text_StyleDependsOnFlow, 4 + msgbox Text_StyleDependsOnFlow, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0 - msgbox Text_StyleFlexible, 4 + msgbox Text_StyleFlexible, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 @@ -439,8 +439,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110 case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, 4 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index a179aec55..2b8f8d763 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF waitmovement 0 setvar VAR_0x8004, 5 special CallBattlePalaceFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 switch VAR_RESULT @@ -92,7 +92,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty setvar VAR_0x8004, 3 @@ -156,7 +156,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, 5 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F @@ -200,7 +200,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 @@ -227,7 +227,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 @@ -249,13 +249,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 @@ -268,10 +268,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC waitmessage @@ -283,7 +283,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A @@ -292,13 +292,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 @@ -311,10 +311,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_250699 waitmessage @@ -326,7 +326,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 23bad0421..2af0d954f 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -60,23 +60,23 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581 end BattleFrontier_BattlePalaceCorridor_EventScript_24F58B:: @ 824F58B - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F594:: @ 824F594 - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F59D:: @ 824F59D - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6:: @ 824F5A6 - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 82d3aa5cf..cf3ecfb14 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -27,7 +27,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -51,21 +51,21 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, MSGBOX_DEFAULT BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9 message BattleFrontier_BattlePalaceLobby_Text_24E4F7 waitmessage call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -80,7 +80,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 setvar VAR_0x8006, 0 special CallBattlePalaceFunction call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -115,7 +115,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907 BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, MSGBOX_DEFAULT message BattleFrontier_BattlePalaceLobby_Text_24E5F6 waitmessage setvar VAR_0x8004, 7 @@ -186,7 +186,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -195,7 +195,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87 @@ -233,7 +233,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, MSGBOX_DEFAULT closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 @@ -244,11 +244,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 compare VAR_FRONTIER_BATTLE_MODE, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 - msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45 @@ -257,11 +257,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45 case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D - msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A @@ -275,18 +275,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91 special LoadPlayerParty BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C release end BattleFrontier_BattlePalaceLobby_EventScript_24DB9E:: @ 824DB9E - msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceLobby_EventScript_24DBA7:: @ 824DBA7 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceLobby_EventScript_24DBB0:: @ 824DBB0 @@ -382,24 +382,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69 end BattleFrontier_BattlePalaceLobby_EventScript_24DC82:: @ 824DC82 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC8B:: @ 824DC8B - msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC94:: @ 824DC94 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC9D:: @ 824DC9D - msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end @@ -418,27 +418,27 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD21:: @ 824DD21 - msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD2F:: @ 824DD2F - msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD3D:: @ 824DD3D - msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD4B:: @ 824DD4B - msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 3b2921737..0a0df3636 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 lockall - msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, 4 + msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT closemessage releaseall applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 6bdb7f848..278bd0407 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -29,7 +29,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 setvar VAR_0x8004, 27 special CallBattlePikeFunction lockall - msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -53,16 +53,16 @@ BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 - msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattlePikeLobby_EventScript_25B78D BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784 - msgbox BattleFrontier_BattlePikeLobby_Text_25C383, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C383, MSGBOX_DEFAULT waitmessage BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D - msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 @@ -87,7 +87,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D special CallBattlePikeFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -116,7 +116,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 special CallBattlePikeFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -128,7 +128,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 setvar VAR_FRONTIER_FACILITY, 5 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, MSGBOX_DEFAULT BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F message BattleFrontier_BattlePikeLobby_Text_25BBC1 @@ -155,7 +155,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C094, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePikeLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -164,7 +164,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 - msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5 + msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73 case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C @@ -205,7 +205,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 5 special CallFrontierUtilFunc @@ -218,7 +218,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C end BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A - msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25B87F BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27 @@ -227,11 +227,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27 case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA4F BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42 - msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F - msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C @@ -245,7 +245,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73 special LoadPlayerParty BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76 - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E release @@ -277,20 +277,20 @@ BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7 step_end BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB - msgbox BattleFrontier_BattlePikeLobby_Text_25C422, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C422, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4 - msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD - msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6 lockall - msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end @@ -307,17 +307,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D - msgbox BattleFrontier_BattlePikeLobby_Text_25C644, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C644, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B - msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39 - msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 9709e4794..3778d4af6 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage releaseall @@ -58,7 +58,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 lockall delay 16 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, MSGBOX_DEFAULT waitmessage closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 @@ -66,7 +66,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage releaseall @@ -86,11 +86,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 waitmovement 0 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, MSGBOX_DEFAULT closemessage release applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 @@ -110,7 +110,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT closemessage special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 @@ -147,13 +147,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA @@ -164,7 +164,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 @@ -172,7 +172,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, MSGBOX_DEFAULT closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D @@ -182,13 +182,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 @@ -199,7 +199,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 @@ -207,7 +207,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, MSGBOX_DEFAULT closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D end @@ -230,19 +230,19 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB @@ -258,7 +258,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 waitmovement 0 @@ -282,7 +282,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT closemessage delay 16 applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD @@ -290,7 +290,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E setvar VAR_0x8004, 21 setvar VAR_0x8005, 1 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE setvar VAR_0x8005, 0 @@ -324,13 +324,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 compare VAR_0x8004, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT closemessage releaseall end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_KIRLIA, 0 @@ -355,7 +355,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry @@ -363,11 +363,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, MSGBOX_DEFAULT return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_DUSCLOPS, 0 @@ -388,7 +388,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry @@ -396,7 +396,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, MSGBOX_DEFAULT return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751 @@ -590,7 +590,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B faceplayer setvar VAR_0x8004, 14 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage release @@ -599,7 +599,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, MSGBOX_DEFAULT closemessage release end @@ -613,7 +613,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 playfanfare MUS_ME_ASA waitfanfare - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT closemessage release applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E @@ -623,21 +623,21 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, MSGBOX_DEFAULT closemessage return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, MSGBOX_DEFAULT closemessage return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, MSGBOX_DEFAULT closemessage release applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index 58031dd85..83031af95 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 setvar VAR_0x8006, 3 special CallFrontierUtilFunc lockall - msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 + msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, MSGBOX_DEFAULT closemessage releaseall warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 0ff9ff5db..3d42b2e36 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -49,7 +49,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, MSGBOX_DEFAULT closemessage releaseall setvar VAR_0x8004, 5 @@ -77,54 +77,54 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A @@ -148,7 +148,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, MSGBOX_YESNO switch VAR_RESULT case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A @@ -181,7 +181,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE waitmovement 0 lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, MSGBOX_DEFAULT releaseall applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5 waitmovement 0 @@ -195,7 +195,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO switch VAR_RESULT case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 @@ -204,7 +204,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, MSGBOX_DEFAULT release end @@ -218,15 +218,15 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 @@ -240,29 +240,29 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc index 5bb6a87e0..6e85b849a 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -2,12 +2,12 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070 .byte 0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT special sub_813A958 return BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT special sub_813A988 release end @@ -16,7 +16,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 compare VAR_TEMP_2, 1 @@ -43,14 +43,14 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 givedecoration VAR_0x8009 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT special sub_813A988 release end @@ -64,14 +64,14 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A giveitem VAR_0x8009, 1 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT compare VAR_TEMP_2, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT special sub_813A988 release end @@ -106,7 +106,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 16 @@ -115,7 +115,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 @@ -124,7 +124,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 @@ -133,7 +133,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -142,7 +142,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -151,7 +151,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -160,7 +160,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -169,7 +169,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -178,7 +178,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -187,7 +187,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -220,7 +220,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 @@ -229,7 +229,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 @@ -238,7 +238,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -247,7 +247,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -256,7 +256,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -290,7 +290,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -299,7 +299,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -308,7 +308,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -317,7 +317,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -326,7 +326,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -335,7 +335,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -372,7 +372,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -381,7 +381,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -390,7 +390,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -399,7 +399,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -408,7 +408,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -417,7 +417,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -426,7 +426,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -435,7 +435,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -444,7 +444,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -453,25 +453,25 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB:: @ 825F7CB - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4:: @ 825F7D4 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD:: @ 825F7DD lock - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT release end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8:: @ 825F7E8 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1:: @ 825F7F1 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA: @ 825F7FA diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index facd60979..a233729cd 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -165,7 +165,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A setvar VAR_0x8004, 7 special CallBattlePyramidFunction - callstd 1 + callstd STD_FIND_ITEM compare VAR_0x8007, 0 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 @@ -781,4 +781,3 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 .string "There aren’t any TRAINERS left that\n" .string "can take you on now…$" - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index bcd2e32c9..9b5ea145e 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -54,11 +54,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special sub_81B95E0 @@ -75,7 +75,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA waitmessage playse SE_EXPMAX waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 @@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special CallBattlePyramidFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -117,7 +117,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 special CallBattlePyramidFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -132,7 +132,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 setvar VAR_FRONTIER_FACILITY, 6 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8 message BattleFrontier_BattlePyramidLobby_Text_250FA7 @@ -159,7 +159,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251297, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -168,7 +168,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5 + msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5 @@ -210,7 +210,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT closemessage call BattleFrontier_BattlePyramidLobby_EventScript_250D56 setvar VAR_0x8004, 2 @@ -225,7 +225,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 end BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68 - msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8 BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 @@ -234,11 +234,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90 - msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D - msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA @@ -252,7 +252,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1 special LoadPlayerParty BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC release @@ -262,9 +262,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 - msgbox BattleFrontier_BattlePyramidLobby_Text_252461, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252461, MSGBOX_DEFAULT releaseall end @@ -281,7 +281,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 return BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special CallBattlePyramidFunction @@ -299,7 +299,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 return BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 special CallBattlePyramidFunction @@ -343,83 +343,83 @@ BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4 return BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E - msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2 - msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB - msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD - msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6 - msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF - msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8 - msgbox BattleFrontier_BattlePyramidLobby_Text_252068, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252068, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA - msgbox BattleFrontier_BattlePyramidLobby_Text_252158, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252158, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03 - msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C - msgbox BattleFrontier_BattlePyramidLobby_Text_252206, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252206, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15 - msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E - msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27 - msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30 - msgbox BattleFrontier_BattlePyramidLobby_Text_252364, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252364, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39 - msgbox BattleFrontier_BattlePyramidLobby_Text_252403, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252403, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 @@ -436,24 +436,24 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattlePyramidFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C message BattleFrontier_BattlePyramidLobby_Text_25161E waitmessage playse SE_EXPMAX waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251647, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251647, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 waitmovement 0 @@ -493,7 +493,7 @@ BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 step_end BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB - msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT setflag FLAG_SPECIAL_FLAG_0x4004 special sub_81C6A94 compare VAR_RESULT, 0 @@ -504,7 +504,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB end BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00 - msgbox BattleFrontier_BattlePyramidLobby_Text_251881, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251881, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09 @@ -539,23 +539,23 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 return BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F - msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, MSGBOX_DEFAULT message BattleFrontier_BattlePyramidLobby_Text_25197E waitmessage goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 end BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83 - msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, 2 + msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, MSGBOX_NPC end BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C - msgbox BattleFrontier_BattlePyramidLobby_Text_252595, 2 + msgbox BattleFrontier_BattlePyramidLobby_Text_252595, MSGBOX_NPC end BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95 lockall - msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end @@ -573,22 +573,22 @@ BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7 - msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05 - msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13 - msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21 - msgbox BattleFrontier_BattlePyramidLobby_Text_252924, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252924, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index e77013519..7454dd10a 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -92,7 +92,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 compare VAR_TEMP_C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 - msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD waitmovement 0 @@ -116,12 +116,12 @@ BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A end BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236 - msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, MSGBOX_DEFAULT closemessage end BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 - msgbox BattleFrontier_BattlePyramidTop_Text_25551F, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_25551F, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD setvar VAR_TEMP_D, 1 closemessage @@ -141,14 +141,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_25573E, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_2552DA end @@ -157,7 +157,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 waitmovement 0 BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA - msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255846, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 @@ -169,14 +169,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A - msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_2558E9 waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_25521A BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 @@ -188,14 +188,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_255392 end @@ -204,7 +204,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 waitmovement 0 BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 - msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 @@ -216,14 +216,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A - msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_255B59 waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_25521A BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 196518e0b..2a0a2ce48 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E switch VAR_RESULT @@ -81,7 +81,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F waitmovement 0 applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -129,7 +129,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, 5 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 @@ -247,7 +247,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 @@ -291,13 +291,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 @@ -309,14 +309,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_24270E waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 @@ -325,13 +325,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF @@ -343,14 +343,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_242932 waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index de242cbcc..fa17ef5af 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -78,14 +78,14 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 delay 15 applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 waitmovement 0 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 special sub_8161F74 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 waitmovement 0 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069 @@ -144,7 +144,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 + msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118 @@ -203,7 +203,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, 5 + msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 1afa9e120..018dbfb31 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -55,7 +55,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 lock faceplayer - msgbox BattleFrontier_BattleTowerLobby_Text_23F583, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -85,7 +85,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 goto BattleFrontier_BattleTowerLobby_EventScript_23E780 BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778 - msgbox BattleFrontier_BattleTowerLobby_Text_241486, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241486, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 setvar VAR_0x8004, 5 @@ -96,10 +96,10 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 - msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9 @@ -109,10 +109,10 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 special sub_8161F74 compare VAR_RESULT, 49 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 release @@ -141,7 +141,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830 message BattleFrontier_BattleTowerLobby_Text_23F6F7 waitmessage call BattleFrontier_BattleTowerLobby_EventScript_23E84D - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 release @@ -186,11 +186,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 playse SE_SAVE - msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF BattleFrontier_BattleTowerLobby_EventScript_23E8D7:: @ 823E8D7 - msgbox gText_BattleRecordCouldntBeSaved, 4 + msgbox gText_BattleRecordCouldntBeSaved, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF return @@ -241,7 +241,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240537, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 message BattleFrontier_BattleTowerLobby_Text_2405B3 @@ -269,7 +269,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -278,7 +278,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A @@ -312,7 +312,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A end BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91 - msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23E948 end @@ -321,7 +321,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 message BattleFrontier_BattleTowerLobby_Text_24085E @@ -349,7 +349,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240A50, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -358,7 +358,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93 @@ -392,7 +392,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 end BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA - msgbox BattleFrontier_BattleTowerLobby_Text_240897, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240897, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23EAB1 end @@ -402,7 +402,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 setvar VAR_FRONTIER_FACILITY, 0 clearflag FLAG_0x152 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D message BattleFrontier_BattleTowerLobby_Text_240B06 @@ -430,7 +430,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -439,7 +439,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF @@ -473,7 +473,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF end BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66 - msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23EC1D end @@ -482,7 +482,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74 faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240E15, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 message BattleFrontier_BattleTowerLobby_Text_240E95 @@ -510,7 +510,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24115E, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -519,7 +519,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68 @@ -573,7 +573,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 end BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 - msgbox BattleFrontier_BattleTowerLobby_Text_23F969, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT setvar VAR_0x8004, 1 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -582,7 +582,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 end BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C - msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT setvar VAR_0x8004, 2 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -591,7 +591,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C end BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 - msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT setvar VAR_0x8004, 3 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -600,7 +600,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 end BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, MSGBOX_DEFAULT release end @@ -612,21 +612,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A end BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23EFAB:: @ 823EFAB - msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23EFB5:: @ 823EFB5 - msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, 2 + msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, MSGBOX_NPC end BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE - msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, 2 + msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, MSGBOX_NPC end BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 @@ -682,17 +682,17 @@ BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046 switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D - msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24038B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F06F:: @ 823F06F - msgbox BattleFrontier_BattleTowerLobby_Text_240027, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240027, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D - msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end @@ -700,17 +700,17 @@ BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4 case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24046B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F0B4:: @ 823F0B4 - msgbox BattleFrontier_BattleTowerLobby_Text_24010B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24010B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end @@ -726,7 +726,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3 BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6 special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1 release @@ -756,7 +756,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 - msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F15B BattleFrontier_BattleTowerLobby_EventScript_23F152:: @ 823F152 @@ -954,20 +954,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special CloseLink compare VAR_0x8005, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F - msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 - msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, MSGBOX_DEFAULT release end @@ -979,20 +979,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D compare VAR_0x8005, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F394:: @ 823F394 - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F39D:: @ 823F39D - msgbox BattleFrontier_BattleTowerLobby_Text_241285, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241285, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF @@ -1012,7 +1012,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF end BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA - msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23ED86 end @@ -1075,7 +1075,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE lockall - msgbox BattleFrontier_BattleTowerLobby_Text_241540, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241540, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end @@ -1093,22 +1093,22 @@ BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520 - msgbox BattleFrontier_BattleTowerLobby_Text_241586, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241586, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F52E:: @ 823F52E - msgbox BattleFrontier_BattleTowerLobby_Text_241693, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241693, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F53C:: @ 823F53C - msgbox BattleFrontier_BattleTowerLobby_Text_241777, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241777, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F54A:: @ 823F54A - msgbox BattleFrontier_BattleTowerLobby_Text_24187E, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24187E, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index f16b7e6a0..b2b05a054 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -67,7 +67,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 moveobjectoffscreen 1 applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty setvar VAR_TEMP_1, 1 releaseall @@ -90,7 +90,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT release end @@ -103,7 +103,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index ba8ca0cb6..b8b199ee2 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -22,11 +22,11 @@ BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 end BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD - msgbox BattleFrontier_Lounge1_Text_25E95F, 4 + msgbox BattleFrontier_Lounge1_Text_25E95F, MSGBOX_DEFAULT return BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 - msgbox BattleFrontier_Lounge1_Text_25EEF6, 4 + msgbox BattleFrontier_Lounge1_Text_25EEF6, MSGBOX_DEFAULT return BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF @@ -45,7 +45,7 @@ BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF end BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF - msgbox BattleFrontier_Lounge1_Text_25EF5E, 4 + msgbox BattleFrontier_Lounge1_Text_25EF5E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E792 end @@ -80,86 +80,86 @@ BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D end BattleFrontier_Lounge1_EventScript_25E87F:: @ 825E87F - msgbox BattleFrontier_Lounge1_Text_25EA92, 4 + msgbox BattleFrontier_Lounge1_Text_25EA92, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E88D:: @ 825E88D - msgbox BattleFrontier_Lounge1_Text_25EAD9, 4 + msgbox BattleFrontier_Lounge1_Text_25EAD9, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E89B:: @ 825E89B - msgbox BattleFrontier_Lounge1_Text_25EB2A, 4 + msgbox BattleFrontier_Lounge1_Text_25EB2A, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E8A9:: @ 825E8A9 - msgbox BattleFrontier_Lounge1_Text_25EB6F, 4 + msgbox BattleFrontier_Lounge1_Text_25EB6F, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E8B7:: @ 825E8B7 - msgbox BattleFrontier_Lounge1_Text_25EBBB, 4 + msgbox BattleFrontier_Lounge1_Text_25EBBB, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8C5:: @ 825E8C5 - msgbox BattleFrontier_Lounge1_Text_25EBF8, 4 + msgbox BattleFrontier_Lounge1_Text_25EBF8, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8D3:: @ 825E8D3 - msgbox BattleFrontier_Lounge1_Text_25EC39, 4 + msgbox BattleFrontier_Lounge1_Text_25EC39, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8E1:: @ 825E8E1 - msgbox BattleFrontier_Lounge1_Text_25ED0E, 4 + msgbox BattleFrontier_Lounge1_Text_25ED0E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8EF:: @ 825E8EF - msgbox BattleFrontier_Lounge1_Text_25EC7B, 4 + msgbox BattleFrontier_Lounge1_Text_25EC7B, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8FD:: @ 825E8FD - msgbox BattleFrontier_Lounge1_Text_25ECC4, 4 + msgbox BattleFrontier_Lounge1_Text_25ECC4, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E90B:: @ 825E90B - msgbox BattleFrontier_Lounge1_Text_25ED4E, 4 + msgbox BattleFrontier_Lounge1_Text_25ED4E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E919:: @ 825E919 - msgbox BattleFrontier_Lounge1_Text_25ED87, 4 + msgbox BattleFrontier_Lounge1_Text_25ED87, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E927:: @ 825E927 - msgbox BattleFrontier_Lounge1_Text_25EDC1, 4 + msgbox BattleFrontier_Lounge1_Text_25EDC1, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E935:: @ 825E935 - msgbox BattleFrontier_Lounge1_Text_25EDF6, 4 + msgbox BattleFrontier_Lounge1_Text_25EDF6, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E943:: @ 825E943 - msgbox BattleFrontier_Lounge1_Text_25EE37, 4 + msgbox BattleFrontier_Lounge1_Text_25EE37, MSGBOX_DEFAULT release end BattleFrontier_Lounge1_EventScript_25E94D:: @ 825E94D - msgbox BattleFrontier_Lounge1_Text_25EFDD, 2 + msgbox BattleFrontier_Lounge1_Text_25EFDD, MSGBOX_NPC end BattleFrontier_Lounge1_EventScript_25E956:: @ 825E956 - msgbox BattleFrontier_Lounge1_Text_25F020, 2 + msgbox BattleFrontier_Lounge1_Text_25F020, MSGBOX_NPC end BattleFrontier_Lounge1_Text_25E95F: @ 825E95F diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index bbb298b5b..fed3672be 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -7,12 +7,12 @@ BattleFrontier_Lounge2_EventScript_260643:: @ 8260643 checkflag FLAG_0x154 goto_eq BattleFrontier_Lounge2_EventScript_26065F setflag FLAG_0x154 - msgbox BattleFrontier_Lounge2_Text_260766, 4 + msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D end BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F - msgbox BattleFrontier_Lounge2_Text_260857, 4 + msgbox BattleFrontier_Lounge2_Text_260857, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D end @@ -48,11 +48,11 @@ BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D end BattleFrontier_Lounge2_EventScript_2606F8:: @ 82606F8 - msgbox BattleFrontier_Lounge2_Text_260933, 4 + msgbox BattleFrontier_Lounge2_Text_260933, MSGBOX_DEFAULT return BattleFrontier_Lounge2_EventScript_260701:: @ 8260701 - msgbox BattleFrontier_Lounge2_Text_2608F2, 4 + msgbox BattleFrontier_Lounge2_Text_2608F2, MSGBOX_DEFAULT return BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A @@ -97,24 +97,24 @@ BattleFrontier_Lounge2_EventScript_260737:: @ 8260737 BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C lock - msgbox BattleFrontier_Lounge2_Text_261C9C, 4 + msgbox BattleFrontier_Lounge2_Text_261C9C, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_260747:: @ 8260747 lock - msgbox BattleFrontier_Lounge2_Text_261CDC, 4 + msgbox BattleFrontier_Lounge2_Text_261CDC, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_260752:: @ 8260752 lock - msgbox BattleFrontier_Lounge2_Text_261D1D, 4 + msgbox BattleFrontier_Lounge2_Text_261D1D, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D - msgbox BattleFrontier_Lounge2_Text_261D5C, 2 + msgbox BattleFrontier_Lounge2_Text_261D5C, MSGBOX_NPC end BattleFrontier_Lounge2_Text_260766:: @ 8260766 diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 2638541b2..e1e6c68a5 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 compare VAR_0x8004, 2 goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB setflag FLAG_0x157 - msgbox BattleFrontier_Lounge3_Text_262061, 4 + msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261DAF end @@ -18,10 +18,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF special sub_813A820 waitmessage waitbuttonpress - msgbox BattleFrontier_Lounge3_Text_262A60, 5 + msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 - msgbox BattleFrontier_Lounge3_Text_262ABD, 5 + msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 message BattleFrontier_Lounge3_Text_262B42 @@ -60,7 +60,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 - msgbox BattleFrontier_Lounge3_Text_262B6E, 4 + msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT message BattleFrontier_Lounge3_Text_262B42 waitmessage goto BattleFrontier_Lounge3_EventScript_261DE9 @@ -72,7 +72,7 @@ BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_Lounge3_Text_262BE0, 4 + msgbox BattleFrontier_Lounge3_Text_262BE0, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261E96 end @@ -107,12 +107,12 @@ BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5 return BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB - msgbox BattleFrontier_Lounge3_Text_261FFE, 4 + msgbox BattleFrontier_Lounge3_Text_261FFE, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 - msgbox BattleFrontier_Lounge3_Text_26346B, 4 + msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 goto BattleFrontier_Lounge3_EventScript_261DAF @@ -127,7 +127,7 @@ BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 end BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E - msgbox BattleFrontier_Lounge3_Text_263334, 4 + msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 call_if 1, BattleFrontier_Lounge3_EventScript_261F80 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 @@ -136,13 +136,13 @@ BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E call_if 1, BattleFrontier_Lounge3_EventScript_261F94 msgbox BattleFrontier_Lounge3_Text_2633D4, 9 special sub_813A9D0 - msgbox BattleFrontier_Lounge3_Text_2633F2, 4 + msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 - msgbox BattleFrontier_Lounge3_Text_263298, 4 + msgbox BattleFrontier_Lounge3_Text_263298, MSGBOX_DEFAULT setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end @@ -170,7 +170,7 @@ BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E end BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5 - msgbox BattleFrontier_Lounge3_Text_26342D, 4 + msgbox BattleFrontier_Lounge3_Text_26342D, MSGBOX_DEFAULT release end @@ -180,27 +180,27 @@ BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF end BattleFrontier_Lounge3_EventScript_261FB8:: @ 8261FB8 - msgbox BattleFrontier_Lounge3_Text_263545, 2 + msgbox BattleFrontier_Lounge3_Text_263545, MSGBOX_NPC end BattleFrontier_Lounge3_EventScript_261FC1:: @ 8261FC1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_26346F, 4 + msgbox BattleFrontier_Lounge3_Text_26346F, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261FD1:: @ 8261FD1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_26351D, 4 + msgbox BattleFrontier_Lounge3_Text_26351D, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_2634C9, 4 + msgbox BattleFrontier_Lounge3_Text_2634C9, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end diff --git a/data/maps/BattleFrontier_Lounge4/scripts.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc index 1108ceee7..5e666c9ef 100644 --- a/data/maps/BattleFrontier_Lounge4/scripts.inc +++ b/data/maps/BattleFrontier_Lounge4/scripts.inc @@ -2,15 +2,15 @@ BattleFrontier_Lounge4_MapScripts:: @ 826358C .byte 0 BattleFrontier_Lounge4_EventScript_26358D:: @ 826358D - msgbox BattleFrontier_Lounge4_Text_2635A8, 2 + msgbox BattleFrontier_Lounge4_Text_2635A8, MSGBOX_NPC end BattleFrontier_Lounge4_EventScript_263596:: @ 8263596 - msgbox BattleFrontier_Lounge4_Text_2635EC, 2 + msgbox BattleFrontier_Lounge4_Text_2635EC, MSGBOX_NPC end BattleFrontier_Lounge4_EventScript_26359F:: @ 826359F - msgbox BattleFrontier_Lounge4_Text_263625, 2 + msgbox BattleFrontier_Lounge4_Text_263625, MSGBOX_NPC end BattleFrontier_Lounge4_Text_2635A8: @ 82635A8 diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc index bb1feceec..6c3ca56fd 100644 --- a/data/maps/BattleFrontier_Lounge5/scripts.inc +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge5_MapScripts:: @ 82645C5 BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 lock faceplayer - msgbox BattleFrontier_Lounge5_Text_264632, 5 + msgbox BattleFrontier_Lounge5_Text_264632, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge5_EventScript_26460D special sub_81B94B0 @@ -23,25 +23,25 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 end BattleFrontier_Lounge5_EventScript_264603:: @ 8264603 - msgbox BattleFrontier_Lounge5_Text_264EEE, 4 + msgbox BattleFrontier_Lounge5_Text_264EEE, MSGBOX_DEFAULT release end BattleFrontier_Lounge5_EventScript_26460D:: @ 826460D - msgbox BattleFrontier_Lounge5_Text_26467F, 4 + msgbox BattleFrontier_Lounge5_Text_26467F, MSGBOX_DEFAULT release end BattleFrontier_Lounge5_EventScript_264617:: @ 8264617 - msgbox BattleFrontier_Lounge5_Text_264F22, 2 + msgbox BattleFrontier_Lounge5_Text_264F22, MSGBOX_NPC end BattleFrontier_Lounge5_EventScript_264620:: @ 8264620 - msgbox BattleFrontier_Lounge5_Text_264F64, 2 + msgbox BattleFrontier_Lounge5_Text_264F64, MSGBOX_NPC end BattleFrontier_Lounge5_EventScript_264629:: @ 8264629 - msgbox BattleFrontier_Lounge5_Text_264FAB, 2 + msgbox BattleFrontier_Lounge5_Text_264FAB, MSGBOX_NPC end BattleFrontier_Lounge5_Text_264632:: @ 8264632 diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index c779e7c76..2f929f082 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox BattleFrontier_Lounge6_Text_26508D, 5 + msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge6_EventScript_26506B special sub_81B94B0 @@ -28,24 +28,24 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED special sub_807EA10 special sub_807F0E4 waitstate - msgbox BattleFrontier_Lounge6_Text_265128, 4 + msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT setflag FLAG_0x09C release end BattleFrontier_Lounge6_EventScript_26506B:: @ 826506B - msgbox BattleFrontier_Lounge6_Text_2651CB, 4 + msgbox BattleFrontier_Lounge6_Text_2651CB, MSGBOX_DEFAULT release end BattleFrontier_Lounge6_EventScript_265075:: @ 8265075 bufferspeciesname 0, VAR_0x8009 - msgbox BattleFrontier_Lounge6_Text_26518D, 4 + msgbox BattleFrontier_Lounge6_Text_26518D, MSGBOX_DEFAULT release end BattleFrontier_Lounge6_EventScript_265083:: @ 8265083 - msgbox BattleFrontier_Lounge6_Text_26520E, 4 + msgbox BattleFrontier_Lounge6_Text_26520E, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 0b810d4f7..882f7a7eb 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -7,13 +7,13 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 setvar VAR_TEMP_C, 9 checkflag FLAG_0x15A goto_eq BattleFrontier_Lounge7_EventScript_265276 - msgbox BattleFrontier_Lounge7_Text_2656ED, 4 + msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT setflag FLAG_0x15A goto BattleFrontier_Lounge7_EventScript_265284 end BattleFrontier_Lounge7_EventScript_265276:: @ 8265276 - msgbox BattleFrontier_Lounge7_Text_2658AB, 4 + msgbox BattleFrontier_Lounge7_Text_2658AB, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_265284 end @@ -122,13 +122,13 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 setvar VAR_TEMP_C, 10 checkflag FLAG_0x15B goto_eq BattleFrontier_Lounge7_EventScript_265466 - msgbox BattleFrontier_Lounge7_Text_265A6C, 4 + msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT setflag FLAG_0x15B goto BattleFrontier_Lounge7_EventScript_265474 end BattleFrontier_Lounge7_EventScript_265466:: @ 8265466 - msgbox BattleFrontier_Lounge7_Text_265C2C, 4 + msgbox BattleFrontier_Lounge7_Text_265C2C, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_265474 end @@ -234,12 +234,12 @@ BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A BattleFrontier_Lounge7_EventScript_265635:: @ 8265635 special sub_813ADB8 special sub_813A988 - msgbox BattleFrontier_Lounge7_Text_265A0E, 4 + msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT release end BattleFrontier_Lounge7_EventScript_265645:: @ 8265645 - msgbox BattleFrontier_Lounge7_Text_265A0E, 4 + msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT release end @@ -249,18 +249,18 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F special sub_813AC7C buffernumberstring 1, VAR_0x8008 copyvar VAR_0x8004, VAR_TEMP_C - msgbox BattleFrontier_Lounge7_Text_265921, 5 + msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_2656CA specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_Lounge7_EventScript_265696 - msgbox BattleFrontier_Lounge7_Text_265997, 4 + msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_2656CA end BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 - msgbox BattleFrontier_Lounge7_Text_26595A, 4 + msgbox BattleFrontier_Lounge7_Text_26595A, MSGBOX_DEFAULT special sub_813AEB4 fadescreen 1 special sub_813A988 @@ -269,7 +269,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_265645 - msgbox BattleFrontier_Lounge7_Text_2659C7, 4 + msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 release @@ -282,11 +282,11 @@ BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA end BattleFrontier_Lounge7_EventScript_2656DB:: @ 82656DB - msgbox BattleFrontier_Lounge7_Text_265C6F, 2 + msgbox BattleFrontier_Lounge7_Text_265C6F, MSGBOX_NPC end BattleFrontier_Lounge7_EventScript_2656E4:: @ 82656E4 - msgbox BattleFrontier_Lounge7_Text_265D17, 2 + msgbox BattleFrontier_Lounge7_Text_265D17, MSGBOX_NPC end BattleFrontier_Lounge7_Text_2656ED: @ 82656ED diff --git a/data/maps/BattleFrontier_Lounge8/scripts.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc index 35f83baff..e6399433e 100644 --- a/data/maps/BattleFrontier_Lounge8/scripts.inc +++ b/data/maps/BattleFrontier_Lounge8/scripts.inc @@ -2,15 +2,15 @@ BattleFrontier_Lounge8_MapScripts:: @ 82676C9 .byte 0 BattleFrontier_Lounge8_EventScript_2676CA:: @ 82676CA - msgbox BattleFrontier_Lounge8_Text_2676E5, 2 + msgbox BattleFrontier_Lounge8_Text_2676E5, MSGBOX_NPC end BattleFrontier_Lounge8_EventScript_2676D3:: @ 82676D3 - msgbox BattleFrontier_Lounge8_Text_26779C, 2 + msgbox BattleFrontier_Lounge8_Text_26779C, MSGBOX_NPC end BattleFrontier_Lounge8_EventScript_2676DC:: @ 82676DC - msgbox BattleFrontier_Lounge8_Text_26782C, 2 + msgbox BattleFrontier_Lounge8_Text_26782C, MSGBOX_NPC end BattleFrontier_Lounge8_Text_2676E5: @ 82676E5 diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 0b7f5b767..f3708b565 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -7,7 +7,7 @@ BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC message gUnknown_08272A21 waitmessage pokemart BattleFrontier_Mart_Pokemart_267AE4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -31,19 +31,19 @@ BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4 end BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 - msgbox BattleFrontier_Mart_Text_267B29, 2 + msgbox BattleFrontier_Mart_Text_267B29, MSGBOX_NPC end BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock applymovement 2, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 - msgbox BattleFrontier_Mart_Text_267B8F, 4 + msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release end BattleFrontier_Mart_EventScript_267B20:: @ 8267B20 - msgbox BattleFrontier_Mart_Text_267C01, 2 + msgbox BattleFrontier_Mart_Text_267C01, MSGBOX_NPC end BattleFrontier_Mart_Text_267B29: @ 8267B29 diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 6ed4d94d6..be0bdc809 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -27,44 +27,44 @@ BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F return BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43 - msgbox BattleFrontier_OutsideEast_Text_242E11, 3 + msgbox BattleFrontier_OutsideEast_Text_242E11, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C - msgbox BattleFrontier_OutsideEast_Text_242E58, 3 + msgbox BattleFrontier_OutsideEast_Text_242E58, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55 - msgbox BattleFrontier_OutsideEast_Text_242E96, 3 + msgbox BattleFrontier_OutsideEast_Text_242E96, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E - msgbox BattleFrontier_OutsideEast_Text_242ECF, 3 + msgbox BattleFrontier_OutsideEast_Text_242ECF, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67 - msgbox BattleFrontier_OutsideEast_Text_242F8C, 2 + msgbox BattleFrontier_OutsideEast_Text_242F8C, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70 - msgbox BattleFrontier_OutsideEast_Text_242FDC, 2 + msgbox BattleFrontier_OutsideEast_Text_242FDC, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79 - msgbox BattleFrontier_OutsideEast_Text_24308C, 2 + msgbox BattleFrontier_OutsideEast_Text_24308C, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82 - msgbox BattleFrontier_OutsideEast_Text_243106, 2 + msgbox BattleFrontier_OutsideEast_Text_243106, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B - msgbox BattleFrontier_OutsideEast_Text_2431A5, 2 + msgbox BattleFrontier_OutsideEast_Text_2431A5, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94 lock - msgbox BattleFrontier_OutsideEast_Text_2432DD, 4 + msgbox BattleFrontier_OutsideEast_Text_2432DD, MSGBOX_DEFAULT release end @@ -73,35 +73,35 @@ BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox BattleFrontier_OutsideEast_Text_24334B, 4 + msgbox BattleFrontier_OutsideEast_Text_24334B, MSGBOX_DEFAULT waitmoncry release end BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2 - msgbox BattleFrontier_OutsideEast_Text_243363, 2 + msgbox BattleFrontier_OutsideEast_Text_243363, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB - msgbox BattleFrontier_OutsideEast_Text_243425, 2 + msgbox BattleFrontier_OutsideEast_Text_243425, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4 - msgbox BattleFrontier_OutsideEast_Text_2434A0, 2 + msgbox BattleFrontier_OutsideEast_Text_2434A0, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD - msgbox BattleFrontier_OutsideEast_Text_243504, 2 + msgbox BattleFrontier_OutsideEast_Text_243504, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6 lock - msgbox BattleFrontier_OutsideEast_Text_243529, 4 + msgbox BattleFrontier_OutsideEast_Text_243529, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1 - msgbox BattleFrontier_OutsideEast_Text_243230, 2 + msgbox BattleFrontier_OutsideEast_Text_243230, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA @@ -123,7 +123,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC playse 269 applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 waitmovement 0 - msgbox gUnknown_082731BD, 4 + msgbox gUnknown_082731BD, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_SUDOWOODO, 2 @@ -169,55 +169,55 @@ BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 step_end BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79 - msgbox BattleFrontier_OutsideEast_Text_243598, 2 + msgbox BattleFrontier_OutsideEast_Text_243598, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82 - msgbox BattleFrontier_OutsideEast_Text_243668, 2 + msgbox BattleFrontier_OutsideEast_Text_243668, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B - msgbox BattleFrontier_OutsideEast_Text_2436F2, 2 + msgbox BattleFrontier_OutsideEast_Text_2436F2, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94 - msgbox BattleFrontier_OutsideEast_Text_243809, 2 + msgbox BattleFrontier_OutsideEast_Text_243809, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D - msgbox BattleFrontier_OutsideEast_Text_243895, 2 + msgbox BattleFrontier_OutsideEast_Text_243895, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6 - msgbox BattleFrontier_OutsideEast_Text_243943, 2 + msgbox BattleFrontier_OutsideEast_Text_243943, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF - msgbox BattleFrontier_OutsideEast_Text_2439A0, 2 + msgbox BattleFrontier_OutsideEast_Text_2439A0, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8 lock - msgbox BattleFrontier_OutsideEast_Text_243A2B, 4 + msgbox BattleFrontier_OutsideEast_Text_243A2B, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3 lock - msgbox BattleFrontier_OutsideEast_Text_243A53, 4 + msgbox BattleFrontier_OutsideEast_Text_243A53, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE - msgbox BattleFrontier_OutsideEast_Text_242F0D, 3 + msgbox BattleFrontier_OutsideEast_Text_242F0D, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7 - msgbox BattleFrontier_OutsideEast_Text_242F4A, 3 + msgbox BattleFrontier_OutsideEast_Text_242F4A, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 - msgbox BattleFrontier_OutsideEast_Text_243B68, 2 + msgbox BattleFrontier_OutsideEast_Text_243B68, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 @@ -225,17 +225,17 @@ BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 faceplayer checkflag FLAG_0x1C6 goto_eq BattleFrontier_OutsideEast_EventScript_242DFE - msgbox BattleFrontier_OutsideEast_Text_243C2C, 4 + msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE - msgbox BattleFrontier_OutsideEast_Text_243CA3, 4 + msgbox BattleFrontier_OutsideEast_Text_243CA3, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08 - msgbox BattleFrontier_OutsideEast_Text_243D0B, 2 + msgbox BattleFrontier_OutsideEast_Text_243D0B, MSGBOX_NPC end BattleFrontier_OutsideEast_Text_242E11: @ 8242E11 diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index ad58cb70f..a735e7ffd 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23D808, 4 + msgbox BattleFrontier_OutsideWest_Text_23D808, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D44E @@ -29,15 +29,15 @@ BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416 end BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E - msgbox BattleFrontier_OutsideWest_Text_23D842, 4 + msgbox BattleFrontier_OutsideWest_Text_23D842, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 - msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5 + msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE - msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 + msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate @@ -45,10 +45,10 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 end BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 - msgbox BattleFrontier_OutsideWest_Text_23D90E, 5 + msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE - msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 + msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate @@ -72,32 +72,32 @@ BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA return BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8 - msgbox BattleFrontier_OutsideWest_Text_23D929, 4 + msgbox BattleFrontier_OutsideWest_Text_23D929, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2 - msgbox BattleFrontier_OutsideWest_Text_23D6F7, 3 + msgbox BattleFrontier_OutsideWest_Text_23D6F7, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB - msgbox BattleFrontier_OutsideWest_Text_23D737, 3 + msgbox BattleFrontier_OutsideWest_Text_23D737, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4 - msgbox BattleFrontier_OutsideWest_Text_23D772, 3 + msgbox BattleFrontier_OutsideWest_Text_23D772, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD - msgbox BattleFrontier_OutsideWest_Text_23D7A6, 2 + msgbox BattleFrontier_OutsideWest_Text_23D7A6, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD - msgbox BattleFrontier_OutsideWest_Text_23D9DD, 2 + msgbox BattleFrontier_OutsideWest_Text_23D9DD, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F - msgbox BattleFrontier_OutsideWest_Text_23D99C, 2 + msgbox BattleFrontier_OutsideWest_Text_23D99C, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 @@ -112,7 +112,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 end BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D - msgbox BattleFrontier_OutsideWest_Text_23DABF, 2 + msgbox BattleFrontier_OutsideWest_Text_23DABF, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536 @@ -128,10 +128,10 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_OutsideWest_Text_23DB7D, 4 + msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 waitmovement 0 - msgbox BattleFrontier_OutsideWest_Text_23DBCE, 4 + msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 @@ -152,7 +152,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA compare VAR_FACING, 4 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - msgbox BattleFrontier_OutsideWest_Text_23DC36, 4 + msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT release end @@ -224,7 +224,7 @@ BattleFrontier_OutsideWest_Movement_23D632: @ 823D632 BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4 + msgbox BattleFrontier_OutsideWest_Text_23DD3B, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideWest_EventScript_23D653 @@ -232,71 +232,71 @@ BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 end BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653 - msgbox BattleFrontier_OutsideWest_Text_23DD7A, 4 + msgbox BattleFrontier_OutsideWest_Text_23DD7A, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D - msgbox BattleFrontier_OutsideWest_Text_23DDAD, 4 + msgbox BattleFrontier_OutsideWest_Text_23DDAD, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667 - msgbox BattleFrontier_OutsideWest_Text_23DE15, 2 + msgbox BattleFrontier_OutsideWest_Text_23DE15, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670 - msgbox BattleFrontier_OutsideWest_Text_23DF7D, 2 + msgbox BattleFrontier_OutsideWest_Text_23DF7D, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679 - msgbox BattleFrontier_OutsideWest_Text_23DEFD, 2 + msgbox BattleFrontier_OutsideWest_Text_23DEFD, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682 - msgbox BattleFrontier_OutsideWest_Text_23DEB4, 2 + msgbox BattleFrontier_OutsideWest_Text_23DEB4, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B - msgbox BattleFrontier_OutsideWest_Text_23DFBF, 2 + msgbox BattleFrontier_OutsideWest_Text_23DFBF, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694 - msgbox BattleFrontier_OutsideWest_Text_23E01E, 2 + msgbox BattleFrontier_OutsideWest_Text_23E01E, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D - msgbox BattleFrontier_OutsideWest_Text_23E09F, 2 + msgbox BattleFrontier_OutsideWest_Text_23E09F, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6 - msgbox BattleFrontier_OutsideWest_Text_23E102, 2 + msgbox BattleFrontier_OutsideWest_Text_23E102, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF - msgbox BattleFrontier_OutsideWest_Text_23E154, 2 + msgbox BattleFrontier_OutsideWest_Text_23E154, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8 lock - msgbox BattleFrontier_OutsideWest_Text_23E273, 4 + msgbox BattleFrontier_OutsideWest_Text_23E273, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3 lock - msgbox BattleFrontier_OutsideWest_Text_23E2E9, 4 + msgbox BattleFrontier_OutsideWest_Text_23E2E9, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE - msgbox BattleFrontier_OutsideWest_Text_23E37E, 2 + msgbox BattleFrontier_OutsideWest_Text_23E37E, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23E410, 4 + msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT closemessage applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 waitmovement 0 @@ -304,7 +304,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 end BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE - msgbox BattleFrontier_OutsideWest_Text_23E5A5, 2 + msgbox BattleFrontier_OutsideWest_Text_23E5A5, MSGBOX_NPC end BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 3dff67a93..e37842cf5 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 end BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916 - msgbox BattleFrontier_PokemonCenter_1F_Text_267944, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_267944, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F - msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 @@ -32,7 +32,7 @@ BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, 4 + msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc index 9015694eb..65b093b32 100644 --- a/data/maps/BattleFrontier_RankingHall/scripts.inc +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -71,34 +71,34 @@ BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522 end BattleFrontier_RankingHall_EventScript_25E52F:: @ 825E52F - msgbox BattleFrontier_RankingHall_Text_25E57C, 2 + msgbox BattleFrontier_RankingHall_Text_25E57C, MSGBOX_NPC end BattleFrontier_RankingHall_EventScript_25E538:: @ 825E538 - msgbox BattleFrontier_RankingHall_Text_25E5F9, 3 + msgbox BattleFrontier_RankingHall_Text_25E5F9, MSGBOX_SIGN end BattleFrontier_RankingHall_EventScript_25E541:: @ 825E541 - msgbox BattleFrontier_RankingHall_Text_25E62E, 3 + msgbox BattleFrontier_RankingHall_Text_25E62E, MSGBOX_SIGN end BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A lock faceplayer - msgbox BattleFrontier_RankingHall_Text_25E666, 5 + msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq BattleFrontier_RankingHall_EventScript_25E569 - msgbox BattleFrontier_RankingHall_Text_25E6B6, 4 + msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT release end BattleFrontier_RankingHall_EventScript_25E569:: @ 825E569 - msgbox BattleFrontier_RankingHall_Text_25E685, 4 + msgbox BattleFrontier_RankingHall_Text_25E685, MSGBOX_DEFAULT release end BattleFrontier_RankingHall_EventScript_25E573:: @ 825E573 - msgbox BattleFrontier_RankingHall_Text_25E715, 2 + msgbox BattleFrontier_RankingHall_Text_25E715, MSGBOX_NPC end BattleFrontier_RankingHall_Text_25E57C: @ 825E57C diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index ec38c3e9d..d5364a2af 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 waitmovement 0 applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266580, 4 + msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2 waitmovement 0 @@ -27,16 +27,16 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 end BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 - msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 - msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4 + msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_2665F7, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message BattleFrontier_ReceptionGate_Text_266676 waitfanfare waitmessage - msgbox BattleFrontier_ReceptionGate_Text_266695, 4 + msgbox BattleFrontier_ReceptionGate_Text_266695, MSGBOX_DEFAULT setflag FLAG_SYS_FRONTIER_PASS - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 - msgbox BattleFrontier_ReceptionGate_Text_266703, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 @@ -47,14 +47,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 applymovement 255, BattleFrontier_ReceptionGate_Movement_272598 waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266733, 4 + msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0 applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6 applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7 applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0 waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266764, 4 + msgbox BattleFrontier_ReceptionGate_Text_266764, MSGBOX_DEFAULT closemessage applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8 waitmovement 0 @@ -121,15 +121,15 @@ BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6 BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_266857, 4 + msgbox BattleFrontier_ReceptionGate_Text_266857, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end @@ -154,59 +154,59 @@ BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320 end BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE - msgbox BattleFrontier_ReceptionGate_Text_2668C2, 4 + msgbox BattleFrontier_ReceptionGate_Text_2668C2, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC - msgbox BattleFrontier_ReceptionGate_Text_26696F, 4 + msgbox BattleFrontier_ReceptionGate_Text_26696F, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA - msgbox BattleFrontier_ReceptionGate_Text_266A34, 4 + msgbox BattleFrontier_ReceptionGate_Text_266A34, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8 - msgbox BattleFrontier_ReceptionGate_Text_266AC2, 4 + msgbox BattleFrontier_ReceptionGate_Text_266AC2, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6 - msgbox BattleFrontier_ReceptionGate_Text_266B5D, 4 + msgbox BattleFrontier_ReceptionGate_Text_266B5D, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4 - msgbox BattleFrontier_ReceptionGate_Text_266C24, 4 + msgbox BattleFrontier_ReceptionGate_Text_266C24, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402 - msgbox BattleFrontier_ReceptionGate_Text_266CBB, 4 + msgbox BattleFrontier_ReceptionGate_Text_266CBB, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410 - msgbox BattleFrontier_ReceptionGate_Text_266D1C, 4 + msgbox BattleFrontier_ReceptionGate_Text_266D1C, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E - msgbox BattleFrontier_ReceptionGate_Text_266DCB, 4 + msgbox BattleFrontier_ReceptionGate_Text_266DCB, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_266E66, 4 + msgbox BattleFrontier_ReceptionGate_Text_266E66, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end @@ -225,39 +225,39 @@ BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446 end BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4 - msgbox BattleFrontier_ReceptionGate_Text_266F04, 4 + msgbox BattleFrontier_ReceptionGate_Text_266F04, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2 - msgbox BattleFrontier_ReceptionGate_Text_266F69, 4 + msgbox BattleFrontier_ReceptionGate_Text_266F69, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0 - msgbox BattleFrontier_ReceptionGate_Text_267080, 4 + msgbox BattleFrontier_ReceptionGate_Text_267080, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE - msgbox BattleFrontier_ReceptionGate_Text_26716A, 4 + msgbox BattleFrontier_ReceptionGate_Text_26716A, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC - msgbox BattleFrontier_ReceptionGate_Text_267298, 4 + msgbox BattleFrontier_ReceptionGate_Text_267298, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_267357, 4 + msgbox BattleFrontier_ReceptionGate_Text_267357, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end @@ -274,22 +274,22 @@ BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504 end BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C - msgbox BattleFrontier_ReceptionGate_Text_2673A1, 4 + msgbox BattleFrontier_ReceptionGate_Text_2673A1, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A - msgbox BattleFrontier_ReceptionGate_Text_2674F3, 4 + msgbox BattleFrontier_ReceptionGate_Text_2674F3, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568 - msgbox BattleFrontier_ReceptionGate_Text_26761C, 4 + msgbox BattleFrontier_ReceptionGate_Text_26761C, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576 - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index ac7c5eb7a..818fb92b0 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -46,7 +46,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC checkflag FLAG_SYS_PYRAMID_SILVER goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - msgbox BattleFrontier_ScottsHouse_Text_2640BC, 4 + msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT giveitem_std ITEM_LANSAT_BERRY compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 @@ -70,7 +70,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC checkflag FLAG_SYS_PYRAMID_GOLD goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - msgbox BattleFrontier_ScottsHouse_Text_264216, 4 + msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT giveitem_std ITEM_STARF_BERRY compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 @@ -80,12 +80,12 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A end BattleFrontier_ScottsHouse_EventScript_2637D0:: @ 82637D0 - msgbox BattleFrontier_ScottsHouse_Text_2643EB, 4 + msgbox BattleFrontier_ScottsHouse_Text_2643EB, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA - msgbox BattleFrontier_ScottsHouse_Text_264373, 4 + msgbox BattleFrontier_ScottsHouse_Text_264373, MSGBOX_DEFAULT release end @@ -95,17 +95,17 @@ BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 goto_eq BattleFrontier_ScottsHouse_EventScript_263807 compare VAR_RESULT, 2 goto_eq BattleFrontier_ScottsHouse_EventScript_263811 - msgbox BattleFrontier_ScottsHouse_Text_263DDD, 4 + msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263807:: @ 8263807 - msgbox BattleFrontier_ScottsHouse_Text_263F12, 4 + msgbox BattleFrontier_ScottsHouse_Text_263F12, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811 - msgbox BattleFrontier_ScottsHouse_Text_263FFE, 4 + msgbox BattleFrontier_ScottsHouse_Text_263FFE, MSGBOX_DEFAULT release end @@ -133,7 +133,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B end BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A - msgbox BattleFrontier_ScottsHouse_Text_264412, 4 + msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT givedecoration_std 42 compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 @@ -143,12 +143,12 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A end BattleFrontier_ScottsHouse_EventScript_2638A0:: @ 82638A0 - msgbox BattleFrontier_ScottsHouse_Text_264583, 4 + msgbox BattleFrontier_ScottsHouse_Text_264583, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA - msgbox BattleFrontier_ScottsHouse_Text_264546, 4 + msgbox BattleFrontier_ScottsHouse_Text_264546, MSGBOX_DEFAULT release end @@ -176,7 +176,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 end BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 - msgbox BattleFrontier_ScottsHouse_Text_26449F, 4 + msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT givedecoration_std 43 compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 @@ -186,12 +186,12 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 end BattleFrontier_ScottsHouse_EventScript_263939:: @ 8263939 - msgbox BattleFrontier_ScottsHouse_Text_263DB8, 4 + msgbox BattleFrontier_ScottsHouse_Text_263DB8, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 - msgbox BattleFrontier_ScottsHouse_Text_263A3F, 4 + msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT closemessage delay 30 compare VAR_FACING, 2 @@ -202,10 +202,10 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 compare VAR_FACING, 3 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 - msgbox BattleFrontier_ScottsHouse_Text_263B29, 4 + msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E waitmovement 0 - msgbox BattleFrontier_ScottsHouse_Text_263BD4, 4 + msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC compare VAR_0x40D1, 9 @@ -242,7 +242,7 @@ BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9 BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 special sub_813A9D0 msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9 - msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4 + msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT setflag FLAG_0x1D1 setflag FLAG_TEMP_2 release diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index fe939172d..dc3407e33 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -4,10 +4,10 @@ BirthIsland_Harbor_MapScripts:: @ 826805C BirthIsland_Harbor_EventScript_26805D:: @ 826805D lock faceplayer - msgbox BirthIsland_Harbor_Text_2C6B90, 5 + msgbox BirthIsland_Harbor_Text_2C6B90, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BirthIsland_Harbor_EventScript_2680A2 - msgbox BirthIsland_Harbor_Text_2A6A5D, 4 + msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA waitmovement 0 @@ -21,7 +21,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D end BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2 - msgbox BirthIsland_Harbor_Text_2A6A82, 4 + msgbox BirthIsland_Harbor_Text_2A6A82, MSGBOX_DEFAULT release end diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 198fffa2b..21ff3537b 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B1F_MapScripts:: @ 82357A8 CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 lock faceplayer - msgbox CaveOfOrigin_B1F_Text_23586E, 4 + msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 waitmovement 0 @@ -47,7 +47,7 @@ CaveOfOrigin_B1F_EventScript_235842:: @ 8235842 goto CaveOfOrigin_B1F_EventScript_2357F0 CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D - msgbox CaveOfOrigin_B1F_Text_235CEE, 4 + msgbox CaveOfOrigin_B1F_Text_235CEE, MSGBOX_DEFAULT closemessage playse SE_KAIDAN fadescreenspeed 1, 4 diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 9d085e45a..760336d91 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -51,7 +51,7 @@ DesertRuins_EventScript_22D9DB:: @ 822D9DB end DesertRuins_EventScript_22D9EE:: @ 822D9EE - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index f14dbbfe8..07f7d9ac8 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -22,53 +22,53 @@ DewfordTown_EventScript_1E9511:: @ 81E9511 end DewfordTown_EventScript_1E955A:: @ 81E955A - msgbox DewfordTown_Text_1E9CE5, 4 + msgbox DewfordTown_Text_1E9CE5, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E9660 release end DewfordTown_EventScript_1E956A:: @ 81E956A - msgbox DewfordTown_Text_1E9D3A, 4 + msgbox DewfordTown_Text_1E9D3A, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E96E7 release end DewfordTown_EventScript_1E957A:: @ 81E957A - msgbox DewfordTown_Text_1E9D8F, 4 + msgbox DewfordTown_Text_1E9D8F, MSGBOX_DEFAULT closemessage release end DewfordTown_EventScript_1E9585:: @ 81E9585 - msgbox DewfordTown_Text_1E9B24, 5 + msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95A2 - msgbox DewfordTown_Text_1E9BD9, 4 + msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E95A2:: @ 81E95A2 - msgbox DewfordTown_Text_1E9B7F, 4 + msgbox DewfordTown_Text_1E9B7F, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E9660 end DewfordTown_EventScript_1E95B1:: @ 81E95B1 - msgbox DewfordTown_Text_1E99A8, 2 + msgbox DewfordTown_Text_1E99A8, MSGBOX_NPC end DewfordTown_EventScript_1E95BA:: @ 81E95BA - msgbox DewfordTown_Text_1E9A0F, 3 + msgbox DewfordTown_Text_1E9A0F, MSGBOX_SIGN end DewfordTown_EventScript_1E95C3:: @ 81E95C3 - msgbox DewfordTown_Text_1E9A3D, 3 + msgbox DewfordTown_Text_1E9A3D, MSGBOX_SIGN end DewfordTown_EventScript_1E95CC:: @ 81E95CC - msgbox DewfordTown_Text_1E9A7F, 3 + msgbox DewfordTown_Text_1E9A7F, MSGBOX_SIGN end DewfordTown_EventScript_1E95D5:: @ 81E95D5 @@ -76,7 +76,7 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 faceplayer checkflag FLAG_0x101 goto_eq DewfordTown_EventScript_1E962A - msgbox DewfordTown_Text_1E9DD1, 5 + msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95FF compare VAR_RESULT, 0 @@ -84,15 +84,15 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 end DewfordTown_EventScript_1E95FF:: @ 81E95FF - msgbox DewfordTown_Text_1E9E14, 4 + msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT giveitem_std ITEM_OLD_ROD setflag FLAG_0x101 - msgbox DewfordTown_Text_1E9E65, 4 + msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9620:: @ 81E9620 - msgbox DewfordTown_Text_1E9F92, 4 + msgbox DewfordTown_Text_1E9F92, MSGBOX_DEFAULT release end @@ -107,12 +107,12 @@ DewfordTown_EventScript_1E962A:: @ 81E962A end DewfordTown_EventScript_1E964C:: @ 81E964C - msgbox DewfordTown_Text_1E9FD0, 4 + msgbox DewfordTown_Text_1E9FD0, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9656:: @ 81E9656 - msgbox DewfordTown_Text_1EA004, 4 + msgbox DewfordTown_Text_1EA004, MSGBOX_DEFAULT release end @@ -189,11 +189,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 end DewfordTown_EventScript_1E9790:: @ 81E9790 - msgbox DewfordTown_Text_1EEC1D, 4 + msgbox DewfordTown_Text_1EEC1D, MSGBOX_DEFAULT return DewfordTown_EventScript_1E9799:: @ 81E9799 - msgbox DewfordTown_Text_1EEDA7, 4 + msgbox DewfordTown_Text_1EEDA7, MSGBOX_DEFAULT return DewfordTown_Movement_1E97A2: @ 81E97A2 @@ -598,7 +598,7 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 lock faceplayer call DewfordTown_EventScript_271E8B - msgbox DewfordTown_Text_1EA136, 5 + msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E9948 compare VAR_RESULT, 0 @@ -606,12 +606,12 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 end DewfordTown_EventScript_1E9948:: @ 81E9948 - msgbox DewfordTown_Text_1EA491, 4 + msgbox DewfordTown_Text_1EA491, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9952:: @ 81E9952 - msgbox DewfordTown_Text_1EA242, 4 + msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT setvar VAR_0x8004, 9 call DewfordTown_EventScript_271E7C lock @@ -626,17 +626,17 @@ DewfordTown_EventScript_1E997D:: @ 81E997D incrementgamestat 2 compare VAR_0x8004, 0 goto_eq DewfordTown_EventScript_1E999E - msgbox DewfordTown_Text_1EA2AA, 4 + msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9994:: @ 81E9994 - msgbox DewfordTown_Text_1EA443, 4 + msgbox DewfordTown_Text_1EA443, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E999E:: @ 81E999E - msgbox DewfordTown_Text_1EA3FE, 4 + msgbox DewfordTown_Text_1EA3FE, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 6acd67792..5de208d11 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -162,7 +162,7 @@ DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 goto_eq DewfordTown_Gym_EventScript_1FC89C checkflag FLAG_0x0A6 goto_if 0, DewfordTown_Gym_EventScript_1FC878 - msgbox DewfordTown_Gym_Text_1FD20D, 4 + msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT release end @@ -171,7 +171,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 message DewfordTown_Gym_Text_1FD07D waitmessage call DewfordTown_Gym_EventScript_27207E - msgbox DewfordTown_Gym_Text_1FD0A8, 4 + msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_0x4F1 setflag FLAG_BADGE02_GET addvar VAR_0x4085, 1 @@ -183,7 +183,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox DewfordTown_Gym_Text_1FD1E0, 4 + msgbox DewfordTown_Gym_Text_1FD1E0, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -197,7 +197,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_27205E - msgbox DewfordTown_Gym_Text_1FD181, 4 + msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 return @@ -205,19 +205,19 @@ DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_272054 - msgbox DewfordTown_Gym_Text_1FD181, 4 + msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 release end DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C trainerbattle 7, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE - msgbox DewfordTown_Gym_Text_1FD37B, 6 + msgbox DewfordTown_Gym_Text_1FD37B, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7 trainerbattle 2, TRAINER_TAKAO, 0, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 - msgbox DewfordTown_Gym_Text_1FCBCA, 6 + msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 @@ -227,7 +227,7 @@ DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9 trainerbattle 2, TRAINER_JOCELYN, 0, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 - msgbox DewfordTown_Gym_Text_1FCC6B, 6 + msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 @@ -237,7 +237,7 @@ DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 - msgbox DewfordTown_Gym_Text_1FCD4F, 6 + msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 @@ -247,7 +247,7 @@ DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D trainerbattle 2, TRAINER_BRENDEN, 0, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 - msgbox DewfordTown_Gym_Text_1FCEAB, 6 + msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 @@ -257,7 +257,7 @@ DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F trainerbattle 2, TRAINER_CRISTIAN, 0, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A - msgbox DewfordTown_Gym_Text_1FCF26, 6 + msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A @@ -267,7 +267,7 @@ DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A DewfordTown_Gym_EventScript_1FC961:: @ 81FC961 trainerbattle 2, TRAINER_LILITH, 0, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C - msgbox DewfordTown_Gym_Text_1FCE08, 6 + msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C @@ -280,12 +280,12 @@ DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 faceplayer checkflag FLAG_0x4F1 goto_eq DewfordTown_Gym_EventScript_1FC998 - msgbox DewfordTown_Gym_Text_1FC9D6, 4 + msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT release end DewfordTown_Gym_EventScript_1FC998:: @ 81FC998 - msgbox DewfordTown_Gym_Text_1FCB5C, 4 + msgbox DewfordTown_Gym_Text_1FCB5C, MSGBOX_DEFAULT release end @@ -304,12 +304,12 @@ DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2 end DewfordTown_Gym_EventScript_1FC9C2:: @ 81FC9C2 - msgbox DewfordTown_Gym_Text_1FD28B, 4 + msgbox DewfordTown_Gym_Text_1FD28B, MSGBOX_DEFAULT releaseall end DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC - msgbox DewfordTown_Gym_Text_1FD272, 4 + msgbox DewfordTown_Gym_Text_1FD272, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index d8c19f1fe..fa142696c 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -8,12 +8,12 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 special TrendyPhraseIsOld compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD4EF - msgbox DewfordTown_Hall_Text_1FD818, 4 + msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF - msgbox DewfordTown_Hall_Text_1FD877, 4 + msgbox DewfordTown_Hall_Text_1FD877, MSGBOX_DEFAULT release end @@ -21,7 +21,7 @@ DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FD8ED, 4 + msgbox DewfordTown_Hall_Text_1FD8ED, MSGBOX_DEFAULT release end @@ -30,7 +30,7 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A faceplayer call DewfordTown_Hall_EventScript_271E8B special sub_811EF6C - msgbox DewfordTown_Hall_Text_1FD948, 5 + msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD533 compare VAR_RESULT, 0 @@ -38,12 +38,12 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A end DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 - msgbox DewfordTown_Hall_Text_1FD9B3, 4 + msgbox DewfordTown_Hall_Text_1FD9B3, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D - msgbox DewfordTown_Hall_Text_1FDA06, 4 + msgbox DewfordTown_Hall_Text_1FDA06, MSGBOX_DEFAULT release end @@ -51,7 +51,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA5C, 4 + msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage applymovement 4, DewfordTown_Hall_Movement_2725A6 waitmovement 0 @@ -62,7 +62,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA99, 4 + msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage applymovement 5, DewfordTown_Hall_Movement_2725A6 waitmovement 0 @@ -73,14 +73,14 @@ DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDAC4, 4 + msgbox DewfordTown_Hall_Text_1FDAC4, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 lockall call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDB89, 4 + msgbox DewfordTown_Hall_Text_1FDB89, MSGBOX_DEFAULT releaseall end @@ -100,22 +100,22 @@ DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 end DewfordTown_Hall_EventScript_1FD607:: @ 81FD607 - msgbox DewfordTown_Hall_Text_1FDC05, 4 + msgbox DewfordTown_Hall_Text_1FDC05, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD611:: @ 81FD611 - msgbox DewfordTown_Hall_Text_1FDC21, 4 + msgbox DewfordTown_Hall_Text_1FDC21, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B - msgbox DewfordTown_Hall_Text_1FDC3C, 4 + msgbox DewfordTown_Hall_Text_1FDC3C, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD625:: @ 81FD625 - msgbox DewfordTown_Hall_Text_1FDC57, 4 + msgbox DewfordTown_Hall_Text_1FDC57, MSGBOX_DEFAULT releaseall end @@ -147,41 +147,41 @@ DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDC76, 4 + msgbox DewfordTown_Hall_Text_1FDC76, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDCE2, 4 + msgbox DewfordTown_Hall_Text_1FDCE2, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDD95, 4 + msgbox DewfordTown_Hall_Text_1FDD95, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDE0E, 4 + msgbox DewfordTown_Hall_Text_1FDE0E, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDE77, 4 + msgbox DewfordTown_Hall_Text_1FDE77, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDED8, 4 + msgbox DewfordTown_Hall_Text_1FDED8, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD701:: @ 81FD701 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDF72, 4 + msgbox DewfordTown_Hall_Text_1FDF72, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDFF1, 4 + msgbox DewfordTown_Hall_Text_1FDFF1, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FE09A, 4 + msgbox DewfordTown_Hall_Text_1FE09A, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FE0F2, 4 + msgbox DewfordTown_Hall_Text_1FE0F2, MSGBOX_DEFAULT releaseall end @@ -254,7 +254,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA call DewfordTown_Hall_EventScript_271E8B checkflag FLAG_RECEIVED_TM_36 goto_eq DewfordTown_Hall_EventScript_1FD80E - msgbox DewfordTown_Hall_Text_1FE142, 4 + msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 goto_eq DewfordTown_Hall_EventScript_272054 @@ -263,7 +263,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA end DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E - msgbox DewfordTown_Hall_Text_1FE1ED, 4 + msgbox DewfordTown_Hall_Text_1FE1ED, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc index 59c490d81..d051cfc19 100644 --- a/data/maps/DewfordTown_House1/scripts.inc +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -2,11 +2,11 @@ DewfordTown_House1_MapScripts:: @ 81FC3CD .byte 0 DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE - msgbox DewfordTown_House1_Text_1FC3F3, 2 + msgbox DewfordTown_House1_Text_1FC3F3, MSGBOX_NPC end DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7 - msgbox DewfordTown_House1_Text_1FC45B, 2 + msgbox DewfordTown_House1_Text_1FC45B, MSGBOX_NPC end DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 @@ -14,7 +14,7 @@ DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox DewfordTown_House1_Text_1FC510, 4 + msgbox DewfordTown_House1_Text_1FC510, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index 1805164af..2385b8328 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -6,7 +6,7 @@ DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E faceplayer checkflag FLAG_0x121 goto_eq DewfordTown_House2_EventScript_1FE267 - msgbox DewfordTown_House2_Text_1FE27A, 4 + msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF compare VAR_RESULT, 0 goto_eq DewfordTown_House2_EventScript_1FE25D @@ -15,17 +15,17 @@ DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E end DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D - msgbox DewfordTown_House2_Text_1FE356, 4 + msgbox DewfordTown_House2_Text_1FE356, MSGBOX_DEFAULT release end DewfordTown_House2_EventScript_1FE267:: @ 81FE267 - msgbox DewfordTown_House2_Text_1FE3D1, 4 + msgbox DewfordTown_House2_Text_1FE3D1, MSGBOX_DEFAULT release end DewfordTown_House2_EventScript_1FE271:: @ 81FE271 - msgbox DewfordTown_House2_Text_1FE444, 2 + msgbox DewfordTown_House2_Text_1FE444, MSGBOX_NPC end DewfordTown_House2_Text_1FE27A: @ 81FE27A diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index a9ce59bc1..e01e37f7b 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 end DewfordTown_PokemonCenter_1F_EventScript_1FC545:: @ 81FC545 - msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, 2 + msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, MSGBOX_NPC end DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E - msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, 2 + msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, MSGBOX_NPC end DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557 diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 178621217..5bb85a3c1 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -8,15 +8,15 @@ EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B - msgbox EverGrandeCity_Text_1E7D4F, 3 + msgbox EverGrandeCity_Text_1E7D4F, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D34:: @ 81E7D34 - msgbox EverGrandeCity_Text_1E7D89, 3 + msgbox EverGrandeCity_Text_1E7D89, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D - msgbox EverGrandeCity_Text_1E7D65, 3 + msgbox EverGrandeCity_Text_1E7D65, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D46:: @ 81E7D46 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 71a72b83c..7ca56c420 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -39,7 +39,7 @@ EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 playbgm MUS_DAIGO, 0 - msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC goto EverGrandeCity_ChampionsRoom_EventScript_228A61 end @@ -49,7 +49,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 setmetatile 6, 1, 838, 0 setmetatile 6, 2, 839, 0 special DrawWholeMapView - msgbox EverGrandeCity_ChampionsRoom_Text_228F66, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT closemessage playse SE_DOOR checkplayergender @@ -75,7 +75,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 return EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 - msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 @@ -83,12 +83,12 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_22910B, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT goto EverGrandeCity_ChampionsRoom_EventScript_228B30 end EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB - msgbox EverGrandeCity_ChampionsRoom_Text_229152, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 @@ -96,7 +96,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT goto EverGrandeCity_ChampionsRoom_EventScript_228B30 end @@ -107,15 +107,15 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 waitmovement 0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8 waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 - msgbox EverGrandeCity_ChampionsRoom_Text_22934D, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 waitmovement 0 delay 20 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_229399, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B @@ -126,7 +126,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 delay 20 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender compare VAR_RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB @@ -143,11 +143,11 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 end EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB - msgbox EverGrandeCity_ChampionsRoom_Text_229479, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229479, MSGBOX_DEFAULT return EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 - msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, MSGBOX_DEFAULT return EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 4c90417af..2e1db2c5e 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -44,13 +44,13 @@ EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 checkflag FLAG_0x4FE goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_DrakesRoom_Text_22873E, 4 + msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895 goto EverGrandeCity_DrakesRoom_EventScript_228724 end EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 + msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT release end @@ -59,7 +59,7 @@ EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724 special sub_813BF7C setflag FLAG_0x4FE call EverGrandeCity_DrakesRoom_EventScript_2723F8 - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 + msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index f1d846f03..90c2957aa 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -44,20 +44,20 @@ EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 checkflag FLAG_0x4FD goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, 4 + msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4 goto EverGrandeCity_GlaciasRoom_EventScript_22849A end EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 + msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT release end EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A setflag FLAG_0x4FD call EverGrandeCity_GlaciasRoom_EventScript_2723F8 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 + msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 763d2ebb1..8f510c13e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -23,7 +23,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_22990E, 4 + msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 applymovement 255, EverGrandeCity_HallOfFame_Movement_229908 @@ -32,7 +32,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_2299A3, 4 + msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 679e4f663..c5f2e9b1a 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -44,20 +44,20 @@ EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB checkflag FLAG_0x4FC goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_PhoebesRoom_Text_22820E, 4 + msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325 goto EverGrandeCity_PhoebesRoom_EventScript_2281FC end EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 + msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT release end EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC setflag FLAG_0x4FC call EverGrandeCity_PhoebesRoom_EventScript_2723F8 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 + msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index aaec19840..e1ec4c671 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -24,17 +24,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 end EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, 2 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, MSGBOX_NPC end EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, 2 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, MSGBOX_NPC end EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 lock faceplayer - msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index b4046d022..7477cf5d5 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -29,7 +29,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A message gUnknown_08272A21 waitmessage pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -88,14 +88,14 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3 EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE playse SE_HAZURE - msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, 4 + msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, MSGBOX_DEFAULT releaseall end EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E waitmovement 0 - msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, 4 + msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 waitmovement 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 5513d3c24..3b80dfe39 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -51,20 +51,20 @@ EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 checkflag FLAG_0x4FB goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_SidneysRoom_Text_227FA7, 4 + msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2 goto EverGrandeCity_SidneysRoom_EventScript_227F95 end EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 + msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release end EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 setflag FLAG_0x4FB call EverGrandeCity_SidneysRoom_EventScript_2723F8 - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 + msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 21cea72e1..80dc91f9e 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -13,21 +13,21 @@ FallarborTown_EventScript_1EB20C:: @ 81EB20C faceplayer checkflag FLAG_0x08B goto_eq FallarborTown_EventScript_1EB221 - msgbox FallarborTown_Text_1EB26B, 4 + msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT release end FallarborTown_EventScript_1EB221:: @ 81EB221 - msgbox FallarborTown_Text_1EB2DE, 4 + msgbox FallarborTown_Text_1EB2DE, MSGBOX_DEFAULT release end FallarborTown_EventScript_1EB22B:: @ 81EB22B - msgbox FallarborTown_Text_1EB35F, 2 + msgbox FallarborTown_Text_1EB35F, MSGBOX_NPC end FallarborTown_EventScript_1EB234:: @ 81EB234 - msgbox FallarborTown_Text_1EB3CA, 2 + msgbox FallarborTown_Text_1EB3CA, MSGBOX_NPC end FallarborTown_EventScript_1EB23D:: @ 81EB23D @@ -35,21 +35,21 @@ FallarborTown_EventScript_1EB23D:: @ 81EB23D faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_1EB3B5, 4 + msgbox FallarborTown_Text_1EB3B5, MSGBOX_DEFAULT waitmoncry release end FallarborTown_EventScript_1EB250:: @ 81EB250 - msgbox FallarborTown_Text_1EB4C2, 3 + msgbox FallarborTown_Text_1EB4C2, MSGBOX_SIGN end FallarborTown_EventScript_1EB259:: @ 81EB259 - msgbox FallarborTown_Text_1EB4FE, 3 + msgbox FallarborTown_Text_1EB4FE, MSGBOX_SIGN end FallarborTown_EventScript_1EB262:: @ 81EB262 - msgbox FallarborTown_Text_1EB534, 3 + msgbox FallarborTown_Text_1EB534, MSGBOX_SIGN end FallarborTown_Text_1EB26B: @ 81EB26B diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 8bbcef830..f3e1edbbf 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -51,10 +51,10 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F playse SE_W187 waitse waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, MSGBOX_DEFAULT setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call FallarborTown_BattleTentBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -65,7 +65,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F waitmovement 0 setvar VAR_0x8004, 6 special sub_81B9B80 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, MSGBOX_DEFAULT FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E setvar VAR_0x8004, 2 @@ -81,7 +81,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C playse SE_BAN waitse waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, MSGBOX_DEFAULT closemessage FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 @@ -102,7 +102,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 waitmovement 0 applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty setvar VAR_0x8004, 3 @@ -127,7 +127,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6 FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 - msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, 5 + msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51 diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 7c75ae4f0..34906cfd3 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -27,7 +27,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4DED, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -43,7 +43,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT message FallarborTown_BattleTentLobby_Text_2C4EFF waitmessage setvar VAR_0x8004, 4 @@ -59,7 +59,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED waitse FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 - msgbox FallarborTown_BattleTentLobby_Text_2C4F22, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT setvar VAR_0x8004, 5 special sub_81B9B80 switch VAR_RESULT @@ -72,14 +72,14 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 - msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4F83, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_TEMP_0, 255 @@ -88,7 +88,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84 lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_1FFF27 end @@ -105,7 +105,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 special sub_81B9B80 playse SE_SAVE waitse - msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -135,7 +135,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 special SavePlayerParty - msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C47EB, MSGBOX_DEFAULT FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 message FallarborTown_BattleTentLobby_Text_2C4843 @@ -159,7 +159,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc - msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 @@ -167,7 +167,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D waitstate compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 - msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5 + msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_2001C2 case 1, FallarborTown_BattleTentLobby_EventScript_2000E2 @@ -201,7 +201,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -210,7 +210,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C end FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169 - msgbox FallarborTown_BattleTentLobby_Text_2C48AC, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C48AC, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_200021 FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 @@ -219,11 +219,11 @@ FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 case 1, FallarborTown_BattleTentLobby_EventScript_20019E FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191 - msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_2001CD FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E - msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_2001CD FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB @@ -237,7 +237,7 @@ FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2 special LoadPlayerParty FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5 - msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C487F, MSGBOX_DEFAULT FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD release @@ -280,15 +280,15 @@ FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 step_end FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D - msgbox FallarborTown_BattleTentLobby_Text_20045A, 2 + msgbox FallarborTown_BattleTentLobby_Text_20045A, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216 - msgbox FallarborTown_BattleTentLobby_Text_200304, 2 + msgbox FallarborTown_BattleTentLobby_Text_200304, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F - msgbox FallarborTown_BattleTentLobby_Text_200382, 2 + msgbox FallarborTown_BattleTentLobby_Text_200382, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 @@ -296,20 +296,20 @@ FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 faceplayer checkflag FLAG_0x1CD goto_eq FallarborTown_BattleTentLobby_EventScript_200245 - msgbox FallarborTown_BattleTentLobby_Text_200501, 4 + msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CD release end FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245 - msgbox FallarborTown_BattleTentLobby_Text_200653, 4 + msgbox FallarborTown_BattleTentLobby_Text_200653, MSGBOX_DEFAULT release end FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F lockall - msgbox FallarborTown_BattleTentLobby_Text_256DB8, 4 + msgbox FallarborTown_BattleTentLobby_Text_256DB8, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end @@ -328,27 +328,27 @@ FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E end FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC - msgbox FallarborTown_BattleTentLobby_Text_2C67CD, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA - msgbox FallarborTown_BattleTentLobby_Text_256E02, 4 + msgbox FallarborTown_BattleTentLobby_Text_256E02, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8 - msgbox FallarborTown_BattleTentLobby_Text_256F43, 4 + msgbox FallarborTown_BattleTentLobby_Text_256F43, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6 - msgbox FallarborTown_BattleTentLobby_Text_256FF2, 4 + msgbox FallarborTown_BattleTentLobby_Text_256FF2, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4 - msgbox FallarborTown_BattleTentLobby_Text_257202, 4 + msgbox FallarborTown_BattleTentLobby_Text_257202, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 4c02160f7..e759b43b3 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -9,7 +9,7 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13 checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 goto_eq FallarborTown_House1_EventScript_200F38 - msgbox FallarborTown_House1_Text_200FEE, 4 + msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT release end @@ -20,34 +20,34 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 call_if 1, FallarborTown_House1_EventScript_200F9C compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_200FA5 - msgbox FallarborTown_House1_Text_201159, 4 + msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_0x0E5 - msgbox FallarborTown_House1_Text_2011A5, 4 + msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200F8B:: @ 8200F8B - msgbox FallarborTown_House1_Text_200FEE, 4 - msgbox FallarborTown_House1_Text_2010A2, 5 + msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT + msgbox FallarborTown_House1_Text_2010A2, MSGBOX_YESNO return FallarborTown_House1_EventScript_200F9C:: @ 8200F9C - msgbox FallarborTown_House1_Text_201249, 5 + msgbox FallarborTown_House1_Text_201249, MSGBOX_YESNO return FallarborTown_House1_EventScript_200FA5:: @ 8200FA5 setflag FLAG_TEMP_2 - msgbox FallarborTown_House1_Text_201212, 4 + msgbox FallarborTown_House1_Text_201212, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 - msgbox FallarborTown_House1_Text_2011A5, 4 + msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT release end @@ -58,17 +58,17 @@ FallarborTown_House1_EventScript_200FBC:: @ 8200FBC goto_eq FallarborTown_House1_EventScript_200FE4 checkflag FLAG_0x08B goto_eq FallarborTown_House1_EventScript_200FDA - msgbox FallarborTown_House1_Text_2012BC, 4 + msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FDA:: @ 8200FDA - msgbox FallarborTown_House1_Text_201310, 4 + msgbox FallarborTown_House1_Text_201310, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FE4:: @ 8200FE4 - msgbox FallarborTown_House1_Text_20134B, 4 + msgbox FallarborTown_House1_Text_20134B, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index c24c7b1f6..e1d072e49 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -7,7 +7,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 waitmovement 0 checkflag FLAG_TEMP_1 goto_eq FallarborTown_House2_EventScript_2013A8 - msgbox FallarborTown_House2_Text_20145C, 4 + msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_2013A8 end @@ -16,14 +16,14 @@ FallarborTown_House2_EventScript_2013A8:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 compare VAR_RESULT, 0 goto_eq FallarborTown_House2_EventScript_201452 - msgbox FallarborTown_House2_Text_201541, 5 + msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_House2_EventScript_201452 goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_2013D6:: @ 82013D6 - msgbox FallarborTown_House2_Text_2015A5, 4 + msgbox FallarborTown_House2_Text_2015A5, MSGBOX_DEFAULT special sub_81B951C waitstate compare VAR_0x8004, 255 @@ -37,28 +37,28 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 end FallarborTown_House2_EventScript_20140C:: @ 820140C - msgbox FallarborTown_House2_Text_2015C3, 4 + msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT special TeachMoveTutorMove waitstate compare VAR_0x8004, 0 goto_eq FallarborTown_House2_EventScript_2013D6 - msgbox FallarborTown_House2_Text_201627, 4 + msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_201452 end FallarborTown_House2_EventScript_201436:: @ 8201436 - msgbox FallarborTown_House2_Text_2015DE, 4 + msgbox FallarborTown_House2_Text_2015DE, MSGBOX_DEFAULT goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_201444:: @ 8201444 - msgbox FallarborTown_House2_Text_201697, 4 + msgbox FallarborTown_House2_Text_201697, MSGBOX_DEFAULT goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_201452:: @ 8201452 - msgbox FallarborTown_House2_Text_201653, 4 + msgbox FallarborTown_House2_Text_201653, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index dbaf33f4e..4b7e0253c 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -7,7 +7,7 @@ FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF message gUnknown_08272A21 waitmessage pokemart FallarborTown_Mart_Pokemart_1FFCD8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -30,11 +30,11 @@ FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8 end FallarborTown_Mart_EventScript_1FFCF4:: @ 81FFCF4 - msgbox FallarborTown_Mart_Text_1FFD19, 2 + msgbox FallarborTown_Mart_Text_1FFD19, MSGBOX_NPC end FallarborTown_Mart_EventScript_1FFCFD:: @ 81FFCFD - msgbox FallarborTown_Mart_Text_1FFE09, 2 + msgbox FallarborTown_Mart_Text_1FFE09, MSGBOX_NPC end FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 @@ -42,7 +42,7 @@ FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox FallarborTown_Mart_Text_1FFDFA, 4 + msgbox FallarborTown_Mart_Text_1FFDFA, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index e408f04d9..6138c615c 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -17,17 +17,17 @@ FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 end FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF - msgbox FallarborTown_PokemonCenter_1F_Text_200E22, 2 + msgbox FallarborTown_PokemonCenter_1F_Text_200E22, MSGBOX_NPC end FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8 - msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, 2 + msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, MSGBOX_NPC end FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01 lock faceplayer - msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, 4 + msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT closemessage switch VAR_FACING case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 08331b33b..1fd5fdd35 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -19,10 +19,10 @@ FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 lock faceplayer - msgbox FarawayIsland_Entrance_Text_2C6B42, 5 + msgbox FarawayIsland_Entrance_Text_2C6B42, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FarawayIsland_Entrance_EventScript_267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A5D, 4 + msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA waitmovement 0 @@ -36,11 +36,11 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 end FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A82, 4 + msgbox FarawayIsland_Entrance_Text_2A6A82, MSGBOX_DEFAULT release end FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1 - msgbox FarawayIsland_Entrance_Text_2C6D5A, 3 + msgbox FarawayIsland_Entrance_Text_2C6D5A, MSGBOX_SIGN end diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index a2892988a..7b62ab578 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -198,7 +198,7 @@ FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB setflag FLAG_HIDE_MEW removeobject 1 fadescreenswapbuffers 0 - msgbox FarawayIsland_Interior_Text_267EF1, 4 + msgbox FarawayIsland_Interior_Text_267EF1, MSGBOX_DEFAULT closemessage releaseall end diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 4a28a180b..ad126f3bf 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -12,7 +12,7 @@ FortreeCity_MapScript1_1E25B3: @ 81E25B3 end FortreeCity_EventScript_1E25B6:: @ 81E25B6 - msgbox FortreeCity_Text_1E2676, 2 + msgbox FortreeCity_Text_1E2676, MSGBOX_NPC end FortreeCity_EventScript_1E25BF:: @ 81E25BF @@ -20,37 +20,37 @@ FortreeCity_EventScript_1E25BF:: @ 81E25BF faceplayer checkflag FLAG_0x127 goto_eq FortreeCity_EventScript_1E25D4 - msgbox FortreeCity_Text_1E2738, 4 + msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E25D4:: @ 81E25D4 - msgbox FortreeCity_Text_1E27B6, 4 + msgbox FortreeCity_Text_1E27B6, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E25DE:: @ 81E25DE - msgbox FortreeCity_Text_1E27FE, 2 + msgbox FortreeCity_Text_1E27FE, MSGBOX_NPC end FortreeCity_EventScript_1E25E7:: @ 81E25E7 - msgbox FortreeCity_Text_1E2880, 2 + msgbox FortreeCity_Text_1E2880, MSGBOX_NPC end FortreeCity_EventScript_1E25F0:: @ 81E25F0 - msgbox FortreeCity_Text_1E292E, 2 + msgbox FortreeCity_Text_1E292E, MSGBOX_NPC end FortreeCity_EventScript_1E25F9:: @ 81E25F9 - msgbox FortreeCity_Text_1E299D, 2 + msgbox FortreeCity_Text_1E299D, MSGBOX_NPC end FortreeCity_EventScript_1E2602:: @ 81E2602 - msgbox FortreeCity_Text_1E2AAC, 3 + msgbox FortreeCity_Text_1E2AAC, MSGBOX_SIGN end FortreeCity_EventScript_1E260B:: @ 81E260B - msgbox FortreeCity_Text_1E2AE6, 3 + msgbox FortreeCity_Text_1E2AE6, MSGBOX_SIGN end FortreeCity_EventScript_1E2614:: @ 81E2614 @@ -59,19 +59,19 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2630 - msgbox FortreeCity_Text_1E29E5, 4 + msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E2630:: @ 81E2630 - msgbox FortreeCity_Text_1E2A08, 5 + msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2645 release end FortreeCity_EventScript_1E2645:: @ 81E2645 - msgbox FortreeCity_Text_1E2A48, 4 + msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7 waitmovement 0 diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 2229ab702..a94fe04d4 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_DecorationShop_MapScripts:: @ 821800D .byte 0 FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E - msgbox FortreeCity_DecorationShop_Text_218078, 2 + msgbox FortreeCity_DecorationShop_Text_218078, MSGBOX_NPC end FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 - msgbox FortreeCity_DecorationShop_Text_2180ED, 2 + msgbox FortreeCity_DecorationShop_Text_2180ED, MSGBOX_NPC end FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 @@ -15,7 +15,7 @@ FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 message gUnknown_08272A21 waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C message gUnknown_08272A21 waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 1b1100cf3..55e24a501 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -22,7 +22,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 goto_eq FortreeCity_Gym_EventScript_21668D checkflag FLAG_0x0AA goto_if 0, FortreeCity_Gym_EventScript_216646 - msgbox FortreeCity_Gym_Text_217071, 4 + msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT release end @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD message FortreeCity_Gym_Text_216EEC waitmessage call FortreeCity_Gym_EventScript_27207E - msgbox FortreeCity_Gym_Text_216F17, 4 + msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT setflag FLAG_0x4F5 setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 @@ -39,7 +39,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox FortreeCity_Gym_Text_217044, 4 + msgbox FortreeCity_Gym_Text_217044, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -53,7 +53,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_272054 - msgbox FortreeCity_Gym_Text_216FEC, 4 + msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA release end @@ -62,43 +62,43 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_27205E - msgbox FortreeCity_Gym_Text_216FEC, 4 + msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA return FortreeCity_Gym_EventScript_21668D:: @ 821668D trainerbattle 7, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 - msgbox FortreeCity_Gym_Text_21720B, 6 + msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 - msgbox FortreeCity_Gym_Text_2168E7, 6 + msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166BF:: @ 82166BF trainerbattle 0, TRAINER_EDWARDO, 0, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 - msgbox FortreeCity_Gym_Text_2169F1, 6 + msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 trainerbattle 0, TRAINER_FLINT, 0, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 - msgbox FortreeCity_Gym_Text_216AD7, 6 + msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166ED:: @ 82166ED trainerbattle 0, TRAINER_ASHLEY, 0, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 - msgbox FortreeCity_Gym_Text_216B5F, 6 + msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_216704:: @ 8216704 trainerbattle 0, TRAINER_HUMBERTO, 0, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 - msgbox FortreeCity_Gym_Text_216C32, 6 + msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_21671B:: @ 821671B trainerbattle 0, TRAINER_DARIUS, 0, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 - msgbox FortreeCity_Gym_Text_216D0F, 6 + msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_216732:: @ 8216732 @@ -106,12 +106,12 @@ FortreeCity_Gym_EventScript_216732:: @ 8216732 faceplayer checkflag FLAG_0x4F5 goto_eq FortreeCity_Gym_EventScript_216747 - msgbox FortreeCity_Gym_Text_216785, 4 + msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT release end FortreeCity_Gym_EventScript_216747:: @ 8216747 - msgbox FortreeCity_Gym_Text_21687D, 4 + msgbox FortreeCity_Gym_Text_21687D, MSGBOX_DEFAULT release end @@ -130,12 +130,12 @@ FortreeCity_Gym_EventScript_216761:: @ 8216761 end FortreeCity_Gym_EventScript_216771:: @ 8216771 - msgbox FortreeCity_Gym_Text_2170C7, 4 + msgbox FortreeCity_Gym_Text_2170C7, MSGBOX_DEFAULT releaseall end FortreeCity_Gym_EventScript_21677B:: @ 821677B - msgbox FortreeCity_Gym_Text_2170AE, 4 + msgbox FortreeCity_Gym_Text_2170AE, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 7e45bf87a..274057110 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -10,7 +10,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_21637B, 5 + msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FortreeCity_House1_EventScript_21633D special sub_81B94B0 @@ -29,29 +29,29 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB special sub_807F0E4 waitstate bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216440, 4 + msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT setflag FLAG_0x09B release end FortreeCity_House1_EventScript_21633D:: @ 821633D - msgbox FortreeCity_House1_Text_21649F, 4 + msgbox FortreeCity_House1_Text_21649F, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_216347:: @ 8216347 bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216474, 4 + msgbox FortreeCity_House1_Text_216474, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_216355:: @ 8216355 - msgbox FortreeCity_House1_Text_2164DB, 4 + msgbox FortreeCity_House1_Text_2164DB, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_21635F:: @ 821635F - msgbox FortreeCity_House1_Text_21653B, 2 + msgbox FortreeCity_House1_Text_21653B, MSGBOX_NPC end FortreeCity_House1_EventScript_216368:: @ 8216368 @@ -59,7 +59,7 @@ FortreeCity_House1_EventScript_216368:: @ 8216368 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_216597, 4 + msgbox FortreeCity_House1_Text_216597, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 8f75b20d9..0a5042c09 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -8,39 +8,39 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB goto_eq FortreeCity_House2_EventScript_21786E checkflag FLAG_0x076 call_if 0, FortreeCity_House2_EventScript_217862 - msgbox FortreeCity_House2_Text_2178D6, 4 + msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_21796A, 4 + msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_2179C9, 4 + msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 0, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_217A28, 4 + msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_272054 setflag FLAG_0x108 - msgbox FortreeCity_House2_Text_217A91, 4 + msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_217862:: @ 8217862 - msgbox FortreeCity_House2_Text_217882, 4 + msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT setflag FLAG_0x076 return FortreeCity_House2_EventScript_21786E:: @ 821786E - msgbox FortreeCity_House2_Text_217A91, 4 + msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_217878:: @ 8217878 - msgbox FortreeCity_House2_Text_217AC7, 4 + msgbox FortreeCity_House2_Text_217AC7, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index 92b963811..742a16411 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_House3_MapScripts:: @ 8217AE7 .byte 0 FortreeCity_House3_EventScript_217AE8:: @ 8217AE8 - msgbox FortreeCity_House3_Text_217AFA, 2 + msgbox FortreeCity_House3_Text_217AFA, MSGBOX_NPC end FortreeCity_House3_EventScript_217AF1:: @ 8217AF1 - msgbox FortreeCity_House3_Text_217C22, 2 + msgbox FortreeCity_House3_Text_217C22, MSGBOX_NPC end FortreeCity_House3_Text_217AFA: @ 8217AFA diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index bf71282bf..24d50afa3 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -2,7 +2,7 @@ FortreeCity_House4_MapScripts:: @ 8217C80 .byte 0 FortreeCity_House4_EventScript_217C81:: @ 8217C81 - msgbox FortreeCity_House4_Text_217D33, 2 + msgbox FortreeCity_House4_Text_217D33, MSGBOX_NPC end FortreeCity_House4_EventScript_217C8A:: @ 8217C8A @@ -13,7 +13,7 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A goto_eq FortreeCity_House4_EventScript_217CD8 checkflag FLAG_0x0DE goto_eq FortreeCity_House4_EventScript_217CC4 - msgbox FortreeCity_House4_Text_217DB9, 4 + msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT closemessage setflag FLAG_0x0DE clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL @@ -26,14 +26,14 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217DD2, 4 + msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217E05, 4 + msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 goto_eq FortreeCity_House4_EventScript_272054 @@ -44,7 +44,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 FortreeCity_House4_EventScript_217D06:: @ 8217D06 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217EA8, 4 + msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT releaseall end @@ -61,7 +61,7 @@ FortreeCity_House4_EventScript_217D20:: @ 8217D20 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_217EE0, 4 + msgbox FortreeCity_House4_Text_217EE0, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index d4f1f2b02..cb0bc72fc 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_House5_MapScripts:: @ 8217EF1 .byte 0 FortreeCity_House5_EventScript_217EF2:: @ 8217EF2 - msgbox FortreeCity_House5_Text_217F17, 2 + msgbox FortreeCity_House5_Text_217F17, MSGBOX_NPC end FortreeCity_House5_EventScript_217EFB:: @ 8217EFB - msgbox FortreeCity_House5_Text_217F80, 2 + msgbox FortreeCity_House5_Text_217F80, MSGBOX_NPC end FortreeCity_House5_EventScript_217F04:: @ 8217F04 @@ -14,7 +14,7 @@ FortreeCity_House5_EventScript_217F04:: @ 8217F04 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_217FFB, 4 + msgbox FortreeCity_House5_Text_217FFB, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index 050fc8f4c..25d7646b7 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -7,7 +7,7 @@ FortreeCity_Mart_EventScript_217666:: @ 8217666 message gUnknown_08272A21 waitmessage pokemart FortreeCity_Mart_Pokemart_217680 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -28,15 +28,15 @@ FortreeCity_Mart_Pokemart_217680: @ 8217680 end FortreeCity_Mart_EventScript_217698:: @ 8217698 - msgbox FortreeCity_Mart_Text_2176B3, 2 + msgbox FortreeCity_Mart_Text_2176B3, MSGBOX_NPC end FortreeCity_Mart_EventScript_2176A1:: @ 82176A1 - msgbox FortreeCity_Mart_Text_217715, 2 + msgbox FortreeCity_Mart_Text_217715, MSGBOX_NPC end FortreeCity_Mart_EventScript_2176AA:: @ 82176AA - msgbox FortreeCity_Mart_Text_21778E, 2 + msgbox FortreeCity_Mart_Text_21778E, MSGBOX_NPC end FortreeCity_Mart_Text_2176B3: @ 82176B3 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 4885c7f15..24449ed2b 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 end FortreeCity_PokemonCenter_1F_EventScript_2173F5:: @ 82173F5 - msgbox FortreeCity_PokemonCenter_1F_Text_217410, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_217410, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_EventScript_2173FE:: @ 82173FE - msgbox FortreeCity_PokemonCenter_1F_Text_21746D, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_21746D, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_EventScript_217407:: @ 8217407 - msgbox FortreeCity_PokemonCenter_1F_Text_21751F, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_21751F, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410 diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index f3d303c0f..0bbb708bd 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -6,15 +6,15 @@ GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E faceplayer checkflag FLAG_0x06D goto_eq GraniteCave_1F_EventScript_22DA8A - msgbox GraniteCave_1F_Text_22DA94, 4 + msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT giveitem_std ITEM_HM05 setflag FLAG_0x06D - msgbox GraniteCave_1F_Text_22DBB7, 4 + msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT release end GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A - msgbox GraniteCave_1F_Text_22DBB7, 4 + msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT release end diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index b057a0548..473837fab 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -4,24 +4,24 @@ GraniteCave_StevensRoom_MapScripts:: @ 822DC7A GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B lock faceplayer - msgbox GraniteCave_StevensRoom_Text_22DD5A, 4 + msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT setvar VAR_0x8004, 274 call GraniteCave_StevensRoom_EventScript_2723E4 setflag FLAG_0x0BD - msgbox GraniteCave_StevensRoom_Text_22DDBD, 4 + msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT giveitem_std ITEM_TM47 compare VAR_RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C - msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 + msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox GraniteCave_StevensRoom_Text_22DF6A, 4 + msgbox GraniteCave_StevensRoom_Text_22DF6A, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x131 - msgbox GraniteCave_StevensRoom_Text_22DF8C, 4 + msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D @@ -54,7 +54,7 @@ GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A return GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C - msgbox GraniteCave_StevensRoom_Text_22DFAA, 4 + msgbox GraniteCave_StevensRoom_Text_22DFAA, MSGBOX_DEFAULT return GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index f4d9fe0b2..c995db5e4 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -50,7 +50,7 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46 end InsideOfTruck_EventScript_23BF6C:: @ 823BF6C - msgbox InsideOfTruck_Text_23BF75, 3 + msgbox InsideOfTruck_Text_23BF75, MSGBOX_SIGN end InsideOfTruck_Text_23BF75: @ 823BF75 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 647077080..e18b73a7a 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -66,7 +66,7 @@ IslandCave_EventScript_238EEF:: @ 8238EEF end IslandCave_EventScript_238F13:: @ 8238F13 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 15ac1bae6..8a464b16e 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -48,7 +48,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB setvar VAR_0x8007, 5 special sub_8139560 waitstate - msgbox JaggedPass_Text_230DBA, 4 + msgbox JaggedPass_Text_230DBA, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -78,7 +78,7 @@ JaggedPass_EventScript_230718:: @ 8230718 waitmovement 0 applymovement 5, JaggedPass_Movement_27259E waitmovement 0 - msgbox JaggedPass_Text_230CCB, 4 + msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle 3, TRAINER_GRUNT_30, 0, JaggedPass_Text_230D2D setflag FLAG_0x139 @@ -90,7 +90,7 @@ JaggedPass_EventScript_230718:: @ 8230718 JaggedPass_EventScript_230766:: @ 8230766 applymovement 5, JaggedPass_Movement_27259E waitmovement 0 - msgbox JaggedPass_Text_230D65, 4 + msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage applymovement 5, JaggedPass_Movement_2725A2 waitmovement 0 @@ -99,7 +99,7 @@ JaggedPass_EventScript_230766:: @ 8230766 JaggedPass_EventScript_230785:: @ 8230785 trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_230888, JaggedPass_Text_2308FF - msgbox JaggedPass_Text_230916, 6 + msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23079C:: @ 823079C @@ -107,23 +107,23 @@ JaggedPass_EventScript_23079C:: @ 823079C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 - msgbox JaggedPass_Text_2309D8, 4 + msgbox JaggedPass_Text_2309D8, MSGBOX_DEFAULT release end JaggedPass_EventScript_2307C8:: @ 82307C8 special sub_80B4808 - msgbox JaggedPass_Text_230A2C, 4 + msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT setvar VAR_0x8004, 474 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 474 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end JaggedPass_EventScript_2307E4:: @ 82307E4 trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_230A76, JaggedPass_Text_230AAA - msgbox JaggedPass_Text_230AD7, 6 + msgbox JaggedPass_Text_230AD7, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_2307FB:: @ 82307FB @@ -131,33 +131,33 @@ JaggedPass_EventScript_2307FB:: @ 82307FB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 - msgbox JaggedPass_Text_230B93, 4 + msgbox JaggedPass_Text_230B93, MSGBOX_DEFAULT release end JaggedPass_EventScript_230827:: @ 8230827 special sub_80B4808 - msgbox JaggedPass_Text_230BC6, 4 + msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT setvar VAR_0x8004, 216 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 216 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end JaggedPass_EventScript_230843:: @ 8230843 trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_230C28, JaggedPass_Text_230C60 - msgbox JaggedPass_Text_230C94, 6 + msgbox JaggedPass_Text_230C94, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23085A:: @ 823085A trainerbattle 0, TRAINER_JULIO, 0, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 - msgbox JaggedPass_Text_230E57, 6 + msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_230871:: @ 8230871 trainerbattle 0, TRAINER_AUTUMN, 0, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD - msgbox JaggedPass_Text_230EE3, 6 + msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE end JaggedPass_Text_230888: @ 8230888 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index efc5a2b89..7eb9336f3 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -71,18 +71,18 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551 end LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 - msgbox LavaridgeTown_Text_1EA7C0, 4 + msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_0x0DD - msgbox LavaridgeTown_Text_1EA897, 4 + msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_1EA5FF end LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA - msgbox LavaridgeTown_Text_1EA9A2, 4 + msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_0x0DD - msgbox LavaridgeTown_Text_1EAA2E, 4 + msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_1EA5FF end @@ -222,27 +222,27 @@ LavaridgeTown_EventScript_1EA70B:: @ 81EA70B end LavaridgeTown_EventScript_1EA70E:: @ 81EA70E - msgbox LavaridgeTown_Text_1EAE03, 2 + msgbox LavaridgeTown_Text_1EAE03, MSGBOX_NPC end LavaridgeTown_EventScript_1EA717:: @ 81EA717 - msgbox LavaridgeTown_Text_1EAEE1, 3 + msgbox LavaridgeTown_Text_1EAEE1, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA720:: @ 81EA720 - msgbox LavaridgeTown_Text_1EAF9B, 2 + msgbox LavaridgeTown_Text_1EAF9B, MSGBOX_NPC end LavaridgeTown_EventScript_1EA729:: @ 81EA729 - msgbox LavaridgeTown_Text_1EB003, 2 + msgbox LavaridgeTown_Text_1EB003, MSGBOX_NPC end LavaridgeTown_EventScript_1EA732:: @ 81EA732 - msgbox LavaridgeTown_Text_1EB092, 2 + msgbox LavaridgeTown_Text_1EB092, MSGBOX_NPC end LavaridgeTown_EventScript_1EA73B:: @ 81EA73B - msgbox LavaridgeTown_Text_1EAF4E, 2 + msgbox LavaridgeTown_Text_1EAF4E, MSGBOX_NPC end LavaridgeTown_EventScript_1EA744:: @ 81EA744 @@ -250,13 +250,13 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 faceplayer checkflag FLAG_0x10A goto_eq LavaridgeTown_EventScript_1EA787 - msgbox LavaridgeTown_Text_1EAB80, 5 + msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LavaridgeTown_EventScript_1EA79B getpartysize compare VAR_RESULT, 6 goto_eq LavaridgeTown_EventScript_1EA791 - msgbox LavaridgeTown_Text_1EACC0, 4 + msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT setflag FLAG_0x10A playfanfare MUS_FANFA4 message LavaridgeTown_Text_1EACF4 @@ -266,30 +266,30 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 end LavaridgeTown_EventScript_1EA787:: @ 81EA787 - msgbox LavaridgeTown_Text_1EAD9E, 4 + msgbox LavaridgeTown_Text_1EAD9E, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA791:: @ 81EA791 - msgbox LavaridgeTown_Text_1EAD09, 4 + msgbox LavaridgeTown_Text_1EAD09, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA79B:: @ 81EA79B - msgbox LavaridgeTown_Text_1EAD44, 4 + msgbox LavaridgeTown_Text_1EAD44, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5 - msgbox LavaridgeTown_Text_1EB12B, 3 + msgbox LavaridgeTown_Text_1EB12B, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE - msgbox LavaridgeTown_Text_1EB178, 3 + msgbox LavaridgeTown_Text_1EB178, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7 - msgbox LavaridgeTown_Text_1EB1CB, 3 + msgbox LavaridgeTown_Text_1EB1CB, MSGBOX_SIGN end LavaridgeTown_Text_1EA7C0: @ 81EA7C0 diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index a0c2e1514..059809ffa 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -65,7 +65,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 checkflag FLAG_0x0A8 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D - msgbox LavaridgeTown_Gym_1F_Text_1FF546, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT release end @@ -73,7 +73,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 message LavaridgeTown_Gym_1F_Text_1FF32F waitmessage call LavaridgeTown_Gym_1F_EventScript_27207E - msgbox LavaridgeTown_Gym_1F_Text_1FF359, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT setflag FLAG_0x06C setflag FLAG_0x4F3 setflag FLAG_BADGE04_GET @@ -88,7 +88,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LavaridgeTown_Gym_1F_Text_1FF517, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF517, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -100,7 +100,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_272054 - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 release end @@ -109,18 +109,18 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_27205E - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 return LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864 trainerbattle 7, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E - msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, 6 + msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, 6 + msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A @@ -134,37 +134,37 @@ LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, 6 + msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA trainerbattle 2, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FED02, 6 + msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5 trainerbattle 2, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, 6 + msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900 trainerbattle 2, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, 6 + msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B trainerbattle 2, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, 6 + msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936 trainerbattle 2, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, 6 + msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 trainerbattle 2, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, 6 + msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C @@ -172,12 +172,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C faceplayer checkflag FLAG_0x4F3 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT release end LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, MSGBOX_DEFAULT release end @@ -196,12 +196,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B end LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB - msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, MSGBOX_DEFAULT releaseall end LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5 - msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index 6af8132e4..14e08bed2 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 message LavaridgeTown_HerbShop_Text_1FE53E waitmessage pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -22,7 +22,7 @@ LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 end LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC - msgbox LavaridgeTown_HerbShop_Text_1FE685, 2 + msgbox LavaridgeTown_HerbShop_Text_1FE685, MSGBOX_NPC end LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 @@ -30,7 +30,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 faceplayer checkflag FLAG_0x0FE goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE584, 4 + msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 goto_eq LavaridgeTown_HerbShop_EventScript_272054 @@ -39,7 +39,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 end LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE5EB, 4 + msgbox LavaridgeTown_HerbShop_Text_1FE5EB, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc index 14d112de9..19424af1a 100644 --- a/data/maps/LavaridgeTown_House/scripts.inc +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -2,7 +2,7 @@ LavaridgeTown_House_MapScripts:: @ 81FF911 .byte 0 LavaridgeTown_House_EventScript_1FF912:: @ 81FF912 - msgbox LavaridgeTown_House_Text_1FF92E, 2 + msgbox LavaridgeTown_House_Text_1FF92E, MSGBOX_NPC end LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B @@ -10,7 +10,7 @@ LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox LavaridgeTown_House_Text_1FF9BB, 4 + msgbox LavaridgeTown_House_Text_1FF9BB, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index 2c5681983..c3bb550cb 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE message gUnknown_08272A21 waitmessage pokemart LavaridgeTown_Mart_Pokemart_1FF9E8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -27,11 +27,11 @@ LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8 end LavaridgeTown_Mart_EventScript_1FF9FE:: @ 81FF9FE - msgbox LavaridgeTown_Mart_Text_1FFA10, 2 + msgbox LavaridgeTown_Mart_Text_1FFA10, MSGBOX_NPC end LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07 - msgbox LavaridgeTown_Mart_Text_1FFA83, 2 + msgbox LavaridgeTown_Mart_Text_1FFA83, MSGBOX_NPC end LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index c7db56a0d..ee60c7d62 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -17,15 +17,15 @@ LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C:: @ 81FFB1C - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25:: @ 81FFB25 - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E:: @ 81FFB2E - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37 diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 54fead4ef..ef178f9ca 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -38,24 +38,24 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 dodailyevents checkflag FLAG_0x92F goto_eq LilycoveCity_EventScript_1E2C18 - msgbox LilycoveCity_Text_2A7244, 4 + msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_272054 setflag FLAG_0x92F - msgbox LilycoveCity_Text_2A72E3, 4 + msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C18:: @ 81E2C18 - msgbox LilycoveCity_Text_2A7321, 4 + msgbox LilycoveCity_Text_2A7321, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C22:: @ 81E2C22 - msgbox LilycoveCity_Text_1E3D9E, 2 + msgbox LilycoveCity_Text_1E3D9E, MSGBOX_NPC end LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B @@ -63,17 +63,17 @@ LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_EventScript_1E2C40 - msgbox LilycoveCity_Text_1E3E3C, 4 + msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C40:: @ 81E2C40 - msgbox LilycoveCity_Text_1E3E7D, 4 + msgbox LilycoveCity_Text_1E3E7D, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A - msgbox LilycoveCity_Text_1E3F05, 2 + msgbox LilycoveCity_Text_1E3F05, MSGBOX_NPC end LilycoveCity_EventScript_1E2C53:: @ 81E2C53 @@ -81,12 +81,12 @@ LilycoveCity_EventScript_1E2C53:: @ 81E2C53 faceplayer checkflag FLAG_0x070 goto_eq LilycoveCity_EventScript_1E2C68 - msgbox LilycoveCity_Text_1E3FAB, 4 + msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C68:: @ 81E2C68 - msgbox LilycoveCity_Text_1E4020, 4 + msgbox LilycoveCity_Text_1E4020, MSGBOX_DEFAULT release end @@ -95,25 +95,25 @@ LilycoveCity_EventScript_1E2C72:: @ 81E2C72 faceplayer checkflag FLAG_0x070 goto_eq LilycoveCity_EventScript_1E2C87 - msgbox LilycoveCity_Text_1E40AD, 4 + msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C87:: @ 81E2C87 - msgbox LilycoveCity_Text_1E4145, 4 + msgbox LilycoveCity_Text_1E4145, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C91:: @ 81E2C91 - msgbox LilycoveCity_Text_1E417B, 2 + msgbox LilycoveCity_Text_1E417B, MSGBOX_NPC end LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A - msgbox LilycoveCity_Text_1E420B, 3 + msgbox LilycoveCity_Text_1E420B, MSGBOX_SIGN end LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3 - msgbox LilycoveCity_Text_1E4283, 3 + msgbox LilycoveCity_Text_1E4283, MSGBOX_SIGN end LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC @@ -121,45 +121,45 @@ LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_EventScript_1E2CC1 - msgbox LilycoveCity_Text_1E42FC, 4 + msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1 - msgbox LilycoveCity_Text_1E43FF, 4 + msgbox LilycoveCity_Text_1E43FF, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB - msgbox LilycoveCity_Text_1E48A5, 2 + msgbox LilycoveCity_Text_1E48A5, MSGBOX_NPC end LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 - msgbox LilycoveCity_Text_1E4902, 2 + msgbox LilycoveCity_Text_1E4902, MSGBOX_NPC end LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD lockall - msgbox LilycoveCity_Text_1E494D, 2 + msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC applymovement 20, LilycoveCity_Movement_2725A2 end LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE lockall - msgbox LilycoveCity_Text_1E49F4, 2 + msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC applymovement 19, LilycoveCity_Movement_2725A2 end LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF - msgbox LilycoveCity_Text_1E448B, 3 + msgbox LilycoveCity_Text_1E448B, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D08:: @ 81E2D08 - msgbox LilycoveCity_Text_1E44C3, 3 + msgbox LilycoveCity_Text_1E44C3, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D11:: @ 81E2D11 - msgbox LilycoveCity_Text_1E44FC, 3 + msgbox LilycoveCity_Text_1E44FC, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A @@ -167,12 +167,12 @@ LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A specialvar VAR_0x8004, sub_80F8940 switch VAR_0x8004 case 0, LilycoveCity_EventScript_1E2D3A - msgbox LilycoveCity_Text_1E4571, 4 + msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A - msgbox LilycoveCity_Text_1E4534, 4 + msgbox LilycoveCity_Text_1E4534, MSGBOX_DEFAULT releaseall end @@ -180,35 +180,35 @@ LilycoveCity_EventScript_1E2D44:: @ 81E2D44 lockall checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2D58 - msgbox LilycoveCity_Text_1E45A7, 4 + msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D58:: @ 81E2D58 - msgbox LilycoveCity_Text_1E4624, 4 + msgbox LilycoveCity_Text_1E4624, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D62:: @ 81E2D62 - msgbox LilycoveCity_Text_1E466E, 3 + msgbox LilycoveCity_Text_1E466E, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B - msgbox LilycoveCity_Text_1E46BE, 3 + msgbox LilycoveCity_Text_1E46BE, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D74:: @ 81E2D74 - msgbox LilycoveCity_Text_1E473D, 3 + msgbox LilycoveCity_Text_1E473D, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall checkflag FLAG_0x0DA goto_eq LilycoveCity_EventScript_1E2DB0 - msgbox LilycoveCity_Text_1E3D1F, 4 + msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E waitmovement 0 - msgbox LilycoveCity_Text_1E3D4A, 4 + msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 waitmovement 0 setflag FLAG_0x0DA @@ -216,24 +216,24 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D end LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0 - msgbox LilycoveCity_Text_1E3D1F, 4 + msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA - msgbox LilycoveCity_Text_1E3B2C, 2 + msgbox LilycoveCity_Text_1E3B2C, MSGBOX_NPC end LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3 - msgbox LilycoveCity_Text_1E3B95, 2 + msgbox LilycoveCity_Text_1E3B95, MSGBOX_NPC end LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC - msgbox LilycoveCity_Text_1E3C46, 2 + msgbox LilycoveCity_Text_1E3C46, MSGBOX_NPC end LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5 - msgbox LilycoveCity_Text_1E3CBE, 2 + msgbox LilycoveCity_Text_1E3CBE, MSGBOX_NPC end LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE @@ -254,7 +254,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 call_if 0, LilycoveCity_EventScript_1E2E51 compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2E5A - msgbox LilycoveCity_Text_1E3234, 4 + msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2EDE case 1, LilycoveCity_EventScript_1E2EEE @@ -262,16 +262,16 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 end LilycoveCity_EventScript_1E2E48:: @ 81E2E48 - msgbox LilycoveCity_Text_1E31F5, 5 + msgbox LilycoveCity_Text_1E31F5, MSGBOX_YESNO return LilycoveCity_EventScript_1E2E51:: @ 81E2E51 - msgbox LilycoveCity_Text_1E3061, 5 + msgbox LilycoveCity_Text_1E3061, MSGBOX_YESNO return LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A setflag FLAG_0x11E - msgbox LilycoveCity_Text_1E318D, 4 + msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm release @@ -285,7 +285,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B call_if 0, LilycoveCity_EventScript_1E2EC4 compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2ECD - msgbox LilycoveCity_Text_1E373C, 4 + msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2F0E case 1, LilycoveCity_EventScript_1E2F1E @@ -293,16 +293,16 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B end LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB - msgbox LilycoveCity_Text_1E36FA, 5 + msgbox LilycoveCity_Text_1E36FA, MSGBOX_YESNO return LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 - msgbox LilycoveCity_Text_1E3608, 5 + msgbox LilycoveCity_Text_1E3608, MSGBOX_YESNO return LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD setflag FLAG_0x11E - msgbox LilycoveCity_Text_1E36BF, 4 + msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm release @@ -339,7 +339,7 @@ LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E end LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E - msgbox LilycoveCity_Text_1E32FB, 4 + msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 @@ -362,21 +362,21 @@ LilycoveCity_EventScript_1E2F80:: @ 81E2F80 return LilycoveCity_EventScript_1E2F86:: @ 81E2F86 - msgbox LilycoveCity_Text_1E3398, 4 + msgbox LilycoveCity_Text_1E3398, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2FA1 - msgbox LilycoveCity_Text_1E346D, 4 + msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1 - msgbox LilycoveCity_Text_1E353A, 4 + msgbox LilycoveCity_Text_1E353A, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA - msgbox LilycoveCity_Text_1E37D7, 4 + msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 @@ -390,17 +390,17 @@ LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA end LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2 - msgbox LilycoveCity_Text_1E3876, 4 + msgbox LilycoveCity_Text_1E3876, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2FFD - msgbox LilycoveCity_Text_1E390C, 4 + msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD - msgbox LilycoveCity_Text_1E39E3, 4 + msgbox LilycoveCity_Text_1E39E3, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E3006:: @ 81E3006 @@ -422,7 +422,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006 LilycoveCity_EventScript_1E302D:: @ 81E302D lock faceplayer - msgbox LilycoveCity_Text_1E4774, 5 + msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E304F compare VAR_RESULT, 0 @@ -431,11 +431,11 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D end LilycoveCity_EventScript_1E304F:: @ 81E304F - msgbox LilycoveCity_Text_1E47A1, 4 + msgbox LilycoveCity_Text_1E47A1, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E3058:: @ 81E3058 - msgbox LilycoveCity_Text_1E4824, 4 + msgbox LilycoveCity_Text_1E4824, MSGBOX_DEFAULT return LilycoveCity_Text_1E3061: @ 81E3061 diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index 3f02a404c..945f01fb0 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -2,25 +2,25 @@ LilycoveCity_ContestHall_MapScripts:: @ 821B484 .byte 0 LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485 - msgbox LilycoveCity_ContestHall_Text_21B74E, 2 + msgbox LilycoveCity_ContestHall_Text_21B74E, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E - msgbox LilycoveCity_ContestHall_Text_21B7D7, 2 + msgbox LilycoveCity_ContestHall_Text_21B7D7, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497 - msgbox LilycoveCity_ContestHall_Text_21B899, 2 + msgbox LilycoveCity_ContestHall_Text_21B899, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0 - msgbox LilycoveCity_ContestHall_Text_21B911, 2 + msgbox LilycoveCity_ContestHall_Text_21B911, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21B977, 4 + msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -30,7 +30,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21B9DC, 4 + msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT closemessage applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -40,7 +40,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BA44, 4 + msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT closemessage applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -50,7 +50,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BAD5, 4 + msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT closemessage applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -60,7 +60,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BB84, 4 + msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT closemessage applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -70,7 +70,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BBDD, 4 + msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT closemessage applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -78,13 +78,13 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C end LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533 - msgbox LilycoveCity_ContestHall_Text_21BC65, 3 + msgbox LilycoveCity_ContestHall_Text_21BC65, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BC89, 4 + msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT closemessage applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -94,7 +94,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD30, 4 + msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT closemessage applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -104,7 +104,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD70, 4 + msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT closemessage applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -114,7 +114,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BDDD, 4 + msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT closemessage applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -124,7 +124,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE16, 4 + msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT closemessage applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -134,7 +134,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE77, 4 + msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT closemessage applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -144,7 +144,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BEDE, 4 + msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT closemessage applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -154,7 +154,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BF6E, 4 + msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT closemessage applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -164,7 +164,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BFE3, 4 + msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT closemessage applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -174,7 +174,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C07F, 4 + msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT closemessage applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -184,7 +184,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C0D8, 4 + msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT closemessage applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -194,7 +194,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C137, 4 + msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT closemessage applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -204,7 +204,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C1A4, 4 + msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT closemessage applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -214,7 +214,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C215, 4 + msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT closemessage applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -224,7 +224,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C27F, 4 + msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT closemessage applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -234,7 +234,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C2BB, 4 + msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT closemessage applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -244,7 +244,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C307, 4 + msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT closemessage applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -254,7 +254,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C365, 4 + msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT closemessage applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -265,19 +265,19 @@ LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA lockall applymovement 29, LilycoveCity_ContestHall_Movement_27259E waitmovement 0 - msgbox LilycoveCity_ContestHall_Text_21C3F4, 4 + msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT closemessage applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 delay 25 - msgbox LilycoveCity_ContestHall_Text_21C411, 4 + msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C4B1, 4 + msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT closemessage applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -287,7 +287,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C445, 4 + msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT closemessage applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -295,15 +295,15 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C end LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733 - msgbox LilycoveCity_ContestHall_Text_21C512, 3 + msgbox LilycoveCity_ContestHall_Text_21C512, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C - msgbox LilycoveCity_ContestHall_Text_21C548, 3 + msgbox LilycoveCity_ContestHall_Text_21C548, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745 - msgbox LilycoveCity_ContestHall_Text_21C57B, 3 + msgbox LilycoveCity_ContestHall_Text_21C57B, MSGBOX_SIGN end LilycoveCity_ContestHall_Text_21B74E: @ 821B74E diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 65749894b..16c4dd915 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -39,12 +39,12 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 waitmovement 4 applymovement 255, LilycoveCity_ContestLobby_Movement_21A418 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 + msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall fadescreen 1 drawcontestwinner 0 lockall - msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 + msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA compare VAR_RESULT, 0 @@ -53,7 +53,7 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 end LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA - msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 + msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC setvar VAR_0x4099, 0 @@ -69,10 +69,10 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA end LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 + msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA - msgbox LilycoveCity_ContestLobby_Text_21B132, 4 + msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 @@ -91,12 +91,12 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, 4 + msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 + msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, 4 - msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 + msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT closemessage return @@ -214,11 +214,11 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 waitmovement 11 applymovement 255, LilycoveCity_ContestLobby_Movement_21A545 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 + msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall fadescreen 1 drawcontestwinner 0 - msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 + msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A compare VAR_RESULT, 0 @@ -226,7 +226,7 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 end LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A - msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 + msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC setvar VAR_0x4099, 0 @@ -242,10 +242,10 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A end LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 + msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A - msgbox LilycoveCity_ContestLobby_Text_21B132, 4 + msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 @@ -265,12 +265,12 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, 4 + msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 + msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, 4 - msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 + msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT closemessage return @@ -424,7 +424,7 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 waitmovement 0 applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_27B653, 4 + msgbox LilycoveCity_ContestLobby_Text_27B653, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8 @@ -477,27 +477,27 @@ LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 step_end LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 - msgbox LilycoveCity_ContestLobby_Text_21B1B1, 2 + msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711 - msgbox LilycoveCity_ContestLobby_Text_21B24D, 2 + msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A - msgbox LilycoveCity_ContestLobby_Text_21B2BA, 2 + msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723 - msgbox LilycoveCity_ContestLobby_Text_21B334, 2 + msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C - msgbox LilycoveCity_ContestLobby_Text_21B392, 2 + msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735 - msgbox LilycoveCity_ContestLobby_Text_21B3FC, 2 + msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E @@ -543,11 +543,11 @@ LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761 end LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768 - msgbox LilycoveCity_ContestLobby_Text_2931AA, 2 + msgbox LilycoveCity_ContestLobby_Text_2931AA, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771 - msgbox LilycoveCity_ContestLobby_Text_2931C6, 2 + msgbox LilycoveCity_ContestLobby_Text_2931C6, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A @@ -571,46 +571,46 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C427C, 4 + msgbox LilycoveCity_ContestLobby_Text_2C427C, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8 lock - msgbox LilycoveCity_ContestLobby_Text_2C464B, 4 + msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3 lock - msgbox LilycoveCity_ContestLobby_Text_2C465A, 4 + msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE lock - msgbox LilycoveCity_ContestLobby_Text_2C4669, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4679, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C46B1, 4 + msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4763, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end @@ -625,7 +625,7 @@ LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806 special sub_80F9154 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_27C063, 4 + msgbox LilycoveCity_ContestLobby_Text_27C063, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A819 end @@ -641,7 +641,7 @@ LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 end LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 - msgbox LilycoveCity_ContestLobby_Text_27BD17, 5 + msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F call LilycoveCity_ContestLobby_EventScript_27134F @@ -694,28 +694,28 @@ LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D end LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955 - msgbox LilycoveCity_ContestLobby_Text_27C340, 4 + msgbox LilycoveCity_ContestLobby_Text_27C340, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963 - msgbox LilycoveCity_ContestLobby_Text_27C5B1, 4 + msgbox LilycoveCity_ContestLobby_Text_27C5B1, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971 - msgbox LilycoveCity_ContestLobby_Text_27C742, 4 + msgbox LilycoveCity_ContestLobby_Text_27C742, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4 + msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C - msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4 + msgbox LilycoveCity_ContestLobby_Text_27C1C3, MSGBOX_DEFAULT setvar VAR_CONTEST_RANK, 0 choosecontestmon compare VAR_0x8004, 255 @@ -734,17 +734,17 @@ LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C end LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0 - msgbox LilycoveCity_ContestLobby_Text_27B471, 4 + msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE - msgbox LilycoveCity_ContestLobby_Text_27C186, 4 + msgbox LilycoveCity_ContestLobby_Text_27C186, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC - msgbox LilycoveCity_ContestLobby_Text_27C140, 4 + msgbox LilycoveCity_ContestLobby_Text_27C140, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end @@ -796,34 +796,34 @@ LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0 return LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5 - msgbox LilycoveCity_ContestLobby_Text_27BF0E, 4 + msgbox LilycoveCity_ContestLobby_Text_27BF0E, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3 - msgbox LilycoveCity_ContestLobby_Text_27BF4B, 4 + msgbox LilycoveCity_ContestLobby_Text_27BF4B, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1 - msgbox LilycoveCity_ContestLobby_Text_27C254, 4 + msgbox LilycoveCity_ContestLobby_Text_27C254, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, 4 + msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27C879, 4 + msgbox LilycoveCity_ContestLobby_Text_27C879, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09 - msgbox LilycoveCity_ContestLobby_Text_27BEFA, 4 + msgbox LilycoveCity_ContestLobby_Text_27BEFA, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end @@ -1008,12 +1008,12 @@ LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 faceplayer checkflag FLAG_0x05F goto_eq LilycoveCity_ContestLobby_EventScript_21AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD10, 4 + msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD55, 4 + msgbox LilycoveCity_ContestLobby_Text_21AD55, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 3468299a9..9b434a0c2 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -7,10 +7,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -18,10 +18,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 end LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -29,10 +29,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 end LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -48,7 +48,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 waitmovement 0 applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index d77627bc3..f92df5b42 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -15,7 +15,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 end LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, MSGBOX_DEFAULT return LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 @@ -35,23 +35,23 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F end LilycoveCity_CoveLilyMotel_2F_EventScript_218720:: @ 8218720 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218729:: @ 8218729 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218732:: @ 8218732 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_21873B:: @ 821873B - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D @@ -59,14 +59,14 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D faceplayer checkflag FLAG_0x1CE goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_21876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CE release end LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 9a4a5aead..e683b8d07 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -24,7 +24,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F message gUnknown_08272A21 waitmessage pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -54,17 +54,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 getpricereduction 3 compare VAR_RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStoreRooftop_EventScript_220282:: @ 8220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStoreRooftop_EventScript_22028C:: @ 822028C - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, 2 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, MSGBOX_NPC end LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295 @@ -82,7 +82,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4 case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end @@ -147,11 +147,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F nop bufferitemname 0, VAR_TEMP_0 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 @@ -159,11 +159,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 @@ -171,11 +171,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436 end @@ -186,12 +186,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220436:: @ 8220436 end LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450 - msgbox gUnknown_08272A89, 4 + msgbox gUnknown_08272A89, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 4a375cf5e..942adedc8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692 .byte 0 LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 checkflag FLAG_0x92A goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, 5 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 setflag FLAG_0x92A @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C special RetrieveLotteryNumber copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber - msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 waitmovement 0 playse SE_PC_ON @@ -57,47 +57,47 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C end LilycoveCity_DepartmentStore_1F_EventScript_21F77B:: @ 821F77B - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F784:: @ 821F784 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F78D:: @ 821F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F797:: @ 821F797 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7A1:: @ 821F7A1 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF end LilycoveCity_DepartmentStore_1F_EventScript_21F7AF:: @ 821F7AF - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7B9:: @ 821F7B9 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7C2:: @ 821F7C2 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7CB:: @ 821F7CB - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD @@ -107,12 +107,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD end LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED - msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT giveitem_std VAR_POKELOT_PRIZE compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED @@ -125,15 +125,15 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 end LilycoveCity_DepartmentStore_1F_EventScript_21F82F:: @ 821F82F - msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F838:: @ 821F838 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F841:: @ 821F841 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A @@ -141,13 +141,13 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, MSGBOX_DEFAULT waitmoncry release end LilycoveCity_DepartmentStore_1F_EventScript_21F85D:: @ 821F85D - msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, 3 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, MSGBOX_SIGN end LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index 8bc6d8b29..ca163acdd 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -2,15 +2,15 @@ LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C .byte 0 LilycoveCity_DepartmentStore_2F_EventScript_21FB2D:: @ 821FB2D - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB36:: @ 821FB36 - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F - msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -46,7 +46,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index 1d980f83e..8ecf415cd 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -28,7 +28,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -46,15 +46,15 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4 end LilycoveCity_DepartmentStore_3F_EventScript_21FCB6:: @ 821FCB6 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_EventScript_21FCBF:: @ 821FCBF - msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_EventScript_21FCC8:: @ 821FCC8 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index b162c4740..cee1cb0b7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -2,15 +2,15 @@ LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA .byte 0 LilycoveCity_DepartmentStore_4F_EventScript_21FDEB:: @ 821FDEB - msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FDF4:: @ 821FDF4 - msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD - msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index d5f5e49ad..b7155e9e4 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -47,7 +47,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -72,7 +72,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -97,7 +97,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -118,7 +118,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054 end LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C - msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, 2 + msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, MSGBOX_NPC end LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 @@ -133,13 +133,13 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 end LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C - msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, 4 + msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, MSGBOX_DEFAULT closemessage releaseall end LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 - msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, 4 + msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 waitmovement 0 @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 end LilycoveCity_DepartmentStore_5F_EventScript_2200BC:: @ 82200BC - msgbox LilycoveCity_DepartmentStore_5F_Text_220122, 2 + msgbox LilycoveCity_DepartmentStore_5F_Text_220122, MSGBOX_NPC end LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 99ad20280..e537acb92 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -35,7 +35,7 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 compare VAR_TEMP_A, 0 goto_eq LilycoveCity_Harbor_EventScript_21E557 - msgbox LilycoveCity_Harbor_Text_21E758, 4 + msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage goto LilycoveCity_Harbor_EventScript_21E09F @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 end LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 - msgbox LilycoveCity_Harbor_Text_21E864, 5 + msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 @@ -97,7 +97,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 end LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 - msgbox LilycoveCity_Harbor_Text_21E880, 5 + msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC @@ -216,10 +216,10 @@ LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 setflag FLAG_0x1AE - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2A68FC, 4 + msgbox LilycoveCity_Harbor_Text_2A68FC, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E30F end @@ -233,10 +233,10 @@ LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 setflag FLAG_0x1AF - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, 4 + msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E33F end @@ -250,10 +250,10 @@ LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 setflag FLAG_0x1B0 - msgbox LilycoveCity_Harbor_Text_2A6848, 4 + msgbox LilycoveCity_Harbor_Text_2A6848, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C68A5, 4 + msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -271,12 +271,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call_if 1, LilycoveCity_Harbor_EventScript_21E675 compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E680 - msgbox LilycoveCity_Harbor_Text_2C6951, 4 + msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E68B compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E696 - msgbox LilycoveCity_Harbor_Text_2C69AA, 4 + msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 @@ -299,10 +299,10 @@ LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D setflag FLAG_0x1DB - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, 4 + msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E43C end @@ -315,7 +315,7 @@ LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C end LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE message LilycoveCity_Harbor_Text_2C6BD4 @@ -335,7 +335,7 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D end LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 - msgbox LilycoveCity_Harbor_Text_2A6A82, 4 + msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -346,7 +346,7 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 - msgbox LilycoveCity_Harbor_Text_21E842, 4 + msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT release end @@ -378,24 +378,24 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 return LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D - msgbox LilycoveCity_Harbor_Text_21E6F1, 4 + msgbox LilycoveCity_Harbor_Text_21E6F1, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E557:: @ 821E557 - msgbox LilycoveCity_Harbor_Text_21E758, 4 + msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage goto LilycoveCity_Harbor_EventScript_21E09F end LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B - msgbox LilycoveCity_Harbor_Text_21E792, 4 + msgbox LilycoveCity_Harbor_Text_21E792, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 - msgbox LilycoveCity_Harbor_Text_21E864, 5 + msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 @@ -406,7 +406,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 end LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D - msgbox LilycoveCity_Harbor_Text_21E880, 5 + msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC @@ -422,7 +422,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 end LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC - msgbox LilycoveCity_Harbor_Text_21E89D, 4 + msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -449,7 +449,7 @@ LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B return LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 - msgbox LilycoveCity_Harbor_Text_21E842, 4 + msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT release end @@ -471,12 +471,12 @@ LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_Harbor_EventScript_21E64C - msgbox LilycoveCity_Harbor_Text_21E8EE, 4 + msgbox LilycoveCity_Harbor_Text_21E8EE, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C - msgbox LilycoveCity_Harbor_Text_21E976, 4 + msgbox LilycoveCity_Harbor_Text_21E976, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc index 59418e667..1484a6a1f 100644 --- a/data/maps/LilycoveCity_House1/scripts.inc +++ b/data/maps/LilycoveCity_House1/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_House1_MapScripts:: @ 821ECCD .byte 0 LilycoveCity_House1_EventScript_21ECCE:: @ 821ECCE - msgbox LilycoveCity_House1_Text_21ECEA, 2 + msgbox LilycoveCity_House1_Text_21ECEA, MSGBOX_NPC end LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 @@ -10,7 +10,7 @@ LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox LilycoveCity_House1_Text_21ED63, 4 + msgbox LilycoveCity_House1_Text_21ED63, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 486df9be0..2a78e6df5 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -6,17 +6,17 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 faceplayer checkflag FLAG_0x0EA goto_eq LilycoveCity_House2_EventScript_21EDAC - msgbox LilycoveCity_House2_Text_21EDB6, 4 + msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 goto_eq LilycoveCity_House2_EventScript_272054 setflag FLAG_0x0EA - msgbox LilycoveCity_House2_Text_21EDF9, 4 + msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release end LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC - msgbox LilycoveCity_House2_Text_21EDF9, 4 + msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 38210196e..a05403de3 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -10,10 +10,10 @@ LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B lock faceplayer - msgbox LilycoveCity_House3_Text_21EF99, 5 + msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_House3_EventScript_21EE75 - msgbox LilycoveCity_House3_Text_21F0F8, 4 + msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -21,7 +21,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B end LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 - msgbox LilycoveCity_House3_Text_21F0A9, 4 + msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -31,7 +31,7 @@ LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A lock faceplayer - msgbox LilycoveCity_House3_Text_21F430, 4 + msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -79,22 +79,22 @@ LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D end LilycoveCity_House3_EventScript_21EF71:: @ 821EF71 - msgbox LilycoveCity_House3_Text_21F4A7, 4 + msgbox LilycoveCity_House3_Text_21F4A7, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF7B:: @ 821EF7B - msgbox LilycoveCity_House3_Text_21F4E0, 4 + msgbox LilycoveCity_House3_Text_21F4E0, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF85:: @ 821EF85 - msgbox LilycoveCity_House3_Text_21F523, 4 + msgbox LilycoveCity_House3_Text_21F523, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F - msgbox LilycoveCity_House3_Text_21F55A, 4 + msgbox LilycoveCity_House3_Text_21F55A, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc index 8bfdb2d48..e3feb8e25 100644 --- a/data/maps/LilycoveCity_House4/scripts.inc +++ b/data/maps/LilycoveCity_House4/scripts.inc @@ -2,11 +2,11 @@ LilycoveCity_House4_MapScripts:: @ 821F5B4 .byte 0 LilycoveCity_House4_EventScript_21F5B5:: @ 821F5B5 - msgbox LilycoveCity_House4_Text_21F5C7, 2 + msgbox LilycoveCity_House4_Text_21F5C7, MSGBOX_NPC end LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE - msgbox LilycoveCity_House4_Text_21F62B, 2 + msgbox LilycoveCity_House4_Text_21F62B, MSGBOX_NPC end LilycoveCity_House4_Text_21F5C7: @ 821F5C7 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index c2f3be7d6..9a7e466f0 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8 .byte 0 LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 @@ -18,11 +18,11 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 end LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 compare VAR_RESULT, 1 @@ -30,12 +30,12 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 end LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, MSGBOX_SIGN releaseall end LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, MSGBOX_SIGN applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99 waitmovement 0 removeobject 2 @@ -89,70 +89,70 @@ LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 step_end LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B lock faceplayer - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, 4 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT closemessage applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 waitmovement 0 @@ -160,7 +160,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B end LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 6b4f0f3da..a09d304b4 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -70,17 +70,17 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E waitmovement 0 applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN copyvar VAR_0x4094, 0x1 releaseall end @@ -105,25 +105,25 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, MSGBOX_DEFAULT goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 @@ -134,13 +134,13 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, MSGBOX_NPC releaseall end @@ -148,79 +148,79 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B lockall checkflag FLAG_0x0A2 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E lockall checkflag FLAG_0x0A4 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 lockall checkflag FLAG_0x0A0 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 lockall checkflag FLAG_0x0A1 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 lockall checkflag FLAG_0x0A3 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 9 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 10 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 11 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 12 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 13 releaseall diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 19471d2e1..aa69aa7ec 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -5,7 +5,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B lockall applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO switch VAR_RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EA3B case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 @@ -13,7 +13,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B end LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, MSGBOX_DEFAULT special sub_81B94B0 waitstate compare VAR_0x8004, 255 @@ -24,14 +24,14 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B special sub_81B96D0 compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, MSGBOX_DEFAULT fadescreen 1 special sub_81B968C fadescreen 0 compare VAR_0x8005, 4 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, MSGBOX_YESNO switch VAR_RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EAB0 case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 @@ -45,29 +45,29 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 special sub_81B9770 playfanfare MUS_ME_WASURE waitfanfare - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EACF:: @ 821EACF special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EADC:: @ 821EADC - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EAE6:: @ 821EAE6 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0 special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index f4a21637b..0f643ad3e 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -33,7 +33,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 end LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, 2 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, MSGBOX_NPC end LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF @@ -41,12 +41,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 8735811bf..e8fc1886c 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -11,13 +11,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 @@ -217,7 +217,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, MSGBOX_DEFAULT release end @@ -225,22 +225,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70:: @ 821CA70 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A:: @ 821CA7A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84:: @ 821CA84 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, MSGBOX_DEFAULT release end @@ -257,7 +257,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, MSGBOX_DEFAULT release end @@ -265,22 +265,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7:: @ 821CAE7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1:: @ 821CAF1 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB:: @ 821CAFB - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, MSGBOX_DEFAULT release end @@ -297,7 +297,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, MSGBOX_DEFAULT release end @@ -305,22 +305,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E:: @ 821CB5E - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68:: @ 821CB68 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72:: @ 821CB72 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, MSGBOX_DEFAULT release end @@ -337,7 +337,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, MSGBOX_DEFAULT release end @@ -345,22 +345,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5:: @ 821CBD5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF:: @ 821CBDF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9:: @ 821CBE9 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, MSGBOX_DEFAULT release end @@ -375,7 +375,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, MSGBOX_DEFAULT release end @@ -383,17 +383,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41:: @ 821CC41 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B:: @ 821CC4B - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, MSGBOX_DEFAULT release end @@ -408,7 +408,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, MSGBOX_DEFAULT release end @@ -416,17 +416,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3:: @ 821CCA3 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD:: @ 821CCAD - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, MSGBOX_DEFAULT release end @@ -441,7 +441,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, MSGBOX_DEFAULT release end @@ -449,17 +449,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05:: @ 821CD05 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F:: @ 821CD0F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, MSGBOX_DEFAULT release end @@ -474,7 +474,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, MSGBOX_DEFAULT release end @@ -482,17 +482,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, MSGBOX_DEFAULT release end @@ -513,7 +513,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 copyvar VAR_0x800A, VAR_0x8006 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT setvar VAR_0x8004, 14 copyvar VAR_0x8005, VAR_0x800A call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C @@ -526,14 +526,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, MSGBOX_DEFAULT goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D end LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 @@ -543,7 +543,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT setvar VAR_0x8004, 14 copyvar VAR_0x8005, VAR_0x800A call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C @@ -578,7 +578,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 @@ -588,14 +588,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT setflag FLAG_0x0D2 release end @@ -603,7 +603,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, MSGBOX_DEFAULT release end diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 03100ee66..1f4e2593c 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -126,7 +126,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 delay 10 applymovement 4, LittlerootTown_Movement_1E7F9A waitmovement 0 - msgbox LittlerootTown_Text_1E86BC, 4 + msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_1E7F9D applymovement 255, LittlerootTown_Movement_1E7FA4 @@ -190,7 +190,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 applymovement 8, LittlerootTown_Movement_272598 waitmovement 0 delay 80 - msgbox LittlerootTown_Text_1E8DA2, 4 + msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH @@ -225,11 +225,11 @@ LittlerootTown_EventScript_1E8013:: @ 81E8013 end LittlerootTown_EventScript_1E8022:: @ 81E8022 - msgbox LittlerootTown_Text_1E8ACF, 2 + msgbox LittlerootTown_Text_1E8ACF, MSGBOX_NPC end LittlerootTown_EventScript_1E802B:: @ 81E802B - msgbox LittlerootTown_Text_1E8B25, 2 + msgbox LittlerootTown_Text_1E8B25, MSGBOX_NPC end LittlerootTown_EventScript_1E8034:: @ 81E8034 @@ -241,13 +241,13 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034 goto_eq LittlerootTown_EventScript_1E807A compare VAR_0x4050, 0 goto_if 5, LittlerootTown_EventScript_1E805D - msgbox LittlerootTown_Text_1E8BB8, 4 + msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT release end LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, 4 + msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_2725A2 waitmovement 0 @@ -257,12 +257,12 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D LittlerootTown_EventScript_1E807A:: @ 81E807A special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8CE3, 4 + msgbox LittlerootTown_Text_1E8CE3, MSGBOX_DEFAULT release end LittlerootTown_EventScript_1E8087:: @ 81E8087 - msgbox LittlerootTown_Text_1E8D07, 4 + msgbox LittlerootTown_Text_1E8D07, MSGBOX_DEFAULT release end @@ -277,12 +277,12 @@ LittlerootTown_EventScript_1E8091:: @ 81E8091 end LittlerootTown_EventScript_1E80AD:: @ 81E80AD - msgbox LittlerootTown_Text_1E8BB8, 4 + msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_1E80DF applymovement 255, LittlerootTown_Movement_1E80EB waitmovement 0 - msgbox LittlerootTown_Text_1E8C07, 4 + msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT closemessage return @@ -365,7 +365,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F applymovement 255, LittlerootTown_Movement_2725A4 waitmovement 0 special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, 4 + msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_2725A2 waitmovement 0 @@ -374,11 +374,11 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F end LittlerootTown_EventScript_1E8151:: @ 81E8151 - msgbox LittlerootTown_Text_1E8D32, 3 + msgbox LittlerootTown_Text_1E8D32, MSGBOX_SIGN end LittlerootTown_EventScript_1E815A:: @ 81E815A - msgbox LittlerootTown_Text_1E8D69, 3 + msgbox LittlerootTown_Text_1E8D69, MSGBOX_SIGN end LittlerootTown_EventScript_1E8163:: @ 81E8163 @@ -392,11 +392,11 @@ LittlerootTown_EventScript_1E8163:: @ 81E8163 end LittlerootTown_EventScript_1E817D:: @ 81E817D - msgbox LittlerootTown_Text_1E8D83, 4 + msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E8186:: @ 81E8186 - msgbox LittlerootTown_Text_1E8D8E, 4 + msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E818F:: @ 81E818F @@ -410,11 +410,11 @@ LittlerootTown_EventScript_1E818F:: @ 81E818F end LittlerootTown_EventScript_1E81A9:: @ 81E81A9 - msgbox LittlerootTown_Text_1E8D8E, 4 + msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E81B2:: @ 81E81B2 - msgbox LittlerootTown_Text_1E8D83, 4 + msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E81BB:: @ 81E81BB @@ -466,7 +466,7 @@ LittlerootTown_EventScript_1E8211:: @ 81E8211 call_if 1, LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E828C - msgbox LittlerootTown_Text_1E87E1, 4 + msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, 0 @@ -917,13 +917,13 @@ LittlerootTown_EventScript_1E8686:: @ 81E8686 end LittlerootTown_EventScript_1E8693:: @ 81E8693 - msgbox LittlerootTown_Text_1E87F0, 4 + msgbox LittlerootTown_Text_1E87F0, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message LittlerootTown_Text_1E8925 waitfanfare setflag FLAG_0x112 - msgbox LittlerootTown_Text_1E894F, 4 - msgbox LittlerootTown_Text_1E8A03, 4 + msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT closemessage delay 30 return diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 04cc1ad38..4a0c9f082 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -60,7 +60,7 @@ LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 lockall - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A @@ -99,7 +99,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_0x057 setvar VAR_0x4082, 2 releaseall @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 compare VAR_0x8008, 2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 54d386e26..cdd8b83b0 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall compare VAR_0x408D, 2 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -96,7 +96,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 @@ -108,7 +108,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB @@ -120,7 +120,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED @@ -132,7 +132,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604 waitmovement 0 @@ -258,7 +258,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 setvar VAR_0x8004, 1 special DoPCTurnOnEffect playse SE_PC_ON - msgbox gUnknown_08272D87, 4 + msgbox gUnknown_08272D87, MSGBOX_DEFAULT special BedroomPC waitstate releaseall @@ -272,18 +272,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F end LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C - msgbox gUnknown_08272CD5, 4 + msgbox gUnknown_08272CD5, MSGBOX_DEFAULT releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656 LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, 3 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, MSGBOX_SIGN end LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, 3 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, MSGBOX_SIGN end LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index d5348ef8a..ef5ff3df1 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -60,7 +60,7 @@ LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 lockall - msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A @@ -99,7 +99,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_0x057 setvar VAR_0x408C, 2 releaseall @@ -125,22 +125,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 compare VAR_0x408D, 3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, MSGBOX_DEFAULT release end @@ -149,7 +149,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D lock faceplayer special GetPlayerBigGuyGirlString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, MSGBOX_DEFAULT release end @@ -199,7 +199,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 compare VAR_0x8008, 2 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B - msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 70e1c59d4..3d7e47d19 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -59,7 +59,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall compare VAR_0x408D, 2 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A - msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -97,7 +97,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 @@ -109,7 +109,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F @@ -121,7 +121,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4 waitmovement 0 @@ -132,7 +132,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 @@ -260,12 +260,12 @@ LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 end LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, MSGBOX_DEFAULT releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, MSGBOX_DEFAULT releaseall end @@ -284,21 +284,21 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D checkflag FLAG_0x125 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F checkflag FLAG_0x125 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, MSGBOX_DEFAULT return EventScript_PlayerPCFemale:: @ 81F9553 @@ -311,7 +311,7 @@ EventScript_PlayerPCFemale:: @ 81F9553 end LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C - msgbox gUnknown_08272CD5, 4 + msgbox gUnknown_08272CD5, MSGBOX_DEFAULT releaseall end @@ -319,7 +319,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 setvar VAR_0x8004, 2 special DoPCTurnOnEffect playse SE_PC_ON - msgbox gUnknown_08272D87, 4 + msgbox gUnknown_08272D87, MSGBOX_DEFAULT special BedroomPC waitstate releaseall diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ae01e4632..22d5bc99b 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -98,7 +98,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 compare VAR_RESULT, 0 @@ -112,7 +112,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 @@ -120,14 +120,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT clearflag FLAG_HIDE_ROUTE_101_BOY setvar VAR_0x4084, 3 releaseall end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 @@ -154,7 +154,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 lockall delay 30 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, MSGBOX_DEFAULT closemessage applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46 waitmovement 0 @@ -183,14 +183,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FB436 waitmessage waitfanfare setflag FLAG_SYS_NATIONAL_DEX special EnableNationalPokedex - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL @@ -201,12 +201,12 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, MSGBOX_DEFAULT closemessage return LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, MSGBOX_DEFAULT closemessage return @@ -246,7 +246,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 lockall applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT setvar VAR_0x40D3, 5 releaseall end @@ -268,18 +268,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 checkflag FLAG_0x058 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT setflag FLAG_0x058 release end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, MSGBOX_DEFAULT release end @@ -290,7 +290,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C @@ -303,7 +303,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D @@ -316,20 +316,20 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE end LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, MSGBOX_DEFAULT releaseall end LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT releaseall end @@ -348,7 +348,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -359,7 +359,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -373,7 +373,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -393,7 +393,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -404,7 +404,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -418,7 +418,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -438,7 +438,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -449,7 +449,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -463,7 +463,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -490,12 +490,12 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A end LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT release end @@ -508,17 +508,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x4084, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2 Route101_EventScript_1FA2D2:: @ 81FA2D2 - msgbox Route101_Text_2B5F52, 4 + msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route101_Text_2B603A, 4 + msgbox Route101_Text_2B603A, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -528,9 +528,9 @@ Route101_EventScript_1FA2D2:: @ 81FA2D2 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, MSGBOX_DEFAULT call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, MSGBOX_DEFAULT closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 @@ -550,20 +550,20 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -578,16 +578,16 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 @@ -596,7 +596,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 step_end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC @@ -617,11 +617,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC end LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A @@ -634,11 +634,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A end LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 @@ -651,11 +651,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 @@ -668,23 +668,23 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 0e133a890..7db80a50c 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -8,12 +8,12 @@ MagmaHideout_1F_MapScript1_239886: @ 8239886 MagmaHideout_1F_EventScript_23988C:: @ 823988C trainerbattle 0, TRAINER_GRUNT_38, 0, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 - msgbox MagmaHideout_1F_Text_2399B1, 6 + msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE end MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 trainerbattle 0, TRAINER_GRUNT_39, 0, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA - msgbox MagmaHideout_1F_Text_239ACD, 6 + msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE end MagmaHideout_1F_Text_2398BA: @ 82398BA diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc index 33252bb57..347956e3b 100644 --- a/data/maps/MagmaHideout_2F_1R/scripts.inc +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -3,22 +3,22 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50 MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 trainerbattle 0, TRAINER_GRUNT_51, 0, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B - msgbox MagmaHideout_2F_1R_Text_239C74, 6 + msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 trainerbattle 0, TRAINER_GRUNT_40, 0, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 - msgbox MagmaHideout_2F_1R_Text_239D1D, 6 + msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F trainerbattle 0, TRAINER_GRUNT_41, 0, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 - msgbox MagmaHideout_2F_1R_Text_239D7D, 6 + msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 trainerbattle 0, TRAINER_GRUNT_42, 0, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA - msgbox MagmaHideout_2F_1R_Text_239DE2, 6 + msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc index 8b1e51f16..188edddcb 100644 --- a/data/maps/MagmaHideout_2F_2R/scripts.inc +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -3,22 +3,22 @@ MagmaHideout_2F_2R_MapScripts:: @ 8239E07 MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 trainerbattle 0, TRAINER_GRUNT_52, 0, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 - msgbox MagmaHideout_2F_2R_Text_239EBB, 6 + msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F trainerbattle 0, TRAINER_GRUNT_43, 0, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 - msgbox MagmaHideout_2F_2R_Text_239FA1, 6 + msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 trainerbattle 0, TRAINER_GRUNT_44, 0, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 - msgbox MagmaHideout_2F_2R_Text_23A07D, 6 + msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D trainerbattle 0, TRAINER_GRUNT_45, 0, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C - msgbox MagmaHideout_2F_2R_Text_23A16F, 6 + msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_Text_239E64: @ 8239E64 diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc index 068e71492..604c09181 100644 --- a/data/maps/MagmaHideout_3F_1R/scripts.inc +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -3,12 +3,12 @@ MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 trainerbattle 0, TRAINER_GRUNT_46, 0, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 - msgbox MagmaHideout_3F_1R_Text_23A246, 6 + msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE end MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA trainerbattle 0, TRAINER_GRUNT_53, 0, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 - msgbox MagmaHideout_3F_1R_Text_23A37C, 6 + msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE end MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc index 15d0c26ea..3656ec357 100644 --- a/data/maps/MagmaHideout_3F_2R/scripts.inc +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -3,7 +3,7 @@ MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 trainerbattle 0, TRAINER_GRUNT_47, 0, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB - msgbox MagmaHideout_3F_2R_Text_23A4EF, 6 + msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE end MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index b2a28639f..82d21bf6c 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -4,7 +4,7 @@ MagmaHideout_4F_MapScripts:: @ 823A55F MagmaHideout_4F_EventScript_23A560:: @ 823A560 lockall playbgm MUS_MGM0, 0 - msgbox MagmaHideout_4F_Text_23A9F4, 4 + msgbox MagmaHideout_4F_Text_23A9F4, MSGBOX_DEFAULT closemessage delay 20 setvar VAR_RESULT, 1 @@ -48,17 +48,17 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 delay 30 applymovement 6, MagmaHideout_4F_Movement_23A680 waitmovement 0 - msgbox MagmaHideout_4F_Text_23AADA, 4 + msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage applymovement 255, MagmaHideout_4F_Movement_2725A8 waitmovement 0 delay 30 applymovement 6, MagmaHideout_4F_Movement_27259E waitmovement 0 - msgbox MagmaHideout_4F_Text_23AB33, 4 + msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5 - msgbox MagmaHideout_4F_Text_23ABE2, 4 + msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY @@ -110,22 +110,22 @@ MagmaHideout_4F_Movement_23A680: @ 823A680 MagmaHideout_4F_EventScript_23A68C:: @ 823A68C trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 - msgbox MagmaHideout_4F_Text_23A7B5, 6 + msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B - msgbox MagmaHideout_4F_Text_23A841, 6 + msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 - msgbox MagmaHideout_4F_Text_23A8C6, 6 + msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 - msgbox MagmaHideout_4F_Text_23A9AC, 6 + msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE end MagmaHideout_4F_Text_23A6E8: @ 823A6E8 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index ed5163cf1..dd5a89a8c 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -20,35 +20,35 @@ MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 return MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 - msgbox MauvilleCity_Text_1E0301, 2 + msgbox MauvilleCity_Text_1E0301, MSGBOX_NPC end MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC - msgbox MauvilleCity_Text_1E037C, 2 + msgbox MauvilleCity_Text_1E037C, MSGBOX_NPC end MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5 - msgbox MauvilleCity_Text_1E03FB, 2 + msgbox MauvilleCity_Text_1E03FB, MSGBOX_NPC end MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE - msgbox MauvilleCity_Text_1E044A, 2 + msgbox MauvilleCity_Text_1E044A, MSGBOX_NPC end MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7 - msgbox MauvilleCity_Text_1E0485, 3 + msgbox MauvilleCity_Text_1E0485, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0 - msgbox MauvilleCity_Text_1E04B7, 3 + msgbox MauvilleCity_Text_1E04B7, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9 - msgbox MauvilleCity_Text_1E0504, 3 + msgbox MauvilleCity_Text_1E0504, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 - msgbox MauvilleCity_Text_1E053C, 3 + msgbox MauvilleCity_Text_1E053C, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB @@ -56,13 +56,13 @@ MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB faceplayer checkflag FLAG_0x062 goto_eq MauvilleCity_EventScript_1DF413 - msgbox MauvilleCity_Text_1E056A, 4 + msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT setflag FLAG_0x062 release end MauvilleCity_EventScript_1DF413:: @ 81DF413 - msgbox MauvilleCity_Text_1E0699, 4 + msgbox MauvilleCity_Text_1E0699, MSGBOX_DEFAULT release end @@ -71,7 +71,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D faceplayer checkflag FLAG_0x11C goto_eq MauvilleCity_EventScript_1DF43D - msgbox MauvilleCity_Text_1DF7DC, 4 + msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 waitmovement 0 @@ -79,7 +79,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D end MauvilleCity_EventScript_1DF43D:: @ 81DF43D - msgbox MauvilleCity_Text_1DFAA5, 4 + msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 waitmovement 0 @@ -92,9 +92,9 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 goto_eq MauvilleCity_EventScript_1DF690 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DF845, 4 - msgbox MauvilleCity_Text_1DF8B9, 4 - msgbox MauvilleCity_Text_1DF963, 4 + msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 playse SE_PIN @@ -102,7 +102,7 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 waitmovement 0 applymovement 6, MauvilleCity_Movement_27259A waitmovement 0 - msgbox MauvilleCity_Text_1DF9B2, 5 + msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD end @@ -128,7 +128,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 255, MauvilleCity_Movement_1DF6EE applymovement 7, MauvilleCity_Movement_1DF6F3 waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, 4 + msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage applymovement 255, MauvilleCity_Movement_1DF6CC applymovement 7, MauvilleCity_Movement_1DF6FA @@ -147,7 +147,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, 4 + msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage applymovement 255, MauvilleCity_Movement_1DF6D0 applymovement 7, MauvilleCity_Movement_1DF703 @@ -170,7 +170,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if 1, MauvilleCity_EventScript_1DF601 applymovement 255, MauvilleCity_Movement_2725AA waitmovement 0 - msgbox MauvilleCity_Text_1DFED5, 4 + msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage addvar VAR_0x40D1, 1 compare VAR_FACING, 2 @@ -207,29 +207,29 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 return MauvilleCity_EventScript_1DF63A:: @ 81DF63A - msgbox MauvilleCity_Text_1DFB6D, 4 + msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DFBC3, 4 + msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 - msgbox MauvilleCity_Text_1DFBED, 4 + msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DFC8A, 4 + msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return MauvilleCity_EventScript_1DF683:: @ 81DF683 setflag FLAG_0x11C - msgbox MauvilleCity_Text_1DFA4A, 4 + msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF690:: @ 81DF690 applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 - msgbox MauvilleCity_Text_1DFB42, 5 + msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD end @@ -430,30 +430,30 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A goto_eq MauvilleCity_EventScript_1DF784 checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON goto_eq MauvilleCity_EventScript_1DF77A - msgbox MauvilleCity_Text_1DFFE4, 4 + msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT giveitem_std ITEM_BASEMENT_KEY setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - msgbox MauvilleCity_Text_1E0154, 4 + msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF77A:: @ 81DF77A - msgbox MauvilleCity_Text_1E0154, 4 + msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF784:: @ 81DF784 - msgbox MauvilleCity_Text_1E020E, 4 + msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_272054 setflag FLAG_GOT_TM24_FROM_WATTSON - msgbox MauvilleCity_Text_1E02AA, 4 + msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0 - msgbox MauvilleCity_Text_1E02AA, 4 + msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release end @@ -463,7 +463,7 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Text_1DFEB4, 4 + msgbox MauvilleCity_Text_1DFEB4, MSGBOX_DEFAULT waitfanfare closemessage delay 30 diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 0231e5bde..2e0fac7c2 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -8,8 +8,8 @@ MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC goto_eq MauvilleCity_BikeShop_EventScript_20EC94 checkflag FLAG_0x059 goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE22, 4 - msgbox MauvilleCity_BikeShop_Text_20EE99, 5 + msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 @@ -17,7 +17,7 @@ MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC end MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE99, 5 + msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 @@ -35,7 +35,7 @@ MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D setflag FLAG_0x059 - msgbox MauvilleCity_BikeShop_Text_20EEE8, 4 + msgbox MauvilleCity_BikeShop_Text_20EEE8, MSGBOX_DEFAULT release end @@ -45,25 +45,25 @@ MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A end MauvilleCity_BikeShop_EventScript_20EC53:: @ 820EC53 - msgbox MauvilleCity_BikeShop_Text_20F18D, 4 + msgbox MauvilleCity_BikeShop_Text_20F18D, MSGBOX_DEFAULT giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D - msgbox MauvilleCity_BikeShop_Text_20F1A5, 4 + msgbox MauvilleCity_BikeShop_Text_20F1A5, MSGBOX_DEFAULT giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 - msgbox MauvilleCity_BikeShop_Text_20F1BD, 4 + msgbox MauvilleCity_BikeShop_Text_20F1BD, MSGBOX_DEFAULT special SwapRegisteredBike release end MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 - msgbox MauvilleCity_BikeShop_Text_20F1FB, 5 + msgbox MauvilleCity_BikeShop_Text_20F1FB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 compare VAR_RESULT, 0 @@ -71,25 +71,25 @@ MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 end MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 - msgbox MauvilleCity_BikeShop_Text_20F22F, 4 + msgbox MauvilleCity_BikeShop_Text_20F22F, MSGBOX_DEFAULT checkitem ITEM_ACRO_BIKE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECEF checkitem ITEM_MACH_BIKE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ED10 - msgbox MauvilleCity_BikeShop_Text_20F2F3, 4 + msgbox MauvilleCity_BikeShop_Text_20F2F3, MSGBOX_DEFAULT release end MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5 - msgbox MauvilleCity_BikeShop_Text_20F2C4, 4 + msgbox MauvilleCity_BikeShop_Text_20F2C4, MSGBOX_DEFAULT release end MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F294, 4 + msgbox MauvilleCity_BikeShop_Text_20F294, MSGBOX_DEFAULT takeitem ITEM_ACRO_BIKE, 1 giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 @@ -97,14 +97,14 @@ MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10 incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F263, 4 + msgbox MauvilleCity_BikeShop_Text_20F263, MSGBOX_DEFAULT takeitem ITEM_MACH_BIKE, 1 giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20ED31:: @ 820ED31 - msgbox MauvilleCity_BikeShop_Text_20F3C3, 2 + msgbox MauvilleCity_BikeShop_Text_20F3C3, MSGBOX_NPC end MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 733581b74..404cd62e7 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -4,7 +4,7 @@ MauvilleCity_GameCorner_MapScripts:: @ 820FBB8 MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210460, 4 + msgbox MauvilleCity_GameCorner_Text_210460, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 nop updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, 4 + msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT hidemoneybox nop nop @@ -64,7 +64,7 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 nop updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, 4 + msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT hidemoneybox nop nop @@ -73,12 +73,12 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 end MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7 - msgbox MauvilleCity_GameCorner_Text_21047E, 4 + msgbox MauvilleCity_GameCorner_Text_21047E, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 - msgbox MauvilleCity_GameCorner_Text_210553, 4 + msgbox MauvilleCity_GameCorner_Text_210553, MSGBOX_DEFAULT hidemoneybox nop nop @@ -87,7 +87,7 @@ MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 end MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 - msgbox MauvilleCity_GameCorner_Text_21059A, 4 + msgbox MauvilleCity_GameCorner_Text_21059A, MSGBOX_DEFAULT hidemoneybox nop nop @@ -96,7 +96,7 @@ MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 end MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 - msgbox MauvilleCity_GameCorner_Text_21057E, 4 + msgbox MauvilleCity_GameCorner_Text_21057E, MSGBOX_DEFAULT hidemoneybox nop nop @@ -107,7 +107,7 @@ MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, 4 + msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FD0D @@ -152,7 +152,7 @@ MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 goto MauvilleCity_GameCorner_EventScript_20FD91 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 - msgbox MauvilleCity_GameCorner_Text_210705, 5 + msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE92 switch VAR_TEMP_1 @@ -173,7 +173,7 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB givedecoration 88 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -189,7 +189,7 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 givedecoration 89 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -205,12 +205,12 @@ MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F givedecoration 90 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 - msgbox MauvilleCity_GameCorner_Text_210673, 4 + msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -220,7 +220,7 @@ MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 end MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 - msgbox MauvilleCity_GameCorner_Text_2106BF, 4 + msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end @@ -228,7 +228,7 @@ MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, 4 + msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FEBB @@ -291,7 +291,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A special sub_81398C0 - msgbox MauvilleCity_GameCorner_Text_210629, 5 + msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210118 switch VAR_TEMP_1 @@ -313,7 +313,7 @@ MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD giveitem ITEM_TM32, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -328,7 +328,7 @@ MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 giveitem ITEM_TM29, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -343,7 +343,7 @@ MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 giveitem ITEM_TM35, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -358,7 +358,7 @@ MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B giveitem ITEM_TM24, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -373,12 +373,12 @@ MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 giveitem ITEM_TM13, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF - msgbox MauvilleCity_GameCorner_Text_210673, 4 + msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -388,17 +388,17 @@ MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D end MauvilleCity_GameCorner_EventScript_210118:: @ 8210118 - msgbox MauvilleCity_GameCorner_Text_2106BF, 4 + msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end MauvilleCity_GameCorner_EventScript_210125:: @ 8210125 - msgbox MauvilleCity_GameCorner_Text_2109D3, 2 + msgbox MauvilleCity_GameCorner_Text_2109D3, MSGBOX_NPC end MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E - msgbox MauvilleCity_GameCorner_Text_210A05, 2 + msgbox MauvilleCity_GameCorner_Text_210A05, MSGBOX_NPC end MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 @@ -406,7 +406,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 faceplayer checkflag FLAG_0x0E2 goto_eq MauvilleCity_GameCorner_EventScript_210213 - msgbox MauvilleCity_GameCorner_Text_210750, 5 + msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210209 switch VAR_STARTER_MON @@ -420,7 +420,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C checkdecorspace 88 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 88 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -431,7 +431,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 checkdecorspace 89 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 89 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -442,7 +442,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 checkdecorspace 90 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 90 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -450,17 +450,17 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA call MauvilleCity_GameCorner_EventScript_272071 - msgbox MauvilleCity_GameCorner_Text_2107A9, 4 + msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_210209:: @ 8210209 - msgbox MauvilleCity_GameCorner_Text_2107CE, 4 + msgbox MauvilleCity_GameCorner_Text_2107CE, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_210213:: @ 8210213 - msgbox MauvilleCity_GameCorner_Text_2107FB, 4 + msgbox MauvilleCity_GameCorner_Text_2107FB, MSGBOX_DEFAULT release end @@ -470,7 +470,7 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_21023D - msgbox MauvilleCity_GameCorner_Text_210830, 4 + msgbox MauvilleCity_GameCorner_Text_210830, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -482,34 +482,34 @@ MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D goto_if 4, MauvilleCity_GameCorner_EventScript_21026B setflag FLAG_0x0E1 givecoins 20 - msgbox MauvilleCity_GameCorner_Text_2108A0, 4 + msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT playse SE_REGI goto MauvilleCity_GameCorner_EventScript_21026B end MauvilleCity_GameCorner_EventScript_21026B:: @ 821026B - msgbox MauvilleCity_GameCorner_Text_2108EF, 4 + msgbox MauvilleCity_GameCorner_Text_2108EF, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210279:: @ 8210279 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210932, 4 + msgbox MauvilleCity_GameCorner_Text_210932, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210289:: @ 8210289 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_21098E, 4 + msgbox MauvilleCity_GameCorner_Text_21098E, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A51, 4 + msgbox MauvilleCity_GameCorner_Text_210A51, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -523,14 +523,14 @@ MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 MauvilleCity_GameCorner_EventScript_2102B6:: @ 82102B6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A82, 4 + msgbox MauvilleCity_GameCorner_Text_210A82, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210B04, 4 + msgbox MauvilleCity_GameCorner_Text_210B04, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -667,7 +667,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 end MauvilleCity_GameCorner_EventScript_210456:: @ 8210456 - msgbox MauvilleCity_GameCorner_Text_210C2E, 4 + msgbox MauvilleCity_GameCorner_Text_210C2E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index a284d1dd7..995b28c94 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -84,7 +84,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB goto_if 0, MauvilleCity_Gym_EventScript_20DF8D compare VAR_0x40BA, 2 goto_eq MauvilleCity_Gym_EventScript_20DFD4 - msgbox MauvilleCity_Gym_Text_20E8E3, 4 + msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT release end @@ -92,7 +92,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B message MauvilleCity_Gym_Text_20E77F waitmessage call MauvilleCity_Gym_EventScript_27207E - msgbox MauvilleCity_Gym_Text_20E7AA, 4 + msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT setvar VAR_0x40D2, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_0x4F2 @@ -109,7 +109,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Gym_Text_20E8B5, 4 + msgbox MauvilleCity_Gym_Text_20E8B5, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -121,7 +121,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_272054 - msgbox MauvilleCity_Gym_Text_20E844, 4 + msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 release end @@ -130,18 +130,18 @@ MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_27205E - msgbox MauvilleCity_Gym_Text_20E844, 4 + msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 return MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4 - msgbox MauvilleCity_Gym_Text_20E925, 4 + msgbox MauvilleCity_Gym_Text_20E925, MSGBOX_DEFAULT release end MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE trainerbattle 7, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD - msgbox MauvilleCity_Gym_Text_20EA5E, 6 + msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 @@ -216,27 +216,27 @@ MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9 trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC - msgbox MauvilleCity_Gym_Text_20E336, 6 + msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0 trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 - msgbox MauvilleCity_Gym_Text_20E3C1, 6 + msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7 trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 - msgbox MauvilleCity_Gym_Text_20E47E, 6 + msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 - msgbox MauvilleCity_Gym_Text_20E50F, 6 + msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E115:: @ 820E115 trainerbattle 0, TRAINER_ANGELO, 0, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 - msgbox MauvilleCity_Gym_Text_20E5C2, 6 + msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C @@ -244,12 +244,12 @@ MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C faceplayer checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E141 - msgbox MauvilleCity_Gym_Text_20E17F, 4 + msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT release end MauvilleCity_Gym_EventScript_20E141:: @ 820E141 - msgbox MauvilleCity_Gym_Text_20E283, 4 + msgbox MauvilleCity_Gym_Text_20E283, MSGBOX_DEFAULT release end @@ -268,12 +268,12 @@ MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B end MauvilleCity_Gym_EventScript_20E16B:: @ 820E16B - msgbox MauvilleCity_Gym_Text_20E96C, 4 + msgbox MauvilleCity_Gym_Text_20E96C, MSGBOX_DEFAULT releaseall end MauvilleCity_Gym_EventScript_20E175:: @ 820E175 - msgbox MauvilleCity_Gym_Text_20E952, 4 + msgbox MauvilleCity_Gym_Text_20E952, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index dd3e1665f..d5605e5d7 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -6,16 +6,16 @@ MauvilleCity_House1_EventScript_20F976:: @ 820F976 faceplayer checkflag FLAG_0x06B goto_eq MauvilleCity_House1_EventScript_20F9A5 - msgbox MauvilleCity_House1_Text_20F9AF, 4 + msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT giveitem_std ITEM_HM06 setflag FLAG_0x06B setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY - msgbox MauvilleCity_House1_Text_20FAA9, 4 + msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT release end MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5 - msgbox MauvilleCity_House1_Text_20FB67, 4 + msgbox MauvilleCity_House1_Text_20FB67, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 7a1a1cad1..dcee418c4 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -6,7 +6,7 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D faceplayer checkflag FLAG_0x102 goto_eq MauvilleCity_House2_EventScript_210CDA - msgbox MauvilleCity_House2_Text_210CEE, 4 + msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210C82 @@ -19,7 +19,7 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 waitmovement 0 applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A waitmovement 0 - msgbox MauvilleCity_House2_Text_210D76, 5 + msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210CB8 compare VAR_RESULT, 0 @@ -27,7 +27,7 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 end MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 - msgbox MauvilleCity_House2_Text_210DB3, 4 + msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT takeitem ITEM_HARBOR_MAIL, 1 giveitem_std ITEM_COIN_CASE setflag FLAG_0x102 @@ -35,12 +35,12 @@ MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 end MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA - msgbox MauvilleCity_House2_Text_210DE7, 4 + msgbox MauvilleCity_House2_Text_210DE7, MSGBOX_DEFAULT release end MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4 - msgbox MauvilleCity_House2_Text_210E16, 4 + msgbox MauvilleCity_House2_Text_210E16, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index 56ee9497f..d6c2c2fd4 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -7,7 +7,7 @@ MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6 message gUnknown_08272A21 waitmessage pokemart MauvilleCity_Mart_Pokemart_211100 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -30,11 +30,11 @@ MauvilleCity_Mart_Pokemart_211100: @ 8211100 end MauvilleCity_Mart_EventScript_21111C:: @ 821111C - msgbox MauvilleCity_Mart_Text_21112E, 2 + msgbox MauvilleCity_Mart_Text_21112E, MSGBOX_NPC end MauvilleCity_Mart_EventScript_211125:: @ 8211125 - msgbox MauvilleCity_Mart_Text_2111D8, 2 + msgbox MauvilleCity_Mart_Text_2111D8, MSGBOX_NPC end MauvilleCity_Mart_Text_21112E: @ 821112E diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index b2267122b..40914c740 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -22,15 +22,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 end MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86 - msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F - msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98 - msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index c430b4440..10b0eca4b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -18,7 +18,7 @@ MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029 end MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F - msgbox MauvilleCity_PokemonCenter_2F_Text_211038, 2 + msgbox MauvilleCity_PokemonCenter_2F_Text_211038, MSGBOX_NPC end MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index e8b81164f..4bfaa7ad9 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -22,7 +22,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF47, 4 + msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 @@ -32,11 +32,11 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 applymovement 5, MeteorFalls_1F_1R_Movement_27259A waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF84, 4 + msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT closemessage applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BFE4, 4 + msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage applymovement 255, MeteorFalls_1F_1R_Movement_2725A4 applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 @@ -53,7 +53,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C04E, 4 + msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 @@ -63,18 +63,18 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F removeobject 6 applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C11C, 4 + msgbox MeteorFalls_1F_1R_Text_22C11C, MSGBOX_DEFAULT closemessage applymovement 8, MeteorFalls_1F_1R_Movement_22BF08 applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C268, 4 + msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT applymovement 7, MeteorFalls_1F_1R_Movement_2725AA waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C292, 4 + msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C2FC, 4 + msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0 applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE @@ -224,12 +224,12 @@ MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 checkflag FLAG_0x0F4 goto_eq MeteorFalls_1F_1R_EventScript_22BF3D setflag FLAG_0x0F4 - msgbox MeteorFalls_1F_1R_Text_22C342, 4 + msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT release end MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D - msgbox MeteorFalls_1F_1R_Text_22C47D, 4 + msgbox MeteorFalls_1F_1R_Text_22C47D, MSGBOX_DEFAULT release end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 4f4ab7c6b..492edb063 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -6,24 +6,24 @@ MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 - msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 + msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A special sub_80B4808 waitmovement 0 - msgbox MeteorFalls_1F_2R_Text_22C6F6, 4 + msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT setvar VAR_0x8004, 392 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 392 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD - msgbox MeteorFalls_1F_2R_Text_22C7D8, 6 + msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 @@ -31,22 +31,22 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C589 - msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 + msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 + msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT setvar VAR_0x8004, 681 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 681 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 - msgbox MeteorFalls_1F_2R_Text_22CBC5, 6 + msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 @@ -54,22 +54,22 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C5ED - msgbox MeteorFalls_1F_2R_Text_22CA70, 4 + msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 + msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT setvar VAR_0x8004, 681 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 681 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB - msgbox MeteorFalls_1F_2R_Text_22CD34, 6 + msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_Text_22C608: @ 822C608 diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 5226ddb4a..962c7c298 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -13,9 +13,9 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 waitmovement 0 applymovement 1, MeteorFalls_StevensCave_Movement_27259E waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B1E1, 4 + msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT trainerbattle 3, TRAINER_STEVEN, 0, MeteorFalls_StevensCave_Text_23B32D - msgbox MeteorFalls_StevensCave_Text_23B358, 4 + msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT setflag FLAG_0x4F8 release end @@ -23,7 +23,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD applymovement 1, MeteorFalls_StevensCave_Movement_27259E waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B358, 4 + msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT release end diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 6406edd9b..e60180559 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -4,7 +4,7 @@ MirageTower_4F_MapScripts:: @ 823AD47 MirageTower_4F_EventScript_23AD48:: @ 823AD48 lock faceplayer - msgbox MirageTower_4F_Text_23ADF9, 5 + msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23AD7F giveitem_std ITEM_ROOT_FOSSIL @@ -18,14 +18,14 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 end MirageTower_4F_EventScript_23AD7F:: @ 823AD7F - msgbox MirageTower_4F_Text_23AE79, 4 + msgbox MirageTower_4F_Text_23AE79, MSGBOX_DEFAULT release end MirageTower_4F_EventScript_23AD89:: @ 823AD89 lock faceplayer - msgbox MirageTower_4F_Text_23AE98, 5 + msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23ADC0 giveitem_std ITEM_CLAW_FOSSIL @@ -39,7 +39,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 end MirageTower_4F_EventScript_23ADC0:: @ 823ADC0 - msgbox MirageTower_4F_Text_23AF18, 4 + msgbox MirageTower_4F_Text_23AF18, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 710770472..e031501d4 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -16,12 +16,12 @@ MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 faceplayer checkflag FLAG_0x07B goto_eq MossdeepCity_EventScript_1E4AC7 - msgbox MossdeepCity_Text_1E4E90, 4 + msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 - msgbox MossdeepCity_Text_1E4F15, 4 + msgbox MossdeepCity_Text_1E4F15, MSGBOX_DEFAULT release end @@ -30,45 +30,45 @@ MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 faceplayer checkflag FLAG_0x07B goto_eq MossdeepCity_EventScript_1E4AE6 - msgbox MossdeepCity_Text_1E4F50, 4 + msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6 - msgbox MossdeepCity_Text_1E5051, 4 + msgbox MossdeepCity_Text_1E5051, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0 - msgbox MossdeepCity_Text_1E4E22, 2 + msgbox MossdeepCity_Text_1E4E22, MSGBOX_NPC end MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9 - msgbox MossdeepCity_Text_1E5135, 2 + msgbox MossdeepCity_Text_1E5135, MSGBOX_NPC end MossdeepCity_EventScript_1E4B02:: @ 81E4B02 - msgbox MossdeepCity_Text_1E50D9, 2 + msgbox MossdeepCity_Text_1E50D9, MSGBOX_NPC end MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B - msgbox MossdeepCity_Text_1E529D, 2 + msgbox MossdeepCity_Text_1E529D, MSGBOX_NPC end MossdeepCity_EventScript_1E4B14:: @ 81E4B14 - msgbox MossdeepCity_Text_1E5396, 3 + msgbox MossdeepCity_Text_1E5396, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D - msgbox MossdeepCity_Text_1E53A9, 3 + msgbox MossdeepCity_Text_1E53A9, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B26:: @ 81E4B26 - msgbox MossdeepCity_Text_1E53F2, 3 + msgbox MossdeepCity_Text_1E53F2, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F - msgbox MossdeepCity_Text_1E541F, 3 + msgbox MossdeepCity_Text_1E541F, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B38:: @ 81E4B38 @@ -218,7 +218,7 @@ MossdeepCity_Movement_1E4C00: @ 81E4C00 MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer - msgbox MossdeepCity_Text_1E5213, 4 + msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 waitmovement 0 release @@ -229,10 +229,10 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 faceplayer checkflag FLAG_0x114 goto_eq MossdeepCity_EventScript_1E4C68 - msgbox MossdeepCity_Text_1E4CED, 5 + msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_1E4C72 - msgbox MossdeepCity_Text_1E4D5B, 4 + msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_272054 @@ -241,23 +241,23 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 end MossdeepCity_EventScript_1E4C68:: @ 81E4C68 - msgbox MossdeepCity_Text_1E4DB3, 4 + msgbox MossdeepCity_Text_1E4DB3, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4C72:: @ 81E4C72 - msgbox MossdeepCity_Text_1E4DD7, 4 + msgbox MossdeepCity_Text_1E4DD7, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C - msgbox MossdeepCity_Text_1E5581, 2 + msgbox MossdeepCity_Text_1E5581, MSGBOX_NPC end MossdeepCity_EventScript_1E4C85:: @ 81E4C85 lock faceplayer - msgbox MossdeepCity_Text_1E5453, 4 + msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, MossdeepCity_EventScript_1E4CB0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ff5c14206..e45e9eb66 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -27,7 +27,7 @@ MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54 end MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D - msgbox MossdeepCity_GameCorner_1F_Text_224BFD, 3 + msgbox MossdeepCity_GameCorner_1F_Text_224BFD, MSGBOX_SIGN end MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 17cf90993..ffa8a4247 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -55,7 +55,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898 goto_eq MossdeepCity_Gym_EventScript_22097E checkflag FLAG_0x0AB goto_if 0, MossdeepCity_Gym_EventScript_220937 - msgbox MossdeepCity_Gym_Text_221B1D, 4 + msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT release end @@ -63,7 +63,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 message MossdeepCity_Gym_Text_22196A waitmessage call MossdeepCity_Gym_EventScript_27207E - msgbox MossdeepCity_Gym_Text_221999, 4 + msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT setflag FLAG_0x4F6 setflag FLAG_BADGE07_GET setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS @@ -83,7 +83,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MossdeepCity_Gym_Text_221AEA, 4 + msgbox MossdeepCity_Gym_Text_221AEA, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -95,7 +95,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_272054 - msgbox MossdeepCity_Gym_Text_221A40, 4 + msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB release end @@ -104,13 +104,13 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_27205E - msgbox MossdeepCity_Gym_Text_221A40, 4 + msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB return MossdeepCity_Gym_EventScript_22097E:: @ 822097E trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 - msgbox MossdeepCity_Gym_Text_221E45, 6 + msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220999:: @ 8220999 @@ -212,62 +212,62 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC - msgbox MossdeepCity_Gym_Text_220ED3, 6 + msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A - msgbox MossdeepCity_Gym_Text_220F3A, 6 + msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 - msgbox MossdeepCity_Gym_Text_221055, 6 + msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 - msgbox MossdeepCity_Gym_Text_22116A, 6 + msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 - msgbox MossdeepCity_Gym_Text_22123D, 6 + msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 - msgbox MossdeepCity_Gym_Text_22132E, 6 + msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 - msgbox MossdeepCity_Gym_Text_221412, 6 + msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 - msgbox MossdeepCity_Gym_Text_2214D3, 6 + msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 - msgbox MossdeepCity_Gym_Text_221680, 6 + msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 - msgbox MossdeepCity_Gym_Text_2215E2, 6 + msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D - msgbox MossdeepCity_Gym_Text_22173A, 6 + msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B - msgbox MossdeepCity_Gym_Text_221545, 6 + msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 @@ -275,12 +275,12 @@ MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 faceplayer checkflag FLAG_0x4F6 goto_eq MossdeepCity_Gym_EventScript_220C26 - msgbox MossdeepCity_Gym_Text_220CD5, 4 + msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT release end MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 - msgbox MossdeepCity_Gym_Text_220E2A, 4 + msgbox MossdeepCity_Gym_Text_220E2A, MSGBOX_DEFAULT release end @@ -304,12 +304,12 @@ MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 end MossdeepCity_Gym_EventScript_220C53:: @ 8220C53 - msgbox MossdeepCity_Gym_Text_221CCA, 4 + msgbox MossdeepCity_Gym_Text_221CCA, MSGBOX_DEFAULT releaseall end MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D - msgbox MossdeepCity_Gym_Text_221CB0, 4 + msgbox MossdeepCity_Gym_Text_221CB0, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index b08d296c7..056e2b057 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -5,21 +5,21 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 lock faceplayer bufferleadmonspeciesname 0 - msgbox MossdeepCity_House1_Text_22200F, 4 + msgbox MossdeepCity_House1_Text_22200F, MSGBOX_DEFAULT specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 goto_eq MossdeepCity_House1_EventScript_221FFC - msgbox MossdeepCity_House1_Text_22201D, 4 + msgbox MossdeepCity_House1_Text_22201D, MSGBOX_DEFAULT release end MossdeepCity_House1_EventScript_221FFC:: @ 8221FFC - msgbox MossdeepCity_House1_Text_222068, 4 + msgbox MossdeepCity_House1_Text_222068, MSGBOX_DEFAULT release end MossdeepCity_House1_EventScript_222006:: @ 8222006 - msgbox MossdeepCity_House1_Text_222099, 2 + msgbox MossdeepCity_House1_Text_222099, MSGBOX_NPC end MossdeepCity_House1_Text_22200F: @ 822200F diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 410fa1df7..84dcc8244 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -2,11 +2,11 @@ MossdeepCity_House2_MapScripts:: @ 82220DE .byte 0 MossdeepCity_House2_EventScript_2220DF:: @ 82220DF - msgbox MossdeepCity_House2_Text_222146, 2 + msgbox MossdeepCity_House2_Text_222146, MSGBOX_NPC end MossdeepCity_House2_EventScript_2220E8:: @ 82220E8 - msgbox MossdeepCity_House2_Text_2221A6, 2 + msgbox MossdeepCity_House2_Text_2221A6, MSGBOX_NPC end MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 @@ -14,7 +14,7 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox MossdeepCity_House2_Text_22222E, 4 + msgbox MossdeepCity_House2_Text_22222E, MSGBOX_DEFAULT waitmoncry closemessage setflag FLAG_0x0E0 diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index dfdbfa956..be294f292 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -6,23 +6,23 @@ MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 faceplayer checkflag FLAG_0x098 goto_eq MossdeepCity_House3_EventScript_222602 - msgbox MossdeepCity_House3_Text_222616, 5 + msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_House3_EventScript_22260C - msgbox MossdeepCity_House3_Text_2226B6, 4 + msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT giveitem_std ITEM_SUPER_ROD setflag FLAG_0x098 - msgbox MossdeepCity_House3_Text_2226F0, 4 + msgbox MossdeepCity_House3_Text_2226F0, MSGBOX_DEFAULT release end MossdeepCity_House3_EventScript_222602:: @ 8222602 - msgbox MossdeepCity_House3_Text_222751, 4 + msgbox MossdeepCity_House3_Text_222751, MSGBOX_DEFAULT release end MossdeepCity_House3_EventScript_22260C:: @ 822260C - msgbox MossdeepCity_House3_Text_222733, 4 + msgbox MossdeepCity_House3_Text_222733, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index cb3cc0d16..66d76aa41 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -6,12 +6,12 @@ MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_House4_EventScript_222DED - msgbox MossdeepCity_House4_Text_222E31, 4 + msgbox MossdeepCity_House4_Text_222E31, MSGBOX_DEFAULT release end MossdeepCity_House4_EventScript_222DED:: @ 8222DED - msgbox MossdeepCity_House4_Text_222E73, 4 + msgbox MossdeepCity_House4_Text_222E73, MSGBOX_DEFAULT release end @@ -22,12 +22,12 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 compare VAR_RESULT, 0 goto_eq MossdeepCity_House4_EventScript_222E14 special GetSecretBaseNearbyMapName - msgbox MossdeepCity_House4_Text_222ECC, 4 + msgbox MossdeepCity_House4_Text_222ECC, MSGBOX_DEFAULT release end MossdeepCity_House4_EventScript_222E14:: @ 8222E14 - msgbox MossdeepCity_House4_Text_222EF7, 4 + msgbox MossdeepCity_House4_Text_222EF7, MSGBOX_DEFAULT release end @@ -36,7 +36,7 @@ MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox MossdeepCity_House4_Text_222F31, 4 + msgbox MossdeepCity_House4_Text_222F31, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index ed7ecd035..b995b396e 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8 message gUnknown_08272A21 waitmessage pokemart MossdeepCity_Mart_Pokemart_2223E0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -27,15 +27,15 @@ MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0 end MossdeepCity_Mart_EventScript_2223F6:: @ 82223F6 - msgbox MossdeepCity_Mart_Text_222411, 2 + msgbox MossdeepCity_Mart_Text_222411, MSGBOX_NPC end MossdeepCity_Mart_EventScript_2223FF:: @ 82223FF - msgbox MossdeepCity_Mart_Text_2224A0, 2 + msgbox MossdeepCity_Mart_Text_2224A0, MSGBOX_NPC end MossdeepCity_Mart_EventScript_222408:: @ 8222408 - msgbox MossdeepCity_Mart_Text_2224FA, 2 + msgbox MossdeepCity_Mart_Text_2224FA, MSGBOX_NPC end MossdeepCity_Mart_Text_222411: @ 8222411 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 2ff03b7f3..28573a3c1 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -16,11 +16,11 @@ MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E end MossdeepCity_PokemonCenter_1F_EventScript_22225C:: @ 822225C - msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, 2 + msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, MSGBOX_NPC end MossdeepCity_PokemonCenter_1F_EventScript_222265:: @ 8222265 - msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, 2 + msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, MSGBOX_NPC end MossdeepCity_PokemonCenter_1F_Text_22226E: @ 822226E diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index 142bce560..e8fbb6e02 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -18,7 +18,7 @@ MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355 end MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B - msgbox MossdeepCity_PokemonCenter_2F_Text_222364, 2 + msgbox MossdeepCity_PokemonCenter_2F_Text_222364, MSGBOX_NPC end MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 2edf6d251..9dbf2117f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -66,11 +66,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 end MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012 - msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B - msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 @@ -88,11 +88,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 end MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051 - msgbox MossdeepCity_SpaceCenter_1F_Text_223305, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223305, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A - msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 @@ -100,12 +100,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 faceplayer compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release @@ -118,36 +118,36 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA checkflag FLAG_0x0C0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA checkflag FLAG_0x0C0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release @@ -166,12 +166,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D end MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154 - msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E - msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, MSGBOX_DEFAULT release end @@ -188,7 +188,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 end MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F - msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 @@ -196,7 +196,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F end MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 - msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 @@ -206,7 +206,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 lock faceplayer - msgbox MossdeepCity_SpaceCenter_1F_Text_223849, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 release @@ -214,23 +214,23 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF lockall - msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, MSGBOX_DEFAULT releaseall end MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 - msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, 6 + msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 - msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, 6 + msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA - msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, 6 + msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F @@ -238,7 +238,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F faceplayer checkflag FLAG_0x0BF goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2 setflag FLAG_0x0BF moveobjectoffscreen 9 @@ -252,7 +252,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F end MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 424ee4bf3..6bb71708d 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -36,10 +36,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5 + msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, MSGBOX_DEFAULT closemessage applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 waitmovement 0 @@ -53,19 +53,19 @@ MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 step_end MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4 waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1 applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 waitmovement 0 @@ -107,12 +107,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D end MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE - msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, MSGBOX_DEFAULT release end @@ -129,12 +129,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 end MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF - msgbox MossdeepCity_SpaceCenter_2F_Text_224253, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224253, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 - msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, MSGBOX_DEFAULT release end @@ -151,31 +151,31 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 end MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A - msgbox MossdeepCity_SpaceCenter_2F_Text_224342, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224342, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34 - msgbox MossdeepCity_SpaceCenter_2F_Text_224376, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224376, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E - msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47 - msgbox MossdeepCity_SpaceCenter_2F_Text_224570, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_224570, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50 - msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer - msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 waitmovement 0 release @@ -183,7 +183,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F lockall - msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, MSGBOX_DEFAULT releaseall end @@ -192,8 +192,8 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A checkflag FLAG_0x0CD goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA setflag FLAG_0x0CD - msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, 4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT closemessage delay 30 playse SE_KOUKA_L @@ -237,10 +237,10 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5 + msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C - msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA waitmovement 0 @@ -278,7 +278,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 waitstate MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 - msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 @@ -289,7 +289,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 delay 20 - msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT closemessage setvar VAR_0x405D, 3 fadedefaultbgm @@ -311,7 +311,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 turnobject 1, 2 call MossdeepCity_SpaceCenter_2F_EventScript_224131 fadescreen 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT closemessage fadescreen 1 setflag FLAG_0x075 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index ca24cebb7..2c8aef889 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -38,11 +38,11 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_222833 waitmovement 0 - msgbox MossdeepCity_StevensHouse_Text_222936, 4 + msgbox MossdeepCity_StevensHouse_Text_222936, MSGBOX_DEFAULT giveitem_std ITEM_HM08 setflag FLAG_0x07B setflag FLAG_0x12E - msgbox MossdeepCity_StevensHouse_Text_222A0E, 4 + msgbox MossdeepCity_StevensHouse_Text_222A0E, MSGBOX_DEFAULT closemessage delay 20 applymovement 1, MossdeepCity_StevensHouse_Movement_22283B @@ -73,14 +73,14 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 lockall - msgbox MossdeepCity_StevensHouse_Text_222B9E, 5 + msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_22285B goto MossdeepCity_StevensHouse_EventScript_222865 end MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B - msgbox MossdeepCity_StevensHouse_Text_222C2A, 4 + msgbox MossdeepCity_StevensHouse_Text_222C2A, MSGBOX_DEFAULT releaseall end @@ -96,7 +96,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 call MossdeepCity_StevensHouse_EventScript_2228EB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B @@ -106,7 +106,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD call MossdeepCity_StevensHouse_EventScript_2228EB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 call MossdeepCity_StevensHouse_EventScript_273797 @@ -135,16 +135,16 @@ MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901 end MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909 - msgbox MossdeepCity_StevensHouse_Text_222D97, 3 + msgbox MossdeepCity_StevensHouse_Text_222D97, MSGBOX_SIGN end MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912 - msgbox MossdeepCity_StevensHouse_Text_222B11, 2 + msgbox MossdeepCity_StevensHouse_Text_222B11, MSGBOX_NPC end MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B lockall - msgbox MossdeepCity_StevensHouse_Text_222C4E, 4 + msgbox MossdeepCity_StevensHouse_Text_222C4E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index c727c735b..f5f7eb482 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -26,17 +26,17 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 end MtChimney_EventScript_22EDF9:: @ 822EDF9 - msgbox MtChimney_Text_22FAD2, 4 + msgbox MtChimney_Text_22FAD2, MSGBOX_DEFAULT return MtChimney_EventScript_22EE02:: @ 822EE02 - msgbox MtChimney_Text_22FBC7, 4 + msgbox MtChimney_Text_22FBC7, MSGBOX_DEFAULT return MtChimney_EventScript_22EE0B:: @ 822EE0B lockall playbgm MUS_MGM0, 0 - msgbox MtChimney_Text_22F26A, 4 + msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT applymovement 2, MtChimney_Movement_27259E waitmovement 0 playse SE_PIN @@ -44,9 +44,9 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B waitmovement 0 applymovement 2, MtChimney_Movement_27259A waitmovement 0 - msgbox MtChimney_Text_22F32E, 4 + msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF - msgbox MtChimney_Text_22F5F7, 4 + msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT closemessage delay 30 fadescreen 1 @@ -64,7 +64,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if 1, MtChimney_EventScript_22EED2 applymovement 255, MtChimney_Movement_2725A4 waitmovement 0 - msgbox MtChimney_Text_22FC3D, 4 + msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEDD @@ -103,13 +103,13 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 lock faceplayer showmoneybox 0, 0, 0 - msgbox MtChimney_Text_22FE04, 5 + msgbox MtChimney_Text_22FE04, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF69 checkmoney 0xc8, 0 compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF76 - msgbox MtChimney_Text_22FE4D, 4 + msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, 1 call_if 1, MtChimney_EventScript_22EF5E @@ -123,7 +123,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 end MtChimney_EventScript_22EF51:: @ 822EF51 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT hidemoneybox nop nop @@ -137,7 +137,7 @@ MtChimney_EventScript_22EF5E:: @ 822EF5E return MtChimney_EventScript_22EF69:: @ 822EF69 - msgbox MtChimney_Text_22FE9B, 4 + msgbox MtChimney_Text_22FE9B, MSGBOX_DEFAULT hidemoneybox nop nop @@ -145,7 +145,7 @@ MtChimney_EventScript_22EF69:: @ 822EF69 end MtChimney_EventScript_22EF76:: @ 822EF76 - msgbox MtChimney_Text_22FE5E, 4 + msgbox MtChimney_Text_22FE5E, MSGBOX_DEFAULT hidemoneybox nop nop @@ -399,57 +399,57 @@ MtChimney_Movement_22F04F: @ 822F04F step_end MtChimney_EventScript_22F053:: @ 822F053 - msgbox MtChimney_Text_22FD1F, 3 + msgbox MtChimney_Text_22FD1F, MSGBOX_SIGN end MtChimney_EventScript_22F05C:: @ 822F05C - msgbox MtChimney_Text_22FD5B, 3 + msgbox MtChimney_Text_22FD5B, MSGBOX_SIGN end MtChimney_EventScript_22F065:: @ 822F065 - msgbox MtChimney_Text_22FDA1, 3 + msgbox MtChimney_Text_22FDA1, MSGBOX_SIGN end MtChimney_EventScript_22F06E:: @ 822F06E trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C - msgbox MtChimney_Text_22F76D, 6 + msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F085:: @ 822F085 trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A - msgbox MtChimney_Text_22F859, 6 + msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F09C:: @ 822F09C - msgbox MtChimney_Text_22F978, 3 + msgbox MtChimney_Text_22F978, MSGBOX_SIGN end MtChimney_EventScript_22F0A5:: @ 822F0A5 - msgbox MtChimney_Text_22F9B2, 3 + msgbox MtChimney_Text_22F9B2, MSGBOX_SIGN end MtChimney_EventScript_22F0AE:: @ 822F0AE - msgbox MtChimney_Text_22F9D1, 3 + msgbox MtChimney_Text_22F9D1, MSGBOX_SIGN end MtChimney_EventScript_22F0B7:: @ 822F0B7 - msgbox MtChimney_Text_22FA2F, 3 + msgbox MtChimney_Text_22FA2F, MSGBOX_SIGN end MtChimney_EventScript_22F0C0:: @ 822F0C0 - msgbox MtChimney_Text_22FA8B, 3 + msgbox MtChimney_Text_22FA8B, MSGBOX_SIGN end MtChimney_EventScript_22F0C9:: @ 822F0C9 - msgbox MtChimney_Text_22FAA5, 3 + msgbox MtChimney_Text_22FAA5, MSGBOX_SIGN end MtChimney_EventScript_22F0D2:: @ 822F0D2 - msgbox MtChimney_Text_22FACB, 3 + msgbox MtChimney_Text_22FACB, MSGBOX_SIGN end MtChimney_EventScript_22F0DB:: @ 822F0DB - msgbox MtChimney_Text_22FDFC, 3 + msgbox MtChimney_Text_22FDFC, MSGBOX_SIGN end MtChimney_EventScript_22F0E4:: @ 822F0E4 @@ -458,32 +458,32 @@ MtChimney_EventScript_22F0E4:: @ 822F0E4 goto_if 0, MtChimney_EventScript_22F137 checkflag FLAG_0x073 goto_eq MtChimney_EventScript_22F12D - msgbox MtChimney_Text_22FF12, 5 + msgbox MtChimney_Text_22FF12, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22F123 - msgbox MtChimney_Text_22FF66, 4 + msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT giveitem_std ITEM_METEORITE setflag FLAG_0x073 releaseall end MtChimney_EventScript_22F123:: @ 822F123 - msgbox MtChimney_Text_22FF9C, 4 + msgbox MtChimney_Text_22FF9C, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F12D:: @ 822F12D - msgbox MtChimney_Text_22FFC0, 4 + msgbox MtChimney_Text_22FFC0, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F137:: @ 822F137 - msgbox MtChimney_Text_22FEAA, 4 + msgbox MtChimney_Text_22FEAA, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F141:: @ 822F141 - msgbox MtChimney_Text_22FFFA, 3 + msgbox MtChimney_Text_22FFFA, MSGBOX_SIGN end MtChimney_EventScript_22F14A:: @ 822F14A @@ -491,44 +491,44 @@ MtChimney_EventScript_22F14A:: @ 822F14A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 - msgbox MtChimney_Text_2300A2, 4 + msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT release end MtChimney_EventScript_22F176:: @ 822F176 special sub_80B4808 waitmovement 0 - msgbox MtChimney_Text_2300E3, 4 + msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT setvar VAR_0x8004, 313 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 313 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end MtChimney_EventScript_22F195:: @ 822F195 trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB - msgbox MtChimney_Text_2301E7, 6 + msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1AC:: @ 822F1AC trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D - msgbox MtChimney_Text_230292, 6 + msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1C3:: @ 822F1C3 trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304 - msgbox MtChimney_Text_23033A, 6 + msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1DA:: @ 822F1DA trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436 - msgbox MtChimney_Text_230463, 6 + msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1F1:: @ 822F1F1 trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921 - msgbox MtChimney_Text_22F93A, 6 + msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F208:: @ 822F208 @@ -536,24 +536,24 @@ MtChimney_EventScript_22F208:: @ 822F208 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 - msgbox MtChimney_Text_230519, 4 + msgbox MtChimney_Text_230519, MSGBOX_DEFAULT release end MtChimney_EventScript_22F234:: @ 822F234 special sub_80B4808 waitmovement 0 - msgbox MtChimney_Text_230557, 4 + msgbox MtChimney_Text_230557, MSGBOX_DEFAULT setvar VAR_0x8004, 1 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 1 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end MtChimney_EventScript_22F253:: @ 822F253 trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3 - msgbox MtChimney_Text_230614, 6 + msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE end MtChimney_Text_22F26A: @ 822F26A diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index b6c2118db..2544e6729 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -31,7 +31,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B lock faceplayer - msgbox MtChimney_CableCarStation_Text_22ACB9, 5 + msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MtChimney_CableCarStation_EventScript_22AC6C compare VAR_RESULT, 0 @@ -39,7 +39,7 @@ MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B end MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C - msgbox MtChimney_CableCarStation_Text_22ACF8, 4 + msgbox MtChimney_CableCarStation_Text_22ACF8, MSGBOX_DEFAULT closemessage applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 applymovement 255, MtChimney_CableCarStation_Movement_22ACAF @@ -54,7 +54,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C end MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B - msgbox MtChimney_CableCarStation_Text_22AD0E, 4 + msgbox MtChimney_CableCarStation_Text_22AD0E, MSGBOX_DEFAULT release end diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 51c8a88fb..755536d8d 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -6,7 +6,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F faceplayer checkflag FLAG_0x11A goto_eq MtPyre_1F_EventScript_230F6E - msgbox MtPyre_1F_Text_230F8A, 4 + msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 goto_eq MtPyre_1F_EventScript_272054 @@ -15,16 +15,16 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F end MtPyre_1F_EventScript_230F6E:: @ 8230F6E - msgbox MtPyre_1F_Text_231005, 4 + msgbox MtPyre_1F_Text_231005, MSGBOX_DEFAULT release end MtPyre_1F_EventScript_230F78:: @ 8230F78 - msgbox MtPyre_1F_Text_23104F, 2 + msgbox MtPyre_1F_Text_23104F, MSGBOX_NPC end MtPyre_1F_EventScript_230F81:: @ 8230F81 - msgbox MtPyre_1F_Text_2310BA, 2 + msgbox MtPyre_1F_Text_2310BA, MSGBOX_NPC end MtPyre_1F_Text_230F8A: @ 8230F8A diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index de8520954..752c17fcc 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -10,36 +10,36 @@ MtPyre_2F_MapScript1_23110B: @ 823110B end MtPyre_2F_EventScript_231116:: @ 8231116 - msgbox MtPyre_2F_Text_2311A3, 2 + msgbox MtPyre_2F_Text_2311A3, MSGBOX_NPC end MtPyre_2F_EventScript_23111F:: @ 823111F - msgbox MtPyre_2F_Text_2311E6, 2 + msgbox MtPyre_2F_Text_2311E6, MSGBOX_NPC end MtPyre_2F_EventScript_231128:: @ 8231128 trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 - msgbox MtPyre_2F_Text_2312CB, 6 + msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23113F:: @ 823113F trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 - msgbox MtPyre_2F_Text_2313B1, 6 + msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23115A:: @ 823115A trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 - msgbox MtPyre_2F_Text_23154D, 6 + msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_231175:: @ 8231175 trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 - msgbox MtPyre_2F_Text_23165A, 6 + msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23118C:: @ 823118C trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 - msgbox MtPyre_2F_Text_2316FB, 6 + msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE end MtPyre_2F_Text_2311A3: @ 82311A3 diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ec5373509..01a31a6ae 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -3,12 +3,12 @@ MtPyre_3F_MapScripts:: @ 8231752 MtPyre_3F_EventScript_231753:: @ 8231753 trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 - msgbox MtPyre_3F_Text_231869, 6 + msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_23176A:: @ 823176A trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD - msgbox MtPyre_3F_Text_2318F2, 6 + msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_231781:: @ 8231781 @@ -16,24 +16,24 @@ MtPyre_3F_EventScript_231781:: @ 8231781 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC - msgbox MtPyre_3F_Text_23199B, 4 + msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT release end MtPyre_3F_EventScript_2317AD:: @ 82317AD special sub_80B4808 waitmovement 0 - msgbox MtPyre_3F_Text_231A49, 4 + msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT setvar VAR_0x8004, 9 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 9 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end MtPyre_3F_EventScript_2317CC:: @ 82317CC trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 - msgbox MtPyre_3F_Text_231B0D, 6 + msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE end MtPyre_3F_Text_2317E3: @ 82317E3 diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index 0573e0f11..2e6e3fc55 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -3,7 +3,7 @@ MtPyre_4F_MapScripts:: @ 8231BC8 MtPyre_5F_EventScript_231BC9:: @ 8231BC9 trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 - msgbox MtPyre_5F_Text_231C24, 6 + msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE end MtPyre_5F_Text_231BE0: @ 8231BE0 diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 4678ac7e0..732658663 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -3,7 +3,7 @@ MtPyre_5F_MapScripts:: @ 8231C6D MtPyre_4F_EventScript_231C6E:: @ 8231C6E trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB - msgbox MtPyre_4F_Text_231CEE, 6 + msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE end MtPyre_4F_Text_231C85: @ 8231C85 diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 8d5d912c2..943e0f31f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -6,29 +6,29 @@ MtPyre_6F_EventScript_231D3B:: @ 8231D3B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 - msgbox MtPyre_6F_Text_231DFC, 4 + msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT release end MtPyre_6F_EventScript_231D67:: @ 8231D67 special sub_80B4808 waitmovement 0 - msgbox MtPyre_6F_Text_231E43, 4 + msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT setvar VAR_0x8004, 108 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 108 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end MtPyre_6F_EventScript_231D86:: @ 8231D86 trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB - msgbox MtPyre_6F_Text_231EE1, 6 + msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE end MtPyre_6F_EventScript_231D9D:: @ 8231D9D trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A - msgbox MtPyre_6F_Text_231F5C, 6 + msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE end MtPyre_6F_Text_231DB4: @ 8231DB4 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 352d92d83..d0c9fcc6a 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -43,7 +43,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if 1, MtPyre_Summit_EventScript_2320EB compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_2320EC - msgbox MtPyre_Summit_Text_23281A, 4 + msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT closemessage fadescreen 1 removeobject 2 @@ -63,7 +63,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if 1, MtPyre_Summit_EventScript_23210C compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232117 - msgbox MtPyre_Summit_Text_23290E, 4 + msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_0x0D4 setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD @@ -133,7 +133,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C faceplayer checkflag FLAG_0x09E goto_eq MtPyre_Summit_EventScript_232167 - msgbox MtPyre_Summit_Text_232E0C, 5 + msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232187 compare VAR_RESULT, 0 @@ -142,7 +142,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C end MtPyre_Summit_EventScript_232167:: @ 8232167 - msgbox MtPyre_Summit_Text_2331A6, 5 + msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232199 compare VAR_RESULT, 0 @@ -151,15 +151,15 @@ MtPyre_Summit_EventScript_232167:: @ 8232167 end MtPyre_Summit_EventScript_232187:: @ 8232187 - msgbox MtPyre_Summit_Text_232F27, 4 + msgbox MtPyre_Summit_Text_232F27, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_232190:: @ 8232190 - msgbox MtPyre_Summit_Text_233162, 4 + msgbox MtPyre_Summit_Text_233162, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_232199:: @ 8232199 - msgbox MtPyre_Summit_Text_23325D, 4 + msgbox MtPyre_Summit_Text_23325D, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_2321A2:: @ 82321A2 @@ -171,23 +171,23 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 call_if 4, MtPyre_Summit_EventScript_2321CB checkflag FLAG_0x081 goto_eq MtPyre_Summit_EventScript_2321D8 - msgbox MtPyre_Summit_Text_232AD8, 4 + msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321CB:: @ 82321CB - msgbox MtPyre_Summit_Text_232CA6, 4 + msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT setflag FLAG_0x103 release end MtPyre_Summit_EventScript_2321D8:: @ 82321D8 - msgbox MtPyre_Summit_Text_232B4F, 4 + msgbox MtPyre_Summit_Text_232B4F, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321E2:: @ 82321E2 - msgbox MtPyre_Summit_Text_232D1E, 4 + msgbox MtPyre_Summit_Text_232D1E, MSGBOX_DEFAULT release end @@ -231,7 +231,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 call_if 1, MtPyre_Summit_EventScript_232328 compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232341 - msgbox MtPyre_Summit_Text_233183, 4 + msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_23235A @@ -426,22 +426,22 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8 MtPyre_Summit_EventScript_2323FD:: @ 82323FD trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 - msgbox MtPyre_Summit_Text_2324E0, 6 + msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232414:: @ 8232414 trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 - msgbox MtPyre_Summit_Text_2325E4, 6 + msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_23242B:: @ 823242B trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 - msgbox MtPyre_Summit_Text_2326B3, 6 + msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232442:: @ 8232442 trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A - msgbox MtPyre_Summit_Text_2327D8, 6 + msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE end MtPyre_Summit_Text_232459: @ 8232459 diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 7f5a9e4c7..910dc8eed 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -4,10 +4,10 @@ NavelRock_Harbor_MapScripts:: @ 82690BC NavelRock_Harbor_EventScript_2690BD:: @ 82690BD lock faceplayer - msgbox NavelRock_Harbor_Text_2C6CE6, 5 + msgbox NavelRock_Harbor_Text_2C6CE6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq NavelRock_Harbor_EventScript_269102 - msgbox NavelRock_Harbor_Text_2A6A5D, 4 + msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA waitmovement 0 @@ -21,7 +21,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD end NavelRock_Harbor_EventScript_269102:: @ 8269102 - msgbox NavelRock_Harbor_Text_2A6A82, 4 + msgbox NavelRock_Harbor_Text_2A6A82, MSGBOX_DEFAULT release end diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 727b77985..714a20b6b 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -25,14 +25,14 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall applymovement 255, NewMauville_Entrance_Movement_2725A6 waitmovement 0 - msgbox NewMauville_Entrance_Text_237382, 4 + msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_237396, 5 + msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_2373AC, 4 + msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT setmetatile 3, 0, 707, 0 setmetatile 4, 0, 708, 0 setmetatile 5, 0, 709, 0 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 1ced90ca9..b0f0a18c7 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_2375D7:: @ 82375D7 NewMauville_Inside_EventScript_237725:: @ 8237725 lockall - msgbox NewMauville_Inside_Text_237932, 4 + msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT call NewMauville_Inside_EventScript_23773A setvar VAR_0x40BA, 2 releaseall @@ -173,12 +173,12 @@ NewMauville_Inside_EventScript_23778F:: @ 823778F lockall compare VAR_0x40BA, 2 goto_eq NewMauville_Inside_EventScript_2377A5 - msgbox NewMauville_Inside_Text_237896, 4 + msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT releaseall end NewMauville_Inside_EventScript_2377A5:: @ 82377A5 - msgbox NewMauville_Inside_Text_237916, 4 + msgbox NewMauville_Inside_Text_237916, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 174d108eb..faf2821f5 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -28,11 +28,11 @@ OldaleTown_EventScript_1E8EDE:: @ 81E8EDE return OldaleTown_EventScript_1E8EEA:: @ 81E8EEA - msgbox OldaleTown_Text_1E94DA, 3 + msgbox OldaleTown_Text_1E94DA, MSGBOX_SIGN end OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 - msgbox OldaleTown_Text_1E918E, 2 + msgbox OldaleTown_Text_1E918E, MSGBOX_NPC end OldaleTown_EventScript_1E8EFC:: @ 81E8EFC @@ -44,7 +44,7 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC goto_eq OldaleTown_EventScript_1E8FB9 setflag FLAG_TEMP_1 playbgm MUS_TSURETEK, 0 - msgbox OldaleTown_Text_1E91C0, 4 + msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT closemessage switch VAR_FACING case 1, OldaleTown_EventScript_1E8F47 @@ -74,23 +74,23 @@ OldaleTown_EventScript_1E8F75:: @ 81E8F75 end OldaleTown_EventScript_1E8F8C:: @ 81E8F8C - msgbox OldaleTown_Text_1E91FD, 4 + msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT giveitem_std ITEM_POTION compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E8FC3 - msgbox OldaleTown_Text_1E92AF, 4 + msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT setflag FLAG_0x084 fadedefaultbgm release end OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 - msgbox OldaleTown_Text_1E92AF, 4 + msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT release end OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT fadedefaultbgm release end @@ -197,7 +197,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F faceplayer checkflag FLAG_0x074 goto_eq OldaleTown_EventScript_1E9066 - msgbox OldaleTown_Text_1E939A, 4 + msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_2725A2 waitmovement 0 @@ -209,7 +209,7 @@ OldaleTown_EventScript_1E903F:: @ 81E903F applymovement 255, OldaleTown_Movement_1E9182 applymovement 3, OldaleTown_Movement_1E9185 waitmovement 0 - msgbox OldaleTown_Text_1E9313, 4 + msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_1E918B waitmovement 0 @@ -217,7 +217,7 @@ OldaleTown_EventScript_1E903F:: @ 81E903F end OldaleTown_EventScript_1E9066:: @ 81E9066 - msgbox OldaleTown_Text_1E93F8, 4 + msgbox OldaleTown_Text_1E93F8, MSGBOX_DEFAULT release end @@ -268,12 +268,12 @@ OldaleTown_EventScript_1E90E6:: @ 81E90E6 end OldaleTown_EventScript_1E90FE:: @ 81E90FE - msgbox OldaleTown_Text_1E9462, 4 + msgbox OldaleTown_Text_1E9462, MSGBOX_DEFAULT goto OldaleTown_EventScript_1E911A end OldaleTown_EventScript_1E910C:: @ 81E910C - msgbox OldaleTown_Text_1E948A, 4 + msgbox OldaleTown_Text_1E948A, MSGBOX_DEFAULT goto OldaleTown_EventScript_1E911A end diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc index 6a36ff57e..71010116e 100644 --- a/data/maps/OldaleTown_House1/scripts.inc +++ b/data/maps/OldaleTown_House1/scripts.inc @@ -2,7 +2,7 @@ OldaleTown_House1_MapScripts:: @ 81FBE85 .byte 0 OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86 - msgbox OldaleTown_House1_Text_1FBE8F, 2 + msgbox OldaleTown_House1_Text_1FBE8F, MSGBOX_NPC end OldaleTown_House1_Text_1FBE8F: @ 81FBE8F diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc index 55941705c..3f2adc9fa 100644 --- a/data/maps/OldaleTown_House2/scripts.inc +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -2,11 +2,11 @@ OldaleTown_House2_MapScripts:: @ 81FBF5A .byte 0 OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B - msgbox OldaleTown_House2_Text_1FBF6D, 2 + msgbox OldaleTown_House2_Text_1FBF6D, MSGBOX_NPC end OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64 - msgbox OldaleTown_House2_Text_1FBFB0, 2 + msgbox OldaleTown_House2_Text_1FBFB0, MSGBOX_NPC end OldaleTown_House2_Text_1FBF6D: @ 81FBF6D diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index de8893712..f73e2d9ff 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -9,7 +9,7 @@ OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 checkflag FLAG_0x074 goto_eq OldaleTown_Mart_EventScript_1FC26C pokemart OldaleTown_Mart_Pokemart_1FC260 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -24,7 +24,7 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C pokemart OldaleTown_Mart_Pokemart_1FC27C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -44,17 +44,17 @@ OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A faceplayer checkflag FLAG_0x074 goto_eq OldaleTown_Mart_EventScript_1FC29F - msgbox OldaleTown_Mart_Text_1FC2B2, 4 + msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT release end OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F - msgbox OldaleTown_Mart_Text_1FC2F3, 4 + msgbox OldaleTown_Mart_Text_1FC2F3, MSGBOX_DEFAULT release end OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9 - msgbox OldaleTown_Mart_Text_1FC338, 2 + msgbox OldaleTown_Mart_Text_1FC338, MSGBOX_NPC end OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index e99e628a6..28d309662 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A end OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, 2 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, MSGBOX_NPC end OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, 2 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, MSGBOX_NPC end OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A @@ -29,12 +29,12 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A faceplayer checkflag FLAG_SYS_POKEDEX_GET goto_eq OldaleTown_PokemonCenter_1F_EventScript_1FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, 4 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, 4 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 1f4f0e872..ef64a7e2e 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -12,19 +12,19 @@ PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 end PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 - msgbox PacifidlogTown_Text_1EBB6C, 2 + msgbox PacifidlogTown_Text_1EBB6C, MSGBOX_NPC end PacifidlogTown_EventScript_1EBACC:: @ 81EBACC - msgbox PacifidlogTown_Text_1EBAE7, 2 + msgbox PacifidlogTown_Text_1EBAE7, MSGBOX_NPC end PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5 - msgbox PacifidlogTown_Text_1EBBAC, 2 + msgbox PacifidlogTown_Text_1EBBAC, MSGBOX_NPC end PacifidlogTown_EventScript_1EBADE:: @ 81EBADE - msgbox PacifidlogTown_Text_1EBC7A, 3 + msgbox PacifidlogTown_Text_1EBC7A, MSGBOX_SIGN end PacifidlogTown_Text_1EBAE7: @ 81EBAE7 diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc index b4fe4c979..159575eec 100644 --- a/data/maps/PacifidlogTown_House1/scripts.inc +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -2,11 +2,11 @@ PacifidlogTown_House1_MapScripts:: @ 820365C .byte 0 PacifidlogTown_House1_EventScript_20365D:: @ 820365D - msgbox PacifidlogTown_House1_Text_20366F, 2 + msgbox PacifidlogTown_House1_Text_20366F, MSGBOX_NPC end PacifidlogTown_House1_EventScript_203666:: @ 8203666 - msgbox PacifidlogTown_House1_Text_20373A, 2 + msgbox PacifidlogTown_House1_Text_20373A, MSGBOX_NPC end PacifidlogTown_House1_Text_20366F: @ 820366F diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 21345242d..d603cbd2d 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -31,12 +31,12 @@ PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE return PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 - msgbox PacifidlogTown_House2_Text_20395B, 4 + msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT return PacifidlogTown_House2_EventScript_203801:: @ 8203801 - msgbox PacifidlogTown_House2_Text_2038C7, 4 - msgbox PacifidlogTown_House2_Text_20395B, 4 + msgbox PacifidlogTown_House2_Text_2038C7, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT return PacifidlogTown_House2_EventScript_203812:: @ 8203812 @@ -44,36 +44,36 @@ PacifidlogTown_House2_EventScript_203812:: @ 8203812 return PacifidlogTown_House2_EventScript_203816:: @ 8203816 - msgbox PacifidlogTown_House2_Text_20396D, 4 + msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, 4 + msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_203845:: @ 8203845 - msgbox PacifidlogTown_House2_Text_2039CE, 4 + msgbox PacifidlogTown_House2_Text_2039CE, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_20384F:: @ 820384F - msgbox PacifidlogTown_House2_Text_203A2F, 4 + msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, 4 + msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_20387E:: @ 820387E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, VAR_RESULT - msgbox PacifidlogTown_House2_Text_203AF4, 4 + msgbox PacifidlogTown_House2_Text_203AF4, MSGBOX_DEFAULT release end @@ -82,9 +82,9 @@ PacifidlogTown_House2_EventScript_203891:: @ 8203891 faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox PacifidlogTown_House2_Text_203B8D, 4 + msgbox PacifidlogTown_House2_Text_203B8D, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203B9D, 4 + msgbox PacifidlogTown_House2_Text_203B9D, MSGBOX_DEFAULT release end @@ -93,9 +93,9 @@ PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC faceplayer waitse playmoncry SPECIES_AZURILL, 2 - msgbox PacifidlogTown_House2_Text_203BCE, 4 + msgbox PacifidlogTown_House2_Text_203BCE, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203BDF, 4 + msgbox PacifidlogTown_House2_Text_203BDF, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 98977b766..3fb023148 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -10,7 +10,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox PacifidlogTown_House3_Text_203CBE, 5 + msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq PacifidlogTown_House3_EventScript_203C93 special sub_81B94B0 @@ -29,29 +29,29 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 special sub_807F0E4 waitstate bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203D87, 4 + msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT setflag FLAG_0x09A release end PacifidlogTown_House3_EventScript_203C93:: @ 8203C93 - msgbox PacifidlogTown_House3_Text_203E12, 4 + msgbox PacifidlogTown_House3_Text_203E12, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203DDE, 4 + msgbox PacifidlogTown_House3_Text_203DDE, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB - msgbox PacifidlogTown_House3_Text_203E7F, 4 + msgbox PacifidlogTown_House3_Text_203E7F, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 - msgbox PacifidlogTown_House3_Text_203EF1, 2 + msgbox PacifidlogTown_House3_Text_203EF1, MSGBOX_NPC end PacifidlogTown_House3_Text_203CBE: @ 8203CBE diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index a3e9cf0a4..d6fb43334 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -2,17 +2,17 @@ PacifidlogTown_House4_MapScripts:: @ 8203F4B .byte 0 PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C - msgbox PacifidlogTown_House4_Text_204017, 2 + msgbox PacifidlogTown_House4_Text_204017, MSGBOX_NPC end PacifidlogTown_House4_EventScript_203F55:: @ 8203F55 - msgbox PacifidlogTown_House4_Text_203F93, 2 + msgbox PacifidlogTown_House4_Text_203F93, MSGBOX_NPC end PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E lock faceplayer - msgbox PacifidlogTown_House4_Text_204035, 5 + msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PacifidlogTown_House4_EventScript_203F7F compare VAR_RESULT, 0 @@ -20,12 +20,12 @@ PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E end PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F - msgbox PacifidlogTown_House4_Text_20404E, 4 + msgbox PacifidlogTown_House4_Text_20404E, MSGBOX_DEFAULT release end PacifidlogTown_House4_EventScript_203F89:: @ 8203F89 - msgbox PacifidlogTown_House4_Text_204084, 4 + msgbox PacifidlogTown_House4_Text_204084, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index ec97a639e..0e9af702f 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -7,17 +7,17 @@ PacifidlogTown_House5_EventScript_204111:: @ 8204111 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D - msgbox PacifidlogTown_House5_Text_204140, 4 + msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT release end PacifidlogTown_House5_EventScript_20412D:: @ 820412D - msgbox PacifidlogTown_House5_Text_204161, 4 + msgbox PacifidlogTown_House5_Text_204161, MSGBOX_DEFAULT release end PacifidlogTown_House5_EventScript_204137:: @ 8204137 - msgbox PacifidlogTown_House5_Text_20418B, 2 + msgbox PacifidlogTown_House5_Text_20418B, MSGBOX_NPC end PacifidlogTown_House5_Text_204140: @ 8204140 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 65af1cdc7..a4dc90bd6 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 end PacifidlogTown_PokemonCenter_1F_EventScript_2034C4:: @ 82034C4 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_EventScript_2034CD:: @ 82034CD - msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6 - msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 5eda45fb8..4905c83d9 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -35,13 +35,13 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E applymovement 2, PetalburgCity_Movement_1DC451 applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 - msgbox PetalburgCity_Text_1EC1F8, 4 + msgbox PetalburgCity_Text_1EC1F8, MSGBOX_DEFAULT special StartWallyTutorialBattle waitstate - msgbox PetalburgCity_Text_1EC271, 4 + msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY - msgbox PetalburgCity_Text_1EC297, 4 + msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 setvar VAR_0x4057, 3 @@ -82,7 +82,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 lock faceplayer - msgbox PetalburgCity_Text_1DC985, 4 + msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgCity_Movement_2725A2 waitmovement 0 @@ -90,7 +90,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 end PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD - msgbox PetalburgCity_Text_1DC837, 2 + msgbox PetalburgCity_Text_1DC837, MSGBOX_NPC end PetalburgCity_Movement_1DC406: @ 81DC406 @@ -218,19 +218,19 @@ PetalburgCity_Movement_1DC451: @ 81DC451 step_end PetalburgCity_EventScript_1DC476:: @ 81DC476 - msgbox PetalburgCity_Text_1DCAAA, 3 + msgbox PetalburgCity_Text_1DCAAA, MSGBOX_SIGN end PetalburgCity_EventScript_1DC47F:: @ 81DC47F - msgbox PetalburgCity_Text_1DCAF1, 3 + msgbox PetalburgCity_Text_1DCAF1, MSGBOX_SIGN end PetalburgCity_EventScript_1DC488:: @ 81DC488 - msgbox PetalburgCity_Text_1DCA30, 2 + msgbox PetalburgCity_Text_1DCA30, MSGBOX_NPC end PetalburgCity_EventScript_1DC491:: @ 81DC491 - msgbox PetalburgCity_Text_1DCB23, 3 + msgbox PetalburgCity_Text_1DCB23, MSGBOX_SIGN end PetalburgCity_EventScript_1DC49A:: @ 81DC49A @@ -274,7 +274,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA call_if 1, PetalburgCity_EventScript_1DC59F compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5B4 - msgbox PetalburgCity_Text_1DC881, 4 + msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC5C9 @@ -284,11 +284,11 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA call_if 1, PetalburgCity_EventScript_1DC5ED compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5FF - msgbox PetalburgCity_Text_1DC91B, 4 + msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT applymovement 8, PetalburgCity_Movement_2725A8 applymovement 255, PetalburgCity_Movement_2725A8 waitmovement 0 - msgbox PetalburgCity_Text_1DC93E, 4 + msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage applymovement 8, PetalburgCity_Movement_1DC658 waitmovement 0 @@ -547,17 +547,17 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 applymovement 255, PetalburgCity_Movement_2725A8 waitmovement 0 setvar VAR_0x40D1, 1 - msgbox PetalburgCity_Text_1DCB31, 4 + msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage applymovement 9, PetalburgCity_Movement_2725A8 waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCB82, 4 + msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage applymovement 9, PetalburgCity_Movement_2725A4 waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCC09, 4 + msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC78E @@ -705,7 +705,7 @@ PetalburgCity_Movement_1DC828: @ 81DC828 step_end PetalburgCity_EventScript_1DC82E:: @ 81DC82E - msgbox PetalburgCity_Text_1DC881, 2 + msgbox PetalburgCity_Text_1DC881, MSGBOX_NPC end PetalburgCity_Text_1DC837: @ 81DC837 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 9347397ff..71d03cfe9 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -88,8 +88,8 @@ PetalburgCity_Gym_MapScript2_20499A: @ 820499A PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 lockall - msgbox PetalburgCity_Gym_Text_205B32, 4 - msgbox PetalburgCity_Gym_Text_205B4C, 4 + msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage applymovement 255, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_2049EC @@ -100,7 +100,7 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 delay 30 applymovement 255, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 - msgbox PetalburgCity_Gym_Text_205C40, 4 + msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_0x4085, 2 releaseall end @@ -123,7 +123,7 @@ PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 case 6, PetalburgCity_Gym_EventScript_204E3B case 7, PetalburgCity_Gym_EventScript_204D80 case 8, PetalburgCity_Gym_EventScript_204DB3 - msgbox PetalburgCity_Gym_Text_2057A2, 4 + msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT closemessage switch VAR_FACING case 1, PetalburgCity_Gym_EventScript_204A80 @@ -163,10 +163,10 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204C5F compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204C5F - msgbox PetalburgCity_Gym_Text_2058B1, 4 - msgbox PetalburgCity_Gym_Text_2058DB, 4 - msgbox PetalburgCity_Gym_Text_205910, 4 - msgbox PetalburgCity_Gym_Text_2059D8, 4 + msgbox PetalburgCity_Gym_Text_2058B1, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_2058DB, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205910, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_2059D8, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204CC7 compare VAR_0x8008, 1 @@ -175,7 +175,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204CE4 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204CF6 - msgbox PetalburgCity_Gym_Text_2059E8, 4 + msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D08 compare VAR_0x8008, 1 @@ -184,9 +184,9 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204D1E compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D29 - msgbox PetalburgCity_Gym_Text_205A46, 4 - msgbox PetalburgCity_Gym_Text_205A89, 4 - msgbox PetalburgCity_Gym_Text_205AF4, 4 + msgbox PetalburgCity_Gym_Text_205A46, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205A89, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205AF4, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D72 compare VAR_0x8008, 1 @@ -203,7 +203,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204D34 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D34 - msgbox PetalburgCity_Gym_Text_205B0F, 4 + msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 @@ -328,22 +328,22 @@ PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F return PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A - msgbox PetalburgCity_Gym_Text_205DB4, 4 + msgbox PetalburgCity_Gym_Text_205DB4, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D54:: @ 8204D54 - msgbox PetalburgCity_Gym_Text_205EAE, 4 + msgbox PetalburgCity_Gym_Text_205EAE, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E - msgbox PetalburgCity_Gym_Text_205F87, 4 + msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D68:: @ 8204D68 - msgbox PetalburgCity_Gym_Text_205F87, 4 + msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT release end @@ -369,7 +369,7 @@ PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 goto_if 0, PetalburgCity_Gym_EventScript_204DAC checkflag FLAG_SYS_GAME_CLEAR goto_eq PetalburgCity_Gym_EventScript_20512D - msgbox PetalburgCity_Gym_Text_206417, 4 + msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT release end @@ -380,7 +380,7 @@ PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A - msgbox PetalburgCity_Gym_Text_2075F7, 6 + msgbox PetalburgCity_Gym_Text_2075F7, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE @@ -395,7 +395,7 @@ PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE goto_eq PetalburgCity_Gym_EventScript_204E17 compare VAR_ENIGMA_BERRY_AVAILABLE, 0 goto_eq PetalburgCity_Gym_EventScript_204E17 - msgbox PetalburgCity_Gym_Text_2A6D3D, 4 + msgbox PetalburgCity_Gym_Text_2A6D3D, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -412,12 +412,12 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D end PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B - msgbox PetalburgCity_Gym_Text_205FE5, 4 + msgbox PetalburgCity_Gym_Text_205FE5, MSGBOX_DEFAULT trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107 message PetalburgCity_Gym_Text_206162 waitmessage call PetalburgCity_Gym_EventScript_27207E - msgbox PetalburgCity_Gym_Text_20618A, 4 + msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_0x4F4 setvar VAR_0x4085, 7 setflag FLAG_BADGE05_GET @@ -432,7 +432,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B special DrawWholeMapView call PetalburgCity_Gym_EventScript_204ED2 delay 30 - msgbox PetalburgCity_Gym_Text_2062FB, 4 + msgbox PetalburgCity_Gym_Text_2062FB, MSGBOX_DEFAULT closemessage delay 40 playse SE_DOOR @@ -449,7 +449,7 @@ PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_27205E setflag FLAG_0x0A9 - msgbox PetalburgCity_Gym_Text_206254, 4 + msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5 @@ -479,7 +479,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 call_if 1, PetalburgCity_Gym_EventScript_205009 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_205025 - msgbox PetalburgCity_Gym_Text_206377, 4 + msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 1 @@ -488,7 +488,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 call_if 1, PetalburgCity_Gym_EventScript_204FD7 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204FE2 - msgbox PetalburgCity_Gym_Text_2063CA, 4 + msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 @@ -780,7 +780,7 @@ PetalburgCity_Gym_Movement_205123: @ 8205123 step_end PetalburgCity_Gym_EventScript_20512D:: @ 820512D - msgbox PetalburgCity_Gym_Text_2064C3, 4 + msgbox PetalburgCity_Gym_Text_2064C3, MSGBOX_DEFAULT release end @@ -790,7 +790,7 @@ PetalburgCity_Gym_EventScript_205137:: @ 8205137 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 - msgbox PetalburgCity_Gym_Text_20721E, 5 + msgbox PetalburgCity_Gym_Text_20721E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -810,7 +810,7 @@ PetalburgCity_Gym_EventScript_20517B:: @ 820517B end PetalburgCity_Gym_EventScript_20517D:: @ 820517D - msgbox PetalburgCity_Gym_Text_2071F4, 4 + msgbox PetalburgCity_Gym_Text_2071F4, MSGBOX_DEFAULT releaseall end @@ -820,7 +820,7 @@ PetalburgCity_Gym_EventScript_205187:: @ 8205187 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 - msgbox PetalburgCity_Gym_Text_207280, 5 + msgbox PetalburgCity_Gym_Text_207280, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -833,7 +833,7 @@ PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 - msgbox PetalburgCity_Gym_Text_2072BB, 5 + msgbox PetalburgCity_Gym_Text_2072BB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -846,7 +846,7 @@ PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, 5 + msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -859,7 +859,7 @@ PetalburgCity_Gym_EventScript_205222:: @ 8205222 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, 5 + msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -872,7 +872,7 @@ PetalburgCity_Gym_EventScript_205255:: @ 8205255 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 - msgbox PetalburgCity_Gym_Text_207331, 5 + msgbox PetalburgCity_Gym_Text_207331, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -885,7 +885,7 @@ PetalburgCity_Gym_EventScript_205288:: @ 8205288 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, 5 + msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -898,7 +898,7 @@ PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, 5 + msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -911,7 +911,7 @@ PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, 5 + msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -924,7 +924,7 @@ PetalburgCity_Gym_EventScript_205321:: @ 8205321 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, 5 + msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -937,7 +937,7 @@ PetalburgCity_Gym_EventScript_205354:: @ 8205354 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, 5 + msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -950,7 +950,7 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, 5 + msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -961,7 +961,7 @@ PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2053ED - msgbox PetalburgCity_Gym_Text_2067D8, 6 + msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE @@ -972,14 +972,14 @@ PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE end PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED - msgbox PetalburgCity_Gym_Text_20685E, 2 + msgbox PetalburgCity_Gym_Text_20685E, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205429 - msgbox PetalburgCity_Gym_Text_206996, 6 + msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_20541A:: @ 820541A @@ -990,14 +990,14 @@ PetalburgCity_Gym_EventScript_20541A:: @ 820541A end PetalburgCity_Gym_EventScript_205429:: @ 8205429 - msgbox PetalburgCity_Gym_Text_2069D9, 2 + msgbox PetalburgCity_Gym_Text_2069D9, MSGBOX_NPC end PetalburgCity_Gym_EventScript_205432:: @ 8205432 trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205465 - msgbox PetalburgCity_Gym_Text_206AE9, 6 + msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205456:: @ 8205456 @@ -1008,14 +1008,14 @@ PetalburgCity_Gym_EventScript_205456:: @ 8205456 end PetalburgCity_Gym_EventScript_205465:: @ 8205465 - msgbox PetalburgCity_Gym_Text_206BB1, 2 + msgbox PetalburgCity_Gym_Text_206BB1, MSGBOX_NPC end PetalburgCity_Gym_EventScript_20546E:: @ 820546E trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054A1 - msgbox PetalburgCity_Gym_Text_206C9F, 6 + msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205492:: @ 8205492 @@ -1026,14 +1026,14 @@ PetalburgCity_Gym_EventScript_205492:: @ 8205492 end PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 - msgbox PetalburgCity_Gym_Text_206D56, 2 + msgbox PetalburgCity_Gym_Text_206D56, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054DD - msgbox PetalburgCity_Gym_Text_206E26, 6 + msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE @@ -1044,14 +1044,14 @@ PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE end PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD - msgbox PetalburgCity_Gym_Text_206ED8, 2 + msgbox PetalburgCity_Gym_Text_206ED8, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205519 - msgbox PetalburgCity_Gym_Text_206F9F, 6 + msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_20550A:: @ 820550A @@ -1062,14 +1062,14 @@ PetalburgCity_Gym_EventScript_20550A:: @ 820550A end PetalburgCity_Gym_EventScript_205519:: @ 8205519 - msgbox PetalburgCity_Gym_Text_207069, 2 + msgbox PetalburgCity_Gym_Text_207069, MSGBOX_NPC end PetalburgCity_Gym_EventScript_205522:: @ 8205522 trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205555 - msgbox PetalburgCity_Gym_Text_2070FB, 6 + msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205546:: @ 8205546 @@ -1080,7 +1080,7 @@ PetalburgCity_Gym_EventScript_205546:: @ 8205546 end PetalburgCity_Gym_EventScript_205555:: @ 8205555 - msgbox PetalburgCity_Gym_Text_207170, 2 + msgbox PetalburgCity_Gym_Text_207170, MSGBOX_NPC end PetalburgCity_Gym_EventScript_20555E:: @ 820555E @@ -1217,12 +1217,12 @@ PetalburgCity_Gym_EventScript_20574F:: @ 820574F faceplayer checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205764 - msgbox PetalburgCity_Gym_Text_206542, 4 + msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_205764:: @ 8205764 - msgbox PetalburgCity_Gym_Text_2066F3, 4 + msgbox PetalburgCity_Gym_Text_2066F3, MSGBOX_DEFAULT release end @@ -1241,12 +1241,12 @@ PetalburgCity_Gym_EventScript_20577E:: @ 820577E end PetalburgCity_Gym_EventScript_20578E:: @ 820578E - msgbox PetalburgCity_Gym_Text_207467, 4 + msgbox PetalburgCity_Gym_Text_207467, MSGBOX_DEFAULT releaseall end PetalburgCity_Gym_EventScript_205798:: @ 8205798 - msgbox PetalburgCity_Gym_Text_20744C, 4 + msgbox PetalburgCity_Gym_Text_20744C, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc index f727ec8a1..cb511bbed 100644 --- a/data/maps/PetalburgCity_House1/scripts.inc +++ b/data/maps/PetalburgCity_House1/scripts.inc @@ -2,11 +2,11 @@ PetalburgCity_House1_MapScripts:: @ 8207799 .byte 0 PetalburgCity_House1_EventScript_20779A:: @ 820779A - msgbox PetalburgCity_House1_Text_2077AC, 2 + msgbox PetalburgCity_House1_Text_2077AC, MSGBOX_NPC end PetalburgCity_House1_EventScript_2077A3:: @ 82077A3 - msgbox PetalburgCity_House1_Text_2077FB, 2 + msgbox PetalburgCity_House1_Text_2077FB, MSGBOX_NPC end PetalburgCity_House1_Text_2077AC: @ 82077AC diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc index 44987b3d6..4fe971339 100644 --- a/data/maps/PetalburgCity_House2/scripts.inc +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -2,11 +2,11 @@ PetalburgCity_House2_MapScripts:: @ 82078F2 .byte 0 PetalburgCity_House2_EventScript_2078F3:: @ 82078F3 - msgbox PetalburgCity_House2_Text_207905, 2 + msgbox PetalburgCity_House2_Text_207905, MSGBOX_NPC end PetalburgCity_House2_EventScript_2078FC:: @ 82078FC - msgbox PetalburgCity_House2_Text_207969, 2 + msgbox PetalburgCity_House2_Text_207969, MSGBOX_NPC end PetalburgCity_House2_Text_207905: @ 8207905 diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 665ad3bae..9ee996374 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -9,7 +9,7 @@ PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 checkflag FLAG_0x128 goto_eq PetalburgCity_Mart_EventScript_207DA6 pokemart PetalburgCity_Mart_Pokemart_207D8C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -32,7 +32,7 @@ PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6 pokemart PetalburgCity_Mart_Pokemart_207DB8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -56,15 +56,15 @@ PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 end PetalburgCity_Mart_EventScript_207DD6:: @ 8207DD6 - msgbox PetalburgCity_Mart_Text_207DF1, 2 + msgbox PetalburgCity_Mart_Text_207DF1, MSGBOX_NPC end PetalburgCity_Mart_EventScript_207DDF:: @ 8207DDF - msgbox PetalburgCity_Mart_Text_207E60, 2 + msgbox PetalburgCity_Mart_Text_207E60, MSGBOX_NPC end PetalburgCity_Mart_EventScript_207DE8:: @ 8207DE8 - msgbox PetalburgCity_Mart_Text_207EB0, 2 + msgbox PetalburgCity_Mart_Text_207EB0, MSGBOX_NPC end PetalburgCity_Mart_Text_207DF1: @ 8207DF1 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 130a43de9..d0a279cf2 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -17,17 +17,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC end PetalburgCity_PokemonCenter_1F_EventScript_207A0A:: @ 8207A0A - msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, 2 + msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, MSGBOX_NPC end PetalburgCity_PokemonCenter_1F_EventScript_207A13:: @ 8207A13 - msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, 2 + msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, MSGBOX_NPC end PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C lock faceplayer - msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, MSGBOX_DEFAULT specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 @@ -45,15 +45,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 end PetalburgCity_PokemonCenter_1F_EventScript_207A5B:: @ 8207A5B - msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_EventScript_207A64:: @ 8207A64 - msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_EventScript_207A6D:: @ 8207A6D - msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_Text_207A76: @ 8207A76 diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index e64bd57b1..babfb6229 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -18,10 +18,10 @@ PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 lockall - msgbox PetalburgCity_WallysHouse_Text_20446E, 4 + msgbox PetalburgCity_WallysHouse_Text_20446E, MSGBOX_DEFAULT giveitem_std ITEM_HM03 setflag FLAG_0x07A - msgbox PetalburgCity_WallysHouse_Text_20461A, 4 + msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT setvar VAR_0x4057, 5 releaseall end @@ -35,23 +35,23 @@ PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 goto_eq PetalburgCity_WallysHouse_EventScript_2042A2 checkflag FLAG_0x087 goto_eq PetalburgCity_WallysHouse_EventScript_2042B6 - msgbox PetalburgCity_WallysHouse_Text_2042DF, 4 + msgbox PetalburgCity_WallysHouse_Text_2042DF, MSGBOX_DEFAULT setflag FLAG_0x087 release end PetalburgCity_WallysHouse_EventScript_2042A2:: @ 82042A2 - msgbox PetalburgCity_WallysHouse_Text_204661, 4 + msgbox PetalburgCity_WallysHouse_Text_204661, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042AC:: @ 82042AC - msgbox PetalburgCity_WallysHouse_Text_204698, 4 + msgbox PetalburgCity_WallysHouse_Text_204698, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 - msgbox PetalburgCity_WallysHouse_Text_20444D, 4 + msgbox PetalburgCity_WallysHouse_Text_20444D, MSGBOX_DEFAULT release end @@ -60,12 +60,12 @@ PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 faceplayer checkflag FLAG_0x07A goto_eq PetalburgCity_WallysHouse_EventScript_2042D5 - msgbox PetalburgCity_WallysHouse_Text_204732, 4 + msgbox PetalburgCity_WallysHouse_Text_204732, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042D5:: @ 82042D5 - msgbox PetalburgCity_WallysHouse_Text_2047A7, 4 + msgbox PetalburgCity_WallysHouse_Text_2047A7, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 7c9a1ae49..7b804d2c6 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -6,26 +6,26 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1CB waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, 4 + msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, 4 + msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E1F6 waitmovement 0 applymovement 4, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E428, 4 + msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1E4 waitmovement 0 - msgbox PetalburgWoods_Text_22E457, 4 + msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E20E waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, 4 + msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 @@ -43,25 +43,25 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 waitmovement 0 applymovement 255, PetalburgWoods_Movement_2725A4 waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, 4 + msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, 4 + msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E205 waitmovement 0 applymovement 4, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E428, 4 + msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 - msgbox PetalburgWoods_Text_22E457, 4 + msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT applymovement 255, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, 4 + msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 @@ -75,19 +75,19 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 PetalburgWoods_EventScript_22E124:: @ 822E124 applymovement 4, PetalburgWoods_Movement_22E1B1 waitmovement 0 - msgbox PetalburgWoods_Text_22E332, 4 + msgbox PetalburgWoods_Text_22E332, MSGBOX_DEFAULT closemessage return PetalburgWoods_EventScript_22E138:: @ 822E138 - msgbox PetalburgWoods_Text_22E563, 4 + msgbox PetalburgWoods_Text_22E563, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 applymovement 255, PetalburgWoods_Movement_2725AA waitmovement 0 - msgbox PetalburgWoods_Text_22E63D, 4 + msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E17D @@ -95,15 +95,15 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 end PetalburgWoods_EventScript_22E17D:: @ 822E17D - msgbox PetalburgWoods_Text_22E741, 4 + msgbox PetalburgWoods_Text_22E741, MSGBOX_DEFAULT goto PetalburgWoods_EventScript_22E18B end PetalburgWoods_EventScript_22E18B:: @ 822E18B - msgbox PetalburgWoods_Text_22E6C7, 4 + msgbox PetalburgWoods_Text_22E6C7, MSGBOX_DEFAULT applymovement 4, PetalburgWoods_Movement_22E1EE waitmovement 0 - msgbox PetalburgWoods_Text_22E712, 4 + msgbox PetalburgWoods_Text_22E712, MSGBOX_DEFAULT closemessage return @@ -239,11 +239,11 @@ PetalburgWoods_Movement_22E20E: @ 822E20E step_end PetalburgWoods_EventScript_22E210:: @ 822E210 - msgbox PetalburgWoods_Text_22EA0C, 2 + msgbox PetalburgWoods_Text_22EA0C, MSGBOX_NPC end PetalburgWoods_EventScript_22E219:: @ 822E219 - msgbox PetalburgWoods_Text_22EA8B, 2 + msgbox PetalburgWoods_Text_22EA8B, MSGBOX_NPC end PetalburgWoods_EventScript_22E222:: @ 822E222 @@ -251,7 +251,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 faceplayer checkflag FLAG_0x129 goto_eq PetalburgWoods_EventScript_22E251 - msgbox PetalburgWoods_Text_22EAFE, 4 + msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_272054 @@ -260,21 +260,21 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 end PetalburgWoods_EventScript_22E251:: @ 822E251 - msgbox PetalburgWoods_Text_22EB63, 4 + msgbox PetalburgWoods_Text_22EB63, MSGBOX_DEFAULT release end PetalburgWoods_EventScript_22E25B:: @ 822E25B - msgbox PetalburgWoods_Text_22EC10, 3 + msgbox PetalburgWoods_Text_22EC10, MSGBOX_SIGN end PetalburgWoods_EventScript_22E264:: @ 822E264 - msgbox PetalburgWoods_Text_22ED07, 3 + msgbox PetalburgWoods_Text_22ED07, MSGBOX_SIGN end PetalburgWoods_EventScript_22E26D:: @ 822E26D trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 - msgbox PetalburgWoods_Text_22E7EF, 6 + msgbox PetalburgWoods_Text_22E7EF, MSGBOX_AUTOCLOSE end PetalburgWoods_EventScript_22E284:: @ 822E284 @@ -286,7 +286,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E2EF - msgbox PetalburgWoods_Text_22E889, 4 + msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end @@ -299,33 +299,33 @@ PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 end PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 - msgbox PetalburgWoods_Text_22E8C3, 4 + msgbox PetalburgWoods_Text_22E8C3, MSGBOX_DEFAULT setvar VAR_0x8004, 621 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 621 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end PetalburgWoods_EventScript_22E2EF:: @ 822E2EF checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E302 - msgbox PetalburgWoods_Text_22E889, 4 + msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end PetalburgWoods_EventScript_22E302:: @ 822E302 - msgbox PetalburgWoods_Text_22E914, 4 + msgbox PetalburgWoods_Text_22E914, MSGBOX_DEFAULT setvar VAR_0x8004, 621 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 621 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end PetalburgWoods_EventScript_22E31B:: @ 822E31B trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 - msgbox PetalburgWoods_Text_22E9B6, 6 + msgbox PetalburgWoods_Text_22E9B6, MSGBOX_AUTOCLOSE end PetalburgWoods_Text_22E332: @ 822E332 diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 7cc7d522f..341f7a572 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -19,7 +19,7 @@ Route101_EventScript_1EBCD5:: @ 81EBCD5 Route101_EventScript_1EBCDE:: @ 81EBCDE lockall playbgm MUS_EVENT0, 1 - msgbox Route101_Text_1EBE8F, 4 + msgbox Route101_Text_1EBE8F, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 @@ -35,7 +35,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF waitmovement 0 - msgbox Route101_Text_1EBE9A, 4 + msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT closemessage setvar VAR_0x4060, 2 releaseall @@ -43,7 +43,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE Route101_EventScript_1EBD4E:: @ 81EBD4E lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD90 waitmovement 0 @@ -52,7 +52,7 @@ Route101_EventScript_1EBD4E:: @ 81EBD4E Route101_EventScript_1EBD64:: @ 81EBD64 lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD92 waitmovement 0 @@ -61,7 +61,7 @@ Route101_EventScript_1EBD64:: @ 81EBD64 Route101_EventScript_1EBD7A:: @ 81EBD7A lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD94 waitmovement 0 @@ -204,15 +204,15 @@ Route101_Movement_1EBDF7: @ 81EBDF7 step_end Route101_EventScript_1EBDFB:: @ 81EBDFB - msgbox Route101_Text_1EBFDD, 2 + msgbox Route101_Text_1EBFDD, MSGBOX_NPC end Route101_EventScript_1EBE04:: @ 81EBE04 - msgbox Route101_Text_1EC04A, 2 + msgbox Route101_Text_1EC04A, MSGBOX_NPC end Route101_EventScript_1EBE0D:: @ 81EBE0D - msgbox Route101_Text_1EC0C8, 3 + msgbox Route101_Text_1EC0C8, MSGBOX_SIGN end Route101_EventScript_1EBE16:: @ 81EBE16 @@ -229,7 +229,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 waitstate applymovement 2, Route101_Movement_1EBE8D waitmovement 0 - msgbox Route101_Text_1EBF12, 4 + msgbox Route101_Text_1EBF12, MSGBOX_DEFAULT special HealPlayerParty setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index d25794242..c38d40a7f 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -2,19 +2,19 @@ Route102_MapScripts:: @ 81EC0E0 .byte 0 Route102_EventScript_1EC0E1:: @ 81EC0E1 - msgbox Route102_Text_1EC2C0, 2 + msgbox Route102_Text_1EC2C0, MSGBOX_NPC end Route102_EventScript_1EC0EA:: @ 81EC0EA - msgbox Route102_Text_1EC35B, 3 + msgbox Route102_Text_1EC35B, MSGBOX_SIGN end Route102_EventScript_1EC0F3:: @ 81EC0F3 - msgbox Route102_Text_1EC373, 3 + msgbox Route102_Text_1EC373, MSGBOX_SIGN end Route102_EventScript_1EC0FC:: @ 81EC0FC - msgbox Route102_Text_1EC32E, 2 + msgbox Route102_Text_1EC32E, MSGBOX_NPC end Route102_EventScript_1EC105:: @ 81EC105 @@ -26,7 +26,7 @@ Route102_EventScript_1EC105:: @ 81EC105 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route102_EventScript_1EC170 - msgbox Route102_Text_2945AC, 4 + msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end @@ -39,48 +39,48 @@ Route102_EventScript_1EC146:: @ 81EC146 end Route102_EventScript_1EC157:: @ 81EC157 - msgbox Route102_Text_294668, 4 + msgbox Route102_Text_294668, MSGBOX_DEFAULT setvar VAR_0x8004, 318 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 318 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route102_EventScript_1EC170:: @ 81EC170 checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC183 - msgbox Route102_Text_2945AC, 4 + msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end Route102_EventScript_1EC183:: @ 81EC183 - msgbox Route102_Text_2945EB, 4 + msgbox Route102_Text_2945EB, MSGBOX_DEFAULT setvar VAR_0x8004, 318 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 318 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route102_EventScript_1EC19C:: @ 81EC19C trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C - msgbox Route102_Text_29473C, 6 + msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1B3:: @ 81EC1B3 trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 - msgbox Route102_Text_294859, 6 + msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 - msgbox Route102_Text_294916, 6 + msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA - msgbox Route102_Text_2947DB, 6 + msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE end PetalburgCity_Text_1EC1F8: @ 81EC1F8 diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 57cde74e6..58a1fc124 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -28,7 +28,7 @@ Route103_EventScript_1EC3C1:: @ 81EC3C1 end Route103_EventScript_1EC3DA:: @ 81EC3DA - msgbox Route103_Text_1EC7A6, 4 + msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 applymovement 2, Route103_Movement_27259E @@ -37,7 +37,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA waitmovement 0 applymovement 2, Route103_Movement_27259A waitmovement 0 - msgbox Route103_Text_1EC7DE, 4 + msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route103_EventScript_1EC48E case 1, Route103_EventScript_1EC49E @@ -45,7 +45,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA end Route103_EventScript_1EC434:: @ 81EC434 - msgbox Route103_Text_1EC989, 4 + msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 applymovement 2, Route103_Movement_27259E @@ -54,7 +54,7 @@ Route103_EventScript_1EC434:: @ 81EC434 waitmovement 0 applymovement 2, Route103_Movement_27259A waitmovement 0 - msgbox Route103_Text_1EC9CE, 4 + msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route103_EventScript_1EC4BE case 1, Route103_EventScript_1EC4CE @@ -92,12 +92,12 @@ Route103_EventScript_1EC4DE:: @ 81EC4DE end Route103_EventScript_1EC4EE:: @ 81EC4EE - msgbox Route103_Text_1EC8AE, 4 + msgbox Route103_Text_1EC8AE, MSGBOX_DEFAULT goto Route103_EventScript_1EC50A end Route103_EventScript_1EC4FC:: @ 81EC4FC - msgbox Route103_Text_1ECA79, 4 + msgbox Route103_Text_1ECA79, MSGBOX_DEFAULT goto Route103_EventScript_1EC50A end @@ -191,20 +191,20 @@ Route103_Movement_1EC5D6: @ 81EC5D6 step_end Route103_EventScript_1EC5D9:: @ 81EC5D9 - msgbox Route103_Text_1ECB73, 2 + msgbox Route103_Text_1ECB73, MSGBOX_NPC end Route103_EventScript_1EC5E2:: @ 81EC5E2 - msgbox Route103_Text_1ECBB5, 2 + msgbox Route103_Text_1ECBB5, MSGBOX_NPC end Route103_EventScript_1EC5EB:: @ 81EC5EB - msgbox Route103_Text_1ECC1A, 3 + msgbox Route103_Text_1ECC1A, MSGBOX_SIGN end Route103_EventScript_1EC5F4:: @ 81EC5F4 trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F - msgbox Route103_Text_2949B4, 6 + msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC60B:: @ 81EC60B @@ -212,21 +212,21 @@ Route103_EventScript_1EC60B:: @ 81EC60B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC653 - msgbox Route103_Text_294A52, 6 + msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC63A:: @ 81EC63A - msgbox Route103_Text_294B8A, 4 + msgbox Route103_Text_294B8A, MSGBOX_DEFAULT setvar VAR_0x8004, 481 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 481 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route103_EventScript_1EC653:: @ 81EC653 trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF - msgbox Route103_Text_294C93, 6 + msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC66E:: @ 81EC66E @@ -234,26 +234,26 @@ Route103_EventScript_1EC66E:: @ 81EC66E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC6B6 - msgbox Route103_Text_294B40, 6 + msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC69D:: @ 81EC69D - msgbox Route103_Text_294B8A, 4 + msgbox Route103_Text_294B8A, MSGBOX_DEFAULT setvar VAR_0x8004, 481 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 481 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route103_EventScript_1EC6B6:: @ 81EC6B6 trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB - msgbox Route103_Text_294D89, 6 + msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6D1:: @ 81EC6D1 trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92 - msgbox Route103_Text_294EBB, 6 + msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6E8:: @ 81EC6E8 @@ -261,44 +261,44 @@ Route103_EventScript_1EC6E8:: @ 81EC6E8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC733 - msgbox Route103_Text_294F42, 4 + msgbox Route103_Text_294F42, MSGBOX_DEFAULT release end Route103_EventScript_1EC714:: @ 81EC714 special sub_80B4808 waitmovement 0 - msgbox Route103_Text_294F7E, 4 + msgbox Route103_Text_294F7E, MSGBOX_DEFAULT setvar VAR_0x8004, 293 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 293 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route103_EventScript_1EC733:: @ 81EC733 trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006 - msgbox Route103_Text_29501E, 6 + msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC74A:: @ 81EC74A trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B - msgbox Route103_Text_295246, 6 + msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC761:: @ 81EC761 trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6 - msgbox Route103_Text_2951DE, 6 + msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC778:: @ 81EC778 trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093 - msgbox Route103_Text_2950AA, 6 + msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC78F:: @ 81EC78F trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146 - msgbox Route103_Text_29514D, 6 + msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE end Route103_Text_1EC7A6: @ 81EC7A6 diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index a37c89469..790eaf303 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -104,27 +104,27 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B checkflag FLAG_0x07C goto_eq Route104_EventScript_1ECDD0 setflag FLAG_0x07C - msgbox Route104_Text_1EDBFF, 4 + msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDC8F, 4 + msgbox Route104_Text_1EDC8F, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD applymovement 255, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDCB1, 4 + msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT closemessage waitmovement 0 applymovement 34, Route104_Movement_1ECDCA waitmovement 0 moveobjectoffscreen 34 - msgbox Route104_Text_1EDCED, 5 + msgbox Route104_Text_1EDCED, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, 4 + msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall end @@ -144,15 +144,15 @@ Route104_Movement_1ECDCD: @ 81ECDCD step_end Route104_EventScript_1ECDD0:: @ 81ECDD0 - msgbox Route104_Text_1EDD9F, 5 + msgbox Route104_Text_1EDD9F, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, 4 + msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ECDED:: @ 81ECDED - msgbox Route104_Text_1EDDDB, 4 + msgbox Route104_Text_1EDDDB, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route104_EventScript_1ECE36 case 1, Route104_EventScript_1ECE49 @@ -160,7 +160,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED end Route104_EventScript_1ECE1C:: @ 81ECE1C - msgbox Route104_Text_1EDE3E, 4 + msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall @@ -195,41 +195,41 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F checkflag FLAG_0x07C goto_eq Route104_EventScript_1ECEEC setflag FLAG_0x07C - msgbox Route104_Text_1EDF04, 4 + msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDFA0, 4 + msgbox Route104_Text_1EDFA0, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD applymovement 255, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDFC6, 4 + msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT closemessage waitmovement 0 applymovement 34, Route104_Movement_1ECDCA waitmovement 0 moveobjectoffscreen 34 - msgbox Route104_Text_1EE009, 5 + msgbox Route104_Text_1EE009, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, 4 + msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall end Route104_EventScript_1ECEEC:: @ 81ECEEC - msgbox Route104_Text_1EE094, 5 + msgbox Route104_Text_1EE094, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, 4 + msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ECF09:: @ 81ECF09 - msgbox Route104_Text_1EE0C7, 4 + msgbox Route104_Text_1EE0C7, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route104_EventScript_1ECF4D case 1, Route104_EventScript_1ECF60 @@ -237,7 +237,7 @@ Route104_EventScript_1ECF09:: @ 81ECF09 end Route104_EventScript_1ECF38:: @ 81ECF38 - msgbox Route104_Text_1EE120, 4 + msgbox Route104_Text_1EE120, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall @@ -276,17 +276,17 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C faceplayer checkflag FLAG_0x0F6 goto_eq Route104_EventScript_1ECFC3 - msgbox Route104_Text_2A6D86, 4 + msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x0F6 - msgbox Route104_Text_2A6E32, 4 + msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release end Route104_EventScript_1ECFC3:: @ 81ECFC3 - msgbox Route104_Text_2A6E32, 4 + msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release end @@ -295,7 +295,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD faceplayer checkflag FLAG_0x117 goto_eq Route104_EventScript_1ECFFC - msgbox Route104_Text_1ED96A, 4 + msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 @@ -304,44 +304,44 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD end Route104_EventScript_1ECFFC:: @ 81ECFFC - msgbox Route104_Text_1EDA0F, 4 + msgbox Route104_Text_1EDA0F, MSGBOX_DEFAULT release end Route104_EventScript_1ED006:: @ 81ED006 - msgbox Route104_Text_1ED5EC, 2 + msgbox Route104_Text_1ED5EC, MSGBOX_NPC end Route104_EventScript_1ED00F:: @ 81ED00F - msgbox Route104_Text_1ED662, 3 + msgbox Route104_Text_1ED662, MSGBOX_SIGN end Route104_EventScript_1ED018:: @ 81ED018 - msgbox Route104_Text_1EDA8C, 3 + msgbox Route104_Text_1EDA8C, MSGBOX_SIGN end Route104_EventScript_1ED021:: @ 81ED021 - msgbox Route104_Text_1EDAA1, 3 + msgbox Route104_Text_1EDAA1, MSGBOX_SIGN end Route104_EventScript_1ED02A:: @ 81ED02A - msgbox Route104_Text_1EDABC, 3 + msgbox Route104_Text_1EDABC, MSGBOX_SIGN end Route104_EventScript_1ED033:: @ 81ED033 - msgbox Route104_Text_1EDAD6, 3 + msgbox Route104_Text_1EDAD6, MSGBOX_SIGN end Route104_EventScript_1ED03C:: @ 81ED03C - msgbox Route104_Text_1EDAEF, 3 + msgbox Route104_Text_1EDAEF, MSGBOX_SIGN end Route104_EventScript_1ED045:: @ 81ED045 - msgbox Route104_Text_1ED6A2, 2 + msgbox Route104_Text_1ED6A2, MSGBOX_NPC end Route104_EventScript_1ED04E:: @ 81ED04E - msgbox Route104_Text_1ED735, 2 + msgbox Route104_Text_1ED735, MSGBOX_NPC end Route104_EventScript_1ED057:: @ 81ED057 @@ -349,7 +349,7 @@ Route104_EventScript_1ED057:: @ 81ED057 faceplayer checkflag FLAG_0x106 goto_eq Route104_EventScript_1ED086 - msgbox Route104_Text_1ED838, 4 + msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 @@ -358,12 +358,12 @@ Route104_EventScript_1ED057:: @ 81ED057 end Route104_EventScript_1ED086:: @ 81ED086 - msgbox Route104_Text_1ED8E7, 4 + msgbox Route104_Text_1ED8E7, MSGBOX_DEFAULT release end Route104_EventScript_1ED090:: @ 81ED090 - msgbox Route104_Text_1ED7A2, 2 + msgbox Route104_Text_1ED7A2, MSGBOX_NPC end Route104_EventScript_1ED099:: @ 81ED099 @@ -396,7 +396,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EE463, 4 + msgbox Route104_Text_1EE463, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -438,12 +438,12 @@ Route104_EventScript_1ED139:: @ 81ED139 end Route104_EventScript_1ED1B4:: @ 81ED1B4 - msgbox Route104_Text_1E9AAF, 4 + msgbox Route104_Text_1E9AAF, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ED1BE:: @ 81ED1BE - msgbox Route104_Text_1E9C1D, 4 + msgbox Route104_Text_1E9C1D, MSGBOX_DEFAULT releaseall end @@ -872,12 +872,12 @@ Route104_Movement_1ED35C: @ 81ED35C Route104_EventScript_1ED35F:: @ 81ED35F trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509 - msgbox Route104_Text_29554E, 6 + msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED376:: @ 81ED376 trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4 - msgbox Route104_Text_2955E8, 6 + msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED38D:: @ 81ED38D @@ -889,7 +889,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED3F8 - msgbox Route104_Text_295689, 4 + msgbox Route104_Text_295689, MSGBOX_DEFAULT release end @@ -902,33 +902,33 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE end Route104_EventScript_1ED3DF:: @ 81ED3DF - msgbox Route104_Text_29576B, 4 + msgbox Route104_Text_29576B, MSGBOX_DEFAULT setvar VAR_0x8004, 604 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 604 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route104_EventScript_1ED3F8:: @ 81ED3F8 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED40B - msgbox Route104_Text_295689, 4 + msgbox Route104_Text_295689, MSGBOX_DEFAULT release end Route104_EventScript_1ED40B:: @ 81ED40B - msgbox Route104_Text_2956FF, 4 + msgbox Route104_Text_2956FF, MSGBOX_DEFAULT setvar VAR_0x8004, 604 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 604 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route104_EventScript_1ED424:: @ 81ED424 trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0 - msgbox Route104_Text_29580C, 6 + msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED43B:: @ 81ED43B @@ -940,7 +940,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED4A6 - msgbox Route104_Text_2958C1, 4 + msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end @@ -953,33 +953,33 @@ Route104_EventScript_1ED47C:: @ 81ED47C end Route104_EventScript_1ED48D:: @ 81ED48D - msgbox Route104_Text_29595A, 4 + msgbox Route104_Text_29595A, MSGBOX_DEFAULT setvar VAR_0x8004, 136 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 136 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route104_EventScript_1ED4A6:: @ 81ED4A6 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED4B9 - msgbox Route104_Text_2958C1, 4 + msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end Route104_EventScript_1ED4B9:: @ 81ED4B9 - msgbox Route104_Text_2958F8, 4 + msgbox Route104_Text_2958F8, MSGBOX_DEFAULT setvar VAR_0x8004, 136 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 136 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route104_EventScript_1ED4D2:: @ 81ED4D2 trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC - msgbox Route104_Text_295A1E, 6 + msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED4E9:: @ 81ED4E9 @@ -991,7 +991,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED554 - msgbox Route104_Text_295AC3, 4 + msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end @@ -1004,52 +1004,52 @@ Route104_EventScript_1ED52A:: @ 81ED52A end Route104_EventScript_1ED53B:: @ 81ED53B - msgbox Route104_Text_295B60, 4 + msgbox Route104_Text_295B60, MSGBOX_DEFAULT setvar VAR_0x8004, 114 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 114 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route104_EventScript_1ED554:: @ 81ED554 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED567 - msgbox Route104_Text_295AC3, 4 + msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end Route104_EventScript_1ED567:: @ 81ED567 - msgbox Route104_Text_295B01, 4 + msgbox Route104_Text_295B01, MSGBOX_DEFAULT setvar VAR_0x8004, 114 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 114 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route104_EventScript_1ED580:: @ 81ED580 trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA - msgbox Route104_Text_295C1F, 6 + msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED597:: @ 81ED597 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 special GetPlayerBigGuyGirlString - msgbox Route104_Text_2952FE, 4 + msgbox Route104_Text_2952FE, MSGBOX_DEFAULT release end Route104_EventScript_1ED5B6:: @ 81ED5B6 trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 special GetPlayerBigGuyGirlString - msgbox Route104_Text_29540D, 4 + msgbox Route104_Text_29540D, MSGBOX_DEFAULT release end Route104_EventScript_1ED5D5:: @ 81ED5D5 trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9 - msgbox Route104_Text_295CD3, 6 + msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE end Route104_Text_1ED5EC: @ 81ED5EC diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index aa40c8cb4..077f9fab4 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -35,8 +35,8 @@ Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A setflag FLAG_0x093 - msgbox Route104_MrBrineysHouse_Text_229E70, 4 - msgbox Route104_MrBrineysHouse_Text_229E9B, 5 + msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT + msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 @@ -53,31 +53,31 @@ Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE end Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 - msgbox Route104_MrBrineysHouse_Text_22A0AD, 5 + msgbox Route104_MrBrineysHouse_Text_22A0AD, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA - msgbox Route104_MrBrineysHouse_Text_22A18F, 5 + msgbox Route104_MrBrineysHouse_Text_22A18F, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13 - msgbox Route104_MrBrineysHouse_Text_22A041, 4 + msgbox Route104_MrBrineysHouse_Text_22A041, MSGBOX_DEFAULT release end Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D - msgbox Route104_MrBrineysHouse_Text_22A2C3, 4 + msgbox Route104_MrBrineysHouse_Text_22A2C3, MSGBOX_DEFAULT release end Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 - msgbox Route104_MrBrineysHouse_Text_229FE9, 4 + msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT call Route104_MrBrineysHouse_EventScript_271E95 setvar VAR_0x408E, 1 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY @@ -97,7 +97,7 @@ Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route104_MrBrineysHouse_Text_22A337, 4 + msgbox Route104_MrBrineysHouse_Text_22A337, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index eefc723b6..08b5b7389 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -20,11 +20,11 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 faceplayer checkflag FLAG_TEMP_1 goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3E4 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT checkflag FLAG_0x07F goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 setflag FLAG_0x07F - msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, 5 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 @@ -33,7 +33,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 end Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, 5 + msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 @@ -42,18 +42,18 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 end Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, MSGBOX_DEFAULT return Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB - msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, MSGBOX_DEFAULT return Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 message gUnknown_08272A52 waitmessage pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -74,14 +74,14 @@ Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C faceplayer checkflag FLAG_0x05E goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT release end Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, MSGBOX_DEFAULT giveitem_std ITEM_WAILMER_PAIL - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT setflag FLAG_0x05E release end @@ -92,19 +92,19 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 dodailyevents checkflag FLAG_0x930 goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 setflag FLAG_0x930 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release end Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 3cb6d9ae6..55d5a45c2 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -33,32 +33,32 @@ Route105_MapScript2_1EE240: @ 81EE240 Route105_EventScript_1EE24A:: @ 81EE24A trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62 - msgbox Route105_Text_295DAB, 6 + msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE261:: @ 81EE261 trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66 - msgbox Route105_Text_295E72, 6 + msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE278:: @ 81EE278 trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA - msgbox Route105_Text_295F08, 6 + msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE28F:: @ 81EE28F trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0 - msgbox Route105_Text_295FAE, 6 + msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2A6:: @ 81EE2A6 trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059 - msgbox Route105_Text_296076, 6 + msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2BD:: @ 81EE2BD trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB - msgbox Route105_Text_2962EC, 6 + msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2D4:: @ 81EE2D4 @@ -66,24 +66,24 @@ Route105_EventScript_1EE2D4:: @ 81EE2D4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F - msgbox Route105_Text_2960FA, 4 + msgbox Route105_Text_2960FA, MSGBOX_DEFAULT release end Route105_EventScript_1EE300:: @ 81EE300 special sub_80B4808 waitmovement 0 - msgbox Route105_Text_296159, 4 + msgbox Route105_Text_296159, MSGBOX_DEFAULT setvar VAR_0x8004, 737 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 737 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route105_EventScript_1EE31F:: @ 81EE31F trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD - msgbox Route105_Text_2961FE, 6 + msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE end Route104_Text_1EE336: @ 81EE336 diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index fdfff0587..ee211773a 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -2,17 +2,17 @@ Route106_MapScripts:: @ 81EE489 .byte 0 Route106_EventScript_1EE48A:: @ 81EE48A - msgbox Route106_Text_1EE53A, 3 + msgbox Route106_Text_1EE53A, MSGBOX_SIGN end Route106_EventScript_1EE493:: @ 81EE493 trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD - msgbox Route106_Text_296608, 6 + msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4AA:: @ 81EE4AA trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674 - msgbox Route106_Text_29669E, 6 + msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4C1:: @ 81EE4C1 @@ -20,29 +20,29 @@ Route106_EventScript_1EE4C1:: @ 81EE4C1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route106_EventScript_1EE50C - msgbox Route106_Text_29638C, 4 + msgbox Route106_Text_29638C, MSGBOX_DEFAULT release end Route106_EventScript_1EE4ED:: @ 81EE4ED special sub_80B4808 waitmovement 0 - msgbox Route106_Text_2963E3, 4 + msgbox Route106_Text_2963E3, MSGBOX_DEFAULT setvar VAR_0x8004, 339 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 339 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route106_EventScript_1EE50C:: @ 81EE50C trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477 - msgbox Route106_Text_296493, 6 + msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE523:: @ 81EE523 trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553 - msgbox Route106_Text_296588, 6 + msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE end Route106_Text_1EE53A: @ 81EE53A diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 2c8364592..4762fcd06 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -3,7 +3,7 @@ Route107_MapScripts:: @ 81EE594 Route107_EventScript_1EE595:: @ 81EE595 trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F - msgbox Route107_Text_29675B, 6 + msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE5AC:: @ 81EE5AC @@ -11,48 +11,48 @@ Route107_EventScript_1EE5AC:: @ 81EE5AC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route107_EventScript_1EE5F7 - msgbox Route107_Text_2967FF, 4 + msgbox Route107_Text_2967FF, MSGBOX_DEFAULT release end Route107_EventScript_1EE5D8:: @ 81EE5D8 special sub_80B4808 waitmovement 0 - msgbox Route107_Text_29685A, 4 + msgbox Route107_Text_29685A, MSGBOX_DEFAULT setvar VAR_0x8004, 155 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 155 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route107_EventScript_1EE5F7:: @ 81EE5F7 trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5 - msgbox Route107_Text_296923, 6 + msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE60E:: @ 81EE60E trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E - msgbox Route107_Text_2969AB, 6 + msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE625:: @ 81EE625 trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17 - msgbox Route107_Text_296A35, 6 + msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE63C:: @ 81EE63C trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E - msgbox Route107_Text_296ADC, 6 + msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE657:: @ 81EE657 trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 - msgbox Route107_Text_296BE1, 6 + msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE672:: @ 81EE672 trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD - msgbox Route107_Text_296CC0, 6 + msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 25657c5a4..c5c1dbccb 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -3,27 +3,27 @@ Route108_MapScripts:: @ 81EE689 Route108_EventScript_1EE68A:: @ 81EE68A trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C - msgbox Route108_Text_296D6E, 6 + msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6A1:: @ 81EE6A1 trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA - msgbox Route108_Text_296E03, 6 + msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6B8:: @ 81EE6B8 trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71 - msgbox Route108_Text_296E7A, 6 + msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6CF:: @ 81EE6CF trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC - msgbox Route108_Text_296F2A, 6 + msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6E6:: @ 81EE6E6 trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7 - msgbox Route108_Text_2970F0, 6 + msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6FD:: @ 81EE6FD @@ -31,23 +31,23 @@ Route108_EventScript_1EE6FD:: @ 81EE6FD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route108_EventScript_1EE748 - msgbox Route108_Text_296FB0, 4 + msgbox Route108_Text_296FB0, MSGBOX_DEFAULT release end Route108_EventScript_1EE729:: @ 81EE729 special sub_80B4808 waitmovement 0 - msgbox Route108_Text_296FD8, 4 + msgbox Route108_Text_296FD8, MSGBOX_DEFAULT setvar VAR_0x8004, 740 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 740 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route108_EventScript_1EE748:: @ 81EE748 trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036 - msgbox Route108_Text_297059, 6 + msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index f87572891..dff0800ac 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -53,7 +53,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT hideobjectat 1, MAP_ROUTE109 - msgbox Route109_Text_1E9C1D, 4 + msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage copyvar VAR_0x4096, VAR_0x8008 resetobjectpriority 255, MAP_ROUTE109 @@ -279,7 +279,7 @@ Route109_EventScript_1EE910:: @ 81EE910 Route109_EventScript_1EE921:: @ 81EE921 message Route109_Text_1EEC96 - msgbox Route109_Text_1EEC96, 5 + msgbox Route109_Text_1EEC96, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route109_EventScript_1EE981 goto Route109_EventScript_1EE972 @@ -296,29 +296,29 @@ Route109_EventScript_1EE93F:: @ 81EE93F end Route109_EventScript_1EE972:: @ 81EE972 - msgbox Route109_Text_1EED06, 4 + msgbox Route109_Text_1EED06, MSGBOX_DEFAULT closemessage goto Route109_EventScript_1EE760 end Route109_EventScript_1EE981:: @ 81EE981 - msgbox Route109_Text_1EED5E, 4 + msgbox Route109_Text_1EED5E, MSGBOX_DEFAULT release end Route109_EventScript_1EE98B:: @ 81EE98B - msgbox Route109_Text_1EEE72, 4 + msgbox Route109_Text_1EEE72, MSGBOX_DEFAULT release end Route109_EventScript_1EE995:: @ 81EE995 - msgbox Route109_Text_1EEEB4, 2 + msgbox Route109_Text_1EEEB4, MSGBOX_NPC end Route109_EventScript_1EE99E:: @ 81EE99E lock faceplayer - msgbox Route109_Text_1EEFB0, 4 + msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 @@ -331,7 +331,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 special GetPlayerBigGuyGirlString checkflag FLAG_0x118 goto_eq Route109_EventScript_1EE9F2 - msgbox Route109_Text_1EEFDE, 4 + msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 goto_eq Route109_EventScript_272054 @@ -343,18 +343,18 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 end Route109_EventScript_1EE9F2:: @ 81EE9F2 - msgbox Route109_Text_1EEFF1, 4 + msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 release end Route109_EventScript_1EEA06:: @ 81EEA06 - msgbox Route109_Text_1EEF08, 2 + msgbox Route109_Text_1EEF08, MSGBOX_NPC end Route109_EventScript_1EEA0F:: @ 81EEA0F - msgbox Route109_Text_1EF080, 2 + msgbox Route109_Text_1EF080, MSGBOX_NPC end Route109_EventScript_1EEA18:: @ 81EEA18 @@ -362,37 +362,37 @@ Route109_EventScript_1EEA18:: @ 81EEA18 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox Route109_Text_1EF173, 4 + msgbox Route109_Text_1EF173, MSGBOX_DEFAULT waitmoncry release end Route109_EventScript_1EEA2B:: @ 81EEA2B - msgbox Route109_Text_1EF185, 3 + msgbox Route109_Text_1EF185, MSGBOX_SIGN end Route109_EventScript_1EEA34:: @ 81EEA34 - msgbox Route109_Text_1EF1D5, 3 + msgbox Route109_Text_1EF1D5, MSGBOX_SIGN end Route109_EventScript_1EEA3D:: @ 81EEA3D trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D - msgbox Route109_Text_297191, 6 + msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA54:: @ 81EEA54 trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD - msgbox Route109_Text_29720F, 6 + msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA6B:: @ 81EEA6B trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B - msgbox Route109_Text_29728C, 6 + msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA82:: @ 81EEA82 trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE - msgbox Route109_Text_2972ED, 6 + msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA99:: @ 81EEA99 @@ -400,24 +400,24 @@ Route109_EventScript_1EEA99:: @ 81EEA99 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEAE4 - msgbox Route109_Text_297380, 4 + msgbox Route109_Text_297380, MSGBOX_DEFAULT release end Route109_EventScript_1EEAC5:: @ 81EEAC5 special sub_80B4808 waitmovement 0 - msgbox Route109_Text_2973C1, 4 + msgbox Route109_Text_2973C1, MSGBOX_DEFAULT setvar VAR_0x8004, 64 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 64 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route109_EventScript_1EEAE4:: @ 81EEAE4 trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437 - msgbox Route109_Text_297458, 6 + msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEAFB:: @ 81EEAFB @@ -425,64 +425,64 @@ Route109_EventScript_1EEAFB:: @ 81EEAFB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEB46 - msgbox Route109_Text_2974D6, 4 + msgbox Route109_Text_2974D6, MSGBOX_DEFAULT release end Route109_EventScript_1EEB27:: @ 81EEB27 special sub_80B4808 waitmovement 0 - msgbox Route109_Text_297520, 4 + msgbox Route109_Text_297520, MSGBOX_DEFAULT setvar VAR_0x8004, 57 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 57 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route109_EventScript_1EEB46:: @ 81EEB46 trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576 - msgbox Route109_Text_29757D, 6 + msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB5D:: @ 81EEB5D trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601 - msgbox Route109_Text_29762A, 6 + msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB74:: @ 81EEB74 trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691 - msgbox Route109_Text_2976A4, 6 + msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB8B:: @ 81EEB8B trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC - msgbox Route109_Text_297715, 6 + msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBA2:: @ 81EEBA2 trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D - msgbox Route109_Text_2977C7, 6 + msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBBD:: @ 81EEBBD trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E - msgbox Route109_Text_2978F1, 6 + msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBD8:: @ 81EEBD8 trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE - msgbox Route109_Text_2979BF, 6 + msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBEF:: @ 81EEBEF trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15 - msgbox Route109_Text_297A40, 6 + msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEC06:: @ 81EEC06 trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7 - msgbox Route109_Text_297AE5, 6 + msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE end DewfordTown_Text_1EEC1D: @ 81EEC1D diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index cb617e2f9..2836a4acf 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -15,18 +15,18 @@ Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE goto_eq Route109_SeashoreHouse_EventScript_269432 checkflag FLAG_TEMP_2 goto_eq Route109_SeashoreHouse_EventScript_269428 - msgbox Route109_SeashoreHouse_Text_269555, 4 + msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end Route109_SeashoreHouse_EventScript_269428:: @ 8269428 - msgbox Route109_SeashoreHouse_Text_269635, 4 + msgbox Route109_SeashoreHouse_Text_269635, MSGBOX_DEFAULT release end Route109_SeashoreHouse_EventScript_269432:: @ 8269432 - msgbox Route109_SeashoreHouse_Text_269685, 4 + msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT giveitem_std ITEM_SODA_POP, 6 compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_269456 @@ -35,16 +35,16 @@ Route109_SeashoreHouse_EventScript_269432:: @ 8269432 end Route109_SeashoreHouse_EventScript_269456:: @ 8269456 - msgbox Route109_SeashoreHouse_Text_26973A, 4 + msgbox Route109_SeashoreHouse_Text_26973A, MSGBOX_DEFAULT release end Route109_SeashoreHouse_EventScript_269460:: @ 8269460 showmoneybox 0, 0, 0 - msgbox Route109_SeashoreHouse_Text_26977E, 5 + msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route109_SeashoreHouse_EventScript_269484 - msgbox Route109_SeashoreHouse_Text_2697EF, 4 + msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT hidemoneybox nop nop @@ -58,7 +58,7 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484 checkitemspace ITEM_SODA_POP, 1 compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_2694D5 - msgbox Route109_SeashoreHouse_Text_2697C8, 4 + msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT takemoney 0x12c, 0 updatemoneybox 0, 0 nop @@ -70,7 +70,7 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484 end Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 - msgbox Route109_SeashoreHouse_Text_2697D5, 4 + msgbox Route109_SeashoreHouse_Text_2697D5, MSGBOX_DEFAULT hidemoneybox nop nop @@ -78,7 +78,7 @@ Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 end Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT hidemoneybox nop nop @@ -87,17 +87,17 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_26989D, 6 + msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_269953, 6 + msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_269518:: @ 8269518 trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_2699DF, 6 + msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_269533:: @ 8269533 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index fe07de8dc..3652f7685 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -31,7 +31,7 @@ Route110_EventScript_1EF2A1:: @ 81EF2A1 Route110_EventScript_1EF2AA:: @ 81EF2AA lock faceplayer - msgbox Route110_Text_1EFB5D, 4 + msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -40,7 +40,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA Route110_EventScript_1EF2C0:: @ 81EF2C0 lock faceplayer - msgbox Route110_Text_1EFB93, 4 + msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -49,7 +49,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0 Route110_EventScript_1EF2D6:: @ 81EF2D6 lock faceplayer - msgbox Route110_Text_1EFBCA, 4 + msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -58,74 +58,74 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6 Route110_EventScript_1EF2EC:: @ 81EF2EC lock faceplayer - msgbox Route110_Text_1EFC0D, 4 + msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release end Route110_EventScript_1EF302:: @ 81EF302 - msgbox Route110_Text_1EFFC3, 2 + msgbox Route110_Text_1EFFC3, MSGBOX_NPC end Route110_EventScript_1EF30B:: @ 81EF30B - msgbox Route110_Text_1F0006, 2 + msgbox Route110_Text_1F0006, MSGBOX_NPC end Route110_EventScript_1EF314:: @ 81EF314 - msgbox Route110_Text_1F006A, 2 + msgbox Route110_Text_1F006A, MSGBOX_NPC end Route110_EventScript_1EF31D:: @ 81EF31D - msgbox Route110_Text_1F0261, 2 + msgbox Route110_Text_1F0261, MSGBOX_NPC end Route110_EventScript_1EF326:: @ 81EF326 - msgbox Route110_Text_1F02CA, 2 + msgbox Route110_Text_1F02CA, MSGBOX_NPC end Route110_EventScript_1EF32F:: @ 81EF32F - msgbox Route110_Text_1F030E, 2 + msgbox Route110_Text_1F030E, MSGBOX_NPC end Route110_EventScript_1EF338:: @ 81EF338 - msgbox Route110_Text_1F0390, 2 + msgbox Route110_Text_1F0390, MSGBOX_NPC end Route110_EventScript_1EF341:: @ 81EF341 - msgbox Route110_Text_1F0812, 3 + msgbox Route110_Text_1F0812, MSGBOX_SIGN end Route110_EventScript_1EF34A:: @ 81EF34A - msgbox Route110_Text_1F082D, 3 + msgbox Route110_Text_1F082D, MSGBOX_SIGN end Route110_EventScript_1EF353:: @ 81EF353 - msgbox Route110_Text_1F0842, 3 + msgbox Route110_Text_1F0842, MSGBOX_SIGN end Route110_EventScript_1EF35C:: @ 81EF35C - msgbox Route110_Text_1F08CD, 3 + msgbox Route110_Text_1F08CD, MSGBOX_SIGN end Route110_EventScript_1EF365:: @ 81EF365 - msgbox Route110_Text_1F08E3, 3 + msgbox Route110_Text_1F08E3, MSGBOX_SIGN end Route110_EventScript_1EF36E:: @ 81EF36E - msgbox Route110_Text_1F08F3, 3 + msgbox Route110_Text_1F08F3, MSGBOX_SIGN end Route110_EventScript_1EF377:: @ 81EF377 - msgbox Route110_Text_1F090D, 3 + msgbox Route110_Text_1F090D, MSGBOX_SIGN end Route110_EventScript_1EF380:: @ 81EF380 - msgbox Route110_Text_1F0992, 3 + msgbox Route110_Text_1F0992, MSGBOX_SIGN end Route110_EventScript_1EF389:: @ 81EF389 - msgbox Route110_Text_1F09DB, 3 + msgbox Route110_Text_1F09DB, MSGBOX_SIGN end Route110_EventScript_1EF392:: @ 81EF392 @@ -133,12 +133,12 @@ Route110_EventScript_1EF392:: @ 81EF392 specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD - msgbox Route110_Text_1F0A1E, 4 + msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT releaseall end Route110_EventScript_1EF3AD:: @ 81EF3AD - msgbox Route110_Text_1F0A5E, 4 + msgbox Route110_Text_1F0A5E, MSGBOX_DEFAULT releaseall end @@ -150,28 +150,28 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7 goto_eq Route110_EventScript_1EF3E8 compare VAR_CYCLING_CHALLENGE_STATE, 0 goto_eq Route110_EventScript_1EF3DE - msgbox Route110_Text_1F06FB, 4 + msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT release end Route110_EventScript_1EF3DE:: @ 81EF3DE - msgbox Route110_Text_1F0661, 4 + msgbox Route110_Text_1F0661, MSGBOX_DEFAULT release end Route110_EventScript_1EF3E8:: @ 81EF3E8 - msgbox Route110_Text_1F0755, 4 + msgbox Route110_Text_1F0755, MSGBOX_DEFAULT release end Route110_EventScript_1EF3F2:: @ 81EF3F2 trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064 - msgbox Route110_Text_29808A, 6 + msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF409:: @ 81EF409 trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5 - msgbox Route110_Text_2980F8, 6 + msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF420:: @ 81EF420 @@ -179,39 +179,39 @@ Route110_EventScript_1EF420:: @ 81EF420 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF46B - msgbox Route110_Text_2981B3, 4 + msgbox Route110_Text_2981B3, MSGBOX_DEFAULT release end Route110_EventScript_1EF44C:: @ 81EF44C special sub_80B4808 waitmovement 0 - msgbox Route110_Text_298201, 4 + msgbox Route110_Text_298201, MSGBOX_DEFAULT setvar VAR_0x8004, 512 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 512 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route110_EventScript_1EF46B:: @ 81EF46B trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288 - msgbox Route110_Text_2982A2, 6 + msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF482:: @ 81EF482 trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5 - msgbox Route110_Text_298303, 6 + msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF499:: @ 81EF499 trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77 - msgbox Route110_Text_297B8F, 6 + msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4B0:: @ 81EF4B0 trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F - msgbox Route110_Text_297C1F, 6 + msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4C7:: @ 81EF4C7 @@ -219,29 +219,29 @@ Route110_EventScript_1EF4C7:: @ 81EF4C7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF512 - msgbox Route110_Text_297CB4, 4 + msgbox Route110_Text_297CB4, MSGBOX_DEFAULT release end Route110_EventScript_1EF4F3:: @ 81EF4F3 special sub_80B4808 waitmovement 0 - msgbox Route110_Text_297CFE, 4 + msgbox Route110_Text_297CFE, MSGBOX_DEFAULT setvar VAR_0x8004, 353 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 353 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route110_EventScript_1EF512:: @ 81EF512 trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E - msgbox Route110_Text_297DB0, 6 + msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF529:: @ 81EF529 trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0 - msgbox Route110_Text_297FF1, 6 + msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF540:: @ 81EF540 @@ -249,24 +249,24 @@ Route110_EventScript_1EF540:: @ 81EF540 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF58B - msgbox Route110_Text_297E88, 4 + msgbox Route110_Text_297E88, MSGBOX_DEFAULT release end Route110_EventScript_1EF56C:: @ 81EF56C special sub_80B4808 waitmovement 0 - msgbox Route110_Text_297ECD, 4 + msgbox Route110_Text_297ECD, MSGBOX_DEFAULT setvar VAR_0x8004, 358 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 358 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route110_EventScript_1EF58B:: @ 81EF58B trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37 - msgbox Route110_Text_297F58, 6 + msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF5A2:: @ 81EF5A2 @@ -274,29 +274,29 @@ Route110_EventScript_1EF5A2:: @ 81EF5A2 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF5ED - msgbox Route110_Text_2983A2, 4 + msgbox Route110_Text_2983A2, MSGBOX_DEFAULT release end Route110_EventScript_1EF5CE:: @ 81EF5CE special sub_80B4808 waitmovement 0 - msgbox Route110_Text_2983EE, 4 + msgbox Route110_Text_2983EE, MSGBOX_DEFAULT setvar VAR_0x8004, 302 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 302 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route110_EventScript_1EF5ED:: @ 81EF5ED trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF - msgbox Route110_Text_2984C8, 6 + msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF604:: @ 81EF604 trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559 - msgbox Route110_Text_298579, 6 + msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF61B:: @ 81EF61B @@ -304,17 +304,17 @@ Route110_EventScript_1EF61B:: @ 81EF61B Route110_EventScript_1EF61C:: @ 81EF61C trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735 - msgbox Route110_Text_298755, 6 + msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF633:: @ 81EF633 trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686 - msgbox Route110_Text_2986A9, 6 + msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF64A:: @ 81EF64A trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9 - msgbox Route110_Text_298612, 6 + msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF661:: @ 81EF661 @@ -327,7 +327,7 @@ Route110_EventScript_1EF661:: @ 81EF661 Route110_EventScript_1EF673:: @ 81EF673 special FinishCyclingRoadChallenge - msgbox Route110_Text_1F03FF, 4 + msgbox Route110_Text_1F03FF, MSGBOX_DEFAULT switch VAR_RESULT case 10, Route110_EventScript_1EF6FD case 9, Route110_EventScript_1EF70B @@ -343,27 +343,27 @@ Route110_EventScript_1EF673:: @ 81EF673 end Route110_EventScript_1EF6FD:: @ 81EF6FD - msgbox Route110_Text_1F0431, 4 + msgbox Route110_Text_1F0431, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF70B:: @ 81EF70B - msgbox Route110_Text_1F04A4, 4 + msgbox Route110_Text_1F04A4, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF719:: @ 81EF719 - msgbox Route110_Text_1F0500, 4 + msgbox Route110_Text_1F0500, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF727:: @ 81EF727 - msgbox Route110_Text_1F0567, 4 + msgbox Route110_Text_1F0567, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF735:: @ 81EF735 - msgbox Route110_Text_1F05CE, 4 + msgbox Route110_Text_1F05CE, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end @@ -425,7 +425,7 @@ Route110_EventScript_1EF7E6:: @ 81EF7E6 return Route110_EventScript_1EF7EB:: @ 81EF7EB - msgbox Route110_Text_1EFC48, 4 + msgbox Route110_Text_1EFC48, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route110_EventScript_1EF81A case 1, Route110_EventScript_1EF82A @@ -448,14 +448,14 @@ Route110_EventScript_1EF83A:: @ 81EF83A end Route110_EventScript_1EF84A:: @ 81EF84A - msgbox Route110_Text_1EFCF1, 4 + msgbox Route110_Text_1EFCF1, MSGBOX_DEFAULT call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFD58, 4 + msgbox Route110_Text_1EFD58, MSGBOX_DEFAULT goto Route110_EventScript_1EF8EC end Route110_EventScript_1EF865:: @ 81EF865 - msgbox Route110_Text_1EFE3F, 4 + msgbox Route110_Text_1EFE3F, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route110_EventScript_1EF894 case 1, Route110_EventScript_1EF8A4 @@ -478,9 +478,9 @@ Route110_EventScript_1EF8B4:: @ 81EF8B4 end Route110_EventScript_1EF8C4:: @ 81EF8C4 - msgbox Route110_Text_1EFECD, 4 + msgbox Route110_Text_1EFECD, MSGBOX_DEFAULT call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFF1C, 4 + msgbox Route110_Text_1EFF1C, MSGBOX_DEFAULT goto Route110_EventScript_1EF8EC end @@ -640,7 +640,7 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 call_if 1, Route110_EventScript_1EFAEE compare VAR_0x8008, 4 call_if 1, Route110_EventScript_1EFAF9 - msgbox Route110_Text_1F0AB5, 4 + msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 applymovement 36, Route110_Movement_2725A4 @@ -652,16 +652,16 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_2725AA waitmovement 0 delay 30 - msgbox Route110_Text_1F0AFF, 4 + msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route110_Text_1F0C0C, 4 + msgbox Route110_Text_1F0C0C, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x119 - msgbox Route110_Text_1F0C33, 4 + msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EFB04 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index cbb5070a2..571cda664 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -4,7 +4,7 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77 Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78 lock faceplayer - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, 4 + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, MSGBOX_DEFAULT release end @@ -19,7 +19,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, 4 + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, MSGBOX_DEFAULT closemessage applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 waitmovement 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index b38bbf896..7bec38fa6 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -16,7 +16,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 lock faceplayer - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, 4 + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 return Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, 4 + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, MSGBOX_DEFAULT closemessage applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 waitmovement 0 diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 4e15ddbe7..8d6da9a8c 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -43,7 +43,7 @@ Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 lock faceplayer - msgbox Route110_TrickHouseEnd_Text_26B08D, 4 + msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 switch VAR_0x4044 case 0, Route110_TrickHouseEnd_EventScript_26AD84 @@ -57,98 +57,98 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 end Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 - msgbox Route110_TrickHouseEnd_Text_26B0BC, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 - msgbox Route110_TrickHouseEnd_Text_26B13B, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC - msgbox Route110_TrickHouseEnd_Text_26B1AD, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 - msgbox Route110_TrickHouseEnd_Text_26B223, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 - msgbox Route110_TrickHouseEnd_Text_26B293, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_TM12 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 - msgbox Route110_TrickHouseEnd_Text_26B315, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_MAGNET compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC - msgbox Route110_TrickHouseEnd_Text_26B365, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 - msgbox Route110_TrickHouseEnd_Text_26B3AB, 4 + msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_26B015 @@ -159,17 +159,17 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 compare VAR_FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_26B036 delay 30 - msgbox Route110_TrickHouseEnd_Text_26B3FA, 4 + msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEnd_Movement_27259E waitmovement 0 delay 30 - msgbox Route110_TrickHouseEnd_Text_26B485, 4 + msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 - msgbox Route110_TrickHouseEnd_Text_26B69A, 4 + msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT call Route110_TrickHouseEnd_EventScript_26AFCF special ResetTrickHouseEndRoomFlag release @@ -201,13 +201,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF call Route110_TrickHouseEnd_EventScript_27205E - msgbox Route110_TrickHouseEnd_Text_26B760, 4 + msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 call Route110_TrickHouseEnd_EventScript_272071 - msgbox Route110_TrickHouseEnd_Text_26B615, 4 + msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return @@ -243,7 +243,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 playse SE_W153 applymovement 255, Route110_TrickHouseEnd_Movement_2725AA waitmovement 0 - msgbox Route110_TrickHouseEnd_Text_26B8BD, 4 + msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage applymovement 255, Route110_TrickHouseEnd_Movement_26B089 waitmovement 0 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 859a28d6a..e82c052fc 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -214,7 +214,7 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 delay 20 compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 - msgbox Route110_TrickHouseEntrance_Text_26A78C, 4 + msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT closemessage delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 @@ -271,35 +271,35 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E end Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE - msgbox Route110_TrickHouseEntrance_Text_26A48A, 4 + msgbox Route110_TrickHouseEntrance_Text_26A48A, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7 - msgbox Route110_TrickHouseEntrance_Text_26A4DA, 4 + msgbox Route110_TrickHouseEntrance_Text_26A4DA, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00 - msgbox Route110_TrickHouseEntrance_Text_26A529, 4 + msgbox Route110_TrickHouseEntrance_Text_26A529, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09 - msgbox Route110_TrickHouseEntrance_Text_26A577, 4 + msgbox Route110_TrickHouseEntrance_Text_26A577, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12 - msgbox Route110_TrickHouseEntrance_Text_26A5C8, 4 + msgbox Route110_TrickHouseEntrance_Text_26A5C8, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B - msgbox Route110_TrickHouseEntrance_Text_26A616, 4 + msgbox Route110_TrickHouseEntrance_Text_26A616, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24 - msgbox Route110_TrickHouseEntrance_Text_26A665, 4 + msgbox Route110_TrickHouseEntrance_Text_26A665, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D - msgbox Route110_TrickHouseEntrance_Text_26A6B6, 4 + msgbox Route110_TrickHouseEntrance_Text_26A6B6, MSGBOX_DEFAULT return Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 @@ -327,11 +327,11 @@ Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F step_end Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 - msgbox Route110_TrickHouseEntrance_Text_26A709, 4 + msgbox Route110_TrickHouseEntrance_Text_26A709, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 - msgbox Route110_TrickHouseEntrance_Text_26A921, 4 + msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 @@ -340,7 +340,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26A9AF, 4 + msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 waitmovement 0 releaseall @@ -349,7 +349,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AA82, 4 + msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269EEF compare VAR_0x4044, 2 @@ -372,7 +372,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -382,7 +382,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -392,7 +392,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -402,7 +402,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -412,7 +412,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -422,7 +422,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -432,7 +432,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -447,13 +447,13 @@ Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_272071 - msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4 + msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end @@ -472,7 +472,7 @@ Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092 return Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A - msgbox Route110_TrickHouseEntrance_Text_26ABAE, 4 + msgbox Route110_TrickHouseEntrance_Text_26ABAE, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_26D632 waitmovement 0 @@ -497,12 +497,12 @@ Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 end Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 - msgbox Route110_TrickHouseEntrance_Text_26A878, 4 + msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 - msgbox Route110_TrickHouseEntrance_Text_26A887, 5 + msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO closemessage compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A126 @@ -581,19 +581,19 @@ Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 end Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 + msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B compare VAR_0x4044, 8 goto_eq Route110_TrickHouseEntrance_EventScript_26A220 - msgbox Route110_TrickHouseEntrance_Text_26A878, 4 + msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 + msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT releaseall end @@ -613,7 +613,7 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 compare VAR_0x40AB, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4 + msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AB, 2 setmetatile 13, 1, 523, 0 @@ -624,7 +624,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 compare VAR_0x40AC, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4 + msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AC, 2 setmetatile 13, 1, 523, 0 @@ -635,7 +635,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB compare VAR_0x40AD, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle3_Text_26C609, 4 + msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AD, 2 setmetatile 13, 1, 523, 0 @@ -646,7 +646,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 compare VAR_0x40AE, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4 + msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AE, 2 setmetatile 13, 1, 523, 0 @@ -657,7 +657,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D compare VAR_0x40AF, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle5_Text_26D660, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AF, 2 setmetatile 13, 1, 523, 0 @@ -668,7 +668,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 compare VAR_0x40B0, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4 + msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B0, 2 setmetatile 13, 1, 523, 0 @@ -679,7 +679,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F compare VAR_0x40B1, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4 + msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B1, 2 setmetatile 13, 1, 523, 0 @@ -690,7 +690,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 compare VAR_0x40B2, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4 + msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B2, 2 setmetatile 13, 1, 523, 0 @@ -699,7 +699,7 @@ Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 end Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1 - msgbox Route110_TrickHouseEntrance_Text_26AC4F, 4 + msgbox Route110_TrickHouseEntrance_Text_26AC4F, MSGBOX_DEFAULT releaseall end @@ -711,7 +711,7 @@ Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB - msgbox Route110_TrickHousePuzzle1_Text_26AC2F, 4 + msgbox Route110_TrickHousePuzzle1_Text_26AC2F, MSGBOX_DEFAULT releaseall end @@ -726,13 +726,13 @@ Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5 playfanfare MUS_FANFA4 message Route110_TrickHousePuzzle1_Text_26ABE8 waitfanfare - msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4 + msgbox Route110_TrickHousePuzzle1_Text_26ABFB, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 lockall - msgbox Route110_TrickHouseEntrance_Text_26A474, 4 + msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT releaseall compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 340a7e03c..519db7c32 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -25,17 +25,17 @@ Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948 trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F - msgbox Route110_TrickHousePuzzle1_Text_26BA57, 6 + msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 - msgbox Route110_TrickHousePuzzle1_Text_26BAC3, 6 + msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976 trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E - msgbox Route110_TrickHousePuzzle1_Text_26BB52, 6 + msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index b724b986d..313f2512a 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -91,17 +91,17 @@ Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62 Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75 trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 - msgbox Route110_TrickHousePuzzle2_Text_26BD70, 6 + msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF - msgbox Route110_TrickHousePuzzle2_Text_26BDEC, 6 + msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3 trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 - msgbox Route110_TrickHousePuzzle2_Text_26BE97, 6 + msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 9956f9889..00b4a7923 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -303,17 +303,17 @@ Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4 trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D - msgbox Route110_TrickHousePuzzle3_Text_26C6E6, 6 + msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 - msgbox Route110_TrickHousePuzzle3_Text_26C776, 6 + msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2 trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC - msgbox Route110_TrickHousePuzzle3_Text_26C80C, 6 + msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_Text_26C609: @ 826C609 diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 56b4b02fb..a2c811bc4 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -15,17 +15,17 @@ Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E - msgbox Route110_TrickHousePuzzle4_Text_26C9A2, 6 + msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895 trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 - msgbox Route110_TrickHousePuzzle4_Text_26CA53, 6 + msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC trainerbattle 0, TRAINER_PAULA, 0, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB - msgbox Route110_TrickHousePuzzle4_Text_26CAD1, 6 + msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 5afce1c88..96c727dc0 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -227,7 +227,7 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D6CE, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26CF45 @@ -253,7 +253,7 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 compare VAR_TEMP_9, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC - msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8EA, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE @@ -277,7 +277,7 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DA1E, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D017 @@ -301,7 +301,7 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DB4C, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D080 @@ -317,7 +317,7 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26DC78, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9 @@ -326,7 +326,7 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 end Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 - msgbox Route110_TrickHousePuzzle5_Text_26D757, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D757, MSGBOX_DEFAULT multichoice 0, 0, 25, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -334,7 +334,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 end Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 - msgbox Route110_TrickHousePuzzle5_Text_26D7AA, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D7AA, MSGBOX_DEFAULT multichoice 0, 0, 26, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -342,7 +342,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 end Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B - msgbox Route110_TrickHousePuzzle5_Text_26D7FC, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D7FC, MSGBOX_DEFAULT multichoice 0, 0, 27, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -350,7 +350,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B end Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE - msgbox Route110_TrickHousePuzzle5_Text_26D940, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D940, MSGBOX_DEFAULT multichoice 0, 0, 28, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -358,7 +358,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE end Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 - msgbox Route110_TrickHousePuzzle5_Text_26D98C, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D98C, MSGBOX_DEFAULT multichoice 0, 0, 29, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -366,7 +366,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 end Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 - msgbox Route110_TrickHousePuzzle5_Text_26D9CE, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D9CE, MSGBOX_DEFAULT multichoice 0, 0, 30, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -374,7 +374,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 end Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 - msgbox Route110_TrickHousePuzzle5_Text_26DA64, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DA64, MSGBOX_DEFAULT multichoice 0, 0, 31, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -382,7 +382,7 @@ Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 end Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A - msgbox Route110_TrickHousePuzzle5_Text_26DAAD, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DAAD, MSGBOX_DEFAULT multichoice 0, 0, 32, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -390,7 +390,7 @@ Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A end Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D - msgbox Route110_TrickHousePuzzle5_Text_26DAFF, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DAFF, MSGBOX_DEFAULT multichoice 0, 0, 33, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -398,7 +398,7 @@ Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D end Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 - msgbox Route110_TrickHousePuzzle5_Text_26DB94, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DB94, MSGBOX_DEFAULT multichoice 0, 0, 34, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -406,7 +406,7 @@ Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 end Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 - msgbox Route110_TrickHousePuzzle5_Text_26DBD7, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DBD7, MSGBOX_DEFAULT multichoice 0, 0, 35, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -414,7 +414,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 end Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 - msgbox Route110_TrickHousePuzzle5_Text_26DC2A, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DC2A, MSGBOX_DEFAULT multichoice 0, 0, 36, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -422,7 +422,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 end Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 - msgbox Route110_TrickHousePuzzle5_Text_26DCCB, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DCCB, MSGBOX_DEFAULT multichoice 0, 0, 37, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -430,7 +430,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 end Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C - msgbox Route110_TrickHousePuzzle5_Text_26DD1B, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DD1B, MSGBOX_DEFAULT multichoice 0, 0, 38, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -438,7 +438,7 @@ Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C end Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F - msgbox Route110_TrickHousePuzzle5_Text_26DD5F, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DD5F, MSGBOX_DEFAULT multichoice 0, 0, 39, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -448,15 +448,15 @@ Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 waitse playse SE_HAZURE - msgbox Route110_TrickHousePuzzle5_Text_26D883, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D883, MSGBOX_DEFAULT applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632 - msgbox Route110_TrickHousePuzzle5_Text_26D8A1, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8A1, MSGBOX_DEFAULT waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8C9, MSGBOX_DEFAULT closemessage warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate @@ -470,7 +470,7 @@ Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0 end Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA - msgbox Route110_TrickHousePuzzle5_Text_26D84D, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D84D, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 0f20aac1f..9ff8c9412 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -29,17 +29,17 @@ Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1 trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 - msgbox Route110_TrickHousePuzzle6_Text_26DEF3, 6 + msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8 trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D - msgbox Route110_TrickHousePuzzle6_Text_26DFA0, 6 + msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 - msgbox Route110_TrickHousePuzzle6_Text_26E048, 6 + msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index fdf734423..3bb1f2495 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -305,32 +305,32 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 - msgbox Route110_TrickHousePuzzle7_Text_26E4F4, 6 + msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0 trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 - msgbox Route110_TrickHousePuzzle7_Text_26E57F, 6 + msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7 trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 - msgbox Route110_TrickHousePuzzle7_Text_26E61E, 6 + msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C - msgbox Route110_TrickHousePuzzle7_Text_26E6BC, 6 + msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5 trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 - msgbox Route110_TrickHousePuzzle7_Text_26E722, 6 + msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB - msgbox Route110_TrickHousePuzzle7_Text_26E7C4, 6 + msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413 diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 369bc59a7..a6a698a40 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -15,17 +15,17 @@ Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 - msgbox Route110_TrickHousePuzzle8_Text_26E918, 6 + msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836 trainerbattle 0, TRAINER_KEIRA, 0, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F - msgbox Route110_TrickHousePuzzle8_Text_26E99F, 6 + msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 - msgbox Route110_TrickHousePuzzle8_Text_26EA3F, 6 + msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index b339ee5de..c7b5457d0 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -140,12 +140,12 @@ Route111_EventScript_1F0E60:: @ 81F0E60 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL checkflag FLAG_0x150 goto_eq Route111_EventScript_1F0EA7 - msgbox Route111_Text_1F1C74, 4 + msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end Route111_EventScript_1F0EA7:: @ 81F0EA7 - msgbox Route111_Text_1F1C9F, 4 + msgbox Route111_Text_1F1C9F, MSGBOX_DEFAULT releaseall end @@ -165,18 +165,18 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 dodailyevents checkflag FLAG_0x92C goto_eq Route111_EventScript_1F0EF4 - msgbox Route111_Text_2A6EBD, 4 + msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C special GetPlayerBigGuyGirlString - msgbox Route111_Text_2A6F3D, 4 + msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT release end Route111_EventScript_1F0EF4:: @ 81F0EF4 - msgbox Route111_Text_2A6F9A, 4 + msgbox Route111_Text_2A6F9A, MSGBOX_DEFAULT release end @@ -213,7 +213,7 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E end Route111_EventScript_1F0F45:: @ 81F0F45 - msgbox gUnknown_08272C5F, 4 + msgbox gUnknown_08272C5F, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 call_if 1, Route111_EventScript_1F0F7C @@ -279,20 +279,20 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_1F1475, 5 + msgbox Route111_Text_1F1475, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0FE7 - msgbox Route111_Text_1F14F5, 4 + msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT release end Route111_EventScript_1F0FE7:: @ 81F0FE7 - msgbox Route111_Text_1F1523, 4 + msgbox Route111_Text_1F1523, MSGBOX_DEFAULT trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542 applymovement 1, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F156F, 4 + msgbox Route111_Text_1F156F, MSGBOX_DEFAULT closemessage applymovement 1, Route111_Movement_1F114A waitmovement 0 @@ -305,12 +305,12 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 2, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F159D, 4 + msgbox Route111_Text_1F159D, MSGBOX_DEFAULT trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616 applymovement 2, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F1645, 4 + msgbox Route111_Text_1F1645, MSGBOX_DEFAULT closemessage applymovement 2, Route111_Movement_1F114A waitmovement 0 @@ -323,12 +323,12 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 3, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F167E, 4 + msgbox Route111_Text_1F167E, MSGBOX_DEFAULT trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6 applymovement 3, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F16DC, 4 + msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT closemessage applymovement 3, Route111_Movement_1F114A waitmovement 0 @@ -341,9 +341,9 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 4, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F16FB, 4 + msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756 - msgbox Route111_Text_1F1788, 4 + msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage applymovement 4, Route111_Movement_2725A6 waitmovement 0 @@ -381,35 +381,35 @@ Route111_Movement_1F114F: @ 81F114F step_end Route111_EventScript_1F1153:: @ 81F1153 - msgbox Route111_Text_1F18CE, 3 + msgbox Route111_Text_1F18CE, MSGBOX_SIGN end Route111_EventScript_1F115C:: @ 81F115C - msgbox Route111_Text_1F18E8, 3 + msgbox Route111_Text_1F18E8, MSGBOX_SIGN end Route111_EventScript_1F1165:: @ 81F1165 - msgbox Route111_Text_1F1921, 3 + msgbox Route111_Text_1F1921, MSGBOX_SIGN end Route111_EventScript_1F116E:: @ 81F116E - msgbox Route111_Text_1F1937, 3 + msgbox Route111_Text_1F1937, MSGBOX_SIGN end Route111_EventScript_1F1177:: @ 81F1177 - msgbox Route111_Text_1F194D, 3 + msgbox Route111_Text_1F194D, MSGBOX_SIGN end Route111_EventScript_1F1180:: @ 81F1180 - msgbox Route111_Text_1F1987, 3 + msgbox Route111_Text_1F1987, MSGBOX_SIGN end Route111_EventScript_1F1189:: @ 81F1189 - msgbox Route111_Text_1F17BA, 2 + msgbox Route111_Text_1F17BA, MSGBOX_NPC end Route111_EventScript_1F1192:: @ 81F1192 - msgbox Route111_Text_1F186E, 2 + msgbox Route111_Text_1F186E, MSGBOX_NPC end Route111_EventScript_1F119B:: @ 81F119B @@ -421,22 +421,22 @@ Route111_EventScript_1F119B:: @ 81F119B goto_eq Route111_EventScript_1F11D0 checkflag FLAG_0x14E goto_eq Route111_EventScript_1F11DA - msgbox Route111_Text_1F1A22, 4 + msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT release end Route111_EventScript_1F11C6:: @ 81F11C6 - msgbox Route111_Text_1F1C12, 4 + msgbox Route111_Text_1F1C12, MSGBOX_DEFAULT release end Route111_EventScript_1F11D0:: @ 81F11D0 - msgbox Route111_Text_1F1B92, 4 + msgbox Route111_Text_1F1B92, MSGBOX_DEFAULT release end Route111_EventScript_1F11DA:: @ 81F11DA - msgbox Route111_Text_1F1AC7, 4 + msgbox Route111_Text_1F1AC7, MSGBOX_DEFAULT release end @@ -444,7 +444,7 @@ Route111_EventScript_1F11E4:: @ 81F11E4 lockall applymovement 46, Route111_Movement_27259E waitmovement 0 - msgbox Route111_Text_1F1CCA, 4 + msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT closemessage applymovement 46, Route111_Movement_2725A2 waitmovement 0 @@ -453,22 +453,22 @@ Route111_EventScript_1F11E4:: @ 81F11E4 Route111_EventScript_1F1204:: @ 81F1204 trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A - msgbox Route111_Text_298853, 6 + msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE end Route111_EventScript_1F121B:: @ 81F121B trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908 - msgbox Route111_Text_29891B, 6 + msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1232:: @ 81F1232 trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6 - msgbox Route111_Text_298A03, 6 + msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1249:: @ 81F1249 trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF - msgbox Route111_Text_298AC0, 6 + msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1260:: @ 81F1260 @@ -476,39 +476,39 @@ Route111_EventScript_1F1260:: @ 81F1260 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB - msgbox Route111_Text_298B9A, 4 + msgbox Route111_Text_298B9A, MSGBOX_DEFAULT release end Route111_EventScript_1F128C:: @ 81F128C special sub_80B4808 waitmovement 0 - msgbox Route111_Text_298C00, 4 + msgbox Route111_Text_298C00, MSGBOX_DEFAULT setvar VAR_0x8004, 44 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 44 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route111_EventScript_1F12AB:: @ 81F12AB trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2 - msgbox Route111_Text_298D0C, 6 + msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12C2:: @ 81F12C2 trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8 - msgbox Route111_Text_298DF1, 6 + msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12D9:: @ 81F12D9 trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E - msgbox Route111_Text_298E8C, 6 + msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12F0:: @ 81F12F0 trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14 - msgbox Route111_Text_298F26, 6 + msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1307:: @ 81F1307 @@ -516,24 +516,24 @@ Route111_EventScript_1F1307:: @ 81F1307 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 - msgbox Route111_Text_298FD4, 4 + msgbox Route111_Text_298FD4, MSGBOX_DEFAULT release end Route111_EventScript_1F1333:: @ 81F1333 special sub_80B4808 waitmovement 0 - msgbox Route111_Text_29903D, 4 + msgbox Route111_Text_29903D, MSGBOX_DEFAULT setvar VAR_0x8004, 78 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 78 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route111_EventScript_1F1352:: @ 81F1352 trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE - msgbox Route111_Text_299102, 6 + msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1369:: @ 81F1369 @@ -541,63 +541,63 @@ Route111_EventScript_1F1369:: @ 81F1369 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 - msgbox Route111_Text_2991C2, 4 + msgbox Route111_Text_2991C2, MSGBOX_DEFAULT release end Route111_EventScript_1F1395:: @ 81F1395 special sub_80B4808 waitmovement 0 - msgbox Route111_Text_29921D, 4 + msgbox Route111_Text_29921D, MSGBOX_DEFAULT setvar VAR_0x8004, 94 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 94 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route111_EventScript_1F13B4:: @ 81F13B4 trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6 - msgbox Route111_Text_2992F5, 6 + msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13CB:: @ 81F13CB trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE - msgbox Route111_Text_2996C5, 6 + msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13E2:: @ 81F13E2 trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D - msgbox Route111_Text_29975D, 6 + msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13F9:: @ 81F13F9 trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549 - msgbox Route111_Text_299576, 6 + msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1410:: @ 81F1410 trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625 - msgbox Route111_Text_29964B, 6 + msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1427:: @ 81F1427 trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384 - msgbox Route111_Text_2993A7, 6 + msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE end Route111_EventScript_1F143E:: @ 81F143E trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431 - msgbox Route111_Text_29945F, 6 + msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1455:: @ 81F1455 trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5 - msgbox Route111_Text_2994FB, 6 + msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE end Route111_EventScript_1F146C:: @ 81F146C - msgbox Route111_Text_1F1D61, 3 + msgbox Route111_Text_1F1D61, MSGBOX_SIGN end Route111_Text_1F1475: @ 81F1475 diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 015a584f4..d1dea14d3 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -9,7 +9,7 @@ Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 lock faceplayer - msgbox Route111_OldLadysRestStop_Text_22A978, 5 + msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 @@ -17,10 +17,10 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 end Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 - msgbox Route111_OldLadysRestStop_Text_22A9EC, 4 + msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT closemessage call Route111_OldLadysRestStop_EventScript_272083 - msgbox Route111_OldLadysRestStop_Text_22AA16, 5 + msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 @@ -28,7 +28,7 @@ Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 end Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E - msgbox Route111_OldLadysRestStop_Text_22AA8F, 4 + msgbox Route111_OldLadysRestStop_Text_22AA8F, MSGBOX_DEFAULT release end diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 13a897692..c1aca9b8f 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -5,7 +5,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D lock faceplayer setvar VAR_0x8008, 2 - msgbox Route111_WinstrateFamilysHouse_Text_22A539, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A539, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -15,7 +15,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 setvar VAR_0x8008, 3 checkflag FLAG_0x115 goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 @@ -24,7 +24,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 end Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -32,7 +32,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8 lock faceplayer setvar VAR_0x8008, 1 - msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -42,13 +42,13 @@ Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD setvar VAR_0x8008, 4 checkflag FLAG_TEMP_4 goto_eq Route111_WinstrateFamilysHouse_EventScript_22A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A780, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_22A52C end Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A89B, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A89B, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 4f7e20b94..d23efddd8 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -13,7 +13,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Route112_Movement_2725A8 waitmovement 0 delay 20 - msgbox Route112_Text_1F1F3F, 4 + msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage applymovement 1, Route112_Movement_2725A2 waitmovement 0 @@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Route112_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route112_Text_1F1F7A, 4 + msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage applymovement 6, Route112_Movement_2725A2 waitmovement 0 @@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Route112_Movement_2725A8 waitmovement 0 delay 20 - msgbox Route112_Text_1F1FBA, 4 + msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage applymovement 1, Route112_Movement_2725A2 waitmovement 0 @@ -37,7 +37,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Route112_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route112_Text_1F2003, 4 + msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage applymovement 6, Route112_Movement_2725A2 waitmovement 0 @@ -45,24 +45,24 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 end Route112_EventScript_1F1E46:: @ 81F1E46 - msgbox Route112_Text_1F20C1, 3 + msgbox Route112_Text_1F20C1, MSGBOX_SIGN end Route112_EventScript_1F1E4F:: @ 81F1E4F - msgbox Route112_Text_1F20ED, 3 + msgbox Route112_Text_1F20ED, MSGBOX_SIGN end Route112_EventScript_1F1E58:: @ 81F1E58 - msgbox Route112_Text_1F2138, 3 + msgbox Route112_Text_1F2138, MSGBOX_SIGN end Route112_EventScript_1F1E61:: @ 81F1E61 - msgbox Route112_Text_1F204E, 2 + msgbox Route112_Text_1F204E, MSGBOX_NPC end Route112_EventScript_1F1E6A:: @ 81F1E6A trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA - msgbox Route112_Text_2997DC, 6 + msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 @@ -70,44 +70,44 @@ Route112_EventScript_1F1E81:: @ 81F1E81 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC - msgbox Route112_Text_299896, 4 + msgbox Route112_Text_299896, MSGBOX_DEFAULT release end Route112_EventScript_1F1EAD:: @ 81F1EAD special sub_80B4808 waitmovement 0 - msgbox Route112_Text_29993C, 4 + msgbox Route112_Text_29993C, MSGBOX_DEFAULT setvar VAR_0x8004, 627 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 627 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route112_EventScript_1F1ECC:: @ 81F1ECC trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 - msgbox Route112_Text_299A0F, 6 + msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EE3:: @ 81F1EE3 trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC - msgbox Route112_Text_299AB4, 6 + msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 - msgbox Route112_Text_299B4C, 6 + msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF - msgbox Route112_Text_299BFB, 6 + msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F - msgbox Route112_Text_299CC6, 6 + msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE end Route112_Text_1F1F3F: @ 81F1F3F diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 93e8ea759..905e9e9ea 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -32,7 +32,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 lock faceplayer - msgbox Route112_CableCarStation_Text_22AB85, 5 + msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route112_CableCarStation_EventScript_22AB38 compare VAR_RESULT, 0 @@ -40,7 +40,7 @@ Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 end Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 - msgbox Route112_CableCarStation_Text_22ABC2, 4 + msgbox Route112_CableCarStation_Text_22ABC2, MSGBOX_DEFAULT closemessage applymovement 1, Route112_CableCarStation_Movement_22AB71 applymovement 255, Route112_CableCarStation_Movement_22AB7B @@ -55,7 +55,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 end Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 - msgbox Route112_CableCarStation_Text_22ABD8, 4 + msgbox Route112_CableCarStation_Text_22ABD8, MSGBOX_DEFAULT release end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index ce2c4b47d..76d4b7f1c 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -25,37 +25,37 @@ Route113_EventScript_1F2189:: @ 81F2189 return Route113_EventScript_1F218A:: @ 81F218A - msgbox Route113_Text_1F235B, 2 + msgbox Route113_Text_1F235B, MSGBOX_NPC end Route113_EventScript_1F2193:: @ 81F2193 - msgbox Route113_Text_1F23CA, 2 + msgbox Route113_Text_1F23CA, MSGBOX_NPC end Route113_EventScript_1F219C:: @ 81F219C - msgbox Route113_Text_1F2440, 3 + msgbox Route113_Text_1F2440, MSGBOX_SIGN end Route113_EventScript_1F21A5:: @ 81F21A5 - msgbox Route113_Text_1F2456, 3 + msgbox Route113_Text_1F2456, MSGBOX_SIGN end Route113_EventScript_1F21AE:: @ 81F21AE - msgbox Route113_Text_1F24F8, 3 + msgbox Route113_Text_1F24F8, MSGBOX_SIGN end Route113_EventScript_1F21B7:: @ 81F21B7 - msgbox Route113_Text_1F2471, 3 + msgbox Route113_Text_1F2471, MSGBOX_SIGN end Route113_EventScript_1F21C0:: @ 81F21C0 trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68 - msgbox Route113_Text_299D7D, 6 + msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21D7:: @ 81F21D7 trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C - msgbox Route113_Text_299E38, 6 + msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21EE:: @ 81F21EE @@ -63,24 +63,24 @@ Route113_EventScript_1F21EE:: @ 81F21EE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 - msgbox Route113_Text_299F15, 4 + msgbox Route113_Text_299F15, MSGBOX_DEFAULT release end Route113_EventScript_1F221A:: @ 81F221A special sub_80B4808 waitmovement 0 - msgbox Route113_Text_299F49, 4 + msgbox Route113_Text_299F49, MSGBOX_DEFAULT setvar VAR_0x8004, 434 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 434 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route113_EventScript_1F2239:: @ 81F2239 trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9 - msgbox Route113_Text_299FD8, 6 + msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2250:: @ 81F2250 @@ -88,59 +88,59 @@ Route113_EventScript_1F2250:: @ 81F2250 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B - msgbox Route113_Text_29A067, 4 + msgbox Route113_Text_29A067, MSGBOX_DEFAULT release end Route113_EventScript_1F227C:: @ 81F227C special sub_80B4808 waitmovement 0 - msgbox Route113_Text_29A0A2, 4 + msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT setvar VAR_0x8004, 419 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 419 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route113_EventScript_1F229B:: @ 81F229B trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F - msgbox Route113_Text_29A13A, 6 + msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22B2:: @ 81F22B2 trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6 - msgbox Route113_Text_29A219, 6 + msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22C9:: @ 81F22C9 trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F - msgbox Route113_Text_29A2DE, 6 + msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22E4:: @ 81F22E4 trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 - msgbox Route113_Text_29A3DA, 6 + msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22FF:: @ 81F22FF trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508 - msgbox Route113_Text_29A529, 6 + msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2316:: @ 81F2316 trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480 - msgbox Route113_Text_29A489, 6 + msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE end Route113_EventScript_1F232D:: @ 81F232D trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0 - msgbox Route113_Text_29A5BE, 6 + msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2344:: @ 81F2344 trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628 - msgbox Route113_Text_29A65D, 6 + msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE end Route113_Text_1F235B: @ 81F235B diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 5ea100567..7784cc79c 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -21,15 +21,15 @@ Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E goto_eq Route113_GlassWorkshop_EventScript_26ED6E compare VAR_0x40BE, 1 goto_eq Route113_GlassWorkshop_EventScript_26ED64 - msgbox Route113_GlassWorkshop_Text_26F19D, 4 + msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK setvar VAR_0x40BE, 1 - msgbox Route113_GlassWorkshop_Text_26F252, 4 + msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 - msgbox Route113_GlassWorkshop_Text_26F252, 4 + msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26ED9D - msgbox Route113_GlassWorkshop_Text_26F312, 4 + msgbox Route113_GlassWorkshop_Text_26F312, MSGBOX_DEFAULT compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 message Route113_GlassWorkshop_Text_26F40A @@ -46,7 +46,7 @@ Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E end Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D - msgbox Route113_GlassWorkshop_Text_26F772, 4 + msgbox Route113_GlassWorkshop_Text_26F772, MSGBOX_DEFAULT release end @@ -73,7 +73,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E setvar VAR_0x800A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 10 @@ -87,7 +87,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 11 @@ -101,7 +101,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 12 @@ -115,7 +115,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 13 @@ -129,7 +129,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 14 @@ -144,7 +144,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A setvar VAR_0x800A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 15 @@ -159,7 +159,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B setvar VAR_0x800A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 16 @@ -168,7 +168,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B end Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC - msgbox Route113_GlassWorkshop_Text_26F641, 4 + msgbox Route113_GlassWorkshop_Text_26F641, MSGBOX_DEFAULT release end @@ -176,7 +176,7 @@ Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6 setvar VAR_0x800A, 250 subvar VAR_0x800A, 16456 buffernumberstring 0, VAR_0x800A - msgbox Route113_GlassWorkshop_Text_26F34E, 4 + msgbox Route113_GlassWorkshop_Text_26F34E, MSGBOX_DEFAULT release end @@ -195,13 +195,13 @@ Route113_GlassWorkshop_EventScript_26F003:: @ 826F003 end Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F - msgbox Route113_GlassWorkshop_Text_26F4DA, 4 + msgbox Route113_GlassWorkshop_Text_26F4DA, MSGBOX_DEFAULT closemessage fadescreen 1 playse SE_SELECT delay 30 fadescreen 0 - msgbox Route113_GlassWorkshop_Text_26F688, 4 + msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 @@ -224,13 +224,13 @@ Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 call Route113_GlassWorkshop_EventScript_27205E - msgbox Route113_GlassWorkshop_Text_26F6B7, 4 + msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 call Route113_GlassWorkshop_EventScript_272071 - msgbox Route113_GlassWorkshop_Text_26F715, 4 + msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT release end @@ -295,7 +295,7 @@ Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B end Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F - msgbox Route113_GlassWorkshop_Text_26F688, 4 + msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 @@ -305,7 +305,7 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F end Route113_GlassWorkshop_EventScript_26F194:: @ 826F194 - msgbox Route113_GlassWorkshop_Text_26F7EC, 2 + msgbox Route113_GlassWorkshop_Text_26F7EC, MSGBOX_NPC end Route113_GlassWorkshop_Text_26F19D: @ 826F19D diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 9443d35bc..931cca4de 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -30,7 +30,7 @@ Route114_EventScript_1F2582:: @ 81F2582 dodailyevents checkflag FLAG_0x92B goto_eq Route114_EventScript_1F25C7 - msgbox Route114_Text_2A6FCB, 4 + msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 addvar VAR_RESULT, 15 addvar VAR_RESULT, 133 @@ -38,12 +38,12 @@ Route114_EventScript_1F2582:: @ 81F2582 compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x92B - msgbox Route114_Text_2A7034, 4 + msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release end Route114_EventScript_1F25C7:: @ 81F25C7 - msgbox Route114_Text_2A706E, 4 + msgbox Route114_Text_2A706E, MSGBOX_DEFAULT release end @@ -52,17 +52,17 @@ Route114_EventScript_1F25D1:: @ 81F25D1 faceplayer checkflag FLAG_0x0E7 goto_eq Route114_EventScript_1F2608 - msgbox Route114_Text_1F2809, 4 + msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x0E7 - msgbox Route114_Text_1F2872, 4 + msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release end Route114_EventScript_1F2608:: @ 81F2608 - msgbox Route114_Text_1F2872, 4 + msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release end @@ -71,41 +71,41 @@ Route114_EventScript_1F2612:: @ 81F2612 faceplayer waitse playmoncry SPECIES_POOCHYENA, 2 - msgbox Route114_Text_1F28A6, 4 + msgbox Route114_Text_1F28A6, MSGBOX_DEFAULT waitmoncry release end Route114_EventScript_1F2625:: @ 81F2625 - msgbox Route114_Text_1F28B3, 3 + msgbox Route114_Text_1F28B3, MSGBOX_SIGN end Route114_EventScript_1F262E:: @ 81F262E - msgbox Route114_Text_1F28DB, 3 + msgbox Route114_Text_1F28DB, MSGBOX_SIGN end Route114_EventScript_1F2637:: @ 81F2637 - msgbox Route114_Text_1F2910, 3 + msgbox Route114_Text_1F2910, MSGBOX_SIGN end Route114_EventScript_1F2640:: @ 81F2640 trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_29A6B1, Route114_Text_29A707 - msgbox Route114_Text_29A715, 6 + msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2657:: @ 81F2657 trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_29A777, Route114_Text_29A7B5 - msgbox Route114_Text_29A7D4, 6 + msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE end Route114_EventScript_1F266E:: @ 81F266E trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_29A818, Route114_Text_29A88F - msgbox Route114_Text_29A89F, 6 + msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2685:: @ 81F2685 trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_29A8D9, Route114_Text_29A90E - msgbox Route114_Text_29A916, 6 + msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE end Route114_EventScript_1F269C:: @ 81F269C @@ -113,24 +113,24 @@ Route114_EventScript_1F269C:: @ 81F269C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F26E7 - msgbox Route114_Text_29A981, 4 + msgbox Route114_Text_29A981, MSGBOX_DEFAULT release end Route114_EventScript_1F26C8:: @ 81F26C8 special sub_80B4808 waitmovement 0 - msgbox Route114_Text_29A9F7, 4 + msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT setvar VAR_0x8004, 143 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 143 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route114_EventScript_1F26E7:: @ 81F26E7 trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_29AA3E, Route114_Text_29AA67 - msgbox Route114_Text_29AA94, 6 + msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE end Route114_EventScript_1F26FE:: @ 81F26FE @@ -138,59 +138,59 @@ Route114_EventScript_1F26FE:: @ 81F26FE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F2749 - msgbox Route114_Text_29AB36, 4 + msgbox Route114_Text_29AB36, MSGBOX_DEFAULT release end Route114_EventScript_1F272A:: @ 81F272A special sub_80B4808 waitmovement 0 - msgbox Route114_Text_29ABA6, 4 + msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT setvar VAR_0x8004, 206 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 206 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route114_EventScript_1F2749:: @ 81F2749 trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_29ABDC, Route114_Text_29AC10 - msgbox Route114_Text_29AC43, 6 + msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2760:: @ 81F2760 trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_29ACB3, Route114_Text_29AD0A - msgbox Route114_Text_29AD2E, 6 + msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2777:: @ 81F2777 trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_29ADA1, Route114_Text_29AE05 - msgbox Route114_Text_29AE3D, 6 + msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE end Route114_EventScript_1F278E:: @ 81F278E trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D - msgbox Route114_Text_29AF0B, 6 + msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27A9:: @ 81F27A9 trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B - msgbox Route114_Text_29AFCF, 6 + msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27C4:: @ 81F27C4 trainerbattle 0, TRAINER_ANGELINA, 0, Route114_Text_29B16F, Route114_Text_29B19C - msgbox Route114_Text_29B1BC, 6 + msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27DB:: @ 81F27DB trainerbattle 0, TRAINER_CHARLOTTE, 0, Route114_Text_29B0DB, Route114_Text_29B0FB - msgbox Route114_Text_29B11A, 6 + msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27F2:: @ 81F27F2 trainerbattle 0, TRAINER_KAI, 0, Route114_Text_29B05D, Route114_Text_29B089 - msgbox Route114_Text_29B0B5, 6 + msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE end Route114_Text_1F2809: @ 81F2809 diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index f14c15f9e..eecb4fd0d 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A faceplayer checkflag FLAG_0x105 goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 - msgbox Route114_FossilManiacsHouse_Text_22AD85, 4 + msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 goto_eq Route114_FossilManiacsHouse_EventScript_272054 @@ -20,16 +20,16 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A end Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 - msgbox Route114_FossilManiacsHouse_Text_22AE48, 4 + msgbox Route114_FossilManiacsHouse_Text_22AE48, MSGBOX_DEFAULT release end Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 - msgbox Route114_FossilManiacsHouse_Text_22AE92, 3 + msgbox Route114_FossilManiacsHouse_Text_22AE92, MSGBOX_SIGN end Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C - msgbox Route114_FossilManiacsHouse_Text_22AEC2, 3 + msgbox Route114_FossilManiacsHouse_Text_22AEC2, MSGBOX_SIGN end Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index bc5a6d977..fae011f32 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -28,7 +28,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 applymovement 255, Route114_FossilManiacsTunnel_Movement_2725AA waitmovement 0 - msgbox Route114_FossilManiacsTunnel_Text_22B1F7, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 releaseall end @@ -44,17 +44,17 @@ Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC - msgbox Route114_FossilManiacsTunnel_Text_22AFD0, 4 + msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT release end Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC - msgbox Route114_FossilManiacsTunnel_Text_22B0D6, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B0D6, MSGBOX_DEFAULT release end Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 - msgbox Route114_FossilManiacsTunnel_Text_22B1CC, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B1CC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 00bb4f226..f90462c60 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -12,7 +12,7 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 checkflag FLAG_0x083 goto_eq Route114_LanettesHouse_EventScript_22B2FF setflag FLAG_SYS_PC_LANETTE - msgbox Route114_LanettesHouse_Text_22B34E, 4 + msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT givedecoration_std 99 compare VAR_RESULT, 0 goto_eq Route114_LanettesHouse_EventScript_272067 @@ -21,32 +21,32 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 end Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF - msgbox Route114_LanettesHouse_Text_22B407, 4 + msgbox Route114_LanettesHouse_Text_22B407, MSGBOX_DEFAULT release end Route114_LanettesHouse_EventScript_22B309:: @ 822B309 lockall - msgbox Route114_LanettesHouse_Text_22B485, 5 + msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route114_LanettesHouse_EventScript_22B327 - msgbox Route114_LanettesHouse_Text_22B6E4, 4 + msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT releaseall end Route114_LanettesHouse_EventScript_22B327:: @ 822B327 - msgbox Route114_LanettesHouse_Text_22B53C, 5 + msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_22B33C releaseall end Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C - msgbox Route114_LanettesHouse_Text_22B5EF, 4 + msgbox Route114_LanettesHouse_Text_22B5EF, MSGBOX_DEFAULT return Route114_LanettesHouse_EventScript_22B345:: @ 822B345 - msgbox Route114_LanettesHouse_Text_22B6FC, 3 + msgbox Route114_LanettesHouse_Text_22B6FC, MSGBOX_SIGN end Route114_LanettesHouse_Text_22B34E: @ 822B34E diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 967f2f9ce..7921b09ee 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -25,15 +25,15 @@ Route115_MapScript2_1F2969: @ 81F2969 .2byte 0 Route115_EventScript_1F2973:: @ 81F2973 - msgbox Route115_Text_1F2B55, 2 + msgbox Route115_Text_1F2B55, MSGBOX_NPC end Route115_EventScript_1F297C:: @ 81F297C - msgbox Route115_Text_1F2BC9, 3 + msgbox Route115_Text_1F2BC9, MSGBOX_SIGN end Route115_EventScript_1F2985:: @ 81F2985 - msgbox Route115_Text_1F2BE3, 3 + msgbox Route115_Text_1F2BE3, MSGBOX_SIGN end Route115_EventScript_1F298E:: @ 81F298E @@ -41,29 +41,29 @@ Route115_EventScript_1F298E:: @ 81F298E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 - msgbox Route115_Text_29B258, 4 + msgbox Route115_Text_29B258, MSGBOX_DEFAULT release end Route115_EventScript_1F29BA:: @ 81F29BA special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B2B3, 4 + msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT setvar VAR_0x8004, 307 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 307 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route115_EventScript_1F29D9:: @ 81F29D9 trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372 - msgbox Route115_Text_29B385, 6 + msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE end Route115_EventScript_1F29F0:: @ 81F29F0 trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED - msgbox Route115_Text_29B3FF, 6 + msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A07:: @ 81F2A07 @@ -71,24 +71,24 @@ Route115_EventScript_1F2A07:: @ 81F2A07 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 - msgbox Route115_Text_29B49D, 4 + msgbox Route115_Text_29B49D, MSGBOX_DEFAULT release end Route115_EventScript_1F2A33:: @ 81F2A33 special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B50B, 4 + msgbox Route115_Text_29B50B, MSGBOX_DEFAULT setvar VAR_0x8004, 183 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 183 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route115_EventScript_1F2A52:: @ 81F2A52 trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D - msgbox Route115_Text_29B5B5, 6 + msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A69:: @ 81F2A69 @@ -96,54 +96,54 @@ Route115_EventScript_1F2A69:: @ 81F2A69 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 - msgbox Route115_Text_29B647, 4 + msgbox Route115_Text_29B647, MSGBOX_DEFAULT release end Route115_EventScript_1F2A95:: @ 81F2A95 special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B6AB, 4 + msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT setvar VAR_0x8004, 427 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 427 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route115_EventScript_1F2AB4:: @ 81F2AB4 trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A - msgbox Route115_Text_29B737, 6 + msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2ACB:: @ 81F2ACB trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5 - msgbox Route115_Text_29B7EA, 6 + msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AE2:: @ 81F2AE2 trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D - msgbox Route115_Text_29B869, 6 + msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AF9:: @ 81F2AF9 trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8 - msgbox Route115_Text_29B904, 6 + msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B10:: @ 81F2B10 trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6 - msgbox Route115_Text_29BA04, 6 + msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B27:: @ 81F2B27 trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958 - msgbox Route115_Text_29B971, 6 + msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B3E:: @ 81F2B3E trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67 - msgbox Route115_Text_29BA87, 6 + msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE end Route115_Text_1F2B55: @ 81F2B55 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index a2bf4d9e0..f5892bb86 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -37,17 +37,17 @@ Route116_EventScript_1F2C70:: @ 81F2C70 goto_eq Route116_EventScript_1F2C8E checkflag FLAG_0x08E goto_eq Route116_EventScript_1F2C98 - msgbox Route116_Text_1F3140, 4 + msgbox Route116_Text_1F3140, MSGBOX_DEFAULT release end Route116_EventScript_1F2C8E:: @ 81F2C8E - msgbox Route116_Text_1F32C1, 4 + msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT release end Route116_EventScript_1F2C98:: @ 81F2C98 - msgbox Route116_Text_1F3166, 4 + msgbox Route116_Text_1F3166, MSGBOX_DEFAULT release end @@ -56,7 +56,7 @@ Route116_EventScript_1F2CA2:: @ 81F2CA2 faceplayer checkflag FLAG_0x11F goto_eq Route116_EventScript_1F2D2B - msgbox Route116_Text_1F3317, 4 + msgbox Route116_Text_1F3317, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end @@ -65,7 +65,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB giveitem_std ITEM_REPEAT_BALL compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2D39 - msgbox Route116_Text_1F3521, 4 + msgbox Route116_Text_1F3521, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, Route116_EventScript_1F2D15 @@ -92,12 +92,12 @@ Route116_EventScript_1F2D20:: @ 81F2D20 return Route116_EventScript_1F2D2B:: @ 81F2D2B - msgbox Route116_Text_1F35CE, 4 + msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end Route116_EventScript_1F2D39:: @ 81F2D39 - msgbox Route116_Text_1F3593, 4 + msgbox Route116_Text_1F3593, MSGBOX_DEFAULT release end @@ -126,29 +126,29 @@ Route116_Movement_1F2D4C: @ 81F2D4C step_end Route116_EventScript_1F2D57:: @ 81F2D57 - msgbox Route116_Text_1F379D, 3 + msgbox Route116_Text_1F379D, MSGBOX_SIGN end Route116_EventScript_1F2D60:: @ 81F2D60 - msgbox Route116_Text_1F37B7, 3 + msgbox Route116_Text_1F37B7, MSGBOX_SIGN end Route116_EventScript_1F2D69:: @ 81F2D69 - msgbox Route116_Text_1F380F, 3 + msgbox Route116_Text_1F380F, MSGBOX_SIGN end Route116_EventScript_1F2D72:: @ 81F2D72 - msgbox Route116_Text_1F3825, 3 + msgbox Route116_Text_1F3825, MSGBOX_SIGN end Route116_EventScript_1F2D7B:: @ 81F2D7B - msgbox Route116_Text_1F38D4, 3 + msgbox Route116_Text_1F38D4, MSGBOX_SIGN end Route116_EventScript_1F2D84:: @ 81F2D84 lock faceplayer - msgbox Route116_Text_1F309D, 4 + msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 release end @@ -158,7 +158,7 @@ Route116_EventScript_1F2D95:: @ 81F2D95 applymovement 11, Route116_Movement_2725A8 applymovement 255, Route116_Movement_2725A4 waitmovement 0 - msgbox Route116_Text_1F309D, 4 + msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 releaseall end @@ -172,28 +172,28 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6 specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DE2 - msgbox Route116_Text_1F3657, 4 + msgbox Route116_Text_1F3657, MSGBOX_DEFAULT release end Route116_EventScript_1F2DE2:: @ 81F2DE2 - msgbox Route116_Text_1F3718, 4 + msgbox Route116_Text_1F3718, MSGBOX_DEFAULT closemessage goto Route116_EventScript_1F2E2A end Route116_EventScript_1F2DF1:: @ 81F2DF1 - msgbox Route116_Text_1F3657, 4 - msgbox Route116_Text_1F3688, 4 + msgbox Route116_Text_1F3657, MSGBOX_DEFAULT + msgbox Route116_Text_1F3688, MSGBOX_DEFAULT specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2E1B - msgbox Route116_Text_1F375E, 4 + msgbox Route116_Text_1F375E, MSGBOX_DEFAULT release end Route116_EventScript_1F2E1B:: @ 81F2E1B - msgbox Route116_Text_1F36B4, 4 + msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT closemessage goto Route116_EventScript_1F2E2A end @@ -249,12 +249,12 @@ Route116_Movement_1F2E7E: @ 81F2E7E Route116_EventScript_1F2E89:: @ 81F2E89 trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A - msgbox Route116_Text_29BBC6, 6 + msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EA0:: @ 81F2EA0 trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25 - msgbox Route116_Text_29BC42, 6 + msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EB7:: @ 81F2EB7 @@ -266,7 +266,7 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2F22 - msgbox Route116_Text_29BD92, 4 + msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end @@ -279,43 +279,43 @@ Route116_EventScript_1F2EF8:: @ 81F2EF8 Route116_EventScript_1F2F03:: @ 81F2F03 special sub_80B4808 waitmovement 0 - msgbox Route116_Text_29BE71, 4 + msgbox Route116_Text_29BE71, MSGBOX_DEFAULT setvar VAR_0x8004, 273 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 273 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route116_EventScript_1F2F22:: @ 81F2F22 checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F35 - msgbox Route116_Text_29BD92, 4 + msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end Route116_EventScript_1F2F35:: @ 81F2F35 - msgbox Route116_Text_29BDEF, 4 + msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT setvar VAR_0x8004, 273 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 273 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route116_EventScript_1F2F4E:: @ 81F2F4E trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C - msgbox Route116_Text_29BF68, 6 + msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F65:: @ 81F2F65 trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F - msgbox Route116_Text_29BB31, 6 + msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F7C:: @ 81F2F7C trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3 - msgbox Route116_Text_29BCCC, 6 + msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F93:: @ 81F2F93 @@ -327,7 +327,7 @@ Route116_EventScript_1F2F93:: @ 81F2F93 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2FFE - msgbox Route116_Text_29C010, 4 + msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end @@ -340,53 +340,53 @@ Route116_EventScript_1F2FD4:: @ 81F2FD4 Route116_EventScript_1F2FDF:: @ 81F2FDF special sub_80B4808 waitmovement 0 - msgbox Route116_Text_29C096, 4 + msgbox Route116_Text_29C096, MSGBOX_DEFAULT setvar VAR_0x8004, 280 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 280 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route116_EventScript_1F2FFE:: @ 81F2FFE checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F3011 - msgbox Route116_Text_29C010, 4 + msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end Route116_EventScript_1F3011:: @ 81F3011 - msgbox Route116_Text_29C052, 4 + msgbox Route116_Text_29C052, MSGBOX_DEFAULT setvar VAR_0x8004, 280 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 280 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route116_EventScript_1F302A:: @ 81F302A trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F - msgbox Route116_Text_29C13B, 6 + msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3041:: @ 81F3041 trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8 - msgbox Route116_Text_29C1EA, 6 + msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3058:: @ 81F3058 trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2 - msgbox Route116_Text_29C2DD, 6 + msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE end Route116_EventScript_1F306F:: @ 81F306F trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365 - msgbox Route116_Text_29C380, 6 + msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3086:: @ 81F3086 trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7 - msgbox Route116_Text_29C418, 6 + msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE end Route116_Text_1F309D: @ 81F309D diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index b2c009337..3e7204e75 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -7,11 +7,11 @@ Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 end Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A - msgbox Route116_TunnelersRestHouse_Text_22B88B, 2 + msgbox Route116_TunnelersRestHouse_Text_22B88B, MSGBOX_NPC end Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 - msgbox Route116_TunnelersRestHouse_Text_22B99F, 2 + msgbox Route116_TunnelersRestHouse_Text_22B99F, MSGBOX_NPC end Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C @@ -19,12 +19,12 @@ Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq Route116_TunnelersRestHouse_EventScript_22B881 - msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4 + msgbox Route116_TunnelersRestHouse_Text_22BAAF, MSGBOX_DEFAULT release end Route116_TunnelersRestHouse_EventScript_22B881:: @ 822B881 - msgbox Route116_TunnelersRestHouse_Text_22BB3B, 4 + msgbox Route116_TunnelersRestHouse_Text_22BB3B, MSGBOX_DEFAULT release end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index eb04664bd..8bb600acc 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -15,27 +15,27 @@ Route117_EventScript_1F3999:: @ 81F3999 return Route117_EventScript_1F399A:: @ 81F399A - msgbox Route117_Text_1F3CFD, 2 + msgbox Route117_Text_1F3CFD, MSGBOX_NPC end Route117_EventScript_1F39A3:: @ 81F39A3 - msgbox Route117_Text_1F3D41, 2 + msgbox Route117_Text_1F3D41, MSGBOX_NPC end Route117_EventScript_1F39AC:: @ 81F39AC - msgbox Route117_Text_1F3C7C, 2 + msgbox Route117_Text_1F3C7C, MSGBOX_NPC end Route117_EventScript_1F39B5:: @ 81F39B5 - msgbox Route117_Text_1F3D58, 3 + msgbox Route117_Text_1F3D58, MSGBOX_SIGN end Route117_EventScript_1F39BE:: @ 81F39BE - msgbox Route117_Text_1F3D74, 3 + msgbox Route117_Text_1F3D74, MSGBOX_SIGN end Route117_EventScript_1F39C7:: @ 81F39C7 - msgbox Route117_Text_1F3D8E, 3 + msgbox Route117_Text_1F3D8E, MSGBOX_SIGN end Route117_EventScript_1F39D0:: @ 81F39D0 @@ -43,24 +43,24 @@ Route117_EventScript_1F39D0:: @ 81F39D0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A1B - msgbox Route117_Text_29C498, 4 + msgbox Route117_Text_29C498, MSGBOX_DEFAULT release end Route117_EventScript_1F39FC:: @ 81F39FC special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C508, 4 + msgbox Route117_Text_29C508, MSGBOX_DEFAULT setvar VAR_0x8004, 538 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 538 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3A1B:: @ 81F3A1B trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B - msgbox Route117_Text_29C5D0, 6 + msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A32:: @ 81F3A32 @@ -68,24 +68,24 @@ Route117_EventScript_1F3A32:: @ 81F3A32 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A7D - msgbox Route117_Text_29C679, 4 + msgbox Route117_Text_29C679, MSGBOX_DEFAULT release end Route117_EventScript_1F3A5E:: @ 81F3A5E special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C6BC, 4 + msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT setvar VAR_0x8004, 545 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 545 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3A7D:: @ 81F3A7D trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E - msgbox Route117_Text_29C75A, 6 + msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A94:: @ 81F3A94 @@ -93,24 +93,24 @@ Route117_EventScript_1F3A94:: @ 81F3A94 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3ADF - msgbox Route117_Text_29C800, 4 + msgbox Route117_Text_29C800, MSGBOX_DEFAULT release end Route117_EventScript_1F3AC0:: @ 81F3AC0 special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C846, 4 + msgbox Route117_Text_29C846, MSGBOX_DEFAULT setvar VAR_0x8004, 364 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 364 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3ADF:: @ 81F3ADF trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 - msgbox Route117_Text_29C8FE, 6 + msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3AF6:: @ 81F3AF6 @@ -118,29 +118,29 @@ Route117_EventScript_1F3AF6:: @ 81F3AF6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3B41 - msgbox Route117_Text_29C9D0, 4 + msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT release end Route117_EventScript_1F3B22:: @ 81F3B22 special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29CA32, 4 + msgbox Route117_Text_29CA32, MSGBOX_DEFAULT setvar VAR_0x8004, 369 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 369 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3B41:: @ 81F3B41 trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC - msgbox Route117_Text_29CAF6, 6 + msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B58:: @ 81F3B58 trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_29CB32, Route117_Text_29CB87 - msgbox Route117_Text_29CBAD, 6 + msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B6F:: @ 81F3B6F @@ -148,22 +148,22 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3BB8 - msgbox Route117_Text_29CCCB, 4 + msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT release end Route117_EventScript_1F3B9F:: @ 81F3B9F - msgbox Route117_Text_29CD1D, 4 + msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT setvar VAR_0x8004, 287 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 287 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3BB8:: @ 81F3BB8 trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E - msgbox Route117_Text_29CF1C, 6 + msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3BD3:: @ 81F3BD3 @@ -171,37 +171,37 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3C1C - msgbox Route117_Text_29CE17, 4 + msgbox Route117_Text_29CE17, MSGBOX_DEFAULT release end Route117_EventScript_1F3C03:: @ 81F3C03 - msgbox Route117_Text_29CD1D, 4 + msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT setvar VAR_0x8004, 287 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 287 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3C1C:: @ 81F3C1C trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 - msgbox Route117_Text_29CFFE, 6 + msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C37:: @ 81F3C37 trainerbattle 0, TRAINER_MELINA, 0, Route117_Text_29D0B7, Route117_Text_29D0F1 - msgbox Route117_Text_29D10E, 6 + msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C4E:: @ 81F3C4E trainerbattle 0, TRAINER_BRANDI, 0, Route117_Text_29D14B, Route117_Text_29D189 - msgbox Route117_Text_29D196, 6 + msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C65:: @ 81F3C65 trainerbattle 0, TRAINER_AISHA, 0, Route117_Text_29D1D1, Route117_Text_29D206 - msgbox Route117_Text_29D24C, 6 + msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE end Route117_Text_1F3C7C: @ 81F3C7C diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 09fad07e7..8448504a1 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -30,7 +30,7 @@ Route118_EventScript_1F3E14:: @ 81F3E14 faceplayer checkflag FLAG_0x0E3 goto_eq Route118_EventScript_1F3E69 - msgbox Route118_Text_1F427B, 5 + msgbox Route118_Text_1F427B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3E3E compare VAR_RESULT, 0 @@ -38,33 +38,33 @@ Route118_EventScript_1F3E14:: @ 81F3E14 end Route118_EventScript_1F3E3E:: @ 81F3E3E - msgbox Route118_Text_1F42AF, 4 + msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT giveitem_std ITEM_GOOD_ROD setflag FLAG_0x0E3 - msgbox Route118_Text_1F42E7, 4 + msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT release end Route118_EventScript_1F3E5F:: @ 81F3E5F - msgbox Route118_Text_1F4319, 4 + msgbox Route118_Text_1F4319, MSGBOX_DEFAULT release end Route118_EventScript_1F3E69:: @ 81F3E69 - msgbox Route118_Text_1F4331, 4 + msgbox Route118_Text_1F4331, MSGBOX_DEFAULT release end Route118_EventScript_1F3E73:: @ 81F3E73 - msgbox Route118_Text_1F4367, 2 + msgbox Route118_Text_1F4367, MSGBOX_NPC end Route118_EventScript_1F3E7C:: @ 81F3E7C - msgbox Route118_Text_1F43F4, 3 + msgbox Route118_Text_1F43F4, MSGBOX_SIGN end Route118_EventScript_1F3E85:: @ 81F3E85 - msgbox Route118_Text_1F440E, 3 + msgbox Route118_Text_1F440E, MSGBOX_SIGN end Route118_EventScript_1F3E8E:: @ 81F3E8E @@ -100,7 +100,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 applymovement 19, Route118_Movement_1F3F65 waitmovement 0 delay 30 - msgbox Route118_Text_1F40BE, 4 + msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, Route118_EventScript_1F3F28 @@ -191,34 +191,34 @@ Route118_EventScript_1F3F87:: @ 81F3F87 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 - msgbox Route118_Text_29D2FA, 4 + msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT release end Route118_EventScript_1F3FB3:: @ 81F3FB3 special sub_80B4808 waitmovement 0 - msgbox Route118_Text_29D343, 4 + msgbox Route118_Text_29D343, MSGBOX_DEFAULT setvar VAR_0x8004, 37 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 37 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route118_EventScript_1F3FD2:: @ 81F3FD2 trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA - msgbox Route118_Text_29D3D9, 6 + msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE end Route118_EventScript_1F3FE9:: @ 81F3FE9 trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C - msgbox Route118_Text_29D587, 6 + msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4000:: @ 81F4000 trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C - msgbox Route118_Text_29D663, 6 + msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4017:: @ 81F4017 @@ -226,39 +226,39 @@ Route118_EventScript_1F4017:: @ 81F4017 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 - msgbox Route118_Text_29D6D8, 4 + msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT release end Route118_EventScript_1F4043:: @ 81F4043 special sub_80B4808 waitmovement 0 - msgbox Route118_Text_29D74A, 4 + msgbox Route118_Text_29D74A, MSGBOX_DEFAULT setvar VAR_0x8004, 196 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 196 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route118_EventScript_1F4062:: @ 81F4062 trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA - msgbox Route118_Text_29D7D5, 6 + msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4079:: @ 81F4079 trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B - msgbox Route118_Text_29D46C, 6 + msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4090:: @ 81F4090 trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4 - msgbox Route118_Text_29D4DA, 6 + msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE end Route118_EventScript_1F40A7:: @ 81F40A7 trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C - msgbox Route118_Text_29D872, 6 + msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE end Route118_Text_1F40BE: @ 81F40BE diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index bf3abf9f8..6c5e8b504 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -79,7 +79,7 @@ Route119_EventScript_1F4506:: @ 81F4506 return Route119_EventScript_1F450B:: @ 81F450B - msgbox Route119_Text_1F49FD, 4 + msgbox Route119_Text_1F49FD, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route119_EventScript_1F453A case 1, Route119_EventScript_1F454A @@ -102,14 +102,14 @@ Route119_EventScript_1F455A:: @ 81F455A end Route119_EventScript_1F456A:: @ 81F456A - msgbox Route119_Text_1F4AF3, 4 + msgbox Route119_Text_1F4AF3, MSGBOX_DEFAULT call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4B56, 4 + msgbox Route119_Text_1F4B56, MSGBOX_DEFAULT goto Route119_EventScript_1F460F end Route119_EventScript_1F4585:: @ 81F4585 - msgbox Route119_Text_1F4C9A, 4 + msgbox Route119_Text_1F4C9A, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route119_EventScript_1F45B4 case 1, Route119_EventScript_1F45C4 @@ -132,9 +132,9 @@ Route119_EventScript_1F45D4:: @ 81F45D4 end Route119_EventScript_1F45E4:: @ 81F45E4 - msgbox Route119_Text_1F4D4B, 4 + msgbox Route119_Text_1F4D4B, MSGBOX_DEFAULT call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4DB5, 4 + msgbox Route119_Text_1F4DB5, MSGBOX_DEFAULT goto Route119_EventScript_1F460F end @@ -169,7 +169,7 @@ Route119_EventScript_1F460F:: @ 81F460F applymovement 43, Route119_Movement_1F4752 waitmovement 0 addvar VAR_0x40D1, 1 - msgbox Route119_Text_1F4E60, 4 + msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F46B0 @@ -325,45 +325,45 @@ Route119_Movement_1F4763: @ 81F4763 step_end Route119_EventScript_1F476B:: @ 81F476B - msgbox Route119_Text_1F5261, 2 + msgbox Route119_Text_1F5261, MSGBOX_NPC end Route119_EventScript_1F4774:: @ 81F4774 - msgbox Route119_Text_1F530E, 3 + msgbox Route119_Text_1F530E, MSGBOX_SIGN end Route119_EventScript_1F477D:: @ 81F477D - msgbox Route119_Text_1F5327, 3 + msgbox Route119_Text_1F5327, MSGBOX_SIGN end Route119_EventScript_1F4786:: @ 81F4786 trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0 - msgbox Route119_Text_29D902, 6 + msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE end Route119_EventScript_1F479D:: @ 81F479D trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C - msgbox Route119_Text_29D993, 6 + msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47B4:: @ 81F47B4 trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14 - msgbox Route119_Text_29DA2C, 6 + msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47CB:: @ 81F47CB trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC - msgbox Route119_Text_29DADB, 6 + msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47E2:: @ 81F47E2 trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66 - msgbox Route119_Text_29DB7C, 6 + msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47F9:: @ 81F47F9 trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20 - msgbox Route119_Text_29DC2B, 6 + msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4810:: @ 81F4810 @@ -371,24 +371,24 @@ Route119_EventScript_1F4810:: @ 81F4810 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F485B - msgbox Route119_Text_29DCC6, 4 + msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT release end Route119_EventScript_1F483C:: @ 81F483C special sub_80B4808 waitmovement 0 - msgbox Route119_Text_29DD1C, 4 + msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT setvar VAR_0x8004, 552 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 552 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route119_EventScript_1F485B:: @ 81F485B trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5 - msgbox Route119_Text_29DDBD, 6 + msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4872:: @ 81F4872 @@ -396,75 +396,75 @@ Route119_EventScript_1F4872:: @ 81F4872 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F48BD - msgbox Route119_Text_29DE88, 4 + msgbox Route119_Text_29DE88, MSGBOX_DEFAULT release end Route119_EventScript_1F489E:: @ 81F489E special sub_80B4808 waitmovement 0 - msgbox Route119_Text_29DEF7, 4 + msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT setvar VAR_0x8004, 559 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 559 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route119_EventScript_1F48BD:: @ 81F48BD trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92 - msgbox Route119_Text_29DFAF, 6 + msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48D4:: @ 81F48D4 trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063 - msgbox Route119_Text_29E071, 6 + msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48EB:: @ 81F48EB trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1 - msgbox Route119_Text_29E0F6, 6 + msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4902:: @ 81F4902 trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D - msgbox Route119_Text_29E19D, 6 + msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4919:: @ 81F4919 trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B - msgbox Route119_Text_29E245, 6 + msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4930:: @ 81F4930 trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288 - msgbox Route119_Text_29E2A3, 6 + msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4947:: @ 81F4947 trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372 - msgbox Route119_Text_29E3A2, 6 + msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE end Route119_EventScript_1F495E:: @ 81F495E trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F - msgbox Route119_Text_29E492, 6 + msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4975:: @ 81F4975 trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513 - msgbox Route119_Text_29E532, 6 + msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE end Route119_EventScript_1F498C:: @ 81F498C trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1 - msgbox Route119_Text_29E5CB, 6 + msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE end Route119_EventScript_1F49A3:: @ 81F49A3 lock faceplayer - msgbox Route119_Text_1F50EB, 4 + msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 waitmovement 0 @@ -474,7 +474,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3 Route119_EventScript_1F49BA:: @ 81F49BA lock faceplayer - msgbox Route119_Text_1F5147, 4 + msgbox Route119_Text_1F5147, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 waitmovement 0 @@ -482,15 +482,15 @@ Route119_EventScript_1F49BA:: @ 81F49BA end Route119_EventScript_1F49D1:: @ 81F49D1 - msgbox Route119_Text_1F51A2, 2 + msgbox Route119_Text_1F51A2, MSGBOX_NPC end Route119_EventScript_1F49DA:: @ 81F49DA - msgbox Route119_Text_1F52B9, 2 + msgbox Route119_Text_1F52B9, MSGBOX_NPC end Route119_EventScript_1F49E3:: @ 81F49E3 - msgbox Route119_Text_1F5339, 3 + msgbox Route119_Text_1F5339, MSGBOX_SIGN end Route119_EventScript_1F49EC:: @ 81F49EC diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc index 5e633437d..4d4826bdf 100644 --- a/data/maps/Route119_House/scripts.inc +++ b/data/maps/Route119_House/scripts.inc @@ -2,7 +2,7 @@ Route119_House_MapScripts:: @ 8270965 .byte 0 Route119_House_EventScript_270966:: @ 8270966 - msgbox Route119_House_Text_270982, 2 + msgbox Route119_House_Text_270982, MSGBOX_NPC end Route119_House_EventScript_27096F:: @ 827096F @@ -10,7 +10,7 @@ Route119_House_EventScript_27096F:: @ 827096F faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route119_House_Text_270A17, 4 + msgbox Route119_House_Text_270A17, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index b008f52c0..2057f8568 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -18,12 +18,12 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT release end Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCB7, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FCB7, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF compare VAR_0x8004, 2 goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FDE8, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT release end @@ -48,17 +48,17 @@ Route119_WeatherInstitute_1F_EventScript_26FAFF:: @ 826FAFF return Route119_WeatherInstitute_1F_EventScript_26FB05:: @ 826FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FD2E, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FD2E, MSGBOX_DEFAULT release end Route119_WeatherInstitute_1F_EventScript_26FB0F:: @ 826FB0F - msgbox Route119_WeatherInstitute_1F_Text_26FE94, 2 + msgbox Route119_WeatherInstitute_1F_Text_26FE94, MSGBOX_NPC end Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 lockall - msgbox Route119_WeatherInstitute_1F_Text_26FEFC, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT closemessage call Route119_WeatherInstitute_1F_EventScript_272083 releaseall @@ -66,12 +66,12 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 trainerbattle 0, TRAINER_GRUNT_11, 0, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB - msgbox Route119_WeatherInstitute_1F_Text_26FBD7, 6 + msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 trainerbattle 0, TRAINER_GRUNT_20, 0, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 - msgbox Route119_WeatherInstitute_1F_Text_26FC60, 6 + msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_Text_26FB57: @ 826FB57 diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index fb0c4ca54..e269f5ec7 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -28,39 +28,39 @@ Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F - msgbox Route119_WeatherInstitute_2F_Text_2703C0, 6 + msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 - msgbox Route119_WeatherInstitute_2F_Text_27022B, 6 + msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE - msgbox Route119_WeatherInstitute_2F_Text_2702DA, 6 + msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, 6 + msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, 4 + msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_DEFAULT closemessage addobject 7 applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_270568, 4 + msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage playse SE_PIN applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 waitmovement 0 applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4 + msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT closemessage setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS @@ -83,7 +83,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 end Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D - msgbox Route119_WeatherInstitute_2F_Text_270650, 4 + msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT setvar VAR_TEMP_1, 385 givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 compare VAR_RESULT, 0 @@ -95,7 +95,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 call Route119_WeatherInstitute_2F_EventScript_2700DB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B @@ -105,7 +105,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD call Route119_WeatherInstitute_2F_EventScript_2700DB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 call Route119_WeatherInstitute_2F_EventScript_273797 @@ -126,7 +126,7 @@ Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB return Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA - msgbox Route119_WeatherInstitute_2F_Text_2706FE, 4 + msgbox Route119_WeatherInstitute_2F_Text_2706FE, MSGBOX_DEFAULT setflag FLAG_0x097 release end @@ -134,7 +134,7 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 checkflag FLAG_SYS_GAME_CLEAR goto_eq Route119_WeatherInstitute_2F_EventScript_27010A - msgbox Route119_WeatherInstitute_2F_Text_27077E, 4 + msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT release end @@ -151,12 +151,12 @@ Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A specialvar VAR_RESULT, sub_813B374 compare VAR_RESULT, 1 goto_eq Route119_WeatherInstitute_2F_EventScript_27014F - msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4 + msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F - msgbox Route119_WeatherInstitute_2F_Text_270873, 4 + msgbox Route119_WeatherInstitute_2F_Text_270873, MSGBOX_DEFAULT release end @@ -170,7 +170,7 @@ Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160 return Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 - msgbox Route119_WeatherInstitute_2F_Text_2708FC, 4 + msgbox Route119_WeatherInstitute_2F_Text_2708FC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 0bcff1a93..6360a54a3 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -105,7 +105,7 @@ Route120_EventScript_1F5527:: @ 81F5527 dodailyevents checkflag FLAG_0x92E goto_eq Route120_EventScript_1F5625 - msgbox Route120_Text_2A70C7, 5 + msgbox Route120_Text_2A70C7, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route120_EventScript_1F562F compare VAR_RESULT, 0 @@ -154,21 +154,21 @@ Route120_EventScript_1F5601:: @ 81F5601 compare VAR_RESULT, 0 goto_eq Route120_EventScript_272054 setflag FLAG_0x92E - msgbox Route120_Text_2A71D5, 4 + msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release end Route120_EventScript_1F5625:: @ 81F5625 - msgbox Route120_Text_2A7217, 4 + msgbox Route120_Text_2A7217, MSGBOX_DEFAULT release end Route120_EventScript_1F562F:: @ 81F562F - msgbox Route120_Text_2A7147, 4 + msgbox Route120_Text_2A7147, MSGBOX_DEFAULT return Route120_EventScript_1F5638:: @ 81F5638 - msgbox Route120_Text_2A7183, 4 + msgbox Route120_Text_2A7183, MSGBOX_DEFAULT return Route120_EventScript_1F5641:: @ 81F5641 @@ -176,27 +176,27 @@ Route120_EventScript_1F5641:: @ 81F5641 faceplayer checkflag FLAG_0x122 goto_eq Route120_EventScript_1F5672 - msgbox Route120_Text_1F5998, 5 + msgbox Route120_Text_1F5998, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end Route120_EventScript_1F5665:: @ 81F5665 - msgbox Route120_Text_1F5AAC, 4 + msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT setflag FLAG_0x122 release end Route120_EventScript_1F5672:: @ 81F5672 - msgbox Route120_Text_1F5ADE, 5 + msgbox Route120_Text_1F5ADE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end Route120_EventScript_1F568B:: @ 81F568B - msgbox Route120_Text_1F5B0F, 4 + msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, Route120_EventScript_1F57A3 @@ -205,7 +205,7 @@ Route120_EventScript_1F568B:: @ 81F568B applymovement 31, Route120_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route120_Text_1F5B43, 4 + msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT closemessage applymovement 30, Route120_Movement_2725A8 waitmovement 0 @@ -242,10 +242,10 @@ Route120_EventScript_1F572C:: @ 81F572C applymovement 31, Route120_Movement_2725AA applymovement 255, Route120_Movement_2725A6 waitmovement 0 - msgbox Route120_Text_1F5BAF, 4 + msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_0x11D - msgbox Route120_Text_1F5C7B, 4 + msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage applymovement 31, Route120_Movement_2725AA waitmovement 0 @@ -279,20 +279,20 @@ Route120_Movement_1F57B9: @ 81F57B9 step_end Route120_EventScript_1F57BC:: @ 81F57BC - msgbox Route120_Text_1F5D00, 2 + msgbox Route120_Text_1F5D00, MSGBOX_NPC end Route120_EventScript_1F57C5:: @ 81F57C5 - msgbox Route120_Text_1F5DCB, 3 + msgbox Route120_Text_1F5DCB, MSGBOX_SIGN end Route120_EventScript_1F57CE:: @ 81F57CE - msgbox Route120_Text_1F5DE4, 3 + msgbox Route120_Text_1F5DE4, MSGBOX_SIGN end Route120_EventScript_1F57D7:: @ 81F57D7 trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665 - msgbox Route120_Text_29E67A, 6 + msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE end Route120_EventScript_1F57EE:: @ 81F57EE @@ -300,34 +300,34 @@ Route120_EventScript_1F57EE:: @ 81F57EE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F5839 - msgbox Route120_Text_29E726, 4 + msgbox Route120_Text_29E726, MSGBOX_DEFAULT release end Route120_EventScript_1F581A:: @ 81F581A special sub_80B4808 waitmovement 0 - msgbox Route120_Text_29E75D, 4 + msgbox Route120_Text_29E75D, MSGBOX_DEFAULT setvar VAR_0x8004, 406 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 406 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route120_EventScript_1F5839:: @ 81F5839 trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1 - msgbox Route120_Text_29E804, 6 + msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5850:: @ 81F5850 trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884 - msgbox Route120_Text_29E8C5, 6 + msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5867:: @ 81F5867 trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980 - msgbox Route120_Text_29E996, 6 + msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE end Route120_EventScript_1F587E:: @ 81F587E @@ -335,64 +335,64 @@ Route120_EventScript_1F587E:: @ 81F587E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F58C9 - msgbox Route120_Text_29EA08, 4 + msgbox Route120_Text_29EA08, MSGBOX_DEFAULT release end Route120_EventScript_1F58AA:: @ 81F58AA special sub_80B4808 waitmovement 0 - msgbox Route120_Text_29EA31, 4 + msgbox Route120_Text_29EA31, MSGBOX_DEFAULT setvar VAR_0x8004, 226 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 226 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route120_EventScript_1F58C9:: @ 81F58C9 trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F - msgbox Route120_Text_29EAA9, 6 + msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58E0:: @ 81F58E0 trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53 - msgbox Route120_Text_29EB6E, 6 + msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58F7:: @ 81F58F7 trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25 - msgbox Route120_Text_29EC41, 6 + msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE end Route120_EventScript_1F590E:: @ 81F590E trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF - msgbox Route120_Text_29ED19, 6 + msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5925:: @ 81F5925 trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3 - msgbox Route120_Text_29EDF7, 6 + msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE end Route120_EventScript_1F593C:: @ 81F593C trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97 - msgbox Route120_Text_29EED4, 6 + msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5953:: @ 81F5953 trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63 - msgbox Route120_Text_29EF89, 6 + msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE end Route120_EventScript_1F596A:: @ 81F596A trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080 - msgbox Route120_Text_29F0A1, 6 + msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5981:: @ 81F5981 trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1 - msgbox Route120_Text_29F002, 6 + msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE end Route120_Text_1F5998: @ 81F5998 diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index f133ffe56..1bd917450 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -2,15 +2,15 @@ Route121_MapScripts:: @ 81F5DFC .byte 0 Route121_EventScript_1F5DFD:: @ 81F5DFD - msgbox Route121_Text_1F607F, 2 + msgbox Route121_Text_1F607F, MSGBOX_NPC end Route121_EventScript_1F5E06:: @ 81F5E06 - msgbox Route121_Text_1F60D3, 3 + msgbox Route121_Text_1F60D3, MSGBOX_SIGN end Route121_EventScript_1F5E0F:: @ 81F5E0F - msgbox Route121_Text_1F611E, 3 + msgbox Route121_Text_1F611E, MSGBOX_SIGN end Route121_EventScript_1F5E18:: @ 81F5E18 @@ -18,7 +18,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18 playbgm MUS_AQA_0, 0 applymovement 13, Route121_Movement_2725B8 waitmovement 0 - msgbox Route121_Text_1F605A, 4 + msgbox Route121_Text_1F605A, MSGBOX_DEFAULT closemessage applymovement 12, Route121_Movement_1F5E59 applymovement 13, Route121_Movement_1F5E62 @@ -67,7 +67,7 @@ Route121_Movement_1F5E6B: @ 81F5E6B Route121_EventScript_1F5E74:: @ 81F5E74 trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F - msgbox Route121_Text_29F138, 6 + msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5E8B:: @ 81F5E8B @@ -75,39 +75,39 @@ Route121_EventScript_1F5E8B:: @ 81F5E8B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 - msgbox Route121_Text_29F21E, 4 + msgbox Route121_Text_29F21E, MSGBOX_DEFAULT release end Route121_EventScript_1F5EB7:: @ 81F5EB7 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F25B, 4 + msgbox Route121_Text_29F25B, MSGBOX_DEFAULT setvar VAR_0x8004, 254 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 254 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route121_EventScript_1F5ED6:: @ 81F5ED6 trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A - msgbox Route121_Text_29F32B, 6 + msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5EED:: @ 81F5EED trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9 - msgbox Route121_Text_29F3C6, 6 + msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F04:: @ 81F5F04 trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 - msgbox Route121_Text_29F476, 6 + msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F1F:: @ 81F5F1F trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE - msgbox Route121_Text_29F582, 6 + msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F3A:: @ 81F5F3A @@ -115,44 +115,44 @@ Route121_EventScript_1F5F3A:: @ 81F5F3A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 - msgbox Route121_Text_29F66F, 4 + msgbox Route121_Text_29F66F, MSGBOX_DEFAULT release end Route121_EventScript_1F5F66:: @ 81F5F66 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F69F, 4 + msgbox Route121_Text_29F69F, MSGBOX_DEFAULT setvar VAR_0x8004, 127 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 127 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route121_EventScript_1F5F85:: @ 81F5F85 trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710 - msgbox Route121_Text_29F740, 6 + msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F9C:: @ 81F5F9C trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B - msgbox Route121_Text_29F9AE, 6 + msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FB3:: @ 81F5FB3 trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64 - msgbox Route121_Text_29FA73, 6 + msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FCA:: @ 81F5FCA trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8 - msgbox Route121_Text_29FAEA, 6 + msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FE1:: @ 81F5FE1 trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C - msgbox Route121_Text_29FBA8, 6 + msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FF8:: @ 81F5FF8 @@ -160,24 +160,24 @@ Route121_EventScript_1F5FF8:: @ 81F5FF8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 - msgbox Route121_Text_29F7D4, 4 + msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT release end Route121_EventScript_1F6024:: @ 81F6024 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F80D, 4 + msgbox Route121_Text_29F80D, MSGBOX_DEFAULT setvar VAR_0x8004, 767 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 767 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route121_EventScript_1F6043:: @ 81F6043 trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8 - msgbox Route121_Text_29F8D0, 6 + msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE end Route121_Text_1F605A: @ 81F605A diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 1973b0e9e..12fa8112e 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -26,21 +26,21 @@ Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD step_end Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 - msgbox Route121_SafariZoneEntrance_Text_2A4D12, 2 + msgbox Route121_SafariZoneEntrance_Text_2A4D12, MSGBOX_NPC end Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF lock faceplayer - msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5 + msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT release end Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4EA1, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4EA1, MSGBOX_DEFAULT release end @@ -49,10 +49,10 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6 waitmovement 0 showmoneybox 0, 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5 + msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 - msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -65,15 +65,15 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 compare VAR_RESULT, 0 goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 playse SE_REGI - msgbox Route121_SafariZoneEntrance_Text_2A501B, 4 + msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT takemoney 0x1f4, 0 updatemoneybox 0, 0 nop - msgbox Route121_SafariZoneEntrance_Text_2A5036, 4 + msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message Route121_SafariZoneEntrance_Text_2A5052 waitfanfare - msgbox Route121_SafariZoneEntrance_Text_2A506F, 4 + msgbox Route121_SafariZoneEntrance_Text_2A506F, MSGBOX_DEFAULT closemessage hidemoneybox nop @@ -94,7 +94,7 @@ Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 - msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 + msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -102,12 +102,12 @@ Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9 return Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA - msgbox Route121_SafariZoneEntrance_Text_2A5105, 4 + msgbox Route121_SafariZoneEntrance_Text_2A5105, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8 - msgbox Route121_SafariZoneEntrance_Text_2A4FF7, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4FF7, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -137,6 +137,6 @@ Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 step_end Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 - msgbox Route121_SafariZoneEntrance_Text_2A55BB, 3 + msgbox Route121_SafariZoneEntrance_Text_2A55BB, MSGBOX_SIGN end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 43e48b627..052405704 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -11,16 +11,16 @@ Route123_EventScript_1F6151:: @ 81F6151 faceplayer checkflag FLAG_0x0E8 goto_eq Route123_EventScript_1F61A0 - msgbox Route123_Text_1F641E, 4 + msgbox Route123_Text_1F641E, MSGBOX_DEFAULT special IsGrassTypeInParty compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E - msgbox Route123_Text_1F645D, 4 + msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 goto_eq Route123_EventScript_272054 setflag FLAG_0x0E8 - msgbox Route123_Text_1F64CF, 4 + msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release end @@ -29,35 +29,35 @@ Route123_EventScript_1F619E:: @ 81F619E end Route123_EventScript_1F61A0:: @ 81F61A0 - msgbox Route123_Text_1F64CF, 4 + msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release end Route123_EventScript_1F61AA:: @ 81F61AA - msgbox Route123_Text_1F6511, 3 + msgbox Route123_Text_1F6511, MSGBOX_SIGN end Route123_EventScript_1F61B3:: @ 81F61B3 - msgbox Route123_Text_1F6529, 3 + msgbox Route123_Text_1F6529, MSGBOX_SIGN end Route123_EventScript_1F61BC:: @ 81F61BC - msgbox Route123_Text_1F6557, 3 + msgbox Route123_Text_1F6557, MSGBOX_SIGN end Route123_EventScript_1F61C5:: @ 81F61C5 trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_29FBEB, Route123_Text_29FC23 - msgbox Route123_Text_29FC42, 6 + msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61DC:: @ 81F61DC trainerbattle 0, TRAINER_BRAXTON, 0, Route123_Text_29FC6F, Route123_Text_29FCD6 - msgbox Route123_Text_29FCF4, 6 + msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61F3:: @ 81F61F3 trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_29FD1D, Route123_Text_29FD53 - msgbox Route123_Text_29FD7B, 6 + msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F620A:: @ 81F620A @@ -65,24 +65,24 @@ Route123_EventScript_1F620A:: @ 81F620A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 - msgbox Route123_Text_29FE2A, 4 + msgbox Route123_Text_29FE2A, MSGBOX_DEFAULT release end Route123_EventScript_1F6236:: @ 81F6236 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_29FE70, 4 + msgbox Route123_Text_29FE70, MSGBOX_DEFAULT setvar VAR_0x8004, 238 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 238 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route123_EventScript_1F6255:: @ 81F6255 trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_29FED4, Route123_Text_29FF1B - msgbox Route123_Text_29FF27, 6 + msgbox Route123_Text_29FF27, MSGBOX_AUTOCLOSE end Route123_EventScript_1F626C:: @ 81F626C @@ -90,74 +90,74 @@ Route123_EventScript_1F626C:: @ 81F626C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 - msgbox Route123_Text_29FFE5, 4 + msgbox Route123_Text_29FFE5, MSGBOX_DEFAULT release end Route123_EventScript_1F6298:: @ 81F6298 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_2A0027, 4 + msgbox Route123_Text_2A0027, MSGBOX_DEFAULT setvar VAR_0x8004, 249 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 249 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route123_EventScript_1F62B7:: @ 81F62B7 trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_2A005E, Route123_Text_2A008D - msgbox Route123_Text_2A0099, 6 + msgbox Route123_Text_2A0099, MSGBOX_AUTOCLOSE end Route123_EventScript_1F62CE:: @ 81F62CE trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D - msgbox Route123_Text_2A012E, 6 + msgbox Route123_Text_2A012E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F62E9:: @ 81F62E9 trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 - msgbox Route123_Text_2A01EE, 6 + msgbox Route123_Text_2A01EE, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6304:: @ 81F6304 trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_2A025F, Route123_Text_2A02A6 - msgbox Route123_Text_2A02C1, 6 + msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE end Route123_EventScript_1F631B:: @ 81F631B trainerbattle 0, TRAINER_FREDRICK, 0, Route123_Text_2A060A, Route123_Text_2A0631 - msgbox Route123_Text_2A0672, 6 + msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6332:: @ 81F6332 trainerbattle 0, TRAINER_ALBERTO, 0, Route123_Text_2A06AF, Route123_Text_2A0704 - msgbox Route123_Text_2A072B, 6 + msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6349:: @ 81F6349 trainerbattle 0, TRAINER_ED, 0, Route123_Text_2A079B, Route123_Text_2A07F0 - msgbox Route123_Text_2A080D, 6 + msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6360:: @ 81F6360 trainerbattle 0, TRAINER_KAYLEY, 0, Route123_Text_2A0902, Route123_Text_2A0943 - msgbox Route123_Text_2A096E, 6 + msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6377:: @ 81F6377 trainerbattle 0, TRAINER_JONAS, 0, Route123_Text_2A0854, Route123_Text_2A088A - msgbox Route123_Text_2A08CA, 6 + msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE end Route123_EventScript_1F638E:: @ 81F638E trainerbattle 0, TRAINER_JAZMYN, 0, Route123_Text_2A054E, Route123_Text_2A0592 - msgbox Route123_Text_2A05AC, 6 + msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63A5:: @ 81F63A5 trainerbattle 0, TRAINER_DAVIS, 0, Route123_Text_2A04C0, Route123_Text_2A04FE - msgbox Route123_Text_2A0512, 6 + msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63BC:: @ 81F63BC @@ -165,24 +165,24 @@ Route123_EventScript_1F63BC:: @ 81F63BC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 - msgbox Route123_Text_2A0389, 4 + msgbox Route123_Text_2A0389, MSGBOX_DEFAULT release end Route123_EventScript_1F63E8:: @ 81F63E8 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_2A03C1, 4 + msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT setvar VAR_0x8004, 195 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 195 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route123_EventScript_1F6407:: @ 81F6407 trainerbattle 5, TRAINER_FERNANDO_1, 0, Route123_Text_2A03FB, Route123_Text_2A045A - msgbox Route123_Text_2A0487, 6 + msgbox Route123_Text_2A0487, MSGBOX_AUTOCLOSE end Route123_Text_1F641E: @ 81F641E diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 9e865ad6a..3ab35b195 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -12,7 +12,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 dodailyevents checkflag FLAG_0x92D goto_eq Route123_BerryMastersHouse_EventScript_26F8B6 - msgbox Route123_BerryMastersHouse_Text_2A7386, 4 + msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 @@ -20,19 +20,19 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x92D - msgbox Route123_BerryMastersHouse_Text_2A7428, 4 + msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 - msgbox Route123_BerryMastersHouse_Text_2A7445, 4 + msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 - msgbox Route123_BerryMastersHouse_Text_2A749E, 4 + msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT release end @@ -42,7 +42,7 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 dodailyevents checkflag FLAG_0x931 goto_eq Route123_BerryMastersHouse_EventScript_26FA6F - msgbox Route123_BerryMastersHouse_Text_2A74E6, 4 + msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 call Route123_BerryMastersHouse_EventScript_271E7C lock @@ -54,8 +54,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 end Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 - msgbox Route123_BerryMastersHouse_Text_2A7682, 4 - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end @@ -75,7 +75,7 @@ Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 end Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C - msgbox Route123_BerryMastersHouse_Text_2A75D0, 4 + msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT @@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A checkflag FLAG_0x0F8 goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -99,7 +99,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB checkflag FLAG_0x0F9 goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -110,7 +110,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC checkflag FLAG_0x0FA goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -121,7 +121,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D checkflag FLAG_0x0FB goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -132,7 +132,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E checkflag FLAG_0x0FC goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -141,13 +141,13 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E end Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 setflag FLAG_0x931 - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index b21e55417..013171cbd 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -8,17 +8,17 @@ Route124_MapScript1_1F6572: @ 81F6572 end Route124_EventScript_1F657C:: @ 81F657C - msgbox Route124_Text_1F6739, 3 + msgbox Route124_Text_1F6739, MSGBOX_SIGN end Route124_EventScript_1F6585:: @ 81F6585 trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 - msgbox Route124_Text_2A0A20, 6 + msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE end Route124_EventScript_1F659C:: @ 81F659C trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC - msgbox Route124_Text_2A0AD9, 6 + msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE end Route124_EventScript_1F65B3:: @ 81F65B3 @@ -26,34 +26,34 @@ Route124_EventScript_1F65B3:: @ 81F65B3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE - msgbox Route124_Text_2A0B9A, 4 + msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT release end Route124_EventScript_1F65DF:: @ 81F65DF special sub_80B4808 waitmovement 0 - msgbox Route124_Text_2A0C14, 4 + msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT setvar VAR_0x8004, 449 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 449 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route124_EventScript_1F65FE:: @ 81F65FE trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 - msgbox Route124_Text_2A0CBE, 6 + msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6615:: @ 81F6615 trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D - msgbox Route124_Text_2A0D66, 6 + msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE end Route124_EventScript_1F662C:: @ 81F662C trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF - msgbox Route124_Text_2A0E1E, 6 + msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6643:: @ 81F6643 @@ -61,22 +61,22 @@ Route124_EventScript_1F6643:: @ 81F6643 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C - msgbox Route124_Text_2A0F3A, 4 + msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT release end Route124_EventScript_1F6673:: @ 81F6673 - msgbox Route124_Text_2A109F, 4 + msgbox Route124_Text_2A109F, MSGBOX_DEFAULT setvar VAR_0x8004, 687 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 687 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route124_EventScript_1F668C:: @ 81F668C trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 - msgbox Route124_Text_2A1203, 6 + msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE end Route124_EventScript_1F66A7:: @ 81F66A7 @@ -84,32 +84,32 @@ Route124_EventScript_1F66A7:: @ 81F66A7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 - msgbox Route124_Text_2A103E, 4 + msgbox Route124_Text_2A103E, MSGBOX_DEFAULT release end Route124_EventScript_1F66D7:: @ 81F66D7 - msgbox Route124_Text_2A109F, 4 + msgbox Route124_Text_2A109F, MSGBOX_DEFAULT setvar VAR_0x8004, 687 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 687 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route124_EventScript_1F66F0:: @ 81F66F0 trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 - msgbox Route124_Text_2A130F, 6 + msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F670B:: @ 81F670B trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C - msgbox Route124_Text_2A144F, 6 + msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6722:: @ 81F6722 trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC - msgbox Route124_Text_2A14ED, 6 + msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE end Route124_Text_1F6739: @ 81F6739 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 7e64ecaff..57b64eae8 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -11,13 +11,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 faceplayer checkflag FLAG_0x0D9 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT setflag FLAG_0x0D9 goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C end Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, MSGBOX_DEFAULT goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C end @@ -61,7 +61,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA return Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0 - msgbox Route124_DivingTreasureHuntersHouse_Text_271098, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271098, MSGBOX_DEFAULT goto Route124_DivingTreasureHuntersHouse_EventScript_270ADE end @@ -246,7 +246,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1 Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 bufferitemname 0, VAR_0x8008 bufferitemname 1, VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271132, 5 + msgbox Route124_DivingTreasureHuntersHouse_Text_271132, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D checkitemspace VAR_0x8009, 1 @@ -261,28 +261,28 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 takeitem VAR_0x8008, 1 giveitem_std VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271158, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271158, MSGBOX_DEFAULT call Route124_DivingTreasureHuntersHouse_EventScript_270A72 compare VAR_TEMP_1, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 - msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, 5 + msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D end Route124_DivingTreasureHuntersHouse_EventScript_270F43:: @ 8270F43 - msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, MSGBOX_DEFAULT release end Route124_DivingTreasureHuntersHouse_EventScript_270F4D:: @ 8270F4D - msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, MSGBOX_DEFAULT release end Route124_DivingTreasureHuntersHouse_EventScript_270F57:: @ 8270F57 - msgbox Route124_DivingTreasureHuntersHouse_Text_271027, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271027, MSGBOX_DEFAULT release end @@ -291,7 +291,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F61:: @ 8270F61 end Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63 - msgbox Route124_DivingTreasureHuntersHouse_Text_271217, 3 + msgbox Route124_DivingTreasureHuntersHouse_Text_271217, MSGBOX_SIGN end Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 2dda3fb2d..c1771a83b 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -28,22 +28,22 @@ Route125_MapScript2_1F679A: @ 81F679A Route125_EventScript_1F67A4:: @ 81F67A4 trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A - msgbox Route125_Text_2A1567, 6 + msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67BB:: @ 81F67BB trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7 - msgbox Route125_Text_2A15D5, 6 + msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67D2:: @ 81F67D2 trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D - msgbox Route125_Text_2A165E, 6 + msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67E9:: @ 81F67E9 trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5 - msgbox Route125_Text_2A16CE, 6 + msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6800:: @ 81F6800 @@ -51,43 +51,43 @@ Route125_EventScript_1F6800:: @ 81F6800 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B - msgbox Route125_Text_2A1755, 4 + msgbox Route125_Text_2A1755, MSGBOX_DEFAULT release end Route125_EventScript_1F682C:: @ 81F682C special sub_80B4808 waitmovement 0 - msgbox Route125_Text_2A17CF, 4 + msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT setvar VAR_0x8004, 492 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 492 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route125_EventScript_1F684B:: @ 81F684B trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851 - msgbox Route125_Text_2A187A, 6 + msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6862:: @ 81F6862 trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 - msgbox Route125_Text_2A19A6, 6 + msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE end Route125_EventScript_1F687D:: @ 81F687D trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 - msgbox Route125_Text_2A1A92, 6 + msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6898:: @ 81F6898 trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E - msgbox Route125_Text_2A1B70, 6 + msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE end Route125_EventScript_1F68AF:: @ 81F68AF trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD - msgbox Route125_Text_2A1C2A, 6 + msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 3ea9ba786..d3679eb54 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -9,37 +9,37 @@ Route126_MapScript1_1F68CC: @ 81F68CC Route126_EventScript_1F68D6:: @ 81F68D6 trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8 - msgbox Route126_Text_2A1CDD, 6 + msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE end Route126_EventScript_1F68ED:: @ 81F68ED trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63 - msgbox Route126_Text_2A1D72, 6 + msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6904:: @ 81F6904 trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8 - msgbox Route126_Text_2A1E03, 6 + msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE end Route126_EventScript_1F691B:: @ 81F691B trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63 - msgbox Route126_Text_2A1E70, 6 + msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6932:: @ 81F6932 trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6 - msgbox Route126_Text_2A20F7, 6 + msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6949:: @ 81F6949 trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3 - msgbox Route126_Text_2A21B8, 6 + msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6960:: @ 81F6960 trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216 - msgbox Route126_Text_2A222A, 6 + msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6977:: @ 81F6977 @@ -47,23 +47,23 @@ Route126_EventScript_1F6977:: @ 81F6977 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route126_EventScript_1F69C2 - msgbox Route126_Text_2A1F10, 4 + msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT release end Route126_EventScript_1F69A3:: @ 81F69A3 special sub_80B4808 waitmovement 0 - msgbox Route126_Text_2A1F5A, 4 + msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT setvar VAR_0x8004, 377 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 377 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route126_EventScript_1F69C2:: @ 81F69C2 trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8 - msgbox Route126_Text_2A200C, 6 + msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 12e5bf127..33d3e808e 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -28,37 +28,37 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B Route127_EventScript_1F6A35:: @ 81F6A35 trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294 - msgbox Route127_Text_2A22A1, 6 + msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A4C:: @ 81F6A4C trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315 - msgbox Route127_Text_2A232C, 6 + msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A63:: @ 81F6A63 trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1 - msgbox Route127_Text_2A240C, 6 + msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A7A:: @ 81F6A7A trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483 - msgbox Route127_Text_2A2494, 6 + msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A91:: @ 81F6A91 trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B - msgbox Route127_Text_2A2538, 6 + msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AA8:: @ 81F6AA8 trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1 - msgbox Route127_Text_2A25D2, 6 + msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6ABF:: @ 81F6ABF trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC - msgbox Route127_Text_2A2832, 6 + msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AD6:: @ 81F6AD6 @@ -66,23 +66,23 @@ Route127_EventScript_1F6AD6:: @ 81F6AD6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 - msgbox Route127_Text_2A26AC, 4 + msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT release end Route127_EventScript_1F6B02:: @ 81F6B02 special sub_80B4808 waitmovement 0 - msgbox Route127_Text_2A26EE, 4 + msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT setvar VAR_0x8004, 672 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 672 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route127_EventScript_1F6B21:: @ 81F6B21 trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B - msgbox Route127_Text_2A278E, 6 + msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 8e2742ff5..2a686a865 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -17,29 +17,29 @@ Route128_EventScript_1F6B57:: @ 81F6B57 delay 20 applymovement 4, Route128_Movement_1F6C89 waitmovement 0 - msgbox Route128_Text_1F6DF5, 4 + msgbox Route128_Text_1F6DF5, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C91 waitmovement 0 - msgbox Route128_Text_1F6E48, 4 + msgbox Route128_Text_1F6E48, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 applymovement 4, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F6E5A, 4 + msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 applymovement 255, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F6F1E, 4 + msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 applymovement 255, Route128_Movement_2725A4 applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 - msgbox Route128_Text_1F704F, 4 + msgbox Route128_Text_1F704F, MSGBOX_DEFAULT closemessage delay 40 applymovement 5, Route128_Movement_1F6CB0 @@ -56,15 +56,15 @@ Route128_EventScript_1F6B57:: @ 81F6B57 waitmovement 0 applymovement 255, Route128_Movement_2725A8 waitmovement 0 - msgbox Route128_Text_1F70C9, 4 + msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 applymovement 255, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F70EA, 4 + msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT applymovement 3, Route128_Movement_2725AA waitmovement 0 - msgbox Route128_Text_1F721B, 4 + msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_2725AA waitmovement 0 @@ -180,24 +180,24 @@ Route128_EventScript_1F6CBE:: @ 81F6CBE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 - msgbox Route128_Text_2A28D7, 4 + msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT release end Route128_EventScript_1F6CEA:: @ 81F6CEA special sub_80B4808 waitmovement 0 - msgbox Route128_Text_2A2916, 4 + msgbox Route128_Text_2A2916, MSGBOX_DEFAULT setvar VAR_0x8004, 376 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 376 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route128_EventScript_1F6D09:: @ 81F6D09 trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8 - msgbox Route128_Text_2A29DC, 6 + msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D20:: @ 81F6D20 @@ -205,49 +205,49 @@ Route128_EventScript_1F6D20:: @ 81F6D20 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B - msgbox Route128_Text_2A2AB7, 4 + msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT release end Route128_EventScript_1F6D4C:: @ 81F6D4C special sub_80B4808 waitmovement 0 - msgbox Route128_Text_2A2AF9, 4 + msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT setvar VAR_0x8004, 386 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 386 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route128_EventScript_1F6D6B:: @ 81F6D6B trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB - msgbox Route128_Text_2A2BDD, 6 + msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D82:: @ 81F6D82 trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79 - msgbox Route128_Text_2A2C95, 6 + msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D99:: @ 81F6D99 trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE - msgbox Route128_Text_2A2D0D, 6 + msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DB0:: @ 81F6DB0 trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9 - msgbox Route128_Text_2A2DBA, 6 + msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DC7:: @ 81F6DC7 trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44 - msgbox Route128_Text_2A2E6C, 6 + msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DDE:: @ 81F6DDE trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA - msgbox Route128_Text_2A2F2F, 6 + msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE end Route128_Text_1F6DF5: @ 81F6DF5 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 170d87e56..c9cb8a305 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -33,26 +33,26 @@ Route129_MapScript2_1F72E2: @ 81F72E2 Route129_EventScript_1F72EC:: @ 81F72EC trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D - msgbox Route129_Text_2A2FB9, 6 + msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7303:: @ 81F7303 trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034 - msgbox Route129_Text_2A3048, 6 + msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE end Route129_EventScript_1F731A:: @ 81F731A trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1 - msgbox Route129_Text_2A3114, 6 + msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7331:: @ 81F7331 trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D - msgbox Route129_Text_2A31A6, 6 + msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7348:: @ 81F7348 trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239 - msgbox Route129_Text_2A3252, 6 + msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 2d860050b..badd68dc0 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -37,16 +37,16 @@ Route130_EventScript_1F73B5:: @ 81F73B5 Route130_EventScript_1F73BF:: @ 81F73BF trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 - msgbox Route130_Text_2A3300, 6 + msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73D6:: @ 81F73D6 trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC - msgbox Route130_Text_2A33F5, 6 + msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73ED:: @ 81F73ED trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D - msgbox Route130_Text_2A3494, 6 + msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 566cbef66..4afd3bbcf 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -19,41 +19,41 @@ Route131_EventScript_1F741F:: @ 81F741F Route131_EventScript_1F7429:: @ 81F7429 trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_2A34C8, Route131_Text_2A350D - msgbox Route131_Text_2A353D, 6 + msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7440:: @ 81F7440 trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_2A35C6, Route131_Text_2A3626 - msgbox Route131_Text_2A362D, 6 + msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7457:: @ 81F7457 trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_2A367B, Route131_Text_2A36AB - msgbox Route131_Text_2A36D6, 6 + msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE end Route131_EventScript_1F746E:: @ 81F746E trainerbattle 0, TRAINER_KARA, 0, Route131_Text_2A3751, Route131_Text_2A378A - msgbox Route131_Text_2A379F, 6 + msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7485:: @ 81F7485 trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 - msgbox Route131_Text_2A3855, 6 + msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74A0:: @ 81F74A0 trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD - msgbox Route131_Text_2A3960, 6 + msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74BB:: @ 81F74BB trainerbattle 0, TRAINER_TALIA, 0, Route131_Text_2A39FE, Route131_Text_2A3A38 - msgbox Route131_Text_2A3A48, 6 + msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74D2:: @ 81F74D2 trainerbattle 0, TRAINER_KEVIN, 0, Route131_Text_2A3AA0, Route131_Text_2A3AFC - msgbox Route131_Text_2A3B02, 6 + msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index a4ae6f716..7866d4e07 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -3,41 +3,41 @@ Route132_MapScripts:: @ 81F74E9 Route132_EventScript_1F74EA:: @ 81F74EA trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC - msgbox Route132_Text_2A3BC0, 6 + msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7501:: @ 81F7501 trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39 - msgbox Route132_Text_2A3C49, 6 + msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7518:: @ 81F7518 trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD - msgbox Route132_Text_2A3CC5, 6 + msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F752F:: @ 81F752F trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C - msgbox Route132_Text_2A3D8B, 6 + msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7546:: @ 81F7546 trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8 - msgbox Route132_Text_2A3FE5, 6 + msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F755D:: @ 81F755D trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E - msgbox Route132_Text_2A40A4, 6 + msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7574:: @ 81F7574 trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD - msgbox Route132_Text_2A3F03, 6 + msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE end Route132_EventScript_1F758B:: @ 81F758B trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C - msgbox Route132_Text_2A3E4E, 6 + msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index dc15a5d40..a6770b93c 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -3,36 +3,36 @@ Route133_MapScripts:: @ 81F75A2 Route133_EventScript_1F75A3:: @ 81F75A3 trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F - msgbox Route133_Text_2A4154, 6 + msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75BA:: @ 81F75BA trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 - msgbox Route133_Text_2A420E, 6 + msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75D1:: @ 81F75D1 trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 - msgbox Route133_Text_2A4264, 6 + msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75E8:: @ 81F75E8 trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 - msgbox Route133_Text_2A4304, 6 + msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75FF:: @ 81F75FF trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C - msgbox Route133_Text_2A43B9, 6 + msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE end Route133_EventScript_1F7616:: @ 81F7616 trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A - msgbox Route133_Text_2A4477, 6 + msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE end Route133_EventScript_1F762D:: @ 81F762D trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 - msgbox Route133_Text_2A4527, 6 + msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index bdec88c42..1be55dadd 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -8,46 +8,46 @@ Route134_MapScript1_1F764A: @ 81F764A Route134_EventScript_1F7653:: @ 81F7653 trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB - msgbox Route134_Text_2A45C5, 6 + msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 - msgbox Route134_Text_2A464B, 6 + msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE - msgbox Route134_Text_2A46D2, 6 + msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 - msgbox Route134_Text_2A47FD, 6 + msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 - msgbox Route134_Text_2A475D, 6 + msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 - msgbox Route134_Text_2A4AD8, 6 + msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 - msgbox Route134_Text_2A4A34, 6 + msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B - msgbox Route134_Text_2A49B1, 6 + msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B - msgbox Route134_Text_2A48BD, 6 + msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index e79c8ef45..18c757454 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -50,7 +50,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 - msgbox RustboroCity_Text_1E22A5, 4 + msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL applymovement 15, RustboroCity_Movement_2725A4 @@ -65,13 +65,13 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 20 applymovement 15, RustboroCity_Movement_2725AA waitmovement 0 - msgbox RustboroCity_Text_1E2331, 4 + msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage delay 20 goto RustboroCity_EventScript_1E07BD RustboroCity_EventScript_1E07AC:: @ 81E07AC - msgbox RustboroCity_Text_1E2449, 4 + msgbox RustboroCity_Text_1E2449, MSGBOX_DEFAULT closemessage delay 10 goto RustboroCity_EventScript_1E07BD @@ -92,7 +92,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD special sub_81C72A4 waitstate delay 20 - msgbox RustboroCity_Text_1E2464, 4 + msgbox RustboroCity_Text_1E2464, MSGBOX_DEFAULT closemessage applymovement 15, RustboroCity_Movement_1E085D waitmovement 0 @@ -136,24 +136,24 @@ RustboroCity_EventScript_1E085F:: @ 81E085F faceplayer checkflag FLAG_0x08E goto_eq RustboroCity_EventScript_1E0874 - msgbox RustboroCity_Text_1E123F, 4 + msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E0874:: @ 81E0874 - msgbox RustboroCity_Text_1E12AC, 4 + msgbox RustboroCity_Text_1E12AC, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E087E:: @ 81E087E lock faceplayer - msgbox RustboroCity_Text_1E1407, 4 + msgbox RustboroCity_Text_1E1407, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E088A:: @ 81E088A - msgbox RustboroCity_Text_1E1480, 2 + msgbox RustboroCity_Text_1E1480, MSGBOX_NPC end RustboroCity_EventScript_1E0893:: @ 81E0893 @@ -161,12 +161,12 @@ RustboroCity_EventScript_1E0893:: @ 81E0893 faceplayer checkflag FLAG_BADGE01_GET goto_eq RustboroCity_EventScript_1E08A8 - msgbox RustboroCity_Text_1E130D, 4 + msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08A8:: @ 81E08A8 - msgbox RustboroCity_Text_1E139E, 4 + msgbox RustboroCity_Text_1E139E, MSGBOX_DEFAULT release end @@ -175,55 +175,55 @@ RustboroCity_EventScript_1E08B2:: @ 81E08B2 faceplayer checkflag FLAG_0x0BC goto_eq RustboroCity_EventScript_1E08C7 - msgbox RustboroCity_Text_1E1520, 4 + msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08C7:: @ 81E08C7 - msgbox RustboroCity_Text_1E1589, 4 + msgbox RustboroCity_Text_1E1589, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08D1:: @ 81E08D1 - msgbox RustboroCity_Text_1E1633, 2 + msgbox RustboroCity_Text_1E1633, MSGBOX_NPC end RustboroCity_EventScript_1E08DA:: @ 81E08DA - msgbox RustboroCity_Text_1E1695, 3 + msgbox RustboroCity_Text_1E1695, MSGBOX_SIGN end RustboroCity_EventScript_1E08E3:: @ 81E08E3 - msgbox RustboroCity_Text_1E20A6, 3 + msgbox RustboroCity_Text_1E20A6, MSGBOX_SIGN end RustboroCity_EventScript_1E08EC:: @ 81E08EC - msgbox RustboroCity_Text_1E2128, 3 + msgbox RustboroCity_Text_1E2128, MSGBOX_SIGN end RustboroCity_EventScript_1E08F5:: @ 81E08F5 - msgbox RustboroCity_Text_1E2167, 3 + msgbox RustboroCity_Text_1E2167, MSGBOX_SIGN end RustboroCity_EventScript_1E08FE:: @ 81E08FE - msgbox RustboroCity_Text_1E21B3, 3 + msgbox RustboroCity_Text_1E21B3, MSGBOX_SIGN end RustboroCity_EventScript_1E0907:: @ 81E0907 - msgbox RustboroCity_Text_1E220B, 3 + msgbox RustboroCity_Text_1E220B, MSGBOX_SIGN end RustboroCity_EventScript_1E0910:: @ 81E0910 - msgbox RustboroCity_Text_1E2253, 3 + msgbox RustboroCity_Text_1E2253, MSGBOX_SIGN end RustboroCity_EventScript_1E0919:: @ 81E0919 - msgbox RustboroCity_Text_1E2296, 3 + msgbox RustboroCity_Text_1E2296, MSGBOX_SIGN end RustboroCity_EventScript_1E0922:: @ 81E0922 lock faceplayer - msgbox RustboroCity_Text_1E16F4, 4 + msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT applymovement 7, RustboroCity_Movement_2725A2 waitmovement 0 release @@ -232,7 +232,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922 RustboroCity_EventScript_1E0938:: @ 81E0938 lock faceplayer - msgbox RustboroCity_Text_1E174B, 4 + msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT applymovement 8, RustboroCity_Movement_2725A2 waitmovement 0 release @@ -241,7 +241,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938 RustboroCity_EventScript_1E094E:: @ 81E094E lock faceplayer - msgbox RustboroCity_Text_1E1789, 4 + msgbox RustboroCity_Text_1E1789, MSGBOX_DEFAULT release end @@ -286,7 +286,7 @@ RustboroCity_EventScript_1E09B6:: @ 81E09B6 end RustboroCity_EventScript_1E09CD:: @ 81E09CD - msgbox RustboroCity_Text_1E17FE, 4 + msgbox RustboroCity_Text_1E17FE, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 addobject 10 @@ -296,7 +296,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD removeobject 10 applymovement 9, RustboroCity_Movement_1E0AB1 waitmovement 0 - msgbox RustboroCity_Text_1E1817, 4 + msgbox RustboroCity_Text_1E1817, MSGBOX_DEFAULT closemessage applymovement 9, RustboroCity_Movement_1E0AB9 waitmovement 0 @@ -317,11 +317,11 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD end RustboroCity_EventScript_1E0A3B:: @ 81E0A3B - msgbox RustboroCity_Text_1E1904, 4 + msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0A44:: @ 81E0A44 - msgbox RustboroCity_Text_1E194D, 4 + msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0A4D:: @ 81E0A4D @@ -453,7 +453,7 @@ RustboroCity_EventScript_1E0ADD:: @ 81E0ADD faceplayer checkflag FLAG_0x08F goto_eq RustboroCity_EventScript_1E0AF2 - msgbox RustboroCity_Text_1E1904, 4 + msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT release end @@ -499,7 +499,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E setflag FLAG_0x09F setvar VAR_0x405A, 3 moveobjectoffscreen 9 - msgbox RustboroCity_Text_1E183E, 4 + msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT releaseall end @@ -592,11 +592,11 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B call_if 1, RustboroCity_EventScript_1E0D60 compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_1E0D96 - msgbox RustboroCity_Text_1E194D, 4 + msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 call_if 1, RustboroCity_EventScript_1E0CD3 - msgbox RustboroCity_Text_1E1A21, 4 + msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT closemessage setflag FLAG_0x090 setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 @@ -608,7 +608,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B end RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 - msgbox RustboroCity_Text_1E19E5, 4 + msgbox RustboroCity_Text_1E19E5, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC @@ -838,11 +838,11 @@ RustboroCity_EventScript_1E100B:: @ 81E100B checkflag FLAG_0x120 goto_eq RustboroCity_EventScript_1E1070 setflag FLAG_0x120 - msgbox RustboroCity_Text_1E1A49, 4 + msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1ADB, 4 + msgbox RustboroCity_Text_1E1ADB, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -850,25 +850,25 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 - msgbox RustboroCity_Text_1E1AFA, 5 + msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, 4 + msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall end RustboroCity_EventScript_1E1070:: @ 81E1070 setvar VAR_0x8008, 1 - msgbox RustboroCity_Text_1E1C48, 5 + msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, 4 + msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT releaseall end RustboroCity_EventScript_1E1092:: @ 81E1092 - msgbox RustboroCity_Text_1E1C84, 4 + msgbox RustboroCity_Text_1E1C84, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E10DB case 1, RustboroCity_EventScript_1E10EE @@ -876,7 +876,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092 end RustboroCity_EventScript_1E10C1:: @ 81E10C1 - msgbox RustboroCity_Text_1E1CE7, 4 + msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall @@ -911,35 +911,35 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 checkflag FLAG_0x120 goto_eq RustboroCity_EventScript_1E1174 setflag FLAG_0x120 - msgbox RustboroCity_Text_1E1D7D, 4 + msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1E11, 4 + msgbox RustboroCity_Text_1E1E11, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - msgbox RustboroCity_Text_1E1E34, 5 + msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, 4 + msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall end RustboroCity_EventScript_1E1174:: @ 81E1174 - msgbox RustboroCity_Text_1E1F76, 5 + msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, 4 + msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT releaseall end RustboroCity_EventScript_1E1191:: @ 81E1191 - msgbox RustboroCity_Text_1E1FA9, 4 + msgbox RustboroCity_Text_1E1FA9, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E11D5 case 1, RustboroCity_EventScript_1E11E8 @@ -947,7 +947,7 @@ RustboroCity_EventScript_1E1191:: @ 81E1191 end RustboroCity_EventScript_1E11C0:: @ 81E11C0 - msgbox RustboroCity_Text_1E2002, 4 + msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall @@ -1028,7 +1028,7 @@ RustboroCity_Movement_1E1230: @ 81E1230 step_end RustboroCity_EventScript_1E1236:: @ 81E1236 - msgbox RustboroCity_Text_1E249D, 2 + msgbox RustboroCity_Text_1E249D, MSGBOX_NPC end RustboroCity_Text_1E123F: @ 81E123F diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index e5c7527f7..6736af297 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -6,20 +6,20 @@ RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 faceplayer checkflag FLAG_0x089 goto_eq RustboroCity_CuttersHouse_EventScript_215C00 - msgbox RustboroCity_CuttersHouse_Text_215C13, 4 + msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT giveitem_std ITEM_HM01 setflag FLAG_0x089 - msgbox RustboroCity_CuttersHouse_Text_215D33, 4 + msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT release end RustboroCity_CuttersHouse_EventScript_215C00:: @ 8215C00 - msgbox RustboroCity_CuttersHouse_Text_215D33, 4 + msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT release end RustboroCity_CuttersHouse_EventScript_215C0A:: @ 8215C0A - msgbox RustboroCity_CuttersHouse_Text_215E39, 2 + msgbox RustboroCity_CuttersHouse_Text_215E39, MSGBOX_NPC end RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 97d7dcf78..b5af318e8 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -19,17 +19,17 @@ RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 goto_eq RustboroCity_DevonCorp_1F_EventScript_211289 checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_21127F - msgbox RustboroCity_DevonCorp_1F_Text_2113D1, 4 + msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_21127F:: @ 821127F - msgbox RustboroCity_DevonCorp_1F_Text_211446, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211446, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 - msgbox RustboroCity_DevonCorp_1F_Text_2114DE, 4 + msgbox RustboroCity_DevonCorp_1F_Text_2114DE, MSGBOX_DEFAULT release end @@ -42,17 +42,17 @@ RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 - msgbox RustboroCity_DevonCorp_1F_Text_21151B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112BA:: @ 82112BA - msgbox RustboroCity_DevonCorp_1F_Text_211585, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211585, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 - msgbox RustboroCity_DevonCorp_1F_Text_211558, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211558, MSGBOX_DEFAULT release end @@ -65,26 +65,26 @@ RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF - msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112F5:: @ 82112F5 - msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112FF:: @ 82112FF - msgbox RustboroCity_DevonCorp_1F_Text_21138B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21138B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_211309:: @ 8211309 - msgbox RustboroCity_DevonCorp_1F_Text_2115AC, 3 + msgbox RustboroCity_DevonCorp_1F_Text_2115AC, MSGBOX_SIGN end RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312 - msgbox RustboroCity_DevonCorp_1F_Text_211722, 3 + msgbox RustboroCity_DevonCorp_1F_Text_211722, MSGBOX_SIGN end RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 88f0c2e73..c656fcac4 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -16,7 +16,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F faceplayer compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211BFB, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT release end @@ -27,12 +27,12 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x11F goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C50, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C99, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211C99, MSGBOX_DEFAULT release end @@ -43,12 +43,12 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x0BC goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211D9F, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211DF3, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211DF3, MSGBOX_DEFAULT release end @@ -57,7 +57,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA faceplayer compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211EE0, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT release end @@ -68,7 +68,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 compare VAR_0x40C4, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 - msgbox RustboroCity_DevonCorp_2F_Text_211F48, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 @@ -85,7 +85,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 + msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_CLAW_FOSSIL, 1 @@ -96,7 +96,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 bufferitemname 0, ITEM_ROOT_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_ROOT_FOSSIL, 1 setvar VAR_0x40C4, 1 setvar VAR_0x40C5, 1 @@ -110,7 +110,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 + msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_ROOT_FOSSIL, 1 @@ -121,7 +121,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 bufferitemname 0, ITEM_CLAW_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_CLAW_FOSSIL, 1 setvar VAR_0x40C4, 1 setvar VAR_0x40C5, 2 @@ -129,12 +129,12 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 end RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF - msgbox RustboroCity_DevonCorp_2F_Text_212046, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212046, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 - msgbox RustboroCity_DevonCorp_2F_Text_2121A2, 4 + msgbox RustboroCity_DevonCorp_2F_Text_2121A2, MSGBOX_DEFAULT release end @@ -147,13 +147,13 @@ RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A bufferspeciesname 1, SPECIES_LILEEP - msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT goto RustboroCity_DevonCorp_2F_EventScript_211A3E end RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C bufferspeciesname 1, SPECIES_ANORITH - msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT goto RustboroCity_DevonCorp_2F_EventScript_211AE1 end @@ -169,7 +169,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E call RustboroCity_DevonCorp_2F_EventScript_211AC4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B @@ -179,7 +179,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 call RustboroCity_DevonCorp_2F_EventScript_211AC4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 call RustboroCity_DevonCorp_2F_EventScript_273797 @@ -218,7 +218,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 call RustboroCity_DevonCorp_2F_EventScript_211B67 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B @@ -228,7 +228,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 call RustboroCity_DevonCorp_2F_EventScript_211B67 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C call RustboroCity_DevonCorp_2F_EventScript_273797 @@ -285,12 +285,12 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 compare VAR_0x405A, 6 goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212338, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212386, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212386, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index e3ecb3db0..f7681a6f6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -28,38 +28,38 @@ RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E lockall - msgbox RustboroCity_DevonCorp_3F_Text_212C37, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212C37, MSGBOX_DEFAULT closemessage applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546 waitmovement 0 delay 80 applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212DE8, MSGBOX_DEFAULT closemessage playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212E2F, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E2F, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543 applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566 waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212609, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212609, MSGBOX_DEFAULT giveitem_std ITEM_LETTER - msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4 + msgbox RustboroCity_DevonCorp_3F_Text_21277C, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_212820 waitfanfare setflag FLAG_SYS_POKENAV_GET setflag FLAG_0x0BC setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT - msgbox RustboroCity_DevonCorp_3F_Text_212837, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT closemessage call RustboroCity_DevonCorp_3F_EventScript_272083 - msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4 + msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT setflag FLAG_HIDE_ROUTE_116_TUNNELER clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN @@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC checkflag FLAG_0x0BD goto_eq RustboroCity_DevonCorp_3F_EventScript_212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A09, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -162,12 +162,12 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C end RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 setflag FLAG_0x110 - msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 end RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC - msgbox RustboroCity_DevonCorp_3F_Text_212B78, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -187,17 +187,17 @@ RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 faceplayer checkflag FLAG_0x100 goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E41, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E88, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E88, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600 - msgbox RustboroCity_DevonCorp_3F_Text_212EE9, 3 + msgbox RustboroCity_DevonCorp_3F_Text_212EE9, MSGBOX_SIGN end RustboroCity_DevonCorp_3F_Text_212609: @ 8212609 diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc index 947ea14d3..9cff0b010 100644 --- a/data/maps/RustboroCity_Flat1_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_Flat1_1F_MapScripts:: @ 82150CD .byte 0 RustboroCity_Flat1_1F_EventScript_2150CE:: @ 82150CE - msgbox RustboroCity_Flat1_1F_Text_2150E0, 2 + msgbox RustboroCity_Flat1_1F_Text_2150E0, MSGBOX_NPC end RustboroCity_Flat1_1F_EventScript_2150D7:: @ 82150D7 - msgbox RustboroCity_Flat1_1F_Text_215115, 2 + msgbox RustboroCity_Flat1_1F_Text_215115, MSGBOX_NPC end RustboroCity_Flat1_1F_Text_2150E0: @ 82150E0 diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 425d61f52..2113da526 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -25,50 +25,50 @@ RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 end RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D - msgbox RustboroCity_Flat1_2F_Text_2152FA, 5 + msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 + msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD - msgbox RustboroCity_Flat1_2F_Text_215448, 5 + msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 + msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151CD:: @ 82151CD - msgbox RustboroCity_Flat1_2F_Text_2154E7, 4 + msgbox RustboroCity_Flat1_2F_Text_2154E7, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151D7:: @ 82151D7 - msgbox RustboroCity_Flat1_2F_Text_2156E3, 4 + msgbox RustboroCity_Flat1_2F_Text_2156E3, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151E1:: @ 82151E1 - msgbox RustboroCity_Flat1_2F_Text_21561E, 4 + msgbox RustboroCity_Flat1_2F_Text_21561E, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215699, 4 + msgbox RustboroCity_Flat1_2F_Text_215699, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 - msgbox RustboroCity_Flat1_2F_Text_215535, 4 + msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215565, 4 + msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT applymovement 6, RustboroCity_Flat1_2F_Movement_27259E waitmovement 0 - msgbox RustboroCity_Flat1_2F_Text_215792, 4 + msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221 - msgbox RustboroCity_Flat1_2F_Text_2155A4, 4 + msgbox RustboroCity_Flat1_2F_Text_2155A4, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_2155D4, 4 + msgbox RustboroCity_Flat1_2F_Text_2155D4, MSGBOX_DEFAULT release end @@ -77,11 +77,11 @@ RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238 return RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D - msgbox RustboroCity_Flat1_2F_Text_21524F, 2 + msgbox RustboroCity_Flat1_2F_Text_21524F, MSGBOX_NPC end RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246 - msgbox RustboroCity_Flat1_2F_Text_215923, 3 + msgbox RustboroCity_Flat1_2F_Text_215923, MSGBOX_SIGN end RustboroCity_Flat1_2F_Text_21524F: @ 821524F diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc index fbb174a29..184ccdb72 100644 --- a/data/maps/RustboroCity_Flat2_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Flat2_1F_MapScripts:: @ 8215F76 .byte 0 RustboroCity_Flat2_1F_EventScript_215F77:: @ 8215F77 - msgbox RustboroCity_Flat2_1F_Text_215F93, 2 + msgbox RustboroCity_Flat2_1F_Text_215F93, MSGBOX_NPC end RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 @@ -10,7 +10,7 @@ RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox RustboroCity_Flat2_1F_Text_215FC6, 4 + msgbox RustboroCity_Flat2_1F_Text_215FC6, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index e623aa485..9835f3622 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7 .byte 0 RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 - msgbox RustboroCity_Flat2_2F_Text_21601A, 2 + msgbox RustboroCity_Flat2_2F_Text_21601A, MSGBOX_NPC end RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 @@ -10,7 +10,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 faceplayer checkflag FLAG_0x0D5 goto_eq RustboroCity_Flat2_2F_EventScript_216010 - msgbox RustboroCity_Flat2_2F_Text_21605A, 4 + msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_eq RustboroCity_Flat2_2F_EventScript_272054 @@ -19,7 +19,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 end RustboroCity_Flat2_2F_EventScript_216010:: @ 8216010 - msgbox RustboroCity_Flat2_2F_Text_2160BD, 4 + msgbox RustboroCity_Flat2_2F_Text_2160BD, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc index 6a267c336..c38e46cbf 100644 --- a/data/maps/RustboroCity_Flat2_3F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_Flat2_3F_MapScripts:: @ 8216116 .byte 0 RustboroCity_Flat2_3F_EventScript_216117:: @ 8216117 - msgbox RustboroCity_Flat2_3F_Text_216129, 2 + msgbox RustboroCity_Flat2_3F_Text_216129, MSGBOX_NPC end RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120 - msgbox RustboroCity_Flat2_3F_Text_216159, 2 + msgbox RustboroCity_Flat2_3F_Text_216159, MSGBOX_NPC end RustboroCity_Flat2_3F_Text_216129: @ 8216129 diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 1d722b7de..d4069f3a7 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -8,7 +8,7 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 goto_eq RustboroCity_Gym_EventScript_212FC8 checkflag FLAG_0x0A5 goto_if 0, RustboroCity_Gym_EventScript_212FA4 - msgbox RustboroCity_Gym_Text_2139A7, 4 + msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT release end @@ -16,7 +16,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 message RustboroCity_Gym_Text_2137EC waitmessage call RustboroCity_Gym_EventScript_27207E - msgbox RustboroCity_Gym_Text_213816, 4 + msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_0x4F0 setflag FLAG_BADGE01_GET setvar VAR_0x405A, 1 @@ -33,28 +33,28 @@ RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 compare VAR_RESULT, 0 goto_eq RustboroCity_Gym_EventScript_272054 setflag FLAG_0x0A5 - msgbox RustboroCity_Gym_Text_2138B1, 4 + msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release end RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8 trainerbattle 7, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 - msgbox RustboroCity_Gym_Text_213D12, 6 + msgbox RustboroCity_Gym_Text_213D12, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3 trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D - msgbox RustboroCity_Gym_Text_213447, 6 + msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 - msgbox RustboroCity_Gym_Text_2134E6, 6 + msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_213011:: @ 8213011 trainerbattle 0, TRAINER_MARC, 0, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 - msgbox RustboroCity_Gym_Text_2135C0, 6 + msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_213028:: @ 8213028 @@ -62,12 +62,12 @@ RustboroCity_Gym_EventScript_213028:: @ 8213028 faceplayer checkflag FLAG_0x4F0 goto_eq RustboroCity_Gym_EventScript_21303D - msgbox RustboroCity_Gym_Text_21309D, 4 + msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT release end RustboroCity_Gym_EventScript_21303D:: @ 821303D - msgbox RustboroCity_Gym_Text_2132E2, 4 + msgbox RustboroCity_Gym_Text_2132E2, MSGBOX_DEFAULT release end @@ -86,12 +86,12 @@ RustboroCity_Gym_EventScript_213057:: @ 8213057 end RustboroCity_Gym_EventScript_213067:: @ 8213067 - msgbox RustboroCity_Gym_Text_213A3B, 4 + msgbox RustboroCity_Gym_Text_213A3B, MSGBOX_DEFAULT releaseall end RustboroCity_Gym_EventScript_213071:: @ 8213071 - msgbox RustboroCity_Gym_Text_213A21, 4 + msgbox RustboroCity_Gym_Text_213A21, MSGBOX_DEFAULT releaseall end @@ -101,7 +101,7 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Gym_Text_213C01, 4 + msgbox RustboroCity_Gym_Text_213C01, MSGBOX_DEFAULT waitfanfare closemessage delay 30 diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index d63536c55..ccf7ef046 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -10,7 +10,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox RustboroCity_House1_Text_2159E8, 5 + msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_House1_EventScript_2159BD special sub_81B94B0 @@ -28,29 +28,29 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F special sub_807EA10 special sub_807F0E4 waitstate - msgbox RustboroCity_House1_Text_215A77, 4 + msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT setflag FLAG_0x099 release end RustboroCity_House1_EventScript_2159BD:: @ 82159BD - msgbox RustboroCity_House1_Text_215ACE, 4 + msgbox RustboroCity_House1_Text_215ACE, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159C7:: @ 82159C7 bufferspeciesname 0, VAR_0x8009 - msgbox RustboroCity_House1_Text_215A9D, 4 + msgbox RustboroCity_House1_Text_215A9D, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159D5:: @ 82159D5 - msgbox RustboroCity_House1_Text_215B17, 4 + msgbox RustboroCity_House1_Text_215B17, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159DF:: @ 82159DF - msgbox RustboroCity_House1_Text_215B57, 2 + msgbox RustboroCity_House1_Text_215B57, MSGBOX_NPC end RustboroCity_House1_Text_2159E8: @ 82159E8 diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc index fd71dc016..37f3b4c43 100644 --- a/data/maps/RustboroCity_House2/scripts.inc +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_House2_MapScripts:: @ 8215EB3 .byte 0 RustboroCity_House2_EventScript_215EB4:: @ 8215EB4 - msgbox RustboroCity_House2_Text_215EC6, 2 + msgbox RustboroCity_House2_Text_215EC6, MSGBOX_NPC end RustboroCity_House2_EventScript_215EBD:: @ 8215EBD - msgbox RustboroCity_House2_Text_215F21, 2 + msgbox RustboroCity_House2_Text_215F21, MSGBOX_NPC end RustboroCity_House2_Text_215EC6: @ 8215EC6 diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc index 87d278099..2d927086e 100644 --- a/data/maps/RustboroCity_House3/scripts.inc +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_House3_MapScripts:: @ 8216190 .byte 0 RustboroCity_House3_EventScript_216191:: @ 8216191 - msgbox RustboroCity_House3_Text_2161B6, 2 + msgbox RustboroCity_House3_Text_2161B6, MSGBOX_NPC end RustboroCity_House3_EventScript_21619A:: @ 821619A - msgbox RustboroCity_House3_Text_21622A, 2 + msgbox RustboroCity_House3_Text_21622A, MSGBOX_NPC end RustboroCity_House3_EventScript_2161A3:: @ 82161A3 @@ -14,7 +14,7 @@ RustboroCity_House3_EventScript_2161A3:: @ 82161A3 faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox RustboroCity_House3_Text_2162AB, 4 + msgbox RustboroCity_House3_Text_2162AB, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index daa445a0e..ed91cf68e 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -14,7 +14,7 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06 RustboroCity_Mart_EventScript_214F21:: @ 8214F21 pokemart RustboroCity_Mart_Pokemart_214F30 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -35,7 +35,7 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30 RustboroCity_Mart_EventScript_214F48:: @ 8214F48 pokemart RustboroCity_Mart_Pokemart_214F58 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -58,15 +58,15 @@ RustboroCity_Mart_Pokemart_214F58: @ 8214F58 end RustboroCity_Mart_EventScript_214F74:: @ 8214F74 - msgbox RustboroCity_Mart_Text_214F8F, 2 + msgbox RustboroCity_Mart_Text_214F8F, MSGBOX_NPC end RustboroCity_Mart_EventScript_214F7D:: @ 8214F7D - msgbox RustboroCity_Mart_Text_214FF1, 2 + msgbox RustboroCity_Mart_Text_214FF1, MSGBOX_NPC end RustboroCity_Mart_EventScript_214F86:: @ 8214F86 - msgbox RustboroCity_Mart_Text_21505C, 2 + msgbox RustboroCity_Mart_Text_21505C, MSGBOX_NPC end RustboroCity_Mart_Text_214F8F: @ 8214F8F diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index acf33e647..0a5a6ed92 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -17,15 +17,15 @@ RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 end RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84 - msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D - msgbox RustboroCity_PokemonCenter_1F_Text_214E13, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214E13, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 - msgbox RustboroCity_PokemonCenter_1F_Text_214E81, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214E81, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index f5030facd..6ec120258 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8 RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9 lockall - msgbox RustboroCity_PokemonSchool_Text_2140B2, 4 + msgbox RustboroCity_PokemonSchool_Text_2140B2, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end @@ -22,27 +22,27 @@ RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 end RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17 - msgbox RustboroCity_PokemonSchool_Text_21411A, 4 + msgbox RustboroCity_PokemonSchool_Text_21411A, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25 - msgbox RustboroCity_PokemonSchool_Text_2141D8, 4 + msgbox RustboroCity_PokemonSchool_Text_2141D8, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33 - msgbox RustboroCity_PokemonSchool_Text_21427D, 4 + msgbox RustboroCity_PokemonSchool_Text_21427D, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41 - msgbox RustboroCity_PokemonSchool_Text_214336, 4 + msgbox RustboroCity_PokemonSchool_Text_214336, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F - msgbox RustboroCity_PokemonSchool_Text_2143B8, 4 + msgbox RustboroCity_PokemonSchool_Text_2143B8, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end @@ -51,27 +51,27 @@ RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D end RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F - msgbox RustboroCity_PokemonSchool_Text_21459F, 2 + msgbox RustboroCity_PokemonSchool_Text_21459F, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68 - msgbox RustboroCity_PokemonSchool_Text_2145CD, 2 + msgbox RustboroCity_PokemonSchool_Text_2145CD, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71 - msgbox RustboroCity_PokemonSchool_Text_214604, 2 + msgbox RustboroCity_PokemonSchool_Text_214604, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A - msgbox RustboroCity_PokemonSchool_Text_214669, 2 + msgbox RustboroCity_PokemonSchool_Text_214669, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83 - msgbox RustboroCity_PokemonSchool_Text_214719, 2 + msgbox RustboroCity_PokemonSchool_Text_214719, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C - msgbox RustboroCity_PokemonSchool_Text_2147A2, 3 + msgbox RustboroCity_PokemonSchool_Text_2147A2, MSGBOX_SIGN end RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 @@ -83,7 +83,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 compare VAR_FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 - msgbox RustboroCity_PokemonSchool_Text_214433, 4 + msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_eq RustboroCity_PokemonSchool_EventScript_272054 @@ -105,7 +105,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 return RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB - msgbox RustboroCity_PokemonSchool_Text_2144C8, 4 + msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA waitmovement 0 @@ -173,7 +173,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 goto_eq RustboroCity_PokemonSchool_EventScript_21406F checkflag FLAG_BADGE01_GET goto_eq RustboroCity_PokemonSchool_EventScript_214082 - msgbox RustboroCity_PokemonSchool_Text_2148C0, 4 + msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x136 release @@ -182,17 +182,17 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F checkflag FLAG_BADGE01_GET goto_eq RustboroCity_PokemonSchool_EventScript_214090 - msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 + msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT release end RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082 - msgbox RustboroCity_PokemonSchool_Text_214B8A, 4 + msgbox RustboroCity_PokemonSchool_Text_214B8A, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_21409E end RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 - msgbox RustboroCity_PokemonSchool_Text_214AB6, 4 + msgbox RustboroCity_PokemonSchool_Text_214AB6, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_21409E end @@ -203,7 +203,7 @@ RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E end RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8 - msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 + msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 86f9c3b2f..bdef05258 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -21,7 +21,7 @@ RusturfTunnel_EventScript_22CE50:: @ 822CE50 RusturfTunnel_EventScript_22CE5F:: @ 822CE5F lock faceplayer - msgbox RusturfTunnel_Text_22D7A3, 4 + msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -34,7 +34,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 checkflag FLAG_TEMP_1 goto_eq RusturfTunnel_EventScript_22CE99 setflag FLAG_TEMP_1 - msgbox RusturfTunnel_Text_22D510, 4 + msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -42,7 +42,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 end RusturfTunnel_EventScript_22CE99:: @ 822CE99 - msgbox RusturfTunnel_Text_22D5F3, 4 + msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -58,14 +58,14 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFC7 call RusturfTunnel_EventScript_22CFFF - msgbox RusturfTunnel_Text_22D65C, 4 + msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_22CFC8 compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 setflag FLAG_0x06A - msgbox RusturfTunnel_Text_22D6D2, 4 + msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CF5D @@ -73,7 +73,7 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE call_if 1, RusturfTunnel_EventScript_22CF6F compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CF8B - msgbox RusturfTunnel_Text_22D745, 4 + msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CFD4 @@ -281,7 +281,7 @@ RusturfTunnel_EventScript_22D07D:: @ 822D07D RusturfTunnel_EventScript_22D083:: @ 822D083 lockall - msgbox RusturfTunnel_Text_22D1C8, 4 + msgbox RusturfTunnel_Text_22D1C8, MSGBOX_DEFAULT closemessage applymovement 6, RusturfTunnel_Movement_22D0AB applymovement 7, RusturfTunnel_Movement_22D0AB @@ -303,7 +303,7 @@ RusturfTunnel_EventScript_22D0AF:: @ 822D0AF faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox RusturfTunnel_Text_22D1F7, 4 + msgbox RusturfTunnel_Text_22D1F7, MSGBOX_DEFAULT waitmoncry release end @@ -312,9 +312,9 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 lock faceplayer playbgm MUS_AQA_0, 0 - msgbox RusturfTunnel_Text_22D20A, 4 + msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 - msgbox RusturfTunnel_Text_22D2E1, 4 + msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage applymovement 255, RusturfTunnel_Movement_22D178 @@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 applymovement 255, RusturfTunnel_Movement_22D17E applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 - msgbox RusturfTunnel_Text_22D395, 4 + msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT applymovement 5, RusturfTunnel_Movement_27259E waitmovement 0 message RusturfTunnel_Text_22D3BA @@ -427,7 +427,7 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB - msgbox RusturfTunnel_Text_22D8F9, 6 + msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE end RusturfTunnel_Text_22D1C8: @ 822D1C8 diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index d53973e87..91780d608 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -15,7 +15,7 @@ SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF setvar VAR_PORTHOLE_STATE, 2 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C462, 4 + msgbox SSTidalCorridor_Text_23C462, MSGBOX_DEFAULT releaseall end @@ -23,7 +23,7 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015 setvar VAR_PORTHOLE_STATE, 6 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, 4 + msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT releaseall end @@ -31,14 +31,14 @@ SSTidalRooms_EventScript_23C028:: @ 823C028 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 playse SE_PINPON - msgbox SSTidalRooms_Text_23C462, 4 + msgbox SSTidalRooms_Text_23C462, MSGBOX_DEFAULT return SSTidalRooms_EventScript_23C03C:: @ 823C03C special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 playse SE_PINPON - msgbox SSTidalRooms_Text_23C553, 4 + msgbox SSTidalRooms_Text_23C553, MSGBOX_DEFAULT return SSTidalCorridor_EventScript_23C050:: @ 823C050 @@ -53,7 +53,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067 setvar VAR_PORTHOLE_STATE, 3 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, 4 + msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT releaseall end @@ -62,7 +62,7 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D setvar VAR_PORTHOLE_STATE, 8 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C50F, 4 + msgbox SSTidalCorridor_Text_23C50F, MSGBOX_DEFAULT releaseall end @@ -70,7 +70,7 @@ SSTidalRooms_EventScript_23C093:: @ 823C093 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 playse SE_PINPON - msgbox SSTidalRooms_Text_23C50F, 4 + msgbox SSTidalRooms_Text_23C50F, MSGBOX_DEFAULT return SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 @@ -82,7 +82,7 @@ SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 return SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9 - msgbox SSTidalCorridor_Text_23C6EC, 2 + msgbox SSTidalCorridor_Text_23C6EC, MSGBOX_NPC end SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 @@ -90,25 +90,25 @@ SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox SSTidalCorridor_Text_23C7E1, 4 + msgbox SSTidalCorridor_Text_23C7E1, MSGBOX_DEFAULT waitmoncry release end SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5 - msgbox SSTidalCorridor_Text_23C7F8, 3 + msgbox SSTidalCorridor_Text_23C7F8, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE - msgbox SSTidalCorridor_Text_23C800, 3 + msgbox SSTidalCorridor_Text_23C800, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C107:: @ 823C107 - msgbox SSTidalCorridor_Text_23C808, 3 + msgbox SSTidalCorridor_Text_23C808, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C110:: @ 823C110 - msgbox SSTidalCorridor_Text_23C810, 3 + msgbox SSTidalCorridor_Text_23C810, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C119:: @ 823C119 @@ -118,13 +118,13 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119 goto_eq SSTidalCorridor_EventScript_23C13B compare VAR_PORTHOLE_STATE, 8 goto_eq SSTidalCorridor_EventScript_23C15A - msgbox SSTidalCorridor_Text_23C596, 4 + msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_23C13B:: @ 823C13B setrespawn HEAL_LOCATION_LILYCOVE_CITY - msgbox SSTidalCorridor_Text_23C64F, 4 + msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 @@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B SSTidalCorridor_EventScript_23C15A:: @ 823C15A setrespawn HEAL_LOCATION_SLATEPORT_CITY - msgbox SSTidalCorridor_Text_23C64F, 4 + msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 @@ -152,7 +152,7 @@ SSTidalCorridor_EventScript_23C17D:: @ 823C17D goto_eq SSTidalCorridor_EventScript_23C19E compare VAR_PORTHOLE_STATE, 7 goto_eq SSTidalCorridor_EventScript_23C19E - msgbox SSTidalCorridor_Text_23C6C3, 4 + msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT releaseall end @@ -167,12 +167,12 @@ SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 checkflag FLAG_0x0F7 goto_eq SSTidalCorridor_EventScript_23C1BD call SSTidalCorridor_EventScript_23C1C7 - msgbox SSTidalCorridor_Text_23C65E, 4 + msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD - msgbox SSTidalCorridor_Text_23C6B0, 4 + msgbox SSTidalCorridor_Text_23C6B0, MSGBOX_DEFAULT release end @@ -206,7 +206,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 waitmovement 0 applymovement 255, SSTidalCorridor_Movement_2725A8 waitmovement 0 - msgbox SSTidalCorridor_Text_23C28F, 4 + msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage applymovement 255, SSTidalCorridor_Movement_23C27D applymovement 1, SSTidalCorridor_Movement_23C284 diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index 2ad1ed580..ac74fd2ec 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -3,12 +3,12 @@ SSTidalLowerDeck_MapScripts:: @ 823C818 SSTidalLowerDeck_EventScript_23C819:: @ 823C819 trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 - msgbox SSTidalLowerDeck_Text_23C8B4, 6 + msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE end SSTidalLowerDeck_EventScript_23C830:: @ 823C830 trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D - msgbox SSTidalLowerDeck_Text_23C98E, 6 + msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE end SSTidalLowerDeck_Text_23C847: @ 823C847 diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 39c453e98..b851f0f76 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -6,23 +6,23 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 faceplayer checkflag FLAG_0x104 goto_eq SSTidalRooms_EventScript_23CA29 - msgbox SSTidalRooms_Text_23D098, 4 + msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 goto_eq SSTidalRooms_EventScript_272054 setflag FLAG_0x104 - msgbox SSTidalRooms_Text_23D145, 4 + msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release end SSTidalRooms_EventScript_23CA29:: @ 823CA29 - msgbox SSTidalRooms_Text_23D145, 4 + msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release end SSTidalRooms_EventScript_23CA33:: @ 823CA33 lockall - msgbox SSTidalRooms_Text_23CAF2, 4 + msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT closemessage call SSTidalRooms_EventScript_272083 call SSTidalRooms_EventScript_23C0A7 @@ -31,37 +31,37 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 SSTidalRooms_EventScript_23CA49:: @ 823CA49 trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 - msgbox SSTidalRooms_Text_23CB75, 6 + msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA60:: @ 823CA60 trainerbattle 0, TRAINER_MICAH, 0, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 - msgbox SSTidalRooms_Text_23CC26, 6 + msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA77:: @ 823CA77 trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A - msgbox SSTidalRooms_Text_23CCBB, 6 + msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA8E:: @ 823CA8E trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 - msgbox SSTidalRooms_Text_23CD5F, 6 + msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 - msgbox SSTidalRooms_Text_23CE59, 6 + msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 - msgbox SSTidalRooms_Text_23CF45, 6 + msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CADB:: @ 823CADB trainerbattle 0, TRAINER_NAOMI, 0, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 - msgbox SSTidalRooms_Text_23D013, 6 + msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE end SSTidalRooms_Text_23CAF2: @ 823CAF2 diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index a96b6b95d..d98fdca88 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -2,10 +2,10 @@ SafariZone_North_MapScripts:: @ 823D253 .byte 0 SafariZone_North_EventScript_23D254:: @ 823D254 - msgbox SafariZone_North_Text_2A5489, 2 + msgbox SafariZone_North_Text_2A5489, MSGBOX_NPC end SafariZone_North_EventScript_23D25D:: @ 823D25D - msgbox SafariZone_North_Text_2A54F0, 2 + msgbox SafariZone_North_Text_2A54F0, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc index 34e510237..a64c142fe 100644 --- a/data/maps/SafariZone_Northwest/scripts.inc +++ b/data/maps/SafariZone_Northwest/scripts.inc @@ -2,6 +2,6 @@ SafariZone_Northwest_MapScripts:: @ 823D249 .byte 0 SafariZone_Northwest_EventScript_23D24A:: @ 823D24A - msgbox SafariZone_Northwest_Text_2A542C, 2 + msgbox SafariZone_Northwest_Text_2A542C, MSGBOX_NPC end diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc index 22657eeb1..e08cfe3da 100644 --- a/data/maps/SafariZone_RestHouse/scripts.inc +++ b/data/maps/SafariZone_RestHouse/scripts.inc @@ -2,14 +2,14 @@ SafariZone_RestHouse_MapScripts:: @ 8242BE6 .byte 0 SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7 - msgbox SafariZone_RestHouse_Text_2A5639, 2 + msgbox SafariZone_RestHouse_Text_2A5639, MSGBOX_NPC end SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0 - msgbox SafariZone_RestHouse_Text_2A56E1, 2 + msgbox SafariZone_RestHouse_Text_2A56E1, MSGBOX_NPC end SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9 - msgbox SafariZone_RestHouse_Text_2A5764, 2 + msgbox SafariZone_RestHouse_Text_2A5764, MSGBOX_NPC end diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 19f51b873..6579b6571 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -37,15 +37,15 @@ SafariZone_South_Movement_23D2C7: @ 823D2C7 step_end SafariZone_South_EventScript_23D2CA:: @ 823D2CA - msgbox SafariZone_South_Text_2A52EF, 2 + msgbox SafariZone_South_Text_2A52EF, MSGBOX_NPC end SafariZone_South_EventScript_23D2D3:: @ 823D2D3 - msgbox SafariZone_South_Text_2A533B, 2 + msgbox SafariZone_South_Text_2A533B, MSGBOX_NPC end SafariZone_South_EventScript_23D2DC:: @ 823D2DC - msgbox SafariZone_South_Text_2A553E, 2 + msgbox SafariZone_South_Text_2A553E, MSGBOX_NPC end SafariZone_South_EventScript_23D2E5:: @ 823D2E5 @@ -53,21 +53,21 @@ SafariZone_South_EventScript_23D2E5:: @ 823D2E5 faceplayer checkflag FLAG_0x05D goto_if 0, SafariZone_South_EventScript_23D30D - msgbox SafariZone_South_Text_2A51D4, 5 + msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SafariZone_South_EventScript_23D31A - msgbox SafariZone_South_Text_2A521A, 4 + msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT release end SafariZone_South_EventScript_23D30D:: @ 823D30D setflag FLAG_0x05D - msgbox SafariZone_South_Text_2A52AB, 4 + msgbox SafariZone_South_Text_2A52AB, MSGBOX_DEFAULT release end SafariZone_South_EventScript_23D31A:: @ 823D31A - msgbox SafariZone_South_Text_2A5248, 4 + msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT closemessage switch VAR_FACING case 2, SafariZone_South_EventScript_23D33F @@ -117,38 +117,38 @@ SafariZone_South_Movement_23D38D: @ 823D38D step_end SafariZone_South_EventScript_23D390:: @ 823D390 - msgbox SafariZone_South_Text_2A57EE, 2 + msgbox SafariZone_South_Text_2A57EE, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D399:: @ 823D399 - msgbox SafariZone_Southeast_Text_2A582D, 2 + msgbox SafariZone_Southeast_Text_2A582D, MSGBOX_NPC end SafariZone_South_EventScript_23D3A2:: @ 823D3A2 - msgbox SafariZone_South_Text_2A5887, 2 + msgbox SafariZone_South_Text_2A5887, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB - msgbox SafariZone_Southeast_Text_2A58C6, 2 + msgbox SafariZone_Southeast_Text_2A58C6, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4 - msgbox SafariZone_Southeast_Text_2A58FD, 2 + msgbox SafariZone_Southeast_Text_2A58FD, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD - msgbox SafariZone_Southeast_Text_2A5960, 2 + msgbox SafariZone_Southeast_Text_2A5960, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6 - msgbox SafariZone_Northeast_Text_2A59A4, 2 + msgbox SafariZone_Northeast_Text_2A59A4, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF - msgbox SafariZone_Northeast_Text_2A5A09, 2 + msgbox SafariZone_Northeast_Text_2A5A09, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8 - msgbox SafariZone_Northeast_Text_2A5A44, 2 + msgbox SafariZone_Northeast_Text_2A5A44, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc index d2e75eb1b..069f22b49 100644 --- a/data/maps/SafariZone_Southwest/scripts.inc +++ b/data/maps/SafariZone_Southwest/scripts.inc @@ -2,10 +2,10 @@ SafariZone_Southwest_MapScripts:: @ 823D266 .byte 0 SafariZone_Southwest_EventScript_23D267:: @ 823D267 - msgbox SafariZone_Southwest_Text_2A53B7, 2 + msgbox SafariZone_Southwest_Text_2A53B7, MSGBOX_NPC end SafariZone_Southwest_EventScript_23D270:: @ 823D270 - msgbox SafariZone_Southwest_Text_2A5613, 3 + msgbox SafariZone_Southwest_Text_2A5613, MSGBOX_SIGN end diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9eb71d5e3..db5dd7f02 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -27,7 +27,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 delay 30 setvar VAR_0x40D9, 1 moveobjectoffscreen 1 - msgbox SeafloorCavern_Entrance_Text_234544, 4 + msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 waitmovement 0 @@ -41,7 +41,7 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED call_if 1, SeafloorCavern_Entrance_EventScript_234523 compare VAR_FACING, 2 call_if 1, SeafloorCavern_Entrance_EventScript_234539 - msgbox SeafloorCavern_Entrance_Text_2346C8, 4 + msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 waitmovement 0 diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index d3308fca2..1fa5e833a 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -3,12 +3,12 @@ SeafloorCavern_Room1_MapScripts:: @ 82347EB SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC trainerbattle 0, TRAINER_GRUNT_5, 0, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A - msgbox SeafloorCavern_Room1_Text_23485D, 6 + msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE end SeafloorCavern_Room1_EventScript_234803:: @ 8234803 trainerbattle 0, TRAINER_GRUNT_6, 0, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD - msgbox SeafloorCavern_Room1_Text_2348E3, 6 + msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE end SeafloorCavern_Room1_Text_23481A: @ 823481A diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index f57d58e22..c3e581acb 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -3,12 +3,12 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937 SeafloorCavern_Room3_EventScript_234938:: @ 8234938 trainerbattle 0, TRAINER_SHELLY_2, 0, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 - msgbox SeafloorCavern_Room3_Text_234A8A, 6 + msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE end SeafloorCavern_Room3_EventScript_23494F:: @ 823494F trainerbattle 0, TRAINER_GRUNT_27, 0, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE - msgbox SeafloorCavern_Room3_Text_234C04, 6 + msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE end SeafloorCavern_Room3_Text_234966: @ 8234966 diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index e509013d6..e42b7c825 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -3,12 +3,12 @@ SeafloorCavern_Room4_MapScripts:: @ 8234C9B SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C trainerbattle 0, TRAINER_GRUNT_7, 0, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 - msgbox SeafloorCavern_Room4_Text_234CFC, 6 + msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE end SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 trainerbattle 0, TRAINER_GRUNT_9, 0, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 - msgbox SeafloorCavern_Room4_Text_234D79, 6 + msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE end SeafloorCavern_Room4_Text_234CCA: @ 8234CCA diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 8761e4bfe..aea2c1b77 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -12,27 +12,27 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement 255, SeafloorCavern_Room9_Movement_23505C waitmovement 0 playbgm MUS_AQA_0, 0 - msgbox SeafloorCavern_Room9_Text_23505F, 4 + msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 applymovement 255, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23507C, 4 + msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2350A6, 4 + msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23512C, 4 + msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC - msgbox SeafloorCavern_Room9_Text_2351E5, 4 + msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT setweather 0 doweather special sub_80B05B4 waitstate - msgbox SeafloorCavern_Room9_Text_235279, 4 + msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT special WaitWeather waitstate setvar VAR_RESULT, 1 @@ -80,21 +80,21 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - msgbox SeafloorCavern_Room9_Text_2352A7, 4 + msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN applymovement 255, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2352F6, 4 + msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23532B, 4 + msgbox SeafloorCavern_Room9_Text_23532B, MSGBOX_DEFAULT closemessage playse SE_PC_OFF delay 20 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23546F, 4 + msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage addobject VAR_0x8005 addobject VAR_0x8006 @@ -105,19 +105,19 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2354F0, 4 + msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2355C2, 4 - msgbox SeafloorCavern_Room9_Text_235692, 4 + msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_235723, 4 + msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT setvar VAR_0x407B, 1 setvar VAR_0x405E, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 9cd3727bb..a906d338e 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -28,7 +28,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 waitstate playse SE_DOOR delay 40 - msgbox gUnknown_0827301B, 4 + msgbox gUnknown_0827301B, MSGBOX_DEFAULT closemessage fadeinbgm 0 setflag FLAG_0x0E4 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index e9e79d1e9..7d3e32479 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -118,7 +118,7 @@ SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 end SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 14d5ba0fa..7d63928ab 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -28,7 +28,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 checkitem ITEM_SHOAL_SHELL, 4 compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, 5 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 @@ -36,13 +36,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 compare VAR_RESULT, 2 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end @@ -64,7 +64,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B return ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, MSGBOX_DEFAULT release end @@ -75,17 +75,17 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B checkitem ITEM_SHOAL_SHELL, 1 compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT release end ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, MSGBOX_DEFAULT release end ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, MSGBOX_DEFAULT release end diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 94505a96d..a92e84e3a 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -82,7 +82,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA end ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC - msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, 4 + msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, MSGBOX_DEFAULT releaseall end @@ -139,7 +139,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C end ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE - msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 9883bf3da..fc0fb32a7 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -29,7 +29,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 end ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 - msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end @@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 faceplayer checkflag FLAG_0x11B goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 @@ -47,7 +47,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 end ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_23728D, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_23728D, MSGBOX_DEFAULT release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index e8c87bd98..de2faf65b 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -29,7 +29,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A end ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C - msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index c852e3484..c809130b7 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -40,7 +40,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 waitmovement 0 applymovement 255, SkyPillar_Outside_Movement_2725A4 waitmovement 0 - msgbox SkyPillar_Outside_Text_239416, 4 + msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage delay 30 setvar VAR_0x8004, 1 @@ -50,7 +50,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 40 - msgbox SkyPillar_Outside_Text_2394BC, 4 + msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT closemessage applymovement 255, SkyPillar_Outside_Movement_2393EB applymovement 1, SkyPillar_Outside_Movement_2393DE @@ -71,7 +71,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 applymovement 1, SkyPillar_Outside_Movement_2725AA waitmovement 0 delay 30 - msgbox SkyPillar_Outside_Text_23950C, 4 + msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL setweather 15 @@ -79,7 +79,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special WaitWeather waitstate delay 30 - msgbox SkyPillar_Outside_Text_23953A, 4 + msgbox SkyPillar_Outside_Text_23953A, MSGBOX_DEFAULT closemessage playse SE_KAIDAN fadescreenswapbuffers 1 @@ -138,7 +138,7 @@ SkyPillar_Outside_EventScript_2393F8:: @ 82393F8 end SkyPillar_Outside_EventScript_2393F9:: @ 82393F9 - msgbox SkyPillar_Outside_Text_239402, 3 + msgbox SkyPillar_Outside_Text_239402, MSGBOX_SIGN end SkyPillar_Outside_Text_239402: @ 8239402 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index a0ae3eb24..ef0419cdb 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -89,7 +89,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 bufferspeciesname 0, VAR_0x8004 - msgbox gUnknown_08273204, 4 + msgbox gUnknown_08273204, MSGBOX_DEFAULT releaseall end @@ -124,7 +124,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A applymovement 1, SkyPillar_Top_Movement_23984B waitmovement 0 removeobject 1 - msgbox SkyPillar_Top_Text_239860, 4 + msgbox SkyPillar_Top_Text_239860, MSGBOX_DEFAULT closemessage delay 20 fadeinbgm 1 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 588a37636..d13953d0d 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -59,24 +59,24 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C applymovement 255, SlateportCity_Movement_1DCDA8 applymovement 35, SlateportCity_Movement_1DCDAC waitmovement 0 - msgbox SlateportCity_Text_1DF032, 4 + msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage applymovement 35, SlateportCity_Movement_2725A4 waitmovement 0 delay 60 - msgbox SlateportCity_Text_1DF0FE, 4 + msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT applymovement 35, SlateportCity_Movement_2725A8 waitmovement 0 - msgbox SlateportCity_Text_1DF12B, 4 + msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SlateportCity_Text_1DF1A6, 4 + msgbox SlateportCity_Text_1DF1A6, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0D7 - msgbox SlateportCity_Text_1DF1D3, 4 + msgbox SlateportCity_Text_1DF1D3, MSGBOX_DEFAULT closemessage applymovement 35, SlateportCity_Movement_1DCDB4 waitmovement 0 @@ -122,7 +122,7 @@ SlateportCity_EventScript_1DCDBD:: @ 81DCDBD message SlateportCity_Text_1DD64A waitmessage pokemart SlateportCity_Pokemart_1DCDD4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -141,29 +141,29 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 lock faceplayer bufferleadmonspeciesname 0 - msgbox SlateportCity_Text_1DD68A, 4 + msgbox SlateportCity_Text_1DD68A, MSGBOX_DEFAULT specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E - msgbox SlateportCity_Text_1DD697, 4 + msgbox SlateportCity_Text_1DD697, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message SlateportCity_Text_1DD6E3 waitfanfare - msgbox SlateportCity_Text_1DD702, 4 + msgbox SlateportCity_Text_1DD702, MSGBOX_DEFAULT special GiveLeadMonEffortRibbon release end SlateportCity_EventScript_1DCE2E:: @ 81DCE2E - msgbox SlateportCity_Text_1DD722, 4 + msgbox SlateportCity_Text_1DD722, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE38:: @ 81DCE38 - msgbox SlateportCity_Text_1DD77B, 4 + msgbox SlateportCity_Text_1DD77B, MSGBOX_DEFAULT release end @@ -172,12 +172,12 @@ SlateportCity_EventScript_1DCE42:: @ 81DCE42 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE59 - msgbox SlateportCity_Text_1DD81A, 4 + msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE59:: @ 81DCE59 - msgbox SlateportCity_Text_1DE3E2, 4 + msgbox SlateportCity_Text_1DE3E2, MSGBOX_DEFAULT release end @@ -186,12 +186,12 @@ SlateportCity_EventScript_1DCE63:: @ 81DCE63 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE7A - msgbox SlateportCity_Text_1DD8A6, 4 + msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE7A:: @ 81DCE7A - msgbox SlateportCity_Text_1DE28E, 4 + msgbox SlateportCity_Text_1DE28E, MSGBOX_DEFAULT release end @@ -202,17 +202,17 @@ SlateportCity_EventScript_1DCE84:: @ 81DCE84 call_if 1, SlateportCity_EventScript_1DCEA4 checkflag FLAG_0x060 goto_eq SlateportCity_EventScript_1DCEAE - msgbox SlateportCity_Text_1DD93D, 4 + msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCEA4:: @ 81DCEA4 - msgbox SlateportCity_Text_1DE30C, 4 + msgbox SlateportCity_Text_1DE30C, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCEAE:: @ 81DCEAE - msgbox SlateportCity_Text_1DD999, 4 + msgbox SlateportCity_Text_1DD999, MSGBOX_DEFAULT release end @@ -221,23 +221,23 @@ SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCECF - msgbox SlateportCity_Text_1DDA34, 4 + msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCECF:: @ 81DCECF - msgbox SlateportCity_Text_1DE376, 4 + msgbox SlateportCity_Text_1DE376, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCED9:: @ 81DCED9 compare VAR_0x4058, 1 goto_eq SlateportCity_EventScript_1DCEED - msgbox SlateportCity_Text_1DDA9A, 2 + msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC end SlateportCity_EventScript_1DCEED:: @ 81DCEED - msgbox SlateportCity_Text_1DE43D, 3 + msgbox SlateportCity_Text_1DE43D, MSGBOX_SIGN end SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 @@ -245,12 +245,12 @@ SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCF0D - msgbox SlateportCity_Text_1DDB21, 4 + msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF0D:: @ 81DCF0D - msgbox SlateportCity_Text_1DE460, 4 + msgbox SlateportCity_Text_1DE460, MSGBOX_DEFAULT release end @@ -259,17 +259,17 @@ SlateportCity_EventScript_1DCF17:: @ 81DCF17 faceplayer checkflag FLAG_0x094 goto_eq SlateportCity_EventScript_1DCF2C - msgbox SlateportCity_Text_1DDBAC, 4 + msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF2C:: @ 81DCF2C - msgbox SlateportCity_Text_1DDBD5, 4 + msgbox SlateportCity_Text_1DDBD5, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF36:: @ 81DCF36 - msgbox SlateportCity_Text_1DE8BC, 3 + msgbox SlateportCity_Text_1DE8BC, MSGBOX_SIGN end SlateportCity_EventScript_1DCF3F:: @ 81DCF3F @@ -278,51 +278,51 @@ SlateportCity_EventScript_1DCF3F:: @ 81DCF3F goto_eq SlateportCity_EventScript_1DCF66 checkflag FLAG_BADGE07_GET goto_eq SlateportCity_EventScript_1DCF5C - msgbox SlateportCity_Text_1DE8F8, 4 + msgbox SlateportCity_Text_1DE8F8, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF5C:: @ 81DCF5C - msgbox SlateportCity_Text_1DE940, 4 + msgbox SlateportCity_Text_1DE940, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF66:: @ 81DCF66 - msgbox SlateportCity_Text_1DE9AA, 4 + msgbox SlateportCity_Text_1DE9AA, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF70:: @ 81DCF70 - msgbox SlateportCity_Text_1DEA0B, 3 + msgbox SlateportCity_Text_1DEA0B, MSGBOX_SIGN end SlateportCity_EventScript_1DCF79:: @ 81DCF79 - msgbox SlateportCity_Text_1DEA3B, 3 + msgbox SlateportCity_Text_1DEA3B, MSGBOX_SIGN end SlateportCity_EventScript_1DCF82:: @ 81DCF82 - msgbox SlateportCity_Text_1DEA6F, 3 + msgbox SlateportCity_Text_1DEA6F, MSGBOX_SIGN end SlateportCity_EventScript_1DCF8B:: @ 81DCF8B - msgbox SlateportCity_Text_1DEAAF, 3 + msgbox SlateportCity_Text_1DEAAF, MSGBOX_SIGN end SlateportCity_EventScript_1DCF94:: @ 81DCF94 lockall checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_EventScript_1DCFA8 - msgbox SlateportCity_Text_1DEAE3, 4 + msgbox SlateportCity_Text_1DEAE3, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCFA8:: @ 81DCFA8 - msgbox SlateportCity_Text_1DEB5A, 4 + msgbox SlateportCity_Text_1DEB5A, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 - msgbox SlateportCity_Text_1DEBA0, 3 + msgbox SlateportCity_Text_1DEBA0, MSGBOX_SIGN end SlateportCity_EventScript_1DCFBB:: @ 81DCFBB @@ -330,39 +330,39 @@ SlateportCity_EventScript_1DCFBB:: @ 81DCFBB faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCFD2 - msgbox SlateportCity_Text_1DE10E, 4 + msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCFD2:: @ 81DCFD2 - msgbox SlateportCity_Text_1DE10E, 4 + msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCFDC:: @ 81DCFDC - msgbox SlateportCity_Text_1DE16C, 2 + msgbox SlateportCity_Text_1DE16C, MSGBOX_NPC end SlateportCity_EventScript_1DCFE5:: @ 81DCFE5 - msgbox SlateportCity_Text_1DDFF7, 2 + msgbox SlateportCity_Text_1DDFF7, MSGBOX_NPC end SlateportCity_EventScript_1DCFEE:: @ 81DCFEE - msgbox SlateportCity_Text_1DE04B, 2 + msgbox SlateportCity_Text_1DE04B, MSGBOX_NPC end SlateportCity_EventScript_1DCFF7:: @ 81DCFF7 - msgbox SlateportCity_Text_1DE0D2, 2 + msgbox SlateportCity_Text_1DE0D2, MSGBOX_NPC end SlateportCity_EventScript_1DD000:: @ 81DD000 - msgbox SlateportCity_Text_1DE1EC, 2 + msgbox SlateportCity_Text_1DE1EC, MSGBOX_NPC end SlateportCity_EventScript_1DD009:: @ 81DD009 lock faceplayer - msgbox SlateportCity_Text_1DDC4F, 4 + msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT closemessage applymovement 5, SlateportCity_Movement_2725A2 waitmovement 0 @@ -372,7 +372,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009 SlateportCity_EventScript_1DD020:: @ 81DD020 lock faceplayer - msgbox SlateportCity_Text_1DDC8A, 4 + msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT closemessage applymovement 18, SlateportCity_Movement_2725A2 waitmovement 0 @@ -382,7 +382,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020 SlateportCity_EventScript_1DD037:: @ 81DD037 lock faceplayer - msgbox SlateportCity_Text_1DDCD5, 4 + msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT closemessage applymovement 19, SlateportCity_Movement_2725A2 waitmovement 0 @@ -392,7 +392,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037 SlateportCity_EventScript_1DD04E:: @ 81DD04E lock faceplayer - msgbox SlateportCity_Text_1DDD18, 4 + msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT closemessage applymovement 26, SlateportCity_Movement_2725A2 waitmovement 0 @@ -402,7 +402,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E SlateportCity_EventScript_1DD065:: @ 81DD065 lock faceplayer - msgbox SlateportCity_Text_1DDD7D, 4 + msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT closemessage applymovement 27, SlateportCity_Movement_2725A2 waitmovement 0 @@ -412,7 +412,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065 SlateportCity_EventScript_1DD07C:: @ 81DD07C lock faceplayer - msgbox SlateportCity_Text_1DDDC0, 4 + msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT closemessage applymovement 28, SlateportCity_Movement_2725A2 waitmovement 0 @@ -422,7 +422,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C SlateportCity_EventScript_1DD093:: @ 81DD093 lock faceplayer - msgbox SlateportCity_Text_1DDDDF, 4 + msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT closemessage applymovement 29, SlateportCity_Movement_2725A2 waitmovement 0 @@ -432,7 +432,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093 SlateportCity_EventScript_1DD0AA:: @ 81DD0AA lock faceplayer - msgbox SlateportCity_Text_1DDE2F, 4 + msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT closemessage applymovement 30, SlateportCity_Movement_2725A2 waitmovement 0 @@ -447,7 +447,7 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 waitmovement 0 applymovement 31, SlateportCity_Movement_27259A waitmovement 0 - msgbox SlateportCity_Text_1DDE6E, 4 + msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_2725A2 waitmovement 0 @@ -455,13 +455,13 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 waitmovement 0 applymovement 31, SlateportCity_Movement_27259E waitmovement 0 - msgbox SlateportCity_Text_1DDE86, 4 + msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_2725A2 waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - msgbox SlateportCity_Text_1DDEB8, 4 + msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_27259E waitmovement 0 @@ -478,13 +478,13 @@ SlateportCity_Movement_1DD147: @ 81DD147 step_end SlateportCity_EventScript_1DD14A:: @ 81DD14A - msgbox SlateportCity_Text_1DDF32, 3 + msgbox SlateportCity_Text_1DDF32, MSGBOX_SIGN end SlateportCity_EventScript_1DD153:: @ 81DD153 lock faceplayer - msgbox SlateportCity_Text_1DDF8D, 4 + msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT closemessage applymovement 33, SlateportCity_Movement_2725A2 waitmovement 0 @@ -497,7 +497,7 @@ SlateportCity_EventScript_1DD16A:: @ 81DD16A message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD184 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -511,7 +511,7 @@ SlateportCity_PokemartDecor_1DD184: @ 81DD184 end SlateportCity_EventScript_1DD18E:: @ 81DD18E - msgbox gUnknown_08272E30, 4 + msgbox gUnknown_08272E30, MSGBOX_DEFAULT release end @@ -523,7 +523,7 @@ SlateportCity_EventScript_1DD198:: @ 81DD198 message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -552,7 +552,7 @@ SlateportCity_EventScript_1DD1D8:: @ 81DD1D8 message gUnknown_08272A21 waitmessage pokemart SlateportCity_Pokemart_1DD1F0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -566,8 +566,8 @@ SlateportCity_Pokemart_1DD1F0: @ 81DD1F0 SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 lockall - msgbox SlateportCity_Text_1DE502, 4 - msgbox SlateportCity_Text_1DE54A, 4 + msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT + msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage applymovement 10, SlateportCity_Movement_2725A8 waitmovement 0 @@ -582,12 +582,12 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 removeobject 10 removeobject 9 - msgbox SlateportCity_Text_1DE5F7, 4 + msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT applymovement 11, SlateportCity_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Text_1DE64F, 4 + msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 - msgbox SlateportCity_Text_1DE724, 4 + msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT applymovement 6, SlateportCity_Movement_2725A4 applymovement 1, SlateportCity_Movement_2725A4 applymovement 7, SlateportCity_Movement_1DD309 @@ -596,7 +596,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, SlateportCity_Movement_2725AA waitmovement 0 - msgbox SlateportCity_Text_1DE7F7, 4 + msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN applymovement 11, SlateportCity_Movement_272598 waitmovement 0 @@ -604,8 +604,8 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, SlateportCity_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Text_1DE860, 4 - msgbox SlateportCity_Text_1DE8A0, 4 + msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT + msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_1DD337 applymovement 255, SlateportCity_Movement_1DD344 @@ -714,15 +714,15 @@ SlateportCity_Movement_1DD34A: @ 81DD34A step_end SlateportCity_EventScript_1DD353:: @ 81DD353 - msgbox SlateportCity_Text_1DE491, 3 + msgbox SlateportCity_Text_1DE491, MSGBOX_SIGN end SlateportCity_EventScript_1DD35C:: @ 81DD35C - msgbox SlateportCity_Text_1DE4C4, 3 + msgbox SlateportCity_Text_1DE4C4, MSGBOX_SIGN end SlateportCity_EventScript_1DD365:: @ 81DD365 - msgbox SlateportCity_Text_1DD7AD, 2 + msgbox SlateportCity_Text_1DD7AD, MSGBOX_NPC end SlateportCity_EventScript_1DD36E:: @ 81DD36E @@ -730,10 +730,10 @@ SlateportCity_EventScript_1DD36E:: @ 81DD36E faceplayer checkflag FLAG_0x151 goto_eq SlateportCity_EventScript_1DD39A - msgbox SlateportCity_Text_1DEBCE, 4 + msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT giveitem_std ITEM_POWDER_JAR setflag FLAG_0x151 - msgbox SlateportCity_Text_1DED27, 4 + msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT release end @@ -742,13 +742,13 @@ SlateportCity_EventScript_1DD39A:: @ 81DD39A specialvar VAR_RESULT, sub_80246D4 compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3C0 - msgbox SlateportCity_Text_1DEE40, 4 + msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT special sub_80248B0 goto SlateportCity_EventScript_1DD3CA end SlateportCity_EventScript_1DD3C0:: @ 81DD3C0 - msgbox SlateportCity_Text_1DED27, 4 + msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT release end @@ -852,13 +852,13 @@ SlateportCity_EventScript_1DD536:: @ 81DD536 end SlateportCity_EventScript_1DD54A:: @ 81DD54A - msgbox SlateportCity_Text_1DEFBC, 4 + msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD557:: @ 81DD557 - msgbox SlateportCity_Text_1DEE90, 5 + msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 @@ -871,22 +871,22 @@ SlateportCity_EventScript_1DD557:: @ 81DD557 copyvar VAR_0x8004, VAR_0x8009 special sub_802477C special sub_802488C - msgbox SlateportCity_Text_1DEEF7, 5 + msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_EventScript_1DD3CA - msgbox SlateportCity_Text_1DEF79, 4 + msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 - msgbox gUnknown_08272A89, 4 + msgbox gUnknown_08272A89, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD5CE:: @ 81DD5CE - msgbox SlateportCity_Text_1DEEC9, 4 + msgbox SlateportCity_Text_1DEEC9, MSGBOX_DEFAULT goto SlateportCity_EventScript_1DD3CA end @@ -902,7 +902,7 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC waitmovement 0 closedoor 10, 12 waitdooranim - msgbox SlateportCity_Text_1DF28C, 4 + msgbox SlateportCity_Text_1DF28C, MSGBOX_DEFAULT closemessage applymovement 255, SlateportCity_Movement_1DD634 applymovement 35, SlateportCity_Movement_1DD63A diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 6b63f13f8..3cff83bd8 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -51,7 +51,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE setvar VAR_0x8004, 4 special sub_81B99B4 lockall - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage special HealPlayerParty diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 57df51237..4e676460c 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -35,14 +35,14 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 special sub_81B9D08 setvar VAR_0x8004, 8 special sub_81B9D08 - msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 6 special sub_81B9D08 waitstate SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 - msgbox SlateportCity_BattleTentCorridor_Text_25AB96, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 waitmovement 0 @@ -62,7 +62,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE special CallBattleFactoryFunction setvar VAR_0x8004, 16 special CallBattleFactoryFunction - msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25A22D, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -82,7 +82,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D case 2, SlateportCity_BattleTentCorridor_EventScript_208F89 SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B - msgbox SlateportCity_BattleTentCorridor_Text_25A350, 5 + msgbox SlateportCity_BattleTentCorridor_Text_25A350, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D case 1, SlateportCity_BattleTentCorridor_EventScript_209022 @@ -100,7 +100,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89 SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB setvar VAR_0x8004, 8 special sub_81B9D08 - msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, 5 + msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4 case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1 @@ -113,7 +113,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 waitstate compare VAR_RESULT, 1 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 - msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, MSGBOX_DEFAULT goto SlateportCity_BattleTentCorridor_EventScript_208EB4 SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 2e7886a2e..8cf551943 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -27,7 +27,7 @@ SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 lockall - msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -58,7 +58,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 waitse SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 - msgbox SlateportCity_BattleTentLobby_Text_2C5D14, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT setvar VAR_0x8004, 5 special sub_81B9D08 switch VAR_RESULT @@ -74,7 +74,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 goto SlateportCity_BattleTentLobby_EventScript_208861 SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A - msgbox SlateportCity_BattleTentLobby_Text_2C5D52, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5D52, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208861 SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 @@ -92,7 +92,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 waitse SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861 - msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -123,7 +123,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA compare VAR_RESULT, 0 goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 special SavePlayerParty - msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA message SlateportCity_BattleTentLobby_Text_2C586A @@ -142,7 +142,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc - msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5 + msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentLobby_EventScript_208A2B case 1, SlateportCity_BattleTentLobby_EventScript_208950 @@ -172,7 +172,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 setvar VAR_0x8006, 0 SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC - msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, MSGBOX_DEFAULT closemessage call SlateportCity_BattleTentLobby_EventScript_2089C9 warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -217,7 +217,7 @@ SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 step_end SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 - msgbox SlateportCity_BattleTentLobby_Text_2C589C, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C589C, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_2088CA SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 @@ -231,7 +231,7 @@ SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B special LoadPlayerParty SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E - msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT release end @@ -247,35 +247,35 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D faceplayer checkflag FLAG_0x109 goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 - msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4 + msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentLobby_EventScript_272054 setflag FLAG_0x109 - msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 + msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release end SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74 - msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 + msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release end SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E - msgbox SlateportCity_BattleTentLobby_Text_208D27, 2 + msgbox SlateportCity_BattleTentLobby_Text_208D27, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87 - msgbox SlateportCity_BattleTentLobby_Text_208DA6, 2 + msgbox SlateportCity_BattleTentLobby_Text_208DA6, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90 - msgbox SlateportCity_BattleTentLobby_Text_208DF1, 2 + msgbox SlateportCity_BattleTentLobby_Text_208DF1, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99 lockall - msgbox SlateportCity_BattleTentLobby_Text_259721, 4 + msgbox SlateportCity_BattleTentLobby_Text_259721, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end @@ -294,27 +294,27 @@ SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8 end SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06 - msgbox SlateportCity_BattleTentLobby_Text_2C5F08, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5F08, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14 - msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22 - msgbox SlateportCity_BattleTentLobby_Text_2C6020, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C6020, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30 - msgbox SlateportCity_BattleTentLobby_Text_2C60C0, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C60C0, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E - msgbox SlateportCity_BattleTentLobby_Text_2C61FE, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C61FE, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 20e6b78ed..bad96e2b0 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -54,7 +54,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 applymovement 6, SlateportCity_Harbor_Movement_2725AA applymovement 255, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Harbor_Text_20D291, 4 + msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage applymovement 6, SlateportCity_Harbor_Movement_20CAC8 applymovement 7, SlateportCity_Harbor_Movement_20CAC8 @@ -74,7 +74,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 compare VAR_0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 - msgbox SlateportCity_Harbor_Text_20D35A, 4 + msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE @@ -164,12 +164,12 @@ SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_Harbor_EventScript_20CB06 - msgbox SlateportCity_Harbor_Text_20CE20, 4 + msgbox SlateportCity_Harbor_Text_20CE20, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 - msgbox SlateportCity_Harbor_Text_20CE87, 4 + msgbox SlateportCity_Harbor_Text_20CE87, MSGBOX_DEFAULT message SlateportCity_Harbor_Text_20CF1C waitmessage goto SlateportCity_Harbor_EventScript_20CB1A @@ -195,12 +195,12 @@ SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50 end SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 - msgbox SlateportCity_Harbor_Text_20CEC1, 4 + msgbox SlateportCity_Harbor_Text_20CEC1, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 - msgbox SlateportCity_Harbor_Text_20CF93, 5 + msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE_STATE, 1 @@ -211,7 +211,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 end SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA - msgbox SlateportCity_Harbor_Text_20CFAE, 5 + msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 @@ -227,7 +227,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD end SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 - msgbox SlateportCity_Harbor_Text_20CFCB, 4 + msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 @@ -244,7 +244,7 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 return SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D - msgbox SlateportCity_Harbor_Text_20CF71, 4 + msgbox SlateportCity_Harbor_Text_20CF71, MSGBOX_DEFAULT release end @@ -279,12 +279,12 @@ SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 call_if 1, SlateportCity_Harbor_EventScript_20CC93 compare VAR_0x8004, 2 goto_eq SlateportCity_Harbor_EventScript_20CC89 - msgbox SlateportCity_Harbor_Text_20D08E, 4 + msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89 - msgbox SlateportCity_Harbor_Text_20D01C, 4 + msgbox SlateportCity_Harbor_Text_20D01C, MSGBOX_DEFAULT release end @@ -293,7 +293,7 @@ SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93 return SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99 - msgbox SlateportCity_Harbor_Text_20D194, 2 + msgbox SlateportCity_Harbor_Text_20D194, MSGBOX_NPC end SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 @@ -307,7 +307,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_eq SlateportCity_Harbor_EventScript_20CCE9 compare VAR_0x40A0, 2 goto_eq SlateportCity_Harbor_EventScript_20CCDF - msgbox SlateportCity_Harbor_Text_20D232, 4 + msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 waitmovement 0 @@ -315,18 +315,18 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 end SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF - msgbox SlateportCity_Harbor_Text_20D35A, 4 + msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9 setflag FLAG_0x10F - msgbox SlateportCity_Harbor_Text_20D42B, 4 + msgbox SlateportCity_Harbor_Text_20D42B, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 - msgbox SlateportCity_Harbor_Text_20D58A, 4 + msgbox SlateportCity_Harbor_Text_20D58A, MSGBOX_DEFAULT release end @@ -338,12 +338,12 @@ SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 goto_eq SlateportCity_Harbor_EventScript_20CD38 checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_Harbor_EventScript_20CD2E - msgbox SlateportCity_Harbor_Text_20D65C, 4 + msgbox SlateportCity_Harbor_Text_20D65C, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E - msgbox SlateportCity_Harbor_Text_20D6CB, 4 + msgbox SlateportCity_Harbor_Text_20D6CB, MSGBOX_DEFAULT release end @@ -363,33 +363,33 @@ SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 end SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B - msgbox SlateportCity_Harbor_Text_20D8BC, 5 + msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, 4 + msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_TRADED_SCANNER_TO_STERN goto SlateportCity_Harbor_EventScript_20CE11 end SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB - msgbox SlateportCity_Harbor_Text_20D8F1, 5 + msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, 4 + msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_TRADED_SCANNER_TO_STERN goto SlateportCity_Harbor_EventScript_20CE11 end SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB - msgbox SlateportCity_Harbor_Text_20D841, 4 + msgbox SlateportCity_Harbor_Text_20D841, MSGBOX_DEFAULT release end @@ -401,7 +401,7 @@ SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05 SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11 setvar VAR_TEMP_1, 1 - msgbox SlateportCity_Harbor_Text_20D970, 4 + msgbox SlateportCity_Harbor_Text_20D970, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 745cc6627..6b0fff3b3 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_House1_MapScripts:: @ 8209AA4 SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 lock faceplayer - msgbox SlateportCity_House1_Text_209B8E, 5 + msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209AC6 compare VAR_RESULT, 0 @@ -12,7 +12,7 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 end SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 - msgbox SlateportCity_House1_Text_209BFF, 4 + msgbox SlateportCity_House1_Text_209BFF, MSGBOX_DEFAULT special sub_81B94B0 waitstate compare VAR_0x8004, 255 @@ -22,7 +22,7 @@ SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 end SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 - msgbox SlateportCity_House1_Text_209D42, 4 + msgbox SlateportCity_House1_Text_209D42, MSGBOX_DEFAULT release end @@ -38,7 +38,7 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 - msgbox SlateportCity_House1_Text_209C2B, 5 + msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B5A compare VAR_RESULT, 0 @@ -46,28 +46,28 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 end SlateportCity_House1_EventScript_209B46:: @ 8209B46 - msgbox SlateportCity_House1_Text_209E74, 4 + msgbox SlateportCity_House1_Text_209E74, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B50:: @ 8209B50 - msgbox SlateportCity_House1_Text_209DF0, 4 + msgbox SlateportCity_House1_Text_209DF0, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B5A:: @ 8209B5A - msgbox SlateportCity_House1_Text_209CA4, 4 + msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT call SlateportCity_House1_EventScript_2723DD specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B84 - msgbox SlateportCity_House1_Text_209D5E, 4 + msgbox SlateportCity_House1_Text_209D5E, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B84:: @ 8209B84 - msgbox SlateportCity_House1_Text_209CD4, 4 + msgbox SlateportCity_House1_Text_209CD4, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc index 28a05ed38..5946b6f43 100644 --- a/data/maps/SlateportCity_House2/scripts.inc +++ b/data/maps/SlateportCity_House2/scripts.inc @@ -2,11 +2,11 @@ SlateportCity_House2_MapScripts:: @ 820D9AE .byte 0 SlateportCity_House2_EventScript_20D9AF:: @ 820D9AF - msgbox SlateportCity_House2_Text_20D9C1, 2 + msgbox SlateportCity_House2_Text_20D9C1, MSGBOX_NPC end SlateportCity_House2_EventScript_20D9B8:: @ 820D9B8 - msgbox SlateportCity_House2_Text_20DA59, 2 + msgbox SlateportCity_House2_Text_20DA59, MSGBOX_NPC end SlateportCity_House2_Text_20D9C1: @ 820D9C1 diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index da217f809..cc1eff7f6 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -7,7 +7,7 @@ SlateportCity_Mart_EventScript_20DC49:: @ 820DC49 message gUnknown_08272A21 waitmessage pokemart SlateportCity_Mart_Pokemart_20DC60 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -26,11 +26,11 @@ SlateportCity_Mart_Pokemart_20DC60: @ 820DC60 end SlateportCity_Mart_EventScript_20DC76:: @ 820DC76 - msgbox SlateportCity_Mart_Text_20DC88, 2 + msgbox SlateportCity_Mart_Text_20DC88, MSGBOX_NPC end SlateportCity_Mart_EventScript_20DC7F:: @ 820DC7F - msgbox SlateportCity_Mart_Text_20DCF8, 2 + msgbox SlateportCity_Mart_Text_20DCF8, MSGBOX_NPC end SlateportCity_Mart_Text_20DC88: @ 820DC88 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 0ed39c118..33bcafc6f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -2,7 +2,7 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95 .byte 0 SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F @@ -21,7 +21,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 showmoneybox 0, 0, 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5 + msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 closemessage @@ -41,7 +41,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 takemoney 0x32, 0 updatemoneybox 0, 0 nop - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT setvar VAR_0x40AA, 1 hidemoneybox nop @@ -52,7 +52,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 checkflag FLAG_0x095 goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT closemessage hidemoneybox nop @@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 end SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT setvar VAR_0x40AA, 1 hidemoneybox nop @@ -76,79 +76,79 @@ SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B step_end SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F - msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A - msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C - msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E - msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB - msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD - msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF - msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 @@ -160,12 +160,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 waitmovement 0 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A waitmovement 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 setflag FLAG_0x10D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C @@ -205,7 +205,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA end SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index f31a0d386..05f654933 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 1 addobject 3 @@ -20,11 +20,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 compare VAR_FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT compare VAR_FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 @@ -33,31 +33,31 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 compare VAR_FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT closemessage delay 35 addobject 2 applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, MSGBOX_DEFAULT closemessage applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, MSGBOX_DEFAULT closemessage savebgm MUS_DUMMY fadedefaultbgm @@ -70,10 +70,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 call SlateportCity_OceanicMuseum_2F_EventScript_2723E4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, MSGBOX_DEFAULT closemessage fadescreen 1 playfanfare MUS_ME_ASA @@ -216,57 +216,57 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE step_end SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C - msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E - msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B - msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, 2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, MSGBOX_NPC end SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D - msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, 2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, MSGBOX_NPC end SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 waitmovement 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index dd62280bb..bbc91609c 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 end SlateportCity_PokemonCenter_1F_EventScript_20DAE1:: @ 820DAE1 - msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, 2 + msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, MSGBOX_NPC end SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA - msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, 2 + msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, MSGBOX_NPC end SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3 diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 307f42af5..0f97b0d86 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -17,7 +17,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 setvar VAR_0x40B7, 1 - msgbox SlateportCity_PokemonFanClub_Text_20A445, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -37,17 +37,17 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA compare VAR_0x40B7, 2 goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A62A, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A9E1, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A9E1, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 - msgbox SlateportCity_PokemonFanClub_Text_20A65F, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT setvar VAR_TEMP_1, 0 checkflag FLAG_0x0CC call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B @@ -79,7 +79,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 return SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 - msgbox SlateportCity_PokemonFanClub_Text_20A66E, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A66E, MSGBOX_DEFAULT release end @@ -87,10 +87,10 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C8 giveitem_std ITEM_RED_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A827, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A827, MSGBOX_DEFAULT release end @@ -98,10 +98,10 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C9 giveitem_std ITEM_BLUE_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A880, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A880, MSGBOX_DEFAULT release end @@ -109,10 +109,10 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CA giveitem_std ITEM_PINK_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A8D7, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A8D7, MSGBOX_DEFAULT release end @@ -120,10 +120,10 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CB giveitem_std ITEM_GREEN_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A933, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A933, MSGBOX_DEFAULT release end @@ -131,15 +131,15 @@ SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CC giveitem_std ITEM_YELLOW_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A984, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A984, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A719, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A719, MSGBOX_DEFAULT release end @@ -196,18 +196,18 @@ SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 checkflag FLAG_0x156 goto_eq SlateportCity_PokemonFanClub_EventScript_20A168 - msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 release end SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168 - msgbox SlateportCity_PokemonFanClub_Text_20A3EE, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A3EE, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 - msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 return @@ -216,7 +216,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E faceplayer checkflag FLAG_0x116 goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE - msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 @@ -229,7 +229,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 waitmovement 0 applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A waitmovement 0 - msgbox SlateportCity_PokemonFanClub_Text_20AB63, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_272054 @@ -238,16 +238,16 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 end SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE - msgbox SlateportCity_PokemonFanClub_Text_20ABC4, 4 + msgbox SlateportCity_PokemonFanClub_Text_20ABC4, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8 - msgbox SlateportCity_PokemonFanClub_Text_20AC47, 2 + msgbox SlateportCity_PokemonFanClub_Text_20AC47, MSGBOX_NPC end SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1 - msgbox SlateportCity_PokemonFanClub_Text_20ACF9, 2 + msgbox SlateportCity_PokemonFanClub_Text_20ACF9, MSGBOX_NPC end SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA @@ -255,7 +255,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD5A, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD5A, MSGBOX_DEFAULT waitmoncry release end @@ -265,7 +265,7 @@ SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD6E, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD6E, MSGBOX_DEFAULT waitmoncry release end @@ -275,7 +275,7 @@ SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220 faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD80, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD80, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 20bbc6fc4..05e378c7e 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -11,10 +11,10 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FD9 checkflag FLAG_0x094 goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FBA - msgbox SlateportCity_SternsShipyard_1F_Text_208008, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 waitmovement 0 @@ -26,21 +26,21 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208323, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 waitmovement 0 @@ -50,20 +50,20 @@ SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208213, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FED:: @ 8207FED - msgbox SlateportCity_SternsShipyard_1F_Text_208558, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_208558, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_EventScript_207FF6:: @ 8207FF6 - msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_EventScript_207FFF:: @ 8207FFF - msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc index a599ac9b8..eed3804f8 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc @@ -2,11 +2,11 @@ SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D .byte 0 SlateportCity_SternsShipyard_2F_EventScript_20863E:: @ 820863E - msgbox SlateportCity_SternsShipyard_2F_Text_208650, 2 + msgbox SlateportCity_SternsShipyard_2F_Text_208650, MSGBOX_NPC end SlateportCity_SternsShipyard_2F_EventScript_208647:: @ 8208647 - msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, 2 + msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, MSGBOX_NPC end SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index f5dcdab74..b3411a9c2 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -704,22 +704,22 @@ SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D goto_eq SootopolisCity_EventScript_1E5ECE compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E5EBA - msgbox SootopolisCity_Text_1E6D77, 4 + msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA - msgbox SootopolisCity_Text_1E6DFE, 4 + msgbox SootopolisCity_Text_1E6DFE, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4 - msgbox SootopolisCity_Text_1E6F38, 4 + msgbox SootopolisCity_Text_1E6F38, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE - msgbox SootopolisCity_Text_1E6ED4, 4 + msgbox SootopolisCity_Text_1E6ED4, MSGBOX_DEFAULT release end @@ -732,7 +732,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 goto_if 4, SootopolisCity_EventScript_1E5F1B compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E5F10 - msgbox SootopolisCity_Text_1E6BFF, 4 + msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage applymovement 3, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -740,7 +740,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 end SootopolisCity_EventScript_1E5F10:: @ 81E5F10 - msgbox SootopolisCity_Text_1E6C53, 4 + msgbox SootopolisCity_Text_1E6C53, MSGBOX_DEFAULT closemessage release end @@ -750,7 +750,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B special GetPlayerBigGuyGirlString checkflag FLAG_0x932 goto_eq SootopolisCity_EventScript_1E5FBB - msgbox SootopolisCity_Text_2A7BB0, 4 + msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 @@ -758,7 +758,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 setflag FLAG_0x932 - msgbox SootopolisCity_Text_2A7C7C, 4 + msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_1E5F79 @@ -770,7 +770,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 - msgbox SootopolisCity_Text_2A7CB7, 4 + msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -778,20 +778,20 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 - msgbox SootopolisCity_Text_2A7CB7, 4 + msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB - msgbox SootopolisCity_Text_2A7CEC, 5 + msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SootopolisCity_EventScript_1E5FD8 - msgbox SootopolisCity_Text_2A7DD2, 4 + msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 - msgbox SootopolisCity_Text_2A7D80, 4 + msgbox SootopolisCity_Text_2A7D80, MSGBOX_DEFAULT release end @@ -801,7 +801,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E600D - msgbox SootopolisCity_Text_1E71A1, 4 + msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage applymovement 2, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -809,7 +809,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 end SootopolisCity_EventScript_1E600D:: @ 81E600D - msgbox SootopolisCity_Text_1E728C, 4 + msgbox SootopolisCity_Text_1E728C, MSGBOX_DEFAULT releaseall end @@ -818,12 +818,12 @@ SootopolisCity_EventScript_1E6017:: @ 81E6017 faceplayer compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E602E - msgbox SootopolisCity_Text_1E6CCA, 4 + msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E602E:: @ 81E602E - msgbox SootopolisCity_Text_1E6D57, 4 + msgbox SootopolisCity_Text_1E6D57, MSGBOX_DEFAULT release end @@ -836,12 +836,12 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 goto_eq SootopolisCity_EventScript_1E6084 compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E6065 - msgbox SootopolisCity_Text_1E6F90, 4 + msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6065:: @ 81E6065 - msgbox SootopolisCity_Text_1E7078, 4 + msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT closemessage applymovement 8, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -849,12 +849,12 @@ SootopolisCity_EventScript_1E6065:: @ 81E6065 end SootopolisCity_EventScript_1E607A:: @ 81E607A - msgbox SootopolisCity_Text_1E710B, 4 + msgbox SootopolisCity_Text_1E710B, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6084:: @ 81E6084 - msgbox SootopolisCity_Text_1E70D4, 4 + msgbox SootopolisCity_Text_1E70D4, MSGBOX_DEFAULT release end @@ -868,7 +868,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E goto_if 4, SootopolisCity_EventScript_1E60CF compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E60CF - msgbox SootopolisCity_Text_1E690B, 4 + msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage applymovement 4, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -876,12 +876,12 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E end SootopolisCity_EventScript_1E60CF:: @ 81E60CF - msgbox SootopolisCity_Text_1E68A1, 4 + msgbox SootopolisCity_Text_1E68A1, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E60D9:: @ 81E60D9 - msgbox SootopolisCity_Text_1E6920, 4 + msgbox SootopolisCity_Text_1E6920, MSGBOX_DEFAULT release end @@ -897,7 +897,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 goto_if 4, SootopolisCity_EventScript_1E6141 compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E6141 - msgbox SootopolisCity_Text_1E6692, 4 + msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage applymovement 5, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -905,30 +905,30 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 end SootopolisCity_EventScript_1E612D:: @ 81E612D - msgbox SootopolisCity_Text_1E6750, 4 + msgbox SootopolisCity_Text_1E6750, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6137:: @ 81E6137 - msgbox SootopolisCity_Text_1E677F, 4 + msgbox SootopolisCity_Text_1E677F, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6141:: @ 81E6141 - msgbox SootopolisCity_Text_1E6618, 4 + msgbox SootopolisCity_Text_1E6618, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E614B:: @ 81E614B - msgbox SootopolisCity_Text_1E656F, 3 + msgbox SootopolisCity_Text_1E656F, MSGBOX_SIGN end SootopolisCity_EventScript_1E6154:: @ 81E6154 - msgbox SootopolisCity_Text_1E65C8, 3 + msgbox SootopolisCity_Text_1E65C8, MSGBOX_SIGN end EventScript_ClosedSootopolisDoor:: @ 81E615D - msgbox SootopolisCity_Text_1E6604, 3 + msgbox SootopolisCity_Text_1E6604, MSGBOX_SIGN end SootopolisCity_EventScript_1E6166:: @ 81E6166 @@ -945,33 +945,33 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 goto_eq SootopolisCity_EventScript_1E61C2 checkflag FLAG_0x09E goto_eq SootopolisCity_EventScript_1E61B8 - msgbox SootopolisCity_Text_1E78E5, 4 + msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61AE:: @ 81E61AE - msgbox SootopolisCity_Text_1E7866, 4 + msgbox SootopolisCity_Text_1E7866, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61B8:: @ 81E61B8 - msgbox SootopolisCity_Text_1E794B, 4 + msgbox SootopolisCity_Text_1E794B, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61C2:: @ 81E61C2 - msgbox SootopolisCity_Text_1E789A, 4 + msgbox SootopolisCity_Text_1E789A, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61CC:: @ 81E61CC - msgbox SootopolisCity_Text_1E75CB, 4 + msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 3 call_if 1, SootopolisCity_EventScript_1E6243 compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E6255 - msgbox SootopolisCity_Text_1E7737, 4 + msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT closemessage applymovement 7, SootopolisCity_Movement_1E62D4 applymovement 255, SootopolisCity_Movement_1E630E @@ -982,7 +982,7 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC applymovement 7, SootopolisCity_Movement_1E6344 applymovement 255, SootopolisCity_Movement_1E634F waitmovement 0 - msgbox SootopolisCity_Text_1E77F0, 4 + msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT closemessage setflag FLAG_0x133 applymovement 255, SootopolisCity_Movement_1E635A @@ -1273,7 +1273,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6388 - msgbox SootopolisCity_Text_1E67DC, 4 + msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage applymovement 15, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1281,7 +1281,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D end SootopolisCity_EventScript_1E6388:: @ 81E6388 - msgbox SootopolisCity_Text_1E6853, 4 + msgbox SootopolisCity_Text_1E6853, MSGBOX_DEFAULT closemessage releaseall end @@ -1290,11 +1290,11 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E63C7 - msgbox SootopolisCity_Text_1E6936, 4 + msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage applymovement 14, SootopolisCity_Movement_27259E waitmovement 0 - msgbox SootopolisCity_Text_1E696C, 4 + msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT closemessage applymovement 14, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1304,7 +1304,7 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 SootopolisCity_EventScript_1E63C7:: @ 81E63C7 applymovement 14, SootopolisCity_Movement_27259E waitmovement 0 - msgbox SootopolisCity_Text_1E69B8, 4 + msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT releaseall end @@ -1314,7 +1314,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6406 - msgbox SootopolisCity_Text_1E6C7C, 4 + msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage applymovement 13, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1322,7 +1322,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB end SootopolisCity_EventScript_1E6406:: @ 81E6406 - msgbox SootopolisCity_Text_1E6CA6, 4 + msgbox SootopolisCity_Text_1E6CA6, MSGBOX_DEFAULT closemessage releaseall end @@ -1333,7 +1333,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E643C - msgbox SootopolisCity_Text_1E6A50, 4 + msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage applymovement 12, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1341,7 +1341,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 end SootopolisCity_EventScript_1E643C:: @ 81E643C - msgbox SootopolisCity_Text_1E6B2A, 4 + msgbox SootopolisCity_Text_1E6B2A, MSGBOX_DEFAULT releaseall end @@ -1354,15 +1354,15 @@ SootopolisCity_EventScript_1E6446:: @ 81E6446 goto_eq SootopolisCity_EventScript_1E64E2 checkflag FLAG_0x09E goto_eq SootopolisCity_EventScript_1E646F - msgbox SootopolisCity_Text_1E7A3E, 4 + msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E646F:: @ 81E646F - msgbox SootopolisCity_Text_1E7ACF, 4 + msgbox SootopolisCity_Text_1E7ACF, MSGBOX_DEFAULT giveitem_std ITEM_HM07 setflag FLAG_0x138 - msgbox SootopolisCity_Text_1E7B86, 4 + msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E64B2 @@ -1388,12 +1388,12 @@ SootopolisCity_EventScript_1E64C5:: @ 81E64C5 return SootopolisCity_EventScript_1E64D8:: @ 81E64D8 - msgbox SootopolisCity_Text_1E79C8, 4 + msgbox SootopolisCity_Text_1E79C8, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E64E2:: @ 81E64E2 - msgbox SootopolisCity_Text_1E7CBC, 4 + msgbox SootopolisCity_Text_1E7CBC, MSGBOX_DEFAULT release end @@ -1411,13 +1411,13 @@ SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6509 - msgbox SootopolisCity_Text_1E72DB, 4 + msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT closemessage releaseall end SootopolisCity_EventScript_1E6509:: @ 81E6509 - msgbox SootopolisCity_Text_1E737E, 4 + msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT setflag FLAG_0x135 checkflag FLAG_0x134 goto_eq SootopolisCity_EventScript_1E654C @@ -1428,13 +1428,13 @@ SootopolisCity_EventScript_1E651F:: @ 81E651F lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6536 - msgbox SootopolisCity_Text_1E7460, 4 + msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT closemessage releaseall end SootopolisCity_EventScript_1E6536:: @ 81E6536 - msgbox SootopolisCity_Text_1E74F6, 4 + msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT setflag FLAG_0x134 checkflag FLAG_0x135 goto_eq SootopolisCity_EventScript_1E654C diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index e95a57769..a70b9cb7a 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -94,7 +94,7 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 checkflag FLAG_BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B - msgbox SootopolisCity_Gym_1F_Text_225778, 4 + msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT release end @@ -102,7 +102,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 message SootopolisCity_Gym_1F_Text_225598 waitmessage call SootopolisCity_Gym_1F_EventScript_27207E - msgbox SootopolisCity_Gym_1F_Text_2255BE, 4 + msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT setflag FLAG_0x4F7 setflag FLAG_BADGE08_GET setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS @@ -116,7 +116,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SootopolisCity_Gym_1F_Text_22574D, 4 + msgbox SootopolisCity_Gym_1F_Text_22574D, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -128,7 +128,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_27205E - msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 + msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC return @@ -136,19 +136,19 @@ SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_272054 - msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 + msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC release end SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B - msgbox SootopolisCity_Gym_1F_Text_225865, 4 + msgbox SootopolisCity_Gym_1F_Text_225865, MSGBOX_DEFAULT release end SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 - msgbox SootopolisCity_Gym_1F_Text_225A67, 6 + msgbox SootopolisCity_Gym_1F_Text_225A67, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 @@ -156,12 +156,12 @@ SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 faceplayer checkflag FLAG_0x4F7 goto_eq SootopolisCity_Gym_1F_EventScript_225055 - msgbox SootopolisCity_Gym_1F_Text_225093, 4 + msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT release end SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 - msgbox SootopolisCity_Gym_1F_Text_2251AF, 4 + msgbox SootopolisCity_Gym_1F_Text_2251AF, MSGBOX_DEFAULT release end @@ -180,12 +180,12 @@ SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F end SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F - msgbox SootopolisCity_Gym_1F_Text_225916, 4 + msgbox SootopolisCity_Gym_1F_Text_225916, MSGBOX_DEFAULT releaseall end SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 - msgbox SootopolisCity_Gym_1F_Text_2258FA, 4 + msgbox SootopolisCity_Gym_1F_Text_2258FA, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 8aaa604e2..8f0f2f678 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -3,52 +3,52 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 - msgbox SootopolisCity_Gym_B1F_Text_225DCF, 6 + msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 - msgbox SootopolisCity_Gym_B1F_Text_225E90, 6 + msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 trainerbattle 0, TRAINER_BRIANNA, 0, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 - msgbox SootopolisCity_Gym_B1F_Text_2264BC, 6 + msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB - msgbox SootopolisCity_Gym_B1F_Text_225FFE, 6 + msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 - msgbox SootopolisCity_Gym_B1F_Text_2260D1, 6 + msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 - msgbox SootopolisCity_Gym_B1F_Text_2261B5, 6 + msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 - msgbox SootopolisCity_Gym_B1F_Text_226286, 6 + msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C trainerbattle 0, TRAINER_BETHANY, 0, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B - msgbox SootopolisCity_Gym_B1F_Text_226341, 6 + msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 trainerbattle 0, TRAINER_ANNIKA, 0, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD - msgbox SootopolisCity_Gym_B1F_Text_2263F4, 6 + msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A trainerbattle 0, TRAINER_DAPHNE, 0, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 - msgbox SootopolisCity_Gym_B1F_Text_225F67, 6 + msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 7c898a0b2..c23b90bb3 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -6,17 +6,17 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D faceplayer checkflag FLAG_0x079 goto_eq SootopolisCity_House1_EventScript_226984 - msgbox SootopolisCity_House1_Text_2269A1, 4 + msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 goto_eq SootopolisCity_House1_EventScript_272054 setflag FLAG_0x079 - msgbox SootopolisCity_House1_Text_226A13, 4 + msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release end SootopolisCity_House1_EventScript_226984:: @ 8226984 - msgbox SootopolisCity_House1_Text_226A13, 4 + msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release end @@ -25,7 +25,7 @@ SootopolisCity_House1_EventScript_22698E:: @ 822698E faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox SootopolisCity_House1_Text_226A60, 4 + msgbox SootopolisCity_House1_Text_226A60, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc index 82270ca56..676ec4ed2 100644 --- a/data/maps/SootopolisCity_House2/scripts.inc +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -4,7 +4,7 @@ SootopolisCity_House2_MapScripts:: @ 8226A76 SootopolisCity_House2_EventScript_226A77:: @ 8226A77 lock faceplayer - msgbox SootopolisCity_House2_Text_226AAB, 5 + msgbox SootopolisCity_House2_Text_226AAB, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_226A99 compare VAR_RESULT, 0 @@ -13,11 +13,11 @@ SootopolisCity_House2_EventScript_226A77:: @ 8226A77 end SootopolisCity_House2_EventScript_226A99:: @ 8226A99 - msgbox SootopolisCity_House2_Text_226AF1, 4 + msgbox SootopolisCity_House2_Text_226AF1, MSGBOX_DEFAULT return SootopolisCity_House2_EventScript_226AA2:: @ 8226AA2 - msgbox SootopolisCity_House2_Text_226B41, 4 + msgbox SootopolisCity_House2_Text_226B41, MSGBOX_DEFAULT return SootopolisCity_House2_Text_226AAB: @ 8226AAB diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index 415f90642..90c9ab155 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -4,20 +4,20 @@ SootopolisCity_House3_MapScripts:: @ 8226B71 SootopolisCity_House3_EventScript_226B72:: @ 8226B72 lock faceplayer - msgbox SootopolisCity_House3_Text_226BA4, 5 + msgbox SootopolisCity_House3_Text_226BA4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SootopolisCity_House3_EventScript_226B91 - msgbox SootopolisCity_House3_Text_226C44, 4 + msgbox SootopolisCity_House3_Text_226C44, MSGBOX_DEFAULT release end SootopolisCity_House3_EventScript_226B91:: @ 8226B91 - msgbox SootopolisCity_House3_Text_226C20, 4 + msgbox SootopolisCity_House3_Text_226C20, MSGBOX_DEFAULT release end SootopolisCity_House3_EventScript_226B9B:: @ 8226B9B - msgbox SootopolisCity_House3_Text_226C9C, 2 + msgbox SootopolisCity_House3_Text_226C9C, MSGBOX_NPC end SootopolisCity_House3_Text_226BA4: @ 8226BA4 diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc index e34e6991d..d92df9be2 100644 --- a/data/maps/SootopolisCity_House4/scripts.inc +++ b/data/maps/SootopolisCity_House4/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House4_MapScripts:: @ 8226D15 .byte 0 SootopolisCity_House4_EventScript_226D16:: @ 8226D16 - msgbox SootopolisCity_House4_Text_226D3B, 2 + msgbox SootopolisCity_House4_Text_226D3B, MSGBOX_NPC end SootopolisCity_House4_EventScript_226D1F:: @ 8226D1F - msgbox SootopolisCity_House4_Text_226DEA, 2 + msgbox SootopolisCity_House4_Text_226DEA, MSGBOX_NPC end SootopolisCity_House4_EventScript_226D28:: @ 8226D28 @@ -14,7 +14,7 @@ SootopolisCity_House4_EventScript_226D28:: @ 8226D28 faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SootopolisCity_House4_Text_226E7F, 4 + msgbox SootopolisCity_House4_Text_226E7F, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc index 51da02de1..04b9feca2 100644 --- a/data/maps/SootopolisCity_House5/scripts.inc +++ b/data/maps/SootopolisCity_House5/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House5_MapScripts:: @ 8226E93 .byte 0 SootopolisCity_House5_EventScript_226E94:: @ 8226E94 - msgbox SootopolisCity_House5_Text_226EA6, 2 + msgbox SootopolisCity_House5_Text_226EA6, MSGBOX_NPC end SootopolisCity_House5_EventScript_226E9D:: @ 8226E9D - msgbox SootopolisCity_House5_Text_226F35, 2 + msgbox SootopolisCity_House5_Text_226F35, MSGBOX_NPC end SootopolisCity_House5_Text_226EA6: @ 8226EA6 diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 38c8456a3..3341ad1c1 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -6,10 +6,10 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C faceplayer checkflag FLAG_0x0F5 goto_eq SootopolisCity_House6_EventScript_226FA3 - msgbox SootopolisCity_House6_Text_226FC3, 5 + msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO compare VAR_RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_226F99 - msgbox SootopolisCity_House6_Text_227034, 4 + msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT givedecoration_std 117 compare VAR_RESULT, 0 goto_eq SootopolisCity_House6_EventScript_226FAD @@ -18,19 +18,19 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C end SootopolisCity_House6_EventScript_226F99:: @ 8226F99 - msgbox SootopolisCity_House6_Text_22708F, 4 + msgbox SootopolisCity_House6_Text_22708F, MSGBOX_DEFAULT release end SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 - msgbox SootopolisCity_House6_Text_2270B7, 4 + msgbox SootopolisCity_House6_Text_2270B7, MSGBOX_DEFAULT release end SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD bufferdecorationname 1, 117 - msgbox gUnknown_08272B1A, 4 - msgbox SootopolisCity_House6_Text_22704A, 4 + msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc index 9df9cde0b..e679e5cd5 100644 --- a/data/maps/SootopolisCity_House7/scripts.inc +++ b/data/maps/SootopolisCity_House7/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House7_MapScripts:: @ 82270CB .byte 0 SootopolisCity_House7_EventScript_2270CC:: @ 82270CC - msgbox SootopolisCity_House7_Text_2270DE, 2 + msgbox SootopolisCity_House7_Text_2270DE, MSGBOX_NPC end SootopolisCity_House7_EventScript_2270D5:: @ 82270D5 - msgbox SootopolisCity_House7_Text_227190, 2 + msgbox SootopolisCity_House7_Text_227190, MSGBOX_NPC end SootopolisCity_House7_Text_2270DE: @ 82270DE diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index 26a322b89..3acf88c12 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -5,7 +5,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B special GetSeedotSizeRecordInfo lock faceplayer - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, MSGBOX_DEFAULT special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 @@ -22,22 +22,22 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B end SootopolisCity_LotadAndSeedotHouse_EventScript_227272:: @ 8227272 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22727C:: @ 822727C - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 @@ -46,7 +46,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 end SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2:: @ 82272B2 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, MSGBOX_DEFAULT release end @@ -54,7 +54,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC special GetLotadSizeRecordInfo lock faceplayer - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, MSGBOX_DEFAULT special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 @@ -71,22 +71,22 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC end SootopolisCity_LotadAndSeedotHouse_EventScript_227303:: @ 8227303 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22730D:: @ 822730D - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 @@ -95,21 +95,21 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 end SootopolisCity_LotadAndSeedotHouse_EventScript_227343:: @ 8227343 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22734D:: @ 822734D special GetSeedotSizeRecordInfo lockall - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, MSGBOX_DEFAULT releaseall end SootopolisCity_LotadAndSeedotHouse_EventScript_22735B:: @ 822735B special GetLotadSizeRecordInfo lockall - msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 26ab5497c..b6d713930 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -7,7 +7,7 @@ SootopolisCity_Mart_EventScript_226795:: @ 8226795 message gUnknown_08272A21 waitmessage pokemart SootopolisCity_Mart_Pokemart_2267AC - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -32,12 +32,12 @@ SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 goto_if 4, SootopolisCity_Mart_EventScript_2267E2 checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_2267E2 - msgbox SootopolisCity_Mart_Text_22685D, 4 + msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT release end SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 - msgbox SootopolisCity_Mart_Text_226816, 4 + msgbox SootopolisCity_Mart_Text_226816, MSGBOX_DEFAULT release end @@ -48,12 +48,12 @@ SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC goto_if 4, SootopolisCity_Mart_EventScript_22680C checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_22680C - msgbox SootopolisCity_Mart_Text_226928, 4 + msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT release end SootopolisCity_Mart_EventScript_22680C:: @ 822680C - msgbox SootopolisCity_Mart_Text_2268AF, 4 + msgbox SootopolisCity_Mart_Text_2268AF, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index e11d3ae9f..f24af7785 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -51,15 +51,15 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F @@ -80,25 +80,25 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E compare VAR_TEMP_1, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special SavePlayerParty special BufferEReaderTrainerName - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty @@ -107,7 +107,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty special ReducePlayerPartyToSelectedMons - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE @@ -122,12 +122,12 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 special LoadPlayerParty - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT fadescreen 1 special sub_80F9438 waitstate diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index eb21ead54..9a6b4b1b3 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 waitmovement 0 special CopyEReaderTrainerGreeting - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, SPECIAL_BATTLE_EREADER setvar VAR_0x8005, 0 @@ -41,7 +41,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF setvar VAR_0x40C0, 3 - msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, 4 + msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 46dccd97e..5c5f63dd3 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -22,12 +22,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E - msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E - msgbox SootopolisCity_PokemonCenter_1F_Text_226562, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_226562, MSGBOX_DEFAULT release end @@ -38,12 +38,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, MSGBOX_DEFAULT release end diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index d303e0614..12d27a61f 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -9,10 +9,10 @@ SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 lock faceplayer - msgbox SouthernIsland_Exterior_Text_2A69F1, 5 + msgbox SouthernIsland_Exterior_Text_2A69F1, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SouthernIsland_Exterior_EventScript_242A17 - msgbox SouthernIsland_Exterior_Text_2A6A5D, 4 + msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA waitmovement 0 @@ -26,7 +26,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 end SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 - msgbox SouthernIsland_Exterior_Text_2A6A82, 4 + msgbox SouthernIsland_Exterior_Text_2A6A82, MSGBOX_DEFAULT release end @@ -50,6 +50,6 @@ BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 step_end SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C - msgbox SouthernIsland_Exterior_Text_2A6AD5, 3 + msgbox SouthernIsland_Exterior_Text_2A6AD5, MSGBOX_SIGN end diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 26bf9d9f9..b21fdecab 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -113,7 +113,7 @@ SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F end SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A - msgbox SouthernIsland_Interior_Text_2A6AA1, 4 + msgbox SouthernIsland_Interior_Text_2A6AA1, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index ff731393b..e9117efe2 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -23,7 +23,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 applymovement 1, TrainerHill_Elevator_Movement_2693EE waitmovement 0 lockall - msgbox TrainerHill_Elevator_Text_268F3E, 5 + msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq TrainerHill_Elevator_EventScript_269360 releaseall diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 84543ff2b..e85d50a04 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -84,13 +84,13 @@ TrainerHill_Entrance_EventScript_268182:: @ 8268182 TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 lockall applymovement 255, TrainerHill_Entrance_Movement_26837F - msgbox TrainerHill_Entrance_Text_268689, 4 + msgbox TrainerHill_Entrance_Text_268689, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_2681DA TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA lockall applymovement 255, TrainerHill_Entrance_Movement_26837F - msgbox TrainerHill_Entrance_Text_268712, 4 + msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage @@ -118,11 +118,11 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD special sp194_trainer_tower compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_26821F - msgbox TrainerHill_Entrance_Text_2686F4, 4 + msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_268227 TrainerHill_Entrance_EventScript_26821F:: @ 826821F - msgbox TrainerHill_Entrance_Text_2687AC, 4 + msgbox TrainerHill_Entrance_Text_2687AC, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_268227:: @ 8268227 release @@ -133,7 +133,7 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 applymovement 255, TrainerHill_Entrance_Movement_26837F checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_26836A - msgbox TrainerHill_Entrance_Text_2684C6, 4 + msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 special sp194_trainer_tower compare VAR_RESULT, 0 @@ -142,11 +142,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 special sp194_trainer_tower compare VAR_RESULT, 1 goto_eq TrainerHill_Entrance_EventScript_268275 - msgbox TrainerHill_Entrance_Text_268564, 4 + msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D TrainerHill_Entrance_EventScript_268275:: @ 8268275 - msgbox TrainerHill_Entrance_Text_26859E, 4 + msgbox TrainerHill_Entrance_Text_26859E, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_26827D:: @ 826827D message TrainerHill_Entrance_Text_2685F8 @@ -160,7 +160,7 @@ TrainerHill_Entrance_EventScript_26827D:: @ 826827D end TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA - msgbox TrainerHill_Entrance_Text_2687C3, 4 + msgbox TrainerHill_Entrance_Text_2687C3, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D end @@ -175,7 +175,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 setvar VAR_0x40D6, 1 setvar VAR_TEMP_5, 0 special HealPlayerParty - msgbox TrainerHill_Entrance_Text_26862A, 4 + msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT setvar VAR_0x8004, 0 special sp194_trainer_tower releaseall @@ -183,7 +183,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 TrainerHill_Entrance_EventScript_268314:: @ 8268314 setvar VAR_TEMP_5, 0 - msgbox TrainerHill_Entrance_Text_26866F, 4 + msgbox TrainerHill_Entrance_Text_26866F, MSGBOX_DEFAULT closemessage applymovement 255, TrainerHill_Entrance_Movement_268381 waitmovement 0 @@ -191,7 +191,7 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314 end TrainerHill_Entrance_EventScript_26832E:: @ 826832E - msgbox TrainerHill_Entrance_Text_26851C, 4 + msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT setvar VAR_0x8004, 14 special sp194_trainer_tower setvar VAR_TEMP_5, 1 @@ -209,7 +209,7 @@ TrainerHill_Entrance_EventScript_26835C:: @ 826835C end TrainerHill_Entrance_EventScript_26836A:: @ 826836A - msgbox TrainerHill_Entrance_Text_268430, 4 + msgbox TrainerHill_Entrance_Text_268430, MSGBOX_DEFAULT closemessage applymovement 255, TrainerHill_Entrance_Movement_268381 waitmovement 0 @@ -244,21 +244,21 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388 TrainerHill_Entrance_EventScript_268391:: @ 8268391 checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_2683A3 - msgbox TrainerHill_Entrance_Text_268D5A, 2 + msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3 - msgbox TrainerHill_Entrance_Text_268DDA, 2 + msgbox TrainerHill_Entrance_Text_268DDA, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_2683BE - msgbox TrainerHill_Entrance_Text_268E6A, 2 + msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE - msgbox TrainerHill_Entrance_Text_268EDC, 2 + msgbox TrainerHill_Entrance_Text_268EDC, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 @@ -269,7 +269,7 @@ TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 checkflag FLAG_SYS_GAME_CLEAR goto_eq TrainerHill_Entrance_EventScript_268402 pokemart TrainerHill_Entrance_Pokemart_2683E8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -292,7 +292,7 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8 TrainerHill_Entrance_EventScript_268402:: @ 8268402 pokemart TrainerHill_Entrance_Pokemart_268414 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index bdec2f7aa..19e8ef567 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -16,7 +16,7 @@ TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 case 2, TrainerHill_Roof_EventScript_2690A8 TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA - msgbox TrainerHill_Roof_Text_268986, 4 + msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 setvar VAR_0x8004, 2 @@ -27,7 +27,7 @@ TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 case 2, TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269020:: @ 8269020 - msgbox TrainerHill_Roof_Text_268AC5, 4 + msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT playfanfare MUS_FANFA1 message gUnknown_08272A78 waitfanfare @@ -35,9 +35,9 @@ TrainerHill_Roof_EventScript_269020:: @ 8269020 goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269037:: @ 8269037 - msgbox TrainerHill_Roof_Text_268AC5, 4 - msgbox gUnknown_08272A89, 4 - msgbox TrainerHill_Roof_Text_268B07, 4 + msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT + msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox TrainerHill_Roof_Text_268B07, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269054:: @ 8269054 @@ -49,22 +49,22 @@ TrainerHill_Roof_EventScript_269054:: @ 8269054 case 2, TrainerHill_Roof_EventScript_26909E TrainerHill_Roof_EventScript_269082:: @ 8269082 - msgbox TrainerHill_Roof_Text_268B43, 4 + msgbox TrainerHill_Roof_Text_268B43, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_26909E end TrainerHill_Roof_EventScript_269090:: @ 8269090 - msgbox TrainerHill_Roof_Text_268C03, 4 + msgbox TrainerHill_Roof_Text_268C03, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_26909E end TrainerHill_Roof_EventScript_26909E:: @ 826909E - msgbox TrainerHill_Roof_Text_268C31, 4 + msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT release end TrainerHill_Roof_EventScript_2690A8:: @ 82690A8 - msgbox TrainerHill_Roof_Text_268C31, 4 + msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT release end diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index ae1d161e0..7cdd3402d 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -39,7 +39,7 @@ Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 end Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC - msgbox Underwater_SeafloorCavern_Text_2343E5, 3 + msgbox Underwater_SeafloorCavern_Text_2343E5, MSGBOX_SIGN end Underwater_SeafloorCavern_Text_2343E5: @ 82343E5 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 8cc8f6f4d..922fcaa77 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -12,25 +12,25 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575 faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_EventScript_1EB594 - msgbox VerdanturfTown_Text_1EB5FD, 4 + msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT applymovement 2, VerdanturfTown_Movement_2725A2 waitmovement 0 release end VerdanturfTown_EventScript_1EB594:: @ 81EB594 - msgbox VerdanturfTown_Text_1EB6E0, 4 + msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT applymovement 2, VerdanturfTown_Movement_2725A2 waitmovement 0 release end VerdanturfTown_EventScript_1EB5A8:: @ 81EB5A8 - msgbox VerdanturfTown_Text_1EB736, 2 + msgbox VerdanturfTown_Text_1EB736, MSGBOX_NPC end VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 - msgbox VerdanturfTown_Text_1EB7E2, 2 + msgbox VerdanturfTown_Text_1EB7E2, MSGBOX_NPC end VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA @@ -38,29 +38,29 @@ VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_EventScript_1EB5CF - msgbox VerdanturfTown_Text_1EB854, 4 + msgbox VerdanturfTown_Text_1EB854, MSGBOX_DEFAULT release end VerdanturfTown_EventScript_1EB5CF:: @ 81EB5CF - msgbox VerdanturfTown_Text_1EB935, 4 + msgbox VerdanturfTown_Text_1EB935, MSGBOX_DEFAULT release end VerdanturfTown_EventScript_1EB5D9:: @ 81EB5D9 - msgbox VerdanturfTown_Text_1EB9C4, 3 + msgbox VerdanturfTown_Text_1EB9C4, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5E2:: @ 81EB5E2 - msgbox VerdanturfTown_Text_1EBA11, 3 + msgbox VerdanturfTown_Text_1EBA11, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5EB:: @ 81EB5EB - msgbox VerdanturfTown_Text_1EBA1F, 3 + msgbox VerdanturfTown_Text_1EBA1F, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5F4:: @ 81EB5F4 - msgbox VerdanturfTown_Text_1EBA59, 3 + msgbox VerdanturfTown_Text_1EBA59, MSGBOX_SIGN end VerdanturfTown_Text_1EB5FD: @ 81EB5FD diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 41c8a9502..93b7802be 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -48,7 +48,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F waitmovement 0 setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7 switch VAR_RESULT @@ -80,7 +80,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 waitmovement 0 - msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4 + msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty setvar VAR_0x8004, 3 @@ -105,7 +105,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8 VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A - msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, 5 + msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, MSGBOX_YESNO switch VAR_RESULT case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 0368859c2..bde086dce 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -27,7 +27,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_24E636, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E636, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -43,7 +43,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT message VerdanturfTown_BattleTentLobby_Text_2C5791 waitmessage setvar VAR_0x8004, 6 @@ -59,7 +59,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 waitse VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 - msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT setvar VAR_0x8004, 7 special sub_81B99B4 switch VAR_RESULT @@ -72,14 +72,14 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD - msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_TEMP_0, 255 @@ -88,7 +88,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201791 end @@ -105,7 +105,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD special sub_81B99B4 playse SE_SAVE waitse - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -113,7 +113,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, MSGBOX_DEFAULT message VerdanturfTown_BattleTentLobby_Text_24E5F6 waitmessage setvar VAR_0x8004, 5 @@ -136,7 +136,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE special SavePlayerParty - msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, MSGBOX_DEFAULT VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 message VerdanturfTown_BattleTentLobby_Text_2C5129 @@ -160,7 +160,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc - msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 @@ -168,7 +168,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF waitstate compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO switch VAR_RESULT case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34 case 1, VerdanturfTown_BattleTentLobby_EventScript_201954 @@ -202,7 +202,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -211,7 +211,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE end VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB - msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201893 VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 @@ -220,11 +220,11 @@ VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10 VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03 - msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201A3F VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201A3F VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D @@ -238,7 +238,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34 special LoadPlayerParty VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37 - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F release @@ -279,27 +279,27 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B faceplayer checkflag FLAG_0x0EB goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 - msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 setflag FLAG_0x0EB - msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2 - msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC - msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, 2 + msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, MSGBOX_NPC end VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 lock - msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, MSGBOX_DEFAULT release end @@ -308,26 +308,26 @@ VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 faceplayer checkflag FLAG_0x1CC goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED - msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CC release end VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED - msgbox VerdanturfTown_BattleTentLobby_Text_202025, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_202025, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7 lock - msgbox VerdanturfTown_BattleTentLobby_Text_201D11, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201D11, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end @@ -349,32 +349,32 @@ VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E - msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C - msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A - msgbox VerdanturfTown_BattleTentLobby_Text_24F049, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F049, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8 - msgbox VerdanturfTown_BattleTentLobby_Text_24F190, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F190, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6 - msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4 - msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc index 28030d869..f677b3aab 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -4,7 +4,7 @@ VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030 VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 lock faceplayer - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 @@ -18,37 +18,37 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 end VerdanturfTown_FriendshipRatersHouse_EventScript_203094:: @ 8203094 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_20309E:: @ 820309E - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8:: @ 82030A8 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2:: @ 82030B2 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC:: @ 82030BC - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6:: @ 82030C6 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0:: @ 82030D0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, MSGBOX_DEFAULT release end @@ -57,7 +57,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc index ce48fd662..c6028c784 100644 --- a/data/maps/VerdanturfTown_House/scripts.inc +++ b/data/maps/VerdanturfTown_House/scripts.inc @@ -2,11 +2,11 @@ VerdanturfTown_House_MapScripts:: @ 820335E .byte 0 VerdanturfTown_House_EventScript_20335F:: @ 820335F - msgbox VerdanturfTown_House_Text_203371, 2 + msgbox VerdanturfTown_House_Text_203371, MSGBOX_NPC end VerdanturfTown_House_EventScript_203368:: @ 8203368 - msgbox VerdanturfTown_House_Text_2033EE, 2 + msgbox VerdanturfTown_House_Text_2033EE, MSGBOX_NPC end VerdanturfTown_House_Text_203371: @ 8203371 diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index 96daf2c84..cfaf2e021 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -7,7 +7,7 @@ VerdanturfTown_Mart_EventScript_202587:: @ 8202587 message gUnknown_08272A21 waitmessage pokemart VerdanturfTown_Mart_Pokemart_2025A0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -29,15 +29,15 @@ VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0 end VerdanturfTown_Mart_EventScript_2025BA:: @ 82025BA - msgbox VerdanturfTown_Mart_Text_2025D5, 2 + msgbox VerdanturfTown_Mart_Text_2025D5, MSGBOX_NPC end VerdanturfTown_Mart_EventScript_2025C3:: @ 82025C3 - msgbox VerdanturfTown_Mart_Text_20264C, 2 + msgbox VerdanturfTown_Mart_Text_20264C, MSGBOX_NPC end VerdanturfTown_Mart_EventScript_2025CC:: @ 82025CC - msgbox VerdanturfTown_Mart_Text_2026C9, 2 + msgbox VerdanturfTown_Mart_Text_2026C9, MSGBOX_NPC end VerdanturfTown_Mart_Text_2025D5: @ 82025D5 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 131df00f7..10a8b6479 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A end VerdanturfTown_PokemonCenter_1F_EventScript_202748:: @ 8202748 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, 2 + msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, MSGBOX_NPC end VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, 2 + msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, MSGBOX_NPC end VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index 8184f4c21..6c3b90fc3 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -6,13 +6,13 @@ VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF faceplayer checkflag FLAG_0x0C1 goto_eq VerdanturfTown_WandasHouse_EventScript_2028D7 - msgbox VerdanturfTown_WandasHouse_Text_202993, 4 + msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT setflag FLAG_0x0C1 release end VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 - msgbox VerdanturfTown_WandasHouse_Text_202ABE, 4 + msgbox VerdanturfTown_WandasHouse_Text_202ABE, MSGBOX_DEFAULT release end @@ -23,22 +23,22 @@ VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 goto_eq VerdanturfTown_WandasHouse_EventScript_202909 checkflag FLAG_0x4F3 goto_eq VerdanturfTown_WandasHouse_EventScript_2028FF - msgbox VerdanturfTown_WandasHouse_Text_202B37, 4 + msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_2028FF:: @ 82028FF - msgbox VerdanturfTown_WandasHouse_Text_202C20, 4 + msgbox VerdanturfTown_WandasHouse_Text_202C20, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202909:: @ 8202909 - msgbox VerdanturfTown_WandasHouse_Text_202C4E, 4 + msgbox VerdanturfTown_WandasHouse_Text_202C4E, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 - msgbox VerdanturfTown_WandasHouse_Text_202E00, 2 + msgbox VerdanturfTown_WandasHouse_Text_202E00, MSGBOX_NPC end VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C @@ -48,17 +48,17 @@ VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C goto_eq VerdanturfTown_WandasHouse_EventScript_202944 checkflag FLAG_0x0BE goto_eq VerdanturfTown_WandasHouse_EventScript_20293A - msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 + msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_20293A:: @ 820293A - msgbox VerdanturfTown_WandasHouse_Text_202CCF, 4 + msgbox VerdanturfTown_WandasHouse_Text_202CCF, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 - msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 + msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end @@ -71,22 +71,22 @@ VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E goto_eq VerdanturfTown_WandasHouse_EventScript_20297F checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_WandasHouse_EventScript_202975 - msgbox VerdanturfTown_WandasHouse_Text_202E47, 4 + msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202975:: @ 8202975 - msgbox VerdanturfTown_WandasHouse_Text_202F19, 4 + msgbox VerdanturfTown_WandasHouse_Text_202F19, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_20297F:: @ 820297F - msgbox VerdanturfTown_WandasHouse_Text_202F73, 4 + msgbox VerdanturfTown_WandasHouse_Text_202F73, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989 - msgbox VerdanturfTown_WandasHouse_Text_202FDB, 4 + msgbox VerdanturfTown_WandasHouse_Text_202FDB, MSGBOX_DEFAULT release end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index e32c07684..ab9e373f8 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -40,9 +40,9 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 applymovement 255, VictoryRoad_1F_Movement_2725AA waitmovement 0 - msgbox VictoryRoad_1F_Text_235EE6, 4 + msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC - msgbox VictoryRoad_1F_Text_236020, 4 + msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY moveobjectoffscreen 4 setflag FLAG_0x07E @@ -78,7 +78,7 @@ VictoryRoad_1F_Movement_235E21: @ 8235E21 step_end VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C - msgbox VictoryRoad_1F_Text_236020, 2 + msgbox VictoryRoad_1F_Text_236020, MSGBOX_NPC end VictoryRoad_1F_EventScript_235E35:: @ 8235E35 @@ -86,37 +86,37 @@ VictoryRoad_1F_EventScript_235E35:: @ 8235E35 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq VictoryRoad_1F_EventScript_235E5C - msgbox VictoryRoad_1F_Text_2360FE, 6 + msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - msgbox VictoryRoad_1F_Text_2360FE, 6 + msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E73:: @ 8235E73 trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB - msgbox VictoryRoad_1F_Text_2361E5, 6 + msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 - msgbox VictoryRoad_1F_Text_2362A4, 6 + msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 - msgbox VictoryRoad_1F_Text_236356, 6 + msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 - msgbox VictoryRoad_1F_Text_2363D5, 6 + msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 - msgbox VictoryRoad_1F_Text_2364BB, 6 + msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE end VictoryRoad_1F_Text_235EE6: @ 8235EE6 diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index 376fda7d5..1517f68ca 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -3,27 +3,27 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4 VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD - msgbox VictoryRoad_B1F_Text_2365C4, 6 + msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D - msgbox VictoryRoad_B1F_Text_236678, 6 + msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236513:: @ 8236513 trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B - msgbox VictoryRoad_B1F_Text_23671B, 6 + msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_23652A:: @ 823652A trainerbattle 0, TRAINER_MITCHELL, 0, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 - msgbox VictoryRoad_B1F_Text_2367A7, 6 + msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236541:: @ 8236541 trainerbattle 0, TRAINER_HALLE, 0, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B - msgbox VictoryRoad_B1F_Text_23684C, 6 + msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_Text_236558: @ 8236558 diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 15deea104..9b6837b39 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -3,32 +3,32 @@ VictoryRoad_B2F_MapScripts:: @ 82368D4 VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 - msgbox VictoryRoad_B2F_Text_2369DE, 6 + msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 - msgbox VictoryRoad_B2F_Text_236AAE, 6 + msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236903:: @ 8236903 trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 - msgbox VictoryRoad_B2F_Text_236B2F, 6 + msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_23691A:: @ 823691A trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A - msgbox VictoryRoad_B2F_Text_236C21, 6 + msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236931:: @ 8236931 trainerbattle 0, TRAINER_FELIX, 0, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB - msgbox VictoryRoad_B2F_Text_236CBA, 6 + msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236948:: @ 8236948 trainerbattle 0, TRAINER_DIANNE, 0, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E - msgbox VictoryRoad_B2F_Text_236D8C, 6 + msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_Text_23695F: @ 823695F diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1fda1133f..21ab4256c 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -31,7 +31,7 @@ Route102_EventScript_274359:: @ 8274359 end Route102_EventScript_274374:: @ 8274374 - msgbox Route102_Text_274507, 5 + msgbox Route102_Text_274507, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_274393 compare VAR_RESULT, 0 @@ -106,7 +106,7 @@ Route102_EventScript_274421:: @ 8274421 lock faceplayer special EventObjectInteractionGetBerryCountString - msgbox Route102_Text_2745EE, 5 + msgbox Route102_Text_2745EE, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_274448 compare VAR_RESULT, 0 @@ -155,7 +155,7 @@ Route102_EventScript_27448D:: @ 827448D compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE special EventObjectInteractionGetBerryName - msgbox Route102_Text_2746E4, 5 + msgbox Route102_Text_2746E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route102_EventScript_2744C4 compare VAR_RESULT, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 3408eb2a8..c92c14763 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -63,7 +63,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19 execram OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A - msgbox gUnknown_08273178, 2 + msgbox gUnknown_08273178, MSGBOX_NPC end OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 @@ -72,16 +72,16 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 checkflag FLAG_SYS_HAS_EON_TICKET goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 - msgbox gUnknown_08273594, 4 + msgbox gUnknown_08273594, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET setvar VAR_0x403F, 0 - msgbox gUnknown_082735F2, 4 + msgbox gUnknown_082735F2, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 - msgbox gUnknown_08273178, 4 + msgbox gUnknown_08273178, MSGBOX_DEFAULT release end @@ -331,12 +331,12 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall applymovement 255, OldaleTown_PokemonCenter_2F_Movement_2725A6 waitmovement 0 - msgbox OldaleTown_PokemonCenter_2F_Text_27964A, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_276E10 waitmovement 0 delay 30 - msgbox OldaleTown_PokemonCenter_2F_Text_279718, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT setvar VAR_0x40CD, 2 releaseall end @@ -354,7 +354,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13 end OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 - msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_276E30 end @@ -399,7 +399,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2 end OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15 - msgbox OldaleTown_PokemonCenter_2F_Text_279142, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 end @@ -417,7 +417,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E end OldaleTown_PokemonCenter_2F_EventScript_276F47:: @ 8276F47 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 end @@ -502,25 +502,25 @@ OldaleTown_PokemonCenter_2F_EventScript_277046:: @ 8277046 OldaleTown_PokemonCenter_2F_EventScript_277072:: @ 8277072 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27833D, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27833D, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 end OldaleTown_PokemonCenter_2F_EventScript_277083:: @ 8277083 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278307, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278307, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 end OldaleTown_PokemonCenter_2F_EventScript_277094:: @ 8277094 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 end OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278372, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278372, MSGBOX_DEFAULT release end @@ -593,12 +593,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 return OldaleTown_PokemonCenter_2F_EventScript_2771BF:: @ 82771BF - msgbox OldaleTown_PokemonCenter_2F_Text_278027, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278027, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD - msgbox OldaleTown_PokemonCenter_2F_Text_278061, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278061, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -659,45 +659,45 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C OldaleTown_PokemonCenter_2F_EventScript_2772AB:: @ 82772AB special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278565, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278565, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_2772B8:: @ 82772B8 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_2772C5:: @ 82772C5 OldaleTown_PokemonCenter_2F_EventScript_2772C5:: @ 82772C5 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27821C, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27821C, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_2772D2:: @ 82772D2 OldaleTown_PokemonCenter_2F_EventScript_2772D2:: @ 82772D2 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_2772DF:: @ 82772DF special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278255, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278255, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_2772EC:: @ 82772EC special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278291, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278291, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9 special CloseLink - msgbox MossdeepCity_GameCorner_1F_Text_278D51, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278D51, MSGBOX_DEFAULT release end @@ -709,29 +709,29 @@ OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306 OldaleTown_PokemonCenter_2F_EventScript_27730E:: @ 827730E special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_27731B:: @ 827731B special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278651, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_278651, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_277335:: @ 8277335 - msgbox gUnknown_0827306F, 4 + msgbox gUnknown_0827306F, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F - msgbox gUnknown_082730BC, 4 + msgbox gUnknown_082730BC, MSGBOX_DEFAULT releaseall end @@ -917,34 +917,34 @@ RecordCorner_EventScript_277471:: @ 8277471 end EventScript_TradeRoom_ReadTrainerCard1:: @ 827747E - msgbox Text_278452, 4 + msgbox Text_278452, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end EventScript_TradeRoom_ReadTrainerCard2:: @ 827748D - msgbox Text_27847B, 4 + msgbox Text_27847B, MSGBOX_DEFAULT fadescreen 1 special sp02A_crash_sound waitstate end EventScript_TradeRoom_TooBusyToNotice:: @ 827749C - msgbox Text_27842E, 4 + msgbox Text_27842E, MSGBOX_DEFAULT closemessage end SingleBattleColosseum_EventScript_2774A6:: @ 82774A6 special sub_8098574 - msgbox SingleBattleColosseum_Text_2784B4, 4 + msgbox SingleBattleColosseum_Text_2784B4, MSGBOX_DEFAULT special sub_809859C closemessage end TradeCenter_EventScript_2774B6:: @ 82774B6 special sub_8098574 - msgbox TradeCenter_Text_2784E2, 4 + msgbox TradeCenter_Text_2784E2, MSGBOX_DEFAULT special sub_809859C closemessage end @@ -970,7 +970,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 end gUnknown_082774EF:: @ 82774EF - msgbox Text_2783A8, 5 + msgbox Text_2783A8, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq gUnknown_08277509 erasebox 0, 0, 29, 19 @@ -1029,7 +1029,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT closemessage special HealPlayerParty setvar VAR_0x8004, 6 @@ -1068,17 +1068,17 @@ OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 return OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C - msgbox OldaleTown_PokemonCenter_2F_Text_27893E, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_273755 end OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A - msgbox OldaleTown_PokemonCenter_2F_Text_27897B, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_273755 end OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 - msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, MSGBOX_DEFAULT release return @@ -1087,15 +1087,15 @@ OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 faceplayer checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 - msgbox OldaleTown_PokemonCenter_2F_Text_279937, 5 + msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27769A - msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, MSGBOX_DEFAULT release return OldaleTown_PokemonCenter_2F_EventScript_27769A:: @ 827769A - msgbox OldaleTown_PokemonCenter_2F_Text_279C91, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_279C91, MSGBOX_DEFAULT release return @@ -1165,7 +1165,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB end OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D - msgbox OldaleTown_PokemonCenter_2F_Text_27909D, 5 + msgbox OldaleTown_PokemonCenter_2F_Text_27909D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_277199 @@ -1202,7 +1202,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 end OldaleTown_PokemonCenter_2F_EventScript_2778B2:: @ 82778B2 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_27783B end @@ -1212,12 +1212,12 @@ OldaleTown_PokemonCenter_2F_EventScript_2778C0:: @ 82778C0 end OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB - msgbox OldaleTown_PokemonCenter_2F_Text_279142, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_27783B end OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 - msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, 5 + msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 12 @@ -1225,7 +1225,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 end OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 - msgbox OldaleTown_PokemonCenter_2F_Text_279114, 5 + msgbox OldaleTown_PokemonCenter_2F_Text_279114, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC special HasAtLeastOneBerry @@ -1236,7 +1236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 end OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 - msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, MSGBOX_DEFAULT goto OldaleTown_PokemonCenter_2F_EventScript_2776E3 end @@ -1402,12 +1402,12 @@ EventScript_WirelessBoxResults:: @ 8277B8A fadescreen 1 special sub_801A42C waitstate - msgbox OldaleTown_PokemonCenter_2F_Text_27874F, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27874F, MSGBOX_DEFAULT releaseall end EventScript_277BB4:: @ 8277BB4 - msgbox OldaleTown_PokemonCenter_2F_Text_27871F, 4 + msgbox OldaleTown_PokemonCenter_2F_Text_27871F, MSGBOX_DEFAULT releaseall end @@ -1476,17 +1476,17 @@ MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34 end MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73 - msgbox MossdeepCity_GameCorner_1F_Text_278ACB, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278ACB, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_277C7D:: @ 8277C7D - msgbox MossdeepCity_GameCorner_1F_Text_278BF1, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278BF1, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_277C87:: @ 8277C87 - msgbox MossdeepCity_GameCorner_1F_Text_278CAC, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278CAC, MSGBOX_DEFAULT release end @@ -1514,7 +1514,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 special sub_802C920 compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 0 special sub_81B8958 @@ -1533,7 +1533,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 special sub_8027A5C compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 1 special sub_81B8958 @@ -1602,12 +1602,12 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 delay 60 - msgbox MossdeepCity_GameCorner_1F_Text_278D68, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278D68, MSGBOX_DEFAULT release end MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278E60, 5 + msgbox MossdeepCity_GameCorner_1F_Text_278E60, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 compare VAR_0x8005, 0 @@ -1618,11 +1618,11 @@ MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 end MossdeepCity_GameCorner_1F_EventScript_277E84:: @ 8277E84 - msgbox MossdeepCity_GameCorner_1F_Text_278EDC, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278EDC, MSGBOX_DEFAULT return MossdeepCity_GameCorner_1F_EventScript_277E8D:: @ 8277E8D - msgbox MossdeepCity_GameCorner_1F_Text_278FA4, 4 + msgbox MossdeepCity_GameCorner_1F_Text_278FA4, MSGBOX_DEFAULT return MossdeepCity_GameCorner_1F_EventScript_277E96:: @ 8277E96 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 48c5d8d01..d522469c6 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,18 +11,18 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 end LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA - msgbox LilycoveCity_ContestLobby_Text_27AEA8, 4 + msgbox LilycoveCity_ContestLobby_Text_27AEA8, MSGBOX_DEFAULT return LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3 - msgbox LilycoveCity_ContestLobby_Text_27ADA7, 4 + msgbox LilycoveCity_ContestLobby_Text_27ADA7, MSGBOX_DEFAULT giveitem_std ITEM_POKEBLOCK_CASE setflag FLAG_0x05F - msgbox LilycoveCity_ContestLobby_Text_27AE47, 4 + msgbox LilycoveCity_ContestLobby_Text_27AE47, MSGBOX_DEFAULT return LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 - msgbox LilycoveCity_ContestLobby_Text_27B67B, 4 + msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT switch VAR_0x408A case 4, LilycoveCity_ContestLobby_EventScript_279D2C end @@ -38,7 +38,7 @@ LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B call LilycoveCity_ContestLobby_EventScript_27205E - msgbox LilycoveCity_ContestLobby_Text_27B6E7, 4 + msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT release end @@ -66,27 +66,27 @@ LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97 end LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF - msgbox LilycoveCity_ContestLobby_Text_27AF7A, 4 + msgbox LilycoveCity_ContestLobby_Text_27AF7A, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279D97 end LilycoveCity_ContestLobby_EventScript_279DED:: @ 8279DED - msgbox LilycoveCity_ContestLobby_Text_27B17D, 4 + msgbox LilycoveCity_ContestLobby_Text_27B17D, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279D97 end LilycoveCity_ContestLobby_EventScript_279DFB:: @ 8279DFB - msgbox LilycoveCity_ContestLobby_Text_27B221, 4 + msgbox LilycoveCity_ContestLobby_Text_27B221, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279D97 end LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09 - msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4 + msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 - msgbox LilycoveCity_ContestLobby_Text_27B44A, 4 + msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT choosecontestmon compare VAR_0x8004, 255 goto_eq LilycoveCity_ContestLobby_EventScript_279E09 @@ -148,39 +148,39 @@ LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1 end LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12 - msgbox LilycoveCity_ContestLobby_Text_27B471, 4 + msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279E13 release end LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21 - msgbox LilycoveCity_ContestLobby_Text_27B5C4, 5 + msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279E13 case 1, LilycoveCity_ContestLobby_EventScript_279F87 end LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45 - msgbox LilycoveCity_ContestLobby_Text_27B547, 5 + msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_279E13 case 1, LilycoveCity_ContestLobby_EventScript_279F87 end LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69 - msgbox LilycoveCity_ContestLobby_Text_27B4C4, 4 + msgbox LilycoveCity_ContestLobby_Text_27B4C4, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279E13 release end LilycoveCity_ContestLobby_EventScript_279F78:: @ 8279F78 - msgbox LilycoveCity_ContestLobby_Text_27B501, 4 + msgbox LilycoveCity_ContestLobby_Text_27B501, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_279E13 release end LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87 - msgbox LilycoveCity_ContestLobby_Text_27B5E2, 4 + msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT closemessage releaseall setvar VAR_0x4086, 1 @@ -276,7 +276,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A0C7 lockall - msgbox LinkContestRoom1_Text_27B711, 4 + msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT releaseall return @@ -423,7 +423,7 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 LinkContestRoom1_EventScript_27A26C:: @ 827A26C compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A280 - msgbox LinkContestRoom1_Text_27B830, 4 + msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A280:: @ 827A280 @@ -847,7 +847,7 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 LinkContestRoom1_EventScript_27A853:: @ 827A853 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A867 - msgbox LinkContestRoom1_Text_27B904, 4 + msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A867:: @ 827A867 @@ -897,7 +897,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A90F - msgbox LinkContestRoom1_Text_27BA15, 4 + msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A90F:: @ 827A90F @@ -910,7 +910,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F LinkContestRoom1_EventScript_27A91E:: @ 827A91E compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A932 - msgbox LinkContestRoom1_Text_27BA30, 4 + msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A932:: @ 827A932 @@ -923,7 +923,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 LinkContestRoom1_EventScript_27A941:: @ 827A941 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A955 - msgbox LinkContestRoom1_Text_27BAAC, 4 + msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A955:: @ 827A955 @@ -936,7 +936,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 LinkContestRoom1_EventScript_27A964:: @ 827A964 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A978 - msgbox LinkContestRoom1_Text_27BB25, 4 + msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A978:: @ 827A978 @@ -987,7 +987,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 LinkContestRoom1_EventScript_27AA00:: @ 827AA00 compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27AA14 - msgbox LinkContestRoom1_Text_27BB4C, 4 + msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27AA14:: @ 827AA14 @@ -1089,7 +1089,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 checkflag FLAG_TEMP_2 goto_eq LinkContestRoom1_EventScript_27AB82 lockall - msgbox LinkContestRoom1_Text_27BBA8, 4 + msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT releaseall call LinkContestRoom1_EventScript_27ABF8 call LinkContestRoom1_EventScript_27AC5E @@ -1104,7 +1104,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 LinkContestRoom1_EventScript_27AB82:: @ 827AB82 lockall - msgbox LinkContestRoom1_Text_27BB7A, 4 + msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall delay 90 special sub_80F88E8 @@ -1199,7 +1199,7 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E compare VAR_0x8005, 3 goto_eq LinkContestRoom1_EventScript_27AC77 lockall - msgbox LinkContestRoom1_Text_27BB7A, 4 + msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall return @@ -1212,14 +1212,14 @@ LinkContestRoom1_EventScript_27AC77:: @ 827AC77 compare VAR_CONTEST_RANK, 3 goto_eq LinkContestRoom1_EventScript_27ACBD lockall - msgbox LinkContestRoom1_Text_27BB7A, 4 + msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall return LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 lockall call LinkContestRoom1_EventScript_27205E - msgbox LinkContestRoom1_Text_27BC2F, 4 + msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT releaseall setvar VAR_0x408A, 4 return @@ -1229,7 +1229,7 @@ LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD compare VAR_RESULT, 0 goto_eq LinkContestRoom1_EventScript_27ACA8 lockall - msgbox LinkContestRoom1_Text_27BB7A, 4 + msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall return @@ -1238,12 +1238,12 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF incrementgamestat 42 setflag FLAG_SYS_RIBBON_GET lockall - msgbox LinkContestRoom1_Text_27BBD4, 4 + msgbox LinkContestRoom1_Text_27BBD4, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LinkContestRoom1_Text_27BC00, 4 + msgbox LinkContestRoom1_Text_27BC00, MSGBOX_DEFAULT waitfanfare special sub_80F8390 - msgbox LinkContestRoom1_Text_27BC16, 4 + msgbox LinkContestRoom1_Text_27BC16, MSGBOX_DEFAULT releaseall return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 7b306a261..3a2194132 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -9,18 +9,18 @@ Route117_EventScript_291C18:: @ 8291C18 goto_eq Route117_EventScript_291CD1 compare VAR_RESULT, 3 goto_eq Route117_EventScript_291CE8 - msgbox Route117_Text_291FCF, 4 + msgbox Route117_Text_291FCF, MSGBOX_DEFAULT release end Route117_EventScript_291C4D:: @ 8291C4D - msgbox Route117_Text_29205D, 5 + msgbox Route117_Text_29205D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C83 - msgbox Route117_Text_2922C6, 5 + msgbox Route117_Text_2922C6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C83 - msgbox Route117_Text_292149, 4 + msgbox Route117_Text_292149, MSGBOX_DEFAULT clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare release @@ -30,7 +30,7 @@ Route117_EventScript_291C83:: @ 8291C83 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 goto_if 5, Route117_EventScript_291C9D - msgbox Route117_Text_29216A, 4 + msgbox Route117_Text_29216A, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ Route117_EventScript_291C9D:: @ 8291C9D playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - msgbox Route117_Text_2921CF, 4 + msgbox Route117_Text_2921CF, MSGBOX_DEFAULT special GiveEggFromDaycare clearflag FLAG_PENDING_DAYCARE_EGG release @@ -52,12 +52,12 @@ Route117_EventScript_291CB7:: @ 8291CB7 return Route117_EventScript_291CC8:: @ 8291CC8 - msgbox Route117_Text_2921E5, 4 + msgbox Route117_Text_2921E5, MSGBOX_DEFAULT return Route117_EventScript_291CD1:: @ 8291CD1 special GetDaycareMonNicknames - msgbox Route117_Text_292114, 4 + msgbox Route117_Text_292114, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_EventScript_291CB7 release @@ -65,7 +65,7 @@ Route117_EventScript_291CD1:: @ 8291CD1 Route117_EventScript_291CE8:: @ 8291CE8 special GetDaycareMonNicknames - msgbox Route117_Text_292299, 4 + msgbox Route117_Text_292299, MSGBOX_DEFAULT special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage @@ -87,10 +87,10 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 goto_eq Route117_PokemonDayCare_EventScript_291E2F compare VAR_RESULT, 3 goto_eq Route117_PokemonDayCare_EventScript_291F5C - msgbox Route117_PokemonDayCare_Text_2922F4, 5 + msgbox Route117_PokemonDayCare_Text_2922F4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 - msgbox Route117_PokemonDayCare_Text_292416, 4 + msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT release end @@ -101,7 +101,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 specialvar VAR_RESULT, sub_80722E0 compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291E01 - msgbox Route117_PokemonDayCare_Text_292349, 4 + msgbox Route117_PokemonDayCare_Text_292349, MSGBOX_DEFAULT fadescreen 1 special ChooseSendDaycareMon waitstate @@ -113,7 +113,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 - msgbox Route117_PokemonDayCare_Text_292370, 4 + msgbox Route117_PokemonDayCare_Text_292370, MSGBOX_DEFAULT waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat 47 @@ -124,39 +124,39 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 end Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA - msgbox Route117_PokemonDayCare_Text_292476, 4 + msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4 - msgbox Route117_PokemonDayCare_Text_2923AF, 5 + msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291DED:: @ 8291DED - msgbox Route117_PokemonDayCare_Text_2925BB, 4 + msgbox Route117_PokemonDayCare_Text_2925BB, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291DF7:: @ 8291DF7 - msgbox Route117_PokemonDayCare_Text_292617, 4 + msgbox Route117_PokemonDayCare_Text_292617, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291E01:: @ 8291E01 - msgbox Route117_PokemonDayCare_Text_29266D, 4 + msgbox Route117_PokemonDayCare_Text_29266D, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291E0B:: @ 8291E0B - msgbox Route117_PokemonDayCare_Text_2923F6, 4 + msgbox Route117_PokemonDayCare_Text_2923F6, MSGBOX_DEFAULT release end Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15 - msgbox Route117_PokemonDayCare_Text_2924CC, 4 + msgbox Route117_PokemonDayCare_Text_2924CC, MSGBOX_DEFAULT return Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E @@ -166,13 +166,13 @@ Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E return Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F - msgbox Route117_PokemonDayCare_Text_292488, 4 + msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_291E1E - msgbox Route117_PokemonDayCare_Text_2923AF, 5 + msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 - msgbox Route117_PokemonDayCare_Text_2925F6, 5 + msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA @@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC special GetDaycareCost - msgbox Route117_PokemonDayCare_Text_292549, 5 + msgbox Route117_PokemonDayCare_Text_292549, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291EC8 goto Route117_PokemonDayCare_EventScript_291DCA @@ -206,7 +206,7 @@ Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291EE2 - msgbox Route117_PokemonDayCare_Text_292432, 4 + msgbox Route117_PokemonDayCare_Text_292432, MSGBOX_DEFAULT release end @@ -216,10 +216,10 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 playse SE_REGI - msgbox Route117_PokemonDayCare_Text_292575, 4 + msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 - msgbox Route117_PokemonDayCare_Text_292593, 4 + msgbox Route117_PokemonDayCare_Text_292593, MSGBOX_DEFAULT waitmoncry specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 @@ -228,14 +228,14 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 end Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24 - msgbox Route117_PokemonDayCare_Text_29244F, 5 + msgbox Route117_PokemonDayCare_Text_29244F, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D - msgbox Route117_PokemonDayCare_Text_2924EF, 4 + msgbox Route117_PokemonDayCare_Text_2924EF, MSGBOX_DEFAULT release end @@ -265,15 +265,15 @@ Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B end Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C - msgbox Route117_PokemonDayCare_Text_292488, 4 + msgbox Route117_PokemonDayCare_Text_292488, MSGBOX_DEFAULT setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_291E1E setvar VAR_0x8004, 1 call Route117_PokemonDayCare_EventScript_291E1E - msgbox Route117_PokemonDayCare_Text_2925F6, 5 + msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D - msgbox Route117_PokemonDayCare_Text_292476, 4 + msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT release end @@ -284,14 +284,14 @@ Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 goto_eq Route117_PokemonDayCare_EventScript_291DCA copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare - msgbox Route117_PokemonDayCare_Text_292575, 4 - msgbox Route117_PokemonDayCare_Text_292476, 4 + msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT + msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT release end EventScript_EggHatch:: @ 8291FC0 lockall - msgbox Text_292668, 4 + msgbox Text_292668, MSGBOX_DEFAULT special EggHatch waitstate releaseall diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index aba6bec97..15bb7a7e6 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -18,10 +18,10 @@ Route123_EventScript_2906BB:: @ 82906BB setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT - msgbox Route103_Text_29072E, 5 + msgbox Route103_Text_29072E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route103_EventScript_29072B - msgbox Route103_Text_290771, 4 + msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect 2 waitstate @@ -47,7 +47,7 @@ Route103_Movement_29071F: @ 829071F step_end Route103_EventScript_290721:: @ 8290721 - msgbox Route103_Text_29077D, 4 + msgbox Route103_Text_29077D, MSGBOX_DEFAULT releaseall end @@ -92,10 +92,10 @@ VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6 setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH - msgbox Route111_Text_29083A, 5 + msgbox Route111_Text_29083A, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route111_EventScript_290837 - msgbox Route111_Text_290771, 4 + msgbox Route111_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect 37 waitstate @@ -132,7 +132,7 @@ Route111_Movement_29082B: @ 829082B step_end Route111_EventScript_29082D:: @ 829082D - msgbox Route111_Text_29087F, 4 + msgbox Route111_Text_29087F, MSGBOX_DEFAULT releaseall end @@ -168,7 +168,7 @@ VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA compare VAR_RESULT, 6 goto_eq FieryPath_EventScript_290915 setfieldeffectargument 0, VAR_RESULT - msgbox FieryPath_Text_29092C, 5 + msgbox FieryPath_Text_29092C, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FieryPath_EventScript_290929 closemessage @@ -186,17 +186,17 @@ FieryPath_EventScript_2908FD:: @ 82908FD FieryPath_EventScript_290908:: @ 8290908 setflag FLAG_SYS_USE_STRENGTH - msgbox FieryPath_Text_29098C, 4 + msgbox FieryPath_Text_29098C, MSGBOX_DEFAULT releaseall end FieryPath_EventScript_290915:: @ 8290915 - msgbox FieryPath_Text_2909D6, 4 + msgbox FieryPath_Text_2909D6, MSGBOX_DEFAULT releaseall end FieryPath_EventScript_29091F:: @ 829091F - msgbox FieryPath_Text_290A16, 4 + msgbox FieryPath_Text_290A16, MSGBOX_DEFAULT releaseall end @@ -230,10 +230,10 @@ EventScript_UseWaterfall:: @ 8290A49 goto_eq EventScript_290A84 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT - msgbox Text_290AC3, 5 + msgbox Text_290AC3, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_290A8C - msgbox Text_290AFC, 4 + msgbox Text_290AFC, MSGBOX_DEFAULT dofieldeffect 43 goto EventScript_290A8C @@ -241,7 +241,7 @@ EventScript_CannotUseWaterfall:: @ 8290A83 lockall EventScript_290A84:: @ 8290A84 - msgbox Text_290A8E, 4 + msgbox Text_290A8E, MSGBOX_DEFAULT EventScript_290A8C:: @ 8290A8C releaseall @@ -266,16 +266,16 @@ EventScript_UseDive:: @ 8290B0F bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 - msgbox Text_290BE8, 5 + msgbox Text_290BE8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_290B58 - msgbox Text_290C1A, 4 + msgbox Text_290C1A, MSGBOX_DEFAULT dofieldeffect 44 goto EventScript_290B58 end EventScript_290B4E:: @ 8290B4E - msgbox Text_290BAA, 4 + msgbox Text_290BAA, MSGBOX_DEFAULT releaseall end @@ -291,17 +291,17 @@ EventScript_UseDiveUnderwater:: @ 8290B5A bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 - msgbox Text_290C6E, 5 + msgbox Text_290C6E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq EventScript_290BA8 - msgbox Text_290C1A, 4 + msgbox Text_290C1A, MSGBOX_DEFAULT dofieldeffect 44 goto EventScript_290BA8 end EventScript_290B99:: @ 8290B99 lockall - msgbox Text_290C28, 4 + msgbox Text_290C28, MSGBOX_DEFAULT goto EventScript_290BA8 end @@ -329,7 +329,7 @@ Text_290C6E: @ 8290C6E .string "Would you like to use DIVE?$" EventScript_290CAE:: @ 8290CAE - msgbox Text_290CB7, 3 + msgbox Text_290CB7, MSGBOX_SIGN end Text_290CB7: @ 8290CB7 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 0ca624572..562c57351 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -137,61 +137,61 @@ Route111_EventScript_28CDD2:: @ 828CDD2 Route111_EventScript_28CDD6:: @ 828CDD6 trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56 - msgbox Route111_Text_28B5C0, 4 + msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end Route111_EventScript_28CDF6:: @ 828CDF6 trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56 - msgbox Route111_Text_28B805, 4 + msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end Route118_EventScript_28CE16:: @ 828CE16 trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B5C0, 4 + msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT release end Route118_EventScript_28CE36:: @ 828CE36 trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B805, 4 + msgbox Route118_Text_28B805, MSGBOX_DEFAULT release end Route120_EventScript_28CE56:: @ 828CE56 trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3 - msgbox Route120_Text_28B5C0, 4 + msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT release end Route120_EventScript_28CE76:: @ 828CE76 trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3 - msgbox Route120_Text_28B805, 4 + msgbox Route120_Text_28B805, MSGBOX_DEFAULT release end Route111_EventScript_28CE96:: @ 828CE96 trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B5C0, 4 + msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end Route111_EventScript_28CEB6:: @ 828CEB6 trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B805, 4 + msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end Route118_EventScript_28CED6:: @ 828CED6 trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B5C0, 4 + msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT release end Route118_EventScript_28CEF6:: @ 828CEF6 trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B805, 4 + msgbox Route118_Text_28B805, MSGBOX_DEFAULT release end @@ -199,7 +199,7 @@ Route111_EventScript_28CF16:: @ 828CF16 Route118_EventScript_28CF16:: @ 828CF16 Route120_EventScript_28CF16:: @ 828CF16 trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B5C0, 4 + msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end @@ -207,7 +207,7 @@ Route111_EventScript_28CF36:: @ 828CF36 Route118_EventScript_28CF36:: @ 828CF36 Route120_EventScript_28CF36:: @ 828CF36 trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B805, 4 + msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end @@ -222,7 +222,7 @@ Route111_EventScript_28CF56:: @ 828CF56 call_if 1, Route111_EventScript_28CFB1 checkflag FLAG_TEMP_1 goto_eq Route111_EventScript_28D0EE - msgbox Route111_Text_28B042, 5 + msgbox Route111_Text_28B042, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end @@ -259,7 +259,7 @@ Route120_EventScript_28CFC3:: @ 828CFC3 specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D053 - msgbox Route111_Text_28B137, 4 + msgbox Route111_Text_28B137, MSGBOX_DEFAULT specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia switch VAR_RESULT case 0, Route111_EventScript_28D061 @@ -282,58 +282,58 @@ Route111_Movement_28D051: @ 828D051 step_end Route111_EventScript_28D053:: @ 828D053 - msgbox Route111_Text_28B62D, 5 + msgbox Route111_Text_28B62D, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D061:: @ 828D061 - msgbox Route111_Text_28B3F3, 5 + msgbox Route111_Text_28B3F3, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D06F:: @ 828D06F - msgbox Route111_Text_28B1B3, 5 + msgbox Route111_Text_28B1B3, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D07D:: @ 828D07D - msgbox Route111_Text_28B23D, 5 + msgbox Route111_Text_28B23D, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D08B:: @ 828D08B - msgbox Route111_Text_28B2FA, 5 + msgbox Route111_Text_28B2FA, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D099:: @ 828D099 - msgbox Route111_Text_28B379, 5 + msgbox Route111_Text_28B379, MSGBOX_YESNO goto Route111_EventScript_28D0A7 end Route111_EventScript_28D0A7:: @ 828D0A7 compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B433, 4 + msgbox Route111_Text_28B433, MSGBOX_DEFAULT setvar VAR_0x8004, 10 call Route111_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B4AB, 4 + msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 release end Route111_EventScript_28D0E1:: @ 828D0E1 - msgbox Route111_Text_28B577, 4 + msgbox Route111_Text_28B577, MSGBOX_DEFAULT setflag FLAG_TEMP_1 release end Route111_EventScript_28D0EE:: @ 828D0EE - msgbox Route111_Text_28B5C0, 4 + msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 46be101e1..52ae750b0 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -11,7 +11,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066 MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 compare VAR_RESULT, 0 @@ -25,17 +25,17 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 special ScrSpecial_HasBardSongBeenChanged compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 - msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA - msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290421, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_290421, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 compare VAR_RESULT, 0 @@ -49,20 +49,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 faceplayer compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D - msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, MSGBOX_DEFAULT setvar VAR_0x8004, 1 special ScrSpecial_PlayBardSong delay 60 - msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 special ScrSpecial_SaveBardSongLyrics - msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290514, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E15D:: @ 828E15D - msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, MSGBOX_DEFAULT release end @@ -70,11 +70,11 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 lock faceplayer setflag FLAG_SYS_HIPSTER_MEET - msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, MSGBOX_DEFAULT special ScrSpecial_GetHipsterSpokenFlag compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C - msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290598, MSGBOX_DEFAULT release end @@ -82,12 +82,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C special ScrSpecial_HipsterTeachWord compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290602, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290666, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290666, MSGBOX_DEFAULT special ScrSpecial_SetHipsterSpokenFlag release end @@ -154,7 +154,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E45A: @ 828E45A MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 special ScrSpecial_GetTraderTradedFlag @@ -166,12 +166,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 end MauvilleCity_PokemonCenter_1F_EventScript_28E503:: @ 828E503 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D - msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, MSGBOX_DEFAULT release end @@ -182,7 +182,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 compare VAR_0x8004, 65535 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E special ScrSpecial_DoesPlayerHaveNoDecorations @@ -192,7 +192,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 end MauvilleCity_PokemonCenter_1F_EventScript_28E558:: @ 828E558 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, MSGBOX_DEFAULT release end @@ -209,12 +209,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E56E:: @ 828E56E end MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A - msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, MSGBOX_DEFAULT special ScrSpecial_TraderMenuGiveDecoration waitstate compare VAR_0x8006, 0 @@ -224,26 +224,26 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 special ScrSpecial_IsDecorationFull compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC - msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 special ScrSpecial_TraderDoDecorationTrade - msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E5D4:: @ 828E5D4 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_28E5DE:: @ 828E5DE - msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, MSGBOX_DEFAULT goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 end MauvilleCity_PokemonCenter_1F_EventScript_28E5EC:: @ 828E5EC - msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, MSGBOX_DEFAULT release end @@ -810,7 +810,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A setvar VAR_0x8009, 0 setvar VAR_0x800A, 0 setvar VAR_0x800B, 0 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot @@ -836,38 +836,38 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 end MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD - msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, MSGBOX_DEFAULT specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA - msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, MSGBOX_DEFAULT MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F - msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_29020F:: @ 829020F - msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_290219:: @ 8290219 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_290223:: @ 8290223 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, MSGBOX_DEFAULT release end @@ -895,7 +895,7 @@ MauvilleCity_PokemonCenter_1F_Text_2902BD: @ 82902BD MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 compare VAR_RESULT, 0 @@ -919,7 +919,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 end MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B - msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, MSGBOX_DEFAULT goto MauvilleCity_PokemonCenter_1F_EventScript_290359 end @@ -935,12 +935,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 end MauvilleCity_PokemonCenter_1F_EventScript_29037A:: @ 829037A - msgbox MauvilleCity_PokemonCenter_1F_Text_290281, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_290281, MSGBOX_DEFAULT release end MauvilleCity_PokemonCenter_1F_EventScript_290384:: @ 8290384 - msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, MSGBOX_DEFAULT release end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 3fba532bf..cd2885ea5 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -3,12 +3,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539 faceplayer checkflag FLAG_SYS_CHAT_USED goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915F5 - msgbox PetalburgCity_PokemonCenter_1F_Text_291687, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291687, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291552 end PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552 - msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT multichoice 17, 6, 20, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F @@ -18,12 +18,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552 end PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 - msgbox PetalburgCity_PokemonCenter_1F_Text_291729, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291552 end PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F - msgbox PetalburgCity_PokemonCenter_1F_Text_291969, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_271E7C @@ -36,7 +36,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F end PetalburgCity_PokemonCenter_1F_EventScript_2915CB:: @ 82915CB - msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, MSGBOX_DEFAULT release end @@ -45,22 +45,22 @@ PetalburgCity_PokemonCenter_1F_EventScript_2915D5:: @ 82915D5 special sub_811EECC waitmessage delay 80 - msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, MSGBOX_DEFAULT release end PetalburgCity_PokemonCenter_1F_EventScript_2915EB:: @ 82915EB - msgbox PetalburgCity_PokemonCenter_1F_Text_291991, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291991, MSGBOX_DEFAULT release end PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291603 end PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT multichoice 17, 6, 20, 0 switch VAR_RESULT case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650 @@ -70,12 +70,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603 end PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 - msgbox PetalburgCity_PokemonCenter_1F_Text_291729, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT goto PetalburgCity_PokemonCenter_1F_EventScript_291603 end PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_271E7C @@ -88,7 +88,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 end PetalburgCity_PokemonCenter_1F_EventScript_29167C:: @ 829167C - msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, MSGBOX_DEFAULT release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 9ae77ccf8..81ea87871 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -5,14 +5,14 @@ LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 compare VAR_0x8005, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_29274D compare VAR_0x8005, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292758 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT closemessage setvar VAR_0x4092, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292763 @@ -37,7 +37,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763 LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AF0 @@ -61,7 +61,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799 LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 checkflag FLAG_0x051 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_29283F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_292849 delay 30 setvar VAR_0x4092, 6 @@ -85,7 +85,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292857 waitmovement 0 @@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292862 waitmovement 0 @@ -161,7 +161,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0 waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 waitmovement 0 @@ -170,8 +170,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D call LittlerootTown_BrendansHouse_1F_EventScript_29296C applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, 4 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD @@ -186,7 +186,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8 waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA waitmovement 0 @@ -195,8 +195,8 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC call LittlerootTown_MaysHouse_1F_EventScript_29296C applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, 4 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT + msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1 @@ -211,7 +211,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B waitmovement 0 applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT closemessage return @@ -219,7 +219,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm special TurnOffTVScreen setflag FLAG_SYS_TV_HOME @@ -326,23 +326,23 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 compare VAR_0x4092, 7 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 checkflag FLAG_0x0D8 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A43 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -358,22 +358,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43 LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 checkflag FLAG_0x085 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT setflag FLAG_0x085 release end LittlerootTown_BrendansHouse_1F_EventScript_292A86:: @ 8292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, MSGBOX_DEFAULT goto LittlerootTown_BrendansHouse_1F_EventScript_292A9E end LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, MSGBOX_DEFAULT release end @@ -381,12 +381,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E closemessage call LittlerootTown_BrendansHouse_1F_EventScript_272083 incrementgamestat 16 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_292AB0:: @ 8292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, MSGBOX_DEFAULT release end @@ -396,7 +396,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292ABA:: @ 8292ABA faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, MSGBOX_DEFAULT waitmoncry release end @@ -407,7 +407,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, MSGBOX_DEFAULT waitmoncry release end @@ -464,16 +464,16 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C96 compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CA1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT giveitem_std ITEM_SS_TICKET - msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CAC compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CC1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CD6 @@ -488,7 +488,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D5D delay 20 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_TV_LATI special TurnOnTVScreen @@ -497,13 +497,13 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D72 compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D7D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D1E compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT closemessage clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF @@ -512,12 +512,12 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D88 compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D9D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT multichoice 22, 8, 108, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer copyvar VAR_0x40D5, VAR_RESULT - msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT closemessage setvar VAR_0x4082, 4 setvar VAR_0x408C, 4 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index e77db6b00..324944bb1 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -252,19 +252,19 @@ EventScript_Pblock1_Ask:: @ 8293C3E setvar VAR_0x8009, 1 applymovement 16, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 - msgbox Text_Pblock1_Ask, 5 + msgbox Text_Pblock1_Ask, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_Pblock1_Yes goto EventScript_Pblock1_No end EventScript_Pblock1_No: @ 8293C70 - msgbox Text_Pblock1_No, 4 + msgbox Text_Pblock1_No, MSGBOX_DEFAULT releaseall end EventScript_Pblock1_NoBerries: @ 8293C7A - msgbox Text_Pblock1_NoBerries, 4 + msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT dodailyevents checkflag FLAG_0x921 goto_eq LilycoveCity_ContestLobby_EventScript_293C92 @@ -272,31 +272,31 @@ EventScript_Pblock1_NoBerries: @ 8293C7A end LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92 - msgbox LilycoveCity_ContestLobby_Text_29307D, 4 + msgbox LilycoveCity_ContestLobby_Text_29307D, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C - msgbox LilycoveCity_ContestLobby_Text_292FD1, 4 + msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT giveitem_std ITEM_PECHA_BERRY setflag FLAG_0x921 goto EventScript_Pblock1_KnowHow end EventScript_Pblock1_KnowHow: @ 8293CB9 - msgbox Text_Pblock1_KnowHow, 5 + msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_Pblock1_Start goto EventScript_Pblock1_Explain end EventScript_Pblock1_Start: @ 8293CD2 - msgbox Text_Pblock1_Start, 4 + msgbox Text_Pblock1_Start, MSGBOX_DEFAULT goto EventScript_StartBlending end EventScript_Pblock1_Explain: @ 8293CE0 - msgbox Text_Pblock1_Explain, 4 + msgbox Text_Pblock1_Explain, MSGBOX_DEFAULT goto EventScript_Pblock1_Start end @@ -310,7 +310,7 @@ EventScript_Pblock1_Yes: @ 8293CEE specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 goto_eq EventScript_Pblock1_NoBerries - msgbox Text_Pblock1_Yes, 4 + msgbox Text_Pblock1_Yes, MSGBOX_DEFAULT goto EventScript_Pblock1_KnowHow end @@ -323,12 +323,12 @@ EventScript_StartBlending: @ 8293D2C end EventScript_Pblock1_FullPokeblock: @ 8293D39 - msgbox Text_Pblock1_FullPokeblock, 4 + msgbox Text_Pblock1_FullPokeblock, MSGBOX_DEFAULT releaseall end EventScript_Pblock1_NoPokeblock: @ 8293D43 - msgbox Text_Pblock1_NoPokeblock, 4 + msgbox Text_Pblock1_NoPokeblock, MSGBOX_DEFAULT releaseall end @@ -338,36 +338,36 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D applymovement 10, LilycoveCity_ContestLobby_Movement_2725A2 applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_293201, 5 + msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DC6 goto LilycoveCity_ContestLobby_EventScript_293D7D end LilycoveCity_ContestLobby_EventScript_293D7D: @ 8293D7D - msgbox LilycoveCity_ContestLobby_Text_29323D, 4 + msgbox LilycoveCity_ContestLobby_Text_29323D, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87 - msgbox LilycoveCity_ContestLobby_Text_293394, 4 + msgbox LilycoveCity_ContestLobby_Text_293394, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91 - msgbox LilycoveCity_ContestLobby_Text_29328C, 5 + msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DAA goto LilycoveCity_ContestLobby_EventScript_293DB8 end LilycoveCity_ContestLobby_EventScript_293DAA: @ 8293DAA - msgbox LilycoveCity_ContestLobby_Text_2932C3, 4 + msgbox LilycoveCity_ContestLobby_Text_2932C3, MSGBOX_DEFAULT goto EventScript_StartBlending end LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8 - msgbox LilycoveCity_ContestLobby_Text_2932F1, 4 + msgbox LilycoveCity_ContestLobby_Text_2932F1, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_293DAA end @@ -378,7 +378,7 @@ LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293E14 - msgbox LilycoveCity_ContestLobby_Text_293237, 4 + msgbox LilycoveCity_ContestLobby_Text_293237, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91 @@ -387,12 +387,12 @@ LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6 end LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A - msgbox LilycoveCity_ContestLobby_Text_29343E, 4 + msgbox LilycoveCity_ContestLobby_Text_29343E, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14 - msgbox LilycoveCity_ContestLobby_Text_2934A2, 4 + msgbox LilycoveCity_ContestLobby_Text_2934A2, MSGBOX_DEFAULT releaseall end @@ -404,36 +404,36 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E applymovement 17, LilycoveCity_ContestLobby_Movement_2725A2 applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_293842, 5 + msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293EA3 goto LilycoveCity_ContestLobby_EventScript_293E5A end LilycoveCity_ContestLobby_EventScript_293E5A: @ 8293E5A - msgbox LilycoveCity_ContestLobby_Text_293558, 4 + msgbox LilycoveCity_ContestLobby_Text_293558, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64 - msgbox LilycoveCity_ContestLobby_Text_29367D, 4 + msgbox LilycoveCity_ContestLobby_Text_29367D, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E - msgbox LilycoveCity_ContestLobby_Text_29357E, 5 + msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293E87 goto LilycoveCity_ContestLobby_EventScript_293E95 end LilycoveCity_ContestLobby_EventScript_293E87: @ 8293E87 - msgbox LilycoveCity_ContestLobby_Text_2935B1, 4 + msgbox LilycoveCity_ContestLobby_Text_2935B1, MSGBOX_DEFAULT goto EventScript_StartBlending end LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95 - msgbox LilycoveCity_ContestLobby_Text_2935E5, 4 + msgbox LilycoveCity_ContestLobby_Text_2935E5, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_293E87 end @@ -444,7 +444,7 @@ LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293EF1 - msgbox LilycoveCity_ContestLobby_Text_29354E, 4 + msgbox LilycoveCity_ContestLobby_Text_29354E, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E @@ -453,27 +453,27 @@ LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3 end LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7 - msgbox LilycoveCity_ContestLobby_Text_293738, 4 + msgbox LilycoveCity_ContestLobby_Text_293738, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293EF1: @ 8293EF1 - msgbox LilycoveCity_ContestLobby_Text_293792, 4 + msgbox LilycoveCity_ContestLobby_Text_293792, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB lockall setvar VAR_0x8009, 1 - msgbox LilycoveCity_ContestLobby_Text_2C42F4, 5 + msgbox LilycoveCity_ContestLobby_Text_2C42F4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293F28 - msgbox LilycoveCity_ContestLobby_Text_2C4332, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4332, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E - msgbox LilycoveCity_ContestLobby_Text_2C439D, 4 + msgbox LilycoveCity_ContestLobby_Text_2C439D, MSGBOX_DEFAULT releaseall end @@ -492,37 +492,37 @@ LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28 end LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64 - msgbox LilycoveCity_ContestLobby_Text_2C43FA, 5 + msgbox LilycoveCity_ContestLobby_Text_2C43FA, MSGBOX_YESNO compare VAR_RESULT, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_293F85 - msgbox LilycoveCity_ContestLobby_Text_2C451B, 4 + msgbox LilycoveCity_ContestLobby_Text_2C451B, MSGBOX_DEFAULT goto EventScript_StartBlending end LilycoveCity_ContestLobby_EventScript_293F85: @ 8293F85 - msgbox LilycoveCity_ContestLobby_Text_2C444C, 4 + msgbox LilycoveCity_ContestLobby_Text_2C444C, MSGBOX_DEFAULT return LilycoveCity_ContestLobby_EventScript_293F8E: @ 8293F8E - msgbox LilycoveCity_ContestLobby_Text_2C4573, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4573, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98 - msgbox LilycoveCity_ContestLobby_Text_2C45E8, 4 + msgbox LilycoveCity_ContestLobby_Text_2C45E8, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2 - msgbox LilycoveCity_ContestLobby_Text_2937F9, 2 + msgbox LilycoveCity_ContestLobby_Text_2937F9, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB - msgbox LilycoveCity_ContestLobby_Text_293842, 2 + msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4 - msgbox LilycoveCity_ContestLobby_Text_29388F, 2 + msgbox LilycoveCity_ContestLobby_Text_29388F, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD @@ -533,7 +533,7 @@ LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8 lock faceplayer - msgbox Text_Pblock1_Talk_0, 4 + msgbox Text_Pblock1_Talk_0, MSGBOX_DEFAULT specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293FEE @@ -542,7 +542,7 @@ LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8 end LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE - msgbox Text_Pblock1_Talk_1, 4 + msgbox Text_Pblock1_Talk_1, MSGBOX_DEFAULT release end @@ -560,15 +560,15 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 end LilycoveCity_ContestLobby_EventScript_294028: @ 8294028 - msgbox LilycoveCity_ContestLobby_Text_293BB4, 4 + msgbox LilycoveCity_ContestLobby_Text_293BB4, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_294032: @ 8294032 - msgbox LilycoveCity_ContestLobby_Text_293AF0, 4 + msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT giveitem_std ITEM_PECHA_BERRY setflag FLAG_0x921 - msgbox LilycoveCity_ContestLobby_Text_293B76, 4 + msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT release end @@ -592,7 +592,7 @@ EventScript_PblockLink:: @ 8294055 end EventScript_PblocLink_Ask: @ 8294092 - msgbox Text_PblockLink_Ask, 5 + msgbox Text_PblockLink_Ask, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_PblocLink_TryConnect compare VAR_RESULT, 0 @@ -600,7 +600,7 @@ EventScript_PblocLink_Ask: @ 8294092 end EventScript_PblocLink_NoBerries: @ 82940B1 - msgbox Text_PblockLink_NoBerries, 4 + msgbox Text_PblockLink_NoBerries, MSGBOX_DEFAULT releaseall end @@ -628,17 +628,17 @@ EventScript_PblocLink_TryConnect: @ 82940BB end EventScript_PblocLink_1Arrived: @ 829411D - msgbox Text_PblockLink_1Arrived, 4 + msgbox Text_PblockLink_1Arrived, MSGBOX_DEFAULT goto EventScript_PblocLink_StartLinkBlending end EventScript_PblocLink_2Arrived: @ 829412B - msgbox Text_PblockLink_2Arrived, 4 + msgbox Text_PblockLink_2Arrived, MSGBOX_DEFAULT goto EventScript_PblocLink_StartLinkBlending end EventScript_PblocLink_3Arrived: @ 8294139 - msgbox Text_PblockLink_3Arrived, 4 + msgbox Text_PblockLink_3Arrived, MSGBOX_DEFAULT goto EventScript_PblocLink_StartLinkBlending end @@ -659,36 +659,36 @@ EventScript_PblocLink_End: @ 8294160 end EventScript_PblocLink_FullPokeblock: @ 8294162 - msgbox Text_PblockLink_FullPokeblock, 4 + msgbox Text_PblockLink_FullPokeblock, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_NoPokeblock: @ 829416C - msgbox Text_PblockLink_NoPokeblock, 4 + msgbox Text_PblockLink_NoPokeblock, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_SomeoneNotReady: @ 8294176 special CloseLink - msgbox LilycoveCity_ContestLobby_Text_2781C7, 4 + msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_DifferentSelections: @ 8294183 special CloseLink - msgbox LilycoveCity_ContestLobby_Text_278255, 4 + msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_CloseLink: @ 8294190 special CloseLink - msgbox gUnknown_08272D9C, 4 + msgbox gUnknown_08272D9C, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_LinkError: @ 829419D special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, 4 + msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT releaseall end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index e4b1fce41..84bb3982d 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -13,7 +13,7 @@ EventScript_2A4B5D:: @ 82A4B5D EventScript_2A4B6F:: @ 82A4B6F lockall - msgbox Text_2A4BF4, 5 + msgbox Text_2A4BF4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_2A4B85 releaseall @@ -45,7 +45,7 @@ EventScript_2A4BAC:: @ 82A4BAC special GetPokeblockFeederInFront compare VAR_RESULT, 65535 goto_if 5, EventScript_2A4BEB - msgbox Text_2A4C90, 5 + msgbox Text_2A4C90, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq EventScript_2A4BD0 releaseall diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 27fe53a4c..aa1f4afee 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -36,10 +36,10 @@ Route111_Text_27659D: @ 827659D Route111_EventScript_2765FF:: @ 82765FF lock faceplayer - msgbox Route111_Text_2762C9, 5 + msgbox Route111_Text_2762C9, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_EventScript_27661E - msgbox Route111_Text_27655C, 4 + msgbox Route111_Text_27655C, MSGBOX_DEFAULT release end @@ -47,7 +47,7 @@ Route111_EventScript_27661E:: @ 827661E giveitem_std ITEM_TM43 compare VAR_RESULT, 0 goto_eq Route111_EventScript_276680 - msgbox Route111_Text_27636E, 4 + msgbox Route111_Text_27636E, MSGBOX_DEFAULT closemessage setflag FLAG_0x060 clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN @@ -72,7 +72,7 @@ Route111_EventScript_276675:: @ 8276675 return Route111_EventScript_276680:: @ 8276680 - msgbox Route111_Text_27659D, 4 + msgbox Route111_Text_27659D, MSGBOX_DEFAULT release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 2292e9984..9033e741f 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -32,18 +32,18 @@ EventScript_27EE54:: @ 827EE54 EventScript_27EE8A:: @ 827EE8A special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, 4 + msgbox gUnknown_08272BCF, MSGBOX_DEFAULT special TurnOffTVScreen releaseall end EventScript_27EE9A:: @ 827EE9A - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, MSGBOX_DEFAULT releaseall end EventScript_27EEA4:: @ 827EEA4 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT special InitRoamer clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF @@ -68,7 +68,7 @@ EventScript_27EED0:: @ 827EED0 EventScript_27EED8:: @ 827EED8 special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, 4 + msgbox gUnknown_08272BCF, MSGBOX_DEFAULT goto EventScript_27EED0 end -- cgit v1.2.3 From e17140536a392db42c5c21b568931c0b753acfda Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 2 Dec 2018 11:58:50 +0100 Subject: finish link rfu and fix rom 8011dc0 --- asm/link_rfu.s | 520 --------------- asm/rom_8011DC0.s | 1851 ---------------------------------------------------- include/librfu.h | 5 + include/link_rfu.h | 10 +- ld_script.txt | 1 - src/link_rfu.c | 307 ++++++--- src/rom_8011DC0.c | 29 +- 7 files changed, 260 insertions(+), 2463 deletions(-) delete mode 100644 asm/link_rfu.s diff --git a/asm/link_rfu.s b/asm/link_rfu.s deleted file mode 100644 index 4060c4959..000000000 --- a/asm/link_rfu.s +++ /dev/null @@ -1,520 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - - - thumb_func_start sub_801209C -sub_801209C: @ 801209C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r5, r0, 24 - mov r8, r5 - ldr r6, =gUnknown_03005000 - adds r0, r6, 0 - adds r0, 0xF1 - ldrb r0, [r0] - cmp r0, 0x4 - bne _080120BA - adds r0, r5, 0 - bl DestroyTask -_080120BA: - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - lsls r0, 16 - movs r1, 0x96 - lsls r1, 17 - cmp r0, r1 - ble _080120E4 - movs r1, 0xE0 - lsls r1, 7 - movs r0, 0x2 - bl sub_8011A64 - adds r0, r5, 0 - bl DestroyTask -_080120E4: - ldr r1, =0x00000ccd - adds r0, r6, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _0801217C - ldr r0, =gUnknown_03004140 - ldrb r0, [r0, 0x6] - cmp r0, 0 - bne _0801217C - movs r2, 0x86 - lsls r2, 1 - adds r0, r6, r2 - bl ReadU16 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r2, =0x00000119 - adds r0, r6, r2 - bl sub_8011CE4 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - beq _0801217C - movs r1, 0xA - ldrsh r0, [r4, r1] - ldr r7, =gUnknown_03007890 - lsls r4, r2, 5 - adds r2, r4, 0 - adds r2, 0x14 - ldr r1, [r7] - adds r1, r2 - adds r1, 0x6 - bl sub_801200C - cmp r0, 0 - bne _0801216C - ldr r0, [r7] - adds r1, r0, r4 - ldrb r0, [r1, 0x16] - cmp r0, 0xFF - beq _0801217C - ldrh r0, [r1, 0x14] - movs r1, 0x5A - bl sub_800C12C - lsls r0, 24 - cmp r0, 0 - bne _0801217C - movs r0, 0xA - strh r0, [r6, 0x4] - adds r0, r5, 0 - bl DestroyTask - b _0801217C - .pool -_0801216C: - movs r1, 0xE0 - lsls r1, 7 - movs r0, 0x2 - bl sub_8011A64 - mov r0, r8 - bl DestroyTask -_0801217C: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_801209C - - thumb_func_start sub_8012188 -sub_8012188: @ 8012188 - push {r4-r7,lr} - adds r3, r0, 0 - adds r5, r1, 0 - lsls r4, r2, 24 - lsrs r4, 24 - ldr r6, =gUnknown_03005000 - ldr r1, =0x00000ccf - adds r0, r6, r1 - movs r7, 0 - strb r7, [r0] - adds r0, r6, 0 - adds r0, 0xF1 - strb r7, [r0] - ldr r1, =0x00000119 - adds r0, r6, r1 - adds r1, r3, 0 - bl StringCopy - movs r1, 0x85 - lsls r1, 1 - adds r0, r6, r1 - adds r1, r5, 0 - movs r2, 0xD - bl memcpy - bl sub_800D658 - ldr r0, =sub_801209C - movs r1, 0x2 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r5 - strh r4, [r1, 0xA] - ldr r0, =sub_800EB44 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r1, r0, 24 - adds r2, r1, 0 - cmp r4, 0x45 - bne _08012210 - cmp r1, 0xFF - beq _0801221E - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r5 - movs r1, 0x1 - strh r1, [r0, 0x16] - b _0801221E - .pool -_08012210: - cmp r2, 0xFF - beq _0801221E - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r5 - strh r7, [r0, 0x16] -_0801221E: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8012188 - - thumb_func_start sub_8012224 -sub_8012224: @ 8012224 - push {lr} - ldr r0, =gUnknown_03005000 - adds r0, 0xF0 - ldrb r0, [r0] - cmp r0, 0x1 - beq _08012238 - movs r0, 0 - b _0801223A - .pool -_08012238: - movs r0, 0x1 -_0801223A: - pop {r1} - bx r1 - thumb_func_end sub_8012224 - - thumb_func_start sub_8012240 -sub_8012240: @ 8012240 - push {r4,lr} - movs r1, 0 - ldr r0, =gUnknown_03004140 - ldrb r2, [r0] - ldr r4, =gUnknown_03005000+0xCD1 - movs r3, 0x1 -_0801224C: - adds r0, r2, 0 - asrs r0, r1 - ands r0, r3 - cmp r0, 0 - beq _0801226C - adds r0, r1, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _0801226C - movs r0, 0 - b _08012274 - .pool -_0801226C: - adds r1, 0x1 - cmp r1, 0x3 - ble _0801224C - movs r0, 0x1 -_08012274: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8012240 - - thumb_func_start sub_801227C -sub_801227C: @ 801227C - push {r4,lr} - movs r4, 0 -_08012280: - lsls r2, r4, 24 - lsrs r2, 24 - ldr r0, =gUnknown_082ED82C - movs r1, 0 - bl nullsub_5 - adds r4, 0x1 - cmp r4, 0x13 - ble _08012280 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801227C - - thumb_func_start sub_801229C -sub_801229C: @ 801229C - push {r4-r7,lr} - mov r7, r8 - push {r7} - bl GetBlockReceivedStatus - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1C - movs r2, 0x13 - movs r3, 0x2 - bl nullsub_13 - ldr r4, =gUnknown_03007890 - ldr r0, [r4] - ldrb r0, [r0, 0x2] - movs r1, 0x14 - movs r2, 0x1 - movs r3, 0x1 - bl nullsub_13 - ldr r0, [r4] - ldrb r0, [r0, 0x3] - movs r1, 0x17 - movs r2, 0x1 - movs r3, 0x1 - bl nullsub_13 - ldr r0, =gUnknown_03005000 - ldrb r0, [r0, 0xC] - cmp r0, 0x1 - bne _08012378 - movs r6, 0 - adds r7, r4, 0 - movs r5, 0x14 -_080122E0: - ldr r2, [r7] - ldrb r0, [r2, 0x7] - asrs r0, r6 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0801231E - lsls r0, r6, 5 - adds r0, r2, r0 - ldrh r0, [r0, 0x18] - adds r4, r6, 0x3 - lsls r4, 24 - lsrs r4, 24 - adds r2, r4, 0 - movs r3, 0x4 - bl nullsub_13 - ldr r0, [r7] - adds r0, r5 - adds r0, 0x6 - movs r1, 0x6 - adds r2, r4, 0 - bl nullsub_5 - ldr r0, [r7] - adds r0, r5 - adds r0, 0x15 - movs r1, 0x16 - adds r2, r4, 0 - bl nullsub_5 -_0801231E: - adds r5, 0x20 - adds r6, 0x1 - cmp r6, 0x3 - ble _080122E0 - movs r6, 0 - ldr r0, =gUnknown_03005000 - mov r8, r0 -_0801232C: - movs r5, 0 - adds r7, r6, 0x1 - lsls r0, r6, 3 - adds r2, r6, 0 - adds r2, 0xB - subs r0, r6 - lsls r0, 1 - mov r1, r8 - adds r1, 0x14 - adds r4, r0, r1 - lsls r6, r2, 24 -_08012342: - ldrb r0, [r4] - lsls r1, r5, 25 - lsrs r1, 24 - lsrs r2, r6, 24 - movs r3, 0x2 - bl nullsub_13 - adds r4, 0x1 - adds r5, 0x1 - cmp r5, 0xD - ble _08012342 - adds r6, r7, 0 - cmp r6, 0x3 - ble _0801232C - ldr r0, =gUnknown_082ED868 - movs r1, 0x1 - movs r2, 0xF - bl nullsub_5 - b _080124AA - .pool -_08012378: - ldr r1, [r4] - ldrb r0, [r1, 0x2] - cmp r0, 0 - beq _08012414 - ldrb r0, [r1, 0x7] - cmp r0, 0 - beq _08012414 - movs r6, 0 - movs r5, 0xC0 - lsls r5, 18 -_0801238C: - lsrs r4, r5, 24 - movs r0, 0 - movs r1, 0x1 - adds r2, r4, 0 - movs r3, 0x4 - bl nullsub_13 - ldr r0, =gUnknown_082ED84B - movs r1, 0x6 - adds r2, r4, 0 - bl nullsub_5 - ldr r0, =gUnknown_082ED85B - movs r1, 0x16 - adds r2, r4, 0 - bl nullsub_5 - movs r1, 0x80 - lsls r1, 17 - adds r5, r1 - adds r6, 0x1 - cmp r6, 0x3 - ble _0801238C - ldr r5, =gUnknown_03007890 - ldr r1, [r5] - ldr r4, =gUnknown_03005000 - ldr r0, =0x00000c3e - adds r4, r0 - ldrb r0, [r4] - lsls r0, 5 - adds r1, r0 - ldrh r0, [r1, 0x18] - movs r1, 0x1 - movs r2, 0x3 - movs r3, 0x4 - bl nullsub_13 - ldrb r1, [r4] - lsls r1, 5 - adds r1, 0x14 - ldr r0, [r5] - adds r0, r1 - adds r0, 0x6 - movs r1, 0x6 - movs r2, 0x3 - bl nullsub_5 - ldrb r1, [r4] - lsls r1, 5 - adds r1, 0x14 - ldr r0, [r5] - adds r0, r1 - adds r0, 0x15 - movs r1, 0x16 - movs r2, 0x3 - bl nullsub_5 - b _080124AA - .pool -_08012414: - movs r6, 0 - ldr r1, =gUnknown_03007890 - ldr r0, [r1] - ldrb r0, [r0, 0x8] - cmp r6, r0 - bge _08012470 - adds r7, r1, 0 - movs r1, 0x14 - mov r8, r1 -_08012426: - ldr r0, [r7] - lsls r5, r6, 5 - adds r1, r0, r5 - ldrb r0, [r1, 0x16] - cmp r0, 0xFF - beq _08012462 - ldrh r0, [r1, 0x18] - adds r4, r6, 0x3 - lsls r4, 24 - lsrs r4, 24 - movs r1, 0x1 - adds r2, r4, 0 - movs r3, 0x4 - bl nullsub_13 - ldr r0, [r7] - adds r0, r5 - ldrh r0, [r0, 0x14] - movs r1, 0x6 - adds r2, r4, 0 - movs r3, 0x4 - bl nullsub_13 - ldr r0, [r7] - add r0, r8 - adds r0, 0x15 - movs r1, 0x16 - adds r2, r4, 0 - bl nullsub_5 -_08012462: - movs r0, 0x20 - add r8, r0 - adds r6, 0x1 - ldr r0, [r7] - ldrb r0, [r0, 0x8] - cmp r6, r0 - blt _08012426 -_08012470: - cmp r6, 0x3 - bgt _080124AA - lsls r0, r6, 24 - movs r1, 0xC0 - lsls r1, 18 - adds r5, r0, r1 -_0801247C: - lsrs r4, r5, 24 - movs r0, 0 - movs r1, 0x1 - adds r2, r4, 0 - movs r3, 0x4 - bl nullsub_13 - ldr r0, =gUnknown_082ED84B - movs r1, 0x6 - adds r2, r4, 0 - bl nullsub_5 - ldr r0, =gUnknown_082ED85B - movs r1, 0x16 - adds r2, r4, 0 - bl nullsub_5 - movs r0, 0x80 - lsls r0, 17 - adds r5, r0 - adds r6, 0x1 - cmp r6, 0x3 - ble _0801247C -_080124AA: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801229C - - thumb_func_start sub_80124C0 -sub_80124C0: @ 80124C0 - ldr r0, =gUnknown_03005000 - ldr r1, =0x00000c1a - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_80124C0 - - thumb_func_start sub_80124D4 -sub_80124D4: @ 80124D4 - ldr r0, =gUnknown_03005000 - ldr r1, =0x000009e6 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_80124D4 - - .align 2, 0 @ don't pad with nop diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index a52c2bc88..7e0099a9c 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -5,1857 +5,6 @@ .text - thumb_func_start sub_80156E0 -sub_80156E0: @ 80156E0 - push {r4-r7,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r4, r0, 24 - movs r5, 0 - ldr r0, =gUnknown_02022C30 - ldr r6, [r0] - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r7, r0, r1 - ldrb r0, [r6, 0x14] - cmp r0, 0x38 - bls _08015702 - bl _08016878 -_08015702: - lsls r0, 2 - ldr r1, =_08015718 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08015718: - .4byte _080157FC - .4byte _08015854 - .4byte _08015878 - .4byte _080158C8 - .4byte _080159A6 - .4byte _08015E5C - .4byte _08015C54 - .4byte _08015E5C - .4byte _08016864 - .4byte _080161C8 - .4byte _080162D4 - .4byte _080160AC - .4byte _080160C6 - .4byte _08016324 - .4byte _08016348 - .4byte _08016350 - .4byte _08016360 - .4byte _0801638E - .4byte _080163A2 - .4byte _08015F32 - .4byte _08015FB8 - .4byte _08015FD6 - .4byte _0801604A - .4byte _08015ADA - .4byte _08015B00 - .4byte _08015B78 - .4byte _08016838 - .4byte _08015D4C - .4byte _08015D34 - .4byte _08015DD0 - .4byte _08015C2A - .4byte _08015DA6 - .4byte _08015D9C - .4byte _08016158 - .4byte _08016178 - .4byte _080161B8 - .4byte _080162DC - .4byte _08016318 - .4byte _08015BF4 - .4byte _08016104 - .4byte _08015E94 - .4byte _08015EC4 - .4byte _080163CC - .4byte _0801645C - .4byte _080165A8 - .4byte _08016610 - .4byte _0801662C - .4byte _08016478 - .4byte _08016634 - .4byte _08016738 - .4byte _0801676C - .4byte _080167F4 - .4byte _0801652C - .4byte _080164E0 - .4byte _080164F4 - .4byte _0801658C - .4byte _080165DC -_080157FC: - movs r0, 0x70 - bl AllocZeroed - str r0, [r6, 0x4] - movs r0, 0x70 - bl AllocZeroed - str r0, [r6, 0xC] - movs r0, 0x80 - lsls r0, 1 - bl AllocZeroed - str r0, [r6] - movs r0, 0x20 - bl AllocZeroed - str r0, [r6, 0x8] - ldr r0, [r6] - movs r1, 0x8 - bl sub_8017580 - ldr r1, =gUnknown_02022C2C - movs r0, 0x40 - strb r0, [r1] - ldr r0, [r6, 0xC] - ldr r1, [r6, 0x4] - movs r2, 0x9 - bl sub_8016DF0 - adds r1, r6, 0 - adds r1, 0x20 - strb r0, [r1] - adds r0, r6, 0 - adds r0, 0xA0 - bl sub_8019BA8 - bl sub_8019F2C - movs r0, 0x1 - bl _08016876 - .pool -_08015854: - adds r0, r6, 0 - adds r0, 0x21 - movs r2, 0 - ldrsh r1, [r7, r2] - bl sub_8019E70 - ldrh r0, [r7] - adds r0, 0x1 - strh r0, [r7] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - beq _08015872 - bl _08016878 -_08015872: - movs r0, 0x2 - bl _08016876 -_08015878: - movs r0, 0x40 - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - ldr r2, =gUnknown_02022C40 - ldrh r0, [r2, 0x2] - ldrh r1, [r2, 0xA] - ldrh r2, [r2, 0xC] - bl sub_8010FCC - bl sub_800B488 - bl OpenLink - bl sub_8011C84 - ldr r0, [r6, 0x8] - movs r1, 0x1 - bl sub_8017580 - ldr r0, [r6, 0x4] - movs r1, 0x4 - bl sub_80175EC - ldr r0, [r6, 0xC] - movs r1, 0x4 - bl sub_80175EC - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] - movs r0, 0x3 - bl _08016876 - .pool -_080158C8: - bl sub_81B1360 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x8 - beq _080158E0 - bl sub_81B1360 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x9 - bne _080159A0 -_080158E0: - ldr r4, =gUnknown_02022C40 - ldrh r0, [r4] - cmp r0, 0 - beq _080159A0 - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r5, r0, 24 - ldrh r0, [r4] - cmp r0, 0x1 - beq _08015900 - cmp r0, 0x2 - beq _08015950 - b _0801598E - .pool -_08015900: - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - cmp r5, 0x5 - bls _0801592C - adds r0, r4, 0 - bl sub_801807C - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010FCC - ldr r0, =gUnknown_082EF4FC - bl sub_801568C - b _0801598E - .pool -_0801592C: - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - adds r1, r4, 0 - bl sub_80180A0 - cmp r0, 0 - bne _0801594C - ldr r1, =gUnknown_082EF47C - movs r0, 0x34 - bl sub_8015664 - b _0801598E - .pool -_0801594C: - movs r0, 0x37 - b _0801598C -_08015950: - adds r0, r6, 0 - bl sub_80156C8 - ldrb r0, [r4, 0x8] - strh r0, [r7, 0x2] - cmp r5, 0x5 - bls _0801596C - ldr r0, =gUnknown_082EF544 - bl sub_801568C - b _0801598E - .pool -_0801596C: - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - ldr r1, =gUnknown_02022C2C - movs r0, 0x44 - strb r0, [r1] - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - adds r1, r4, 0 - bl sub_80180E8 - movs r0, 0x33 -_0801598C: - strb r0, [r6, 0x14] -_0801598E: - ldr r1, =gUnknown_02022C40 - movs r0, 0 - strh r0, [r1] - bl _08016878 - .pool -_080159A0: - movs r0, 0x4 - bl _08016876 -_080159A6: - ldr r4, =gSpecialVar_Result - ldrh r0, [r4] - cmp r0, 0 - beq _08015A0A - cmp r0, 0x9 - bne _080159E0 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - movs r0, 0x2 - bl PlaySE - ldr r0, =gStringVar1 - ldr r1, =gSaveBlock2Ptr - ldr r1, [r1] - bl StringCopy - movs r1, 0 - movs r0, 0x2A - b _08015A02 - .pool -_080159E0: - cmp r0, 0xB - bne _080159F4 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - movs r1, 0 - movs r0, 0x17 - b _08015A02 -_080159F4: - movs r0, 0 - strh r0, [r7] - ldrh r0, [r4] - subs r0, 0x1 - strh r0, [r7, 0x2] - movs r1, 0 - movs r0, 0x18 -_08015A02: - strb r0, [r6, 0x14] - strh r1, [r4] - bl _08016878 -_08015A0A: - bl ScriptContext2_IsEnabled - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08015A1A - bl _08016878 -_08015A1A: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08015A80 - ldr r0, [r6] - adds r2, r7, 0x2 - adds r3, r6, 0 - adds r3, 0x21 - adds r1, r7, 0 - bl sub_801A2A8 - cmp r0, 0 - beq _08015A4C - movs r0, 0x5 - bl PlaySE - bl sub_80181CC - movs r0, 0x18 - bl _08016876 - .pool -_08015A4C: - bl sub_8017940 - cmp r0, 0 - beq _08015A80 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - movs r0, 0x2 - bl PlaySE - bl sub_80181CC - ldr r0, =gStringVar1 - ldr r1, =gSaveBlock2Ptr - ldr r1, [r1] - bl StringCopy - movs r0, 0x2D - bl _08016876 - .pool -_08015A80: - bl sub_8016B00 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _08015AA2 - cmp r0, 0x2 - bgt _08015A96 - cmp r0, 0x1 - beq _08015A9C - b _08015AD0 -_08015A96: - cmp r0, 0x4 - beq _08015AAA - b _08015AD0 -_08015A9C: - movs r0, 0x2 - bl PlaySE -_08015AA2: - adds r0, r6, 0 - bl sub_801A274 - b _08015AD0 -_08015AAA: - movs r0, 0xB - strb r0, [r6, 0x14] - bl sub_80181CC - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010FCC - adds r0, r6, 0 - bl sub_80181DC - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - movs r0, 0x53 - movs r2, 0 - bl sub_8011090 -_08015AD0: - adds r0, r6, 0 - bl sub_801A284 - bl _08016878 -_08015ADA: - ldr r0, =sub_809FA34 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _08015AEA - bl _08016878 -_08015AEA: - movs r0, 0x40 - movs r1, 0 - movs r2, 0 - bl sub_8011090 - movs r0, 0x4 - bl _08016876 - .pool -_08015B00: - bl sub_801704C - movs r3, 0x2 - ldrsh r0, [r7, r3] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - ldr r0, [r6] - ldrb r1, [r7] - ldrb r2, [r7, 0x2] - adds r3, r4, 0 - bl sub_80179D4 - cmp r0, 0x1 - beq _08015B44 - cmp r0, 0x1 - bgt _08015B36 - cmp r0, 0 - beq _08015B3E - bl _08016878 -_08015B36: - cmp r0, 0x2 - beq _08015B68 - bl _08016878 -_08015B3E: - movs r0, 0x1A - bl _08016876 -_08015B44: - movs r1, 0x2 - ldrsh r0, [r7, r1] - lsls r0, 5 - ldr r1, [r6] - adds r1, r0 - adds r0, r1, 0 - adds r0, 0x10 - ldr r2, =gUnknown_02022C2C - ldrb r2, [r2] - bl sub_8012188 - strh r5, [r6, 0x12] - movs r0, 0x19 - bl _08016876 - .pool -_08015B68: - ldr r1, =gStringVar4 - movs r0, 0x13 - bl sub_8015664 - bl _08016878 - .pool -_08015B78: - bl sub_801704C - bl sub_8011A74 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1 - blt _08015BBE - cmp r4, 0x2 - ble _08015B9A - cmp r4, 0x4 - bne _08015BBE - movs r0, 0x1 - bl sub_801818C - strb r4, [r6, 0x14] - b _08015BBE -_08015B9A: - bl sub_8011B90 - cmp r0, 0x1 - bne _08015BB0 - ldr r0, =gUnknown_082EE6C8 - bl sub_801568C - b _08015BB8 - .pool -_08015BB0: - ldr r1, =gUnknown_082EE6C8 - movs r0, 0x1E - bl sub_8015664 -_08015BB8: - ldr r1, =gUnknown_02022C2C - movs r0, 0x40 - strb r0, [r1] -_08015BBE: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _08015BCA - bl _08016878 -_08015BCA: - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - ldr r0, =sub_80140E0 - movs r1, 0x5 - bl CreateTask - movs r0, 0x26 - bl _08016876 - .pool -_08015BF4: - ldr r0, =sub_80140E0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _08015C04 - bl _08016878 -_08015C04: - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x44 - bne _08015C24 - ldr r1, =gUnknown_082EE004 - movs r0, 0x1F - bl sub_8015664 - bl _08016878 - .pool -_08015C24: - movs r0, 0x5 - bl _08016876 -_08015C2A: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _08015C36 - bl _08016878 -_08015C36: - movs r0, 0 - bl sub_801818C - movs r2, 0 - ldrsh r0, [r7, r2] - movs r3, 0x2 - ldrsh r1, [r7, r3] - ldr r2, [r6] - bl sub_801A3D0 - movs r0, 0x2 - bl _08016876 - .pool -_08015C54: - adds r0, r6, 0 - adds r0, 0x16 - adds r1, r6, 0 - adds r1, 0x1B - adds r2, r6, 0 - adds r2, 0x1C - ldr r3, =gUnknown_082F021C - ldr r4, =gUnknown_082F0244 - str r4, [sp] - bl sub_8017178 - adds r5, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _08015C78 - bl _08016878 -_08015C78: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _08015C94 - movs r0, 0x1C - bl _08016876 - .pool -_08015C94: - adds r1, r6, 0 - adds r1, 0x98 - movs r0, 0 - strh r0, [r1] - movs r2, 0x2 - ldrsh r0, [r7, r2] - ldr r1, [r6] - bl sub_8017CF8 - movs r0, 0x2 - negs r0, r0 - cmp r5, r0 - beq _08015CB2 - cmp r5, 0x40 - bne _08015CE4 -_08015CB2: - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0x40 - strh r1, [r0] - bl sub_800FE50 - ldr r0, =gStringVar4 - ldr r2, =gUnknown_082EEB80 - ldr r1, =gLinkPlayers - ldrb r1, [r1, 0x13] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - movs r0, 0x20 - bl _08016876 - .pool -_08015CE4: - ldr r0, =gUnknown_02022C2C - strb r5, [r0] - ldr r1, =gUnknown_02022C2D - lsrs r0, r5, 8 - strb r0, [r1] - lsls r0, r5, 24 - lsrs r0, 24 - cmp r0, 0x41 - bne _08015D18 - bl sub_8018024 - cmp r0, 0 - bne _08015D18 - ldr r1, =gUnknown_082EEBD0 - movs r0, 0x5 - bl sub_8015664 - bl _08016878 - .pool -_08015D18: - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - movs r1, 0x40 - orrs r1, r0 - adds r0, r6, 0 - adds r0, 0x4C - strh r1, [r0] - bl sub_800FE50 - movs r0, 0x1B - bl _08016876 - .pool -_08015D34: - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EEB88 - bl StringCopy - movs r0, 0x24 - bl _08016876 - .pool -_08015D4C: - adds r0, r6, 0 - bl sub_8017FD8 - movs r3, 0x2 - ldrsh r0, [r7, r3] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - adds r0, r6, 0 - adds r0, 0x4C - ldrh r1, [r0] - movs r0, 0x3F - ands r0, r1 - bl sub_8017984 - adds r5, r0, 0 - adds r0, r6, 0 - adds r0, 0x16 - ldr r3, =gUnknown_082EE82C - lsls r1, r5, 2 - lsls r2, r4, 4 - adds r1, r2 - adds r1, r3 - ldr r1, [r1] - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _08015D8C - bl _08016878 -_08015D8C: - movs r0, 0 - strh r0, [r7, 0x6] - movs r0, 0x1D - bl _08016876 - .pool -_08015D9C: - bl sub_800AC34 - movs r0, 0x24 - bl _08016876 -_08015DA6: - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0x44 - strh r1, [r0] - ldr r2, =gUnknown_02022C40 - ldrh r1, [r2, 0xE] - adds r3, r6, 0 - adds r3, 0x4E - strh r1, [r3] - ldrh r2, [r2, 0x10] - adds r1, r6, 0 - adds r1, 0x50 - strh r2, [r1] - bl sub_800FE50 - movs r0, 0x1D - bl _08016876 - .pool -_08015DD0: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _08015DF4 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EEB88 - bl StringCopy - movs r0, 0x1C - bl _08016876 - .pool -_08015DF4: - adds r0, r6, 0 - bl sub_8017FD8 - adds r0, r6, 0 - adds r0, 0x98 - ldrh r0, [r0] - cmp r0, 0x51 - bne _08015E2A - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x8 - bne _08015E24 - ldr r0, =gStringVar4 - adds r1, r6, 0 - movs r2, 0 - bl sub_8018220 - movs r0, 0x28 - bl _08016876 - .pool -_08015E24: - movs r0, 0xD - bl _08016876 -_08015E2A: - cmp r0, 0x52 - beq _08015E32 - bl _08016878 -_08015E32: - movs r5, 0 - movs r0, 0x20 - strb r0, [r6, 0x14] - ldr r0, =gStringVar4 - ldr r4, =gUnknown_02022C2C - ldrb r2, [r4] - movs r1, 0x40 - orrs r1, r2 - ldr r2, =gLinkPlayers - ldrb r2, [r2, 0x13] - bl sub_8017D9C - strb r5, [r4] - bl _08016878 - .pool -_08015E5C: - movs r0, 0x2 - ldrsh r1, [r7, r0] - lsls r1, 5 - ldr r0, [r6] - adds r0, r1 - bl sub_80179AC - adds r5, r0, 0 - movs r1, 0x2 - ldrsh r0, [r7, r1] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - ldr r2, =gUnknown_082EE24C - lsls r0, r4, 2 - lsls r1, r5, 3 - adds r0, r1 - adds r0, r2 - ldr r1, [r0] - movs r0, 0x6 - bl sub_8015664 - bl _08016878 - .pool -_08015E94: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gStringVar4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _08015EA8 - bl _08016878 -_08015EA8: - movs r4, 0 - movs r0, 0x29 - strb r0, [r6, 0x14] - bl sub_800ADF8 - adds r0, r6, 0 - adds r0, 0x98 - strh r4, [r0] - adds r0, 0x2 - strh r4, [r0] - bl _08016878 - .pool -_08015EC4: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - bne _08015ED2 - bl _08016878 -_08015ED2: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _08015F2C - ldr r5, =gStringVar1 - bl GetMultiplayerId - movs r1, 0x1 - eors r0, r1 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - ldr r4, =gLinkPlayers + 8 - adds r1, r4 - adds r0, r5, 0 - bl StringCopy - ldrh r0, [r4, 0x18] - adds r4, 0x1C - adds r1, r4, 0 - bl sub_800E540 - adds r5, r0, 0 - ldr r0, =gStringVar4 - ldr r2, =gUnknown_082EE378 - lsls r1, r5, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - movs r0, 0x21 - bl _08016876 - .pool -_08015F2C: - movs r0, 0x7 - bl _08016876 -_08015F32: - adds r0, r6, 0 - adds r0, 0x16 - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r5, r0, 24 - cmp r5, 0 - beq _08015F5C - cmp r5, 0 - bgt _08015F54 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - beq _08015F98 - bl _08016878 -_08015F54: - cmp r5, 0x1 - beq _08015F98 - bl _08016878 -_08015F5C: - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldr r4, =gUnknown_02022C2C - movs r0, 0x45 - strb r0, [r4] - movs r0, 0x45 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - movs r2, 0x2 - ldrsh r0, [r7, r2] - lsls r0, 5 - ldr r1, [r6] - adds r1, r0 - adds r0, r1, 0 - adds r0, 0x10 - ldrb r2, [r4] - bl sub_8012188 - ldrh r0, [r7, 0x2] - strh r0, [r6, 0x12] - movs r0, 0x14 - strb r0, [r6, 0x14] - strh r5, [r7, 0x6] - bl _08016878 - .pool -_08015F98: - movs r3, 0x2 - ldrsh r0, [r7, r3] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - ldr r1, =gUnknown_082EEC9C - lsls r0, r4, 2 - adds r0, r1 - ldr r0, [r0] - bl sub_801568C - bl _08016878 - .pool -_08015FB8: - ldrh r0, [r7, 0x4] - adds r0, 0x1 - strh r0, [r7, 0x4] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3C - bgt _08015FCA - bl _08016878 -_08015FCA: - movs r1, 0 - movs r0, 0x15 - strb r0, [r6, 0x14] - strh r1, [r7, 0x4] - bl _08016878 -_08015FD6: - bl sub_8011A74 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - beq _0801603C - cmp r4, 0x3 - ble _08015FF4 - cmp r4, 0x4 - bne _08016040 - movs r0, 0x1 - bl sub_801818C - strb r4, [r6, 0x14] - b _08016040 -_08015FF4: - cmp r4, 0x1 - blt _08016040 - movs r1, 0x2 - ldrsh r0, [r7, r1] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - bl sub_8011B90 - cmp r0, 0x1 - bne _08016028 - ldr r0, =gUnknown_082EED3C - lsls r1, r4, 2 - adds r1, r0 - ldr r0, [r1] - bl sub_801568C - b _08016040 - .pool -_08016028: - ldr r0, =gUnknown_082EED3C - lsls r1, r4, 2 - adds r1, r0 - ldr r1, [r1] - movs r0, 0x1E - bl sub_8015664 - b _08016040 - .pool -_0801603C: - movs r0, 0x16 - strb r0, [r6, 0x14] -_08016040: - ldrh r0, [r7, 0x6] - adds r0, 0x1 - strh r0, [r7, 0x6] - bl _08016878 -_0801604A: - bl sub_8011A80 - cmp r0, 0 - beq _08016092 - movs r2, 0x2 - ldrsh r0, [r7, r2] - ldr r1, [r6] - bl sub_8017CF8 - adds r4, r0, 0 - movs r0, 0x54 - movs r1, 0 - movs r2, 0x1 - bl sub_8011090 - bl sub_8011B90 - cmp r0, 0x1 - bne _08016084 - ldr r0, =gUnknown_082EED3C - lsls r1, r4, 2 - adds r1, r0 - ldr r0, [r1] - bl sub_801568C - b _08016092 - .pool -_08016084: - ldr r0, =gUnknown_082EED3C - lsls r1, r4, 2 - adds r1, r0 - ldr r1, [r1] - movs r0, 0x1E - bl sub_8015664 -_08016092: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _0801609E - bl _08016878 -_0801609E: - movs r0, 0x10 - bl _08016876 - .pool -_080160AC: - movs r0, 0x49 - bl PlaySE - bl sub_800EF7C - movs r0, 0 - movs r1, 0xC - strb r1, [r6, 0x14] - adds r1, r6, 0 - adds r1, 0x9A - strh r0, [r1] - bl _08016878 -_080160C6: - bl sub_8011A80 - cmp r0, 0 - beq _080160DA - movs r0, 0 - bl sub_801818C - movs r0, 0x2 - bl _08016876 -_080160DA: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _080160E4 - b _08016878 -_080160E4: - ldr r0, =gBlockSendBuffer - movs r1, 0x1 - bl sub_80143E4 - ldr r0, =sub_80140E0 - movs r1, 0x5 - bl CreateTask - movs r0, 0x27 - b _08016876 - .pool -_08016104: - adds r0, r6, 0 - bl sub_801689C - ldr r0, =sub_80140E0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _08016118 - b _08016878 -_08016118: - movs r0, 0x21 - strb r0, [r6, 0x14] - ldr r0, =gStringVar1 - ldr r4, =gLinkPlayers + 0x1C + 0x08 @ &gLinkPlayers[1].name - adds r1, r4, 0 - bl StringCopy - adds r0, r4, 0 - subs r0, 0x24 - ldrh r0, [r0, 0x20] - adds r1, r4, 0 - bl sub_800E540 - adds r5, r0, 0 - ldr r0, =gStringVar4 - ldr r2, =gUnknown_082EE324 - lsls r1, r5, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders - b _08016878 - .pool -_08016158: - adds r0, r6, 0 - bl sub_801689C - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gStringVar4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _08016170 - b _08016878 -_08016170: - movs r0, 0x22 - b _08016876 - .pool -_08016178: - adds r0, r6, 0 - bl sub_801689C - adds r0, r6, 0 - bl sub_80168DC - cmp r0, 0 - bne _0801618A - b _08016878 -_0801618A: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08016198 - b _08016878 -_08016198: - movs r0, 0x1 - bl sub_8011DE0 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EE598 - bl StringCopy - movs r0, 0x24 - b _08016876 - .pool -_080161B8: - ldr r1, =gStringVar4 - movs r0, 0x9 - bl sub_8015664 - b _08016878 - .pool -_080161C8: - adds r0, r6, 0 - adds r0, 0x16 - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080161EE - cmp r1, 0 - bgt _080161E8 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080162AE - b _08016878 -_080161E8: - cmp r1, 0x1 - beq _080162AE - b _08016878 -_080161EE: - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0x51 - strh r1, [r0] - ldr r1, =gUnknown_02022C2C - ldrb r1, [r1] - adds r5, r0, 0 - cmp r1, 0x45 - bne _08016220 - movs r4, 0x40 - orrs r4, r1 - movs r0, 0x1 - bl sub_801100C - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - movs r2, 0 - bl sub_8011090 - b _0801623E - .pool -_08016220: - movs r0, 0x40 - adds r4, r1, 0 - orrs r4, r0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - bl sub_801100C - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - movs r2, 0x1 - bl sub_8011090 -_0801623E: - ldr r1, [r6, 0x8] - movs r0, 0 - strb r0, [r1, 0x1B] - strh r0, [r7, 0x6] - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - cmp r0, 0x41 - bne _08016286 - bl sub_8018024 - cmp r0, 0 - bne _0801627C - movs r0, 0x52 - strh r0, [r5] - adds r0, r5, 0 - bl sub_800FE50 - movs r0, 0xA - strb r0, [r6, 0x14] - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EEC14 - bl StringCopy - b _08016878 - .pool -_0801627C: - adds r0, r5, 0 - bl sub_800FE50 - movs r0, 0xD - b _08016876 -_08016286: - cmp r0, 0x48 - bne _080162A4 - adds r0, r5, 0 - bl sub_800FE50 - ldr r0, =gStringVar4 - adds r1, r6, 0 - movs r2, 0x1 - bl sub_8018220 - movs r0, 0x28 - b _08016876 - .pool -_080162A4: - adds r0, r5, 0 - bl sub_800FE50 - movs r0, 0xD - b _08016876 -_080162AE: - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0x52 - strh r1, [r0] - bl sub_800FE50 - movs r0, 0xA - strb r0, [r6, 0x14] - ldr r0, =gStringVar4 - ldr r1, =gUnknown_02022C2C - ldrb r1, [r1] - bl sub_8013078 - b _08016878 - .pool -_080162D4: - bl sub_800AC34 - movs r0, 0x24 - b _08016876 -_080162DC: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r4, [r0] - cmp r4, 0 - beq _080162E6 - b _08016878 -_080162E6: - ldr r1, =gUnknown_02022C2C - movs r0, 0x40 - strb r0, [r1] - ldr r1, =gStringVar4 - movs r0, 0x25 - bl sub_8015664 - adds r0, r6, 0 - adds r0, 0x4C - movs r1, 0 - movs r2, 0xC - bl memset - adds r0, r6, 0 - adds r0, 0x9A - strh r4, [r0] - subs r0, 0x2 - strh r4, [r0] - b _08016878 - .pool -_08016318: - movs r0, 0x2 - strb r0, [r6, 0x14] - movs r0, 0 - bl sub_801818C - b _08016878 -_08016324: - ldr r4, =gStringVar4 - ldr r0, =gUnknown_02022C2C - ldrb r0, [r0] - movs r1, 0x40 - orrs r1, r0 - adds r0, r4, 0 - bl sub_8017E00 - movs r0, 0xE - adds r1, r4, 0 - bl sub_8015664 - b _08016878 - .pool -_08016348: - bl sub_800ADF8 - movs r0, 0xF - b _08016876 -_08016350: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - bne _0801635C - b _08016878 -_0801635C: - movs r0, 0x10 - b _08016876 -_08016360: - ldr r0, [r6, 0x8] - bl Free - ldr r0, [r6] - bl Free - ldr r0, [r6, 0xC] - bl Free - ldr r0, [r6, 0x4] - bl Free - adds r0, r6, 0 - adds r0, 0x20 - ldrb r0, [r0] - bl DestroyTask - adds r0, r6, 0 - adds r0, 0x21 - bl sub_8019F04 - movs r0, 0x11 - b _08016876 -_0801638E: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - movs r0, 0x12 - b _08016876 -_080163A2: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - beq _080163AE - b _08016878 -_080163AE: - bl sub_8019E3C - adds r0, r4, 0 - bl DestroyTask - ldr r0, =gUnknown_02022C30 - ldr r0, [r0] - bl Free - bl sub_80149D8 - b _08016878 - .pool -_080163CC: - bl sub_800F7DC - ldrh r1, [r0, 0x8] - ldr r4, =0x000003ff - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - bne _080163E4 - movs r0, 0x2B - b _08016876 - .pool -_080163E4: - bl sub_800F7DC - ldrh r1, [r0, 0x8] - adds r0, r4, 0 - ands r0, r1 - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - bne _08016408 - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EF590 - bl StringCopy - b _0801643E - .pool -_08016408: - ldr r4, =gStringVar1 - bl sub_800F7DC - ldrh r0, [r0, 0x8] - lsls r0, 22 - lsrs r0, 22 - movs r1, 0xB - muls r1, r0 - ldr r0, =gSpeciesNames - adds r1, r0 - adds r0, r4, 0 - bl StringCopy - ldr r4, =gStringVar2 - bl sub_800F7DC - ldrb r1, [r0, 0xB] - lsrs r1, 1 - adds r0, r4, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - ldr r0, =gStringVar4 - ldr r1, =gUnknown_082EF564 - bl StringExpandPlaceholders -_0801643E: - ldr r1, =gStringVar4 - movs r0, 0x2C - bl sub_8015664 - b _08016878 - .pool -_0801645C: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gUnknown_082EF20C - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _0801646E - b _08016878 -_0801646E: - movs r0, 0x2F - b _08016876 - .pool -_08016478: - adds r0, r6, 0 - adds r0, 0x16 - adds r1, r6, 0 - adds r1, 0x1D - adds r2, r6, 0 - adds r2, 0x1E - ldr r3, =gUnknown_082F025C - ldr r4, =gUnknown_082F027C - str r4, [sp] - bl sub_8017178 - adds r5, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _0801649A - b _08016878 -_0801649A: - subs r0, 0x1 - cmp r5, r0 - beq _080164A4 - cmp r5, 0x3 - bne _080164B8 -_080164A4: - movs r0, 0x4 - strb r0, [r6, 0x14] - movs r0, 0x1 - bl sub_801818C - b _08016878 - .pool -_080164B8: - cmp r5, 0x1 - beq _080164C2 - cmp r5, 0x2 - beq _080164D0 - b _08016878 -_080164C2: - ldr r1, =gUnknown_082EF4C4 - movs r0, 0x35 - bl sub_8015664 - b _08016878 - .pool -_080164D0: - ldr r1, =gUnknown_082EF298 - movs r0, 0x2F - bl sub_8015664 - b _08016878 - .pool -_080164E0: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - movs r0, 0x36 - b _08016876 -_080164F4: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08016502 - b _08016878 -_08016502: - ldr r1, =gUnknown_02022C40 - movs r0, 0x1 - strh r0, [r1] - ldr r1, =gFieldCallback - ldr r0, =sub_80AF128 - str r0, [r1] - ldr r1, =CB2_ReturnToField - movs r0, 0x8 - bl sub_81B8904 - b _08016878 - .pool -_0801652C: - adds r0, r6, 0 - adds r0, 0x16 - adds r1, r6, 0 - adds r1, 0x1D - adds r2, r6, 0 - adds r2, 0x1E - ldr r3, =gUnknown_082F0294 - ldr r4, =gUnknown_082F032C - str r4, [sp] - bl sub_8017178 - adds r5, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _0801654E - b _08016878 -_0801654E: - subs r0, 0x1 - cmp r5, r0 - beq _08016558 - cmp r5, 0x12 - bne _08016580 -_08016558: - ldr r0, =gUnknown_02022C40 - bl sub_801807C - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010FCC - ldr r0, =gUnknown_082EF4FC - bl sub_801568C - b _08016878 - .pool -_08016580: - ldr r0, =gUnknown_02022C40 - strh r5, [r0, 0x2] - movs r0, 0x37 - b _08016876 - .pool -_0801658C: - ldr r2, =gUnknown_02022C40 - ldrh r0, [r2, 0x2] - ldrh r1, [r2, 0xA] - ldrh r2, [r2, 0xC] - bl sub_8010FCC - ldr r0, =gUnknown_082EF520 - bl sub_801568C - b _08016878 - .pool -_080165A8: - adds r0, r6, 0 - adds r0, 0x16 - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080165CE - cmp r1, 0 - bgt _080165C8 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080165D2 - b _08016878 -_080165C8: - cmp r1, 0x1 - beq _080165D2 - b _08016878 -_080165CE: - movs r0, 0x38 - b _08016876 -_080165D2: - movs r0, 0x1 - bl sub_801818C - movs r0, 0x4 - b _08016876 -_080165DC: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gUnknown_082EF5B8 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _080165EE - b _08016878 -_080165EE: - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl sub_8010FCC - ldr r0, =gUnknown_02022C40 - bl sub_801807C - movs r0, 0x1 - bl sub_801818C - movs r0, 0x4 - b _08016876 - .pool -_08016610: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gUnknown_082EF1EC - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _08016622 - b _08016878 -_08016622: - movs r0, 0x2E - b _08016876 - .pool -_0801662C: - bl sub_80173B0 - movs r0, 0x30 - b _08016876 -_08016634: - adds r0, r6, 0 - adds r0, 0x16 - adds r1, r6, 0 - adds r1, 0x1D - adds r2, r6, 0 - adds r2, 0x4A - adds r3, r6, 0 - adds r3, 0x1E - ldr r4, =gUnknown_082F034C - str r4, [sp] - ldr r4, =gUnknown_082F03A4 - str r4, [sp, 0x4] - ldr r4, [r6] - str r4, [sp, 0x8] - bl sub_80172A0 - adds r5, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r5, r0 - bne _08016660 - b _08016878 -_08016660: - subs r0, 0x1 - cmp r5, r0 - beq _0801666A - cmp r5, 0x8 - bne _0801667C -_0801666A: - movs r0, 0x1 - bl sub_801818C - movs r0, 0x4 - b _08016876 - .pool -_0801667C: - bl sub_80173B0 - ldr r1, [r6] - lsls r4, r5, 5 - adds r1, r4 - ldrb r0, [r1, 0x9] - lsrs r0, 2 - ldrh r1, [r1, 0x8] - lsls r1, 22 - lsrs r1, 22 - bl sub_8017D04 - cmp r0, 0x1 - beq _080166C8 - cmp r0, 0x1 - bgt _080166A2 - cmp r0, 0 - beq _080166A8 - b _08016878 -_080166A2: - cmp r0, 0x2 - beq _080166FC - b _08016878 -_080166A8: - ldr r0, =gStringVar1 - ldr r1, [r6] - adds r1, r4 - bl sub_8018404 - ldr r1, =gUnknown_082EF65C - movs r0, 0x31 - bl sub_8015664 - strh r5, [r7, 0x2] - b _08016878 - .pool -_080166C8: - ldr r0, =gStringVar1 - ldr r1, [r6] - adds r1, r4 - bl sub_8018404 - ldr r0, =gStringVar2 - ldr r1, [r6] - adds r1, r4 - ldrb r2, [r1, 0x9] - lsrs r2, 2 - lsls r1, r2, 3 - subs r1, r2 - ldr r2, =gTypeNames - adds r1, r2 - bl StringCopy - ldr r1, =gUnknown_082EF6E4 - b _0801671E - .pool -_080166FC: - ldr r0, =gStringVar1 - ldr r1, [r6] - adds r1, r4 - bl sub_8018404 - ldr r0, =gStringVar2 - ldr r1, [r6] - adds r1, r4 - ldrb r2, [r1, 0x9] - lsrs r2, 2 - lsls r1, r2, 3 - subs r1, r2 - ldr r2, =gTypeNames - adds r1, r2 - bl StringCopy - ldr r1, =gUnknown_082EF718 -_0801671E: - movs r0, 0x2E - bl sub_8015664 - b _08016878 - .pool -_08016738: - adds r0, r6, 0 - adds r0, 0x16 - movs r1, 0 - bl sub_80170B8 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _0801675E - cmp r1, 0 - bgt _08016758 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08016762 - b _08016878 -_08016758: - cmp r1, 0x1 - beq _08016762 - b _08016878 -_0801675E: - movs r0, 0x32 - b _08016876 -_08016762: - movs r0, 0x1 - bl sub_801818C - movs r0, 0x4 - b _08016876 -_0801676C: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gUnknown_082EF4C4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - bne _0801677E - b _08016878 -_0801677E: - ldr r4, =gUnknown_02022C40 - movs r0, 0x2 - strh r0, [r4] - ldr r2, =gUnknown_02022C38 - movs r3, 0x2 - ldrsh r0, [r7, r3] - ldr r1, [r6] - lsls r0, 5 - adds r0, r1 - ldr r0, [r0] - str r0, [r2] - ldr r2, =gUnknown_02022C3E - ldr r1, [r6] - movs r3, 0x2 - ldrsh r0, [r7, r3] - lsls r0, 5 - adds r1, r0 - ldrb r0, [r1, 0x9] - lsrs r0, 2 - strb r0, [r2] - ldr r2, =gUnknown_02022C3C - ldr r1, [r6] - movs r3, 0x2 - ldrsh r0, [r7, r3] - lsls r0, 5 - adds r1, r0 - ldrh r0, [r1, 0x8] - lsls r0, 22 - lsrs r0, 22 - strh r0, [r2] - ldr r1, =gFieldCallback - ldr r0, =sub_80AF128 - str r0, [r1] - ldr r1, =CB2_ReturnToField - movs r0, 0x9 - bl sub_81B8904 - adds r0, r6, 0 - bl sub_80156B0 - ldrh r0, [r7, 0x2] - strb r0, [r4, 0x8] - b _08016878 - .pool -_080167F4: - ldr r1, =gUnknown_02022C2C - movs r0, 0x44 - strb r0, [r1] - movs r1, 0x2 - ldrsh r0, [r7, r1] - lsls r0, 5 - ldr r1, [r6] - adds r1, r0 - adds r0, r1, 0 - adds r0, 0x10 - movs r2, 0x44 - bl sub_8012188 - ldr r0, =gStringVar1 - movs r3, 0x2 - ldrsh r2, [r7, r3] - lsls r2, 5 - ldr r1, [r6] - adds r1, r2 - bl sub_8018404 - ldr r0, =gUnknown_082EE17C - ldr r0, [r0, 0x8] - bl sub_8017020 - movs r0, 0x19 - b _08016876 - .pool -_08016838: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gStringVar4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - beq _08016878 - movs r0, 0x1 - bl sub_801818C - movs r1, 0 - ldrsh r0, [r7, r1] - movs r2, 0x2 - ldrsh r1, [r7, r2] - ldr r2, [r6] - bl sub_801A3D0 - movs r0, 0x4 - b _08016876 - .pool -_08016864: - adds r0, r6, 0 - adds r0, 0x16 - ldr r1, =gStringVar4 - bl PrintOnTextbox - lsls r0, 24 - cmp r0, 0 - beq _08016878 - ldrb r0, [r6, 0x15] -_08016876: - strb r0, [r6, 0x14] -_08016878: - add sp, 0xC - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80156E0 - - thumb_func_start var_800D_set_xB -var_800D_set_xB: @ 8016884 - push {lr} - bl InUnionRoom - cmp r0, 0x1 - bne _08016894 - ldr r1, =gSpecialVar_Result - movs r0, 0xB - strh r0, [r1] -_08016894: - pop {r0} - bx r0 - .pool -thumb_func_end var_800D_set_xB - thumb_func_start sub_801689C sub_801689C: @ 801689C push {r4,r5,lr} diff --git a/include/librfu.h b/include/librfu.h index ba6e535d4..49df42541 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -1,3 +1,6 @@ +#ifndef GUARD_LIBRFU_H +#define GUARD_LIBRFU_H + #include "main.h" enum @@ -253,3 +256,5 @@ void rfu_UNI_readySendData(u8 a0); void rfu_UNI_clearRecvNewDataFlag(u8 a0); void rfu_REQ_PARENT_resumeRetransmitAndChange(void); void rfu_NI_setSendData(u8, u8, u8 *, u8); + +#endif // GUARD_LIBRFU_H diff --git a/include/link_rfu.h b/include/link_rfu.h index eb24addbe..4398ca690 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -1,6 +1,8 @@ #ifndef GUARD_LINK_RFU_H #define GUARD_LINK_RFU_H +#include "librfu.h" + // Exported type declarations struct UnkLinkRfuStruct_02022B2C @@ -158,7 +160,8 @@ struct UnkRfuStruct_2 /* 0x102 */ u8 unk_102; /* 0x103 */ u8 filler_103[0x10A - 0x103]; /* 0x10A */ struct UnkLinkRfuStruct_02022B14 unk_10A; - u8 filler_120[12]; + u8 filler_; + u8 playerName[PLAYER_NAME_LENGTH + 1]; /* 0x124 */ struct UnkRfuStruct_2_Sub_124 unk_124; /* 0x9e8 */ struct UnkRfuStruct_2_Sub_9e8 unk_9e8; /* 0xc1c */ struct UnkRfuStruct_2_Sub_c1c unk_c1c; @@ -193,7 +196,8 @@ struct UnkRfuStruct_2 /* 0xcee */ u8 unk_cee[4]; }; // size = 0xcf4 -struct UnkRfuStruct_8010A14 { +struct UnkRfuStruct_8010A14 +{ char unk_00[15]; u8 unk_0f; u8 unk_10[4]; @@ -266,7 +270,7 @@ void sub_8010FA0(bool32 a0, bool32 a1); void sub_8010F60(void); void sub_8010FCC(u32 a0, u32 a1, u32 a2); void sub_8011C84(void); -void sub_8012188(const u8 *a0, struct UnkLinkRfuStruct_02022B14 *arg1, u8 arg2); +void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2); bool32 sub_8011B90(void); void sub_800FE50(u16 *a0); bool32 sub_800E540(u16 id, u8 *name); diff --git a/ld_script.txt b/ld_script.txt index 628475264..86562a541 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -54,7 +54,6 @@ SECTIONS { src/string_util.o(.text); src/link.o(.text); src/link_rfu.o(.text); - asm/link_rfu.o(.text); src/rom_8011DC0.o(.text); asm/rom_8011DC0.o(.text); src/rtc.o(.text); diff --git a/src/link_rfu.c b/src/link_rfu.c index f026ca3c3..7809842f4 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -1,20 +1,20 @@ #include "global.h" -#include "malloc.h" #include "battle.h" #include "berry_blender.h" -#include "task.h" -#include "random.h" #include "decompress.h" -#include "text.h" -#include "string_util.h" #include "event_data.h" -#include "overworld.h" -#include "link.h" +#include "gpu_regs.h" #include "librfu.h" -#include "rom_8011DC0.h" +#include "link.h" #include "link_rfu.h" +#include "malloc.h" +#include "overworld.h" +#include "random.h" #include "palette.h" -#include "gpu_regs.h" +#include "rom_8011DC0.h" +#include "string_util.h" +#include "task.h" +#include "text.h" #include "constants/species.h" extern u16 gUnknown_03005DA8; @@ -65,7 +65,7 @@ static void rfufunc_80FA020(void); bool32 sub_8010454(u32 a0); static void sub_8010528(void); void sub_8010750(void); -int sub_80107A0(void); +s32 sub_80107A0(void); void sub_801084C(u8 taskId); void sub_80109E8(u16 a0); void sub_8010A70(void *a0); @@ -75,7 +75,7 @@ void sub_80115EC(s32 a0); u8 sub_8011CE4(const u8 *a0, u16 a1); void sub_8011D6C(u32 a0); void sub_8011E94(u32 a0, u32 a1); -u8 sub_8012224(void); +bool8 sub_8012224(void); void sub_801227C(void); void sub_801209C(u8 taskId); void sub_8011BF8(void); @@ -308,6 +308,11 @@ const char gUnknown_082ED7EC[] = "PokemonSioInfo"; const char gUnknown_082ED7FC[] = "LINK LOSS DISCONNECT!"; const char gUnknown_082ED814[] = "LINK LOSS RECOVERY NOW"; +extern const char gUnknown_082ED82C[]; +extern const char gUnknown_082ED84B[]; +extern const char gUnknown_082ED85B[]; +extern const char gUnknown_082ED868[]; + // .text u32 sub_800BEC0(void) @@ -352,7 +357,7 @@ void rfu_REQ_sendData_wrapper(u8 r2) rfu_REQ_sendData(r2); } -int sub_800BF4C(void (*func1)(u8, u8), void (*func2)(u16)) +s32 sub_800BF4C(void (*func1)(u8, u8), void (*func2)(u16)) { if (func1 == NULL) { @@ -1684,8 +1689,8 @@ void sub_800D658(void) void sub_800D6C8(struct UnkRfuStruct_2_Sub_124 *ptr) { - int i; - int j; + s32 i; + s32 j; for (i = 0; i < 32; i++) { @@ -1702,8 +1707,8 @@ void sub_800D6C8(struct UnkRfuStruct_2_Sub_124 *ptr) void sub_800D724(struct UnkRfuStruct_2_Sub_9e8 *ptr) { - int i; - int j; + s32 i; + s32 j; for (i = 0; i < 40; i++) { @@ -1720,8 +1725,8 @@ void sub_800D724(struct UnkRfuStruct_2_Sub_9e8 *ptr) void sub_800D780(struct UnkRfuStruct_Sub_Unused *ptr) { - int i; - int j; + s32 i; + s32 j; for (i = 0; i < 2; i++) { @@ -1738,7 +1743,7 @@ void sub_800D780(struct UnkRfuStruct_Sub_Unused *ptr) void sub_800D7D8(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) { - int i; + s32 i; u16 imeBak; u8 count; @@ -1778,7 +1783,7 @@ void sub_800D7D8(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) void sub_800D888(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) { - int i; + s32 i; u16 imeBak; if (q1->unk_232 < 40) @@ -1817,7 +1822,7 @@ void sub_800D888(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) bool8 sub_800D934(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) { u16 imeBak; - int i; + s32 i; imeBak = REG_IME; REG_IME = 0; @@ -1843,7 +1848,7 @@ bool8 sub_800D934(struct UnkRfuStruct_2_Sub_124 *q1, u8 *q2) bool8 sub_800D9DC(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) { - int i; + s32 i; u16 imeBak; if (q1->unk_230 == q1->unk_231 || q1->unk_233 != 0) @@ -1865,7 +1870,7 @@ bool8 sub_800D9DC(struct UnkRfuStruct_2_Sub_9e8 *q1, u8 *q2) void sub_800DA68(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2) { - int i; + s32 i; if (q2[1] == 0) { @@ -1892,7 +1897,7 @@ void sub_800DA68(struct UnkRfuStruct_2_Sub_c1c *q1, const u8 *q2) static bool8 sub_800DAC8(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2) { - int i; + s32 i; if (q1->unk_1e == 0) { @@ -1913,7 +1918,7 @@ static bool8 sub_800DAC8(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2) void sub_800DB18(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) { - int i; + s32 i; if (q1->unk_202 < 2) { @@ -1933,7 +1938,7 @@ void sub_800DB18(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) bool8 sub_800DB84(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) { - int i; + s32 i; if (q1->unk_200 == q1->unk_201 || q1->unk_203) { @@ -1951,7 +1956,7 @@ bool8 sub_800DB84(struct UnkRfuStruct_Sub_Unused *q1, u8 *q2) void sub_800DBF8(u8 *q1, u8 mode) { - int i; + s32 i; u8 rval; u16 r5 = 0; switch (mode) @@ -1995,7 +2000,7 @@ void sub_800DBF8(u8 *q1, u8 mode) void PkmnStrToASCII(u8 *q1, const u8 *q2) { - int i; + s32 i; for (i = 0; q2[i] != EOS; i++) { @@ -2006,7 +2011,7 @@ void PkmnStrToASCII(u8 *q1, const u8 *q2) void ASCIIToPkmnStr(u8 *q1, const u8 *q2) { - int i; + s32 i; for (i = 0; q2[i] != 0; i++) { @@ -2114,9 +2119,9 @@ NAKED u8 sub_800DD1C(u8 maxFlags) } #endif -void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, int r3) +void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, s32 r3) { - int i; + s32 i; for (i = 0; i < 2; i++) { @@ -2260,7 +2265,7 @@ u8 sub_800E124(void) return 0; } -void sub_800E15C(struct Sprite *sprite, int signalStrengthAnimNum) +void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum) { if (sprite->data[2] != signalStrengthAnimNum) { @@ -2350,7 +2355,7 @@ void sub_800E378(struct UnkSaveSubstruct_3b98 *dest, u32 trainerId, const u8 *na bool32 sub_800E388(const u8 *name) { - int i; + s32 i; for (i = 0; i < 8; i++) { @@ -2366,10 +2371,10 @@ void sub_800E3A8(void) { if (gWirelessCommType != 0) { - int i; - int j; - int cnt; - int sp0[5]; + s32 i; + s32 j; + s32 cnt; + s32 sp0[5]; struct UnkSaveSubstruct_3b98 *sp14 = calloc(20, sizeof(struct UnkSaveSubstruct_3b98)); for (i = 0; i < GetLinkPlayerCount(); i++) { @@ -2413,7 +2418,7 @@ void sub_800E3A8(void) bool32 sub_800E540(u16 id, u8 *name) { - int i; + s32 i; for (i = 0; i < 20; i++) { @@ -2431,7 +2436,7 @@ bool32 sub_800E540(u16 id, u8 *name) void sub_800E5AC(void) { - int i; + s32 i; for (i = 0; i < 20; i++) { @@ -2445,14 +2450,14 @@ void nullsub_5(const char *unused_0, u8 unused_1, u8 unused_2) // debug? } -void nullsub_13(u8 unused_0, u8 unused_1, u8 unused_2, u8 unused_3) +void nullsub_13(u16 unused_0, u8 unused_1, u8 unused_2, u8 unused_3) { } void sub_800E604(void) { - int i; + s32 i; u8 unk_ee_bak = gUnknown_03005000.unk_ee; CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000); gUnknown_03005000.unk_ee = unk_ee_bak; @@ -2541,12 +2546,12 @@ s32 sub_800E87C(u8 idx) return gUnknown_082ED6A5[idx]; } -void sub_800E88C(int r2, int r5) +void sub_800E88C(s32 r2, s32 r5) { u8 i; u8 r4 = 1; - int r1 = r2; - int r6 = 0; + s32 r1 = r2; + s32 r6 = 0; if (r5 == -1) { for (i = 0; i < 4; r2 >>= 1, i++) @@ -2737,7 +2742,7 @@ void sub_800ED28(void) void sub_800ED34(u16 unused) { - int i; + s32 i; for (i = 0; i < 14; i++) { @@ -2879,7 +2884,7 @@ void sub_800EF88(u8 a0) // FIXME: gRecvCmds should be in r6 and r7 void sub_800EFB0(void) { - int i, j; + s32 i, j; for (i = 0; i < 5; i++) { for (j = 0; j < 7; j++) @@ -2941,7 +2946,7 @@ NAKED void sub_800EFB0(void) void sub_800F014(void) { - int i; + s32 i; for (i = 0; i < 7; i++) { gRecvCmds[0][i] = gSendCmd[i]; @@ -2975,8 +2980,8 @@ static void sub_800F048(void) bool32 sub_800F0B8(void) { - int i; - int j; + s32 i; + s32 j; if (gUnknown_03007890->unk_06 == 0) { @@ -3131,7 +3136,7 @@ bool32 sub_800F1E0(void) void sub_800F498(u16 *a0, u8 *a1) { - int i; + s32 i; if (a0[0]) { @@ -3199,7 +3204,7 @@ bool32 sub_800F4F0(void) void sub_800F638(u8 unused, u32 flags) { - int i, j; + s32 i, j; const u8 *r10 = gUnknown_03005000.unk_6c.unk_04; for (i = 0; i < gUnknown_03005000.unk_6c.unk_02; i++) @@ -3404,7 +3409,7 @@ static void sub_800F86C(u8 unused) bool8 sub_800FC60(void) { - int i; + s32 i; for (i = 0; i < 5; i++) { @@ -3416,7 +3421,7 @@ bool8 sub_800FC60(void) bool8 sub_800FC88(void) { - int i; + s32 i; for (i = 0; i < gUnknown_03005000.playerCount; i++) { @@ -3440,7 +3445,7 @@ static void sub_800FCC4(struct UnkRfuStruct_2_Sub_6c *data) u8 sub_800FCD8(void) { u8 flags = 0; - int i; + s32 i; for (i = 0; i < 5; i++) { @@ -3560,7 +3565,7 @@ static void rfufunc_80F9F44(void) static void sub_800FFB0(void) { - int i; + s32 i; const u8 *src = gUnknown_03005000.unk_6c.unk_04; gSendCmd[0] = 0x8900 | gUnknown_03005000.unk_6c.unk_00; for (i = 0; i < 7; i++) @@ -3577,7 +3582,7 @@ static void rfufunc_80FA020(void) { const u8 *src = gUnknown_03005000.unk_6c.unk_04; u8 mpId = GetMultiplayerId(); - int i; + s32 i; if (gUnknown_03005000.unk_0c == 0) { gSendCmd[0] = (~0x76ff) | (gUnknown_03005000.unk_6c.unk_02 - 1); @@ -3641,9 +3646,9 @@ void sub_8010198(void) void sub_80101CC(void) { - int i; + s32 i; u8 playerCount = gUnknown_03005000.playerCount; - int count = 0; + s32 count = 0; for (i = 0; i < MAX_RFU_PLAYERS; i++) { @@ -3770,7 +3775,7 @@ void sub_8010434(void) bool32 sub_8010454(u32 a0) { - int i; + s32 i; for (i = 0; gUnknown_082ED6E0[i] != a0; i++) { if (gUnknown_082ED6E0[i] == 0xffff) @@ -3820,7 +3825,7 @@ static void sub_8010528(void) bool8 sub_8010540(void) { - int i; + s32 i; bool8 retval = FALSE; for (i = 0; i < 4; i++) { @@ -3851,7 +3856,7 @@ bool8 sub_8010540(void) bool32 sub_80105EC(void) { u8 flags = 0; - int i; + s32 i; for (i = 0; i < 4; i++) { if (gUnknown_03005000.unk_cd5[i] == 11) @@ -3910,7 +3915,7 @@ u32 sub_8010714(u16 a0, const u8 *a1) void sub_8010750(void) { - int i; + s32 i; sub_8010540(); for (i = 0; i < 4; i++) @@ -3924,9 +3929,9 @@ void sub_8010750(void) } } -int sub_80107A0(void) +s32 sub_80107A0(void) { - int retval = 0; + s32 retval = 0; if (gUnknown_03005000.unk_c85 == 8) { if (gUnknown_03007880[gUnknown_03005000.unk_c3e]->unk_0 == 0x26 || gUnknown_03007880[gUnknown_03005000.unk_c3e]->unk_0 == 0x27) @@ -3948,7 +3953,7 @@ int sub_80107A0(void) void sub_801084C(u8 taskId) { - int i; + s32 i; if (gUnknown_03005000.unk_f1 == 1 || gUnknown_03005000.unk_f1 == 2) { @@ -4032,7 +4037,7 @@ void sub_801084C(u8 taskId) void sub_80109E8(u16 a0) { - int i; + s32 i; for (i = 0; i < 4; i++) { @@ -4043,7 +4048,7 @@ void sub_80109E8(u16 a0) void sub_8010A14(const struct UnkRfuStruct_8010A14 *a0) { - int i; + s32 i; gUnknown_03005000.playerCount = a0->unk_0f; for (i = 0; i < 4; i++) gUnknown_03005000.unk_cde[i] = a0->unk_10[i]; @@ -4066,7 +4071,7 @@ void sub_8010A70(void *a0) void sub_8010AAC(u8 taskId) { - int i; + s32 i; struct LinkPlayerBlock *r2; struct UnkRfuStruct_8010A14 *r5; u8 r4 = gUnknown_03005000.unk_cde[gUnknown_082ED68C[gUnknown_03005000.unk_ce9]]; @@ -4267,7 +4272,7 @@ void sub_8010FCC(u32 a0, u32 a1, u32 a2) gUnknown_02022B14.unk_0b_1 = a2; } -u8 sub_801100C(int a0) +u8 sub_801100C(s32 a0) { u8 retval = 0x80; retval |= (gLinkPlayers[a0].gender << 3); @@ -4278,7 +4283,7 @@ u8 sub_801100C(int a0) void sub_801103C(void) { struct UnkLinkRfuStruct_02022B14 *r5 = &gUnknown_02022B14; - int i; + s32 i; for (i = 1; i < GetLinkPlayerCount(); i++) r5->unk_04[i - 1] = sub_801100C(i); @@ -4299,10 +4304,10 @@ void sub_8011090(u8 a0, u32 a1, u32 a2) void sub_80110B8(u32 a0) { - int i; + s32 i; u32 r5; u32 r7; - int r8; + s32 r8; if (sub_800F7DC()->unk_0a_0 == 0x45) { @@ -4962,7 +4967,7 @@ void sub_8011FC8(const u8 *src, u16 trainerId) data[8] = trainerId; } -bool32 sub_801200C(u16 a1, struct UnkLinkRfuStruct_02022B14 *structPtr) +bool32 sub_801200C(s16 a1, struct UnkLinkRfuStruct_02022B14 *structPtr) { if (sub_800F7DC()->unk_0a_0 == 0x45) { @@ -4993,3 +4998,159 @@ bool32 sub_801200C(u16 a1, struct UnkLinkRfuStruct_02022B14 *structPtr) return FALSE; } + +void sub_801209C(u8 taskId) +{ + if (gUnknown_03005000.unk_f1 == 4) + DestroyTask(taskId); + + if (++gTasks[taskId].data[0] > 300) + { + sub_8011A64(2, 0x7000); + DestroyTask(taskId); + } + + if (gUnknown_03005000.unk_ccd != 0 && gUnknown_03004140.unk_06 == 0) + { + u16 trainerId = ReadU16(gUnknown_03005000.unk_10A.unk_00.playerTrainerId); + u8 id = sub_8011CE4(gUnknown_03005000.playerName, trainerId); + if (id != 0xFF) + { + if (!sub_801200C(gTasks[taskId].data[1], &gUnknown_03007890->unk_14[id].unk_06)) + { + if (gUnknown_03007890->unk_14[id].unk_02 != 0xFF && !sub_800C12C(gUnknown_03007890->unk_14[id].unk_00, 0x5A)) + { + gUnknown_03005000.unk_04 = 0xA; + DestroyTask(taskId); + } + } + else + { + sub_8011A64(2, 0x7000); + DestroyTask(taskId); + } + } + } +} + +void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2) +{ + u8 taskId, taskId2; + + gUnknown_03005000.unk_ccf = 0; + gUnknown_03005000.unk_f1 = 0; + StringCopy(gUnknown_03005000.playerName, name); + memcpy(&gUnknown_03005000.unk_10A, structPtr, 0xD); + sub_800D658(); + taskId = CreateTask(sub_801209C, 2); + gTasks[taskId].data[1] = a2; + taskId2 = FindTaskIdByFunc(sub_800EB44); + if (a2 == 0x45) + { + if (taskId2 != 0xFF) + gTasks[taskId2].data[7] = 1; + } + else + { + if (taskId2 != 0xFF) + gTasks[taskId2].data[7] = 0; + } +} + +bool8 sub_8012224(void) +{ + if (gUnknown_03005000.unk_f0 == 1) + return TRUE; + else + return FALSE; +} + +bool32 sub_8012240(void) +{ + s32 i; + + for (i = 0; i < 4; i++) + { + if ((gUnknown_03004140.unk_00 >> i) & 1 && gUnknown_03005000.unk_cd1[i] == 0) + return FALSE; + } + + return TRUE; +} + +void sub_801227C(void) +{ + s32 i; + + for (i = 0; i < 20; i++) + nullsub_5(gUnknown_082ED82C, 0, i); +} + +void sub_801229C(void) +{ + s32 i, j; + + nullsub_13(GetBlockReceivedStatus(), 0x1C, 0x13, 2); + nullsub_13(gUnknown_03007890->unk_02, 0x14, 1, 1); + nullsub_13(gUnknown_03007890->unk_03, 0x17, 1, 1); + if (gUnknown_03005000.unk_0c == 1) + { + for (i = 0; i < 4; i++) + { + if ((gUnknown_03007890->unk_07 >> i) & 1) + { + nullsub_13(gUnknown_03007890->unk_14[i].unk_04, 1, i + 3, 4); + nullsub_5((void*) &gUnknown_03007890->unk_14[i].unk_06, 6, i + 3); + nullsub_5(gUnknown_03007890->unk_14[i].playerName, 0x16, i + 3); + } + } + for (i = 0; i < 4; i++) + { + for (j = 0; j < 14; j++) + { + nullsub_13(gUnknown_03005000.unk_14[i][j], j * 2, i + 11, 2); + } + } + nullsub_5(gUnknown_082ED868, 1, 0xF); + } + else if (gUnknown_03007890->unk_02 != 0 && gUnknown_03007890->unk_07 != 0) + { + for (i = 0; i < 4; i++) + { + nullsub_13(0, 1, i + 3, 4); + nullsub_5(gUnknown_082ED84B, 6, i + 3); + nullsub_5(gUnknown_082ED85B, 0x16, i + 3); + } + nullsub_13(gUnknown_03007890->unk_14[gUnknown_03005000.unk_c3e].unk_04, 1, 3, 4); + nullsub_5((void*) &gUnknown_03007890->unk_14[gUnknown_03005000.unk_c3e].unk_06, 6, 3); + nullsub_5(gUnknown_03007890->unk_14[gUnknown_03005000.unk_c3e].playerName, 0x16, 3); + } + else + { + for (i = 0; i < gUnknown_03007890->unk_08; i++) + { + if (gUnknown_03007890->unk_14[i].unk_02 != 0xFF) + { + nullsub_13(gUnknown_03007890->unk_14[i].unk_04, 1, i + 3, 4); + nullsub_13(gUnknown_03007890->unk_14[i].unk_00, 6, i + 3, 4); + nullsub_5(gUnknown_03007890->unk_14[i].playerName, 0x16, i + 3); + } + } + for (; i < 4; i++) + { + nullsub_13(0, 1, i + 3, 4); + nullsub_5(gUnknown_082ED84B, 6, i + 3); + nullsub_5(gUnknown_082ED85B, 0x16, i + 3); + } + } +} + +u32 sub_80124C0(void) +{ + return gUnknown_03005000.unk_9e8.unk_232; +} + +u32 sub_80124D4(void) +{ + return gUnknown_03005000.unk_124.unk_8c2; +} diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index b7ca087fd..250f80c4c 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -39,7 +39,7 @@ extern void HealPlayerParty(void); struct UnkStruct_Shared { struct UnkLinkRfuStruct_02022B14 field_0; - u8 needingPadding[3]; + u8 needingPadding[2]; u8 playerName[PLAYER_NAME_LENGTH + 1]; }; @@ -265,7 +265,7 @@ void sub_801689C(struct UnkStruct_URoom *arg0); u8 sub_80181DC(struct UnkStruct_URoom *arg0); bool32 sub_80168DC(struct UnkStruct_URoom *arg0); bool32 sub_801704C(void); -u32 sub_8017CF8(u32 arg1, struct UnkStruct_Main0 *arg0); +s32 sub_8017CF8(s32 arg1, struct UnkStruct_Main0 *arg0); s32 sub_80179D4(struct UnkStruct_Main0 *arg0, u8 arg1, u8 arg2, u32 playerGender); void sub_801818C(bool32 arg0); void sub_801A3D0(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2); @@ -2510,13 +2510,11 @@ void sub_80156C8(struct UnkStruct_URoom *data) memcpy(data->field_0, &gDecompressionBuffer[0x3F00], 0x100); } -// Cannot match, please fix later. -/* void sub_80156E0(u8 taskId) { u32 id = 0; s32 var5 = 0; - u32 playerGender = 0; + s32 playerGender = 0; struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; s16 *taskData = gTasks[taskId].data; @@ -2679,7 +2677,7 @@ void sub_80156E0(u8 taskId) break; case 1: sub_8012188(data->field_0->arr[taskData[1]].unk.playerName, &data->field_0->arr[taskData[1]].unk.field_0, gUnknown_02022C2C); - data->field_12 = id; + data->field_12 = id; // Should be just 0, but won't match any other way. data->state = 25; break; case 2: @@ -2730,6 +2728,11 @@ void sub_80156E0(u8 taskId) data->state = 2; } break; + case 5: + id = sub_80179AC(&data->field_0->arr[taskData[1]]); + playerGender = sub_8017CF8(taskData[1], data->field_0); + sub_8015664(6, gUnknown_082EE24C[id][playerGender]); + break; case 6: var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244); if (var5 != -1) @@ -2742,16 +2745,15 @@ void sub_80156E0(u8 taskId) { data->field_98 = 0; playerGender = sub_8017CF8(taskData[1], data->field_0); - switch (var5) + if (var5 == -2 || var5 == 0x40) { - case -2: - case 0x40: data->field_4C[0] = 0x40; sub_800FE50(data->field_4C); StringCopy(gStringVar4, gUnknown_082EEB80[gLinkPlayers[0].gender]); data->state = 32; - break; - default: + } + else + { gUnknown_02022C2C = var5; gUnknown_02022C2D = (u32)(var5) >> 8; if (gUnknown_02022C2C == 0x41 && !sub_8018024()) @@ -2764,7 +2766,6 @@ void sub_80156E0(u8 taskId) sub_800FE50(data->field_4C); data->state = 27; } - break; } } } @@ -2823,7 +2824,7 @@ void sub_80156E0(u8 taskId) } } break; - case 5: + case 7: id = sub_80179AC(&data->field_0->arr[taskData[1]]); playerGender = sub_8017CF8(taskData[1], data->field_0); @@ -3261,5 +3262,3 @@ void var_800D_set_xB(void) if (InUnionRoom() == TRUE) gSpecialVar_Result = 11; } - -*/ -- cgit v1.2.3 From 862265b73a6eab7d070e628d3cb77663543bc368 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 06:04:59 -0500 Subject: defines `register_matchcall` macro --- asm/macros/event.inc | 7 +++++++ data/maps/AbandonedShip_Rooms2_1F/scripts.inc | 10 ++------- data/maps/AbandonedShip_Rooms_1F/scripts.inc | 5 +---- data/maps/JaggedPass/scripts.inc | 10 ++------- data/maps/MeteorFalls_1F_2R/scripts.inc | 15 +++----------- data/maps/MtChimney/scripts.inc | 10 ++------- data/maps/MtPyre_3F/scripts.inc | 5 +---- data/maps/MtPyre_6F/scripts.inc | 5 +---- data/maps/PetalburgWoods/scripts.inc | 10 ++------- data/maps/Route102/scripts.inc | 10 ++------- data/maps/Route103/scripts.inc | 15 +++----------- data/maps/Route104/scripts.inc | 30 ++++++--------------------- data/maps/Route105/scripts.inc | 5 +---- data/maps/Route106/scripts.inc | 5 +---- data/maps/Route107/scripts.inc | 5 +---- data/maps/Route108/scripts.inc | 5 +---- data/maps/Route109/scripts.inc | 10 ++------- data/maps/Route110/scripts.inc | 20 ++++-------------- data/maps/Route111/scripts.inc | 15 +++----------- data/maps/Route112/scripts.inc | 5 +---- data/maps/Route113/scripts.inc | 10 ++------- data/maps/Route114/scripts.inc | 10 ++------- data/maps/Route115/scripts.inc | 15 +++----------- data/maps/Route116/scripts.inc | 20 ++++-------------- data/maps/Route117/scripts.inc | 30 ++++++--------------------- data/maps/Route118/scripts.inc | 10 ++------- data/maps/Route119/scripts.inc | 10 ++------- data/maps/Route120/scripts.inc | 10 ++------- data/maps/Route121/scripts.inc | 15 +++----------- data/maps/Route123/scripts.inc | 15 +++----------- data/maps/Route124/scripts.inc | 15 +++----------- data/maps/Route125/scripts.inc | 5 +---- data/maps/Route126/scripts.inc | 5 +---- data/maps/Route127/scripts.inc | 5 +---- data/maps/Route128/scripts.inc | 10 ++------- 35 files changed, 83 insertions(+), 304 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index a1b0b0c62..e59f18b32 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1554,3 +1554,10 @@ setorcopyvar 0x8000, \decoration callstd STD_OBTAIN_DECORATION .endm + + .macro register_matchcall trainer + setvar VAR_0x8004, \trainer + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, \trainer + callstd STD_REGISTER_MATCH_CALL + .endm diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index c6eb6779b..0c5a9ce8b 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -12,10 +12,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KIRA_AND_DAN_1 release end @@ -35,10 +32,7 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KIRA_AND_DAN_1 release end diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index ad036da3b..94665168a 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -23,10 +23,7 @@ AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF special sub_80B4808 waitmovement 0 msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT - setvar VAR_0x8004, 144 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 144 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_THALIA_1 release end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 8a464b16e..99e5910d1 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -114,10 +114,7 @@ JaggedPass_EventScript_23079C:: @ 823079C JaggedPass_EventScript_2307C8:: @ 82307C8 special sub_80B4808 msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT - setvar VAR_0x8004, 474 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 474 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DIANA_1 release end @@ -138,10 +135,7 @@ JaggedPass_EventScript_2307FB:: @ 82307FB JaggedPass_EventScript_230827:: @ 8230827 special sub_80B4808 msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT - setvar VAR_0x8004, 216 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 216 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ETHAN_1 release end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 492edb063..df62fe313 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -14,10 +14,7 @@ MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A special sub_80B4808 waitmovement 0 msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT - setvar VAR_0x8004, 392 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 392 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_NICOLAS_1 release end @@ -37,10 +34,7 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JOHN_AND_JAY_1 release end @@ -60,10 +54,7 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JOHN_AND_JAY_1 release end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index f5f7eb482..480f91515 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -499,10 +499,7 @@ MtChimney_EventScript_22F176:: @ 822F176 special sub_80B4808 waitmovement 0 msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT - setvar VAR_0x8004, 313 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 313 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_SHELBY_1 release end @@ -544,10 +541,7 @@ MtChimney_EventScript_22F234:: @ 822F234 special sub_80B4808 waitmovement 0 msgbox MtChimney_Text_230557, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 1 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_SAWYER_1 release end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 01a31a6ae..7c84290de 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -24,10 +24,7 @@ MtPyre_3F_EventScript_2317AD:: @ 82317AD special sub_80B4808 waitmovement 0 msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT - setvar VAR_0x8004, 9 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 9 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_GABRIELLE_1 release end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 943e0f31f..c82827d4f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -14,10 +14,7 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67 special sub_80B4808 waitmovement 0 msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT - setvar VAR_0x8004, 108 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 108 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_VALERIE_1 release end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 7b804d2c6..81ad5ad3d 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -300,10 +300,7 @@ PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 msgbox PetalburgWoods_Text_22E8C3, MSGBOX_DEFAULT - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JAMES_1 release end @@ -316,10 +313,7 @@ PetalburgWoods_EventScript_22E2EF:: @ 822E2EF PetalburgWoods_EventScript_22E302:: @ 822E302 msgbox PetalburgWoods_Text_22E914, MSGBOX_DEFAULT - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JAMES_1 release end diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index c38d40a7f..ca6de7d9c 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -40,10 +40,7 @@ Route102_EventScript_1EC146:: @ 81EC146 Route102_EventScript_1EC157:: @ 81EC157 msgbox Route102_Text_294668, MSGBOX_DEFAULT - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CALVIN_1 release end @@ -56,10 +53,7 @@ Route102_EventScript_1EC170:: @ 81EC170 Route102_EventScript_1EC183:: @ 81EC183 msgbox Route102_Text_2945EB, MSGBOX_DEFAULT - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CALVIN_1 release end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 58a1fc124..2f9c12207 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -217,10 +217,7 @@ Route103_EventScript_1EC60B:: @ 81EC60B Route103_EventScript_1EC63A:: @ 81EC63A msgbox Route103_Text_294B8A, MSGBOX_DEFAULT - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_AMY_AND_LIV_1 release end @@ -239,10 +236,7 @@ Route103_EventScript_1EC66E:: @ 81EC66E Route103_EventScript_1EC69D:: @ 81EC69D msgbox Route103_Text_294B8A, MSGBOX_DEFAULT - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_AMY_AND_LIV_1 release end @@ -269,10 +263,7 @@ Route103_EventScript_1EC714:: @ 81EC714 special sub_80B4808 waitmovement 0 msgbox Route103_Text_294F7E, MSGBOX_DEFAULT - setvar VAR_0x8004, 293 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 293 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_MIGUEL_1 release end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 790eaf303..70c6d33cc 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -903,10 +903,7 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE Route104_EventScript_1ED3DF:: @ 81ED3DF msgbox Route104_Text_29576B, MSGBOX_DEFAULT - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_HALEY_1 release end @@ -919,10 +916,7 @@ Route104_EventScript_1ED3F8:: @ 81ED3F8 Route104_EventScript_1ED40B:: @ 81ED40B msgbox Route104_Text_2956FF, MSGBOX_DEFAULT - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_HALEY_1 release end @@ -954,10 +948,7 @@ Route104_EventScript_1ED47C:: @ 81ED47C Route104_EventScript_1ED48D:: @ 81ED48D msgbox Route104_Text_29595A, MSGBOX_DEFAULT - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WINSTON_1 release end @@ -970,10 +961,7 @@ Route104_EventScript_1ED4A6:: @ 81ED4A6 Route104_EventScript_1ED4B9:: @ 81ED4B9 msgbox Route104_Text_2958F8, MSGBOX_DEFAULT - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WINSTON_1 release end @@ -1005,10 +993,7 @@ Route104_EventScript_1ED52A:: @ 81ED52A Route104_EventScript_1ED53B:: @ 81ED53B msgbox Route104_Text_295B60, MSGBOX_DEFAULT - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CINDY_1 release end @@ -1021,10 +1006,7 @@ Route104_EventScript_1ED554:: @ 81ED554 Route104_EventScript_1ED567:: @ 81ED567 msgbox Route104_Text_295B01, MSGBOX_DEFAULT - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CINDY_1 release end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 55d5a45c2..a96c5c58f 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -74,10 +74,7 @@ Route105_EventScript_1EE300:: @ 81EE300 special sub_80B4808 waitmovement 0 msgbox Route105_Text_296159, MSGBOX_DEFAULT - setvar VAR_0x8004, 737 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 737 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ANDRES_1 release end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index ee211773a..4187ae136 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -28,10 +28,7 @@ Route106_EventScript_1EE4ED:: @ 81EE4ED special sub_80B4808 waitmovement 0 msgbox Route106_Text_2963E3, MSGBOX_DEFAULT - setvar VAR_0x8004, 339 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 339 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ELLIOT_1 release end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 4762fcd06..25c11feb0 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -19,10 +19,7 @@ Route107_EventScript_1EE5D8:: @ 81EE5D8 special sub_80B4808 waitmovement 0 msgbox Route107_Text_29685A, MSGBOX_DEFAULT - setvar VAR_0x8004, 155 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 155 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_TONY_1 release end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index c5c1dbccb..a833dcc5f 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -39,10 +39,7 @@ Route108_EventScript_1EE729:: @ 81EE729 special sub_80B4808 waitmovement 0 msgbox Route108_Text_296FD8, MSGBOX_DEFAULT - setvar VAR_0x8004, 740 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 740 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CORY_1 release end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index dff0800ac..d90e423ff 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -408,10 +408,7 @@ Route109_EventScript_1EEAC5:: @ 81EEAC5 special sub_80B4808 waitmovement 0 msgbox Route109_Text_2973C1, MSGBOX_DEFAULT - setvar VAR_0x8004, 64 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 64 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_RICKY_1 release end @@ -433,10 +430,7 @@ Route109_EventScript_1EEB27:: @ 81EEB27 special sub_80B4808 waitmovement 0 msgbox Route109_Text_297520, MSGBOX_DEFAULT - setvar VAR_0x8004, 57 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 57 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LOLA_1 release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 3652f7685..09dd38c69 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -187,10 +187,7 @@ Route110_EventScript_1EF44C:: @ 81EF44C special sub_80B4808 waitmovement 0 msgbox Route110_Text_298201, MSGBOX_DEFAULT - setvar VAR_0x8004, 512 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 512 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_EDWIN_1 release end @@ -227,10 +224,7 @@ Route110_EventScript_1EF4F3:: @ 81EF4F3 special sub_80B4808 waitmovement 0 msgbox Route110_Text_297CFE, MSGBOX_DEFAULT - setvar VAR_0x8004, 353 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 353 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_BENJAMIN_1 release end @@ -257,10 +251,7 @@ Route110_EventScript_1EF56C:: @ 81EF56C special sub_80B4808 waitmovement 0 msgbox Route110_Text_297ECD, MSGBOX_DEFAULT - setvar VAR_0x8004, 358 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 358 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ABIGAIL_1 release end @@ -282,10 +273,7 @@ Route110_EventScript_1EF5CE:: @ 81EF5CE special sub_80B4808 waitmovement 0 msgbox Route110_Text_2983EE, MSGBOX_DEFAULT - setvar VAR_0x8004, 302 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 302 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ISABEL_1 release end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c7b5457d0..08d4cb48e 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -484,10 +484,7 @@ Route111_EventScript_1F128C:: @ 81F128C special sub_80B4808 waitmovement 0 msgbox Route111_Text_298C00, MSGBOX_DEFAULT - setvar VAR_0x8004, 44 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 44 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DUSTY_1 release end @@ -524,10 +521,7 @@ Route111_EventScript_1F1333:: @ 81F1333 special sub_80B4808 waitmovement 0 msgbox Route111_Text_29903D, MSGBOX_DEFAULT - setvar VAR_0x8004, 78 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 78 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WILTON_1 release end @@ -549,10 +543,7 @@ Route111_EventScript_1F1395:: @ 81F1395 special sub_80B4808 waitmovement 0 msgbox Route111_Text_29921D, MSGBOX_DEFAULT - setvar VAR_0x8004, 94 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 94 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_BROOKE_1 release end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index d23efddd8..ec18e56da 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -78,10 +78,7 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD special sub_80B4808 waitmovement 0 msgbox Route112_Text_29993C, MSGBOX_DEFAULT - setvar VAR_0x8004, 627 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 627 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_TRENT_1 release end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 76d4b7f1c..35611fd6a 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -71,10 +71,7 @@ Route113_EventScript_1F221A:: @ 81F221A special sub_80B4808 waitmovement 0 msgbox Route113_Text_299F49, MSGBOX_DEFAULT - setvar VAR_0x8004, 434 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 434 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_MADELINE_1 release end @@ -96,10 +93,7 @@ Route113_EventScript_1F227C:: @ 81F227C special sub_80B4808 waitmovement 0 msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT - setvar VAR_0x8004, 419 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 419 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LAO_1 release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 931cca4de..6e702be1c 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -121,10 +121,7 @@ Route114_EventScript_1F26C8:: @ 81F26C8 special sub_80B4808 waitmovement 0 msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT - setvar VAR_0x8004, 143 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 143 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_STEVE_1 release end @@ -146,10 +143,7 @@ Route114_EventScript_1F272A:: @ 81F272A special sub_80B4808 waitmovement 0 msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT - setvar VAR_0x8004, 206 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 206 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_BERNIE_1 release end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 7921b09ee..37763c1e1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -49,10 +49,7 @@ Route115_EventScript_1F29BA:: @ 81F29BA special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT - setvar VAR_0x8004, 307 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 307 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_TIMOTHY_1 release end @@ -79,10 +76,7 @@ Route115_EventScript_1F2A33:: @ 81F2A33 special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B50B, MSGBOX_DEFAULT - setvar VAR_0x8004, 183 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 183 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_NOB_1 release end @@ -104,10 +98,7 @@ Route115_EventScript_1F2A95:: @ 81F2A95 special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT - setvar VAR_0x8004, 427 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 427 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CYNDY_1 release end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index f5892bb86..4e5c8892f 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -280,10 +280,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 special sub_80B4808 waitmovement 0 msgbox Route116_Text_29BE71, MSGBOX_DEFAULT - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JERRY_1 release end @@ -296,10 +293,7 @@ Route116_EventScript_1F2F22:: @ 81F2F22 Route116_EventScript_1F2F35:: @ 81F2F35 msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JERRY_1 release end @@ -341,10 +335,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF special sub_80B4808 waitmovement 0 msgbox Route116_Text_29C096, MSGBOX_DEFAULT - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KAREN_1 release end @@ -357,10 +348,7 @@ Route116_EventScript_1F2FFE:: @ 81F2FFE Route116_EventScript_1F3011:: @ 81F3011 msgbox Route116_Text_29C052, MSGBOX_DEFAULT - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KAREN_1 release end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 8bb600acc..12e6651fe 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -51,10 +51,7 @@ Route117_EventScript_1F39FC:: @ 81F39FC special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C508, MSGBOX_DEFAULT - setvar VAR_0x8004, 538 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 538 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ISAAC_1 release end @@ -76,10 +73,7 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT - setvar VAR_0x8004, 545 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 545 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LYDIA_1 release end @@ -101,10 +95,7 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0 special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C846, MSGBOX_DEFAULT - setvar VAR_0x8004, 364 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 364 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DYLAN_1 release end @@ -126,10 +117,7 @@ Route117_EventScript_1F3B22:: @ 81F3B22 special sub_80B4808 waitmovement 0 msgbox Route117_Text_29CA32, MSGBOX_DEFAULT - setvar VAR_0x8004, 369 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 369 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_MARIA_1 release end @@ -154,10 +142,7 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F Route117_EventScript_1F3B9F:: @ 81F3B9F msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ANNA_AND_MEG_1 release end @@ -177,10 +162,7 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 Route117_EventScript_1F3C03:: @ 81F3C03 msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ANNA_AND_MEG_1 release end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 8448504a1..56ec024a1 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -199,10 +199,7 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3 special sub_80B4808 waitmovement 0 msgbox Route118_Text_29D343, MSGBOX_DEFAULT - setvar VAR_0x8004, 37 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 37 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ROSE_1 release end @@ -234,10 +231,7 @@ Route118_EventScript_1F4043:: @ 81F4043 special sub_80B4808 waitmovement 0 msgbox Route118_Text_29D74A, MSGBOX_DEFAULT - setvar VAR_0x8004, 196 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 196 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DALTON_1 release end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 6c5e8b504..36ad9115d 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -379,10 +379,7 @@ Route119_EventScript_1F483C:: @ 81F483C special sub_80B4808 waitmovement 0 msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT - setvar VAR_0x8004, 552 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 552 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JACKSON_1 release end @@ -404,10 +401,7 @@ Route119_EventScript_1F489E:: @ 81F489E special sub_80B4808 waitmovement 0 msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT - setvar VAR_0x8004, 559 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 559 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CATHERINE_1 release end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6360a54a3..6b41400d5 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -308,10 +308,7 @@ Route120_EventScript_1F581A:: @ 81F581A special sub_80B4808 waitmovement 0 msgbox Route120_Text_29E75D, MSGBOX_DEFAULT - setvar VAR_0x8004, 406 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 406 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ROBERT_1 release end @@ -343,10 +340,7 @@ Route120_EventScript_1F58AA:: @ 81F58AA special sub_80B4808 waitmovement 0 msgbox Route120_Text_29EA31, MSGBOX_DEFAULT - setvar VAR_0x8004, 226 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 226 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JEFFREY_1 release end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 1bd917450..9c683c70d 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -83,10 +83,7 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F25B, MSGBOX_DEFAULT - setvar VAR_0x8004, 254 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 254 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WALTER_1 release end @@ -123,10 +120,7 @@ Route121_EventScript_1F5F66:: @ 81F5F66 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F69F, MSGBOX_DEFAULT - setvar VAR_0x8004, 127 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 127 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JESSICA_1 release end @@ -168,10 +162,7 @@ Route121_EventScript_1F6024:: @ 81F6024 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F80D, MSGBOX_DEFAULT - setvar VAR_0x8004, 767 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 767 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CRISTIN_1 release end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 052405704..5e0f97493 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -73,10 +73,7 @@ Route123_EventScript_1F6236:: @ 81F6236 special sub_80B4808 waitmovement 0 msgbox Route123_Text_29FE70, MSGBOX_DEFAULT - setvar VAR_0x8004, 238 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 238 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CAMERON_1 release end @@ -98,10 +95,7 @@ Route123_EventScript_1F6298:: @ 81F6298 special sub_80B4808 waitmovement 0 msgbox Route123_Text_2A0027, MSGBOX_DEFAULT - setvar VAR_0x8004, 249 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 249 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JACKI_1 release end @@ -173,10 +167,7 @@ Route123_EventScript_1F63E8:: @ 81F63E8 special sub_80B4808 waitmovement 0 msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT - setvar VAR_0x8004, 195 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 195 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_FERNANDO_1 release end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 013171cbd..530e0703a 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -34,10 +34,7 @@ Route124_EventScript_1F65DF:: @ 81F65DF special sub_80B4808 waitmovement 0 msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT - setvar VAR_0x8004, 449 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 449 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JENNY_1 release end @@ -67,10 +64,7 @@ Route124_EventScript_1F6643:: @ 81F6643 Route124_EventScript_1F6673:: @ 81F6673 msgbox Route124_Text_2A109F, MSGBOX_DEFAULT - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LILA_AND_ROY_1 release end @@ -90,10 +84,7 @@ Route124_EventScript_1F66A7:: @ 81F66A7 Route124_EventScript_1F66D7:: @ 81F66D7 msgbox Route124_Text_2A109F, MSGBOX_DEFAULT - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LILA_AND_ROY_1 release end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index c1771a83b..b2061f325 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -59,10 +59,7 @@ Route125_EventScript_1F682C:: @ 81F682C special sub_80B4808 waitmovement 0 msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT - setvar VAR_0x8004, 492 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 492 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ERNEST_1 release end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index d3679eb54..a773feb2b 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -55,10 +55,7 @@ Route126_EventScript_1F69A3:: @ 81F69A3 special sub_80B4808 waitmovement 0 msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT - setvar VAR_0x8004, 377 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 377 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_PABLO_1 release end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 33d3e808e..399e7a428 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -74,10 +74,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02 special sub_80B4808 waitmovement 0 msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT - setvar VAR_0x8004, 672 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 672 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KOJI_1 release end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 2a686a865..0d7a8587c 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -188,10 +188,7 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA special sub_80B4808 waitmovement 0 msgbox Route128_Text_2A2916, MSGBOX_DEFAULT - setvar VAR_0x8004, 376 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 376 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ISAIAH_1 release end @@ -213,10 +210,7 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C special sub_80B4808 waitmovement 0 msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT - setvar VAR_0x8004, 386 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 386 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KATELYN_1 release end -- cgit v1.2.3 From d137ebc7a9e0f4f73a1379ab667d90fbce859876 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 2 Dec 2018 13:59:55 +0100 Subject: Some more rom 8011dc0 work --- asm/rom_8011DC0.s | 491 ----------------------------------------------------- include/link_rfu.h | 1 + src/link_rfu.c | 2 +- src/rom_8011DC0.c | 302 ++++++++++++++++++++++++++++---- 4 files changed, 274 insertions(+), 522 deletions(-) diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 7e0099a9c..3e07135e6 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -5,500 +5,9 @@ .text - thumb_func_start sub_801689C -sub_801689C: @ 801689C - push {r4,r5,lr} - adds r2, r0, 0 - ldr r3, =gRecvCmds - ldrh r5, [r3, 0x12] - adds r4, r5, 0 - cmp r4, 0 - beq _080168D0 - ldrh r0, [r3, 0x10] - movs r1, 0xFF - lsls r1, 8 - ands r1, r0 - movs r0, 0xBC - lsls r0, 6 - cmp r1, r0 - bne _080168D0 - adds r0, r2, 0 - adds r0, 0x9A - strh r5, [r0] - cmp r4, 0x44 - bne _080168D0 - ldrh r1, [r3, 0x14] - adds r0, 0x2 - strh r1, [r0] - ldrh r1, [r3, 0x16] - adds r0, 0x2 - strh r1, [r0] -_080168D0: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_801689C - - thumb_func_start sub_80168DC -sub_80168DC: @ 80168DC - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r4, 0 - adds r5, 0x9A - ldrh r0, [r5] - cmp r0, 0 - beq _0801692C - ldr r0, =gStringVar4 - ldr r1, =gLinkPlayers - adds r1, 0x2F - ldrb r1, [r1] - adds r2, r5, 0 - adds r3, r4, 0 - bl sub_8017EA0 - cmp r0, 0 - beq _0801692C - cmp r0, 0x1 - bne _0801691C - movs r0, 0x23 - strb r0, [r4, 0x14] - ldr r1, =gUnknown_02022C2C - ldrh r0, [r5] - strb r0, [r1] - movs r0, 0 - b _0801692E - .pool -_0801691C: - cmp r0, 0x2 - bne _0801692C - movs r0, 0x24 - strb r0, [r4, 0x14] - bl sub_800AC34 - movs r0, 0 - b _0801692E -_0801692C: - movs r0, 0x1 -_0801692E: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80168DC - - thumb_func_start sub_8016934 -sub_8016934: @ 8016934 - push {r4,r5,lr} - ldr r5, =gUnknown_02022C20 - movs r0, 0xFF - strb r0, [r5] - ldr r0, =task00_081199FC - movs r1, 0 - bl CreateTask - ldr r4, =gUnknown_02022C30 - movs r0, 0x9B - lsls r0, 2 - bl AllocZeroed - str r0, [r4] - ldr r1, =gUnknown_03000DA8 - str r0, [r1] - movs r1, 0 - strb r1, [r0, 0x14] - strb r1, [r0, 0x16] - strh r1, [r0, 0x10] - strh r1, [r0, 0x12] - movs r0, 0x1 - negs r0, r0 - strb r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8016934 - thumb_func_start task00_081199FC -task00_081199FC: @ 801697C - push {r4-r6,lr} - sub sp, 0x20 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gUnknown_02022C30 - ldr r5, [r0] - ldrb r0, [r5, 0x14] - cmp r0, 0x4 - bls _08016990 - b _08016AC8 -_08016990: - lsls r0, 2 - ldr r1, =_080169A4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080169A4: - .4byte _080169B8 - .4byte _080169BE - .4byte _080169E0 - .4byte _08016A30 - .4byte _08016A94 -_080169B8: - movs r0, 0x1 - strb r0, [r5, 0x14] - b _08016AC8 -_080169BE: - movs r0, 0xC - movs r1, 0 - movs r2, 0 - bl sub_8010F84 - bl sub_800B488 - bl OpenLink - bl sub_8011C84 - movs r0, 0x1 - bl sub_80111B0 - movs r0, 0x2 - strb r0, [r5, 0x14] - b _08016AC8 -_080169E0: - movs r0, 0x70 - bl AllocZeroed - str r0, [r5, 0x4] - movs r1, 0x4 - bl sub_80175EC - movs r0, 0x70 - bl AllocZeroed - str r0, [r5, 0xC] - movs r1, 0x4 - bl sub_80175EC - movs r0, 0x80 - lsls r0, 1 - bl AllocZeroed - str r0, [r5] - movs r1, 0x8 - bl sub_8017580 - movs r0, 0x20 - bl AllocZeroed - str r0, [r5, 0x8] - movs r1, 0x1 - bl sub_8017580 - ldr r0, [r5, 0xC] - ldr r1, [r5, 0x4] - movs r2, 0xA - bl sub_8016DF0 - adds r1, r5, 0 - adds r1, 0x20 - strb r0, [r1] - movs r0, 0x3 - strb r0, [r5, 0x14] - b _08016AC8 -_08016A30: - bl sub_8016B00 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - blt _08016AC8 - cmp r0, 0x2 - bgt _08016AC8 - ldr r0, =gUnknown_02022C20 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08016AC8 - movs r6, 0 -_08016A4A: - ldr r0, [r5] - lsls r4, r6, 5 - adds r1, r0, r4 - ldrb r0, [r1, 0x1A] - lsls r0, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _08016A78 - mov r0, sp - bl sub_8018404 - ldr r0, [r5] - adds r0, r4 - adds r0, 0x2 - bl ReadAsU16 - lsls r0, 16 - lsrs r0, 16 - mov r1, sp - bl sub_800E540 - cmp r0, 0 - bne _08016A84 -_08016A78: - adds r6, 0x1 - cmp r6, 0x7 - ble _08016A4A - b _08016AC8 - .pool -_08016A84: - ldr r0, =gUnknown_02022C20 - mov r1, sp - bl StringCopy - b _08016AC8 - .pool -_08016A94: - ldr r0, [r5, 0x8] - bl Free - ldr r0, [r5] - bl Free - ldr r0, [r5, 0xC] - bl Free - ldr r0, [r5, 0x4] - bl Free - adds r0, r5, 0 - adds r0, 0x20 - ldrb r0, [r0] - bl DestroyTask - ldr r0, =gUnknown_02022C30 - ldr r0, [r0] - bl Free - bl sub_800EDD4 - adds r0, r4, 0 - bl DestroyTask -_08016AC8: - add sp, 0x20 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end task00_081199FC - thumb_func_start sp182_move_string -sp182_move_string: @ 8016AD4 - push {r4,lr} - ldr r4, =gUnknown_02022C20 - ldrb r0, [r4] - cmp r0, 0xFF - bne _08016AE8 - movs r0, 0 - b _08016AF6 - .pool -_08016AE8: - ldr r0, =gStringVar1 - adds r1, r4, 0 - bl StringCopy - movs r0, 0xFF - strb r0, [r4] - movs r0, 0x1 -_08016AF6: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sp182_move_string - thumb_func_start sub_8016B00 -sub_8016B00: @ 8016B00 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r0, =gUnknown_02022C30 - ldr r4, [r0] - movs r7, 0 - movs r6, 0 - movs r5, 0 -_08016B12: - ldr r0, [r4, 0xC] - adds r0, r5 - ldr r1, =gUnknown_082F045C - bl sub_8017630 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x1 - bne _08016B5C - ldr r1, [r4, 0xC] - ldr r0, [r4, 0x8] - adds r1, r5 - ldm r1!, {r2,r5,r6} - stm r0!, {r2,r5,r6} - ldm r1!, {r2,r5,r6} - stm r0!, {r2,r5,r6} - ldr r1, [r4, 0x8] - movs r0, 0 - strh r0, [r1, 0x18] - ldr r2, [r4, 0x8] - ldrb r1, [r2, 0x1A] - movs r5, 0x4 - negs r5, r5 - adds r0, r5, 0 - ands r1, r0 - movs r0, 0x1 - orrs r1, r0 - strb r1, [r2, 0x1A] - ldr r0, [r4, 0x8] - strb r3, [r0, 0x1B] - movs r0, 0x4 - b _08016C90 - .pool -_08016B5C: - adds r5, 0x1C - adds r6, 0x1 - cmp r6, 0x3 - ble _08016B12 - movs r6, 0 - mov r9, r6 -_08016B68: - ldr r0, [r4] - mov r1, r9 - lsls r5, r1, 5 - adds r2, r0, r5 - ldrb r0, [r2, 0x1A] - lsls r0, 30 - mov r8, r5 - cmp r0, 0 - beq _08016C5C - ldr r1, [r4, 0x4] - adds r0, r2, 0 - bl sub_80176E4 - adds r6, r0, 0 - cmp r6, 0xFF - beq _08016C02 - ldr r0, [r4] - adds r2, r0, r5 - ldrb r1, [r2, 0x1A] - lsls r0, r1, 30 - lsrs r0, 30 - cmp r0, 0x1 - bne _08016BE0 - lsls r0, r6, 3 - subs r0, r6 - lsls r6, r0, 2 - ldr r1, [r4, 0x4] - adds r1, r6 - adds r0, r2, 0 - bl sub_8017678 - cmp r0, 0 - beq _08016BC6 - ldr r1, [r4] - ldr r0, [r4, 0x4] - adds r1, r5 - adds r0, r6 - ldm r0!, {r2,r3,r6} - stm r1!, {r2,r3,r6} - ldm r0!, {r2,r3,r6} - stm r1!, {r2,r3,r6} - ldr r0, [r4] - adds r0, r5 - movs r1, 0x40 - strb r1, [r0, 0x1B] - movs r7, 0x1 - b _08016BF8 -_08016BC6: - ldr r0, [r4] - adds r1, r0, r5 - ldrb r0, [r1, 0x1B] - cmp r0, 0 - beq _08016BF8 - subs r0, 0x1 - strb r0, [r1, 0x1B] - ldr r0, [r4] - adds r0, r5 - ldrb r0, [r0, 0x1B] - cmp r0, 0 - bne _08016BF8 - b _08016BF6 -_08016BE0: - movs r3, 0x4 - negs r3, r3 - adds r0, r3, 0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x1A] - ldr r0, [r4] - adds r0, r5 - movs r1, 0 - strb r1, [r0, 0x1B] -_08016BF6: - movs r7, 0x2 -_08016BF8: - ldr r0, [r4] - add r0, r8 - movs r1, 0 - strh r1, [r0, 0x18] - b _08016C5C -_08016C02: - ldr r0, [r4] - adds r1, r0, r5 - ldrb r0, [r1, 0x1A] - lsls r2, r0, 30 - lsrs r0, r2, 30 - cmp r0, 0x2 - beq _08016C3C - ldrh r0, [r1, 0x18] - adds r0, 0x1 - strh r0, [r1, 0x18] - ldr r0, [r4] - adds r2, r0, r5 - ldrh r1, [r2, 0x18] - ldr r0, =0x00000257 - cmp r1, r0 - bls _08016C5C - ldrb r0, [r2, 0x1A] - movs r5, 0x4 - negs r5, r5 - adds r1, r5, 0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2, 0x1A] - movs r7, 0x2 - b _08016C5C - .pool -_08016C3C: - lsrs r0, r2, 30 - cmp r0, 0x2 - bne _08016C5C - ldrh r0, [r1, 0x18] - adds r0, 0x1 - strh r0, [r1, 0x18] - ldr r0, [r4] - adds r2, r0, r5 - ldrh r1, [r2, 0x18] - ldr r0, =0x00000383 - cmp r1, r0 - bls _08016C5C - adds r0, r2, 0 - movs r1, 0x1 - bl sub_8017580 -_08016C5C: - mov r0, r9 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - cmp r0, 0x7 - bhi _08016C6C - b _08016B68 -_08016C6C: - movs r5, 0 - movs r6, 0x3 -_08016C70: - ldr r0, [r4] - ldr r1, [r4, 0x4] - adds r1, r5 - movs r2, 0x8 - bl sub_8017734 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08016C86 - movs r7, 0x1 -_08016C86: - adds r5, 0x1C - subs r6, 0x1 - cmp r6, 0 - bge _08016C70 - adds r0, r7, 0 -_08016C90: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8016B00 thumb_func_start sub_8016CA0 sub_8016CA0: @ 8016CA0 diff --git a/include/link_rfu.h b/include/link_rfu.h index 4398ca690..426565e56 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -277,5 +277,6 @@ bool32 sub_800E540(u16 id, u8 *name); void sub_8011DE0(u32 arg0); u8 sub_801100C(int a0); void sub_800EF7C(void); +bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); #endif //GUARD_LINK_RFU_H diff --git a/src/link_rfu.c b/src/link_rfu.c index 7809842f4..308ad615c 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -4822,7 +4822,7 @@ void sub_8011C84(void) gUnknown_03005000.unk_67 = CreateTask(sub_800EB44, 1); } -u16 ReadU16(const void *ptr) +static u16 ReadU16(const void *ptr) { const u8 *ptr_ = ptr; return (ptr_[1] << 8) | (ptr_[0]); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 250f80c4c..a197598de 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -63,7 +63,7 @@ struct UnkStruct_x20 struct UnkStruct_Main0 { - struct UnkStruct_x20 arr[5]; + struct UnkStruct_x20 arr[8]; }; struct UnkStruct_Main4 @@ -153,9 +153,7 @@ struct UnkStruct_URoom u16 field_4C[6]; u8 field_58[0x98 - 0x58]; u16 field_98; - u16 field_9A; - u16 field_9C; - u16 field_9E; + u16 field_9A[3]; struct UnkStruct_8019BA8 field_A0[8]; }; @@ -182,17 +180,18 @@ struct TradeUnkStruct }; extern struct TradeUnkStruct gUnknown_02022C40; - +extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; extern union UnkUnion_Main gUnknown_02022C30; - extern u8 gUnknown_02022C2C; extern u8 gUnknown_02022C2D; extern u8 gUnknown_02022C3E; extern u16 gUnknown_02022C3C; -extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; - +extern u8 gUnknown_02022C20[]; extern u8 gFieldLinkPlayerCount; extern u8 gUnknown_03005DB4; +extern u8 gSelectedOrderFromParty[]; +extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; +extern u8 gUnknown_02032298[2]; // IWRAM vars IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0; @@ -212,7 +211,7 @@ void sub_8014F48(u8 taskId); void sub_80152F4(u8 taskId); void sub_80156E0(u8 taskId); void sub_80175EC(struct UnkStruct_Main4 *arg0, u8 count); -void sub_8017580(struct UnkStruct_Main0 *arg0, u8 count); +void sub_8017580(struct UnkStruct_x20 *arg0, u8 count); u8 sub_8016FC0(struct UnkStruct_Main4 *arg0, u32 arg1); u8 sub_8016FF0(struct UnkStruct_Main4 *arg0, u32 arg1); bool8 PrintOnTextbox(u8 *textState, const u8 *str); @@ -282,7 +281,10 @@ void sub_8019E3C(void); void sub_80173B0(void); s32 sub_8017D04(u32 type, u32 species); void sub_8017020(const u8 *src); -void sub_8019BA8(); +void sub_8019BA8(void *); +s32 sub_8017EA0(u8 *dst, u32 gender, u16 *arg2, struct UnkStruct_URoom *arg3); +void sub_801697C(u8 taskId); +bool8 sub_8017630(struct UnkStruct_Shared* arg0, const struct UnkStruct_Shared* arg1); // const rom data extern const u8 *const gUnknown_082EDB60[][5]; @@ -376,7 +378,9 @@ extern const u8 *const gUnknown_082EE82C[][4]; extern const u8 *const gUnknown_082EE24C[][2]; -extern const struct UnkStruct_Shared gUnknown_082F045C[]; +extern const struct UnkStruct_Shared gUnknown_082F045C; + +extern const u8 *const gUnknown_082F04D8[22]; // code void nullsub_89(void) @@ -484,7 +488,7 @@ void sub_8012780(u8 taskId) data->field_0 = AllocZeroed(0xA0); data->field_8 = AllocZeroed(0xA0); sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 5); + sub_8017580(data->field_0->arr, 5); sub_800DF90(&data->field_0->arr[0].unk.field_0, data->field_0->arr[0].unk.playerName); data->field_0->arr[0].field_18 = 0; data->field_0->arr[0].field_1A_0 = 1; @@ -1008,7 +1012,7 @@ u8 sub_8013398(struct UnkStruct_Main0 *arg0) ret = copiedCount; for (; copiedCount < 5; copiedCount++) { - data->field_0->arr[copiedCount].unk = gUnknown_082F045C[0]; + data->field_0->arr[copiedCount].unk = gUnknown_082F045C; data->field_0->arr[copiedCount].field_18 = 0; data->field_0->arr[copiedCount].field_1A_0 = 0; data->field_0->arr[copiedCount].field_1A_1 = 0; @@ -1068,7 +1072,7 @@ void sub_80134E8(u8 taskId) break; case 2: sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 16); + sub_8017580(data->field_0->arr, 16); data->field_11 = sub_8016FC0(data->field_4, gSpecialVar_0x8004); data->field_C = AddWindow(&gUnknown_082F00BC); data->listWindowId = AddWindow(&gUnknown_082F0174); @@ -1370,7 +1374,7 @@ void sub_8013C7C(u8 taskId) break; case 2: sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 16); + sub_8017580(data->field_0->arr, 16); data->field_11 = sub_8016FC0(data->field_4, 0xFF); data->field_F = 0; data->state = 3; @@ -1395,8 +1399,6 @@ void sub_8013C7C(u8 taskId) } } -extern const u8 *const gUnknown_082F04D8[22]; - bool32 sub_8013D88(u32 arg0, u32 id) { if (id == 0xFF) @@ -1518,9 +1520,6 @@ u8 sub_8013F78(void) return taskId; } -extern struct MailStruct gUnknown_020321C0[PARTY_SIZE]; -extern u8 gUnknown_02032298[2]; - void sub_8013F90(u8 taskId) { u32 monId = sub_8018120(&gUnknown_02022C40, GetMultiplayerId()); @@ -1784,8 +1783,6 @@ void sub_801440C(u8 taskId) ScriptContext2_Disable(); } -extern u8 gSelectedOrderFromParty[]; - void sub_8014790(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -1934,7 +1931,7 @@ void sub_8014A40(u8 taskId) data->field_0 = AllocZeroed(0xA0); data->field_8 = AllocZeroed(0xA0); sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 5); + sub_8017580(data->field_0->arr, 5); sub_800DF90(&data->field_0->arr[0].unk.field_0, data->field_0->arr[0].unk.playerName); data->field_0->arr[0].field_18 = 0; data->field_0->arr[0].field_1A_0 = 1; @@ -2143,7 +2140,7 @@ void sub_8014F48(u8 taskId) break; case 2: sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 16); + sub_8017580(data->field_0->arr, 16); data->field_11 = sub_8016FC0(data->field_4, data->field_12 + 7); winTemplate1 = gUnknown_082F0174; @@ -2312,7 +2309,7 @@ void sub_80152F4(u8 taskId) break; case 2: sub_80175EC(data->field_4, 4); - sub_8017580(data->field_0, 16); + sub_8017580(data->field_0->arr, 16); data->field_11 = sub_8016FF0(data->field_4, data->field_12 + 7); if (data->field_13 != 0) @@ -2525,7 +2522,7 @@ void sub_80156E0(u8 taskId) data->field_C = AllocZeroed(0x70); data->field_0 = AllocZeroed(0x100); data->field_8 = AllocZeroed(0x20); - sub_8017580(data->field_0, 8); + sub_8017580(data->field_0->arr, 8); gUnknown_02022C2C = 0x40; data->field_20 = sub_8016DF0(data->field_C, data->field_4, 9); sub_8019BA8(data->field_A0); @@ -2543,7 +2540,7 @@ void sub_80156E0(u8 taskId) sub_800B488(); OpenLink(); sub_8011C84(); - sub_8017580(data->field_8, 1); + sub_8017580(&data->field_8->arr[0], 1); sub_80175EC(data->field_4, 4); sub_80175EC(data->field_C, 4); gSpecialVar_Result = 0; @@ -2836,7 +2833,7 @@ void sub_80156E0(u8 taskId) data->state = 41; sub_800ADF8(); data->field_98 = 0; - data->field_9A = 0; + data->field_9A[0] = 0; } break; case 41: @@ -2920,7 +2917,7 @@ void sub_80156E0(u8 taskId) PlaySE(SE_PINPON); sub_800EF7C(); data->state = 12; - data->field_9A = 0; + data->field_9A[0] = 0; break; case 12: if (sub_8011A80()) @@ -3020,7 +3017,7 @@ void sub_80156E0(u8 taskId) gUnknown_02022C2C = 0x40; sub_8015664(0x25, gStringVar4); memset(data->field_4C, 0, sizeof(data->field_4C)); - data->field_9A = 0; + data->field_9A[0] = 0; data->field_98 = 0; } break; @@ -3262,3 +3259,248 @@ void var_800D_set_xB(void) if (InUnionRoom() == TRUE) gSpecialVar_Result = 11; } + +void sub_801689C(struct UnkStruct_URoom *arg0) +{ + if (gRecvCmds[1][1] != 0 && (gRecvCmds[1][0] & 0xFF00) == 0x2F00) + { + arg0->field_9A[0] = gRecvCmds[1][1]; + if (gRecvCmds[1][1] == 0x44) + { + arg0->field_9A[1] = gRecvCmds[1][2]; + arg0->field_9A[2] = gRecvCmds[1][3]; + } + } +} + +bool32 sub_80168DC(struct UnkStruct_URoom *arg0) +{ + if (arg0->field_9A[0] != 0) + { + s32 var = sub_8017EA0(gStringVar4, gLinkPlayers[1].gender, &arg0->field_9A[0], arg0); + if (var == 0) + { + return TRUE; + } + else if (var == 1) + { + arg0->state = 35; + gUnknown_02022C2C = arg0->field_9A[0]; + return FALSE; + } + else if (var == 2) + { + arg0->state = 36; + sub_800AC34(); + return FALSE; + } + } + + return TRUE; +} + +void sub_8016934(void) +{ + struct UnkStruct_URoom *ptr; + + gUnknown_02022C20[0] = EOS; + CreateTask(sub_801697C, 0); + gUnknown_02022C30.uRoom = gUnknown_02022C30.uRoom; // Needed to match. + gUnknown_02022C30.uRoom = ptr = AllocZeroed(0x26C); + gUnknown_03000DA8 = gUnknown_02022C30.uRoom; + ptr->state = 0; + ptr->textState = 0; + ptr->field_10 = 0; + ptr->field_12 = 0; + gUnknown_02022C20[0] = EOS; +} + +void sub_801697C(u8 taskId) +{ + s32 i; + u8 text[32]; + struct UnkStruct_URoom *structPtr = gUnknown_02022C30.uRoom; + + switch (structPtr->state) + { + case 0: + structPtr->state = 1; + break; + case 1: + sub_8010F84(0xC, 0, 0); + sub_800B488(); + OpenLink(); + sub_8011C84(); + sub_80111B0(1); + structPtr->state = 2; + break; + case 2: + structPtr->field_4 = AllocZeroed(0x70); + sub_80175EC(structPtr->field_4, 4); + structPtr->field_C = AllocZeroed(0x70); + sub_80175EC(structPtr->field_C, 4); + structPtr->field_0 = AllocZeroed(0x100); + sub_8017580(structPtr->field_0->arr, 8); + structPtr->field_8 = AllocZeroed(0x20); + sub_8017580(&structPtr->field_8->arr[0], 1); + structPtr->field_20 = sub_8016DF0(structPtr->field_C, structPtr->field_4, 10); + structPtr->state = 3; + break; + case 3: + switch (sub_8016B00()) + { + case 1: + case 2: + if (gUnknown_02022C20[0] == EOS) + { + for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) + { + if (structPtr->field_0->arr[i].field_1A_0 == 1) + { + sub_8018404(text, &structPtr->field_0->arr[i]); + if (sub_800E540(ReadAsU16(structPtr->field_0->arr[i].unk.field_0.unk_00.playerTrainerId), text)) + { + StringCopy(gUnknown_02022C20, text); + break; + } + } + } + } + break; + case 3: + break; + } + break; + case 4: + free(structPtr->field_8); + free(structPtr->field_0); + free(structPtr->field_C); + free(structPtr->field_4); + DestroyTask(structPtr->field_20); + free(gUnknown_02022C30.uRoom); + sub_800EDD4(); + DestroyTask(taskId); + break; + } +} + +bool16 sp182_move_string(void) +{ + if (gUnknown_02022C20[0] != EOS) + { + StringCopy(gStringVar1, gUnknown_02022C20); + gUnknown_02022C20[0] = EOS; + return TRUE; + } + else + { + return FALSE; + } +} + +u8 sub_8016B00(void) +{ + s32 i; + u8 j; + struct UnkStruct_URoom *structPtr = gUnknown_02022C30.uRoom; + s32 r7 = 0; + + for (i = 0; i < 4; i++) + { + if (sub_8017630(&structPtr->field_C->arr[i].unk0, &gUnknown_082F045C) == TRUE) + { + structPtr->field_8->arr[0].unk = structPtr->field_C->arr[i].unk0; + structPtr->field_8->arr[0].field_18 = 0; + structPtr->field_8->arr[0].field_1A_0 = 1; + structPtr->field_8->arr[0].field_1B = 1; + return 4; + } + } + for (j = 0; j < 8; j++) + { + if (structPtr->field_0->arr[j].field_1A_0 != 0) + { + i = sub_80176E4(&structPtr->field_0->arr[j], &structPtr->field_4->arr[0]); + if (i != 0xFF) + { + if (structPtr->field_0->arr[j].field_1A_0 == 1) + { + if (sub_8017678(&structPtr->field_0->arr[j], &structPtr->field_4->arr[i])) + { + structPtr->field_0->arr[j].unk = structPtr->field_4->arr[i].unk0; + structPtr->field_0->arr[j].field_1B = 0x40; + r7 = 1; + } + else if (structPtr->field_0->arr[j].field_1B != 0) + { + structPtr->field_0->arr[j].field_1B--; + if (structPtr->field_0->arr[j].field_1B == 0) + r7 = 2; + } + } + else + { + structPtr->field_0->arr[j].field_1A_0 = 1; + structPtr->field_0->arr[j].field_1B = 0; + r7 = 2; + } + structPtr->field_0->arr[j].field_18 = 0; + } + else if (structPtr->field_0->arr[j].field_1A_0 != 2) + { + structPtr->field_0->arr[j].field_18++; + if (structPtr->field_0->arr[j].field_18 >= 600) + { + structPtr->field_0->arr[j].field_1A_0 = 2; + r7 = 2; + } + } + else if (structPtr->field_0->arr[j].field_1A_0 == 2) + { + structPtr->field_0->arr[j].field_18++; + if (structPtr->field_0->arr[j].field_18 >= 900) + { + sub_8017580(&structPtr->field_0->arr[j], 1); + } + } + } + } + for (i = 0; i < 4; i++) + { + if (sub_8017734(&structPtr->field_0->arr[0], &structPtr->field_4->arr[i].unk0, 8) != 0xFF) + r7 = 1; + } + + return r7; +} + +/* +void sub_8016CA0(u8 taskId) +{ + s32 i, j; + struct UnkLinkRfuStruct_02022B14 sp0; + u8 text[10]; + struct UnkStruct_Main4 *ptr = (void*) gTasks[taskId].data; + + for (i = 0; i < 4; i++) + { + j = sub_800DE7C(&sp0, text, i); + if (!sub_8013D88(sp0.unk_0a_0, gTasks[taskId].data[4])) + sp0 = gUnknown_082F045C.field_0; + if (sp0.unk_00.unk_00_0 == 1) + sp0 = gUnknown_082F045C.field_0; + + if (!j) + { + for (j = 0; j < i; j++) + { + if (sub_8017630()) + } + } + else + { + + } + } +} +*/ -- cgit v1.2.3 From b87e6a4e577e27d054e256464a7276665104ff83 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 2 Dec 2018 18:58:33 +0100 Subject: Get rid of static functions in includes --- include/event_object_movement.h | 25 ++----------------------- include/overworld.h | 7 ------- include/string_util.h | 1 - src/event_object_movement.c | 22 ++++++++++++++++++++++ 4 files changed, 24 insertions(+), 31 deletions(-) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 6515791c3..cc45f1531 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -19,7 +19,8 @@ enum SpinnerRunnerFollowPatterns RUNFOLLOW_SOUTH_EAST_WEST }; -struct UnkStruct_085094AC { +struct UnkStruct_085094AC +{ const union AnimCmd *const *anims; u8 animPos[4]; }; @@ -45,28 +46,6 @@ struct UnkStruct_085094AC { #define GROUND_EFFECT_FLAG_HOT_SPRINGS (1 << 18) #define GROUND_EFFECT_FLAG_SEAWEED (1 << 19) -#define movement_type_def(setup, table) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ -void setup(struct Sprite *sprite)\ -{\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ -}\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - return table[sprite->data[1]](eventObject, sprite);\ -} - -#define movement_type_empty_callback(setup) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ -void setup(struct Sprite *sprite)\ -{\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ -}\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ -{\ - return 0;\ -} - struct PairedPalettes { u16 tag; diff --git a/include/overworld.h b/include/overworld.h index 6f7801905..60d9d5133 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -47,13 +47,8 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); -static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -static bool32 IsDummyWarp(struct WarpData *warp); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); struct MapHeader const *const GetDestinationWarpMapHeader(void); -static void LoadCurrentMapData(void); -static void LoadSaveblockMapHeader(void); -static void SetPlayerCoordsFromWarp(void); void WarpIntoMap(void); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId); @@ -67,7 +62,6 @@ void sub_8084D5C(s16 a1, s16 a2); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084E14(void); void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -static void SetFixedDiveWarpAsDestination(void); void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetFixedHoleWarpAsDestination(s16 x, s16 y); void warp1_set_to_sav1w(void); @@ -75,7 +69,6 @@ void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084F6C(u8 a1); void sub_8084FAC(int unused); const struct MapConnection *GetMapConnection(u8 dir); -static bool8 SetDiveWarp(u8 dir, u16 x, u16 y); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); void mliX_load_map(u8 mapGroup, u8 mapNum); diff --git a/include/string_util.h b/include/string_util.h index 67149bca0..d7a005ec5 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -39,7 +39,6 @@ u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color); bool32 IsStringJapanese(u8 *str); bool32 sub_800924C(u8 *str, s32 n); u8 GetExtCtrlCodeLength(u8 code); -static const u8 *SkipExtCtrlCode(const u8 *s); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); void ConvertInternationalString(u8 *s, u8 language); void StripExtCtrlCodes(u8 *str); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index cd5a547a9..e509c7738 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -27,6 +27,28 @@ // this file was known as evobjmv.c in Game Freak's original source +#define movement_type_def(setup, table) \ +static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +void setup(struct Sprite *sprite)\ +{\ + UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ +}\ +static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +{\ + return table[sprite->data[1]](eventObject, sprite);\ +} + +#define movement_type_empty_callback(setup) \ +static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +void setup(struct Sprite *sprite)\ +{\ + UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ +}\ +static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +{\ + return 0;\ +} + EWRAM_DATA u8 sCurrentReflectionType = 0; EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0; EWRAM_DATA struct LockedAnimEventObjects *gLockedAnimEventObjects = {0}; -- cgit v1.2.3 From 725f99a1bfd43d1a8e60139c248da916065111b4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 2 Dec 2018 19:24:06 +0100 Subject: Use :req macros --- asm/macros/battle_ai_script.inc | 170 +++++++-------- asm/macros/battle_anim_script.inc | 112 +++++----- asm/macros/battle_script.inc | 438 +++++++++++++++++++------------------- asm/macros/event.inc | 368 ++++++++++++++++---------------- 4 files changed, 544 insertions(+), 544 deletions(-) diff --git a/asm/macros/battle_ai_script.inc b/asm/macros/battle_ai_script.inc index 28f60be46..4c7646d6f 100644 --- a/asm/macros/battle_ai_script.inc +++ b/asm/macros/battle_ai_script.inc @@ -1,206 +1,206 @@ - .macro if_random_less_than param0, param1 + .macro if_random_less_than param0:req, param1:req .byte 0x0 .byte \param0 .4byte \param1 .endm - .macro if_random_greater_than param0, param1 + .macro if_random_greater_than param0:req, param1:req .byte 0x1 .byte \param0 .4byte \param1 .endm - .macro if_random_equal param0, param1 + .macro if_random_equal param0:req, param1:req .byte 0x2 .byte \param0 .4byte \param1 .endm - .macro if_random_not_equal param0, param1 + .macro if_random_not_equal param0:req, param1:req .byte 0x3 .byte \param0 .4byte \param1 .endm - .macro score param0 + .macro score param0:req .byte 0x4 .byte \param0 .endm - .macro if_hp_less_than battler, param1, param2 + .macro if_hp_less_than battler:req, param1:req, param2:req .byte 0x5 .byte \battler .byte \param1 .4byte \param2 .endm - .macro if_hp_more_than battler, param1, param2 + .macro if_hp_more_than battler:req, param1:req, param2:req .byte 0x6 .byte \battler .byte \param1 .4byte \param2 .endm - .macro if_hp_equal battler, param1, param2 + .macro if_hp_equal battler:req, param1:req, param2:req .byte 0x7 .byte \battler .byte \param1 .4byte \param2 .endm - .macro if_hp_not_equal battler, param1, param2 + .macro if_hp_not_equal battler:req, param1:req, param2:req .byte 0x8 .byte \battler .byte \param1 .4byte \param2 .endm - .macro if_status battler, status1, param2 + .macro if_status battler:req, status1:req, param2:req .byte 0x9 .byte \battler .4byte \status1 .4byte \param2 .endm - .macro if_not_status battler, status1, param2 + .macro if_not_status battler:req, status1:req, param2:req .byte 0xa .byte \battler .4byte \status1 .4byte \param2 .endm - .macro if_status2 battler, status2, param2 + .macro if_status2 battler:req, status2:req, param2:req .byte 0xb .byte \battler .4byte \status2 .4byte \param2 .endm - .macro if_not_status2 battler, status2, param2 + .macro if_not_status2 battler:req, status2:req, param2:req .byte 0xc .byte \battler .4byte \status2 .4byte \param2 .endm - .macro if_status3 battler, status3, param2 + .macro if_status3 battler:req, status3:req, param2:req .byte 0xd .byte \battler .4byte \status3 .4byte \param2 .endm - .macro if_not_status3 battler, status3, param2 + .macro if_not_status3 battler:req, status3:req, param2:req .byte 0xe .byte \battler .4byte \status3 .4byte \param2 .endm - .macro if_side_affecting battler, sidestatus, param2 + .macro if_side_affecting battler:req, sidestatus:req, param2:req .byte 0xf .byte \battler .4byte \sidestatus .4byte \param2 .endm - .macro if_not_side_affecting battler, sidestatus, param2 + .macro if_not_side_affecting battler:req, sidestatus:req, param2:req .byte 0x10 .byte \battler .4byte \sidestatus .4byte \param2 .endm - .macro if_less_than param0, param1 + .macro if_less_than param0:req, param1:req .byte 0x11 .byte \param0 .4byte \param1 .endm - .macro if_more_than param0, param1 + .macro if_more_than param0:req, param1:req .byte 0x12 .byte \param0 .4byte \param1 .endm - .macro if_equal param0, param1 + .macro if_equal param0:req, param1:req .byte 0x13 .byte \param0 .4byte \param1 .endm - .macro if_not_equal param0, param1 + .macro if_not_equal param0:req, param1:req .byte 0x14 .byte \param0 .4byte \param1 .endm - .macro if_less_than_ptr param0, param1 + .macro if_less_than_ptr param0:req, param1:req .byte 0x15 .4byte \param0 .4byte \param1 .endm - .macro if_more_than_ptr param0, param1 + .macro if_more_than_ptr param0:req, param1:req .byte 0x16 .4byte \param0 .4byte \param1 .endm - .macro if_equal_ptr param0, param1 + .macro if_equal_ptr param0:req, param1:req .byte 0x17 .4byte \param0 .4byte \param1 .endm - .macro if_not_equal_ptr param0, param1 + .macro if_not_equal_ptr param0:req, param1:req .byte 0x18 .4byte \param0 .4byte \param1 .endm - .macro if_move param0, param1 + .macro if_move param0:req, param1:req .byte 0x19 .2byte \param0 .4byte \param1 .endm - .macro if_not_move param0, param1 + .macro if_not_move param0:req, param1:req .byte 0x1a .2byte \param0 .4byte \param1 .endm - .macro if_in_bytes param0, param1 + .macro if_in_bytes param0:req, param1:req .byte 0x1b .4byte \param0 .4byte \param1 .endm - .macro if_not_in_bytes param0, param1 + .macro if_not_in_bytes param0:req, param1:req .byte 0x1c .4byte \param0 .4byte \param1 .endm - .macro if_in_hwords param0, param1 + .macro if_in_hwords param0:req, param1:req .byte 0x1d .4byte \param0 .4byte \param1 .endm - .macro if_not_in_hwords param0, param1 + .macro if_not_in_hwords param0:req, param1:req .byte 0x1e .4byte \param0 .4byte \param1 .endm - .macro if_user_has_attacking_move param0 + .macro if_user_has_attacking_move param0:req .byte 0x1f .4byte \param0 .endm - .macro if_user_has_no_attacking_moves param0 + .macro if_user_has_no_attacking_moves param0:req .byte 0x20 .4byte \param0 .endm @@ -209,7 +209,7 @@ .byte 0x21 .endm - .macro get_type param0 + .macro get_type param0:req .byte 0x22 .byte \param0 .endm @@ -222,30 +222,30 @@ .byte 0x24 .endm - .macro get_last_used_bank_move battler + .macro get_last_used_bank_move battler:req .byte 0x25 .byte \battler .endm - .macro if_equal_ param0, param1 + .macro if_equal_ param0:req, param1:req .byte 0x26 .byte \param0 .4byte \param1 .endm - .macro if_not_equal_ param0, param1 + .macro if_not_equal_ param0:req, param1:req .byte 0x27 .byte \param0 .4byte \param1 .endm - .macro if_user_goes param0, param1 + .macro if_user_goes param0:req, param1:req .byte 0x28 .byte \param0 .4byte \param1 .endm - .macro if_user_doesnt_go param0, param1 + .macro if_user_doesnt_go param0:req, param1:req .byte 0x29 .byte \param0 .4byte \param1 @@ -259,7 +259,7 @@ .byte 0x2b .endm - .macro count_usable_party_mons battler + .macro count_usable_party_mons battler:req .byte 0x2c .byte \battler .endm @@ -272,7 +272,7 @@ .byte 0x2e .endm - .macro get_ability battler + .macro get_ability battler:req .byte 0x2f .byte \battler .endm @@ -281,7 +281,7 @@ .byte 0x30 .endm - .macro if_type_effectiveness param0, param1 + .macro if_type_effectiveness param0:req, param1:req .byte 0x31 .byte \param0 .4byte \param1 @@ -295,14 +295,14 @@ .byte 0x33 .endm - .macro if_status_in_party battler, status1, param2 + .macro if_status_in_party battler:req, status1:req, param2:req .byte 0x34 .byte \battler .4byte \status1 .4byte \param2 .endm - .macro if_status_not_in_party battler, status1, param2 + .macro if_status_not_in_party battler:req, status1:req, param2:req .byte 0x35 .byte \battler .4byte \status1 @@ -313,19 +313,19 @@ .byte 0x36 .endm - .macro if_effect param0, param1 + .macro if_effect param0:req, param1:req .byte 0x37 .byte \param0 .4byte \param1 .endm - .macro if_not_effect param0, param1 + .macro if_not_effect param0:req, param1:req .byte 0x38 .byte \param0 .4byte \param1 .endm - .macro if_stat_level_less_than battler, stat, param2, param3 + .macro if_stat_level_less_than battler:req, stat:req, param2:req, param3:req .byte 0x39 .byte \battler .byte \stat @@ -333,7 +333,7 @@ .4byte \param3 .endm - .macro if_stat_level_more_than battler, stat, param2, param3 + .macro if_stat_level_more_than battler:req, stat:req, param2:req, param3:req .byte 0x3a .byte \battler .byte \stat @@ -341,7 +341,7 @@ .4byte \param3 .endm - .macro if_stat_level_equal battler, stat, param2, param3 + .macro if_stat_level_equal battler:req, stat:req, param2:req, param3:req .byte 0x3b .byte \battler .byte \stat @@ -349,7 +349,7 @@ .4byte \param3 .endm - .macro if_stat_level_not_equal battler, stat, param2, param3 + .macro if_stat_level_not_equal battler:req, stat:req, param2:req, param3:req .byte 0x3c .byte \battler .byte \stat @@ -357,52 +357,52 @@ .4byte \param3 .endm - .macro if_can_faint param0 + .macro if_can_faint param0:req .byte 0x3d .4byte \param0 .endm - .macro if_cant_faint param0 + .macro if_cant_faint param0:req .byte 0x3e .4byte \param0 .endm - .macro if_has_move battler, param1, param2 + .macro if_has_move battler:req, param1:req, param2:req .byte 0x3f .byte \battler .2byte \param1 .4byte \param2 .endm - .macro if_doesnt_have_move battler, param1, param2 + .macro if_doesnt_have_move battler:req, param1:req, param2:req .byte 0x40 .byte \battler .2byte \param1 .4byte \param2 .endm - .macro if_has_move_with_effect battler, param1, param2 + .macro if_has_move_with_effect battler:req, param1:req, param2:req .byte 0x41 .byte \battler .byte \param1 .4byte \param2 .endm - .macro if_doesnt_have_move_with_effect battler, param1, param2 + .macro if_doesnt_have_move_with_effect battler:req, param1:req, param2:req .byte 0x42 .byte \battler .byte \param1 .4byte \param2 .endm - .macro if_any_move_disabled_or_encored battler, param1, param2 + .macro if_any_move_disabled_or_encored battler:req, param1:req, param2:req .byte 0x43 .byte \battler .byte \param1 .4byte \param2 .endm - .macro if_curr_move_disabled_or_encored param0, param1 + .macro if_curr_move_disabled_or_encored param0:req, param1:req .byte 0x44 .byte \param0 .4byte \param1 @@ -412,7 +412,7 @@ .byte 0x45 .endm - .macro if_random_safari_flee param0 + .macro if_random_safari_flee param0:req .byte 0x46 .4byte \param0 .endm @@ -421,22 +421,22 @@ .byte 0x47 .endm - .macro get_hold_effect battler + .macro get_hold_effect battler:req .byte 0x48 .byte \battler .endm - .macro get_gender battler + .macro get_gender battler:req .byte 0x49 .byte \battler .endm - .macro is_first_turn_for battler + .macro is_first_turn_for battler:req .byte 0x4a .byte \battler .endm - .macro get_stockpile_count battler + .macro get_stockpile_count battler:req .byte 0x4b .byte \battler .endm @@ -445,7 +445,7 @@ .byte 0x4c .endm - .macro get_used_held_item battler + .macro get_used_held_item battler:req .byte 0x4d .byte \battler .endm @@ -462,7 +462,7 @@ .byte 0x50 .endm - .macro get_protect_count battler + .macro get_protect_count battler:req .byte 0x51 .byte \battler .endm @@ -491,12 +491,12 @@ .byte 0x57 .endm - .macro call param0 + .macro call param0:req .byte 0x58 .4byte \param0 .endm - .macro goto param0 + .macro goto param0:req .byte 0x59 .4byte \param0 .endm @@ -505,46 +505,46 @@ .byte 0x5a .endm - .macro if_level_cond param0, param1 + .macro if_level_cond param0:req, param1:req .byte 0x5b .byte \param0 .4byte \param1 .endm - .macro if_target_taunted param0 + .macro if_target_taunted param0:req .byte 0x5c .4byte \param0 .endm - .macro if_target_not_taunted param0 + .macro if_target_not_taunted param0:req .byte 0x5d .4byte \param0 .endm - .macro if_target_is_ally param0 + .macro if_target_is_ally param0:req .byte 0x5e .4byte \param0 .endm - .macro is_of_type battler, type + .macro is_of_type battler:req, type:req .byte 0x5f .byte \battler .byte \type .endm - .macro check_ability battler, ability + .macro check_ability battler:req, ability:req .byte 0x60 .byte \battler .byte \ability .endm - .macro if_flash_fired battler, param1 + .macro if_flash_fired battler:req, param1:req .byte 0x61 .byte \battler .4byte \param1 .endm - .macro if_holds_item battler, param1, param2 + .macro if_holds_item battler:req, param1:req, param2:req .byte 0x62 .byte \battler .2byte \param1 @@ -572,48 +572,48 @@ get_type AI_TYPE2_TARGET .endm - .macro if_ability battler, ability, ptr + .macro if_ability battler:req, ability:req, ptr:req check_ability \battler, \ability if_equal 1, \ptr .endm - .macro if_no_ability battler, ability, ptr + .macro if_no_ability battler:req, ability:req, ptr:req check_ability \battler, \ability if_equal 0, \ptr .endm - .macro if_type battler, type, ptr + .macro if_type battler:req, type:req, ptr:req is_of_type \battler, \type if_equal 1, \ptr .endm - .macro if_no_type battler, type, ptr + .macro if_no_type battler:req, type:req, ptr:req is_of_type \battler, \type if_equal 0, \ptr .endm - .macro if_target_faster ptr + .macro if_target_faster ptr:req if_user_goes 1, \ptr .endm - .macro if_user_faster ptr + .macro if_user_faster ptr:req if_user_goes 0, \ptr .endm - .macro if_double_battle ptr + .macro if_double_battle ptr:req is_double_battle if_equal 1, \ptr .endm - .macro if_not_double_battle ptr + .macro if_not_double_battle ptr:req is_double_battle if_equal 0, \ptr .endm - .macro if_any_move_disabled battler, ptr + .macro if_any_move_disabled battler:req, ptr:req if_any_move_disabled_or_encored \battler, 0, \ptr .endm - .macro if_any_move_encored battler, ptr + .macro if_any_move_encored battler:req, ptr:req if_any_move_disabled_or_encored \battler, 1, \ptr .endm diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index ab27bc23d..6ccd8d505 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -1,16 +1,16 @@ @ commands - .macro loadspritegfx param0 + .macro loadspritegfx tag:req .byte 0x0 - .2byte \param0 + .2byte \tag .endm - .macro unloadspritegfx param0 + .macro unloadspritegfx tag:req .byte 0x1 - .2byte \param0 + .2byte \tag .endm -.macro createsprite template, anim_battler, subpriority_offset, argv:vararg +.macro createsprite template:req, anim_battler:req, subpriority_offset:req, argv:vararg .byte 0x02 .4byte \template .if \anim_battler == ANIM_TARGET @@ -24,7 +24,7 @@ .Lsprite_\@_2: .endm - .macro createvisualtask addr, priority, argv:vararg + .macro createvisualtask addr:req, priority:req, argv:vararg .byte 0x03 .4byte \addr .byte \priority @@ -34,7 +34,7 @@ .Lcreatetask_\@_2: .endm - .macro delay param0 + .macro delay param0:req .byte 0x4 .byte \param0 .endm @@ -55,22 +55,22 @@ .byte 0x8 .endm - .macro playse param0 + .macro playse se:req .byte 0x9 - .2byte \param0 + .2byte \se .endm - .macro monbg battler + .macro monbg battler:req .byte 0xa .byte \battler .endm - .macro clearmonbg battler + .macro clearmonbg battler:req .byte 0xb .byte \battler .endm - .macro setalpha eva, evb + .macro setalpha eva:req, evb:req .byte 0x0C .2byte ((\evb) << 8) | (\eva) .endm @@ -79,7 +79,7 @@ .byte 0xd .endm - .macro call param0 + .macro call param0:req .byte 0xe .4byte \param0 .endm @@ -88,32 +88,32 @@ .byte 0xf .endm - .macro setarg param0, param1 + .macro setarg param0:req, param1:req .byte 0x10 .byte \param0 .2byte \param1 .endm - .macro choosetwoturnanim param0, param1 + .macro choosetwoturnanim param0:req, param1:req .byte 0x11 .4byte \param0 .4byte \param1 .endm - .macro jumpifmoveturn param0, param1 + .macro jumpifmoveturn param0:req, ptr:req .byte 0x12 .byte \param0 - .4byte \param1 + .4byte \ptr .endm - .macro goto param0 + .macro goto ptr:req .byte 0x13 - .4byte \param0 + .4byte \ptr .endm - .macro fadetobg param0 + .macro fadetobg bg:req .byte 0x14 - .byte \param0 + .byte \bg .endm .macro restorebg @@ -128,52 +128,52 @@ .byte 0x17 .endm - .macro changebg param0 + .macro changebg bg:req .byte 0x18 - .byte \param0 + .byte \bg .endm - .macro playsewithpan param0, param1 + .macro playsewithpan se:req, pan:req .byte 0x19 - .2byte \param0 - .byte \param1 + .2byte \se + .byte \pan .endm - .macro setpan param0 + .macro setpan pan:req .byte 0x1a - .byte \param0 + .byte \pan .endm - .macro panse_1B param0, param1, param2, param3, param4 + .macro panse_1B se:req, param1:req, param2:req, param3:req, param4 .byte 0x1b - .2byte \param0 + .2byte \se .byte \param1 .byte \param2 .byte \param3 .byte \param4 .endm - .macro loopsewithpan param0, param1, param2, param3 + .macro loopsewithpan se:req, param1:req, param2:req, param3:req .byte 0x1c - .2byte \param0 + .2byte \se .byte \param1 .byte \param2 .byte \param3 .endm - .macro waitplaysewithpan param0, param1, param2 + .macro waitplaysewithpan se:req, param1:req, param2:req .byte 0x1d - .2byte \param0 + .2byte \se .byte \param1 .byte \param2 .endm - .macro setbldcnt param0 + .macro setbldcnt param0:req .byte 0x1e .2byte \param0 .endm - .macro createsoundtask addr, argv:vararg + .macro createsoundtask addr:req, argv:vararg .byte 0x1F .4byte \addr .byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2 @@ -186,54 +186,54 @@ .byte 0x20 .endm - .macro jumpargeq param0, param1, param2 + .macro jumpargeq param0:req, param1:req, ptr:req .byte 0x21 .byte \param0 .2byte \param1 - .4byte \param2 + .4byte \ptr .endm - .macro monbg_22 battler + .macro monbg_22 battler:req .byte 0x22 .byte \battler .endm - .macro clearmonbg_23 battler + .macro clearmonbg_23 battler:req .byte 0x23 .byte \battler .endm - .macro jumpifcontest param0 + .macro jumpifcontest ptr:req .byte 0x24 - .4byte \param0 + .4byte \ptr .endm - .macro fadetobgfromset param0, param1, param2 + .macro fadetobgfromset param0:req, param1:req, param2:req .byte 0x25 .byte \param0 .byte \param1 .byte \param2 .endm - .macro panse_26 param0, param1, param2, param3, param4 + .macro panse_26 se:req, param1:req, param2:req, param3:req, param4 .byte 0x26 - .2byte \param0 + .2byte \se .byte \param1 .byte \param2 .byte \param3 .byte \param4 .endm - .macro panse_27 param0, param1, param2, param3, param4 + .macro panse_27 se:req, param1:req, param2:req, param3:req, param4 .byte 0x27 - .2byte \param0 + .2byte \se .byte \param1 .byte \param2 .byte \param3 .byte \param4 .endm - .macro monbgprio_28 battler + .macro monbgprio_28 battler:req .byte 0x28 .byte \battler .endm @@ -242,27 +242,27 @@ .byte 0x29 .endm - .macro monbgprio_2A battler + .macro monbgprio_2A battler:req .byte 0x2a .byte \battler .endm - .macro invisible battler + .macro invisible battler:req .byte 0x2b .byte \battler .endm - .macro visible battler + .macro visible battler:req .byte 0x2c .byte \battler .endm - .macro doublebattle_2D battler + .macro doublebattle_2D battler:req .byte 0x2d .byte \battler .endm - .macro doublebattle_2E battler + .macro doublebattle_2E battler:req .byte 0x2e .byte \battler .endm @@ -272,14 +272,14 @@ .endm @ useful macros - .macro jumpreteq value, ptr + .macro jumpreteq value:req, ptr:req jumpargeq ARG_RET_ID, \value, \ptr .endm - .macro jumprettrue ptr + .macro jumprettrue ptr:req jumpreteq TRUE, \ptr .endm - .macro jumpretfalse ptr + .macro jumpretfalse ptr:req jumpreteq FALSE, \ptr .endm diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 8ab0f3ce5..6b0e285b6 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -3,7 +3,7 @@ .byte 0x0 .endm - .macro accuracycheck param0, param1 + .macro accuracycheck param0:req, param1:req .byte 0x1 .4byte \param0 .2byte \param1 @@ -45,12 +45,12 @@ .byte 0xa .endm - .macro healthbarupdate battler + .macro healthbarupdate battler:req .byte 0xb .byte \battler .endm - .macro datahpupdate battler + .macro datahpupdate battler:req .byte 0xc .byte \battler .endm @@ -67,29 +67,29 @@ .byte 0xf .endm - .macro printstring param0 + .macro printstring id:req .byte 0x10 - .2byte \param0 + .2byte \id .endm - .macro printselectionstring param0 + .macro printselectionstring id:req .byte 0x11 - .2byte \param0 + .2byte \id .endm - .macro waitmessage param0 + .macro waitmessage param0:req .byte 0x12 .2byte \param0 .endm - .macro printfromtable param0 + .macro printfromtable ptr:req .byte 0x13 - .4byte \param0 + .4byte \ptr .endm - .macro printselectionstringfromtable param0 + .macro printselectionstringfromtable ptr:req .byte 0x14 - .4byte \param0 + .4byte \ptr .endm .macro seteffectwithchance @@ -104,110 +104,110 @@ .byte 0x17 .endm - .macro clearstatusfromeffect battler + .macro clearstatusfromeffect battler:req .byte 0x18 .byte \battler .endm - .macro tryfaintmon battler, param1, param2 + .macro tryfaintmon battler:req, param1:req, ptr:req .byte 0x19 .byte \battler .byte \param1 - .4byte \param2 + .4byte \ptr .endm - .macro dofaintanimation battler + .macro dofaintanimation battler:req .byte 0x1a .byte \battler .endm - .macro cleareffectsonfaint battler + .macro cleareffectsonfaint battler:req .byte 0x1b .byte \battler .endm - .macro jumpifstatus battler, status1, param2 + .macro jumpifstatus battler:req, status1:req, ptr:req .byte 0x1c .byte \battler .4byte \status1 - .4byte \param2 + .4byte \ptr .endm - .macro jumpifstatus2 battler, status2, param2 + .macro jumpifstatus2 battler:req, status2:req, ptr:req .byte 0x1d .byte \battler .4byte \status2 - .4byte \param2 + .4byte \ptr .endm - .macro jumpifability param0, ability, param2 + .macro jumpifability param0:req, ability:req, ptr:req .byte 0x1e .byte \param0 .byte \ability - .4byte \param2 + .4byte \ptr .endm - .macro jumpifsideaffecting battler, sidestatus, param2 + .macro jumpifsideaffecting battler:req, sidestatus:req, ptr:req .byte 0x1f .byte \battler .2byte \sidestatus - .4byte \param2 + .4byte \ptr .endm - .macro jumpifstat battler, ifflag, stat, param3, param4 + .macro jumpifstat battler:req, ifflag:req, stat:req, value:req, ptr .byte 0x20 .byte \battler .byte \ifflag .byte \stat - .byte \param3 - .4byte \param4 + .byte \value + .4byte \ptr .endm - .macro jumpifstatus3condition battler, status3, param2, param3 + .macro jumpifstatus3condition battler:req, status3:req, param2:req, ptr:req .byte 0x21 .byte \battler .4byte \status3 .byte \param2 - .4byte \param3 + .4byte \ptr .endm - .macro jumpiftype battler, type, param2 + .macro jumpiftype battler:req, type:req, ptr:req .byte 0x22 .byte \battler .byte \type - .4byte \param2 + .4byte \ptr .endm - .macro getexp battler + .macro getexp battler:req .byte 0x23 .byte \battler .endm - .macro atk24 param0 + .macro atk24 ptr:req .byte 0x24 - .4byte \param0 + .4byte \ptr .endm .macro movevaluescleanup .byte 0x25 .endm - .macro setmultihit param0 + .macro setmultihit value:req .byte 0x26 - .byte \param0 + .byte \value .endm - .macro decrementmultihit param0 + .macro decrementmultihit value:req .byte 0x27 - .4byte \param0 + .4byte \value .endm - .macro goto param0 + .macro goto ptr:req .byte 0x28 - .4byte \param0 + .4byte \ptr .endm - .macro jumpifbyte ifflag, param1, param2, param3 + .macro jumpifbyte ifflag:req, param1:req, param2:req, param3:req .byte 0x29 .byte \ifflag .4byte \param1 @@ -215,7 +215,7 @@ .4byte \param3 .endm - .macro jumpifhalfword ifflag, param1, param2, param3 + .macro jumpifhalfword ifflag:req, param1:req, param2:req, param3:req .byte 0x2a .byte \ifflag .4byte \param1 @@ -223,7 +223,7 @@ .4byte \param3 .endm - .macro jumpifword ifflag, param1, param2, param3 + .macro jumpifword ifflag:req, param1:req, param2:req, param3:req .byte 0x2b .byte \ifflag .4byte \param1 @@ -231,7 +231,7 @@ .4byte \param3 .endm - .macro jumpifarrayequal param0, param1, param2, param3 + .macro jumpifarrayequal param0:req, param1:req, param2:req, param3:req .byte 0x2c .4byte \param0 .4byte \param1 @@ -239,7 +239,7 @@ .4byte \param3 .endm - .macro jumpifarraynotequal param0, param1, param2, param3 + .macro jumpifarraynotequal param0:req, param1:req, param2:req, param3:req .byte 0x2d .4byte \param0 .4byte \param1 @@ -247,32 +247,32 @@ .4byte \param3 .endm - .macro setbyte param0, param1 + .macro setbyte ptr:req, param1:req .byte 0x2e - .4byte \param0 + .4byte \ptr .byte \param1 .endm - .macro addbyte param0, param1 + .macro addbyte ptr:req, param1:req .byte 0x2f - .4byte \param0 + .4byte \ptr .byte \param1 .endm - .macro subbyte param0, param1 + .macro subbyte ptr:req, param1:req .byte 0x30 - .4byte \param0 + .4byte \ptr .byte \param1 .endm - .macro copyarray param0, param1, param2 + .macro copyarray param0:req, param1:req, param2:req .byte 0x31 .4byte \param0 .4byte \param1 .byte \param2 .endm - .macro copyarraywithindex param0, param1, param2, param3 + .macro copyarraywithindex param0:req, param1:req, param2:req, param3:req .byte 0x32 .4byte \param0 .4byte \param1 @@ -280,43 +280,43 @@ .byte \param3 .endm - .macro orbyte param0, param1 + .macro orbyte ptr:req, param1:req .byte 0x33 - .4byte \param0 + .4byte \ptr .byte \param1 .endm - .macro orhalfword param0, param1 + .macro orhalfword ptr:req, param1:req .byte 0x34 - .4byte \param0 + .4byte \ptr .2byte \param1 .endm - .macro orword param0, param1 + .macro orword ptr:req, param1:req .byte 0x35 - .4byte \param0 + .4byte \ptr .4byte \param1 .endm - .macro bicbyte param0, param1 + .macro bicbyte ptr:req, param1:req .byte 0x36 - .4byte \param0 + .4byte \ptr .byte \param1 .endm - .macro bichalfword param0, param1 + .macro bichalfword ptr:req, param1:req .byte 0x37 - .4byte \param0 + .4byte \ptr .2byte \param1 .endm - .macro bicword param0, param1 + .macro bicword ptr:req, param1:req .byte 0x38 - .4byte \param0 + .4byte \ptr .4byte \param1 .endm - .macro pause param0 + .macro pause param0:req .byte 0x39 .2byte \param0 .endm @@ -325,7 +325,7 @@ .byte 0x3a .endm - .macro healthbar_update battler + .macro healthbar_update battler:req .byte 0x3b .byte \battler .endm @@ -346,41 +346,41 @@ .byte 0x3f .endm - .macro jumpifaffectedbyprotect param0 + .macro jumpifaffectedbyprotect ptr:req .byte 0x40 - .4byte \param0 + .4byte \ptr .endm - .macro call param0 + .macro call ptr:req .byte 0x41 - .4byte \param0 + .4byte \ptr .endm - .macro jumpiftype2 battler, type, param2 + .macro jumpiftype2 battler:req, type:req, ptr:req .byte 0x42 .byte \battler .byte \type - .4byte \param2 + .4byte \ptr .endm - .macro jumpifabilitypresent ability, param1 + .macro jumpifabilitypresent ability:req, ptr:req .byte 0x43 .byte \ability - .4byte \param1 + .4byte \ptr .endm .macro endselectionscript .byte 0x44 .endm - .macro playanimation battler, param1, param2 + .macro playanimation battler:req, param1:req, param2:req .byte 0x45 .byte \battler .byte \param1 .4byte \param2 .endm - .macro playanimation2 battler, param1, param2 + .macro playanimation2 battler:req, param1:req, param2:req .byte 0x46 .byte \battler .4byte \param1 @@ -391,14 +391,14 @@ .byte 0x47 .endm - .macro playstatchangeanimation battler, param1, param2 + .macro playstatchangeanimation battler:req, param1:req, param2:req .byte 0x48 .byte \battler .byte \param1 .byte \param2 .endm - .macro moveend param0, param1 + .macro moveend param0:req, param1:req .byte 0x49 .byte \param0 .byte \param1 @@ -412,61 +412,61 @@ .byte 0x4b .endm - .macro getswitchedmondata battler + .macro getswitchedmondata battler:req .byte 0x4c .byte \battler .endm - .macro switchindataupdate battler + .macro switchindataupdate battler:req .byte 0x4d .byte \battler .endm - .macro switchinanim battler, dontclearsubstitutebit + .macro switchinanim battler:req, dontclearsubstitutebit:req .byte 0x4e .byte \battler .byte \dontclearsubstitutebit .endm - .macro jumpifcantswitch battler, param1 + .macro jumpifcantswitch battler:req, ptr:req .byte 0x4f .byte \battler - .4byte \param1 + .4byte \ptr .endm - .macro openpartyscreen param0, param1 + .macro openpartyscreen param0:req, param1:req .byte 0x50 .byte \param0 .4byte \param1 .endm - .macro switchhandleorder battler, param1 + .macro switchhandleorder battler:req, param1:req .byte 0x51 .byte \battler .byte \param1 .endm - .macro switchineffects battler + .macro switchineffects battler:req .byte 0x52 .byte \battler .endm - .macro trainerslidein battler + .macro trainerslidein battler:req .byte 0x53 .byte \battler .endm - .macro playse param0 + .macro playse param0:req .byte 0x54 .2byte \param0 .endm - .macro fanfare param0 + .macro fanfare param0:req .byte 0x55 .2byte \param0 .endm - .macro playfaintcry battler + .macro playfaintcry battler:req .byte 0x56 .byte \battler .endm @@ -475,29 +475,29 @@ .byte 0x57 .endm - .macro returntoball battler + .macro returntoball battler:req .byte 0x58 .byte \battler .endm - .macro handlelearnnewmove param0, param1, param2 + .macro handlelearnnewmove param0:req, param1:req, param2:req .byte 0x59 .4byte \param0 .4byte \param1 .byte \param2 .endm - .macro yesnoboxlearnmove param0 + .macro yesnoboxlearnmove param0:req .byte 0x5a .4byte \param0 .endm - .macro yesnoboxstoplearningmove param0 + .macro yesnoboxstoplearningmove param0:req .byte 0x5b .4byte \param0 .endm - .macro hitanimation battler + .macro hitanimation battler:req .byte 0x5c .byte \battler .endm @@ -506,7 +506,7 @@ .byte 0x5d .endm - .macro atk5E battler + .macro atk5E battler:req .byte 0x5e .byte \battler .endm @@ -515,38 +515,38 @@ .byte 0x5f .endm - .macro incrementgamestat param0 + .macro incrementgamestat param0:req .byte 0x60 .byte \param0 .endm - .macro drawpartystatussummary battler + .macro drawpartystatussummary battler:req .byte 0x61 .byte \battler .endm - .macro hidepartystatussummary battler + .macro hidepartystatussummary battler:req .byte 0x62 .byte \battler .endm - .macro jumptocalledmove param0 + .macro jumptocalledmove param0:req .byte 0x63 .byte \param0 .endm - .macro statusanimation battler + .macro statusanimation battler:req .byte 0x64 .byte \battler .endm - .macro status2animation battler, status2 + .macro status2animation battler:req, status2:req .byte 0x65 .byte \battler .4byte \status2 .endm - .macro chosenstatusanimation battler, param1, param2 + .macro chosenstatusanimation battler:req, param1:req, param2:req .byte 0x66 .byte \battler .byte \param1 @@ -565,7 +565,7 @@ .byte 0x69 .endm - .macro removeitem battler + .macro removeitem battler:req .byte 0x6a .byte \battler .endm @@ -586,12 +586,12 @@ .byte 0x6e .endm - .macro makevisible battler + .macro makevisible battler:req .byte 0x6f .byte \battler .endm - .macro recordlastability battler + .macro recordlastability battler:req .byte 0x70 .byte \battler .endm @@ -600,17 +600,17 @@ .byte 0x71 .endm - .macro jumpifplayerran param0 + .macro jumpifplayerran ptr:req .byte 0x72 - .4byte \param0 + .4byte \ptr .endm - .macro hpthresholds battler + .macro hpthresholds battler:req .byte 0x73 .byte \battler .endm - .macro hpthresholds2 battler + .macro hpthresholds2 battler:req .byte 0x74 .byte \battler .endm @@ -619,7 +619,7 @@ .byte 0x75 .endm - .macro various battler, param1 + .macro various battler:req, param1:req .byte 0x76 .byte \battler .byte \param1 @@ -637,12 +637,12 @@ .byte 0x79 .endm - .macro jumpifnexttargetvalid param0 + .macro jumpifnexttargetvalid ptr:req .byte 0x7a - .4byte \param0 + .4byte \ptr .endm - .macro tryhealhalfhealth param0, battler + .macro tryhealhalfhealth param0:req, battler:req .byte 0x7b .4byte \param0 .byte \battler @@ -664,26 +664,26 @@ .byte 0x7f .endm - .macro manipulatedamage param0 + .macro manipulatedamage param0:req .byte 0x80 .byte \param0 .endm - .macro trysetrest param0 + .macro trysetrest param0:req .byte 0x81 .4byte \param0 .endm - .macro jumpifnotfirstturn param0 + .macro jumpifnotfirstturn ptr:req .byte 0x82 - .4byte \param0 + .4byte \ptr .endm .macro nop .byte 0x83 .endm - .macro jumpifcantmakeasleep param0 + .macro jumpifcantmakeasleep param0:req .byte 0x84 .4byte \param0 .endm @@ -692,12 +692,12 @@ .byte 0x85 .endm - .macro stockpiletobasedamage param0 + .macro stockpiletobasedamage param0:req .byte 0x86 .4byte \param0 .endm - .macro stockpiletohpheal param0 + .macro stockpiletohpheal param0:req .byte 0x87 .4byte \param0 .endm @@ -706,7 +706,7 @@ .byte 0x88 .endm - .macro statbuffchange param0, param1 + .macro statbuffchange param0:req, param1:req .byte 0x89 .byte \param0 .4byte \param1 @@ -724,7 +724,7 @@ .byte 0x8c .endm - .macro setmultihitcounter param0 + .macro setmultihitcounter param0:req .byte 0x8d .byte \param0 .endm @@ -733,12 +733,12 @@ .byte 0x8e .endm - .macro forcerandomswitch param0 + .macro forcerandomswitch param0:req .byte 0x8f .4byte \param0 .endm - .macro tryconversiontypechange param0 + .macro tryconversiontypechange param0:req .byte 0x90 .4byte \param0 .endm @@ -751,7 +751,7 @@ .byte 0x92 .endm - .macro tryKO param0 + .macro tryKO param0:req .byte 0x93 .4byte \param0 .endm @@ -768,12 +768,12 @@ .byte 0x96 .endm - .macro tryinfatuating param0 + .macro tryinfatuating param0:req .byte 0x97 .4byte \param0 .endm - .macro updatestatusicon battler + .macro updatestatusicon battler:req .byte 0x98 .byte \battler .endm @@ -794,7 +794,7 @@ .byte 0x9c .endm - .macro mimicattackcopy param0 + .macro mimicattackcopy param0:req .byte 0x9d .4byte \param0 .endm @@ -811,32 +811,32 @@ .byte 0xa0 .endm - .macro counterdamagecalculator param0 + .macro counterdamagecalculator param0:req .byte 0xa1 .4byte \param0 .endm - .macro mirrorcoatdamagecalculator param0 + .macro mirrorcoatdamagecalculator param0:req .byte 0xa2 .4byte \param0 .endm - .macro disablelastusedattack param0 + .macro disablelastusedattack param0:req .byte 0xa3 .4byte \param0 .endm - .macro trysetencore param0 + .macro trysetencore param0:req .byte 0xa4 .4byte \param0 .endm - .macro painsplitdmgcalc param0 + .macro painsplitdmgcalc param0:req .byte 0xa5 .4byte \param0 .endm - .macro settypetorandomresistance param0 + .macro settypetorandomresistance param0:req .byte 0xa6 .4byte \param0 .endm @@ -845,12 +845,12 @@ .byte 0xa7 .endm - .macro copymovepermanently param0 + .macro copymovepermanently param0:req .byte 0xa8 .4byte \param0 .endm - .macro trychoosesleeptalkmove param0 + .macro trychoosesleeptalkmove param0:req .byte 0xa9 .4byte \param0 .endm @@ -867,7 +867,7 @@ .byte 0xac .endm - .macro tryspiteppreduce param0 + .macro tryspiteppreduce param0:req .byte 0xad .4byte \param0 .endm @@ -876,12 +876,12 @@ .byte 0xae .endm - .macro cursetarget param0 + .macro cursetarget param0:req .byte 0xaf .4byte \param0 .endm - .macro trysetspikes param0 + .macro trysetspikes param0:req .byte 0xb0 .4byte \param0 .endm @@ -890,7 +890,7 @@ .byte 0xb1 .endm - .macro trysetperishsong param0 + .macro trysetperishsong param0:req .byte 0xb2 .4byte \param0 .endm @@ -899,10 +899,10 @@ .byte 0xb3 .endm - .macro jumpifconfusedandstatmaxed stat, param1 + .macro jumpifconfusedandstatmaxed stat:req, ptr:req .byte 0xb4 .byte \stat - .4byte \param1 + .4byte \ptr .endm .macro furycuttercalc @@ -925,7 +925,7 @@ .byte 0xb9 .endm - .macro jumpifnopursuitswitchdmg param0 + .macro jumpifnopursuitswitchdmg param0:req .byte 0xba .4byte \param0 .endm @@ -934,12 +934,12 @@ .byte 0xbb .endm - .macro maxattackhalvehp param0 + .macro maxattackhalvehp param0:req .byte 0xbc .4byte \param0 .endm - .macro copyfoestats param0 + .macro copyfoestats param0:req .byte 0xbd .4byte \param0 .endm @@ -952,7 +952,7 @@ .byte 0xbf .endm - .macro recoverbasedonsunlight param0 + .macro recoverbasedonsunlight param0:req .byte 0xc0 .4byte \param0 .endm @@ -965,12 +965,12 @@ .byte 0xc2 .endm - .macro trysetfutureattack param0 + .macro trysetfutureattack param0:req .byte 0xc3 .4byte \param0 .endm - .macro trydobeatup param0, param1 + .macro trydobeatup param0:req, param1:req .byte 0xc4 .4byte \param0 .4byte \param1 @@ -992,9 +992,9 @@ .byte 0xc8 .endm - .macro jumpifattackandspecialattackcannotfall param0 + .macro jumpifattackandspecialattackcannotfall ptr:req .byte 0xc9 - .4byte \param0 + .4byte \ptr .endm .macro setforcedtarget @@ -1009,48 +1009,48 @@ .byte 0xcc .endm - .macro cureifburnedparalysedorpoisoned param0 + .macro cureifburnedparalysedorpoisoned param0:req .byte 0xcd .4byte \param0 .endm - .macro settorment param0 + .macro settorment param0:req .byte 0xce .4byte \param0 .endm - .macro jumpifnodamage param0 + .macro jumpifnodamage param0:req .byte 0xcf .4byte \param0 .endm - .macro settaunt param0 + .macro settaunt param0:req .byte 0xd0 .4byte \param0 .endm - .macro trysethelpinghand param0 + .macro trysethelpinghand param0:req .byte 0xd1 .4byte \param0 .endm - .macro tryswapitems param0 + .macro tryswapitems param0:req .byte 0xd2 .4byte \param0 .endm - .macro trycopyability param0 + .macro trycopyability param0:req .byte 0xd3 .4byte \param0 .endm - .macro trywish param0, param1 + .macro trywish param0:req, param1:req .byte 0xd4 .byte \param0 .4byte \param1 .endm - .macro trysetroots param0 + .macro trysetroots param0:req .byte 0xd5 .4byte \param0 .endm @@ -1059,12 +1059,12 @@ .byte 0xd6 .endm - .macro setyawn param0 + .macro setyawn param0:req .byte 0xd7 .4byte \param0 .endm - .macro setdamagetohealthdifference param0 + .macro setdamagetohealthdifference param0:req .byte 0xd8 .4byte \param0 .endm @@ -1073,17 +1073,17 @@ .byte 0xd9 .endm - .macro tryswapabilities param0 + .macro tryswapabilities param0:req .byte 0xda .4byte \param0 .endm - .macro tryimprision param0 + .macro tryimprision param0:req .byte 0xdb .4byte \param0 .endm - .macro trysetgrudge param0 + .macro trysetgrudge param0:req .byte 0xdc .4byte \param0 .endm @@ -1092,32 +1092,32 @@ .byte 0xdd .endm - .macro asistattackselect param0 + .macro asistattackselect param0:req .byte 0xde .4byte \param0 .endm - .macro trysetmagiccoat param0 + .macro trysetmagiccoat param0:req .byte 0xdf .4byte \param0 .endm - .macro trysetsnatch param0 + .macro trysetsnatch param0:req .byte 0xe0 .4byte \param0 .endm - .macro trygetintimidatetarget param0 + .macro trygetintimidatetarget param0:req .byte 0xe1 .4byte \param0 .endm - .macro switchoutabilities battler + .macro switchoutabilities battler:req .byte 0xe2 .byte \battler .endm - .macro jumpifhasnohp battler, param1 + .macro jumpifhasnohp battler:req, param1:req .byte 0xe3 .byte \battler .4byte \param1 @@ -1139,7 +1139,7 @@ .byte 0xe7 .endm - .macro settypebasedhalvers param0 + .macro settypebasedhalvers param0:req .byte 0xe8 .4byte \param0 .endm @@ -1148,17 +1148,17 @@ .byte 0xe9 .endm - .macro tryrecycleitem param0 + .macro tryrecycleitem param0:req .byte 0xea .4byte \param0 .endm - .macro settypetoterrain param0 + .macro settypetoterrain param0:req .byte 0xeb .4byte \param0 .endm - .macro pursuitrelated param0 + .macro pursuitrelated param0:req .byte 0xec .4byte \param0 .endm @@ -1179,7 +1179,7 @@ .byte 0xf0 .endm - .macro trysetcaughtmondexflags param0 + .macro trysetcaughtmondexflags param0:req .byte 0xf1 .4byte \param0 .endm @@ -1188,7 +1188,7 @@ .byte 0xf2 .endm - .macro trygivecaughtmonnick param0 + .macro trygivecaughtmonnick param0:req .byte 0xf3 .4byte \param0 .endm @@ -1209,45 +1209,45 @@ .byte 0xf7 .endm - .macro trainerslideout param0 + .macro trainerslideout param0:req .byte 0xf8 .byte \param0 .endm @ various command changed to more readable macros - .macro cancelmultiturnmoves battler + .macro cancelmultiturnmoves battler:req various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES .endm - .macro setmagiccoattarget battler + .macro setmagiccoattarget battler:req various \battler, VARIOUS_SET_MAGIC_COAT_TARGET .endm - .macro getifcantrunfrombattle battler + .macro getifcantrunfrombattle battler:req various \battler, VARIOUS_IS_RUNNING_IMPOSSIBLE .endm - .macro getmovetarget battler + .macro getmovetarget battler:req various \battler, VARIOUS_GET_MOVE_TARGET .endm - .macro various4 battler + .macro various4 battler:req various \battler, 4 .endm - .macro resetintrimidatetracebits battler + .macro resetintrimidatetracebits battler:req various \battler, VARIOUS_RESET_INTIMIDATE_TRACE_BITS .endm - .macro updatechoicemoveonlvlup battler + .macro updatechoicemoveonlvlup battler:req various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP .endm - .macro various7 battler + .macro various7 battler:req various \battler, 7 .endm - .macro various8 battler + .macro various8 battler:req various \battler, 8 .endm @@ -1267,35 +1267,35 @@ various BS_ATTACKER, VARIOUS_ARENA_BOTH_MONS_LOST .endm - .macro forfeityesnobox battler + .macro forfeityesnobox battler:req various \battler, VARIOUS_EMIT_YESNOBOX .endm - .macro various14 battler + .macro various14 battler:req various \battler, 14 .endm - .macro various15 battler + .macro various15 battler:req various \battler, 15 .endm - .macro arenajudmengtstring id + .macro arenajudmengtstring id:req various \id, VARIOUS_ARENA_JUDGMENT_STRING .endm - .macro arenawaitmessage id + .macro arenawaitmessage id:req various \id, VARIOUS_ARENA_WAIT_STRING .endm - .macro waitcry battler + .macro waitcry battler:req various \battler, VARIOUS_WAIT_CRY .endm - .macro returnopponentmon1toball battler + .macro returnopponentmon1toball battler:req various \battler, VARIOUS_RETURN_OPPONENT_MON1 .endm - .macro returnopponentmon2toball battler + .macro returnopponentmon2toball battler:req various \battler, VARIOUS_RETURN_OPPONENT_MON2 .endm @@ -1307,95 +1307,95 @@ various BS_ATTACKER, VARIOUS_VOLUME_UP .endm - .macro setalreadystatusedmoveattempt battler + .macro setalreadystatusedmoveattempt battler:req various \battler, 23 .endm - .macro various24 battler + .macro various24 battler:req various \battler, 24 .endm - .macro setoutcomeonteleport battler + .macro setoutcomeonteleport battler:req various \battler, VARIOUS_SET_TELEPORT_OUTCOME .endm - .macro playtrainerdefeatbgm battler + .macro playtrainerdefeatbgm battler:req various \battler, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC .endm @ helpful macros - .macro setstatchanger stat, stages, down + .macro setstatchanger stat:req, stages:req, down:req setbyte sSTATCHANGER \stat | \stages << 4 | \down << 7 .endm - .macro setmoveeffect effect + .macro setmoveeffect effect:req setbyte cEFFECT_CHOOSER \effect .endm - .macro chosenstatus1animation battler, status + .macro chosenstatus1animation battler:req, status:req chosenstatusanimation \battler 0x0 \status .endm - .macro chosenstatus2animation battler, status + .macro chosenstatus2animation battler:req, status:req chosenstatusanimation \battler 0x1 \status .endm - .macro sethword dst, value + .macro sethword dst:req, value:req setbyte \dst, \value & 0xFF setbyte \dst + 1, (\value >> 8) & 0xFF .endm - .macro setword dst, value + .macro setword dst:req, value:req setbyte \dst, \value & 0xFF setbyte \dst + 1, (\value >> 8) & 0xFF setbyte \dst + 2, (\value >> 16) & 0xFF setbyte \dst + 3, (\value >> 24) & 0xFF .endm - .macro copybyte dst, src + .macro copybyte dst:req, src:req copyarray \dst, \src, 0x1 .endm - .macro copyhword dst, src + .macro copyhword dst:req, src:req copyarray \dst, \src, 0x2 .endm - .macro copyword dst, src + .macro copyword dst:req, src:req copyarray \dst, \src, 0x4 .endm - .macro jumpifbytenotequal byte1, byte2, jumpptr + .macro jumpifbytenotequal byte1:req, byte2:req, jumpptr:req jumpifarraynotequal \byte1, \byte2, 0x1, \jumpptr .endm - .macro jumpifbyteequal byte1, byte2, jumpptr + .macro jumpifbyteequal byte1:req, byte2:req, jumpptr:req jumpifarrayequal \byte1, \byte2, 0x1, \jumpptr .endm - .macro jumpifmove move, jumpptr + .macro jumpifmove move:req, jumpptr:req jumpifhalfword CMP_EQUAL, gCurrentMove, \move, \jumpptr .endm - .macro jumpifnotmove move, jumpptr + .macro jumpifnotmove move:req, jumpptr:req jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpptr .endm - .macro jumpifstatus3 battler, status, jumpptr + .macro jumpifstatus3 battler:req, status:req, jumpptr:req jumpifstatus3condition \battler, \status, 0x0, \jumpptr .endm - .macro jumpifnostatus3 battler, status, jumpptr + .macro jumpifnostatus3 battler:req, status:req, jumpptr:req jumpifstatus3condition \battler, \status, 0x1, \jumpptr .endm - .macro jumpifmovehadnoeffect jumpptr + .macro jumpifmovehadnoeffect jumpptr:req jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpptr .endm - .macro jumpifbattletype flags, jumpptr + .macro jumpifbattletype flags:req, jumpptr:req jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr .endm - .macro jumpifnotbattletype flags, jumpptr + .macro jumpifnotbattletype flags:req, jumpptr:req jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr .endm diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 6b9227442..ee673cb8a 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -19,52 +19,52 @@ .endm @ Jumps to destination and continues script execution from there. The location of the calling script is remembered and can be returned to later. - .macro call destination + .macro call destination:req .byte 0x04 .4byte \destination .endm @ Jumps to destination and continues script execution from there. - .macro goto destination + .macro goto destination:req .byte 0x05 .4byte \destination .endm @ If the result of the last comparison matches condition (see Comparison operators), jumps to destination and continues script execution from there. - .macro goto_if condition, destination + .macro goto_if condition:req, destination:req .byte 0x06 .byte \condition .4byte \destination .endm @ If the result of the last comparison matches condition (see Comparison operators), calls destination. - .macro call_if condition, destination + .macro call_if condition:req, destination:req .byte 0x07 .byte \condition .4byte \destination .endm @ Jumps to the standard function at index function. - .macro gotostd function + .macro gotostd function:req .byte 0x08 .byte \function .endm @ Calls the standard function at index function. - .macro callstd function + .macro callstd function:req .byte 0x09 .byte \function .endm @ If the result of the last comparison matches condition (see Comparison operators), jumps to the standard function at index function. - .macro gotostd_if condition, function + .macro gotostd_if condition:req, function:req .byte 0x0a .byte \condition .byte \function .endm @ If the result of the last comparison matches condition (see Comparison operators), calls the standard function at index function. - .macro callstd_if condition, function + .macro callstd_if condition:req, function:req .byte 0x0b .byte \condition .byte \function @@ -81,146 +81,146 @@ .endm @ Sets some status related to Mystery Event. - .macro setmysteryeventstatus value + .macro setmysteryeventstatus value:req .byte 0x0e .byte \value .endm @ Sets the specified script bank to value. - .macro loadword destination, value + .macro loadword destination:req, value:req .byte 0x0f .byte \destination .4byte \value .endm @ Sets the specified script bank to value. - .macro loadbyte destination, value + .macro loadbyte destination:req, value:req .byte 0x10 .byte \destination .byte \value .endm @ Sets the byte at offset to value. - .macro writebytetoaddr value, offset + .macro writebytetoaddr value:req, offset:req .byte 0x11 .byte \value .4byte \offset .endm @ Copies the byte value at source into the specified script bank. - .macro loadbytefromaddr destination, source + .macro loadbytefromaddr destination:req, source:req .byte 0x12 .byte \destination .4byte \source .endm @ Not sure. Judging from XSE's description I think it takes the least-significant byte in bank source and writes it to destination. - .macro setptrbyte source, destination + .macro setptrbyte source:req, destination:req .byte 0x13 .byte \source .4byte \destination .endm @ Copies the contents of bank source into bank destination. - .macro copylocal destination, source + .macro copylocal destination:req, source:req .byte 0x14 .byte \destination .byte \source .endm @ Copies the byte at source to destination, replacing whatever byte was previously there. - .macro copybyte destination, source + .macro copybyte destination:req, source:req .byte 0x15 .4byte \destination .4byte \source .endm @ Changes the value of destination to value. - .macro setvar destination, value + .macro setvar destination:req, value:req .byte 0x16 .2byte \destination .2byte \value .endm @ Changes the value of destination by adding value to it. Overflow is not prevented (0xFFFF + 1 = 0x0000). - .macro addvar destination, value + .macro addvar destination:req, value:req .byte 0x17 .2byte \destination .2byte \value .endm @ Changes the value of destination by subtracting value to it. Overflow is not prevented (0x0000 - 1 = 0xFFFF). - .macro subvar destination, value + .macro subvar destination:req, value:req .byte 0x18 .2byte \destination .2byte \value .endm @ Copies the value of source into destination. - .macro copyvar destination, source + .macro copyvar destination:req, source:req .byte 0x19 .2byte \destination .2byte \source .endm @ If source is not a variable, then this function acts like setvar. Otherwise, it acts like copyvar. - .macro setorcopyvar destination, source + .macro setorcopyvar destination:req, source:req .byte 0x1a .2byte \destination .2byte \source .endm @ Compares the values of script banks a and b, after forcing the values to bytes. - .macro compare_local_to_local byte1, byte2 + .macro compare_local_to_local byte1:req, byte2:req .byte 0x1b .byte \byte1 .byte \byte2 .endm @ Compares the least-significant byte of the value of script bank a to a fixed byte value (b). - .macro compare_local_to_value a, b + .macro compare_local_to_value a:req, b:req .byte 0x1c .byte \a .byte \b .endm @ Compares the least-significant byte of the value of script bank a to the byte located at offset b. - .macro compare_local_to_addr a, b + .macro compare_local_to_addr a:req, b:req .byte 0x1d .byte \a .4byte \b .endm @ Compares the byte located at offset a to the least-significant byte of the value of script bank b. - .macro compare_addr_to_local a, b + .macro compare_addr_to_local a:req, b:req .byte 0x1e .4byte \a .byte \b .endm @ Compares the byte located at offset a to a fixed byte value (b). - .macro compare_addr_to_value a, b + .macro compare_addr_to_value a:req, b:req .byte 0x1f .4byte \a .byte \b .endm @ Compares the byte located at offset a to the byte located at offset b. - .macro compare_addr_to_addr a, b + .macro compare_addr_to_addr a:req, b:req .byte 0x20 .4byte \a .4byte \b .endm @ Compares the value of `var` to a fixed word value (b). - .macro compare_var_to_value var, value + .macro compare_var_to_value var:req, value:req .byte 0x21 .2byte \var .2byte \value .endm @ Compares the value of `var1` to the value of `var2`. - .macro compare_var_to_var var1, var2 + .macro compare_var_to_var var1:req, var2:req .byte 0x22 .2byte \var1 .2byte \var2 @@ -228,7 +228,7 @@ @ Generic compare macro which attempts to deduce argument types based on their values @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers - .macro compare arg1, arg2 + .macro compare arg1:req, arg2:req .if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8) compare_var_to_var \arg1, \arg2 .elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF) @@ -239,32 +239,32 @@ .endm @ Calls the native C function stored at `func`. - .macro callnative func + .macro callnative func:req .byte 0x23 .4byte \func .endm @ Replaces the script with the function stored at `func`. Execution returns to the bytecode script when func returns TRUE. - .macro gotonative func + .macro gotonative func:req .byte 0x24 .4byte \func .endm @ Calls a special function; that is, a function designed for use by scripts and listed in a table of pointers. - .macro special function + .macro special function:req .byte 0x25 .2byte SPECIAL_\function .endm @ Calls a special function. That function's output (if any) will be written to the variable you specify. - .macro specialvar output, function + .macro specialvar output:req, function:req .byte 0x26 .2byte \output .2byte SPECIAL_\function .endm @ temporary solution - .macro specialvar_ output, functionId + .macro specialvar_ output:req, functionId:req .byte 0x26 .2byte \output .2byte \functionId @@ -276,31 +276,31 @@ .endm @ Blocks script execution for time (frames? milliseconds?). - .macro delay time + .macro delay time:req .byte 0x28 .2byte \time .endm @ Sets a to 1. - .macro setflag a + .macro setflag a:req .byte 0x29 .2byte \a .endm @ Sets a to 0. - .macro clearflag a + .macro clearflag a:req .byte 0x2a .2byte \a .endm @ Compares a to 1. - .macro checkflag a + .macro checkflag a:req .byte 0x2b .2byte \a .endm @ Initializes the RTC`s local time offset to the given hour and minute. In FireRed, this command is a nop. - .macro initclock hour, minute + .macro initclock hour:req, minute:req .byte 0x2c .2byte \hour .2byte \minute @@ -317,7 +317,7 @@ .endm @ Plays the specified (sound_number) sound. Only one sound may play at a time, with newer ones interrupting older ones. - .macro playse sound_number + .macro playse sound_number:req .byte 0x2f .2byte \sound_number .endm @@ -328,7 +328,7 @@ .endm @ Plays the specified (fanfare_number) fanfare. - .macro playfanfare fanfare_number + .macro playfanfare fanfare_number:req .byte 0x31 .2byte \fanfare_number .endm @@ -339,14 +339,14 @@ .endm @ Plays the specified (song_number) song. The byte is apparently supposed to be 0x00. - .macro playbgm song_number, unknown + .macro playbgm song_number:req, unknown:req .byte 0x33 .2byte \song_number .byte \unknown .endm @ Saves the specified (song_number) song to be played later. - .macro savebgm song_number + .macro savebgm song_number:req .byte 0x34 .2byte \song_number .endm @@ -357,25 +357,25 @@ .endm @ Crossfades the currently-playng song into the specified (song_number) song. - .macro fadenewbgm song_number + .macro fadenewbgm song_number:req .byte 0x36 .2byte \song_number .endm @ Fades out the currently-playing song. - .macro fadeoutbgm speed + .macro fadeoutbgm speed:req .byte 0x37 .byte \speed .endm @ Fades the previously-playing song back in. - .macro fadeinbgm speed + .macro fadeinbgm speed:req .byte 0x38 .byte \speed .endm @ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, then the player will instead be sent to (X, Y) on the map. - .macro warp map, warp, X, Y + .macro warp map:req, warp:req, X:req, Y:req .byte 0x39 map \map .byte \warp @@ -384,7 +384,7 @@ .endm @ Clone of warp that does not play a sound effect. - .macro warpsilent map, warp, X, Y + .macro warpsilent map:req, warp:req, X:req, Y:req .byte 0x3a map \map .byte \warp @@ -393,7 +393,7 @@ .endm @ Clone of warp that plays a door opening animation before stepping upwards into it. - .macro warpdoor map, warp, X, Y + .macro warpdoor map:req, warp:req, X:req, Y:req .byte 0x3b map \map .byte \warp @@ -402,13 +402,13 @@ .endm @ Warps the player to another map using a hole animation. - .macro warphole map + .macro warphole map:req .byte 0x3c map \map .endm @ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E. - .macro warpteleport map, warp, X, Y + .macro warpteleport map:req, warp:req, X:req, Y:req .byte 0x3d map \map .byte \warp @@ -417,7 +417,7 @@ .endm @ Sets the warp destination to be used later. - .macro setwarp map, warp, X, Y + .macro setwarp map:req, warp:req, X:req, Y:req .byte 0x3e map \map .byte \warp @@ -426,7 +426,7 @@ .endm @ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators). - .macro setdynamicwarp map, warp, X, Y + .macro setdynamicwarp map:req, warp:req, X:req, Y:req .byte 0x3f map \map .byte \warp @@ -435,7 +435,7 @@ .endm @ Sets the destination that diving or emerging from a dive will take the player to. - .macro setdivewarp map, warp, X, Y + .macro setdivewarp map:req, warp:req, X:req, Y:req .byte 0x40 map \map .byte \warp @@ -444,7 +444,7 @@ .endm @ Sets the destination that falling into a hole will take the player to. - .macro setholewarp map, warp, X, Y + .macro setholewarp map:req, warp:req, X:req, Y:req .byte 0x41 map \map .byte \warp @@ -453,7 +453,7 @@ .endm @ Retrieves the player's zero-indexed X- and Y-coordinates in the map, and stores them in the specified variables. - .macro getplayerxy X, Y + .macro getplayerxy X:req, Y:req .byte 0x42 .2byte \X .2byte \Y @@ -465,80 +465,80 @@ .endm @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000. - .macro giveitem index, quantity + .macro giveitem index:req, quantity:req .byte 0x44 .2byte \index .2byte \quantity .endm @ Removes quantity of item index from the player's Bag. - .macro takeitem index, quantity + .macro takeitem index:req, quantity:req .byte 0x45 .2byte \index .2byte \quantity .endm @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. - .macro checkitemspace index, quantity + .macro checkitemspace index:req, quantity:req .byte 0x46 .2byte \index .2byte \quantity .endm @ Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item. - .macro checkitem index, quantity + .macro checkitem index:req, quantity:req .byte 0x47 .2byte \index .2byte \quantity .endm @ Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE). - .macro checkitemtype index + .macro checkitemtype index:req .byte 0x48 .2byte \index .endm @ Adds a quantity amount of item index to the player's PC. Both arguments can be variables. - .macro givepcitem index, quantity + .macro givepcitem index:req, quantity:req .byte 0x49 .2byte \index .2byte \quantity .endm @ Checks for quantity amount of item index in the player's PC. Both arguments can be variables. - .macro checkpcitem index, quantity + .macro checkpcitem index:req, quantity:req .byte 0x4a .2byte \index .2byte \quantity .endm @ Adds decoration to the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro givedecoration decoration + .macro givedecoration decoration:req .byte 0x4b .2byte \decoration .endm @ Removes a decoration from the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro takedecoration decoration + .macro takedecoration decoration:req .byte 0x4c .2byte \decoration .endm @ Checks for decoration in the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro checkdecor decoration + .macro checkdecor decoration:req .byte 0x4d .2byte \decoration .endm @ Checks if the player has enough space in their PC to hold decoration. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro checkdecorspace decoration + .macro checkdecorspace decoration:req .byte 0x4e .2byte \decoration .endm @ Applies the movement data at movements to the specified (index) Object. Also closes any standard message boxes that are still open. @ If no map is specified, then the current map is used. - .macro applymovement index, movements, map + .macro applymovement index:req, movements:req, map .ifb \map .byte 0x4f .2byte \index @@ -554,7 +554,7 @@ @ Blocks script execution until the movements being applied to the specified (index) Object finish. If the specified Object is 0x0000, then the command will block script execution until all Objects affected by applymovement finish their movements. If the specified Object is not currently being manipulated with applymovement, then this command does nothing. @ If no map is specified, then the current map is used. - .macro waitmovement index, map + .macro waitmovement index:req, map .ifb \map .byte 0x51 .2byte \index @@ -567,7 +567,7 @@ @ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. @ If no map is specified, then the current map is used. - .macro removeobject index, map + .macro removeobject index:req, map .ifb \map .byte 0x53 .2byte \index @@ -580,7 +580,7 @@ @ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. @ If no map is specified, then the current map is used. - .macro addobject index, map + .macro addobject index:req, map .ifb \map .byte 0x55 .2byte \index @@ -592,20 +592,20 @@ .endm @ Sets the specified (index) Object's position on the current map. - .macro setobjectxy index, x, y + .macro setobjectxy index:req, x:req, y:req .byte 0x57 .2byte \index .2byte \x .2byte \y .endm - .macro showobjectat index, map + .macro showobjectat index:req, map:req .byte 0x58 .2byte \index map \map .endm - .macro hideobjectat index, map + .macro hideobjectat index:req, map:req .byte 0x59 .2byte \index map \map @@ -616,14 +616,14 @@ .byte 0x5a .endm - .macro turnobject index, direction + .macro turnobject index:req, direction:req .byte 0x5b .2byte \index .byte \direction .endm @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. - .macro trainerbattle type, trainer, word, pointer1, pointer2, pointer3, pointer4 + .macro trainerbattle type:req, trainer:req, word:req, pointer1:req, pointer2, pointer3, pointer4 .byte 0x5c .byte \type .2byte \trainer @@ -694,36 +694,36 @@ .endm @ Compares Flag (trainer + 0x500) to 1. (If the flag is set, then the trainer has been defeated by the player.) - .macro checktrainerflag trainer + .macro checktrainerflag trainer:req .byte 0x60 .2byte \trainer .endm @ Sets Flag (trainer + 0x500). - .macro settrainerflag trainer + .macro settrainerflag trainer:req .byte 0x61 .2byte \trainer .endm @ Clears Flag (trainer + 0x500). - .macro cleartrainerflag trainer + .macro cleartrainerflag trainer:req .byte 0x62 .2byte \trainer .endm - .macro setobjectxyperm index, x, y + .macro setobjectxyperm index:req, x:req, y:req .byte 0x63 .2byte \index .2byte \x .2byte \y .endm - .macro moveobjectoffscreen index + .macro moveobjectoffscreen index:req .byte 0x64 .2byte \index .endm - .macro setobjectmovementtype word, byte + .macro setobjectmovementtype word:req, byte:req .byte 0x65 .2byte \word .byte \byte @@ -735,7 +735,7 @@ .endm @ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.) - .macro message text + .macro message text:req .byte 0x67 .4byte \text .endm @@ -771,14 +771,14 @@ .endm @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES". - .macro yesnobox x, y + .macro yesnobox x:req, y:req .byte 0x6e .byte \x .byte \y .endm @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro multichoice x, y, list, b + .macro multichoice x:req, y:req, list:req, b:req .byte 0x6f .byte \x .byte \y @@ -787,7 +787,7 @@ .endm @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro multichoicedefault x, y, list, default, b + .macro multichoicedefault x:req, y:req, list:req, default:req, b:req .byte 0x70 .byte \x .byte \y @@ -797,7 +797,7 @@ .endm @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. - .macro multichoicegrid x, y, list, per_row, B + .macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req .byte 0x71 .byte \x .byte \y @@ -812,7 +812,7 @@ .endm @ Nopped in Emerald, but still consumes parameters. - .macro erasebox byte1, byte2, byte3, byte4 + .macro erasebox byte1:req, byte2:req, byte3:req, byte4:req .byte 0x73 .byte \byte1 .byte \byte2 @@ -821,7 +821,7 @@ .endm @ Nopped in Emerald, but still consumes parameters. - .macro drawboxtext byte1, byte2, byte3, byte4 + .macro drawboxtext byte1:req, byte2:req, byte3:req, byte4:req .byte 0x74 .byte \byte1 .byte \byte2 @@ -830,7 +830,7 @@ .endm @ Displays a box containing the front sprite for the specified (species) Pokemon species. - .macro drawmonpic species, x, y + .macro drawmonpic species:req, x:req, y:req .byte 0x75 .2byte \species .byte \x @@ -843,19 +843,19 @@ .endm @ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.) - .macro drawcontestwinner a + .macro drawcontestwinner a:req .byte 0x77 .byte \a .endm @ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille characters and needs to provide six extra starting characters that are skipped (in RS, these characters determined the box's size and position, but in Emerald these are calculated automatically). - .macro braillemessage text + .macro braillemessage text:req .byte 0x78 .4byte \text .endm @ Gives the player one of the specified (species) Pokemon at level level holding item. The unknown arguments should all be zeroes. - .macro givemon species, level, item, unknown1, unknown2, unknown3 + .macro givemon species:req, level:req, item:req, unknown1:req, unknown2:req, unknown3:req .byte 0x79 .2byte \species .byte \level @@ -865,12 +865,12 @@ .byte \unknown3 .endm - .macro giveegg species + .macro giveegg species:req .byte 0x7a .2byte \species .endm - .macro setmonmove index, slot, move + .macro setmonmove index:req, slot:req, move:req .byte 0x7b .byte \index .byte \slot @@ -878,99 +878,99 @@ .endm @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species. - .macro checkpartymove index + .macro checkpartymove index:req .byte 0x7c .2byte \index .endm @ Writes the name of the Pokemon at index species to the specified buffer. - .macro bufferspeciesname out, species + .macro bufferspeciesname out:req, species:req .byte 0x7d .byte \out .2byte \species .endm @ Writes the name of the species of the first Pokemon in the player's party to the specified buffer. - .macro bufferleadmonspeciesname out + .macro bufferleadmonspeciesname out:req .byte 0x7e .byte \out .endm @ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer. - .macro bufferpartymonnick out, slot + .macro bufferpartymonnick out:req, slot:req .byte 0x7f .byte \out .2byte \slot .endm @ Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead. - .macro bufferitemname out, item + .macro bufferitemname out:req, item:req .byte 0x80 .byte \out .2byte \item .endm @ Writes the name of the decoration at index decoration to the specified buffer. In FireRed, this command is a nop. - .macro bufferdecorationname out, decoration + .macro bufferdecorationname out:req, decoration:req .byte 0x81 .byte \out .2byte \decoration .endm @ Writes the name of the move at index move to the specified buffer. - .macro buffermovename out, move + .macro buffermovename out:req, move:req .byte 0x82 .byte \out .2byte \move .endm @ Converts the value of input to a decimal string, and writes that string to the specified buffer. - .macro buffernumberstring out, input + .macro buffernumberstring out:req, input:req .byte 0x83 .byte \out .2byte \input .endm @ Writes the standard string identified by index to the specified buffer. This command has no protections in place at all, so specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption. - .macro bufferstdstring out, index + .macro bufferstdstring out:req, index:req .byte 0x84 .byte \out .2byte \index .endm @ Copies the string at offset to the specified buffer. - .macro bufferstring out, offset + .macro bufferstring out:req, offset:req .byte 0x85 .byte \out .4byte \offset .endm @ Opens the Pokemart system, offering the specified products for sale. - .macro pokemart products + .macro pokemart products:req .byte 0x86 .4byte \products .endm @ Opens the Pokemart system and treats the list of items as decorations. - .macro pokemartdecoration products + .macro pokemartdecoration products:req .byte 0x87 .4byte \products .endm @ Apparent clone of pokemartdecoration. - .macro pokemartdecoration2 products + .macro pokemartdecoration2 products:req .byte 0x88 .4byte \products .endm @ Starts up the slot machine minigame. - .macro playslotmachine word + .macro playslotmachine word:req .byte 0x89 .2byte \word .endm @ Sets a berry tree's specific berry and growth stage. In FireRed, this command is a nop. - .macro setberrytree tree_id, berry, growth_stage + .macro setberrytree tree_id:req, berry:req, growth_stage:req .byte 0x8a .byte \tree_id .byte \berry @@ -998,34 +998,34 @@ .endm @ Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT). - .macro random limit + .macro random limit:req .byte 0x8f .2byte \limit .endm @ If check is 0x00, this command adds value to the player's money. - .macro givemoney value, check + .macro givemoney value:req, check:req .byte 0x90 .4byte \value .byte \check .endm @ If check is 0x00, this command subtracts value from the player's money. - .macro takemoney value, check + .macro takemoney value:req, check:req .byte 0x91 .4byte \value .byte \check .endm @ If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not. - .macro checkmoney value, check + .macro checkmoney value:req, check:req .byte 0x92 .4byte \value .byte \check .endm @ Spawns a secondary box showing how much money the player has. - .macro showmoneybox x, y, check + .macro showmoneybox x:req, y:req, check:req .byte 0x93 .byte \x .byte \y @@ -1038,67 +1038,67 @@ .endm @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. - .macro updatemoneybox x, y + .macro updatemoneybox x:req, y:req .byte 0x95 .byte \x .byte \y .endm @ Gets the price reduction for the index given. In FireRed, this command is a nop. - .macro getpricereduction index + .macro getpricereduction index:req .byte 0x96 .2byte \index .endm @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. - .macro fadescreen effect + .macro fadescreen effect:req .byte 0x97 .byte \effect .endm @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist. - .macro fadescreenspeed effect, speed + .macro fadescreenspeed effect:req, speed:req .byte 0x98 .byte \effect .byte \speed .endm - .macro setflashradius word + .macro setflashradius word:req .byte 0x99 .2byte \word .endm - .macro animateflash byte + .macro animateflash byte:req .byte 0x9a .byte \byte .endm - .macro messageautoscroll pointer + .macro messageautoscroll pointer:req .byte 0x9b .4byte \pointer .endm @ Executes the specified field move animation. - .macro dofieldeffect animation + .macro dofieldeffect animation:req .byte 0x9c .2byte \animation .endm @ Sets up the field effect argument argument with the value value. - .macro setfieldeffectargument argument, param + .macro setfieldeffectargument argument:req, param:req .byte 0x9d .byte \argument .2byte \param .endm @ Blocks script execution until all playing field move animations complete. - .macro waitfieldeffect animation + .macro waitfieldeffect animation:req .byte 0x9e .2byte \animation .endm @ Sets which healing place the player will return to if all of the Pokemon in their party faint. - .macro setrespawn heallocation + .macro setrespawn heallocation:req .byte 0x9f .2byte \heallocation .endm @@ -1109,14 +1109,14 @@ .endm @ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes. - .macro playmoncry species, effect + .macro playmoncry species:req, effect:req .byte 0xa1 .2byte \species .2byte \effect .endm @ Changes the metatile at (x, y) on the current map. - .macro setmetatile x, y, metatile_number, tile_attrib + .macro setmetatile x:req, y:req, metatile_number:req, tile_attrib:req .byte 0xa2 .2byte \x .2byte \y @@ -1130,7 +1130,7 @@ .endm @ Queues a weather change to type weather. - .macro setweather type + .macro setweather type:req .byte 0xa4 .2byte \type .endm @@ -1141,30 +1141,30 @@ .endm @ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors). - .macro setstepcallback subroutine + .macro setstepcallback subroutine:req .byte 0xa6 .byte \subroutine .endm - .macro setmaplayoutindex index + .macro setmaplayoutindex index:req .byte 0xa7 .2byte \index .endm - .macro setobjectpriority index, map, priority + .macro setobjectpriority index:req, map:req, priority:req .byte 0xa8 .2byte \index map \map .byte \priority .endm - .macro resetobjectpriority index, map + .macro resetobjectpriority index:req, map:req .byte 0xa9 .2byte \index map \map .endm - .macro createvobject sprite, byte2, x, y, elevation, direction + .macro createvobject sprite:req, byte2:req, x:req, y:req, elevation, direction .byte 0xaa .byte \sprite .byte \byte2 @@ -1174,21 +1174,21 @@ .byte \direction .endm - .macro turnvobject index, direction + .macro turnvobject index:req, direction:req .byte 0xab .byte \index .byte \direction .endm @ Opens the door metatile at (X, Y) with an animation. - .macro opendoor x, y + .macro opendoor x:req, y:req .byte 0xac .2byte \x .2byte \y .endm @ Closes the door metatile at (X, Y) with an animation. - .macro closedoor x, y + .macro closedoor x:req, y:req .byte 0xad .2byte \x .2byte \y @@ -1200,21 +1200,21 @@ .endm @ Sets the door tile at (x, y) to be open without an animation. - .macro setdooropen x, y + .macro setdooropen x:req, y:req .byte 0xaf .2byte \x .2byte \y .endm @ Sets the door tile at (x, y) to be closed without an animation. - .macro setdoorclosed x, y + .macro setdoorclosed x:req, y:req .byte 0xb0 .2byte \x .2byte \y .endm @ In Emerald, this command consumes its parameters and does nothing. In FireRed, this command is a nop. - .macro addelevmenuitem a, b, c, d + .macro addelevmenuitem a:req, b:req, c:req, d:req .byte 0xb1 .byte \a .2byte \b @@ -1227,23 +1227,23 @@ .byte 0xb2 .endm - .macro checkcoins out + .macro checkcoins out:req .byte 0xb3 .2byte \out .endm - .macro givecoins count + .macro givecoins count:req .byte 0xb4 .2byte \count .endm - .macro takecoins count + .macro takecoins count:req .byte 0xb5 .2byte \count .endm @ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. - .macro setwildbattle species, level, item + .macro setwildbattle species:req, level:req, item:req .byte 0xb6 .2byte \species .byte \level @@ -1255,78 +1255,78 @@ .byte 0xb7 .endm - .macro setvaddress pointer + .macro setvaddress pointer:req .byte 0xb8 .4byte \pointer .endm - .macro vgoto pointer + .macro vgoto pointer:req .byte 0xb9 .4byte \pointer .endm - .macro vcall pointer + .macro vcall pointer:req .byte 0xba .4byte \pointer .endm - .macro vgoto_if byte, pointer + .macro vgoto_if byte:req, pointer:req .byte 0xbb .byte \byte .4byte \pointer .endm - .macro vcall_if byte, pointer + .macro vcall_if byte:req, pointer:req .byte 0xbc .byte \byte .4byte \pointer .endm - .macro vmessage pointer + .macro vmessage pointer:req .byte 0xbd .4byte \pointer .endm - .macro vloadptr pointer + .macro vloadptr pointer:req .byte 0xbe .4byte \pointer .endm - .macro vbufferstring byte, pointer + .macro vbufferstring byte:req, pointer:req .byte 0xbf .byte \byte .4byte \pointer .endm @ Spawns a secondary box showing how many Coins the player has. - .macro showcoinsbox x, y + .macro showcoinsbox x:req, y:req .byte 0xc0 .byte \x .byte \y .endm @ Hides the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. - .macro hidecoinsbox x, y + .macro hidecoinsbox x:req, y:req .byte 0xc1 .byte \x .byte \y .endm @ Updates the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. - .macro updatecoinsbox x, y + .macro updatecoinsbox x:req, y:req .byte 0xc2 .byte \x .byte \y .endm @ Increases the value of the specified game stat by 1. The stat's value will not be allowed to exceed 0x00FFFFFF. - .macro incrementgamestat stat + .macro incrementgamestat stat:req .byte 0xc3 .byte \stat .endm @ Sets the destination that using an Escape Rope or Dig will take the player to. - .macro setescapewarp map, warp, x, y + .macro setescapewarp map:req, warp:req, x:req, y:req .byte 0xc4 map \map .byte \warp @@ -1340,20 +1340,20 @@ .endm @ Writes the name of the specified (box) PC box to the specified buffer. - .macro bufferboxname out, box + .macro bufferboxname out:req, box:req .byte 0xc6 .byte \out .2byte \box .endm @ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 0xFF resets the color to the default for the current OW's gender, and all other values produce black text. - .macro textcolor color + .macro textcolor color:req .byte 0xc7 .byte \color .endm @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened. - .macro loadhelp pointer + .macro loadhelp pointer:req .byte 0xc8 .4byte \pointer .endm @@ -1374,20 +1374,20 @@ .endm @ Compares the value of a hidden variable to a dword. - .macro comparehiddenvar a, value + .macro comparehiddenvar a:req, value:req .byte 0xcc .byte \a .4byte \value .endm @ Makes the Pokemon in the specified slot of the player's party obedient. It will not randomly disobey orders in battle. - .macro setmonobedient slot + .macro setmonobedient slot:req .byte 0xcd .2byte \slot .endm @ Checks if the Pokemon in the specified slot of the player's party is obedient. If the Pokemon is disobedient, 0x0001 is written to script variable 0x800D (LASTRESULT). If the Pokemon is obedient (or if the specified slot is empty or invalid), 0x0000 is written. - .macro checkmonobedience slot + .macro checkmonobedience slot:req .byte 0xce .2byte \slot .endm @@ -1398,13 +1398,13 @@ .endm @ Sets worldmapflag to 1. This allows the player to Fly to the corresponding map, if that map has a flightspot. - .macro setworldmapflag worldmapflag + .macro setworldmapflag worldmapflag:req .byte 0xd0 .2byte \worldmapflag .endm @ Clone of warpteleport? It is apparently only used in FR/LG, and only with specials.[source] - .macro warpteleport2 map, warp, x, y + .macro warpteleport2 map:req, warp:req, x:req, y:req .byte 0xd1 map \map .byte \warp @@ -1413,13 +1413,13 @@ .endm @ Changes the location where the player caught the Pokemon in the specified slot of their party. - .macro setmonmetlocation slot, location + .macro setmonmetlocation slot:req, location:req .byte 0xd2 .2byte \slot .byte \location .endm - .macro mossdeepgym1 unknown + .macro mossdeepgym1 unknown:req .byte 0xd3 .2byte \unknown .endm @@ -1429,7 +1429,7 @@ .endm @ In FireRed, this command is a nop. - .macro mossdeepgym3 var + .macro mossdeepgym3 var:req .byte 0xd5 .2byte \var .endm @@ -1438,7 +1438,7 @@ .byte 0xd6 .endm - .macro warp7 map, byte, word1, word2 + .macro warp7 map:req, byte:req, word1:req, word2:req .byte 0xd7 map \map .byte \byte @@ -1458,34 +1458,34 @@ .byte 0xda .endm - .macro message3 pointer + .macro message3 pointer:req .byte 0xdb .4byte \pointer .endm - .macro fadescreenswapbuffers byte + .macro fadescreenswapbuffers byte:req .byte 0xdc .byte \byte .endm - .macro buffertrainerclassname out, class + .macro buffertrainerclassname out:req, class:req .byte 0xdd .byte \out .2byte \class .endm - .macro buffertrainername out, trainer + .macro buffertrainername out:req, trainer:req .byte 0xde .byte \out .2byte \trainer .endm - .macro pokenavcall pointer + .macro pokenavcall pointer:req .byte 0xdf .4byte \pointer .endm - .macro warp8 map, byte, word1, word2 + .macro warp8 map:req, byte:req, word1:req, word2:req .byte 0xe0 map \map .byte \byte @@ -1493,14 +1493,14 @@ .2byte \word2 .endm - .macro buffercontesttypestring out, word + .macro buffercontesttypestring out:req, word:req .byte 0xe1 .byte \out .2byte \word .endm @ Writes the name of the specified (item) item to the specified buffer. If the specified item is a Berry (0x85 - 0xAE) or Poke Ball (0x4) and if the quantity is 2 or more, the buffered string will be pluralized ("IES" or "S" appended). If the specified item is the Enigma Berry, I have no idea what this command does (but testing showed no pluralization). If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead. - .macro bufferitemnameplural out, item, quantity + .macro bufferitemnameplural out:req, item:req, quantity:req .byte 0xe2 .byte \out .2byte \item @@ -1510,20 +1510,20 @@ @ Supplementary - .macro goto_eq dest + .macro goto_eq dest:req goto_if 1, \dest .endm - .macro switch var + .macro switch var:req copyvar 0x8000, \var .endm - .macro case condition, dest + .macro case condition:req, dest:req compare 0x8000, \condition goto_eq \dest .endm - .macro msgbox text, type=4 + .macro msgbox text:req, type=4 loadword 0, \text callstd \type .endm @@ -1534,13 +1534,13 @@ YES = 1 NO = 0 - .macro giveitem_std item, amount=1, function=0 + .macro giveitem_std item:req, amount=1, function=0 setorcopyvar 0x8000, \item setorcopyvar 0x8001, \amount callstd \function .endm - .macro givedecoration_std decoration + .macro givedecoration_std decoration:req setorcopyvar 0x8000, \decoration callstd 7 .endm -- cgit v1.2.3 From a42bfd7a0eeff5bd0cf0014ab133ef5ff4b5becf Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 2 Dec 2018 19:27:56 +0100 Subject: fix brackes n ne file --- src/data/items.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 49f981faf..2293bcfac 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -5961,7 +5961,7 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, - { + { .name = _("MYSTICTICKET"), .itemId = ITEM_MYSTIC_TICKET, .price = 0, @@ -5977,7 +5977,7 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, - { + { .name = _("AURORATICKET"), .itemId = ITEM_AURORA_TICKET, .price = 0, @@ -5993,7 +5993,7 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, - { + { .name = _("POWDER JAR"), .itemId = ITEM_POWDER_JAR, .price = 0, @@ -6009,7 +6009,7 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, - { + { .name = _("RUBY"), .itemId = ITEM_RUBY, .price = 0, @@ -6025,7 +6025,7 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, - { + { .name = _("SAPPHIRE"), .itemId = ITEM_SAPPHIRE, .price = 0, @@ -6044,7 +6044,7 @@ const struct Item gItems[] = //Emerald-specific key items - { + { .name = _("MAGMA EMBLEM"), .itemId = ITEM_MAGMA_EMBLEM, .price = 0, @@ -6060,7 +6060,7 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, - { + { .name = _("OLD SEA MAP"), .itemId = ITEM_OLD_SEA_MAP, .price = 0, -- cgit v1.2.3 From bad5323642a0db0875ca6213370b1947c1fc105a Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 07:17:54 -0500 Subject: cleans up trainer battle scripts * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro --- asm/macros/event.inc | 65 +++++++++++++++++----- data/event_scripts.s | 3 +- data/maps/AbandonedShip_Corridors_1F/scripts.inc | 3 +- data/maps/AbandonedShip_Corridors_B1F/scripts.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/scripts.inc | 13 ++--- data/maps/AbandonedShip_Rooms_1F/scripts.inc | 6 +- data/maps/AquaHideout_1F/scripts.inc | 2 +- data/maps/AquaHideout_B1F/scripts.inc | 8 +-- data/maps/AquaHideout_B2F/scripts.inc | 8 +-- .../scripts.inc | 2 +- data/maps/DewfordTown_Gym/scripts.inc | 16 +++--- data/maps/EverGrandeCity_ChampionsRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_DrakesRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_SidneysRoom/scripts.inc | 2 +- data/maps/FortreeCity_Gym/scripts.inc | 16 +++--- data/maps/JaggedPass/scripts.inc | 16 +++--- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 20 +++---- data/maps/LilycoveCity/scripts.inc | 12 ++-- data/maps/MagmaHideout_1F/scripts.inc | 4 +- data/maps/MagmaHideout_2F_1R/scripts.inc | 8 +-- data/maps/MagmaHideout_2F_2R/scripts.inc | 8 +-- data/maps/MagmaHideout_3F_1R/scripts.inc | 4 +- data/maps/MagmaHideout_3F_2R/scripts.inc | 2 +- data/maps/MagmaHideout_4F/scripts.inc | 10 ++-- data/maps/MauvilleCity/scripts.inc | 2 +- data/maps/MauvilleCity_Gym/scripts.inc | 14 ++--- data/maps/MeteorFalls_1F_2R/scripts.inc | 12 ++-- data/maps/MeteorFalls_StevensCave/scripts.inc | 2 +- data/maps/MossdeepCity_Gym/scripts.inc | 28 +++++----- data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 8 +-- data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | 10 ++-- data/maps/MtChimney/scripts.inc | 22 ++++---- data/maps/MtPyre_2F/scripts.inc | 10 ++-- data/maps/MtPyre_3F/scripts.inc | 8 +-- data/maps/MtPyre_4F/scripts.inc | 2 +- data/maps/MtPyre_5F/scripts.inc | 2 +- data/maps/MtPyre_6F/scripts.inc | 6 +- data/maps/MtPyre_Summit/scripts.inc | 8 +-- data/maps/PetalburgCity_Gym/scripts.inc | 18 +++--- data/maps/PetalburgWoods/scripts.inc | 10 ++-- data/maps/Route102/scripts.inc | 10 ++-- data/maps/Route103/scripts.inc | 36 ++++++------ data/maps/Route104/scripts.inc | 34 +++++------ data/maps/Route105/scripts.inc | 16 +++--- data/maps/Route106/scripts.inc | 10 ++-- data/maps/Route107/scripts.inc | 16 +++--- data/maps/Route108/scripts.inc | 14 ++--- data/maps/Route109/scripts.inc | 32 +++++------ data/maps/Route109_SeashoreHouse/scripts.inc | 6 +- data/maps/Route110/scripts.inc | 48 ++++++++-------- data/maps/Route110_TrickHousePuzzle1/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle2/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle3/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle4/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle6/scripts.inc | 6 +- data/maps/Route110_TrickHousePuzzle7/scripts.inc | 12 ++-- data/maps/Route110_TrickHousePuzzle8/scripts.inc | 6 +- data/maps/Route111/scripts.inc | 48 ++++++++-------- data/maps/Route112/scripts.inc | 14 ++--- data/maps/Route113/scripts.inc | 26 ++++----- data/maps/Route114/scripts.inc | 30 +++++----- data/maps/Route115/scripts.inc | 26 ++++----- data/maps/Route116/scripts.inc | 24 ++++---- data/maps/Route117/scripts.inc | 32 +++++------ data/maps/Route118/scripts.inc | 18 +++--- data/maps/Route119/scripts.inc | 50 ++++++++--------- data/maps/Route119_WeatherInstitute_1F/scripts.inc | 4 +- data/maps/Route119_WeatherInstitute_2F/scripts.inc | 8 +-- data/maps/Route120/scripts.inc | 30 +++++----- data/maps/Route121/scripts.inc | 28 +++++----- data/maps/Route123/scripts.inc | 38 ++++++------- data/maps/Route124/scripts.inc | 24 ++++---- data/maps/Route125/scripts.inc | 20 +++---- data/maps/Route126/scripts.inc | 18 +++--- data/maps/Route127/scripts.inc | 18 +++--- data/maps/Route128/scripts.inc | 18 +++--- data/maps/Route129/scripts.inc | 10 ++-- data/maps/Route130/scripts.inc | 6 +- data/maps/Route131/scripts.inc | 16 +++--- data/maps/Route132/scripts.inc | 16 +++--- data/maps/Route133/scripts.inc | 14 ++--- data/maps/Route134/scripts.inc | 18 +++--- data/maps/RustboroCity/scripts.inc | 12 ++-- data/maps/RustboroCity_Gym/scripts.inc | 10 ++-- data/maps/RusturfTunnel/scripts.inc | 4 +- data/maps/SSTidalLowerDeck/scripts.inc | 4 +- data/maps/SSTidalRooms/scripts.inc | 14 ++--- data/maps/SeafloorCavern_Room1/scripts.inc | 4 +- data/maps/SeafloorCavern_Room3/scripts.inc | 4 +- data/maps/SeafloorCavern_Room4/scripts.inc | 4 +- data/maps/SeafloorCavern_Room9/scripts.inc | 2 +- .../SlateportCity_OceanicMuseum_2F/scripts.inc | 4 +- data/maps/SootopolisCity_Gym_1F/scripts.inc | 4 +- data/maps/SootopolisCity_Gym_B1F/scripts.inc | 20 +++---- data/maps/VictoryRoad_1F/scripts.inc | 17 +++--- data/maps/VictoryRoad_B1F/scripts.inc | 10 ++-- data/maps/VictoryRoad_B2F/scripts.inc | 12 ++-- data/scripts/gabby_and_ty.inc | 24 ++++---- include/battle_setup.h | 17 ------ include/constants/battle_setup.h | 18 ++++++ src/battle_setup.c | 1 + src/trainer_see.c | 1 + 104 files changed, 723 insertions(+), 687 deletions(-) create mode 100644 include/constants/battle_setup.h diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 33afdc3b3..8c6110b64 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -629,60 +629,95 @@ .endm @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. - .macro trainerbattle type:req, trainer:req, word:req, pointer1:req, pointer2, pointer3, pointer4 + .macro trainerbattle type, trainer, local_id, pointer1, pointer2, pointer3, pointer4 .byte 0x5c .byte \type .2byte \trainer - .2byte \word - .if \type == 0 + .2byte \local_id + .if \type == TRAINER_BATTLE_NORMAL .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 1 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ event script - .elseif \type == 2 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ event script - .elseif \type == 3 + .elseif \type == TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT .4byte \pointer1 @ text - .elseif \type == 4 + .elseif \type == TRAINER_BATTLE_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text - .elseif \type == 5 + .elseif \type == TRAINER_BATTLE_REMATCH .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 6 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script - .elseif \type == 7 + .elseif \type == TRAINER_BATTLE_REMATCH_DOUBLE .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text - .elseif \type == 8 + .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script - .elseif \type == 9 + .elseif \type == TRAINER_BATTLE_9 .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 10 + .elseif \type == TRAINER_BATTLE_SET_TRAINER_A .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 11 + .elseif \type == TRAINER_BATTLE_SET_TRAINER_B .4byte \pointer1 @ text .4byte \pointer2 @ text - .elseif \type == 12 + .elseif \type == TRAINER_BATTLE_12 .4byte \pointer1 @ text .4byte \pointer2 @ text .endif .endm + NO_MUSIC = FALSE + + @ Starts a normal trainer battle + .macro trainerbattle_normal trainer, intro_text, lose_text, event_script=FALSE, music=TRUE + .if \event_script == FALSE + trainerbattle TRAINER_BATTLE_NORMAL, \trainer, 0, \intro_text, \lose_text + .elseif \event_script != FALSE && \music == TRUE + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, \trainer, 0, \intro_text, \lose_text, \event_script + .else + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \event_script + .endif + .endm + + @ Starts a double trainer battle + .macro trainerbattle_double trainer, intro_text, lose_text, not_enough_pkmn_text, event_script=FALSE, music=TRUE + .if \event_script == FALSE + trainerbattle TRAINER_BATTLE_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text + .elseif \event_script != FALSE && \music == TRUE + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script + .else + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script + .endif + .endm + + .macro trainerbattle_rematch trainer, intro_text, lose_text + trainerbattle TRAINER_BATTLE_REMATCH, \trainer, 0, \intro_text, \lose_text + .endm + + .macro trainerbattle_rematch_double trainer, intro_text, lose_text, not_enough_pkmn_text + trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text + .endm + + .macro trainerbattle_no_intro trainer, lose_text + trainerbattle TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT, \trainer, 0, \lose_text + .endm @ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes. .macro trainerbattlebegin diff --git a/data/event_scripts.s b/data/event_scripts.s index b16e1942e..e4fb20cd6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,4 +1,5 @@ #include "constants/battle_frontier.h" +#include "constants/battle_setup.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" @@ -11734,7 +11735,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE step_end EventScript_2C83F0:: @ 82C83F0 - trainerbattle 12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D + trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D setvar VAR_0x8004, 11 special sp194_trainer_tower waitmessage diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index bf40bcae5..3de2e335d 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -6,7 +6,7 @@ AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 end AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE - trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 + trainerbattle_normal TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE end @@ -24,4 +24,3 @@ AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60 .string "Isn’t it fun here?\n" .string "I get excited just being here!$" - diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index c1106048f..3914ab0a2 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -53,7 +53,7 @@ AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 end AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 - trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 + trainerbattle_normal TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 0c5a9ce8b..40ffd6ff8 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 .byte 0 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 - trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 + trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 @@ -17,12 +17,12 @@ AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 end AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 - trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 + trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B - trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B + trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 @@ -37,17 +37,17 @@ AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B end AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 - trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 + trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F - trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 + trainerbattle_normal TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 - trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 + trainerbattle_normal TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE end @@ -149,4 +149,3 @@ AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9 .string "In a cabin somewhere on board,\n" .string "I saw something sparkle.$" - diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 94665168a..d19b21395 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -6,12 +6,12 @@ AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 end AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C - trainerbattle 0, TRAINER_DEMETRIUS, 0, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A + trainerbattle_normal TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 - trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF + trainerbattle_normal TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE @@ -28,7 +28,7 @@ AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF end AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE - trainerbattle 5, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 + trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index c9acfd669..fb5d95e70 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -44,7 +44,7 @@ AquaHideout_1F_EventScript_2334EE:: @ 82334EE end AquaHideout_1F_EventScript_2334F8:: @ 82334F8 - trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 + trainerbattle_normal TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 569ce99dc..1d7f1b843 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -85,7 +85,7 @@ AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C end AquaHideout_B1F_EventScript_233A85:: @ 8233A85 - trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 + trainerbattle_normal TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE end @@ -97,7 +97,7 @@ AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 end AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 - trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB + trainerbattle_normal TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE end @@ -107,12 +107,12 @@ AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB end AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 - trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA + trainerbattle_normal TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC - trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E + trainerbattle_normal TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 48e7d3556..427d1073e 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -24,7 +24,7 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 end AquaHideout_B2F_EventScript_233E09:: @ 8233E09 - trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 + trainerbattle_normal TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT release end @@ -67,7 +67,7 @@ AquaHideout_B2F_Movement_233E85: @ 8233E85 step_end AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A - trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 + trainerbattle_normal TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE end @@ -77,12 +77,12 @@ AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 end AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF - trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE + trainerbattle_normal TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 - trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC + trainerbattle_normal TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE end diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index a233729cd..3aa041fb4 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -153,7 +153,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F - trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D + trainerbattle TRAINER_BATTLE_9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D setvar VAR_0x8004, 10 special CallBattlePyramidFunction waitmessage diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 5de208d11..1ccd7ed61 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -156,7 +156,7 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 return DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 - trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7 + trainerbattle_normal TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq DewfordTown_Gym_EventScript_1FC89C @@ -211,12 +211,12 @@ DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 end DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C - trainerbattle 7, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE + trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE msgbox DewfordTown_Gym_Text_1FD37B, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7 - trainerbattle 2, TRAINER_TAKAO, 0, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 + trainerbattle_normal TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE end @@ -226,7 +226,7 @@ DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 end DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9 - trainerbattle 2, TRAINER_JOCELYN, 0, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 + trainerbattle_normal TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE end @@ -236,7 +236,7 @@ DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 end DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB - trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 + trainerbattle_normal TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE end @@ -246,7 +246,7 @@ DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 end DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D - trainerbattle 2, TRAINER_BRENDEN, 0, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 + trainerbattle_normal TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE end @@ -256,7 +256,7 @@ DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 end DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F - trainerbattle 2, TRAINER_CRISTIAN, 0, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A + trainerbattle_normal TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE end @@ -266,7 +266,7 @@ DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A end DewfordTown_Gym_EventScript_1FC961:: @ 81FC961 - trainerbattle 2, TRAINER_LILITH, 0, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C + trainerbattle_normal TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 7ca56c420..2bba37d4d 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -40,7 +40,7 @@ EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 playbgm MUS_DAIGO, 0 msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC + trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_228EAC goto EverGrandeCity_ChampionsRoom_EventScript_228A61 end diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 2e1db2c5e..519bb535f 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -45,7 +45,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895 + trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895 goto EverGrandeCity_DrakesRoom_EventScript_228724 end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 90c2957aa..0f7d2248d 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -45,7 +45,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4 + trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4 goto EverGrandeCity_GlaciasRoom_EventScript_22849A end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index c5f2e9b1a..a1062bab5 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -45,7 +45,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325 + trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325 goto EverGrandeCity_PhoebesRoom_EventScript_2281FC end diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 3b80dfe39..f8182bbf3 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -52,7 +52,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2 + trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 goto EverGrandeCity_SidneysRoom_EventScript_227F95 end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 55e24a501..6fc6dcb7e 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 end FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 - trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD + trainerbattle_normal TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq FortreeCity_Gym_EventScript_21668D @@ -67,37 +67,37 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A return FortreeCity_Gym_EventScript_21668D:: @ 821668D - trainerbattle 7, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 + trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 - trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 + trainerbattle_normal TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166BF:: @ 82166BF - trainerbattle 0, TRAINER_EDWARDO, 0, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 + trainerbattle_normal TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 - trainerbattle 0, TRAINER_FLINT, 0, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 + trainerbattle_normal TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166ED:: @ 82166ED - trainerbattle 0, TRAINER_ASHLEY, 0, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 + trainerbattle_normal TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_216704:: @ 8216704 - trainerbattle 0, TRAINER_HUMBERTO, 0, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 + trainerbattle_normal TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_21671B:: @ 821671B - trainerbattle 0, TRAINER_DARIUS, 0, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 + trainerbattle_normal TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 99e5910d1..0f3b027b3 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -80,7 +80,7 @@ JaggedPass_EventScript_230718:: @ 8230718 waitmovement 0 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage - trainerbattle 3, TRAINER_GRUNT_30, 0, JaggedPass_Text_230D2D + trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_0x139 applymovement 5, JaggedPass_Movement_2725A2 waitmovement 0 @@ -98,12 +98,12 @@ JaggedPass_EventScript_230766:: @ 8230766 end JaggedPass_EventScript_230785:: @ 8230785 - trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_230888, JaggedPass_Text_2308FF + trainerbattle_normal TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23079C:: @ 823079C - trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 + trainerbattle_normal TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 @@ -119,12 +119,12 @@ JaggedPass_EventScript_2307C8:: @ 82307C8 end JaggedPass_EventScript_2307E4:: @ 82307E4 - trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_230A76, JaggedPass_Text_230AAA + trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_230A76, JaggedPass_Text_230AAA msgbox JaggedPass_Text_230AD7, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_2307FB:: @ 82307FB - trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 + trainerbattle_normal TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 @@ -140,17 +140,17 @@ JaggedPass_EventScript_230827:: @ 8230827 end JaggedPass_EventScript_230843:: @ 8230843 - trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_230C28, JaggedPass_Text_230C60 + trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_230C28, JaggedPass_Text_230C60 msgbox JaggedPass_Text_230C94, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23085A:: @ 823085A - trainerbattle 0, TRAINER_JULIO, 0, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 + trainerbattle_normal TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_230871:: @ 8230871 - trainerbattle 0, TRAINER_AUTUMN, 0, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD + trainerbattle_normal TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 059809ffa..aa19a87ef 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -59,7 +59,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B return LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C - trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1 + trainerbattle_normal TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 @@ -114,12 +114,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 return LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864 - trainerbattle 7, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E + trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F - trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE end @@ -133,37 +133,37 @@ LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A end LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF - trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA - trainerbattle 2, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5 - trainerbattle 2, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900 - trainerbattle 2, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B - trainerbattle 2, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936 - trainerbattle 2, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 - trainerbattle 2, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index ef178f9ca..6b325d549 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -309,32 +309,32 @@ LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD end LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE - trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE - trainerbattle 3, TRAINER_MAY_13, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE - trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E - trainerbattle 3, TRAINER_BRENDAN_14, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E - trainerbattle 3, TRAINER_BRENDAN_15, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E - trainerbattle 3, TRAINER_BRENDAN_13, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 7db80a50c..35726640f 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -7,12 +7,12 @@ MagmaHideout_1F_MapScript1_239886: @ 8239886 end MagmaHideout_1F_EventScript_23988C:: @ 823988C - trainerbattle 0, TRAINER_GRUNT_38, 0, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 + trainerbattle_normal TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE end MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 - trainerbattle 0, TRAINER_GRUNT_39, 0, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA + trainerbattle_normal TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc index 347956e3b..3318648c5 100644 --- a/data/maps/MagmaHideout_2F_1R/scripts.inc +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -2,22 +2,22 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50 .byte 0 MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 - trainerbattle 0, TRAINER_GRUNT_51, 0, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B + trainerbattle_normal TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 - trainerbattle 0, TRAINER_GRUNT_40, 0, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 + trainerbattle_normal TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F - trainerbattle 0, TRAINER_GRUNT_41, 0, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 + trainerbattle_normal TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 - trainerbattle 0, TRAINER_GRUNT_42, 0, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA + trainerbattle_normal TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc index 188edddcb..9ea56dbac 100644 --- a/data/maps/MagmaHideout_2F_2R/scripts.inc +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -2,22 +2,22 @@ MagmaHideout_2F_2R_MapScripts:: @ 8239E07 .byte 0 MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 - trainerbattle 0, TRAINER_GRUNT_52, 0, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 + trainerbattle_normal TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F - trainerbattle 0, TRAINER_GRUNT_43, 0, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 + trainerbattle_normal TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 - trainerbattle 0, TRAINER_GRUNT_44, 0, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 + trainerbattle_normal TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D - trainerbattle 0, TRAINER_GRUNT_45, 0, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C + trainerbattle_normal TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc index 604c09181..0d8459693 100644 --- a/data/maps/MagmaHideout_3F_1R/scripts.inc +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -2,12 +2,12 @@ MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 .byte 0 MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 - trainerbattle 0, TRAINER_GRUNT_46, 0, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 + trainerbattle_normal TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE end MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA - trainerbattle 0, TRAINER_GRUNT_53, 0, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 + trainerbattle_normal TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc index 3656ec357..3ae8cc81a 100644 --- a/data/maps/MagmaHideout_3F_2R/scripts.inc +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -2,7 +2,7 @@ MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 .byte 0 MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 - trainerbattle 0, TRAINER_GRUNT_47, 0, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB + trainerbattle_normal TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 82d21bf6c..f21dfa1d8 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -57,7 +57,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage - trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5 + trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_23ABB5 msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN @@ -109,22 +109,22 @@ MagmaHideout_4F_Movement_23A680: @ 823A680 step_end MagmaHideout_4F_EventScript_23A68C:: @ 823A68C - trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 + trainerbattle_normal TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 - trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B + trainerbattle_normal TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA - trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 + trainerbattle_normal TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 - trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 + trainerbattle_normal TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index dd5a89a8c..cc15974a2 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -208,7 +208,7 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 MauvilleCity_EventScript_1DF63A:: @ 81DF63A msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96 + trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 995b28c94..fcf303421 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -76,7 +76,7 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 end MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB - trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B + trainerbattle_normal TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MauvilleCity_Gym_EventScript_20DFDE @@ -140,7 +140,7 @@ MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4 end MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE - trainerbattle 7, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD + trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE end @@ -215,27 +215,27 @@ MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 end MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9 - trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC + trainerbattle_normal TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0 - trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 + trainerbattle_normal TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7 - trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 + trainerbattle_normal TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE - trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 + trainerbattle_normal TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E115:: @ 820E115 - trainerbattle 0, TRAINER_ANGELO, 0, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 + trainerbattle_normal TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index df62fe313..294ef9c48 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD .byte 0 MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE - trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A + trainerbattle_normal TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 @@ -19,12 +19,12 @@ MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A end MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 - trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD + trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 - trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C589 @@ -39,12 +39,12 @@ MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 end MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 - trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C5ED @@ -59,7 +59,7 @@ MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 end MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 962c7c298..3d7722487 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -14,7 +14,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 applymovement 1, MeteorFalls_StevensCave_Movement_27259E waitmovement 0 msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_STEVEN, 0, MeteorFalls_StevensCave_Text_23B32D + trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT setflag FLAG_0x4F8 release diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index ffa8a4247..4726b5050 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -49,7 +49,7 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885 end MossdeepCity_Gym_EventScript_220898:: @ 8220898 - trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1 + trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MossdeepCity_Gym_EventScript_22097E @@ -109,7 +109,7 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B return MossdeepCity_Gym_EventScript_22097E:: @ 822097E - trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 + trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE end @@ -211,62 +211,62 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 end MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD - trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC + trainerbattle_normal TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 - trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A + trainerbattle_normal TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B - trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 + trainerbattle_normal TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 - trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 + trainerbattle_normal TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 - trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 + trainerbattle_normal TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 - trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 + trainerbattle_normal TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 - trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 + trainerbattle_normal TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E - trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 + trainerbattle_normal TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 - trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 + trainerbattle_normal TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC - trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 + trainerbattle_normal TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 - trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D + trainerbattle_normal TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA - trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B + trainerbattle_normal TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 9dbf2117f..dbb673fe9 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -219,17 +219,17 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF end MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA - trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 + trainerbattle_normal TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 - trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 + trainerbattle_normal TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 - trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA + trainerbattle_normal TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE end @@ -239,7 +239,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F checkflag FLAG_0x0BF goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2 + trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2 setflag FLAG_0x0BF moveobjectoffscreen 9 switch VAR_FACING diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 6bb71708d..22fcc1476 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -54,19 +54,19 @@ MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461 + trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499 + trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1 + trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 waitmovement 0 setvar VAR_0x409F, 2 @@ -343,11 +343,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152 return MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157 - trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C + trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C end MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 - trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD + trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD end MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 480f91515..570043a9d 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -45,7 +45,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B applymovement 2, MtChimney_Movement_27259A waitmovement 0 msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF + trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT closemessage delay 30 @@ -411,12 +411,12 @@ MtChimney_EventScript_22F065:: @ 822F065 end MtChimney_EventScript_22F06E:: @ 822F06E - trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C + trainerbattle_normal TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F085:: @ 822F085 - trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A + trainerbattle_normal TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE end @@ -487,7 +487,7 @@ MtChimney_EventScript_22F141:: @ 822F141 end MtChimney_EventScript_22F14A:: @ 822F14A - trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 + trainerbattle_normal TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 @@ -504,32 +504,32 @@ MtChimney_EventScript_22F176:: @ 822F176 end MtChimney_EventScript_22F195:: @ 822F195 - trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB + trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_230153, MtChimney_Text_2301BB msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1AC:: @ 822F1AC - trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D + trainerbattle_normal TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1C3:: @ 822F1C3 - trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304 + trainerbattle_normal TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304 msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1DA:: @ 822F1DA - trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436 + trainerbattle_normal TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436 msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1F1:: @ 822F1F1 - trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921 + trainerbattle_normal TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921 msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F208:: @ 822F208 - trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 + trainerbattle_normal TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 @@ -546,7 +546,7 @@ MtChimney_EventScript_22F234:: @ 822F234 end MtChimney_EventScript_22F253:: @ 822F253 - trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3 + trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_23059C, MtChimney_Text_2305E3 msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 752c17fcc..5b94690b8 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -18,27 +18,27 @@ MtPyre_2F_EventScript_23111F:: @ 823111F end MtPyre_2F_EventScript_231128:: @ 8231128 - trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 + trainerbattle_normal TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23113F:: @ 823113F - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23115A:: @ 823115A - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_231175:: @ 8231175 - trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 + trainerbattle_normal TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23118C:: @ 823118C - trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 + trainerbattle_normal TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 7c84290de..ef31d7ef3 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,17 +2,17 @@ MtPyre_3F_MapScripts:: @ 8231752 .byte 0 MtPyre_3F_EventScript_231753:: @ 8231753 - trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 + trainerbattle_normal TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_23176A:: @ 823176A - trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD + trainerbattle_normal TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_231781:: @ 8231781 - trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD + trainerbattle_normal TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC @@ -29,7 +29,7 @@ MtPyre_3F_EventScript_2317AD:: @ 82317AD end MtPyre_3F_EventScript_2317CC:: @ 82317CC - trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 + trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index 2e6e3fc55..74844f55b 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_4F_MapScripts:: @ 8231BC8 .byte 0 MtPyre_5F_EventScript_231BC9:: @ 8231BC9 - trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 + trainerbattle_normal TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 732658663..43916a546 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_5F_MapScripts:: @ 8231C6D .byte 0 MtPyre_4F_EventScript_231C6E:: @ 8231C6E - trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB + trainerbattle_normal TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index c82827d4f..83a104bac 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 8231D3A .byte 0 MtPyre_6F_EventScript_231D3B:: @ 8231D3B - trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 + trainerbattle_normal TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 @@ -19,12 +19,12 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67 end MtPyre_6F_EventScript_231D86:: @ 8231D86 - trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB + trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE end MtPyre_6F_EventScript_231D9D:: @ 8231D9D - trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A + trainerbattle_normal TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index d0c9fcc6a..cfff1c354 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -425,22 +425,22 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8 step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 + trainerbattle_normal TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 + trainerbattle_normal TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 + trainerbattle_normal TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A + trainerbattle_normal TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 71d03cfe9..d6acdb0ec 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -379,7 +379,7 @@ PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC end PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 - trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A + trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A msgbox PetalburgCity_Gym_Text_2075F7, MSGBOX_AUTOCLOSE end @@ -413,7 +413,7 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B msgbox PetalburgCity_Gym_Text_205FE5, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107 + trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 message PetalburgCity_Gym_Text_206162 waitmessage call PetalburgCity_Gym_EventScript_27207E @@ -958,7 +958,7 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 end PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA - trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE + trainerbattle_normal TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2053ED msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE @@ -976,7 +976,7 @@ PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED end PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 - trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A + trainerbattle_normal TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205429 msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE @@ -994,7 +994,7 @@ PetalburgCity_Gym_EventScript_205429:: @ 8205429 end PetalburgCity_Gym_EventScript_205432:: @ 8205432 - trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 + trainerbattle_normal TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205465 msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE @@ -1012,7 +1012,7 @@ PetalburgCity_Gym_EventScript_205465:: @ 8205465 end PetalburgCity_Gym_EventScript_20546E:: @ 820546E - trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 + trainerbattle_normal TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054A1 msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE @@ -1030,7 +1030,7 @@ PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 end PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA - trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE + trainerbattle_normal TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054DD msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE @@ -1048,7 +1048,7 @@ PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD end PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 - trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A + trainerbattle_normal TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205519 msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE @@ -1066,7 +1066,7 @@ PetalburgCity_Gym_EventScript_205519:: @ 8205519 end PetalburgCity_Gym_EventScript_205522:: @ 8205522 - trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 + trainerbattle_normal TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205555 msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 81ad5ad3d..c5c71a0e4 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -26,7 +26,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 applymovement 3, PetalburgWoods_Movement_22E20E waitmovement 0 msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 @@ -62,7 +62,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 applymovement 255, PetalburgWoods_Movement_2725A6 waitmovement 0 msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 @@ -273,12 +273,12 @@ PetalburgWoods_EventScript_22E264:: @ 822E264 end PetalburgWoods_EventScript_22E26D:: @ 822E26D - trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 + trainerbattle_normal TRAINER_LYLE, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 msgbox PetalburgWoods_Text_22E7EF, MSGBOX_AUTOCLOSE end PetalburgWoods_EventScript_22E284:: @ 822E284 - trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 + trainerbattle_normal TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq PetalburgWoods_EventScript_22E31B @@ -318,7 +318,7 @@ PetalburgWoods_EventScript_22E302:: @ 822E302 end PetalburgWoods_EventScript_22E31B:: @ 822E31B - trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 + trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 msgbox PetalburgWoods_Text_22E9B6, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index ca6de7d9c..3430c054b 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC end Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + trainerbattle_normal TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C @@ -58,22 +58,22 @@ Route102_EventScript_1EC183:: @ 81EC183 end Route102_EventScript_1EC19C:: @ 81EC19C - trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C + trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 + trainerbattle_normal TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 + trainerbattle_normal TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA + trainerbattle_normal TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 2f9c12207..4e7cf12f8 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -62,32 +62,32 @@ Route103_EventScript_1EC434:: @ 81EC434 end Route103_EventScript_1EC48E:: @ 81EC48E - trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC49E:: @ 81EC49E - trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC4AE:: @ 81EC4AE - trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC4BE:: @ 81EC4BE - trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end Route103_EventScript_1EC4CE:: @ 81EC4CE - trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end Route103_EventScript_1EC4DE:: @ 81EC4DE - trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end @@ -203,12 +203,12 @@ Route103_EventScript_1EC5EB:: @ 81EC5EB end Route103_EventScript_1EC5F4:: @ 81EC5F4 - trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F + trainerbattle_normal TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC60B:: @ 81EC60B - trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC653 @@ -222,12 +222,12 @@ Route103_EventScript_1EC63A:: @ 81EC63A end Route103_EventScript_1EC653:: @ 81EC653 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC66E:: @ 81EC66E - trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC6B6 @@ -241,17 +241,17 @@ Route103_EventScript_1EC69D:: @ 81EC69D end Route103_EventScript_1EC6B6:: @ 81EC6B6 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6D1:: @ 81EC6D1 - trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92 + trainerbattle_normal TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92 msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6E8:: @ 81EC6E8 - trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 + trainerbattle_normal TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC733 @@ -268,27 +268,27 @@ Route103_EventScript_1EC714:: @ 81EC714 end Route103_EventScript_1EC733:: @ 81EC733 - trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006 + trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_294FC3, Route103_Text_295006 msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC74A:: @ 81EC74A - trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B + trainerbattle_normal TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC761:: @ 81EC761 - trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6 + trainerbattle_normal TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6 msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC778:: @ 81EC778 - trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093 + trainerbattle_normal TRAINER_PETE, Route103_Text_295063, Route103_Text_295093 msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC78F:: @ 81EC78F - trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146 + trainerbattle_normal TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146 msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 70c6d33cc..f46482eb5 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -172,19 +172,19 @@ Route104_EventScript_1ECE31:: @ 81ECE31 return Route104_EventScript_1ECE36:: @ 81ECE36 - trainerbattle 3, TRAINER_MAY_14, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE49:: @ 81ECE49 - trainerbattle 3, TRAINER_MAY_15, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE5C:: @ 81ECE5C - trainerbattle 3, TRAINER_MAY_10, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end @@ -244,19 +244,19 @@ Route104_EventScript_1ECF38:: @ 81ECF38 end Route104_EventScript_1ECF4D:: @ 81ECF4D - trainerbattle 3, TRAINER_BRENDAN_10, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end Route104_EventScript_1ECF60:: @ 81ECF60 - trainerbattle 3, TRAINER_BRENDAN_12, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end Route104_EventScript_1ECF73:: @ 81ECF73 - trainerbattle 3, TRAINER_BRENDAN_11, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end @@ -871,17 +871,17 @@ Route104_Movement_1ED35C: @ 81ED35C step_end Route104_EventScript_1ED35F:: @ 81ED35F - trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509 + trainerbattle_normal TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509 msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED376:: @ 81ED376 - trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4 + trainerbattle_normal TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4 msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED38D:: @ 81ED38D - trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE + trainerbattle_normal TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED424 @@ -921,12 +921,12 @@ Route104_EventScript_1ED40B:: @ 81ED40B end Route104_EventScript_1ED424:: @ 81ED424 - trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0 + trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_2957D7, Route104_Text_2957F0 msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED43B:: @ 81ED43B - trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C + trainerbattle_normal TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED4D2 @@ -966,12 +966,12 @@ Route104_EventScript_1ED4B9:: @ 81ED4B9 end Route104_EventScript_1ED4D2:: @ 81ED4D2 - trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC + trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_2959BC, Route104_Text_2959FC msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED4E9:: @ 81ED4E9 - trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A + trainerbattle_normal TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED580 @@ -1011,26 +1011,26 @@ Route104_EventScript_1ED567:: @ 81ED567 end Route104_EventScript_1ED580:: @ 81ED580 - trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA + trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_295BC8, Route104_Text_295BFA msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED597:: @ 81ED597 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 special GetPlayerBigGuyGirlString msgbox Route104_Text_2952FE, MSGBOX_DEFAULT release end Route104_EventScript_1ED5B6:: @ 81ED5B6 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 special GetPlayerBigGuyGirlString msgbox Route104_Text_29540D, MSGBOX_DEFAULT release end Route104_EventScript_1ED5D5:: @ 81ED5D5 - trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9 + trainerbattle_normal TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9 msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index a96c5c58f..a917bf5b6 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -32,37 +32,37 @@ Route105_MapScript2_1EE240: @ 81EE240 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62 + trainerbattle_normal TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66 + trainerbattle_normal TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA + trainerbattle_normal TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0 + trainerbattle_normal TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059 + trainerbattle_normal TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB + trainerbattle_normal TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 + trainerbattle_normal TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F @@ -79,7 +79,7 @@ Route105_EventScript_1EE300:: @ 81EE300 end Route105_EventScript_1EE31F:: @ 81EE31F - trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD + trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index 4187ae136..e877993f4 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -6,17 +6,17 @@ Route106_EventScript_1EE48A:: @ 81EE48A end Route106_EventScript_1EE493:: @ 81EE493 - trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD + trainerbattle_normal TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4AA:: @ 81EE4AA - trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674 + trainerbattle_normal TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674 msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4C1:: @ 81EE4C1 - trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED + trainerbattle_normal TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route106_EventScript_1EE50C @@ -33,12 +33,12 @@ Route106_EventScript_1EE4ED:: @ 81EE4ED end Route106_EventScript_1EE50C:: @ 81EE50C - trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477 + trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_29642E, Route106_Text_296477 msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE523:: @ 81EE523 - trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553 + trainerbattle_normal TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553 msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 25c11feb0..3344b20f1 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 81EE594 .byte 0 Route107_EventScript_1EE595:: @ 81EE595 - trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F + trainerbattle_normal TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE5AC:: @ 81EE5AC - trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 + trainerbattle_normal TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route107_EventScript_1EE5F7 @@ -24,32 +24,32 @@ Route107_EventScript_1EE5D8:: @ 81EE5D8 end Route107_EventScript_1EE5F7:: @ 81EE5F7 - trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5 + trainerbattle_rematch TRAINER_TONY_1, Route107_Text_296897, Route107_Text_2968D5 msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE60E:: @ 81EE60E - trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E + trainerbattle_normal TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE625:: @ 81EE625 - trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17 + trainerbattle_normal TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17 msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE63C:: @ 81EE63C - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE657:: @ 81EE657 - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE672:: @ 81EE672 - trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD + trainerbattle_normal TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index a833dcc5f..16ecc381d 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,32 +2,32 @@ Route108_MapScripts:: @ 81EE689 .byte 0 Route108_EventScript_1EE68A:: @ 81EE68A - trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C + trainerbattle_normal TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6A1:: @ 81EE6A1 - trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA + trainerbattle_normal TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6B8:: @ 81EE6B8 - trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71 + trainerbattle_normal TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71 msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6CF:: @ 81EE6CF - trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC + trainerbattle_normal TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6E6:: @ 81EE6E6 - trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7 + trainerbattle_normal TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7 msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6FD:: @ 81EE6FD - trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 + trainerbattle_normal TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route108_EventScript_1EE748 @@ -44,7 +44,7 @@ Route108_EventScript_1EE729:: @ 81EE729 end Route108_EventScript_1EE748:: @ 81EE748 - trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036 + trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036 msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index d90e423ff..18cfd858f 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -376,27 +376,27 @@ Route109_EventScript_1EEA34:: @ 81EEA34 end Route109_EventScript_1EEA3D:: @ 81EEA3D - trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D + trainerbattle_normal TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA54:: @ 81EEA54 - trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD + trainerbattle_normal TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA6B:: @ 81EEA6B - trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B + trainerbattle_normal TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA82:: @ 81EEA82 - trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE + trainerbattle_normal TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA99:: @ 81EEA99 - trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 + trainerbattle_normal TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEAE4 @@ -413,12 +413,12 @@ Route109_EventScript_1EEAC5:: @ 81EEAC5 end Route109_EventScript_1EEAE4:: @ 81EEAE4 - trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437 + trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437 msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEAFB:: @ 81EEAFB - trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 + trainerbattle_normal TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEB46 @@ -435,47 +435,47 @@ Route109_EventScript_1EEB27:: @ 81EEB27 end Route109_EventScript_1EEB46:: @ 81EEB46 - trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576 + trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576 msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB5D:: @ 81EEB5D - trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601 + trainerbattle_normal TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601 msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB74:: @ 81EEB74 - trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691 + trainerbattle_normal TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691 msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB8B:: @ 81EEB8B - trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC + trainerbattle_normal TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBA2:: @ 81EEBA2 - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBBD:: @ 81EEBBD - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBD8:: @ 81EEBD8 - trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE + trainerbattle_normal TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBEF:: @ 81EEBEF - trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15 + trainerbattle_normal TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15 msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEC06:: @ 81EEC06 - trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7 + trainerbattle_normal TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7 msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 2836a4acf..4bd2f6157 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -86,17 +86,17 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 end Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 - trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 + trainerbattle_normal TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD - trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 + trainerbattle_normal TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_269518:: @ 8269518 - trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 + trainerbattle_normal TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 09dd38c69..e6c21be2b 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -165,17 +165,17 @@ Route110_EventScript_1EF3E8:: @ 81EF3E8 end Route110_EventScript_1EF3F2:: @ 81EF3F2 - trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064 + trainerbattle_normal TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064 msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF409:: @ 81EF409 - trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5 + trainerbattle_normal TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5 msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF420:: @ 81EF420 - trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C + trainerbattle_normal TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF46B @@ -192,27 +192,27 @@ Route110_EventScript_1EF44C:: @ 81EF44C end Route110_EventScript_1EF46B:: @ 81EF46B - trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288 + trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_298232, Route110_Text_298288 msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF482:: @ 81EF482 - trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5 + trainerbattle_normal TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5 msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF499:: @ 81EF499 - trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77 + trainerbattle_normal TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77 msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4B0:: @ 81EF4B0 - trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F + trainerbattle_normal TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4C7:: @ 81EF4C7 - trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 + trainerbattle_normal TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF512 @@ -229,17 +229,17 @@ Route110_EventScript_1EF4F3:: @ 81EF4F3 end Route110_EventScript_1EF512:: @ 81EF512 - trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E + trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_297D4B, Route110_Text_297D8E msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF529:: @ 81EF529 - trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0 + trainerbattle_normal TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0 msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF540:: @ 81EF540 - trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C + trainerbattle_normal TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF58B @@ -256,12 +256,12 @@ Route110_EventScript_1EF56C:: @ 81EF56C end Route110_EventScript_1EF58B:: @ 81EF58B - trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37 + trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_297F09, Route110_Text_297F37 msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF5A2:: @ 81EF5A2 - trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE + trainerbattle_normal TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF5ED @@ -278,12 +278,12 @@ Route110_EventScript_1EF5CE:: @ 81EF5CE end Route110_EventScript_1EF5ED:: @ 81EF5ED - trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF + trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_298466, Route110_Text_2984AF msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF604:: @ 81EF604 - trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559 + trainerbattle_normal TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559 msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE end @@ -291,17 +291,17 @@ Route110_EventScript_1EF61B:: @ 81EF61B end Route110_EventScript_1EF61C:: @ 81EF61C - trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735 + trainerbattle_normal TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735 msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF633:: @ 81EF633 - trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686 + trainerbattle_normal TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686 msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF64A:: @ 81EF64A - trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9 + trainerbattle_normal TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9 msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE end @@ -421,17 +421,17 @@ Route110_EventScript_1EF7EB:: @ 81EF7EB end Route110_EventScript_1EF81A:: @ 81EF81A - trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end Route110_EventScript_1EF82A:: @ 81EF82A - trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end Route110_EventScript_1EF83A:: @ 81EF83A - trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end @@ -451,17 +451,17 @@ Route110_EventScript_1EF865:: @ 81EF865 end Route110_EventScript_1EF894:: @ 81EF894 - trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end Route110_EventScript_1EF8A4:: @ 81EF8A4 - trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end Route110_EventScript_1EF8B4:: @ 81EF8B4 - trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 519db7c32..bbaf9b446 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,17 +24,17 @@ Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D end Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948 - trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F + trainerbattle_normal TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F - trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 + trainerbattle_normal TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976 - trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E + trainerbattle_normal TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 313f2512a..691ab26c9 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,17 +90,17 @@ Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62 return Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75 - trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 + trainerbattle_normal TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C - trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF + trainerbattle_normal TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3 - trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 + trainerbattle_normal TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 00b4a7923..899279a87 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -302,17 +302,17 @@ Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 end Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4 - trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D + trainerbattle_normal TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB - trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 + trainerbattle_normal TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2 - trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC + trainerbattle_normal TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index a2c811bc4..c7b1a38cd 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,17 +14,17 @@ Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 end Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E - trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E + trainerbattle_normal TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895 - trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 + trainerbattle_normal TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC - trainerbattle 0, TRAINER_PAULA, 0, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB + trainerbattle_normal TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 9ff8c9412..590081dc1 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,17 +28,17 @@ Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 end Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1 - trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 + trainerbattle_normal TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8 - trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D + trainerbattle_normal TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F - trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 + trainerbattle_normal TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3bb1f2495..3e52d51bf 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -304,32 +304,32 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 end Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 - trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 + trainerbattle_normal TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0 - trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 + trainerbattle_normal TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7 - trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 + trainerbattle_normal TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE - trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C + trainerbattle_normal TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5 - trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 + trainerbattle_normal TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC - trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB + trainerbattle_normal TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index a6a698a40..415be2e95 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,17 +14,17 @@ Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 end Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F - trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 + trainerbattle_normal TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836 - trainerbattle 0, TRAINER_KEIRA, 0, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F + trainerbattle_normal TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D - trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 + trainerbattle_normal TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 08d4cb48e..9b6dd9c43 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -288,7 +288,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 Route111_EventScript_1F0FE7:: @ 81F0FE7 msgbox Route111_Text_1F1523, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542 + trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 applymovement 1, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C @@ -306,7 +306,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 call Route111_EventScript_1F1143 msgbox Route111_Text_1F159D, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616 + trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 applymovement 2, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C @@ -324,7 +324,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 call Route111_EventScript_1F1143 msgbox Route111_Text_1F167E, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6 + trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 applymovement 3, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C @@ -342,7 +342,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 call Route111_EventScript_1F1143 msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756 + trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage applymovement 4, Route111_Movement_2725A6 @@ -452,27 +452,27 @@ Route111_EventScript_1F11E4:: @ 81F11E4 end Route111_EventScript_1F1204:: @ 81F1204 - trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A + trainerbattle_normal TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE end Route111_EventScript_1F121B:: @ 81F121B - trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908 + trainerbattle_normal TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908 msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1232:: @ 81F1232 - trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6 + trainerbattle_normal TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6 msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1249:: @ 81F1249 - trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF + trainerbattle_normal TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1260:: @ 81F1260 - trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C + trainerbattle_normal TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB @@ -489,27 +489,27 @@ Route111_EventScript_1F128C:: @ 81F128C end Route111_EventScript_1F12AB:: @ 81F12AB - trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2 + trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2 msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12C2:: @ 81F12C2 - trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8 + trainerbattle_normal TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8 msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12D9:: @ 81F12D9 - trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E + trainerbattle_normal TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12F0:: @ 81F12F0 - trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14 + trainerbattle_normal TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14 msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1307:: @ 81F1307 - trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 + trainerbattle_normal TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 @@ -526,12 +526,12 @@ Route111_EventScript_1F1333:: @ 81F1333 end Route111_EventScript_1F1352:: @ 81F1352 - trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE + trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1369:: @ 81F1369 - trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 + trainerbattle_normal TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 @@ -548,42 +548,42 @@ Route111_EventScript_1F1395:: @ 81F1395 end Route111_EventScript_1F13B4:: @ 81F13B4 - trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6 + trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6 msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13CB:: @ 81F13CB - trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE + trainerbattle_normal TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13E2:: @ 81F13E2 - trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D + trainerbattle_normal TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13F9:: @ 81F13F9 - trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549 + trainerbattle_normal TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549 msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1410:: @ 81F1410 - trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625 + trainerbattle_normal TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625 msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1427:: @ 81F1427 - trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384 + trainerbattle_normal TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384 msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE end Route111_EventScript_1F143E:: @ 81F143E - trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431 + trainerbattle_normal TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431 msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1455:: @ 81F1455 - trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5 + trainerbattle_normal TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5 msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index ec18e56da..4d4ac58cc 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -61,12 +61,12 @@ Route112_EventScript_1F1E61:: @ 81F1E61 end Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA + trainerbattle_normal TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD + trainerbattle_normal TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC @@ -83,27 +83,27 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD end Route112_EventScript_1F1ECC:: @ 81F1ECC - trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 + trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7 msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC + trainerbattle_normal TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 + trainerbattle_normal TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF + trainerbattle_normal TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F + trainerbattle_normal TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 35611fd6a..42a619cd2 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_1F21B7:: @ 81F21B7 end Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68 + trainerbattle_normal TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C + trainerbattle_normal TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A + trainerbattle_normal TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 @@ -76,12 +76,12 @@ Route113_EventScript_1F221A:: @ 81F221A end Route113_EventScript_1F2239:: @ 81F2239 - trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9 + trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9 msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C + trainerbattle_normal TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B @@ -98,42 +98,42 @@ Route113_EventScript_1F227C:: @ 81F227C end Route113_EventScript_1F229B:: @ 81F229B - trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F + trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6 + trainerbattle_normal TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22C9:: @ 81F22C9 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22E4:: @ 81F22E4 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508 + trainerbattle_normal TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480 + trainerbattle_normal TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE end Route113_EventScript_1F232D:: @ 81F232D - trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0 + trainerbattle_normal TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628 + trainerbattle_normal TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 6e702be1c..1f24b4204 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -89,27 +89,27 @@ Route114_EventScript_1F2637:: @ 81F2637 end Route114_EventScript_1F2640:: @ 81F2640 - trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_29A6B1, Route114_Text_29A707 + trainerbattle_normal TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707 msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2657:: @ 81F2657 - trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_29A777, Route114_Text_29A7B5 + trainerbattle_normal TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5 msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE end Route114_EventScript_1F266E:: @ 81F266E - trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_29A818, Route114_Text_29A88F + trainerbattle_normal TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2685:: @ 81F2685 - trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_29A8D9, Route114_Text_29A90E + trainerbattle_normal TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE end Route114_EventScript_1F269C:: @ 81F269C - trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 + trainerbattle_normal TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F26E7 @@ -126,12 +126,12 @@ Route114_EventScript_1F26C8:: @ 81F26C8 end Route114_EventScript_1F26E7:: @ 81F26E7 - trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_29AA3E, Route114_Text_29AA67 + trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67 msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE end Route114_EventScript_1F26FE:: @ 81F26FE - trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A + trainerbattle_normal TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F2749 @@ -148,42 +148,42 @@ Route114_EventScript_1F272A:: @ 81F272A end Route114_EventScript_1F2749:: @ 81F2749 - trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_29ABDC, Route114_Text_29AC10 + trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10 msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2760:: @ 81F2760 - trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_29ACB3, Route114_Text_29AD0A + trainerbattle_normal TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2777:: @ 81F2777 - trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_29ADA1, Route114_Text_29AE05 + trainerbattle_normal TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05 msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE end Route114_EventScript_1F278E:: @ 81F278E - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27A9:: @ 81F27A9 - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27C4:: @ 81F27C4 - trainerbattle 0, TRAINER_ANGELINA, 0, Route114_Text_29B16F, Route114_Text_29B19C + trainerbattle_normal TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27DB:: @ 81F27DB - trainerbattle 0, TRAINER_CHARLOTTE, 0, Route114_Text_29B0DB, Route114_Text_29B0FB + trainerbattle_normal TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27F2:: @ 81F27F2 - trainerbattle 0, TRAINER_KAI, 0, Route114_Text_29B05D, Route114_Text_29B089 + trainerbattle_normal TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089 msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 37763c1e1..66e5e3fb1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -37,7 +37,7 @@ Route115_EventScript_1F2985:: @ 81F2985 end Route115_EventScript_1F298E:: @ 81F298E - trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA + trainerbattle_normal TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 @@ -54,17 +54,17 @@ Route115_EventScript_1F29BA:: @ 81F29BA end Route115_EventScript_1F29D9:: @ 81F29D9 - trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372 + trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372 msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE end Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED + trainerbattle_normal TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 + trainerbattle_normal TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 @@ -81,12 +81,12 @@ Route115_EventScript_1F2A33:: @ 81F2A33 end Route115_EventScript_1F2A52:: @ 81F2A52 - trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D + trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 + trainerbattle_normal TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 @@ -103,37 +103,37 @@ Route115_EventScript_1F2A95:: @ 81F2A95 end Route115_EventScript_1F2AB4:: @ 81F2AB4 - trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A + trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5 + trainerbattle_normal TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D + trainerbattle_normal TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8 + trainerbattle_normal TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6 + trainerbattle_normal TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958 + trainerbattle_normal TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67 + trainerbattle_normal TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 4e5c8892f..8b689677d 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -248,17 +248,17 @@ Route116_Movement_1F2E7E: @ 81F2E7E step_end Route116_EventScript_1F2E89:: @ 81F2E89 - trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A + trainerbattle_normal TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EA0:: @ 81F2EA0 - trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25 + trainerbattle_normal TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25 msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EB7:: @ 81F2EB7 - trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 + trainerbattle_normal TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2F4E @@ -298,22 +298,22 @@ Route116_EventScript_1F2F35:: @ 81F2F35 end Route116_EventScript_1F2F4E:: @ 81F2F4E - trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C + trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F65:: @ 81F2F65 - trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F + trainerbattle_normal TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F7C:: @ 81F2F7C - trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3 + trainerbattle_normal TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3 msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F93:: @ 81F2F93 - trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 + trainerbattle_normal TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F302A @@ -353,27 +353,27 @@ Route116_EventScript_1F3011:: @ 81F3011 end Route116_EventScript_1F302A:: @ 81F302A - trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F + trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3041:: @ 81F3041 - trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8 + trainerbattle_normal TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8 msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3058:: @ 81F3058 - trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2 + trainerbattle_normal TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2 msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE end Route116_EventScript_1F306F:: @ 81F306F - trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365 + trainerbattle_normal TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365 msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3086:: @ 81F3086 - trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7 + trainerbattle_normal TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7 msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 12e6651fe..05dc75fe7 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -39,7 +39,7 @@ Route117_EventScript_1F39C7:: @ 81F39C7 end Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC + trainerbattle_normal TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A1B @@ -56,12 +56,12 @@ Route117_EventScript_1F39FC:: @ 81F39FC end Route117_EventScript_1F3A1B:: @ 81F3A1B - trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B + trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A32:: @ 81F3A32 - trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E + trainerbattle_normal TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A7D @@ -78,12 +78,12 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E end Route117_EventScript_1F3A7D:: @ 81F3A7D - trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E + trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A94:: @ 81F3A94 - trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 + trainerbattle_normal TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3ADF @@ -100,12 +100,12 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0 end Route117_EventScript_1F3ADF:: @ 81F3ADF - trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 + trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3 msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3AF6:: @ 81F3AF6 - trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 + trainerbattle_normal TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3B41 @@ -122,17 +122,17 @@ Route117_EventScript_1F3B22:: @ 81F3B22 end Route117_EventScript_1F3B41:: @ 81F3B41 - trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC + trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B58:: @ 81F3B58 - trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_29CB32, Route117_Text_29CB87 + trainerbattle_normal TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B6F:: @ 81F3B6F - trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3BB8 @@ -147,12 +147,12 @@ Route117_EventScript_1F3B9F:: @ 81F3B9F end Route117_EventScript_1F3BB8:: @ 81F3BB8 - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3BD3:: @ 81F3BD3 - trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3C1C @@ -167,22 +167,22 @@ Route117_EventScript_1F3C03:: @ 81F3C03 end Route117_EventScript_1F3C1C:: @ 81F3C1C - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C37:: @ 81F3C37 - trainerbattle 0, TRAINER_MELINA, 0, Route117_Text_29D0B7, Route117_Text_29D0F1 + trainerbattle_normal TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C4E:: @ 81F3C4E - trainerbattle 0, TRAINER_BRANDI, 0, Route117_Text_29D14B, Route117_Text_29D189 + trainerbattle_normal TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C65:: @ 81F3C65 - trainerbattle 0, TRAINER_AISHA, 0, Route117_Text_29D1D1, Route117_Text_29D206 + trainerbattle_normal TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 56ec024a1..f892b64aa 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -187,7 +187,7 @@ Route118_Movement_1F3F7E: @ 81F3F7E step_end Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 + trainerbattle_normal TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 @@ -204,22 +204,22 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3 end Route118_EventScript_1F3FD2:: @ 81F3FD2 - trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA + trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE end Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C + trainerbattle_normal TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C + trainerbattle_normal TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 + trainerbattle_normal TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 @@ -236,22 +236,22 @@ Route118_EventScript_1F4043:: @ 81F4043 end Route118_EventScript_1F4062:: @ 81F4062 - trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA + trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B + trainerbattle_normal TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4 + trainerbattle_normal TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE end Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C + trainerbattle_normal TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 36ad9115d..b8e441dca 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -87,17 +87,17 @@ Route119_EventScript_1F450B:: @ 81F450B end Route119_EventScript_1F453A:: @ 81F453A - trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end Route119_EventScript_1F454A:: @ 81F454A - trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end Route119_EventScript_1F455A:: @ 81F455A - trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end @@ -117,17 +117,17 @@ Route119_EventScript_1F4585:: @ 81F4585 end Route119_EventScript_1F45B4:: @ 81F45B4 - trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end Route119_EventScript_1F45C4:: @ 81F45C4 - trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end Route119_EventScript_1F45D4:: @ 81F45D4 - trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end @@ -337,37 +337,37 @@ Route119_EventScript_1F477D:: @ 81F477D end Route119_EventScript_1F4786:: @ 81F4786 - trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0 + trainerbattle_normal TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0 msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE end Route119_EventScript_1F479D:: @ 81F479D - trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C + trainerbattle_normal TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47B4:: @ 81F47B4 - trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14 + trainerbattle_normal TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14 msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47CB:: @ 81F47CB - trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC + trainerbattle_normal TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47E2:: @ 81F47E2 - trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66 + trainerbattle_normal TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66 msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47F9:: @ 81F47F9 - trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20 + trainerbattle_normal TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20 msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4810:: @ 81F4810 - trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C + trainerbattle_normal TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F485B @@ -384,12 +384,12 @@ Route119_EventScript_1F483C:: @ 81F483C end Route119_EventScript_1F485B:: @ 81F485B - trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5 + trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5 msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4872:: @ 81F4872 - trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E + trainerbattle_normal TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F48BD @@ -406,52 +406,52 @@ Route119_EventScript_1F489E:: @ 81F489E end Route119_EventScript_1F48BD:: @ 81F48BD - trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92 + trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92 msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48D4:: @ 81F48D4 - trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063 + trainerbattle_normal TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063 msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48EB:: @ 81F48EB - trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1 + trainerbattle_normal TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1 msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4902:: @ 81F4902 - trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D + trainerbattle_normal TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4919:: @ 81F4919 - trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B + trainerbattle_normal TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4930:: @ 81F4930 - trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288 + trainerbattle_normal TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288 msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4947:: @ 81F4947 - trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372 + trainerbattle_normal TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372 msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE end Route119_EventScript_1F495E:: @ 81F495E - trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F + trainerbattle_normal TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4975:: @ 81F4975 - trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513 + trainerbattle_normal TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513 msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE end Route119_EventScript_1F498C:: @ 81F498C - trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1 + trainerbattle_normal TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1 msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 2057f8568..ba132a56b 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -65,12 +65,12 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 end Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 - trainerbattle 0, TRAINER_GRUNT_11, 0, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB + trainerbattle_normal TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 - trainerbattle 0, TRAINER_GRUNT_20, 0, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 + trainerbattle_normal TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index e269f5ec7..36b9081af 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -27,22 +27,22 @@ Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C return Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 - trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F + trainerbattle_normal TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F - trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 + trainerbattle_normal TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 - trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE + trainerbattle_normal TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD - trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 + trainerbattle_normal TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6b41400d5..6a3343e4a 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -291,12 +291,12 @@ Route120_EventScript_1F57CE:: @ 81F57CE end Route120_EventScript_1F57D7:: @ 81F57D7 - trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665 + trainerbattle_normal TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665 msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE end Route120_EventScript_1F57EE:: @ 81F57EE - trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A + trainerbattle_normal TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F5839 @@ -313,22 +313,22 @@ Route120_EventScript_1F581A:: @ 81F581A end Route120_EventScript_1F5839:: @ 81F5839 - trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1 + trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_29E7AA, Route120_Text_29E7E1 msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5850:: @ 81F5850 - trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884 + trainerbattle_normal TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884 msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5867:: @ 81F5867 - trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980 + trainerbattle_normal TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980 msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE end Route120_EventScript_1F587E:: @ 81F587E - trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA + trainerbattle_normal TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F58C9 @@ -345,47 +345,47 @@ Route120_EventScript_1F58AA:: @ 81F58AA end Route120_EventScript_1F58C9:: @ 81F58C9 - trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F + trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_29EA61, Route120_Text_29EA8F msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58E0:: @ 81F58E0 - trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53 + trainerbattle_normal TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53 msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58F7:: @ 81F58F7 - trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25 + trainerbattle_normal TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25 msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE end Route120_EventScript_1F590E:: @ 81F590E - trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF + trainerbattle_normal TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5925:: @ 81F5925 - trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3 + trainerbattle_normal TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3 msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE end Route120_EventScript_1F593C:: @ 81F593C - trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97 + trainerbattle_normal TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97 msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5953:: @ 81F5953 - trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63 + trainerbattle_normal TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63 msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE end Route120_EventScript_1F596A:: @ 81F596A - trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080 + trainerbattle_normal TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080 msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5981:: @ 81F5981 - trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1 + trainerbattle_normal TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1 msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 9c683c70d..efaf46f5a 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -66,12 +66,12 @@ Route121_Movement_1F5E6B: @ 81F5E6B step_end Route121_EventScript_1F5E74:: @ 81F5E74 - trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F + trainerbattle_normal TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5E8B:: @ 81F5E8B - trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 + trainerbattle_normal TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 @@ -88,27 +88,27 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7 end Route121_EventScript_1F5ED6:: @ 81F5ED6 - trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A + trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_29F2A6, Route121_Text_29F31A msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5EED:: @ 81F5EED - trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9 + trainerbattle_normal TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F04:: @ 81F5F04 - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F1F:: @ 81F5F1F - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F3A:: @ 81F5F3A - trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 + trainerbattle_normal TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 @@ -125,32 +125,32 @@ Route121_EventScript_1F5F66:: @ 81F5F66 end Route121_EventScript_1F5F85:: @ 81F5F85 - trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710 + trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_29F6E4, Route121_Text_29F710 msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F9C:: @ 81F5F9C - trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B + trainerbattle_normal TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FB3:: @ 81F5FB3 - trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64 + trainerbattle_normal TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FCA:: @ 81F5FCA - trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8 + trainerbattle_normal TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FE1:: @ 81F5FE1 - trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C + trainerbattle_normal TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FF8:: @ 81F5FF8 - trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 + trainerbattle_normal TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 @@ -167,7 +167,7 @@ Route121_EventScript_1F6024:: @ 81F6024 end Route121_EventScript_1F6043:: @ 81F6043 - trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8 + trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_29F855, Route121_Text_29F8A8 msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 5e0f97493..193c33368 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -46,22 +46,22 @@ Route123_EventScript_1F61BC:: @ 81F61BC end Route123_EventScript_1F61C5:: @ 81F61C5 - trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_29FBEB, Route123_Text_29FC23 + trainerbattle_normal TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23 msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61DC:: @ 81F61DC - trainerbattle 0, TRAINER_BRAXTON, 0, Route123_Text_29FC6F, Route123_Text_29FCD6 + trainerbattle_normal TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6 msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61F3:: @ 81F61F3 - trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_29FD1D, Route123_Text_29FD53 + trainerbattle_normal TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53 msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F620A:: @ 81F620A - trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 + trainerbattle_normal TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 @@ -78,12 +78,12 @@ Route123_EventScript_1F6236:: @ 81F6236 end Route123_EventScript_1F6255:: @ 81F6255 - trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_29FED4, Route123_Text_29FF1B + trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_29FED4, Route123_Text_29FF1B msgbox Route123_Text_29FF27, MSGBOX_AUTOCLOSE end Route123_EventScript_1F626C:: @ 81F626C - trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 + trainerbattle_normal TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 @@ -100,62 +100,62 @@ Route123_EventScript_1F6298:: @ 81F6298 end Route123_EventScript_1F62B7:: @ 81F62B7 - trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_2A005E, Route123_Text_2A008D + trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_2A005E, Route123_Text_2A008D msgbox Route123_Text_2A0099, MSGBOX_AUTOCLOSE end Route123_EventScript_1F62CE:: @ 81F62CE - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D msgbox Route123_Text_2A012E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F62E9:: @ 81F62E9 - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 msgbox Route123_Text_2A01EE, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6304:: @ 81F6304 - trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_2A025F, Route123_Text_2A02A6 + trainerbattle_normal TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6 msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE end Route123_EventScript_1F631B:: @ 81F631B - trainerbattle 0, TRAINER_FREDRICK, 0, Route123_Text_2A060A, Route123_Text_2A0631 + trainerbattle_normal TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631 msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6332:: @ 81F6332 - trainerbattle 0, TRAINER_ALBERTO, 0, Route123_Text_2A06AF, Route123_Text_2A0704 + trainerbattle_normal TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704 msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6349:: @ 81F6349 - trainerbattle 0, TRAINER_ED, 0, Route123_Text_2A079B, Route123_Text_2A07F0 + trainerbattle_normal TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0 msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6360:: @ 81F6360 - trainerbattle 0, TRAINER_KAYLEY, 0, Route123_Text_2A0902, Route123_Text_2A0943 + trainerbattle_normal TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943 msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6377:: @ 81F6377 - trainerbattle 0, TRAINER_JONAS, 0, Route123_Text_2A0854, Route123_Text_2A088A + trainerbattle_normal TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE end Route123_EventScript_1F638E:: @ 81F638E - trainerbattle 0, TRAINER_JAZMYN, 0, Route123_Text_2A054E, Route123_Text_2A0592 + trainerbattle_normal TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592 msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63A5:: @ 81F63A5 - trainerbattle 0, TRAINER_DAVIS, 0, Route123_Text_2A04C0, Route123_Text_2A04FE + trainerbattle_normal TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63BC:: @ 81F63BC - trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 + trainerbattle_normal TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 @@ -172,7 +172,7 @@ Route123_EventScript_1F63E8:: @ 81F63E8 end Route123_EventScript_1F6407:: @ 81F6407 - trainerbattle 5, TRAINER_FERNANDO_1, 0, Route123_Text_2A03FB, Route123_Text_2A045A + trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_2A03FB, Route123_Text_2A045A msgbox Route123_Text_2A0487, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 530e0703a..914189ca0 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -12,17 +12,17 @@ Route124_EventScript_1F657C:: @ 81F657C end Route124_EventScript_1F6585:: @ 81F6585 - trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 + trainerbattle_normal TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE end Route124_EventScript_1F659C:: @ 81F659C - trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC + trainerbattle_normal TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE end Route124_EventScript_1F65B3:: @ 81F65B3 - trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF + trainerbattle_normal TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE @@ -39,22 +39,22 @@ Route124_EventScript_1F65DF:: @ 81F65DF end Route124_EventScript_1F65FE:: @ 81F65FE - trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 + trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0 msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6615:: @ 81F6615 - trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D + trainerbattle_normal TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE end Route124_EventScript_1F662C:: @ 81F662C - trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF + trainerbattle_normal TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6643:: @ 81F6643 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C @@ -69,12 +69,12 @@ Route124_EventScript_1F6673:: @ 81F6673 end Route124_EventScript_1F668C:: @ 81F668C - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE end Route124_EventScript_1F66A7:: @ 81F66A7 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 @@ -89,17 +89,17 @@ Route124_EventScript_1F66D7:: @ 81F66D7 end Route124_EventScript_1F66F0:: @ 81F66F0 - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F670B:: @ 81F670B - trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C + trainerbattle_normal TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6722:: @ 81F6722 - trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC + trainerbattle_normal TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index b2061f325..c0e36be66 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -27,27 +27,27 @@ Route125_MapScript2_1F679A: @ 81F679A .2byte 0 Route125_EventScript_1F67A4:: @ 81F67A4 - trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A + trainerbattle_normal TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67BB:: @ 81F67BB - trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7 + trainerbattle_normal TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7 msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67D2:: @ 81F67D2 - trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D + trainerbattle_normal TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67E9:: @ 81F67E9 - trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5 + trainerbattle_normal TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5 msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6800:: @ 81F6800 - trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C + trainerbattle_normal TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B @@ -64,27 +64,27 @@ Route125_EventScript_1F682C:: @ 81F682C end Route125_EventScript_1F684B:: @ 81F684B - trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851 + trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_2A180E, Route125_Text_2A1851 msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6862:: @ 81F6862 - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE end Route125_EventScript_1F687D:: @ 81F687D - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6898:: @ 81F6898 - trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E + trainerbattle_normal TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE end Route125_EventScript_1F68AF:: @ 81F68AF - trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD + trainerbattle_normal TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index a773feb2b..8728b6f2d 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -8,42 +8,42 @@ Route126_MapScript1_1F68CC: @ 81F68CC end Route126_EventScript_1F68D6:: @ 81F68D6 - trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8 + trainerbattle_normal TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8 msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE end Route126_EventScript_1F68ED:: @ 81F68ED - trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63 + trainerbattle_normal TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63 msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6904:: @ 81F6904 - trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8 + trainerbattle_normal TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8 msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE end Route126_EventScript_1F691B:: @ 81F691B - trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63 + trainerbattle_normal TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63 msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6932:: @ 81F6932 - trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6 + trainerbattle_normal TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6 msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6949:: @ 81F6949 - trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3 + trainerbattle_normal TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3 msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6960:: @ 81F6960 - trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216 + trainerbattle_normal TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216 msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6977:: @ 81F6977 - trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 + trainerbattle_normal TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route126_EventScript_1F69C2 @@ -60,7 +60,7 @@ Route126_EventScript_1F69A3:: @ 81F69A3 end Route126_EventScript_1F69C2:: @ 81F69C2 - trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8 + trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8 msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 399e7a428..c6c560010 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -27,42 +27,42 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 - trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294 + trainerbattle_normal TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A4C:: @ 81F6A4C - trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315 + trainerbattle_normal TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A63:: @ 81F6A63 - trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1 + trainerbattle_normal TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A7A:: @ 81F6A7A - trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483 + trainerbattle_normal TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A91:: @ 81F6A91 - trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B + trainerbattle_normal TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AA8:: @ 81F6AA8 - trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1 + trainerbattle_normal TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6ABF:: @ 81F6ABF - trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC + trainerbattle_normal TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AD6:: @ 81F6AD6 - trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 + trainerbattle_normal TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 @@ -79,7 +79,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02 end Route127_EventScript_1F6B21:: @ 81F6B21 - trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B + trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 0d7a8587c..72fc41e03 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -176,7 +176,7 @@ Route128_Movement_1F6CBB: @ 81F6CBB step_end Route128_EventScript_1F6CBE:: @ 81F6CBE - trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA + trainerbattle_normal TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 @@ -193,12 +193,12 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA end Route128_EventScript_1F6D09:: @ 81F6D09 - trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8 + trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8 msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D20:: @ 81F6D20 - trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C + trainerbattle_normal TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B @@ -215,32 +215,32 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C end Route128_EventScript_1F6D6B:: @ 81F6D6B - trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB + trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D82:: @ 81F6D82 - trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79 + trainerbattle_normal TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D99:: @ 81F6D99 - trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE + trainerbattle_normal TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DB0:: @ 81F6DB0 - trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9 + trainerbattle_normal TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DC7:: @ 81F6DC7 - trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44 + trainerbattle_normal TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DDE:: @ 81F6DDE - trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA + trainerbattle_normal TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index c9cb8a305..8649f903b 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -32,27 +32,27 @@ Route129_MapScript2_1F72E2: @ 81F72E2 .2byte 0 Route129_EventScript_1F72EC:: @ 81F72EC - trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D + trainerbattle_normal TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7303:: @ 81F7303 - trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034 + trainerbattle_normal TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034 msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE end Route129_EventScript_1F731A:: @ 81F731A - trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1 + trainerbattle_normal TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1 msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7331:: @ 81F7331 - trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D + trainerbattle_normal TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7348:: @ 81F7348 - trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239 + trainerbattle_normal TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239 msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index badd68dc0..91c3dde49 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -36,17 +36,17 @@ Route130_EventScript_1F73B5:: @ 81F73B5 return Route130_EventScript_1F73BF:: @ 81F73BF - trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 + trainerbattle_normal TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73D6:: @ 81F73D6 - trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC + trainerbattle_normal TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73ED:: @ 81F73ED - trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D + trainerbattle_normal TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 4afd3bbcf..07647a959 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -18,42 +18,42 @@ Route131_EventScript_1F741F:: @ 81F741F return Route131_EventScript_1F7429:: @ 81F7429 - trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_2A34C8, Route131_Text_2A350D + trainerbattle_normal TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7440:: @ 81F7440 - trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_2A35C6, Route131_Text_2A3626 + trainerbattle_normal TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626 msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7457:: @ 81F7457 - trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_2A367B, Route131_Text_2A36AB + trainerbattle_normal TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE end Route131_EventScript_1F746E:: @ 81F746E - trainerbattle 0, TRAINER_KARA, 0, Route131_Text_2A3751, Route131_Text_2A378A + trainerbattle_normal TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7485:: @ 81F7485 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74A0:: @ 81F74A0 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74BB:: @ 81F74BB - trainerbattle 0, TRAINER_TALIA, 0, Route131_Text_2A39FE, Route131_Text_2A3A38 + trainerbattle_normal TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38 msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74D2:: @ 81F74D2 - trainerbattle 0, TRAINER_KEVIN, 0, Route131_Text_2A3AA0, Route131_Text_2A3AFC + trainerbattle_normal TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index 7866d4e07..a80a1a5c0 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,42 +2,42 @@ Route132_MapScripts:: @ 81F74E9 .byte 0 Route132_EventScript_1F74EA:: @ 81F74EA - trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC + trainerbattle_normal TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7501:: @ 81F7501 - trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39 + trainerbattle_normal TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39 msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7518:: @ 81F7518 - trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD + trainerbattle_normal TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F752F:: @ 81F752F - trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C + trainerbattle_normal TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7546:: @ 81F7546 - trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8 + trainerbattle_normal TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8 msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F755D:: @ 81F755D - trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E + trainerbattle_normal TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7574:: @ 81F7574 - trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD + trainerbattle_normal TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE end Route132_EventScript_1F758B:: @ 81F758B - trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C + trainerbattle_normal TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index a6770b93c..c42963d83 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,37 +2,37 @@ Route133_MapScripts:: @ 81F75A2 .byte 0 Route133_EventScript_1F75A3:: @ 81F75A3 - trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F + trainerbattle_normal TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75BA:: @ 81F75BA - trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 + trainerbattle_normal TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75D1:: @ 81F75D1 - trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 + trainerbattle_normal TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75E8:: @ 81F75E8 - trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 + trainerbattle_normal TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75FF:: @ 81F75FF - trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C + trainerbattle_normal TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE end Route133_EventScript_1F7616:: @ 81F7616 - trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A + trainerbattle_normal TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE end Route133_EventScript_1F762D:: @ 81F762D - trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 + trainerbattle_normal TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 1be55dadd..862026bf6 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A end Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB + trainerbattle_normal TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A - trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 + trainerbattle_normal TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE + trainerbattle_normal TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 + trainerbattle_normal TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 + trainerbattle_normal TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + trainerbattle_normal TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 + trainerbattle_normal TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B + trainerbattle_normal TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B - trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B + trainerbattle_normal TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 18c757454..a524e3969 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -888,19 +888,19 @@ RustboroCity_EventScript_1E10D6:: @ 81E10D6 return RustboroCity_EventScript_1E10DB:: @ 81E10DB - trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E10EE:: @ 81E10EE - trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E1101:: @ 81E1101 - trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end @@ -954,19 +954,19 @@ RustboroCity_EventScript_1E11C0:: @ 81E11C0 end RustboroCity_EventScript_1E11D5:: @ 81E11D5 - trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end RustboroCity_EventScript_1E11E8:: @ 81E11E8 - trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end RustboroCity_EventScript_1E11FB:: @ 81E11FB - trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index d4069f3a7..48e04593e 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 8212F30 .byte 0 RustboroCity_Gym_EventScript_212F31:: @ 8212F31 - trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66 + trainerbattle_normal TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq RustboroCity_Gym_EventScript_212FC8 @@ -38,22 +38,22 @@ RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 end RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8 - trainerbattle 7, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 + trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 msgbox RustboroCity_Gym_Text_213D12, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3 - trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D + trainerbattle_normal TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA - trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 + trainerbattle_normal TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_213011:: @ 8213011 - trainerbattle 0, TRAINER_MARC, 0, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 + trainerbattle_normal TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index bdef05258..b507c29b4 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -313,7 +313,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 faceplayer playbgm MUS_AQA_0, 0 msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 + trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0 msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage @@ -426,7 +426,7 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB + trainerbattle_normal TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index ac74fd2ec..4fcc90137 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,12 +2,12 @@ SSTidalLowerDeck_MapScripts:: @ 823C818 .byte 0 SSTidalLowerDeck_EventScript_23C819:: @ 823C819 - trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 + trainerbattle_normal TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE end SSTidalLowerDeck_EventScript_23C830:: @ 823C830 - trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D + trainerbattle_normal TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index b851f0f76..086d60b2d 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -30,37 +30,37 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 end SSTidalRooms_EventScript_23CA49:: @ 823CA49 - trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 + trainerbattle_normal TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA60:: @ 823CA60 - trainerbattle 0, TRAINER_MICAH, 0, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 + trainerbattle_normal TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA77:: @ 823CA77 - trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A + trainerbattle_normal TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA8E:: @ 823CA8E - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 - trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 + trainerbattle_normal TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CADB:: @ 823CADB - trainerbattle 0, TRAINER_NAOMI, 0, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 + trainerbattle_normal TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 1fa5e833a..598cd34bf 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -2,12 +2,12 @@ SeafloorCavern_Room1_MapScripts:: @ 82347EB .byte 0 SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC - trainerbattle 0, TRAINER_GRUNT_5, 0, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A + trainerbattle_normal TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE end SeafloorCavern_Room1_EventScript_234803:: @ 8234803 - trainerbattle 0, TRAINER_GRUNT_6, 0, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD + trainerbattle_normal TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index c3e581acb..d795c4b8f 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -2,12 +2,12 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937 .byte 0 SeafloorCavern_Room3_EventScript_234938:: @ 8234938 - trainerbattle 0, TRAINER_SHELLY_2, 0, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 + trainerbattle_normal TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE end SeafloorCavern_Room3_EventScript_23494F:: @ 823494F - trainerbattle 0, TRAINER_GRUNT_27, 0, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE + trainerbattle_normal TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index e42b7c825..5b0944b2f 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -2,12 +2,12 @@ SeafloorCavern_Room4_MapScripts:: @ 8234C9B .byte 0 SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C - trainerbattle 0, TRAINER_GRUNT_7, 0, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 + trainerbattle_normal TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE end SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 - trainerbattle 0, TRAINER_GRUNT_9, 0, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 + trainerbattle_normal TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index aea2c1b77..70e37ac5e 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -26,7 +26,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E waitmovement 0 msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC + trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT setweather 0 doweather diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 05f654933..b2a7ed510 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -32,7 +32,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 compare VAR_FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 - trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2 + trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF @@ -40,7 +40,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66 + trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index a70b9cb7a..21664cb6f 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 step_end SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 - trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82 + trainerbattle_normal TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq SootopolisCity_Gym_1F_EventScript_225025 @@ -147,7 +147,7 @@ SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B end SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 - trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 + trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 msgbox SootopolisCity_Gym_1F_Text_225A67, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 8f0f2f678..89a67471b 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,52 +2,52 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A .byte 0 SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B - trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 + trainerbattle_normal TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 - trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 + trainerbattle_normal TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 - trainerbattle 0, TRAINER_BRIANNA, 0, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 + trainerbattle_normal TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 - trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB + trainerbattle_normal TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 - trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 + trainerbattle_normal TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE - trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 + trainerbattle_normal TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 - trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 + trainerbattle_normal TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C - trainerbattle 0, TRAINER_BETHANY, 0, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B + trainerbattle_normal TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 - trainerbattle 0, TRAINER_ANNIKA, 0, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD + trainerbattle_normal TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A - trainerbattle 0, TRAINER_DAPHNE, 0, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 + trainerbattle_normal TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index ab9e373f8..c6b99c836 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 applymovement 255, VictoryRoad_1F_Movement_2725AA waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC + trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY moveobjectoffscreen 4 @@ -82,7 +82,7 @@ VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C end VictoryRoad_1F_EventScript_235E35:: @ 8235E35 - trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + trainerbattle_normal TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq VictoryRoad_1F_EventScript_235E5C @@ -90,32 +90,32 @@ VictoryRoad_1F_EventScript_235E35:: @ 8235E35 end VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C - trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E73:: @ 8235E73 - trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB + trainerbattle_normal TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A - trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 + trainerbattle_normal TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 - trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 + trainerbattle_normal TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 - trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 + trainerbattle_normal TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF - trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 + trainerbattle_normal TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE end @@ -217,4 +217,3 @@ VictoryRoad_1F_Text_2364A7: @ 82364A7 VictoryRoad_1F_Text_2364BB: @ 82364BB .string "Humph, go right on ahead.\n" .string "See if I care.$" - diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index 1517f68ca..999ad1f16 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,27 +2,27 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4 .byte 0 VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 - trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD + trainerbattle_normal TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC - trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D + trainerbattle_normal TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236513:: @ 8236513 - trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B + trainerbattle_normal TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_23652A:: @ 823652A - trainerbattle 0, TRAINER_MITCHELL, 0, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 + trainerbattle_normal TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236541:: @ 8236541 - trainerbattle 0, TRAINER_HALLE, 0, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B + trainerbattle_normal TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 9b6837b39..c4e77ea1f 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,32 +2,32 @@ VictoryRoad_B2F_MapScripts:: @ 82368D4 .byte 0 VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 - trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 + trainerbattle_normal TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC - trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 + trainerbattle_normal TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236903:: @ 8236903 - trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 + trainerbattle_normal TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_23691A:: @ 823691A - trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A + trainerbattle_normal TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236931:: @ 8236931 - trainerbattle 0, TRAINER_FELIX, 0, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB + trainerbattle_normal TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236948:: @ 8236948 - trainerbattle 0, TRAINER_DIANNE, 0, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E + trainerbattle_normal TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 562c57351..f95cfa0ab 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -136,61 +136,61 @@ Route111_EventScript_28CDD2:: @ 828CDD2 return Route111_EventScript_28CDD6:: @ 828CDD6 - trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56 + trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56 msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end Route111_EventScript_28CDF6:: @ 828CDF6 - trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56 + trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56 msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end Route118_EventScript_28CE16:: @ 828CE16 - trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT release end Route118_EventScript_28CE36:: @ 828CE36 - trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 msgbox Route118_Text_28B805, MSGBOX_DEFAULT release end Route120_EventScript_28CE56:: @ 828CE56 - trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3 msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT release end Route120_EventScript_28CE76:: @ 828CE76 - trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3 msgbox Route120_Text_28B805, MSGBOX_DEFAULT release end Route111_EventScript_28CE96:: @ 828CE96 - trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end Route111_EventScript_28CEB6:: @ 828CEB6 - trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end Route118_EventScript_28CED6:: @ 828CED6 - trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT release end Route118_EventScript_28CEF6:: @ 828CEF6 - trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 msgbox Route118_Text_28B805, MSGBOX_DEFAULT release end @@ -198,7 +198,7 @@ Route118_EventScript_28CEF6:: @ 828CEF6 Route111_EventScript_28CF16:: @ 828CF16 Route118_EventScript_28CF16:: @ 828CF16 Route120_EventScript_28CF16:: @ 828CF16 - trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT release end @@ -206,7 +206,7 @@ Route120_EventScript_28CF16:: @ 828CF16 Route111_EventScript_28CF36:: @ 828CF36 Route118_EventScript_28CF36:: @ 828CF36 Route120_EventScript_28CF36:: @ 828CF36 - trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 + trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 msgbox Route111_Text_28B805, MSGBOX_DEFAULT release end diff --git a/include/battle_setup.h b/include/battle_setup.h index 0caa3df27..98c366acd 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -1,23 +1,6 @@ #ifndef GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H -enum -{ - TRAINER_BATTLE_NORMAL, - TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, - TRAINER_BATTLE_CONTINUE_SCRIPT, - TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT, - TRAINER_BATTLE_DOUBLE, - TRAINER_BATTLE_REMATCH, - TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, - TRAINER_BATTLE_REMATCH_DOUBLE, - TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, - TRAINER_BATTLE_9, - TRAINER_BATTLE_SET_TRAINER_A, - TRAINER_BATTLE_SET_TRAINER_B, - TRAINER_BATTLE_12, -}; - #define REMATCHES_COUNT 5 #define REMATCH_TABLE_ENTRIES 78 #define REMATCH_WALLY_ENTRY 64 diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h new file mode 100644 index 000000000..0256f889c --- /dev/null +++ b/include/constants/battle_setup.h @@ -0,0 +1,18 @@ +#ifndef GUARD_CONSTANTS_BATTLE_SETUP_H +#define GUARD_CONSTANTS_BATTLE_SETUP_H + +#define TRAINER_BATTLE_NORMAL 0 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC 1 +#define TRAINER_BATTLE_CONTINUE_SCRIPT 2 +#define TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT 3 +#define TRAINER_BATTLE_DOUBLE 4 +#define TRAINER_BATTLE_REMATCH 5 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 +#define TRAINER_BATTLE_REMATCH_DOUBLE 7 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8 +#define TRAINER_BATTLE_9 9 +#define TRAINER_BATTLE_SET_TRAINER_A 10 +#define TRAINER_BATTLE_SET_TRAINER_B 11 +#define TRAINER_BATTLE_12 12 + +#endif // GUARD_CONSTANTS_BATTLE_SETUP_H diff --git a/src/battle_setup.c b/src/battle_setup.c index ab2a12fb7..6db787a5f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1,6 +1,7 @@ #include "global.h" #include "constants/trainers.h" #include "battle.h" +#include "constants/battle_setup.h" #include "battle_setup.h" #include "battle_transition.h" #include "main.h" diff --git a/src/trainer_see.c b/src/trainer_see.c index b74608d0b..d3d450de4 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/battle_setup.h" #include "battle_setup.h" #include "event_data.h" #include "event_object_movement.h" -- cgit v1.2.3 From 10725def8e356a6ea9346b1ea3170e1429314db3 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 13:54:48 -0500 Subject: =?UTF-8?q?trainerbattle=5Fnormal=20=E2=86=92=20trainerbattle=5Fsi?= =?UTF-8?q?ngle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little --- asm/macros/event.inc | 20 ++++++++----- data/maps/AbandonedShip_Corridors_1F/scripts.inc | 2 +- data/maps/AbandonedShip_Corridors_B1F/scripts.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/scripts.inc | 4 +-- data/maps/AbandonedShip_Rooms_1F/scripts.inc | 4 +-- data/maps/AquaHideout_1F/scripts.inc | 2 +- data/maps/AquaHideout_B1F/scripts.inc | 8 ++--- data/maps/AquaHideout_B2F/scripts.inc | 8 ++--- data/maps/DewfordTown_Gym/scripts.inc | 14 ++++----- data/maps/FortreeCity_Gym/scripts.inc | 14 ++++----- data/maps/JaggedPass/scripts.inc | 10 +++---- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 2 +- data/maps/MagmaHideout_1F/scripts.inc | 4 +-- data/maps/MagmaHideout_2F_1R/scripts.inc | 8 ++--- data/maps/MagmaHideout_2F_2R/scripts.inc | 8 ++--- data/maps/MagmaHideout_3F_1R/scripts.inc | 4 +-- data/maps/MagmaHideout_3F_2R/scripts.inc | 2 +- data/maps/MagmaHideout_4F/scripts.inc | 8 ++--- data/maps/MauvilleCity_Gym/scripts.inc | 12 ++++---- data/maps/MeteorFalls_1F_2R/scripts.inc | 2 +- data/maps/MossdeepCity_Gym/scripts.inc | 24 +++++++-------- data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 6 ++-- data/maps/MtChimney/scripts.inc | 16 +++++----- data/maps/MtPyre_2F/scripts.inc | 6 ++-- data/maps/MtPyre_3F/scripts.inc | 6 ++-- data/maps/MtPyre_4F/scripts.inc | 2 +- data/maps/MtPyre_5F/scripts.inc | 2 +- data/maps/MtPyre_6F/scripts.inc | 4 +-- data/maps/MtPyre_Summit/scripts.inc | 8 ++--- data/maps/PetalburgCity_Gym/scripts.inc | 14 ++++----- data/maps/PetalburgWoods/scripts.inc | 4 +-- data/maps/Route102/scripts.inc | 8 ++--- data/maps/Route103/scripts.inc | 14 ++++----- data/maps/Route104/scripts.inc | 12 ++++---- data/maps/Route105/scripts.inc | 14 ++++----- data/maps/Route106/scripts.inc | 8 ++--- data/maps/Route107/scripts.inc | 10 +++---- data/maps/Route108/scripts.inc | 12 ++++---- data/maps/Route109/scripts.inc | 24 +++++++-------- data/maps/Route109_SeashoreHouse/scripts.inc | 6 ++-- data/maps/Route110/scripts.inc | 28 +++++++++--------- data/maps/Route110_TrickHousePuzzle1/scripts.inc | 6 ++-- data/maps/Route110_TrickHousePuzzle2/scripts.inc | 6 ++-- data/maps/Route110_TrickHousePuzzle3/scripts.inc | 6 ++-- data/maps/Route110_TrickHousePuzzle4/scripts.inc | 6 ++-- data/maps/Route110_TrickHousePuzzle6/scripts.inc | 6 ++-- data/maps/Route110_TrickHousePuzzle7/scripts.inc | 12 ++++---- data/maps/Route110_TrickHousePuzzle8/scripts.inc | 6 ++-- data/maps/Route111/scripts.inc | 34 +++++++++++----------- data/maps/Route112/scripts.inc | 12 ++++---- data/maps/Route113/scripts.inc | 18 ++++++------ data/maps/Route114/scripts.inc | 22 +++++++------- data/maps/Route115/scripts.inc | 20 ++++++------- data/maps/Route116/scripts.inc | 20 ++++++------- data/maps/Route117/scripts.inc | 16 +++++----- data/maps/Route118/scripts.inc | 14 ++++----- data/maps/Route119/scripts.inc | 34 +++++++++++----------- data/maps/Route119_WeatherInstitute_1F/scripts.inc | 4 +-- data/maps/Route119_WeatherInstitute_2F/scripts.inc | 8 ++--- data/maps/Route120/scripts.inc | 26 ++++++++--------- data/maps/Route121/scripts.inc | 18 ++++++------ data/maps/Route123/scripts.inc | 28 +++++++++--------- data/maps/Route124/scripts.inc | 14 ++++----- data/maps/Route125/scripts.inc | 14 ++++----- data/maps/Route126/scripts.inc | 16 +++++----- data/maps/Route127/scripts.inc | 16 +++++----- data/maps/Route128/scripts.inc | 14 ++++----- data/maps/Route129/scripts.inc | 10 +++---- data/maps/Route130/scripts.inc | 6 ++-- data/maps/Route131/scripts.inc | 12 ++++---- data/maps/Route132/scripts.inc | 16 +++++----- data/maps/Route133/scripts.inc | 14 ++++----- data/maps/Route134/scripts.inc | 18 ++++++------ data/maps/RustboroCity_Gym/scripts.inc | 8 ++--- data/maps/RusturfTunnel/scripts.inc | 2 +- data/maps/SSTidalLowerDeck/scripts.inc | 4 +-- data/maps/SSTidalRooms/scripts.inc | 10 +++---- data/maps/SeafloorCavern_Room1/scripts.inc | 4 +-- data/maps/SeafloorCavern_Room3/scripts.inc | 4 +-- data/maps/SeafloorCavern_Room4/scripts.inc | 4 +-- data/maps/SootopolisCity_Gym_1F/scripts.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/scripts.inc | 20 ++++++------- data/maps/VictoryRoad_1F/scripts.inc | 12 ++++---- data/maps/VictoryRoad_B1F/scripts.inc | 10 +++---- data/maps/VictoryRoad_B2F/scripts.inc | 12 ++++---- include/constants/battle_setup.h | 4 +-- src/battle_setup.c | 2 +- 87 files changed, 471 insertions(+), 465 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 8c6110b64..e7756c317 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -634,7 +634,7 @@ .byte \type .2byte \trainer .2byte \local_id - .if \type == TRAINER_BATTLE_NORMAL + .if \type == TRAINER_BATTLE_SINGLE .4byte \pointer1 @ text .4byte \pointer2 @ text .elseif \type == TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC @@ -645,7 +645,7 @@ .4byte \pointer1 @ text .4byte \pointer2 @ text .4byte \pointer3 @ event script - .elseif \type == TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT + .elseif \type == TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT .4byte \pointer1 @ text .elseif \type == TRAINER_BATTLE_DOUBLE .4byte \pointer1 @ text @@ -685,10 +685,11 @@ NO_MUSIC = FALSE - @ Starts a normal trainer battle - .macro trainerbattle_normal trainer, intro_text, lose_text, event_script=FALSE, music=TRUE + @ Starts a single trainer battle, takes a trainer, intro text, loss text, and an optional event script + @ when used with an event script, you can also pass in an optional flag to disable music + .macro trainerbattle_single trainer, intro_text, lose_text, event_script=FALSE, music=TRUE .if \event_script == FALSE - trainerbattle TRAINER_BATTLE_NORMAL, \trainer, 0, \intro_text, \lose_text + trainerbattle TRAINER_BATTLE_SINGLE, \trainer, 0, \intro_text, \lose_text .elseif \event_script != FALSE && \music == TRUE trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, \trainer, 0, \intro_text, \lose_text, \event_script .else @@ -696,7 +697,8 @@ .endif .endm - @ Starts a double trainer battle + @ Starts a double trainer battle, takes a trainer, intro text, loss text, text for when you have too few pokemon + @ and an optional event script, when used with an event script you can pass in an optional flag to disable music .macro trainerbattle_double trainer, intro_text, lose_text, not_enough_pkmn_text, event_script=FALSE, music=TRUE .if \event_script == FALSE trainerbattle TRAINER_BATTLE_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text @@ -707,18 +709,22 @@ .endif .endm + @ Starts a rematch battle, takes a trainer, intro text and loss text .macro trainerbattle_rematch trainer, intro_text, lose_text trainerbattle TRAINER_BATTLE_REMATCH, \trainer, 0, \intro_text, \lose_text .endm + @ Starts a rematch double battle, takes a trainer, intro text, loss text, and text for when you have too few pokemon .macro trainerbattle_rematch_double trainer, intro_text, lose_text, not_enough_pkmn_text trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text .endm + @ Starts a trainer battle, skipping intro text, takes a trainer and loss text .macro trainerbattle_no_intro trainer, lose_text - trainerbattle TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT, \trainer, 0, \lose_text + trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, \trainer, 0, \lose_text .endm + @ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes. .macro trainerbattlebegin .byte 0x5d diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 3de2e335d..348e3f6fd 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -6,7 +6,7 @@ AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 end AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE - trainerbattle_normal TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 + trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 3914ab0a2..9cf3ca04a 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -53,7 +53,7 @@ AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 end AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 - trainerbattle_normal TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 + trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 40ffd6ff8..981b62c36 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -42,12 +42,12 @@ AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 end AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F - trainerbattle_normal TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 + trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 - trainerbattle_normal TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 + trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index d19b21395..055cf140b 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -6,12 +6,12 @@ AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 end AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C - trainerbattle_normal TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A + trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 - trainerbattle_normal TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF + trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index fb5d95e70..c23b511b4 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -44,7 +44,7 @@ AquaHideout_1F_EventScript_2334EE:: @ 82334EE end AquaHideout_1F_EventScript_2334F8:: @ 82334F8 - trainerbattle_normal TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 + trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 1d7f1b843..2073dea29 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -85,7 +85,7 @@ AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C end AquaHideout_B1F_EventScript_233A85:: @ 8233A85 - trainerbattle_normal TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 + trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE end @@ -97,7 +97,7 @@ AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 end AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 - trainerbattle_normal TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB + trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE end @@ -107,12 +107,12 @@ AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB end AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 - trainerbattle_normal TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA + trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC - trainerbattle_normal TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E + trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 427d1073e..a2bd702e6 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -24,7 +24,7 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 end AquaHideout_B2F_EventScript_233E09:: @ 8233E09 - trainerbattle_normal TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 + trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT release end @@ -67,7 +67,7 @@ AquaHideout_B2F_Movement_233E85: @ 8233E85 step_end AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A - trainerbattle_normal TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 + trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE end @@ -77,12 +77,12 @@ AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 end AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF - trainerbattle_normal TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE + trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 - trainerbattle_normal TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC + trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 1ccd7ed61..ade729c96 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -156,7 +156,7 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 return DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 - trainerbattle_normal TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC + trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq DewfordTown_Gym_EventScript_1FC89C @@ -216,7 +216,7 @@ DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C end DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7 - trainerbattle_normal TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 + trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE end @@ -226,7 +226,7 @@ DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 end DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9 - trainerbattle_normal TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 + trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE end @@ -236,7 +236,7 @@ DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 end DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB - trainerbattle_normal TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 + trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE end @@ -246,7 +246,7 @@ DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 end DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D - trainerbattle_normal TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 + trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE end @@ -256,7 +256,7 @@ DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 end DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F - trainerbattle_normal TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A + trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE end @@ -266,7 +266,7 @@ DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A end DewfordTown_Gym_EventScript_1FC961:: @ 81FC961 - trainerbattle_normal TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C + trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 6fc6dcb7e..fb91c5c1a 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 end FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 - trainerbattle_normal TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC + trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq FortreeCity_Gym_EventScript_21668D @@ -72,32 +72,32 @@ FortreeCity_Gym_EventScript_21668D:: @ 821668D end FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 - trainerbattle_normal TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 + trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166BF:: @ 82166BF - trainerbattle_normal TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 + trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 - trainerbattle_normal TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 + trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166ED:: @ 82166ED - trainerbattle_normal TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 + trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_216704:: @ 8216704 - trainerbattle_normal TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 + trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_21671B:: @ 821671B - trainerbattle_normal TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 + trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 0f3b027b3..8a8832dec 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -98,12 +98,12 @@ JaggedPass_EventScript_230766:: @ 8230766 end JaggedPass_EventScript_230785:: @ 8230785 - trainerbattle_normal TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF + trainerbattle_single TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23079C:: @ 823079C - trainerbattle_normal TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 + trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 @@ -124,7 +124,7 @@ JaggedPass_EventScript_2307E4:: @ 82307E4 end JaggedPass_EventScript_2307FB:: @ 82307FB - trainerbattle_normal TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 + trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 @@ -145,12 +145,12 @@ JaggedPass_EventScript_230843:: @ 8230843 end JaggedPass_EventScript_23085A:: @ 823085A - trainerbattle_normal TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 + trainerbattle_single TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_230871:: @ 8230871 - trainerbattle_normal TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD + trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index aa19a87ef..77c4a7b5d 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -59,7 +59,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B return LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C - trainerbattle_normal TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC + trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 35726640f..deb805bb5 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -7,12 +7,12 @@ MagmaHideout_1F_MapScript1_239886: @ 8239886 end MagmaHideout_1F_EventScript_23988C:: @ 823988C - trainerbattle_normal TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 + trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE end MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 - trainerbattle_normal TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA + trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc index 3318648c5..9536ad433 100644 --- a/data/maps/MagmaHideout_2F_1R/scripts.inc +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -2,22 +2,22 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50 .byte 0 MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 - trainerbattle_normal TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B + trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 - trainerbattle_normal TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 + trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F - trainerbattle_normal TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 + trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 - trainerbattle_normal TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA + trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc index 9ea56dbac..4fc06770c 100644 --- a/data/maps/MagmaHideout_2F_2R/scripts.inc +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -2,22 +2,22 @@ MagmaHideout_2F_2R_MapScripts:: @ 8239E07 .byte 0 MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 - trainerbattle_normal TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 + trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F - trainerbattle_normal TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 + trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 - trainerbattle_normal TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 + trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D - trainerbattle_normal TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C + trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc index 0d8459693..69fd661b2 100644 --- a/data/maps/MagmaHideout_3F_1R/scripts.inc +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -2,12 +2,12 @@ MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 .byte 0 MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 - trainerbattle_normal TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 + trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE end MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA - trainerbattle_normal TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 + trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc index 3ae8cc81a..e4c232d32 100644 --- a/data/maps/MagmaHideout_3F_2R/scripts.inc +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -2,7 +2,7 @@ MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 .byte 0 MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 - trainerbattle_normal TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB + trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index f21dfa1d8..1eae21a57 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -109,22 +109,22 @@ MagmaHideout_4F_Movement_23A680: @ 823A680 step_end MagmaHideout_4F_EventScript_23A68C:: @ 823A68C - trainerbattle_normal TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 + trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 - trainerbattle_normal TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B + trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA - trainerbattle_normal TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 + trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 - trainerbattle_normal TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 + trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index fcf303421..5996fda47 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -76,7 +76,7 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 end MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB - trainerbattle_normal TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC + trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MauvilleCity_Gym_EventScript_20DFDE @@ -215,27 +215,27 @@ MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 end MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9 - trainerbattle_normal TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC + trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0 - trainerbattle_normal TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 + trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7 - trainerbattle_normal TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 + trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE - trainerbattle_normal TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 + trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E115:: @ 820E115 - trainerbattle_normal TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 + trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 294ef9c48..2deefd65d 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD .byte 0 MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE - trainerbattle_normal TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A + trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 4726b5050..66c484365 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -211,62 +211,62 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 end MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD - trainerbattle_normal TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC + trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 - trainerbattle_normal TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A + trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B - trainerbattle_normal TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 + trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 - trainerbattle_normal TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 + trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 - trainerbattle_normal TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 + trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 - trainerbattle_normal TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 + trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 - trainerbattle_normal TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 + trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E - trainerbattle_normal TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 + trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 - trainerbattle_normal TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 + trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC - trainerbattle_normal TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 + trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 - trainerbattle_normal TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D + trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA - trainerbattle_normal TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B + trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index dbb673fe9..6027591ee 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -219,17 +219,17 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF end MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA - trainerbattle_normal TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 + trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 - trainerbattle_normal TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 + trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 - trainerbattle_normal TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA + trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 570043a9d..ddd8b8d42 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -411,12 +411,12 @@ MtChimney_EventScript_22F065:: @ 822F065 end MtChimney_EventScript_22F06E:: @ 822F06E - trainerbattle_normal TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C + trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F085:: @ 822F085 - trainerbattle_normal TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A + trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE end @@ -487,7 +487,7 @@ MtChimney_EventScript_22F141:: @ 822F141 end MtChimney_EventScript_22F14A:: @ 822F14A - trainerbattle_normal TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 + trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 @@ -509,27 +509,27 @@ MtChimney_EventScript_22F195:: @ 822F195 end MtChimney_EventScript_22F1AC:: @ 822F1AC - trainerbattle_normal TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D + trainerbattle_single TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1C3:: @ 822F1C3 - trainerbattle_normal TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304 + trainerbattle_single TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304 msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1DA:: @ 822F1DA - trainerbattle_normal TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436 + trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436 msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1F1:: @ 822F1F1 - trainerbattle_normal TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921 + trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921 msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F208:: @ 822F208 - trainerbattle_normal TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 + trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 5b94690b8..830ed5cf7 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -18,7 +18,7 @@ MtPyre_2F_EventScript_23111F:: @ 823111F end MtPyre_2F_EventScript_231128:: @ 8231128 - trainerbattle_normal TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 + trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE end @@ -33,12 +33,12 @@ MtPyre_2F_EventScript_23115A:: @ 823115A end MtPyre_2F_EventScript_231175:: @ 8231175 - trainerbattle_normal TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 + trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23118C:: @ 823118C - trainerbattle_normal TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 + trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ef31d7ef3..890fc4d22 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,17 +2,17 @@ MtPyre_3F_MapScripts:: @ 8231752 .byte 0 MtPyre_3F_EventScript_231753:: @ 8231753 - trainerbattle_normal TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 + trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_23176A:: @ 823176A - trainerbattle_normal TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD + trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_231781:: @ 8231781 - trainerbattle_normal TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD + trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index 74844f55b..27883c8ed 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_4F_MapScripts:: @ 8231BC8 .byte 0 MtPyre_5F_EventScript_231BC9:: @ 8231BC9 - trainerbattle_normal TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 + trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 43916a546..5a5365baf 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_5F_MapScripts:: @ 8231C6D .byte 0 MtPyre_4F_EventScript_231C6E:: @ 8231C6E - trainerbattle_normal TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB + trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 83a104bac..62b4e87b7 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 8231D3A .byte 0 MtPyre_6F_EventScript_231D3B:: @ 8231D3B - trainerbattle_normal TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 + trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 @@ -24,7 +24,7 @@ MtPyre_6F_EventScript_231D86:: @ 8231D86 end MtPyre_6F_EventScript_231D9D:: @ 8231D9D - trainerbattle_normal TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A + trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index cfff1c354..ee03362ed 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -425,22 +425,22 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8 step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle_normal TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 + trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle_normal TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 + trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle_normal TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 + trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle_normal TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A + trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index d6acdb0ec..29459f5e5 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -958,7 +958,7 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 end PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA - trainerbattle_normal TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE + trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2053ED msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE @@ -976,7 +976,7 @@ PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED end PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 - trainerbattle_normal TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A + trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205429 msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE @@ -994,7 +994,7 @@ PetalburgCity_Gym_EventScript_205429:: @ 8205429 end PetalburgCity_Gym_EventScript_205432:: @ 8205432 - trainerbattle_normal TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 + trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205465 msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE @@ -1012,7 +1012,7 @@ PetalburgCity_Gym_EventScript_205465:: @ 8205465 end PetalburgCity_Gym_EventScript_20546E:: @ 820546E - trainerbattle_normal TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 + trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054A1 msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE @@ -1030,7 +1030,7 @@ PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 end PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA - trainerbattle_normal TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE + trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054DD msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE @@ -1048,7 +1048,7 @@ PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD end PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 - trainerbattle_normal TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A + trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205519 msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE @@ -1066,7 +1066,7 @@ PetalburgCity_Gym_EventScript_205519:: @ 8205519 end PetalburgCity_Gym_EventScript_205522:: @ 8205522 - trainerbattle_normal TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 + trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205555 msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index c5c71a0e4..82e49abb2 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -273,12 +273,12 @@ PetalburgWoods_EventScript_22E264:: @ 822E264 end PetalburgWoods_EventScript_22E26D:: @ 822E26D - trainerbattle_normal TRAINER_LYLE, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 + trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 msgbox PetalburgWoods_Text_22E7EF, MSGBOX_AUTOCLOSE end PetalburgWoods_EventScript_22E284:: @ 822E284 - trainerbattle_normal TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 + trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq PetalburgWoods_EventScript_22E31B diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index 3430c054b..6eb35c32f 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC end Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle_normal TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C @@ -63,17 +63,17 @@ Route102_EventScript_1EC19C:: @ 81EC19C end Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle_normal TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 + trainerbattle_single TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle_normal TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 + trainerbattle_single TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle_normal TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA + trainerbattle_single TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 4e7cf12f8..063beaca7 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -203,7 +203,7 @@ Route103_EventScript_1EC5EB:: @ 81EC5EB end Route103_EventScript_1EC5F4:: @ 81EC5F4 - trainerbattle_normal TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F + trainerbattle_single TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE end @@ -246,12 +246,12 @@ Route103_EventScript_1EC6B6:: @ 81EC6B6 end Route103_EventScript_1EC6D1:: @ 81EC6D1 - trainerbattle_normal TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92 + trainerbattle_single TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92 msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6E8:: @ 81EC6E8 - trainerbattle_normal TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 + trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC733 @@ -273,22 +273,22 @@ Route103_EventScript_1EC733:: @ 81EC733 end Route103_EventScript_1EC74A:: @ 81EC74A - trainerbattle_normal TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B + trainerbattle_single TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC761:: @ 81EC761 - trainerbattle_normal TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6 + trainerbattle_single TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6 msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC778:: @ 81EC778 - trainerbattle_normal TRAINER_PETE, Route103_Text_295063, Route103_Text_295093 + trainerbattle_single TRAINER_PETE, Route103_Text_295063, Route103_Text_295093 msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC78F:: @ 81EC78F - trainerbattle_normal TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146 + trainerbattle_single TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146 msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index f46482eb5..fcef181eb 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -871,17 +871,17 @@ Route104_Movement_1ED35C: @ 81ED35C step_end Route104_EventScript_1ED35F:: @ 81ED35F - trainerbattle_normal TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509 + trainerbattle_single TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509 msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED376:: @ 81ED376 - trainerbattle_normal TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4 + trainerbattle_single TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4 msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED38D:: @ 81ED38D - trainerbattle_normal TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE + trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED424 @@ -926,7 +926,7 @@ Route104_EventScript_1ED424:: @ 81ED424 end Route104_EventScript_1ED43B:: @ 81ED43B - trainerbattle_normal TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C + trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED4D2 @@ -971,7 +971,7 @@ Route104_EventScript_1ED4D2:: @ 81ED4D2 end Route104_EventScript_1ED4E9:: @ 81ED4E9 - trainerbattle_normal TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A + trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED580 @@ -1030,7 +1030,7 @@ Route104_EventScript_1ED5B6:: @ 81ED5B6 end Route104_EventScript_1ED5D5:: @ 81ED5D5 - trainerbattle_normal TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9 + trainerbattle_single TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9 msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index a917bf5b6..18fe07cbe 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -32,37 +32,37 @@ Route105_MapScript2_1EE240: @ 81EE240 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle_normal TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 + trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle_normal TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 + trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle_normal TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA + trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle_normal TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 + trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle_normal TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 + trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle_normal TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB + trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle_normal TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 + trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index e877993f4..533f65254 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -6,17 +6,17 @@ Route106_EventScript_1EE48A:: @ 81EE48A end Route106_EventScript_1EE493:: @ 81EE493 - trainerbattle_normal TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD + trainerbattle_single TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4AA:: @ 81EE4AA - trainerbattle_normal TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674 + trainerbattle_single TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674 msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4C1:: @ 81EE4C1 - trainerbattle_normal TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED + trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route106_EventScript_1EE50C @@ -38,7 +38,7 @@ Route106_EventScript_1EE50C:: @ 81EE50C end Route106_EventScript_1EE523:: @ 81EE523 - trainerbattle_normal TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553 + trainerbattle_single TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553 msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 3344b20f1..5f840b3fb 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 81EE594 .byte 0 Route107_EventScript_1EE595:: @ 81EE595 - trainerbattle_normal TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F + trainerbattle_single TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE5AC:: @ 81EE5AC - trainerbattle_normal TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 + trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route107_EventScript_1EE5F7 @@ -29,12 +29,12 @@ Route107_EventScript_1EE5F7:: @ 81EE5F7 end Route107_EventScript_1EE60E:: @ 81EE60E - trainerbattle_normal TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E + trainerbattle_single TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE625:: @ 81EE625 - trainerbattle_normal TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17 + trainerbattle_single TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17 msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE end @@ -49,7 +49,7 @@ Route107_EventScript_1EE657:: @ 81EE657 end Route107_EventScript_1EE672:: @ 81EE672 - trainerbattle_normal TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD + trainerbattle_single TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 16ecc381d..73ddb031d 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,32 +2,32 @@ Route108_MapScripts:: @ 81EE689 .byte 0 Route108_EventScript_1EE68A:: @ 81EE68A - trainerbattle_normal TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C + trainerbattle_single TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6A1:: @ 81EE6A1 - trainerbattle_normal TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA + trainerbattle_single TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6B8:: @ 81EE6B8 - trainerbattle_normal TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71 + trainerbattle_single TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71 msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6CF:: @ 81EE6CF - trainerbattle_normal TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC + trainerbattle_single TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6E6:: @ 81EE6E6 - trainerbattle_normal TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7 + trainerbattle_single TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7 msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6FD:: @ 81EE6FD - trainerbattle_normal TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 + trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route108_EventScript_1EE748 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 18cfd858f..050dad358 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -376,27 +376,27 @@ Route109_EventScript_1EEA34:: @ 81EEA34 end Route109_EventScript_1EEA3D:: @ 81EEA3D - trainerbattle_normal TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D + trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA54:: @ 81EEA54 - trainerbattle_normal TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD + trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA6B:: @ 81EEA6B - trainerbattle_normal TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B + trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA82:: @ 81EEA82 - trainerbattle_normal TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE + trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA99:: @ 81EEA99 - trainerbattle_normal TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 + trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEAE4 @@ -418,7 +418,7 @@ Route109_EventScript_1EEAE4:: @ 81EEAE4 end Route109_EventScript_1EEAFB:: @ 81EEAFB - trainerbattle_normal TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 + trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEB46 @@ -440,17 +440,17 @@ Route109_EventScript_1EEB46:: @ 81EEB46 end Route109_EventScript_1EEB5D:: @ 81EEB5D - trainerbattle_normal TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601 + trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601 msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB74:: @ 81EEB74 - trainerbattle_normal TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691 + trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691 msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB8B:: @ 81EEB8B - trainerbattle_normal TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC + trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE end @@ -465,17 +465,17 @@ Route109_EventScript_1EEBBD:: @ 81EEBBD end Route109_EventScript_1EEBD8:: @ 81EEBD8 - trainerbattle_normal TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE + trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBEF:: @ 81EEBEF - trainerbattle_normal TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15 + trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15 msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEC06:: @ 81EEC06 - trainerbattle_normal TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7 + trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7 msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 4bd2f6157..323dc2bf8 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -86,17 +86,17 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 end Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 - trainerbattle_normal TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 + trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD - trainerbattle_normal TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 + trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_269518:: @ 8269518 - trainerbattle_normal TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 + trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index e6c21be2b..9ff7667c5 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -165,17 +165,17 @@ Route110_EventScript_1EF3E8:: @ 81EF3E8 end Route110_EventScript_1EF3F2:: @ 81EF3F2 - trainerbattle_normal TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064 + trainerbattle_single TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064 msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF409:: @ 81EF409 - trainerbattle_normal TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5 + trainerbattle_single TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5 msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF420:: @ 81EF420 - trainerbattle_normal TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C + trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF46B @@ -197,22 +197,22 @@ Route110_EventScript_1EF46B:: @ 81EF46B end Route110_EventScript_1EF482:: @ 81EF482 - trainerbattle_normal TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5 + trainerbattle_single TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5 msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF499:: @ 81EF499 - trainerbattle_normal TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77 + trainerbattle_single TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77 msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4B0:: @ 81EF4B0 - trainerbattle_normal TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F + trainerbattle_single TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4C7:: @ 81EF4C7 - trainerbattle_normal TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 + trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF512 @@ -234,12 +234,12 @@ Route110_EventScript_1EF512:: @ 81EF512 end Route110_EventScript_1EF529:: @ 81EF529 - trainerbattle_normal TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0 + trainerbattle_single TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0 msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF540:: @ 81EF540 - trainerbattle_normal TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C + trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF58B @@ -261,7 +261,7 @@ Route110_EventScript_1EF58B:: @ 81EF58B end Route110_EventScript_1EF5A2:: @ 81EF5A2 - trainerbattle_normal TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE + trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF5ED @@ -283,7 +283,7 @@ Route110_EventScript_1EF5ED:: @ 81EF5ED end Route110_EventScript_1EF604:: @ 81EF604 - trainerbattle_normal TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559 + trainerbattle_single TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559 msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE end @@ -291,17 +291,17 @@ Route110_EventScript_1EF61B:: @ 81EF61B end Route110_EventScript_1EF61C:: @ 81EF61C - trainerbattle_normal TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735 + trainerbattle_single TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735 msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF633:: @ 81EF633 - trainerbattle_normal TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686 + trainerbattle_single TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686 msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF64A:: @ 81EF64A - trainerbattle_normal TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9 + trainerbattle_single TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9 msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index bbaf9b446..aeeec549d 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,17 +24,17 @@ Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D end Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948 - trainerbattle_normal TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F + trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F - trainerbattle_normal TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 + trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976 - trainerbattle_normal TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E + trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 691ab26c9..80d09866b 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,17 +90,17 @@ Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62 return Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75 - trainerbattle_normal TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 + trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C - trainerbattle_normal TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF + trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3 - trainerbattle_normal TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 + trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 899279a87..2c94012fb 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -302,17 +302,17 @@ Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 end Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4 - trainerbattle_normal TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D + trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB - trainerbattle_normal TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 + trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2 - trainerbattle_normal TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC + trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index c7b1a38cd..2cc97127b 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,17 +14,17 @@ Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 end Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E - trainerbattle_normal TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E + trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895 - trainerbattle_normal TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 + trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC - trainerbattle_normal TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB + trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 590081dc1..4881ac87a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,17 +28,17 @@ Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 end Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1 - trainerbattle_normal TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 + trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8 - trainerbattle_normal TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D + trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F - trainerbattle_normal TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 + trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3e52d51bf..3df92dc99 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -304,32 +304,32 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 end Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 - trainerbattle_normal TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 + trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0 - trainerbattle_normal TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 + trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7 - trainerbattle_normal TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 + trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE - trainerbattle_normal TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C + trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5 - trainerbattle_normal TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 + trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC - trainerbattle_normal TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB + trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 415be2e95..0f9155faf 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,17 +14,17 @@ Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 end Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F - trainerbattle_normal TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 + trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836 - trainerbattle_normal TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F + trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D - trainerbattle_normal TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 + trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 9b6dd9c43..f03dc38ac 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -452,27 +452,27 @@ Route111_EventScript_1F11E4:: @ 81F11E4 end Route111_EventScript_1F1204:: @ 81F1204 - trainerbattle_normal TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A + trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE end Route111_EventScript_1F121B:: @ 81F121B - trainerbattle_normal TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908 + trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908 msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1232:: @ 81F1232 - trainerbattle_normal TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6 + trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6 msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1249:: @ 81F1249 - trainerbattle_normal TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF + trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1260:: @ 81F1260 - trainerbattle_normal TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C + trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB @@ -494,22 +494,22 @@ Route111_EventScript_1F12AB:: @ 81F12AB end Route111_EventScript_1F12C2:: @ 81F12C2 - trainerbattle_normal TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8 + trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8 msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12D9:: @ 81F12D9 - trainerbattle_normal TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E + trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12F0:: @ 81F12F0 - trainerbattle_normal TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14 + trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14 msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1307:: @ 81F1307 - trainerbattle_normal TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 + trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 @@ -531,7 +531,7 @@ Route111_EventScript_1F1352:: @ 81F1352 end Route111_EventScript_1F1369:: @ 81F1369 - trainerbattle_normal TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 + trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 @@ -553,37 +553,37 @@ Route111_EventScript_1F13B4:: @ 81F13B4 end Route111_EventScript_1F13CB:: @ 81F13CB - trainerbattle_normal TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE + trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13E2:: @ 81F13E2 - trainerbattle_normal TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D + trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13F9:: @ 81F13F9 - trainerbattle_normal TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549 + trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549 msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1410:: @ 81F1410 - trainerbattle_normal TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625 + trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625 msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1427:: @ 81F1427 - trainerbattle_normal TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384 + trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384 msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE end Route111_EventScript_1F143E:: @ 81F143E - trainerbattle_normal TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431 + trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431 msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1455:: @ 81F1455 - trainerbattle_normal TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5 + trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5 msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 4d4ac58cc..cb6a48dce 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -61,12 +61,12 @@ Route112_EventScript_1F1E61:: @ 81F1E61 end Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle_normal TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA + trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle_normal TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD + trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC @@ -88,22 +88,22 @@ Route112_EventScript_1F1ECC:: @ 81F1ECC end Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle_normal TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC + trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle_normal TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 + trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle_normal TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF + trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle_normal TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F + trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 42a619cd2..550029289 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_1F21B7:: @ 81F21B7 end Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle_normal TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 + trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle_normal TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C + trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle_normal TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A + trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 @@ -81,7 +81,7 @@ Route113_EventScript_1F2239:: @ 81F2239 end Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle_normal TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C + trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B @@ -103,7 +103,7 @@ Route113_EventScript_1F229B:: @ 81F229B end Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle_normal TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 + trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE end @@ -118,22 +118,22 @@ Route113_EventScript_1F22E4:: @ 81F22E4 end Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle_normal TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 + trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle_normal TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 + trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE end Route113_EventScript_1F232D:: @ 81F232D - trainerbattle_normal TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 + trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle_normal TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 + trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 1f24b4204..e47a3660f 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -89,27 +89,27 @@ Route114_EventScript_1F2637:: @ 81F2637 end Route114_EventScript_1F2640:: @ 81F2640 - trainerbattle_normal TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707 + trainerbattle_single TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707 msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2657:: @ 81F2657 - trainerbattle_normal TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5 + trainerbattle_single TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5 msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE end Route114_EventScript_1F266E:: @ 81F266E - trainerbattle_normal TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F + trainerbattle_single TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2685:: @ 81F2685 - trainerbattle_normal TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E + trainerbattle_single TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE end Route114_EventScript_1F269C:: @ 81F269C - trainerbattle_normal TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 + trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F26E7 @@ -131,7 +131,7 @@ Route114_EventScript_1F26E7:: @ 81F26E7 end Route114_EventScript_1F26FE:: @ 81F26FE - trainerbattle_normal TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A + trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F2749 @@ -153,12 +153,12 @@ Route114_EventScript_1F2749:: @ 81F2749 end Route114_EventScript_1F2760:: @ 81F2760 - trainerbattle_normal TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A + trainerbattle_single TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2777:: @ 81F2777 - trainerbattle_normal TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05 + trainerbattle_single TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05 msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE end @@ -173,17 +173,17 @@ Route114_EventScript_1F27A9:: @ 81F27A9 end Route114_EventScript_1F27C4:: @ 81F27C4 - trainerbattle_normal TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C + trainerbattle_single TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27DB:: @ 81F27DB - trainerbattle_normal TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB + trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27F2:: @ 81F27F2 - trainerbattle_normal TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089 + trainerbattle_single TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089 msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 66e5e3fb1..3dcf7adee 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -37,7 +37,7 @@ Route115_EventScript_1F2985:: @ 81F2985 end Route115_EventScript_1F298E:: @ 81F298E - trainerbattle_normal TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA + trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 @@ -59,12 +59,12 @@ Route115_EventScript_1F29D9:: @ 81F29D9 end Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle_normal TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED + trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle_normal TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 + trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 @@ -86,7 +86,7 @@ Route115_EventScript_1F2A52:: @ 81F2A52 end Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle_normal TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 + trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 @@ -108,32 +108,32 @@ Route115_EventScript_1F2AB4:: @ 81F2AB4 end Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle_normal TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 + trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle_normal TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D + trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle_normal TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 + trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle_normal TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 + trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle_normal TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 + trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle_normal TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 + trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 8b689677d..af9210a36 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -248,17 +248,17 @@ Route116_Movement_1F2E7E: @ 81F2E7E step_end Route116_EventScript_1F2E89:: @ 81F2E89 - trainerbattle_normal TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A + trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EA0:: @ 81F2EA0 - trainerbattle_normal TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25 + trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25 msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EB7:: @ 81F2EB7 - trainerbattle_normal TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 + trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2F4E @@ -303,17 +303,17 @@ Route116_EventScript_1F2F4E:: @ 81F2F4E end Route116_EventScript_1F2F65:: @ 81F2F65 - trainerbattle_normal TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F + trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F7C:: @ 81F2F7C - trainerbattle_normal TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3 + trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3 msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F93:: @ 81F2F93 - trainerbattle_normal TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 + trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F302A @@ -358,22 +358,22 @@ Route116_EventScript_1F302A:: @ 81F302A end Route116_EventScript_1F3041:: @ 81F3041 - trainerbattle_normal TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8 + trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8 msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3058:: @ 81F3058 - trainerbattle_normal TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2 + trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2 msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE end Route116_EventScript_1F306F:: @ 81F306F - trainerbattle_normal TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365 + trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365 msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3086:: @ 81F3086 - trainerbattle_normal TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7 + trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7 msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 05dc75fe7..e80148cd7 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -39,7 +39,7 @@ Route117_EventScript_1F39C7:: @ 81F39C7 end Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle_normal TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC + trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A1B @@ -61,7 +61,7 @@ Route117_EventScript_1F3A1B:: @ 81F3A1B end Route117_EventScript_1F3A32:: @ 81F3A32 - trainerbattle_normal TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E + trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A7D @@ -83,7 +83,7 @@ Route117_EventScript_1F3A7D:: @ 81F3A7D end Route117_EventScript_1F3A94:: @ 81F3A94 - trainerbattle_normal TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 + trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3ADF @@ -105,7 +105,7 @@ Route117_EventScript_1F3ADF:: @ 81F3ADF end Route117_EventScript_1F3AF6:: @ 81F3AF6 - trainerbattle_normal TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 + trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3B41 @@ -127,7 +127,7 @@ Route117_EventScript_1F3B41:: @ 81F3B41 end Route117_EventScript_1F3B58:: @ 81F3B58 - trainerbattle_normal TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 + trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE end @@ -172,17 +172,17 @@ Route117_EventScript_1F3C1C:: @ 81F3C1C end Route117_EventScript_1F3C37:: @ 81F3C37 - trainerbattle_normal TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 + trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C4E:: @ 81F3C4E - trainerbattle_normal TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 + trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C65:: @ 81F3C65 - trainerbattle_normal TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 + trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index f892b64aa..f88e0e9c3 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -187,7 +187,7 @@ Route118_Movement_1F3F7E: @ 81F3F7E step_end Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle_normal TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 + trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 @@ -209,17 +209,17 @@ Route118_EventScript_1F3FD2:: @ 81F3FD2 end Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle_normal TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C + trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle_normal TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C + trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle_normal TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 + trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 @@ -241,17 +241,17 @@ Route118_EventScript_1F4062:: @ 81F4062 end Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle_normal TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B + trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle_normal TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 + trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE end Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle_normal TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C + trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index b8e441dca..87acdeb84 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -337,37 +337,37 @@ Route119_EventScript_1F477D:: @ 81F477D end Route119_EventScript_1F4786:: @ 81F4786 - trainerbattle_normal TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0 + trainerbattle_single TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0 msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE end Route119_EventScript_1F479D:: @ 81F479D - trainerbattle_normal TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C + trainerbattle_single TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47B4:: @ 81F47B4 - trainerbattle_normal TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14 + trainerbattle_single TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14 msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47CB:: @ 81F47CB - trainerbattle_normal TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC + trainerbattle_single TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47E2:: @ 81F47E2 - trainerbattle_normal TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66 + trainerbattle_single TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66 msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47F9:: @ 81F47F9 - trainerbattle_normal TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20 + trainerbattle_single TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20 msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4810:: @ 81F4810 - trainerbattle_normal TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C + trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F485B @@ -389,7 +389,7 @@ Route119_EventScript_1F485B:: @ 81F485B end Route119_EventScript_1F4872:: @ 81F4872 - trainerbattle_normal TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E + trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F48BD @@ -411,47 +411,47 @@ Route119_EventScript_1F48BD:: @ 81F48BD end Route119_EventScript_1F48D4:: @ 81F48D4 - trainerbattle_normal TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063 + trainerbattle_single TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063 msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48EB:: @ 81F48EB - trainerbattle_normal TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1 + trainerbattle_single TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1 msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4902:: @ 81F4902 - trainerbattle_normal TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D + trainerbattle_single TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4919:: @ 81F4919 - trainerbattle_normal TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B + trainerbattle_single TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4930:: @ 81F4930 - trainerbattle_normal TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288 + trainerbattle_single TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288 msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4947:: @ 81F4947 - trainerbattle_normal TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372 + trainerbattle_single TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372 msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE end Route119_EventScript_1F495E:: @ 81F495E - trainerbattle_normal TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F + trainerbattle_single TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4975:: @ 81F4975 - trainerbattle_normal TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513 + trainerbattle_single TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513 msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE end Route119_EventScript_1F498C:: @ 81F498C - trainerbattle_normal TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1 + trainerbattle_single TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1 msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index ba132a56b..f5b97bffa 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -65,12 +65,12 @@ Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 end Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 - trainerbattle_normal TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB + trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 - trainerbattle_normal TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 + trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 36b9081af..1b7ba28de 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -27,22 +27,22 @@ Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C return Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 - trainerbattle_normal TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F + trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F - trainerbattle_normal TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 + trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 - trainerbattle_normal TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE + trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD - trainerbattle_normal TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 + trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6a3343e4a..86bf1b10e 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -291,12 +291,12 @@ Route120_EventScript_1F57CE:: @ 81F57CE end Route120_EventScript_1F57D7:: @ 81F57D7 - trainerbattle_normal TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665 + trainerbattle_single TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665 msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE end Route120_EventScript_1F57EE:: @ 81F57EE - trainerbattle_normal TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A + trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F5839 @@ -318,17 +318,17 @@ Route120_EventScript_1F5839:: @ 81F5839 end Route120_EventScript_1F5850:: @ 81F5850 - trainerbattle_normal TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884 + trainerbattle_single TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884 msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5867:: @ 81F5867 - trainerbattle_normal TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980 + trainerbattle_single TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980 msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE end Route120_EventScript_1F587E:: @ 81F587E - trainerbattle_normal TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA + trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F58C9 @@ -350,42 +350,42 @@ Route120_EventScript_1F58C9:: @ 81F58C9 end Route120_EventScript_1F58E0:: @ 81F58E0 - trainerbattle_normal TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53 + trainerbattle_single TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53 msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58F7:: @ 81F58F7 - trainerbattle_normal TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25 + trainerbattle_single TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25 msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE end Route120_EventScript_1F590E:: @ 81F590E - trainerbattle_normal TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF + trainerbattle_single TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5925:: @ 81F5925 - trainerbattle_normal TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3 + trainerbattle_single TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3 msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE end Route120_EventScript_1F593C:: @ 81F593C - trainerbattle_normal TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97 + trainerbattle_single TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97 msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5953:: @ 81F5953 - trainerbattle_normal TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63 + trainerbattle_single TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63 msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE end Route120_EventScript_1F596A:: @ 81F596A - trainerbattle_normal TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080 + trainerbattle_single TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080 msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5981:: @ 81F5981 - trainerbattle_normal TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1 + trainerbattle_single TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1 msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index efaf46f5a..84c7473e9 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -66,12 +66,12 @@ Route121_Movement_1F5E6B: @ 81F5E6B step_end Route121_EventScript_1F5E74:: @ 81F5E74 - trainerbattle_normal TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F + trainerbattle_single TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5E8B:: @ 81F5E8B - trainerbattle_normal TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 + trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 @@ -93,7 +93,7 @@ Route121_EventScript_1F5ED6:: @ 81F5ED6 end Route121_EventScript_1F5EED:: @ 81F5EED - trainerbattle_normal TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 + trainerbattle_single TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE end @@ -108,7 +108,7 @@ Route121_EventScript_1F5F1F:: @ 81F5F1F end Route121_EventScript_1F5F3A:: @ 81F5F3A - trainerbattle_normal TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 + trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 @@ -130,27 +130,27 @@ Route121_EventScript_1F5F85:: @ 81F5F85 end Route121_EventScript_1F5F9C:: @ 81F5F9C - trainerbattle_normal TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B + trainerbattle_single TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FB3:: @ 81F5FB3 - trainerbattle_normal TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 + trainerbattle_single TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FCA:: @ 81F5FCA - trainerbattle_normal TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 + trainerbattle_single TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FE1:: @ 81F5FE1 - trainerbattle_normal TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C + trainerbattle_single TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FF8:: @ 81F5FF8 - trainerbattle_normal TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 + trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 193c33368..ab5b5abb9 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -46,22 +46,22 @@ Route123_EventScript_1F61BC:: @ 81F61BC end Route123_EventScript_1F61C5:: @ 81F61C5 - trainerbattle_normal TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23 + trainerbattle_single TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23 msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61DC:: @ 81F61DC - trainerbattle_normal TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6 + trainerbattle_single TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6 msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61F3:: @ 81F61F3 - trainerbattle_normal TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53 + trainerbattle_single TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53 msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F620A:: @ 81F620A - trainerbattle_normal TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 + trainerbattle_single TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 @@ -83,7 +83,7 @@ Route123_EventScript_1F6255:: @ 81F6255 end Route123_EventScript_1F626C:: @ 81F626C - trainerbattle_normal TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 + trainerbattle_single TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 @@ -115,47 +115,47 @@ Route123_EventScript_1F62E9:: @ 81F62E9 end Route123_EventScript_1F6304:: @ 81F6304 - trainerbattle_normal TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6 + trainerbattle_single TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6 msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE end Route123_EventScript_1F631B:: @ 81F631B - trainerbattle_normal TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631 + trainerbattle_single TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631 msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6332:: @ 81F6332 - trainerbattle_normal TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704 + trainerbattle_single TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704 msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6349:: @ 81F6349 - trainerbattle_normal TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0 + trainerbattle_single TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0 msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6360:: @ 81F6360 - trainerbattle_normal TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943 + trainerbattle_single TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943 msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6377:: @ 81F6377 - trainerbattle_normal TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A + trainerbattle_single TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE end Route123_EventScript_1F638E:: @ 81F638E - trainerbattle_normal TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592 + trainerbattle_single TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592 msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63A5:: @ 81F63A5 - trainerbattle_normal TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE + trainerbattle_single TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63BC:: @ 81F63BC - trainerbattle_normal TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 + trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 914189ca0..d9d43b531 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -12,17 +12,17 @@ Route124_EventScript_1F657C:: @ 81F657C end Route124_EventScript_1F6585:: @ 81F6585 - trainerbattle_normal TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 + trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE end Route124_EventScript_1F659C:: @ 81F659C - trainerbattle_normal TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC + trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE end Route124_EventScript_1F65B3:: @ 81F65B3 - trainerbattle_normal TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF + trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE @@ -44,12 +44,12 @@ Route124_EventScript_1F65FE:: @ 81F65FE end Route124_EventScript_1F6615:: @ 81F6615 - trainerbattle_normal TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D + trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE end Route124_EventScript_1F662C:: @ 81F662C - trainerbattle_normal TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF + trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE end @@ -94,12 +94,12 @@ Route124_EventScript_1F66F0:: @ 81F66F0 end Route124_EventScript_1F670B:: @ 81F670B - trainerbattle_normal TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C + trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6722:: @ 81F6722 - trainerbattle_normal TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC + trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index c0e36be66..528eda704 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -27,27 +27,27 @@ Route125_MapScript2_1F679A: @ 81F679A .2byte 0 Route125_EventScript_1F67A4:: @ 81F67A4 - trainerbattle_normal TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A + trainerbattle_single TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67BB:: @ 81F67BB - trainerbattle_normal TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7 + trainerbattle_single TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7 msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67D2:: @ 81F67D2 - trainerbattle_normal TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D + trainerbattle_single TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67E9:: @ 81F67E9 - trainerbattle_normal TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5 + trainerbattle_single TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5 msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6800:: @ 81F6800 - trainerbattle_normal TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C + trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B @@ -79,12 +79,12 @@ Route125_EventScript_1F687D:: @ 81F687D end Route125_EventScript_1F6898:: @ 81F6898 - trainerbattle_normal TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E + trainerbattle_single TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE end Route125_EventScript_1F68AF:: @ 81F68AF - trainerbattle_normal TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD + trainerbattle_single TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 8728b6f2d..0be11144a 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -8,42 +8,42 @@ Route126_MapScript1_1F68CC: @ 81F68CC end Route126_EventScript_1F68D6:: @ 81F68D6 - trainerbattle_normal TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8 + trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8 msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE end Route126_EventScript_1F68ED:: @ 81F68ED - trainerbattle_normal TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63 + trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63 msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6904:: @ 81F6904 - trainerbattle_normal TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8 + trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8 msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE end Route126_EventScript_1F691B:: @ 81F691B - trainerbattle_normal TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63 + trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63 msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6932:: @ 81F6932 - trainerbattle_normal TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6 + trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6 msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6949:: @ 81F6949 - trainerbattle_normal TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3 + trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3 msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6960:: @ 81F6960 - trainerbattle_normal TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216 + trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216 msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6977:: @ 81F6977 - trainerbattle_normal TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 + trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route126_EventScript_1F69C2 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index c6c560010..f9c3290b9 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -27,42 +27,42 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 - trainerbattle_normal TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 + trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A4C:: @ 81F6A4C - trainerbattle_normal TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 + trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A63:: @ 81F6A63 - trainerbattle_normal TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 + trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A7A:: @ 81F6A7A - trainerbattle_normal TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 + trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A91:: @ 81F6A91 - trainerbattle_normal TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B + trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AA8:: @ 81F6AA8 - trainerbattle_normal TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 + trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6ABF:: @ 81F6ABF - trainerbattle_normal TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC + trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AD6:: @ 81F6AD6 - trainerbattle_normal TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 + trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 72fc41e03..ec47bf39c 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -176,7 +176,7 @@ Route128_Movement_1F6CBB: @ 81F6CBB step_end Route128_EventScript_1F6CBE:: @ 81F6CBE - trainerbattle_normal TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA + trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 @@ -198,7 +198,7 @@ Route128_EventScript_1F6D09:: @ 81F6D09 end Route128_EventScript_1F6D20:: @ 81F6D20 - trainerbattle_normal TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C + trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B @@ -220,27 +220,27 @@ Route128_EventScript_1F6D6B:: @ 81F6D6B end Route128_EventScript_1F6D82:: @ 81F6D82 - trainerbattle_normal TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 + trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D99:: @ 81F6D99 - trainerbattle_normal TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE + trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DB0:: @ 81F6DB0 - trainerbattle_normal TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 + trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DC7:: @ 81F6DC7 - trainerbattle_normal TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 + trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DDE:: @ 81F6DDE - trainerbattle_normal TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA + trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 8649f903b..b58e9ddd4 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -32,27 +32,27 @@ Route129_MapScript2_1F72E2: @ 81F72E2 .2byte 0 Route129_EventScript_1F72EC:: @ 81F72EC - trainerbattle_normal TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D + trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7303:: @ 81F7303 - trainerbattle_normal TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034 + trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034 msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE end Route129_EventScript_1F731A:: @ 81F731A - trainerbattle_normal TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1 + trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1 msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7331:: @ 81F7331 - trainerbattle_normal TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D + trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7348:: @ 81F7348 - trainerbattle_normal TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239 + trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239 msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 91c3dde49..6698837d2 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -36,17 +36,17 @@ Route130_EventScript_1F73B5:: @ 81F73B5 return Route130_EventScript_1F73BF:: @ 81F73BF - trainerbattle_normal TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 + trainerbattle_single TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73D6:: @ 81F73D6 - trainerbattle_normal TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC + trainerbattle_single TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73ED:: @ 81F73ED - trainerbattle_normal TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D + trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 07647a959..618d17fdb 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -18,22 +18,22 @@ Route131_EventScript_1F741F:: @ 81F741F return Route131_EventScript_1F7429:: @ 81F7429 - trainerbattle_normal TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D + trainerbattle_single TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7440:: @ 81F7440 - trainerbattle_normal TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626 + trainerbattle_single TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626 msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7457:: @ 81F7457 - trainerbattle_normal TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB + trainerbattle_single TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE end Route131_EventScript_1F746E:: @ 81F746E - trainerbattle_normal TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A + trainerbattle_single TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE end @@ -48,12 +48,12 @@ Route131_EventScript_1F74A0:: @ 81F74A0 end Route131_EventScript_1F74BB:: @ 81F74BB - trainerbattle_normal TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38 + trainerbattle_single TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38 msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74D2:: @ 81F74D2 - trainerbattle_normal TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC + trainerbattle_single TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index a80a1a5c0..aed4d0673 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,42 +2,42 @@ Route132_MapScripts:: @ 81F74E9 .byte 0 Route132_EventScript_1F74EA:: @ 81F74EA - trainerbattle_normal TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC + trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7501:: @ 81F7501 - trainerbattle_normal TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39 + trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39 msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7518:: @ 81F7518 - trainerbattle_normal TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD + trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F752F:: @ 81F752F - trainerbattle_normal TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C + trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7546:: @ 81F7546 - trainerbattle_normal TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8 + trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8 msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F755D:: @ 81F755D - trainerbattle_normal TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E + trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7574:: @ 81F7574 - trainerbattle_normal TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD + trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE end Route132_EventScript_1F758B:: @ 81F758B - trainerbattle_normal TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C + trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index c42963d83..a91eeead3 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,37 +2,37 @@ Route133_MapScripts:: @ 81F75A2 .byte 0 Route133_EventScript_1F75A3:: @ 81F75A3 - trainerbattle_normal TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F + trainerbattle_single TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75BA:: @ 81F75BA - trainerbattle_normal TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 + trainerbattle_single TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75D1:: @ 81F75D1 - trainerbattle_normal TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 + trainerbattle_single TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75E8:: @ 81F75E8 - trainerbattle_normal TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 + trainerbattle_single TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75FF:: @ 81F75FF - trainerbattle_normal TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C + trainerbattle_single TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE end Route133_EventScript_1F7616:: @ 81F7616 - trainerbattle_normal TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A + trainerbattle_single TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE end Route133_EventScript_1F762D:: @ 81F762D - trainerbattle_normal TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 + trainerbattle_single TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 862026bf6..f6f4feee3 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A end Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle_normal TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB + trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A - trainerbattle_normal TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 + trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle_normal TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE + trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle_normal TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 + trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle_normal TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 + trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle_normal TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle_normal TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 + trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle_normal TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B + trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B - trainerbattle_normal TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B + trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 48e04593e..f39374c64 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 8212F30 .byte 0 RustboroCity_Gym_EventScript_212F31:: @ 8212F31 - trainerbattle_normal TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC + trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq RustboroCity_Gym_EventScript_212FC8 @@ -43,17 +43,17 @@ RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8 end RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3 - trainerbattle_normal TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D + trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA - trainerbattle_normal TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 + trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_213011:: @ 8213011 - trainerbattle_normal TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 + trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index b507c29b4..c93f7d5c4 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -426,7 +426,7 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle_normal TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB + trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index 4fcc90137..b7e15a82d 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,12 +2,12 @@ SSTidalLowerDeck_MapScripts:: @ 823C818 .byte 0 SSTidalLowerDeck_EventScript_23C819:: @ 823C819 - trainerbattle_normal TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 + trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE end SSTidalLowerDeck_EventScript_23C830:: @ 823C830 - trainerbattle_normal TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D + trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 086d60b2d..055973787 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -30,17 +30,17 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 end SSTidalRooms_EventScript_23CA49:: @ 823CA49 - trainerbattle_normal TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 + trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA60:: @ 823CA60 - trainerbattle_normal TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 + trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA77:: @ 823CA77 - trainerbattle_normal TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A + trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE end @@ -55,12 +55,12 @@ SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 end SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 - trainerbattle_normal TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 + trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CADB:: @ 823CADB - trainerbattle_normal TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 + trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 598cd34bf..96ef36d38 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -2,12 +2,12 @@ SeafloorCavern_Room1_MapScripts:: @ 82347EB .byte 0 SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC - trainerbattle_normal TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A + trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE end SeafloorCavern_Room1_EventScript_234803:: @ 8234803 - trainerbattle_normal TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD + trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index d795c4b8f..29bfcc89a 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -2,12 +2,12 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937 .byte 0 SeafloorCavern_Room3_EventScript_234938:: @ 8234938 - trainerbattle_normal TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 + trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE end SeafloorCavern_Room3_EventScript_23494F:: @ 823494F - trainerbattle_normal TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE + trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index 5b0944b2f..92e165c7b 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -2,12 +2,12 @@ SeafloorCavern_Room4_MapScripts:: @ 8234C9B .byte 0 SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C - trainerbattle_normal TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 + trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE end SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 - trainerbattle_normal TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 + trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 21664cb6f..b04243b90 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 step_end SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 - trainerbattle_normal TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC + trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq SootopolisCity_Gym_1F_EventScript_225025 diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 89a67471b..33840b427 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,52 +2,52 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A .byte 0 SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B - trainerbattle_normal TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 + trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 - trainerbattle_normal TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 + trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 - trainerbattle_normal TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 + trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 - trainerbattle_normal TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB + trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 - trainerbattle_normal TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 + trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE - trainerbattle_normal TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 + trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 - trainerbattle_normal TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 + trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C - trainerbattle_normal TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B + trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 - trainerbattle_normal TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD + trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A - trainerbattle_normal TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 + trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index c6b99c836..abe42e6d6 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -82,7 +82,7 @@ VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C end VictoryRoad_1F_EventScript_235E35:: @ 8235E35 - trainerbattle_normal TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq VictoryRoad_1F_EventScript_235E5C @@ -95,27 +95,27 @@ VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C end VictoryRoad_1F_EventScript_235E73:: @ 8235E73 - trainerbattle_normal TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB + trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A - trainerbattle_normal TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 + trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 - trainerbattle_normal TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 + trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 - trainerbattle_normal TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 + trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF - trainerbattle_normal TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 + trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index 999ad1f16..d6d2d6861 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,27 +2,27 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4 .byte 0 VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 - trainerbattle_normal TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD + trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC - trainerbattle_normal TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D + trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236513:: @ 8236513 - trainerbattle_normal TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B + trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_23652A:: @ 823652A - trainerbattle_normal TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 + trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236541:: @ 8236541 - trainerbattle_normal TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B + trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index c4e77ea1f..245440135 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,32 +2,32 @@ VictoryRoad_B2F_MapScripts:: @ 82368D4 .byte 0 VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 - trainerbattle_normal TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 + trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC - trainerbattle_normal TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 + trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236903:: @ 8236903 - trainerbattle_normal TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 + trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_23691A:: @ 823691A - trainerbattle_normal TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A + trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236931:: @ 8236931 - trainerbattle_normal TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB + trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236948:: @ 8236948 - trainerbattle_normal TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E + trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE end diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h index 0256f889c..329bfa650 100644 --- a/include/constants/battle_setup.h +++ b/include/constants/battle_setup.h @@ -1,10 +1,10 @@ #ifndef GUARD_CONSTANTS_BATTLE_SETUP_H #define GUARD_CONSTANTS_BATTLE_SETUP_H -#define TRAINER_BATTLE_NORMAL 0 +#define TRAINER_BATTLE_SINGLE 0 #define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC 1 #define TRAINER_BATTLE_CONTINUE_SCRIPT 2 -#define TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT 3 +#define TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT 3 #define TRAINER_BATTLE_DOUBLE 4 #define TRAINER_BATTLE_REMATCH 5 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 diff --git a/src/battle_setup.c b/src/battle_setup.c index 6db787a5f..4243d2f3f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1086,7 +1086,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) switch (sTrainerBattleMode) { - case TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT: + case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT: TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); return EventScript_2713C2; case TRAINER_BATTLE_DOUBLE: -- cgit v1.2.3 From a2a99bde115e183267db6bb4b5c1dc73d57284fc Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 15:10:05 -0500 Subject: adds req for macro arguments --- asm/macros/event.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e7756c317..d66992c35 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -629,7 +629,7 @@ .endm @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. - .macro trainerbattle type, trainer, local_id, pointer1, pointer2, pointer3, pointer4 + .macro trainerbattle type:req, trainer:req, local_id:req, pointer1:req, pointer2, pointer3, pointer4 .byte 0x5c .byte \type .2byte \trainer @@ -687,10 +687,10 @@ @ Starts a single trainer battle, takes a trainer, intro text, loss text, and an optional event script @ when used with an event script, you can also pass in an optional flag to disable music - .macro trainerbattle_single trainer, intro_text, lose_text, event_script=FALSE, music=TRUE + .macro trainerbattle_single trainer:req, intro_text:req, lose_text:req, event_script=FALSE, music=TRUE .if \event_script == FALSE trainerbattle TRAINER_BATTLE_SINGLE, \trainer, 0, \intro_text, \lose_text - .elseif \event_script != FALSE && \music == TRUE + .elseif \music == TRUE trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, \trainer, 0, \intro_text, \lose_text, \event_script .else trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \event_script @@ -699,10 +699,10 @@ @ Starts a double trainer battle, takes a trainer, intro text, loss text, text for when you have too few pokemon @ and an optional event script, when used with an event script you can pass in an optional flag to disable music - .macro trainerbattle_double trainer, intro_text, lose_text, not_enough_pkmn_text, event_script=FALSE, music=TRUE + .macro trainerbattle_double trainer:req, intro_text:req, lose_text:req, not_enough_pkmn_text:req, event_script=FALSE, music=TRUE .if \event_script == FALSE trainerbattle TRAINER_BATTLE_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text - .elseif \event_script != FALSE && \music == TRUE + .elseif \music == TRUE trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script .else trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script @@ -710,17 +710,17 @@ .endm @ Starts a rematch battle, takes a trainer, intro text and loss text - .macro trainerbattle_rematch trainer, intro_text, lose_text + .macro trainerbattle_rematch trainer:req, intro_text:req, lose_text:req trainerbattle TRAINER_BATTLE_REMATCH, \trainer, 0, \intro_text, \lose_text .endm @ Starts a rematch double battle, takes a trainer, intro text, loss text, and text for when you have too few pokemon - .macro trainerbattle_rematch_double trainer, intro_text, lose_text, not_enough_pkmn_text + .macro trainerbattle_rematch_double trainer:req, intro_text:req, lose_text:req, not_enough_pkmn_text:req trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text .endm @ Starts a trainer battle, skipping intro text, takes a trainer and loss text - .macro trainerbattle_no_intro trainer, lose_text + .macro trainerbattle_no_intro trainer:req, lose_text:req trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, \trainer, 0, \lose_text .endm -- cgit v1.2.3 From 72bd670ba63765b55a713994d26bdc2020e5513a Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 21:41:31 -0500 Subject: index trainer class lookups --- src/data/pokemon/trainer_class_lookups.h | 328 +++++++++++++++---------------- 1 file changed, 164 insertions(+), 164 deletions(-) diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 90ceec811..0d3cd0fe7 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -3,174 +3,174 @@ const u8 gFacilityClassToPicIndex[] = { - TRAINER_PIC_HIKER, // FACILITY_CLASS_HIKER - TRAINER_PIC_AQUA_GRUNT_M, // FACILITY_CLASS_TEAM_AQUA_1 - TRAINER_PIC_POKEMON_BREEDER_F, // FACILITY_CLASS_PKMN_BREEDER_1 - TRAINER_PIC_COOL_TRAINER_M, // FACILITY_CLASS_COOLTRAINER_M - TRAINER_PIC_BIRD_KEEPER, // FACILITY_CLASS_BIRD_KEEPER - TRAINER_PIC_COLLECTOR, // FACILITY_CLASS_COLLECTOR - TRAINER_PIC_AQUA_GRUNT_F, // FACILITY_CLASS_TEAM_AQUA_2 - TRAINER_PIC_SWIMMER_M, // FACILITY_CLASS_SWIMMER_M - TRAINER_PIC_MAGMA_GRUNT_M, // FACILITY_CLASS_TEAM_MAGMA_1 - TRAINER_PIC_EXPERT_M, // FACILITY_CLASS_EXPERT_M - TRAINER_PIC_BLACK_BELT, // FACILITY_CLASS_BLACK_BELT - TRAINER_PIC_AQUA_LEADER_ARCHIE, // FACILITY_CLASS_AQUA_LEADER - TRAINER_PIC_HEX_MANIAC, // FACILITY_CLASS_HEX_MANIAC - TRAINER_PIC_AROMA_LADY, // FACILITY_CLASS_AROMA_LADY - TRAINER_PIC_RUIN_MANIAC, // FACILITY_CLASS_RUIN_MANIAC - TRAINER_PIC_INTERVIEWER, // FACILITY_CLASS_INTERVIEWER - TRAINER_PIC_TUBER_F, // FACILITY_CLASS_TUBER_1 - TRAINER_PIC_TUBER_M, // FACILITY_CLASS_TUBER_2 - TRAINER_PIC_COOL_TRAINER_F, // FACILITY_CLASS_COOLTRAINER_F - TRAINER_PIC_LADY, // FACILITY_CLASS_LADY - TRAINER_PIC_BEAUTY, // FACILITY_CLASS_BEAUTY - TRAINER_PIC_RICH_BOY, // FACILITY_CLASS_RICH_BOY - TRAINER_PIC_EXPERT_F, // FACILITY_CLASS_EXPERT_2 - TRAINER_PIC_POKEMANIAC, // FACILITY_CLASS_POKEMANIAC - TRAINER_PIC_MAGMA_GRUNT_F, // FACILITY_CLASS_TEAM_MAGMA_2 - TRAINER_PIC_GUITARIST, // FACILITY_CLASS_GUITARIST - TRAINER_PIC_KINDLER, // FACILITY_CLASS_KINDLER - TRAINER_PIC_CAMPER, // FACILITY_CLASS_CAMPER - TRAINER_PIC_PICNICKER, // FACILITY_CLASS_PICNICKER - TRAINER_PIC_BUG_MANIAC, // FACILITY_CLASS_BUG_MANIAC - TRAINER_PIC_PSYCHIC_M, // FACILITY_CLASS_PSYCHIC_M - TRAINER_PIC_PSYCHIC_F, // FACILITY_CLASS_PSYCHIC_F - TRAINER_PIC_GENTLEMAN, // FACILITY_CLASS_GENTLEMAN - TRAINER_PIC_ELITE_FOUR_SIDNEY, // FACILITY_CLASS_ELITE_FOUR_1 - TRAINER_PIC_ELITE_FOUR_PHOEBE, // FACILITY_CLASS_ELITE_FOUR_2 - TRAINER_PIC_LEADER_ROXANNE, // FACILITY_CLASS_LEADER_1 - TRAINER_PIC_LEADER_BRAWLY, // FACILITY_CLASS_LEADER_2 - TRAINER_PIC_LEADER_TATE_AND_LIZA, // FACILITY_CLASS_LEADER_3 - TRAINER_PIC_SCHOOL_KID_M, // FACILITY_CLASS_SCHOOL_KID_M - TRAINER_PIC_SCHOOL_KID_F, // FACILITY_CLASS_SCHOOL_KID_F - TRAINER_PIC_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR - TRAINER_PIC_POKEFAN_M, // FACILITY_CLASS_POKEFAN_1 - TRAINER_PIC_POKEFAN_F, // FACILITY_CLASS_POKEFAN_2 - TRAINER_PIC_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER - TRAINER_PIC_CHAMPION_WALLACE, // FACILITY_CLASS_CHAMPION - TRAINER_PIC_FISHERMAN, // FACILITY_CLASS_FISHERMAN - TRAINER_PIC_CYCLING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_1 - TRAINER_PIC_CYCLING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_2 - TRAINER_PIC_RUNNING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_3 - TRAINER_PIC_RUNNING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_4 - TRAINER_PIC_SWIMMING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_5 - TRAINER_PIC_SWIMMING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_6 - TRAINER_PIC_DRAGON_TAMER, // FACILITY_CLASS_DRAGON_TAMER - TRAINER_PIC_NINJA_BOY, // FACILITY_CLASS_NINJA_BOY - TRAINER_PIC_BATTLE_GIRL, // FACILITY_CLASS_BATTLE_GIRL - TRAINER_PIC_PARASOL_LADY, // FACILITY_CLASS_PARASOL_LADY - TRAINER_PIC_SWIMMER_F, // FACILITY_CLASS_SWIMMER_F - TRAINER_PIC_TWINS, // FACILITY_CLASS_TWINS - TRAINER_PIC_SAILOR, // FACILITY_CLASS_SAILOR - TRAINER_PIC_WALLY, // FACILITY_CLASS_PKMN_TRAINER_1 - TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_BRENDAN - TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_3 - TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_4 - TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_MAY - TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_6 - TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_7 - TRAINER_PIC_POKEMON_BREEDER_M, // FACILITY_CLASS_PKMN_BREEDER_2 - TRAINER_PIC_BUG_CATCHER, // FACILITY_CLASS_BUG_CATCHER - TRAINER_PIC_POKEMON_RANGER_M, // FACILITY_CLASS_PKMN_RANGER_M - TRAINER_PIC_POKEMON_RANGER_F, // FACILITY_CLASS_PKMN_RANGER_F - TRAINER_PIC_MAGMA_LEADER_MAXIE, // FACILITY_CLASS_MAGMA_LEADER - TRAINER_PIC_LASS, // FACILITY_CLASS_LASS - TRAINER_PIC_YOUNG_COUPLE, // FACILITY_CLASS_YOUNG_COUPLE - TRAINER_PIC_OLD_COUPLE, // FACILITY_CLASS_OLD_COUPLE - TRAINER_PIC_SIS_AND_BRO, // FACILITY_CLASS_SIS_AND_BRO - TRAINER_PIC_STEVEN, // FACILITY_CLASS_PKMN_TRAINER_STEVEN - TRAINER_PIC_SALON_MAIDEN_ANABEL, // FACILITY_CLASS_SALON_MAIDEN - TRAINER_PIC_DOME_ACE_TUCKER, // FACILITY_CLASS_DOME_ACE - TRAINER_PIC_RED, // FACILITY_CLASS_PKMN_TRAINER_RED - TRAINER_PIC_LEAF, // FACILITY_CLASS_PKMN_TRAINER_LEAF - TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN - TRAINER_PIC_RUBY_SAPPHIRE_MAY, // FACILITY_CLASS_PKMN_TRAINER_RS_MAY + [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER, + [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_PIC_AQUA_GRUNT_M, + [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_PIC_POKEMON_BREEDER_F, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOL_TRAINER_M, + [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER, + [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR, + [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_PIC_AQUA_GRUNT_F, + [FACILITY_CLASS_SWIMMER_M] = TRAINER_PIC_SWIMMER_M, + [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_PIC_MAGMA_GRUNT_M, + [FACILITY_CLASS_EXPERT_M] = TRAINER_PIC_EXPERT_M, + [FACILITY_CLASS_BLACK_BELT] = TRAINER_PIC_BLACK_BELT, + [FACILITY_CLASS_AQUA_LEADER] = TRAINER_PIC_AQUA_LEADER_ARCHIE, + [FACILITY_CLASS_HEX_MANIAC] = TRAINER_PIC_HEX_MANIAC, + [FACILITY_CLASS_AROMA_LADY] = TRAINER_PIC_AROMA_LADY, + [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_PIC_RUIN_MANIAC, + [FACILITY_CLASS_INTERVIEWER] = TRAINER_PIC_INTERVIEWER, + [FACILITY_CLASS_TUBER_1] = TRAINER_PIC_TUBER_F, + [FACILITY_CLASS_TUBER_2] = TRAINER_PIC_TUBER_M, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOL_TRAINER_F, + [FACILITY_CLASS_LADY] = TRAINER_PIC_LADY, + [FACILITY_CLASS_BEAUTY] = TRAINER_PIC_BEAUTY, + [FACILITY_CLASS_RICH_BOY] = TRAINER_PIC_RICH_BOY, + [FACILITY_CLASS_EXPERT_2] = TRAINER_PIC_EXPERT_F, + [FACILITY_CLASS_POKEMANIAC] = TRAINER_PIC_POKEMANIAC, + [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_PIC_MAGMA_GRUNT_F, + [FACILITY_CLASS_GUITARIST] = TRAINER_PIC_GUITARIST, + [FACILITY_CLASS_KINDLER] = TRAINER_PIC_KINDLER, + [FACILITY_CLASS_CAMPER] = TRAINER_PIC_CAMPER, + [FACILITY_CLASS_PICNICKER] = TRAINER_PIC_PICNICKER, + [FACILITY_CLASS_BUG_MANIAC] = TRAINER_PIC_BUG_MANIAC, + [FACILITY_CLASS_PSYCHIC_M] = TRAINER_PIC_PSYCHIC_M, + [FACILITY_CLASS_PSYCHIC_F] = TRAINER_PIC_PSYCHIC_F, + [FACILITY_CLASS_GENTLEMAN] = TRAINER_PIC_GENTLEMAN, + [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_PIC_ELITE_FOUR_SIDNEY, + [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_PIC_ELITE_FOUR_PHOEBE, + [FACILITY_CLASS_LEADER_1] = TRAINER_PIC_LEADER_ROXANNE, + [FACILITY_CLASS_LEADER_2] = TRAINER_PIC_LEADER_BRAWLY, + [FACILITY_CLASS_LEADER_3] = TRAINER_PIC_LEADER_TATE_AND_LIZA, + [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_PIC_SCHOOL_KID_M, + [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_PIC_SCHOOL_KID_F, + [FACILITY_CLASS_SR_AND_JR] = TRAINER_PIC_SR_AND_JR, + [FACILITY_CLASS_POKEFAN_1] = TRAINER_PIC_POKEFAN_M, + [FACILITY_CLASS_POKEFAN_2] = TRAINER_PIC_POKEFAN_F, + [FACILITY_CLASS_YOUNGSTER] = TRAINER_PIC_YOUNGSTER, + [FACILITY_CLASS_CHAMPION] = TRAINER_PIC_CHAMPION_WALLACE, + [FACILITY_CLASS_FISHERMAN] = TRAINER_PIC_FISHERMAN, + [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_PIC_CYCLING_TRIATHLETE_M, + [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_PIC_CYCLING_TRIATHLETE_F, + [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_PIC_RUNNING_TRIATHLETE_M, + [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_PIC_RUNNING_TRIATHLETE_F, + [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_PIC_DRAGON_TAMER, + [FACILITY_CLASS_NINJA_BOY] = TRAINER_PIC_NINJA_BOY, + [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_PIC_BATTLE_GIRL, + [FACILITY_CLASS_PARASOL_LADY] = TRAINER_PIC_PARASOL_LADY, + [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F, + [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS, + [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR, + [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_PIC_WALLY, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_PIC_POKEMON_BREEDER_M, + [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER, + [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M, + [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_PIC_POKEMON_RANGER_F, + [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_PIC_MAGMA_LEADER_MAXIE, + [FACILITY_CLASS_LASS] = TRAINER_PIC_LASS, + [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_PIC_YOUNG_COUPLE, + [FACILITY_CLASS_OLD_COUPLE] = TRAINER_PIC_OLD_COUPLE, + [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_PIC_SIS_AND_BRO, + [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_PIC_STEVEN, + [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_PIC_SALON_MAIDEN_ANABEL, + [FACILITY_CLASS_DOME_ACE] = TRAINER_PIC_DOME_ACE_TUCKER, + [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_PIC_RED, + [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_PIC_LEAF, + [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_PIC_RUBY_SAPPHIRE_MAY, }; const u8 gFacilityClassToTrainerClass[] = { - TRAINER_CLASS_HIKER, // FACILITY_CLASS_HIKER - TRAINER_CLASS_TEAM_AQUA, // FACILITY_CLASS_TEAM_AQUA_1 - TRAINER_CLASS_PKMN_BREEDER, // FACILITY_CLASS_PKMN_BREEDER_1 - TRAINER_CLASS_COOLTRAINER_1, // FACILITY_CLASS_COOLTRAINER_M - TRAINER_CLASS_BIRD_KEEPER, // FACILITY_CLASS_BIRD_KEEPER - TRAINER_CLASS_COLLECTOR, // FACILITY_CLASS_COLLECTOR - TRAINER_CLASS_TEAM_AQUA, // FACILITY_CLASS_TEAM_AQUA_2 - TRAINER_CLASS_SWIMMER_M, // FACILITY_CLASS_SWIMMER_M - TRAINER_CLASS_TEAM_MAGMA, // FACILITY_CLASS_TEAM_MAGMA_1 - TRAINER_CLASS_EXPERT, // FACILITY_CLASS_EXPERT_M - TRAINER_CLASS_BLACK_BELT, // FACILITY_CLASS_BLACK_BELT - TRAINER_CLASS_AQUA_LEADER, // FACILITY_CLASS_AQUA_LEADER - TRAINER_CLASS_HEX_MANIAC, // FACILITY_CLASS_HEX_MANIAC - TRAINER_CLASS_AROMA_LADY, // FACILITY_CLASS_AROMA_LADY - TRAINER_CLASS_RUIN_MANIAC, // FACILITY_CLASS_RUIN_MANIAC - TRAINER_CLASS_INTERVIEWER, // FACILITY_CLASS_INTERVIEWER - TRAINER_CLASS_TUBER_1, // FACILITY_CLASS_TUBER_1 - TRAINER_CLASS_TUBER_2, // FACILITY_CLASS_TUBER_2 - TRAINER_CLASS_COOLTRAINER_1, // FACILITY_CLASS_COOLTRAINER_F - TRAINER_CLASS_LADY, // FACILITY_CLASS_LADY - TRAINER_CLASS_BEAUTY, // FACILITY_CLASS_BEAUTY - TRAINER_CLASS_RICH_BOY, // FACILITY_CLASS_RICH_BOY - TRAINER_CLASS_EXPERT, // FACILITY_CLASS_EXPERT_2 - TRAINER_CLASS_POKEMANIAC, // FACILITY_CLASS_POKEMANIAC - TRAINER_CLASS_TEAM_MAGMA, // FACILITY_CLASS_TEAM_MAGMA_2 - TRAINER_CLASS_GUITARIST, // FACILITY_CLASS_GUITARIST - TRAINER_CLASS_KINDLER, // FACILITY_CLASS_KINDLER - TRAINER_CLASS_CAMPER, // FACILITY_CLASS_CAMPER - TRAINER_CLASS_PICNICKER, // FACILITY_CLASS_PICNICKER - TRAINER_CLASS_BUG_MANIAC, // FACILITY_CLASS_BUG_MANIAC - TRAINER_CLASS_PSYCHIC, // FACILITY_CLASS_PSYCHIC_M - TRAINER_CLASS_PSYCHIC, // FACILITY_CLASS_PSYCHIC_F - TRAINER_CLASS_GENTLEMAN, // FACILITY_CLASS_GENTLEMAN - TRAINER_CLASS_ELITE_FOUR, // FACILITY_CLASS_ELITE_FOUR_1 - TRAINER_CLASS_ELITE_FOUR, // FACILITY_CLASS_ELITE_FOUR_2 - TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_1 - TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_2 - TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_3 - TRAINER_CLASS_SCHOOL_KID, // FACILITY_CLASS_SCHOOL_KID_M - TRAINER_CLASS_SCHOOL_KID, // FACILITY_CLASS_SCHOOL_KID_F - TRAINER_CLASS_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR - TRAINER_CLASS_POKEFAN, // FACILITY_CLASS_POKEFAN_1 - TRAINER_CLASS_POKEFAN, // FACILITY_CLASS_POKEFAN_2 - TRAINER_CLASS_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER - TRAINER_CLASS_CHAMPION, // FACILITY_CLASS_CHAMPION - TRAINER_CLASS_FISHERMAN, // FACILITY_CLASS_FISHERMAN - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_1 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_2 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_3 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_4 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_5 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_6 - TRAINER_CLASS_DRAGON_TAMER, // FACILITY_CLASS_DRAGON_TAMER - TRAINER_CLASS_NINJA_BOY, // FACILITY_CLASS_NINJA_BOY - TRAINER_CLASS_BATTLE_GIRL, // FACILITY_CLASS_BATTLE_GIRL - TRAINER_CLASS_PARASOL_LADY, // FACILITY_CLASS_PARASOL_LADY - TRAINER_CLASS_SWIMMER_F, // FACILITY_CLASS_SWIMMER_F - TRAINER_CLASS_TWINS, // FACILITY_CLASS_TWINS - TRAINER_CLASS_SAILOR, // FACILITY_CLASS_SAILOR - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_1 - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_MAY - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_3 - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_4 - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_BRENDAN - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_6 - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_7 - TRAINER_CLASS_PKMN_BREEDER, // FACILITY_CLASS_PKMN_BREEDER_2 - TRAINER_CLASS_BUG_CATCHER, // FACILITY_CLASS_BUG_CATCHER - TRAINER_CLASS_PKMN_RANGER, // FACILITY_CLASS_PKMN_RANGER_M - TRAINER_CLASS_PKMN_RANGER, // FACILITY_CLASS_PKMN_RANGER_F - TRAINER_CLASS_MAGMA_LEADER, // FACILITY_CLASS_MAGMA_LEADER - TRAINER_CLASS_LASS, // FACILITY_CLASS_LASS - TRAINER_CLASS_YOUNG_COUPLE, // FACILITY_CLASS_YOUNG_COUPLE - TRAINER_CLASS_OLD_COUPLE, // FACILITY_CLASS_OLD_COUPLE - TRAINER_CLASS_SIS_AND_BRO, // FACILITY_CLASS_SIS_AND_BRO - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_STEVEN - TRAINER_CLASS_SALON_MAIDEN, // FACILITY_CLASS_SALON_MAIDEN - TRAINER_CLASS_DOME_ACE, // FACILITY_CLASS_DOME_ACE - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_RED - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_LEAF - TRAINER_CLASS_PKMN_TRAINER_4, // FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN - TRAINER_CLASS_PKMN_TRAINER_4, // FACILITY_CLASS_PKMN_TRAINER_RS_MAY + [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER, + [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER_1, + [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER, + [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR, + [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_SWIMMER_M] = TRAINER_CLASS_SWIMMER_M, + [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_EXPERT_M] = TRAINER_CLASS_EXPERT, + [FACILITY_CLASS_BLACK_BELT] = TRAINER_CLASS_BLACK_BELT, + [FACILITY_CLASS_AQUA_LEADER] = TRAINER_CLASS_AQUA_LEADER, + [FACILITY_CLASS_HEX_MANIAC] = TRAINER_CLASS_HEX_MANIAC, + [FACILITY_CLASS_AROMA_LADY] = TRAINER_CLASS_AROMA_LADY, + [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_CLASS_RUIN_MANIAC, + [FACILITY_CLASS_INTERVIEWER] = TRAINER_CLASS_INTERVIEWER, + [FACILITY_CLASS_TUBER_1] = TRAINER_CLASS_TUBER_1, + [FACILITY_CLASS_TUBER_2] = TRAINER_CLASS_TUBER_2, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER_1, + [FACILITY_CLASS_LADY] = TRAINER_CLASS_LADY, + [FACILITY_CLASS_BEAUTY] = TRAINER_CLASS_BEAUTY, + [FACILITY_CLASS_RICH_BOY] = TRAINER_CLASS_RICH_BOY, + [FACILITY_CLASS_EXPERT_2] = TRAINER_CLASS_EXPERT, + [FACILITY_CLASS_POKEMANIAC] = TRAINER_CLASS_POKEMANIAC, + [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_GUITARIST] = TRAINER_CLASS_GUITARIST, + [FACILITY_CLASS_KINDLER] = TRAINER_CLASS_KINDLER, + [FACILITY_CLASS_CAMPER] = TRAINER_CLASS_CAMPER, + [FACILITY_CLASS_PICNICKER] = TRAINER_CLASS_PICNICKER, + [FACILITY_CLASS_BUG_MANIAC] = TRAINER_CLASS_BUG_MANIAC, + [FACILITY_CLASS_PSYCHIC_M] = TRAINER_CLASS_PSYCHIC, + [FACILITY_CLASS_PSYCHIC_F] = TRAINER_CLASS_PSYCHIC, + [FACILITY_CLASS_GENTLEMAN] = TRAINER_CLASS_GENTLEMAN, + [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_LEADER_1] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_2] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_3] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_CLASS_SCHOOL_KID, + [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_CLASS_SCHOOL_KID, + [FACILITY_CLASS_SR_AND_JR] = TRAINER_CLASS_SR_AND_JR, + [FACILITY_CLASS_POKEFAN_1] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_POKEFAN_2] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_YOUNGSTER] = TRAINER_CLASS_YOUNGSTER, + [FACILITY_CLASS_CHAMPION] = TRAINER_CLASS_CHAMPION, + [FACILITY_CLASS_FISHERMAN] = TRAINER_CLASS_FISHERMAN, + [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_CLASS_DRAGON_TAMER, + [FACILITY_CLASS_NINJA_BOY] = TRAINER_CLASS_NINJA_BOY, + [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_CLASS_BATTLE_GIRL, + [FACILITY_CLASS_PARASOL_LADY] = TRAINER_CLASS_PARASOL_LADY, + [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F, + [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS, + [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR, + [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER, + [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER, + [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_CLASS_PKMN_RANGER, + [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_CLASS_MAGMA_LEADER, + [FACILITY_CLASS_LASS] = TRAINER_CLASS_LASS, + [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_CLASS_YOUNG_COUPLE, + [FACILITY_CLASS_OLD_COUPLE] = TRAINER_CLASS_OLD_COUPLE, + [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_CLASS_SIS_AND_BRO, + [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_CLASS_SALON_MAIDEN, + [FACILITY_CLASS_DOME_ACE] = TRAINER_CLASS_DOME_ACE, + [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4, + [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, }; #endif //POKEEMERALD_TRAINER_CLASS_LOOKUPS_H -- cgit v1.2.3 From eeb6446da4384246e6b5c47b04554d82a4cd752f Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 22:35:11 -0500 Subject: add more consistent names --- data/battle_frontier/battle_frontier_trainers.inc | 140 +++++------ .../fallarbor_battle_tent_trainers.inc | 10 +- .../slateport_battle_tent_trainers.inc | 10 +- .../verdanturf_battle_tent_trainers.inc | 10 +- include/constants/trainers.h | 90 +++---- src/battle_controller_link_opponent.c | 16 +- src/battle_main.c | 6 +- src/data/pokemon/trainer_class_lookups.h | 156 ++++++------ src/data/text/trainer_class_names.h | 8 +- src/data/trainer_graphics/front_pic_anims.h | 8 +- src/data/trainers.h | 262 ++++++++++----------- src/pokemon.c | 4 +- 12 files changed, 360 insertions(+), 360 deletions(-) diff --git a/data/battle_frontier/battle_frontier_trainers.inc b/data/battle_frontier/battle_frontier_trainers.inc index 034c1b62c..8b05d88eb 100644 --- a/data/battle_frontier/battle_frontier_trainers.inc +++ b/data/battle_frontier/battle_frontier_trainers.inc @@ -625,7 +625,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Lauren @ 24 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "KIPP$", 8 @ pre-battle speech .2byte EC_WORD_IF_I_WIN @@ -651,7 +651,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kipp @ 25 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "JASON$", 8 @ pre-battle speech .2byte EC_WORD_TEACH @@ -677,7 +677,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jason @ 26 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "JOHN$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -703,7 +703,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_John @ 27 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "ANN$", 8 @ pre-battle speech .2byte EC_WORD_IT_S @@ -729,7 +729,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Ann @ 28 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "EILEEN$", 8 @ pre-battle speech .2byte EC_WORD_LET_S @@ -755,7 +755,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Eileen @ 29 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "CARLIE$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -937,7 +937,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kathy @ 36 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "PEYTON$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -963,7 +963,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Peyton @ 37 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "JULIAN$", 8 @ pre-battle speech .2byte EC_WORD_YOU @@ -989,7 +989,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Julian @ 38 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "QUINN$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -1015,7 +1015,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Quinn @ 39 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "HAYLEE$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -1041,7 +1041,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Haylee @ 40 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "AMANDA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -1067,7 +1067,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Amanda @ 41 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "STACY$", 8 @ pre-battle speech .2byte EC_WORD_ALL @@ -1093,7 +1093,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Stacy @ 42 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "RAFAEL$", 8 @ pre-battle speech .2byte EC_WORD_COME_ON @@ -1119,7 +1119,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Rafael @ 43 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "OLIVER$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -1145,7 +1145,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Oliver @ 44 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "PAYTON$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -1171,7 +1171,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Payton @ 45 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "PAMELA$", 8 @ pre-battle speech .2byte EC_WORD_ALL @@ -1197,7 +1197,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Pamela @ 46 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "ELIZA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -1223,7 +1223,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Eliza @ 47 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "MARISA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -2341,7 +2341,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Nash @ 90 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "ROBBY$", 8 @ pre-battle speech .2byte EC_WORD_HAHAHA @@ -2367,7 +2367,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Robby @ 91 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "REECE$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -2393,7 +2393,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Reece @ 92 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "KATHRYN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -2419,7 +2419,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kathryn @ 93 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "ELLEN$", 8 @ pre-battle speech .2byte EC_WORD_CRUSH @@ -2445,7 +2445,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Ellen @ 94 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "RAMON$", 8 @ pre-battle speech .2byte EC_WORD_OKAY @@ -2471,7 +2471,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Ramon @ 95 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "ARTHUR$", 8 @ pre-battle speech .2byte EC_WORD_HERE_I_COME @@ -2497,7 +2497,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Arthur @ 96 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "ALONDRA$", 8 @ pre-battle speech .2byte EC_WORD_EVERY @@ -2523,7 +2523,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Alondra @ 97 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "ADRIANA$", 8 @ pre-battle speech .2byte EC_WORD_COME @@ -2549,7 +2549,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Adriana @ 98 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "MALIK$", 8 @ pre-battle speech .2byte EC_WORD_OH @@ -2575,7 +2575,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Malik @ 99 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "JILL$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -2601,7 +2601,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jill @ 100 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "ERIK$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -2627,7 +2627,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Erik @ 101 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "YAZMIN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -2653,7 +2653,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Yazmin @ 102 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "JAMAL$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -2679,7 +2679,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jamal @ 103 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "LESLIE$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -2705,7 +2705,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Leslie @ 104 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "DAVE$", 8 @ pre-battle speech .2byte EC_WORD_WHAT @@ -2731,7 +2731,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Dave @ 105 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "CARLO$", 8 @ pre-battle speech .2byte EC_WORD_HAH @@ -2757,7 +2757,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Carlo @ 106 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "EMILIA$", 8 @ pre-battle speech .2byte EC_WORD_ME @@ -2783,7 +2783,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Emilia @ 107 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "DALIA$", 8 @ pre-battle speech .2byte EC_WORD_MY @@ -3043,7 +3043,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Joel @ 117 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "KRISTEN$", 8 @ pre-battle speech .2byte EC_WORD_HAHAHA @@ -3069,7 +3069,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Kristen @ 118 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "SELPHY$", 8 @ pre-battle speech .2byte EC_WORD_HUH_QUES @@ -3095,7 +3095,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Selphy @ 119 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "CHLOE$", 8 @ pre-battle speech .2byte EC_WORD_COME @@ -4057,7 +4057,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Graham @ 156 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "TYLOR$", 8 @ pre-battle speech .2byte EC_WORD_ARE @@ -4083,7 +4083,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Tylor @ 157 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "JAREN$", 8 @ pre-battle speech .2byte EC_WORD_FIGHTING @@ -4109,7 +4109,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jaren @ 158 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "CORDELL$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -4135,7 +4135,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Cordell @ 159 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "JAZLYN$", 8 @ pre-battle speech .2byte EC_WORD_IS @@ -4577,7 +4577,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Gunnar @ 176 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "CRAIG$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -4603,7 +4603,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Craig @ 177 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "PIERCE$", 8 @ pre-battle speech .2byte EC_WORD_THERE @@ -4629,7 +4629,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Pierce @ 178 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "REGINA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -4655,7 +4655,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Regina @ 179 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "ALISON$", 8 @ pre-battle speech .2byte EC_WORD_THIS @@ -5513,7 +5513,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Joyce @ 212 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "TODD$", 8 @ pre-battle speech .2byte EC_WORD_YOU_RE @@ -5539,7 +5539,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Todd @ 213 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "GAVIN$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -5565,7 +5565,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Gavin @ 214 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "MALORY$", 8 @ pre-battle speech .2byte EC_WORD_PROMISE @@ -5591,7 +5591,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Malory @ 215 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "ESTHER$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -5617,7 +5617,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Esther @ 216 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "OSCAR$", 8 @ pre-battle speech .2byte EC_WORD_LET_S @@ -5643,7 +5643,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Oscar @ 217 - .4byte FACILITY_CLASS_PKMN_BREEDER_2 + .4byte FACILITY_CLASS_PKMN_BREEDER_M .string "WILSON$", 8 @ pre-battle speech .2byte EC_WORD_WORK @@ -5669,7 +5669,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Wilson @ 218 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "CLARE$", 8 @ pre-battle speech .2byte EC_WORD_YAY @@ -5695,7 +5695,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Clare @ 219 - .4byte FACILITY_CLASS_PKMN_BREEDER_1 + .4byte FACILITY_CLASS_POKEMON_BREEDER_F .string "TESS$", 8 @ pre-battle speech .2byte EC_WORD_WANT @@ -6397,7 +6397,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jasper @ 246 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "NADIA$", 8 @ pre-battle speech .2byte EC_WORD_YOU @@ -6423,7 +6423,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Nadia @ 247 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "MIRANDA$", 8 @ pre-battle speech .2byte EC_WORD_WELL @@ -6449,7 +6449,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Miranda @ 248 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "EMMA$", 8 @ pre-battle speech .2byte EC_WORD_I_VE @@ -6865,7 +6865,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Reese @ 264 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "MASON$", 8 @ pre-battle speech .2byte EC_WORD_PLEASE @@ -6891,7 +6891,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Mason @ 265 - .4byte FACILITY_CLASS_TRIATHLETE_3 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M .string "TOBY$", 8 @ pre-battle speech .2byte EC_WORD_LISTEN @@ -6917,7 +6917,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Toby @ 266 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "DOROTHY$", 8 @ pre-battle speech .2byte EC_WORD_THE @@ -6943,7 +6943,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Dorothy @ 267 - .4byte FACILITY_CLASS_TRIATHLETE_4 + .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F .string "PIPER$", 8 @ pre-battle speech .2byte EC_WORD_COME_ON @@ -6969,7 +6969,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Piper @ 268 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "FINN$", 8 @ pre-battle speech .2byte EC_WORD_NOT @@ -6995,7 +6995,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Finn @ 269 - .4byte FACILITY_CLASS_TRIATHLETE_5 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M .string "SAMIR$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -7021,7 +7021,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Samir @ 270 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "FIONA$", 8 @ pre-battle speech .2byte EC_WORD_DID @@ -7047,7 +7047,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Fiona @ 271 - .4byte FACILITY_CLASS_TRIATHLETE_6 + .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F .string "GLORIA$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -7073,7 +7073,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Gloria @ 272 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "NICO$", 8 @ pre-battle speech .2byte EC_WORD_LIKE @@ -7099,7 +7099,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Nico @ 273 - .4byte FACILITY_CLASS_TRIATHLETE_1 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M .string "JEREMY$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -7125,7 +7125,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Jeremy @ 274 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "CAITLIN$", 8 @ pre-battle speech .2byte EC_WORD_DON_T @@ -7151,7 +7151,7 @@ gBattleFrontierTrainers:: @ 85D5ACC .4byte gBattleFrontierTrainerMons_Caitlin @ 275 - .4byte FACILITY_CLASS_TRIATHLETE_2 + .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F .string "REENA$", 8 @ pre-battle speech .2byte EC_WORD_I_AM diff --git a/data/battle_frontier/fallarbor_battle_tent_trainers.inc b/data/battle_frontier/fallarbor_battle_tent_trainers.inc index 675314eb3..f1e2f8c4c 100644 --- a/data/battle_frontier/fallarbor_battle_tent_trainers.inc +++ b/data/battle_frontier/fallarbor_battle_tent_trainers.inc @@ -53,7 +53,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Javier @ 2 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "NATALIE$", 8 @ pre-battle speech .2byte EC_WORD_THE @@ -79,7 +79,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Natalie @ 3 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "TREVE$", 8 @ pre-battle speech .2byte EC_WORD_LOOK @@ -417,7 +417,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Mariana @ 16 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "SHELDON$", 8 @ pre-battle speech .2byte EC_WORD_A @@ -443,7 +443,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Sheldon @ 17 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "GIANNA$", 8 @ pre-battle speech .2byte EC_WORD_AHAHA @@ -495,7 +495,7 @@ gFallarborBattleTentTrainers:: @ 85DF084 .4byte gFallarborBattleTentTrainerMons_Yahir @ 19 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "BRITNEY$", 8 @ pre-battle speech .2byte EC_WORD_IT diff --git a/data/battle_frontier/slateport_battle_tent_trainers.inc b/data/battle_frontier/slateport_battle_tent_trainers.inc index 051514b94..92a2f2518 100644 --- a/data/battle_frontier/slateport_battle_tent_trainers.inc +++ b/data/battle_frontier/slateport_battle_tent_trainers.inc @@ -53,7 +53,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Malachi @ 2 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "KELSIE$", 8 @ pre-battle speech .2byte EC_WORD_GO @@ -79,7 +79,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Kelsie @ 3 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "DAVON$", 8 @ pre-battle speech .2byte EC_WORD_YEAH_YEAH @@ -417,7 +417,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Rebecca @ 16 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "REGGIE$", 8 @ pre-battle speech .2byte EC_WORD_POKEMON @@ -443,7 +443,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Reggie @ 17 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "JANAE$", 8 @ pre-battle speech .2byte EC_WORD_I @@ -495,7 +495,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14 .4byte gSlateportBattleTentTrainerMons_Caiden @ 19 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "KIRSTEN$", 8 @ pre-battle speech .2byte EC_WORD_HUH_QUES diff --git a/data/battle_frontier/verdanturf_battle_tent_trainers.inc b/data/battle_frontier/verdanturf_battle_tent_trainers.inc index b375ce811..5f4dad133 100644 --- a/data/battle_frontier/verdanturf_battle_tent_trainers.inc +++ b/data/battle_frontier/verdanturf_battle_tent_trainers.inc @@ -53,7 +53,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Dilan @ 2 - .4byte FACILITY_CLASS_TUBER_1 + .4byte FACILITY_CLASS_TUBER_F .string "ELIANA$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -79,7 +79,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Eliana @ 3 - .4byte FACILITY_CLASS_TUBER_2 + .4byte FACILITY_CLASS_TUBER_M .string "MARKUS$", 8 @ pre-battle speech .2byte EC_WORD_I_AM @@ -417,7 +417,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Ashlyn @ 16 - .4byte FACILITY_CLASS_POKEFAN_1 + .4byte FACILITY_CLASS_POKEFAN_M .string "ADDISON$", 8 @ pre-battle speech .2byte EC_WORD_YES @@ -443,7 +443,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Addison @ 17 - .4byte FACILITY_CLASS_POKEFAN_2 + .4byte FACILITY_CLASS_POKEFAN_F .string "JUSTINE$", 8 @ pre-battle speech .2byte EC_WORD_YES @@ -495,7 +495,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610 .4byte gVerdanturfBattleTentTrainerMons_Tyson @ 19 - .4byte FACILITY_CLASS_EXPERT_2 + .4byte FACILITY_CLASS_EXPERT_F .string "LAILA$", 8 @ pre-battle speech .2byte EC_WORD_A diff --git a/include/constants/trainers.h b/include/constants/trainers.h index a87624eb6..d7832754e 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -17,7 +17,7 @@ #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 #define TRAINER_PIC_POKEMON_BREEDER_F 2 -#define TRAINER_PIC_COOL_TRAINER_M 3 +#define TRAINER_PIC_COOLTRAINER_M 3 #define TRAINER_PIC_BIRD_KEEPER 4 #define TRAINER_PIC_COLLECTOR 5 #define TRAINER_PIC_AQUA_GRUNT_F 6 @@ -34,7 +34,7 @@ #define TRAINER_PIC_INTERVIEWER 17 #define TRAINER_PIC_TUBER_F 18 #define TRAINER_PIC_TUBER_M 19 -#define TRAINER_PIC_COOL_TRAINER_F 20 +#define TRAINER_PIC_COOLTRAINER_F 20 #define TRAINER_PIC_LADY 21 #define TRAINER_PIC_BEAUTY 22 #define TRAINER_PIC_RICH_BOY 23 @@ -105,8 +105,8 @@ #define TRAINER_PIC_PYRAMID_KING_BRANDON 88 #define TRAINER_PIC_RED 89 #define TRAINER_PIC_LEAF 90 -#define TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN 91 -#define TRAINER_PIC_RUBY_SAPPHIRE_MAY 92 +#define TRAINER_PIC_RS_BRENDAN 91 +#define TRAINER_PIC_RS_MAY 92 #define TRAINER_BACK_PIC_BRENDAN 0 #define TRAINER_BACK_PIC_MAY 1 @@ -118,30 +118,30 @@ #define TRAINER_BACK_PIC_STEVEN 7 #define FACILITY_CLASS_HIKER 0x0 -#define FACILITY_CLASS_TEAM_AQUA_1 0x1 -#define FACILITY_CLASS_PKMN_BREEDER_1 0x2 +#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 +#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 #define FACILITY_CLASS_COOLTRAINER_M 0x3 #define FACILITY_CLASS_BIRD_KEEPER 0x4 #define FACILITY_CLASS_COLLECTOR 0x5 -#define FACILITY_CLASS_TEAM_AQUA_2 0x6 +#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 #define FACILITY_CLASS_SWIMMER_M 0x7 -#define FACILITY_CLASS_TEAM_MAGMA_1 0x8 +#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 #define FACILITY_CLASS_EXPERT_M 0x9 #define FACILITY_CLASS_BLACK_BELT 0xa -#define FACILITY_CLASS_AQUA_LEADER 0xb +#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb #define FACILITY_CLASS_HEX_MANIAC 0xc #define FACILITY_CLASS_AROMA_LADY 0xd #define FACILITY_CLASS_RUIN_MANIAC 0xe #define FACILITY_CLASS_INTERVIEWER 0xf -#define FACILITY_CLASS_TUBER_1 0x10 -#define FACILITY_CLASS_TUBER_2 0x11 +#define FACILITY_CLASS_TUBER_F 0x10 +#define FACILITY_CLASS_TUBER_M 0x11 #define FACILITY_CLASS_COOLTRAINER_F 0x12 #define FACILITY_CLASS_LADY 0x13 #define FACILITY_CLASS_BEAUTY 0x14 #define FACILITY_CLASS_RICH_BOY 0x15 -#define FACILITY_CLASS_EXPERT_2 0x16 +#define FACILITY_CLASS_EXPERT_F 0x16 #define FACILITY_CLASS_POKEMANIAC 0x17 -#define FACILITY_CLASS_TEAM_MAGMA_2 0x18 +#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 #define FACILITY_CLASS_GUITARIST 0x19 #define FACILITY_CLASS_KINDLER 0x1a #define FACILITY_CLASS_CAMPER 0x1b @@ -150,25 +150,25 @@ #define FACILITY_CLASS_PSYCHIC_M 0x1e #define FACILITY_CLASS_PSYCHIC_F 0x1f #define FACILITY_CLASS_GENTLEMAN 0x20 -#define FACILITY_CLASS_ELITE_FOUR_1 0x21 -#define FACILITY_CLASS_ELITE_FOUR_2 0x22 -#define FACILITY_CLASS_LEADER_1 0x23 -#define FACILITY_CLASS_LEADER_2 0x24 -#define FACILITY_CLASS_LEADER_3 0x25 +#define FACILITY_CLASS_ELITE_FOUR_SIDNEY 0x21 +#define FACILITY_CLASS_ELITE_FOUR_PHOEBE 0x22 +#define FACILITY_CLASS_LEADER_ROXANNE 0x23 +#define FACILITY_CLASS_LEADER_BRAWLY 0x24 +#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 #define FACILITY_CLASS_SCHOOL_KID_M 0x26 #define FACILITY_CLASS_SCHOOL_KID_F 0x27 #define FACILITY_CLASS_SR_AND_JR 0x28 -#define FACILITY_CLASS_POKEFAN_1 0x29 -#define FACILITY_CLASS_POKEFAN_2 0x2a +#define FACILITY_CLASS_POKEFAN_M 0x29 +#define FACILITY_CLASS_POKEFAN_F 0x2a #define FACILITY_CLASS_YOUNGSTER 0x2b -#define FACILITY_CLASS_CHAMPION 0x2c +#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c #define FACILITY_CLASS_FISHERMAN 0x2d -#define FACILITY_CLASS_TRIATHLETE_1 0x2e -#define FACILITY_CLASS_TRIATHLETE_2 0x2f -#define FACILITY_CLASS_TRIATHLETE_3 0x30 -#define FACILITY_CLASS_TRIATHLETE_4 0x31 -#define FACILITY_CLASS_TRIATHLETE_5 0x32 -#define FACILITY_CLASS_TRIATHLETE_6 0x33 +#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e +#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f +#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 #define FACILITY_CLASS_DRAGON_TAMER 0x34 #define FACILITY_CLASS_NINJA_BOY 0x35 #define FACILITY_CLASS_BATTLE_GIRL 0x36 @@ -176,36 +176,36 @@ #define FACILITY_CLASS_SWIMMER_F 0x38 #define FACILITY_CLASS_TWINS 0x39 #define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_PKMN_TRAINER_1 0x3b +#define FACILITY_CLASS_PKMN_TRAINER_WALLY 0x3b #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c -#define FACILITY_CLASS_PKMN_TRAINER_3 0x3d -#define FACILITY_CLASS_PKMN_TRAINER_4 0x3e +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2 0x3d +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3 0x3e #define FACILITY_CLASS_PKMN_TRAINER_MAY 0x3f -#define FACILITY_CLASS_PKMN_TRAINER_6 0x40 -#define FACILITY_CLASS_PKMN_TRAINER_7 0x41 -#define FACILITY_CLASS_PKMN_BREEDER_2 0x42 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 0x40 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 0x41 +#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 #define FACILITY_CLASS_BUG_CATCHER 0x43 #define FACILITY_CLASS_PKMN_RANGER_M 0x44 #define FACILITY_CLASS_PKMN_RANGER_F 0x45 -#define FACILITY_CLASS_MAGMA_LEADER 0x46 +#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 #define FACILITY_CLASS_LASS 0x47 #define FACILITY_CLASS_YOUNG_COUPLE 0x48 #define FACILITY_CLASS_OLD_COUPLE 0x49 #define FACILITY_CLASS_SIS_AND_BRO 0x4a -#define FACILITY_CLASS_PKMN_TRAINER_STEVEN 0x4b -#define FACILITY_CLASS_SALON_MAIDEN 0x4c -#define FACILITY_CLASS_DOME_ACE 0x4d -#define FACILITY_CLASS_PKMN_TRAINER_RED 0x4e -#define FACILITY_CLASS_PKMN_TRAINER_LEAF 0x4f -#define FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN 0x50 -#define FACILITY_CLASS_PKMN_TRAINER_RS_MAY 0x51 +#define FACILITY_CLASS_STEVEN 0x4b +#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c +#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d +#define FACILITY_CLASS_RED 0x4e +#define FACILITY_CLASS_LEAF 0x4f +#define FACILITY_CLASS_RS_BRENDAN 0x50 +#define FACILITY_CLASS_RS_MAY 0x51 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 #define TRAINER_CLASS_HIKER 0x2 #define TRAINER_CLASS_TEAM_AQUA 0x3 #define TRAINER_CLASS_PKMN_BREEDER 0x4 -#define TRAINER_CLASS_COOLTRAINER_1 0x5 +#define TRAINER_CLASS_COOLTRAINER 0x5 #define TRAINER_CLASS_BIRD_KEEPER 0x6 #define TRAINER_CLASS_COLLECTOR 0x7 #define TRAINER_CLASS_SWIMMER_M 0x8 @@ -218,8 +218,8 @@ #define TRAINER_CLASS_AROMA_LADY 0xf #define TRAINER_CLASS_RUIN_MANIAC 0x10 #define TRAINER_CLASS_INTERVIEWER 0x11 -#define TRAINER_CLASS_TUBER_1 0x12 -#define TRAINER_CLASS_TUBER_2 0x13 +#define TRAINER_CLASS_TUBER_F 0x12 +#define TRAINER_CLASS_TUBER_M 0x13 #define TRAINER_CLASS_LADY 0x14 #define TRAINER_CLASS_BEAUTY 0x15 #define TRAINER_CLASS_RICH_BOY 0x16 @@ -248,7 +248,7 @@ #define TRAINER_CLASS_SWIMMER_F 0x2d #define TRAINER_CLASS_TWINS 0x2e #define TRAINER_CLASS_SAILOR 0x2f -#define TRAINER_CLASS_COOLTRAINER_2 0x30 +#define TRAINER_CLASS_COOLTRAINER_UNUSED 0x30 #define TRAINER_CLASS_MAGMA_ADMIN 0x31 #define TRAINER_CLASS_PKMN_TRAINER_3 0x32 #define TRAINER_CLASS_BUG_CATCHER 0x33 diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 0cec046e4..a34f3f20f 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1251,17 +1251,17 @@ static void LinkOpponentHandleDrawTrainerPic(void) || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN) { if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED]; } else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE) { if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN]; } else { @@ -1280,17 +1280,17 @@ static void LinkOpponentHandleDrawTrainerPic(void) || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN) { if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED]; } else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE) { if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0) - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY]; else - trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN]; + trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN]; } else { diff --git a/src/battle_main.c b/src/battle_main.c index 8bdd2220b..de0becd2a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -451,10 +451,10 @@ const struct TrainerMoney gTrainerMoneyTable[] = {TRAINER_CLASS_AROMA_LADY, 10}, {TRAINER_CLASS_RUIN_MANIAC, 15}, {TRAINER_CLASS_INTERVIEWER, 12}, - {TRAINER_CLASS_TUBER_1, 1}, - {TRAINER_CLASS_TUBER_2, 1}, + {TRAINER_CLASS_TUBER_F, 1}, + {TRAINER_CLASS_TUBER_M, 1}, {TRAINER_CLASS_SIS_AND_BRO, 3}, - {TRAINER_CLASS_COOLTRAINER_1, 12}, + {TRAINER_CLASS_COOLTRAINER, 12}, {TRAINER_CLASS_HEX_MANIAC, 6}, {TRAINER_CLASS_LADY, 50}, {TRAINER_CLASS_BEAUTY, 20}, diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 0d3cd0fe7..4d3492e8b 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -4,30 +4,30 @@ const u8 gFacilityClassToPicIndex[] = { [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER, - [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_PIC_AQUA_GRUNT_M, - [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_PIC_POKEMON_BREEDER_F, - [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOL_TRAINER_M, + [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_PIC_AQUA_GRUNT_M, + [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_PIC_POKEMON_BREEDER_F, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOLTRAINER_M, [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER, [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR, - [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_PIC_AQUA_GRUNT_F, + [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_PIC_AQUA_GRUNT_F, [FACILITY_CLASS_SWIMMER_M] = TRAINER_PIC_SWIMMER_M, - [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_PIC_MAGMA_GRUNT_M, + [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_PIC_MAGMA_GRUNT_M, [FACILITY_CLASS_EXPERT_M] = TRAINER_PIC_EXPERT_M, [FACILITY_CLASS_BLACK_BELT] = TRAINER_PIC_BLACK_BELT, - [FACILITY_CLASS_AQUA_LEADER] = TRAINER_PIC_AQUA_LEADER_ARCHIE, + [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_PIC_AQUA_LEADER_ARCHIE, [FACILITY_CLASS_HEX_MANIAC] = TRAINER_PIC_HEX_MANIAC, [FACILITY_CLASS_AROMA_LADY] = TRAINER_PIC_AROMA_LADY, [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_PIC_RUIN_MANIAC, [FACILITY_CLASS_INTERVIEWER] = TRAINER_PIC_INTERVIEWER, - [FACILITY_CLASS_TUBER_1] = TRAINER_PIC_TUBER_F, - [FACILITY_CLASS_TUBER_2] = TRAINER_PIC_TUBER_M, - [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOL_TRAINER_F, + [FACILITY_CLASS_TUBER_F] = TRAINER_PIC_TUBER_F, + [FACILITY_CLASS_TUBER_M] = TRAINER_PIC_TUBER_M, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOLTRAINER_F, [FACILITY_CLASS_LADY] = TRAINER_PIC_LADY, [FACILITY_CLASS_BEAUTY] = TRAINER_PIC_BEAUTY, [FACILITY_CLASS_RICH_BOY] = TRAINER_PIC_RICH_BOY, - [FACILITY_CLASS_EXPERT_2] = TRAINER_PIC_EXPERT_F, + [FACILITY_CLASS_EXPERT_F] = TRAINER_PIC_EXPERT_F, [FACILITY_CLASS_POKEMANIAC] = TRAINER_PIC_POKEMANIAC, - [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_PIC_MAGMA_GRUNT_F, + [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_PIC_MAGMA_GRUNT_F, [FACILITY_CLASS_GUITARIST] = TRAINER_PIC_GUITARIST, [FACILITY_CLASS_KINDLER] = TRAINER_PIC_KINDLER, [FACILITY_CLASS_CAMPER] = TRAINER_PIC_CAMPER, @@ -36,25 +36,25 @@ const u8 gFacilityClassToPicIndex[] = [FACILITY_CLASS_PSYCHIC_M] = TRAINER_PIC_PSYCHIC_M, [FACILITY_CLASS_PSYCHIC_F] = TRAINER_PIC_PSYCHIC_F, [FACILITY_CLASS_GENTLEMAN] = TRAINER_PIC_GENTLEMAN, - [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_PIC_ELITE_FOUR_SIDNEY, - [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_PIC_ELITE_FOUR_PHOEBE, - [FACILITY_CLASS_LEADER_1] = TRAINER_PIC_LEADER_ROXANNE, - [FACILITY_CLASS_LEADER_2] = TRAINER_PIC_LEADER_BRAWLY, - [FACILITY_CLASS_LEADER_3] = TRAINER_PIC_LEADER_TATE_AND_LIZA, + [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_PIC_ELITE_FOUR_SIDNEY, + [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_PIC_ELITE_FOUR_PHOEBE, + [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_PIC_LEADER_ROXANNE, + [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_PIC_LEADER_BRAWLY, + [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_PIC_LEADER_TATE_AND_LIZA, [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_PIC_SCHOOL_KID_M, [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_PIC_SCHOOL_KID_F, [FACILITY_CLASS_SR_AND_JR] = TRAINER_PIC_SR_AND_JR, - [FACILITY_CLASS_POKEFAN_1] = TRAINER_PIC_POKEFAN_M, - [FACILITY_CLASS_POKEFAN_2] = TRAINER_PIC_POKEFAN_F, + [FACILITY_CLASS_POKEFAN_M] = TRAINER_PIC_POKEFAN_M, + [FACILITY_CLASS_POKEFAN_F] = TRAINER_PIC_POKEFAN_F, [FACILITY_CLASS_YOUNGSTER] = TRAINER_PIC_YOUNGSTER, - [FACILITY_CLASS_CHAMPION] = TRAINER_PIC_CHAMPION_WALLACE, + [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_PIC_CHAMPION_WALLACE, [FACILITY_CLASS_FISHERMAN] = TRAINER_PIC_FISHERMAN, - [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_PIC_CYCLING_TRIATHLETE_M, - [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_PIC_CYCLING_TRIATHLETE_F, - [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_PIC_RUNNING_TRIATHLETE_M, - [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_PIC_RUNNING_TRIATHLETE_F, - [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_PIC_SWIMMING_TRIATHLETE_M, - [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_PIC_CYCLING_TRIATHLETE_M, + [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_PIC_CYCLING_TRIATHLETE_F, + [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_PIC_RUNNING_TRIATHLETE_M, + [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_PIC_RUNNING_TRIATHLETE_F, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_PIC_SWIMMING_TRIATHLETE_F, [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_PIC_DRAGON_TAMER, [FACILITY_CLASS_NINJA_BOY] = TRAINER_PIC_NINJA_BOY, [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_PIC_BATTLE_GIRL, @@ -62,58 +62,58 @@ const u8 gFacilityClassToPicIndex[] = [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F, [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR, - [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_PIC_WALLY, + [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_PIC_WALLY, [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_PIC_BRENDAN, [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_PIC_POKEMON_BREEDER_M, + [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_PIC_POKEMON_BREEDER_M, [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER, [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M, [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_PIC_POKEMON_RANGER_F, - [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_PIC_MAGMA_LEADER_MAXIE, + [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_PIC_MAGMA_LEADER_MAXIE, [FACILITY_CLASS_LASS] = TRAINER_PIC_LASS, [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_PIC_YOUNG_COUPLE, [FACILITY_CLASS_OLD_COUPLE] = TRAINER_PIC_OLD_COUPLE, [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_PIC_SIS_AND_BRO, - [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_PIC_STEVEN, - [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_PIC_SALON_MAIDEN_ANABEL, - [FACILITY_CLASS_DOME_ACE] = TRAINER_PIC_DOME_ACE_TUCKER, - [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_PIC_RED, - [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_PIC_LEAF, - [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_PIC_RUBY_SAPPHIRE_MAY, + [FACILITY_CLASS_STEVEN] = TRAINER_PIC_STEVEN, + [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_PIC_SALON_MAIDEN_ANABEL, + [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_PIC_DOME_ACE_TUCKER, + [FACILITY_CLASS_RED] = TRAINER_PIC_RED, + [FACILITY_CLASS_LEAF] = TRAINER_PIC_LEAF, + [FACILITY_CLASS_RS_BRENDAN] = TRAINER_PIC_RS_BRENDAN, + [FACILITY_CLASS_RS_MAY] = TRAINER_PIC_RS_MAY, }; const u8 gFacilityClassToTrainerClass[] = { [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER, - [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_CLASS_TEAM_AQUA, - [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_CLASS_PKMN_BREEDER, - [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER_1, + [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER, [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER, [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR, - [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_CLASS_TEAM_AQUA, [FACILITY_CLASS_SWIMMER_M] = TRAINER_CLASS_SWIMMER_M, - [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_CLASS_TEAM_MAGMA, [FACILITY_CLASS_EXPERT_M] = TRAINER_CLASS_EXPERT, [FACILITY_CLASS_BLACK_BELT] = TRAINER_CLASS_BLACK_BELT, - [FACILITY_CLASS_AQUA_LEADER] = TRAINER_CLASS_AQUA_LEADER, + [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_CLASS_AQUA_LEADER, [FACILITY_CLASS_HEX_MANIAC] = TRAINER_CLASS_HEX_MANIAC, [FACILITY_CLASS_AROMA_LADY] = TRAINER_CLASS_AROMA_LADY, [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_CLASS_RUIN_MANIAC, [FACILITY_CLASS_INTERVIEWER] = TRAINER_CLASS_INTERVIEWER, - [FACILITY_CLASS_TUBER_1] = TRAINER_CLASS_TUBER_1, - [FACILITY_CLASS_TUBER_2] = TRAINER_CLASS_TUBER_2, - [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER_1, + [FACILITY_CLASS_TUBER_F] = TRAINER_CLASS_TUBER_F, + [FACILITY_CLASS_TUBER_M] = TRAINER_CLASS_TUBER_M, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER, [FACILITY_CLASS_LADY] = TRAINER_CLASS_LADY, [FACILITY_CLASS_BEAUTY] = TRAINER_CLASS_BEAUTY, [FACILITY_CLASS_RICH_BOY] = TRAINER_CLASS_RICH_BOY, - [FACILITY_CLASS_EXPERT_2] = TRAINER_CLASS_EXPERT, + [FACILITY_CLASS_EXPERT_F] = TRAINER_CLASS_EXPERT, [FACILITY_CLASS_POKEMANIAC] = TRAINER_CLASS_POKEMANIAC, - [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_CLASS_TEAM_MAGMA, [FACILITY_CLASS_GUITARIST] = TRAINER_CLASS_GUITARIST, [FACILITY_CLASS_KINDLER] = TRAINER_CLASS_KINDLER, [FACILITY_CLASS_CAMPER] = TRAINER_CLASS_CAMPER, @@ -122,25 +122,25 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_PSYCHIC_M] = TRAINER_CLASS_PSYCHIC, [FACILITY_CLASS_PSYCHIC_F] = TRAINER_CLASS_PSYCHIC, [FACILITY_CLASS_GENTLEMAN] = TRAINER_CLASS_GENTLEMAN, - [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_CLASS_ELITE_FOUR, - [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_CLASS_ELITE_FOUR, - [FACILITY_CLASS_LEADER_1] = TRAINER_CLASS_LEADER, - [FACILITY_CLASS_LEADER_2] = TRAINER_CLASS_LEADER, - [FACILITY_CLASS_LEADER_3] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_CLASS_LEADER, [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_CLASS_SCHOOL_KID, [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_CLASS_SCHOOL_KID, [FACILITY_CLASS_SR_AND_JR] = TRAINER_CLASS_SR_AND_JR, - [FACILITY_CLASS_POKEFAN_1] = TRAINER_CLASS_POKEFAN, - [FACILITY_CLASS_POKEFAN_2] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_POKEFAN_M] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_POKEFAN_F] = TRAINER_CLASS_POKEFAN, [FACILITY_CLASS_YOUNGSTER] = TRAINER_CLASS_YOUNGSTER, - [FACILITY_CLASS_CHAMPION] = TRAINER_CLASS_CHAMPION, + [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_CLASS_CHAMPION, [FACILITY_CLASS_FISHERMAN] = TRAINER_CLASS_FISHERMAN, - [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_CLASS_TRIATHLETE, - [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE, [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_CLASS_DRAGON_TAMER, [FACILITY_CLASS_NINJA_BOY] = TRAINER_CLASS_NINJA_BOY, [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_CLASS_BATTLE_GIRL, @@ -148,29 +148,29 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F, [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR, - [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER, [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER, [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER, [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_CLASS_PKMN_RANGER, - [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_CLASS_MAGMA_LEADER, + [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_CLASS_MAGMA_LEADER, [FACILITY_CLASS_LASS] = TRAINER_CLASS_LASS, [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_CLASS_YOUNG_COUPLE, [FACILITY_CLASS_OLD_COUPLE] = TRAINER_CLASS_OLD_COUPLE, [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_CLASS_SIS_AND_BRO, - [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_CLASS_SALON_MAIDEN, - [FACILITY_CLASS_DOME_ACE] = TRAINER_CLASS_DOME_ACE, - [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4, - [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, + [FACILITY_CLASS_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_CLASS_SALON_MAIDEN, + [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE, + [FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4, + [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, }; #endif //POKEEMERALD_TRAINER_CLASS_LOOKUPS_H diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index 62529d06e..2abbfc6d1 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -9,7 +9,7 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_HIKER] = _("HIKER"), [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"), [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"), - [TRAINER_CLASS_COOLTRAINER_1] = _("COOLTRAINER"), + [TRAINER_CLASS_COOLTRAINER] = _("COOLTRAINER"), [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"), [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"), [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"), @@ -22,8 +22,8 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_AROMA_LADY] = _("AROMA LADY"), [TRAINER_CLASS_RUIN_MANIAC] = _("RUIN MANIAC"), [TRAINER_CLASS_INTERVIEWER] = _("INTERVIEWER"), - [TRAINER_CLASS_TUBER_1] = _("TUBER"), - [TRAINER_CLASS_TUBER_2] = _("TUBER"), + [TRAINER_CLASS_TUBER_F] = _("TUBER"), + [TRAINER_CLASS_TUBER_M] = _("TUBER"), [TRAINER_CLASS_LADY] = _("LADY"), [TRAINER_CLASS_BEAUTY] = _("BEAUTY"), [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"), @@ -52,7 +52,7 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"), [TRAINER_CLASS_TWINS] = _("TWINS"), [TRAINER_CLASS_SAILOR] = _("SAILOR"), - [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"), + [TRAINER_CLASS_COOLTRAINER_UNUSED] = _("COOLTRAINER"), [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"), [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"), [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"), diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h index 537cd557c..11fb1797f 100644 --- a/src/data/trainer_graphics/front_pic_anims.h +++ b/src/data/trainer_graphics/front_pic_anims.h @@ -375,7 +375,7 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F - gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOL_TRAINER_M + gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOLTRAINER_M gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F @@ -392,7 +392,7 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M - gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOL_TRAINER_F + gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOLTRAINER_F gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY @@ -463,6 +463,6 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON gTrainerFrontAnims_Red, // TRAINER_PIC_RED gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF - gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN - gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RUBY_SAPPHIRE_MAY + gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RS_BRENDAN + gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RS_MAY }; diff --git a/src/data/trainers.h b/src/data/trainers.h index fe087d166..7ec297eb3 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -156,9 +156,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MARCEL] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("MARCEL"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -534,9 +534,9 @@ const struct Trainer gTrainers[] = { [TRAINER_FELIX] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("FELIX"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -800,7 +800,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_1] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -814,7 +814,7 @@ const struct Trainer gTrainers[] = { [TRAINER_AUSTINA] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("AUSTINA"), @@ -828,7 +828,7 @@ const struct Trainer gTrainers[] = { [TRAINER_GWEN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("GWEN"), @@ -842,7 +842,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_2] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -856,7 +856,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_3] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -870,7 +870,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_4] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -884,7 +884,7 @@ const struct Trainer gTrainers[] = { [TRAINER_LOLA_5] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("LOLA"), @@ -898,7 +898,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -912,7 +912,7 @@ const struct Trainer gTrainers[] = { [TRAINER_SIMON] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("SIMON"), @@ -926,7 +926,7 @@ const struct Trainer gTrainers[] = { [TRAINER_CHARLIE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("CHARLIE"), @@ -940,7 +940,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -954,7 +954,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -968,7 +968,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -982,7 +982,7 @@ const struct Trainer gTrainers[] = { [TRAINER_RICKY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("RICKY"), @@ -996,9 +996,9 @@ const struct Trainer gTrainers[] = { [TRAINER_RANDALL] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("RANDALL"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1010,9 +1010,9 @@ const struct Trainer gTrainers[] = { [TRAINER_PARKER] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("PARKER"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1024,9 +1024,9 @@ const struct Trainer gTrainers[] = { [TRAINER_GEORGE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GEORGE"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1038,9 +1038,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BERKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("BERKE"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1052,9 +1052,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BRAXTON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("BRAXTON"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1066,9 +1066,9 @@ const struct Trainer gTrainers[] = { [TRAINER_VINCENT] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("VINCENT"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1080,9 +1080,9 @@ const struct Trainer gTrainers[] = { [TRAINER_LEROY] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEROY"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1094,9 +1094,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_1] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1108,9 +1108,9 @@ const struct Trainer gTrainers[] = { [TRAINER_EDGAR] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("EDGAR"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1122,9 +1122,9 @@ const struct Trainer gTrainers[] = { [TRAINER_ALBERT] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("ALBERT"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1136,9 +1136,9 @@ const struct Trainer gTrainers[] = { [TRAINER_SAMUEL] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("SAMUEL"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1150,9 +1150,9 @@ const struct Trainer gTrainers[] = { [TRAINER_VITO] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("VITO"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1164,9 +1164,9 @@ const struct Trainer gTrainers[] = { [TRAINER_OWEN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("OWEN"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1178,9 +1178,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_2] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1192,9 +1192,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_3] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1206,9 +1206,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_4] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1220,9 +1220,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WILTON_5] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WILTON"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1234,9 +1234,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WARREN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("WARREN"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1248,9 +1248,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MARY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MARY"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1262,9 +1262,9 @@ const struct Trainer gTrainers[] = { [TRAINER_ALEXIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ALEXIA"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1276,9 +1276,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JODY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JODY"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1290,9 +1290,9 @@ const struct Trainer gTrainers[] = { [TRAINER_WENDY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("WENDY"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1304,9 +1304,9 @@ const struct Trainer gTrainers[] = { [TRAINER_KEIRA] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("KEIRA"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1318,9 +1318,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_1] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1332,9 +1332,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JENNIFER] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JENNIFER"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1346,9 +1346,9 @@ const struct Trainer gTrainers[] = { [TRAINER_HOPE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("HOPE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1360,9 +1360,9 @@ const struct Trainer gTrainers[] = { [TRAINER_SHANNON] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("SHANNON"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1374,9 +1374,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MICHELLE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MICHELLE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1388,9 +1388,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CAROLINE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CAROLINE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1402,9 +1402,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JULIE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JULIE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1416,9 +1416,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_2] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1430,9 +1430,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_3] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1444,9 +1444,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_4] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -1458,9 +1458,9 @@ const struct Trainer gTrainers[] = { [TRAINER_BROOKE_5] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("BROOKE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -4538,9 +4538,9 @@ const struct Trainer gTrainers[] = { [TRAINER_QUINCY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("QUINCY"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -4552,9 +4552,9 @@ const struct Trainer gTrainers[] = { [TRAINER_KATELYNN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("KATELYNN"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -5840,9 +5840,9 @@ const struct Trainer gTrainers[] = { [TRAINER_DIANNE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("DIANNE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -5854,7 +5854,7 @@ const struct Trainer gTrainers[] = { [TRAINER_JANI] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("JANI"), @@ -7044,9 +7044,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JAZMYN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_2, + .trainerClass = TRAINER_CLASS_COOLTRAINER_UNUSED, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("JAZMYN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -7114,9 +7114,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MARLEY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("MARLEY"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -7562,9 +7562,9 @@ const struct Trainer gTrainers[] = { [TRAINER_MITCHELL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("MITCHELL"), .items = {}, .doubleBattle = FALSE, @@ -7646,9 +7646,9 @@ const struct Trainer gTrainers[] = { [TRAINER_HALLE] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("HALLE"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -8080,9 +8080,9 @@ const struct Trainer gTrainers[] = { [TRAINER_ATHENA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ATHENA"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -8374,9 +8374,9 @@ const struct Trainer gTrainers[] = { [TRAINER_JONATHAN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("JONATHAN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -9074,9 +9074,9 @@ const struct Trainer gTrainers[] = { [TRAINER_GERALD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("GERALD"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -9382,9 +9382,9 @@ const struct Trainer gTrainers[] = { [TRAINER_ALEXA] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("ALEXA"), .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -9396,9 +9396,9 @@ const struct Trainer gTrainers[] = { [TRAINER_RUBEN] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("RUBEN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -9760,7 +9760,7 @@ const struct Trainer gTrainers[] = { [TRAINER_HAILEY] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_1, + .trainerClass = TRAINER_CLASS_TUBER_F, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_F, .trainerName = _("HAILEY"), @@ -9774,7 +9774,7 @@ const struct Trainer gTrainers[] = { [TRAINER_CHANDLER] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_TUBER_2, + .trainerClass = TRAINER_CLASS_TUBER_M, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL, .trainerPic = TRAINER_PIC_TUBER_M, .trainerName = _("CHANDLER"), @@ -10264,9 +10264,9 @@ const struct Trainer gTrainers[] = { [TRAINER_DARCY] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("DARCY"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -10376,9 +10376,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CAROLINA] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CAROLINA"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -10670,9 +10670,9 @@ const struct Trainer gTrainers[] = { [TRAINER_LEONEL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_M, + .trainerPic = TRAINER_PIC_COOLTRAINER_M, .trainerName = _("LEONEL"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -10740,9 +10740,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_1] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11594,9 +11594,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_2] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11608,9 +11608,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_3] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11622,9 +11622,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_4] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11636,9 +11636,9 @@ const struct Trainer gTrainers[] = { [TRAINER_CRISTIN_5] = { .partyFlags = 0, - .trainerClass = TRAINER_CLASS_COOLTRAINER_1, + .trainerClass = TRAINER_CLASS_COOLTRAINER, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL, - .trainerPic = TRAINER_PIC_COOL_TRAINER_F, + .trainerPic = TRAINER_PIC_COOLTRAINER_F, .trainerName = _("CRISTIN"), .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, @@ -11946,7 +11946,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, + .trainerPic = TRAINER_PIC_RS_BRENDAN, .trainerName = _("BRENDAN"), .items = {}, .doubleBattle = FALSE, @@ -11960,7 +11960,7 @@ const struct Trainer gTrainers[] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4, .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE, - .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_MAY, + .trainerPic = TRAINER_PIC_RS_MAY, .trainerName = _("MAY"), .items = {}, .doubleBattle = FALSE, diff --git a/src/pokemon.c b/src/pokemon.c index 0f7c80b77..d4d9f2ac1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2269,9 +2269,9 @@ const u16 gUnknown_08329D54[] = { FACILITY_CLASS_COOLTRAINER_M, FACILITY_CLASS_BLACK_BELT, FACILITY_CLASS_CAMPER, FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_PSYCHIC_M, FACILITY_CLASS_BUG_CATCHER, - FACILITY_CLASS_PKMN_BREEDER_2, FACILITY_CLASS_GUITARIST, FACILITY_CLASS_COOLTRAINER_F, + FACILITY_CLASS_PKMN_BREEDER_M, FACILITY_CLASS_GUITARIST, FACILITY_CLASS_COOLTRAINER_F, FACILITY_CLASS_HEX_MANIAC, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_LASS, - FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, FACILITY_CLASS_PKMN_BREEDER_1, + FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, FACILITY_CLASS_POKEMON_BREEDER_F, FACILITY_CLASS_BEAUTY }; -- cgit v1.2.3 From 462e7c82956ed120ab8fce453f2326ef9bfbc9a6 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 2 Dec 2018 23:22:42 -0500 Subject: begin batle tower data --- constants/battle_frontier_constants.inc | 70 - data/battle_frontier/battle_frontier_mons.inc | 2 + .../battle_frontier/fallarbor_battle_tent_mons.inc | 316 -- .../fallarbor_battle_tent_trainer_mons.inc | 257 -- .../fallarbor_battle_tent_trainers.inc | 781 ----- .../battle_frontier/slateport_battle_tent_mons.inc | 491 ---- .../slateport_battle_tent_trainer_mons.inc | 448 --- .../slateport_battle_tent_trainers.inc | 781 ----- .../verdanturf_battle_tent_mons.inc | 316 -- .../verdanturf_battle_tent_trainer_mons.inc | 254 -- .../verdanturf_battle_tent_trainers.inc | 781 ----- data/battle_tower.s | 629 ---- include/battle_tower.h | 331 +++ include/constants/battle_frontier.h | 71 + src/battle_tower.c | 828 +++++- src/data/battle_frontier/battle_tent.h | 3006 ++++++++++++++++++++ 16 files changed, 4214 insertions(+), 5148 deletions(-) delete mode 100644 constants/battle_frontier_constants.inc delete mode 100644 data/battle_frontier/fallarbor_battle_tent_mons.inc delete mode 100644 data/battle_frontier/fallarbor_battle_tent_trainer_mons.inc delete mode 100644 data/battle_frontier/fallarbor_battle_tent_trainers.inc delete mode 100644 data/battle_frontier/slateport_battle_tent_mons.inc delete mode 100644 data/battle_frontier/slateport_battle_tent_trainer_mons.inc delete mode 100644 data/battle_frontier/slateport_battle_tent_trainers.inc delete mode 100644 data/battle_frontier/verdanturf_battle_tent_mons.inc delete mode 100644 data/battle_frontier/verdanturf_battle_tent_trainer_mons.inc delete mode 100644 data/battle_frontier/verdanturf_battle_tent_trainers.inc create mode 100644 src/data/battle_frontier/battle_tent.h diff --git a/constants/battle_frontier_constants.inc b/constants/battle_frontier_constants.inc deleted file mode 100644 index a6c069723..000000000 --- a/constants/battle_frontier_constants.inc +++ /dev/null @@ -1,70 +0,0 @@ - .set F_EV_SPREAD_HP, 1 << 0 - .set F_EV_SPREAD_ATTACK, 1 << 1 - .set F_EV_SPREAD_DEFENSE, 1 << 2 - .set F_EV_SPREAD_SPEED, 1 << 3 - .set F_EV_SPREAD_SP_ATTACK, 1 << 4 - .set F_EV_SPREAD_SP_DEFENSE, 1 << 5 - - .set BATTLE_FRONTIER_ITEM_NONE, 0 - .set BATTLE_FRONTIER_ITEM_KINGS_ROCK, 1 - .set BATTLE_FRONTIER_ITEM_SITRUS_BERRY, 2 - .set BATTLE_FRONTIER_ITEM_ORAN_BERRY, 3 - .set BATTLE_FRONTIER_ITEM_CHESTO_BERRY, 4 - .set BATTLE_FRONTIER_ITEM_HARD_STONE, 5 - .set BATTLE_FRONTIER_ITEM_FOCUS_BAND, 6 - .set BATTLE_FRONTIER_ITEM_PERSIM_BERRY, 7 - .set BATTLE_FRONTIER_ITEM_MIRACLE_SEED, 8 - .set BATTLE_FRONTIER_ITEM_BERRY_JUICE, 9 - .set BATTLE_FRONTIER_ITEM_MACHO_BRACE, 10 - .set BATTLE_FRONTIER_ITEM_SILVER_POWDER, 11 - .set BATTLE_FRONTIER_ITEM_CHERI_BERRY, 12 - .set BATTLE_FRONTIER_ITEM_BLACK_GLASSES, 13 - .set BATTLE_FRONTIER_ITEM_BLACK_BELT, 14 - .set BATTLE_FRONTIER_ITEM_SOUL_DEW, 15 - .set BATTLE_FRONTIER_ITEM_CHOICE_BAND, 16 - .set BATTLE_FRONTIER_ITEM_MAGNET, 17 - .set BATTLE_FRONTIER_ITEM_SILK_SCARF, 18 - .set BATTLE_FRONTIER_ITEM_WHITE_HERB, 19 - .set BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE, 20 - .set BATTLE_FRONTIER_ITEM_DEEP_SEA_TOOTH, 21 - .set BATTLE_FRONTIER_ITEM_MYSTIC_WATER, 22 - .set BATTLE_FRONTIER_ITEM_SHARP_BEAK, 23 - .set BATTLE_FRONTIER_ITEM_QUICK_CLAW, 24 - .set BATTLE_FRONTIER_ITEM_LEFTOVERS, 25 - .set BATTLE_FRONTIER_ITEM_RAWST_BERRY, 26 - .set BATTLE_FRONTIER_ITEM_LIGHT_BALL, 27 - .set BATTLE_FRONTIER_ITEM_POISON_BARB, 28 - .set BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, 29 - .set BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, 30 - .set BATTLE_FRONTIER_ITEM_SPELL_TAG, 31 - .set BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, 32 - .set BATTLE_FRONTIER_ITEM_LEPPA_BERRY, 33 - .set BATTLE_FRONTIER_ITEM_SCOPE_LENS, 34 - .set BATTLE_FRONTIER_ITEM_TWISTED_SPOON, 35 - .set BATTLE_FRONTIER_ITEM_METAL_COAT, 36 - .set BATTLE_FRONTIER_ITEM_MENTAL_HERB, 37 - .set BATTLE_FRONTIER_ITEM_CHARCOAL, 38 - .set BATTLE_FRONTIER_ITEM_PECHA_BERRY, 39 - .set BATTLE_FRONTIER_ITEM_SOFT_SAND, 40 - .set BATTLE_FRONTIER_ITEM_LUM_BERRY, 41 - .set BATTLE_FRONTIER_ITEM_DRAGON_SCALE, 42 - .set BATTLE_FRONTIER_ITEM_DRAGON_FANG, 43 - .set BATTLE_FRONTIER_ITEM_IAPAPA_BERRY, 44 - .set BATTLE_FRONTIER_ITEM_WIKI_BERRY, 45 - .set BATTLE_FRONTIER_ITEM_SEA_INCENSE, 46 - .set BATTLE_FRONTIER_ITEM_SHELL_BELL, 47 - .set BATTLE_FRONTIER_ITEM_SALAC_BERRY, 48 - .set BATTLE_FRONTIER_ITEM_LANSAT_BERRY, 49 - .set BATTLE_FRONTIER_ITEM_APICOT_BERRY, 50 - .set BATTLE_FRONTIER_ITEM_STARF_BERRY, 51 - .set BATTLE_FRONTIER_ITEM_LIECHI_BERRY, 52 - .set BATTLE_FRONTIER_ITEM_STICK, 53 - .set BATTLE_FRONTIER_ITEM_LAX_INCENSE, 54 - .set BATTLE_FRONTIER_ITEM_AGUAV_BERRY, 55 - .set BATTLE_FRONTIER_ITEM_FIGY_BERRY, 56 - .set BATTLE_FRONTIER_ITEM_THICK_CLUB, 57 - .set BATTLE_FRONTIER_ITEM_MAGO_BERRY, 58 - .set BATTLE_FRONTIER_ITEM_METAL_POWDER, 59 - .set BATTLE_FRONTIER_ITEM_PETAYA_BERRY, 60 - .set BATTLE_FRONTIER_ITEM_LUCKY_PUNCH, 61 - .set BATTLE_FRONTIER_ITEM_GANLON_BERRY, 62 diff --git a/data/battle_frontier/battle_frontier_mons.inc b/data/battle_frontier/battle_frontier_mons.inc index 6b77c8378..f81032bcb 100644 --- a/data/battle_frontier/battle_frontier_mons.inc +++ b/data/battle_frontier/battle_frontier_mons.inc @@ -1,3 +1,5 @@ +#include "constants/battle_frontier.h" + .align 2 gBattleFrontierMons:: @ 85D97BC @ 0 diff --git a/data/battle_frontier/fallarbor_battle_tent_mons.inc b/data/battle_frontier/fallarbor_battle_tent_mons.inc deleted file mode 100644 index 36684c04b..000000000 --- a/data/battle_frontier/fallarbor_battle_tent_mons.inc +++ /dev/null @@ -1,316 +0,0 @@ - .align 2 -gFallarborBattleTentMons:: @ 85DF69C -@ 0 - .2byte SPECIES_NUMEL - .2byte MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY - .byte BATTLE_FRONTIER_ITEM_CHARCOAL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 1 - .2byte SPECIES_LINOONE - .2byte MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_SASSY - -@ 2 - .2byte SPECIES_PLUSLE - .2byte MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS - .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 3 - .2byte SPECIES_POOCHYENA - .2byte MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION - .byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 4 - .2byte SPECIES_KECLEON - .2byte MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM - .byte BATTLE_FRONTIER_ITEM_WIKI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_MODEST - -@ 5 - .2byte SPECIES_MAGIKARP - .2byte MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 6 - .2byte SPECIES_SOLROCK - .2byte MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE - .byte BATTLE_FRONTIER_ITEM_HARD_STONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 7 - .2byte SPECIES_MAKUHITA - .2byte MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT - .byte BATTLE_FRONTIER_ITEM_BLACK_BELT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 8 - .2byte SPECIES_MACHOKE - .2byte MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_NAIVE - -@ 9 - .2byte SPECIES_NINCADA - .2byte MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_SERIOUS - -@ 10 - .2byte SPECIES_BEAUTIFLY - .2byte MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 11 - .2byte SPECIES_DUSTOX - .2byte MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .4byte NATURE_DOCILE - -@ 12 - .2byte SPECIES_ILLUMISE - .2byte MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 13 - .2byte SPECIES_VOLBEAT - .2byte MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW - .byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 14 - .2byte SPECIES_NINJASK - .2byte MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_TIMID - -@ 15 - .2byte SPECIES_NINJASK - .2byte MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE - .byte BATTLE_FRONTIER_ITEM_SILVER_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 16 - .2byte SPECIES_ARON - .2byte MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 17 - .2byte SPECIES_ARON - .2byte MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_GENTLE - -@ 18 - .2byte SPECIES_ELECTRIKE - .2byte MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_SEA_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HASTY - -@ 19 - .2byte SPECIES_MAGNEMITE - .2byte MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK - .byte BATTLE_FRONTIER_ITEM_MAGNET - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 20 - .2byte SPECIES_VOLTORB - .2byte MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM - .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 21 - .2byte SPECIES_WHISMUR - .2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 22 - .2byte SPECIES_LOUDRED - .2byte MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 23 - .2byte SPECIES_LINOONE - .2byte MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL - .byte BATTLE_FRONTIER_ITEM_MAGNET - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 24 - .2byte SPECIES_MIGHTYENA - .2byte MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_JOLLY - -@ 25 - .2byte SPECIES_SWABLU - .2byte MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 26 - .2byte SPECIES_SKARMORY - .2byte MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT - .byte BATTLE_FRONTIER_ITEM_METAL_COAT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 27 - .2byte SPECIES_GOLBAT - .2byte MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 28 - .2byte SPECIES_WINGULL - .2byte MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 29 - .2byte SPECIES_PELIPPER - .2byte MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN - .byte BATTLE_FRONTIER_ITEM_DRAGON_FANG - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 30 - .2byte SPECIES_BARBOACH - .2byte MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 31 - .2byte SPECIES_WAILMER - .2byte MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 32 - .2byte SPECIES_MARILL - .2byte MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_HARD_STONE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 33 - .2byte SPECIES_GOLDEEN - .2byte MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_GANLON_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HASTY - -@ 34 - .2byte SPECIES_GOLDEEN - .2byte MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC - .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 35 - .2byte SPECIES_TRAPINCH - .2byte MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH - .byte BATTLE_FRONTIER_ITEM_MAGO_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 36 - .2byte SPECIES_BALTOY - .2byte MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 37 - .2byte SPECIES_GRAVELER - .2byte MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT - .byte BATTLE_FRONTIER_ITEM_HARD_STONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 38 - .2byte SPECIES_SANDSHREW - .2byte MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH - .byte BATTLE_FRONTIER_ITEM_SOFT_SAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 39 - .2byte SPECIES_SWALOT - .2byte MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 40 - .2byte SPECIES_SHROOMISH - .2byte MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 41 - .2byte SPECIES_KIRLIA - .2byte MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 42 - .2byte SPECIES_LOMBRE - .2byte MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BASHFUL - -@ 43 - .2byte SPECIES_NUZLEAF - .2byte MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 44 - .2byte SPECIES_CACNEA - .2byte MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT diff --git a/data/battle_frontier/fallarbor_battle_tent_trainer_mons.inc b/data/battle_frontier/fallarbor_battle_tent_trainer_mons.inc deleted file mode 100644 index f3d5696d6..000000000 --- a/data/battle_frontier/fallarbor_battle_tent_trainer_mons.inc +++ /dev/null @@ -1,257 +0,0 @@ - .align 1 -gFallarborBattleTentTrainerMons_Amber:: @ 85DEEF8 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte -1 - -gFallarborBattleTentTrainerMons_Javier:: @ 85DEF06 - .2byte 6 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 44 - .2byte -1 - -gFallarborBattleTentTrainerMons_Natalie:: @ 85DEF14 - .2byte 5 - .2byte 29 - .2byte 30 - .2byte 32 - .2byte 34 - .2byte -1 - -gFallarborBattleTentTrainerMons_Treve:: @ 85DEF20 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 32 - .2byte 33 - .2byte -1 - -gFallarborBattleTentTrainerMons_Arianna:: @ 85DEF2C - .2byte 18 - .2byte 23 - .2byte 24 - .2byte 27 - .2byte 44 - .2byte -1 - -gFallarborBattleTentTrainerMons_Jadyn:: @ 85DEF38 - .2byte 0 - .2byte 22 - .2byte 24 - .2byte 27 - .2byte 32 - .2byte 39 - .2byte -1 - -gFallarborBattleTentTrainerMons_Gerardo:: @ 85DEF46 - .2byte 6 - .2byte 18 - .2byte 23 - .2byte 24 - .2byte 29 - .2byte -1 - -gFallarborBattleTentTrainerMons_Jonn:: @ 85DEF52 - .2byte 16 - .2byte 17 - .2byte 21 - .2byte 22 - .2byte 37 - .2byte -1 - -gFallarborBattleTentTrainerMons_Esteban:: @ 85DEF5E - .2byte 5 - .2byte 28 - .2byte 30 - .2byte 33 - .2byte 42 - .2byte -1 - -gFallarborBattleTentTrainerMons_Jameson:: @ 85DEF6A - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 5 - .2byte 9 - .2byte -1 - -gFallarborBattleTentTrainerMons_Alanzo:: @ 85DEF76 - .2byte 9 - .2byte 10 - .2byte 11 - .2byte 12 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte -1 - -gFallarborBattleTentTrainerMons_Howard:: @ 85DEF86 - .2byte 18 - .2byte 23 - .2byte 31 - .2byte 38 - .2byte 43 - .2byte -1 - -gFallarborBattleTentTrainerMons_Conrad:: @ 85DEF92 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte -1 - -gFallarborBattleTentTrainerMons_Makenna:: @ 85DEF9E - .2byte 4 - .2byte 21 - .2byte 25 - .2byte 36 - .2byte 40 - .2byte -1 - -gFallarborBattleTentTrainerMons_Brayan:: @ 85DEFAA - .2byte 0 - .2byte 4 - .2byte 6 - .2byte 12 - .2byte 19 - .2byte 23 - .2byte 28 - .2byte -1 - -gFallarborBattleTentTrainerMons_Mariana:: @ 85DEFBA - .2byte 0 - .2byte 4 - .2byte 13 - .2byte 19 - .2byte 28 - .2byte 30 - .2byte 37 - .2byte -1 - -gFallarborBattleTentTrainerMons_Sheldon:: @ 85DEFCA - .2byte 2 - .2byte 3 - .2byte 21 - .2byte 31 - .2byte 39 - .2byte -1 - -gFallarborBattleTentTrainerMons_Gianna:: @ 85DEFD6 - .2byte 1 - .2byte 2 - .2byte 30 - .2byte 32 - .2byte 41 - .2byte -1 - -gFallarborBattleTentTrainerMons_Yahir:: @ 85DEFE2 - .2byte 4 - .2byte 8 - .2byte 15 - .2byte 17 - .2byte 22 - .2byte 24 - .2byte -1 - -gFallarborBattleTentTrainerMons_Britney:: @ 85DEFF0 - .2byte 4 - .2byte 7 - .2byte 14 - .2byte 20 - .2byte 23 - .2byte 43 - .2byte -1 - -gFallarborBattleTentTrainerMons_Hecter:: @ 85DEFFE - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 5 - .2byte 9 - .2byte 35 - .2byte -1 - -gFallarborBattleTentTrainerMons_Tannor:: @ 85DF00C - .2byte 5 - .2byte 30 - .2byte 31 - .2byte 33 - .2byte 34 - .2byte -1 - -gFallarborBattleTentTrainerMons_Benji:: @ 85DF018 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte -1 - -gFallarborBattleTentTrainerMons_Rory:: @ 85DF024 - .2byte 9 - .2byte 11 - .2byte 14 - .2byte 15 - .2byte 27 - .2byte 39 - .2byte -1 - -gFallarborBattleTentTrainerMons_Eleanor:: @ 85DF032 - .2byte 23 - .2byte 28 - .2byte 31 - .2byte 36 - .2byte 38 - .2byte 42 - .2byte 44 - .2byte -1 - -gFallarborBattleTentTrainerMons_Evelyn:: @ 85DF042 - .2byte 29 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte -1 - -gFallarborBattleTentTrainerMons_Arielle:: @ 85DF04E - .2byte 1 - .2byte 3 - .2byte 38 - .2byte 39 - .2byte 41 - .2byte -1 - -gFallarborBattleTentTrainerMons_Connar:: @ 85DF05A - .2byte 7 - .2byte 8 - .2byte 28 - .2byte 29 - .2byte 31 - .2byte 32 - .2byte -1 - -gFallarborBattleTentTrainerMons_Maurice:: @ 85DF068 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 12 - .2byte 13 - .2byte -1 - -gFallarborBattleTentTrainerMons_Kianna:: @ 85DF074 - .2byte 22 - .2byte 24 - .2byte 26 - .2byte 27 - .2byte 34 - .2byte 37 - .2byte -1 diff --git a/data/battle_frontier/fallarbor_battle_tent_trainers.inc b/data/battle_frontier/fallarbor_battle_tent_trainers.inc deleted file mode 100644 index 675314eb3..000000000 --- a/data/battle_frontier/fallarbor_battle_tent_trainers.inc +++ /dev/null @@ -1,781 +0,0 @@ - .align 2 -gFallarborBattleTentTrainers:: @ 85DF084 -@ 0 - .4byte FACILITY_CLASS_AROMA_LADY - .string "AMBER$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_TO - .2byte EC_WORD_DIET - .2byte EC_WORD_EVERY - .2byte EC_WORD_DAY -@ win speech - .2byte EC_WORD_A - .2byte EC_MOVE(NIGHTMARE) - .2byte EC_WORD_OF - .2byte EC_WORD_SWEETS - .2byte EC_WORD_SHOCKED - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_IF - .2byte EC_WORD_YOU - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_YOU - .2byte EC_WORD_WILL - .2byte EC_WORD_LOSE - .4byte gFallarborBattleTentTrainerMons_Amber - -@ 1 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "JAVIER$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_NEVER - .2byte EC_WORD_EVER - .2byte EC_WORD_HAVE - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_MONEY -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_MONEY -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_MONEY - .2byte EC_WORD_FOR - .2byte EC_WORD_A - .2byte EC_WORD_BIKE - .4byte gFallarborBattleTentTrainerMons_Javier - -@ 2 - .4byte FACILITY_CLASS_TUBER_1 - .string "NATALIE$", 8 -@ pre-battle speech - .2byte EC_WORD_THE - .2byte EC_WORD_WAY - .2byte EC_WORD_I - .2byte EC_WORD_BATTLE - .2byte EC_WORD_IS - .2byte EC_WORD_WEIRD -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MUCH - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_FOR - .2byte EC_WORD_THIS - .2byte EC_WORD_PLACE -@ loss speech - .2byte EC_WORD_GIVE_ME - .2byte EC_WORD_AN - .2byte EC_WORD_EASY - .2byte EC_WORD_MATCH - .2byte EC_WORD_NEXT - .2byte EC_WORD_TIME - .4byte gFallarborBattleTentTrainerMons_Natalie - -@ 3 - .4byte FACILITY_CLASS_TUBER_2 - .string "TREVE$", 8 -@ pre-battle speech - .2byte EC_WORD_LOOK - .2byte EC_WORD_AT - .2byte EC_WORD_MY - .2byte EC_MOVE2(METRONOME) - .2byte EC_WORD_AND - .2byte EC_WORD_SLEEP -@ win speech - .2byte EC_WORD_YEAH - .2byte EC_WORD_EXCL - .2byte EC_MOVE(HYPNOSIS) - .2byte EC_WORD_IS - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_GREAT -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE(HYPNOSIS) - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_WORK - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gFallarborBattleTentTrainerMons_Treve - -@ 4 - .4byte FACILITY_CLASS_LADY - .string "ARIANNA$", 8 -@ pre-battle speech - .2byte EC_WORD_IF_I_WIN - .2byte EC_WORD_GIVE_ME - .2byte EC_WORD_POKEMON - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_COLLECTION -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_TO - .2byte EC_WORD_COLLECT -@ loss speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_ELSE - .2byte EC_WORD_ELLIPSIS - .4byte gFallarborBattleTentTrainerMons_Arianna - -@ 5 - .4byte FACILITY_CLASS_BEAUTY - .string "JADYN$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_NAME - .2byte EC_WORD_IS - .2byte EC_WORD_REALLY - .2byte EC_WORD_A - .2byte EC_WORD_MYSTERY -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_NAME - .2byte EC_WORD_GOES - .2byte EC_WORD_ON - .2byte EC_WORD_A - .2byte EC_WORD_MYSTERY -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_NAME - .2byte EC_WORD_QUES - .2byte EC_WORD_I_AM - .2byte EC_WORD_YOUR - .2byte EC_WORD_MOTHER - .4byte gFallarborBattleTentTrainerMons_Jadyn - -@ 6 - .4byte FACILITY_CLASS_RICH_BOY - .string "GERARDO$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_THE - .2byte EC_WORD_BEST - .2byte EC_WORD_HERO - .2byte EC_WORD_EVER - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_SEE - .2byte EC_WORD_WHAT - .2byte EC_WORD_I - .2byte EC_WORD_MEAN - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_YOU - .2byte EC_WORD_WERE - .2byte EC_WORD_RIGHT - .2byte EC_WORD_QUES - .2byte -1 - .4byte gFallarborBattleTentTrainerMons_Gerardo - -@ 7 - .4byte FACILITY_CLASS_POKEMANIAC - .string "JONN$", 8 -@ pre-battle speech - .2byte EC_WORD_THE - .2byte EC_WORD_WORLD - .2byte EC_MOVE2(SUPERPOWER) - .2byte EC_MOVE2(STOMP) - .2byte EC_WORD_CONTEST - .2byte EC_WORD_EXCL_EXCL -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NO_1 - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_HEAR - .2byte EC_WORD_ME - .2byte EC_MOVE2(ROAR) -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_EXCL - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_NO_1 - .2byte EC_WORD_EXCL - .4byte gFallarborBattleTentTrainerMons_Jonn - -@ 8 - .4byte FACILITY_CLASS_SWIMMER_M - .string "ESTEBAN$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_A - .2byte EC_WORD_GOOD - .2byte EC_WORD_TRAINER - .2byte EC_WORD_QUES - .2byte EC_WORD_UNBELIEVABLE -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_SOME - .2byte EC_WORD_PUSHOVER - .2byte EC_WORD_OF - .2byte EC_WORD_A - .2byte EC_WORD_TRAINER -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MUCH - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .4byte gFallarborBattleTentTrainerMons_Esteban - -@ 9 - .4byte FACILITY_CLASS_CAMPER - .string "JAMESON$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_SILKY - .2byte EC_WORD_SMOOTH - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_SILKY - .2byte EC_WORD_SMOOTH - .2byte EC_WORD_POKEMON - .2byte EC_WORD_RULE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_IN - .2byte EC_WORD_YOUR - .2byte EC_WORD_STICKY_HOLD - .4byte gFallarborBattleTentTrainerMons_Jameson - -@ 10 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "ALANZO$", 8 -@ pre-battle speech - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_WORD_POWER - .2byte EC_WORD_I - .2byte EC_WORD_HAVE -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_OBLIVIOUS - .2byte EC_WORD_ABOUT - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_IS - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_RIGHT - .2byte EC_WORD_EXCL - .4byte gFallarborBattleTentTrainerMons_Alanzo - -@ 11 - .4byte FACILITY_CLASS_GENTLEMAN - .string "HOWARD$", 8 -@ pre-battle speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_CAN_T - .2byte EC_WORD_BEAT - .2byte EC_WORD_ME - .2byte -1 -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_COULDN_T - .2byte EC_WORD_WIN - .2byte EC_WORD_COULD - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_WOULD - .2byte EC_WORD_GO - .2byte EC_WORD_ALL - .2byte EC_WORD_OUT - .2byte EC_WORD_ELLIPSIS - .4byte gFallarborBattleTentTrainerMons_Howard - -@ 12 - .4byte FACILITY_CLASS_GUITARIST - .string "CONRAD$", 8 -@ pre-battle speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_PRETTY - .2byte EC_WORD_WILD - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_WHOAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_LET_S - .2byte EC_WORD_DANCE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_MUSIC - .2byte EC_WORD_WILL - .2byte EC_WORD_PLAY - .2byte EC_WORD_ON - .2byte EC_WORD_ELLIPSIS - .4byte gFallarborBattleTentTrainerMons_Conrad - -@ 13 - .4byte FACILITY_CLASS_SCHOOL_KID_F - .string "MAKENNA$", 8 -@ pre-battle speech - .2byte EC_WORD_SHOW - .2byte EC_WORD_ME - .2byte EC_WORD_THAT - .2byte EC_WORD_YOU - .2byte EC_WORD_MEAN - .2byte EC_WORD_IT -@ win speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHY - .2byte EC_WORD_I - .2byte EC_WORD_STUDY - .2byte EC_WORD_EVERY - .2byte EC_WORD_DAY -@ loss speech - .2byte EC_WORD_AWW - .2byte EC_WORD_I - .2byte EC_WORD_STUDY - .2byte EC_WORD_EVERY - .2byte EC_WORD_DAY - .2byte EC_WORD_TOO - .4byte gFallarborBattleTentTrainerMons_Makenna - -@ 14 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "BRAYAN$", 8 -@ pre-battle speech - .2byte EC_WORD_CAN - .2byte EC_WORD_YOU - .2byte EC_WORD_SEE - .2byte EC_WORD_MY - .2byte EC_WORD_POWER - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_HOW - .2byte EC_WORD_BORING - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_GOOD_BYE -@ loss speech - .2byte EC_WORD_AM - .2byte EC_WORD_I - .2byte EC_WORD_THE - .2byte EC_WORD_WEAK - .2byte EC_WORD_TRAINER - .2byte EC_WORD_QUES - .4byte gFallarborBattleTentTrainerMons_Brayan - -@ 15 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "MARIANA$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_LIE - .2byte EC_WORD_CAN - .2byte EC_WORD_BE - .2byte EC_WORD_KIND - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_LIKE - .2byte EC_WORD_THE - .2byte EC_WORD_SUNDAY - .2byte EC_WORD_COMICS -@ loss speech - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_LIKE - .2byte EC_WORD_FROM - .2byte EC_WORD_A - .2byte EC_WORD_MOVIE - .4byte gFallarborBattleTentTrainerMons_Mariana - -@ 16 - .4byte FACILITY_CLASS_POKEFAN_1 - .string "SHELDON$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_TEACHER - .2byte EC_WORD_GETS - .2byte EC_WORD_NO - .2byte EC_MOVE2(REST) -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_SMARTNESS - .2byte EC_WORD_GETS - .2byte EC_WORD_ME - .2byte EC_WORD_EASY - .2byte EC_WORD_WINS -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_TO - .2byte EC_WORD_GO - .2byte EC_WORD_WORK - .2byte EC_WORD_BYE_BYE - .4byte gFallarborBattleTentTrainerMons_Sheldon - -@ 17 - .4byte FACILITY_CLASS_POKEFAN_2 - .string "GIANNA$", 8 -@ pre-battle speech - .2byte EC_WORD_AHAHA - .2byte EC_WORD_YES - .2byte EC_WORD_EXCL - .2byte EC_WORD_LOVEY_DOVEY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_WORLD -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_SHINE - .2byte EC_WORD_IS - .2byte EC_WORD_MAKING - .2byte EC_WORD_THINGS - .2byte EC_WORD_BETTER -@ loss speech - .2byte EC_WORD_DO - .2byte EC_WORD_YOU - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_POKEMON - .2byte EC_WORD_QUES - .2byte -1 - .4byte gFallarborBattleTentTrainerMons_Gianna - -@ 18 - .4byte FACILITY_CLASS_EXPERT_M - .string "YAHIR$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_COME_ON - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_TRAIN - .2byte EC_WORD_A_LOT - .2byte EC_WORD_MORE -@ loss speech - .2byte EC_WORD_NOT - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_JUST - .2byte EC_WORD_NOT - .2byte EC_WORD_ENOUGH - .4byte gFallarborBattleTentTrainerMons_Yahir - -@ 19 - .4byte FACILITY_CLASS_EXPERT_2 - .string "BRITNEY$", 8 -@ pre-battle speech - .2byte EC_WORD_IT - .2byte EC_WORD_SEEMS - .2byte EC_WORD_THAT - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_QUITE - .2byte EC_WORD_GOOD -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_A - .2byte EC_WORD_LUKEWARM - .2byte EC_WORD_TALENT - .2byte EC_WORD_AT - .2byte EC_WORD_BEST -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_A - .2byte EC_WORD_COOL - .2byte EC_WORD_HERO - .2byte EC_WORD_AT - .2byte EC_WORD_THIS - .4byte gFallarborBattleTentTrainerMons_Britney - -@ 20 - .4byte FACILITY_CLASS_YOUNGSTER - .string "HECTER$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_IS - .2byte EC_WORD_EXCITING - .2byte EC_WORD_ME - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_YEEHAW_EXCL - .2byte EC_WORD_LET_S - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_PARTY -@ loss speech - .2byte EC_WORD_WAAAH - .2byte EC_WORD_EXCL - .2byte EC_WORD_DON_T - .2byte EC_WORD_YOU - .2byte EC_MOVE2(MIMIC) - .2byte EC_WORD_ME - .4byte gFallarborBattleTentTrainerMons_Hecter - -@ 21 - .4byte FACILITY_CLASS_FISHERMAN - .string "TANNOR$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_GOT - .2byte EC_WORD_TO - .2byte EC_WORD_BE - .2byte EC_WORD_JOKING -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_THE - .2byte EC_WORD_BEST - .2byte EC_WORD_AT - .2byte EC_WORD_BEING - .2byte EC_WORD_FUNNY -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_WEREN_T - .2byte EC_WORD_BEING - .2byte EC_WORD_FUNNY - .2byte EC_WORD_AT - .2byte EC_WORD_ALL - .4byte gFallarborBattleTentTrainerMons_Tannor - -@ 22 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "BENJI$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DON_T - .2byte EC_WORD_THINK - .2byte EC_WORD_VERY - .2byte EC_WORD_FAST - .2byte EC_WORD_HUH_QUES -@ win speech - .2byte EC_WORD_SORRY - .2byte EC_WORD_EXCL - .2byte EC_WORD_I - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_MEAN - .2byte EC_WORD_YOU -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_LEFT - .2byte EC_WORD_ME - .2byte EC_WORD_FEELING - .2byte EC_WORD_SAD - .2byte EC_WORD_ELLIPSIS - .4byte gFallarborBattleTentTrainerMons_Benji - -@ 23 - .4byte FACILITY_CLASS_NINJA_BOY - .string "RORY$", 8 -@ pre-battle speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_CAUSE - .2byte EC_WORD_AN - .2byte EC_MOVE(UPROAR) - .2byte EC_WORD_YOU - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_NEED - .2byte EC_WORD_AN - .2byte EC_MOVE(UPROAR) - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_CAUSE - .2byte EC_WORD_AN - .2byte EC_MOVE(UPROAR) - .4byte gFallarborBattleTentTrainerMons_Rory - -@ 24 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "ELEANOR$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_REALLY - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_PARTY - .2byte -1 -@ win speech - .2byte EC_WORD_A - .2byte EC_WORD_TRENDY - .2byte EC_WORD_PARTY - .2byte EC_WORD_WOULD - .2byte EC_WORD_BE - .2byte EC_WORD_REFRESHING -@ loss speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_YOU - .2byte EC_WORD_LIKE - .2byte EC_WORD_TO - .2byte EC_WORD_PARTY - .2byte EC_WORD_QUES - .4byte gFallarborBattleTentTrainerMons_Eleanor - -@ 25 - .4byte FACILITY_CLASS_SWIMMER_F - .string "EVELYN$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_PC - .2byte EC_WORD_IS - .2byte EC_WORD_MY - .2byte EC_WORD_SECRET_BASE - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_ALL - .2byte EC_WORD_SECRET - .2byte EC_WORD_ON - .2byte EC_WORD_MY - .2byte EC_WORD_PC -@ loss speech - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_REJECT - .2byte EC_WORD_THIS - .4byte gFallarborBattleTentTrainerMons_Evelyn - -@ 26 - .4byte FACILITY_CLASS_PICNICKER - .string "ARIELLE$", 8 -@ pre-battle speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_PRETTY - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_TRY -@ win speech - .2byte EC_WORD_WE_RE - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_PRETTY - .2byte EC_WORD_BUT - .2byte EC_WORD_WE_RE - .2byte EC_WORD_GREAT -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_PRETTY - .2byte EC_WORD_MEAN - .2byte EC_WORD_OF - .2byte EC_WORD_YOU - .2byte EC_WORD_EXCL - .4byte gFallarborBattleTentTrainerMons_Arielle - -@ 27 - .4byte FACILITY_CLASS_SAILOR - .string "CONNAR$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_STRONG - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_FOR - .2byte EC_WORD_THIS -@ win speech - .2byte EC_WORD_DO - .2byte EC_WORD_YOU - .2byte EC_WORD_THINK - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_OK_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_GOOD_BYE - .2byte EC_WORD_AND - .2byte EC_WORD_THANK_YOU - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gFallarborBattleTentTrainerMons_Connar - -@ 28 - .4byte FACILITY_CLASS_COLLECTOR - .string "MAURICE$", 8 -@ pre-battle speech - .2byte EC_WORD_THERE - .2byte EC_WORD_IS - .2byte EC_WORD_NO - .2byte EC_WORD_RADIO - .2byte EC_WORD_OR - .2byte EC_WORD_TELEVISION -@ win speech - .2byte EC_WORD_BUT - .2byte EC_WORD_THERE - .2byte EC_WORD_IS - .2byte EC_WORD_A_LOT - .2byte EC_WORD_OF - .2byte EC_WORD_POKEMON -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_ENJOY - .2byte EC_WORD_MYSELF - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_MONEY - .4byte gFallarborBattleTentTrainerMons_Maurice - -@ 29 - .4byte FACILITY_CLASS_LASS - .string "KIANNA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_GO - .2byte EC_WORD_DEPT_STORE - .2byte EC_WORD_SHOPPING -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_SHOPPING - .2byte EC_WORD_ALONE - .2byte -1 - .2byte -1 -@ loss speech - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_GO - .2byte EC_WORD_SHOPPING - .2byte EC_WORD_TOGETHER - .2byte EC_WORD_QUES - .4byte gFallarborBattleTentTrainerMons_Kianna diff --git a/data/battle_frontier/slateport_battle_tent_mons.inc b/data/battle_frontier/slateport_battle_tent_mons.inc deleted file mode 100644 index 8760673d2..000000000 --- a/data/battle_frontier/slateport_battle_tent_mons.inc +++ /dev/null @@ -1,491 +0,0 @@ - .align 2 -gSlateportBattleTentMons:: @ 85DE02C -@ 0 - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 1 - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 2 - .2byte SPECIES_BEAUTIFLY - .2byte MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 3 - .2byte SPECIES_DUSTOX - .2byte MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST - .byte BATTLE_FRONTIER_ITEM_ORAN_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 4 - .2byte SPECIES_WAILMER - .2byte MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 5 - .2byte SPECIES_WAILMER - .2byte MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 6 - .2byte SPECIES_MARILL - .2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 7 - .2byte SPECIES_WINGULL - .2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING - .byte BATTLE_FRONTIER_ITEM_METAL_COAT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_NAIVE - -@ 8 - .2byte SPECIES_PELIPPER - .2byte MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK - .byte BATTLE_FRONTIER_ITEM_DRAGON_FANG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 9 - .2byte SPECIES_CACNEA - .2byte MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SPEED - .4byte NATURE_JOLLY - -@ 10 - .2byte SPECIES_LOMBRE - .2byte MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB - .byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 11 - .2byte SPECIES_LOTAD - .2byte MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 12 - .2byte SPECIES_SEEDOT - .2byte MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_TIMID - -@ 13 - .2byte SPECIES_NUZLEAF - .2byte MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 14 - .2byte SPECIES_NINJASK - .2byte MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 15 - .2byte SPECIES_NINJASK - .2byte MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_SILVER_POWDER - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 16 - .2byte SPECIES_GRAVELER - .2byte MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 17 - .2byte SPECIES_BALTOY - .2byte MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_NAIVE - -@ 18 - .2byte SPECIES_MIGHTYENA - .2byte MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE - .byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 19 - .2byte SPECIES_MIGHTYENA - .2byte MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 20 - .2byte SPECIES_LINOONE - .2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_JOLLY - -@ 21 - .2byte SPECIES_GOLDEEN - .2byte MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_CALM - -@ 22 - .2byte SPECIES_ELECTRIKE - .2byte MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH - .byte BATTLE_FRONTIER_ITEM_MAGNET - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_MODEST - -@ 23 - .2byte SPECIES_VOLTORB - .2byte MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .4byte NATURE_MILD - -@ 24 - .2byte SPECIES_ARON - .2byte MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 25 - .2byte SPECIES_ARON - .2byte MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 26 - .2byte SPECIES_TRAPINCH - .2byte MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 27 - .2byte SPECIES_CACNEA - .2byte MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_TIMID - -@ 28 - .2byte SPECIES_TAILLOW - .2byte MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR - .byte BATTLE_FRONTIER_ITEM_SHARP_BEAK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 29 - .2byte SPECIES_SWELLOW - .2byte MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 30 - .2byte SPECIES_GOLBAT - .2byte MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_SPELL_TAG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .4byte NATURE_TIMID - -@ 31 - .2byte SPECIES_LOUDRED - .2byte MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 32 - .2byte SPECIES_SPINDA - .2byte MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 33 - .2byte SPECIES_MAGNEMITE - .2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_SERIOUS - -@ 34 - .2byte SPECIES_WHISMUR - .2byte MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 35 - .2byte SPECIES_MAKUHITA - .2byte MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 36 - .2byte SPECIES_NUMEL - .2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_MODEST - -@ 37 - .2byte SPECIES_BARBOACH - .2byte MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN - .byte BATTLE_FRONTIER_ITEM_SEA_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_JOLLY - -@ 38 - .2byte SPECIES_TENTACOOL - .2byte MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER - .byte BATTLE_FRONTIER_ITEM_POISON_BARB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 39 - .2byte SPECIES_VIGOROTH - .2byte MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN - .byte BATTLE_FRONTIER_ITEM_AGUAV_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 40 - .2byte SPECIES_MAGIKARP - .2byte MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_DRAGON_SCALE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 41 - .2byte SPECIES_SEVIPER - .2byte MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 42 - .2byte SPECIES_SOLROCK - .2byte MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE - .byte BATTLE_FRONTIER_ITEM_HARD_STONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 43 - .2byte SPECIES_KECLEON - .2byte MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 44 - .2byte SPECIES_KECLEON - .2byte MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 45 - .2byte SPECIES_SHROOMISH - .2byte MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 46 - .2byte SPECIES_SHROOMISH - .2byte MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED - .byte BATTLE_FRONTIER_ITEM_FIGY_BERRY - .byte F_EV_SPREAD_ATTACK - .4byte NATURE_BRAVE - -@ 47 - .2byte SPECIES_LOMBRE - .2byte MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_LONELY - -@ 48 - .2byte SPECIES_NUMEL - .2byte MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY - .byte BATTLE_FRONTIER_ITEM_CHARCOAL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 49 - .2byte SPECIES_TRAPINCH - .2byte MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 50 - .2byte SPECIES_PELIPPER - .2byte MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_WIKI_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 51 - .2byte SPECIES_WINGULL - .2byte MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND - .byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 52 - .2byte SPECIES_MARILL - .2byte MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN - .byte BATTLE_FRONTIER_ITEM_GANLON_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 53 - .2byte SPECIES_SKITTY - .2byte MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 54 - .2byte SPECIES_SEVIPER - .2byte MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_BRAVE - -@ 55 - .2byte SPECIES_GOLBAT - .2byte MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 56 - .2byte SPECIES_RALTS - .2byte MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER - .byte BATTLE_FRONTIER_ITEM_MAGO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_TIMID - -@ 57 - .2byte SPECIES_SANDSHREW - .2byte MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL - .byte BATTLE_FRONTIER_ITEM_SOFT_SAND - .byte 0 - .4byte NATURE_HARDY - -@ 58 - .2byte SPECIES_SWALOT - .2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_IMPISH - -@ 59 - .2byte SPECIES_VOLBEAT - .2byte MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 60 - .2byte SPECIES_ILLUMISE - .2byte MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 61 - .2byte SPECIES_KADABRA - .2byte MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 62 - .2byte SPECIES_KIRLIA - .2byte MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 63 - .2byte SPECIES_BRELOOM - .2byte MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAIVE - -@ 64 - .2byte SPECIES_PLUSLE - .2byte MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_LONELY - -@ 65 - .2byte SPECIES_PLUSLE - .2byte MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MILD - -@ 66 - .2byte SPECIES_ELECTRIKE - .2byte MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_APICOT_BERRY - .byte F_EV_SPREAD_SPEED - .4byte NATURE_TIMID - -@ 67 - .2byte SPECIES_SWABLU - .2byte MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 68 - .2byte SPECIES_MACHOP - .2byte MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT - .byte BATTLE_FRONTIER_ITEM_BLACK_BELT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 69 - .2byte SPECIES_MACHOKE - .2byte MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST diff --git a/data/battle_frontier/slateport_battle_tent_trainer_mons.inc b/data/battle_frontier/slateport_battle_tent_trainer_mons.inc deleted file mode 100644 index 6565f469a..000000000 --- a/data/battle_frontier/slateport_battle_tent_trainer_mons.inc +++ /dev/null @@ -1,448 +0,0 @@ - .align 1 -gSlateportBattleTentTrainerMons_Jolie:: @ 85DD70C - .2byte 9 - .2byte 10 - .2byte 13 - .2byte 27 - .2byte 35 - .2byte 37 - .2byte 42 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 63 - .2byte -1 - -gSlateportBattleTentTrainerMons_Malachi:: @ 85DD724 - .2byte 9 - .2byte 16 - .2byte 17 - .2byte 27 - .2byte 36 - .2byte 39 - .2byte 42 - .2byte 45 - .2byte 48 - .2byte 49 - .2byte 53 - .2byte -1 - -gSlateportBattleTentTrainerMons_Kelsie:: @ 85DD73C - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 11 - .2byte 28 - .2byte 34 - .2byte 35 - .2byte 37 - .2byte 43 - .2byte 51 - .2byte 53 - .2byte -1 - -gSlateportBattleTentTrainerMons_Davon:: @ 85DD754 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 12 - .2byte 26 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 40 - .2byte 44 - .2byte 46 - .2byte 50 - .2byte -1 - -gSlateportBattleTentTrainerMons_Glenda:: @ 85DD76E - .2byte 0 - .2byte 1 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 22 - .2byte 23 - .2byte 33 - .2byte 42 - .2byte 61 - .2byte 64 - .2byte 65 - .2byte 66 - .2byte -1 - -gSlateportBattleTentTrainerMons_Helena:: @ 85DD78A - .2byte 18 - .2byte 19 - .2byte 21 - .2byte 38 - .2byte 39 - .2byte 41 - .2byte 42 - .2byte 52 - .2byte 54 - .2byte 58 - .2byte 63 - .2byte -1 - -gSlateportBattleTentTrainerMons_Rodolfo:: @ 85DD7A2 - .2byte 0 - .2byte 1 - .2byte 4 - .2byte 5 - .2byte 7 - .2byte 8 - .2byte 18 - .2byte 20 - .2byte 21 - .2byte 37 - .2byte 38 - .2byte 40 - .2byte 62 - .2byte -1 - -gSlateportBattleTentTrainerMons_Davion:: @ 85DD7BE - .2byte 17 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 39 - .2byte 43 - .2byte 44 - .2byte 49 - .2byte 57 - .2byte 69 - .2byte -1 - -gSlateportBattleTentTrainerMons_Kendall:: @ 85DD7DC - .2byte 4 - .2byte 7 - .2byte 8 - .2byte 9 - .2byte 11 - .2byte 12 - .2byte 13 - .2byte 27 - .2byte 38 - .2byte 40 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 63 - .2byte -1 - -gSlateportBattleTentTrainerMons_Colten:: @ 85DD7FA - .2byte 0 - .2byte 2 - .2byte 12 - .2byte 22 - .2byte 28 - .2byte 30 - .2byte 35 - .2byte 38 - .2byte 43 - .2byte 44 - .2byte 56 - .2byte 57 - .2byte -1 - -gSlateportBattleTentTrainerMons_Irvin:: @ 85DD814 - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 14 - .2byte 15 - .2byte 24 - .2byte 25 - .2byte 32 - .2byte 34 - .2byte 39 - .2byte 59 - .2byte 60 - .2byte -1 - -gSlateportBattleTentTrainerMons_Shaun:: @ 85DD830 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 22 - .2byte 29 - .2byte 36 - .2byte 42 - .2byte 48 - .2byte 61 - .2byte 62 - .2byte 66 - .2byte 68 - .2byte 69 - .2byte -1 - -gSlateportBattleTentTrainerMons_Kyler:: @ 85DD84C - .2byte 22 - .2byte 23 - .2byte 28 - .2byte 29 - .2byte 31 - .2byte 32 - .2byte 34 - .2byte 39 - .2byte 55 - .2byte 64 - .2byte 65 - .2byte 67 - .2byte -1 - -gSlateportBattleTentTrainerMons_Maggie:: @ 85DD866 - .2byte 10 - .2byte 13 - .2byte 17 - .2byte 27 - .2byte 45 - .2byte 46 - .2byte 53 - .2byte 56 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte -1 - -gSlateportBattleTentTrainerMons_Stephon:: @ 85DD87E - .2byte 8 - .2byte 10 - .2byte 16 - .2byte 23 - .2byte 29 - .2byte 43 - .2byte 44 - .2byte 60 - .2byte 62 - .2byte 63 - .2byte 68 - .2byte -1 - -gSlateportBattleTentTrainerMons_Rebecca:: @ 85DD896 - .2byte 8 - .2byte 13 - .2byte 21 - .2byte 29 - .2byte 33 - .2byte 41 - .2byte 48 - .2byte 54 - .2byte 59 - .2byte 61 - .2byte 68 - .2byte -1 - -gSlateportBattleTentTrainerMons_Reggie:: @ 85DD8AE - .2byte 6 - .2byte 7 - .2byte 17 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 36 - .2byte 52 - .2byte 53 - .2byte 57 - .2byte 65 - .2byte -1 - -gSlateportBattleTentTrainerMons_Janae:: @ 85DD8C8 - .2byte 0 - .2byte 1 - .2byte 27 - .2byte 28 - .2byte 32 - .2byte 34 - .2byte 36 - .2byte 37 - .2byte 52 - .2byte 53 - .2byte 57 - .2byte 65 - .2byte -1 - -gSlateportBattleTentTrainerMons_Caiden:: @ 85DD8E2 - .2byte 10 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 20 - .2byte 21 - .2byte 25 - .2byte 30 - .2byte 35 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 69 - .2byte -1 - -gSlateportBattleTentTrainerMons_Kirsten:: @ 85DD8FE - .2byte 10 - .2byte 16 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 25 - .2byte 30 - .2byte 35 - .2byte 39 - .2byte 41 - .2byte 48 - .2byte 69 - .2byte -1 - -gSlateportBattleTentTrainerMons_Kurtis:: @ 85DD91A - .2byte 0 - .2byte 1 - .2byte 36 - .2byte 37 - .2byte 40 - .2byte 46 - .2byte 49 - .2byte 51 - .2byte 64 - .2byte 67 - .2byte 68 - .2byte -1 - -gSlateportBattleTentTrainerMons_Stefan:: @ 85DD932 - .2byte 4 - .2byte 5 - .2byte 21 - .2byte 33 - .2byte 37 - .2byte 38 - .2byte 40 - .2byte 51 - .2byte 52 - .2byte 64 - .2byte 65 - .2byte -1 - -gSlateportBattleTentTrainerMons_Avery:: @ 85DD94A - .2byte 2 - .2byte 3 - .2byte 7 - .2byte 8 - .2byte 22 - .2byte 23 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 51 - .2byte 67 - .2byte -1 - -gSlateportBattleTentTrainerMons_Dwane:: @ 85DD962 - .2byte 14 - .2byte 15 - .2byte 30 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 55 - .2byte 58 - .2byte 59 - .2byte 63 - .2byte -1 - -gSlateportBattleTentTrainerMons_Mckenna:: @ 85DD97A - .2byte 27 - .2byte 29 - .2byte 30 - .2byte 32 - .2byte 36 - .2byte 48 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 57 - .2byte 67 - .2byte -1 - -gSlateportBattleTentTrainerMons_Camryn:: @ 85DD992 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 8 - .2byte 10 - .2byte 16 - .2byte 17 - .2byte 20 - .2byte 21 - .2byte 37 - .2byte 43 - .2byte 44 - .2byte -1 - -gSlateportBattleTentTrainerMons_Natasha:: @ 85DD9AC - .2byte 1 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 9 - .2byte 11 - .2byte 12 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 51 - .2byte -1 - -gSlateportBattleTentTrainerMons_Austyn:: @ 85DD9C4 - .2byte 25 - .2byte 31 - .2byte 35 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 58 - .2byte 68 - .2byte 69 - .2byte -1 - -gSlateportBattleTentTrainerMons_Donovan:: @ 85DD9DE - .2byte 10 - .2byte 16 - .2byte 17 - .2byte 24 - .2byte 25 - .2byte 43 - .2byte 44 - .2byte 47 - .2byte 49 - .2byte 53 - .2byte 59 - .2byte 60 - .2byte 64 - .2byte 65 - .2byte -1 - -gSlateportBattleTentTrainerMons_Tamia:: @ 85DD9FC - .2byte 2 - .2byte 6 - .2byte 9 - .2byte 13 - .2byte 17 - .2byte 19 - .2byte 20 - .2byte 24 - .2byte 27 - .2byte 29 - .2byte 30 - .2byte -1 diff --git a/data/battle_frontier/slateport_battle_tent_trainers.inc b/data/battle_frontier/slateport_battle_tent_trainers.inc deleted file mode 100644 index 051514b94..000000000 --- a/data/battle_frontier/slateport_battle_tent_trainers.inc +++ /dev/null @@ -1,781 +0,0 @@ - .align 2 -gSlateportBattleTentTrainers:: @ 85DDA14 -@ 0 - .4byte FACILITY_CLASS_AROMA_LADY - .string "JOLIE$", 8 -@ pre-battle speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_WILL - .2byte EC_WORD_I - .2byte EC_WORD_BE - .2byte EC_WORD_TOMORROW - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_LIKE - .2byte EC_WORD_IT_S - .2byte EC_WORD_FRIDAY - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_LIKE - .2byte EC_WORD_IT_S - .2byte EC_WORD_MONDAY - .2byte EC_WORD_ELLIPSIS - .4byte gSlateportBattleTentTrainerMons_Jolie - -@ 1 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "MALACHI$", 8 -@ pre-battle speech - .2byte EC_WORD_BAD - .2byte EC_WORD_NEWS - .2byte EC_WORD_EXCL - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_MOVE(SAND_TOMB) -@ win speech - .2byte EC_WORD_YEEHAW_EXCL - .2byte -1 - .2byte -1 - .2byte EC_WORD_I_VE - .2byte EC_WORD_DONE - .2byte EC_WORD_IT -@ loss speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_LOST - .2byte EC_WORD_IN - .2byte EC_WORD_THIS - .2byte EC_MOVE(SAND_TOMB) - .2byte EC_WORD_ELLIPSIS - .4byte gSlateportBattleTentTrainerMons_Malachi - -@ 2 - .4byte FACILITY_CLASS_TUBER_1 - .string "KELSIE$", 8 -@ pre-battle speech - .2byte EC_WORD_GO - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_MY - .2byte EC_WORD_BATH - .2byte EC_WORD_POKEMON - .2byte EC_WORD_EXCL_EXCL -@ win speech - .2byte EC_WORD_YAHOO - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_MY - .2byte EC_WORD_BATH - .2byte EC_WORD_POKEMON - .2byte EC_WORD_EXCL_EXCL -@ loss speech - .2byte EC_WORD_GWAH - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_MY - .2byte EC_WORD_BATH - .2byte EC_WORD_POKEMON - .2byte EC_WORD_EXCL_EXCL - .4byte gSlateportBattleTentTrainerMons_Kelsie - -@ 3 - .4byte FACILITY_CLASS_TUBER_2 - .string "DAVON$", 8 -@ pre-battle speech - .2byte EC_WORD_YEAH_YEAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_GREAT - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_WORD_ISN_T_IT_QUES -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_LIKE - .2byte EC_WORD_A - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_WORD_YEAH_YEAH - .2byte EC_WORD_EXCL_EXCL -@ loss speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_GET - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_IN - .2byte EC_WORD_THAT - .2byte EC_MOVE(WHIRLPOOL) - .4byte gSlateportBattleTentTrainerMons_Davon - -@ 4 - .4byte FACILITY_CLASS_LADY - .string "GLENDA$", 8 -@ pre-battle speech - .2byte EC_WORD_CONVERSATION - .2byte EC_WORD_CAN - .2byte EC_WORD_WAIT - .2byte EC_WORD_UNTIL - .2byte EC_WORD_I - .2byte EC_WORD_WIN -@ win speech - .2byte EC_WORD_FABULOUS - .2byte EC_WORD_EXCL - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_ROCK -@ loss speech - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_WASN_T - .2byte EC_WORD_SERIOUS - .4byte gSlateportBattleTentTrainerMons_Glenda - -@ 5 - .4byte FACILITY_CLASS_BEAUTY - .string "HELENA$", 8 -@ pre-battle speech - .2byte EC_WORD_DOES - .2byte EC_WORD_MY - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_INTIMIDATE - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_SORRY - .2byte EC_WORD_BUT - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_BORING -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DO - .2byte EC_WORD_SO - .2byte EC_WORD_ENJOY - .2byte EC_WORD_THIS - .2byte EC_WORD_EXCL - .4byte gSlateportBattleTentTrainerMons_Helena - -@ 6 - .4byte FACILITY_CLASS_RICH_BOY - .string "RODOLFO$", 8 -@ pre-battle speech - .2byte EC_WORD_GO - .2byte EC_WORD_GET - .2byte EC_WORD_A - .2byte EC_POKEMON(WHISCASH) - .2byte EC_WORD_FOR - .2byte EC_WORD_ME -@ win speech - .2byte EC_WORD_AWW - .2byte EC_WORD_YOU - .2byte EC_WORD_DON_T - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_POKEMON(WHISCASH) -@ loss speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_A - .2byte EC_POKEMON(WHISCASH) - .2byte EC_WORD_BADLY - .4byte gSlateportBattleTentTrainerMons_Rodolfo - -@ 7 - .4byte FACILITY_CLASS_POKEMANIAC - .string "DAVION$", 8 -@ pre-battle speech - .2byte EC_WORD_GRAAAH - .2byte EC_WORD_GRAAAH - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_GRAAAH - .2byte EC_WORD_GRAAAH - .2byte EC_WORD_EXCL_EXCL -@ win speech - .2byte EC_MOVE2(ROAR) - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_MOVE2(ROAR) - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_URGH - .2byte EC_WORD_WAAAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gSlateportBattleTentTrainerMons_Davion - -@ 8 - .4byte FACILITY_CLASS_SWIMMER_M - .string "KENDALL$", 8 -@ pre-battle speech - .2byte EC_WORD_A_LITTLE - .2byte EC_MOVE2(PETAL_DANCE) - .2byte EC_WORD_TO - .2byte EC_WORD_PLEASE - .2byte EC_WORD_YOU - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_DO - .2byte EC_WORD_THIS - .2byte EC_WORD_ONLY - .2byte EC_WORD_FOR - .2byte EC_WORD_WORK -@ loss speech - .2byte EC_WORD_HOW - .2byte EC_WORD_COULD - .2byte EC_WORD_YOU - .2byte EC_MOVE2(POUND) - .2byte EC_WORD_ME - .2byte EC_WORD_QUES - .4byte gSlateportBattleTentTrainerMons_Kendall - -@ 9 - .4byte FACILITY_CLASS_CAMPER - .string "COLTEN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_GO - .2byte EC_WORD_RUN - .2byte EC_WORD_AROUND -@ win speech - .2byte EC_WORD_YAY - .2byte EC_WORD_EXCL - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_RUN - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_A - .2byte EC_WORD_SWIFT_SWIM - .2byte EC_WORD_WOULD - .2byte EC_WORD_BE - .2byte EC_WORD_GOOD - .2byte EC_WORD_TOO - .4byte gSlateportBattleTentTrainerMons_Colten - -@ 10 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "IRVIN$", 8 -@ pre-battle speech - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_WORD_LOOK - .2byte EC_WORD_AT - .2byte EC_WORD_MY - .2byte EC_MOVE(CONFUSE_RAY) -@ win speech - .2byte EC_WORD_YAHOO - .2byte EC_WORD_MY - .2byte EC_MOVE(CONFUSE_RAY) - .2byte EC_WORD_IS - .2byte EC_WORD_THE - .2byte EC_WORD_BEST -@ loss speech - .2byte EC_WORD_GWAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_SORRY - .2byte EC_WORD_EXCL - .4byte gSlateportBattleTentTrainerMons_Irvin - -@ 11 - .4byte FACILITY_CLASS_GENTLEMAN - .string "SHAUN$", 8 -@ pre-battle speech - .2byte EC_WORD_LISTEN - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_YOU - .2byte EC_WORD_AREN_T - .2byte EC_WORD_VERY - .2byte EC_WORD_GOOD -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte EC_WORD_I - .2byte EC_WORD_WAS - .2byte EC_WORD_RIGHT -@ loss speech - .2byte EC_WORD_YES - .2byte EC_WORD_YES - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_QUITE - .2byte EC_WORD_SOMETHING - .4byte gSlateportBattleTentTrainerMons_Shaun - -@ 12 - .4byte FACILITY_CLASS_GUITARIST - .string "KYLER$", 8 -@ pre-battle speech - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_YAY -@ loss speech - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_WOW - .4byte gSlateportBattleTentTrainerMons_Kyler - -@ 13 - .4byte FACILITY_CLASS_SCHOOL_KID_F - .string "MAGGIE$", 8 -@ pre-battle speech - .2byte EC_POKEMON(VULPIX) - .2byte EC_POKEMON(XATU) - .2byte EC_POKEMON2(UMBREON) - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_UM - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_POKEMON(NOSEPASS) - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_UM - .2byte EC_POKEMON(SEVIPER) - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_POKEMON(NOSEPASS) - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_UM - .2byte EC_POKEMON2(SNORLAX) - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_UH_OH - .4byte gSlateportBattleTentTrainerMons_Maggie - -@ 14 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "STEPHON$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_ENJOY - .2byte EC_WORD_AN - .2byte EC_WORD_EGG -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_ENJOY - .2byte EC_WORD_THIS - .2byte EC_WORD_TASTY - .2byte EC_WORD_VICTORY -@ loss speech - .2byte EC_WORD_AWFUL - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_JUST - .2byte EC_WORD_AWFUL - .2byte EC_WORD_EXCL_EXCL - .4byte gSlateportBattleTentTrainerMons_Stephon - -@ 15 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "REBECCA$", 8 -@ pre-battle speech - .2byte EC_WORD_THAT - .2byte EC_WORD_EGG - .2byte EC_WORD_HAS - .2byte EC_WORD_A - .2byte EC_WORD_TASTY - .2byte EC_WORD_SHINE -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_EXCL - .2byte EC_WORD_SMELL - .2byte EC_WORD_THAT - .2byte EC_WORD_STENCH -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T - .2byte EC_WORD_MAKE - .2byte EC_WORD_ME - .2byte EC_WORD_STOP - .2byte EC_WORD_ELLIPSIS - .4byte gSlateportBattleTentTrainerMons_Rebecca - -@ 16 - .4byte FACILITY_CLASS_POKEFAN_1 - .string "REGGIE$", 8 -@ pre-battle speech - .2byte EC_WORD_POKEMON - .2byte EC_WORD_COME - .2byte EC_WORD_BEFORE - .2byte EC_WORD_MONEY - .2byte EC_WORD_OR - .2byte EC_WORD_FAMILY -@ win speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .2byte EC_WORD_IS - .2byte EC_WORD_MAKING - .2byte EC_WORD_ME - .2byte EC_WORD_STRONG -@ loss speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHY - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_THICK - .2byte EC_WORD_ELLIPSIS - .4byte gSlateportBattleTentTrainerMons_Reggie - -@ 17 - .4byte FACILITY_CLASS_POKEFAN_2 - .string "JANAE$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_JUST - .2byte EC_WORD_ADORE - .2byte EC_WORD_YOUR - .2byte EC_WORD_TOUGH - .2byte EC_WORD_LOOK -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_HOW - .2byte EC_WORD_YOU - .2byte EC_MOVE2(STRUGGLE) - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_A - .2byte EC_WORD_MEAN - .2byte EC_WORD_AND - .2byte EC_WORD_AWFUL - .2byte EC_WORD_TRAINER - .4byte gSlateportBattleTentTrainerMons_Janae - -@ 18 - .4byte FACILITY_CLASS_EXPERT_M - .string "CAIDEN$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(CURSE) - .2byte EC_WORD_WILL - .2byte EC_WORD_BREAK - .2byte EC_WORD_YOUR - .2byte EC_WORD_SPIRIT -@ win speech - .2byte EC_MOVE2(CURSE) - .2byte EC_WORD_QUES - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_LIE - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(CURSE) - .2byte EC_WORD_WILL - .2byte EC_WORD_LAST - .2byte EC_WORD_FOREVER - .2byte -1 - .4byte gSlateportBattleTentTrainerMons_Caiden - -@ 19 - .4byte FACILITY_CLASS_EXPERT_2 - .string "KIRSTEN$", 8 -@ pre-battle speech - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_A - .2byte EC_WORD_BATTLE - .2byte EC_WORD_YOU - .2byte EC_WORD_SAID - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_STRONG - .2byte EC_WORD_BUT - .2byte EC_WORD_NOT - .2byte EC_WORD_STRONG - .2byte EC_WORD_ENOUGH -@ loss speech - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_I - .2byte EC_WORD_SURRENDER - .2byte EC_WORD_TO - .2byte EC_WORD_YOUR - .2byte EC_MOVE(STRENGTH) - .4byte gSlateportBattleTentTrainerMons_Kirsten - -@ 20 - .4byte FACILITY_CLASS_YOUNGSTER - .string "KURTIS$", 8 -@ pre-battle speech - .2byte EC_WORD_SORRY - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_GET - .2byte EC_MOVE2(BEAT_UP) -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_SAID - .2byte EC_WORD_WE - .2byte EC_WORD_WOULD - .2byte EC_MOVE2(POUND) - .2byte EC_WORD_YOU -@ loss speech - .2byte EC_WORD_HOW - .2byte EC_WORD_DID - .2byte EC_WORD_I - .2byte EC_WORD_GET - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_QUES - .4byte gSlateportBattleTentTrainerMons_Kurtis - -@ 21 - .4byte FACILITY_CLASS_FISHERMAN - .string "STEFAN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_ONLY - .2byte EC_WORD_WANT - .2byte EC_WORD_CUTE - .2byte EC_WORD_POKEMON - .2byte -1 -@ win speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_IS - .2byte EC_WORD_IT - .2byte EC_WORD_TO - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_KIND - .2byte EC_WORD_OF - .2byte EC_WORD_AWESOME - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gSlateportBattleTentTrainerMons_Stefan - -@ 22 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "AVERY$", 8 -@ pre-battle speech - .2byte EC_WORD_TOYS - .2byte EC_WORD_EXCL - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_MORE - .2byte EC_WORD_TOYS -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_SOME - .2byte EC_WORD_EASY - .2byte EC_WORD_MONEY - .2byte EC_WORD_FAST -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_WORK - .2byte EC_WORD_FOR - .2byte EC_WORD_MONEY - .4byte gSlateportBattleTentTrainerMons_Avery - -@ 23 - .4byte FACILITY_CLASS_NINJA_BOY - .string "DWANE$", 8 -@ pre-battle speech - .2byte EC_WORD_MMM - .2byte EC_WORD_TASTY - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_WONDER - .2byte EC_WORD_WHAT - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_MMM - .2byte EC_WORD_MMM - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_YOU - .2byte EC_WORD_DON_T - .2byte EC_WORD_KNOW -@ loss speech - .2byte EC_WORD_MMM - .2byte EC_WORD_MMM - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_THIS_IS_IT_EXCL - .2byte -1 - .4byte gSlateportBattleTentTrainerMons_Dwane - -@ 24 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "MCKENNA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_SMALL - .2byte EC_WORD_TALK - .2byte EC_WORD_LET_S - .2byte EC_WORD_GO -@ win speech - .2byte EC_WORD_YUP - .2byte EC_WORD_THAT_S - .2byte EC_WORD_THAT - .2byte -1 - .2byte -1 - .2byte -1 -@ loss speech - .2byte EC_WORD_KTHX_BYE - .2byte -1 - .2byte -1 - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gSlateportBattleTentTrainerMons_Mckenna - -@ 25 - .4byte FACILITY_CLASS_SWIMMER_F - .string "CAMRYN$", 8 -@ pre-battle speech - .2byte EC_WORD_MR - .2byte EC_WORD_JUDGE - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_OUR - .2byte EC_WORD_TRUST -@ win speech - .2byte EC_WORD_YES_SIR_EXCL - .2byte EC_WORD_WE_RE - .2byte EC_WORD_NO_1 - .2byte EC_WORD_IN - .2byte EC_WORD_THIS - .2byte EC_WORD_CONTEST -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WON_T - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_MY - .2byte EC_WORD_IDOL - .2byte EC_WORD_DREAM - .4byte gSlateportBattleTentTrainerMons_Camryn - -@ 26 - .4byte FACILITY_CLASS_PICNICKER - .string "NATASHA$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_OVER - .2byte EC_WORD_TO - .2byte EC_WORD_MY - .2byte EC_WORD_PLACE - .2byte EC_WORD_OK_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_COME_ON - .2byte EC_WORD_OVER - .2byte EC_WORD_IT - .2byte EC_WORD_WILL - .2byte EC_WORD_BE - .2byte EC_WORD_GREAT -@ loss speech - .2byte EC_WORD_AWW - .2byte EC_WORD_WON_T - .2byte EC_WORD_YOU - .2byte EC_WORD_COME_OVER - .2byte EC_WORD_QUES - .2byte -1 - .4byte gSlateportBattleTentTrainerMons_Natasha - -@ 27 - .4byte FACILITY_CLASS_SAILOR - .string "AUSTYN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_CARE - .2byte EC_WORD_HOW - .2byte EC_WORD_WE - .2byte EC_WORD_MATCH_UP -@ win speech - .2byte EC_WORD_HAH - .2byte EC_WORD_BACK - .2byte EC_WORD_TO - .2byte EC_WORD_SCHOOL - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_STUDY - .2byte EC_WORD_MY - .2byte EC_WORD_LESSONS - .4byte gSlateportBattleTentTrainerMons_Austyn - -@ 28 - .4byte FACILITY_CLASS_COLLECTOR - .string "DONOVAN$", 8 -@ pre-battle speech - .2byte EC_WORD_OH - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_SLIMY - .2byte EC_WORD_ALL - .2byte EC_WORD_OVER -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_GOING - .2byte EC_WORD_DOWN - .2byte EC_WORD_THE - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_WORD_HAHAHA -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NATURALLY - .2byte EC_WORD_SLIMY - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .2byte EC_WORD_I_AM - .4byte gSlateportBattleTentTrainerMons_Donovan - -@ 29 - .4byte FACILITY_CLASS_LASS - .string "TAMIA$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_ANGRY - .2byte EC_WORD_WITH - .2byte EC_WORD_MY - .2byte EC_WORD_FATHER - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_REALLY - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_MY - .2byte EC_WORD_FATHER - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_JUST - .2byte EC_WORD_SO - .2byte EC_WORD_ADORE - .2byte EC_WORD_MY - .2byte EC_WORD_FATHER - .4byte gSlateportBattleTentTrainerMons_Tamia diff --git a/data/battle_frontier/verdanturf_battle_tent_mons.inc b/data/battle_frontier/verdanturf_battle_tent_mons.inc deleted file mode 100644 index ec3404b17..000000000 --- a/data/battle_frontier/verdanturf_battle_tent_mons.inc +++ /dev/null @@ -1,316 +0,0 @@ - .align 2 -gVerdanturfBattleTentMons:: @ 85DEC28 -@ 0 - .2byte SPECIES_POOCHYENA - .2byte MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL - .byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 1 - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 2 - .2byte SPECIES_DUSTOX - .2byte MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH - .byte BATTLE_FRONTIER_ITEM_SILVER_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 3 - .2byte SPECIES_TAILLOW - .2byte MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL - .byte BATTLE_FRONTIER_ITEM_ORAN_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 4 - .2byte SPECIES_SHROOMISH - .2byte MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_RASH - -@ 5 - .2byte SPECIES_MACHOP - .2byte MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_LONELY - -@ 6 - .2byte SPECIES_MAGIKARP - .2byte MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 7 - .2byte SPECIES_BARBOACH - .2byte MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK - .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY - .byte F_EV_SPREAD_SPEED - .4byte NATURE_HASTY - -@ 8 - .2byte SPECIES_WINGULL - .2byte MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC - .byte BATTLE_FRONTIER_ITEM_DRAGON_FANG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_IMPISH - -@ 9 - .2byte SPECIES_ARON - .2byte MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 10 - .2byte SPECIES_NUMEL - .2byte MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL - .byte BATTLE_FRONTIER_ITEM_CHARCOAL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_SASSY - -@ 11 - .2byte SPECIES_SWALOT - .2byte MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA - .byte BATTLE_FRONTIER_ITEM_POISON_BARB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 12 - .2byte SPECIES_KECLEON - .2byte MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIET - -@ 13 - .2byte SPECIES_BALTOY - .2byte MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 14 - .2byte SPECIES_NINJASK - .2byte MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 15 - .2byte SPECIES_MAKUHITA - .2byte MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 16 - .2byte SPECIES_SWABLU - .2byte MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MILD - -@ 17 - .2byte SPECIES_GOLDEEN - .2byte MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_GENTLE - -@ 18 - .2byte SPECIES_LOTAD - .2byte MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_IAPAPA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 19 - .2byte SPECIES_NUMEL - .2byte MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL - .byte BATTLE_FRONTIER_ITEM_CHARCOAL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_RELAXED - -@ 20 - .2byte SPECIES_LINOONE - .2byte MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 21 - .2byte SPECIES_SEVIPER - .2byte MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 22 - .2byte SPECIES_SKARMORY - .2byte MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_MACHO_BRACE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_BASHFUL - -@ 23 - .2byte SPECIES_SWELLOW - .2byte MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC - .byte BATTLE_FRONTIER_ITEM_SHARP_BEAK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 24 - .2byte SPECIES_GOLDEEN - .2byte MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_GENTLE - -@ 25 - .2byte SPECIES_ELECTRIKE - .2byte MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MILD - -@ 26 - .2byte SPECIES_NUZLEAF - .2byte MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF - .byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 27 - .2byte SPECIES_ARON - .2byte MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 28 - .2byte SPECIES_MIGHTYENA - .2byte MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 29 - .2byte SPECIES_SOLROCK - .2byte MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 30 - .2byte SPECIES_GRAVELER - .2byte MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_IMPISH - -@ 31 - .2byte SPECIES_KADABRA - .2byte MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 32 - .2byte SPECIES_VOLTORB - .2byte MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_BASHFUL - -@ 33 - .2byte SPECIES_MAGNEMITE - .2byte MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE - .byte BATTLE_FRONTIER_ITEM_MAGNET - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SERIOUS - -@ 34 - .2byte SPECIES_PELIPPER - .2byte MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_FIGY_BERRY - .byte 0 - .4byte NATURE_BRAVE - -@ 35 - .2byte SPECIES_LOUDRED - .2byte MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 36 - .2byte SPECIES_MARILL - .2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_JOLLY - -@ 37 - .2byte SPECIES_TRAPINCH - .2byte MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK - .byte BATTLE_FRONTIER_ITEM_NONE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 38 - .2byte SPECIES_TENTACOOL - .2byte MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 39 - .2byte SPECIES_VIGOROTH - .2byte MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER - .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 40 - .2byte SPECIES_WAILMER - .2byte MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 41 - .2byte SPECIES_ILLUMISE - .2byte MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 42 - .2byte SPECIES_MACHOKE - .2byte MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_CALM - -@ 43 - .2byte SPECIES_WHISMUR - .2byte MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 44 - .2byte SPECIES_CACNEA - .2byte MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SERIOUS diff --git a/data/battle_frontier/verdanturf_battle_tent_trainer_mons.inc b/data/battle_frontier/verdanturf_battle_tent_trainer_mons.inc deleted file mode 100644 index eda9f200a..000000000 --- a/data/battle_frontier/verdanturf_battle_tent_trainer_mons.inc +++ /dev/null @@ -1,254 +0,0 @@ - .align 1 -gVerdanturfBattleTentTrainerMons_Brenna:: @ 85DE48C - .2byte 4 - .2byte 11 - .2byte 13 - .2byte 18 - .2byte 26 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Dilan:: @ 85DE498 - .2byte 30 - .2byte 37 - .2byte 13 - .2byte 29 - .2byte 42 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Eliana:: @ 85DE4A4 - .2byte 6 - .2byte 7 - .2byte 17 - .2byte 18 - .2byte 40 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Markus:: @ 85DE4B0 - .2byte 6 - .2byte 7 - .2byte 18 - .2byte 24 - .2byte 38 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Caitlyn:: @ 85DE4BC - .2byte 0 - .2byte 12 - .2byte 25 - .2byte 28 - .2byte 22 - .2byte 44 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Desiree:: @ 85DE4CA - .2byte 8 - .2byte 12 - .2byte 21 - .2byte 22 - .2byte 31 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Ronald:: @ 85DE4D6 - .2byte 1 - .2byte 20 - .2byte 23 - .2byte 25 - .2byte 32 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Ashten:: @ 85DE4E2 - .2byte 9 - .2byte 12 - .2byte 27 - .2byte 37 - .2byte 43 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Gerard:: @ 85DE4EE - .2byte 36 - .2byte 7 - .2byte 34 - .2byte 6 - .2byte 40 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Bradly:: @ 85DE4FA - .2byte 26 - .2byte 3 - .2byte 0 - .2byte 2 - .2byte 17 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Dennis:: @ 85DE506 - .2byte 14 - .2byte 37 - .2byte 2 - .2byte 38 - .2byte 27 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Prestin:: @ 85DE512 - .2byte 31 - .2byte 28 - .2byte 22 - .2byte 25 - .2byte 44 - .2byte 43 - .2byte 41 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Ernesto:: @ 85DE522 - .2byte 33 - .2byte 32 - .2byte 25 - .2byte 35 - .2byte 34 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Nala:: @ 85DE52E - .2byte 1 - .2byte 4 - .2byte 8 - .2byte 11 - .2byte 17 - .2byte 40 - .2byte 34 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Darnell:: @ 85DE53E - .2byte 0 - .2byte 29 - .2byte 35 - .2byte 37 - .2byte 39 - .2byte 43 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Ashlyn:: @ 85DE54C - .2byte 29 - .2byte 36 - .2byte 32 - .2byte 30 - .2byte 17 - .2byte 6 - .2byte 44 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Addison:: @ 85DE55C - .2byte 0 - .2byte 1 - .2byte 16 - .2byte 31 - .2byte 6 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Justine:: @ 85DE568 - .2byte 0 - .2byte 1 - .2byte 16 - .2byte 36 - .2byte 18 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Tyson:: @ 85DE574 - .2byte 5 - .2byte 15 - .2byte 22 - .2byte 30 - .2byte 16 - .2byte 39 - .2byte 43 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Laila:: @ 85DE584 - .2byte 5 - .2byte 15 - .2byte 19 - .2byte 24 - .2byte 41 - .2byte 43 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Waren:: @ 85DE592 - .2byte 0 - .2byte 9 - .2byte 10 - .2byte 11 - .2byte 23 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Tobias:: @ 85DE59E - .2byte 6 - .2byte 7 - .2byte 24 - .2byte 38 - .2byte 40 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Josiah:: @ 85DE5AA - .2byte 8 - .2byte 16 - .2byte 23 - .2byte 34 - .2byte 3 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Dion:: @ 85DE5B6 - .2byte 14 - .2byte 2 - .2byte 11 - .2byte 39 - .2byte 21 - .2byte 38 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Kenzie:: @ 85DE5C4 - .2byte 18 - .2byte 10 - .2byte 16 - .2byte 26 - .2byte 25 - .2byte 27 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Lillian:: @ 85DE5D2 - .2byte 24 - .2byte 34 - .2byte 36 - .2byte 38 - .2byte 5 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Lesley:: @ 85DE5DE - .2byte 26 - .2byte 0 - .2byte 18 - .2byte 13 - .2byte 25 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Marquis:: @ 85DE5EA - .2byte 24 - .2byte 34 - .2byte 5 - .2byte 15 - .2byte 7 - .2byte 42 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Freddy:: @ 85DE5F8 - .2byte 18 - .2byte 21 - .2byte 26 - .2byte 29 - .2byte 41 - .2byte -1 - -gVerdanturfBattleTentTrainerMons_Cecilia:: @ 85DE604 - .2byte 23 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 31 - .2byte -1 diff --git a/data/battle_frontier/verdanturf_battle_tent_trainers.inc b/data/battle_frontier/verdanturf_battle_tent_trainers.inc deleted file mode 100644 index b375ce811..000000000 --- a/data/battle_frontier/verdanturf_battle_tent_trainers.inc +++ /dev/null @@ -1,781 +0,0 @@ - .align 2 -gVerdanturfBattleTentTrainers:: @ 85DE610 -@ 0 - .4byte FACILITY_CLASS_AROMA_LADY - .string "BRENNA$", 8 -@ pre-battle speech - .2byte EC_WORD_NO - .2byte EC_WORD_DAYS - .2byte EC_WORD_GO - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_MY - .2byte EC_MOVE(FAKE_TEARS) -@ win speech - .2byte EC_WORD_OH - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_SO - .2byte EC_WORD_REFRESHING - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_ALL - .2byte EC_WORD_I - .2byte EC_WORD_EVER - .2byte EC_WORD_GET - .2byte EC_WORD_IS - .2byte EC_MOVE(TORMENT) - .4byte gVerdanturfBattleTentTrainerMons_Brenna - -@ 1 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "DILAN$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DON_T - .2byte EC_WORD_KNOW - .2byte EC_WORD_HOW - .2byte EC_WORD_BORED - .2byte EC_WORD_I_AM -@ win speech - .2byte EC_WORD_LOSING - .2byte EC_WORD_ISN_T - .2byte EC_WORD_EXCITING - .2byte EC_WORD_AT - .2byte EC_WORD_ALL - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_EXCITING - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_BYE_BYE - .2byte EC_WORD_TO - .2byte EC_WORD_BEING - .2byte EC_WORD_BORED - .4byte gVerdanturfBattleTentTrainerMons_Dilan - -@ 2 - .4byte FACILITY_CLASS_TUBER_1 - .string "ELIANA$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_ON - .2byte EC_WORD_A - .2byte EC_WORD_VACATION - .2byte EC_WORD_SOON -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_GET - .2byte EC_WORD_SOME - .2byte EC_WORD_MONEY -@ loss speech - .2byte EC_WORD_NO - .2byte EC_WORD_SLEEP - .2byte EC_WORD_UNTIL - .2byte EC_WORD_I - .2byte EC_WORD_GET - .2byte EC_WORD_HOME - .4byte gVerdanturfBattleTentTrainerMons_Eliana - -@ 3 - .4byte FACILITY_CLASS_TUBER_2 - .string "MARKUS$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SMART - .2byte EC_WORD_EXCL - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_I - .2byte EC_MOVE(SELF_DESTRUCT) -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_NON_STOP - .2byte EC_MOVE2(EXPLOSION) - .2byte EC_WORD_OF - .2byte EC_WORD_JOY -@ loss speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_LOST - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_TIME - .2byte EC_WORD_TO - .2byte EC_MOVE(SELF_DESTRUCT) - .4byte gVerdanturfBattleTentTrainerMons_Markus - -@ 4 - .4byte FACILITY_CLASS_LADY - .string "CAITLYN$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_BORED - .2byte EC_WORD_OF - .2byte EC_WORD_BEING - .2byte EC_WORD_AN - .2byte EC_WORD_IDOL -@ win speech - .2byte EC_WORD_A - .2byte EC_WORD_BATTLE - .2byte EC_WORD_IS - .2byte EC_WORD_BEST - .2byte EC_WORD_FOR - .2byte EC_WORD_HAPPINESS -@ loss speech - .2byte EC_WORD_LOSING - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_BUG - .2byte EC_WORD_ME - .2byte EC_WORD_AT - .2byte EC_WORD_ALL - .4byte gVerdanturfBattleTentTrainerMons_Caitlyn - -@ 5 - .4byte FACILITY_CLASS_BEAUTY - .string "DESIREE$", 8 -@ pre-battle speech - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_MY - .2byte EC_WORD_BEAUTY - .2byte EC_MOVE(ASTONISH) - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_DID - .2byte EC_WORD_I - .2byte EC_WORD_INTIMIDATE - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_DID - .2byte EC_WORD_NOTHING - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU - .4byte gVerdanturfBattleTentTrainerMons_Desiree - -@ 6 - .4byte FACILITY_CLASS_RICH_BOY - .string "RONALD$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_ON - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_BATTLE - .2byte EC_WORD_SERIOUSLY - .2byte -1 -@ win speech - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_QUES - .2byte -1 - .2byte EC_WORD_THAT_S - .2byte EC_WORD_REALLY - .2byte EC_WORD_WEAK -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_DO - .2byte EC_WORD_A - .2byte EC_MOVE2(BATON_PASS) - .4byte gVerdanturfBattleTentTrainerMons_Ronald - -@ 7 - .4byte FACILITY_CLASS_POKEMANIAC - .string "ASHTEN$", 8 -@ pre-battle speech - .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_EXCITING - .2byte EC_WORD_BATTLE - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_WIMPY - .2byte EC_WORD_AND - .2byte EC_WORD_BORING -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_AN - .2byte EC_WORD_EXCITING - .2byte EC_WORD_LOSS - .2byte EC_WORD_WOW - .2byte EC_WORD_EXCL - .4byte gVerdanturfBattleTentTrainerMons_Ashten - -@ 8 - .4byte FACILITY_CLASS_SWIMMER_M - .string "GERARD$", 8 -@ pre-battle speech - .2byte EC_WORD_LOOK - .2byte EC_WORD_AT - .2byte EC_WORD_MY - .2byte EC_WORD_SUPER - .2byte EC_MOVE2(TEETER_DANCE) - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_HARD - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_AM - .2byte EC_WORD_I - .2byte EC_WORD_OK_QUES -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WON_T - .2byte EC_WORD_FORGIVE - .2byte EC_WORD_YOU - .2byte EC_WORD_FOR - .2byte EC_WORD_THAT - .4byte gVerdanturfBattleTentTrainerMons_Gerard - -@ 9 - .4byte FACILITY_CLASS_CAMPER - .string "BRADLY$", 8 -@ pre-battle speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_LONESOME - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_VACATION - .2byte EC_WORD_ALONE -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_MOVE(WITHDRAW) - .2byte EC_WORD_INSIDE - .2byte EC_WORD_MY - .2byte EC_WORD_SHELL_ARMOR -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte EC_WORD_ALONE - .2byte EC_WORD_AS - .2byte EC_WORD_ALWAYS - .4byte gVerdanturfBattleTentTrainerMons_Bradly - -@ 10 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "DENNIS$", 8 -@ pre-battle speech - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_REALLY - .2byte EC_WORD_STRONG - .2byte EC_WORD_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_NICE - .2byte EC_WORD_GOING - .2byte EC_WORD_EXCL - .2byte EC_WORD_I - .2byte EC_WORD_WAS - .2byte EC_WORD_CHILD_S_PLAY - .4byte gVerdanturfBattleTentTrainerMons_Dennis - -@ 11 - .4byte FACILITY_CLASS_GENTLEMAN - .string "PRESTIN$", 8 -@ pre-battle speech - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_MOVE(NIGHTMARE) - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU -@ win speech - .2byte EC_WORD_FORGIVE - .2byte EC_WORD_ME - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_DREAM -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_WAKE_UP - .2byte EC_WORD_FROM - .2byte EC_WORD_THIS - .4byte gVerdanturfBattleTentTrainerMons_Prestin - -@ 12 - .4byte FACILITY_CLASS_GUITARIST - .string "ERNESTO$", 8 -@ pre-battle speech - .2byte EC_WORD_THIS - .2byte EC_WORD_PARTY - .2byte EC_WORD_GOES - .2byte EC_WORD_ON - .2byte EC_WORD_FOREVER - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_THE - .2byte EC_WORD_MUSIC - .2byte EC_WORD_PLAYS - .2byte EC_WORD_ON - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_END -@ loss speech - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL - .2byte EC_WORD_THE - .2byte EC_WORD_MUSIC - .2byte EC_WORD_CAN_T - .2byte EC_WORD_STOP - .4byte gVerdanturfBattleTentTrainerMons_Ernesto - -@ 13 - .4byte FACILITY_CLASS_SCHOOL_KID_F - .string "NALA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_THE - .2byte EC_WORD_WORLD - .2byte EC_WORD_MOVIE - .2byte EC_WORD_COLLECTION -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_LIKE - .2byte EC_WORD_RADIO - .2byte EC_WORD_VERY - .2byte EC_WORD_MUCH -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_REFUSE - .2byte EC_WORD_TO - .2byte EC_WORD_BELIEVE - .2byte EC_WORD_THIS - .2byte EC_WORD_EXCL - .4byte gVerdanturfBattleTentTrainerMons_Nala - -@ 14 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "DARNELL$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_GO_EASY - .2byte EC_WORD_ON - .2byte EC_WORD_YOU - .2byte -1 -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_SHOULD - .2byte EC_WORD_BE - .2byte EC_WORD_HIDDEN - .2byte EC_WORD_AWAY -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH - .2byte EC_WORD_TO - .2byte EC_WORD_TAKE - .2byte EC_WORD_ELLIPSIS - .4byte gVerdanturfBattleTentTrainerMons_Darnell - -@ 15 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "ASHLYN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_LOOK - .2byte EC_WORD_TOUGH - .2byte EC_WORD_DO - .2byte EC_WORD_I - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_OVER - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(TAUNT) - .2byte EC_WORD_YET -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MEAN - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gVerdanturfBattleTentTrainerMons_Ashlyn - -@ 16 - .4byte FACILITY_CLASS_POKEFAN_1 - .string "ADDISON$", 8 -@ pre-battle speech - .2byte EC_WORD_YES - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_WELL - .2byte EC_WORD_WASN_T - .2byte EC_WORD_THAT - .2byte EC_WORD_EASY - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_WAAAH - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_BUT - .2byte EC_WORD_WHY - .2byte EC_WORD_QUES - .4byte gVerdanturfBattleTentTrainerMons_Addison - -@ 17 - .4byte FACILITY_CLASS_POKEFAN_2 - .string "JUSTINE$", 8 -@ pre-battle speech - .2byte EC_WORD_YES - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_COME_ON - .2byte EC_WORD_I_AM - .2byte EC_WORD_READY -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_JUST - .2byte EC_WORD_NOT - .2byte EC_WORD_GOOD - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_WOWEE - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gVerdanturfBattleTentTrainerMons_Justine - -@ 18 - .4byte FACILITY_CLASS_EXPERT_M - .string "TYSON$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_ME - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_QUES - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MUCH - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_THIS - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_MAKE - .2byte EC_WORD_ME - .2byte EC_WORD_HAPPY - .2byte EC_WORD_EXCL - .4byte gVerdanturfBattleTentTrainerMons_Tyson - -@ 19 - .4byte FACILITY_CLASS_EXPERT_2 - .string "LAILA$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_ISN_T - .2byte EC_WORD_VERY - .2byte EC_WORD_COOL - .2byte -1 -@ win speech - .2byte EC_WORD_NOPE - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_COOL - .2byte EC_WORD_AT - .2byte EC_WORD_ALL - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_NOT - .2byte EC_WORD_COOL - .2byte EC_WORD_BUT - .2byte EC_WORD_YOU - .2byte EC_WORD_WON - .4byte gVerdanturfBattleTentTrainerMons_Laila - -@ 20 - .4byte FACILITY_CLASS_YOUNGSTER - .string "WAREN$", 8 -@ pre-battle speech - .2byte EC_WORD_DANGER - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_SENSE - .2byte EC_WORD_DANGER -@ win speech - .2byte EC_WORD_DID - .2byte EC_WORD_YOU - .2byte EC_WORD_BELIEVE - .2byte EC_WORD_MY - .2byte EC_WORD_LIE - .2byte EC_WORD_QUES_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_REALLY - .2byte EC_WORD_DID - .2byte EC_WORD_SENSE - .2byte EC_WORD_DANGER - .2byte EC_WORD_ELLIPSIS - .4byte gVerdanturfBattleTentTrainerMons_Waren - -@ 21 - .4byte FACILITY_CLASS_FISHERMAN - .string "TOBIAS$", 8 -@ pre-battle speech - .2byte EC_MOVE2(BARRIER) - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_NOW - .2byte EC_WORD_COME_ON - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_YOU - .2byte EC_WORD_MEAN - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_SHOULD - .2byte EC_WORD_KNOW - .2byte EC_WORD_THAT - .2byte EC_WORD_IT_S - .2byte EC_WORD_HOPELESS - .4byte gVerdanturfBattleTentTrainerMons_Tobias - -@ 22 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "JOSIAH$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_PROMISE - .2byte EC_WORD_TO - .2byte EC_MOVE(FLY) - .2byte EC_WORD_IF_I_LOSE - .2byte -1 -@ win speech - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte EC_WORD_YOU - .2byte EC_MOVE(FLY) - .2byte EC_WORD_INSTEAD -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_PROMISE - .2byte EC_WORD_TO - .2byte EC_MOVE(FLY) - .2byte EC_WORD_SOMETIME - .2byte EC_WORD_SOON - .4byte gVerdanturfBattleTentTrainerMons_Josiah - -@ 23 - .4byte FACILITY_CLASS_NINJA_BOY - .string "DION$", 8 -@ pre-battle speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_TRENDY - .2byte EC_WORD_UM - .2byte EC_WORD_BATTLE - .2byte EC_WORD_SOMETHING - .2byte -1 -@ win speech - .2byte EC_WORD_WAS - .2byte EC_WORD_IT - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_BATTLE - .2byte EC_WORD_DATE - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_WAS - .2byte EC_WORD_IT - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_BATTLE - .2byte EC_WORD_GOURMET - .2byte EC_WORD_QUES - .4byte gVerdanturfBattleTentTrainerMons_Dion - -@ 24 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "KENZIE$", 8 -@ pre-battle speech - .2byte EC_WORD_THE - .2byte EC_MOVE(MORNING_SUN) - .2byte EC_WORD_GIVES - .2byte EC_WORD_ME - .2byte EC_MOVE(STRENGTH) - .2byte -1 -@ win speech - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_MOVE2(MOONLIGHT) - .2byte EC_WORD_TOO - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_LIKE - .2byte EC_WORD_A - .2byte EC_WORD_TERRIBLE - .2byte EC_MOVE(SANDSTORM) - .2byte EC_WORD_ELLIPSIS - .4byte gVerdanturfBattleTentTrainerMons_Kenzie - -@ 25 - .4byte FACILITY_CLASS_SWIMMER_F - .string "LILLIAN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DO - .2byte EC_WORD_THINGS - .2byte EC_WORD_AT - .2byte EC_WORD_MY - .2byte EC_WORD_OWN_TEMPO -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_QUES - .2byte EC_WORD_WHAT - .2byte EC_WORD_A - .2byte EC_WORD_SURPRISE -@ loss speech - .2byte EC_WORD_AWW - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_A - .2byte EC_WORD_NAP - .4byte gVerdanturfBattleTentTrainerMons_Lillian - -@ 26 - .4byte FACILITY_CLASS_PICNICKER - .string "LESLEY$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SHOULD - .2byte EC_WORD_NOT - .2byte EC_WORD_BE - .2byte EC_WORD_LOLLING - .2byte EC_WORD_ABOUT -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SHOULD - .2byte EC_WORD_GET - .2byte EC_WORD_UP - .2byte EC_WORD_EARLIER - .2byte -1 -@ loss speech - .2byte EC_WORD_THIS - .2byte EC_WORD_SHOULD - .2byte EC_WORD_NOT - .2byte EC_WORD_BE - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_EXCL - .4byte gVerdanturfBattleTentTrainerMons_Lesley - -@ 27 - .4byte FACILITY_CLASS_SAILOR - .string "MARQUIS$", 8 -@ pre-battle speech - .2byte EC_WORD_NONE - .2byte EC_WORD_OF - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_MAKING - .2byte EC_WORD_SENSE -@ win speech - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte EC_WORD_THIS - .2byte EC_WORD_JUST - .2byte EC_WORD_ISN_T - .2byte EC_WORD_NORMAL -@ loss speech - .2byte EC_WORD_SHOULD - .2byte EC_WORD_I - .2byte EC_WORD_CAUSE - .2byte EC_WORD_AN - .2byte EC_MOVE(UPROAR) - .2byte EC_WORD_QUES - .4byte gVerdanturfBattleTentTrainerMons_Marquis - -@ 28 - .4byte FACILITY_CLASS_COLLECTOR - .string "FREDDY$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_ADORE - .2byte EC_WORD_THIS - .2byte EC_WORD_CUTE - .2byte EC_WORD_TELEVISION - .2byte EC_WORD_IDOL -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_SO - .2byte EC_WORD_FUNNY - .2byte EC_WORD_WHEN - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_ANGRY -@ loss speech - .2byte EC_WORD_LATE - .2byte EC_WORD_NIGHT - .2byte EC_WORD_TELEVISION - .2byte EC_WORD_IS - .2byte EC_WORD_MY - .2byte EC_WORD_LIFE - .4byte gVerdanturfBattleTentTrainerMons_Freddy - -@ 29 - .4byte FACILITY_CLASS_LASS - .string "CECILIA$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_FABULOUS - .2byte EC_WORD_CUTENESS - .2byte EC_WORD_IS - .2byte EC_WORD_IN - .2byte EC_WORD_FASHION -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_NO - .2byte EC_WORD_MATCH - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_CUTE_CHARM -@ loss speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_FASHION - .2byte EC_WORD_SENSE - .2byte EC_WORD_QUES - .4byte gVerdanturfBattleTentTrainerMons_Cecilia diff --git a/data/battle_tower.s b/data/battle_tower.s index 9f7e1ade4..5c3f4cc54 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -40,640 +40,11 @@ sRubyFacilityClassToEmerald:: @ 85DCF40 .byte 0x30, 0x36, 0x31, 0x37, 0x32, 0x38, 0x33, 0x1c, 0x34, 0x39, 0x35, 0x3a, 0x38, 0x05, 0x39, 0x3b, 0x3a, 0x3c, 0x3b, 0x3d, 0x3c, 0x3e, 0x3d, 0x3f, 0x3e, 0x40, 0x3f, 0x41, 0x40, 0x42, 0x41, 0x02 .byte 0x42, 0x44, 0x43, 0x45, 0x44, 0x46, 0x45, 0x08, 0x46, 0x18, 0x47, 0x47, 0x48, 0x43, 0x49, 0x00, 0x4a, 0x48, 0x4b, 0x49, 0x4c, 0x4a, 0x00, 0x00 - .align 2 -gUnknown_085DCFD8:: @ 85DCFD8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244383 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244413 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6 - .align 2 -gUnknown_085DCFEC:: @ 85DCFEC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244549 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5 - .align 2 -gUnknown_085DD000:: @ 85DD000 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244618 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244643 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4 - .align 2 -gUnknown_085DD014:: @ 85DD014 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7 - .align 2 -gUnknown_085DD028:: @ 85DD028 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244939 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244989 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6 - .align 2 -gUnknown_085DD03C:: @ 85DD03C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93 - .align 2 -gUnknown_085DD050:: @ 85DD050 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07 - .align 2 -gUnknown_085DD064:: @ 85DD064 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B - .align 2 -gUnknown_085DD078:: @ 85DD078 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98 - - .align 2 -gUnknown_085DD08C:: @ 85DD08C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245013 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245087 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0 - - .align 2 -gUnknown_085DD0A0:: @ 85DD0A0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245196 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A - - .align 2 -gUnknown_085DD0B4:: @ 85DD0B4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245406 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245464 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3 - - .align 2 -gUnknown_085DD0C8:: @ 85DD0C8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245535 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245656 - - .align 2 -gUnknown_085DD0DC:: @ 85DD0DC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245740 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F - - .align 2 -gUnknown_085DD0F0:: @ 85DD0F0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245851 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245923 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F - - .align 2 -gUnknown_085DD104:: @ 85DD104 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E - - .align 2 -gUnknown_085DD118:: @ 85DD118 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D - - .align 2 -gUnknown_085DD12C:: @ 85DD12C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07 - - .align 2 -gUnknown_085DD140:: @ 85DD140 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0 - - .align 2 -gUnknown_085DD154:: @ 85DD154 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC - - .align 2 -gUnknown_085DD168:: @ 85DD168 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246002 - - .align 2 -gUnknown_085DD17C:: @ 85DD17C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246020 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246051 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246082 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D - - .align 2 -gUnknown_085DD190:: @ 85DD190 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5 - - .align 2 -gUnknown_085DD1A4:: @ 85DD1A4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246244 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4 - - .align 2 -gUnknown_085DD1B8:: @ 85DD1B8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF - - .align 2 -gUnknown_085DD1CC:: @ 85DD1CC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246449 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246478 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246529 - - .align 2 -gUnknown_085DD1E0:: @ 85DD1E0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246571 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246605 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A - - .align 2 -gUnknown_085DD1F4:: @ 85DD1F4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246662 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246686 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A - - .align 2 -gUnknown_085DD208:: @ 85DD208 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246741 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246760 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246791 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6 - - .align 2 -gUnknown_085DD21C:: @ 85DD21C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246831 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246864 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE - - .align 2 -gUnknown_085DD230:: @ 85DD230 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1 - - .align 2 -gUnknown_085DD244:: @ 85DD244 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7 - - .align 2 -gUnknown_085DD258:: @ 85DD258 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9 - - .align 2 -gUnknown_085DD26C:: @ 85DD26C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9 - - .align 2 -gUnknown_085DD280:: @ 85DD280 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3 - - .align 2 -gUnknown_085DD294:: @ 85DD294 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE - - .align 2 -gUnknown_085DD2A8:: @ 85DD2A8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247013 - - .align 2 -gUnknown_085DD2BC:: @ 85DD2BC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A - - .align 2 -gUnknown_085DD2D0:: @ 85DD2D0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247238 - - .align 2 -gUnknown_085DD2E4:: @ 85DD2E4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247268 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247291 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247313 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247348 - - .align 2 -gUnknown_085DD2F8:: @ 85DD2F8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247438 - - .align 2 -gUnknown_085DD30C:: @ 85DD30C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247470 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247484 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D - - .align 2 -gUnknown_085DD320:: @ 85DD32 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5 - - .align 2 -gUnknown_085DD334:: @ 85DD334 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247629 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247655 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED - - .align 2 -gUnknown_085DD348:: @ 85DD348 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247724 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247749 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247807 - - .align 2 -gUnknown_085DD35C:: @ 85DD35C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247838 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247854 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247889 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D - - .align 2 -gUnknown_085DD370:: @ 85DD370 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247942 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247991 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18 - - .align 2 -gUnknown_085DD384:: @ 85DD384 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16 - - .align 2 -gUnknown_085DD398:: @ 85DD398 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23 - - .align 2 -gUnknown_085DD3AC:: @ 85DD3AC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E - - .align 2 -gUnknown_085DD3C0:: @ 85DD3C0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E - - .align 2 -gUnknown_085DD3D4:: @ 85DD3D4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D - - .align 2 -gUnknown_085DD3E8:: @ 85DD3E8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248031 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E - - .align 2 -gUnknown_085DD3FC:: @ 85DD3FC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248128 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248151 - - .align 2 -gUnknown_085DD410:: @ 85DD410 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248221 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F - - .align 2 -gUnknown_085DD424:: @ 85DD424 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248297 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248321 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D - - .align 2 -gUnknown_085DD438:: @ 85DD438 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248369 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248401 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248431 - - .align 2 -gUnknown_085DD44C:: @ 85DD44C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248467 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248477 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248517 - - .align 2 -gUnknown_085DD460:: @ 85DD460 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248553 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248614 - - .align 2 -gUnknown_085DD474:: @ 85DD474 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248661 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248671 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF - - .align 2 -gUnknown_085DD488:: @ 85DD488 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248725 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248751 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248781 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7 - - .align 2 -gUnknown_085DD49C:: @ 85DD49C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248829 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248892 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248908 - - .align 2 -gUnknown_085DD4B0:: @ 85DD4B0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7 - - .align 2 -gUnknown_085DD4C4:: @ 85DD4C4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB - - .align 2 -gUnknown_085DD4D8:: @ 85DD4D8 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE - - .align 2 -gUnknown_085DD4EC:: @ 85DD4EC - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04 - - .align 2 -gUnknown_085DD500:: @ 85DD500 - .4byte 0x00000047, gUnknown_085DD118 - .4byte 0x0000002b, gUnknown_085DD12C - .4byte 0x00000000, gUnknown_085DD140 - .4byte 0x00000014, gUnknown_085DD154 - .4byte 0x0000002d, gUnknown_085DD168 - .4byte 0x00000013, gUnknown_085DD17C - .4byte 0x0000002f, gUnknown_085DD190 - .4byte 0x00000043, gUnknown_085DD1A4 - .4byte 0x00000026, gUnknown_085DD1B8 - .4byte 0x00000015, gUnknown_085DD1CC - .4byte 0x0000000a, gUnknown_085DD1E0 - .4byte 0x00000010, gUnknown_085DD1F4 - .4byte 0x0000000c, gUnknown_085DD208 - .4byte 0x00000042, gUnknown_085DD21C - .4byte 0x00000031, gUnknown_085DD230 - .4byte 0x00000030, gUnknown_085DD244 - .4byte 0x00000036, gUnknown_085DD258 - .4byte 0x0000002e, gUnknown_085DD26C - .4byte 0x00000011, gUnknown_085DD280 - .4byte 0x00000019, gUnknown_085DD294 - .4byte 0x00000020, gUnknown_085DD2A8 - .4byte 0x00000029, gUnknown_085DD2BC - .4byte 0x00000009, gUnknown_085DD2D0 - .4byte 0x00000016, gUnknown_085DD2E4 - .4byte 0x00000034, gUnknown_085DD2F8 - .4byte 0x00000004, gUnknown_085DD30C - .4byte 0x00000035, gUnknown_085DD320 - .4byte 0x00000037, gUnknown_085DD334 - .4byte 0x0000001d, gUnknown_085DD348 - .4byte 0x0000003a, gUnknown_085DD35C - .4byte 0x00000005, gUnknown_085DD370 - .4byte 0x00000044, gUnknown_085DD384 - .4byte 0x00000045, gUnknown_085DD398 - .4byte 0x0000000d, gUnknown_085DD3AC - .4byte 0x0000000e, gUnknown_085DD3C0 - .4byte 0x00000003, gUnknown_085DD3D4 - .4byte 0x00000012, gUnknown_085DD3E8 - .4byte 0x00000017, gUnknown_085DD3FC - .4byte 0x0000001a, gUnknown_085DD410 - .4byte 0x0000001b, gUnknown_085DD424 - .4byte 0x0000001c, gUnknown_085DD438 - .4byte 0x0000001e, gUnknown_085DD44C - .4byte 0x0000001f, gUnknown_085DD460 - .4byte 0x00000027, gUnknown_085DD474 - .4byte 0x00000002, gUnknown_085DD488 - .4byte 0x0000002a, gUnknown_085DD49C - .4byte 0x00000038, gUnknown_085DD4B0 - .4byte 0x00000032, gUnknown_085DD4C4 - .4byte 0x00000033, gUnknown_085DD4D8 - .4byte 0x00000007, gUnknown_085DD4EC - - .align 2 -gUnknown_085DD690:: @ 85DD690 - .4byte gUnknown_085DCFD8 - .4byte gUnknown_085DCFEC - .4byte gUnknown_085DD000 - .4byte gUnknown_085DD014 - .4byte gUnknown_085DD028 - .4byte gUnknown_085DD03C - .4byte gUnknown_085DD050 - .4byte gUnknown_085DD064 - .4byte gUnknown_085DD078 - .4byte gUnknown_085DD08C - .4byte gUnknown_085DD0A0 - .4byte gUnknown_085DD0B4 - .4byte gUnknown_085DD0C8 - .4byte gUnknown_085DD0DC - .4byte gUnknown_085DD0F0 - .4byte gUnknown_085DD104 - -sStevenMons:: @ 85DD6D0 - .byte 0x8f, 0x01, 0x1f, 0x2a, 0x02 - -gUnknown_085DD6D5:: @ 85DD6D5 - .byte 0x00, 0xfc, 0xfc, 0x00, 0x06, 0x00, 0x00 - - .align 1 -gUnknown_085DD6DC:: @ 85DD6DC - .2byte 0x0071, 0x005e, 0x0073, 0x00e8, 0x00e3, 0x2b1f, 0xfc08, 0x0000, 0x0600, 0x00fc, 0x005c, 0x014c, 0x00b6, 0x00d3, 0x0180, 0x2c1f - .2byte 0x0003, 0x00fc, 0xfc00, 0x0006, 0x0057, 0x00b6, 0x004c, 0x0151 - -@ 85DD70C - .include "data/battle_frontier/slateport_battle_tent_trainer_mons.inc" - -@ 85DDA14 - .include "data/battle_frontier/slateport_battle_tent_trainers.inc" - -@ 85DE02C - .include "data/battle_frontier/slateport_battle_tent_mons.inc" - -@ 85DE48C - .include "data/battle_frontier/verdanturf_battle_tent_trainer_mons.inc" - -@ 85DE610 - .include "data/battle_frontier/verdanturf_battle_tent_trainers.inc" - -@ 85DEC28 - .include "data/battle_frontier/verdanturf_battle_tent_mons.inc" - -@ 85DEEF8 - .include "data/battle_frontier/fallarbor_battle_tent_trainer_mons.inc" - -@ 85DF084 - .include "data/battle_frontier/fallarbor_battle_tent_trainers.inc" - -@ 85DF69C - .include "data/battle_frontier/fallarbor_battle_tent_mons.inc" diff --git a/include/battle_tower.h b/include/battle_tower.h index b6adcec0c..68f495524 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -78,4 +78,335 @@ u8 sub_81660B8(u8 facilityClass); bool32 ValidateBattleTowerRecord(u8 recordId); // unused void sub_8166188(void); +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248297[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247749[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246864[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248661[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246662[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248321[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244549[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246244[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244383[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248467[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248553[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246741[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248725[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244939[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247291[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245464[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247313[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247470[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245535[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247991[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246605[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246020[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246449[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246831[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247854[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246051[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248401[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248671[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247484[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247629[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244413[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248369[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248892[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248781[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246791[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246571[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247838[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247942[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248751[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247724[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244618[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245406[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245087[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245196[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245740[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248128[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248477[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245923[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248829[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245013[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246686[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246082[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245851[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246760[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246478[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; + #endif //GUARD_BATTLE_TOWER_H diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index b5ad4f072..55b14b642 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -41,4 +41,75 @@ // For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special. #define RESULTS_LINK_CONTEST 7 +#define F_EV_SPREAD_HP (1 << 0) +#define F_EV_SPREAD_ATTACK (1 << 1) +#define F_EV_SPREAD_DEFENSE (1 << 2) +#define F_EV_SPREAD_SPEED (1 << 3) +#define F_EV_SPREAD_SP_ATTACK (1 << 4) +#define F_EV_SPREAD_SP_DEFENSE (1 << 5) + +#define BATTLE_FRONTIER_ITEM_NONE 0 +#define BATTLE_FRONTIER_ITEM_KINGS_ROCK 1 +#define BATTLE_FRONTIER_ITEM_SITRUS_BERRY 2 +#define BATTLE_FRONTIER_ITEM_ORAN_BERRY 3 +#define BATTLE_FRONTIER_ITEM_CHESTO_BERRY 4 +#define BATTLE_FRONTIER_ITEM_HARD_STONE 5 +#define BATTLE_FRONTIER_ITEM_FOCUS_BAND 6 +#define BATTLE_FRONTIER_ITEM_PERSIM_BERRY 7 +#define BATTLE_FRONTIER_ITEM_MIRACLE_SEED 8 +#define BATTLE_FRONTIER_ITEM_BERRY_JUICE 9 +#define BATTLE_FRONTIER_ITEM_MACHO_BRACE 10 +#define BATTLE_FRONTIER_ITEM_SILVER_POWDER 11 +#define BATTLE_FRONTIER_ITEM_CHERI_BERRY 12 +#define BATTLE_FRONTIER_ITEM_BLACK_GLASSES 13 +#define BATTLE_FRONTIER_ITEM_BLACK_BELT 14 +#define BATTLE_FRONTIER_ITEM_SOUL_DEW 15 +#define BATTLE_FRONTIER_ITEM_CHOICE_BAND 16 +#define BATTLE_FRONTIER_ITEM_MAGNET 17 +#define BATTLE_FRONTIER_ITEM_SILK_SCARF 18 +#define BATTLE_FRONTIER_ITEM_WHITE_HERB 19 +#define BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE 20 +#define BATTLE_FRONTIER_ITEM_DEEP_SEA_TOOTH 21 +#define BATTLE_FRONTIER_ITEM_MYSTIC_WATER 22 +#define BATTLE_FRONTIER_ITEM_SHARP_BEAK 23 +#define BATTLE_FRONTIER_ITEM_QUICK_CLAW 24 +#define BATTLE_FRONTIER_ITEM_LEFTOVERS 25 +#define BATTLE_FRONTIER_ITEM_RAWST_BERRY 26 +#define BATTLE_FRONTIER_ITEM_LIGHT_BALL 27 +#define BATTLE_FRONTIER_ITEM_POISON_BARB 28 +#define BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE 29 +#define BATTLE_FRONTIER_ITEM_ASPEAR_BERRY 30 +#define BATTLE_FRONTIER_ITEM_SPELL_TAG 31 +#define BATTLE_FRONTIER_ITEM_BRIGHT_POWDER 32 +#define BATTLE_FRONTIER_ITEM_LEPPA_BERRY 33 +#define BATTLE_FRONTIER_ITEM_SCOPE_LENS 34 +#define BATTLE_FRONTIER_ITEM_TWISTED_SPOON 35 +#define BATTLE_FRONTIER_ITEM_METAL_COAT 36 +#define BATTLE_FRONTIER_ITEM_MENTAL_HERB 37 +#define BATTLE_FRONTIER_ITEM_CHARCOAL 38 +#define BATTLE_FRONTIER_ITEM_PECHA_BERRY 39 +#define BATTLE_FRONTIER_ITEM_SOFT_SAND 40 +#define BATTLE_FRONTIER_ITEM_LUM_BERRY 41 +#define BATTLE_FRONTIER_ITEM_DRAGON_SCALE 42 +#define BATTLE_FRONTIER_ITEM_DRAGON_FANG 43 +#define BATTLE_FRONTIER_ITEM_IAPAPA_BERRY 44 +#define BATTLE_FRONTIER_ITEM_WIKI_BERRY 45 +#define BATTLE_FRONTIER_ITEM_SEA_INCENSE 46 +#define BATTLE_FRONTIER_ITEM_SHELL_BELL 47 +#define BATTLE_FRONTIER_ITEM_SALAC_BERRY 48 +#define BATTLE_FRONTIER_ITEM_LANSAT_BERRY 49 +#define BATTLE_FRONTIER_ITEM_APICOT_BERRY 50 +#define BATTLE_FRONTIER_ITEM_STARF_BERRY 51 +#define BATTLE_FRONTIER_ITEM_LIECHI_BERRY 52 +#define BATTLE_FRONTIER_ITEM_STICK 53 +#define BATTLE_FRONTIER_ITEM_LAX_INCENSE 54 +#define BATTLE_FRONTIER_ITEM_AGUAV_BERRY 55 +#define BATTLE_FRONTIER_ITEM_FIGY_BERRY 56 +#define BATTLE_FRONTIER_ITEM_THICK_CLUB 57 +#define BATTLE_FRONTIER_ITEM_MAGO_BERRY 58 +#define BATTLE_FRONTIER_ITEM_METAL_POWDER 59 +#define BATTLE_FRONTIER_ITEM_PETAYA_BERRY 60 +#define BATTLE_FRONTIER_ITEM_LUCKY_PUNCH 61 +#define BATTLE_FRONTIER_ITEM_GANLON_BERRY 62 + #endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H diff --git a/src/battle_tower.c b/src/battle_tower.c index 165b6bf64..e865d4656 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -27,37 +27,14 @@ #include "constants/event_objects.h" #include "constants/moves.h" #include "constants/species.h" +#include "constants/easy_chat.h" extern void sub_81A4C30(void); -extern const u8 *const *const gUnknown_085DD690[]; extern const u16 gBattleFrontierHeldItems[]; -extern const u8 sRubyFacilityClassToEmerald[82][2]; extern const u16 gUnknown_085DFA46[]; -extern const struct FacilityMon gSlateportBattleTentMons[]; -extern const struct FacilityMon gVerdanturfBattleTentMons[]; -extern const struct FacilityMon gFallarborBattleTentMons[]; extern const struct FacilityMon gBattleFrontierMons[]; extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; -extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; -extern const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[]; -extern const struct BattleFrontierTrainer gFallarborBattleTentTrainers[]; - -struct -{ - u32 facilityClass; - const u8 *const *strings; -} extern const gUnknown_085DD500[50]; - -struct -{ - u16 species; - u8 fixedIV; - u8 level; - u8 nature; - u8 evs[6]; - u16 moves[4]; -} extern const sStevenMons[3]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[]; @@ -102,6 +79,809 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT static u8 SetTentPtrsGetLevel(void); // Const rom data. + + + + + + + + + + +extern const u8 sRubyFacilityClassToEmerald[82][2]; +/* +const u8 sRubyFacilityClassToEmerald[82][2] = +{ + {0x00, 0x0b}, + {0x01, 0x01}, + {0x02, 0x06}, + {0x03, 0x0d}, + {0x04, 0x0e}, + {0x05, 0x0f}, + {0x06, 0x10}, + {0x07, 0x11}, + {0x08, 0x03}, + {0x09, 0x12}, + {0x0a, 0x0c}, + {0x0b, 0x13}, + {0x0c, 0x14}, + {0x0d, 0x15}, + {0x0e, 0x17}, + {0x0f, 0x07}, + {0x10, 0x0a}, + {0x11, 0x19}, + {0x12, 0x1a}, + {0x13, 0x1b}, + {0x14, 0x1d}, + {0x15, 0x1e}, + {0x16, 0x1f}, + {0x17, 0x20}, + {0x18, 0x21}, + {0x19, 0x22}, + {0x1a, 0x23}, + {0x1b, 0x24}, + {0x1c, 0x25}, + {0x1d, 0x26}, + {0x1e, 0x27}, + {0x1f, 0x28}, + {0x20, 0x29}, + {0x21, 0x2a}, + {0x22, 0x09}, + {0x23, 0x16}, + {0x24, 0x2b}, + {0x25, 0x2c}, + {0x26, 0x2d}, + {0x27, 0x2e}, + {0x28, 0x2f}, + {0x29, 0x30}, + {0x2a, 0x31}, + {0x2b, 0x32}, + {0x2c, 0x33}, + {0x2d, 0x34}, + {0x2e, 0x04}, + {0x2f, 0x35}, + {0x30, 0x36}, + {0x31, 0x37}, + {0x32, 0x38}, + {0x33, 0x1c}, + {0x34, 0x39}, + {0x35, 0x3a}, + {0x38, 0x05}, + {0x39, 0x3b}, + {0x3a, 0x3c}, + {0x3b, 0x3d}, + {0x3c, 0x3e}, + {0x3d, 0x3f}, + {0x3e, 0x40}, + {0x3f, 0x41}, + {0x40, 0x42}, + {0x41, 0x02}, + {0x42, 0x44}, + {0x43, 0x45}, + {0x44, 0x46}, + {0x45, 0x08}, + {0x46, 0x18}, + {0x47, 0x47}, + {0x48, 0x43}, + {0x49, 0x00}, + {0x4a, 0x48}, + {0x4b, 0x49}, + {0x4c, 0x4a}, + {0x00, 0x00} +}; +*/ + +const u8 *const gUnknown_085DCFD8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244383, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244413, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6 +}; + +const u8 *const gUnknown_085DCFEC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244549, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5 +}; + +const u8 *const gUnknown_085DD000[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244618, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244643, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4 +}; + +const u8 *const gUnknown_085DD014[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7 +}; + +const u8 *const gUnknown_085DD028[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244939, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244989, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6 +}; + +const u8 *const gUnknown_085DD03C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93 +}; + +const u8 *const gUnknown_085DD050[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07 +}; + +const u8 *const gUnknown_085DD064[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B +}; + +const u8 *const gUnknown_085DD078[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98 +}; + +const u8 *const gUnknown_085DD08C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245013, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245087, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0 +}; + +const u8 *const gUnknown_085DD0A0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245196, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A +}; + +const u8 *const gUnknown_085DD0B4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245406, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245464, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3 +}; + +const u8 *const gUnknown_085DD0C8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245535, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245656 +}; + +const u8 *const gUnknown_085DD0DC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245740, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F +}; + +const u8 *const gUnknown_085DD0F0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245851, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245923, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F +}; + +const u8 *const gUnknown_085DD104[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E +}; + +const u8 *const gUnknown_085DD118[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D +}; + +const u8 *const gUnknown_085DD12C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07 +}; + +const u8 *const gUnknown_085DD140[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0 +}; + +const u8 *const gUnknown_085DD154[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC +}; + +const u8 *const gUnknown_085DD168[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87, + BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246002 +}; + +const u8 *const gUnknown_085DD17C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246020, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246051, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246082, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D +}; + +const u8 *const gUnknown_085DD190[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5 +}; + +const u8 *const gUnknown_085DD1A4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246244, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4 +}; + +const u8 *const gUnknown_085DD1B8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF +}; + +const u8 *const gUnknown_085DD1CC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246449, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246478, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246529 +}; + +const u8 *const gUnknown_085DD1E0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246571, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246605, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A +}; + +const u8 *const gUnknown_085DD1F4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246662, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246686, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A +}; + +const u8 *const gUnknown_085DD208[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246741, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246760, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246791, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6 +}; + +const u8 *const gUnknown_085DD21C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246831, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246864, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE +}; + +const u8 *const gUnknown_085DD230[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1 +}; + +const u8 *const gUnknown_085DD244[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7 +}; + +const u8 *const gUnknown_085DD258[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9 +}; + +const u8 *const gUnknown_085DD26C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9 +}; + +const u8 *const gUnknown_085DD280[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3 +}; + +const u8 *const gUnknown_085DD294[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE +}; + +const u8 *const gUnknown_085DD2A8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247013 +}; + +const u8 *const gUnknown_085DD2BC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A +}; + +const u8 *const gUnknown_085DD2D0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247238 +}; + +const u8 *const gUnknown_085DD2E4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247268, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247291, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247313, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247348 +}; + +const u8 *const gUnknown_085DD2F8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247438 +}; + +const u8 *const gUnknown_085DD30C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247470, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247484, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D +}; + +const u8 *const gUnknown_085DD320[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5 +}; + +const u8 *const gUnknown_085DD334[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247629, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247655, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED +}; + +const u8 *const gUnknown_085DD348[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247724, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247749, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247807 +}; + +const u8 *const gUnknown_085DD35C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247838, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247854, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247889, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D +}; + +const u8 *const gUnknown_085DD370[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247942, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247991, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18 +}; + +const u8 *const gUnknown_085DD384[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16 +}; + +const u8 *const gUnknown_085DD398[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23 +}; + +const u8 *const gUnknown_085DD3AC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E +}; + +const u8 *const gUnknown_085DD3C0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E +}; + +const u8 *const gUnknown_085DD3D4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D +}; + +const u8 *const gUnknown_085DD3E8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248031, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E +}; + +const u8 *const gUnknown_085DD3FC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248128, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248151 +}; + +const u8 *const gUnknown_085DD410[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248221, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F +}; + +const u8 *const gUnknown_085DD424[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248297, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248321, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D +}; + +const u8 *const gUnknown_085DD438[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248369, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248401, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248431 +}; + +const u8 *const gUnknown_085DD44C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248467, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248477, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248517 +}; + +const u8 *const gUnknown_085DD460[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248553, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248614 +}; + +const u8 *const gUnknown_085DD474[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248661, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248671, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF +}; + +const u8 *const gUnknown_085DD488[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248725, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248751, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248781, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7 +}; + +const u8 *const gUnknown_085DD49C[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248829, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248892, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248908 +}; + +const u8 *const gUnknown_085DD4B0[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD, + BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7 +}; + +const u8 *const gUnknown_085DD4C4[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB +}; + +const u8 *const gUnknown_085DD4D8[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE +}; + +const u8 *const gUnknown_085DD4EC[] = +{ + BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF, + BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04 +}; + +struct +{ + u32 facilityClass; + const u8 *const *strings; +} const gUnknown_085DD500[50] = +{ + {0x00000047, gUnknown_085DD118}, + {0x0000002b, gUnknown_085DD12C}, + {0x00000000, gUnknown_085DD140}, + {0x00000014, gUnknown_085DD154}, + {0x0000002d, gUnknown_085DD168}, + {0x00000013, gUnknown_085DD17C}, + {0x0000002f, gUnknown_085DD190}, + {0x00000043, gUnknown_085DD1A4}, + {0x00000026, gUnknown_085DD1B8}, + {0x00000015, gUnknown_085DD1CC}, + {0x0000000a, gUnknown_085DD1E0}, + {0x00000010, gUnknown_085DD1F4}, + {0x0000000c, gUnknown_085DD208}, + {0x00000042, gUnknown_085DD21C}, + {0x00000031, gUnknown_085DD230}, + {0x00000030, gUnknown_085DD244}, + {0x00000036, gUnknown_085DD258}, + {0x0000002e, gUnknown_085DD26C}, + {0x00000011, gUnknown_085DD280}, + {0x00000019, gUnknown_085DD294}, + {0x00000020, gUnknown_085DD2A8}, + {0x00000029, gUnknown_085DD2BC}, + {0x00000009, gUnknown_085DD2D0}, + {0x00000016, gUnknown_085DD2E4}, + {0x00000034, gUnknown_085DD2F8}, + {0x00000004, gUnknown_085DD30C}, + {0x00000035, gUnknown_085DD320}, + {0x00000037, gUnknown_085DD334}, + {0x0000001d, gUnknown_085DD348}, + {0x0000003a, gUnknown_085DD35C}, + {0x00000005, gUnknown_085DD370}, + {0x00000044, gUnknown_085DD384}, + {0x00000045, gUnknown_085DD398}, + {0x0000000d, gUnknown_085DD3AC}, + {0x0000000e, gUnknown_085DD3C0}, + {0x00000003, gUnknown_085DD3D4}, + {0x00000012, gUnknown_085DD3E8}, + {0x00000017, gUnknown_085DD3FC}, + {0x0000001a, gUnknown_085DD410}, + {0x0000001b, gUnknown_085DD424}, + {0x0000001c, gUnknown_085DD438}, + {0x0000001e, gUnknown_085DD44C}, + {0x0000001f, gUnknown_085DD460}, + {0x00000027, gUnknown_085DD474}, + {0x00000002, gUnknown_085DD488}, + {0x0000002a, gUnknown_085DD49C}, + {0x00000038, gUnknown_085DD4B0}, + {0x00000032, gUnknown_085DD4C4}, + {0x00000033, gUnknown_085DD4D8}, + {0x00000007, gUnknown_085DD4EC} +}; + +const u8 *const *const gUnknown_085DD690[] = +{ + gUnknown_085DCFD8, + gUnknown_085DCFEC, + gUnknown_085DD000, + gUnknown_085DD014, + gUnknown_085DD028, + gUnknown_085DD03C, + gUnknown_085DD050, + gUnknown_085DD064, + gUnknown_085DD078, + gUnknown_085DD08C, + gUnknown_085DD0A0, + gUnknown_085DD0B4, + gUnknown_085DD0C8, + gUnknown_085DD0DC, + gUnknown_085DD0F0, + gUnknown_085DD104 +}; + +struct +{ + u16 species; + u8 fixedIV; + u8 level; + u8 nature; + u8 evs[6]; + u16 moves[4]; +} const sStevenMons[3] = +{ + { + .species = SPECIES_METANG, + .fixedIV = 31, + .level = 42, + .nature = NATURE_BRAVE, + .evs = {0, 252, 252, 0, 6, 0}, + .moves = {MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_METAL_CLAW} + }, + { + .species = SPECIES_SKARMORY, + .fixedIV = 31, + .level = 43, + .nature = NATURE_IMPISH, + .evs = {252, 0, 0, 0, 6, 252}, + .moves = {MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_PROTECT, MOVE_STEEL_WING} + }, + { + .species = SPECIES_AGGRON, + .fixedIV = 31, + .level = 44, + .nature = NATURE_ADAMANT, + .evs = {0, 252, 0, 0, 252, 6}, + .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW} + } +}; + +#include "data/battle_frontier/battle_tent.h" + static void (* const gUnknown_085DF96C[])(void) = { sub_8161F94, diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h new file mode 100644 index 000000000..d96f8935e --- /dev/null +++ b/src/data/battle_frontier/battle_tent.h @@ -0,0 +1,3006 @@ + +// Slateport Battle Tent. +const u16 gSlateportBattleTentTrainerMons_Jolie[] = +{ + 9, + 10, + 13, + 27, + 35, + 37, + 42, + 44, + 45, + 46, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Malachi[] = +{ + 9, + 16, + 17, + 27, + 36, + 39, + 42, + 45, + 48, + 49, + 53, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kelsie[] = +{ + 4, + 5, + 6, + 11, + 28, + 34, + 35, + 37, + 43, + 51, + 53, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Davon[] = +{ + 4, + 5, + 6, + 12, + 26, + 36, + 37, + 38, + 40, + 44, + 46, + 50, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Glenda[] = +{ + 0, + 1, + 17, + 18, + 19, + 22, + 23, + 33, + 42, + 61, + 64, + 65, + 66, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Helena[] = +{ + 18, + 19, + 21, + 38, + 39, + 41, + 42, + 52, + 54, + 58, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Rodolfo[] = +{ + 0, + 1, + 4, + 5, + 7, + 8, + 18, + 20, + 21, + 37, + 38, + 40, + 62, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Davion[] = +{ + 17, + 23, + 24, + 25, + 31, + 32, + 33, + 34, + 39, + 43, + 44, + 49, + 57, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kendall[] = +{ + 4, + 7, + 8, + 9, + 11, + 12, + 13, + 27, + 38, + 40, + 45, + 46, + 47, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Colten[] = +{ + 0, + 2, + 12, + 22, + 28, + 30, + 35, + 38, + 43, + 44, + 56, + 57, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Irvin[] = +{ + 0, + 1, + 2, + 3, + 14, + 15, + 24, + 25, + 32, + 34, + 39, + 59, + 60, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Shaun[] = +{ + 17, + 18, + 19, + 22, + 29, + 36, + 42, + 48, + 61, + 62, + 66, + 68, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kyler[] = +{ + 22, + 23, + 28, + 29, + 31, + 32, + 34, + 39, + 55, + 64, + 65, + 67, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Maggie[] = +{ + 10, + 13, + 17, + 27, + 45, + 46, + 53, + 56, + 61, + 62, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Stephon[] = +{ + 8, + 10, + 16, + 23, + 29, + 43, + 44, + 60, + 62, + 63, + 68, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Rebecca[] = +{ + 8, + 13, + 21, + 29, + 33, + 41, + 48, + 54, + 59, + 61, + 68, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Reggie[] = +{ + 6, + 7, + 17, + 23, + 24, + 26, + 32, + 36, + 52, + 53, + 57, + 65, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Janae[] = +{ + 0, + 1, + 27, + 28, + 32, + 34, + 36, + 37, + 52, + 53, + 57, + 65, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Caiden[] = +{ + 10, + 14, + 15, + 16, + 20, + 21, + 25, + 30, + 35, + 47, + 48, + 50, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kirsten[] = +{ + 10, + 16, + 18, + 19, + 20, + 21, + 25, + 30, + 35, + 39, + 41, + 48, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Kurtis[] = +{ + 0, + 1, + 36, + 37, + 40, + 46, + 49, + 51, + 64, + 67, + 68, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Stefan[] = +{ + 4, + 5, + 21, + 33, + 37, + 38, + 40, + 51, + 52, + 64, + 65, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Avery[] = +{ + 2, + 3, + 7, + 8, + 22, + 23, + 28, + 29, + 30, + 51, + 67, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Dwane[] = +{ + 14, + 15, + 30, + 43, + 44, + 45, + 46, + 55, + 58, + 59, + 63, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Mckenna[] = +{ + 27, + 29, + 30, + 32, + 36, + 48, + 51, + 52, + 53, + 57, + 67, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Camryn[] = +{ + 5, + 6, + 7, + 8, + 10, + 16, + 17, + 20, + 21, + 37, + 43, + 44, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Natasha[] = +{ + 1, + 3, + 4, + 5, + 9, + 11, + 12, + 20, + 21, + 22, + 51, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Austyn[] = +{ + 25, + 31, + 35, + 37, + 38, + 39, + 50, + 51, + 52, + 58, + 68, + 69, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Donovan[] = +{ + 10, + 16, + 17, + 24, + 25, + 43, + 44, + 47, + 49, + 53, + 59, + 60, + 64, + 65, + -1 +}; + +const u16 gSlateportBattleTentTrainerMons_Tamia[] = +{ + 2, + 6, + 9, + 13, + 17, + 19, + 20, + 24, + 27, + 29, + 30, + -1 +}; + +const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = +{ + [0] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("JOLIE"), + .speechBefore = {EC_WORD_WHAT, EC_WORD_WILL, EC_WORD_I, EC_WORD_BE, EC_WORD_TOMORROW, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_FRIDAY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_MONDAY, EC_WORD_ELLIPSIS}, + .monSets = gSlateportBattleTentTrainerMons_Jolie + }, + [1] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("MALACHI"), + .speechBefore = {EC_WORD_BAD, EC_WORD_NEWS, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_A, EC_MOVE(SAND_TOMB)}, + .speechWin = {EC_WORD_YEEHAW_EXCL, -1, -1, EC_WORD_I_VE, EC_WORD_DONE, EC_WORD_IT}, + .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_IN, EC_WORD_THIS, EC_MOVE(SAND_TOMB), EC_WORD_ELLIPSIS}, + .monSets = gSlateportBattleTentTrainerMons_Malachi + }, + [2] = { + .facilityClass = FACILITY_CLASS_TUBER_1, + .trainerName = _("KELSIE"), + .speechBefore = {EC_WORD_GO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, + .speechLose = {EC_WORD_GWAH, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, + .monSets = gSlateportBattleTentTrainerMons_Kelsie + }, + [3] = { + .facilityClass = FACILITY_CLASS_TUBER_2, + .trainerName = _("DAVON"), + .speechBefore = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_GREAT, EC_MOVE(WHIRLPOOL), EC_WORD_ISN_T_IT_QUES}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_LIKE, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL}, + .speechLose = {EC_WORD_DON_T, EC_WORD_GET, EC_MOVE2(BEAT_UP), EC_WORD_IN, EC_WORD_THAT, EC_MOVE(WHIRLPOOL)}, + .monSets = gSlateportBattleTentTrainerMons_Davon + }, + [4] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("GLENDA"), + .speechBefore = {EC_WORD_CONVERSATION, EC_WORD_CAN, EC_WORD_WAIT, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN}, + .speechWin = {EC_WORD_FABULOUS, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_ROCK}, + .speechLose = {EC_WORD_NO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_SERIOUS}, + .monSets = gSlateportBattleTentTrainerMons_Glenda + }, + [5] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("HELENA"), + .speechBefore = {EC_WORD_DOES, EC_WORD_MY, EC_WORD_BEAUTY, EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_BORING}, + .speechLose = {EC_WORD_I, EC_WORD_DO, EC_WORD_SO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_EXCL}, + .monSets = gSlateportBattleTentTrainerMons_Helena + }, + [6] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("RODOLFO"), + .speechBefore = {EC_WORD_GO, EC_WORD_GET, EC_WORD_A, EC_POKEMON(WHISCASH), EC_WORD_FOR, EC_WORD_ME}, + .speechWin = {EC_WORD_AWW, EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_HAVE, EC_WORD_A, EC_POKEMON(WHISCASH)}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_POKEMON(WHISCASH), EC_WORD_BADLY}, + .monSets = gSlateportBattleTentTrainerMons_Rodolfo + }, + [7] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("DAVION"), + .speechBefore = {EC_WORD_GRAAAH, EC_WORD_GRAAAH, EC_WORD_EXCL_EXCL, EC_WORD_GRAAAH, EC_WORD_GRAAAH, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_MOVE2(ROAR), EC_WORD_EXCL, -1, EC_MOVE2(ROAR), EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_URGH, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, -1, -1, -1}, + .monSets = gSlateportBattleTentTrainerMons_Davion + }, + [8] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("KENDALL"), + .speechBefore = {EC_WORD_A_LITTLE, EC_MOVE2(PETAL_DANCE), EC_WORD_TO, EC_WORD_PLEASE, EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THIS, EC_WORD_ONLY, EC_WORD_FOR, EC_WORD_WORK}, + .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_MOVE2(POUND), EC_WORD_ME, EC_WORD_QUES}, + .monSets = gSlateportBattleTentTrainerMons_Kendall + }, + [9] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("COLTEN"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_RUN, EC_WORD_AROUND}, + .speechWin = {EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_WANT, EC_WORD_TO, EC_WORD_RUN, EC_WORD_QUES}, + .speechLose = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_GOOD, EC_WORD_TOO}, + .monSets = gSlateportBattleTentTrainerMons_Colten + }, + [10] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("IRVIN"), + .speechBefore = {EC_WORD_HAVE, EC_WORD_A, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE(CONFUSE_RAY)}, + .speechWin = {EC_WORD_YAHOO, EC_WORD_MY, EC_MOVE(CONFUSE_RAY), EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST}, + .speechLose = {EC_WORD_GWAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL}, + .monSets = gSlateportBattleTentTrainerMons_Irvin + }, + [11] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("SHAUN"), + .speechBefore = {EC_WORD_LISTEN, EC_WORD_ELLIPSIS, EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_GOOD}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_WAS, EC_WORD_RIGHT}, + .speechLose = {EC_WORD_YES, EC_WORD_YES, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SOMETHING}, + .monSets = gSlateportBattleTentTrainerMons_Shaun + }, + [12] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("KYLER"), + .speechBefore = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_QUES}, + .speechWin = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_YAY}, + .speechLose = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_WOW}, + .monSets = gSlateportBattleTentTrainerMons_Kyler + }, + [13] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("MAGGIE"), + .speechBefore = {EC_POKEMON(VULPIX), EC_POKEMON(XATU), EC_POKEMON2(UMBREON), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_WORD_ELLIPSIS}, + .speechWin = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON(SEVIPER), EC_WORD_EXCL, -1}, + .speechLose = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON2(SNORLAX), EC_WORD_ELLIPSIS, EC_WORD_UH_OH}, + .monSets = gSlateportBattleTentTrainerMons_Maggie + }, + [14] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("STEPHON"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_AN, EC_WORD_EGG}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_VICTORY}, + .speechLose = {EC_WORD_AWFUL, EC_WORD_EXCL_EXCL, -1, EC_WORD_JUST, EC_WORD_AWFUL, EC_WORD_EXCL_EXCL}, + .monSets = gSlateportBattleTentTrainerMons_Stephon + }, + [15] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("REBECCA"), + .speechBefore = {EC_WORD_THAT, EC_WORD_EGG, EC_WORD_HAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SHINE}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_EXCL, EC_WORD_SMELL, EC_WORD_THAT, EC_WORD_STENCH}, + .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_STOP, EC_WORD_ELLIPSIS}, + .monSets = gSlateportBattleTentTrainerMons_Rebecca + }, + [16] = { + .facilityClass = FACILITY_CLASS_POKEFAN_1, + .trainerName = _("REGGIE"), + .speechBefore = {EC_WORD_POKEMON, EC_WORD_COME, EC_WORD_BEFORE, EC_WORD_MONEY, EC_WORD_OR, EC_WORD_FAMILY}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_STRONG}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_THICK, EC_WORD_ELLIPSIS}, + .monSets = gSlateportBattleTentTrainerMons_Reggie + }, + [17] = { + .facilityClass = FACILITY_CLASS_POKEFAN_2, + .trainerName = _("JANAE"), + .speechBefore = {EC_WORD_I, EC_WORD_JUST, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_TOUGH, EC_WORD_LOOK}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_YOU, EC_MOVE2(STRUGGLE), -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_MEAN, EC_WORD_AND, EC_WORD_AWFUL, EC_WORD_TRAINER}, + .monSets = gSlateportBattleTentTrainerMons_Janae + }, + [18] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("CAIDEN"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(CURSE), EC_WORD_WILL, EC_WORD_BREAK, EC_WORD_YOUR, EC_WORD_SPIRIT}, + .speechWin = {EC_MOVE2(CURSE), EC_WORD_QUES, EC_WORD_IT_S, EC_WORD_A, EC_WORD_LIE, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_MY, EC_MOVE2(CURSE), EC_WORD_WILL, EC_WORD_LAST, EC_WORD_FOREVER, -1}, + .monSets = gSlateportBattleTentTrainerMons_Caiden + }, + [19] = { + .facilityClass = FACILITY_CLASS_EXPERT_2, + .trainerName = _("KIRSTEN"), + .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_YOU, EC_WORD_SAID, EC_WORD_QUES}, + .speechWin = {EC_WORD_HUH_QUES, EC_WORD_STRONG, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH}, + .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_TO, EC_WORD_YOUR, EC_MOVE(STRENGTH)}, + .monSets = gSlateportBattleTentTrainerMons_Kirsten + }, + [20] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("KURTIS"), + .speechBefore = {EC_WORD_SORRY, EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_MOVE2(BEAT_UP)}, + .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_WE, EC_WORD_WOULD, EC_MOVE2(POUND), EC_WORD_YOU}, + .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_I, EC_WORD_GET, EC_MOVE2(BEAT_UP), EC_WORD_QUES}, + .monSets = gSlateportBattleTentTrainerMons_Kurtis + }, + [21] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("STEFAN"), + .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_WANT, EC_WORD_CUTE, EC_WORD_POKEMON, -1}, + .speechWin = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_IT, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_ELLIPSIS, -1}, + .monSets = gSlateportBattleTentTrainerMons_Stefan + }, + [22] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("AVERY"), + .speechBefore = {EC_WORD_TOYS, EC_WORD_EXCL, EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_TOYS}, + .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_EASY, EC_WORD_MONEY, EC_WORD_FAST}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_MONEY}, + .monSets = gSlateportBattleTentTrainerMons_Avery + }, + [23] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("DWANE"), + .speechBefore = {EC_WORD_MMM, EC_WORD_TASTY, EC_WORD_ELLIPSIS, EC_WORD_WONDER, EC_WORD_WHAT, EC_WORD_QUES}, + .speechWin = {EC_WORD_MMM, EC_WORD_MMM, EC_WORD_ELLIPSIS, EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW}, + .speechLose = {EC_WORD_MMM, EC_WORD_MMM, EC_WORD_ELLIPSIS, EC_WORD_OH_YEAH, EC_WORD_THIS_IS_IT_EXCL, -1}, + .monSets = gSlateportBattleTentTrainerMons_Dwane + }, + [24] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("MCKENNA"), + .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_SMALL, EC_WORD_TALK, EC_WORD_LET_S, EC_WORD_GO}, + .speechWin = {EC_WORD_YUP, EC_WORD_THAT_S, EC_WORD_THAT, -1, -1, -1}, + .speechLose = {EC_WORD_KTHX_BYE, -1, -1, -1, -1, -1}, + .monSets = gSlateportBattleTentTrainerMons_Mckenna + }, + [25] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("CAMRYN"), + .speechBefore = {EC_WORD_MR, EC_WORD_JUDGE, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_OUR, EC_WORD_TRUST}, + .speechWin = {EC_WORD_YES_SIR_EXCL, EC_WORD_WE_RE, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THIS, EC_WORD_CONTEST}, + .speechLose = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_MY, EC_WORD_IDOL, EC_WORD_DREAM}, + .monSets = gSlateportBattleTentTrainerMons_Camryn + }, + [26] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("NATASHA"), + .speechBefore = {EC_WORD_COME_OVER, EC_WORD_TO, EC_WORD_MY, EC_WORD_PLACE, EC_WORD_OK_QUES, -1}, + .speechWin = {EC_WORD_COME_ON, EC_WORD_OVER, EC_WORD_IT, EC_WORD_WILL, EC_WORD_BE, EC_WORD_GREAT}, + .speechLose = {EC_WORD_AWW, EC_WORD_WON_T, EC_WORD_YOU, EC_WORD_COME_OVER, EC_WORD_QUES, -1}, + .monSets = gSlateportBattleTentTrainerMons_Natasha + }, + [27] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("AUSTYN"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_CARE, EC_WORD_HOW, EC_WORD_WE, EC_WORD_MATCH_UP}, + .speechWin = {EC_WORD_HAH, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_FOR, EC_WORD_YOU}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MY, EC_WORD_LESSONS}, + .monSets = gSlateportBattleTentTrainerMons_Austyn + }, + [28] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("DONOVAN"), + .speechBefore = {EC_WORD_OH, EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SLIMY, EC_WORD_ALL, EC_WORD_OVER}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_THE, EC_MOVE2(MEGA_DRAIN), EC_WORD_HAHAHA}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NATURALLY, EC_WORD_SLIMY, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, + .monSets = gSlateportBattleTentTrainerMons_Donovan + }, + [29] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("TAMIA"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_FATHER, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_MY, EC_WORD_FATHER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_JUST, EC_WORD_SO, EC_WORD_ADORE, EC_WORD_MY, EC_WORD_FATHER}, + .monSets = gSlateportBattleTentTrainerMons_Tamia + } +}; + +const struct FacilityMon gSlateportBattleTentMons[] = +{ + [0] = { + .species = SPECIES_ZIGZAGOON, + .moves = {MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [1] = { + .species = SPECIES_ZIGZAGOON, + .moves = {MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [2] = { + .species = SPECIES_BEAUTIFLY, + .moves = {MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [3] = { + .species = SPECIES_DUSTOX, + .moves = {MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST}, + .itemTableId = BATTLE_FRONTIER_ITEM_ORAN_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [4] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [5] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [6] = { + .species = SPECIES_MARILL, + .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [7] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAIVE + }, + [8] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [9] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED, + .nature = NATURE_JOLLY + }, + [10] = { + .species = SPECIES_LOMBRE, + .moves = {MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB}, + .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [11] = { + .species = SPECIES_LOTAD, + .moves = {MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [12] = { + .species = SPECIES_SEEDOT, + .moves = {MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [13] = { + .species = SPECIES_NUZLEAF, + .moves = {MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [14] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [15] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [16] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [17] = { + .species = SPECIES_BALTOY, + .moves = {MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAIVE + }, + [18] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [19] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [20] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [21] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CALM + }, + [22] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_MODEST + }, + [23] = { + .species = SPECIES_VOLTORB, + .moves = {MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_MILD + }, + [24] = { + .species = SPECIES_ARON, + .moves = {MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [25] = { + .species = SPECIES_ARON, + .moves = {MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [26] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [27] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [28] = { + .species = SPECIES_TAILLOW, + .moves = {MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [29] = { + .species = SPECIES_SWELLOW, + .moves = {MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [30] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SPELL_TAG, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_TIMID + }, + [31] = { + .species = SPECIES_LOUDRED, + .moves = {MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [32] = { + .species = SPECIES_SPINDA, + .moves = {MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [33] = { + .species = SPECIES_MAGNEMITE, + .moves = {MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_SERIOUS + }, + [34] = { + .species = SPECIES_WHISMUR, + .moves = {MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [35] = { + .species = SPECIES_MAKUHITA, + .moves = {MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [36] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_MODEST + }, + [37] = { + .species = SPECIES_BARBOACH, + .moves = {MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SEA_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [38] = { + .species = SPECIES_TENTACOOL, + .moves = {MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [39] = { + .species = SPECIES_VIGOROTH, + .moves = {MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_AGUAV_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [40] = { + .species = SPECIES_MAGIKARP, + .moves = {MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_SCALE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [41] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [42] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [43] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [44] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_IAPAPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [45] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [46] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED}, + .itemTableId = BATTLE_FRONTIER_ITEM_FIGY_BERRY, + .evSpread = F_EV_SPREAD_ATTACK, + .nature = NATURE_BRAVE + }, + [47] = { + .species = SPECIES_LOMBRE, + .moves = {MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_LONELY + }, + [48] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [49] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [50] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_WIKI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [51] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [52] = { + .species = SPECIES_MARILL, + .moves = {MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN}, + .itemTableId = BATTLE_FRONTIER_ITEM_GANLON_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [53] = { + .species = SPECIES_SKITTY, + .moves = {MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [54] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BRAVE + }, + [55] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [56] = { + .species = SPECIES_RALTS, + .moves = {MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [57] = { + .species = SPECIES_SANDSHREW, + .moves = {MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = 0, + .nature = NATURE_HARDY + }, + [58] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [59] = { + .species = SPECIES_VOLBEAT, + .moves = {MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [60] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [61] = { + .species = SPECIES_KADABRA, + .moves = {MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [62] = { + .species = SPECIES_KIRLIA, + .moves = {MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [63] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [64] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_LONELY + }, + [65] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MILD + }, + [66] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_APICOT_BERRY, + .evSpread = F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [67] = { + .species = SPECIES_SWABLU, + .moves = {MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [68] = { + .species = SPECIES_MACHOP, + .moves = {MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [69] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + } +}; + +// Verdanturf Battle Tent. +const u16 gVerdanturfBattleTentTrainerMons_Brenna[] = +{ + 4, + 11, + 13, + 18, + 26, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Dilan[] = +{ + 30, + 37, + 13, + 29, + 42, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Eliana[] = +{ + 6, + 7, + 17, + 18, + 40, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Markus[] = +{ + 6, + 7, + 18, + 24, + 38, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] = +{ + 0, + 12, + 25, + 28, + 22, + 44, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Desiree[] = +{ + 8, + 12, + 21, + 22, + 31, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Ronald[] = +{ + 1, + 20, + 23, + 25, + 32, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Ashten[] = +{ + 9, + 12, + 27, + 37, + 43, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Gerard[] = +{ + 36, + 7, + 34, + 6, + 40, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Bradly[] = +{ + 26, + 3, + 0, + 2, + 17, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Dennis[] = +{ + 14, + 37, + 2, + 38, + 27, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Prestin[] = +{ + 31, + 28, + 22, + 25, + 44, + 43, + 41, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] = +{ + 33, + 32, + 25, + 35, + 34, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Nala[] = +{ + 1, + 4, + 8, + 11, + 17, + 40, + 34, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Darnell[] = +{ + 0, + 29, + 35, + 37, + 39, + 43, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] = +{ + 29, + 36, + 32, + 30, + 17, + 6, + 44, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Addison[] = +{ + 0, + 1, + 16, + 31, + 6, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Justine[] = +{ + 0, + 1, + 16, + 36, + 18, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Tyson[] = +{ + 5, + 15, + 22, + 30, + 16, + 39, + 43, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Laila[] = +{ + 5, + 15, + 19, + 24, + 41, + 43, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Waren[] = +{ + 0, + 9, + 10, + 11, + 23, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Tobias[] = +{ + 6, + 7, + 24, + 38, + 40, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Josiah[] = +{ + 8, + 16, + 23, + 34, + 3, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Dion[] = +{ + 14, + 2, + 11, + 39, + 21, + 38, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] = +{ + 18, + 10, + 16, + 26, + 25, + 27, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Lillian[] = +{ + 24, + 34, + 36, + 38, + 5, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Lesley[] = +{ + 26, + 0, + 18, + 13, + 25, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Marquis[] = +{ + 24, + 34, + 5, + 15, + 7, + 42, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Freddy[] = +{ + 18, + 21, + 26, + 29, + 41, + -1 +}; + +const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] = +{ + 23, + 26, + 27, + 28, + 31, + -1 +}; + +const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = +{ + [0] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("BRENNA"), + .speechBefore = {EC_WORD_NO, EC_WORD_DAYS, EC_WORD_GO, EC_WORD_WITHOUT, EC_WORD_MY, EC_MOVE(FAKE_TEARS)}, + .speechWin = {EC_WORD_OH, EC_WORD_THAT_WAS, EC_WORD_SO, EC_WORD_REFRESHING, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_ALL, EC_WORD_I, EC_WORD_EVER, EC_WORD_GET, EC_WORD_IS, EC_MOVE(TORMENT)}, + .monSets = gVerdanturfBattleTentTrainerMons_Brenna + }, + [1] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("DILAN"), + .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_BORED, EC_WORD_I_AM}, + .speechWin = {EC_WORD_LOSING, EC_WORD_ISN_T, EC_WORD_EXCITING, EC_WORD_AT, EC_WORD_ALL, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_EXCITING, EC_WORD_EXCL_EXCL, EC_WORD_BYE_BYE, EC_WORD_TO, EC_WORD_BEING, EC_WORD_BORED}, + .monSets = gVerdanturfBattleTentTrainerMons_Dilan + }, + [2] = { + .facilityClass = FACILITY_CLASS_TUBER_1, + .trainerName = _("ELIANA"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_ON, EC_WORD_A, EC_WORD_VACATION, EC_WORD_SOON}, + .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_GET, EC_WORD_SOME, EC_WORD_MONEY}, + .speechLose = {EC_WORD_NO, EC_WORD_SLEEP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_GET, EC_WORD_HOME}, + .monSets = gVerdanturfBattleTentTrainerMons_Eliana + }, + [3] = { + .facilityClass = FACILITY_CLASS_TUBER_2, + .trainerName = _("MARKUS"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_SMART, EC_WORD_EXCL, EC_WORD_IF_I_LOSE, EC_WORD_I, EC_MOVE(SELF_DESTRUCT)}, + .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_NON_STOP, EC_MOVE2(EXPLOSION), EC_WORD_OF, EC_WORD_JOY}, + .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_TIME, EC_WORD_TO, EC_MOVE(SELF_DESTRUCT)}, + .monSets = gVerdanturfBattleTentTrainerMons_Markus + }, + [4] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("CAITLYN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_OF, EC_WORD_BEING, EC_WORD_AN, EC_WORD_IDOL}, + .speechWin = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_BEST, EC_WORD_FOR, EC_WORD_HAPPINESS}, + .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, EC_WORD_AT, EC_WORD_ALL}, + .monSets = gVerdanturfBattleTentTrainerMons_Caitlyn + }, + [5] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("DESIREE"), + .speechBefore = {EC_WORD_DOESN_T, EC_WORD_MY, EC_WORD_BEAUTY, EC_MOVE(ASTONISH), EC_WORD_YOU, EC_WORD_QUES}, + .speechWin = {EC_WORD_DID, EC_WORD_I, EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_MY, EC_WORD_BEAUTY, EC_WORD_DID, EC_WORD_NOTHING, EC_WORD_FOR, EC_WORD_YOU}, + .monSets = gVerdanturfBattleTentTrainerMons_Desiree + }, + [6] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("RONALD"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_WILL, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, -1}, + .speechWin = {EC_WORD_GIVE_UP, EC_WORD_QUES, -1, EC_WORD_THAT_S, EC_WORD_REALLY, EC_WORD_WEAK}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE2(BATON_PASS)}, + .monSets = gVerdanturfBattleTentTrainerMons_Ronald + }, + [7] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("ASHTEN"), + .speechBefore = {EC_WORD_OH_YEAH, EC_WORD_ANOTHER, EC_WORD_EXCITING, EC_WORD_BATTLE, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_WIMPY, EC_WORD_AND, EC_WORD_BORING}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_LOSS, EC_WORD_WOW, EC_WORD_EXCL}, + .monSets = gVerdanturfBattleTentTrainerMons_Ashten + }, + [8] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("GERARD"), + .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_SUPER, EC_MOVE2(TEETER_DANCE), EC_WORD_EXCL}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_HARD, EC_WORD_ELLIPSIS, EC_WORD_AM, EC_WORD_I, EC_WORD_OK_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGIVE, EC_WORD_YOU, EC_WORD_FOR, EC_WORD_THAT}, + .monSets = gVerdanturfBattleTentTrainerMons_Gerard + }, + [9] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("BRADLY"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_LONESOME, EC_WORD_BUT, EC_WORD_I, EC_WORD_VACATION, EC_WORD_ALONE}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(WITHDRAW), EC_WORD_INSIDE, EC_WORD_MY, EC_WORD_SHELL_ARMOR}, + .speechLose = {EC_WORD_OH, EC_WORD_ELLIPSIS, -1, EC_WORD_ALONE, EC_WORD_AS, EC_WORD_ALWAYS}, + .monSets = gVerdanturfBattleTentTrainerMons_Bradly + }, + [10] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("DENNIS"), + .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_STRONG, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, -1, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_NICE, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WAS, EC_WORD_CHILD_S_PLAY}, + .monSets = gVerdanturfBattleTentTrainerMons_Dennis + }, + [11] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("PRESTIN"), + .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_FOR, EC_WORD_YOU}, + .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_A, EC_WORD_DREAM}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_WAKE_UP, EC_WORD_FROM, EC_WORD_THIS}, + .monSets = gVerdanturfBattleTentTrainerMons_Prestin + }, + [12] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("ERNESTO"), + .speechBefore = {EC_WORD_THIS, EC_WORD_PARTY, EC_WORD_GOES, EC_WORD_ON, EC_WORD_FOREVER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THE, EC_WORD_MUSIC, EC_WORD_PLAYS, EC_WORD_ON, EC_WORD_WITHOUT, EC_WORD_END}, + .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_MUSIC, EC_WORD_CAN_T, EC_WORD_STOP}, + .monSets = gVerdanturfBattleTentTrainerMons_Ernesto + }, + [13] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("NALA"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_THE, EC_WORD_WORLD, EC_WORD_MOVIE, EC_WORD_COLLECTION}, + .speechWin = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_LIKE, EC_WORD_RADIO, EC_WORD_VERY, EC_WORD_MUCH}, + .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_EXCL}, + .monSets = gVerdanturfBattleTentTrainerMons_Nala + }, + [14] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("DARNELL"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO_EASY, EC_WORD_ON, EC_WORD_YOU, -1}, + .speechWin = {EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_HIDDEN, EC_WORD_AWAY}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE, EC_WORD_ELLIPSIS}, + .monSets = gVerdanturfBattleTentTrainerMons_Darnell + }, + [15] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("ASHLYN"), + .speechBefore = {EC_WORD_I, EC_WORD_LOOK, EC_WORD_TOUGH, EC_WORD_DO, EC_WORD_I, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OVER, EC_WORD_YOUR, EC_MOVE2(TAUNT), EC_WORD_YET}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL_EXCL, -1, -1, -1}, + .monSets = gVerdanturfBattleTentTrainerMons_Ashlyn + }, + [16] = { + .facilityClass = FACILITY_CLASS_POKEFAN_1, + .trainerName = _("ADDISON"), + .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WELL, EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_EASY, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, -1, EC_WORD_BUT, EC_WORD_WHY, EC_WORD_QUES}, + .monSets = gVerdanturfBattleTentTrainerMons_Addison + }, + [17] = { + .facilityClass = FACILITY_CLASS_POKEFAN_2, + .trainerName = _("JUSTINE"), + .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_I_AM, EC_WORD_READY}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_EXCL}, + .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL_EXCL, -1, -1, -1, -1}, + .monSets = gVerdanturfBattleTentTrainerMons_Justine + }, + [18] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("TYSON"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_PRESSURE, EC_WORD_ME, EC_WORD_QUES}, + .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO_WEAK, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THIS, EC_WORD_DOESN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY, EC_WORD_EXCL}, + .monSets = gVerdanturfBattleTentTrainerMons_Tyson + }, + [19] = { + .facilityClass = FACILITY_CLASS_EXPERT_2, + .trainerName = _("LAILA"), + .speechBefore = {EC_WORD_A, EC_MOVE2(STRUGGLE), EC_WORD_ISN_T, EC_WORD_VERY, EC_WORD_COOL, -1}, + .speechWin = {EC_WORD_NOPE, EC_WORD_NOT_VERY, EC_WORD_COOL, EC_WORD_AT, EC_WORD_ALL, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_YOU, EC_WORD_WON}, + .monSets = gVerdanturfBattleTentTrainerMons_Laila + }, + [20] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("WAREN"), + .speechBefore = {EC_WORD_DANGER, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_SENSE, EC_WORD_DANGER}, + .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_BELIEVE, EC_WORD_MY, EC_WORD_LIE, EC_WORD_QUES_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_DID, EC_WORD_SENSE, EC_WORD_DANGER, EC_WORD_ELLIPSIS}, + .monSets = gVerdanturfBattleTentTrainerMons_Waren + }, + [21] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("TOBIAS"), + .speechBefore = {EC_MOVE2(BARRIER), EC_WORD_EXCL_EXCL, -1, EC_WORD_NOW, EC_WORD_COME_ON, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_KNOW, EC_WORD_THAT, EC_WORD_IT_S, EC_WORD_HOPELESS}, + .monSets = gVerdanturfBattleTentTrainerMons_Tobias + }, + [22] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("JOSIAH"), + .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_MOVE(FLY), EC_WORD_IF_I_LOSE, -1}, + .speechWin = {EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, -1, EC_WORD_YOU, EC_MOVE(FLY), EC_WORD_INSTEAD}, + .speechLose = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_MOVE(FLY), EC_WORD_SOMETIME, EC_WORD_SOON}, + .monSets = gVerdanturfBattleTentTrainerMons_Josiah + }, + [23] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("DION"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_TRENDY, EC_WORD_UM, EC_WORD_BATTLE, EC_WORD_SOMETHING, -1}, + .speechWin = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_BATTLE, EC_WORD_DATE, EC_WORD_QUES}, + .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_BATTLE, EC_WORD_GOURMET, EC_WORD_QUES}, + .monSets = gVerdanturfBattleTentTrainerMons_Dion + }, + [24] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("KENZIE"), + .speechBefore = {EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_GIVES, EC_WORD_ME, EC_MOVE(STRENGTH), -1}, + .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_LIKE, EC_MOVE2(MOONLIGHT), EC_WORD_TOO, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TERRIBLE, EC_MOVE(SANDSTORM), EC_WORD_ELLIPSIS}, + .monSets = gVerdanturfBattleTentTrainerMons_Kenzie + }, + [25] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("LILLIAN"), + .speechBefore = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_WORD_MY, EC_WORD_OWN_TEMPO}, + .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_QUES, EC_WORD_WHAT, EC_WORD_A, EC_WORD_SURPRISE}, + .speechLose = {EC_WORD_AWW, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_NAP}, + .monSets = gVerdanturfBattleTentTrainerMons_Lillian + }, + [26] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("LESLEY"), + .speechBefore = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BE, EC_WORD_LOLLING, EC_WORD_ABOUT}, + .speechWin = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_GET, EC_WORD_UP, EC_WORD_EARLIER, -1}, + .speechLose = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_EXCL}, + .monSets = gVerdanturfBattleTentTrainerMons_Lesley + }, + [27] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("MARQUIS"), + .speechBefore = {EC_WORD_NONE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_SENSE}, + .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THIS, EC_WORD_JUST, EC_WORD_ISN_T, EC_WORD_NORMAL}, + .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_QUES}, + .monSets = gVerdanturfBattleTentTrainerMons_Marquis + }, + [28] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("FREDDY"), + .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_THIS, EC_WORD_CUTE, EC_WORD_TELEVISION, EC_WORD_IDOL}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_SO, EC_WORD_FUNNY, EC_WORD_WHEN, EC_WORD_YOU_RE, EC_WORD_ANGRY}, + .speechLose = {EC_WORD_LATE, EC_WORD_NIGHT, EC_WORD_TELEVISION, EC_WORD_IS, EC_WORD_MY, EC_WORD_LIFE}, + .monSets = gVerdanturfBattleTentTrainerMons_Freddy + }, + [29] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("CECILIA"), + .speechBefore = {EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_CUTENESS, EC_WORD_IS, EC_WORD_IN, EC_WORD_FASHION}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_NO, EC_WORD_MATCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_CUTE_CHARM}, + .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_QUES}, + .monSets = gVerdanturfBattleTentTrainerMons_Cecilia + } +}; + +const struct FacilityMon gVerdanturfBattleTentMons[] = +{ + [0] = { + .species = SPECIES_POOCHYENA, + .moves = {MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [1] = { + .species = SPECIES_ZIGZAGOON, + .moves = {MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [2] = { + .species = SPECIES_DUSTOX, + .moves = {MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [3] = { + .species = SPECIES_TAILLOW, + .moves = {MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_ORAN_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [4] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [5] = { + .species = SPECIES_MACHOP, + .moves = {MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_LONELY + }, + [6] = { + .species = SPECIES_MAGIKARP, + .moves = {MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [7] = { + .species = SPECIES_BARBOACH, + .moves = {MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_SPEED, + .nature = NATURE_HASTY + }, + [8] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [9] = { + .species = SPECIES_ARON, + .moves = {MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [10] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_SASSY + }, + [11] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [12] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIET + }, + [13] = { + .species = SPECIES_BALTOY, + .moves = {MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [14] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [15] = { + .species = SPECIES_MAKUHITA, + .moves = {MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [16] = { + .species = SPECIES_SWABLU, + .moves = {MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MILD + }, + [17] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_GENTLE + }, + [18] = { + .species = SPECIES_LOTAD, + .moves = {MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_IAPAPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [19] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_RELAXED + }, + [20] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [21] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [22] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_MACHO_BRACE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_BASHFUL + }, + [23] = { + .species = SPECIES_SWELLOW, + .moves = {MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [24] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [25] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MILD + }, + [26] = { + .species = SPECIES_NUZLEAF, + .moves = {MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [27] = { + .species = SPECIES_ARON, + .moves = {MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [28] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [29] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [30] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [31] = { + .species = SPECIES_KADABRA, + .moves = {MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [32] = { + .species = SPECIES_VOLTORB, + .moves = {MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_BASHFUL + }, + [33] = { + .species = SPECIES_MAGNEMITE, + .moves = {MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [34] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FIGY_BERRY, + .evSpread = 0, + .nature = NATURE_BRAVE + }, + [35] = { + .species = SPECIES_LOUDRED, + .moves = {MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [36] = { + .species = SPECIES_MARILL, + .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [37] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_NONE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [38] = { + .species = SPECIES_TENTACOOL, + .moves = {MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [39] = { + .species = SPECIES_VIGOROTH, + .moves = {MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [40] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [41] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [42] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_CALM + }, + [43] = { + .species = SPECIES_WHISMUR, + .moves = {MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [44] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + } +}; + +// Fallarbor Battle Tent. +const u16 gFallarborBattleTentTrainerMons_Amber[] = +{ + 39, + 40, + 41, + 42, + 43, + 44, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Javier[] = +{ + 6, + 35, + 36, + 37, + 38, + 44, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Natalie[] = +{ + 5, + 29, + 30, + 32, + 34, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Treve[] = +{ + 28, + 29, + 30, + 32, + 33, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Arianna[] = +{ + 18, + 23, + 24, + 27, + 44, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Jadyn[] = +{ + 0, + 22, + 24, + 27, + 32, + 39, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Gerardo[] = +{ + 6, + 18, + 23, + 24, + 29, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Jonn[] = +{ + 16, + 17, + 21, + 22, + 37, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Esteban[] = +{ + 5, + 28, + 30, + 33, + 42, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Jameson[] = +{ + 1, + 2, + 3, + 5, + 9, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Alanzo[] = +{ + 9, + 10, + 11, + 12, + 13, + 14, + 15, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Howard[] = +{ + 18, + 23, + 31, + 38, + 43, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Conrad[] = +{ + 18, + 19, + 20, + 21, + 22, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Makenna[] = +{ + 4, + 21, + 25, + 36, + 40, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Brayan[] = +{ + 0, + 4, + 6, + 12, + 19, + 23, + 28, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Mariana[] = +{ + 0, + 4, + 13, + 19, + 28, + 30, + 37, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Sheldon[] = +{ + 2, + 3, + 21, + 31, + 39, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Gianna[] = +{ + 1, + 2, + 30, + 32, + 41, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Yahir[] = +{ + 4, + 8, + 15, + 17, + 22, + 24, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Britney[] = +{ + 4, + 7, + 14, + 20, + 23, + 43, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Hecter[] = +{ + 0, + 1, + 2, + 5, + 9, + 35, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Tannor[] = +{ + 5, + 30, + 31, + 33, + 34, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Benji[] = +{ + 25, + 26, + 27, + 28, + 29, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Rory[] = +{ + 9, + 11, + 14, + 15, + 27, + 39, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Eleanor[] = +{ + 23, + 28, + 31, + 36, + 38, + 42, + 44, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Evelyn[] = +{ + 29, + 31, + 32, + 33, + 34, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Arielle[] = +{ + 1, + 3, + 38, + 39, + 41, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Connar[] = +{ + 7, + 8, + 28, + 29, + 31, + 32, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Maurice[] = +{ + 4, + 5, + 6, + 12, + 13, + -1 +}; + +const u16 gFallarborBattleTentTrainerMons_Kianna[] = +{ + 22, + 24, + 26, + 27, + 34, + 37, + -1 +}; + +const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = +{ + [0] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("AMBER"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DIET, EC_WORD_EVERY, EC_WORD_DAY}, + .speechWin = {EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_OF, EC_WORD_SWEETS, EC_WORD_SHOCKED, EC_WORD_ME}, + .speechLose = {EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_LOSE}, + .monSets = gFallarborBattleTentTrainerMons_Amber + }, + [1] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("JAVIER"), + .speechBefore = {EC_WORD_I, EC_WORD_NEVER, EC_WORD_EVER, EC_WORD_HAVE, EC_WORD_ENOUGH, EC_WORD_MONEY}, + .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I, EC_WORD_NEED, EC_WORD_MONEY}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MONEY, EC_WORD_FOR, EC_WORD_A, EC_WORD_BIKE}, + .monSets = gFallarborBattleTentTrainerMons_Javier + }, + [2] = { + .facilityClass = FACILITY_CLASS_TUBER_1, + .trainerName = _("NATALIE"), + .speechBefore = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_WEIRD}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_THIS, EC_WORD_PLACE}, + .speechLose = {EC_WORD_GIVE_ME, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH, EC_WORD_NEXT, EC_WORD_TIME}, + .monSets = gFallarborBattleTentTrainerMons_Natalie + }, + [3] = { + .facilityClass = FACILITY_CLASS_TUBER_2, + .trainerName = _("TREVE"), + .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE2(METRONOME), EC_WORD_AND, EC_WORD_SLEEP}, + .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_MOVE(HYPNOSIS), EC_WORD_IS, EC_WORD_TOTALLY, EC_WORD_GREAT}, + .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_ELLIPSIS, -1}, + .monSets = gFallarborBattleTentTrainerMons_Treve + }, + [4] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("ARIANNA"), + .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_GIVE_ME, EC_WORD_POKEMON, EC_WORD_FOR, EC_WORD_MY, EC_WORD_COLLECTION}, + .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_COLLECT}, + .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ELLIPSIS}, + .monSets = gFallarborBattleTentTrainerMons_Arianna + }, + [5] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("JADYN"), + .speechBefore = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_A, EC_WORD_MYSTERY}, + .speechWin = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_GOES, EC_WORD_ON, EC_WORD_A, EC_WORD_MYSTERY}, + .speechLose = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_YOUR, EC_WORD_MOTHER}, + .monSets = gFallarborBattleTentTrainerMons_Jadyn + }, + [6] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("GERARDO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST, EC_WORD_HERO, EC_WORD_EVER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_SEE, EC_WORD_WHAT, EC_WORD_I, EC_WORD_MEAN, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_WERE, EC_WORD_RIGHT, EC_WORD_QUES, -1}, + .monSets = gFallarborBattleTentTrainerMons_Gerardo + }, + [7] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("JONN"), + .speechBefore = {EC_WORD_THE, EC_WORD_WORLD, EC_MOVE2(SUPERPOWER), EC_MOVE2(STOMP), EC_WORD_CONTEST, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_EXCL_EXCL, EC_WORD_HEAR, EC_WORD_ME, EC_MOVE2(ROAR)}, + .speechLose = {EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_NO_1, EC_WORD_EXCL}, + .monSets = gFallarborBattleTentTrainerMons_Jonn + }, + [8] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("ESTEBAN"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_GOOD, EC_WORD_TRAINER, EC_WORD_QUES, EC_WORD_UNBELIEVABLE}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_PUSHOVER, EC_WORD_OF, EC_WORD_A, EC_WORD_TRAINER}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_ME}, + .monSets = gFallarborBattleTentTrainerMons_Esteban + }, + [9] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("JAMESON"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SILKY, EC_WORD_SMOOTH, EC_WORD_EXCL}, + .speechWin = {EC_WORD_MY, EC_WORD_SILKY, EC_WORD_SMOOTH, EC_WORD_POKEMON, EC_WORD_RULE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(STRUGGLE), EC_WORD_IN, EC_WORD_YOUR, EC_WORD_STICKY_HOLD}, + .monSets = gFallarborBattleTentTrainerMons_Jameson + }, + [10] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("ALANZO"), + .speechBefore = {EC_MOVE2(FORESIGHT), EC_WORD_IS, EC_WORD_A, EC_WORD_POWER, EC_WORD_I, EC_WORD_HAVE}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_OBLIVIOUS, EC_WORD_ABOUT, EC_MOVE2(FORESIGHT), EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_RIGHT, EC_WORD_EXCL}, + .monSets = gFallarborBattleTentTrainerMons_Alanzo + }, + [11] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("HOWARD"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_COULDN_T, EC_WORD_WIN, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_ELLIPSIS}, + .monSets = gFallarborBattleTentTrainerMons_Howard + }, + [12] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("CONRAD"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_PRETTY, EC_WORD_WILD, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WHOAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_LET_S, EC_WORD_DANCE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_MY, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ON, EC_WORD_ELLIPSIS}, + .monSets = gFallarborBattleTentTrainerMons_Conrad + }, + [13] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("MAKENNA"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY}, + .speechLose = {EC_WORD_AWW, EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_TOO}, + .monSets = gFallarborBattleTentTrainerMons_Makenna + }, + [14] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("BRAYAN"), + .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_MY, EC_WORD_POWER, EC_WORD_QUES}, + .speechWin = {EC_WORD_HOW, EC_WORD_BORING, EC_WORD_ELLIPSIS, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, + .speechLose = {EC_WORD_AM, EC_WORD_I, EC_WORD_THE, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_QUES}, + .monSets = gFallarborBattleTentTrainerMons_Brayan + }, + [15] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("MARIANA"), + .speechBefore = {EC_WORD_A, EC_WORD_LIE, EC_WORD_CAN, EC_WORD_BE, EC_WORD_KIND, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_LIKE, EC_WORD_THE, EC_WORD_SUNDAY, EC_WORD_COMICS}, + .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_LIKE, EC_WORD_FROM, EC_WORD_A, EC_WORD_MOVIE}, + .monSets = gFallarborBattleTentTrainerMons_Mariana + }, + [16] = { + .facilityClass = FACILITY_CLASS_POKEFAN_1, + .trainerName = _("SHELDON"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_TEACHER, EC_WORD_GETS, EC_WORD_NO, EC_MOVE2(REST)}, + .speechWin = {EC_WORD_MY, EC_WORD_SMARTNESS, EC_WORD_GETS, EC_WORD_ME, EC_WORD_EASY, EC_WORD_WINS}, + .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_GO, EC_WORD_WORK, EC_WORD_BYE_BYE}, + .monSets = gFallarborBattleTentTrainerMons_Sheldon + }, + [17] = { + .facilityClass = FACILITY_CLASS_POKEFAN_2, + .trainerName = _("GIANNA"), + .speechBefore = {EC_WORD_AHAHA, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_LOVEY_DOVEY, EC_WORD_POKEMON, EC_WORD_WORLD}, + .speechWin = {EC_WORD_MY, EC_WORD_SHINE, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_THINGS, EC_WORD_BETTER}, + .speechLose = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_POKEMON, EC_WORD_QUES, -1}, + .monSets = gFallarborBattleTentTrainerMons_Gianna + }, + [18] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("YAHIR"), + .speechBefore = {EC_WORD_YOU, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_COME_ON, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_TRAIN, EC_WORD_A_LOT, EC_WORD_MORE}, + .speechLose = {EC_WORD_NOT, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_ENOUGH}, + .monSets = gFallarborBattleTentTrainerMons_Yahir + }, + [19] = { + .facilityClass = FACILITY_CLASS_EXPERT_2, + .trainerName = _("BRITNEY"), + .speechBefore = {EC_WORD_IT, EC_WORD_SEEMS, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_GOOD}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LUKEWARM, EC_WORD_TALENT, EC_WORD_AT, EC_WORD_BEST}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_COOL, EC_WORD_HERO, EC_WORD_AT, EC_WORD_THIS}, + .monSets = gFallarborBattleTentTrainerMons_Britney + }, + [20] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("HECTER"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(HIDDEN_POWER), EC_WORD_IS, EC_WORD_EXCITING, EC_WORD_ME, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YEEHAW_EXCL, EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(HIDDEN_POWER), EC_WORD_PARTY}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_YOU, EC_MOVE2(MIMIC), EC_WORD_ME}, + .monSets = gFallarborBattleTentTrainerMons_Hecter + }, + [21] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("TANNOR"), + .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_BE, EC_WORD_JOKING}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_AT, EC_WORD_BEING, EC_WORD_FUNNY}, + .speechLose = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BEING, EC_WORD_FUNNY, EC_WORD_AT, EC_WORD_ALL}, + .monSets = gFallarborBattleTentTrainerMons_Tannor + }, + [22] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("BENJI"), + .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_THINK, EC_WORD_VERY, EC_WORD_FAST, EC_WORD_HUH_QUES}, + .speechWin = {EC_WORD_SORRY, EC_WORD_EXCL, EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_MEAN, EC_WORD_YOU}, + .speechLose = {EC_WORD_YOU, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_ELLIPSIS}, + .monSets = gFallarborBattleTentTrainerMons_Benji + }, + [23] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("RORY"), + .speechBefore = {EC_WORD_DON_T, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_NEED, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR)}, + .monSets = gFallarborBattleTentTrainerMons_Rory + }, + [24] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("ELEANOR"), + .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_WANT, EC_WORD_TO, EC_WORD_PARTY, -1}, + .speechWin = {EC_WORD_A, EC_WORD_TRENDY, EC_WORD_PARTY, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_REFRESHING}, + .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PARTY, EC_WORD_QUES}, + .monSets = gFallarborBattleTentTrainerMons_Eleanor + }, + [25] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("EVELYN"), + .speechBefore = {EC_WORD_MY, EC_WORD_PC, EC_WORD_IS, EC_WORD_MY, EC_WORD_SECRET_BASE, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_SECRET, EC_WORD_ON, EC_WORD_MY, EC_WORD_PC}, + .speechLose = {EC_WORD_NO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_REJECT, EC_WORD_THIS}, + .monSets = gFallarborBattleTentTrainerMons_Evelyn + }, + [26] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("ARIELLE"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_NOT_VERY, EC_WORD_PRETTY, EC_WORD_BUT, EC_WORD_I, EC_WORD_TRY}, + .speechWin = {EC_WORD_WE_RE, EC_WORD_NOT_VERY, EC_WORD_PRETTY, EC_WORD_BUT, EC_WORD_WE_RE, EC_WORD_GREAT}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_PRETTY, EC_WORD_MEAN, EC_WORD_OF, EC_WORD_YOU, EC_WORD_EXCL}, + .monSets = gFallarborBattleTentTrainerMons_Arielle + }, + [27] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("CONNAR"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_THIS}, + .speechWin = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_YOU_RE, EC_WORD_OK_QUES, -1}, + .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, -1, -1, -1}, + .monSets = gFallarborBattleTentTrainerMons_Connar + }, + [28] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("MAURICE"), + .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_RADIO, EC_WORD_OR, EC_WORD_TELEVISION}, + .speechWin = {EC_WORD_BUT, EC_WORD_THERE, EC_WORD_IS, EC_WORD_A_LOT, EC_WORD_OF, EC_WORD_POKEMON}, + .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_ENJOY, EC_WORD_MYSELF, EC_WORD_WITHOUT, EC_WORD_MONEY}, + .monSets = gFallarborBattleTentTrainerMons_Maurice + }, + [29] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("KIANNA"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_DEPT_STORE, EC_WORD_SHOPPING}, + .speechWin = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_SHOPPING, EC_WORD_ALONE, -1, -1}, + .speechLose = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_SHOPPING, EC_WORD_TOGETHER, EC_WORD_QUES}, + .monSets = gFallarborBattleTentTrainerMons_Kianna + } +}; + +const struct FacilityMon gFallarborBattleTentMons[] = +{ + [0] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [1] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_SASSY + }, + [2] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [3] = { + .species = SPECIES_POOCHYENA, + .moves = {MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [4] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_WIKI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_MODEST + }, + [5] = { + .species = SPECIES_MAGIKARP, + .moves = {MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_SCALE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [6] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [7] = { + .species = SPECIES_MAKUHITA, + .moves = {MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [8] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAIVE + }, + [9] = { + .species = SPECIES_NINCADA, + .moves = {MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_SERIOUS + }, + [10] = { + .species = SPECIES_BEAUTIFLY, + .moves = {MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [11] = { + .species = SPECIES_DUSTOX, + .moves = {MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [12] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [13] = { + .species = SPECIES_VOLBEAT, + .moves = {MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [14] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [15] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [16] = { + .species = SPECIES_ARON, + .moves = {MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [17] = { + .species = SPECIES_ARON, + .moves = {MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_GENTLE + }, + [18] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SEA_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HASTY + }, + [19] = { + .species = SPECIES_MAGNEMITE, + .moves = {MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [20] = { + .species = SPECIES_VOLTORB, + .moves = {MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [21] = { + .species = SPECIES_WHISMUR, + .moves = {MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [22] = { + .species = SPECIES_LOUDRED, + .moves = {MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [23] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [24] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [25] = { + .species = SPECIES_SWABLU, + .moves = {MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [26] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT}, + .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [27] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [28] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [29] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN}, + .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [30] = { + .species = SPECIES_BARBOACH, + .moves = {MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [31] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [32] = { + .species = SPECIES_MARILL, + .moves = {MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [33] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_GANLON_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HASTY + }, + [34] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [35] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [36] = { + .species = SPECIES_BALTOY, + .moves = {MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [37] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [38] = { + .species = SPECIES_SANDSHREW, + .moves = {MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [39] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [40] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [41] = { + .species = SPECIES_KIRLIA, + .moves = {MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [42] = { + .species = SPECIES_LOMBRE, + .moves = {MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [43] = { + .species = SPECIES_NUZLEAF, + .moves = {MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [44] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + } +}; -- cgit v1.2.3 From 52fa5137c95a3bbdf3bf29d594e66948bf7382ae Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 3 Dec 2018 00:31:15 -0500 Subject: tweak alignment --- include/constants/trainers.h | 166 +++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/include/constants/trainers.h b/include/constants/trainers.h index d7832754e..d1ab51e4e 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -17,7 +17,7 @@ #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 #define TRAINER_PIC_POKEMON_BREEDER_F 2 -#define TRAINER_PIC_COOLTRAINER_M 3 +#define TRAINER_PIC_COOLTRAINER_M 3 #define TRAINER_PIC_BIRD_KEEPER 4 #define TRAINER_PIC_COLLECTOR 5 #define TRAINER_PIC_AQUA_GRUNT_F 6 @@ -34,7 +34,7 @@ #define TRAINER_PIC_INTERVIEWER 17 #define TRAINER_PIC_TUBER_F 18 #define TRAINER_PIC_TUBER_M 19 -#define TRAINER_PIC_COOLTRAINER_F 20 +#define TRAINER_PIC_COOLTRAINER_F 20 #define TRAINER_PIC_LADY 21 #define TRAINER_PIC_BEAUTY 22 #define TRAINER_PIC_RICH_BOY 23 @@ -105,8 +105,8 @@ #define TRAINER_PIC_PYRAMID_KING_BRANDON 88 #define TRAINER_PIC_RED 89 #define TRAINER_PIC_LEAF 90 -#define TRAINER_PIC_RS_BRENDAN 91 -#define TRAINER_PIC_RS_MAY 92 +#define TRAINER_PIC_RS_BRENDAN 91 +#define TRAINER_PIC_RS_MAY 92 #define TRAINER_BACK_PIC_BRENDAN 0 #define TRAINER_BACK_PIC_MAY 1 @@ -117,95 +117,95 @@ #define TRAINER_BACK_PIC_WALLY 6 #define TRAINER_BACK_PIC_STEVEN 7 -#define FACILITY_CLASS_HIKER 0x0 -#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 -#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 -#define FACILITY_CLASS_COOLTRAINER_M 0x3 -#define FACILITY_CLASS_BIRD_KEEPER 0x4 -#define FACILITY_CLASS_COLLECTOR 0x5 -#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 -#define FACILITY_CLASS_SWIMMER_M 0x7 -#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 -#define FACILITY_CLASS_EXPERT_M 0x9 -#define FACILITY_CLASS_BLACK_BELT 0xa -#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb -#define FACILITY_CLASS_HEX_MANIAC 0xc -#define FACILITY_CLASS_AROMA_LADY 0xd -#define FACILITY_CLASS_RUIN_MANIAC 0xe -#define FACILITY_CLASS_INTERVIEWER 0xf -#define FACILITY_CLASS_TUBER_F 0x10 -#define FACILITY_CLASS_TUBER_M 0x11 -#define FACILITY_CLASS_COOLTRAINER_F 0x12 -#define FACILITY_CLASS_LADY 0x13 -#define FACILITY_CLASS_BEAUTY 0x14 -#define FACILITY_CLASS_RICH_BOY 0x15 -#define FACILITY_CLASS_EXPERT_F 0x16 -#define FACILITY_CLASS_POKEMANIAC 0x17 -#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 -#define FACILITY_CLASS_GUITARIST 0x19 -#define FACILITY_CLASS_KINDLER 0x1a -#define FACILITY_CLASS_CAMPER 0x1b -#define FACILITY_CLASS_PICNICKER 0x1c -#define FACILITY_CLASS_BUG_MANIAC 0x1d -#define FACILITY_CLASS_PSYCHIC_M 0x1e -#define FACILITY_CLASS_PSYCHIC_F 0x1f -#define FACILITY_CLASS_GENTLEMAN 0x20 +#define FACILITY_CLASS_HIKER 0x0 +#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 +#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 +#define FACILITY_CLASS_COOLTRAINER_M 0x3 +#define FACILITY_CLASS_BIRD_KEEPER 0x4 +#define FACILITY_CLASS_COLLECTOR 0x5 +#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 +#define FACILITY_CLASS_SWIMMER_M 0x7 +#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 +#define FACILITY_CLASS_EXPERT_M 0x9 +#define FACILITY_CLASS_BLACK_BELT 0xa +#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb +#define FACILITY_CLASS_HEX_MANIAC 0xc +#define FACILITY_CLASS_AROMA_LADY 0xd +#define FACILITY_CLASS_RUIN_MANIAC 0xe +#define FACILITY_CLASS_INTERVIEWER 0xf +#define FACILITY_CLASS_TUBER_F 0x10 +#define FACILITY_CLASS_TUBER_M 0x11 +#define FACILITY_CLASS_COOLTRAINER_F 0x12 +#define FACILITY_CLASS_LADY 0x13 +#define FACILITY_CLASS_BEAUTY 0x14 +#define FACILITY_CLASS_RICH_BOY 0x15 +#define FACILITY_CLASS_EXPERT_F 0x16 +#define FACILITY_CLASS_POKEMANIAC 0x17 +#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 +#define FACILITY_CLASS_GUITARIST 0x19 +#define FACILITY_CLASS_KINDLER 0x1a +#define FACILITY_CLASS_CAMPER 0x1b +#define FACILITY_CLASS_PICNICKER 0x1c +#define FACILITY_CLASS_BUG_MANIAC 0x1d +#define FACILITY_CLASS_PSYCHIC_M 0x1e +#define FACILITY_CLASS_PSYCHIC_F 0x1f +#define FACILITY_CLASS_GENTLEMAN 0x20 #define FACILITY_CLASS_ELITE_FOUR_SIDNEY 0x21 #define FACILITY_CLASS_ELITE_FOUR_PHOEBE 0x22 -#define FACILITY_CLASS_LEADER_ROXANNE 0x23 +#define FACILITY_CLASS_LEADER_ROXANNE 0x23 #define FACILITY_CLASS_LEADER_BRAWLY 0x24 -#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 -#define FACILITY_CLASS_SCHOOL_KID_M 0x26 -#define FACILITY_CLASS_SCHOOL_KID_F 0x27 -#define FACILITY_CLASS_SR_AND_JR 0x28 -#define FACILITY_CLASS_POKEFAN_M 0x29 -#define FACILITY_CLASS_POKEFAN_F 0x2a -#define FACILITY_CLASS_YOUNGSTER 0x2b -#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c -#define FACILITY_CLASS_FISHERMAN 0x2d -#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e -#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f -#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 -#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 -#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 -#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 -#define FACILITY_CLASS_DRAGON_TAMER 0x34 -#define FACILITY_CLASS_NINJA_BOY 0x35 -#define FACILITY_CLASS_BATTLE_GIRL 0x36 -#define FACILITY_CLASS_PARASOL_LADY 0x37 -#define FACILITY_CLASS_SWIMMER_F 0x38 -#define FACILITY_CLASS_TWINS 0x39 -#define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_PKMN_TRAINER_WALLY 0x3b -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c +#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 +#define FACILITY_CLASS_SCHOOL_KID_M 0x26 +#define FACILITY_CLASS_SCHOOL_KID_F 0x27 +#define FACILITY_CLASS_SR_AND_JR 0x28 +#define FACILITY_CLASS_POKEFAN_M 0x29 +#define FACILITY_CLASS_POKEFAN_F 0x2a +#define FACILITY_CLASS_YOUNGSTER 0x2b +#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c +#define FACILITY_CLASS_FISHERMAN 0x2d +#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e +#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f +#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 +#define FACILITY_CLASS_DRAGON_TAMER 0x34 +#define FACILITY_CLASS_NINJA_BOY 0x35 +#define FACILITY_CLASS_BATTLE_GIRL 0x36 +#define FACILITY_CLASS_PARASOL_LADY 0x37 +#define FACILITY_CLASS_SWIMMER_F 0x38 +#define FACILITY_CLASS_TWINS 0x39 +#define FACILITY_CLASS_SAILOR 0x3a +#define FACILITY_CLASS_PKMN_TRAINER_WALLY 0x3b +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2 0x3d #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3 0x3e -#define FACILITY_CLASS_PKMN_TRAINER_MAY 0x3f -#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 0x40 -#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 0x41 -#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 -#define FACILITY_CLASS_BUG_CATCHER 0x43 -#define FACILITY_CLASS_PKMN_RANGER_M 0x44 -#define FACILITY_CLASS_PKMN_RANGER_F 0x45 -#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 -#define FACILITY_CLASS_LASS 0x47 -#define FACILITY_CLASS_YOUNG_COUPLE 0x48 -#define FACILITY_CLASS_OLD_COUPLE 0x49 -#define FACILITY_CLASS_SIS_AND_BRO 0x4a -#define FACILITY_CLASS_STEVEN 0x4b -#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c -#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d -#define FACILITY_CLASS_RED 0x4e -#define FACILITY_CLASS_LEAF 0x4f -#define FACILITY_CLASS_RS_BRENDAN 0x50 -#define FACILITY_CLASS_RS_MAY 0x51 +#define FACILITY_CLASS_PKMN_TRAINER_MAY 0x3f +#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 0x40 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 0x41 +#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 +#define FACILITY_CLASS_BUG_CATCHER 0x43 +#define FACILITY_CLASS_PKMN_RANGER_M 0x44 +#define FACILITY_CLASS_PKMN_RANGER_F 0x45 +#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 +#define FACILITY_CLASS_LASS 0x47 +#define FACILITY_CLASS_YOUNG_COUPLE 0x48 +#define FACILITY_CLASS_OLD_COUPLE 0x49 +#define FACILITY_CLASS_SIS_AND_BRO 0x4a +#define FACILITY_CLASS_STEVEN 0x4b +#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c +#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d +#define FACILITY_CLASS_RED 0x4e +#define FACILITY_CLASS_LEAF 0x4f +#define FACILITY_CLASS_RS_BRENDAN 0x50 +#define FACILITY_CLASS_RS_MAY 0x51 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 #define TRAINER_CLASS_HIKER 0x2 #define TRAINER_CLASS_TEAM_AQUA 0x3 #define TRAINER_CLASS_PKMN_BREEDER 0x4 -#define TRAINER_CLASS_COOLTRAINER 0x5 +#define TRAINER_CLASS_COOLTRAINER 0x5 #define TRAINER_CLASS_BIRD_KEEPER 0x6 #define TRAINER_CLASS_COLLECTOR 0x7 #define TRAINER_CLASS_SWIMMER_M 0x8 @@ -218,7 +218,7 @@ #define TRAINER_CLASS_AROMA_LADY 0xf #define TRAINER_CLASS_RUIN_MANIAC 0x10 #define TRAINER_CLASS_INTERVIEWER 0x11 -#define TRAINER_CLASS_TUBER_F 0x12 +#define TRAINER_CLASS_TUBER_F 0x12 #define TRAINER_CLASS_TUBER_M 0x13 #define TRAINER_CLASS_LADY 0x14 #define TRAINER_CLASS_BEAUTY 0x15 -- cgit v1.2.3 From d8b952f94ccf3b1806db5733188be2249d91fe35 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 13:37:32 +0100 Subject: Clean up items data --- ld_script.txt | 2 + src/battle_anim_80D51AC.c | 55 ++++ src/data/items.h | 768 +++++++++++++++++++++++++++++++++++++++++++++- src/item.c | 9 +- src/item_menu_icons.c | 68 +--- 5 files changed, 818 insertions(+), 84 deletions(-) diff --git a/ld_script.txt b/ld_script.txt index 86562a541..ddafe6ecf 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -459,6 +459,8 @@ SECTIONS { src/fldeff_cut.o(.rodata); src/map_name_popup.o(.rodata); src/item_menu_icons.o(.rodata); + src/battle_anim_80D51AC.o(.rodata); + src/item.o(.rodata); data/contest.o(.rodata); src/shop.o(.rodata); src/fldeff_escalator.o(.rodata); diff --git a/src/battle_anim_80D51AC.c b/src/battle_anim_80D51AC.c index 25e07dc3a..6c1a2ad99 100644 --- a/src/battle_anim_80D51AC.c +++ b/src/battle_anim_80D51AC.c @@ -28,6 +28,61 @@ void sub_80D6308(u8 taskId); void sub_80D646C(u8 taskId); void sub_80A8B3C(u8 taskId); +const struct SpriteTemplate gHorizontalLungeSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = DoHorizontalLunge, +}; + +const struct SpriteTemplate gVerticalDipSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = DoVerticalDip, +}; + +const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SlideMonToOriginalPos, +}; + +const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SlideMonToOffset, +}; + +const struct SpriteTemplate gUnknown_0857FE88 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80D5B48, +}; + // Task to facilitate simple shaking of a pokemon's picture in battle. // The shaking alternates between the original position and the target position. // arg 0: anim battler diff --git a/src/data/items.h b/src/data/items.h index 2293bcfac..a36a13033 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1,5 +1,6 @@ const struct Item gItems[] = { + [ITEM_NONE] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -17,8 +18,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Pokeballs +// Pokeballs + [ITEM_MASTER_BALL] = { .name = _("MASTER BALL"), .itemId = ITEM_MASTER_BALL, @@ -35,6 +37,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 0, }, + + [ITEM_ULTRA_BALL] = { .name = _("ULTRA BALL"), .itemId = ITEM_ULTRA_BALL, @@ -51,6 +55,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 1, }, + + [ITEM_GREAT_BALL] = { .name = _("GREAT BALL"), .itemId = ITEM_GREAT_BALL, @@ -67,6 +73,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 2, }, + + [ITEM_POKE_BALL] = { .name = _("POKé BALL"), .itemId = ITEM_POKE_BALL, @@ -83,6 +91,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 3, }, + + [ITEM_SAFARI_BALL] = { .name = _("SAFARI BALL"), .itemId = ITEM_SAFARI_BALL, @@ -99,6 +109,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 4, }, + + [ITEM_NET_BALL] = { .name = _("NET BALL"), .itemId = ITEM_NET_BALL, @@ -115,6 +127,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 5, }, + + [ITEM_DIVE_BALL] = { .name = _("DIVE BALL"), .itemId = ITEM_DIVE_BALL, @@ -131,6 +145,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 6, }, + + [ITEM_NEST_BALL] = { .name = _("NEST BALL"), .itemId = ITEM_NEST_BALL, @@ -147,6 +163,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 7, }, + + [ITEM_REPEAT_BALL] = { .name = _("REPEAT BALL"), .itemId = ITEM_REPEAT_BALL, @@ -163,6 +181,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 8, }, + + [ITEM_TIMER_BALL] = { .name = _("TIMER BALL"), .itemId = ITEM_TIMER_BALL, @@ -179,6 +199,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 9, }, + + [ITEM_LUXURY_BALL] = { .name = _("LUXURY BALL"), .itemId = ITEM_LUXURY_BALL, @@ -195,6 +217,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PokeBall, .secondaryId = 10, }, + + [ITEM_PREMIER_BALL] = { .name = _("PREMIER BALL"), .itemId = ITEM_PREMIER_BALL, @@ -212,8 +236,9 @@ const struct Item gItems[] = .secondaryId = 11, }, -//Medicine +// Medicine + [ITEM_POTION] = { .name = _("POTION"), .itemId = ITEM_POTION, @@ -230,6 +255,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ANTIDOTE] = { .name = _("ANTIDOTE"), .itemId = ITEM_ANTIDOTE, @@ -246,6 +273,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_BURN_HEAL] = { .name = _("BURN HEAL"), .itemId = ITEM_BURN_HEAL, @@ -262,6 +291,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ICE_HEAL] = { .name = _("ICE HEAL"), .itemId = ITEM_ICE_HEAL, @@ -278,6 +309,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_AWAKENING] = { .name = _("AWAKENING"), .itemId = ITEM_AWAKENING, @@ -294,6 +327,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_PARALYZE_HEAL] = { .name = _("PARLYZ HEAL"), .itemId = ITEM_PARALYZE_HEAL, @@ -310,6 +345,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_FULL_RESTORE] = { .name = _("FULL RESTORE"), .itemId = ITEM_FULL_RESTORE, @@ -326,6 +363,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_MAX_POTION] = { .name = _("MAX POTION"), .itemId = ITEM_MAX_POTION, @@ -342,6 +381,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_HYPER_POTION] = { .name = _("HYPER POTION"), .itemId = ITEM_HYPER_POTION, @@ -358,6 +399,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_SUPER_POTION] = { .name = _("SUPER POTION"), .itemId = ITEM_SUPER_POTION, @@ -374,6 +417,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_FULL_HEAL] = { .name = _("FULL HEAL"), .itemId = ITEM_FULL_HEAL, @@ -390,6 +435,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_REVIVE] = { .name = _("REVIVE"), .itemId = ITEM_REVIVE, @@ -406,6 +453,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_MAX_REVIVE] = { .name = _("MAX REVIVE"), .itemId = ITEM_MAX_REVIVE, @@ -422,6 +471,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_FRESH_WATER] = { .name = _("FRESH WATER"), .itemId = ITEM_FRESH_WATER, @@ -438,6 +489,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_SODA_POP] = { .name = _("SODA POP"), .itemId = ITEM_SODA_POP, @@ -454,6 +507,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_LEMONADE] = { .name = _("LEMONADE"), .itemId = ITEM_LEMONADE, @@ -470,6 +525,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_MOOMOO_MILK] = { .name = _("MOOMOO MILK"), .itemId = ITEM_MOOMOO_MILK, @@ -486,6 +543,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ENERGY_POWDER] = { .name = _("ENERGYPOWDER"), .itemId = ITEM_ENERGY_POWDER, @@ -502,6 +561,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ENERGY_ROOT] = { .name = _("ENERGY ROOT"), .itemId = ITEM_ENERGY_ROOT, @@ -518,6 +579,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_HEAL_POWDER] = { .name = _("HEAL POWDER"), .itemId = ITEM_HEAL_POWDER, @@ -534,6 +597,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_REVIVAL_HERB] = { .name = _("REVIVAL HERB"), .itemId = ITEM_REVIVAL_HERB, @@ -550,6 +615,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ETHER] = { .name = _("ETHER"), .itemId = ITEM_ETHER, @@ -566,6 +633,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_MAX_ETHER] = { .name = _("MAX ETHER"), .itemId = ITEM_MAX_ETHER, @@ -582,6 +651,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_ELIXIR] = { .name = _("ELIXIR"), .itemId = ITEM_ELIXIR, @@ -598,6 +669,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_MAX_ELIXIR] = { .name = _("MAX ELIXIR"), .itemId = ITEM_MAX_ELIXIR, @@ -614,6 +687,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_LAVA_COOKIE] = { .name = _("LAVA COOKIE"), .itemId = ITEM_LAVA_COOKIE, @@ -630,6 +705,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_BLUE_FLUTE] = { .name = _("BLUE FLUTE"), .itemId = ITEM_BLUE_FLUTE, @@ -646,6 +723,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_YELLOW_FLUTE] = { .name = _("YELLOW FLUTE"), .itemId = ITEM_YELLOW_FLUTE, @@ -662,6 +741,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_RED_FLUTE] = { .name = _("RED FLUTE"), .itemId = ITEM_RED_FLUTE, @@ -678,6 +759,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_BLACK_FLUTE] = { .name = _("BLACK FLUTE"), .itemId = ITEM_BLACK_FLUTE, @@ -694,6 +777,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WHITE_FLUTE] = { .name = _("WHITE FLUTE"), .itemId = ITEM_WHITE_FLUTE, @@ -710,6 +795,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BERRY_JUICE] = { .name = _("BERRY JUICE"), .itemId = ITEM_BERRY_JUICE, @@ -726,6 +813,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_SACRED_ASH] = { .name = _("SACRED ASH"), .itemId = ITEM_SACRED_ASH, @@ -743,8 +832,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Collectibles +// Collectibles + [ITEM_SHOAL_SALT] = { .name = _("SHOAL SALT"), .itemId = ITEM_SHOAL_SALT, @@ -761,6 +851,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SHOAL_SHELL] = { .name = _("SHOAL SHELL"), .itemId = ITEM_SHOAL_SHELL, @@ -777,6 +869,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RED_SHARD] = { .name = _("RED SHARD"), .itemId = ITEM_RED_SHARD, @@ -793,6 +887,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLUE_SHARD] = { .name = _("BLUE SHARD"), .itemId = ITEM_BLUE_SHARD, @@ -809,6 +905,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_YELLOW_SHARD] = { .name = _("YELLOW SHARD"), .itemId = ITEM_YELLOW_SHARD, @@ -825,6 +923,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GREEN_SHARD] = { .name = _("GREEN SHARD"), .itemId = ITEM_GREEN_SHARD, @@ -841,6 +941,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_034] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -857,6 +959,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_035] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -873,6 +977,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_036] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -889,6 +995,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_037] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -905,6 +1013,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_038] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -921,6 +1031,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_039] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -937,6 +1049,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03A] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -953,6 +1067,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03B] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -969,6 +1085,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03C] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -985,6 +1103,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03D] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1001,6 +1121,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_03E] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1018,8 +1140,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Vitamins +// Vitamins + [ITEM_HP_UP] = { .name = _("HP UP"), .itemId = ITEM_HP_UP, @@ -1036,6 +1159,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PROTEIN] = { .name = _("PROTEIN"), .itemId = ITEM_PROTEIN, @@ -1052,6 +1177,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_IRON] = { .name = _("IRON"), .itemId = ITEM_IRON, @@ -1068,6 +1195,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CARBOS] = { .name = _("CARBOS"), .itemId = ITEM_CARBOS, @@ -1084,6 +1213,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CALCIUM] = { .name = _("CALCIUM"), .itemId = ITEM_CALCIUM, @@ -1100,6 +1231,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RARE_CANDY] = { .name = _("RARE CANDY"), .itemId = ITEM_RARE_CANDY, @@ -1116,6 +1249,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PP_UP] = { .name = _("PP UP"), .itemId = ITEM_PP_UP, @@ -1132,6 +1267,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ZINC] = { .name = _("ZINC"), .itemId = ITEM_ZINC, @@ -1148,6 +1285,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PP_MAX] = { .name = _("PP MAX"), .itemId = ITEM_PP_MAX, @@ -1164,6 +1303,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_048] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1181,8 +1322,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Battle items +// Battle items + [ITEM_GUARD_SPEC] = { .name = _("GUARD SPEC."), .itemId = ITEM_GUARD_SPEC, @@ -1199,6 +1341,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_DIRE_HIT] = { .name = _("DIRE HIT"), .itemId = ITEM_DIRE_HIT, @@ -1215,6 +1359,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_ATTACK] = { .name = _("X ATTACK"), .itemId = ITEM_X_ATTACK, @@ -1231,6 +1377,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_DEFEND] = { .name = _("X DEFEND"), .itemId = ITEM_X_DEFEND, @@ -1247,6 +1395,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_SPEED] = { .name = _("X SPEED"), .itemId = ITEM_X_SPEED, @@ -1263,6 +1413,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_ACCURACY] = { .name = _("X ACCURACY"), .itemId = ITEM_X_ACCURACY, @@ -1279,6 +1431,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_X_SPECIAL] = { .name = _("X SPECIAL"), .itemId = ITEM_X_SPECIAL, @@ -1295,6 +1449,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_StatIncrease, .secondaryId = 0, }, + + [ITEM_POKE_DOLL] = { .name = _("POKé DOLL"), .itemId = ITEM_POKE_DOLL, @@ -1311,6 +1467,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Escape, .secondaryId = 0, }, + + [ITEM_FLUFFY_TAIL] = { .name = _("FLUFFY TAIL"), .itemId = ITEM_FLUFFY_TAIL, @@ -1327,6 +1485,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Escape, .secondaryId = 0, }, + + [ITEM_052] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1344,8 +1504,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Field items +// Field items + [ITEM_SUPER_REPEL] = { .name = _("SUPER REPEL"), .itemId = ITEM_SUPER_REPEL, @@ -1362,6 +1523,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MAX_REPEL] = { .name = _("MAX REPEL"), .itemId = ITEM_MAX_REPEL, @@ -1378,6 +1541,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ESCAPE_ROPE] = { .name = _("ESCAPE ROPE"), .itemId = ITEM_ESCAPE_ROPE, @@ -1394,6 +1559,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_REPEL] = { .name = _("REPEL"), .itemId = ITEM_REPEL, @@ -1410,6 +1577,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_057] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1426,6 +1595,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_058] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1442,6 +1613,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_059] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1458,6 +1631,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_05A] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1474,6 +1649,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_05B] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1490,6 +1667,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_05C] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1507,8 +1686,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Evolution stones +// Evolution stones + [ITEM_SUN_STONE] = { .name = _("SUN STONE"), .itemId = ITEM_SUN_STONE, @@ -1525,6 +1705,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MOON_STONE] = { .name = _("MOON STONE"), .itemId = ITEM_MOON_STONE, @@ -1541,6 +1723,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_FIRE_STONE] = { .name = _("FIRE STONE"), .itemId = ITEM_FIRE_STONE, @@ -1557,6 +1741,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_THUNDER_STONE] = { .name = _("THUNDERSTONE"), .itemId = ITEM_THUNDER_STONE, @@ -1573,6 +1759,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WATER_STONE] = { .name = _("WATER STONE"), .itemId = ITEM_WATER_STONE, @@ -1589,6 +1777,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LEAF_STONE] = { .name = _("LEAF STONE"), .itemId = ITEM_LEAF_STONE, @@ -1605,6 +1795,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_063] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1621,6 +1813,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_064] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1637,6 +1831,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_065] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1653,6 +1849,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_066] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1670,8 +1868,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Valuable items +// Valuable items + [ITEM_TINY_MUSHROOM] = { .name = _("TINYMUSHROOM"), .itemId = ITEM_TINY_MUSHROOM, @@ -1688,6 +1887,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BIG_MUSHROOM] = { .name = _("BIG MUSHROOM"), .itemId = ITEM_BIG_MUSHROOM, @@ -1704,6 +1905,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_069] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1720,6 +1923,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PEARL] = { .name = _("PEARL"), .itemId = ITEM_PEARL, @@ -1736,6 +1941,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BIG_PEARL] = { .name = _("BIG PEARL"), .itemId = ITEM_BIG_PEARL, @@ -1752,6 +1959,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STARDUST] = { .name = _("STARDUST"), .itemId = ITEM_STARDUST, @@ -1768,6 +1977,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STAR_PIECE] = { .name = _("STAR PIECE"), .itemId = ITEM_STAR_PIECE, @@ -1784,6 +1995,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_NUGGET] = { .name = _("NUGGET"), .itemId = ITEM_NUGGET, @@ -1800,6 +2013,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HEART_SCALE] = { .name = _("HEART SCALE"), .itemId = ITEM_HEART_SCALE, @@ -1816,6 +2031,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_070] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1832,6 +2049,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_071] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1848,6 +2067,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_072] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1864,6 +2085,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_073] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1880,6 +2103,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_074] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1896,6 +2121,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_075] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1912,6 +2139,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_076] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1928,6 +2157,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_077] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1944,6 +2175,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_078] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -1961,7 +2194,8 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Mail +// Mail + [ITEM_ORANGE_MAIL] = { .name = _("ORANGE MAIL"), .itemId = ITEM_ORANGE_MAIL, @@ -1978,6 +2212,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HARBOR_MAIL] = { .name = _("HARBOR MAIL"), .itemId = ITEM_HARBOR_MAIL, @@ -1994,6 +2230,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 1, }, + + [ITEM_GLITTER_MAIL] = { .name = _("GLITTER MAIL"), .itemId = ITEM_GLITTER_MAIL, @@ -2010,6 +2248,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 2, }, + + [ITEM_MECH_MAIL] = { .name = _("MECH MAIL"), .itemId = ITEM_MECH_MAIL, @@ -2026,6 +2266,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 3, }, + + [ITEM_WOOD_MAIL] = { .name = _("WOOD MAIL"), .itemId = ITEM_WOOD_MAIL, @@ -2042,6 +2284,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 4, }, + + [ITEM_WAVE_MAIL] = { .name = _("WAVE MAIL"), .itemId = ITEM_WAVE_MAIL, @@ -2058,6 +2302,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 5, }, + + [ITEM_BEAD_MAIL] = { .name = _("BEAD MAIL"), .itemId = ITEM_BEAD_MAIL, @@ -2074,6 +2320,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 6, }, + + [ITEM_SHADOW_MAIL] = { .name = _("SHADOW MAIL"), .itemId = ITEM_SHADOW_MAIL, @@ -2090,6 +2338,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 7, }, + + [ITEM_TROPIC_MAIL] = { .name = _("TROPIC MAIL"), .itemId = ITEM_TROPIC_MAIL, @@ -2106,6 +2356,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 8, }, + + [ITEM_DREAM_MAIL] = { .name = _("DREAM MAIL"), .itemId = ITEM_DREAM_MAIL, @@ -2122,6 +2374,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 9, }, + + [ITEM_FAB_MAIL] = { .name = _("FAB MAIL"), .itemId = ITEM_FAB_MAIL, @@ -2138,6 +2392,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 10, }, + + [ITEM_RETRO_MAIL] = { .name = _("RETRO MAIL"), .itemId = ITEM_RETRO_MAIL, @@ -2155,8 +2411,9 @@ const struct Item gItems[] = .secondaryId = 11, }, -//Berries +// Berries + [ITEM_CHERI_BERRY] = { .name = _("CHERI BERRY"), .itemId = ITEM_CHERI_BERRY, @@ -2173,6 +2430,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_CHESTO_BERRY] = { .name = _("CHESTO BERRY"), .itemId = ITEM_CHESTO_BERRY, @@ -2189,6 +2448,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_PECHA_BERRY] = { .name = _("PECHA BERRY"), .itemId = ITEM_PECHA_BERRY, @@ -2205,6 +2466,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_RAWST_BERRY] = { .name = _("RAWST BERRY"), .itemId = ITEM_RAWST_BERRY, @@ -2221,6 +2484,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_ASPEAR_BERRY] = { .name = _("ASPEAR BERRY"), .itemId = ITEM_ASPEAR_BERRY, @@ -2237,6 +2502,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_LEPPA_BERRY] = { .name = _("LEPPA BERRY"), .itemId = ITEM_LEPPA_BERRY, @@ -2253,6 +2520,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_PPRecovery, .secondaryId = 0, }, + + [ITEM_ORAN_BERRY] = { .name = _("ORAN BERRY"), .itemId = ITEM_ORAN_BERRY, @@ -2269,6 +2538,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_PERSIM_BERRY] = { .name = _("PERSIM BERRY"), .itemId = ITEM_PERSIM_BERRY, @@ -2285,6 +2556,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_LUM_BERRY] = { .name = _("LUM BERRY"), .itemId = ITEM_LUM_BERRY, @@ -2301,6 +2574,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_SITRUS_BERRY] = { .name = _("SITRUS BERRY"), .itemId = ITEM_SITRUS_BERRY, @@ -2317,6 +2592,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, .secondaryId = 0, }, + + [ITEM_FIGY_BERRY] = { .name = _("FIGY BERRY"), .itemId = ITEM_FIGY_BERRY, @@ -2333,6 +2610,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WIKI_BERRY] = { .name = _("WIKI BERRY"), .itemId = ITEM_WIKI_BERRY, @@ -2349,6 +2628,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MAGO_BERRY] = { .name = _("MAGO BERRY"), .itemId = ITEM_MAGO_BERRY, @@ -2365,6 +2646,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_AGUAV_BERRY] = { .name = _("AGUAV BERRY"), .itemId = ITEM_AGUAV_BERRY, @@ -2381,6 +2664,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_IAPAPA_BERRY] = { .name = _("IAPAPA BERRY"), .itemId = ITEM_IAPAPA_BERRY, @@ -2397,6 +2682,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RAZZ_BERRY] = { .name = _("RAZZ BERRY"), .itemId = ITEM_RAZZ_BERRY, @@ -2413,6 +2700,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLUK_BERRY] = { .name = _("BLUK BERRY"), .itemId = ITEM_BLUK_BERRY, @@ -2429,6 +2718,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_NANAB_BERRY] = { .name = _("NANAB BERRY"), .itemId = ITEM_NANAB_BERRY, @@ -2445,6 +2736,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WEPEAR_BERRY] = { .name = _("WEPEAR BERRY"), .itemId = ITEM_WEPEAR_BERRY, @@ -2461,6 +2754,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PINAP_BERRY] = { .name = _("PINAP BERRY"), .itemId = ITEM_PINAP_BERRY, @@ -2477,6 +2772,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_POMEG_BERRY] = { .name = _("POMEG BERRY"), .itemId = ITEM_POMEG_BERRY, @@ -2493,6 +2790,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_KELPSY_BERRY] = { .name = _("KELPSY BERRY"), .itemId = ITEM_KELPSY_BERRY, @@ -2509,6 +2808,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_QUALOT_BERRY] = { .name = _("QUALOT BERRY"), .itemId = ITEM_QUALOT_BERRY, @@ -2525,6 +2826,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HONDEW_BERRY] = { .name = _("HONDEW BERRY"), .itemId = ITEM_HONDEW_BERRY, @@ -2541,6 +2844,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GREPA_BERRY] = { .name = _("GREPA BERRY"), .itemId = ITEM_GREPA_BERRY, @@ -2557,6 +2862,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TAMATO_BERRY] = { .name = _("TAMATO BERRY"), .itemId = ITEM_TAMATO_BERRY, @@ -2573,6 +2880,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CORNN_BERRY] = { .name = _("CORNN BERRY"), .itemId = ITEM_CORNN_BERRY, @@ -2589,6 +2898,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MAGOST_BERRY] = { .name = _("MAGOST BERRY"), .itemId = ITEM_MAGOST_BERRY, @@ -2605,6 +2916,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RABUTA_BERRY] = { .name = _("RABUTA BERRY"), .itemId = ITEM_RABUTA_BERRY, @@ -2621,6 +2934,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_NOMEL_BERRY] = { .name = _("NOMEL BERRY"), .itemId = ITEM_NOMEL_BERRY, @@ -2637,6 +2952,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SPELON_BERRY] = { .name = _("SPELON BERRY"), .itemId = ITEM_SPELON_BERRY, @@ -2653,6 +2970,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PAMTRE_BERRY] = { .name = _("PAMTRE BERRY"), .itemId = ITEM_PAMTRE_BERRY, @@ -2669,6 +2988,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WATMEL_BERRY] = { .name = _("WATMEL BERRY"), .itemId = ITEM_WATMEL_BERRY, @@ -2685,6 +3006,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DURIN_BERRY] = { .name = _("DURIN BERRY"), .itemId = ITEM_DURIN_BERRY, @@ -2701,6 +3024,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BELUE_BERRY] = { .name = _("BELUE BERRY"), .itemId = ITEM_BELUE_BERRY, @@ -2717,6 +3042,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LIECHI_BERRY] = { .name = _("LIECHI BERRY"), .itemId = ITEM_LIECHI_BERRY, @@ -2733,6 +3060,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GANLON_BERRY] = { .name = _("GANLON BERRY"), .itemId = ITEM_GANLON_BERRY, @@ -2749,6 +3078,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SALAC_BERRY] = { .name = _("SALAC BERRY"), .itemId = ITEM_SALAC_BERRY, @@ -2765,6 +3096,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PETAYA_BERRY] = { .name = _("PETAYA BERRY"), .itemId = ITEM_PETAYA_BERRY, @@ -2781,6 +3114,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_APICOT_BERRY] = { .name = _("APICOT BERRY"), .itemId = ITEM_APICOT_BERRY, @@ -2797,6 +3132,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LANSAT_BERRY] = { .name = _("LANSAT BERRY"), .itemId = ITEM_LANSAT_BERRY, @@ -2813,6 +3150,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STARF_BERRY] = { .name = _("STARF BERRY"), .itemId = ITEM_STARF_BERRY, @@ -2829,6 +3168,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ENIGMA_BERRY] = { .name = _("ENIGMA BERRY"), .itemId = ITEM_ENIGMA_BERRY, @@ -2845,6 +3186,8 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_EnigmaBerry, .secondaryId = 0, }, + + [ITEM_0B0] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -2861,6 +3204,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0B1] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -2877,6 +3222,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0B2] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -2894,8 +3241,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Hold items +// Hold items + [ITEM_BRIGHT_POWDER] = { .name = _("BRIGHTPOWDER"), .itemId = ITEM_BRIGHT_POWDER, @@ -2912,6 +3260,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WHITE_HERB] = { .name = _("WHITE HERB"), .itemId = ITEM_WHITE_HERB, @@ -2928,6 +3278,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MACHO_BRACE] = { .name = _("MACHO BRACE"), .itemId = ITEM_MACHO_BRACE, @@ -2944,6 +3296,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_EXP_SHARE] = { .name = _("EXP. SHARE"), .itemId = ITEM_EXP_SHARE, @@ -2960,6 +3314,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_QUICK_CLAW] = { .name = _("QUICK CLAW"), .itemId = ITEM_QUICK_CLAW, @@ -2976,6 +3332,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SOOTHE_BELL] = { .name = _("SOOTHE BELL"), .itemId = ITEM_SOOTHE_BELL, @@ -2992,6 +3350,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MENTAL_HERB] = { .name = _("MENTAL HERB"), .itemId = ITEM_MENTAL_HERB, @@ -3008,6 +3368,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CHOICE_BAND] = { .name = _("CHOICE BAND"), .itemId = ITEM_CHOICE_BAND, @@ -3024,6 +3386,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_KINGS_ROCK] = { .name = _("KING’S ROCK"), .itemId = ITEM_KINGS_ROCK, @@ -3040,6 +3404,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SILVER_POWDER] = { .name = _("SILVERPOWDER"), .itemId = ITEM_SILVER_POWDER, @@ -3056,6 +3422,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_AMULET_COIN] = { .name = _("AMULET COIN"), .itemId = ITEM_AMULET_COIN, @@ -3072,6 +3440,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CLEANSE_TAG] = { .name = _("CLEANSE TAG"), .itemId = ITEM_CLEANSE_TAG, @@ -3088,6 +3458,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SOUL_DEW] = { .name = _("SOUL DEW"), .itemId = ITEM_SOUL_DEW, @@ -3104,6 +3476,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DEEP_SEA_TOOTH] = { .name = _("DEEPSEATOOTH"), .itemId = ITEM_DEEP_SEA_TOOTH, @@ -3120,6 +3494,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DEEP_SEA_SCALE] = { .name = _("DEEPSEASCALE"), .itemId = ITEM_DEEP_SEA_SCALE, @@ -3136,6 +3512,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SMOKE_BALL] = { .name = _("SMOKE BALL"), .itemId = ITEM_SMOKE_BALL, @@ -3152,6 +3530,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_EVERSTONE] = { .name = _("EVERSTONE"), .itemId = ITEM_EVERSTONE, @@ -3168,6 +3548,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_FOCUS_BAND] = { .name = _("FOCUS BAND"), .itemId = ITEM_FOCUS_BAND, @@ -3184,6 +3566,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LUCKY_EGG] = { .name = _("LUCKY EGG"), .itemId = ITEM_LUCKY_EGG, @@ -3200,6 +3584,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SCOPE_LENS] = { .name = _("SCOPE LENS"), .itemId = ITEM_SCOPE_LENS, @@ -3216,6 +3602,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_METAL_COAT] = { .name = _("METAL COAT"), .itemId = ITEM_METAL_COAT, @@ -3232,6 +3620,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LEFTOVERS] = { .name = _("LEFTOVERS"), .itemId = ITEM_LEFTOVERS, @@ -3248,6 +3638,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DRAGON_SCALE] = { .name = _("DRAGON SCALE"), .itemId = ITEM_DRAGON_SCALE, @@ -3264,6 +3656,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LIGHT_BALL] = { .name = _("LIGHT BALL"), .itemId = ITEM_LIGHT_BALL, @@ -3280,6 +3674,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SOFT_SAND] = { .name = _("SOFT SAND"), .itemId = ITEM_SOFT_SAND, @@ -3296,6 +3692,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HARD_STONE] = { .name = _("HARD STONE"), .itemId = ITEM_HARD_STONE, @@ -3312,6 +3710,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MIRACLE_SEED] = { .name = _("MIRACLE SEED"), .itemId = ITEM_MIRACLE_SEED, @@ -3328,6 +3728,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLACK_GLASSES] = { .name = _("BLACKGLASSES"), .itemId = ITEM_BLACK_GLASSES, @@ -3344,6 +3746,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLACK_BELT] = { .name = _("BLACK BELT"), .itemId = ITEM_BLACK_BELT, @@ -3360,6 +3764,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MAGNET] = { .name = _("MAGNET"), .itemId = ITEM_MAGNET, @@ -3376,6 +3782,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MYSTIC_WATER] = { .name = _("MYSTIC WATER"), .itemId = ITEM_MYSTIC_WATER, @@ -3392,6 +3800,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SHARP_BEAK] = { .name = _("SHARP BEAK"), .itemId = ITEM_SHARP_BEAK, @@ -3408,6 +3818,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_POISON_BARB] = { .name = _("POISON BARB"), .itemId = ITEM_POISON_BARB, @@ -3424,6 +3836,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_NEVER_MELT_ICE] = { .name = _("NEVERMELTICE"), .itemId = ITEM_NEVER_MELT_ICE, @@ -3440,6 +3854,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SPELL_TAG] = { .name = _("SPELL TAG"), .itemId = ITEM_SPELL_TAG, @@ -3456,6 +3872,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TWISTED_SPOON] = { .name = _("TWISTEDSPOON"), .itemId = ITEM_TWISTED_SPOON, @@ -3472,6 +3890,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CHARCOAL] = { .name = _("CHARCOAL"), .itemId = ITEM_CHARCOAL, @@ -3488,6 +3908,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DRAGON_FANG] = { .name = _("DRAGON FANG"), .itemId = ITEM_DRAGON_FANG, @@ -3504,6 +3926,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SILK_SCARF] = { .name = _("SILK SCARF"), .itemId = ITEM_SILK_SCARF, @@ -3520,6 +3944,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_UP_GRADE] = { .name = _("UP-GRADE"), .itemId = ITEM_UP_GRADE, @@ -3536,6 +3962,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SHELL_BELL] = { .name = _("SHELL BELL"), .itemId = ITEM_SHELL_BELL, @@ -3552,6 +3980,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SEA_INCENSE] = { .name = _("SEA INCENSE"), .itemId = ITEM_SEA_INCENSE, @@ -3568,6 +3998,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LAX_INCENSE] = { .name = _("LAX INCENSE"), .itemId = ITEM_LAX_INCENSE, @@ -3584,6 +4016,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LUCKY_PUNCH] = { .name = _("LUCKY PUNCH"), .itemId = ITEM_LUCKY_PUNCH, @@ -3600,6 +4034,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_METAL_POWDER] = { .name = _("METAL POWDER"), .itemId = ITEM_METAL_POWDER, @@ -3616,6 +4052,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_THICK_CLUB] = { .name = _("THICK CLUB"), .itemId = ITEM_THICK_CLUB, @@ -3632,6 +4070,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STICK] = { .name = _("STICK"), .itemId = ITEM_STICK, @@ -3648,6 +4088,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E2] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3664,6 +4106,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E3] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3680,6 +4124,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E4] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3696,6 +4142,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E5] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3712,6 +4160,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E6] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3728,6 +4178,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E7] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3744,6 +4196,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E8] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3760,6 +4214,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0E9] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3776,6 +4232,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EA] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3792,6 +4250,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EB] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3808,6 +4268,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EC] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3824,6 +4286,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0ED] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3840,6 +4304,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EE] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3856,6 +4322,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0EF] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3872,6 +4340,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F0] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3888,6 +4358,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F1] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3904,6 +4376,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F2] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3920,6 +4394,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F3] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3936,6 +4412,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F4] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3952,6 +4430,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F5] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3968,6 +4448,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F6] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -3984,6 +4466,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F7] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4000,6 +4484,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F8] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4016,6 +4502,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0F9] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4032,6 +4520,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0FA] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4048,6 +4538,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0FB] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4064,6 +4556,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0FC] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4080,6 +4574,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_0FD] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4096,6 +4592,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RED_SCARF] = { .name = _("RED SCARF"), .itemId = ITEM_RED_SCARF, @@ -4112,6 +4610,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLUE_SCARF] = { .name = _("BLUE SCARF"), .itemId = ITEM_BLUE_SCARF, @@ -4128,6 +4628,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_PINK_SCARF] = { .name = _("PINK SCARF"), .itemId = ITEM_PINK_SCARF, @@ -4144,6 +4646,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GREEN_SCARF] = { .name = _("GREEN SCARF"), .itemId = ITEM_GREEN_SCARF, @@ -4160,6 +4664,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_YELLOW_SCARF] = { .name = _("YELLOW SCARF"), .itemId = ITEM_YELLOW_SCARF, @@ -4177,8 +4683,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Key items +// Key items + [ITEM_MACH_BIKE] = { .name = _("MACH BIKE"), .itemId = ITEM_MACH_BIKE, @@ -4195,6 +4702,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_COIN_CASE] = { .name = _("COIN CASE"), .itemId = ITEM_COIN_CASE, @@ -4211,6 +4720,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ITEMFINDER] = { .name = _("ITEMFINDER"), .itemId = ITEM_ITEMFINDER, @@ -4227,6 +4738,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_OLD_ROD] = { .name = _("OLD ROD"), .itemId = ITEM_OLD_ROD, @@ -4243,6 +4756,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GOOD_ROD] = { .name = _("GOOD ROD"), .itemId = ITEM_GOOD_ROD, @@ -4259,6 +4774,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 1, }, + + [ITEM_SUPER_ROD] = { .name = _("SUPER ROD"), .itemId = ITEM_SUPER_ROD, @@ -4275,6 +4792,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 2, }, + + [ITEM_SS_TICKET] = { .name = _("S.S. TICKET"), .itemId = ITEM_SS_TICKET, @@ -4291,6 +4810,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CONTEST_PASS] = { .name = _("CONTEST PASS"), .itemId = ITEM_CONTEST_PASS, @@ -4307,6 +4828,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_10B] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -4323,6 +4846,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_WAILMER_PAIL] = { .name = _("WAILMER PAIL"), .itemId = ITEM_WAILMER_PAIL, @@ -4339,6 +4864,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DEVON_GOODS] = { .name = _("DEVON GOODS"), .itemId = ITEM_DEVON_GOODS, @@ -4355,6 +4882,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SOOT_SACK] = { .name = _("SOOT SACK"), .itemId = ITEM_SOOT_SACK, @@ -4371,6 +4900,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BASEMENT_KEY] = { .name = _("BASEMENT KEY"), .itemId = ITEM_BASEMENT_KEY, @@ -4387,6 +4918,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ACRO_BIKE] = { .name = _("ACRO BIKE"), .itemId = ITEM_ACRO_BIKE, @@ -4403,6 +4936,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 1, }, + + [ITEM_POKEBLOCK_CASE] = { .name = _("{POKEBLOCK} CASE"), .itemId = ITEM_POKEBLOCK_CASE, @@ -4419,6 +4954,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LETTER] = { .name = _("LETTER"), .itemId = ITEM_LETTER, @@ -4435,6 +4972,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_EON_TICKET] = { .name = _("EON TICKET"), .itemId = ITEM_EON_TICKET, @@ -4451,6 +4990,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 1, }, + + [ITEM_RED_ORB] = { .name = _("RED ORB"), .itemId = ITEM_RED_ORB, @@ -4467,6 +5008,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BLUE_ORB] = { .name = _("BLUE ORB"), .itemId = ITEM_BLUE_ORB, @@ -4483,6 +5026,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SCANNER] = { .name = _("SCANNER"), .itemId = ITEM_SCANNER, @@ -4499,6 +5044,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GO_GOGGLES] = { .name = _("GO-GOGGLES"), .itemId = ITEM_GO_GOGGLES, @@ -4515,6 +5062,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_METEORITE] = { .name = _("METEORITE"), .itemId = ITEM_METEORITE, @@ -4531,6 +5080,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOM_1_KEY] = { .name = _("RM. 1 KEY"), .itemId = ITEM_ROOM_1_KEY, @@ -4547,6 +5098,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOM_2_KEY] = { .name = _("RM. 2 KEY"), .itemId = ITEM_ROOM_2_KEY, @@ -4563,6 +5116,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOM_4_KEY] = { .name = _("RM. 4 KEY"), .itemId = ITEM_ROOM_4_KEY, @@ -4579,6 +5134,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOM_6_KEY] = { .name = _("RM. 6 KEY"), .itemId = ITEM_ROOM_6_KEY, @@ -4595,6 +5152,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_STORAGE_KEY] = { .name = _("STORAGE KEY"), .itemId = ITEM_STORAGE_KEY, @@ -4611,6 +5170,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_ROOT_FOSSIL] = { .name = _("ROOT FOSSIL"), .itemId = ITEM_ROOT_FOSSIL, @@ -4627,6 +5188,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CLAW_FOSSIL] = { .name = _("CLAW FOSSIL"), .itemId = ITEM_CLAW_FOSSIL, @@ -4643,6 +5206,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DEVON_SCOPE] = { .name = _("DEVON SCOPE"), .itemId = ITEM_DEVON_SCOPE, @@ -4660,8 +5225,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//TMs/HMs +// TMs/HMs + [ITEM_TM01_FOCUS_PUNCH] = { .name = _("TM01"), .itemId = ITEM_TM01_FOCUS_PUNCH, @@ -4678,6 +5244,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM02_DRAGON_CLAW] = { .name = _("TM02"), .itemId = ITEM_TM02_DRAGON_CLAW, @@ -4694,6 +5262,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM03_WATER_PULSE] = { .name = _("TM03"), .itemId = ITEM_TM03_WATER_PULSE, @@ -4710,6 +5280,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM04_CALM_MIND] = { .name = _("TM04"), .itemId = ITEM_TM04_CALM_MIND, @@ -4726,6 +5298,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM05_ROAR] = { .name = _("TM05"), .itemId = ITEM_TM05_ROAR, @@ -4742,6 +5316,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM06_TOXIC] = { .name = _("TM06"), .itemId = ITEM_TM06_TOXIC, @@ -4758,6 +5334,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM07_HAIL] = { .name = _("TM07"), .itemId = ITEM_TM07_HAIL, @@ -4774,6 +5352,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM08_BULK_UP] = { .name = _("TM08"), .itemId = ITEM_TM08_BULK_UP, @@ -4790,6 +5370,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM09_BULLET_SEED] = { .name = _("TM09"), .itemId = ITEM_TM09_BULLET_SEED, @@ -4806,6 +5388,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM10_HIDDEN_POWER] = { .name = _("TM10"), .itemId = ITEM_TM10_HIDDEN_POWER, @@ -4822,6 +5406,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM11_SUNNY_DAY] = { .name = _("TM11"), .itemId = ITEM_TM11_SUNNY_DAY, @@ -4838,6 +5424,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM12_TAUNT] = { .name = _("TM12"), .itemId = ITEM_TM12_TAUNT, @@ -4854,6 +5442,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM13_ICE_BEAM] = { .name = _("TM13"), .itemId = ITEM_TM13_ICE_BEAM, @@ -4870,6 +5460,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM14_BLIZZARD] = { .name = _("TM14"), .itemId = ITEM_TM14_BLIZZARD, @@ -4886,6 +5478,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM15_HYPER_BEAM] = { .name = _("TM15"), .itemId = ITEM_TM15_HYPER_BEAM, @@ -4902,6 +5496,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM16_LIGHT_SCREEN] = { .name = _("TM16"), .itemId = ITEM_TM16_LIGHT_SCREEN, @@ -4918,6 +5514,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM17_PROTECT] = { .name = _("TM17"), .itemId = ITEM_TM17_PROTECT, @@ -4934,6 +5532,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM18_RAIN_DANCE] = { .name = _("TM18"), .itemId = ITEM_TM18_RAIN_DANCE, @@ -4950,6 +5550,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM19_GIGA_DRAIN] = { .name = _("TM19"), .itemId = ITEM_TM19_GIGA_DRAIN, @@ -4966,6 +5568,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM20_SAFEGUARD] = { .name = _("TM20"), .itemId = ITEM_TM20_SAFEGUARD, @@ -4982,6 +5586,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM21_FRUSTRATION] = { .name = _("TM21"), .itemId = ITEM_TM21_FRUSTRATION, @@ -4998,6 +5604,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM22_SOLARBEAM] = { .name = _("TM22"), .itemId = ITEM_TM22_SOLARBEAM, @@ -5014,6 +5622,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM23_IRON_TAIL] = { .name = _("TM23"), .itemId = ITEM_TM23_IRON_TAIL, @@ -5030,6 +5640,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM24_THUNDERBOLT] = { .name = _("TM24"), .itemId = ITEM_TM24_THUNDERBOLT, @@ -5046,6 +5658,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM25_THUNDER] = { .name = _("TM25"), .itemId = ITEM_TM25_THUNDER, @@ -5062,6 +5676,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM26_EARTHQUAKE] = { .name = _("TM26"), .itemId = ITEM_TM26_EARTHQUAKE, @@ -5078,6 +5694,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM27_RETURN] = { .name = _("TM27"), .itemId = ITEM_TM27_RETURN, @@ -5094,6 +5712,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM28_DIG] = { .name = _("TM28"), .itemId = ITEM_TM28_DIG, @@ -5110,6 +5730,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM29_PSYCHIC] = { .name = _("TM29"), .itemId = ITEM_TM29_PSYCHIC, @@ -5126,6 +5748,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM30_SHADOW_BALL] = { .name = _("TM30"), .itemId = ITEM_TM30_SHADOW_BALL, @@ -5142,6 +5766,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM31_BRICK_BREAK] = { .name = _("TM31"), .itemId = ITEM_TM31_BRICK_BREAK, @@ -5158,6 +5784,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM32_DOUBLE_TEAM] = { .name = _("TM32"), .itemId = ITEM_TM32_DOUBLE_TEAM, @@ -5174,6 +5802,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM33_REFLECT] = { .name = _("TM33"), .itemId = ITEM_TM33_REFLECT, @@ -5190,6 +5820,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM34_SHOCK_WAVE] = { .name = _("TM34"), .itemId = ITEM_TM34_SHOCK_WAVE, @@ -5206,6 +5838,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM35_FLAMETHROWER] = { .name = _("TM35"), .itemId = ITEM_TM35_FLAMETHROWER, @@ -5222,6 +5856,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM36_SLUDGE_BOMB] = { .name = _("TM36"), .itemId = ITEM_TM36_SLUDGE_BOMB, @@ -5238,6 +5874,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM37_SANDSTORM] = { .name = _("TM37"), .itemId = ITEM_TM37_SANDSTORM, @@ -5254,6 +5892,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM38_FIRE_BLAST] = { .name = _("TM38"), .itemId = ITEM_TM38_FIRE_BLAST, @@ -5270,6 +5910,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM39_ROCK_TOMB] = { .name = _("TM39"), .itemId = ITEM_TM39_ROCK_TOMB, @@ -5286,6 +5928,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM40_AERIAL_ACE] = { .name = _("TM40"), .itemId = ITEM_TM40_AERIAL_ACE, @@ -5302,6 +5946,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM41_TORMENT] = { .name = _("TM41"), .itemId = ITEM_TM41_TORMENT, @@ -5318,6 +5964,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM42_FACADE] = { .name = _("TM42"), .itemId = ITEM_TM42_FACADE, @@ -5334,6 +5982,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM43_SECRET_POWER] = { .name = _("TM43"), .itemId = ITEM_TM43_SECRET_POWER, @@ -5350,6 +6000,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM44_REST] = { .name = _("TM44"), .itemId = ITEM_TM44_REST, @@ -5366,6 +6018,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM45_ATTRACT] = { .name = _("TM45"), .itemId = ITEM_TM45_ATTRACT, @@ -5382,6 +6036,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM46_THIEF] = { .name = _("TM46"), .itemId = ITEM_TM46_THIEF, @@ -5398,6 +6054,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM47_STEEL_WING] = { .name = _("TM47"), .itemId = ITEM_TM47_STEEL_WING, @@ -5414,6 +6072,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM48_SKILL_SWAP] = { .name = _("TM48"), .itemId = ITEM_TM48_SKILL_SWAP, @@ -5430,6 +6090,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM49_SNATCH] = { .name = _("TM49"), .itemId = ITEM_TM49_SNATCH, @@ -5446,6 +6108,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM50_OVERHEAT] = { .name = _("TM50"), .itemId = ITEM_TM50_OVERHEAT, @@ -5462,6 +6126,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM01_CUT] = { .name = _("HM01"), .itemId = ITEM_HM01_CUT, @@ -5478,6 +6144,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM02_FLY] = { .name = _("HM02"), .itemId = ITEM_HM02_FLY, @@ -5494,6 +6162,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM03_SURF] = { .name = _("HM03"), .itemId = ITEM_HM03_SURF, @@ -5510,6 +6180,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM04_STRENGTH] = { .name = _("HM04"), .itemId = ITEM_HM04_STRENGTH, @@ -5526,6 +6198,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM05_FLASH] = { .name = _("HM05"), .itemId = ITEM_HM05_FLASH, @@ -5542,6 +6216,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM06_ROCK_SMASH] = { .name = _("HM06"), .itemId = ITEM_HM06_ROCK_SMASH, @@ -5558,6 +6234,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM07_WATERFALL] = { .name = _("HM07"), .itemId = ITEM_HM07_WATERFALL, @@ -5574,6 +6252,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HM08_DIVE] = { .name = _("HM08"), .itemId = ITEM_HM08_DIVE, @@ -5590,6 +6270,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_15B] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -5606,6 +6288,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_15C] = { .name = _("????????"), .itemId = ITEM_NONE, @@ -5623,8 +6307,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//FireRed/LeafGreen key items +// FireRed/LeafGreen key items + [ITEM_OAKS_PARCEL] = { .name = _("OAK’S PARCEL"), .itemId = ITEM_OAKS_PARCEL, @@ -5641,6 +6326,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_POKE_FLUTE] = { .name = _("POKé FLUTE"), .itemId = ITEM_POKE_FLUTE, @@ -5657,6 +6344,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SECRET_KEY] = { .name = _("SECRET KEY"), .itemId = ITEM_SECRET_KEY, @@ -5673,6 +6362,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BIKE_VOUCHER] = { .name = _("BIKE VOUCHER"), .itemId = ITEM_BIKE_VOUCHER, @@ -5689,6 +6380,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_GOLD_TEETH] = { .name = _("GOLD TEETH"), .itemId = ITEM_GOLD_TEETH, @@ -5705,6 +6398,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_OLD_AMBER] = { .name = _("OLD AMBER"), .itemId = ITEM_OLD_AMBER, @@ -5721,6 +6416,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_CARD_KEY] = { .name = _("CARD KEY"), .itemId = ITEM_CARD_KEY, @@ -5737,6 +6434,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_LIFT_KEY] = { .name = _("LIFT KEY"), .itemId = ITEM_LIFT_KEY, @@ -5753,6 +6452,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_HELIX_FOSSIL] = { .name = _("HELIX FOSSIL"), .itemId = ITEM_HELIX_FOSSIL, @@ -5769,6 +6470,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_DOME_FOSSIL] = { .name = _("DOME FOSSIL"), .itemId = ITEM_DOME_FOSSIL, @@ -5785,6 +6488,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SILPH_SCOPE] = { .name = _("SILPH SCOPE"), .itemId = ITEM_SILPH_SCOPE, @@ -5801,6 +6506,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BICYCLE] = { .name = _("BICYCLE"), .itemId = ITEM_BICYCLE, @@ -5817,6 +6524,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TOWN_MAP] = { .name = _("TOWN MAP"), .itemId = ITEM_TOWN_MAP, @@ -5833,6 +6542,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_VS_SEEKER] = { .name = _("VS SEEKER"), .itemId = ITEM_VS_SEEKER, @@ -5849,6 +6560,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_FAME_CHECKER] = { .name = _("FAME CHECKER"), .itemId = ITEM_FAME_CHECKER, @@ -5865,6 +6578,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TM_CASE] = { .name = _("TM CASE"), .itemId = ITEM_TM_CASE, @@ -5881,6 +6596,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_BERRY_POUCH] = { .name = _("BERRY POUCH"), .itemId = ITEM_BERRY_POUCH, @@ -5897,6 +6614,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TEACHY_TV] = { .name = _("TEACHY TV"), .itemId = ITEM_TEACHY_TV, @@ -5913,6 +6632,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TRI_PASS] = { .name = _("TRI-PASS"), .itemId = ITEM_TRI_PASS, @@ -5929,6 +6650,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RAINBOW_PASS] = { .name = _("RAINBOW PASS"), .itemId = ITEM_RAINBOW_PASS, @@ -5945,6 +6668,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_TEA] = { .name = _("TEA"), .itemId = ITEM_TEA, @@ -5961,6 +6686,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_MYSTIC_TICKET] = { .name = _("MYSTICTICKET"), .itemId = ITEM_MYSTIC_TICKET, @@ -5977,6 +6704,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_AURORA_TICKET] = { .name = _("AURORATICKET"), .itemId = ITEM_AURORA_TICKET, @@ -5993,6 +6722,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_POWDER_JAR] = { .name = _("POWDER JAR"), .itemId = ITEM_POWDER_JAR, @@ -6009,6 +6740,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_RUBY] = { .name = _("RUBY"), .itemId = ITEM_RUBY, @@ -6025,6 +6758,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SAPPHIRE] = { .name = _("SAPPHIRE"), .itemId = ITEM_SAPPHIRE, @@ -6042,8 +6777,9 @@ const struct Item gItems[] = .secondaryId = 0, }, -//Emerald-specific key items +// Emerald-specific key items + [ITEM_MAGMA_EMBLEM] = { .name = _("MAGMA EMBLEM"), .itemId = ITEM_MAGMA_EMBLEM, @@ -6060,6 +6796,8 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_OLD_SEA_MAP] = { .name = _("OLD SEA MAP"), .itemId = ITEM_OLD_SEA_MAP, diff --git a/src/item.c b/src/item.c index b2c009be6..6d2dbd561 100644 --- a/src/item.c +++ b/src/item.c @@ -1,7 +1,6 @@ #include "global.h" #include "item.h" #include "berry.h" -#include "constants/items.h" #include "string_util.h" #include "text.h" #include "event_data.h" @@ -10,11 +9,13 @@ #include "item_menu.h" #include "strings.h" #include "load_save.h" +#include "item_use.h" #include "battle_pyramid.h" #include "battle_pyramid_bag.h" +#include "constants/items.h" +#include "constants/hold_effects.h" extern u16 gUnknown_0203CF30[]; -extern const struct Item gItems[]; // this file's functions static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); @@ -23,6 +24,10 @@ static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count); // EWRAM variables EWRAM_DATA struct BagPocket gBagPockets[POCKETS_COUNT] = {0}; +// rodata +#include "data/text/item_descriptions.h" +#include "data/items.h" + // code static u16 GetBagItemQuantity(u16 *quantity) { diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 23dbd51eb..85b42b9b3 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -8,10 +8,8 @@ #include "menu_helpers.h" #include "berry.h" #include "graphics.h" -#include "constants/items.h" #include "item.h" -#include "item_use.h" -#include "constants/hold_effects.h" +#include "constants/items.h" struct CompressedTilesPal { @@ -19,12 +17,6 @@ struct CompressedTilesPal const u32 *pal; }; -extern void DoHorizontalLunge(struct Sprite *sprite); -extern void DoVerticalDip(struct Sprite *sprite); -extern void SlideMonToOriginalPos(struct Sprite *sprite); -extern void SlideMonToOffset(struct Sprite *sprite); -extern void sub_80D5B48(struct Sprite *sprite); - // this file's functions static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite); static void SpriteCB_ShakeBagVisual(struct Sprite *sprite); @@ -414,64 +406,6 @@ static const struct SpriteTemplate gUnknown_0857FE10 = .callback = SpriteCallbackDummy, }; -const struct SpriteTemplate gHorizontalLungeSpriteTemplate = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = DoHorizontalLunge, -}; - -const struct SpriteTemplate gVerticalDipSpriteTemplate = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = DoVerticalDip, -}; - -const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SlideMonToOriginalPos, -}; - -const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SlideMonToOffset, -}; - -const struct SpriteTemplate gUnknown_0857FE88 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80D5B48, -}; - -#include "data/text/item_descriptions.h" -#include "data/items.h" - // code void RemoveBagSprite(u8 id) { -- cgit v1.2.3 From 2779421ad479312eba5a0fc5bb993473e83465ee Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 3 Dec 2018 08:01:52 -0500 Subject: fix brendan/may/wally consistency issues --- include/constants/trainers.h | 14 +++++++------- src/battle_dome.c | 2 +- src/data/pokemon/trainer_class_lookups.h | 28 ++++++++++++++-------------- src/main_menu.c | 4 ++-- src/pokemon.c | 4 ++-- src/trainer_pokemon_sprites.c | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/constants/trainers.h b/include/constants/trainers.h index d1ab51e4e..d5b1dbba3 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -176,13 +176,13 @@ #define FACILITY_CLASS_SWIMMER_F 0x38 #define FACILITY_CLASS_TWINS 0x39 #define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_PKMN_TRAINER_WALLY 0x3b -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2 0x3d -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3 0x3e -#define FACILITY_CLASS_PKMN_TRAINER_MAY 0x3f -#define FACILITY_CLASS_PKMN_TRAINER_MAY_2 0x40 -#define FACILITY_CLASS_PKMN_TRAINER_MAY_3 0x41 +#define FACILITY_CLASS_WALLY 0x3b +#define FACILITY_CLASS_BRENDAN 0x3c +#define FACILITY_CLASS_BRENDAN_2 0x3d +#define FACILITY_CLASS_BRENDAN_3 0x3e +#define FACILITY_CLASS_MAY 0x3f +#define FACILITY_CLASS_MAY_2 0x40 +#define FACILITY_CLASS_MAY_3 0x41 #define FACILITY_CLASS_PKMN_BREEDER_M 0x42 #define FACILITY_CLASS_BUG_CATCHER 0x43 #define FACILITY_CLASS_PKMN_RANGER_M 0x44 diff --git a/src/battle_dome.c b/src/battle_dome.c index 152a11ae8..0f5721fb9 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -4791,7 +4791,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) i = 0; if (trainerId == TRAINER_PLAYER) - j = gFacilityClassToTrainerClass[FACILITY_CLASS_PKMN_TRAINER_BRENDAN]; + j = gFacilityClassToTrainerClass[FACILITY_CLASS_BRENDAN]; else if (trainerId == TRAINER_FRONTIER_BRAIN) j = GetDomeBrainTrainerClass(); else diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 4d3492e8b..6d28a9a06 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -62,13 +62,13 @@ const u8 gFacilityClassToPicIndex[] = [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F, [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR, - [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_PIC_WALLY, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_PIC_BRENDAN, - [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_PIC_MAY, - [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_PIC_MAY, + [FACILITY_CLASS_WALLY] = TRAINER_PIC_WALLY, + [FACILITY_CLASS_BRENDAN] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_BRENDAN_2] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_BRENDAN_3] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_MAY] = TRAINER_PIC_MAY, + [FACILITY_CLASS_MAY_2] = TRAINER_PIC_MAY, + [FACILITY_CLASS_MAY_3] = TRAINER_PIC_MAY, [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_PIC_POKEMON_BREEDER_M, [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER, [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M, @@ -148,13 +148,13 @@ const u8 gFacilityClassToTrainerClass[] = [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F, [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS, [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR, - [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3, - [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER, [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER, [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER, diff --git a/src/main_menu.c b/src/main_menu.c index a8383cd0c..ee777d106 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1772,12 +1772,12 @@ static void AddBirchSpeechObjects(u8 taskId) gSprites[lotadSpriteId].oam.priority = 0; gSprites[lotadSpriteId].invisible = TRUE; gTasks[taskId].tLotadSpriteId = lotadSpriteId; - brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_BRENDAN), 120, 60, 0, &gDecompressionBuffer[0]); + brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_BRENDAN), 120, 60, 0, &gDecompressionBuffer[0]); gSprites[brendanSpriteId].callback = nullsub_11; gSprites[brendanSpriteId].invisible = TRUE; gSprites[brendanSpriteId].oam.priority = 0; gTasks[taskId].tBrendanSpriteId = brendanSpriteId; - maySpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_MAY), 120, 60, 0, &gDecompressionBuffer[0x800]); + maySpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_MAY), 120, 60, 0, &gDecompressionBuffer[0x800]); gSprites[maySpriteId].callback = nullsub_11; gSprites[maySpriteId].invisible = TRUE; gSprites[maySpriteId].oam.priority = 0; diff --git a/src/pokemon.c b/src/pokemon.c index d4d9f2ac1..9c8836e2c 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -7113,9 +7113,9 @@ u16 FacilityClassToPicIndex(u16 facilityClass) u16 PlayerGenderToFrontTrainerPicId(u8 playerGender) { if (playerGender != MALE) - return FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_MAY); + return FacilityClassToPicIndex(FACILITY_CLASS_MAY); else - return FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_BRENDAN); + return FacilityClassToPicIndex(FACILITY_CLASS_BRENDAN); } void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality) diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 18c02350f..040310901 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -404,9 +404,9 @@ u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass) switch (gender) { default: - return gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_MAY]; + return gFacilityClassToPicIndex[FACILITY_CLASS_MAY]; case MALE: - return gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_BRENDAN]; + return gFacilityClassToPicIndex[FACILITY_CLASS_BRENDAN]; } } return gender; -- cgit v1.2.3 From 0e5e487b789f722dc5ceef6a1393ec4910753e34 Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 3 Dec 2018 08:04:11 -0500 Subject: tweak alignment --- include/constants/trainers.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/constants/trainers.h b/include/constants/trainers.h index d5b1dbba3..cf6eaf929 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -176,13 +176,13 @@ #define FACILITY_CLASS_SWIMMER_F 0x38 #define FACILITY_CLASS_TWINS 0x39 #define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_WALLY 0x3b -#define FACILITY_CLASS_BRENDAN 0x3c -#define FACILITY_CLASS_BRENDAN_2 0x3d -#define FACILITY_CLASS_BRENDAN_3 0x3e -#define FACILITY_CLASS_MAY 0x3f -#define FACILITY_CLASS_MAY_2 0x40 -#define FACILITY_CLASS_MAY_3 0x41 +#define FACILITY_CLASS_WALLY 0x3b +#define FACILITY_CLASS_BRENDAN 0x3c +#define FACILITY_CLASS_BRENDAN_2 0x3d +#define FACILITY_CLASS_BRENDAN_3 0x3e +#define FACILITY_CLASS_MAY 0x3f +#define FACILITY_CLASS_MAY_2 0x40 +#define FACILITY_CLASS_MAY_3 0x41 #define FACILITY_CLASS_PKMN_BREEDER_M 0x42 #define FACILITY_CLASS_BUG_CATCHER 0x43 #define FACILITY_CLASS_PKMN_RANGER_M 0x44 -- cgit v1.2.3 From 44af81103373f96bdff01a70fb633985b081009c Mon Sep 17 00:00:00 2001 From: Melody Date: Mon, 3 Dec 2018 08:36:10 -0500 Subject: index trainer front anims ptr table --- src/data/trainer_graphics/front_pic_anims.h | 188 ++++++++++++++-------------- 1 file changed, 95 insertions(+), 93 deletions(-) diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h index 11fb1797f..371e5a300 100644 --- a/src/data/trainer_graphics/front_pic_anims.h +++ b/src/data/trainer_graphics/front_pic_anims.h @@ -1,3 +1,5 @@ +#include "constants/trainers.h" + const union AnimCmd *const gTrainerFrontAnims_Hiker[] ={ gAnimCmd_General_Frame0, }; @@ -372,97 +374,97 @@ const union AnimCmd *const gTrainerFrontAnims_RubySapphireMay[] ={ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] = { - gTrainerFrontAnims_Hiker, // TRAINER_PIC_HIKER - gTrainerFrontAnims_AquaGruntM, // TRAINER_PIC_AQUA_GRUNT_M - gTrainerFrontAnims_PokemonBreederF, // TRAINER_PIC_POKEMON_BREEDER_F - gTrainerFrontAnims_CoolTrainerM, // TRAINER_PIC_COOLTRAINER_M - gTrainerFrontAnims_BirdKeeper, // TRAINER_PIC_BIRD_KEEPER - gTrainerFrontAnims_Collector, // TRAINER_PIC_COLLECTOR - gTrainerFrontAnims_AquaGruntF, // TRAINER_PIC_AQUA_GRUNT_F - gTrainerFrontAnims_SwimmerM, // TRAINER_PIC_SWIMMER_M - gTrainerFrontAnims_MagmaGruntM, // TRAINER_PIC_MAGMA_GRUNT_M - gTrainerFrontAnims_ExpertM, // TRAINER_PIC_EXPERT_M - gTrainerFrontAnims_AquaAdminM, // TRAINER_PIC_AQUA_ADMIN_M - gTrainerFrontAnims_BlackBelt, // TRAINER_PIC_BLACK_BELT - gTrainerFrontAnims_AquaAdminF, // TRAINER_PIC_AQUA_ADMIN_F - gTrainerFrontAnims_AquaLeaderArchie, // TRAINER_PIC_AQUA_LEADER_ARCHIE - gTrainerFrontAnims_HexManiac, // TRAINER_PIC_HEX_MANIAC - gTrainerFrontAnims_AromaLady, // TRAINER_PIC_AROMA_LADY - gTrainerFrontAnims_RuinManiac, // TRAINER_PIC_RUIN_MANIAC - gTrainerFrontAnims_Interviewer, // TRAINER_PIC_INTERVIEWER - gTrainerFrontAnims_TuberF, // TRAINER_PIC_TUBER_F - gTrainerFrontAnims_TuberM, // TRAINER_PIC_TUBER_M - gTrainerFrontAnims_CoolTrainerF, // TRAINER_PIC_COOLTRAINER_F - gTrainerFrontAnims_Lady, // TRAINER_PIC_LADY - gTrainerFrontAnims_Beauty, // TRAINER_PIC_BEAUTY - gTrainerFrontAnims_RichBoy, // TRAINER_PIC_RICH_BOY - gTrainerFrontAnims_ExpertF, // TRAINER_PIC_EXPERT_F - gTrainerFrontAnims_Pokemaniac, // TRAINER_PIC_POKEMANIAC - gTrainerFrontAnims_MagmaGruntF, // TRAINER_PIC_MAGMA_GRUNT_F - gTrainerFrontAnims_Guitarist, // TRAINER_PIC_GUITARIST - gTrainerFrontAnims_Kindler, // TRAINER_PIC_KINDLER - gTrainerFrontAnims_Camper, // TRAINER_PIC_CAMPER - gTrainerFrontAnims_Picnicker, // TRAINER_PIC_PICNICKER - gTrainerFrontAnims_BugManiac, // TRAINER_PIC_BUG_MANIAC - gTrainerFrontAnims_PokemonBreederM, // TRAINER_PIC_POKEMON_BREEDER_M - gTrainerFrontAnims_PsychicM, // TRAINER_PIC_PSYCHIC_M - gTrainerFrontAnims_PsychicF, // TRAINER_PIC_PSYCHIC_F - gTrainerFrontAnims_Gentleman, // TRAINER_PIC_GENTLEMAN - gTrainerFrontAnims_EliteFourSidney, // TRAINER_PIC_ELITE_FOUR_SIDNEY - gTrainerFrontAnims_EliteFourPhoebe, // TRAINER_PIC_ELITE_FOUR_PHOEBE - gTrainerFrontAnims_EliteFourGlacia, // TRAINER_PIC_ELITE_FOUR_GLACIA - gTrainerFrontAnims_EliteFourDrake, // TRAINER_PIC_ELITE_FOUR_DRAKE - gTrainerFrontAnims_LeaderRoxanne, // TRAINER_PIC_LEADER_ROXANNE - gTrainerFrontAnims_LeaderBrawly, // TRAINER_PIC_LEADER_BRAWLY - gTrainerFrontAnims_LeaderWattson, // TRAINER_PIC_LEADER_WATTSON - gTrainerFrontAnims_LeaderFlannery, // TRAINER_PIC_LEADER_FLANNERY - gTrainerFrontAnims_LeaderNorman, // TRAINER_PIC_LEADER_NORMAN - gTrainerFrontAnims_LeaderWinona, // TRAINER_PIC_LEADER_WINONA - gTrainerFrontAnims_LeaderTateAndLiza, // TRAINER_PIC_LEADER_TATE_AND_LIZA - gTrainerFrontAnims_LeaderJuan, // TRAINER_PIC_LEADER_JUAN - gTrainerFrontAnims_SchoolKidM, // TRAINER_PIC_SCHOOL_KID_M - gTrainerFrontAnims_SchoolKidF, // TRAINER_PIC_SCHOOL_KID_F - gTrainerFrontAnims_SrAndJr, // TRAINER_PIC_SR_AND_JR - gTrainerFrontAnims_PokefanM, // TRAINER_PIC_POKEFAN_M - gTrainerFrontAnims_PokefanF, // TRAINER_PIC_POKEFAN_F - gTrainerFrontAnims_Youngster, // TRAINER_PIC_YOUNGSTER - gTrainerFrontAnims_ChampionWallace, // TRAINER_PIC_CHAMPION_WALLACE - gTrainerFrontAnims_Fisherman, // TRAINER_PIC_FISHERMAN - gTrainerFrontAnims_CyclingTriathleteM, // TRAINER_PIC_CYCLING_TRIATHLETE_M - gTrainerFrontAnims_CyclingTriathleteF, // TRAINER_PIC_CYCLING_TRIATHLETE_F - gTrainerFrontAnims_RunningTriathleteM, // TRAINER_PIC_RUNNING_TRIATHLETE_M - gTrainerFrontAnims_RunningTriathleteF, // TRAINER_PIC_RUNNING_TRIATHLETE_F - gTrainerFrontAnims_SwimmingTriathleteM, // TRAINER_PIC_SWIMMING_TRIATHLETE_M - gTrainerFrontAnims_SwimmingTriathleteF, // TRAINER_PIC_SWIMMING_TRIATHLETE_F - gTrainerFrontAnims_DragonTamer, // TRAINER_PIC_DRAGON_TAMER - gTrainerFrontAnims_NinjaBoy, // TRAINER_PIC_NINJA_BOY - gTrainerFrontAnims_BattleGirl, // TRAINER_PIC_BATTLE_GIRL - gTrainerFrontAnims_ParasolLady, // TRAINER_PIC_PARASOL_LADY - gTrainerFrontAnims_SwimmerF, // TRAINER_PIC_SWIMMER_F - gTrainerFrontAnims_Twins, // TRAINER_PIC_TWINS - gTrainerFrontAnims_Sailor, // TRAINER_PIC_SAILOR - gTrainerFrontAnims_MagmaAdmin, // TRAINER_PIC_MAGMA_ADMIN - gTrainerFrontAnims_Wally, // TRAINER_PIC_WALLY - gTrainerFrontAnims_Brendan, // TRAINER_PIC_BRENDAN - gTrainerFrontAnims_May, // TRAINER_PIC_MAY - gTrainerFrontAnims_BugCatcher, // TRAINER_PIC_BUG_CATCHER - gTrainerFrontAnims_PokemonRangerM, // TRAINER_PIC_POKEMON_RANGER_M - gTrainerFrontAnims_PokemonRangerF, // TRAINER_PIC_POKEMON_RANGER_F - gTrainerFrontAnims_MagmaLeaderMaxie, // TRAINER_PIC_MAGMA_LEADER_MAXIE - gTrainerFrontAnims_Lass, // TRAINER_PIC_LASS - gTrainerFrontAnims_YoungCouple, // TRAINER_PIC_YOUNG_COUPLE - gTrainerFrontAnims_OldCouple, // TRAINER_PIC_OLD_COUPLE - gTrainerFrontAnims_SisAndBro, // TRAINER_PIC_SIS_AND_BRO - gTrainerFrontAnims_Steven, // TRAINER_PIC_STEVEN - gTrainerFrontAnims_SalonMaidenAnabel, // TRAINER_PIC_SALON_MAIDEN_ANABEL - gTrainerFrontAnims_DomeAceTucker, // TRAINER_PIC_DOME_ACE_TUCKER - gTrainerFrontAnims_PalaceMavenSpenser, // TRAINER_PIC_PALACE_MAVEN_SPENSER - gTrainerFrontAnims_ArenaTycoonGreta, // TRAINER_PIC_ARENA_TYCOON_GRETA - gTrainerFrontAnims_FactoryHeadNoland, // TRAINER_PIC_FACTORY_HEAD_NOLAND - gTrainerFrontAnims_PikeQueenLucy, // TRAINER_PIC_PIKE_QUEEN_LUCY - gTrainerFrontAnims_PyramidKingBrandon, // TRAINER_PIC_PYRAMID_KING_BRANDON - gTrainerFrontAnims_Red, // TRAINER_PIC_RED - gTrainerFrontAnims_Leaf, // TRAINER_PIC_LEAF - gTrainerFrontAnims_RubySapphireBrendan, // TRAINER_PIC_RS_BRENDAN - gTrainerFrontAnims_RubySapphireMay, // TRAINER_PIC_RS_MAY + [TRAINER_PIC_HIKER] = gTrainerFrontAnims_Hiker, + [TRAINER_PIC_AQUA_GRUNT_M] = gTrainerFrontAnims_AquaGruntM, + [TRAINER_PIC_POKEMON_BREEDER_F] = gTrainerFrontAnims_PokemonBreederF, + [TRAINER_PIC_COOLTRAINER_M] = gTrainerFrontAnims_CoolTrainerM, + [TRAINER_PIC_BIRD_KEEPER] = gTrainerFrontAnims_BirdKeeper, + [TRAINER_PIC_COLLECTOR] = gTrainerFrontAnims_Collector, + [TRAINER_PIC_AQUA_GRUNT_F] = gTrainerFrontAnims_AquaGruntF, + [TRAINER_PIC_SWIMMER_M] = gTrainerFrontAnims_SwimmerM, + [TRAINER_PIC_MAGMA_GRUNT_M] = gTrainerFrontAnims_MagmaGruntM, + [TRAINER_PIC_EXPERT_M] = gTrainerFrontAnims_ExpertM, + [TRAINER_PIC_AQUA_ADMIN_M] = gTrainerFrontAnims_AquaAdminM, + [TRAINER_PIC_BLACK_BELT] = gTrainerFrontAnims_BlackBelt, + [TRAINER_PIC_AQUA_ADMIN_F] = gTrainerFrontAnims_AquaAdminF, + [TRAINER_PIC_AQUA_LEADER_ARCHIE] = gTrainerFrontAnims_AquaLeaderArchie, + [TRAINER_PIC_HEX_MANIAC] = gTrainerFrontAnims_HexManiac, + [TRAINER_PIC_AROMA_LADY] = gTrainerFrontAnims_AromaLady, + [TRAINER_PIC_RUIN_MANIAC] = gTrainerFrontAnims_RuinManiac, + [TRAINER_PIC_INTERVIEWER] = gTrainerFrontAnims_Interviewer, + [TRAINER_PIC_TUBER_F] = gTrainerFrontAnims_TuberF, + [TRAINER_PIC_TUBER_M] = gTrainerFrontAnims_TuberM, + [TRAINER_PIC_COOLTRAINER_F] = gTrainerFrontAnims_CoolTrainerF, + [TRAINER_PIC_LADY] = gTrainerFrontAnims_Lady, + [TRAINER_PIC_BEAUTY] = gTrainerFrontAnims_Beauty, + [TRAINER_PIC_RICH_BOY] = gTrainerFrontAnims_RichBoy, + [TRAINER_PIC_EXPERT_F] = gTrainerFrontAnims_ExpertF, + [TRAINER_PIC_POKEMANIAC] = gTrainerFrontAnims_Pokemaniac, + [TRAINER_PIC_MAGMA_GRUNT_F] = gTrainerFrontAnims_MagmaGruntF, + [TRAINER_PIC_GUITARIST] = gTrainerFrontAnims_Guitarist, + [TRAINER_PIC_KINDLER] = gTrainerFrontAnims_Kindler, + [TRAINER_PIC_CAMPER] = gTrainerFrontAnims_Camper, + [TRAINER_PIC_PICNICKER] = gTrainerFrontAnims_Picnicker, + [TRAINER_PIC_BUG_MANIAC] = gTrainerFrontAnims_BugManiac, + [TRAINER_PIC_POKEMON_BREEDER_M] = gTrainerFrontAnims_PokemonBreederM, + [TRAINER_PIC_PSYCHIC_M] = gTrainerFrontAnims_PsychicM, + [TRAINER_PIC_PSYCHIC_F] = gTrainerFrontAnims_PsychicF, + [TRAINER_PIC_GENTLEMAN] = gTrainerFrontAnims_Gentleman, + [TRAINER_PIC_ELITE_FOUR_SIDNEY] = gTrainerFrontAnims_EliteFourSidney, + [TRAINER_PIC_ELITE_FOUR_PHOEBE] = gTrainerFrontAnims_EliteFourPhoebe, + [TRAINER_PIC_ELITE_FOUR_GLACIA] = gTrainerFrontAnims_EliteFourGlacia, + [TRAINER_PIC_ELITE_FOUR_DRAKE] = gTrainerFrontAnims_EliteFourDrake, + [TRAINER_PIC_LEADER_ROXANNE] = gTrainerFrontAnims_LeaderRoxanne, + [TRAINER_PIC_LEADER_BRAWLY] = gTrainerFrontAnims_LeaderBrawly, + [TRAINER_PIC_LEADER_WATTSON] = gTrainerFrontAnims_LeaderWattson, + [TRAINER_PIC_LEADER_FLANNERY] = gTrainerFrontAnims_LeaderFlannery, + [TRAINER_PIC_LEADER_NORMAN] = gTrainerFrontAnims_LeaderNorman, + [TRAINER_PIC_LEADER_WINONA] = gTrainerFrontAnims_LeaderWinona, + [TRAINER_PIC_LEADER_TATE_AND_LIZA] = gTrainerFrontAnims_LeaderTateAndLiza, + [TRAINER_PIC_LEADER_JUAN] = gTrainerFrontAnims_LeaderJuan, + [TRAINER_PIC_SCHOOL_KID_M] = gTrainerFrontAnims_SchoolKidM, + [TRAINER_PIC_SCHOOL_KID_F] = gTrainerFrontAnims_SchoolKidF, + [TRAINER_PIC_SR_AND_JR] = gTrainerFrontAnims_SrAndJr, + [TRAINER_PIC_POKEFAN_M] = gTrainerFrontAnims_PokefanM, + [TRAINER_PIC_POKEFAN_F] = gTrainerFrontAnims_PokefanF, + [TRAINER_PIC_YOUNGSTER] = gTrainerFrontAnims_Youngster, + [TRAINER_PIC_CHAMPION_WALLACE] = gTrainerFrontAnims_ChampionWallace, + [TRAINER_PIC_FISHERMAN] = gTrainerFrontAnims_Fisherman, + [TRAINER_PIC_CYCLING_TRIATHLETE_M] = gTrainerFrontAnims_CyclingTriathleteM, + [TRAINER_PIC_CYCLING_TRIATHLETE_F] = gTrainerFrontAnims_CyclingTriathleteF, + [TRAINER_PIC_RUNNING_TRIATHLETE_M] = gTrainerFrontAnims_RunningTriathleteM, + [TRAINER_PIC_RUNNING_TRIATHLETE_F] = gTrainerFrontAnims_RunningTriathleteF, + [TRAINER_PIC_SWIMMING_TRIATHLETE_M] = gTrainerFrontAnims_SwimmingTriathleteM, + [TRAINER_PIC_SWIMMING_TRIATHLETE_F] = gTrainerFrontAnims_SwimmingTriathleteF, + [TRAINER_PIC_DRAGON_TAMER] = gTrainerFrontAnims_DragonTamer, + [TRAINER_PIC_NINJA_BOY] = gTrainerFrontAnims_NinjaBoy, + [TRAINER_PIC_BATTLE_GIRL] = gTrainerFrontAnims_BattleGirl, + [TRAINER_PIC_PARASOL_LADY] = gTrainerFrontAnims_ParasolLady, + [TRAINER_PIC_SWIMMER_F] = gTrainerFrontAnims_SwimmerF, + [TRAINER_PIC_TWINS] = gTrainerFrontAnims_Twins, + [TRAINER_PIC_SAILOR] = gTrainerFrontAnims_Sailor, + [TRAINER_PIC_MAGMA_ADMIN] = gTrainerFrontAnims_MagmaAdmin, + [TRAINER_PIC_WALLY] = gTrainerFrontAnims_Wally, + [TRAINER_PIC_BRENDAN] = gTrainerFrontAnims_Brendan, + [TRAINER_PIC_MAY] = gTrainerFrontAnims_May, + [TRAINER_PIC_BUG_CATCHER] = gTrainerFrontAnims_BugCatcher, + [TRAINER_PIC_POKEMON_RANGER_M] = gTrainerFrontAnims_PokemonRangerM, + [TRAINER_PIC_POKEMON_RANGER_F] = gTrainerFrontAnims_PokemonRangerF, + [TRAINER_PIC_MAGMA_LEADER_MAXIE] = gTrainerFrontAnims_MagmaLeaderMaxie, + [TRAINER_PIC_LASS] = gTrainerFrontAnims_Lass, + [TRAINER_PIC_YOUNG_COUPLE] = gTrainerFrontAnims_YoungCouple, + [TRAINER_PIC_OLD_COUPLE] = gTrainerFrontAnims_OldCouple, + [TRAINER_PIC_SIS_AND_BRO] = gTrainerFrontAnims_SisAndBro, + [TRAINER_PIC_STEVEN] = gTrainerFrontAnims_Steven, + [TRAINER_PIC_SALON_MAIDEN_ANABEL] = gTrainerFrontAnims_SalonMaidenAnabel, + [TRAINER_PIC_DOME_ACE_TUCKER] = gTrainerFrontAnims_DomeAceTucker, + [TRAINER_PIC_PALACE_MAVEN_SPENSER] = gTrainerFrontAnims_PalaceMavenSpenser, + [TRAINER_PIC_ARENA_TYCOON_GRETA] = gTrainerFrontAnims_ArenaTycoonGreta, + [TRAINER_PIC_FACTORY_HEAD_NOLAND] = gTrainerFrontAnims_FactoryHeadNoland, + [TRAINER_PIC_PIKE_QUEEN_LUCY] = gTrainerFrontAnims_PikeQueenLucy, + [TRAINER_PIC_PYRAMID_KING_BRANDON] = gTrainerFrontAnims_PyramidKingBrandon, + [TRAINER_PIC_RED] = gTrainerFrontAnims_Red, + [TRAINER_PIC_LEAF] = gTrainerFrontAnims_Leaf, + [TRAINER_PIC_RS_BRENDAN] = gTrainerFrontAnims_RubySapphireBrendan, + [TRAINER_PIC_RS_MAY] = gTrainerFrontAnims_RubySapphireMay, }; -- cgit v1.2.3 From a83fc52a7e393e44079abd0f616d75ad7fa230e8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 14:49:16 +0100 Subject: Make data easier to edit --- include/constants/species.h | 2 + src/battle_anim_80D51AC.c | 36 +- src/data/pokedex_orders.h | 2372 +++++++++++++++++----------------- src/data/pokemon/pokedex_entries.h | 1547 ++++++++++++++++------ src/pokedex.c | 6 +- src/pokemon.c | 2477 ++++++++++++++++++------------------ 6 files changed, 3606 insertions(+), 2834 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index cd9b13743..02e5ea396 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -449,6 +449,7 @@ // National Dex Index Defines +#define NATIONAL_DEX_NONE 0 #define NATIONAL_DEX_BULBASAUR 1 #define NATIONAL_DEX_IVYSAUR 2 #define NATIONAL_DEX_VENUSAUR 3 @@ -865,6 +866,7 @@ // Hoenn Dex Index Defines +#define HOENN_DEX_NONE 0 #define HOENN_DEX_BULBASAUR 203 #define HOENN_DEX_IVYSAUR 204 #define HOENN_DEX_VENUSAUR 205 diff --git a/src/battle_anim_80D51AC.c b/src/battle_anim_80D51AC.c index 6c1a2ad99..bfd0635f6 100644 --- a/src/battle_anim_80D51AC.c +++ b/src/battle_anim_80D51AC.c @@ -11,15 +11,15 @@ void AnimTask_ShakeMon2Step(u8 taskId); void AnimTask_ShakeMonInPlaceStep(u8 taskId); void AnimTask_ShakeAndSinkMonStep(u8 taskId); void sub_80D57B8(u8 taskId); -void DoHorizontalLunge(struct Sprite *sprite); -void ReverseHorizontalLungeDirection(struct Sprite *sprite); -void DoVerticalDip(struct Sprite *sprite); -void ReverseVerticalDipDirection(struct Sprite* sprite); -void SlideMonToOriginalPos(struct Sprite *sprite); -void SlideMonToOriginalPosStep(struct Sprite *sprite); -void SlideMonToOffset(struct Sprite *sprite); -void sub_80D5B48(struct Sprite *sprite); -void sub_80D5C20(struct Sprite *sprite); +static void DoHorizontalLunge(struct Sprite *sprite); +static void ReverseHorizontalLungeDirection(struct Sprite *sprite); +static void DoVerticalDip(struct Sprite *sprite); +static void ReverseVerticalDipDirection(struct Sprite* sprite); +static void SlideMonToOriginalPos(struct Sprite *sprite); +static void SlideMonToOriginalPosStep(struct Sprite *sprite); +static void SlideMonToOffset(struct Sprite *sprite); +static void sub_80D5B48(struct Sprite *sprite); +static void sub_80D5C20(struct Sprite *sprite); void AnimTask_WindUpLungePart1(u8 taskId); void AnimTask_WindUpLungePart2(u8 taskId); void AnimTask_SwayMonStep(u8 taskId); @@ -428,7 +428,7 @@ void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId) // horizontally, and then moves back in the opposite direction. // arg 0: duration of single lunge direction // arg 1: x pixel delta that is applied each frame -void DoHorizontalLunge(struct Sprite *sprite) +static void DoHorizontalLunge(struct Sprite *sprite) { sprite->invisible = TRUE; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) @@ -444,7 +444,7 @@ void DoHorizontalLunge(struct Sprite *sprite) sprite->callback = sub_80A6630; } -void ReverseHorizontalLungeDirection(struct Sprite *sprite) +static void ReverseHorizontalLungeDirection(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[1] = -sprite->data[1]; @@ -457,7 +457,7 @@ void ReverseHorizontalLungeDirection(struct Sprite *sprite) // arg 0: duration of single dip direction // arg 1: y pixel delta that is applied each frame // arg 2: battler -void DoVerticalDip(struct Sprite *sprite) +static void DoVerticalDip(struct Sprite *sprite) { u8 spriteId; sprite->invisible = TRUE; @@ -471,7 +471,7 @@ void DoVerticalDip(struct Sprite *sprite) sprite->callback = sub_80A6630; } -void ReverseVerticalDipDirection(struct Sprite *sprite) +static void ReverseVerticalDipDirection(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[2] = -sprite->data[2]; @@ -484,7 +484,7 @@ void ReverseVerticalDipDirection(struct Sprite *sprite) // arg 0: 1 = target or 0 = attacker // arg 1: direction (0 = horizontal and vertical, 1 = horizontal only, 2 = vertical only) // arg 2: duration -void SlideMonToOriginalPos(struct Sprite *sprite) +static void SlideMonToOriginalPos(struct Sprite *sprite) { u32 monSpriteId; if (!gBattleAnimArgs[0]) @@ -514,7 +514,7 @@ void SlideMonToOriginalPos(struct Sprite *sprite) sprite->callback = SlideMonToOriginalPosStep; } -void SlideMonToOriginalPosStep(struct Sprite *sprite) +static void SlideMonToOriginalPosStep(struct Sprite *sprite) { s8 monSpriteId; u8 lo; @@ -551,7 +551,7 @@ void SlideMonToOriginalPosStep(struct Sprite *sprite) // arg 2: target y pixel offset // arg 3: mirror vertical translation for opposite battle side // arg 4: duration -void SlideMonToOffset(struct Sprite *sprite) +static void SlideMonToOffset(struct Sprite *sprite) { u8 battler; u8 monSpriteId; @@ -584,7 +584,7 @@ void SlideMonToOffset(struct Sprite *sprite) sprite->callback = sub_80A6680; } -void sub_80D5B48(struct Sprite *sprite) +static void sub_80D5B48(struct Sprite *sprite) { u8 spriteId; u8 battlerId; @@ -628,7 +628,7 @@ void sub_80D5B48(struct Sprite *sprite) } -void sub_80D5C20(struct Sprite *sprite) +static void sub_80D5C20(struct Sprite *sprite) { gSprites[sprite->data[5]].pos2.x = 0; gSprites[sprite->data[5]].pos2.y = 0; diff --git a/src/data/pokedex_orders.h b/src/data/pokedex_orders.h index 61fbd289c..55b0abcea 100644 --- a/src/data/pokedex_orders.h +++ b/src/data/pokedex_orders.h @@ -1,1199 +1,1195 @@ -#ifndef GUARD_DATA_POKEDEX_ORDERS -#define GUARD_DATA_POKEDEX_ORDERS - const u16 gPokedexOrder_Alphabetical[] = { - 387, - 388, - 389, - 390, - 391, - 392, - 393, - 394, - 395, - 396, - 397, - 398, - 399, - 400, - 401, - 402, - 403, - 404, - 405, - 406, - 407, - 408, - 409, - 410, - 411, - 63, // Abra - 359, // Absol - 142, // Aerodactyl - 306, // Aggron - 190, // Aipom - 65, // Alakazam - 334, // Altaria - 181, // Ampharos - 347, // Anorith - 24, // Arbok - 59, // Arcanine - 168, // Ariados - 348, // Armaldo - 304, // Aron - 144, // Articuno - 184, // Azumarill - 298, // Azurill - 371, // Bagon - 343, // Baltoy - 354, // Banette - 339, // Barboach - 153, // Bayleef - 267, // Beautifly - 15, // Beedrill - 374, // Beldum - 182, // Bellossom - 69, // Bellsprout - 9, // Blastoise - 257, // Blaziken - 242, // Blissey - 286, // Breloom - 1, // Bulbasaur - 12, // Butterfree - 331, // Cacnea - 332, // Cacturne - 323, // Camerupt - 318, // Carvanha - 268, // Cascoon - 351, // Castform - 10, // Caterpie - 251, // Celebi - 113, // Chansey - 6, // Charizard - 4, // Charmander - 5, // Charmeleon - 152, // Chikorita - 358, // Chimecho - 170, // Chinchou - 366, // Clamperl - 344, // Claydol - 36, // Clefable - 35, // Clefairy - 173, // Cleffa - 91, // Cloyster - 256, // Combusken - 341, // Corphish - 222, // Corsola - 346, // Cradily - 342, // Crawdaunt - 169, // Crobat - 159, // Croconaw - 104, // Cubone - 155, // Cyndaquil - 301, // Delcatty - 225, // Delibird - 386, // Deoxys - 87, // Dewgong - 50, // Diglett - 132, // Ditto - 85, // Dodrio - 84, // Doduo - 232, // Donphan - 148, // Dragonair - 149, // Dragonite - 147, // Dratini - 96, // Drowzee - 51, // Dugtrio - 206, // Dunsparce - 356, // Dusclops - 355, // Duskull - 269, // Dustox - 133, // Eevee - 23, // Ekans - 125, // Electabuzz - 309, // Electrike - 101, // Electrode - 239, // Elekid - 244, // Entei - 196, // Espeon - 102, // Exeggcute - 103, // Exeggutor - 295, // Exploud - 83, // Farfetch'd - 22, // Fearow - 349, // Feebas - 160, // Feraligatr - 180, // Flaaffy - 136, // Flareon - 330, // Flygon - 205, // Forretress - 162, // Furret - 282, // Gardevoir - 92, // Gastly - 94, // Gengar - 74, // Geodude - 203, // Girafarig - 362, // Glalie - 207, // Gligar - 44, // Gloom - 42, // Golbat - 118, // Goldeen - 55, // Golduck - 76, // Golem - 368, // Gorebyss - 210, // Granbull - 75, // Graveler - 88, // Grimer - 383, // Groudon - 253, // Grovyle - 58, // Growlithe - 326, // Grumpig - 316, // Gulpin - 130, // Gyarados - 297, // Hariyama - 93, // Haunter - 214, // Heracross - 107, // Hitmonchan - 106, // Hitmonlee - 237, // Hitmontop - 250, // Ho-Oh - 163, // Hoothoot - 187, // Hoppip - 116, // Horsea - 229, // Houndoom - 228, // Houndour - 367, // Huntail - 97, // Hypno - 174, // Igglybuff - 314, // Illumise - 2, // Ivysaur - 39, // Jigglypuff - 385, // Jirachi - 135, // Jolteon - 189, // Jumpluff - 124, // Jynx - 140, // Kabuto - 141, // Kabutops - 64, // Kadabra - 14, // Kakuna - 115, // Kangaskhan - 352, // Kecleon - 230, // Kingdra - 99, // Kingler - 281, // Kirlia - 109, // Koffing - 98, // Krabby - 382, // Kyogre - 305, // Lairon - 171, // Lanturn - 131, // Lapras - 246, // Larvitar - 380, // Latias - 381, // Latios - 166, // Ledian - 165, // Ledyba - 108, // Lickitung - 345, // Lileep - 264, // Linoone - 271, // Lombre - 270, // Lotad - 294, // Loudred - 272, // Ludicolo - 249, // Lugia - 337, // Lunatone - 370, // Luvdisc - 68, // Machamp - 67, // Machoke - 66, // Machop - 240, // Magby - 219, // Magcargo - 129, // Magikarp - 126, // Magmar - 81, // Magnemite - 82, // Magneton - 296, // Makuhita - 310, // Manectric - 56, // Mankey - 226, // Mantine - 179, // Mareep - 183, // Marill - 105, // Marowak - 259, // Marshtomp - 284, // Masquerain - 303, // Mawile - 308, // Medicham - 307, // Meditite - 154, // Meganium - 52, // Meowth - 376, // Metagross - 375, // Metang - 11, // Metapod - 151, // Mew - 150, // Mewtwo - 262, // Mightyena - 350, // Milotic - 241, // Miltank - 312, // Minun - 200, // Misdreavus - 146, // Moltres - 122, // Mr. mime - 258, // Mudkip - 89, // Muk - 198, // Murkrow - 177, // Natu - 34, // Nidoking - 31, // Nidoqueen - 29, // Nidoran? - 32, // Nidoran? - 30, // Nidorina - 33, // Nidorino - 290, // Nincada - 38, // Ninetales - 291, // Ninjask - 164, // Noctowl - 299, // Nosepass - 322, // Numel - 274, // Nuzleaf - 224, // Octillery - 43, // Oddish - 138, // Omanyte - 139, // Omastar - 95, // Onix - 46, // Paras - 47, // Parasect - 279, // Pelipper - 53, // Persian - 231, // Phanpy - 172, // Pichu - 18, // Pidgeot - 17, // Pidgeotto - 16, // Pidgey - 25, // Pikachu - 221, // Piloswine - 204, // Pineco - 127, // Pinsir - 311, // Plusle - 186, // Politoed - 60, // Poliwag - 61, // Poliwhirl - 62, // Poliwrath - 77, // Ponyta - 261, // Poochyena - 137, // Porygon - 233, // Porygon2 - 57, // Primeape - 54, // Psyduck - 247, // Pupitar - 195, // Quagsire - 156, // Quilava - 211, // Qwilfish - 26, // Raichu - 243, // Raikou - 280, // Ralts - 78, // Rapidash - 20, // Raticate - 19, // Rattata - 384, // Rayquaza - 378, // Regice - 377, // Regirock - 379, // Registeel - 369, // Relicanth - 223, // Remoraid - 112, // Rhydon - 111, // Rhyhorn - 315, // Roselia - 302, // Sableye - 373, // Salamence - 27, // Sandshrew - 28, // Sandslash - 254, // Sceptile - 212, // Scizor - 123, // Scyther - 117, // Seadra - 119, // Seaking - 364, // Sealeo - 273, // Seedot - 86, // Seel - 161, // Sentret - 336, // Seviper - 319, // Sharpedo - 292, // Shedinja - 372, // Shelgon - 90, // Shellder - 275, // Shiftry - 285, // Shroomish - 213, // Shuckle - 353, // Shuppet - 266, // Silcoon - 227, // Skarmory - 188, // Skiploom - 300, // Skitty - 289, // Slaking - 287, // Slakoth - 80, // Slowbro - 199, // Slowking - 79, // Slowpoke - 218, // Slugma - 235, // Smeargle - 238, // Smoochum - 215, // Sneasel - 143, // Snorlax - 361, // Snorunt - 209, // Snubbull - 338, // Solrock - 21, // Spearow - 363, // Spheal - 167, // Spinarak - 327, // Spinda - 325, // Spoink - 7, // Squirtle - 234, // Stantler - 121, // Starmie - 120, // Staryu - 208, // Steelix - 185, // Sudowoodo - 245, // Suicune - 192, // Sunflora - 191, // Sunkern - 283, // Surskit - 333, // Swablu - 317, // Swalot - 260, // Swampert - 277, // Swellow - 220, // Swinub - 276, // Taillow - 114, // Tangela - 128, // Tauros - 216, // Teddiursa - 72, // Tentacool - 73, // Tentacruel - 175, // Togepi - 176, // Togetic - 255, // Torchic - 324, // Torkoal - 158, // Totodile - 328, // Trapinch - 252, // Treecko - 357, // Tropius - 157, // Typhlosion - 248, // Tyranitar - 236, // Tyrogue - 197, // Umbreon - 201, // Unown - 217, // Ursaring - 134, // Vaporeon - 49, // Venomoth - 48, // Venonat - 3, // Venusaur - 329, // Vibrava - 71, // Victreebel - 288, // Vigoroth - 45, // Vileplume - 313, // Volbeat - 100, // Voltorb - 37, // Vulpix - 320, // Wailmer - 321, // Wailord - 365, // Walrein - 8, // Wartortle - 13, // Weedle - 70, // Weepinbell - 110, // Weezing - 340, // Whiscash - 293, // Whismur - 40, // Wigglytuff - 278, // Wingull - 202, // Wobbuffet - 194, // Wooper - 265, // Wurmple - 360, // Wynaut - 178, // Xatu - 193, // Yanma - 335, // Zangoose - 145, // Zapdos - 263, // Zigzagoon - 41, // Zubat + NATIONAL_DEX_OLD_UNOWN_B, + NATIONAL_DEX_OLD_UNOWN_C, + NATIONAL_DEX_OLD_UNOWN_D, + NATIONAL_DEX_OLD_UNOWN_E, + NATIONAL_DEX_OLD_UNOWN_F, + NATIONAL_DEX_OLD_UNOWN_G, + NATIONAL_DEX_OLD_UNOWN_H, + NATIONAL_DEX_OLD_UNOWN_I, + NATIONAL_DEX_OLD_UNOWN_J, + NATIONAL_DEX_OLD_UNOWN_K, + NATIONAL_DEX_OLD_UNOWN_L, + NATIONAL_DEX_OLD_UNOWN_M, + NATIONAL_DEX_OLD_UNOWN_N, + NATIONAL_DEX_OLD_UNOWN_O, + NATIONAL_DEX_OLD_UNOWN_P, + NATIONAL_DEX_OLD_UNOWN_Q, + NATIONAL_DEX_OLD_UNOWN_R, + NATIONAL_DEX_OLD_UNOWN_S, + NATIONAL_DEX_OLD_UNOWN_T, + NATIONAL_DEX_OLD_UNOWN_U, + NATIONAL_DEX_OLD_UNOWN_V, + NATIONAL_DEX_OLD_UNOWN_W, + NATIONAL_DEX_OLD_UNOWN_X, + NATIONAL_DEX_OLD_UNOWN_Y, + NATIONAL_DEX_OLD_UNOWN_Z, + // Actual pokemon start here. + NATIONAL_DEX_ABRA, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_ARON, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_GROUDON, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_METANG, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_MEW, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_MUK, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_NATU, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_WAILORD, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_XATU, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_ZUBAT, }; const u16 gPokedexOrder_Weight[] = { - 92, // Gastly - 93, // Haunter - 187, // Hoppip - 50, // Diglett - 351, // Castform - 109, // Koffing - 174, // Igglybuff - 200, // Misdreavus - 358, // Chimecho - 188, // Skiploom - 385, // Jirachi - 333, // Swablu - 292, // Shedinja - 175, // Togepi - 283, // Surskit - 16, // Pidgey - 191, // Sunkern - 339, // Barboach - 172, // Pichu - 298, // Azurill - 315, // Roselia - 177, // Natu - 21, // Spearow - 198, // Murkrow - 353, // Shuppet - 276, // Taillow - 102, // Exeggcute - 255, // Torchic - 270, // Lotad - 10, // Caterpie - 189, // Jumpluff - 173, // Cleffa - 13, // Weedle - 176, // Togetic - 147, // Dratini - 19, // Rattata - 284, // Masquerain - 265, // Wurmple - 211, // Qwilfish - 151, // Mew - 90, // Shellder - 273, // Seedot - 132, // Ditto - 69, // Bellsprout - 311, // Plusle - 52, // Meowth - 312, // Minun - 285, // Shroomish - 251, // Celebi - 222, // Corsola - 252, // Treecko - 327, // Spinda - 201, // Unown - 46, // Paras - 43, // Oddish - 39, // Jigglypuff - 290, // Nincada - 182, // Bellossom - 81, // Magnemite - 25, // Pikachu - 238, // Smoochum - 161, // Sentret - 70, // Weepinbell - 152, // Chikorita - 220, // Swinub - 133, // Eevee - 98, // Krabby - 104, // Cubone - 280, // Ralts - 1, // Bulbasaur - 23, // Ekans - 29, // Nidoran? - 204, // Pineco - 349, // Feebas - 138, // Omanyte - 41, // Zubat - 35, // Clefairy - 258, // Mudkip - 209, // Snubbull - 179, // Mareep - 155, // Cyndaquil - 116, // Horsea - 4, // Charmander - 192, // Sunflora - 183, // Marill - 194, // Wooper - 167, // Spinarak - 44, // Gloom - 370, // Luvdisc - 216, // Teddiursa - 32, // Nidoran? - 7, // Squirtle - 278, // Wingull - 158, // Totodile - 110, // Weezing - 37, // Vulpix - 11, // Metapod - 266, // Silcoon - 129, // Magikarp - 14, // Kakuna - 316, // Gulpin - 100, // Voltorb - 165, // Ledyba - 228, // Houndour - 300, // Skitty - 302, // Sableye - 307, // Meditite - 341, // Corphish - 190, // Aipom - 268, // Cascoon - 303, // Mawile - 140, // Kabuto - 40, // Wigglytuff - 27, // Sandshrew - 223, // Remoraid - 291, // Ninjask - 170, // Chinchou - 60, // Poliwag - 347, // Anorith - 49, // Venomoth - 354, // Banette - 2, // Ivysaur - 180, // Flaaffy - 261, // Poochyena - 360, // Wynaut - 206, // Dunsparce - 178, // Xatu - 355, // Duskull - 83, // Farfetch'd - 328, // Trapinch - 118, // Goldeen - 309, // Electrike - 329, // Vibrava - 71, // Victreebel - 153, // Bayleef - 225, // Delibird - 293, // Whismur - 148, // Dragonair - 361, // Snorunt - 263, // Zigzagoon - 314, // Illumise - 313, // Volbeat - 20, // Raticate - 45, // Vileplume - 156, // Quilava - 5, // Charmeleon - 58, // Growlithe - 256, // Combusken - 66, // Machop - 63, // Abra - 33, // Nidorino - 54, // Psyduck - 277, // Swellow - 38, // Ninetales - 30, // Nidorina - 61, // Poliwhirl - 74, // Geodude - 281, // Kirlia - 213, // Shuckle - 334, // Altaria - 318, // Carvanha - 236, // Tyrogue - 163, // Hoothoot - 240, // Magby - 343, // Baltoy - 253, // Grovyle - 352, // Kecleon - 171, // Lanturn - 8, // Wartortle - 368, // Gorebyss - 369, // Relicanth - 239, // Elekid - 340, // Whiscash - 345, // Lileep - 322, // Numel - 287, // Slakoth - 135, // Jolteon - 159, // Croconaw - 136, // Flareon - 117, // Seadra - 196, // Espeon - 367, // Huntail - 197, // Umbreon - 259, // Marshtomp - 274, // Nuzleaf - 215, // Sneasel - 56, // Mankey - 279, // Pelipper - 267, // Beautifly - 224, // Octillery - 184, // Azumarill - 202, // Wobbuffet - 134, // Vaporeon - 28, // Sandslash - 47, // Parasect - 15, // Beedrill - 89, // Muk - 17, // Pidgeotto - 88, // Grimer - 26, // Raichu - 77, // Ponyta - 125, // Electabuzz - 48, // Venonat - 325, // Spoink - 356, // Dusclops - 308, // Medicham - 269, // Dustox - 53, // Persian - 12, // Butterfree - 57, // Primeape - 96, // Drowzee - 162, // Furret - 233, // Porygon2 - 271, // Lombre - 264, // Linoone - 301, // Delcatty - 342, // Crawdaunt - 51, // Dugtrio - 168, // Ariados - 231, // Phanpy - 186, // Politoed - 120, // Staryu - 113, // Chansey - 139, // Omastar - 114, // Tangela - 218, // Slugma - 229, // Houndoom - 166, // Ledian - 79, // Slowpoke - 137, // Porygon - 262, // Mightyena - 193, // Yanma - 22, // Fearow - 185, // Sudowoodo - 119, // Seaking - 286, // Breloom - 84, // Doduo - 18, // Pidgeot - 363, // Spheal - 36, // Clefable - 380, // Latias - 310, // Manectric - 335, // Zangoose - 141, // Kabutops - 94, // Gengar - 294, // Loudred - 124, // Jynx - 164, // Noctowl - 203, // Girafarig - 371, // Bagon - 126, // Magmar - 105, // Marowak - 72, // Tentacool - 288, // Vigoroth - 242, // Blissey - 359, // Absol - 65, // Alakazam - 237, // Hitmontop - 282, // Gardevoir - 210, // Granbull - 106, // Hitmonlee - 107, // Hitmonchan - 227, // Skarmory - 331, // Cacnea - 257, // Blaziken - 254, // Sceptile - 336, // Seviper - 366, // Clamperl - 145, // Zapdos - 214, // Heracross - 62, // Poliwrath - 122, // Mr. mime - 127, // Pinsir - 272, // Ludicolo - 73, // Tentacruel - 42, // Golbat - 219, // Magcargo - 144, // Articuno - 221, // Piloswine - 123, // Scyther - 64, // Kadabra - 235, // Smeargle - 142, // Aerodactyl - 275, // Shiftry - 99, // Kingler - 31, // Nidoqueen - 82, // Magneton - 304, // Aron - 381, // Latios - 146, // Moltres - 346, // Cradily - 386, // Deoxys - 181, // Ampharos - 34, // Nidoking - 207, // Gligar - 24, // Arbok - 108, // Lickitung - 101, // Electrode - 348, // Armaldo - 67, // Machoke - 234, // Stantler - 326, // Grumpig - 246, // Larvitar - 169, // Crobat - 195, // Quagsire - 241, // Miltank - 97, // Hypno - 55, // Golduck - 332, // Cacturne - 80, // Slowbro - 157, // Typhlosion - 199, // Slowking - 115, // Kangaskhan - 121, // Starmie - 317, // Swalot - 324, // Torkoal - 260, // Swampert - 330, // Flygon - 295, // Exploud - 85, // Dodrio - 9, // Blastoise - 296, // Makuhita - 364, // Sealeo - 128, // Tauros - 319, // Sharpedo - 160, // Feraligatr - 86, // Seel - 6, // Charizard - 78, // Rapidash - 374, // Beldum - 299, // Nosepass - 3, // Venusaur - 357, // Tropius - 154, // Meganium - 373, // Salamence - 75, // Graveler - 344, // Claydol - 372, // Shelgon - 111, // Rhyhorn - 212, // Scizor - 87, // Dewgong - 112, // Rhydon - 232, // Donphan - 103, // Exeggutor - 305, // Lairon - 150, // Mewtwo - 217, // Ursaring - 205, // Forretress - 68, // Machamp - 320, // Wailmer - 289, // Slaking - 91, // Cloyster - 365, // Walrein - 247, // Pupitar - 230, // Kingdra - 338, // Solrock - 59, // Arcanine - 350, // Milotic - 337, // Lunatone - 378, // Regice - 243, // Raikou - 245, // Suicune - 244, // Entei - 250, // Ho-Oh - 248, // Tyranitar - 375, // Metang - 379, // Registeel - 384, // Rayquaza - 95, // Onix - 149, // Dragonite - 249, // Lugia - 131, // Lapras - 323, // Camerupt - 226, // Mantine - 377, // Regirock - 130, // Gyarados - 297, // Hariyama - 362, // Glalie - 76, // Golem - 382, // Kyogre - 306, // Aggron - 321, // Wailord - 208, // Steelix - 143, // Snorlax - 376, // Metagross - 383, // Groudon + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_NATU, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_MEW, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_XATU, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_MUK, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_ARON, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_METANG, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_WAILORD, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_GROUDON, }; const u16 gPokedexOrder_Height[] = { - 50, // Diglett - 298, // Azurill - 177, // Natu - 13, // Weedle - 172, // Pichu - 173, // Cleffa - 175, // Togepi - 351, // Castform - 174, // Igglybuff - 10, // Caterpie - 276, // Taillow - 132, // Ditto - 133, // Eevee - 315, // Roselia - 21, // Spearow - 16, // Pidgey - 191, // Sunkern - 90, // Shellder - 19, // Rattata - 81, // Magnemite - 46, // Paras - 265, // Wurmple - 385, // Jirachi - 104, // Cubone - 258, // Mudkip - 194, // Wooper - 116, // Horsea - 52, // Meowth - 29, // Nidoran? - 220, // Swinub - 151, // Mew - 333, // Swablu - 304, // Aron - 311, // Plusle - 312, // Minun - 102, // Exeggcute - 25, // Pikachu - 182, // Bellossom - 316, // Gulpin - 263, // Zigzagoon - 285, // Shroomish - 138, // Omanyte - 331, // Cacnea - 98, // Krabby - 280, // Ralts - 187, // Hoppip - 255, // Torchic - 366, // Clamperl - 74, // Geodude - 183, // Marill - 339, // Barboach - 238, // Smoochum - 100, // Voltorb - 290, // Nincada - 302, // Sableye - 198, // Murkrow - 211, // Qwilfish - 7, // Squirtle - 252, // Treecko - 343, // Baltoy - 43, // Oddish - 270, // Lotad - 39, // Jigglypuff - 283, // Surskit - 155, // Cyndaquil - 140, // Kabuto - 264, // Linoone - 324, // Torkoal - 32, // Nidoran? - 167, // Spinarak - 56, // Mankey - 273, // Seedot - 261, // Poochyena - 231, // Phanpy - 201, // Unown - 170, // Chinchou - 233, // Porygon2 - 60, // Poliwag - 371, // Bagon - 349, // Feebas - 353, // Shuppet - 158, // Totodile - 251, // Celebi - 360, // Wynaut - 27, // Sandshrew - 358, // Chimecho - 370, // Luvdisc - 228, // Houndour - 266, // Silcoon - 309, // Electrike - 4, // Charmander - 307, // Meditite - 278, // Wingull - 223, // Remoraid - 341, // Corphish - 222, // Corsola - 314, // Illumise - 209, // Snubbull - 37, // Vulpix - 246, // Larvitar - 374, // Beldum - 293, // Whismur - 204, // Pineco - 239, // Elekid - 35, // Clefairy - 213, // Shuckle - 216, // Teddiursa - 14, // Kakuna - 300, // Skitty - 176, // Togetic - 118, // Goldeen - 303, // Mawile - 179, // Mareep - 188, // Skiploom - 109, // Koffing - 51, // Dugtrio - 268, // Cascoon - 322, // Numel - 347, // Anorith - 313, // Volbeat - 163, // Hoothoot - 328, // Trapinch - 325, // Spoink - 11, // Metapod - 69, // Bellsprout - 361, // Snorunt - 20, // Raticate - 259, // Marshtomp - 277, // Swellow - 240, // Magby - 58, // Growlithe - 200, // Misdreavus - 1, // Bulbasaur - 236, // Tyrogue - 218, // Slugma - 287, // Slakoth - 281, // Kirlia - 190, // Aipom - 135, // Jolteon - 30, // Nidorina - 184, // Azumarill - 292, // Shedinja - 66, // Machop - 291, // Ninjask - 284, // Masquerain - 355, // Duskull - 192, // Sunflora - 189, // Jumpluff - 120, // Staryu - 180, // Flaaffy - 363, // Spheal - 54, // Psyduck - 219, // Magcargo - 83, // Farfetch'd - 41, // Zubat - 137, // Porygon - 161, // Sentret - 318, // Carvanha - 44, // Gloom - 26, // Raichu - 129, // Magikarp - 215, // Sneasel - 305, // Lairon - 256, // Combusken - 224, // Octillery - 33, // Nidorino - 136, // Flareon - 225, // Delibird - 72, // Tentacool - 63, // Abra - 253, // Grovyle - 340, // Whiscash - 156, // Quilava - 196, // Espeon - 88, // Grimer - 152, // Chikorita - 326, // Grumpig - 299, // Nosepass - 53, // Persian - 262, // Mightyena - 48, // Venonat - 82, // Magneton - 77, // Ponyta - 296, // Makuhita - 337, // Lunatone - 28, // Sandslash - 96, // Drowzee - 114, // Tangela - 57, // Primeape - 165, // Ledyba - 40, // Wigglytuff - 47, // Parasect - 139, // Omastar - 294, // Loudred - 8, // Wartortle - 75, // Graveler - 197, // Umbreon - 345, // Lileep - 61, // Poliwhirl - 134, // Vaporeon - 15, // Beedrill - 105, // Marowak - 70, // Weepinbell - 369, // Relicanth - 111, // Rhyhorn - 2, // Ivysaur - 352, // Kecleon - 274, // Nuzleaf - 267, // Beautifly - 17, // Pidgeotto - 168, // Ariados - 86, // Seel - 186, // Politoed - 159, // Croconaw - 113, // Chansey - 354, // Banette - 232, // Donphan - 121, // Starmie - 5, // Charmeleon - 221, // Piloswine - 12, // Butterfree - 329, // Vibrava - 125, // Electabuzz - 342, // Crawdaunt - 301, // Delcatty - 334, // Altaria - 372, // Shelgon - 38, // Ninetales - 207, // Gligar - 364, // Sealeo - 327, // Spinda - 247, // Pupitar - 79, // Slowpoke - 338, // Solrock - 241, // Miltank - 22, // Fearow - 45, // Vileplume - 89, // Muk - 205, // Forretress - 185, // Sudowoodo - 359, // Absol - 193, // Yanma - 269, // Dustox - 108, // Lickitung - 235, // Smeargle - 171, // Lanturn - 101, // Electrode - 271, // Lombre - 286, // Breloom - 153, // Bayleef - 117, // Seadra - 110, // Weezing - 279, // Pelipper - 375, // Metang - 31, // Nidoqueen - 332, // Cacturne - 275, // Shiftry - 308, // Medicham - 335, // Zangoose - 141, // Kabutops - 99, // Kingler - 64, // Kadabra - 119, // Seaking - 36, // Clefable - 126, // Magmar - 202, // Wobbuffet - 92, // Gastly - 122, // Mr. mime - 62, // Poliwrath - 128, // Tauros - 380, // Latias - 181, // Ampharos - 288, // Vigoroth - 166, // Ledian - 76, // Golem - 365, // Walrein - 84, // Doduo - 229, // Houndoom - 34, // Nidoking - 124, // Jynx - 107, // Hitmonchan - 234, // Stantler - 210, // Granbull - 237, // Hitmontop - 195, // Quagsire - 344, // Claydol - 260, // Swampert - 242, // Blissey - 272, // Ludicolo - 295, // Exploud - 206, // Dunsparce - 127, // Pinsir - 91, // Cloyster - 67, // Machoke - 203, // Girafarig - 18, // Pidgeot - 178, // Xatu - 346, // Cradily - 106, // Hitmonlee - 49, // Venomoth - 94, // Gengar - 214, // Heracross - 362, // Glalie - 123, // Scyther - 373, // Salamence - 310, // Manectric - 348, // Armaldo - 65, // Alakazam - 97, // Hypno - 164, // Noctowl - 73, // Tentacruel - 356, // Dusclops - 145, // Zapdos - 42, // Golbat - 376, // Metagross - 282, // Gardevoir - 9, // Blastoise - 80, // Slowbro - 93, // Haunter - 68, // Machamp - 377, // Regirock - 317, // Swalot - 254, // Sceptile - 227, // Skarmory - 55, // Golduck - 386, // Deoxys - 71, // Victreebel - 78, // Rapidash - 6, // Charizard - 367, // Huntail - 87, // Dewgong - 144, // Articuno - 157, // Typhlosion - 142, // Aerodactyl - 368, // Gorebyss - 217, // Ursaring - 154, // Meganium - 378, // Regice - 212, // Scizor - 230, // Kingdra - 147, // Dratini - 85, // Dodrio - 319, // Sharpedo - 169, // Crobat - 162, // Furret - 59, // Arcanine - 243, // Raikou - 257, // Blaziken - 323, // Camerupt - 112, // Rhydon - 379, // Registeel - 23, // Ekans - 330, // Flygon - 357, // Tropius - 381, // Latios - 245, // Suicune - 146, // Moltres - 3, // Venusaur - 103, // Exeggutor - 199, // Slowking - 248, // Tyranitar - 289, // Slaking - 320, // Wailmer - 150, // Mewtwo - 306, // Aggron - 143, // Snorlax - 226, // Mantine - 244, // Entei - 149, // Dragonite - 115, // Kangaskhan - 297, // Hariyama - 160, // Feraligatr - 131, // Lapras - 336, // Seviper - 24, // Arbok - 383, // Groudon - 250, // Ho-Oh - 148, // Dragonair - 382, // Kyogre - 249, // Lugia - 350, // Milotic - 130, // Gyarados - 384, // Rayquaza - 95, // Onix - 208, // Steelix - 321, // Wailord + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_NATU, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_MEW, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_ARON, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_MUK, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_METANG, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_XATU, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_GROUDON, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_WAILORD, }; - -#endif // GUARD_DATA_POKEDEX_ORDERS diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index acf6506bd..007c73248 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -1,6 +1,7 @@ const struct PokedexEntry gPokedexEntries[] = { - { //Dummy + [NATIONAL_DEX_NONE] = + { .categoryName = _("UNKNOWN"), .height = 0, .weight = 0, @@ -10,7 +11,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Bulbasaur + + [NATIONAL_DEX_BULBASAUR] = + { .categoryName = _("SEED"), .height = 7, .weight = 69, @@ -20,7 +23,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ivysaur + + [NATIONAL_DEX_IVYSAUR] = + { .categoryName = _("SEED"), .height = 10, .weight = 130, @@ -30,7 +35,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Venusaur + + [NATIONAL_DEX_VENUSAUR] = + { .categoryName = _("SEED"), .height = 20, .weight = 1000, @@ -40,7 +47,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 388, .trainerOffset = 6, }, - { //Charmander + + [NATIONAL_DEX_CHARMANDER] = + { .categoryName = _("LIZARD"), .height = 6, .weight = 85, @@ -50,7 +59,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Charmeleon + + [NATIONAL_DEX_CHARMELEON] = + { .categoryName = _("FLAME"), .height = 11, .weight = 190, @@ -60,7 +71,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Charizard + + [NATIONAL_DEX_CHARIZARD] = + { .categoryName = _("FLAME"), .height = 17, .weight = 905, @@ -70,7 +83,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 302, .trainerOffset = 3, }, - { //Squirtle + + [NATIONAL_DEX_SQUIRTLE] = + { .categoryName = _("TINY TURTLE"), .height = 5, .weight = 90, @@ -80,7 +95,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Wartortle + + [NATIONAL_DEX_WARTORTLE] = + { .categoryName = _("TURTLE"), .height = 10, .weight = 225, @@ -90,7 +107,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Blastoise + + [NATIONAL_DEX_BLASTOISE] = + { .categoryName = _("SHELLFISH"), .height = 16, .weight = 855, @@ -100,7 +119,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 293, .trainerOffset = 2, }, - { //Caterpie + + [NATIONAL_DEX_CATERPIE] = + { .categoryName = _("WORM"), .height = 3, .weight = 29, @@ -110,7 +131,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Metapod + + [NATIONAL_DEX_METAPOD] = + { .categoryName = _("COCOON"), .height = 7, .weight = 99, @@ -120,7 +143,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Butterfree + + [NATIONAL_DEX_BUTTERFREE] = + { .categoryName = _("BUTTERFLY"), .height = 11, .weight = 320, @@ -130,7 +155,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Weedle + + [NATIONAL_DEX_WEEDLE] = + { .categoryName = _("HAIRY BUG"), .height = 3, .weight = 32, @@ -140,7 +167,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kakuna + + [NATIONAL_DEX_KAKUNA] = + { .categoryName = _("COCOON"), .height = 6, .weight = 100, @@ -150,7 +179,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Beedrill + + [NATIONAL_DEX_BEEDRILL] = + { .categoryName = _("POISON BEE"), .height = 10, .weight = 295, @@ -160,7 +191,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Pidgey + + [NATIONAL_DEX_PIDGEY] = + { .categoryName = _("TINY BIRD"), .height = 3, .weight = 18, @@ -170,7 +203,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Pidgeotto + + [NATIONAL_DEX_PIDGEOTTO] = + { .categoryName = _("BIRD"), .height = 11, .weight = 300, @@ -180,7 +215,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Pidgeot + + [NATIONAL_DEX_PIDGEOT] = + { .categoryName = _("BIRD"), .height = 15, .weight = 395, @@ -190,7 +227,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Rattata + + [NATIONAL_DEX_RATTATA] = + { .categoryName = _("MOUSE"), .height = 3, .weight = 35, @@ -200,7 +239,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Raticate + + [NATIONAL_DEX_RATICATE] = + { .categoryName = _("MOUSE"), .height = 7, .weight = 185, @@ -210,7 +251,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Spearow + + [NATIONAL_DEX_SPEAROW] = + { .categoryName = _("TINY BIRD"), .height = 3, .weight = 20, @@ -220,7 +263,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Fearow + + [NATIONAL_DEX_FEAROW] = + { .categoryName = _("BEAK"), .height = 12, .weight = 380, @@ -230,7 +275,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ekans + + [NATIONAL_DEX_EKANS] = + { .categoryName = _("SNAKE"), .height = 20, .weight = 69, @@ -240,7 +287,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Arbok + + [NATIONAL_DEX_ARBOK] = + { .categoryName = _("COBRA"), .height = 35, .weight = 650, @@ -250,7 +299,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 296, .trainerOffset = 2, }, - { //Pikachu + + [NATIONAL_DEX_PIKACHU] = + { .categoryName = _("MOUSE"), .height = 4, .weight = 60, @@ -260,7 +311,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Raichu + + [NATIONAL_DEX_RAICHU] = + { .categoryName = _("MOUSE"), .height = 8, .weight = 300, @@ -270,7 +323,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sandshrew + + [NATIONAL_DEX_SANDSHREW] = + { .categoryName = _("MOUSE"), .height = 6, .weight = 120, @@ -280,7 +335,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sandslash + + [NATIONAL_DEX_SANDSLASH] = + { .categoryName = _("MOUSE"), .height = 10, .weight = 295, @@ -290,7 +347,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //NidoranF + + [NATIONAL_DEX_NIDORAN_F] = + { .categoryName = _("POISON PIN"), .height = 4, .weight = 70, @@ -300,7 +359,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Nidorina + + [NATIONAL_DEX_NIDORINA] = + { .categoryName = _("POISON PIN"), .height = 8, .weight = 200, @@ -310,7 +371,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Nidoqueen + + [NATIONAL_DEX_NIDOQUEEN] = + { .categoryName = _("DRILL"), .height = 13, .weight = 600, @@ -320,7 +383,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //NidoranM + + [NATIONAL_DEX_NIDORAN_M] = + { .categoryName = _("POISON PIN"), .height = 5, .weight = 90, @@ -330,7 +395,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Nidorino + + [NATIONAL_DEX_NIDORINO] = + { .categoryName = _("POISON PIN"), .height = 9, .weight = 195, @@ -340,7 +407,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Nidoking + + [NATIONAL_DEX_NIDOKING] = + { .categoryName = _("DRILL"), .height = 14, .weight = 620, @@ -350,7 +419,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Clefairy + + [NATIONAL_DEX_CLEFAIRY] = + { .categoryName = _("FAIRY"), .height = 6, .weight = 75, @@ -360,7 +431,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Clefable + + [NATIONAL_DEX_CLEFABLE] = + { .categoryName = _("FAIRY"), .height = 13, .weight = 400, @@ -370,7 +443,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Vulpix + + [NATIONAL_DEX_VULPIX] = + { .categoryName = _("FOX"), .height = 6, .weight = 99, @@ -380,7 +455,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ninetales + + [NATIONAL_DEX_NINETALES] = + { .categoryName = _("FOX"), .height = 11, .weight = 199, @@ -390,7 +467,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Jigglypuff + + [NATIONAL_DEX_JIGGLYPUFF] = + { .categoryName = _("BALLOON"), .height = 5, .weight = 55, @@ -400,7 +479,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Wigglytuff + + [NATIONAL_DEX_WIGGLYTUFF] = + { .categoryName = _("BALLOON"), .height = 10, .weight = 120, @@ -410,7 +491,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Zubat + + [NATIONAL_DEX_ZUBAT] = + { .categoryName = _("BAT"), .height = 8, .weight = 75, @@ -420,7 +503,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Golbat + + [NATIONAL_DEX_GOLBAT] = + { .categoryName = _("BAT"), .height = 16, .weight = 550, @@ -430,7 +515,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Oddish + + [NATIONAL_DEX_ODDISH] = + { .categoryName = _("WEED"), .height = 5, .weight = 54, @@ -440,7 +527,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Gloom + + [NATIONAL_DEX_GLOOM] = + { .categoryName = _("WEED"), .height = 8, .weight = 86, @@ -450,7 +539,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Vileplume + + [NATIONAL_DEX_VILEPLUME] = + { .categoryName = _("FLOWER"), .height = 12, .weight = 186, @@ -460,7 +551,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Paras + + [NATIONAL_DEX_PARAS] = + { .categoryName = _("MUSHROOM"), .height = 3, .weight = 54, @@ -470,7 +563,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Parasect + + [NATIONAL_DEX_PARASECT] = + { .categoryName = _("MUSHROOM"), .height = 10, .weight = 295, @@ -480,7 +575,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Venonat + + [NATIONAL_DEX_VENONAT] = + { .categoryName = _("INSECT"), .height = 10, .weight = 300, @@ -490,7 +587,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = -1, }, - { //Venomoth + + [NATIONAL_DEX_VENOMOTH] = + { .categoryName = _("POISON MOTH"), .height = 15, .weight = 125, @@ -500,7 +599,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 1, }, - { //Diglett + + [NATIONAL_DEX_DIGLETT] = + { .categoryName = _("MOLE"), .height = 2, .weight = 8, @@ -510,7 +611,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Dugtrio + + [NATIONAL_DEX_DUGTRIO] = + { .categoryName = _("MOLE"), .height = 7, .weight = 333, @@ -520,7 +623,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Meowth + + [NATIONAL_DEX_MEOWTH] = + { .categoryName = _("SCRATCH CAT"), .height = 4, .weight = 42, @@ -530,7 +635,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Persian + + [NATIONAL_DEX_PERSIAN] = + { .categoryName = _("CLASSY CAT"), .height = 10, .weight = 320, @@ -540,7 +647,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Psyduck + + [NATIONAL_DEX_PSYDUCK] = + { .categoryName = _("DUCK"), .height = 8, .weight = 196, @@ -550,7 +659,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Golduck + + [NATIONAL_DEX_GOLDUCK] = + { .categoryName = _("DUCK"), .height = 17, .weight = 766, @@ -560,7 +671,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 273, .trainerOffset = 1, }, - { //Mankey + + [NATIONAL_DEX_MANKEY] = + { .categoryName = _("PIG MONKEY"), .height = 5, .weight = 280, @@ -570,7 +683,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Primeape + + [NATIONAL_DEX_PRIMEAPE] = + { .categoryName = _("PIG MONKEY"), .height = 10, .weight = 320, @@ -580,7 +695,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Growlithe + + [NATIONAL_DEX_GROWLITHE] = + { .categoryName = _("PUPPY"), .height = 7, .weight = 190, @@ -590,7 +707,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Arcanine + + [NATIONAL_DEX_ARCANINE] = + { .categoryName = _("LEGENDARY"), .height = 19, .weight = 1550, @@ -600,7 +719,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 312, .trainerOffset = 4, }, - { //Poliwag + + [NATIONAL_DEX_POLIWAG] = + { .categoryName = _("TADPOLE"), .height = 6, .weight = 124, @@ -610,7 +731,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Poliwhirl + + [NATIONAL_DEX_POLIWHIRL] = + { .categoryName = _("TADPOLE"), .height = 10, .weight = 200, @@ -620,7 +743,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Poliwrath + + [NATIONAL_DEX_POLIWRATH] = + { .categoryName = _("TADPOLE"), .height = 13, .weight = 540, @@ -630,7 +755,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Abra + + [NATIONAL_DEX_ABRA] = + { .categoryName = _("PSI"), .height = 9, .weight = 195, @@ -640,7 +767,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kadabra + + [NATIONAL_DEX_KADABRA] = + { .categoryName = _("PSI"), .height = 13, .weight = 565, @@ -650,7 +779,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Alakazam + + [NATIONAL_DEX_ALAKAZAM] = + { .categoryName = _("PSI"), .height = 15, .weight = 480, @@ -660,7 +791,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Machop + + [NATIONAL_DEX_MACHOP] = + { .categoryName = _("SUPERPOWER"), .height = 8, .weight = 195, @@ -670,7 +803,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Machoke + + [NATIONAL_DEX_MACHOKE] = + { .categoryName = _("SUPERPOWER"), .height = 15, .weight = 705, @@ -680,7 +815,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 257, .trainerOffset = 0, }, - { //Machamp + + [NATIONAL_DEX_MACHAMP] = + { .categoryName = _("SUPERPOWER"), .height = 16, .weight = 1300, @@ -690,7 +827,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 269, .trainerOffset = -1, }, - { //Bellsprout + + [NATIONAL_DEX_BELLSPROUT] = + { .categoryName = _("FLOWER"), .height = 7, .weight = 40, @@ -700,7 +839,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Weepinbell + + [NATIONAL_DEX_WEEPINBELL] = + { .categoryName = _("FLYCATCHER"), .height = 10, .weight = 64, @@ -710,7 +851,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Victreebel + + [NATIONAL_DEX_VICTREEBEL] = + { .categoryName = _("FLYCATCHER"), .height = 17, .weight = 155, @@ -720,7 +863,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 312, .trainerOffset = 3, }, - { //Tentacool + + [NATIONAL_DEX_TENTACOOL] = + { .categoryName = _("JELLYFISH"), .height = 9, .weight = 455, @@ -730,7 +875,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Tentacruel + + [NATIONAL_DEX_TENTACRUEL] = + { .categoryName = _("JELLYFISH"), .height = 16, .weight = 550, @@ -740,7 +887,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 312, .trainerOffset = 1, }, - { //Geodude + + [NATIONAL_DEX_GEODUDE] = + { .categoryName = _("ROCK"), .height = 4, .weight = 200, @@ -750,7 +899,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Graveler + + [NATIONAL_DEX_GRAVELER] = + { .categoryName = _("ROCK"), .height = 10, .weight = 1050, @@ -760,7 +911,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Golem + + [NATIONAL_DEX_GOLEM] = + { .categoryName = _("MEGATON"), .height = 14, .weight = 3000, @@ -770,7 +923,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 296, .trainerOffset = 2, }, - { //Ponyta + + [NATIONAL_DEX_PONYTA] = + { .categoryName = _("FIRE HORSE"), .height = 10, .weight = 300, @@ -780,7 +935,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Rapidash + + [NATIONAL_DEX_RAPIDASH] = + { .categoryName = _("FIRE HORSE"), .height = 17, .weight = 950, @@ -790,7 +947,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 289, .trainerOffset = 1, }, - { //Slowpoke + + [NATIONAL_DEX_SLOWPOKE] = + { .categoryName = _("DOPEY"), .height = 12, .weight = 360, @@ -800,7 +959,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Slowbro + + [NATIONAL_DEX_SLOWBRO] = + { .categoryName = _("HERMIT CRAB"), .height = 16, .weight = 785, @@ -810,7 +971,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 296, .trainerOffset = 2, }, - { //Magnemite + + [NATIONAL_DEX_MAGNEMITE] = + { .categoryName = _("MAGNET"), .height = 3, .weight = 60, @@ -820,7 +983,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Magneton + + [NATIONAL_DEX_MAGNETON] = + { .categoryName = _("MAGNET"), .height = 10, .weight = 600, @@ -830,7 +995,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Farfetchd + + [NATIONAL_DEX_FARFETCHD] = + { .categoryName = _("WILD DUCK"), .height = 8, .weight = 150, @@ -840,7 +1007,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 293, .trainerOffset = 2, }, - { //Doduo + + [NATIONAL_DEX_DODUO] = + { .categoryName = _("TWIN BIRD"), .height = 14, .weight = 392, @@ -850,7 +1019,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 257, .trainerOffset = -1, }, - { //Dodrio + + [NATIONAL_DEX_DODRIO] = + { .categoryName = _("TRIPLE BIRD"), .height = 18, .weight = 852, @@ -860,7 +1031,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 268, .trainerOffset = 0, }, - { //Seel + + [NATIONAL_DEX_SEEL] = + { .categoryName = _("SEA LION"), .height = 11, .weight = 900, @@ -870,7 +1043,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Dewgong + + [NATIONAL_DEX_DEWGONG] = + { .categoryName = _("SEA LION"), .height = 17, .weight = 1200, @@ -880,7 +1055,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 275, .trainerOffset = 0, }, - { //Grimer + + [NATIONAL_DEX_GRIMER] = + { .categoryName = _("SLUDGE"), .height = 9, .weight = 300, @@ -890,7 +1067,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Muk + + [NATIONAL_DEX_MUK] = + { .categoryName = _("SLUDGE"), .height = 12, .weight = 300, @@ -900,7 +1079,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Shellder + + [NATIONAL_DEX_SHELLDER] = + { .categoryName = _("BIVALVE"), .height = 3, .weight = 40, @@ -910,7 +1091,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Cloyster + + [NATIONAL_DEX_CLOYSTER] = + { .categoryName = _("BIVALVE"), .height = 15, .weight = 1325, @@ -920,7 +1103,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 269, .trainerOffset = 1, }, - { //Gastly + + [NATIONAL_DEX_GASTLY] = + { .categoryName = _("GAS"), .height = 13, .weight = 1, @@ -930,7 +1115,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Haunter + + [NATIONAL_DEX_HAUNTER] = + { .categoryName = _("GAS"), .height = 16, .weight = 1, @@ -940,7 +1127,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 293, .trainerOffset = 2, }, - { //Gengar + + [NATIONAL_DEX_GENGAR] = + { .categoryName = _("SHADOW"), .height = 15, .weight = 405, @@ -950,7 +1139,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 302, .trainerOffset = 2, }, - { //Onix + + [NATIONAL_DEX_ONIX] = + { .categoryName = _("ROCK SNAKE"), .height = 88, .weight = 2100, @@ -960,7 +1151,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 515, .trainerOffset = 14, }, - { //Drowzee + + [NATIONAL_DEX_DROWZEE] = + { .categoryName = _("HYPNOSIS"), .height = 10, .weight = 324, @@ -970,7 +1163,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Hypno + + [NATIONAL_DEX_HYPNO] = + { .categoryName = _("HYPNOSIS"), .height = 16, .weight = 756, @@ -980,7 +1175,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 257, .trainerOffset = 0, }, - { //Krabby + + [NATIONAL_DEX_KRABBY] = + { .categoryName = _("RIVER CRAB"), .height = 4, .weight = 65, @@ -990,7 +1187,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kingler + + [NATIONAL_DEX_KINGLER] = + { .categoryName = _("PINCER"), .height = 13, .weight = 600, @@ -1000,7 +1199,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Voltorb + + [NATIONAL_DEX_VOLTORB] = + { .categoryName = _("BALL"), .height = 5, .weight = 104, @@ -1010,7 +1211,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Electrode + + [NATIONAL_DEX_ELECTRODE] = + { .categoryName = _("BALL"), .height = 12, .weight = 666, @@ -1020,7 +1223,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Exeggcute + + [NATIONAL_DEX_EXEGGCUTE] = + { .categoryName = _("EGG"), .height = 4, .weight = 25, @@ -1030,7 +1235,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Exeggutor + + [NATIONAL_DEX_EXEGGUTOR] = + { .categoryName = _("COCONUT"), .height = 20, .weight = 1200, @@ -1040,7 +1247,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 309, .trainerOffset = 5, }, - { //Cubone + + [NATIONAL_DEX_CUBONE] = + { .categoryName = _("LONELY"), .height = 4, .weight = 65, @@ -1050,7 +1259,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Marowak + + [NATIONAL_DEX_MAROWAK] = + { .categoryName = _("BONE KEEPER"), .height = 10, .weight = 450, @@ -1060,7 +1271,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Hitmonlee + + [NATIONAL_DEX_HITMONLEE] = + { .categoryName = _("KICKING"), .height = 15, .weight = 498, @@ -1070,7 +1283,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 259, .trainerOffset = 1, }, - { //Hitmonchan + + [NATIONAL_DEX_HITMONCHAN] = + { .categoryName = _("PUNCHING"), .height = 14, .weight = 502, @@ -1080,7 +1295,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 277, .trainerOffset = 2, }, - { //Lickitung + + [NATIONAL_DEX_LICKITUNG] = + { .categoryName = _("LICKING"), .height = 12, .weight = 655, @@ -1090,7 +1307,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Koffing + + [NATIONAL_DEX_KOFFING] = + { .categoryName = _("POISON GAS"), .height = 6, .weight = 10, @@ -1100,7 +1319,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Weezing + + [NATIONAL_DEX_WEEZING] = + { .categoryName = _("POISON GAS"), .height = 12, .weight = 95, @@ -1110,7 +1331,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Rhyhorn + + [NATIONAL_DEX_RHYHORN] = + { .categoryName = _("SPIKES"), .height = 10, .weight = 1150, @@ -1120,7 +1343,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Rhydon + + [NATIONAL_DEX_RHYDON] = + { .categoryName = _("DRILL"), .height = 19, .weight = 1200, @@ -1130,7 +1355,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 299, .trainerOffset = 2, }, - { //Chansey + + [NATIONAL_DEX_CHANSEY] = + { .categoryName = _("EGG"), .height = 11, .weight = 346, @@ -1140,7 +1367,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Tangela + + [NATIONAL_DEX_TANGELA] = + { .categoryName = _("VINE"), .height = 10, .weight = 350, @@ -1150,7 +1379,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kangaskhan + + [NATIONAL_DEX_KANGASKHAN] = + { .categoryName = _("PARENT"), .height = 22, .weight = 800, @@ -1160,7 +1391,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 387, .trainerOffset = 8, }, - { //Horsea + + [NATIONAL_DEX_HORSEA] = + { .categoryName = _("DRAGON"), .height = 4, .weight = 80, @@ -1170,7 +1403,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Seadra + + [NATIONAL_DEX_SEADRA] = + { .categoryName = _("DRAGON"), .height = 12, .weight = 250, @@ -1180,7 +1415,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Goldeen + + [NATIONAL_DEX_GOLDEEN] = + { .categoryName = _("GOLDFISH"), .height = 6, .weight = 150, @@ -1190,7 +1427,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Seaking + + [NATIONAL_DEX_SEAKING] = + { .categoryName = _("GOLDFISH"), .height = 13, .weight = 390, @@ -1200,7 +1439,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Staryu + + [NATIONAL_DEX_STARYU] = + { .categoryName = _("STAR SHAPE"), .height = 8, .weight = 345, @@ -1210,7 +1451,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Starmie + + [NATIONAL_DEX_STARMIE] = + { .categoryName = _("MYSTERIOUS"), .height = 11, .weight = 800, @@ -1220,7 +1463,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Mrmime + + [NATIONAL_DEX_MR_MIME] = + { .categoryName = _("BARRIER"), .height = 13, .weight = 545, @@ -1230,7 +1475,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Scyther + + [NATIONAL_DEX_SCYTHER] = + { .categoryName = _("MANTIS"), .height = 15, .weight = 560, @@ -1240,7 +1487,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 293, .trainerOffset = 2, }, - { //Jynx + + [NATIONAL_DEX_JYNX] = + { .categoryName = _("HUMAN SHAPE"), .height = 14, .weight = 406, @@ -1250,7 +1499,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 300, .trainerOffset = 1, }, - { //Electabuzz + + [NATIONAL_DEX_ELECTABUZZ] = + { .categoryName = _("ELECTRIC"), .height = 11, .weight = 300, @@ -1260,7 +1511,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Magmar + + [NATIONAL_DEX_MAGMAR] = + { .categoryName = _("SPITFIRE"), .height = 13, .weight = 445, @@ -1270,7 +1523,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Pinsir + + [NATIONAL_DEX_PINSIR] = + { .categoryName = _("STAG BEETLE"), .height = 15, .weight = 550, @@ -1280,7 +1535,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 257, .trainerOffset = 0, }, - { //Tauros + + [NATIONAL_DEX_TAUROS] = + { .categoryName = _("WILD BULL"), .height = 14, .weight = 884, @@ -1290,7 +1547,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Magikarp + + [NATIONAL_DEX_MAGIKARP] = + { .categoryName = _("FISH"), .height = 9, .weight = 100, @@ -1300,7 +1559,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Gyarados + + [NATIONAL_DEX_GYARADOS] = + { .categoryName = _("ATROCIOUS"), .height = 65, .weight = 2350, @@ -1310,7 +1571,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 481, .trainerOffset = 13, }, - { //Lapras + + [NATIONAL_DEX_LAPRAS] = + { .categoryName = _("TRANSPORT"), .height = 25, .weight = 2200, @@ -1320,7 +1583,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 423, .trainerOffset = 8, }, - { //Ditto + + [NATIONAL_DEX_DITTO] = + { .categoryName = _("TRANSFORM"), .height = 3, .weight = 40, @@ -1330,7 +1595,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Eevee + + [NATIONAL_DEX_EEVEE] = + { .categoryName = _("EVOLUTION"), .height = 3, .weight = 65, @@ -1340,7 +1607,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Vaporeon + + [NATIONAL_DEX_VAPOREON] = + { .categoryName = _("BUBBLE JET"), .height = 10, .weight = 290, @@ -1350,7 +1619,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Jolteon + + [NATIONAL_DEX_JOLTEON] = + { .categoryName = _("LIGHTNING"), .height = 8, .weight = 245, @@ -1360,7 +1631,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Flareon + + [NATIONAL_DEX_FLAREON] = + { .categoryName = _("FLAME"), .height = 9, .weight = 250, @@ -1370,7 +1643,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Porygon + + [NATIONAL_DEX_PORYGON] = + { .categoryName = _("VIRTUAL"), .height = 8, .weight = 365, @@ -1380,7 +1655,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Omanyte + + [NATIONAL_DEX_OMANYTE] = + { .categoryName = _("SPIRAL"), .height = 4, .weight = 75, @@ -1390,7 +1667,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Omastar + + [NATIONAL_DEX_OMASTAR] = + { .categoryName = _("SPIRAL"), .height = 10, .weight = 350, @@ -1400,7 +1679,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kabuto + + [NATIONAL_DEX_KABUTO] = + { .categoryName = _("SHELLFISH"), .height = 5, .weight = 115, @@ -1410,7 +1691,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kabutops + + [NATIONAL_DEX_KABUTOPS] = + { .categoryName = _("SHELLFISH"), .height = 13, .weight = 405, @@ -1420,7 +1703,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Aerodactyl + + [NATIONAL_DEX_AERODACTYL] = + { .categoryName = _("FOSSIL"), .height = 18, .weight = 590, @@ -1430,7 +1715,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 302, .trainerOffset = 4, }, - { //Snorlax + + [NATIONAL_DEX_SNORLAX] = + { .categoryName = _("SLEEPING"), .height = 21, .weight = 4600, @@ -1440,7 +1727,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 423, .trainerOffset = 11, }, - { //Articuno + + [NATIONAL_DEX_ARTICUNO] = + { .categoryName = _("FREEZE"), .height = 17, .weight = 554, @@ -1450,7 +1739,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 309, .trainerOffset = 2, }, - { //Zapdos + + [NATIONAL_DEX_ZAPDOS] = + { .categoryName = _("ELECTRIC"), .height = 16, .weight = 526, @@ -1460,7 +1751,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 318, .trainerOffset = 3, }, - { //Moltres + + [NATIONAL_DEX_MOLTRES] = + { .categoryName = _("FLAME"), .height = 20, .weight = 600, @@ -1470,7 +1763,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 387, .trainerOffset = 8, }, - { //Dratini + + [NATIONAL_DEX_DRATINI] = + { .categoryName = _("DRAGON"), .height = 18, .weight = 33, @@ -1480,7 +1775,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 386, .trainerOffset = 6, }, - { //Dragonair + + [NATIONAL_DEX_DRAGONAIR] = + { .categoryName = _("DRAGON"), .height = 40, .weight = 165, @@ -1490,7 +1787,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 411, .trainerOffset = 5, }, - { //Dragonite + + [NATIONAL_DEX_DRAGONITE] = + { .categoryName = _("DRAGON"), .height = 22, .weight = 2100, @@ -1500,7 +1799,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 309, .trainerOffset = 4, }, - { //Mewtwo + + [NATIONAL_DEX_MEWTWO] = + { .categoryName = _("GENETIC"), .height = 20, .weight = 1220, @@ -1510,7 +1811,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 309, .trainerOffset = 4, }, - { //Mew + + [NATIONAL_DEX_MEW] = + { .categoryName = _("NEW SPECIES"), .height = 4, .weight = 40, @@ -1520,7 +1823,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Chikorita + + [NATIONAL_DEX_CHIKORITA] = + { .categoryName = _("LEAF"), .height = 9, .weight = 64, @@ -1530,7 +1835,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Bayleef + + [NATIONAL_DEX_BAYLEEF] = + { .categoryName = _("LEAF"), .height = 12, .weight = 158, @@ -1540,7 +1847,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Meganium + + [NATIONAL_DEX_MEGANIUM] = + { .categoryName = _("HERB"), .height = 18, .weight = 1005, @@ -1550,7 +1859,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 277, .trainerOffset = 1, }, - { //Cyndaquil + + [NATIONAL_DEX_CYNDAQUIL] = + { .categoryName = _("FIRE MOUSE"), .height = 5, .weight = 79, @@ -1560,7 +1871,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Quilava + + [NATIONAL_DEX_QUILAVA] = + { .categoryName = _("VOLCANO"), .height = 9, .weight = 190, @@ -1570,7 +1883,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Typhlosion + + [NATIONAL_DEX_TYPHLOSION] = + { .categoryName = _("VOLCANO"), .height = 17, .weight = 795, @@ -1580,7 +1895,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 268, .trainerOffset = 1, }, - { //Totodile + + [NATIONAL_DEX_TOTODILE] = + { .categoryName = _("BIG JAW"), .height = 6, .weight = 95, @@ -1590,7 +1907,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Croconaw + + [NATIONAL_DEX_CROCONAW] = + { .categoryName = _("BIG JAW"), .height = 11, .weight = 250, @@ -1600,7 +1919,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Feraligatr + + [NATIONAL_DEX_FERALIGATR] = + { .categoryName = _("BIG JAW"), .height = 23, .weight = 888, @@ -1610,7 +1931,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 342, .trainerOffset = 7, }, - { //Sentret + + [NATIONAL_DEX_SENTRET] = + { .categoryName = _("SCOUT"), .height = 8, .weight = 60, @@ -1620,7 +1943,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Furret + + [NATIONAL_DEX_FURRET] = + { .categoryName = _("LONG BODY"), .height = 18, .weight = 325, @@ -1630,7 +1955,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Hoothoot + + [NATIONAL_DEX_HOOTHOOT] = + { .categoryName = _("OWL"), .height = 7, .weight = 212, @@ -1640,7 +1967,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Noctowl + + [NATIONAL_DEX_NOCTOWL] = + { .categoryName = _("OWL"), .height = 16, .weight = 408, @@ -1650,7 +1979,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ledyba + + [NATIONAL_DEX_LEDYBA] = + { .categoryName = _("FIVE STAR"), .height = 10, .weight = 108, @@ -1660,7 +1991,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ledian + + [NATIONAL_DEX_LEDIAN] = + { .categoryName = _("FIVE STAR"), .height = 14, .weight = 356, @@ -1670,7 +2003,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Spinarak + + [NATIONAL_DEX_SPINARAK] = + { .categoryName = _("STRING SPIT"), .height = 5, .weight = 85, @@ -1680,7 +2015,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ariados + + [NATIONAL_DEX_ARIADOS] = + { .categoryName = _("LONG LEG"), .height = 11, .weight = 335, @@ -1690,7 +2027,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Crobat + + [NATIONAL_DEX_CROBAT] = + { .categoryName = _("BAT"), .height = 18, .weight = 750, @@ -1700,7 +2039,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 281, .trainerOffset = 1, }, - { //Chinchou + + [NATIONAL_DEX_CHINCHOU] = + { .categoryName = _("ANGLER"), .height = 5, .weight = 120, @@ -1710,7 +2051,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Lanturn + + [NATIONAL_DEX_LANTURN] = + { .categoryName = _("LIGHT"), .height = 12, .weight = 225, @@ -1720,7 +2063,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Pichu + + [NATIONAL_DEX_PICHU] = + { .categoryName = _("TINY MOUSE"), .height = 3, .weight = 20, @@ -1730,7 +2075,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Cleffa + + [NATIONAL_DEX_CLEFFA] = + { .categoryName = _("STAR SHAPE"), .height = 3, .weight = 30, @@ -1740,7 +2087,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Igglybuff + + [NATIONAL_DEX_IGGLYBUFF] = + { .categoryName = _("BALLOON"), .height = 3, .weight = 10, @@ -1750,7 +2099,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Togepi + + [NATIONAL_DEX_TOGEPI] = + { .categoryName = _("SPIKE BALL"), .height = 3, .weight = 15, @@ -1760,7 +2111,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Togetic + + [NATIONAL_DEX_TOGETIC] = + { .categoryName = _("HAPPINESS"), .height = 6, .weight = 32, @@ -1770,7 +2123,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Natu + + [NATIONAL_DEX_NATU] = + { .categoryName = _("TINY BIRD"), .height = 2, .weight = 20, @@ -1780,7 +2135,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Xatu + + [NATIONAL_DEX_XATU] = + { .categoryName = _("MYSTIC"), .height = 15, .weight = 150, @@ -1790,7 +2147,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 318, .trainerOffset = 4, }, - { //Mareep + + [NATIONAL_DEX_MAREEP] = + { .categoryName = _("WOOL"), .height = 6, .weight = 78, @@ -1800,7 +2159,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Flaaffy + + [NATIONAL_DEX_FLAAFFY] = + { .categoryName = _("WOOL"), .height = 8, .weight = 133, @@ -1810,7 +2171,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ampharos + + [NATIONAL_DEX_AMPHAROS] = + { .categoryName = _("LIGHT"), .height = 14, .weight = 615, @@ -1820,7 +2183,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Bellossom + + [NATIONAL_DEX_BELLOSSOM] = + { .categoryName = _("FLOWER"), .height = 4, .weight = 58, @@ -1830,7 +2195,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Marill + + [NATIONAL_DEX_MARILL] = + { .categoryName = _("AQUA MOUSE"), .height = 4, .weight = 85, @@ -1840,7 +2207,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Azumarill + + [NATIONAL_DEX_AZUMARILL] = + { .categoryName = _("AQUA RABBIT"), .height = 8, .weight = 285, @@ -1850,7 +2219,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sudowoodo + + [NATIONAL_DEX_SUDOWOODO] = + { .categoryName = _("IMITATION"), .height = 12, .weight = 380, @@ -1860,7 +2231,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Politoed + + [NATIONAL_DEX_POLITOED] = + { .categoryName = _("FROG"), .height = 11, .weight = 339, @@ -1870,7 +2243,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Hoppip + + [NATIONAL_DEX_HOPPIP] = + { .categoryName = _("COTTONWEED"), .height = 4, .weight = 5, @@ -1880,7 +2255,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Skiploom + + [NATIONAL_DEX_SKIPLOOM] = + { .categoryName = _("COTTONWEED"), .height = 6, .weight = 10, @@ -1890,7 +2267,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Jumpluff + + [NATIONAL_DEX_JUMPLUFF] = + { .categoryName = _("COTTONWEED"), .height = 8, .weight = 30, @@ -1900,7 +2279,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Aipom + + [NATIONAL_DEX_AIPOM] = + { .categoryName = _("LONG TAIL"), .height = 8, .weight = 115, @@ -1910,7 +2291,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sunkern + + [NATIONAL_DEX_SUNKERN] = + { .categoryName = _("SEED"), .height = 3, .weight = 18, @@ -1920,7 +2303,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sunflora + + [NATIONAL_DEX_SUNFLORA] = + { .categoryName = _("SUN"), .height = 8, .weight = 85, @@ -1930,7 +2315,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Yanma + + [NATIONAL_DEX_YANMA] = + { .categoryName = _("CLEAR WING"), .height = 12, .weight = 380, @@ -1940,7 +2327,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Wooper + + [NATIONAL_DEX_WOOPER] = + { .categoryName = _("WATER FISH"), .height = 4, .weight = 85, @@ -1950,7 +2339,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Quagsire + + [NATIONAL_DEX_QUAGSIRE] = + { .categoryName = _("WATER FISH"), .height = 14, .weight = 750, @@ -1960,7 +2351,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Espeon + + [NATIONAL_DEX_ESPEON] = + { .categoryName = _("SUN"), .height = 9, .weight = 265, @@ -1970,7 +2363,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Umbreon + + [NATIONAL_DEX_UMBREON] = + { .categoryName = _("MOONLIGHT"), .height = 10, .weight = 270, @@ -1980,7 +2375,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Murkrow + + [NATIONAL_DEX_MURKROW] = + { .categoryName = _("DARKNESS"), .height = 5, .weight = 21, @@ -1990,7 +2387,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 1, }, - { //Slowking + + [NATIONAL_DEX_SLOWKING] = + { .categoryName = _("ROYAL"), .height = 20, .weight = 795, @@ -2000,7 +2399,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 309, .trainerOffset = 5, }, - { //Misdreavus + + [NATIONAL_DEX_MISDREAVUS] = + { .categoryName = _("SCREECH"), .height = 7, .weight = 10, @@ -2010,7 +2411,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Unown + + [NATIONAL_DEX_UNOWN] = + { .categoryName = _("SYMBOL"), .height = 5, .weight = 50, @@ -2020,7 +2423,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Wobbuffet + + [NATIONAL_DEX_WOBBUFFET] = + { .categoryName = _("PATIENT"), .height = 13, .weight = 285, @@ -2030,7 +2435,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Girafarig + + [NATIONAL_DEX_GIRAFARIG] = + { .categoryName = _("LONG NECK"), .height = 15, .weight = 415, @@ -2040,7 +2447,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Pineco + + [NATIONAL_DEX_PINECO] = + { .categoryName = _("BAGWORM"), .height = 6, .weight = 72, @@ -2050,7 +2459,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Forretress + + [NATIONAL_DEX_FORRETRESS] = + { .categoryName = _("BAGWORM"), .height = 12, .weight = 1258, @@ -2060,7 +2471,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Dunsparce + + [NATIONAL_DEX_DUNSPARCE] = + { .categoryName = _("LAND SNAKE"), .height = 15, .weight = 140, @@ -2070,7 +2483,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Gligar + + [NATIONAL_DEX_GLIGAR] = + { .categoryName = _("FLYSCORPION"), .height = 11, .weight = 648, @@ -2080,7 +2495,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Steelix + + [NATIONAL_DEX_STEELIX] = + { .categoryName = _("IRON SNAKE"), .height = 92, .weight = 4000, @@ -2090,7 +2507,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 516, .trainerOffset = 13, }, - { //Snubbull + + [NATIONAL_DEX_SNUBBULL] = + { .categoryName = _("FAIRY"), .height = 6, .weight = 78, @@ -2100,7 +2519,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Granbull + + [NATIONAL_DEX_GRANBULL] = + { .categoryName = _("FAIRY"), .height = 14, .weight = 487, @@ -2110,7 +2531,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Qwilfish + + [NATIONAL_DEX_QWILFISH] = + { .categoryName = _("BALLOON"), .height = 5, .weight = 39, @@ -2120,7 +2543,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Scizor + + [NATIONAL_DEX_SCIZOR] = + { .categoryName = _("PINCER"), .height = 18, .weight = 1180, @@ -2130,7 +2555,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Shuckle + + [NATIONAL_DEX_SHUCKLE] = + { .categoryName = _("MOLD"), .height = 6, .weight = 205, @@ -2140,7 +2567,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Heracross + + [NATIONAL_DEX_HERACROSS] = + { .categoryName = _("SINGLE HORN"), .height = 15, .weight = 540, @@ -2150,7 +2579,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sneasel + + [NATIONAL_DEX_SNEASEL] = + { .categoryName = _("SHARP CLAW"), .height = 9, .weight = 280, @@ -2160,7 +2591,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Teddiursa + + [NATIONAL_DEX_TEDDIURSA] = + { .categoryName = _("LITTLE BEAR"), .height = 6, .weight = 88, @@ -2170,7 +2603,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ursaring + + [NATIONAL_DEX_URSARING] = + { .categoryName = _("HIBERNATOR"), .height = 18, .weight = 1258, @@ -2180,7 +2615,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Slugma + + [NATIONAL_DEX_SLUGMA] = + { .categoryName = _("LAVA"), .height = 7, .weight = 350, @@ -2190,7 +2627,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Magcargo + + [NATIONAL_DEX_MAGCARGO] = + { .categoryName = _("LAVA"), .height = 8, .weight = 550, @@ -2200,7 +2639,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Swinub + + [NATIONAL_DEX_SWINUB] = + { .categoryName = _("PIG"), .height = 4, .weight = 65, @@ -2210,7 +2651,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Piloswine + + [NATIONAL_DEX_PILOSWINE] = + { .categoryName = _("SWINE"), .height = 11, .weight = 558, @@ -2220,7 +2663,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Corsola + + [NATIONAL_DEX_CORSOLA] = + { .categoryName = _("CORAL"), .height = 6, .weight = 50, @@ -2230,7 +2675,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Remoraid + + [NATIONAL_DEX_REMORAID] = + { .categoryName = _("JET"), .height = 6, .weight = 120, @@ -2240,7 +2687,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Octillery + + [NATIONAL_DEX_OCTILLERY] = + { .categoryName = _("JET"), .height = 9, .weight = 285, @@ -2250,7 +2699,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Delibird + + [NATIONAL_DEX_DELIBIRD] = + { .categoryName = _("DELIVERY"), .height = 9, .weight = 160, @@ -2260,7 +2711,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Mantine + + [NATIONAL_DEX_MANTINE] = + { .categoryName = _("KITE"), .height = 21, .weight = 2200, @@ -2270,7 +2723,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 342, .trainerOffset = 7, }, - { //Skarmory + + [NATIONAL_DEX_SKARMORY] = + { .categoryName = _("ARMOR BIRD"), .height = 17, .weight = 505, @@ -2280,7 +2735,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 271, .trainerOffset = 1, }, - { //Houndour + + [NATIONAL_DEX_HOUNDOUR] = + { .categoryName = _("DARK"), .height = 6, .weight = 108, @@ -2290,7 +2747,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Houndoom + + [NATIONAL_DEX_HOUNDOOM] = + { .categoryName = _("DARK"), .height = 14, .weight = 350, @@ -2300,7 +2759,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kingdra + + [NATIONAL_DEX_KINGDRA] = + { .categoryName = _("DRAGON"), .height = 18, .weight = 1520, @@ -2310,7 +2771,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 287, .trainerOffset = 0, }, - { //Phanpy + + [NATIONAL_DEX_PHANPY] = + { .categoryName = _("LONG NOSE"), .height = 5, .weight = 335, @@ -2320,7 +2783,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Donphan + + [NATIONAL_DEX_DONPHAN] = + { .categoryName = _("ARMOR"), .height = 11, .weight = 1200, @@ -2330,7 +2795,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Porygon2 + + [NATIONAL_DEX_PORYGON2] = + { .categoryName = _("VIRTUAL"), .height = 6, .weight = 325, @@ -2340,7 +2807,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Stantler + + [NATIONAL_DEX_STANTLER] = + { .categoryName = _("BIG HORN"), .height = 14, .weight = 712, @@ -2350,7 +2819,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Smeargle + + [NATIONAL_DEX_SMEARGLE] = + { .categoryName = _("PAINTER"), .height = 12, .weight = 580, @@ -2360,7 +2831,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Tyrogue + + [NATIONAL_DEX_TYROGUE] = + { .categoryName = _("SCUFFLE"), .height = 7, .weight = 210, @@ -2370,7 +2843,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Hitmontop + + [NATIONAL_DEX_HITMONTOP] = + { .categoryName = _("HANDSTAND"), .height = 14, .weight = 480, @@ -2380,7 +2855,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 257, .trainerOffset = 0, }, - { //Smoochum + + [NATIONAL_DEX_SMOOCHUM] = + { .categoryName = _("KISS"), .height = 4, .weight = 60, @@ -2390,7 +2867,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Elekid + + [NATIONAL_DEX_ELEKID] = + { .categoryName = _("ELECTRIC"), .height = 6, .weight = 235, @@ -2400,7 +2879,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Magby + + [NATIONAL_DEX_MAGBY] = + { .categoryName = _("LIVE COAL"), .height = 7, .weight = 214, @@ -2410,7 +2891,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Miltank + + [NATIONAL_DEX_MILTANK] = + { .categoryName = _("MILK COW"), .height = 12, .weight = 755, @@ -2420,7 +2903,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Blissey + + [NATIONAL_DEX_BLISSEY] = + { .categoryName = _("HAPPINESS"), .height = 15, .weight = 468, @@ -2430,7 +2915,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 310, .trainerOffset = 3, }, - { //Raikou + + [NATIONAL_DEX_RAIKOU] = + { .categoryName = _("THUNDER"), .height = 19, .weight = 1780, @@ -2440,7 +2927,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 345, .trainerOffset = 7, }, - { //Entei + + [NATIONAL_DEX_ENTEI] = + { .categoryName = _("VOLCANO"), .height = 21, .weight = 1980, @@ -2450,7 +2939,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 345, .trainerOffset = 7, }, - { //Suicune + + [NATIONAL_DEX_SUICUNE] = + { .categoryName = _("AURORA"), .height = 20, .weight = 1870, @@ -2460,7 +2951,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 345, .trainerOffset = 7, }, - { //Larvitar + + [NATIONAL_DEX_LARVITAR] = + { .categoryName = _("ROCK SKIN"), .height = 6, .weight = 720, @@ -2470,7 +2963,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Pupitar + + [NATIONAL_DEX_PUPITAR] = + { .categoryName = _("HARD SHELL"), .height = 12, .weight = 1520, @@ -2480,7 +2975,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Tyranitar + + [NATIONAL_DEX_TYRANITAR] = + { .categoryName = _("ARMOR"), .height = 20, .weight = 2020, @@ -2490,7 +2987,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 345, .trainerOffset = 7, }, - { //Lugia + + [NATIONAL_DEX_LUGIA] = + { .categoryName = _("DIVING"), .height = 52, .weight = 2160, @@ -2500,7 +2999,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 721, .trainerOffset = 19, }, - { //HoOh + + [NATIONAL_DEX_HO_OH] = + { .categoryName = _("RAINBOW"), .height = 38, .weight = 1990, @@ -2510,7 +3011,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 610, .trainerOffset = 17, }, - { //Celebi + + [NATIONAL_DEX_CELEBI] = + { .categoryName = _("TIME TRAVEL"), .height = 6, .weight = 50, @@ -2520,7 +3023,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Treecko + + [NATIONAL_DEX_TREECKO] = + { .categoryName = _("WOOD GECKO"), .height = 5, .weight = 50, @@ -2530,7 +3035,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Grovyle + + [NATIONAL_DEX_GROVYLE] = + { .categoryName = _("WOOD GECKO"), .height = 9, .weight = 216, @@ -2540,7 +3047,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sceptile + + [NATIONAL_DEX_SCEPTILE] = + { .categoryName = _("FOREST"), .height = 17, .weight = 522, @@ -2550,7 +3059,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 275, .trainerOffset = 2, }, - { //Torchic + + [NATIONAL_DEX_TORCHIC] = + { .categoryName = _("CHICK"), .height = 4, .weight = 25, @@ -2560,7 +3071,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Combusken + + [NATIONAL_DEX_COMBUSKEN] = + { .categoryName = _("YOUNG FOWL"), .height = 9, .weight = 195, @@ -2570,7 +3083,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Blaziken + + [NATIONAL_DEX_BLAZIKEN] = + { .categoryName = _("BLAZE"), .height = 19, .weight = 520, @@ -2580,7 +3095,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 301, .trainerOffset = 4, }, - { //Mudkip + + [NATIONAL_DEX_MUDKIP] = + { .categoryName = _("MUD FISH"), .height = 4, .weight = 76, @@ -2590,7 +3107,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Marshtomp + + [NATIONAL_DEX_MARSHTOMP] = + { .categoryName = _("MUD FISH"), .height = 7, .weight = 280, @@ -2600,7 +3119,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Swampert + + [NATIONAL_DEX_SWAMPERT] = + { .categoryName = _("MUD FISH"), .height = 15, .weight = 819, @@ -2610,7 +3131,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Poochyena + + [NATIONAL_DEX_POOCHYENA] = + { .categoryName = _("BITE"), .height = 5, .weight = 136, @@ -2620,7 +3143,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Mightyena + + [NATIONAL_DEX_MIGHTYENA] = + { .categoryName = _("BITE"), .height = 10, .weight = 370, @@ -2630,7 +3155,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Zigzagoon + + [NATIONAL_DEX_ZIGZAGOON] = + { .categoryName = _("TINYRACCOON"), .height = 4, .weight = 175, @@ -2640,7 +3167,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Linoone + + [NATIONAL_DEX_LINOONE] = + { .categoryName = _("RUSHING"), .height = 5, .weight = 325, @@ -2650,7 +3179,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Wurmple + + [NATIONAL_DEX_WURMPLE] = + { .categoryName = _("WORM"), .height = 3, .weight = 36, @@ -2660,7 +3191,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Silcoon + + [NATIONAL_DEX_SILCOON] = + { .categoryName = _("COCOON"), .height = 6, .weight = 100, @@ -2670,7 +3203,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Beautifly + + [NATIONAL_DEX_BEAUTIFLY] = + { .categoryName = _("BUTTERFLY"), .height = 10, .weight = 284, @@ -2680,7 +3215,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Cascoon + + [NATIONAL_DEX_CASCOON] = + { .categoryName = _("COCOON"), .height = 7, .weight = 115, @@ -2690,7 +3227,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Dustox + + [NATIONAL_DEX_DUSTOX] = + { .categoryName = _("POISON MOTH"), .height = 12, .weight = 316, @@ -2700,7 +3239,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Lotad + + [NATIONAL_DEX_LOTAD] = + { .categoryName = _("WATER WEED"), .height = 5, .weight = 26, @@ -2710,7 +3251,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Lombre + + [NATIONAL_DEX_LOMBRE] = + { .categoryName = _("JOLLY"), .height = 12, .weight = 325, @@ -2720,7 +3263,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ludicolo + + [NATIONAL_DEX_LUDICOLO] = + { .categoryName = _("CAREFREE"), .height = 15, .weight = 550, @@ -2730,7 +3275,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 268, .trainerOffset = -1, }, - { //Seedot + + [NATIONAL_DEX_SEEDOT] = + { .categoryName = _("ACORN"), .height = 5, .weight = 40, @@ -2740,7 +3287,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Nuzleaf + + [NATIONAL_DEX_NUZLEAF] = + { .categoryName = _("WILY"), .height = 10, .weight = 280, @@ -2750,7 +3299,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Shiftry + + [NATIONAL_DEX_SHIFTRY] = + { .categoryName = _("WICKED"), .height = 13, .weight = 596, @@ -2760,7 +3311,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Taillow + + [NATIONAL_DEX_TAILLOW] = + { .categoryName = _("TINYSWALLOW"), .height = 3, .weight = 23, @@ -2770,7 +3323,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Swellow + + [NATIONAL_DEX_SWELLOW] = + { .categoryName = _("SWALLOW"), .height = 7, .weight = 198, @@ -2780,7 +3335,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Wingull + + [NATIONAL_DEX_WINGULL] = + { .categoryName = _("SEAGULL"), .height = 6, .weight = 95, @@ -2790,7 +3347,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Pelipper + + [NATIONAL_DEX_PELIPPER] = + { .categoryName = _("WATER BIRD"), .height = 12, .weight = 280, @@ -2800,7 +3359,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ralts + + [NATIONAL_DEX_RALTS] = + { .categoryName = _("FEELING"), .height = 4, .weight = 66, @@ -2810,7 +3371,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kirlia + + [NATIONAL_DEX_KIRLIA] = + { .categoryName = _("EMOTION"), .height = 8, .weight = 202, @@ -2820,7 +3383,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Gardevoir + + [NATIONAL_DEX_GARDEVOIR] = + { .categoryName = _("EMBRACE"), .height = 16, .weight = 484, @@ -2830,7 +3395,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Surskit + + [NATIONAL_DEX_SURSKIT] = + { .categoryName = _("POND SKATER"), .height = 5, .weight = 17, @@ -2840,7 +3407,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Masquerain + + [NATIONAL_DEX_MASQUERAIN] = + { .categoryName = _("EYEBALL"), .height = 8, .weight = 36, @@ -2850,7 +3419,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Shroomish + + [NATIONAL_DEX_SHROOMISH] = + { .categoryName = _("MUSHROOM"), .height = 4, .weight = 45, @@ -2860,7 +3431,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Breloom + + [NATIONAL_DEX_BRELOOM] = + { .categoryName = _("MUSHROOM"), .height = 12, .weight = 392, @@ -2870,7 +3443,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Slakoth + + [NATIONAL_DEX_SLAKOTH] = + { .categoryName = _("SLACKER"), .height = 8, .weight = 240, @@ -2880,7 +3455,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Vigoroth + + [NATIONAL_DEX_VIGOROTH] = + { .categoryName = _("WILD MONKEY"), .height = 14, .weight = 465, @@ -2890,7 +3467,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Slaking + + [NATIONAL_DEX_SLAKING] = + { .categoryName = _("LAZY"), .height = 20, .weight = 1305, @@ -2900,7 +3479,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 300, .trainerOffset = 1, }, - { //Nincada + + [NATIONAL_DEX_NINCADA] = + { .categoryName = _("TRAINEE"), .height = 5, .weight = 55, @@ -2910,7 +3491,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Ninjask + + [NATIONAL_DEX_NINJASK] = + { .categoryName = _("NINJA"), .height = 8, .weight = 120, @@ -2920,7 +3503,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Shedinja + + [NATIONAL_DEX_SHEDINJA] = + { .categoryName = _("SHED"), .height = 8, .weight = 12, @@ -2930,7 +3515,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Whismur + + [NATIONAL_DEX_WHISMUR] = + { .categoryName = _("WHISPER"), .height = 6, .weight = 163, @@ -2940,7 +3527,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Loudred + + [NATIONAL_DEX_LOUDRED] = + { .categoryName = _("BIG VOICE"), .height = 10, .weight = 405, @@ -2950,7 +3539,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Exploud + + [NATIONAL_DEX_EXPLOUD] = + { .categoryName = _("LOUD NOISE"), .height = 15, .weight = 840, @@ -2960,7 +3551,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Makuhita + + [NATIONAL_DEX_MAKUHITA] = + { .categoryName = _("GUTS"), .height = 10, .weight = 864, @@ -2970,7 +3563,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Hariyama + + [NATIONAL_DEX_HARIYAMA] = + { .categoryName = _("ARM THRUST"), .height = 23, .weight = 2538, @@ -2980,7 +3575,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 343, .trainerOffset = 7, }, - { //Azurill + + [NATIONAL_DEX_AZURILL] = + { .categoryName = _("POLKA DOT"), .height = 2, .weight = 20, @@ -2990,7 +3587,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Nosepass + + [NATIONAL_DEX_NOSEPASS] = + { .categoryName = _("COMPASS"), .height = 10, .weight = 970, @@ -3000,7 +3599,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 289, .trainerOffset = 3, }, - { //Skitty + + [NATIONAL_DEX_SKITTY] = + { .categoryName = _("KITTEN"), .height = 6, .weight = 110, @@ -3010,7 +3611,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Delcatty + + [NATIONAL_DEX_DELCATTY] = + { .categoryName = _("PRIM"), .height = 11, .weight = 326, @@ -3020,7 +3623,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sableye + + [NATIONAL_DEX_SABLEYE] = + { .categoryName = _("DARKNESS"), .height = 5, .weight = 110, @@ -3030,7 +3635,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Mawile + + [NATIONAL_DEX_MAWILE] = + { .categoryName = _("DECEIVER"), .height = 6, .weight = 115, @@ -3040,7 +3647,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Aron + + [NATIONAL_DEX_ARON] = + { .categoryName = _("IRON ARMOR"), .height = 4, .weight = 600, @@ -3050,7 +3659,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Lairon + + [NATIONAL_DEX_LAIRON] = + { .categoryName = _("IRON ARMOR"), .height = 9, .weight = 1200, @@ -3060,7 +3671,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Aggron + + [NATIONAL_DEX_AGGRON] = + { .categoryName = _("IRON ARMOR"), .height = 21, .weight = 3600, @@ -3070,7 +3683,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 350, .trainerOffset = 6, }, - { //Meditite + + [NATIONAL_DEX_MEDITITE] = + { .categoryName = _("MEDITATE"), .height = 6, .weight = 112, @@ -3080,7 +3695,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Medicham + + [NATIONAL_DEX_MEDICHAM] = + { .categoryName = _("MEDITATE"), .height = 13, .weight = 315, @@ -3090,7 +3707,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Electrike + + [NATIONAL_DEX_ELECTRIKE] = + { .categoryName = _("LIGHTNING"), .height = 6, .weight = 152, @@ -3100,7 +3719,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Manectric + + [NATIONAL_DEX_MANECTRIC] = + { .categoryName = _("DISCHARGE"), .height = 15, .weight = 402, @@ -3110,7 +3731,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 257, .trainerOffset = 0, }, - { //Plusle + + [NATIONAL_DEX_PLUSLE] = + { .categoryName = _("CHEERING"), .height = 4, .weight = 42, @@ -3120,7 +3743,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Minun + + [NATIONAL_DEX_MINUN] = + { .categoryName = _("CHEERING"), .height = 4, .weight = 42, @@ -3130,7 +3755,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Volbeat + + [NATIONAL_DEX_VOLBEAT] = + { .categoryName = _("FIREFLY"), .height = 7, .weight = 177, @@ -3140,7 +3767,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Illumise + + [NATIONAL_DEX_ILLUMISE] = + { .categoryName = _("FIREFLY"), .height = 6, .weight = 177, @@ -3150,7 +3779,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Roselia + + [NATIONAL_DEX_ROSELIA] = + { .categoryName = _("THORN"), .height = 3, .weight = 20, @@ -3160,7 +3791,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Gulpin + + [NATIONAL_DEX_GULPIN] = + { .categoryName = _("STOMACH"), .height = 4, .weight = 103, @@ -3170,7 +3803,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Swalot + + [NATIONAL_DEX_SWALOT] = + { .categoryName = _("POISON BAG"), .height = 17, .weight = 800, @@ -3180,7 +3815,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 345, .trainerOffset = 3, }, - { //Carvanha + + [NATIONAL_DEX_CARVANHA] = + { .categoryName = _("SAVAGE"), .height = 8, .weight = 208, @@ -3190,7 +3827,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sharpedo + + [NATIONAL_DEX_SHARPEDO] = + { .categoryName = _("BRUTAL"), .height = 18, .weight = 888, @@ -3200,7 +3839,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 317, .trainerOffset = 3, }, - { //Wailmer + + [NATIONAL_DEX_WAILMER] = + { .categoryName = _("BALL WHALE"), .height = 20, .weight = 1300, @@ -3210,7 +3851,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 493, .trainerOffset = 0, }, - { //Wailord + + [NATIONAL_DEX_WAILORD] = + { .categoryName = _("FLOAT WHALE"), .height = 145, .weight = 3980, @@ -3220,7 +3863,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 1352, .trainerOffset = 18, }, - { //Numel + + [NATIONAL_DEX_NUMEL] = + { .categoryName = _("NUMB"), .height = 7, .weight = 240, @@ -3230,7 +3875,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Camerupt + + [NATIONAL_DEX_CAMERUPT] = + { .categoryName = _("ERUPTION"), .height = 19, .weight = 2200, @@ -3240,7 +3887,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 345, .trainerOffset = 6, }, - { //Torkoal + + [NATIONAL_DEX_TORKOAL] = + { .categoryName = _("COAL"), .height = 5, .weight = 804, @@ -3250,7 +3899,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Spoink + + [NATIONAL_DEX_SPOINK] = + { .categoryName = _("BOUNCE"), .height = 7, .weight = 306, @@ -3260,7 +3911,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Grumpig + + [NATIONAL_DEX_GRUMPIG] = + { .categoryName = _("MANIPULATE"), .height = 9, .weight = 715, @@ -3270,7 +3923,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Spinda + + [NATIONAL_DEX_SPINDA] = + { .categoryName = _("SPOT PANDA"), .height = 11, .weight = 50, @@ -3280,7 +3935,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Trapinch + + [NATIONAL_DEX_TRAPINCH] = + { .categoryName = _("ANT PIT"), .height = 7, .weight = 150, @@ -3290,7 +3947,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Vibrava + + [NATIONAL_DEX_VIBRAVA] = + { .categoryName = _("VIBRATION"), .height = 11, .weight = 153, @@ -3300,7 +3959,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Flygon + + [NATIONAL_DEX_FLYGON] = + { .categoryName = _("MYSTIC"), .height = 20, .weight = 820, @@ -3310,7 +3971,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 268, .trainerOffset = 1, }, - { //Cacnea + + [NATIONAL_DEX_CACNEA] = + { .categoryName = _("CACTUS"), .height = 4, .weight = 513, @@ -3320,7 +3983,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Cacturne + + [NATIONAL_DEX_CACTURNE] = + { .categoryName = _("SCARECROW"), .height = 13, .weight = 774, @@ -3330,7 +3995,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Swablu + + [NATIONAL_DEX_SWABLU] = + { .categoryName = _("COTTON BIRD"), .height = 4, .weight = 12, @@ -3340,7 +4007,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Altaria + + [NATIONAL_DEX_ALTARIA] = + { .categoryName = _("HUMMING"), .height = 11, .weight = 206, @@ -3350,7 +4019,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Zangoose + + [NATIONAL_DEX_ZANGOOSE] = + { .categoryName = _("CAT FERRET"), .height = 13, .weight = 403, @@ -3360,7 +4031,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Seviper + + [NATIONAL_DEX_SEVIPER] = + { .categoryName = _("FANG SNAKE"), .height = 27, .weight = 525, @@ -3370,7 +4043,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Lunatone + + [NATIONAL_DEX_LUNATONE] = + { .categoryName = _("METEORITE"), .height = 10, .weight = 1680, @@ -3380,7 +4055,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Solrock + + [NATIONAL_DEX_SOLROCK] = + { .categoryName = _("METEORITE"), .height = 12, .weight = 1540, @@ -3390,7 +4067,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Barboach + + [NATIONAL_DEX_BARBOACH] = + { .categoryName = _("WHISKERS"), .height = 4, .weight = 19, @@ -3400,7 +4079,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Whiscash + + [NATIONAL_DEX_WHISCASH] = + { .categoryName = _("WHISKERS"), .height = 9, .weight = 236, @@ -3410,7 +4091,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Corphish + + [NATIONAL_DEX_CORPHISH] = + { .categoryName = _("RUFFIAN"), .height = 6, .weight = 115, @@ -3420,7 +4103,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Crawdaunt + + [NATIONAL_DEX_CRAWDAUNT] = + { .categoryName = _("ROGUE"), .height = 11, .weight = 328, @@ -3430,7 +4115,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Baltoy + + [NATIONAL_DEX_BALTOY] = + { .categoryName = _("CLAY DOLL"), .height = 5, .weight = 215, @@ -3440,7 +4127,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Claydol + + [NATIONAL_DEX_CLAYDOL] = + { .categoryName = _("CLAY DOLL"), .height = 15, .weight = 1080, @@ -3450,7 +4139,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 280, .trainerOffset = 1, }, - { //Lileep + + [NATIONAL_DEX_LILEEP] = + { .categoryName = _("SEA LILY"), .height = 10, .weight = 238, @@ -3460,7 +4151,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Cradily + + [NATIONAL_DEX_CRADILY] = + { .categoryName = _("BARNACLE"), .height = 15, .weight = 604, @@ -3470,7 +4163,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Anorith + + [NATIONAL_DEX_ANORITH] = + { .categoryName = _("OLD SHRIMP"), .height = 7, .weight = 125, @@ -3480,7 +4175,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Armaldo + + [NATIONAL_DEX_ARMALDO] = + { .categoryName = _("PLATE"), .height = 15, .weight = 682, @@ -3490,7 +4187,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 271, .trainerOffset = 0, }, - { //Feebas + + [NATIONAL_DEX_FEEBAS] = + { .categoryName = _("FISH"), .height = 6, .weight = 74, @@ -3500,7 +4199,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Milotic + + [NATIONAL_DEX_MILOTIC] = + { .categoryName = _("TENDER"), .height = 62, .weight = 1620, @@ -3510,7 +4211,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 360, .trainerOffset = 7, }, - { //Castform + + [NATIONAL_DEX_CASTFORM] = + { .categoryName = _("WEATHER"), .height = 3, .weight = 8, @@ -3520,7 +4223,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Kecleon + + [NATIONAL_DEX_KECLEON] = + { .categoryName = _("COLOR SWAP"), .height = 10, .weight = 220, @@ -3530,7 +4235,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Shuppet + + [NATIONAL_DEX_SHUPPET] = + { .categoryName = _("PUPPET"), .height = 6, .weight = 23, @@ -3540,7 +4247,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Banette + + [NATIONAL_DEX_BANETTE] = + { .categoryName = _("MARIONETTE"), .height = 11, .weight = 125, @@ -3550,7 +4259,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Duskull + + [NATIONAL_DEX_DUSKULL] = + { .categoryName = _("REQUIEM"), .height = 8, .weight = 150, @@ -3560,7 +4271,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Dusclops + + [NATIONAL_DEX_DUSCLOPS] = + { .categoryName = _("BECKON"), .height = 16, .weight = 306, @@ -3570,7 +4283,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 299, .trainerOffset = 1, }, - { //Tropius + + [NATIONAL_DEX_TROPIUS] = + { .categoryName = _("FRUIT"), .height = 20, .weight = 1000, @@ -3580,7 +4295,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 344, .trainerOffset = 7, }, - { //Chimecho + + [NATIONAL_DEX_CHIMECHO] = + { .categoryName = _("WIND CHIME"), .height = 6, .weight = 10, @@ -3590,7 +4307,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Absol + + [NATIONAL_DEX_ABSOL] = + { .categoryName = _("DISASTER"), .height = 12, .weight = 470, @@ -3600,7 +4319,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Wynaut + + [NATIONAL_DEX_WYNAUT] = + { .categoryName = _("BRIGHT"), .height = 6, .weight = 140, @@ -3610,7 +4331,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Snorunt + + [NATIONAL_DEX_SNORUNT] = + { .categoryName = _("SNOW HAT"), .height = 7, .weight = 168, @@ -3620,7 +4343,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Glalie + + [NATIONAL_DEX_GLALIE] = + { .categoryName = _("FACE"), .height = 15, .weight = 2565, @@ -3630,7 +4355,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 344, .trainerOffset = 0, }, - { //Spheal + + [NATIONAL_DEX_SPHEAL] = + { .categoryName = _("CLAP"), .height = 8, .weight = 395, @@ -3640,7 +4367,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Sealeo + + [NATIONAL_DEX_SEALEO] = + { .categoryName = _("BALL ROLL"), .height = 11, .weight = 876, @@ -3650,7 +4379,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Walrein + + [NATIONAL_DEX_WALREIN] = + { .categoryName = _("ICE BREAK"), .height = 14, .weight = 1506, @@ -3660,7 +4391,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Clamperl + + [NATIONAL_DEX_CLAMPERL] = + { .categoryName = _("BIVALVE"), .height = 4, .weight = 525, @@ -3670,7 +4403,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Huntail + + [NATIONAL_DEX_HUNTAIL] = + { .categoryName = _("DEEP SEA"), .height = 17, .weight = 270, @@ -3680,7 +4415,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Gorebyss + + [NATIONAL_DEX_GOREBYSS] = + { .categoryName = _("SOUTH SEA"), .height = 18, .weight = 226, @@ -3690,7 +4427,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Relicanth + + [NATIONAL_DEX_RELICANTH] = + { .categoryName = _("LONGEVITY"), .height = 10, .weight = 234, @@ -3700,7 +4439,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Luvdisc + + [NATIONAL_DEX_LUVDISC] = + { .categoryName = _("RENDEZVOUS"), .height = 6, .weight = 87, @@ -3710,7 +4451,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Bagon + + [NATIONAL_DEX_BAGON] = + { .categoryName = _("ROCK HEAD"), .height = 6, .weight = 421, @@ -3720,7 +4463,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Shelgon + + [NATIONAL_DEX_SHELGON] = + { .categoryName = _("ENDURANCE"), .height = 11, .weight = 1105, @@ -3730,7 +4475,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Salamence + + [NATIONAL_DEX_SALAMENCE] = + { .categoryName = _("DRAGON"), .height = 15, .weight = 1026, @@ -3740,7 +4487,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Beldum + + [NATIONAL_DEX_BELDUM] = + { .categoryName = _("IRON BALL"), .height = 6, .weight = 952, @@ -3750,7 +4499,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Metang + + [NATIONAL_DEX_METANG] = + { .categoryName = _("IRON CLAW"), .height = 12, .weight = 2025, @@ -3760,7 +4511,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Metagross + + [NATIONAL_DEX_METAGROSS] = + { .categoryName = _("IRON LEG"), .height = 16, .weight = 5500, @@ -3770,7 +4523,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 447, .trainerOffset = 9, }, - { //Regirock + + [NATIONAL_DEX_REGIROCK] = + { .categoryName = _("ROCK PEAK"), .height = 17, .weight = 2300, @@ -3780,7 +4535,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 309, .trainerOffset = 1, }, - { //Regice + + [NATIONAL_DEX_REGICE] = + { .categoryName = _("ICEBERG"), .height = 18, .weight = 1750, @@ -3790,7 +4547,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 301, .trainerOffset = 2, }, - { //Registeel + + [NATIONAL_DEX_REGISTEEL] = + { .categoryName = _("IRON"), .height = 19, .weight = 2050, @@ -3800,7 +4559,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 359, .trainerOffset = 6, }, - { //Latias + + [NATIONAL_DEX_LATIAS] = + { .categoryName = _("EON"), .height = 14, .weight = 400, @@ -3810,7 +4571,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Latios + + [NATIONAL_DEX_LATIOS] = + { .categoryName = _("EON"), .height = 20, .weight = 600, @@ -3820,7 +4583,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 294, .trainerOffset = 3, }, - { //Kyogre + + [NATIONAL_DEX_KYOGRE] = + { .categoryName = _("SEA BASIN"), .height = 45, .weight = 3520, @@ -3830,7 +4595,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 614, .trainerOffset = 13, }, - { //Groudon + + [NATIONAL_DEX_GROUDON] = + { .categoryName = _("CONTINENT"), .height = 35, .weight = 9500, @@ -3840,7 +4607,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 515, .trainerOffset = 14, }, - { //Rayquaza + + [NATIONAL_DEX_RAYQUAZA] = + { .categoryName = _("SKY HIGH"), .height = 70, .weight = 2065, @@ -3850,7 +4619,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 448, .trainerOffset = 12, }, - { //Jirachi + + [NATIONAL_DEX_JIRACHI] = + { .categoryName = _("WISH"), .height = 3, .weight = 11, @@ -3860,7 +4631,9 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, - { //Deoxys + + [NATIONAL_DEX_DEOXYS] = + { .categoryName = _("DNA"), .height = 17, .weight = 608, diff --git a/src/pokedex.c b/src/pokedex.c index e234c355f..b744572d8 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -832,7 +832,7 @@ static const struct BgTemplate gUnknown_0856E630[] = } }; -static const struct WindowTemplate gUnknown_0856E640[] = +static const struct WindowTemplate gUnknown_0856E640[] = { { .bg = 2, @@ -895,7 +895,7 @@ static const struct BgTemplate gUnknown_0856E668[] = }, }; -static const struct WindowTemplate gUnknown_0856E670[] = +static const struct WindowTemplate gUnknown_0856E670[] = { { .bg = 2, @@ -1195,7 +1195,7 @@ static const struct BgTemplate gUnknown_0856EFF8[] = } }; -static const struct WindowTemplate gUnknown_0856F008[] = +static const struct WindowTemplate gUnknown_0856F008[] = { { .bg = 2, diff --git a/src/pokemon.c b/src/pokemon.c index 0f7c80b77..e5b6d02ae 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -107,1252 +107,1253 @@ EWRAM_DATA struct Unknown_806F160_Struct *gUnknown_020249B4[2] = {NULL}; #include "data/battle_moves.h" static const u8 sUnreferencedData[] = {0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00}; +#define SPECIES_TO_HOENN(name) [SPECIES_##name - 1] = HOENN_DEX_##name +#define SPECIES_TO_NATIONAL(name) [SPECIES_##name - 1] = NATIONAL_DEX_##name +#define HOENN_TO_NATIONAL(name) [HOENN_DEX_##name - 1] = NATIONAL_DEX_##name + const u16 gSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index (Summary No. for Hoenn Dex) { - // SPECIES_NONE - HOENN_DEX_BULBASAUR, // SPECIES_BULBASAUR - HOENN_DEX_IVYSAUR, // SPECIES_IVYSAUR - HOENN_DEX_VENUSAUR, // SPECIES_VENUSAUR - HOENN_DEX_CHARMANDER, // SPECIES_CHARMANDER - HOENN_DEX_CHARMELEON, // SPECIES_CHARMELEON - HOENN_DEX_CHARIZARD, // SPECIES_CHARIZARD - HOENN_DEX_SQUIRTLE, // SPECIES_SQUIRTLE - HOENN_DEX_WARTORTLE, // SPECIES_WARTORTLE - HOENN_DEX_BLASTOISE, // SPECIES_BLASTOISE - HOENN_DEX_CATERPIE, // SPECIES_CATERPIE - HOENN_DEX_METAPOD, // SPECIES_METAPOD - HOENN_DEX_BUTTERFREE, // SPECIES_BUTTERFREE - HOENN_DEX_WEEDLE, // SPECIES_WEEDLE - HOENN_DEX_KAKUNA, // SPECIES_KAKUNA - HOENN_DEX_BEEDRILL, // SPECIES_BEEDRILL - HOENN_DEX_PIDGEY, // SPECIES_PIDGEY - HOENN_DEX_PIDGEOTTO, // SPECIES_PIDGEOTTO - HOENN_DEX_PIDGEOT, // SPECIES_PIDGEOT - HOENN_DEX_RATTATA, // SPECIES_RATTATA - HOENN_DEX_RATICATE, // SPECIES_RATICATE - HOENN_DEX_SPEAROW, // SPECIES_SPEAROW - HOENN_DEX_FEAROW, // SPECIES_FEAROW - HOENN_DEX_EKANS, // SPECIES_EKANS - HOENN_DEX_ARBOK, // SPECIES_ARBOK - HOENN_DEX_PIKACHU, // SPECIES_PIKACHU - HOENN_DEX_RAICHU, // SPECIES_RAICHU - HOENN_DEX_SANDSHREW, // SPECIES_SANDSHREW - HOENN_DEX_SANDSLASH, // SPECIES_SANDSLASH - HOENN_DEX_NIDORAN_F, // SPECIES_NIDORAN_F - HOENN_DEX_NIDORINA, // SPECIES_NIDORINA - HOENN_DEX_NIDOQUEEN, // SPECIES_NIDOQUEEN - HOENN_DEX_NIDORAN_M, // SPECIES_NIDORAN_M - HOENN_DEX_NIDORINO, // SPECIES_NIDORINO - HOENN_DEX_NIDOKING, // SPECIES_NIDOKING - HOENN_DEX_CLEFAIRY, // SPECIES_CLEFAIRY - HOENN_DEX_CLEFABLE, // SPECIES_CLEFABLE - HOENN_DEX_VULPIX, // SPECIES_VULPIX - HOENN_DEX_NINETALES, // SPECIES_NINETALES - HOENN_DEX_JIGGLYPUFF, // SPECIES_JIGGLYPUFF - HOENN_DEX_WIGGLYTUFF, // SPECIES_WIGGLYTUFF - HOENN_DEX_ZUBAT, // SPECIES_ZUBAT - HOENN_DEX_GOLBAT, // SPECIES_GOLBAT - HOENN_DEX_ODDISH, // SPECIES_ODDISH - HOENN_DEX_GLOOM, // SPECIES_GLOOM - HOENN_DEX_VILEPLUME, // SPECIES_VILEPLUME - HOENN_DEX_PARAS, // SPECIES_PARAS - HOENN_DEX_PARASECT, // SPECIES_PARASECT - HOENN_DEX_VENONAT, // SPECIES_VENONAT - HOENN_DEX_VENOMOTH, // SPECIES_VENOMOTH - HOENN_DEX_DIGLETT, // SPECIES_DIGLETT - HOENN_DEX_DUGTRIO, // SPECIES_DUGTRIO - HOENN_DEX_MEOWTH, // SPECIES_MEOWTH - HOENN_DEX_PERSIAN, // SPECIES_PERSIAN - HOENN_DEX_PSYDUCK, // SPECIES_PSYDUCK - HOENN_DEX_GOLDUCK, // SPECIES_GOLDUCK - HOENN_DEX_MANKEY, // SPECIES_MANKEY - HOENN_DEX_PRIMEAPE, // SPECIES_PRIMEAPE - HOENN_DEX_GROWLITHE, // SPECIES_GROWLITHE - HOENN_DEX_ARCANINE, // SPECIES_ARCANINE - HOENN_DEX_POLIWAG, // SPECIES_POLIWAG - HOENN_DEX_POLIWHIRL, // SPECIES_POLIWHIRL - HOENN_DEX_POLIWRATH, // SPECIES_POLIWRATH - HOENN_DEX_ABRA, // SPECIES_ABRA - HOENN_DEX_KADABRA, // SPECIES_KADABRA - HOENN_DEX_ALAKAZAM, // SPECIES_ALAKAZAM - HOENN_DEX_MACHOP, // SPECIES_MACHOP - HOENN_DEX_MACHOKE, // SPECIES_MACHOKE - HOENN_DEX_MACHAMP, // SPECIES_MACHAMP - HOENN_DEX_BELLSPROUT, // SPECIES_BELLSPROUT - HOENN_DEX_WEEPINBELL, // SPECIES_WEEPINBELL - HOENN_DEX_VICTREEBEL, // SPECIES_VICTREEBEL - HOENN_DEX_TENTACOOL, // SPECIES_TENTACOOL - HOENN_DEX_TENTACRUEL, // SPECIES_TENTACRUEL - HOENN_DEX_GEODUDE, // SPECIES_GEODUDE - HOENN_DEX_GRAVELER, // SPECIES_GRAVELER - HOENN_DEX_GOLEM, // SPECIES_GOLEM - HOENN_DEX_PONYTA, // SPECIES_PONYTA - HOENN_DEX_RAPIDASH, // SPECIES_RAPIDASH - HOENN_DEX_SLOWPOKE, // SPECIES_SLOWPOKE - HOENN_DEX_SLOWBRO, // SPECIES_SLOWBRO - HOENN_DEX_MAGNEMITE, // SPECIES_MAGNEMITE - HOENN_DEX_MAGNETON, // SPECIES_MAGNETON - HOENN_DEX_FARFETCHD, // SPECIES_FARFETCHD - HOENN_DEX_DODUO, // SPECIES_DODUO - HOENN_DEX_DODRIO, // SPECIES_DODRIO - HOENN_DEX_SEEL, // SPECIES_SEEL - HOENN_DEX_DEWGONG, // SPECIES_DEWGONG - HOENN_DEX_GRIMER, // SPECIES_GRIMER - HOENN_DEX_MUK, // SPECIES_MUK - HOENN_DEX_SHELLDER, // SPECIES_SHELLDER - HOENN_DEX_CLOYSTER, // SPECIES_CLOYSTER - HOENN_DEX_GASTLY, // SPECIES_GASTLY - HOENN_DEX_HAUNTER, // SPECIES_HAUNTER - HOENN_DEX_GENGAR, // SPECIES_GENGAR - HOENN_DEX_ONIX, // SPECIES_ONIX - HOENN_DEX_DROWZEE, // SPECIES_DROWZEE - HOENN_DEX_HYPNO, // SPECIES_HYPNO - HOENN_DEX_KRABBY, // SPECIES_KRABBY - HOENN_DEX_KINGLER, // SPECIES_KINGLER - HOENN_DEX_VOLTORB, // SPECIES_VOLTORB - HOENN_DEX_ELECTRODE, // SPECIES_ELECTRODE - HOENN_DEX_EXEGGCUTE, // SPECIES_EXEGGCUTE - HOENN_DEX_EXEGGUTOR, // SPECIES_EXEGGUTOR - HOENN_DEX_CUBONE, // SPECIES_CUBONE - HOENN_DEX_MAROWAK, // SPECIES_MAROWAK - HOENN_DEX_HITMONLEE, // SPECIES_HITMONLEE - HOENN_DEX_HITMONCHAN, // SPECIES_HITMONCHAN - HOENN_DEX_LICKITUNG, // SPECIES_LICKITUNG - HOENN_DEX_KOFFING, // SPECIES_KOFFING - HOENN_DEX_WEEZING, // SPECIES_WEEZING - HOENN_DEX_RHYHORN, // SPECIES_RHYHORN - HOENN_DEX_RHYDON, // SPECIES_RHYDON - HOENN_DEX_CHANSEY, // SPECIES_CHANSEY - HOENN_DEX_TANGELA, // SPECIES_TANGELA - HOENN_DEX_KANGASKHAN, // SPECIES_KANGASKHAN - HOENN_DEX_HORSEA, // SPECIES_HORSEA - HOENN_DEX_SEADRA, // SPECIES_SEADRA - HOENN_DEX_GOLDEEN, // SPECIES_GOLDEEN - HOENN_DEX_SEAKING, // SPECIES_SEAKING - HOENN_DEX_STARYU, // SPECIES_STARYU - HOENN_DEX_STARMIE, // SPECIES_STARMIE - HOENN_DEX_MR_MIME, // SPECIES_MR_MIME - HOENN_DEX_SCYTHER, // SPECIES_SCYTHER - HOENN_DEX_JYNX, // SPECIES_JYNX - HOENN_DEX_ELECTABUZZ, // SPECIES_ELECTABUZZ - HOENN_DEX_MAGMAR, // SPECIES_MAGMAR - HOENN_DEX_PINSIR, // SPECIES_PINSIR - HOENN_DEX_TAUROS, // SPECIES_TAUROS - HOENN_DEX_MAGIKARP, // SPECIES_MAGIKARP - HOENN_DEX_GYARADOS, // SPECIES_GYARADOS - HOENN_DEX_LAPRAS, // SPECIES_LAPRAS - HOENN_DEX_DITTO, // SPECIES_DITTO - HOENN_DEX_EEVEE, // SPECIES_EEVEE - HOENN_DEX_VAPOREON, // SPECIES_VAPOREON - HOENN_DEX_JOLTEON, // SPECIES_JOLTEON - HOENN_DEX_FLAREON, // SPECIES_FLAREON - HOENN_DEX_PORYGON, // SPECIES_PORYGON - HOENN_DEX_OMANYTE, // SPECIES_OMANYTE - HOENN_DEX_OMASTAR, // SPECIES_OMASTAR - HOENN_DEX_KABUTO, // SPECIES_KABUTO - HOENN_DEX_KABUTOPS, // SPECIES_KABUTOPS - HOENN_DEX_AERODACTYL, // SPECIES_AERODACTYL - HOENN_DEX_SNORLAX, // SPECIES_SNORLAX - HOENN_DEX_ARTICUNO, // SPECIES_ARTICUNO - HOENN_DEX_ZAPDOS, // SPECIES_ZAPDOS - HOENN_DEX_MOLTRES, // SPECIES_MOLTRES - HOENN_DEX_DRATINI, // SPECIES_DRATINI - HOENN_DEX_DRAGONAIR, // SPECIES_DRAGONAIR - HOENN_DEX_DRAGONITE, // SPECIES_DRAGONITE - HOENN_DEX_MEWTWO, // SPECIES_MEWTWO - HOENN_DEX_MEW, // SPECIES_MEW - HOENN_DEX_CHIKORITA, // SPECIES_CHIKORITA - HOENN_DEX_BAYLEEF, // SPECIES_BAYLEEF - HOENN_DEX_MEGANIUM, // SPECIES_MEGANIUM - HOENN_DEX_CYNDAQUIL, // SPECIES_CYNDAQUIL - HOENN_DEX_QUILAVA, // SPECIES_QUILAVA - HOENN_DEX_TYPHLOSION, // SPECIES_TYPHLOSION - HOENN_DEX_TOTODILE, // SPECIES_TOTODILE - HOENN_DEX_CROCONAW, // SPECIES_CROCONAW - HOENN_DEX_FERALIGATR, // SPECIES_FERALIGATR - HOENN_DEX_SENTRET, // SPECIES_SENTRET - HOENN_DEX_FURRET, // SPECIES_FURRET - HOENN_DEX_HOOTHOOT, // SPECIES_HOOTHOOT - HOENN_DEX_NOCTOWL, // SPECIES_NOCTOWL - HOENN_DEX_LEDYBA, // SPECIES_LEDYBA - HOENN_DEX_LEDIAN, // SPECIES_LEDIAN - HOENN_DEX_SPINARAK, // SPECIES_SPINARAK - HOENN_DEX_ARIADOS, // SPECIES_ARIADOS - HOENN_DEX_CROBAT, // SPECIES_CROBAT - HOENN_DEX_CHINCHOU, // SPECIES_CHINCHOU - HOENN_DEX_LANTURN, // SPECIES_LANTURN - HOENN_DEX_PICHU, // SPECIES_PICHU - HOENN_DEX_CLEFFA, // SPECIES_CLEFFA - HOENN_DEX_IGGLYBUFF, // SPECIES_IGGLYBUFF - HOENN_DEX_TOGEPI, // SPECIES_TOGEPI - HOENN_DEX_TOGETIC, // SPECIES_TOGETIC - HOENN_DEX_NATU, // SPECIES_NATU - HOENN_DEX_XATU, // SPECIES_XATU - HOENN_DEX_MAREEP, // SPECIES_MAREEP - HOENN_DEX_FLAAFFY, // SPECIES_FLAAFFY - HOENN_DEX_AMPHAROS, // SPECIES_AMPHAROS - HOENN_DEX_BELLOSSOM, // SPECIES_BELLOSSOM - HOENN_DEX_MARILL, // SPECIES_MARILL - HOENN_DEX_AZUMARILL, // SPECIES_AZUMARILL - HOENN_DEX_SUDOWOODO, // SPECIES_SUDOWOODO - HOENN_DEX_POLITOED, // SPECIES_POLITOED - HOENN_DEX_HOPPIP, // SPECIES_HOPPIP - HOENN_DEX_SKIPLOOM, // SPECIES_SKIPLOOM - HOENN_DEX_JUMPLUFF, // SPECIES_JUMPLUFF - HOENN_DEX_AIPOM, // SPECIES_AIPOM - HOENN_DEX_SUNKERN, // SPECIES_SUNKERN - HOENN_DEX_SUNFLORA, // SPECIES_SUNFLORA - HOENN_DEX_YANMA, // SPECIES_YANMA - HOENN_DEX_WOOPER, // SPECIES_WOOPER - HOENN_DEX_QUAGSIRE, // SPECIES_QUAGSIRE - HOENN_DEX_ESPEON, // SPECIES_ESPEON - HOENN_DEX_UMBREON, // SPECIES_UMBREON - HOENN_DEX_MURKROW, // SPECIES_MURKROW - HOENN_DEX_SLOWKING, // SPECIES_SLOWKING - HOENN_DEX_MISDREAVUS, // SPECIES_MISDREAVUS - HOENN_DEX_UNOWN, // SPECIES_UNOWN - HOENN_DEX_WOBBUFFET, // SPECIES_WOBBUFFET - HOENN_DEX_GIRAFARIG, // SPECIES_GIRAFARIG - HOENN_DEX_PINECO, // SPECIES_PINECO - HOENN_DEX_FORRETRESS, // SPECIES_FORRETRESS - HOENN_DEX_DUNSPARCE, // SPECIES_DUNSPARCE - HOENN_DEX_GLIGAR, // SPECIES_GLIGAR - HOENN_DEX_STEELIX, // SPECIES_STEELIX - HOENN_DEX_SNUBBULL, // SPECIES_SNUBBULL - HOENN_DEX_GRANBULL, // SPECIES_GRANBULL - HOENN_DEX_QWILFISH, // SPECIES_QWILFISH - HOENN_DEX_SCIZOR, // SPECIES_SCIZOR - HOENN_DEX_SHUCKLE, // SPECIES_SHUCKLE - HOENN_DEX_HERACROSS, // SPECIES_HERACROSS - HOENN_DEX_SNEASEL, // SPECIES_SNEASEL - HOENN_DEX_TEDDIURSA, // SPECIES_TEDDIURSA - HOENN_DEX_URSARING, // SPECIES_URSARING - HOENN_DEX_SLUGMA, // SPECIES_SLUGMA - HOENN_DEX_MAGCARGO, // SPECIES_MAGCARGO - HOENN_DEX_SWINUB, // SPECIES_SWINUB - HOENN_DEX_PILOSWINE, // SPECIES_PILOSWINE - HOENN_DEX_CORSOLA, // SPECIES_CORSOLA - HOENN_DEX_REMORAID, // SPECIES_REMORAID - HOENN_DEX_OCTILLERY, // SPECIES_OCTILLERY - HOENN_DEX_DELIBIRD, // SPECIES_DELIBIRD - HOENN_DEX_MANTINE, // SPECIES_MANTINE - HOENN_DEX_SKARMORY, // SPECIES_SKARMORY - HOENN_DEX_HOUNDOUR, // SPECIES_HOUNDOUR - HOENN_DEX_HOUNDOOM, // SPECIES_HOUNDOOM - HOENN_DEX_KINGDRA, // SPECIES_KINGDRA - HOENN_DEX_PHANPY, // SPECIES_PHANPY - HOENN_DEX_DONPHAN, // SPECIES_DONPHAN - HOENN_DEX_PORYGON2, // SPECIES_PORYGON2 - HOENN_DEX_STANTLER, // SPECIES_STANTLER - HOENN_DEX_SMEARGLE, // SPECIES_SMEARGLE - HOENN_DEX_TYROGUE, // SPECIES_TYROGUE - HOENN_DEX_HITMONTOP, // SPECIES_HITMONTOP - HOENN_DEX_SMOOCHUM, // SPECIES_SMOOCHUM - HOENN_DEX_ELEKID, // SPECIES_ELEKID - HOENN_DEX_MAGBY, // SPECIES_MAGBY - HOENN_DEX_MILTANK, // SPECIES_MILTANK - HOENN_DEX_BLISSEY, // SPECIES_BLISSEY - HOENN_DEX_RAIKOU, // SPECIES_RAIKOU - HOENN_DEX_ENTEI, // SPECIES_ENTEI - HOENN_DEX_SUICUNE, // SPECIES_SUICUNE - HOENN_DEX_LARVITAR, // SPECIES_LARVITAR - HOENN_DEX_PUPITAR, // SPECIES_PUPITAR - HOENN_DEX_TYRANITAR, // SPECIES_TYRANITAR - HOENN_DEX_LUGIA, // SPECIES_LUGIA - HOENN_DEX_HO_OH, // SPECIES_HO-OH - HOENN_DEX_CELEBI, // SPECIES_CELEBI - HOENN_DEX_OLD_UNOWN_B, // SPECIES_OLD_UNOWN_B - HOENN_DEX_OLD_UNOWN_C, // SPECIES_OLD_UNOWN_C - HOENN_DEX_OLD_UNOWN_D, // SPECIES_OLD_UNOWN_D - HOENN_DEX_OLD_UNOWN_E, // SPECIES_OLD_UNOWN_E - HOENN_DEX_OLD_UNOWN_F, // SPECIES_OLD_UNOWN_F - HOENN_DEX_OLD_UNOWN_G, // SPECIES_OLD_UNOWN_G - HOENN_DEX_OLD_UNOWN_H, // SPECIES_OLD_UNOWN_H - HOENN_DEX_OLD_UNOWN_I, // SPECIES_OLD_UNOWN_I - HOENN_DEX_OLD_UNOWN_J, // SPECIES_OLD_UNOWN_J - HOENN_DEX_OLD_UNOWN_K, // SPECIES_OLD_UNOWN_K - HOENN_DEX_OLD_UNOWN_L, // SPECIES_OLD_UNOWN_L - HOENN_DEX_OLD_UNOWN_M, // SPECIES_OLD_UNOWN_M - HOENN_DEX_OLD_UNOWN_N, // SPECIES_OLD_UNOWN_N - HOENN_DEX_OLD_UNOWN_O, // SPECIES_OLD_UNOWN_O - HOENN_DEX_OLD_UNOWN_P, // SPECIES_OLD_UNOWN_P - HOENN_DEX_OLD_UNOWN_Q, // SPECIES_OLD_UNOWN_Q - HOENN_DEX_OLD_UNOWN_R, // SPECIES_OLD_UNOWN_R - HOENN_DEX_OLD_UNOWN_S, // SPECIES_OLD_UNOWN_S - HOENN_DEX_OLD_UNOWN_T, // SPECIES_OLD_UNOWN_T - HOENN_DEX_OLD_UNOWN_U, // SPECIES_OLD_UNOWN_U - HOENN_DEX_OLD_UNOWN_V, // SPECIES_OLD_UNOWN_V - HOENN_DEX_OLD_UNOWN_W, // SPECIES_OLD_UNOWN_W - HOENN_DEX_OLD_UNOWN_X, // SPECIES_OLD_UNOWN_X - HOENN_DEX_OLD_UNOWN_Y, // SPECIES_OLD_UNOWN_Y - HOENN_DEX_OLD_UNOWN_Z, // SPECIES_OLD_UNOWN_Z - HOENN_DEX_TREECKO, // SPECIES_TREECKO - HOENN_DEX_GROVYLE, // SPECIES_GROVYLE - HOENN_DEX_SCEPTILE, // SPECIES_SCEPTILE - HOENN_DEX_TORCHIC, // SPECIES_TORCHIC - HOENN_DEX_COMBUSKEN, // SPECIES_COMBUSKEN - HOENN_DEX_BLAZIKEN, // SPECIES_BLAZIKEN - HOENN_DEX_MUDKIP, // SPECIES_MUDKIP - HOENN_DEX_MARSHTOMP, // SPECIES_MARSHTOMP - HOENN_DEX_SWAMPERT, // SPECIES_SWAMPERT - HOENN_DEX_POOCHYENA, // SPECIES_POOCHYENA - HOENN_DEX_MIGHTYENA, // SPECIES_MIGHTYENA - HOENN_DEX_ZIGZAGOON, // SPECIES_ZIGZAGOON - HOENN_DEX_LINOONE, // SPECIES_LINOONE - HOENN_DEX_WURMPLE, // SPECIES_WURMPLE - HOENN_DEX_SILCOON, // SPECIES_SILCOON - HOENN_DEX_BEAUTIFLY, // SPECIES_BEAUTIFLY - HOENN_DEX_CASCOON, // SPECIES_CASCOON - HOENN_DEX_DUSTOX, // SPECIES_DUSTOX - HOENN_DEX_LOTAD, // SPECIES_LOTAD - HOENN_DEX_LOMBRE, // SPECIES_LOMBRE - HOENN_DEX_LUDICOLO, // SPECIES_LUDICOLO - HOENN_DEX_SEEDOT, // SPECIES_SEEDOT - HOENN_DEX_NUZLEAF, // SPECIES_NUZLEAF - HOENN_DEX_SHIFTRY, // SPECIES_SHIFTRY - HOENN_DEX_NINCADA, // SPECIES_NINCADA - HOENN_DEX_NINJASK, // SPECIES_NINJASK - HOENN_DEX_SHEDINJA, // SPECIES_SHEDINJA - HOENN_DEX_TAILLOW, // SPECIES_TAILLOW - HOENN_DEX_SWELLOW, // SPECIES_SWELLOW - HOENN_DEX_SHROOMISH, // SPECIES_SHROOMISH - HOENN_DEX_BRELOOM, // SPECIES_BRELOOM - HOENN_DEX_SPINDA, // SPECIES_SPINDA - HOENN_DEX_WINGULL, // SPECIES_WINGULL - HOENN_DEX_PELIPPER, // SPECIES_PELIPPER - HOENN_DEX_SURSKIT, // SPECIES_SURSKIT - HOENN_DEX_MASQUERAIN, // SPECIES_MASQUERAIN - HOENN_DEX_WAILMER, // SPECIES_WAILMER - HOENN_DEX_WAILORD, // SPECIES_WAILORD - HOENN_DEX_SKITTY, // SPECIES_SKITTY - HOENN_DEX_DELCATTY, // SPECIES_DELCATTY - HOENN_DEX_KECLEON, // SPECIES_KECLEON - HOENN_DEX_BALTOY, // SPECIES_BALTOY - HOENN_DEX_CLAYDOL, // SPECIES_CLAYDOL - HOENN_DEX_NOSEPASS, // SPECIES_NOSEPASS - HOENN_DEX_TORKOAL, // SPECIES_TORKOAL - HOENN_DEX_SABLEYE, // SPECIES_SABLEYE - HOENN_DEX_BARBOACH, // SPECIES_BARBOACH - HOENN_DEX_WHISCASH, // SPECIES_WHISCASH - HOENN_DEX_LUVDISC, // SPECIES_LUVDISC - HOENN_DEX_CORPHISH, // SPECIES_CORPHISH - HOENN_DEX_CRAWDAUNT, // SPECIES_CRAWDAUNT - HOENN_DEX_FEEBAS, // SPECIES_FEEBAS - HOENN_DEX_MILOTIC, // SPECIES_MILOTIC - HOENN_DEX_CARVANHA, // SPECIES_CARVANHA - HOENN_DEX_SHARPEDO, // SPECIES_SHARPEDO - HOENN_DEX_TRAPINCH, // SPECIES_TRAPINCH - HOENN_DEX_VIBRAVA, // SPECIES_VIBRAVA - HOENN_DEX_FLYGON, // SPECIES_FLYGON - HOENN_DEX_MAKUHITA, // SPECIES_MAKUHITA - HOENN_DEX_HARIYAMA, // SPECIES_HARIYAMA - HOENN_DEX_ELECTRIKE, // SPECIES_ELECTRIKE - HOENN_DEX_MANECTRIC, // SPECIES_MANECTRIC - HOENN_DEX_NUMEL, // SPECIES_NUMEL - HOENN_DEX_CAMERUPT, // SPECIES_CAMERUPT - HOENN_DEX_SPHEAL, // SPECIES_SPHEAL - HOENN_DEX_SEALEO, // SPECIES_SEALEO - HOENN_DEX_WALREIN, // SPECIES_WALREIN - HOENN_DEX_CACNEA, // SPECIES_CACNEA - HOENN_DEX_CACTURNE, // SPECIES_CACTURNE - HOENN_DEX_SNORUNT, // SPECIES_SNORUNT - HOENN_DEX_GLALIE, // SPECIES_GLALIE - HOENN_DEX_LUNATONE, // SPECIES_LUNATONE - HOENN_DEX_SOLROCK, // SPECIES_SOLROCK - HOENN_DEX_AZURILL, // SPECIES_AZURILL - HOENN_DEX_SPOINK, // SPECIES_SPOINK - HOENN_DEX_GRUMPIG, // SPECIES_GRUMPIG - HOENN_DEX_PLUSLE, // SPECIES_PLUSLE - HOENN_DEX_MINUN, // SPECIES_MINUN - HOENN_DEX_MAWILE, // SPECIES_MAWILE - HOENN_DEX_MEDITITE, // SPECIES_MEDITITE - HOENN_DEX_MEDICHAM, // SPECIES_MEDICHAM - HOENN_DEX_SWABLU, // SPECIES_SWABLU - HOENN_DEX_ALTARIA, // SPECIES_ALTARIA - HOENN_DEX_WYNAUT, // SPECIES_WYNAUT - HOENN_DEX_DUSKULL, // SPECIES_DUSKULL - HOENN_DEX_DUSCLOPS, // SPECIES_DUSCLOPS - HOENN_DEX_ROSELIA, // SPECIES_ROSELIA - HOENN_DEX_SLAKOTH, // SPECIES_SLAKOTH - HOENN_DEX_VIGOROTH, // SPECIES_VIGOROTH - HOENN_DEX_SLAKING, // SPECIES_SLAKING - HOENN_DEX_GULPIN, // SPECIES_GULPIN - HOENN_DEX_SWALOT, // SPECIES_SWALOT - HOENN_DEX_TROPIUS, // SPECIES_TROPIUS - HOENN_DEX_WHISMUR, // SPECIES_WHISMUR - HOENN_DEX_LOUDRED, // SPECIES_LOUDRED - HOENN_DEX_EXPLOUD, // SPECIES_EXPLOUD - HOENN_DEX_CLAMPERL, // SPECIES_CLAMPERL - HOENN_DEX_HUNTAIL, // SPECIES_HUNTAIL - HOENN_DEX_GOREBYSS, // SPECIES_GOREBYSS - HOENN_DEX_ABSOL, // SPECIES_ABSOL - HOENN_DEX_SHUPPET, // SPECIES_SHUPPET - HOENN_DEX_BANETTE, // SPECIES_BANETTE - HOENN_DEX_SEVIPER, // SPECIES_SEVIPER - HOENN_DEX_ZANGOOSE, // SPECIES_ZANGOOSE - HOENN_DEX_RELICANTH, // SPECIES_RELICANTH - HOENN_DEX_ARON, // SPECIES_ARON - HOENN_DEX_LAIRON, // SPECIES_LAIRON - HOENN_DEX_AGGRON, // SPECIES_AGGRON - HOENN_DEX_CASTFORM, // SPECIES_CASTFORM - HOENN_DEX_VOLBEAT, // SPECIES_VOLBEAT - HOENN_DEX_ILLUMISE, // SPECIES_ILLUMISE - HOENN_DEX_LILEEP, // SPECIES_LILEEP - HOENN_DEX_CRADILY, // SPECIES_CRADILY - HOENN_DEX_ANORITH, // SPECIES_ANORITH - HOENN_DEX_ARMALDO, // SPECIES_ARMALDO - HOENN_DEX_RALTS, // SPECIES_RALTS - HOENN_DEX_KIRLIA, // SPECIES_KIRLIA - HOENN_DEX_GARDEVOIR, // SPECIES_GARDEVOIR - HOENN_DEX_BAGON, // SPECIES_BAGON - HOENN_DEX_SHELGON, // SPECIES_SHELGON - HOENN_DEX_SALAMENCE, // SPECIES_SALAMENCE - HOENN_DEX_BELDUM, // SPECIES_BELDUM - HOENN_DEX_METANG, // SPECIES_METANG - HOENN_DEX_METAGROSS, // SPECIES_METAGROSS - HOENN_DEX_REGIROCK, // SPECIES_REGIROCK - HOENN_DEX_REGICE, // SPECIES_REGICE - HOENN_DEX_REGISTEEL, // SPECIES_REGISTEEL - HOENN_DEX_KYOGRE, // SPECIES_KYOGRE - HOENN_DEX_GROUDON, // SPECIES_GROUDON - HOENN_DEX_RAYQUAZA, // SPECIES_RAYQUAZA - HOENN_DEX_LATIAS, // SPECIES_LATIAS - HOENN_DEX_LATIOS, // SPECIES_LATIOS - HOENN_DEX_JIRACHI, // SPECIES_JIRACHI - HOENN_DEX_DEOXYS, // SPECIES_DEOXYS - HOENN_DEX_CHIMECHO // SPECIES_CHIMECHO + SPECIES_TO_HOENN(BULBASAUR), + SPECIES_TO_HOENN(IVYSAUR), + SPECIES_TO_HOENN(VENUSAUR), + SPECIES_TO_HOENN(CHARMANDER), + SPECIES_TO_HOENN(CHARMELEON), + SPECIES_TO_HOENN(CHARIZARD), + SPECIES_TO_HOENN(SQUIRTLE), + SPECIES_TO_HOENN(WARTORTLE), + SPECIES_TO_HOENN(BLASTOISE), + SPECIES_TO_HOENN(CATERPIE), + SPECIES_TO_HOENN(METAPOD), + SPECIES_TO_HOENN(BUTTERFREE), + SPECIES_TO_HOENN(WEEDLE), + SPECIES_TO_HOENN(KAKUNA), + SPECIES_TO_HOENN(BEEDRILL), + SPECIES_TO_HOENN(PIDGEY), + SPECIES_TO_HOENN(PIDGEOTTO), + SPECIES_TO_HOENN(PIDGEOT), + SPECIES_TO_HOENN(RATTATA), + SPECIES_TO_HOENN(RATICATE), + SPECIES_TO_HOENN(SPEAROW), + SPECIES_TO_HOENN(FEAROW), + SPECIES_TO_HOENN(EKANS), + SPECIES_TO_HOENN(ARBOK), + SPECIES_TO_HOENN(PIKACHU), + SPECIES_TO_HOENN(RAICHU), + SPECIES_TO_HOENN(SANDSHREW), + SPECIES_TO_HOENN(SANDSLASH), + SPECIES_TO_HOENN(NIDORAN_F), + SPECIES_TO_HOENN(NIDORINA), + SPECIES_TO_HOENN(NIDOQUEEN), + SPECIES_TO_HOENN(NIDORAN_M), + SPECIES_TO_HOENN(NIDORINO), + SPECIES_TO_HOENN(NIDOKING), + SPECIES_TO_HOENN(CLEFAIRY), + SPECIES_TO_HOENN(CLEFABLE), + SPECIES_TO_HOENN(VULPIX), + SPECIES_TO_HOENN(NINETALES), + SPECIES_TO_HOENN(JIGGLYPUFF), + SPECIES_TO_HOENN(WIGGLYTUFF), + SPECIES_TO_HOENN(ZUBAT), + SPECIES_TO_HOENN(GOLBAT), + SPECIES_TO_HOENN(ODDISH), + SPECIES_TO_HOENN(GLOOM), + SPECIES_TO_HOENN(VILEPLUME), + SPECIES_TO_HOENN(PARAS), + SPECIES_TO_HOENN(PARASECT), + SPECIES_TO_HOENN(VENONAT), + SPECIES_TO_HOENN(VENOMOTH), + SPECIES_TO_HOENN(DIGLETT), + SPECIES_TO_HOENN(DUGTRIO), + SPECIES_TO_HOENN(MEOWTH), + SPECIES_TO_HOENN(PERSIAN), + SPECIES_TO_HOENN(PSYDUCK), + SPECIES_TO_HOENN(GOLDUCK), + SPECIES_TO_HOENN(MANKEY), + SPECIES_TO_HOENN(PRIMEAPE), + SPECIES_TO_HOENN(GROWLITHE), + SPECIES_TO_HOENN(ARCANINE), + SPECIES_TO_HOENN(POLIWAG), + SPECIES_TO_HOENN(POLIWHIRL), + SPECIES_TO_HOENN(POLIWRATH), + SPECIES_TO_HOENN(ABRA), + SPECIES_TO_HOENN(KADABRA), + SPECIES_TO_HOENN(ALAKAZAM), + SPECIES_TO_HOENN(MACHOP), + SPECIES_TO_HOENN(MACHOKE), + SPECIES_TO_HOENN(MACHAMP), + SPECIES_TO_HOENN(BELLSPROUT), + SPECIES_TO_HOENN(WEEPINBELL), + SPECIES_TO_HOENN(VICTREEBEL), + SPECIES_TO_HOENN(TENTACOOL), + SPECIES_TO_HOENN(TENTACRUEL), + SPECIES_TO_HOENN(GEODUDE), + SPECIES_TO_HOENN(GRAVELER), + SPECIES_TO_HOENN(GOLEM), + SPECIES_TO_HOENN(PONYTA), + SPECIES_TO_HOENN(RAPIDASH), + SPECIES_TO_HOENN(SLOWPOKE), + SPECIES_TO_HOENN(SLOWBRO), + SPECIES_TO_HOENN(MAGNEMITE), + SPECIES_TO_HOENN(MAGNETON), + SPECIES_TO_HOENN(FARFETCHD), + SPECIES_TO_HOENN(DODUO), + SPECIES_TO_HOENN(DODRIO), + SPECIES_TO_HOENN(SEEL), + SPECIES_TO_HOENN(DEWGONG), + SPECIES_TO_HOENN(GRIMER), + SPECIES_TO_HOENN(MUK), + SPECIES_TO_HOENN(SHELLDER), + SPECIES_TO_HOENN(CLOYSTER), + SPECIES_TO_HOENN(GASTLY), + SPECIES_TO_HOENN(HAUNTER), + SPECIES_TO_HOENN(GENGAR), + SPECIES_TO_HOENN(ONIX), + SPECIES_TO_HOENN(DROWZEE), + SPECIES_TO_HOENN(HYPNO), + SPECIES_TO_HOENN(KRABBY), + SPECIES_TO_HOENN(KINGLER), + SPECIES_TO_HOENN(VOLTORB), + SPECIES_TO_HOENN(ELECTRODE), + SPECIES_TO_HOENN(EXEGGCUTE), + SPECIES_TO_HOENN(EXEGGUTOR), + SPECIES_TO_HOENN(CUBONE), + SPECIES_TO_HOENN(MAROWAK), + SPECIES_TO_HOENN(HITMONLEE), + SPECIES_TO_HOENN(HITMONCHAN), + SPECIES_TO_HOENN(LICKITUNG), + SPECIES_TO_HOENN(KOFFING), + SPECIES_TO_HOENN(WEEZING), + SPECIES_TO_HOENN(RHYHORN), + SPECIES_TO_HOENN(RHYDON), + SPECIES_TO_HOENN(CHANSEY), + SPECIES_TO_HOENN(TANGELA), + SPECIES_TO_HOENN(KANGASKHAN), + SPECIES_TO_HOENN(HORSEA), + SPECIES_TO_HOENN(SEADRA), + SPECIES_TO_HOENN(GOLDEEN), + SPECIES_TO_HOENN(SEAKING), + SPECIES_TO_HOENN(STARYU), + SPECIES_TO_HOENN(STARMIE), + SPECIES_TO_HOENN(MR_MIME), + SPECIES_TO_HOENN(SCYTHER), + SPECIES_TO_HOENN(JYNX), + SPECIES_TO_HOENN(ELECTABUZZ), + SPECIES_TO_HOENN(MAGMAR), + SPECIES_TO_HOENN(PINSIR), + SPECIES_TO_HOENN(TAUROS), + SPECIES_TO_HOENN(MAGIKARP), + SPECIES_TO_HOENN(GYARADOS), + SPECIES_TO_HOENN(LAPRAS), + SPECIES_TO_HOENN(DITTO), + SPECIES_TO_HOENN(EEVEE), + SPECIES_TO_HOENN(VAPOREON), + SPECIES_TO_HOENN(JOLTEON), + SPECIES_TO_HOENN(FLAREON), + SPECIES_TO_HOENN(PORYGON), + SPECIES_TO_HOENN(OMANYTE), + SPECIES_TO_HOENN(OMASTAR), + SPECIES_TO_HOENN(KABUTO), + SPECIES_TO_HOENN(KABUTOPS), + SPECIES_TO_HOENN(AERODACTYL), + SPECIES_TO_HOENN(SNORLAX), + SPECIES_TO_HOENN(ARTICUNO), + SPECIES_TO_HOENN(ZAPDOS), + SPECIES_TO_HOENN(MOLTRES), + SPECIES_TO_HOENN(DRATINI), + SPECIES_TO_HOENN(DRAGONAIR), + SPECIES_TO_HOENN(DRAGONITE), + SPECIES_TO_HOENN(MEWTWO), + SPECIES_TO_HOENN(MEW), + SPECIES_TO_HOENN(CHIKORITA), + SPECIES_TO_HOENN(BAYLEEF), + SPECIES_TO_HOENN(MEGANIUM), + SPECIES_TO_HOENN(CYNDAQUIL), + SPECIES_TO_HOENN(QUILAVA), + SPECIES_TO_HOENN(TYPHLOSION), + SPECIES_TO_HOENN(TOTODILE), + SPECIES_TO_HOENN(CROCONAW), + SPECIES_TO_HOENN(FERALIGATR), + SPECIES_TO_HOENN(SENTRET), + SPECIES_TO_HOENN(FURRET), + SPECIES_TO_HOENN(HOOTHOOT), + SPECIES_TO_HOENN(NOCTOWL), + SPECIES_TO_HOENN(LEDYBA), + SPECIES_TO_HOENN(LEDIAN), + SPECIES_TO_HOENN(SPINARAK), + SPECIES_TO_HOENN(ARIADOS), + SPECIES_TO_HOENN(CROBAT), + SPECIES_TO_HOENN(CHINCHOU), + SPECIES_TO_HOENN(LANTURN), + SPECIES_TO_HOENN(PICHU), + SPECIES_TO_HOENN(CLEFFA), + SPECIES_TO_HOENN(IGGLYBUFF), + SPECIES_TO_HOENN(TOGEPI), + SPECIES_TO_HOENN(TOGETIC), + SPECIES_TO_HOENN(NATU), + SPECIES_TO_HOENN(XATU), + SPECIES_TO_HOENN(MAREEP), + SPECIES_TO_HOENN(FLAAFFY), + SPECIES_TO_HOENN(AMPHAROS), + SPECIES_TO_HOENN(BELLOSSOM), + SPECIES_TO_HOENN(MARILL), + SPECIES_TO_HOENN(AZUMARILL), + SPECIES_TO_HOENN(SUDOWOODO), + SPECIES_TO_HOENN(POLITOED), + SPECIES_TO_HOENN(HOPPIP), + SPECIES_TO_HOENN(SKIPLOOM), + SPECIES_TO_HOENN(JUMPLUFF), + SPECIES_TO_HOENN(AIPOM), + SPECIES_TO_HOENN(SUNKERN), + SPECIES_TO_HOENN(SUNFLORA), + SPECIES_TO_HOENN(YANMA), + SPECIES_TO_HOENN(WOOPER), + SPECIES_TO_HOENN(QUAGSIRE), + SPECIES_TO_HOENN(ESPEON), + SPECIES_TO_HOENN(UMBREON), + SPECIES_TO_HOENN(MURKROW), + SPECIES_TO_HOENN(SLOWKING), + SPECIES_TO_HOENN(MISDREAVUS), + SPECIES_TO_HOENN(UNOWN), + SPECIES_TO_HOENN(WOBBUFFET), + SPECIES_TO_HOENN(GIRAFARIG), + SPECIES_TO_HOENN(PINECO), + SPECIES_TO_HOENN(FORRETRESS), + SPECIES_TO_HOENN(DUNSPARCE), + SPECIES_TO_HOENN(GLIGAR), + SPECIES_TO_HOENN(STEELIX), + SPECIES_TO_HOENN(SNUBBULL), + SPECIES_TO_HOENN(GRANBULL), + SPECIES_TO_HOENN(QWILFISH), + SPECIES_TO_HOENN(SCIZOR), + SPECIES_TO_HOENN(SHUCKLE), + SPECIES_TO_HOENN(HERACROSS), + SPECIES_TO_HOENN(SNEASEL), + SPECIES_TO_HOENN(TEDDIURSA), + SPECIES_TO_HOENN(URSARING), + SPECIES_TO_HOENN(SLUGMA), + SPECIES_TO_HOENN(MAGCARGO), + SPECIES_TO_HOENN(SWINUB), + SPECIES_TO_HOENN(PILOSWINE), + SPECIES_TO_HOENN(CORSOLA), + SPECIES_TO_HOENN(REMORAID), + SPECIES_TO_HOENN(OCTILLERY), + SPECIES_TO_HOENN(DELIBIRD), + SPECIES_TO_HOENN(MANTINE), + SPECIES_TO_HOENN(SKARMORY), + SPECIES_TO_HOENN(HOUNDOUR), + SPECIES_TO_HOENN(HOUNDOOM), + SPECIES_TO_HOENN(KINGDRA), + SPECIES_TO_HOENN(PHANPY), + SPECIES_TO_HOENN(DONPHAN), + SPECIES_TO_HOENN(PORYGON2), + SPECIES_TO_HOENN(STANTLER), + SPECIES_TO_HOENN(SMEARGLE), + SPECIES_TO_HOENN(TYROGUE), + SPECIES_TO_HOENN(HITMONTOP), + SPECIES_TO_HOENN(SMOOCHUM), + SPECIES_TO_HOENN(ELEKID), + SPECIES_TO_HOENN(MAGBY), + SPECIES_TO_HOENN(MILTANK), + SPECIES_TO_HOENN(BLISSEY), + SPECIES_TO_HOENN(RAIKOU), + SPECIES_TO_HOENN(ENTEI), + SPECIES_TO_HOENN(SUICUNE), + SPECIES_TO_HOENN(LARVITAR), + SPECIES_TO_HOENN(PUPITAR), + SPECIES_TO_HOENN(TYRANITAR), + SPECIES_TO_HOENN(LUGIA), + SPECIES_TO_HOENN(HO_OH), + SPECIES_TO_HOENN(CELEBI), + SPECIES_TO_HOENN(OLD_UNOWN_B), + SPECIES_TO_HOENN(OLD_UNOWN_C), + SPECIES_TO_HOENN(OLD_UNOWN_D), + SPECIES_TO_HOENN(OLD_UNOWN_E), + SPECIES_TO_HOENN(OLD_UNOWN_F), + SPECIES_TO_HOENN(OLD_UNOWN_G), + SPECIES_TO_HOENN(OLD_UNOWN_H), + SPECIES_TO_HOENN(OLD_UNOWN_I), + SPECIES_TO_HOENN(OLD_UNOWN_J), + SPECIES_TO_HOENN(OLD_UNOWN_K), + SPECIES_TO_HOENN(OLD_UNOWN_L), + SPECIES_TO_HOENN(OLD_UNOWN_M), + SPECIES_TO_HOENN(OLD_UNOWN_N), + SPECIES_TO_HOENN(OLD_UNOWN_O), + SPECIES_TO_HOENN(OLD_UNOWN_P), + SPECIES_TO_HOENN(OLD_UNOWN_Q), + SPECIES_TO_HOENN(OLD_UNOWN_R), + SPECIES_TO_HOENN(OLD_UNOWN_S), + SPECIES_TO_HOENN(OLD_UNOWN_T), + SPECIES_TO_HOENN(OLD_UNOWN_U), + SPECIES_TO_HOENN(OLD_UNOWN_V), + SPECIES_TO_HOENN(OLD_UNOWN_W), + SPECIES_TO_HOENN(OLD_UNOWN_X), + SPECIES_TO_HOENN(OLD_UNOWN_Y), + SPECIES_TO_HOENN(OLD_UNOWN_Z), + SPECIES_TO_HOENN(TREECKO), + SPECIES_TO_HOENN(GROVYLE), + SPECIES_TO_HOENN(SCEPTILE), + SPECIES_TO_HOENN(TORCHIC), + SPECIES_TO_HOENN(COMBUSKEN), + SPECIES_TO_HOENN(BLAZIKEN), + SPECIES_TO_HOENN(MUDKIP), + SPECIES_TO_HOENN(MARSHTOMP), + SPECIES_TO_HOENN(SWAMPERT), + SPECIES_TO_HOENN(POOCHYENA), + SPECIES_TO_HOENN(MIGHTYENA), + SPECIES_TO_HOENN(ZIGZAGOON), + SPECIES_TO_HOENN(LINOONE), + SPECIES_TO_HOENN(WURMPLE), + SPECIES_TO_HOENN(SILCOON), + SPECIES_TO_HOENN(BEAUTIFLY), + SPECIES_TO_HOENN(CASCOON), + SPECIES_TO_HOENN(DUSTOX), + SPECIES_TO_HOENN(LOTAD), + SPECIES_TO_HOENN(LOMBRE), + SPECIES_TO_HOENN(LUDICOLO), + SPECIES_TO_HOENN(SEEDOT), + SPECIES_TO_HOENN(NUZLEAF), + SPECIES_TO_HOENN(SHIFTRY), + SPECIES_TO_HOENN(NINCADA), + SPECIES_TO_HOENN(NINJASK), + SPECIES_TO_HOENN(SHEDINJA), + SPECIES_TO_HOENN(TAILLOW), + SPECIES_TO_HOENN(SWELLOW), + SPECIES_TO_HOENN(SHROOMISH), + SPECIES_TO_HOENN(BRELOOM), + SPECIES_TO_HOENN(SPINDA), + SPECIES_TO_HOENN(WINGULL), + SPECIES_TO_HOENN(PELIPPER), + SPECIES_TO_HOENN(SURSKIT), + SPECIES_TO_HOENN(MASQUERAIN), + SPECIES_TO_HOENN(WAILMER), + SPECIES_TO_HOENN(WAILORD), + SPECIES_TO_HOENN(SKITTY), + SPECIES_TO_HOENN(DELCATTY), + SPECIES_TO_HOENN(KECLEON), + SPECIES_TO_HOENN(BALTOY), + SPECIES_TO_HOENN(CLAYDOL), + SPECIES_TO_HOENN(NOSEPASS), + SPECIES_TO_HOENN(TORKOAL), + SPECIES_TO_HOENN(SABLEYE), + SPECIES_TO_HOENN(BARBOACH), + SPECIES_TO_HOENN(WHISCASH), + SPECIES_TO_HOENN(LUVDISC), + SPECIES_TO_HOENN(CORPHISH), + SPECIES_TO_HOENN(CRAWDAUNT), + SPECIES_TO_HOENN(FEEBAS), + SPECIES_TO_HOENN(MILOTIC), + SPECIES_TO_HOENN(CARVANHA), + SPECIES_TO_HOENN(SHARPEDO), + SPECIES_TO_HOENN(TRAPINCH), + SPECIES_TO_HOENN(VIBRAVA), + SPECIES_TO_HOENN(FLYGON), + SPECIES_TO_HOENN(MAKUHITA), + SPECIES_TO_HOENN(HARIYAMA), + SPECIES_TO_HOENN(ELECTRIKE), + SPECIES_TO_HOENN(MANECTRIC), + SPECIES_TO_HOENN(NUMEL), + SPECIES_TO_HOENN(CAMERUPT), + SPECIES_TO_HOENN(SPHEAL), + SPECIES_TO_HOENN(SEALEO), + SPECIES_TO_HOENN(WALREIN), + SPECIES_TO_HOENN(CACNEA), + SPECIES_TO_HOENN(CACTURNE), + SPECIES_TO_HOENN(SNORUNT), + SPECIES_TO_HOENN(GLALIE), + SPECIES_TO_HOENN(LUNATONE), + SPECIES_TO_HOENN(SOLROCK), + SPECIES_TO_HOENN(AZURILL), + SPECIES_TO_HOENN(SPOINK), + SPECIES_TO_HOENN(GRUMPIG), + SPECIES_TO_HOENN(PLUSLE), + SPECIES_TO_HOENN(MINUN), + SPECIES_TO_HOENN(MAWILE), + SPECIES_TO_HOENN(MEDITITE), + SPECIES_TO_HOENN(MEDICHAM), + SPECIES_TO_HOENN(SWABLU), + SPECIES_TO_HOENN(ALTARIA), + SPECIES_TO_HOENN(WYNAUT), + SPECIES_TO_HOENN(DUSKULL), + SPECIES_TO_HOENN(DUSCLOPS), + SPECIES_TO_HOENN(ROSELIA), + SPECIES_TO_HOENN(SLAKOTH), + SPECIES_TO_HOENN(VIGOROTH), + SPECIES_TO_HOENN(SLAKING), + SPECIES_TO_HOENN(GULPIN), + SPECIES_TO_HOENN(SWALOT), + SPECIES_TO_HOENN(TROPIUS), + SPECIES_TO_HOENN(WHISMUR), + SPECIES_TO_HOENN(LOUDRED), + SPECIES_TO_HOENN(EXPLOUD), + SPECIES_TO_HOENN(CLAMPERL), + SPECIES_TO_HOENN(HUNTAIL), + SPECIES_TO_HOENN(GOREBYSS), + SPECIES_TO_HOENN(ABSOL), + SPECIES_TO_HOENN(SHUPPET), + SPECIES_TO_HOENN(BANETTE), + SPECIES_TO_HOENN(SEVIPER), + SPECIES_TO_HOENN(ZANGOOSE), + SPECIES_TO_HOENN(RELICANTH), + SPECIES_TO_HOENN(ARON), + SPECIES_TO_HOENN(LAIRON), + SPECIES_TO_HOENN(AGGRON), + SPECIES_TO_HOENN(CASTFORM), + SPECIES_TO_HOENN(VOLBEAT), + SPECIES_TO_HOENN(ILLUMISE), + SPECIES_TO_HOENN(LILEEP), + SPECIES_TO_HOENN(CRADILY), + SPECIES_TO_HOENN(ANORITH), + SPECIES_TO_HOENN(ARMALDO), + SPECIES_TO_HOENN(RALTS), + SPECIES_TO_HOENN(KIRLIA), + SPECIES_TO_HOENN(GARDEVOIR), + SPECIES_TO_HOENN(BAGON), + SPECIES_TO_HOENN(SHELGON), + SPECIES_TO_HOENN(SALAMENCE), + SPECIES_TO_HOENN(BELDUM), + SPECIES_TO_HOENN(METANG), + SPECIES_TO_HOENN(METAGROSS), + SPECIES_TO_HOENN(REGIROCK), + SPECIES_TO_HOENN(REGICE), + SPECIES_TO_HOENN(REGISTEEL), + SPECIES_TO_HOENN(KYOGRE), + SPECIES_TO_HOENN(GROUDON), + SPECIES_TO_HOENN(RAYQUAZA), + SPECIES_TO_HOENN(LATIAS), + SPECIES_TO_HOENN(LATIOS), + SPECIES_TO_HOENN(JIRACHI), + SPECIES_TO_HOENN(DEOXYS), + SPECIES_TO_HOENN(CHIMECHO), }; const u16 gSpeciesToNationalPokedexNum[] = // Assigns all species to the National Dex Index (Summary No. for National Dex) { - // SPECIES_NONE - NATIONAL_DEX_BULBASAUR, // SPECIES_BULBASAUR - NATIONAL_DEX_IVYSAUR, // SPECIES_IVYSAUR - NATIONAL_DEX_VENUSAUR, // SPECIES_VENUSAUR - NATIONAL_DEX_CHARMANDER, // SPECIES_CHARMANDER - NATIONAL_DEX_CHARMELEON, // SPECIES_CHARMELEON - NATIONAL_DEX_CHARIZARD, // SPECIES_CHARIZARD - NATIONAL_DEX_SQUIRTLE, // SPECIES_SQUIRTLE - NATIONAL_DEX_WARTORTLE, // SPECIES_WARTORTLE - NATIONAL_DEX_BLASTOISE, // SPECIES_BLASTOISE - NATIONAL_DEX_CATERPIE, // SPECIES_CATERPIE - NATIONAL_DEX_METAPOD, // SPECIES_METAPOD - NATIONAL_DEX_BUTTERFREE, // SPECIES_BUTTERFREE - NATIONAL_DEX_WEEDLE, // SPECIES_WEEDLE - NATIONAL_DEX_KAKUNA, // SPECIES_KAKUNA - NATIONAL_DEX_BEEDRILL, // SPECIES_BEEDRILL - NATIONAL_DEX_PIDGEY, // SPECIES_PIDGEY - NATIONAL_DEX_PIDGEOTTO, // SPECIES_PIDGEOTTO - NATIONAL_DEX_PIDGEOT, // SPECIES_PIDGEOT - NATIONAL_DEX_RATTATA, // SPECIES_RATTATA - NATIONAL_DEX_RATICATE, // SPECIES_RATICATE - NATIONAL_DEX_SPEAROW, // SPECIES_SPEAROW - NATIONAL_DEX_FEAROW, // SPECIES_FEAROW - NATIONAL_DEX_EKANS, // SPECIES_EKANS - NATIONAL_DEX_ARBOK, // SPECIES_ARBOK - NATIONAL_DEX_PIKACHU, // SPECIES_PIKACHU - NATIONAL_DEX_RAICHU, // SPECIES_RAICHU - NATIONAL_DEX_SANDSHREW, // SPECIES_SANDSHREW - NATIONAL_DEX_SANDSLASH, // SPECIES_SANDSLASH - NATIONAL_DEX_NIDORAN_F, // SPECIES_NIDORAN_F - NATIONAL_DEX_NIDORINA, // SPECIES_NIDORINA - NATIONAL_DEX_NIDOQUEEN, // SPECIES_NIDOQUEEN - NATIONAL_DEX_NIDORAN_M, // SPECIES_NIDORAN_M - NATIONAL_DEX_NIDORINO, // SPECIES_NIDORINO - NATIONAL_DEX_NIDOKING, // SPECIES_NIDOKING - NATIONAL_DEX_CLEFAIRY, // SPECIES_CLEFAIRY - NATIONAL_DEX_CLEFABLE, // SPECIES_CLEFABLE - NATIONAL_DEX_VULPIX, // SPECIES_VULPIX - NATIONAL_DEX_NINETALES, // SPECIES_NINETALES - NATIONAL_DEX_JIGGLYPUFF, // SPECIES_JIGGLYPUFF - NATIONAL_DEX_WIGGLYTUFF, // SPECIES_WIGGLYTUFF - NATIONAL_DEX_ZUBAT, // SPECIES_ZUBAT - NATIONAL_DEX_GOLBAT, // SPECIES_GOLBAT - NATIONAL_DEX_ODDISH, // SPECIES_ODDISH - NATIONAL_DEX_GLOOM, // SPECIES_GLOOM - NATIONAL_DEX_VILEPLUME, // SPECIES_VILEPLUME - NATIONAL_DEX_PARAS, // SPECIES_PARAS - NATIONAL_DEX_PARASECT, // SPECIES_PARASECT - NATIONAL_DEX_VENONAT, // SPECIES_VENONAT - NATIONAL_DEX_VENOMOTH, // SPECIES_VENOMOTH - NATIONAL_DEX_DIGLETT, // SPECIES_DIGLETT - NATIONAL_DEX_DUGTRIO, // SPECIES_DUGTRIO - NATIONAL_DEX_MEOWTH, // SPECIES_MEOWTH - NATIONAL_DEX_PERSIAN, // SPECIES_PERSIAN - NATIONAL_DEX_PSYDUCK, // SPECIES_PSYDUCK - NATIONAL_DEX_GOLDUCK, // SPECIES_GOLDUCK - NATIONAL_DEX_MANKEY, // SPECIES_MANKEY - NATIONAL_DEX_PRIMEAPE, // SPECIES_PRIMEAPE - NATIONAL_DEX_GROWLITHE, // SPECIES_GROWLITHE - NATIONAL_DEX_ARCANINE, // SPECIES_ARCANINE - NATIONAL_DEX_POLIWAG, // SPECIES_POLIWAG - NATIONAL_DEX_POLIWHIRL, // SPECIES_POLIWHIRL - NATIONAL_DEX_POLIWRATH, // SPECIES_POLIWRATH - NATIONAL_DEX_ABRA, // SPECIES_ABRA - NATIONAL_DEX_KADABRA, // SPECIES_KADABRA - NATIONAL_DEX_ALAKAZAM, // SPECIES_ALAKAZAM - NATIONAL_DEX_MACHOP, // SPECIES_MACHOP - NATIONAL_DEX_MACHOKE, // SPECIES_MACHOKE - NATIONAL_DEX_MACHAMP, // SPECIES_MACHAMP - NATIONAL_DEX_BELLSPROUT, // SPECIES_BELLSPROUT - NATIONAL_DEX_WEEPINBELL, // SPECIES_WEEPINBELL - NATIONAL_DEX_VICTREEBEL, // SPECIES_VICTREEBEL - NATIONAL_DEX_TENTACOOL, // SPECIES_TENTACOOL - NATIONAL_DEX_TENTACRUEL, // SPECIES_TENTACRUEL - NATIONAL_DEX_GEODUDE, // SPECIES_GEODUDE - NATIONAL_DEX_GRAVELER, // SPECIES_GRAVELER - NATIONAL_DEX_GOLEM, // SPECIES_GOLEM - NATIONAL_DEX_PONYTA, // SPECIES_PONYTA - NATIONAL_DEX_RAPIDASH, // SPECIES_RAPIDASH - NATIONAL_DEX_SLOWPOKE, // SPECIES_SLOWPOKE - NATIONAL_DEX_SLOWBRO, // SPECIES_SLOWBRO - NATIONAL_DEX_MAGNEMITE, // SPECIES_MAGNEMITE - NATIONAL_DEX_MAGNETON, // SPECIES_MAGNETON - NATIONAL_DEX_FARFETCHD, // SPECIES_FARFETCHD - NATIONAL_DEX_DODUO, // SPECIES_DODUO - NATIONAL_DEX_DODRIO, // SPECIES_DODRIO - NATIONAL_DEX_SEEL, // SPECIES_SEEL - NATIONAL_DEX_DEWGONG, // SPECIES_DEWGONG - NATIONAL_DEX_GRIMER, // SPECIES_GRIMER - NATIONAL_DEX_MUK, // SPECIES_MUK - NATIONAL_DEX_SHELLDER, // SPECIES_SHELLDER - NATIONAL_DEX_CLOYSTER, // SPECIES_CLOYSTER - NATIONAL_DEX_GASTLY, // SPECIES_GASTLY - NATIONAL_DEX_HAUNTER, // SPECIES_HAUNTER - NATIONAL_DEX_GENGAR, // SPECIES_GENGAR - NATIONAL_DEX_ONIX, // SPECIES_ONIX - NATIONAL_DEX_DROWZEE, // SPECIES_DROWZEE - NATIONAL_DEX_HYPNO, // SPECIES_HYPNO - NATIONAL_DEX_KRABBY, // SPECIES_KRABBY - NATIONAL_DEX_KINGLER, // SPECIES_KINGLER - NATIONAL_DEX_VOLTORB, // SPECIES_VOLTORB - NATIONAL_DEX_ELECTRODE, // SPECIES_ELECTRODE - NATIONAL_DEX_EXEGGCUTE, // SPECIES_EXEGGCUTE - NATIONAL_DEX_EXEGGUTOR, // SPECIES_EXEGGUTOR - NATIONAL_DEX_CUBONE, // SPECIES_CUBONE - NATIONAL_DEX_MAROWAK, // SPECIES_MAROWAK - NATIONAL_DEX_HITMONLEE, // SPECIES_HITMONLEE - NATIONAL_DEX_HITMONCHAN, // SPECIES_HITMONCHAN - NATIONAL_DEX_LICKITUNG, // SPECIES_LICKITUNG - NATIONAL_DEX_KOFFING, // SPECIES_KOFFING - NATIONAL_DEX_WEEZING, // SPECIES_WEEZING - NATIONAL_DEX_RHYHORN, // SPECIES_RHYHORN - NATIONAL_DEX_RHYDON, // SPECIES_RHYDON - NATIONAL_DEX_CHANSEY, // SPECIES_CHANSEY - NATIONAL_DEX_TANGELA, // SPECIES_TANGELA - NATIONAL_DEX_KANGASKHAN, // SPECIES_KANGASKHAN - NATIONAL_DEX_HORSEA, // SPECIES_HORSEA - NATIONAL_DEX_SEADRA, // SPECIES_SEADRA - NATIONAL_DEX_GOLDEEN, // SPECIES_GOLDEEN - NATIONAL_DEX_SEAKING, // SPECIES_SEAKING - NATIONAL_DEX_STARYU, // SPECIES_STARYU - NATIONAL_DEX_STARMIE, // SPECIES_STARMIE - NATIONAL_DEX_MR_MIME, // SPECIES_MR_MIME - NATIONAL_DEX_SCYTHER, // SPECIES_SCYTHER - NATIONAL_DEX_JYNX, // SPECIES_JYNX - NATIONAL_DEX_ELECTABUZZ, // SPECIES_ELECTABUZZ - NATIONAL_DEX_MAGMAR, // SPECIES_MAGMAR - NATIONAL_DEX_PINSIR, // SPECIES_PINSIR - NATIONAL_DEX_TAUROS, // SPECIES_TAUROS - NATIONAL_DEX_MAGIKARP, // SPECIES_MAGIKARP - NATIONAL_DEX_GYARADOS, // SPECIES_GYARADOS - NATIONAL_DEX_LAPRAS, // SPECIES_LAPRAS - NATIONAL_DEX_DITTO, // SPECIES_DITTO - NATIONAL_DEX_EEVEE, // SPECIES_EEVEE - NATIONAL_DEX_VAPOREON, // SPECIES_VAPOREON - NATIONAL_DEX_JOLTEON, // SPECIES_JOLTEON - NATIONAL_DEX_FLAREON, // SPECIES_FLAREON - NATIONAL_DEX_PORYGON, // SPECIES_PORYGON - NATIONAL_DEX_OMANYTE, // SPECIES_OMANYTE - NATIONAL_DEX_OMASTAR, // SPECIES_OMASTAR - NATIONAL_DEX_KABUTO, // SPECIES_KABUTO - NATIONAL_DEX_KABUTOPS, // SPECIES_KABUTOPS - NATIONAL_DEX_AERODACTYL, // SPECIES_AERODACTYL - NATIONAL_DEX_SNORLAX, // SPECIES_SNORLAX - NATIONAL_DEX_ARTICUNO, // SPECIES_ARTICUNO - NATIONAL_DEX_ZAPDOS, // SPECIES_ZAPDOS - NATIONAL_DEX_MOLTRES, // SPECIES_MOLTRES - NATIONAL_DEX_DRATINI, // SPECIES_DRATINI - NATIONAL_DEX_DRAGONAIR, // SPECIES_DRAGONAIR - NATIONAL_DEX_DRAGONITE, // SPECIES_DRAGONITE - NATIONAL_DEX_MEWTWO, // SPECIES_MEWTWO - NATIONAL_DEX_MEW, // SPECIES_MEW - NATIONAL_DEX_CHIKORITA, // SPECIES_CHIKORITA - NATIONAL_DEX_BAYLEEF, // SPECIES_BAYLEEF - NATIONAL_DEX_MEGANIUM, // SPECIES_MEGANIUM - NATIONAL_DEX_CYNDAQUIL, // SPECIES_CYNDAQUIL - NATIONAL_DEX_QUILAVA, // SPECIES_QUILAVA - NATIONAL_DEX_TYPHLOSION, // SPECIES_TYPHLOSION - NATIONAL_DEX_TOTODILE, // SPECIES_TOTODILE - NATIONAL_DEX_CROCONAW, // SPECIES_CROCONAW - NATIONAL_DEX_FERALIGATR, // SPECIES_FERALIGATR - NATIONAL_DEX_SENTRET, // SPECIES_SENTRET - NATIONAL_DEX_FURRET, // SPECIES_FURRET - NATIONAL_DEX_HOOTHOOT, // SPECIES_HOOTHOOT - NATIONAL_DEX_NOCTOWL, // SPECIES_NOCTOWL - NATIONAL_DEX_LEDYBA, // SPECIES_LEDYBA - NATIONAL_DEX_LEDIAN, // SPECIES_LEDIAN - NATIONAL_DEX_SPINARAK, // SPECIES_SPINARAK - NATIONAL_DEX_ARIADOS, // SPECIES_ARIADOS - NATIONAL_DEX_CROBAT, // SPECIES_CROBAT - NATIONAL_DEX_CHINCHOU, // SPECIES_CHINCHOU - NATIONAL_DEX_LANTURN, // SPECIES_LANTURN - NATIONAL_DEX_PICHU, // SPECIES_PICHU - NATIONAL_DEX_CLEFFA, // SPECIES_CLEFFA - NATIONAL_DEX_IGGLYBUFF, // SPECIES_IGGLYBUFF - NATIONAL_DEX_TOGEPI, // SPECIES_TOGEPI - NATIONAL_DEX_TOGETIC, // SPECIES_TOGETIC - NATIONAL_DEX_NATU, // SPECIES_NATU - NATIONAL_DEX_XATU, // SPECIES_XATU - NATIONAL_DEX_MAREEP, // SPECIES_MAREEP - NATIONAL_DEX_FLAAFFY, // SPECIES_FLAAFFY - NATIONAL_DEX_AMPHAROS, // SPECIES_AMPHAROS - NATIONAL_DEX_BELLOSSOM, // SPECIES_BELLOSSOM - NATIONAL_DEX_MARILL, // SPECIES_MARILL - NATIONAL_DEX_AZUMARILL, // SPECIES_AZUMARILL - NATIONAL_DEX_SUDOWOODO, // SPECIES_SUDOWOODO - NATIONAL_DEX_POLITOED, // SPECIES_POLITOED - NATIONAL_DEX_HOPPIP, // SPECIES_HOPPIP - NATIONAL_DEX_SKIPLOOM, // SPECIES_SKIPLOOM - NATIONAL_DEX_JUMPLUFF, // SPECIES_JUMPLUFF - NATIONAL_DEX_AIPOM, // SPECIES_AIPOM - NATIONAL_DEX_SUNKERN, // SPECIES_SUNKERN - NATIONAL_DEX_SUNFLORA, // SPECIES_SUNFLORA - NATIONAL_DEX_YANMA, // SPECIES_YANMA - NATIONAL_DEX_WOOPER, // SPECIES_WOOPER - NATIONAL_DEX_QUAGSIRE, // SPECIES_QUAGSIRE - NATIONAL_DEX_ESPEON, // SPECIES_ESPEON - NATIONAL_DEX_UMBREON, // SPECIES_UMBREON - NATIONAL_DEX_MURKROW, // SPECIES_MURKROW - NATIONAL_DEX_SLOWKING, // SPECIES_SLOWKING - NATIONAL_DEX_MISDREAVUS, // SPECIES_MISDREAVUS - NATIONAL_DEX_UNOWN, // SPECIES_UNOWN - NATIONAL_DEX_WOBBUFFET, // SPECIES_WOBBUFFET - NATIONAL_DEX_GIRAFARIG, // SPECIES_GIRAFARIG - NATIONAL_DEX_PINECO, // SPECIES_PINECO - NATIONAL_DEX_FORRETRESS, // SPECIES_FORRETRESS - NATIONAL_DEX_DUNSPARCE, // SPECIES_DUNSPARCE - NATIONAL_DEX_GLIGAR, // SPECIES_GLIGAR - NATIONAL_DEX_STEELIX, // SPECIES_STEELIX - NATIONAL_DEX_SNUBBULL, // SPECIES_SNUBBULL - NATIONAL_DEX_GRANBULL, // SPECIES_GRANBULL - NATIONAL_DEX_QWILFISH, // SPECIES_QWILFISH - NATIONAL_DEX_SCIZOR, // SPECIES_SCIZOR - NATIONAL_DEX_SHUCKLE, // SPECIES_SHUCKLE - NATIONAL_DEX_HERACROSS, // SPECIES_HERACROSS - NATIONAL_DEX_SNEASEL, // SPECIES_SNEASEL - NATIONAL_DEX_TEDDIURSA, // SPECIES_TEDDIURSA - NATIONAL_DEX_URSARING, // SPECIES_URSARING - NATIONAL_DEX_SLUGMA, // SPECIES_SLUGMA - NATIONAL_DEX_MAGCARGO, // SPECIES_MAGCARGO - NATIONAL_DEX_SWINUB, // SPECIES_SWINUB - NATIONAL_DEX_PILOSWINE, // SPECIES_PILOSWINE - NATIONAL_DEX_CORSOLA, // SPECIES_CORSOLA - NATIONAL_DEX_REMORAID, // SPECIES_REMORAID - NATIONAL_DEX_OCTILLERY, // SPECIES_OCTILLERY - NATIONAL_DEX_DELIBIRD, // SPECIES_DELIBIRD - NATIONAL_DEX_MANTINE, // SPECIES_MANTINE - NATIONAL_DEX_SKARMORY, // SPECIES_SKARMORY - NATIONAL_DEX_HOUNDOUR, // SPECIES_HOUNDOUR - NATIONAL_DEX_HOUNDOOM, // SPECIES_HOUNDOOM - NATIONAL_DEX_KINGDRA, // SPECIES_KINGDRA - NATIONAL_DEX_PHANPY, // SPECIES_PHANPY - NATIONAL_DEX_DONPHAN, // SPECIES_DONPHAN - NATIONAL_DEX_PORYGON2, // SPECIES_PORYGON2 - NATIONAL_DEX_STANTLER, // SPECIES_STANTLER - NATIONAL_DEX_SMEARGLE, // SPECIES_SMEARGLE - NATIONAL_DEX_TYROGUE, // SPECIES_TYROGUE - NATIONAL_DEX_HITMONTOP, // SPECIES_HITMONTOP - NATIONAL_DEX_SMOOCHUM, // SPECIES_SMOOCHUM - NATIONAL_DEX_ELEKID, // SPECIES_ELEKID - NATIONAL_DEX_MAGBY, // SPECIES_MAGBY - NATIONAL_DEX_MILTANK, // SPECIES_MILTANK - NATIONAL_DEX_BLISSEY, // SPECIES_BLISSEY - NATIONAL_DEX_RAIKOU, // SPECIES_RAIKOU - NATIONAL_DEX_ENTEI, // SPECIES_ENTEI - NATIONAL_DEX_SUICUNE, // SPECIES_SUICUNE - NATIONAL_DEX_LARVITAR, // SPECIES_LARVITAR - NATIONAL_DEX_PUPITAR, // SPECIES_PUPITAR - NATIONAL_DEX_TYRANITAR, // SPECIES_TYRANITAR - NATIONAL_DEX_LUGIA, // SPECIES_LUGIA - NATIONAL_DEX_HO_OH, // SPECIES_HO-OH - NATIONAL_DEX_CELEBI, // SPECIES_CELEBI - NATIONAL_DEX_OLD_UNOWN_B, // SPECIES_OLD_UNOWN_B - NATIONAL_DEX_OLD_UNOWN_C, // SPECIES_OLD_UNOWN_C - NATIONAL_DEX_OLD_UNOWN_D, // SPECIES_OLD_UNOWN_D - NATIONAL_DEX_OLD_UNOWN_E, // SPECIES_OLD_UNOWN_E - NATIONAL_DEX_OLD_UNOWN_F, // SPECIES_OLD_UNOWN_F - NATIONAL_DEX_OLD_UNOWN_G, // SPECIES_OLD_UNOWN_G - NATIONAL_DEX_OLD_UNOWN_H, // SPECIES_OLD_UNOWN_H - NATIONAL_DEX_OLD_UNOWN_I, // SPECIES_OLD_UNOWN_I - NATIONAL_DEX_OLD_UNOWN_J, // SPECIES_OLD_UNOWN_J - NATIONAL_DEX_OLD_UNOWN_K, // SPECIES_OLD_UNOWN_K - NATIONAL_DEX_OLD_UNOWN_L, // SPECIES_OLD_UNOWN_L - NATIONAL_DEX_OLD_UNOWN_M, // SPECIES_OLD_UNOWN_M - NATIONAL_DEX_OLD_UNOWN_N, // SPECIES_OLD_UNOWN_N - NATIONAL_DEX_OLD_UNOWN_O, // SPECIES_OLD_UNOWN_O - NATIONAL_DEX_OLD_UNOWN_P, // SPECIES_OLD_UNOWN_P - NATIONAL_DEX_OLD_UNOWN_Q, // SPECIES_OLD_UNOWN_Q - NATIONAL_DEX_OLD_UNOWN_R, // SPECIES_OLD_UNOWN_R - NATIONAL_DEX_OLD_UNOWN_S, // SPECIES_OLD_UNOWN_S - NATIONAL_DEX_OLD_UNOWN_T, // SPECIES_OLD_UNOWN_T - NATIONAL_DEX_OLD_UNOWN_U, // SPECIES_OLD_UNOWN_U - NATIONAL_DEX_OLD_UNOWN_V, // SPECIES_OLD_UNOWN_V - NATIONAL_DEX_OLD_UNOWN_W, // SPECIES_OLD_UNOWN_W - NATIONAL_DEX_OLD_UNOWN_X, // SPECIES_OLD_UNOWN_X - NATIONAL_DEX_OLD_UNOWN_Y, // SPECIES_OLD_UNOWN_Y - NATIONAL_DEX_OLD_UNOWN_Z, // SPECIES_OLD_UNOWN_Z - NATIONAL_DEX_TREECKO, // SPECIES_TREECKO - NATIONAL_DEX_GROVYLE, // SPECIES_GROVYLE - NATIONAL_DEX_SCEPTILE, // SPECIES_SCEPTILE - NATIONAL_DEX_TORCHIC, // SPECIES_TORCHIC - NATIONAL_DEX_COMBUSKEN, // SPECIES_COMBUSKEN - NATIONAL_DEX_BLAZIKEN, // SPECIES_BLAZIKEN - NATIONAL_DEX_MUDKIP, // SPECIES_MUDKIP - NATIONAL_DEX_MARSHTOMP, // SPECIES_MARSHTOMP - NATIONAL_DEX_SWAMPERT, // SPECIES_SWAMPERT - NATIONAL_DEX_POOCHYENA, // SPECIES_POOCHYENA - NATIONAL_DEX_MIGHTYENA, // SPECIES_MIGHTYENA - NATIONAL_DEX_ZIGZAGOON, // SPECIES_ZIGZAGOON - NATIONAL_DEX_LINOONE, // SPECIES_LINOONE - NATIONAL_DEX_WURMPLE, // SPECIES_WURMPLE - NATIONAL_DEX_SILCOON, // SPECIES_SILCOON - NATIONAL_DEX_BEAUTIFLY, // SPECIES_BEAUTIFLY - NATIONAL_DEX_CASCOON, // SPECIES_CASCOON - NATIONAL_DEX_DUSTOX, // SPECIES_DUSTOX - NATIONAL_DEX_LOTAD, // SPECIES_LOTAD - NATIONAL_DEX_LOMBRE, // SPECIES_LOMBRE - NATIONAL_DEX_LUDICOLO, // SPECIES_LUDICOLO - NATIONAL_DEX_SEEDOT, // SPECIES_SEEDOT - NATIONAL_DEX_NUZLEAF, // SPECIES_NUZLEAF - NATIONAL_DEX_SHIFTRY, // SPECIES_SHIFTRY - NATIONAL_DEX_NINCADA, // SPECIES_NINCADA - NATIONAL_DEX_NINJASK, // SPECIES_NINJASK - NATIONAL_DEX_SHEDINJA, // SPECIES_SHEDINJA - NATIONAL_DEX_TAILLOW, // SPECIES_TAILLOW - NATIONAL_DEX_SWELLOW, // SPECIES_SWELLOW - NATIONAL_DEX_SHROOMISH, // SPECIES_SHROOMISH - NATIONAL_DEX_BRELOOM, // SPECIES_BRELOOM - NATIONAL_DEX_SPINDA, // SPECIES_SPINDA - NATIONAL_DEX_WINGULL, // SPECIES_WINGULL - NATIONAL_DEX_PELIPPER, // SPECIES_PELIPPER - NATIONAL_DEX_SURSKIT, // SPECIES_SURSKIT - NATIONAL_DEX_MASQUERAIN, // SPECIES_MASQUERAIN - NATIONAL_DEX_WAILMER, // SPECIES_WAILMER - NATIONAL_DEX_WAILORD, // SPECIES_WAILORD - NATIONAL_DEX_SKITTY, // SPECIES_SKITTY - NATIONAL_DEX_DELCATTY, // SPECIES_DELCATTY - NATIONAL_DEX_KECLEON, // SPECIES_KECLEON - NATIONAL_DEX_BALTOY, // SPECIES_BALTOY - NATIONAL_DEX_CLAYDOL, // SPECIES_CLAYDOL - NATIONAL_DEX_NOSEPASS, // SPECIES_NOSEPASS - NATIONAL_DEX_TORKOAL, // SPECIES_TORKOAL - NATIONAL_DEX_SABLEYE, // SPECIES_SABLEYE - NATIONAL_DEX_BARBOACH, // SPECIES_BARBOACH - NATIONAL_DEX_WHISCASH, // SPECIES_WHISCASH - NATIONAL_DEX_LUVDISC, // SPECIES_LUVDISC - NATIONAL_DEX_CORPHISH, // SPECIES_CORPHISH - NATIONAL_DEX_CRAWDAUNT, // SPECIES_CRAWDAUNT - NATIONAL_DEX_FEEBAS, // SPECIES_FEEBAS - NATIONAL_DEX_MILOTIC, // SPECIES_MILOTIC - NATIONAL_DEX_CARVANHA, // SPECIES_CARVANHA - NATIONAL_DEX_SHARPEDO, // SPECIES_SHARPEDO - NATIONAL_DEX_TRAPINCH, // SPECIES_TRAPINCH - NATIONAL_DEX_VIBRAVA, // SPECIES_VIBRAVA - NATIONAL_DEX_FLYGON, // SPECIES_FLYGON - NATIONAL_DEX_MAKUHITA, // SPECIES_MAKUHITA - NATIONAL_DEX_HARIYAMA, // SPECIES_HARIYAMA - NATIONAL_DEX_ELECTRIKE, // SPECIES_ELECTRIKE - NATIONAL_DEX_MANECTRIC, // SPECIES_MANECTRIC - NATIONAL_DEX_NUMEL, // SPECIES_NUMEL - NATIONAL_DEX_CAMERUPT, // SPECIES_CAMERUPT - NATIONAL_DEX_SPHEAL, // SPECIES_SPHEAL - NATIONAL_DEX_SEALEO, // SPECIES_SEALEO - NATIONAL_DEX_WALREIN, // SPECIES_WALREIN - NATIONAL_DEX_CACNEA, // SPECIES_CACNEA - NATIONAL_DEX_CACTURNE, // SPECIES_CACTURNE - NATIONAL_DEX_SNORUNT, // SPECIES_SNORUNT - NATIONAL_DEX_GLALIE, // SPECIES_GLALIE - NATIONAL_DEX_LUNATONE, // SPECIES_LUNATONE - NATIONAL_DEX_SOLROCK, // SPECIES_SOLROCK - NATIONAL_DEX_AZURILL, // SPECIES_AZURILL - NATIONAL_DEX_SPOINK, // SPECIES_SPOINK - NATIONAL_DEX_GRUMPIG, // SPECIES_GRUMPIG - NATIONAL_DEX_PLUSLE, // SPECIES_PLUSLE - NATIONAL_DEX_MINUN, // SPECIES_MINUN - NATIONAL_DEX_MAWILE, // SPECIES_MAWILE - NATIONAL_DEX_MEDITITE, // SPECIES_MEDITITE - NATIONAL_DEX_MEDICHAM, // SPECIES_MEDICHAM - NATIONAL_DEX_SWABLU, // SPECIES_SWABLU - NATIONAL_DEX_ALTARIA, // SPECIES_ALTARIA - NATIONAL_DEX_WYNAUT, // SPECIES_WYNAUT - NATIONAL_DEX_DUSKULL, // SPECIES_DUSKULL - NATIONAL_DEX_DUSCLOPS, // SPECIES_DUSCLOPS - NATIONAL_DEX_ROSELIA, // SPECIES_ROSELIA - NATIONAL_DEX_SLAKOTH, // SPECIES_SLAKOTH - NATIONAL_DEX_VIGOROTH, // SPECIES_VIGOROTH - NATIONAL_DEX_SLAKING, // SPECIES_SLAKING - NATIONAL_DEX_GULPIN, // SPECIES_GULPIN - NATIONAL_DEX_SWALOT, // SPECIES_SWALOT - NATIONAL_DEX_TROPIUS, // SPECIES_TROPIUS - NATIONAL_DEX_WHISMUR, // SPECIES_WHISMUR - NATIONAL_DEX_LOUDRED, // SPECIES_LOUDRED - NATIONAL_DEX_EXPLOUD, // SPECIES_EXPLOUD - NATIONAL_DEX_CLAMPERL, // SPECIES_CLAMPERL - NATIONAL_DEX_HUNTAIL, // SPECIES_HUNTAIL - NATIONAL_DEX_GOREBYSS, // SPECIES_GOREBYSS - NATIONAL_DEX_ABSOL, // SPECIES_ABSOL - NATIONAL_DEX_SHUPPET, // SPECIES_SHUPPET - NATIONAL_DEX_BANETTE, // SPECIES_BANETTE - NATIONAL_DEX_SEVIPER, // SPECIES_SEVIPER - NATIONAL_DEX_ZANGOOSE, // SPECIES_ZANGOOSE - NATIONAL_DEX_RELICANTH, // SPECIES_RELICANTH - NATIONAL_DEX_ARON, // SPECIES_ARON - NATIONAL_DEX_LAIRON, // SPECIES_LAIRON - NATIONAL_DEX_AGGRON, // SPECIES_AGGRON - NATIONAL_DEX_CASTFORM, // SPECIES_CASTFORM - NATIONAL_DEX_VOLBEAT, // SPECIES_VOLBEAT - NATIONAL_DEX_ILLUMISE, // SPECIES_ILLUMISE - NATIONAL_DEX_LILEEP, // SPECIES_LILEEP - NATIONAL_DEX_CRADILY, // SPECIES_CRADILY - NATIONAL_DEX_ANORITH, // SPECIES_ANORITH - NATIONAL_DEX_ARMALDO, // SPECIES_ARMALDO - NATIONAL_DEX_RALTS, // SPECIES_RALTS - NATIONAL_DEX_KIRLIA, // SPECIES_KIRLIA - NATIONAL_DEX_GARDEVOIR, // SPECIES_GARDEVOIR - NATIONAL_DEX_BAGON, // SPECIES_BAGON - NATIONAL_DEX_SHELGON, // SPECIES_SHELGON - NATIONAL_DEX_SALAMENCE, // SPECIES_SALAMENCE - NATIONAL_DEX_BELDUM, // SPECIES_BELDUM - NATIONAL_DEX_METANG, // SPECIES_METANG - NATIONAL_DEX_METAGROSS, // SPECIES_METAGROSS - NATIONAL_DEX_REGIROCK, // SPECIES_REGIROCK - NATIONAL_DEX_REGICE, // SPECIES_REGICE - NATIONAL_DEX_REGISTEEL, // SPECIES_REGISTEEL - NATIONAL_DEX_KYOGRE, // SPECIES_KYOGRE - NATIONAL_DEX_GROUDON, // SPECIES_GROUDON - NATIONAL_DEX_RAYQUAZA, // SPECIES_RAYQUAZA - NATIONAL_DEX_LATIAS, // SPECIES_LATIAS - NATIONAL_DEX_LATIOS, // SPECIES_LATIOS - NATIONAL_DEX_JIRACHI, // SPECIES_JIRACHI - NATIONAL_DEX_DEOXYS, // SPECIES_DEOXYS - NATIONAL_DEX_CHIMECHO // SPECIES_CHIMECHO + SPECIES_TO_NATIONAL(BULBASAUR), + SPECIES_TO_NATIONAL(IVYSAUR), + SPECIES_TO_NATIONAL(VENUSAUR), + SPECIES_TO_NATIONAL(CHARMANDER), + SPECIES_TO_NATIONAL(CHARMELEON), + SPECIES_TO_NATIONAL(CHARIZARD), + SPECIES_TO_NATIONAL(SQUIRTLE), + SPECIES_TO_NATIONAL(WARTORTLE), + SPECIES_TO_NATIONAL(BLASTOISE), + SPECIES_TO_NATIONAL(CATERPIE), + SPECIES_TO_NATIONAL(METAPOD), + SPECIES_TO_NATIONAL(BUTTERFREE), + SPECIES_TO_NATIONAL(WEEDLE), + SPECIES_TO_NATIONAL(KAKUNA), + SPECIES_TO_NATIONAL(BEEDRILL), + SPECIES_TO_NATIONAL(PIDGEY), + SPECIES_TO_NATIONAL(PIDGEOTTO), + SPECIES_TO_NATIONAL(PIDGEOT), + SPECIES_TO_NATIONAL(RATTATA), + SPECIES_TO_NATIONAL(RATICATE), + SPECIES_TO_NATIONAL(SPEAROW), + SPECIES_TO_NATIONAL(FEAROW), + SPECIES_TO_NATIONAL(EKANS), + SPECIES_TO_NATIONAL(ARBOK), + SPECIES_TO_NATIONAL(PIKACHU), + SPECIES_TO_NATIONAL(RAICHU), + SPECIES_TO_NATIONAL(SANDSHREW), + SPECIES_TO_NATIONAL(SANDSLASH), + SPECIES_TO_NATIONAL(NIDORAN_F), + SPECIES_TO_NATIONAL(NIDORINA), + SPECIES_TO_NATIONAL(NIDOQUEEN), + SPECIES_TO_NATIONAL(NIDORAN_M), + SPECIES_TO_NATIONAL(NIDORINO), + SPECIES_TO_NATIONAL(NIDOKING), + SPECIES_TO_NATIONAL(CLEFAIRY), + SPECIES_TO_NATIONAL(CLEFABLE), + SPECIES_TO_NATIONAL(VULPIX), + SPECIES_TO_NATIONAL(NINETALES), + SPECIES_TO_NATIONAL(JIGGLYPUFF), + SPECIES_TO_NATIONAL(WIGGLYTUFF), + SPECIES_TO_NATIONAL(ZUBAT), + SPECIES_TO_NATIONAL(GOLBAT), + SPECIES_TO_NATIONAL(ODDISH), + SPECIES_TO_NATIONAL(GLOOM), + SPECIES_TO_NATIONAL(VILEPLUME), + SPECIES_TO_NATIONAL(PARAS), + SPECIES_TO_NATIONAL(PARASECT), + SPECIES_TO_NATIONAL(VENONAT), + SPECIES_TO_NATIONAL(VENOMOTH), + SPECIES_TO_NATIONAL(DIGLETT), + SPECIES_TO_NATIONAL(DUGTRIO), + SPECIES_TO_NATIONAL(MEOWTH), + SPECIES_TO_NATIONAL(PERSIAN), + SPECIES_TO_NATIONAL(PSYDUCK), + SPECIES_TO_NATIONAL(GOLDUCK), + SPECIES_TO_NATIONAL(MANKEY), + SPECIES_TO_NATIONAL(PRIMEAPE), + SPECIES_TO_NATIONAL(GROWLITHE), + SPECIES_TO_NATIONAL(ARCANINE), + SPECIES_TO_NATIONAL(POLIWAG), + SPECIES_TO_NATIONAL(POLIWHIRL), + SPECIES_TO_NATIONAL(POLIWRATH), + SPECIES_TO_NATIONAL(ABRA), + SPECIES_TO_NATIONAL(KADABRA), + SPECIES_TO_NATIONAL(ALAKAZAM), + SPECIES_TO_NATIONAL(MACHOP), + SPECIES_TO_NATIONAL(MACHOKE), + SPECIES_TO_NATIONAL(MACHAMP), + SPECIES_TO_NATIONAL(BELLSPROUT), + SPECIES_TO_NATIONAL(WEEPINBELL), + SPECIES_TO_NATIONAL(VICTREEBEL), + SPECIES_TO_NATIONAL(TENTACOOL), + SPECIES_TO_NATIONAL(TENTACRUEL), + SPECIES_TO_NATIONAL(GEODUDE), + SPECIES_TO_NATIONAL(GRAVELER), + SPECIES_TO_NATIONAL(GOLEM), + SPECIES_TO_NATIONAL(PONYTA), + SPECIES_TO_NATIONAL(RAPIDASH), + SPECIES_TO_NATIONAL(SLOWPOKE), + SPECIES_TO_NATIONAL(SLOWBRO), + SPECIES_TO_NATIONAL(MAGNEMITE), + SPECIES_TO_NATIONAL(MAGNETON), + SPECIES_TO_NATIONAL(FARFETCHD), + SPECIES_TO_NATIONAL(DODUO), + SPECIES_TO_NATIONAL(DODRIO), + SPECIES_TO_NATIONAL(SEEL), + SPECIES_TO_NATIONAL(DEWGONG), + SPECIES_TO_NATIONAL(GRIMER), + SPECIES_TO_NATIONAL(MUK), + SPECIES_TO_NATIONAL(SHELLDER), + SPECIES_TO_NATIONAL(CLOYSTER), + SPECIES_TO_NATIONAL(GASTLY), + SPECIES_TO_NATIONAL(HAUNTER), + SPECIES_TO_NATIONAL(GENGAR), + SPECIES_TO_NATIONAL(ONIX), + SPECIES_TO_NATIONAL(DROWZEE), + SPECIES_TO_NATIONAL(HYPNO), + SPECIES_TO_NATIONAL(KRABBY), + SPECIES_TO_NATIONAL(KINGLER), + SPECIES_TO_NATIONAL(VOLTORB), + SPECIES_TO_NATIONAL(ELECTRODE), + SPECIES_TO_NATIONAL(EXEGGCUTE), + SPECIES_TO_NATIONAL(EXEGGUTOR), + SPECIES_TO_NATIONAL(CUBONE), + SPECIES_TO_NATIONAL(MAROWAK), + SPECIES_TO_NATIONAL(HITMONLEE), + SPECIES_TO_NATIONAL(HITMONCHAN), + SPECIES_TO_NATIONAL(LICKITUNG), + SPECIES_TO_NATIONAL(KOFFING), + SPECIES_TO_NATIONAL(WEEZING), + SPECIES_TO_NATIONAL(RHYHORN), + SPECIES_TO_NATIONAL(RHYDON), + SPECIES_TO_NATIONAL(CHANSEY), + SPECIES_TO_NATIONAL(TANGELA), + SPECIES_TO_NATIONAL(KANGASKHAN), + SPECIES_TO_NATIONAL(HORSEA), + SPECIES_TO_NATIONAL(SEADRA), + SPECIES_TO_NATIONAL(GOLDEEN), + SPECIES_TO_NATIONAL(SEAKING), + SPECIES_TO_NATIONAL(STARYU), + SPECIES_TO_NATIONAL(STARMIE), + SPECIES_TO_NATIONAL(MR_MIME), + SPECIES_TO_NATIONAL(SCYTHER), + SPECIES_TO_NATIONAL(JYNX), + SPECIES_TO_NATIONAL(ELECTABUZZ), + SPECIES_TO_NATIONAL(MAGMAR), + SPECIES_TO_NATIONAL(PINSIR), + SPECIES_TO_NATIONAL(TAUROS), + SPECIES_TO_NATIONAL(MAGIKARP), + SPECIES_TO_NATIONAL(GYARADOS), + SPECIES_TO_NATIONAL(LAPRAS), + SPECIES_TO_NATIONAL(DITTO), + SPECIES_TO_NATIONAL(EEVEE), + SPECIES_TO_NATIONAL(VAPOREON), + SPECIES_TO_NATIONAL(JOLTEON), + SPECIES_TO_NATIONAL(FLAREON), + SPECIES_TO_NATIONAL(PORYGON), + SPECIES_TO_NATIONAL(OMANYTE), + SPECIES_TO_NATIONAL(OMASTAR), + SPECIES_TO_NATIONAL(KABUTO), + SPECIES_TO_NATIONAL(KABUTOPS), + SPECIES_TO_NATIONAL(AERODACTYL), + SPECIES_TO_NATIONAL(SNORLAX), + SPECIES_TO_NATIONAL(ARTICUNO), + SPECIES_TO_NATIONAL(ZAPDOS), + SPECIES_TO_NATIONAL(MOLTRES), + SPECIES_TO_NATIONAL(DRATINI), + SPECIES_TO_NATIONAL(DRAGONAIR), + SPECIES_TO_NATIONAL(DRAGONITE), + SPECIES_TO_NATIONAL(MEWTWO), + SPECIES_TO_NATIONAL(MEW), + SPECIES_TO_NATIONAL(CHIKORITA), + SPECIES_TO_NATIONAL(BAYLEEF), + SPECIES_TO_NATIONAL(MEGANIUM), + SPECIES_TO_NATIONAL(CYNDAQUIL), + SPECIES_TO_NATIONAL(QUILAVA), + SPECIES_TO_NATIONAL(TYPHLOSION), + SPECIES_TO_NATIONAL(TOTODILE), + SPECIES_TO_NATIONAL(CROCONAW), + SPECIES_TO_NATIONAL(FERALIGATR), + SPECIES_TO_NATIONAL(SENTRET), + SPECIES_TO_NATIONAL(FURRET), + SPECIES_TO_NATIONAL(HOOTHOOT), + SPECIES_TO_NATIONAL(NOCTOWL), + SPECIES_TO_NATIONAL(LEDYBA), + SPECIES_TO_NATIONAL(LEDIAN), + SPECIES_TO_NATIONAL(SPINARAK), + SPECIES_TO_NATIONAL(ARIADOS), + SPECIES_TO_NATIONAL(CROBAT), + SPECIES_TO_NATIONAL(CHINCHOU), + SPECIES_TO_NATIONAL(LANTURN), + SPECIES_TO_NATIONAL(PICHU), + SPECIES_TO_NATIONAL(CLEFFA), + SPECIES_TO_NATIONAL(IGGLYBUFF), + SPECIES_TO_NATIONAL(TOGEPI), + SPECIES_TO_NATIONAL(TOGETIC), + SPECIES_TO_NATIONAL(NATU), + SPECIES_TO_NATIONAL(XATU), + SPECIES_TO_NATIONAL(MAREEP), + SPECIES_TO_NATIONAL(FLAAFFY), + SPECIES_TO_NATIONAL(AMPHAROS), + SPECIES_TO_NATIONAL(BELLOSSOM), + SPECIES_TO_NATIONAL(MARILL), + SPECIES_TO_NATIONAL(AZUMARILL), + SPECIES_TO_NATIONAL(SUDOWOODO), + SPECIES_TO_NATIONAL(POLITOED), + SPECIES_TO_NATIONAL(HOPPIP), + SPECIES_TO_NATIONAL(SKIPLOOM), + SPECIES_TO_NATIONAL(JUMPLUFF), + SPECIES_TO_NATIONAL(AIPOM), + SPECIES_TO_NATIONAL(SUNKERN), + SPECIES_TO_NATIONAL(SUNFLORA), + SPECIES_TO_NATIONAL(YANMA), + SPECIES_TO_NATIONAL(WOOPER), + SPECIES_TO_NATIONAL(QUAGSIRE), + SPECIES_TO_NATIONAL(ESPEON), + SPECIES_TO_NATIONAL(UMBREON), + SPECIES_TO_NATIONAL(MURKROW), + SPECIES_TO_NATIONAL(SLOWKING), + SPECIES_TO_NATIONAL(MISDREAVUS), + SPECIES_TO_NATIONAL(UNOWN), + SPECIES_TO_NATIONAL(WOBBUFFET), + SPECIES_TO_NATIONAL(GIRAFARIG), + SPECIES_TO_NATIONAL(PINECO), + SPECIES_TO_NATIONAL(FORRETRESS), + SPECIES_TO_NATIONAL(DUNSPARCE), + SPECIES_TO_NATIONAL(GLIGAR), + SPECIES_TO_NATIONAL(STEELIX), + SPECIES_TO_NATIONAL(SNUBBULL), + SPECIES_TO_NATIONAL(GRANBULL), + SPECIES_TO_NATIONAL(QWILFISH), + SPECIES_TO_NATIONAL(SCIZOR), + SPECIES_TO_NATIONAL(SHUCKLE), + SPECIES_TO_NATIONAL(HERACROSS), + SPECIES_TO_NATIONAL(SNEASEL), + SPECIES_TO_NATIONAL(TEDDIURSA), + SPECIES_TO_NATIONAL(URSARING), + SPECIES_TO_NATIONAL(SLUGMA), + SPECIES_TO_NATIONAL(MAGCARGO), + SPECIES_TO_NATIONAL(SWINUB), + SPECIES_TO_NATIONAL(PILOSWINE), + SPECIES_TO_NATIONAL(CORSOLA), + SPECIES_TO_NATIONAL(REMORAID), + SPECIES_TO_NATIONAL(OCTILLERY), + SPECIES_TO_NATIONAL(DELIBIRD), + SPECIES_TO_NATIONAL(MANTINE), + SPECIES_TO_NATIONAL(SKARMORY), + SPECIES_TO_NATIONAL(HOUNDOUR), + SPECIES_TO_NATIONAL(HOUNDOOM), + SPECIES_TO_NATIONAL(KINGDRA), + SPECIES_TO_NATIONAL(PHANPY), + SPECIES_TO_NATIONAL(DONPHAN), + SPECIES_TO_NATIONAL(PORYGON2), + SPECIES_TO_NATIONAL(STANTLER), + SPECIES_TO_NATIONAL(SMEARGLE), + SPECIES_TO_NATIONAL(TYROGUE), + SPECIES_TO_NATIONAL(HITMONTOP), + SPECIES_TO_NATIONAL(SMOOCHUM), + SPECIES_TO_NATIONAL(ELEKID), + SPECIES_TO_NATIONAL(MAGBY), + SPECIES_TO_NATIONAL(MILTANK), + SPECIES_TO_NATIONAL(BLISSEY), + SPECIES_TO_NATIONAL(RAIKOU), + SPECIES_TO_NATIONAL(ENTEI), + SPECIES_TO_NATIONAL(SUICUNE), + SPECIES_TO_NATIONAL(LARVITAR), + SPECIES_TO_NATIONAL(PUPITAR), + SPECIES_TO_NATIONAL(TYRANITAR), + SPECIES_TO_NATIONAL(LUGIA), + SPECIES_TO_NATIONAL(HO_OH), + SPECIES_TO_NATIONAL(CELEBI), + SPECIES_TO_NATIONAL(OLD_UNOWN_B), + SPECIES_TO_NATIONAL(OLD_UNOWN_C), + SPECIES_TO_NATIONAL(OLD_UNOWN_D), + SPECIES_TO_NATIONAL(OLD_UNOWN_E), + SPECIES_TO_NATIONAL(OLD_UNOWN_F), + SPECIES_TO_NATIONAL(OLD_UNOWN_G), + SPECIES_TO_NATIONAL(OLD_UNOWN_H), + SPECIES_TO_NATIONAL(OLD_UNOWN_I), + SPECIES_TO_NATIONAL(OLD_UNOWN_J), + SPECIES_TO_NATIONAL(OLD_UNOWN_K), + SPECIES_TO_NATIONAL(OLD_UNOWN_L), + SPECIES_TO_NATIONAL(OLD_UNOWN_M), + SPECIES_TO_NATIONAL(OLD_UNOWN_N), + SPECIES_TO_NATIONAL(OLD_UNOWN_O), + SPECIES_TO_NATIONAL(OLD_UNOWN_P), + SPECIES_TO_NATIONAL(OLD_UNOWN_Q), + SPECIES_TO_NATIONAL(OLD_UNOWN_R), + SPECIES_TO_NATIONAL(OLD_UNOWN_S), + SPECIES_TO_NATIONAL(OLD_UNOWN_T), + SPECIES_TO_NATIONAL(OLD_UNOWN_U), + SPECIES_TO_NATIONAL(OLD_UNOWN_V), + SPECIES_TO_NATIONAL(OLD_UNOWN_W), + SPECIES_TO_NATIONAL(OLD_UNOWN_X), + SPECIES_TO_NATIONAL(OLD_UNOWN_Y), + SPECIES_TO_NATIONAL(OLD_UNOWN_Z), + SPECIES_TO_NATIONAL(TREECKO), + SPECIES_TO_NATIONAL(GROVYLE), + SPECIES_TO_NATIONAL(SCEPTILE), + SPECIES_TO_NATIONAL(TORCHIC), + SPECIES_TO_NATIONAL(COMBUSKEN), + SPECIES_TO_NATIONAL(BLAZIKEN), + SPECIES_TO_NATIONAL(MUDKIP), + SPECIES_TO_NATIONAL(MARSHTOMP), + SPECIES_TO_NATIONAL(SWAMPERT), + SPECIES_TO_NATIONAL(POOCHYENA), + SPECIES_TO_NATIONAL(MIGHTYENA), + SPECIES_TO_NATIONAL(ZIGZAGOON), + SPECIES_TO_NATIONAL(LINOONE), + SPECIES_TO_NATIONAL(WURMPLE), + SPECIES_TO_NATIONAL(SILCOON), + SPECIES_TO_NATIONAL(BEAUTIFLY), + SPECIES_TO_NATIONAL(CASCOON), + SPECIES_TO_NATIONAL(DUSTOX), + SPECIES_TO_NATIONAL(LOTAD), + SPECIES_TO_NATIONAL(LOMBRE), + SPECIES_TO_NATIONAL(LUDICOLO), + SPECIES_TO_NATIONAL(SEEDOT), + SPECIES_TO_NATIONAL(NUZLEAF), + SPECIES_TO_NATIONAL(SHIFTRY), + SPECIES_TO_NATIONAL(NINCADA), + SPECIES_TO_NATIONAL(NINJASK), + SPECIES_TO_NATIONAL(SHEDINJA), + SPECIES_TO_NATIONAL(TAILLOW), + SPECIES_TO_NATIONAL(SWELLOW), + SPECIES_TO_NATIONAL(SHROOMISH), + SPECIES_TO_NATIONAL(BRELOOM), + SPECIES_TO_NATIONAL(SPINDA), + SPECIES_TO_NATIONAL(WINGULL), + SPECIES_TO_NATIONAL(PELIPPER), + SPECIES_TO_NATIONAL(SURSKIT), + SPECIES_TO_NATIONAL(MASQUERAIN), + SPECIES_TO_NATIONAL(WAILMER), + SPECIES_TO_NATIONAL(WAILORD), + SPECIES_TO_NATIONAL(SKITTY), + SPECIES_TO_NATIONAL(DELCATTY), + SPECIES_TO_NATIONAL(KECLEON), + SPECIES_TO_NATIONAL(BALTOY), + SPECIES_TO_NATIONAL(CLAYDOL), + SPECIES_TO_NATIONAL(NOSEPASS), + SPECIES_TO_NATIONAL(TORKOAL), + SPECIES_TO_NATIONAL(SABLEYE), + SPECIES_TO_NATIONAL(BARBOACH), + SPECIES_TO_NATIONAL(WHISCASH), + SPECIES_TO_NATIONAL(LUVDISC), + SPECIES_TO_NATIONAL(CORPHISH), + SPECIES_TO_NATIONAL(CRAWDAUNT), + SPECIES_TO_NATIONAL(FEEBAS), + SPECIES_TO_NATIONAL(MILOTIC), + SPECIES_TO_NATIONAL(CARVANHA), + SPECIES_TO_NATIONAL(SHARPEDO), + SPECIES_TO_NATIONAL(TRAPINCH), + SPECIES_TO_NATIONAL(VIBRAVA), + SPECIES_TO_NATIONAL(FLYGON), + SPECIES_TO_NATIONAL(MAKUHITA), + SPECIES_TO_NATIONAL(HARIYAMA), + SPECIES_TO_NATIONAL(ELECTRIKE), + SPECIES_TO_NATIONAL(MANECTRIC), + SPECIES_TO_NATIONAL(NUMEL), + SPECIES_TO_NATIONAL(CAMERUPT), + SPECIES_TO_NATIONAL(SPHEAL), + SPECIES_TO_NATIONAL(SEALEO), + SPECIES_TO_NATIONAL(WALREIN), + SPECIES_TO_NATIONAL(CACNEA), + SPECIES_TO_NATIONAL(CACTURNE), + SPECIES_TO_NATIONAL(SNORUNT), + SPECIES_TO_NATIONAL(GLALIE), + SPECIES_TO_NATIONAL(LUNATONE), + SPECIES_TO_NATIONAL(SOLROCK), + SPECIES_TO_NATIONAL(AZURILL), + SPECIES_TO_NATIONAL(SPOINK), + SPECIES_TO_NATIONAL(GRUMPIG), + SPECIES_TO_NATIONAL(PLUSLE), + SPECIES_TO_NATIONAL(MINUN), + SPECIES_TO_NATIONAL(MAWILE), + SPECIES_TO_NATIONAL(MEDITITE), + SPECIES_TO_NATIONAL(MEDICHAM), + SPECIES_TO_NATIONAL(SWABLU), + SPECIES_TO_NATIONAL(ALTARIA), + SPECIES_TO_NATIONAL(WYNAUT), + SPECIES_TO_NATIONAL(DUSKULL), + SPECIES_TO_NATIONAL(DUSCLOPS), + SPECIES_TO_NATIONAL(ROSELIA), + SPECIES_TO_NATIONAL(SLAKOTH), + SPECIES_TO_NATIONAL(VIGOROTH), + SPECIES_TO_NATIONAL(SLAKING), + SPECIES_TO_NATIONAL(GULPIN), + SPECIES_TO_NATIONAL(SWALOT), + SPECIES_TO_NATIONAL(TROPIUS), + SPECIES_TO_NATIONAL(WHISMUR), + SPECIES_TO_NATIONAL(LOUDRED), + SPECIES_TO_NATIONAL(EXPLOUD), + SPECIES_TO_NATIONAL(CLAMPERL), + SPECIES_TO_NATIONAL(HUNTAIL), + SPECIES_TO_NATIONAL(GOREBYSS), + SPECIES_TO_NATIONAL(ABSOL), + SPECIES_TO_NATIONAL(SHUPPET), + SPECIES_TO_NATIONAL(BANETTE), + SPECIES_TO_NATIONAL(SEVIPER), + SPECIES_TO_NATIONAL(ZANGOOSE), + SPECIES_TO_NATIONAL(RELICANTH), + SPECIES_TO_NATIONAL(ARON), + SPECIES_TO_NATIONAL(LAIRON), + SPECIES_TO_NATIONAL(AGGRON), + SPECIES_TO_NATIONAL(CASTFORM), + SPECIES_TO_NATIONAL(VOLBEAT), + SPECIES_TO_NATIONAL(ILLUMISE), + SPECIES_TO_NATIONAL(LILEEP), + SPECIES_TO_NATIONAL(CRADILY), + SPECIES_TO_NATIONAL(ANORITH), + SPECIES_TO_NATIONAL(ARMALDO), + SPECIES_TO_NATIONAL(RALTS), + SPECIES_TO_NATIONAL(KIRLIA), + SPECIES_TO_NATIONAL(GARDEVOIR), + SPECIES_TO_NATIONAL(BAGON), + SPECIES_TO_NATIONAL(SHELGON), + SPECIES_TO_NATIONAL(SALAMENCE), + SPECIES_TO_NATIONAL(BELDUM), + SPECIES_TO_NATIONAL(METANG), + SPECIES_TO_NATIONAL(METAGROSS), + SPECIES_TO_NATIONAL(REGIROCK), + SPECIES_TO_NATIONAL(REGICE), + SPECIES_TO_NATIONAL(REGISTEEL), + SPECIES_TO_NATIONAL(KYOGRE), + SPECIES_TO_NATIONAL(GROUDON), + SPECIES_TO_NATIONAL(RAYQUAZA), + SPECIES_TO_NATIONAL(LATIAS), + SPECIES_TO_NATIONAL(LATIOS), + SPECIES_TO_NATIONAL(JIRACHI), + SPECIES_TO_NATIONAL(DEOXYS), + SPECIES_TO_NATIONAL(CHIMECHO), }; -const u16 gHoennToNationalOrder[] = // Assigns Hoenn Dex Pokémon (Using National Dex Index) -{ - // 0 - NATIONAL_DEX_TREECKO, // HOENN_DEX_TREECKO - NATIONAL_DEX_GROVYLE, // HOENN_DEX_GROVYLE - NATIONAL_DEX_SCEPTILE, // HOENN_DEX_SCEPTILE - NATIONAL_DEX_TORCHIC, // HOENN_DEX_TORCHIC - NATIONAL_DEX_COMBUSKEN, // HOENN_DEX_COMBUSKEN - NATIONAL_DEX_BLAZIKEN, // HOENN_DEX_BLAZIKEN - NATIONAL_DEX_MUDKIP, // HOENN_DEX_MUDKIP - NATIONAL_DEX_MARSHTOMP, // HOENN_DEX_MARSHTOMP - NATIONAL_DEX_SWAMPERT, // HOENN_DEX_SWAMPERT - NATIONAL_DEX_POOCHYENA, // HOENN_DEX_POOCHYENA - NATIONAL_DEX_MIGHTYENA, // HOENN_DEX_MIGHTYENA - NATIONAL_DEX_ZIGZAGOON, // HOENN_DEX_ZIGZAGOON - NATIONAL_DEX_LINOONE, // HOENN_DEX_LINOONE - NATIONAL_DEX_WURMPLE, // HOENN_DEX_WURMPLE - NATIONAL_DEX_SILCOON, // HOENN_DEX_SILCOON - NATIONAL_DEX_BEAUTIFLY, // HOENN_DEX_BEAUTIFLY - NATIONAL_DEX_CASCOON, // HOENN_DEX_CASCOON - NATIONAL_DEX_DUSTOX, // HOENN_DEX_DUSTOX - NATIONAL_DEX_LOTAD, // HOENN_DEX_LOTAD - NATIONAL_DEX_LOMBRE, // HOENN_DEX_LOMBRE - NATIONAL_DEX_LUDICOLO, // HOENN_DEX_LUDICOLO - NATIONAL_DEX_SEEDOT, // HOENN_DEX_SEEDOT - NATIONAL_DEX_NUZLEAF, // HOENN_DEX_NUZLEAF - NATIONAL_DEX_SHIFTRY, // HOENN_DEX_SHIFTRY - NATIONAL_DEX_TAILLOW, // HOENN_DEX_TAILLOW - NATIONAL_DEX_SWELLOW, // HOENN_DEX_SWELLOW - NATIONAL_DEX_WINGULL, // HOENN_DEX_WINGULL - NATIONAL_DEX_PELIPPER, // HOENN_DEX_PELIPPER - NATIONAL_DEX_RALTS, // HOENN_DEX_RALTS - NATIONAL_DEX_KIRLIA, // HOENN_DEX_KIRLIA - NATIONAL_DEX_GARDEVOIR, // HOENN_DEX_GARDEVOIR - NATIONAL_DEX_SURSKIT, // HOENN_DEX_SURSKIT - NATIONAL_DEX_MASQUERAIN, // HOENN_DEX_MASQUERAIN - NATIONAL_DEX_SHROOMISH, // HOENN_DEX_SHROOMISH - NATIONAL_DEX_BRELOOM, // HOENN_DEX_BRELOOM - NATIONAL_DEX_SLAKOTH, // HOENN_DEX_SLAKOTH - NATIONAL_DEX_VIGOROTH, // HOENN_DEX_VIGOROTH - NATIONAL_DEX_SLAKING, // HOENN_DEX_SLAKING - NATIONAL_DEX_ABRA, // HOENN_DEX_ABRA - NATIONAL_DEX_KADABRA, // HOENN_DEX_KADABRA - NATIONAL_DEX_ALAKAZAM, // HOENN_DEX_ALAKAZAM - NATIONAL_DEX_NINCADA, // HOENN_DEX_NINCADA - NATIONAL_DEX_NINJASK, // HOENN_DEX_NINJASK - NATIONAL_DEX_SHEDINJA, // HOENN_DEX_SHEDINJA - NATIONAL_DEX_WHISMUR, // HOENN_DEX_WHISMUR - NATIONAL_DEX_LOUDRED, // HOENN_DEX_LOUDRED - NATIONAL_DEX_EXPLOUD, // HOENN_DEX_EXPLOUD - NATIONAL_DEX_MAKUHITA, // HOENN_DEX_MAKUHITA - NATIONAL_DEX_HARIYAMA, // HOENN_DEX_HARIYAMA - NATIONAL_DEX_GOLDEEN, // HOENN_DEX_GOLDEEN - NATIONAL_DEX_SEAKING, // HOENN_DEX_SEAKING - NATIONAL_DEX_MAGIKARP, // HOENN_DEX_MAGIKARP - NATIONAL_DEX_GYARADOS, // HOENN_DEX_GYARADOS - NATIONAL_DEX_AZURILL, // HOENN_DEX_AZURILL - NATIONAL_DEX_MARILL, // HOENN_DEX_MARILL - NATIONAL_DEX_AZUMARILL, // HOENN_DEX_AZUMARILL - NATIONAL_DEX_GEODUDE, // HOENN_DEX_GEODUDE - NATIONAL_DEX_GRAVELER, // HOENN_DEX_GRAVELER - NATIONAL_DEX_GOLEM, // HOENN_DEX_GOLEM - NATIONAL_DEX_NOSEPASS, // HOENN_DEX_NOSEPASS - NATIONAL_DEX_SKITTY, // HOENN_DEX_SKITTY - NATIONAL_DEX_DELCATTY, // HOENN_DEX_DELCATTY - NATIONAL_DEX_ZUBAT, // HOENN_DEX_ZUBAT - NATIONAL_DEX_GOLBAT, // HOENN_DEX_GOLBAT - NATIONAL_DEX_CROBAT, // HOENN_DEX_CROBAT - NATIONAL_DEX_TENTACOOL, // HOENN_DEX_TENTACOOL - NATIONAL_DEX_TENTACRUEL, // HOENN_DEX_TENTACRUEL - NATIONAL_DEX_SABLEYE, // HOENN_DEX_SABLEYE - NATIONAL_DEX_MAWILE, // HOENN_DEX_MAWILE - NATIONAL_DEX_ARON, // HOENN_DEX_ARON - NATIONAL_DEX_LAIRON, // HOENN_DEX_LAIRON - NATIONAL_DEX_AGGRON, // HOENN_DEX_AGGRON - NATIONAL_DEX_MACHOP, // HOENN_DEX_MACHOP - NATIONAL_DEX_MACHOKE, // HOENN_DEX_MACHOKE - NATIONAL_DEX_MACHAMP, // HOENN_DEX_MACHAMP - NATIONAL_DEX_MEDITITE, // HOENN_DEX_MEDITITE - NATIONAL_DEX_MEDICHAM, // HOENN_DEX_MEDICHAM - NATIONAL_DEX_ELECTRIKE, // HOENN_DEX_ELECTRIKE - NATIONAL_DEX_MANECTRIC, // HOENN_DEX_MANECTRIC - NATIONAL_DEX_PLUSLE, // HOENN_DEX_PLUSLE - NATIONAL_DEX_MINUN, // HOENN_DEX_MINUN - NATIONAL_DEX_MAGNEMITE, // HOENN_DEX_MAGNEMITE - NATIONAL_DEX_MAGNETON, // HOENN_DEX_MAGNETON - NATIONAL_DEX_VOLTORB, // HOENN_DEX_VOLTORB - NATIONAL_DEX_ELECTRODE, // HOENN_DEX_ELECTRODE - NATIONAL_DEX_VOLBEAT, // HOENN_DEX_VOLBEAT - NATIONAL_DEX_ILLUMISE, // HOENN_DEX_ILLUMISE - NATIONAL_DEX_ODDISH, // HOENN_DEX_ODDISH - NATIONAL_DEX_GLOOM, // HOENN_DEX_GLOOM - NATIONAL_DEX_VILEPLUME, // HOENN_DEX_VILEPLUME - NATIONAL_DEX_BELLOSSOM, // HOENN_DEX_BELLOSSOM - NATIONAL_DEX_DODUO, // HOENN_DEX_DODUO - NATIONAL_DEX_DODRIO, // HOENN_DEX_DODRIO - NATIONAL_DEX_ROSELIA, // HOENN_DEX_ROSELIA - NATIONAL_DEX_GULPIN, // HOENN_DEX_GULPIN - NATIONAL_DEX_SWALOT, // HOENN_DEX_SWALOT - NATIONAL_DEX_CARVANHA, // HOENN_DEX_CARVANHA - NATIONAL_DEX_SHARPEDO, // HOENN_DEX_SHARPEDO - NATIONAL_DEX_WAILMER, // HOENN_DEX_WAILMER - NATIONAL_DEX_WAILORD, // HOENN_DEX_WAILORD - NATIONAL_DEX_NUMEL, // HOENN_DEX_NUMEL - NATIONAL_DEX_CAMERUPT, // HOENN_DEX_CAMERUPT - NATIONAL_DEX_SLUGMA, // HOENN_DEX_SLUGMA - NATIONAL_DEX_MAGCARGO, // HOENN_DEX_MAGCARGO - NATIONAL_DEX_TORKOAL, // HOENN_DEX_TORKOAL - NATIONAL_DEX_GRIMER, // HOENN_DEX_GRIMER - NATIONAL_DEX_MUK, // HOENN_DEX_MUK - NATIONAL_DEX_KOFFING, // HOENN_DEX_KOFFING - NATIONAL_DEX_WEEZING, // HOENN_DEX_WEEZING - NATIONAL_DEX_SPOINK, // HOENN_DEX_SPOINK - NATIONAL_DEX_GRUMPIG, // HOENN_DEX_GRUMPIG - NATIONAL_DEX_SANDSHREW, // HOENN_DEX_SANDSHREW - NATIONAL_DEX_SANDSLASH, // HOENN_DEX_SANDSLASH - NATIONAL_DEX_SPINDA, // HOENN_DEX_SPINDA - NATIONAL_DEX_SKARMORY, // HOENN_DEX_SKARMORY - NATIONAL_DEX_TRAPINCH, // HOENN_DEX_TRAPINCH - NATIONAL_DEX_VIBRAVA, // HOENN_DEX_VIBRAVA - NATIONAL_DEX_FLYGON, // HOENN_DEX_FLYGON - NATIONAL_DEX_CACNEA, // HOENN_DEX_CACNEA - NATIONAL_DEX_CACTURNE, // HOENN_DEX_CACTURNE - NATIONAL_DEX_SWABLU, // HOENN_DEX_SWABLU - NATIONAL_DEX_ALTARIA, // HOENN_DEX_ALTARIA - NATIONAL_DEX_ZANGOOSE, // HOENN_DEX_ZANGOOSE - NATIONAL_DEX_SEVIPER, // HOENN_DEX_SEVIPER - NATIONAL_DEX_LUNATONE, // HOENN_DEX_LUNATONE - NATIONAL_DEX_SOLROCK, // HOENN_DEX_SOLROCK - NATIONAL_DEX_BARBOACH, // HOENN_DEX_BARBOACH - NATIONAL_DEX_WHISCASH, // HOENN_DEX_WHISCASH - NATIONAL_DEX_CORPHISH, // HOENN_DEX_CORPHISH - NATIONAL_DEX_CRAWDAUNT, // HOENN_DEX_CRAWDAUNT - NATIONAL_DEX_BALTOY, // HOENN_DEX_BALTOY - NATIONAL_DEX_CLAYDOL, // HOENN_DEX_CLAYDOL - NATIONAL_DEX_LILEEP, // HOENN_DEX_LILEEP - NATIONAL_DEX_CRADILY, // HOENN_DEX_CRADILY - NATIONAL_DEX_ANORITH, // HOENN_DEX_ANORITH - NATIONAL_DEX_ARMALDO, // HOENN_DEX_ARMALDO - NATIONAL_DEX_IGGLYBUFF, // HOENN_DEX_IGGLYBUFF - NATIONAL_DEX_JIGGLYPUFF, // HOENN_DEX_JIGGLYPUFF - NATIONAL_DEX_WIGGLYTUFF, // HOENN_DEX_WIGGLYTUFF - NATIONAL_DEX_FEEBAS, // HOENN_DEX_FEEBAS - NATIONAL_DEX_MILOTIC, // HOENN_DEX_MILOTIC - NATIONAL_DEX_CASTFORM, // HOENN_DEX_CASTFORM - NATIONAL_DEX_STARYU, // HOENN_DEX_STARYU - NATIONAL_DEX_STARMIE, // HOENN_DEX_STARMIE - NATIONAL_DEX_KECLEON, // HOENN_DEX_KECLEON - NATIONAL_DEX_SHUPPET, // HOENN_DEX_SHUPPET - NATIONAL_DEX_BANETTE, // HOENN_DEX_BANETTE - NATIONAL_DEX_DUSKULL, // HOENN_DEX_DUSKULL - NATIONAL_DEX_DUSCLOPS, // HOENN_DEX_DUSCLOPS - NATIONAL_DEX_TROPIUS, // HOENN_DEX_TROPIUS - NATIONAL_DEX_CHIMECHO, // HOENN_DEX_CHIMECHO - NATIONAL_DEX_ABSOL, // HOENN_DEX_ABSOL - NATIONAL_DEX_VULPIX, // HOENN_DEX_VULPIX - NATIONAL_DEX_NINETALES, // HOENN_DEX_NINETALES - NATIONAL_DEX_PICHU, // HOENN_DEX_PICHU - NATIONAL_DEX_PIKACHU, // HOENN_DEX_PIKACHU - NATIONAL_DEX_RAICHU, // HOENN_DEX_RAICHU - NATIONAL_DEX_PSYDUCK, // HOENN_DEX_PSYDUCK - NATIONAL_DEX_GOLDUCK, // HOENN_DEX_GOLDUCK - NATIONAL_DEX_WYNAUT, // HOENN_DEX_WYNAUT - NATIONAL_DEX_WOBBUFFET, // HOENN_DEX_WOBBUFFET - NATIONAL_DEX_NATU, // HOENN_DEX_NATU - NATIONAL_DEX_XATU, // HOENN_DEX_XATU - NATIONAL_DEX_GIRAFARIG, // HOENN_DEX_GIRAFARIG - NATIONAL_DEX_PHANPY, // HOENN_DEX_PHANPY - NATIONAL_DEX_DONPHAN, // HOENN_DEX_DONPHAN - NATIONAL_DEX_PINSIR, // HOENN_DEX_PINSIR - NATIONAL_DEX_HERACROSS, // HOENN_DEX_HERACROSS - NATIONAL_DEX_RHYHORN, // HOENN_DEX_RHYHORN - NATIONAL_DEX_RHYDON, // HOENN_DEX_RHYDON - NATIONAL_DEX_SNORUNT, // HOENN_DEX_SNORUNT - NATIONAL_DEX_GLALIE, // HOENN_DEX_GLALIE - NATIONAL_DEX_SPHEAL, // HOENN_DEX_SPHEAL - NATIONAL_DEX_SEALEO, // HOENN_DEX_SEALEO - NATIONAL_DEX_WALREIN, // HOENN_DEX_WALREIN - NATIONAL_DEX_CLAMPERL, // HOENN_DEX_CLAMPERL - NATIONAL_DEX_HUNTAIL, // HOENN_DEX_HUNTAIL - NATIONAL_DEX_GOREBYSS, // HOENN_DEX_GOREBYSS - NATIONAL_DEX_RELICANTH, // HOENN_DEX_RELICANTH - NATIONAL_DEX_CORSOLA, // HOENN_DEX_CORSOLA - NATIONAL_DEX_CHINCHOU, // HOENN_DEX_CHINCHOU - NATIONAL_DEX_LANTURN, // HOENN_DEX_LANTURN - NATIONAL_DEX_LUVDISC, // HOENN_DEX_LUVDISC - NATIONAL_DEX_HORSEA, // HOENN_DEX_HORSEA - NATIONAL_DEX_SEADRA, // HOENN_DEX_SEADRA - NATIONAL_DEX_KINGDRA, // HOENN_DEX_KINGDRA - NATIONAL_DEX_BAGON, // HOENN_DEX_BAGON - NATIONAL_DEX_SHELGON, // HOENN_DEX_SHELGON - NATIONAL_DEX_SALAMENCE, // HOENN_DEX_SALAMENCE - NATIONAL_DEX_BELDUM, // HOENN_DEX_BELDUM - NATIONAL_DEX_METANG, // HOENN_DEX_METANG - NATIONAL_DEX_METAGROSS, // HOENN_DEX_METAGROSS - NATIONAL_DEX_REGIROCK, // HOENN_DEX_REGIROCK - NATIONAL_DEX_REGICE, // HOENN_DEX_REGICE - NATIONAL_DEX_REGISTEEL, // HOENN_DEX_REGISTEEL - NATIONAL_DEX_LATIAS, // HOENN_DEX_LATIAS - NATIONAL_DEX_LATIOS, // HOENN_DEX_LATIOS - NATIONAL_DEX_KYOGRE, // HOENN_DEX_KYOGRE - NATIONAL_DEX_GROUDON, // HOENN_DEX_GROUDON - NATIONAL_DEX_RAYQUAZA, // HOENN_DEX_RAYQUAZA - NATIONAL_DEX_JIRACHI, // HOENN_DEX_JIRACHI - NATIONAL_DEX_DEOXYS, // HOENN_DEX_DEOXYS - NATIONAL_DEX_BULBASAUR, // HOENN_DEX_BULBASAUR - Pokémon from here onwards are UNSEEN in the Hoenn Dex. - NATIONAL_DEX_IVYSAUR, // HOENN_DEX_IVYSAUR - NATIONAL_DEX_VENUSAUR, // HOENN_DEX_VENUSAUR - NATIONAL_DEX_CHARMANDER, // HOENN_DEX_CHARMANDER - NATIONAL_DEX_CHARMELEON, // HOENN_DEX_CHARMELEON - NATIONAL_DEX_CHARIZARD, // HOENN_DEX_CHARIZARD - NATIONAL_DEX_SQUIRTLE, // HOENN_DEX_SQUIRTLE - NATIONAL_DEX_WARTORTLE, // HOENN_DEX_WARTORTLE - NATIONAL_DEX_BLASTOISE, // HOENN_DEX_BLASTOISE - NATIONAL_DEX_CATERPIE, // HOENN_DEX_CATERPIE - NATIONAL_DEX_METAPOD, // HOENN_DEX_METAPOD - NATIONAL_DEX_BUTTERFREE, // HOENN_DEX_BUTTERFREE - NATIONAL_DEX_WEEDLE, // HOENN_DEX_WEEDLE - NATIONAL_DEX_KAKUNA, // HOENN_DEX_KAKUNA - NATIONAL_DEX_BEEDRILL, // HOENN_DEX_BEEDRILL - NATIONAL_DEX_PIDGEY, // HOENN_DEX_PIDGEY - NATIONAL_DEX_PIDGEOTTO, // HOENN_DEX_PIDGEOTTO - NATIONAL_DEX_PIDGEOT, // HOENN_DEX_PIDGEOT - NATIONAL_DEX_RATTATA, // HOENN_DEX_RATTATA - NATIONAL_DEX_RATICATE, // HOENN_DEX_RATICATE - NATIONAL_DEX_SPEAROW, // HOENN_DEX_SPEAROW - NATIONAL_DEX_FEAROW, // HOENN_DEX_FEAROW - NATIONAL_DEX_EKANS, // HOENN_DEX_EKANS - NATIONAL_DEX_ARBOK, // HOENN_DEX_ARBOK - NATIONAL_DEX_NIDORAN_F, // HOENN_DEX_NIDORAN♀ - NATIONAL_DEX_NIDORINA, // HOENN_DEX_NIDORINA - NATIONAL_DEX_NIDOQUEEN, // HOENN_DEX_NIDOQUEEN - NATIONAL_DEX_NIDORAN_M, // HOENN_DEX_NIDORAN♂ - NATIONAL_DEX_NIDORINO, // HOENN_DEX_NIDORINO - NATIONAL_DEX_NIDOKING, // HOENN_DEX_NIDOKING - NATIONAL_DEX_CLEFAIRY, // HOENN_DEX_CLEFAIRY - NATIONAL_DEX_CLEFABLE, // HOENN_DEX_CLEFABLE - NATIONAL_DEX_PARAS, // HOENN_DEX_PARAS - NATIONAL_DEX_PARASECT, // HOENN_DEX_PARASECT - NATIONAL_DEX_VENONAT, // HOENN_DEX_VENONAT - NATIONAL_DEX_VENOMOTH, // HOENN_DEX_VENOMOTH - NATIONAL_DEX_DIGLETT, // HOENN_DEX_DIGLETT - NATIONAL_DEX_DUGTRIO, // HOENN_DEX_DUGTRIO - NATIONAL_DEX_MEOWTH, // HOENN_DEX_MEOWTH - NATIONAL_DEX_PERSIAN, // HOENN_DEX_PERSIAN - NATIONAL_DEX_MANKEY, // HOENN_DEX_MANKEY - NATIONAL_DEX_PRIMEAPE, // HOENN_DEX_PRIMEAPE - NATIONAL_DEX_GROWLITHE, // HOENN_DEX_GROWLITHE - NATIONAL_DEX_ARCANINE, // HOENN_DEX_ARCANINE - NATIONAL_DEX_POLIWAG, // HOENN_DEX_POLIWAG - NATIONAL_DEX_POLIWHIRL, // HOENN_DEX_POLIWHIRL - NATIONAL_DEX_POLIWRATH, // HOENN_DEX_POLIWRATH - NATIONAL_DEX_BELLSPROUT, // HOENN_DEX_BELLSPROUT - NATIONAL_DEX_WEEPINBELL, // HOENN_DEX_WEEPINBELL - NATIONAL_DEX_VICTREEBEL, // HOENN_DEX_VICTREEBEL - NATIONAL_DEX_PONYTA, // HOENN_DEX_PONYTA - NATIONAL_DEX_RAPIDASH, // HOENN_DEX_RAPIDASH - NATIONAL_DEX_SLOWPOKE, // HOENN_DEX_SLOWPOKE - NATIONAL_DEX_SLOWBRO, // HOENN_DEX_SLOWBRO - NATIONAL_DEX_FARFETCHD, // HOENN_DEX_FARFETCH'D - NATIONAL_DEX_SEEL, // HOENN_DEX_SEEL - NATIONAL_DEX_DEWGONG, // HOENN_DEX_DEWGONG - NATIONAL_DEX_SHELLDER, // HOENN_DEX_SHELLDER - NATIONAL_DEX_CLOYSTER, // HOENN_DEX_CLOYSTER - NATIONAL_DEX_GASTLY, // HOENN_DEX_GASTLY - NATIONAL_DEX_HAUNTER, // HOENN_DEX_HAUNTER - NATIONAL_DEX_GENGAR, // HOENN_DEX_GENGAR - NATIONAL_DEX_ONIX, // HOENN_DEX_ONIX - NATIONAL_DEX_DROWZEE, // HOENN_DEX_DROWZEE - NATIONAL_DEX_HYPNO, // HOENN_DEX_HYPNO - NATIONAL_DEX_KRABBY, // HOENN_DEX_KRABBY - NATIONAL_DEX_KINGLER, // HOENN_DEX_KINGLER - NATIONAL_DEX_EXEGGCUTE, // HOENN_DEX_EXEGGCUTE - NATIONAL_DEX_EXEGGUTOR, // HOENN_DEX_EXEGGUTOR - NATIONAL_DEX_CUBONE, // HOENN_DEX_CUBONE - NATIONAL_DEX_MAROWAK, // HOENN_DEX_MAROWAK - NATIONAL_DEX_HITMONLEE, // HOENN_DEX_HITMONLEE - NATIONAL_DEX_HITMONCHAN, // HOENN_DEX_HITMONCHAN - NATIONAL_DEX_LICKITUNG, // HOENN_DEX_LICKITUNG - NATIONAL_DEX_CHANSEY, // HOENN_DEX_CHANSEY - NATIONAL_DEX_TANGELA, // HOENN_DEX_TANGELA - NATIONAL_DEX_KANGASKHAN, // HOENN_DEX_KANGASKHAN - NATIONAL_DEX_MR_MIME, // HOENN_DEX_MR. MIME - NATIONAL_DEX_SCYTHER, // HOENN_DEX_SCYTHER - NATIONAL_DEX_JYNX, // HOENN_DEX_JYNX - NATIONAL_DEX_ELECTABUZZ, // HOENN_DEX_ELECTABUZZ - NATIONAL_DEX_MAGMAR, // HOENN_DEX_MAGMAR - NATIONAL_DEX_TAUROS, // HOENN_DEX_TAUROS - NATIONAL_DEX_LAPRAS, // HOENN_DEX_LAPRAS - NATIONAL_DEX_DITTO, // HOENN_DEX_DITTO - NATIONAL_DEX_EEVEE, // HOENN_DEX_EEVEE - NATIONAL_DEX_VAPOREON, // HOENN_DEX_VAPOREON - NATIONAL_DEX_JOLTEON, // HOENN_DEX_JOLTEON - NATIONAL_DEX_FLAREON, // HOENN_DEX_FLAREON - NATIONAL_DEX_PORYGON, // HOENN_DEX_PORYGON - NATIONAL_DEX_OMANYTE, // HOENN_DEX_OMANYTE - NATIONAL_DEX_OMASTAR, // HOENN_DEX_OMASTAR - NATIONAL_DEX_KABUTO, // HOENN_DEX_KABUTO - NATIONAL_DEX_KABUTOPS, // HOENN_DEX_KABUTOPS - NATIONAL_DEX_AERODACTYL, // HOENN_DEX_AERODACTYL - NATIONAL_DEX_SNORLAX, // HOENN_DEX_SNORLAX - NATIONAL_DEX_ARTICUNO, // HOENN_DEX_ARTICUNO - NATIONAL_DEX_ZAPDOS, // HOENN_DEX_ZAPDOS - NATIONAL_DEX_MOLTRES, // HOENN_DEX_MOLTRES - NATIONAL_DEX_DRATINI, // HOENN_DEX_DRATINI - NATIONAL_DEX_DRAGONAIR, // HOENN_DEX_DRAGONAIR - NATIONAL_DEX_DRAGONITE, // HOENN_DEX_DRAGONITE - NATIONAL_DEX_MEWTWO, // HOENN_DEX_MEWTWO - NATIONAL_DEX_MEW, // HOENN_DEX_MEW - NATIONAL_DEX_CHIKORITA, // HOENN_DEX_CHIKORITA - NATIONAL_DEX_BAYLEEF, // HOENN_DEX_BAYLEEF - NATIONAL_DEX_MEGANIUM, // HOENN_DEX_MEGANIUM - NATIONAL_DEX_CYNDAQUIL, // HOENN_DEX_CYNDAQUIL - NATIONAL_DEX_QUILAVA, // HOENN_DEX_QUILAVA - NATIONAL_DEX_TYPHLOSION, // HOENN_DEX_TYPHLOSION - NATIONAL_DEX_TOTODILE, // HOENN_DEX_TOTODILE - NATIONAL_DEX_CROCONAW, // HOENN_DEX_CROCONAW - NATIONAL_DEX_FERALIGATR, // HOENN_DEX_FERALIGATR - NATIONAL_DEX_SENTRET, // HOENN_DEX_SENTRET - NATIONAL_DEX_FURRET, // HOENN_DEX_FURRET - NATIONAL_DEX_HOOTHOOT, // HOENN_DEX_HOOTHOOT - NATIONAL_DEX_NOCTOWL, // HOENN_DEX_NOCTOWL - NATIONAL_DEX_LEDYBA, // HOENN_DEX_LEDYBA - NATIONAL_DEX_LEDIAN, // HOENN_DEX_LEDIAN - NATIONAL_DEX_SPINARAK, // HOENN_DEX_SPINARAK - NATIONAL_DEX_ARIADOS, // HOENN_DEX_ARIADOS - NATIONAL_DEX_CLEFFA, // HOENN_DEX_CLEFFA - NATIONAL_DEX_TOGEPI, // HOENN_DEX_TOGEPI - NATIONAL_DEX_TOGETIC, // HOENN_DEX_TOGETIC - NATIONAL_DEX_MAREEP, // HOENN_DEX_MAREEP - NATIONAL_DEX_FLAAFFY, // HOENN_DEX_FLAAFFY - NATIONAL_DEX_AMPHAROS, // HOENN_DEX_AMPHAROS - NATIONAL_DEX_SUDOWOODO, // HOENN_DEX_SUDOWOODO - NATIONAL_DEX_POLITOED, // HOENN_DEX_POLITOED - NATIONAL_DEX_HOPPIP, // HOENN_DEX_HOPPIP - NATIONAL_DEX_SKIPLOOM, // HOENN_DEX_SKIPLOOM - NATIONAL_DEX_JUMPLUFF, // HOENN_DEX_JUMPLUFF - NATIONAL_DEX_AIPOM, // HOENN_DEX_AIPOM - NATIONAL_DEX_SUNKERN, // HOENN_DEX_SUNKERN - NATIONAL_DEX_SUNFLORA, // HOENN_DEX_SUNFLORA - NATIONAL_DEX_YANMA, // HOENN_DEX_YANMA - NATIONAL_DEX_WOOPER, // HOENN_DEX_WOOPER - NATIONAL_DEX_QUAGSIRE, // HOENN_DEX_QUAGSIRE - NATIONAL_DEX_ESPEON, // HOENN_DEX_ESPEON - NATIONAL_DEX_UMBREON, // HOENN_DEX_UMBREON - NATIONAL_DEX_MURKROW, // HOENN_DEX_MURKROW - NATIONAL_DEX_SLOWKING, // HOENN_DEX_SLOWKING - NATIONAL_DEX_MISDREAVUS, // HOENN_DEX_MISDREAVUS - NATIONAL_DEX_UNOWN, // HOENN_DEX_UNOWN - NATIONAL_DEX_PINECO, // HOENN_DEX_PINECO - NATIONAL_DEX_FORRETRESS, // HOENN_DEX_FORRETRESS - NATIONAL_DEX_DUNSPARCE, // HOENN_DEX_DUNSPARCE - NATIONAL_DEX_GLIGAR, // HOENN_DEX_GLIGAR - NATIONAL_DEX_STEELIX, // HOENN_DEX_STEELIX - NATIONAL_DEX_SNUBBULL, // HOENN_DEX_SNUBBULL - NATIONAL_DEX_GRANBULL, // HOENN_DEX_GRANBULL - NATIONAL_DEX_QWILFISH, // HOENN_DEX_QWILFISH - NATIONAL_DEX_SCIZOR, // HOENN_DEX_SCIZOR - NATIONAL_DEX_SHUCKLE, // HOENN_DEX_SHUCKLE - NATIONAL_DEX_SNEASEL, // HOENN_DEX_SNEASEL - NATIONAL_DEX_TEDDIURSA, // HOENN_DEX_TEDDIURSA - NATIONAL_DEX_URSARING, // HOENN_DEX_URSARING - NATIONAL_DEX_SWINUB, // HOENN_DEX_SWINUB - NATIONAL_DEX_PILOSWINE, // HOENN_DEX_PILOSWINE - NATIONAL_DEX_REMORAID, // HOENN_DEX_REMORAID - NATIONAL_DEX_OCTILLERY, // HOENN_DEX_OCTILLERY - NATIONAL_DEX_DELIBIRD, // HOENN_DEX_DELIBIRD - NATIONAL_DEX_MANTINE, // HOENN_DEX_MANTINE - NATIONAL_DEX_HOUNDOUR, // HOENN_DEX_HOUNDOUR - NATIONAL_DEX_HOUNDOOM, // HOENN_DEX_HOUNDOOM - NATIONAL_DEX_PORYGON2, // HOENN_DEX_PORYGON2 - NATIONAL_DEX_STANTLER, // HOENN_DEX_STANTLER - NATIONAL_DEX_SMEARGLE, // HOENN_DEX_SMEARGLE - NATIONAL_DEX_TYROGUE, // HOENN_DEX_TYROGUE - NATIONAL_DEX_HITMONTOP, // HOENN_DEX_HITMONTOP - NATIONAL_DEX_SMOOCHUM, // HOENN_DEX_SMOOCHUM - NATIONAL_DEX_ELEKID, // HOENN_DEX_ELEKID - NATIONAL_DEX_MAGBY, // HOENN_DEX_MAGBY - NATIONAL_DEX_MILTANK, // HOENN_DEX_MILTANK - NATIONAL_DEX_BLISSEY, // HOENN_DEX_BLISSEY - NATIONAL_DEX_RAIKOU, // HOENN_DEX_RAIKOU - NATIONAL_DEX_ENTEI, // HOENN_DEX_ENTEI - NATIONAL_DEX_SUICUNE, // HOENN_DEX_SUICUNE - NATIONAL_DEX_LARVITAR, // HOENN_DEX_LARVITAR - NATIONAL_DEX_PUPITAR, // HOENN_DEX_PUPITAR - NATIONAL_DEX_TYRANITAR, // HOENN_DEX_TYRANITAR - NATIONAL_DEX_LUGIA, // HOENN_DEX_LUGIA - NATIONAL_DEX_HO_OH, // HOENN_DEX_HO-OH - NATIONAL_DEX_CELEBI, // HOENN_DEX_CELEBI - NATIONAL_DEX_OLD_UNOWN_B, // HOENN_DEX_OLD_UNOWN_B - NATIONAL_DEX_OLD_UNOWN_C, // HOENN_DEX_OLD_UNOWN_C - NATIONAL_DEX_OLD_UNOWN_D, // HOENN_DEX_OLD_UNOWN_D - NATIONAL_DEX_OLD_UNOWN_E, // HOENN_DEX_OLD_UNOWN_E - NATIONAL_DEX_OLD_UNOWN_F, // HOENN_DEX_OLD_UNOWN_F - NATIONAL_DEX_OLD_UNOWN_G, // HOENN_DEX_OLD_UNOWN_G - NATIONAL_DEX_OLD_UNOWN_H, // HOENN_DEX_OLD_UNOWN_H - NATIONAL_DEX_OLD_UNOWN_I, // HOENN_DEX_OLD_UNOWN_I - NATIONAL_DEX_OLD_UNOWN_J, // HOENN_DEX_OLD_UNOWN_J - NATIONAL_DEX_OLD_UNOWN_K, // HOENN_DEX_OLD_UNOWN_K - NATIONAL_DEX_OLD_UNOWN_L, // HOENN_DEX_OLD_UNOWN_L - NATIONAL_DEX_OLD_UNOWN_M, // HOENN_DEX_OLD_UNOWN_M - NATIONAL_DEX_OLD_UNOWN_N, // HOENN_DEX_OLD_UNOWN_N - NATIONAL_DEX_OLD_UNOWN_O, // HOENN_DEX_OLD_UNOWN_O - NATIONAL_DEX_OLD_UNOWN_P, // HOENN_DEX_OLD_UNOWN_P - NATIONAL_DEX_OLD_UNOWN_Q, // HOENN_DEX_OLD_UNOWN_Q - NATIONAL_DEX_OLD_UNOWN_R, // HOENN_DEX_OLD_UNOWN_R - NATIONAL_DEX_OLD_UNOWN_S, // HOENN_DEX_OLD_UNOWN_S - NATIONAL_DEX_OLD_UNOWN_T, // HOENN_DEX_OLD_UNOWN_T - NATIONAL_DEX_OLD_UNOWN_U, // HOENN_DEX_OLD_UNOWN_U - NATIONAL_DEX_OLD_UNOWN_V, // HOENN_DEX_OLD_UNOWN_V - NATIONAL_DEX_OLD_UNOWN_W, // HOENN_DEX_OLD_UNOWN_W - NATIONAL_DEX_OLD_UNOWN_X, // HOENN_DEX_OLD_UNOWN_X - NATIONAL_DEX_OLD_UNOWN_Y, // HOENN_DEX_OLD_UNOWN_Y - NATIONAL_DEX_OLD_UNOWN_Z // HOENN_DEX_OLD_UNOWN_Z +const u16 gHoennToNationalOrder[] = // Assigns Hoenn Dex Pokémon (Using National Dex Index) +{ + HOENN_TO_NATIONAL(TREECKO), + HOENN_TO_NATIONAL(GROVYLE), + HOENN_TO_NATIONAL(SCEPTILE), + HOENN_TO_NATIONAL(TORCHIC), + HOENN_TO_NATIONAL(COMBUSKEN), + HOENN_TO_NATIONAL(BLAZIKEN), + HOENN_TO_NATIONAL(MUDKIP), + HOENN_TO_NATIONAL(MARSHTOMP), + HOENN_TO_NATIONAL(SWAMPERT), + HOENN_TO_NATIONAL(POOCHYENA), + HOENN_TO_NATIONAL(MIGHTYENA), + HOENN_TO_NATIONAL(ZIGZAGOON), + HOENN_TO_NATIONAL(LINOONE), + HOENN_TO_NATIONAL(WURMPLE), + HOENN_TO_NATIONAL(SILCOON), + HOENN_TO_NATIONAL(BEAUTIFLY), + HOENN_TO_NATIONAL(CASCOON), + HOENN_TO_NATIONAL(DUSTOX), + HOENN_TO_NATIONAL(LOTAD), + HOENN_TO_NATIONAL(LOMBRE), + HOENN_TO_NATIONAL(LUDICOLO), + HOENN_TO_NATIONAL(SEEDOT), + HOENN_TO_NATIONAL(NUZLEAF), + HOENN_TO_NATIONAL(SHIFTRY), + HOENN_TO_NATIONAL(TAILLOW), + HOENN_TO_NATIONAL(SWELLOW), + HOENN_TO_NATIONAL(WINGULL), + HOENN_TO_NATIONAL(PELIPPER), + HOENN_TO_NATIONAL(RALTS), + HOENN_TO_NATIONAL(KIRLIA), + HOENN_TO_NATIONAL(GARDEVOIR), + HOENN_TO_NATIONAL(SURSKIT), + HOENN_TO_NATIONAL(MASQUERAIN), + HOENN_TO_NATIONAL(SHROOMISH), + HOENN_TO_NATIONAL(BRELOOM), + HOENN_TO_NATIONAL(SLAKOTH), + HOENN_TO_NATIONAL(VIGOROTH), + HOENN_TO_NATIONAL(SLAKING), + HOENN_TO_NATIONAL(ABRA), + HOENN_TO_NATIONAL(KADABRA), + HOENN_TO_NATIONAL(ALAKAZAM), + HOENN_TO_NATIONAL(NINCADA), + HOENN_TO_NATIONAL(NINJASK), + HOENN_TO_NATIONAL(SHEDINJA), + HOENN_TO_NATIONAL(WHISMUR), + HOENN_TO_NATIONAL(LOUDRED), + HOENN_TO_NATIONAL(EXPLOUD), + HOENN_TO_NATIONAL(MAKUHITA), + HOENN_TO_NATIONAL(HARIYAMA), + HOENN_TO_NATIONAL(GOLDEEN), + HOENN_TO_NATIONAL(SEAKING), + HOENN_TO_NATIONAL(MAGIKARP), + HOENN_TO_NATIONAL(GYARADOS), + HOENN_TO_NATIONAL(AZURILL), + HOENN_TO_NATIONAL(MARILL), + HOENN_TO_NATIONAL(AZUMARILL), + HOENN_TO_NATIONAL(GEODUDE), + HOENN_TO_NATIONAL(GRAVELER), + HOENN_TO_NATIONAL(GOLEM), + HOENN_TO_NATIONAL(NOSEPASS), + HOENN_TO_NATIONAL(SKITTY), + HOENN_TO_NATIONAL(DELCATTY), + HOENN_TO_NATIONAL(ZUBAT), + HOENN_TO_NATIONAL(GOLBAT), + HOENN_TO_NATIONAL(CROBAT), + HOENN_TO_NATIONAL(TENTACOOL), + HOENN_TO_NATIONAL(TENTACRUEL), + HOENN_TO_NATIONAL(SABLEYE), + HOENN_TO_NATIONAL(MAWILE), + HOENN_TO_NATIONAL(ARON), + HOENN_TO_NATIONAL(LAIRON), + HOENN_TO_NATIONAL(AGGRON), + HOENN_TO_NATIONAL(MACHOP), + HOENN_TO_NATIONAL(MACHOKE), + HOENN_TO_NATIONAL(MACHAMP), + HOENN_TO_NATIONAL(MEDITITE), + HOENN_TO_NATIONAL(MEDICHAM), + HOENN_TO_NATIONAL(ELECTRIKE), + HOENN_TO_NATIONAL(MANECTRIC), + HOENN_TO_NATIONAL(PLUSLE), + HOENN_TO_NATIONAL(MINUN), + HOENN_TO_NATIONAL(MAGNEMITE), + HOENN_TO_NATIONAL(MAGNETON), + HOENN_TO_NATIONAL(VOLTORB), + HOENN_TO_NATIONAL(ELECTRODE), + HOENN_TO_NATIONAL(VOLBEAT), + HOENN_TO_NATIONAL(ILLUMISE), + HOENN_TO_NATIONAL(ODDISH), + HOENN_TO_NATIONAL(GLOOM), + HOENN_TO_NATIONAL(VILEPLUME), + HOENN_TO_NATIONAL(BELLOSSOM), + HOENN_TO_NATIONAL(DODUO), + HOENN_TO_NATIONAL(DODRIO), + HOENN_TO_NATIONAL(ROSELIA), + HOENN_TO_NATIONAL(GULPIN), + HOENN_TO_NATIONAL(SWALOT), + HOENN_TO_NATIONAL(CARVANHA), + HOENN_TO_NATIONAL(SHARPEDO), + HOENN_TO_NATIONAL(WAILMER), + HOENN_TO_NATIONAL(WAILORD), + HOENN_TO_NATIONAL(NUMEL), + HOENN_TO_NATIONAL(CAMERUPT), + HOENN_TO_NATIONAL(SLUGMA), + HOENN_TO_NATIONAL(MAGCARGO), + HOENN_TO_NATIONAL(TORKOAL), + HOENN_TO_NATIONAL(GRIMER), + HOENN_TO_NATIONAL(MUK), + HOENN_TO_NATIONAL(KOFFING), + HOENN_TO_NATIONAL(WEEZING), + HOENN_TO_NATIONAL(SPOINK), + HOENN_TO_NATIONAL(GRUMPIG), + HOENN_TO_NATIONAL(SANDSHREW), + HOENN_TO_NATIONAL(SANDSLASH), + HOENN_TO_NATIONAL(SPINDA), + HOENN_TO_NATIONAL(SKARMORY), + HOENN_TO_NATIONAL(TRAPINCH), + HOENN_TO_NATIONAL(VIBRAVA), + HOENN_TO_NATIONAL(FLYGON), + HOENN_TO_NATIONAL(CACNEA), + HOENN_TO_NATIONAL(CACTURNE), + HOENN_TO_NATIONAL(SWABLU), + HOENN_TO_NATIONAL(ALTARIA), + HOENN_TO_NATIONAL(ZANGOOSE), + HOENN_TO_NATIONAL(SEVIPER), + HOENN_TO_NATIONAL(LUNATONE), + HOENN_TO_NATIONAL(SOLROCK), + HOENN_TO_NATIONAL(BARBOACH), + HOENN_TO_NATIONAL(WHISCASH), + HOENN_TO_NATIONAL(CORPHISH), + HOENN_TO_NATIONAL(CRAWDAUNT), + HOENN_TO_NATIONAL(BALTOY), + HOENN_TO_NATIONAL(CLAYDOL), + HOENN_TO_NATIONAL(LILEEP), + HOENN_TO_NATIONAL(CRADILY), + HOENN_TO_NATIONAL(ANORITH), + HOENN_TO_NATIONAL(ARMALDO), + HOENN_TO_NATIONAL(IGGLYBUFF), + HOENN_TO_NATIONAL(JIGGLYPUFF), + HOENN_TO_NATIONAL(WIGGLYTUFF), + HOENN_TO_NATIONAL(FEEBAS), + HOENN_TO_NATIONAL(MILOTIC), + HOENN_TO_NATIONAL(CASTFORM), + HOENN_TO_NATIONAL(STARYU), + HOENN_TO_NATIONAL(STARMIE), + HOENN_TO_NATIONAL(KECLEON), + HOENN_TO_NATIONAL(SHUPPET), + HOENN_TO_NATIONAL(BANETTE), + HOENN_TO_NATIONAL(DUSKULL), + HOENN_TO_NATIONAL(DUSCLOPS), + HOENN_TO_NATIONAL(TROPIUS), + HOENN_TO_NATIONAL(CHIMECHO), + HOENN_TO_NATIONAL(ABSOL), + HOENN_TO_NATIONAL(VULPIX), + HOENN_TO_NATIONAL(NINETALES), + HOENN_TO_NATIONAL(PICHU), + HOENN_TO_NATIONAL(PIKACHU), + HOENN_TO_NATIONAL(RAICHU), + HOENN_TO_NATIONAL(PSYDUCK), + HOENN_TO_NATIONAL(GOLDUCK), + HOENN_TO_NATIONAL(WYNAUT), + HOENN_TO_NATIONAL(WOBBUFFET), + HOENN_TO_NATIONAL(NATU), + HOENN_TO_NATIONAL(XATU), + HOENN_TO_NATIONAL(GIRAFARIG), + HOENN_TO_NATIONAL(PHANPY), + HOENN_TO_NATIONAL(DONPHAN), + HOENN_TO_NATIONAL(PINSIR), + HOENN_TO_NATIONAL(HERACROSS), + HOENN_TO_NATIONAL(RHYHORN), + HOENN_TO_NATIONAL(RHYDON), + HOENN_TO_NATIONAL(SNORUNT), + HOENN_TO_NATIONAL(GLALIE), + HOENN_TO_NATIONAL(SPHEAL), + HOENN_TO_NATIONAL(SEALEO), + HOENN_TO_NATIONAL(WALREIN), + HOENN_TO_NATIONAL(CLAMPERL), + HOENN_TO_NATIONAL(HUNTAIL), + HOENN_TO_NATIONAL(GOREBYSS), + HOENN_TO_NATIONAL(RELICANTH), + HOENN_TO_NATIONAL(CORSOLA), + HOENN_TO_NATIONAL(CHINCHOU), + HOENN_TO_NATIONAL(LANTURN), + HOENN_TO_NATIONAL(LUVDISC), + HOENN_TO_NATIONAL(HORSEA), + HOENN_TO_NATIONAL(SEADRA), + HOENN_TO_NATIONAL(KINGDRA), + HOENN_TO_NATIONAL(BAGON), + HOENN_TO_NATIONAL(SHELGON), + HOENN_TO_NATIONAL(SALAMENCE), + HOENN_TO_NATIONAL(BELDUM), + HOENN_TO_NATIONAL(METANG), + HOENN_TO_NATIONAL(METAGROSS), + HOENN_TO_NATIONAL(REGIROCK), + HOENN_TO_NATIONAL(REGICE), + HOENN_TO_NATIONAL(REGISTEEL), + HOENN_TO_NATIONAL(LATIAS), + HOENN_TO_NATIONAL(LATIOS), + HOENN_TO_NATIONAL(KYOGRE), + HOENN_TO_NATIONAL(GROUDON), + HOENN_TO_NATIONAL(RAYQUAZA), + HOENN_TO_NATIONAL(JIRACHI), + HOENN_TO_NATIONAL(DEOXYS), + HOENN_TO_NATIONAL(BULBASAUR), // Pokémon from here onwards are UNSEEN in the HoennDex. + HOENN_TO_NATIONAL(IVYSAUR), + HOENN_TO_NATIONAL(VENUSAUR), + HOENN_TO_NATIONAL(CHARMANDER), + HOENN_TO_NATIONAL(CHARMELEON), + HOENN_TO_NATIONAL(CHARIZARD), + HOENN_TO_NATIONAL(SQUIRTLE), + HOENN_TO_NATIONAL(WARTORTLE), + HOENN_TO_NATIONAL(BLASTOISE), + HOENN_TO_NATIONAL(CATERPIE), + HOENN_TO_NATIONAL(METAPOD), + HOENN_TO_NATIONAL(BUTTERFREE), + HOENN_TO_NATIONAL(WEEDLE), + HOENN_TO_NATIONAL(KAKUNA), + HOENN_TO_NATIONAL(BEEDRILL), + HOENN_TO_NATIONAL(PIDGEY), + HOENN_TO_NATIONAL(PIDGEOTTO), + HOENN_TO_NATIONAL(PIDGEOT), + HOENN_TO_NATIONAL(RATTATA), + HOENN_TO_NATIONAL(RATICATE), + HOENN_TO_NATIONAL(SPEAROW), + HOENN_TO_NATIONAL(FEAROW), + HOENN_TO_NATIONAL(EKANS), + HOENN_TO_NATIONAL(ARBOK), + HOENN_TO_NATIONAL(NIDORAN_F), + HOENN_TO_NATIONAL(NIDORINA), + HOENN_TO_NATIONAL(NIDOQUEEN), + HOENN_TO_NATIONAL(NIDORAN_M), + HOENN_TO_NATIONAL(NIDORINO), + HOENN_TO_NATIONAL(NIDOKING), + HOENN_TO_NATIONAL(CLEFAIRY), + HOENN_TO_NATIONAL(CLEFABLE), + HOENN_TO_NATIONAL(PARAS), + HOENN_TO_NATIONAL(PARASECT), + HOENN_TO_NATIONAL(VENONAT), + HOENN_TO_NATIONAL(VENOMOTH), + HOENN_TO_NATIONAL(DIGLETT), + HOENN_TO_NATIONAL(DUGTRIO), + HOENN_TO_NATIONAL(MEOWTH), + HOENN_TO_NATIONAL(PERSIAN), + HOENN_TO_NATIONAL(MANKEY), + HOENN_TO_NATIONAL(PRIMEAPE), + HOENN_TO_NATIONAL(GROWLITHE), + HOENN_TO_NATIONAL(ARCANINE), + HOENN_TO_NATIONAL(POLIWAG), + HOENN_TO_NATIONAL(POLIWHIRL), + HOENN_TO_NATIONAL(POLIWRATH), + HOENN_TO_NATIONAL(BELLSPROUT), + HOENN_TO_NATIONAL(WEEPINBELL), + HOENN_TO_NATIONAL(VICTREEBEL), + HOENN_TO_NATIONAL(PONYTA), + HOENN_TO_NATIONAL(RAPIDASH), + HOENN_TO_NATIONAL(SLOWPOKE), + HOENN_TO_NATIONAL(SLOWBRO), + HOENN_TO_NATIONAL(FARFETCHD), + HOENN_TO_NATIONAL(SEEL), + HOENN_TO_NATIONAL(DEWGONG), + HOENN_TO_NATIONAL(SHELLDER), + HOENN_TO_NATIONAL(CLOYSTER), + HOENN_TO_NATIONAL(GASTLY), + HOENN_TO_NATIONAL(HAUNTER), + HOENN_TO_NATIONAL(GENGAR), + HOENN_TO_NATIONAL(ONIX), + HOENN_TO_NATIONAL(DROWZEE), + HOENN_TO_NATIONAL(HYPNO), + HOENN_TO_NATIONAL(KRABBY), + HOENN_TO_NATIONAL(KINGLER), + HOENN_TO_NATIONAL(EXEGGCUTE), + HOENN_TO_NATIONAL(EXEGGUTOR), + HOENN_TO_NATIONAL(CUBONE), + HOENN_TO_NATIONAL(MAROWAK), + HOENN_TO_NATIONAL(HITMONLEE), + HOENN_TO_NATIONAL(HITMONCHAN), + HOENN_TO_NATIONAL(LICKITUNG), + HOENN_TO_NATIONAL(CHANSEY), + HOENN_TO_NATIONAL(TANGELA), + HOENN_TO_NATIONAL(KANGASKHAN), + HOENN_TO_NATIONAL(MR_MIME), + HOENN_TO_NATIONAL(SCYTHER), + HOENN_TO_NATIONAL(JYNX), + HOENN_TO_NATIONAL(ELECTABUZZ), + HOENN_TO_NATIONAL(MAGMAR), + HOENN_TO_NATIONAL(TAUROS), + HOENN_TO_NATIONAL(LAPRAS), + HOENN_TO_NATIONAL(DITTO), + HOENN_TO_NATIONAL(EEVEE), + HOENN_TO_NATIONAL(VAPOREON), + HOENN_TO_NATIONAL(JOLTEON), + HOENN_TO_NATIONAL(FLAREON), + HOENN_TO_NATIONAL(PORYGON), + HOENN_TO_NATIONAL(OMANYTE), + HOENN_TO_NATIONAL(OMASTAR), + HOENN_TO_NATIONAL(KABUTO), + HOENN_TO_NATIONAL(KABUTOPS), + HOENN_TO_NATIONAL(AERODACTYL), + HOENN_TO_NATIONAL(SNORLAX), + HOENN_TO_NATIONAL(ARTICUNO), + HOENN_TO_NATIONAL(ZAPDOS), + HOENN_TO_NATIONAL(MOLTRES), + HOENN_TO_NATIONAL(DRATINI), + HOENN_TO_NATIONAL(DRAGONAIR), + HOENN_TO_NATIONAL(DRAGONITE), + HOENN_TO_NATIONAL(MEWTWO), + HOENN_TO_NATIONAL(MEW), + HOENN_TO_NATIONAL(CHIKORITA), + HOENN_TO_NATIONAL(BAYLEEF), + HOENN_TO_NATIONAL(MEGANIUM), + HOENN_TO_NATIONAL(CYNDAQUIL), + HOENN_TO_NATIONAL(QUILAVA), + HOENN_TO_NATIONAL(TYPHLOSION), + HOENN_TO_NATIONAL(TOTODILE), + HOENN_TO_NATIONAL(CROCONAW), + HOENN_TO_NATIONAL(FERALIGATR), + HOENN_TO_NATIONAL(SENTRET), + HOENN_TO_NATIONAL(FURRET), + HOENN_TO_NATIONAL(HOOTHOOT), + HOENN_TO_NATIONAL(NOCTOWL), + HOENN_TO_NATIONAL(LEDYBA), + HOENN_TO_NATIONAL(LEDIAN), + HOENN_TO_NATIONAL(SPINARAK), + HOENN_TO_NATIONAL(ARIADOS), + HOENN_TO_NATIONAL(CLEFFA), + HOENN_TO_NATIONAL(TOGEPI), + HOENN_TO_NATIONAL(TOGETIC), + HOENN_TO_NATIONAL(MAREEP), + HOENN_TO_NATIONAL(FLAAFFY), + HOENN_TO_NATIONAL(AMPHAROS), + HOENN_TO_NATIONAL(SUDOWOODO), + HOENN_TO_NATIONAL(POLITOED), + HOENN_TO_NATIONAL(HOPPIP), + HOENN_TO_NATIONAL(SKIPLOOM), + HOENN_TO_NATIONAL(JUMPLUFF), + HOENN_TO_NATIONAL(AIPOM), + HOENN_TO_NATIONAL(SUNKERN), + HOENN_TO_NATIONAL(SUNFLORA), + HOENN_TO_NATIONAL(YANMA), + HOENN_TO_NATIONAL(WOOPER), + HOENN_TO_NATIONAL(QUAGSIRE), + HOENN_TO_NATIONAL(ESPEON), + HOENN_TO_NATIONAL(UMBREON), + HOENN_TO_NATIONAL(MURKROW), + HOENN_TO_NATIONAL(SLOWKING), + HOENN_TO_NATIONAL(MISDREAVUS), + HOENN_TO_NATIONAL(UNOWN), + HOENN_TO_NATIONAL(PINECO), + HOENN_TO_NATIONAL(FORRETRESS), + HOENN_TO_NATIONAL(DUNSPARCE), + HOENN_TO_NATIONAL(GLIGAR), + HOENN_TO_NATIONAL(STEELIX), + HOENN_TO_NATIONAL(SNUBBULL), + HOENN_TO_NATIONAL(GRANBULL), + HOENN_TO_NATIONAL(QWILFISH), + HOENN_TO_NATIONAL(SCIZOR), + HOENN_TO_NATIONAL(SHUCKLE), + HOENN_TO_NATIONAL(SNEASEL), + HOENN_TO_NATIONAL(TEDDIURSA), + HOENN_TO_NATIONAL(URSARING), + HOENN_TO_NATIONAL(SWINUB), + HOENN_TO_NATIONAL(PILOSWINE), + HOENN_TO_NATIONAL(REMORAID), + HOENN_TO_NATIONAL(OCTILLERY), + HOENN_TO_NATIONAL(DELIBIRD), + HOENN_TO_NATIONAL(MANTINE), + HOENN_TO_NATIONAL(HOUNDOUR), + HOENN_TO_NATIONAL(HOUNDOOM), + HOENN_TO_NATIONAL(PORYGON2), + HOENN_TO_NATIONAL(STANTLER), + HOENN_TO_NATIONAL(SMEARGLE), + HOENN_TO_NATIONAL(TYROGUE), + HOENN_TO_NATIONAL(HITMONTOP), + HOENN_TO_NATIONAL(SMOOCHUM), + HOENN_TO_NATIONAL(ELEKID), + HOENN_TO_NATIONAL(MAGBY), + HOENN_TO_NATIONAL(MILTANK), + HOENN_TO_NATIONAL(BLISSEY), + HOENN_TO_NATIONAL(RAIKOU), + HOENN_TO_NATIONAL(ENTEI), + HOENN_TO_NATIONAL(SUICUNE), + HOENN_TO_NATIONAL(LARVITAR), + HOENN_TO_NATIONAL(PUPITAR), + HOENN_TO_NATIONAL(TYRANITAR), + HOENN_TO_NATIONAL(LUGIA), + HOENN_TO_NATIONAL(HO_OH), + HOENN_TO_NATIONAL(CELEBI), + HOENN_TO_NATIONAL(OLD_UNOWN_B), + HOENN_TO_NATIONAL(OLD_UNOWN_C), + HOENN_TO_NATIONAL(OLD_UNOWN_D), + HOENN_TO_NATIONAL(OLD_UNOWN_E), + HOENN_TO_NATIONAL(OLD_UNOWN_F), + HOENN_TO_NATIONAL(OLD_UNOWN_G), + HOENN_TO_NATIONAL(OLD_UNOWN_H), + HOENN_TO_NATIONAL(OLD_UNOWN_I), + HOENN_TO_NATIONAL(OLD_UNOWN_J), + HOENN_TO_NATIONAL(OLD_UNOWN_K), + HOENN_TO_NATIONAL(OLD_UNOWN_L), + HOENN_TO_NATIONAL(OLD_UNOWN_M), + HOENN_TO_NATIONAL(OLD_UNOWN_N), + HOENN_TO_NATIONAL(OLD_UNOWN_O), + HOENN_TO_NATIONAL(OLD_UNOWN_P), + HOENN_TO_NATIONAL(OLD_UNOWN_Q), + HOENN_TO_NATIONAL(OLD_UNOWN_R), + HOENN_TO_NATIONAL(OLD_UNOWN_S), + HOENN_TO_NATIONAL(OLD_UNOWN_T), + HOENN_TO_NATIONAL(OLD_UNOWN_U), + HOENN_TO_NATIONAL(OLD_UNOWN_V), + HOENN_TO_NATIONAL(OLD_UNOWN_W), + HOENN_TO_NATIONAL(OLD_UNOWN_X), + HOENN_TO_NATIONAL(OLD_UNOWN_Y), + HOENN_TO_NATIONAL(OLD_UNOWN_Z), }; const struct SpindaSpot gSpindaSpotGraphics[] = -- cgit v1.2.3 From 715fbb379e14feca236d30220526c125896d25b5 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Mon, 3 Dec 2018 14:58:25 +0000 Subject: Document some of pokedex.c --- include/graphics.h | 18 +- src/graphics.c | 18 +- src/pokedex.c | 932 +++++++++++++++++++++++++++-------------------------- src/start_menu.c | 4 +- 4 files changed, 487 insertions(+), 485 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 6ec5c44b2..f51d7fa47 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3282,18 +3282,18 @@ extern const u32 gBattleTerrainPalette_StadiumWallace[]; extern const u32 gPokedexMenu2_Gfx[]; extern const u16 gPokedexText_Pal[]; extern const u32 gPokedexMenu_Gfx[]; -extern const u8 gUnknown_08DC2C5C[]; -extern const u8 gUnknown_08DC2DAC[]; -extern const u8 gUnknown_08DC2A08[]; -extern const u8 gUnknown_08DC2B1C[]; +extern const u8 gPokedexTilemap_Main[]; +extern const u8 gPokedexTilemap_MainUnderlay[]; +extern const u8 gPokedexTilemap_StartMenu1[]; +extern const u8 gPokedexTilemap_StartMenu2[]; extern const u16 gPokedexHoennBg_Pal[]; extern const u16 gPokedexText_Pal[]; extern const u16 gPokedexNationalBg_Pal[]; -extern const u8 gUnknown_08DC3080[]; -extern const u8 gUnknown_08DC3198[]; -extern const u8 gUnknown_08DC2E6C[]; -extern const u8 gUnknown_08DC2F5C[]; -extern const u8 gUnknown_08DC2FEC[]; +extern const u8 gPokedexTilemap_DescriptionScreen[]; +extern const u8 gPokedexTilemap_CryScreen[]; +extern const u8 gPokedexTilemap_SizeScreen[]; +extern const u8 gPokedexTilemap_ScreenSelectBar1[]; +extern const u8 gPokedexTilemap_ScreenSelectBar2[]; extern const u16 gPokedexCaughtScreenFade_Pal[]; extern const u32 gPokedexSearchMenu_Gfx[]; extern const u32 gPokedexSearch2_Tilemap[]; diff --git a/src/graphics.c b/src/graphics.c index 2a21b610a..b2de074bc 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1279,15 +1279,15 @@ const u32 gPokedexMenu2_Gfx[] = INCBIN_U32("graphics/pokedex/menu2.4bpp.lz"); const u32 gUnused_PokedexNoBall[] = INCBIN_U32("graphics/pokedex/noball_unused.4bpp.lz"); -const u32 gUnknown_08DC2A08[] = INCBIN_U32("graphics/pokedex/tilemap1.bin.lz"); -const u32 gUnknown_08DC2B1C[] = INCBIN_U32("graphics/pokedex/tilemap2.bin.lz"); -const u32 gUnknown_08DC2C5C[] = INCBIN_U32("graphics/pokedex/tilemap3.bin.lz"); -const u32 gUnknown_08DC2DAC[] = INCBIN_U32("graphics/pokedex/tilemap4.bin.lz"); -const u32 gUnknown_08DC2E6C[] = INCBIN_U32("graphics/pokedex/tilemap5.bin.lz"); -const u32 gUnknown_08DC2F5C[] = INCBIN_U32("graphics/pokedex/tilemap6.bin.lz"); -const u32 gUnknown_08DC2FEC[] = INCBIN_U32("graphics/pokedex/tilemap7.bin.lz"); -const u32 gUnknown_08DC3080[] = INCBIN_U32("graphics/pokedex/tilemap8.bin.lz"); -const u32 gUnknown_08DC3198[] = INCBIN_U32("graphics/pokedex/tilemap9.bin.lz"); +const u32 gPokedexTilemap_StartMenu1[] = INCBIN_U32("graphics/pokedex/tilemap1.bin.lz"); +const u32 gPokedexTilemap_StartMenu2[] = INCBIN_U32("graphics/pokedex/tilemap2.bin.lz"); +const u32 gPokedexTilemap_Main[] = INCBIN_U32("graphics/pokedex/tilemap3.bin.lz"); +const u32 gPokedexTilemap_MainUnderlay[] = INCBIN_U32("graphics/pokedex/tilemap4.bin.lz"); +const u32 gPokedexTilemap_SizeScreen[] = INCBIN_U32("graphics/pokedex/tilemap5.bin.lz"); +const u32 gPokedexTilemap_ScreenSelectBar1[] = INCBIN_U32("graphics/pokedex/tilemap6.bin.lz"); +const u32 gPokedexTilemap_ScreenSelectBar2[] = INCBIN_U32("graphics/pokedex/tilemap7.bin.lz"); +const u32 gPokedexTilemap_DescriptionScreen[] = INCBIN_U32("graphics/pokedex/tilemap8.bin.lz"); +const u32 gPokedexTilemap_CryScreen[] = INCBIN_U32("graphics/pokedex/tilemap9.bin.lz"); const u16 gPokedexSearchMenu_Pal[] = INCBIN_U16("graphics/pokedex/search_menu.gbapal"); const u32 gPokedexSearchMenu_Gfx[] = INCBIN_U32("graphics/pokedex/search_menu.4bpp.lz"); diff --git a/src/pokedex.c b/src/pokedex.c index e234c355f..9602ce7ea 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -33,10 +33,10 @@ extern u8 gDexCryScreenState; // EWRAM -static EWRAM_DATA struct PokedexView *gUnknown_02039B4C = NULL; +static EWRAM_DATA struct PokedexView *sPokedexView = NULL; static EWRAM_DATA u16 gUnknown_02039B50 = 0; static EWRAM_DATA u8 gUnknown_02039B52 = 0; -static EWRAM_DATA struct PokedexListItem *gUnknown_02039B54 = NULL; +static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL; // IWRAM common u8 gUnknown_030060B0; @@ -50,7 +50,7 @@ struct UnknownStruct2 struct UnknownStruct1 { - const struct UnknownStruct2 *unk0; + const struct UnknownStruct2 *pokedexList; u8 unk4; u8 unk5; u16 unk6; @@ -89,7 +89,7 @@ struct PokedexListItem struct PokedexView { - struct PokedexListItem unk0[NATIONAL_DEX_COUNT]; + struct PokedexListItem pokedexList[NATIONAL_DEX_COUNT]; u16 unk608; u8 unk60A_1:1; u8 unk60A_2:1; @@ -101,8 +101,8 @@ struct PokedexView u16 unk614; u16 dexOrder; u16 unk618; - u16 unk61A; - u16 unk61C; + u16 seenCount; + u16 ownCount; u16 unk61E[4]; u16 selectedMonSpriteId; u16 unk628; @@ -170,7 +170,7 @@ void sub_80BD154(u16, u8, u8, u16); void sub_80BD1F4(u16, u8, u8, u16); u8 sub_80BD23C(u16, u8, u8); void sub_80BD28C(u8, u8, u16); -void sub_80BD2B4(u16, u16); +static void CreateInitialPokemonSprites(u16, u16); bool8 sub_80BD404(u8, u8, u8); u16 sub_80BD69C(u16, u16); void sub_80BD8D0(void); @@ -178,7 +178,7 @@ bool8 sub_80BD930(void); u8 sub_80BDA40(void); u16 sub_80BDA8C(u16); u32 sub_80BDACC(u16, s16, s16); -void sub_80BDB7C(u8); +static void CreateInterfaceSprites(u8); void sub_80BE470(struct Sprite *sprite); void sub_80BE604(struct Sprite *sprite); void sub_80BE658(struct Sprite *sprite); @@ -258,7 +258,7 @@ static const struct OamData sOamData_855CFE4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = ST_OAM_SQUARE, .x = 0, .matrixNum = 0, .size = 0, @@ -275,7 +275,7 @@ static const struct OamData sOamData_855CFEC = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = ST_OAM_H_RECTANGLE, .x = 0, .matrixNum = 0, .size = 0, @@ -292,7 +292,7 @@ static const struct OamData sOamData_855CFF4 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = ST_OAM_H_RECTANGLE, .x = 0, .matrixNum = 0, .size = 2, @@ -309,7 +309,7 @@ static const struct OamData sOamData_855CFFC = .objMode = 2, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = ST_OAM_SQUARE, .x = 0, .matrixNum = 0, .size = 2, @@ -326,7 +326,7 @@ static const struct OamData sOamData_855D004 = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 1, + .shape = ST_OAM_H_RECTANGLE, .x = 0, .matrixNum = 0, .size = 3, @@ -343,7 +343,7 @@ static const struct OamData sOamData_855D00C = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 2, + .shape = ST_OAM_V_RECTANGLE, .x = 0, .matrixNum = 0, .size = 0, @@ -613,7 +613,7 @@ static const union AnimCmd *const sSpriteAnimTable_855D190[] = sSpriteAnim_855D10C }; -static const struct SpriteTemplate gUnknown_0855D194 = +static const struct SpriteTemplate sScrollBarSpriteTemplate = { .tileTag = 4096, .paletteTag = 4096, @@ -624,7 +624,7 @@ static const struct SpriteTemplate gUnknown_0855D194 = .callback = sub_80BE604, }; -static const struct SpriteTemplate gUnknown_0855D1AC = +static const struct SpriteTemplate sArrowSpriteTemplate = { .tileTag = 4096, .paletteTag = 4096, @@ -635,7 +635,7 @@ static const struct SpriteTemplate gUnknown_0855D1AC = .callback = sub_80BE658, }; -static const struct SpriteTemplate gUnknown_0855D1C4 = +static const struct SpriteTemplate sInterfaceTextSpriteTemplate = { .tileTag = 4096, .paletteTag = 4096, @@ -646,7 +646,7 @@ static const struct SpriteTemplate gUnknown_0855D1C4 = .callback = sub_80BE758, }; -static const struct SpriteTemplate gUnknown_0855D1DC = +static const struct SpriteTemplate sRotatingPokeballSpriteTemplate = { .tileTag = 4096, .paletteTag = 4096, @@ -657,7 +657,7 @@ static const struct SpriteTemplate gUnknown_0855D1DC = .callback = sub_80BE780, }; -static const struct SpriteTemplate gUnknown_0855D1F4 = +static const struct SpriteTemplate sSeenOwnTextSpriteTemplate = { .tileTag = 4096, .paletteTag = 4096, @@ -712,13 +712,13 @@ static const struct SpriteTemplate gUnknown_0855D254 = .callback = sub_80BE834, }; -static const struct CompressedSpriteSheet gSpriteSheets_0855D26C[] = +static const struct CompressedSpriteSheet sInterfaceSpriteSheet[] = { {gPokedexMenu2_Gfx, 0x2000, 4096}, {0} }; -static const struct SpritePalette gSpritePalettes_0855D26C[] = +static const struct SpritePalette sInterfaceSpritePalette[] = { {gPokedexText_Pal, 4096}, {0} @@ -767,7 +767,7 @@ static const struct BgTemplate gBgTemplates_0855D298[] = } }; -static const struct WindowTemplate sWindowTemplates_0855D2A8[] = +static const struct WindowTemplate sPokemonList_WindowTemplate[] = { { .bg = 2, @@ -781,7 +781,7 @@ static const struct WindowTemplate sWindowTemplates_0855D2A8[] = DUMMY_WIN_TEMPLATE }; -static const u8 gUnknown_0855D2B8[] = _("{NO}000"); +static const u8 sText_No000[] = _("{NO}000"); static const u8 gUnknown_0855D2BE[] = INCBIN_U8("graphics/pokedex/caught_ball.4bpp"); static const u8 sText_TenDashes[] = _("----------"); @@ -1248,15 +1248,15 @@ void sub_80BB370(void) TransferPlttBuffer(); } -void sub_80BB384(struct PokedexView *pokedexView) +static void ResetPokedexView(struct PokedexView *pokedexView) { u16 i; for (i = 0; i < NATIONAL_DEX_COUNT; i++) { - pokedexView->unk0[i].dexNum |= 0xFFFF; - pokedexView->unk0[i].seen = 0; - pokedexView->unk0[i].owned = 0; + pokedexView->pokedexList[i].dexNum |= 0xFFFF; + pokedexView->pokedexList[i].seen = 0; + pokedexView->pokedexList[i].owned = 0; } pokedexView->unk608 = 0; pokedexView->unk60A_1 = 0; @@ -1268,8 +1268,8 @@ void sub_80BB384(struct PokedexView *pokedexView) pokedexView->unk614 = 0; pokedexView->dexOrder = 0; pokedexView->unk618 = 0; - pokedexView->unk61A = 0; - pokedexView->unk61C = 0; + pokedexView->seenCount = 0; + pokedexView->ownCount = 0; for (i = 0; i <= 3; i++) pokedexView->unk61E[i] |= 0xFFFF; pokedexView->unk628 = 0; @@ -1299,7 +1299,7 @@ void sub_80BB384(struct PokedexView *pokedexView) pokedexView->unk65C[i] = 0; } -void sub_80BB534(void) +void CB2_Pokedex(void) { u8 *addr; u32 size; @@ -1326,34 +1326,34 @@ void sub_80BB534(void) gMain.state++; break; case 2: - gUnknown_02039B4C = AllocZeroed(sizeof(struct PokedexView)); - sub_80BB384(gUnknown_02039B4C); + sPokedexView = AllocZeroed(sizeof(struct PokedexView)); + ResetPokedexView(sPokedexView); CreateTask(sub_80BB78C, 0); - gUnknown_02039B4C->dexMode = gSaveBlock2Ptr->pokedex.unknown1; + sPokedexView->dexMode = gSaveBlock2Ptr->pokedex.unknown1; if (!IsNationalPokedexEnabled()) - gUnknown_02039B4C->dexMode = DEX_MODE_HOENN; - gUnknown_02039B4C->dexOrder = gSaveBlock2Ptr->pokedex.order; - gUnknown_02039B4C->selectedPokemon = gUnknown_02039B50; - gUnknown_02039B4C->unk62C = gUnknown_02039B52; - gUnknown_02039B4C->selectedScreen = 0; + sPokedexView->dexMode = DEX_MODE_HOENN; + sPokedexView->dexOrder = gSaveBlock2Ptr->pokedex.order; + sPokedexView->selectedPokemon = gUnknown_02039B50; + sPokedexView->unk62C = gUnknown_02039B52; + sPokedexView->selectedScreen = 0; if (!IsNationalPokedexEnabled()) { - gUnknown_02039B4C->unk61A = GetHoennPokedexCount(0); - gUnknown_02039B4C->unk61C = GetHoennPokedexCount(1); + sPokedexView->seenCount = GetHoennPokedexCount(0); + sPokedexView->ownCount = GetHoennPokedexCount(1); } else { - gUnknown_02039B4C->unk61A = GetNationalPokedexCount(0); - gUnknown_02039B4C->unk61C = GetNationalPokedexCount(1); + sPokedexView->seenCount = GetNationalPokedexCount(0); + sPokedexView->ownCount = GetNationalPokedexCount(1); } - gUnknown_02039B4C->unk62D = 8; + sPokedexView->unk62D = 8; gMain.state++; break; case 3: EnableInterrupts(1); SetVBlankCallback(sub_80BB370); SetMainCallback2(sub_80BB774); - sub_80BC8D4(gUnknown_02039B4C->dexMode, gUnknown_02039B4C->dexOrder); + sub_80BC8D4(sPokedexView->dexMode, sPokedexView->dexOrder); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80); break; } @@ -1369,26 +1369,26 @@ void sub_80BB774(void) void sub_80BB78C(u8 taskId) { - gUnknown_02039B4C->unk64C_1 = FALSE; + sPokedexView->unk64C_1 = FALSE; if (sub_80BC514(0)) gTasks[taskId].func = sub_80BB7D4; } void sub_80BB7D4(u8 taskId) { - SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_02039B4C->menuY); + SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY); - if (gUnknown_02039B4C->menuY) + if (sPokedexView->menuY) { - gUnknown_02039B4C->menuY -= 8; + sPokedexView->menuY -= 8; } else { - if ((gMain.newKeys & A_BUTTON) && gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon].seen) + if ((gMain.newKeys & A_BUTTON) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen) { sub_80BD8D0(); - BeginNormalPaletteFade(~(1 << (gSprites[gUnknown_02039B4C->selectedMonSpriteId].oam.paletteNum + 16)), 0, 0, 0x10, RGB_BLACK); - gSprites[gUnknown_02039B4C->selectedMonSpriteId].callback = sub_80BE470; + BeginNormalPaletteFade(~(1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16)), 0, 0, 0x10, RGB_BLACK); + gSprites[sPokedexView->selectedMonSpriteId].callback = sub_80BE470; gTasks[taskId].func = sub_80BBBF4; PlaySE(SE_PIN); sub_80BC890(); @@ -1396,9 +1396,9 @@ void sub_80BB7D4(u8 taskId) else if (gMain.newKeys & START_BUTTON) { //Open menu - gUnknown_02039B4C->menuY = 0; - gUnknown_02039B4C->menuIsOpen = 1; - gUnknown_02039B4C->menuCursorPos = 0; + sPokedexView->menuY = 0; + sPokedexView->menuIsOpen = 1; + sPokedexView->menuCursorPos = 0; gTasks[taskId].func = sub_80BBA78; PlaySE(SE_SELECT); } @@ -1407,11 +1407,11 @@ void sub_80BB7D4(u8 taskId) PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].data[0] = sub_80C1258(); - gUnknown_02039B4C->unk64E = 0; - gUnknown_02039B4C->unk62A = gUnknown_02039B4C->unk62C; - gUnknown_02039B4C->unk610 = gUnknown_02039B4C->selectedPokemon; - gUnknown_02039B4C->unk614 = gUnknown_02039B4C->dexMode; - gUnknown_02039B4C->unk618 = gUnknown_02039B4C->dexOrder; + sPokedexView->unk64E = 0; + sPokedexView->unk62A = sPokedexView->unk62C; + sPokedexView->unk610 = sPokedexView->selectedPokemon; + sPokedexView->unk614 = sPokedexView->dexMode; + sPokedexView->unk618 = sPokedexView->dexOrder; gTasks[taskId].func = sub_80BBD1C; PlaySE(SE_PC_LOGIN); sub_80BC890(); @@ -1425,8 +1425,8 @@ void sub_80BB7D4(u8 taskId) else { //Handle D-pad - gUnknown_02039B4C->selectedPokemon = sub_80BD69C(gUnknown_02039B4C->selectedPokemon, 0xE); - if (gUnknown_02039B4C->unk62E) + sPokedexView->selectedPokemon = sub_80BD69C(sPokedexView->selectedPokemon, 0xE); + if (sPokedexView->unk62E) gTasks[taskId].func = sub_80BBA28; } } @@ -1434,41 +1434,41 @@ void sub_80BB7D4(u8 taskId) void sub_80BBA28(u8 taskId) { - if (sub_80BD404(gUnknown_02039B4C->unk62F, gUnknown_02039B4C->unk634, gUnknown_02039B4C->unk636)) + if (sub_80BD404(sPokedexView->unk62F, sPokedexView->unk634, sPokedexView->unk636)) gTasks[taskId].func = sub_80BB7D4; } void sub_80BBA78(u8 taskId) { - SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_02039B4C->menuY); + SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY); //If menu is not open, slide it up, on screen - if (gUnknown_02039B4C->menuY != 80) + if (sPokedexView->menuY != 80) { - gUnknown_02039B4C->menuY += 8; + sPokedexView->menuY += 8; } else { if (gMain.newKeys & A_BUTTON) { - switch (gUnknown_02039B4C->menuCursorPos) + switch (sPokedexView->menuCursorPos) { case 0: //BACK TO LIST default: gMain.newKeys |= START_BUTTON; //Exit menu break; case 1: //LIST TOP - gUnknown_02039B4C->selectedPokemon = 0; - gUnknown_02039B4C->unk62C = 0x40; + sPokedexView->selectedPokemon = 0; + sPokedexView->unk62C = 0x40; sub_80BDA40(); - sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE); + CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE); gMain.newKeys |= START_BUTTON; //Exit menu break; case 2: //LIST BOTTOM - gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->pokemonListCount - 1; - gUnknown_02039B4C->unk62C = gUnknown_02039B4C->pokemonListCount * 16 + 0x30; + sPokedexView->selectedPokemon = sPokedexView->pokemonListCount - 1; + sPokedexView->unk62C = sPokedexView->pokemonListCount * 16 + 0x30; sub_80BDA40(); - sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE); + CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE); gMain.newKeys |= START_BUTTON; //Exit menu break; case 3: //CLOSE POKEDEX @@ -1482,18 +1482,18 @@ void sub_80BBA78(u8 taskId) //Exit menu when Start or B is pressed if (gMain.newKeys & (START_BUTTON | B_BUTTON)) { - gUnknown_02039B4C->menuIsOpen = 0; + sPokedexView->menuIsOpen = 0; gTasks[taskId].func = sub_80BB7D4; PlaySE(SE_SELECT); } - else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gUnknown_02039B4C->menuCursorPos != 0) + else if ((gMain.newAndRepeatedKeys & DPAD_UP) && sPokedexView->menuCursorPos != 0) { - gUnknown_02039B4C->menuCursorPos--; + sPokedexView->menuCursorPos--; PlaySE(SE_SELECT); } - else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gUnknown_02039B4C->menuCursorPos <= 2) + else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && sPokedexView->menuCursorPos <= 2) { - gUnknown_02039B4C->menuCursorPos++; + sPokedexView->menuCursorPos++; PlaySE(SE_SELECT); } } @@ -1501,10 +1501,10 @@ void sub_80BBA78(u8 taskId) void sub_80BBBF4(u8 taskId) { - if (gSprites[gUnknown_02039B4C->selectedMonSpriteId].pos1.x == 48 && gSprites[gUnknown_02039B4C->selectedMonSpriteId].pos1.y == 56) + if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56) { - gUnknown_02039B4C->unk64B = gUnknown_02039B4C->unk64A; - gTasks[taskId].data[0] = sub_80BE91C(&gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon], gUnknown_02039B4C->selectedMonSpriteId); + sPokedexView->unk64B = sPokedexView->unk64A; + gTasks[taskId].data[0] = sub_80BE91C(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId); gTasks[taskId].func = sub_80BBC74; } } @@ -1513,13 +1513,13 @@ void sub_80BBC74(u8 taskId) { if (gTasks[gTasks[taskId].data[0]].isActive) { - if (gUnknown_02039B4C->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930()) - sub_80BE9F8(&gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon], gTasks[taskId].data[0]); + if (sPokedexView->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930()) + sub_80BE9F8(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], gTasks[taskId].data[0]); } else { - gUnknown_02039B50 = gUnknown_02039B4C->selectedPokemon; - gUnknown_02039B52 = gUnknown_02039B4C->unk62C; + gUnknown_02039B50 = sPokedexView->selectedPokemon; + gUnknown_02039B52 = sPokedexView->unk62C; gTasks[taskId].func = sub_80BB78C; } } @@ -1529,20 +1529,20 @@ void sub_80BBD1C(u8 taskId) if (!gTasks[gTasks[taskId].data[0]].isActive) { sub_80BDA40(); - if (gUnknown_02039B4C->unk64E != 0) + if (sPokedexView->unk64E != 0) { - gUnknown_02039B4C->selectedPokemon = 0; - gUnknown_02039B4C->unk62C = 0x40; + sPokedexView->selectedPokemon = 0; + sPokedexView->unk62C = 0x40; gTasks[taskId].func = sub_80BBE70; } else { - gUnknown_02039B4C->unk62C = gUnknown_02039B4C->unk62A; - gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->unk610; - gUnknown_02039B4C->dexMode = gUnknown_02039B4C->unk614; + sPokedexView->unk62C = sPokedexView->unk62A; + sPokedexView->selectedPokemon = sPokedexView->unk610; + sPokedexView->dexMode = sPokedexView->unk614; if (!IsNationalPokedexEnabled()) - gUnknown_02039B4C->dexMode = DEX_MODE_HOENN; - gUnknown_02039B4C->dexOrder = gUnknown_02039B4C->unk618; + sPokedexView->dexMode = DEX_MODE_HOENN; + sPokedexView->dexOrder = sPokedexView->unk618; gTasks[taskId].func = sub_80BB78C; } } @@ -1552,43 +1552,43 @@ void sub_80BBDE8(u8 taskId) { if (!gPaletteFade.active) { - gSaveBlock2Ptr->pokedex.unknown1 = gUnknown_02039B4C->dexMode; + gSaveBlock2Ptr->pokedex.unknown1 = sPokedexView->dexMode; if (!IsNationalPokedexEnabled()) gSaveBlock2Ptr->pokedex.unknown1 = DEX_MODE_HOENN; - gSaveBlock2Ptr->pokedex.order = gUnknown_02039B4C->dexOrder; + gSaveBlock2Ptr->pokedex.order = sPokedexView->dexOrder; sub_80BDA40(); sub_80BC890(); DestroyTask(taskId); SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); - Free(gUnknown_02039B4C); + Free(sPokedexView); } } void sub_80BBE70(u8 taskId) { - gUnknown_02039B4C->unk64C_1 = TRUE; + sPokedexView->unk64C_1 = TRUE; if (sub_80BC514(3)) gTasks[taskId].func = sub_80BBEB8; } void sub_80BBEB8(u8 taskId) { - SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_02039B4C->menuY); + SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY); - if (gUnknown_02039B4C->menuY) + if (sPokedexView->menuY) { - gUnknown_02039B4C->menuY -= 8; + sPokedexView->menuY -= 8; } else { - if ((gMain.newKeys & A_BUTTON) && gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon].seen) + if ((gMain.newKeys & A_BUTTON) && sPokedexView->pokedexList[sPokedexView->selectedPokemon].seen) { u32 a; sub_80BD8D0(); - a = (1 << (gSprites[gUnknown_02039B4C->selectedMonSpriteId].oam.paletteNum + 16)); - gSprites[gUnknown_02039B4C->selectedMonSpriteId].callback = sub_80BE470; + a = (1 << (gSprites[sPokedexView->selectedMonSpriteId].oam.paletteNum + 16)); + gSprites[sPokedexView->selectedMonSpriteId].callback = sub_80BE470; BeginNormalPaletteFade(~a, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = sub_80BC2D4; PlaySE(SE_PIN); @@ -1596,9 +1596,9 @@ void sub_80BBEB8(u8 taskId) } else if (gMain.newKeys & START_BUTTON) { - gUnknown_02039B4C->menuY = 0; - gUnknown_02039B4C->menuIsOpen = 1; - gUnknown_02039B4C->menuCursorPos = 0; + sPokedexView->menuY = 0; + sPokedexView->menuIsOpen = 1; + sPokedexView->menuCursorPos = 0; gTasks[taskId].func = sub_80BC0F8; PlaySE(SE_SELECT); } @@ -1606,7 +1606,7 @@ void sub_80BBEB8(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].data[0] = sub_80C1258(); - gUnknown_02039B4C->unk64E = 0; + sPokedexView->unk64E = 0; gTasks[taskId].func = sub_80BBD1C; PlaySE(SE_PC_LOGIN); sub_80BC890(); @@ -1620,8 +1620,8 @@ void sub_80BBEB8(u8 taskId) else { //Handle D-pad - gUnknown_02039B4C->selectedPokemon = sub_80BD69C(gUnknown_02039B4C->selectedPokemon, 0xE); - if (gUnknown_02039B4C->unk62E) + sPokedexView->selectedPokemon = sub_80BD69C(sPokedexView->selectedPokemon, 0xE); + if (sPokedexView->unk62E) gTasks[taskId].func = sub_80BC0A8; } } @@ -1629,40 +1629,40 @@ void sub_80BBEB8(u8 taskId) void sub_80BC0A8(u8 taskId) { - if (sub_80BD404(gUnknown_02039B4C->unk62F, gUnknown_02039B4C->unk634, gUnknown_02039B4C->unk636)) + if (sub_80BD404(sPokedexView->unk62F, sPokedexView->unk634, sPokedexView->unk636)) gTasks[taskId].func = sub_80BBEB8; } void sub_80BC0F8(u8 taskId) { - SetGpuReg(REG_OFFSET_BG0VOFS, gUnknown_02039B4C->menuY); + SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY); - if (gUnknown_02039B4C->menuY != 96) + if (sPokedexView->menuY != 96) { - gUnknown_02039B4C->menuY += 8; + sPokedexView->menuY += 8; } else { if (gMain.newKeys & A_BUTTON) { - switch (gUnknown_02039B4C->menuCursorPos) + switch (sPokedexView->menuCursorPos) { case 0: //BACK TO LIST default: gMain.newKeys |= START_BUTTON; break; case 1: //LIST TOP - gUnknown_02039B4C->selectedPokemon = 0; - gUnknown_02039B4C->unk62C = 0x40; + sPokedexView->selectedPokemon = 0; + sPokedexView->unk62C = 0x40; sub_80BDA40(); - sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE); + CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE); gMain.newKeys |= START_BUTTON; break; case 2: //LIST BOTTOM - gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->pokemonListCount - 1; - gUnknown_02039B4C->unk62C = gUnknown_02039B4C->pokemonListCount * 16 + 0x30; + sPokedexView->selectedPokemon = sPokedexView->pokemonListCount - 1; + sPokedexView->unk62C = sPokedexView->pokemonListCount * 16 + 0x30; sub_80BDA40(); - sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE); + CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE); gMain.newKeys |= START_BUTTON; break; case 3: //BACK TO POKEDEX @@ -1681,18 +1681,18 @@ void sub_80BC0F8(u8 taskId) //Exit menu when Start or B is pressed if (gMain.newKeys & (START_BUTTON | B_BUTTON)) { - gUnknown_02039B4C->menuIsOpen = 0; + sPokedexView->menuIsOpen = 0; gTasks[taskId].func = sub_80BBEB8; PlaySE(SE_SELECT); } - else if ((gMain.newAndRepeatedKeys & DPAD_UP) && gUnknown_02039B4C->menuCursorPos) + else if ((gMain.newAndRepeatedKeys & DPAD_UP) && sPokedexView->menuCursorPos) { - gUnknown_02039B4C->menuCursorPos--; + sPokedexView->menuCursorPos--; PlaySE(SE_SELECT); } - else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && gUnknown_02039B4C->menuCursorPos <= 3) + else if ((gMain.newAndRepeatedKeys & DPAD_DOWN) && sPokedexView->menuCursorPos <= 3) { - gUnknown_02039B4C->menuCursorPos++; + sPokedexView->menuCursorPos++; PlaySE(SE_SELECT); } } @@ -1700,11 +1700,11 @@ void sub_80BC0F8(u8 taskId) void sub_80BC2D4(u8 taskId) { - if (gSprites[gUnknown_02039B4C->selectedMonSpriteId].pos1.x == 48 && gSprites[gUnknown_02039B4C->selectedMonSpriteId].pos1.y == 56) + if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56) { - gUnknown_02039B4C->unk64B = gUnknown_02039B4C->unk64A; - gTasks[taskId].data[0] = sub_80BE91C(&gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon], gUnknown_02039B4C->selectedMonSpriteId); - gUnknown_02039B4C->selectedMonSpriteId = -1; + sPokedexView->unk64B = sPokedexView->unk64A; + gTasks[taskId].data[0] = sub_80BE91C(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId); + sPokedexView->selectedMonSpriteId = -1; gTasks[taskId].func = sub_80BC360; } } @@ -1713,8 +1713,8 @@ void sub_80BC360(u8 taskId) { if (gTasks[gTasks[taskId].data[0]].isActive) { - if (gUnknown_02039B4C->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930()) - sub_80BE9F8(&gUnknown_02039B4C->unk0[gUnknown_02039B4C->selectedPokemon], gTasks[taskId].data[0]); + if (sPokedexView->unk64A == 1 && !sub_80BE9C4(gTasks[taskId].data[0]) && sub_80BD930()) + sub_80BE9F8(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], gTasks[taskId].data[0]); } else { @@ -1726,12 +1726,12 @@ void sub_80BC3DC(u8 taskId) { if (!gPaletteFade.active) { - gUnknown_02039B4C->unk62C = gUnknown_02039B4C->unk62A; - gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->unk610; - gUnknown_02039B4C->dexMode = gUnknown_02039B4C->unk614; + sPokedexView->unk62C = sPokedexView->unk62A; + sPokedexView->selectedPokemon = sPokedexView->unk610; + sPokedexView->dexMode = sPokedexView->unk614; if (!IsNationalPokedexEnabled()) - gUnknown_02039B4C->dexMode = DEX_MODE_HOENN; - gUnknown_02039B4C->dexOrder = gUnknown_02039B4C->unk618; + sPokedexView->dexMode = DEX_MODE_HOENN; + sPokedexView->dexOrder = sPokedexView->unk618; gTasks[taskId].func = sub_80BB78C; sub_80BDA40(); sub_80BC890(); @@ -1742,12 +1742,12 @@ void sub_80BC47C(u8 taskId) { if (!gPaletteFade.active) { - gUnknown_02039B4C->unk62C = gUnknown_02039B4C->unk62A; - gUnknown_02039B4C->selectedPokemon = gUnknown_02039B4C->unk610; - gUnknown_02039B4C->dexMode = gUnknown_02039B4C->unk614; + sPokedexView->unk62C = sPokedexView->unk62A; + sPokedexView->selectedPokemon = sPokedexView->unk610; + sPokedexView->dexMode = sPokedexView->unk614; if (!IsNationalPokedexEnabled()) - gUnknown_02039B4C->dexMode = DEX_MODE_HOENN; - gUnknown_02039B4C->dexOrder = gUnknown_02039B4C->unk618; + sPokedexView->dexMode = DEX_MODE_HOENN; + sPokedexView->dexOrder = sPokedexView->unk618; gTasks[taskId].func = sub_80BBDE8; } } @@ -1761,9 +1761,9 @@ bool8 sub_80BC514(u8 a) if (gPaletteFade.active) return 0; SetVBlankCallback(NULL); - gUnknown_02039B4C->unk64A = a; + sPokedexView->unk64A = a; sub_80C09B0(0); - SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D); + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gBgTemplates_0855D298, 4); SetBgTilemapBuffer(3, AllocZeroed(0x800)); @@ -1771,19 +1771,19 @@ bool8 sub_80BC514(u8 a) SetBgTilemapBuffer(1, AllocZeroed(0x800)); SetBgTilemapBuffer(0, AllocZeroed(0x800)); DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(1, gUnknown_08DC2C5C, 0, 0); - CopyToBgTilemapBuffer(3, gUnknown_08DC2DAC, 0, 0); + CopyToBgTilemapBuffer(1, gPokedexTilemap_Main, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexTilemap_MainUnderlay, 0, 0); if (a == 0) - CopyToBgTilemapBuffer(0, gUnknown_08DC2A08, 0, 0x280); + CopyToBgTilemapBuffer(0, gPokedexTilemap_StartMenu1, 0, 0x280); else - CopyToBgTilemapBuffer(0, gUnknown_08DC2B1C, 0, 0x280); + CopyToBgTilemapBuffer(0, gPokedexTilemap_StartMenu2, 0, 0x280); ResetPaletteFade(); if (a == 0) - gUnknown_02039B4C->unk64C_1 = FALSE; + sPokedexView->unk64C_1 = FALSE; else - gUnknown_02039B4C->unk64C_1 = TRUE; - sub_80BC844(gUnknown_02039B4C->unk64C_1); - InitWindows(sWindowTemplates_0855D2A8); + sPokedexView->unk64C_1 = TRUE; + sub_80BC844(sPokedexView->unk64C_1); + InitWindows(sPokemonList_WindowTemplate); DeactivateAllTextPrinters(); PutWindowTilemap(0); CopyWindowToVram(0, 3); @@ -1793,9 +1793,9 @@ bool8 sub_80BC514(u8 a) ResetSpriteData(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; - LoadCompressedObjectPic(&gSpriteSheets_0855D26C[0]); - LoadSpritePalettes(gSpritePalettes_0855D26C); - sub_80BDB7C(a); + LoadCompressedObjectPic(&sInterfaceSpriteSheet[0]); + LoadSpritePalettes(sInterfaceSpritePalette); + CreateInterfaceSprites(a); gMain.state++; break; case 2: @@ -1803,10 +1803,10 @@ bool8 sub_80BC514(u8 a) break; case 3: if (a == 0) - sub_80BC8D4(gUnknown_02039B4C->dexMode, gUnknown_02039B4C->dexOrder); - sub_80BD2B4(gUnknown_02039B4C->selectedPokemon, 0xE); - gUnknown_02039B4C->menuIsOpen = 0; - gUnknown_02039B4C->menuY = 0; + sub_80BC8D4(sPokedexView->dexMode, sPokedexView->dexOrder); + CreateInitialPokemonSprites(sPokedexView->selectedPokemon, 0xE); + sPokedexView->menuIsOpen = 0; + sPokedexView->menuY = 0; CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); @@ -1881,7 +1881,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) u16 vars[3]; //I have no idea why three regular variables are stored in an array, but whatever. s16 i; - gUnknown_02039B4C->pokemonListCount = 0; + sPokedexView->pokemonListCount = 0; switch (dexMode) { @@ -1912,11 +1912,11 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) for (i = 0; i < vars[0]; i++) { vars[2] = HoennToNationalOrder(i + 1); - gUnknown_02039B4C->unk0[i].dexNum = vars[2]; - gUnknown_02039B4C->unk0[i].seen = GetSetPokedexFlag(vars[2], 0); - gUnknown_02039B4C->unk0[i].owned = GetSetPokedexFlag(vars[2], 1); - if (gUnknown_02039B4C->unk0[i].seen) - gUnknown_02039B4C->pokemonListCount = i + 1; + sPokedexView->pokedexList[i].dexNum = vars[2]; + sPokedexView->pokedexList[i].seen = GetSetPokedexFlag(vars[2], 0); + sPokedexView->pokedexList[i].owned = GetSetPokedexFlag(vars[2], 1); + if (sPokedexView->pokedexList[i].seen) + sPokedexView->pokemonListCount = i + 1; } } else @@ -1933,11 +1933,11 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) if (r10) { asm(""); //Needed to match for some reason - gUnknown_02039B4C->unk0[r5].dexNum = vars[2]; - gUnknown_02039B4C->unk0[r5].seen = GetSetPokedexFlag(vars[2], 0); - gUnknown_02039B4C->unk0[r5].owned = GetSetPokedexFlag(vars[2], 1); - if (gUnknown_02039B4C->unk0[r5].seen) - gUnknown_02039B4C->pokemonListCount = r5 + 1; + sPokedexView->pokedexList[r5].dexNum = vars[2]; + sPokedexView->pokedexList[r5].seen = GetSetPokedexFlag(vars[2], 0); + sPokedexView->pokedexList[r5].owned = GetSetPokedexFlag(vars[2], 1); + if (sPokedexView->pokedexList[r5].seen) + sPokedexView->pokemonListCount = r5 + 1; r5++; } } @@ -1950,10 +1950,10 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 0)) { - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2]; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = GetSetPokedexFlag(vars[2], 1); - gUnknown_02039B4C->pokemonListCount++; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = GetSetPokedexFlag(vars[2], 1); + sPokedexView->pokemonListCount++; } } break; @@ -1964,10 +1964,10 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1)) { - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2]; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = 1; - gUnknown_02039B4C->pokemonListCount++; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1; + sPokedexView->pokemonListCount++; } } break; @@ -1978,10 +1978,10 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1)) { - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2]; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = 1; - gUnknown_02039B4C->pokemonListCount++; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1; + sPokedexView->pokemonListCount++; } } break; @@ -1992,10 +1992,10 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1)) { - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2]; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = 1; - gUnknown_02039B4C->pokemonListCount++; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1; + sPokedexView->pokemonListCount++; } } break; @@ -2006,20 +2006,20 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1)) { - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].dexNum = vars[2]; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].seen = 1; - gUnknown_02039B4C->unk0[gUnknown_02039B4C->pokemonListCount].owned = 1; - gUnknown_02039B4C->pokemonListCount++; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1; + sPokedexView->pokemonListCount++; } } break; } - for (i = gUnknown_02039B4C->pokemonListCount; i < NATIONAL_DEX_COUNT; i++) + for (i = sPokedexView->pokemonListCount; i < NATIONAL_DEX_COUNT; i++) { - gUnknown_02039B4C->unk0[i].dexNum |= 0xFFFF; - gUnknown_02039B4C->unk0[i].seen = 0; - gUnknown_02039B4C->unk0[i].owned = 0; + sPokedexView->pokedexList[i].dexNum |= 0xFFFF; + sPokedexView->pokedexList[i].seen = 0; + sPokedexView->pokedexList[i].owned = 0; } } @@ -2046,18 +2046,18 @@ void sub_80BCE84(u8 a, u16 b, u16 c) _b = b - 5; for (i = 0; i <= 10; i++) { - if (_b < 0 || _b >= NATIONAL_DEX_COUNT || gUnknown_02039B4C->unk0[_b].dexNum == 0xFFFF) + if (_b < 0 || _b >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[_b].dexNum == 0xFFFF) { sub_80BD28C(0x11, i * 2, c); } else { sub_80BD28C(0x11, i * 2, c); - if (gUnknown_02039B4C->unk0[_b].seen) + if (sPokedexView->pokedexList[_b].seen) { sub_80BD154(_b, 0x12, i * 2, c); - sub_80BD1F4(gUnknown_02039B4C->unk0[_b].owned, 0x11, i * 2, c); - sub_80BD23C(gUnknown_02039B4C->unk0[_b].dexNum, 0x16, i * 2); + sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, i * 2, c); + sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, i * 2); } else { @@ -2071,42 +2071,42 @@ void sub_80BCE84(u8 a, u16 b, u16 c) break; case 1: _b = b - 5; - if (_b < 0 || _b >= NATIONAL_DEX_COUNT || gUnknown_02039B4C->unk0[_b].dexNum == 0xFFFF) + if (_b < 0 || _b >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[_b].dexNum == 0xFFFF) { - sub_80BD28C(0x11, gUnknown_02039B4C->unk630 * 2, c); + sub_80BD28C(0x11, sPokedexView->unk630 * 2, c); } else { - sub_80BD28C(0x11, gUnknown_02039B4C->unk630 * 2, c); - if (gUnknown_02039B4C->unk0[_b].seen) + sub_80BD28C(0x11, sPokedexView->unk630 * 2, c); + if (sPokedexView->pokedexList[_b].seen) { - sub_80BD154(_b, 0x12, gUnknown_02039B4C->unk630 * 2, c); - sub_80BD1F4(gUnknown_02039B4C->unk0[_b].owned, 0x11, gUnknown_02039B4C->unk630 * 2, c); - sub_80BD23C(gUnknown_02039B4C->unk0[_b].dexNum, 0x16, gUnknown_02039B4C->unk630 * 2); + sub_80BD154(_b, 0x12, sPokedexView->unk630 * 2, c); + sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, sPokedexView->unk630 * 2, c); + sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, sPokedexView->unk630 * 2); } else { - sub_80BD154(_b, 0x12, gUnknown_02039B4C->unk630 * 2, c); - sub_80BD1F4(0, 0x11, gUnknown_02039B4C->unk630 * 2, c); - sub_80BD23C(0, 0x16, gUnknown_02039B4C->unk630 * 2); + sub_80BD154(_b, 0x12, sPokedexView->unk630 * 2, c); + sub_80BD1F4(0, 0x11, sPokedexView->unk630 * 2, c); + sub_80BD23C(0, 0x16, sPokedexView->unk630 * 2); } } break; case 2: _b = b + 5; - r2 = gUnknown_02039B4C->unk630 + 10; + r2 = sPokedexView->unk630 + 10; if (r2 > 15) r2 -= 16; - if (_b < 0 || _b >= NATIONAL_DEX_COUNT || gUnknown_02039B4C->unk0[_b].dexNum == 0xFFFF) + if (_b < 0 || _b >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[_b].dexNum == 0xFFFF) sub_80BD28C(0x11, r2 * 2, c); else { sub_80BD28C(0x11, r2 * 2, c); - if (gUnknown_02039B4C->unk0[_b].seen) + if (sPokedexView->pokedexList[_b].seen) { sub_80BD154(_b, 0x12, r2 * 2, c); - sub_80BD1F4(gUnknown_02039B4C->unk0[_b].owned, 0x11, r2 * 2, c); - sub_80BD23C(gUnknown_02039B4C->unk0[_b].dexNum, 0x16, r2 * 2); + sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, r2 * 2, c); + sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, r2 * 2); } else { @@ -2125,9 +2125,9 @@ void sub_80BD154(u16 a, u8 left, u8 top, u16 unused) u8 text[6]; u16 r6; - memcpy(text, gUnknown_0855D2B8, 6); - r6 = gUnknown_02039B4C->unk0[a].dexNum; - if (gUnknown_02039B4C->dexMode == DEX_MODE_HOENN) + memcpy(text, sText_No000, 6); + r6 = sPokedexView->pokedexList[a].dexNum; + if (sPokedexView->dexMode == DEX_MODE_HOENN) r6 = NationalToHoennOrder(r6); text[2] = CHAR_0 + r6 / 100; text[3] = CHAR_0 + (r6 % 100) / 10; @@ -2161,7 +2161,7 @@ void sub_80BD28C(u8 x, u8 y, u16 unused) FillWindowPixelRect(0, 0, x * 8, y * 8, 0x60, 16); } -void sub_80BD2B4(u16 a, u16 b) +static void CreateInitialPokemonSprites(u16 selectedMon, u16 b) { u8 i; u16 unk; @@ -2170,10 +2170,10 @@ void sub_80BD2B4(u16 a, u16 b) gPaletteFade.bufferTransferDisabled = TRUE; for (i = 0; i < 4; i++) - gUnknown_02039B4C->unk61E[i] = 0xFFFF; - gUnknown_02039B4C->selectedMonSpriteId = 0xFFFF; + sPokedexView->unk61E[i] = 0xFFFF; + sPokedexView->selectedMonSpriteId = 0xFFFF; - unk = sub_80BDA8C(a - 1); + unk = sub_80BDA8C(selectedMon - 1); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); @@ -2181,7 +2181,7 @@ void sub_80BD2B4(u16 a, u16 b) gSprites[spriteId].data[5] = -32; } - unk = sub_80BDA8C(a); + unk = sub_80BDA8C(selectedMon); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); @@ -2189,7 +2189,7 @@ void sub_80BD2B4(u16 a, u16 b) gSprites[spriteId].data[5] = 0; } - unk = sub_80BDA8C(a + 1); + unk = sub_80BDA8C(selectedMon + 1); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); @@ -2197,11 +2197,11 @@ void sub_80BD2B4(u16 a, u16 b) gSprites[spriteId].data[5] = 32; } - sub_80BCE84(0, a, b); - SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D); + sub_80BCE84(0, selectedMon, b); + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D); - gUnknown_02039B4C->unk630 = 0; - gUnknown_02039B4C->unk632 = 0; + sPokedexView->unk630 = 0; + sPokedexView->unk632 = 0; gPaletteFade.bufferTransferDisabled = FALSE; } @@ -2211,79 +2211,79 @@ bool8 sub_80BD404(u8 a, u8 b, u8 c) u16 i; u8 foo; - if (gUnknown_02039B4C->unk62E) + if (sPokedexView->unk62E) { - gUnknown_02039B4C->unk62E--; + sPokedexView->unk62E--; switch (a) { case 1: for (i = 0; i < 4; i++) { - if (gUnknown_02039B4C->unk61E[i] != 0xFFFF) - gSprites[gUnknown_02039B4C->unk61E[i]].data[5] += b; + if (sPokedexView->unk61E[i] != 0xFFFF) + gSprites[sPokedexView->unk61E[i]].data[5] += b; } - foo = 16 * (c - gUnknown_02039B4C->unk62E) / c; - SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D + gUnknown_02039B4C->unk632 * 16 - foo); - gUnknown_02039B4C->unk62C -= gUnknown_02039B4C->unk628; + foo = 16 * (c - sPokedexView->unk62E) / c; + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk632 * 16 - foo); + sPokedexView->unk62C -= sPokedexView->unk628; break; case 2: for (i = 0; i < 4; i++) { - if (gUnknown_02039B4C->unk61E[i] != 0xFFFF) - gSprites[gUnknown_02039B4C->unk61E[i]].data[5] -= b; + if (sPokedexView->unk61E[i] != 0xFFFF) + gSprites[sPokedexView->unk61E[i]].data[5] -= b; } - foo = 16 * (c - gUnknown_02039B4C->unk62E) / c; - SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D + gUnknown_02039B4C->unk632 * 16 + foo); - gUnknown_02039B4C->unk62C += gUnknown_02039B4C->unk628; + foo = 16 * (c - sPokedexView->unk62E) / c; + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk632 * 16 + foo); + sPokedexView->unk62C += sPokedexView->unk628; break; } return FALSE; } else { - SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D + gUnknown_02039B4C->unk630 * 16); + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk630 * 16); return TRUE; } } -void sub_80BD5A8(u8 a, u16 b) +static void CreateNewPokemonSprite(u8 direction, u16 selectedMon) { u16 unk; u8 spriteId; - gUnknown_02039B4C->unk632 = gUnknown_02039B4C->unk630; - switch (a) + sPokedexView->unk632 = sPokedexView->unk630; + switch (direction) { - case 1: - unk = sub_80BDA8C(b - 1); + case 1: // up + unk = sub_80BDA8C(selectedMon - 1); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_80BE4E0; gSprites[spriteId].data[5] = -64; } - if (gUnknown_02039B4C->unk630 > 0) - gUnknown_02039B4C->unk630--; + if (sPokedexView->unk630 > 0) + sPokedexView->unk630--; else - gUnknown_02039B4C->unk630 = 15; + sPokedexView->unk630 = 15; break; - case 2: - unk = sub_80BDA8C(b + 1); + case 2: // down + unk = sub_80BDA8C(selectedMon + 1); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_80BE4E0; gSprites[spriteId].data[5] = 0x40; } - if (gUnknown_02039B4C->unk630 <= 0xE) - gUnknown_02039B4C->unk630++; + if (sPokedexView->unk630 <= 0xE) + sPokedexView->unk630++; else - gUnknown_02039B4C->unk630 = 0; + sPokedexView->unk630 = 0; break; } } -u16 sub_80BD69C(u16 a, u16 b) +u16 sub_80BD69C(u16 selectedMon, u16 b) { u8 r3; u8 r5; @@ -2291,61 +2291,61 @@ u16 sub_80BD69C(u16 a, u16 b) u16 r6; u8 r10 = 0; - if ((gMain.heldKeys & DPAD_UP) && (a > 0)) + if ((gMain.heldKeys & DPAD_UP) && (selectedMon > 0)) { r10 = 1; - a = sub_80C0E0C(1, a, 0, gUnknown_02039B4C->pokemonListCount - 1); - sub_80BD5A8(1, a); - sub_80BCE84(1, a, b); + selectedMon = sub_80C0E0C(1, selectedMon, 0, sPokedexView->pokemonListCount - 1); + CreateNewPokemonSprite(1, selectedMon); + sub_80BCE84(1, selectedMon, b); PlaySE(SE_Z_SCROLL); } - else if ((gMain.heldKeys & DPAD_DOWN) && (a < gUnknown_02039B4C->pokemonListCount - 1)) + else if ((gMain.heldKeys & DPAD_DOWN) && (selectedMon < sPokedexView->pokemonListCount - 1)) { r10 = 2; - a = sub_80C0E0C(0, a, 0, gUnknown_02039B4C->pokemonListCount - 1); - sub_80BD5A8(2, a); - sub_80BCE84(2, a, b); + selectedMon = sub_80C0E0C(0, selectedMon, 0, sPokedexView->pokemonListCount - 1); + CreateNewPokemonSprite(2, selectedMon); + sub_80BCE84(2, selectedMon, b); PlaySE(SE_Z_SCROLL); } - else if ((gMain.newKeys & DPAD_LEFT) && (a > 0)) + else if ((gMain.newKeys & DPAD_LEFT) && (selectedMon > 0)) { - r6 = a; + r6 = selectedMon; for (i = 0; i < 7; i++) - a = sub_80C0E0C(1, a, 0, gUnknown_02039B4C->pokemonListCount - 1); - gUnknown_02039B4C->unk62C += 16 * (a - r6); + selectedMon = sub_80C0E0C(1, selectedMon, 0, sPokedexView->pokemonListCount - 1); + sPokedexView->unk62C += 16 * (selectedMon - r6); sub_80BDA40(); - sub_80BD2B4(a, 0xE); + CreateInitialPokemonSprites(selectedMon, 0xE); PlaySE(SE_Z_PAGE); } - else if ((gMain.newKeys & DPAD_RIGHT) && (a < gUnknown_02039B4C->pokemonListCount - 1)) + else if ((gMain.newKeys & DPAD_RIGHT) && (selectedMon < sPokedexView->pokemonListCount - 1)) { - r6 = a; + r6 = selectedMon; for (i = 0; i < 7; i++) - a = sub_80C0E0C(0, a, 0, gUnknown_02039B4C->pokemonListCount - 1); - gUnknown_02039B4C->unk62C += (a - r6) * 16; + selectedMon = sub_80C0E0C(0, selectedMon, 0, sPokedexView->pokemonListCount - 1); + sPokedexView->unk62C += (selectedMon - r6) * 16; sub_80BDA40(); - sub_80BD2B4(a, 0xE); + CreateInitialPokemonSprites(selectedMon, 0xE); PlaySE(SE_Z_PAGE); } if (r10 == 0) { - gUnknown_02039B4C->unk638 = 0; - return a; + sPokedexView->unk638 = 0; + return selectedMon; } - r5 = gUnknown_0855D28C[gUnknown_02039B4C->unk638 / 4]; - r3 = gUnknown_0855D291[gUnknown_02039B4C->unk638 / 4]; - gUnknown_02039B4C->unk62E = r3; - gUnknown_02039B4C->unk636 = r3; - gUnknown_02039B4C->unk634 = r5; - gUnknown_02039B4C->unk62F = r10; - gUnknown_02039B4C->unk628 = r5 / 2; - sub_80BD404(gUnknown_02039B4C->unk62F, gUnknown_02039B4C->unk634, gUnknown_02039B4C->unk636); - if (gUnknown_02039B4C->unk638 <= 0xB) - gUnknown_02039B4C->unk638++; - return a; + r5 = gUnknown_0855D28C[sPokedexView->unk638 / 4]; + r3 = gUnknown_0855D291[sPokedexView->unk638 / 4]; + sPokedexView->unk62E = r3; + sPokedexView->unk636 = r3; + sPokedexView->unk634 = r5; + sPokedexView->unk62F = r10; + sPokedexView->unk628 = r5 / 2; + sub_80BD404(sPokedexView->unk62F, sPokedexView->unk634, sPokedexView->unk636); + if (sPokedexView->unk638 <= 0xB) + sPokedexView->unk638++; + return selectedMon; } void sub_80BD8D0(void) @@ -2354,61 +2354,61 @@ void sub_80BD8D0(void) for (i = 0; i < 4; i++) { - u16 spriteId = gUnknown_02039B4C->unk61E[i]; + u16 spriteId = sPokedexView->unk61E[i]; if (gSprites[spriteId].pos2.x == 0 && gSprites[spriteId].pos2.y == 0 && spriteId != 0xFFFF) - gUnknown_02039B4C->selectedMonSpriteId = spriteId; + sPokedexView->selectedMonSpriteId = spriteId; } } u8 sub_80BD930(void) { u16 r2; - u16 r4 = gUnknown_02039B4C->selectedPokemon; + u16 r4 = sPokedexView->selectedPokemon; if ((gMain.newKeys & DPAD_UP) && r4) { r2 = r4; while (r2 != 0) { - r2 = sub_80C0E0C(1, r2, 0, gUnknown_02039B4C->pokemonListCount - 1); + r2 = sub_80C0E0C(1, r2, 0, sPokedexView->pokemonListCount - 1); - if (gUnknown_02039B4C->unk0[r2].seen) + if (sPokedexView->pokedexList[r2].seen) { r4 = r2; break; } } - if (gUnknown_02039B4C->selectedPokemon == r4) + if (sPokedexView->selectedPokemon == r4) return FALSE; else { - gUnknown_02039B4C->selectedPokemon = r4; - gUnknown_02039B4C->unk62C -= 16; + sPokedexView->selectedPokemon = r4; + sPokedexView->unk62C -= 16; return TRUE; } } - else if ((gMain.newKeys & DPAD_DOWN) && r4 < gUnknown_02039B4C->pokemonListCount - 1) + else if ((gMain.newKeys & DPAD_DOWN) && r4 < sPokedexView->pokemonListCount - 1) { r2 = r4; - while (r2 < gUnknown_02039B4C->pokemonListCount - 1) + while (r2 < sPokedexView->pokemonListCount - 1) { - r2 = sub_80C0E0C(0, r2, 0, gUnknown_02039B4C->pokemonListCount - 1); + r2 = sub_80C0E0C(0, r2, 0, sPokedexView->pokemonListCount - 1); - if (gUnknown_02039B4C->unk0[r2].seen) + if (sPokedexView->pokedexList[r2].seen) { r4 = r2; break; } } - if (gUnknown_02039B4C->selectedPokemon == r4) + if (sPokedexView->selectedPokemon == r4) return FALSE; else { - gUnknown_02039B4C->selectedPokemon = r4; - gUnknown_02039B4C->unk62C += 16; + sPokedexView->selectedPokemon = r4; + sPokedexView->unk62C += 16; return TRUE; } } @@ -2421,10 +2421,10 @@ u8 sub_80BDA40(void) for (i = 0; i < 4; i++) { - if (gUnknown_02039B4C->unk61E[i] != 0xFFFF) + if (sPokedexView->unk61E[i] != 0xFFFF) { - FreeAndDestroyMonPicSprite(gUnknown_02039B4C->unk61E[i]); - gUnknown_02039B4C->unk61E[i] |= 0xFFFF; + FreeAndDestroyMonPicSprite(sPokedexView->unk61E[i]); + sPokedexView->unk61E[i] |= 0xFFFF; } } return FALSE; @@ -2432,10 +2432,10 @@ u8 sub_80BDA40(void) u16 sub_80BDA8C(u16 a1) { - if (a1 >= NATIONAL_DEX_COUNT || gUnknown_02039B4C->unk0[a1].dexNum == 0xFFFF) + if (a1 >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[a1].dexNum == 0xFFFF) return 0xFFFF; - else if (gUnknown_02039B4C->unk0[a1].seen) - return gUnknown_02039B4C->unk0[a1].dexNum; + else if (sPokedexView->pokedexList[a1].seen) + return sPokedexView->pokedexList[a1].dexNum; else return 0; } @@ -2446,7 +2446,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y) for (i = 0; i < 4; i++) { - if (gUnknown_02039B4C->unk61E[i] == 0xFFFF) + if (sPokedexView->unk61E[i] == 0xFFFF) { u8 spriteId = sub_80C0E9C(num, x, y, i); @@ -2455,45 +2455,46 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y) gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[1] = i; gSprites[spriteId].data[2] = NationalPokedexNumToSpecies(num); - gUnknown_02039B4C->unk61E[i] = spriteId; + sPokedexView->unk61E[i] = spriteId; return spriteId; } } return 0xFFFF; } -void sub_80BDB7C(u8 a) +static void CreateInterfaceSprites(u8 a) { u8 spriteId; u16 r5; - - spriteId = CreateSprite(&gUnknown_0855D1AC, 184, 4, 0); +// Up arrow + spriteId = CreateSprite(&sArrowSpriteTemplate, 184, 4, 0); gSprites[spriteId].data[1] = 0; - - spriteId = CreateSprite(&gUnknown_0855D1AC, 184, 156, 0); +// Down arrow + spriteId = CreateSprite(&sArrowSpriteTemplate, 184, 156, 0); gSprites[spriteId].data[1] = 1; gSprites[spriteId].vFlip = TRUE; - CreateSprite(&gUnknown_0855D194, 230, 20, 0); - CreateSprite(&gUnknown_0855D1C4, 16, 120, 0); - - spriteId = CreateSprite(&gUnknown_0855D1C4, 48, 120, 0); + CreateSprite(&sScrollBarSpriteTemplate, 230, 20, 0); +// Start button + CreateSprite(&sInterfaceTextSpriteTemplate, 16, 120, 0); +// Menu text + spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 48, 120, 0); StartSpriteAnim(&gSprites[spriteId], 3); - - spriteId = CreateSprite(&gUnknown_0855D1C4, 16, 144, 0); +// Select button + spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 16, 144, 0); StartSpriteAnim(&gSprites[spriteId], 2); gSprites[spriteId].data[2] = 0x80; - - spriteId = CreateSprite(&gUnknown_0855D1C4, 48, 144, 0); +// Search text + spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 48, 144, 0); StartSpriteAnim(&gSprites[spriteId], 1); - spriteId = CreateSprite(&gUnknown_0855D1DC, 0, 80, 2); + spriteId = CreateSprite(&sRotatingPokeballSpriteTemplate, 0, 80, 2); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 30; gSprites[spriteId].data[0] = 0x1E; gSprites[spriteId].data[1] = 0; - spriteId = CreateSprite(&gUnknown_0855D1DC, 0, 80, 2); + spriteId = CreateSprite(&sRotatingPokeballSpriteTemplate, 0, 80, 2); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 31; gSprites[spriteId].data[0] = 0x1F; @@ -2505,58 +2506,59 @@ void sub_80BDB7C(u8 a) if (!IsNationalPokedexEnabled()) { - CreateSprite(&gUnknown_0855D1F4, 32, 40, 1); - - spriteId = CreateSprite(&gUnknown_0855D1F4, 32, 72, 1); +// Seen text + CreateSprite(&sSeenOwnTextSpriteTemplate, 32, 40, 1); +// Own text + spriteId = CreateSprite(&sSeenOwnTextSpriteTemplate, 32, 72, 1); StartSpriteAnim(&gSprites[spriteId], 1); _a = 0; - +// Seen value - 100s spriteId = CreateSprite(&gUnknown_0855D224, 24, 48, 1); - r5 = gUnknown_02039B4C->unk61A / 100; + r5 = sPokedexView->seenCount / 100; StartSpriteAnim(&gSprites[spriteId], r5); if (r5 != 0) _a = 1; else gSprites[spriteId].invisible = TRUE; - +// Seen value - 10s spriteId = CreateSprite(&gUnknown_0855D224, 32, 48, 1); - r5 = (gUnknown_02039B4C->unk61A % 100) / 10; + r5 = (sPokedexView->seenCount % 100) / 10; if (r5 != 0 || _a != 0) StartSpriteAnim(&gSprites[spriteId], r5); else gSprites[spriteId].invisible = TRUE; - +// Seen value - 1s spriteId = CreateSprite(&gUnknown_0855D224, 40, 48, 1); - r5 = (gUnknown_02039B4C->unk61A % 100) % 10; + r5 = (sPokedexView->seenCount % 100) % 10; StartSpriteAnim(&gSprites[spriteId], r5); _a = 0; - +// Owned value - 100s spriteId = CreateSprite(&gUnknown_0855D224, 24, 80, 1); - r5 = gUnknown_02039B4C->unk61C / 100; + r5 = sPokedexView->ownCount / 100; StartSpriteAnim(&gSprites[spriteId], r5); if (r5 != 0) _a = 1; else gSprites[spriteId].invisible = TRUE; - +// Owned value - 10s spriteId = CreateSprite(&gUnknown_0855D224, 32, 80, 1); - r5 = (gUnknown_02039B4C->unk61C % 100) / 10; + r5 = (sPokedexView->ownCount % 100) / 10; if (r5 != 0 || _a != 0) StartSpriteAnim(&gSprites[spriteId], r5); else gSprites[spriteId].invisible = TRUE; - +// Owned value -1s spriteId = CreateSprite(&gUnknown_0855D224, 40, 80, 1); - r5 = (gUnknown_02039B4C->unk61C % 100) % 10; + r5 = (sPokedexView->ownCount % 100) % 10; StartSpriteAnim(&gSprites[spriteId], r5); } else { u16 r6; - CreateSprite(&gUnknown_0855D1F4, 32, 40, 1); + CreateSprite(&sSeenOwnTextSpriteTemplate, 32, 40, 1); - spriteId = CreateSprite(&gUnknown_0855D1F4, 32, 76, 1); + spriteId = CreateSprite(&sSeenOwnTextSpriteTemplate, 32, 76, 1); StartSpriteAnim(&gSprites[spriteId], 1); CreateSprite(&gUnknown_0855D20C, 17, 45, 1); @@ -2594,7 +2596,7 @@ void sub_80BDB7C(u8 a) _a = 0; spriteId = CreateSprite(&gUnknown_0855D23C, 40, 55, 1); - r5 = gUnknown_02039B4C->unk61A / 100; + r5 = sPokedexView->seenCount / 100; StartSpriteAnim(&gSprites[spriteId], r5); if (r5 != 0) _a = 1; @@ -2602,14 +2604,14 @@ void sub_80BDB7C(u8 a) gSprites[spriteId].invisible = TRUE; spriteId = CreateSprite(&gUnknown_0855D23C, 48, 55, 1); - r5 = (gUnknown_02039B4C->unk61A % 100) / 10; + r5 = (sPokedexView->seenCount % 100) / 10; if (r5 != 0 || _a != 0) StartSpriteAnim(&gSprites[spriteId], r5); else gSprites[spriteId].invisible = TRUE; spriteId = CreateSprite(&gUnknown_0855D23C, 56, 55, 1); - r5 = (gUnknown_02039B4C->unk61A % 100) % 10; + r5 = (sPokedexView->seenCount % 100) % 10; StartSpriteAnim(&gSprites[spriteId], r5); r6 = GetHoennPokedexCount(1); @@ -2637,7 +2639,7 @@ void sub_80BDB7C(u8 a) _a = 0; spriteId = CreateSprite(&gUnknown_0855D23C, 40, 91, 1); - r5 = gUnknown_02039B4C->unk61C / 100; + r5 = sPokedexView->ownCount / 100; StartSpriteAnim(&gSprites[spriteId], r5); if (r5 != 0) _a = 1; @@ -2645,14 +2647,14 @@ void sub_80BDB7C(u8 a) gSprites[spriteId].invisible = TRUE; spriteId = CreateSprite(&gUnknown_0855D23C, 48, 91, 1); - r5 = (gUnknown_02039B4C->unk61C % 100) / 10; + r5 = (sPokedexView->ownCount % 100) / 10; if (r5 != 0 || _a != 0) StartSpriteAnim(&gSprites[spriteId], r5); else gSprites[spriteId].invisible = TRUE; spriteId = CreateSprite(&gUnknown_0855D23C, 56, 91, 1); - r5 = (gUnknown_02039B4C->unk61C % 100) % 10; + r5 = (sPokedexView->ownCount % 100) % 10; StartSpriteAnim(&gSprites[spriteId], r5); } spriteId = CreateSprite(&gUnknown_0855D254, 136, 96, 1); @@ -2671,7 +2673,7 @@ void nullsub_38(struct Sprite *sprite) void sub_80BE44C(struct Sprite *sprite) { - if (gUnknown_02039B4C->unk64A != 0) + if (sPokedexView->unk64A != 0) DestroySprite(sprite); } @@ -2704,10 +2706,10 @@ void sub_80BE4E0(struct Sprite *sprite) { u8 data1 = sprite->data[1]; - if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3) + if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3) { - FreeAndDestroyMonPicSprite(gUnknown_02039B4C->unk61E[data1]); - gUnknown_02039B4C->unk61E[data1] = 0xFFFF; + FreeAndDestroyMonPicSprite(sPokedexView->unk61E[data1]); + sPokedexView->unk61E[data1] = 0xFFFF; } else { @@ -2732,23 +2734,23 @@ void sub_80BE4E0(struct Sprite *sprite) if ((sprite->data[5] <= -64 || sprite->data[5] >= 64) && sprite->data[0] != 0) { - FreeAndDestroyMonPicSprite(gUnknown_02039B4C->unk61E[data1]); - gUnknown_02039B4C->unk61E[data1] = 0xFFFF; + FreeAndDestroyMonPicSprite(sPokedexView->unk61E[data1]); + sPokedexView->unk61E[data1] = 0xFFFF; } } } void sub_80BE604(struct Sprite *sprite) { - if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3) + if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3) DestroySprite(sprite); else - sprite->pos2.y = gUnknown_02039B4C->selectedPokemon * 120 / (gUnknown_02039B4C->pokemonListCount - 1); + sprite->pos2.y = sPokedexView->selectedPokemon * 120 / (sPokedexView->pokemonListCount - 1); } void sub_80BE658(struct Sprite *sprite) { - if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3) + if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3) { DestroySprite(sprite); } @@ -2758,7 +2760,7 @@ void sub_80BE658(struct Sprite *sprite) if (sprite->data[1] != 0) { - if (gUnknown_02039B4C->selectedPokemon == gUnknown_02039B4C->pokemonListCount - 1) + if (sPokedexView->selectedPokemon == sPokedexView->pokemonListCount - 1) sprite->invisible = TRUE; else sprite->invisible = FALSE; @@ -2766,7 +2768,7 @@ void sub_80BE658(struct Sprite *sprite) } else { - if (gUnknown_02039B4C->selectedPokemon == 0) + if (sPokedexView->selectedPokemon == 0) sprite->invisible = TRUE; else sprite->invisible = FALSE; @@ -2774,7 +2776,7 @@ void sub_80BE658(struct Sprite *sprite) } sprite->pos2.y = gSineTable[r0] / 64; sprite->data[2] = sprite->data[2] + 8; - if (gUnknown_02039B4C->menuIsOpen == 0 && gUnknown_02039B4C->menuY == 0 && sprite->invisible == 0) + if (sPokedexView->menuIsOpen == 0 && sPokedexView->menuY == 0 && sprite->invisible == 0) sprite->invisible = FALSE; else sprite->invisible = TRUE; @@ -2783,13 +2785,13 @@ void sub_80BE658(struct Sprite *sprite) void sub_80BE758(struct Sprite *sprite) { - if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3) + if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3) DestroySprite(sprite); } void sub_80BE780(struct Sprite *sprite) { - if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3) + if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3) { DestroySprite(sprite); } @@ -2799,12 +2801,12 @@ void sub_80BE780(struct Sprite *sprite) s16 r3; s16 r0; - val = gUnknown_02039B4C->unk62C + sprite->data[1]; + val = sPokedexView->unk62C + sprite->data[1]; r3 = gSineTable[val]; r0 = gSineTable[val + 0x40]; SetOamMatrix(sprite->data[0], r0, r3, -r3, r0); - val = gUnknown_02039B4C->unk62C + (sprite->data[1] + 0x40); + val = sPokedexView->unk62C + (sprite->data[1] + 0x40); r3 = gSineTable[val]; r0 = gSineTable[val + 0x40]; sprite->pos2.x = r0 * 40 / 256; @@ -2814,18 +2816,18 @@ void sub_80BE780(struct Sprite *sprite) void sub_80BE834(struct Sprite *sprite) { - if (gUnknown_02039B4C->unk64A != 0 && gUnknown_02039B4C->unk64A != 3) + if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3) { DestroySprite(sprite); } else { - u16 r1 = gUnknown_02039B4C->unk64A == 0 ? 80 : 96; + u16 r1 = sPokedexView->unk64A == 0 ? 80 : 96; - if (gUnknown_02039B4C->menuIsOpen != 0 && gUnknown_02039B4C->menuY == r1) + if (sPokedexView->menuIsOpen != 0 && sPokedexView->menuY == r1) { sprite->invisible = FALSE; - sprite->pos2.y = gUnknown_02039B4C->menuCursorPos * 16; + sprite->pos2.y = sPokedexView->menuCursorPos * 16; sprite->pos2.x = gSineTable[(u8)sprite->data[2]] / 64; sprite->data[2] += 8; } @@ -2850,7 +2852,7 @@ u8 sub_80BE91C(struct PokedexListItem* item, u8 b) { u8 taskId; - gUnknown_02039B54 = item; + sPokedexListItem = item; taskId = CreateTask(sub_80BEA24, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 1; @@ -2880,7 +2882,7 @@ bool8 sub_80BE9C4(u8 taskId) u8 sub_80BE9F8(struct PokedexListItem *item, u8 b) { - gUnknown_02039B54 = item; + sPokedexListItem = item; gTasks[b].data[0] = 1; gTasks[b].data[1] = 0; gTasks[b].data[2] = 0; @@ -2898,7 +2900,7 @@ void sub_80BEA24(u8 taskId) { u16 r2; - gUnknown_02039B4C->unk64A = 1; + sPokedexView->unk64A = 1; gUnknown_030060B4 = gMain.vblankCallback; SetVBlankCallback(NULL); r2 = 0; @@ -2912,26 +2914,26 @@ void sub_80BEA24(u8 taskId) break; case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, gUnknown_08DC3080, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0); FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); PutWindowTilemap(1); - sub_80C0D30(1, gUnknown_02039B54->dexNum); + sub_80C0D30(1, sPokedexListItem->dexNum); CopyWindowToVram(1, 2); gMain.state++; break; case 2: sub_80BFCDC(0xD); - sub_80BFD0C(gUnknown_02039B4C->selectedScreen, 0xD); - sub_80BC844(gUnknown_02039B4C->unk64C_1); + sub_80BFD0C(sPokedexView->selectedScreen, 0xD); + sub_80BC844(sPokedexView->unk64C_1); gMain.state++; break; case 3: gMain.state++; break; case 4: - sub_80C020C(gUnknown_02039B54->dexNum, gUnknown_02039B4C->dexMode == 0 ? 0 : 1, gUnknown_02039B54->owned, 0); - if (!gUnknown_02039B54->owned) + sub_80C020C(sPokedexListItem->dexNum, sPokedexView->dexMode == 0 ? 0 : 1, sPokedexListItem->owned, 0); + if (!sPokedexListItem->owned) LoadPalette(gPlttBufferUnfaded + 1, 0x31, 0x1E); CopyWindowToVram(0, 3); CopyBgTilemapBufferToVram(1); @@ -2942,7 +2944,7 @@ void sub_80BEA24(u8 taskId) case 5: if (gTasks[taskId].data[1] == 0) { - gTasks[taskId].data[4] = (u16)sub_80C0E9C(gUnknown_02039B54->dexNum, 0x30, 0x38, 0); + gTasks[taskId].data[4] = (u16)sub_80C0E9C(sPokedexListItem->dexNum, 0x30, 0x38, 0); gSprites[gTasks[taskId].data[4]].oam.priority = 0; } gMain.state++; @@ -2978,7 +2980,7 @@ void sub_80BEA24(u8 taskId) if (gTasks[taskId].data[3] == 0) { StopCryAndClearCrySongs(); - PlayCry2(NationalPokedexNumToSpecies(gUnknown_02039B54->dexNum), 0, 0x7D, 0xA); + PlayCry2(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), 0, 0x7D, 0xA); } else { @@ -3037,29 +3039,29 @@ void sub_80BEDF4(u8 taskId) } if (gMain.newKeys & A_BUTTON) { - switch (gUnknown_02039B4C->selectedScreen) + switch (sPokedexView->selectedScreen) { case AREA_SCREEN: BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB_BLACK); - gUnknown_02039B4C->unk64E = 1; + sPokedexView->unk64E = 1; gTasks[taskId].func = sub_80BEFD0; PlaySE(SE_PIN); break; case CRY_SCREEN: BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); - gUnknown_02039B4C->unk64E = 2; + sPokedexView->unk64E = 2; gTasks[taskId].func = sub_80BEFD0; PlaySE(SE_PIN); break; case SIZE_SCREEN: - if (!gUnknown_02039B54->owned) + if (!sPokedexListItem->owned) { PlaySE(SE_HAZURE); } else { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); - gUnknown_02039B4C->unk64E = 3; + sPokedexView->unk64E = 3; gTasks[taskId].func = sub_80BEFD0; PlaySE(SE_PIN); } @@ -3074,19 +3076,19 @@ void sub_80BEDF4(u8 taskId) } if (((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) - && gUnknown_02039B4C->selectedScreen > 0) + && sPokedexView->selectedScreen > 0) { - gUnknown_02039B4C->selectedScreen--; - sub_80BFD0C(gUnknown_02039B4C->selectedScreen, 0xD); + sPokedexView->selectedScreen--; + sub_80BFD0C(sPokedexView->selectedScreen, 0xD); PlaySE(SE_Z_PAGE); return; } if (((gMain.newKeys & DPAD_RIGHT) || ((gMain.newKeys & R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) - && gUnknown_02039B4C->selectedScreen < 3) + && sPokedexView->selectedScreen < 3) { - gUnknown_02039B4C->selectedScreen++; - sub_80BFD0C(gUnknown_02039B4C->selectedScreen, 0xD); + sPokedexView->selectedScreen++; + sub_80BFD0C(sPokedexView->selectedScreen, 0xD); PlaySE(SE_Z_PAGE); return; } @@ -3097,7 +3099,7 @@ void sub_80BEFD0(u8 taskId) if (!gPaletteFade.active) { FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]); - switch (gUnknown_02039B4C->unk64E) + switch (sPokedexView->unk64E) { case 1: default: @@ -3140,25 +3142,25 @@ void sub_80BF0AC(u8 taskId) default: if (!gPaletteFade.active) { - gUnknown_02039B4C->unk64A = 5; + sPokedexView->unk64A = 5; gUnknown_030060B4 = gMain.vblankCallback; SetVBlankCallback(NULL); sub_80C09B0(0x200); - gUnknown_02039B4C->selectedScreen = AREA_SCREEN; + sPokedexView->selectedScreen = AREA_SCREEN; gMain.state = 1; } break; case 1: sub_80BFCF4(0xD); sub_80BFD7C(0, 0xD); - sub_80BC844(gUnknown_02039B4C->unk64C_1); + sub_80BC844(sPokedexView->unk64C_1); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256); gMain.state++; break; case 2: - ShowPokedexAreaScreen(NationalPokedexNumToSpecies(gUnknown_02039B54->dexNum), &gUnknown_02039B4C->unk64E); + ShowPokedexAreaScreen(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), &sPokedexView->unk64E); SetVBlankCallback(gUnknown_030060B4); - gUnknown_02039B4C->unk64E = 0; + sPokedexView->unk64E = 0; gMain.state = 0; gTasks[taskId].func = sub_80BF1B4; break; @@ -3167,7 +3169,7 @@ void sub_80BF0AC(u8 taskId) void sub_80BF1B4(u8 taskId) { - if (gUnknown_02039B4C->unk64E != 0) + if (sPokedexView->unk64E != 0) gTasks[taskId].func = sub_80BF1EC; } @@ -3175,7 +3177,7 @@ void sub_80BF1EC(u8 taskId) { if (!gPaletteFade.active) { - switch (gUnknown_02039B4C->unk64E) + switch (sPokedexView->unk64E) { case 1: default: @@ -3197,17 +3199,17 @@ void sub_80BF250(u8 taskId) if (!gPaletteFade.active) { m4aMPlayStop(&gMPlayInfo_BGM); - gUnknown_02039B4C->unk64A = 6; + sPokedexView->unk64A = 6; gUnknown_030060B4 = gMain.vblankCallback; SetVBlankCallback(NULL); sub_80C09B0(0x200); - gUnknown_02039B4C->selectedScreen = CRY_SCREEN; + sPokedexView->selectedScreen = CRY_SCREEN; gMain.state = 1; } break; case 1: DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenu_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, &gUnknown_08DC3198, 0, 0); + CopyToBgTilemapBuffer(3, &gPokedexTilemap_CryScreen, 0, 0); FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); PutWindowTilemap(3); @@ -3217,7 +3219,7 @@ void sub_80BF250(u8 taskId) case 2: sub_80BFCF4(0xD); sub_80BFD7C(1, 0xD); - sub_80BC844(gUnknown_02039B4C->unk64C_1); + sub_80BC844(sPokedexView->unk64C_1); gMain.state++; break; case 3: @@ -3226,11 +3228,11 @@ void sub_80BF250(u8 taskId) break; case 4: sub_80BE8DC(gText_CryOf, 0x52, 33); - sub_80C0B44(0, gUnknown_02039B54->dexNum, 0x52, 49); + sub_80C0B44(0, sPokedexListItem->dexNum, 0x52, 49); gMain.state++; break; case 5: - gTasks[taskId].data[4] = sub_80C0E9C(gUnknown_02039B54->dexNum, 48, 56, 0); + gTasks[taskId].data[4] = sub_80C0E9C(sPokedexListItem->dexNum, 48, 56, 0); gSprites[gTasks[taskId].data[4]].oam.priority = 0; gDexCryScreenState = 0; gMain.state++; @@ -3285,7 +3287,7 @@ void sub_80BF250(u8 taskId) gMain.state++; break; case 10: - gUnknown_02039B4C->unk64E = 0; + sPokedexView->unk64E = 0; gMain.state = 0; gTasks[taskId].func = sub_80BF5CC; break; @@ -3304,7 +3306,7 @@ void sub_80BF5CC(u8 taskId) if (gMain.newKeys & A_BUTTON) { sub_80BF7FC(1); - sub_8145534(NationalPokedexNumToSpecies(gUnknown_02039B54->dexNum)); + sub_8145534(NationalPokedexNumToSpecies(sPokedexListItem->dexNum)); return; } else if (!gPaletteFade.active) @@ -3313,7 +3315,7 @@ void sub_80BF5CC(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); m4aMPlayContinue(&gMPlayInfo_BGM); - gUnknown_02039B4C->unk64E = 1; + sPokedexView->unk64E = 1; gTasks[taskId].func = sub_80BF790; PlaySE(SE_PC_OFF); return; @@ -3323,7 +3325,7 @@ void sub_80BF5CC(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); m4aMPlayContinue(&gMPlayInfo_BGM); - gUnknown_02039B4C->unk64E = 2; + sPokedexView->unk64E = 2; gTasks[taskId].func = sub_80BF790; PlaySE(SE_Z_PAGE); return; @@ -3331,7 +3333,7 @@ void sub_80BF5CC(u8 taskId) if ((gMain.newKeys & DPAD_RIGHT) || ((gMain.newKeys & R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { - if (!gUnknown_02039B54->owned) + if (!sPokedexListItem->owned) { PlaySE(SE_HAZURE); } @@ -3339,7 +3341,7 @@ void sub_80BF5CC(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); m4aMPlayContinue(&gMPlayInfo_BGM); - gUnknown_02039B4C->unk64E = 3; + sPokedexView->unk64E = 3; gTasks[taskId].func = sub_80BF790; PlaySE(SE_Z_PAGE); } @@ -3354,7 +3356,7 @@ void sub_80BF790(u8 taskId) { sub_8145914(); FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]); - switch (gUnknown_02039B4C->unk64E) + switch (sPokedexView->unk64E) { default: case 1: @@ -3391,17 +3393,17 @@ void sub_80BF82C(u8 taskId) case 0: if (!gPaletteFade.active) { - gUnknown_02039B4C->unk64A = 7; + sPokedexView->unk64A = 7; gUnknown_030060B4 = gMain.vblankCallback; SetVBlankCallback(NULL); sub_80C09B0(0x200); - gUnknown_02039B4C->selectedScreen = SIZE_SCREEN; + sPokedexView->selectedScreen = SIZE_SCREEN; gMain.state = 1; } break; case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, gUnknown_08DC2E6C, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexTilemap_SizeScreen, 0, 0); FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); gMain.state++; @@ -3409,7 +3411,7 @@ void sub_80BF82C(u8 taskId) case 2: sub_80BFCF4(0xD); sub_80BFD7C(2, 0xD); - sub_80BC844(gUnknown_02039B4C->unk64C_1); + sub_80BC844(sPokedexView->unk64C_1); gMain.state++; break; case 3: @@ -3431,19 +3433,19 @@ void sub_80BF82C(u8 taskId) gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 1; gSprites[spriteId].oam.priority = 0; - gSprites[spriteId].pos2.y = gPokedexEntries[gUnknown_02039B54->dexNum].trainerOffset; - SetOamMatrix(1, gPokedexEntries[gUnknown_02039B54->dexNum].trainerScale, 0, 0, gPokedexEntries[gUnknown_02039B54->dexNum].trainerScale); + gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset; + SetOamMatrix(1, gPokedexEntries[sPokedexListItem->dexNum].trainerScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].trainerScale); LoadPalette(gUnknown_0856E610, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20); gTasks[taskId].data[5] = spriteId; gMain.state++; break; case 6: - spriteId = sub_80C0E9C(gUnknown_02039B54->dexNum, 88, 56, 1); + spriteId = sub_80C0E9C(sPokedexListItem->dexNum, 88, 56, 1); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 2; gSprites[spriteId].oam.priority = 0; - gSprites[spriteId].pos2.y = gPokedexEntries[gUnknown_02039B54->dexNum].pokemonOffset; - SetOamMatrix(2, gPokedexEntries[gUnknown_02039B54->dexNum].pokemonScale, 0, 0, gPokedexEntries[gUnknown_02039B54->dexNum].pokemonScale); + gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset; + SetOamMatrix(2, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale); LoadPalette(gUnknown_0856E610, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20); gTasks[taskId].data[4] = spriteId; CopyWindowToVram(0, 3); @@ -3471,7 +3473,7 @@ void sub_80BF82C(u8 taskId) case 9: if (!gPaletteFade.active) { - gUnknown_02039B4C->unk64E = 0; + sPokedexView->unk64E = 0; gMain.state = 0; gTasks[taskId].func = sub_80BFBB0; } @@ -3484,7 +3486,7 @@ void sub_80BFBB0(u8 taskId) if (gMain.newKeys & B_BUTTON) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); - gUnknown_02039B4C->unk64E = 1; + sPokedexView->unk64E = 1; gTasks[taskId].func = sub_80BFC78; PlaySE(SE_PC_OFF); } @@ -3492,7 +3494,7 @@ void sub_80BFBB0(u8 taskId) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK); - gUnknown_02039B4C->unk64E = 2; + sPokedexView->unk64E = 2; gTasks[taskId].func = sub_80BFC78; PlaySE(SE_Z_PAGE); } @@ -3504,7 +3506,7 @@ void sub_80BFC78(u8 taskId) { FreeAndDestroyMonPicSprite(gTasks[taskId].data[4]); FreeAndDestroyTrainerPicSprite(gTasks[taskId].data[5]); - switch (gUnknown_02039B4C->unk64E) + switch (sPokedexView->unk64E) { default: case 1: @@ -3519,12 +3521,12 @@ void sub_80BFC78(u8 taskId) void sub_80BFCDC(u16 a) { - CopyToBgTilemapBuffer(1, gUnknown_08DC2F5C, 0, 0); + CopyToBgTilemapBuffer(1, gPokedexTilemap_ScreenSelectBar1, 0, 0); } void sub_80BFCF4(u16 a) { - CopyToBgTilemapBuffer(1, gUnknown_08DC2FEC, 0, 0); + CopyToBgTilemapBuffer(1, gPokedexTilemap_ScreenSelectBar2, 0, 0); } #ifdef NONMATCHING @@ -3748,7 +3750,7 @@ void sub_80BFE38(u8 taskId) break; case 1: DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0); - CopyToBgTilemapBuffer(3, gUnknown_08DC3080, 0, 0); + CopyToBgTilemapBuffer(3, gPokedexTilemap_DescriptionScreen, 0, 0); FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); PutWindowTilemap(1); @@ -4644,47 +4646,47 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 for (i = 0, resultsCount = 0; i < NATIONAL_DEX_COUNT; i++) { - if (gUnknown_02039B4C->unk0[i].seen) + if (sPokedexView->pokedexList[i].seen) { - gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i]; + sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i]; resultsCount++; } } - gUnknown_02039B4C->pokemonListCount = resultsCount; + sPokedexView->pokemonListCount = resultsCount; // Search by name if (abcGroup != 0xFF) { - for (i = 0, resultsCount = 0; i < gUnknown_02039B4C->pokemonListCount; i++) + for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { u8 r3; - species = NationalPokedexNumToSpecies(gUnknown_02039B4C->unk0[i].dexNum); + species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum); r3 = gSpeciesNames[species][0]; if ((r3 >= gUnknown_0856ED08[abcGroup][0] && r3 < gUnknown_0856ED08[abcGroup][0] + gUnknown_0856ED08[abcGroup][1]) || (r3 >= gUnknown_0856ED08[abcGroup][2] && r3 < gUnknown_0856ED08[abcGroup][2] + gUnknown_0856ED08[abcGroup][3])) { - gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i]; + sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i]; resultsCount++; } } - gUnknown_02039B4C->pokemonListCount = resultsCount; + sPokedexView->pokemonListCount = resultsCount; } // Search by body color if (bodyColor != 0xFF) { - for (i = 0, resultsCount = 0; i < gUnknown_02039B4C->pokemonListCount; i++) + for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { - species = NationalPokedexNumToSpecies(gUnknown_02039B4C->unk0[i].dexNum); + species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum); if (bodyColor == gBaseStats[species].bodyColor) { - gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i]; + sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i]; resultsCount++; } } - gUnknown_02039B4C->pokemonListCount = resultsCount; + sPokedexView->pokemonListCount = resultsCount; } // Search by type @@ -4698,17 +4700,17 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 if (type2 == 0xFF) { - for (i = 0, resultsCount = 0; i < gUnknown_02039B4C->pokemonListCount; i++) + for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { - if (gUnknown_02039B4C->unk0[i].owned) + if (sPokedexView->pokedexList[i].owned) { - species = NationalPokedexNumToSpecies(gUnknown_02039B4C->unk0[i].dexNum); + species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum); types[0] = gBaseStats[species].type1; types[1] = gBaseStats[species].type2; if (types[0] == type1 || types[1] == type1) { - gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i]; + sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i]; resultsCount++; } } @@ -4716,32 +4718,32 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } else { - for (i = 0, resultsCount = 0; i < gUnknown_02039B4C->pokemonListCount; i++) + for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { - if (gUnknown_02039B4C->unk0[i].owned) + if (sPokedexView->pokedexList[i].owned) { - species = NationalPokedexNumToSpecies(gUnknown_02039B4C->unk0[i].dexNum); + species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum); types[0] = gBaseStats[species].type1; types[1] = gBaseStats[species].type2; if ((types[0] == type1 && types[1] == type2) || (types[0] == type2 && types[1] == type1)) { - gUnknown_02039B4C->unk0[resultsCount] = gUnknown_02039B4C->unk0[i]; + sPokedexView->pokedexList[resultsCount] = sPokedexView->pokedexList[i]; resultsCount++; } } } } - gUnknown_02039B4C->pokemonListCount = resultsCount; + sPokedexView->pokemonListCount = resultsCount; } - if (gUnknown_02039B4C->pokemonListCount != 0) + if (sPokedexView->pokemonListCount != 0) { - for (i = gUnknown_02039B4C->pokemonListCount; i < NATIONAL_DEX_COUNT; i++) + for (i = sPokedexView->pokemonListCount; i < NATIONAL_DEX_COUNT; i++) { - gUnknown_02039B4C->unk0[i].dexNum = 0xFFFF; - gUnknown_02039B4C->unk0[i].seen = FALSE; - gUnknown_02039B4C->unk0[i].owned = FALSE; + sPokedexView->pokedexList[i].dexNum = 0xFFFF; + sPokedexView->pokedexList[i].seen = FALSE; + sPokedexView->pokedexList[i].owned = FALSE; } } @@ -4779,7 +4781,7 @@ void sub_80C12E0(u8 taskId) case 0: if (!gPaletteFade.active) { - gUnknown_02039B4C->unk64A = 2; + sPokedexView->unk64A = 2; sub_80C09B0(0); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_0856EFF8, 4); @@ -4801,8 +4803,8 @@ void sub_80C12E0(u8 taskId) } break; case 1: - LoadCompressedObjectPic(gSpriteSheets_0855D26C); - LoadSpritePalettes(gSpritePalettes_0855D26C); + LoadCompressedObjectPic(sInterfaceSpriteSheet); + LoadSpritePalettes(sInterfaceSpritePalette); sub_80C2594(taskId); for (i = 0; i < 16; i++) gTasks[taskId].data[i] = 0; @@ -4957,15 +4959,15 @@ void sub_80C170C(u8 taskId) if (gTasks[taskId].data[0] != 0) { gUnknown_02039B52 = 0x40; - gUnknown_02039B4C->unk62A = 0x40; + sPokedexView->unk62A = 0x40; gUnknown_02039B50 = 0; - gUnknown_02039B4C->unk610 = 0; + sPokedexView->unk610 = 0; gSaveBlock2Ptr->pokedex.unknown1 = sub_80C2318(taskId, 5); if (!IsNationalPokedexEnabled()) gSaveBlock2Ptr->pokedex.unknown1 = 0; - gUnknown_02039B4C->unk614 = gSaveBlock2Ptr->pokedex.unknown1; + sPokedexView->unk614 = gSaveBlock2Ptr->pokedex.unknown1; gSaveBlock2Ptr->pokedex.order = sub_80C2318(taskId, 4); - gUnknown_02039B4C->unk618 = gSaveBlock2Ptr->pokedex.order; + sPokedexView->unk618 = gSaveBlock2Ptr->pokedex.order; PlaySE(SE_PC_OFF); gTasks[taskId].func = sub_80C1D38; } @@ -5036,7 +5038,7 @@ void sub_80C1A4C(u8 taskId) { if (!IsSEPlaying()) { - if (gUnknown_02039B4C->pokemonListCount != 0) + if (sPokedexView->pokemonListCount != 0) { PlaySE(SE_SEIKAI); sub_80C2618(gText_SearchCompleted); @@ -5055,11 +5057,11 @@ void sub_80C1AB8(u8 taskId) { if (gMain.newKeys & A_BUTTON) { - if (gUnknown_02039B4C->pokemonListCount != 0) + if (sPokedexView->pokemonListCount != 0) { - gUnknown_02039B4C->unk64E = 1; - gUnknown_02039B4C->dexMode = sub_80C2318(taskId, 5); - gUnknown_02039B4C->dexOrder = sub_80C2318(taskId, 4); + sPokedexView->unk64E = 1; + sPokedexView->dexMode = sub_80C2318(taskId, 5); + sPokedexView->dexOrder = sub_80C2318(taskId, 4); gTasks[taskId].func = sub_80C1D38; PlaySE(SE_PC_OFF); } @@ -5100,7 +5102,7 @@ void sub_80C1BCC(u8 taskId) bool8 r3; r1 = gTasks[taskId].data[1]; - r8 = gUnknown_0856EFC8[r1].unk0; + r8 = gUnknown_0856EFC8[r1].pokedexList; p1 = &gTasks[taskId].data[gUnknown_0856EFC8[r1].unk4]; p2 = &gTasks[taskId].data[gUnknown_0856EFC8[r1].unk5]; r2 = gUnknown_0856EFC8[r1].unk6 - 1; @@ -5445,7 +5447,7 @@ void sub_80C21D4(u8 a) void sub_80C2294(u8 taskId) { - const struct UnknownStruct2 *r6 = gUnknown_0856EFC8[gTasks[taskId].data[1]].unk0; + const struct UnknownStruct2 *r6 = gUnknown_0856EFC8[gTasks[taskId].data[1]].pokedexList; const u16 *r8 = &gTasks[taskId].data[gUnknown_0856EFC8[gTasks[taskId].data[1]].unk4]; const u16 *r7 = &gTasks[taskId].data[gUnknown_0856EFC8[gTasks[taskId].data[1]].unk5]; u16 i; @@ -5491,7 +5493,7 @@ void sub_80C23B8(u8 taskId) { u16 r3; - switch (gUnknown_02039B4C->unk614) + switch (sPokedexView->unk614) { default: case 0: @@ -5503,7 +5505,7 @@ void sub_80C23B8(u8 taskId) } gTasks[taskId].data[2] = r3; - switch (gUnknown_02039B4C->unk618) + switch (sPokedexView->unk618) { default: case 0: @@ -5586,12 +5588,12 @@ void sub_80C2594(u8 taskId) { u8 spriteId; - spriteId = CreateSprite(&gUnknown_0855D1AC, 184, 4, 0); + spriteId = CreateSprite(&sArrowSpriteTemplate, 184, 4, 0); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = 0; gSprites[spriteId].callback = sub_80C24E0; - spriteId = CreateSprite(&gUnknown_0855D1AC, 184, 108, 0); + spriteId = CreateSprite(&sArrowSpriteTemplate, 184, 108, 0); gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = 1; gSprites[spriteId].vFlip = TRUE; diff --git a/src/start_menu.c b/src/start_menu.c index 455d26509..079f05be0 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -87,7 +87,7 @@ extern u8 gUnknown_03005DB4; extern void sub_80AF688(void); extern void var_800D_set_xB(void); extern void sub_808B864(void); -extern void sub_80BB534(void); +extern void CB2_Pokedex(void); extern void play_some_sound(void); extern void CB2_PartyMenuFromStartMenu(void); extern void CB2_PokeNav(void); @@ -624,7 +624,7 @@ static bool8 StartMenuPokedexCallback(void) play_some_sound(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); - SetMainCallback2(sub_80BB534); // Display pokedex + SetMainCallback2(CB2_Pokedex); return TRUE; } -- cgit v1.2.3 From 846b5d79e4179cf95e216feaa493e59f0ef12976 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 16:10:41 +0100 Subject: Get rid of headers in src/data --- .../battle_pyramid_level_50_wild_mons.h | 1 - .../battle_pyramid_open_level_wild_mons.h | 1 - src/data/battle_moves.h | 1424 +++++++++++++++----- src/data/decoration/description.h | 8 - src/data/decoration/header.h | 9 - src/data/decoration/icon.h | 9 - src/data/decoration/tilemaps.h | 9 - src/data/decoration/tiles.h | 5 - src/data/field_event_obj/base_oam.h | 5 - .../field_event_obj/berry_tree_graphics_tables.h | 6 - src/data/field_event_obj/event_object_anims.h | 5 - src/data/field_event_obj/event_object_graphics.h | 7 +- .../field_event_obj/event_object_graphics_info.h | 5 - .../event_object_graphics_info_pointers.h | 5 - src/data/field_event_obj/event_object_pic_tables.h | 5 - src/data/field_event_obj/event_object_subsprites.h | 5 - .../field_effect_object_template_pointers.h | 5 - src/data/field_event_obj/field_effect_objects.h | 5 - .../field_event_obj/movement_action_func_tables.h | 5 - .../field_event_obj/movement_type_func_tables.h | 5 - src/data/item_icon_table.h | 817 ++++++----- src/data/pokedex_orders.h | 1195 ---------------- src/data/pokemon/base_stats.h | 5 - src/data/pokemon/cry_ids.h | 5 - src/data/pokemon/egg_moves.h | 5 - src/data/pokemon/evolution.h | 5 - src/data/pokemon/experience_tables.h | 5 - src/data/pokemon/item_effects.h | 5 - src/data/pokemon/level_up_learnset_pointers.h | 5 - src/data/pokemon/level_up_learnsets.h | 5 - src/data/pokemon/pokedex_orders.h | 1195 ++++++++++++++++ src/data/pokemon/tmhm_learnsets.h | 5 - src/data/pokemon/trainer_class_lookups.h | 332 +++-- src/data/pokemon_graphics/back_pic_coordinates.h | 881 ++++++------ src/data/pokemon_graphics/back_pic_table.h | 881 ++++++------ src/data/pokemon_graphics/front_pic_table.h | 887 ++++++------ src/data/pokemon_graphics/palette_table.h | 880 ++++++------ src/data/pokemon_graphics/shiny_palette_table.h | 880 ++++++------ src/data/text/item_descriptions.h | 33 +- src/data/text/trainer_class_names.h | 7 - src/data/trainer_parties.h | 1 - src/data2b.c | 1 + src/item_icon.c | 5 +- src/pokedex.c | 2 +- 44 files changed, 5053 insertions(+), 4518 deletions(-) delete mode 100644 src/data/pokedex_orders.h create mode 100644 src/data/pokemon/pokedex_orders.h diff --git a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h index 50bc1c856..108b3a3b0 100644 --- a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h @@ -1,4 +1,3 @@ - static const struct PyramidWildMon sLevel50WildMons_Round1[] = { { diff --git a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h index 6409e73b1..10435d767 100644 --- a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h +++ b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h @@ -1,4 +1,3 @@ - static const struct PyramidWildMon sOpenLevelWildMons_Round1[] = { { diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 00a6f7fdb..d555194e3 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -1,9 +1,7 @@ -#ifndef GUARD_DATA_BATTLE_MOVES -#define GUARD_DATA_BATTLE_MOVES - const struct BattleMove gBattleMoves[MOVES_COUNT] = { - { // MOVE_NONE + [MOVE_NONE] = + { .effect = EFFECT_HIT, .power = 0, .type = TYPE_NORMAL, @@ -14,7 +12,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_POUND + + [MOVE_POUND] = + { .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -25,7 +25,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_KARATE_CHOP + + [MOVE_KARATE_CHOP] = + { .effect = EFFECT_HIGH_CRITICAL, .power = 50, .type = TYPE_FIGHTING, @@ -36,7 +38,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_DOUBLE_SLAP + + [MOVE_DOUBLE_SLAP] = + { .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -47,7 +51,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_COMET_PUNCH + + [MOVE_COMET_PUNCH] = + { .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -58,7 +64,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_MEGA_PUNCH + + [MOVE_MEGA_PUNCH] = + { .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -69,7 +77,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_PAY_DAY + + [MOVE_PAY_DAY] = + { .effect = EFFECT_PAY_DAY, .power = 40, .type = TYPE_NORMAL, @@ -80,7 +90,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_FIRE_PUNCH + + [MOVE_FIRE_PUNCH] = + { .effect = EFFECT_BURN_HIT, .power = 75, .type = TYPE_FIRE, @@ -91,7 +103,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ICE_PUNCH + + [MOVE_ICE_PUNCH] = + { .effect = EFFECT_FREEZE_HIT, .power = 75, .type = TYPE_ICE, @@ -102,7 +116,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_THUNDER_PUNCH + + [MOVE_THUNDER_PUNCH] = + { .effect = EFFECT_PARALYZE_HIT, .power = 75, .type = TYPE_ELECTRIC, @@ -113,7 +129,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SCRATCH + + [MOVE_SCRATCH] = + { .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -124,7 +142,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_VICE_GRIP + + [MOVE_VICE_GRIP] = + { .effect = EFFECT_HIT, .power = 55, .type = TYPE_NORMAL, @@ -135,7 +155,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_GUILLOTINE + + [MOVE_GUILLOTINE] = + { .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -146,7 +168,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_RAZOR_WIND + + [MOVE_RAZOR_WIND] = + { .effect = EFFECT_RAZOR_WIND, .power = 80, .type = TYPE_NORMAL, @@ -157,7 +181,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SWORDS_DANCE + + [MOVE_SWORDS_DANCE] = + { .effect = EFFECT_ATTACK_UP_2, .power = 0, .type = TYPE_NORMAL, @@ -168,7 +194,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_CUT + + [MOVE_CUT] = + { .effect = EFFECT_HIT, .power = 50, .type = TYPE_NORMAL, @@ -179,7 +207,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_GUST + + [MOVE_GUST] = + { .effect = EFFECT_GUST, .power = 40, .type = TYPE_FLYING, @@ -190,7 +220,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_WING_ATTACK + + [MOVE_WING_ATTACK] = + { .effect = EFFECT_HIT, .power = 60, .type = TYPE_FLYING, @@ -201,7 +233,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_WHIRLWIND + + [MOVE_WHIRLWIND] = + { .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -212,7 +246,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = -6, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FLY + + [MOVE_FLY] = + { .effect = EFFECT_SEMI_INVULNERABLE, .power = 70, .type = TYPE_FLYING, @@ -223,7 +259,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_BIND + + [MOVE_BIND] = + { .effect = EFFECT_TRAP, .power = 15, .type = TYPE_NORMAL, @@ -234,7 +272,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SLAM + + [MOVE_SLAM] = + { .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -245,7 +285,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_VINE_WHIP + + [MOVE_VINE_WHIP] = + { .effect = EFFECT_HIT, .power = 35, .type = TYPE_GRASS, @@ -256,7 +298,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_STOMP + + [MOVE_STOMP] = + { .effect = EFFECT_FLINCH_MINIMIZE_HIT, .power = 65, .type = TYPE_NORMAL, @@ -267,7 +311,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DOUBLE_KICK + + [MOVE_DOUBLE_KICK] = + { .effect = EFFECT_DOUBLE_HIT, .power = 30, .type = TYPE_FIGHTING, @@ -278,7 +324,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_MEGA_KICK + + [MOVE_MEGA_KICK] = + { .effect = EFFECT_HIT, .power = 120, .type = TYPE_NORMAL, @@ -289,7 +337,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_JUMP_KICK + + [MOVE_JUMP_KICK] = + { .effect = EFFECT_RECOIL_IF_MISS, .power = 70, .type = TYPE_FIGHTING, @@ -300,7 +350,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ROLLING_KICK + + [MOVE_ROLLING_KICK] = + { .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_FIGHTING, @@ -311,7 +363,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SAND_ATTACK + + [MOVE_SAND_ATTACK] = + { .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_GROUND, @@ -322,7 +376,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_HEADBUTT + + [MOVE_HEADBUTT] = + { .effect = EFFECT_FLINCH_HIT, .power = 70, .type = TYPE_NORMAL, @@ -333,7 +389,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_HORN_ATTACK + + [MOVE_HORN_ATTACK] = + { .effect = EFFECT_HIT, .power = 65, .type = TYPE_NORMAL, @@ -344,7 +402,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_FURY_ATTACK + + [MOVE_FURY_ATTACK] = + { .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -355,7 +415,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_HORN_DRILL + + [MOVE_HORN_DRILL] = + { .effect = EFFECT_OHKO, .power = 1, .type = TYPE_NORMAL, @@ -366,7 +428,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_TACKLE + + [MOVE_TACKLE] = + { .effect = EFFECT_HIT, .power = 35, .type = TYPE_NORMAL, @@ -377,7 +441,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_BODY_SLAM + + [MOVE_BODY_SLAM] = + { .effect = EFFECT_PARALYZE_HIT, .power = 85, .type = TYPE_NORMAL, @@ -388,7 +454,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_WRAP + + [MOVE_WRAP] = + { .effect = EFFECT_TRAP, .power = 15, .type = TYPE_NORMAL, @@ -399,7 +467,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_TAKE_DOWN + + [MOVE_TAKE_DOWN] = + { .effect = EFFECT_RECOIL, .power = 90, .type = TYPE_NORMAL, @@ -410,7 +480,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_THRASH + + [MOVE_THRASH] = + { .effect = EFFECT_RAMPAGE, .power = 90, .type = TYPE_NORMAL, @@ -421,7 +493,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_DOUBLE_EDGE + + [MOVE_DOUBLE_EDGE] = + { .effect = EFFECT_DOUBLE_EDGE, .power = 120, .type = TYPE_NORMAL, @@ -432,7 +506,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_TAIL_WHIP + + [MOVE_TAIL_WHIP] = + { .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -443,7 +519,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_POISON_STING + + [MOVE_POISON_STING] = + { .effect = EFFECT_POISON_HIT, .power = 15, .type = TYPE_POISON, @@ -454,7 +532,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_TWINEEDLE + + [MOVE_TWINEEDLE] = + { .effect = EFFECT_TWINEEDLE, .power = 25, .type = TYPE_BUG, @@ -465,7 +545,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_PIN_MISSILE + + [MOVE_PIN_MISSILE] = + { .effect = EFFECT_MULTI_HIT, .power = 14, .type = TYPE_BUG, @@ -476,7 +558,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_LEER + + [MOVE_LEER] = + { .effect = EFFECT_DEFENSE_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -487,7 +571,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_BITE + + [MOVE_BITE] = + { .effect = EFFECT_FLINCH_HIT, .power = 60, .type = TYPE_DARK, @@ -498,7 +584,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_GROWL + + [MOVE_GROWL] = + { .effect = EFFECT_ATTACK_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -509,7 +597,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ROAR + + [MOVE_ROAR] = + { .effect = EFFECT_ROAR, .power = 0, .type = TYPE_NORMAL, @@ -520,7 +610,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = -6, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SING + + [MOVE_SING] = + { .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -531,7 +623,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SUPERSONIC + + [MOVE_SUPERSONIC] = + { .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_NORMAL, @@ -542,7 +636,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SONIC_BOOM + + [MOVE_SONIC_BOOM] = + { .effect = EFFECT_SONICBOOM, .power = 1, .type = TYPE_NORMAL, @@ -553,7 +649,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_DISABLE + + [MOVE_DISABLE] = + { .effect = EFFECT_DISABLE, .power = 0, .type = TYPE_NORMAL, @@ -564,7 +662,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ACID + + [MOVE_ACID] = + { .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 40, .type = TYPE_POISON, @@ -575,7 +675,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_EMBER + + [MOVE_EMBER] = + { .effect = EFFECT_BURN_HIT, .power = 40, .type = TYPE_FIRE, @@ -586,7 +688,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FLAMETHROWER + + [MOVE_FLAMETHROWER] = + { .effect = EFFECT_BURN_HIT, .power = 95, .type = TYPE_FIRE, @@ -597,7 +701,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MIST + + [MOVE_MIST] = + { .effect = EFFECT_MIST, .power = 0, .type = TYPE_ICE, @@ -608,7 +714,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_WATER_GUN + + [MOVE_WATER_GUN] = + { .effect = EFFECT_HIT, .power = 40, .type = TYPE_WATER, @@ -619,7 +727,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_HYDRO_PUMP + + [MOVE_HYDRO_PUMP] = + { .effect = EFFECT_HIT, .power = 120, .type = TYPE_WATER, @@ -630,7 +740,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SURF + + [MOVE_SURF] = + { .effect = EFFECT_HIT, .power = 95, .type = TYPE_WATER, @@ -641,7 +753,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ICE_BEAM + + [MOVE_ICE_BEAM] = + { .effect = EFFECT_FREEZE_HIT, .power = 95, .type = TYPE_ICE, @@ -652,7 +766,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_BLIZZARD + + [MOVE_BLIZZARD] = + { .effect = EFFECT_FREEZE_HIT, .power = 120, .type = TYPE_ICE, @@ -663,7 +779,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_PSYBEAM + + [MOVE_PSYBEAM] = + { .effect = EFFECT_CONFUSE_HIT, .power = 65, .type = TYPE_PSYCHIC, @@ -674,7 +792,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_BUBBLE_BEAM + + [MOVE_BUBBLE_BEAM] = + { .effect = EFFECT_SPEED_DOWN_HIT, .power = 65, .type = TYPE_WATER, @@ -685,7 +805,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_AURORA_BEAM + + [MOVE_AURORA_BEAM] = + { .effect = EFFECT_ATTACK_DOWN_HIT, .power = 65, .type = TYPE_ICE, @@ -696,7 +818,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_HYPER_BEAM + + [MOVE_HYPER_BEAM] = + { .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_NORMAL, @@ -707,7 +831,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_PECK + + [MOVE_PECK] = + { .effect = EFFECT_HIT, .power = 35, .type = TYPE_FLYING, @@ -718,7 +844,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_DRILL_PECK + + [MOVE_DRILL_PECK] = + { .effect = EFFECT_HIT, .power = 80, .type = TYPE_FLYING, @@ -729,7 +857,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SUBMISSION + + [MOVE_SUBMISSION] = + { .effect = EFFECT_RECOIL, .power = 80, .type = TYPE_FIGHTING, @@ -740,7 +870,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_LOW_KICK + + [MOVE_LOW_KICK] = + { .effect = EFFECT_LOW_KICK, .power = 1, .type = TYPE_FIGHTING, @@ -751,7 +883,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_COUNTER + + [MOVE_COUNTER] = + { .effect = EFFECT_COUNTER, .power = 1, .type = TYPE_FIGHTING, @@ -762,7 +896,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = -5, .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SEISMIC_TOSS + + [MOVE_SEISMIC_TOSS] = + { .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_FIGHTING, @@ -773,7 +909,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_STRENGTH + + [MOVE_STRENGTH] = + { .effect = EFFECT_HIT, .power = 80, .type = TYPE_NORMAL, @@ -784,7 +922,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ABSORB + + [MOVE_ABSORB] = + { .effect = EFFECT_ABSORB, .power = 20, .type = TYPE_GRASS, @@ -795,7 +935,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MEGA_DRAIN + + [MOVE_MEGA_DRAIN] = + { .effect = EFFECT_ABSORB, .power = 40, .type = TYPE_GRASS, @@ -806,7 +948,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_LEECH_SEED + + [MOVE_LEECH_SEED] = + { .effect = EFFECT_LEECH_SEED, .power = 0, .type = TYPE_GRASS, @@ -817,7 +961,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_GROWTH + + [MOVE_GROWTH] = + { .effect = EFFECT_SPECIAL_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -828,7 +974,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_RAZOR_LEAF + + [MOVE_RAZOR_LEAF] = + { .effect = EFFECT_HIGH_CRITICAL, .power = 55, .type = TYPE_GRASS, @@ -839,7 +987,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SOLAR_BEAM + + [MOVE_SOLAR_BEAM] = + { .effect = EFFECT_SOLARBEAM, .power = 120, .type = TYPE_GRASS, @@ -850,7 +1000,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_POISON_POWDER + + [MOVE_POISON_POWDER] = + { .effect = EFFECT_POISON, .power = 0, .type = TYPE_POISON, @@ -861,7 +1013,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_STUN_SPORE + + [MOVE_STUN_SPORE] = + { .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_GRASS, @@ -872,7 +1026,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SLEEP_POWDER + + [MOVE_SLEEP_POWDER] = + { .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -883,7 +1039,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_PETAL_DANCE + + [MOVE_PETAL_DANCE] = + { .effect = EFFECT_RAMPAGE, .power = 70, .type = TYPE_GRASS, @@ -894,7 +1052,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_STRING_SHOT + + [MOVE_STRING_SHOT] = + { .effect = EFFECT_SPEED_DOWN, .power = 0, .type = TYPE_BUG, @@ -905,7 +1065,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DRAGON_RAGE + + [MOVE_DRAGON_RAGE] = + { .effect = EFFECT_DRAGON_RAGE, .power = 1, .type = TYPE_DRAGON, @@ -916,7 +1078,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_FIRE_SPIN + + [MOVE_FIRE_SPIN] = + { .effect = EFFECT_TRAP, .power = 15, .type = TYPE_FIRE, @@ -927,7 +1091,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_THUNDER_SHOCK + + [MOVE_THUNDER_SHOCK] = + { .effect = EFFECT_PARALYZE_HIT, .power = 40, .type = TYPE_ELECTRIC, @@ -938,7 +1104,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_THUNDERBOLT + + [MOVE_THUNDERBOLT] = + { .effect = EFFECT_PARALYZE_HIT, .power = 95, .type = TYPE_ELECTRIC, @@ -949,7 +1117,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_THUNDER_WAVE + + [MOVE_THUNDER_WAVE] = + { .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_ELECTRIC, @@ -960,7 +1130,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_THUNDER + + [MOVE_THUNDER] = + { .effect = EFFECT_THUNDER, .power = 120, .type = TYPE_ELECTRIC, @@ -971,7 +1143,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ROCK_THROW + + [MOVE_ROCK_THROW] = + { .effect = EFFECT_HIT, .power = 50, .type = TYPE_ROCK, @@ -982,7 +1156,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_EARTHQUAKE + + [MOVE_EARTHQUAKE] = + { .effect = EFFECT_EARTHQUAKE, .power = 100, .type = TYPE_GROUND, @@ -993,7 +1169,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_FISSURE + + [MOVE_FISSURE] = + { .effect = EFFECT_OHKO, .power = 1, .type = TYPE_GROUND, @@ -1004,7 +1182,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DIG + + [MOVE_DIG] = + { .effect = EFFECT_SEMI_INVULNERABLE, .power = 60, .type = TYPE_GROUND, @@ -1015,7 +1195,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_TOXIC + + [MOVE_TOXIC] = + { .effect = EFFECT_TOXIC, .power = 0, .type = TYPE_POISON, @@ -1026,7 +1208,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_CONFUSION + + [MOVE_CONFUSION] = + { .effect = EFFECT_CONFUSE_HIT, .power = 50, .type = TYPE_PSYCHIC, @@ -1037,7 +1221,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_PSYCHIC + + [MOVE_PSYCHIC] = + { .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 90, .type = TYPE_PSYCHIC, @@ -1048,7 +1234,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_HYPNOSIS + + [MOVE_HYPNOSIS] = + { .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_PSYCHIC, @@ -1059,7 +1247,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MEDITATE + + [MOVE_MEDITATE] = + { .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_PSYCHIC, @@ -1070,7 +1260,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_AGILITY + + [MOVE_AGILITY] = + { .effect = EFFECT_SPEED_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -1081,7 +1273,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_QUICK_ATTACK + + [MOVE_QUICK_ATTACK] = + { .effect = EFFECT_QUICK_ATTACK, .power = 40, .type = TYPE_NORMAL, @@ -1092,7 +1286,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 1, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_RAGE + + [MOVE_RAGE] = + { .effect = EFFECT_RAGE, .power = 20, .type = TYPE_NORMAL, @@ -1103,7 +1299,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_TELEPORT + + [MOVE_TELEPORT] = + { .effect = EFFECT_TELEPORT, .power = 0, .type = TYPE_PSYCHIC, @@ -1114,7 +1312,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_NIGHT_SHADE + + [MOVE_NIGHT_SHADE] = + { .effect = EFFECT_LEVEL_DAMAGE, .power = 1, .type = TYPE_GHOST, @@ -1125,7 +1325,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_MIMIC + + [MOVE_MIMIC] = + { .effect = EFFECT_MIMIC, .power = 0, .type = TYPE_NORMAL, @@ -1136,7 +1338,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, - { // MOVE_SCREECH + + [MOVE_SCREECH] = + { .effect = EFFECT_DEFENSE_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -1147,7 +1351,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DOUBLE_TEAM + + [MOVE_DOUBLE_TEAM] = + { .effect = EFFECT_EVASION_UP, .power = 0, .type = TYPE_NORMAL, @@ -1158,7 +1364,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_RECOVER + + [MOVE_RECOVER] = + { .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_NORMAL, @@ -1169,7 +1377,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_HARDEN + + [MOVE_HARDEN] = + { .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_NORMAL, @@ -1180,7 +1390,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_MINIMIZE + + [MOVE_MINIMIZE] = + { .effect = EFFECT_MINIMIZE, .power = 0, .type = TYPE_NORMAL, @@ -1191,7 +1403,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_SMOKESCREEN + + [MOVE_SMOKESCREEN] = + { .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -1202,7 +1416,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_CONFUSE_RAY + + [MOVE_CONFUSE_RAY] = + { .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_GHOST, @@ -1213,7 +1429,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_WITHDRAW + + [MOVE_WITHDRAW] = + { .effect = EFFECT_DEFENSE_UP, .power = 0, .type = TYPE_WATER, @@ -1224,7 +1442,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_DEFENSE_CURL + + [MOVE_DEFENSE_CURL] = + { .effect = EFFECT_DEFENSE_CURL, .power = 0, .type = TYPE_NORMAL, @@ -1235,7 +1455,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_BARRIER + + [MOVE_BARRIER] = + { .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -1246,7 +1468,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_LIGHT_SCREEN + + [MOVE_LIGHT_SCREEN] = + { .effect = EFFECT_LIGHT_SCREEN, .power = 0, .type = TYPE_PSYCHIC, @@ -1257,7 +1481,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_HAZE + + [MOVE_HAZE] = + { .effect = EFFECT_HAZE, .power = 0, .type = TYPE_ICE, @@ -1268,7 +1494,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, - { // MOVE_REFLECT + + [MOVE_REFLECT] = + { .effect = EFFECT_REFLECT, .power = 0, .type = TYPE_PSYCHIC, @@ -1279,7 +1507,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_FOCUS_ENERGY + + [MOVE_FOCUS_ENERGY] = + { .effect = EFFECT_FOCUS_ENERGY, .power = 0, .type = TYPE_NORMAL, @@ -1290,7 +1520,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_BIDE + + [MOVE_BIDE] = + { .effect = EFFECT_BIDE, .power = 1, .type = TYPE_NORMAL, @@ -1301,7 +1533,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_METRONOME + + [MOVE_METRONOME] = + { .effect = EFFECT_METRONOME, .power = 0, .type = TYPE_NORMAL, @@ -1312,7 +1546,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_MIRROR_MOVE + + [MOVE_MIRROR_MOVE] = + { .effect = EFFECT_MIRROR_MOVE, .power = 0, .type = TYPE_FLYING, @@ -1323,7 +1559,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_SELF_DESTRUCT + + [MOVE_SELF_DESTRUCT] = + { .effect = EFFECT_EXPLOSION, .power = 200, .type = TYPE_NORMAL, @@ -1334,7 +1572,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_EGG_BOMB + + [MOVE_EGG_BOMB] = + { .effect = EFFECT_HIT, .power = 100, .type = TYPE_NORMAL, @@ -1345,7 +1585,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_LICK + + [MOVE_LICK] = + { .effect = EFFECT_PARALYZE_HIT, .power = 20, .type = TYPE_GHOST, @@ -1356,7 +1598,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SMOG + + [MOVE_SMOG] = + { .effect = EFFECT_POISON_HIT, .power = 20, .type = TYPE_POISON, @@ -1367,7 +1611,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SLUDGE + + [MOVE_SLUDGE] = + { .effect = EFFECT_POISON_HIT, .power = 65, .type = TYPE_POISON, @@ -1378,7 +1624,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_BONE_CLUB + + [MOVE_BONE_CLUB] = + { .effect = EFFECT_FLINCH_HIT, .power = 65, .type = TYPE_GROUND, @@ -1389,7 +1637,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FIRE_BLAST + + [MOVE_FIRE_BLAST] = + { .effect = EFFECT_BURN_HIT, .power = 120, .type = TYPE_FIRE, @@ -1400,7 +1650,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_WATERFALL + + [MOVE_WATERFALL] = + { .effect = EFFECT_HIT, .power = 80, .type = TYPE_WATER, @@ -1411,7 +1663,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_CLAMP + + [MOVE_CLAMP] = + { .effect = EFFECT_TRAP, .power = 35, .type = TYPE_WATER, @@ -1422,7 +1676,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SWIFT + + [MOVE_SWIFT] = + { .effect = EFFECT_ALWAYS_HIT, .power = 60, .type = TYPE_NORMAL, @@ -1433,7 +1689,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SKULL_BASH + + [MOVE_SKULL_BASH] = + { .effect = EFFECT_SKULL_BASH, .power = 100, .type = TYPE_NORMAL, @@ -1444,7 +1702,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SPIKE_CANNON + + [MOVE_SPIKE_CANNON] = + { .effect = EFFECT_MULTI_HIT, .power = 20, .type = TYPE_NORMAL, @@ -1455,7 +1715,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_CONSTRICT + + [MOVE_CONSTRICT] = + { .effect = EFFECT_SPEED_DOWN_HIT, .power = 10, .type = TYPE_NORMAL, @@ -1466,7 +1728,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_AMNESIA + + [MOVE_AMNESIA] = + { .effect = EFFECT_SPECIAL_DEFENSE_UP_2, .power = 0, .type = TYPE_PSYCHIC, @@ -1477,7 +1741,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_KINESIS + + [MOVE_KINESIS] = + { .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_PSYCHIC, @@ -1488,7 +1754,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SOFT_BOILED + + [MOVE_SOFT_BOILED] = + { .effect = EFFECT_SOFTBOILED, .power = 0, .type = TYPE_NORMAL, @@ -1499,7 +1767,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_HI_JUMP_KICK + + [MOVE_HI_JUMP_KICK] = + { .effect = EFFECT_RECOIL_IF_MISS, .power = 85, .type = TYPE_FIGHTING, @@ -1510,7 +1780,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_GLARE + + [MOVE_GLARE] = + { .effect = EFFECT_PARALYZE, .power = 0, .type = TYPE_NORMAL, @@ -1521,7 +1793,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DREAM_EATER + + [MOVE_DREAM_EATER] = + { .effect = EFFECT_DREAM_EATER, .power = 100, .type = TYPE_PSYCHIC, @@ -1532,7 +1806,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_POISON_GAS + + [MOVE_POISON_GAS] = + { .effect = EFFECT_POISON, .power = 0, .type = TYPE_POISON, @@ -1543,7 +1819,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_BARRAGE + + [MOVE_BARRAGE] = + { .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_NORMAL, @@ -1554,7 +1832,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_LEECH_LIFE + + [MOVE_LEECH_LIFE] = + { .effect = EFFECT_ABSORB, .power = 20, .type = TYPE_BUG, @@ -1565,7 +1845,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_LOVELY_KISS + + [MOVE_LOVELY_KISS] = + { .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_NORMAL, @@ -1576,7 +1858,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SKY_ATTACK + + [MOVE_SKY_ATTACK] = + { .effect = EFFECT_SKY_ATTACK, .power = 140, .type = TYPE_FLYING, @@ -1587,7 +1871,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_TRANSFORM + + [MOVE_TRANSFORM] = + { .effect = EFFECT_TRANSFORM, .power = 0, .type = TYPE_NORMAL, @@ -1598,7 +1884,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_BUBBLE + + [MOVE_BUBBLE] = + { .effect = EFFECT_SPEED_DOWN_HIT, .power = 20, .type = TYPE_WATER, @@ -1609,7 +1897,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DIZZY_PUNCH + + [MOVE_DIZZY_PUNCH] = + { .effect = EFFECT_CONFUSE_HIT, .power = 70, .type = TYPE_NORMAL, @@ -1620,7 +1910,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SPORE + + [MOVE_SPORE] = + { .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -1631,7 +1923,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FLASH + + [MOVE_FLASH] = + { .effect = EFFECT_ACCURACY_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -1642,7 +1936,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_PSYWAVE + + [MOVE_PSYWAVE] = + { .effect = EFFECT_PSYWAVE, .power = 1, .type = TYPE_PSYCHIC, @@ -1653,7 +1949,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SPLASH + + [MOVE_SPLASH] = + { .effect = EFFECT_SPLASH, .power = 0, .type = TYPE_NORMAL, @@ -1664,7 +1962,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_ACID_ARMOR + + [MOVE_ACID_ARMOR] = + { .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_POISON, @@ -1675,7 +1975,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_CRABHAMMER + + [MOVE_CRABHAMMER] = + { .effect = EFFECT_HIGH_CRITICAL, .power = 90, .type = TYPE_WATER, @@ -1686,7 +1988,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_EXPLOSION + + [MOVE_EXPLOSION] = + { .effect = EFFECT_EXPLOSION, .power = 250, .type = TYPE_NORMAL, @@ -1697,7 +2001,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_FURY_SWIPES + + [MOVE_FURY_SWIPES] = + { .effect = EFFECT_MULTI_HIT, .power = 18, .type = TYPE_NORMAL, @@ -1708,7 +2014,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_BONEMERANG + + [MOVE_BONEMERANG] = + { .effect = EFFECT_DOUBLE_HIT, .power = 50, .type = TYPE_GROUND, @@ -1719,7 +2027,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_REST + + [MOVE_REST] = + { .effect = EFFECT_REST, .power = 0, .type = TYPE_PSYCHIC, @@ -1730,7 +2040,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_ROCK_SLIDE + + [MOVE_ROCK_SLIDE] = + { .effect = EFFECT_FLINCH_HIT, .power = 75, .type = TYPE_ROCK, @@ -1741,7 +2053,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_HYPER_FANG + + [MOVE_HYPER_FANG] = + { .effect = EFFECT_FLINCH_HIT, .power = 80, .type = TYPE_NORMAL, @@ -1752,7 +2066,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SHARPEN + + [MOVE_SHARPEN] = + { .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -1763,7 +2079,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_CONVERSION + + [MOVE_CONVERSION] = + { .effect = EFFECT_CONVERSION, .power = 0, .type = TYPE_NORMAL, @@ -1774,7 +2092,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_TRI_ATTACK + + [MOVE_TRI_ATTACK] = + { .effect = EFFECT_TRI_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -1785,7 +2105,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SUPER_FANG + + [MOVE_SUPER_FANG] = + { .effect = EFFECT_SUPER_FANG, .power = 1, .type = TYPE_NORMAL, @@ -1796,7 +2118,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SLASH + + [MOVE_SLASH] = + { .effect = EFFECT_HIGH_CRITICAL, .power = 70, .type = TYPE_NORMAL, @@ -1807,7 +2131,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SUBSTITUTE + + [MOVE_SUBSTITUTE] = + { .effect = EFFECT_SUBSTITUTE, .power = 0, .type = TYPE_NORMAL, @@ -1818,7 +2144,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_STRUGGLE + + [MOVE_STRUGGLE] = + { .effect = EFFECT_RECOIL, .power = 50, .type = TYPE_NORMAL, @@ -1829,7 +2157,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SKETCH + + [MOVE_SKETCH] = + { .effect = EFFECT_SKETCH, .power = 0, .type = TYPE_NORMAL, @@ -1840,7 +2170,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_TRIPLE_KICK + + [MOVE_TRIPLE_KICK] = + { .effect = EFFECT_TRIPLE_KICK, .power = 10, .type = TYPE_FIGHTING, @@ -1851,7 +2183,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_THIEF + + [MOVE_THIEF] = + { .effect = EFFECT_THIEF, .power = 40, .type = TYPE_DARK, @@ -1862,7 +2196,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SPIDER_WEB + + [MOVE_SPIDER_WEB] = + { .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_BUG, @@ -1873,7 +2209,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MIND_READER + + [MOVE_MIND_READER] = + { .effect = EFFECT_LOCK_ON, .power = 0, .type = TYPE_NORMAL, @@ -1884,7 +2222,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_NIGHTMARE + + [MOVE_NIGHTMARE] = + { .effect = EFFECT_NIGHTMARE, .power = 0, .type = TYPE_GHOST, @@ -1895,7 +2235,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FLAME_WHEEL + + [MOVE_FLAME_WHEEL] = + { .effect = EFFECT_THAW_HIT, .power = 60, .type = TYPE_FIRE, @@ -1906,7 +2248,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SNORE + + [MOVE_SNORE] = + { .effect = EFFECT_SNORE, .power = 40, .type = TYPE_NORMAL, @@ -1917,7 +2261,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_CURSE + + [MOVE_CURSE] = + { .effect = EFFECT_CURSE, .power = 0, .type = TYPE_MYSTERY, @@ -1928,7 +2274,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_FLAIL + + [MOVE_FLAIL] = + { .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_NORMAL, @@ -1939,7 +2287,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_CONVERSION_2 + + [MOVE_CONVERSION_2] = + { .effect = EFFECT_CONVERSION_2, .power = 0, .type = TYPE_NORMAL, @@ -1950,7 +2300,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_AEROBLAST + + [MOVE_AEROBLAST] = + { .effect = EFFECT_HIGH_CRITICAL, .power = 100, .type = TYPE_FLYING, @@ -1961,7 +2313,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_COTTON_SPORE + + [MOVE_COTTON_SPORE] = + { .effect = EFFECT_SPEED_DOWN_2, .power = 0, .type = TYPE_GRASS, @@ -1972,7 +2326,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_REVERSAL + + [MOVE_REVERSAL] = + { .effect = EFFECT_FLAIL, .power = 1, .type = TYPE_FIGHTING, @@ -1983,7 +2339,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SPITE + + [MOVE_SPITE] = + { .effect = EFFECT_SPITE, .power = 0, .type = TYPE_GHOST, @@ -1994,7 +2352,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_POWDER_SNOW + + [MOVE_POWDER_SNOW] = + { .effect = EFFECT_FREEZE_HIT, .power = 40, .type = TYPE_ICE, @@ -2005,7 +2365,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_PROTECT + + [MOVE_PROTECT] = + { .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_NORMAL, @@ -2016,7 +2378,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 3, .flags = 0, }, - { // MOVE_MACH_PUNCH + + [MOVE_MACH_PUNCH] = + { .effect = EFFECT_QUICK_ATTACK, .power = 40, .type = TYPE_FIGHTING, @@ -2027,7 +2391,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 1, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SCARY_FACE + + [MOVE_SCARY_FACE] = + { .effect = EFFECT_SPEED_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -2038,7 +2404,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FAINT_ATTACK + + [MOVE_FAINT_ATTACK] = + { .effect = EFFECT_ALWAYS_HIT, .power = 60, .type = TYPE_DARK, @@ -2049,7 +2417,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SWEET_KISS + + [MOVE_SWEET_KISS] = + { .effect = EFFECT_CONFUSE, .power = 0, .type = TYPE_NORMAL, @@ -2060,7 +2430,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_BELLY_DRUM + + [MOVE_BELLY_DRUM] = + { .effect = EFFECT_BELLY_DRUM, .power = 0, .type = TYPE_NORMAL, @@ -2071,7 +2443,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_SLUDGE_BOMB + + [MOVE_SLUDGE_BOMB] = + { .effect = EFFECT_POISON_HIT, .power = 90, .type = TYPE_POISON, @@ -2082,7 +2456,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MUD_SLAP + + [MOVE_MUD_SLAP] = + { .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 20, .type = TYPE_GROUND, @@ -2093,7 +2469,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_OCTAZOOKA + + [MOVE_OCTAZOOKA] = + { .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 65, .type = TYPE_WATER, @@ -2104,7 +2482,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SPIKES + + [MOVE_SPIKES] = + { .effect = EFFECT_SPIKES, .power = 0, .type = TYPE_GROUND, @@ -2115,7 +2495,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_ZAP_CANNON + + [MOVE_ZAP_CANNON] = + { .effect = EFFECT_PARALYZE_HIT, .power = 100, .type = TYPE_ELECTRIC, @@ -2126,7 +2508,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FORESIGHT + + [MOVE_FORESIGHT] = + { .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, @@ -2137,7 +2521,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DESTINY_BOND + + [MOVE_DESTINY_BOND] = + { .effect = EFFECT_DESTINY_BOND, .power = 0, .type = TYPE_GHOST, @@ -2148,7 +2534,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_PERISH_SONG + + [MOVE_PERISH_SONG] = + { .effect = EFFECT_PERISH_SONG, .power = 0, .type = TYPE_NORMAL, @@ -2159,7 +2547,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_ICY_WIND + + [MOVE_ICY_WIND] = + { .effect = EFFECT_SPEED_DOWN_HIT, .power = 55, .type = TYPE_ICE, @@ -2170,7 +2560,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DETECT + + [MOVE_DETECT] = + { .effect = EFFECT_PROTECT, .power = 0, .type = TYPE_FIGHTING, @@ -2181,7 +2573,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 3, .flags = 0, }, - { // MOVE_BONE_RUSH + + [MOVE_BONE_RUSH] = + { .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_GROUND, @@ -2192,7 +2586,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_LOCK_ON + + [MOVE_LOCK_ON] = + { .effect = EFFECT_LOCK_ON, .power = 0, .type = TYPE_NORMAL, @@ -2203,7 +2599,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_OUTRAGE + + [MOVE_OUTRAGE] = + { .effect = EFFECT_RAMPAGE, .power = 90, .type = TYPE_DRAGON, @@ -2214,7 +2612,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SANDSTORM + + [MOVE_SANDSTORM] = + { .effect = EFFECT_SANDSTORM, .power = 0, .type = TYPE_ROCK, @@ -2225,7 +2625,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_GIGA_DRAIN + + [MOVE_GIGA_DRAIN] = + { .effect = EFFECT_ABSORB, .power = 60, .type = TYPE_GRASS, @@ -2236,7 +2638,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ENDURE + + [MOVE_ENDURE] = + { .effect = EFFECT_ENDURE, .power = 0, .type = TYPE_NORMAL, @@ -2247,7 +2651,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 3, .flags = 0, }, - { // MOVE_CHARM + + [MOVE_CHARM] = + { .effect = EFFECT_ATTACK_DOWN_2, .power = 0, .type = TYPE_NORMAL, @@ -2258,7 +2664,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ROLLOUT + + [MOVE_ROLLOUT] = + { .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ROCK, @@ -2269,7 +2677,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_FALSE_SWIPE + + [MOVE_FALSE_SWIPE] = + { .effect = EFFECT_FALSE_SWIPE, .power = 40, .type = TYPE_NORMAL, @@ -2280,7 +2690,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SWAGGER + + [MOVE_SWAGGER] = + { .effect = EFFECT_SWAGGER, .power = 0, .type = TYPE_NORMAL, @@ -2291,7 +2703,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MILK_DRINK + + [MOVE_MILK_DRINK] = + { .effect = EFFECT_SOFTBOILED, .power = 0, .type = TYPE_NORMAL, @@ -2302,7 +2716,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_SNATCH_AFFECTED, }, - { // MOVE_SPARK + + [MOVE_SPARK] = + { .effect = EFFECT_PARALYZE_HIT, .power = 65, .type = TYPE_ELECTRIC, @@ -2313,7 +2729,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FURY_CUTTER + + [MOVE_FURY_CUTTER] = + { .effect = EFFECT_FURY_CUTTER, .power = 10, .type = TYPE_BUG, @@ -2324,7 +2742,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_STEEL_WING + + [MOVE_STEEL_WING] = + { .effect = EFFECT_DEFENSE_UP_HIT, .power = 70, .type = TYPE_STEEL, @@ -2335,7 +2755,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_MEAN_LOOK + + [MOVE_MEAN_LOOK] = + { .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -2346,7 +2768,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ATTRACT + + [MOVE_ATTRACT] = + { .effect = EFFECT_ATTRACT, .power = 0, .type = TYPE_NORMAL, @@ -2357,7 +2781,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SLEEP_TALK + + [MOVE_SLEEP_TALK] = + { .effect = EFFECT_SLEEP_TALK, .power = 0, .type = TYPE_NORMAL, @@ -2368,7 +2794,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_HEAL_BELL + + [MOVE_HEAL_BELL] = + { .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_NORMAL, @@ -2379,7 +2807,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_RETURN + + [MOVE_RETURN] = + { .effect = EFFECT_RETURN, .power = 1, .type = TYPE_NORMAL, @@ -2390,7 +2820,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_PRESENT + + [MOVE_PRESENT] = + { .effect = EFFECT_PRESENT, .power = 1, .type = TYPE_NORMAL, @@ -2401,7 +2833,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FRUSTRATION + + [MOVE_FRUSTRATION] = + { .effect = EFFECT_FRUSTRATION, .power = 1, .type = TYPE_NORMAL, @@ -2412,7 +2846,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SAFEGUARD + + [MOVE_SAFEGUARD] = + { .effect = EFFECT_SAFEGUARD, .power = 0, .type = TYPE_NORMAL, @@ -2423,7 +2859,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_PAIN_SPLIT + + [MOVE_PAIN_SPLIT] = + { .effect = EFFECT_PAIN_SPLIT, .power = 0, .type = TYPE_NORMAL, @@ -2434,7 +2872,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SACRED_FIRE + + [MOVE_SACRED_FIRE] = + { .effect = EFFECT_THAW_HIT, .power = 100, .type = TYPE_FIRE, @@ -2445,7 +2885,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MAGNITUDE + + [MOVE_MAGNITUDE] = + { .effect = EFFECT_MAGNITUDE, .power = 1, .type = TYPE_GROUND, @@ -2456,7 +2898,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_DYNAMIC_PUNCH + + [MOVE_DYNAMIC_PUNCH] = + { .effect = EFFECT_CONFUSE_HIT, .power = 100, .type = TYPE_FIGHTING, @@ -2467,7 +2911,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MEGAHORN + + [MOVE_MEGAHORN] = + { .effect = EFFECT_HIT, .power = 120, .type = TYPE_BUG, @@ -2478,7 +2924,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_DRAGON_BREATH + + [MOVE_DRAGON_BREATH] = + { .effect = EFFECT_PARALYZE_HIT, .power = 60, .type = TYPE_DRAGON, @@ -2489,7 +2937,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_BATON_PASS + + [MOVE_BATON_PASS] = + { .effect = EFFECT_BATON_PASS, .power = 0, .type = TYPE_NORMAL, @@ -2500,7 +2950,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_ENCORE + + [MOVE_ENCORE] = + { .effect = EFFECT_ENCORE, .power = 0, .type = TYPE_NORMAL, @@ -2511,7 +2963,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_PURSUIT + + [MOVE_PURSUIT] = + { .effect = EFFECT_PURSUIT, .power = 40, .type = TYPE_DARK, @@ -2522,7 +2976,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_RAPID_SPIN + + [MOVE_RAPID_SPIN] = + { .effect = EFFECT_RAPID_SPIN, .power = 20, .type = TYPE_NORMAL, @@ -2533,7 +2989,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SWEET_SCENT + + [MOVE_SWEET_SCENT] = + { .effect = EFFECT_EVASION_DOWN, .power = 0, .type = TYPE_NORMAL, @@ -2544,7 +3002,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_IRON_TAIL + + [MOVE_IRON_TAIL] = + { .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 100, .type = TYPE_STEEL, @@ -2555,7 +3015,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_METAL_CLAW + + [MOVE_METAL_CLAW] = + { .effect = EFFECT_ATTACK_UP_HIT, .power = 50, .type = TYPE_STEEL, @@ -2566,7 +3028,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_VITAL_THROW + + [MOVE_VITAL_THROW] = + { .effect = EFFECT_VITAL_THROW, .power = 70, .type = TYPE_FIGHTING, @@ -2577,7 +3041,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = -1, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_MORNING_SUN + + [MOVE_MORNING_SUN] = + { .effect = EFFECT_MORNING_SUN, .power = 0, .type = TYPE_NORMAL, @@ -2588,7 +3054,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_SYNTHESIS + + [MOVE_SYNTHESIS] = + { .effect = EFFECT_SYNTHESIS, .power = 0, .type = TYPE_GRASS, @@ -2599,7 +3067,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_MOONLIGHT + + [MOVE_MOONLIGHT] = + { .effect = EFFECT_MOONLIGHT, .power = 0, .type = TYPE_NORMAL, @@ -2610,7 +3080,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_HIDDEN_POWER + + [MOVE_HIDDEN_POWER] = + { .effect = EFFECT_HIDDEN_POWER, .power = 1, .type = TYPE_NORMAL, @@ -2621,7 +3093,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_CROSS_CHOP + + [MOVE_CROSS_CHOP] = + { .effect = EFFECT_HIGH_CRITICAL, .power = 100, .type = TYPE_FIGHTING, @@ -2632,7 +3106,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_TWISTER + + [MOVE_TWISTER] = + { .effect = EFFECT_TWISTER, .power = 40, .type = TYPE_DRAGON, @@ -2643,7 +3119,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_RAIN_DANCE + + [MOVE_RAIN_DANCE] = + { .effect = EFFECT_RAIN_DANCE, .power = 0, .type = TYPE_WATER, @@ -2654,7 +3132,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_SUNNY_DAY + + [MOVE_SUNNY_DAY] = + { .effect = EFFECT_SUNNY_DAY, .power = 0, .type = TYPE_FIRE, @@ -2665,7 +3145,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_CRUNCH + + [MOVE_CRUNCH] = + { .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_DARK, @@ -2676,7 +3158,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MIRROR_COAT + + [MOVE_MIRROR_COAT] = + { .effect = EFFECT_MIRROR_COAT, .power = 1, .type = TYPE_PSYCHIC, @@ -2687,7 +3171,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = -5, .flags = FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_PSYCH_UP + + [MOVE_PSYCH_UP] = + { .effect = EFFECT_PSYCH_UP, .power = 0, .type = TYPE_NORMAL, @@ -2698,7 +3184,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_EXTREME_SPEED + + [MOVE_EXTREME_SPEED] = + { .effect = EFFECT_QUICK_ATTACK, .power = 80, .type = TYPE_NORMAL, @@ -2709,7 +3197,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 1, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ANCIENT_POWER + + [MOVE_ANCIENT_POWER] = + { .effect = EFFECT_ALL_STATS_UP_HIT, .power = 60, .type = TYPE_ROCK, @@ -2720,7 +3210,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SHADOW_BALL + + [MOVE_SHADOW_BALL] = + { .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 80, .type = TYPE_GHOST, @@ -2731,7 +3223,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FUTURE_SIGHT + + [MOVE_FUTURE_SIGHT] = + { .effect = EFFECT_FUTURE_SIGHT, .power = 80, .type = TYPE_PSYCHIC, @@ -2742,7 +3236,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_ROCK_SMASH + + [MOVE_ROCK_SMASH] = + { .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 20, .type = TYPE_FIGHTING, @@ -2753,7 +3249,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_WHIRLPOOL + + [MOVE_WHIRLPOOL] = + { .effect = EFFECT_TRAP, .power = 15, .type = TYPE_WATER, @@ -2764,7 +3262,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_BEAT_UP + + [MOVE_BEAT_UP] = + { .effect = EFFECT_BEAT_UP, .power = 10, .type = TYPE_DARK, @@ -2775,7 +3275,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_FAKE_OUT + + [MOVE_FAKE_OUT] = + { .effect = EFFECT_FAKE_OUT, .power = 40, .type = TYPE_NORMAL, @@ -2786,7 +3288,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 1, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_UPROAR + + [MOVE_UPROAR] = + { .effect = EFFECT_UPROAR, .power = 50, .type = TYPE_NORMAL, @@ -2797,7 +3301,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_STOCKPILE + + [MOVE_STOCKPILE] = + { .effect = EFFECT_STOCKPILE, .power = 0, .type = TYPE_NORMAL, @@ -2808,7 +3314,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_SPIT_UP + + [MOVE_SPIT_UP] = + { .effect = EFFECT_SPIT_UP, .power = 100, .type = TYPE_NORMAL, @@ -2819,7 +3327,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SWALLOW + + [MOVE_SWALLOW] = + { .effect = EFFECT_SWALLOW, .power = 0, .type = TYPE_NORMAL, @@ -2830,7 +3340,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_HEAT_WAVE + + [MOVE_HEAT_WAVE] = + { .effect = EFFECT_BURN_HIT, .power = 100, .type = TYPE_FIRE, @@ -2841,7 +3353,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_HAIL + + [MOVE_HAIL] = + { .effect = EFFECT_HAIL, .power = 0, .type = TYPE_ICE, @@ -2852,7 +3366,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, - { // MOVE_TORMENT + + [MOVE_TORMENT] = + { .effect = EFFECT_TORMENT, .power = 0, .type = TYPE_DARK, @@ -2863,7 +3379,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FLATTER + + [MOVE_FLATTER] = + { .effect = EFFECT_FLATTER, .power = 0, .type = TYPE_DARK, @@ -2874,7 +3392,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_WILL_O_WISP + + [MOVE_WILL_O_WISP] = + { .effect = EFFECT_WILL_O_WISP, .power = 0, .type = TYPE_FIRE, @@ -2885,7 +3405,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MEMENTO + + [MOVE_MEMENTO] = + { .effect = EFFECT_MEMENTO, .power = 0, .type = TYPE_DARK, @@ -2896,7 +3418,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FACADE + + [MOVE_FACADE] = + { .effect = EFFECT_FACADE, .power = 70, .type = TYPE_NORMAL, @@ -2907,7 +3431,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FOCUS_PUNCH + + [MOVE_FOCUS_PUNCH] = + { .effect = EFFECT_FOCUS_PUNCH, .power = 150, .type = TYPE_FIGHTING, @@ -2918,7 +3444,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = -3, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, }, - { // MOVE_SMELLING_SALT + + [MOVE_SMELLING_SALT] = + { .effect = EFFECT_SMELLINGSALT, .power = 60, .type = TYPE_NORMAL, @@ -2929,7 +3457,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FOLLOW_ME + + [MOVE_FOLLOW_ME] = + { .effect = EFFECT_FOLLOW_ME, .power = 0, .type = TYPE_NORMAL, @@ -2940,7 +3470,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 3, .flags = 0, }, - { // MOVE_NATURE_POWER + + [MOVE_NATURE_POWER] = + { .effect = EFFECT_NATURE_POWER, .power = 0, .type = TYPE_NORMAL, @@ -2951,7 +3483,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_CHARGE + + [MOVE_CHARGE] = + { .effect = EFFECT_CHARGE, .power = 0, .type = TYPE_ELECTRIC, @@ -2962,7 +3496,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_TAUNT + + [MOVE_TAUNT] = + { .effect = EFFECT_TAUNT, .power = 0, .type = TYPE_DARK, @@ -2973,7 +3509,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, - { // MOVE_HELPING_HAND + + [MOVE_HELPING_HAND] = + { .effect = EFFECT_HELPING_HAND, .power = 0, .type = TYPE_NORMAL, @@ -2984,7 +3522,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 5, .flags = 0, }, - { // MOVE_TRICK + + [MOVE_TRICK] = + { .effect = EFFECT_TRICK, .power = 0, .type = TYPE_PSYCHIC, @@ -2995,7 +3535,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ROLE_PLAY + + [MOVE_ROLE_PLAY] = + { .effect = EFFECT_ROLE_PLAY, .power = 0, .type = TYPE_PSYCHIC, @@ -3006,7 +3548,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_WISH + + [MOVE_WISH] = + { .effect = EFFECT_WISH, .power = 0, .type = TYPE_NORMAL, @@ -3017,7 +3561,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, - { // MOVE_ASSIST + + [MOVE_ASSIST] = + { .effect = EFFECT_ASSIST, .power = 0, .type = TYPE_NORMAL, @@ -3028,7 +3574,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_INGRAIN + + [MOVE_INGRAIN] = + { .effect = EFFECT_INGRAIN, .power = 0, .type = TYPE_GRASS, @@ -3039,7 +3587,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_SUPERPOWER + + [MOVE_SUPERPOWER] = + { .effect = EFFECT_SUPERPOWER, .power = 120, .type = TYPE_FIGHTING, @@ -3050,7 +3600,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MAGIC_COAT + + [MOVE_MAGIC_COAT] = + { .effect = EFFECT_MAGIC_COAT, .power = 0, .type = TYPE_PSYCHIC, @@ -3061,7 +3613,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 4, .flags = 0, }, - { // MOVE_RECYCLE + + [MOVE_RECYCLE] = + { .effect = EFFECT_RECYCLE, .power = 0, .type = TYPE_NORMAL, @@ -3072,7 +3626,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_REVENGE + + [MOVE_REVENGE] = + { .effect = EFFECT_REVENGE, .power = 60, .type = TYPE_FIGHTING, @@ -3083,7 +3639,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = -4, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_BRICK_BREAK + + [MOVE_BRICK_BREAK] = + { .effect = EFFECT_BRICK_BREAK, .power = 75, .type = TYPE_FIGHTING, @@ -3094,7 +3652,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_YAWN + + [MOVE_YAWN] = + { .effect = EFFECT_YAWN, .power = 0, .type = TYPE_NORMAL, @@ -3105,7 +3665,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_KNOCK_OFF + + [MOVE_KNOCK_OFF] = + { .effect = EFFECT_KNOCK_OFF, .power = 20, .type = TYPE_DARK, @@ -3116,7 +3678,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ENDEAVOR + + [MOVE_ENDEAVOR] = + { .effect = EFFECT_ENDEAVOR, .power = 1, .type = TYPE_NORMAL, @@ -3127,7 +3691,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ERUPTION + + [MOVE_ERUPTION] = + { .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_FIRE, @@ -3138,7 +3704,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SKILL_SWAP + + [MOVE_SKILL_SWAP] = + { .effect = EFFECT_SKILL_SWAP, .power = 0, .type = TYPE_PSYCHIC, @@ -3149,7 +3717,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_IMPRISON + + [MOVE_IMPRISON] = + { .effect = EFFECT_IMPRISON, .power = 0, .type = TYPE_PSYCHIC, @@ -3160,7 +3730,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, - { // MOVE_REFRESH + + [MOVE_REFRESH] = + { .effect = EFFECT_REFRESH, .power = 0, .type = TYPE_NORMAL, @@ -3171,7 +3743,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_GRUDGE + + [MOVE_GRUDGE] = + { .effect = EFFECT_GRUDGE, .power = 0, .type = TYPE_GHOST, @@ -3182,7 +3756,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SNATCH + + [MOVE_SNATCH] = + { .effect = EFFECT_SNATCH, .power = 0, .type = TYPE_DARK, @@ -3193,7 +3769,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 4, .flags = FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SECRET_POWER + + [MOVE_SECRET_POWER] = + { .effect = EFFECT_SECRET_POWER, .power = 70, .type = TYPE_NORMAL, @@ -3204,7 +3782,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_DIVE + + [MOVE_DIVE] = + { .effect = EFFECT_SEMI_INVULNERABLE, .power = 60, .type = TYPE_WATER, @@ -3215,7 +3795,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ARM_THRUST + + [MOVE_ARM_THRUST] = + { .effect = EFFECT_MULTI_HIT, .power = 15, .type = TYPE_FIGHTING, @@ -3226,7 +3808,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_CAMOUFLAGE + + [MOVE_CAMOUFLAGE] = + { .effect = EFFECT_CAMOUFLAGE, .power = 0, .type = TYPE_NORMAL, @@ -3237,7 +3821,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_TAIL_GLOW + + [MOVE_TAIL_GLOW] = + { .effect = EFFECT_SPECIAL_ATTACK_UP_2, .power = 0, .type = TYPE_BUG, @@ -3248,7 +3834,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_LUSTER_PURGE + + [MOVE_LUSTER_PURGE] = + { .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -3259,7 +3847,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MIST_BALL + + [MOVE_MIST_BALL] = + { .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, .power = 70, .type = TYPE_PSYCHIC, @@ -3270,7 +3860,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_FEATHER_DANCE + + [MOVE_FEATHER_DANCE] = + { .effect = EFFECT_ATTACK_DOWN_2, .power = 0, .type = TYPE_FLYING, @@ -3281,7 +3873,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_TEETER_DANCE + + [MOVE_TEETER_DANCE] = + { .effect = EFFECT_TEETER_DANCE, .power = 0, .type = TYPE_NORMAL, @@ -3292,7 +3886,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, - { // MOVE_BLAZE_KICK + + [MOVE_BLAZE_KICK] = + { .effect = EFFECT_BLAZE_KICK, .power = 85, .type = TYPE_FIRE, @@ -3303,7 +3899,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MUD_SPORT + + [MOVE_MUD_SPORT] = + { .effect = EFFECT_MUD_SPORT, .power = 0, .type = TYPE_GROUND, @@ -3314,7 +3912,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_ICE_BALL + + [MOVE_ICE_BALL] = + { .effect = EFFECT_ROLLOUT, .power = 30, .type = TYPE_ICE, @@ -3325,7 +3925,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_NEEDLE_ARM + + [MOVE_NEEDLE_ARM] = + { .effect = EFFECT_FLINCH_MINIMIZE_HIT, .power = 60, .type = TYPE_GRASS, @@ -3336,7 +3938,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SLACK_OFF + + [MOVE_SLACK_OFF] = + { .effect = EFFECT_RESTORE_HP, .power = 0, .type = TYPE_NORMAL, @@ -3347,7 +3951,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_HYPER_VOICE + + [MOVE_HYPER_VOICE] = + { .effect = EFFECT_HIT, .power = 90, .type = TYPE_NORMAL, @@ -3358,7 +3964,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_POISON_FANG + + [MOVE_POISON_FANG] = + { .effect = EFFECT_POISON_FANG, .power = 50, .type = TYPE_POISON, @@ -3369,7 +3977,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_CRUSH_CLAW + + [MOVE_CRUSH_CLAW] = + { .effect = EFFECT_DEFENSE_DOWN_HIT, .power = 75, .type = TYPE_NORMAL, @@ -3380,7 +3990,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_BLAST_BURN + + [MOVE_BLAST_BURN] = + { .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_FIRE, @@ -3391,7 +4003,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_HYDRO_CANNON + + [MOVE_HYDRO_CANNON] = + { .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_WATER, @@ -3402,7 +4016,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_METEOR_MASH + + [MOVE_METEOR_MASH] = + { .effect = EFFECT_ATTACK_UP_HIT, .power = 100, .type = TYPE_STEEL, @@ -3413,7 +4029,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ASTONISH + + [MOVE_ASTONISH] = + { .effect = EFFECT_FLINCH_MINIMIZE_HIT, .power = 30, .type = TYPE_GHOST, @@ -3424,7 +4042,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_WEATHER_BALL + + [MOVE_WEATHER_BALL] = + { .effect = EFFECT_WEATHER_BALL, .power = 50, .type = TYPE_NORMAL, @@ -3435,7 +4055,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_AROMATHERAPY + + [MOVE_AROMATHERAPY] = + { .effect = EFFECT_HEAL_BELL, .power = 0, .type = TYPE_GRASS, @@ -3446,7 +4068,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_FAKE_TEARS + + [MOVE_FAKE_TEARS] = + { .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_DARK, @@ -3457,7 +4081,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_AIR_CUTTER + + [MOVE_AIR_CUTTER] = + { .effect = EFFECT_HIGH_CRITICAL, .power = 55, .type = TYPE_FLYING, @@ -3468,7 +4094,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_OVERHEAT + + [MOVE_OVERHEAT] = + { .effect = EFFECT_OVERHEAT, .power = 140, .type = TYPE_FIRE, @@ -3479,7 +4107,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ODOR_SLEUTH + + [MOVE_ODOR_SLEUTH] = + { .effect = EFFECT_FORESIGHT, .power = 0, .type = TYPE_NORMAL, @@ -3490,7 +4120,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_ROCK_TOMB + + [MOVE_ROCK_TOMB] = + { .effect = EFFECT_SPEED_DOWN_HIT, .power = 50, .type = TYPE_ROCK, @@ -3501,7 +4133,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SILVER_WIND + + [MOVE_SILVER_WIND] = + { .effect = EFFECT_ALL_STATS_UP_HIT, .power = 60, .type = TYPE_BUG, @@ -3512,7 +4146,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_METAL_SOUND + + [MOVE_METAL_SOUND] = + { .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, .power = 0, .type = TYPE_STEEL, @@ -3523,7 +4159,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_GRASS_WHISTLE + + [MOVE_GRASS_WHISTLE] = + { .effect = EFFECT_SLEEP, .power = 0, .type = TYPE_GRASS, @@ -3534,7 +4172,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_TICKLE + + [MOVE_TICKLE] = + { .effect = EFFECT_TICKLE, .power = 0, .type = TYPE_NORMAL, @@ -3545,7 +4185,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_COSMIC_POWER + + [MOVE_COSMIC_POWER] = + { .effect = EFFECT_COSMIC_POWER, .power = 0, .type = TYPE_PSYCHIC, @@ -3556,7 +4198,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_WATER_SPOUT + + [MOVE_WATER_SPOUT] = + { .effect = EFFECT_ERUPTION, .power = 150, .type = TYPE_WATER, @@ -3567,7 +4211,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SIGNAL_BEAM + + [MOVE_SIGNAL_BEAM] = + { .effect = EFFECT_CONFUSE_HIT, .power = 75, .type = TYPE_BUG, @@ -3578,7 +4224,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SHADOW_PUNCH + + [MOVE_SHADOW_PUNCH] = + { .effect = EFFECT_ALWAYS_HIT, .power = 60, .type = TYPE_GHOST, @@ -3589,7 +4237,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_EXTRASENSORY + + [MOVE_EXTRASENSORY] = + { .effect = EFFECT_FLINCH_MINIMIZE_HIT, .power = 80, .type = TYPE_PSYCHIC, @@ -3600,7 +4250,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_SKY_UPPERCUT + + [MOVE_SKY_UPPERCUT] = + { .effect = EFFECT_SKY_UPPERCUT, .power = 85, .type = TYPE_FIGHTING, @@ -3611,7 +4263,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SAND_TOMB + + [MOVE_SAND_TOMB] = + { .effect = EFFECT_TRAP, .power = 15, .type = TYPE_GROUND, @@ -3622,7 +4276,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SHEER_COLD + + [MOVE_SHEER_COLD] = + { .effect = EFFECT_OHKO, .power = 1, .type = TYPE_ICE, @@ -3633,7 +4289,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_MUDDY_WATER + + [MOVE_MUDDY_WATER] = + { .effect = EFFECT_ACCURACY_DOWN_HIT, .power = 95, .type = TYPE_WATER, @@ -3644,7 +4302,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_BULLET_SEED + + [MOVE_BULLET_SEED] = + { .effect = EFFECT_MULTI_HIT, .power = 10, .type = TYPE_GRASS, @@ -3655,7 +4315,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_AERIAL_ACE + + [MOVE_AERIAL_ACE] = + { .effect = EFFECT_ALWAYS_HIT, .power = 60, .type = TYPE_FLYING, @@ -3666,7 +4328,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_ICICLE_SPEAR + + [MOVE_ICICLE_SPEAR] = + { .effect = EFFECT_MULTI_HIT, .power = 10, .type = TYPE_ICE, @@ -3677,7 +4341,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_IRON_DEFENSE + + [MOVE_IRON_DEFENSE] = + { .effect = EFFECT_DEFENSE_UP_2, .power = 0, .type = TYPE_STEEL, @@ -3688,7 +4354,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_BLOCK + + [MOVE_BLOCK] = + { .effect = EFFECT_MEAN_LOOK, .power = 0, .type = TYPE_NORMAL, @@ -3699,7 +4367,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_HOWL + + [MOVE_HOWL] = + { .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, @@ -3710,7 +4380,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_DRAGON_CLAW + + [MOVE_DRAGON_CLAW] = + { .effect = EFFECT_HIT, .power = 80, .type = TYPE_DRAGON, @@ -3721,7 +4393,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_FRENZY_PLANT + + [MOVE_FRENZY_PLANT] = + { .effect = EFFECT_RECHARGE, .power = 150, .type = TYPE_GRASS, @@ -3732,7 +4406,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_BULK_UP + + [MOVE_BULK_UP] = + { .effect = EFFECT_BULK_UP, .power = 0, .type = TYPE_FIGHTING, @@ -3743,7 +4419,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_BOUNCE + + [MOVE_BOUNCE] = + { .effect = EFFECT_SEMI_INVULNERABLE, .power = 85, .type = TYPE_FLYING, @@ -3754,7 +4432,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_MUD_SHOT + + [MOVE_MUD_SHOT] = + { .effect = EFFECT_SPEED_DOWN_HIT, .power = 55, .type = TYPE_GROUND, @@ -3765,7 +4445,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_POISON_TAIL + + [MOVE_POISON_TAIL] = + { .effect = EFFECT_POISON_TAIL, .power = 50, .type = TYPE_POISON, @@ -3776,7 +4458,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_COVET + + [MOVE_COVET] = + { .effect = EFFECT_THIEF, .power = 40, .type = TYPE_NORMAL, @@ -3787,7 +4471,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, - { // MOVE_VOLT_TACKLE + + [MOVE_VOLT_TACKLE] = + { .effect = EFFECT_DOUBLE_EDGE, .power = 120, .type = TYPE_ELECTRIC, @@ -3798,7 +4484,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_MAGICAL_LEAF + + [MOVE_MAGICAL_LEAF] = + { .effect = EFFECT_ALWAYS_HIT, .power = 60, .type = TYPE_GRASS, @@ -3809,7 +4497,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_WATER_SPORT + + [MOVE_WATER_SPORT] = + { .effect = EFFECT_WATER_SPORT, .power = 0, .type = TYPE_WATER, @@ -3820,7 +4510,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_CALM_MIND + + [MOVE_CALM_MIND] = + { .effect = EFFECT_CALM_MIND, .power = 0, .type = TYPE_PSYCHIC, @@ -3831,7 +4523,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_LEAF_BLADE + + [MOVE_LEAF_BLADE] = + { .effect = EFFECT_HIGH_CRITICAL, .power = 70, .type = TYPE_GRASS, @@ -3842,7 +4536,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_DRAGON_DANCE + + [MOVE_DRAGON_DANCE] = + { .effect = EFFECT_DRAGON_DANCE, .power = 0, .type = TYPE_DRAGON, @@ -3853,7 +4549,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, - { // MOVE_ROCK_BLAST + + [MOVE_ROCK_BLAST] = + { .effect = EFFECT_MULTI_HIT, .power = 25, .type = TYPE_ROCK, @@ -3864,7 +4562,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_SHOCK_WAVE + + [MOVE_SHOCK_WAVE] = + { .effect = EFFECT_ALWAYS_HIT, .power = 60, .type = TYPE_ELECTRIC, @@ -3875,7 +4575,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_WATER_PULSE + + [MOVE_WATER_PULSE] = + { .effect = EFFECT_CONFUSE_HIT, .power = 60, .type = TYPE_WATER, @@ -3886,7 +4588,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, - { // MOVE_DOOM_DESIRE + + [MOVE_DOOM_DESIRE] = + { .effect = EFFECT_FUTURE_SIGHT, .power = 120, .type = TYPE_STEEL, @@ -3897,7 +4601,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .priority = 0, .flags = 0, }, - { // MOVE_PSYCHO_BOOST + + [MOVE_PSYCHO_BOOST] = + { .effect = EFFECT_OVERHEAT, .power = 140, .type = TYPE_PSYCHIC, @@ -3909,5 +4615,3 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, }; - -#endif // GUARD_DATA_BATTLE_MOVES diff --git a/src/data/decoration/description.h b/src/data/decoration/description.h index ba4c3dd54..b56f43eb6 100644 --- a/src/data/decoration/description.h +++ b/src/data/decoration/description.h @@ -1,10 +1,3 @@ -// -// Created by scott on 10/21/2017. -// - -#ifndef GUARD_DATA_DECORATION_DESCRIPTION_H -#define GUARD_DATA_DECORATION_DESCRIPTION_H - const u8 DecorDesc_SMALL_DESK[] = _( "A small desk built\n" "for one."); @@ -578,4 +571,3 @@ const u8 DecorDesc_REGISTEEL_DOLL[] = _( "A large doll.\n" "Place it on a mat\n" "or a desk."); -#endif //GUARD_DATA_DECORATION_DESCRIPTION_H diff --git a/src/data/decoration/header.h b/src/data/decoration/header.h index 64bed1c7e..a909bd9fd 100644 --- a/src/data/decoration/header.h +++ b/src/data/decoration/header.h @@ -1,10 +1,3 @@ -// -// Created by scott on 10/21/2017. -// - -#ifndef GUARD_DATA_DECORATION_HEADER_H -#define GUARD_DATA_DECORATION_HEADER_H - const struct Decoration gDecorations[] = { { DECOR_NONE, @@ -1096,5 +1089,3 @@ const struct Decoration gDecorations[] = { DecorDesc_REGISTEEL_DOLL, DecorGfx_REGISTEEL_DOLL} }; - -#endif //GUARD_DATA_DECORATION_HEADER_H diff --git a/src/data/decoration/icon.h b/src/data/decoration/icon.h index 1823485ba..58d9cea7b 100644 --- a/src/data/decoration/icon.h +++ b/src/data/decoration/icon.h @@ -1,10 +1,3 @@ -// -// Created by scott on 10/21/2017. -// - -#ifndef GUARD_ICON_H -#define GUARD_ICON_H - const u32 *const gUnknown_085A6BE8[][2] = { {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, {NULL, NULL}, @@ -128,5 +121,3 @@ const u32 *const gUnknown_085A6BE8[][2] = { {gUnknown_08DB9DD4, gUnknown_08DB9EE4}, {gUnknown_08DBA020, gUnknown_08DBA12C} }; - -#endif //GUARD_ICON_H diff --git a/src/data/decoration/tilemaps.h b/src/data/decoration/tilemaps.h index 1cca7ae0b..12fe31dc0 100644 --- a/src/data/decoration/tilemaps.h +++ b/src/data/decoration/tilemaps.h @@ -1,10 +1,3 @@ -// -// Created by scott on 10/21/2017. -// - -#ifndef GUARD_TILEMAPS_H -#define GUARD_TILEMAPS_H - const u8 Unknown_085A6FB0[] = { 0x00, 0x01, 0x02, 0x03 }; @@ -235,5 +228,3 @@ const struct { Unknown_085A7198, 0x18 }}; - -#endif //GUARD_TILEMAPS_H diff --git a/src/data/decoration/tiles.h b/src/data/decoration/tiles.h index 6b3ed699f..2b91cb53d 100644 --- a/src/data/decoration/tiles.h +++ b/src/data/decoration/tiles.h @@ -1,6 +1,3 @@ -#ifndef GUARD_DATA_DECORATION_TILES -#define GUARD_DATA_DECORATION_TILES - const u16 DecorGfx_SMALL_DESK[] = { 0x87 }; @@ -642,5 +639,3 @@ const u16 DecorGfx_REGICE_DOLL[] = { const u16 DecorGfx_REGISTEEL_DOLL[] = { EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL }; - -#endif // GUARD_DATA_DECORATION_TILES diff --git a/src/data/field_event_obj/base_oam.h b/src/data/field_event_obj/base_oam.h index 1aa6987c3..543382d43 100755 --- a/src/data/field_event_obj/base_oam.h +++ b/src/data/field_event_obj/base_oam.h @@ -1,6 +1,3 @@ -#ifndef GUARD_BASE_OAM_H -#define GUARD_BASE_OAM_H - const struct OamData gEventObjectBaseOam_8x8 = { .shape = 0, .size = 0, @@ -48,5 +45,3 @@ const struct OamData gEventObjectBaseOam_64x64 = { .size = 3, .priority = 2 }; - -#endif //GUARD_BASE_OAM_H diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h index beb59974f..f5ef15af9 100755 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ b/src/data/field_event_obj/berry_tree_graphics_tables.h @@ -1,6 +1,3 @@ -#ifndef GUARD_BERRY_TREE_GRAPHICS_TABLES_H -#define GUARD_BERRY_TREE_GRAPHICS_TABLES_H - const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), @@ -565,6 +562,3 @@ const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = { gBerryTreeEventObjectGraphicsIdTable, gBerryTreeEventObjectGraphicsIdTable, }; - - -#endif //GUARD_BERRY_TREE_GRAPHICS_TABLES_H diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h index 9b897651d..6203e0548 100755 --- a/src/data/field_event_obj/event_object_anims.h +++ b/src/data/field_event_obj/event_object_anims.h @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_ANIMS_H -#define GUARD_EVENT_OBJECT_ANIMS_H - const union AnimCmd gEventObjectImageAnim_StayStill[] = { ANIMCMD_FRAME(0, 8), @@ -1172,5 +1169,3 @@ const struct UnkStruct_085094AC gUnknown_085094AC[] = { {0, 0, 0, 0}, }, }; - -#endif //GUARD_EVENT_OBJECT_ANIMS_H diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 4b65e694f..f7f1f33ba 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_GFX_H -#define GUARD_EVENT_OBJECT_GFX_H - const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); const u32 gEventObjectPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); @@ -307,7 +304,7 @@ const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/pale const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal"); const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust.4bpp"); const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass.4bpp"); -const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp"); +const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp"); const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16.4bpp"); const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp"); const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18.4bpp"); @@ -363,5 +360,3 @@ const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/poke const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); const u32 gEventObjectPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); - -#endif //GUARD_EVENT_OBJECT_GFX_H diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h index ebc324b08..1f89cc98d 100755 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ b/src/data/field_event_obj/event_object_graphics_info.h @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_H -#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_H - const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; @@ -246,5 +243,3 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrenda const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lugia, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_HoOh, gEventObjectPicTable_HoOh, gDummySpriteAffineAnimTable}; - -#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_H diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 3f726e30e..f57e294c3 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H -#define GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H - const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; @@ -500,5 +497,3 @@ const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[ &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, }; - -#endif //GUARD_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index bd1ad1a25..5c8be195d 100755 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_PIC_TABLES_H -#define GUARD_EVENT_OBJECT_PIC_TABLES_H - const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0), overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1), @@ -2175,5 +2172,3 @@ const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = { overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 7), overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 8), }; - -#endif //GUARD_EVENT_OBJECT_PIC_TABLES_H diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h index db5fddf1e..5da262731 100755 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/field_event_obj/event_object_subsprites.h @@ -1,6 +1,3 @@ -#ifndef GUARD_EVENT_OBJECT_SUBSPRITES_H -#define GUARD_EVENT_OBJECT_SUBSPRITES_H - const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { { -8, -8, 0, 1, 0, 2} }; @@ -338,5 +335,3 @@ const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = { {16, gEventObjectSpriteOamTable_SubmarineShadow_3}, {16, gEventObjectSpriteOamTable_SubmarineShadow_3} }; - -#endif //GUARD_EVENT_OBJECT_SUBSPRITES_H diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/field_event_obj/field_effect_object_template_pointers.h index 3b08a5ff1..32d2b069a 100755 --- a/src/data/field_event_obj/field_effect_object_template_pointers.h +++ b/src/data/field_event_obj/field_effect_object_template_pointers.h @@ -1,6 +1,3 @@ -#ifndef GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H -#define GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H - const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge; @@ -78,5 +75,3 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { &gFieldEffectObjectTemplate_Unknown35, &gFieldEffectObjectTemplate_Rayquaza, }; - -#endif //GUARD_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h index 82fde1769..a3944de36 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_event_obj/field_effect_objects.h @@ -1,6 +1,3 @@ -#ifndef GUARD_FIELD_EFFECT_OBJECTS_H -#define GUARD_FIELD_EFFECT_OBJECTS_H - const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, 0x1004}; const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, 0x1005}; @@ -993,5 +990,3 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011}; - -#endif //GUARD_FIELD_EFFECT_OBJECTS_H diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h index b24f5dea4..fb9f4b2cd 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/field_event_obj/movement_action_func_tables.h @@ -1,6 +1,3 @@ -#ifndef GUARD_MOVEMENT_ACTION_FUNC_TABLES_H -#define GUARD_MOVEMENT_ACTION_FUNC_TABLES_H - u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *); @@ -1514,5 +1511,3 @@ u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, MovementAction_DestroyExtraTaskIfAtTop_Step0, MovementAction_Finish, }; - -#endif //GUARD_MOVEMENT_ACTION_FUNC_TABLES_H diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h index 165e96220..3c490011b 100755 --- a/src/data/field_event_obj/movement_type_func_tables.h +++ b/src/data/field_event_obj/movement_type_func_tables.h @@ -1,6 +1,3 @@ -#ifndef GUARD_MOVEMENT_TYPE_FUNC_TABLES_H -#define GUARD_MOVEMENT_TYPE_FUNC_TABLES_H - u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = { MovementType_WanderAround_Step0, MovementType_WanderAround_Step1, @@ -439,5 +436,3 @@ u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite * MovementType_Invisible_Step1, MovementType_Invisible_Step2, }; - -#endif //GUARD_MOVEMENT_TYPE_FUNC_TABLES_H diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index a56f297ef..f55a8468e 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -1,414 +1,407 @@ -#ifndef GUARD_DATA_ITEM_ICON_TABLE_H -#define GUARD_DATA_ITEM_ICON_TABLE_H - -#include "global.h" -#include "graphics.h" - -const u32 *const gItemIconTable[][2] = +const u32 *const gItemIconTable[][2] = { - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Pokeballs - gItemIcon_MasterBall, gItemIconPalette_MasterBall, - gItemIcon_UltraBall, gItemIconPalette_UltraBall, - gItemIcon_GreatBall, gItemIconPalette_GreatBall, - gItemIcon_PokeBall, gItemIconPalette_PokeBall, - gItemIcon_SafariBall, gItemIconPalette_SafariBall, - gItemIcon_NetBall, gItemIconPalette_NetBall, - gItemIcon_DiveBall, gItemIconPalette_DiveBall, - gItemIcon_NestBall, gItemIconPalette_NestBall, - gItemIcon_RepeatBall, gItemIconPalette_RepeatBall, - gItemIcon_TimerBall, gItemIconPalette_RepeatBall, - gItemIcon_LuxuryBall, gItemIconPalette_LuxuryBall, - gItemIcon_PremierBall, gItemIconPalette_LuxuryBall, -// Medicine - gItemIcon_Potion, gItemIconPalette_Potion, - gItemIcon_Antidote, gItemIconPalette_Antidote, - gItemIcon_StatusHeal, gItemIconPalette_BurnHeal, - gItemIcon_StatusHeal, gItemIconPalette_IceHeal, - gItemIcon_StatusHeal, gItemIconPalette_Awakening, - gItemIcon_StatusHeal, gItemIconPalette_ParalyzeHeal, - gItemIcon_LargePotion, gItemIconPalette_FullRestore, - gItemIcon_LargePotion, gItemIconPalette_MaxPotion, - gItemIcon_Potion, gItemIconPalette_HyperPotion, - gItemIcon_Potion, gItemIconPalette_SuperPotion, - gItemIcon_FullHeal, gItemIconPalette_FullHeal, - gItemIcon_Revive, gItemIconPalette_Revive, - gItemIcon_MaxRevive, gItemIconPalette_Revive, - gItemIcon_FreshWater, gItemIconPalette_FreshWater, - gItemIcon_SodaPop, gItemIconPalette_SodaPop, - gItemIcon_Lemonade, gItemIconPalette_Lemonade, - gItemIcon_MoomooMilk, gItemIconPalette_MoomooMilk, - gItemIcon_Powder, gItemIconPalette_EnergyPowder, - gItemIcon_EnergyRoot, gItemIconPalette_EnergyRoot, - gItemIcon_Powder, gItemIconPalette_HealPowder, - gItemIcon_RevivalHerb, gItemIconPalette_RevivalHerb, - gItemIcon_Ether, gItemIconPalette_Ether, - gItemIcon_Ether, gItemIconPalette_MaxEther, - gItemIcon_Ether, gItemIconPalette_Elixir, - gItemIcon_Ether, gItemIconPalette_MaxElixir, - gItemIcon_LavaCookie, gItemIconPalette_LavaCookieAndLetter, - gItemIcon_Flute, gItemIconPalette_BlueFlute, - gItemIcon_Flute, gItemIconPalette_YellowFlute, - gItemIcon_Flute, gItemIconPalette_RedFlute, - gItemIcon_Flute, gItemIconPalette_BlackFlute, - gItemIcon_Flute, gItemIconPalette_WhiteFlute, - gItemIcon_BerryJuice, gItemIconPalette_BerryJuice, - gItemIcon_SacredAsh, gItemIconPalette_SacredAsh, -// Collectibles - gItemIcon_Powder, gItemIconPalette_ShoalSalt, - gItemIcon_ShoalShell, gItemIconPalette_Shell, - gItemIcon_Shard, gItemIconPalette_RedShard, - gItemIcon_Shard, gItemIconPalette_BlueShard, - gItemIcon_Shard, gItemIconPalette_YellowShard, - gItemIcon_Shard, gItemIconPalette_GreenShard, -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Vitamins - gItemIcon_HPUp, gItemIconPalette_HPUp, - gItemIcon_Vitamin, gItemIconPalette_Protein, - gItemIcon_Vitamin, gItemIconPalette_Iron, - gItemIcon_Vitamin, gItemIconPalette_Carbos, - gItemIcon_Vitamin, gItemIconPalette_Calcium, - gItemIcon_RareCandy, gItemIconPalette_RareCandy, - gItemIcon_PPUp, gItemIconPalette_PPUp, - gItemIcon_Vitamin, gItemIconPalette_Zinc, - gItemIcon_PPMax, gItemIconPalette_PPMax, -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Battle items - gItemIcon_BattleStatItem, gItemIconPalette_GuardSpec, - gItemIcon_BattleStatItem, gItemIconPalette_DireHit, - gItemIcon_BattleStatItem, gItemIconPalette_XAttack, - gItemIcon_BattleStatItem, gItemIconPalette_XDefend, - gItemIcon_BattleStatItem, gItemIconPalette_XSpeed, - gItemIcon_BattleStatItem, gItemIconPalette_XAccuracy, - gItemIcon_BattleStatItem, gItemIconPalette_XSpecial, - gItemIcon_PokeDoll, gItemIconPalette_PokeDoll, - gItemIcon_FluffyTail, gItemIconPalette_FluffyTail, -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Field items - gItemIcon_Repel, gItemIconPalette_SuperRepel, - gItemIcon_Repel, gItemIconPalette_MaxRepel, - gItemIcon_EscapeRope, gItemIconPalette_EscapeRope, - gItemIcon_Repel, gItemIconPalette_Repel, -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Evolution stones - gItemIcon_SunStone, gItemIconPalette_SunStone, - gItemIcon_MoonStone, gItemIconPalette_MoonStone, - gItemIcon_FireStone, gItemIconPalette_FireStone, - gItemIcon_ThunderStone, gItemIconPalette_ThunderStone, - gItemIcon_WaterStone, gItemIconPalette_WaterStone, - gItemIcon_LeafStone, gItemIconPalette_LeafStone, -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Valuables - gItemIcon_TinyMushroom, gItemIconPalette_Mushroom, - gItemIcon_BigMushroom, gItemIconPalette_Mushroom, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_Pearl, gItemIconPalette_Pearl, - gItemIcon_BigPearl, gItemIconPalette_Pearl, - gItemIcon_Stardust, gItemIconPalette_Star, - gItemIcon_StarPiece, gItemIconPalette_Star, - gItemIcon_Nugget, gItemIconPalette_Nugget, - gItemIcon_HeartScale, gItemIconPalette_HeartScale, -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Mail - gItemIcon_OrangeMail, gItemIconPalette_OrangeMail, - gItemIcon_HarborMail, gItemIconPalette_HarborMail, - gItemIcon_GlitterMail, gItemIconPalette_GlitterMail, - gItemIcon_MechMail, gItemIconPalette_MechMail, - gItemIcon_WoodMail, gItemIconPalette_WoodMail, - gItemIcon_WaveMail, gItemIconPalette_WaveMail, - gItemIcon_BeadMail, gItemIconPalette_BeadMail, - gItemIcon_ShadowMail, gItemIconPalette_ShadowMail, - gItemIcon_TropicMail, gItemIconPalette_TropicMail, - gItemIcon_DreamMail, gItemIconPalette_DreamMail, - gItemIcon_FabMail, gItemIconPalette_FabMail, - gItemIcon_RetroMail, gItemIconPalette_RetroMail, -// Berries - gItemIcon_CheriBerry, gItemIconPalette_CheriBerry, - gItemIcon_ChestoBerry, gItemIconPalette_ChestoBerry, - gItemIcon_PechaBerry, gItemIconPalette_PechaBerry, - gItemIcon_RawstBerry, gItemIconPalette_RawstBerry, - gItemIcon_AspearBerry, gItemIconPalette_AspearBerry, - gItemIcon_LeppaBerry, gItemIconPalette_LeppaBerry, - gItemIcon_OranBerry, gItemIconPalette_OranBerry, - gItemIcon_PersimBerry, gItemIconPalette_PersimBerry, - gItemIcon_LumBerry, gItemIconPalette_LumBerry, - gItemIcon_SitrusBerry, gItemIconPalette_SitrusBerry, - gItemIcon_FigyBerry, gItemIconPalette_FigyBerry, - gItemIcon_WikiBerry, gItemIconPalette_WikiBerry, - gItemIcon_MagoBerry, gItemIconPalette_MagoBerry, - gItemIcon_AguavBerry, gItemIconPalette_AguavBerry, - gItemIcon_IapapaBerry, gItemIconPalette_IapapaBerry, - gItemIcon_RazzBerry, gItemIconPalette_RazzBerry, - gItemIcon_BlukBerry, gItemIconPalette_BlukBerry, - gItemIcon_NanabBerry, gItemIconPalette_NanabBerry, - gItemIcon_WepearBerry, gItemIconPalette_WepearBerry, - gItemIcon_PinapBerry, gItemIconPalette_PinapBerry, - gItemIcon_PomegBerry, gItemIconPalette_PomegBerry, - gItemIcon_KelpsyBerry, gItemIconPalette_KelpsyBerry, - gItemIcon_QualotBerry, gItemIconPalette_QualotBerry, - gItemIcon_HondewBerry, gItemIconPalette_HondewBerry, - gItemIcon_GrepaBerry, gItemIconPalette_GrepaBerry, - gItemIcon_TamatoBerry, gItemIconPalette_TamatoBerry, - gItemIcon_CornnBerry, gItemIconPalette_CornnBerry, - gItemIcon_MagostBerry, gItemIconPalette_MagostBerry, - gItemIcon_RabutaBerry, gItemIconPalette_RabutaBerry, - gItemIcon_NomelBerry, gItemIconPalette_NomelBerry, - gItemIcon_SpelonBerry, gItemIconPalette_SpelonBerry, - gItemIcon_PamtreBerry, gItemIconPalette_PamtreBerry, - gItemIcon_WatmelBerry, gItemIconPalette_WatmelBerry, - gItemIcon_DurinBerry, gItemIconPalette_DurinBerry, - gItemIcon_BelueBerry, gItemIconPalette_BelueBerry, - gItemIcon_LiechiBerry, gItemIconPalette_LiechiBerry, - gItemIcon_GanlonBerry, gItemIconPalette_GanlonBerry, - gItemIcon_SalacBerry, gItemIconPalette_SalacBerry, - gItemIcon_PetayaBerry, gItemIconPalette_PetayaBerry, - gItemIcon_ApicotBerry, gItemIconPalette_ApicotBerry, - gItemIcon_LansatBerry, gItemIconPalette_LansatBerry, - gItemIcon_StarfBerry, gItemIconPalette_StarfBerry, - gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry, -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Hold items - gItemIcon_BrightPowder, gItemIconPalette_BrightPowder, - gItemIcon_InBattleHerb, gItemIconPalette_WhiteHerb, - gItemIcon_MachoBrace, gItemIconPalette_MachoBrace, - gItemIcon_ExpShare, gItemIconPalette_ExpShare, - gItemIcon_QuickClaw, gItemIconPalette_QuickClaw, - gItemIcon_SootheBell, gItemIconPalette_SootheBell, - gItemIcon_InBattleHerb, gItemIconPalette_MentalHerb, - gItemIcon_ChoiceBand, gItemIconPalette_ChoiceBand, - gItemIcon_KingsRock, gItemIconPalette_KingsRock, - gItemIcon_SilverPowder, gItemIconPalette_SilverPowder, - gItemIcon_AmuletCoin, gItemIconPalette_AmuletCoin, - gItemIcon_CleanseTag, gItemIconPalette_CleanseTag, - gItemIcon_SoulDew, gItemIconPalette_SoulDew, - gItemIcon_DeepSeaTooth, gItemIconPalette_DeepSeaTooth, - gItemIcon_DeepSeaScale, gItemIconPalette_DeepSeaScale, - gItemIcon_SmokeBall, gItemIconPalette_SmokeBall, - gItemIcon_Everstone, gItemIconPalette_Everstone, - gItemIcon_FocusBand, gItemIconPalette_FocusBand, - gItemIcon_LuckyEgg, gItemIconPalette_LuckyEgg, - gItemIcon_ScopeLens, gItemIconPalette_ScopeLens, - gItemIcon_MetalCoat, gItemIconPalette_MetalCoat, - gItemIcon_Leftovers, gItemIconPalette_Leftovers, - gItemIcon_DragonScale, gItemIconPalette_DragonScale, - gItemIcon_LightBall, gItemIconPalette_LightBall, - gItemIcon_SoftSand, gItemIconPalette_SoftSand, - gItemIcon_HardStone, gItemIconPalette_HardStone, - gItemIcon_MiracleSeed, gItemIconPalette_MiracleSeed, - gItemIcon_BlackGlasses, gItemIconPalette_BlackTypeEnhancingItem, - gItemIcon_BlackBelt, gItemIconPalette_BlackTypeEnhancingItem, - gItemIcon_Magnet, gItemIconPalette_Magnet, - gItemIcon_MysticWater, gItemIconPalette_MysticWater, - gItemIcon_SharpBeak, gItemIconPalette_SharpBeak, - gItemIcon_PoisonBarb, gItemIconPalette_PoisonBarb, - gItemIcon_NeverMeltIce, gItemIconPalette_NeverMeltIce, - gItemIcon_SpellTag, gItemIconPalette_SpellTag, - gItemIcon_TwistedSpoon, gItemIconPalette_TwistedSpoon, - gItemIcon_Charcoal, gItemIconPalette_Charcoal, - gItemIcon_DragonFang, gItemIconPalette_DragonFang, - gItemIcon_SilkScarf, gItemIconPalette_SilkScarf, - gItemIcon_UpGrade, gItemIconPalette_UpGrade, - gItemIcon_ShellBell, gItemIconPalette_Shell, - gItemIcon_SeaIncense, gItemIconPalette_SeaIncense, - gItemIcon_LaxIncense, gItemIconPalette_LaxIncense, - gItemIcon_LuckyPunch, gItemIconPalette_LuckyPunch, - gItemIcon_MetalPowder, gItemIconPalette_MetalPowder, - gItemIcon_ThickClub, gItemIconPalette_ThickClub, - gItemIcon_Stick, gItemIconPalette_Stick, -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// Contest hold items - gItemIcon_Scarf, gItemIconPalette_RedScarf, - gItemIcon_Scarf, gItemIconPalette_BlueScarf, - gItemIcon_Scarf, gItemIconPalette_PinkScarf, - gItemIcon_Scarf, gItemIconPalette_GreenScarf, - gItemIcon_Scarf, gItemIconPalette_YellowScarf, -// Key items - gItemIcon_MachBike, gItemIconPalette_MachBike, - gItemIcon_CoinCase, gItemIconPalette_CoinCase, - gItemIcon_Itemfinder, gItemIconPalette_Itemfinder, - gItemIcon_OldRod, gItemIconPalette_OldRod, - gItemIcon_GoodRod, gItemIconPalette_GoodRod, - gItemIcon_SuperRod, gItemIconPalette_SuperRod, - gItemIcon_SSTicket, gItemIconPalette_SSTicket, - gItemIcon_ContestPass, gItemIconPalette_ContestPass, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_WailmerPail, gItemIconPalette_WailmerPail, - gItemIcon_DevonGoods, gItemIconPalette_DevonGoods, - gItemIcon_SootSack, gItemIconPalette_SootSack, - gItemIcon_BasementKey, gItemIconPalette_OldKey, - gItemIcon_AcroBike, gItemIconPalette_AcroBike, - gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase, - gItemIcon_Letter, gItemIconPalette_LavaCookieAndLetter, - gItemIcon_EonTicket, gItemIconPalette_EonTicket, - gItemIcon_Orb, gItemIconPalette_RedOrb, - gItemIcon_Orb, gItemIconPalette_BlueOrb, - gItemIcon_Scanner, gItemIconPalette_Scanner, - gItemIcon_GoGoggles, gItemIconPalette_GoGoggles, - gItemIcon_Meteorite, gItemIconPalette_Meteorite, - gItemIcon_Room1Key, gItemIconPalette_Key, - gItemIcon_Room2Key, gItemIconPalette_Key, - gItemIcon_Room4Key, gItemIconPalette_Key, - gItemIcon_Room6Key, gItemIconPalette_Key, - gItemIcon_StorageKey, gItemIconPalette_OldKey, - gItemIcon_RootFossil, gItemIconPalette_HoennFossil, - gItemIcon_ClawFossil, gItemIconPalette_HoennFossil, - gItemIcon_DevonScope, gItemIconPalette_DevonScope, -// TMs/HMs - gItemIcon_TM, gItemIconPalette_FightingTMHM, // TM01 - gItemIcon_TM, gItemIconPalette_DragonTMHM, // TM02 - gItemIcon_TM, gItemIconPalette_WaterTMHM, // TM03 - gItemIcon_TM, gItemIconPalette_PsychicTMHM, // TM04 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM05 - gItemIcon_TM, gItemIconPalette_PoisonTMHM, // TM06 - gItemIcon_TM, gItemIconPalette_IceTMHM, // TM07 - gItemIcon_TM, gItemIconPalette_FightingTMHM, // TM08 - gItemIcon_TM, gItemIconPalette_GrassTMHM, // TM09 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM10 - gItemIcon_TM, gItemIconPalette_FireTMHM, // TM11 - gItemIcon_TM, gItemIconPalette_DarkTMHM, // TM12 - gItemIcon_TM, gItemIconPalette_IceTMHM, // TM13 - gItemIcon_TM, gItemIconPalette_IceTMHM, // TM14 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM15 - gItemIcon_TM, gItemIconPalette_PsychicTMHM, // TM16 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM17 - gItemIcon_TM, gItemIconPalette_WaterTMHM, // TM18 - gItemIcon_TM, gItemIconPalette_GrassTMHM, // TM19 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM20 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM21 - gItemIcon_TM, gItemIconPalette_GrassTMHM, // TM22 - gItemIcon_TM, gItemIconPalette_SteelTMHM, // TM23 - gItemIcon_TM, gItemIconPalette_ElectricTMHM, // TM24 - gItemIcon_TM, gItemIconPalette_ElectricTMHM, // TM25 - gItemIcon_TM, gItemIconPalette_GroundTMHM, // TM26 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM27 - gItemIcon_TM, gItemIconPalette_GroundTMHM, // TM28 - gItemIcon_TM, gItemIconPalette_PsychicTMHM, // TM29 - gItemIcon_TM, gItemIconPalette_GhostTMHM, // TM30 - gItemIcon_TM, gItemIconPalette_FightingTMHM, // TM31 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM32 - gItemIcon_TM, gItemIconPalette_PsychicTMHM, // TM33 - gItemIcon_TM, gItemIconPalette_ElectricTMHM, // TM34 - gItemIcon_TM, gItemIconPalette_FireTMHM, // TM35 - gItemIcon_TM, gItemIconPalette_PoisonTMHM, // TM36 - gItemIcon_TM, gItemIconPalette_RockTMHM, // TM37 - gItemIcon_TM, gItemIconPalette_FireTMHM, // TM38 - gItemIcon_TM, gItemIconPalette_RockTMHM, // TM39 - gItemIcon_TM, gItemIconPalette_FlyingTMHM, // TM40 - gItemIcon_TM, gItemIconPalette_DarkTMHM, // TM41 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM42 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM43 - gItemIcon_TM, gItemIconPalette_PsychicTMHM, // TM44 - gItemIcon_TM, gItemIconPalette_NormalTMHM, // TM45 - gItemIcon_TM, gItemIconPalette_DarkTMHM, // TM46 - gItemIcon_TM, gItemIconPalette_SteelTMHM, // TM47 - gItemIcon_TM, gItemIconPalette_PsychicTMHM, // TM48 - gItemIcon_TM, gItemIconPalette_DarkTMHM, // TM49 - gItemIcon_TM, gItemIconPalette_FireTMHM, // TM50 - gItemIcon_HM, gItemIconPalette_NormalTMHM, // HM01 - gItemIcon_HM, gItemIconPalette_FlyingTMHM, // HM02 - gItemIcon_HM, gItemIconPalette_WaterTMHM, // HM03 - gItemIcon_HM, gItemIconPalette_NormalTMHM, // HM04 - gItemIcon_HM, gItemIconPalette_NormalTMHM, // HM05 - gItemIcon_HM, gItemIconPalette_FightingTMHM, // HM06 - gItemIcon_HM, gItemIconPalette_WaterTMHM, // HM07 - gItemIcon_HM, gItemIconPalette_WaterTMHM, // HM08 -// ???????? - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, - gItemIcon_QuestionMark, gItemIconPalette_QuestionMark, -// FireRed/LeafGreen key items - gItemIcon_OaksParcel, gItemIconPalette_OaksParcel, - gItemIcon_PokeFlute, gItemIconPalette_PokeFlute, - gItemIcon_SecretKey, gItemIconPalette_SecretKey, - gItemIcon_BikeVoucher, gItemIconPalette_BikeVoucher, - gItemIcon_GoldTeeth, gItemIconPalette_GoldTeeth, - gItemIcon_OldAmber, gItemIconPalette_OldAmber, - gItemIcon_CardKey, gItemIconPalette_CardKey, - gItemIcon_LiftKey, gItemIconPalette_Key, - gItemIcon_HelixFossil, gItemIconPalette_KantoFossil, - gItemIcon_DomeFossil, gItemIconPalette_KantoFossil, - gItemIcon_SilphScope, gItemIconPalette_SilphScope, - gItemIcon_Bicycle, gItemIconPalette_Bicycle, - gItemIcon_TownMap, gItemIconPalette_TownMap, - gItemIcon_VSSeeker, gItemIconPalette_VSSeeker, - gItemIcon_FameChecker, gItemIconPalette_FameChecker, - gItemIcon_TMCase, gItemIconPalette_TMCase, - gItemIcon_BerryPouch, gItemIconPalette_BerryPouch, - gItemIcon_TeachyTV, gItemIconPalette_TeachyTV, - gItemIcon_TriPass, gItemIconPalette_TriPass, - gItemIcon_RainbowPass, gItemIconPalette_RainbowPass, - gItemIcon_Tea, gItemIconPalette_Tea, - gItemIcon_MysticTicket, gItemIconPalette_MysticTicket, - gItemIcon_AuroraTicket, gItemIconPalette_AuroraTicket, - gItemIcon_PowderJar, gItemIconPalette_PowderJar, - gItemIcon_Gem, gItemIconPalette_Ruby, - gItemIcon_Gem, gItemIconPalette_Sapphire, -// Emerald-only key items - gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem, - gItemIcon_OldSeaMap, gItemIconPalette_OldSeaMap, -// Return to field arrow - gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow, + [ITEM_NONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Pokeballs + [ITEM_MASTER_BALL] = {gItemIcon_MasterBall, gItemIconPalette_MasterBall}, + [ITEM_ULTRA_BALL] = {gItemIcon_UltraBall, gItemIconPalette_UltraBall}, + [ITEM_GREAT_BALL] = {gItemIcon_GreatBall, gItemIconPalette_GreatBall}, + [ITEM_POKE_BALL] = {gItemIcon_PokeBall, gItemIconPalette_PokeBall}, + [ITEM_SAFARI_BALL] = {gItemIcon_SafariBall, gItemIconPalette_SafariBall}, + [ITEM_NET_BALL] = {gItemIcon_NetBall, gItemIconPalette_NetBall}, + [ITEM_DIVE_BALL] = {gItemIcon_DiveBall, gItemIconPalette_DiveBall}, + [ITEM_NEST_BALL] = {gItemIcon_NestBall, gItemIconPalette_NestBall}, + [ITEM_REPEAT_BALL] = {gItemIcon_RepeatBall, gItemIconPalette_RepeatBall}, + [ITEM_TIMER_BALL] = {gItemIcon_TimerBall, gItemIconPalette_RepeatBall}, + [ITEM_LUXURY_BALL] = {gItemIcon_LuxuryBall, gItemIconPalette_LuxuryBall}, + [ITEM_PREMIER_BALL] = {gItemIcon_PremierBall, gItemIconPalette_LuxuryBall}, + // Medicine + [ITEM_POTION] = {gItemIcon_Potion, gItemIconPalette_Potion}, + [ITEM_ANTIDOTE] = {gItemIcon_Antidote, gItemIconPalette_Antidote}, + [ITEM_BURN_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_BurnHeal}, + [ITEM_ICE_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_IceHeal}, + [ITEM_AWAKENING] = {gItemIcon_StatusHeal, gItemIconPalette_Awakening}, + [ITEM_PARALYZE_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_ParalyzeHeal}, + [ITEM_FULL_RESTORE] = {gItemIcon_LargePotion, gItemIconPalette_FullRestore}, + [ITEM_MAX_POTION] = {gItemIcon_LargePotion, gItemIconPalette_MaxPotion}, + [ITEM_HYPER_POTION] = {gItemIcon_Potion, gItemIconPalette_HyperPotion}, + [ITEM_SUPER_POTION] = {gItemIcon_Potion, gItemIconPalette_SuperPotion}, + [ITEM_FULL_HEAL] = {gItemIcon_FullHeal, gItemIconPalette_FullHeal}, + [ITEM_REVIVE] = {gItemIcon_Revive, gItemIconPalette_Revive}, + [ITEM_MAX_REVIVE] = {gItemIcon_MaxRevive, gItemIconPalette_Revive}, + [ITEM_FRESH_WATER] = {gItemIcon_FreshWater, gItemIconPalette_FreshWater}, + [ITEM_SODA_POP] = {gItemIcon_SodaPop, gItemIconPalette_SodaPop}, + [ITEM_LEMONADE] = {gItemIcon_Lemonade, gItemIconPalette_Lemonade}, + [ITEM_MOOMOO_MILK] = {gItemIcon_MoomooMilk, gItemIconPalette_MoomooMilk}, + [ITEM_ENERGY_POWDER] = {gItemIcon_Powder, gItemIconPalette_EnergyPowder}, + [ITEM_ENERGY_ROOT] = {gItemIcon_EnergyRoot, gItemIconPalette_EnergyRoot}, + [ITEM_HEAL_POWDER] = {gItemIcon_Powder, gItemIconPalette_HealPowder}, + [ITEM_REVIVAL_HERB] = {gItemIcon_RevivalHerb, gItemIconPalette_RevivalHerb}, + [ITEM_ETHER] = {gItemIcon_Ether, gItemIconPalette_Ether}, + [ITEM_MAX_ETHER] = {gItemIcon_Ether, gItemIconPalette_MaxEther}, + [ITEM_ELIXIR] = {gItemIcon_Ether, gItemIconPalette_Elixir}, + [ITEM_MAX_ELIXIR] = {gItemIcon_Ether, gItemIconPalette_MaxElixir}, + [ITEM_LAVA_COOKIE] = {gItemIcon_LavaCookie, gItemIconPalette_LavaCookieAndLetter}, + [ITEM_BLUE_FLUTE] = {gItemIcon_Flute, gItemIconPalette_BlueFlute}, + [ITEM_YELLOW_FLUTE] = {gItemIcon_Flute, gItemIconPalette_YellowFlute}, + [ITEM_RED_FLUTE] = {gItemIcon_Flute, gItemIconPalette_RedFlute}, + [ITEM_BLACK_FLUTE] = {gItemIcon_Flute, gItemIconPalette_BlackFlute}, + [ITEM_WHITE_FLUTE] = {gItemIcon_Flute, gItemIconPalette_WhiteFlute}, + [ITEM_BERRY_JUICE] = {gItemIcon_BerryJuice, gItemIconPalette_BerryJuice}, + [ITEM_SACRED_ASH] = {gItemIcon_SacredAsh, gItemIconPalette_SacredAsh}, + // Collectibles + [ITEM_SHOAL_SALT] = {gItemIcon_Powder, gItemIconPalette_ShoalSalt}, + [ITEM_SHOAL_SHELL] = {gItemIcon_ShoalShell, gItemIconPalette_Shell}, + [ITEM_RED_SHARD] = {gItemIcon_Shard, gItemIconPalette_RedShard}, + [ITEM_BLUE_SHARD] = {gItemIcon_Shard, gItemIconPalette_BlueShard}, + [ITEM_YELLOW_SHARD] = {gItemIcon_Shard, gItemIconPalette_YellowShard}, + [ITEM_GREEN_SHARD] = {gItemIcon_Shard, gItemIconPalette_GreenShard}, + // ???????? + [ITEM_034] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_035] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_036] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_037] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_038] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_039] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_03A] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_03B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_03C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_03D] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_03E] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Vitamins + [ITEM_HP_UP] = {gItemIcon_HPUp, gItemIconPalette_HPUp}, + [ITEM_PROTEIN] = {gItemIcon_Vitamin, gItemIconPalette_Protein}, + [ITEM_IRON] = {gItemIcon_Vitamin, gItemIconPalette_Iron}, + [ITEM_CARBOS] = {gItemIcon_Vitamin, gItemIconPalette_Carbos}, + [ITEM_CALCIUM] = {gItemIcon_Vitamin, gItemIconPalette_Calcium}, + [ITEM_RARE_CANDY] = {gItemIcon_RareCandy, gItemIconPalette_RareCandy}, + [ITEM_PP_UP] = {gItemIcon_PPUp, gItemIconPalette_PPUp}, + [ITEM_ZINC] = {gItemIcon_Vitamin, gItemIconPalette_Zinc}, + [ITEM_PP_MAX] = {gItemIcon_PPMax, gItemIconPalette_PPMax}, + // ???????? + [ITEM_048] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Battle items + [ITEM_GUARD_SPEC] = {gItemIcon_BattleStatItem, gItemIconPalette_GuardSpec}, + [ITEM_DIRE_HIT] = {gItemIcon_BattleStatItem, gItemIconPalette_DireHit}, + [ITEM_X_ATTACK] = {gItemIcon_BattleStatItem, gItemIconPalette_XAttack}, + [ITEM_X_DEFEND] = {gItemIcon_BattleStatItem, gItemIconPalette_XDefend}, + [ITEM_X_SPEED] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpeed}, + [ITEM_X_ACCURACY] = {gItemIcon_BattleStatItem, gItemIconPalette_XAccuracy}, + [ITEM_X_SPECIAL] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpecial}, + [ITEM_POKE_DOLL] = {gItemIcon_PokeDoll, gItemIconPalette_PokeDoll}, + [ITEM_FLUFFY_TAIL] = {gItemIcon_FluffyTail, gItemIconPalette_FluffyTail}, + // ???????? + [ITEM_052] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Field items + [ITEM_SUPER_REPEL] = {gItemIcon_Repel, gItemIconPalette_SuperRepel}, + [ITEM_MAX_REPEL] = {gItemIcon_Repel, gItemIconPalette_MaxRepel}, + [ITEM_ESCAPE_ROPE] = {gItemIcon_EscapeRope, gItemIconPalette_EscapeRope}, + [ITEM_REPEL] = {gItemIcon_Repel, gItemIconPalette_Repel}, + // ???????? + [ITEM_057] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_058] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_059] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_05A] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_05B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_05C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Evolution stones + [ITEM_SUN_STONE] = {gItemIcon_SunStone, gItemIconPalette_SunStone}, + [ITEM_MOON_STONE] = {gItemIcon_MoonStone, gItemIconPalette_MoonStone}, + [ITEM_FIRE_STONE] = {gItemIcon_FireStone, gItemIconPalette_FireStone}, + [ITEM_THUNDER_STONE] = {gItemIcon_ThunderStone, gItemIconPalette_ThunderStone}, + [ITEM_WATER_STONE] = {gItemIcon_WaterStone, gItemIconPalette_WaterStone}, + [ITEM_LEAF_STONE] = {gItemIcon_LeafStone, gItemIconPalette_LeafStone}, + // ???????? + [ITEM_063] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_064] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_065] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_066] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Valuables + [ITEM_TINY_MUSHROOM] = {gItemIcon_TinyMushroom, gItemIconPalette_Mushroom}, + [ITEM_BIG_MUSHROOM] = {gItemIcon_BigMushroom, gItemIconPalette_Mushroom}, + [ITEM_069] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_PEARL] = {gItemIcon_Pearl, gItemIconPalette_Pearl}, + [ITEM_BIG_PEARL] = {gItemIcon_BigPearl, gItemIconPalette_Pearl}, + [ITEM_STARDUST] = {gItemIcon_Stardust, gItemIconPalette_Star}, + [ITEM_STAR_PIECE] = {gItemIcon_StarPiece, gItemIconPalette_Star}, + [ITEM_NUGGET] = {gItemIcon_Nugget, gItemIconPalette_Nugget}, + [ITEM_HEART_SCALE] = {gItemIcon_HeartScale, gItemIconPalette_HeartScale}, + // ???????? + [ITEM_070] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_071] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_072] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_073] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_074] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_075] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_076] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_077] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_078] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Mail + [ITEM_ORANGE_MAIL] = {gItemIcon_OrangeMail, gItemIconPalette_OrangeMail}, + [ITEM_HARBOR_MAIL] = {gItemIcon_HarborMail, gItemIconPalette_HarborMail}, + [ITEM_GLITTER_MAIL] = {gItemIcon_GlitterMail, gItemIconPalette_GlitterMail}, + [ITEM_MECH_MAIL] = {gItemIcon_MechMail, gItemIconPalette_MechMail}, + [ITEM_WOOD_MAIL] = {gItemIcon_WoodMail, gItemIconPalette_WoodMail}, + [ITEM_WAVE_MAIL] = {gItemIcon_WaveMail, gItemIconPalette_WaveMail}, + [ITEM_BEAD_MAIL] = {gItemIcon_BeadMail, gItemIconPalette_BeadMail}, + [ITEM_SHADOW_MAIL] = {gItemIcon_ShadowMail, gItemIconPalette_ShadowMail}, + [ITEM_TROPIC_MAIL] = {gItemIcon_TropicMail, gItemIconPalette_TropicMail}, + [ITEM_DREAM_MAIL] = {gItemIcon_DreamMail, gItemIconPalette_DreamMail}, + [ITEM_FAB_MAIL] = {gItemIcon_FabMail, gItemIconPalette_FabMail}, + [ITEM_RETRO_MAIL] = {gItemIcon_RetroMail, gItemIconPalette_RetroMail}, + // Berries + [ITEM_CHERI_BERRY] = {gItemIcon_CheriBerry, gItemIconPalette_CheriBerry}, + [ITEM_CHESTO_BERRY] = {gItemIcon_ChestoBerry, gItemIconPalette_ChestoBerry}, + [ITEM_PECHA_BERRY] = {gItemIcon_PechaBerry, gItemIconPalette_PechaBerry}, + [ITEM_RAWST_BERRY] = {gItemIcon_RawstBerry, gItemIconPalette_RawstBerry}, + [ITEM_ASPEAR_BERRY] = {gItemIcon_AspearBerry, gItemIconPalette_AspearBerry}, + [ITEM_LEPPA_BERRY] = {gItemIcon_LeppaBerry, gItemIconPalette_LeppaBerry}, + [ITEM_ORAN_BERRY] = {gItemIcon_OranBerry, gItemIconPalette_OranBerry}, + [ITEM_PERSIM_BERRY] = {gItemIcon_PersimBerry, gItemIconPalette_PersimBerry}, + [ITEM_LUM_BERRY] = {gItemIcon_LumBerry, gItemIconPalette_LumBerry}, + [ITEM_SITRUS_BERRY] = {gItemIcon_SitrusBerry, gItemIconPalette_SitrusBerry}, + [ITEM_FIGY_BERRY] = {gItemIcon_FigyBerry, gItemIconPalette_FigyBerry}, + [ITEM_WIKI_BERRY] = {gItemIcon_WikiBerry, gItemIconPalette_WikiBerry}, + [ITEM_MAGO_BERRY] = {gItemIcon_MagoBerry, gItemIconPalette_MagoBerry}, + [ITEM_AGUAV_BERRY] = {gItemIcon_AguavBerry, gItemIconPalette_AguavBerry}, + [ITEM_IAPAPA_BERRY] = {gItemIcon_IapapaBerry, gItemIconPalette_IapapaBerry}, + [ITEM_RAZZ_BERRY] = {gItemIcon_RazzBerry, gItemIconPalette_RazzBerry}, + [ITEM_BLUK_BERRY] = {gItemIcon_BlukBerry, gItemIconPalette_BlukBerry}, + [ITEM_NANAB_BERRY] = {gItemIcon_NanabBerry, gItemIconPalette_NanabBerry}, + [ITEM_WEPEAR_BERRY] = {gItemIcon_WepearBerry, gItemIconPalette_WepearBerry}, + [ITEM_PINAP_BERRY] = {gItemIcon_PinapBerry, gItemIconPalette_PinapBerry}, + [ITEM_POMEG_BERRY] = {gItemIcon_PomegBerry, gItemIconPalette_PomegBerry}, + [ITEM_KELPSY_BERRY] = {gItemIcon_KelpsyBerry, gItemIconPalette_KelpsyBerry}, + [ITEM_QUALOT_BERRY] = {gItemIcon_QualotBerry, gItemIconPalette_QualotBerry}, + [ITEM_HONDEW_BERRY] = {gItemIcon_HondewBerry, gItemIconPalette_HondewBerry}, + [ITEM_GREPA_BERRY] = {gItemIcon_GrepaBerry, gItemIconPalette_GrepaBerry}, + [ITEM_TAMATO_BERRY] = {gItemIcon_TamatoBerry, gItemIconPalette_TamatoBerry}, + [ITEM_CORNN_BERRY] = {gItemIcon_CornnBerry, gItemIconPalette_CornnBerry}, + [ITEM_MAGOST_BERRY] = {gItemIcon_MagostBerry, gItemIconPalette_MagostBerry}, + [ITEM_RABUTA_BERRY] = {gItemIcon_RabutaBerry, gItemIconPalette_RabutaBerry}, + [ITEM_NOMEL_BERRY] = {gItemIcon_NomelBerry, gItemIconPalette_NomelBerry}, + [ITEM_SPELON_BERRY] = {gItemIcon_SpelonBerry, gItemIconPalette_SpelonBerry}, + [ITEM_PAMTRE_BERRY] = {gItemIcon_PamtreBerry, gItemIconPalette_PamtreBerry}, + [ITEM_WATMEL_BERRY] = {gItemIcon_WatmelBerry, gItemIconPalette_WatmelBerry}, + [ITEM_DURIN_BERRY] = {gItemIcon_DurinBerry, gItemIconPalette_DurinBerry}, + [ITEM_BELUE_BERRY] = {gItemIcon_BelueBerry, gItemIconPalette_BelueBerry}, + [ITEM_LIECHI_BERRY] = {gItemIcon_LiechiBerry, gItemIconPalette_LiechiBerry}, + [ITEM_GANLON_BERRY] = {gItemIcon_GanlonBerry, gItemIconPalette_GanlonBerry}, + [ITEM_SALAC_BERRY] = {gItemIcon_SalacBerry, gItemIconPalette_SalacBerry}, + [ITEM_PETAYA_BERRY] = {gItemIcon_PetayaBerry, gItemIconPalette_PetayaBerry}, + [ITEM_APICOT_BERRY] = {gItemIcon_ApicotBerry, gItemIconPalette_ApicotBerry}, + [ITEM_LANSAT_BERRY] = {gItemIcon_LansatBerry, gItemIconPalette_LansatBerry}, + [ITEM_STARF_BERRY] = {gItemIcon_StarfBerry, gItemIconPalette_StarfBerry}, + [ITEM_ENIGMA_BERRY] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry}, + // ???????? + [ITEM_0B0] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0B1] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0B2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Hold items + [ITEM_BRIGHT_POWDER] = {gItemIcon_BrightPowder, gItemIconPalette_BrightPowder}, + [ITEM_WHITE_HERB] = {gItemIcon_InBattleHerb, gItemIconPalette_WhiteHerb}, + [ITEM_MACHO_BRACE] = {gItemIcon_MachoBrace, gItemIconPalette_MachoBrace}, + [ITEM_EXP_SHARE] = {gItemIcon_ExpShare, gItemIconPalette_ExpShare}, + [ITEM_QUICK_CLAW] = {gItemIcon_QuickClaw, gItemIconPalette_QuickClaw}, + [ITEM_SOOTHE_BELL] = {gItemIcon_SootheBell, gItemIconPalette_SootheBell}, + [ITEM_MENTAL_HERB] = {gItemIcon_InBattleHerb, gItemIconPalette_MentalHerb}, + [ITEM_CHOICE_BAND] = {gItemIcon_ChoiceBand, gItemIconPalette_ChoiceBand}, + [ITEM_KINGS_ROCK] = {gItemIcon_KingsRock, gItemIconPalette_KingsRock}, + [ITEM_SILVER_POWDER] = {gItemIcon_SilverPowder, gItemIconPalette_SilverPowder}, + [ITEM_AMULET_COIN] = {gItemIcon_AmuletCoin, gItemIconPalette_AmuletCoin}, + [ITEM_CLEANSE_TAG] = {gItemIcon_CleanseTag, gItemIconPalette_CleanseTag}, + [ITEM_SOUL_DEW] = {gItemIcon_SoulDew, gItemIconPalette_SoulDew}, + [ITEM_DEEP_SEA_TOOTH] = {gItemIcon_DeepSeaTooth, gItemIconPalette_DeepSeaTooth}, + [ITEM_DEEP_SEA_SCALE] = {gItemIcon_DeepSeaScale, gItemIconPalette_DeepSeaScale}, + [ITEM_SMOKE_BALL] = {gItemIcon_SmokeBall, gItemIconPalette_SmokeBall}, + [ITEM_EVERSTONE] = {gItemIcon_Everstone, gItemIconPalette_Everstone}, + [ITEM_FOCUS_BAND] = {gItemIcon_FocusBand, gItemIconPalette_FocusBand}, + [ITEM_LUCKY_EGG] = {gItemIcon_LuckyEgg, gItemIconPalette_LuckyEgg}, + [ITEM_SCOPE_LENS] = {gItemIcon_ScopeLens, gItemIconPalette_ScopeLens}, + [ITEM_METAL_COAT] = {gItemIcon_MetalCoat, gItemIconPalette_MetalCoat}, + [ITEM_LEFTOVERS] = {gItemIcon_Leftovers, gItemIconPalette_Leftovers}, + [ITEM_DRAGON_SCALE] = {gItemIcon_DragonScale, gItemIconPalette_DragonScale}, + [ITEM_LIGHT_BALL] = {gItemIcon_LightBall, gItemIconPalette_LightBall}, + [ITEM_SOFT_SAND] = {gItemIcon_SoftSand, gItemIconPalette_SoftSand}, + [ITEM_HARD_STONE] = {gItemIcon_HardStone, gItemIconPalette_HardStone}, + [ITEM_MIRACLE_SEED] = {gItemIcon_MiracleSeed, gItemIconPalette_MiracleSeed}, + [ITEM_BLACK_GLASSES] = {gItemIcon_BlackGlasses, gItemIconPalette_BlackTypeEnhancingItem}, + [ITEM_BLACK_BELT] = {gItemIcon_BlackBelt, gItemIconPalette_BlackTypeEnhancingItem}, + [ITEM_MAGNET] = {gItemIcon_Magnet, gItemIconPalette_Magnet}, + [ITEM_MYSTIC_WATER] = {gItemIcon_MysticWater, gItemIconPalette_MysticWater}, + [ITEM_SHARP_BEAK] = {gItemIcon_SharpBeak, gItemIconPalette_SharpBeak}, + [ITEM_POISON_BARB] = {gItemIcon_PoisonBarb, gItemIconPalette_PoisonBarb}, + [ITEM_NEVER_MELT_ICE] = {gItemIcon_NeverMeltIce, gItemIconPalette_NeverMeltIce}, + [ITEM_SPELL_TAG] = {gItemIcon_SpellTag, gItemIconPalette_SpellTag}, + [ITEM_TWISTED_SPOON] = {gItemIcon_TwistedSpoon, gItemIconPalette_TwistedSpoon}, + [ITEM_CHARCOAL] = {gItemIcon_Charcoal, gItemIconPalette_Charcoal}, + [ITEM_DRAGON_FANG] = {gItemIcon_DragonFang, gItemIconPalette_DragonFang}, + [ITEM_SILK_SCARF] = {gItemIcon_SilkScarf, gItemIconPalette_SilkScarf}, + [ITEM_UP_GRADE] = {gItemIcon_UpGrade, gItemIconPalette_UpGrade}, + [ITEM_SHELL_BELL] = {gItemIcon_ShellBell, gItemIconPalette_Shell}, + [ITEM_SEA_INCENSE] = {gItemIcon_SeaIncense, gItemIconPalette_SeaIncense}, + [ITEM_LAX_INCENSE] = {gItemIcon_LaxIncense, gItemIconPalette_LaxIncense}, + [ITEM_LUCKY_PUNCH] = {gItemIcon_LuckyPunch, gItemIconPalette_LuckyPunch}, + [ITEM_METAL_POWDER] = {gItemIcon_MetalPowder, gItemIconPalette_MetalPowder}, + [ITEM_THICK_CLUB] = {gItemIcon_ThickClub, gItemIconPalette_ThickClub}, + [ITEM_STICK] = {gItemIcon_Stick, gItemIconPalette_Stick}, + // ???????? + [ITEM_0E2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0E3] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0E4] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0E5] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0E6] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0E7] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0E8] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0E9] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0EA] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0EB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0EC] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0ED] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0EE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0EF] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F0] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F1] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F3] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F4] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F5] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F6] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F7] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F8] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0F9] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0FA] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0FB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0FC] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_0FD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // Contest hold items + [ITEM_RED_SCARF] = {gItemIcon_Scarf, gItemIconPalette_RedScarf}, + [ITEM_BLUE_SCARF] = {gItemIcon_Scarf, gItemIconPalette_BlueScarf}, + [ITEM_PINK_SCARF] = {gItemIcon_Scarf, gItemIconPalette_PinkScarf}, + [ITEM_GREEN_SCARF] = {gItemIcon_Scarf, gItemIconPalette_GreenScarf}, + [ITEM_YELLOW_SCARF] = {gItemIcon_Scarf, gItemIconPalette_YellowScarf}, + // Key items + [ITEM_MACH_BIKE] = {gItemIcon_MachBike, gItemIconPalette_MachBike}, + [ITEM_COIN_CASE] = {gItemIcon_CoinCase, gItemIconPalette_CoinCase}, + [ITEM_ITEMFINDER] = {gItemIcon_Itemfinder, gItemIconPalette_Itemfinder}, + [ITEM_OLD_ROD] = {gItemIcon_OldRod, gItemIconPalette_OldRod}, + [ITEM_GOOD_ROD] = {gItemIcon_GoodRod, gItemIconPalette_GoodRod}, + [ITEM_SUPER_ROD] = {gItemIcon_SuperRod, gItemIconPalette_SuperRod}, + [ITEM_SS_TICKET] = {gItemIcon_SSTicket, gItemIconPalette_SSTicket}, + [ITEM_CONTEST_PASS] = {gItemIcon_ContestPass, gItemIconPalette_ContestPass}, + [ITEM_10B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_WAILMER_PAIL] = {gItemIcon_WailmerPail, gItemIconPalette_WailmerPail}, + [ITEM_DEVON_GOODS] = {gItemIcon_DevonGoods, gItemIconPalette_DevonGoods}, + [ITEM_SOOT_SACK] = {gItemIcon_SootSack, gItemIconPalette_SootSack}, + [ITEM_BASEMENT_KEY] = {gItemIcon_BasementKey, gItemIconPalette_OldKey}, + [ITEM_ACRO_BIKE] = {gItemIcon_AcroBike, gItemIconPalette_AcroBike}, + [ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase}, + [ITEM_LETTER] = {gItemIcon_Letter, gItemIconPalette_LavaCookieAndLetter}, + [ITEM_EON_TICKET] = {gItemIcon_EonTicket, gItemIconPalette_EonTicket}, + [ITEM_RED_ORB] = {gItemIcon_Orb, gItemIconPalette_RedOrb}, + [ITEM_BLUE_ORB] = {gItemIcon_Orb, gItemIconPalette_BlueOrb}, + [ITEM_SCANNER] = {gItemIcon_Scanner, gItemIconPalette_Scanner}, + [ITEM_GO_GOGGLES] = {gItemIcon_GoGoggles, gItemIconPalette_GoGoggles}, + [ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite}, + [ITEM_ROOM_1_KEY] = {gItemIcon_Room1Key, gItemIconPalette_Key}, + [ITEM_ROOM_2_KEY] = {gItemIcon_Room2Key, gItemIconPalette_Key}, + [ITEM_ROOM_4_KEY] = {gItemIcon_Room4Key, gItemIconPalette_Key}, + [ITEM_ROOM_6_KEY] = {gItemIcon_Room6Key, gItemIconPalette_Key}, + [ITEM_STORAGE_KEY] = {gItemIcon_StorageKey, gItemIconPalette_OldKey}, + [ITEM_ROOT_FOSSIL] = {gItemIcon_RootFossil, gItemIconPalette_HoennFossil}, + [ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil}, + [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope}, + // TMs / HMs + [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM01 + [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM}, // TM02 + [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM03 + [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM04 + [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM05 + [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM06 + [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM07 + [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM08 + [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM09 + [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM10 + [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM11 + [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM12 + [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM13 + [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM14 + [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM15 + [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM16 + [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM17 + [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM18 + [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM19 + [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM20 + [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM21 + [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM22 + [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM23 + [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM24 + [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM25 + [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM26 + [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM27 + [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM28 + [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM29 + [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM}, // TM30 + [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM31 + [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM32 + [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM33 + [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM34 + [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM35 + [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM36 + [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM37 + [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM38 + [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM39 + [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM}, // TM40 + [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM41 + [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM42 + [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM43 + [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM44 + [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM45 + [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM46 + [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM47 + [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM48 + [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM49 + [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM50 + [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM01 + [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, // HM02 + [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM03 + [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM04 + [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM05 + [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, // HM06 + [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM07 + [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM08 + // ???????? + [ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + // FireRed/LeafGreen key items + [ITEM_OAKS_PARCEL] = {gItemIcon_OaksParcel, gItemIconPalette_OaksParcel}, + [ITEM_POKE_FLUTE] = {gItemIcon_PokeFlute, gItemIconPalette_PokeFlute}, + [ITEM_SECRET_KEY] = {gItemIcon_SecretKey, gItemIconPalette_SecretKey}, + [ITEM_BIKE_VOUCHER] = {gItemIcon_BikeVoucher, gItemIconPalette_BikeVoucher}, + [ITEM_GOLD_TEETH] = {gItemIcon_GoldTeeth, gItemIconPalette_GoldTeeth}, + [ITEM_OLD_AMBER] = {gItemIcon_OldAmber, gItemIconPalette_OldAmber}, + [ITEM_CARD_KEY] = {gItemIcon_CardKey, gItemIconPalette_CardKey}, + [ITEM_LIFT_KEY] = {gItemIcon_LiftKey, gItemIconPalette_Key}, + [ITEM_HELIX_FOSSIL] = {gItemIcon_HelixFossil, gItemIconPalette_KantoFossil}, + [ITEM_DOME_FOSSIL] = {gItemIcon_DomeFossil, gItemIconPalette_KantoFossil}, + [ITEM_SILPH_SCOPE] = {gItemIcon_SilphScope, gItemIconPalette_SilphScope}, + [ITEM_BICYCLE] = {gItemIcon_Bicycle, gItemIconPalette_Bicycle}, + [ITEM_TOWN_MAP] = {gItemIcon_TownMap, gItemIconPalette_TownMap}, + [ITEM_VS_SEEKER] = {gItemIcon_VSSeeker, gItemIconPalette_VSSeeker}, + [ITEM_FAME_CHECKER] = {gItemIcon_FameChecker, gItemIconPalette_FameChecker}, + [ITEM_TM_CASE] = {gItemIcon_TMCase, gItemIconPalette_TMCase}, + [ITEM_BERRY_POUCH] = {gItemIcon_BerryPouch, gItemIconPalette_BerryPouch}, + [ITEM_TEACHY_TV] = {gItemIcon_TeachyTV, gItemIconPalette_TeachyTV}, + [ITEM_TRI_PASS] = {gItemIcon_TriPass, gItemIconPalette_TriPass}, + [ITEM_RAINBOW_PASS] = {gItemIcon_RainbowPass, gItemIconPalette_RainbowPass}, + [ITEM_TEA] = {gItemIcon_Tea, gItemIconPalette_Tea}, + [ITEM_MYSTIC_TICKET] = {gItemIcon_MysticTicket, gItemIconPalette_MysticTicket}, + [ITEM_AURORA_TICKET] = {gItemIcon_AuroraTicket, gItemIconPalette_AuroraTicket}, + [ITEM_POWDER_JAR] = {gItemIcon_PowderJar, gItemIconPalette_PowderJar}, + [ITEM_RUBY] = {gItemIcon_Gem, gItemIconPalette_Ruby}, + [ITEM_SAPPHIRE] = {gItemIcon_Gem, gItemIconPalette_Sapphire}, + // Emerald-only key items + [ITEM_MAGMA_EMBLEM] = {gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem}, + [ITEM_OLD_SEA_MAP] = {gItemIcon_OldSeaMap, gItemIconPalette_OldSeaMap}, + // Return to field arrow + [ITEM_FIELD_ARROW] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow}, }; -#endif // GUARD_DATA_ITEM_ICON_TABLE_H diff --git a/src/data/pokedex_orders.h b/src/data/pokedex_orders.h deleted file mode 100644 index 55b0abcea..000000000 --- a/src/data/pokedex_orders.h +++ /dev/null @@ -1,1195 +0,0 @@ -const u16 gPokedexOrder_Alphabetical[] = -{ - NATIONAL_DEX_OLD_UNOWN_B, - NATIONAL_DEX_OLD_UNOWN_C, - NATIONAL_DEX_OLD_UNOWN_D, - NATIONAL_DEX_OLD_UNOWN_E, - NATIONAL_DEX_OLD_UNOWN_F, - NATIONAL_DEX_OLD_UNOWN_G, - NATIONAL_DEX_OLD_UNOWN_H, - NATIONAL_DEX_OLD_UNOWN_I, - NATIONAL_DEX_OLD_UNOWN_J, - NATIONAL_DEX_OLD_UNOWN_K, - NATIONAL_DEX_OLD_UNOWN_L, - NATIONAL_DEX_OLD_UNOWN_M, - NATIONAL_DEX_OLD_UNOWN_N, - NATIONAL_DEX_OLD_UNOWN_O, - NATIONAL_DEX_OLD_UNOWN_P, - NATIONAL_DEX_OLD_UNOWN_Q, - NATIONAL_DEX_OLD_UNOWN_R, - NATIONAL_DEX_OLD_UNOWN_S, - NATIONAL_DEX_OLD_UNOWN_T, - NATIONAL_DEX_OLD_UNOWN_U, - NATIONAL_DEX_OLD_UNOWN_V, - NATIONAL_DEX_OLD_UNOWN_W, - NATIONAL_DEX_OLD_UNOWN_X, - NATIONAL_DEX_OLD_UNOWN_Y, - NATIONAL_DEX_OLD_UNOWN_Z, - // Actual pokemon start here. - NATIONAL_DEX_ABRA, - NATIONAL_DEX_ABSOL, - NATIONAL_DEX_AERODACTYL, - NATIONAL_DEX_AGGRON, - NATIONAL_DEX_AIPOM, - NATIONAL_DEX_ALAKAZAM, - NATIONAL_DEX_ALTARIA, - NATIONAL_DEX_AMPHAROS, - NATIONAL_DEX_ANORITH, - NATIONAL_DEX_ARBOK, - NATIONAL_DEX_ARCANINE, - NATIONAL_DEX_ARIADOS, - NATIONAL_DEX_ARMALDO, - NATIONAL_DEX_ARON, - NATIONAL_DEX_ARTICUNO, - NATIONAL_DEX_AZUMARILL, - NATIONAL_DEX_AZURILL, - NATIONAL_DEX_BAGON, - NATIONAL_DEX_BALTOY, - NATIONAL_DEX_BANETTE, - NATIONAL_DEX_BARBOACH, - NATIONAL_DEX_BAYLEEF, - NATIONAL_DEX_BEAUTIFLY, - NATIONAL_DEX_BEEDRILL, - NATIONAL_DEX_BELDUM, - NATIONAL_DEX_BELLOSSOM, - NATIONAL_DEX_BELLSPROUT, - NATIONAL_DEX_BLASTOISE, - NATIONAL_DEX_BLAZIKEN, - NATIONAL_DEX_BLISSEY, - NATIONAL_DEX_BRELOOM, - NATIONAL_DEX_BULBASAUR, - NATIONAL_DEX_BUTTERFREE, - NATIONAL_DEX_CACNEA, - NATIONAL_DEX_CACTURNE, - NATIONAL_DEX_CAMERUPT, - NATIONAL_DEX_CARVANHA, - NATIONAL_DEX_CASCOON, - NATIONAL_DEX_CASTFORM, - NATIONAL_DEX_CATERPIE, - NATIONAL_DEX_CELEBI, - NATIONAL_DEX_CHANSEY, - NATIONAL_DEX_CHARIZARD, - NATIONAL_DEX_CHARMANDER, - NATIONAL_DEX_CHARMELEON, - NATIONAL_DEX_CHIKORITA, - NATIONAL_DEX_CHIMECHO, - NATIONAL_DEX_CHINCHOU, - NATIONAL_DEX_CLAMPERL, - NATIONAL_DEX_CLAYDOL, - NATIONAL_DEX_CLEFABLE, - NATIONAL_DEX_CLEFAIRY, - NATIONAL_DEX_CLEFFA, - NATIONAL_DEX_CLOYSTER, - NATIONAL_DEX_COMBUSKEN, - NATIONAL_DEX_CORPHISH, - NATIONAL_DEX_CORSOLA, - NATIONAL_DEX_CRADILY, - NATIONAL_DEX_CRAWDAUNT, - NATIONAL_DEX_CROBAT, - NATIONAL_DEX_CROCONAW, - NATIONAL_DEX_CUBONE, - NATIONAL_DEX_CYNDAQUIL, - NATIONAL_DEX_DELCATTY, - NATIONAL_DEX_DELIBIRD, - NATIONAL_DEX_DEOXYS, - NATIONAL_DEX_DEWGONG, - NATIONAL_DEX_DIGLETT, - NATIONAL_DEX_DITTO, - NATIONAL_DEX_DODRIO, - NATIONAL_DEX_DODUO, - NATIONAL_DEX_DONPHAN, - NATIONAL_DEX_DRAGONAIR, - NATIONAL_DEX_DRAGONITE, - NATIONAL_DEX_DRATINI, - NATIONAL_DEX_DROWZEE, - NATIONAL_DEX_DUGTRIO, - NATIONAL_DEX_DUNSPARCE, - NATIONAL_DEX_DUSCLOPS, - NATIONAL_DEX_DUSKULL, - NATIONAL_DEX_DUSTOX, - NATIONAL_DEX_EEVEE, - NATIONAL_DEX_EKANS, - NATIONAL_DEX_ELECTABUZZ, - NATIONAL_DEX_ELECTRIKE, - NATIONAL_DEX_ELECTRODE, - NATIONAL_DEX_ELEKID, - NATIONAL_DEX_ENTEI, - NATIONAL_DEX_ESPEON, - NATIONAL_DEX_EXEGGCUTE, - NATIONAL_DEX_EXEGGUTOR, - NATIONAL_DEX_EXPLOUD, - NATIONAL_DEX_FARFETCHD, - NATIONAL_DEX_FEAROW, - NATIONAL_DEX_FEEBAS, - NATIONAL_DEX_FERALIGATR, - NATIONAL_DEX_FLAAFFY, - NATIONAL_DEX_FLAREON, - NATIONAL_DEX_FLYGON, - NATIONAL_DEX_FORRETRESS, - NATIONAL_DEX_FURRET, - NATIONAL_DEX_GARDEVOIR, - NATIONAL_DEX_GASTLY, - NATIONAL_DEX_GENGAR, - NATIONAL_DEX_GEODUDE, - NATIONAL_DEX_GIRAFARIG, - NATIONAL_DEX_GLALIE, - NATIONAL_DEX_GLIGAR, - NATIONAL_DEX_GLOOM, - NATIONAL_DEX_GOLBAT, - NATIONAL_DEX_GOLDEEN, - NATIONAL_DEX_GOLDUCK, - NATIONAL_DEX_GOLEM, - NATIONAL_DEX_GOREBYSS, - NATIONAL_DEX_GRANBULL, - NATIONAL_DEX_GRAVELER, - NATIONAL_DEX_GRIMER, - NATIONAL_DEX_GROUDON, - NATIONAL_DEX_GROVYLE, - NATIONAL_DEX_GROWLITHE, - NATIONAL_DEX_GRUMPIG, - NATIONAL_DEX_GULPIN, - NATIONAL_DEX_GYARADOS, - NATIONAL_DEX_HARIYAMA, - NATIONAL_DEX_HAUNTER, - NATIONAL_DEX_HERACROSS, - NATIONAL_DEX_HITMONCHAN, - NATIONAL_DEX_HITMONLEE, - NATIONAL_DEX_HITMONTOP, - NATIONAL_DEX_HO_OH, - NATIONAL_DEX_HOOTHOOT, - NATIONAL_DEX_HOPPIP, - NATIONAL_DEX_HORSEA, - NATIONAL_DEX_HOUNDOOM, - NATIONAL_DEX_HOUNDOUR, - NATIONAL_DEX_HUNTAIL, - NATIONAL_DEX_HYPNO, - NATIONAL_DEX_IGGLYBUFF, - NATIONAL_DEX_ILLUMISE, - NATIONAL_DEX_IVYSAUR, - NATIONAL_DEX_JIGGLYPUFF, - NATIONAL_DEX_JIRACHI, - NATIONAL_DEX_JOLTEON, - NATIONAL_DEX_JUMPLUFF, - NATIONAL_DEX_JYNX, - NATIONAL_DEX_KABUTO, - NATIONAL_DEX_KABUTOPS, - NATIONAL_DEX_KADABRA, - NATIONAL_DEX_KAKUNA, - NATIONAL_DEX_KANGASKHAN, - NATIONAL_DEX_KECLEON, - NATIONAL_DEX_KINGDRA, - NATIONAL_DEX_KINGLER, - NATIONAL_DEX_KIRLIA, - NATIONAL_DEX_KOFFING, - NATIONAL_DEX_KRABBY, - NATIONAL_DEX_KYOGRE, - NATIONAL_DEX_LAIRON, - NATIONAL_DEX_LANTURN, - NATIONAL_DEX_LAPRAS, - NATIONAL_DEX_LARVITAR, - NATIONAL_DEX_LATIAS, - NATIONAL_DEX_LATIOS, - NATIONAL_DEX_LEDIAN, - NATIONAL_DEX_LEDYBA, - NATIONAL_DEX_LICKITUNG, - NATIONAL_DEX_LILEEP, - NATIONAL_DEX_LINOONE, - NATIONAL_DEX_LOMBRE, - NATIONAL_DEX_LOTAD, - NATIONAL_DEX_LOUDRED, - NATIONAL_DEX_LUDICOLO, - NATIONAL_DEX_LUGIA, - NATIONAL_DEX_LUNATONE, - NATIONAL_DEX_LUVDISC, - NATIONAL_DEX_MACHAMP, - NATIONAL_DEX_MACHOKE, - NATIONAL_DEX_MACHOP, - NATIONAL_DEX_MAGBY, - NATIONAL_DEX_MAGCARGO, - NATIONAL_DEX_MAGIKARP, - NATIONAL_DEX_MAGMAR, - NATIONAL_DEX_MAGNEMITE, - NATIONAL_DEX_MAGNETON, - NATIONAL_DEX_MAKUHITA, - NATIONAL_DEX_MANECTRIC, - NATIONAL_DEX_MANKEY, - NATIONAL_DEX_MANTINE, - NATIONAL_DEX_MAREEP, - NATIONAL_DEX_MARILL, - NATIONAL_DEX_MAROWAK, - NATIONAL_DEX_MARSHTOMP, - NATIONAL_DEX_MASQUERAIN, - NATIONAL_DEX_MAWILE, - NATIONAL_DEX_MEDICHAM, - NATIONAL_DEX_MEDITITE, - NATIONAL_DEX_MEGANIUM, - NATIONAL_DEX_MEOWTH, - NATIONAL_DEX_METAGROSS, - NATIONAL_DEX_METANG, - NATIONAL_DEX_METAPOD, - NATIONAL_DEX_MEW, - NATIONAL_DEX_MEWTWO, - NATIONAL_DEX_MIGHTYENA, - NATIONAL_DEX_MILOTIC, - NATIONAL_DEX_MILTANK, - NATIONAL_DEX_MINUN, - NATIONAL_DEX_MISDREAVUS, - NATIONAL_DEX_MOLTRES, - NATIONAL_DEX_MR_MIME, - NATIONAL_DEX_MUDKIP, - NATIONAL_DEX_MUK, - NATIONAL_DEX_MURKROW, - NATIONAL_DEX_NATU, - NATIONAL_DEX_NIDOKING, - NATIONAL_DEX_NIDOQUEEN, - NATIONAL_DEX_NIDORAN_F, - NATIONAL_DEX_NIDORAN_M, - NATIONAL_DEX_NIDORINA, - NATIONAL_DEX_NIDORINO, - NATIONAL_DEX_NINCADA, - NATIONAL_DEX_NINETALES, - NATIONAL_DEX_NINJASK, - NATIONAL_DEX_NOCTOWL, - NATIONAL_DEX_NOSEPASS, - NATIONAL_DEX_NUMEL, - NATIONAL_DEX_NUZLEAF, - NATIONAL_DEX_OCTILLERY, - NATIONAL_DEX_ODDISH, - NATIONAL_DEX_OMANYTE, - NATIONAL_DEX_OMASTAR, - NATIONAL_DEX_ONIX, - NATIONAL_DEX_PARAS, - NATIONAL_DEX_PARASECT, - NATIONAL_DEX_PELIPPER, - NATIONAL_DEX_PERSIAN, - NATIONAL_DEX_PHANPY, - NATIONAL_DEX_PICHU, - NATIONAL_DEX_PIDGEOT, - NATIONAL_DEX_PIDGEOTTO, - NATIONAL_DEX_PIDGEY, - NATIONAL_DEX_PIKACHU, - NATIONAL_DEX_PILOSWINE, - NATIONAL_DEX_PINECO, - NATIONAL_DEX_PINSIR, - NATIONAL_DEX_PLUSLE, - NATIONAL_DEX_POLITOED, - NATIONAL_DEX_POLIWAG, - NATIONAL_DEX_POLIWHIRL, - NATIONAL_DEX_POLIWRATH, - NATIONAL_DEX_PONYTA, - NATIONAL_DEX_POOCHYENA, - NATIONAL_DEX_PORYGON, - NATIONAL_DEX_PORYGON2, - NATIONAL_DEX_PRIMEAPE, - NATIONAL_DEX_PSYDUCK, - NATIONAL_DEX_PUPITAR, - NATIONAL_DEX_QUAGSIRE, - NATIONAL_DEX_QUILAVA, - NATIONAL_DEX_QWILFISH, - NATIONAL_DEX_RAICHU, - NATIONAL_DEX_RAIKOU, - NATIONAL_DEX_RALTS, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_RATICATE, - NATIONAL_DEX_RATTATA, - NATIONAL_DEX_RAYQUAZA, - NATIONAL_DEX_REGICE, - NATIONAL_DEX_REGIROCK, - NATIONAL_DEX_REGISTEEL, - NATIONAL_DEX_RELICANTH, - NATIONAL_DEX_REMORAID, - NATIONAL_DEX_RHYDON, - NATIONAL_DEX_RHYHORN, - NATIONAL_DEX_ROSELIA, - NATIONAL_DEX_SABLEYE, - NATIONAL_DEX_SALAMENCE, - NATIONAL_DEX_SANDSHREW, - NATIONAL_DEX_SANDSLASH, - NATIONAL_DEX_SCEPTILE, - NATIONAL_DEX_SCIZOR, - NATIONAL_DEX_SCYTHER, - NATIONAL_DEX_SEADRA, - NATIONAL_DEX_SEAKING, - NATIONAL_DEX_SEALEO, - NATIONAL_DEX_SEEDOT, - NATIONAL_DEX_SEEL, - NATIONAL_DEX_SENTRET, - NATIONAL_DEX_SEVIPER, - NATIONAL_DEX_SHARPEDO, - NATIONAL_DEX_SHEDINJA, - NATIONAL_DEX_SHELGON, - NATIONAL_DEX_SHELLDER, - NATIONAL_DEX_SHIFTRY, - NATIONAL_DEX_SHROOMISH, - NATIONAL_DEX_SHUCKLE, - NATIONAL_DEX_SHUPPET, - NATIONAL_DEX_SILCOON, - NATIONAL_DEX_SKARMORY, - NATIONAL_DEX_SKIPLOOM, - NATIONAL_DEX_SKITTY, - NATIONAL_DEX_SLAKING, - NATIONAL_DEX_SLAKOTH, - NATIONAL_DEX_SLOWBRO, - NATIONAL_DEX_SLOWKING, - NATIONAL_DEX_SLOWPOKE, - NATIONAL_DEX_SLUGMA, - NATIONAL_DEX_SMEARGLE, - NATIONAL_DEX_SMOOCHUM, - NATIONAL_DEX_SNEASEL, - NATIONAL_DEX_SNORLAX, - NATIONAL_DEX_SNORUNT, - NATIONAL_DEX_SNUBBULL, - NATIONAL_DEX_SOLROCK, - NATIONAL_DEX_SPEAROW, - NATIONAL_DEX_SPHEAL, - NATIONAL_DEX_SPINARAK, - NATIONAL_DEX_SPINDA, - NATIONAL_DEX_SPOINK, - NATIONAL_DEX_SQUIRTLE, - NATIONAL_DEX_STANTLER, - NATIONAL_DEX_STARMIE, - NATIONAL_DEX_STARYU, - NATIONAL_DEX_STEELIX, - NATIONAL_DEX_SUDOWOODO, - NATIONAL_DEX_SUICUNE, - NATIONAL_DEX_SUNFLORA, - NATIONAL_DEX_SUNKERN, - NATIONAL_DEX_SURSKIT, - NATIONAL_DEX_SWABLU, - NATIONAL_DEX_SWALOT, - NATIONAL_DEX_SWAMPERT, - NATIONAL_DEX_SWELLOW, - NATIONAL_DEX_SWINUB, - NATIONAL_DEX_TAILLOW, - NATIONAL_DEX_TANGELA, - NATIONAL_DEX_TAUROS, - NATIONAL_DEX_TEDDIURSA, - NATIONAL_DEX_TENTACOOL, - NATIONAL_DEX_TENTACRUEL, - NATIONAL_DEX_TOGEPI, - NATIONAL_DEX_TOGETIC, - NATIONAL_DEX_TORCHIC, - NATIONAL_DEX_TORKOAL, - NATIONAL_DEX_TOTODILE, - NATIONAL_DEX_TRAPINCH, - NATIONAL_DEX_TREECKO, - NATIONAL_DEX_TROPIUS, - NATIONAL_DEX_TYPHLOSION, - NATIONAL_DEX_TYRANITAR, - NATIONAL_DEX_TYROGUE, - NATIONAL_DEX_UMBREON, - NATIONAL_DEX_UNOWN, - NATIONAL_DEX_URSARING, - NATIONAL_DEX_VAPOREON, - NATIONAL_DEX_VENOMOTH, - NATIONAL_DEX_VENONAT, - NATIONAL_DEX_VENUSAUR, - NATIONAL_DEX_VIBRAVA, - NATIONAL_DEX_VICTREEBEL, - NATIONAL_DEX_VIGOROTH, - NATIONAL_DEX_VILEPLUME, - NATIONAL_DEX_VOLBEAT, - NATIONAL_DEX_VOLTORB, - NATIONAL_DEX_VULPIX, - NATIONAL_DEX_WAILMER, - NATIONAL_DEX_WAILORD, - NATIONAL_DEX_WALREIN, - NATIONAL_DEX_WARTORTLE, - NATIONAL_DEX_WEEDLE, - NATIONAL_DEX_WEEPINBELL, - NATIONAL_DEX_WEEZING, - NATIONAL_DEX_WHISCASH, - NATIONAL_DEX_WHISMUR, - NATIONAL_DEX_WIGGLYTUFF, - NATIONAL_DEX_WINGULL, - NATIONAL_DEX_WOBBUFFET, - NATIONAL_DEX_WOOPER, - NATIONAL_DEX_WURMPLE, - NATIONAL_DEX_WYNAUT, - NATIONAL_DEX_XATU, - NATIONAL_DEX_YANMA, - NATIONAL_DEX_ZANGOOSE, - NATIONAL_DEX_ZAPDOS, - NATIONAL_DEX_ZIGZAGOON, - NATIONAL_DEX_ZUBAT, -}; - -const u16 gPokedexOrder_Weight[] = -{ - NATIONAL_DEX_GASTLY, - NATIONAL_DEX_HAUNTER, - NATIONAL_DEX_HOPPIP, - NATIONAL_DEX_DIGLETT, - NATIONAL_DEX_CASTFORM, - NATIONAL_DEX_KOFFING, - NATIONAL_DEX_IGGLYBUFF, - NATIONAL_DEX_MISDREAVUS, - NATIONAL_DEX_CHIMECHO, - NATIONAL_DEX_SKIPLOOM, - NATIONAL_DEX_JIRACHI, - NATIONAL_DEX_SWABLU, - NATIONAL_DEX_SHEDINJA, - NATIONAL_DEX_TOGEPI, - NATIONAL_DEX_SURSKIT, - NATIONAL_DEX_PIDGEY, - NATIONAL_DEX_SUNKERN, - NATIONAL_DEX_BARBOACH, - NATIONAL_DEX_PICHU, - NATIONAL_DEX_AZURILL, - NATIONAL_DEX_ROSELIA, - NATIONAL_DEX_NATU, - NATIONAL_DEX_SPEAROW, - NATIONAL_DEX_MURKROW, - NATIONAL_DEX_SHUPPET, - NATIONAL_DEX_TAILLOW, - NATIONAL_DEX_EXEGGCUTE, - NATIONAL_DEX_TORCHIC, - NATIONAL_DEX_LOTAD, - NATIONAL_DEX_CATERPIE, - NATIONAL_DEX_JUMPLUFF, - NATIONAL_DEX_CLEFFA, - NATIONAL_DEX_WEEDLE, - NATIONAL_DEX_TOGETIC, - NATIONAL_DEX_DRATINI, - NATIONAL_DEX_RATTATA, - NATIONAL_DEX_MASQUERAIN, - NATIONAL_DEX_WURMPLE, - NATIONAL_DEX_QWILFISH, - NATIONAL_DEX_MEW, - NATIONAL_DEX_SHELLDER, - NATIONAL_DEX_SEEDOT, - NATIONAL_DEX_DITTO, - NATIONAL_DEX_BELLSPROUT, - NATIONAL_DEX_PLUSLE, - NATIONAL_DEX_MEOWTH, - NATIONAL_DEX_MINUN, - NATIONAL_DEX_SHROOMISH, - NATIONAL_DEX_CELEBI, - NATIONAL_DEX_CORSOLA, - NATIONAL_DEX_TREECKO, - NATIONAL_DEX_SPINDA, - NATIONAL_DEX_UNOWN, - NATIONAL_DEX_PARAS, - NATIONAL_DEX_ODDISH, - NATIONAL_DEX_JIGGLYPUFF, - NATIONAL_DEX_NINCADA, - NATIONAL_DEX_BELLOSSOM, - NATIONAL_DEX_MAGNEMITE, - NATIONAL_DEX_PIKACHU, - NATIONAL_DEX_SMOOCHUM, - NATIONAL_DEX_SENTRET, - NATIONAL_DEX_WEEPINBELL, - NATIONAL_DEX_CHIKORITA, - NATIONAL_DEX_SWINUB, - NATIONAL_DEX_EEVEE, - NATIONAL_DEX_KRABBY, - NATIONAL_DEX_CUBONE, - NATIONAL_DEX_RALTS, - NATIONAL_DEX_BULBASAUR, - NATIONAL_DEX_EKANS, - NATIONAL_DEX_NIDORAN_F, - NATIONAL_DEX_PINECO, - NATIONAL_DEX_FEEBAS, - NATIONAL_DEX_OMANYTE, - NATIONAL_DEX_ZUBAT, - NATIONAL_DEX_CLEFAIRY, - NATIONAL_DEX_MUDKIP, - NATIONAL_DEX_SNUBBULL, - NATIONAL_DEX_MAREEP, - NATIONAL_DEX_CYNDAQUIL, - NATIONAL_DEX_HORSEA, - NATIONAL_DEX_CHARMANDER, - NATIONAL_DEX_SUNFLORA, - NATIONAL_DEX_MARILL, - NATIONAL_DEX_WOOPER, - NATIONAL_DEX_SPINARAK, - NATIONAL_DEX_GLOOM, - NATIONAL_DEX_LUVDISC, - NATIONAL_DEX_TEDDIURSA, - NATIONAL_DEX_NIDORAN_M, - NATIONAL_DEX_SQUIRTLE, - NATIONAL_DEX_WINGULL, - NATIONAL_DEX_TOTODILE, - NATIONAL_DEX_WEEZING, - NATIONAL_DEX_VULPIX, - NATIONAL_DEX_METAPOD, - NATIONAL_DEX_SILCOON, - NATIONAL_DEX_MAGIKARP, - NATIONAL_DEX_KAKUNA, - NATIONAL_DEX_GULPIN, - NATIONAL_DEX_VOLTORB, - NATIONAL_DEX_LEDYBA, - NATIONAL_DEX_HOUNDOUR, - NATIONAL_DEX_SKITTY, - NATIONAL_DEX_SABLEYE, - NATIONAL_DEX_MEDITITE, - NATIONAL_DEX_CORPHISH, - NATIONAL_DEX_AIPOM, - NATIONAL_DEX_CASCOON, - NATIONAL_DEX_MAWILE, - NATIONAL_DEX_KABUTO, - NATIONAL_DEX_WIGGLYTUFF, - NATIONAL_DEX_SANDSHREW, - NATIONAL_DEX_REMORAID, - NATIONAL_DEX_NINJASK, - NATIONAL_DEX_CHINCHOU, - NATIONAL_DEX_POLIWAG, - NATIONAL_DEX_ANORITH, - NATIONAL_DEX_VENOMOTH, - NATIONAL_DEX_BANETTE, - NATIONAL_DEX_IVYSAUR, - NATIONAL_DEX_FLAAFFY, - NATIONAL_DEX_POOCHYENA, - NATIONAL_DEX_WYNAUT, - NATIONAL_DEX_DUNSPARCE, - NATIONAL_DEX_XATU, - NATIONAL_DEX_DUSKULL, - NATIONAL_DEX_FARFETCHD, - NATIONAL_DEX_TRAPINCH, - NATIONAL_DEX_GOLDEEN, - NATIONAL_DEX_ELECTRIKE, - NATIONAL_DEX_VIBRAVA, - NATIONAL_DEX_VICTREEBEL, - NATIONAL_DEX_BAYLEEF, - NATIONAL_DEX_DELIBIRD, - NATIONAL_DEX_WHISMUR, - NATIONAL_DEX_DRAGONAIR, - NATIONAL_DEX_SNORUNT, - NATIONAL_DEX_ZIGZAGOON, - NATIONAL_DEX_ILLUMISE, - NATIONAL_DEX_VOLBEAT, - NATIONAL_DEX_RATICATE, - NATIONAL_DEX_VILEPLUME, - NATIONAL_DEX_QUILAVA, - NATIONAL_DEX_CHARMELEON, - NATIONAL_DEX_GROWLITHE, - NATIONAL_DEX_COMBUSKEN, - NATIONAL_DEX_MACHOP, - NATIONAL_DEX_ABRA, - NATIONAL_DEX_NIDORINO, - NATIONAL_DEX_PSYDUCK, - NATIONAL_DEX_SWELLOW, - NATIONAL_DEX_NINETALES, - NATIONAL_DEX_NIDORINA, - NATIONAL_DEX_POLIWHIRL, - NATIONAL_DEX_GEODUDE, - NATIONAL_DEX_KIRLIA, - NATIONAL_DEX_SHUCKLE, - NATIONAL_DEX_ALTARIA, - NATIONAL_DEX_CARVANHA, - NATIONAL_DEX_TYROGUE, - NATIONAL_DEX_HOOTHOOT, - NATIONAL_DEX_MAGBY, - NATIONAL_DEX_BALTOY, - NATIONAL_DEX_GROVYLE, - NATIONAL_DEX_KECLEON, - NATIONAL_DEX_LANTURN, - NATIONAL_DEX_WARTORTLE, - NATIONAL_DEX_GOREBYSS, - NATIONAL_DEX_RELICANTH, - NATIONAL_DEX_ELEKID, - NATIONAL_DEX_WHISCASH, - NATIONAL_DEX_LILEEP, - NATIONAL_DEX_NUMEL, - NATIONAL_DEX_SLAKOTH, - NATIONAL_DEX_JOLTEON, - NATIONAL_DEX_CROCONAW, - NATIONAL_DEX_FLAREON, - NATIONAL_DEX_SEADRA, - NATIONAL_DEX_ESPEON, - NATIONAL_DEX_HUNTAIL, - NATIONAL_DEX_UMBREON, - NATIONAL_DEX_MARSHTOMP, - NATIONAL_DEX_NUZLEAF, - NATIONAL_DEX_SNEASEL, - NATIONAL_DEX_MANKEY, - NATIONAL_DEX_PELIPPER, - NATIONAL_DEX_BEAUTIFLY, - NATIONAL_DEX_OCTILLERY, - NATIONAL_DEX_AZUMARILL, - NATIONAL_DEX_WOBBUFFET, - NATIONAL_DEX_VAPOREON, - NATIONAL_DEX_SANDSLASH, - NATIONAL_DEX_PARASECT, - NATIONAL_DEX_BEEDRILL, - NATIONAL_DEX_MUK, - NATIONAL_DEX_PIDGEOTTO, - NATIONAL_DEX_GRIMER, - NATIONAL_DEX_RAICHU, - NATIONAL_DEX_PONYTA, - NATIONAL_DEX_ELECTABUZZ, - NATIONAL_DEX_VENONAT, - NATIONAL_DEX_SPOINK, - NATIONAL_DEX_DUSCLOPS, - NATIONAL_DEX_MEDICHAM, - NATIONAL_DEX_DUSTOX, - NATIONAL_DEX_PERSIAN, - NATIONAL_DEX_BUTTERFREE, - NATIONAL_DEX_PRIMEAPE, - NATIONAL_DEX_DROWZEE, - NATIONAL_DEX_FURRET, - NATIONAL_DEX_PORYGON2, - NATIONAL_DEX_LOMBRE, - NATIONAL_DEX_LINOONE, - NATIONAL_DEX_DELCATTY, - NATIONAL_DEX_CRAWDAUNT, - NATIONAL_DEX_DUGTRIO, - NATIONAL_DEX_ARIADOS, - NATIONAL_DEX_PHANPY, - NATIONAL_DEX_POLITOED, - NATIONAL_DEX_STARYU, - NATIONAL_DEX_CHANSEY, - NATIONAL_DEX_OMASTAR, - NATIONAL_DEX_TANGELA, - NATIONAL_DEX_SLUGMA, - NATIONAL_DEX_HOUNDOOM, - NATIONAL_DEX_LEDIAN, - NATIONAL_DEX_SLOWPOKE, - NATIONAL_DEX_PORYGON, - NATIONAL_DEX_MIGHTYENA, - NATIONAL_DEX_YANMA, - NATIONAL_DEX_FEAROW, - NATIONAL_DEX_SUDOWOODO, - NATIONAL_DEX_SEAKING, - NATIONAL_DEX_BRELOOM, - NATIONAL_DEX_DODUO, - NATIONAL_DEX_PIDGEOT, - NATIONAL_DEX_SPHEAL, - NATIONAL_DEX_CLEFABLE, - NATIONAL_DEX_LATIAS, - NATIONAL_DEX_MANECTRIC, - NATIONAL_DEX_ZANGOOSE, - NATIONAL_DEX_KABUTOPS, - NATIONAL_DEX_GENGAR, - NATIONAL_DEX_LOUDRED, - NATIONAL_DEX_JYNX, - NATIONAL_DEX_NOCTOWL, - NATIONAL_DEX_GIRAFARIG, - NATIONAL_DEX_BAGON, - NATIONAL_DEX_MAGMAR, - NATIONAL_DEX_MAROWAK, - NATIONAL_DEX_TENTACOOL, - NATIONAL_DEX_VIGOROTH, - NATIONAL_DEX_BLISSEY, - NATIONAL_DEX_ABSOL, - NATIONAL_DEX_ALAKAZAM, - NATIONAL_DEX_HITMONTOP, - NATIONAL_DEX_GARDEVOIR, - NATIONAL_DEX_GRANBULL, - NATIONAL_DEX_HITMONLEE, - NATIONAL_DEX_HITMONCHAN, - NATIONAL_DEX_SKARMORY, - NATIONAL_DEX_CACNEA, - NATIONAL_DEX_BLAZIKEN, - NATIONAL_DEX_SCEPTILE, - NATIONAL_DEX_SEVIPER, - NATIONAL_DEX_CLAMPERL, - NATIONAL_DEX_ZAPDOS, - NATIONAL_DEX_HERACROSS, - NATIONAL_DEX_POLIWRATH, - NATIONAL_DEX_MR_MIME, - NATIONAL_DEX_PINSIR, - NATIONAL_DEX_LUDICOLO, - NATIONAL_DEX_TENTACRUEL, - NATIONAL_DEX_GOLBAT, - NATIONAL_DEX_MAGCARGO, - NATIONAL_DEX_ARTICUNO, - NATIONAL_DEX_PILOSWINE, - NATIONAL_DEX_SCYTHER, - NATIONAL_DEX_KADABRA, - NATIONAL_DEX_SMEARGLE, - NATIONAL_DEX_AERODACTYL, - NATIONAL_DEX_SHIFTRY, - NATIONAL_DEX_KINGLER, - NATIONAL_DEX_NIDOQUEEN, - NATIONAL_DEX_MAGNETON, - NATIONAL_DEX_ARON, - NATIONAL_DEX_LATIOS, - NATIONAL_DEX_MOLTRES, - NATIONAL_DEX_CRADILY, - NATIONAL_DEX_DEOXYS, - NATIONAL_DEX_AMPHAROS, - NATIONAL_DEX_NIDOKING, - NATIONAL_DEX_GLIGAR, - NATIONAL_DEX_ARBOK, - NATIONAL_DEX_LICKITUNG, - NATIONAL_DEX_ELECTRODE, - NATIONAL_DEX_ARMALDO, - NATIONAL_DEX_MACHOKE, - NATIONAL_DEX_STANTLER, - NATIONAL_DEX_GRUMPIG, - NATIONAL_DEX_LARVITAR, - NATIONAL_DEX_CROBAT, - NATIONAL_DEX_QUAGSIRE, - NATIONAL_DEX_MILTANK, - NATIONAL_DEX_HYPNO, - NATIONAL_DEX_GOLDUCK, - NATIONAL_DEX_CACTURNE, - NATIONAL_DEX_SLOWBRO, - NATIONAL_DEX_TYPHLOSION, - NATIONAL_DEX_SLOWKING, - NATIONAL_DEX_KANGASKHAN, - NATIONAL_DEX_STARMIE, - NATIONAL_DEX_SWALOT, - NATIONAL_DEX_TORKOAL, - NATIONAL_DEX_SWAMPERT, - NATIONAL_DEX_FLYGON, - NATIONAL_DEX_EXPLOUD, - NATIONAL_DEX_DODRIO, - NATIONAL_DEX_BLASTOISE, - NATIONAL_DEX_MAKUHITA, - NATIONAL_DEX_SEALEO, - NATIONAL_DEX_TAUROS, - NATIONAL_DEX_SHARPEDO, - NATIONAL_DEX_FERALIGATR, - NATIONAL_DEX_SEEL, - NATIONAL_DEX_CHARIZARD, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_BELDUM, - NATIONAL_DEX_NOSEPASS, - NATIONAL_DEX_VENUSAUR, - NATIONAL_DEX_TROPIUS, - NATIONAL_DEX_MEGANIUM, - NATIONAL_DEX_SALAMENCE, - NATIONAL_DEX_GRAVELER, - NATIONAL_DEX_CLAYDOL, - NATIONAL_DEX_SHELGON, - NATIONAL_DEX_RHYHORN, - NATIONAL_DEX_SCIZOR, - NATIONAL_DEX_DEWGONG, - NATIONAL_DEX_RHYDON, - NATIONAL_DEX_DONPHAN, - NATIONAL_DEX_EXEGGUTOR, - NATIONAL_DEX_LAIRON, - NATIONAL_DEX_MEWTWO, - NATIONAL_DEX_URSARING, - NATIONAL_DEX_FORRETRESS, - NATIONAL_DEX_MACHAMP, - NATIONAL_DEX_WAILMER, - NATIONAL_DEX_SLAKING, - NATIONAL_DEX_CLOYSTER, - NATIONAL_DEX_WALREIN, - NATIONAL_DEX_PUPITAR, - NATIONAL_DEX_KINGDRA, - NATIONAL_DEX_SOLROCK, - NATIONAL_DEX_ARCANINE, - NATIONAL_DEX_MILOTIC, - NATIONAL_DEX_LUNATONE, - NATIONAL_DEX_REGICE, - NATIONAL_DEX_RAIKOU, - NATIONAL_DEX_SUICUNE, - NATIONAL_DEX_ENTEI, - NATIONAL_DEX_HO_OH, - NATIONAL_DEX_TYRANITAR, - NATIONAL_DEX_METANG, - NATIONAL_DEX_REGISTEEL, - NATIONAL_DEX_RAYQUAZA, - NATIONAL_DEX_ONIX, - NATIONAL_DEX_DRAGONITE, - NATIONAL_DEX_LUGIA, - NATIONAL_DEX_LAPRAS, - NATIONAL_DEX_CAMERUPT, - NATIONAL_DEX_MANTINE, - NATIONAL_DEX_REGIROCK, - NATIONAL_DEX_GYARADOS, - NATIONAL_DEX_HARIYAMA, - NATIONAL_DEX_GLALIE, - NATIONAL_DEX_GOLEM, - NATIONAL_DEX_KYOGRE, - NATIONAL_DEX_AGGRON, - NATIONAL_DEX_WAILORD, - NATIONAL_DEX_STEELIX, - NATIONAL_DEX_SNORLAX, - NATIONAL_DEX_METAGROSS, - NATIONAL_DEX_GROUDON, -}; - -const u16 gPokedexOrder_Height[] = -{ - NATIONAL_DEX_DIGLETT, - NATIONAL_DEX_AZURILL, - NATIONAL_DEX_NATU, - NATIONAL_DEX_WEEDLE, - NATIONAL_DEX_PICHU, - NATIONAL_DEX_CLEFFA, - NATIONAL_DEX_TOGEPI, - NATIONAL_DEX_CASTFORM, - NATIONAL_DEX_IGGLYBUFF, - NATIONAL_DEX_CATERPIE, - NATIONAL_DEX_TAILLOW, - NATIONAL_DEX_DITTO, - NATIONAL_DEX_EEVEE, - NATIONAL_DEX_ROSELIA, - NATIONAL_DEX_SPEAROW, - NATIONAL_DEX_PIDGEY, - NATIONAL_DEX_SUNKERN, - NATIONAL_DEX_SHELLDER, - NATIONAL_DEX_RATTATA, - NATIONAL_DEX_MAGNEMITE, - NATIONAL_DEX_PARAS, - NATIONAL_DEX_WURMPLE, - NATIONAL_DEX_JIRACHI, - NATIONAL_DEX_CUBONE, - NATIONAL_DEX_MUDKIP, - NATIONAL_DEX_WOOPER, - NATIONAL_DEX_HORSEA, - NATIONAL_DEX_MEOWTH, - NATIONAL_DEX_NIDORAN_F, - NATIONAL_DEX_SWINUB, - NATIONAL_DEX_MEW, - NATIONAL_DEX_SWABLU, - NATIONAL_DEX_ARON, - NATIONAL_DEX_PLUSLE, - NATIONAL_DEX_MINUN, - NATIONAL_DEX_EXEGGCUTE, - NATIONAL_DEX_PIKACHU, - NATIONAL_DEX_BELLOSSOM, - NATIONAL_DEX_GULPIN, - NATIONAL_DEX_ZIGZAGOON, - NATIONAL_DEX_SHROOMISH, - NATIONAL_DEX_OMANYTE, - NATIONAL_DEX_CACNEA, - NATIONAL_DEX_KRABBY, - NATIONAL_DEX_RALTS, - NATIONAL_DEX_HOPPIP, - NATIONAL_DEX_TORCHIC, - NATIONAL_DEX_CLAMPERL, - NATIONAL_DEX_GEODUDE, - NATIONAL_DEX_MARILL, - NATIONAL_DEX_BARBOACH, - NATIONAL_DEX_SMOOCHUM, - NATIONAL_DEX_VOLTORB, - NATIONAL_DEX_NINCADA, - NATIONAL_DEX_SABLEYE, - NATIONAL_DEX_MURKROW, - NATIONAL_DEX_QWILFISH, - NATIONAL_DEX_SQUIRTLE, - NATIONAL_DEX_TREECKO, - NATIONAL_DEX_BALTOY, - NATIONAL_DEX_ODDISH, - NATIONAL_DEX_LOTAD, - NATIONAL_DEX_JIGGLYPUFF, - NATIONAL_DEX_SURSKIT, - NATIONAL_DEX_CYNDAQUIL, - NATIONAL_DEX_KABUTO, - NATIONAL_DEX_LINOONE, - NATIONAL_DEX_TORKOAL, - NATIONAL_DEX_NIDORAN_M, - NATIONAL_DEX_SPINARAK, - NATIONAL_DEX_MANKEY, - NATIONAL_DEX_SEEDOT, - NATIONAL_DEX_POOCHYENA, - NATIONAL_DEX_PHANPY, - NATIONAL_DEX_UNOWN, - NATIONAL_DEX_CHINCHOU, - NATIONAL_DEX_PORYGON2, - NATIONAL_DEX_POLIWAG, - NATIONAL_DEX_BAGON, - NATIONAL_DEX_FEEBAS, - NATIONAL_DEX_SHUPPET, - NATIONAL_DEX_TOTODILE, - NATIONAL_DEX_CELEBI, - NATIONAL_DEX_WYNAUT, - NATIONAL_DEX_SANDSHREW, - NATIONAL_DEX_CHIMECHO, - NATIONAL_DEX_LUVDISC, - NATIONAL_DEX_HOUNDOUR, - NATIONAL_DEX_SILCOON, - NATIONAL_DEX_ELECTRIKE, - NATIONAL_DEX_CHARMANDER, - NATIONAL_DEX_MEDITITE, - NATIONAL_DEX_WINGULL, - NATIONAL_DEX_REMORAID, - NATIONAL_DEX_CORPHISH, - NATIONAL_DEX_CORSOLA, - NATIONAL_DEX_ILLUMISE, - NATIONAL_DEX_SNUBBULL, - NATIONAL_DEX_VULPIX, - NATIONAL_DEX_LARVITAR, - NATIONAL_DEX_BELDUM, - NATIONAL_DEX_WHISMUR, - NATIONAL_DEX_PINECO, - NATIONAL_DEX_ELEKID, - NATIONAL_DEX_CLEFAIRY, - NATIONAL_DEX_SHUCKLE, - NATIONAL_DEX_TEDDIURSA, - NATIONAL_DEX_KAKUNA, - NATIONAL_DEX_SKITTY, - NATIONAL_DEX_TOGETIC, - NATIONAL_DEX_GOLDEEN, - NATIONAL_DEX_MAWILE, - NATIONAL_DEX_MAREEP, - NATIONAL_DEX_SKIPLOOM, - NATIONAL_DEX_KOFFING, - NATIONAL_DEX_DUGTRIO, - NATIONAL_DEX_CASCOON, - NATIONAL_DEX_NUMEL, - NATIONAL_DEX_ANORITH, - NATIONAL_DEX_VOLBEAT, - NATIONAL_DEX_HOOTHOOT, - NATIONAL_DEX_TRAPINCH, - NATIONAL_DEX_SPOINK, - NATIONAL_DEX_METAPOD, - NATIONAL_DEX_BELLSPROUT, - NATIONAL_DEX_SNORUNT, - NATIONAL_DEX_RATICATE, - NATIONAL_DEX_MARSHTOMP, - NATIONAL_DEX_SWELLOW, - NATIONAL_DEX_MAGBY, - NATIONAL_DEX_GROWLITHE, - NATIONAL_DEX_MISDREAVUS, - NATIONAL_DEX_BULBASAUR, - NATIONAL_DEX_TYROGUE, - NATIONAL_DEX_SLUGMA, - NATIONAL_DEX_SLAKOTH, - NATIONAL_DEX_KIRLIA, - NATIONAL_DEX_AIPOM, - NATIONAL_DEX_JOLTEON, - NATIONAL_DEX_NIDORINA, - NATIONAL_DEX_AZUMARILL, - NATIONAL_DEX_SHEDINJA, - NATIONAL_DEX_MACHOP, - NATIONAL_DEX_NINJASK, - NATIONAL_DEX_MASQUERAIN, - NATIONAL_DEX_DUSKULL, - NATIONAL_DEX_SUNFLORA, - NATIONAL_DEX_JUMPLUFF, - NATIONAL_DEX_STARYU, - NATIONAL_DEX_FLAAFFY, - NATIONAL_DEX_SPHEAL, - NATIONAL_DEX_PSYDUCK, - NATIONAL_DEX_MAGCARGO, - NATIONAL_DEX_FARFETCHD, - NATIONAL_DEX_ZUBAT, - NATIONAL_DEX_PORYGON, - NATIONAL_DEX_SENTRET, - NATIONAL_DEX_CARVANHA, - NATIONAL_DEX_GLOOM, - NATIONAL_DEX_RAICHU, - NATIONAL_DEX_MAGIKARP, - NATIONAL_DEX_SNEASEL, - NATIONAL_DEX_LAIRON, - NATIONAL_DEX_COMBUSKEN, - NATIONAL_DEX_OCTILLERY, - NATIONAL_DEX_NIDORINO, - NATIONAL_DEX_FLAREON, - NATIONAL_DEX_DELIBIRD, - NATIONAL_DEX_TENTACOOL, - NATIONAL_DEX_ABRA, - NATIONAL_DEX_GROVYLE, - NATIONAL_DEX_WHISCASH, - NATIONAL_DEX_QUILAVA, - NATIONAL_DEX_ESPEON, - NATIONAL_DEX_GRIMER, - NATIONAL_DEX_CHIKORITA, - NATIONAL_DEX_GRUMPIG, - NATIONAL_DEX_NOSEPASS, - NATIONAL_DEX_PERSIAN, - NATIONAL_DEX_MIGHTYENA, - NATIONAL_DEX_VENONAT, - NATIONAL_DEX_MAGNETON, - NATIONAL_DEX_PONYTA, - NATIONAL_DEX_MAKUHITA, - NATIONAL_DEX_LUNATONE, - NATIONAL_DEX_SANDSLASH, - NATIONAL_DEX_DROWZEE, - NATIONAL_DEX_TANGELA, - NATIONAL_DEX_PRIMEAPE, - NATIONAL_DEX_LEDYBA, - NATIONAL_DEX_WIGGLYTUFF, - NATIONAL_DEX_PARASECT, - NATIONAL_DEX_OMASTAR, - NATIONAL_DEX_LOUDRED, - NATIONAL_DEX_WARTORTLE, - NATIONAL_DEX_GRAVELER, - NATIONAL_DEX_UMBREON, - NATIONAL_DEX_LILEEP, - NATIONAL_DEX_POLIWHIRL, - NATIONAL_DEX_VAPOREON, - NATIONAL_DEX_BEEDRILL, - NATIONAL_DEX_MAROWAK, - NATIONAL_DEX_WEEPINBELL, - NATIONAL_DEX_RELICANTH, - NATIONAL_DEX_RHYHORN, - NATIONAL_DEX_IVYSAUR, - NATIONAL_DEX_KECLEON, - NATIONAL_DEX_NUZLEAF, - NATIONAL_DEX_BEAUTIFLY, - NATIONAL_DEX_PIDGEOTTO, - NATIONAL_DEX_ARIADOS, - NATIONAL_DEX_SEEL, - NATIONAL_DEX_POLITOED, - NATIONAL_DEX_CROCONAW, - NATIONAL_DEX_CHANSEY, - NATIONAL_DEX_BANETTE, - NATIONAL_DEX_DONPHAN, - NATIONAL_DEX_STARMIE, - NATIONAL_DEX_CHARMELEON, - NATIONAL_DEX_PILOSWINE, - NATIONAL_DEX_BUTTERFREE, - NATIONAL_DEX_VIBRAVA, - NATIONAL_DEX_ELECTABUZZ, - NATIONAL_DEX_CRAWDAUNT, - NATIONAL_DEX_DELCATTY, - NATIONAL_DEX_ALTARIA, - NATIONAL_DEX_SHELGON, - NATIONAL_DEX_NINETALES, - NATIONAL_DEX_GLIGAR, - NATIONAL_DEX_SEALEO, - NATIONAL_DEX_SPINDA, - NATIONAL_DEX_PUPITAR, - NATIONAL_DEX_SLOWPOKE, - NATIONAL_DEX_SOLROCK, - NATIONAL_DEX_MILTANK, - NATIONAL_DEX_FEAROW, - NATIONAL_DEX_VILEPLUME, - NATIONAL_DEX_MUK, - NATIONAL_DEX_FORRETRESS, - NATIONAL_DEX_SUDOWOODO, - NATIONAL_DEX_ABSOL, - NATIONAL_DEX_YANMA, - NATIONAL_DEX_DUSTOX, - NATIONAL_DEX_LICKITUNG, - NATIONAL_DEX_SMEARGLE, - NATIONAL_DEX_LANTURN, - NATIONAL_DEX_ELECTRODE, - NATIONAL_DEX_LOMBRE, - NATIONAL_DEX_BRELOOM, - NATIONAL_DEX_BAYLEEF, - NATIONAL_DEX_SEADRA, - NATIONAL_DEX_WEEZING, - NATIONAL_DEX_PELIPPER, - NATIONAL_DEX_METANG, - NATIONAL_DEX_NIDOQUEEN, - NATIONAL_DEX_CACTURNE, - NATIONAL_DEX_SHIFTRY, - NATIONAL_DEX_MEDICHAM, - NATIONAL_DEX_ZANGOOSE, - NATIONAL_DEX_KABUTOPS, - NATIONAL_DEX_KINGLER, - NATIONAL_DEX_KADABRA, - NATIONAL_DEX_SEAKING, - NATIONAL_DEX_CLEFABLE, - NATIONAL_DEX_MAGMAR, - NATIONAL_DEX_WOBBUFFET, - NATIONAL_DEX_GASTLY, - NATIONAL_DEX_MR_MIME, - NATIONAL_DEX_POLIWRATH, - NATIONAL_DEX_TAUROS, - NATIONAL_DEX_LATIAS, - NATIONAL_DEX_AMPHAROS, - NATIONAL_DEX_VIGOROTH, - NATIONAL_DEX_LEDIAN, - NATIONAL_DEX_GOLEM, - NATIONAL_DEX_WALREIN, - NATIONAL_DEX_DODUO, - NATIONAL_DEX_HOUNDOOM, - NATIONAL_DEX_NIDOKING, - NATIONAL_DEX_JYNX, - NATIONAL_DEX_HITMONCHAN, - NATIONAL_DEX_STANTLER, - NATIONAL_DEX_GRANBULL, - NATIONAL_DEX_HITMONTOP, - NATIONAL_DEX_QUAGSIRE, - NATIONAL_DEX_CLAYDOL, - NATIONAL_DEX_SWAMPERT, - NATIONAL_DEX_BLISSEY, - NATIONAL_DEX_LUDICOLO, - NATIONAL_DEX_EXPLOUD, - NATIONAL_DEX_DUNSPARCE, - NATIONAL_DEX_PINSIR, - NATIONAL_DEX_CLOYSTER, - NATIONAL_DEX_MACHOKE, - NATIONAL_DEX_GIRAFARIG, - NATIONAL_DEX_PIDGEOT, - NATIONAL_DEX_XATU, - NATIONAL_DEX_CRADILY, - NATIONAL_DEX_HITMONLEE, - NATIONAL_DEX_VENOMOTH, - NATIONAL_DEX_GENGAR, - NATIONAL_DEX_HERACROSS, - NATIONAL_DEX_GLALIE, - NATIONAL_DEX_SCYTHER, - NATIONAL_DEX_SALAMENCE, - NATIONAL_DEX_MANECTRIC, - NATIONAL_DEX_ARMALDO, - NATIONAL_DEX_ALAKAZAM, - NATIONAL_DEX_HYPNO, - NATIONAL_DEX_NOCTOWL, - NATIONAL_DEX_TENTACRUEL, - NATIONAL_DEX_DUSCLOPS, - NATIONAL_DEX_ZAPDOS, - NATIONAL_DEX_GOLBAT, - NATIONAL_DEX_METAGROSS, - NATIONAL_DEX_GARDEVOIR, - NATIONAL_DEX_BLASTOISE, - NATIONAL_DEX_SLOWBRO, - NATIONAL_DEX_HAUNTER, - NATIONAL_DEX_MACHAMP, - NATIONAL_DEX_REGIROCK, - NATIONAL_DEX_SWALOT, - NATIONAL_DEX_SCEPTILE, - NATIONAL_DEX_SKARMORY, - NATIONAL_DEX_GOLDUCK, - NATIONAL_DEX_DEOXYS, - NATIONAL_DEX_VICTREEBEL, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_CHARIZARD, - NATIONAL_DEX_HUNTAIL, - NATIONAL_DEX_DEWGONG, - NATIONAL_DEX_ARTICUNO, - NATIONAL_DEX_TYPHLOSION, - NATIONAL_DEX_AERODACTYL, - NATIONAL_DEX_GOREBYSS, - NATIONAL_DEX_URSARING, - NATIONAL_DEX_MEGANIUM, - NATIONAL_DEX_REGICE, - NATIONAL_DEX_SCIZOR, - NATIONAL_DEX_KINGDRA, - NATIONAL_DEX_DRATINI, - NATIONAL_DEX_DODRIO, - NATIONAL_DEX_SHARPEDO, - NATIONAL_DEX_CROBAT, - NATIONAL_DEX_FURRET, - NATIONAL_DEX_ARCANINE, - NATIONAL_DEX_RAIKOU, - NATIONAL_DEX_BLAZIKEN, - NATIONAL_DEX_CAMERUPT, - NATIONAL_DEX_RHYDON, - NATIONAL_DEX_REGISTEEL, - NATIONAL_DEX_EKANS, - NATIONAL_DEX_FLYGON, - NATIONAL_DEX_TROPIUS, - NATIONAL_DEX_LATIOS, - NATIONAL_DEX_SUICUNE, - NATIONAL_DEX_MOLTRES, - NATIONAL_DEX_VENUSAUR, - NATIONAL_DEX_EXEGGUTOR, - NATIONAL_DEX_SLOWKING, - NATIONAL_DEX_TYRANITAR, - NATIONAL_DEX_SLAKING, - NATIONAL_DEX_WAILMER, - NATIONAL_DEX_MEWTWO, - NATIONAL_DEX_AGGRON, - NATIONAL_DEX_SNORLAX, - NATIONAL_DEX_MANTINE, - NATIONAL_DEX_ENTEI, - NATIONAL_DEX_DRAGONITE, - NATIONAL_DEX_KANGASKHAN, - NATIONAL_DEX_HARIYAMA, - NATIONAL_DEX_FERALIGATR, - NATIONAL_DEX_LAPRAS, - NATIONAL_DEX_SEVIPER, - NATIONAL_DEX_ARBOK, - NATIONAL_DEX_GROUDON, - NATIONAL_DEX_HO_OH, - NATIONAL_DEX_DRAGONAIR, - NATIONAL_DEX_KYOGRE, - NATIONAL_DEX_LUGIA, - NATIONAL_DEX_MILOTIC, - NATIONAL_DEX_GYARADOS, - NATIONAL_DEX_RAYQUAZA, - NATIONAL_DEX_ONIX, - NATIONAL_DEX_STEELIX, - NATIONAL_DEX_WAILORD, -}; diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index bc6572b46..078304888 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -1,6 +1,3 @@ -#ifndef GUARD_BASE_STATS_H -#define GUARD_BASE_STATS_H - // Maximum value for a female pokemon is 254 (MON_FEMALE) which is 100% female. // 255 (MON_GENDERLESS) is reserved for genderless pokemon. #define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100)) @@ -13572,5 +13569,3 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, } }; - -#endif //GUARD_BASE_STATS_H diff --git a/src/data/pokemon/cry_ids.h b/src/data/pokemon/cry_ids.h index 1c1c32dde..0c7dd8dad 100644 --- a/src/data/pokemon/cry_ids.h +++ b/src/data/pokemon/cry_ids.h @@ -1,6 +1,3 @@ -#ifndef POKEEMERALD_CRY_IDS_H -#define POKEEMERALD_CRY_IDS_H - const u16 gSpeciesIdToCryId[] = { 273, // TREECKO @@ -139,5 +136,3 @@ const u16 gSpeciesIdToCryId[] = 386, // DEOXYS 387 // CHIMECHO }; - -#endif //POKEEMERALD_CRY_IDS_H diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 3d74868b4..f8c250c6d 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -1,12 +1,7 @@ -#ifndef POKEEMERALD_DAYCARE_H -#define POKEEMERALD_DAYCARE_H - #define EGG_MOVES_SPECIES_OFFSET 20000 #define EGG_MOVES_TERMINATOR 0xFFFF #define egg_moves(species, moves...) (SPECIES_##species + EGG_MOVES_SPECIES_OFFSET), moves -#endif // POKEEMERALD_DAYCARE_H - const u16 gEggMoves[] = { egg_moves(BULBASAUR, MOVE_LIGHT_SCREEN, diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 8629ac9b1..c9b0cf716 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -1,6 +1,3 @@ -#ifndef POKEEMERALD_EVOLUTION_H -#define POKEEMERALD_EVOLUTION_H - const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = { [SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR}}, @@ -188,5 +185,3 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_BELDUM] = {{EVO_LEVEL, 20, SPECIES_METANG}}, [SPECIES_METANG] = {{EVO_LEVEL, 45, SPECIES_METAGROSS}}, }; - -#endif //POKEEMERALD_EVOLUTION_H diff --git a/src/data/pokemon/experience_tables.h b/src/data/pokemon/experience_tables.h index 9fd5a2fae..15bcadeb2 100644 --- a/src/data/pokemon/experience_tables.h +++ b/src/data/pokemon/experience_tables.h @@ -1,6 +1,3 @@ -#ifndef POKEEMERALD_EXPERIENCE_TABLES_H -#define POKEEMERALD_EXPERIENCE_TABLES_H - #define SQUARE(n)(n * n) #define CUBE(n)(n * n * n) @@ -845,5 +842,3 @@ const u32 gExperienceTables[][MAX_LEVEL + 1] = EXP_MEDIUM_FAST(100), } }; - -#endif //POKEEMERALD_EXPERIENCE_TABLES_H diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 6ba0d694e..9f5720a66 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -1,6 +1,3 @@ -#ifndef GUARD_ITEM_EFFECTS_H -#define GUARD_ITEM_EFFECTS_H - const u8 gItemEffect_Potion[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20}; const u8 gItemEffect_Antidote[] = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00}; const u8 gItemEffect_BurnHeal[] = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00}; @@ -237,5 +234,3 @@ const u8 *const gItemEffectTable[] = NULL, NULL }; - -#endif //GUARD_ITEM_EFFECTS_H diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 0f648526c..5ac7b3bd7 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -1,6 +1,3 @@ -#ifndef POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H -#define POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H - const u16 *const gLevelUpLearnsets[NUM_SPECIES] = { [SPECIES_NONE] = sBulbasaurLevelUpLearnset, @@ -416,5 +413,3 @@ const u16 *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DEOXYS] = sDeoxysLevelUpLearnset, [SPECIES_CHIMECHO] = sChimechoLevelUpLearnset, }; - -#endif //POKEEMERALD_LEVEL_UP_LEARNSET_POINTERS_H diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 062873aee..727cc0959 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -1,6 +1,3 @@ -#ifndef POKEEMERALD_LEVEL_UP_LEARNSETS_H -#define POKEEMERALD_LEVEL_UP_LEARNSETS_H - #define LEVEL_UP_MOVE(lvl, move) ((lvl << 9) | move) #define LEVEL_UP_END 0xffff @@ -5619,5 +5616,3 @@ static const u16 sChimechoLevelUpLearnset[] = { LEVEL_UP_MOVE(46, MOVE_PSYCHIC), LEVEL_UP_END }; - -#endif //POKEEMERALD_LEVEL_UP_LEARNSETS_H diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h new file mode 100644 index 000000000..55b0abcea --- /dev/null +++ b/src/data/pokemon/pokedex_orders.h @@ -0,0 +1,1195 @@ +const u16 gPokedexOrder_Alphabetical[] = +{ + NATIONAL_DEX_OLD_UNOWN_B, + NATIONAL_DEX_OLD_UNOWN_C, + NATIONAL_DEX_OLD_UNOWN_D, + NATIONAL_DEX_OLD_UNOWN_E, + NATIONAL_DEX_OLD_UNOWN_F, + NATIONAL_DEX_OLD_UNOWN_G, + NATIONAL_DEX_OLD_UNOWN_H, + NATIONAL_DEX_OLD_UNOWN_I, + NATIONAL_DEX_OLD_UNOWN_J, + NATIONAL_DEX_OLD_UNOWN_K, + NATIONAL_DEX_OLD_UNOWN_L, + NATIONAL_DEX_OLD_UNOWN_M, + NATIONAL_DEX_OLD_UNOWN_N, + NATIONAL_DEX_OLD_UNOWN_O, + NATIONAL_DEX_OLD_UNOWN_P, + NATIONAL_DEX_OLD_UNOWN_Q, + NATIONAL_DEX_OLD_UNOWN_R, + NATIONAL_DEX_OLD_UNOWN_S, + NATIONAL_DEX_OLD_UNOWN_T, + NATIONAL_DEX_OLD_UNOWN_U, + NATIONAL_DEX_OLD_UNOWN_V, + NATIONAL_DEX_OLD_UNOWN_W, + NATIONAL_DEX_OLD_UNOWN_X, + NATIONAL_DEX_OLD_UNOWN_Y, + NATIONAL_DEX_OLD_UNOWN_Z, + // Actual pokemon start here. + NATIONAL_DEX_ABRA, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_ARON, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_GROUDON, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_METANG, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_MEW, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_MUK, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_NATU, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_WAILORD, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_XATU, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_ZUBAT, +}; + +const u16 gPokedexOrder_Weight[] = +{ + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_NATU, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_MEW, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_XATU, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_MUK, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_ARON, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_METANG, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_WAILORD, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_GROUDON, +}; + +const u16 gPokedexOrder_Height[] = +{ + NATIONAL_DEX_DIGLETT, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_NATU, + NATIONAL_DEX_WEEDLE, + NATIONAL_DEX_PICHU, + NATIONAL_DEX_CLEFFA, + NATIONAL_DEX_TOGEPI, + NATIONAL_DEX_CASTFORM, + NATIONAL_DEX_IGGLYBUFF, + NATIONAL_DEX_CATERPIE, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_DITTO, + NATIONAL_DEX_EEVEE, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_PIDGEY, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SHELLDER, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_MAGNEMITE, + NATIONAL_DEX_PARAS, + NATIONAL_DEX_WURMPLE, + NATIONAL_DEX_JIRACHI, + NATIONAL_DEX_CUBONE, + NATIONAL_DEX_MUDKIP, + NATIONAL_DEX_WOOPER, + NATIONAL_DEX_HORSEA, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_MEW, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_ARON, + NATIONAL_DEX_PLUSLE, + NATIONAL_DEX_MINUN, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_PIKACHU, + NATIONAL_DEX_BELLOSSOM, + NATIONAL_DEX_GULPIN, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_OMANYTE, + NATIONAL_DEX_CACNEA, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_HOPPIP, + NATIONAL_DEX_TORCHIC, + NATIONAL_DEX_CLAMPERL, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_BARBOACH, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_VOLTORB, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_SABLEYE, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_QWILFISH, + NATIONAL_DEX_SQUIRTLE, + NATIONAL_DEX_TREECKO, + NATIONAL_DEX_BALTOY, + NATIONAL_DEX_ODDISH, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_JIGGLYPUFF, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_CYNDAQUIL, + NATIONAL_DEX_KABUTO, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_UNOWN, + NATIONAL_DEX_CHINCHOU, + NATIONAL_DEX_PORYGON2, + NATIONAL_DEX_POLIWAG, + NATIONAL_DEX_BAGON, + NATIONAL_DEX_FEEBAS, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_TOTODILE, + NATIONAL_DEX_CELEBI, + NATIONAL_DEX_WYNAUT, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_CHIMECHO, + NATIONAL_DEX_LUVDISC, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_SILCOON, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_CHARMANDER, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_REMORAID, + NATIONAL_DEX_CORPHISH, + NATIONAL_DEX_CORSOLA, + NATIONAL_DEX_ILLUMISE, + NATIONAL_DEX_SNUBBULL, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_LARVITAR, + NATIONAL_DEX_BELDUM, + NATIONAL_DEX_WHISMUR, + NATIONAL_DEX_PINECO, + NATIONAL_DEX_ELEKID, + NATIONAL_DEX_CLEFAIRY, + NATIONAL_DEX_SHUCKLE, + NATIONAL_DEX_TEDDIURSA, + NATIONAL_DEX_KAKUNA, + NATIONAL_DEX_SKITTY, + NATIONAL_DEX_TOGETIC, + NATIONAL_DEX_GOLDEEN, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_SKIPLOOM, + NATIONAL_DEX_KOFFING, + NATIONAL_DEX_DUGTRIO, + NATIONAL_DEX_CASCOON, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_ANORITH, + NATIONAL_DEX_VOLBEAT, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_TRAPINCH, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_METAPOD, + NATIONAL_DEX_BELLSPROUT, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_MARSHTOMP, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_MISDREAVUS, + NATIONAL_DEX_BULBASAUR, + NATIONAL_DEX_TYROGUE, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_SLAKOTH, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_AIPOM, + NATIONAL_DEX_JOLTEON, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_MACHOP, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_JUMPLUFF, + NATIONAL_DEX_STARYU, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_PSYDUCK, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_FARFETCHD, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_PORYGON, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_CARVANHA, + NATIONAL_DEX_GLOOM, + NATIONAL_DEX_RAICHU, + NATIONAL_DEX_MAGIKARP, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_COMBUSKEN, + NATIONAL_DEX_OCTILLERY, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_FLAREON, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_TENTACOOL, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_GROVYLE, + NATIONAL_DEX_WHISCASH, + NATIONAL_DEX_QUILAVA, + NATIONAL_DEX_ESPEON, + NATIONAL_DEX_GRIMER, + NATIONAL_DEX_CHIKORITA, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_MAGNETON, + NATIONAL_DEX_PONYTA, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_LUNATONE, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_DROWZEE, + NATIONAL_DEX_TANGELA, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_WIGGLYTUFF, + NATIONAL_DEX_PARASECT, + NATIONAL_DEX_OMASTAR, + NATIONAL_DEX_LOUDRED, + NATIONAL_DEX_WARTORTLE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_UMBREON, + NATIONAL_DEX_LILEEP, + NATIONAL_DEX_POLIWHIRL, + NATIONAL_DEX_VAPOREON, + NATIONAL_DEX_BEEDRILL, + NATIONAL_DEX_MAROWAK, + NATIONAL_DEX_WEEPINBELL, + NATIONAL_DEX_RELICANTH, + NATIONAL_DEX_RHYHORN, + NATIONAL_DEX_IVYSAUR, + NATIONAL_DEX_KECLEON, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_BEAUTIFLY, + NATIONAL_DEX_PIDGEOTTO, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_SEEL, + NATIONAL_DEX_POLITOED, + NATIONAL_DEX_CROCONAW, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_STARMIE, + NATIONAL_DEX_CHARMELEON, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_BUTTERFREE, + NATIONAL_DEX_VIBRAVA, + NATIONAL_DEX_ELECTABUZZ, + NATIONAL_DEX_CRAWDAUNT, + NATIONAL_DEX_DELCATTY, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_SHELGON, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_SPINDA, + NATIONAL_DEX_PUPITAR, + NATIONAL_DEX_SLOWPOKE, + NATIONAL_DEX_SOLROCK, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_VILEPLUME, + NATIONAL_DEX_MUK, + NATIONAL_DEX_FORRETRESS, + NATIONAL_DEX_SUDOWOODO, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_DUSTOX, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_LANTURN, + NATIONAL_DEX_ELECTRODE, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_BAYLEEF, + NATIONAL_DEX_SEADRA, + NATIONAL_DEX_WEEZING, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_METANG, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_CACTURNE, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_ZANGOOSE, + NATIONAL_DEX_KABUTOPS, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_SEAKING, + NATIONAL_DEX_CLEFABLE, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_WOBBUFFET, + NATIONAL_DEX_GASTLY, + NATIONAL_DEX_MR_MIME, + NATIONAL_DEX_POLIWRATH, + NATIONAL_DEX_TAUROS, + NATIONAL_DEX_LATIAS, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_VIGOROTH, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_HITMONCHAN, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_GRANBULL, + NATIONAL_DEX_HITMONTOP, + NATIONAL_DEX_QUAGSIRE, + NATIONAL_DEX_CLAYDOL, + NATIONAL_DEX_SWAMPERT, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_EXPLOUD, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_PINSIR, + NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_MACHOKE, + NATIONAL_DEX_GIRAFARIG, + NATIONAL_DEX_PIDGEOT, + NATIONAL_DEX_XATU, + NATIONAL_DEX_CRADILY, + NATIONAL_DEX_HITMONLEE, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_GENGAR, + NATIONAL_DEX_HERACROSS, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_SCYTHER, + NATIONAL_DEX_SALAMENCE, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_ARMALDO, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_HYPNO, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_TENTACRUEL, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_ZAPDOS, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_METAGROSS, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_SLOWBRO, + NATIONAL_DEX_HAUNTER, + NATIONAL_DEX_MACHAMP, + NATIONAL_DEX_REGIROCK, + NATIONAL_DEX_SWALOT, + NATIONAL_DEX_SCEPTILE, + NATIONAL_DEX_SKARMORY, + NATIONAL_DEX_GOLDUCK, + NATIONAL_DEX_DEOXYS, + NATIONAL_DEX_VICTREEBEL, + NATIONAL_DEX_RAPIDASH, + NATIONAL_DEX_CHARIZARD, + NATIONAL_DEX_HUNTAIL, + NATIONAL_DEX_DEWGONG, + NATIONAL_DEX_ARTICUNO, + NATIONAL_DEX_TYPHLOSION, + NATIONAL_DEX_AERODACTYL, + NATIONAL_DEX_GOREBYSS, + NATIONAL_DEX_URSARING, + NATIONAL_DEX_MEGANIUM, + NATIONAL_DEX_REGICE, + NATIONAL_DEX_SCIZOR, + NATIONAL_DEX_KINGDRA, + NATIONAL_DEX_DRATINI, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_SHARPEDO, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_RAIKOU, + NATIONAL_DEX_BLAZIKEN, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_RHYDON, + NATIONAL_DEX_REGISTEEL, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_FLYGON, + NATIONAL_DEX_TROPIUS, + NATIONAL_DEX_LATIOS, + NATIONAL_DEX_SUICUNE, + NATIONAL_DEX_MOLTRES, + NATIONAL_DEX_VENUSAUR, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_SLOWKING, + NATIONAL_DEX_TYRANITAR, + NATIONAL_DEX_SLAKING, + NATIONAL_DEX_WAILMER, + NATIONAL_DEX_MEWTWO, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_SNORLAX, + NATIONAL_DEX_MANTINE, + NATIONAL_DEX_ENTEI, + NATIONAL_DEX_DRAGONITE, + NATIONAL_DEX_KANGASKHAN, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_FERALIGATR, + NATIONAL_DEX_LAPRAS, + NATIONAL_DEX_SEVIPER, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_GROUDON, + NATIONAL_DEX_HO_OH, + NATIONAL_DEX_DRAGONAIR, + NATIONAL_DEX_KYOGRE, + NATIONAL_DEX_LUGIA, + NATIONAL_DEX_MILOTIC, + NATIONAL_DEX_GYARADOS, + NATIONAL_DEX_RAYQUAZA, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_WAILORD, +}; diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index f14478863..3ad9a97c6 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -1,6 +1,3 @@ -#ifndef GUARD_TMHM_LEARNSETS_H -#define GUARD_TMHM_LEARNSETS_H - #define TMHM_LEARNSET(moves) {(u32)(moves), ((u64)(moves) >> 32)} #define TMHM(tmhm) ((u64)1 << (ITEM_##tmhm - ITEM_TM01_FOCUS_PUNCH)) @@ -9389,5 +9386,3 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM05_FLASH)), }; - -#endif // GUARD_TMHM_LEARNSETS_H diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index 90ceec811..e8bd68177 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -1,176 +1,172 @@ -#ifndef POKEEMERALD_TRAINER_CLASS_LOOKUPS_H -#define POKEEMERALD_TRAINER_CLASS_LOOKUPS_H - const u8 gFacilityClassToPicIndex[] = { - TRAINER_PIC_HIKER, // FACILITY_CLASS_HIKER - TRAINER_PIC_AQUA_GRUNT_M, // FACILITY_CLASS_TEAM_AQUA_1 - TRAINER_PIC_POKEMON_BREEDER_F, // FACILITY_CLASS_PKMN_BREEDER_1 - TRAINER_PIC_COOL_TRAINER_M, // FACILITY_CLASS_COOLTRAINER_M - TRAINER_PIC_BIRD_KEEPER, // FACILITY_CLASS_BIRD_KEEPER - TRAINER_PIC_COLLECTOR, // FACILITY_CLASS_COLLECTOR - TRAINER_PIC_AQUA_GRUNT_F, // FACILITY_CLASS_TEAM_AQUA_2 - TRAINER_PIC_SWIMMER_M, // FACILITY_CLASS_SWIMMER_M - TRAINER_PIC_MAGMA_GRUNT_M, // FACILITY_CLASS_TEAM_MAGMA_1 - TRAINER_PIC_EXPERT_M, // FACILITY_CLASS_EXPERT_M - TRAINER_PIC_BLACK_BELT, // FACILITY_CLASS_BLACK_BELT - TRAINER_PIC_AQUA_LEADER_ARCHIE, // FACILITY_CLASS_AQUA_LEADER - TRAINER_PIC_HEX_MANIAC, // FACILITY_CLASS_HEX_MANIAC - TRAINER_PIC_AROMA_LADY, // FACILITY_CLASS_AROMA_LADY - TRAINER_PIC_RUIN_MANIAC, // FACILITY_CLASS_RUIN_MANIAC - TRAINER_PIC_INTERVIEWER, // FACILITY_CLASS_INTERVIEWER - TRAINER_PIC_TUBER_F, // FACILITY_CLASS_TUBER_1 - TRAINER_PIC_TUBER_M, // FACILITY_CLASS_TUBER_2 - TRAINER_PIC_COOL_TRAINER_F, // FACILITY_CLASS_COOLTRAINER_F - TRAINER_PIC_LADY, // FACILITY_CLASS_LADY - TRAINER_PIC_BEAUTY, // FACILITY_CLASS_BEAUTY - TRAINER_PIC_RICH_BOY, // FACILITY_CLASS_RICH_BOY - TRAINER_PIC_EXPERT_F, // FACILITY_CLASS_EXPERT_2 - TRAINER_PIC_POKEMANIAC, // FACILITY_CLASS_POKEMANIAC - TRAINER_PIC_MAGMA_GRUNT_F, // FACILITY_CLASS_TEAM_MAGMA_2 - TRAINER_PIC_GUITARIST, // FACILITY_CLASS_GUITARIST - TRAINER_PIC_KINDLER, // FACILITY_CLASS_KINDLER - TRAINER_PIC_CAMPER, // FACILITY_CLASS_CAMPER - TRAINER_PIC_PICNICKER, // FACILITY_CLASS_PICNICKER - TRAINER_PIC_BUG_MANIAC, // FACILITY_CLASS_BUG_MANIAC - TRAINER_PIC_PSYCHIC_M, // FACILITY_CLASS_PSYCHIC_M - TRAINER_PIC_PSYCHIC_F, // FACILITY_CLASS_PSYCHIC_F - TRAINER_PIC_GENTLEMAN, // FACILITY_CLASS_GENTLEMAN - TRAINER_PIC_ELITE_FOUR_SIDNEY, // FACILITY_CLASS_ELITE_FOUR_1 - TRAINER_PIC_ELITE_FOUR_PHOEBE, // FACILITY_CLASS_ELITE_FOUR_2 - TRAINER_PIC_LEADER_ROXANNE, // FACILITY_CLASS_LEADER_1 - TRAINER_PIC_LEADER_BRAWLY, // FACILITY_CLASS_LEADER_2 - TRAINER_PIC_LEADER_TATE_AND_LIZA, // FACILITY_CLASS_LEADER_3 - TRAINER_PIC_SCHOOL_KID_M, // FACILITY_CLASS_SCHOOL_KID_M - TRAINER_PIC_SCHOOL_KID_F, // FACILITY_CLASS_SCHOOL_KID_F - TRAINER_PIC_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR - TRAINER_PIC_POKEFAN_M, // FACILITY_CLASS_POKEFAN_1 - TRAINER_PIC_POKEFAN_F, // FACILITY_CLASS_POKEFAN_2 - TRAINER_PIC_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER - TRAINER_PIC_CHAMPION_WALLACE, // FACILITY_CLASS_CHAMPION - TRAINER_PIC_FISHERMAN, // FACILITY_CLASS_FISHERMAN - TRAINER_PIC_CYCLING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_1 - TRAINER_PIC_CYCLING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_2 - TRAINER_PIC_RUNNING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_3 - TRAINER_PIC_RUNNING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_4 - TRAINER_PIC_SWIMMING_TRIATHLETE_M, // FACILITY_CLASS_TRIATHLETE_5 - TRAINER_PIC_SWIMMING_TRIATHLETE_F, // FACILITY_CLASS_TRIATHLETE_6 - TRAINER_PIC_DRAGON_TAMER, // FACILITY_CLASS_DRAGON_TAMER - TRAINER_PIC_NINJA_BOY, // FACILITY_CLASS_NINJA_BOY - TRAINER_PIC_BATTLE_GIRL, // FACILITY_CLASS_BATTLE_GIRL - TRAINER_PIC_PARASOL_LADY, // FACILITY_CLASS_PARASOL_LADY - TRAINER_PIC_SWIMMER_F, // FACILITY_CLASS_SWIMMER_F - TRAINER_PIC_TWINS, // FACILITY_CLASS_TWINS - TRAINER_PIC_SAILOR, // FACILITY_CLASS_SAILOR - TRAINER_PIC_WALLY, // FACILITY_CLASS_PKMN_TRAINER_1 - TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_BRENDAN - TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_3 - TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_4 - TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_MAY - TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_6 - TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_7 - TRAINER_PIC_POKEMON_BREEDER_M, // FACILITY_CLASS_PKMN_BREEDER_2 - TRAINER_PIC_BUG_CATCHER, // FACILITY_CLASS_BUG_CATCHER - TRAINER_PIC_POKEMON_RANGER_M, // FACILITY_CLASS_PKMN_RANGER_M - TRAINER_PIC_POKEMON_RANGER_F, // FACILITY_CLASS_PKMN_RANGER_F - TRAINER_PIC_MAGMA_LEADER_MAXIE, // FACILITY_CLASS_MAGMA_LEADER - TRAINER_PIC_LASS, // FACILITY_CLASS_LASS - TRAINER_PIC_YOUNG_COUPLE, // FACILITY_CLASS_YOUNG_COUPLE - TRAINER_PIC_OLD_COUPLE, // FACILITY_CLASS_OLD_COUPLE - TRAINER_PIC_SIS_AND_BRO, // FACILITY_CLASS_SIS_AND_BRO - TRAINER_PIC_STEVEN, // FACILITY_CLASS_PKMN_TRAINER_STEVEN - TRAINER_PIC_SALON_MAIDEN_ANABEL, // FACILITY_CLASS_SALON_MAIDEN - TRAINER_PIC_DOME_ACE_TUCKER, // FACILITY_CLASS_DOME_ACE - TRAINER_PIC_RED, // FACILITY_CLASS_PKMN_TRAINER_RED - TRAINER_PIC_LEAF, // FACILITY_CLASS_PKMN_TRAINER_LEAF - TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN - TRAINER_PIC_RUBY_SAPPHIRE_MAY, // FACILITY_CLASS_PKMN_TRAINER_RS_MAY + [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER, + [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_PIC_AQUA_GRUNT_M, + [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_PIC_POKEMON_BREEDER_F, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOL_TRAINER_M, + [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER, + [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR, + [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_PIC_AQUA_GRUNT_F, + [FACILITY_CLASS_SWIMMER_M] = TRAINER_PIC_SWIMMER_M, + [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_PIC_MAGMA_GRUNT_M, + [FACILITY_CLASS_EXPERT_M] = TRAINER_PIC_EXPERT_M, + [FACILITY_CLASS_BLACK_BELT] = TRAINER_PIC_BLACK_BELT, + [FACILITY_CLASS_AQUA_LEADER] = TRAINER_PIC_AQUA_LEADER_ARCHIE, + [FACILITY_CLASS_HEX_MANIAC] = TRAINER_PIC_HEX_MANIAC, + [FACILITY_CLASS_AROMA_LADY] = TRAINER_PIC_AROMA_LADY, + [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_PIC_RUIN_MANIAC, + [FACILITY_CLASS_INTERVIEWER] = TRAINER_PIC_INTERVIEWER, + [FACILITY_CLASS_TUBER_1] = TRAINER_PIC_TUBER_F, + [FACILITY_CLASS_TUBER_2] = TRAINER_PIC_TUBER_M, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOL_TRAINER_F, + [FACILITY_CLASS_LADY] = TRAINER_PIC_LADY, + [FACILITY_CLASS_BEAUTY] = TRAINER_PIC_BEAUTY, + [FACILITY_CLASS_RICH_BOY] = TRAINER_PIC_RICH_BOY, + [FACILITY_CLASS_EXPERT_2] = TRAINER_PIC_EXPERT_F, + [FACILITY_CLASS_POKEMANIAC] = TRAINER_PIC_POKEMANIAC, + [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_PIC_MAGMA_GRUNT_F, + [FACILITY_CLASS_GUITARIST] = TRAINER_PIC_GUITARIST, + [FACILITY_CLASS_KINDLER] = TRAINER_PIC_KINDLER, + [FACILITY_CLASS_CAMPER] = TRAINER_PIC_CAMPER, + [FACILITY_CLASS_PICNICKER] = TRAINER_PIC_PICNICKER, + [FACILITY_CLASS_BUG_MANIAC] = TRAINER_PIC_BUG_MANIAC, + [FACILITY_CLASS_PSYCHIC_M] = TRAINER_PIC_PSYCHIC_M, + [FACILITY_CLASS_PSYCHIC_F] = TRAINER_PIC_PSYCHIC_F, + [FACILITY_CLASS_GENTLEMAN] = TRAINER_PIC_GENTLEMAN, + [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_PIC_ELITE_FOUR_SIDNEY, + [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_PIC_ELITE_FOUR_PHOEBE, + [FACILITY_CLASS_LEADER_1] = TRAINER_PIC_LEADER_ROXANNE, + [FACILITY_CLASS_LEADER_2] = TRAINER_PIC_LEADER_BRAWLY, + [FACILITY_CLASS_LEADER_3] = TRAINER_PIC_LEADER_TATE_AND_LIZA, + [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_PIC_SCHOOL_KID_M, + [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_PIC_SCHOOL_KID_F, + [FACILITY_CLASS_SR_AND_JR] = TRAINER_PIC_SR_AND_JR, + [FACILITY_CLASS_POKEFAN_1] = TRAINER_PIC_POKEFAN_M, + [FACILITY_CLASS_POKEFAN_2] = TRAINER_PIC_POKEFAN_F, + [FACILITY_CLASS_YOUNGSTER] = TRAINER_PIC_YOUNGSTER, + [FACILITY_CLASS_CHAMPION] = TRAINER_PIC_CHAMPION_WALLACE, + [FACILITY_CLASS_FISHERMAN] = TRAINER_PIC_FISHERMAN, + [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_PIC_CYCLING_TRIATHLETE_M, + [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_PIC_CYCLING_TRIATHLETE_F, + [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_PIC_RUNNING_TRIATHLETE_M, + [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_PIC_RUNNING_TRIATHLETE_F, + [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_PIC_SWIMMING_TRIATHLETE_M, + [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_PIC_SWIMMING_TRIATHLETE_F, + [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_PIC_DRAGON_TAMER, + [FACILITY_CLASS_NINJA_BOY] = TRAINER_PIC_NINJA_BOY, + [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_PIC_BATTLE_GIRL, + [FACILITY_CLASS_PARASOL_LADY] = TRAINER_PIC_PARASOL_LADY, + [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F, + [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS, + [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR, + [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_PIC_WALLY, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_PIC_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_PIC_MAY, + [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_PIC_POKEMON_BREEDER_M, + [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER, + [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M, + [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_PIC_POKEMON_RANGER_F, + [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_PIC_MAGMA_LEADER_MAXIE, + [FACILITY_CLASS_LASS] = TRAINER_PIC_LASS, + [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_PIC_YOUNG_COUPLE, + [FACILITY_CLASS_OLD_COUPLE] = TRAINER_PIC_OLD_COUPLE, + [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_PIC_SIS_AND_BRO, + [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_PIC_STEVEN, + [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_PIC_SALON_MAIDEN_ANABEL, + [FACILITY_CLASS_DOME_ACE] = TRAINER_PIC_DOME_ACE_TUCKER, + [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_PIC_RED, + [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_PIC_LEAF, + [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, + [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_PIC_RUBY_SAPPHIRE_MAY, }; const u8 gFacilityClassToTrainerClass[] = { - TRAINER_CLASS_HIKER, // FACILITY_CLASS_HIKER - TRAINER_CLASS_TEAM_AQUA, // FACILITY_CLASS_TEAM_AQUA_1 - TRAINER_CLASS_PKMN_BREEDER, // FACILITY_CLASS_PKMN_BREEDER_1 - TRAINER_CLASS_COOLTRAINER_1, // FACILITY_CLASS_COOLTRAINER_M - TRAINER_CLASS_BIRD_KEEPER, // FACILITY_CLASS_BIRD_KEEPER - TRAINER_CLASS_COLLECTOR, // FACILITY_CLASS_COLLECTOR - TRAINER_CLASS_TEAM_AQUA, // FACILITY_CLASS_TEAM_AQUA_2 - TRAINER_CLASS_SWIMMER_M, // FACILITY_CLASS_SWIMMER_M - TRAINER_CLASS_TEAM_MAGMA, // FACILITY_CLASS_TEAM_MAGMA_1 - TRAINER_CLASS_EXPERT, // FACILITY_CLASS_EXPERT_M - TRAINER_CLASS_BLACK_BELT, // FACILITY_CLASS_BLACK_BELT - TRAINER_CLASS_AQUA_LEADER, // FACILITY_CLASS_AQUA_LEADER - TRAINER_CLASS_HEX_MANIAC, // FACILITY_CLASS_HEX_MANIAC - TRAINER_CLASS_AROMA_LADY, // FACILITY_CLASS_AROMA_LADY - TRAINER_CLASS_RUIN_MANIAC, // FACILITY_CLASS_RUIN_MANIAC - TRAINER_CLASS_INTERVIEWER, // FACILITY_CLASS_INTERVIEWER - TRAINER_CLASS_TUBER_1, // FACILITY_CLASS_TUBER_1 - TRAINER_CLASS_TUBER_2, // FACILITY_CLASS_TUBER_2 - TRAINER_CLASS_COOLTRAINER_1, // FACILITY_CLASS_COOLTRAINER_F - TRAINER_CLASS_LADY, // FACILITY_CLASS_LADY - TRAINER_CLASS_BEAUTY, // FACILITY_CLASS_BEAUTY - TRAINER_CLASS_RICH_BOY, // FACILITY_CLASS_RICH_BOY - TRAINER_CLASS_EXPERT, // FACILITY_CLASS_EXPERT_2 - TRAINER_CLASS_POKEMANIAC, // FACILITY_CLASS_POKEMANIAC - TRAINER_CLASS_TEAM_MAGMA, // FACILITY_CLASS_TEAM_MAGMA_2 - TRAINER_CLASS_GUITARIST, // FACILITY_CLASS_GUITARIST - TRAINER_CLASS_KINDLER, // FACILITY_CLASS_KINDLER - TRAINER_CLASS_CAMPER, // FACILITY_CLASS_CAMPER - TRAINER_CLASS_PICNICKER, // FACILITY_CLASS_PICNICKER - TRAINER_CLASS_BUG_MANIAC, // FACILITY_CLASS_BUG_MANIAC - TRAINER_CLASS_PSYCHIC, // FACILITY_CLASS_PSYCHIC_M - TRAINER_CLASS_PSYCHIC, // FACILITY_CLASS_PSYCHIC_F - TRAINER_CLASS_GENTLEMAN, // FACILITY_CLASS_GENTLEMAN - TRAINER_CLASS_ELITE_FOUR, // FACILITY_CLASS_ELITE_FOUR_1 - TRAINER_CLASS_ELITE_FOUR, // FACILITY_CLASS_ELITE_FOUR_2 - TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_1 - TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_2 - TRAINER_CLASS_LEADER, // FACILITY_CLASS_LEADER_3 - TRAINER_CLASS_SCHOOL_KID, // FACILITY_CLASS_SCHOOL_KID_M - TRAINER_CLASS_SCHOOL_KID, // FACILITY_CLASS_SCHOOL_KID_F - TRAINER_CLASS_SR_AND_JR, // FACILITY_CLASS_SR_AND_JR - TRAINER_CLASS_POKEFAN, // FACILITY_CLASS_POKEFAN_1 - TRAINER_CLASS_POKEFAN, // FACILITY_CLASS_POKEFAN_2 - TRAINER_CLASS_YOUNGSTER, // FACILITY_CLASS_YOUNGSTER - TRAINER_CLASS_CHAMPION, // FACILITY_CLASS_CHAMPION - TRAINER_CLASS_FISHERMAN, // FACILITY_CLASS_FISHERMAN - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_1 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_2 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_3 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_4 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_5 - TRAINER_CLASS_TRIATHLETE, // FACILITY_CLASS_TRIATHLETE_6 - TRAINER_CLASS_DRAGON_TAMER, // FACILITY_CLASS_DRAGON_TAMER - TRAINER_CLASS_NINJA_BOY, // FACILITY_CLASS_NINJA_BOY - TRAINER_CLASS_BATTLE_GIRL, // FACILITY_CLASS_BATTLE_GIRL - TRAINER_CLASS_PARASOL_LADY, // FACILITY_CLASS_PARASOL_LADY - TRAINER_CLASS_SWIMMER_F, // FACILITY_CLASS_SWIMMER_F - TRAINER_CLASS_TWINS, // FACILITY_CLASS_TWINS - TRAINER_CLASS_SAILOR, // FACILITY_CLASS_SAILOR - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_1 - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_MAY - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_3 - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_4 - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_BRENDAN - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_6 - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_7 - TRAINER_CLASS_PKMN_BREEDER, // FACILITY_CLASS_PKMN_BREEDER_2 - TRAINER_CLASS_BUG_CATCHER, // FACILITY_CLASS_BUG_CATCHER - TRAINER_CLASS_PKMN_RANGER, // FACILITY_CLASS_PKMN_RANGER_M - TRAINER_CLASS_PKMN_RANGER, // FACILITY_CLASS_PKMN_RANGER_F - TRAINER_CLASS_MAGMA_LEADER, // FACILITY_CLASS_MAGMA_LEADER - TRAINER_CLASS_LASS, // FACILITY_CLASS_LASS - TRAINER_CLASS_YOUNG_COUPLE, // FACILITY_CLASS_YOUNG_COUPLE - TRAINER_CLASS_OLD_COUPLE, // FACILITY_CLASS_OLD_COUPLE - TRAINER_CLASS_SIS_AND_BRO, // FACILITY_CLASS_SIS_AND_BRO - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_STEVEN - TRAINER_CLASS_SALON_MAIDEN, // FACILITY_CLASS_SALON_MAIDEN - TRAINER_CLASS_DOME_ACE, // FACILITY_CLASS_DOME_ACE - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_RED - TRAINER_CLASS_PKMN_TRAINER_3, // FACILITY_CLASS_PKMN_TRAINER_LEAF - TRAINER_CLASS_PKMN_TRAINER_4, // FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN - TRAINER_CLASS_PKMN_TRAINER_4, // FACILITY_CLASS_PKMN_TRAINER_RS_MAY + [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER, + [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER_1, + [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER, + [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR, + [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_CLASS_TEAM_AQUA, + [FACILITY_CLASS_SWIMMER_M] = TRAINER_CLASS_SWIMMER_M, + [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_EXPERT_M] = TRAINER_CLASS_EXPERT, + [FACILITY_CLASS_BLACK_BELT] = TRAINER_CLASS_BLACK_BELT, + [FACILITY_CLASS_AQUA_LEADER] = TRAINER_CLASS_AQUA_LEADER, + [FACILITY_CLASS_HEX_MANIAC] = TRAINER_CLASS_HEX_MANIAC, + [FACILITY_CLASS_AROMA_LADY] = TRAINER_CLASS_AROMA_LADY, + [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_CLASS_RUIN_MANIAC, + [FACILITY_CLASS_INTERVIEWER] = TRAINER_CLASS_INTERVIEWER, + [FACILITY_CLASS_TUBER_1] = TRAINER_CLASS_TUBER_1, + [FACILITY_CLASS_TUBER_2] = TRAINER_CLASS_TUBER_2, + [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER_1, + [FACILITY_CLASS_LADY] = TRAINER_CLASS_LADY, + [FACILITY_CLASS_BEAUTY] = TRAINER_CLASS_BEAUTY, + [FACILITY_CLASS_RICH_BOY] = TRAINER_CLASS_RICH_BOY, + [FACILITY_CLASS_EXPERT_2] = TRAINER_CLASS_EXPERT, + [FACILITY_CLASS_POKEMANIAC] = TRAINER_CLASS_POKEMANIAC, + [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_CLASS_TEAM_MAGMA, + [FACILITY_CLASS_GUITARIST] = TRAINER_CLASS_GUITARIST, + [FACILITY_CLASS_KINDLER] = TRAINER_CLASS_KINDLER, + [FACILITY_CLASS_CAMPER] = TRAINER_CLASS_CAMPER, + [FACILITY_CLASS_PICNICKER] = TRAINER_CLASS_PICNICKER, + [FACILITY_CLASS_BUG_MANIAC] = TRAINER_CLASS_BUG_MANIAC, + [FACILITY_CLASS_PSYCHIC_M] = TRAINER_CLASS_PSYCHIC, + [FACILITY_CLASS_PSYCHIC_F] = TRAINER_CLASS_PSYCHIC, + [FACILITY_CLASS_GENTLEMAN] = TRAINER_CLASS_GENTLEMAN, + [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_CLASS_ELITE_FOUR, + [FACILITY_CLASS_LEADER_1] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_2] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_LEADER_3] = TRAINER_CLASS_LEADER, + [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_CLASS_SCHOOL_KID, + [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_CLASS_SCHOOL_KID, + [FACILITY_CLASS_SR_AND_JR] = TRAINER_CLASS_SR_AND_JR, + [FACILITY_CLASS_POKEFAN_1] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_POKEFAN_2] = TRAINER_CLASS_POKEFAN, + [FACILITY_CLASS_YOUNGSTER] = TRAINER_CLASS_YOUNGSTER, + [FACILITY_CLASS_CHAMPION] = TRAINER_CLASS_CHAMPION, + [FACILITY_CLASS_FISHERMAN] = TRAINER_CLASS_FISHERMAN, + [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_CLASS_TRIATHLETE, + [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_CLASS_DRAGON_TAMER, + [FACILITY_CLASS_NINJA_BOY] = TRAINER_CLASS_NINJA_BOY, + [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_CLASS_BATTLE_GIRL, + [FACILITY_CLASS_PARASOL_LADY] = TRAINER_CLASS_PARASOL_LADY, + [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F, + [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS, + [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR, + [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_CLASS_PKMN_BREEDER, + [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER, + [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER, + [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_CLASS_PKMN_RANGER, + [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_CLASS_MAGMA_LEADER, + [FACILITY_CLASS_LASS] = TRAINER_CLASS_LASS, + [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_CLASS_YOUNG_COUPLE, + [FACILITY_CLASS_OLD_COUPLE] = TRAINER_CLASS_OLD_COUPLE, + [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_CLASS_SIS_AND_BRO, + [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_CLASS_SALON_MAIDEN, + [FACILITY_CLASS_DOME_ACE] = TRAINER_CLASS_DOME_ACE, + [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3, + [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4, + [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4, }; -#endif //POKEEMERALD_TRAINER_CLASS_LOOKUPS_H diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 29d0ff32e..ab64c6f20 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1,443 +1,444 @@ const struct MonCoords gMonBackPicCoords[] = { - {0x88, 0x00}, // SPECIES_NONE - {0x64, 0x10}, // SPECIES_BULBASAUR - {0x66, 0x09}, // SPECIES_IVYSAUR - {0x87, 0x07}, // SPECIES_VENUSAUR - {0x65, 0x0e}, // SPECIES_CHARMANDER - {0x66, 0x09}, // SPECIES_CHARMELEON - {0x87, 0x04}, // SPECIES_CHARIZARD - {0x65, 0x0e}, // SPECIES_SQUIRTLE - {0x76, 0x0a}, // SPECIES_WARTORTLE - {0x86, 0x08}, // SPECIES_BLASTOISE - {0x55, 0x0f}, // SPECIES_CATERPIE - {0x65, 0x0c}, // SPECIES_METAPOD - {0x87, 0x06}, // SPECIES_BUTTERFREE - {0x56, 0x0b}, // SPECIES_WEEDLE - {0x46, 0x0a}, // SPECIES_KAKUNA - {0x86, 0x09}, // SPECIES_BEEDRILL - {0x66, 0x08}, // SPECIES_PIDGEY - {0x85, 0x0c}, // SPECIES_PIDGEOTTO - {0x78, 0x02}, // SPECIES_PIDGEOT - {0x65, 0x0d}, // SPECIES_RATTATA - {0x75, 0x0d}, // SPECIES_RATICATE - {0x65, 0x0c}, // SPECIES_SPEAROW - {0x87, 0x05}, // SPECIES_FEAROW - {0x66, 0x09}, // SPECIES_EKANS - {0x77, 0x04}, // SPECIES_ARBOK - {0x77, 0x07}, // SPECIES_PIKACHU - {0x66, 0x08}, // SPECIES_RAICHU - {0x65, 0x0d}, // SPECIES_SANDSHREW - {0x86, 0x09}, // SPECIES_SANDSLASH - {0x55, 0x0c}, // SPECIES_NIDORAN_F - {0x86, 0x0a}, // SPECIES_NIDORINA - {0x77, 0x06}, // SPECIES_NIDOQUEEN - {0x56, 0x08}, // SPECIES_NIDORAN_M - {0x86, 0x09}, // SPECIES_NIDORINO - {0x88, 0x03}, // SPECIES_NIDOKING - {0x65, 0x0d}, // SPECIES_CLEFAIRY - {0x76, 0x0a}, // SPECIES_CLEFABLE - {0x76, 0x09}, // SPECIES_VULPIX - {0x77, 0x05}, // SPECIES_NINETALES - {0x65, 0x0d}, // SPECIES_JIGGLYPUFF - {0x66, 0x08}, // SPECIES_WIGGLYTUFF - {0x76, 0x0b}, // SPECIES_ZUBAT - {0x87, 0x06}, // SPECIES_GOLBAT - {0x56, 0x0b}, // SPECIES_ODDISH - {0x66, 0x0a}, // SPECIES_GLOOM - {0x87, 0x07}, // SPECIES_VILEPLUME - {0x63, 0x14}, // SPECIES_PARAS - {0x87, 0x07}, // SPECIES_PARASECT - {0x77, 0x06}, // SPECIES_VENONAT - {0x77, 0x04}, // SPECIES_VENOMOTH - {0x54, 0x10}, // SPECIES_DIGLETT - {0x66, 0x0b}, // SPECIES_DUGTRIO - {0x65, 0x0c}, // SPECIES_MEOWTH - {0x87, 0x07}, // SPECIES_PERSIAN - {0x67, 0x07}, // SPECIES_PSYDUCK - {0x77, 0x05}, // SPECIES_GOLDUCK - {0x76, 0x0b}, // SPECIES_MANKEY - {0x77, 0x07}, // SPECIES_PRIMEAPE - {0x66, 0x08}, // SPECIES_GROWLITHE - {0x87, 0x06}, // SPECIES_ARCANINE - {0x74, 0x10}, // SPECIES_POLIWAG - {0x65, 0x0c}, // SPECIES_POLIWHIRL - {0x86, 0x0b}, // SPECIES_POLIWRATH - {0x66, 0x0b}, // SPECIES_ABRA - {0x76, 0x08}, // SPECIES_KADABRA - {0x67, 0x05}, // SPECIES_ALAKAZAM - {0x65, 0x0c}, // SPECIES_MACHOP - {0x76, 0x09}, // SPECIES_MACHOKE - {0x67, 0x04}, // SPECIES_MACHAMP - {0x66, 0x0a}, // SPECIES_BELLSPROUT - {0x66, 0x09}, // SPECIES_WEEPINBELL - {0x87, 0x06}, // SPECIES_VICTREEBEL - {0x56, 0x0a}, // SPECIES_TENTACOOL - {0x86, 0x0b}, // SPECIES_TENTACRUEL - {0x66, 0x0b}, // SPECIES_GEODUDE - {0x75, 0x0c}, // SPECIES_GRAVELER - {0x84, 0x10}, // SPECIES_GOLEM - {0x66, 0x09}, // SPECIES_PONYTA - {0x87, 0x05}, // SPECIES_RAPIDASH - {0x85, 0x0e}, // SPECIES_SLOWPOKE - {0x86, 0x0a}, // SPECIES_SLOWBRO - {0x43, 0x14}, // SPECIES_MAGNEMITE - {0x66, 0x0a}, // SPECIES_MAGNETON - {0x66, 0x0a}, // SPECIES_FARFETCHD - {0x66, 0x08}, // SPECIES_DODUO - {0x88, 0x01}, // SPECIES_DODRIO - {0x66, 0x0a}, // SPECIES_SEEL - {0x77, 0x05}, // SPECIES_DEWGONG - {0x75, 0x0c}, // SPECIES_GRIMER - {0x87, 0x05}, // SPECIES_MUK - {0x76, 0x0b}, // SPECIES_SHELLDER - {0x87, 0x06}, // SPECIES_CLOYSTER - {0x85, 0x0e}, // SPECIES_GASTLY - {0x76, 0x08}, // SPECIES_HAUNTER - {0x76, 0x09}, // SPECIES_GENGAR - {0x78, 0x00}, // SPECIES_ONIX - {0x65, 0x0d}, // SPECIES_DROWZEE - {0x66, 0x09}, // SPECIES_HYPNO - {0x66, 0x0a}, // SPECIES_KRABBY - {0x77, 0x04}, // SPECIES_KINGLER - {0x55, 0x0e}, // SPECIES_VOLTORB - {0x65, 0x0d}, // SPECIES_ELECTRODE - {0x65, 0x0d}, // SPECIES_EXEGGCUTE - {0x87, 0x04}, // SPECIES_EXEGGUTOR - {0x66, 0x0a}, // SPECIES_CUBONE - {0x66, 0x08}, // SPECIES_MAROWAK - {0x65, 0x0c}, // SPECIES_HITMONLEE - {0x65, 0x0c}, // SPECIES_HITMONCHAN - {0x65, 0x0e}, // SPECIES_LICKITUNG - {0x66, 0x09}, // SPECIES_KOFFING - {0x77, 0x06}, // SPECIES_WEEZING - {0x85, 0x0c}, // SPECIES_RHYHORN - {0x88, 0x03}, // SPECIES_RHYDON - {0x86, 0x0b}, // SPECIES_CHANSEY - {0x85, 0x0e}, // SPECIES_TANGELA - {0x77, 0x05}, // SPECIES_KANGASKHAN - {0x66, 0x09}, // SPECIES_HORSEA - {0x66, 0x08}, // SPECIES_SEADRA - {0x66, 0x08}, // SPECIES_GOLDEEN - {0x76, 0x0b}, // SPECIES_SEAKING - {0x65, 0x0d}, // SPECIES_STARYU - {0x85, 0x0e}, // SPECIES_STARMIE - {0x85, 0x0d}, // SPECIES_MR_MIME - {0x77, 0x07}, // SPECIES_SCYTHER - {0x86, 0x0a}, // SPECIES_JYNX - {0x66, 0x08}, // SPECIES_ELECTABUZZ - {0x66, 0x08}, // SPECIES_MAGMAR - {0x66, 0x09}, // SPECIES_PINSIR - {0x85, 0x0d}, // SPECIES_TAUROS - {0x76, 0x09}, // SPECIES_MAGIKARP - {0x78, 0x00}, // SPECIES_GYARADOS - {0x77, 0x04}, // SPECIES_LAPRAS - {0x54, 0x11}, // SPECIES_DITTO - {0x66, 0x0a}, // SPECIES_EEVEE - {0x66, 0x0a}, // SPECIES_VAPOREON - {0x87, 0x06}, // SPECIES_JOLTEON - {0x67, 0x05}, // SPECIES_FLAREON - {0x65, 0x0d}, // SPECIES_PORYGON - {0x66, 0x0a}, // SPECIES_OMANYTE - {0x66, 0x08}, // SPECIES_OMASTAR - {0x65, 0x0d}, // SPECIES_KABUTO - {0x77, 0x05}, // SPECIES_KABUTOPS - {0x86, 0x08}, // SPECIES_AERODACTYL - {0x86, 0x0b}, // SPECIES_SNORLAX - {0x65, 0x0c}, // SPECIES_ARTICUNO - {0x76, 0x0b}, // SPECIES_ZAPDOS - {0x87, 0x04}, // SPECIES_MOLTRES - {0x66, 0x09}, // SPECIES_DRATINI - {0x78, 0x00}, // SPECIES_DRAGONAIR - {0x87, 0x06}, // SPECIES_DRAGONITE - {0x78, 0x01}, // SPECIES_MEWTWO - {0x66, 0x08}, // SPECIES_MEW - {0x56, 0x0a}, // SPECIES_CHIKORITA - {0x66, 0x08}, // SPECIES_BAYLEEF - {0x78, 0x00}, // SPECIES_MEGANIUM - {0x76, 0x09}, // SPECIES_CYNDAQUIL - {0x87, 0x04}, // SPECIES_QUILAVA - {0x87, 0x04}, // SPECIES_TYPHLOSION - {0x66, 0x0b}, // SPECIES_TOTODILE - {0x67, 0x07}, // SPECIES_CROCONAW - {0x88, 0x01}, // SPECIES_FERALIGATR - {0x67, 0x05}, // SPECIES_SENTRET - {0x66, 0x08}, // SPECIES_FURRET - {0x66, 0x08}, // SPECIES_HOOTHOOT - {0x68, 0x03}, // SPECIES_NOCTOWL - {0x76, 0x0b}, // SPECIES_LEDYBA - {0x77, 0x07}, // SPECIES_LEDIAN - {0x73, 0x15}, // SPECIES_SPINARAK - {0x86, 0x0b}, // SPECIES_ARIADOS - {0x87, 0x05}, // SPECIES_CROBAT - {0x86, 0x08}, // SPECIES_CHINCHOU - {0x86, 0x08}, // SPECIES_LANTURN - {0x66, 0x0b}, // SPECIES_PICHU - {0x65, 0x0f}, // SPECIES_CLEFFA - {0x66, 0x0b}, // SPECIES_IGGLYBUFF - {0x54, 0x10}, // SPECIES_TOGEPI - {0x66, 0x08}, // SPECIES_TOGETIC - {0x54, 0x11}, // SPECIES_NATU - {0x76, 0x08}, // SPECIES_XATU - {0x66, 0x09}, // SPECIES_MAREEP - {0x66, 0x09}, // SPECIES_FLAAFFY - {0x88, 0x01}, // SPECIES_AMPHAROS - {0x66, 0x0b}, // SPECIES_BELLOSSOM - {0x75, 0x0c}, // SPECIES_MARILL - {0x86, 0x08}, // SPECIES_AZUMARILL - {0x66, 0x08}, // SPECIES_SUDOWOODO - {0x66, 0x09}, // SPECIES_POLITOED - {0x66, 0x0b}, // SPECIES_HOPPIP - {0x65, 0x0d}, // SPECIES_SKIPLOOM - {0x87, 0x04}, // SPECIES_JUMPLUFF - {0x66, 0x09}, // SPECIES_AIPOM - {0x56, 0x0a}, // SPECIES_SUNKERN - {0x66, 0x08}, // SPECIES_SUNFLORA - {0x77, 0x04}, // SPECIES_YANMA - {0x85, 0x0f}, // SPECIES_WOOPER - {0x76, 0x08}, // SPECIES_QUAGSIRE - {0x76, 0x0b}, // SPECIES_ESPEON - {0x87, 0x04}, // SPECIES_UMBREON - {0x66, 0x09}, // SPECIES_MURKROW - {0x66, 0x08}, // SPECIES_SLOWKING - {0x66, 0x0a}, // SPECIES_MISDREAVUS - {0x36, 0x08}, // SPECIES_UNOWN - {0x75, 0x0c}, // SPECIES_WOBBUFFET - {0x87, 0x05}, // SPECIES_GIRAFARIG - {0x65, 0x0f}, // SPECIES_PINECO - {0x84, 0x10}, // SPECIES_FORRETRESS - {0x85, 0x0f}, // SPECIES_DUNSPARCE - {0x87, 0x05}, // SPECIES_GLIGAR - {0x88, 0x00}, // SPECIES_STEELIX - {0x76, 0x0a}, // SPECIES_SNUBBULL - {0x87, 0x05}, // SPECIES_GRANBULL - {0x77, 0x07}, // SPECIES_QWILFISH - {0x77, 0x04}, // SPECIES_SCIZOR - {0x56, 0x0b}, // SPECIES_SHUCKLE - {0x77, 0x04}, // SPECIES_HERACROSS - {0x66, 0x08}, // SPECIES_SNEASEL - {0x66, 0x08}, // SPECIES_TEDDIURSA - {0x88, 0x03}, // SPECIES_URSARING - {0x66, 0x08}, // SPECIES_SLUGMA - {0x76, 0x09}, // SPECIES_MAGCARGO - {0x63, 0x15}, // SPECIES_SWINUB - {0x75, 0x0d}, // SPECIES_PILOSWINE - {0x65, 0x0c}, // SPECIES_CORSOLA - {0x75, 0x0d}, // SPECIES_REMORAID - {0x66, 0x0a}, // SPECIES_OCTILLERY - {0x67, 0x06}, // SPECIES_DELIBIRD - {0x87, 0x07}, // SPECIES_MANTINE - {0x87, 0x04}, // SPECIES_SKARMORY - {0x55, 0x0c}, // SPECIES_HOUNDOUR - {0x87, 0x07}, // SPECIES_HOUNDOOM - {0x87, 0x06}, // SPECIES_KINGDRA - {0x65, 0x0e}, // SPECIES_PHANPY - {0x85, 0x0d}, // SPECIES_DONPHAN - {0x76, 0x0a}, // SPECIES_PORYGON2 - {0x78, 0x03}, // SPECIES_STANTLER - {0x76, 0x0a}, // SPECIES_SMEARGLE - {0x66, 0x08}, // SPECIES_TYROGUE - {0x87, 0x05}, // SPECIES_HITMONTOP - {0x56, 0x09}, // SPECIES_SMOOCHUM - {0x66, 0x08}, // SPECIES_ELEKID - {0x66, 0x0b}, // SPECIES_MAGBY - {0x87, 0x07}, // SPECIES_MILTANK - {0x85, 0x0d}, // SPECIES_BLISSEY - {0x86, 0x0a}, // SPECIES_RAIKOU - {0x87, 0x06}, // SPECIES_ENTEI - {0x88, 0x03}, // SPECIES_SUICUNE - {0x66, 0x08}, // SPECIES_LARVITAR - {0x67, 0x05}, // SPECIES_PUPITAR - {0x88, 0x00}, // SPECIES_TYRANITAR - {0x88, 0x01}, // SPECIES_LUGIA - {0x88, 0x01}, // SPECIES_HO_OH - {0x66, 0x08}, // SPECIES_CELEBI - {0x88, 0x02}, // SPECIES_OLD_UNOWN_B - {0x88, 0x02}, // SPECIES_OLD_UNOWN_C - {0x88, 0x02}, // SPECIES_OLD_UNOWN_D - {0x88, 0x02}, // SPECIES_OLD_UNOWN_E - {0x88, 0x02}, // SPECIES_OLD_UNOWN_F - {0x88, 0x02}, // SPECIES_OLD_UNOWN_G - {0x88, 0x02}, // SPECIES_OLD_UNOWN_H - {0x88, 0x02}, // SPECIES_OLD_UNOWN_I - {0x88, 0x02}, // SPECIES_OLD_UNOWN_J - {0x88, 0x02}, // SPECIES_OLD_UNOWN_K - {0x88, 0x02}, // SPECIES_OLD_UNOWN_L - {0x88, 0x02}, // SPECIES_OLD_UNOWN_M - {0x88, 0x02}, // SPECIES_OLD_UNOWN_N - {0x88, 0x02}, // SPECIES_OLD_UNOWN_O - {0x88, 0x02}, // SPECIES_OLD_UNOWN_P - {0x88, 0x02}, // SPECIES_OLD_UNOWN_Q - {0x88, 0x02}, // SPECIES_OLD_UNOWN_R - {0x88, 0x02}, // SPECIES_OLD_UNOWN_S - {0x88, 0x02}, // SPECIES_OLD_UNOWN_T - {0x88, 0x02}, // SPECIES_OLD_UNOWN_U - {0x88, 0x02}, // SPECIES_OLD_UNOWN_V - {0x88, 0x02}, // SPECIES_OLD_UNOWN_W - {0x88, 0x02}, // SPECIES_OLD_UNOWN_X - {0x88, 0x02}, // SPECIES_OLD_UNOWN_Y - {0x88, 0x02}, // SPECIES_OLD_UNOWN_Z - {0x87, 0x06}, // SPECIES_TREECKO - {0x86, 0x08}, // SPECIES_GROVYLE - {0x88, 0x01}, // SPECIES_SCEPTILE - {0x67, 0x05}, // SPECIES_TORCHIC - {0x88, 0x00}, // SPECIES_COMBUSKEN - {0x88, 0x00}, // SPECIES_BLAZIKEN - {0x77, 0x05}, // SPECIES_MUDKIP - {0x87, 0x04}, // SPECIES_MARSHTOMP - {0x87, 0x05}, // SPECIES_SWAMPERT - {0x76, 0x09}, // SPECIES_POOCHYENA - {0x87, 0x04}, // SPECIES_MIGHTYENA - {0x76, 0x0b}, // SPECIES_ZIGZAGOON - {0x85, 0x0f}, // SPECIES_LINOONE - {0x76, 0x0b}, // SPECIES_WURMPLE - {0x83, 0x15}, // SPECIES_SILCOON - {0x88, 0x00}, // SPECIES_BEAUTIFLY - {0x73, 0x14}, // SPECIES_CASCOON - {0x83, 0x14}, // SPECIES_DUSTOX - {0x75, 0x0f}, // SPECIES_LOTAD - {0x86, 0x08}, // SPECIES_LOMBRE - {0x86, 0x0a}, // SPECIES_LUDICOLO - {0x86, 0x09}, // SPECIES_SEEDOT - {0x76, 0x0a}, // SPECIES_NUZLEAF - {0x86, 0x08}, // SPECIES_SHIFTRY - {0x83, 0x14}, // SPECIES_NINCADA - {0x86, 0x08}, // SPECIES_NINJASK - {0x77, 0x06}, // SPECIES_SHEDINJA - {0x64, 0x11}, // SPECIES_TAILLOW - {0x86, 0x08}, // SPECIES_SWELLOW - {0x85, 0x0d}, // SPECIES_SHROOMISH - {0x87, 0x04}, // SPECIES_BRELOOM - {0x77, 0x04}, // SPECIES_SPINDA - {0x85, 0x0e}, // SPECIES_WINGULL - {0x87, 0x06}, // SPECIES_PELIPPER - {0x86, 0x0b}, // SPECIES_SURSKIT - {0x88, 0x00}, // SPECIES_MASQUERAIN - {0x83, 0x15}, // SPECIES_WAILMER - {0x83, 0x16}, // SPECIES_WAILORD - {0x86, 0x0a}, // SPECIES_SKITTY - {0x86, 0x08}, // SPECIES_DELCATTY - {0x87, 0x06}, // SPECIES_KECLEON - {0x86, 0x08}, // SPECIES_BALTOY - {0x87, 0x07}, // SPECIES_CLAYDOL - {0x85, 0x0c}, // SPECIES_NOSEPASS - {0x86, 0x0a}, // SPECIES_TORKOAL - {0x76, 0x08}, // SPECIES_SABLEYE - {0x66, 0x0a}, // SPECIES_BARBOACH - {0x86, 0x0a}, // SPECIES_WHISCASH - {0x46, 0x0a}, // SPECIES_LUVDISC - {0x77, 0x07}, // SPECIES_CORPHISH - {0x87, 0x05}, // SPECIES_CRAWDAUNT - {0x67, 0x07}, // SPECIES_FEEBAS - {0x68, 0x02}, // SPECIES_MILOTIC - {0x87, 0x07}, // SPECIES_CARVANHA - {0x88, 0x02}, // SPECIES_SHARPEDO - {0x75, 0x0e}, // SPECIES_TRAPINCH - {0x74, 0x11}, // SPECIES_VIBRAVA - {0x88, 0x02}, // SPECIES_FLYGON - {0x76, 0x0b}, // SPECIES_MAKUHITA - {0x87, 0x07}, // SPECIES_HARIYAMA - {0x84, 0x10}, // SPECIES_ELECTRIKE - {0x87, 0x04}, // SPECIES_MANECTRIC - {0x86, 0x0b}, // SPECIES_NUMEL - {0x84, 0x13}, // SPECIES_CAMERUPT - {0x64, 0x12}, // SPECIES_SPHEAL - {0x86, 0x0a}, // SPECIES_SEALEO - {0x87, 0x06}, // SPECIES_WALREIN - {0x85, 0x0f}, // SPECIES_CACNEA - {0x87, 0x07}, // SPECIES_CACTURNE - {0x76, 0x0a}, // SPECIES_SNORUNT - {0x85, 0x0c}, // SPECIES_GLALIE - {0x87, 0x05}, // SPECIES_LUNATONE - {0x87, 0x05}, // SPECIES_SOLROCK - {0x86, 0x0a}, // SPECIES_AZURILL - {0x56, 0x0b}, // SPECIES_SPOINK - {0x87, 0x04}, // SPECIES_GRUMPIG - {0x76, 0x08}, // SPECIES_PLUSLE - {0x76, 0x08}, // SPECIES_MINUN - {0x87, 0x04}, // SPECIES_MAWILE - {0x76, 0x0b}, // SPECIES_MEDITITE - {0x68, 0x03}, // SPECIES_MEDICHAM - {0x86, 0x09}, // SPECIES_SWABLU - {0x87, 0x06}, // SPECIES_ALTARIA - {0x77, 0x07}, // SPECIES_WYNAUT - {0x66, 0x0b}, // SPECIES_DUSKULL - {0x86, 0x08}, // SPECIES_DUSCLOPS - {0x86, 0x08}, // SPECIES_ROSELIA - {0x85, 0x0f}, // SPECIES_SLAKOTH - {0x86, 0x0a}, // SPECIES_VIGOROTH - {0x86, 0x08}, // SPECIES_SLAKING - {0x66, 0x0b}, // SPECIES_GULPIN - {0x77, 0x06}, // SPECIES_SWALOT - {0x87, 0x07}, // SPECIES_TROPIUS - {0x85, 0x0d}, // SPECIES_WHISMUR - {0x86, 0x09}, // SPECIES_LOUDRED - {0x88, 0x03}, // SPECIES_EXPLOUD - {0x85, 0x0d}, // SPECIES_CLAMPERL - {0x68, 0x02}, // SPECIES_HUNTAIL - {0x77, 0x05}, // SPECIES_GOREBYSS - {0x78, 0x03}, // SPECIES_ABSOL - {0x77, 0x06}, // SPECIES_SHUPPET - {0x65, 0x0c}, // SPECIES_BANETTE - {0x88, 0x03}, // SPECIES_SEVIPER - {0x88, 0x01}, // SPECIES_ZANGOOSE - {0x86, 0x0a}, // SPECIES_RELICANTH - {0x54, 0x11}, // SPECIES_ARON - {0x84, 0x11}, // SPECIES_LAIRON - {0x87, 0x07}, // SPECIES_AGGRON - {0x45, 0x0d}, // SPECIES_CASTFORM - {0x76, 0x08}, // SPECIES_VOLBEAT - {0x67, 0x06}, // SPECIES_ILLUMISE - {0x86, 0x09}, // SPECIES_LILEEP - {0x77, 0x04}, // SPECIES_CRADILY - {0x83, 0x17}, // SPECIES_ANORITH - {0x77, 0x05}, // SPECIES_ARMALDO - {0x45, 0x0d}, // SPECIES_RALTS - {0x57, 0x06}, // SPECIES_KIRLIA - {0x77, 0x04}, // SPECIES_GARDEVOIR - {0x66, 0x08}, // SPECIES_BAGON - {0x85, 0x0d}, // SPECIES_SHELGON - {0x77, 0x06}, // SPECIES_SALAMENCE - {0x66, 0x0a}, // SPECIES_BELDUM - {0x84, 0x10}, // SPECIES_METANG - {0x83, 0x14}, // SPECIES_METAGROSS - {0x86, 0x0a}, // SPECIES_REGIROCK - {0x85, 0x0e}, // SPECIES_REGICE - {0x85, 0x0e}, // SPECIES_REGISTEEL - {0x84, 0x13}, // SPECIES_KYOGRE - {0x87, 0x07}, // SPECIES_GROUDON - {0x78, 0x00}, // SPECIES_RAYQUAZA - {0x88, 0x02}, // SPECIES_LATIAS - {0x88, 0x03}, // SPECIES_LATIOS - {0x87, 0x05}, // SPECIES_JIRACHI - {0x86, 0x09}, // SPECIES_DEOXYS - {0x47, 0x07}, // SPECIES_CHIMECHO - {0x36, 0x0a}, // SPECIES_EGG - {0x56, 0x09}, // SPECIES_UNOWN_B - {0x67, 0x06}, // SPECIES_UNOWN_C - {0x56, 0x08}, // SPECIES_UNOWN_D - {0x56, 0x0a}, // SPECIES_UNOWN_E - {0x66, 0x0a}, // SPECIES_UNOWN_F - {0x57, 0x05}, // SPECIES_UNOWN_G - {0x66, 0x08}, // SPECIES_UNOWN_H - {0x37, 0x07}, // SPECIES_UNOWN_I - {0x46, 0x09}, // SPECIES_UNOWN_J - {0x57, 0x07}, // SPECIES_UNOWN_K - {0x46, 0x0a}, // SPECIES_UNOWN_L - {0x65, 0x0d}, // SPECIES_UNOWN_M - {0x65, 0x0d}, // SPECIES_UNOWN_N - {0x66, 0x08}, // SPECIES_UNOWN_O - {0x46, 0x0a}, // SPECIES_UNOWN_P - {0x55, 0x0f}, // SPECIES_UNOWN_Q - {0x45, 0x0c}, // SPECIES_UNOWN_R - {0x57, 0x04}, // SPECIES_UNOWN_S - {0x45, 0x0d}, // SPECIES_UNOWN_T - {0x65, 0x0d}, // SPECIES_UNOWN_U - {0x56, 0x0b}, // SPECIES_UNOWN_V - {0x55, 0x0d}, // SPECIES_UNOWN_W - {0x55, 0x0f}, // SPECIES_UNOWN_X - {0x46, 0x0a}, // SPECIES_UNOWN_Y - {0x46, 0x0a}, // SPECIES_UNOWN_Z - {0x37, 0x06}, // SPECIES_UNOWN_EMARK - {0x47, 0x06}, // SPECIES_UNOWN_QMARK + [SPECIES_NONE] = {0x88, 0x00}, + [SPECIES_BULBASAUR] = {0x64, 0x10}, + [SPECIES_IVYSAUR] = {0x66, 0x09}, + [SPECIES_VENUSAUR] = {0x87, 0x07}, + [SPECIES_CHARMANDER] = {0x65, 0x0e}, + [SPECIES_CHARMELEON] = {0x66, 0x09}, + [SPECIES_CHARIZARD] = {0x87, 0x04}, + [SPECIES_SQUIRTLE] = {0x65, 0x0e}, + [SPECIES_WARTORTLE] = {0x76, 0x0a}, + [SPECIES_BLASTOISE] = {0x86, 0x08}, + [SPECIES_CATERPIE] = {0x55, 0x0f}, + [SPECIES_METAPOD] = {0x65, 0x0c}, + [SPECIES_BUTTERFREE] = {0x87, 0x06}, + [SPECIES_WEEDLE] = {0x56, 0x0b}, + [SPECIES_KAKUNA] = {0x46, 0x0a}, + [SPECIES_BEEDRILL] = {0x86, 0x09}, + [SPECIES_PIDGEY] = {0x66, 0x08}, + [SPECIES_PIDGEOTTO] = {0x85, 0x0c}, + [SPECIES_PIDGEOT] = {0x78, 0x02}, + [SPECIES_RATTATA] = {0x65, 0x0d}, + [SPECIES_RATICATE] = {0x75, 0x0d}, + [SPECIES_SPEAROW] = {0x65, 0x0c}, + [SPECIES_FEAROW] = {0x87, 0x05}, + [SPECIES_EKANS] = {0x66, 0x09}, + [SPECIES_ARBOK] = {0x77, 0x04}, + [SPECIES_PIKACHU] = {0x77, 0x07}, + [SPECIES_RAICHU] = {0x66, 0x08}, + [SPECIES_SANDSHREW] = {0x65, 0x0d}, + [SPECIES_SANDSLASH] = {0x86, 0x09}, + [SPECIES_NIDORAN_F] = {0x55, 0x0c}, + [SPECIES_NIDORINA] = {0x86, 0x0a}, + [SPECIES_NIDOQUEEN] = {0x77, 0x06}, + [SPECIES_NIDORAN_M] = {0x56, 0x08}, + [SPECIES_NIDORINO] = {0x86, 0x09}, + [SPECIES_NIDOKING] = {0x88, 0x03}, + [SPECIES_CLEFAIRY] = {0x65, 0x0d}, + [SPECIES_CLEFABLE] = {0x76, 0x0a}, + [SPECIES_VULPIX] = {0x76, 0x09}, + [SPECIES_NINETALES] = {0x77, 0x05}, + [SPECIES_JIGGLYPUFF] = {0x65, 0x0d}, + [SPECIES_WIGGLYTUFF] = {0x66, 0x08}, + [SPECIES_ZUBAT] = {0x76, 0x0b}, + [SPECIES_GOLBAT] = {0x87, 0x06}, + [SPECIES_ODDISH] = {0x56, 0x0b}, + [SPECIES_GLOOM] = {0x66, 0x0a}, + [SPECIES_VILEPLUME] = {0x87, 0x07}, + [SPECIES_PARAS] = {0x63, 0x14}, + [SPECIES_PARASECT] = {0x87, 0x07}, + [SPECIES_VENONAT] = {0x77, 0x06}, + [SPECIES_VENOMOTH] = {0x77, 0x04}, + [SPECIES_DIGLETT] = {0x54, 0x10}, + [SPECIES_DUGTRIO] = {0x66, 0x0b}, + [SPECIES_MEOWTH] = {0x65, 0x0c}, + [SPECIES_PERSIAN] = {0x87, 0x07}, + [SPECIES_PSYDUCK] = {0x67, 0x07}, + [SPECIES_GOLDUCK] = {0x77, 0x05}, + [SPECIES_MANKEY] = {0x76, 0x0b}, + [SPECIES_PRIMEAPE] = {0x77, 0x07}, + [SPECIES_GROWLITHE] = {0x66, 0x08}, + [SPECIES_ARCANINE] = {0x87, 0x06}, + [SPECIES_POLIWAG] = {0x74, 0x10}, + [SPECIES_POLIWHIRL] = {0x65, 0x0c}, + [SPECIES_POLIWRATH] = {0x86, 0x0b}, + [SPECIES_ABRA] = {0x66, 0x0b}, + [SPECIES_KADABRA] = {0x76, 0x08}, + [SPECIES_ALAKAZAM] = {0x67, 0x05}, + [SPECIES_MACHOP] = {0x65, 0x0c}, + [SPECIES_MACHOKE] = {0x76, 0x09}, + [SPECIES_MACHAMP] = {0x67, 0x04}, + [SPECIES_BELLSPROUT] = {0x66, 0x0a}, + [SPECIES_WEEPINBELL] = {0x66, 0x09}, + [SPECIES_VICTREEBEL] = {0x87, 0x06}, + [SPECIES_TENTACOOL] = {0x56, 0x0a}, + [SPECIES_TENTACRUEL] = {0x86, 0x0b}, + [SPECIES_GEODUDE] = {0x66, 0x0b}, + [SPECIES_GRAVELER] = {0x75, 0x0c}, + [SPECIES_GOLEM] = {0x84, 0x10}, + [SPECIES_PONYTA] = {0x66, 0x09}, + [SPECIES_RAPIDASH] = {0x87, 0x05}, + [SPECIES_SLOWPOKE] = {0x85, 0x0e}, + [SPECIES_SLOWBRO] = {0x86, 0x0a}, + [SPECIES_MAGNEMITE] = {0x43, 0x14}, + [SPECIES_MAGNETON] = {0x66, 0x0a}, + [SPECIES_FARFETCHD] = {0x66, 0x0a}, + [SPECIES_DODUO] = {0x66, 0x08}, + [SPECIES_DODRIO] = {0x88, 0x01}, + [SPECIES_SEEL] = {0x66, 0x0a}, + [SPECIES_DEWGONG] = {0x77, 0x05}, + [SPECIES_GRIMER] = {0x75, 0x0c}, + [SPECIES_MUK] = {0x87, 0x05}, + [SPECIES_SHELLDER] = {0x76, 0x0b}, + [SPECIES_CLOYSTER] = {0x87, 0x06}, + [SPECIES_GASTLY] = {0x85, 0x0e}, + [SPECIES_HAUNTER] = {0x76, 0x08}, + [SPECIES_GENGAR] = {0x76, 0x09}, + [SPECIES_ONIX] = {0x78, 0x00}, + [SPECIES_DROWZEE] = {0x65, 0x0d}, + [SPECIES_HYPNO] = {0x66, 0x09}, + [SPECIES_KRABBY] = {0x66, 0x0a}, + [SPECIES_KINGLER] = {0x77, 0x04}, + [SPECIES_VOLTORB] = {0x55, 0x0e}, + [SPECIES_ELECTRODE] = {0x65, 0x0d}, + [SPECIES_EXEGGCUTE] = {0x65, 0x0d}, + [SPECIES_EXEGGUTOR] = {0x87, 0x04}, + [SPECIES_CUBONE] = {0x66, 0x0a}, + [SPECIES_MAROWAK] = {0x66, 0x08}, + [SPECIES_HITMONLEE] = {0x65, 0x0c}, + [SPECIES_HITMONCHAN] = {0x65, 0x0c}, + [SPECIES_LICKITUNG] = {0x65, 0x0e}, + [SPECIES_KOFFING] = {0x66, 0x09}, + [SPECIES_WEEZING] = {0x77, 0x06}, + [SPECIES_RHYHORN] = {0x85, 0x0c}, + [SPECIES_RHYDON] = {0x88, 0x03}, + [SPECIES_CHANSEY] = {0x86, 0x0b}, + [SPECIES_TANGELA] = {0x85, 0x0e}, + [SPECIES_KANGASKHAN] = {0x77, 0x05}, + [SPECIES_HORSEA] = {0x66, 0x09}, + [SPECIES_SEADRA] = {0x66, 0x08}, + [SPECIES_GOLDEEN] = {0x66, 0x08}, + [SPECIES_SEAKING] = {0x76, 0x0b}, + [SPECIES_STARYU] = {0x65, 0x0d}, + [SPECIES_STARMIE] = {0x85, 0x0e}, + [SPECIES_MR_MIME] = {0x85, 0x0d}, + [SPECIES_SCYTHER] = {0x77, 0x07}, + [SPECIES_JYNX] = {0x86, 0x0a}, + [SPECIES_ELECTABUZZ] = {0x66, 0x08}, + [SPECIES_MAGMAR] = {0x66, 0x08}, + [SPECIES_PINSIR] = {0x66, 0x09}, + [SPECIES_TAUROS] = {0x85, 0x0d}, + [SPECIES_MAGIKARP] = {0x76, 0x09}, + [SPECIES_GYARADOS] = {0x78, 0x00}, + [SPECIES_LAPRAS] = {0x77, 0x04}, + [SPECIES_DITTO] = {0x54, 0x11}, + [SPECIES_EEVEE] = {0x66, 0x0a}, + [SPECIES_VAPOREON] = {0x66, 0x0a}, + [SPECIES_JOLTEON] = {0x87, 0x06}, + [SPECIES_FLAREON] = {0x67, 0x05}, + [SPECIES_PORYGON] = {0x65, 0x0d}, + [SPECIES_OMANYTE] = {0x66, 0x0a}, + [SPECIES_OMASTAR] = {0x66, 0x08}, + [SPECIES_KABUTO] = {0x65, 0x0d}, + [SPECIES_KABUTOPS] = {0x77, 0x05}, + [SPECIES_AERODACTYL] = {0x86, 0x08}, + [SPECIES_SNORLAX] = {0x86, 0x0b}, + [SPECIES_ARTICUNO] = {0x65, 0x0c}, + [SPECIES_ZAPDOS] = {0x76, 0x0b}, + [SPECIES_MOLTRES] = {0x87, 0x04}, + [SPECIES_DRATINI] = {0x66, 0x09}, + [SPECIES_DRAGONAIR] = {0x78, 0x00}, + [SPECIES_DRAGONITE] = {0x87, 0x06}, + [SPECIES_MEWTWO] = {0x78, 0x01}, + [SPECIES_MEW] = {0x66, 0x08}, + [SPECIES_CHIKORITA] = {0x56, 0x0a}, + [SPECIES_BAYLEEF] = {0x66, 0x08}, + [SPECIES_MEGANIUM] = {0x78, 0x00}, + [SPECIES_CYNDAQUIL] = {0x76, 0x09}, + [SPECIES_QUILAVA] = {0x87, 0x04}, + [SPECIES_TYPHLOSION] = {0x87, 0x04}, + [SPECIES_TOTODILE] = {0x66, 0x0b}, + [SPECIES_CROCONAW] = {0x67, 0x07}, + [SPECIES_FERALIGATR] = {0x88, 0x01}, + [SPECIES_SENTRET] = {0x67, 0x05}, + [SPECIES_FURRET] = {0x66, 0x08}, + [SPECIES_HOOTHOOT] = {0x66, 0x08}, + [SPECIES_NOCTOWL] = {0x68, 0x03}, + [SPECIES_LEDYBA] = {0x76, 0x0b}, + [SPECIES_LEDIAN] = {0x77, 0x07}, + [SPECIES_SPINARAK] = {0x73, 0x15}, + [SPECIES_ARIADOS] = {0x86, 0x0b}, + [SPECIES_CROBAT] = {0x87, 0x05}, + [SPECIES_CHINCHOU] = {0x86, 0x08}, + [SPECIES_LANTURN] = {0x86, 0x08}, + [SPECIES_PICHU] = {0x66, 0x0b}, + [SPECIES_CLEFFA] = {0x65, 0x0f}, + [SPECIES_IGGLYBUFF] = {0x66, 0x0b}, + [SPECIES_TOGEPI] = {0x54, 0x10}, + [SPECIES_TOGETIC] = {0x66, 0x08}, + [SPECIES_NATU] = {0x54, 0x11}, + [SPECIES_XATU] = {0x76, 0x08}, + [SPECIES_MAREEP] = {0x66, 0x09}, + [SPECIES_FLAAFFY] = {0x66, 0x09}, + [SPECIES_AMPHAROS] = {0x88, 0x01}, + [SPECIES_BELLOSSOM] = {0x66, 0x0b}, + [SPECIES_MARILL] = {0x75, 0x0c}, + [SPECIES_AZUMARILL] = {0x86, 0x08}, + [SPECIES_SUDOWOODO] = {0x66, 0x08}, + [SPECIES_POLITOED] = {0x66, 0x09}, + [SPECIES_HOPPIP] = {0x66, 0x0b}, + [SPECIES_SKIPLOOM] = {0x65, 0x0d}, + [SPECIES_JUMPLUFF] = {0x87, 0x04}, + [SPECIES_AIPOM] = {0x66, 0x09}, + [SPECIES_SUNKERN] = {0x56, 0x0a}, + [SPECIES_SUNFLORA] = {0x66, 0x08}, + [SPECIES_YANMA] = {0x77, 0x04}, + [SPECIES_WOOPER] = {0x85, 0x0f}, + [SPECIES_QUAGSIRE] = {0x76, 0x08}, + [SPECIES_ESPEON] = {0x76, 0x0b}, + [SPECIES_UMBREON] = {0x87, 0x04}, + [SPECIES_MURKROW] = {0x66, 0x09}, + [SPECIES_SLOWKING] = {0x66, 0x08}, + [SPECIES_MISDREAVUS] = {0x66, 0x0a}, + [SPECIES_UNOWN] = {0x36, 0x08}, + [SPECIES_WOBBUFFET] = {0x75, 0x0c}, + [SPECIES_GIRAFARIG] = {0x87, 0x05}, + [SPECIES_PINECO] = {0x65, 0x0f}, + [SPECIES_FORRETRESS] = {0x84, 0x10}, + [SPECIES_DUNSPARCE] = {0x85, 0x0f}, + [SPECIES_GLIGAR] = {0x87, 0x05}, + [SPECIES_STEELIX] = {0x88, 0x00}, + [SPECIES_SNUBBULL] = {0x76, 0x0a}, + [SPECIES_GRANBULL] = {0x87, 0x05}, + [SPECIES_QWILFISH] = {0x77, 0x07}, + [SPECIES_SCIZOR] = {0x77, 0x04}, + [SPECIES_SHUCKLE] = {0x56, 0x0b}, + [SPECIES_HERACROSS] = {0x77, 0x04}, + [SPECIES_SNEASEL] = {0x66, 0x08}, + [SPECIES_TEDDIURSA] = {0x66, 0x08}, + [SPECIES_URSARING] = {0x88, 0x03}, + [SPECIES_SLUGMA] = {0x66, 0x08}, + [SPECIES_MAGCARGO] = {0x76, 0x09}, + [SPECIES_SWINUB] = {0x63, 0x15}, + [SPECIES_PILOSWINE] = {0x75, 0x0d}, + [SPECIES_CORSOLA] = {0x65, 0x0c}, + [SPECIES_REMORAID] = {0x75, 0x0d}, + [SPECIES_OCTILLERY] = {0x66, 0x0a}, + [SPECIES_DELIBIRD] = {0x67, 0x06}, + [SPECIES_MANTINE] = {0x87, 0x07}, + [SPECIES_SKARMORY] = {0x87, 0x04}, + [SPECIES_HOUNDOUR] = {0x55, 0x0c}, + [SPECIES_HOUNDOOM] = {0x87, 0x07}, + [SPECIES_KINGDRA] = {0x87, 0x06}, + [SPECIES_PHANPY] = {0x65, 0x0e}, + [SPECIES_DONPHAN] = {0x85, 0x0d}, + [SPECIES_PORYGON2] = {0x76, 0x0a}, + [SPECIES_STANTLER] = {0x78, 0x03}, + [SPECIES_SMEARGLE] = {0x76, 0x0a}, + [SPECIES_TYROGUE] = {0x66, 0x08}, + [SPECIES_HITMONTOP] = {0x87, 0x05}, + [SPECIES_SMOOCHUM] = {0x56, 0x09}, + [SPECIES_ELEKID] = {0x66, 0x08}, + [SPECIES_MAGBY] = {0x66, 0x0b}, + [SPECIES_MILTANK] = {0x87, 0x07}, + [SPECIES_BLISSEY] = {0x85, 0x0d}, + [SPECIES_RAIKOU] = {0x86, 0x0a}, + [SPECIES_ENTEI] = {0x87, 0x06}, + [SPECIES_SUICUNE] = {0x88, 0x03}, + [SPECIES_LARVITAR] = {0x66, 0x08}, + [SPECIES_PUPITAR] = {0x67, 0x05}, + [SPECIES_TYRANITAR] = {0x88, 0x00}, + [SPECIES_LUGIA] = {0x88, 0x01}, + [SPECIES_HO_OH] = {0x88, 0x01}, + [SPECIES_CELEBI] = {0x66, 0x08}, + [SPECIES_OLD_UNOWN_B] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_C] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_D] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_E] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_F] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_G] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_H] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_I] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_J] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_K] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_L] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_M] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_N] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_O] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_P] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_Q] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_R] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_S] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_T] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_U] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_V] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_W] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_X] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_Y] = {0x88, 0x02}, + [SPECIES_OLD_UNOWN_Z] = {0x88, 0x02}, + [SPECIES_TREECKO] = {0x87, 0x06}, + [SPECIES_GROVYLE] = {0x86, 0x08}, + [SPECIES_SCEPTILE] = {0x88, 0x01}, + [SPECIES_TORCHIC] = {0x67, 0x05}, + [SPECIES_COMBUSKEN] = {0x88, 0x00}, + [SPECIES_BLAZIKEN] = {0x88, 0x00}, + [SPECIES_MUDKIP] = {0x77, 0x05}, + [SPECIES_MARSHTOMP] = {0x87, 0x04}, + [SPECIES_SWAMPERT] = {0x87, 0x05}, + [SPECIES_POOCHYENA] = {0x76, 0x09}, + [SPECIES_MIGHTYENA] = {0x87, 0x04}, + [SPECIES_ZIGZAGOON] = {0x76, 0x0b}, + [SPECIES_LINOONE] = {0x85, 0x0f}, + [SPECIES_WURMPLE] = {0x76, 0x0b}, + [SPECIES_SILCOON] = {0x83, 0x15}, + [SPECIES_BEAUTIFLY] = {0x88, 0x00}, + [SPECIES_CASCOON] = {0x73, 0x14}, + [SPECIES_DUSTOX] = {0x83, 0x14}, + [SPECIES_LOTAD] = {0x75, 0x0f}, + [SPECIES_LOMBRE] = {0x86, 0x08}, + [SPECIES_LUDICOLO] = {0x86, 0x0a}, + [SPECIES_SEEDOT] = {0x86, 0x09}, + [SPECIES_NUZLEAF] = {0x76, 0x0a}, + [SPECIES_SHIFTRY] = {0x86, 0x08}, + [SPECIES_NINCADA] = {0x83, 0x14}, + [SPECIES_NINJASK] = {0x86, 0x08}, + [SPECIES_SHEDINJA] = {0x77, 0x06}, + [SPECIES_TAILLOW] = {0x64, 0x11}, + [SPECIES_SWELLOW] = {0x86, 0x08}, + [SPECIES_SHROOMISH] = {0x85, 0x0d}, + [SPECIES_BRELOOM] = {0x87, 0x04}, + [SPECIES_SPINDA] = {0x77, 0x04}, + [SPECIES_WINGULL] = {0x85, 0x0e}, + [SPECIES_PELIPPER] = {0x87, 0x06}, + [SPECIES_SURSKIT] = {0x86, 0x0b}, + [SPECIES_MASQUERAIN] = {0x88, 0x00}, + [SPECIES_WAILMER] = {0x83, 0x15}, + [SPECIES_WAILORD] = {0x83, 0x16}, + [SPECIES_SKITTY] = {0x86, 0x0a}, + [SPECIES_DELCATTY] = {0x86, 0x08}, + [SPECIES_KECLEON] = {0x87, 0x06}, + [SPECIES_BALTOY] = {0x86, 0x08}, + [SPECIES_CLAYDOL] = {0x87, 0x07}, + [SPECIES_NOSEPASS] = {0x85, 0x0c}, + [SPECIES_TORKOAL] = {0x86, 0x0a}, + [SPECIES_SABLEYE] = {0x76, 0x08}, + [SPECIES_BARBOACH] = {0x66, 0x0a}, + [SPECIES_WHISCASH] = {0x86, 0x0a}, + [SPECIES_LUVDISC] = {0x46, 0x0a}, + [SPECIES_CORPHISH] = {0x77, 0x07}, + [SPECIES_CRAWDAUNT] = {0x87, 0x05}, + [SPECIES_FEEBAS] = {0x67, 0x07}, + [SPECIES_MILOTIC] = {0x68, 0x02}, + [SPECIES_CARVANHA] = {0x87, 0x07}, + [SPECIES_SHARPEDO] = {0x88, 0x02}, + [SPECIES_TRAPINCH] = {0x75, 0x0e}, + [SPECIES_VIBRAVA] = {0x74, 0x11}, + [SPECIES_FLYGON] = {0x88, 0x02}, + [SPECIES_MAKUHITA] = {0x76, 0x0b}, + [SPECIES_HARIYAMA] = {0x87, 0x07}, + [SPECIES_ELECTRIKE] = {0x84, 0x10}, + [SPECIES_MANECTRIC] = {0x87, 0x04}, + [SPECIES_NUMEL] = {0x86, 0x0b}, + [SPECIES_CAMERUPT] = {0x84, 0x13}, + [SPECIES_SPHEAL] = {0x64, 0x12}, + [SPECIES_SEALEO] = {0x86, 0x0a}, + [SPECIES_WALREIN] = {0x87, 0x06}, + [SPECIES_CACNEA] = {0x85, 0x0f}, + [SPECIES_CACTURNE] = {0x87, 0x07}, + [SPECIES_SNORUNT] = {0x76, 0x0a}, + [SPECIES_GLALIE] = {0x85, 0x0c}, + [SPECIES_LUNATONE] = {0x87, 0x05}, + [SPECIES_SOLROCK] = {0x87, 0x05}, + [SPECIES_AZURILL] = {0x86, 0x0a}, + [SPECIES_SPOINK] = {0x56, 0x0b}, + [SPECIES_GRUMPIG] = {0x87, 0x04}, + [SPECIES_PLUSLE] = {0x76, 0x08}, + [SPECIES_MINUN] = {0x76, 0x08}, + [SPECIES_MAWILE] = {0x87, 0x04}, + [SPECIES_MEDITITE] = {0x76, 0x0b}, + [SPECIES_MEDICHAM] = {0x68, 0x03}, + [SPECIES_SWABLU] = {0x86, 0x09}, + [SPECIES_ALTARIA] = {0x87, 0x06}, + [SPECIES_WYNAUT] = {0x77, 0x07}, + [SPECIES_DUSKULL] = {0x66, 0x0b}, + [SPECIES_DUSCLOPS] = {0x86, 0x08}, + [SPECIES_ROSELIA] = {0x86, 0x08}, + [SPECIES_SLAKOTH] = {0x85, 0x0f}, + [SPECIES_VIGOROTH] = {0x86, 0x0a}, + [SPECIES_SLAKING] = {0x86, 0x08}, + [SPECIES_GULPIN] = {0x66, 0x0b}, + [SPECIES_SWALOT] = {0x77, 0x06}, + [SPECIES_TROPIUS] = {0x87, 0x07}, + [SPECIES_WHISMUR] = {0x85, 0x0d}, + [SPECIES_LOUDRED] = {0x86, 0x09}, + [SPECIES_EXPLOUD] = {0x88, 0x03}, + [SPECIES_CLAMPERL] = {0x85, 0x0d}, + [SPECIES_HUNTAIL] = {0x68, 0x02}, + [SPECIES_GOREBYSS] = {0x77, 0x05}, + [SPECIES_ABSOL] = {0x78, 0x03}, + [SPECIES_SHUPPET] = {0x77, 0x06}, + [SPECIES_BANETTE] = {0x65, 0x0c}, + [SPECIES_SEVIPER] = {0x88, 0x03}, + [SPECIES_ZANGOOSE] = {0x88, 0x01}, + [SPECIES_RELICANTH] = {0x86, 0x0a}, + [SPECIES_ARON] = {0x54, 0x11}, + [SPECIES_LAIRON] = {0x84, 0x11}, + [SPECIES_AGGRON] = {0x87, 0x07}, + [SPECIES_CASTFORM] = {0x45, 0x0d}, + [SPECIES_VOLBEAT] = {0x76, 0x08}, + [SPECIES_ILLUMISE] = {0x67, 0x06}, + [SPECIES_LILEEP] = {0x86, 0x09}, + [SPECIES_CRADILY] = {0x77, 0x04}, + [SPECIES_ANORITH] = {0x83, 0x17}, + [SPECIES_ARMALDO] = {0x77, 0x05}, + [SPECIES_RALTS] = {0x45, 0x0d}, + [SPECIES_KIRLIA] = {0x57, 0x06}, + [SPECIES_GARDEVOIR] = {0x77, 0x04}, + [SPECIES_BAGON] = {0x66, 0x08}, + [SPECIES_SHELGON] = {0x85, 0x0d}, + [SPECIES_SALAMENCE] = {0x77, 0x06}, + [SPECIES_BELDUM] = {0x66, 0x0a}, + [SPECIES_METANG] = {0x84, 0x10}, + [SPECIES_METAGROSS] = {0x83, 0x14}, + [SPECIES_REGIROCK] = {0x86, 0x0a}, + [SPECIES_REGICE] = {0x85, 0x0e}, + [SPECIES_REGISTEEL] = {0x85, 0x0e}, + [SPECIES_KYOGRE] = {0x84, 0x13}, + [SPECIES_GROUDON] = {0x87, 0x07}, + [SPECIES_RAYQUAZA] = {0x78, 0x00}, + [SPECIES_LATIAS] = {0x88, 0x02}, + [SPECIES_LATIOS] = {0x88, 0x03}, + [SPECIES_JIRACHI] = {0x87, 0x05}, + [SPECIES_DEOXYS] = {0x86, 0x09}, + [SPECIES_CHIMECHO] = {0x47, 0x07}, + [SPECIES_EGG] = {0x36, 0x0a}, + [SPECIES_UNOWN_B] = {0x56, 0x09}, + [SPECIES_UNOWN_C] = {0x67, 0x06}, + [SPECIES_UNOWN_D] = {0x56, 0x08}, + [SPECIES_UNOWN_E] = {0x56, 0x0a}, + [SPECIES_UNOWN_F] = {0x66, 0x0a}, + [SPECIES_UNOWN_G] = {0x57, 0x05}, + [SPECIES_UNOWN_H] = {0x66, 0x08}, + [SPECIES_UNOWN_I] = {0x37, 0x07}, + [SPECIES_UNOWN_J] = {0x46, 0x09}, + [SPECIES_UNOWN_K] = {0x57, 0x07}, + [SPECIES_UNOWN_L] = {0x46, 0x0a}, + [SPECIES_UNOWN_M] = {0x65, 0x0d}, + [SPECIES_UNOWN_N] = {0x65, 0x0d}, + [SPECIES_UNOWN_O] = {0x66, 0x08}, + [SPECIES_UNOWN_P] = {0x46, 0x0a}, + [SPECIES_UNOWN_Q] = {0x55, 0x0f}, + [SPECIES_UNOWN_R] = {0x45, 0x0c}, + [SPECIES_UNOWN_S] = {0x57, 0x04}, + [SPECIES_UNOWN_T] = {0x45, 0x0d}, + [SPECIES_UNOWN_U] = {0x65, 0x0d}, + [SPECIES_UNOWN_V] = {0x56, 0x0b}, + [SPECIES_UNOWN_W] = {0x55, 0x0d}, + [SPECIES_UNOWN_X] = {0x55, 0x0f}, + [SPECIES_UNOWN_Y] = {0x46, 0x0a}, + [SPECIES_UNOWN_Z] = {0x46, 0x0a}, + [SPECIES_UNOWN_EMARK] = {0x37, 0x06}, + [SPECIES_UNOWN_QMARK] = {0x47, 0x06}, }; + diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 7426a8dc4..c6fd1300b 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1,443 +1,444 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = { - gMonBackPic_CircledQuestionMark, 0x800, 0, - gMonBackPic_Bulbasaur, 0x800, 1, - gMonBackPic_Ivysaur, 0x800, 2, - gMonBackPic_Venusaur, 0x800, 3, - gMonBackPic_Charmander, 0x800, 4, - gMonBackPic_Charmeleon, 0x800, 5, - gMonBackPic_Charizard, 0x800, 6, - gMonBackPic_Squirtle, 0x800, 7, - gMonBackPic_Wartortle, 0x800, 8, - gMonBackPic_Blastoise, 0x800, 9, - gMonBackPic_Caterpie, 0x800, 10, - gMonBackPic_Metapod, 0x800, 11, - gMonBackPic_Butterfree, 0x800, 12, - gMonBackPic_Weedle, 0x800, 13, - gMonBackPic_Kakuna, 0x800, 14, - gMonBackPic_Beedrill, 0x800, 15, - gMonBackPic_Pidgey, 0x800, 16, - gMonBackPic_Pidgeotto, 0x800, 17, - gMonBackPic_Pidgeot, 0x800, 18, - gMonBackPic_Rattata, 0x800, 19, - gMonBackPic_Raticate, 0x800, 20, - gMonBackPic_Spearow, 0x800, 21, - gMonBackPic_Fearow, 0x800, 22, - gMonBackPic_Ekans, 0x800, 23, - gMonBackPic_Arbok, 0x800, 24, - gMonBackPic_Pikachu, 0x800, 25, - gMonBackPic_Raichu, 0x800, 26, - gMonBackPic_Sandshrew, 0x800, 27, - gMonBackPic_Sandslash, 0x800, 28, - gMonBackPic_NidoranF, 0x800, 29, - gMonBackPic_Nidorina, 0x800, 30, - gMonBackPic_Nidoqueen, 0x800, 31, - gMonBackPic_NidoranM, 0x800, 32, - gMonBackPic_Nidorino, 0x800, 33, - gMonBackPic_Nidoking, 0x800, 34, - gMonBackPic_Clefairy, 0x800, 35, - gMonBackPic_Clefable, 0x800, 36, - gMonBackPic_Vulpix, 0x800, 37, - gMonBackPic_Ninetales, 0x800, 38, - gMonBackPic_Jigglypuff, 0x800, 39, - gMonBackPic_Wigglytuff, 0x800, 40, - gMonBackPic_Zubat, 0x800, 41, - gMonBackPic_Golbat, 0x800, 42, - gMonBackPic_Oddish, 0x800, 43, - gMonBackPic_Gloom, 0x800, 44, - gMonBackPic_Vileplume, 0x800, 45, - gMonBackPic_Paras, 0x800, 46, - gMonBackPic_Parasect, 0x800, 47, - gMonBackPic_Venonat, 0x800, 48, - gMonBackPic_Venomoth, 0x800, 49, - gMonBackPic_Diglett, 0x800, 50, - gMonBackPic_Dugtrio, 0x800, 51, - gMonBackPic_Meowth, 0x800, 52, - gMonBackPic_Persian, 0x800, 53, - gMonBackPic_Psyduck, 0x800, 54, - gMonBackPic_Golduck, 0x800, 55, - gMonBackPic_Mankey, 0x800, 56, - gMonBackPic_Primeape, 0x800, 57, - gMonBackPic_Growlithe, 0x800, 58, - gMonBackPic_Arcanine, 0x800, 59, - gMonBackPic_Poliwag, 0x800, 60, - gMonBackPic_Poliwhirl, 0x800, 61, - gMonBackPic_Poliwrath, 0x800, 62, - gMonBackPic_Abra, 0x800, 63, - gMonBackPic_Kadabra, 0x800, 64, - gMonBackPic_Alakazam, 0x800, 65, - gMonBackPic_Machop, 0x800, 66, - gMonBackPic_Machoke, 0x800, 67, - gMonBackPic_Machamp, 0x800, 68, - gMonBackPic_Bellsprout, 0x800, 69, - gMonBackPic_Weepinbell, 0x800, 70, - gMonBackPic_Victreebel, 0x800, 71, - gMonBackPic_Tentacool, 0x800, 72, - gMonBackPic_Tentacruel, 0x800, 73, - gMonBackPic_Geodude, 0x800, 74, - gMonBackPic_Graveler, 0x800, 75, - gMonBackPic_Golem, 0x800, 76, - gMonBackPic_Ponyta, 0x800, 77, - gMonBackPic_Rapidash, 0x800, 78, - gMonBackPic_Slowpoke, 0x800, 79, - gMonBackPic_Slowbro, 0x800, 80, - gMonBackPic_Magnemite, 0x800, 81, - gMonBackPic_Magneton, 0x800, 82, - gMonBackPic_Farfetchd, 0x800, 83, - gMonBackPic_Doduo, 0x800, 84, - gMonBackPic_Dodrio, 0x800, 85, - gMonBackPic_Seel, 0x800, 86, - gMonBackPic_Dewgong, 0x800, 87, - gMonBackPic_Grimer, 0x800, 88, - gMonBackPic_Muk, 0x800, 89, - gMonBackPic_Shellder, 0x800, 90, - gMonBackPic_Cloyster, 0x800, 91, - gMonBackPic_Gastly, 0x800, 92, - gMonBackPic_Haunter, 0x800, 93, - gMonBackPic_Gengar, 0x800, 94, - gMonBackPic_Onix, 0x800, 95, - gMonBackPic_Drowzee, 0x800, 96, - gMonBackPic_Hypno, 0x800, 97, - gMonBackPic_Krabby, 0x800, 98, - gMonBackPic_Kingler, 0x800, 99, - gMonBackPic_Voltorb, 0x800, 100, - gMonBackPic_Electrode, 0x800, 101, - gMonBackPic_Exeggcute, 0x800, 102, - gMonBackPic_Exeggutor, 0x800, 103, - gMonBackPic_Cubone, 0x800, 104, - gMonBackPic_Marowak, 0x800, 105, - gMonBackPic_Hitmonlee, 0x800, 106, - gMonBackPic_Hitmonchan, 0x800, 107, - gMonBackPic_Lickitung, 0x800, 108, - gMonBackPic_Koffing, 0x800, 109, - gMonBackPic_Weezing, 0x800, 110, - gMonBackPic_Rhyhorn, 0x800, 111, - gMonBackPic_Rhydon, 0x800, 112, - gMonBackPic_Chansey, 0x800, 113, - gMonBackPic_Tangela, 0x800, 114, - gMonBackPic_Kangaskhan, 0x800, 115, - gMonBackPic_Horsea, 0x800, 116, - gMonBackPic_Seadra, 0x800, 117, - gMonBackPic_Goldeen, 0x800, 118, - gMonBackPic_Seaking, 0x800, 119, - gMonBackPic_Staryu, 0x800, 120, - gMonBackPic_Starmie, 0x800, 121, - gMonBackPic_Mrmime, 0x800, 122, - gMonBackPic_Scyther, 0x800, 123, - gMonBackPic_Jynx, 0x800, 124, - gMonBackPic_Electabuzz, 0x800, 125, - gMonBackPic_Magmar, 0x800, 126, - gMonBackPic_Pinsir, 0x800, 127, - gMonBackPic_Tauros, 0x800, 128, - gMonBackPic_Magikarp, 0x800, 129, - gMonBackPic_Gyarados, 0x800, 130, - gMonBackPic_Lapras, 0x800, 131, - gMonBackPic_Ditto, 0x800, 132, - gMonBackPic_Eevee, 0x800, 133, - gMonBackPic_Vaporeon, 0x800, 134, - gMonBackPic_Jolteon, 0x800, 135, - gMonBackPic_Flareon, 0x800, 136, - gMonBackPic_Porygon, 0x800, 137, - gMonBackPic_Omanyte, 0x800, 138, - gMonBackPic_Omastar, 0x800, 139, - gMonBackPic_Kabuto, 0x800, 140, - gMonBackPic_Kabutops, 0x800, 141, - gMonBackPic_Aerodactyl, 0x800, 142, - gMonBackPic_Snorlax, 0x800, 143, - gMonBackPic_Articuno, 0x800, 144, - gMonBackPic_Zapdos, 0x800, 145, - gMonBackPic_Moltres, 0x800, 146, - gMonBackPic_Dratini, 0x800, 147, - gMonBackPic_Dragonair, 0x800, 148, - gMonBackPic_Dragonite, 0x800, 149, - gMonBackPic_Mewtwo, 0x800, 150, - gMonBackPic_Mew, 0x800, 151, - gMonBackPic_Chikorita, 0x800, 152, - gMonBackPic_Bayleef, 0x800, 153, - gMonBackPic_Meganium, 0x800, 154, - gMonBackPic_Cyndaquil, 0x800, 155, - gMonBackPic_Quilava, 0x800, 156, - gMonBackPic_Typhlosion, 0x800, 157, - gMonBackPic_Totodile, 0x800, 158, - gMonBackPic_Croconaw, 0x800, 159, - gMonBackPic_Feraligatr, 0x800, 160, - gMonBackPic_Sentret, 0x800, 161, - gMonBackPic_Furret, 0x800, 162, - gMonBackPic_Hoothoot, 0x800, 163, - gMonBackPic_Noctowl, 0x800, 164, - gMonBackPic_Ledyba, 0x800, 165, - gMonBackPic_Ledian, 0x800, 166, - gMonBackPic_Spinarak, 0x800, 167, - gMonBackPic_Ariados, 0x800, 168, - gMonBackPic_Crobat, 0x800, 169, - gMonBackPic_Chinchou, 0x800, 170, - gMonBackPic_Lanturn, 0x800, 171, - gMonBackPic_Pichu, 0x800, 172, - gMonBackPic_Cleffa, 0x800, 173, - gMonBackPic_Igglybuff, 0x800, 174, - gMonBackPic_Togepi, 0x800, 175, - gMonBackPic_Togetic, 0x800, 176, - gMonBackPic_Natu, 0x800, 177, - gMonBackPic_Xatu, 0x800, 178, - gMonBackPic_Mareep, 0x800, 179, - gMonBackPic_Flaaffy, 0x800, 180, - gMonBackPic_Ampharos, 0x800, 181, - gMonBackPic_Bellossom, 0x800, 182, - gMonBackPic_Marill, 0x800, 183, - gMonBackPic_Azumarill, 0x800, 184, - gMonBackPic_Sudowoodo, 0x800, 185, - gMonBackPic_Politoed, 0x800, 186, - gMonBackPic_Hoppip, 0x800, 187, - gMonBackPic_Skiploom, 0x800, 188, - gMonBackPic_Jumpluff, 0x800, 189, - gMonBackPic_Aipom, 0x800, 190, - gMonBackPic_Sunkern, 0x800, 191, - gMonBackPic_Sunflora, 0x800, 192, - gMonBackPic_Yanma, 0x800, 193, - gMonBackPic_Wooper, 0x800, 194, - gMonBackPic_Quagsire, 0x800, 195, - gMonBackPic_Espeon, 0x800, 196, - gMonBackPic_Umbreon, 0x800, 197, - gMonBackPic_Murkrow, 0x800, 198, - gMonBackPic_Slowking, 0x800, 199, - gMonBackPic_Misdreavus, 0x800, 200, - gMonBackPic_UnownA, 0x800, 201, - gMonBackPic_Wobbuffet, 0x800, 202, - gMonBackPic_Girafarig, 0x800, 203, - gMonBackPic_Pineco, 0x800, 204, - gMonBackPic_Forretress, 0x800, 205, - gMonBackPic_Dunsparce, 0x800, 206, - gMonBackPic_Gligar, 0x800, 207, - gMonBackPic_Steelix, 0x800, 208, - gMonBackPic_Snubbull, 0x800, 209, - gMonBackPic_Granbull, 0x800, 210, - gMonBackPic_Qwilfish, 0x800, 211, - gMonBackPic_Scizor, 0x800, 212, - gMonBackPic_Shuckle, 0x800, 213, - gMonBackPic_Heracross, 0x800, 214, - gMonBackPic_Sneasel, 0x800, 215, - gMonBackPic_Teddiursa, 0x800, 216, - gMonBackPic_Ursaring, 0x800, 217, - gMonBackPic_Slugma, 0x800, 218, - gMonBackPic_Magcargo, 0x800, 219, - gMonBackPic_Swinub, 0x800, 220, - gMonBackPic_Piloswine, 0x800, 221, - gMonBackPic_Corsola, 0x800, 222, - gMonBackPic_Remoraid, 0x800, 223, - gMonBackPic_Octillery, 0x800, 224, - gMonBackPic_Delibird, 0x800, 225, - gMonBackPic_Mantine, 0x800, 226, - gMonBackPic_Skarmory, 0x800, 227, - gMonBackPic_Houndour, 0x800, 228, - gMonBackPic_Houndoom, 0x800, 229, - gMonBackPic_Kingdra, 0x800, 230, - gMonBackPic_Phanpy, 0x800, 231, - gMonBackPic_Donphan, 0x800, 232, - gMonBackPic_Porygon2, 0x800, 233, - gMonBackPic_Stantler, 0x800, 234, - gMonBackPic_Smeargle, 0x800, 235, - gMonBackPic_Tyrogue, 0x800, 236, - gMonBackPic_Hitmontop, 0x800, 237, - gMonBackPic_Smoochum, 0x800, 238, - gMonBackPic_Elekid, 0x800, 239, - gMonBackPic_Magby, 0x800, 240, - gMonBackPic_Miltank, 0x800, 241, - gMonBackPic_Blissey, 0x800, 242, - gMonBackPic_Raikou, 0x800, 243, - gMonBackPic_Entei, 0x800, 244, - gMonBackPic_Suicune, 0x800, 245, - gMonBackPic_Larvitar, 0x800, 246, - gMonBackPic_Pupitar, 0x800, 247, - gMonBackPic_Tyranitar, 0x800, 248, - gMonBackPic_Lugia, 0x800, 249, - gMonBackPic_HoOh, 0x800, 250, - gMonBackPic_Celebi, 0x800, 251, - gMonBackPic_DoubleQuestionMark, 0x800, 252, - gMonBackPic_DoubleQuestionMark, 0x800, 253, - gMonBackPic_DoubleQuestionMark, 0x800, 254, - gMonBackPic_DoubleQuestionMark, 0x800, 255, - gMonBackPic_DoubleQuestionMark, 0x800, 256, - gMonBackPic_DoubleQuestionMark, 0x800, 257, - gMonBackPic_DoubleQuestionMark, 0x800, 258, - gMonBackPic_DoubleQuestionMark, 0x800, 259, - gMonBackPic_DoubleQuestionMark, 0x800, 260, - gMonBackPic_DoubleQuestionMark, 0x800, 261, - gMonBackPic_DoubleQuestionMark, 0x800, 262, - gMonBackPic_DoubleQuestionMark, 0x800, 263, - gMonBackPic_DoubleQuestionMark, 0x800, 264, - gMonBackPic_DoubleQuestionMark, 0x800, 265, - gMonBackPic_DoubleQuestionMark, 0x800, 266, - gMonBackPic_DoubleQuestionMark, 0x800, 267, - gMonBackPic_DoubleQuestionMark, 0x800, 268, - gMonBackPic_DoubleQuestionMark, 0x800, 269, - gMonBackPic_DoubleQuestionMark, 0x800, 270, - gMonBackPic_DoubleQuestionMark, 0x800, 271, - gMonBackPic_DoubleQuestionMark, 0x800, 272, - gMonBackPic_DoubleQuestionMark, 0x800, 273, - gMonBackPic_DoubleQuestionMark, 0x800, 274, - gMonBackPic_DoubleQuestionMark, 0x800, 275, - gMonBackPic_DoubleQuestionMark, 0x800, 276, - gMonBackPic_Treecko, 0x800, 277, - gMonBackPic_Grovyle, 0x800, 278, - gMonBackPic_Sceptile, 0x800, 279, - gMonBackPic_Torchic, 0x800, 280, - gMonBackPic_Combusken, 0x800, 281, - gMonBackPic_Blaziken, 0x800, 282, - gMonBackPic_Mudkip, 0x800, 283, - gMonBackPic_Marshtomp, 0x800, 284, - gMonBackPic_Swampert, 0x800, 285, - gMonBackPic_Poochyena, 0x800, 286, - gMonBackPic_Mightyena, 0x800, 287, - gMonBackPic_Zigzagoon, 0x800, 288, - gMonBackPic_Linoone, 0x800, 289, - gMonBackPic_Wurmple, 0x800, 290, - gMonBackPic_Silcoon, 0x800, 291, - gMonBackPic_Beautifly, 0x800, 292, - gMonBackPic_Cascoon, 0x800, 293, - gMonBackPic_Dustox, 0x800, 294, - gMonBackPic_Lotad, 0x800, 295, - gMonBackPic_Lombre, 0x800, 296, - gMonBackPic_Ludicolo, 0x800, 297, - gMonBackPic_Seedot, 0x800, 298, - gMonBackPic_Nuzleaf, 0x800, 299, - gMonBackPic_Shiftry, 0x800, 300, - gMonBackPic_Nincada, 0x800, 301, - gMonBackPic_Ninjask, 0x800, 302, - gMonBackPic_Shedinja, 0x800, 303, - gMonBackPic_Taillow, 0x800, 304, - gMonBackPic_Swellow, 0x800, 305, - gMonBackPic_Shroomish, 0x800, 306, - gMonBackPic_Breloom, 0x800, 307, - gMonBackPic_Spinda, 0x800, 308, - gMonBackPic_Wingull, 0x800, 309, - gMonBackPic_Pelipper, 0x800, 310, - gMonBackPic_Surskit, 0x800, 311, - gMonBackPic_Masquerain, 0x800, 312, - gMonBackPic_Wailmer, 0x800, 313, - gMonBackPic_Wailord, 0x800, 314, - gMonBackPic_Skitty, 0x800, 315, - gMonBackPic_Delcatty, 0x800, 316, - gMonBackPic_Kecleon, 0x800, 317, - gMonBackPic_Baltoy, 0x800, 318, - gMonBackPic_Claydol, 0x800, 319, - gMonBackPic_Nosepass, 0x800, 320, - gMonBackPic_Torkoal, 0x800, 321, - gMonBackPic_Sableye, 0x800, 322, - gMonBackPic_Barboach, 0x800, 323, - gMonBackPic_Whiscash, 0x800, 324, - gMonBackPic_Luvdisc, 0x800, 325, - gMonBackPic_Corphish, 0x800, 326, - gMonBackPic_Crawdaunt, 0x800, 327, - gMonBackPic_Feebas, 0x800, 328, - gMonBackPic_Milotic, 0x800, 329, - gMonBackPic_Carvanha, 0x800, 330, - gMonBackPic_Sharpedo, 0x800, 331, - gMonBackPic_Trapinch, 0x800, 332, - gMonBackPic_Vibrava, 0x800, 333, - gMonBackPic_Flygon, 0x800, 334, - gMonBackPic_Makuhita, 0x800, 335, - gMonBackPic_Hariyama, 0x800, 336, - gMonBackPic_Electrike, 0x800, 337, - gMonBackPic_Manectric, 0x800, 338, - gMonBackPic_Numel, 0x800, 339, - gMonBackPic_Camerupt, 0x800, 340, - gMonBackPic_Spheal, 0x800, 341, - gMonBackPic_Sealeo, 0x800, 342, - gMonBackPic_Walrein, 0x800, 343, - gMonBackPic_Cacnea, 0x800, 344, - gMonBackPic_Cacturne, 0x800, 345, - gMonBackPic_Snorunt, 0x800, 346, - gMonBackPic_Glalie, 0x800, 347, - gMonBackPic_Lunatone, 0x800, 348, - gMonBackPic_Solrock, 0x800, 349, - gMonBackPic_Azurill, 0x800, 350, - gMonBackPic_Spoink, 0x800, 351, - gMonBackPic_Grumpig, 0x800, 352, - gMonBackPic_Plusle, 0x800, 353, - gMonBackPic_Minun, 0x800, 354, - gMonBackPic_Mawile, 0x800, 355, - gMonBackPic_Meditite, 0x800, 356, - gMonBackPic_Medicham, 0x800, 357, - gMonBackPic_Swablu, 0x800, 358, - gMonBackPic_Altaria, 0x800, 359, - gMonBackPic_Wynaut, 0x800, 360, - gMonBackPic_Duskull, 0x800, 361, - gMonBackPic_Dusclops, 0x800, 362, - gMonBackPic_Roselia, 0x800, 363, - gMonBackPic_Slakoth, 0x800, 364, - gMonBackPic_Vigoroth, 0x800, 365, - gMonBackPic_Slaking, 0x800, 366, - gMonBackPic_Gulpin, 0x800, 367, - gMonBackPic_Swalot, 0x800, 368, - gMonBackPic_Tropius, 0x800, 369, - gMonBackPic_Whismur, 0x800, 370, - gMonBackPic_Loudred, 0x800, 371, - gMonBackPic_Exploud, 0x800, 372, - gMonBackPic_Clamperl, 0x800, 373, - gMonBackPic_Huntail, 0x800, 374, - gMonBackPic_Gorebyss, 0x800, 375, - gMonBackPic_Absol, 0x800, 376, - gMonBackPic_Shuppet, 0x800, 377, - gMonBackPic_Banette, 0x800, 378, - gMonBackPic_Seviper, 0x800, 379, - gMonBackPic_Zangoose, 0x800, 380, - gMonBackPic_Relicanth, 0x800, 381, - gMonBackPic_Aron, 0x800, 382, - gMonBackPic_Lairon, 0x800, 383, - gMonBackPic_Aggron, 0x800, 384, - gMonBackPic_Castform, 0x800, 385, - gMonBackPic_Volbeat, 0x800, 386, - gMonBackPic_Illumise, 0x800, 387, - gMonBackPic_Lileep, 0x800, 388, - gMonBackPic_Cradily, 0x800, 389, - gMonBackPic_Anorith, 0x800, 390, - gMonBackPic_Armaldo, 0x800, 391, - gMonBackPic_Ralts, 0x800, 392, - gMonBackPic_Kirlia, 0x800, 393, - gMonBackPic_Gardevoir, 0x800, 394, - gMonBackPic_Bagon, 0x800, 395, - gMonBackPic_Shelgon, 0x800, 396, - gMonBackPic_Salamence, 0x800, 397, - gMonBackPic_Beldum, 0x800, 398, - gMonBackPic_Metang, 0x800, 399, - gMonBackPic_Metagross, 0x800, 400, - gMonBackPic_Regirock, 0x800, 401, - gMonBackPic_Regice, 0x800, 402, - gMonBackPic_Registeel, 0x800, 403, - gMonBackPic_Kyogre, 0x800, 404, - gMonBackPic_Groudon, 0x800, 405, - gMonBackPic_Rayquaza, 0x800, 406, - gMonBackPic_Latias, 0x800, 407, - gMonBackPic_Latios, 0x800, 408, - gMonBackPic_Jirachi, 0x800, 409, - gMonBackPic_Deoxys, 0x800, 410, - gMonBackPic_Chimecho, 0x800, 411, - gMonStillFrontPic_Egg, 0x800, 412, - gMonBackPic_UnownB, 0x800, 413, - gMonBackPic_UnownC, 0x800, 414, - gMonBackPic_UnownD, 0x800, 415, - gMonBackPic_UnownE, 0x800, 416, - gMonBackPic_UnownF, 0x800, 417, - gMonBackPic_UnownG, 0x800, 418, - gMonBackPic_UnownH, 0x800, 419, - gMonBackPic_UnownI, 0x800, 420, - gMonBackPic_UnownJ, 0x800, 421, - gMonBackPic_UnownK, 0x800, 422, - gMonBackPic_UnownL, 0x800, 423, - gMonBackPic_UnownM, 0x800, 424, - gMonBackPic_UnownN, 0x800, 425, - gMonBackPic_UnownO, 0x800, 426, - gMonBackPic_UnownP, 0x800, 427, - gMonBackPic_UnownQ, 0x800, 428, - gMonBackPic_UnownR, 0x800, 429, - gMonBackPic_UnownS, 0x800, 430, - gMonBackPic_UnownT, 0x800, 431, - gMonBackPic_UnownU, 0x800, 432, - gMonBackPic_UnownV, 0x800, 433, - gMonBackPic_UnownW, 0x800, 434, - gMonBackPic_UnownX, 0x800, 435, - gMonBackPic_UnownY, 0x800, 436, - gMonBackPic_UnownZ, 0x800, 437, - gMonBackPic_UnownExclamationMark, 0x800, 438, - gMonBackPic_UnownQuestionMark, 0x800, 439, + [SPECIES_NONE] = {gMonBackPic_CircledQuestionMark, 0x800, SPECIES_NONE}, + [SPECIES_BULBASAUR] = {gMonBackPic_Bulbasaur, 0x800, SPECIES_BULBASAUR}, + [SPECIES_IVYSAUR] = {gMonBackPic_Ivysaur, 0x800, SPECIES_IVYSAUR}, + [SPECIES_VENUSAUR] = {gMonBackPic_Venusaur, 0x800, SPECIES_VENUSAUR}, + [SPECIES_CHARMANDER] = {gMonBackPic_Charmander, 0x800, SPECIES_CHARMANDER}, + [SPECIES_CHARMELEON] = {gMonBackPic_Charmeleon, 0x800, SPECIES_CHARMELEON}, + [SPECIES_CHARIZARD] = {gMonBackPic_Charizard, 0x800, SPECIES_CHARIZARD}, + [SPECIES_SQUIRTLE] = {gMonBackPic_Squirtle, 0x800, SPECIES_SQUIRTLE}, + [SPECIES_WARTORTLE] = {gMonBackPic_Wartortle, 0x800, SPECIES_WARTORTLE}, + [SPECIES_BLASTOISE] = {gMonBackPic_Blastoise, 0x800, SPECIES_BLASTOISE}, + [SPECIES_CATERPIE] = {gMonBackPic_Caterpie, 0x800, SPECIES_CATERPIE}, + [SPECIES_METAPOD] = {gMonBackPic_Metapod, 0x800, SPECIES_METAPOD}, + [SPECIES_BUTTERFREE] = {gMonBackPic_Butterfree, 0x800, SPECIES_BUTTERFREE}, + [SPECIES_WEEDLE] = {gMonBackPic_Weedle, 0x800, SPECIES_WEEDLE}, + [SPECIES_KAKUNA] = {gMonBackPic_Kakuna, 0x800, SPECIES_KAKUNA}, + [SPECIES_BEEDRILL] = {gMonBackPic_Beedrill, 0x800, SPECIES_BEEDRILL}, + [SPECIES_PIDGEY] = {gMonBackPic_Pidgey, 0x800, SPECIES_PIDGEY}, + [SPECIES_PIDGEOTTO] = {gMonBackPic_Pidgeotto, 0x800, SPECIES_PIDGEOTTO}, + [SPECIES_PIDGEOT] = {gMonBackPic_Pidgeot, 0x800, SPECIES_PIDGEOT}, + [SPECIES_RATTATA] = {gMonBackPic_Rattata, 0x800, SPECIES_RATTATA}, + [SPECIES_RATICATE] = {gMonBackPic_Raticate, 0x800, SPECIES_RATICATE}, + [SPECIES_SPEAROW] = {gMonBackPic_Spearow, 0x800, SPECIES_SPEAROW}, + [SPECIES_FEAROW] = {gMonBackPic_Fearow, 0x800, SPECIES_FEAROW}, + [SPECIES_EKANS] = {gMonBackPic_Ekans, 0x800, SPECIES_EKANS}, + [SPECIES_ARBOK] = {gMonBackPic_Arbok, 0x800, SPECIES_ARBOK}, + [SPECIES_PIKACHU] = {gMonBackPic_Pikachu, 0x800, SPECIES_PIKACHU}, + [SPECIES_RAICHU] = {gMonBackPic_Raichu, 0x800, SPECIES_RAICHU}, + [SPECIES_SANDSHREW] = {gMonBackPic_Sandshrew, 0x800, SPECIES_SANDSHREW}, + [SPECIES_SANDSLASH] = {gMonBackPic_Sandslash, 0x800, SPECIES_SANDSLASH}, + [SPECIES_NIDORAN_F] = {gMonBackPic_NidoranF, 0x800, SPECIES_NIDORAN_F}, + [SPECIES_NIDORINA] = {gMonBackPic_Nidorina, 0x800, SPECIES_NIDORINA}, + [SPECIES_NIDOQUEEN] = {gMonBackPic_Nidoqueen, 0x800, SPECIES_NIDOQUEEN}, + [SPECIES_NIDORAN_M] = {gMonBackPic_NidoranM, 0x800, SPECIES_NIDORAN_M}, + [SPECIES_NIDORINO] = {gMonBackPic_Nidorino, 0x800, SPECIES_NIDORINO}, + [SPECIES_NIDOKING] = {gMonBackPic_Nidoking, 0x800, SPECIES_NIDOKING}, + [SPECIES_CLEFAIRY] = {gMonBackPic_Clefairy, 0x800, SPECIES_CLEFAIRY}, + [SPECIES_CLEFABLE] = {gMonBackPic_Clefable, 0x800, SPECIES_CLEFABLE}, + [SPECIES_VULPIX] = {gMonBackPic_Vulpix, 0x800, SPECIES_VULPIX}, + [SPECIES_NINETALES] = {gMonBackPic_Ninetales, 0x800, SPECIES_NINETALES}, + [SPECIES_JIGGLYPUFF] = {gMonBackPic_Jigglypuff, 0x800, SPECIES_JIGGLYPUFF}, + [SPECIES_WIGGLYTUFF] = {gMonBackPic_Wigglytuff, 0x800, SPECIES_WIGGLYTUFF}, + [SPECIES_ZUBAT] = {gMonBackPic_Zubat, 0x800, SPECIES_ZUBAT}, + [SPECIES_GOLBAT] = {gMonBackPic_Golbat, 0x800, SPECIES_GOLBAT}, + [SPECIES_ODDISH] = {gMonBackPic_Oddish, 0x800, SPECIES_ODDISH}, + [SPECIES_GLOOM] = {gMonBackPic_Gloom, 0x800, SPECIES_GLOOM}, + [SPECIES_VILEPLUME] = {gMonBackPic_Vileplume, 0x800, SPECIES_VILEPLUME}, + [SPECIES_PARAS] = {gMonBackPic_Paras, 0x800, SPECIES_PARAS}, + [SPECIES_PARASECT] = {gMonBackPic_Parasect, 0x800, SPECIES_PARASECT}, + [SPECIES_VENONAT] = {gMonBackPic_Venonat, 0x800, SPECIES_VENONAT}, + [SPECIES_VENOMOTH] = {gMonBackPic_Venomoth, 0x800, SPECIES_VENOMOTH}, + [SPECIES_DIGLETT] = {gMonBackPic_Diglett, 0x800, SPECIES_DIGLETT}, + [SPECIES_DUGTRIO] = {gMonBackPic_Dugtrio, 0x800, SPECIES_DUGTRIO}, + [SPECIES_MEOWTH] = {gMonBackPic_Meowth, 0x800, SPECIES_MEOWTH}, + [SPECIES_PERSIAN] = {gMonBackPic_Persian, 0x800, SPECIES_PERSIAN}, + [SPECIES_PSYDUCK] = {gMonBackPic_Psyduck, 0x800, SPECIES_PSYDUCK}, + [SPECIES_GOLDUCK] = {gMonBackPic_Golduck, 0x800, SPECIES_GOLDUCK}, + [SPECIES_MANKEY] = {gMonBackPic_Mankey, 0x800, SPECIES_MANKEY}, + [SPECIES_PRIMEAPE] = {gMonBackPic_Primeape, 0x800, SPECIES_PRIMEAPE}, + [SPECIES_GROWLITHE] = {gMonBackPic_Growlithe, 0x800, SPECIES_GROWLITHE}, + [SPECIES_ARCANINE] = {gMonBackPic_Arcanine, 0x800, SPECIES_ARCANINE}, + [SPECIES_POLIWAG] = {gMonBackPic_Poliwag, 0x800, SPECIES_POLIWAG}, + [SPECIES_POLIWHIRL] = {gMonBackPic_Poliwhirl, 0x800, SPECIES_POLIWHIRL}, + [SPECIES_POLIWRATH] = {gMonBackPic_Poliwrath, 0x800, SPECIES_POLIWRATH}, + [SPECIES_ABRA] = {gMonBackPic_Abra, 0x800, SPECIES_ABRA}, + [SPECIES_KADABRA] = {gMonBackPic_Kadabra, 0x800, SPECIES_KADABRA}, + [SPECIES_ALAKAZAM] = {gMonBackPic_Alakazam, 0x800, SPECIES_ALAKAZAM}, + [SPECIES_MACHOP] = {gMonBackPic_Machop, 0x800, SPECIES_MACHOP}, + [SPECIES_MACHOKE] = {gMonBackPic_Machoke, 0x800, SPECIES_MACHOKE}, + [SPECIES_MACHAMP] = {gMonBackPic_Machamp, 0x800, SPECIES_MACHAMP}, + [SPECIES_BELLSPROUT] = {gMonBackPic_Bellsprout, 0x800, SPECIES_BELLSPROUT}, + [SPECIES_WEEPINBELL] = {gMonBackPic_Weepinbell, 0x800, SPECIES_WEEPINBELL}, + [SPECIES_VICTREEBEL] = {gMonBackPic_Victreebel, 0x800, SPECIES_VICTREEBEL}, + [SPECIES_TENTACOOL] = {gMonBackPic_Tentacool, 0x800, SPECIES_TENTACOOL}, + [SPECIES_TENTACRUEL] = {gMonBackPic_Tentacruel, 0x800, SPECIES_TENTACRUEL}, + [SPECIES_GEODUDE] = {gMonBackPic_Geodude, 0x800, SPECIES_GEODUDE}, + [SPECIES_GRAVELER] = {gMonBackPic_Graveler, 0x800, SPECIES_GRAVELER}, + [SPECIES_GOLEM] = {gMonBackPic_Golem, 0x800, SPECIES_GOLEM}, + [SPECIES_PONYTA] = {gMonBackPic_Ponyta, 0x800, SPECIES_PONYTA}, + [SPECIES_RAPIDASH] = {gMonBackPic_Rapidash, 0x800, SPECIES_RAPIDASH}, + [SPECIES_SLOWPOKE] = {gMonBackPic_Slowpoke, 0x800, SPECIES_SLOWPOKE}, + [SPECIES_SLOWBRO] = {gMonBackPic_Slowbro, 0x800, SPECIES_SLOWBRO}, + [SPECIES_MAGNEMITE] = {gMonBackPic_Magnemite, 0x800, SPECIES_MAGNEMITE}, + [SPECIES_MAGNETON] = {gMonBackPic_Magneton, 0x800, SPECIES_MAGNETON}, + [SPECIES_FARFETCHD] = {gMonBackPic_Farfetchd, 0x800, SPECIES_FARFETCHD}, + [SPECIES_DODUO] = {gMonBackPic_Doduo, 0x800, SPECIES_DODUO}, + [SPECIES_DODRIO] = {gMonBackPic_Dodrio, 0x800, SPECIES_DODRIO}, + [SPECIES_SEEL] = {gMonBackPic_Seel, 0x800, SPECIES_SEEL}, + [SPECIES_DEWGONG] = {gMonBackPic_Dewgong, 0x800, SPECIES_DEWGONG}, + [SPECIES_GRIMER] = {gMonBackPic_Grimer, 0x800, SPECIES_GRIMER}, + [SPECIES_MUK] = {gMonBackPic_Muk, 0x800, SPECIES_MUK}, + [SPECIES_SHELLDER] = {gMonBackPic_Shellder, 0x800, SPECIES_SHELLDER}, + [SPECIES_CLOYSTER] = {gMonBackPic_Cloyster, 0x800, SPECIES_CLOYSTER}, + [SPECIES_GASTLY] = {gMonBackPic_Gastly, 0x800, SPECIES_GASTLY}, + [SPECIES_HAUNTER] = {gMonBackPic_Haunter, 0x800, SPECIES_HAUNTER}, + [SPECIES_GENGAR] = {gMonBackPic_Gengar, 0x800, SPECIES_GENGAR}, + [SPECIES_ONIX] = {gMonBackPic_Onix, 0x800, SPECIES_ONIX}, + [SPECIES_DROWZEE] = {gMonBackPic_Drowzee, 0x800, SPECIES_DROWZEE}, + [SPECIES_HYPNO] = {gMonBackPic_Hypno, 0x800, SPECIES_HYPNO}, + [SPECIES_KRABBY] = {gMonBackPic_Krabby, 0x800, SPECIES_KRABBY}, + [SPECIES_KINGLER] = {gMonBackPic_Kingler, 0x800, SPECIES_KINGLER}, + [SPECIES_VOLTORB] = {gMonBackPic_Voltorb, 0x800, SPECIES_VOLTORB}, + [SPECIES_ELECTRODE] = {gMonBackPic_Electrode, 0x800, SPECIES_ELECTRODE}, + [SPECIES_EXEGGCUTE] = {gMonBackPic_Exeggcute, 0x800, SPECIES_EXEGGCUTE}, + [SPECIES_EXEGGUTOR] = {gMonBackPic_Exeggutor, 0x800, SPECIES_EXEGGUTOR}, + [SPECIES_CUBONE] = {gMonBackPic_Cubone, 0x800, SPECIES_CUBONE}, + [SPECIES_MAROWAK] = {gMonBackPic_Marowak, 0x800, SPECIES_MAROWAK}, + [SPECIES_HITMONLEE] = {gMonBackPic_Hitmonlee, 0x800, SPECIES_HITMONLEE}, + [SPECIES_HITMONCHAN] = {gMonBackPic_Hitmonchan, 0x800, SPECIES_HITMONCHAN}, + [SPECIES_LICKITUNG] = {gMonBackPic_Lickitung, 0x800, SPECIES_LICKITUNG}, + [SPECIES_KOFFING] = {gMonBackPic_Koffing, 0x800, SPECIES_KOFFING}, + [SPECIES_WEEZING] = {gMonBackPic_Weezing, 0x800, SPECIES_WEEZING}, + [SPECIES_RHYHORN] = {gMonBackPic_Rhyhorn, 0x800, SPECIES_RHYHORN}, + [SPECIES_RHYDON] = {gMonBackPic_Rhydon, 0x800, SPECIES_RHYDON}, + [SPECIES_CHANSEY] = {gMonBackPic_Chansey, 0x800, SPECIES_CHANSEY}, + [SPECIES_TANGELA] = {gMonBackPic_Tangela, 0x800, SPECIES_TANGELA}, + [SPECIES_KANGASKHAN] = {gMonBackPic_Kangaskhan, 0x800, SPECIES_KANGASKHAN}, + [SPECIES_HORSEA] = {gMonBackPic_Horsea, 0x800, SPECIES_HORSEA}, + [SPECIES_SEADRA] = {gMonBackPic_Seadra, 0x800, SPECIES_SEADRA}, + [SPECIES_GOLDEEN] = {gMonBackPic_Goldeen, 0x800, SPECIES_GOLDEEN}, + [SPECIES_SEAKING] = {gMonBackPic_Seaking, 0x800, SPECIES_SEAKING}, + [SPECIES_STARYU] = {gMonBackPic_Staryu, 0x800, SPECIES_STARYU}, + [SPECIES_STARMIE] = {gMonBackPic_Starmie, 0x800, SPECIES_STARMIE}, + [SPECIES_MR_MIME] = {gMonBackPic_Mrmime, 0x800, SPECIES_MR_MIME}, + [SPECIES_SCYTHER] = {gMonBackPic_Scyther, 0x800, SPECIES_SCYTHER}, + [SPECIES_JYNX] = {gMonBackPic_Jynx, 0x800, SPECIES_JYNX}, + [SPECIES_ELECTABUZZ] = {gMonBackPic_Electabuzz, 0x800, SPECIES_ELECTABUZZ}, + [SPECIES_MAGMAR] = {gMonBackPic_Magmar, 0x800, SPECIES_MAGMAR}, + [SPECIES_PINSIR] = {gMonBackPic_Pinsir, 0x800, SPECIES_PINSIR}, + [SPECIES_TAUROS] = {gMonBackPic_Tauros, 0x800, SPECIES_TAUROS}, + [SPECIES_MAGIKARP] = {gMonBackPic_Magikarp, 0x800, SPECIES_MAGIKARP}, + [SPECIES_GYARADOS] = {gMonBackPic_Gyarados, 0x800, SPECIES_GYARADOS}, + [SPECIES_LAPRAS] = {gMonBackPic_Lapras, 0x800, SPECIES_LAPRAS}, + [SPECIES_DITTO] = {gMonBackPic_Ditto, 0x800, SPECIES_DITTO}, + [SPECIES_EEVEE] = {gMonBackPic_Eevee, 0x800, SPECIES_EEVEE}, + [SPECIES_VAPOREON] = {gMonBackPic_Vaporeon, 0x800, SPECIES_VAPOREON}, + [SPECIES_JOLTEON] = {gMonBackPic_Jolteon, 0x800, SPECIES_JOLTEON}, + [SPECIES_FLAREON] = {gMonBackPic_Flareon, 0x800, SPECIES_FLAREON}, + [SPECIES_PORYGON] = {gMonBackPic_Porygon, 0x800, SPECIES_PORYGON}, + [SPECIES_OMANYTE] = {gMonBackPic_Omanyte, 0x800, SPECIES_OMANYTE}, + [SPECIES_OMASTAR] = {gMonBackPic_Omastar, 0x800, SPECIES_OMASTAR}, + [SPECIES_KABUTO] = {gMonBackPic_Kabuto, 0x800, SPECIES_KABUTO}, + [SPECIES_KABUTOPS] = {gMonBackPic_Kabutops, 0x800, SPECIES_KABUTOPS}, + [SPECIES_AERODACTYL] = {gMonBackPic_Aerodactyl, 0x800, SPECIES_AERODACTYL}, + [SPECIES_SNORLAX] = {gMonBackPic_Snorlax, 0x800, SPECIES_SNORLAX}, + [SPECIES_ARTICUNO] = {gMonBackPic_Articuno, 0x800, SPECIES_ARTICUNO}, + [SPECIES_ZAPDOS] = {gMonBackPic_Zapdos, 0x800, SPECIES_ZAPDOS}, + [SPECIES_MOLTRES] = {gMonBackPic_Moltres, 0x800, SPECIES_MOLTRES}, + [SPECIES_DRATINI] = {gMonBackPic_Dratini, 0x800, SPECIES_DRATINI}, + [SPECIES_DRAGONAIR] = {gMonBackPic_Dragonair, 0x800, SPECIES_DRAGONAIR}, + [SPECIES_DRAGONITE] = {gMonBackPic_Dragonite, 0x800, SPECIES_DRAGONITE}, + [SPECIES_MEWTWO] = {gMonBackPic_Mewtwo, 0x800, SPECIES_MEWTWO}, + [SPECIES_MEW] = {gMonBackPic_Mew, 0x800, SPECIES_MEW}, + [SPECIES_CHIKORITA] = {gMonBackPic_Chikorita, 0x800, SPECIES_CHIKORITA}, + [SPECIES_BAYLEEF] = {gMonBackPic_Bayleef, 0x800, SPECIES_BAYLEEF}, + [SPECIES_MEGANIUM] = {gMonBackPic_Meganium, 0x800, SPECIES_MEGANIUM}, + [SPECIES_CYNDAQUIL] = {gMonBackPic_Cyndaquil, 0x800, SPECIES_CYNDAQUIL}, + [SPECIES_QUILAVA] = {gMonBackPic_Quilava, 0x800, SPECIES_QUILAVA}, + [SPECIES_TYPHLOSION] = {gMonBackPic_Typhlosion, 0x800, SPECIES_TYPHLOSION}, + [SPECIES_TOTODILE] = {gMonBackPic_Totodile, 0x800, SPECIES_TOTODILE}, + [SPECIES_CROCONAW] = {gMonBackPic_Croconaw, 0x800, SPECIES_CROCONAW}, + [SPECIES_FERALIGATR] = {gMonBackPic_Feraligatr, 0x800, SPECIES_FERALIGATR}, + [SPECIES_SENTRET] = {gMonBackPic_Sentret, 0x800, SPECIES_SENTRET}, + [SPECIES_FURRET] = {gMonBackPic_Furret, 0x800, SPECIES_FURRET}, + [SPECIES_HOOTHOOT] = {gMonBackPic_Hoothoot, 0x800, SPECIES_HOOTHOOT}, + [SPECIES_NOCTOWL] = {gMonBackPic_Noctowl, 0x800, SPECIES_NOCTOWL}, + [SPECIES_LEDYBA] = {gMonBackPic_Ledyba, 0x800, SPECIES_LEDYBA}, + [SPECIES_LEDIAN] = {gMonBackPic_Ledian, 0x800, SPECIES_LEDIAN}, + [SPECIES_SPINARAK] = {gMonBackPic_Spinarak, 0x800, SPECIES_SPINARAK}, + [SPECIES_ARIADOS] = {gMonBackPic_Ariados, 0x800, SPECIES_ARIADOS}, + [SPECIES_CROBAT] = {gMonBackPic_Crobat, 0x800, SPECIES_CROBAT}, + [SPECIES_CHINCHOU] = {gMonBackPic_Chinchou, 0x800, SPECIES_CHINCHOU}, + [SPECIES_LANTURN] = {gMonBackPic_Lanturn, 0x800, SPECIES_LANTURN}, + [SPECIES_PICHU] = {gMonBackPic_Pichu, 0x800, SPECIES_PICHU}, + [SPECIES_CLEFFA] = {gMonBackPic_Cleffa, 0x800, SPECIES_CLEFFA}, + [SPECIES_IGGLYBUFF] = {gMonBackPic_Igglybuff, 0x800, SPECIES_IGGLYBUFF}, + [SPECIES_TOGEPI] = {gMonBackPic_Togepi, 0x800, SPECIES_TOGEPI}, + [SPECIES_TOGETIC] = {gMonBackPic_Togetic, 0x800, SPECIES_TOGETIC}, + [SPECIES_NATU] = {gMonBackPic_Natu, 0x800, SPECIES_NATU}, + [SPECIES_XATU] = {gMonBackPic_Xatu, 0x800, SPECIES_XATU}, + [SPECIES_MAREEP] = {gMonBackPic_Mareep, 0x800, SPECIES_MAREEP}, + [SPECIES_FLAAFFY] = {gMonBackPic_Flaaffy, 0x800, SPECIES_FLAAFFY}, + [SPECIES_AMPHAROS] = {gMonBackPic_Ampharos, 0x800, SPECIES_AMPHAROS}, + [SPECIES_BELLOSSOM] = {gMonBackPic_Bellossom, 0x800, SPECIES_BELLOSSOM}, + [SPECIES_MARILL] = {gMonBackPic_Marill, 0x800, SPECIES_MARILL}, + [SPECIES_AZUMARILL] = {gMonBackPic_Azumarill, 0x800, SPECIES_AZUMARILL}, + [SPECIES_SUDOWOODO] = {gMonBackPic_Sudowoodo, 0x800, SPECIES_SUDOWOODO}, + [SPECIES_POLITOED] = {gMonBackPic_Politoed, 0x800, SPECIES_POLITOED}, + [SPECIES_HOPPIP] = {gMonBackPic_Hoppip, 0x800, SPECIES_HOPPIP}, + [SPECIES_SKIPLOOM] = {gMonBackPic_Skiploom, 0x800, SPECIES_SKIPLOOM}, + [SPECIES_JUMPLUFF] = {gMonBackPic_Jumpluff, 0x800, SPECIES_JUMPLUFF}, + [SPECIES_AIPOM] = {gMonBackPic_Aipom, 0x800, SPECIES_AIPOM}, + [SPECIES_SUNKERN] = {gMonBackPic_Sunkern, 0x800, SPECIES_SUNKERN}, + [SPECIES_SUNFLORA] = {gMonBackPic_Sunflora, 0x800, SPECIES_SUNFLORA}, + [SPECIES_YANMA] = {gMonBackPic_Yanma, 0x800, SPECIES_YANMA}, + [SPECIES_WOOPER] = {gMonBackPic_Wooper, 0x800, SPECIES_WOOPER}, + [SPECIES_QUAGSIRE] = {gMonBackPic_Quagsire, 0x800, SPECIES_QUAGSIRE}, + [SPECIES_ESPEON] = {gMonBackPic_Espeon, 0x800, SPECIES_ESPEON}, + [SPECIES_UMBREON] = {gMonBackPic_Umbreon, 0x800, SPECIES_UMBREON}, + [SPECIES_MURKROW] = {gMonBackPic_Murkrow, 0x800, SPECIES_MURKROW}, + [SPECIES_SLOWKING] = {gMonBackPic_Slowking, 0x800, SPECIES_SLOWKING}, + [SPECIES_MISDREAVUS] = {gMonBackPic_Misdreavus, 0x800, SPECIES_MISDREAVUS}, + [SPECIES_UNOWN] = {gMonBackPic_UnownA, 0x800, SPECIES_UNOWN}, + [SPECIES_WOBBUFFET] = {gMonBackPic_Wobbuffet, 0x800, SPECIES_WOBBUFFET}, + [SPECIES_GIRAFARIG] = {gMonBackPic_Girafarig, 0x800, SPECIES_GIRAFARIG}, + [SPECIES_PINECO] = {gMonBackPic_Pineco, 0x800, SPECIES_PINECO}, + [SPECIES_FORRETRESS] = {gMonBackPic_Forretress, 0x800, SPECIES_FORRETRESS}, + [SPECIES_DUNSPARCE] = {gMonBackPic_Dunsparce, 0x800, SPECIES_DUNSPARCE}, + [SPECIES_GLIGAR] = {gMonBackPic_Gligar, 0x800, SPECIES_GLIGAR}, + [SPECIES_STEELIX] = {gMonBackPic_Steelix, 0x800, SPECIES_STEELIX}, + [SPECIES_SNUBBULL] = {gMonBackPic_Snubbull, 0x800, SPECIES_SNUBBULL}, + [SPECIES_GRANBULL] = {gMonBackPic_Granbull, 0x800, SPECIES_GRANBULL}, + [SPECIES_QWILFISH] = {gMonBackPic_Qwilfish, 0x800, SPECIES_QWILFISH}, + [SPECIES_SCIZOR] = {gMonBackPic_Scizor, 0x800, SPECIES_SCIZOR}, + [SPECIES_SHUCKLE] = {gMonBackPic_Shuckle, 0x800, SPECIES_SHUCKLE}, + [SPECIES_HERACROSS] = {gMonBackPic_Heracross, 0x800, SPECIES_HERACROSS}, + [SPECIES_SNEASEL] = {gMonBackPic_Sneasel, 0x800, SPECIES_SNEASEL}, + [SPECIES_TEDDIURSA] = {gMonBackPic_Teddiursa, 0x800, SPECIES_TEDDIURSA}, + [SPECIES_URSARING] = {gMonBackPic_Ursaring, 0x800, SPECIES_URSARING}, + [SPECIES_SLUGMA] = {gMonBackPic_Slugma, 0x800, SPECIES_SLUGMA}, + [SPECIES_MAGCARGO] = {gMonBackPic_Magcargo, 0x800, SPECIES_MAGCARGO}, + [SPECIES_SWINUB] = {gMonBackPic_Swinub, 0x800, SPECIES_SWINUB}, + [SPECIES_PILOSWINE] = {gMonBackPic_Piloswine, 0x800, SPECIES_PILOSWINE}, + [SPECIES_CORSOLA] = {gMonBackPic_Corsola, 0x800, SPECIES_CORSOLA}, + [SPECIES_REMORAID] = {gMonBackPic_Remoraid, 0x800, SPECIES_REMORAID}, + [SPECIES_OCTILLERY] = {gMonBackPic_Octillery, 0x800, SPECIES_OCTILLERY}, + [SPECIES_DELIBIRD] = {gMonBackPic_Delibird, 0x800, SPECIES_DELIBIRD}, + [SPECIES_MANTINE] = {gMonBackPic_Mantine, 0x800, SPECIES_MANTINE}, + [SPECIES_SKARMORY] = {gMonBackPic_Skarmory, 0x800, SPECIES_SKARMORY}, + [SPECIES_HOUNDOUR] = {gMonBackPic_Houndour, 0x800, SPECIES_HOUNDOUR}, + [SPECIES_HOUNDOOM] = {gMonBackPic_Houndoom, 0x800, SPECIES_HOUNDOOM}, + [SPECIES_KINGDRA] = {gMonBackPic_Kingdra, 0x800, SPECIES_KINGDRA}, + [SPECIES_PHANPY] = {gMonBackPic_Phanpy, 0x800, SPECIES_PHANPY}, + [SPECIES_DONPHAN] = {gMonBackPic_Donphan, 0x800, SPECIES_DONPHAN}, + [SPECIES_PORYGON2] = {gMonBackPic_Porygon2, 0x800, SPECIES_PORYGON2}, + [SPECIES_STANTLER] = {gMonBackPic_Stantler, 0x800, SPECIES_STANTLER}, + [SPECIES_SMEARGLE] = {gMonBackPic_Smeargle, 0x800, SPECIES_SMEARGLE}, + [SPECIES_TYROGUE] = {gMonBackPic_Tyrogue, 0x800, SPECIES_TYROGUE}, + [SPECIES_HITMONTOP] = {gMonBackPic_Hitmontop, 0x800, SPECIES_HITMONTOP}, + [SPECIES_SMOOCHUM] = {gMonBackPic_Smoochum, 0x800, SPECIES_SMOOCHUM}, + [SPECIES_ELEKID] = {gMonBackPic_Elekid, 0x800, SPECIES_ELEKID}, + [SPECIES_MAGBY] = {gMonBackPic_Magby, 0x800, SPECIES_MAGBY}, + [SPECIES_MILTANK] = {gMonBackPic_Miltank, 0x800, SPECIES_MILTANK}, + [SPECIES_BLISSEY] = {gMonBackPic_Blissey, 0x800, SPECIES_BLISSEY}, + [SPECIES_RAIKOU] = {gMonBackPic_Raikou, 0x800, SPECIES_RAIKOU}, + [SPECIES_ENTEI] = {gMonBackPic_Entei, 0x800, SPECIES_ENTEI}, + [SPECIES_SUICUNE] = {gMonBackPic_Suicune, 0x800, SPECIES_SUICUNE}, + [SPECIES_LARVITAR] = {gMonBackPic_Larvitar, 0x800, SPECIES_LARVITAR}, + [SPECIES_PUPITAR] = {gMonBackPic_Pupitar, 0x800, SPECIES_PUPITAR}, + [SPECIES_TYRANITAR] = {gMonBackPic_Tyranitar, 0x800, SPECIES_TYRANITAR}, + [SPECIES_LUGIA] = {gMonBackPic_Lugia, 0x800, SPECIES_LUGIA}, + [SPECIES_HO_OH] = {gMonBackPic_HoOh, 0x800, SPECIES_HO_OH}, + [SPECIES_CELEBI] = {gMonBackPic_Celebi, 0x800, SPECIES_CELEBI}, + [SPECIES_OLD_UNOWN_B] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_B}, + [SPECIES_OLD_UNOWN_C] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_C}, + [SPECIES_OLD_UNOWN_D] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_D}, + [SPECIES_OLD_UNOWN_E] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_E}, + [SPECIES_OLD_UNOWN_F] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_F}, + [SPECIES_OLD_UNOWN_G] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_G}, + [SPECIES_OLD_UNOWN_H] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_H}, + [SPECIES_OLD_UNOWN_I] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_I}, + [SPECIES_OLD_UNOWN_J] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_J}, + [SPECIES_OLD_UNOWN_K] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_K}, + [SPECIES_OLD_UNOWN_L] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_L}, + [SPECIES_OLD_UNOWN_M] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_M}, + [SPECIES_OLD_UNOWN_N] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_N}, + [SPECIES_OLD_UNOWN_O] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_O}, + [SPECIES_OLD_UNOWN_P] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_P}, + [SPECIES_OLD_UNOWN_Q] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Q}, + [SPECIES_OLD_UNOWN_R] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_R}, + [SPECIES_OLD_UNOWN_S] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_S}, + [SPECIES_OLD_UNOWN_T] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_T}, + [SPECIES_OLD_UNOWN_U] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_U}, + [SPECIES_OLD_UNOWN_V] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_V}, + [SPECIES_OLD_UNOWN_W] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_W}, + [SPECIES_OLD_UNOWN_X] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_X}, + [SPECIES_OLD_UNOWN_Y] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Y}, + [SPECIES_OLD_UNOWN_Z] = {gMonBackPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Z}, + [SPECIES_TREECKO] = {gMonBackPic_Treecko, 0x800, SPECIES_TREECKO}, + [SPECIES_GROVYLE] = {gMonBackPic_Grovyle, 0x800, SPECIES_GROVYLE}, + [SPECIES_SCEPTILE] = {gMonBackPic_Sceptile, 0x800, SPECIES_SCEPTILE}, + [SPECIES_TORCHIC] = {gMonBackPic_Torchic, 0x800, SPECIES_TORCHIC}, + [SPECIES_COMBUSKEN] = {gMonBackPic_Combusken, 0x800, SPECIES_COMBUSKEN}, + [SPECIES_BLAZIKEN] = {gMonBackPic_Blaziken, 0x800, SPECIES_BLAZIKEN}, + [SPECIES_MUDKIP] = {gMonBackPic_Mudkip, 0x800, SPECIES_MUDKIP}, + [SPECIES_MARSHTOMP] = {gMonBackPic_Marshtomp, 0x800, SPECIES_MARSHTOMP}, + [SPECIES_SWAMPERT] = {gMonBackPic_Swampert, 0x800, SPECIES_SWAMPERT}, + [SPECIES_POOCHYENA] = {gMonBackPic_Poochyena, 0x800, SPECIES_POOCHYENA}, + [SPECIES_MIGHTYENA] = {gMonBackPic_Mightyena, 0x800, SPECIES_MIGHTYENA}, + [SPECIES_ZIGZAGOON] = {gMonBackPic_Zigzagoon, 0x800, SPECIES_ZIGZAGOON}, + [SPECIES_LINOONE] = {gMonBackPic_Linoone, 0x800, SPECIES_LINOONE}, + [SPECIES_WURMPLE] = {gMonBackPic_Wurmple, 0x800, SPECIES_WURMPLE}, + [SPECIES_SILCOON] = {gMonBackPic_Silcoon, 0x800, SPECIES_SILCOON}, + [SPECIES_BEAUTIFLY] = {gMonBackPic_Beautifly, 0x800, SPECIES_BEAUTIFLY}, + [SPECIES_CASCOON] = {gMonBackPic_Cascoon, 0x800, SPECIES_CASCOON}, + [SPECIES_DUSTOX] = {gMonBackPic_Dustox, 0x800, SPECIES_DUSTOX}, + [SPECIES_LOTAD] = {gMonBackPic_Lotad, 0x800, SPECIES_LOTAD}, + [SPECIES_LOMBRE] = {gMonBackPic_Lombre, 0x800, SPECIES_LOMBRE}, + [SPECIES_LUDICOLO] = {gMonBackPic_Ludicolo, 0x800, SPECIES_LUDICOLO}, + [SPECIES_SEEDOT] = {gMonBackPic_Seedot, 0x800, SPECIES_SEEDOT}, + [SPECIES_NUZLEAF] = {gMonBackPic_Nuzleaf, 0x800, SPECIES_NUZLEAF}, + [SPECIES_SHIFTRY] = {gMonBackPic_Shiftry, 0x800, SPECIES_SHIFTRY}, + [SPECIES_NINCADA] = {gMonBackPic_Nincada, 0x800, SPECIES_NINCADA}, + [SPECIES_NINJASK] = {gMonBackPic_Ninjask, 0x800, SPECIES_NINJASK}, + [SPECIES_SHEDINJA] = {gMonBackPic_Shedinja, 0x800, SPECIES_SHEDINJA}, + [SPECIES_TAILLOW] = {gMonBackPic_Taillow, 0x800, SPECIES_TAILLOW}, + [SPECIES_SWELLOW] = {gMonBackPic_Swellow, 0x800, SPECIES_SWELLOW}, + [SPECIES_SHROOMISH] = {gMonBackPic_Shroomish, 0x800, SPECIES_SHROOMISH}, + [SPECIES_BRELOOM] = {gMonBackPic_Breloom, 0x800, SPECIES_BRELOOM}, + [SPECIES_SPINDA] = {gMonBackPic_Spinda, 0x800, SPECIES_SPINDA}, + [SPECIES_WINGULL] = {gMonBackPic_Wingull, 0x800, SPECIES_WINGULL}, + [SPECIES_PELIPPER] = {gMonBackPic_Pelipper, 0x800, SPECIES_PELIPPER}, + [SPECIES_SURSKIT] = {gMonBackPic_Surskit, 0x800, SPECIES_SURSKIT}, + [SPECIES_MASQUERAIN] = {gMonBackPic_Masquerain, 0x800, SPECIES_MASQUERAIN}, + [SPECIES_WAILMER] = {gMonBackPic_Wailmer, 0x800, SPECIES_WAILMER}, + [SPECIES_WAILORD] = {gMonBackPic_Wailord, 0x800, SPECIES_WAILORD}, + [SPECIES_SKITTY] = {gMonBackPic_Skitty, 0x800, SPECIES_SKITTY}, + [SPECIES_DELCATTY] = {gMonBackPic_Delcatty, 0x800, SPECIES_DELCATTY}, + [SPECIES_KECLEON] = {gMonBackPic_Kecleon, 0x800, SPECIES_KECLEON}, + [SPECIES_BALTOY] = {gMonBackPic_Baltoy, 0x800, SPECIES_BALTOY}, + [SPECIES_CLAYDOL] = {gMonBackPic_Claydol, 0x800, SPECIES_CLAYDOL}, + [SPECIES_NOSEPASS] = {gMonBackPic_Nosepass, 0x800, SPECIES_NOSEPASS}, + [SPECIES_TORKOAL] = {gMonBackPic_Torkoal, 0x800, SPECIES_TORKOAL}, + [SPECIES_SABLEYE] = {gMonBackPic_Sableye, 0x800, SPECIES_SABLEYE}, + [SPECIES_BARBOACH] = {gMonBackPic_Barboach, 0x800, SPECIES_BARBOACH}, + [SPECIES_WHISCASH] = {gMonBackPic_Whiscash, 0x800, SPECIES_WHISCASH}, + [SPECIES_LUVDISC] = {gMonBackPic_Luvdisc, 0x800, SPECIES_LUVDISC}, + [SPECIES_CORPHISH] = {gMonBackPic_Corphish, 0x800, SPECIES_CORPHISH}, + [SPECIES_CRAWDAUNT] = {gMonBackPic_Crawdaunt, 0x800, SPECIES_CRAWDAUNT}, + [SPECIES_FEEBAS] = {gMonBackPic_Feebas, 0x800, SPECIES_FEEBAS}, + [SPECIES_MILOTIC] = {gMonBackPic_Milotic, 0x800, SPECIES_MILOTIC}, + [SPECIES_CARVANHA] = {gMonBackPic_Carvanha, 0x800, SPECIES_CARVANHA}, + [SPECIES_SHARPEDO] = {gMonBackPic_Sharpedo, 0x800, SPECIES_SHARPEDO}, + [SPECIES_TRAPINCH] = {gMonBackPic_Trapinch, 0x800, SPECIES_TRAPINCH}, + [SPECIES_VIBRAVA] = {gMonBackPic_Vibrava, 0x800, SPECIES_VIBRAVA}, + [SPECIES_FLYGON] = {gMonBackPic_Flygon, 0x800, SPECIES_FLYGON}, + [SPECIES_MAKUHITA] = {gMonBackPic_Makuhita, 0x800, SPECIES_MAKUHITA}, + [SPECIES_HARIYAMA] = {gMonBackPic_Hariyama, 0x800, SPECIES_HARIYAMA}, + [SPECIES_ELECTRIKE] = {gMonBackPic_Electrike, 0x800, SPECIES_ELECTRIKE}, + [SPECIES_MANECTRIC] = {gMonBackPic_Manectric, 0x800, SPECIES_MANECTRIC}, + [SPECIES_NUMEL] = {gMonBackPic_Numel, 0x800, SPECIES_NUMEL}, + [SPECIES_CAMERUPT] = {gMonBackPic_Camerupt, 0x800, SPECIES_CAMERUPT}, + [SPECIES_SPHEAL] = {gMonBackPic_Spheal, 0x800, SPECIES_SPHEAL}, + [SPECIES_SEALEO] = {gMonBackPic_Sealeo, 0x800, SPECIES_SEALEO}, + [SPECIES_WALREIN] = {gMonBackPic_Walrein, 0x800, SPECIES_WALREIN}, + [SPECIES_CACNEA] = {gMonBackPic_Cacnea, 0x800, SPECIES_CACNEA}, + [SPECIES_CACTURNE] = {gMonBackPic_Cacturne, 0x800, SPECIES_CACTURNE}, + [SPECIES_SNORUNT] = {gMonBackPic_Snorunt, 0x800, SPECIES_SNORUNT}, + [SPECIES_GLALIE] = {gMonBackPic_Glalie, 0x800, SPECIES_GLALIE}, + [SPECIES_LUNATONE] = {gMonBackPic_Lunatone, 0x800, SPECIES_LUNATONE}, + [SPECIES_SOLROCK] = {gMonBackPic_Solrock, 0x800, SPECIES_SOLROCK}, + [SPECIES_AZURILL] = {gMonBackPic_Azurill, 0x800, SPECIES_AZURILL}, + [SPECIES_SPOINK] = {gMonBackPic_Spoink, 0x800, SPECIES_SPOINK}, + [SPECIES_GRUMPIG] = {gMonBackPic_Grumpig, 0x800, SPECIES_GRUMPIG}, + [SPECIES_PLUSLE] = {gMonBackPic_Plusle, 0x800, SPECIES_PLUSLE}, + [SPECIES_MINUN] = {gMonBackPic_Minun, 0x800, SPECIES_MINUN}, + [SPECIES_MAWILE] = {gMonBackPic_Mawile, 0x800, SPECIES_MAWILE}, + [SPECIES_MEDITITE] = {gMonBackPic_Meditite, 0x800, SPECIES_MEDITITE}, + [SPECIES_MEDICHAM] = {gMonBackPic_Medicham, 0x800, SPECIES_MEDICHAM}, + [SPECIES_SWABLU] = {gMonBackPic_Swablu, 0x800, SPECIES_SWABLU}, + [SPECIES_ALTARIA] = {gMonBackPic_Altaria, 0x800, SPECIES_ALTARIA}, + [SPECIES_WYNAUT] = {gMonBackPic_Wynaut, 0x800, SPECIES_WYNAUT}, + [SPECIES_DUSKULL] = {gMonBackPic_Duskull, 0x800, SPECIES_DUSKULL}, + [SPECIES_DUSCLOPS] = {gMonBackPic_Dusclops, 0x800, SPECIES_DUSCLOPS}, + [SPECIES_ROSELIA] = {gMonBackPic_Roselia, 0x800, SPECIES_ROSELIA}, + [SPECIES_SLAKOTH] = {gMonBackPic_Slakoth, 0x800, SPECIES_SLAKOTH}, + [SPECIES_VIGOROTH] = {gMonBackPic_Vigoroth, 0x800, SPECIES_VIGOROTH}, + [SPECIES_SLAKING] = {gMonBackPic_Slaking, 0x800, SPECIES_SLAKING}, + [SPECIES_GULPIN] = {gMonBackPic_Gulpin, 0x800, SPECIES_GULPIN}, + [SPECIES_SWALOT] = {gMonBackPic_Swalot, 0x800, SPECIES_SWALOT}, + [SPECIES_TROPIUS] = {gMonBackPic_Tropius, 0x800, SPECIES_TROPIUS}, + [SPECIES_WHISMUR] = {gMonBackPic_Whismur, 0x800, SPECIES_WHISMUR}, + [SPECIES_LOUDRED] = {gMonBackPic_Loudred, 0x800, SPECIES_LOUDRED}, + [SPECIES_EXPLOUD] = {gMonBackPic_Exploud, 0x800, SPECIES_EXPLOUD}, + [SPECIES_CLAMPERL] = {gMonBackPic_Clamperl, 0x800, SPECIES_CLAMPERL}, + [SPECIES_HUNTAIL] = {gMonBackPic_Huntail, 0x800, SPECIES_HUNTAIL}, + [SPECIES_GOREBYSS] = {gMonBackPic_Gorebyss, 0x800, SPECIES_GOREBYSS}, + [SPECIES_ABSOL] = {gMonBackPic_Absol, 0x800, SPECIES_ABSOL}, + [SPECIES_SHUPPET] = {gMonBackPic_Shuppet, 0x800, SPECIES_SHUPPET}, + [SPECIES_BANETTE] = {gMonBackPic_Banette, 0x800, SPECIES_BANETTE}, + [SPECIES_SEVIPER] = {gMonBackPic_Seviper, 0x800, SPECIES_SEVIPER}, + [SPECIES_ZANGOOSE] = {gMonBackPic_Zangoose, 0x800, SPECIES_ZANGOOSE}, + [SPECIES_RELICANTH] = {gMonBackPic_Relicanth, 0x800, SPECIES_RELICANTH}, + [SPECIES_ARON] = {gMonBackPic_Aron, 0x800, SPECIES_ARON}, + [SPECIES_LAIRON] = {gMonBackPic_Lairon, 0x800, SPECIES_LAIRON}, + [SPECIES_AGGRON] = {gMonBackPic_Aggron, 0x800, SPECIES_AGGRON}, + [SPECIES_CASTFORM] = {gMonBackPic_Castform, 0x800, SPECIES_CASTFORM}, + [SPECIES_VOLBEAT] = {gMonBackPic_Volbeat, 0x800, SPECIES_VOLBEAT}, + [SPECIES_ILLUMISE] = {gMonBackPic_Illumise, 0x800, SPECIES_ILLUMISE}, + [SPECIES_LILEEP] = {gMonBackPic_Lileep, 0x800, SPECIES_LILEEP}, + [SPECIES_CRADILY] = {gMonBackPic_Cradily, 0x800, SPECIES_CRADILY}, + [SPECIES_ANORITH] = {gMonBackPic_Anorith, 0x800, SPECIES_ANORITH}, + [SPECIES_ARMALDO] = {gMonBackPic_Armaldo, 0x800, SPECIES_ARMALDO}, + [SPECIES_RALTS] = {gMonBackPic_Ralts, 0x800, SPECIES_RALTS}, + [SPECIES_KIRLIA] = {gMonBackPic_Kirlia, 0x800, SPECIES_KIRLIA}, + [SPECIES_GARDEVOIR] = {gMonBackPic_Gardevoir, 0x800, SPECIES_GARDEVOIR}, + [SPECIES_BAGON] = {gMonBackPic_Bagon, 0x800, SPECIES_BAGON}, + [SPECIES_SHELGON] = {gMonBackPic_Shelgon, 0x800, SPECIES_SHELGON}, + [SPECIES_SALAMENCE] = {gMonBackPic_Salamence, 0x800, SPECIES_SALAMENCE}, + [SPECIES_BELDUM] = {gMonBackPic_Beldum, 0x800, SPECIES_BELDUM}, + [SPECIES_METANG] = {gMonBackPic_Metang, 0x800, SPECIES_METANG}, + [SPECIES_METAGROSS] = {gMonBackPic_Metagross, 0x800, SPECIES_METAGROSS}, + [SPECIES_REGIROCK] = {gMonBackPic_Regirock, 0x800, SPECIES_REGIROCK}, + [SPECIES_REGICE] = {gMonBackPic_Regice, 0x800, SPECIES_REGICE}, + [SPECIES_REGISTEEL] = {gMonBackPic_Registeel, 0x800, SPECIES_REGISTEEL}, + [SPECIES_KYOGRE] = {gMonBackPic_Kyogre, 0x800, SPECIES_KYOGRE}, + [SPECIES_GROUDON] = {gMonBackPic_Groudon, 0x800, SPECIES_GROUDON}, + [SPECIES_RAYQUAZA] = {gMonBackPic_Rayquaza, 0x800, SPECIES_RAYQUAZA}, + [SPECIES_LATIAS] = {gMonBackPic_Latias, 0x800, SPECIES_LATIAS}, + [SPECIES_LATIOS] = {gMonBackPic_Latios, 0x800, SPECIES_LATIOS}, + [SPECIES_JIRACHI] = {gMonBackPic_Jirachi, 0x800, SPECIES_JIRACHI}, + [SPECIES_DEOXYS] = {gMonBackPic_Deoxys, 0x800, SPECIES_DEOXYS}, + [SPECIES_CHIMECHO] = {gMonBackPic_Chimecho, 0x800, SPECIES_CHIMECHO}, + [SPECIES_EGG] = {gMonStillFrontPic_Egg, 0x800, SPECIES_EGG}, + [SPECIES_UNOWN_B] = {gMonBackPic_UnownB, 0x800, SPECIES_UNOWN_B}, + [SPECIES_UNOWN_C] = {gMonBackPic_UnownC, 0x800, SPECIES_UNOWN_C}, + [SPECIES_UNOWN_D] = {gMonBackPic_UnownD, 0x800, SPECIES_UNOWN_D}, + [SPECIES_UNOWN_E] = {gMonBackPic_UnownE, 0x800, SPECIES_UNOWN_E}, + [SPECIES_UNOWN_F] = {gMonBackPic_UnownF, 0x800, SPECIES_UNOWN_F}, + [SPECIES_UNOWN_G] = {gMonBackPic_UnownG, 0x800, SPECIES_UNOWN_G}, + [SPECIES_UNOWN_H] = {gMonBackPic_UnownH, 0x800, SPECIES_UNOWN_H}, + [SPECIES_UNOWN_I] = {gMonBackPic_UnownI, 0x800, SPECIES_UNOWN_I}, + [SPECIES_UNOWN_J] = {gMonBackPic_UnownJ, 0x800, SPECIES_UNOWN_J}, + [SPECIES_UNOWN_K] = {gMonBackPic_UnownK, 0x800, SPECIES_UNOWN_K}, + [SPECIES_UNOWN_L] = {gMonBackPic_UnownL, 0x800, SPECIES_UNOWN_L}, + [SPECIES_UNOWN_M] = {gMonBackPic_UnownM, 0x800, SPECIES_UNOWN_M}, + [SPECIES_UNOWN_N] = {gMonBackPic_UnownN, 0x800, SPECIES_UNOWN_N}, + [SPECIES_UNOWN_O] = {gMonBackPic_UnownO, 0x800, SPECIES_UNOWN_O}, + [SPECIES_UNOWN_P] = {gMonBackPic_UnownP, 0x800, SPECIES_UNOWN_P}, + [SPECIES_UNOWN_Q] = {gMonBackPic_UnownQ, 0x800, SPECIES_UNOWN_Q}, + [SPECIES_UNOWN_R] = {gMonBackPic_UnownR, 0x800, SPECIES_UNOWN_R}, + [SPECIES_UNOWN_S] = {gMonBackPic_UnownS, 0x800, SPECIES_UNOWN_S}, + [SPECIES_UNOWN_T] = {gMonBackPic_UnownT, 0x800, SPECIES_UNOWN_T}, + [SPECIES_UNOWN_U] = {gMonBackPic_UnownU, 0x800, SPECIES_UNOWN_U}, + [SPECIES_UNOWN_V] = {gMonBackPic_UnownV, 0x800, SPECIES_UNOWN_V}, + [SPECIES_UNOWN_W] = {gMonBackPic_UnownW, 0x800, SPECIES_UNOWN_W}, + [SPECIES_UNOWN_X] = {gMonBackPic_UnownX, 0x800, SPECIES_UNOWN_X}, + [SPECIES_UNOWN_Y] = {gMonBackPic_UnownY, 0x800, SPECIES_UNOWN_Y}, + [SPECIES_UNOWN_Z] = {gMonBackPic_UnownZ, 0x800, SPECIES_UNOWN_Z}, + [SPECIES_UNOWN_EMARK] = {gMonBackPic_UnownExclamationMark, 0x800, SPECIES_UNOWN_EMARK}, + [SPECIES_UNOWN_QMARK] = {gMonBackPic_UnownQuestionMark, 0x800, SPECIES_UNOWN_QMARK}, }; + diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 5aa22f4f8..92e6bab2e 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1,446 +1,443 @@ -const struct CompressedSpriteSheet gMonFrontPicTable[] = -{ //.data .size .tag - gMonFrontPic_CircledQuestionMark, 0x800, 0, - gMonFrontPic_Bulbasaur, 0x800, 1, - gMonFrontPic_Ivysaur, 0x800, 2, - gMonFrontPic_Venusaur, 0x800, 3, - gMonFrontPic_Charmander, 0x800, 4, - gMonFrontPic_Charmeleon, 0x800, 5, - gMonFrontPic_Charizard, 0x800, 6, - gMonFrontPic_Squirtle, 0x800, 7, - gMonFrontPic_Wartortle, 0x800, 8, - gMonFrontPic_Blastoise, 0x800, 9, - gMonFrontPic_Caterpie, 0x800, 10, - gMonFrontPic_Metapod, 0x800, 11, - gMonFrontPic_Butterfree, 0x800, 12, - gMonFrontPic_Weedle, 0x800, 13, - gMonFrontPic_Kakuna, 0x800, 14, - gMonFrontPic_Beedrill, 0x800, 15, - gMonFrontPic_Pidgey, 0x800, 16, - gMonFrontPic_Pidgeotto, 0x800, 17, - gMonFrontPic_Pidgeot, 0x800, 18, - gMonFrontPic_Rattata, 0x800, 19, - gMonFrontPic_Raticate, 0x800, 20, - gMonFrontPic_Spearow, 0x800, 21, - gMonFrontPic_Fearow, 0x800, 22, - gMonFrontPic_Ekans, 0x800, 23, - gMonFrontPic_Arbok, 0x800, 24, - gMonFrontPic_Pikachu, 0x800, 25, - gMonFrontPic_Raichu, 0x800, 26, - gMonFrontPic_Sandshrew, 0x800, 27, - gMonFrontPic_Sandslash, 0x800, 28, - gMonFrontPic_NidoranF, 0x800, 29, - gMonFrontPic_Nidorina, 0x800, 30, - gMonFrontPic_Nidoqueen, 0x800, 31, - gMonFrontPic_NidoranM, 0x800, 32, - gMonFrontPic_Nidorino, 0x800, 33, - gMonFrontPic_Nidoking, 0x800, 34, - gMonFrontPic_Clefairy, 0x800, 35, - gMonFrontPic_Clefable, 0x800, 36, - gMonFrontPic_Vulpix, 0x800, 37, - gMonFrontPic_Ninetales, 0x800, 38, - gMonFrontPic_Jigglypuff, 0x800, 39, - gMonFrontPic_Wigglytuff, 0x800, 40, - gMonFrontPic_Zubat, 0x800, 41, - gMonFrontPic_Golbat, 0x800, 42, - gMonFrontPic_Oddish, 0x800, 43, - gMonFrontPic_Gloom, 0x800, 44, - gMonFrontPic_Vileplume, 0x800, 45, - gMonFrontPic_Paras, 0x800, 46, - gMonFrontPic_Parasect, 0x800, 47, - gMonFrontPic_Venonat, 0x800, 48, - gMonFrontPic_Venomoth, 0x800, 49, - gMonFrontPic_Diglett, 0x800, 50, - gMonFrontPic_Dugtrio, 0x800, 51, - gMonFrontPic_Meowth, 0x800, 52, - gMonFrontPic_Persian, 0x800, 53, - gMonFrontPic_Psyduck, 0x800, 54, - gMonFrontPic_Golduck, 0x800, 55, - gMonFrontPic_Mankey, 0x800, 56, - gMonFrontPic_Primeape, 0x800, 57, - gMonFrontPic_Growlithe, 0x800, 58, - gMonFrontPic_Arcanine, 0x800, 59, - gMonFrontPic_Poliwag, 0x800, 60, - gMonFrontPic_Poliwhirl, 0x800, 61, - gMonFrontPic_Poliwrath, 0x800, 62, - gMonFrontPic_Abra, 0x800, 63, - gMonFrontPic_Kadabra, 0x800, 64, - gMonFrontPic_Alakazam, 0x800, 65, - gMonFrontPic_Machop, 0x800, 66, - gMonFrontPic_Machoke, 0x800, 67, - gMonFrontPic_Machamp, 0x800, 68, - gMonFrontPic_Bellsprout, 0x800, 69, - gMonFrontPic_Weepinbell, 0x800, 70, - gMonFrontPic_Victreebel, 0x800, 71, - gMonFrontPic_Tentacool, 0x800, 72, - gMonFrontPic_Tentacruel, 0x800, 73, - gMonFrontPic_Geodude, 0x800, 74, - gMonFrontPic_Graveler, 0x800, 75, - gMonFrontPic_Golem, 0x800, 76, - gMonFrontPic_Ponyta, 0x800, 77, - gMonFrontPic_Rapidash, 0x800, 78, - gMonFrontPic_Slowpoke, 0x800, 79, - gMonFrontPic_Slowbro, 0x800, 80, - gMonFrontPic_Magnemite, 0x800, 81, - gMonFrontPic_Magneton, 0x800, 82, - gMonFrontPic_Farfetchd, 0x800, 83, - gMonFrontPic_Doduo, 0x800, 84, - gMonFrontPic_Dodrio, 0x800, 85, - gMonFrontPic_Seel, 0x800, 86, - gMonFrontPic_Dewgong, 0x800, 87, - gMonFrontPic_Grimer, 0x800, 88, - gMonFrontPic_Muk, 0x800, 89, - gMonFrontPic_Shellder, 0x800, 90, - gMonFrontPic_Cloyster, 0x800, 91, - gMonFrontPic_Gastly, 0x800, 92, - gMonFrontPic_Haunter, 0x800, 93, - gMonFrontPic_Gengar, 0x800, 94, - gMonFrontPic_Onix, 0x800, 95, - gMonFrontPic_Drowzee, 0x800, 96, - gMonFrontPic_Hypno, 0x800, 97, - gMonFrontPic_Krabby, 0x800, 98, - gMonFrontPic_Kingler, 0x800, 99, - gMonFrontPic_Voltorb, 0x800, 100, - gMonFrontPic_Electrode, 0x800, 101, - gMonFrontPic_Exeggcute, 0x800, 102, - gMonFrontPic_Exeggutor, 0x800, 103, - gMonFrontPic_Cubone, 0x800, 104, - gMonFrontPic_Marowak, 0x800, 105, - gMonFrontPic_Hitmonlee, 0x800, 106, - gMonFrontPic_Hitmonchan, 0x800, 107, - gMonFrontPic_Lickitung, 0x800, 108, - gMonFrontPic_Koffing, 0x800, 109, - gMonFrontPic_Weezing, 0x800, 110, - gMonFrontPic_Rhyhorn, 0x800, 111, - gMonFrontPic_Rhydon, 0x800, 112, - gMonFrontPic_Chansey, 0x800, 113, - gMonFrontPic_Tangela, 0x800, 114, - gMonFrontPic_Kangaskhan, 0x800, 115, - gMonFrontPic_Horsea, 0x800, 116, - gMonFrontPic_Seadra, 0x800, 117, - gMonFrontPic_Goldeen, 0x800, 118, - gMonFrontPic_Seaking, 0x800, 119, - gMonFrontPic_Staryu, 0x800, 120, - gMonFrontPic_Starmie, 0x800, 121, - gMonFrontPic_Mrmime, 0x800, 122, - gMonFrontPic_Scyther, 0x800, 123, - gMonFrontPic_Jynx, 0x800, 124, - gMonFrontPic_Electabuzz, 0x800, 125, - gMonFrontPic_Magmar, 0x800, 126, - gMonFrontPic_Pinsir, 0x800, 127, - gMonFrontPic_Tauros, 0x800, 128, - gMonFrontPic_Magikarp, 0x800, 129, - gMonFrontPic_Gyarados, 0x800, 130, - gMonFrontPic_Lapras, 0x800, 131, - gMonFrontPic_Ditto, 0x800, 132, - gMonFrontPic_Eevee, 0x800, 133, - gMonFrontPic_Vaporeon, 0x800, 134, - gMonFrontPic_Jolteon, 0x800, 135, - gMonFrontPic_Flareon, 0x800, 136, - gMonFrontPic_Porygon, 0x800, 137, - gMonFrontPic_Omanyte, 0x800, 138, - gMonFrontPic_Omastar, 0x800, 139, - gMonFrontPic_Kabuto, 0x800, 140, - gMonFrontPic_Kabutops, 0x800, 141, - gMonFrontPic_Aerodactyl, 0x800, 142, - gMonFrontPic_Snorlax, 0x800, 143, - gMonFrontPic_Articuno, 0x800, 144, - gMonFrontPic_Zapdos, 0x800, 145, - gMonFrontPic_Moltres, 0x800, 146, - gMonFrontPic_Dratini, 0x800, 147, - gMonFrontPic_Dragonair, 0x800, 148, - gMonFrontPic_Dragonite, 0x800, 149, - gMonFrontPic_Mewtwo, 0x800, 150, - gMonFrontPic_Mew, 0x800, 151, -// Gen II - gMonFrontPic_Chikorita, 0x800, 152, - gMonFrontPic_Bayleef, 0x800, 153, - gMonFrontPic_Meganium, 0x800, 154, - gMonFrontPic_Cyndaquil, 0x800, 155, - gMonFrontPic_Quilava, 0x800, 156, - gMonFrontPic_Typhlosion, 0x800, 157, - gMonFrontPic_Totodile, 0x800, 158, - gMonFrontPic_Croconaw, 0x800, 159, - gMonFrontPic_Feraligatr, 0x800, 160, - gMonFrontPic_Sentret, 0x800, 161, - gMonFrontPic_Furret, 0x800, 162, - gMonFrontPic_Hoothoot, 0x800, 163, - gMonFrontPic_Noctowl, 0x800, 164, - gMonFrontPic_Ledyba, 0x800, 165, - gMonFrontPic_Ledian, 0x800, 166, - gMonFrontPic_Spinarak, 0x800, 167, - gMonFrontPic_Ariados, 0x800, 168, - gMonFrontPic_Crobat, 0x800, 169, - gMonFrontPic_Chinchou, 0x800, 170, - gMonFrontPic_Lanturn, 0x800, 171, - gMonFrontPic_Pichu, 0x800, 172, - gMonFrontPic_Cleffa, 0x800, 173, - gMonFrontPic_Igglybuff, 0x800, 174, - gMonFrontPic_Togepi, 0x800, 175, - gMonFrontPic_Togetic, 0x800, 176, - gMonFrontPic_Natu, 0x800, 177, - gMonFrontPic_Xatu, 0x800, 178, - gMonFrontPic_Mareep, 0x800, 179, - gMonFrontPic_Flaaffy, 0x800, 180, - gMonFrontPic_Ampharos, 0x800, 181, - gMonFrontPic_Bellossom, 0x800, 182, - gMonFrontPic_Marill, 0x800, 183, - gMonFrontPic_Azumarill, 0x800, 184, - gMonFrontPic_Sudowoodo, 0x800, 185, - gMonFrontPic_Politoed, 0x800, 186, - gMonFrontPic_Hoppip, 0x800, 187, - gMonFrontPic_Skiploom, 0x800, 188, - gMonFrontPic_Jumpluff, 0x800, 189, - gMonFrontPic_Aipom, 0x800, 190, - gMonFrontPic_Sunkern, 0x800, 191, - gMonFrontPic_Sunflora, 0x800, 192, - gMonFrontPic_Yanma, 0x800, 193, - gMonFrontPic_Wooper, 0x800, 194, - gMonFrontPic_Quagsire, 0x800, 195, - gMonFrontPic_Espeon, 0x800, 196, - gMonFrontPic_Umbreon, 0x800, 197, - gMonFrontPic_Murkrow, 0x800, 198, - gMonFrontPic_Slowking, 0x800, 199, - gMonFrontPic_Misdreavus, 0x800, 200, - gMonFrontPic_UnownA, 0x800, 201, - gMonFrontPic_Wobbuffet, 0x800, 202, - gMonFrontPic_Girafarig, 0x800, 203, - gMonFrontPic_Pineco, 0x800, 204, - gMonFrontPic_Forretress, 0x800, 205, - gMonFrontPic_Dunsparce, 0x800, 206, - gMonFrontPic_Gligar, 0x800, 207, - gMonFrontPic_Steelix, 0x800, 208, - gMonFrontPic_Snubbull, 0x800, 209, - gMonFrontPic_Granbull, 0x800, 210, - gMonFrontPic_Qwilfish, 0x800, 211, - gMonFrontPic_Scizor, 0x800, 212, - gMonFrontPic_Shuckle, 0x800, 213, - gMonFrontPic_Heracross, 0x800, 214, - gMonFrontPic_Sneasel, 0x800, 215, - gMonFrontPic_Teddiursa, 0x800, 216, - gMonFrontPic_Ursaring, 0x800, 217, - gMonFrontPic_Slugma, 0x800, 218, - gMonFrontPic_Magcargo, 0x800, 219, - gMonFrontPic_Swinub, 0x800, 220, - gMonFrontPic_Piloswine, 0x800, 221, - gMonFrontPic_Corsola, 0x800, 222, - gMonFrontPic_Remoraid, 0x800, 223, - gMonFrontPic_Octillery, 0x800, 224, - gMonFrontPic_Delibird, 0x800, 225, - gMonFrontPic_Mantine, 0x800, 226, - gMonFrontPic_Skarmory, 0x800, 227, - gMonFrontPic_Houndour, 0x800, 228, - gMonFrontPic_Houndoom, 0x800, 229, - gMonFrontPic_Kingdra, 0x800, 230, - gMonFrontPic_Phanpy, 0x800, 231, - gMonFrontPic_Donphan, 0x800, 232, - gMonFrontPic_Porygon2, 0x800, 233, - gMonFrontPic_Stantler, 0x800, 234, - gMonFrontPic_Smeargle, 0x800, 235, - gMonFrontPic_Tyrogue, 0x800, 236, - gMonFrontPic_Hitmontop, 0x800, 237, - gMonFrontPic_Smoochum, 0x800, 238, - gMonFrontPic_Elekid, 0x800, 239, - gMonFrontPic_Magby, 0x800, 240, - gMonFrontPic_Miltank, 0x800, 241, - gMonFrontPic_Blissey, 0x800, 242, - gMonFrontPic_Raikou, 0x800, 243, - gMonFrontPic_Entei, 0x800, 244, - gMonFrontPic_Suicune, 0x800, 245, - gMonFrontPic_Larvitar, 0x800, 246, - gMonFrontPic_Pupitar, 0x800, 247, - gMonFrontPic_Tyranitar, 0x800, 248, - gMonFrontPic_Lugia, 0x800, 249, - gMonFrontPic_HoOh, 0x800, 250, - gMonFrontPic_Celebi, 0x800, 251, -// Empty slots - gMonFrontPic_DoubleQuestionMark, 0x800, 252, - gMonFrontPic_DoubleQuestionMark, 0x800, 253, - gMonFrontPic_DoubleQuestionMark, 0x800, 254, - gMonFrontPic_DoubleQuestionMark, 0x800, 255, - gMonFrontPic_DoubleQuestionMark, 0x800, 256, - gMonFrontPic_DoubleQuestionMark, 0x800, 257, - gMonFrontPic_DoubleQuestionMark, 0x800, 258, - gMonFrontPic_DoubleQuestionMark, 0x800, 259, - gMonFrontPic_DoubleQuestionMark, 0x800, 260, - gMonFrontPic_DoubleQuestionMark, 0x800, 261, - gMonFrontPic_DoubleQuestionMark, 0x800, 262, - gMonFrontPic_DoubleQuestionMark, 0x800, 263, - gMonFrontPic_DoubleQuestionMark, 0x800, 264, - gMonFrontPic_DoubleQuestionMark, 0x800, 265, - gMonFrontPic_DoubleQuestionMark, 0x800, 266, - gMonFrontPic_DoubleQuestionMark, 0x800, 267, - gMonFrontPic_DoubleQuestionMark, 0x800, 268, - gMonFrontPic_DoubleQuestionMark, 0x800, 269, - gMonFrontPic_DoubleQuestionMark, 0x800, 270, - gMonFrontPic_DoubleQuestionMark, 0x800, 271, - gMonFrontPic_DoubleQuestionMark, 0x800, 272, - gMonFrontPic_DoubleQuestionMark, 0x800, 273, - gMonFrontPic_DoubleQuestionMark, 0x800, 274, - gMonFrontPic_DoubleQuestionMark, 0x800, 275, - gMonFrontPic_DoubleQuestionMark, 0x800, 276, -// Gen III - gMonFrontPic_Treecko, 0x800, 277, - gMonFrontPic_Grovyle, 0x800, 278, - gMonFrontPic_Sceptile, 0x800, 279, - gMonFrontPic_Torchic, 0x800, 280, - gMonFrontPic_Combusken, 0x800, 281, - gMonFrontPic_Blaziken, 0x800, 282, - gMonFrontPic_Mudkip, 0x800, 283, - gMonFrontPic_Marshtomp, 0x800, 284, - gMonFrontPic_Swampert, 0x800, 285, - gMonFrontPic_Poochyena, 0x800, 286, - gMonFrontPic_Mightyena, 0x800, 287, - gMonFrontPic_Zigzagoon, 0x800, 288, - gMonFrontPic_Linoone, 0x800, 289, - gMonFrontPic_Wurmple, 0x800, 290, - gMonFrontPic_Silcoon, 0x800, 291, - gMonFrontPic_Beautifly, 0x800, 292, - gMonFrontPic_Cascoon, 0x800, 293, - gMonFrontPic_Dustox, 0x800, 294, - gMonFrontPic_Lotad, 0x800, 295, - gMonFrontPic_Lombre, 0x800, 296, - gMonFrontPic_Ludicolo, 0x800, 297, - gMonFrontPic_Seedot, 0x800, 298, - gMonFrontPic_Nuzleaf, 0x800, 299, - gMonFrontPic_Shiftry, 0x800, 300, - gMonFrontPic_Nincada, 0x800, 301, - gMonFrontPic_Ninjask, 0x800, 302, - gMonFrontPic_Shedinja, 0x800, 303, - gMonFrontPic_Taillow, 0x800, 304, - gMonFrontPic_Swellow, 0x800, 305, - gMonFrontPic_Shroomish, 0x800, 306, - gMonFrontPic_Breloom, 0x800, 307, - gMonFrontPic_Spinda, 0x800, 308, - gMonFrontPic_Wingull, 0x800, 309, - gMonFrontPic_Pelipper, 0x800, 310, - gMonFrontPic_Surskit, 0x800, 311, - gMonFrontPic_Masquerain, 0x800, 312, - gMonFrontPic_Wailmer, 0x800, 313, - gMonFrontPic_Wailord, 0x800, 314, - gMonFrontPic_Skitty, 0x800, 315, - gMonFrontPic_Delcatty, 0x800, 316, - gMonFrontPic_Kecleon, 0x800, 317, - gMonFrontPic_Baltoy, 0x800, 318, - gMonFrontPic_Claydol, 0x800, 319, - gMonFrontPic_Nosepass, 0x800, 320, - gMonFrontPic_Torkoal, 0x800, 321, - gMonFrontPic_Sableye, 0x800, 322, - gMonFrontPic_Barboach, 0x800, 323, - gMonFrontPic_Whiscash, 0x800, 324, - gMonFrontPic_Luvdisc, 0x800, 325, - gMonFrontPic_Corphish, 0x800, 326, - gMonFrontPic_Crawdaunt, 0x800, 327, - gMonFrontPic_Feebas, 0x800, 328, - gMonFrontPic_Milotic, 0x800, 329, - gMonFrontPic_Carvanha, 0x800, 330, - gMonFrontPic_Sharpedo, 0x800, 331, - gMonFrontPic_Trapinch, 0x800, 332, - gMonFrontPic_Vibrava, 0x800, 333, - gMonFrontPic_Flygon, 0x800, 334, - gMonFrontPic_Makuhita, 0x800, 335, - gMonFrontPic_Hariyama, 0x800, 336, - gMonFrontPic_Electrike, 0x800, 337, - gMonFrontPic_Manectric, 0x800, 338, - gMonFrontPic_Numel, 0x800, 339, - gMonFrontPic_Camerupt, 0x800, 340, - gMonFrontPic_Spheal, 0x800, 341, - gMonFrontPic_Sealeo, 0x800, 342, - gMonFrontPic_Walrein, 0x800, 343, - gMonFrontPic_Cacnea, 0x800, 344, - gMonFrontPic_Cacturne, 0x800, 345, - gMonFrontPic_Snorunt, 0x800, 346, - gMonFrontPic_Glalie, 0x800, 347, - gMonFrontPic_Lunatone, 0x800, 348, - gMonFrontPic_Solrock, 0x800, 349, - gMonFrontPic_Azurill, 0x800, 350, - gMonFrontPic_Spoink, 0x800, 351, - gMonFrontPic_Grumpig, 0x800, 352, - gMonFrontPic_Plusle, 0x800, 353, - gMonFrontPic_Minun, 0x800, 354, - gMonFrontPic_Mawile, 0x800, 355, - gMonFrontPic_Meditite, 0x800, 356, - gMonFrontPic_Medicham, 0x800, 357, - gMonFrontPic_Swablu, 0x800, 358, - gMonFrontPic_Altaria, 0x800, 359, - gMonFrontPic_Wynaut, 0x800, 360, - gMonFrontPic_Duskull, 0x800, 361, - gMonFrontPic_Dusclops, 0x800, 362, - gMonFrontPic_Roselia, 0x800, 363, - gMonFrontPic_Slakoth, 0x800, 364, - gMonFrontPic_Vigoroth, 0x800, 365, - gMonFrontPic_Slaking, 0x800, 366, - gMonFrontPic_Gulpin, 0x800, 367, - gMonFrontPic_Swalot, 0x800, 368, - gMonFrontPic_Tropius, 0x800, 369, - gMonFrontPic_Whismur, 0x800, 370, - gMonFrontPic_Loudred, 0x800, 371, - gMonFrontPic_Exploud, 0x800, 372, - gMonFrontPic_Clamperl, 0x800, 373, - gMonFrontPic_Huntail, 0x800, 374, - gMonFrontPic_Gorebyss, 0x800, 375, - gMonFrontPic_Absol, 0x800, 376, - gMonFrontPic_Shuppet, 0x800, 377, - gMonFrontPic_Banette, 0x800, 378, - gMonFrontPic_Seviper, 0x800, 379, - gMonFrontPic_Zangoose, 0x800, 380, - gMonFrontPic_Relicanth, 0x800, 381, - gMonFrontPic_Aron, 0x800, 382, - gMonFrontPic_Lairon, 0x800, 383, - gMonFrontPic_Aggron, 0x800, 384, - gMonFrontPic_Castform, 0x800, 385, - gMonFrontPic_Volbeat, 0x800, 386, - gMonFrontPic_Illumise, 0x800, 387, - gMonFrontPic_Lileep, 0x800, 388, - gMonFrontPic_Cradily, 0x800, 389, - gMonFrontPic_Anorith, 0x800, 390, - gMonFrontPic_Armaldo, 0x800, 391, - gMonFrontPic_Ralts, 0x800, 392, - gMonFrontPic_Kirlia, 0x800, 393, - gMonFrontPic_Gardevoir, 0x800, 394, - gMonFrontPic_Bagon, 0x800, 395, - gMonFrontPic_Shelgon, 0x800, 396, - gMonFrontPic_Salamence, 0x800, 397, - gMonFrontPic_Beldum, 0x800, 398, - gMonFrontPic_Metang, 0x800, 399, - gMonFrontPic_Metagross, 0x800, 400, - gMonFrontPic_Regirock, 0x800, 401, - gMonFrontPic_Regice, 0x800, 402, - gMonFrontPic_Registeel, 0x800, 403, - gMonFrontPic_Kyogre, 0x800, 404, - gMonFrontPic_Groudon, 0x800, 405, - gMonFrontPic_Rayquaza, 0x800, 406, - gMonFrontPic_Latias, 0x800, 407, - gMonFrontPic_Latios, 0x800, 408, - gMonFrontPic_Jirachi, 0x800, 409, - gMonFrontPic_Deoxys, 0x800, 410, - gMonFrontPic_Chimecho, 0x800, 411, - gMonFrontPic_Egg, 0x800, 412, - gMonFrontPic_UnownB, 0x800, 413, - gMonFrontPic_UnownC, 0x800, 414, - gMonFrontPic_UnownD, 0x800, 415, - gMonFrontPic_UnownE, 0x800, 416, - gMonFrontPic_UnownF, 0x800, 417, - gMonFrontPic_UnownG, 0x800, 418, - gMonFrontPic_UnownH, 0x800, 419, - gMonFrontPic_UnownI, 0x800, 420, - gMonFrontPic_UnownJ, 0x800, 421, - gMonFrontPic_UnownK, 0x800, 422, - gMonFrontPic_UnownL, 0x800, 423, - gMonFrontPic_UnownM, 0x800, 424, - gMonFrontPic_UnownN, 0x800, 425, - gMonFrontPic_UnownO, 0x800, 426, - gMonFrontPic_UnownP, 0x800, 427, - gMonFrontPic_UnownQ, 0x800, 428, - gMonFrontPic_UnownR, 0x800, 429, - gMonFrontPic_UnownS, 0x800, 430, - gMonFrontPic_UnownT, 0x800, 431, - gMonFrontPic_UnownU, 0x800, 432, - gMonFrontPic_UnownV, 0x800, 433, - gMonFrontPic_UnownW, 0x800, 434, - gMonFrontPic_UnownX, 0x800, 435, - gMonFrontPic_UnownY, 0x800, 436, - gMonFrontPic_UnownZ, 0x800, 437, - gMonFrontPic_UnownExclamationMark, 0x800, 438, - gMonFrontPic_UnownQuestionMark, 0x800, 439, +const struct CompressedSpriteSheet gMonFrontPicTable[] = +{ + [SPECIES_NONE] = {gMonFrontPic_CircledQuestionMark, 0x800, SPECIES_NONE}, + [SPECIES_BULBASAUR] = {gMonFrontPic_Bulbasaur, 0x800, SPECIES_BULBASAUR}, + [SPECIES_IVYSAUR] = {gMonFrontPic_Ivysaur, 0x800, SPECIES_IVYSAUR}, + [SPECIES_VENUSAUR] = {gMonFrontPic_Venusaur, 0x800, SPECIES_VENUSAUR}, + [SPECIES_CHARMANDER] = {gMonFrontPic_Charmander, 0x800, SPECIES_CHARMANDER}, + [SPECIES_CHARMELEON] = {gMonFrontPic_Charmeleon, 0x800, SPECIES_CHARMELEON}, + [SPECIES_CHARIZARD] = {gMonFrontPic_Charizard, 0x800, SPECIES_CHARIZARD}, + [SPECIES_SQUIRTLE] = {gMonFrontPic_Squirtle, 0x800, SPECIES_SQUIRTLE}, + [SPECIES_WARTORTLE] = {gMonFrontPic_Wartortle, 0x800, SPECIES_WARTORTLE}, + [SPECIES_BLASTOISE] = {gMonFrontPic_Blastoise, 0x800, SPECIES_BLASTOISE}, + [SPECIES_CATERPIE] = {gMonFrontPic_Caterpie, 0x800, SPECIES_CATERPIE}, + [SPECIES_METAPOD] = {gMonFrontPic_Metapod, 0x800, SPECIES_METAPOD}, + [SPECIES_BUTTERFREE] = {gMonFrontPic_Butterfree, 0x800, SPECIES_BUTTERFREE}, + [SPECIES_WEEDLE] = {gMonFrontPic_Weedle, 0x800, SPECIES_WEEDLE}, + [SPECIES_KAKUNA] = {gMonFrontPic_Kakuna, 0x800, SPECIES_KAKUNA}, + [SPECIES_BEEDRILL] = {gMonFrontPic_Beedrill, 0x800, SPECIES_BEEDRILL}, + [SPECIES_PIDGEY] = {gMonFrontPic_Pidgey, 0x800, SPECIES_PIDGEY}, + [SPECIES_PIDGEOTTO] = {gMonFrontPic_Pidgeotto, 0x800, SPECIES_PIDGEOTTO}, + [SPECIES_PIDGEOT] = {gMonFrontPic_Pidgeot, 0x800, SPECIES_PIDGEOT}, + [SPECIES_RATTATA] = {gMonFrontPic_Rattata, 0x800, SPECIES_RATTATA}, + [SPECIES_RATICATE] = {gMonFrontPic_Raticate, 0x800, SPECIES_RATICATE}, + [SPECIES_SPEAROW] = {gMonFrontPic_Spearow, 0x800, SPECIES_SPEAROW}, + [SPECIES_FEAROW] = {gMonFrontPic_Fearow, 0x800, SPECIES_FEAROW}, + [SPECIES_EKANS] = {gMonFrontPic_Ekans, 0x800, SPECIES_EKANS}, + [SPECIES_ARBOK] = {gMonFrontPic_Arbok, 0x800, SPECIES_ARBOK}, + [SPECIES_PIKACHU] = {gMonFrontPic_Pikachu, 0x800, SPECIES_PIKACHU}, + [SPECIES_RAICHU] = {gMonFrontPic_Raichu, 0x800, SPECIES_RAICHU}, + [SPECIES_SANDSHREW] = {gMonFrontPic_Sandshrew, 0x800, SPECIES_SANDSHREW}, + [SPECIES_SANDSLASH] = {gMonFrontPic_Sandslash, 0x800, SPECIES_SANDSLASH}, + [SPECIES_NIDORAN_F] = {gMonFrontPic_NidoranF, 0x800, SPECIES_NIDORAN_F}, + [SPECIES_NIDORINA] = {gMonFrontPic_Nidorina, 0x800, SPECIES_NIDORINA}, + [SPECIES_NIDOQUEEN] = {gMonFrontPic_Nidoqueen, 0x800, SPECIES_NIDOQUEEN}, + [SPECIES_NIDORAN_M] = {gMonFrontPic_NidoranM, 0x800, SPECIES_NIDORAN_M}, + [SPECIES_NIDORINO] = {gMonFrontPic_Nidorino, 0x800, SPECIES_NIDORINO}, + [SPECIES_NIDOKING] = {gMonFrontPic_Nidoking, 0x800, SPECIES_NIDOKING}, + [SPECIES_CLEFAIRY] = {gMonFrontPic_Clefairy, 0x800, SPECIES_CLEFAIRY}, + [SPECIES_CLEFABLE] = {gMonFrontPic_Clefable, 0x800, SPECIES_CLEFABLE}, + [SPECIES_VULPIX] = {gMonFrontPic_Vulpix, 0x800, SPECIES_VULPIX}, + [SPECIES_NINETALES] = {gMonFrontPic_Ninetales, 0x800, SPECIES_NINETALES}, + [SPECIES_JIGGLYPUFF] = {gMonFrontPic_Jigglypuff, 0x800, SPECIES_JIGGLYPUFF}, + [SPECIES_WIGGLYTUFF] = {gMonFrontPic_Wigglytuff, 0x800, SPECIES_WIGGLYTUFF}, + [SPECIES_ZUBAT] = {gMonFrontPic_Zubat, 0x800, SPECIES_ZUBAT}, + [SPECIES_GOLBAT] = {gMonFrontPic_Golbat, 0x800, SPECIES_GOLBAT}, + [SPECIES_ODDISH] = {gMonFrontPic_Oddish, 0x800, SPECIES_ODDISH}, + [SPECIES_GLOOM] = {gMonFrontPic_Gloom, 0x800, SPECIES_GLOOM}, + [SPECIES_VILEPLUME] = {gMonFrontPic_Vileplume, 0x800, SPECIES_VILEPLUME}, + [SPECIES_PARAS] = {gMonFrontPic_Paras, 0x800, SPECIES_PARAS}, + [SPECIES_PARASECT] = {gMonFrontPic_Parasect, 0x800, SPECIES_PARASECT}, + [SPECIES_VENONAT] = {gMonFrontPic_Venonat, 0x800, SPECIES_VENONAT}, + [SPECIES_VENOMOTH] = {gMonFrontPic_Venomoth, 0x800, SPECIES_VENOMOTH}, + [SPECIES_DIGLETT] = {gMonFrontPic_Diglett, 0x800, SPECIES_DIGLETT}, + [SPECIES_DUGTRIO] = {gMonFrontPic_Dugtrio, 0x800, SPECIES_DUGTRIO}, + [SPECIES_MEOWTH] = {gMonFrontPic_Meowth, 0x800, SPECIES_MEOWTH}, + [SPECIES_PERSIAN] = {gMonFrontPic_Persian, 0x800, SPECIES_PERSIAN}, + [SPECIES_PSYDUCK] = {gMonFrontPic_Psyduck, 0x800, SPECIES_PSYDUCK}, + [SPECIES_GOLDUCK] = {gMonFrontPic_Golduck, 0x800, SPECIES_GOLDUCK}, + [SPECIES_MANKEY] = {gMonFrontPic_Mankey, 0x800, SPECIES_MANKEY}, + [SPECIES_PRIMEAPE] = {gMonFrontPic_Primeape, 0x800, SPECIES_PRIMEAPE}, + [SPECIES_GROWLITHE] = {gMonFrontPic_Growlithe, 0x800, SPECIES_GROWLITHE}, + [SPECIES_ARCANINE] = {gMonFrontPic_Arcanine, 0x800, SPECIES_ARCANINE}, + [SPECIES_POLIWAG] = {gMonFrontPic_Poliwag, 0x800, SPECIES_POLIWAG}, + [SPECIES_POLIWHIRL] = {gMonFrontPic_Poliwhirl, 0x800, SPECIES_POLIWHIRL}, + [SPECIES_POLIWRATH] = {gMonFrontPic_Poliwrath, 0x800, SPECIES_POLIWRATH}, + [SPECIES_ABRA] = {gMonFrontPic_Abra, 0x800, SPECIES_ABRA}, + [SPECIES_KADABRA] = {gMonFrontPic_Kadabra, 0x800, SPECIES_KADABRA}, + [SPECIES_ALAKAZAM] = {gMonFrontPic_Alakazam, 0x800, SPECIES_ALAKAZAM}, + [SPECIES_MACHOP] = {gMonFrontPic_Machop, 0x800, SPECIES_MACHOP}, + [SPECIES_MACHOKE] = {gMonFrontPic_Machoke, 0x800, SPECIES_MACHOKE}, + [SPECIES_MACHAMP] = {gMonFrontPic_Machamp, 0x800, SPECIES_MACHAMP}, + [SPECIES_BELLSPROUT] = {gMonFrontPic_Bellsprout, 0x800, SPECIES_BELLSPROUT}, + [SPECIES_WEEPINBELL] = {gMonFrontPic_Weepinbell, 0x800, SPECIES_WEEPINBELL}, + [SPECIES_VICTREEBEL] = {gMonFrontPic_Victreebel, 0x800, SPECIES_VICTREEBEL}, + [SPECIES_TENTACOOL] = {gMonFrontPic_Tentacool, 0x800, SPECIES_TENTACOOL}, + [SPECIES_TENTACRUEL] = {gMonFrontPic_Tentacruel, 0x800, SPECIES_TENTACRUEL}, + [SPECIES_GEODUDE] = {gMonFrontPic_Geodude, 0x800, SPECIES_GEODUDE}, + [SPECIES_GRAVELER] = {gMonFrontPic_Graveler, 0x800, SPECIES_GRAVELER}, + [SPECIES_GOLEM] = {gMonFrontPic_Golem, 0x800, SPECIES_GOLEM}, + [SPECIES_PONYTA] = {gMonFrontPic_Ponyta, 0x800, SPECIES_PONYTA}, + [SPECIES_RAPIDASH] = {gMonFrontPic_Rapidash, 0x800, SPECIES_RAPIDASH}, + [SPECIES_SLOWPOKE] = {gMonFrontPic_Slowpoke, 0x800, SPECIES_SLOWPOKE}, + [SPECIES_SLOWBRO] = {gMonFrontPic_Slowbro, 0x800, SPECIES_SLOWBRO}, + [SPECIES_MAGNEMITE] = {gMonFrontPic_Magnemite, 0x800, SPECIES_MAGNEMITE}, + [SPECIES_MAGNETON] = {gMonFrontPic_Magneton, 0x800, SPECIES_MAGNETON}, + [SPECIES_FARFETCHD] = {gMonFrontPic_Farfetchd, 0x800, SPECIES_FARFETCHD}, + [SPECIES_DODUO] = {gMonFrontPic_Doduo, 0x800, SPECIES_DODUO}, + [SPECIES_DODRIO] = {gMonFrontPic_Dodrio, 0x800, SPECIES_DODRIO}, + [SPECIES_SEEL] = {gMonFrontPic_Seel, 0x800, SPECIES_SEEL}, + [SPECIES_DEWGONG] = {gMonFrontPic_Dewgong, 0x800, SPECIES_DEWGONG}, + [SPECIES_GRIMER] = {gMonFrontPic_Grimer, 0x800, SPECIES_GRIMER}, + [SPECIES_MUK] = {gMonFrontPic_Muk, 0x800, SPECIES_MUK}, + [SPECIES_SHELLDER] = {gMonFrontPic_Shellder, 0x800, SPECIES_SHELLDER}, + [SPECIES_CLOYSTER] = {gMonFrontPic_Cloyster, 0x800, SPECIES_CLOYSTER}, + [SPECIES_GASTLY] = {gMonFrontPic_Gastly, 0x800, SPECIES_GASTLY}, + [SPECIES_HAUNTER] = {gMonFrontPic_Haunter, 0x800, SPECIES_HAUNTER}, + [SPECIES_GENGAR] = {gMonFrontPic_Gengar, 0x800, SPECIES_GENGAR}, + [SPECIES_ONIX] = {gMonFrontPic_Onix, 0x800, SPECIES_ONIX}, + [SPECIES_DROWZEE] = {gMonFrontPic_Drowzee, 0x800, SPECIES_DROWZEE}, + [SPECIES_HYPNO] = {gMonFrontPic_Hypno, 0x800, SPECIES_HYPNO}, + [SPECIES_KRABBY] = {gMonFrontPic_Krabby, 0x800, SPECIES_KRABBY}, + [SPECIES_KINGLER] = {gMonFrontPic_Kingler, 0x800, SPECIES_KINGLER}, + [SPECIES_VOLTORB] = {gMonFrontPic_Voltorb, 0x800, SPECIES_VOLTORB}, + [SPECIES_ELECTRODE] = {gMonFrontPic_Electrode, 0x800, SPECIES_ELECTRODE}, + [SPECIES_EXEGGCUTE] = {gMonFrontPic_Exeggcute, 0x800, SPECIES_EXEGGCUTE}, + [SPECIES_EXEGGUTOR] = {gMonFrontPic_Exeggutor, 0x800, SPECIES_EXEGGUTOR}, + [SPECIES_CUBONE] = {gMonFrontPic_Cubone, 0x800, SPECIES_CUBONE}, + [SPECIES_MAROWAK] = {gMonFrontPic_Marowak, 0x800, SPECIES_MAROWAK}, + [SPECIES_HITMONLEE] = {gMonFrontPic_Hitmonlee, 0x800, SPECIES_HITMONLEE}, + [SPECIES_HITMONCHAN] = {gMonFrontPic_Hitmonchan, 0x800, SPECIES_HITMONCHAN}, + [SPECIES_LICKITUNG] = {gMonFrontPic_Lickitung, 0x800, SPECIES_LICKITUNG}, + [SPECIES_KOFFING] = {gMonFrontPic_Koffing, 0x800, SPECIES_KOFFING}, + [SPECIES_WEEZING] = {gMonFrontPic_Weezing, 0x800, SPECIES_WEEZING}, + [SPECIES_RHYHORN] = {gMonFrontPic_Rhyhorn, 0x800, SPECIES_RHYHORN}, + [SPECIES_RHYDON] = {gMonFrontPic_Rhydon, 0x800, SPECIES_RHYDON}, + [SPECIES_CHANSEY] = {gMonFrontPic_Chansey, 0x800, SPECIES_CHANSEY}, + [SPECIES_TANGELA] = {gMonFrontPic_Tangela, 0x800, SPECIES_TANGELA}, + [SPECIES_KANGASKHAN] = {gMonFrontPic_Kangaskhan, 0x800, SPECIES_KANGASKHAN}, + [SPECIES_HORSEA] = {gMonFrontPic_Horsea, 0x800, SPECIES_HORSEA}, + [SPECIES_SEADRA] = {gMonFrontPic_Seadra, 0x800, SPECIES_SEADRA}, + [SPECIES_GOLDEEN] = {gMonFrontPic_Goldeen, 0x800, SPECIES_GOLDEEN}, + [SPECIES_SEAKING] = {gMonFrontPic_Seaking, 0x800, SPECIES_SEAKING}, + [SPECIES_STARYU] = {gMonFrontPic_Staryu, 0x800, SPECIES_STARYU}, + [SPECIES_STARMIE] = {gMonFrontPic_Starmie, 0x800, SPECIES_STARMIE}, + [SPECIES_MR_MIME] = {gMonFrontPic_Mrmime, 0x800, SPECIES_MR_MIME}, + [SPECIES_SCYTHER] = {gMonFrontPic_Scyther, 0x800, SPECIES_SCYTHER}, + [SPECIES_JYNX] = {gMonFrontPic_Jynx, 0x800, SPECIES_JYNX}, + [SPECIES_ELECTABUZZ] = {gMonFrontPic_Electabuzz, 0x800, SPECIES_ELECTABUZZ}, + [SPECIES_MAGMAR] = {gMonFrontPic_Magmar, 0x800, SPECIES_MAGMAR}, + [SPECIES_PINSIR] = {gMonFrontPic_Pinsir, 0x800, SPECIES_PINSIR}, + [SPECIES_TAUROS] = {gMonFrontPic_Tauros, 0x800, SPECIES_TAUROS}, + [SPECIES_MAGIKARP] = {gMonFrontPic_Magikarp, 0x800, SPECIES_MAGIKARP}, + [SPECIES_GYARADOS] = {gMonFrontPic_Gyarados, 0x800, SPECIES_GYARADOS}, + [SPECIES_LAPRAS] = {gMonFrontPic_Lapras, 0x800, SPECIES_LAPRAS}, + [SPECIES_DITTO] = {gMonFrontPic_Ditto, 0x800, SPECIES_DITTO}, + [SPECIES_EEVEE] = {gMonFrontPic_Eevee, 0x800, SPECIES_EEVEE}, + [SPECIES_VAPOREON] = {gMonFrontPic_Vaporeon, 0x800, SPECIES_VAPOREON}, + [SPECIES_JOLTEON] = {gMonFrontPic_Jolteon, 0x800, SPECIES_JOLTEON}, + [SPECIES_FLAREON] = {gMonFrontPic_Flareon, 0x800, SPECIES_FLAREON}, + [SPECIES_PORYGON] = {gMonFrontPic_Porygon, 0x800, SPECIES_PORYGON}, + [SPECIES_OMANYTE] = {gMonFrontPic_Omanyte, 0x800, SPECIES_OMANYTE}, + [SPECIES_OMASTAR] = {gMonFrontPic_Omastar, 0x800, SPECIES_OMASTAR}, + [SPECIES_KABUTO] = {gMonFrontPic_Kabuto, 0x800, SPECIES_KABUTO}, + [SPECIES_KABUTOPS] = {gMonFrontPic_Kabutops, 0x800, SPECIES_KABUTOPS}, + [SPECIES_AERODACTYL] = {gMonFrontPic_Aerodactyl, 0x800, SPECIES_AERODACTYL}, + [SPECIES_SNORLAX] = {gMonFrontPic_Snorlax, 0x800, SPECIES_SNORLAX}, + [SPECIES_ARTICUNO] = {gMonFrontPic_Articuno, 0x800, SPECIES_ARTICUNO}, + [SPECIES_ZAPDOS] = {gMonFrontPic_Zapdos, 0x800, SPECIES_ZAPDOS}, + [SPECIES_MOLTRES] = {gMonFrontPic_Moltres, 0x800, SPECIES_MOLTRES}, + [SPECIES_DRATINI] = {gMonFrontPic_Dratini, 0x800, SPECIES_DRATINI}, + [SPECIES_DRAGONAIR] = {gMonFrontPic_Dragonair, 0x800, SPECIES_DRAGONAIR}, + [SPECIES_DRAGONITE] = {gMonFrontPic_Dragonite, 0x800, SPECIES_DRAGONITE}, + [SPECIES_MEWTWO] = {gMonFrontPic_Mewtwo, 0x800, SPECIES_MEWTWO}, + [SPECIES_MEW] = {gMonFrontPic_Mew, 0x800, SPECIES_MEW}, + [SPECIES_CHIKORITA] = {gMonFrontPic_Chikorita, 0x800, SPECIES_CHIKORITA}, + [SPECIES_BAYLEEF] = {gMonFrontPic_Bayleef, 0x800, SPECIES_BAYLEEF}, + [SPECIES_MEGANIUM] = {gMonFrontPic_Meganium, 0x800, SPECIES_MEGANIUM}, + [SPECIES_CYNDAQUIL] = {gMonFrontPic_Cyndaquil, 0x800, SPECIES_CYNDAQUIL}, + [SPECIES_QUILAVA] = {gMonFrontPic_Quilava, 0x800, SPECIES_QUILAVA}, + [SPECIES_TYPHLOSION] = {gMonFrontPic_Typhlosion, 0x800, SPECIES_TYPHLOSION}, + [SPECIES_TOTODILE] = {gMonFrontPic_Totodile, 0x800, SPECIES_TOTODILE}, + [SPECIES_CROCONAW] = {gMonFrontPic_Croconaw, 0x800, SPECIES_CROCONAW}, + [SPECIES_FERALIGATR] = {gMonFrontPic_Feraligatr, 0x800, SPECIES_FERALIGATR}, + [SPECIES_SENTRET] = {gMonFrontPic_Sentret, 0x800, SPECIES_SENTRET}, + [SPECIES_FURRET] = {gMonFrontPic_Furret, 0x800, SPECIES_FURRET}, + [SPECIES_HOOTHOOT] = {gMonFrontPic_Hoothoot, 0x800, SPECIES_HOOTHOOT}, + [SPECIES_NOCTOWL] = {gMonFrontPic_Noctowl, 0x800, SPECIES_NOCTOWL}, + [SPECIES_LEDYBA] = {gMonFrontPic_Ledyba, 0x800, SPECIES_LEDYBA}, + [SPECIES_LEDIAN] = {gMonFrontPic_Ledian, 0x800, SPECIES_LEDIAN}, + [SPECIES_SPINARAK] = {gMonFrontPic_Spinarak, 0x800, SPECIES_SPINARAK}, + [SPECIES_ARIADOS] = {gMonFrontPic_Ariados, 0x800, SPECIES_ARIADOS}, + [SPECIES_CROBAT] = {gMonFrontPic_Crobat, 0x800, SPECIES_CROBAT}, + [SPECIES_CHINCHOU] = {gMonFrontPic_Chinchou, 0x800, SPECIES_CHINCHOU}, + [SPECIES_LANTURN] = {gMonFrontPic_Lanturn, 0x800, SPECIES_LANTURN}, + [SPECIES_PICHU] = {gMonFrontPic_Pichu, 0x800, SPECIES_PICHU}, + [SPECIES_CLEFFA] = {gMonFrontPic_Cleffa, 0x800, SPECIES_CLEFFA}, + [SPECIES_IGGLYBUFF] = {gMonFrontPic_Igglybuff, 0x800, SPECIES_IGGLYBUFF}, + [SPECIES_TOGEPI] = {gMonFrontPic_Togepi, 0x800, SPECIES_TOGEPI}, + [SPECIES_TOGETIC] = {gMonFrontPic_Togetic, 0x800, SPECIES_TOGETIC}, + [SPECIES_NATU] = {gMonFrontPic_Natu, 0x800, SPECIES_NATU}, + [SPECIES_XATU] = {gMonFrontPic_Xatu, 0x800, SPECIES_XATU}, + [SPECIES_MAREEP] = {gMonFrontPic_Mareep, 0x800, SPECIES_MAREEP}, + [SPECIES_FLAAFFY] = {gMonFrontPic_Flaaffy, 0x800, SPECIES_FLAAFFY}, + [SPECIES_AMPHAROS] = {gMonFrontPic_Ampharos, 0x800, SPECIES_AMPHAROS}, + [SPECIES_BELLOSSOM] = {gMonFrontPic_Bellossom, 0x800, SPECIES_BELLOSSOM}, + [SPECIES_MARILL] = {gMonFrontPic_Marill, 0x800, SPECIES_MARILL}, + [SPECIES_AZUMARILL] = {gMonFrontPic_Azumarill, 0x800, SPECIES_AZUMARILL}, + [SPECIES_SUDOWOODO] = {gMonFrontPic_Sudowoodo, 0x800, SPECIES_SUDOWOODO}, + [SPECIES_POLITOED] = {gMonFrontPic_Politoed, 0x800, SPECIES_POLITOED}, + [SPECIES_HOPPIP] = {gMonFrontPic_Hoppip, 0x800, SPECIES_HOPPIP}, + [SPECIES_SKIPLOOM] = {gMonFrontPic_Skiploom, 0x800, SPECIES_SKIPLOOM}, + [SPECIES_JUMPLUFF] = {gMonFrontPic_Jumpluff, 0x800, SPECIES_JUMPLUFF}, + [SPECIES_AIPOM] = {gMonFrontPic_Aipom, 0x800, SPECIES_AIPOM}, + [SPECIES_SUNKERN] = {gMonFrontPic_Sunkern, 0x800, SPECIES_SUNKERN}, + [SPECIES_SUNFLORA] = {gMonFrontPic_Sunflora, 0x800, SPECIES_SUNFLORA}, + [SPECIES_YANMA] = {gMonFrontPic_Yanma, 0x800, SPECIES_YANMA}, + [SPECIES_WOOPER] = {gMonFrontPic_Wooper, 0x800, SPECIES_WOOPER}, + [SPECIES_QUAGSIRE] = {gMonFrontPic_Quagsire, 0x800, SPECIES_QUAGSIRE}, + [SPECIES_ESPEON] = {gMonFrontPic_Espeon, 0x800, SPECIES_ESPEON}, + [SPECIES_UMBREON] = {gMonFrontPic_Umbreon, 0x800, SPECIES_UMBREON}, + [SPECIES_MURKROW] = {gMonFrontPic_Murkrow, 0x800, SPECIES_MURKROW}, + [SPECIES_SLOWKING] = {gMonFrontPic_Slowking, 0x800, SPECIES_SLOWKING}, + [SPECIES_MISDREAVUS] = {gMonFrontPic_Misdreavus, 0x800, SPECIES_MISDREAVUS}, + [SPECIES_UNOWN] = {gMonFrontPic_UnownA, 0x800, SPECIES_UNOWN}, + [SPECIES_WOBBUFFET] = {gMonFrontPic_Wobbuffet, 0x800, SPECIES_WOBBUFFET}, + [SPECIES_GIRAFARIG] = {gMonFrontPic_Girafarig, 0x800, SPECIES_GIRAFARIG}, + [SPECIES_PINECO] = {gMonFrontPic_Pineco, 0x800, SPECIES_PINECO}, + [SPECIES_FORRETRESS] = {gMonFrontPic_Forretress, 0x800, SPECIES_FORRETRESS}, + [SPECIES_DUNSPARCE] = {gMonFrontPic_Dunsparce, 0x800, SPECIES_DUNSPARCE}, + [SPECIES_GLIGAR] = {gMonFrontPic_Gligar, 0x800, SPECIES_GLIGAR}, + [SPECIES_STEELIX] = {gMonFrontPic_Steelix, 0x800, SPECIES_STEELIX}, + [SPECIES_SNUBBULL] = {gMonFrontPic_Snubbull, 0x800, SPECIES_SNUBBULL}, + [SPECIES_GRANBULL] = {gMonFrontPic_Granbull, 0x800, SPECIES_GRANBULL}, + [SPECIES_QWILFISH] = {gMonFrontPic_Qwilfish, 0x800, SPECIES_QWILFISH}, + [SPECIES_SCIZOR] = {gMonFrontPic_Scizor, 0x800, SPECIES_SCIZOR}, + [SPECIES_SHUCKLE] = {gMonFrontPic_Shuckle, 0x800, SPECIES_SHUCKLE}, + [SPECIES_HERACROSS] = {gMonFrontPic_Heracross, 0x800, SPECIES_HERACROSS}, + [SPECIES_SNEASEL] = {gMonFrontPic_Sneasel, 0x800, SPECIES_SNEASEL}, + [SPECIES_TEDDIURSA] = {gMonFrontPic_Teddiursa, 0x800, SPECIES_TEDDIURSA}, + [SPECIES_URSARING] = {gMonFrontPic_Ursaring, 0x800, SPECIES_URSARING}, + [SPECIES_SLUGMA] = {gMonFrontPic_Slugma, 0x800, SPECIES_SLUGMA}, + [SPECIES_MAGCARGO] = {gMonFrontPic_Magcargo, 0x800, SPECIES_MAGCARGO}, + [SPECIES_SWINUB] = {gMonFrontPic_Swinub, 0x800, SPECIES_SWINUB}, + [SPECIES_PILOSWINE] = {gMonFrontPic_Piloswine, 0x800, SPECIES_PILOSWINE}, + [SPECIES_CORSOLA] = {gMonFrontPic_Corsola, 0x800, SPECIES_CORSOLA}, + [SPECIES_REMORAID] = {gMonFrontPic_Remoraid, 0x800, SPECIES_REMORAID}, + [SPECIES_OCTILLERY] = {gMonFrontPic_Octillery, 0x800, SPECIES_OCTILLERY}, + [SPECIES_DELIBIRD] = {gMonFrontPic_Delibird, 0x800, SPECIES_DELIBIRD}, + [SPECIES_MANTINE] = {gMonFrontPic_Mantine, 0x800, SPECIES_MANTINE}, + [SPECIES_SKARMORY] = {gMonFrontPic_Skarmory, 0x800, SPECIES_SKARMORY}, + [SPECIES_HOUNDOUR] = {gMonFrontPic_Houndour, 0x800, SPECIES_HOUNDOUR}, + [SPECIES_HOUNDOOM] = {gMonFrontPic_Houndoom, 0x800, SPECIES_HOUNDOOM}, + [SPECIES_KINGDRA] = {gMonFrontPic_Kingdra, 0x800, SPECIES_KINGDRA}, + [SPECIES_PHANPY] = {gMonFrontPic_Phanpy, 0x800, SPECIES_PHANPY}, + [SPECIES_DONPHAN] = {gMonFrontPic_Donphan, 0x800, SPECIES_DONPHAN}, + [SPECIES_PORYGON2] = {gMonFrontPic_Porygon2, 0x800, SPECIES_PORYGON2}, + [SPECIES_STANTLER] = {gMonFrontPic_Stantler, 0x800, SPECIES_STANTLER}, + [SPECIES_SMEARGLE] = {gMonFrontPic_Smeargle, 0x800, SPECIES_SMEARGLE}, + [SPECIES_TYROGUE] = {gMonFrontPic_Tyrogue, 0x800, SPECIES_TYROGUE}, + [SPECIES_HITMONTOP] = {gMonFrontPic_Hitmontop, 0x800, SPECIES_HITMONTOP}, + [SPECIES_SMOOCHUM] = {gMonFrontPic_Smoochum, 0x800, SPECIES_SMOOCHUM}, + [SPECIES_ELEKID] = {gMonFrontPic_Elekid, 0x800, SPECIES_ELEKID}, + [SPECIES_MAGBY] = {gMonFrontPic_Magby, 0x800, SPECIES_MAGBY}, + [SPECIES_MILTANK] = {gMonFrontPic_Miltank, 0x800, SPECIES_MILTANK}, + [SPECIES_BLISSEY] = {gMonFrontPic_Blissey, 0x800, SPECIES_BLISSEY}, + [SPECIES_RAIKOU] = {gMonFrontPic_Raikou, 0x800, SPECIES_RAIKOU}, + [SPECIES_ENTEI] = {gMonFrontPic_Entei, 0x800, SPECIES_ENTEI}, + [SPECIES_SUICUNE] = {gMonFrontPic_Suicune, 0x800, SPECIES_SUICUNE}, + [SPECIES_LARVITAR] = {gMonFrontPic_Larvitar, 0x800, SPECIES_LARVITAR}, + [SPECIES_PUPITAR] = {gMonFrontPic_Pupitar, 0x800, SPECIES_PUPITAR}, + [SPECIES_TYRANITAR] = {gMonFrontPic_Tyranitar, 0x800, SPECIES_TYRANITAR}, + [SPECIES_LUGIA] = {gMonFrontPic_Lugia, 0x800, SPECIES_LUGIA}, + [SPECIES_HO_OH] = {gMonFrontPic_HoOh, 0x800, SPECIES_HO_OH}, + [SPECIES_CELEBI] = {gMonFrontPic_Celebi, 0x800, SPECIES_CELEBI}, + [SPECIES_OLD_UNOWN_B] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_B}, + [SPECIES_OLD_UNOWN_C] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_C}, + [SPECIES_OLD_UNOWN_D] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_D}, + [SPECIES_OLD_UNOWN_E] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_E}, + [SPECIES_OLD_UNOWN_F] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_F}, + [SPECIES_OLD_UNOWN_G] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_G}, + [SPECIES_OLD_UNOWN_H] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_H}, + [SPECIES_OLD_UNOWN_I] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_I}, + [SPECIES_OLD_UNOWN_J] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_J}, + [SPECIES_OLD_UNOWN_K] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_K}, + [SPECIES_OLD_UNOWN_L] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_L}, + [SPECIES_OLD_UNOWN_M] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_M}, + [SPECIES_OLD_UNOWN_N] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_N}, + [SPECIES_OLD_UNOWN_O] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_O}, + [SPECIES_OLD_UNOWN_P] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_P}, + [SPECIES_OLD_UNOWN_Q] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Q}, + [SPECIES_OLD_UNOWN_R] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_R}, + [SPECIES_OLD_UNOWN_S] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_S}, + [SPECIES_OLD_UNOWN_T] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_T}, + [SPECIES_OLD_UNOWN_U] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_U}, + [SPECIES_OLD_UNOWN_V] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_V}, + [SPECIES_OLD_UNOWN_W] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_W}, + [SPECIES_OLD_UNOWN_X] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_X}, + [SPECIES_OLD_UNOWN_Y] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Y}, + [SPECIES_OLD_UNOWN_Z] = {gMonFrontPic_DoubleQuestionMark, 0x800, SPECIES_OLD_UNOWN_Z}, + [SPECIES_TREECKO] = {gMonFrontPic_Treecko, 0x800, SPECIES_TREECKO}, + [SPECIES_GROVYLE] = {gMonFrontPic_Grovyle, 0x800, SPECIES_GROVYLE}, + [SPECIES_SCEPTILE] = {gMonFrontPic_Sceptile, 0x800, SPECIES_SCEPTILE}, + [SPECIES_TORCHIC] = {gMonFrontPic_Torchic, 0x800, SPECIES_TORCHIC}, + [SPECIES_COMBUSKEN] = {gMonFrontPic_Combusken, 0x800, SPECIES_COMBUSKEN}, + [SPECIES_BLAZIKEN] = {gMonFrontPic_Blaziken, 0x800, SPECIES_BLAZIKEN}, + [SPECIES_MUDKIP] = {gMonFrontPic_Mudkip, 0x800, SPECIES_MUDKIP}, + [SPECIES_MARSHTOMP] = {gMonFrontPic_Marshtomp, 0x800, SPECIES_MARSHTOMP}, + [SPECIES_SWAMPERT] = {gMonFrontPic_Swampert, 0x800, SPECIES_SWAMPERT}, + [SPECIES_POOCHYENA] = {gMonFrontPic_Poochyena, 0x800, SPECIES_POOCHYENA}, + [SPECIES_MIGHTYENA] = {gMonFrontPic_Mightyena, 0x800, SPECIES_MIGHTYENA}, + [SPECIES_ZIGZAGOON] = {gMonFrontPic_Zigzagoon, 0x800, SPECIES_ZIGZAGOON}, + [SPECIES_LINOONE] = {gMonFrontPic_Linoone, 0x800, SPECIES_LINOONE}, + [SPECIES_WURMPLE] = {gMonFrontPic_Wurmple, 0x800, SPECIES_WURMPLE}, + [SPECIES_SILCOON] = {gMonFrontPic_Silcoon, 0x800, SPECIES_SILCOON}, + [SPECIES_BEAUTIFLY] = {gMonFrontPic_Beautifly, 0x800, SPECIES_BEAUTIFLY}, + [SPECIES_CASCOON] = {gMonFrontPic_Cascoon, 0x800, SPECIES_CASCOON}, + [SPECIES_DUSTOX] = {gMonFrontPic_Dustox, 0x800, SPECIES_DUSTOX}, + [SPECIES_LOTAD] = {gMonFrontPic_Lotad, 0x800, SPECIES_LOTAD}, + [SPECIES_LOMBRE] = {gMonFrontPic_Lombre, 0x800, SPECIES_LOMBRE}, + [SPECIES_LUDICOLO] = {gMonFrontPic_Ludicolo, 0x800, SPECIES_LUDICOLO}, + [SPECIES_SEEDOT] = {gMonFrontPic_Seedot, 0x800, SPECIES_SEEDOT}, + [SPECIES_NUZLEAF] = {gMonFrontPic_Nuzleaf, 0x800, SPECIES_NUZLEAF}, + [SPECIES_SHIFTRY] = {gMonFrontPic_Shiftry, 0x800, SPECIES_SHIFTRY}, + [SPECIES_NINCADA] = {gMonFrontPic_Nincada, 0x800, SPECIES_NINCADA}, + [SPECIES_NINJASK] = {gMonFrontPic_Ninjask, 0x800, SPECIES_NINJASK}, + [SPECIES_SHEDINJA] = {gMonFrontPic_Shedinja, 0x800, SPECIES_SHEDINJA}, + [SPECIES_TAILLOW] = {gMonFrontPic_Taillow, 0x800, SPECIES_TAILLOW}, + [SPECIES_SWELLOW] = {gMonFrontPic_Swellow, 0x800, SPECIES_SWELLOW}, + [SPECIES_SHROOMISH] = {gMonFrontPic_Shroomish, 0x800, SPECIES_SHROOMISH}, + [SPECIES_BRELOOM] = {gMonFrontPic_Breloom, 0x800, SPECIES_BRELOOM}, + [SPECIES_SPINDA] = {gMonFrontPic_Spinda, 0x800, SPECIES_SPINDA}, + [SPECIES_WINGULL] = {gMonFrontPic_Wingull, 0x800, SPECIES_WINGULL}, + [SPECIES_PELIPPER] = {gMonFrontPic_Pelipper, 0x800, SPECIES_PELIPPER}, + [SPECIES_SURSKIT] = {gMonFrontPic_Surskit, 0x800, SPECIES_SURSKIT}, + [SPECIES_MASQUERAIN] = {gMonFrontPic_Masquerain, 0x800, SPECIES_MASQUERAIN}, + [SPECIES_WAILMER] = {gMonFrontPic_Wailmer, 0x800, SPECIES_WAILMER}, + [SPECIES_WAILORD] = {gMonFrontPic_Wailord, 0x800, SPECIES_WAILORD}, + [SPECIES_SKITTY] = {gMonFrontPic_Skitty, 0x800, SPECIES_SKITTY}, + [SPECIES_DELCATTY] = {gMonFrontPic_Delcatty, 0x800, SPECIES_DELCATTY}, + [SPECIES_KECLEON] = {gMonFrontPic_Kecleon, 0x800, SPECIES_KECLEON}, + [SPECIES_BALTOY] = {gMonFrontPic_Baltoy, 0x800, SPECIES_BALTOY}, + [SPECIES_CLAYDOL] = {gMonFrontPic_Claydol, 0x800, SPECIES_CLAYDOL}, + [SPECIES_NOSEPASS] = {gMonFrontPic_Nosepass, 0x800, SPECIES_NOSEPASS}, + [SPECIES_TORKOAL] = {gMonFrontPic_Torkoal, 0x800, SPECIES_TORKOAL}, + [SPECIES_SABLEYE] = {gMonFrontPic_Sableye, 0x800, SPECIES_SABLEYE}, + [SPECIES_BARBOACH] = {gMonFrontPic_Barboach, 0x800, SPECIES_BARBOACH}, + [SPECIES_WHISCASH] = {gMonFrontPic_Whiscash, 0x800, SPECIES_WHISCASH}, + [SPECIES_LUVDISC] = {gMonFrontPic_Luvdisc, 0x800, SPECIES_LUVDISC}, + [SPECIES_CORPHISH] = {gMonFrontPic_Corphish, 0x800, SPECIES_CORPHISH}, + [SPECIES_CRAWDAUNT] = {gMonFrontPic_Crawdaunt, 0x800, SPECIES_CRAWDAUNT}, + [SPECIES_FEEBAS] = {gMonFrontPic_Feebas, 0x800, SPECIES_FEEBAS}, + [SPECIES_MILOTIC] = {gMonFrontPic_Milotic, 0x800, SPECIES_MILOTIC}, + [SPECIES_CARVANHA] = {gMonFrontPic_Carvanha, 0x800, SPECIES_CARVANHA}, + [SPECIES_SHARPEDO] = {gMonFrontPic_Sharpedo, 0x800, SPECIES_SHARPEDO}, + [SPECIES_TRAPINCH] = {gMonFrontPic_Trapinch, 0x800, SPECIES_TRAPINCH}, + [SPECIES_VIBRAVA] = {gMonFrontPic_Vibrava, 0x800, SPECIES_VIBRAVA}, + [SPECIES_FLYGON] = {gMonFrontPic_Flygon, 0x800, SPECIES_FLYGON}, + [SPECIES_MAKUHITA] = {gMonFrontPic_Makuhita, 0x800, SPECIES_MAKUHITA}, + [SPECIES_HARIYAMA] = {gMonFrontPic_Hariyama, 0x800, SPECIES_HARIYAMA}, + [SPECIES_ELECTRIKE] = {gMonFrontPic_Electrike, 0x800, SPECIES_ELECTRIKE}, + [SPECIES_MANECTRIC] = {gMonFrontPic_Manectric, 0x800, SPECIES_MANECTRIC}, + [SPECIES_NUMEL] = {gMonFrontPic_Numel, 0x800, SPECIES_NUMEL}, + [SPECIES_CAMERUPT] = {gMonFrontPic_Camerupt, 0x800, SPECIES_CAMERUPT}, + [SPECIES_SPHEAL] = {gMonFrontPic_Spheal, 0x800, SPECIES_SPHEAL}, + [SPECIES_SEALEO] = {gMonFrontPic_Sealeo, 0x800, SPECIES_SEALEO}, + [SPECIES_WALREIN] = {gMonFrontPic_Walrein, 0x800, SPECIES_WALREIN}, + [SPECIES_CACNEA] = {gMonFrontPic_Cacnea, 0x800, SPECIES_CACNEA}, + [SPECIES_CACTURNE] = {gMonFrontPic_Cacturne, 0x800, SPECIES_CACTURNE}, + [SPECIES_SNORUNT] = {gMonFrontPic_Snorunt, 0x800, SPECIES_SNORUNT}, + [SPECIES_GLALIE] = {gMonFrontPic_Glalie, 0x800, SPECIES_GLALIE}, + [SPECIES_LUNATONE] = {gMonFrontPic_Lunatone, 0x800, SPECIES_LUNATONE}, + [SPECIES_SOLROCK] = {gMonFrontPic_Solrock, 0x800, SPECIES_SOLROCK}, + [SPECIES_AZURILL] = {gMonFrontPic_Azurill, 0x800, SPECIES_AZURILL}, + [SPECIES_SPOINK] = {gMonFrontPic_Spoink, 0x800, SPECIES_SPOINK}, + [SPECIES_GRUMPIG] = {gMonFrontPic_Grumpig, 0x800, SPECIES_GRUMPIG}, + [SPECIES_PLUSLE] = {gMonFrontPic_Plusle, 0x800, SPECIES_PLUSLE}, + [SPECIES_MINUN] = {gMonFrontPic_Minun, 0x800, SPECIES_MINUN}, + [SPECIES_MAWILE] = {gMonFrontPic_Mawile, 0x800, SPECIES_MAWILE}, + [SPECIES_MEDITITE] = {gMonFrontPic_Meditite, 0x800, SPECIES_MEDITITE}, + [SPECIES_MEDICHAM] = {gMonFrontPic_Medicham, 0x800, SPECIES_MEDICHAM}, + [SPECIES_SWABLU] = {gMonFrontPic_Swablu, 0x800, SPECIES_SWABLU}, + [SPECIES_ALTARIA] = {gMonFrontPic_Altaria, 0x800, SPECIES_ALTARIA}, + [SPECIES_WYNAUT] = {gMonFrontPic_Wynaut, 0x800, SPECIES_WYNAUT}, + [SPECIES_DUSKULL] = {gMonFrontPic_Duskull, 0x800, SPECIES_DUSKULL}, + [SPECIES_DUSCLOPS] = {gMonFrontPic_Dusclops, 0x800, SPECIES_DUSCLOPS}, + [SPECIES_ROSELIA] = {gMonFrontPic_Roselia, 0x800, SPECIES_ROSELIA}, + [SPECIES_SLAKOTH] = {gMonFrontPic_Slakoth, 0x800, SPECIES_SLAKOTH}, + [SPECIES_VIGOROTH] = {gMonFrontPic_Vigoroth, 0x800, SPECIES_VIGOROTH}, + [SPECIES_SLAKING] = {gMonFrontPic_Slaking, 0x800, SPECIES_SLAKING}, + [SPECIES_GULPIN] = {gMonFrontPic_Gulpin, 0x800, SPECIES_GULPIN}, + [SPECIES_SWALOT] = {gMonFrontPic_Swalot, 0x800, SPECIES_SWALOT}, + [SPECIES_TROPIUS] = {gMonFrontPic_Tropius, 0x800, SPECIES_TROPIUS}, + [SPECIES_WHISMUR] = {gMonFrontPic_Whismur, 0x800, SPECIES_WHISMUR}, + [SPECIES_LOUDRED] = {gMonFrontPic_Loudred, 0x800, SPECIES_LOUDRED}, + [SPECIES_EXPLOUD] = {gMonFrontPic_Exploud, 0x800, SPECIES_EXPLOUD}, + [SPECIES_CLAMPERL] = {gMonFrontPic_Clamperl, 0x800, SPECIES_CLAMPERL}, + [SPECIES_HUNTAIL] = {gMonFrontPic_Huntail, 0x800, SPECIES_HUNTAIL}, + [SPECIES_GOREBYSS] = {gMonFrontPic_Gorebyss, 0x800, SPECIES_GOREBYSS}, + [SPECIES_ABSOL] = {gMonFrontPic_Absol, 0x800, SPECIES_ABSOL}, + [SPECIES_SHUPPET] = {gMonFrontPic_Shuppet, 0x800, SPECIES_SHUPPET}, + [SPECIES_BANETTE] = {gMonFrontPic_Banette, 0x800, SPECIES_BANETTE}, + [SPECIES_SEVIPER] = {gMonFrontPic_Seviper, 0x800, SPECIES_SEVIPER}, + [SPECIES_ZANGOOSE] = {gMonFrontPic_Zangoose, 0x800, SPECIES_ZANGOOSE}, + [SPECIES_RELICANTH] = {gMonFrontPic_Relicanth, 0x800, SPECIES_RELICANTH}, + [SPECIES_ARON] = {gMonFrontPic_Aron, 0x800, SPECIES_ARON}, + [SPECIES_LAIRON] = {gMonFrontPic_Lairon, 0x800, SPECIES_LAIRON}, + [SPECIES_AGGRON] = {gMonFrontPic_Aggron, 0x800, SPECIES_AGGRON}, + [SPECIES_CASTFORM] = {gMonFrontPic_Castform, 0x800, SPECIES_CASTFORM}, + [SPECIES_VOLBEAT] = {gMonFrontPic_Volbeat, 0x800, SPECIES_VOLBEAT}, + [SPECIES_ILLUMISE] = {gMonFrontPic_Illumise, 0x800, SPECIES_ILLUMISE}, + [SPECIES_LILEEP] = {gMonFrontPic_Lileep, 0x800, SPECIES_LILEEP}, + [SPECIES_CRADILY] = {gMonFrontPic_Cradily, 0x800, SPECIES_CRADILY}, + [SPECIES_ANORITH] = {gMonFrontPic_Anorith, 0x800, SPECIES_ANORITH}, + [SPECIES_ARMALDO] = {gMonFrontPic_Armaldo, 0x800, SPECIES_ARMALDO}, + [SPECIES_RALTS] = {gMonFrontPic_Ralts, 0x800, SPECIES_RALTS}, + [SPECIES_KIRLIA] = {gMonFrontPic_Kirlia, 0x800, SPECIES_KIRLIA}, + [SPECIES_GARDEVOIR] = {gMonFrontPic_Gardevoir, 0x800, SPECIES_GARDEVOIR}, + [SPECIES_BAGON] = {gMonFrontPic_Bagon, 0x800, SPECIES_BAGON}, + [SPECIES_SHELGON] = {gMonFrontPic_Shelgon, 0x800, SPECIES_SHELGON}, + [SPECIES_SALAMENCE] = {gMonFrontPic_Salamence, 0x800, SPECIES_SALAMENCE}, + [SPECIES_BELDUM] = {gMonFrontPic_Beldum, 0x800, SPECIES_BELDUM}, + [SPECIES_METANG] = {gMonFrontPic_Metang, 0x800, SPECIES_METANG}, + [SPECIES_METAGROSS] = {gMonFrontPic_Metagross, 0x800, SPECIES_METAGROSS}, + [SPECIES_REGIROCK] = {gMonFrontPic_Regirock, 0x800, SPECIES_REGIROCK}, + [SPECIES_REGICE] = {gMonFrontPic_Regice, 0x800, SPECIES_REGICE}, + [SPECIES_REGISTEEL] = {gMonFrontPic_Registeel, 0x800, SPECIES_REGISTEEL}, + [SPECIES_KYOGRE] = {gMonFrontPic_Kyogre, 0x800, SPECIES_KYOGRE}, + [SPECIES_GROUDON] = {gMonFrontPic_Groudon, 0x800, SPECIES_GROUDON}, + [SPECIES_RAYQUAZA] = {gMonFrontPic_Rayquaza, 0x800, SPECIES_RAYQUAZA}, + [SPECIES_LATIAS] = {gMonFrontPic_Latias, 0x800, SPECIES_LATIAS}, + [SPECIES_LATIOS] = {gMonFrontPic_Latios, 0x800, SPECIES_LATIOS}, + [SPECIES_JIRACHI] = {gMonFrontPic_Jirachi, 0x800, SPECIES_JIRACHI}, + [SPECIES_DEOXYS] = {gMonFrontPic_Deoxys, 0x800, SPECIES_DEOXYS}, + [SPECIES_CHIMECHO] = {gMonFrontPic_Chimecho, 0x800, SPECIES_CHIMECHO}, + [SPECIES_EGG] = {gMonFrontPic_Egg, 0x800, SPECIES_EGG}, + [SPECIES_UNOWN_B] = {gMonFrontPic_UnownB, 0x800, SPECIES_UNOWN_B}, + [SPECIES_UNOWN_C] = {gMonFrontPic_UnownC, 0x800, SPECIES_UNOWN_C}, + [SPECIES_UNOWN_D] = {gMonFrontPic_UnownD, 0x800, SPECIES_UNOWN_D}, + [SPECIES_UNOWN_E] = {gMonFrontPic_UnownE, 0x800, SPECIES_UNOWN_E}, + [SPECIES_UNOWN_F] = {gMonFrontPic_UnownF, 0x800, SPECIES_UNOWN_F}, + [SPECIES_UNOWN_G] = {gMonFrontPic_UnownG, 0x800, SPECIES_UNOWN_G}, + [SPECIES_UNOWN_H] = {gMonFrontPic_UnownH, 0x800, SPECIES_UNOWN_H}, + [SPECIES_UNOWN_I] = {gMonFrontPic_UnownI, 0x800, SPECIES_UNOWN_I}, + [SPECIES_UNOWN_J] = {gMonFrontPic_UnownJ, 0x800, SPECIES_UNOWN_J}, + [SPECIES_UNOWN_K] = {gMonFrontPic_UnownK, 0x800, SPECIES_UNOWN_K}, + [SPECIES_UNOWN_L] = {gMonFrontPic_UnownL, 0x800, SPECIES_UNOWN_L}, + [SPECIES_UNOWN_M] = {gMonFrontPic_UnownM, 0x800, SPECIES_UNOWN_M}, + [SPECIES_UNOWN_N] = {gMonFrontPic_UnownN, 0x800, SPECIES_UNOWN_N}, + [SPECIES_UNOWN_O] = {gMonFrontPic_UnownO, 0x800, SPECIES_UNOWN_O}, + [SPECIES_UNOWN_P] = {gMonFrontPic_UnownP, 0x800, SPECIES_UNOWN_P}, + [SPECIES_UNOWN_Q] = {gMonFrontPic_UnownQ, 0x800, SPECIES_UNOWN_Q}, + [SPECIES_UNOWN_R] = {gMonFrontPic_UnownR, 0x800, SPECIES_UNOWN_R}, + [SPECIES_UNOWN_S] = {gMonFrontPic_UnownS, 0x800, SPECIES_UNOWN_S}, + [SPECIES_UNOWN_T] = {gMonFrontPic_UnownT, 0x800, SPECIES_UNOWN_T}, + [SPECIES_UNOWN_U] = {gMonFrontPic_UnownU, 0x800, SPECIES_UNOWN_U}, + [SPECIES_UNOWN_V] = {gMonFrontPic_UnownV, 0x800, SPECIES_UNOWN_V}, + [SPECIES_UNOWN_W] = {gMonFrontPic_UnownW, 0x800, SPECIES_UNOWN_W}, + [SPECIES_UNOWN_X] = {gMonFrontPic_UnownX, 0x800, SPECIES_UNOWN_X}, + [SPECIES_UNOWN_Y] = {gMonFrontPic_UnownY, 0x800, SPECIES_UNOWN_Y}, + [SPECIES_UNOWN_Z] = {gMonFrontPic_UnownZ, 0x800, SPECIES_UNOWN_Z}, + [SPECIES_UNOWN_EMARK] = {gMonFrontPic_UnownExclamationMark, 0x800, SPECIES_UNOWN_EMARK}, + [SPECIES_UNOWN_QMARK] = {gMonFrontPic_UnownQuestionMark, 0x800, SPECIES_UNOWN_QMARK}, }; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 99412daa5..3b60d8567 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1,443 +1,443 @@ const struct CompressedSpritePalette gMonPaletteTable[] = { - gMonPalette_CircledQuestionMark, 0, - gMonPalette_Bulbasaur, 1, - gMonPalette_Ivysaur, 2, - gMonPalette_Venusaur, 3, - gMonPalette_Charmander, 4, - gMonPalette_Charmeleon, 5, - gMonPalette_Charizard, 6, - gMonPalette_Squirtle, 7, - gMonPalette_Wartortle, 8, - gMonPalette_Blastoise, 9, - gMonPalette_Caterpie, 10, - gMonPalette_Metapod, 11, - gMonPalette_Butterfree, 12, - gMonPalette_Weedle, 13, - gMonPalette_Kakuna, 14, - gMonPalette_Beedrill, 15, - gMonPalette_Pidgey, 16, - gMonPalette_Pidgeotto, 17, - gMonPalette_Pidgeot, 18, - gMonPalette_Rattata, 19, - gMonPalette_Raticate, 20, - gMonPalette_Spearow, 21, - gMonPalette_Fearow, 22, - gMonPalette_Ekans, 23, - gMonPalette_Arbok, 24, - gMonPalette_Pikachu, 25, - gMonPalette_Raichu, 26, - gMonPalette_Sandshrew, 27, - gMonPalette_Sandslash, 28, - gMonPalette_NidoranF, 29, - gMonPalette_Nidorina, 30, - gMonPalette_Nidoqueen, 31, - gMonPalette_NidoranM, 32, - gMonPalette_Nidorino, 33, - gMonPalette_Nidoking, 34, - gMonPalette_Clefairy, 35, - gMonPalette_Clefable, 36, - gMonPalette_Vulpix, 37, - gMonPalette_Ninetales, 38, - gMonPalette_Jigglypuff, 39, - gMonPalette_Wigglytuff, 40, - gMonPalette_Zubat, 41, - gMonPalette_Golbat, 42, - gMonPalette_Oddish, 43, - gMonPalette_Gloom, 44, - gMonPalette_Vileplume, 45, - gMonPalette_Paras, 46, - gMonPalette_Parasect, 47, - gMonPalette_Venonat, 48, - gMonPalette_Venomoth, 49, - gMonPalette_Diglett, 50, - gMonPalette_Dugtrio, 51, - gMonPalette_Meowth, 52, - gMonPalette_Persian, 53, - gMonPalette_Psyduck, 54, - gMonPalette_Golduck, 55, - gMonPalette_Mankey, 56, - gMonPalette_Primeape, 57, - gMonPalette_Growlithe, 58, - gMonPalette_Arcanine, 59, - gMonPalette_Poliwag, 60, - gMonPalette_Poliwhirl, 61, - gMonPalette_Poliwrath, 62, - gMonPalette_Abra, 63, - gMonPalette_Kadabra, 64, - gMonPalette_Alakazam, 65, - gMonPalette_Machop, 66, - gMonPalette_Machoke, 67, - gMonPalette_Machamp, 68, - gMonPalette_Bellsprout, 69, - gMonPalette_Weepinbell, 70, - gMonPalette_Victreebel, 71, - gMonPalette_Tentacool, 72, - gMonPalette_Tentacruel, 73, - gMonPalette_Geodude, 74, - gMonPalette_Graveler, 75, - gMonPalette_Golem, 76, - gMonPalette_Ponyta, 77, - gMonPalette_Rapidash, 78, - gMonPalette_Slowpoke, 79, - gMonPalette_Slowbro, 80, - gMonPalette_Magnemite, 81, - gMonPalette_Magneton, 82, - gMonPalette_Farfetchd, 83, - gMonPalette_Doduo, 84, - gMonPalette_Dodrio, 85, - gMonPalette_Seel, 86, - gMonPalette_Dewgong, 87, - gMonPalette_Grimer, 88, - gMonPalette_Muk, 89, - gMonPalette_Shellder, 90, - gMonPalette_Cloyster, 91, - gMonPalette_Gastly, 92, - gMonPalette_Haunter, 93, - gMonPalette_Gengar, 94, - gMonPalette_Onix, 95, - gMonPalette_Drowzee, 96, - gMonPalette_Hypno, 97, - gMonPalette_Krabby, 98, - gMonPalette_Kingler, 99, - gMonPalette_Voltorb, 100, - gMonPalette_Electrode, 101, - gMonPalette_Exeggcute, 102, - gMonPalette_Exeggutor, 103, - gMonPalette_Cubone, 104, - gMonPalette_Marowak, 105, - gMonPalette_Hitmonlee, 106, - gMonPalette_Hitmonchan, 107, - gMonPalette_Lickitung, 108, - gMonPalette_Koffing, 109, - gMonPalette_Weezing, 110, - gMonPalette_Rhyhorn, 111, - gMonPalette_Rhydon, 112, - gMonPalette_Chansey, 113, - gMonPalette_Tangela, 114, - gMonPalette_Kangaskhan, 115, - gMonPalette_Horsea, 116, - gMonPalette_Seadra, 117, - gMonPalette_Goldeen, 118, - gMonPalette_Seaking, 119, - gMonPalette_Staryu, 120, - gMonPalette_Starmie, 121, - gMonPalette_Mrmime, 122, - gMonPalette_Scyther, 123, - gMonPalette_Jynx, 124, - gMonPalette_Electabuzz, 125, - gMonPalette_Magmar, 126, - gMonPalette_Pinsir, 127, - gMonPalette_Tauros, 128, - gMonPalette_Magikarp, 129, - gMonPalette_Gyarados, 130, - gMonPalette_Lapras, 131, - gMonPalette_Ditto, 132, - gMonPalette_Eevee, 133, - gMonPalette_Vaporeon, 134, - gMonPalette_Jolteon, 135, - gMonPalette_Flareon, 136, - gMonPalette_Porygon, 137, - gMonPalette_Omanyte, 138, - gMonPalette_Omastar, 139, - gMonPalette_Kabuto, 140, - gMonPalette_Kabutops, 141, - gMonPalette_Aerodactyl, 142, - gMonPalette_Snorlax, 143, - gMonPalette_Articuno, 144, - gMonPalette_Zapdos, 145, - gMonPalette_Moltres, 146, - gMonPalette_Dratini, 147, - gMonPalette_Dragonair, 148, - gMonPalette_Dragonite, 149, - gMonPalette_Mewtwo, 150, - gMonPalette_Mew, 151, - gMonPalette_Chikorita, 152, - gMonPalette_Bayleef, 153, - gMonPalette_Meganium, 154, - gMonPalette_Cyndaquil, 155, - gMonPalette_Quilava, 156, - gMonPalette_Typhlosion, 157, - gMonPalette_Totodile, 158, - gMonPalette_Croconaw, 159, - gMonPalette_Feraligatr, 160, - gMonPalette_Sentret, 161, - gMonPalette_Furret, 162, - gMonPalette_Hoothoot, 163, - gMonPalette_Noctowl, 164, - gMonPalette_Ledyba, 165, - gMonPalette_Ledian, 166, - gMonPalette_Spinarak, 167, - gMonPalette_Ariados, 168, - gMonPalette_Crobat, 169, - gMonPalette_Chinchou, 170, - gMonPalette_Lanturn, 171, - gMonPalette_Pichu, 172, - gMonPalette_Cleffa, 173, - gMonPalette_Igglybuff, 174, - gMonPalette_Togepi, 175, - gMonPalette_Togetic, 176, - gMonPalette_Natu, 177, - gMonPalette_Xatu, 178, - gMonPalette_Mareep, 179, - gMonPalette_Flaaffy, 180, - gMonPalette_Ampharos, 181, - gMonPalette_Bellossom, 182, - gMonPalette_Marill, 183, - gMonPalette_Azumarill, 184, - gMonPalette_Sudowoodo, 185, - gMonPalette_Politoed, 186, - gMonPalette_Hoppip, 187, - gMonPalette_Skiploom, 188, - gMonPalette_Jumpluff, 189, - gMonPalette_Aipom, 190, - gMonPalette_Sunkern, 191, - gMonPalette_Sunflora, 192, - gMonPalette_Yanma, 193, - gMonPalette_Wooper, 194, - gMonPalette_Quagsire, 195, - gMonPalette_Espeon, 196, - gMonPalette_Umbreon, 197, - gMonPalette_Murkrow, 198, - gMonPalette_Slowking, 199, - gMonPalette_Misdreavus, 200, - gMonPalette_Unown, 201, - gMonPalette_Wobbuffet, 202, - gMonPalette_Girafarig, 203, - gMonPalette_Pineco, 204, - gMonPalette_Forretress, 205, - gMonPalette_Dunsparce, 206, - gMonPalette_Gligar, 207, - gMonPalette_Steelix, 208, - gMonPalette_Snubbull, 209, - gMonPalette_Granbull, 210, - gMonPalette_Qwilfish, 211, - gMonPalette_Scizor, 212, - gMonPalette_Shuckle, 213, - gMonPalette_Heracross, 214, - gMonPalette_Sneasel, 215, - gMonPalette_Teddiursa, 216, - gMonPalette_Ursaring, 217, - gMonPalette_Slugma, 218, - gMonPalette_Magcargo, 219, - gMonPalette_Swinub, 220, - gMonPalette_Piloswine, 221, - gMonPalette_Corsola, 222, - gMonPalette_Remoraid, 223, - gMonPalette_Octillery, 224, - gMonPalette_Delibird, 225, - gMonPalette_Mantine, 226, - gMonPalette_Skarmory, 227, - gMonPalette_Houndour, 228, - gMonPalette_Houndoom, 229, - gMonPalette_Kingdra, 230, - gMonPalette_Phanpy, 231, - gMonPalette_Donphan, 232, - gMonPalette_Porygon2, 233, - gMonPalette_Stantler, 234, - gMonPalette_Smeargle, 235, - gMonPalette_Tyrogue, 236, - gMonPalette_Hitmontop, 237, - gMonPalette_Smoochum, 238, - gMonPalette_Elekid, 239, - gMonPalette_Magby, 240, - gMonPalette_Miltank, 241, - gMonPalette_Blissey, 242, - gMonPalette_Raikou, 243, - gMonPalette_Entei, 244, - gMonPalette_Suicune, 245, - gMonPalette_Larvitar, 246, - gMonPalette_Pupitar, 247, - gMonPalette_Tyranitar, 248, - gMonPalette_Lugia, 249, - gMonPalette_HoOh, 250, - gMonPalette_Celebi, 251, - gMonPalette_DoubleQuestionMark, 252, - gMonPalette_DoubleQuestionMark, 253, - gMonPalette_DoubleQuestionMark, 254, - gMonPalette_DoubleQuestionMark, 255, - gMonPalette_DoubleQuestionMark, 256, - gMonPalette_DoubleQuestionMark, 257, - gMonPalette_DoubleQuestionMark, 258, - gMonPalette_DoubleQuestionMark, 259, - gMonPalette_DoubleQuestionMark, 260, - gMonPalette_DoubleQuestionMark, 261, - gMonPalette_DoubleQuestionMark, 262, - gMonPalette_DoubleQuestionMark, 263, - gMonPalette_DoubleQuestionMark, 264, - gMonPalette_DoubleQuestionMark, 265, - gMonPalette_DoubleQuestionMark, 266, - gMonPalette_DoubleQuestionMark, 267, - gMonPalette_DoubleQuestionMark, 268, - gMonPalette_DoubleQuestionMark, 269, - gMonPalette_DoubleQuestionMark, 270, - gMonPalette_DoubleQuestionMark, 271, - gMonPalette_DoubleQuestionMark, 272, - gMonPalette_DoubleQuestionMark, 273, - gMonPalette_DoubleQuestionMark, 274, - gMonPalette_DoubleQuestionMark, 275, - gMonPalette_DoubleQuestionMark, 276, - gMonPalette_Treecko, 277, - gMonPalette_Grovyle, 278, - gMonPalette_Sceptile, 279, - gMonPalette_Torchic, 280, - gMonPalette_Combusken, 281, - gMonPalette_Blaziken, 282, - gMonPalette_Mudkip, 283, - gMonPalette_Marshtomp, 284, - gMonPalette_Swampert, 285, - gMonPalette_Poochyena, 286, - gMonPalette_Mightyena, 287, - gMonPalette_Zigzagoon, 288, - gMonPalette_Linoone, 289, - gMonPalette_Wurmple, 290, - gMonPalette_Silcoon, 291, - gMonPalette_Beautifly, 292, - gMonPalette_Cascoon, 293, - gMonPalette_Dustox, 294, - gMonPalette_Lotad, 295, - gMonPalette_Lombre, 296, - gMonPalette_Ludicolo, 297, - gMonPalette_Seedot, 298, - gMonPalette_Nuzleaf, 299, - gMonPalette_Shiftry, 300, - gMonPalette_Nincada, 301, - gMonPalette_Ninjask, 302, - gMonPalette_Shedinja, 303, - gMonPalette_Taillow, 304, - gMonPalette_Swellow, 305, - gMonPalette_Shroomish, 306, - gMonPalette_Breloom, 307, - gMonPalette_Spinda, 308, - gMonPalette_Wingull, 309, - gMonPalette_Pelipper, 310, - gMonPalette_Surskit, 311, - gMonPalette_Masquerain, 312, - gMonPalette_Wailmer, 313, - gMonPalette_Wailord, 314, - gMonPalette_Skitty, 315, - gMonPalette_Delcatty, 316, - gMonPalette_Kecleon, 317, - gMonPalette_Baltoy, 318, - gMonPalette_Claydol, 319, - gMonPalette_Nosepass, 320, - gMonPalette_Torkoal, 321, - gMonPalette_Sableye, 322, - gMonPalette_Barboach, 323, - gMonPalette_Whiscash, 324, - gMonPalette_Luvdisc, 325, - gMonPalette_Corphish, 326, - gMonPalette_Crawdaunt, 327, - gMonPalette_Feebas, 328, - gMonPalette_Milotic, 329, - gMonPalette_Carvanha, 330, - gMonPalette_Sharpedo, 331, - gMonPalette_Trapinch, 332, - gMonPalette_Vibrava, 333, - gMonPalette_Flygon, 334, - gMonPalette_Makuhita, 335, - gMonPalette_Hariyama, 336, - gMonPalette_Electrike, 337, - gMonPalette_Manectric, 338, - gMonPalette_Numel, 339, - gMonPalette_Camerupt, 340, - gMonPalette_Spheal, 341, - gMonPalette_Sealeo, 342, - gMonPalette_Walrein, 343, - gMonPalette_Cacnea, 344, - gMonPalette_Cacturne, 345, - gMonPalette_Snorunt, 346, - gMonPalette_Glalie, 347, - gMonPalette_Lunatone, 348, - gMonPalette_Solrock, 349, - gMonPalette_Azurill, 350, - gMonPalette_Spoink, 351, - gMonPalette_Grumpig, 352, - gMonPalette_Plusle, 353, - gMonPalette_Minun, 354, - gMonPalette_Mawile, 355, - gMonPalette_Meditite, 356, - gMonPalette_Medicham, 357, - gMonPalette_Swablu, 358, - gMonPalette_Altaria, 359, - gMonPalette_Wynaut, 360, - gMonPalette_Duskull, 361, - gMonPalette_Dusclops, 362, - gMonPalette_Roselia, 363, - gMonPalette_Slakoth, 364, - gMonPalette_Vigoroth, 365, - gMonPalette_Slaking, 366, - gMonPalette_Gulpin, 367, - gMonPalette_Swalot, 368, - gMonPalette_Tropius, 369, - gMonPalette_Whismur, 370, - gMonPalette_Loudred, 371, - gMonPalette_Exploud, 372, - gMonPalette_Clamperl, 373, - gMonPalette_Huntail, 374, - gMonPalette_Gorebyss, 375, - gMonPalette_Absol, 376, - gMonPalette_Shuppet, 377, - gMonPalette_Banette, 378, - gMonPalette_Seviper, 379, - gMonPalette_Zangoose, 380, - gMonPalette_Relicanth, 381, - gMonPalette_Aron, 382, - gMonPalette_Lairon, 383, - gMonPalette_Aggron, 384, - gMonPalette_Castform, 385, - gMonPalette_Volbeat, 386, - gMonPalette_Illumise, 387, - gMonPalette_Lileep, 388, - gMonPalette_Cradily, 389, - gMonPalette_Anorith, 390, - gMonPalette_Armaldo, 391, - gMonPalette_Ralts, 392, - gMonPalette_Kirlia, 393, - gMonPalette_Gardevoir, 394, - gMonPalette_Bagon, 395, - gMonPalette_Shelgon, 396, - gMonPalette_Salamence, 397, - gMonPalette_Beldum, 398, - gMonPalette_Metang, 399, - gMonPalette_Metagross, 400, - gMonPalette_Regirock, 401, - gMonPalette_Regice, 402, - gMonPalette_Registeel, 403, - gMonPalette_Kyogre, 404, - gMonPalette_Groudon, 405, - gMonPalette_Rayquaza, 406, - gMonPalette_Latias, 407, - gMonPalette_Latios, 408, - gMonPalette_Jirachi, 409, - gMonPalette_Deoxys, 410, - gMonPalette_Chimecho, 411, - gMonPalette_Egg, 412, - gMonPalette_Unown, 413, - gMonPalette_Unown, 414, - gMonPalette_Unown, 415, - gMonPalette_Unown, 416, - gMonPalette_Unown, 417, - gMonPalette_Unown, 418, - gMonPalette_Unown, 419, - gMonPalette_Unown, 420, - gMonPalette_Unown, 421, - gMonPalette_Unown, 422, - gMonPalette_Unown, 423, - gMonPalette_Unown, 424, - gMonPalette_Unown, 425, - gMonPalette_Unown, 426, - gMonPalette_Unown, 427, - gMonPalette_Unown, 428, - gMonPalette_Unown, 429, - gMonPalette_Unown, 430, - gMonPalette_Unown, 431, - gMonPalette_Unown, 432, - gMonPalette_Unown, 433, - gMonPalette_Unown, 434, - gMonPalette_Unown, 435, - gMonPalette_Unown, 436, - gMonPalette_Unown, 437, - gMonPalette_Unown, 438, - gMonPalette_Unown, 439, + [SPECIES_NONE] = {gMonPalette_CircledQuestionMark, SPECIES_NONE}, + [SPECIES_BULBASAUR] = {gMonPalette_Bulbasaur, SPECIES_BULBASAUR}, + [SPECIES_IVYSAUR] = {gMonPalette_Ivysaur, SPECIES_IVYSAUR}, + [SPECIES_VENUSAUR] = {gMonPalette_Venusaur, SPECIES_VENUSAUR}, + [SPECIES_CHARMANDER] = {gMonPalette_Charmander, SPECIES_CHARMANDER}, + [SPECIES_CHARMELEON] = {gMonPalette_Charmeleon, SPECIES_CHARMELEON}, + [SPECIES_CHARIZARD] = {gMonPalette_Charizard, SPECIES_CHARIZARD}, + [SPECIES_SQUIRTLE] = {gMonPalette_Squirtle, SPECIES_SQUIRTLE}, + [SPECIES_WARTORTLE] = {gMonPalette_Wartortle, SPECIES_WARTORTLE}, + [SPECIES_BLASTOISE] = {gMonPalette_Blastoise, SPECIES_BLASTOISE}, + [SPECIES_CATERPIE] = {gMonPalette_Caterpie, SPECIES_CATERPIE}, + [SPECIES_METAPOD] = {gMonPalette_Metapod, SPECIES_METAPOD}, + [SPECIES_BUTTERFREE] = {gMonPalette_Butterfree, SPECIES_BUTTERFREE}, + [SPECIES_WEEDLE] = {gMonPalette_Weedle, SPECIES_WEEDLE}, + [SPECIES_KAKUNA] = {gMonPalette_Kakuna, SPECIES_KAKUNA}, + [SPECIES_BEEDRILL] = {gMonPalette_Beedrill, SPECIES_BEEDRILL}, + [SPECIES_PIDGEY] = {gMonPalette_Pidgey, SPECIES_PIDGEY}, + [SPECIES_PIDGEOTTO] = {gMonPalette_Pidgeotto, SPECIES_PIDGEOTTO}, + [SPECIES_PIDGEOT] = {gMonPalette_Pidgeot, SPECIES_PIDGEOT}, + [SPECIES_RATTATA] = {gMonPalette_Rattata, SPECIES_RATTATA}, + [SPECIES_RATICATE] = {gMonPalette_Raticate, SPECIES_RATICATE}, + [SPECIES_SPEAROW] = {gMonPalette_Spearow, SPECIES_SPEAROW}, + [SPECIES_FEAROW] = {gMonPalette_Fearow, SPECIES_FEAROW}, + [SPECIES_EKANS] = {gMonPalette_Ekans, SPECIES_EKANS}, + [SPECIES_ARBOK] = {gMonPalette_Arbok, SPECIES_ARBOK}, + [SPECIES_PIKACHU] = {gMonPalette_Pikachu, SPECIES_PIKACHU}, + [SPECIES_RAICHU] = {gMonPalette_Raichu, SPECIES_RAICHU}, + [SPECIES_SANDSHREW] = {gMonPalette_Sandshrew, SPECIES_SANDSHREW}, + [SPECIES_SANDSLASH] = {gMonPalette_Sandslash, SPECIES_SANDSLASH}, + [SPECIES_NIDORAN_F] = {gMonPalette_NidoranF, SPECIES_NIDORAN_F}, + [SPECIES_NIDORINA] = {gMonPalette_Nidorina, SPECIES_NIDORINA}, + [SPECIES_NIDOQUEEN] = {gMonPalette_Nidoqueen, SPECIES_NIDOQUEEN}, + [SPECIES_NIDORAN_M] = {gMonPalette_NidoranM, SPECIES_NIDORAN_M}, + [SPECIES_NIDORINO] = {gMonPalette_Nidorino, SPECIES_NIDORINO}, + [SPECIES_NIDOKING] = {gMonPalette_Nidoking, SPECIES_NIDOKING}, + [SPECIES_CLEFAIRY] = {gMonPalette_Clefairy, SPECIES_CLEFAIRY}, + [SPECIES_CLEFABLE] = {gMonPalette_Clefable, SPECIES_CLEFABLE}, + [SPECIES_VULPIX] = {gMonPalette_Vulpix, SPECIES_VULPIX}, + [SPECIES_NINETALES] = {gMonPalette_Ninetales, SPECIES_NINETALES}, + [SPECIES_JIGGLYPUFF] = {gMonPalette_Jigglypuff, SPECIES_JIGGLYPUFF}, + [SPECIES_WIGGLYTUFF] = {gMonPalette_Wigglytuff, SPECIES_WIGGLYTUFF}, + [SPECIES_ZUBAT] = {gMonPalette_Zubat, SPECIES_ZUBAT}, + [SPECIES_GOLBAT] = {gMonPalette_Golbat, SPECIES_GOLBAT}, + [SPECIES_ODDISH] = {gMonPalette_Oddish, SPECIES_ODDISH}, + [SPECIES_GLOOM] = {gMonPalette_Gloom, SPECIES_GLOOM}, + [SPECIES_VILEPLUME] = {gMonPalette_Vileplume, SPECIES_VILEPLUME}, + [SPECIES_PARAS] = {gMonPalette_Paras, SPECIES_PARAS}, + [SPECIES_PARASECT] = {gMonPalette_Parasect, SPECIES_PARASECT}, + [SPECIES_VENONAT] = {gMonPalette_Venonat, SPECIES_VENONAT}, + [SPECIES_VENOMOTH] = {gMonPalette_Venomoth, SPECIES_VENOMOTH}, + [SPECIES_DIGLETT] = {gMonPalette_Diglett, SPECIES_DIGLETT}, + [SPECIES_DUGTRIO] = {gMonPalette_Dugtrio, SPECIES_DUGTRIO}, + [SPECIES_MEOWTH] = {gMonPalette_Meowth, SPECIES_MEOWTH}, + [SPECIES_PERSIAN] = {gMonPalette_Persian, SPECIES_PERSIAN}, + [SPECIES_PSYDUCK] = {gMonPalette_Psyduck, SPECIES_PSYDUCK}, + [SPECIES_GOLDUCK] = {gMonPalette_Golduck, SPECIES_GOLDUCK}, + [SPECIES_MANKEY] = {gMonPalette_Mankey, SPECIES_MANKEY}, + [SPECIES_PRIMEAPE] = {gMonPalette_Primeape, SPECIES_PRIMEAPE}, + [SPECIES_GROWLITHE] = {gMonPalette_Growlithe, SPECIES_GROWLITHE}, + [SPECIES_ARCANINE] = {gMonPalette_Arcanine, SPECIES_ARCANINE}, + [SPECIES_POLIWAG] = {gMonPalette_Poliwag, SPECIES_POLIWAG}, + [SPECIES_POLIWHIRL] = {gMonPalette_Poliwhirl, SPECIES_POLIWHIRL}, + [SPECIES_POLIWRATH] = {gMonPalette_Poliwrath, SPECIES_POLIWRATH}, + [SPECIES_ABRA] = {gMonPalette_Abra, SPECIES_ABRA}, + [SPECIES_KADABRA] = {gMonPalette_Kadabra, SPECIES_KADABRA}, + [SPECIES_ALAKAZAM] = {gMonPalette_Alakazam, SPECIES_ALAKAZAM}, + [SPECIES_MACHOP] = {gMonPalette_Machop, SPECIES_MACHOP}, + [SPECIES_MACHOKE] = {gMonPalette_Machoke, SPECIES_MACHOKE}, + [SPECIES_MACHAMP] = {gMonPalette_Machamp, SPECIES_MACHAMP}, + [SPECIES_BELLSPROUT] = {gMonPalette_Bellsprout, SPECIES_BELLSPROUT}, + [SPECIES_WEEPINBELL] = {gMonPalette_Weepinbell, SPECIES_WEEPINBELL}, + [SPECIES_VICTREEBEL] = {gMonPalette_Victreebel, SPECIES_VICTREEBEL}, + [SPECIES_TENTACOOL] = {gMonPalette_Tentacool, SPECIES_TENTACOOL}, + [SPECIES_TENTACRUEL] = {gMonPalette_Tentacruel, SPECIES_TENTACRUEL}, + [SPECIES_GEODUDE] = {gMonPalette_Geodude, SPECIES_GEODUDE}, + [SPECIES_GRAVELER] = {gMonPalette_Graveler, SPECIES_GRAVELER}, + [SPECIES_GOLEM] = {gMonPalette_Golem, SPECIES_GOLEM}, + [SPECIES_PONYTA] = {gMonPalette_Ponyta, SPECIES_PONYTA}, + [SPECIES_RAPIDASH] = {gMonPalette_Rapidash, SPECIES_RAPIDASH}, + [SPECIES_SLOWPOKE] = {gMonPalette_Slowpoke, SPECIES_SLOWPOKE}, + [SPECIES_SLOWBRO] = {gMonPalette_Slowbro, SPECIES_SLOWBRO}, + [SPECIES_MAGNEMITE] = {gMonPalette_Magnemite, SPECIES_MAGNEMITE}, + [SPECIES_MAGNETON] = {gMonPalette_Magneton, SPECIES_MAGNETON}, + [SPECIES_FARFETCHD] = {gMonPalette_Farfetchd, SPECIES_FARFETCHD}, + [SPECIES_DODUO] = {gMonPalette_Doduo, SPECIES_DODUO}, + [SPECIES_DODRIO] = {gMonPalette_Dodrio, SPECIES_DODRIO}, + [SPECIES_SEEL] = {gMonPalette_Seel, SPECIES_SEEL}, + [SPECIES_DEWGONG] = {gMonPalette_Dewgong, SPECIES_DEWGONG}, + [SPECIES_GRIMER] = {gMonPalette_Grimer, SPECIES_GRIMER}, + [SPECIES_MUK] = {gMonPalette_Muk, SPECIES_MUK}, + [SPECIES_SHELLDER] = {gMonPalette_Shellder, SPECIES_SHELLDER}, + [SPECIES_CLOYSTER] = {gMonPalette_Cloyster, SPECIES_CLOYSTER}, + [SPECIES_GASTLY] = {gMonPalette_Gastly, SPECIES_GASTLY}, + [SPECIES_HAUNTER] = {gMonPalette_Haunter, SPECIES_HAUNTER}, + [SPECIES_GENGAR] = {gMonPalette_Gengar, SPECIES_GENGAR}, + [SPECIES_ONIX] = {gMonPalette_Onix, SPECIES_ONIX}, + [SPECIES_DROWZEE] = {gMonPalette_Drowzee, SPECIES_DROWZEE}, + [SPECIES_HYPNO] = {gMonPalette_Hypno, SPECIES_HYPNO}, + [SPECIES_KRABBY] = {gMonPalette_Krabby, SPECIES_KRABBY}, + [SPECIES_KINGLER] = {gMonPalette_Kingler, SPECIES_KINGLER}, + [SPECIES_VOLTORB] = {gMonPalette_Voltorb, SPECIES_VOLTORB}, + [SPECIES_ELECTRODE] = {gMonPalette_Electrode, SPECIES_ELECTRODE}, + [SPECIES_EXEGGCUTE] = {gMonPalette_Exeggcute, SPECIES_EXEGGCUTE}, + [SPECIES_EXEGGUTOR] = {gMonPalette_Exeggutor, SPECIES_EXEGGUTOR}, + [SPECIES_CUBONE] = {gMonPalette_Cubone, SPECIES_CUBONE}, + [SPECIES_MAROWAK] = {gMonPalette_Marowak, SPECIES_MAROWAK}, + [SPECIES_HITMONLEE] = {gMonPalette_Hitmonlee, SPECIES_HITMONLEE}, + [SPECIES_HITMONCHAN] = {gMonPalette_Hitmonchan, SPECIES_HITMONCHAN}, + [SPECIES_LICKITUNG] = {gMonPalette_Lickitung, SPECIES_LICKITUNG}, + [SPECIES_KOFFING] = {gMonPalette_Koffing, SPECIES_KOFFING}, + [SPECIES_WEEZING] = {gMonPalette_Weezing, SPECIES_WEEZING}, + [SPECIES_RHYHORN] = {gMonPalette_Rhyhorn, SPECIES_RHYHORN}, + [SPECIES_RHYDON] = {gMonPalette_Rhydon, SPECIES_RHYDON}, + [SPECIES_CHANSEY] = {gMonPalette_Chansey, SPECIES_CHANSEY}, + [SPECIES_TANGELA] = {gMonPalette_Tangela, SPECIES_TANGELA}, + [SPECIES_KANGASKHAN] = {gMonPalette_Kangaskhan, SPECIES_KANGASKHAN}, + [SPECIES_HORSEA] = {gMonPalette_Horsea, SPECIES_HORSEA}, + [SPECIES_SEADRA] = {gMonPalette_Seadra, SPECIES_SEADRA}, + [SPECIES_GOLDEEN] = {gMonPalette_Goldeen, SPECIES_GOLDEEN}, + [SPECIES_SEAKING] = {gMonPalette_Seaking, SPECIES_SEAKING}, + [SPECIES_STARYU] = {gMonPalette_Staryu, SPECIES_STARYU}, + [SPECIES_STARMIE] = {gMonPalette_Starmie, SPECIES_STARMIE}, + [SPECIES_MR_MIME] = {gMonPalette_Mrmime, SPECIES_MR_MIME}, + [SPECIES_SCYTHER] = {gMonPalette_Scyther, SPECIES_SCYTHER}, + [SPECIES_JYNX] = {gMonPalette_Jynx, SPECIES_JYNX}, + [SPECIES_ELECTABUZZ] = {gMonPalette_Electabuzz, SPECIES_ELECTABUZZ}, + [SPECIES_MAGMAR] = {gMonPalette_Magmar, SPECIES_MAGMAR}, + [SPECIES_PINSIR] = {gMonPalette_Pinsir, SPECIES_PINSIR}, + [SPECIES_TAUROS] = {gMonPalette_Tauros, SPECIES_TAUROS}, + [SPECIES_MAGIKARP] = {gMonPalette_Magikarp, SPECIES_MAGIKARP}, + [SPECIES_GYARADOS] = {gMonPalette_Gyarados, SPECIES_GYARADOS}, + [SPECIES_LAPRAS] = {gMonPalette_Lapras, SPECIES_LAPRAS}, + [SPECIES_DITTO] = {gMonPalette_Ditto, SPECIES_DITTO}, + [SPECIES_EEVEE] = {gMonPalette_Eevee, SPECIES_EEVEE}, + [SPECIES_VAPOREON] = {gMonPalette_Vaporeon, SPECIES_VAPOREON}, + [SPECIES_JOLTEON] = {gMonPalette_Jolteon, SPECIES_JOLTEON}, + [SPECIES_FLAREON] = {gMonPalette_Flareon, SPECIES_FLAREON}, + [SPECIES_PORYGON] = {gMonPalette_Porygon, SPECIES_PORYGON}, + [SPECIES_OMANYTE] = {gMonPalette_Omanyte, SPECIES_OMANYTE}, + [SPECIES_OMASTAR] = {gMonPalette_Omastar, SPECIES_OMASTAR}, + [SPECIES_KABUTO] = {gMonPalette_Kabuto, SPECIES_KABUTO}, + [SPECIES_KABUTOPS] = {gMonPalette_Kabutops, SPECIES_KABUTOPS}, + [SPECIES_AERODACTYL] = {gMonPalette_Aerodactyl, SPECIES_AERODACTYL}, + [SPECIES_SNORLAX] = {gMonPalette_Snorlax, SPECIES_SNORLAX}, + [SPECIES_ARTICUNO] = {gMonPalette_Articuno, SPECIES_ARTICUNO}, + [SPECIES_ZAPDOS] = {gMonPalette_Zapdos, SPECIES_ZAPDOS}, + [SPECIES_MOLTRES] = {gMonPalette_Moltres, SPECIES_MOLTRES}, + [SPECIES_DRATINI] = {gMonPalette_Dratini, SPECIES_DRATINI}, + [SPECIES_DRAGONAIR] = {gMonPalette_Dragonair, SPECIES_DRAGONAIR}, + [SPECIES_DRAGONITE] = {gMonPalette_Dragonite, SPECIES_DRAGONITE}, + [SPECIES_MEWTWO] = {gMonPalette_Mewtwo, SPECIES_MEWTWO}, + [SPECIES_MEW] = {gMonPalette_Mew, SPECIES_MEW}, + [SPECIES_CHIKORITA] = {gMonPalette_Chikorita, SPECIES_CHIKORITA}, + [SPECIES_BAYLEEF] = {gMonPalette_Bayleef, SPECIES_BAYLEEF}, + [SPECIES_MEGANIUM] = {gMonPalette_Meganium, SPECIES_MEGANIUM}, + [SPECIES_CYNDAQUIL] = {gMonPalette_Cyndaquil, SPECIES_CYNDAQUIL}, + [SPECIES_QUILAVA] = {gMonPalette_Quilava, SPECIES_QUILAVA}, + [SPECIES_TYPHLOSION] = {gMonPalette_Typhlosion, SPECIES_TYPHLOSION}, + [SPECIES_TOTODILE] = {gMonPalette_Totodile, SPECIES_TOTODILE}, + [SPECIES_CROCONAW] = {gMonPalette_Croconaw, SPECIES_CROCONAW}, + [SPECIES_FERALIGATR] = {gMonPalette_Feraligatr, SPECIES_FERALIGATR}, + [SPECIES_SENTRET] = {gMonPalette_Sentret, SPECIES_SENTRET}, + [SPECIES_FURRET] = {gMonPalette_Furret, SPECIES_FURRET}, + [SPECIES_HOOTHOOT] = {gMonPalette_Hoothoot, SPECIES_HOOTHOOT}, + [SPECIES_NOCTOWL] = {gMonPalette_Noctowl, SPECIES_NOCTOWL}, + [SPECIES_LEDYBA] = {gMonPalette_Ledyba, SPECIES_LEDYBA}, + [SPECIES_LEDIAN] = {gMonPalette_Ledian, SPECIES_LEDIAN}, + [SPECIES_SPINARAK] = {gMonPalette_Spinarak, SPECIES_SPINARAK}, + [SPECIES_ARIADOS] = {gMonPalette_Ariados, SPECIES_ARIADOS}, + [SPECIES_CROBAT] = {gMonPalette_Crobat, SPECIES_CROBAT}, + [SPECIES_CHINCHOU] = {gMonPalette_Chinchou, SPECIES_CHINCHOU}, + [SPECIES_LANTURN] = {gMonPalette_Lanturn, SPECIES_LANTURN}, + [SPECIES_PICHU] = {gMonPalette_Pichu, SPECIES_PICHU}, + [SPECIES_CLEFFA] = {gMonPalette_Cleffa, SPECIES_CLEFFA}, + [SPECIES_IGGLYBUFF] = {gMonPalette_Igglybuff, SPECIES_IGGLYBUFF}, + [SPECIES_TOGEPI] = {gMonPalette_Togepi, SPECIES_TOGEPI}, + [SPECIES_TOGETIC] = {gMonPalette_Togetic, SPECIES_TOGETIC}, + [SPECIES_NATU] = {gMonPalette_Natu, SPECIES_NATU}, + [SPECIES_XATU] = {gMonPalette_Xatu, SPECIES_XATU}, + [SPECIES_MAREEP] = {gMonPalette_Mareep, SPECIES_MAREEP}, + [SPECIES_FLAAFFY] = {gMonPalette_Flaaffy, SPECIES_FLAAFFY}, + [SPECIES_AMPHAROS] = {gMonPalette_Ampharos, SPECIES_AMPHAROS}, + [SPECIES_BELLOSSOM] = {gMonPalette_Bellossom, SPECIES_BELLOSSOM}, + [SPECIES_MARILL] = {gMonPalette_Marill, SPECIES_MARILL}, + [SPECIES_AZUMARILL] = {gMonPalette_Azumarill, SPECIES_AZUMARILL}, + [SPECIES_SUDOWOODO] = {gMonPalette_Sudowoodo, SPECIES_SUDOWOODO}, + [SPECIES_POLITOED] = {gMonPalette_Politoed, SPECIES_POLITOED}, + [SPECIES_HOPPIP] = {gMonPalette_Hoppip, SPECIES_HOPPIP}, + [SPECIES_SKIPLOOM] = {gMonPalette_Skiploom, SPECIES_SKIPLOOM}, + [SPECIES_JUMPLUFF] = {gMonPalette_Jumpluff, SPECIES_JUMPLUFF}, + [SPECIES_AIPOM] = {gMonPalette_Aipom, SPECIES_AIPOM}, + [SPECIES_SUNKERN] = {gMonPalette_Sunkern, SPECIES_SUNKERN}, + [SPECIES_SUNFLORA] = {gMonPalette_Sunflora, SPECIES_SUNFLORA}, + [SPECIES_YANMA] = {gMonPalette_Yanma, SPECIES_YANMA}, + [SPECIES_WOOPER] = {gMonPalette_Wooper, SPECIES_WOOPER}, + [SPECIES_QUAGSIRE] = {gMonPalette_Quagsire, SPECIES_QUAGSIRE}, + [SPECIES_ESPEON] = {gMonPalette_Espeon, SPECIES_ESPEON}, + [SPECIES_UMBREON] = {gMonPalette_Umbreon, SPECIES_UMBREON}, + [SPECIES_MURKROW] = {gMonPalette_Murkrow, SPECIES_MURKROW}, + [SPECIES_SLOWKING] = {gMonPalette_Slowking, SPECIES_SLOWKING}, + [SPECIES_MISDREAVUS] = {gMonPalette_Misdreavus, SPECIES_MISDREAVUS}, + [SPECIES_UNOWN] = {gMonPalette_Unown, SPECIES_UNOWN}, + [SPECIES_WOBBUFFET] = {gMonPalette_Wobbuffet, SPECIES_WOBBUFFET}, + [SPECIES_GIRAFARIG] = {gMonPalette_Girafarig, SPECIES_GIRAFARIG}, + [SPECIES_PINECO] = {gMonPalette_Pineco, SPECIES_PINECO}, + [SPECIES_FORRETRESS] = {gMonPalette_Forretress, SPECIES_FORRETRESS}, + [SPECIES_DUNSPARCE] = {gMonPalette_Dunsparce, SPECIES_DUNSPARCE}, + [SPECIES_GLIGAR] = {gMonPalette_Gligar, SPECIES_GLIGAR}, + [SPECIES_STEELIX] = {gMonPalette_Steelix, SPECIES_STEELIX}, + [SPECIES_SNUBBULL] = {gMonPalette_Snubbull, SPECIES_SNUBBULL}, + [SPECIES_GRANBULL] = {gMonPalette_Granbull, SPECIES_GRANBULL}, + [SPECIES_QWILFISH] = {gMonPalette_Qwilfish, SPECIES_QWILFISH}, + [SPECIES_SCIZOR] = {gMonPalette_Scizor, SPECIES_SCIZOR}, + [SPECIES_SHUCKLE] = {gMonPalette_Shuckle, SPECIES_SHUCKLE}, + [SPECIES_HERACROSS] = {gMonPalette_Heracross, SPECIES_HERACROSS}, + [SPECIES_SNEASEL] = {gMonPalette_Sneasel, SPECIES_SNEASEL}, + [SPECIES_TEDDIURSA] = {gMonPalette_Teddiursa, SPECIES_TEDDIURSA}, + [SPECIES_URSARING] = {gMonPalette_Ursaring, SPECIES_URSARING}, + [SPECIES_SLUGMA] = {gMonPalette_Slugma, SPECIES_SLUGMA}, + [SPECIES_MAGCARGO] = {gMonPalette_Magcargo, SPECIES_MAGCARGO}, + [SPECIES_SWINUB] = {gMonPalette_Swinub, SPECIES_SWINUB}, + [SPECIES_PILOSWINE] = {gMonPalette_Piloswine, SPECIES_PILOSWINE}, + [SPECIES_CORSOLA] = {gMonPalette_Corsola, SPECIES_CORSOLA}, + [SPECIES_REMORAID] = {gMonPalette_Remoraid, SPECIES_REMORAID}, + [SPECIES_OCTILLERY] = {gMonPalette_Octillery, SPECIES_OCTILLERY}, + [SPECIES_DELIBIRD] = {gMonPalette_Delibird, SPECIES_DELIBIRD}, + [SPECIES_MANTINE] = {gMonPalette_Mantine, SPECIES_MANTINE}, + [SPECIES_SKARMORY] = {gMonPalette_Skarmory, SPECIES_SKARMORY}, + [SPECIES_HOUNDOUR] = {gMonPalette_Houndour, SPECIES_HOUNDOUR}, + [SPECIES_HOUNDOOM] = {gMonPalette_Houndoom, SPECIES_HOUNDOOM}, + [SPECIES_KINGDRA] = {gMonPalette_Kingdra, SPECIES_KINGDRA}, + [SPECIES_PHANPY] = {gMonPalette_Phanpy, SPECIES_PHANPY}, + [SPECIES_DONPHAN] = {gMonPalette_Donphan, SPECIES_DONPHAN}, + [SPECIES_PORYGON2] = {gMonPalette_Porygon2, SPECIES_PORYGON2}, + [SPECIES_STANTLER] = {gMonPalette_Stantler, SPECIES_STANTLER}, + [SPECIES_SMEARGLE] = {gMonPalette_Smeargle, SPECIES_SMEARGLE}, + [SPECIES_TYROGUE] = {gMonPalette_Tyrogue, SPECIES_TYROGUE}, + [SPECIES_HITMONTOP] = {gMonPalette_Hitmontop, SPECIES_HITMONTOP}, + [SPECIES_SMOOCHUM] = {gMonPalette_Smoochum, SPECIES_SMOOCHUM}, + [SPECIES_ELEKID] = {gMonPalette_Elekid, SPECIES_ELEKID}, + [SPECIES_MAGBY] = {gMonPalette_Magby, SPECIES_MAGBY}, + [SPECIES_MILTANK] = {gMonPalette_Miltank, SPECIES_MILTANK}, + [SPECIES_BLISSEY] = {gMonPalette_Blissey, SPECIES_BLISSEY}, + [SPECIES_RAIKOU] = {gMonPalette_Raikou, SPECIES_RAIKOU}, + [SPECIES_ENTEI] = {gMonPalette_Entei, SPECIES_ENTEI}, + [SPECIES_SUICUNE] = {gMonPalette_Suicune, SPECIES_SUICUNE}, + [SPECIES_LARVITAR] = {gMonPalette_Larvitar, SPECIES_LARVITAR}, + [SPECIES_PUPITAR] = {gMonPalette_Pupitar, SPECIES_PUPITAR}, + [SPECIES_TYRANITAR] = {gMonPalette_Tyranitar, SPECIES_TYRANITAR}, + [SPECIES_LUGIA] = {gMonPalette_Lugia, SPECIES_LUGIA}, + [SPECIES_HO_OH] = {gMonPalette_HoOh, SPECIES_HO_OH}, + [SPECIES_CELEBI] = {gMonPalette_Celebi, SPECIES_CELEBI}, + [SPECIES_OLD_UNOWN_B] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_B}, + [SPECIES_OLD_UNOWN_C] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_C}, + [SPECIES_OLD_UNOWN_D] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_D}, + [SPECIES_OLD_UNOWN_E] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_E}, + [SPECIES_OLD_UNOWN_F] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_F}, + [SPECIES_OLD_UNOWN_G] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_G}, + [SPECIES_OLD_UNOWN_H] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_H}, + [SPECIES_OLD_UNOWN_I] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_I}, + [SPECIES_OLD_UNOWN_J] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_J}, + [SPECIES_OLD_UNOWN_K] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_K}, + [SPECIES_OLD_UNOWN_L] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_L}, + [SPECIES_OLD_UNOWN_M] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_M}, + [SPECIES_OLD_UNOWN_N] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_N}, + [SPECIES_OLD_UNOWN_O] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_O}, + [SPECIES_OLD_UNOWN_P] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_P}, + [SPECIES_OLD_UNOWN_Q] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Q}, + [SPECIES_OLD_UNOWN_R] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_R}, + [SPECIES_OLD_UNOWN_S] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_S}, + [SPECIES_OLD_UNOWN_T] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_T}, + [SPECIES_OLD_UNOWN_U] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_U}, + [SPECIES_OLD_UNOWN_V] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_V}, + [SPECIES_OLD_UNOWN_W] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_W}, + [SPECIES_OLD_UNOWN_X] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_X}, + [SPECIES_OLD_UNOWN_Y] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Y}, + [SPECIES_OLD_UNOWN_Z] = {gMonPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Z}, + [SPECIES_TREECKO] = {gMonPalette_Treecko, SPECIES_TREECKO}, + [SPECIES_GROVYLE] = {gMonPalette_Grovyle, SPECIES_GROVYLE}, + [SPECIES_SCEPTILE] = {gMonPalette_Sceptile, SPECIES_SCEPTILE}, + [SPECIES_TORCHIC] = {gMonPalette_Torchic, SPECIES_TORCHIC}, + [SPECIES_COMBUSKEN] = {gMonPalette_Combusken, SPECIES_COMBUSKEN}, + [SPECIES_BLAZIKEN] = {gMonPalette_Blaziken, SPECIES_BLAZIKEN}, + [SPECIES_MUDKIP] = {gMonPalette_Mudkip, SPECIES_MUDKIP}, + [SPECIES_MARSHTOMP] = {gMonPalette_Marshtomp, SPECIES_MARSHTOMP}, + [SPECIES_SWAMPERT] = {gMonPalette_Swampert, SPECIES_SWAMPERT}, + [SPECIES_POOCHYENA] = {gMonPalette_Poochyena, SPECIES_POOCHYENA}, + [SPECIES_MIGHTYENA] = {gMonPalette_Mightyena, SPECIES_MIGHTYENA}, + [SPECIES_ZIGZAGOON] = {gMonPalette_Zigzagoon, SPECIES_ZIGZAGOON}, + [SPECIES_LINOONE] = {gMonPalette_Linoone, SPECIES_LINOONE}, + [SPECIES_WURMPLE] = {gMonPalette_Wurmple, SPECIES_WURMPLE}, + [SPECIES_SILCOON] = {gMonPalette_Silcoon, SPECIES_SILCOON}, + [SPECIES_BEAUTIFLY] = {gMonPalette_Beautifly, SPECIES_BEAUTIFLY}, + [SPECIES_CASCOON] = {gMonPalette_Cascoon, SPECIES_CASCOON}, + [SPECIES_DUSTOX] = {gMonPalette_Dustox, SPECIES_DUSTOX}, + [SPECIES_LOTAD] = {gMonPalette_Lotad, SPECIES_LOTAD}, + [SPECIES_LOMBRE] = {gMonPalette_Lombre, SPECIES_LOMBRE}, + [SPECIES_LUDICOLO] = {gMonPalette_Ludicolo, SPECIES_LUDICOLO}, + [SPECIES_SEEDOT] = {gMonPalette_Seedot, SPECIES_SEEDOT}, + [SPECIES_NUZLEAF] = {gMonPalette_Nuzleaf, SPECIES_NUZLEAF}, + [SPECIES_SHIFTRY] = {gMonPalette_Shiftry, SPECIES_SHIFTRY}, + [SPECIES_NINCADA] = {gMonPalette_Nincada, SPECIES_NINCADA}, + [SPECIES_NINJASK] = {gMonPalette_Ninjask, SPECIES_NINJASK}, + [SPECIES_SHEDINJA] = {gMonPalette_Shedinja, SPECIES_SHEDINJA}, + [SPECIES_TAILLOW] = {gMonPalette_Taillow, SPECIES_TAILLOW}, + [SPECIES_SWELLOW] = {gMonPalette_Swellow, SPECIES_SWELLOW}, + [SPECIES_SHROOMISH] = {gMonPalette_Shroomish, SPECIES_SHROOMISH}, + [SPECIES_BRELOOM] = {gMonPalette_Breloom, SPECIES_BRELOOM}, + [SPECIES_SPINDA] = {gMonPalette_Spinda, SPECIES_SPINDA}, + [SPECIES_WINGULL] = {gMonPalette_Wingull, SPECIES_WINGULL}, + [SPECIES_PELIPPER] = {gMonPalette_Pelipper, SPECIES_PELIPPER}, + [SPECIES_SURSKIT] = {gMonPalette_Surskit, SPECIES_SURSKIT}, + [SPECIES_MASQUERAIN] = {gMonPalette_Masquerain, SPECIES_MASQUERAIN}, + [SPECIES_WAILMER] = {gMonPalette_Wailmer, SPECIES_WAILMER}, + [SPECIES_WAILORD] = {gMonPalette_Wailord, SPECIES_WAILORD}, + [SPECIES_SKITTY] = {gMonPalette_Skitty, SPECIES_SKITTY}, + [SPECIES_DELCATTY] = {gMonPalette_Delcatty, SPECIES_DELCATTY}, + [SPECIES_KECLEON] = {gMonPalette_Kecleon, SPECIES_KECLEON}, + [SPECIES_BALTOY] = {gMonPalette_Baltoy, SPECIES_BALTOY}, + [SPECIES_CLAYDOL] = {gMonPalette_Claydol, SPECIES_CLAYDOL}, + [SPECIES_NOSEPASS] = {gMonPalette_Nosepass, SPECIES_NOSEPASS}, + [SPECIES_TORKOAL] = {gMonPalette_Torkoal, SPECIES_TORKOAL}, + [SPECIES_SABLEYE] = {gMonPalette_Sableye, SPECIES_SABLEYE}, + [SPECIES_BARBOACH] = {gMonPalette_Barboach, SPECIES_BARBOACH}, + [SPECIES_WHISCASH] = {gMonPalette_Whiscash, SPECIES_WHISCASH}, + [SPECIES_LUVDISC] = {gMonPalette_Luvdisc, SPECIES_LUVDISC}, + [SPECIES_CORPHISH] = {gMonPalette_Corphish, SPECIES_CORPHISH}, + [SPECIES_CRAWDAUNT] = {gMonPalette_Crawdaunt, SPECIES_CRAWDAUNT}, + [SPECIES_FEEBAS] = {gMonPalette_Feebas, SPECIES_FEEBAS}, + [SPECIES_MILOTIC] = {gMonPalette_Milotic, SPECIES_MILOTIC}, + [SPECIES_CARVANHA] = {gMonPalette_Carvanha, SPECIES_CARVANHA}, + [SPECIES_SHARPEDO] = {gMonPalette_Sharpedo, SPECIES_SHARPEDO}, + [SPECIES_TRAPINCH] = {gMonPalette_Trapinch, SPECIES_TRAPINCH}, + [SPECIES_VIBRAVA] = {gMonPalette_Vibrava, SPECIES_VIBRAVA}, + [SPECIES_FLYGON] = {gMonPalette_Flygon, SPECIES_FLYGON}, + [SPECIES_MAKUHITA] = {gMonPalette_Makuhita, SPECIES_MAKUHITA}, + [SPECIES_HARIYAMA] = {gMonPalette_Hariyama, SPECIES_HARIYAMA}, + [SPECIES_ELECTRIKE] = {gMonPalette_Electrike, SPECIES_ELECTRIKE}, + [SPECIES_MANECTRIC] = {gMonPalette_Manectric, SPECIES_MANECTRIC}, + [SPECIES_NUMEL] = {gMonPalette_Numel, SPECIES_NUMEL}, + [SPECIES_CAMERUPT] = {gMonPalette_Camerupt, SPECIES_CAMERUPT}, + [SPECIES_SPHEAL] = {gMonPalette_Spheal, SPECIES_SPHEAL}, + [SPECIES_SEALEO] = {gMonPalette_Sealeo, SPECIES_SEALEO}, + [SPECIES_WALREIN] = {gMonPalette_Walrein, SPECIES_WALREIN}, + [SPECIES_CACNEA] = {gMonPalette_Cacnea, SPECIES_CACNEA}, + [SPECIES_CACTURNE] = {gMonPalette_Cacturne, SPECIES_CACTURNE}, + [SPECIES_SNORUNT] = {gMonPalette_Snorunt, SPECIES_SNORUNT}, + [SPECIES_GLALIE] = {gMonPalette_Glalie, SPECIES_GLALIE}, + [SPECIES_LUNATONE] = {gMonPalette_Lunatone, SPECIES_LUNATONE}, + [SPECIES_SOLROCK] = {gMonPalette_Solrock, SPECIES_SOLROCK}, + [SPECIES_AZURILL] = {gMonPalette_Azurill, SPECIES_AZURILL}, + [SPECIES_SPOINK] = {gMonPalette_Spoink, SPECIES_SPOINK}, + [SPECIES_GRUMPIG] = {gMonPalette_Grumpig, SPECIES_GRUMPIG}, + [SPECIES_PLUSLE] = {gMonPalette_Plusle, SPECIES_PLUSLE}, + [SPECIES_MINUN] = {gMonPalette_Minun, SPECIES_MINUN}, + [SPECIES_MAWILE] = {gMonPalette_Mawile, SPECIES_MAWILE}, + [SPECIES_MEDITITE] = {gMonPalette_Meditite, SPECIES_MEDITITE}, + [SPECIES_MEDICHAM] = {gMonPalette_Medicham, SPECIES_MEDICHAM}, + [SPECIES_SWABLU] = {gMonPalette_Swablu, SPECIES_SWABLU}, + [SPECIES_ALTARIA] = {gMonPalette_Altaria, SPECIES_ALTARIA}, + [SPECIES_WYNAUT] = {gMonPalette_Wynaut, SPECIES_WYNAUT}, + [SPECIES_DUSKULL] = {gMonPalette_Duskull, SPECIES_DUSKULL}, + [SPECIES_DUSCLOPS] = {gMonPalette_Dusclops, SPECIES_DUSCLOPS}, + [SPECIES_ROSELIA] = {gMonPalette_Roselia, SPECIES_ROSELIA}, + [SPECIES_SLAKOTH] = {gMonPalette_Slakoth, SPECIES_SLAKOTH}, + [SPECIES_VIGOROTH] = {gMonPalette_Vigoroth, SPECIES_VIGOROTH}, + [SPECIES_SLAKING] = {gMonPalette_Slaking, SPECIES_SLAKING}, + [SPECIES_GULPIN] = {gMonPalette_Gulpin, SPECIES_GULPIN}, + [SPECIES_SWALOT] = {gMonPalette_Swalot, SPECIES_SWALOT}, + [SPECIES_TROPIUS] = {gMonPalette_Tropius, SPECIES_TROPIUS}, + [SPECIES_WHISMUR] = {gMonPalette_Whismur, SPECIES_WHISMUR}, + [SPECIES_LOUDRED] = {gMonPalette_Loudred, SPECIES_LOUDRED}, + [SPECIES_EXPLOUD] = {gMonPalette_Exploud, SPECIES_EXPLOUD}, + [SPECIES_CLAMPERL] = {gMonPalette_Clamperl, SPECIES_CLAMPERL}, + [SPECIES_HUNTAIL] = {gMonPalette_Huntail, SPECIES_HUNTAIL}, + [SPECIES_GOREBYSS] = {gMonPalette_Gorebyss, SPECIES_GOREBYSS}, + [SPECIES_ABSOL] = {gMonPalette_Absol, SPECIES_ABSOL}, + [SPECIES_SHUPPET] = {gMonPalette_Shuppet, SPECIES_SHUPPET}, + [SPECIES_BANETTE] = {gMonPalette_Banette, SPECIES_BANETTE}, + [SPECIES_SEVIPER] = {gMonPalette_Seviper, SPECIES_SEVIPER}, + [SPECIES_ZANGOOSE] = {gMonPalette_Zangoose, SPECIES_ZANGOOSE}, + [SPECIES_RELICANTH] = {gMonPalette_Relicanth, SPECIES_RELICANTH}, + [SPECIES_ARON] = {gMonPalette_Aron, SPECIES_ARON}, + [SPECIES_LAIRON] = {gMonPalette_Lairon, SPECIES_LAIRON}, + [SPECIES_AGGRON] = {gMonPalette_Aggron, SPECIES_AGGRON}, + [SPECIES_CASTFORM] = {gMonPalette_Castform, SPECIES_CASTFORM}, + [SPECIES_VOLBEAT] = {gMonPalette_Volbeat, SPECIES_VOLBEAT}, + [SPECIES_ILLUMISE] = {gMonPalette_Illumise, SPECIES_ILLUMISE}, + [SPECIES_LILEEP] = {gMonPalette_Lileep, SPECIES_LILEEP}, + [SPECIES_CRADILY] = {gMonPalette_Cradily, SPECIES_CRADILY}, + [SPECIES_ANORITH] = {gMonPalette_Anorith, SPECIES_ANORITH}, + [SPECIES_ARMALDO] = {gMonPalette_Armaldo, SPECIES_ARMALDO}, + [SPECIES_RALTS] = {gMonPalette_Ralts, SPECIES_RALTS}, + [SPECIES_KIRLIA] = {gMonPalette_Kirlia, SPECIES_KIRLIA}, + [SPECIES_GARDEVOIR] = {gMonPalette_Gardevoir, SPECIES_GARDEVOIR}, + [SPECIES_BAGON] = {gMonPalette_Bagon, SPECIES_BAGON}, + [SPECIES_SHELGON] = {gMonPalette_Shelgon, SPECIES_SHELGON}, + [SPECIES_SALAMENCE] = {gMonPalette_Salamence, SPECIES_SALAMENCE}, + [SPECIES_BELDUM] = {gMonPalette_Beldum, SPECIES_BELDUM}, + [SPECIES_METANG] = {gMonPalette_Metang, SPECIES_METANG}, + [SPECIES_METAGROSS] = {gMonPalette_Metagross, SPECIES_METAGROSS}, + [SPECIES_REGIROCK] = {gMonPalette_Regirock, SPECIES_REGIROCK}, + [SPECIES_REGICE] = {gMonPalette_Regice, SPECIES_REGICE}, + [SPECIES_REGISTEEL] = {gMonPalette_Registeel, SPECIES_REGISTEEL}, + [SPECIES_KYOGRE] = {gMonPalette_Kyogre, SPECIES_KYOGRE}, + [SPECIES_GROUDON] = {gMonPalette_Groudon, SPECIES_GROUDON}, + [SPECIES_RAYQUAZA] = {gMonPalette_Rayquaza, SPECIES_RAYQUAZA}, + [SPECIES_LATIAS] = {gMonPalette_Latias, SPECIES_LATIAS}, + [SPECIES_LATIOS] = {gMonPalette_Latios, SPECIES_LATIOS}, + [SPECIES_JIRACHI] = {gMonPalette_Jirachi, SPECIES_JIRACHI}, + [SPECIES_DEOXYS] = {gMonPalette_Deoxys, SPECIES_DEOXYS}, + [SPECIES_CHIMECHO] = {gMonPalette_Chimecho, SPECIES_CHIMECHO}, + [SPECIES_EGG] = {gMonPalette_Egg, SPECIES_EGG}, + [SPECIES_UNOWN_B] = {gMonPalette_Unown, SPECIES_UNOWN_B}, + [SPECIES_UNOWN_C] = {gMonPalette_Unown, SPECIES_UNOWN_C}, + [SPECIES_UNOWN_D] = {gMonPalette_Unown, SPECIES_UNOWN_D}, + [SPECIES_UNOWN_E] = {gMonPalette_Unown, SPECIES_UNOWN_E}, + [SPECIES_UNOWN_F] = {gMonPalette_Unown, SPECIES_UNOWN_F}, + [SPECIES_UNOWN_G] = {gMonPalette_Unown, SPECIES_UNOWN_G}, + [SPECIES_UNOWN_H] = {gMonPalette_Unown, SPECIES_UNOWN_H}, + [SPECIES_UNOWN_I] = {gMonPalette_Unown, SPECIES_UNOWN_I}, + [SPECIES_UNOWN_J] = {gMonPalette_Unown, SPECIES_UNOWN_J}, + [SPECIES_UNOWN_K] = {gMonPalette_Unown, SPECIES_UNOWN_K}, + [SPECIES_UNOWN_L] = {gMonPalette_Unown, SPECIES_UNOWN_L}, + [SPECIES_UNOWN_M] = {gMonPalette_Unown, SPECIES_UNOWN_M}, + [SPECIES_UNOWN_N] = {gMonPalette_Unown, SPECIES_UNOWN_N}, + [SPECIES_UNOWN_O] = {gMonPalette_Unown, SPECIES_UNOWN_O}, + [SPECIES_UNOWN_P] = {gMonPalette_Unown, SPECIES_UNOWN_P}, + [SPECIES_UNOWN_Q] = {gMonPalette_Unown, SPECIES_UNOWN_Q}, + [SPECIES_UNOWN_R] = {gMonPalette_Unown, SPECIES_UNOWN_R}, + [SPECIES_UNOWN_S] = {gMonPalette_Unown, SPECIES_UNOWN_S}, + [SPECIES_UNOWN_T] = {gMonPalette_Unown, SPECIES_UNOWN_T}, + [SPECIES_UNOWN_U] = {gMonPalette_Unown, SPECIES_UNOWN_U}, + [SPECIES_UNOWN_V] = {gMonPalette_Unown, SPECIES_UNOWN_V}, + [SPECIES_UNOWN_W] = {gMonPalette_Unown, SPECIES_UNOWN_W}, + [SPECIES_UNOWN_X] = {gMonPalette_Unown, SPECIES_UNOWN_X}, + [SPECIES_UNOWN_Y] = {gMonPalette_Unown, SPECIES_UNOWN_Y}, + [SPECIES_UNOWN_Z] = {gMonPalette_Unown, SPECIES_UNOWN_Z}, + [SPECIES_UNOWN_EMARK] = {gMonPalette_Unown, SPECIES_UNOWN_EMARK}, + [SPECIES_UNOWN_QMARK] = {gMonPalette_Unown, SPECIES_UNOWN_QMARK}, }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 91708fafa..0c3f990cf 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1,443 +1,443 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = { - gMonShinyPalette_CircledQuestionMark, 500, - gMonShinyPalette_Bulbasaur, 501, - gMonShinyPalette_Ivysaur, 502, - gMonShinyPalette_Venusaur, 503, - gMonShinyPalette_Charmander, 504, - gMonShinyPalette_Charmeleon, 505, - gMonShinyPalette_Charizard, 506, - gMonShinyPalette_Squirtle, 507, - gMonShinyPalette_Wartortle, 508, - gMonShinyPalette_Blastoise, 509, - gMonShinyPalette_Caterpie, 510, - gMonShinyPalette_Metapod, 511, - gMonShinyPalette_Butterfree, 512, - gMonShinyPalette_Weedle, 513, - gMonShinyPalette_Kakuna, 514, - gMonShinyPalette_Beedrill, 515, - gMonShinyPalette_Pidgey, 516, - gMonShinyPalette_Pidgeotto, 517, - gMonShinyPalette_Pidgeot, 518, - gMonShinyPalette_Rattata, 519, - gMonShinyPalette_Raticate, 520, - gMonShinyPalette_Spearow, 521, - gMonShinyPalette_Fearow, 522, - gMonShinyPalette_Ekans, 523, - gMonShinyPalette_Arbok, 524, - gMonShinyPalette_Pikachu, 525, - gMonShinyPalette_Raichu, 526, - gMonShinyPalette_Sandshrew, 527, - gMonShinyPalette_Sandslash, 528, - gMonShinyPalette_NidoranF, 529, - gMonShinyPalette_Nidorina, 530, - gMonShinyPalette_Nidoqueen, 531, - gMonShinyPalette_NidoranM, 532, - gMonShinyPalette_Nidorino, 533, - gMonShinyPalette_Nidoking, 534, - gMonShinyPalette_Clefairy, 535, - gMonShinyPalette_Clefable, 536, - gMonShinyPalette_Vulpix, 537, - gMonShinyPalette_Ninetales, 538, - gMonShinyPalette_Jigglypuff, 539, - gMonShinyPalette_Wigglytuff, 540, - gMonShinyPalette_Zubat, 541, - gMonShinyPalette_Golbat, 542, - gMonShinyPalette_Oddish, 543, - gMonShinyPalette_Gloom, 544, - gMonShinyPalette_Vileplume, 545, - gMonShinyPalette_Paras, 546, - gMonShinyPalette_Parasect, 547, - gMonShinyPalette_Venonat, 548, - gMonShinyPalette_Venomoth, 549, - gMonShinyPalette_Diglett, 550, - gMonShinyPalette_Dugtrio, 551, - gMonShinyPalette_Meowth, 552, - gMonShinyPalette_Persian, 553, - gMonShinyPalette_Psyduck, 554, - gMonShinyPalette_Golduck, 555, - gMonShinyPalette_Mankey, 556, - gMonShinyPalette_Primeape, 557, - gMonShinyPalette_Growlithe, 558, - gMonShinyPalette_Arcanine, 559, - gMonShinyPalette_Poliwag, 560, - gMonShinyPalette_Poliwhirl, 561, - gMonShinyPalette_Poliwrath, 562, - gMonShinyPalette_Abra, 563, - gMonShinyPalette_Kadabra, 564, - gMonShinyPalette_Alakazam, 565, - gMonShinyPalette_Machop, 566, - gMonShinyPalette_Machoke, 567, - gMonShinyPalette_Machamp, 568, - gMonShinyPalette_Bellsprout, 569, - gMonShinyPalette_Weepinbell, 570, - gMonShinyPalette_Victreebel, 571, - gMonShinyPalette_Tentacool, 572, - gMonShinyPalette_Tentacruel, 573, - gMonShinyPalette_Geodude, 574, - gMonShinyPalette_Graveler, 575, - gMonShinyPalette_Golem, 576, - gMonShinyPalette_Ponyta, 577, - gMonShinyPalette_Rapidash, 578, - gMonShinyPalette_Slowpoke, 579, - gMonShinyPalette_Slowbro, 580, - gMonShinyPalette_Magnemite, 581, - gMonShinyPalette_Magneton, 582, - gMonShinyPalette_Farfetchd, 583, - gMonShinyPalette_Doduo, 584, - gMonShinyPalette_Dodrio, 585, - gMonShinyPalette_Seel, 586, - gMonShinyPalette_Dewgong, 587, - gMonShinyPalette_Grimer, 588, - gMonShinyPalette_Muk, 589, - gMonShinyPalette_Shellder, 590, - gMonShinyPalette_Cloyster, 591, - gMonShinyPalette_Gastly, 592, - gMonShinyPalette_Haunter, 593, - gMonShinyPalette_Gengar, 594, - gMonShinyPalette_Onix, 595, - gMonShinyPalette_Drowzee, 596, - gMonShinyPalette_Hypno, 597, - gMonShinyPalette_Krabby, 598, - gMonShinyPalette_Kingler, 599, - gMonShinyPalette_Voltorb, 600, - gMonShinyPalette_Electrode, 601, - gMonShinyPalette_Exeggcute, 602, - gMonShinyPalette_Exeggutor, 603, - gMonShinyPalette_Cubone, 604, - gMonShinyPalette_Marowak, 605, - gMonShinyPalette_Hitmonlee, 606, - gMonShinyPalette_Hitmonchan, 607, - gMonShinyPalette_Lickitung, 608, - gMonShinyPalette_Koffing, 609, - gMonShinyPalette_Weezing, 610, - gMonShinyPalette_Rhyhorn, 611, - gMonShinyPalette_Rhydon, 612, - gMonShinyPalette_Chansey, 613, - gMonShinyPalette_Tangela, 614, - gMonShinyPalette_Kangaskhan, 615, - gMonShinyPalette_Horsea, 616, - gMonShinyPalette_Seadra, 617, - gMonShinyPalette_Goldeen, 618, - gMonShinyPalette_Seaking, 619, - gMonShinyPalette_Staryu, 620, - gMonShinyPalette_Starmie, 621, - gMonShinyPalette_Mrmime, 622, - gMonShinyPalette_Scyther, 623, - gMonShinyPalette_Jynx, 624, - gMonShinyPalette_Electabuzz, 625, - gMonShinyPalette_Magmar, 626, - gMonShinyPalette_Pinsir, 627, - gMonShinyPalette_Tauros, 628, - gMonShinyPalette_Magikarp, 629, - gMonShinyPalette_Gyarados, 630, - gMonShinyPalette_Lapras, 631, - gMonShinyPalette_Ditto, 632, - gMonShinyPalette_Eevee, 633, - gMonShinyPalette_Vaporeon, 634, - gMonShinyPalette_Jolteon, 635, - gMonShinyPalette_Flareon, 636, - gMonShinyPalette_Porygon, 637, - gMonShinyPalette_Omanyte, 638, - gMonShinyPalette_Omastar, 639, - gMonShinyPalette_Kabuto, 640, - gMonShinyPalette_Kabutops, 641, - gMonShinyPalette_Aerodactyl, 642, - gMonShinyPalette_Snorlax, 643, - gMonShinyPalette_Articuno, 644, - gMonShinyPalette_Zapdos, 645, - gMonShinyPalette_Moltres, 646, - gMonShinyPalette_Dratini, 647, - gMonShinyPalette_Dragonair, 648, - gMonShinyPalette_Dragonite, 649, - gMonShinyPalette_Mewtwo, 650, - gMonShinyPalette_Mew, 651, - gMonShinyPalette_Chikorita, 652, - gMonShinyPalette_Bayleef, 653, - gMonShinyPalette_Meganium, 654, - gMonShinyPalette_Cyndaquil, 655, - gMonShinyPalette_Quilava, 656, - gMonShinyPalette_Typhlosion, 657, - gMonShinyPalette_Totodile, 658, - gMonShinyPalette_Croconaw, 659, - gMonShinyPalette_Feraligatr, 660, - gMonShinyPalette_Sentret, 661, - gMonShinyPalette_Furret, 662, - gMonShinyPalette_Hoothoot, 663, - gMonShinyPalette_Noctowl, 664, - gMonShinyPalette_Ledyba, 665, - gMonShinyPalette_Ledian, 666, - gMonShinyPalette_Spinarak, 667, - gMonShinyPalette_Ariados, 668, - gMonShinyPalette_Crobat, 669, - gMonShinyPalette_Chinchou, 670, - gMonShinyPalette_Lanturn, 671, - gMonShinyPalette_Pichu, 672, - gMonShinyPalette_Cleffa, 673, - gMonShinyPalette_Igglybuff, 674, - gMonShinyPalette_Togepi, 675, - gMonShinyPalette_Togetic, 676, - gMonShinyPalette_Natu, 677, - gMonShinyPalette_Xatu, 678, - gMonShinyPalette_Mareep, 679, - gMonShinyPalette_Flaaffy, 680, - gMonShinyPalette_Ampharos, 681, - gMonShinyPalette_Bellossom, 682, - gMonShinyPalette_Marill, 683, - gMonShinyPalette_Azumarill, 684, - gMonShinyPalette_Sudowoodo, 685, - gMonShinyPalette_Politoed, 686, - gMonShinyPalette_Hoppip, 687, - gMonShinyPalette_Skiploom, 688, - gMonShinyPalette_Jumpluff, 689, - gMonShinyPalette_Aipom, 690, - gMonShinyPalette_Sunkern, 691, - gMonShinyPalette_Sunflora, 692, - gMonShinyPalette_Yanma, 693, - gMonShinyPalette_Wooper, 694, - gMonShinyPalette_Quagsire, 695, - gMonShinyPalette_Espeon, 696, - gMonShinyPalette_Umbreon, 697, - gMonShinyPalette_Murkrow, 698, - gMonShinyPalette_Slowking, 699, - gMonShinyPalette_Misdreavus, 700, - gMonShinyPalette_Unown, 701, - gMonShinyPalette_Wobbuffet, 702, - gMonShinyPalette_Girafarig, 703, - gMonShinyPalette_Pineco, 704, - gMonShinyPalette_Forretress, 705, - gMonShinyPalette_Dunsparce, 706, - gMonShinyPalette_Gligar, 707, - gMonShinyPalette_Steelix, 708, - gMonShinyPalette_Snubbull, 709, - gMonShinyPalette_Granbull, 710, - gMonShinyPalette_Qwilfish, 711, - gMonShinyPalette_Scizor, 712, - gMonShinyPalette_Shuckle, 713, - gMonShinyPalette_Heracross, 714, - gMonShinyPalette_Sneasel, 715, - gMonShinyPalette_Teddiursa, 716, - gMonShinyPalette_Ursaring, 717, - gMonShinyPalette_Slugma, 718, - gMonShinyPalette_Magcargo, 719, - gMonShinyPalette_Swinub, 720, - gMonShinyPalette_Piloswine, 721, - gMonShinyPalette_Corsola, 722, - gMonShinyPalette_Remoraid, 723, - gMonShinyPalette_Octillery, 724, - gMonShinyPalette_Delibird, 725, - gMonShinyPalette_Mantine, 726, - gMonShinyPalette_Skarmory, 727, - gMonShinyPalette_Houndour, 728, - gMonShinyPalette_Houndoom, 729, - gMonShinyPalette_Kingdra, 730, - gMonShinyPalette_Phanpy, 731, - gMonShinyPalette_Donphan, 732, - gMonShinyPalette_Porygon2, 733, - gMonShinyPalette_Stantler, 734, - gMonShinyPalette_Smeargle, 735, - gMonShinyPalette_Tyrogue, 736, - gMonShinyPalette_Hitmontop, 737, - gMonShinyPalette_Smoochum, 738, - gMonShinyPalette_Elekid, 739, - gMonShinyPalette_Magby, 740, - gMonShinyPalette_Miltank, 741, - gMonShinyPalette_Blissey, 742, - gMonShinyPalette_Raikou, 743, - gMonShinyPalette_Entei, 744, - gMonShinyPalette_Suicune, 745, - gMonShinyPalette_Larvitar, 746, - gMonShinyPalette_Pupitar, 747, - gMonShinyPalette_Tyranitar, 748, - gMonShinyPalette_Lugia, 749, - gMonShinyPalette_HoOh, 750, - gMonShinyPalette_Celebi, 751, - gMonShinyPalette_DoubleQuestionMark, 752, - gMonShinyPalette_DoubleQuestionMark, 753, - gMonShinyPalette_DoubleQuestionMark, 754, - gMonShinyPalette_DoubleQuestionMark, 755, - gMonShinyPalette_DoubleQuestionMark, 756, - gMonShinyPalette_DoubleQuestionMark, 757, - gMonShinyPalette_DoubleQuestionMark, 758, - gMonShinyPalette_DoubleQuestionMark, 759, - gMonShinyPalette_DoubleQuestionMark, 760, - gMonShinyPalette_DoubleQuestionMark, 761, - gMonShinyPalette_DoubleQuestionMark, 762, - gMonShinyPalette_DoubleQuestionMark, 763, - gMonShinyPalette_DoubleQuestionMark, 764, - gMonShinyPalette_DoubleQuestionMark, 765, - gMonShinyPalette_DoubleQuestionMark, 766, - gMonShinyPalette_DoubleQuestionMark, 767, - gMonShinyPalette_DoubleQuestionMark, 768, - gMonShinyPalette_DoubleQuestionMark, 769, - gMonShinyPalette_DoubleQuestionMark, 770, - gMonShinyPalette_DoubleQuestionMark, 771, - gMonShinyPalette_DoubleQuestionMark, 772, - gMonShinyPalette_DoubleQuestionMark, 773, - gMonShinyPalette_DoubleQuestionMark, 774, - gMonShinyPalette_DoubleQuestionMark, 775, - gMonShinyPalette_DoubleQuestionMark, 776, - gMonShinyPalette_Treecko, 777, - gMonShinyPalette_Grovyle, 778, - gMonShinyPalette_Sceptile, 779, - gMonShinyPalette_Torchic, 780, - gMonShinyPalette_Combusken, 781, - gMonShinyPalette_Blaziken, 782, - gMonShinyPalette_Mudkip, 783, - gMonShinyPalette_Marshtomp, 784, - gMonShinyPalette_Swampert, 785, - gMonShinyPalette_Poochyena, 786, - gMonShinyPalette_Mightyena, 787, - gMonShinyPalette_Zigzagoon, 788, - gMonShinyPalette_Linoone, 789, - gMonShinyPalette_Wurmple, 790, - gMonShinyPalette_Silcoon, 791, - gMonShinyPalette_Beautifly, 792, - gMonShinyPalette_Cascoon, 793, - gMonShinyPalette_Dustox, 794, - gMonShinyPalette_Lotad, 795, - gMonShinyPalette_Lombre, 796, - gMonShinyPalette_Ludicolo, 797, - gMonShinyPalette_Seedot, 798, - gMonShinyPalette_Nuzleaf, 799, - gMonShinyPalette_Shiftry, 800, - gMonShinyPalette_Nincada, 801, - gMonShinyPalette_Ninjask, 802, - gMonShinyPalette_Shedinja, 803, - gMonShinyPalette_Taillow, 804, - gMonShinyPalette_Swellow, 805, - gMonShinyPalette_Shroomish, 806, - gMonShinyPalette_Breloom, 807, - gMonShinyPalette_Spinda, 808, - gMonShinyPalette_Wingull, 809, - gMonShinyPalette_Pelipper, 810, - gMonShinyPalette_Surskit, 811, - gMonShinyPalette_Masquerain, 812, - gMonShinyPalette_Wailmer, 813, - gMonShinyPalette_Wailord, 814, - gMonShinyPalette_Skitty, 815, - gMonShinyPalette_Delcatty, 816, - gMonShinyPalette_Kecleon, 817, - gMonShinyPalette_Baltoy, 818, - gMonShinyPalette_Claydol, 819, - gMonShinyPalette_Nosepass, 820, - gMonShinyPalette_Torkoal, 821, - gMonShinyPalette_Sableye, 822, - gMonShinyPalette_Barboach, 823, - gMonShinyPalette_Whiscash, 824, - gMonShinyPalette_Luvdisc, 825, - gMonShinyPalette_Corphish, 826, - gMonShinyPalette_Crawdaunt, 827, - gMonShinyPalette_Feebas, 828, - gMonShinyPalette_Milotic, 829, - gMonShinyPalette_Carvanha, 830, - gMonShinyPalette_Sharpedo, 831, - gMonShinyPalette_Trapinch, 832, - gMonShinyPalette_Vibrava, 833, - gMonShinyPalette_Flygon, 834, - gMonShinyPalette_Makuhita, 835, - gMonShinyPalette_Hariyama, 836, - gMonShinyPalette_Electrike, 837, - gMonShinyPalette_Manectric, 838, - gMonShinyPalette_Numel, 839, - gMonShinyPalette_Camerupt, 840, - gMonShinyPalette_Spheal, 841, - gMonShinyPalette_Sealeo, 842, - gMonShinyPalette_Walrein, 843, - gMonShinyPalette_Cacnea, 844, - gMonShinyPalette_Cacturne, 845, - gMonShinyPalette_Snorunt, 846, - gMonShinyPalette_Glalie, 847, - gMonShinyPalette_Lunatone, 848, - gMonShinyPalette_Solrock, 849, - gMonShinyPalette_Azurill, 850, - gMonShinyPalette_Spoink, 851, - gMonShinyPalette_Grumpig, 852, - gMonShinyPalette_Plusle, 853, - gMonShinyPalette_Minun, 854, - gMonShinyPalette_Mawile, 855, - gMonShinyPalette_Meditite, 856, - gMonShinyPalette_Medicham, 857, - gMonShinyPalette_Swablu, 858, - gMonShinyPalette_Altaria, 859, - gMonShinyPalette_Wynaut, 860, - gMonShinyPalette_Duskull, 861, - gMonShinyPalette_Dusclops, 862, - gMonShinyPalette_Roselia, 863, - gMonShinyPalette_Slakoth, 864, - gMonShinyPalette_Vigoroth, 865, - gMonShinyPalette_Slaking, 866, - gMonShinyPalette_Gulpin, 867, - gMonShinyPalette_Swalot, 868, - gMonShinyPalette_Tropius, 869, - gMonShinyPalette_Whismur, 870, - gMonShinyPalette_Loudred, 871, - gMonShinyPalette_Exploud, 872, - gMonShinyPalette_Clamperl, 873, - gMonShinyPalette_Huntail, 874, - gMonShinyPalette_Gorebyss, 875, - gMonShinyPalette_Absol, 876, - gMonShinyPalette_Shuppet, 877, - gMonShinyPalette_Banette, 878, - gMonShinyPalette_Seviper, 879, - gMonShinyPalette_Zangoose, 880, - gMonShinyPalette_Relicanth, 881, - gMonShinyPalette_Aron, 882, - gMonShinyPalette_Lairon, 883, - gMonShinyPalette_Aggron, 884, - gMonShinyPalette_Castform, 885, - gMonShinyPalette_Volbeat, 886, - gMonShinyPalette_Illumise, 887, - gMonShinyPalette_Lileep, 888, - gMonShinyPalette_Cradily, 889, - gMonShinyPalette_Anorith, 890, - gMonShinyPalette_Armaldo, 891, - gMonShinyPalette_Ralts, 892, - gMonShinyPalette_Kirlia, 893, - gMonShinyPalette_Gardevoir, 894, - gMonShinyPalette_Bagon, 895, - gMonShinyPalette_Shelgon, 896, - gMonShinyPalette_Salamence, 897, - gMonShinyPalette_Beldum, 898, - gMonShinyPalette_Metang, 899, - gMonShinyPalette_Metagross, 900, - gMonShinyPalette_Regirock, 901, - gMonShinyPalette_Regice, 902, - gMonShinyPalette_Registeel, 903, - gMonShinyPalette_Kyogre, 904, - gMonShinyPalette_Groudon, 905, - gMonShinyPalette_Rayquaza, 906, - gMonShinyPalette_Latias, 907, - gMonShinyPalette_Latios, 908, - gMonShinyPalette_Jirachi, 909, - gMonShinyPalette_Deoxys, 910, - gMonShinyPalette_Chimecho, 911, - gMonPalette_Egg, 912, - gMonShinyPalette_Unown, 913, - gMonShinyPalette_Unown, 914, - gMonShinyPalette_Unown, 915, - gMonShinyPalette_Unown, 916, - gMonShinyPalette_Unown, 917, - gMonShinyPalette_Unown, 918, - gMonShinyPalette_Unown, 919, - gMonShinyPalette_Unown, 920, - gMonShinyPalette_Unown, 921, - gMonShinyPalette_Unown, 922, - gMonShinyPalette_Unown, 923, - gMonShinyPalette_Unown, 924, - gMonShinyPalette_Unown, 925, - gMonShinyPalette_Unown, 926, - gMonShinyPalette_Unown, 927, - gMonShinyPalette_Unown, 928, - gMonShinyPalette_Unown, 929, - gMonShinyPalette_Unown, 930, - gMonShinyPalette_Unown, 931, - gMonShinyPalette_Unown, 932, - gMonShinyPalette_Unown, 933, - gMonShinyPalette_Unown, 934, - gMonShinyPalette_Unown, 935, - gMonShinyPalette_Unown, 936, - gMonShinyPalette_Unown, 937, - gMonShinyPalette_Unown, 938, - gMonShinyPalette_Unown, 939, + [SPECIES_NONE] = {gMonShinyPalette_CircledQuestionMark, SPECIES_NONE + 500}, + [SPECIES_BULBASAUR] = {gMonShinyPalette_Bulbasaur, SPECIES_BULBASAUR + 500}, + [SPECIES_IVYSAUR] = {gMonShinyPalette_Ivysaur, SPECIES_IVYSAUR + 500}, + [SPECIES_VENUSAUR] = {gMonShinyPalette_Venusaur, SPECIES_VENUSAUR + 500}, + [SPECIES_CHARMANDER] = {gMonShinyPalette_Charmander, SPECIES_CHARMANDER + 500}, + [SPECIES_CHARMELEON] = {gMonShinyPalette_Charmeleon, SPECIES_CHARMELEON + 500}, + [SPECIES_CHARIZARD] = {gMonShinyPalette_Charizard, SPECIES_CHARIZARD + 500}, + [SPECIES_SQUIRTLE] = {gMonShinyPalette_Squirtle, SPECIES_SQUIRTLE + 500}, + [SPECIES_WARTORTLE] = {gMonShinyPalette_Wartortle, SPECIES_WARTORTLE + 500}, + [SPECIES_BLASTOISE] = {gMonShinyPalette_Blastoise, SPECIES_BLASTOISE + 500}, + [SPECIES_CATERPIE] = {gMonShinyPalette_Caterpie, SPECIES_CATERPIE + 500}, + [SPECIES_METAPOD] = {gMonShinyPalette_Metapod, SPECIES_METAPOD + 500}, + [SPECIES_BUTTERFREE] = {gMonShinyPalette_Butterfree, SPECIES_BUTTERFREE + 500}, + [SPECIES_WEEDLE] = {gMonShinyPalette_Weedle, SPECIES_WEEDLE + 500}, + [SPECIES_KAKUNA] = {gMonShinyPalette_Kakuna, SPECIES_KAKUNA + 500}, + [SPECIES_BEEDRILL] = {gMonShinyPalette_Beedrill, SPECIES_BEEDRILL + 500}, + [SPECIES_PIDGEY] = {gMonShinyPalette_Pidgey, SPECIES_PIDGEY + 500}, + [SPECIES_PIDGEOTTO] = {gMonShinyPalette_Pidgeotto, SPECIES_PIDGEOTTO + 500}, + [SPECIES_PIDGEOT] = {gMonShinyPalette_Pidgeot, SPECIES_PIDGEOT + 500}, + [SPECIES_RATTATA] = {gMonShinyPalette_Rattata, SPECIES_RATTATA + 500}, + [SPECIES_RATICATE] = {gMonShinyPalette_Raticate, SPECIES_RATICATE + 500}, + [SPECIES_SPEAROW] = {gMonShinyPalette_Spearow, SPECIES_SPEAROW + 500}, + [SPECIES_FEAROW] = {gMonShinyPalette_Fearow, SPECIES_FEAROW + 500}, + [SPECIES_EKANS] = {gMonShinyPalette_Ekans, SPECIES_EKANS + 500}, + [SPECIES_ARBOK] = {gMonShinyPalette_Arbok, SPECIES_ARBOK + 500}, + [SPECIES_PIKACHU] = {gMonShinyPalette_Pikachu, SPECIES_PIKACHU + 500}, + [SPECIES_RAICHU] = {gMonShinyPalette_Raichu, SPECIES_RAICHU + 500}, + [SPECIES_SANDSHREW] = {gMonShinyPalette_Sandshrew, SPECIES_SANDSHREW + 500}, + [SPECIES_SANDSLASH] = {gMonShinyPalette_Sandslash, SPECIES_SANDSLASH + 500}, + [SPECIES_NIDORAN_F] = {gMonShinyPalette_NidoranF, SPECIES_NIDORAN_F + 500}, + [SPECIES_NIDORINA] = {gMonShinyPalette_Nidorina, SPECIES_NIDORINA + 500}, + [SPECIES_NIDOQUEEN] = {gMonShinyPalette_Nidoqueen, SPECIES_NIDOQUEEN + 500}, + [SPECIES_NIDORAN_M] = {gMonShinyPalette_NidoranM, SPECIES_NIDORAN_M + 500}, + [SPECIES_NIDORINO] = {gMonShinyPalette_Nidorino, SPECIES_NIDORINO + 500}, + [SPECIES_NIDOKING] = {gMonShinyPalette_Nidoking, SPECIES_NIDOKING + 500}, + [SPECIES_CLEFAIRY] = {gMonShinyPalette_Clefairy, SPECIES_CLEFAIRY + 500}, + [SPECIES_CLEFABLE] = {gMonShinyPalette_Clefable, SPECIES_CLEFABLE + 500}, + [SPECIES_VULPIX] = {gMonShinyPalette_Vulpix, SPECIES_VULPIX + 500}, + [SPECIES_NINETALES] = {gMonShinyPalette_Ninetales, SPECIES_NINETALES + 500}, + [SPECIES_JIGGLYPUFF] = {gMonShinyPalette_Jigglypuff, SPECIES_JIGGLYPUFF + 500}, + [SPECIES_WIGGLYTUFF] = {gMonShinyPalette_Wigglytuff, SPECIES_WIGGLYTUFF + 500}, + [SPECIES_ZUBAT] = {gMonShinyPalette_Zubat, SPECIES_ZUBAT + 500}, + [SPECIES_GOLBAT] = {gMonShinyPalette_Golbat, SPECIES_GOLBAT + 500}, + [SPECIES_ODDISH] = {gMonShinyPalette_Oddish, SPECIES_ODDISH + 500}, + [SPECIES_GLOOM] = {gMonShinyPalette_Gloom, SPECIES_GLOOM + 500}, + [SPECIES_VILEPLUME] = {gMonShinyPalette_Vileplume, SPECIES_VILEPLUME + 500}, + [SPECIES_PARAS] = {gMonShinyPalette_Paras, SPECIES_PARAS + 500}, + [SPECIES_PARASECT] = {gMonShinyPalette_Parasect, SPECIES_PARASECT + 500}, + [SPECIES_VENONAT] = {gMonShinyPalette_Venonat, SPECIES_VENONAT + 500}, + [SPECIES_VENOMOTH] = {gMonShinyPalette_Venomoth, SPECIES_VENOMOTH + 500}, + [SPECIES_DIGLETT] = {gMonShinyPalette_Diglett, SPECIES_DIGLETT + 500}, + [SPECIES_DUGTRIO] = {gMonShinyPalette_Dugtrio, SPECIES_DUGTRIO + 500}, + [SPECIES_MEOWTH] = {gMonShinyPalette_Meowth, SPECIES_MEOWTH + 500}, + [SPECIES_PERSIAN] = {gMonShinyPalette_Persian, SPECIES_PERSIAN + 500}, + [SPECIES_PSYDUCK] = {gMonShinyPalette_Psyduck, SPECIES_PSYDUCK + 500}, + [SPECIES_GOLDUCK] = {gMonShinyPalette_Golduck, SPECIES_GOLDUCK + 500}, + [SPECIES_MANKEY] = {gMonShinyPalette_Mankey, SPECIES_MANKEY + 500}, + [SPECIES_PRIMEAPE] = {gMonShinyPalette_Primeape, SPECIES_PRIMEAPE + 500}, + [SPECIES_GROWLITHE] = {gMonShinyPalette_Growlithe, SPECIES_GROWLITHE + 500}, + [SPECIES_ARCANINE] = {gMonShinyPalette_Arcanine, SPECIES_ARCANINE + 500}, + [SPECIES_POLIWAG] = {gMonShinyPalette_Poliwag, SPECIES_POLIWAG + 500}, + [SPECIES_POLIWHIRL] = {gMonShinyPalette_Poliwhirl, SPECIES_POLIWHIRL + 500}, + [SPECIES_POLIWRATH] = {gMonShinyPalette_Poliwrath, SPECIES_POLIWRATH + 500}, + [SPECIES_ABRA] = {gMonShinyPalette_Abra, SPECIES_ABRA + 500}, + [SPECIES_KADABRA] = {gMonShinyPalette_Kadabra, SPECIES_KADABRA + 500}, + [SPECIES_ALAKAZAM] = {gMonShinyPalette_Alakazam, SPECIES_ALAKAZAM + 500}, + [SPECIES_MACHOP] = {gMonShinyPalette_Machop, SPECIES_MACHOP + 500}, + [SPECIES_MACHOKE] = {gMonShinyPalette_Machoke, SPECIES_MACHOKE + 500}, + [SPECIES_MACHAMP] = {gMonShinyPalette_Machamp, SPECIES_MACHAMP + 500}, + [SPECIES_BELLSPROUT] = {gMonShinyPalette_Bellsprout, SPECIES_BELLSPROUT + 500}, + [SPECIES_WEEPINBELL] = {gMonShinyPalette_Weepinbell, SPECIES_WEEPINBELL + 500}, + [SPECIES_VICTREEBEL] = {gMonShinyPalette_Victreebel, SPECIES_VICTREEBEL + 500}, + [SPECIES_TENTACOOL] = {gMonShinyPalette_Tentacool, SPECIES_TENTACOOL + 500}, + [SPECIES_TENTACRUEL] = {gMonShinyPalette_Tentacruel, SPECIES_TENTACRUEL + 500}, + [SPECIES_GEODUDE] = {gMonShinyPalette_Geodude, SPECIES_GEODUDE + 500}, + [SPECIES_GRAVELER] = {gMonShinyPalette_Graveler, SPECIES_GRAVELER + 500}, + [SPECIES_GOLEM] = {gMonShinyPalette_Golem, SPECIES_GOLEM + 500}, + [SPECIES_PONYTA] = {gMonShinyPalette_Ponyta, SPECIES_PONYTA + 500}, + [SPECIES_RAPIDASH] = {gMonShinyPalette_Rapidash, SPECIES_RAPIDASH + 500}, + [SPECIES_SLOWPOKE] = {gMonShinyPalette_Slowpoke, SPECIES_SLOWPOKE + 500}, + [SPECIES_SLOWBRO] = {gMonShinyPalette_Slowbro, SPECIES_SLOWBRO + 500}, + [SPECIES_MAGNEMITE] = {gMonShinyPalette_Magnemite, SPECIES_MAGNEMITE + 500}, + [SPECIES_MAGNETON] = {gMonShinyPalette_Magneton, SPECIES_MAGNETON + 500}, + [SPECIES_FARFETCHD] = {gMonShinyPalette_Farfetchd, SPECIES_FARFETCHD + 500}, + [SPECIES_DODUO] = {gMonShinyPalette_Doduo, SPECIES_DODUO + 500}, + [SPECIES_DODRIO] = {gMonShinyPalette_Dodrio, SPECIES_DODRIO + 500}, + [SPECIES_SEEL] = {gMonShinyPalette_Seel, SPECIES_SEEL + 500}, + [SPECIES_DEWGONG] = {gMonShinyPalette_Dewgong, SPECIES_DEWGONG + 500}, + [SPECIES_GRIMER] = {gMonShinyPalette_Grimer, SPECIES_GRIMER + 500}, + [SPECIES_MUK] = {gMonShinyPalette_Muk, SPECIES_MUK + 500}, + [SPECIES_SHELLDER] = {gMonShinyPalette_Shellder, SPECIES_SHELLDER + 500}, + [SPECIES_CLOYSTER] = {gMonShinyPalette_Cloyster, SPECIES_CLOYSTER + 500}, + [SPECIES_GASTLY] = {gMonShinyPalette_Gastly, SPECIES_GASTLY + 500}, + [SPECIES_HAUNTER] = {gMonShinyPalette_Haunter, SPECIES_HAUNTER + 500}, + [SPECIES_GENGAR] = {gMonShinyPalette_Gengar, SPECIES_GENGAR + 500}, + [SPECIES_ONIX] = {gMonShinyPalette_Onix, SPECIES_ONIX + 500}, + [SPECIES_DROWZEE] = {gMonShinyPalette_Drowzee, SPECIES_DROWZEE + 500}, + [SPECIES_HYPNO] = {gMonShinyPalette_Hypno, SPECIES_HYPNO + 500}, + [SPECIES_KRABBY] = {gMonShinyPalette_Krabby, SPECIES_KRABBY + 500}, + [SPECIES_KINGLER] = {gMonShinyPalette_Kingler, SPECIES_KINGLER + 500}, + [SPECIES_VOLTORB] = {gMonShinyPalette_Voltorb, SPECIES_VOLTORB + 500}, + [SPECIES_ELECTRODE] = {gMonShinyPalette_Electrode, SPECIES_ELECTRODE + 500}, + [SPECIES_EXEGGCUTE] = {gMonShinyPalette_Exeggcute, SPECIES_EXEGGCUTE + 500}, + [SPECIES_EXEGGUTOR] = {gMonShinyPalette_Exeggutor, SPECIES_EXEGGUTOR + 500}, + [SPECIES_CUBONE] = {gMonShinyPalette_Cubone, SPECIES_CUBONE + 500}, + [SPECIES_MAROWAK] = {gMonShinyPalette_Marowak, SPECIES_MAROWAK + 500}, + [SPECIES_HITMONLEE] = {gMonShinyPalette_Hitmonlee, SPECIES_HITMONLEE + 500}, + [SPECIES_HITMONCHAN] = {gMonShinyPalette_Hitmonchan, SPECIES_HITMONCHAN + 500}, + [SPECIES_LICKITUNG] = {gMonShinyPalette_Lickitung, SPECIES_LICKITUNG + 500}, + [SPECIES_KOFFING] = {gMonShinyPalette_Koffing, SPECIES_KOFFING + 500}, + [SPECIES_WEEZING] = {gMonShinyPalette_Weezing, SPECIES_WEEZING + 500}, + [SPECIES_RHYHORN] = {gMonShinyPalette_Rhyhorn, SPECIES_RHYHORN + 500}, + [SPECIES_RHYDON] = {gMonShinyPalette_Rhydon, SPECIES_RHYDON + 500}, + [SPECIES_CHANSEY] = {gMonShinyPalette_Chansey, SPECIES_CHANSEY + 500}, + [SPECIES_TANGELA] = {gMonShinyPalette_Tangela, SPECIES_TANGELA + 500}, + [SPECIES_KANGASKHAN] = {gMonShinyPalette_Kangaskhan, SPECIES_KANGASKHAN + 500}, + [SPECIES_HORSEA] = {gMonShinyPalette_Horsea, SPECIES_HORSEA + 500}, + [SPECIES_SEADRA] = {gMonShinyPalette_Seadra, SPECIES_SEADRA + 500}, + [SPECIES_GOLDEEN] = {gMonShinyPalette_Goldeen, SPECIES_GOLDEEN + 500}, + [SPECIES_SEAKING] = {gMonShinyPalette_Seaking, SPECIES_SEAKING + 500}, + [SPECIES_STARYU] = {gMonShinyPalette_Staryu, SPECIES_STARYU + 500}, + [SPECIES_STARMIE] = {gMonShinyPalette_Starmie, SPECIES_STARMIE + 500}, + [SPECIES_MR_MIME] = {gMonShinyPalette_Mrmime, SPECIES_MR_MIME + 500}, + [SPECIES_SCYTHER] = {gMonShinyPalette_Scyther, SPECIES_SCYTHER + 500}, + [SPECIES_JYNX] = {gMonShinyPalette_Jynx, SPECIES_JYNX + 500}, + [SPECIES_ELECTABUZZ] = {gMonShinyPalette_Electabuzz, SPECIES_ELECTABUZZ + 500}, + [SPECIES_MAGMAR] = {gMonShinyPalette_Magmar, SPECIES_MAGMAR + 500}, + [SPECIES_PINSIR] = {gMonShinyPalette_Pinsir, SPECIES_PINSIR + 500}, + [SPECIES_TAUROS] = {gMonShinyPalette_Tauros, SPECIES_TAUROS + 500}, + [SPECIES_MAGIKARP] = {gMonShinyPalette_Magikarp, SPECIES_MAGIKARP + 500}, + [SPECIES_GYARADOS] = {gMonShinyPalette_Gyarados, SPECIES_GYARADOS + 500}, + [SPECIES_LAPRAS] = {gMonShinyPalette_Lapras, SPECIES_LAPRAS + 500}, + [SPECIES_DITTO] = {gMonShinyPalette_Ditto, SPECIES_DITTO + 500}, + [SPECIES_EEVEE] = {gMonShinyPalette_Eevee, SPECIES_EEVEE + 500}, + [SPECIES_VAPOREON] = {gMonShinyPalette_Vaporeon, SPECIES_VAPOREON + 500}, + [SPECIES_JOLTEON] = {gMonShinyPalette_Jolteon, SPECIES_JOLTEON + 500}, + [SPECIES_FLAREON] = {gMonShinyPalette_Flareon, SPECIES_FLAREON + 500}, + [SPECIES_PORYGON] = {gMonShinyPalette_Porygon, SPECIES_PORYGON + 500}, + [SPECIES_OMANYTE] = {gMonShinyPalette_Omanyte, SPECIES_OMANYTE + 500}, + [SPECIES_OMASTAR] = {gMonShinyPalette_Omastar, SPECIES_OMASTAR + 500}, + [SPECIES_KABUTO] = {gMonShinyPalette_Kabuto, SPECIES_KABUTO + 500}, + [SPECIES_KABUTOPS] = {gMonShinyPalette_Kabutops, SPECIES_KABUTOPS + 500}, + [SPECIES_AERODACTYL] = {gMonShinyPalette_Aerodactyl, SPECIES_AERODACTYL + 500}, + [SPECIES_SNORLAX] = {gMonShinyPalette_Snorlax, SPECIES_SNORLAX + 500}, + [SPECIES_ARTICUNO] = {gMonShinyPalette_Articuno, SPECIES_ARTICUNO + 500}, + [SPECIES_ZAPDOS] = {gMonShinyPalette_Zapdos, SPECIES_ZAPDOS + 500}, + [SPECIES_MOLTRES] = {gMonShinyPalette_Moltres, SPECIES_MOLTRES + 500}, + [SPECIES_DRATINI] = {gMonShinyPalette_Dratini, SPECIES_DRATINI + 500}, + [SPECIES_DRAGONAIR] = {gMonShinyPalette_Dragonair, SPECIES_DRAGONAIR + 500}, + [SPECIES_DRAGONITE] = {gMonShinyPalette_Dragonite, SPECIES_DRAGONITE + 500}, + [SPECIES_MEWTWO] = {gMonShinyPalette_Mewtwo, SPECIES_MEWTWO + 500}, + [SPECIES_MEW] = {gMonShinyPalette_Mew, SPECIES_MEW + 500}, + [SPECIES_CHIKORITA] = {gMonShinyPalette_Chikorita, SPECIES_CHIKORITA + 500}, + [SPECIES_BAYLEEF] = {gMonShinyPalette_Bayleef, SPECIES_BAYLEEF + 500}, + [SPECIES_MEGANIUM] = {gMonShinyPalette_Meganium, SPECIES_MEGANIUM + 500}, + [SPECIES_CYNDAQUIL] = {gMonShinyPalette_Cyndaquil, SPECIES_CYNDAQUIL + 500}, + [SPECIES_QUILAVA] = {gMonShinyPalette_Quilava, SPECIES_QUILAVA + 500}, + [SPECIES_TYPHLOSION] = {gMonShinyPalette_Typhlosion, SPECIES_TYPHLOSION + 500}, + [SPECIES_TOTODILE] = {gMonShinyPalette_Totodile, SPECIES_TOTODILE + 500}, + [SPECIES_CROCONAW] = {gMonShinyPalette_Croconaw, SPECIES_CROCONAW + 500}, + [SPECIES_FERALIGATR] = {gMonShinyPalette_Feraligatr, SPECIES_FERALIGATR + 500}, + [SPECIES_SENTRET] = {gMonShinyPalette_Sentret, SPECIES_SENTRET + 500}, + [SPECIES_FURRET] = {gMonShinyPalette_Furret, SPECIES_FURRET + 500}, + [SPECIES_HOOTHOOT] = {gMonShinyPalette_Hoothoot, SPECIES_HOOTHOOT + 500}, + [SPECIES_NOCTOWL] = {gMonShinyPalette_Noctowl, SPECIES_NOCTOWL + 500}, + [SPECIES_LEDYBA] = {gMonShinyPalette_Ledyba, SPECIES_LEDYBA + 500}, + [SPECIES_LEDIAN] = {gMonShinyPalette_Ledian, SPECIES_LEDIAN + 500}, + [SPECIES_SPINARAK] = {gMonShinyPalette_Spinarak, SPECIES_SPINARAK + 500}, + [SPECIES_ARIADOS] = {gMonShinyPalette_Ariados, SPECIES_ARIADOS + 500}, + [SPECIES_CROBAT] = {gMonShinyPalette_Crobat, SPECIES_CROBAT + 500}, + [SPECIES_CHINCHOU] = {gMonShinyPalette_Chinchou, SPECIES_CHINCHOU + 500}, + [SPECIES_LANTURN] = {gMonShinyPalette_Lanturn, SPECIES_LANTURN + 500}, + [SPECIES_PICHU] = {gMonShinyPalette_Pichu, SPECIES_PICHU + 500}, + [SPECIES_CLEFFA] = {gMonShinyPalette_Cleffa, SPECIES_CLEFFA + 500}, + [SPECIES_IGGLYBUFF] = {gMonShinyPalette_Igglybuff, SPECIES_IGGLYBUFF + 500}, + [SPECIES_TOGEPI] = {gMonShinyPalette_Togepi, SPECIES_TOGEPI + 500}, + [SPECIES_TOGETIC] = {gMonShinyPalette_Togetic, SPECIES_TOGETIC + 500}, + [SPECIES_NATU] = {gMonShinyPalette_Natu, SPECIES_NATU + 500}, + [SPECIES_XATU] = {gMonShinyPalette_Xatu, SPECIES_XATU + 500}, + [SPECIES_MAREEP] = {gMonShinyPalette_Mareep, SPECIES_MAREEP + 500}, + [SPECIES_FLAAFFY] = {gMonShinyPalette_Flaaffy, SPECIES_FLAAFFY + 500}, + [SPECIES_AMPHAROS] = {gMonShinyPalette_Ampharos, SPECIES_AMPHAROS + 500}, + [SPECIES_BELLOSSOM] = {gMonShinyPalette_Bellossom, SPECIES_BELLOSSOM + 500}, + [SPECIES_MARILL] = {gMonShinyPalette_Marill, SPECIES_MARILL + 500}, + [SPECIES_AZUMARILL] = {gMonShinyPalette_Azumarill, SPECIES_AZUMARILL + 500}, + [SPECIES_SUDOWOODO] = {gMonShinyPalette_Sudowoodo, SPECIES_SUDOWOODO + 500}, + [SPECIES_POLITOED] = {gMonShinyPalette_Politoed, SPECIES_POLITOED + 500}, + [SPECIES_HOPPIP] = {gMonShinyPalette_Hoppip, SPECIES_HOPPIP + 500}, + [SPECIES_SKIPLOOM] = {gMonShinyPalette_Skiploom, SPECIES_SKIPLOOM + 500}, + [SPECIES_JUMPLUFF] = {gMonShinyPalette_Jumpluff, SPECIES_JUMPLUFF + 500}, + [SPECIES_AIPOM] = {gMonShinyPalette_Aipom, SPECIES_AIPOM + 500}, + [SPECIES_SUNKERN] = {gMonShinyPalette_Sunkern, SPECIES_SUNKERN + 500}, + [SPECIES_SUNFLORA] = {gMonShinyPalette_Sunflora, SPECIES_SUNFLORA + 500}, + [SPECIES_YANMA] = {gMonShinyPalette_Yanma, SPECIES_YANMA + 500}, + [SPECIES_WOOPER] = {gMonShinyPalette_Wooper, SPECIES_WOOPER + 500}, + [SPECIES_QUAGSIRE] = {gMonShinyPalette_Quagsire, SPECIES_QUAGSIRE + 500}, + [SPECIES_ESPEON] = {gMonShinyPalette_Espeon, SPECIES_ESPEON + 500}, + [SPECIES_UMBREON] = {gMonShinyPalette_Umbreon, SPECIES_UMBREON + 500}, + [SPECIES_MURKROW] = {gMonShinyPalette_Murkrow, SPECIES_MURKROW + 500}, + [SPECIES_SLOWKING] = {gMonShinyPalette_Slowking, SPECIES_SLOWKING + 500}, + [SPECIES_MISDREAVUS] = {gMonShinyPalette_Misdreavus, SPECIES_MISDREAVUS + 500}, + [SPECIES_UNOWN] = {gMonShinyPalette_Unown, SPECIES_UNOWN + 500}, + [SPECIES_WOBBUFFET] = {gMonShinyPalette_Wobbuffet, SPECIES_WOBBUFFET + 500}, + [SPECIES_GIRAFARIG] = {gMonShinyPalette_Girafarig, SPECIES_GIRAFARIG + 500}, + [SPECIES_PINECO] = {gMonShinyPalette_Pineco, SPECIES_PINECO + 500}, + [SPECIES_FORRETRESS] = {gMonShinyPalette_Forretress, SPECIES_FORRETRESS + 500}, + [SPECIES_DUNSPARCE] = {gMonShinyPalette_Dunsparce, SPECIES_DUNSPARCE + 500}, + [SPECIES_GLIGAR] = {gMonShinyPalette_Gligar, SPECIES_GLIGAR + 500}, + [SPECIES_STEELIX] = {gMonShinyPalette_Steelix, SPECIES_STEELIX + 500}, + [SPECIES_SNUBBULL] = {gMonShinyPalette_Snubbull, SPECIES_SNUBBULL + 500}, + [SPECIES_GRANBULL] = {gMonShinyPalette_Granbull, SPECIES_GRANBULL + 500}, + [SPECIES_QWILFISH] = {gMonShinyPalette_Qwilfish, SPECIES_QWILFISH + 500}, + [SPECIES_SCIZOR] = {gMonShinyPalette_Scizor, SPECIES_SCIZOR + 500}, + [SPECIES_SHUCKLE] = {gMonShinyPalette_Shuckle, SPECIES_SHUCKLE + 500}, + [SPECIES_HERACROSS] = {gMonShinyPalette_Heracross, SPECIES_HERACROSS + 500}, + [SPECIES_SNEASEL] = {gMonShinyPalette_Sneasel, SPECIES_SNEASEL + 500}, + [SPECIES_TEDDIURSA] = {gMonShinyPalette_Teddiursa, SPECIES_TEDDIURSA + 500}, + [SPECIES_URSARING] = {gMonShinyPalette_Ursaring, SPECIES_URSARING + 500}, + [SPECIES_SLUGMA] = {gMonShinyPalette_Slugma, SPECIES_SLUGMA + 500}, + [SPECIES_MAGCARGO] = {gMonShinyPalette_Magcargo, SPECIES_MAGCARGO + 500}, + [SPECIES_SWINUB] = {gMonShinyPalette_Swinub, SPECIES_SWINUB + 500}, + [SPECIES_PILOSWINE] = {gMonShinyPalette_Piloswine, SPECIES_PILOSWINE + 500}, + [SPECIES_CORSOLA] = {gMonShinyPalette_Corsola, SPECIES_CORSOLA + 500}, + [SPECIES_REMORAID] = {gMonShinyPalette_Remoraid, SPECIES_REMORAID + 500}, + [SPECIES_OCTILLERY] = {gMonShinyPalette_Octillery, SPECIES_OCTILLERY + 500}, + [SPECIES_DELIBIRD] = {gMonShinyPalette_Delibird, SPECIES_DELIBIRD + 500}, + [SPECIES_MANTINE] = {gMonShinyPalette_Mantine, SPECIES_MANTINE + 500}, + [SPECIES_SKARMORY] = {gMonShinyPalette_Skarmory, SPECIES_SKARMORY + 500}, + [SPECIES_HOUNDOUR] = {gMonShinyPalette_Houndour, SPECIES_HOUNDOUR + 500}, + [SPECIES_HOUNDOOM] = {gMonShinyPalette_Houndoom, SPECIES_HOUNDOOM + 500}, + [SPECIES_KINGDRA] = {gMonShinyPalette_Kingdra, SPECIES_KINGDRA + 500}, + [SPECIES_PHANPY] = {gMonShinyPalette_Phanpy, SPECIES_PHANPY + 500}, + [SPECIES_DONPHAN] = {gMonShinyPalette_Donphan, SPECIES_DONPHAN + 500}, + [SPECIES_PORYGON2] = {gMonShinyPalette_Porygon2, SPECIES_PORYGON2 + 500}, + [SPECIES_STANTLER] = {gMonShinyPalette_Stantler, SPECIES_STANTLER + 500}, + [SPECIES_SMEARGLE] = {gMonShinyPalette_Smeargle, SPECIES_SMEARGLE + 500}, + [SPECIES_TYROGUE] = {gMonShinyPalette_Tyrogue, SPECIES_TYROGUE + 500}, + [SPECIES_HITMONTOP] = {gMonShinyPalette_Hitmontop, SPECIES_HITMONTOP + 500}, + [SPECIES_SMOOCHUM] = {gMonShinyPalette_Smoochum, SPECIES_SMOOCHUM + 500}, + [SPECIES_ELEKID] = {gMonShinyPalette_Elekid, SPECIES_ELEKID + 500}, + [SPECIES_MAGBY] = {gMonShinyPalette_Magby, SPECIES_MAGBY + 500}, + [SPECIES_MILTANK] = {gMonShinyPalette_Miltank, SPECIES_MILTANK + 500}, + [SPECIES_BLISSEY] = {gMonShinyPalette_Blissey, SPECIES_BLISSEY + 500}, + [SPECIES_RAIKOU] = {gMonShinyPalette_Raikou, SPECIES_RAIKOU + 500}, + [SPECIES_ENTEI] = {gMonShinyPalette_Entei, SPECIES_ENTEI + 500}, + [SPECIES_SUICUNE] = {gMonShinyPalette_Suicune, SPECIES_SUICUNE + 500}, + [SPECIES_LARVITAR] = {gMonShinyPalette_Larvitar, SPECIES_LARVITAR + 500}, + [SPECIES_PUPITAR] = {gMonShinyPalette_Pupitar, SPECIES_PUPITAR + 500}, + [SPECIES_TYRANITAR] = {gMonShinyPalette_Tyranitar, SPECIES_TYRANITAR + 500}, + [SPECIES_LUGIA] = {gMonShinyPalette_Lugia, SPECIES_LUGIA + 500}, + [SPECIES_HO_OH] = {gMonShinyPalette_HoOh, SPECIES_HO_OH + 500}, + [SPECIES_CELEBI] = {gMonShinyPalette_Celebi, SPECIES_CELEBI + 500}, + [SPECIES_OLD_UNOWN_B] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_B + 500}, + [SPECIES_OLD_UNOWN_C] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_C + 500}, + [SPECIES_OLD_UNOWN_D] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_D + 500}, + [SPECIES_OLD_UNOWN_E] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_E + 500}, + [SPECIES_OLD_UNOWN_F] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_F + 500}, + [SPECIES_OLD_UNOWN_G] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_G + 500}, + [SPECIES_OLD_UNOWN_H] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_H + 500}, + [SPECIES_OLD_UNOWN_I] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_I + 500}, + [SPECIES_OLD_UNOWN_J] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_J + 500}, + [SPECIES_OLD_UNOWN_K] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_K + 500}, + [SPECIES_OLD_UNOWN_L] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_L + 500}, + [SPECIES_OLD_UNOWN_M] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_M + 500}, + [SPECIES_OLD_UNOWN_N] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_N + 500}, + [SPECIES_OLD_UNOWN_O] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_O + 500}, + [SPECIES_OLD_UNOWN_P] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_P + 500}, + [SPECIES_OLD_UNOWN_Q] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Q + 500}, + [SPECIES_OLD_UNOWN_R] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_R + 500}, + [SPECIES_OLD_UNOWN_S] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_S + 500}, + [SPECIES_OLD_UNOWN_T] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_T + 500}, + [SPECIES_OLD_UNOWN_U] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_U + 500}, + [SPECIES_OLD_UNOWN_V] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_V + 500}, + [SPECIES_OLD_UNOWN_W] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_W + 500}, + [SPECIES_OLD_UNOWN_X] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_X + 500}, + [SPECIES_OLD_UNOWN_Y] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Y + 500}, + [SPECIES_OLD_UNOWN_Z] = {gMonShinyPalette_DoubleQuestionMark, SPECIES_OLD_UNOWN_Z + 500}, + [SPECIES_TREECKO] = {gMonShinyPalette_Treecko, SPECIES_TREECKO + 500}, + [SPECIES_GROVYLE] = {gMonShinyPalette_Grovyle, SPECIES_GROVYLE + 500}, + [SPECIES_SCEPTILE] = {gMonShinyPalette_Sceptile, SPECIES_SCEPTILE + 500}, + [SPECIES_TORCHIC] = {gMonShinyPalette_Torchic, SPECIES_TORCHIC + 500}, + [SPECIES_COMBUSKEN] = {gMonShinyPalette_Combusken, SPECIES_COMBUSKEN + 500}, + [SPECIES_BLAZIKEN] = {gMonShinyPalette_Blaziken, SPECIES_BLAZIKEN + 500}, + [SPECIES_MUDKIP] = {gMonShinyPalette_Mudkip, SPECIES_MUDKIP + 500}, + [SPECIES_MARSHTOMP] = {gMonShinyPalette_Marshtomp, SPECIES_MARSHTOMP + 500}, + [SPECIES_SWAMPERT] = {gMonShinyPalette_Swampert, SPECIES_SWAMPERT + 500}, + [SPECIES_POOCHYENA] = {gMonShinyPalette_Poochyena, SPECIES_POOCHYENA + 500}, + [SPECIES_MIGHTYENA] = {gMonShinyPalette_Mightyena, SPECIES_MIGHTYENA + 500}, + [SPECIES_ZIGZAGOON] = {gMonShinyPalette_Zigzagoon, SPECIES_ZIGZAGOON + 500}, + [SPECIES_LINOONE] = {gMonShinyPalette_Linoone, SPECIES_LINOONE + 500}, + [SPECIES_WURMPLE] = {gMonShinyPalette_Wurmple, SPECIES_WURMPLE + 500}, + [SPECIES_SILCOON] = {gMonShinyPalette_Silcoon, SPECIES_SILCOON + 500}, + [SPECIES_BEAUTIFLY] = {gMonShinyPalette_Beautifly, SPECIES_BEAUTIFLY + 500}, + [SPECIES_CASCOON] = {gMonShinyPalette_Cascoon, SPECIES_CASCOON + 500}, + [SPECIES_DUSTOX] = {gMonShinyPalette_Dustox, SPECIES_DUSTOX + 500}, + [SPECIES_LOTAD] = {gMonShinyPalette_Lotad, SPECIES_LOTAD + 500}, + [SPECIES_LOMBRE] = {gMonShinyPalette_Lombre, SPECIES_LOMBRE + 500}, + [SPECIES_LUDICOLO] = {gMonShinyPalette_Ludicolo, SPECIES_LUDICOLO + 500}, + [SPECIES_SEEDOT] = {gMonShinyPalette_Seedot, SPECIES_SEEDOT + 500}, + [SPECIES_NUZLEAF] = {gMonShinyPalette_Nuzleaf, SPECIES_NUZLEAF + 500}, + [SPECIES_SHIFTRY] = {gMonShinyPalette_Shiftry, SPECIES_SHIFTRY + 500}, + [SPECIES_NINCADA] = {gMonShinyPalette_Nincada, SPECIES_NINCADA + 500}, + [SPECIES_NINJASK] = {gMonShinyPalette_Ninjask, SPECIES_NINJASK + 500}, + [SPECIES_SHEDINJA] = {gMonShinyPalette_Shedinja, SPECIES_SHEDINJA + 500}, + [SPECIES_TAILLOW] = {gMonShinyPalette_Taillow, SPECIES_TAILLOW + 500}, + [SPECIES_SWELLOW] = {gMonShinyPalette_Swellow, SPECIES_SWELLOW + 500}, + [SPECIES_SHROOMISH] = {gMonShinyPalette_Shroomish, SPECIES_SHROOMISH + 500}, + [SPECIES_BRELOOM] = {gMonShinyPalette_Breloom, SPECIES_BRELOOM + 500}, + [SPECIES_SPINDA] = {gMonShinyPalette_Spinda, SPECIES_SPINDA + 500}, + [SPECIES_WINGULL] = {gMonShinyPalette_Wingull, SPECIES_WINGULL + 500}, + [SPECIES_PELIPPER] = {gMonShinyPalette_Pelipper, SPECIES_PELIPPER + 500}, + [SPECIES_SURSKIT] = {gMonShinyPalette_Surskit, SPECIES_SURSKIT + 500}, + [SPECIES_MASQUERAIN] = {gMonShinyPalette_Masquerain, SPECIES_MASQUERAIN + 500}, + [SPECIES_WAILMER] = {gMonShinyPalette_Wailmer, SPECIES_WAILMER + 500}, + [SPECIES_WAILORD] = {gMonShinyPalette_Wailord, SPECIES_WAILORD + 500}, + [SPECIES_SKITTY] = {gMonShinyPalette_Skitty, SPECIES_SKITTY + 500}, + [SPECIES_DELCATTY] = {gMonShinyPalette_Delcatty, SPECIES_DELCATTY + 500}, + [SPECIES_KECLEON] = {gMonShinyPalette_Kecleon, SPECIES_KECLEON + 500}, + [SPECIES_BALTOY] = {gMonShinyPalette_Baltoy, SPECIES_BALTOY + 500}, + [SPECIES_CLAYDOL] = {gMonShinyPalette_Claydol, SPECIES_CLAYDOL + 500}, + [SPECIES_NOSEPASS] = {gMonShinyPalette_Nosepass, SPECIES_NOSEPASS + 500}, + [SPECIES_TORKOAL] = {gMonShinyPalette_Torkoal, SPECIES_TORKOAL + 500}, + [SPECIES_SABLEYE] = {gMonShinyPalette_Sableye, SPECIES_SABLEYE + 500}, + [SPECIES_BARBOACH] = {gMonShinyPalette_Barboach, SPECIES_BARBOACH + 500}, + [SPECIES_WHISCASH] = {gMonShinyPalette_Whiscash, SPECIES_WHISCASH + 500}, + [SPECIES_LUVDISC] = {gMonShinyPalette_Luvdisc, SPECIES_LUVDISC + 500}, + [SPECIES_CORPHISH] = {gMonShinyPalette_Corphish, SPECIES_CORPHISH + 500}, + [SPECIES_CRAWDAUNT] = {gMonShinyPalette_Crawdaunt, SPECIES_CRAWDAUNT + 500}, + [SPECIES_FEEBAS] = {gMonShinyPalette_Feebas, SPECIES_FEEBAS + 500}, + [SPECIES_MILOTIC] = {gMonShinyPalette_Milotic, SPECIES_MILOTIC + 500}, + [SPECIES_CARVANHA] = {gMonShinyPalette_Carvanha, SPECIES_CARVANHA + 500}, + [SPECIES_SHARPEDO] = {gMonShinyPalette_Sharpedo, SPECIES_SHARPEDO + 500}, + [SPECIES_TRAPINCH] = {gMonShinyPalette_Trapinch, SPECIES_TRAPINCH + 500}, + [SPECIES_VIBRAVA] = {gMonShinyPalette_Vibrava, SPECIES_VIBRAVA + 500}, + [SPECIES_FLYGON] = {gMonShinyPalette_Flygon, SPECIES_FLYGON + 500}, + [SPECIES_MAKUHITA] = {gMonShinyPalette_Makuhita, SPECIES_MAKUHITA + 500}, + [SPECIES_HARIYAMA] = {gMonShinyPalette_Hariyama, SPECIES_HARIYAMA + 500}, + [SPECIES_ELECTRIKE] = {gMonShinyPalette_Electrike, SPECIES_ELECTRIKE + 500}, + [SPECIES_MANECTRIC] = {gMonShinyPalette_Manectric, SPECIES_MANECTRIC + 500}, + [SPECIES_NUMEL] = {gMonShinyPalette_Numel, SPECIES_NUMEL + 500}, + [SPECIES_CAMERUPT] = {gMonShinyPalette_Camerupt, SPECIES_CAMERUPT + 500}, + [SPECIES_SPHEAL] = {gMonShinyPalette_Spheal, SPECIES_SPHEAL + 500}, + [SPECIES_SEALEO] = {gMonShinyPalette_Sealeo, SPECIES_SEALEO + 500}, + [SPECIES_WALREIN] = {gMonShinyPalette_Walrein, SPECIES_WALREIN + 500}, + [SPECIES_CACNEA] = {gMonShinyPalette_Cacnea, SPECIES_CACNEA + 500}, + [SPECIES_CACTURNE] = {gMonShinyPalette_Cacturne, SPECIES_CACTURNE + 500}, + [SPECIES_SNORUNT] = {gMonShinyPalette_Snorunt, SPECIES_SNORUNT + 500}, + [SPECIES_GLALIE] = {gMonShinyPalette_Glalie, SPECIES_GLALIE + 500}, + [SPECIES_LUNATONE] = {gMonShinyPalette_Lunatone, SPECIES_LUNATONE + 500}, + [SPECIES_SOLROCK] = {gMonShinyPalette_Solrock, SPECIES_SOLROCK + 500}, + [SPECIES_AZURILL] = {gMonShinyPalette_Azurill, SPECIES_AZURILL + 500}, + [SPECIES_SPOINK] = {gMonShinyPalette_Spoink, SPECIES_SPOINK + 500}, + [SPECIES_GRUMPIG] = {gMonShinyPalette_Grumpig, SPECIES_GRUMPIG + 500}, + [SPECIES_PLUSLE] = {gMonShinyPalette_Plusle, SPECIES_PLUSLE + 500}, + [SPECIES_MINUN] = {gMonShinyPalette_Minun, SPECIES_MINUN + 500}, + [SPECIES_MAWILE] = {gMonShinyPalette_Mawile, SPECIES_MAWILE + 500}, + [SPECIES_MEDITITE] = {gMonShinyPalette_Meditite, SPECIES_MEDITITE + 500}, + [SPECIES_MEDICHAM] = {gMonShinyPalette_Medicham, SPECIES_MEDICHAM + 500}, + [SPECIES_SWABLU] = {gMonShinyPalette_Swablu, SPECIES_SWABLU + 500}, + [SPECIES_ALTARIA] = {gMonShinyPalette_Altaria, SPECIES_ALTARIA + 500}, + [SPECIES_WYNAUT] = {gMonShinyPalette_Wynaut, SPECIES_WYNAUT + 500}, + [SPECIES_DUSKULL] = {gMonShinyPalette_Duskull, SPECIES_DUSKULL + 500}, + [SPECIES_DUSCLOPS] = {gMonShinyPalette_Dusclops, SPECIES_DUSCLOPS + 500}, + [SPECIES_ROSELIA] = {gMonShinyPalette_Roselia, SPECIES_ROSELIA + 500}, + [SPECIES_SLAKOTH] = {gMonShinyPalette_Slakoth, SPECIES_SLAKOTH + 500}, + [SPECIES_VIGOROTH] = {gMonShinyPalette_Vigoroth, SPECIES_VIGOROTH + 500}, + [SPECIES_SLAKING] = {gMonShinyPalette_Slaking, SPECIES_SLAKING + 500}, + [SPECIES_GULPIN] = {gMonShinyPalette_Gulpin, SPECIES_GULPIN + 500}, + [SPECIES_SWALOT] = {gMonShinyPalette_Swalot, SPECIES_SWALOT + 500}, + [SPECIES_TROPIUS] = {gMonShinyPalette_Tropius, SPECIES_TROPIUS + 500}, + [SPECIES_WHISMUR] = {gMonShinyPalette_Whismur, SPECIES_WHISMUR + 500}, + [SPECIES_LOUDRED] = {gMonShinyPalette_Loudred, SPECIES_LOUDRED + 500}, + [SPECIES_EXPLOUD] = {gMonShinyPalette_Exploud, SPECIES_EXPLOUD + 500}, + [SPECIES_CLAMPERL] = {gMonShinyPalette_Clamperl, SPECIES_CLAMPERL + 500}, + [SPECIES_HUNTAIL] = {gMonShinyPalette_Huntail, SPECIES_HUNTAIL + 500}, + [SPECIES_GOREBYSS] = {gMonShinyPalette_Gorebyss, SPECIES_GOREBYSS + 500}, + [SPECIES_ABSOL] = {gMonShinyPalette_Absol, SPECIES_ABSOL + 500}, + [SPECIES_SHUPPET] = {gMonShinyPalette_Shuppet, SPECIES_SHUPPET + 500}, + [SPECIES_BANETTE] = {gMonShinyPalette_Banette, SPECIES_BANETTE + 500}, + [SPECIES_SEVIPER] = {gMonShinyPalette_Seviper, SPECIES_SEVIPER + 500}, + [SPECIES_ZANGOOSE] = {gMonShinyPalette_Zangoose, SPECIES_ZANGOOSE + 500}, + [SPECIES_RELICANTH] = {gMonShinyPalette_Relicanth, SPECIES_RELICANTH + 500}, + [SPECIES_ARON] = {gMonShinyPalette_Aron, SPECIES_ARON + 500}, + [SPECIES_LAIRON] = {gMonShinyPalette_Lairon, SPECIES_LAIRON + 500}, + [SPECIES_AGGRON] = {gMonShinyPalette_Aggron, SPECIES_AGGRON + 500}, + [SPECIES_CASTFORM] = {gMonShinyPalette_Castform, SPECIES_CASTFORM + 500}, + [SPECIES_VOLBEAT] = {gMonShinyPalette_Volbeat, SPECIES_VOLBEAT + 500}, + [SPECIES_ILLUMISE] = {gMonShinyPalette_Illumise, SPECIES_ILLUMISE + 500}, + [SPECIES_LILEEP] = {gMonShinyPalette_Lileep, SPECIES_LILEEP + 500}, + [SPECIES_CRADILY] = {gMonShinyPalette_Cradily, SPECIES_CRADILY + 500}, + [SPECIES_ANORITH] = {gMonShinyPalette_Anorith, SPECIES_ANORITH + 500}, + [SPECIES_ARMALDO] = {gMonShinyPalette_Armaldo, SPECIES_ARMALDO + 500}, + [SPECIES_RALTS] = {gMonShinyPalette_Ralts, SPECIES_RALTS + 500}, + [SPECIES_KIRLIA] = {gMonShinyPalette_Kirlia, SPECIES_KIRLIA + 500}, + [SPECIES_GARDEVOIR] = {gMonShinyPalette_Gardevoir, SPECIES_GARDEVOIR + 500}, + [SPECIES_BAGON] = {gMonShinyPalette_Bagon, SPECIES_BAGON + 500}, + [SPECIES_SHELGON] = {gMonShinyPalette_Shelgon, SPECIES_SHELGON + 500}, + [SPECIES_SALAMENCE] = {gMonShinyPalette_Salamence, SPECIES_SALAMENCE + 500}, + [SPECIES_BELDUM] = {gMonShinyPalette_Beldum, SPECIES_BELDUM + 500}, + [SPECIES_METANG] = {gMonShinyPalette_Metang, SPECIES_METANG + 500}, + [SPECIES_METAGROSS] = {gMonShinyPalette_Metagross, SPECIES_METAGROSS + 500}, + [SPECIES_REGIROCK] = {gMonShinyPalette_Regirock, SPECIES_REGIROCK + 500}, + [SPECIES_REGICE] = {gMonShinyPalette_Regice, SPECIES_REGICE + 500}, + [SPECIES_REGISTEEL] = {gMonShinyPalette_Registeel, SPECIES_REGISTEEL + 500}, + [SPECIES_KYOGRE] = {gMonShinyPalette_Kyogre, SPECIES_KYOGRE + 500}, + [SPECIES_GROUDON] = {gMonShinyPalette_Groudon, SPECIES_GROUDON + 500}, + [SPECIES_RAYQUAZA] = {gMonShinyPalette_Rayquaza, SPECIES_RAYQUAZA + 500}, + [SPECIES_LATIAS] = {gMonShinyPalette_Latias, SPECIES_LATIAS + 500}, + [SPECIES_LATIOS] = {gMonShinyPalette_Latios, SPECIES_LATIOS + 500}, + [SPECIES_JIRACHI] = {gMonShinyPalette_Jirachi, SPECIES_JIRACHI + 500}, + [SPECIES_DEOXYS] = {gMonShinyPalette_Deoxys, SPECIES_DEOXYS + 500}, + [SPECIES_CHIMECHO] = {gMonShinyPalette_Chimecho, SPECIES_CHIMECHO + 500}, + [SPECIES_EGG] = {gMonPalette_Egg, SPECIES_EGG + 500}, + [SPECIES_UNOWN_B] = {gMonShinyPalette_Unown, SPECIES_UNOWN_B + 500}, + [SPECIES_UNOWN_C] = {gMonShinyPalette_Unown, SPECIES_UNOWN_C + 500}, + [SPECIES_UNOWN_D] = {gMonShinyPalette_Unown, SPECIES_UNOWN_D + 500}, + [SPECIES_UNOWN_E] = {gMonShinyPalette_Unown, SPECIES_UNOWN_E + 500}, + [SPECIES_UNOWN_F] = {gMonShinyPalette_Unown, SPECIES_UNOWN_F + 500}, + [SPECIES_UNOWN_G] = {gMonShinyPalette_Unown, SPECIES_UNOWN_G + 500}, + [SPECIES_UNOWN_H] = {gMonShinyPalette_Unown, SPECIES_UNOWN_H + 500}, + [SPECIES_UNOWN_I] = {gMonShinyPalette_Unown, SPECIES_UNOWN_I + 500}, + [SPECIES_UNOWN_J] = {gMonShinyPalette_Unown, SPECIES_UNOWN_J + 500}, + [SPECIES_UNOWN_K] = {gMonShinyPalette_Unown, SPECIES_UNOWN_K + 500}, + [SPECIES_UNOWN_L] = {gMonShinyPalette_Unown, SPECIES_UNOWN_L + 500}, + [SPECIES_UNOWN_M] = {gMonShinyPalette_Unown, SPECIES_UNOWN_M + 500}, + [SPECIES_UNOWN_N] = {gMonShinyPalette_Unown, SPECIES_UNOWN_N + 500}, + [SPECIES_UNOWN_O] = {gMonShinyPalette_Unown, SPECIES_UNOWN_O + 500}, + [SPECIES_UNOWN_P] = {gMonShinyPalette_Unown, SPECIES_UNOWN_P + 500}, + [SPECIES_UNOWN_Q] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Q + 500}, + [SPECIES_UNOWN_R] = {gMonShinyPalette_Unown, SPECIES_UNOWN_R + 500}, + [SPECIES_UNOWN_S] = {gMonShinyPalette_Unown, SPECIES_UNOWN_S + 500}, + [SPECIES_UNOWN_T] = {gMonShinyPalette_Unown, SPECIES_UNOWN_T + 500}, + [SPECIES_UNOWN_U] = {gMonShinyPalette_Unown, SPECIES_UNOWN_U + 500}, + [SPECIES_UNOWN_V] = {gMonShinyPalette_Unown, SPECIES_UNOWN_V + 500}, + [SPECIES_UNOWN_W] = {gMonShinyPalette_Unown, SPECIES_UNOWN_W + 500}, + [SPECIES_UNOWN_X] = {gMonShinyPalette_Unown, SPECIES_UNOWN_X + 500}, + [SPECIES_UNOWN_Y] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Y + 500}, + [SPECIES_UNOWN_Z] = {gMonShinyPalette_Unown, SPECIES_UNOWN_Z + 500}, + [SPECIES_UNOWN_EMARK] = {gMonShinyPalette_Unown, SPECIES_UNOWN_EMARK + 500}, + [SPECIES_UNOWN_QMARK] = {gMonShinyPalette_Unown, SPECIES_UNOWN_QMARK + 500}, }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 8683978d7..ff0b680dd 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1,7 +1,5 @@ -#ifndef POKEEMERALD_DATA_TEXT_ITEM_DESCRIPTIONS_H -#define POKEEMERALD_DATA_TEXT_ITEM_DESCRIPTIONS_H const u8 gDummyItemDescription[] = _("?????"); -//Pokeballs +// Pokeballs const u8 gMasterBallItemDescription[] = _("The best BALL that\ncatches a POKéMON\nwithout fail."); const u8 gUltraBallItemDescription[] = _("A better BALL with\na higher catch rate\nthan a GREAT BALL."); const u8 gGreatBallItemDescription[] = _("A good BALL with a\nhigher catch rate\nthan a POKé BALL."); @@ -14,7 +12,7 @@ const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns."); const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly."); const u8 gPremierBallItemDescription[] = _("A rare BALL made\nin commemoration\nof some event."); -//Medicine +// Medicine const u8 gPotionItemDescription[] = _("Restores the HP of\na POKéMON by\n20 points."); const u8 gAntidoteItemDescription[] = _("Heals a poisoned\nPOKéMON."); const u8 gBurnHealItemDescription[] = _("Heals POKéMON\nof a burn."); @@ -48,14 +46,14 @@ const u8 gBlackFluteItemDescription[] = _("A glass flute that\nkeeps away wild\n const u8 gWhiteFluteItemDescription[] = _("A glass flute that\nlures wild POKéMON."); const u8 gBerryJuiceItemDescription[] = _("A 100% pure juice\nthat restores HP\nby 20 points."); const u8 gSacredAshItemDescription[] = _("Fully revives and\nrestores all\nfainted POKéMON."); -//Collectibles +// Collectibles const u8 gShoalSaltItemDescription[] = _("Salt obtained from\ndeep inside the\nSHOAL CAVE."); const u8 gShoalShellItemDescription[] = _("A seashell found\ndeep inside the\nSHOAL CAVE."); const u8 gRedShardItemDescription[] = _("A shard from an\nancient item. Can\nbe sold cheaply."); const u8 gBlueShardItemDescription[] = _("A shard from an\nancient item. Can\nbe sold cheaply."); const u8 gYellowShardItemDescription[] = _("A shard from an\nancient item. Can\nbe sold cheaply."); const u8 gGreenShardItemDescription[] = _("A shard from an\nancient item. Can\nbe sold cheaply."); -//Vitamins +// Vitamins const u8 gHPUpItemDescription[] = _("Raises the base HP\nof one POKéMON."); const u8 gProteinItemDescription[] = _("Raises the base\nATTACK stat of one\nPOKéMON."); const u8 gIronItemDescription[] = _("Raises the base\nDEFENSE stat of\none POKéMON."); @@ -65,7 +63,7 @@ const u8 gRareCandyItemDescription[] = _("Raises the level\nof a POKéMON by\non const u8 gPPUpItemDescription[] = _("Raises the maximum\nPP of a selected\nmove."); const u8 gZincItemDescription[] = _("Raises the base\nSP. DEF stat of one\nPOKéMON."); const u8 gPPMaxItemDescription[] = _("Raises the PP of a\nmove to its maximum\npoints."); -//Battle items +// Battle items const u8 gGuardSpecItemDescription[] = _("Prevents stat\nreduction when\nused in battle."); const u8 gDireHitItemDescription[] = _("Raises the\ncritical-hit ratio\nduring one battle."); const u8 gXAttackItemDescription[] = _("Raises the stat\nATTACK during one\nbattle."); @@ -75,19 +73,19 @@ const u8 gXAccuracyItemDescription[] = _("Raises accuracy\nof attack moves\nduri const u8 gXSpecialItemDescription[] = _("Raises the stat\nSP. ATK during one\nbattle."); const u8 gPokeDollItemDescription[] = _("Use to flee from\nany battle with\na wild POKéMON."); const u8 gFluffyTailItemDescription[] = _("Use to flee from\nany battle with\na wild POKéMON."); -//Field items +// Field items const u8 gSuperRepelItemDescription[] = _("Repels weak wild\nPOKéMON for 200\nsteps."); const u8 gMaxRepelItemDescription[] = _("Repels weak wild\nPOKéMON for 250\nsteps."); const u8 gEscapeRopeItemDescription[] = _("Use to escape\ninstantly from a\ncave or a dungeon."); const u8 gRepelItemDescription[] = _("Repels weak wild\nPOKéMON for 100\nsteps."); -//Evolution stones +// Evolution stones const u8 gSunStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve."); const u8 gMoonStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve."); const u8 gFireStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve."); const u8 gThunderStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve."); const u8 gWaterStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve."); const u8 gLeafStoneItemDescription[] = _("Makes certain\nspecies of POKéMON\nevolve."); -//Valuable items +// Valuable items const u8 gTinyMushroomItemDescription[] = _("A plain mushroom\nthat would sell\nat a cheap price."); const u8 gBigMushroomItemDescription[] = _("A rare mushroom\nthat would sell at a\nhigh price."); const u8 gPearlItemDescription[] = _("A pretty pearl\nthat would sell at a\ncheap price."); @@ -96,7 +94,7 @@ const u8 gStardustItemDescription[] = _("Beautiful red sand.\nCan be sold at a\n const u8 gStarPieceItemDescription[] = _("A red gem shard.\nIt would sell for a\nvery high price."); const u8 gNuggetItemDescription[] = _("A nugget of pure\ngold. Can be sold at\na high price."); const u8 gHeartScaleItemDescription[] = _("A lovely scale.\nIt is coveted by\ncollectors."); -//Mail +// Mail const u8 gOrangeMailItemDescription[] = _("A ZIGZAGOON-print\nMAIL to be held by\na POKéMON."); const u8 gHarborMailItemDescription[] = _("A WINGULL-print\nMAIL to be held by\na POKéMON."); const u8 gGlitterMailItemDescription[] = _("A PIKACHU-print\nMAIL to be held by\na POKéMON."); @@ -109,7 +107,7 @@ const u8 gTropicMailItemDescription[] = _("A BELLOSSOM-print\nMAIL to be held by const u8 gDreamMailItemDescription[] = _("MAIL featuring a\nsketch of the\nholding POKéMON."); const u8 gFabMailItemDescription[] = _("A gorgeous-print\nMAIL to be held\nby a POKéMON."); const u8 gRetroMailItemDescription[] = _("MAIL featuring the\ndrawings of three\nPOKéMON."); -//Berries +// Berries const u8 gCheriBerryItemDescription[] = _("A hold item that\nheals paralysis\nin battle."); const u8 gChestoBerryItemDescription[] = _("A hold item that\nawakens POKéMON\nin battle."); const u8 gPechaBerryItemDescription[] = _("A hold item that\nheals poisoning\nin battle."); @@ -153,7 +151,7 @@ const u8 gApicotBerryItemDescription[] = _("A hold item that\nraises SP. DEF in\ const u8 gLansatBerryItemDescription[] = _("A hold item that\nups the critical-\nhit rate in a pinch."); const u8 gStarfBerryItemDescription[] = _("A hold item that\nsharply boosts a\nstat in a pinch."); const u8 gEnigmaBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow a mystery."); -//Hold items +// Hold items const u8 gBrightPowderItemDescription[] = _("A hold item that\ncasts a glare to\nreduce accuracy."); const u8 gWhiteHerbItemDescription[] = _("A hold item that\nrestores any\nlowered stat."); const u8 gMachoBraceItemDescription[] = _("A hold item that\npromotes growth,\nbut reduces SPEED."); @@ -206,7 +204,7 @@ const u8 gBlueScarfItemDescription[] = _("A hold item that\nraises BEAUTY in\nCO const u8 gPinkScarfItemDescription[] = _("A hold item that\nraises CUTE in\nCONTESTS."); const u8 gGreenScarfItemDescription[] = _("A hold item that\nraises SMART in\nCONTESTS."); const u8 gYellowScarfItemDescription[] = _("A hold item that\nraises TOUGH in\nCONTESTS."); -//Key items +// Key items const u8 gMachBikeItemDescription[] = _("A folding bicycle\nthat doubles your\nspeed or better."); const u8 gCoinCaseItemDescription[] = _("A case that holds\nup to 9,999 COINS."); const u8 gItemfinderItemDescription[] = _("A device that\nsignals an invisible\nitem by sound."); @@ -236,7 +234,7 @@ const u8 gStorageKeyItemDescription[] = _("The key to the\nstorage inside the\nA const u8 gRootFossilItemDescription[] = _("A fossil of an\nancient, seafloor-\ndwelling POKéMON."); const u8 gClawFossilItemDescription[] = _("A fossil of an\nancient, seafloor-\ndwelling POKéMON."); const u8 gDevonScopeItemDescription[] = _("A device by DEVON\nthat signals any\nunseeable POKéMON."); -//TMs/HMs +// TMs/HMs const u8 gTM01ItemDescription[] = _("Powerful, but makes\nthe user flinch if\nhit by the foe."); const u8 gTM02ItemDescription[] = _("Hooks and slashes\nthe foe with long,\nsharp claws."); const u8 gTM03ItemDescription[] = _("Generates an\nultrasonic wave\nthat may confuse."); @@ -296,7 +294,7 @@ const u8 gHM05ItemDescription[] = _("Looses a powerful\nblast of light that\nred const u8 gHM06ItemDescription[] = _("A rock-crushingly\ntough attack that\nmay lower DEFENSE."); const u8 gHM07ItemDescription[] = _("Attacks the foe\nwith enough power\nto climb waterfalls."); const u8 gHM08ItemDescription[] = _("Dives underwater\nthe 1st turn, then\nattacks next turn."); -//FireRed/LeafGreen key items +// FireRed/LeafGreen key items const u8 gOaksParcelItemDescription[] = _("A parcel for PROF.\nOAK from a POKéMON\nMART’s clerk."); const u8 gPokeFluteItemDescription[] = _("A sweet-sounding\nflute that awakens\nPOKéMON."); const u8 gSecretKeyItemDescription[] = _("The key to the\nCINNABAR ISLAND\nGYM’s entrance."); @@ -323,7 +321,6 @@ const u8 gAuroraTicketItemDescription[] = _("A ticket required\nto board the shi const u8 gPowderJarItemDescription[] = _("Stores BERRY\nPOWDER made using\na BERRY CRUSHER."); const u8 gRubyItemDescription[] = _("An exquisite, red-\nglowing gem that\nsymbolizes passion."); const u8 gSapphireItemDescription[] = _("A brilliant blue gem\nthat symbolizes\nhonesty."); -//Emerald-specific key items +// Emerald-specific key items const u8 gMagmaEmblemItemDescription[] = _("A medal-like item in\nthe same shape as\nTEAM MAGMA’s mark."); const u8 gOldSeaMapItemDescription[] = _("A faded sea chart\nthat shows the way\nto a certain island."); -#endif // POKEEMERALD_DATA_TEXT_ITEM_DESCRIPTIONS_H diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h index 62529d06e..9d201193c 100644 --- a/src/data/text/trainer_class_names.h +++ b/src/data/text/trainer_class_names.h @@ -1,8 +1,3 @@ -#include "constants/trainers.h" - -#ifndef GUARD_TRAINER_CLASS_NAMES_H -#define GUARD_TRAINER_CLASS_NAMES_H - const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_PKMN_TRAINER_1] = _("{PKMN} TRAINER"), [TRAINER_CLASS_PKMN_TRAINER_2] = _("{PKMN} TRAINER"), @@ -71,5 +66,3 @@ const u8 gTrainerClassNames[][13] = { [TRAINER_CLASS_PYRAMID_KING] = _("PYRAMID KING"), [TRAINER_CLASS_PKMN_TRAINER_4] = _("{PKMN} TRAINER"), }; - -#endif diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 4993186d2..20a6ec75d 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -12434,4 +12434,3 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_May16[] = { .species = SPECIES_KYOGRE, } }; - diff --git a/src/data2b.c b/src/data2b.c index 3be2bdba7..022903375 100644 --- a/src/data2b.c +++ b/src/data2b.c @@ -2,6 +2,7 @@ #include "data2.h" #include "graphics.h" #include "malloc.h" +#include "constants/species.h" const u16 gUnknown_082FF1D8[] = INCBIN_U16("graphics/link/minigame_digits.gbapal"); const u32 gUnknown_082FF1F8[] = INCBIN_U32("graphics/link/minigame_digits.4bpp.lz"); diff --git a/src/item_icon.c b/src/item_icon.c index 68ec1daf0..41c6589f5 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -1,16 +1,17 @@ #include "global.h" +#include "decompress.h" +#include "graphics.h" #include "item_icon.h" #include "malloc.h" #include "sprite.h" -#include "decompress.h" #include "constants/items.h" -#include "data/item_icon_table.h" // EWRAM vars EWRAM_DATA void *gItemIconDecompressionBuffer = NULL; EWRAM_DATA void *gItemIcon4x4Buffer = NULL; // const rom data +#include "data/item_icon_table.h" static const struct OamData sOamData_ItemIcon = { diff --git a/src/pokedex.c b/src/pokedex.c index b744572d8..32bf5207c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -249,7 +249,7 @@ void sub_80C2668(u32, const u8*); void sub_80C267C(void); // const rom data -#include "data/pokedex_orders.h" +#include "data/pokemon/pokedex_orders.h" static const struct OamData sOamData_855CFE4 = { -- cgit v1.2.3 From dcb1d78fa9e82d65d13d8131a95a4b8ac99bd168 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 16:20:39 +0100 Subject: Add battle controllers var to src from sym_ewram --- include/battle_controllers.h | 1 + src/battle_controller_link_opponent.c | 1 - src/battle_controller_link_partner.c | 2 - src/battle_controller_opponent.c | 1 - src/battle_controller_player.c | 1 - src/battle_controller_player_partner.c | 5 +-- src/battle_controller_recorded_opponent.c | 4 +- src/battle_controller_recorded_player.c | 4 -- src/battle_controller_wally.c | 3 -- src/battle_controllers.c | 68 +++++++++++++++---------------- src/rom_8034C54.c | 5 ++- sym_ewram.txt | 18 +------- 12 files changed, 41 insertions(+), 72 deletions(-) diff --git a/include/battle_controllers.h b/include/battle_controllers.h index ff5a629af..9449f1986 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -175,6 +175,7 @@ enum CONTROLLER_CMDS_COUNT }; +extern struct UnusedControllerStruct gUnknown_02022D0C; // general functions void HandleLinkBattleSetup(void); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 0cec046e4..36f749061 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -27,7 +27,6 @@ #include "constants/trainers.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 04a3784da..0cd15f39e 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -26,8 +26,6 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern struct UnusedControllerStruct gUnknown_02022D0C; - extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 403cc5eed..c057e8575 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -34,7 +34,6 @@ #include "constants/trainers.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 49629198c..2bd5ef365 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -37,7 +37,6 @@ extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; extern u8 gUnknown_0203CF00[]; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index bd892c922..02dd1383b 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -6,6 +6,7 @@ #include "battle_message.h" #include "battle_interface.h" #include "battle_setup.h" +#include "battle_tower.h" #include "bg.h" #include "data2.h" #include "item_use.h" @@ -26,15 +27,11 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern struct UnusedControllerStruct gUnknown_02022D0C; - extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_81358F4(void); extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void SetMultiuseSpriteTemplateToPokemon(u16, u8); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions static void PlayerPartnerHandleGetMonData(void); diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index b54e61255..0cf3634dc 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -6,6 +6,7 @@ #include "battle_interface.h" #include "battle_message.h" #include "battle_setup.h" +#include "battle_tower.h" #include "battle_tv.h" #include "bg.h" #include "data2.h" @@ -29,14 +30,11 @@ #include "constants/trainers.h" extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; -extern u8 gUnknown_0203C7B4; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern u16 sub_8068B48(void); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions static void RecordedOpponentHandleGetMonData(void); diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 17b115caa..4d7fdc01e 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -25,16 +25,12 @@ #include "constants/battle_anim.h" #include "constants/songs.h" -extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT]; -extern u8 gUnknown_0203C7B4; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions static void RecordedPlayerHandleGetMonData(void); diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 1a3a2d53d..5d87c4f90 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -31,9 +31,6 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern s32 gUnknown_0203CD70; -extern struct UnusedControllerStruct gUnknown_02022D0C; - extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 1c6942ead..a6d6e9294 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -13,10 +13,10 @@ #include "constants/abilities.h" #include "constants/species.h" -extern u8 gUnknown_02022D08; -extern u8 gUnknown_02022D09; -extern u8 gUnknown_02022D0A; - +static EWRAM_DATA u8 sLinkSendTaskId = 0; +static EWRAM_DATA u8 sLinkReceiveTaskId = 0; +static EWRAM_DATA u8 sUnknown_02022D0A = 0; +EWRAM_DATA struct UnusedControllerStruct gUnknown_02022D0C = {}; static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {}; extern void sub_81B8D64(u8 battlerId, u8 arg1); // party_menu @@ -681,20 +681,20 @@ static void PrepareBufferDataTransfer(u8 bufferId, u8 *data, u16 size) static void CreateTasksForSendRecvLinkBuffers(void) { - gUnknown_02022D08 = CreateTask(Task_HandleSendLinkBuffersData, 0); - gTasks[gUnknown_02022D08].data[11] = 0; - gTasks[gUnknown_02022D08].data[12] = 0; - gTasks[gUnknown_02022D08].data[13] = 0; - gTasks[gUnknown_02022D08].data[14] = 0; - gTasks[gUnknown_02022D08].data[15] = 0; + sLinkSendTaskId = CreateTask(Task_HandleSendLinkBuffersData, 0); + gTasks[sLinkSendTaskId].data[11] = 0; + gTasks[sLinkSendTaskId].data[12] = 0; + gTasks[sLinkSendTaskId].data[13] = 0; + gTasks[sLinkSendTaskId].data[14] = 0; + gTasks[sLinkSendTaskId].data[15] = 0; - gUnknown_02022D09 = CreateTask(Task_HandleCopyReceivedLinkBuffersData, 0); - gTasks[gUnknown_02022D09].data[12] = 0; - gTasks[gUnknown_02022D09].data[13] = 0; - gTasks[gUnknown_02022D09].data[14] = 0; - gTasks[gUnknown_02022D09].data[15] = 0; + sLinkReceiveTaskId = CreateTask(Task_HandleCopyReceivedLinkBuffersData, 0); + gTasks[sLinkReceiveTaskId].data[12] = 0; + gTasks[sLinkReceiveTaskId].data[13] = 0; + gTasks[sLinkReceiveTaskId].data[14] = 0; + gTasks[sLinkReceiveTaskId].data[15] = 0; - gUnknown_02022D0A = 0; + sUnknown_02022D0A = 0; } enum @@ -716,24 +716,24 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data) s32 i; alignedSize = size - size % 4 + 4; - if (gTasks[gUnknown_02022D08].data[14] + alignedSize + LINK_BUFF_DATA + 1 > BATTLE_BUFFER_LINK_SIZE) + if (gTasks[sLinkSendTaskId].data[14] + alignedSize + LINK_BUFF_DATA + 1 > BATTLE_BUFFER_LINK_SIZE) { - gTasks[gUnknown_02022D08].data[12] = gTasks[gUnknown_02022D08].data[14]; - gTasks[gUnknown_02022D08].data[14] = 0; + gTasks[sLinkSendTaskId].data[12] = gTasks[sLinkSendTaskId].data[14]; + gTasks[sLinkSendTaskId].data[14] = 0; } - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BATTLER] = gActiveBattler; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattlerAttacker; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattlerTarget; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BATTLER_FLAGS] = gAbsentBattlerFlags; - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_EFFECT_BATTLER] = gEffectBattler; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_BUFFER_ID] = bufferId; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ACTIVE_BATTLER] = gActiveBattler; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ATTACKER] = gBattlerAttacker; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_TARGET] = gBattlerTarget; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_SIZE_LO] = alignedSize; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_ABSENT_BATTLER_FLAGS] = gAbsentBattlerFlags; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_EFFECT_BATTLER] = gEffectBattler; for (i = 0; i < size; i++) - gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_DATA + i] = data[i]; + gLinkBattleSendBuffer[gTasks[sLinkSendTaskId].data[14] + LINK_BUFF_DATA + i] = data[i]; - gTasks[gUnknown_02022D08].data[14] = gTasks[gUnknown_02022D08].data[14] + alignedSize + LINK_BUFF_DATA; + gTasks[sLinkSendTaskId].data[14] = gTasks[sLinkSendTaskId].data[14] + alignedSize + LINK_BUFF_DATA; } static void Task_HandleSendLinkBuffersData(u8 taskId) @@ -845,19 +845,19 @@ void sub_8033648(void) #endif r6 = gBlockRecvBuffer[i][2]; - if (gTasks[gUnknown_02022D09].data[14] + 9 + r6 > 0x1000) + if (gTasks[sLinkReceiveTaskId].data[14] + 9 + r6 > 0x1000) { - gTasks[gUnknown_02022D09].data[12] = gTasks[gUnknown_02022D09].data[14]; - gTasks[gUnknown_02022D09].data[14] = 0; + gTasks[sLinkReceiveTaskId].data[12] = gTasks[sLinkReceiveTaskId].data[14]; + gTasks[sLinkReceiveTaskId].data[14] = 0; } - dest = &gLinkBattleRecvBuffer[gTasks[gUnknown_02022D09].data[14]]; + dest = &gLinkBattleRecvBuffer[gTasks[sLinkReceiveTaskId].data[14]]; src = recvBuffer; for (j = 0; j < r6 + 8; j++) dest[j] = src[j]; - gTasks[gUnknown_02022D09].data[14] = gTasks[gUnknown_02022D09].data[14] + r6 + 8; + gTasks[sLinkReceiveTaskId].data[14] = gTasks[sLinkReceiveTaskId].data[14] + r6 + 8; } } } diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c index 1ef223c69..be6d6614a 100644 --- a/src/rom_8034C54.c +++ b/src/rom_8034C54.c @@ -31,8 +31,6 @@ struct UnkStruct1 struct UnkStruct2 *array; }; -extern struct UnkStruct1 *gUnknown_02022E10; - extern const struct SpriteTemplate gUnknown_0831AC88; // this file's functions @@ -50,6 +48,9 @@ static IWRAM_DATA s32 gUnknown_03000DD4; static IWRAM_DATA s32 gUnknown_03000DD8; static IWRAM_DATA s32 gUnknown_03000DDC; +// ewram +static EWRAM_DATA struct UnkStruct1 *gUnknown_02022E10 = {0}; + // const rom data static const u8 gUnknown_082FF1C8[][4] = { diff --git a/sym_ewram.txt b/sym_ewram.txt index 4830343e8..19146b72d 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -104,24 +104,8 @@ gUnknown_02022D00: @ 2022D00 .space 0x4 .include "src/main_menu.o" - -gUnknown_02022D08: @ 2022D08 - .space 0x1 - -gUnknown_02022D09: @ 2022D09 - .space 0x1 - -gUnknown_02022D0A: @ 2022D0A - .space 0x2 - -gUnknown_02022D0C: @ 2022D0C - .space 0x4 - .include "src/battle_controllers.o" - -gUnknown_02022E10: @ 2022E10 - .space 0x4 - + .include "src/rom_8034C54.o" .include "src/battle_main.o" .include "src/pokemon.o" .include "src/random.o" -- cgit v1.2.3 From 2821eafb99e98267c610bcd62cec8e9555805e58 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 17:19:10 +0100 Subject: Clean up roamer --- src/roamer.c | 59 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/roamer.c b/src/roamer.c index fbd25bfad..be45642e0 100644 --- a/src/roamer.c +++ b/src/roamer.c @@ -1,9 +1,10 @@ #include "global.h" -#include "roamer.h" +#include "event_data.h" #include "pokemon.h" #include "random.h" +#include "roamer.h" +#include "constants/maps.h" #include "constants/species.h" -#include "event_data.h" enum { @@ -16,26 +17,26 @@ EWRAM_DATA static u8 sRoamerLocation[2] = {0}; static const u8 sRoamerLocations[][6] = { - { 0x19, 0x1A, 0x20, 0x21, 0x31, 0xFF }, - { 0x1A, 0x19, 0x20, 0x21, 0xFF, 0xFF }, - { 0x20, 0x1A, 0x19, 0x21, 0xFF, 0xFF }, - { 0x21, 0x20, 0x19, 0x1A, 0x22, 0x26 }, - { 0x22, 0x21, 0x23, 0xFF, 0xFF, 0xFF }, - { 0x23, 0x22, 0x24, 0xFF, 0xFF, 0xFF }, - { 0x24, 0x23, 0x25, 0x26, 0xFF, 0xFF }, - { 0x25, 0x24, 0x26, 0xFF, 0xFF, 0xFF }, - { 0x26, 0x25, 0x21, 0xFF, 0xFF, 0xFF }, - { 0x27, 0x24, 0x28, 0x29, 0xFF, 0xFF }, - { 0x28, 0x27, 0x2A, 0xFF, 0xFF, 0xFF }, - { 0x29, 0x27, 0x2A, 0xFF, 0xFF, 0xFF }, - { 0x2A, 0x28, 0x29, 0x2B, 0xFF, 0xFF }, - { 0x2B, 0x2A, 0x2C, 0xFF, 0xFF, 0xFF }, - { 0x2C, 0x2B, 0x2D, 0xFF, 0xFF, 0xFF }, - { 0x2D, 0x2C, 0x2E, 0xFF, 0xFF, 0xFF }, - { 0x2E, 0x2D, 0x2F, 0xFF, 0xFF, 0xFF }, - { 0x2F, 0x2E, 0x30, 0xFF, 0xFF, 0xFF }, - { 0x30, 0x2F, 0x31, 0xFF, 0xFF, 0xFF }, - { 0x31, 0x30, 0x19, 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE110), MAP_NUM(ROUTE111), MAP_NUM(ROUTE117), MAP_NUM(ROUTE118), MAP_NUM(ROUTE134), 0xFF }, + { MAP_NUM(ROUTE111), MAP_NUM(ROUTE110), MAP_NUM(ROUTE117), MAP_NUM(ROUTE118), 0xFF, 0xFF }, + { MAP_NUM(ROUTE117), MAP_NUM(ROUTE111), MAP_NUM(ROUTE110), MAP_NUM(ROUTE118), 0xFF, 0xFF }, + { MAP_NUM(ROUTE118), MAP_NUM(ROUTE117), MAP_NUM(ROUTE110), MAP_NUM(ROUTE111), MAP_NUM(ROUTE119), MAP_NUM(ROUTE123) }, + { MAP_NUM(ROUTE119), MAP_NUM(ROUTE118), MAP_NUM(ROUTE120), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE120), MAP_NUM(ROUTE119), MAP_NUM(ROUTE121), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE121), MAP_NUM(ROUTE120), MAP_NUM(ROUTE122), MAP_NUM(ROUTE123), 0xFF, 0xFF }, + { MAP_NUM(ROUTE122), MAP_NUM(ROUTE121), MAP_NUM(ROUTE123), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE123), MAP_NUM(ROUTE122), MAP_NUM(ROUTE118), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE124), MAP_NUM(ROUTE121), MAP_NUM(ROUTE125), MAP_NUM(ROUTE126), 0xFF, 0xFF }, + { MAP_NUM(ROUTE125), MAP_NUM(ROUTE124), MAP_NUM(ROUTE127), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE126), MAP_NUM(ROUTE124), MAP_NUM(ROUTE127), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE127), MAP_NUM(ROUTE125), MAP_NUM(ROUTE126), MAP_NUM(ROUTE128), 0xFF, 0xFF }, + { MAP_NUM(ROUTE128), MAP_NUM(ROUTE127), MAP_NUM(ROUTE129), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE129), MAP_NUM(ROUTE128), MAP_NUM(ROUTE130), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE130), MAP_NUM(ROUTE129), MAP_NUM(ROUTE131), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE131), MAP_NUM(ROUTE130), MAP_NUM(ROUTE132), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE132), MAP_NUM(ROUTE131), MAP_NUM(ROUTE133), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE133), MAP_NUM(ROUTE132), MAP_NUM(ROUTE134), 0xFF, 0xFF, 0xFF }, + { MAP_NUM(ROUTE134), MAP_NUM(ROUTE133), MAP_NUM(ROUTE110), 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, }; @@ -79,7 +80,7 @@ static void CreateInitialRoamerMon(bool16 createLatios) (&gSaveBlock1Ptr->roamer)->smart = GetMonData(&gEnemyParty[0], MON_DATA_SMART); (&gSaveBlock1Ptr->roamer)->tough = GetMonData(&gEnemyParty[0], MON_DATA_TOUGH); sRoamerLocation[MAP_GRP] = 0; - sRoamerLocation[MAP_NUM] = sRoamerLocations[Random() % 20][0]; + sRoamerLocation[MAP_NUM] = sRoamerLocations[Random() % (ARRAY_COUNT(sRoamerLocations) - 1)][0]; } void InitRoamer(void) @@ -103,20 +104,20 @@ void UpdateLocationHistoryForRoamer(void) void RoamerMoveToOtherLocationSet(void) { - u8 val = 0; + u8 mapNum = 0; struct Roamer *roamer = &gSaveBlock1Ptr->roamer; if (!roamer->active) return; - sRoamerLocation[MAP_GRP] = val; + sRoamerLocation[MAP_GRP] = 0; while (1) { - val = sRoamerLocations[Random() % 20][0]; - if (sRoamerLocation[MAP_NUM] != val) + mapNum = sRoamerLocations[Random() % (ARRAY_COUNT(sRoamerLocations) - 1)][0]; + if (sRoamerLocation[MAP_NUM] != mapNum) { - sRoamerLocation[MAP_NUM] = val; + sRoamerLocation[MAP_NUM] = mapNum; return; } } @@ -137,7 +138,7 @@ void RoamerMove(void) if (!roamer->active) return; - while (locSet < 20) + while (locSet < (ARRAY_COUNT(sRoamerLocations) - 1)) { if (sRoamerLocation[MAP_NUM] == sRoamerLocations[locSet][0]) { -- cgit v1.2.3 From e1829c40abf547830d72b857db19de135be77e67 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 17:31:34 +0100 Subject: Clean up safari zone --- src/rtc.c | 1 - src/safari_zone.c | 36 +++++++++++++----------------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/rtc.c b/src/rtc.c index ca8b9567e..3f413d0e3 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -344,4 +344,3 @@ u16 RtcGetLocalDayCount(void) { return RtcGetDayCount(&sRtc); } - diff --git a/src/safari_zone.c b/src/safari_zone.c index 427a5ceb8..accf94981 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -1,11 +1,15 @@ #include "global.h" -#include "safari_zone.h" +#include "battle.h" #include "event_data.h" -#include "constants/game_stat.h" +#include "field_player_avatar.h" +#include "overworld.h" #include "main.h" -#include "battle.h" -#include "string_util.h" #include "pokeblock.h" +#include "safari_zone.h" +#include "script.h" +#include "string_util.h" +#include "tv.h" +#include "constants/game_stat.h" struct PokeblockFeeder { @@ -18,26 +22,12 @@ struct PokeblockFeeder #define NUM_POKEBLOCK_FEEDERS 10 -extern u8 gBattleOutcome; -extern void* gFieldCallback; - -extern u8 EventScript_2A4B8A[]; -extern u8 EventScript_2A4B6F[]; -extern u8 EventScript_2A4B4C[]; -extern u8 EventScript_2A4B9B[]; - -extern void sub_80EE44C(u8, u8); -extern void IncrementGameStat(u8 index); -extern void ScriptContext1_SetupScript(u8*); -extern void ScriptContext2_RunNewScript(u8*); -extern void CB2_ReturnToField(void); -extern void CB2_ReturnToFieldContinueScriptPlayMapMusic(void); -extern void CB2_LoadMap(void); +extern const u8 EventScript_2A4B8A[]; +extern const u8 EventScript_2A4B6F[]; +extern const u8 EventScript_2A4B4C[]; +extern const u8 EventScript_2A4B9B[]; + extern void sub_80AF6F0(void); -extern void ScriptContext1_Stop(void); -extern void WarpIntoMap(void); -extern void GetXYCoordsOneStepInFrontOfPlayer(s16* x, s16* y); -extern void PlayerGetDestCoords(s16* x, s16* y); EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 sSafariZoneStepCounter = 0; -- cgit v1.2.3 From ba1fc055581921f41cbaebfe9d91b51b8e5df544 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 18:10:03 +0100 Subject: tabs --- src/data/battle_moves.h | 9224 +++++++++++++++++++++++------------------------ 1 file changed, 4612 insertions(+), 4612 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index d555194e3..008d7d784 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -2,4616 +2,4616 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = { [MOVE_NONE] = { - .effect = EFFECT_HIT, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 0, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - }, - - [MOVE_POUND] = - { - .effect = EFFECT_HIT, - .power = 40, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 35, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_KARATE_CHOP] = - { - .effect = EFFECT_HIGH_CRITICAL, - .power = 50, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_DOUBLE_SLAP] = - { - .effect = EFFECT_MULTI_HIT, - .power = 15, - .type = TYPE_NORMAL, - .accuracy = 85, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_COMET_PUNCH] = - { - .effect = EFFECT_MULTI_HIT, - .power = 18, - .type = TYPE_NORMAL, - .accuracy = 85, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_MEGA_PUNCH] = - { - .effect = EFFECT_HIT, - .power = 80, - .type = TYPE_NORMAL, - .accuracy = 85, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_PAY_DAY] = - { - .effect = EFFECT_PAY_DAY, - .power = 40, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_FIRE_PUNCH] = - { - .effect = EFFECT_BURN_HIT, - .power = 75, - .type = TYPE_FIRE, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ICE_PUNCH] = - { - .effect = EFFECT_FREEZE_HIT, - .power = 75, - .type = TYPE_ICE, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_THUNDER_PUNCH] = - { - .effect = EFFECT_PARALYZE_HIT, - .power = 75, - .type = TYPE_ELECTRIC, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SCRATCH] = - { - .effect = EFFECT_HIT, - .power = 40, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 35, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_VICE_GRIP] = - { - .effect = EFFECT_HIT, - .power = 55, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_GUILLOTINE] = - { - .effect = EFFECT_OHKO, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 30, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_RAZOR_WIND] = - { - .effect = EFFECT_RAZOR_WIND, - .power = 80, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SWORDS_DANCE] = - { - .effect = EFFECT_ATTACK_UP_2, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_CUT] = - { - .effect = EFFECT_HIT, - .power = 50, - .type = TYPE_NORMAL, - .accuracy = 95, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_GUST] = - { - .effect = EFFECT_GUST, - .power = 40, - .type = TYPE_FLYING, - .accuracy = 100, - .pp = 35, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_WING_ATTACK] = - { - .effect = EFFECT_HIT, - .power = 60, - .type = TYPE_FLYING, - .accuracy = 100, - .pp = 35, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_WHIRLWIND] = - { - .effect = EFFECT_ROAR, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = -6, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FLY] = - { - .effect = EFFECT_SEMI_INVULNERABLE, - .power = 70, - .type = TYPE_FLYING, - .accuracy = 95, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_BIND] = - { - .effect = EFFECT_TRAP, - .power = 15, - .type = TYPE_NORMAL, - .accuracy = 75, - .pp = 20, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SLAM] = - { - .effect = EFFECT_HIT, - .power = 80, - .type = TYPE_NORMAL, - .accuracy = 75, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_VINE_WHIP] = - { - .effect = EFFECT_HIT, - .power = 35, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_STOMP] = - { - .effect = EFFECT_FLINCH_MINIMIZE_HIT, - .power = 65, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DOUBLE_KICK] = - { - .effect = EFFECT_DOUBLE_HIT, - .power = 30, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_MEGA_KICK] = - { - .effect = EFFECT_HIT, - .power = 120, - .type = TYPE_NORMAL, - .accuracy = 75, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_JUMP_KICK] = - { - .effect = EFFECT_RECOIL_IF_MISS, - .power = 70, - .type = TYPE_FIGHTING, - .accuracy = 95, - .pp = 25, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ROLLING_KICK] = - { - .effect = EFFECT_FLINCH_HIT, - .power = 60, - .type = TYPE_FIGHTING, - .accuracy = 85, - .pp = 15, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SAND_ATTACK] = - { - .effect = EFFECT_ACCURACY_DOWN, - .power = 0, - .type = TYPE_GROUND, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_HEADBUTT] = - { - .effect = EFFECT_FLINCH_HIT, - .power = 70, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_HORN_ATTACK] = - { - .effect = EFFECT_HIT, - .power = 65, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_FURY_ATTACK] = - { - .effect = EFFECT_MULTI_HIT, - .power = 15, - .type = TYPE_NORMAL, - .accuracy = 85, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_HORN_DRILL] = - { - .effect = EFFECT_OHKO, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 30, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_TACKLE] = - { - .effect = EFFECT_HIT, - .power = 35, - .type = TYPE_NORMAL, - .accuracy = 95, - .pp = 35, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_BODY_SLAM] = - { - .effect = EFFECT_PARALYZE_HIT, - .power = 85, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_WRAP] = - { - .effect = EFFECT_TRAP, - .power = 15, - .type = TYPE_NORMAL, - .accuracy = 85, - .pp = 20, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_TAKE_DOWN] = - { - .effect = EFFECT_RECOIL, - .power = 90, - .type = TYPE_NORMAL, - .accuracy = 85, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_THRASH] = - { - .effect = EFFECT_RAMPAGE, - .power = 90, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_RANDOM, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_DOUBLE_EDGE] = - { - .effect = EFFECT_DOUBLE_EDGE, - .power = 120, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_TAIL_WHIP] = - { - .effect = EFFECT_DEFENSE_DOWN, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_POISON_STING] = - { - .effect = EFFECT_POISON_HIT, - .power = 15, - .type = TYPE_POISON, - .accuracy = 100, - .pp = 35, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_TWINEEDLE] = - { - .effect = EFFECT_TWINEEDLE, - .power = 25, - .type = TYPE_BUG, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_PIN_MISSILE] = - { - .effect = EFFECT_MULTI_HIT, - .power = 14, - .type = TYPE_BUG, - .accuracy = 85, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_LEER] = - { - .effect = EFFECT_DEFENSE_DOWN, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_BITE] = - { - .effect = EFFECT_FLINCH_HIT, - .power = 60, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_GROWL] = - { - .effect = EFFECT_ATTACK_DOWN, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ROAR] = - { - .effect = EFFECT_ROAR, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = -6, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SING] = - { - .effect = EFFECT_SLEEP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 55, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SUPERSONIC] = - { - .effect = EFFECT_CONFUSE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 55, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SONIC_BOOM] = - { - .effect = EFFECT_SONICBOOM, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 90, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_DISABLE] = - { - .effect = EFFECT_DISABLE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 55, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ACID] = - { - .effect = EFFECT_DEFENSE_DOWN_HIT, - .power = 40, - .type = TYPE_POISON, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_EMBER] = - { - .effect = EFFECT_BURN_HIT, - .power = 40, - .type = TYPE_FIRE, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FLAMETHROWER] = - { - .effect = EFFECT_BURN_HIT, - .power = 95, - .type = TYPE_FIRE, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MIST] = - { - .effect = EFFECT_MIST, - .power = 0, - .type = TYPE_ICE, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_WATER_GUN] = - { - .effect = EFFECT_HIT, - .power = 40, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_HYDRO_PUMP] = - { - .effect = EFFECT_HIT, - .power = 120, - .type = TYPE_WATER, - .accuracy = 80, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SURF] = - { - .effect = EFFECT_HIT, - .power = 95, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ICE_BEAM] = - { - .effect = EFFECT_FREEZE_HIT, - .power = 95, - .type = TYPE_ICE, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_BLIZZARD] = - { - .effect = EFFECT_FREEZE_HIT, - .power = 120, - .type = TYPE_ICE, - .accuracy = 70, - .pp = 5, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_PSYBEAM] = - { - .effect = EFFECT_CONFUSE_HIT, - .power = 65, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_BUBBLE_BEAM] = - { - .effect = EFFECT_SPEED_DOWN_HIT, - .power = 65, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_AURORA_BEAM] = - { - .effect = EFFECT_ATTACK_DOWN_HIT, - .power = 65, - .type = TYPE_ICE, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_HYPER_BEAM] = - { - .effect = EFFECT_RECHARGE, - .power = 150, - .type = TYPE_NORMAL, - .accuracy = 90, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_PECK] = - { - .effect = EFFECT_HIT, - .power = 35, - .type = TYPE_FLYING, - .accuracy = 100, - .pp = 35, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_DRILL_PECK] = - { - .effect = EFFECT_HIT, - .power = 80, - .type = TYPE_FLYING, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SUBMISSION] = - { - .effect = EFFECT_RECOIL, - .power = 80, - .type = TYPE_FIGHTING, - .accuracy = 80, - .pp = 25, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_LOW_KICK] = - { - .effect = EFFECT_LOW_KICK, - .power = 1, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_COUNTER] = - { - .effect = EFFECT_COUNTER, - .power = 1, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = -5, - .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SEISMIC_TOSS] = - { - .effect = EFFECT_LEVEL_DAMAGE, - .power = 1, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_STRENGTH] = - { - .effect = EFFECT_HIT, - .power = 80, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ABSORB] = - { - .effect = EFFECT_ABSORB, - .power = 20, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MEGA_DRAIN] = - { - .effect = EFFECT_ABSORB, - .power = 40, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_LEECH_SEED] = - { - .effect = EFFECT_LEECH_SEED, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 90, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_GROWTH] = - { - .effect = EFFECT_SPECIAL_ATTACK_UP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_RAZOR_LEAF] = - { - .effect = EFFECT_HIGH_CRITICAL, - .power = 55, - .type = TYPE_GRASS, - .accuracy = 95, - .pp = 25, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SOLAR_BEAM] = - { - .effect = EFFECT_SOLARBEAM, - .power = 120, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_POISON_POWDER] = - { - .effect = EFFECT_POISON, - .power = 0, - .type = TYPE_POISON, - .accuracy = 75, - .pp = 35, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_STUN_SPORE] = - { - .effect = EFFECT_PARALYZE, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 75, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SLEEP_POWDER] = - { - .effect = EFFECT_SLEEP, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 75, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_PETAL_DANCE] = - { - .effect = EFFECT_RAMPAGE, - .power = 70, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_RANDOM, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_STRING_SHOT] = - { - .effect = EFFECT_SPEED_DOWN, - .power = 0, - .type = TYPE_BUG, - .accuracy = 95, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DRAGON_RAGE] = - { - .effect = EFFECT_DRAGON_RAGE, - .power = 1, - .type = TYPE_DRAGON, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_FIRE_SPIN] = - { - .effect = EFFECT_TRAP, - .power = 15, - .type = TYPE_FIRE, - .accuracy = 70, - .pp = 15, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_THUNDER_SHOCK] = - { - .effect = EFFECT_PARALYZE_HIT, - .power = 40, - .type = TYPE_ELECTRIC, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_THUNDERBOLT] = - { - .effect = EFFECT_PARALYZE_HIT, - .power = 95, - .type = TYPE_ELECTRIC, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_THUNDER_WAVE] = - { - .effect = EFFECT_PARALYZE, - .power = 0, - .type = TYPE_ELECTRIC, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_THUNDER] = - { - .effect = EFFECT_THUNDER, - .power = 120, - .type = TYPE_ELECTRIC, - .accuracy = 70, - .pp = 10, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ROCK_THROW] = - { - .effect = EFFECT_HIT, - .power = 50, - .type = TYPE_ROCK, - .accuracy = 90, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_EARTHQUAKE] = - { - .effect = EFFECT_EARTHQUAKE, - .power = 100, - .type = TYPE_GROUND, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_FOES_AND_ALLY, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_FISSURE] = - { - .effect = EFFECT_OHKO, - .power = 1, - .type = TYPE_GROUND, - .accuracy = 30, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DIG] = - { - .effect = EFFECT_SEMI_INVULNERABLE, - .power = 60, - .type = TYPE_GROUND, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_TOXIC] = - { - .effect = EFFECT_TOXIC, - .power = 0, - .type = TYPE_POISON, - .accuracy = 85, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_CONFUSION] = - { - .effect = EFFECT_CONFUSE_HIT, - .power = 50, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_PSYCHIC] = - { - .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, - .power = 90, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_HYPNOSIS] = - { - .effect = EFFECT_SLEEP, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 60, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MEDITATE] = - { - .effect = EFFECT_ATTACK_UP, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_AGILITY] = - { - .effect = EFFECT_SPEED_UP_2, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_QUICK_ATTACK] = - { - .effect = EFFECT_QUICK_ATTACK, - .power = 40, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 1, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_RAGE] = - { - .effect = EFFECT_RAGE, - .power = 20, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_TELEPORT] = - { - .effect = EFFECT_TELEPORT, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_NIGHT_SHADE] = - { - .effect = EFFECT_LEVEL_DAMAGE, - .power = 1, - .type = TYPE_GHOST, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_MIMIC] = - { - .effect = EFFECT_MIMIC, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED, - }, - - [MOVE_SCREECH] = - { - .effect = EFFECT_DEFENSE_DOWN_2, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 85, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DOUBLE_TEAM] = - { - .effect = EFFECT_EVASION_UP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_RECOVER] = - { - .effect = EFFECT_RESTORE_HP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_HARDEN] = - { - .effect = EFFECT_DEFENSE_UP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_MINIMIZE] = - { - .effect = EFFECT_MINIMIZE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_SMOKESCREEN] = - { - .effect = EFFECT_ACCURACY_DOWN, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_CONFUSE_RAY] = - { - .effect = EFFECT_CONFUSE, - .power = 0, - .type = TYPE_GHOST, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_WITHDRAW] = - { - .effect = EFFECT_DEFENSE_UP, - .power = 0, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_DEFENSE_CURL] = - { - .effect = EFFECT_DEFENSE_CURL, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_BARRIER] = - { - .effect = EFFECT_DEFENSE_UP_2, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_LIGHT_SCREEN] = - { - .effect = EFFECT_LIGHT_SCREEN, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_HAZE] = - { - .effect = EFFECT_HAZE, - .power = 0, - .type = TYPE_ICE, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED, - }, - - [MOVE_REFLECT] = - { - .effect = EFFECT_REFLECT, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_FOCUS_ENERGY] = - { - .effect = EFFECT_FOCUS_ENERGY, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_BIDE] = - { - .effect = EFFECT_BIDE, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_METRONOME] = - { - .effect = EFFECT_METRONOME, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = 0, - .flags = 0, - }, - - [MOVE_MIRROR_MOVE] = - { - .effect = EFFECT_MIRROR_MOVE, - .power = 0, - .type = TYPE_FLYING, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = 0, - .flags = 0, - }, - - [MOVE_SELF_DESTRUCT] = - { - .effect = EFFECT_EXPLOSION, - .power = 200, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_FOES_AND_ALLY, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_EGG_BOMB] = - { - .effect = EFFECT_HIT, - .power = 100, - .type = TYPE_NORMAL, - .accuracy = 75, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_LICK] = - { - .effect = EFFECT_PARALYZE_HIT, - .power = 20, - .type = TYPE_GHOST, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SMOG] = - { - .effect = EFFECT_POISON_HIT, - .power = 20, - .type = TYPE_POISON, - .accuracy = 70, - .pp = 20, - .secondaryEffectChance = 40, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SLUDGE] = - { - .effect = EFFECT_POISON_HIT, - .power = 65, - .type = TYPE_POISON, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_BONE_CLUB] = - { - .effect = EFFECT_FLINCH_HIT, - .power = 65, - .type = TYPE_GROUND, - .accuracy = 85, - .pp = 20, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FIRE_BLAST] = - { - .effect = EFFECT_BURN_HIT, - .power = 120, - .type = TYPE_FIRE, - .accuracy = 85, - .pp = 5, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_WATERFALL] = - { - .effect = EFFECT_HIT, - .power = 80, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_CLAMP] = - { - .effect = EFFECT_TRAP, - .power = 35, - .type = TYPE_WATER, - .accuracy = 75, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SWIFT] = - { - .effect = EFFECT_ALWAYS_HIT, - .power = 60, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SKULL_BASH] = - { - .effect = EFFECT_SKULL_BASH, - .power = 100, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SPIKE_CANNON] = - { - .effect = EFFECT_MULTI_HIT, - .power = 20, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_CONSTRICT] = - { - .effect = EFFECT_SPEED_DOWN_HIT, - .power = 10, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 35, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_AMNESIA] = - { - .effect = EFFECT_SPECIAL_DEFENSE_UP_2, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_KINESIS] = - { - .effect = EFFECT_ACCURACY_DOWN, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 80, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SOFT_BOILED] = - { - .effect = EFFECT_SOFTBOILED, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_HI_JUMP_KICK] = - { - .effect = EFFECT_RECOIL_IF_MISS, - .power = 85, - .type = TYPE_FIGHTING, - .accuracy = 90, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_GLARE] = - { - .effect = EFFECT_PARALYZE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 75, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DREAM_EATER] = - { - .effect = EFFECT_DREAM_EATER, - .power = 100, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_POISON_GAS] = - { - .effect = EFFECT_POISON, - .power = 0, - .type = TYPE_POISON, - .accuracy = 55, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_BARRAGE] = - { - .effect = EFFECT_MULTI_HIT, - .power = 15, - .type = TYPE_NORMAL, - .accuracy = 85, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_LEECH_LIFE] = - { - .effect = EFFECT_ABSORB, - .power = 20, - .type = TYPE_BUG, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_LOVELY_KISS] = - { - .effect = EFFECT_SLEEP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 75, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SKY_ATTACK] = - { - .effect = EFFECT_SKY_ATTACK, - .power = 140, - .type = TYPE_FLYING, - .accuracy = 90, - .pp = 5, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_TRANSFORM] = - { - .effect = EFFECT_TRANSFORM, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - }, - - [MOVE_BUBBLE] = - { - .effect = EFFECT_SPEED_DOWN_HIT, - .power = 20, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DIZZY_PUNCH] = - { - .effect = EFFECT_CONFUSE_HIT, - .power = 70, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SPORE] = - { - .effect = EFFECT_SLEEP, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FLASH] = - { - .effect = EFFECT_ACCURACY_DOWN, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 70, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_PSYWAVE] = - { - .effect = EFFECT_PSYWAVE, - .power = 1, - .type = TYPE_PSYCHIC, - .accuracy = 80, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SPLASH] = - { - .effect = EFFECT_SPLASH, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_ACID_ARMOR] = - { - .effect = EFFECT_DEFENSE_UP_2, - .power = 0, - .type = TYPE_POISON, - .accuracy = 0, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_CRABHAMMER] = - { - .effect = EFFECT_HIGH_CRITICAL, - .power = 90, - .type = TYPE_WATER, - .accuracy = 85, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_EXPLOSION] = - { - .effect = EFFECT_EXPLOSION, - .power = 250, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_FOES_AND_ALLY, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_FURY_SWIPES] = - { - .effect = EFFECT_MULTI_HIT, - .power = 18, - .type = TYPE_NORMAL, - .accuracy = 80, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_BONEMERANG] = - { - .effect = EFFECT_DOUBLE_HIT, - .power = 50, - .type = TYPE_GROUND, - .accuracy = 90, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_REST] = - { - .effect = EFFECT_REST, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_ROCK_SLIDE] = - { - .effect = EFFECT_FLINCH_HIT, - .power = 75, - .type = TYPE_ROCK, - .accuracy = 90, - .pp = 10, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_HYPER_FANG] = - { - .effect = EFFECT_FLINCH_HIT, - .power = 80, - .type = TYPE_NORMAL, - .accuracy = 90, - .pp = 15, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SHARPEN] = - { - .effect = EFFECT_ATTACK_UP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_CONVERSION] = - { - .effect = EFFECT_CONVERSION, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_TRI_ATTACK] = - { - .effect = EFFECT_TRI_ATTACK, - .power = 80, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SUPER_FANG] = - { - .effect = EFFECT_SUPER_FANG, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 90, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SLASH] = - { - .effect = EFFECT_HIGH_CRITICAL, - .power = 70, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SUBSTITUTE] = - { - .effect = EFFECT_SUBSTITUTE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_STRUGGLE] = - { - .effect = EFFECT_RECOIL, - .power = 50, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 1, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SKETCH] = - { - .effect = EFFECT_SKETCH, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 1, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - }, - - [MOVE_TRIPLE_KICK] = - { - .effect = EFFECT_TRIPLE_KICK, - .power = 10, - .type = TYPE_FIGHTING, - .accuracy = 90, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_THIEF] = - { - .effect = EFFECT_THIEF, - .power = 40, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SPIDER_WEB] = - { - .effect = EFFECT_MEAN_LOOK, - .power = 0, - .type = TYPE_BUG, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MIND_READER] = - { - .effect = EFFECT_LOCK_ON, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_NIGHTMARE] = - { - .effect = EFFECT_NIGHTMARE, - .power = 0, - .type = TYPE_GHOST, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FLAME_WHEEL] = - { - .effect = EFFECT_THAW_HIT, - .power = 60, - .type = TYPE_FIRE, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SNORE] = - { - .effect = EFFECT_SNORE, - .power = 40, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_CURSE] = - { - .effect = EFFECT_CURSE, - .power = 0, - .type = TYPE_MYSTERY, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - }, - - [MOVE_FLAIL] = - { - .effect = EFFECT_FLAIL, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_CONVERSION_2] = - { - .effect = EFFECT_CONVERSION_2, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_AEROBLAST] = - { - .effect = EFFECT_HIGH_CRITICAL, - .power = 100, - .type = TYPE_FLYING, - .accuracy = 95, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_COTTON_SPORE] = - { - .effect = EFFECT_SPEED_DOWN_2, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 85, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_REVERSAL] = - { - .effect = EFFECT_FLAIL, - .power = 1, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SPITE] = - { - .effect = EFFECT_SPITE, - .power = 0, - .type = TYPE_GHOST, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_POWDER_SNOW] = - { - .effect = EFFECT_FREEZE_HIT, - .power = 40, - .type = TYPE_ICE, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_PROTECT] = - { - .effect = EFFECT_PROTECT, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 3, - .flags = 0, - }, - - [MOVE_MACH_PUNCH] = - { - .effect = EFFECT_QUICK_ATTACK, - .power = 40, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 1, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SCARY_FACE] = - { - .effect = EFFECT_SPEED_DOWN_2, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 90, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FAINT_ATTACK] = - { - .effect = EFFECT_ALWAYS_HIT, - .power = 60, - .type = TYPE_DARK, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SWEET_KISS] = - { - .effect = EFFECT_CONFUSE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 75, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_BELLY_DRUM] = - { - .effect = EFFECT_BELLY_DRUM, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_SLUDGE_BOMB] = - { - .effect = EFFECT_POISON_HIT, - .power = 90, - .type = TYPE_POISON, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MUD_SLAP] = - { - .effect = EFFECT_ACCURACY_DOWN_HIT, - .power = 20, - .type = TYPE_GROUND, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_OCTAZOOKA] = - { - .effect = EFFECT_ACCURACY_DOWN_HIT, - .power = 65, - .type = TYPE_WATER, - .accuracy = 85, - .pp = 10, - .secondaryEffectChance = 50, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SPIKES] = - { - .effect = EFFECT_SPIKES, - .power = 0, - .type = TYPE_GROUND, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_OPPONENTS_FIELD, - .priority = 0, - .flags = 0, - }, - - [MOVE_ZAP_CANNON] = - { - .effect = EFFECT_PARALYZE_HIT, - .power = 100, - .type = TYPE_ELECTRIC, - .accuracy = 50, - .pp = 5, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FORESIGHT] = - { - .effect = EFFECT_FORESIGHT, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DESTINY_BOND] = - { - .effect = EFFECT_DESTINY_BOND, - .power = 0, - .type = TYPE_GHOST, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_PERISH_SONG] = - { - .effect = EFFECT_PERISH_SONG, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_ICY_WIND] = - { - .effect = EFFECT_SPEED_DOWN_HIT, - .power = 55, - .type = TYPE_ICE, - .accuracy = 95, - .pp = 15, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DETECT] = - { - .effect = EFFECT_PROTECT, - .power = 0, - .type = TYPE_FIGHTING, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 3, - .flags = 0, - }, - - [MOVE_BONE_RUSH] = - { - .effect = EFFECT_MULTI_HIT, - .power = 25, - .type = TYPE_GROUND, - .accuracy = 80, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_LOCK_ON] = - { - .effect = EFFECT_LOCK_ON, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_OUTRAGE] = - { - .effect = EFFECT_RAMPAGE, - .power = 90, - .type = TYPE_DRAGON, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_RANDOM, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SANDSTORM] = - { - .effect = EFFECT_SANDSTORM, - .power = 0, - .type = TYPE_ROCK, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_GIGA_DRAIN] = - { - .effect = EFFECT_ABSORB, - .power = 60, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ENDURE] = - { - .effect = EFFECT_ENDURE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 3, - .flags = 0, - }, - - [MOVE_CHARM] = - { - .effect = EFFECT_ATTACK_DOWN_2, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ROLLOUT] = - { - .effect = EFFECT_ROLLOUT, - .power = 30, - .type = TYPE_ROCK, - .accuracy = 90, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_FALSE_SWIPE] = - { - .effect = EFFECT_FALSE_SWIPE, - .power = 40, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SWAGGER] = - { - .effect = EFFECT_SWAGGER, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 90, - .pp = 15, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MILK_DRINK] = - { - .effect = EFFECT_SOFTBOILED, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_SNATCH_AFFECTED, - }, - - [MOVE_SPARK] = - { - .effect = EFFECT_PARALYZE_HIT, - .power = 65, - .type = TYPE_ELECTRIC, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FURY_CUTTER] = - { - .effect = EFFECT_FURY_CUTTER, - .power = 10, - .type = TYPE_BUG, - .accuracy = 95, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_STEEL_WING] = - { - .effect = EFFECT_DEFENSE_UP_HIT, - .power = 70, - .type = TYPE_STEEL, - .accuracy = 90, - .pp = 25, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_MEAN_LOOK] = - { - .effect = EFFECT_MEAN_LOOK, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ATTRACT] = - { - .effect = EFFECT_ATTRACT, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SLEEP_TALK] = - { - .effect = EFFECT_SLEEP_TALK, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = 0, - .flags = 0, - }, - - [MOVE_HEAL_BELL] = - { - .effect = EFFECT_HEAL_BELL, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_RETURN] = - { - .effect = EFFECT_RETURN, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_PRESENT] = - { - .effect = EFFECT_PRESENT, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 90, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FRUSTRATION] = - { - .effect = EFFECT_FRUSTRATION, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SAFEGUARD] = - { - .effect = EFFECT_SAFEGUARD, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 25, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_PAIN_SPLIT] = - { - .effect = EFFECT_PAIN_SPLIT, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SACRED_FIRE] = - { - .effect = EFFECT_THAW_HIT, - .power = 100, - .type = TYPE_FIRE, - .accuracy = 95, - .pp = 5, - .secondaryEffectChance = 50, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MAGNITUDE] = - { - .effect = EFFECT_MAGNITUDE, - .power = 1, - .type = TYPE_GROUND, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_FOES_AND_ALLY, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_DYNAMIC_PUNCH] = - { - .effect = EFFECT_CONFUSE_HIT, - .power = 100, - .type = TYPE_FIGHTING, - .accuracy = 50, - .pp = 5, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MEGAHORN] = - { - .effect = EFFECT_HIT, - .power = 120, - .type = TYPE_BUG, - .accuracy = 85, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_DRAGON_BREATH] = - { - .effect = EFFECT_PARALYZE_HIT, - .power = 60, - .type = TYPE_DRAGON, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_BATON_PASS] = - { - .effect = EFFECT_BATON_PASS, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_ENCORE] = - { - .effect = EFFECT_ENCORE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_PURSUIT] = - { - .effect = EFFECT_PURSUIT, - .power = 40, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_RAPID_SPIN] = - { - .effect = EFFECT_RAPID_SPIN, - .power = 20, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SWEET_SCENT] = - { - .effect = EFFECT_EVASION_DOWN, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_IRON_TAIL] = - { - .effect = EFFECT_DEFENSE_DOWN_HIT, - .power = 100, - .type = TYPE_STEEL, - .accuracy = 75, - .pp = 15, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_METAL_CLAW] = - { - .effect = EFFECT_ATTACK_UP_HIT, - .power = 50, - .type = TYPE_STEEL, - .accuracy = 95, - .pp = 35, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_VITAL_THROW] = - { - .effect = EFFECT_VITAL_THROW, - .power = 70, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = -1, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_MORNING_SUN] = - { - .effect = EFFECT_MORNING_SUN, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_SYNTHESIS] = - { - .effect = EFFECT_SYNTHESIS, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_MOONLIGHT] = - { - .effect = EFFECT_MOONLIGHT, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_HIDDEN_POWER] = - { - .effect = EFFECT_HIDDEN_POWER, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_CROSS_CHOP] = - { - .effect = EFFECT_HIGH_CRITICAL, - .power = 100, - .type = TYPE_FIGHTING, - .accuracy = 80, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_TWISTER] = - { - .effect = EFFECT_TWISTER, - .power = 40, - .type = TYPE_DRAGON, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_RAIN_DANCE] = - { - .effect = EFFECT_RAIN_DANCE, - .power = 0, - .type = TYPE_WATER, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_SUNNY_DAY] = - { - .effect = EFFECT_SUNNY_DAY, - .power = 0, - .type = TYPE_FIRE, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_CRUNCH] = - { - .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, - .power = 80, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MIRROR_COAT] = - { - .effect = EFFECT_MIRROR_COAT, - .power = 1, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = -5, - .flags = FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_PSYCH_UP] = - { - .effect = EFFECT_PSYCH_UP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_EXTREME_SPEED] = - { - .effect = EFFECT_QUICK_ATTACK, - .power = 80, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 1, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ANCIENT_POWER] = - { - .effect = EFFECT_ALL_STATS_UP_HIT, - .power = 60, - .type = TYPE_ROCK, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SHADOW_BALL] = - { - .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, - .power = 80, - .type = TYPE_GHOST, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FUTURE_SIGHT] = - { - .effect = EFFECT_FUTURE_SIGHT, - .power = 80, - .type = TYPE_PSYCHIC, - .accuracy = 90, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - }, - - [MOVE_ROCK_SMASH] = - { - .effect = EFFECT_DEFENSE_DOWN_HIT, - .power = 20, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 50, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_WHIRLPOOL] = - { - .effect = EFFECT_TRAP, - .power = 15, - .type = TYPE_WATER, - .accuracy = 70, - .pp = 15, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_BEAT_UP] = - { - .effect = EFFECT_BEAT_UP, - .power = 10, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_FAKE_OUT] = - { - .effect = EFFECT_FAKE_OUT, - .power = 40, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 1, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_UPROAR] = - { - .effect = EFFECT_UPROAR, - .power = 50, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_RANDOM, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_STOCKPILE] = - { - .effect = EFFECT_STOCKPILE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_SPIT_UP] = - { - .effect = EFFECT_SPIT_UP, - .power = 100, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SWALLOW] = - { - .effect = EFFECT_SWALLOW, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_HEAT_WAVE] = - { - .effect = EFFECT_BURN_HIT, - .power = 100, - .type = TYPE_FIRE, - .accuracy = 90, - .pp = 10, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_HAIL] = - { - .effect = EFFECT_HAIL, - .power = 0, - .type = TYPE_ICE, - .accuracy = 0, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED, - }, - - [MOVE_TORMENT] = - { - .effect = EFFECT_TORMENT, - .power = 0, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FLATTER] = - { - .effect = EFFECT_FLATTER, - .power = 0, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_WILL_O_WISP] = - { - .effect = EFFECT_WILL_O_WISP, - .power = 0, - .type = TYPE_FIRE, - .accuracy = 75, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MEMENTO] = - { - .effect = EFFECT_MEMENTO, - .power = 0, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FACADE] = - { - .effect = EFFECT_FACADE, - .power = 70, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FOCUS_PUNCH] = - { - .effect = EFFECT_FOCUS_PUNCH, - .power = 150, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = -3, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, - }, - - [MOVE_SMELLING_SALT] = - { - .effect = EFFECT_SMELLINGSALT, - .power = 60, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FOLLOW_ME] = - { - .effect = EFFECT_FOLLOW_ME, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 3, - .flags = 0, - }, - - [MOVE_NATURE_POWER] = - { - .effect = EFFECT_NATURE_POWER, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 95, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = 0, - .flags = 0, - }, - - [MOVE_CHARGE] = - { - .effect = EFFECT_CHARGE, - .power = 0, - .type = TYPE_ELECTRIC, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_TAUNT] = - { - .effect = EFFECT_TAUNT, - .power = 0, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED, - }, - - [MOVE_HELPING_HAND] = - { - .effect = EFFECT_HELPING_HAND, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 5, - .flags = 0, - }, - - [MOVE_TRICK] = - { - .effect = EFFECT_TRICK, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ROLE_PLAY] = - { - .effect = EFFECT_ROLE_PLAY, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - }, - - [MOVE_WISH] = - { - .effect = EFFECT_WISH, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED, - }, - - [MOVE_ASSIST] = - { - .effect = EFFECT_ASSIST, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = 0, - .flags = 0, - }, - - [MOVE_INGRAIN] = - { - .effect = EFFECT_INGRAIN, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_SUPERPOWER] = - { - .effect = EFFECT_SUPERPOWER, - .power = 120, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MAGIC_COAT] = - { - .effect = EFFECT_MAGIC_COAT, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = 4, - .flags = 0, - }, - - [MOVE_RECYCLE] = - { - .effect = EFFECT_RECYCLE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_REVENGE] = - { - .effect = EFFECT_REVENGE, - .power = 60, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = -4, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_BRICK_BREAK] = - { - .effect = EFFECT_BRICK_BREAK, - .power = 75, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_YAWN] = - { - .effect = EFFECT_YAWN, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_KNOCK_OFF] = - { - .effect = EFFECT_KNOCK_OFF, - .power = 20, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ENDEAVOR] = - { - .effect = EFFECT_ENDEAVOR, - .power = 1, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ERUPTION] = - { - .effect = EFFECT_ERUPTION, - .power = 150, - .type = TYPE_FIRE, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SKILL_SWAP] = - { - .effect = EFFECT_SKILL_SWAP, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_IMPRISON] = - { - .effect = EFFECT_IMPRISON, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED, - }, - - [MOVE_REFRESH] = - { - .effect = EFFECT_REFRESH, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_GRUDGE] = - { - .effect = EFFECT_GRUDGE, - .power = 0, - .type = TYPE_GHOST, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SNATCH] = - { - .effect = EFFECT_SNATCH, - .power = 0, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_DEPENDS, - .priority = 4, - .flags = FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SECRET_POWER] = - { - .effect = EFFECT_SECRET_POWER, - .power = 70, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_DIVE] = - { - .effect = EFFECT_SEMI_INVULNERABLE, - .power = 60, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ARM_THRUST] = - { - .effect = EFFECT_MULTI_HIT, - .power = 15, - .type = TYPE_FIGHTING, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_CAMOUFLAGE] = - { - .effect = EFFECT_CAMOUFLAGE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_TAIL_GLOW] = - { - .effect = EFFECT_SPECIAL_ATTACK_UP_2, - .power = 0, - .type = TYPE_BUG, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_LUSTER_PURGE] = - { - .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, - .power = 70, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 50, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MIST_BALL] = - { - .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, - .power = 70, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 50, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_FEATHER_DANCE] = - { - .effect = EFFECT_ATTACK_DOWN_2, - .power = 0, - .type = TYPE_FLYING, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_TEETER_DANCE] = - { - .effect = EFFECT_TEETER_DANCE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_FOES_AND_ALLY, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED, - }, - - [MOVE_BLAZE_KICK] = - { - .effect = EFFECT_BLAZE_KICK, - .power = 85, - .type = TYPE_FIRE, - .accuracy = 90, - .pp = 10, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MUD_SPORT] = - { - .effect = EFFECT_MUD_SPORT, - .power = 0, - .type = TYPE_GROUND, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_ICE_BALL] = - { - .effect = EFFECT_ROLLOUT, - .power = 30, - .type = TYPE_ICE, - .accuracy = 90, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_NEEDLE_ARM] = - { - .effect = EFFECT_FLINCH_MINIMIZE_HIT, - .power = 60, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SLACK_OFF] = - { - .effect = EFFECT_RESTORE_HP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_HYPER_VOICE] = - { - .effect = EFFECT_HIT, - .power = 90, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_POISON_FANG] = - { - .effect = EFFECT_POISON_FANG, - .power = 50, - .type = TYPE_POISON, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_CRUSH_CLAW] = - { - .effect = EFFECT_DEFENSE_DOWN_HIT, - .power = 75, - .type = TYPE_NORMAL, - .accuracy = 95, - .pp = 10, - .secondaryEffectChance = 50, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_BLAST_BURN] = - { - .effect = EFFECT_RECHARGE, - .power = 150, - .type = TYPE_FIRE, - .accuracy = 90, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_HYDRO_CANNON] = - { - .effect = EFFECT_RECHARGE, - .power = 150, - .type = TYPE_WATER, - .accuracy = 90, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_METEOR_MASH] = - { - .effect = EFFECT_ATTACK_UP_HIT, - .power = 100, - .type = TYPE_STEEL, - .accuracy = 85, - .pp = 10, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ASTONISH] = - { - .effect = EFFECT_FLINCH_MINIMIZE_HIT, - .power = 30, - .type = TYPE_GHOST, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_WEATHER_BALL] = - { - .effect = EFFECT_WEATHER_BALL, - .power = 50, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_AROMATHERAPY] = - { - .effect = EFFECT_HEAL_BELL, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_FAKE_TEARS] = - { - .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, - .power = 0, - .type = TYPE_DARK, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_AIR_CUTTER] = - { - .effect = EFFECT_HIGH_CRITICAL, - .power = 55, - .type = TYPE_FLYING, - .accuracy = 95, - .pp = 25, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_OVERHEAT] = - { - .effect = EFFECT_OVERHEAT, - .power = 140, - .type = TYPE_FIRE, - .accuracy = 90, - .pp = 5, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ODOR_SLEUTH] = - { - .effect = EFFECT_FORESIGHT, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_ROCK_TOMB] = - { - .effect = EFFECT_SPEED_DOWN_HIT, - .power = 50, - .type = TYPE_ROCK, - .accuracy = 80, - .pp = 10, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SILVER_WIND] = - { - .effect = EFFECT_ALL_STATS_UP_HIT, - .power = 60, - .type = TYPE_BUG, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_METAL_SOUND] = - { - .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, - .power = 0, - .type = TYPE_STEEL, - .accuracy = 85, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_GRASS_WHISTLE] = - { - .effect = EFFECT_SLEEP, - .power = 0, - .type = TYPE_GRASS, - .accuracy = 55, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_TICKLE] = - { - .effect = EFFECT_TICKLE, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_COSMIC_POWER] = - { - .effect = EFFECT_COSMIC_POWER, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_WATER_SPOUT] = - { - .effect = EFFECT_ERUPTION, - .power = 150, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SIGNAL_BEAM] = - { - .effect = EFFECT_CONFUSE_HIT, - .power = 75, - .type = TYPE_BUG, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SHADOW_PUNCH] = - { - .effect = EFFECT_ALWAYS_HIT, - .power = 60, - .type = TYPE_GHOST, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_EXTRASENSORY] = - { - .effect = EFFECT_FLINCH_MINIMIZE_HIT, - .power = 80, - .type = TYPE_PSYCHIC, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_SKY_UPPERCUT] = - { - .effect = EFFECT_SKY_UPPERCUT, - .power = 85, - .type = TYPE_FIGHTING, - .accuracy = 90, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SAND_TOMB] = - { - .effect = EFFECT_TRAP, - .power = 15, - .type = TYPE_GROUND, - .accuracy = 70, - .pp = 15, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SHEER_COLD] = - { - .effect = EFFECT_OHKO, - .power = 1, - .type = TYPE_ICE, - .accuracy = 30, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_MUDDY_WATER] = - { - .effect = EFFECT_ACCURACY_DOWN_HIT, - .power = 95, - .type = TYPE_WATER, - .accuracy = 85, - .pp = 10, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_BOTH, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_BULLET_SEED] = - { - .effect = EFFECT_MULTI_HIT, - .power = 10, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_AERIAL_ACE] = - { - .effect = EFFECT_ALWAYS_HIT, - .power = 60, - .type = TYPE_FLYING, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_ICICLE_SPEAR] = - { - .effect = EFFECT_MULTI_HIT, - .power = 10, - .type = TYPE_ICE, - .accuracy = 100, - .pp = 30, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_IRON_DEFENSE] = - { - .effect = EFFECT_DEFENSE_UP_2, - .power = 0, - .type = TYPE_STEEL, - .accuracy = 0, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_BLOCK] = - { - .effect = EFFECT_MEAN_LOOK, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_HOWL] = - { - .effect = EFFECT_ATTACK_UP, - .power = 0, - .type = TYPE_NORMAL, - .accuracy = 0, - .pp = 40, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_DRAGON_CLAW] = - { - .effect = EFFECT_HIT, - .power = 80, - .type = TYPE_DRAGON, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_FRENZY_PLANT] = - { - .effect = EFFECT_RECHARGE, - .power = 150, - .type = TYPE_GRASS, - .accuracy = 90, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_BULK_UP] = - { - .effect = EFFECT_BULK_UP, - .power = 0, - .type = TYPE_FIGHTING, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_BOUNCE] = - { - .effect = EFFECT_SEMI_INVULNERABLE, - .power = 85, - .type = TYPE_FLYING, - .accuracy = 85, - .pp = 5, - .secondaryEffectChance = 30, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_MUD_SHOT] = - { - .effect = EFFECT_SPEED_DOWN_HIT, - .power = 55, - .type = TYPE_GROUND, - .accuracy = 95, - .pp = 15, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_POISON_TAIL] = - { - .effect = EFFECT_POISON_TAIL, - .power = 50, - .type = TYPE_POISON, - .accuracy = 100, - .pp = 25, - .secondaryEffectChance = 10, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_COVET] = - { - .effect = EFFECT_THIEF, - .power = 40, - .type = TYPE_NORMAL, - .accuracy = 100, - .pp = 40, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - }, - - [MOVE_VOLT_TACKLE] = - { - .effect = EFFECT_DOUBLE_EDGE, - .power = 120, - .type = TYPE_ELECTRIC, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_MAGICAL_LEAF] = - { - .effect = EFFECT_ALWAYS_HIT, - .power = 60, - .type = TYPE_GRASS, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_WATER_SPORT] = - { - .effect = EFFECT_WATER_SPORT, - .power = 0, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = 0, - }, - - [MOVE_CALM_MIND] = - { - .effect = EFFECT_CALM_MIND, - .power = 0, - .type = TYPE_PSYCHIC, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_LEAF_BLADE] = - { - .effect = EFFECT_HIGH_CRITICAL, - .power = 70, - .type = TYPE_GRASS, - .accuracy = 100, - .pp = 15, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_DRAGON_DANCE] = - { - .effect = EFFECT_DRAGON_DANCE, - .power = 0, - .type = TYPE_DRAGON, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, - .priority = 0, - .flags = FLAG_SNATCH_AFFECTED, - }, - - [MOVE_ROCK_BLAST] = - { - .effect = EFFECT_MULTI_HIT, - .power = 25, - .type = TYPE_ROCK, - .accuracy = 80, - .pp = 10, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_SHOCK_WAVE] = - { - .effect = EFFECT_ALWAYS_HIT, - .power = 60, - .type = TYPE_ELECTRIC, - .accuracy = 0, - .pp = 20, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_WATER_PULSE] = - { - .effect = EFFECT_CONFUSE_HIT, - .power = 60, - .type = TYPE_WATER, - .accuracy = 100, - .pp = 20, - .secondaryEffectChance = 20, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, - - [MOVE_DOOM_DESIRE] = - { - .effect = EFFECT_FUTURE_SIGHT, - .power = 120, - .type = TYPE_STEEL, - .accuracy = 85, - .pp = 5, - .secondaryEffectChance = 0, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = 0, - }, - - [MOVE_PSYCHO_BOOST] = - { - .effect = EFFECT_OVERHEAT, - .power = 140, - .type = TYPE_PSYCHIC, - .accuracy = 90, - .pp = 5, - .secondaryEffectChance = 100, - .target = MOVE_TARGET_SELECTED, - .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, - }, + .effect = EFFECT_HIT, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 0, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = 0, + }, + + [MOVE_POUND] = + { + .effect = EFFECT_HIT, + .power = 40, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 35, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_KARATE_CHOP] = + { + .effect = EFFECT_HIGH_CRITICAL, + .power = 50, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_DOUBLE_SLAP] = + { + .effect = EFFECT_MULTI_HIT, + .power = 15, + .type = TYPE_NORMAL, + .accuracy = 85, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_COMET_PUNCH] = + { + .effect = EFFECT_MULTI_HIT, + .power = 18, + .type = TYPE_NORMAL, + .accuracy = 85, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_MEGA_PUNCH] = + { + .effect = EFFECT_HIT, + .power = 80, + .type = TYPE_NORMAL, + .accuracy = 85, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_PAY_DAY] = + { + .effect = EFFECT_PAY_DAY, + .power = 40, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_FIRE_PUNCH] = + { + .effect = EFFECT_BURN_HIT, + .power = 75, + .type = TYPE_FIRE, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ICE_PUNCH] = + { + .effect = EFFECT_FREEZE_HIT, + .power = 75, + .type = TYPE_ICE, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_THUNDER_PUNCH] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 75, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SCRATCH] = + { + .effect = EFFECT_HIT, + .power = 40, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 35, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_VICE_GRIP] = + { + .effect = EFFECT_HIT, + .power = 55, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_GUILLOTINE] = + { + .effect = EFFECT_OHKO, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 30, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_RAZOR_WIND] = + { + .effect = EFFECT_RAZOR_WIND, + .power = 80, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SWORDS_DANCE] = + { + .effect = EFFECT_ATTACK_UP_2, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_CUT] = + { + .effect = EFFECT_HIT, + .power = 50, + .type = TYPE_NORMAL, + .accuracy = 95, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_GUST] = + { + .effect = EFFECT_GUST, + .power = 40, + .type = TYPE_FLYING, + .accuracy = 100, + .pp = 35, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_WING_ATTACK] = + { + .effect = EFFECT_HIT, + .power = 60, + .type = TYPE_FLYING, + .accuracy = 100, + .pp = 35, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_WHIRLWIND] = + { + .effect = EFFECT_ROAR, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = -6, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FLY] = + { + .effect = EFFECT_SEMI_INVULNERABLE, + .power = 70, + .type = TYPE_FLYING, + .accuracy = 95, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_BIND] = + { + .effect = EFFECT_TRAP, + .power = 15, + .type = TYPE_NORMAL, + .accuracy = 75, + .pp = 20, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SLAM] = + { + .effect = EFFECT_HIT, + .power = 80, + .type = TYPE_NORMAL, + .accuracy = 75, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_VINE_WHIP] = + { + .effect = EFFECT_HIT, + .power = 35, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_STOMP] = + { + .effect = EFFECT_FLINCH_MINIMIZE_HIT, + .power = 65, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DOUBLE_KICK] = + { + .effect = EFFECT_DOUBLE_HIT, + .power = 30, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_MEGA_KICK] = + { + .effect = EFFECT_HIT, + .power = 120, + .type = TYPE_NORMAL, + .accuracy = 75, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_JUMP_KICK] = + { + .effect = EFFECT_RECOIL_IF_MISS, + .power = 70, + .type = TYPE_FIGHTING, + .accuracy = 95, + .pp = 25, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ROLLING_KICK] = + { + .effect = EFFECT_FLINCH_HIT, + .power = 60, + .type = TYPE_FIGHTING, + .accuracy = 85, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SAND_ATTACK] = + { + .effect = EFFECT_ACCURACY_DOWN, + .power = 0, + .type = TYPE_GROUND, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_HEADBUTT] = + { + .effect = EFFECT_FLINCH_HIT, + .power = 70, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_HORN_ATTACK] = + { + .effect = EFFECT_HIT, + .power = 65, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_FURY_ATTACK] = + { + .effect = EFFECT_MULTI_HIT, + .power = 15, + .type = TYPE_NORMAL, + .accuracy = 85, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_HORN_DRILL] = + { + .effect = EFFECT_OHKO, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 30, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_TACKLE] = + { + .effect = EFFECT_HIT, + .power = 35, + .type = TYPE_NORMAL, + .accuracy = 95, + .pp = 35, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_BODY_SLAM] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 85, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_WRAP] = + { + .effect = EFFECT_TRAP, + .power = 15, + .type = TYPE_NORMAL, + .accuracy = 85, + .pp = 20, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_TAKE_DOWN] = + { + .effect = EFFECT_RECOIL, + .power = 90, + .type = TYPE_NORMAL, + .accuracy = 85, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_THRASH] = + { + .effect = EFFECT_RAMPAGE, + .power = 90, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_RANDOM, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_DOUBLE_EDGE] = + { + .effect = EFFECT_DOUBLE_EDGE, + .power = 120, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_TAIL_WHIP] = + { + .effect = EFFECT_DEFENSE_DOWN, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_POISON_STING] = + { + .effect = EFFECT_POISON_HIT, + .power = 15, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 35, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_TWINEEDLE] = + { + .effect = EFFECT_TWINEEDLE, + .power = 25, + .type = TYPE_BUG, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 20, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_PIN_MISSILE] = + { + .effect = EFFECT_MULTI_HIT, + .power = 14, + .type = TYPE_BUG, + .accuracy = 85, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_LEER] = + { + .effect = EFFECT_DEFENSE_DOWN, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_BITE] = + { + .effect = EFFECT_FLINCH_HIT, + .power = 60, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_GROWL] = + { + .effect = EFFECT_ATTACK_DOWN, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ROAR] = + { + .effect = EFFECT_ROAR, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = -6, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SING] = + { + .effect = EFFECT_SLEEP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 55, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SUPERSONIC] = + { + .effect = EFFECT_CONFUSE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 55, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SONIC_BOOM] = + { + .effect = EFFECT_SONICBOOM, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 90, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_DISABLE] = + { + .effect = EFFECT_DISABLE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 55, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ACID] = + { + .effect = EFFECT_DEFENSE_DOWN_HIT, + .power = 40, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_EMBER] = + { + .effect = EFFECT_BURN_HIT, + .power = 40, + .type = TYPE_FIRE, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FLAMETHROWER] = + { + .effect = EFFECT_BURN_HIT, + .power = 95, + .type = TYPE_FIRE, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MIST] = + { + .effect = EFFECT_MIST, + .power = 0, + .type = TYPE_ICE, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_WATER_GUN] = + { + .effect = EFFECT_HIT, + .power = 40, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_HYDRO_PUMP] = + { + .effect = EFFECT_HIT, + .power = 120, + .type = TYPE_WATER, + .accuracy = 80, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SURF] = + { + .effect = EFFECT_HIT, + .power = 95, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ICE_BEAM] = + { + .effect = EFFECT_FREEZE_HIT, + .power = 95, + .type = TYPE_ICE, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_BLIZZARD] = + { + .effect = EFFECT_FREEZE_HIT, + .power = 120, + .type = TYPE_ICE, + .accuracy = 70, + .pp = 5, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_PSYBEAM] = + { + .effect = EFFECT_CONFUSE_HIT, + .power = 65, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_BUBBLE_BEAM] = + { + .effect = EFFECT_SPEED_DOWN_HIT, + .power = 65, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_AURORA_BEAM] = + { + .effect = EFFECT_ATTACK_DOWN_HIT, + .power = 65, + .type = TYPE_ICE, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_HYPER_BEAM] = + { + .effect = EFFECT_RECHARGE, + .power = 150, + .type = TYPE_NORMAL, + .accuracy = 90, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_PECK] = + { + .effect = EFFECT_HIT, + .power = 35, + .type = TYPE_FLYING, + .accuracy = 100, + .pp = 35, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_DRILL_PECK] = + { + .effect = EFFECT_HIT, + .power = 80, + .type = TYPE_FLYING, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SUBMISSION] = + { + .effect = EFFECT_RECOIL, + .power = 80, + .type = TYPE_FIGHTING, + .accuracy = 80, + .pp = 25, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_LOW_KICK] = + { + .effect = EFFECT_LOW_KICK, + .power = 1, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_COUNTER] = + { + .effect = EFFECT_COUNTER, + .power = 1, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = -5, + .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SEISMIC_TOSS] = + { + .effect = EFFECT_LEVEL_DAMAGE, + .power = 1, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_STRENGTH] = + { + .effect = EFFECT_HIT, + .power = 80, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ABSORB] = + { + .effect = EFFECT_ABSORB, + .power = 20, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MEGA_DRAIN] = + { + .effect = EFFECT_ABSORB, + .power = 40, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_LEECH_SEED] = + { + .effect = EFFECT_LEECH_SEED, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_GROWTH] = + { + .effect = EFFECT_SPECIAL_ATTACK_UP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_RAZOR_LEAF] = + { + .effect = EFFECT_HIGH_CRITICAL, + .power = 55, + .type = TYPE_GRASS, + .accuracy = 95, + .pp = 25, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SOLAR_BEAM] = + { + .effect = EFFECT_SOLARBEAM, + .power = 120, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_POISON_POWDER] = + { + .effect = EFFECT_POISON, + .power = 0, + .type = TYPE_POISON, + .accuracy = 75, + .pp = 35, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_STUN_SPORE] = + { + .effect = EFFECT_PARALYZE, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 75, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SLEEP_POWDER] = + { + .effect = EFFECT_SLEEP, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 75, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_PETAL_DANCE] = + { + .effect = EFFECT_RAMPAGE, + .power = 70, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_RANDOM, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_STRING_SHOT] = + { + .effect = EFFECT_SPEED_DOWN, + .power = 0, + .type = TYPE_BUG, + .accuracy = 95, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DRAGON_RAGE] = + { + .effect = EFFECT_DRAGON_RAGE, + .power = 1, + .type = TYPE_DRAGON, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_FIRE_SPIN] = + { + .effect = EFFECT_TRAP, + .power = 15, + .type = TYPE_FIRE, + .accuracy = 70, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_THUNDER_SHOCK] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 40, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_THUNDERBOLT] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 95, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_THUNDER_WAVE] = + { + .effect = EFFECT_PARALYZE, + .power = 0, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_THUNDER] = + { + .effect = EFFECT_THUNDER, + .power = 120, + .type = TYPE_ELECTRIC, + .accuracy = 70, + .pp = 10, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ROCK_THROW] = + { + .effect = EFFECT_HIT, + .power = 50, + .type = TYPE_ROCK, + .accuracy = 90, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_EARTHQUAKE] = + { + .effect = EFFECT_EARTHQUAKE, + .power = 100, + .type = TYPE_GROUND, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_FISSURE] = + { + .effect = EFFECT_OHKO, + .power = 1, + .type = TYPE_GROUND, + .accuracy = 30, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DIG] = + { + .effect = EFFECT_SEMI_INVULNERABLE, + .power = 60, + .type = TYPE_GROUND, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_TOXIC] = + { + .effect = EFFECT_TOXIC, + .power = 0, + .type = TYPE_POISON, + .accuracy = 85, + .pp = 10, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_CONFUSION] = + { + .effect = EFFECT_CONFUSE_HIT, + .power = 50, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_PSYCHIC] = + { + .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, + .power = 90, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_HYPNOSIS] = + { + .effect = EFFECT_SLEEP, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 60, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MEDITATE] = + { + .effect = EFFECT_ATTACK_UP, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_AGILITY] = + { + .effect = EFFECT_SPEED_UP_2, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_QUICK_ATTACK] = + { + .effect = EFFECT_QUICK_ATTACK, + .power = 40, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 1, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_RAGE] = + { + .effect = EFFECT_RAGE, + .power = 20, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_TELEPORT] = + { + .effect = EFFECT_TELEPORT, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_NIGHT_SHADE] = + { + .effect = EFFECT_LEVEL_DAMAGE, + .power = 1, + .type = TYPE_GHOST, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_MIMIC] = + { + .effect = EFFECT_MIMIC, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED, + }, + + [MOVE_SCREECH] = + { + .effect = EFFECT_DEFENSE_DOWN_2, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 85, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DOUBLE_TEAM] = + { + .effect = EFFECT_EVASION_UP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_RECOVER] = + { + .effect = EFFECT_RESTORE_HP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_HARDEN] = + { + .effect = EFFECT_DEFENSE_UP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_MINIMIZE] = + { + .effect = EFFECT_MINIMIZE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_SMOKESCREEN] = + { + .effect = EFFECT_ACCURACY_DOWN, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_CONFUSE_RAY] = + { + .effect = EFFECT_CONFUSE, + .power = 0, + .type = TYPE_GHOST, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_WITHDRAW] = + { + .effect = EFFECT_DEFENSE_UP, + .power = 0, + .type = TYPE_WATER, + .accuracy = 0, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_DEFENSE_CURL] = + { + .effect = EFFECT_DEFENSE_CURL, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_BARRIER] = + { + .effect = EFFECT_DEFENSE_UP_2, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_LIGHT_SCREEN] = + { + .effect = EFFECT_LIGHT_SCREEN, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_HAZE] = + { + .effect = EFFECT_HAZE, + .power = 0, + .type = TYPE_ICE, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED, + }, + + [MOVE_REFLECT] = + { + .effect = EFFECT_REFLECT, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_FOCUS_ENERGY] = + { + .effect = EFFECT_FOCUS_ENERGY, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_BIDE] = + { + .effect = EFFECT_BIDE, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_METRONOME] = + { + .effect = EFFECT_METRONOME, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = 0, + .flags = 0, + }, + + [MOVE_MIRROR_MOVE] = + { + .effect = EFFECT_MIRROR_MOVE, + .power = 0, + .type = TYPE_FLYING, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = 0, + .flags = 0, + }, + + [MOVE_SELF_DESTRUCT] = + { + .effect = EFFECT_EXPLOSION, + .power = 200, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_EGG_BOMB] = + { + .effect = EFFECT_HIT, + .power = 100, + .type = TYPE_NORMAL, + .accuracy = 75, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_LICK] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 20, + .type = TYPE_GHOST, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SMOG] = + { + .effect = EFFECT_POISON_HIT, + .power = 20, + .type = TYPE_POISON, + .accuracy = 70, + .pp = 20, + .secondaryEffectChance = 40, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SLUDGE] = + { + .effect = EFFECT_POISON_HIT, + .power = 65, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_BONE_CLUB] = + { + .effect = EFFECT_FLINCH_HIT, + .power = 65, + .type = TYPE_GROUND, + .accuracy = 85, + .pp = 20, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FIRE_BLAST] = + { + .effect = EFFECT_BURN_HIT, + .power = 120, + .type = TYPE_FIRE, + .accuracy = 85, + .pp = 5, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_WATERFALL] = + { + .effect = EFFECT_HIT, + .power = 80, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_CLAMP] = + { + .effect = EFFECT_TRAP, + .power = 35, + .type = TYPE_WATER, + .accuracy = 75, + .pp = 10, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SWIFT] = + { + .effect = EFFECT_ALWAYS_HIT, + .power = 60, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SKULL_BASH] = + { + .effect = EFFECT_SKULL_BASH, + .power = 100, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SPIKE_CANNON] = + { + .effect = EFFECT_MULTI_HIT, + .power = 20, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_CONSTRICT] = + { + .effect = EFFECT_SPEED_DOWN_HIT, + .power = 10, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 35, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_AMNESIA] = + { + .effect = EFFECT_SPECIAL_DEFENSE_UP_2, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_KINESIS] = + { + .effect = EFFECT_ACCURACY_DOWN, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 80, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SOFT_BOILED] = + { + .effect = EFFECT_SOFTBOILED, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_HI_JUMP_KICK] = + { + .effect = EFFECT_RECOIL_IF_MISS, + .power = 85, + .type = TYPE_FIGHTING, + .accuracy = 90, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_GLARE] = + { + .effect = EFFECT_PARALYZE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 75, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DREAM_EATER] = + { + .effect = EFFECT_DREAM_EATER, + .power = 100, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_POISON_GAS] = + { + .effect = EFFECT_POISON, + .power = 0, + .type = TYPE_POISON, + .accuracy = 55, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_BARRAGE] = + { + .effect = EFFECT_MULTI_HIT, + .power = 15, + .type = TYPE_NORMAL, + .accuracy = 85, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_LEECH_LIFE] = + { + .effect = EFFECT_ABSORB, + .power = 20, + .type = TYPE_BUG, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_LOVELY_KISS] = + { + .effect = EFFECT_SLEEP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 75, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SKY_ATTACK] = + { + .effect = EFFECT_SKY_ATTACK, + .power = 140, + .type = TYPE_FLYING, + .accuracy = 90, + .pp = 5, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_TRANSFORM] = + { + .effect = EFFECT_TRANSFORM, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = 0, + }, + + [MOVE_BUBBLE] = + { + .effect = EFFECT_SPEED_DOWN_HIT, + .power = 20, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DIZZY_PUNCH] = + { + .effect = EFFECT_CONFUSE_HIT, + .power = 70, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 20, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SPORE] = + { + .effect = EFFECT_SLEEP, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FLASH] = + { + .effect = EFFECT_ACCURACY_DOWN, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 70, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_PSYWAVE] = + { + .effect = EFFECT_PSYWAVE, + .power = 1, + .type = TYPE_PSYCHIC, + .accuracy = 80, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SPLASH] = + { + .effect = EFFECT_SPLASH, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_ACID_ARMOR] = + { + .effect = EFFECT_DEFENSE_UP_2, + .power = 0, + .type = TYPE_POISON, + .accuracy = 0, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_CRABHAMMER] = + { + .effect = EFFECT_HIGH_CRITICAL, + .power = 90, + .type = TYPE_WATER, + .accuracy = 85, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_EXPLOSION] = + { + .effect = EFFECT_EXPLOSION, + .power = 250, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_FURY_SWIPES] = + { + .effect = EFFECT_MULTI_HIT, + .power = 18, + .type = TYPE_NORMAL, + .accuracy = 80, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_BONEMERANG] = + { + .effect = EFFECT_DOUBLE_HIT, + .power = 50, + .type = TYPE_GROUND, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_REST] = + { + .effect = EFFECT_REST, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_ROCK_SLIDE] = + { + .effect = EFFECT_FLINCH_HIT, + .power = 75, + .type = TYPE_ROCK, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_HYPER_FANG] = + { + .effect = EFFECT_FLINCH_HIT, + .power = 80, + .type = TYPE_NORMAL, + .accuracy = 90, + .pp = 15, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SHARPEN] = + { + .effect = EFFECT_ATTACK_UP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_CONVERSION] = + { + .effect = EFFECT_CONVERSION, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_TRI_ATTACK] = + { + .effect = EFFECT_TRI_ATTACK, + .power = 80, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 20, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SUPER_FANG] = + { + .effect = EFFECT_SUPER_FANG, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SLASH] = + { + .effect = EFFECT_HIGH_CRITICAL, + .power = 70, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SUBSTITUTE] = + { + .effect = EFFECT_SUBSTITUTE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_STRUGGLE] = + { + .effect = EFFECT_RECOIL, + .power = 50, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 1, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SKETCH] = + { + .effect = EFFECT_SKETCH, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 1, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = 0, + }, + + [MOVE_TRIPLE_KICK] = + { + .effect = EFFECT_TRIPLE_KICK, + .power = 10, + .type = TYPE_FIGHTING, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_THIEF] = + { + .effect = EFFECT_THIEF, + .power = 40, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SPIDER_WEB] = + { + .effect = EFFECT_MEAN_LOOK, + .power = 0, + .type = TYPE_BUG, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MIND_READER] = + { + .effect = EFFECT_LOCK_ON, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_NIGHTMARE] = + { + .effect = EFFECT_NIGHTMARE, + .power = 0, + .type = TYPE_GHOST, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FLAME_WHEEL] = + { + .effect = EFFECT_THAW_HIT, + .power = 60, + .type = TYPE_FIRE, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SNORE] = + { + .effect = EFFECT_SNORE, + .power = 40, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_CURSE] = + { + .effect = EFFECT_CURSE, + .power = 0, + .type = TYPE_MYSTERY, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = 0, + }, + + [MOVE_FLAIL] = + { + .effect = EFFECT_FLAIL, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_CONVERSION_2] = + { + .effect = EFFECT_CONVERSION_2, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_AEROBLAST] = + { + .effect = EFFECT_HIGH_CRITICAL, + .power = 100, + .type = TYPE_FLYING, + .accuracy = 95, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_COTTON_SPORE] = + { + .effect = EFFECT_SPEED_DOWN_2, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 85, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_REVERSAL] = + { + .effect = EFFECT_FLAIL, + .power = 1, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SPITE] = + { + .effect = EFFECT_SPITE, + .power = 0, + .type = TYPE_GHOST, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_POWDER_SNOW] = + { + .effect = EFFECT_FREEZE_HIT, + .power = 40, + .type = TYPE_ICE, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_PROTECT] = + { + .effect = EFFECT_PROTECT, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 3, + .flags = 0, + }, + + [MOVE_MACH_PUNCH] = + { + .effect = EFFECT_QUICK_ATTACK, + .power = 40, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 1, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SCARY_FACE] = + { + .effect = EFFECT_SPEED_DOWN_2, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FAINT_ATTACK] = + { + .effect = EFFECT_ALWAYS_HIT, + .power = 60, + .type = TYPE_DARK, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SWEET_KISS] = + { + .effect = EFFECT_CONFUSE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 75, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_BELLY_DRUM] = + { + .effect = EFFECT_BELLY_DRUM, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_SLUDGE_BOMB] = + { + .effect = EFFECT_POISON_HIT, + .power = 90, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MUD_SLAP] = + { + .effect = EFFECT_ACCURACY_DOWN_HIT, + .power = 20, + .type = TYPE_GROUND, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_OCTAZOOKA] = + { + .effect = EFFECT_ACCURACY_DOWN_HIT, + .power = 65, + .type = TYPE_WATER, + .accuracy = 85, + .pp = 10, + .secondaryEffectChance = 50, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SPIKES] = + { + .effect = EFFECT_SPIKES, + .power = 0, + .type = TYPE_GROUND, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_OPPONENTS_FIELD, + .priority = 0, + .flags = 0, + }, + + [MOVE_ZAP_CANNON] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 100, + .type = TYPE_ELECTRIC, + .accuracy = 50, + .pp = 5, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FORESIGHT] = + { + .effect = EFFECT_FORESIGHT, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DESTINY_BOND] = + { + .effect = EFFECT_DESTINY_BOND, + .power = 0, + .type = TYPE_GHOST, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_PERISH_SONG] = + { + .effect = EFFECT_PERISH_SONG, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_ICY_WIND] = + { + .effect = EFFECT_SPEED_DOWN_HIT, + .power = 55, + .type = TYPE_ICE, + .accuracy = 95, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DETECT] = + { + .effect = EFFECT_PROTECT, + .power = 0, + .type = TYPE_FIGHTING, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 3, + .flags = 0, + }, + + [MOVE_BONE_RUSH] = + { + .effect = EFFECT_MULTI_HIT, + .power = 25, + .type = TYPE_GROUND, + .accuracy = 80, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_LOCK_ON] = + { + .effect = EFFECT_LOCK_ON, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_OUTRAGE] = + { + .effect = EFFECT_RAMPAGE, + .power = 90, + .type = TYPE_DRAGON, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_RANDOM, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SANDSTORM] = + { + .effect = EFFECT_SANDSTORM, + .power = 0, + .type = TYPE_ROCK, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_GIGA_DRAIN] = + { + .effect = EFFECT_ABSORB, + .power = 60, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ENDURE] = + { + .effect = EFFECT_ENDURE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 3, + .flags = 0, + }, + + [MOVE_CHARM] = + { + .effect = EFFECT_ATTACK_DOWN_2, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ROLLOUT] = + { + .effect = EFFECT_ROLLOUT, + .power = 30, + .type = TYPE_ROCK, + .accuracy = 90, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_FALSE_SWIPE] = + { + .effect = EFFECT_FALSE_SWIPE, + .power = 40, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SWAGGER] = + { + .effect = EFFECT_SWAGGER, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 90, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MILK_DRINK] = + { + .effect = EFFECT_SOFTBOILED, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_SNATCH_AFFECTED, + }, + + [MOVE_SPARK] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 65, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FURY_CUTTER] = + { + .effect = EFFECT_FURY_CUTTER, + .power = 10, + .type = TYPE_BUG, + .accuracy = 95, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_STEEL_WING] = + { + .effect = EFFECT_DEFENSE_UP_HIT, + .power = 70, + .type = TYPE_STEEL, + .accuracy = 90, + .pp = 25, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_MEAN_LOOK] = + { + .effect = EFFECT_MEAN_LOOK, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ATTRACT] = + { + .effect = EFFECT_ATTRACT, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SLEEP_TALK] = + { + .effect = EFFECT_SLEEP_TALK, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = 0, + .flags = 0, + }, + + [MOVE_HEAL_BELL] = + { + .effect = EFFECT_HEAL_BELL, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_RETURN] = + { + .effect = EFFECT_RETURN, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_PRESENT] = + { + .effect = EFFECT_PRESENT, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 90, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FRUSTRATION] = + { + .effect = EFFECT_FRUSTRATION, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SAFEGUARD] = + { + .effect = EFFECT_SAFEGUARD, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 25, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_PAIN_SPLIT] = + { + .effect = EFFECT_PAIN_SPLIT, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SACRED_FIRE] = + { + .effect = EFFECT_THAW_HIT, + .power = 100, + .type = TYPE_FIRE, + .accuracy = 95, + .pp = 5, + .secondaryEffectChance = 50, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MAGNITUDE] = + { + .effect = EFFECT_MAGNITUDE, + .power = 1, + .type = TYPE_GROUND, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_DYNAMIC_PUNCH] = + { + .effect = EFFECT_CONFUSE_HIT, + .power = 100, + .type = TYPE_FIGHTING, + .accuracy = 50, + .pp = 5, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MEGAHORN] = + { + .effect = EFFECT_HIT, + .power = 120, + .type = TYPE_BUG, + .accuracy = 85, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_DRAGON_BREATH] = + { + .effect = EFFECT_PARALYZE_HIT, + .power = 60, + .type = TYPE_DRAGON, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_BATON_PASS] = + { + .effect = EFFECT_BATON_PASS, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_ENCORE] = + { + .effect = EFFECT_ENCORE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_PURSUIT] = + { + .effect = EFFECT_PURSUIT, + .power = 40, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_RAPID_SPIN] = + { + .effect = EFFECT_RAPID_SPIN, + .power = 20, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SWEET_SCENT] = + { + .effect = EFFECT_EVASION_DOWN, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_IRON_TAIL] = + { + .effect = EFFECT_DEFENSE_DOWN_HIT, + .power = 100, + .type = TYPE_STEEL, + .accuracy = 75, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_METAL_CLAW] = + { + .effect = EFFECT_ATTACK_UP_HIT, + .power = 50, + .type = TYPE_STEEL, + .accuracy = 95, + .pp = 35, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_VITAL_THROW] = + { + .effect = EFFECT_VITAL_THROW, + .power = 70, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = -1, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_MORNING_SUN] = + { + .effect = EFFECT_MORNING_SUN, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_SYNTHESIS] = + { + .effect = EFFECT_SYNTHESIS, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_MOONLIGHT] = + { + .effect = EFFECT_MOONLIGHT, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_HIDDEN_POWER] = + { + .effect = EFFECT_HIDDEN_POWER, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_CROSS_CHOP] = + { + .effect = EFFECT_HIGH_CRITICAL, + .power = 100, + .type = TYPE_FIGHTING, + .accuracy = 80, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_TWISTER] = + { + .effect = EFFECT_TWISTER, + .power = 40, + .type = TYPE_DRAGON, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 20, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_RAIN_DANCE] = + { + .effect = EFFECT_RAIN_DANCE, + .power = 0, + .type = TYPE_WATER, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_SUNNY_DAY] = + { + .effect = EFFECT_SUNNY_DAY, + .power = 0, + .type = TYPE_FIRE, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_CRUNCH] = + { + .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, + .power = 80, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 20, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MIRROR_COAT] = + { + .effect = EFFECT_MIRROR_COAT, + .power = 1, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = -5, + .flags = FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_PSYCH_UP] = + { + .effect = EFFECT_PSYCH_UP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_EXTREME_SPEED] = + { + .effect = EFFECT_QUICK_ATTACK, + .power = 80, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 1, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ANCIENT_POWER] = + { + .effect = EFFECT_ALL_STATS_UP_HIT, + .power = 60, + .type = TYPE_ROCK, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SHADOW_BALL] = + { + .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, + .power = 80, + .type = TYPE_GHOST, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 20, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FUTURE_SIGHT] = + { + .effect = EFFECT_FUTURE_SIGHT, + .power = 80, + .type = TYPE_PSYCHIC, + .accuracy = 90, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = 0, + }, + + [MOVE_ROCK_SMASH] = + { + .effect = EFFECT_DEFENSE_DOWN_HIT, + .power = 20, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 50, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_WHIRLPOOL] = + { + .effect = EFFECT_TRAP, + .power = 15, + .type = TYPE_WATER, + .accuracy = 70, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_BEAT_UP] = + { + .effect = EFFECT_BEAT_UP, + .power = 10, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_FAKE_OUT] = + { + .effect = EFFECT_FAKE_OUT, + .power = 40, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 1, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_UPROAR] = + { + .effect = EFFECT_UPROAR, + .power = 50, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_RANDOM, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_STOCKPILE] = + { + .effect = EFFECT_STOCKPILE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_SPIT_UP] = + { + .effect = EFFECT_SPIT_UP, + .power = 100, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SWALLOW] = + { + .effect = EFFECT_SWALLOW, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_HEAT_WAVE] = + { + .effect = EFFECT_BURN_HIT, + .power = 100, + .type = TYPE_FIRE, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_HAIL] = + { + .effect = EFFECT_HAIL, + .power = 0, + .type = TYPE_ICE, + .accuracy = 0, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED, + }, + + [MOVE_TORMENT] = + { + .effect = EFFECT_TORMENT, + .power = 0, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FLATTER] = + { + .effect = EFFECT_FLATTER, + .power = 0, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_WILL_O_WISP] = + { + .effect = EFFECT_WILL_O_WISP, + .power = 0, + .type = TYPE_FIRE, + .accuracy = 75, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MEMENTO] = + { + .effect = EFFECT_MEMENTO, + .power = 0, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FACADE] = + { + .effect = EFFECT_FACADE, + .power = 70, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FOCUS_PUNCH] = + { + .effect = EFFECT_FOCUS_PUNCH, + .power = 150, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = -3, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED, + }, + + [MOVE_SMELLING_SALT] = + { + .effect = EFFECT_SMELLINGSALT, + .power = 60, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FOLLOW_ME] = + { + .effect = EFFECT_FOLLOW_ME, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 3, + .flags = 0, + }, + + [MOVE_NATURE_POWER] = + { + .effect = EFFECT_NATURE_POWER, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 95, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = 0, + .flags = 0, + }, + + [MOVE_CHARGE] = + { + .effect = EFFECT_CHARGE, + .power = 0, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_TAUNT] = + { + .effect = EFFECT_TAUNT, + .power = 0, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED, + }, + + [MOVE_HELPING_HAND] = + { + .effect = EFFECT_HELPING_HAND, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 5, + .flags = 0, + }, + + [MOVE_TRICK] = + { + .effect = EFFECT_TRICK, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ROLE_PLAY] = + { + .effect = EFFECT_ROLE_PLAY, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = 0, + }, + + [MOVE_WISH] = + { + .effect = EFFECT_WISH, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED, + }, + + [MOVE_ASSIST] = + { + .effect = EFFECT_ASSIST, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = 0, + .flags = 0, + }, + + [MOVE_INGRAIN] = + { + .effect = EFFECT_INGRAIN, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_SUPERPOWER] = + { + .effect = EFFECT_SUPERPOWER, + .power = 120, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MAGIC_COAT] = + { + .effect = EFFECT_MAGIC_COAT, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = 4, + .flags = 0, + }, + + [MOVE_RECYCLE] = + { + .effect = EFFECT_RECYCLE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_REVENGE] = + { + .effect = EFFECT_REVENGE, + .power = 60, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = -4, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_BRICK_BREAK] = + { + .effect = EFFECT_BRICK_BREAK, + .power = 75, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_YAWN] = + { + .effect = EFFECT_YAWN, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_KNOCK_OFF] = + { + .effect = EFFECT_KNOCK_OFF, + .power = 20, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ENDEAVOR] = + { + .effect = EFFECT_ENDEAVOR, + .power = 1, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ERUPTION] = + { + .effect = EFFECT_ERUPTION, + .power = 150, + .type = TYPE_FIRE, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SKILL_SWAP] = + { + .effect = EFFECT_SKILL_SWAP, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_IMPRISON] = + { + .effect = EFFECT_IMPRISON, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED, + }, + + [MOVE_REFRESH] = + { + .effect = EFFECT_REFRESH, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_GRUDGE] = + { + .effect = EFFECT_GRUDGE, + .power = 0, + .type = TYPE_GHOST, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SNATCH] = + { + .effect = EFFECT_SNATCH, + .power = 0, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_DEPENDS, + .priority = 4, + .flags = FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SECRET_POWER] = + { + .effect = EFFECT_SECRET_POWER, + .power = 70, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_DIVE] = + { + .effect = EFFECT_SEMI_INVULNERABLE, + .power = 60, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ARM_THRUST] = + { + .effect = EFFECT_MULTI_HIT, + .power = 15, + .type = TYPE_FIGHTING, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_CAMOUFLAGE] = + { + .effect = EFFECT_CAMOUFLAGE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_TAIL_GLOW] = + { + .effect = EFFECT_SPECIAL_ATTACK_UP_2, + .power = 0, + .type = TYPE_BUG, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_LUSTER_PURGE] = + { + .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT, + .power = 70, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 50, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MIST_BALL] = + { + .effect = EFFECT_SPECIAL_ATTACK_DOWN_HIT, + .power = 70, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 50, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_FEATHER_DANCE] = + { + .effect = EFFECT_ATTACK_DOWN_2, + .power = 0, + .type = TYPE_FLYING, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_TEETER_DANCE] = + { + .effect = EFFECT_TEETER_DANCE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_FOES_AND_ALLY, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED, + }, + + [MOVE_BLAZE_KICK] = + { + .effect = EFFECT_BLAZE_KICK, + .power = 85, + .type = TYPE_FIRE, + .accuracy = 90, + .pp = 10, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MUD_SPORT] = + { + .effect = EFFECT_MUD_SPORT, + .power = 0, + .type = TYPE_GROUND, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_ICE_BALL] = + { + .effect = EFFECT_ROLLOUT, + .power = 30, + .type = TYPE_ICE, + .accuracy = 90, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_NEEDLE_ARM] = + { + .effect = EFFECT_FLINCH_MINIMIZE_HIT, + .power = 60, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SLACK_OFF] = + { + .effect = EFFECT_RESTORE_HP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_HYPER_VOICE] = + { + .effect = EFFECT_HIT, + .power = 90, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_POISON_FANG] = + { + .effect = EFFECT_POISON_FANG, + .power = 50, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_CRUSH_CLAW] = + { + .effect = EFFECT_DEFENSE_DOWN_HIT, + .power = 75, + .type = TYPE_NORMAL, + .accuracy = 95, + .pp = 10, + .secondaryEffectChance = 50, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_BLAST_BURN] = + { + .effect = EFFECT_RECHARGE, + .power = 150, + .type = TYPE_FIRE, + .accuracy = 90, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_HYDRO_CANNON] = + { + .effect = EFFECT_RECHARGE, + .power = 150, + .type = TYPE_WATER, + .accuracy = 90, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_METEOR_MASH] = + { + .effect = EFFECT_ATTACK_UP_HIT, + .power = 100, + .type = TYPE_STEEL, + .accuracy = 85, + .pp = 10, + .secondaryEffectChance = 20, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ASTONISH] = + { + .effect = EFFECT_FLINCH_MINIMIZE_HIT, + .power = 30, + .type = TYPE_GHOST, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_WEATHER_BALL] = + { + .effect = EFFECT_WEATHER_BALL, + .power = 50, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_AROMATHERAPY] = + { + .effect = EFFECT_HEAL_BELL, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 0, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_FAKE_TEARS] = + { + .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, + .power = 0, + .type = TYPE_DARK, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_AIR_CUTTER] = + { + .effect = EFFECT_HIGH_CRITICAL, + .power = 55, + .type = TYPE_FLYING, + .accuracy = 95, + .pp = 25, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_OVERHEAT] = + { + .effect = EFFECT_OVERHEAT, + .power = 140, + .type = TYPE_FIRE, + .accuracy = 90, + .pp = 5, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ODOR_SLEUTH] = + { + .effect = EFFECT_FORESIGHT, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_ROCK_TOMB] = + { + .effect = EFFECT_SPEED_DOWN_HIT, + .power = 50, + .type = TYPE_ROCK, + .accuracy = 80, + .pp = 10, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SILVER_WIND] = + { + .effect = EFFECT_ALL_STATS_UP_HIT, + .power = 60, + .type = TYPE_BUG, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_METAL_SOUND] = + { + .effect = EFFECT_SPECIAL_DEFENSE_DOWN_2, + .power = 0, + .type = TYPE_STEEL, + .accuracy = 85, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_GRASS_WHISTLE] = + { + .effect = EFFECT_SLEEP, + .power = 0, + .type = TYPE_GRASS, + .accuracy = 55, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_TICKLE] = + { + .effect = EFFECT_TICKLE, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_COSMIC_POWER] = + { + .effect = EFFECT_COSMIC_POWER, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_WATER_SPOUT] = + { + .effect = EFFECT_ERUPTION, + .power = 150, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SIGNAL_BEAM] = + { + .effect = EFFECT_CONFUSE_HIT, + .power = 75, + .type = TYPE_BUG, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SHADOW_PUNCH] = + { + .effect = EFFECT_ALWAYS_HIT, + .power = 60, + .type = TYPE_GHOST, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_EXTRASENSORY] = + { + .effect = EFFECT_FLINCH_MINIMIZE_HIT, + .power = 80, + .type = TYPE_PSYCHIC, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_SKY_UPPERCUT] = + { + .effect = EFFECT_SKY_UPPERCUT, + .power = 85, + .type = TYPE_FIGHTING, + .accuracy = 90, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SAND_TOMB] = + { + .effect = EFFECT_TRAP, + .power = 15, + .type = TYPE_GROUND, + .accuracy = 70, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SHEER_COLD] = + { + .effect = EFFECT_OHKO, + .power = 1, + .type = TYPE_ICE, + .accuracy = 30, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_MUDDY_WATER] = + { + .effect = EFFECT_ACCURACY_DOWN_HIT, + .power = 95, + .type = TYPE_WATER, + .accuracy = 85, + .pp = 10, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_BOTH, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_BULLET_SEED] = + { + .effect = EFFECT_MULTI_HIT, + .power = 10, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_AERIAL_ACE] = + { + .effect = EFFECT_ALWAYS_HIT, + .power = 60, + .type = TYPE_FLYING, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_ICICLE_SPEAR] = + { + .effect = EFFECT_MULTI_HIT, + .power = 10, + .type = TYPE_ICE, + .accuracy = 100, + .pp = 30, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_IRON_DEFENSE] = + { + .effect = EFFECT_DEFENSE_UP_2, + .power = 0, + .type = TYPE_STEEL, + .accuracy = 0, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_BLOCK] = + { + .effect = EFFECT_MEAN_LOOK, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_HOWL] = + { + .effect = EFFECT_ATTACK_UP, + .power = 0, + .type = TYPE_NORMAL, + .accuracy = 0, + .pp = 40, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_DRAGON_CLAW] = + { + .effect = EFFECT_HIT, + .power = 80, + .type = TYPE_DRAGON, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_FRENZY_PLANT] = + { + .effect = EFFECT_RECHARGE, + .power = 150, + .type = TYPE_GRASS, + .accuracy = 90, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_BULK_UP] = + { + .effect = EFFECT_BULK_UP, + .power = 0, + .type = TYPE_FIGHTING, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_BOUNCE] = + { + .effect = EFFECT_SEMI_INVULNERABLE, + .power = 85, + .type = TYPE_FLYING, + .accuracy = 85, + .pp = 5, + .secondaryEffectChance = 30, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_MUD_SHOT] = + { + .effect = EFFECT_SPEED_DOWN_HIT, + .power = 55, + .type = TYPE_GROUND, + .accuracy = 95, + .pp = 15, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_POISON_TAIL] = + { + .effect = EFFECT_POISON_TAIL, + .power = 50, + .type = TYPE_POISON, + .accuracy = 100, + .pp = 25, + .secondaryEffectChance = 10, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_COVET] = + { + .effect = EFFECT_THIEF, + .power = 40, + .type = TYPE_NORMAL, + .accuracy = 100, + .pp = 40, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + }, + + [MOVE_VOLT_TACKLE] = + { + .effect = EFFECT_DOUBLE_EDGE, + .power = 120, + .type = TYPE_ELECTRIC, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_MAGICAL_LEAF] = + { + .effect = EFFECT_ALWAYS_HIT, + .power = 60, + .type = TYPE_GRASS, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_WATER_SPORT] = + { + .effect = EFFECT_WATER_SPORT, + .power = 0, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = 0, + }, + + [MOVE_CALM_MIND] = + { + .effect = EFFECT_CALM_MIND, + .power = 0, + .type = TYPE_PSYCHIC, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_LEAF_BLADE] = + { + .effect = EFFECT_HIGH_CRITICAL, + .power = 70, + .type = TYPE_GRASS, + .accuracy = 100, + .pp = 15, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_DRAGON_DANCE] = + { + .effect = EFFECT_DRAGON_DANCE, + .power = 0, + .type = TYPE_DRAGON, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_USER, + .priority = 0, + .flags = FLAG_SNATCH_AFFECTED, + }, + + [MOVE_ROCK_BLAST] = + { + .effect = EFFECT_MULTI_HIT, + .power = 25, + .type = TYPE_ROCK, + .accuracy = 80, + .pp = 10, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_SHOCK_WAVE] = + { + .effect = EFFECT_ALWAYS_HIT, + .power = 60, + .type = TYPE_ELECTRIC, + .accuracy = 0, + .pp = 20, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_WATER_PULSE] = + { + .effect = EFFECT_CONFUSE_HIT, + .power = 60, + .type = TYPE_WATER, + .accuracy = 100, + .pp = 20, + .secondaryEffectChance = 20, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, + + [MOVE_DOOM_DESIRE] = + { + .effect = EFFECT_FUTURE_SIGHT, + .power = 120, + .type = TYPE_STEEL, + .accuracy = 85, + .pp = 5, + .secondaryEffectChance = 0, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = 0, + }, + + [MOVE_PSYCHO_BOOST] = + { + .effect = EFFECT_OVERHEAT, + .power = 140, + .type = TYPE_PSYCHIC, + .accuracy = 90, + .pp = 5, + .secondaryEffectChance = 100, + .target = MOVE_TARGET_SELECTED, + .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + }, }; -- cgit v1.2.3 From c7dd347bb1fdb660414031e3c175bb6503dd8bbf Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 21:09:26 +0100 Subject: Match battle_tower.c function For some reason, I gave the function of type void, type u16 instead, which messed up the registers, LMAO --- src/battle_tower.c | 58 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/src/battle_tower.c b/src/battle_tower.c index 165b6bf64..f9dfcabd1 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -424,10 +424,9 @@ u16 sub_8162548(u8 challengeNum, u8 battleNum) return trainerId; } -#ifdef NONMATCHING -static u16 sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg3) // Unused +static void sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg3) // Unused { - register u16 trainerId, count; + u16 trainerId, count; if (challengeNum <= 7) { @@ -451,59 +450,6 @@ static u16 sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg *trainerIdPtr = trainerId; *arg3 = count; } -#else -NAKED -static u16 sub_81625B4(u8 challengeNum, u8 battleNum, u16 *trainerIdPtr, u8 *arg3) -{ - asm_unified(" push {r4,lr}\n\ - adds r4, r2, 0\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - adds r2, r0, 0\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - cmp r0, 0x7\n\ - bhi _081625F4\n\ - cmp r1, 0x6\n\ - bne _081625D4\n\ - ldr r1, =gUnknown_085DFA1A\n\ - lsls r2, r0, 2\n\ - b _081625D8\n\ - .pool\n\ -_081625D4:\n\ - ldr r1, =gUnknown_085DF9FA\n\ - lsls r2, 2\n\ -_081625D8:\n\ - adds r0, r1, 0x2\n\ - adds r0, r2, r0\n\ - adds r2, r1\n\ - ldrh r0, [r0]\n\ - ldrh r1, [r2]\n\ - subs r0, r1\n\ - adds r0, 0x1\n\ - lsls r0, 16\n\ - lsrs r1, r0, 16\n\ - ldrh r0, [r2]\n\ - b _08162604\n\ - .pool\n\ -_081625F4:\n\ - ldr r0, =gUnknown_085DF9FA\n\ - ldrh r1, [r0, 0x1E]\n\ - ldrh r2, [r0, 0x1C]\n\ - subs r1, r2\n\ - adds r1, 0x1\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - ldrh r0, [r0, 0x1C]\n\ -_08162604:\n\ - strh r0, [r4]\n\ - strb r1, [r3]\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ - .pool"); -} -#endif void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId) { -- cgit v1.2.3 From bac1f1b6c96a80ff3705a0497557b09c882a2186 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 3 Dec 2018 21:44:47 +0100 Subject: Match and clean rotating_gate.c One more down, many more to go. --- src/rotating_gate.c | 219 ++++++++-------------------------------------------- 1 file changed, 33 insertions(+), 186 deletions(-) diff --git a/src/rotating_gate.c b/src/rotating_gate.c index fcced6c8c..f617321af 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -2,10 +2,11 @@ #include "bike.h" #include "event_data.h" #include "event_object_movement.h" -#include "constants/maps.h" -#include "constants/songs.h" +#include "fieldmap.h" #include "sound.h" #include "sprite.h" +#include "constants/maps.h" +#include "constants/songs.h" #define ROTATING_GATE_TILE_TAG 0x1300 #define ROTATING_GATE_PUZZLE_MAX 12 @@ -638,9 +639,7 @@ static s32 GetCurrentMapRotatingGatePuzzleType(void) static void RotatingGate_ResetAllGateOrientations(void) { s32 i; - u8 *ptr; - - ptr = (u8 *)GetVarPointer(VAR_TEMP_0); + u8 *ptr = (u8 *)GetVarPointer(VAR_TEMP_0); for (i = 0; i < gRotatingGate_PuzzleCount; i++) { @@ -715,12 +714,10 @@ static void RotatingGate_CreateGatesWithinViewport(s16 deltaX, s16 deltaY) s16 y = gSaveBlock1Ptr->pos.y - 2; s16 y2 = gSaveBlock1Ptr->pos.y + 0xe; - s16 x3, y3; - for (i = 0; i < gRotatingGate_PuzzleCount; i++) { - x3 = gRotatingGate_PuzzleConfig[i].x + 7; - y3 = gRotatingGate_PuzzleConfig[i].y + 7; + s16 x3 = gRotatingGate_PuzzleConfig[i].x + 7; + s16 y3 = gRotatingGate_PuzzleConfig[i].y + 7; if (y <= y3 && y2 >= y3 && x <= x3 && x2 >= x3 && gRotatingGate_GateSpriteIds[i] == MAX_SPRITES) @@ -734,11 +731,10 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY) { struct Sprite *sprite; struct SpriteTemplate template; - const struct RotatingGatePuzzle *gate; u8 spriteId; s16 x, y; - gate = &gRotatingGate_PuzzleConfig[gateId]; + const struct RotatingGatePuzzle *gate = &gRotatingGate_PuzzleConfig[gateId]; if (gate->shape == GATE_SHAPE_L1 || gate->shape == GATE_SHAPE_T1) template = sSpriteTemplate_RotatingGateRegular; @@ -767,12 +763,9 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY) static void SpriteCallback_RotatingGate(struct Sprite *sprite) { - u8 rotationDirection; - u8 orientation; u8 affineAnimation; - - rotationDirection = sprite->data[1]; - orientation = sprite->data[2]; + u8 rotationDirection = sprite->data[1]; + u8 orientation = sprite->data[2]; RotatingGate_HideGatesOutsideViewport(sprite); @@ -802,10 +795,8 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) static void RotatingGate_HideGatesOutsideViewport(struct Sprite *sprite) { - u16 x; - s16 x2; - u16 y; - s16 y2; + u16 x, y; + s16 x2, y2; sprite->invisible = FALSE; x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; @@ -830,35 +821,27 @@ static void LoadRotatingGatePics(void) LoadSpriteSheets(sRotatingGatesGraphicsTable); } -/* -static*/ void RotatingGate_DestroyGatesOutsideViewport(void) +static void RotatingGate_DestroyGatesOutsideViewport(void) { - s16 x; - s16 x2; - s16 y; - s16 y2; - s16 xGate; - s16 yGate; s32 i; - struct Sprite *sprite; // Same as RotatingGate_CreateGatesWithinViewport - x = gSaveBlock1Ptr->pos.x - 2; - x2 = gSaveBlock1Ptr->pos.x + 0x11; - y = gSaveBlock1Ptr->pos.y - 2; - y2 = gSaveBlock1Ptr->pos.y + 0xe; + s16 x = gSaveBlock1Ptr->pos.x - 2; + s16 x2 = gSaveBlock1Ptr->pos.x + 0x11; + s16 y = gSaveBlock1Ptr->pos.y - 2; + s16 y2 = gSaveBlock1Ptr->pos.y + 0xe; for (i = 0; i < gRotatingGate_PuzzleCount; i++) { - xGate = gRotatingGate_PuzzleConfig[i].x + 7; - yGate = gRotatingGate_PuzzleConfig[i].y + 7; + s16 xGate = gRotatingGate_PuzzleConfig[i].x + 7; + s16 yGate = gRotatingGate_PuzzleConfig[i].y + 7; if (gRotatingGate_GateSpriteIds[i] == MAX_SPRITES) continue; if (xGate < x || xGate > x2 || yGate < y || yGate > y2) { - sprite = &gSprites[gRotatingGate_GateSpriteIds[i]]; + struct Sprite *sprite = &gSprites[gRotatingGate_GateSpriteIds[i]]; FreeSpriteOamMatrix(sprite); DestroySprite(sprite); gRotatingGate_GateSpriteIds[i] = MAX_SPRITES; @@ -866,23 +849,13 @@ static*/ void RotatingGate_DestroyGatesOutsideViewport(void) } } - -#ifdef NONMATCHING -bool8 MapGridIsImpassableAt(s32, s32); //fool the compiler - -static s32 RotatingGate_CanRotate(u8 gateId, s16 rotationDirection) +static s32 RotatingGate_CanRotate(u8 gateId, s32 rotationDirection) { const struct Coords8 *armPos; u8 orientation; - s16 x; - s16 y; + s16 x, y; u8 shape; - u32 shape8; - s32 i; - s32 j; - s32 armOrientation; - const u8 *gateArmCollisionData; - u8 armIndex; + s32 i, j; if (rotationDirection == ROTATE_ANTICLOCKWISE) armPos = sRotatingGate_ArmPositionsAntiClockwiseRotation; @@ -897,166 +870,40 @@ static s32 RotatingGate_CanRotate(u8 gateId, s16 rotationDirection) x = gRotatingGate_PuzzleConfig[gateId].x + 7; y = gRotatingGate_PuzzleConfig[gateId].y + 7; - // Loop through the gate's "arms" clockwise (north, south, east, west) - for (i = GATE_ARM_NORTH, shape8 = shape* 4*2 ; i <= GATE_ARM_WEST; i++) + for (i = GATE_ARM_NORTH ; i <= GATE_ARM_WEST; i++) { // Ensure that no part of the arm collides with the map - for (j = 0, armOrientation = orientation + i, gateArmCollisionData = (u8 *)((u32)sRotatingGate_ArmLayout + shape8 + 2*i); j < GATE_ARM_MAX_LENGTH; j++) + for (j = 0; j < GATE_ARM_MAX_LENGTH; j++) { - armIndex = 2 * (armOrientation % 4) + j; + u8 armIndex = 2 * ((orientation + i) % 4) + j; - if (*gateArmCollisionData) + if (sRotatingGate_ArmLayout[shape][2 * i + j]) { - if (MapGridIsImpassableAt(x + armPos[armIndex].deltaX, y + armPos[armIndex].deltaY) == TRUE) + if (MapGridIsImpassableAt(x + armPos[armIndex].x, y + armPos[armIndex].y) == TRUE) return FALSE; } - gateArmCollisionData++; } } return TRUE; } -#else -NAKED -static s32 RotatingGate_CanRotate(u8 a, s16 rotationDirection) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0xC\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - cmp r1, 0x1\n\ - bne _080FBCFC\n\ - ldr r0, =sRotatingGate_ArmPositionsAntiClockwiseRotation\n\ - mov r10, r0\n\ - b _080FBD08\n\ - .pool\n\ -_080FBCFC:\n\ - cmp r1, 0x2\n\ - beq _080FBD04\n\ -_080FBD00:\n\ - movs r0, 0\n\ - b _080FBD98\n\ -_080FBD04:\n\ - ldr r1, =sRotatingGate_ArmPositionsClockwiseRotation\n\ - mov r10, r1\n\ -_080FBD08:\n\ - adds r0, r4, 0\n\ - bl RotatingGate_GetGateOrientation\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - str r0, [sp]\n\ - ldr r0, =gRotatingGate_PuzzleConfig\n\ - ldr r1, [r0]\n\ - lsls r0, r4, 3\n\ - adds r0, r1\n\ - ldrb r2, [r0, 0x4]\n\ - ldrh r1, [r0]\n\ - adds r1, 0x7\n\ - ldrh r0, [r0, 0x2]\n\ - adds r0, 0x7\n\ - movs r3, 0\n\ - lsls r2, 3\n\ - str r2, [sp, 0x4]\n\ - lsls r1, 16\n\ - asrs r1, 16\n\ - mov r9, r1\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - mov r8, r0\n\ -_080FBD38:\n\ - movs r6, 0\n\ - ldr r2, [sp]\n\ - adds r7, r2, r3\n\ - lsls r0, r3, 1\n\ - adds r5, r7, 0\n\ - ldr r1, [sp, 0x4]\n\ - adds r0, r1\n\ - ldr r2, =sRotatingGate_ArmLayout\n\ - adds r4, r0, r2\n\ -_080FBD4A:\n\ - adds r0, r5, 0\n\ - cmp r5, 0\n\ - bge _080FBD52\n\ - adds r0, r7, 0x3\n\ -_080FBD52:\n\ - asrs r0, 2\n\ - lsls r0, 2\n\ - subs r0, r5, r0\n\ - lsls r0, 1\n\ - adds r0, r6\n\ - lsls r0, 24\n\ - lsrs r1, r0, 24\n\ - ldrb r0, [r4]\n\ - cmp r0, 0\n\ - beq _080FBD88\n\ - lsls r1, 2\n\ - add r1, r10\n\ - movs r0, 0\n\ - ldrsb r0, [r1, r0]\n\ - add r0, r9\n\ - ldrb r1, [r1, 0x1]\n\ - lsls r1, 24\n\ - asrs r1, 24\n\ - add r1, r8\n\ - str r3, [sp, 0x8]\n\ - bl MapGridIsImpassableAt\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - ldr r3, [sp, 0x8]\n\ - cmp r0, 0x1\n\ - beq _080FBD00\n\ -_080FBD88:\n\ - adds r4, 0x1\n\ - adds r6, 0x1\n\ - cmp r6, 0x1\n\ - ble _080FBD4A\n\ - adds r3, 0x1\n\ - cmp r3, 0x3\n\ - ble _080FBD38\n\ - movs r0, 0x1\n\ -_080FBD98:\n\ - add sp, 0xC\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .pool\n\ -.syntax divided\n"); -} -#endif - static s32 RotatingGate_HasArm(u8 gateId, u8 armInfo) { - s32 isLongArm; - s8 armOrientation; - s32 arm; - s32 shape; - - arm = armInfo >> 1; - isLongArm = armInfo & 1; + s32 arm = armInfo / 2; + s32 isLongArm = armInfo % 2; - armOrientation = (arm - RotatingGate_GetGateOrientation(gateId) + 4) % 4; - shape = gRotatingGate_PuzzleConfig[gateId].shape; + s8 armOrientation = (arm - RotatingGate_GetGateOrientation(gateId) + 4) % 4; + s32 shape = gRotatingGate_PuzzleConfig[gateId].shape; return sRotatingGate_ArmLayout[shape][armOrientation * 2 + isLongArm]; } static void RotatingGate_TriggerRotationAnimation(u8 gateId, s32 rotationDirection) { - struct Sprite *sprite; - if (gRotatingGate_GateSpriteIds[gateId] != MAX_SPRITES) { - sprite = &gSprites[gRotatingGate_GateSpriteIds[gateId]]; + struct Sprite *sprite = &gSprites[gRotatingGate_GateSpriteIds[gateId]]; sprite->data[1] = rotationDirection; sprite->data[2] = RotatingGate_GetGateOrientation(gateId); } @@ -1064,7 +911,7 @@ static void RotatingGate_TriggerRotationAnimation(u8 gateId, s32 rotationDirecti static u8 RotatingGate_GetRotationInfo(u8 direction, s16 x, s16 y) { - register const u8 *ptr; + const u8 *ptr; if (direction == DIR_NORTH) ptr = sRotatingGate_RotationInfoNorth; -- cgit v1.2.3 From d6a88e0eaa7d74f187fb27f8a376203f40537340 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 3 Dec 2018 16:39:51 -0500 Subject: remove frontier asm constants to fix build --- constants/constants.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/constants/constants.inc b/constants/constants.inc index 27d554ad0..38887dd28 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -2,6 +2,5 @@ .include "constants/misc_constants.inc" .include "constants/contest_constants.inc" .include "constants/pokemon_data_constants.inc" - .include "constants/battle_frontier_constants.inc" .include "constants/berry_constants.inc" .include "constants/contest_move_effects.inc" -- cgit v1.2.3 From e69cb6b2767d1b4ae9b73eba9aeb9496b25be4d9 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 3 Dec 2018 17:21:34 -0500 Subject: update frontier class names --- src/data/battle_frontier/battle_tent.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h index d96f8935e..9a1539772 100644 --- a/src/data/battle_frontier/battle_tent.h +++ b/src/data/battle_frontier/battle_tent.h @@ -527,7 +527,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Malachi }, [2] = { - .facilityClass = FACILITY_CLASS_TUBER_1, + .facilityClass = FACILITY_CLASS_TUBER_F, .trainerName = _("KELSIE"), .speechBefore = {EC_WORD_GO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, .speechWin = {EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL}, @@ -535,7 +535,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Kelsie }, [3] = { - .facilityClass = FACILITY_CLASS_TUBER_2, + .facilityClass = FACILITY_CLASS_TUBER_M, .trainerName = _("DAVON"), .speechBefore = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_GREAT, EC_MOVE(WHIRLPOOL), EC_WORD_ISN_T_IT_QUES}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_LIKE, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL}, @@ -639,7 +639,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Rebecca }, [16] = { - .facilityClass = FACILITY_CLASS_POKEFAN_1, + .facilityClass = FACILITY_CLASS_POKEFAN_M, .trainerName = _("REGGIE"), .speechBefore = {EC_WORD_POKEMON, EC_WORD_COME, EC_WORD_BEFORE, EC_WORD_MONEY, EC_WORD_OR, EC_WORD_FAMILY}, .speechWin = {EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_STRONG}, @@ -647,7 +647,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Reggie }, [17] = { - .facilityClass = FACILITY_CLASS_POKEFAN_2, + .facilityClass = FACILITY_CLASS_POKEFAN_F, .trainerName = _("JANAE"), .speechBefore = {EC_WORD_I, EC_WORD_JUST, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_TOUGH, EC_WORD_LOOK}, .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_YOU, EC_MOVE2(STRUGGLE), -1}, @@ -663,7 +663,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = .monSets = gSlateportBattleTentTrainerMons_Caiden }, [19] = { - .facilityClass = FACILITY_CLASS_EXPERT_2, + .facilityClass = FACILITY_CLASS_EXPERT_F, .trainerName = _("KIRSTEN"), .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_YOU, EC_WORD_SAID, EC_WORD_QUES}, .speechWin = {EC_WORD_HUH_QUES, EC_WORD_STRONG, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH}, @@ -1580,7 +1580,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Dilan }, [2] = { - .facilityClass = FACILITY_CLASS_TUBER_1, + .facilityClass = FACILITY_CLASS_TUBER_F, .trainerName = _("ELIANA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_ON, EC_WORD_A, EC_WORD_VACATION, EC_WORD_SOON}, .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_GET, EC_WORD_SOME, EC_WORD_MONEY}, @@ -1588,7 +1588,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Eliana }, [3] = { - .facilityClass = FACILITY_CLASS_TUBER_2, + .facilityClass = FACILITY_CLASS_TUBER_M, .trainerName = _("MARKUS"), .speechBefore = {EC_WORD_I_AM, EC_WORD_SMART, EC_WORD_EXCL, EC_WORD_IF_I_LOSE, EC_WORD_I, EC_MOVE(SELF_DESTRUCT)}, .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_NON_STOP, EC_MOVE2(EXPLOSION), EC_WORD_OF, EC_WORD_JOY}, @@ -1692,7 +1692,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Ashlyn }, [16] = { - .facilityClass = FACILITY_CLASS_POKEFAN_1, + .facilityClass = FACILITY_CLASS_POKEFAN_M, .trainerName = _("ADDISON"), .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL}, .speechWin = {EC_WORD_WELL, EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_EASY, EC_WORD_QUES, -1}, @@ -1700,7 +1700,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Addison }, [17] = { - .facilityClass = FACILITY_CLASS_POKEFAN_2, + .facilityClass = FACILITY_CLASS_POKEFAN_F, .trainerName = _("JUSTINE"), .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_I_AM, EC_WORD_READY}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_EXCL}, @@ -1716,7 +1716,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = .monSets = gVerdanturfBattleTentTrainerMons_Tyson }, [19] = { - .facilityClass = FACILITY_CLASS_EXPERT_2, + .facilityClass = FACILITY_CLASS_EXPERT_F, .trainerName = _("LAILA"), .speechBefore = {EC_WORD_A, EC_MOVE2(STRUGGLE), EC_WORD_ISN_T, EC_WORD_VERY, EC_WORD_COOL, -1}, .speechWin = {EC_WORD_NOPE, EC_WORD_NOT_VERY, EC_WORD_COOL, EC_WORD_AT, EC_WORD_ALL, EC_WORD_EXCL}, @@ -2461,7 +2461,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Javier }, [2] = { - .facilityClass = FACILITY_CLASS_TUBER_1, + .facilityClass = FACILITY_CLASS_TUBER_F, .trainerName = _("NATALIE"), .speechBefore = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_WEIRD}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_THIS, EC_WORD_PLACE}, @@ -2469,7 +2469,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Natalie }, [3] = { - .facilityClass = FACILITY_CLASS_TUBER_2, + .facilityClass = FACILITY_CLASS_TUBER_M, .trainerName = _("TREVE"), .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE2(METRONOME), EC_WORD_AND, EC_WORD_SLEEP}, .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_MOVE(HYPNOSIS), EC_WORD_IS, EC_WORD_TOTALLY, EC_WORD_GREAT}, @@ -2573,7 +2573,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Mariana }, [16] = { - .facilityClass = FACILITY_CLASS_POKEFAN_1, + .facilityClass = FACILITY_CLASS_POKEFAN_M, .trainerName = _("SHELDON"), .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_TEACHER, EC_WORD_GETS, EC_WORD_NO, EC_MOVE2(REST)}, .speechWin = {EC_WORD_MY, EC_WORD_SMARTNESS, EC_WORD_GETS, EC_WORD_ME, EC_WORD_EASY, EC_WORD_WINS}, @@ -2581,7 +2581,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Sheldon }, [17] = { - .facilityClass = FACILITY_CLASS_POKEFAN_2, + .facilityClass = FACILITY_CLASS_POKEFAN_F, .trainerName = _("GIANNA"), .speechBefore = {EC_WORD_AHAHA, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_LOVEY_DOVEY, EC_WORD_POKEMON, EC_WORD_WORLD}, .speechWin = {EC_WORD_MY, EC_WORD_SHINE, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_THINGS, EC_WORD_BETTER}, @@ -2597,7 +2597,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = .monSets = gFallarborBattleTentTrainerMons_Yahir }, [19] = { - .facilityClass = FACILITY_CLASS_EXPERT_2, + .facilityClass = FACILITY_CLASS_EXPERT_F, .trainerName = _("BRITNEY"), .speechBefore = {EC_WORD_IT, EC_WORD_SEEMS, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_GOOD}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LUKEWARM, EC_WORD_TALENT, EC_WORD_AT, EC_WORD_BEST}, -- cgit v1.2.3 From 80c3258504b2736f9db113a90462c0e09b0b1078 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 4 Dec 2018 12:09:35 -0500 Subject: finish battle tower data except sRubyFacilityClassToEmerald --- .../battle_frontier/battle_frontier_held_items.inc | 65 - data/battle_frontier/battle_frontier_mons.inc | 6177 -------- .../battle_frontier_trainer_mons.inc | 14630 ------------------ data/battle_frontier/battle_frontier_trainers.inc | 7801 ---------- data/battle_tower.s | 50 - include/battle_tower.h | 5 - ld_script.txt | 1 - src/battle_tower.c | 198 +- src/data/battle_frontier/battle_frontier_mons.h | 6177 ++++++++ .../battle_frontier/battle_frontier_trainer_mons.h | 15229 +++++++++++++++++++ .../battle_frontier/battle_frontier_trainers.h | 2403 +++ src/data/battle_frontier/battle_tent.h | 1 - 12 files changed, 23995 insertions(+), 28742 deletions(-) delete mode 100644 data/battle_frontier/battle_frontier_held_items.inc delete mode 100644 data/battle_frontier/battle_frontier_mons.inc delete mode 100644 data/battle_frontier/battle_frontier_trainer_mons.inc delete mode 100644 data/battle_frontier/battle_frontier_trainers.inc delete mode 100644 data/battle_tower.s create mode 100644 src/data/battle_frontier/battle_frontier_mons.h create mode 100644 src/data/battle_frontier/battle_frontier_trainer_mons.h create mode 100644 src/data/battle_frontier/battle_frontier_trainers.h diff --git a/data/battle_frontier/battle_frontier_held_items.inc b/data/battle_frontier/battle_frontier_held_items.inc deleted file mode 100644 index a8a7a797a..000000000 --- a/data/battle_frontier/battle_frontier_held_items.inc +++ /dev/null @@ -1,65 +0,0 @@ - .align 2 -gBattleFrontierHeldItems:: @ 85CECB0 - .2byte ITEM_NONE - .2byte ITEM_KINGS_ROCK - .2byte ITEM_SITRUS_BERRY - .2byte ITEM_ORAN_BERRY - .2byte ITEM_CHESTO_BERRY - .2byte ITEM_HARD_STONE - .2byte ITEM_FOCUS_BAND - .2byte ITEM_PERSIM_BERRY - .2byte ITEM_MIRACLE_SEED - .2byte ITEM_BERRY_JUICE - .2byte ITEM_MACHO_BRACE - .2byte ITEM_SILVER_POWDER - .2byte ITEM_CHERI_BERRY - .2byte ITEM_BLACK_GLASSES - .2byte ITEM_BLACK_BELT - .2byte ITEM_SOUL_DEW - .2byte ITEM_CHOICE_BAND - .2byte ITEM_MAGNET - .2byte ITEM_SILK_SCARF - .2byte ITEM_WHITE_HERB - .2byte ITEM_DEEP_SEA_SCALE - .2byte ITEM_DEEP_SEA_TOOTH - .2byte ITEM_MYSTIC_WATER - .2byte ITEM_SHARP_BEAK - .2byte ITEM_QUICK_CLAW - .2byte ITEM_LEFTOVERS - .2byte ITEM_RAWST_BERRY - .2byte ITEM_LIGHT_BALL - .2byte ITEM_POISON_BARB - .2byte ITEM_NEVER_MELT_ICE - .2byte ITEM_ASPEAR_BERRY - .2byte ITEM_SPELL_TAG - .2byte ITEM_BRIGHT_POWDER - .2byte ITEM_LEPPA_BERRY - .2byte ITEM_SCOPE_LENS - .2byte ITEM_TWISTED_SPOON - .2byte ITEM_METAL_COAT - .2byte ITEM_MENTAL_HERB - .2byte ITEM_CHARCOAL - .2byte ITEM_PECHA_BERRY - .2byte ITEM_SOFT_SAND - .2byte ITEM_LUM_BERRY - .2byte ITEM_DRAGON_SCALE - .2byte ITEM_DRAGON_FANG - .2byte ITEM_IAPAPA_BERRY - .2byte ITEM_WIKI_BERRY - .2byte ITEM_SEA_INCENSE - .2byte ITEM_SHELL_BELL - .2byte ITEM_SALAC_BERRY - .2byte ITEM_LANSAT_BERRY - .2byte ITEM_APICOT_BERRY - .2byte ITEM_STARF_BERRY - .2byte ITEM_LIECHI_BERRY - .2byte ITEM_STICK - .2byte ITEM_LAX_INCENSE - .2byte ITEM_AGUAV_BERRY - .2byte ITEM_FIGY_BERRY - .2byte ITEM_THICK_CLUB - .2byte ITEM_MAGO_BERRY - .2byte ITEM_METAL_POWDER - .2byte ITEM_PETAYA_BERRY - .2byte ITEM_LUCKY_PUNCH - .2byte ITEM_GANLON_BERRY diff --git a/data/battle_frontier/battle_frontier_mons.inc b/data/battle_frontier/battle_frontier_mons.inc deleted file mode 100644 index f81032bcb..000000000 --- a/data/battle_frontier/battle_frontier_mons.inc +++ /dev/null @@ -1,6177 +0,0 @@ -#include "constants/battle_frontier.h" - - .align 2 -gBattleFrontierMons:: @ 85D97BC -@ 0 - .2byte SPECIES_SUNKERN - .2byte MOVE_MEGA_DRAIN, MOVE_HELPING_HAND, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 1 - .2byte SPECIES_AZURILL - .2byte MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RASH - -@ 2 - .2byte SPECIES_CATERPIE - .2byte MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 3 - .2byte SPECIES_WEEDLE - .2byte MOVE_POISON_STING, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 4 - .2byte SPECIES_WURMPLE - .2byte MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_POISON_STING, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 5 - .2byte SPECIES_RALTS - .2byte MOVE_CONFUSION, MOVE_IMPRISON, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 6 - .2byte SPECIES_MAGIKARP - .2byte MOVE_FLAIL, MOVE_NONE, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 7 - .2byte SPECIES_FEEBAS - .2byte MOVE_FLAIL, MOVE_MIRROR_COAT, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 8 - .2byte SPECIES_METAPOD - .2byte MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BASHFUL - -@ 9 - .2byte SPECIES_KAKUNA - .2byte MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BASHFUL - -@ 10 - .2byte SPECIES_PICHU - .2byte MOVE_SWEET_KISS, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_SHOCK_WAVE - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RASH - -@ 11 - .2byte SPECIES_SILCOON - .2byte MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BASHFUL - -@ 12 - .2byte SPECIES_CASCOON - .2byte MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BASHFUL - -@ 13 - .2byte SPECIES_IGGLYBUFF - .2byte MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_SEISMIC_TOSS - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 14 - .2byte SPECIES_WOOPER - .2byte MOVE_YAWN, MOVE_DIG, MOVE_WATER_PULSE, MOVE_RAIN_DANCE - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 15 - .2byte SPECIES_TYROGUE - .2byte MOVE_MACH_PUNCH, MOVE_PROTECT, MOVE_DOUBLE_TEAM, MOVE_FACADE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 16 - .2byte SPECIES_SENTRET - .2byte MOVE_QUICK_ATTACK, MOVE_FOLLOW_ME, MOVE_HELPING_HAND, MOVE_ASSIST - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 17 - .2byte SPECIES_CLEFFA - .2byte MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_METRONOME - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SERIOUS - -@ 18 - .2byte SPECIES_SEEDOT - .2byte MOVE_BULLET_SEED, MOVE_BIDE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 19 - .2byte SPECIES_LOTAD - .2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_SUNNY_DAY, MOVE_MEGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 20 - .2byte SPECIES_POOCHYENA - .2byte MOVE_CRUNCH, MOVE_SWAGGER, MOVE_ROAR, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 21 - .2byte SPECIES_SHEDINJA - .2byte MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_SILVER_WIND, MOVE_GRUDGE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_NAIVE - -@ 22 - .2byte SPECIES_MAKUHITA - .2byte MOVE_FAKE_OUT, MOVE_SEISMIC_TOSS, MOVE_DETECT, MOVE_WHIRLWIND - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 23 - .2byte SPECIES_WHISMUR - .2byte MOVE_UPROAR, MOVE_SWAGGER, MOVE_BODY_SLAM, MOVE_SMELLING_SALT - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 24 - .2byte SPECIES_ZIGZAGOON - .2byte MOVE_HEADBUTT, MOVE_PIN_MISSILE, MOVE_SWIFT, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_TIMID - -@ 25 - .2byte SPECIES_ZUBAT - .2byte MOVE_POISON_FANG, MOVE_WHIRLWIND, MOVE_CONFUSE_RAY, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 26 - .2byte SPECIES_TOGEPI - .2byte MOVE_RETURN, MOVE_YAWN, MOVE_WISH, MOVE_SWEET_KISS - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 27 - .2byte SPECIES_SPINARAK - .2byte MOVE_SIGNAL_BEAM, MOVE_NIGHT_SHADE, MOVE_SPIDER_WEB, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 28 - .2byte SPECIES_MARILL - .2byte MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_LIGHT_SCREEN, MOVE_RETURN - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_GENTLE - -@ 29 - .2byte SPECIES_HOPPIP - .2byte MOVE_MEGA_DRAIN, MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_STUN_SPORE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_LAX - -@ 30 - .2byte SPECIES_SLUGMA - .2byte MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_YAWN, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 31 - .2byte SPECIES_SWINUB - .2byte MOVE_ICY_WIND, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_GENTLE - -@ 32 - .2byte SPECIES_SMEARGLE - .2byte MOVE_EXTREME_SPEED, MOVE_FAKE_OUT, MOVE_QUICK_ATTACK, MOVE_MACH_PUNCH - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 33 - .2byte SPECIES_PIDGEY - .2byte MOVE_GUST, MOVE_SAND_ATTACK, MOVE_WHIRLWIND, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_SHARP_BEAK - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 34 - .2byte SPECIES_RATTATA - .2byte MOVE_HYPER_FANG, MOVE_PURSUIT, MOVE_QUICK_ATTACK, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 35 - .2byte SPECIES_WYNAUT - .2byte MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_JOLLY - -@ 36 - .2byte SPECIES_SKITTY - .2byte MOVE_SING, MOVE_ATTRACT, MOVE_CHARM, MOVE_DOUBLE_SLAP - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 37 - .2byte SPECIES_SPEAROW - .2byte MOVE_FURY_ATTACK, MOVE_PURSUIT, MOVE_MIRROR_MOVE, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 38 - .2byte SPECIES_HOOTHOOT - .2byte MOVE_CONFUSION, MOVE_HYPNOSIS, MOVE_SUPERSONIC, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 39 - .2byte SPECIES_DIGLETT - .2byte MOVE_MAGNITUDE, MOVE_SLASH, MOVE_ROCK_TOMB, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_NAIVE - -@ 40 - .2byte SPECIES_LEDYBA - .2byte MOVE_PSYBEAM, MOVE_AGILITY, MOVE_BATON_PASS, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BASHFUL - -@ 41 - .2byte SPECIES_NINCADA - .2byte MOVE_MUD_SLAP, MOVE_DIG, MOVE_TOXIC, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 42 - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE_BEAM, MOVE_RAIN_DANCE, MOVE_SWEET_SCENT, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 43 - .2byte SPECIES_JIGGLYPUFF - .2byte MOVE_SING, MOVE_WISH, MOVE_MIMIC, MOVE_DOUBLE_SLAP - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 44 - .2byte SPECIES_TAILLOW - .2byte MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_ENDEAVOR, MOVE_FOCUS_ENERGY - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_GENTLE - -@ 45 - .2byte SPECIES_WINGULL - .2byte MOVE_WATER_PULSE, MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_STEEL_WING - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 46 - .2byte SPECIES_NIDORAN_M - .2byte MOVE_DOUBLE_KICK, MOVE_POISON_STING, MOVE_DISABLE, MOVE_HELPING_HAND - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 47 - .2byte SPECIES_NIDORAN_F - .2byte MOVE_CRUNCH, MOVE_DOUBLE_KICK, MOVE_FLATTER, MOVE_HELPING_HAND - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 48 - .2byte SPECIES_KIRLIA - .2byte MOVE_CONFUSION, MOVE_WILL_O_WISP, MOVE_FUTURE_SIGHT, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 49 - .2byte SPECIES_MAREEP - .2byte MOVE_SHOCK_WAVE, MOVE_FLASH, MOVE_REFLECT, MOVE_COTTON_SPORE - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 50 - .2byte SPECIES_MEDITITE - .2byte MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_SWAGGER, MOVE_PSYCH_UP - .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 51 - .2byte SPECIES_SLAKOTH - .2byte MOVE_YAWN, MOVE_SCRATCH, MOVE_ENCORE, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 52 - .2byte SPECIES_PARAS - .2byte MOVE_SPORE, MOVE_LEECH_LIFE, MOVE_SLASH, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 53 - .2byte SPECIES_EKANS - .2byte MOVE_ACID, MOVE_DIG, MOVE_SCREECH, MOVE_TORMENT - .byte BATTLE_FRONTIER_ITEM_POISON_BARB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 54 - .2byte SPECIES_DITTO - .2byte MOVE_TRANSFORM, MOVE_NONE, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_METAL_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 55 - .2byte SPECIES_BARBOACH - .2byte MOVE_MAGNITUDE, MOVE_WATER_PULSE, MOVE_SPARK, MOVE_FUTURE_SIGHT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_BASHFUL - -@ 56 - .2byte SPECIES_MEOWTH - .2byte MOVE_SLASH, MOVE_BITE, MOVE_SCREECH, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 57 - .2byte SPECIES_PINECO - .2byte MOVE_SELF_DESTRUCT, MOVE_TAKE_DOWN, MOVE_REFLECT, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 58 - .2byte SPECIES_TRAPINCH - .2byte MOVE_TOXIC, MOVE_DIG, MOVE_SANDSTORM, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SERIOUS - -@ 59 - .2byte SPECIES_SPHEAL - .2byte MOVE_ICE_BALL, MOVE_WATER_PULSE, MOVE_HAIL, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 60 - .2byte SPECIES_HORSEA - .2byte MOVE_WATER_GUN, MOVE_AGILITY, MOVE_ICY_WIND, MOVE_TWISTER - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 61 - .2byte SPECIES_SHROOMISH - .2byte MOVE_SPORE, MOVE_BULLET_SEED, MOVE_LEECH_SEED, MOVE_HEADBUTT - .byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 62 - .2byte SPECIES_SHUPPET - .2byte MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_GRUDGE, MOVE_KNOCK_OFF - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RASH - -@ 63 - .2byte SPECIES_DUSKULL - .2byte MOVE_SKILL_SWAP, MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 64 - .2byte SPECIES_ELECTRIKE - .2byte MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 65 - .2byte SPECIES_VULPIX - .2byte MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 66 - .2byte SPECIES_PIKACHU - .2byte MOVE_THUNDER_PUNCH, MOVE_THUNDER_WAVE, MOVE_DOUBLE_TEAM, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_LIGHT_BALL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 67 - .2byte SPECIES_SANDSHREW - .2byte MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_SOFT_SAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 68 - .2byte SPECIES_POLIWAG - .2byte MOVE_HYPNOSIS, MOVE_ICY_WIND, MOVE_WATER_GUN, MOVE_RAIN_DANCE - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 69 - .2byte SPECIES_BELLSPROUT - .2byte MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_STUN_SPORE, MOVE_WRAP - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_LAX - -@ 70 - .2byte SPECIES_GEODUDE - .2byte MOVE_MAGNITUDE, MOVE_ROCK_BLAST, MOVE_STRENGTH, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 71 - .2byte SPECIES_DRATINI - .2byte MOVE_OUTRAGE, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_WATER_PULSE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 72 - .2byte SPECIES_SNUBBULL - .2byte MOVE_BITE, MOVE_CHARM, MOVE_SWAGGER, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 73 - .2byte SPECIES_REMORAID - .2byte MOVE_BUBBLE_BEAM, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 74 - .2byte SPECIES_LARVITAR - .2byte MOVE_THRASH, MOVE_ROCK_SLIDE, MOVE_DIG, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 75 - .2byte SPECIES_BALTOY - .2byte MOVE_PSYBEAM, MOVE_ANCIENT_POWER, MOVE_LIGHT_SCREEN, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 76 - .2byte SPECIES_SNORUNT - .2byte MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_LEER, MOVE_BITE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 77 - .2byte SPECIES_BAGON - .2byte MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 78 - .2byte SPECIES_BELDUM - .2byte MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 79 - .2byte SPECIES_GULPIN - .2byte MOVE_TOXIC, MOVE_YAWN, MOVE_PAIN_SPLIT, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SERIOUS - -@ 80 - .2byte SPECIES_VENONAT - .2byte MOVE_PSYBEAM, MOVE_SUPERSONIC, MOVE_STUN_SPORE, MOVE_SKILL_SWAP - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 81 - .2byte SPECIES_MANKEY - .2byte MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SCREECH, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_BLACK_BELT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 82 - .2byte SPECIES_MACHOP - .2byte MOVE_SEISMIC_TOSS, MOVE_REVENGE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 83 - .2byte SPECIES_SHELLDER - .2byte MOVE_ICICLE_SPEAR, MOVE_SUPERSONIC, MOVE_CLAMP, MOVE_WITHDRAW - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 84 - .2byte SPECIES_SMOOCHUM - .2byte MOVE_SWEET_KISS, MOVE_SING, MOVE_MUD_SLAP, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 85 - .2byte SPECIES_NUMEL - .2byte MOVE_EMBER, MOVE_MAGNITUDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 86 - .2byte SPECIES_CARVANHA - .2byte MOVE_BITE, MOVE_SCREECH, MOVE_SCARY_FACE, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 87 - .2byte SPECIES_CORPHISH - .2byte MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 88 - .2byte SPECIES_CHARMANDER - .2byte MOVE_FIRE_SPIN, MOVE_METAL_CLAW, MOVE_SMOKESCREEN, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 89 - .2byte SPECIES_CYNDAQUIL - .2byte MOVE_EMBER, MOVE_SWIFT, MOVE_QUICK_ATTACK, MOVE_SMOKESCREEN - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 90 - .2byte SPECIES_ABRA - .2byte MOVE_MIMIC, MOVE_METRONOME, MOVE_FLASH, MOVE_SEISMIC_TOSS - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 91 - .2byte SPECIES_DODUO - .2byte MOVE_FURY_ATTACK, MOVE_UPROAR, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 92 - .2byte SPECIES_GASTLY - .2byte MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_NIGHT_SHADE, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 93 - .2byte SPECIES_SWABLU - .2byte MOVE_TAKE_DOWN, MOVE_DREAM_EATER, MOVE_SING, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 94 - .2byte SPECIES_TREECKO - .2byte MOVE_BULLET_SEED, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_LONELY - -@ 95 - .2byte SPECIES_TORCHIC - .2byte MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 96 - .2byte SPECIES_MUDKIP - .2byte MOVE_WHIRLPOOL, MOVE_ENDEAVOR, MOVE_MUD_SPORT, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 97 - .2byte SPECIES_SQUIRTLE - .2byte MOVE_WATER_PULSE, MOVE_BITE, MOVE_WITHDRAW, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 98 - .2byte SPECIES_TOTODILE - .2byte MOVE_SLASH, MOVE_WATER_PULSE, MOVE_SCREECH, MOVE_ICY_WIND - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 99 - .2byte SPECIES_SLOWPOKE - .2byte MOVE_CONFUSION, MOVE_DISABLE, MOVE_WATER_PULSE, MOVE_YAWN - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 100 - .2byte SPECIES_BULBASAUR - .2byte MOVE_RAZOR_LEAF, MOVE_SWEET_SCENT, MOVE_SLEEP_POWDER, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 101 - .2byte SPECIES_CHIKORITA - .2byte MOVE_SECRET_POWER, MOVE_BULLET_SEED, MOVE_MUD_SLAP, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 102 - .2byte SPECIES_ODDISH - .2byte MOVE_ACID, MOVE_STUN_SPORE, MOVE_SWEET_SCENT, MOVE_MOONLIGHT - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 103 - .2byte SPECIES_PSYDUCK - .2byte MOVE_CONFUSION, MOVE_FURY_SWIPES, MOVE_AERIAL_ACE, MOVE_DISABLE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HASTY - -@ 104 - .2byte SPECIES_CUBONE - .2byte MOVE_BONE_CLUB, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_SOFT_SAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 105 - .2byte SPECIES_GOLDEEN - .2byte MOVE_WATERFALL, MOVE_FURY_ATTACK, MOVE_AGILITY, MOVE_PSYBEAM - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 106 - .2byte SPECIES_NATU - .2byte MOVE_NIGHT_SHADE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_FLASH - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 107 - .2byte SPECIES_CLEFAIRY - .2byte MOVE_FOLLOW_ME, MOVE_RETURN, MOVE_ENCORE, MOVE_SING - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 108 - .2byte SPECIES_MAGNEMITE - .2byte MOVE_SHOCK_WAVE, MOVE_SUPERSONIC, MOVE_METAL_SOUND, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_GENTLE - -@ 109 - .2byte SPECIES_SEEL - .2byte MOVE_AURORA_BEAM, MOVE_DIVE, MOVE_BODY_SLAM, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_ASPEAR_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 110 - .2byte SPECIES_GRIMER - .2byte MOVE_SLUDGE, MOVE_ROCK_TOMB, MOVE_ACID_ARMOR, MOVE_MINIMIZE - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 111 - .2byte SPECIES_KRABBY - .2byte MOVE_CRABHAMMER, MOVE_MUD_SHOT, MOVE_FLAIL, MOVE_KNOCK_OFF - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 112 - .2byte SPECIES_EXEGGCUTE - .2byte MOVE_CONFUSION, MOVE_ANCIENT_POWER, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 113 - .2byte SPECIES_EEVEE - .2byte MOVE_CHARM, MOVE_ATTRACT, MOVE_FLAIL, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 114 - .2byte SPECIES_DROWZEE - .2byte MOVE_CONFUSION, MOVE_HEADBUTT, MOVE_DISABLE, MOVE_BARRIER - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 115 - .2byte SPECIES_VOLTORB - .2byte MOVE_SPARK, MOVE_SCREECH, MOVE_ROLLOUT, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 116 - .2byte SPECIES_CHINCHOU - .2byte MOVE_SPARK, MOVE_DIVE, MOVE_CONFUSE_RAY, MOVE_TAKE_DOWN - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 117 - .2byte SPECIES_TEDDIURSA - .2byte MOVE_SECRET_POWER, MOVE_FAKE_TEARS, MOVE_FAINT_ATTACK, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 118 - .2byte SPECIES_DELIBIRD - .2byte MOVE_PRESENT, MOVE_ICE_BALL, MOVE_AERIAL_ACE, MOVE_HAIL - .byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 119 - .2byte SPECIES_HOUNDOUR - .2byte MOVE_CRUNCH, MOVE_EMBER, MOVE_ROAR, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_CHARCOAL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 120 - .2byte SPECIES_PHANPY - .2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_ROCK_TOMB, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 121 - .2byte SPECIES_SPOINK - .2byte MOVE_PSYWAVE, MOVE_BOUNCE, MOVE_MAGIC_COAT, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 122 - .2byte SPECIES_ARON - .2byte MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_METAL_SOUND, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 123 - .2byte SPECIES_LUVDISC - .2byte MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_DIVE, MOVE_RAIN_DANCE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 124 - .2byte SPECIES_TENTACOOL - .2byte MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER, MOVE_WRAP - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 125 - .2byte SPECIES_CACNEA - .2byte MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_COTTON_SPORE, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 126 - .2byte SPECIES_UNOWN - .2byte MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 127 - .2byte SPECIES_KOFFING - .2byte MOVE_SLUDGE, MOVE_SMOKESCREEN, MOVE_TORMENT, MOVE_HAZE - .byte BATTLE_FRONTIER_ITEM_POISON_BARB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 128 - .2byte SPECIES_STARYU - .2byte MOVE_BUBBLE_BEAM, MOVE_MINIMIZE, MOVE_SWIFT, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 129 - .2byte SPECIES_SKIPLOOM - .2byte MOVE_MEGA_DRAIN, MOVE_CONFUSION, MOVE_COTTON_SPORE, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 130 - .2byte SPECIES_NUZLEAF - .2byte MOVE_EXTRASENSORY, MOVE_FAKE_OUT, MOVE_RAZOR_WIND, MOVE_FAINT_ATTACK - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 131 - .2byte SPECIES_LOMBRE - .2byte MOVE_WATER_PULSE, MOVE_FAKE_OUT, MOVE_BRICK_BREAK, MOVE_ABSORB - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 132 - .2byte SPECIES_VIBRAVA - .2byte MOVE_DRAGON_BREATH, MOVE_DIG, MOVE_SCREECH, MOVE_ROCK_TOMB - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 133 - .2byte SPECIES_RHYHORN - .2byte MOVE_ROCK_BLAST, MOVE_DIG, MOVE_SCARY_FACE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 134 - .2byte SPECIES_CLAMPERL - .2byte MOVE_DIVE, MOVE_TOXIC, MOVE_IRON_DEFENSE, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 135 - .2byte SPECIES_PIDGEOTTO - .2byte MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_FEATHER_DANCE, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 136 - .2byte SPECIES_GROWLITHE - .2byte MOVE_FLAME_WHEEL, MOVE_BITE, MOVE_ROAR, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 137 - .2byte SPECIES_FARFETCHD - .2byte MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_STICK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 138 - .2byte SPECIES_OMANYTE - .2byte MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ANCIENT_POWER, MOVE_TICKLE - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 139 - .2byte SPECIES_KABUTO - .2byte MOVE_MEGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_SAND_ATTACK, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 140 - .2byte SPECIES_LILEEP - .2byte MOVE_ANCIENT_POWER, MOVE_ACID, MOVE_INGRAIN, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 141 - .2byte SPECIES_ANORITH - .2byte MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_ANCIENT_POWER, MOVE_WATER_GUN - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 142 - .2byte SPECIES_AIPOM - .2byte MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_BATON_PASS, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 143 - .2byte SPECIES_ELEKID - .2byte MOVE_THUNDER_PUNCH, MOVE_QUICK_ATTACK, MOVE_SWIFT, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAIVE - -@ 144 - .2byte SPECIES_LOUDRED - .2byte MOVE_STOMP, MOVE_HOWL, MOVE_ASTONISH, MOVE_SUPERSONIC - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 145 - .2byte SPECIES_SPINDA - .2byte MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FAINT_ATTACK - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 146 - .2byte SPECIES_NIDORINA - .2byte MOVE_DOUBLE_KICK, MOVE_BITE, MOVE_AERIAL_ACE, MOVE_FLATTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 147 - .2byte SPECIES_NIDORINO - .2byte MOVE_DOUBLE_KICK, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_FLATTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 148 - .2byte SPECIES_FLAAFFY - .2byte MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_COTTON_SPORE, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_MAGNET - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MILD - -@ 149 - .2byte SPECIES_MAGBY - .2byte MOVE_FIRE_PUNCH, MOVE_SMOKESCREEN, MOVE_CONFUSE_RAY, MOVE_SMOG - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 150 - .2byte SPECIES_NOSEPASS - .2byte MOVE_ROCK_SLIDE, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_HARD_STONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 151 - .2byte SPECIES_CORSOLA - .2byte MOVE_BUBBLE_BEAM, MOVE_MIRROR_COAT, MOVE_ATTRACT, MOVE_ANCIENT_POWER - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 152 - .2byte SPECIES_MAWILE - .2byte MOVE_CRUNCH, MOVE_FAKE_TEARS, MOVE_IRON_DEFENSE, MOVE_BATON_PASS - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 153 - .2byte SPECIES_BUTTERFREE - .2byte MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_WHIRLWIND - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 154 - .2byte SPECIES_BEEDRILL - .2byte MOVE_TWINEEDLE, MOVE_PURSUIT, MOVE_ENDEAVOR, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 155 - .2byte SPECIES_POLIWHIRL - .2byte MOVE_WATER_PULSE, MOVE_DOUBLE_SLAP, MOVE_ICY_WIND, MOVE_RAIN_DANCE - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 156 - .2byte SPECIES_ONIX - .2byte MOVE_ROCK_SLIDE, MOVE_BIND, MOVE_DRAGON_BREATH, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 157 - .2byte SPECIES_BEAUTIFLY - .2byte MOVE_SILVER_WIND, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_WHIRLWIND - .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 158 - .2byte SPECIES_DUSTOX - .2byte MOVE_SILVER_WIND, MOVE_TOXIC, MOVE_PSYBEAM, MOVE_WHIRLWIND - .byte BATTLE_FRONTIER_ITEM_SILVER_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 159 - .2byte SPECIES_LEDIAN - .2byte MOVE_COMET_PUNCH, MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_BASHFUL - -@ 160 - .2byte SPECIES_ARIADOS - .2byte MOVE_SIGNAL_BEAM, MOVE_SPIDER_WEB, MOVE_NIGHT_SHADE, MOVE_TOXIC - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SERIOUS - -@ 161 - .2byte SPECIES_YANMA - .2byte MOVE_SIGNAL_BEAM, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_DETECT - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_RELAXED - -@ 162 - .2byte SPECIES_DELCATTY - .2byte MOVE_SECRET_POWER, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_HEAL_BELL - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 163 - .2byte SPECIES_SABLEYE - .2byte MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_KNOCK_OFF, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_BLACK_GLASSES - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 164 - .2byte SPECIES_LICKITUNG - .2byte MOVE_SLAM, MOVE_BRICK_BREAK, MOVE_LICK, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 165 - .2byte SPECIES_WEEPINBELL - .2byte MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_WRAP, MOVE_SWEET_SCENT - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 166 - .2byte SPECIES_GRAVELER - .2byte MOVE_MAGNITUDE, MOVE_ROCK_THROW, MOVE_DEFENSE_CURL, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 167 - .2byte SPECIES_GLOOM - .2byte MOVE_PETAL_DANCE, MOVE_ACID, MOVE_STUN_SPORE, MOVE_MOONLIGHT - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 168 - .2byte SPECIES_PORYGON - .2byte MOVE_PSYBEAM, MOVE_ICY_WIND, MOVE_RECYCLE, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 169 - .2byte SPECIES_KADABRA - .2byte MOVE_CONFUSION, MOVE_ROLE_PLAY, MOVE_FUTURE_SIGHT, MOVE_DISABLE - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 170 - .2byte SPECIES_WAILMER - .2byte MOVE_WHIRLPOOL, MOVE_ROAR, MOVE_DEFENSE_CURL, MOVE_ROLLOUT - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_DOCILE - -@ 171 - .2byte SPECIES_ROSELIA - .2byte MOVE_MAGICAL_LEAF, MOVE_TOXIC, MOVE_GRASS_WHISTLE, MOVE_COTTON_SPORE - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 172 - .2byte SPECIES_VOLBEAT - .2byte MOVE_SILVER_WIND, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 173 - .2byte SPECIES_ILLUMISE - .2byte MOVE_SILVER_WIND, MOVE_WISH, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 174 - .2byte SPECIES_IVYSAUR - .2byte MOVE_PETAL_DANCE, MOVE_GROWTH, MOVE_SWEET_SCENT, MOVE_FURY_CUTTER - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_GENTLE - -@ 175 - .2byte SPECIES_CHARMELEON - .2byte MOVE_SLASH, MOVE_FIRE_SPIN, MOVE_SWORDS_DANCE, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 176 - .2byte SPECIES_WARTORTLE - .2byte MOVE_WATER_PULSE, MOVE_BITE, MOVE_MUD_SLAP, MOVE_YAWN - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 177 - .2byte SPECIES_PARASECT - .2byte MOVE_SLASH, MOVE_PSYBEAM, MOVE_STUN_SPORE, MOVE_FLASH - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_RASH - -@ 178 - .2byte SPECIES_MACHOKE - .2byte MOVE_LOW_KICK, MOVE_ROCK_TOMB, MOVE_FORESIGHT, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 179 - .2byte SPECIES_HAUNTER - .2byte MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_SPITE, MOVE_GRUDGE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RASH - -@ 180 - .2byte SPECIES_BAYLEEF - .2byte MOVE_RAZOR_LEAF, MOVE_TOXIC, MOVE_SAFEGUARD, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 181 - .2byte SPECIES_QUILAVA - .2byte MOVE_FLAME_WHEEL, MOVE_FURY_SWIPES, MOVE_SWIFT, MOVE_SMOKESCREEN - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 182 - .2byte SPECIES_CROCONAW - .2byte MOVE_SLASH, MOVE_WATER_PULSE, MOVE_BITE, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 183 - .2byte SPECIES_TOGETIC - .2byte MOVE_AERIAL_ACE, MOVE_MAGICAL_LEAF, MOVE_WISH, MOVE_FOLLOW_ME - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 184 - .2byte SPECIES_MURKROW - .2byte MOVE_FAINT_ATTACK, MOVE_FLY, MOVE_TORMENT, MOVE_TAUNT - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 185 - .2byte SPECIES_WOBBUFFET - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM, MOVE_SAFEGUARD - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 186 - .2byte SPECIES_PLUSLE - .2byte MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 187 - .2byte SPECIES_MINUN - .2byte MOVE_SPARK, MOVE_CHARM, MOVE_ENCORE, MOVE_HELPING_HAND - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 188 - .2byte SPECIES_GROVYLE - .2byte MOVE_FURY_CUTTER, MOVE_ENDEAVOR, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 189 - .2byte SPECIES_COMBUSKEN - .2byte MOVE_EMBER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 190 - .2byte SPECIES_MARSHTOMP - .2byte MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ROCK_TOMB, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 191 - .2byte SPECIES_PONYTA - .2byte MOVE_FIRE_SPIN, MOVE_BOUNCE, MOVE_QUICK_ATTACK, MOVE_TAIL_WHIP - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 192 - .2byte SPECIES_AZUMARILL - .2byte MOVE_BUBBLE_BEAM, MOVE_FACADE, MOVE_DIG, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_DOCILE - -@ 193 - .2byte SPECIES_SUDOWOODO - .2byte MOVE_ROCK_SLIDE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM, MOVE_BLOCK - .byte BATTLE_FRONTIER_ITEM_HARD_STONE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 194 - .2byte SPECIES_MAGCARGO - .2byte MOVE_ROCK_SLIDE, MOVE_EMBER, MOVE_ACID_ARMOR, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_GENTLE - -@ 195 - .2byte SPECIES_PUPITAR - .2byte MOVE_DIG, MOVE_BITE, MOVE_SCARY_FACE, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_SOFT_SAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 196 - .2byte SPECIES_SEALEO - .2byte MOVE_ICE_BALL, MOVE_HAIL, MOVE_SNORE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 197 - .2byte SPECIES_RATICATE - .2byte MOVE_ENDEAVOR, MOVE_PURSUIT, MOVE_SCARY_FACE, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAIVE - -@ 198 - .2byte SPECIES_MASQUERAIN - .2byte MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_ICY_WIND, MOVE_STUN_SPORE - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_RELAXED - -@ 199 - .2byte SPECIES_FURRET - .2byte MOVE_SLAM, MOVE_PROTECT, MOVE_HELPING_HAND, MOVE_FOLLOW_ME - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_SERIOUS - -@ 200 - .2byte SPECIES_DUNSPARCE - .2byte MOVE_HEADBUTT, MOVE_GLARE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 201 - .2byte SPECIES_DRAGONAIR - .2byte MOVE_DRAGON_BREATH, MOVE_LEER, MOVE_WRAP, MOVE_SAFEGUARD - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 202 - .2byte SPECIES_MIGHTYENA - .2byte MOVE_BITE, MOVE_POISON_FANG, MOVE_TAUNT, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_MENTAL_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_TIMID - -@ 203 - .2byte SPECIES_LINOONE - .2byte MOVE_SECRET_POWER, MOVE_SAND_ATTACK, MOVE_COVET, MOVE_TICKLE - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 204 - .2byte SPECIES_CASTFORM - .2byte MOVE_EMBER, MOVE_WATER_PULSE, MOVE_SHOCK_WAVE, MOVE_ICY_WIND - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HASTY - -@ 205 - .2byte SPECIES_SHELGON - .2byte MOVE_HEADBUTT, MOVE_DRAGON_BREATH, MOVE_PROTECT, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 206 - .2byte SPECIES_METANG - .2byte MOVE_METAL_CLAW, MOVE_CONFUSION, MOVE_PURSUIT, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 207 - .2byte SPECIES_WIGGLYTUFF - .2byte MOVE_SING, MOVE_DISABLE, MOVE_WISH, MOVE_SECRET_POWER - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_RELAXED - -@ 208 - .2byte SPECIES_SUNFLORA - .2byte MOVE_PETAL_DANCE, MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 209 - .2byte SPECIES_CHIMECHO - .2byte MOVE_PSYWAVE, MOVE_TAKE_DOWN, MOVE_HEAL_BELL, MOVE_SAFEGUARD - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 210 - .2byte SPECIES_GLIGAR - .2byte MOVE_METAL_CLAW, MOVE_DIG, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HASTY - -@ 211 - .2byte SPECIES_QWILFISH - .2byte MOVE_BUBBLE_BEAM, MOVE_PIN_MISSILE, MOVE_SPIKES, MOVE_MINIMIZE - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .4byte NATURE_IMPISH - -@ 212 - .2byte SPECIES_SNEASEL - .2byte MOVE_FAINT_ATTACK, MOVE_FAKE_OUT, MOVE_ICY_WIND, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 213 - .2byte SPECIES_PELIPPER - .2byte MOVE_WATER_PULSE, MOVE_AERIAL_ACE, MOVE_STOCKPILE, MOVE_SWALLOW - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 214 - .2byte SPECIES_SWELLOW - .2byte MOVE_FLY, MOVE_ENDEAVOR, MOVE_FACADE, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 215 - .2byte SPECIES_LAIRON - .2byte MOVE_METAL_CLAW, MOVE_ROCK_TOMB, MOVE_IRON_DEFENSE, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_METAL_COAT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 216 - .2byte SPECIES_TANGELA - .2byte MOVE_MEGA_DRAIN, MOVE_SLAM, MOVE_TOXIC, MOVE_BIND - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 217 - .2byte SPECIES_ARBOK - .2byte MOVE_POISON_FANG, MOVE_DIG, MOVE_BITE, MOVE_GLARE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 218 - .2byte SPECIES_PERSIAN - .2byte MOVE_FAKE_OUT, MOVE_SLASH, MOVE_TORMENT, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 219 - .2byte SPECIES_SEADRA - .2byte MOVE_AURORA_BEAM, MOVE_SMOKESCREEN, MOVE_WATER_GUN, MOVE_RAIN_DANCE - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 220 - .2byte SPECIES_KECLEON - .2byte MOVE_SECRET_POWER, MOVE_PSYBEAM, MOVE_MAGIC_COAT, MOVE_SEISMIC_TOSS - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAIVE - -@ 221 - .2byte SPECIES_VIGOROTH - .2byte MOVE_SLASH, MOVE_COUNTER, MOVE_ENCORE, MOVE_UPROAR - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_LONELY - -@ 222 - .2byte SPECIES_LUNATONE - .2byte MOVE_CONFUSION, MOVE_COSMIC_POWER, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 223 - .2byte SPECIES_SOLROCK - .2byte MOVE_CONFUSION, MOVE_FIRE_SPIN, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 224 - .2byte SPECIES_NOCTOWL - .2byte MOVE_CONFUSION, MOVE_AERIAL_ACE, MOVE_FAINT_ATTACK, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 225 - .2byte SPECIES_SANDSLASH - .2byte MOVE_CRUSH_CLAW, MOVE_ROCK_SLIDE, MOVE_SWIFT, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 226 - .2byte SPECIES_VENOMOTH - .2byte MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_SLEEP_POWDER, MOVE_SKILL_SWAP - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 227 - .2byte SPECIES_CHANSEY - .2byte MOVE_METRONOME, MOVE_REFRESH, MOVE_DEFENSE_CURL, MOVE_MINIMIZE - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_RELAXED - -@ 228 - .2byte SPECIES_SEAKING - .2byte MOVE_WATER_PULSE, MOVE_PSYBEAM, MOVE_SWIFT, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 229 - .2byte SPECIES_JUMPLUFF - .2byte MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 230 - .2byte SPECIES_PILOSWINE - .2byte MOVE_DIG, MOVE_ANCIENT_POWER, MOVE_HAIL, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_SOFT_SAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 231 - .2byte SPECIES_GOLBAT - .2byte MOVE_AIR_CUTTER, MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_STEEL_WING - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 232 - .2byte SPECIES_PRIMEAPE - .2byte MOVE_KARATE_CHOP, MOVE_COUNTER, MOVE_SWAGGER, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 233 - .2byte SPECIES_HITMONLEE - .2byte MOVE_ROLLING_KICK, MOVE_BRICK_BREAK, MOVE_FOCUS_ENERGY, MOVE_FACADE - .byte BATTLE_FRONTIER_ITEM_BLACK_BELT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 234 - .2byte SPECIES_HITMONCHAN - .2byte MOVE_MACH_PUNCH, MOVE_SKY_UPPERCUT, MOVE_DETECT, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 235 - .2byte SPECIES_GIRAFARIG - .2byte MOVE_PSYBEAM, MOVE_STOMP, MOVE_WISH, MOVE_SKILL_SWAP - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 236 - .2byte SPECIES_HITMONTOP - .2byte MOVE_TRIPLE_KICK, MOVE_DIG, MOVE_MACH_PUNCH, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 237 - .2byte SPECIES_BANETTE - .2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SPITE, MOVE_KNOCK_OFF - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 238 - .2byte SPECIES_NINJASK - .2byte MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_ENDURE, MOVE_DIG - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MILD - -@ 239 - .2byte SPECIES_SEVIPER - .2byte MOVE_POISON_TAIL, MOVE_BITE, MOVE_GLARE, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 240 - .2byte SPECIES_ZANGOOSE - .2byte MOVE_SLASH, MOVE_DOUBLE_KICK, MOVE_ROAR, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 241 - .2byte SPECIES_CAMERUPT - .2byte MOVE_MAGNITUDE, MOVE_PROTECT, MOVE_SANDSTORM, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 242 - .2byte SPECIES_SHARPEDO - .2byte MOVE_SLASH, MOVE_BITE, MOVE_WATER_PULSE, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 243 - .2byte SPECIES_TROPIUS - .2byte MOVE_MAGICAL_LEAF, MOVE_WHIRLWIND, MOVE_AERIAL_ACE, MOVE_STEEL_WING - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 244 - .2byte SPECIES_MAGNETON - .2byte MOVE_SHOCK_WAVE, MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_LONELY - -@ 245 - .2byte SPECIES_MANTINE - .2byte MOVE_BUBBLE_BEAM, MOVE_AERIAL_ACE, MOVE_RAIN_DANCE, MOVE_ICY_WIND - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 246 - .2byte SPECIES_STANTLER - .2byte MOVE_EXTRASENSORY, MOVE_CONFUSE_RAY, MOVE_STOMP, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_GENTLE - -@ 247 - .2byte SPECIES_ABSOL - .2byte MOVE_BITE, MOVE_RAZOR_WIND, MOVE_FUTURE_SIGHT, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 248 - .2byte SPECIES_SWALOT - .2byte MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_SLUDGE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIRKY - -@ 249 - .2byte SPECIES_CRAWDAUNT - .2byte MOVE_BUBBLE_BEAM, MOVE_VICE_GRIP, MOVE_KNOCK_OFF, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 250 - .2byte SPECIES_PIDGEOT - .2byte MOVE_AERIAL_ACE, MOVE_FEATHER_DANCE, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK - .byte BATTLE_FRONTIER_ITEM_SHARP_BEAK - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 251 - .2byte SPECIES_GRUMPIG - .2byte MOVE_PSYBEAM, MOVE_CONFUSE_RAY, MOVE_FUTURE_SIGHT, MOVE_MAGIC_COAT - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 252 - .2byte SPECIES_TORKOAL - .2byte MOVE_EMBER, MOVE_FIRE_SPIN, MOVE_SMOKESCREEN, MOVE_AMNESIA - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 253 - .2byte SPECIES_KINGLER - .2byte MOVE_CRABHAMMER, MOVE_METAL_CLAW, MOVE_MUD_SHOT, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 254 - .2byte SPECIES_CACTURNE - .2byte MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_ACID, MOVE_MEGA_PUNCH - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_HASTY - -@ 255 - .2byte SPECIES_BELLOSSOM - .2byte MOVE_PETAL_DANCE, MOVE_SAFEGUARD, MOVE_SUNNY_DAY, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 256 - .2byte SPECIES_OCTILLERY - .2byte MOVE_OCTAZOOKA, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_ROCK_BLAST - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 257 - .2byte SPECIES_HUNTAIL - .2byte MOVE_WHIRLPOOL, MOVE_SCARY_FACE, MOVE_MUD_SLAP, MOVE_BITE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 258 - .2byte SPECIES_GOREBYSS - .2byte MOVE_WHIRLPOOL, MOVE_AMNESIA, MOVE_ICY_WIND, MOVE_CONFUSION - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 259 - .2byte SPECIES_RELICANTH - .2byte MOVE_ANCIENT_POWER, MOVE_WATER_PULSE, MOVE_HARDEN, MOVE_AMNESIA - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 260 - .2byte SPECIES_OMASTAR - .2byte MOVE_BUBBLE_BEAM, MOVE_SPIKE_CANNON, MOVE_TICKLE, MOVE_ANCIENT_POWER - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 261 - .2byte SPECIES_KABUTOPS - .2byte MOVE_SLASH, MOVE_DIG, MOVE_FURY_CUTTER, MOVE_KNOCK_OFF - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 262 - .2byte SPECIES_POLIWRATH - .2byte MOVE_SUBMISSION, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_BUBBLE_BEAM - .byte BATTLE_FRONTIER_ITEM_BLACK_BELT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 263 - .2byte SPECIES_SCYTHER - .2byte MOVE_FURY_CUTTER, MOVE_AERIAL_ACE, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 264 - .2byte SPECIES_PINSIR - .2byte MOVE_SUBMISSION, MOVE_FOCUS_ENERGY, MOVE_SWORDS_DANCE, MOVE_REVENGE - .byte BATTLE_FRONTIER_ITEM_BLACK_BELT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_NAUGHTY - -@ 265 - .2byte SPECIES_POLITOED - .2byte MOVE_DIVE, MOVE_DIG, MOVE_HYPNOSIS, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_RELAXED - -@ 266 - .2byte SPECIES_CLOYSTER - .2byte MOVE_AURORA_BEAM, MOVE_SPIKE_CANNON, MOVE_SUPERSONIC, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 267 - .2byte SPECIES_DELCATTY - .2byte MOVE_FAKE_TEARS, MOVE_SING, MOVE_THUNDERBOLT, MOVE_ICE_BEAM - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 268 - .2byte SPECIES_SABLEYE - .2byte MOVE_SHADOW_BALL, MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 269 - .2byte SPECIES_LICKITUNG - .2byte MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 270 - .2byte SPECIES_WEEPINBELL - .2byte MOVE_SLUDGE_BOMB, MOVE_RAZOR_LEAF, MOVE_SLEEP_POWDER, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIRKY - -@ 271 - .2byte SPECIES_GRAVELER - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 272 - .2byte SPECIES_GLOOM - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SLUDGE_BOMB, MOVE_MOONLIGHT - .byte BATTLE_FRONTIER_ITEM_PECHA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 273 - .2byte SPECIES_PORYGON - .2byte MOVE_TRI_ATTACK, MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 274 - .2byte SPECIES_KADABRA - .2byte MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_REFLECT, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 275 - .2byte SPECIES_WAILMER - .2byte MOVE_WATER_SPOUT, MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_DOCILE - -@ 276 - .2byte SPECIES_ROSELIA - .2byte MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_GRASS_WHISTLE, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 277 - .2byte SPECIES_VOLBEAT - .2byte MOVE_SIGNAL_BEAM, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_TAIL_GLOW - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 278 - .2byte SPECIES_ILLUMISE - .2byte MOVE_SILVER_WIND, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 279 - .2byte SPECIES_IVYSAUR - .2byte MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_LEECH_SEED - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 280 - .2byte SPECIES_CHARMELEON - .2byte MOVE_FLAMETHROWER, MOVE_SLASH, MOVE_ANCIENT_POWER, MOVE_DRAGON_RAGE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 281 - .2byte SPECIES_WARTORTLE - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAPID_SPIN, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 282 - .2byte SPECIES_PARASECT - .2byte MOVE_SPORE, MOVE_GIGA_DRAIN, MOVE_DIG, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 283 - .2byte SPECIES_MACHOKE - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FORESIGHT, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 284 - .2byte SPECIES_HAUNTER - .2byte MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 285 - .2byte SPECIES_BAYLEEF - .2byte MOVE_GIGA_DRAIN, MOVE_BODY_SLAM, MOVE_GRASS_WHISTLE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 286 - .2byte SPECIES_QUILAVA - .2byte MOVE_FLAMETHROWER, MOVE_CRUSH_CLAW, MOVE_BODY_SLAM, MOVE_SMOKESCREEN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 287 - .2byte SPECIES_CROCONAW - .2byte MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_DIG - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 288 - .2byte SPECIES_TOGETIC - .2byte MOVE_RETURN, MOVE_SWEET_KISS, MOVE_AERIAL_ACE, MOVE_YAWN - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 289 - .2byte SPECIES_MURKROW - .2byte MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 290 - .2byte SPECIES_WOBBUFFET - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_ENCORE, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_CAREFUL - -@ 291 - .2byte SPECIES_PLUSLE - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_SEISMIC_TOSS, MOVE_WISH - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_DOCILE - -@ 292 - .2byte SPECIES_MINUN - .2byte MOVE_THUNDERBOLT, MOVE_ATTRACT, MOVE_CHARM, MOVE_WISH - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_DOCILE - -@ 293 - .2byte SPECIES_GROVYLE - .2byte MOVE_GIGA_DRAIN, MOVE_CRUSH_CLAW, MOVE_SCREECH, MOVE_ROCK_TOMB - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 294 - .2byte SPECIES_COMBUSKEN - .2byte MOVE_FLAMETHROWER, MOVE_SKY_UPPERCUT, MOVE_SLASH, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 295 - .2byte SPECIES_MARSHTOMP - .2byte MOVE_MUDDY_WATER, MOVE_EARTHQUAKE, MOVE_MUD_SLAP, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 296 - .2byte SPECIES_PONYTA - .2byte MOVE_FLAMETHROWER, MOVE_BODY_SLAM, MOVE_DOUBLE_KICK, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 297 - .2byte SPECIES_AZUMARILL - .2byte MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_IRON_TAIL, MOVE_DIG - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 298 - .2byte SPECIES_SUDOWOODO - .2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_LOW_KICK, MOVE_SELF_DESTRUCT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 299 - .2byte SPECIES_MAGCARGO - .2byte MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 300 - .2byte SPECIES_PUPITAR - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 301 - .2byte SPECIES_SEALEO - .2byte MOVE_ICE_BEAM, MOVE_SURF, MOVE_BODY_SLAM, MOVE_HAIL - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 302 - .2byte SPECIES_RATICATE - .2byte MOVE_SUPER_FANG, MOVE_HYPER_FANG, MOVE_SHADOW_BALL, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 303 - .2byte SPECIES_MASQUERAIN - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_GIGA_DRAIN, MOVE_STUN_SPORE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 304 - .2byte SPECIES_FURRET - .2byte MOVE_TRICK, MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_FOLLOW_ME - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 305 - .2byte SPECIES_DUNSPARCE - .2byte MOVE_ICE_BEAM, MOVE_ROCK_TOMB, MOVE_BITE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 306 - .2byte SPECIES_DRAGONAIR - .2byte MOVE_RETURN, MOVE_REST, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 307 - .2byte SPECIES_MIGHTYENA - .2byte MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIRKY - -@ 308 - .2byte SPECIES_LINOONE - .2byte MOVE_TRICK, MOVE_FRUSTRATION, MOVE_THUNDER_WAVE, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 309 - .2byte SPECIES_CASTFORM - .2byte MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_WATER_PULSE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 310 - .2byte SPECIES_SHELGON - .2byte MOVE_FRUSTRATION, MOVE_DRAGON_DANCE, MOVE_CRUNCH, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 311 - .2byte SPECIES_METANG - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_BODY_SLAM, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 312 - .2byte SPECIES_WIGGLYTUFF - .2byte MOVE_FAKE_TEARS, MOVE_SING, MOVE_DREAM_EATER, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_DOCILE - -@ 313 - .2byte SPECIES_SUNFLORA - .2byte MOVE_GIGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_GROWTH, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 314 - .2byte SPECIES_CHIMECHO - .2byte MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEAL_BELL - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 315 - .2byte SPECIES_GLIGAR - .2byte MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_GUILLOTINE, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 316 - .2byte SPECIES_QWILFISH - .2byte MOVE_REVENGE, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 317 - .2byte SPECIES_SNEASEL - .2byte MOVE_CRUSH_CLAW, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_JOLLY - -@ 318 - .2byte SPECIES_PELIPPER - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_AERIAL_ACE, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 319 - .2byte SPECIES_SWELLOW - .2byte MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PURSUIT, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 320 - .2byte SPECIES_LAIRON - .2byte MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROAR, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 321 - .2byte SPECIES_TANGELA - .2byte MOVE_GIGA_DRAIN, MOVE_STUN_SPORE, MOVE_REST, MOVE_AMNESIA - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 322 - .2byte SPECIES_ARBOK - .2byte MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_GLARE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 323 - .2byte SPECIES_PERSIAN - .2byte MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_ROAR, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_SILK_SCARF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 324 - .2byte SPECIES_SEADRA - .2byte MOVE_HYDRO_PUMP, MOVE_FRUSTRATION, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 325 - .2byte SPECIES_KECLEON - .2byte MOVE_TRICK, MOVE_BRICK_BREAK, MOVE_SHADOW_BALL, MOVE_SKILL_SWAP - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 326 - .2byte SPECIES_VIGOROTH - .2byte MOVE_CRUSH_CLAW, MOVE_REVERSAL, MOVE_ENDURE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 327 - .2byte SPECIES_LUNATONE - .2byte MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_CALM_MIND - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 328 - .2byte SPECIES_SOLROCK - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COSMIC_POWER, MOVE_OVERHEAT - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 329 - .2byte SPECIES_NOCTOWL - .2byte MOVE_PSYCHIC, MOVE_FAINT_ATTACK, MOVE_AERIAL_ACE, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 330 - .2byte SPECIES_SANDSLASH - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUSH_CLAW, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 331 - .2byte SPECIES_VENOMOTH - .2byte MOVE_SIGNAL_BEAM, MOVE_PSYCHIC, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 332 - .2byte SPECIES_CHANSEY - .2byte MOVE_SEISMIC_TOSS, MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_SOFT_BOILED - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_RELAXED - -@ 333 - .2byte SPECIES_SEAKING - .2byte MOVE_HORN_DRILL, MOVE_MEGAHORN, MOVE_SLEEP_TALK, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 334 - .2byte SPECIES_JUMPLUFF - .2byte MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_BOLD - -@ 335 - .2byte SPECIES_PILOSWINE - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_ADAMANT - -@ 336 - .2byte SPECIES_GOLBAT - .2byte MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 337 - .2byte SPECIES_PRIMEAPE - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_TOMB, MOVE_OVERHEAT, MOVE_BULK_UP - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 338 - .2byte SPECIES_HITMONLEE - .2byte MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_FORESIGHT, MOVE_ROCK_TOMB - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 339 - .2byte SPECIES_HITMONCHAN - .2byte MOVE_DYNAMIC_PUNCH, MOVE_MACH_PUNCH, MOVE_DETECT, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 340 - .2byte SPECIES_GIRAFARIG - .2byte MOVE_PSYCHIC, MOVE_CRUNCH, MOVE_BATON_PASS, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 341 - .2byte SPECIES_HITMONTOP - .2byte MOVE_DOUBLE_EDGE, MOVE_SEISMIC_TOSS, MOVE_ROCK_SLIDE, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 342 - .2byte SPECIES_BANETTE - .2byte MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCREECH, MOVE_WILL_O_WISP - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_ADAMANT - -@ 343 - .2byte SPECIES_NINJASK - .2byte MOVE_SLASH, MOVE_SHADOW_BALL, MOVE_SWORDS_DANCE, MOVE_BATON_PASS - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 344 - .2byte SPECIES_SEVIPER - .2byte MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 345 - .2byte SPECIES_ZANGOOSE - .2byte MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 346 - .2byte SPECIES_CAMERUPT - .2byte MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_BODY_SLAM, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 347 - .2byte SPECIES_SHARPEDO - .2byte MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_SURF - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 348 - .2byte SPECIES_TROPIUS - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 349 - .2byte SPECIES_MAGNETON - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 350 - .2byte SPECIES_MANTINE - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 351 - .2byte SPECIES_STANTLER - .2byte MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 352 - .2byte SPECIES_ABSOL - .2byte MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_IRON_TAIL - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 353 - .2byte SPECIES_SWALOT - .2byte MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_BODY_SLAM, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 354 - .2byte SPECIES_CRAWDAUNT - .2byte MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 355 - .2byte SPECIES_PIDGEOT - .2byte MOVE_RETURN, MOVE_AERIAL_ACE, MOVE_STEEL_WING, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 356 - .2byte SPECIES_GRUMPIG - .2byte MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 357 - .2byte SPECIES_TORKOAL - .2byte MOVE_OVERHEAT, MOVE_BODY_SLAM, MOVE_SMOKESCREEN, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 358 - .2byte SPECIES_KINGLER - .2byte MOVE_GUILLOTINE, MOVE_ROCK_TOMB, MOVE_FLAIL, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 359 - .2byte SPECIES_CACTURNE - .2byte MOVE_MEGA_KICK, MOVE_TEETER_DANCE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_HARDY - -@ 360 - .2byte SPECIES_BELLOSSOM - .2byte MOVE_SOLAR_BEAM, MOVE_ATTRACT, MOVE_SUNNY_DAY, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 361 - .2byte SPECIES_OCTILLERY - .2byte MOVE_OCTAZOOKA, MOVE_FIRE_BLAST, MOVE_THUNDER_WAVE, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 362 - .2byte SPECIES_HUNTAIL - .2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 363 - .2byte SPECIES_GOREBYSS - .2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_PSYCHIC, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 364 - .2byte SPECIES_RELICANTH - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 365 - .2byte SPECIES_OMASTAR - .2byte MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_ICE_BEAM, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 366 - .2byte SPECIES_KABUTOPS - .2byte MOVE_SLASH, MOVE_ROCK_SLIDE, MOVE_FLAIL, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 367 - .2byte SPECIES_POLIWRATH - .2byte MOVE_BRICK_BREAK, MOVE_HYPNOSIS, MOVE_REST, MOVE_BELLY_DRUM - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 368 - .2byte SPECIES_SCYTHER - .2byte MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 369 - .2byte SPECIES_PINSIR - .2byte MOVE_GUILLOTINE, MOVE_SWORDS_DANCE, MOVE_FLAIL, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_JOLLY - -@ 370 - .2byte SPECIES_POLITOED - .2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_MUD_SLAP, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_LAX_INCENSE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 371 - .2byte SPECIES_CLOYSTER - .2byte MOVE_DIVE, MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 372 - .2byte SPECIES_DUGTRIO - .2byte MOVE_EARTHQUAKE, MOVE_TRI_ATTACK, MOVE_SLASH, MOVE_SAND_TOMB - .byte BATTLE_FRONTIER_ITEM_SOFT_SAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 373 - .2byte SPECIES_MEDICHAM - .2byte MOVE_PSYCHIC, MOVE_HI_JUMP_KICK, MOVE_CALM_MIND, MOVE_BATON_PASS - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 374 - .2byte SPECIES_MISDREAVUS - .2byte MOVE_PAIN_SPLIT, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 375 - .2byte SPECIES_FEAROW - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_FACADE, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_SHARP_BEAK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 376 - .2byte SPECIES_GRANBULL - .2byte MOVE_MEGA_KICK, MOVE_SMELLING_SALT, MOVE_THUNDER_WAVE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 377 - .2byte SPECIES_JYNX - .2byte MOVE_ICE_BEAM, MOVE_FAKE_OUT, MOVE_LOVELY_KISS, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 378 - .2byte SPECIES_DUSCLOPS - .2byte MOVE_WILL_O_WISP, MOVE_SEISMIC_TOSS, MOVE_PAIN_SPLIT, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 379 - .2byte SPECIES_DODRIO - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_SLEEP_TALK, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 380 - .2byte SPECIES_MR_MIME - .2byte MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_FAKE_OUT, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 381 - .2byte SPECIES_LANTURN - .2byte MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 382 - .2byte SPECIES_BRELOOM - .2byte MOVE_SKY_UPPERCUT, MOVE_MACH_PUNCH, MOVE_HEADBUTT, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 383 - .2byte SPECIES_FORRETRESS - .2byte MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_LIGHT_SCREEN, MOVE_SPIKES - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 384 - .2byte SPECIES_WHISCASH - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 385 - .2byte SPECIES_XATU - .2byte MOVE_DRILL_PECK, MOVE_NIGHT_SHADE, MOVE_WISH, MOVE_FUTURE_SIGHT - .byte BATTLE_FRONTIER_ITEM_SHARP_BEAK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 386 - .2byte SPECIES_SKARMORY - .2byte MOVE_STEEL_WING, MOVE_AIR_CUTTER, MOVE_COUNTER, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 387 - .2byte SPECIES_MAROWAK - .2byte MOVE_BONEMERANG, MOVE_ROCK_SLIDE, MOVE_ICY_WIND, MOVE_HEADBUTT - .byte BATTLE_FRONTIER_ITEM_THICK_CLUB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 388 - .2byte SPECIES_QUAGSIRE - .2byte MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_MUD_SLAP - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 389 - .2byte SPECIES_CLEFABLE - .2byte MOVE_METRONOME, MOVE_DOUBLE_TEAM, MOVE_REFLECT, MOVE_FOLLOW_ME - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_BRAVE - -@ 390 - .2byte SPECIES_HARIYAMA - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 391 - .2byte SPECIES_RAICHU - .2byte MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 392 - .2byte SPECIES_DEWGONG - .2byte MOVE_ICE_BEAM, MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 393 - .2byte SPECIES_MANECTRIC - .2byte MOVE_THUNDERBOLT, MOVE_FLASH, MOVE_QUICK_ATTACK, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_MAGNET - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 394 - .2byte SPECIES_VILEPLUME - .2byte MOVE_SLUDGE_BOMB, MOVE_PETAL_DANCE, MOVE_MOONLIGHT, MOVE_AROMATHERAPY - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 395 - .2byte SPECIES_VICTREEBEL - .2byte MOVE_GIGA_DRAIN, MOVE_SLEEP_POWDER, MOVE_SWEET_SCENT, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 396 - .2byte SPECIES_ELECTRODE - .2byte MOVE_THUNDERBOLT, MOVE_SWIFT, MOVE_LIGHT_SCREEN, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 397 - .2byte SPECIES_EXPLOUD - .2byte MOVE_HYPER_VOICE, MOVE_SHADOW_BALL, MOVE_SLEEP_TALK, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 398 - .2byte SPECIES_SHIFTRY - .2byte MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_MIRACLE_SEED - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 399 - .2byte SPECIES_GLALIE - .2byte MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_HAIL, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 400 - .2byte SPECIES_LUDICOLO - .2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 401 - .2byte SPECIES_HYPNO - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_HYPNOSIS - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 402 - .2byte SPECIES_GOLEM - .2byte MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_COUNTER, MOVE_ROCK_TOMB - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 403 - .2byte SPECIES_RHYDON - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 404 - .2byte SPECIES_ALAKAZAM - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 405 - .2byte SPECIES_WEEZING - .2byte MOVE_SLUDGE_BOMB, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_SMOKESCREEN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 406 - .2byte SPECIES_KANGASKHAN - .2byte MOVE_DIZZY_PUNCH, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 407 - .2byte SPECIES_ELECTABUZZ - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 408 - .2byte SPECIES_TAUROS - .2byte MOVE_EARTHQUAKE, MOVE_THRASH, MOVE_SWAGGER, MOVE_FACADE - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 409 - .2byte SPECIES_SLOWBRO - .2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_HEADBUTT, MOVE_ICE_PUNCH - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 410 - .2byte SPECIES_SLOWKING - .2byte MOVE_PSYCHIC, MOVE_BRICK_BREAK, MOVE_AMNESIA, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 411 - .2byte SPECIES_MILTANK - .2byte MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_MILK_DRINK - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 412 - .2byte SPECIES_ALTARIA - .2byte MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_REFRESH, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 413 - .2byte SPECIES_NIDOQUEEN - .2byte MOVE_SLUDGE_BOMB, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 414 - .2byte SPECIES_NIDOKING - .2byte MOVE_HORN_DRILL, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 415 - .2byte SPECIES_MAGMAR - .2byte MOVE_FLAMETHROWER, MOVE_SMOKESCREEN, MOVE_BRICK_BREAK, MOVE_BARRIER - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 416 - .2byte SPECIES_CRADILY - .2byte MOVE_GIGA_DRAIN, MOVE_ROCK_SLIDE, MOVE_BARRIER, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 417 - .2byte SPECIES_ARMALDO - .2byte MOVE_SLASH, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 418 - .2byte SPECIES_GOLDUCK - .2byte MOVE_HYDRO_PUMP, MOVE_DIG, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 419 - .2byte SPECIES_RAPIDASH - .2byte MOVE_FLAMETHROWER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_CHARCOAL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIET - -@ 420 - .2byte SPECIES_MUK - .2byte MOVE_SLUDGE_BOMB, MOVE_BODY_SLAM, MOVE_SCREECH, MOVE_MINIMIZE - .byte BATTLE_FRONTIER_ITEM_POISON_BARB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 421 - .2byte SPECIES_GENGAR - .2byte MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_CONFUSE_RAY, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_TIMID - -@ 422 - .2byte SPECIES_AMPHAROS - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_MAGNET - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 423 - .2byte SPECIES_SCIZOR - .2byte MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_COUNTER, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 424 - .2byte SPECIES_HERACROSS - .2byte MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_ROCK_TOMB, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 425 - .2byte SPECIES_URSARING - .2byte MOVE_MEGA_KICK, MOVE_CRUNCH, MOVE_AERIAL_ACE, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 426 - .2byte SPECIES_HOUNDOOM - .2byte MOVE_FLAMETHROWER, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_WILL_O_WISP - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 427 - .2byte SPECIES_DONPHAN - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 428 - .2byte SPECIES_CLAYDOL - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWAGGER, MOVE_PSYCH_UP - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 429 - .2byte SPECIES_WAILORD - .2byte MOVE_SURF, MOVE_ICY_WIND, MOVE_BODY_SLAM, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 430 - .2byte SPECIES_NINETALES - .2byte MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP - .byte BATTLE_FRONTIER_ITEM_RAWST_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 431 - .2byte SPECIES_MACHAMP - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 432 - .2byte SPECIES_SHUCKLE - .2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_SLEEP_TALK, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_BRAVE - -@ 433 - .2byte SPECIES_STEELIX - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_ROCK_TOMB, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 434 - .2byte SPECIES_TENTACRUEL - .2byte MOVE_SLUDGE_BOMB, MOVE_ICY_WIND, MOVE_BARRIER, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_PERSIM_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_IMPISH - -@ 435 - .2byte SPECIES_AERODACTYL - .2byte MOVE_ANCIENT_POWER, MOVE_DRAGON_BREATH, MOVE_AERIAL_ACE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 436 - .2byte SPECIES_PORYGON2 - .2byte MOVE_TRI_ATTACK, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 437 - .2byte SPECIES_GARDEVOIR - .2byte MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_MAGICAL_LEAF, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_TIMID - -@ 438 - .2byte SPECIES_EXEGGUTOR - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 439 - .2byte SPECIES_STARMIE - .2byte MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 440 - .2byte SPECIES_FLYGON - .2byte MOVE_EARTHQUAKE, MOVE_STEEL_WING, MOVE_FAINT_ATTACK, MOVE_FACADE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 441 - .2byte SPECIES_VENUSAUR - .2byte MOVE_GIGA_DRAIN, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_SLEEP_POWDER - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 442 - .2byte SPECIES_VAPOREON - .2byte MOVE_SURF, MOVE_ROAR, MOVE_BITE, MOVE_QUICK_ATTACK - .byte BATTLE_FRONTIER_ITEM_MYSTIC_WATER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 443 - .2byte SPECIES_JOLTEON - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 444 - .2byte SPECIES_FLAREON - .2byte MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_BITE, MOVE_SAND_ATTACK - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 445 - .2byte SPECIES_MEGANIUM - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 446 - .2byte SPECIES_ESPEON - .2byte MOVE_PSYCHIC, MOVE_CHARM, MOVE_CALM_MIND, MOVE_BATON_PASS - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 447 - .2byte SPECIES_UMBREON - .2byte MOVE_CONFUSE_RAY, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BATON_PASS - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 448 - .2byte SPECIES_BLASTOISE - .2byte MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_BITE, MOVE_SEISMIC_TOSS - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 449 - .2byte SPECIES_FERALIGATR - .2byte MOVE_SURF, MOVE_RAIN_DANCE, MOVE_AERIAL_ACE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 450 - .2byte SPECIES_AGGRON - .2byte MOVE_IRON_TAIL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 451 - .2byte SPECIES_BLAZIKEN - .2byte MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_DOUBLE_KICK, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 452 - .2byte SPECIES_WALREIN - .2byte MOVE_BLIZZARD, MOVE_HAIL, MOVE_YAWN, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 453 - .2byte SPECIES_SCEPTILE - .2byte MOVE_LEAF_BLADE, MOVE_LEECH_SEED, MOVE_AERIAL_ACE, MOVE_DETECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 454 - .2byte SPECIES_CHARIZARD - .2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_ROAR, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 455 - .2byte SPECIES_TYPHLOSION - .2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SMOKESCREEN, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 456 - .2byte SPECIES_LAPRAS - .2byte MOVE_SURF, MOVE_ATTRACT, MOVE_CONFUSE_RAY, MOVE_SING - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_BOLD - -@ 457 - .2byte SPECIES_CROBAT - .2byte MOVE_SLUDGE_BOMB, MOVE_BITE, MOVE_ASTONISH, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 458 - .2byte SPECIES_SWAMPERT - .2byte MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REST, MOVE_CURSE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 459 - .2byte SPECIES_GYARADOS - .2byte MOVE_RETURN, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 460 - .2byte SPECIES_SNORLAX - .2byte MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 461 - .2byte SPECIES_KINGDRA - .2byte MOVE_HYDRO_PUMP, MOVE_DRAGON_BREATH, MOVE_ICY_WIND, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 462 - .2byte SPECIES_BLISSEY - .2byte MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_SING, MOVE_SOFT_BOILED - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_BOLD - -@ 463 - .2byte SPECIES_MILOTIC - .2byte MOVE_HYDRO_PUMP, MOVE_ICY_WIND, MOVE_RECOVER, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 464 - .2byte SPECIES_ARCANINE - .2byte MOVE_FLAMETHROWER, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 465 - .2byte SPECIES_SALAMENCE - .2byte MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_HEADBUTT, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 466 - .2byte SPECIES_METAGROSS - .2byte MOVE_METEOR_MASH, MOVE_AERIAL_ACE, MOVE_FACADE, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 467 - .2byte SPECIES_SLAKING - .2byte MOVE_YAWN, MOVE_BULK_UP, MOVE_SWAGGER, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 468 - .2byte SPECIES_DUGTRIO - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_TRI_ATTACK - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 469 - .2byte SPECIES_MEDICHAM - .2byte MOVE_REVERSAL, MOVE_ENDURE, MOVE_PSYCHIC, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 470 - .2byte SPECIES_MAROWAK - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_ICY_WIND - .byte BATTLE_FRONTIER_ITEM_THICK_CLUB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 471 - .2byte SPECIES_QUAGSIRE - .2byte MOVE_CURSE, MOVE_ATTRACT, MOVE_YAWN, MOVE_ANCIENT_POWER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_SASSY - -@ 472 - .2byte SPECIES_MISDREAVUS - .2byte MOVE_PSYCHIC, MOVE_ATTRACT, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_BOLD - -@ 473 - .2byte SPECIES_FEAROW - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_ATTRACT, MOVE_PURSUIT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 474 - .2byte SPECIES_GRANBULL - .2byte MOVE_OVERHEAT, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FACADE - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .4byte NATURE_QUIET - -@ 475 - .2byte SPECIES_JYNX - .2byte MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_LOVELY_KISS, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 476 - .2byte SPECIES_DUSCLOPS - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 477 - .2byte SPECIES_DODRIO - .2byte MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_FAINT_ATTACK, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 478 - .2byte SPECIES_MR_MIME - .2byte MOVE_BATON_PASS, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_PSYCHIC - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 479 - .2byte SPECIES_LANTURN - .2byte MOVE_FLAIL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_SURF - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 480 - .2byte SPECIES_BRELOOM - .2byte MOVE_GIGA_DRAIN, MOVE_LEECH_SEED, MOVE_FOCUS_PUNCH, MOVE_SPORE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_DOCILE - -@ 481 - .2byte SPECIES_FORRETRESS - .2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_COUNTER, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 482 - .2byte SPECIES_SKARMORY - .2byte MOVE_SPIKES, MOVE_ROAR, MOVE_DRILL_PECK, MOVE_TOXIC - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 483 - .2byte SPECIES_WHISCASH - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_SPARK, MOVE_FUTURE_SIGHT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 484 - .2byte SPECIES_XATU - .2byte MOVE_FLY, MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 485 - .2byte SPECIES_CLEFABLE - .2byte MOVE_METEOR_MASH, MOVE_COSMIC_POWER, MOVE_DOUBLE_TEAM, MOVE_FOLLOW_ME - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 486 - .2byte SPECIES_HARIYAMA - .2byte MOVE_CROSS_CHOP, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 487 - .2byte SPECIES_RAICHU - .2byte MOVE_THUNDERBOLT, MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 488 - .2byte SPECIES_DEWGONG - .2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_ENCORE, MOVE_DISABLE - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 489 - .2byte SPECIES_MANECTRIC - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 490 - .2byte SPECIES_VILEPLUME - .2byte MOVE_INGRAIN, MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 491 - .2byte SPECIES_VICTREEBEL - .2byte MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_SERIOUS - -@ 492 - .2byte SPECIES_ELECTRODE - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 493 - .2byte SPECIES_EXPLOUD - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 494 - .2byte SPECIES_SHIFTRY - .2byte MOVE_LEECH_SEED, MOVE_DIG, MOVE_DOUBLE_TEAM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_IMPISH - -@ 495 - .2byte SPECIES_GLALIE - .2byte MOVE_EXPLOSION, MOVE_ENDURE, MOVE_BODY_SLAM, MOVE_ICY_WIND - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 496 - .2byte SPECIES_LUDICOLO - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 497 - .2byte SPECIES_HYPNO - .2byte MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_DREAM_EATER, MOVE_PSYCHIC - .byte BATTLE_FRONTIER_ITEM_TWISTED_SPOON - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 498 - .2byte SPECIES_GOLEM - .2byte MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 499 - .2byte SPECIES_RHYDON - .2byte MOVE_EARTHQUAKE, MOVE_HORN_DRILL, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 500 - .2byte SPECIES_ALAKAZAM - .2byte MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_THUNDER_WAVE, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 501 - .2byte SPECIES_WEEZING - .2byte MOVE_MEMENTO, MOVE_SLUDGE_BOMB, MOVE_FACADE, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 502 - .2byte SPECIES_KANGASKHAN - .2byte MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 503 - .2byte SPECIES_ELECTABUZZ - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_ATTRACT, MOVE_FOCUS_PUNCH - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 504 - .2byte SPECIES_TAUROS - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 505 - .2byte SPECIES_SLOWBRO - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_YAWN - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_MODEST - -@ 506 - .2byte SPECIES_SLOWKING - .2byte MOVE_YAWN, MOVE_THUNDER_WAVE, MOVE_SURF, MOVE_PSYCHIC - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 507 - .2byte SPECIES_MILTANK - .2byte MOVE_FOCUS_PUNCH, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 508 - .2byte SPECIES_ALTARIA - .2byte MOVE_PERISH_SONG, MOVE_DRAGON_BREATH, MOVE_PURSUIT, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 509 - .2byte SPECIES_NIDOQUEEN - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 510 - .2byte SPECIES_NIDOKING - .2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 511 - .2byte SPECIES_MAGMAR - .2byte MOVE_FIRE_BLAST, MOVE_SMOKESCREEN, MOVE_THUNDER_PUNCH, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 512 - .2byte SPECIES_CRADILY - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_PSYCH_UP - .byte BATTLE_FRONTIER_ITEM_SITRUS_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 513 - .2byte SPECIES_ARMALDO - .2byte MOVE_IRON_TAIL, MOVE_ANCIENT_POWER, MOVE_BRICK_BREAK, MOVE_KNOCK_OFF - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 514 - .2byte SPECIES_GOLDUCK - .2byte MOVE_CROSS_CHOP, MOVE_SURF, MOVE_SWAGGER, MOVE_PSYCH_UP - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 515 - .2byte SPECIES_RAPIDASH - .2byte MOVE_FIRE_BLAST, MOVE_BOUNCE, MOVE_DOUBLE_TEAM, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 516 - .2byte SPECIES_MUK - .2byte MOVE_CURSE, MOVE_REST, MOVE_SLUDGE_BOMB, MOVE_DYNAMIC_PUNCH - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 517 - .2byte SPECIES_GENGAR - .2byte MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 518 - .2byte SPECIES_AMPHAROS - .2byte MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_FOCUS_PUNCH, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 519 - .2byte SPECIES_SCIZOR - .2byte MOVE_SILVER_WIND, MOVE_STEEL_WING, MOVE_SWORDS_DANCE, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 520 - .2byte SPECIES_HERACROSS - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_BULK_UP - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_JOLLY - -@ 521 - .2byte SPECIES_URSARING - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 522 - .2byte SPECIES_HOUNDOOM - .2byte MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_ROAR, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 523 - .2byte SPECIES_DONPHAN - .2byte MOVE_FLAIL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 524 - .2byte SPECIES_CLAYDOL - .2byte MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_COSMIC_POWER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 525 - .2byte SPECIES_WAILORD - .2byte MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_CURSE, MOVE_AMNESIA - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 526 - .2byte SPECIES_NINETALES - .2byte MOVE_HEAT_WAVE, MOVE_BODY_SLAM, MOVE_GRUDGE, MOVE_SUNNY_DAY - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 527 - .2byte SPECIES_MACHAMP - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_BULK_UP, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 528 - .2byte SPECIES_SHUCKLE - .2byte MOVE_SANDSTORM, MOVE_DIG, MOVE_FLASH, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_CAREFUL - -@ 529 - .2byte SPECIES_STEELIX - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_SANDSTORM, MOVE_BLOCK - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 530 - .2byte SPECIES_TENTACRUEL - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_SURF - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 531 - .2byte SPECIES_AERODACTYL - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 532 - .2byte SPECIES_PORYGON2 - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_THUNDER_WAVE, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 533 - .2byte SPECIES_GARDEVOIR - .2byte MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_DOUBLE_TEAM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 534 - .2byte SPECIES_EXEGGUTOR - .2byte MOVE_RETURN, MOVE_CURSE, MOVE_SLEEP_POWDER, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 535 - .2byte SPECIES_STARMIE - .2byte MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 536 - .2byte SPECIES_FLYGON - .2byte MOVE_SOLAR_BEAM, MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_SUNNY_DAY - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 537 - .2byte SPECIES_VENUSAUR - .2byte MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 538 - .2byte SPECIES_VAPOREON - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 539 - .2byte SPECIES_JOLTEON - .2byte MOVE_THUNDERBOLT, MOVE_DIG, MOVE_DOUBLE_KICK, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 540 - .2byte SPECIES_FLAREON - .2byte MOVE_CURSE, MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_RELAXED - -@ 541 - .2byte SPECIES_MEGANIUM - .2byte MOVE_LEECH_SEED, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_GRASS_WHISTLE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 542 - .2byte SPECIES_ESPEON - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_CALM_MIND, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 543 - .2byte SPECIES_UMBREON - .2byte MOVE_CURSE, MOVE_SCREECH, MOVE_DOUBLE_TEAM, MOVE_DOUBLE_EDGE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 544 - .2byte SPECIES_BLASTOISE - .2byte MOVE_HYDRO_PUMP, MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 545 - .2byte SPECIES_FERALIGATR - .2byte MOVE_SURF, MOVE_DRAGON_CLAW, MOVE_BRICK_BREAK, MOVE_SCARY_FACE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_SASSY - -@ 546 - .2byte SPECIES_AGGRON - .2byte MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 547 - .2byte SPECIES_BLAZIKEN - .2byte MOVE_BLAZE_KICK, MOVE_MEGA_KICK, MOVE_THUNDER_PUNCH, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 548 - .2byte SPECIES_WALREIN - .2byte MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_QUIRKY - -@ 549 - .2byte SPECIES_SCEPTILE - .2byte MOVE_LEAF_BLADE, MOVE_THUNDER_PUNCH, MOVE_ATTRACT, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 550 - .2byte SPECIES_CHARIZARD - .2byte MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE, MOVE_SMOKESCREEN - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 551 - .2byte SPECIES_TYPHLOSION - .2byte MOVE_FLAMETHROWER, MOVE_THUNDER_PUNCH, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 552 - .2byte SPECIES_LAPRAS - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_TIMID - -@ 553 - .2byte SPECIES_CROBAT - .2byte MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 554 - .2byte SPECIES_SWAMPERT - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 555 - .2byte SPECIES_GYARADOS - .2byte MOVE_HYDRO_PUMP, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_BLIZZARD - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 556 - .2byte SPECIES_SNORLAX - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 557 - .2byte SPECIES_KINGDRA - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 558 - .2byte SPECIES_BLISSEY - .2byte MOVE_SEISMIC_TOSS, MOVE_SING, MOVE_ATTRACT, MOVE_SUBSTITUTE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_BOLD - -@ 559 - .2byte SPECIES_MILOTIC - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_SAFEGUARD, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 560 - .2byte SPECIES_ARCANINE - .2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_CRUNCH, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_DOCILE - -@ 561 - .2byte SPECIES_SALAMENCE - .2byte MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_SWAGGER, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 562 - .2byte SPECIES_METAGROSS - .2byte MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_PSYCH_UP, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 563 - .2byte SPECIES_SLAKING - .2byte MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_YAWN, MOVE_AMNESIA - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_ADAMANT - -@ 564 - .2byte SPECIES_DUGTRIO - .2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_FISSURE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 565 - .2byte SPECIES_MEDICHAM - .2byte MOVE_DYNAMIC_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_HARDY - -@ 566 - .2byte SPECIES_MISDREAVUS - .2byte MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 567 - .2byte SPECIES_FEAROW - .2byte MOVE_DRILL_PECK, MOVE_RETURN, MOVE_STEEL_WING, MOVE_FAINT_ATTACK - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 568 - .2byte SPECIES_GRANBULL - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 569 - .2byte SPECIES_JYNX - .2byte MOVE_DREAM_EATER, MOVE_LOVELY_KISS, MOVE_ATTRACT, MOVE_SUBSTITUTE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 570 - .2byte SPECIES_DUSCLOPS - .2byte MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 571 - .2byte SPECIES_DODRIO - .2byte MOVE_DOUBLE_EDGE, MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_FAINT_ATTACK - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 572 - .2byte SPECIES_MR_MIME - .2byte MOVE_TRICK, MOVE_TORMENT, MOVE_PSYCHIC, MOVE_THUNDERBOLT - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 573 - .2byte SPECIES_LANTURN - .2byte MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_CONFUSE_RAY, MOVE_RAIN_DANCE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 574 - .2byte SPECIES_BRELOOM - .2byte MOVE_IRON_TAIL, MOVE_FOCUS_PUNCH, MOVE_ATTRACT, MOVE_SPORE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 575 - .2byte SPECIES_FORRETRESS - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_ZAP_CANNON - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 576 - .2byte SPECIES_WHISCASH - .2byte MOVE_SLEEP_TALK, MOVE_REST, MOVE_SURF, MOVE_FISSURE - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_HARDY - -@ 577 - .2byte SPECIES_XATU - .2byte MOVE_DRILL_PECK, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_STEEL_WING - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 578 - .2byte SPECIES_SKARMORY - .2byte MOVE_TOXIC, MOVE_CURSE, MOVE_REST, MOVE_FLY - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 579 - .2byte SPECIES_MAROWAK - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_THICK_CLUB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 580 - .2byte SPECIES_QUAGSIRE - .2byte MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE, MOVE_CURSE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 581 - .2byte SPECIES_CLEFABLE - .2byte MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_FLAMETHROWER, MOVE_MAGICAL_LEAF - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 582 - .2byte SPECIES_HARIYAMA - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FACADE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 583 - .2byte SPECIES_RAICHU - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_IRON_TAIL, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_CHERI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_DOCILE - -@ 584 - .2byte SPECIES_DEWGONG - .2byte MOVE_HORN_DRILL, MOVE_SHEER_COLD, MOVE_SLEEP_TALK, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 585 - .2byte SPECIES_MANECTRIC - .2byte MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_THUNDER_WAVE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 586 - .2byte SPECIES_VILEPLUME - .2byte MOVE_ATTRACT, MOVE_STUN_SPORE, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 587 - .2byte SPECIES_VICTREEBEL - .2byte MOVE_STUN_SPORE, MOVE_INGRAIN, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 588 - .2byte SPECIES_ELECTRODE - .2byte MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_LIECHI_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 589 - .2byte SPECIES_EXPLOUD - .2byte MOVE_OVERHEAT, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_EXTRASENSORY - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 590 - .2byte SPECIES_SHIFTRY - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 591 - .2byte SPECIES_GLALIE - .2byte MOVE_BLIZZARD, MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 592 - .2byte SPECIES_LUDICOLO - .2byte MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 593 - .2byte SPECIES_HYPNO - .2byte MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_MEGA_KICK, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 594 - .2byte SPECIES_GOLEM - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 595 - .2byte SPECIES_RHYDON - .2byte MOVE_MEGAHORN, MOVE_CRUSH_CLAW, MOVE_EARTHQUAKE, MOVE_HORN_DRILL - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 596 - .2byte SPECIES_ALAKAZAM - .2byte MOVE_TRICK, MOVE_DISABLE, MOVE_PSYCHIC, MOVE_SKILL_SWAP - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 597 - .2byte SPECIES_WEEZING - .2byte MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 598 - .2byte SPECIES_KANGASKHAN - .2byte MOVE_REVERSAL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 599 - .2byte SPECIES_ELECTABUZZ - .2byte MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDERBOLT, MOVE_CROSS_CHOP - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 600 - .2byte SPECIES_TAUROS - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 601 - .2byte SPECIES_SLOWBRO - .2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .4byte NATURE_QUIET - -@ 602 - .2byte SPECIES_SLOWKING - .2byte MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 603 - .2byte SPECIES_MILTANK - .2byte MOVE_REVERSAL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 604 - .2byte SPECIES_ALTARIA - .2byte MOVE_SING, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 605 - .2byte SPECIES_NIDOQUEEN - .2byte MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_CRUNCH - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 606 - .2byte SPECIES_NIDOKING - .2byte MOVE_HORN_DRILL, MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SURF - .byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 607 - .2byte SPECIES_MAGMAR - .2byte MOVE_MEGA_KICK, MOVE_CROSS_CHOP, MOVE_IRON_TAIL, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_IMPISH - -@ 608 - .2byte SPECIES_CRADILY - .2byte MOVE_SUBSTITUTE, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 609 - .2byte SPECIES_ARMALDO - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_SWORDS_DANCE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 610 - .2byte SPECIES_GOLDUCK - .2byte MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 611 - .2byte SPECIES_RAPIDASH - .2byte MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_HYPNOSIS - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 612 - .2byte SPECIES_MUK - .2byte MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_PUNCH - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_QUIET - -@ 613 - .2byte SPECIES_GENGAR - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_GIGA_DRAIN, MOVE_SKILL_SWAP - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 614 - .2byte SPECIES_AMPHAROS - .2byte MOVE_THUNDERBOLT, MOVE_MEGA_KICK, MOVE_IRON_TAIL, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 615 - .2byte SPECIES_SCIZOR - .2byte MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY, MOVE_SLASH - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_CAREFUL - -@ 616 - .2byte SPECIES_HERACROSS - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 617 - .2byte SPECIES_URSARING - .2byte MOVE_FIRE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_CRUNCH - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 618 - .2byte SPECIES_HOUNDOOM - .2byte MOVE_OVERHEAT, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 619 - .2byte SPECIES_DONPHAN - .2byte MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SECRET_POWER - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 620 - .2byte SPECIES_CLAYDOL - .2byte MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 621 - .2byte SPECIES_WAILORD - .2byte MOVE_HYDRO_PUMP, MOVE_FISSURE, MOVE_DOUBLE_TEAM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 622 - .2byte SPECIES_NINETALES - .2byte MOVE_FIRE_BLAST, MOVE_IRON_TAIL, MOVE_CONFUSE_RAY, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 623 - .2byte SPECIES_MACHAMP - .2byte MOVE_CROSS_CHOP, MOVE_FIRE_BLAST, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 624 - .2byte SPECIES_SHUCKLE - .2byte MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_TOXIC, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_CAREFUL - -@ 625 - .2byte SPECIES_STEELIX - .2byte MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_ROCK_SLIDE, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 626 - .2byte SPECIES_TENTACRUEL - .2byte MOVE_SURF, MOVE_GIGA_DRAIN, MOVE_ICE_BEAM, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 627 - .2byte SPECIES_AERODACTYL - .2byte MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_DRAGON_CLAW - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 628 - .2byte SPECIES_PORYGON2 - .2byte MOVE_PSYCHIC, MOVE_TRI_ATTACK, MOVE_THUNDER_WAVE, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 629 - .2byte SPECIES_GARDEVOIR - .2byte MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH, MOVE_MAGICAL_LEAF - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 630 - .2byte SPECIES_EXEGGUTOR - .2byte MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 631 - .2byte SPECIES_STARMIE - .2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 632 - .2byte SPECIES_FLYGON - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 633 - .2byte SPECIES_VENUSAUR - .2byte MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SLEEP_POWDER - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 634 - .2byte SPECIES_VAPOREON - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_BATON_PASS - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 635 - .2byte SPECIES_JOLTEON - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_AGILITY, MOVE_BATON_PASS - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 636 - .2byte SPECIES_FLAREON - .2byte MOVE_SHADOW_BALL, MOVE_FLAIL, MOVE_ENDURE, MOVE_OVERHEAT - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 637 - .2byte SPECIES_MEGANIUM - .2byte MOVE_EARTHQUAKE, MOVE_FLAIL, MOVE_ENDURE, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_JOLLY - -@ 638 - .2byte SPECIES_ESPEON - .2byte MOVE_PSYCHIC, MOVE_BITE, MOVE_WISH, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 639 - .2byte SPECIES_UMBREON - .2byte MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ATTRACT, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 640 - .2byte SPECIES_BLASTOISE - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 641 - .2byte SPECIES_FERALIGATR - .2byte MOVE_HYDRO_PUMP, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 642 - .2byte SPECIES_AGGRON - .2byte MOVE_SURF, MOVE_THUNDER, MOVE_FIRE_BLAST, MOVE_BLIZZARD - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 643 - .2byte SPECIES_BLAZIKEN - .2byte MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_REVERSAL - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 644 - .2byte SPECIES_WALREIN - .2byte MOVE_SHEER_COLD, MOVE_FISSURE, MOVE_SURF, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 645 - .2byte SPECIES_SCEPTILE - .2byte MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 646 - .2byte SPECIES_CHARIZARD - .2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_BITE, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 647 - .2byte SPECIES_TYPHLOSION - .2byte MOVE_EARTHQUAKE, MOVE_OVERHEAT, MOVE_ENDURE, MOVE_REVERSAL - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 648 - .2byte SPECIES_LAPRAS - .2byte MOVE_DOUBLE_EDGE, MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 649 - .2byte SPECIES_CROBAT - .2byte MOVE_AIR_CUTTER, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_SCREECH - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 650 - .2byte SPECIES_SWAMPERT - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_BRAVE - -@ 651 - .2byte SPECIES_GYARADOS - .2byte MOVE_SURF, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 652 - .2byte SPECIES_SNORLAX - .2byte MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_ADAMANT - -@ 653 - .2byte SPECIES_KINGDRA - .2byte MOVE_FLAIL, MOVE_HYDRO_PUMP, MOVE_DRAGON_DANCE, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 654 - .2byte SPECIES_BLISSEY - .2byte MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_CALM_MIND, MOVE_SOFT_BOILED - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_BOLD - -@ 655 - .2byte SPECIES_MILOTIC - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_ATTRACT, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 656 - .2byte SPECIES_ARCANINE - .2byte MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 657 - .2byte SPECIES_SALAMENCE - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 658 - .2byte SPECIES_METAGROSS - .2byte MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_DOUBLE_TEAM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 659 - .2byte SPECIES_SLAKING - .2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_ADAMANT - -@ 660 - .2byte SPECIES_DUGTRIO - .2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FISSURE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 661 - .2byte SPECIES_MEDICHAM - .2byte MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 662 - .2byte SPECIES_MISDREAVUS - .2byte MOVE_DESTINY_BOND, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_TIMID - -@ 663 - .2byte SPECIES_FEAROW - .2byte MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SKY_ATTACK - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 664 - .2byte SPECIES_GRANBULL - .2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_BRAVE - -@ 665 - .2byte SPECIES_JYNX - .2byte MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_LOVELY_KISS, MOVE_FAKE_TEARS - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 666 - .2byte SPECIES_DUSCLOPS - .2byte MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_CURSE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 667 - .2byte SPECIES_DODRIO - .2byte MOVE_FLAIL, MOVE_ENDURE, MOVE_DRILL_PECK, MOVE_FACADE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 668 - .2byte SPECIES_MR_MIME - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 669 - .2byte SPECIES_LANTURN - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 670 - .2byte SPECIES_BRELOOM - .2byte MOVE_FOCUS_PUNCH, MOVE_SLUDGE_BOMB, MOVE_SPORE, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 671 - .2byte SPECIES_FORRETRESS - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 672 - .2byte SPECIES_WHISCASH - .2byte MOVE_FISSURE, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 673 - .2byte SPECIES_XATU - .2byte MOVE_PSYCHIC, MOVE_DRILL_PECK, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_PETAYA_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 674 - .2byte SPECIES_SKARMORY - .2byte MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_COUNTER, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 675 - .2byte SPECIES_MAROWAK - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_MEGA_KICK - .byte BATTLE_FRONTIER_ITEM_THICK_CLUB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 676 - .2byte SPECIES_QUAGSIRE - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_AMNESIA - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_SASSY - -@ 677 - .2byte SPECIES_CLEFABLE - .2byte MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_SOFT_BOILED - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 678 - .2byte SPECIES_HARIYAMA - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 679 - .2byte SPECIES_RAICHU - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_PROTECT, MOVE_MEGA_KICK - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 680 - .2byte SPECIES_DEWGONG - .2byte MOVE_SHEER_COLD, MOVE_ICE_BEAM, MOVE_SURF, MOVE_SIGNAL_BEAM - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 681 - .2byte SPECIES_MANECTRIC - .2byte MOVE_THUNDERBOLT, MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 682 - .2byte SPECIES_VILEPLUME - .2byte MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 683 - .2byte SPECIES_VICTREEBEL - .2byte MOVE_GIGA_DRAIN, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_SYNTHESIS - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 684 - .2byte SPECIES_ELECTRODE - .2byte MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_NAUGHTY - -@ 685 - .2byte SPECIES_EXPLOUD - .2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_OVERHEAT - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 686 - .2byte SPECIES_SHIFTRY - .2byte MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_MEGA_KICK, MOVE_FAKE_OUT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 687 - .2byte SPECIES_GLALIE - .2byte MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 688 - .2byte SPECIES_LUDICOLO - .2byte MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_TOXIC - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 689 - .2byte SPECIES_HYPNO - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 690 - .2byte SPECIES_GOLEM - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 691 - .2byte SPECIES_RHYDON - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_HORN_DRILL - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 692 - .2byte SPECIES_ALAKAZAM - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 693 - .2byte SPECIES_WEEZING - .2byte MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FRUSTRATION, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 694 - .2byte SPECIES_KANGASKHAN - .2byte MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 695 - .2byte SPECIES_ELECTABUZZ - .2byte MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_MEGA_KICK, MOVE_CROSS_CHOP - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 696 - .2byte SPECIES_TAUROS - .2byte MOVE_DOUBLE_EDGE, MOVE_ROCK_TOMB, MOVE_THUNDERBOLT, MOVE_SURF - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 697 - .2byte SPECIES_SLOWBRO - .2byte MOVE_PSYCHIC, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .4byte NATURE_SASSY - -@ 698 - .2byte SPECIES_SLOWKING - .2byte MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 699 - .2byte SPECIES_MILTANK - .2byte MOVE_DOUBLE_EDGE, MOVE_CURSE, MOVE_DOUBLE_TEAM, MOVE_MILK_DRINK - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 700 - .2byte SPECIES_ALTARIA - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 701 - .2byte SPECIES_NIDOQUEEN - .2byte MOVE_SUPERPOWER, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 702 - .2byte SPECIES_NIDOKING - .2byte MOVE_MEGAHORN, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_THUNDER - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 703 - .2byte SPECIES_MAGMAR - .2byte MOVE_FLAMETHROWER, MOVE_PSYCHIC, MOVE_CROSS_CHOP, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 704 - .2byte SPECIES_CRADILY - .2byte MOVE_TOXIC, MOVE_INGRAIN, MOVE_MIRROR_COAT, MOVE_GIGA_DRAIN - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 705 - .2byte SPECIES_ARMALDO - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 706 - .2byte SPECIES_GOLDUCK - .2byte MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 707 - .2byte SPECIES_RAPIDASH - .2byte MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_IRON_TAIL, MOVE_DOUBLE_KICK - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 708 - .2byte SPECIES_MUK - .2byte MOVE_SLUDGE_BOMB, MOVE_BRICK_BREAK, MOVE_GIGA_DRAIN, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_BRAVE - -@ 709 - .2byte SPECIES_GENGAR - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 710 - .2byte SPECIES_AMPHAROS - .2byte MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_THUNDER_WAVE, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 711 - .2byte SPECIES_SCIZOR - .2byte MOVE_SILVER_WIND, MOVE_SWORDS_DANCE, MOVE_AGILITY, MOVE_BATON_PASS - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 712 - .2byte SPECIES_HERACROSS - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_REVERSAL, MOVE_ENDURE - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 713 - .2byte SPECIES_URSARING - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 714 - .2byte SPECIES_HOUNDOOM - .2byte MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_CRUNCH, MOVE_SUNNY_DAY - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 715 - .2byte SPECIES_DONPHAN - .2byte MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_IRON_TAIL - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 716 - .2byte SPECIES_CLAYDOL - .2byte MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 717 - .2byte SPECIES_WAILORD - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_FISSURE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 718 - .2byte SPECIES_NINETALES - .2byte MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_QUIRKY - -@ 719 - .2byte SPECIES_MACHAMP - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 720 - .2byte SPECIES_SHUCKLE - .2byte MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_WRAP, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_CAREFUL - -@ 721 - .2byte SPECIES_STEELIX - .2byte MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 722 - .2byte SPECIES_TENTACRUEL - .2byte MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIRKY - -@ 723 - .2byte SPECIES_AERODACTYL - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_BITE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 724 - .2byte SPECIES_PORYGON2 - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 725 - .2byte SPECIES_GARDEVOIR - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 726 - .2byte SPECIES_EXEGGUTOR - .2byte MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 727 - .2byte SPECIES_STARMIE - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 728 - .2byte SPECIES_FLYGON - .2byte MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_DOUBLE_EDGE, MOVE_CRUNCH - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 729 - .2byte SPECIES_VENUSAUR - .2byte MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 730 - .2byte SPECIES_VAPOREON - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 731 - .2byte SPECIES_JOLTEON - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BITE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_TIMID - -@ 732 - .2byte SPECIES_FLAREON - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 733 - .2byte SPECIES_MEGANIUM - .2byte MOVE_GIGA_DRAIN, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_BODY_SLAM - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 734 - .2byte SPECIES_ESPEON - .2byte MOVE_PSYCHIC, MOVE_BITE, MOVE_ATTRACT, MOVE_CALM_MIND - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 735 - .2byte SPECIES_UMBREON - .2byte MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 736 - .2byte SPECIES_BLASTOISE - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 737 - .2byte SPECIES_FERALIGATR - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 738 - .2byte SPECIES_AGGRON - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 739 - .2byte SPECIES_BLAZIKEN - .2byte MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_THUNDER_PUNCH, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 740 - .2byte SPECIES_WALREIN - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_SHEER_COLD - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 741 - .2byte SPECIES_SCEPTILE - .2byte MOVE_LEAF_BLADE, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_THUNDER_PUNCH - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 742 - .2byte SPECIES_CHARIZARD - .2byte MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 743 - .2byte SPECIES_TYPHLOSION - .2byte MOVE_OVERHEAT, MOVE_THUNDER_PUNCH, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 744 - .2byte SPECIES_LAPRAS - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_PSYCHIC - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 745 - .2byte SPECIES_CROBAT - .2byte MOVE_SLUDGE_BOMB, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 746 - .2byte SPECIES_SWAMPERT - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 747 - .2byte SPECIES_GYARADOS - .2byte MOVE_RETURN, MOVE_EARTHQUAKE, MOVE_DRAGON_DANCE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 748 - .2byte SPECIES_SNORLAX - .2byte MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_CURSE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 749 - .2byte SPECIES_KINGDRA - .2byte MOVE_DOUBLE_EDGE, MOVE_ICE_BEAM, MOVE_DRAGON_DANCE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 750 - .2byte SPECIES_BLISSEY - .2byte MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_COUNTER, MOVE_SOFT_BOILED - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_BOLD - -@ 751 - .2byte SPECIES_MILOTIC - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_MIRROR_COAT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 752 - .2byte SPECIES_ARCANINE - .2byte MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_DOUBLE_EDGE - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_DOCILE - -@ 753 - .2byte SPECIES_SALAMENCE - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 754 - .2byte SPECIES_METAGROSS - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 755 - .2byte SPECIES_SLAKING - .2byte MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_YAWN - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .4byte NATURE_MODEST - -@ 756 - .2byte SPECIES_ARTICUNO - .2byte MOVE_ICE_BEAM, MOVE_WATER_PULSE, MOVE_ICY_WIND, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 757 - .2byte SPECIES_ZAPDOS - .2byte MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_DOCILE - -@ 758 - .2byte SPECIES_MOLTRES - .2byte MOVE_FLAMETHROWER, MOVE_AERIAL_ACE, MOVE_MUD_SLAP, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 759 - .2byte SPECIES_RAIKOU - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 760 - .2byte SPECIES_ENTEI - .2byte MOVE_FLAMETHROWER, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 761 - .2byte SPECIES_SUICUNE - .2byte MOVE_SURF, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 762 - .2byte SPECIES_REGIROCK - .2byte MOVE_SUPERPOWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 763 - .2byte SPECIES_REGICE - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_AMNESIA, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 764 - .2byte SPECIES_REGISTEEL - .2byte MOVE_METAL_CLAW, MOVE_CURSE, MOVE_AMNESIA, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 765 - .2byte SPECIES_LATIAS - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 766 - .2byte SPECIES_LATIOS - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 767 - .2byte SPECIES_ARTICUNO - .2byte MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_BLIZZARD, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 768 - .2byte SPECIES_ZAPDOS - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DRILL_PECK, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 769 - .2byte SPECIES_MOLTRES - .2byte MOVE_OVERHEAT, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 770 - .2byte SPECIES_RAIKOU - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 771 - .2byte SPECIES_ENTEI - .2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 772 - .2byte SPECIES_SUICUNE - .2byte MOVE_TOXIC, MOVE_DIVE, MOVE_DOUBLE_TEAM, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 773 - .2byte SPECIES_REGIROCK - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 774 - .2byte SPECIES_REGICE - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 775 - .2byte SPECIES_REGISTEEL - .2byte MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 776 - .2byte SPECIES_LATIAS - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 777 - .2byte SPECIES_LATIOS - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 778 - .2byte SPECIES_ARTICUNO - .2byte MOVE_ICE_BEAM, MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PROTECT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 779 - .2byte SPECIES_ZAPDOS - .2byte MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_SUBSTITUTE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 780 - .2byte SPECIES_MOLTRES - .2byte MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_DOUBLE_TEAM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 781 - .2byte SPECIES_RAIKOU - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 782 - .2byte SPECIES_ENTEI - .2byte MOVE_FLAMETHROWER, MOVE_DOUBLE_EDGE, MOVE_SWAGGER, MOVE_PSYCH_UP - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 783 - .2byte SPECIES_SUICUNE - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 784 - .2byte SPECIES_REGIROCK - .2byte MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_CURSE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 785 - .2byte SPECIES_REGICE - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_QUIET - -@ 786 - .2byte SPECIES_REGISTEEL - .2byte MOVE_ANCIENT_POWER, MOVE_AMNESIA, MOVE_COUNTER, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 787 - .2byte SPECIES_LATIAS - .2byte MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 788 - .2byte SPECIES_LATIOS - .2byte MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 789 - .2byte SPECIES_ARTICUNO - .2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 790 - .2byte SPECIES_ZAPDOS - .2byte MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 791 - .2byte SPECIES_MOLTRES - .2byte MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SAFEGUARD - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_QUIET - -@ 792 - .2byte SPECIES_RAIKOU - .2byte MOVE_THUNDERBOLT, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 793 - .2byte SPECIES_ENTEI - .2byte MOVE_FLAMETHROWER, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 794 - .2byte SPECIES_SUICUNE - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_BITE, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 795 - .2byte SPECIES_REGIROCK - .2byte MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_CAREFUL - -@ 796 - .2byte SPECIES_REGICE - .2byte MOVE_ICE_BEAM, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 797 - .2byte SPECIES_REGISTEEL - .2byte MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_IMPISH - -@ 798 - .2byte SPECIES_LATIAS - .2byte MOVE_MIST_BALL, MOVE_SHADOW_BALL, MOVE_CHARM, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 799 - .2byte SPECIES_LATIOS - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 800 - .2byte SPECIES_GENGAR - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 801 - .2byte SPECIES_GENGAR - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 802 - .2byte SPECIES_GENGAR - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 803 - .2byte SPECIES_GENGAR - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 804 - .2byte SPECIES_URSARING - .2byte MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_CHOICE_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 805 - .2byte SPECIES_URSARING - .2byte MOVE_HYPER_BEAM, MOVE_YAWN, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 806 - .2byte SPECIES_URSARING - .2byte MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BULK_UP - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 807 - .2byte SPECIES_URSARING - .2byte MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 808 - .2byte SPECIES_MACHAMP - .2byte MOVE_CROSS_CHOP, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 809 - .2byte SPECIES_MACHAMP - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_ROCK_TOMB - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 810 - .2byte SPECIES_MACHAMP - .2byte MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 811 - .2byte SPECIES_MACHAMP - .2byte MOVE_REVENGE, MOVE_ROCK_SLIDE, MOVE_FACADE, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 812 - .2byte SPECIES_GARDEVOIR - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ENDURE, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 813 - .2byte SPECIES_GARDEVOIR - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .4byte NATURE_TIMID - -@ 814 - .2byte SPECIES_GARDEVOIR - .2byte MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BOLD - -@ 815 - .2byte SPECIES_GARDEVOIR - .2byte MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_ATTRACT, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 816 - .2byte SPECIES_STARMIE - .2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_RECOVER, MOVE_LIGHT_SCREEN - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 817 - .2byte SPECIES_STARMIE - .2byte MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 818 - .2byte SPECIES_STARMIE - .2byte MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 819 - .2byte SPECIES_STARMIE - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_COSMIC_POWER, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 820 - .2byte SPECIES_LAPRAS - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 821 - .2byte SPECIES_LAPRAS - .2byte MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 822 - .2byte SPECIES_LAPRAS - .2byte MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_REST, MOVE_SLEEP_TALK - .byte BATTLE_FRONTIER_ITEM_LEPPA_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 823 - .2byte SPECIES_LAPRAS - .2byte MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_SING, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_CALM - -@ 824 - .2byte SPECIES_SNORLAX - .2byte MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 825 - .2byte SPECIES_SNORLAX - .2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 826 - .2byte SPECIES_SNORLAX - .2byte MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_CURSE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 827 - .2byte SPECIES_SNORLAX - .2byte MOVE_RETURN, MOVE_SHADOW_BALL, MOVE_BELLY_DRUM, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 828 - .2byte SPECIES_SALAMENCE - .2byte MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 829 - .2byte SPECIES_SALAMENCE - .2byte MOVE_HEADBUTT, MOVE_AERIAL_ACE, MOVE_CRUNCH, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_HARDY - -@ 830 - .2byte SPECIES_SALAMENCE - .2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 831 - .2byte SPECIES_SALAMENCE - .2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 832 - .2byte SPECIES_METAGROSS - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_JOLLY - -@ 833 - .2byte SPECIES_METAGROSS - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 834 - .2byte SPECIES_METAGROSS - .2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 835 - .2byte SPECIES_METAGROSS - .2byte MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 836 - .2byte SPECIES_REGIROCK - .2byte MOVE_HYPER_BEAM, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 837 - .2byte SPECIES_REGIROCK - .2byte MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ROCK_SLIDE, MOVE_EXPLOSION - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 838 - .2byte SPECIES_REGICE - .2byte MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_COUNTER - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_BRAVE - -@ 839 - .2byte SPECIES_REGICE - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_SLEEP_TALK, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 840 - .2byte SPECIES_REGISTEEL - .2byte MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_DOUBLE_TEAM - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 841 - .2byte SPECIES_REGISTEEL - .2byte MOVE_SUPERPOWER, MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 842 - .2byte SPECIES_LATIAS - .2byte MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 843 - .2byte SPECIES_LATIAS - .2byte MOVE_MIST_BALL, MOVE_DRAGON_CLAW, MOVE_ATTRACT, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 844 - .2byte SPECIES_LATIAS - .2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 845 - .2byte SPECIES_LATIAS - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 846 - .2byte SPECIES_LATIOS - .2byte MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 847 - .2byte SPECIES_LATIOS - .2byte MOVE_LUSTER_PURGE, MOVE_SHADOW_BALL, MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 848 - .2byte SPECIES_LATIOS - .2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_DRAGON_DANCE, MOVE_RECOVER - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 849 - .2byte SPECIES_LATIOS - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE - .byte BATTLE_FRONTIER_ITEM_KINGS_ROCK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 850 - .2byte SPECIES_DRAGONITE - .2byte MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 851 - .2byte SPECIES_DRAGONITE - .2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 852 - .2byte SPECIES_DRAGONITE - .2byte MOVE_HYPER_BEAM, MOVE_ATTRACT, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_LEFTOVERS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .4byte NATURE_ADAMANT - -@ 853 - .2byte SPECIES_DRAGONITE - .2byte MOVE_HYPER_BEAM, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 854 - .2byte SPECIES_DRAGONITE - .2byte MOVE_OUTRAGE, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE, MOVE_ROAR - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 855 - .2byte SPECIES_DRAGONITE - .2byte MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_FLAMETHROWER - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 856 - .2byte SPECIES_DRAGONITE - .2byte MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 857 - .2byte SPECIES_DRAGONITE - .2byte MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_BRICK_BREAK - .byte BATTLE_FRONTIER_ITEM_SHELL_BELL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 858 - .2byte SPECIES_DRAGONITE - .2byte MOVE_THUNDER, MOVE_SURF, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 859 - .2byte SPECIES_DRAGONITE - .2byte MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_DOCILE - -@ 860 - .2byte SPECIES_TYRANITAR - .2byte MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_THUNDERBOLT, MOVE_SURF - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 861 - .2byte SPECIES_TYRANITAR - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_THUNDERBOLT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 862 - .2byte SPECIES_TYRANITAR - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 863 - .2byte SPECIES_TYRANITAR - .2byte MOVE_CRUNCH, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 864 - .2byte SPECIES_TYRANITAR - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 865 - .2byte SPECIES_TYRANITAR - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 866 - .2byte SPECIES_TYRANITAR - .2byte MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_CURSE - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 867 - .2byte SPECIES_TYRANITAR - .2byte MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 868 - .2byte SPECIES_TYRANITAR - .2byte MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ATTRACT - .byte BATTLE_FRONTIER_ITEM_QUICK_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_HARDY - -@ 869 - .2byte SPECIES_TYRANITAR - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_ADAMANT - -@ 870 - .2byte SPECIES_ARTICUNO - .2byte MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_AGILITY, MOVE_SWAGGER - .byte BATTLE_FRONTIER_ITEM_FOCUS_BAND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 871 - .2byte SPECIES_ARTICUNO - .2byte MOVE_ICE_BEAM, MOVE_AERIAL_ACE, MOVE_REFLECT, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 872 - .2byte SPECIES_ZAPDOS - .2byte MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE - .byte BATTLE_FRONTIER_ITEM_SCOPE_LENS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 873 - .2byte SPECIES_ZAPDOS - .2byte MOVE_THUNDER, MOVE_DRILL_PECK, MOVE_RAIN_DANCE, MOVE_DOUBLE_EDGE - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 874 - .2byte SPECIES_MOLTRES - .2byte MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_SWAGGER, MOVE_FACADE - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_DOCILE - -@ 875 - .2byte SPECIES_MOLTRES - .2byte MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_STEEL_WING - .byte BATTLE_FRONTIER_ITEM_WHITE_HERB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .4byte NATURE_DOCILE - -@ 876 - .2byte SPECIES_RAIKOU - .2byte MOVE_THUNDERBOLT, MOVE_DOUBLE_EDGE, MOVE_ROAR, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_BRIGHT_POWDER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .4byte NATURE_MODEST - -@ 877 - .2byte SPECIES_RAIKOU - .2byte MOVE_THUNDERBOLT, MOVE_CALM_MIND, MOVE_SUBSTITUTE, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 878 - .2byte SPECIES_ENTEI - .2byte MOVE_FIRE_BLAST, MOVE_DOUBLE_EDGE, MOVE_ENDURE, MOVE_REFLECT - .byte BATTLE_FRONTIER_ITEM_SALAC_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_DOCILE - -@ 879 - .2byte SPECIES_ENTEI - .2byte MOVE_FLAMETHROWER, MOVE_CALM_MIND, MOVE_ROAR, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .4byte NATURE_MODEST - -@ 880 - .2byte SPECIES_SUICUNE - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_ICY_WIND - .byte BATTLE_FRONTIER_ITEM_LUM_BERRY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .4byte NATURE_MODEST - -@ 881 - .2byte SPECIES_SUICUNE - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_REST - .byte BATTLE_FRONTIER_ITEM_CHESTO_BERRY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .4byte NATURE_MODEST diff --git a/data/battle_frontier/battle_frontier_trainer_mons.inc b/data/battle_frontier/battle_frontier_trainer_mons.inc deleted file mode 100644 index b2c04128e..000000000 --- a/data/battle_frontier/battle_frontier_trainer_mons.inc +++ /dev/null @@ -1,14630 +0,0 @@ - .align 1 -gBattleFrontierTrainerMons_Brady:: @ 85CED2E - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Conner:: @ 85CEDAC - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Bradley:: @ 85CEE2A - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Cybil:: @ 85CEEA8 - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Rodette:: @ 85CEF26 - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Peggy:: @ 85CEFA4 - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Keith:: @ 85CF022 - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Grayson:: @ 85CF07C - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Glenn:: @ 85CF0D6 - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Liliana:: @ 85CF130 - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Elise:: @ 85CF18A - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Zoey:: @ 85CF1E4 - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Manuel:: @ 85CF23E - .2byte 5 - .2byte 20 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 53 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 119 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 146 - .2byte 147 - .2byte 154 - .2byte 158 - .2byte 160 - .2byte -1 - -gBattleFrontierTrainerMons_Russ:: @ 85CF28A - .2byte 5 - .2byte 20 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 53 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 119 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 146 - .2byte 147 - .2byte 154 - .2byte 158 - .2byte 160 - .2byte -1 - -gBattleFrontierTrainerMons_Dustin:: @ 85CF2D6 - .2byte 5 - .2byte 20 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 53 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 119 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 146 - .2byte 147 - .2byte 154 - .2byte 158 - .2byte 160 - .2byte -1 - -gBattleFrontierTrainerMons_Tina:: @ 85CF322 - .2byte 5 - .2byte 20 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 53 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 119 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 146 - .2byte 147 - .2byte 154 - .2byte 158 - .2byte 160 - .2byte -1 - -gBattleFrontierTrainerMons_Gillian:: @ 85CF36E - .2byte 5 - .2byte 20 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 53 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 119 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 146 - .2byte 147 - .2byte 154 - .2byte 158 - .2byte 160 - .2byte -1 - -gBattleFrontierTrainerMons_Zoe:: @ 85CF3BA - .2byte 5 - .2byte 20 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 53 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 119 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 146 - .2byte 147 - .2byte 154 - .2byte 158 - .2byte 160 - .2byte -1 - -gBattleFrontierTrainerMons_Chen:: @ 85CF406 - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Al:: @ 85CF46E - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Mitch:: @ 85CF4D6 - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Anne:: @ 85CF53E - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Alize:: @ 85CF5A6 - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Lauren:: @ 85CF60E - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Kipp:: @ 85CF676 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 35 - .2byte 42 - .2byte 45 - .2byte 48 - .2byte 50 - .2byte 55 - .2byte 59 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 90 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 109 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte -1 - -gBattleFrontierTrainerMons_Jason:: @ 85CF6B8 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 35 - .2byte 42 - .2byte 45 - .2byte 48 - .2byte 50 - .2byte 55 - .2byte 59 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 90 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 109 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte -1 - -gBattleFrontierTrainerMons_John:: @ 85CF6FA - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 35 - .2byte 42 - .2byte 45 - .2byte 48 - .2byte 50 - .2byte 55 - .2byte 59 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 90 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 109 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte -1 - -gBattleFrontierTrainerMons_Ann:: @ 85CF73C - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 35 - .2byte 42 - .2byte 45 - .2byte 48 - .2byte 50 - .2byte 55 - .2byte 59 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 90 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 109 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte -1 - -gBattleFrontierTrainerMons_Eileen:: @ 85CF77E - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 35 - .2byte 42 - .2byte 45 - .2byte 48 - .2byte 50 - .2byte 55 - .2byte 59 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 90 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 109 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte -1 - -gBattleFrontierTrainerMons_Carlie:: @ 85CF7C0 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 35 - .2byte 42 - .2byte 45 - .2byte 48 - .2byte 50 - .2byte 55 - .2byte 59 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 90 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 109 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte -1 - -gBattleFrontierTrainerMons_Gordon:: @ 85CF802 - .2byte 1 - .2byte 13 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 34 - .2byte 36 - .2byte 43 - .2byte 50 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 68 - .2byte 72 - .2byte 73 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 116 - .2byte 117 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 152 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Ayden:: @ 85CF868 - .2byte 1 - .2byte 13 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 34 - .2byte 36 - .2byte 43 - .2byte 50 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 68 - .2byte 72 - .2byte 73 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 116 - .2byte 117 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 152 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Marco:: @ 85CF8CE - .2byte 1 - .2byte 13 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 34 - .2byte 36 - .2byte 43 - .2byte 50 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 68 - .2byte 72 - .2byte 73 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 116 - .2byte 117 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 152 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Cierra:: @ 85CF934 - .2byte 1 - .2byte 13 - .2byte 16 - .2byte 17 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 34 - .2byte 36 - .2byte 43 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 68 - .2byte 72 - .2byte 73 - .2byte 76 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Marcy:: @ 85CF994 - .2byte 1 - .2byte 13 - .2byte 16 - .2byte 17 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 34 - .2byte 36 - .2byte 43 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 68 - .2byte 72 - .2byte 73 - .2byte 76 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Kathy:: @ 85CF9F4 - .2byte 1 - .2byte 13 - .2byte 16 - .2byte 17 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 34 - .2byte 36 - .2byte 43 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 68 - .2byte 72 - .2byte 73 - .2byte 76 - .2byte 83 - .2byte 84 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 105 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Peyton:: @ 85CFA54 - .2byte 84 - .2byte 85 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 109 - .2byte 112 - .2byte 113 - .2byte 117 - .2byte 120 - .2byte 121 - .2byte 123 - .2byte 129 - .2byte 134 - .2byte 142 - .2byte 143 - .2byte 145 - .2byte 148 - .2byte 149 - .2byte 151 - .2byte 152 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Julian:: @ 85CFA9E - .2byte 84 - .2byte 85 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 109 - .2byte 112 - .2byte 113 - .2byte 117 - .2byte 120 - .2byte 121 - .2byte 123 - .2byte 129 - .2byte 134 - .2byte 142 - .2byte 143 - .2byte 145 - .2byte 148 - .2byte 149 - .2byte 151 - .2byte 152 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Quinn:: @ 85CFAE8 - .2byte 84 - .2byte 85 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 109 - .2byte 112 - .2byte 113 - .2byte 117 - .2byte 120 - .2byte 121 - .2byte 123 - .2byte 129 - .2byte 134 - .2byte 142 - .2byte 143 - .2byte 145 - .2byte 148 - .2byte 149 - .2byte 151 - .2byte 152 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Haylee:: @ 85CFB32 - .2byte 1 - .2byte 5 - .2byte 6 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 28 - .2byte 29 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 54 - .2byte 56 - .2byte 59 - .2byte 61 - .2byte 65 - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 71 - .2byte 72 - .2byte 79 - .2byte -1 - -gBattleFrontierTrainerMons_Amanda:: @ 85CFB86 - .2byte 1 - .2byte 5 - .2byte 6 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 28 - .2byte 29 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 54 - .2byte 56 - .2byte 59 - .2byte 61 - .2byte 65 - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 71 - .2byte 72 - .2byte 79 - .2byte -1 - -gBattleFrontierTrainerMons_Stacy:: @ 85CFBDA - .2byte 1 - .2byte 5 - .2byte 6 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 28 - .2byte 29 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 54 - .2byte 56 - .2byte 59 - .2byte 61 - .2byte 65 - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 71 - .2byte 72 - .2byte 79 - .2byte -1 - -gBattleFrontierTrainerMons_Rafael:: @ 85CFC2E - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Oliver:: @ 85CFCAC - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Payton:: @ 85CFD06 - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Pamela:: @ 85CFD6E - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Eliza:: @ 85CFDEC - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Marisa:: @ 85CFE46 - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Lewis:: @ 85CFEAE - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 8 - .2byte 9 - .2byte 21 - .2byte 27 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 52 - .2byte 57 - .2byte 58 - .2byte 80 - .2byte 112 - .2byte 132 - .2byte 141 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Yoshi:: @ 85CFEE2 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 11 - .2byte 12 - .2byte 21 - .2byte 27 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 52 - .2byte 57 - .2byte 58 - .2byte 80 - .2byte 112 - .2byte 132 - .2byte 141 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Destin:: @ 85CFF16 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 21 - .2byte 27 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 52 - .2byte 57 - .2byte 58 - .2byte 80 - .2byte 112 - .2byte 132 - .2byte 141 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Keon:: @ 85CFF46 - .2byte 5 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 52 - .2byte 53 - .2byte 57 - .2byte 58 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 132 - .2byte 141 - .2byte 146 - .2byte 147 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Stuart:: @ 85CFFA8 - .2byte 5 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 52 - .2byte 53 - .2byte 57 - .2byte 58 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 132 - .2byte 141 - .2byte 146 - .2byte 147 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Nestor:: @ 85D000A - .2byte 5 - .2byte 21 - .2byte 25 - .2byte 27 - .2byte 35 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 50 - .2byte 52 - .2byte 53 - .2byte 57 - .2byte 58 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 100 - .2byte 102 - .2byte 106 - .2byte 110 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte 124 - .2byte 127 - .2byte 132 - .2byte 141 - .2byte 146 - .2byte 147 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Derrick:: @ 85D006C - .2byte 21 - .2byte 27 - .2byte 29 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 52 - .2byte 57 - .2byte 58 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 80 - .2byte 92 - .2byte 102 - .2byte 112 - .2byte 125 - .2byte 129 - .2byte 132 - .2byte 140 - .2byte 141 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Bryson:: @ 85D00AA - .2byte 21 - .2byte 27 - .2byte 29 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 52 - .2byte 57 - .2byte 58 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 80 - .2byte 92 - .2byte 102 - .2byte 112 - .2byte 125 - .2byte 129 - .2byte 132 - .2byte 140 - .2byte 141 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Clayton:: @ 85D00E8 - .2byte 21 - .2byte 27 - .2byte 29 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 52 - .2byte 57 - .2byte 58 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 69 - .2byte 80 - .2byte 92 - .2byte 102 - .2byte 112 - .2byte 125 - .2byte 129 - .2byte 132 - .2byte 140 - .2byte 141 - .2byte 153 - .2byte 154 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Trenton:: @ 85D0126 - .2byte 6 - .2byte 7 - .2byte 55 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 105 - .2byte 111 - .2byte 116 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 151 - .2byte -1 - -gBattleFrontierTrainerMons_Jenson:: @ 85D014E - .2byte 6 - .2byte 7 - .2byte 55 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 105 - .2byte 111 - .2byte 116 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 151 - .2byte -1 - -gBattleFrontierTrainerMons_Wesley:: @ 85D0176 - .2byte 6 - .2byte 7 - .2byte 55 - .2byte 60 - .2byte 68 - .2byte 73 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 105 - .2byte 111 - .2byte 116 - .2byte 123 - .2byte 124 - .2byte 128 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 151 - .2byte -1 - -gBattleFrontierTrainerMons_Anton:: @ 85D019E - .2byte 31 - .2byte 39 - .2byte 58 - .2byte 67 - .2byte 70 - .2byte 74 - .2byte 75 - .2byte 78 - .2byte 85 - .2byte 104 - .2byte 108 - .2byte 120 - .2byte 122 - .2byte 133 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Lawson:: @ 85D01CC - .2byte 31 - .2byte 39 - .2byte 58 - .2byte 67 - .2byte 70 - .2byte 74 - .2byte 75 - .2byte 78 - .2byte 85 - .2byte 104 - .2byte 108 - .2byte 120 - .2byte 122 - .2byte 133 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Sammy:: @ 85D01FA - .2byte 31 - .2byte 39 - .2byte 58 - .2byte 67 - .2byte 70 - .2byte 74 - .2byte 75 - .2byte 78 - .2byte 85 - .2byte 104 - .2byte 108 - .2byte 120 - .2byte 122 - .2byte 133 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Arnie:: @ 85D0228 - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Adrian:: @ 85D02A6 - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Tristan:: @ 85D0300 - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Juliana:: @ 85D0368 - .2byte 0 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 42 - .2byte 58 - .2byte 59 - .2byte 67 - .2byte 68 - .2byte 85 - .2byte 118 - .2byte 120 - .2byte 123 - .2byte 155 - .2byte 156 - .2byte 193 - .2byte -1 - -gBattleFrontierTrainerMons_Rylee:: @ 85D038A - .2byte 0 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 42 - .2byte 58 - .2byte 59 - .2byte 67 - .2byte 68 - .2byte 85 - .2byte 118 - .2byte 120 - .2byte 123 - .2byte 155 - .2byte 156 - .2byte 193 - .2byte -1 - -gBattleFrontierTrainerMons_Chelsea:: @ 85D03AC - .2byte 0 - .2byte 14 - .2byte 19 - .2byte 28 - .2byte 42 - .2byte 58 - .2byte 59 - .2byte 67 - .2byte 68 - .2byte 85 - .2byte 118 - .2byte 120 - .2byte 123 - .2byte 155 - .2byte 156 - .2byte 193 - .2byte -1 - -gBattleFrontierTrainerMons_Danela:: @ 85D03CE - .2byte 0 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 6 - .2byte 7 - .2byte 10 - .2byte 13 - .2byte 14 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 19 - .2byte 20 - .2byte 21 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 27 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 31 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 39 - .2byte 40 - .2byte 41 - .2byte 42 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 65 - .2byte -1 - -gBattleFrontierTrainerMons_Lizbeth:: @ 85D044C - .2byte 66 - .2byte 67 - .2byte 68 - .2byte 69 - .2byte 70 - .2byte 71 - .2byte 72 - .2byte 73 - .2byte 74 - .2byte 75 - .2byte 76 - .2byte 77 - .2byte 78 - .2byte 79 - .2byte 80 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 85 - .2byte 86 - .2byte 87 - .2byte 88 - .2byte 89 - .2byte 90 - .2byte 91 - .2byte 92 - .2byte 93 - .2byte 94 - .2byte 95 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 103 - .2byte 104 - .2byte 105 - .2byte 106 - .2byte 107 - .2byte 108 - .2byte 109 - .2byte -1 - -gBattleFrontierTrainerMons_Amelia:: @ 85D04A6 - .2byte 110 - .2byte 111 - .2byte 112 - .2byte 113 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 117 - .2byte 118 - .2byte 119 - .2byte 120 - .2byte 121 - .2byte 122 - .2byte 123 - .2byte 124 - .2byte 125 - .2byte 127 - .2byte 128 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 132 - .2byte 133 - .2byte 134 - .2byte 135 - .2byte 136 - .2byte 137 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 146 - .2byte 147 - .2byte 148 - .2byte 149 - .2byte 150 - .2byte 151 - .2byte 152 - .2byte 153 - .2byte 154 - .2byte 155 - .2byte 156 - .2byte 157 - .2byte 158 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte -1 - -gBattleFrontierTrainerMons_Jillian:: @ 85D050E - .2byte 0 - .2byte 5 - .2byte 18 - .2byte 19 - .2byte 29 - .2byte 35 - .2byte 48 - .2byte 50 - .2byte 52 - .2byte 61 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 84 - .2byte 90 - .2byte 94 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 106 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte 125 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 140 - .2byte -1 - -gBattleFrontierTrainerMons_Abbie:: @ 85D054A - .2byte 0 - .2byte 5 - .2byte 18 - .2byte 19 - .2byte 29 - .2byte 35 - .2byte 48 - .2byte 50 - .2byte 52 - .2byte 61 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 84 - .2byte 90 - .2byte 94 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 106 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte 125 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 140 - .2byte -1 - -gBattleFrontierTrainerMons_Briana:: @ 85D0586 - .2byte 0 - .2byte 5 - .2byte 18 - .2byte 19 - .2byte 29 - .2byte 35 - .2byte 48 - .2byte 50 - .2byte 52 - .2byte 61 - .2byte 69 - .2byte 75 - .2byte 78 - .2byte 84 - .2byte 90 - .2byte 94 - .2byte 99 - .2byte 100 - .2byte 101 - .2byte 102 - .2byte 106 - .2byte 112 - .2byte 114 - .2byte 121 - .2byte 125 - .2byte 129 - .2byte 130 - .2byte 131 - .2byte 140 - .2byte -1 - -gBattleFrontierTrainerMons_Antonio:: @ 85D05C2 - .2byte 5 - .2byte 10 - .2byte 20 - .2byte 35 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 66 - .2byte 71 - .2byte 75 - .2byte 77 - .2byte 78 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 106 - .2byte 108 - .2byte 112 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 119 - .2byte 121 - .2byte 122 - .2byte 143 - .2byte 148 - .2byte 152 - .2byte -1 - -gBattleFrontierTrainerMons_Jaden:: @ 85D0602 - .2byte 5 - .2byte 10 - .2byte 20 - .2byte 35 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 66 - .2byte 71 - .2byte 75 - .2byte 77 - .2byte 78 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 106 - .2byte 108 - .2byte 112 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 119 - .2byte 121 - .2byte 122 - .2byte 143 - .2byte 148 - .2byte 152 - .2byte -1 - -gBattleFrontierTrainerMons_Dakota:: @ 85D0642 - .2byte 5 - .2byte 10 - .2byte 20 - .2byte 35 - .2byte 48 - .2byte 49 - .2byte 50 - .2byte 62 - .2byte 63 - .2byte 64 - .2byte 66 - .2byte 71 - .2byte 75 - .2byte 77 - .2byte 78 - .2byte 84 - .2byte 90 - .2byte 92 - .2byte 99 - .2byte 106 - .2byte 108 - .2byte 112 - .2byte 114 - .2byte 115 - .2byte 116 - .2byte 119 - .2byte 121 - .2byte 122 - .2byte 143 - .2byte 148 - .2byte 152 - .2byte -1 - -gBattleFrontierTrainerMons_Brayden:: @ 85D0682 - .2byte 1 - .2byte 13 - .2byte 16 - .2byte 17 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 72 - .2byte 91 - .2byte 93 - .2byte 95 - .2byte 106 - .2byte 107 - .2byte 113 - .2byte 117 - .2byte 118 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte -1 - -gBattleFrontierTrainerMons_Corson:: @ 85D06C8 - .2byte 1 - .2byte 13 - .2byte 16 - .2byte 17 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 72 - .2byte 91 - .2byte 93 - .2byte 95 - .2byte 106 - .2byte 107 - .2byte 113 - .2byte 117 - .2byte 118 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte -1 - -gBattleFrontierTrainerMons_Trevin:: @ 85D070E - .2byte 1 - .2byte 13 - .2byte 16 - .2byte 17 - .2byte 23 - .2byte 24 - .2byte 25 - .2byte 26 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 43 - .2byte 44 - .2byte 45 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 72 - .2byte 91 - .2byte 93 - .2byte 95 - .2byte 106 - .2byte 107 - .2byte 113 - .2byte 117 - .2byte 118 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte -1 - -gBattleFrontierTrainerMons_Patrick:: @ 85D0754 - .2byte 15 - .2byte 22 - .2byte 50 - .2byte 67 - .2byte 70 - .2byte 71 - .2byte 74 - .2byte 77 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 104 - .2byte 109 - .2byte 111 - .2byte 120 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 133 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 151 - .2byte 155 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Kaden:: @ 85D0796 - .2byte 15 - .2byte 22 - .2byte 50 - .2byte 67 - .2byte 70 - .2byte 71 - .2byte 74 - .2byte 77 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 104 - .2byte 109 - .2byte 111 - .2byte 120 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 133 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 151 - .2byte 155 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Maxwell:: @ 85D07D8 - .2byte 15 - .2byte 22 - .2byte 50 - .2byte 67 - .2byte 70 - .2byte 71 - .2byte 74 - .2byte 77 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 86 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 104 - .2byte 109 - .2byte 111 - .2byte 120 - .2byte 124 - .2byte 128 - .2byte 131 - .2byte 133 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 151 - .2byte 155 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Daryl:: @ 85D081A - .2byte 15 - .2byte 22 - .2byte 31 - .2byte 39 - .2byte 50 - .2byte 51 - .2byte 58 - .2byte 67 - .2byte 70 - .2byte 74 - .2byte 75 - .2byte 81 - .2byte 82 - .2byte 85 - .2byte 104 - .2byte 120 - .2byte 122 - .2byte 132 - .2byte 133 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 144 - .2byte 150 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Kenneth:: @ 85D0852 - .2byte 15 - .2byte 22 - .2byte 31 - .2byte 39 - .2byte 50 - .2byte 51 - .2byte 58 - .2byte 67 - .2byte 70 - .2byte 74 - .2byte 75 - .2byte 81 - .2byte 82 - .2byte 85 - .2byte 104 - .2byte 120 - .2byte 122 - .2byte 132 - .2byte 133 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 144 - .2byte 150 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Rich:: @ 85D088A - .2byte 15 - .2byte 22 - .2byte 31 - .2byte 39 - .2byte 50 - .2byte 51 - .2byte 58 - .2byte 67 - .2byte 70 - .2byte 74 - .2byte 75 - .2byte 81 - .2byte 82 - .2byte 85 - .2byte 104 - .2byte 120 - .2byte 122 - .2byte 132 - .2byte 133 - .2byte 138 - .2byte 139 - .2byte 140 - .2byte 141 - .2byte 142 - .2byte 144 - .2byte 150 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Caden:: @ 85D08C2 - .2byte 30 - .2byte 62 - .2byte 63 - .2byte 65 - .2byte 70 - .2byte 74 - .2byte 77 - .2byte 78 - .2byte 85 - .2byte 88 - .2byte 89 - .2byte 95 - .2byte 108 - .2byte 119 - .2byte 122 - .2byte 133 - .2byte 136 - .2byte 149 - .2byte 150 - .2byte 152 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Marlon:: @ 85D08EE - .2byte 30 - .2byte 62 - .2byte 63 - .2byte 65 - .2byte 70 - .2byte 74 - .2byte 77 - .2byte 78 - .2byte 85 - .2byte 88 - .2byte 89 - .2byte 95 - .2byte 108 - .2byte 119 - .2byte 122 - .2byte 133 - .2byte 136 - .2byte 149 - .2byte 150 - .2byte 152 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Nash:: @ 85D091A - .2byte 30 - .2byte 62 - .2byte 63 - .2byte 65 - .2byte 70 - .2byte 74 - .2byte 77 - .2byte 78 - .2byte 85 - .2byte 88 - .2byte 89 - .2byte 95 - .2byte 108 - .2byte 119 - .2byte 122 - .2byte 133 - .2byte 136 - .2byte 149 - .2byte 150 - .2byte 152 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Robby:: @ 85D0946 - .2byte 1 - .2byte 13 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 43 - .2byte 44 - .2byte 50 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 67 - .2byte 70 - .2byte 72 - .2byte 74 - .2byte 75 - .2byte 81 - .2byte 82 - .2byte 85 - .2byte 91 - .2byte 93 - .2byte 104 - .2byte 107 - .2byte 113 - .2byte 117 - .2byte 120 - .2byte 132 - .2byte 133 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Reece:: @ 85D09A0 - .2byte 1 - .2byte 13 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 43 - .2byte 44 - .2byte 50 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 67 - .2byte 70 - .2byte 72 - .2byte 74 - .2byte 75 - .2byte 81 - .2byte 82 - .2byte 85 - .2byte 91 - .2byte 93 - .2byte 104 - .2byte 107 - .2byte 113 - .2byte 117 - .2byte 120 - .2byte 132 - .2byte 133 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Kathryn:: @ 85D09FA - .2byte 1 - .2byte 13 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 43 - .2byte 44 - .2byte 50 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 67 - .2byte 70 - .2byte 72 - .2byte 74 - .2byte 75 - .2byte 81 - .2byte 82 - .2byte 85 - .2byte 91 - .2byte 93 - .2byte 104 - .2byte 107 - .2byte 113 - .2byte 117 - .2byte 120 - .2byte 132 - .2byte 133 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Ellen:: @ 85D0A54 - .2byte 1 - .2byte 13 - .2byte 15 - .2byte 16 - .2byte 17 - .2byte 22 - .2byte 23 - .2byte 24 - .2byte 26 - .2byte 32 - .2byte 33 - .2byte 34 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 43 - .2byte 44 - .2byte 50 - .2byte 51 - .2byte 54 - .2byte 56 - .2byte 67 - .2byte 70 - .2byte 72 - .2byte 74 - .2byte 75 - .2byte 81 - .2byte 82 - .2byte 85 - .2byte 91 - .2byte 93 - .2byte 104 - .2byte 107 - .2byte 113 - .2byte 117 - .2byte 120 - .2byte 132 - .2byte 133 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 156 - .2byte -1 - -gBattleFrontierTrainerMons_Ramon:: @ 85D0AAE - .2byte 15 - .2byte 22 - .2byte 50 - .2byte 71 - .2byte 72 - .2byte 76 - .2byte 77 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 117 - .2byte 118 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Arthur:: @ 85D0AF0 - .2byte 15 - .2byte 22 - .2byte 50 - .2byte 71 - .2byte 72 - .2byte 76 - .2byte 77 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 117 - .2byte 118 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Alondra:: @ 85D0B32 - .2byte 15 - .2byte 22 - .2byte 50 - .2byte 71 - .2byte 72 - .2byte 76 - .2byte 77 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 117 - .2byte 118 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Adriana:: @ 85D0B74 - .2byte 15 - .2byte 22 - .2byte 50 - .2byte 71 - .2byte 72 - .2byte 76 - .2byte 77 - .2byte 81 - .2byte 82 - .2byte 83 - .2byte 84 - .2byte 87 - .2byte 96 - .2byte 97 - .2byte 98 - .2byte 99 - .2byte 103 - .2byte 107 - .2byte 109 - .2byte 111 - .2byte 113 - .2byte 117 - .2byte 118 - .2byte 131 - .2byte 134 - .2byte 138 - .2byte 139 - .2byte 142 - .2byte 144 - .2byte 145 - .2byte 151 - .2byte 155 - .2byte -1 - -gBattleFrontierTrainerMons_Malik:: @ 85D0BB6 - .2byte 10 - .2byte 15 - .2byte 22 - .2byte 49 - .2byte 50 - .2byte 64 - .2byte 66 - .2byte 71 - .2byte 72 - .2byte 77 - .2byte 78 - .2byte 81 - .2byte 82 - .2byte 91 - .2byte 93 - .2byte 107 - .2byte 108 - .2byte 113 - .2byte 115 - .2byte 117 - .2byte 122 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 148 - .2byte 152 - .2byte -1 - -gBattleFrontierTrainerMons_Jill:: @ 85D0BF2 - .2byte 10 - .2byte 15 - .2byte 22 - .2byte 49 - .2byte 50 - .2byte 64 - .2byte 66 - .2byte 71 - .2byte 72 - .2byte 77 - .2byte 78 - .2byte 81 - .2byte 82 - .2byte 91 - .2byte 93 - .2byte 107 - .2byte 108 - .2byte 113 - .2byte 115 - .2byte 117 - .2byte 122 - .2byte 135 - .2byte 137 - .2byte 142 - .2byte 143 - .2byte 144 - .2byte 145 - .2byte 148 - .2byte 152 - .2byte -1 - -gBattleFrontierTrainerMons_Erik:: @ 85D0C2E - .2byte 162 - .2byte 164 - .2byte 168 - .2byte 178 - .2byte 183 - .2byte 184 - .2byte 189 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 203 - .2byte 204 - .2byte 207 - .2byte 210 - .2byte 213 - .2byte 214 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 224 - .2byte 227 - .2byte 231 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 238 - .2byte 240 - .2byte 243 - .2byte 245 - .2byte 246 - .2byte 250 - .2byte 263 - .2byte -1 - -gBattleFrontierTrainerMons_Yazmin:: @ 85D0C74 - .2byte 162 - .2byte 164 - .2byte 168 - .2byte 178 - .2byte 183 - .2byte 184 - .2byte 189 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 203 - .2byte 204 - .2byte 207 - .2byte 210 - .2byte 213 - .2byte 214 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 224 - .2byte 227 - .2byte 231 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 238 - .2byte 240 - .2byte 243 - .2byte 245 - .2byte 246 - .2byte 250 - .2byte 263 - .2byte -1 - -gBattleFrontierTrainerMons_Jamal:: @ 85D0CBA - .2byte 170 - .2byte 176 - .2byte 178 - .2byte 182 - .2byte 189 - .2byte 190 - .2byte 192 - .2byte 196 - .2byte 211 - .2byte 212 - .2byte 213 - .2byte 219 - .2byte 228 - .2byte 230 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 236 - .2byte 242 - .2byte 245 - .2byte 249 - .2byte 253 - .2byte 256 - .2byte 257 - .2byte 258 - .2byte 259 - .2byte 260 - .2byte 261 - .2byte 262 - .2byte 265 - .2byte 266 - .2byte -1 - -gBattleFrontierTrainerMons_Leslie:: @ 85D0CFA - .2byte 170 - .2byte 176 - .2byte 178 - .2byte 182 - .2byte 189 - .2byte 190 - .2byte 192 - .2byte 196 - .2byte 211 - .2byte 212 - .2byte 213 - .2byte 219 - .2byte 228 - .2byte 230 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 236 - .2byte 242 - .2byte 245 - .2byte 249 - .2byte 253 - .2byte 256 - .2byte 257 - .2byte 258 - .2byte 259 - .2byte 260 - .2byte 261 - .2byte 262 - .2byte 265 - .2byte 266 - .2byte -1 - -gBattleFrontierTrainerMons_Dave:: @ 85D0D3A - .2byte 162 - .2byte 164 - .2byte 168 - .2byte 178 - .2byte 183 - .2byte 186 - .2byte 187 - .2byte 189 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 203 - .2byte 204 - .2byte 206 - .2byte 207 - .2byte 214 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 224 - .2byte 227 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 244 - .2byte 246 - .2byte 250 - .2byte -1 - -gBattleFrontierTrainerMons_Carlo:: @ 85D0D7A - .2byte 162 - .2byte 164 - .2byte 168 - .2byte 178 - .2byte 183 - .2byte 186 - .2byte 187 - .2byte 189 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 203 - .2byte 204 - .2byte 206 - .2byte 207 - .2byte 214 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 224 - .2byte 227 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 244 - .2byte 246 - .2byte 250 - .2byte -1 - -gBattleFrontierTrainerMons_Emilia:: @ 85D0DBA - .2byte 162 - .2byte 164 - .2byte 168 - .2byte 178 - .2byte 183 - .2byte 186 - .2byte 187 - .2byte 189 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 203 - .2byte 204 - .2byte 206 - .2byte 207 - .2byte 214 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 224 - .2byte 227 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 244 - .2byte 246 - .2byte 250 - .2byte -1 - -gBattleFrontierTrainerMons_Dalia:: @ 85D0DFA - .2byte 162 - .2byte 164 - .2byte 168 - .2byte 178 - .2byte 183 - .2byte 186 - .2byte 187 - .2byte 189 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 203 - .2byte 204 - .2byte 206 - .2byte 207 - .2byte 214 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 224 - .2byte 227 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 244 - .2byte 246 - .2byte 250 - .2byte -1 - -gBattleFrontierTrainerMons_Hitomi:: @ 85D0E3A - .2byte 164 - .2byte 166 - .2byte 175 - .2byte 178 - .2byte 181 - .2byte 189 - .2byte 191 - .2byte 193 - .2byte 194 - .2byte 195 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 202 - .2byte 203 - .2byte 205 - .2byte 206 - .2byte 207 - .2byte 210 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 222 - .2byte 223 - .2byte 225 - .2byte 227 - .2byte 230 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 241 - .2byte 246 - .2byte 247 - .2byte 252 - .2byte 254 - .2byte 262 - .2byte -1 - -gBattleFrontierTrainerMons_Ricardo:: @ 85D0E8C - .2byte 164 - .2byte 166 - .2byte 175 - .2byte 178 - .2byte 181 - .2byte 189 - .2byte 191 - .2byte 193 - .2byte 194 - .2byte 195 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 202 - .2byte 203 - .2byte 205 - .2byte 206 - .2byte 207 - .2byte 210 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 222 - .2byte 223 - .2byte 225 - .2byte 227 - .2byte 230 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 241 - .2byte 246 - .2byte 247 - .2byte 252 - .2byte 254 - .2byte 262 - .2byte -1 - -gBattleFrontierTrainerMons_Shizuka:: @ 85D0EDE - .2byte 164 - .2byte 166 - .2byte 175 - .2byte 178 - .2byte 181 - .2byte 189 - .2byte 191 - .2byte 193 - .2byte 194 - .2byte 195 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 202 - .2byte 203 - .2byte 205 - .2byte 206 - .2byte 207 - .2byte 210 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 222 - .2byte 223 - .2byte 225 - .2byte 227 - .2byte 230 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 241 - .2byte 246 - .2byte 247 - .2byte 252 - .2byte 254 - .2byte 262 - .2byte -1 - -gBattleFrontierTrainerMons_Joana:: @ 85D0F30 - .2byte 164 - .2byte 166 - .2byte 175 - .2byte 178 - .2byte 181 - .2byte 189 - .2byte 191 - .2byte 193 - .2byte 194 - .2byte 195 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 202 - .2byte 203 - .2byte 205 - .2byte 206 - .2byte 207 - .2byte 210 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 222 - .2byte 223 - .2byte 225 - .2byte 227 - .2byte 230 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 241 - .2byte 246 - .2byte 247 - .2byte 252 - .2byte 254 - .2byte 262 - .2byte -1 - -gBattleFrontierTrainerMons_Kelly:: @ 85D0F82 - .2byte 164 - .2byte 166 - .2byte 175 - .2byte 178 - .2byte 181 - .2byte 189 - .2byte 191 - .2byte 193 - .2byte 194 - .2byte 195 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 202 - .2byte 203 - .2byte 205 - .2byte 206 - .2byte 207 - .2byte 210 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 222 - .2byte 223 - .2byte 225 - .2byte 227 - .2byte 230 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 241 - .2byte 246 - .2byte 247 - .2byte 252 - .2byte 254 - .2byte 262 - .2byte -1 - -gBattleFrontierTrainerMons_Rayna:: @ 85D0FD4 - .2byte 164 - .2byte 166 - .2byte 175 - .2byte 178 - .2byte 181 - .2byte 189 - .2byte 191 - .2byte 193 - .2byte 194 - .2byte 195 - .2byte 197 - .2byte 199 - .2byte 200 - .2byte 202 - .2byte 203 - .2byte 205 - .2byte 206 - .2byte 207 - .2byte 210 - .2byte 215 - .2byte 218 - .2byte 220 - .2byte 221 - .2byte 222 - .2byte 223 - .2byte 225 - .2byte 227 - .2byte 230 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte 240 - .2byte 241 - .2byte 246 - .2byte 247 - .2byte 252 - .2byte 254 - .2byte 262 - .2byte -1 - -gBattleFrontierTrainerMons_Evan:: @ 85D1026 - .2byte 162 - .2byte 163 - .2byte 164 - .2byte 165 - .2byte 166 - .2byte 167 - .2byte 168 - .2byte 169 - .2byte 170 - .2byte 171 - .2byte 172 - .2byte 173 - .2byte 174 - .2byte 175 - .2byte 176 - .2byte 177 - .2byte 178 - .2byte 179 - .2byte 180 - .2byte 181 - .2byte 182 - .2byte 183 - .2byte 184 - .2byte 185 - .2byte 186 - .2byte 187 - .2byte 188 - .2byte 189 - .2byte 190 - .2byte 191 - .2byte 192 - .2byte 193 - .2byte 194 - .2byte 195 - .2byte 196 - .2byte 197 - .2byte 198 - .2byte 199 - .2byte -1 - -gBattleFrontierTrainerMons_Jordan:: @ 85D1074 - .2byte 200 - .2byte 201 - .2byte 202 - .2byte 203 - .2byte 204 - .2byte 205 - .2byte 206 - .2byte 207 - .2byte 208 - .2byte 209 - .2byte 210 - .2byte 211 - .2byte 212 - .2byte 213 - .2byte 214 - .2byte 215 - .2byte 216 - .2byte 217 - .2byte 218 - .2byte 219 - .2byte 220 - .2byte 221 - .2byte 222 - .2byte 223 - .2byte 224 - .2byte 225 - .2byte 226 - .2byte 227 - .2byte 228 - .2byte 229 - .2byte 230 - .2byte 231 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte -1 - -gBattleFrontierTrainerMons_Joel:: @ 85D10C0 - .2byte 237 - .2byte 238 - .2byte 239 - .2byte 240 - .2byte 241 - .2byte 242 - .2byte 243 - .2byte 244 - .2byte 245 - .2byte 246 - .2byte 247 - .2byte 248 - .2byte 249 - .2byte 250 - .2byte 251 - .2byte 252 - .2byte 253 - .2byte 254 - .2byte 255 - .2byte 256 - .2byte 257 - .2byte 258 - .2byte 259 - .2byte 260 - .2byte 261 - .2byte 262 - .2byte 263 - .2byte 264 - .2byte 265 - .2byte 266 - .2byte -1 - -gBattleFrontierTrainerMons_Kristen:: @ 85D10FE - .2byte 162 - .2byte 163 - .2byte 164 - .2byte 165 - .2byte 166 - .2byte 167 - .2byte 168 - .2byte 169 - .2byte 170 - .2byte 171 - .2byte 172 - .2byte 173 - .2byte 174 - .2byte 175 - .2byte 176 - .2byte 177 - .2byte 178 - .2byte 179 - .2byte 180 - .2byte 181 - .2byte 182 - .2byte 183 - .2byte 184 - .2byte 185 - .2byte 186 - .2byte 187 - .2byte 188 - .2byte 189 - .2byte 190 - .2byte 191 - .2byte 192 - .2byte 193 - .2byte 194 - .2byte 195 - .2byte 196 - .2byte 197 - .2byte 198 - .2byte 199 - .2byte -1 - -gBattleFrontierTrainerMons_Selphy:: @ 85D114C - .2byte 200 - .2byte 201 - .2byte 202 - .2byte 203 - .2byte 204 - .2byte 205 - .2byte 206 - .2byte 207 - .2byte 208 - .2byte 209 - .2byte 210 - .2byte 211 - .2byte 212 - .2byte 213 - .2byte 214 - .2byte 215 - .2byte 216 - .2byte 217 - .2byte 218 - .2byte 219 - .2byte 220 - .2byte 221 - .2byte 222 - .2byte 223 - .2byte 224 - .2byte 225 - .2byte 226 - .2byte 227 - .2byte 228 - .2byte 229 - .2byte 230 - .2byte 231 - .2byte 232 - .2byte 233 - .2byte 234 - .2byte 235 - .2byte 236 - .2byte -1 - -gBattleFrontierTrainerMons_Chloe:: @ 85D1198 - .2byte 237 - .2byte 238 - .2byte 239 - .2byte 240 - .2byte 241 - .2byte 242 - .2byte 243 - .2byte 244 - .2byte 245 - .2byte 246 - .2byte 247 - .2byte 248 - .2byte 249 - .2byte 250 - .2byte 251 - .2byte 252 - .2byte 253 - .2byte 254 - .2byte 255 - .2byte 256 - .2byte 257 - .2byte 258 - .2byte 259 - .2byte 260 - .2byte 261 - .2byte 262 - .2byte 263 - .2byte 264 - .2byte 265 - .2byte 266 - .2byte -1 - -gBattleFrontierTrainerMons_Norton:: @ 85D11D6 - .2byte 267 - .2byte 268 - .2byte 273 - .2byte 274 - .2byte 276 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 291 - .2byte 292 - .2byte 307 - .2byte 308 - .2byte 311 - .2byte 312 - .2byte 314 - .2byte 317 - .2byte 325 - .2byte 327 - .2byte 328 - .2byte 329 - .2byte 331 - .2byte 332 - .2byte 340 - .2byte 342 - .2byte 347 - .2byte 349 - .2byte 351 - .2byte 352 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte 363 - .2byte 370 - .2byte -1 - -gBattleFrontierTrainerMons_Lukas:: @ 85D121A - .2byte 267 - .2byte 268 - .2byte 273 - .2byte 274 - .2byte 276 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 291 - .2byte 292 - .2byte 307 - .2byte 308 - .2byte 311 - .2byte 312 - .2byte 314 - .2byte 317 - .2byte 325 - .2byte 327 - .2byte 328 - .2byte 329 - .2byte 331 - .2byte 332 - .2byte 340 - .2byte 342 - .2byte 347 - .2byte 349 - .2byte 351 - .2byte 352 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte 363 - .2byte 370 - .2byte -1 - -gBattleFrontierTrainerMons_Zach:: @ 85D125E - .2byte 267 - .2byte 268 - .2byte 273 - .2byte 274 - .2byte 276 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 291 - .2byte 292 - .2byte 307 - .2byte 308 - .2byte 311 - .2byte 312 - .2byte 314 - .2byte 317 - .2byte 325 - .2byte 327 - .2byte 328 - .2byte 329 - .2byte 331 - .2byte 332 - .2byte 340 - .2byte 342 - .2byte 347 - .2byte 349 - .2byte 351 - .2byte 352 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte 363 - .2byte 370 - .2byte -1 - -gBattleFrontierTrainerMons_Kaitlyn:: @ 85D12A2 - .2byte 267 - .2byte 268 - .2byte 273 - .2byte 274 - .2byte 276 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 291 - .2byte 292 - .2byte 307 - .2byte 308 - .2byte 311 - .2byte 312 - .2byte 314 - .2byte 317 - .2byte 325 - .2byte 327 - .2byte 328 - .2byte 329 - .2byte 331 - .2byte 332 - .2byte 340 - .2byte 342 - .2byte 347 - .2byte 349 - .2byte 351 - .2byte 352 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte 363 - .2byte 370 - .2byte -1 - -gBattleFrontierTrainerMons_Breanna:: @ 85D12E6 - .2byte 267 - .2byte 268 - .2byte 273 - .2byte 274 - .2byte 276 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 291 - .2byte 292 - .2byte 307 - .2byte 308 - .2byte 311 - .2byte 312 - .2byte 314 - .2byte 317 - .2byte 325 - .2byte 327 - .2byte 328 - .2byte 329 - .2byte 331 - .2byte 332 - .2byte 340 - .2byte 342 - .2byte 347 - .2byte 349 - .2byte 351 - .2byte 352 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte 363 - .2byte 370 - .2byte -1 - -gBattleFrontierTrainerMons_Kendra:: @ 85D132A - .2byte 267 - .2byte 268 - .2byte 273 - .2byte 274 - .2byte 276 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 291 - .2byte 292 - .2byte 307 - .2byte 308 - .2byte 311 - .2byte 312 - .2byte 314 - .2byte 317 - .2byte 325 - .2byte 327 - .2byte 328 - .2byte 329 - .2byte 331 - .2byte 332 - .2byte 340 - .2byte 342 - .2byte 347 - .2byte 349 - .2byte 351 - .2byte 352 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte 363 - .2byte 370 - .2byte -1 - -gBattleFrontierTrainerMons_Molly:: @ 85D136E - .2byte 268 - .2byte 270 - .2byte 272 - .2byte 274 - .2byte 282 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 303 - .2byte 307 - .2byte 311 - .2byte 314 - .2byte 317 - .2byte 322 - .2byte 327 - .2byte 328 - .2byte 331 - .2byte 336 - .2byte 340 - .2byte 342 - .2byte 344 - .2byte 347 - .2byte 352 - .2byte 353 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte -1 - -gBattleFrontierTrainerMons_Jazmin:: @ 85D13A6 - .2byte 268 - .2byte 270 - .2byte 272 - .2byte 274 - .2byte 282 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 303 - .2byte 307 - .2byte 311 - .2byte 314 - .2byte 317 - .2byte 322 - .2byte 327 - .2byte 328 - .2byte 331 - .2byte 336 - .2byte 340 - .2byte 342 - .2byte 344 - .2byte 347 - .2byte 352 - .2byte 353 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte -1 - -gBattleFrontierTrainerMons_Kelsey:: @ 85D13DE - .2byte 268 - .2byte 270 - .2byte 272 - .2byte 274 - .2byte 282 - .2byte 284 - .2byte 289 - .2byte 290 - .2byte 303 - .2byte 307 - .2byte 311 - .2byte 314 - .2byte 317 - .2byte 322 - .2byte 327 - .2byte 328 - .2byte 331 - .2byte 336 - .2byte 340 - .2byte 342 - .2byte 344 - .2byte 347 - .2byte 352 - .2byte 353 - .2byte 354 - .2byte 356 - .2byte 359 - .2byte -1 - -gBattleFrontierTrainerMons_Jalen:: @ 85D1416 - .2byte 269 - .2byte 271 - .2byte 275 - .2byte 279 - .2byte 280 - .2byte 281 - .2byte 283 - .2byte 285 - .2byte 286 - .2byte 287 - .2byte 293 - .2byte 294 - .2byte 295 - .2byte 300 - .2byte 302 - .2byte 307 - .2byte 310 - .2byte 311 - .2byte 320 - .2byte 322 - .2byte 326 - .2byte 330 - .2byte 332 - .2byte 335 - .2byte 344 - .2byte 345 - .2byte 346 - .2byte 348 - .2byte 350 - .2byte 353 - .2byte 357 - .2byte -1 - -gBattleFrontierTrainerMons_Griffen:: @ 85D1456 - .2byte 269 - .2byte 271 - .2byte 275 - .2byte 279 - .2byte 280 - .2byte 281 - .2byte 283 - .2byte 285 - .2byte 286 - .2byte 287 - .2byte 293 - .2byte 294 - .2byte 295 - .2byte 300 - .2byte 302 - .2byte 307 - .2byte 310 - .2byte 311 - .2byte 320 - .2byte 322 - .2byte 326 - .2byte 330 - .2byte 332 - .2byte 335 - .2byte 344 - .2byte 345 - .2byte 346 - .2byte 348 - .2byte 350 - .2byte 353 - .2byte 357 - .2byte -1 - -gBattleFrontierTrainerMons_Xander:: @ 85D1496 - .2byte 269 - .2byte 271 - .2byte 275 - .2byte 279 - .2byte 280 - .2byte 281 - .2byte 283 - .2byte 285 - .2byte 286 - .2byte 287 - .2byte 293 - .2byte 294 - .2byte 295 - .2byte 300 - .2byte 302 - .2byte 307 - .2byte 310 - .2byte 311 - .2byte 320 - .2byte 322 - .2byte 326 - .2byte 330 - .2byte 332 - .2byte 335 - .2byte 344 - .2byte 345 - .2byte 346 - .2byte 348 - .2byte 350 - .2byte 353 - .2byte 357 - .2byte -1 - -gBattleFrontierTrainerMons_Marvin:: @ 85D14D6 - .2byte 267 - .2byte 268 - .2byte 269 - .2byte 270 - .2byte 271 - .2byte 272 - .2byte 273 - .2byte 274 - .2byte 275 - .2byte 276 - .2byte 277 - .2byte 278 - .2byte 279 - .2byte 280 - .2byte 281 - .2byte 282 - .2byte 283 - .2byte 284 - .2byte 285 - .2byte 286 - .2byte 287 - .2byte 288 - .2byte 289 - .2byte 290 - .2byte 291 - .2byte 292 - .2byte 293 - .2byte 294 - .2byte 295 - .2byte 296 - .2byte 297 - .2byte 298 - .2byte 299 - .2byte 300 - .2byte 301 - .2byte 302 - .2byte 303 - .2byte 304 - .2byte -1 - -gBattleFrontierTrainerMons_Brennan:: @ 85D1524 - .2byte 305 - .2byte 306 - .2byte 307 - .2byte 308 - .2byte 309 - .2byte 310 - .2byte 311 - .2byte 312 - .2byte 313 - .2byte 314 - .2byte 315 - .2byte 316 - .2byte 317 - .2byte 318 - .2byte 319 - .2byte 320 - .2byte 321 - .2byte 322 - .2byte 323 - .2byte 324 - .2byte 325 - .2byte 326 - .2byte 327 - .2byte 328 - .2byte 329 - .2byte 330 - .2byte 331 - .2byte 332 - .2byte 333 - .2byte 334 - .2byte 335 - .2byte 336 - .2byte 337 - .2byte 338 - .2byte 339 - .2byte 340 - .2byte 341 - .2byte -1 - -gBattleFrontierTrainerMons_Baley:: @ 85D1570 - .2byte 159 - .2byte 160 - .2byte 161 - .2byte 172 - .2byte 173 - .2byte 177 - .2byte 198 - .2byte 226 - .2byte 238 - .2byte 263 - .2byte 264 - .2byte 277 - .2byte 278 - .2byte 282 - .2byte 303 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte -1 - -gBattleFrontierTrainerMons_Zackary:: @ 85D1598 - .2byte 271 - .2byte 283 - .2byte 294 - .2byte 295 - .2byte 298 - .2byte 299 - .2byte 300 - .2byte 311 - .2byte 315 - .2byte 320 - .2byte 327 - .2byte 328 - .2byte 330 - .2byte 335 - .2byte 337 - .2byte 338 - .2byte 339 - .2byte 341 - .2byte 346 - .2byte 364 - .2byte 365 - .2byte 366 - .2byte -1 - -gBattleFrontierTrainerMons_Gabriel:: @ 85D15C6 - .2byte 342 - .2byte 343 - .2byte 344 - .2byte 345 - .2byte 346 - .2byte 347 - .2byte 348 - .2byte 349 - .2byte 350 - .2byte 351 - .2byte 352 - .2byte 353 - .2byte 354 - .2byte 355 - .2byte 356 - .2byte 357 - .2byte 358 - .2byte 359 - .2byte 360 - .2byte 361 - .2byte 362 - .2byte 363 - .2byte 364 - .2byte 365 - .2byte 366 - .2byte 367 - .2byte 368 - .2byte 369 - .2byte 370 - .2byte 371 - .2byte -1 - -gBattleFrontierTrainerMons_Emily:: @ 85D1604 - .2byte 272 - .2byte 301 - .2byte 309 - .2byte 330 - .2byte 348 - .2byte 349 - .2byte 350 - .2byte 359 - .2byte 360 - .2byte 362 - .2byte 363 - .2byte 365 - .2byte -1 - -gBattleFrontierTrainerMons_Jordyn:: @ 85D161E - .2byte 267 - .2byte 269 - .2byte 270 - .2byte 272 - .2byte 273 - .2byte 276 - .2byte 279 - .2byte 284 - .2byte 288 - .2byte 302 - .2byte 304 - .2byte 305 - .2byte 308 - .2byte 309 - .2byte 312 - .2byte 316 - .2byte 319 - .2byte 322 - .2byte 323 - .2byte 325 - .2byte 326 - .2byte 329 - .2byte 331 - .2byte 332 - .2byte 336 - .2byte 340 - .2byte 344 - .2byte 345 - .2byte 351 - .2byte 353 - .2byte 355 - .2byte -1 - -gBattleFrontierTrainerMons_Sofia:: @ 85D165E - .2byte 270 - .2byte 272 - .2byte 274 - .2byte 276 - .2byte 279 - .2byte 282 - .2byte 285 - .2byte 290 - .2byte 293 - .2byte 313 - .2byte 314 - .2byte 321 - .2byte 334 - .2byte 340 - .2byte 348 - .2byte 356 - .2byte 359 - .2byte 360 - .2byte -1 - -gBattleFrontierTrainerMons_Braden:: @ 85D1684 - .2byte 372 - .2byte 373 - .2byte 374 - .2byte 375 - .2byte 376 - .2byte 377 - .2byte 378 - .2byte 379 - .2byte 380 - .2byte 381 - .2byte 382 - .2byte 383 - .2byte 384 - .2byte 385 - .2byte 386 - .2byte 387 - .2byte 388 - .2byte 389 - .2byte 390 - .2byte 391 - .2byte 392 - .2byte 393 - .2byte 394 - .2byte 395 - .2byte 396 - .2byte 397 - .2byte 398 - .2byte 399 - .2byte 400 - .2byte 401 - .2byte 402 - .2byte 403 - .2byte 404 - .2byte -1 - -gBattleFrontierTrainerMons_Kayden:: @ 85D16C8 - .2byte 405 - .2byte 406 - .2byte 407 - .2byte 408 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 415 - .2byte 416 - .2byte 417 - .2byte 418 - .2byte 419 - .2byte 420 - .2byte 421 - .2byte 422 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 426 - .2byte 427 - .2byte 428 - .2byte 429 - .2byte 430 - .2byte 431 - .2byte 432 - .2byte 433 - .2byte 434 - .2byte 435 - .2byte 436 - .2byte 437 - .2byte -1 - -gBattleFrontierTrainerMons_Cooper:: @ 85D170C - .2byte 438 - .2byte 439 - .2byte 440 - .2byte 441 - .2byte 442 - .2byte 443 - .2byte 444 - .2byte 445 - .2byte 446 - .2byte 447 - .2byte 448 - .2byte 449 - .2byte 450 - .2byte 451 - .2byte 452 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 456 - .2byte 457 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 461 - .2byte 462 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte 466 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Julia:: @ 85D174A - .2byte 372 - .2byte 373 - .2byte 374 - .2byte 375 - .2byte 376 - .2byte 377 - .2byte 378 - .2byte 379 - .2byte 380 - .2byte 381 - .2byte 382 - .2byte 383 - .2byte 384 - .2byte 385 - .2byte 386 - .2byte 387 - .2byte 388 - .2byte 389 - .2byte 390 - .2byte 391 - .2byte 392 - .2byte 393 - .2byte 394 - .2byte 395 - .2byte 396 - .2byte 397 - .2byte 398 - .2byte 399 - .2byte 400 - .2byte 401 - .2byte 402 - .2byte 403 - .2byte 404 - .2byte -1 - -gBattleFrontierTrainerMons_Amara:: @ 85D178E - .2byte 405 - .2byte 406 - .2byte 407 - .2byte 408 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 415 - .2byte 416 - .2byte 417 - .2byte 418 - .2byte 419 - .2byte 420 - .2byte 421 - .2byte 422 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 426 - .2byte 427 - .2byte 428 - .2byte 429 - .2byte 430 - .2byte 431 - .2byte 432 - .2byte 433 - .2byte 434 - .2byte 435 - .2byte 436 - .2byte 437 - .2byte -1 - -gBattleFrontierTrainerMons_Lynn:: @ 85D17D2 - .2byte 438 - .2byte 439 - .2byte 440 - .2byte 441 - .2byte 442 - .2byte 443 - .2byte 444 - .2byte 445 - .2byte 446 - .2byte 447 - .2byte 448 - .2byte 449 - .2byte 450 - .2byte 451 - .2byte 452 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 456 - .2byte 457 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 461 - .2byte 462 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte 466 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Jovan:: @ 85D1810 - .2byte 238 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 375 - .2byte 376 - .2byte 379 - .2byte 382 - .2byte 383 - .2byte 389 - .2byte 394 - .2byte 395 - .2byte 397 - .2byte 398 - .2byte 400 - .2byte 406 - .2byte 408 - .2byte 411 - .2byte 416 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 432 - .2byte 436 - .2byte 438 - .2byte 441 - .2byte 445 - .2byte 453 - .2byte 460 - .2byte 462 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Dominic:: @ 85D1854 - .2byte 238 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 375 - .2byte 376 - .2byte 379 - .2byte 382 - .2byte 383 - .2byte 389 - .2byte 394 - .2byte 395 - .2byte 397 - .2byte 398 - .2byte 400 - .2byte 406 - .2byte 408 - .2byte 411 - .2byte 416 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 432 - .2byte 436 - .2byte 438 - .2byte 441 - .2byte 445 - .2byte 453 - .2byte 460 - .2byte 462 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Nikolas:: @ 85D1898 - .2byte 238 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 375 - .2byte 376 - .2byte 379 - .2byte 382 - .2byte 383 - .2byte 389 - .2byte 394 - .2byte 395 - .2byte 397 - .2byte 398 - .2byte 400 - .2byte 406 - .2byte 408 - .2byte 411 - .2byte 416 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 432 - .2byte 436 - .2byte 438 - .2byte 441 - .2byte 445 - .2byte 453 - .2byte 460 - .2byte 462 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Valeria:: @ 85D18DC - .2byte 238 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 375 - .2byte 376 - .2byte 379 - .2byte 382 - .2byte 383 - .2byte 389 - .2byte 394 - .2byte 395 - .2byte 397 - .2byte 398 - .2byte 400 - .2byte 406 - .2byte 408 - .2byte 411 - .2byte 416 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 432 - .2byte 436 - .2byte 438 - .2byte 441 - .2byte 445 - .2byte 453 - .2byte 460 - .2byte 462 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Delaney:: @ 85D1920 - .2byte 238 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 375 - .2byte 376 - .2byte 379 - .2byte 382 - .2byte 383 - .2byte 389 - .2byte 394 - .2byte 395 - .2byte 397 - .2byte 398 - .2byte 400 - .2byte 406 - .2byte 408 - .2byte 411 - .2byte 416 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 432 - .2byte 436 - .2byte 438 - .2byte 441 - .2byte 445 - .2byte 453 - .2byte 460 - .2byte 462 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Meghan:: @ 85D1964 - .2byte 238 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 375 - .2byte 376 - .2byte 379 - .2byte 382 - .2byte 383 - .2byte 389 - .2byte 394 - .2byte 395 - .2byte 397 - .2byte 398 - .2byte 400 - .2byte 406 - .2byte 408 - .2byte 411 - .2byte 416 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 432 - .2byte 436 - .2byte 438 - .2byte 441 - .2byte 445 - .2byte 453 - .2byte 460 - .2byte 462 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Roberto:: @ 85D19A8 - .2byte 386 - .2byte 403 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 453 - .2byte 454 - .2byte 456 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte -1 - -gBattleFrontierTrainerMons_Damian:: @ 85D19CC - .2byte 386 - .2byte 403 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 453 - .2byte 454 - .2byte 456 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte -1 - -gBattleFrontierTrainerMons_Brody:: @ 85D19F0 - .2byte 386 - .2byte 403 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 453 - .2byte 454 - .2byte 456 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte -1 - -gBattleFrontierTrainerMons_Graham:: @ 85D1A14 - .2byte 386 - .2byte 403 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 453 - .2byte 454 - .2byte 456 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte -1 - -gBattleFrontierTrainerMons_Tylor:: @ 85D1A38 - .2byte 374 - .2byte 381 - .2byte 382 - .2byte 385 - .2byte 388 - .2byte 389 - .2byte 391 - .2byte 392 - .2byte 394 - .2byte 409 - .2byte 411 - .2byte 412 - .2byte 419 - .2byte 430 - .2byte 432 - .2byte 436 - .2byte 440 - .2byte 456 - .2byte 460 - .2byte 462 - .2byte 463 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Jaren:: @ 85D1A66 - .2byte 374 - .2byte 381 - .2byte 382 - .2byte 385 - .2byte 388 - .2byte 389 - .2byte 391 - .2byte 392 - .2byte 394 - .2byte 409 - .2byte 411 - .2byte 412 - .2byte 419 - .2byte 430 - .2byte 432 - .2byte 436 - .2byte 440 - .2byte 456 - .2byte 460 - .2byte 462 - .2byte 463 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Cordell:: @ 85D1A94 - .2byte 420 - .2byte 421 - .2byte 422 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 426 - .2byte 427 - .2byte 428 - .2byte 429 - .2byte 430 - .2byte 431 - .2byte 432 - .2byte 433 - .2byte 434 - .2byte 435 - .2byte 436 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 440 - .2byte 441 - .2byte 442 - .2byte 443 - .2byte 444 - .2byte 445 - .2byte 446 - .2byte 447 - .2byte 448 - .2byte 449 - .2byte 450 - .2byte 451 - .2byte 452 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 456 - .2byte 457 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 461 - .2byte 462 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte 466 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Jazlyn:: @ 85D1AF6 - .2byte 372 - .2byte 373 - .2byte 374 - .2byte 375 - .2byte 376 - .2byte 377 - .2byte 378 - .2byte 379 - .2byte 380 - .2byte 381 - .2byte 382 - .2byte 383 - .2byte 384 - .2byte 385 - .2byte 386 - .2byte 387 - .2byte 388 - .2byte 389 - .2byte 390 - .2byte 391 - .2byte 392 - .2byte 393 - .2byte 394 - .2byte 395 - .2byte 396 - .2byte 397 - .2byte 398 - .2byte 399 - .2byte 400 - .2byte 401 - .2byte 402 - .2byte 403 - .2byte 404 - .2byte 405 - .2byte 406 - .2byte 407 - .2byte 408 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 415 - .2byte 416 - .2byte 417 - .2byte 418 - .2byte 419 - .2byte -1 - -gBattleFrontierTrainerMons_Zachery:: @ 85D1B58 - .2byte 468 - .2byte 469 - .2byte 470 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 474 - .2byte 475 - .2byte 476 - .2byte 477 - .2byte 478 - .2byte 479 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 483 - .2byte 484 - .2byte 485 - .2byte 486 - .2byte 487 - .2byte 488 - .2byte 489 - .2byte 490 - .2byte 491 - .2byte 492 - .2byte 493 - .2byte 494 - .2byte 495 - .2byte 496 - .2byte 497 - .2byte 498 - .2byte 499 - .2byte 500 - .2byte -1 - -gBattleFrontierTrainerMons_Johan:: @ 85D1B9C - .2byte 469 - .2byte 470 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 474 - .2byte 475 - .2byte 476 - .2byte 477 - .2byte 478 - .2byte 479 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 483 - .2byte 484 - .2byte 485 - .2byte 486 - .2byte 487 - .2byte 488 - .2byte 489 - .2byte 490 - .2byte 491 - .2byte 492 - .2byte 493 - .2byte 494 - .2byte 495 - .2byte 496 - .2byte 497 - .2byte 498 - .2byte 499 - .2byte 500 - .2byte -1 - -gBattleFrontierTrainerMons_Shea:: @ 85D1BDE - .2byte 468 - .2byte 469 - .2byte 470 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 474 - .2byte 475 - .2byte 476 - .2byte 477 - .2byte 478 - .2byte 479 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 483 - .2byte 484 - .2byte 485 - .2byte 486 - .2byte 487 - .2byte 488 - .2byte 489 - .2byte 490 - .2byte 491 - .2byte 492 - .2byte 493 - .2byte 494 - .2byte 495 - .2byte 496 - .2byte 497 - .2byte 498 - .2byte 499 - .2byte 500 - .2byte -1 - -gBattleFrontierTrainerMons_Kaila:: @ 85D1C22 - .2byte 468 - .2byte 469 - .2byte 470 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 474 - .2byte 475 - .2byte 476 - .2byte 477 - .2byte 478 - .2byte 479 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 483 - .2byte 484 - .2byte 485 - .2byte 486 - .2byte 487 - .2byte 488 - .2byte 489 - .2byte 490 - .2byte 491 - .2byte 492 - .2byte 493 - .2byte 494 - .2byte 495 - .2byte 496 - .2byte 497 - .2byte 498 - .2byte 499 - .2byte 500 - .2byte -1 - -gBattleFrontierTrainerMons_Isiah:: @ 85D1C66 - .2byte 501 - .2byte 502 - .2byte 503 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 511 - .2byte 512 - .2byte 513 - .2byte 514 - .2byte 515 - .2byte 516 - .2byte 517 - .2byte 518 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 522 - .2byte 523 - .2byte 524 - .2byte 525 - .2byte 526 - .2byte 527 - .2byte 528 - .2byte 529 - .2byte 530 - .2byte 531 - .2byte 532 - .2byte 533 - .2byte -1 - -gBattleFrontierTrainerMons_Garrett:: @ 85D1CAA - .2byte 501 - .2byte 502 - .2byte 503 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 511 - .2byte 512 - .2byte 513 - .2byte 514 - .2byte 515 - .2byte 516 - .2byte 517 - .2byte 518 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 522 - .2byte 523 - .2byte 524 - .2byte 525 - .2byte 526 - .2byte 527 - .2byte 528 - .2byte 529 - .2byte 530 - .2byte 531 - .2byte 532 - .2byte 533 - .2byte -1 - -gBattleFrontierTrainerMons_Haylie:: @ 85D1CEE - .2byte 501 - .2byte 502 - .2byte 503 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 511 - .2byte 512 - .2byte 513 - .2byte 514 - .2byte 515 - .2byte 516 - .2byte 517 - .2byte 518 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 522 - .2byte 523 - .2byte 524 - .2byte 525 - .2byte 526 - .2byte 527 - .2byte 528 - .2byte 529 - .2byte 530 - .2byte 531 - .2byte 532 - .2byte 533 - .2byte -1 - -gBattleFrontierTrainerMons_Megan:: @ 85D1D32 - .2byte 501 - .2byte 502 - .2byte 503 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 511 - .2byte 512 - .2byte 513 - .2byte 514 - .2byte 515 - .2byte 516 - .2byte 517 - .2byte 518 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 522 - .2byte 523 - .2byte 524 - .2byte 525 - .2byte 526 - .2byte 527 - .2byte 528 - .2byte 529 - .2byte 530 - .2byte 531 - .2byte 532 - .2byte 533 - .2byte -1 - -gBattleFrontierTrainerMons_Issac:: @ 85D1D76 - .2byte 534 - .2byte 535 - .2byte 536 - .2byte 537 - .2byte 538 - .2byte 539 - .2byte 540 - .2byte 541 - .2byte 542 - .2byte 543 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 547 - .2byte 548 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 552 - .2byte 553 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 560 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Quinton:: @ 85D1DB4 - .2byte 534 - .2byte 535 - .2byte 536 - .2byte 537 - .2byte 538 - .2byte 539 - .2byte 540 - .2byte 541 - .2byte 542 - .2byte 543 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 547 - .2byte 548 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 552 - .2byte 553 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 560 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Salma:: @ 85D1DF2 - .2byte 534 - .2byte 535 - .2byte 536 - .2byte 537 - .2byte 538 - .2byte 539 - .2byte 540 - .2byte 541 - .2byte 542 - .2byte 543 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 547 - .2byte 548 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 552 - .2byte 553 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 560 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Ansley:: @ 85D1E30 - .2byte 534 - .2byte 535 - .2byte 536 - .2byte 537 - .2byte 538 - .2byte 539 - .2byte 540 - .2byte 541 - .2byte 542 - .2byte 543 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 547 - .2byte 548 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 552 - .2byte 553 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 560 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Holden:: @ 85D1E6E - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 383 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 432 - .2byte 480 - .2byte 481 - .2byte 490 - .2byte 491 - .2byte 494 - .2byte 496 - .2byte 512 - .2byte 513 - .2byte 519 - .2byte 520 - .2byte 528 - .2byte 534 - .2byte 537 - .2byte 541 - .2byte 549 - .2byte -1 - -gBattleFrontierTrainerMons_Luca:: @ 85D1E9E - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 383 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 432 - .2byte 480 - .2byte 481 - .2byte 490 - .2byte 491 - .2byte 494 - .2byte 496 - .2byte 512 - .2byte 513 - .2byte 519 - .2byte 520 - .2byte 528 - .2byte 534 - .2byte 537 - .2byte 541 - .2byte 549 - .2byte -1 - -gBattleFrontierTrainerMons_Jamison:: @ 85D1ECE - .2byte 282 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 469 - .2byte 472 - .2byte 475 - .2byte 476 - .2byte 478 - .2byte 481 - .2byte 484 - .2byte 490 - .2byte 491 - .2byte 497 - .2byte 500 - .2byte 501 - .2byte 509 - .2byte 510 - .2byte 513 - .2byte 516 - .2byte 517 - .2byte 519 - .2byte 520 - .2byte 524 - .2byte 528 - .2byte 530 - .2byte 533 - .2byte 534 - .2byte 537 - .2byte 542 - .2byte 553 - .2byte -1 - -gBattleFrontierTrainerMons_Gunnar:: @ 85D1F10 - .2byte 282 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 469 - .2byte 472 - .2byte 475 - .2byte 476 - .2byte 478 - .2byte 481 - .2byte 484 - .2byte 490 - .2byte 491 - .2byte 497 - .2byte 500 - .2byte 501 - .2byte 509 - .2byte 510 - .2byte 513 - .2byte 516 - .2byte 517 - .2byte 519 - .2byte 520 - .2byte 524 - .2byte 528 - .2byte 530 - .2byte 533 - .2byte 534 - .2byte 537 - .2byte 542 - .2byte 553 - .2byte -1 - -gBattleFrontierTrainerMons_Craig:: @ 85D1F52 - .2byte 471 - .2byte 474 - .2byte 475 - .2byte 479 - .2byte 483 - .2byte 485 - .2byte 488 - .2byte 493 - .2byte 495 - .2byte 496 - .2byte 502 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 514 - .2byte 521 - .2byte 525 - .2byte 530 - .2byte 532 - .2byte 535 - .2byte 538 - .2byte 544 - .2byte 545 - .2byte 548 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Pierce:: @ 85D1F96 - .2byte 471 - .2byte 474 - .2byte 475 - .2byte 479 - .2byte 483 - .2byte 485 - .2byte 488 - .2byte 493 - .2byte 495 - .2byte 496 - .2byte 502 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 514 - .2byte 521 - .2byte 525 - .2byte 530 - .2byte 532 - .2byte 535 - .2byte 538 - .2byte 544 - .2byte 545 - .2byte 548 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Regina:: @ 85D1FDA - .2byte 471 - .2byte 474 - .2byte 475 - .2byte 479 - .2byte 483 - .2byte 485 - .2byte 488 - .2byte 493 - .2byte 495 - .2byte 496 - .2byte 502 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 514 - .2byte 521 - .2byte 525 - .2byte 530 - .2byte 532 - .2byte 535 - .2byte 538 - .2byte 544 - .2byte 545 - .2byte 548 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Alison:: @ 85D201E - .2byte 471 - .2byte 474 - .2byte 475 - .2byte 479 - .2byte 483 - .2byte 485 - .2byte 488 - .2byte 493 - .2byte 495 - .2byte 496 - .2byte 502 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 514 - .2byte 521 - .2byte 525 - .2byte 530 - .2byte 532 - .2byte 535 - .2byte 538 - .2byte 544 - .2byte 545 - .2byte 548 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Hank:: @ 85D2062 - .2byte 277 - .2byte 278 - .2byte 282 - .2byte 303 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 383 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 432 - .2byte 481 - .2byte 513 - .2byte 519 - .2byte 520 - .2byte 528 - .2byte 575 - .2byte 609 - .2byte 615 - .2byte 616 - .2byte 624 - .2byte -1 - -gBattleFrontierTrainerMons_Earl:: @ 85D2092 - .2byte 277 - .2byte 278 - .2byte 282 - .2byte 303 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 383 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 432 - .2byte 481 - .2byte 513 - .2byte 519 - .2byte 520 - .2byte 528 - .2byte 575 - .2byte 609 - .2byte 615 - .2byte 616 - .2byte 624 - .2byte -1 - -gBattleFrontierTrainerMons_Ramiro:: @ 85D20C2 - .2byte 316 - .2byte 333 - .2byte 347 - .2byte 350 - .2byte 354 - .2byte 358 - .2byte 361 - .2byte 362 - .2byte 363 - .2byte 364 - .2byte 573 - .2byte 576 - .2byte 621 - .2byte 626 - .2byte 631 - .2byte -1 - -gBattleFrontierTrainerMons_Hunter:: @ 85D20E2 - .2byte 316 - .2byte 333 - .2byte 347 - .2byte 350 - .2byte 354 - .2byte 358 - .2byte 361 - .2byte 362 - .2byte 363 - .2byte 364 - .2byte 573 - .2byte 576 - .2byte 621 - .2byte 626 - .2byte 631 - .2byte -1 - -gBattleFrontierTrainerMons_Aiden:: @ 85D2102 - .2byte 564 - .2byte 575 - .2byte 576 - .2byte 578 - .2byte 579 - .2byte 580 - .2byte 594 - .2byte 595 - .2byte 605 - .2byte 606 - .2byte 608 - .2byte 609 - .2byte 615 - .2byte 619 - .2byte 620 - .2byte 624 - .2byte 625 - .2byte 627 - .2byte 632 - .2byte 642 - .2byte 650 - .2byte 658 - .2byte -1 - -gBattleFrontierTrainerMons_Xavier:: @ 85D2130 - .2byte 564 - .2byte 575 - .2byte 576 - .2byte 578 - .2byte 579 - .2byte 580 - .2byte 594 - .2byte 595 - .2byte 605 - .2byte 606 - .2byte 608 - .2byte 609 - .2byte 615 - .2byte 619 - .2byte 620 - .2byte 624 - .2byte 625 - .2byte 627 - .2byte 632 - .2byte 642 - .2byte 650 - .2byte 658 - .2byte -1 - -gBattleFrontierTrainerMons_Clinton:: @ 85D215E - .2byte 564 - .2byte 565 - .2byte 566 - .2byte 567 - .2byte 568 - .2byte 569 - .2byte 570 - .2byte 571 - .2byte 572 - .2byte 573 - .2byte 574 - .2byte 575 - .2byte 576 - .2byte 577 - .2byte 578 - .2byte 579 - .2byte 580 - .2byte 581 - .2byte 582 - .2byte 583 - .2byte 584 - .2byte 585 - .2byte 586 - .2byte 587 - .2byte 588 - .2byte 589 - .2byte 590 - .2byte 591 - .2byte 592 - .2byte 593 - .2byte 594 - .2byte 595 - .2byte 596 - .2byte 597 - .2byte 598 - .2byte 599 - .2byte 600 - .2byte 601 - .2byte 602 - .2byte 603 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 607 - .2byte 608 - .2byte 609 - .2byte 610 - .2byte 611 - .2byte -1 - -gBattleFrontierTrainerMons_Jesse:: @ 85D21C0 - .2byte 564 - .2byte 565 - .2byte 566 - .2byte 567 - .2byte 568 - .2byte 569 - .2byte 570 - .2byte 571 - .2byte 572 - .2byte 573 - .2byte 574 - .2byte 575 - .2byte 576 - .2byte 577 - .2byte 578 - .2byte 579 - .2byte 580 - .2byte 581 - .2byte 582 - .2byte 583 - .2byte 584 - .2byte 585 - .2byte 586 - .2byte 587 - .2byte 588 - .2byte 589 - .2byte 590 - .2byte 591 - .2byte 592 - .2byte 593 - .2byte 594 - .2byte 595 - .2byte 596 - .2byte 597 - .2byte 598 - .2byte 599 - .2byte 600 - .2byte 601 - .2byte 602 - .2byte 603 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 607 - .2byte 608 - .2byte 609 - .2byte 610 - .2byte 611 - .2byte -1 - -gBattleFrontierTrainerMons_Eduardo:: @ 85D2222 - .2byte 268 - .2byte 307 - .2byte 317 - .2byte 349 - .2byte 352 - .2byte 573 - .2byte 583 - .2byte 585 - .2byte 588 - .2byte 590 - .2byte 599 - .2byte 614 - .2byte 618 - .2byte 635 - .2byte 639 - .2byte -1 - -gBattleFrontierTrainerMons_Hal:: @ 85D2242 - .2byte 268 - .2byte 307 - .2byte 317 - .2byte 349 - .2byte 352 - .2byte 573 - .2byte 583 - .2byte 585 - .2byte 588 - .2byte 590 - .2byte 599 - .2byte 614 - .2byte 618 - .2byte 635 - .2byte 639 - .2byte -1 - -gBattleFrontierTrainerMons_Gage:: @ 85D2262 - .2byte 289 - .2byte 318 - .2byte 319 - .2byte 329 - .2byte 355 - .2byte 375 - .2byte 379 - .2byte 385 - .2byte 386 - .2byte 457 - .2byte 473 - .2byte 477 - .2byte 482 - .2byte 484 - .2byte 553 - .2byte 567 - .2byte 571 - .2byte 577 - .2byte 578 - .2byte 649 - .2byte -1 - -gBattleFrontierTrainerMons_Arnold:: @ 85D228C - .2byte 289 - .2byte 318 - .2byte 319 - .2byte 329 - .2byte 355 - .2byte 375 - .2byte 379 - .2byte 385 - .2byte 386 - .2byte 457 - .2byte 473 - .2byte 477 - .2byte 482 - .2byte 484 - .2byte 553 - .2byte 567 - .2byte 571 - .2byte 577 - .2byte 578 - .2byte 649 - .2byte -1 - -gBattleFrontierTrainerMons_Jarrett:: @ 85D22B6 - .2byte 565 - .2byte 573 - .2byte 576 - .2byte 580 - .2byte 582 - .2byte 584 - .2byte 592 - .2byte 601 - .2byte 602 - .2byte 610 - .2byte 621 - .2byte 623 - .2byte 626 - .2byte 631 - .2byte 634 - .2byte 640 - .2byte 641 - .2byte 644 - .2byte 648 - .2byte 650 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte -1 - -gBattleFrontierTrainerMons_Garett:: @ 85D22E6 - .2byte 565 - .2byte 573 - .2byte 576 - .2byte 580 - .2byte 582 - .2byte 584 - .2byte 592 - .2byte 601 - .2byte 602 - .2byte 610 - .2byte 621 - .2byte 623 - .2byte 626 - .2byte 631 - .2byte 634 - .2byte 640 - .2byte 641 - .2byte 644 - .2byte 648 - .2byte 650 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte -1 - -gBattleFrontierTrainerMons_Emanuel:: @ 85D2316 - .2byte 564 - .2byte 565 - .2byte 574 - .2byte 579 - .2byte 582 - .2byte 594 - .2byte 595 - .2byte 605 - .2byte 606 - .2byte 608 - .2byte 609 - .2byte 616 - .2byte 619 - .2byte 620 - .2byte 623 - .2byte 624 - .2byte 625 - .2byte 627 - .2byte 642 - .2byte 643 - .2byte -1 - -gBattleFrontierTrainerMons_Gustavo:: @ 85D2340 - .2byte 564 - .2byte 565 - .2byte 574 - .2byte 579 - .2byte 582 - .2byte 594 - .2byte 595 - .2byte 605 - .2byte 606 - .2byte 608 - .2byte 609 - .2byte 616 - .2byte 619 - .2byte 620 - .2byte 623 - .2byte 624 - .2byte 625 - .2byte 627 - .2byte 642 - .2byte 643 - .2byte -1 - -gBattleFrontierTrainerMons_Kameron:: @ 85D236A - .2byte 568 - .2byte 581 - .2byte 589 - .2byte 598 - .2byte 600 - .2byte 603 - .2byte 607 - .2byte 611 - .2byte 617 - .2byte 618 - .2byte 622 - .2byte 636 - .2byte 643 - .2byte 646 - .2byte 647 - .2byte 652 - .2byte 654 - .2byte 656 - .2byte 659 - .2byte -1 - -gBattleFrontierTrainerMons_Alfredo:: @ 85D2392 - .2byte 568 - .2byte 581 - .2byte 589 - .2byte 598 - .2byte 600 - .2byte 603 - .2byte 607 - .2byte 611 - .2byte 617 - .2byte 618 - .2byte 622 - .2byte 636 - .2byte 643 - .2byte 646 - .2byte 647 - .2byte 652 - .2byte 654 - .2byte 656 - .2byte 659 - .2byte -1 - -gBattleFrontierTrainerMons_Ruben:: @ 85D23BA - .2byte 612 - .2byte 613 - .2byte 614 - .2byte 615 - .2byte 616 - .2byte 617 - .2byte 618 - .2byte 619 - .2byte 620 - .2byte 621 - .2byte 622 - .2byte 623 - .2byte 624 - .2byte 625 - .2byte 626 - .2byte 627 - .2byte 628 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 632 - .2byte 633 - .2byte 634 - .2byte 635 - .2byte 636 - .2byte 637 - .2byte 638 - .2byte 639 - .2byte 640 - .2byte 641 - .2byte 642 - .2byte 643 - .2byte 644 - .2byte 645 - .2byte 646 - .2byte 647 - .2byte 648 - .2byte 649 - .2byte 650 - .2byte 651 - .2byte 652 - .2byte 653 - .2byte 654 - .2byte 655 - .2byte 656 - .2byte 657 - .2byte 658 - .2byte 659 - .2byte -1 - -gBattleFrontierTrainerMons_Lamar:: @ 85D241C - .2byte 612 - .2byte 613 - .2byte 614 - .2byte 615 - .2byte 616 - .2byte 617 - .2byte 618 - .2byte 619 - .2byte 620 - .2byte 621 - .2byte 622 - .2byte 623 - .2byte 624 - .2byte 625 - .2byte 626 - .2byte 627 - .2byte 628 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 632 - .2byte 633 - .2byte 634 - .2byte 635 - .2byte 636 - .2byte 637 - .2byte 638 - .2byte 639 - .2byte 640 - .2byte 641 - .2byte 642 - .2byte 643 - .2byte 644 - .2byte 645 - .2byte 646 - .2byte 647 - .2byte 648 - .2byte 649 - .2byte 650 - .2byte 651 - .2byte 652 - .2byte 653 - .2byte 654 - .2byte 655 - .2byte 656 - .2byte 657 - .2byte 658 - .2byte 659 - .2byte -1 - -gBattleFrontierTrainerMons_Jaxon:: @ 85D247E - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte -1 - -gBattleFrontierTrainerMons_Logan:: @ 85D24C2 - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte -1 - -gBattleFrontierTrainerMons_Emilee:: @ 85D2506 - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte -1 - -gBattleFrontierTrainerMons_Josie:: @ 85D254A - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte -1 - -gBattleFrontierTrainerMons_Armando:: @ 85D258E - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte -1 - -gBattleFrontierTrainerMons_Skyler:: @ 85D25D2 - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte -1 - -gBattleFrontierTrainerMons_Ruth:: @ 85D2616 - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte -1 - -gBattleFrontierTrainerMons_Melody:: @ 85D265A - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte -1 - -gBattleFrontierTrainerMons_Pedro:: @ 85D269E - .2byte 347 - .2byte 661 - .2byte 664 - .2byte 669 - .2byte 672 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 680 - .2byte 685 - .2byte 688 - .2byte 694 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 706 - .2byte 713 - .2byte 717 - .2byte 719 - .2byte 722 - .2byte 724 - .2byte 727 - .2byte 730 - .2byte 736 - .2byte 737 - .2byte 740 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Erick:: @ 85D26E6 - .2byte 347 - .2byte 661 - .2byte 664 - .2byte 669 - .2byte 672 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 680 - .2byte 685 - .2byte 688 - .2byte 694 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 706 - .2byte 713 - .2byte 717 - .2byte 719 - .2byte 722 - .2byte 724 - .2byte 727 - .2byte 730 - .2byte 736 - .2byte 737 - .2byte 740 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Elaine:: @ 85D272E - .2byte 664 - .2byte 665 - .2byte 669 - .2byte 672 - .2byte 676 - .2byte 677 - .2byte 680 - .2byte 685 - .2byte 687 - .2byte 688 - .2byte 694 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 706 - .2byte 713 - .2byte 717 - .2byte 722 - .2byte 724 - .2byte 727 - .2byte 730 - .2byte 736 - .2byte 737 - .2byte 740 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Joyce:: @ 85D2772 - .2byte 664 - .2byte 665 - .2byte 669 - .2byte 672 - .2byte 676 - .2byte 677 - .2byte 680 - .2byte 685 - .2byte 687 - .2byte 688 - .2byte 694 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 706 - .2byte 713 - .2byte 717 - .2byte 722 - .2byte 724 - .2byte 727 - .2byte 730 - .2byte 736 - .2byte 737 - .2byte 740 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Todd:: @ 85D27B6 - .2byte 267 - .2byte 273 - .2byte 305 - .2byte 312 - .2byte 325 - .2byte 332 - .2byte 352 - .2byte 662 - .2byte 665 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 672 - .2byte 673 - .2byte 676 - .2byte 677 - .2byte 679 - .2byte 680 - .2byte 682 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 707 - .2byte 710 - .2byte 718 - .2byte 720 - .2byte 724 - .2byte 725 - .2byte 728 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 734 - .2byte 735 - .2byte 744 - .2byte 748 - .2byte 750 - .2byte 751 - .2byte -1 - -gBattleFrontierTrainerMons_Gavin:: @ 85D2808 - .2byte 267 - .2byte 273 - .2byte 305 - .2byte 312 - .2byte 325 - .2byte 332 - .2byte 352 - .2byte 662 - .2byte 665 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 672 - .2byte 673 - .2byte 676 - .2byte 677 - .2byte 679 - .2byte 680 - .2byte 682 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 707 - .2byte 710 - .2byte 718 - .2byte 720 - .2byte 724 - .2byte 725 - .2byte 728 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 734 - .2byte 735 - .2byte 744 - .2byte 748 - .2byte 750 - .2byte 751 - .2byte -1 - -gBattleFrontierTrainerMons_Malory:: @ 85D285A - .2byte 267 - .2byte 273 - .2byte 305 - .2byte 312 - .2byte 325 - .2byte 332 - .2byte 352 - .2byte 662 - .2byte 665 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 672 - .2byte 673 - .2byte 676 - .2byte 677 - .2byte 679 - .2byte 680 - .2byte 682 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 707 - .2byte 710 - .2byte 718 - .2byte 720 - .2byte 724 - .2byte 725 - .2byte 728 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 734 - .2byte 735 - .2byte 744 - .2byte 748 - .2byte 750 - .2byte 751 - .2byte -1 - -gBattleFrontierTrainerMons_Esther:: @ 85D28AC - .2byte 267 - .2byte 273 - .2byte 305 - .2byte 312 - .2byte 325 - .2byte 332 - .2byte 352 - .2byte 662 - .2byte 665 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 672 - .2byte 673 - .2byte 676 - .2byte 677 - .2byte 679 - .2byte 680 - .2byte 682 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 707 - .2byte 710 - .2byte 718 - .2byte 720 - .2byte 724 - .2byte 725 - .2byte 728 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 734 - .2byte 735 - .2byte 744 - .2byte 748 - .2byte 750 - .2byte 751 - .2byte -1 - -gBattleFrontierTrainerMons_Oscar:: @ 85D28FE - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Wilson:: @ 85D293C - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Clare:: @ 85D297A - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Tess:: @ 85D29B8 - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Leon:: @ 85D29F6 - .2byte 420 - .2byte 421 - .2byte 422 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 426 - .2byte 427 - .2byte 428 - .2byte 429 - .2byte 430 - .2byte 431 - .2byte 432 - .2byte 433 - .2byte 434 - .2byte 435 - .2byte 436 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 440 - .2byte 441 - .2byte 442 - .2byte 443 - .2byte 516 - .2byte 517 - .2byte 518 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 522 - .2byte 523 - .2byte 524 - .2byte 525 - .2byte 526 - .2byte 527 - .2byte 528 - .2byte 529 - .2byte 530 - .2byte 531 - .2byte 532 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 536 - .2byte 537 - .2byte 538 - .2byte 539 - .2byte 612 - .2byte 613 - .2byte 614 - .2byte 615 - .2byte 616 - .2byte 617 - .2byte 618 - .2byte 619 - .2byte 620 - .2byte 621 - .2byte 622 - .2byte 623 - .2byte 624 - .2byte 625 - .2byte 626 - .2byte 627 - .2byte 628 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 632 - .2byte 633 - .2byte 634 - .2byte 635 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte -1 - -gBattleFrontierTrainerMons_Alonzo:: @ 85D2AB8 - .2byte 444 - .2byte 445 - .2byte 446 - .2byte 447 - .2byte 448 - .2byte 449 - .2byte 450 - .2byte 451 - .2byte 452 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 456 - .2byte 457 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 461 - .2byte 462 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte 466 - .2byte 467 - .2byte 540 - .2byte 541 - .2byte 542 - .2byte 543 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 547 - .2byte 548 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 552 - .2byte 553 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 560 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte 636 - .2byte 637 - .2byte 638 - .2byte 639 - .2byte 640 - .2byte 641 - .2byte 642 - .2byte 643 - .2byte 644 - .2byte 645 - .2byte 646 - .2byte 647 - .2byte 648 - .2byte 649 - .2byte 650 - .2byte 651 - .2byte 652 - .2byte 653 - .2byte 654 - .2byte 655 - .2byte 656 - .2byte 657 - .2byte 658 - .2byte 659 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Vince:: @ 85D2B7A - .2byte 421 - .2byte 425 - .2byte 431 - .2byte 437 - .2byte 439 - .2byte 456 - .2byte 460 - .2byte 465 - .2byte 466 - .2byte 517 - .2byte 521 - .2byte 527 - .2byte 533 - .2byte 535 - .2byte 552 - .2byte 556 - .2byte 561 - .2byte 562 - .2byte 613 - .2byte 617 - .2byte 623 - .2byte 629 - .2byte 631 - .2byte 648 - .2byte 652 - .2byte 657 - .2byte 658 - .2byte 709 - .2byte 713 - .2byte 719 - .2byte 725 - .2byte 727 - .2byte 744 - .2byte 748 - .2byte 753 - .2byte 754 - .2byte 766 - .2byte 777 - .2byte 788 - .2byte 799 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte 804 - .2byte 805 - .2byte 806 - .2byte 807 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte 824 - .2byte 825 - .2byte 826 - .2byte 827 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Bryon:: @ 85D2C44 - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 759 - .2byte 760 - .2byte 761 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 766 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 770 - .2byte 771 - .2byte 772 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 777 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 781 - .2byte 782 - .2byte 783 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 788 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 792 - .2byte 793 - .2byte 794 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 799 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte 870 - .2byte 871 - .2byte 872 - .2byte 873 - .2byte 874 - .2byte 875 - .2byte 876 - .2byte 877 - .2byte 878 - .2byte 879 - .2byte 880 - .2byte 881 - .2byte -1 - -gBattleFrontierTrainerMons_Ava:: @ 85D2CEA - .2byte 372 - .2byte 373 - .2byte 374 - .2byte 375 - .2byte 376 - .2byte 377 - .2byte 378 - .2byte 379 - .2byte 380 - .2byte 381 - .2byte 382 - .2byte 383 - .2byte 384 - .2byte 385 - .2byte 386 - .2byte 387 - .2byte 388 - .2byte 389 - .2byte 390 - .2byte 391 - .2byte 392 - .2byte 393 - .2byte 394 - .2byte 395 - .2byte 468 - .2byte 469 - .2byte 470 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 474 - .2byte 475 - .2byte 476 - .2byte 477 - .2byte 478 - .2byte 479 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 483 - .2byte 484 - .2byte 485 - .2byte 486 - .2byte 487 - .2byte 488 - .2byte 489 - .2byte 490 - .2byte 491 - .2byte 564 - .2byte 565 - .2byte 566 - .2byte 567 - .2byte 568 - .2byte 569 - .2byte 570 - .2byte 571 - .2byte 572 - .2byte 573 - .2byte 574 - .2byte 575 - .2byte 576 - .2byte 577 - .2byte 578 - .2byte 579 - .2byte 580 - .2byte 581 - .2byte 582 - .2byte 583 - .2byte 584 - .2byte 585 - .2byte 586 - .2byte 587 - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte -1 - -gBattleFrontierTrainerMons_Miriam:: @ 85D2DAC - .2byte 396 - .2byte 397 - .2byte 398 - .2byte 399 - .2byte 400 - .2byte 401 - .2byte 402 - .2byte 403 - .2byte 404 - .2byte 405 - .2byte 406 - .2byte 407 - .2byte 408 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 415 - .2byte 416 - .2byte 417 - .2byte 418 - .2byte 419 - .2byte 492 - .2byte 493 - .2byte 494 - .2byte 495 - .2byte 496 - .2byte 497 - .2byte 498 - .2byte 499 - .2byte 500 - .2byte 501 - .2byte 502 - .2byte 503 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 511 - .2byte 512 - .2byte 513 - .2byte 514 - .2byte 515 - .2byte 588 - .2byte 589 - .2byte 590 - .2byte 591 - .2byte 592 - .2byte 593 - .2byte 594 - .2byte 595 - .2byte 596 - .2byte 597 - .2byte 598 - .2byte 599 - .2byte 600 - .2byte 601 - .2byte 602 - .2byte 603 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 607 - .2byte 608 - .2byte 609 - .2byte 610 - .2byte 611 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte -1 - -gBattleFrontierTrainerMons_Carrie:: @ 85D2E6E - .2byte 421 - .2byte 425 - .2byte 431 - .2byte 437 - .2byte 439 - .2byte 456 - .2byte 460 - .2byte 465 - .2byte 466 - .2byte 517 - .2byte 521 - .2byte 527 - .2byte 533 - .2byte 535 - .2byte 552 - .2byte 556 - .2byte 561 - .2byte 562 - .2byte 613 - .2byte 617 - .2byte 623 - .2byte 629 - .2byte 631 - .2byte 648 - .2byte 652 - .2byte 657 - .2byte 658 - .2byte 709 - .2byte 713 - .2byte 719 - .2byte 725 - .2byte 727 - .2byte 744 - .2byte 748 - .2byte 753 - .2byte 754 - .2byte 765 - .2byte 776 - .2byte 787 - .2byte 798 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte 804 - .2byte 805 - .2byte 806 - .2byte 807 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte 824 - .2byte 825 - .2byte 826 - .2byte 827 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Gillian2:: @ 85D2F38 - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 759 - .2byte 760 - .2byte 761 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 765 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 770 - .2byte 771 - .2byte 772 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 776 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 781 - .2byte 782 - .2byte 783 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 787 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 792 - .2byte 793 - .2byte 794 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 798 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte 870 - .2byte 871 - .2byte 872 - .2byte 873 - .2byte 874 - .2byte 875 - .2byte 876 - .2byte 877 - .2byte 878 - .2byte 879 - .2byte 880 - .2byte 881 - .2byte -1 - -gBattleFrontierTrainerMons_Tyler:: @ 85D2FDE - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Chaz:: @ 85D30A0 - .2byte 564 - .2byte 565 - .2byte 566 - .2byte 567 - .2byte 568 - .2byte 569 - .2byte 570 - .2byte 571 - .2byte 572 - .2byte 573 - .2byte 574 - .2byte 575 - .2byte 576 - .2byte 577 - .2byte 578 - .2byte 579 - .2byte 580 - .2byte 581 - .2byte 582 - .2byte 583 - .2byte 584 - .2byte 585 - .2byte 586 - .2byte 587 - .2byte 588 - .2byte 589 - .2byte 590 - .2byte 591 - .2byte 592 - .2byte 593 - .2byte 594 - .2byte 595 - .2byte 596 - .2byte 597 - .2byte 598 - .2byte 599 - .2byte 600 - .2byte 601 - .2byte 602 - .2byte 603 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 607 - .2byte 608 - .2byte 609 - .2byte 610 - .2byte 611 - .2byte 612 - .2byte 613 - .2byte 614 - .2byte 615 - .2byte 616 - .2byte 617 - .2byte 618 - .2byte 619 - .2byte 620 - .2byte 621 - .2byte 622 - .2byte 623 - .2byte 624 - .2byte 625 - .2byte 626 - .2byte 627 - .2byte 628 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 632 - .2byte 633 - .2byte 634 - .2byte 635 - .2byte 636 - .2byte 637 - .2byte 638 - .2byte 639 - .2byte 640 - .2byte 641 - .2byte 642 - .2byte 643 - .2byte 644 - .2byte 645 - .2byte 646 - .2byte 647 - .2byte 648 - .2byte 649 - .2byte 650 - .2byte 651 - .2byte 652 - .2byte 653 - .2byte 654 - .2byte 655 - .2byte 656 - .2byte 657 - .2byte 658 - .2byte 659 - .2byte -1 - -gBattleFrontierTrainerMons_Nelson:: @ 85D3162 - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 759 - .2byte 760 - .2byte 761 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 766 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 770 - .2byte 771 - .2byte 772 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 777 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 781 - .2byte 782 - .2byte 783 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 788 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 792 - .2byte 793 - .2byte 794 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 799 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte 870 - .2byte 871 - .2byte 872 - .2byte 873 - .2byte 874 - .2byte 875 - .2byte 876 - .2byte 877 - .2byte 878 - .2byte 879 - .2byte 880 - .2byte 881 - .2byte -1 - -gBattleFrontierTrainerMons_Shania:: @ 85D3208 - .2byte 468 - .2byte 469 - .2byte 470 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 474 - .2byte 475 - .2byte 476 - .2byte 477 - .2byte 478 - .2byte 479 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 483 - .2byte 484 - .2byte 485 - .2byte 486 - .2byte 487 - .2byte 488 - .2byte 489 - .2byte 490 - .2byte 491 - .2byte 492 - .2byte 493 - .2byte 494 - .2byte 495 - .2byte 496 - .2byte 497 - .2byte 498 - .2byte 499 - .2byte 500 - .2byte 501 - .2byte 502 - .2byte 503 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 511 - .2byte 512 - .2byte 513 - .2byte 514 - .2byte 515 - .2byte 516 - .2byte 517 - .2byte 518 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 522 - .2byte 523 - .2byte 524 - .2byte 525 - .2byte 526 - .2byte 527 - .2byte 528 - .2byte 529 - .2byte 530 - .2byte 531 - .2byte 532 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 536 - .2byte 537 - .2byte 538 - .2byte 539 - .2byte 540 - .2byte 541 - .2byte 542 - .2byte 543 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 547 - .2byte 548 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 552 - .2byte 553 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 560 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Stella:: @ 85D32CA - .2byte 372 - .2byte 373 - .2byte 374 - .2byte 375 - .2byte 376 - .2byte 377 - .2byte 378 - .2byte 379 - .2byte 380 - .2byte 381 - .2byte 382 - .2byte 383 - .2byte 384 - .2byte 385 - .2byte 386 - .2byte 387 - .2byte 388 - .2byte 389 - .2byte 390 - .2byte 391 - .2byte 392 - .2byte 393 - .2byte 394 - .2byte 395 - .2byte 396 - .2byte 397 - .2byte 398 - .2byte 399 - .2byte 400 - .2byte 401 - .2byte 402 - .2byte 403 - .2byte 404 - .2byte 405 - .2byte 406 - .2byte 407 - .2byte 408 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 415 - .2byte 416 - .2byte 417 - .2byte 418 - .2byte 419 - .2byte 420 - .2byte 421 - .2byte 422 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 426 - .2byte 427 - .2byte 428 - .2byte 429 - .2byte 430 - .2byte 431 - .2byte 432 - .2byte 433 - .2byte 434 - .2byte 435 - .2byte 436 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 440 - .2byte 441 - .2byte 442 - .2byte 443 - .2byte 444 - .2byte 445 - .2byte 446 - .2byte 447 - .2byte 448 - .2byte 449 - .2byte 450 - .2byte 451 - .2byte 452 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 456 - .2byte 457 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 461 - .2byte 462 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte 466 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Dorine:: @ 85D338C - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 759 - .2byte 760 - .2byte 761 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 765 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 770 - .2byte 771 - .2byte 772 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 776 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 781 - .2byte 782 - .2byte 783 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 787 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 792 - .2byte 793 - .2byte 794 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 798 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte 870 - .2byte 871 - .2byte 872 - .2byte 873 - .2byte 874 - .2byte 875 - .2byte 876 - .2byte 877 - .2byte 878 - .2byte 879 - .2byte 880 - .2byte 881 - .2byte -1 - -gBattleFrontierTrainerMons_Maddox:: @ 85D3432 - .2byte 403 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 454 - .2byte 456 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 465 - .2byte 499 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 529 - .2byte 531 - .2byte 536 - .2byte 546 - .2byte 550 - .2byte 552 - .2byte 555 - .2byte 557 - .2byte 559 - .2byte 561 - .2byte 595 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 625 - .2byte 627 - .2byte 632 - .2byte 642 - .2byte 646 - .2byte 648 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte 657 - .2byte 691 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 721 - .2byte 723 - .2byte 728 - .2byte 738 - .2byte 742 - .2byte 744 - .2byte 747 - .2byte 749 - .2byte 751 - .2byte 753 - .2byte 765 - .2byte 766 - .2byte 776 - .2byte 777 - .2byte 787 - .2byte 788 - .2byte 798 - .2byte 799 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Davin:: @ 85D34F4 - .2byte 403 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 454 - .2byte 456 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 465 - .2byte 499 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 529 - .2byte 531 - .2byte 536 - .2byte 546 - .2byte 550 - .2byte 552 - .2byte 555 - .2byte 557 - .2byte 559 - .2byte 561 - .2byte 595 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 625 - .2byte 627 - .2byte 632 - .2byte 642 - .2byte 646 - .2byte 648 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte 657 - .2byte 691 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 721 - .2byte 723 - .2byte 728 - .2byte 738 - .2byte 742 - .2byte 744 - .2byte 747 - .2byte 749 - .2byte 751 - .2byte 753 - .2byte 765 - .2byte 766 - .2byte 776 - .2byte 777 - .2byte 787 - .2byte 788 - .2byte 798 - .2byte 799 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Trevon:: @ 85D35B6 - .2byte 403 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 454 - .2byte 456 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 465 - .2byte 499 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 529 - .2byte 531 - .2byte 536 - .2byte 546 - .2byte 550 - .2byte 552 - .2byte 555 - .2byte 557 - .2byte 559 - .2byte 561 - .2byte 595 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 625 - .2byte 627 - .2byte 632 - .2byte 642 - .2byte 646 - .2byte 648 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte 657 - .2byte 691 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 721 - .2byte 723 - .2byte 728 - .2byte 738 - .2byte 742 - .2byte 744 - .2byte 747 - .2byte 749 - .2byte 751 - .2byte 753 - .2byte 765 - .2byte 766 - .2byte 776 - .2byte 777 - .2byte 787 - .2byte 788 - .2byte 798 - .2byte 799 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Mateo:: @ 85D3678 - .2byte 373 - .2byte 382 - .2byte 390 - .2byte 402 - .2byte 403 - .2byte 416 - .2byte 417 - .2byte 424 - .2byte 431 - .2byte 432 - .2byte 435 - .2byte 450 - .2byte 451 - .2byte 469 - .2byte 480 - .2byte 486 - .2byte 498 - .2byte 499 - .2byte 512 - .2byte 513 - .2byte 520 - .2byte 527 - .2byte 528 - .2byte 531 - .2byte 546 - .2byte 547 - .2byte 565 - .2byte 574 - .2byte 582 - .2byte 594 - .2byte 595 - .2byte 608 - .2byte 609 - .2byte 616 - .2byte 623 - .2byte 624 - .2byte 627 - .2byte 642 - .2byte 643 - .2byte 661 - .2byte 670 - .2byte 678 - .2byte 690 - .2byte 691 - .2byte 704 - .2byte 705 - .2byte 712 - .2byte 719 - .2byte 720 - .2byte 723 - .2byte 738 - .2byte 739 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte -1 - -gBattleFrontierTrainerMons_Bret:: @ 85D36EA - .2byte 373 - .2byte 382 - .2byte 390 - .2byte 415 - .2byte 419 - .2byte 424 - .2byte 426 - .2byte 430 - .2byte 431 - .2byte 444 - .2byte 451 - .2byte 454 - .2byte 455 - .2byte 464 - .2byte 469 - .2byte 480 - .2byte 486 - .2byte 511 - .2byte 515 - .2byte 520 - .2byte 522 - .2byte 526 - .2byte 527 - .2byte 540 - .2byte 547 - .2byte 550 - .2byte 551 - .2byte 560 - .2byte 565 - .2byte 574 - .2byte 582 - .2byte 607 - .2byte 611 - .2byte 616 - .2byte 618 - .2byte 622 - .2byte 623 - .2byte 636 - .2byte 643 - .2byte 646 - .2byte 647 - .2byte 656 - .2byte 661 - .2byte 670 - .2byte 678 - .2byte 703 - .2byte 707 - .2byte 712 - .2byte 714 - .2byte 718 - .2byte 719 - .2byte 732 - .2byte 739 - .2byte 742 - .2byte 743 - .2byte 752 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte -1 - -gBattleFrontierTrainerMons_Raul:: @ 85D3764 - .2byte 373 - .2byte 382 - .2byte 383 - .2byte 386 - .2byte 390 - .2byte 423 - .2byte 424 - .2byte 431 - .2byte 433 - .2byte 450 - .2byte 451 - .2byte 466 - .2byte 469 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 486 - .2byte 519 - .2byte 520 - .2byte 527 - .2byte 529 - .2byte 546 - .2byte 547 - .2byte 562 - .2byte 565 - .2byte 574 - .2byte 575 - .2byte 578 - .2byte 582 - .2byte 615 - .2byte 616 - .2byte 623 - .2byte 625 - .2byte 642 - .2byte 643 - .2byte 658 - .2byte 661 - .2byte 670 - .2byte 671 - .2byte 674 - .2byte 678 - .2byte 711 - .2byte 712 - .2byte 719 - .2byte 721 - .2byte 738 - .2byte 739 - .2byte 754 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte -1 - -gBattleFrontierTrainerMons_Kay:: @ 85D37D6 - .2byte 373 - .2byte 382 - .2byte 387 - .2byte 390 - .2byte 402 - .2byte 403 - .2byte 413 - .2byte 414 - .2byte 424 - .2byte 427 - .2byte 431 - .2byte 433 - .2byte 451 - .2byte 469 - .2byte 470 - .2byte 480 - .2byte 486 - .2byte 498 - .2byte 499 - .2byte 509 - .2byte 510 - .2byte 520 - .2byte 523 - .2byte 527 - .2byte 529 - .2byte 547 - .2byte 565 - .2byte 574 - .2byte 579 - .2byte 582 - .2byte 594 - .2byte 595 - .2byte 605 - .2byte 606 - .2byte 616 - .2byte 619 - .2byte 623 - .2byte 625 - .2byte 643 - .2byte 661 - .2byte 670 - .2byte 675 - .2byte 678 - .2byte 690 - .2byte 691 - .2byte 701 - .2byte 702 - .2byte 712 - .2byte 715 - .2byte 719 - .2byte 721 - .2byte 739 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte -1 - -gBattleFrontierTrainerMons_Elena:: @ 85D3848 - .2byte 373 - .2byte 382 - .2byte 390 - .2byte 415 - .2byte 419 - .2byte 424 - .2byte 426 - .2byte 430 - .2byte 431 - .2byte 444 - .2byte 451 - .2byte 454 - .2byte 455 - .2byte 464 - .2byte 469 - .2byte 480 - .2byte 486 - .2byte 511 - .2byte 515 - .2byte 520 - .2byte 522 - .2byte 526 - .2byte 527 - .2byte 540 - .2byte 547 - .2byte 550 - .2byte 551 - .2byte 560 - .2byte 565 - .2byte 574 - .2byte 582 - .2byte 607 - .2byte 611 - .2byte 616 - .2byte 618 - .2byte 622 - .2byte 623 - .2byte 636 - .2byte 643 - .2byte 646 - .2byte 647 - .2byte 656 - .2byte 661 - .2byte 670 - .2byte 678 - .2byte 703 - .2byte 707 - .2byte 712 - .2byte 714 - .2byte 718 - .2byte 719 - .2byte 732 - .2byte 739 - .2byte 742 - .2byte 743 - .2byte 752 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte -1 - -gBattleFrontierTrainerMons_Alana:: @ 85D38C2 - .2byte 373 - .2byte 382 - .2byte 383 - .2byte 386 - .2byte 390 - .2byte 423 - .2byte 424 - .2byte 431 - .2byte 433 - .2byte 450 - .2byte 451 - .2byte 466 - .2byte 469 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 486 - .2byte 519 - .2byte 520 - .2byte 527 - .2byte 529 - .2byte 546 - .2byte 547 - .2byte 562 - .2byte 565 - .2byte 574 - .2byte 575 - .2byte 578 - .2byte 582 - .2byte 615 - .2byte 616 - .2byte 623 - .2byte 625 - .2byte 642 - .2byte 643 - .2byte 658 - .2byte 661 - .2byte 670 - .2byte 671 - .2byte 674 - .2byte 678 - .2byte 711 - .2byte 712 - .2byte 719 - .2byte 721 - .2byte 738 - .2byte 739 - .2byte 754 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte -1 - -gBattleFrontierTrainerMons_Alexas:: @ 85D3934 - .2byte 382 - .2byte 387 - .2byte 403 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 431 - .2byte 433 - .2byte 435 - .2byte 450 - .2byte 459 - .2byte 461 - .2byte 465 - .2byte 466 - .2byte 470 - .2byte 480 - .2byte 499 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 527 - .2byte 529 - .2byte 531 - .2byte 546 - .2byte 555 - .2byte 557 - .2byte 561 - .2byte 562 - .2byte 574 - .2byte 579 - .2byte 595 - .2byte 615 - .2byte 616 - .2byte 617 - .2byte 623 - .2byte 625 - .2byte 627 - .2byte 642 - .2byte 651 - .2byte 653 - .2byte 657 - .2byte 658 - .2byte 670 - .2byte 675 - .2byte 691 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 719 - .2byte 721 - .2byte 723 - .2byte 738 - .2byte 747 - .2byte 749 - .2byte 753 - .2byte 754 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 804 - .2byte 805 - .2byte 806 - .2byte 807 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Weston:: @ 85D39FE - .2byte 374 - .2byte 377 - .2byte 404 - .2byte 421 - .2byte 422 - .2byte 426 - .2byte 437 - .2byte 439 - .2byte 446 - .2byte 451 - .2byte 453 - .2byte 457 - .2byte 458 - .2byte 472 - .2byte 475 - .2byte 500 - .2byte 517 - .2byte 518 - .2byte 522 - .2byte 533 - .2byte 535 - .2byte 542 - .2byte 547 - .2byte 549 - .2byte 553 - .2byte 554 - .2byte 566 - .2byte 569 - .2byte 596 - .2byte 613 - .2byte 614 - .2byte 618 - .2byte 629 - .2byte 631 - .2byte 638 - .2byte 643 - .2byte 645 - .2byte 649 - .2byte 650 - .2byte 662 - .2byte 665 - .2byte 692 - .2byte 709 - .2byte 710 - .2byte 714 - .2byte 725 - .2byte 727 - .2byte 734 - .2byte 739 - .2byte 741 - .2byte 745 - .2byte 746 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 766 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 777 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 788 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 799 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Jasper:: @ 85D3AC8 - .2byte 378 - .2byte 388 - .2byte 400 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 416 - .2byte 429 - .2byte 432 - .2byte 438 - .2byte 447 - .2byte 452 - .2byte 456 - .2byte 460 - .2byte 462 - .2byte 463 - .2byte 471 - .2byte 476 - .2byte 496 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 512 - .2byte 525 - .2byte 528 - .2byte 534 - .2byte 543 - .2byte 548 - .2byte 552 - .2byte 556 - .2byte 558 - .2byte 559 - .2byte 570 - .2byte 580 - .2byte 592 - .2byte 601 - .2byte 602 - .2byte 603 - .2byte 608 - .2byte 621 - .2byte 624 - .2byte 630 - .2byte 639 - .2byte 644 - .2byte 648 - .2byte 652 - .2byte 654 - .2byte 655 - .2byte 666 - .2byte 676 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 704 - .2byte 717 - .2byte 720 - .2byte 726 - .2byte 735 - .2byte 740 - .2byte 744 - .2byte 748 - .2byte 750 - .2byte 751 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte 824 - .2byte 825 - .2byte 826 - .2byte 827 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Nadia:: @ 85D3B92 - .2byte 382 - .2byte 387 - .2byte 403 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 431 - .2byte 433 - .2byte 435 - .2byte 450 - .2byte 459 - .2byte 461 - .2byte 465 - .2byte 466 - .2byte 470 - .2byte 480 - .2byte 499 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 527 - .2byte 529 - .2byte 531 - .2byte 546 - .2byte 555 - .2byte 557 - .2byte 561 - .2byte 562 - .2byte 574 - .2byte 579 - .2byte 595 - .2byte 615 - .2byte 616 - .2byte 617 - .2byte 623 - .2byte 625 - .2byte 627 - .2byte 642 - .2byte 651 - .2byte 653 - .2byte 657 - .2byte 658 - .2byte 670 - .2byte 675 - .2byte 691 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 719 - .2byte 721 - .2byte 723 - .2byte 738 - .2byte 747 - .2byte 749 - .2byte 753 - .2byte 754 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 804 - .2byte 805 - .2byte 806 - .2byte 807 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte -1 - -gBattleFrontierTrainerMons_Miranda:: @ 85D3C5C - .2byte 374 - .2byte 377 - .2byte 404 - .2byte 421 - .2byte 422 - .2byte 426 - .2byte 437 - .2byte 439 - .2byte 446 - .2byte 451 - .2byte 453 - .2byte 457 - .2byte 458 - .2byte 472 - .2byte 475 - .2byte 500 - .2byte 517 - .2byte 518 - .2byte 522 - .2byte 533 - .2byte 535 - .2byte 542 - .2byte 547 - .2byte 549 - .2byte 553 - .2byte 554 - .2byte 566 - .2byte 569 - .2byte 596 - .2byte 613 - .2byte 614 - .2byte 618 - .2byte 629 - .2byte 631 - .2byte 638 - .2byte 643 - .2byte 645 - .2byte 649 - .2byte 650 - .2byte 662 - .2byte 665 - .2byte 692 - .2byte 709 - .2byte 710 - .2byte 714 - .2byte 725 - .2byte 727 - .2byte 734 - .2byte 739 - .2byte 741 - .2byte 745 - .2byte 746 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 765 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 776 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 787 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 798 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Emma:: @ 85D3D26 - .2byte 378 - .2byte 388 - .2byte 400 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 416 - .2byte 429 - .2byte 432 - .2byte 438 - .2byte 447 - .2byte 452 - .2byte 456 - .2byte 460 - .2byte 462 - .2byte 463 - .2byte 471 - .2byte 476 - .2byte 496 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 512 - .2byte 525 - .2byte 528 - .2byte 534 - .2byte 543 - .2byte 548 - .2byte 552 - .2byte 556 - .2byte 558 - .2byte 559 - .2byte 570 - .2byte 580 - .2byte 592 - .2byte 601 - .2byte 602 - .2byte 603 - .2byte 608 - .2byte 621 - .2byte 624 - .2byte 630 - .2byte 639 - .2byte 644 - .2byte 648 - .2byte 652 - .2byte 654 - .2byte 655 - .2byte 666 - .2byte 676 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 704 - .2byte 717 - .2byte 720 - .2byte 726 - .2byte 735 - .2byte 740 - .2byte 744 - .2byte 748 - .2byte 750 - .2byte 751 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte 824 - .2byte 825 - .2byte 826 - .2byte 827 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte -1 - -gBattleFrontierTrainerMons_Rolando:: @ 85D3DF0 - .2byte 185 - .2byte 290 - .2byte 377 - .2byte 380 - .2byte 385 - .2byte 401 - .2byte 404 - .2byte 409 - .2byte 410 - .2byte 428 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 446 - .2byte 466 - .2byte 475 - .2byte 478 - .2byte 484 - .2byte 497 - .2byte 500 - .2byte 505 - .2byte 506 - .2byte 524 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 542 - .2byte 562 - .2byte 569 - .2byte 572 - .2byte 577 - .2byte 593 - .2byte 596 - .2byte 601 - .2byte 602 - .2byte 620 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 638 - .2byte 658 - .2byte 665 - .2byte 668 - .2byte 673 - .2byte 689 - .2byte 692 - .2byte 697 - .2byte 698 - .2byte 716 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 734 - .2byte 754 - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 766 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 777 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 788 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 799 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 870 - .2byte 871 - .2byte 872 - .2byte 873 - .2byte 874 - .2byte 875 - .2byte -1 - -gBattleFrontierTrainerMons_Stanly:: @ 85D3EAA - .2byte 185 - .2byte 290 - .2byte 377 - .2byte 380 - .2byte 385 - .2byte 401 - .2byte 404 - .2byte 409 - .2byte 410 - .2byte 428 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 446 - .2byte 466 - .2byte 475 - .2byte 478 - .2byte 484 - .2byte 497 - .2byte 500 - .2byte 505 - .2byte 506 - .2byte 524 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 542 - .2byte 562 - .2byte 569 - .2byte 572 - .2byte 577 - .2byte 593 - .2byte 596 - .2byte 601 - .2byte 602 - .2byte 620 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 638 - .2byte 658 - .2byte 665 - .2byte 668 - .2byte 673 - .2byte 689 - .2byte 692 - .2byte 697 - .2byte 698 - .2byte 716 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 734 - .2byte 754 - .2byte 759 - .2byte 760 - .2byte 761 - .2byte 766 - .2byte 770 - .2byte 771 - .2byte 772 - .2byte 777 - .2byte 781 - .2byte 782 - .2byte 783 - .2byte 788 - .2byte 792 - .2byte 793 - .2byte 794 - .2byte 799 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 876 - .2byte 877 - .2byte 878 - .2byte 879 - .2byte 880 - .2byte 881 - .2byte -1 - -gBattleFrontierTrainerMons_Dario:: @ 85D3F64 - .2byte 185 - .2byte 290 - .2byte 377 - .2byte 380 - .2byte 385 - .2byte 401 - .2byte 404 - .2byte 409 - .2byte 410 - .2byte 428 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 446 - .2byte 466 - .2byte 475 - .2byte 478 - .2byte 484 - .2byte 497 - .2byte 500 - .2byte 505 - .2byte 506 - .2byte 524 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 542 - .2byte 562 - .2byte 569 - .2byte 572 - .2byte 577 - .2byte 593 - .2byte 596 - .2byte 601 - .2byte 602 - .2byte 620 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 638 - .2byte 658 - .2byte 665 - .2byte 668 - .2byte 673 - .2byte 689 - .2byte 692 - .2byte 697 - .2byte 698 - .2byte 716 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 734 - .2byte 754 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 766 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 777 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 788 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 799 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte -1 - -gBattleFrontierTrainerMons_Karlee:: @ 85D401E - .2byte 185 - .2byte 290 - .2byte 377 - .2byte 380 - .2byte 385 - .2byte 401 - .2byte 404 - .2byte 409 - .2byte 410 - .2byte 428 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 446 - .2byte 466 - .2byte 475 - .2byte 478 - .2byte 484 - .2byte 497 - .2byte 500 - .2byte 505 - .2byte 506 - .2byte 524 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 542 - .2byte 562 - .2byte 569 - .2byte 572 - .2byte 577 - .2byte 593 - .2byte 596 - .2byte 601 - .2byte 602 - .2byte 620 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 638 - .2byte 658 - .2byte 665 - .2byte 668 - .2byte 673 - .2byte 689 - .2byte 692 - .2byte 697 - .2byte 698 - .2byte 716 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 734 - .2byte 754 - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 765 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 776 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 787 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 798 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 870 - .2byte 871 - .2byte 872 - .2byte 873 - .2byte 874 - .2byte 875 - .2byte -1 - -gBattleFrontierTrainerMons_Jaylin:: @ 85D40D8 - .2byte 185 - .2byte 290 - .2byte 377 - .2byte 380 - .2byte 385 - .2byte 401 - .2byte 404 - .2byte 409 - .2byte 410 - .2byte 428 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 446 - .2byte 466 - .2byte 475 - .2byte 478 - .2byte 484 - .2byte 497 - .2byte 500 - .2byte 505 - .2byte 506 - .2byte 524 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 542 - .2byte 562 - .2byte 569 - .2byte 572 - .2byte 577 - .2byte 593 - .2byte 596 - .2byte 601 - .2byte 602 - .2byte 620 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 638 - .2byte 658 - .2byte 665 - .2byte 668 - .2byte 673 - .2byte 689 - .2byte 692 - .2byte 697 - .2byte 698 - .2byte 716 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 734 - .2byte 754 - .2byte 759 - .2byte 760 - .2byte 761 - .2byte 765 - .2byte 770 - .2byte 771 - .2byte 772 - .2byte 776 - .2byte 781 - .2byte 782 - .2byte 783 - .2byte 787 - .2byte 792 - .2byte 793 - .2byte 794 - .2byte 798 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 876 - .2byte 877 - .2byte 878 - .2byte 879 - .2byte 880 - .2byte 881 - .2byte -1 - -gBattleFrontierTrainerMons_Ingrid:: @ 85D4192 - .2byte 185 - .2byte 290 - .2byte 377 - .2byte 380 - .2byte 385 - .2byte 401 - .2byte 404 - .2byte 409 - .2byte 410 - .2byte 428 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 446 - .2byte 466 - .2byte 475 - .2byte 478 - .2byte 484 - .2byte 497 - .2byte 500 - .2byte 505 - .2byte 506 - .2byte 524 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 542 - .2byte 562 - .2byte 569 - .2byte 572 - .2byte 577 - .2byte 593 - .2byte 596 - .2byte 601 - .2byte 602 - .2byte 620 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 638 - .2byte 658 - .2byte 665 - .2byte 668 - .2byte 673 - .2byte 689 - .2byte 692 - .2byte 697 - .2byte 698 - .2byte 716 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 734 - .2byte 754 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 765 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 776 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 787 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 798 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte -1 - -gBattleFrontierTrainerMons_Delilah:: @ 85D424C - .2byte 347 - .2byte 352 - .2byte 374 - .2byte 378 - .2byte 398 - .2byte 421 - .2byte 426 - .2byte 447 - .2byte 472 - .2byte 476 - .2byte 494 - .2byte 517 - .2byte 522 - .2byte 543 - .2byte 566 - .2byte 570 - .2byte 590 - .2byte 613 - .2byte 618 - .2byte 639 - .2byte 662 - .2byte 666 - .2byte 686 - .2byte 709 - .2byte 714 - .2byte 735 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte -1 - -gBattleFrontierTrainerMons_Carly:: @ 85D428A - .2byte 344 - .2byte 374 - .2byte 378 - .2byte 394 - .2byte 395 - .2byte 405 - .2byte 413 - .2byte 414 - .2byte 420 - .2byte 421 - .2byte 434 - .2byte 441 - .2byte 457 - .2byte 472 - .2byte 476 - .2byte 490 - .2byte 491 - .2byte 501 - .2byte 509 - .2byte 510 - .2byte 516 - .2byte 517 - .2byte 530 - .2byte 537 - .2byte 553 - .2byte 566 - .2byte 570 - .2byte 586 - .2byte 587 - .2byte 597 - .2byte 605 - .2byte 606 - .2byte 612 - .2byte 613 - .2byte 626 - .2byte 633 - .2byte 649 - .2byte 662 - .2byte 666 - .2byte 682 - .2byte 683 - .2byte 693 - .2byte 701 - .2byte 702 - .2byte 708 - .2byte 709 - .2byte 722 - .2byte 729 - .2byte 745 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte -1 - -gBattleFrontierTrainerMons_Lexie:: @ 85D42F6 - .2byte 344 - .2byte 347 - .2byte 352 - .2byte 394 - .2byte 395 - .2byte 398 - .2byte 405 - .2byte 413 - .2byte 414 - .2byte 420 - .2byte 421 - .2byte 426 - .2byte 434 - .2byte 441 - .2byte 447 - .2byte 457 - .2byte 490 - .2byte 491 - .2byte 494 - .2byte 501 - .2byte 509 - .2byte 510 - .2byte 516 - .2byte 517 - .2byte 522 - .2byte 530 - .2byte 537 - .2byte 543 - .2byte 553 - .2byte 586 - .2byte 587 - .2byte 590 - .2byte 597 - .2byte 605 - .2byte 606 - .2byte 612 - .2byte 613 - .2byte 618 - .2byte 626 - .2byte 633 - .2byte 639 - .2byte 649 - .2byte 682 - .2byte 683 - .2byte 686 - .2byte 693 - .2byte 701 - .2byte 702 - .2byte 708 - .2byte 709 - .2byte 714 - .2byte 722 - .2byte 729 - .2byte 735 - .2byte 745 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte -1 - -gBattleFrontierTrainerMons_Miller:: @ 85D436E - .2byte 345 - .2byte 376 - .2byte 386 - .2byte 387 - .2byte 397 - .2byte 399 - .2byte 402 - .2byte 403 - .2byte 406 - .2byte 408 - .2byte 411 - .2byte 413 - .2byte 414 - .2byte 425 - .2byte 427 - .2byte 429 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 441 - .2byte 445 - .2byte 448 - .2byte 449 - .2byte 450 - .2byte 452 - .2byte 454 - .2byte 456 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 462 - .2byte 465 - .2byte 466 - .2byte 467 - .2byte 470 - .2byte 474 - .2byte 482 - .2byte 493 - .2byte 495 - .2byte 498 - .2byte 499 - .2byte 502 - .2byte 504 - .2byte 507 - .2byte 509 - .2byte 510 - .2byte 521 - .2byte 523 - .2byte 525 - .2byte 529 - .2byte 531 - .2byte 536 - .2byte 537 - .2byte 541 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 548 - .2byte 550 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 558 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Marv:: @ 85D441E - .2byte 345 - .2byte 568 - .2byte 578 - .2byte 579 - .2byte 589 - .2byte 591 - .2byte 594 - .2byte 595 - .2byte 598 - .2byte 600 - .2byte 603 - .2byte 605 - .2byte 606 - .2byte 617 - .2byte 619 - .2byte 621 - .2byte 625 - .2byte 627 - .2byte 632 - .2byte 633 - .2byte 637 - .2byte 640 - .2byte 641 - .2byte 642 - .2byte 644 - .2byte 646 - .2byte 648 - .2byte 650 - .2byte 651 - .2byte 652 - .2byte 654 - .2byte 657 - .2byte 658 - .2byte 659 - .2byte 664 - .2byte 674 - .2byte 675 - .2byte 685 - .2byte 687 - .2byte 690 - .2byte 691 - .2byte 694 - .2byte 696 - .2byte 699 - .2byte 701 - .2byte 702 - .2byte 713 - .2byte 715 - .2byte 717 - .2byte 721 - .2byte 723 - .2byte 728 - .2byte 729 - .2byte 733 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 740 - .2byte 742 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 750 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Layton:: @ 85D44CE - .2byte 345 - .2byte 425 - .2byte 433 - .2byte 435 - .2byte 445 - .2byte 450 - .2byte 454 - .2byte 456 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 465 - .2byte 466 - .2byte 521 - .2byte 529 - .2byte 531 - .2byte 541 - .2byte 546 - .2byte 550 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 561 - .2byte 562 - .2byte 617 - .2byte 625 - .2byte 627 - .2byte 637 - .2byte 642 - .2byte 646 - .2byte 648 - .2byte 650 - .2byte 651 - .2byte 652 - .2byte 657 - .2byte 658 - .2byte 713 - .2byte 721 - .2byte 723 - .2byte 733 - .2byte 738 - .2byte 742 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 753 - .2byte 754 - .2byte 804 - .2byte 805 - .2byte 806 - .2byte 807 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte 824 - .2byte 825 - .2byte 826 - .2byte 827 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Brooks:: @ 85D4582 - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Gregory:: @ 85D4644 - .2byte 421 - .2byte 425 - .2byte 431 - .2byte 437 - .2byte 439 - .2byte 456 - .2byte 460 - .2byte 465 - .2byte 466 - .2byte 517 - .2byte 521 - .2byte 527 - .2byte 533 - .2byte 535 - .2byte 552 - .2byte 556 - .2byte 561 - .2byte 562 - .2byte 613 - .2byte 617 - .2byte 623 - .2byte 629 - .2byte 631 - .2byte 648 - .2byte 652 - .2byte 657 - .2byte 658 - .2byte 709 - .2byte 713 - .2byte 719 - .2byte 725 - .2byte 727 - .2byte 744 - .2byte 748 - .2byte 753 - .2byte 754 - .2byte 765 - .2byte 766 - .2byte 776 - .2byte 777 - .2byte 787 - .2byte 788 - .2byte 798 - .2byte 799 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte 804 - .2byte 805 - .2byte 806 - .2byte 807 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte 824 - .2byte 825 - .2byte 826 - .2byte 827 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Reese:: @ 85D470E - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 759 - .2byte 760 - .2byte 761 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 765 - .2byte 766 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 770 - .2byte 771 - .2byte 772 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 776 - .2byte 777 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 781 - .2byte 782 - .2byte 783 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 787 - .2byte 788 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 792 - .2byte 793 - .2byte 794 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 798 - .2byte 799 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte 842 - .2byte 843 - .2byte 844 - .2byte 845 - .2byte 846 - .2byte 847 - .2byte 848 - .2byte 849 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte 870 - .2byte 871 - .2byte 872 - .2byte 873 - .2byte 874 - .2byte 875 - .2byte 876 - .2byte 877 - .2byte 878 - .2byte 879 - .2byte 880 - .2byte 881 - .2byte -1 - -gBattleFrontierTrainerMons_Mason:: @ 85D47C4 - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Toby:: @ 85D4886 - .2byte 564 - .2byte 565 - .2byte 566 - .2byte 567 - .2byte 568 - .2byte 569 - .2byte 570 - .2byte 571 - .2byte 572 - .2byte 573 - .2byte 574 - .2byte 575 - .2byte 576 - .2byte 577 - .2byte 578 - .2byte 579 - .2byte 580 - .2byte 581 - .2byte 582 - .2byte 583 - .2byte 584 - .2byte 585 - .2byte 586 - .2byte 587 - .2byte 588 - .2byte 589 - .2byte 590 - .2byte 591 - .2byte 592 - .2byte 593 - .2byte 594 - .2byte 595 - .2byte 596 - .2byte 597 - .2byte 598 - .2byte 599 - .2byte 600 - .2byte 601 - .2byte 602 - .2byte 603 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 607 - .2byte 608 - .2byte 609 - .2byte 610 - .2byte 611 - .2byte 612 - .2byte 613 - .2byte 614 - .2byte 615 - .2byte 616 - .2byte 617 - .2byte 618 - .2byte 619 - .2byte 620 - .2byte 621 - .2byte 622 - .2byte 623 - .2byte 624 - .2byte 625 - .2byte 626 - .2byte 627 - .2byte 628 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 632 - .2byte 633 - .2byte 634 - .2byte 635 - .2byte 636 - .2byte 637 - .2byte 638 - .2byte 639 - .2byte 640 - .2byte 641 - .2byte 642 - .2byte 643 - .2byte 644 - .2byte 645 - .2byte 646 - .2byte 647 - .2byte 648 - .2byte 649 - .2byte 650 - .2byte 651 - .2byte 652 - .2byte 653 - .2byte 654 - .2byte 655 - .2byte 656 - .2byte 657 - .2byte 658 - .2byte 659 - .2byte -1 - -gBattleFrontierTrainerMons_Dorothy:: @ 85D4948 - .2byte 468 - .2byte 469 - .2byte 470 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 474 - .2byte 475 - .2byte 476 - .2byte 477 - .2byte 478 - .2byte 479 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 483 - .2byte 484 - .2byte 485 - .2byte 486 - .2byte 487 - .2byte 488 - .2byte 489 - .2byte 490 - .2byte 491 - .2byte 492 - .2byte 493 - .2byte 494 - .2byte 495 - .2byte 496 - .2byte 497 - .2byte 498 - .2byte 499 - .2byte 500 - .2byte 501 - .2byte 502 - .2byte 503 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 511 - .2byte 512 - .2byte 513 - .2byte 514 - .2byte 515 - .2byte 516 - .2byte 517 - .2byte 518 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 522 - .2byte 523 - .2byte 524 - .2byte 525 - .2byte 526 - .2byte 527 - .2byte 528 - .2byte 529 - .2byte 530 - .2byte 531 - .2byte 532 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 536 - .2byte 537 - .2byte 538 - .2byte 539 - .2byte 540 - .2byte 541 - .2byte 542 - .2byte 543 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 547 - .2byte 548 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 552 - .2byte 553 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 560 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Piper:: @ 85D4A0A - .2byte 372 - .2byte 373 - .2byte 374 - .2byte 375 - .2byte 376 - .2byte 377 - .2byte 378 - .2byte 379 - .2byte 380 - .2byte 381 - .2byte 382 - .2byte 383 - .2byte 384 - .2byte 385 - .2byte 386 - .2byte 387 - .2byte 388 - .2byte 389 - .2byte 390 - .2byte 391 - .2byte 392 - .2byte 393 - .2byte 394 - .2byte 395 - .2byte 396 - .2byte 397 - .2byte 398 - .2byte 399 - .2byte 400 - .2byte 401 - .2byte 402 - .2byte 403 - .2byte 404 - .2byte 405 - .2byte 406 - .2byte 407 - .2byte 408 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 415 - .2byte 416 - .2byte 417 - .2byte 418 - .2byte 419 - .2byte 420 - .2byte 421 - .2byte 422 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 426 - .2byte 427 - .2byte 428 - .2byte 429 - .2byte 430 - .2byte 431 - .2byte 432 - .2byte 433 - .2byte 434 - .2byte 435 - .2byte 436 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 440 - .2byte 441 - .2byte 442 - .2byte 443 - .2byte 444 - .2byte 445 - .2byte 446 - .2byte 447 - .2byte 448 - .2byte 449 - .2byte 450 - .2byte 451 - .2byte 452 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 456 - .2byte 457 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 461 - .2byte 462 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte 466 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Finn:: @ 85D4ACC - .2byte 317 - .2byte 371 - .2byte 373 - .2byte 377 - .2byte 390 - .2byte 392 - .2byte 399 - .2byte 431 - .2byte 452 - .2byte 456 - .2byte 469 - .2byte 475 - .2byte 486 - .2byte 488 - .2byte 495 - .2byte 527 - .2byte 548 - .2byte 552 - .2byte 565 - .2byte 569 - .2byte 573 - .2byte 576 - .2byte 580 - .2byte 582 - .2byte 584 - .2byte 591 - .2byte 592 - .2byte 601 - .2byte 602 - .2byte 610 - .2byte 621 - .2byte 623 - .2byte 626 - .2byte 631 - .2byte 634 - .2byte 640 - .2byte 641 - .2byte 644 - .2byte 648 - .2byte 650 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte 661 - .2byte 665 - .2byte 669 - .2byte 672 - .2byte 676 - .2byte 678 - .2byte 680 - .2byte 687 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 706 - .2byte 717 - .2byte 719 - .2byte 722 - .2byte 727 - .2byte 730 - .2byte 736 - .2byte 737 - .2byte 740 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 749 - .2byte 751 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte -1 - -gBattleFrontierTrainerMons_Samir:: @ 85D4B6E - .2byte 317 - .2byte 371 - .2byte 373 - .2byte 377 - .2byte 390 - .2byte 392 - .2byte 399 - .2byte 431 - .2byte 452 - .2byte 456 - .2byte 469 - .2byte 475 - .2byte 486 - .2byte 488 - .2byte 495 - .2byte 527 - .2byte 548 - .2byte 552 - .2byte 565 - .2byte 569 - .2byte 573 - .2byte 576 - .2byte 580 - .2byte 582 - .2byte 584 - .2byte 591 - .2byte 592 - .2byte 601 - .2byte 602 - .2byte 610 - .2byte 621 - .2byte 623 - .2byte 626 - .2byte 631 - .2byte 634 - .2byte 640 - .2byte 641 - .2byte 644 - .2byte 648 - .2byte 650 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte 661 - .2byte 665 - .2byte 669 - .2byte 672 - .2byte 676 - .2byte 678 - .2byte 680 - .2byte 687 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 706 - .2byte 717 - .2byte 719 - .2byte 722 - .2byte 727 - .2byte 730 - .2byte 736 - .2byte 737 - .2byte 740 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 749 - .2byte 751 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte -1 - -gBattleFrontierTrainerMons_Fiona:: @ 85D4C10 - .2byte 317 - .2byte 371 - .2byte 373 - .2byte 377 - .2byte 381 - .2byte 384 - .2byte 388 - .2byte 390 - .2byte 392 - .2byte 399 - .2byte 400 - .2byte 409 - .2byte 410 - .2byte 418 - .2byte 429 - .2byte 431 - .2byte 434 - .2byte 439 - .2byte 442 - .2byte 448 - .2byte 449 - .2byte 452 - .2byte 456 - .2byte 458 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 469 - .2byte 471 - .2byte 475 - .2byte 479 - .2byte 483 - .2byte 486 - .2byte 488 - .2byte 495 - .2byte 496 - .2byte 505 - .2byte 506 - .2byte 514 - .2byte 525 - .2byte 527 - .2byte 530 - .2byte 535 - .2byte 538 - .2byte 544 - .2byte 545 - .2byte 548 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 557 - .2byte 559 - .2byte 565 - .2byte 569 - .2byte 582 - .2byte 584 - .2byte 591 - .2byte 623 - .2byte 644 - .2byte 648 - .2byte 661 - .2byte 665 - .2byte 678 - .2byte 680 - .2byte 687 - .2byte 719 - .2byte 740 - .2byte 744 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte -1 - -gBattleFrontierTrainerMons_Gloria:: @ 85D4CB2 - .2byte 317 - .2byte 371 - .2byte 373 - .2byte 377 - .2byte 381 - .2byte 384 - .2byte 388 - .2byte 390 - .2byte 392 - .2byte 399 - .2byte 400 - .2byte 409 - .2byte 410 - .2byte 418 - .2byte 429 - .2byte 431 - .2byte 434 - .2byte 439 - .2byte 442 - .2byte 448 - .2byte 449 - .2byte 452 - .2byte 456 - .2byte 458 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 469 - .2byte 471 - .2byte 475 - .2byte 479 - .2byte 483 - .2byte 486 - .2byte 488 - .2byte 495 - .2byte 496 - .2byte 505 - .2byte 506 - .2byte 514 - .2byte 525 - .2byte 527 - .2byte 530 - .2byte 535 - .2byte 538 - .2byte 544 - .2byte 545 - .2byte 548 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 557 - .2byte 559 - .2byte 565 - .2byte 569 - .2byte 582 - .2byte 584 - .2byte 591 - .2byte 623 - .2byte 644 - .2byte 648 - .2byte 661 - .2byte 665 - .2byte 678 - .2byte 680 - .2byte 687 - .2byte 719 - .2byte 740 - .2byte 744 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte -1 - -gBattleFrontierTrainerMons_Nico:: @ 85D4D54 - .2byte 660 - .2byte 661 - .2byte 662 - .2byte 663 - .2byte 664 - .2byte 665 - .2byte 666 - .2byte 667 - .2byte 668 - .2byte 669 - .2byte 670 - .2byte 671 - .2byte 672 - .2byte 673 - .2byte 674 - .2byte 675 - .2byte 676 - .2byte 677 - .2byte 678 - .2byte 679 - .2byte 680 - .2byte 681 - .2byte 682 - .2byte 683 - .2byte 684 - .2byte 685 - .2byte 686 - .2byte 687 - .2byte 688 - .2byte 689 - .2byte 690 - .2byte 691 - .2byte 692 - .2byte 693 - .2byte 694 - .2byte 695 - .2byte 696 - .2byte 697 - .2byte 698 - .2byte 699 - .2byte 700 - .2byte 701 - .2byte 702 - .2byte 703 - .2byte 704 - .2byte 705 - .2byte 706 - .2byte 707 - .2byte 708 - .2byte 709 - .2byte 710 - .2byte 711 - .2byte 712 - .2byte 713 - .2byte 714 - .2byte 715 - .2byte 716 - .2byte 717 - .2byte 718 - .2byte 719 - .2byte 720 - .2byte 721 - .2byte 722 - .2byte 723 - .2byte 724 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 728 - .2byte 729 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 733 - .2byte 734 - .2byte 735 - .2byte 736 - .2byte 737 - .2byte 738 - .2byte 739 - .2byte 740 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 744 - .2byte 745 - .2byte 746 - .2byte 747 - .2byte 748 - .2byte 749 - .2byte 750 - .2byte 751 - .2byte 752 - .2byte 753 - .2byte 754 - .2byte 755 - .2byte -1 - -gBattleFrontierTrainerMons_Jeremy:: @ 85D4E16 - .2byte 564 - .2byte 565 - .2byte 566 - .2byte 567 - .2byte 568 - .2byte 569 - .2byte 570 - .2byte 571 - .2byte 572 - .2byte 573 - .2byte 574 - .2byte 575 - .2byte 576 - .2byte 577 - .2byte 578 - .2byte 579 - .2byte 580 - .2byte 581 - .2byte 582 - .2byte 583 - .2byte 584 - .2byte 585 - .2byte 586 - .2byte 587 - .2byte 588 - .2byte 589 - .2byte 590 - .2byte 591 - .2byte 592 - .2byte 593 - .2byte 594 - .2byte 595 - .2byte 596 - .2byte 597 - .2byte 598 - .2byte 599 - .2byte 600 - .2byte 601 - .2byte 602 - .2byte 603 - .2byte 604 - .2byte 605 - .2byte 606 - .2byte 607 - .2byte 608 - .2byte 609 - .2byte 610 - .2byte 611 - .2byte 612 - .2byte 613 - .2byte 614 - .2byte 615 - .2byte 616 - .2byte 617 - .2byte 618 - .2byte 619 - .2byte 620 - .2byte 621 - .2byte 622 - .2byte 623 - .2byte 624 - .2byte 625 - .2byte 626 - .2byte 627 - .2byte 628 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 632 - .2byte 633 - .2byte 634 - .2byte 635 - .2byte 636 - .2byte 637 - .2byte 638 - .2byte 639 - .2byte 640 - .2byte 641 - .2byte 642 - .2byte 643 - .2byte 644 - .2byte 645 - .2byte 646 - .2byte 647 - .2byte 648 - .2byte 649 - .2byte 650 - .2byte 651 - .2byte 652 - .2byte 653 - .2byte 654 - .2byte 655 - .2byte 656 - .2byte 657 - .2byte 658 - .2byte 659 - .2byte -1 - -gBattleFrontierTrainerMons_Caitlin:: @ 85D4ED8 - .2byte 468 - .2byte 469 - .2byte 470 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 474 - .2byte 475 - .2byte 476 - .2byte 477 - .2byte 478 - .2byte 479 - .2byte 480 - .2byte 481 - .2byte 482 - .2byte 483 - .2byte 484 - .2byte 485 - .2byte 486 - .2byte 487 - .2byte 488 - .2byte 489 - .2byte 490 - .2byte 491 - .2byte 492 - .2byte 493 - .2byte 494 - .2byte 495 - .2byte 496 - .2byte 497 - .2byte 498 - .2byte 499 - .2byte 500 - .2byte 501 - .2byte 502 - .2byte 503 - .2byte 504 - .2byte 505 - .2byte 506 - .2byte 507 - .2byte 508 - .2byte 509 - .2byte 510 - .2byte 511 - .2byte 512 - .2byte 513 - .2byte 514 - .2byte 515 - .2byte 516 - .2byte 517 - .2byte 518 - .2byte 519 - .2byte 520 - .2byte 521 - .2byte 522 - .2byte 523 - .2byte 524 - .2byte 525 - .2byte 526 - .2byte 527 - .2byte 528 - .2byte 529 - .2byte 530 - .2byte 531 - .2byte 532 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 536 - .2byte 537 - .2byte 538 - .2byte 539 - .2byte 540 - .2byte 541 - .2byte 542 - .2byte 543 - .2byte 544 - .2byte 545 - .2byte 546 - .2byte 547 - .2byte 548 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 552 - .2byte 553 - .2byte 554 - .2byte 555 - .2byte 556 - .2byte 557 - .2byte 558 - .2byte 559 - .2byte 560 - .2byte 561 - .2byte 562 - .2byte 563 - .2byte -1 - -gBattleFrontierTrainerMons_Reena:: @ 85D4F9A - .2byte 372 - .2byte 373 - .2byte 374 - .2byte 375 - .2byte 376 - .2byte 377 - .2byte 378 - .2byte 379 - .2byte 380 - .2byte 381 - .2byte 382 - .2byte 383 - .2byte 384 - .2byte 385 - .2byte 386 - .2byte 387 - .2byte 388 - .2byte 389 - .2byte 390 - .2byte 391 - .2byte 392 - .2byte 393 - .2byte 394 - .2byte 395 - .2byte 396 - .2byte 397 - .2byte 398 - .2byte 399 - .2byte 400 - .2byte 401 - .2byte 402 - .2byte 403 - .2byte 404 - .2byte 405 - .2byte 406 - .2byte 407 - .2byte 408 - .2byte 409 - .2byte 410 - .2byte 411 - .2byte 412 - .2byte 413 - .2byte 414 - .2byte 415 - .2byte 416 - .2byte 417 - .2byte 418 - .2byte 419 - .2byte 420 - .2byte 421 - .2byte 422 - .2byte 423 - .2byte 424 - .2byte 425 - .2byte 426 - .2byte 427 - .2byte 428 - .2byte 429 - .2byte 430 - .2byte 431 - .2byte 432 - .2byte 433 - .2byte 434 - .2byte 435 - .2byte 436 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 440 - .2byte 441 - .2byte 442 - .2byte 443 - .2byte 444 - .2byte 445 - .2byte 446 - .2byte 447 - .2byte 448 - .2byte 449 - .2byte 450 - .2byte 451 - .2byte 452 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 456 - .2byte 457 - .2byte 458 - .2byte 459 - .2byte 460 - .2byte 461 - .2byte 462 - .2byte 463 - .2byte 464 - .2byte 465 - .2byte 466 - .2byte 467 - .2byte -1 - -gBattleFrontierTrainerMons_Avery:: @ 85D505C - .2byte 21 - .2byte 238 - .2byte 282 - .2byte 303 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 383 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 432 - .2byte 481 - .2byte 513 - .2byte 519 - .2byte 520 - .2byte 528 - .2byte 575 - .2byte 609 - .2byte 615 - .2byte 616 - .2byte 624 - .2byte 671 - .2byte 705 - .2byte 711 - .2byte 712 - .2byte 720 - .2byte -1 - -gBattleFrontierTrainerMons_Liam:: @ 85D5096 - .2byte 21 - .2byte 238 - .2byte 282 - .2byte 303 - .2byte 331 - .2byte 343 - .2byte 368 - .2byte 369 - .2byte 383 - .2byte 417 - .2byte 423 - .2byte 424 - .2byte 432 - .2byte 481 - .2byte 513 - .2byte 519 - .2byte 520 - .2byte 528 - .2byte 575 - .2byte 609 - .2byte 615 - .2byte 616 - .2byte 624 - .2byte 671 - .2byte 705 - .2byte 711 - .2byte 712 - .2byte 720 - .2byte -1 - -gBattleFrontierTrainerMons_Theo:: @ 85D50D0 - .2byte 333 - .2byte 347 - .2byte 350 - .2byte 354 - .2byte 358 - .2byte 361 - .2byte 362 - .2byte 363 - .2byte 364 - .2byte 371 - .2byte 381 - .2byte 384 - .2byte 429 - .2byte 434 - .2byte 439 - .2byte 479 - .2byte 483 - .2byte 525 - .2byte 530 - .2byte 535 - .2byte 573 - .2byte 576 - .2byte 621 - .2byte 626 - .2byte 631 - .2byte 669 - .2byte 672 - .2byte 717 - .2byte 722 - .2byte 727 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte -1 - -gBattleFrontierTrainerMons_Bailey:: @ 85D5116 - .2byte 333 - .2byte 347 - .2byte 350 - .2byte 354 - .2byte 358 - .2byte 361 - .2byte 362 - .2byte 363 - .2byte 364 - .2byte 371 - .2byte 381 - .2byte 384 - .2byte 429 - .2byte 434 - .2byte 439 - .2byte 479 - .2byte 483 - .2byte 525 - .2byte 530 - .2byte 535 - .2byte 573 - .2byte 576 - .2byte 621 - .2byte 626 - .2byte 631 - .2byte 669 - .2byte 672 - .2byte 717 - .2byte 722 - .2byte 727 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte -1 - -gBattleFrontierTrainerMons_Hugo:: @ 85D515C - .2byte 383 - .2byte 386 - .2byte 402 - .2byte 403 - .2byte 416 - .2byte 417 - .2byte 423 - .2byte 432 - .2byte 433 - .2byte 435 - .2byte 450 - .2byte 466 - .2byte 481 - .2byte 482 - .2byte 498 - .2byte 499 - .2byte 512 - .2byte 513 - .2byte 519 - .2byte 528 - .2byte 529 - .2byte 531 - .2byte 546 - .2byte 562 - .2byte 575 - .2byte 578 - .2byte 594 - .2byte 595 - .2byte 608 - .2byte 609 - .2byte 615 - .2byte 624 - .2byte 625 - .2byte 627 - .2byte 642 - .2byte 658 - .2byte 671 - .2byte 674 - .2byte 690 - .2byte 691 - .2byte 704 - .2byte 705 - .2byte 711 - .2byte 720 - .2byte 721 - .2byte 723 - .2byte 738 - .2byte 754 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte -1 - -gBattleFrontierTrainerMons_Bryce:: @ 85D51EA - .2byte 383 - .2byte 386 - .2byte 402 - .2byte 403 - .2byte 416 - .2byte 417 - .2byte 423 - .2byte 432 - .2byte 433 - .2byte 435 - .2byte 450 - .2byte 466 - .2byte 481 - .2byte 482 - .2byte 498 - .2byte 499 - .2byte 512 - .2byte 513 - .2byte 519 - .2byte 528 - .2byte 529 - .2byte 531 - .2byte 546 - .2byte 562 - .2byte 575 - .2byte 578 - .2byte 594 - .2byte 595 - .2byte 608 - .2byte 609 - .2byte 615 - .2byte 624 - .2byte 625 - .2byte 627 - .2byte 642 - .2byte 658 - .2byte 671 - .2byte 674 - .2byte 690 - .2byte 691 - .2byte 704 - .2byte 705 - .2byte 711 - .2byte 720 - .2byte 721 - .2byte 723 - .2byte 738 - .2byte 754 - .2byte 762 - .2byte 763 - .2byte 764 - .2byte 773 - .2byte 774 - .2byte 775 - .2byte 784 - .2byte 785 - .2byte 786 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 836 - .2byte 837 - .2byte 838 - .2byte 839 - .2byte 840 - .2byte 841 - .2byte -1 - -gBattleFrontierTrainerMons_Gideon:: @ 85D5278 - .2byte 441 - .2byte 445 - .2byte 448 - .2byte 449 - .2byte 451 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 458 - .2byte 537 - .2byte 541 - .2byte 544 - .2byte 545 - .2byte 547 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 554 - .2byte 633 - .2byte 637 - .2byte 640 - .2byte 641 - .2byte 643 - .2byte 645 - .2byte 646 - .2byte 647 - .2byte 650 - .2byte 729 - .2byte 733 - .2byte 736 - .2byte 737 - .2byte 739 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 746 - .2byte -1 - -gBattleFrontierTrainerMons_Triston:: @ 85D52C2 - .2byte 441 - .2byte 445 - .2byte 448 - .2byte 449 - .2byte 451 - .2byte 453 - .2byte 454 - .2byte 455 - .2byte 458 - .2byte 537 - .2byte 541 - .2byte 544 - .2byte 545 - .2byte 547 - .2byte 549 - .2byte 550 - .2byte 551 - .2byte 554 - .2byte 633 - .2byte 637 - .2byte 640 - .2byte 641 - .2byte 643 - .2byte 645 - .2byte 646 - .2byte 647 - .2byte 650 - .2byte 729 - .2byte 733 - .2byte 736 - .2byte 737 - .2byte 739 - .2byte 741 - .2byte 742 - .2byte 743 - .2byte 746 - .2byte -1 - -gBattleFrontierTrainerMons_Charles:: @ 85D530C - .2byte 352 - .2byte 381 - .2byte 391 - .2byte 393 - .2byte 396 - .2byte 398 - .2byte 407 - .2byte 422 - .2byte 426 - .2byte 443 - .2byte 447 - .2byte 479 - .2byte 487 - .2byte 489 - .2byte 492 - .2byte 494 - .2byte 503 - .2byte 518 - .2byte 522 - .2byte 539 - .2byte 543 - .2byte 573 - .2byte 583 - .2byte 585 - .2byte 588 - .2byte 590 - .2byte 599 - .2byte 614 - .2byte 618 - .2byte 635 - .2byte 639 - .2byte 669 - .2byte 679 - .2byte 681 - .2byte 684 - .2byte 686 - .2byte 695 - .2byte 710 - .2byte 714 - .2byte 731 - .2byte 735 - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 870 - .2byte 871 - .2byte 872 - .2byte 873 - .2byte 874 - .2byte 875 - .2byte -1 - -gBattleFrontierTrainerMons_Raymond:: @ 85D5384 - .2byte 374 - .2byte 376 - .2byte 381 - .2byte 404 - .2byte 407 - .2byte 422 - .2byte 439 - .2byte 443 - .2byte 459 - .2byte 472 - .2byte 500 - .2byte 506 - .2byte 507 - .2byte 518 - .2byte 532 - .2byte 546 - .2byte 566 - .2byte 585 - .2byte 588 - .2byte 628 - .2byte 635 - .2byte 679 - .2byte 681 - .2byte 684 - .2byte 710 - .2byte 731 - .2byte 785 - .2byte 795 - .2byte 796 - .2byte 797 - .2byte 817 - .2byte 842 - .2byte 843 - .2byte 846 - .2byte 847 - .2byte -1 - -gBattleFrontierTrainerMons_Dirk:: @ 85D53CC - .2byte 355 - .2byte 375 - .2byte 379 - .2byte 385 - .2byte 386 - .2byte 412 - .2byte 435 - .2byte 440 - .2byte 454 - .2byte 457 - .2byte 459 - .2byte 465 - .2byte 473 - .2byte 477 - .2byte 482 - .2byte 484 - .2byte 508 - .2byte 531 - .2byte 536 - .2byte 550 - .2byte 553 - .2byte 555 - .2byte 561 - .2byte 567 - .2byte 571 - .2byte 577 - .2byte 578 - .2byte 604 - .2byte 627 - .2byte 632 - .2byte 646 - .2byte 649 - .2byte 651 - .2byte 657 - .2byte 663 - .2byte 667 - .2byte 673 - .2byte 674 - .2byte 700 - .2byte 723 - .2byte 728 - .2byte 742 - .2byte 745 - .2byte 747 - .2byte 753 - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte -1 - -gBattleFrontierTrainerMons_Harold:: @ 85D5448 - .2byte 355 - .2byte 375 - .2byte 379 - .2byte 385 - .2byte 386 - .2byte 412 - .2byte 435 - .2byte 440 - .2byte 454 - .2byte 457 - .2byte 459 - .2byte 465 - .2byte 473 - .2byte 477 - .2byte 482 - .2byte 484 - .2byte 508 - .2byte 531 - .2byte 536 - .2byte 550 - .2byte 553 - .2byte 555 - .2byte 561 - .2byte 567 - .2byte 571 - .2byte 577 - .2byte 578 - .2byte 604 - .2byte 627 - .2byte 632 - .2byte 646 - .2byte 649 - .2byte 651 - .2byte 657 - .2byte 663 - .2byte 667 - .2byte 673 - .2byte 674 - .2byte 700 - .2byte 723 - .2byte 728 - .2byte 742 - .2byte 745 - .2byte 747 - .2byte 753 - .2byte 756 - .2byte 757 - .2byte 758 - .2byte 767 - .2byte 768 - .2byte 769 - .2byte 778 - .2byte 779 - .2byte 780 - .2byte 789 - .2byte 790 - .2byte 791 - .2byte 828 - .2byte 829 - .2byte 830 - .2byte 831 - .2byte -1 - -gBattleFrontierTrainerMons_Omar:: @ 85D54C4 - .2byte 373 - .2byte 388 - .2byte 390 - .2byte 392 - .2byte 400 - .2byte 409 - .2byte 410 - .2byte 418 - .2byte 431 - .2byte 442 - .2byte 448 - .2byte 449 - .2byte 452 - .2byte 456 - .2byte 458 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 469 - .2byte 471 - .2byte 486 - .2byte 488 - .2byte 496 - .2byte 505 - .2byte 506 - .2byte 514 - .2byte 527 - .2byte 538 - .2byte 544 - .2byte 545 - .2byte 548 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 557 - .2byte 559 - .2byte 565 - .2byte 580 - .2byte 582 - .2byte 584 - .2byte 592 - .2byte 601 - .2byte 602 - .2byte 610 - .2byte 623 - .2byte 634 - .2byte 640 - .2byte 641 - .2byte 644 - .2byte 648 - .2byte 650 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte 661 - .2byte 676 - .2byte 678 - .2byte 680 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 706 - .2byte 719 - .2byte 730 - .2byte 736 - .2byte 737 - .2byte 740 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 749 - .2byte 751 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte -1 - -gBattleFrontierTrainerMons_Peter:: @ 85D5566 - .2byte 373 - .2byte 388 - .2byte 390 - .2byte 392 - .2byte 400 - .2byte 409 - .2byte 410 - .2byte 418 - .2byte 431 - .2byte 442 - .2byte 448 - .2byte 449 - .2byte 452 - .2byte 456 - .2byte 458 - .2byte 459 - .2byte 461 - .2byte 463 - .2byte 469 - .2byte 471 - .2byte 486 - .2byte 488 - .2byte 496 - .2byte 505 - .2byte 506 - .2byte 514 - .2byte 527 - .2byte 538 - .2byte 544 - .2byte 545 - .2byte 548 - .2byte 552 - .2byte 554 - .2byte 555 - .2byte 557 - .2byte 559 - .2byte 565 - .2byte 580 - .2byte 582 - .2byte 584 - .2byte 592 - .2byte 601 - .2byte 602 - .2byte 610 - .2byte 623 - .2byte 634 - .2byte 640 - .2byte 641 - .2byte 644 - .2byte 648 - .2byte 650 - .2byte 651 - .2byte 653 - .2byte 655 - .2byte 661 - .2byte 676 - .2byte 678 - .2byte 680 - .2byte 688 - .2byte 697 - .2byte 698 - .2byte 706 - .2byte 719 - .2byte 730 - .2byte 736 - .2byte 737 - .2byte 740 - .2byte 744 - .2byte 746 - .2byte 747 - .2byte 749 - .2byte 751 - .2byte 808 - .2byte 809 - .2byte 810 - .2byte 811 - .2byte 820 - .2byte 821 - .2byte 822 - .2byte 823 - .2byte -1 - -gBattleFrontierTrainerMons_Dev:: @ 85D5608 - .2byte 372 - .2byte 387 - .2byte 402 - .2byte 403 - .2byte 413 - .2byte 414 - .2byte 416 - .2byte 417 - .2byte 427 - .2byte 428 - .2byte 432 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 466 - .2byte 468 - .2byte 470 - .2byte 498 - .2byte 499 - .2byte 509 - .2byte 510 - .2byte 512 - .2byte 513 - .2byte 523 - .2byte 524 - .2byte 528 - .2byte 529 - .2byte 531 - .2byte 536 - .2byte 546 - .2byte 562 - .2byte 564 - .2byte 579 - .2byte 594 - .2byte 595 - .2byte 605 - .2byte 606 - .2byte 608 - .2byte 609 - .2byte 619 - .2byte 620 - .2byte 624 - .2byte 625 - .2byte 627 - .2byte 632 - .2byte 642 - .2byte 658 - .2byte 660 - .2byte 675 - .2byte 690 - .2byte 691 - .2byte 701 - .2byte 702 - .2byte 704 - .2byte 705 - .2byte 715 - .2byte 716 - .2byte 720 - .2byte 721 - .2byte 723 - .2byte 728 - .2byte 738 - .2byte 754 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Corey:: @ 85D56A6 - .2byte 372 - .2byte 387 - .2byte 402 - .2byte 403 - .2byte 413 - .2byte 414 - .2byte 416 - .2byte 417 - .2byte 427 - .2byte 428 - .2byte 432 - .2byte 433 - .2byte 435 - .2byte 440 - .2byte 450 - .2byte 466 - .2byte 468 - .2byte 470 - .2byte 498 - .2byte 499 - .2byte 509 - .2byte 510 - .2byte 512 - .2byte 513 - .2byte 523 - .2byte 524 - .2byte 528 - .2byte 529 - .2byte 531 - .2byte 536 - .2byte 546 - .2byte 562 - .2byte 564 - .2byte 579 - .2byte 594 - .2byte 595 - .2byte 605 - .2byte 606 - .2byte 608 - .2byte 609 - .2byte 619 - .2byte 620 - .2byte 624 - .2byte 625 - .2byte 627 - .2byte 632 - .2byte 642 - .2byte 658 - .2byte 660 - .2byte 675 - .2byte 690 - .2byte 691 - .2byte 701 - .2byte 702 - .2byte 704 - .2byte 705 - .2byte 715 - .2byte 716 - .2byte 720 - .2byte 721 - .2byte 723 - .2byte 728 - .2byte 738 - .2byte 754 - .2byte 832 - .2byte 833 - .2byte 834 - .2byte 835 - .2byte 860 - .2byte 861 - .2byte 862 - .2byte 863 - .2byte 864 - .2byte 865 - .2byte 866 - .2byte 867 - .2byte 868 - .2byte 869 - .2byte -1 - -gBattleFrontierTrainerMons_Andre:: @ 85D5744 - .2byte 374 - .2byte 378 - .2byte 415 - .2byte 419 - .2byte 421 - .2byte 426 - .2byte 430 - .2byte 444 - .2byte 451 - .2byte 454 - .2byte 455 - .2byte 464 - .2byte 472 - .2byte 476 - .2byte 511 - .2byte 515 - .2byte 517 - .2byte 522 - .2byte 526 - .2byte 540 - .2byte 547 - .2byte 550 - .2byte 551 - .2byte 560 - .2byte 566 - .2byte 570 - .2byte 607 - .2byte 611 - .2byte 613 - .2byte 618 - .2byte 622 - .2byte 636 - .2byte 643 - .2byte 646 - .2byte 647 - .2byte 656 - .2byte 662 - .2byte 666 - .2byte 703 - .2byte 707 - .2byte 709 - .2byte 714 - .2byte 718 - .2byte 732 - .2byte 739 - .2byte 742 - .2byte 743 - .2byte 752 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte -1 - -gBattleFrontierTrainerMons_Ferris:: @ 85D57C2 - .2byte 374 - .2byte 378 - .2byte 415 - .2byte 419 - .2byte 421 - .2byte 426 - .2byte 430 - .2byte 444 - .2byte 451 - .2byte 454 - .2byte 455 - .2byte 464 - .2byte 472 - .2byte 476 - .2byte 511 - .2byte 515 - .2byte 517 - .2byte 522 - .2byte 526 - .2byte 540 - .2byte 547 - .2byte 550 - .2byte 551 - .2byte 560 - .2byte 566 - .2byte 570 - .2byte 607 - .2byte 611 - .2byte 613 - .2byte 618 - .2byte 622 - .2byte 636 - .2byte 643 - .2byte 646 - .2byte 647 - .2byte 656 - .2byte 662 - .2byte 666 - .2byte 703 - .2byte 707 - .2byte 709 - .2byte 714 - .2byte 718 - .2byte 732 - .2byte 739 - .2byte 742 - .2byte 743 - .2byte 752 - .2byte 800 - .2byte 801 - .2byte 802 - .2byte 803 - .2byte 850 - .2byte 851 - .2byte 852 - .2byte 853 - .2byte 854 - .2byte 855 - .2byte 856 - .2byte 857 - .2byte 858 - .2byte 859 - .2byte -1 - -gBattleFrontierTrainerMons_Alivia:: @ 85D5840 - .2byte 399 - .2byte 400 - .2byte 409 - .2byte 422 - .2byte 438 - .2byte 441 - .2byte 445 - .2byte 448 - .2byte 449 - .2byte 451 - .2byte 452 - .2byte 454 - .2byte 455 - .2byte 489 - .2byte 492 - .2byte 493 - .2byte 503 - .2byte 526 - .2byte 532 - .2byte 535 - .2byte 536 - .2byte 560 - .2byte 573 - .2byte 583 - .2byte 590 - .2byte 592 - .2byte 608 - .2byte 611 - .2byte 620 - .2byte 651 - .2byte 682 - .2byte 688 - .2byte 714 - .2byte 729 - .2byte 732 - .2byte -1 - -gBattleFrontierTrainerMons_Paige:: @ 85D5888 - .2byte 399 - .2byte 400 - .2byte 409 - .2byte 422 - .2byte 438 - .2byte 441 - .2byte 445 - .2byte 448 - .2byte 449 - .2byte 451 - .2byte 452 - .2byte 454 - .2byte 455 - .2byte 489 - .2byte 492 - .2byte 493 - .2byte 503 - .2byte 526 - .2byte 532 - .2byte 535 - .2byte 536 - .2byte 560 - .2byte 573 - .2byte 583 - .2byte 590 - .2byte 592 - .2byte 608 - .2byte 611 - .2byte 620 - .2byte 651 - .2byte 682 - .2byte 688 - .2byte 714 - .2byte 729 - .2byte 732 - .2byte -1 - -gBattleFrontierTrainerMons_Anya:: @ 85D58D0 - .2byte 442 - .2byte 443 - .2byte 444 - .2byte 446 - .2byte 447 - .2byte 538 - .2byte 539 - .2byte 540 - .2byte 542 - .2byte 543 - .2byte 634 - .2byte 635 - .2byte 636 - .2byte 638 - .2byte 639 - .2byte 730 - .2byte 731 - .2byte 732 - .2byte 734 - .2byte 735 - .2byte -1 - -gBattleFrontierTrainerMons_Dawn:: @ 85D58FA - .2byte 377 - .2byte 381 - .2byte 410 - .2byte 421 - .2byte 422 - .2byte 443 - .2byte 456 - .2byte 460 - .2byte 461 - .2byte 471 - .2byte 472 - .2byte 473 - .2byte 484 - .2byte 491 - .2byte 502 - .2byte 503 - .2byte 507 - .2byte 508 - .2byte 515 - .2byte 520 - .2byte 540 - .2byte 549 - .2byte 569 - .2byte 574 - .2byte 583 - .2byte 586 - .2byte 601 - .2byte 622 - .2byte 624 - .2byte 639 - .2byte 644 - .2byte 655 - .2byte 734 - .2byte 804 - .2byte 810 - .2byte 815 - .2byte 823 - .2byte 831 - .2byte 843 - .2byte -1 - -gBattleFrontierTrainerMons_Abby:: @ 85D594A - .2byte 185 - .2byte 290 - .2byte 313 - .2byte 334 - .2byte 348 - .2byte 359 - .2byte 360 - .2byte 377 - .2byte 380 - .2byte 382 - .2byte 385 - .2byte 394 - .2byte 395 - .2byte 398 - .2byte 400 - .2byte 401 - .2byte 404 - .2byte 409 - .2byte 410 - .2byte 416 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 441 - .2byte 445 - .2byte 446 - .2byte 453 - .2byte 475 - .2byte 478 - .2byte 480 - .2byte 484 - .2byte 490 - .2byte 491 - .2byte 494 - .2byte 496 - .2byte 497 - .2byte 500 - .2byte 505 - .2byte 506 - .2byte 512 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 537 - .2byte 541 - .2byte 542 - .2byte 549 - .2byte 569 - .2byte 572 - .2byte 574 - .2byte 577 - .2byte 586 - .2byte 587 - .2byte 590 - .2byte 592 - .2byte 593 - .2byte 596 - .2byte 601 - .2byte 602 - .2byte 608 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 633 - .2byte 637 - .2byte 638 - .2byte 645 - .2byte 665 - .2byte 668 - .2byte 670 - .2byte 673 - .2byte 682 - .2byte 683 - .2byte 686 - .2byte 688 - .2byte 689 - .2byte 692 - .2byte 697 - .2byte 698 - .2byte 704 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 729 - .2byte 733 - .2byte 734 - .2byte 741 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte -1 - -gBattleFrontierTrainerMons_Gretel:: @ 85D5A0A - .2byte 185 - .2byte 290 - .2byte 313 - .2byte 334 - .2byte 348 - .2byte 359 - .2byte 360 - .2byte 377 - .2byte 380 - .2byte 382 - .2byte 385 - .2byte 394 - .2byte 395 - .2byte 398 - .2byte 400 - .2byte 401 - .2byte 404 - .2byte 409 - .2byte 410 - .2byte 416 - .2byte 437 - .2byte 438 - .2byte 439 - .2byte 441 - .2byte 445 - .2byte 446 - .2byte 453 - .2byte 475 - .2byte 478 - .2byte 480 - .2byte 484 - .2byte 490 - .2byte 491 - .2byte 494 - .2byte 496 - .2byte 497 - .2byte 500 - .2byte 505 - .2byte 506 - .2byte 512 - .2byte 533 - .2byte 534 - .2byte 535 - .2byte 537 - .2byte 541 - .2byte 542 - .2byte 549 - .2byte 569 - .2byte 572 - .2byte 574 - .2byte 577 - .2byte 586 - .2byte 587 - .2byte 590 - .2byte 592 - .2byte 593 - .2byte 596 - .2byte 601 - .2byte 602 - .2byte 608 - .2byte 629 - .2byte 630 - .2byte 631 - .2byte 633 - .2byte 637 - .2byte 638 - .2byte 645 - .2byte 665 - .2byte 668 - .2byte 670 - .2byte 673 - .2byte 682 - .2byte 683 - .2byte 686 - .2byte 688 - .2byte 689 - .2byte 692 - .2byte 697 - .2byte 698 - .2byte 704 - .2byte 725 - .2byte 726 - .2byte 727 - .2byte 729 - .2byte 733 - .2byte 734 - .2byte 741 - .2byte 812 - .2byte 813 - .2byte 814 - .2byte 815 - .2byte 816 - .2byte 817 - .2byte 818 - .2byte 819 - .2byte -1 diff --git a/data/battle_frontier/battle_frontier_trainers.inc b/data/battle_frontier/battle_frontier_trainers.inc deleted file mode 100644 index 8b05d88eb..000000000 --- a/data/battle_frontier/battle_frontier_trainers.inc +++ /dev/null @@ -1,7801 +0,0 @@ - .align 2 -gBattleFrontierTrainers:: @ 85D5ACC -@ 0 - .4byte FACILITY_CLASS_YOUNGSTER - .string "BRADY$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NEVER - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_LOSE - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_STRONG - .2byte EC_WORD_AREN_T - .2byte EC_WORD_I - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_QUES - .2byte -1 - .2byte EC_WORD_BUT - .2byte EC_WORD_HOW - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Brady - -@ 1 - .4byte FACILITY_CLASS_YOUNGSTER - .string "CONNER$", 8 -@ pre-battle speech - .2byte EC_WORD_LOSING - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_BUG - .2byte EC_WORD_ME - .2byte -1 - .2byte -1 -@ win speech - .2byte EC_WORD_A - .2byte EC_WORD_WIN - .2byte EC_WORD_IS - .2byte EC_WORD_JUST - .2byte EC_WORD_AWESOME - .2byte -1 -@ loss speech - .2byte EC_WORD_DARN - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_LOSING - .2byte EC_WORD_DOES - .2byte EC_WORD_BUG - .2byte EC_WORD_ME - .4byte gBattleFrontierTrainerMons_Conner - -@ 2 - .4byte FACILITY_CLASS_YOUNGSTER - .string "BRADLEY$", 8 -@ pre-battle speech - .2byte EC_WORD_HEY_THERE - .2byte EC_WORD_EXCL - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MY - .2byte EC_WORD_OPPONENT - .2byte EC_WORD_TODAY -@ win speech - .2byte EC_WORD_HAHAHA - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_SEE_YA - .2byte EC_WORD_LATER - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_TOMORROW - .2byte EC_WORD_IS - .2byte EC_WORD_WHEN - .2byte EC_WORD_WE - .2byte EC_WORD_REALLY - .2byte EC_WORD_BATTLE - .4byte gBattleFrontierTrainerMons_Bradley - -@ 3 - .4byte FACILITY_CLASS_LASS - .string "CYBIL$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_REALLY - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_SCARY - .2byte EC_WORD_AT - .2byte EC_WORD_ALL -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_SAD - .2byte EC_WORD_TO - .2byte EC_WORD_SEE - .2byte EC_WORD_YOU - .2byte EC_MOVE2(STRUGGLE) -@ loss speech - .2byte EC_WORD_THIS - .2byte EC_WORD_CAN_T - .2byte EC_WORD_BE - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_TO_ME - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Cybil - -@ 4 - .4byte FACILITY_CLASS_LASS - .string "RODETTE$", 8 -@ pre-battle speech - .2byte EC_WORD_OH - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_SO - .2byte EC_WORD_EXCITING - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_HOW - .2byte EC_WORD_STRONG - .2byte EC_WORD_I_AM - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_I_AM - .2byte EC_WORD_JUST - .2byte EC_WORD_NO - .2byte EC_WORD_GOOD - .4byte gBattleFrontierTrainerMons_Rodette - -@ 5 - .4byte FACILITY_CLASS_LASS - .string "PEGGY$", 8 -@ pre-battle speech - .2byte EC_WORD_GET - .2byte EC_WORD_READY - .2byte EC_WORD_TO - .2byte EC_WORD_BE - .2byte EC_WORD_DESTROYED - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_HAHAHA - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_LOLLING - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_SAD - .2byte EC_WORD_THANKS - .2byte EC_WORD_TO - .2byte EC_WORD_YOU - .4byte gBattleFrontierTrainerMons_Peggy - -@ 6 - .4byte FACILITY_CLASS_SCHOOL_KID_M - .string "KEITH$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_JUST - .2byte EC_WORD_STUDY - .2byte EC_WORD_YOU - .2byte EC_WORD_KNOW -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DON_T - .2byte EC_WORD_STUDY - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_ELLIPSIS - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_STUDY - .2byte EC_WORD_MORE - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Keith - -@ 7 - .4byte FACILITY_CLASS_SCHOOL_KID_M - .string "GRAYSON$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_BATTLE - .2byte EC_WORD_ISN_T - .2byte EC_WORD_CHILD_S_PLAY - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_DONE - .2byte EC_WORD_AREN_T - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_WE - .2byte EC_WORD_WERE - .2byte EC_WORD_LIKE - .2byte EC_WORD_TOYS - .2byte EC_WORD_TO - .2byte EC_WORD_YOU - .4byte gBattleFrontierTrainerMons_Grayson - -@ 8 - .4byte FACILITY_CLASS_SCHOOL_KID_M - .string "GLENN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WOULD - .2byte EC_WORD_BE - .2byte EC_WORD_COOL - .2byte EC_WORD_IF_I_WIN - .2byte -1 -@ win speech - .2byte EC_WORD_COOL - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .2byte EC_WORD_I_AM -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_BE - .2byte EC_WORD_COOL - .4byte gBattleFrontierTrainerMons_Glenn - -@ 9 - .4byte FACILITY_CLASS_SCHOOL_KID_F - .string "LILIANA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WON_T - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_UNTIL - .2byte EC_WORD_I - .2byte EC_WORD_WIN -@ win speech - .2byte EC_WORD_THERE - .2byte EC_WORD_IS - .2byte EC_WORD_NO - .2byte EC_WORD_SURRENDER - .2byte EC_WORD_IN - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_IT - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_I - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Liliana - -@ 10 - .4byte FACILITY_CLASS_SCHOOL_KID_F - .string "ELISE$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_STRATEGY - .2byte EC_WORD_IS - .2byte EC_WORD_FROM - .2byte EC_WORD_MY - .2byte EC_WORD_FATHER -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WIN - .2byte EC_WORD_EXCL - .2byte EC_WORD_FATHER - .2byte EC_WORD_I_VE - .2byte EC_WORD_WON -@ loss speech - .2byte EC_WORD_FORGIVE - .2byte EC_WORD_ME - .2byte EC_WORD_FATHER - .2byte EC_WORD_FOR - .2byte EC_WORD_I_VE - .2byte EC_WORD_LOST - .4byte gBattleFrontierTrainerMons_Elise - -@ 11 - .4byte FACILITY_CLASS_SCHOOL_KID_F - .string "ZOEY$", 8 -@ pre-battle speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_BATTLE - .2byte EC_WORD_LIKE - .2byte EC_WORD_YOU - .2byte EC_WORD_MEAN - .2byte EC_WORD_IT -@ win speech - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_SO - .2byte EC_WORD_MUCH -@ loss speech - .2byte EC_WORD_WERE - .2byte EC_WORD_YOU - .2byte EC_WORD_REALLY - .2byte EC_WORD_BEING - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Zoey - -@ 12 - .4byte FACILITY_CLASS_RICH_BOY - .string "MANUEL$", 8 -@ pre-battle speech - .2byte EC_WORD_ME - .2byte EC_WORD_LOSE - .2byte EC_WORD_QUES - .2byte EC_WORD_THAT_S - .2byte EC_WORD_PREPOSTEROUS - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_NATURALLY - .2byte EC_WORD_I - .2byte EC_WORD_WIN - .2byte -1 - .2byte -1 - .2byte -1 -@ loss speech - .2byte EC_WORD_WAAAH - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_LOST - .2byte EC_WORD_MOTHER - .4byte gBattleFrontierTrainerMons_Manuel - -@ 13 - .4byte FACILITY_CLASS_RICH_BOY - .string "RUSS$", 8 -@ pre-battle speech - .2byte EC_WORD_THEY - .2byte EC_WORD_ALL - .2byte EC_WORD_WANT - .2byte EC_WORD_MY - .2byte EC_WORD_FABULOUS - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_PARTY -@ loss speech - .2byte EC_WORD_HOW - .2byte EC_WORD_COULD - .2byte EC_WORD_YOU - .2byte EC_WORD_DO - .2byte EC_WORD_THAT - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Russ - -@ 14 - .4byte FACILITY_CLASS_RICH_BOY - .string "DUSTIN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_REALLY - .2byte EC_WORD_LIKE - .2byte EC_WORD_COOL - .2byte EC_WORD_POKEMON - .2byte -1 -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_MYSELF - .2byte EC_WORD_WHEN_I_WIN - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_MYSELF - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_TOO - .2byte -1 - .4byte gBattleFrontierTrainerMons_Dustin - -@ 15 - .4byte FACILITY_CLASS_LADY - .string "TINA$", 8 -@ pre-battle speech - .2byte EC_WORD_IF_I_WIN - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_MOVE2(SWEET_KISS) -@ win speech - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(SWEET_KISS) - .2byte EC_WORD_FROM - .2byte EC_WORD_MY - .2byte EC_POKEMON2(JYNX) -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_WANT - .2byte EC_WORD_A - .2byte EC_MOVE(SWIFT) - .2byte EC_MOVE2(MEGA_KICK) - .2byte EC_WORD_INSTEAD - .4byte gBattleFrontierTrainerMons_Tina - -@ 16 - .4byte FACILITY_CLASS_LADY - .string "GILLIAN$", 8 -@ pre-battle speech - .2byte EC_WORD_THE - .2byte EC_WORD_GOURMET - .2byte EC_WORD_THING - .2byte EC_WORD_IS - .2byte EC_WORD_SO - .2byte EC_WORD_YESTERDAY -@ win speech - .2byte EC_WORD_POKEMON - .2byte EC_WORD_NEVER - .2byte EC_WORD_GO - .2byte EC_WORD_OUT - .2byte EC_WORD_OF - .2byte EC_WORD_FASHION -@ loss speech - .2byte EC_WORD_LOSING - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_DISAPPOINT - .2byte EC_WORD_ME - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Gillian - -@ 17 - .4byte FACILITY_CLASS_LADY - .string "ZOE$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVEN_T - .2byte EC_WORD_A - .2byte EC_WORD_WORRY - .2byte EC_WORD_AT - .2byte EC_WORD_ALL -@ win speech - .2byte EC_WORD_LIFE - .2byte EC_WORD_IS - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_GOOD - .2byte EC_WORD_TO_ME - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WORRY - .2byte EC_WORD_ABOUT - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_SKILL - .4byte gBattleFrontierTrainerMons_Zoe - -@ 18 - .4byte FACILITY_CLASS_CAMPER - .string "CHEN$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_READY - .2byte EC_WORD_TO - .2byte EC_WORD_ROCK - .2byte EC_WORD_TODAY -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_READY - .2byte EC_WORD_TO - .2byte EC_WORD_GO - .2byte EC_WORD_ON - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_LOST - .2byte EC_WORD_MY - .2byte EC_MOVE(FOCUS_ENERGY) - .2byte EC_WORD_AND - .2byte EC_WORD_TOUGHNESS - .4byte gBattleFrontierTrainerMons_Chen - -@ 19 - .4byte FACILITY_CLASS_CAMPER - .string "AL$", 8 -@ pre-battle speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_LOOK - .2byte EC_WORD_SAYS - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_REALLY - .2byte EC_WORD_TOUGH -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_ME - .2byte EC_WORD_WHO_IS - .2byte EC_WORD_REALLY - .2byte EC_WORD_TOUGH - .2byte -1 -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_RIGHT - .2byte EC_WORD_EXCL - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_REALLY - .2byte EC_WORD_TOUGH - .4byte gBattleFrontierTrainerMons_Al - -@ 20 - .4byte FACILITY_CLASS_CAMPER - .string "MITCH$", 8 -@ pre-battle speech - .2byte EC_WORD_MOTHER - .2byte EC_WORD_NATURE - .2byte EC_WORD_IS - .2byte EC_WORD_MY - .2byte EC_WORD_ALLY - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_WAS - .2byte EC_WORD_THAT - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_MOTHER - .2byte EC_WORD_NATURE - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_LET_ME_WIN - .2byte EC_WORD_QUES - .2byte -1 - .4byte gBattleFrontierTrainerMons_Mitch - -@ 21 - .4byte FACILITY_CLASS_PICNICKER - .string "ANNE$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_WAIT - .2byte EC_WORD_LET_S - .2byte EC_WORD_BATTLE - .2byte EC_WORD_NOW -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_IS - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_DESTROYED - .2byte EC_WORD_MY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Anne - -@ 22 - .4byte FACILITY_CLASS_PICNICKER - .string "ALIZE$", 8 -@ pre-battle speech - .2byte EC_WORD_CUTE - .2byte EC_WORD_AND - .2byte EC_WORD_AWFULLY - .2byte EC_WORD_STRONG - .2byte EC_WORD_THAT_S - .2byte EC_WORD_ME -@ win speech - .2byte EC_WORD_YUP - .2byte EC_WORD_I_AM - .2byte EC_WORD_CUTE - .2byte EC_WORD_AND - .2byte EC_WORD_AWFULLY - .2byte EC_WORD_STRONG -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_WEAK - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_BUT - .2byte EC_WORD_I_AM - .2byte EC_WORD_CUTE - .4byte gBattleFrontierTrainerMons_Alize - -@ 23 - .4byte FACILITY_CLASS_PICNICKER - .string "LAUREN$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_OLD - .2byte EC_WORD_BUT - .2byte EC_WORD_I_AM - .2byte EC_WORD_ALSO - .2byte EC_WORD_GOOD -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_SAID - .2byte EC_WORD_I_WAS - .2byte EC_WORD_OLD - .2byte EC_WORD_BUT - .2byte EC_WORD_GOOD -@ loss speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_A - .2byte EC_WORD_WEIRD - .2byte EC_WORD_DREAM - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Lauren - -@ 24 - .4byte FACILITY_CLASS_TUBER_M - .string "KIPP$", 8 -@ pre-battle speech - .2byte EC_WORD_IF_I_WIN - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_GO - .2byte EC_MOVE2(SURF) -@ win speech - .2byte EC_WORD_YEAH - .2byte EC_WORD_EXCL - .2byte EC_WORD_I_AM - .2byte EC_WORD_OFF - .2byte EC_WORD_TO - .2byte EC_MOVE2(SURF) -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL - .2byte EC_WORD_A - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Kipp - -@ 25 - .4byte FACILITY_CLASS_TUBER_M - .string "JASON$", 8 -@ pre-battle speech - .2byte EC_WORD_TEACH - .2byte EC_WORD_ME - .2byte EC_WORD_A - .2byte EC_WORD_GOOD - .2byte EC_WORD_STRATEGY - .2byte -1 -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_YOUR - .2byte EC_WORD_GOOD - .2byte EC_WORD_STRATEGY - .2byte EC_WORD_QUES_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_WOW - .2byte EC_WORD_THAT - .2byte EC_WORD_IS - .2byte EC_WORD_AN - .2byte EC_WORD_AWESOME - .2byte EC_WORD_STRATEGY - .4byte gBattleFrontierTrainerMons_Jason - -@ 26 - .4byte FACILITY_CLASS_TUBER_M - .string "JOHN$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_PRETTY - .2byte EC_WORD_NEW - .2byte EC_WORD_TRAINER - .2byte -1 -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NEW - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NEW - .2byte EC_WORD_SO - .2byte EC_WORD_WHAT - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_John - -@ 27 - .4byte FACILITY_CLASS_TUBER_F - .string "ANN$", 8 -@ pre-battle speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_SO - .2byte EC_WORD_EXCITING - .2byte EC_WORD_IT - .2byte EC_WORD_REALLY - .2byte EC_WORD_IS -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_HAPPY - .2byte EC_WORD_I - .2byte EC_WORD_CAN - .2byte EC_WORD_CRY -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_SAD - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_CRY - .4byte gBattleFrontierTrainerMons_Ann - -@ 28 - .4byte FACILITY_CLASS_TUBER_F - .string "EILEEN$", 8 -@ pre-battle speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_PRETEND - .2byte EC_WORD_I_AM - .2byte EC_WORD_AN - .2byte EC_WORD_ADULT - .2byte EC_WORD_OK_QUES -@ win speech - .2byte EC_WORD_SO - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_AN - .2byte EC_WORD_ADULT - .2byte EC_WORD_FEELING -@ loss speech - .2byte EC_WORD_AN - .2byte EC_WORD_ADULT - .2byte EC_WORD_CAN_T - .2byte EC_WORD_BEAT - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Eileen - -@ 29 - .4byte FACILITY_CLASS_TUBER_F - .string "CARLIE$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_SUMMER - .2byte EC_WORD_VACATION - .2byte EC_WORD_IS - .2byte EC_WORD_FOR - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_SUMMER - .2byte EC_WORD_VACATION - .2byte EC_WORD_WILL - .2byte EC_WORD_BE - .2byte EC_WORD_AWESOME -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T_WIN - .2byte EC_WORD_LIKE - .2byte EC_WORD_THIS - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Carlie - -@ 30 - .4byte FACILITY_CLASS_SWIMMER_M - .string "GORDON$", 8 -@ pre-battle speech - .2byte EC_WORD_VICTORY - .2byte EC_WORD_WILL - .2byte EC_WORD_COME - .2byte EC_WORD_TO_ME - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_REALLY - .2byte EC_WORD_WON -@ loss speech - .2byte EC_WORD_NOTHING - .2byte EC_WORD_IS - .2byte EC_WORD_WORKING - .2byte EC_WORD_OUT - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .4byte gBattleFrontierTrainerMons_Gordon - -@ 31 - .4byte FACILITY_CLASS_SWIMMER_M - .string "AYDEN$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_ON - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_A - .2byte EC_WORD_HOT - .2byte EC_WORD_BATTLE -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_WATER - .2byte EC_WORD_TO - .2byte EC_WORD_COOL - .2byte EC_WORD_DOWN -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_ME - .2byte EC_WORD_FEELING - .2byte EC_WORD_ICE - .2byte EC_WORD_COLD - .4byte gBattleFrontierTrainerMons_Ayden - -@ 32 - .4byte FACILITY_CLASS_SWIMMER_M - .string "MARCO$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_MOVE2(SURF) - .2byte EC_WORD_IN - .2byte EC_WORD_THE - .2byte EC_WORD_WINTER - .2byte EC_WORD_TOO -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_GO - .2byte EC_MOVE2(SURF) - .2byte EC_WORD_RIGHT - .2byte EC_WORD_NOW -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_MY - .2byte EC_MOVE2(SURF) - .2byte EC_WORD_BOARD - .4byte gBattleFrontierTrainerMons_Marco - -@ 33 - .4byte FACILITY_CLASS_SWIMMER_F - .string "CIERRA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_TO - .2byte EC_WORD_SYNCHRONIZE - .2byte EC_WORD_MY - .2byte EC_WORD_SWIFT_SWIM -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_SYNCHRONIZE - .2byte EC_WORD_WITH - .2byte EC_WORD_ME - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_SYNCHRONIZE - .2byte EC_WORD_BETTER - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Cierra - -@ 34 - .4byte FACILITY_CLASS_SWIMMER_F - .string "MARCY$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_KNOCKOUT - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T_WIN - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_AFTER - .2byte EC_WORD_ALL - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_KNOCKOUT - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_NOT - .2byte EC_WORD_THE - .2byte EC_WORD_KNOCKOUT - .2byte EC_WORD_I - .2byte EC_WORD_MEAN - .4byte gBattleFrontierTrainerMons_Marcy - -@ 35 - .4byte FACILITY_CLASS_SWIMMER_F - .string "KATHY$", 8 -@ pre-battle speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_WON - .2byte EC_WORD_EVERY - .2byte EC_WORD_MATCH - .2byte EC_WORD_TODAY - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_SO - .2byte EC_WORD_GREAT - .2byte EC_WORD_TO - .2byte EC_WORD_WIN - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_I - .2byte EC_WORD_SHOULD - .2byte EC_WORD_NOT - .2byte EC_WORD_HAVE - .2byte EC_WORD_LOST - .4byte gBattleFrontierTrainerMons_Kathy - -@ 36 - .4byte FACILITY_CLASS_POKEFAN_M - .string "PEYTON$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NEVER - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_WITH - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_HAPPY - .2byte EC_WORD_IF - .2byte EC_WORD_WE - .2byte EC_WORD_WIN - .2byte EC_WORD_TOGETHER -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_ADORE - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_MORE - .2byte EC_WORD_IF_I_LOSE - .4byte gBattleFrontierTrainerMons_Peyton - -@ 37 - .4byte FACILITY_CLASS_POKEFAN_M - .string "JULIAN$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_ADORE - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_RIGHT - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_OUT - .2byte EC_WORD_OF - .2byte EC_WORD_THE - .2byte EC_WORD_QUESTION -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DO - .2byte EC_WORD_ADORE - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Julian - -@ 38 - .4byte FACILITY_CLASS_POKEFAN_M - .string "QUINN$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_BUT - .2byte EC_WORD_A - .2byte EC_WORD_DREAM -@ win speech - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_WORD_BEAUTIFUL - .2byte EC_WORD_DREAM - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_AN - .2byte EC_WORD_AWFUL - .2byte EC_MOVE(NIGHTMARE) - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Quinn - -@ 39 - .4byte FACILITY_CLASS_POKEFAN_F - .string "HAYLEE$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_KNOW - .2byte EC_WORD_HOW - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_JOY - .2byte EC_WORD_OVER - .2byte EC_WORD_THIS -@ loss speech - .2byte EC_WORD_DESTROYED - .2byte EC_WORD_IS - .2byte EC_WORD_THE - .2byte EC_WORD_WAY - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .4byte gBattleFrontierTrainerMons_Haylee - -@ 40 - .4byte FACILITY_CLASS_POKEFAN_F - .string "AMANDA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_COME - .2byte EC_WORD_FROM - .2byte EC_WORD_A - .2byte EC_WORD_TRAINER - .2byte EC_WORD_FAMILY -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_TREASURE - .2byte EC_WORD_THIS - .2byte EC_WORD_WIN - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_GO_HOME - .2byte EC_WORD_RIGHT - .2byte EC_WORD_NOW - .4byte gBattleFrontierTrainerMons_Amanda - -@ 41 - .4byte FACILITY_CLASS_POKEFAN_F - .string "STACY$", 8 -@ pre-battle speech - .2byte EC_WORD_ALL - .2byte EC_WORD_POKEMON - .2byte EC_WORD_HAVE - .2byte EC_WORD_THEIR - .2byte EC_WORD_OWN - .2byte EC_WORD_CUTE_CHARM -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SEE - .2byte EC_WORD_WHAT - .2byte EC_WORD_I - .2byte EC_WORD_MEAN - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_SHOULD - .2byte EC_WORD_I - .2byte EC_WORD_NOT - .2byte EC_WORD_ADORE - .2byte EC_WORD_POKEMON - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Stacy - -@ 42 - .4byte FACILITY_CLASS_PKMN_BREEDER_M - .string "RAFAEL$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_ON - .2byte EC_WORD_EXCL - .2byte EC_WORD_LET_S - .2byte EC_WORD_SEE - .2byte EC_WORD_SOME - .2byte EC_WORD_SPIRIT -@ win speech - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte EC_WORD_THAT_S - .2byte EC_WORD_THE - .2byte EC_WORD_SPIRIT - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_WELL - .2byte EC_WORD_SO - .2byte EC_WORD_MUCH - .2byte EC_WORD_FOR - .2byte EC_WORD_OUR - .2byte EC_WORD_SPIRIT - .4byte gBattleFrontierTrainerMons_Rafael - -@ 43 - .4byte FACILITY_CLASS_PKMN_BREEDER_M - .string "OLIVER$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_GENIUS - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .2byte EC_WORD_I_AM - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_HOW - .2byte EC_WORD_A - .2byte EC_WORD_GENIUS - .2byte EC_WORD_WORKS - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MORE - .2byte EC_WORD_A - .2byte EC_WORD_GENIUS - .2byte EC_WORD_THAN - .2byte EC_WORD_I_AM - .4byte gBattleFrontierTrainerMons_Oliver - -@ 44 - .4byte FACILITY_CLASS_PKMN_BREEDER_M - .string "PAYTON$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_TRAIN - .2byte EC_WORD_FROM - .2byte EC_WORD_THE - .2byte EC_WORD_EGG - .2byte EC_WORD_UP -@ win speech - .2byte EC_WORD_WELL - .2byte EC_WORD_DONE - .2byte EC_WORD_EXCL - .2byte -1 - .2byte -1 - .2byte -1 -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_A - .2byte EC_MOVE2(SOFT_BOILED) - .2byte EC_WORD_LOSS - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Payton - -@ 45 - .4byte FACILITY_CLASS_POKEMON_BREEDER_F - .string "PAMELA$", 8 -@ pre-battle speech - .2byte EC_WORD_ALL - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ADORE - .2byte EC_WORD_A - .2byte EC_WORD_KIND - .2byte EC_WORD_TRAINER -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_TOO - .2byte EC_WORD_BAD - .2byte EC_WORD_YOU - .2byte EC_WORD_LOST - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_KIND - .2byte EC_WORD_AND - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_ALSO - .2byte EC_WORD_STRONG - .4byte gBattleFrontierTrainerMons_Pamela - -@ 46 - .4byte FACILITY_CLASS_POKEMON_BREEDER_F - .string "ELIZA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_ADORE - .2byte EC_WORD_POKEMON - .2byte EC_WORD_LIKE - .2byte EC_WORD_MY - .2byte EC_WORD_CHILDREN -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_HAPPY - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON -@ loss speech - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_SORRY - .2byte EC_WORD_ABOUT - .2byte EC_WORD_THIS - .4byte gBattleFrontierTrainerMons_Eliza - -@ 47 - .4byte FACILITY_CLASS_POKEMON_BREEDER_F - .string "MARISA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_PROMISE - .2byte EC_WORD_TO - .2byte EC_WORD_BATTLE - .2byte EC_WORD_SERIOUSLY - .2byte -1 -@ win speech - .2byte EC_WORD_PROMISE - .2byte EC_WORD_ME - .2byte EC_WORD_YOU - .2byte EC_WORD_WILL - .2byte EC_WORD_DO - .2byte EC_WORD_BETTER -@ loss speech - .2byte EC_WORD_PROMISE - .2byte EC_WORD_ME - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_BATTLE - .2byte EC_WORD_PLEASE - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Marisa - -@ 48 - .4byte FACILITY_CLASS_BUG_CATCHER - .string "LEWIS$", 8 -@ pre-battle speech - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_BUG - .2byte EC_WORD_IS - .2byte EC_WORD_SCARY - .2byte EC_WORD_QUES - .2byte EC_WORD_HAHAHA -@ win speech - .2byte EC_WORD_LOOK - .2byte EC_WORD_LOOK - .2byte EC_WORD_EXCL - .2byte EC_WORD_A - .2byte EC_WORD_SCARY - .2byte EC_WORD_BUG -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_A - .2byte EC_WORD_BUG - .2byte EC_WORD_ISN_T - .2byte EC_WORD_SCARY - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Lewis - -@ 49 - .4byte FACILITY_CLASS_BUG_CATCHER - .string "YOSHI$", 8 -@ pre-battle speech - .2byte EC_WORD_BUG - .2byte EC_WORD_POKEMON - .2byte EC_WORD_MAKE - .2byte EC_WORD_ME - .2byte EC_WORD_FEELING - .2byte EC_WORD_LOVEY_DOVEY -@ win speech - .2byte EC_WORD_BUG - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_THE - .2byte EC_WORD_BEST - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_IGNORANT - .2byte EC_WORD_ABOUT - .2byte EC_WORD_BUG - .2byte EC_WORD_POKEMON - .2byte -1 - .4byte gBattleFrontierTrainerMons_Yoshi - -@ 50 - .4byte FACILITY_CLASS_BUG_CATCHER - .string "DESTIN$", 8 -@ pre-battle speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_WAY - .2byte EC_WORD_TOO - .2byte EC_WORD_HOT - .2byte EC_WORD_HERE - .2byte -1 -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_ABOUT - .2byte EC_WORD_TO - .2byte EC_MOVE(OVERHEAT) - .2byte -1 - .2byte -1 -@ loss speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_SOME - .2byte EC_WORD_WATER - .2byte -1 - .4byte gBattleFrontierTrainerMons_Destin - -@ 51 - .4byte FACILITY_CLASS_NINJA_BOY - .string "KEON$", 8 -@ pre-battle speech - .2byte EC_WORD_FORGIVE - .2byte EC_WORD_ME - .2byte EC_WORD_BUT - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_FORGIVE - .2byte EC_WORD_ME - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_POWER -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SORRY - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Keon - -@ 52 - .4byte FACILITY_CLASS_NINJA_BOY - .string "STUART$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_PROMISE - .2byte EC_WORD_YOU - .2byte EC_WORD_A - .2byte EC_WORD_HOT - .2byte EC_WORD_BATTLE -@ win speech - .2byte EC_WORD_THE - .2byte EC_WORD_MASTER - .2byte EC_WORD_OF - .2byte EC_WORD_COOL - .2byte EC_WORD_THAT_S - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_SEE - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_SO - .2byte EC_WORD_COOL - .4byte gBattleFrontierTrainerMons_Stuart - -@ 53 - .4byte FACILITY_CLASS_NINJA_BOY - .string "NESTOR$", 8 -@ pre-battle speech - .2byte EC_WORD_SHOW - .2byte EC_WORD_ME - .2byte EC_WORD_A - .2byte EC_WORD_REALLY - .2byte EC_WORD_SMOOTH - .2byte EC_WORD_MOVE -@ win speech - .2byte EC_WORD_THERE - .2byte EC_WORD_WAS - .2byte EC_WORD_NOTHING - .2byte EC_WORD_SMOOTH - .2byte EC_WORD_ABOUT - .2byte EC_WORD_THAT -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_REALLY - .2byte EC_WORD_ARE - .2byte EC_WORD_SMOOTH - .2byte EC_WORD_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Nestor - -@ 54 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "DERRICK$", 8 -@ pre-battle speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_SEE - .2byte EC_WORD_YOU - .2byte EC_MOVE2(MEDITATE) - .2byte EC_WORD_LIKE - .2byte EC_WORD_ME -@ win speech - .2byte EC_WORD_HOW - .2byte EC_WORD_I - .2byte EC_MOVE2(MEDITATE) - .2byte EC_WORD_IS - .2byte EC_WORD_JUST - .2byte EC_WORD_BEAUTIFUL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_MOVE2(MEDITATE) - .2byte EC_WORD_FOR - .2byte EC_WORD_A - .2byte EC_MOVE2(CALM_MIND) - .4byte gBattleFrontierTrainerMons_Derrick - -@ 55 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "BRYSON$", 8 -@ pre-battle speech - .2byte EC_MOVE2(POISON_POWDER) - .2byte EC_WORD_IS - .2byte EC_WORD_IN - .2byte EC_WORD_OUR - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_MOVE -@ win speech - .2byte EC_WORD_HOW_DO - .2byte EC_WORD_YOU - .2byte EC_WORD_LIKE - .2byte EC_WORD_OUR - .2byte EC_MOVE2(POISON_POWDER) - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_WAS - .2byte EC_WORD_USELESS - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Bryson - -@ 56 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "CLAYTON$", 8 -@ pre-battle speech - .2byte EC_WORD_HUH_QUES - .2byte -1 - .2byte -1 - .2byte EC_WORD_WHERE - .2byte EC_WORD_IS_IT_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_WHERE - .2byte EC_WORD_IS_IT_QUES - .2byte EC_WORD_I_VE - .2byte EC_WORD_LOST - .2byte EC_WORD_MY - .2byte EC_WORD_POKENAV -@ loss speech - .2byte EC_WORD_WHERE - .2byte EC_WORD_IS_IT_QUES - .2byte EC_WORD_I_VE - .2byte EC_WORD_LOST - .2byte EC_WORD_MY - .2byte EC_WORD_SENSE - .4byte gBattleFrontierTrainerMons_Clayton - -@ 57 - .4byte FACILITY_CLASS_FISHERMAN - .string "TRENTON$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_OVER - .2byte EC_WORD_FOR - .2byte EC_WORD_SOME - .2byte EC_WORD_TASTY - .2byte EC_WORD_WATER - .2byte -1 -@ win speech - .2byte EC_WORD_MMM - .2byte EC_WORD_DO - .2byte EC_WORD_YOU - .2byte EC_WORD_WANT - .2byte EC_WORD_SOME - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_GOT - .2byte EC_WORD_THIS - .2byte EC_WORD_TASTY - .2byte EC_WORD_WATER - .2byte EC_WORD_SHOPPING - .4byte gBattleFrontierTrainerMons_Trenton - -@ 58 - .4byte FACILITY_CLASS_FISHERMAN - .string "JENSON$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_WILL - .2byte EC_WORD_MAKE - .2byte EC_WORD_YOU - .2byte EC_WORD_DOWNCAST -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_DON_T - .2byte EC_WORD_MAKE - .2byte EC_WORD_THE - .2byte EC_MOVE(CUT) -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_THE - .2byte EC_WORD_TRAINER - .2byte EC_WORD_WHO_IS - .2byte EC_WORD_FEELING - .2byte EC_WORD_DOWNCAST - .4byte gBattleFrontierTrainerMons_Jenson - -@ 59 - .4byte FACILITY_CLASS_FISHERMAN - .string "WESLEY$", 8 -@ pre-battle speech - .2byte EC_POKEMON2(MEW) - .2byte EC_POKEMON2(MEW) - .2byte EC_WORD_IS - .2byte EC_WORD_HOW - .2byte EC_WORD_I - .2byte EC_WORD_CRY -@ win speech - .2byte EC_WORD_YES - .2byte EC_WORD_I - .2byte EC_WORD_KNOW - .2byte EC_WORD_I_AM - .2byte EC_WORD_CUTE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_POKEMON2(MEW) - .2byte EC_POKEMON2(MEW) - .2byte EC_WORD_EXCL - .2byte EC_POKEMON2(MEW) - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Wesley - -@ 60 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "ANTON$", 8 -@ pre-battle speech - .2byte EC_WORD_GET - .2byte EC_WORD_READY - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .2byte EC_WORD_TO - .2byte EC_MOVE(THRASH) -@ win speech - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_EXCL - .2byte EC_WORD_SORRY - .2byte EC_WORD_ABOUT - .2byte EC_WORD_THAT - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_TOUGH - .2byte EC_WORD_LOSS - .2byte EC_WORD_TO - .2byte EC_MOVE2(SWALLOW) - .4byte gBattleFrontierTrainerMons_Anton - -@ 61 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "LAWSON$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_YOUNG - .2byte EC_WORD_AT - .2byte EC_WORD_HEART - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_NOT - .2byte EC_WORD_COOL - .2byte EC_WORD_EXCL - .2byte EC_WORD_NOT - .2byte EC_WORD_AT - .2byte EC_WORD_ALL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_OLD - .2byte EC_WORD_AND - .2byte EC_WORD_FEELING - .2byte EC_WORD_SHAKY - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Lawson - -@ 62 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "SAMMY$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_PARTY - .2byte EC_WORD_IS - .2byte EC_WORD_READY - .2byte EC_WORD_TO - .2byte EC_WORD_ROCK -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_PARTY - .2byte EC_WORD_IS - .2byte EC_WORD_JUST - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_CRY - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_PARTY - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Sammy - -@ 63 - .4byte FACILITY_CLASS_COLLECTOR - .string "ARNIE$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NO_1 - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_NO - .2byte EC_WORD_RIVAL -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_LOSE -@ loss speech - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL - .2byte EC_WORD_I - .2byte EC_WORD_WON_T - .2byte EC_WORD_ACCEPT - .2byte EC_WORD_THIS - .4byte gBattleFrontierTrainerMons_Arnie - -@ 64 - .4byte FACILITY_CLASS_COLLECTOR - .string "ADRIAN$", 8 -@ pre-battle speech - .2byte EC_WORD_YAHOO - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_YAHOO - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_GOOD_BYE - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_GOOD_BYE - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Adrian - -@ 65 - .4byte FACILITY_CLASS_COLLECTOR - .string "TRISTAN$", 8 -@ pre-battle speech - .2byte EC_WORD_CONFUSED - .2byte EC_WORD_QUES - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_GENIUS -@ win speech - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_GENIUS -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_A - .2byte EC_WORD_GENIUS - .2byte EC_WORD_IN - .2byte EC_WORD_BATTLE - .4byte gBattleFrontierTrainerMons_Tristan - -@ 66 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "JULIANA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_THINK - .2byte EC_WORD_I_AM - .2byte EC_WORD_SHOPPING - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH -@ win speech - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_PLUSH_DOLL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_SO - .2byte EC_WORD_WANT - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_POKEMON - .2byte EC_WORD_PLUSH_DOLL - .4byte gBattleFrontierTrainerMons_Juliana - -@ 67 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "RYLEE$", 8 -@ pre-battle speech - .2byte EC_WORD_SHOW - .2byte EC_WORD_ME - .2byte EC_WORD_THAT - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_GUTS -@ win speech - .2byte EC_WORD_BYE_BYE - .2byte EC_WORD_EXCL - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_NO - .2byte EC_WORD_GUTS -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_GUTSY - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_QUITE - .2byte EC_WORD_SUPER - .4byte gBattleFrontierTrainerMons_Rylee - -@ 68 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "CHELSEA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_SERIOUSLY - .2byte EC_WORD_MEAN - .2byte EC_WORD_TO - .2byte EC_WORD_WIN - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_MY - .2byte EC_WORD_WILL - .2byte EC_WORD_TO - .2byte EC_WORD_WIN - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_FAR - .2byte EC_WORD_TOO_STRONG - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .2byte -1 - .4byte gBattleFrontierTrainerMons_Chelsea - -@ 69 - .4byte FACILITY_CLASS_BEAUTY - .string "DANELA$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_MUST_BE - .2byte EC_WORD_MY - .2byte EC_WORD_OPPONENT - .2byte EC_WORD_NOW - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_EXCL - .2byte EC_WORD_DON_T - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_GOOD - .2byte EC_WORD_AND - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_GOOD_BYE - .4byte gBattleFrontierTrainerMons_Danela - -@ 70 - .4byte FACILITY_CLASS_BEAUTY - .string "LIZBETH$", 8 -@ pre-battle speech - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_MOVE2(PRESENT) -@ win speech - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_PRAISE - .2byte EC_WORD_AS - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(PRESENT) -@ loss speech - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_QUES_EXCL - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_A - .2byte EC_MOVE(DOUBLE_SLAP) - .4byte gBattleFrontierTrainerMons_Lizbeth - -@ 71 - .4byte FACILITY_CLASS_BEAUTY - .string "AMELIA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_BELIEVE - .2byte EC_WORD_IN - .2byte EC_WORD_CUTE - .2byte EC_WORD_FASHION - .2byte EC_WORD_APPEAL -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_FASHION - .2byte EC_WORD_SENSE - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_WORD_DISASTER -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_AWFUL - .2byte EC_WORD_EXCL - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_HOME - .4byte gBattleFrontierTrainerMons_Amelia - -@ 72 - .4byte FACILITY_CLASS_AROMA_LADY - .string "JILLIAN$", 8 -@ pre-battle speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_IS - .2byte EC_WORD_THAT - .2byte EC_WORD_I - .2byte EC_WORD_SMELL - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_THE - .2byte EC_MOVE(SWEET_SCENT) - .2byte EC_WORD_OF - .2byte EC_WORD_TASTY - .2byte EC_WORD_WATER -@ loss speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_YOUR - .2byte EC_WORD_OFFENSIVE - .2byte EC_WORD_STENCH - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .4byte gBattleFrontierTrainerMons_Jillian - -@ 73 - .4byte FACILITY_CLASS_AROMA_LADY - .string "ABBIE$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_TRY - .2byte EC_WORD_MY - .2byte EC_WORD_SECRET - .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_WORD_OK_QUES -@ win speech - .2byte EC_WORD_MY - .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_WORD_IS - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU -@ loss speech - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_YOU - .2byte EC_WORD_SMELL - .2byte EC_WORD_A - .2byte EC_WORD_THING - .2byte EC_WORD_QUES_EXCL - .4byte gBattleFrontierTrainerMons_Abbie - -@ 74 - .4byte FACILITY_CLASS_AROMA_LADY - .string "BRIANA$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_BOY - .2byte EC_WORD_FRIEND - .2byte EC_WORD_WORKS - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_ONLY - .2byte EC_WORD_MISS - .2byte EC_WORD_HIM - .2byte EC_WORD_MORE - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_LONESOME - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_HIM - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Briana - -@ 75 - .4byte FACILITY_CLASS_GUITARIST - .string "ANTONIO$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_KNOW - .2byte EC_WORD_HOW - .2byte EC_WORD_TO - .2byte EC_WORD_GO - .2byte EC_WORD_GO -@ win speech - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_LIKE - .2byte EC_WORD_TO - .2byte EC_WORD_DANCE -@ loss speech - .2byte EC_WORD_GO - .2byte EC_WORD_GO - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_JUST - .2byte EC_MOVE(FLAIL) - .2byte EC_WORD_ABOUT - .4byte gBattleFrontierTrainerMons_Antonio - -@ 76 - .4byte FACILITY_CLASS_GUITARIST - .string "JADEN$", 8 -@ pre-battle speech - .2byte EC_WORD_HELLO - .2byte EC_WORD_I - .2byte EC_WORD_THINK - .2byte EC_WORD_I - .2byte EC_WORD_ADORE - .2byte EC_WORD_YOU -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_MAKE - .2byte EC_WORD_ME - .2byte EC_MOVE(THRASH) - .2byte EC_WORD_IN - .2byte EC_MOVE2(FRUSTRATION) -@ loss speech - .2byte EC_WORD_THIS_IS_IT_EXCL - .2byte -1 - .2byte -1 - .2byte EC_WORD_GOOD_BYE - .2byte EC_WORD_FOREVER - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Jaden - -@ 77 - .4byte FACILITY_CLASS_GUITARIST - .string "DAKOTA$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_TO - .2byte EC_WORD_DANCE - .2byte EC_WORD_WITH - .2byte EC_WORD_POWER -@ win speech - .2byte EC_WORD_GOT - .2byte EC_WORD_IT - .2byte EC_WORD_QUES - .2byte EC_WORD_DANCE - .2byte EC_WORD_WITH - .2byte EC_WORD_POWER -@ loss speech - .2byte EC_WORD_OKAY - .2byte EC_WORD_YOU - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_ALL_RIGHT - .2byte EC_WORD_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Dakota - -@ 78 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "BRAYDEN$", 8 -@ pre-battle speech - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_WORD_VERSION - .2byte EC_WORD_TOYS - .2byte EC_WORD_ARE - .2byte EC_WORD_USELESS - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_ONLY - .2byte EC_WORD_COLLECT - .2byte EC_WORD_NORMAL - .2byte EC_WORD_VERSION - .2byte EC_WORD_TOYS -@ loss speech - .2byte EC_WORD_I - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_WORD_VERSION - .2byte EC_WORD_TOYS - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Brayden - -@ 79 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "CORSON$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_GET - .2byte EC_WORD_TO - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_ON - .2byte EC_WORD_YOU -@ win speech - .2byte EC_WORD_TOO - .2byte EC_WORD_EASY - .2byte EC_WORD_EXCL - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_COOL -@ loss speech - .2byte EC_WORD_WHY - .2byte EC_WORD_QUES_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_MOVE2(CURSE) - .2byte EC_WORD_YOU - .4byte gBattleFrontierTrainerMons_Corson - -@ 80 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "TREVIN$", 8 -@ pre-battle speech - .2byte EC_WORD_THERE - .2byte EC_WORD_IS - .2byte EC_WORD_NONE - .2byte EC_WORD_BETTER - .2byte EC_WORD_THAN - .2byte EC_WORD_ME -@ win speech - .2byte EC_WORD_YES_SIR_EXCL - .2byte -1 - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_THE - .2byte EC_WORD_BEST -@ loss speech - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_QUES_EXCL - .2byte -1 - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Trevin - -@ 81 - .4byte FACILITY_CLASS_SAILOR - .string "PATRICK$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_PERFECT - .2byte EC_WORD_EXCL - .2byte EC_WORD_GIVE_UP - .2byte EC_WORD_NOW - .2byte -1 -@ win speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_BE - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_I_AM - .2byte EC_WORD_PERFECT - .2byte -1 -@ loss speech - .2byte EC_WORD_BUT - .2byte EC_WORD_HOW - .2byte EC_WORD_QUES - .2byte EC_WORD_I_AM - .2byte EC_WORD_PERFECT - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Patrick - -@ 82 - .4byte FACILITY_CLASS_SAILOR - .string "KADEN$", 8 -@ pre-battle speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_UP - .2byte EC_WORD_TO - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_WERE - .2byte EC_WORD_A - .2byte EC_WORD_SURPRISE - .2byte EC_WORD_TO_ME - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_KNOW - .2byte EC_WORD_WHO - .2byte EC_WORD_I_AM - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Kaden - -@ 83 - .4byte FACILITY_CLASS_SAILOR - .string "MAXWELL$", 8 -@ pre-battle speech - .2byte EC_WORD_HEY_THERE - .2byte EC_WORD_WHO_IS - .2byte EC_WORD_YOUR - .2byte EC_WORD_RIVAL - .2byte EC_WORD_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_RIVAL - .2byte EC_WORD_IS - .2byte EC_WORD_MY - .2byte EC_WORD_GIRL - .2byte EC_WORD_FRIEND -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_MAKING - .2byte EC_WORD_YOU - .2byte EC_WORD_MY - .2byte EC_WORD_RIVAL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Maxwell - -@ 84 - .4byte FACILITY_CLASS_HIKER - .string "DARYL$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_ONLY - .2byte EC_WORD_KNOW - .2byte EC_WORD_HOW - .2byte EC_WORD_TO - .2byte EC_MOVE(CHARGE) -@ win speech - .2byte EC_WORD_AM - .2byte EC_WORD_I - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_OR - .2byte EC_WORD_WHAT - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_A - .2byte EC_WORD_LEGEND - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Daryl - -@ 85 - .4byte FACILITY_CLASS_HIKER - .string "KENNETH$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_BETTER - .2byte EC_WORD_NOT - .2byte EC_MOVE2(SLACK_OFF) - .2byte EC_WORD_WITH - .2byte EC_WORD_ME -@ win speech - .2byte EC_WORD_DID - .2byte EC_WORD_MY - .2byte EC_MOVE2(TAUNT) - .2byte EC_WORD_INTIMIDATE - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SORRY - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Kenneth - -@ 86 - .4byte FACILITY_CLASS_HIKER - .string "RICH$", 8 -@ pre-battle speech - .2byte EC_WORD_YOUR - .2byte EC_MOVE(FACADE) - .2byte EC_WORD_DOESN_T - .2byte EC_MOVE2(TRICK) - .2byte EC_WORD_ME - .2byte -1 -@ win speech - .2byte EC_WORD_SERIOUSLY - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_REALLY - .2byte EC_WORD_OK_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_REALLY - .2byte EC_WORD_TOUGH - .2byte EC_WORD_ON - .2byte EC_WORD_ME - .2byte -1 - .4byte gBattleFrontierTrainerMons_Rich - -@ 87 - .4byte FACILITY_CLASS_KINDLER - .string "CADEN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_BE - .2byte EC_WORD_DEFEATED - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_FIRE - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_FIRE - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_TIRED - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_IT_S - .2byte EC_WORD_SO - .2byte EC_WORD_HOT - .4byte gBattleFrontierTrainerMons_Caden - -@ 88 - .4byte FACILITY_CLASS_KINDLER - .string "MARLON$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_IS - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_RADIO - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_RADIO - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_THAT_S - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_COOL -@ loss speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_NOT - .2byte EC_WORD_QUES - .2byte EC_WORD_IS - .2byte EC_WORD_POKENAV - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Marlon - -@ 89 - .4byte FACILITY_CLASS_KINDLER - .string "NASH$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_ON - .2byte EC_WORD_FIRE - .2byte EC_WORD_BABY - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_LEFT - .2byte EC_WORD_YOU - .2byte EC_WORD_JUST - .2byte EC_WORD_AN - .2byte EC_MOVE2(EMBER) -@ loss speech - .2byte EC_WORD_AIYEEH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_NO - .2byte EC_WORD_WATER - .2byte EC_WORD_PLEASE - .4byte gBattleFrontierTrainerMons_Nash - -@ 90 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M - .string "ROBBY$", 8 -@ pre-battle speech - .2byte EC_WORD_HAHAHA - .2byte EC_WORD_EXCL - .2byte EC_WORD_HAPPY - .2byte EC_WORD_TO - .2byte EC_WORD_MEET_YOU - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_THE - .2byte EC_WORD_LEADER - .2byte EC_WORD_WITH - .2byte EC_WORD_REFRESHING - .2byte EC_WORD_SERENE_GRACE -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_MOVE(THRASH) - .2byte EC_WORD_MY - .2byte EC_WORD_TOYS - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Robby - -@ 91 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M - .string "REECE$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_WORD_CAN - .2byte EC_WORD_BEAT - .2byte EC_WORD_A - .2byte EC_MOVE2(TELEPORT) -@ win speech - .2byte EC_WORD_LIKE - .2byte EC_WORD_I - .2byte EC_WORD_SAID - .2byte EC_WORD_I_AM - .2byte EC_WORD_DARN - .2byte EC_WORD_FAST -@ loss speech - .2byte EC_WORD_I_WAS - .2byte EC_WORD_KIDDING - .2byte EC_WORD_ABOUT - .2byte EC_WORD_THAT - .2byte EC_MOVE2(TELEPORT) - .2byte EC_WORD_THING - .4byte gBattleFrontierTrainerMons_Reece - -@ 92 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F - .string "KATHRYN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_TRAIN - .2byte EC_WORD_GOOD - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_DON_T - .2byte EC_MOVE2(TAUNT) - .2byte EC_WORD_ME - .2byte EC_WORD_LIKE - .2byte EC_WORD_THAT - .2byte EC_WORD_OK_QUES -@ loss speech - .2byte EC_WORD_WHY - .2byte EC_WORD_COULDN_T - .2byte EC_WORD_I - .2byte EC_WORD_WIN - .2byte EC_WORD_THIS - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Kathryn - -@ 93 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F - .string "ELLEN$", 8 -@ pre-battle speech - .2byte EC_WORD_CRUSH - .2byte EC_WORD_YOU - .2byte EC_WORD_LIKE - .2byte EC_WORD_AN - .2byte EC_WORD_EGG - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_A - .2byte EC_WORD_TASTY - .2byte EC_WORD_VICTORY - .2byte EC_WORD_FOR - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_TOO - .2byte EC_WORD_TOUGH - .2byte EC_WORD_TO - .2byte EC_WORD_CRUSH - .2byte EC_WORD_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Ellen - -@ 94 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M - .string "RAMON$", 8 -@ pre-battle speech - .2byte EC_WORD_OKAY - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_PERFECTION -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_HAPPY - .2byte EC_WORD_THAT - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_SECRET - .2byte EC_WORD_WHY - .2byte EC_WORD_I_AM - .2byte EC_WORD_HAPPY - .4byte gBattleFrontierTrainerMons_Ramon - -@ 95 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M - .string "ARTHUR$", 8 -@ pre-battle speech - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_FEELING - .2byte EC_WORD_READY - .2byte EC_WORD_FOR - .2byte EC_WORD_IT - .2byte EC_WORD_ALL -@ win speech - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte -1 - .2byte -1 - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_FABULOUS - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_NOT - .2byte EC_WORD_WHAT - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte -1 - .4byte gBattleFrontierTrainerMons_Arthur - -@ 96 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F - .string "ALONDRA$", 8 -@ pre-battle speech - .2byte EC_WORD_EVERY - .2byte EC_WORD_DAY - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_WORD_GREAT - .2byte EC_WORD_DAY -@ win speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(DIVE) - .2byte EC_WORD_WILL - .2byte EC_WORD_BE - .2byte EC_WORD_A - .2byte EC_WORD_LEGEND -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(DIVE) - .2byte EC_WORD_LEFT - .2byte EC_WORD_ME - .2byte EC_WORD_COLD - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Alondra - -@ 97 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F - .string "ADRIANA$", 8 -@ pre-battle speech - .2byte EC_WORD_COME - .2byte EC_WORD_SEE - .2byte EC_WORD_AN - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_SWIFT_SWIM - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_MAKE - .2byte EC_WORD_IT - .2byte EC_WORD_LOOK - .2byte EC_WORD_SO - .2byte EC_WORD_EASY -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_AND - .2byte EC_WORD_TIRED - .2byte -1 - .4byte gBattleFrontierTrainerMons_Adriana - -@ 98 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M - .string "MALIK$", 8 -@ pre-battle speech - .2byte EC_WORD_OH - .2byte EC_WORD_NOT - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_BATTLE - .2byte EC_WORD_PLEASE - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_FINALLY - .2byte EC_WORD_WON - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_I_AM - .2byte EC_WORD_TIRED -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_FINALLY - .2byte EC_WORD_LOST - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_I_AM - .2byte EC_WORD_TIRED - .4byte gBattleFrontierTrainerMons_Malik - -@ 99 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F - .string "JILL$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_THE - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_WORD_TRAINER - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_THE - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_WORD_TRAINER - .2byte EC_WORD_WINS - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_THE - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_WORD_TRAINER - .2byte EC_WORD_GIVES - .2byte EC_WORD_UP - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Jill - -@ 100 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M - .string "ERIK$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_THE - .2byte EC_WORD_SPEED_BOOST - .2byte EC_WORD_HERO - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_FROM - .2byte EC_WORD_THE - .2byte EC_WORD_SPEED_BOOST - .2byte EC_WORD_HERO - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_WAAAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_NO - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL_EXCL - .4byte gBattleFrontierTrainerMons_Erik - -@ 101 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F - .string "YAZMIN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WOULD - .2byte EC_WORD_RATHER - .2byte EC_WORD_RUN - .2byte EC_WORD_THAN - .2byte EC_WORD_BIKE -@ win speech - .2byte EC_WORD_YES - .2byte EC_WORD_I - .2byte EC_WORD_WOULD - .2byte EC_WORD_MUCH - .2byte EC_WORD_RATHER - .2byte EC_WORD_RUN -@ loss speech - .2byte EC_WORD_BYE_BYE - .2byte EC_WORD_EXCL - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_RUN_AWAY - .4byte gBattleFrontierTrainerMons_Yazmin - -@ 102 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M - .string "JAMAL$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_BE - .2byte EC_WORD_A - .2byte EC_WORD_FATHER -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_WAIT - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_BABY -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_BABY - .2byte EC_WORD_WILL - .2byte EC_WORD_BE - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_AWESOME - .4byte gBattleFrontierTrainerMons_Jamal - -@ 103 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F - .string "LESLIE$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_BE - .2byte EC_WORD_A - .2byte EC_WORD_MOTHER -@ win speech - .2byte EC_WORD_A - .2byte EC_WORD_BABY - .2byte EC_WORD_WILL - .2byte EC_WORD_BE - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_CHALLENGE -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_TOO - .2byte EC_WORD_HAPPY - .2byte EC_WORD_TO - .2byte EC_WORD_BE - .2byte EC_WORD_ANGRY - .4byte gBattleFrontierTrainerMons_Leslie - -@ 104 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M - .string "DAVE$", 8 -@ pre-battle speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_SHOULD - .2byte EC_WORD_I - .2byte EC_WORD_DO - .2byte EC_WORD_TODAY - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_SHOULD - .2byte EC_WORD_ENJOY - .2byte EC_WORD_SOME - .2byte EC_WORD_SPORTS - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_GO - .2byte EC_WORD_PLAY - .2byte EC_WORD_A - .2byte EC_WORD_GAME - .4byte gBattleFrontierTrainerMons_Dave - -@ 105 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M - .string "CARLO$", 8 -@ pre-battle speech - .2byte EC_WORD_HAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_YEAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_DO - .2byte EC_WORD_THINGS - .2byte EC_WORD_AT - .2byte EC_MOVE(EXTREME_SPEED) - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_LOST - .2byte EC_WORD_AT - .2byte EC_MOVE(EXTREME_SPEED) - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Carlo - -@ 106 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F - .string "EMILIA$", 8 -@ pre-battle speech - .2byte EC_WORD_ME - .2byte EC_WORD_WORRY - .2byte EC_WORD_QUES - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_NONE -@ win speech - .2byte EC_WORD_AHAHA - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_AHAHA - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_ENTERTAINING - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Emilia - -@ 107 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F - .string "DALIA$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_BIKE - .2byte EC_WORD_IS - .2byte EC_WORD_VERY - .2byte EC_WORD_EXPENSIVE - .2byte -1 -@ win speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_COME - .2byte EC_WORD_NEAR - .2byte EC_WORD_MY - .2byte EC_WORD_BIKE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_BIKE - .2byte EC_WORD_IS - .2byte EC_WORD_MY - .2byte EC_WORD_BEST - .2byte EC_WORD_FRIEND - .4byte gBattleFrontierTrainerMons_Dalia - -@ 108 - .4byte FACILITY_CLASS_BLACK_BELT - .string "HITOMI$", 8 -@ pre-battle speech - .2byte EC_WORD_YEAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_HAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_QUES_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_QUES_EXCL -@ loss speech - .2byte EC_WORD_AIYEEH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_SORRY - .2byte EC_WORD_EXCL_EXCL - .4byte gBattleFrontierTrainerMons_Hitomi - -@ 109 - .4byte FACILITY_CLASS_BLACK_BELT - .string "RICARDO$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_ON - .2byte EC_WORD_EXCL - .2byte EC_WORD_PLAY - .2byte EC_WORD_TIME - .2byte EC_WORD_IS - .2byte EC_WORD_OVER -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_OUT - .2byte EC_WORD_OF - .2byte EC_WORD_HERE - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_DON_T - .2byte EC_WORD_HIT - .2byte EC_WORD_ME - .2byte EC_WORD_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Ricardo - -@ 110 - .4byte FACILITY_CLASS_BLACK_BELT - .string "SHIZUKA$", 8 -@ pre-battle speech - .2byte EC_WORD_SHOW - .2byte EC_WORD_ME - .2byte EC_WORD_THAT - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WON_T - .2byte EC_WORD_FORGET - .2byte EC_WORD_ABOUT - .2byte EC_WORD_YOU - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_PERFECT - .2byte EC_WORD_IN - .2byte EC_WORD_EVERY - .2byte EC_WORD_WAY - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Shizuka - -@ 111 - .4byte FACILITY_CLASS_BATTLE_GIRL - .string "JOANA$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_LOSE - .2byte EC_WORD_RIGHT - .2byte EC_WORD_AWAY -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_THE - .2byte EC_WORD_WINNER - .2byte EC_WORD_HEAR - .2byte EC_WORD_ME - .2byte EC_MOVE2(ROAR) -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_REFUSE - .2byte EC_WORD_TO - .2byte EC_WORD_ACCEPT - .2byte EC_WORD_THAT - .2byte EC_MOVE(OUTRAGE) - .4byte gBattleFrontierTrainerMons_Joana - -@ 112 - .4byte FACILITY_CLASS_BATTLE_GIRL - .string "KELLY$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_NIGHT - .2byte EC_WORD_SCHOOL - .2byte EC_WORD_IS - .2byte EC_WORD_REALLY - .2byte EC_WORD_SCARY -@ win speech - .2byte EC_WORD_A - .2byte EC_WORD_LADY - .2byte EC_WORD_GHOST - .2byte EC_WORD_APPEARS - .2byte EC_WORD_THERE - .2byte -1 -@ loss speech - .2byte EC_WORD_THE - .2byte EC_WORD_HOME - .2byte EC_WORD_WORK - .2byte EC_WORD_IS - .2byte EC_WORD_AWFULLY - .2byte EC_WORD_SCARY - .4byte gBattleFrontierTrainerMons_Kelly - -@ 113 - .4byte FACILITY_CLASS_BATTLE_GIRL - .string "RAYNA$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NO_1 - .2byte EC_WORD_WHEN - .2byte EC_WORD_IT_S - .2byte EC_WORD_ABOUT - .2byte EC_WORD_POWER -@ win speech - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_MY - .2byte EC_WORD_POWER - .2byte EC_WORD_NOW - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Rayna - -@ 114 - .4byte FACILITY_CLASS_EXPERT_M - .string "EVAN$", 8 -@ pre-battle speech - .2byte EC_WORD_EVERY - .2byte EC_WORD_BATTLE - .2byte EC_WORD_HAS - .2byte EC_WORD_A - .2byte EC_WORD_SMELL - .2byte -1 -@ win speech - .2byte EC_WORD_OH - .2byte EC_WORD_EXCL - .2byte EC_WORD_THE - .2byte EC_MOVE(SWEET_SCENT) - .2byte EC_WORD_OF - .2byte EC_WORD_VICTORY -@ loss speech - .2byte EC_WORD_THE - .2byte EC_WORD_AWFUL - .2byte EC_WORD_STENCH - .2byte EC_WORD_OF - .2byte EC_WORD_A - .2byte EC_WORD_LOSS - .4byte gBattleFrontierTrainerMons_Evan - -@ 115 - .4byte FACILITY_CLASS_EXPERT_M - .string "JORDAN$", 8 -@ pre-battle speech - .2byte EC_WORD_GOOD - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_COME_ON - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T - .2byte EC_WORD_BEAT - .2byte EC_WORD_ME - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_QUES_EXCL - .2byte -1 - .2byte EC_WORD_BUT - .2byte EC_WORD_HOW - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Jordan - -@ 116 - .4byte FACILITY_CLASS_EXPERT_M - .string "JOEL$", 8 -@ pre-battle speech - .2byte EC_WORD_FUFUFU - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte -1 - .2byte -1 - .2byte -1 -@ win speech - .2byte EC_WORD_GIGGLE - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte -1 - .2byte -1 - .2byte -1 -@ loss speech - .2byte EC_WORD_HAHAHA - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Joel - -@ 117 - .4byte FACILITY_CLASS_EXPERT_F - .string "KRISTEN$", 8 -@ pre-battle speech - .2byte EC_WORD_HAHAHA - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte EC_WORD_A - .2byte EC_WORD_KID - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_JUST - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_KID - .2byte EC_WORD_AFTER - .2byte EC_WORD_ALL - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_A - .2byte EC_WORD_TOUGH - .2byte EC_WORD_KID - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_HUMPH - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Kristen - -@ 118 - .4byte FACILITY_CLASS_EXPERT_F - .string "SELPHY$", 8 -@ pre-battle speech - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_WHAT - .2byte EC_WORD_IS_IT_QUES - .2byte -1 - .2byte -1 - .2byte -1 -@ win speech - .2byte EC_WORD_OH - .2byte EC_WORD_YES - .2byte EC_WORD_EXCL - .2byte EC_WORD_WHY - .2byte EC_WORD_NOT - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL - .2byte EC_WORD_WHY - .2byte EC_WORD_NOT - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Selphy - -@ 119 - .4byte FACILITY_CLASS_EXPERT_F - .string "CHLOE$", 8 -@ pre-battle speech - .2byte EC_WORD_COME - .2byte EC_WORD_WE - .2byte EC_WORD_WILL - .2byte EC_WORD_DO - .2byte EC_WORD_BATTLE - .2byte EC_WORD_NOW -@ win speech - .2byte EC_WORD_MORE - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_BATTLE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_STRONG - .2byte EC_WORD_YOU - .2byte EC_WORD_ARE - .4byte gBattleFrontierTrainerMons_Chloe - -@ 120 - .4byte FACILITY_CLASS_PSYCHIC_M - .string "NORTON$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_KNOW - .2byte EC_WORD_ONLY - .2byte EC_WORD_YOU - .2byte -1 - .2byte -1 -@ win speech - .2byte EC_WORD_EXCUSE_ME - .2byte EC_WORD_BUT - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_A - .2byte EC_WORD_PUSHOVER - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_SOME - .2byte EC_WORD_KIND - .2byte EC_WORD_OF - .2byte EC_WORD_AWESOME - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Norton - -@ 121 - .4byte FACILITY_CLASS_PSYCHIC_M - .string "LUKAS$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_JOKING - .2byte EC_WORD_IS - .2byte EC_WORD_PRETTY - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_ROCK_HEAD - .2byte EC_WORD_EXISTS - .2byte EC_WORD_TO - .2byte EC_WORD_SHINE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_ROCK_HEAD - .2byte EC_WORD_COME - .2byte EC_WORD_TO - .2byte EC_WORD_SHINE - .2byte -1 - .4byte gBattleFrontierTrainerMons_Lukas - -@ 122 - .4byte FACILITY_CLASS_PSYCHIC_M - .string "ZACH$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_AN - .2byte EC_WORD_EXCELLENT - .2byte EC_MOVE2(MIMIC) - .2byte EC_WORD_OF - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_HAPPY - .2byte EC_WORD_LIKE - .2byte EC_WORD_A_LITTLE - .2byte EC_POKEMON2(TOGEPI) - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_ANGRY - .2byte EC_WORD_LIKE - .2byte EC_WORD_A - .2byte EC_POKEMON2(MANKEY) - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Zach - -@ 123 - .4byte FACILITY_CLASS_PSYCHIC_F - .string "KAITLYN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_CRUSH - .2byte EC_WORD_THINGS - .2byte EC_WORD_WITH - .2byte EC_WORD_PSYCHIC - .2byte EC_WORD_POWER -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_VICTORY - .2byte EC_WORD_WILL - .2byte EC_WORD_MAKE - .2byte EC_WORD_THE - .2byte EC_WORD_NEWS -@ loss speech - .2byte EC_WORD_NO - .2byte EC_WORD_NO - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_THIS - .2byte EC_WORD_WON_T - .2byte EC_WORD_DO - .4byte gBattleFrontierTrainerMons_Kaitlyn - -@ 124 - .4byte FACILITY_CLASS_PSYCHIC_F - .string "BREANNA$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_WILL - .2byte EC_WORD_CRUSH - .2byte EC_WORD_YOU - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_HAVE - .2byte EC_WORD_SOME - .2byte EC_WORD_MORE - .2byte EC_WORD_OF - .2byte EC_WORD_THIS - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_GUTS - .2byte EC_WORD_AND - .2byte EC_WORD_SKILL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Breanna - -@ 125 - .4byte FACILITY_CLASS_PSYCHIC_F - .string "KENDRA$", 8 -@ pre-battle speech - .2byte EC_WORD_IF - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_SMART - .2byte EC_WORD_STOP - .2byte EC_WORD_RIGHT - .2byte EC_WORD_NOW -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_SAID - .2byte EC_WORD_THAT - .2byte EC_WORD_YOU - .2byte EC_WORD_SHOULD - .2byte EC_WORD_STOP -@ loss speech - .2byte EC_WORD_WHY - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_YOU - .2byte EC_WORD_STOP - .2byte EC_WORD_QUES - .2byte -1 - .4byte gBattleFrontierTrainerMons_Kendra - -@ 126 - .4byte FACILITY_CLASS_HEX_MANIAC - .string "MOLLY$", 8 -@ pre-battle speech - .2byte EC_WORD_WILL - .2byte EC_WORD_MY - .2byte EC_WORD_CUTE_CHARM - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_MY - .2byte EC_WORD_TOYS - .2byte EC_WORD_NOW -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_HOW - .2byte EC_WORD_COULD - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES - .2byte -1 - .4byte gBattleFrontierTrainerMons_Molly - -@ 127 - .4byte FACILITY_CLASS_HEX_MANIAC - .string "JAZMIN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_FORECAST - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_THINGS - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU -@ win speech - .2byte EC_WORD_THERE - .2byte EC_WORD_WASN_T - .2byte EC_WORD_MY - .2byte EC_WORD_FORECAST - .2byte EC_WORD_RIGHT - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_SHOW - .2byte EC_WORD_ME - .2byte EC_WORD_THIS - .4byte gBattleFrontierTrainerMons_Jazmin - -@ 128 - .4byte FACILITY_CLASS_HEX_MANIAC - .string "KELSEY$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVEN_T - .2byte EC_WORD_SLEPT - .2byte EC_WORD_IN - .2byte EC_WORD_DAYS - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_SLEEP - .2byte EC_WORD_WILL - .2byte EC_WORD_BE - .2byte EC_WORD_EXCELLENT - .2byte EC_WORD_NOW -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_DESTROYED - .2byte EC_WORD_MY - .2byte EC_WORD_SLEEP - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Kelsey - -@ 129 - .4byte FACILITY_CLASS_POKEMANIAC - .string "JALEN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_ALLOW - .2byte EC_WORD_POKEMON - .2byte EC_WORD_TO - .2byte EC_MOVE(THRASH) -@ win speech - .2byte EC_WORD_HAHAHA - .2byte EC_WORD_EXCL - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_ANGRY - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_WHY - .2byte EC_WORD_IS - .2byte EC_WORD_THIS - .2byte EC_WORD_SO - .2byte EC_WORD_HARD - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Jalen - -@ 130 - .4byte FACILITY_CLASS_POKEMANIAC - .string "GRIFFEN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_MOVE2(SWALLOW) - .2byte EC_MOVE2(SLUDGE) - .2byte EC_WORD_TO - .2byte EC_MOVE2(TRANSFORM) - .2byte EC_WORD_MYSELF -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_MOVE(GROWTH) - .2byte EC_WORD_OF - .2byte EC_MOVE2(ACID_ARMOR) -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_MOVE(GROWTH) - .2byte EC_WORD_OF - .2byte EC_WORD_SUCTION_CUPS - .4byte gBattleFrontierTrainerMons_Griffen - -@ 131 - .4byte FACILITY_CLASS_POKEMANIAC - .string "XANDER$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_GOT - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ON - .2byte EC_WORD_RENTAL -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_MY - .2byte EC_WORD_RENTAL - .2byte EC_WORD_POKEMON - .2byte EC_WORD_WON -@ loss speech - .2byte EC_WORD_RENTAL - .2byte EC_WORD_POKEMON - .2byte EC_WORD_AREN_T - .2byte EC_WORD_UP - .2byte EC_WORD_TO - .2byte EC_MOVE2(SCRATCH) - .4byte gBattleFrontierTrainerMons_Xander - -@ 132 - .4byte FACILITY_CLASS_GENTLEMAN - .string "MARVIN$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_UP - .2byte EC_WORD_TO - .2byte EC_WORD_THE - .2byte EC_WORD_CHALLENGE - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_THINK - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_GOOD - .2byte EC_WORD_ENOUGH -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_PERFECT - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_SO - .2byte EC_WORD_MUCH - .4byte gBattleFrontierTrainerMons_Marvin - -@ 133 - .4byte FACILITY_CLASS_GENTLEMAN - .string "BRENNAN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_MOVE2(WISH) - .2byte EC_WORD_TO - .2byte EC_WORD_SEE - .2byte EC_WORD_THE - .2byte EC_WORD_NEWS -@ win speech - .2byte EC_WORD_COMICS - .2byte EC_WORD_GET - .2byte EC_WORD_DAMP - .2byte EC_WORD_FROM - .2byte EC_WORD_DRIZZLE - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_THE - .2byte EC_WORD_TIGHT - .2byte EC_WORD_MONEY - .2byte EC_WORD_LIVING - .2byte EC_WORD_CHANNEL - .2byte EC_WORD_QUES_EXCL - .4byte gBattleFrontierTrainerMons_Brennan - -@ 134 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "BALEY$", 8 -@ pre-battle speech - .2byte EC_MOVE(SCREECH) - .2byte EC_WORD_IS - .2byte EC_WORD_LIKE - .2byte EC_WORD_MUSIC - .2byte EC_WORD_TO_ME - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_MY - .2byte EC_MOVE(SCREECH) - .2byte EC_WORD_STRATEGY - .2byte EC_WORD_IS - .2byte EC_WORD_THE - .2byte EC_WORD_BEST -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_SOUNDPROOF - .2byte EC_WORD_QUES - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Baley - -@ 135 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "ZACKARY$", 8 -@ pre-battle speech - .2byte EC_WORD_CAN - .2byte EC_WORD_YOU - .2byte EC_MOVE(DIG) - .2byte EC_WORD_IT - .2byte EC_WORD_YO - .2byte EC_WORD_QUES -@ win speech - .2byte EC_MOVE2(TAKE_DOWN) - .2byte EC_WORD_TAKE - .2byte EC_WORD_A - .2byte EC_MOVE2(DIVE) - .2byte EC_WORD_YO - .2byte EC_WORD_YO -@ loss speech - .2byte EC_WORD_BREAK - .2byte EC_WORD_DOWN - .2byte EC_MOVE2(DIVE) - .2byte EC_WORD_TIME - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .4byte gBattleFrontierTrainerMons_Zackary - -@ 136 - .4byte FACILITY_CLASS_COLLECTOR - .string "GABRIEL$", 8 -@ pre-battle speech - .2byte EC_MOVE2(POUND) - .2byte EC_WORD_THE - .2byte EC_WORD_THICK_FAT - .2byte EC_WORD_ON - .2byte EC_WORD_MY - .2byte EC_MOVE2(BELLY_DRUM) -@ win speech - .2byte EC_MOVE2(POUND) - .2byte EC_WORD_MY - .2byte EC_MOVE2(BELLY_DRUM) - .2byte EC_MOVE2(POUND) - .2byte EC_WORD_MY - .2byte EC_MOVE2(BELLY_DRUM) -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(BELLY_DRUM) - .2byte EC_WORD_WAS - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Gabriel - -@ 137 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "EMILY$", 8 -@ pre-battle speech - .2byte EC_WORD_HOW - .2byte EC_WORD_ABOUT - .2byte EC_WORD_A_TINY_BIT - .2byte EC_WORD_OF - .2byte EC_MOVE(HYPNOSIS) - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_MY - .2byte EC_MOVE(HYPNOSIS) - .2byte EC_WORD_STRATEGY - .2byte EC_WORD_WORKS - .2byte EC_WORD_TO - .2byte EC_WORD_PERFECTION -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE(HYPNOSIS) - .2byte EC_WORD_STRATEGY - .2byte EC_WORD_WENT - .2byte EC_WORD_BADLY - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Emily - -@ 138 - .4byte FACILITY_CLASS_BEAUTY - .string "JORDYN$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DON_T - .2byte EC_WORD_KNOW - .2byte EC_WORD_MY - .2byte EC_WORD_SECRET - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_AS - .2byte EC_WORD_I - .2byte EC_WORD_APPEAR - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_BUT - .2byte EC_WORD_HOW - .2byte EC_WORD_DID - .2byte EC_WORD_YOU - .2byte EC_WORD_KNOW - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Jordyn - -@ 139 - .4byte FACILITY_CLASS_AROMA_LADY - .string "SOFIA$", 8 -@ pre-battle speech - .2byte EC_POKEMON(LOUDRED) - .2byte EC_WORD_PROBABLY - .2byte EC_WORD_HAS - .2byte EC_WORD_A - .2byte EC_MOVE(SWEET_SCENT) - .2byte -1 -@ win speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_THE - .2byte EC_WORD_FEELING - .2byte EC_WORD_THAT - .2byte EC_WORD_I - .2byte EC_WORD_GET -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WORK - .2byte EC_WORD_AT - .2byte EC_WORD_THE - .2byte EC_WORD_DEPT_STORE - .2byte -1 - .4byte gBattleFrontierTrainerMons_Sofia - -@ 140 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "BRADEN$", 8 -@ pre-battle speech - .2byte EC_WORD_I_CHOOSE_YOU - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_THIS_IS_IT_EXCL - .2byte -1 - .2byte -1 -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_PRETTY - .2byte EC_WORD_AWESOME - .2byte EC_WORD_ABOUT - .2byte EC_WORD_MYSELF -@ loss speech - .2byte EC_WORD_ALL_RIGHT - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_SURRENDER - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Braden - -@ 141 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "KAYDEN$", 8 -@ pre-battle speech - .2byte EC_WORD_THEY - .2byte EC_WORD_OVERDO - .2byte EC_WORD_THAT - .2byte EC_WORD_GOURMET - .2byte EC_WORD_THING - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_THAT - .2byte EC_WORD_GOURMET - .2byte EC_WORD_THING - .2byte EC_WORD_ISN_T - .2byte EC_WORD_FOR - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_HEY - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_PRETTY - .2byte EC_WORD_TASTY - .2byte -1 - .4byte gBattleFrontierTrainerMons_Kayden - -@ 142 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "COOPER$", 8 -@ pre-battle speech - .2byte EC_WORD_THIS - .2byte EC_WORD_SHOULD - .2byte EC_WORD_ABSOLUTELY - .2byte EC_WORD_BE - .2byte EC_WORD_A - .2byte EC_WORD_PUSHOVER -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_TOO - .2byte EC_WORD_EXCITING - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_SORRY - .2byte EC_WORD_I_AM - .2byte EC_WORD_SORRY - .4byte gBattleFrontierTrainerMons_Cooper - -@ 143 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "JULIA$", 8 -@ pre-battle speech - .2byte EC_WORD_SPIRIT - .2byte EC_WORD_ALONE - .2byte EC_WORD_WON_T - .2byte EC_WORD_MAKE - .2byte EC_WORD_YOU - .2byte EC_WORD_WIN -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SHOULD - .2byte EC_WORD_ACCEPT - .2byte EC_WORD_THIS - .2byte EC_WORD_WITH - .2byte EC_WORD_SERENE_GRACE -@ loss speech - .2byte EC_WORD_FOR_NOW - .2byte EC_WORD_GOOD_BYE - .2byte EC_WORD_BUT - .2byte EC_WORD_IT_S - .2byte EC_WORD_NOT - .2byte EC_WORD_OVER - .4byte gBattleFrontierTrainerMons_Julia - -@ 144 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "AMARA$", 8 -@ pre-battle speech - .2byte EC_WORD_WROOOAAR_EXCL - .2byte EC_WORD_EXCL_EXCL - .2byte EC_WORD_I_AM - .2byte EC_WORD_SO - .2byte EC_WORD_READY - .2byte EC_WORD_EXCL_EXCL -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_LOSE - .2byte EC_WORD_MYSELF - .2byte EC_WORD_IF - .2byte EC_WORD_IT_S - .2byte EC_WORD_EXCITING -@ loss speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH - .2byte EC_WORD_TO - .2byte EC_MOVE2(TACKLE) - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Amara - -@ 145 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "LYNN$", 8 -@ pre-battle speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_SECRET - .2byte EC_WORD_CAN_T - .2byte EC_WORD_BE - .2byte EC_WORD_HIDDEN - .2byte EC_WORD_FOREVER -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_KNOW - .2byte EC_WORD_YOUR - .2byte EC_WORD_SECRET - .2byte EC_WORD_NOW - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T - .2byte EC_MOVE(SAFEGUARD) - .2byte EC_WORD_YOUR - .2byte EC_WORD_OWN - .2byte EC_WORD_SECRET - .4byte gBattleFrontierTrainerMons_Lynn - -@ 146 - .4byte FACILITY_CLASS_PKMN_RANGER_M - .string "JOVAN$", 8 -@ pre-battle speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_BATTLE - .2byte EC_WORD_SENSE - .2byte EC_WORD_IS - .2byte EC_WORD_SADLY - .2byte EC_WORD_LACKING -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_BATTLE - .2byte EC_WORD_SENSE - .2byte EC_WORD_IS - .2byte EC_WORD_COOL - .2byte EC_WORD_ISN_T_IT_QUES -@ loss speech - .2byte EC_WORD_I_WAS - .2byte EC_WORD_MINUS - .2byte EC_WORD_MY - .2byte EC_WORD_NORMAL - .2byte EC_WORD_POWER - .2byte EC_WORD_TODAY - .4byte gBattleFrontierTrainerMons_Jovan - -@ 147 - .4byte FACILITY_CLASS_PKMN_RANGER_M - .string "DOMINIC$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_THIS - .2byte EC_WORD_EXCELLENT - .2byte EC_WORD_CAMERA - .2byte -1 -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_CAMERA - .2byte EC_WORD_WAS - .2byte EC_WORD_AWFULLY - .2byte EC_WORD_EXPENSIVE - .2byte -1 -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_CAMERA - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_MISS - .2byte EC_WORD_A - .2byte EC_WORD_THING - .4byte gBattleFrontierTrainerMons_Dominic - -@ 148 - .4byte FACILITY_CLASS_PKMN_RANGER_M - .string "NIKOLAS$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_MOVE2(MIMIC) - .2byte EC_WORD_POKEMON - .2byte EC_WORD_AFTER - .2byte EC_WORD_EVERY - .2byte EC_WORD_BATTLE -@ win speech - .2byte EC_WORD_IF_I_WIN - .2byte EC_WORD_I - .2byte EC_WORD_PRETEND - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_POKEMON2(TAUROS) -@ loss speech - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_I - .2byte EC_WORD_PRETEND - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_POKEMON2(MILTANK) - .4byte gBattleFrontierTrainerMons_Nikolas - -@ 149 - .4byte FACILITY_CLASS_PKMN_RANGER_F - .string "VALERIA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_MOVE2(WISH) - .2byte EC_WORD_YOU - .2byte EC_WORD_WOULD - .2byte EC_WORD_NOT - .2byte EC_MOVE2(GLARE) -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MEAN - .2byte EC_WORD_EXCL - .2byte EC_WORD_I - .2byte EC_WORD_MEAN - .2byte EC_WORD_REALLY -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_WORD_REALLY - .2byte EC_MOVE(SCARY_FACE) - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Valeria - -@ 150 - .4byte FACILITY_CLASS_PKMN_RANGER_F - .string "DELANEY$", 8 -@ pre-battle speech - .2byte EC_WORD_SCHOOL - .2byte EC_WORD_IS - .2byte EC_WORD_OVER - .2byte EC_WORD_TIME - .2byte EC_WORD_TO - .2byte EC_WORD_PLAY -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_BOY - .2byte EC_WORD_FRIEND - .2byte EC_WORD_IS - .2byte EC_WORD_FROM - .2byte EC_WORD_SCHOOL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_TO - .2byte EC_WORD_WORK - .2byte EC_WORD_NEXT - .2byte EC_WORD_WEEK - .4byte gBattleFrontierTrainerMons_Delaney - -@ 151 - .4byte FACILITY_CLASS_PKMN_RANGER_F - .string "MEGHAN$", 8 -@ pre-battle speech - .2byte EC_WORD_SCHOOL - .2byte EC_WORD_IS - .2byte EC_WORD_OUT - .2byte EC_WORD_TIME - .2byte EC_WORD_TO - .2byte EC_WORD_PLAY -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_BOY - .2byte EC_WORD_FRIEND - .2byte EC_WORD_LIKES - .2byte EC_WORD_COMICS - .2byte -1 -@ loss speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_BACK - .2byte EC_WORD_TO - .2byte EC_WORD_SCHOOL - .2byte EC_WORD_SOON - .2byte -1 - .4byte gBattleFrontierTrainerMons_Meghan - -@ 152 - .4byte FACILITY_CLASS_DRAGON_TAMER - .string "ROBERTO$", 8 -@ pre-battle speech - .2byte EC_WORD_DRAGON - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_WEREN_T - .2byte EC_WORD_BAD - .2byte EC_WORD_I_WAS - .2byte EC_WORD_JUST - .2byte EC_WORD_BETTER -@ loss speech - .2byte EC_WORD_AREN_T - .2byte EC_WORD_YOU - .2byte EC_WORD_SATISFIED - .2byte EC_WORD_YET - .2byte EC_WORD_QUES - .2byte -1 - .4byte gBattleFrontierTrainerMons_Roberto - -@ 153 - .4byte FACILITY_CLASS_DRAGON_TAMER - .string "DAMIAN$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_PURE_POWER - .2byte EC_WORD_IS - .2byte EC_WORD_MACHINE - .2byte EC_WORD_LIKE - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(MACH_PUNCH) - .2byte EC_WORD_WILL - .2byte EC_WORD_MAKE - .2byte EC_WORD_A - .2byte EC_MOVE(BRICK_BREAK) -@ loss speech - .2byte EC_WORD_ARRGH - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Damian - -@ 154 - .4byte FACILITY_CLASS_DRAGON_TAMER - .string "BRODY$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_FASHION - .2byte EC_WORD_SENSE - .2byte EC_WORD_SEEMS - .2byte EC_POKEMON(ODDISH) - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_MY - .2byte EC_WORD_FAMILY - .2byte EC_WORD_STAY_AT_HOME - .2byte EC_WORD_LOOK - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_QUESTION - .2byte EC_WORD_YOUR - .2byte EC_WORD_FASHION - .2byte EC_WORD_SENSE - .2byte EC_WORD_SERIOUSLY - .4byte gBattleFrontierTrainerMons_Brody - -@ 155 - .4byte FACILITY_CLASS_DRAGON_TAMER - .string "GRAHAM$", 8 -@ pre-battle speech - .2byte EC_WORD_YEAH - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_YEAH_YEAH - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_EXCL - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_EXCL_EXCL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SORRY - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_IT_S - .2byte EC_WORD_MY - .2byte EC_WORD_BAD - .4byte gBattleFrontierTrainerMons_Graham - -@ 156 - .4byte FACILITY_CLASS_POKEFAN_M - .string "TYLOR$", 8 -@ pre-battle speech - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_FEELING - .2byte EC_WORD_MY - .2byte EC_MOVE2(HEAT_WAVE) - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YES - .2byte EC_WORD_I_AM - .2byte EC_WORD_ON - .2byte EC_WORD_FIRE - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_BUT - .2byte EC_WORD_I_WAS - .2byte EC_WORD_ON - .2byte EC_WORD_FIRE - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU - .4byte gBattleFrontierTrainerMons_Tylor - -@ 157 - .4byte FACILITY_CLASS_POKEFAN_F - .string "JAREN$", 8 -@ pre-battle speech - .2byte EC_WORD_FIGHTING - .2byte EC_WORD_SPIRIT - .2byte EC_WORD_QUES - .2byte EC_WORD_ME - .2byte EC_WORD_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_MORE - .2byte EC_WORD_CUTE - .2byte EC_WORD_POKEMON - .2byte -1 -@ loss speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_LOOK - .2byte EC_WORD_QUITE - .2byte EC_WORD_CUTE - .2byte -1 - .4byte gBattleFrontierTrainerMons_Jaren - -@ 158 - .4byte FACILITY_CLASS_PKMN_BREEDER_M - .string "CORDELL$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_BATTLE - .2byte EC_WORD_IS - .2byte EC_WORD_DECIDED - .2byte EC_WORD_ON - .2byte EC_WORD_SPIRIT -@ win speech - .2byte EC_WORD_CAN_T - .2byte EC_WORD_YOU - .2byte EC_WORD_ACCEPT - .2byte EC_WORD_THAT - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_BE - .2byte EC_WORD_ON - .2byte EC_WORD_MY - .2byte EC_WORD_WAY - .4byte gBattleFrontierTrainerMons_Cordell - -@ 159 - .4byte FACILITY_CLASS_POKEMON_BREEDER_F - .string "JAZLYN$", 8 -@ pre-battle speech - .2byte EC_WORD_IS - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_REALLY - .2byte EC_WORD_AWESOME - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_WOW - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_IS - .2byte EC_WORD_SUPER -@ loss speech - .2byte EC_WORD_AN - .2byte EC_WORD_AVANT_GARDE - .2byte EC_WORD_POKEDEX - .2byte EC_WORD_WOULD - .2byte EC_WORD_BE - .2byte EC_WORD_AWESOME - .4byte gBattleFrontierTrainerMons_Jazlyn - -@ 160 - .4byte FACILITY_CLASS_YOUNGSTER - .string "ZACHERY$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_MY - .2byte EC_WORD_OWN - .2byte EC_WORD_PLACE - .2byte EC_WORD_YEEHAW_EXCL -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_AN - .2byte EC_WORD_EXCITING - .2byte EC_WORD_TIME - .2byte EC_WORD_FOR - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T - .2byte EC_WORD_FLATTEN - .2byte EC_WORD_MY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Zachery - -@ 161 - .4byte FACILITY_CLASS_YOUNGSTER - .string "JOHAN$", 8 -@ pre-battle speech - .2byte EC_WORD_WINTER - .2byte EC_WORD_WILL - .2byte EC_WORD_SOON - .2byte EC_WORD_BE - .2byte EC_WORD_HERE - .2byte -1 -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_ALLOWANCE - .2byte EC_WORD_COULD - .2byte EC_WORD_USE - .2byte EC_WORD_A - .2byte EC_MOVE2(HELPING_HAND) -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_USE - .2byte EC_WORD_MY - .2byte EC_WORD_ALLOWANCE - .2byte EC_WORD_UP - .4byte gBattleFrontierTrainerMons_Johan - -@ 162 - .4byte FACILITY_CLASS_LASS - .string "SHEA$", 8 -@ pre-battle speech - .2byte EC_WORD_DO - .2byte EC_WORD_YOU - .2byte EC_WORD_BATTLE - .2byte EC_WORD_WITH - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_BATTLE - .2byte EC_WORD_IN - .2byte EC_WORD_AN - .2byte EC_WORD_UGLY - .2byte EC_WORD_WAY -@ loss speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_IS - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_TO - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Shea - -@ 163 - .4byte FACILITY_CLASS_LASS - .string "KAILA$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_THIRSTY - .2byte EC_WORD_RIGHT - .2byte EC_WORD_NOW - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_COULD - .2byte EC_WORD_USE - .2byte EC_WORD_A - .2byte EC_WORD_COLD - .2byte EC_WORD_DRINK -@ loss speech - .2byte EC_WORD_THAT - .2byte EC_WORD_LOSS - .2byte EC_WORD_IS - .2byte EC_WORD_HARD - .2byte EC_WORD_TO - .2byte EC_MOVE2(SWALLOW) - .4byte gBattleFrontierTrainerMons_Kaila - -@ 164 - .4byte FACILITY_CLASS_SCHOOL_KID_M - .string "ISIAH$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_PRETEND - .2byte EC_WORD_TO - .2byte EC_WORD_STUDY - .2byte EC_WORD_A_LOT - .2byte -1 -@ win speech - .2byte EC_WORD_I - .2byte EC_MOVE2(TRICK) - .2byte EC_WORD_MOTHER - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_ALLOWANCE -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_STUDY - .2byte EC_WORD_MORE - .4byte gBattleFrontierTrainerMons_Isiah - -@ 165 - .4byte FACILITY_CLASS_SCHOOL_KID_M - .string "GARRETT$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_ENJOY - .2byte EC_WORD_COMICS - .2byte EC_WORD_AND - .2byte EC_WORD_THIS - .2byte EC_WORD_GAME -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_THIS - .2byte EC_WORD_MUSIC - .2byte EC_WORD_IDOL - .2byte EC_WORD_TOO -@ loss speech - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_TO - .2byte EC_WORD_STUDY - .2byte EC_WORD_MORE - .4byte gBattleFrontierTrainerMons_Garrett - -@ 166 - .4byte FACILITY_CLASS_SCHOOL_KID_F - .string "HAYLIE$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WORRY - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH - .2byte EC_WORD_TO - .2byte EC_WORD_SLEEP -@ win speech - .2byte EC_WORD_A - .2byte EC_WORD_WIN - .2byte EC_WORD_GIVES - .2byte EC_WORD_ME - .2byte EC_WORD_A - .2byte EC_MOVE2(CALM_MIND) -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_INSOMNIA - .2byte EC_WORD_WILL - .2byte EC_WORD_GET - .2byte EC_WORD_BAD - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Haylie - -@ 167 - .4byte FACILITY_CLASS_SCHOOL_KID_F - .string "MEGAN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_BELIEVE - .2byte EC_WORD_IN - .2byte EC_WORD_AN - .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_WORD_BATH -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_A - .2byte EC_WORD_HEALTHY - .2byte EC_WORD_CLEAR_BODY - .2byte -1 -@ loss speech - .2byte EC_WORD_IF - .2byte EC_WORD_ONLY - .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_WORD_WERE - .2byte EC_WORD_LESS - .2byte EC_WORD_EXPENSIVE - .4byte gBattleFrontierTrainerMons_Megan - -@ 168 - .4byte FACILITY_CLASS_RICH_BOY - .string "ISSAC$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_HOBBY - .2byte EC_WORD_QUES - .2byte -1 - .2byte -1 - .2byte -1 -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_ANY - .2byte EC_WORD_KIND - .2byte EC_WORD_OF - .2byte EC_MOVE2(WATER_SPORT) -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_ANY - .2byte EC_WORD_KIND - .2byte EC_WORD_OF - .2byte EC_MOVE2(MUD_SPORT) - .4byte gBattleFrontierTrainerMons_Issac - -@ 169 - .4byte FACILITY_CLASS_RICH_BOY - .string "QUINTON$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SAD - .2byte EC_WORD_CAUSE - .2byte EC_WORD_I_AM - .2byte EC_WORD_TOO_WEAK - .2byte -1 -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_AREN_T - .2byte EC_WORD_TOO_STRONG - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .2byte -1 -@ loss speech - .2byte EC_WORD_HEY - .2byte EC_WORD_WHAT - .2byte EC_WORD_DID - .2byte EC_WORD_I - .2byte EC_WORD_DO - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Quinton - -@ 170 - .4byte FACILITY_CLASS_LADY - .string "SALMA$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_GOT - .2byte EC_WORD_YOUR - .2byte EC_WORD_HUSTLE - .2byte EC_WORD_ON - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WIN - .2byte EC_WORD_YOU - .2byte EC_WORD_HUSTLE - .2byte EC_WORD_ON - .2byte EC_WORD_OUT -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_GET - .2byte EC_WORD_HOW - .2byte EC_WORD_I - .2byte EC_WORD_LOST - .4byte gBattleFrontierTrainerMons_Salma - -@ 171 - .4byte FACILITY_CLASS_LADY - .string "ANSLEY$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_BORED - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_DANCE - .2byte EC_WORD_FOR - .2byte EC_WORD_ME -@ win speech - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_BORED - .2byte EC_WORD_ME - .2byte EC_WORD_SOME - .2byte EC_WORD_MORE - .2byte -1 -@ loss speech - .2byte EC_WORD_TAKE - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_SOME - .2byte EC_WORD_OTHER - .2byte EC_WORD_PLACE - .4byte gBattleFrontierTrainerMons_Ansley - -@ 172 - .4byte FACILITY_CLASS_BUG_CATCHER - .string "HOLDEN$", 8 -@ pre-battle speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_COMMEMORATE - .2byte EC_WORD_MY - .2byte EC_WORD_COOLNESS - .2byte EC_WORD_IN - .2byte EC_WORD_BATTLE -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_FOR - .2byte EC_WORD_ANY - .2byte EC_WORD_PRAISE - .2byte -1 -@ loss speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_BATTLE - .2byte EC_WORD_SENSE - .2byte EC_WORD_IS - .2byte EC_WORD_AMUSING - .2byte -1 - .4byte gBattleFrontierTrainerMons_Holden - -@ 173 - .4byte FACILITY_CLASS_BUG_CATCHER - .string "LUCA$", 8 -@ pre-battle speech - .2byte EC_WORD_WE - .2byte EC_WORD_WILL - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_WORD_COOL - .2byte EC_WORD_BATTLE -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_IN - .2byte EC_WORD_A - .2byte EC_WORD_COOL - .2byte EC_WORD_WAY -@ loss speech - .2byte EC_WORD_HELLO - .2byte EC_WORD_QUES - .2byte EC_WORD_I_AM - .2byte EC_WORD_JUST - .2byte EC_WORD_A - .2byte EC_WORD_KID - .4byte gBattleFrontierTrainerMons_Luca - -@ 174 - .4byte FACILITY_CLASS_NINJA_BOY - .string "JAMISON$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_WORD_IS - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_TO - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_DID - .2byte EC_WORD_YOU - .2byte EC_WORD_SEE - .2byte EC_WORD_THAT - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_USE - .2byte EC_MOVE(SMOKESCREEN) - .2byte EC_WORD_TO - .2byte EC_WORD_ESCAPE - .4byte gBattleFrontierTrainerMons_Jamison - -@ 175 - .4byte FACILITY_CLASS_NINJA_BOY - .string "GUNNAR$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_MOVE(CUT) - .2byte EC_WORD_DOWN - .2byte EC_WORD_EVERY - .2byte EC_WORD_OPPONENT - .2byte -1 -@ win speech - .2byte EC_WORD_DON_T - .2byte EC_MOVE(GRUDGE) - .2byte EC_WORD_ME - .2byte EC_WORD_FOR - .2byte EC_WORD_YOUR - .2byte EC_WORD_LOSS -@ loss speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_LOSE - .2byte EC_WORD_THAT - .2byte EC_MOVE(SCARY_FACE) - .2byte EC_WORD_OF - .2byte EC_WORD_YOURS - .4byte gBattleFrontierTrainerMons_Gunnar - -@ 176 - .4byte FACILITY_CLASS_TUBER_M - .string "CRAIG$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_WAIT - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_TRAIN -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_TRAIN - .2byte EC_WORD_ISN_T - .2byte EC_WORD_HERE - .2byte EC_WORD_YET - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_MY - .2byte EC_WORD_TRAIN - .2byte EC_WORD_SEE_YA - .2byte EC_WORD_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Craig - -@ 177 - .4byte FACILITY_CLASS_TUBER_M - .string "PIERCE$", 8 -@ pre-battle speech - .2byte EC_WORD_THERE - .2byte EC_WORD_WAS - .2byte EC_WORD_A - .2byte EC_MOVE2(HEAT_WAVE) - .2byte EC_WORD_LAST - .2byte EC_WORD_WEEK -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_TAKE - .2byte EC_WORD_A - .2byte EC_MOVE2(HEAT_WAVE) - .2byte -1 -@ loss speech - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_IT - .2byte EC_MOVE(HAIL) - .2byte EC_WORD_TOO - .2byte EC_WORD_QUES - .2byte -1 - .4byte gBattleFrontierTrainerMons_Pierce - -@ 178 - .4byte FACILITY_CLASS_TUBER_F - .string "REGINA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_TO - .2byte EC_WORD_PLAY - .2byte EC_WORD_IN - .2byte EC_WORD_WATER -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_REFUSE - .2byte EC_WORD_TO - .2byte EC_WORD_COME - .2byte EC_WORD_OUT - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_NOT - .2byte EC_WORD_MUCH - .2byte EC_WORD_GOOD - .2byte EC_WORD_IN - .2byte EC_WORD_WATER - .4byte gBattleFrontierTrainerMons_Regina - -@ 179 - .4byte FACILITY_CLASS_TUBER_F - .string "ALISON$", 8 -@ pre-battle speech - .2byte EC_WORD_THIS - .2byte EC_WORD_KINDERGARTEN - .2byte EC_WORD_MAGAZINE - .2byte EC_WORD_IS - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH -@ win speech - .2byte EC_WORD_HOW - .2byte EC_WORD_TO - .2byte EC_WORD_BUG - .2byte EC_WORD_YOUR - .2byte EC_WORD_TEACHER - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_ENJOY - .2byte EC_WORD_A - .2byte EC_WORD_TASTY - .2byte EC_WORD_SCHOOL - .2byte EC_WORD_DIET - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Alison - -@ 180 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "HANK$", 8 -@ pre-battle speech - .2byte EC_WORD_THERE - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_WORD_BUG - .2byte EC_WORD_EVENT - .2byte EC_WORD_SOON -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_BUG - .2byte EC_WORD_FASHION - .2byte EC_WORD_SHOW - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_YOU - .2byte EC_WORD_LIKE - .2byte EC_WORD_BUG - .2byte EC_WORD_POKEMON - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Hank - -@ 181 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "EARL$", 8 -@ pre-battle speech - .2byte EC_WORD_THE - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_BUG - .2byte EC_WORD_TRAINER - .2byte EC_WORD_IS - .2byte EC_WORD_HERE -@ win speech - .2byte EC_WORD_THE - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_BUG - .2byte EC_WORD_TRAINER - .2byte EC_WORD_AM - .2byte EC_WORD_I -@ loss speech - .2byte EC_WORD_SEE - .2byte EC_WORD_HOW - .2byte EC_WORD_FAST - .2byte EC_WORD_I - .2byte EC_WORD_RUN_AWAY - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Earl - -@ 182 - .4byte FACILITY_CLASS_FISHERMAN - .string "RAMIRO$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WENT - .2byte EC_WORD_TO - .2byte EC_WORD_A - .2byte EC_WORD_FISHING - .2byte EC_WORD_SCHOOL -@ win speech - .2byte EC_WORD_SERIOUSLY - .2byte EC_WORD_I_AM - .2byte EC_WORD_IN - .2byte EC_WORD_THE - .2byte EC_WORD_FISHING - .2byte EC_WORD_HALL_OF_FAME -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_GO - .2byte EC_WORD_BACK - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Ramiro - -@ 183 - .4byte FACILITY_CLASS_FISHERMAN - .string "HUNTER$", 8 -@ pre-battle speech - .2byte EC_WORD_SHOW - .2byte EC_WORD_ME - .2byte EC_WORD_A - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_COOL - .2byte EC_MOVE(CROSS_CHOP) -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_TO - .2byte EC_WORD_DO - .2byte EC_WORD_A - .2byte EC_MOVE(CROSS_CHOP) -@ loss speech - .2byte EC_WORD_WAS - .2byte EC_WORD_IT - .2byte EC_WORD_A - .2byte EC_WORD_MISTAKE - .2byte EC_WORD_QUES - .2byte -1 - .4byte gBattleFrontierTrainerMons_Hunter - -@ 184 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "AIDEN$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_WORK - .2byte EC_WORD_IS - .2byte EC_WORD_MAKING - .2byte EC_WORD_ME - .2byte EC_WORD_HEALTHY -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte EC_WORD_I_AM - .2byte EC_WORD_HEALTHY - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MORE - .2byte EC_WORD_HEALTHY - .2byte EC_WORD_THAN - .2byte EC_WORD_I_AM - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Aiden - -@ 185 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "XAVIER$", 8 -@ pre-battle speech - .2byte EC_WORD_HEY_THERE - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_LOOK - .2byte EC_WORD_LOOK - .2byte EC_WORD_EXCL_EXCL -@ win speech - .2byte EC_WORD_GOOD_BYE - .2byte EC_WORD_AND - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_FUNNY - .2byte -1 -@ loss speech - .2byte EC_WORD_WOWEE - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_NO - .2byte EC_WORD_NO - .2byte EC_WORD_EXCL_EXCL - .4byte gBattleFrontierTrainerMons_Xavier - -@ 186 - .4byte FACILITY_CLASS_COLLECTOR - .string "CLINTON$", 8 -@ pre-battle speech - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_SEE - .2byte EC_WORD_MY - .2byte EC_MOVE(HYPNOSIS) - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_WORD_YOUR - .2byte EC_MOVE(STRENGTH) - .2byte EC_WORD_YOUNG - .2byte EC_WORD_TRAINER -@ loss speech - .2byte EC_WORD_TCH - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Clinton - -@ 187 - .4byte FACILITY_CLASS_COLLECTOR - .string "JESSE$", 8 -@ pre-battle speech - .2byte EC_WORD_THIS - .2byte EC_WORD_BATTLE - .2byte EC_WORD_IS - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_MOTHER -@ win speech - .2byte EC_WORD_MOTHER - .2byte EC_WORD_WILL - .2byte EC_WORD_BE - .2byte EC_WORD_HAPPY - .2byte EC_WORD_FOR - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_MY - .2byte EC_WORD_MOTHER - .2byte EC_WORD_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Jesse - -@ 188 - .4byte FACILITY_CLASS_GUITARIST - .string "EDUARDO$", 8 -@ pre-battle speech - .2byte EC_WORD_OUR - .2byte EC_WORD_MUSIC - .2byte EC_WORD_WILL - .2byte EC_WORD_PLAY - .2byte EC_WORD_ALL - .2byte EC_WORD_NIGHT -@ win speech - .2byte EC_WORD_NIGHTTIME - .2byte EC_WORD_IS - .2byte EC_WORD_WHEN - .2byte EC_WORD_I - .2byte EC_WORD_PLAY - .2byte EC_WORD_BEST -@ loss speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_PARTY - .2byte EC_WORD_UNTIL - .2byte EC_WORD_THE - .2byte EC_MOVE(MORNING_SUN) - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Eduardo - -@ 189 - .4byte FACILITY_CLASS_GUITARIST - .string "HAL$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_TRENDY - .2byte EC_WORD_AREN_T - .2byte EC_WORD_I - .2byte EC_WORD_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_HIP_AND - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_TRENDY - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_VERY - .2byte EC_WORD_MUCH - .4byte gBattleFrontierTrainerMons_Hal - -@ 190 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "GAGE$", 8 -@ pre-battle speech - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_A - .2byte EC_WORD_FLYING - .2byte EC_WORD_TYPE - .2byte EC_WORD_HIDDEN - .2byte EC_WORD_MOVE -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_FLYING - .2byte EC_WORD_TYPE - .2byte EC_WORD_VICTORY - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_I - .2byte EC_WORD_JUST - .2byte EC_MOVE(FLY) - .2byte EC_WORD_AWAY - .2byte -1 - .4byte gBattleFrontierTrainerMons_Gage - -@ 191 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "ARNOLD$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_WEIRD - .2byte EC_WORD_FROM - .2byte EC_WORD_A - .2byte EC_WORD_DREAM -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_MOVE(SCARY_FACE) - .2byte EC_WORD_WAS - .2byte EC_WORD_IN - .2byte EC_WORD_MY - .2byte EC_WORD_DREAM -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_DREAM - .2byte EC_WORD_WAS - .2byte EC_WORD_SO - .2byte EC_WORD_WEIRD - .4byte gBattleFrontierTrainerMons_Arnold - -@ 192 - .4byte FACILITY_CLASS_SAILOR - .string "JARRETT$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_ON - .2byte EC_WORD_LET_S - .2byte EC_WORD_DANCE - .2byte EC_WORD_LIKE - .2byte EC_WORD_IT_S - .2byte EC_WORD_YESTERDAY -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_LIKE - .2byte EC_WORD_HOW - .2byte EC_WORD_I - .2byte EC_WORD_DANCE - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DON_T - .2byte EC_WORD_APPRECIATE - .2byte EC_WORD_HOW - .2byte EC_WORD_I - .2byte EC_WORD_DANCE - .4byte gBattleFrontierTrainerMons_Jarrett - -@ 193 - .4byte FACILITY_CLASS_SAILOR - .string "GARETT$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_GIRL - .2byte EC_WORD_GIVES - .2byte EC_WORD_ME - .2byte EC_WORD_A_LITTLE - .2byte EC_MOVE2(SWEET_KISS) -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_GIRL - .2byte EC_WORD_FRIEND - .2byte EC_WORD_IS - .2byte EC_WORD_MY - .2byte EC_WORD_TREASURE -@ loss speech - .2byte EC_WORD_A - .2byte EC_WORD_TREASURE - .2byte EC_WORD_ISN_T - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_ABOUT - .2byte EC_WORD_MONEY - .4byte gBattleFrontierTrainerMons_Garett - -@ 194 - .4byte FACILITY_CLASS_HIKER - .string "EMANUEL$", 8 -@ pre-battle speech - .2byte EC_WORD_SMARTNESS - .2byte EC_WORD_ALONE - .2byte EC_WORD_WON_T - .2byte EC_WORD_MAKE - .2byte EC_WORD_YOU - .2byte EC_WORD_WIN -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_SMART - .2byte EC_WORD_BUT - .2byte EC_WORD_I - .2byte EC_WORD_WON -@ loss speech - .2byte EC_WORD_HOW - .2byte EC_WORD_DID - .2byte EC_WORD_YOU - .2byte EC_MOVE2(FAKE_OUT) - .2byte EC_WORD_ME - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Emanuel - -@ 195 - .4byte FACILITY_CLASS_HIKER - .string "GUSTAVO$", 8 -@ pre-battle speech - .2byte EC_MOVE(CHARGE) - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_MOVE(CHARGE) - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_SURRENDER - .2byte EC_WORD_QUES - .2byte -1 - .2byte EC_WORD_SO - .2byte EC_WORD_SOON - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T - .2byte EC_WORD_MAKE - .2byte EC_WORD_ME - .2byte EC_WORD_SURRENDER - .2byte EC_WORD_YET - .4byte gBattleFrontierTrainerMons_Gustavo - -@ 196 - .4byte FACILITY_CLASS_KINDLER - .string "KAMERON$", 8 -@ pre-battle speech - .2byte EC_WORD_TAKE_THAT - .2byte EC_WORD_EXCL - .2byte EC_WORD_IT_S - .2byte EC_WORD_MY - .2byte EC_WORD_FIERY - .2byte EC_MOVE2(TRICK) -@ win speech - .2byte EC_WORD_DID - .2byte EC_WORD_MY - .2byte EC_WORD_FIERY - .2byte EC_MOVE2(TRICK) - .2byte EC_MOVE(ASTONISH) - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_FALL - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_MOVE2(TRICK) - .4byte gBattleFrontierTrainerMons_Kameron - -@ 197 - .4byte FACILITY_CLASS_KINDLER - .string "ALFREDO$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_FIERY - .2byte EC_WORD_GOURMET - .2byte EC_WORD_AM - .2byte EC_WORD_I - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_TASTY - .2byte EC_WORD_GOURMET - .2byte EC_WORD_VICTORY - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_A - .2byte EC_WORD_DISASTER - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Alfredo - -@ 198 - .4byte FACILITY_CLASS_GENTLEMAN - .string "RUBEN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_WAIT - .2byte EC_WORD_TO - .2byte EC_WORD_GET - .2byte EC_WORD_GOING -@ win speech - .2byte EC_WORD_GET - .2byte EC_WORD_GOING - .2byte EC_WORD_EXCL - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_GOOD_BYE -@ loss speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_GOT - .2byte EC_WORD_TO - .2byte EC_WORD_GET - .2byte EC_WORD_GOING - .2byte -1 - .4byte gBattleFrontierTrainerMons_Ruben - -@ 199 - .4byte FACILITY_CLASS_GENTLEMAN - .string "LAMAR$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .2byte EC_WORD_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_MMM - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_QUITE - .2byte EC_WORD_TASTY - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_IT_S - .2byte EC_WORD_A - .2byte EC_WORD_GAME - .2byte EC_WORD_IS_IT_QUES - .2byte -1 - .4byte gBattleFrontierTrainerMons_Lamar - -@ 200 - .4byte FACILITY_CLASS_YOUNGSTER - .string "JAXON$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_SHELL_ARMOR - .2byte EC_WORD_IS - .2byte EC_WORD_WHAT - .2byte EC_WORD_I - .2byte EC_WORD_WANT -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_FATHER - .2byte EC_WORD_AND - .2byte EC_WORD_MOTHER - .2byte EC_WORD_WON_T - .2byte EC_WORD_ACCEPT -@ loss speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_A - .2byte EC_WORD_SHELL_ARMOR - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Jaxon - -@ 201 - .4byte FACILITY_CLASS_YOUNGSTER - .string "LOGAN$", 8 -@ pre-battle speech - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_STUDY - .2byte EC_WORD_FOR - .2byte EC_WORD_SCHOOL -@ win speech - .2byte EC_WORD_ME - .2byte EC_WORD_STUDY - .2byte EC_WORD_QUES - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_LIKELY_TO - .2byte EC_WORD_SEE -@ loss speech - .2byte EC_WORD_NO - .2byte EC_WORD_THANKS - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_SLEEP - .4byte gBattleFrontierTrainerMons_Logan - -@ 202 - .4byte FACILITY_CLASS_LASS - .string "EMILEE$", 8 -@ pre-battle speech - .2byte EC_WORD_IS - .2byte EC_WORD_THIS - .2byte EC_WORD_KIND - .2byte EC_WORD_OF - .2byte EC_WORD_BATTLE - .2byte EC_WORD_OK_QUES -@ win speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_GO - .2byte EC_WORD_FOR - .2byte EC_WORD_AN - .2byte EC_MOVE(ICY_WIND) - .2byte EC_MOVE2(SURF) -@ loss speech - .2byte EC_WORD_HOW - .2byte EC_WORD_ABOUT - .2byte EC_WORD_A - .2byte EC_MOVE(ROCK_SLIDE) - .2byte EC_WORD_SHOW - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Emilee - -@ 203 - .4byte FACILITY_CLASS_LASS - .string "JOSIE$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_FASHION - .2byte EC_WORD_CONTEST - .2byte EC_WORD_IS - .2byte EC_WORD_PRETTY -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_REALLY - .2byte EC_WORD_LIKE - .2byte EC_WORD_MODE - .2byte EC_WORD_FASHION - .2byte EC_WORD_THINGS -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_LACKING - .2byte EC_WORD_IN - .2byte EC_WORD_FASHION - .2byte EC_WORD_SENSE - .4byte gBattleFrontierTrainerMons_Josie - -@ 204 - .4byte FACILITY_CLASS_CAMPER - .string "ARMANDO$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_MORE - .2byte EC_WORD_GRASS - .2byte EC_WORD_TYPE - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_TRADE - .2byte EC_WORD_ME - .2byte EC_WORD_A - .2byte EC_WORD_GRASS - .2byte EC_WORD_POKEMON - .2byte EC_WORD_PLEASE -@ loss speech - .2byte EC_WORD_THERE - .2byte EC_WORD_AREN_T - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_GRASS - .2byte EC_WORD_TYPE - .2byte EC_WORD_POKEMON - .4byte gBattleFrontierTrainerMons_Armando - -@ 205 - .4byte FACILITY_CLASS_CAMPER - .string "SKYLER$", 8 -@ pre-battle speech - .2byte EC_MOVE2(INGRAIN) - .2byte EC_WORD_IS - .2byte EC_WORD_MY - .2byte EC_WORD_CHOICE - .2byte EC_WORD_BATTLE - .2byte EC_WORD_MOVE -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T - .2byte EC_WORD_MOVE - .2byte EC_WORD_ME - .2byte EC_WORD_NOW - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_MOVE(CUT) - .2byte EC_WORD_ME - .2byte EC_WORD_DOWN - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Skyler - -@ 206 - .4byte FACILITY_CLASS_PICNICKER - .string "RUTH$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_ENJOY - .2byte EC_WORD_THIS - .2byte EC_WORD_BATTLE -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_MUCH - .2byte EC_WORD_TOO - .2byte EC_WORD_EASY - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_STOP - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_ENJOY - .2byte EC_WORD_THIS - .4byte gBattleFrontierTrainerMons_Ruth - -@ 207 - .4byte FACILITY_CLASS_PICNICKER - .string "MELODY$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_MOVE2(WISH) - .2byte EC_WORD_SUNDAY - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_MOVE2(SUNNY_DAY) -@ win speech - .2byte EC_WORD_SUNDAY - .2byte EC_WORD_SEEMS - .2byte EC_WORD_FOREVER - .2byte EC_WORD_TO - .2byte EC_WORD_COME - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_THE - .2byte EC_WORD_FORECAST - .2byte EC_WORD_SAYS - .2byte EC_WORD_IT - .2byte EC_WORD_WILL - .2byte EC_MOVE(HAIL) - .4byte gBattleFrontierTrainerMons_Melody - -@ 208 - .4byte FACILITY_CLASS_SWIMMER_M - .string "PEDRO$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_SWIFT_SWIM - .2byte EC_WORD_WILL - .2byte EC_WORD_DO - .2byte EC_WORD_YOU - .2byte EC_WORD_GOOD -@ win speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_HOW - .2byte EC_WORD_I - .2byte EC_WORD_SINK - .2byte EC_WORD_AN - .2byte EC_WORD_OPPONENT -@ loss speech - .2byte EC_WORD_UH_OH - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_A - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Pedro - -@ 209 - .4byte FACILITY_CLASS_SWIMMER_M - .string "ERICK$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_MOVE2(TACKLE) - .2byte EC_WORD_YOU - .2byte EC_WORD_DOWN - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_YOU - .2byte EC_WORD_RUN_AWAY - .2byte EC_WORD_YOU - .2byte EC_WORD_LOSER - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_THINK - .2byte EC_WORD_YOU - .2byte EC_WORD_WOULD - .2byte EC_MOVE(COUNTER) - .4byte gBattleFrontierTrainerMons_Erick - -@ 210 - .4byte FACILITY_CLASS_SWIMMER_F - .string "ELAINE$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_HEROINE - .2byte EC_WORD_ADVENTURE - .2byte EC_WORD_ISN_T - .2byte EC_WORD_GOING - .2byte EC_WORD_WELL -@ win speech - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_EXCL - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .2byte EC_WORD_I - .2byte EC_WORD_NEED -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_KNOW - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_A - .2byte EC_WORD_HEROINE - .4byte gBattleFrontierTrainerMons_Elaine - -@ 211 - .4byte FACILITY_CLASS_SWIMMER_F - .string "JOYCE$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_MAKE - .2byte EC_WORD_ME - .2byte EC_WORD_GO - .2byte EC_WORD_AHAHA - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_LALALA - .2byte EC_WORD_NO - .2byte EC_WORD_LOSING - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_LALALA - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte EC_WORD_HUH_QUES - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Joyce - -@ 212 - .4byte FACILITY_CLASS_POKEFAN_M - .string "TODD$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_A - .2byte EC_WORD_LIGHTNINGROD - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_POWER -@ win speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_ALL - .2byte EC_WORD_YOU - .2byte EC_WORD_COULD - .2byte EC_MOVE(ABSORB) - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_MOVE2(REFLECT) - .2byte EC_WORD_MY - .2byte EC_WORD_POWER - .2byte EC_WORD_BACK - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Todd - -@ 213 - .4byte FACILITY_CLASS_POKEFAN_M - .string "GAVIN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_MOVE(BIDE) - .2byte EC_WORD_MY - .2byte EC_WORD_TIME - .2byte -1 -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_OVER - .2byte EC_WORD_SO - .2byte EC_WORD_SOON - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_MISTAKE - .2byte EC_WORD_WAS - .2byte EC_WORD_TOO - .2byte EC_WORD_EXPENSIVE - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Gavin - -@ 214 - .4byte FACILITY_CLASS_POKEFAN_F - .string "MALORY$", 8 -@ pre-battle speech - .2byte EC_WORD_PROMISE - .2byte EC_WORD_TO - .2byte EC_WORD_SHOW - .2byte EC_WORD_ME - .2byte EC_WORD_CUTE - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_GIGGLE - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_SO - .2byte EC_WORD_MUCH -@ loss speech - .2byte EC_WORD_TCH - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_AREN_T - .2byte EC_WORD_VERY - .2byte EC_WORD_NICE - .4byte gBattleFrontierTrainerMons_Malory - -@ 215 - .4byte FACILITY_CLASS_POKEFAN_F - .string "ESTHER$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_A - .2byte EC_WORD_NICE - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_GET - .2byte EC_WORD_ME - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_GAME -@ loss speech - .2byte EC_WORD_MESSAGE - .2byte EC_WORD_CARDS - .2byte EC_WORD_MAKE - .2byte EC_WORD_A - .2byte EC_WORD_WEAK - .2byte EC_MOVE2(PRESENT) - .4byte gBattleFrontierTrainerMons_Esther - -@ 216 - .4byte FACILITY_CLASS_PKMN_BREEDER_M - .string "OSCAR$", 8 -@ pre-battle speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_SEE - .2byte EC_WORD_YOUR - .2byte EC_WORD_POWER - .2byte EC_WORD_IN - .2byte EC_WORD_FULL -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_NOT - .2byte EC_WORD_YOUR - .2byte EC_WORD_FULL - .2byte EC_WORD_POWER - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_NOT - .2byte EC_WORD_FUNNY - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_TOO_STRONG - .2byte -1 - .4byte gBattleFrontierTrainerMons_Oscar - -@ 217 - .4byte FACILITY_CLASS_PKMN_BREEDER_M - .string "WILSON$", 8 -@ pre-battle speech - .2byte EC_WORD_WORK - .2byte EC_WORD_IS - .2byte EC_WORD_MAKING - .2byte EC_WORD_ME - .2byte EC_WORD_AN - .2byte EC_WORD_EARLY_BIRD -@ win speech - .2byte EC_WORD_ALL - .2byte EC_WORD_WORK - .2byte EC_WORD_AND - .2byte EC_WORD_NO - .2byte EC_WORD_PLAY - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_MOVE(ENDURE) - .2byte EC_WORD_IS - .2byte EC_WORD_ALL - .2byte EC_WORD_I - .2byte EC_WORD_CAN - .2byte EC_WORD_DO - .4byte gBattleFrontierTrainerMons_Wilson - -@ 218 - .4byte FACILITY_CLASS_POKEMON_BREEDER_F - .string "CLARE$", 8 -@ pre-battle speech - .2byte EC_WORD_YAY - .2byte EC_WORD_EXCL - .2byte EC_WORD_A - .2byte EC_WORD_TOUGH - .2byte EC_WORD_TRAINER - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_AWW - .2byte EC_WORD_EXCL - .2byte EC_WORD_A - .2byte EC_WORD_WIMPY - .2byte EC_WORD_TRAINER - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_COOL - .2byte EC_WORD_EXCL - .2byte EC_WORD_A - .2byte EC_WORD_GENIUS - .2byte EC_WORD_TRAINER - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Clare - -@ 219 - .4byte FACILITY_CLASS_POKEMON_BREEDER_F - .string "TESS$", 8 -@ pre-battle speech - .2byte EC_WORD_WANT - .2byte EC_WORD_SOME - .2byte EC_POKEMON(GULPIN) - .2byte EC_WORD_DESIGN - .2byte EC_WORD_SWEETS - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_A - .2byte EC_WORD_SECRET - .2byte EC_WORD_POKEMON - .2byte EC_WORD_GOURMET - .2byte EC_WORD_ITEM -@ loss speech - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_TASTY - .2byte EC_WORD_EXCL - .2byte EC_WORD_REFRESHING - .2byte EC_WORD_TOO - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Tess - -@ 220 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "LEON$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_BETTER - .2byte EC_WORD_THAN - .2byte EC_WORD_ANY - .2byte EC_WORD_OTHER - .2byte EC_WORD_TRAINER -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_DID - .2byte EC_WORD_IT - .2byte EC_MOVE2(JUMP_KICK) - .2byte EC_WORD_FOR - .2byte EC_WORD_JOY -@ loss speech - .2byte EC_WORD_BACK - .2byte EC_WORD_HOME - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_GO - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Leon - -@ 221 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "ALONZO$", 8 -@ pre-battle speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_NOT - .2byte EC_WORD_LOST - .2byte EC_WORD_ONCE - .2byte EC_WORD_YET - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_SAD - .2byte EC_WORD_LOOK - .2byte EC_WORD_BECOMES - .2byte EC_WORD_YOU - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_BELIEVE - .2byte EC_WORD_THIS - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Alonzo - -@ 222 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "VINCE$", 8 -@ pre-battle speech - .2byte EC_WORD_THE - .2byte EC_WORD_TOP - .2byte EC_WORD_TRAINER - .2byte EC_WORD_THAT_S - .2byte EC_WORD_ME - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_THE - .2byte EC_WORD_TOP - .2byte EC_WORD_RANK - .2byte EC_WORD_BELONGS_TO - .2byte EC_WORD_ME - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_APPEAL - .2byte EC_WORD_THIS - .2byte EC_MOVE(OUTRAGE) - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Vince - -@ 223 - .4byte FACILITY_CLASS_COOLTRAINER_M - .string "BRYON$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(BARRAGE) - .2byte EC_WORD_WILL - .2byte EC_MOVE2(SLAM) - .2byte EC_WORD_YOU - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_COUNT_ON - .2byte EC_WORD_ANY - .2byte EC_WORD_LESS - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_JUST - .2byte EC_WORD_DON_T - .2byte EC_WORD_GET - .2byte EC_WORD_IT - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Bryon - -@ 224 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "AVA$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_TREASURE - .2byte EC_WORD_OF - .2byte EC_WORD_THIS - .2byte EC_WORD_WORLD -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_WORLD - .2byte EC_WORD_IS - .2byte EC_WORD_FULL - .2byte EC_WORD_OF - .2byte EC_WORD_WONDER -@ loss speech - .2byte EC_WORD_WHY - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_SO - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Ava - -@ 225 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "MIRIAM$", 8 -@ pre-battle speech - .2byte EC_WORD_OH - .2byte EC_WORD_A - .2byte EC_WORD_TRAINER - .2byte EC_WORD_WITH - .2byte EC_WORD_A - .2byte EC_MOVE(SCARY_FACE) -@ win speech - .2byte EC_WORD_AHAHA - .2byte EC_WORD_YOU - .2byte EC_WORD_ONLY - .2byte EC_WORD_LOOK - .2byte EC_WORD_SCARY - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_AIYEEH - .2byte EC_WORD_EXCL - .2byte EC_WORD_YOU - .2byte EC_WORD_REALLY - .2byte EC_WORD_ARE - .2byte EC_WORD_SCARY - .4byte gBattleFrontierTrainerMons_Miriam - -@ 226 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "CARRIE$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_SHOW - .2byte EC_WORD_YOU - .2byte EC_WORD_GUTSY - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_ALL - .2byte EC_WORD_ABOUT - .2byte EC_WORD_GUTS - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_NO - .2byte EC_WORD_ELLIPSIS - .2byte EC_MOVE(SELF_DESTRUCT) - .2byte EC_WORD_MODE - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Carrie - -@ 227 - .4byte FACILITY_CLASS_COOLTRAINER_F - .string "GILLIAN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_SEEK - .2byte EC_WORD_A - .2byte EC_WORD_TRULY - .2byte EC_WORD_GREAT - .2byte EC_WORD_BATTLE -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_A_LOT - .2byte EC_WORD_BETTER - .2byte EC_WORD_BATTLE - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH - .2byte EC_WORD_TO - .2byte EC_WORD_TAKE - .4byte gBattleFrontierTrainerMons_Gillian2 - -@ 228 - .4byte FACILITY_CLASS_PKMN_RANGER_M - .string "TYLER$", 8 -@ pre-battle speech - .2byte EC_WORD_YO - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_LET_S - .2byte EC_WORD_GO - .2byte EC_WORD_EXCL_EXCL -@ win speech - .2byte EC_WORD_YO - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_YO -@ loss speech - .2byte EC_WORD_YO - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_LOST - .2byte EC_WORD_YO - .4byte gBattleFrontierTrainerMons_Tyler - -@ 229 - .4byte FACILITY_CLASS_PKMN_RANGER_M - .string "CHAZ$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_HAVE - .2byte EC_WORD_TOO - .2byte EC_WORD_MUCH - .2byte EC_WORD_POWER -@ win speech - .2byte EC_WORD_THEY - .2byte EC_WORD_HAVE - .2byte EC_WORD_MORE - .2byte EC_WORD_POWER - .2byte EC_WORD_NOW - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YEAH - .2byte EC_MOVE2(TAKE_DOWN) - .2byte EC_WORD_THEIR - .2byte EC_WORD_POWER - .2byte EC_WORD_A_TINY_BIT - .2byte EC_WORD_PLEASE - .4byte gBattleFrontierTrainerMons_Chaz - -@ 230 - .4byte FACILITY_CLASS_PKMN_RANGER_M - .string "NELSON$", 8 -@ pre-battle speech - .2byte EC_WORD_WELL_THEN - .2byte EC_WORD_WILL - .2byte EC_WORD_THIS - .2byte EC_WORD_POKEMON - .2byte EC_WORD_WORK - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_SEE - .2byte EC_WORD_THAT - .2byte EC_WORD_IT - .2byte EC_WORD_WAS - .2byte EC_WORD_TOO_STRONG -@ loss speech - .2byte EC_WORD_IT - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_MATCH_UP - .2byte EC_WORD_WELL - .2byte EC_WORD_I - .2byte EC_WORD_THINK - .4byte gBattleFrontierTrainerMons_Nelson - -@ 231 - .4byte FACILITY_CLASS_PKMN_RANGER_F - .string "SHANIA$", 8 -@ pre-battle speech - .2byte EC_WORD_ALL - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ABSOLUTELY - .2byte EC_WORD_ADORE - .2byte EC_WORD_ME -@ win speech - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_WITH - .2byte EC_WORD_CUTE_CHARM -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_SO - .2byte EC_WORD_MEAN - .2byte EC_WORD_TO - .2byte EC_WORD_CUTE - .2byte EC_WORD_POKEMON - .4byte gBattleFrontierTrainerMons_Shania - -@ 232 - .4byte FACILITY_CLASS_PKMN_RANGER_F - .string "STELLA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_SEE - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_WELL - .2byte EC_WORD_AREN_T - .2byte EC_WORD_THEY - .2byte EC_WORD_BORING - .2byte EC_WORD_QUES - .2byte EC_WORD_AHAHA -@ loss speech - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_ELSE - .2byte EC_WORD_ALL_RIGHT - .4byte gBattleFrontierTrainerMons_Stella - -@ 233 - .4byte FACILITY_CLASS_PKMN_RANGER_F - .string "DORINE$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_YOUNG - .2byte EC_WORD_AND - .2byte EC_WORD_STRONG - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte EC_WORD_AREN_T - .2byte EC_WORD_I - .2byte EC_WORD_GOOD - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_THIS - .2byte EC_WORD_ISN_T - .2byte EC_WORD_WORKING - .2byte EC_WORD_OUT - .2byte EC_WORD_AT - .2byte EC_WORD_ALL - .4byte gBattleFrontierTrainerMons_Dorine - -@ 234 - .4byte FACILITY_CLASS_DRAGON_TAMER - .string "MADDOX$", 8 -@ pre-battle speech - .2byte EC_WORD_DRAGON - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_MY - .2byte EC_WORD_NO_1 - .2byte EC_WORD_CHOICE -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_NO - .2byte EC_WORD_SECRET - .2byte EC_WORD_DRAGON - .2byte EC_WORD_POKEMON - .2byte EC_WORD_WIN -@ loss speech - .2byte EC_WORD_DRAGON - .2byte EC_WORD_POKEMON - .2byte EC_WORD_SHOULD - .2byte EC_WORD_NOT - .2byte EC_WORD_LOSE - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Maddox - -@ 235 - .4byte FACILITY_CLASS_DRAGON_TAMER - .string "DAVIN$", 8 -@ pre-battle speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_HEAR - .2byte EC_WORD_YOU - .2byte EC_MOVE2(ROAR) - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_WROOOAAR_EXCL - .2byte -1 - .2byte -1 - .2byte EC_WORD_VICTORY - .2byte EC_WORD_EXCL_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_WROOOAAR_EXCL - .2byte -1 - .2byte -1 - .2byte EC_WORD_WHY - .2byte EC_WORD_QUES_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Davin - -@ 236 - .4byte FACILITY_CLASS_DRAGON_TAMER - .string "TREVON$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_LIVING - .2byte EC_WORD_ONLY - .2byte EC_WORD_WITH - .2byte EC_WORD_DRAGON - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_THE - .2byte EC_WORD_WAY - .2byte EC_WORD_I_AM - .2byte EC_WORD_LIVING - .2byte EC_WORD_IS - .2byte EC_WORD_PERFECT -@ loss speech - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_DESTROYED - .2byte EC_WORD_THE - .2byte EC_WORD_WAY - .2byte EC_WORD_I_AM - .2byte EC_WORD_LIVING - .4byte gBattleFrontierTrainerMons_Trevon - -@ 237 - .4byte FACILITY_CLASS_BLACK_BELT - .string "MATEO$", 8 -@ pre-battle speech - .2byte EC_WORD_THIS - .2byte EC_WORD_SHOULD - .2byte EC_WORD_BE - .2byte EC_WORD_OVER - .2byte EC_WORD_SOON - .2byte EC_WORD_ENOUGH -@ win speech - .2byte EC_WORD_WELL - .2byte EC_WORD_THAT - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_TAKE - .2byte EC_WORD_VERY - .2byte EC_WORD_MUCH -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_LOSE - .2byte EC_WORD_SO - .2byte EC_WORD_SOON - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Mateo - -@ 238 - .4byte FACILITY_CLASS_BLACK_BELT - .string "BRET$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_ROCK_SOLID - .2byte EC_WORD_POKEMON - .2byte EC_WORD_THE - .2byte EC_WORD_BEST -@ win speech - .2byte EC_WORD_TOUGHNESS - .2byte EC_WORD_IS - .2byte EC_WORD_THE - .2byte EC_WORD_WAY - .2byte EC_WORD_TO - .2byte EC_WORD_GO -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_ALSO - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_WORD_PLUSH_DOLL - .2byte EC_WORD_COLLECTION - .4byte gBattleFrontierTrainerMons_Bret - -@ 239 - .4byte FACILITY_CLASS_BLACK_BELT - .string "RAUL$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_REJECT - .2byte EC_WORD_EVERY - .2byte EC_WORD_WEAK - .2byte EC_WORD_TRAINER - .2byte -1 -@ win speech - .2byte EC_WORD_HUMPH - .2byte EC_WORD_EXCL - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_WEAK - .2byte EC_WORD_TRAINER - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_THERE - .2byte EC_WORD_IS - .2byte EC_WORD_NOTHING - .2byte EC_WORD_WEAK - .2byte EC_WORD_ABOUT - .2byte EC_WORD_YOU - .4byte gBattleFrontierTrainerMons_Raul - -@ 240 - .4byte FACILITY_CLASS_BATTLE_GIRL - .string "KAY$", 8 -@ pre-battle speech - .2byte EC_WORD_AND - .2byte EC_WORD_YET - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_BATTLE - .2byte EC_WORD_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_BUT - .2byte EC_WORD_I_AM - .2byte EC_WORD_TIRED - .2byte EC_WORD_ELLIPSIS -@ loss speech - .2byte EC_WORD_GOOD - .2byte EC_WORD_IT_S - .2byte EC_WORD_OVER - .2byte EC_WORD_AT - .2byte EC_WORD_LAST - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Kay - -@ 241 - .4byte FACILITY_CLASS_BATTLE_GIRL - .string "ELENA$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_BATTLE - .2byte EC_WORD_GIRL - .2byte EC_WORD_THAT_S - .2byte EC_WORD_ME - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_ISN_T - .2byte EC_WORD_A - .2byte EC_WORD_BATTLE - .2byte EC_WORD_GIRL - .2byte EC_WORD_AWESOME - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_A - .2byte EC_WORD_BATTLE - .2byte EC_WORD_GIRL - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Elena - -@ 242 - .4byte FACILITY_CLASS_BATTLE_GIRL - .string "ALANA$", 8 -@ pre-battle speech - .2byte EC_WORD_EAT - .2byte EC_WORD_MY - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_ATTACK - .2byte EC_WORD_YOU - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_MUCH - .2byte EC_WORD_TO - .2byte EC_WORD_LEARN - .2byte -1 -@ loss speech - .2byte EC_WORD_SO - .2byte EC_WORD_MUCH - .2byte EC_WORD_FOR - .2byte EC_WORD_MY - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_ATTACK - .4byte gBattleFrontierTrainerMons_Alana - -@ 243 - .4byte FACILITY_CLASS_EXPERT_M - .string "ALEXAS$", 8 -@ pre-battle speech - .2byte EC_WORD_GOOD - .2byte EC_WORD_TO - .2byte EC_WORD_MEET_YOU - .2byte EC_WORD_YOUNG - .2byte EC_WORD_TRAINER - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_GIVE - .2byte EC_WORD_IT - .2byte EC_WORD_UP -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_ARE - .2byte EC_WORD_A - .2byte EC_WORD_STRONG - .2byte EC_WORD_TRAINER - .2byte EC_WORD_KID - .4byte gBattleFrontierTrainerMons_Alexas - -@ 244 - .4byte FACILITY_CLASS_EXPERT_M - .string "WESTON$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_PLAY - .2byte EC_WORD_DOWN - .2byte EC_WORD_ALL_RIGHT - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_FAR - .2byte EC_WORD_TOO - .2byte EC_WORD_EASY - .2byte EC_WORD_TO - .2byte EC_WORD_ATTACK -@ loss speech - .2byte EC_WORD_WELL - .2byte EC_WORD_WELL - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_I - .2byte EC_WORD_SURRENDER - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Weston - -@ 245 - .4byte FACILITY_CLASS_EXPERT_M - .string "JASPER$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_OLD - .2byte EC_WORD_I_AM - .2byte EC_WORD_SKILLED - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_SKILLED - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .2byte EC_WORD_I_AM - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SHOCKED - .2byte EC_WORD_EXCL - .2byte EC_WORD_DOWN - .2byte EC_WORD_I - .2byte EC_WORD_GO - .4byte gBattleFrontierTrainerMons_Jasper - -@ 246 - .4byte FACILITY_CLASS_EXPERT_F - .string "NADIA$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T - .2byte EC_WORD_BEAT - .2byte EC_WORD_ME - .2byte EC_WORD_DOWN - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_HAH - .2byte EC_WORD_EXCL - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_BEAT - .2byte EC_WORD_YOU -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_AND - .2byte EC_WORD_DOWNCAST - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Nadia - -@ 247 - .4byte FACILITY_CLASS_EXPERT_F - .string "MIRANDA$", 8 -@ pre-battle speech - .2byte EC_WORD_WELL - .2byte EC_WORD_WELL - .2byte -1 - .2byte EC_WORD_LET_S - .2byte EC_WORD_START - .2byte -1 -@ win speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_QUES - .2byte EC_WORD_DONE - .2byte EC_WORD_SO - .2byte EC_WORD_SOON - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_WELL - .2byte EC_WORD_I - .2byte EC_WORD_SEE - .2byte EC_WORD_THAT - .2byte EC_WORD_I_AM - .2byte EC_WORD_TOO_WEAK - .4byte gBattleFrontierTrainerMons_Miranda - -@ 248 - .4byte FACILITY_CLASS_EXPERT_F - .string "EMMA$", 8 -@ pre-battle speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_BEEN - .2byte EC_WORD_HEARING - .2byte EC_WORD_ABOUT - .2byte EC_WORD_YOU - .2byte -1 -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_THINK - .2byte EC_WORD_I_VE - .2byte EC_WORD_MISHEARD - .2byte EC_WORD_THINGS - .2byte -1 -@ loss speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_I_VE - .2byte EC_WORD_BEEN - .2byte EC_WORD_HEARING - .2byte EC_WORD_IS - .2byte EC_WORD_RIGHT - .4byte gBattleFrontierTrainerMons_Emma - -@ 249 - .4byte FACILITY_CLASS_PSYCHIC_M - .string "ROLANDO$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_SUPER - .2byte EC_WORD_POKEMON - .2byte EC_WORD_HERO - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_WAS - .2byte EC_WORD_THAT - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SHOULD - .2byte EC_WORD_NOT - .2byte EC_WORD_BEAT - .2byte EC_WORD_A - .2byte EC_WORD_HERO - .4byte gBattleFrontierTrainerMons_Rolando - -@ 250 - .4byte FACILITY_CLASS_PSYCHIC_M - .string "STANLY$", 8 -@ pre-battle speech - .2byte EC_WORD_THIS - .2byte EC_WORD_SHOULD - .2byte EC_WORD_BE - .2byte EC_WORD_AN - .2byte EC_WORD_EASY - .2byte EC_WORD_MATCH -@ win speech - .2byte EC_WORD_IT - .2byte EC_WORD_REALLY - .2byte EC_WORD_WAS - .2byte EC_WORD_EASY - .2byte -1 - .2byte -1 -@ loss speech - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_HAPPY - .2byte EC_WORD_NOW - .2byte EC_WORD_QUES - .2byte -1 - .4byte gBattleFrontierTrainerMons_Stanly - -@ 251 - .4byte FACILITY_CLASS_PSYCHIC_M - .string "DARIO$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_SAYS - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_WIN -@ win speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_HAS - .2byte EC_WORD_BEEN - .2byte EC_WORD_PERFECT - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_SEE - .2byte EC_WORD_THIS - .2byte EC_MOVE(REVERSAL) - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Dario - -@ 252 - .4byte FACILITY_CLASS_PSYCHIC_F - .string "KARLEE$", 8 -@ pre-battle speech - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_GOOD - .2byte EC_WORD_WILL - .2byte EC_WORD_COME - .2byte EC_WORD_OF - .2byte EC_WORD_THIS -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_THAT - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_GOOD - .2byte EC_WORD_WENT - .2byte EC_WORD_TO - .2byte EC_WORD_YOU - .4byte gBattleFrontierTrainerMons_Karlee - -@ 253 - .4byte FACILITY_CLASS_PSYCHIC_F - .string "JAYLIN$", 8 -@ pre-battle speech - .2byte EC_WORD_EVERY - .2byte EC_WORD_TRAINER - .2byte EC_WORD_HAS - .2byte EC_WORD_BEEN - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_ELLIPSIS -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_MAKING - .2byte EC_WORD_ME - .2byte EC_MOVE(YAWN) - .2byte EC_WORD_THAT - .2byte EC_WORD_BATTLE -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_SLEPT - .2byte EC_WORD_AND - .2byte EC_WORD_SO - .2byte EC_WORD_I - .2byte EC_WORD_LOST - .4byte gBattleFrontierTrainerMons_Jaylin - -@ 254 - .4byte FACILITY_CLASS_PSYCHIC_F - .string "INGRID$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_A - .2byte EC_WORD_VERY - .2byte EC_WORD_MEAN - .2byte EC_WORD_TRAINER -@ win speech - .2byte EC_WORD_WASN_T - .2byte EC_WORD_THAT - .2byte EC_WORD_A - .2byte EC_WORD_GOOD - .2byte EC_WORD_MATCH - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_LOST - .2byte EC_WORD_CAUSE - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MEAN - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Ingrid - -@ 255 - .4byte FACILITY_CLASS_HEX_MANIAC - .string "DELILAH$", 8 -@ pre-battle speech - .2byte EC_WORD_DON_T - .2byte EC_MOVE(GRUDGE) - .2byte EC_WORD_ME - .2byte EC_WORD_IF_I_WIN - .2byte EC_WORD_OK_QUES - .2byte -1 -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_SORRY - .2byte EC_WORD_TO - .2byte EC_WORD_SEE - .2byte EC_WORD_YOU - .2byte EC_WORD_ANGRY -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVE - .2byte EC_WORD_A - .2byte EC_MOVE(GRUDGE) - .2byte EC_WORD_WITH - .2byte EC_WORD_YOU - .4byte gBattleFrontierTrainerMons_Delilah - -@ 256 - .4byte FACILITY_CLASS_HEX_MANIAC - .string "CARLY$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_SCATTER - .2byte EC_WORD_SOME - .2byte EC_MOVE2(POISON_POWDER) - .2byte EC_WORD_ABOUT -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_SCARY - .2byte EC_WORD_HOW - .2byte EC_WORD_MY - .2byte EC_WORD_STRATEGY - .2byte EC_WORD_WORKS -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_YOU - .2byte EC_WORD_AND - .2byte EC_WORD_YOUR - .2byte EC_WORD_POKEMON - .4byte gBattleFrontierTrainerMons_Carly - -@ 257 - .4byte FACILITY_CLASS_HEX_MANIAC - .string "LEXIE$", 8 -@ pre-battle speech - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_SEE - .2byte EC_WORD_SCARY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_WASN_T - .2byte EC_WORD_THAT - .2byte EC_WORD_SCARY - .2byte EC_WORD_EH_QUES - .2byte -1 - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_MORE - .2byte EC_WORD_SCARY - .2byte EC_WORD_THAN - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .4byte gBattleFrontierTrainerMons_Lexie - -@ 258 - .4byte FACILITY_CLASS_POKEMANIAC - .string "MILLER$", 8 -@ pre-battle speech - .2byte EC_WORD_HELLO - .2byte EC_WORD_QUES - .2byte -1 - .2byte EC_WORD_HELLO - .2byte EC_WORD_QUES_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_HELLO - .2byte EC_WORD_MOTHER - .2byte EC_WORD_EXCL - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_PHONE - .2byte EC_WORD_ISN_T - .2byte EC_WORD_WORKING - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Miller - -@ 259 - .4byte FACILITY_CLASS_POKEMANIAC - .string "MARV$", 8 -@ pre-battle speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN - .2byte EC_WORD_LOSE - .2byte EC_WORD_YOUR - .2byte EC_MOVE(SWAGGER) - .2byte EC_WORD_NOW -@ win speech - .2byte EC_WORD_THERE - .2byte EC_WORD_IS - .2byte EC_WORD_NO - .2byte EC_MOVE(SWAGGER) - .2byte EC_WORD_LEFT - .2byte EC_WORD_EH_QUES -@ loss speech - .2byte EC_WORD_GO - .2byte EC_WORD_ON - .2byte EC_MOVE(SWAGGER) - .2byte EC_WORD_ALL - .2byte EC_WORD_YOU - .2byte EC_WORD_WANT - .4byte gBattleFrontierTrainerMons_Marv - -@ 260 - .4byte FACILITY_CLASS_POKEMANIAC - .string "LAYTON$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_KNOW - .2byte EC_WORD_I_AM - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_COOL - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN - .2byte EC_WORD_LOOK - .2byte EC_WORD_UP - .2byte EC_WORD_TO - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_COOL - .2byte EC_WORD_EXCL - .2byte EC_WORD_NO - .2byte EC_WORD_REALLY - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Layton - -@ 261 - .4byte FACILITY_CLASS_GENTLEMAN - .string "BROOKS$", 8 -@ pre-battle speech - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_WORD_HIGH - .2byte EC_WORD_LEVEL - .2byte EC_WORD_BATTLE -@ win speech - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_HIGH - .2byte EC_WORD_LEVEL - .2byte EC_WORD_AND - .2byte EC_WORD_EXCITING - .2byte EC_WORD_TOO -@ loss speech - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_TOO - .2byte EC_WORD_HIGH - .2byte EC_WORD_IN - .2byte EC_WORD_LEVEL - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Brooks - -@ 262 - .4byte FACILITY_CLASS_GENTLEMAN - .string "GREGORY$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_THAT - .2byte EC_WORD_OLD - .2byte EC_WORD_YET - .2byte -1 -@ win speech - .2byte EC_WORD_WHO - .2byte EC_WORD_SAYS - .2byte EC_WORD_I_AM - .2byte EC_WORD_TOO - .2byte EC_WORD_OLD - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_I_AM - .2byte EC_WORD_REALLY - .2byte EC_WORD_NOT - .2byte EC_WORD_THAT - .2byte EC_WORD_OLD - .4byte gBattleFrontierTrainerMons_Gregory - -@ 263 - .4byte FACILITY_CLASS_GENTLEMAN - .string "REESE$", 8 -@ pre-battle speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_A - .2byte EC_WORD_COUPLE - .2byte EC_WORD_THINGS - .2byte -1 - .2byte -1 -@ win speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_DIET - .2byte EC_WORD_PLAY - .2byte EC_WORD_SPORTS - .2byte EC_WORD_INSTEAD - .2byte -1 -@ loss speech - .2byte EC_WORD_INSTEAD - .2byte EC_WORD_OF - .2byte EC_WORD_TELEVISION - .2byte EC_WORD_GET - .2byte EC_WORD_A - .2byte EC_WORD_BOOK - .4byte gBattleFrontierTrainerMons_Reese - -@ 264 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M - .string "MASON$", 8 -@ pre-battle speech - .2byte EC_WORD_PLEASE - .2byte EC_WORD_DON_T - .2byte EC_WORD_MAKE - .2byte EC_WORD_THIS - .2byte EC_WORD_SCARY - .2byte -1 -@ win speech - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte EC_WORD_I_AM - .2byte EC_WORD_HAPPY - .2byte EC_WORD_NOW -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Mason - -@ 265 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M - .string "TOBY$", 8 -@ pre-battle speech - .2byte EC_WORD_LISTEN - .2byte EC_WORD_UP - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_WIN -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_GENIUS - .2byte EC_WORD_OR - .2byte EC_WORD_WHAT - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN - .2byte EC_WORD_BEAT - .2byte EC_WORD_YOU - .2byte EC_WORD_AT - .2byte EC_WORD_SMARTNESS - .4byte gBattleFrontierTrainerMons_Toby - -@ 266 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F - .string "DOROTHY$", 8 -@ pre-battle speech - .2byte EC_WORD_THE - .2byte EC_WORD_SPORTS - .2byte EC_WORD_WORLD - .2byte EC_WORD_SHOULD - .2byte EC_WORD_ACCEPT - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_EXCL - .2byte EC_WORD_THAT - .2byte EC_WORD_WIN - .2byte EC_WORD_WAS - .2byte EC_WORD_REFRESHING -@ loss speech - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_EXCL - .2byte EC_WORD_THAT - .2byte EC_WORD_LOSS - .2byte EC_WORD_WAS - .2byte EC_WORD_REFRESHING - .4byte gBattleFrontierTrainerMons_Dorothy - -@ 267 - .4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F - .string "PIPER$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_ON - .2byte EC_WORD_YOU - .2byte EC_WORD_NEED - .2byte EC_WORD_A - .2byte EC_WORD_SPEED_BOOST - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_SHOW - .2byte EC_WORD_MORE - .2byte EC_WORD_GUTS -@ loss speech - .2byte EC_WORD_OH - .2byte EC_WORD_YOU - .2byte EC_WORD_EXCL - .2byte -1 - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Piper - -@ 268 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M - .string "FINN$", 8 -@ pre-battle speech - .2byte EC_WORD_NOT - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_TRAINER - .2byte EC_WORD_BATTLE - .2byte EC_WORD_ELLIPSIS - .2byte -1 -@ win speech - .2byte EC_WORD_WON_T - .2byte EC_WORD_THIS - .2byte EC_WORD_EVER - .2byte EC_WORD_END - .2byte EC_WORD_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_FINALLY - .2byte EC_WORD_GET - .2byte EC_WORD_TO - .2byte EC_MOVE2(REST) - .2byte EC_WORD_A_LITTLE - .4byte gBattleFrontierTrainerMons_Finn - -@ 269 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M - .string "SAMIR$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_MOVE2(DIVE) - .2byte EC_WORD_BELOW - .2byte EC_WORD_THE - .2byte EC_MOVE2(SURF) - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_YAHOO - .2byte EC_WORD_TAKE - .2byte EC_WORD_A - .2byte EC_MOVE2(DIVE) - .2byte EC_WORD_YOU - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_TO - .2byte EC_WORD_SINK - .2byte EC_WORD_ELLIPSIS - .2byte -1 - .4byte gBattleFrontierTrainerMons_Samir - -@ 270 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F - .string "FIONA$", 8 -@ pre-battle speech - .2byte EC_WORD_DID - .2byte EC_WORD_YOU - .2byte EC_WORD_LIMBER - .2byte EC_WORD_UP - .2byte EC_WORD_BEFORE - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_BE - .2byte EC_WORD_MORE - .2byte EC_WORD_READY -@ loss speech - .2byte EC_WORD_BEING - .2byte EC_WORD_LIMBER - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_WORK - .2byte EC_WORD_FOR - .2byte EC_WORD_ME - .4byte gBattleFrontierTrainerMons_Fiona - -@ 271 - .4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F - .string "GLORIA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_TO - .2byte EC_WORD_ATTACK - .2byte EC_WORD_WITH - .2byte EC_WORD_SUCTION_CUPS -@ win speech - .2byte EC_WORD_GIGGLE - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_IT_S - .2byte EC_WORD_OVER - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DON_T - .2byte EC_WORD_GET - .2byte EC_WORD_HOW - .2byte EC_WORD_SUCTION_CUPS - .2byte EC_WORD_WORK - .4byte gBattleFrontierTrainerMons_Gloria - -@ 272 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M - .string "NICO$", 8 -@ pre-battle speech - .2byte EC_WORD_LIKE - .2byte EC_WORD_A - .2byte EC_MOVE(SONIC_BOOM) - .2byte EC_WORD_I_VE_ARRIVED - .2byte -1 - .2byte -1 -@ win speech - .2byte EC_WORD_SORRY - .2byte EC_WORD_TO - .2byte EC_WORD_MAKE - .2byte EC_WORD_YOU - .2byte EC_WORD_SO - .2byte EC_WORD_DOWNCAST -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_WITH - .2byte EC_WORD_A - .2byte EC_MOVE2(SUPERSONIC) - .2byte EC_WORD_SPEED_BOOST - .4byte gBattleFrontierTrainerMons_Nico - -@ 273 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M - .string "JEREMY$", 8 -@ pre-battle speech - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_MASTER - .2byte EC_WORD_THAT_S - .2byte EC_WORD_MY - .2byte EC_WORD_DREAM -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_DREAM - .2byte EC_WORD_ISN_T - .2byte EC_WORD_FAR - .2byte EC_WORD_OFF - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_I - .2byte EC_WORD_DREAM - .2byte EC_WORD_ISN_T - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Jeremy - -@ 274 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F - .string "CAITLIN$", 8 -@ pre-battle speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_YOU - .2byte EC_WORD_THINK - .2byte EC_WORD_I_AM - .2byte EC_WORD_CUTE - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_THERE - .2byte EC_WORD_IS - .2byte EC_WORD_MORE - .2byte EC_WORD_TO_ME - .2byte EC_WORD_THAN - .2byte EC_WORD_CUTENESS -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_CUTE_CHARM - .2byte EC_WORD_DOESN_T - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Caitlin - -@ 275 - .4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F - .string "REENA$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_HAPPY - .2byte EC_WORD_HAPPY - .2byte EC_WORD_HAPPY - .2byte EC_WORD_EXCL -@ win speech - .2byte EC_WORD_OH - .2byte EC_WORD_YAY - .2byte EC_WORD_EXCL - .2byte EC_WORD_YAHOO - .2byte EC_WORD_FOR - .2byte EC_WORD_ME -@ loss speech - .2byte EC_WORD_YAHOO - .2byte EC_WORD_EXCL - .2byte EC_WORD_I_AM - .2byte EC_WORD_HAPPY - .2byte EC_WORD_FOR - .2byte EC_WORD_YOU - .4byte gBattleFrontierTrainerMons_Reena - -@ 276 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "AVERY$", 8 -@ pre-battle speech - .2byte EC_WORD_I_VE - .2byte EC_WORD_GOT - .2byte EC_WORD_A_LOT - .2byte EC_WORD_OF - .2byte EC_WORD_BUG - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_MY - .2byte EC_WORD_BUG - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_ALL - .2byte EC_WORD_UNBELIEVABLE -@ loss speech - .2byte EC_WORD_MY - .2byte EC_WORD_BUG - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_ALL - .2byte EC_WORD_UPSIDE_DOWN - .4byte gBattleFrontierTrainerMons_Avery - -@ 277 - .4byte FACILITY_CLASS_BUG_MANIAC - .string "LIAM$", 8 -@ pre-battle speech - .2byte EC_WORD_WE - .2byte EC_WORD_REALLY - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_FIRE - .2byte EC_WORD_AND - .2byte EC_WORD_FLYING -@ win speech - .2byte EC_WORD_BUG - .2byte EC_WORD_POKEMON - .2byte EC_WORD_AREN_T - .2byte EC_WORD_BAD - .2byte EC_WORD_HEY_QUES - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_KNOW - .2byte EC_WORD_WHAT - .2byte EC_WORD_WE - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_HEY_QUES - .4byte gBattleFrontierTrainerMons_Liam - -@ 278 - .4byte FACILITY_CLASS_FISHERMAN - .string "THEO$", 8 -@ pre-battle speech - .2byte EC_WORD_FISHING - .2byte EC_WORD_IS - .2byte EC_WORD_MY - .2byte EC_WORD_CHOICE - .2byte EC_WORD_IN - .2byte EC_WORD_LIFE -@ win speech - .2byte EC_WORD_WATER - .2byte EC_WORD_POKEMON - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_ME - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_END -@ loss speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_COUNT_ON - .2byte EC_WORD_THAT - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_TIME - .4byte gBattleFrontierTrainerMons_Theo - -@ 279 - .4byte FACILITY_CLASS_FISHERMAN - .string "BAILEY$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_AN - .2byte EC_WORD_ADULT - .2byte EC_WORD_I - .2byte EC_WORD_BATTLE - .2byte EC_WORD_EASY -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_AN - .2byte EC_WORD_ADULT - .2byte EC_WORD_I - .2byte EC_MOVE2(SWALLOW) - .2byte EC_WORD_JOY -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_AN - .2byte EC_WORD_ADULT - .2byte EC_WORD_I - .2byte EC_MOVE2(SWALLOW) - .2byte EC_MOVE2(FRUSTRATION) - .4byte gBattleFrontierTrainerMons_Bailey - -@ 280 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "HUGO$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_TRY - .2byte EC_WORD_THE - .2byte EC_WORD_BEST - .2byte EC_WORD_I - .2byte EC_WORD_CAN -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_CAN_WIN - .2byte EC_WORD_IF - .2byte EC_WORD_I - .2byte EC_WORD_TRY - .2byte EC_WORD_ENOUGH -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_DID - .2byte EC_WORD_TRY - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_I - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Hugo - -@ 281 - .4byte FACILITY_CLASS_RUIN_MANIAC - .string "BRYCE$", 8 -@ pre-battle speech - .2byte EC_WORD_I_WAS - .2byte EC_WORD_ON - .2byte EC_WORD_VACATION - .2byte EC_WORD_UNTIL - .2byte EC_WORD_ONLY - .2byte EC_WORD_YESTERDAY -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_HAVEN_T - .2byte EC_WORD_LOST - .2byte EC_WORD_MY - .2byte EC_WORD_SKILL - .2byte EC_WORD_YET -@ loss speech - .2byte EC_WORD_THAT_S - .2byte EC_WORD_IT - .2byte EC_WORD_ELLIPSIS - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_SLEEP - .4byte gBattleFrontierTrainerMons_Bryce - -@ 282 - .4byte FACILITY_CLASS_COLLECTOR - .string "GIDEON$", 8 -@ pre-battle speech - .2byte EC_WORD_WHAT_S_UP_QUES - .2byte EC_WORD_YOU - .2byte EC_WORD_THINK - .2byte EC_WORD_I_AM - .2byte EC_WORD_SCARY - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_COOL - .2byte EC_WORD_BUT - .2byte EC_WORD_NOT - .2byte EC_WORD_SCARY - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_LOOK - .2byte EC_WORD_AT - .2byte EC_WORD_MY - .2byte EC_WORD_FABULOUS - .2byte EC_WORD_FASHION - .2byte EC_WORD_SENSE - .4byte gBattleFrontierTrainerMons_Gideon - -@ 283 - .4byte FACILITY_CLASS_COLLECTOR - .string "TRISTON$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_WOULD - .2byte EC_WORD_RATHER - .2byte EC_WORD_LOOK - .2byte EC_WORD_AT - .2byte EC_WORD_POKEMON -@ win speech - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_YOU - .2byte EC_WORD_MEAN - .2byte EC_WORD_I - .2byte EC_WORD_WON - .2byte EC_WORD_QUES_EXCL -@ loss speech - .2byte EC_WORD_SEE - .2byte EC_WORD_QUES - .2byte -1 - .2byte EC_WORD_I - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_LOSE - .4byte gBattleFrontierTrainerMons_Triston - -@ 284 - .4byte FACILITY_CLASS_GUITARIST - .string "CHARLES$", 8 -@ pre-battle speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_HOPELESS - .2byte EC_WORD_TO - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_WITH - .2byte EC_WORD_ME -@ win speech - .2byte EC_MOVE(SUBMISSION) - .2byte EC_WORD_WAS - .2byte EC_WORD_YOUR - .2byte EC_WORD_ONLY - .2byte EC_WORD_CHOICE - .2byte -1 -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_GOING - .2byte EC_WORD_DOWN - .2byte EC_WORD_DOWN - .2byte EC_WORD_DOWN - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Charles - -@ 285 - .4byte FACILITY_CLASS_GUITARIST - .string "RAYMOND$", 8 -@ pre-battle speech - .2byte EC_WORD_WANT - .2byte EC_WORD_TO - .2byte EC_WORD_HEAR - .2byte EC_WORD_MY - .2byte EC_WORD_SONG - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_SATISFIED - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .2byte EC_WORD_I_AM - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_SATISFIED - .2byte EC_WORD_IS - .2byte EC_WORD_WHAT - .2byte EC_WORD_I - .2byte EC_WORD_CAN_T - .2byte EC_WORD_BE - .4byte gBattleFrontierTrainerMons_Raymond - -@ 286 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "DIRK$", 8 -@ pre-battle speech - .2byte EC_WORD_FLYING - .2byte EC_WORD_POKEMON - .2byte EC_WORD_ARE - .2byte EC_WORD_ABOVE - .2byte EC_WORD_THE - .2byte EC_MOVE2(REST) -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_CAN_T_WIN - .2byte EC_WORD_EXCL - .2byte EC_WORD_FLYING - .2byte EC_WORD_POKEMON - .2byte EC_WORD_RULE -@ loss speech - .2byte EC_WORD_AREN_T - .2byte EC_WORD_THERE - .2byte EC_WORD_MORE - .2byte EC_WORD_FLYING - .2byte EC_WORD_POKEMON - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Dirk - -@ 287 - .4byte FACILITY_CLASS_BIRD_KEEPER - .string "HAROLD$", 8 -@ pre-battle speech - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_APPEAL - .2byte EC_WORD_TO - .2byte EC_WORD_YOU - .2byte EC_WORD_QUES -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_DO - .2byte EC_WORD_LIKE - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_QUES -@ loss speech - .2byte EC_WORD_SO - .2byte EC_WORD_YOU - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_MY - .2byte EC_WORD_POKEMON - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Harold - -@ 288 - .4byte FACILITY_CLASS_SAILOR - .string "OMAR$", 8 -@ pre-battle speech - .2byte EC_WORD_LET_ME_WIN - .2byte EC_WORD_IN - .2byte EC_MOVE(RETURN) - .2byte EC_WORD_FOR - .2byte EC_WORD_A - .2byte EC_MOVE2(PRESENT) -@ win speech - .2byte EC_WORD_HERE - .2byte EC_WORD_YOU - .2byte EC_WORD_ARE - .2byte EC_WORD_SOME - .2byte EC_MOVE2(TOXIC) - .2byte EC_WORD_SWEETS -@ loss speech - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_QUES - .2byte EC_WORD_WHAT - .2byte EC_WORD_FOR - .2byte EC_WORD_QUES_EXCL - .4byte gBattleFrontierTrainerMons_Omar - -@ 289 - .4byte FACILITY_CLASS_SAILOR - .string "PETER$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_BRAG - .2byte EC_WORD_ABOUT - .2byte EC_WORD_MY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_OK_QUES -@ win speech - .2byte EC_WORD_YOU - .2byte EC_WORD_HAVE - .2byte EC_WORD_TO - .2byte EC_WORD_LISTEN - .2byte EC_WORD_TO_ME - .2byte EC_WORD_BRAG -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_YOU - .2byte EC_WORD_WON_T - .2byte EC_WORD_LISTEN - .2byte EC_WORD_TO_ME - .4byte gBattleFrontierTrainerMons_Peter - -@ 290 - .4byte FACILITY_CLASS_HIKER - .string "DEV$", 8 -@ pre-battle speech - .2byte EC_WORD_COME_ON - .2byte EC_WORD_LET_S - .2byte EC_WORD_GET - .2byte EC_WORD_A - .2byte EC_WORD_MOVE - .2byte EC_WORD_ON -@ win speech - .2byte EC_WORD_I - .2byte EC_WORD_GET - .2byte EC_WORD_TO - .2byte EC_WORD_NAP - .2byte EC_WORD_AFTER - .2byte EC_WORD_THAT -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_NEED - .2byte EC_WORD_TO - .2byte EC_WORD_NAP - .2byte EC_WORD_AFTER - .2byte EC_WORD_THAT - .4byte gBattleFrontierTrainerMons_Dev - -@ 291 - .4byte FACILITY_CLASS_HIKER - .string "COREY$", 8 -@ pre-battle speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_TEACH - .2byte EC_WORD_YOU - .2byte EC_WORD_HOW - .2byte EC_WORD_TOUGH - .2byte EC_WORD_I_AM -@ win speech - .2byte EC_WORD_LOOK - .2byte EC_WORD_AT - .2byte EC_WORD_ME - .2byte EC_WORD_MAKE - .2byte EC_WORD_A - .2byte EC_MOVE(BRICK_BREAK) -@ loss speech - .2byte EC_WORD_MY - .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_IS - .2byte EC_WORD_CLOSE - .2byte EC_WORD_TO - .2byte EC_MOVE2(ERUPTION) - .4byte gBattleFrontierTrainerMons_Corey - -@ 292 - .4byte FACILITY_CLASS_KINDLER - .string "ANDRE$", 8 -@ pre-battle speech - .2byte EC_WORD_NOW - .2byte EC_WORD_THIS - .2byte EC_WORD_IS - .2byte EC_WORD_A - .2byte EC_WORD_PERFECT - .2byte EC_WORD_FLAME_BODY -@ win speech - .2byte EC_WORD_LOOK - .2byte EC_WORD_AT - .2byte EC_WORD_MY - .2byte EC_WORD_FIERY - .2byte EC_WORD_DANCE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_WANT - .2byte EC_WORD_AN - .2byte EC_MOVE2(EXPLOSION) - .2byte EC_WORD_HERE - .2byte EC_WORD_QUES - .4byte gBattleFrontierTrainerMons_Andre - -@ 293 - .4byte FACILITY_CLASS_KINDLER - .string "FERRIS$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NO_1 - .2byte EC_WORD_IN - .2byte EC_WORD_THE - .2byte EC_WORD_OLD - .2byte EC_WORD_CLASS -@ win speech - .2byte EC_WORD_NO_1 - .2byte EC_WORD_THAT_S - .2byte EC_WORD_WHAT - .2byte EC_WORD_I_AM - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_NOT - .2byte EC_WORD_NO_1 - .2byte EC_WORD_ANY - .2byte EC_WORD_MORE - .2byte EC_WORD_ELLIPSIS - .4byte gBattleFrontierTrainerMons_Ferris - -@ 294 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "ALIVIA$", 8 -@ pre-battle speech - .2byte EC_WORD_I_AM - .2byte EC_WORD_FEELING - .2byte EC_WORD_GIDDY - .2byte EC_WORD_SO - .2byte EC_WORD_SHOULD - .2byte EC_WORD_YOU -@ win speech - .2byte EC_WORD_IT - .2byte EC_WORD_WAS - .2byte EC_WORD_ALL - .2byte EC_WORD_TOGETHER - .2byte EC_WORD_TOO - .2byte EC_WORD_EASY -@ loss speech - .2byte EC_WORD_I - .2byte EC_WORD_WILL - .2byte EC_WORD_GIDDY - .2byte EC_WORD_UP - .2byte EC_WORD_AND - .2byte EC_WORD_AWAY - .4byte gBattleFrontierTrainerMons_Alivia - -@ 295 - .4byte FACILITY_CLASS_PARASOL_LADY - .string "PAIGE$", 8 -@ pre-battle speech - .2byte EC_WORD_LET_S - .2byte EC_WORD_ENJOY - .2byte EC_WORD_OUR - .2byte EC_WORD_BATTLE - .2byte EC_WORD_TOGETHER - .2byte -1 -@ win speech - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte -1 - .2byte -1 - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_VERY - .2byte EC_WORD_MUCH -@ loss speech - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte -1 - .2byte -1 - .2byte EC_WORD_DO - .2byte EC_WORD_GO - .2byte EC_WORD_ON - .4byte gBattleFrontierTrainerMons_Paige - -@ 296 - .4byte FACILITY_CLASS_BEAUTY - .string "ANYA$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_OH - .2byte EC_WORD_SO - .2byte EC_WORD_PRETTY - .2byte EC_WORD_FASHION -@ win speech - .2byte EC_WORD_FASHION - .2byte EC_WORD_SHOULD - .2byte EC_WORD_MATCH - .2byte EC_WORD_THE - .2byte EC_WORD_PERSON - .2byte -1 -@ loss speech - .2byte EC_WORD_PRETTY - .2byte EC_WORD_COULD - .2byte EC_WORD_BE - .2byte EC_WORD_GOOD - .2byte -1 - .2byte -1 - .4byte gBattleFrontierTrainerMons_Anya - -@ 297 - .4byte FACILITY_CLASS_BEAUTY - .string "DAWN$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_GO - .2byte EC_WORD_ALL - .2byte EC_WORD_OUT - .2byte EC_WORD_EXCL - .2byte -1 -@ win speech - .2byte EC_WORD_DON_T - .2byte EC_WORD_BE - .2byte EC_WORD_A - .2byte EC_WORD_BABY - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_YOU - .2byte EC_WORD_WON - .2byte EC_WORD_EXCL - .2byte EC_WORD_MOVE - .2byte EC_WORD_ON - .2byte EC_WORD_EXCL - .4byte gBattleFrontierTrainerMons_Dawn - -@ 298 - .4byte FACILITY_CLASS_AROMA_LADY - .string "ABBY$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_LIKE - .2byte EC_WORD_A - .2byte EC_WORD_TRAINER - .2byte EC_WORD_THAT_S - .2byte EC_WORD_REFRESHING -@ win speech - .2byte EC_WORD_VICTORY - .2byte EC_WORD_HAS - .2byte EC_WORD_A - .2byte EC_MOVE(SWEET_SCENT) - .2byte EC_WORD_EXCL - .2byte -1 -@ loss speech - .2byte EC_WORD_WHAT - .2byte EC_WORD_AN - .2byte EC_WORD_AWFUL - .2byte EC_WORD_STENCH - .2byte EC_WORD_EXCL - .2byte -1 - .4byte gBattleFrontierTrainerMons_Abby - -@ 299 - .4byte FACILITY_CLASS_AROMA_LADY - .string "GRETEL$", 8 -@ pre-battle speech - .2byte EC_WORD_I - .2byte EC_WORD_CAUSE - .2byte EC_MOVE(OUTRAGE) - .2byte EC_WORD_AS - .2byte EC_WORD_A - .2byte EC_WORD_TRAINER -@ win speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_ONLY - .2byte EC_WORD_NATURAL - .2byte EC_WORD_SEE_YA - .2byte EC_WORD_BYE_BYE - .2byte EC_WORD_EXCL -@ loss speech - .2byte EC_WORD_IT_S - .2byte EC_WORD_HARD - .2byte EC_WORD_TO - .2byte EC_WORD_BELIEVE - .2byte EC_WORD_BUT - .2byte EC_WORD_CONGRATS - .4byte gBattleFrontierTrainerMons_Gretel diff --git a/data/battle_tower.s b/data/battle_tower.s deleted file mode 100644 index 5c3f4cc54..000000000 --- a/data/battle_tower.s +++ /dev/null @@ -1,50 +0,0 @@ -#include "constants/easy_chat.h" -#include "constants/items.h" -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" -#include "constants/pokemon.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 85CECB0 - .include "data/battle_frontier/battle_frontier_held_items.inc" - -@ 85CED2E - .include "data/battle_frontier/battle_frontier_trainer_mons.inc" - -@ 85D5ACC - .include "data/battle_frontier/battle_frontier_trainers.inc" - -@ 85D97BC - .include "data/battle_frontier/battle_frontier_mons.inc" - -gTowerMaleFacilityClasses:: @ 85DCEDC - .byte 0x0e, 0x11, 0x03, 0x15, 0x17, 0x07, 0x0a, 0x19, 0x1a, 0x1b, 0x1d, 0x1e, 0x20, 0x26, 0x29, 0x09, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x34, 0x04, 0x35, 0x3a, 0x05, 0x42, 0x44, 0x43, 0x00 - -gTowerFemaleFacilityClasses:: @ 85DCEFA - .byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47 - -gTowerMaleTrainerGfxIds:: @ 85DCF0E - .byte 0x37, 0x36, 0x21, 0x0f, 0x27, 0x33, 0x2c, 0x42, 0x42, 0x1f, 0x27, 0x25, 0x30, 0x26, 0x19, 0x15, 0x23, 0x32, 0x38, 0x33, 0x33, 0x21, 0x42, 0x05, 0x31, 0x27, 0x41, 0x1f, 0x24, 0x37 - -gTowerFemaleTrainerGfxIds:: @ 85DCF2C - .byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f - -sRubyFacilityClassToEmerald:: @ 85DCF40 - .byte 0x00, 0x0b, 0x01, 0x01, 0x02, 0x06, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x06, 0x10, 0x07, 0x11, 0x08, 0x03, 0x09, 0x12, 0x0a, 0x0c, 0x0b, 0x13, 0x0c, 0x14, 0x0d, 0x15, 0x0e, 0x17, 0x0f, 0x07 - .byte 0x10, 0x0a, 0x11, 0x19, 0x12, 0x1a, 0x13, 0x1b, 0x14, 0x1d, 0x15, 0x1e, 0x16, 0x1f, 0x17, 0x20, 0x18, 0x21, 0x19, 0x22, 0x1a, 0x23, 0x1b, 0x24, 0x1c, 0x25, 0x1d, 0x26, 0x1e, 0x27, 0x1f, 0x28 - .byte 0x20, 0x29, 0x21, 0x2a, 0x22, 0x09, 0x23, 0x16, 0x24, 0x2b, 0x25, 0x2c, 0x26, 0x2d, 0x27, 0x2e, 0x28, 0x2f, 0x29, 0x30, 0x2a, 0x31, 0x2b, 0x32, 0x2c, 0x33, 0x2d, 0x34, 0x2e, 0x04, 0x2f, 0x35 - .byte 0x30, 0x36, 0x31, 0x37, 0x32, 0x38, 0x33, 0x1c, 0x34, 0x39, 0x35, 0x3a, 0x38, 0x05, 0x39, 0x3b, 0x3a, 0x3c, 0x3b, 0x3d, 0x3c, 0x3e, 0x3d, 0x3f, 0x3e, 0x40, 0x3f, 0x41, 0x40, 0x42, 0x41, 0x02 - .byte 0x42, 0x44, 0x43, 0x45, 0x44, 0x46, 0x45, 0x08, 0x46, 0x18, 0x47, 0x47, 0x48, 0x43, 0x49, 0x00, 0x4a, 0x48, 0x4b, 0x49, 0x4c, 0x4a, 0x00, 0x00 - - - - - - - - - diff --git a/include/battle_tower.h b/include/battle_tower.h index 68f495524..e08f5e5c9 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -33,11 +33,6 @@ struct FacilityMon u8 nature; }; -extern const u8 gTowerMaleFacilityClasses[30]; -extern const u8 gTowerMaleTrainerGfxIds[30]; -extern const u8 gTowerFemaleFacilityClasses[20]; -extern const u8 gTowerFemaleTrainerGfxIds[20]; - extern u16 gUnknown_03006298[]; extern const struct BattleFrontierTrainer *gFacilityTrainers; diff --git a/ld_script.txt b/ld_script.txt index ddafe6ecf..fbc738c42 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -537,7 +537,6 @@ SECTIONS { data/battle_anim_815A0D4.o(.rodata); src/learn_move.o(.rodata); src/roamer.o(.rodata); - data/battle_tower.o(.rodata); src/battle_tower.o(.rodata); src/use_pokeblock.o(.rodata); data/use_pokeblock.o(.rodata); diff --git a/src/battle_tower.c b/src/battle_tower.c index d95cadfc2..f00db4c1d 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -31,10 +31,7 @@ extern void sub_81A4C30(void); -extern const u16 gBattleFrontierHeldItems[]; extern const u16 gUnknown_085DFA46[]; -extern const struct FacilityMon gBattleFrontierMons[]; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[]; @@ -79,15 +76,192 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT static u8 SetTentPtrsGetLevel(void); // Const rom data. - - - - - - - - - +const u16 gBattleFrontierHeldItems[] = +{ + ITEM_NONE, + ITEM_KINGS_ROCK, + ITEM_SITRUS_BERRY, + ITEM_ORAN_BERRY, + ITEM_CHESTO_BERRY, + ITEM_HARD_STONE, + ITEM_FOCUS_BAND, + ITEM_PERSIM_BERRY, + ITEM_MIRACLE_SEED, + ITEM_BERRY_JUICE, + ITEM_MACHO_BRACE, + ITEM_SILVER_POWDER, + ITEM_CHERI_BERRY, + ITEM_BLACK_GLASSES, + ITEM_BLACK_BELT, + ITEM_SOUL_DEW, + ITEM_CHOICE_BAND, + ITEM_MAGNET, + ITEM_SILK_SCARF, + ITEM_WHITE_HERB, + ITEM_DEEP_SEA_SCALE, + ITEM_DEEP_SEA_TOOTH, + ITEM_MYSTIC_WATER, + ITEM_SHARP_BEAK, + ITEM_QUICK_CLAW, + ITEM_LEFTOVERS, + ITEM_RAWST_BERRY, + ITEM_LIGHT_BALL, + ITEM_POISON_BARB, + ITEM_NEVER_MELT_ICE, + ITEM_ASPEAR_BERRY, + ITEM_SPELL_TAG, + ITEM_BRIGHT_POWDER, + ITEM_LEPPA_BERRY, + ITEM_SCOPE_LENS, + ITEM_TWISTED_SPOON, + ITEM_METAL_COAT, + ITEM_MENTAL_HERB, + ITEM_CHARCOAL, + ITEM_PECHA_BERRY, + ITEM_SOFT_SAND, + ITEM_LUM_BERRY, + ITEM_DRAGON_SCALE, + ITEM_DRAGON_FANG, + ITEM_IAPAPA_BERRY, + ITEM_WIKI_BERRY, + ITEM_SEA_INCENSE, + ITEM_SHELL_BELL, + ITEM_SALAC_BERRY, + ITEM_LANSAT_BERRY, + ITEM_APICOT_BERRY, + ITEM_STARF_BERRY, + ITEM_LIECHI_BERRY, + ITEM_STICK, + ITEM_LAX_INCENSE, + ITEM_AGUAV_BERRY, + ITEM_FIGY_BERRY, + ITEM_THICK_CLUB, + ITEM_MAGO_BERRY, + ITEM_METAL_POWDER, + ITEM_PETAYA_BERRY, + ITEM_LUCKY_PUNCH, + ITEM_GANLON_BERRY +}; + +#include "data/battle_frontier/battle_frontier_trainer_mons.h" +#include "data/battle_frontier/battle_frontier_trainers.h" +#include "data/battle_frontier/battle_frontier_mons.h" + +const u8 gTowerMaleFacilityClasses[] = +{ + FACILITY_CLASS_RUIN_MANIAC, + FACILITY_CLASS_TUBER_M, + FACILITY_CLASS_COOLTRAINER_M, + FACILITY_CLASS_RICH_BOY, + FACILITY_CLASS_POKEMANIAC, + FACILITY_CLASS_SWIMMER_M, + FACILITY_CLASS_BLACK_BELT, + FACILITY_CLASS_GUITARIST, + FACILITY_CLASS_KINDLER, + FACILITY_CLASS_CAMPER, + FACILITY_CLASS_BUG_MANIAC, + FACILITY_CLASS_PSYCHIC_M, + FACILITY_CLASS_GENTLEMAN, + FACILITY_CLASS_SCHOOL_KID_M, + FACILITY_CLASS_POKEFAN_M, + FACILITY_CLASS_EXPERT_M, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_FISHERMAN, + FACILITY_CLASS_CYCLING_TRIATHLETE_M, + FACILITY_CLASS_RUNNING_TRIATHLETE_M, + FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + FACILITY_CLASS_DRAGON_TAMER, + FACILITY_CLASS_BIRD_KEEPER, + FACILITY_CLASS_NINJA_BOY, + FACILITY_CLASS_SAILOR, + FACILITY_CLASS_COLLECTOR, + FACILITY_CLASS_PKMN_BREEDER_M, + FACILITY_CLASS_PKMN_RANGER_M, + FACILITY_CLASS_BUG_CATCHER, + FACILITY_CLASS_HIKER +}; + +const u8 gTowerFemaleFacilityClasses[] = +{ + FACILITY_CLASS_AROMA_LADY, + FACILITY_CLASS_TUBER_F, + FACILITY_CLASS_COOLTRAINER_F, + FACILITY_CLASS_HEX_MANIAC, + FACILITY_CLASS_LADY, + FACILITY_CLASS_BEAUTY, + FACILITY_CLASS_PSYCHIC_F, + FACILITY_CLASS_SCHOOL_KID_F, + FACILITY_CLASS_POKEFAN_F, + FACILITY_CLASS_EXPERT_F, + FACILITY_CLASS_CYCLING_TRIATHLETE_F, + FACILITY_CLASS_RUNNING_TRIATHLETE_F, + FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + FACILITY_CLASS_BATTLE_GIRL, + FACILITY_CLASS_PARASOL_LADY, + FACILITY_CLASS_SWIMMER_F, + FACILITY_CLASS_PICNICKER, + FACILITY_CLASS_POKEMON_BREEDER_F, + FACILITY_CLASS_PKMN_RANGER_F, + FACILITY_CLASS_LASS +}; + +const u8 gTowerMaleTrainerGfxIds[] = +{ + EVENT_OBJ_GFX_HIKER, + EVENT_OBJ_GFX_TUBER_M, + EVENT_OBJ_GFX_MAN_3, + EVENT_OBJ_GFX_RICH_BOY, + EVENT_OBJ_GFX_MANIAC, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + EVENT_OBJ_GFX_BLACK_BELT, + EVENT_OBJ_GFX_MAN_5, + EVENT_OBJ_GFX_MAN_5, + EVENT_OBJ_GFX_CAMPER, + EVENT_OBJ_GFX_MANIAC, + EVENT_OBJ_GFX_PSYCHIC_M, + EVENT_OBJ_GFX_GENTLEMAN, + EVENT_OBJ_GFX_SCHOOL_KID_M, + EVENT_OBJ_GFX_POKEFAN_M, + EVENT_OBJ_GFX_EXPERT_M, + EVENT_OBJ_GFX_YOUNGSTER, + EVENT_OBJ_GFX_FISHERMAN, + EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + EVENT_OBJ_GFX_MAN_3, + EVENT_OBJ_GFX_MAN_5, + EVENT_OBJ_GFX_NINJA_BOY, + EVENT_OBJ_GFX_SAILOR, + EVENT_OBJ_GFX_MANIAC, + EVENT_OBJ_GFX_MAN_4, + EVENT_OBJ_GFX_CAMPER, + EVENT_OBJ_GFX_BUG_CATCHER, + EVENT_OBJ_GFX_HIKER +}; + +const u8 gTowerFemaleTrainerGfxIds[] = +{ + EVENT_OBJ_GFX_WOMAN_2, + EVENT_OBJ_GFX_TUBER_F, + EVENT_OBJ_GFX_WOMAN_5, + EVENT_OBJ_GFX_HEX_MANIAC, + EVENT_OBJ_GFX_WOMAN_2, + EVENT_OBJ_GFX_BEAUTY, + EVENT_OBJ_GFX_LASS, + EVENT_OBJ_GFX_GIRL_3, + EVENT_OBJ_GFX_POKEFAN_F, + EVENT_OBJ_GFX_EXPERT_F, + EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + EVENT_OBJ_GFX_GIRL_3, + EVENT_OBJ_GFX_WOMAN_5, + EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + EVENT_OBJ_GFX_PICNICKER, + EVENT_OBJ_GFX_WOMAN_2, + EVENT_OBJ_GFX_PICNICKER, + EVENT_OBJ_GFX_LASS +}; extern const u8 sRubyFacilityClassToEmerald[82][2]; /* diff --git a/src/data/battle_frontier/battle_frontier_mons.h b/src/data/battle_frontier/battle_frontier_mons.h new file mode 100644 index 000000000..371b0f170 --- /dev/null +++ b/src/data/battle_frontier/battle_frontier_mons.h @@ -0,0 +1,6177 @@ +const struct FacilityMon gBattleFrontierMons[] = +{ + [0] = { + .species = SPECIES_SUNKERN, + .moves = {MOVE_MEGA_DRAIN MOVE_HELPING_HAND MOVE_SUNNY_DAY MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [1] = { + .species = SPECIES_AZURILL, + .moves = {MOVE_WATER_PULSE MOVE_ATTRACT MOVE_SING MOVE_CHARM}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [2] = { + .species = SPECIES_CATERPIE, + .moves = {MOVE_TACKLE MOVE_STRING_SHOT MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [3] = { + .species = SPECIES_WEEDLE, + .moves = {MOVE_POISON_STING MOVE_STRING_SHOT MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [4] = { + .species = SPECIES_WURMPLE, + .moves = {MOVE_TACKLE MOVE_STRING_SHOT MOVE_POISON_STING MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [5] = { + .species = SPECIES_RALTS, + .moves = {MOVE_CONFUSION MOVE_IMPRISON MOVE_DOUBLE_TEAM MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [6] = { + .species = SPECIES_MAGIKARP, + .moves = {MOVE_FLAIL MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [7] = { + .species = SPECIES_FEEBAS, + .moves = {MOVE_FLAIL MOVE_MIRROR_COAT MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [8] = { + .species = SPECIES_METAPOD, + .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [9] = { + .species = SPECIES_KAKUNA, + .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [10] = { + .species = SPECIES_PICHU, + .moves = {MOVE_SWEET_KISS MOVE_THUNDER_WAVE MOVE_ATTRACT MOVE_SHOCK_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [11] = { + .species = SPECIES_SILCOON, + .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [12] = { + .species = SPECIES_CASCOON, + .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [13] = { + .species = SPECIES_IGGLYBUFF, + .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_ATTRACT MOVE_SEISMIC_TOSS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [14] = { + .species = SPECIES_WOOPER, + .moves = {MOVE_YAWN MOVE_DIG MOVE_WATER_PULSE MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [15] = { + .species = SPECIES_TYROGUE, + .moves = {MOVE_MACH_PUNCH MOVE_PROTECT MOVE_DOUBLE_TEAM MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [16] = { + .species = SPECIES_SENTRET, + .moves = {MOVE_QUICK_ATTACK MOVE_FOLLOW_ME MOVE_HELPING_HAND MOVE_ASSIST}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [17] = { + .species = SPECIES_CLEFFA, + .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_ATTRACT MOVE_METRONOME}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [18] = { + .species = SPECIES_SEEDOT, + .moves = {MOVE_BULLET_SEED MOVE_BIDE MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [19] = { + .species = SPECIES_LOTAD, + .moves = {MOVE_RAIN_DANCE MOVE_WATER_PULSE MOVE_SUNNY_DAY MOVE_MEGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [20] = { + .species = SPECIES_POOCHYENA, + .moves = {MOVE_CRUNCH MOVE_SWAGGER MOVE_ROAR MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [21] = { + .species = SPECIES_SHEDINJA, + .moves = {MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_SILVER_WIND MOVE_GRUDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [22] = { + .species = SPECIES_MAKUHITA, + .moves = {MOVE_FAKE_OUT MOVE_SEISMIC_TOSS MOVE_DETECT MOVE_WHIRLWIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [23] = { + .species = SPECIES_WHISMUR, + .moves = {MOVE_UPROAR MOVE_SWAGGER MOVE_BODY_SLAM MOVE_SMELLING_SALT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [24] = { + .species = SPECIES_ZIGZAGOON, + .moves = {MOVE_HEADBUTT MOVE_PIN_MISSILE MOVE_SWIFT MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [25] = { + .species = SPECIES_ZUBAT, + .moves = {MOVE_POISON_FANG MOVE_WHIRLWIND MOVE_CONFUSE_RAY MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [26] = { + .species = SPECIES_TOGEPI, + .moves = {MOVE_RETURN MOVE_YAWN MOVE_WISH MOVE_SWEET_KISS}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [27] = { + .species = SPECIES_SPINARAK, + .moves = {MOVE_SIGNAL_BEAM MOVE_NIGHT_SHADE MOVE_SPIDER_WEB MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [28] = { + .species = SPECIES_MARILL, + .moves = {MOVE_WATER_PULSE MOVE_RAIN_DANCE MOVE_LIGHT_SCREEN MOVE_RETURN}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [29] = { + .species = SPECIES_HOPPIP, + .moves = {MOVE_MEGA_DRAIN MOVE_LEECH_SEED MOVE_SLEEP_POWDER MOVE_STUN_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_LAX + }, + [30] = { + .species = SPECIES_SLUGMA, + .moves = {MOVE_EMBER MOVE_ROCK_SLIDE MOVE_YAWN MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [31] = { + .species = SPECIES_SWINUB, + .moves = {MOVE_ICY_WIND MOVE_DIG MOVE_ROCK_TOMB MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_GENTLE + }, + [32] = { + .species = SPECIES_SMEARGLE, + .moves = {MOVE_EXTREME_SPEED MOVE_FAKE_OUT MOVE_QUICK_ATTACK MOVE_MACH_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [33] = { + .species = SPECIES_PIDGEY, + .moves = {MOVE_GUST MOVE_SAND_ATTACK MOVE_WHIRLWIND MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [34] = { + .species = SPECIES_RATTATA, + .moves = {MOVE_HYPER_FANG MOVE_PURSUIT MOVE_QUICK_ATTACK MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [35] = { + .species = SPECIES_WYNAUT, + .moves = {MOVE_ENCORE MOVE_COUNTER MOVE_MIRROR_COAT MOVE_CHARM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_JOLLY + }, + [36] = { + .species = SPECIES_SKITTY, + .moves = {MOVE_SING MOVE_ATTRACT MOVE_CHARM MOVE_DOUBLE_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [37] = { + .species = SPECIES_SPEAROW, + .moves = {MOVE_FURY_ATTACK MOVE_PURSUIT MOVE_MIRROR_MOVE MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [38] = { + .species = SPECIES_HOOTHOOT, + .moves = {MOVE_CONFUSION MOVE_HYPNOSIS MOVE_SUPERSONIC MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [39] = { + .species = SPECIES_DIGLETT, + .moves = {MOVE_MAGNITUDE MOVE_SLASH MOVE_ROCK_TOMB MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAIVE + }, + [40] = { + .species = SPECIES_LEDYBA, + .moves = {MOVE_PSYBEAM MOVE_AGILITY MOVE_BATON_PASS MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BASHFUL + }, + [41] = { + .species = SPECIES_NINCADA, + .moves = {MOVE_MUD_SLAP MOVE_DIG MOVE_TOXIC MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [42] = { + .species = SPECIES_SURSKIT, + .moves = {MOVE_BUBBLE_BEAM MOVE_RAIN_DANCE MOVE_SWEET_SCENT MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [43] = { + .species = SPECIES_JIGGLYPUFF, + .moves = {MOVE_SING MOVE_WISH MOVE_MIMIC MOVE_DOUBLE_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [44] = { + .species = SPECIES_TAILLOW, + .moves = {MOVE_FLY MOVE_QUICK_ATTACK MOVE_ENDEAVOR MOVE_FOCUS_ENERGY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [45] = { + .species = SPECIES_WINGULL, + .moves = {MOVE_WATER_PULSE MOVE_FLY MOVE_QUICK_ATTACK MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [46] = { + .species = SPECIES_NIDORAN_M, + .moves = {MOVE_DOUBLE_KICK MOVE_POISON_STING MOVE_DISABLE MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [47] = { + .species = SPECIES_NIDORAN_F, + .moves = {MOVE_CRUNCH MOVE_DOUBLE_KICK MOVE_FLATTER MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [48] = { + .species = SPECIES_KIRLIA, + .moves = {MOVE_CONFUSION MOVE_WILL_O_WISP MOVE_FUTURE_SIGHT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [49] = { + .species = SPECIES_MAREEP, + .moves = {MOVE_SHOCK_WAVE MOVE_FLASH MOVE_REFLECT MOVE_COTTON_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [50] = { + .species = SPECIES_MEDITITE, + .moves = {MOVE_HI_JUMP_KICK MOVE_MEDITATE MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [51] = { + .species = SPECIES_SLAKOTH, + .moves = {MOVE_YAWN MOVE_SCRATCH MOVE_ENCORE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [52] = { + .species = SPECIES_PARAS, + .moves = {MOVE_SPORE MOVE_LEECH_LIFE MOVE_SLASH MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [53] = { + .species = SPECIES_EKANS, + .moves = {MOVE_ACID MOVE_DIG MOVE_SCREECH MOVE_TORMENT}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [54] = { + .species = SPECIES_DITTO, + .moves = {MOVE_TRANSFORM MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_METAL_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [55] = { + .species = SPECIES_BARBOACH, + .moves = {MOVE_MAGNITUDE MOVE_WATER_PULSE MOVE_SPARK MOVE_FUTURE_SIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_BASHFUL + }, + [56] = { + .species = SPECIES_MEOWTH, + .moves = {MOVE_SLASH MOVE_BITE MOVE_SCREECH MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [57] = { + .species = SPECIES_PINECO, + .moves = {MOVE_SELF_DESTRUCT MOVE_TAKE_DOWN MOVE_REFLECT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [58] = { + .species = SPECIES_TRAPINCH, + .moves = {MOVE_TOXIC MOVE_DIG MOVE_SANDSTORM MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [59] = { + .species = SPECIES_SPHEAL, + .moves = {MOVE_ICE_BALL MOVE_WATER_PULSE MOVE_HAIL MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [60] = { + .species = SPECIES_HORSEA, + .moves = {MOVE_WATER_GUN MOVE_AGILITY MOVE_ICY_WIND MOVE_TWISTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [61] = { + .species = SPECIES_SHROOMISH, + .moves = {MOVE_SPORE MOVE_BULLET_SEED MOVE_LEECH_SEED MOVE_HEADBUTT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [62] = { + .species = SPECIES_SHUPPET, + .moves = {MOVE_WILL_O_WISP MOVE_NIGHT_SHADE MOVE_GRUDGE MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [63] = { + .species = SPECIES_DUSKULL, + .moves = {MOVE_SKILL_SWAP MOVE_NIGHT_SHADE MOVE_DISABLE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [64] = { + .species = SPECIES_ELECTRIKE, + .moves = {MOVE_SPARK MOVE_THUNDER_WAVE MOVE_ROAR MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [65] = { + .species = SPECIES_VULPIX, + .moves = {MOVE_WILL_O_WISP MOVE_CONFUSE_RAY MOVE_FIRE_SPIN MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [66] = { + .species = SPECIES_PIKACHU, + .moves = {MOVE_THUNDER_PUNCH MOVE_THUNDER_WAVE MOVE_DOUBLE_TEAM MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIGHT_BALL, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [67] = { + .species = SPECIES_SANDSHREW, + .moves = {MOVE_DIG MOVE_ROCK_TOMB MOVE_SANDSTORM MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [68] = { + .species = SPECIES_POLIWAG, + .moves = {MOVE_HYPNOSIS MOVE_ICY_WIND MOVE_WATER_GUN MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [69] = { + .species = SPECIES_BELLSPROUT, + .moves = {MOVE_RAZOR_LEAF MOVE_ACID MOVE_STUN_SPORE MOVE_WRAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_LAX + }, + [70] = { + .species = SPECIES_GEODUDE, + .moves = {MOVE_MAGNITUDE MOVE_ROCK_BLAST MOVE_STRENGTH MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [71] = { + .species = SPECIES_DRATINI, + .moves = {MOVE_OUTRAGE MOVE_THUNDER_WAVE MOVE_SUPERSONIC MOVE_WATER_PULSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [72] = { + .species = SPECIES_SNUBBULL, + .moves = {MOVE_BITE MOVE_CHARM MOVE_SWAGGER MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [73] = { + .species = SPECIES_REMORAID, + .moves = {MOVE_BUBBLE_BEAM MOVE_AURORA_BEAM MOVE_PSYBEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [74] = { + .species = SPECIES_LARVITAR, + .moves = {MOVE_THRASH MOVE_ROCK_SLIDE MOVE_DIG MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [75] = { + .species = SPECIES_BALTOY, + .moves = {MOVE_PSYBEAM MOVE_ANCIENT_POWER MOVE_LIGHT_SCREEN MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [76] = { + .species = SPECIES_SNORUNT, + .moves = {MOVE_ICY_WIND MOVE_HEADBUTT MOVE_LEER MOVE_BITE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [77] = { + .species = SPECIES_BAGON, + .moves = {MOVE_DRAGON_BREATH MOVE_HEADBUTT MOVE_BRICK_BREAK MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [78] = { + .species = SPECIES_BELDUM, + .moves = {MOVE_TAKE_DOWN MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [79] = { + .species = SPECIES_GULPIN, + .moves = {MOVE_TOXIC MOVE_YAWN MOVE_PAIN_SPLIT MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [80] = { + .species = SPECIES_VENONAT, + .moves = {MOVE_PSYBEAM MOVE_SUPERSONIC MOVE_STUN_SPORE MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [81] = { + .species = SPECIES_MANKEY, + .moves = {MOVE_KARATE_CHOP MOVE_LOW_KICK MOVE_SCREECH MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [82] = { + .species = SPECIES_MACHOP, + .moves = {MOVE_SEISMIC_TOSS MOVE_REVENGE MOVE_ROCK_TOMB MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [83] = { + .species = SPECIES_SHELLDER, + .moves = {MOVE_ICICLE_SPEAR MOVE_SUPERSONIC MOVE_CLAMP MOVE_WITHDRAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [84] = { + .species = SPECIES_SMOOCHUM, + .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_MUD_SLAP MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [85] = { + .species = SPECIES_NUMEL, + .moves = {MOVE_EMBER MOVE_MAGNITUDE MOVE_ROCK_TOMB MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [86] = { + .species = SPECIES_CARVANHA, + .moves = {MOVE_BITE MOVE_SCREECH MOVE_SCARY_FACE MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [87] = { + .species = SPECIES_CORPHISH, + .moves = {MOVE_CRABHAMMER MOVE_WATER_PULSE MOVE_MUD_SLAP MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [88] = { + .species = SPECIES_CHARMANDER, + .moves = {MOVE_FIRE_SPIN MOVE_METAL_CLAW MOVE_SMOKESCREEN MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [89] = { + .species = SPECIES_CYNDAQUIL, + .moves = {MOVE_EMBER MOVE_SWIFT MOVE_QUICK_ATTACK MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [90] = { + .species = SPECIES_ABRA, + .moves = {MOVE_MIMIC MOVE_METRONOME MOVE_FLASH MOVE_SEISMIC_TOSS}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [91] = { + .species = SPECIES_DODUO, + .moves = {MOVE_FURY_ATTACK MOVE_UPROAR MOVE_MUD_SLAP MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [92] = { + .species = SPECIES_GASTLY, + .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_NIGHT_SHADE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [93] = { + .species = SPECIES_SWABLU, + .moves = {MOVE_TAKE_DOWN MOVE_DREAM_EATER MOVE_SING MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [94] = { + .species = SPECIES_TREECKO, + .moves = {MOVE_BULLET_SEED MOVE_AERIAL_ACE MOVE_QUICK_ATTACK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_LONELY + }, + [95] = { + .species = SPECIES_TORCHIC, + .moves = {MOVE_FIRE_SPIN MOVE_QUICK_ATTACK MOVE_SAND_ATTACK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [96] = { + .species = SPECIES_MUDKIP, + .moves = {MOVE_WHIRLPOOL MOVE_ENDEAVOR MOVE_MUD_SPORT MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [97] = { + .species = SPECIES_SQUIRTLE, + .moves = {MOVE_WATER_PULSE MOVE_BITE MOVE_WITHDRAW MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [98] = { + .species = SPECIES_TOTODILE, + .moves = {MOVE_SLASH MOVE_WATER_PULSE MOVE_SCREECH MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [99] = { + .species = SPECIES_SLOWPOKE, + .moves = {MOVE_CONFUSION MOVE_DISABLE MOVE_WATER_PULSE MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [100] = { + .species = SPECIES_BULBASAUR, + .moves = {MOVE_RAZOR_LEAF MOVE_SWEET_SCENT MOVE_SLEEP_POWDER MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [101] = { + .species = SPECIES_CHIKORITA, + .moves = {MOVE_SECRET_POWER MOVE_BULLET_SEED MOVE_MUD_SLAP MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [102] = { + .species = SPECIES_ODDISH, + .moves = {MOVE_ACID MOVE_STUN_SPORE MOVE_SWEET_SCENT MOVE_MOONLIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [103] = { + .species = SPECIES_PSYDUCK, + .moves = {MOVE_CONFUSION MOVE_FURY_SWIPES MOVE_AERIAL_ACE MOVE_DISABLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HASTY + }, + [104] = { + .species = SPECIES_CUBONE, + .moves = {MOVE_BONE_CLUB MOVE_HEADBUTT MOVE_BRICK_BREAK MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [105] = { + .species = SPECIES_GOLDEEN, + .moves = {MOVE_WATERFALL MOVE_FURY_ATTACK MOVE_AGILITY MOVE_PSYBEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [106] = { + .species = SPECIES_NATU, + .moves = {MOVE_NIGHT_SHADE MOVE_FUTURE_SIGHT MOVE_CONFUSE_RAY MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [107] = { + .species = SPECIES_CLEFAIRY, + .moves = {MOVE_FOLLOW_ME MOVE_RETURN MOVE_ENCORE MOVE_SING}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [108] = { + .species = SPECIES_MAGNEMITE, + .moves = {MOVE_SHOCK_WAVE MOVE_SUPERSONIC MOVE_METAL_SOUND MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_GENTLE + }, + [109] = { + .species = SPECIES_SEEL, + .moves = {MOVE_AURORA_BEAM MOVE_DIVE MOVE_BODY_SLAM MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [110] = { + .species = SPECIES_GRIMER, + .moves = {MOVE_SLUDGE MOVE_ROCK_TOMB MOVE_ACID_ARMOR MOVE_MINIMIZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [111] = { + .species = SPECIES_KRABBY, + .moves = {MOVE_CRABHAMMER MOVE_MUD_SHOT MOVE_FLAIL MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [112] = { + .species = SPECIES_EXEGGCUTE, + .moves = {MOVE_CONFUSION MOVE_ANCIENT_POWER MOVE_LEECH_SEED MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [113] = { + .species = SPECIES_EEVEE, + .moves = {MOVE_CHARM MOVE_ATTRACT MOVE_FLAIL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [114] = { + .species = SPECIES_DROWZEE, + .moves = {MOVE_CONFUSION MOVE_HEADBUTT MOVE_DISABLE MOVE_BARRIER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [115] = { + .species = SPECIES_VOLTORB, + .moves = {MOVE_SPARK MOVE_SCREECH MOVE_ROLLOUT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [116] = { + .species = SPECIES_CHINCHOU, + .moves = {MOVE_SPARK MOVE_DIVE MOVE_CONFUSE_RAY MOVE_TAKE_DOWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [117] = { + .species = SPECIES_TEDDIURSA, + .moves = {MOVE_SECRET_POWER MOVE_FAKE_TEARS MOVE_FAINT_ATTACK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [118] = { + .species = SPECIES_DELIBIRD, + .moves = {MOVE_PRESENT MOVE_ICE_BALL MOVE_AERIAL_ACE MOVE_HAIL}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [119] = { + .species = SPECIES_HOUNDOUR, + .moves = {MOVE_CRUNCH MOVE_EMBER MOVE_ROAR MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [120] = { + .species = SPECIES_PHANPY, + .moves = {MOVE_ROLLOUT MOVE_DEFENSE_CURL MOVE_ROCK_TOMB MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [121] = { + .species = SPECIES_SPOINK, + .moves = {MOVE_PSYWAVE MOVE_BOUNCE MOVE_MAGIC_COAT MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [122] = { + .species = SPECIES_ARON, + .moves = {MOVE_METAL_CLAW MOVE_AERIAL_ACE MOVE_METAL_SOUND MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [123] = { + .species = SPECIES_LUVDISC, + .moves = {MOVE_SWEET_KISS MOVE_ATTRACT MOVE_DIVE MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [124] = { + .species = SPECIES_TENTACOOL, + .moves = {MOVE_BUBBLE_BEAM MOVE_ACID MOVE_BARRIER MOVE_WRAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [125] = { + .species = SPECIES_CACNEA, + .moves = {MOVE_NEEDLE_ARM MOVE_FAINT_ATTACK MOVE_COTTON_SPORE MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [126] = { + .species = SPECIES_UNOWN, + .moves = {MOVE_HIDDEN_POWER MOVE_NONE MOVE_NONE MOVE_NONE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [127] = { + .species = SPECIES_KOFFING, + .moves = {MOVE_SLUDGE MOVE_SMOKESCREEN MOVE_TORMENT MOVE_HAZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [128] = { + .species = SPECIES_STARYU, + .moves = {MOVE_BUBBLE_BEAM MOVE_MINIMIZE MOVE_SWIFT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [129] = { + .species = SPECIES_SKIPLOOM, + .moves = {MOVE_MEGA_DRAIN MOVE_CONFUSION MOVE_COTTON_SPORE MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [130] = { + .species = SPECIES_NUZLEAF, + .moves = {MOVE_EXTRASENSORY MOVE_FAKE_OUT MOVE_RAZOR_WIND MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [131] = { + .species = SPECIES_LOMBRE, + .moves = {MOVE_WATER_PULSE MOVE_FAKE_OUT MOVE_BRICK_BREAK MOVE_ABSORB}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [132] = { + .species = SPECIES_VIBRAVA, + .moves = {MOVE_DRAGON_BREATH MOVE_DIG MOVE_SCREECH MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [133] = { + .species = SPECIES_RHYHORN, + .moves = {MOVE_ROCK_BLAST MOVE_DIG MOVE_SCARY_FACE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [134] = { + .species = SPECIES_CLAMPERL, + .moves = {MOVE_DIVE MOVE_TOXIC MOVE_IRON_DEFENSE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [135] = { + .species = SPECIES_PIDGEOTTO, + .moves = {MOVE_AERIAL_ACE MOVE_QUICK_ATTACK MOVE_FEATHER_DANCE MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [136] = { + .species = SPECIES_GROWLITHE, + .moves = {MOVE_FLAME_WHEEL MOVE_BITE MOVE_ROAR MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [137] = { + .species = SPECIES_FARFETCHD, + .moves = {MOVE_SLASH MOVE_KNOCK_OFF MOVE_SWORDS_DANCE MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_STICK, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [138] = { + .species = SPECIES_OMANYTE, + .moves = {MOVE_MUD_SHOT MOVE_WATER_GUN MOVE_ANCIENT_POWER MOVE_TICKLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [139] = { + .species = SPECIES_KABUTO, + .moves = {MOVE_MEGA_DRAIN MOVE_ANCIENT_POWER MOVE_SAND_ATTACK MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [140] = { + .species = SPECIES_LILEEP, + .moves = {MOVE_ANCIENT_POWER MOVE_ACID MOVE_INGRAIN MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [141] = { + .species = SPECIES_ANORITH, + .moves = {MOVE_METAL_CLAW MOVE_FURY_CUTTER MOVE_ANCIENT_POWER MOVE_WATER_GUN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [142] = { + .species = SPECIES_AIPOM, + .moves = {MOVE_FURY_SWIPES MOVE_SAND_ATTACK MOVE_BATON_PASS MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [143] = { + .species = SPECIES_ELEKID, + .moves = {MOVE_THUNDER_PUNCH MOVE_QUICK_ATTACK MOVE_SWIFT MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [144] = { + .species = SPECIES_LOUDRED, + .moves = {MOVE_STOMP MOVE_HOWL MOVE_ASTONISH MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [145] = { + .species = SPECIES_SPINDA, + .moves = {MOVE_DIZZY_PUNCH MOVE_TEETER_DANCE MOVE_PSYBEAM MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [146] = { + .species = SPECIES_NIDORINA, + .moves = {MOVE_DOUBLE_KICK MOVE_BITE MOVE_AERIAL_ACE MOVE_FLATTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [147] = { + .species = SPECIES_NIDORINO, + .moves = {MOVE_DOUBLE_KICK MOVE_WATER_PULSE MOVE_MUD_SLAP MOVE_FLATTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [148] = { + .species = SPECIES_FLAAFFY, + .moves = {MOVE_SHOCK_WAVE MOVE_THUNDER_WAVE MOVE_COTTON_SPORE MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MILD + }, + [149] = { + .species = SPECIES_MAGBY, + .moves = {MOVE_FIRE_PUNCH MOVE_SMOKESCREEN MOVE_CONFUSE_RAY MOVE_SMOG}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [150] = { + .species = SPECIES_NOSEPASS, + .moves = {MOVE_ROCK_SLIDE MOVE_SHOCK_WAVE MOVE_THUNDER_WAVE MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [151] = { + .species = SPECIES_CORSOLA, + .moves = {MOVE_BUBBLE_BEAM MOVE_MIRROR_COAT MOVE_ATTRACT MOVE_ANCIENT_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [152] = { + .species = SPECIES_MAWILE, + .moves = {MOVE_CRUNCH MOVE_FAKE_TEARS MOVE_IRON_DEFENSE MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [153] = { + .species = SPECIES_BUTTERFREE, + .moves = {MOVE_SILVER_WIND MOVE_PSYBEAM MOVE_TOXIC MOVE_WHIRLWIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [154] = { + .species = SPECIES_BEEDRILL, + .moves = {MOVE_TWINEEDLE MOVE_PURSUIT MOVE_ENDEAVOR MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [155] = { + .species = SPECIES_POLIWHIRL, + .moves = {MOVE_WATER_PULSE MOVE_DOUBLE_SLAP MOVE_ICY_WIND MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [156] = { + .species = SPECIES_ONIX, + .moves = {MOVE_ROCK_SLIDE MOVE_BIND MOVE_DRAGON_BREATH MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [157] = { + .species = SPECIES_BEAUTIFLY, + .moves = {MOVE_SILVER_WIND MOVE_MEGA_DRAIN MOVE_ATTRACT MOVE_WHIRLWIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [158] = { + .species = SPECIES_DUSTOX, + .moves = {MOVE_SILVER_WIND MOVE_TOXIC MOVE_PSYBEAM MOVE_WHIRLWIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [159] = { + .species = SPECIES_LEDIAN, + .moves = {MOVE_COMET_PUNCH MOVE_BATON_PASS MOVE_SWORDS_DANCE MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_BASHFUL + }, + [160] = { + .species = SPECIES_ARIADOS, + .moves = {MOVE_SIGNAL_BEAM MOVE_SPIDER_WEB MOVE_NIGHT_SHADE MOVE_TOXIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SERIOUS + }, + [161] = { + .species = SPECIES_YANMA, + .moves = {MOVE_SIGNAL_BEAM MOVE_AERIAL_ACE MOVE_DOUBLE_TEAM MOVE_DETECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [162] = { + .species = SPECIES_DELCATTY, + .moves = {MOVE_SECRET_POWER MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM MOVE_HEAL_BELL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [163] = { + .species = SPECIES_SABLEYE, + .moves = {MOVE_FAINT_ATTACK MOVE_CONFUSE_RAY MOVE_KNOCK_OFF MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [164] = { + .species = SPECIES_LICKITUNG, + .moves = {MOVE_SLAM MOVE_BRICK_BREAK MOVE_LICK MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [165] = { + .species = SPECIES_WEEPINBELL, + .moves = {MOVE_RAZOR_LEAF MOVE_ACID MOVE_WRAP MOVE_SWEET_SCENT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [166] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_MAGNITUDE MOVE_ROCK_THROW MOVE_DEFENSE_CURL MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [167] = { + .species = SPECIES_GLOOM, + .moves = {MOVE_PETAL_DANCE MOVE_ACID MOVE_STUN_SPORE MOVE_MOONLIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [168] = { + .species = SPECIES_PORYGON, + .moves = {MOVE_PSYBEAM MOVE_ICY_WIND MOVE_RECYCLE MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [169] = { + .species = SPECIES_KADABRA, + .moves = {MOVE_CONFUSION MOVE_ROLE_PLAY MOVE_FUTURE_SIGHT MOVE_DISABLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [170] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_WHIRLPOOL MOVE_ROAR MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [171] = { + .species = SPECIES_ROSELIA, + .moves = {MOVE_MAGICAL_LEAF MOVE_TOXIC MOVE_GRASS_WHISTLE MOVE_COTTON_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [172] = { + .species = SPECIES_VOLBEAT, + .moves = {MOVE_SILVER_WIND MOVE_CONFUSE_RAY MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [173] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_SILVER_WIND MOVE_WISH MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [174] = { + .species = SPECIES_IVYSAUR, + .moves = {MOVE_PETAL_DANCE MOVE_GROWTH MOVE_SWEET_SCENT MOVE_FURY_CUTTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [175] = { + .species = SPECIES_CHARMELEON, + .moves = {MOVE_SLASH MOVE_FIRE_SPIN MOVE_SWORDS_DANCE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [176] = { + .species = SPECIES_WARTORTLE, + .moves = {MOVE_WATER_PULSE MOVE_BITE MOVE_MUD_SLAP MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [177] = { + .species = SPECIES_PARASECT, + .moves = {MOVE_SLASH MOVE_PSYBEAM MOVE_STUN_SPORE MOVE_FLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RASH + }, + [178] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_LOW_KICK MOVE_ROCK_TOMB MOVE_FORESIGHT MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [179] = { + .species = SPECIES_HAUNTER, + .moves = {MOVE_SHADOW_PUNCH MOVE_CONFUSE_RAY MOVE_SPITE MOVE_GRUDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RASH + }, + [180] = { + .species = SPECIES_BAYLEEF, + .moves = {MOVE_RAZOR_LEAF MOVE_TOXIC MOVE_SAFEGUARD MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [181] = { + .species = SPECIES_QUILAVA, + .moves = {MOVE_FLAME_WHEEL MOVE_FURY_SWIPES MOVE_SWIFT MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [182] = { + .species = SPECIES_CROCONAW, + .moves = {MOVE_SLASH MOVE_WATER_PULSE MOVE_BITE MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [183] = { + .species = SPECIES_TOGETIC, + .moves = {MOVE_AERIAL_ACE MOVE_MAGICAL_LEAF MOVE_WISH MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [184] = { + .species = SPECIES_MURKROW, + .moves = {MOVE_FAINT_ATTACK MOVE_FLY MOVE_TORMENT MOVE_TAUNT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [185] = { + .species = SPECIES_WOBBUFFET, + .moves = {MOVE_COUNTER MOVE_MIRROR_COAT MOVE_CHARM MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [186] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_SPARK MOVE_FAKE_TEARS MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [187] = { + .species = SPECIES_MINUN, + .moves = {MOVE_SPARK MOVE_CHARM MOVE_ENCORE MOVE_HELPING_HAND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [188] = { + .species = SPECIES_GROVYLE, + .moves = {MOVE_FURY_CUTTER MOVE_ENDEAVOR MOVE_BRICK_BREAK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [189] = { + .species = SPECIES_COMBUSKEN, + .moves = {MOVE_EMBER MOVE_DOUBLE_KICK MOVE_QUICK_ATTACK MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [190] = { + .species = SPECIES_MARSHTOMP, + .moves = {MOVE_MUD_SHOT MOVE_WATER_GUN MOVE_ROCK_TOMB MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [191] = { + .species = SPECIES_PONYTA, + .moves = {MOVE_FIRE_SPIN MOVE_BOUNCE MOVE_QUICK_ATTACK MOVE_TAIL_WHIP}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [192] = { + .species = SPECIES_AZUMARILL, + .moves = {MOVE_BUBBLE_BEAM MOVE_FACADE MOVE_DIG MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [193] = { + .species = SPECIES_SUDOWOODO, + .moves = {MOVE_ROCK_SLIDE MOVE_FAINT_ATTACK MOVE_SANDSTORM MOVE_BLOCK}, + .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [194] = { + .species = SPECIES_MAGCARGO, + .moves = {MOVE_ROCK_SLIDE MOVE_EMBER MOVE_ACID_ARMOR MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [195] = { + .species = SPECIES_PUPITAR, + .moves = {MOVE_DIG MOVE_BITE MOVE_SCARY_FACE MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [196] = { + .species = SPECIES_SEALEO, + .moves = {MOVE_ICE_BALL MOVE_HAIL MOVE_SNORE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [197] = { + .species = SPECIES_RATICATE, + .moves = {MOVE_ENDEAVOR MOVE_PURSUIT MOVE_SCARY_FACE MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [198] = { + .species = SPECIES_MASQUERAIN, + .moves = {MOVE_SILVER_WIND MOVE_AERIAL_ACE MOVE_ICY_WIND MOVE_STUN_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_RELAXED + }, + [199] = { + .species = SPECIES_FURRET, + .moves = {MOVE_SLAM MOVE_PROTECT MOVE_HELPING_HAND MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_SERIOUS + }, + [200] = { + .species = SPECIES_DUNSPARCE, + .moves = {MOVE_HEADBUTT MOVE_GLARE MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [201] = { + .species = SPECIES_DRAGONAIR, + .moves = {MOVE_DRAGON_BREATH MOVE_LEER MOVE_WRAP MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [202] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_BITE MOVE_POISON_FANG MOVE_TAUNT MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_TIMID + }, + [203] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_SECRET_POWER MOVE_SAND_ATTACK MOVE_COVET MOVE_TICKLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [204] = { + .species = SPECIES_CASTFORM, + .moves = {MOVE_EMBER MOVE_WATER_PULSE MOVE_SHOCK_WAVE MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HASTY + }, + [205] = { + .species = SPECIES_SHELGON, + .moves = {MOVE_HEADBUTT MOVE_DRAGON_BREATH MOVE_PROTECT MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [206] = { + .species = SPECIES_METANG, + .moves = {MOVE_METAL_CLAW MOVE_CONFUSION MOVE_PURSUIT MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [207] = { + .species = SPECIES_WIGGLYTUFF, + .moves = {MOVE_SING MOVE_DISABLE MOVE_WISH MOVE_SECRET_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [208] = { + .species = SPECIES_SUNFLORA, + .moves = {MOVE_PETAL_DANCE MOVE_INGRAIN MOVE_LEECH_SEED MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [209] = { + .species = SPECIES_CHIMECHO, + .moves = {MOVE_PSYWAVE MOVE_TAKE_DOWN MOVE_HEAL_BELL MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [210] = { + .species = SPECIES_GLIGAR, + .moves = {MOVE_METAL_CLAW MOVE_DIG MOVE_AERIAL_ACE MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HASTY + }, + [211] = { + .species = SPECIES_QWILFISH, + .moves = {MOVE_BUBBLE_BEAM MOVE_PIN_MISSILE MOVE_SPIKES MOVE_MINIMIZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_IMPISH + }, + [212] = { + .species = SPECIES_SNEASEL, + .moves = {MOVE_FAINT_ATTACK MOVE_FAKE_OUT MOVE_ICY_WIND MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [213] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_WATER_PULSE MOVE_AERIAL_ACE MOVE_STOCKPILE MOVE_SWALLOW}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [214] = { + .species = SPECIES_SWELLOW, + .moves = {MOVE_FLY MOVE_ENDEAVOR MOVE_FACADE MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [215] = { + .species = SPECIES_LAIRON, + .moves = {MOVE_METAL_CLAW MOVE_ROCK_TOMB MOVE_IRON_DEFENSE MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [216] = { + .species = SPECIES_TANGELA, + .moves = {MOVE_MEGA_DRAIN MOVE_SLAM MOVE_TOXIC MOVE_BIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [217] = { + .species = SPECIES_ARBOK, + .moves = {MOVE_POISON_FANG MOVE_DIG MOVE_BITE MOVE_GLARE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [218] = { + .species = SPECIES_PERSIAN, + .moves = {MOVE_FAKE_OUT MOVE_SLASH MOVE_TORMENT MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [219] = { + .species = SPECIES_SEADRA, + .moves = {MOVE_AURORA_BEAM MOVE_SMOKESCREEN MOVE_WATER_GUN MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [220] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_SECRET_POWER MOVE_PSYBEAM MOVE_MAGIC_COAT MOVE_SEISMIC_TOSS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAIVE + }, + [221] = { + .species = SPECIES_VIGOROTH, + .moves = {MOVE_SLASH MOVE_COUNTER MOVE_ENCORE MOVE_UPROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_LONELY + }, + [222] = { + .species = SPECIES_LUNATONE, + .moves = {MOVE_CONFUSION MOVE_COSMIC_POWER MOVE_LIGHT_SCREEN MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [223] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_CONFUSION MOVE_FIRE_SPIN MOVE_LIGHT_SCREEN MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [224] = { + .species = SPECIES_NOCTOWL, + .moves = {MOVE_CONFUSION MOVE_AERIAL_ACE MOVE_FAINT_ATTACK MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [225] = { + .species = SPECIES_SANDSLASH, + .moves = {MOVE_CRUSH_CLAW MOVE_ROCK_SLIDE MOVE_SWIFT MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [226] = { + .species = SPECIES_VENOMOTH, + .moves = {MOVE_SILVER_WIND MOVE_PSYBEAM MOVE_SLEEP_POWDER MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [227] = { + .species = SPECIES_CHANSEY, + .moves = {MOVE_METRONOME MOVE_REFRESH MOVE_DEFENSE_CURL MOVE_MINIMIZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [228] = { + .species = SPECIES_SEAKING, + .moves = {MOVE_WATER_PULSE MOVE_PSYBEAM MOVE_SWIFT MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [229] = { + .species = SPECIES_JUMPLUFF, + .moves = {MOVE_AERIAL_ACE MOVE_SWAGGER MOVE_PSYCH_UP MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [230] = { + .species = SPECIES_PILOSWINE, + .moves = {MOVE_DIG MOVE_ANCIENT_POWER MOVE_HAIL MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [231] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_AIR_CUTTER MOVE_CONFUSE_RAY MOVE_TOXIC MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [232] = { + .species = SPECIES_PRIMEAPE, + .moves = {MOVE_KARATE_CHOP MOVE_COUNTER MOVE_SWAGGER MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [233] = { + .species = SPECIES_HITMONLEE, + .moves = {MOVE_ROLLING_KICK MOVE_BRICK_BREAK MOVE_FOCUS_ENERGY MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [234] = { + .species = SPECIES_HITMONCHAN, + .moves = {MOVE_MACH_PUNCH MOVE_SKY_UPPERCUT MOVE_DETECT MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [235] = { + .species = SPECIES_GIRAFARIG, + .moves = {MOVE_PSYBEAM MOVE_STOMP MOVE_WISH MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [236] = { + .species = SPECIES_HITMONTOP, + .moves = {MOVE_TRIPLE_KICK MOVE_DIG MOVE_MACH_PUNCH MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [237] = { + .species = SPECIES_BANETTE, + .moves = {MOVE_NIGHT_SHADE MOVE_WILL_O_WISP MOVE_SPITE MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [238] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_BATON_PASS MOVE_SWORDS_DANCE MOVE_ENDURE MOVE_DIG}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MILD + }, + [239] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_POISON_TAIL MOVE_BITE MOVE_GLARE MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [240] = { + .species = SPECIES_ZANGOOSE, + .moves = {MOVE_SLASH MOVE_DOUBLE_KICK MOVE_ROAR MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [241] = { + .species = SPECIES_CAMERUPT, + .moves = {MOVE_MAGNITUDE MOVE_PROTECT MOVE_SANDSTORM MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [242] = { + .species = SPECIES_SHARPEDO, + .moves = {MOVE_SLASH MOVE_BITE MOVE_WATER_PULSE MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [243] = { + .species = SPECIES_TROPIUS, + .moves = {MOVE_MAGICAL_LEAF MOVE_WHIRLWIND MOVE_AERIAL_ACE MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [244] = { + .species = SPECIES_MAGNETON, + .moves = {MOVE_SHOCK_WAVE MOVE_SONIC_BOOM MOVE_THUNDER_WAVE MOVE_SUPERSONIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_LONELY + }, + [245] = { + .species = SPECIES_MANTINE, + .moves = {MOVE_BUBBLE_BEAM MOVE_AERIAL_ACE MOVE_RAIN_DANCE MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [246] = { + .species = SPECIES_STANTLER, + .moves = {MOVE_EXTRASENSORY MOVE_CONFUSE_RAY MOVE_STOMP MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_GENTLE + }, + [247] = { + .species = SPECIES_ABSOL, + .moves = {MOVE_BITE MOVE_RAZOR_WIND MOVE_FUTURE_SIGHT MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [248] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_STOCKPILE MOVE_SWALLOW MOVE_SPIT_UP MOVE_SLUDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIRKY + }, + [249] = { + .species = SPECIES_CRAWDAUNT, + .moves = {MOVE_BUBBLE_BEAM MOVE_VICE_GRIP MOVE_KNOCK_OFF MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [250] = { + .species = SPECIES_PIDGEOT, + .moves = {MOVE_AERIAL_ACE MOVE_FEATHER_DANCE MOVE_MUD_SLAP MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [251] = { + .species = SPECIES_GRUMPIG, + .moves = {MOVE_PSYBEAM MOVE_CONFUSE_RAY MOVE_FUTURE_SIGHT MOVE_MAGIC_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [252] = { + .species = SPECIES_TORKOAL, + .moves = {MOVE_EMBER MOVE_FIRE_SPIN MOVE_SMOKESCREEN MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [253] = { + .species = SPECIES_KINGLER, + .moves = {MOVE_CRABHAMMER MOVE_METAL_CLAW MOVE_MUD_SHOT MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [254] = { + .species = SPECIES_CACTURNE, + .moves = {MOVE_NEEDLE_ARM MOVE_FAINT_ATTACK MOVE_ACID MOVE_MEGA_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_HASTY + }, + [255] = { + .species = SPECIES_BELLOSSOM, + .moves = {MOVE_PETAL_DANCE MOVE_SAFEGUARD MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [256] = { + .species = SPECIES_OCTILLERY, + .moves = {MOVE_OCTAZOOKA MOVE_AURORA_BEAM MOVE_PSYBEAM MOVE_ROCK_BLAST}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [257] = { + .species = SPECIES_HUNTAIL, + .moves = {MOVE_WHIRLPOOL MOVE_SCARY_FACE MOVE_MUD_SLAP MOVE_BITE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [258] = { + .species = SPECIES_GOREBYSS, + .moves = {MOVE_WHIRLPOOL MOVE_AMNESIA MOVE_ICY_WIND MOVE_CONFUSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [259] = { + .species = SPECIES_RELICANTH, + .moves = {MOVE_ANCIENT_POWER MOVE_WATER_PULSE MOVE_HARDEN MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [260] = { + .species = SPECIES_OMASTAR, + .moves = {MOVE_BUBBLE_BEAM MOVE_SPIKE_CANNON MOVE_TICKLE MOVE_ANCIENT_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [261] = { + .species = SPECIES_KABUTOPS, + .moves = {MOVE_SLASH MOVE_DIG MOVE_FURY_CUTTER MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [262] = { + .species = SPECIES_POLIWRATH, + .moves = {MOVE_SUBMISSION MOVE_DIG MOVE_ROCK_TOMB MOVE_BUBBLE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [263] = { + .species = SPECIES_SCYTHER, + .moves = {MOVE_FURY_CUTTER MOVE_AERIAL_ACE MOVE_LIGHT_SCREEN MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [264] = { + .species = SPECIES_PINSIR, + .moves = {MOVE_SUBMISSION MOVE_FOCUS_ENERGY MOVE_SWORDS_DANCE MOVE_REVENGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_NAUGHTY + }, + [265] = { + .species = SPECIES_POLITOED, + .moves = {MOVE_DIVE MOVE_DIG MOVE_HYPNOSIS MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [266] = { + .species = SPECIES_CLOYSTER, + .moves = {MOVE_AURORA_BEAM MOVE_SPIKE_CANNON MOVE_SUPERSONIC MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [267] = { + .species = SPECIES_DELCATTY, + .moves = {MOVE_FAKE_TEARS MOVE_SING MOVE_THUNDERBOLT MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [268] = { + .species = SPECIES_SABLEYE, + .moves = {MOVE_SHADOW_BALL MOVE_FAINT_ATTACK MOVE_CONFUSE_RAY MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [269] = { + .species = SPECIES_LICKITUNG, + .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_SHADOW_BALL MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [270] = { + .species = SPECIES_WEEPINBELL, + .moves = {MOVE_SLUDGE_BOMB MOVE_RAZOR_LEAF MOVE_SLEEP_POWDER MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIRKY + }, + [271] = { + .species = SPECIES_GRAVELER, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [272] = { + .species = SPECIES_GLOOM, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SLUDGE_BOMB MOVE_MOONLIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [273] = { + .species = SPECIES_PORYGON, + .moves = {MOVE_TRI_ATTACK MOVE_PSYCHIC MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [274] = { + .species = SPECIES_KADABRA, + .moves = {MOVE_PSYCHIC MOVE_THUNDER_WAVE MOVE_REFLECT MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [275] = { + .species = SPECIES_WAILMER, + .moves = {MOVE_WATER_SPOUT MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [276] = { + .species = SPECIES_ROSELIA, + .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_GRASS_WHISTLE MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [277] = { + .species = SPECIES_VOLBEAT, + .moves = {MOVE_SIGNAL_BEAM MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_TAIL_GLOW}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [278] = { + .species = SPECIES_ILLUMISE, + .moves = {MOVE_SILVER_WIND MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [279] = { + .species = SPECIES_IVYSAUR, + .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_SLEEP_POWDER MOVE_LEECH_SEED}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [280] = { + .species = SPECIES_CHARMELEON, + .moves = {MOVE_FLAMETHROWER MOVE_SLASH MOVE_ANCIENT_POWER MOVE_DRAGON_RAGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [281] = { + .species = SPECIES_WARTORTLE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAPID_SPIN MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [282] = { + .species = SPECIES_PARASECT, + .moves = {MOVE_SPORE MOVE_GIGA_DRAIN MOVE_DIG MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [283] = { + .species = SPECIES_MACHOKE, + .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_FORESIGHT MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [284] = { + .species = SPECIES_HAUNTER, + .moves = {MOVE_PSYCHIC MOVE_HYPNOSIS MOVE_NIGHTMARE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [285] = { + .species = SPECIES_BAYLEEF, + .moves = {MOVE_GIGA_DRAIN MOVE_BODY_SLAM MOVE_GRASS_WHISTLE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [286] = { + .species = SPECIES_QUILAVA, + .moves = {MOVE_FLAMETHROWER MOVE_CRUSH_CLAW MOVE_BODY_SLAM MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [287] = { + .species = SPECIES_CROCONAW, + .moves = {MOVE_MEGA_KICK MOVE_AERIAL_ACE MOVE_ROCK_SLIDE MOVE_DIG}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [288] = { + .species = SPECIES_TOGETIC, + .moves = {MOVE_RETURN MOVE_SWEET_KISS MOVE_AERIAL_ACE MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [289] = { + .species = SPECIES_MURKROW, + .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [290] = { + .species = SPECIES_WOBBUFFET, + .moves = {MOVE_COUNTER MOVE_MIRROR_COAT MOVE_ENCORE MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CAREFUL + }, + [291] = { + .species = SPECIES_PLUSLE, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_SEISMIC_TOSS MOVE_WISH}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [292] = { + .species = SPECIES_MINUN, + .moves = {MOVE_THUNDERBOLT MOVE_ATTRACT MOVE_CHARM MOVE_WISH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [293] = { + .species = SPECIES_GROVYLE, + .moves = {MOVE_GIGA_DRAIN MOVE_CRUSH_CLAW MOVE_SCREECH MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [294] = { + .species = SPECIES_COMBUSKEN, + .moves = {MOVE_FLAMETHROWER MOVE_SKY_UPPERCUT MOVE_SLASH MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [295] = { + .species = SPECIES_MARSHTOMP, + .moves = {MOVE_MUDDY_WATER MOVE_EARTHQUAKE MOVE_MUD_SLAP MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [296] = { + .species = SPECIES_PONYTA, + .moves = {MOVE_FLAMETHROWER MOVE_BODY_SLAM MOVE_DOUBLE_KICK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [297] = { + .species = SPECIES_AZUMARILL, + .moves = {MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_IRON_TAIL MOVE_DIG}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [298] = { + .species = SPECIES_SUDOWOODO, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_LOW_KICK MOVE_SELF_DESTRUCT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [299] = { + .species = SPECIES_MAGCARGO, + .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [300] = { + .species = SPECIES_PUPITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUNCH MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [301] = { + .species = SPECIES_SEALEO, + .moves = {MOVE_ICE_BEAM MOVE_SURF MOVE_BODY_SLAM MOVE_HAIL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [302] = { + .species = SPECIES_RATICATE, + .moves = {MOVE_SUPER_FANG MOVE_HYPER_FANG MOVE_SHADOW_BALL MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [303] = { + .species = SPECIES_MASQUERAIN, + .moves = {MOVE_HYDRO_PUMP MOVE_ICE_BEAM MOVE_GIGA_DRAIN MOVE_STUN_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [304] = { + .species = SPECIES_FURRET, + .moves = {MOVE_TRICK MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [305] = { + .species = SPECIES_DUNSPARCE, + .moves = {MOVE_ICE_BEAM MOVE_ROCK_TOMB MOVE_BITE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [306] = { + .species = SPECIES_DRAGONAIR, + .moves = {MOVE_RETURN MOVE_REST MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [307] = { + .species = SPECIES_MIGHTYENA, + .moves = {MOVE_CRUNCH MOVE_SHADOW_BALL MOVE_FRUSTRATION MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIRKY + }, + [308] = { + .species = SPECIES_LINOONE, + .moves = {MOVE_TRICK MOVE_FRUSTRATION MOVE_THUNDER_WAVE MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [309] = { + .species = SPECIES_CASTFORM, + .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_WATER_PULSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [310] = { + .species = SPECIES_SHELGON, + .moves = {MOVE_FRUSTRATION MOVE_DRAGON_DANCE MOVE_CRUNCH MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [311] = { + .species = SPECIES_METANG, + .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_BODY_SLAM MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [312] = { + .species = SPECIES_WIGGLYTUFF, + .moves = {MOVE_FAKE_TEARS MOVE_SING MOVE_DREAM_EATER MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [313] = { + .species = SPECIES_SUNFLORA, + .moves = {MOVE_GIGA_DRAIN MOVE_GRASS_WHISTLE MOVE_GROWTH MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [314] = { + .species = SPECIES_CHIMECHO, + .moves = {MOVE_PSYCHIC MOVE_HYPNOSIS MOVE_DREAM_EATER MOVE_HEAL_BELL}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [315] = { + .species = SPECIES_GLIGAR, + .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_GUILLOTINE MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [316] = { + .species = SPECIES_QWILFISH, + .moves = {MOVE_REVENGE MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [317] = { + .species = SPECIES_SNEASEL, + .moves = {MOVE_CRUSH_CLAW MOVE_BRICK_BREAK MOVE_AERIAL_ACE MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [318] = { + .species = SPECIES_PELIPPER, + .moves = {MOVE_SURF MOVE_BLIZZARD MOVE_AERIAL_ACE MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [319] = { + .species = SPECIES_SWELLOW, + .moves = {MOVE_FACADE MOVE_AERIAL_ACE MOVE_PURSUIT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [320] = { + .species = SPECIES_LAIRON, + .moves = {MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_ROAR MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [321] = { + .species = SPECIES_TANGELA, + .moves = {MOVE_GIGA_DRAIN MOVE_STUN_SPORE MOVE_REST MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [322] = { + .species = SPECIES_ARBOK, + .moves = {MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_GLARE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [323] = { + .species = SPECIES_PERSIAN, + .moves = {MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_ROAR MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [324] = { + .species = SPECIES_SEADRA, + .moves = {MOVE_HYDRO_PUMP MOVE_FRUSTRATION MOVE_DRAGON_BREATH MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [325] = { + .species = SPECIES_KECLEON, + .moves = {MOVE_TRICK MOVE_BRICK_BREAK MOVE_SHADOW_BALL MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [326] = { + .species = SPECIES_VIGOROTH, + .moves = {MOVE_CRUSH_CLAW MOVE_REVERSAL MOVE_ENDURE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [327] = { + .species = SPECIES_LUNATONE, + .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_COSMIC_POWER MOVE_CALM_MIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [328] = { + .species = SPECIES_SOLROCK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COSMIC_POWER MOVE_OVERHEAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [329] = { + .species = SPECIES_NOCTOWL, + .moves = {MOVE_PSYCHIC MOVE_FAINT_ATTACK MOVE_AERIAL_ACE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [330] = { + .species = SPECIES_SANDSLASH, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUSH_CLAW MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [331] = { + .species = SPECIES_VENOMOTH, + .moves = {MOVE_SIGNAL_BEAM MOVE_PSYCHIC MOVE_SLUDGE_BOMB MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [332] = { + .species = SPECIES_CHANSEY, + .moves = {MOVE_SEISMIC_TOSS MOVE_SHADOW_BALL MOVE_DOUBLE_TEAM MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_RELAXED + }, + [333] = { + .species = SPECIES_SEAKING, + .moves = {MOVE_HORN_DRILL MOVE_MEGAHORN MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [334] = { + .species = SPECIES_JUMPLUFF, + .moves = {MOVE_LEECH_SEED MOVE_SLEEP_POWDER MOVE_GIGA_DRAIN MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [335] = { + .species = SPECIES_PILOSWINE, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BODY_SLAM MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [336] = { + .species = SPECIES_GOLBAT, + .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_AIR_CUTTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [337] = { + .species = SPECIES_PRIMEAPE, + .moves = {MOVE_CROSS_CHOP MOVE_ROCK_TOMB MOVE_OVERHEAT MOVE_BULK_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [338] = { + .species = SPECIES_HITMONLEE, + .moves = {MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_FORESIGHT MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [339] = { + .species = SPECIES_HITMONCHAN, + .moves = {MOVE_DYNAMIC_PUNCH MOVE_MACH_PUNCH MOVE_DETECT MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [340] = { + .species = SPECIES_GIRAFARIG, + .moves = {MOVE_PSYCHIC MOVE_CRUNCH MOVE_BATON_PASS MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [341] = { + .species = SPECIES_HITMONTOP, + .moves = {MOVE_DOUBLE_EDGE MOVE_SEISMIC_TOSS MOVE_ROCK_SLIDE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [342] = { + .species = SPECIES_BANETTE, + .moves = {MOVE_SHADOW_BALL MOVE_FRUSTRATION MOVE_SCREECH MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [343] = { + .species = SPECIES_NINJASK, + .moves = {MOVE_SLASH MOVE_SHADOW_BALL MOVE_SWORDS_DANCE MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [344] = { + .species = SPECIES_SEVIPER, + .moves = {MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [345] = { + .species = SPECIES_ZANGOOSE, + .moves = {MOVE_CRUSH_CLAW MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [346] = { + .species = SPECIES_CAMERUPT, + .moves = {MOVE_EARTHQUAKE MOVE_ERUPTION MOVE_BODY_SLAM MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [347] = { + .species = SPECIES_SHARPEDO, + .moves = {MOVE_DOUBLE_EDGE MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [348] = { + .species = SPECIES_TROPIUS, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [349] = { + .species = SPECIES_MAGNETON, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_THUNDER_WAVE MOVE_METAL_SOUND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [350] = { + .species = SPECIES_MANTINE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAIN_DANCE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [351] = { + .species = SPECIES_STANTLER, + .moves = {MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [352] = { + .species = SPECIES_ABSOL, + .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_AERIAL_ACE MOVE_IRON_TAIL}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [353] = { + .species = SPECIES_SWALOT, + .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_BODY_SLAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [354] = { + .species = SPECIES_CRAWDAUNT, + .moves = {MOVE_GUILLOTINE MOVE_FRUSTRATION MOVE_ANCIENT_POWER MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [355] = { + .species = SPECIES_PIDGEOT, + .moves = {MOVE_RETURN MOVE_AERIAL_ACE MOVE_STEEL_WING MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [356] = { + .species = SPECIES_GRUMPIG, + .moves = {MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [357] = { + .species = SPECIES_TORKOAL, + .moves = {MOVE_OVERHEAT MOVE_BODY_SLAM MOVE_SMOKESCREEN MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [358] = { + .species = SPECIES_KINGLER, + .moves = {MOVE_GUILLOTINE MOVE_ROCK_TOMB MOVE_FLAIL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [359] = { + .species = SPECIES_CACTURNE, + .moves = {MOVE_MEGA_KICK MOVE_TEETER_DANCE MOVE_FAINT_ATTACK MOVE_SANDSTORM}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_HARDY + }, + [360] = { + .species = SPECIES_BELLOSSOM, + .moves = {MOVE_SOLAR_BEAM MOVE_ATTRACT MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [361] = { + .species = SPECIES_OCTILLERY, + .moves = {MOVE_OCTAZOOKA MOVE_FIRE_BLAST MOVE_THUNDER_WAVE MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [362] = { + .species = SPECIES_HUNTAIL, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_CRUNCH MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [363] = { + .species = SPECIES_GOREBYSS, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_PSYCHIC MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [364] = { + .species = SPECIES_RELICANTH, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AMNESIA MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [365] = { + .species = SPECIES_OMASTAR, + .moves = {MOVE_HYDRO_PUMP MOVE_RAIN_DANCE MOVE_ICE_BEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [366] = { + .species = SPECIES_KABUTOPS, + .moves = {MOVE_SLASH MOVE_ROCK_SLIDE MOVE_FLAIL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [367] = { + .species = SPECIES_POLIWRATH, + .moves = {MOVE_BRICK_BREAK MOVE_HYPNOSIS MOVE_REST MOVE_BELLY_DRUM}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [368] = { + .species = SPECIES_SCYTHER, + .moves = {MOVE_SILVER_WIND MOVE_AERIAL_ACE MOVE_SWORDS_DANCE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [369] = { + .species = SPECIES_PINSIR, + .moves = {MOVE_GUILLOTINE MOVE_SWORDS_DANCE MOVE_FLAIL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [370] = { + .species = SPECIES_POLITOED, + .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_MUD_SLAP MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [371] = { + .species = SPECIES_CLOYSTER, + .moves = {MOVE_DIVE MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [372] = { + .species = SPECIES_DUGTRIO, + .moves = {MOVE_EARTHQUAKE MOVE_TRI_ATTACK MOVE_SLASH MOVE_SAND_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [373] = { + .species = SPECIES_MEDICHAM, + .moves = {MOVE_PSYCHIC MOVE_HI_JUMP_KICK MOVE_CALM_MIND MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [374] = { + .species = SPECIES_MISDREAVUS, + .moves = {MOVE_PAIN_SPLIT MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [375] = { + .species = SPECIES_FEAROW, + .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_FACADE MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [376] = { + .species = SPECIES_GRANBULL, + .moves = {MOVE_MEGA_KICK MOVE_SMELLING_SALT MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [377] = { + .species = SPECIES_JYNX, + .moves = {MOVE_ICE_BEAM MOVE_FAKE_OUT MOVE_LOVELY_KISS MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [378] = { + .species = SPECIES_DUSCLOPS, + .moves = {MOVE_WILL_O_WISP MOVE_SEISMIC_TOSS MOVE_PAIN_SPLIT MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [379] = { + .species = SPECIES_DODRIO, + .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [380] = { + .species = SPECIES_MR_MIME, + .moves = {MOVE_PSYCHIC MOVE_MAGICAL_LEAF MOVE_FAKE_OUT MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [381] = { + .species = SPECIES_LANTURN, + .moves = {MOVE_SURF MOVE_CONFUSE_RAY MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [382] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_SKY_UPPERCUT MOVE_MACH_PUNCH MOVE_HEADBUTT MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [383] = { + .species = SPECIES_FORRETRESS, + .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_LIGHT_SCREEN MOVE_SPIKES}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [384] = { + .species = SPECIES_WHISCASH, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AMNESIA MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [385] = { + .species = SPECIES_XATU, + .moves = {MOVE_DRILL_PECK MOVE_NIGHT_SHADE MOVE_WISH MOVE_FUTURE_SIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [386] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_STEEL_WING MOVE_AIR_CUTTER MOVE_COUNTER MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [387] = { + .species = SPECIES_MAROWAK, + .moves = {MOVE_BONEMERANG MOVE_ROCK_SLIDE MOVE_ICY_WIND MOVE_HEADBUTT}, + .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [388] = { + .species = SPECIES_QUAGSIRE, + .moves = {MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_COUNTER MOVE_MUD_SLAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [389] = { + .species = SPECIES_CLEFABLE, + .moves = {MOVE_METRONOME MOVE_DOUBLE_TEAM MOVE_REFLECT MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BRAVE + }, + [390] = { + .species = SPECIES_HARIYAMA, + .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [391] = { + .species = SPECIES_RAICHU, + .moves = {MOVE_THUNDERBOLT MOVE_QUICK_ATTACK MOVE_LIGHT_SCREEN MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [392] = { + .species = SPECIES_DEWGONG, + .moves = {MOVE_ICE_BEAM MOVE_ICY_WIND MOVE_HEADBUTT MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [393] = { + .species = SPECIES_MANECTRIC, + .moves = {MOVE_THUNDERBOLT MOVE_FLASH MOVE_QUICK_ATTACK MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [394] = { + .species = SPECIES_VILEPLUME, + .moves = {MOVE_SLUDGE_BOMB MOVE_PETAL_DANCE MOVE_MOONLIGHT MOVE_AROMATHERAPY}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [395] = { + .species = SPECIES_VICTREEBEL, + .moves = {MOVE_GIGA_DRAIN MOVE_SLEEP_POWDER MOVE_SWEET_SCENT MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [396] = { + .species = SPECIES_ELECTRODE, + .moves = {MOVE_THUNDERBOLT MOVE_SWIFT MOVE_LIGHT_SCREEN MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [397] = { + .species = SPECIES_EXPLOUD, + .moves = {MOVE_HYPER_VOICE MOVE_SHADOW_BALL MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [398] = { + .species = SPECIES_SHIFTRY, + .moves = {MOVE_GIGA_DRAIN MOVE_FAINT_ATTACK MOVE_QUICK_ATTACK MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [399] = { + .species = SPECIES_GLALIE, + .moves = {MOVE_ICE_BEAM MOVE_CRUNCH MOVE_HAIL MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [400] = { + .species = SPECIES_LUDICOLO, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [401] = { + .species = SPECIES_HYPNO, + .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_HYPNOSIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [402] = { + .species = SPECIES_GOLEM, + .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_COUNTER MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [403] = { + .species = SPECIES_RHYDON, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_TOMB MOVE_SCARY_FACE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [404] = { + .species = SPECIES_ALAKAZAM, + .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [405] = { + .species = SPECIES_WEEZING, + .moves = {MOVE_SLUDGE_BOMB MOVE_WILL_O_WISP MOVE_SHADOW_BALL MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [406] = { + .species = SPECIES_KANGASKHAN, + .moves = {MOVE_DIZZY_PUNCH MOVE_BRICK_BREAK MOVE_COUNTER MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [407] = { + .species = SPECIES_ELECTABUZZ, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_BRICK_BREAK MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [408] = { + .species = SPECIES_TAUROS, + .moves = {MOVE_EARTHQUAKE MOVE_THRASH MOVE_SWAGGER MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [409] = { + .species = SPECIES_SLOWBRO, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_HEADBUTT MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [410] = { + .species = SPECIES_SLOWKING, + .moves = {MOVE_PSYCHIC MOVE_BRICK_BREAK MOVE_AMNESIA MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [411] = { + .species = SPECIES_MILTANK, + .moves = {MOVE_FACADE MOVE_SHADOW_BALL MOVE_COUNTER MOVE_MILK_DRINK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [412] = { + .species = SPECIES_ALTARIA, + .moves = {MOVE_DRAGON_CLAW MOVE_AERIAL_ACE MOVE_REFRESH MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [413] = { + .species = SPECIES_NIDOQUEEN, + .moves = {MOVE_SLUDGE_BOMB MOVE_DOUBLE_KICK MOVE_BODY_SLAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [414] = { + .species = SPECIES_NIDOKING, + .moves = {MOVE_HORN_DRILL MOVE_DOUBLE_KICK MOVE_BODY_SLAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [415] = { + .species = SPECIES_MAGMAR, + .moves = {MOVE_FLAMETHROWER MOVE_SMOKESCREEN MOVE_BRICK_BREAK MOVE_BARRIER}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [416] = { + .species = SPECIES_CRADILY, + .moves = {MOVE_GIGA_DRAIN MOVE_ROCK_SLIDE MOVE_BARRIER MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [417] = { + .species = SPECIES_ARMALDO, + .moves = {MOVE_SLASH MOVE_AERIAL_ACE MOVE_ANCIENT_POWER MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [418] = { + .species = SPECIES_GOLDUCK, + .moves = {MOVE_HYDRO_PUMP MOVE_DIG MOVE_BRICK_BREAK MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [419] = { + .species = SPECIES_RAPIDASH, + .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_KICK MOVE_QUICK_ATTACK MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIET + }, + [420] = { + .species = SPECIES_MUK, + .moves = {MOVE_SLUDGE_BOMB MOVE_BODY_SLAM MOVE_SCREECH MOVE_MINIMIZE}, + .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [421] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [422] = { + .species = SPECIES_AMPHAROS, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_THUNDER_WAVE MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [423] = { + .species = SPECIES_SCIZOR, + .moves = {MOVE_METAL_CLAW MOVE_AERIAL_ACE MOVE_COUNTER MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [424] = { + .species = SPECIES_HERACROSS, + .moves = {MOVE_MEGAHORN MOVE_BRICK_BREAK MOVE_ROCK_TOMB MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [425] = { + .species = SPECIES_URSARING, + .moves = {MOVE_MEGA_KICK MOVE_CRUNCH MOVE_AERIAL_ACE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [426] = { + .species = SPECIES_HOUNDOOM, + .moves = {MOVE_FLAMETHROWER MOVE_SHADOW_BALL MOVE_COUNTER MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [427] = { + .species = SPECIES_DONPHAN, + .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_SWAGGER MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [428] = { + .species = SPECIES_CLAYDOL, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [429] = { + .species = SPECIES_WAILORD, + .moves = {MOVE_SURF MOVE_ICY_WIND MOVE_BODY_SLAM MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [430] = { + .species = SPECIES_NINETALES, + .moves = {MOVE_FLAMETHROWER MOVE_ROAR MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [431] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [432] = { + .species = SPECIES_SHUCKLE, + .moves = {MOVE_ROLLOUT MOVE_DEFENSE_CURL MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BRAVE + }, + [433] = { + .species = SPECIES_STEELIX, + .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_BREATH MOVE_ROCK_TOMB MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [434] = { + .species = SPECIES_TENTACRUEL, + .moves = {MOVE_SLUDGE_BOMB MOVE_ICY_WIND MOVE_BARRIER MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [435] = { + .species = SPECIES_AERODACTYL, + .moves = {MOVE_ANCIENT_POWER MOVE_DRAGON_BREATH MOVE_AERIAL_ACE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [436] = { + .species = SPECIES_PORYGON2, + .moves = {MOVE_TRI_ATTACK MOVE_AERIAL_ACE MOVE_SHADOW_BALL MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [437] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_MAGICAL_LEAF MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [438] = { + .species = SPECIES_EXEGGUTOR, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [439] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_PSYCHIC MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [440] = { + .species = SPECIES_FLYGON, + .moves = {MOVE_EARTHQUAKE MOVE_STEEL_WING MOVE_FAINT_ATTACK MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [441] = { + .species = SPECIES_VENUSAUR, + .moves = {MOVE_GIGA_DRAIN MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_SLEEP_POWDER}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [442] = { + .species = SPECIES_VAPOREON, + .moves = {MOVE_SURF MOVE_ROAR MOVE_BITE MOVE_QUICK_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [443] = { + .species = SPECIES_JOLTEON, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_ATTRACT MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [444] = { + .species = SPECIES_FLAREON, + .moves = {MOVE_FLAMETHROWER MOVE_ROAR MOVE_BITE MOVE_SAND_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [445] = { + .species = SPECIES_MEGANIUM, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_LIGHT_SCREEN MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [446] = { + .species = SPECIES_ESPEON, + .moves = {MOVE_PSYCHIC MOVE_CHARM MOVE_CALM_MIND MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [447] = { + .species = SPECIES_UMBREON, + .moves = {MOVE_CONFUSE_RAY MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [448] = { + .species = SPECIES_BLASTOISE, + .moves = {MOVE_HYDRO_PUMP MOVE_RAIN_DANCE MOVE_BITE MOVE_SEISMIC_TOSS}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [449] = { + .species = SPECIES_FERALIGATR, + .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_AERIAL_ACE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [450] = { + .species = SPECIES_AGGRON, + .moves = {MOVE_IRON_TAIL MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [451] = { + .species = SPECIES_BLAZIKEN, + .moves = {MOVE_FLAMETHROWER MOVE_SUNNY_DAY MOVE_DOUBLE_KICK MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [452] = { + .species = SPECIES_WALREIN, + .moves = {MOVE_BLIZZARD MOVE_HAIL MOVE_YAWN MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [453] = { + .species = SPECIES_SCEPTILE, + .moves = {MOVE_LEAF_BLADE MOVE_LEECH_SEED MOVE_AERIAL_ACE MOVE_DETECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [454] = { + .species = SPECIES_CHARIZARD, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_ROAR MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [455] = { + .species = SPECIES_TYPHLOSION, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_SMOKESCREEN MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [456] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SURF MOVE_ATTRACT MOVE_CONFUSE_RAY MOVE_SING}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [457] = { + .species = SPECIES_CROBAT, + .moves = {MOVE_SLUDGE_BOMB MOVE_BITE MOVE_ASTONISH MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [458] = { + .species = SPECIES_SWAMPERT, + .moves = {MOVE_EARTHQUAKE MOVE_COUNTER MOVE_REST MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [459] = { + .species = SPECIES_GYARADOS, + .moves = {MOVE_RETURN MOVE_BITE MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [460] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_FACADE MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [461] = { + .species = SPECIES_KINGDRA, + .moves = {MOVE_HYDRO_PUMP MOVE_DRAGON_BREATH MOVE_ICY_WIND MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [462] = { + .species = SPECIES_BLISSEY, + .moves = {MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_SING MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [463] = { + .species = SPECIES_MILOTIC, + .moves = {MOVE_HYDRO_PUMP MOVE_ICY_WIND MOVE_RECOVER MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [464] = { + .species = SPECIES_ARCANINE, + .moves = {MOVE_FLAMETHROWER MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [465] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_DRAGON_CLAW MOVE_AERIAL_ACE MOVE_HEADBUTT MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [466] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_METEOR_MASH MOVE_AERIAL_ACE MOVE_FACADE MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [467] = { + .species = SPECIES_SLAKING, + .moves = {MOVE_YAWN MOVE_BULK_UP MOVE_SWAGGER MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [468] = { + .species = SPECIES_DUGTRIO, + .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_AERIAL_ACE MOVE_TRI_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [469] = { + .species = SPECIES_MEDICHAM, + .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_PSYCHIC MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [470] = { + .species = SPECIES_MAROWAK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [471] = { + .species = SPECIES_QUAGSIRE, + .moves = {MOVE_CURSE MOVE_ATTRACT MOVE_YAWN MOVE_ANCIENT_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_SASSY + }, + [472] = { + .species = SPECIES_MISDREAVUS, + .moves = {MOVE_PSYCHIC MOVE_ATTRACT MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [473] = { + .species = SPECIES_FEAROW, + .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_ATTRACT MOVE_PURSUIT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [474] = { + .species = SPECIES_GRANBULL, + .moves = {MOVE_OVERHEAT MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_QUIET + }, + [475] = { + .species = SPECIES_JYNX, + .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_LOVELY_KISS MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [476] = { + .species = SPECIES_DUSCLOPS, + .moves = {MOVE_TOXIC MOVE_CONFUSE_RAY MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [477] = { + .species = SPECIES_DODRIO, + .moves = {MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_FAINT_ATTACK MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [478] = { + .species = SPECIES_MR_MIME, + .moves = {MOVE_BATON_PASS MOVE_SWAGGER MOVE_PSYCH_UP MOVE_PSYCHIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [479] = { + .species = SPECIES_LANTURN, + .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_THUNDERBOLT MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [480] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_GIGA_DRAIN MOVE_LEECH_SEED MOVE_FOCUS_PUNCH MOVE_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [481] = { + .species = SPECIES_FORRETRESS, + .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_COUNTER MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [482] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_SPIKES MOVE_ROAR MOVE_DRILL_PECK MOVE_TOXIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [483] = { + .species = SPECIES_WHISCASH, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_SPARK MOVE_FUTURE_SIGHT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [484] = { + .species = SPECIES_XATU, + .moves = {MOVE_FLY MOVE_TOXIC MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [485] = { + .species = SPECIES_CLEFABLE, + .moves = {MOVE_METEOR_MASH MOVE_COSMIC_POWER MOVE_DOUBLE_TEAM MOVE_FOLLOW_ME}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [486] = { + .species = SPECIES_HARIYAMA, + .moves = {MOVE_CROSS_CHOP MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [487] = { + .species = SPECIES_RAICHU, + .moves = {MOVE_THUNDERBOLT MOVE_REVERSAL MOVE_ENDURE MOVE_AGILITY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [488] = { + .species = SPECIES_DEWGONG, + .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_ENCORE MOVE_DISABLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [489] = { + .species = SPECIES_MANECTRIC, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_CRUNCH MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [490] = { + .species = SPECIES_VILEPLUME, + .moves = {MOVE_INGRAIN MOVE_DOUBLE_TEAM MOVE_TOXIC MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [491] = { + .species = SPECIES_VICTREEBEL, + .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_SLEEP_POWDER MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_SERIOUS + }, + [492] = { + .species = SPECIES_ELECTRODE, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [493] = { + .species = SPECIES_EXPLOUD, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_EARTHQUAKE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [494] = { + .species = SPECIES_SHIFTRY, + .moves = {MOVE_LEECH_SEED MOVE_DIG MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_IMPISH + }, + [495] = { + .species = SPECIES_GLALIE, + .moves = {MOVE_EXPLOSION MOVE_ENDURE MOVE_BODY_SLAM MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [496] = { + .species = SPECIES_LUDICOLO, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [497] = { + .species = SPECIES_HYPNO, + .moves = {MOVE_HYPNOSIS MOVE_NIGHTMARE MOVE_DREAM_EATER MOVE_PSYCHIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [498] = { + .species = SPECIES_GOLEM, + .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [499] = { + .species = SPECIES_RHYDON, + .moves = {MOVE_EARTHQUAKE MOVE_HORN_DRILL MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [500] = { + .species = SPECIES_ALAKAZAM, + .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [501] = { + .species = SPECIES_WEEZING, + .moves = {MOVE_MEMENTO MOVE_SLUDGE_BOMB MOVE_FACADE MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [502] = { + .species = SPECIES_KANGASKHAN, + .moves = {MOVE_CRUSH_CLAW MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [503] = { + .species = SPECIES_ELECTABUZZ, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_ATTRACT MOVE_FOCUS_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [504] = { + .species = SPECIES_TAUROS, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [505] = { + .species = SPECIES_SLOWBRO, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_MODEST + }, + [506] = { + .species = SPECIES_SLOWKING, + .moves = {MOVE_YAWN MOVE_THUNDER_WAVE MOVE_SURF MOVE_PSYCHIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [507] = { + .species = SPECIES_MILTANK, + .moves = {MOVE_FOCUS_PUNCH MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [508] = { + .species = SPECIES_ALTARIA, + .moves = {MOVE_PERISH_SONG MOVE_DRAGON_BREATH MOVE_PURSUIT MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [509] = { + .species = SPECIES_NIDOQUEEN, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [510] = { + .species = SPECIES_NIDOKING, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [511] = { + .species = SPECIES_MAGMAR, + .moves = {MOVE_FIRE_BLAST MOVE_SMOKESCREEN MOVE_THUNDER_PUNCH MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [512] = { + .species = SPECIES_CRADILY, + .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [513] = { + .species = SPECIES_ARMALDO, + .moves = {MOVE_IRON_TAIL MOVE_ANCIENT_POWER MOVE_BRICK_BREAK MOVE_KNOCK_OFF}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [514] = { + .species = SPECIES_GOLDUCK, + .moves = {MOVE_CROSS_CHOP MOVE_SURF MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [515] = { + .species = SPECIES_RAPIDASH, + .moves = {MOVE_FIRE_BLAST MOVE_BOUNCE MOVE_DOUBLE_TEAM MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [516] = { + .species = SPECIES_MUK, + .moves = {MOVE_CURSE MOVE_REST MOVE_SLUDGE_BOMB MOVE_DYNAMIC_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [517] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [518] = { + .species = SPECIES_AMPHAROS, + .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_FOCUS_PUNCH MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [519] = { + .species = SPECIES_SCIZOR, + .moves = {MOVE_SILVER_WIND MOVE_STEEL_WING MOVE_SWORDS_DANCE MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [520] = { + .species = SPECIES_HERACROSS, + .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ATTRACT MOVE_BULK_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [521] = { + .species = SPECIES_URSARING, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [522] = { + .species = SPECIES_HOUNDOOM, + .moves = {MOVE_FIRE_BLAST MOVE_CRUNCH MOVE_ROAR MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [523] = { + .species = SPECIES_DONPHAN, + .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_EARTHQUAKE MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [524] = { + .species = SPECIES_CLAYDOL, + .moves = {MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_COSMIC_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [525] = { + .species = SPECIES_WAILORD, + .moves = {MOVE_DOUBLE_EDGE MOVE_REST MOVE_CURSE MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [526] = { + .species = SPECIES_NINETALES, + .moves = {MOVE_HEAT_WAVE MOVE_BODY_SLAM MOVE_GRUDGE MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [527] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_BULK_UP MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [528] = { + .species = SPECIES_SHUCKLE, + .moves = {MOVE_SANDSTORM MOVE_DIG MOVE_FLASH MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CAREFUL + }, + [529] = { + .species = SPECIES_STEELIX, + .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_BREATH MOVE_SANDSTORM MOVE_BLOCK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [530] = { + .species = SPECIES_TENTACRUEL, + .moves = {MOVE_TOXIC MOVE_GIGA_DRAIN MOVE_CONFUSE_RAY MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [531] = { + .species = SPECIES_AERODACTYL, + .moves = {MOVE_HYPER_BEAM MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ANCIENT_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [532] = { + .species = SPECIES_PORYGON2, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [533] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [534] = { + .species = SPECIES_EXEGGUTOR, + .moves = {MOVE_RETURN MOVE_CURSE MOVE_SLEEP_POWDER MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [535] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_RAIN_DANCE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [536] = { + .species = SPECIES_FLYGON, + .moves = {MOVE_SOLAR_BEAM MOVE_FIRE_BLAST MOVE_CRUNCH MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [537] = { + .species = SPECIES_VENUSAUR, + .moves = {MOVE_LEECH_SEED MOVE_GIGA_DRAIN MOVE_DOUBLE_TEAM MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [538] = { + .species = SPECIES_VAPOREON, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BODY_SLAM MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [539] = { + .species = SPECIES_JOLTEON, + .moves = {MOVE_THUNDERBOLT MOVE_DIG MOVE_DOUBLE_KICK MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [540] = { + .species = SPECIES_FLAREON, + .moves = {MOVE_CURSE MOVE_ATTRACT MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_RELAXED + }, + [541] = { + .species = SPECIES_MEGANIUM, + .moves = {MOVE_LEECH_SEED MOVE_SUBSTITUTE MOVE_DOUBLE_TEAM MOVE_GRASS_WHISTLE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [542] = { + .species = SPECIES_ESPEON, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [543] = { + .species = SPECIES_UMBREON, + .moves = {MOVE_CURSE MOVE_SCREECH MOVE_DOUBLE_TEAM MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [544] = { + .species = SPECIES_BLASTOISE, + .moves = {MOVE_HYDRO_PUMP MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [545] = { + .species = SPECIES_FERALIGATR, + .moves = {MOVE_SURF MOVE_DRAGON_CLAW MOVE_BRICK_BREAK MOVE_SCARY_FACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_SASSY + }, + [546] = { + .species = SPECIES_AGGRON, + .moves = {MOVE_FOCUS_PUNCH MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [547] = { + .species = SPECIES_BLAZIKEN, + .moves = {MOVE_BLAZE_KICK MOVE_MEGA_KICK MOVE_THUNDER_PUNCH MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [548] = { + .species = SPECIES_WALREIN, + .moves = {MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_CURSE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_QUIRKY + }, + [549] = { + .species = SPECIES_SCEPTILE, + .moves = {MOVE_LEAF_BLADE MOVE_THUNDER_PUNCH MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [550] = { + .species = SPECIES_CHARIZARD, + .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE MOVE_SMOKESCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [551] = { + .species = SPECIES_TYPHLOSION, + .moves = {MOVE_FLAMETHROWER MOVE_THUNDER_PUNCH MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [552] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BODY_SLAM MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [553] = { + .species = SPECIES_CROBAT, + .moves = {MOVE_TOXIC MOVE_GIGA_DRAIN MOVE_CONFUSE_RAY MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [554] = { + .species = SPECIES_SWAMPERT, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_COUNTER MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [555] = { + .species = SPECIES_GYARADOS, + .moves = {MOVE_HYDRO_PUMP MOVE_THUNDERBOLT MOVE_FIRE_BLAST MOVE_BLIZZARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [556] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CURSE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [557] = { + .species = SPECIES_KINGDRA, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_DRAGON_BREATH MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [558] = { + .species = SPECIES_BLISSEY, + .moves = {MOVE_SEISMIC_TOSS MOVE_SING MOVE_ATTRACT MOVE_SUBSTITUTE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [559] = { + .species = SPECIES_MILOTIC, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_SAFEGUARD MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [560] = { + .species = SPECIES_ARCANINE, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_CRUNCH MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [561] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_DOUBLE_EDGE MOVE_CRUNCH MOVE_SWAGGER MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [562] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_EARTHQUAKE MOVE_METEOR_MASH MOVE_PSYCH_UP MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [563] = { + .species = SPECIES_SLAKING, + .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_YAWN MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [564] = { + .species = SPECIES_DUGTRIO, + .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_FISSURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [565] = { + .species = SPECIES_MEDICHAM, + .moves = {MOVE_DYNAMIC_PUNCH MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_HARDY + }, + [566] = { + .species = SPECIES_MISDREAVUS, + .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [567] = { + .species = SPECIES_FEAROW, + .moves = {MOVE_DRILL_PECK MOVE_RETURN MOVE_STEEL_WING MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [568] = { + .species = SPECIES_GRANBULL, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_SLUDGE_BOMB MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [569] = { + .species = SPECIES_JYNX, + .moves = {MOVE_DREAM_EATER MOVE_LOVELY_KISS MOVE_ATTRACT MOVE_SUBSTITUTE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [570] = { + .species = SPECIES_DUSCLOPS, + .moves = {MOVE_PSYCH_UP MOVE_SWAGGER MOVE_SHADOW_BALL MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [571] = { + .species = SPECIES_DODRIO, + .moves = {MOVE_DOUBLE_EDGE MOVE_DRILL_PECK MOVE_STEEL_WING MOVE_FAINT_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [572] = { + .species = SPECIES_MR_MIME, + .moves = {MOVE_TRICK MOVE_TORMENT MOVE_PSYCHIC MOVE_THUNDERBOLT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [573] = { + .species = SPECIES_LANTURN, + .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_CONFUSE_RAY MOVE_RAIN_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [574] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_IRON_TAIL MOVE_FOCUS_PUNCH MOVE_ATTRACT MOVE_SPORE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [575] = { + .species = SPECIES_FORRETRESS, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_GIGA_DRAIN MOVE_ZAP_CANNON}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [576] = { + .species = SPECIES_WHISCASH, + .moves = {MOVE_SLEEP_TALK MOVE_REST MOVE_SURF MOVE_FISSURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_HARDY + }, + [577] = { + .species = SPECIES_XATU, + .moves = {MOVE_DRILL_PECK MOVE_PSYCHIC MOVE_GIGA_DRAIN MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [578] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_TOXIC MOVE_CURSE MOVE_REST MOVE_FLY}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [579] = { + .species = SPECIES_MAROWAK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [580] = { + .species = SPECIES_QUAGSIRE, + .moves = {MOVE_EARTHQUAKE MOVE_SLUDGE_BOMB MOVE_DOUBLE_EDGE MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [581] = { + .species = SPECIES_CLEFABLE, + .moves = {MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_FLAMETHROWER MOVE_MAGICAL_LEAF}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [582] = { + .species = SPECIES_HARIYAMA, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [583] = { + .species = SPECIES_RAICHU, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_IRON_TAIL MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [584] = { + .species = SPECIES_DEWGONG, + .moves = {MOVE_HORN_DRILL MOVE_SHEER_COLD MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [585] = { + .species = SPECIES_MANECTRIC, + .moves = {MOVE_THUNDERBOLT MOVE_IRON_TAIL MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [586] = { + .species = SPECIES_VILEPLUME, + .moves = {MOVE_ATTRACT MOVE_STUN_SPORE MOVE_SLUDGE_BOMB MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [587] = { + .species = SPECIES_VICTREEBEL, + .moves = {MOVE_STUN_SPORE MOVE_INGRAIN MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [588] = { + .species = SPECIES_ELECTRODE, + .moves = {MOVE_EXPLOSION MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [589] = { + .species = SPECIES_EXPLOUD, + .moves = {MOVE_OVERHEAT MOVE_ICE_BEAM MOVE_THUNDER_PUNCH MOVE_EXTRASENSORY}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [590] = { + .species = SPECIES_SHIFTRY, + .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_EXPLOSION MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [591] = { + .species = SPECIES_GLALIE, + .moves = {MOVE_BLIZZARD MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [592] = { + .species = SPECIES_LUDICOLO, + .moves = {MOVE_LEECH_SEED MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [593] = { + .species = SPECIES_HYPNO, + .moves = {MOVE_PSYCH_UP MOVE_SWAGGER MOVE_MEGA_KICK MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [594] = { + .species = SPECIES_GOLEM, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [595] = { + .species = SPECIES_RHYDON, + .moves = {MOVE_MEGAHORN MOVE_CRUSH_CLAW MOVE_EARTHQUAKE MOVE_HORN_DRILL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [596] = { + .species = SPECIES_ALAKAZAM, + .moves = {MOVE_TRICK MOVE_DISABLE MOVE_PSYCHIC MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [597] = { + .species = SPECIES_WEEZING, + .moves = {MOVE_EXPLOSION MOVE_SLUDGE_BOMB MOVE_FLAMETHROWER MOVE_THUNDERBOLT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [598] = { + .species = SPECIES_KANGASKHAN, + .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_THUNDERBOLT MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [599] = { + .species = SPECIES_ELECTABUZZ, + .moves = {MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDERBOLT MOVE_CROSS_CHOP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [600] = { + .species = SPECIES_TAUROS, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [601] = { + .species = SPECIES_SLOWBRO, + .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_QUIET + }, + [602] = { + .species = SPECIES_SLOWKING, + .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [603] = { + .species = SPECIES_MILTANK, + .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [604] = { + .species = SPECIES_ALTARIA, + .moves = {MOVE_SING MOVE_DRAGON_DANCE MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [605] = { + .species = SPECIES_NIDOQUEEN, + .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_CRUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [606] = { + .species = SPECIES_NIDOKING, + .moves = {MOVE_HORN_DRILL MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [607] = { + .species = SPECIES_MAGMAR, + .moves = {MOVE_MEGA_KICK MOVE_CROSS_CHOP MOVE_IRON_TAIL MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_IMPISH + }, + [608] = { + .species = SPECIES_CRADILY, + .moves = {MOVE_SUBSTITUTE MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [609] = { + .species = SPECIES_ARMALDO, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_SWORDS_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [610] = { + .species = SPECIES_GOLDUCK, + .moves = {MOVE_HYDRO_PUMP MOVE_CROSS_CHOP MOVE_BLIZZARD MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [611] = { + .species = SPECIES_RAPIDASH, + .moves = {MOVE_OVERHEAT MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_HYPNOSIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [612] = { + .species = SPECIES_MUK, + .moves = {MOVE_SLUDGE_BOMB MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_QUIET + }, + [613] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_GIGA_DRAIN MOVE_SKILL_SWAP}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [614] = { + .species = SPECIES_AMPHAROS, + .moves = {MOVE_THUNDERBOLT MOVE_MEGA_KICK MOVE_IRON_TAIL MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [615] = { + .species = SPECIES_SCIZOR, + .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_AGILITY MOVE_SLASH}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_CAREFUL + }, + [616] = { + .species = SPECIES_HERACROSS, + .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [617] = { + .species = SPECIES_URSARING, + .moves = {MOVE_FIRE_PUNCH MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH MOVE_CRUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [618] = { + .species = SPECIES_HOUNDOOM, + .moves = {MOVE_OVERHEAT MOVE_SHADOW_BALL MOVE_SLUDGE_BOMB MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [619] = { + .species = SPECIES_DONPHAN, + .moves = {MOVE_FISSURE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SECRET_POWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [620] = { + .species = SPECIES_CLAYDOL, + .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_SOLAR_BEAM MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [621] = { + .species = SPECIES_WAILORD, + .moves = {MOVE_HYDRO_PUMP MOVE_FISSURE MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [622] = { + .species = SPECIES_NINETALES, + .moves = {MOVE_FIRE_BLAST MOVE_IRON_TAIL MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [623] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_FIRE_BLAST MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [624] = { + .species = SPECIES_SHUCKLE, + .moves = {MOVE_SUBSTITUTE MOVE_ATTRACT MOVE_TOXIC MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CAREFUL + }, + [625] = { + .species = SPECIES_STEELIX, + .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [626] = { + .species = SPECIES_TENTACRUEL, + .moves = {MOVE_SURF MOVE_GIGA_DRAIN MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [627] = { + .species = SPECIES_AERODACTYL, + .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_FIRE_BLAST MOVE_DRAGON_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [628] = { + .species = SPECIES_PORYGON2, + .moves = {MOVE_PSYCHIC MOVE_TRI_ATTACK MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [629] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_FIRE_PUNCH MOVE_MAGICAL_LEAF}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [630] = { + .species = SPECIES_EXEGGUTOR, + .moves = {MOVE_LEECH_SEED MOVE_GIGA_DRAIN MOVE_TOXIC MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [631] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [632] = { + .species = SPECIES_FLYGON, + .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_CLAW MOVE_FLAMETHROWER MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [633] = { + .species = SPECIES_VENUSAUR, + .moves = {MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_SLEEP_POWDER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [634] = { + .species = SPECIES_VAPOREON, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_ACID_ARMOR MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [635] = { + .species = SPECIES_JOLTEON, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_AGILITY MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [636] = { + .species = SPECIES_FLAREON, + .moves = {MOVE_SHADOW_BALL MOVE_FLAIL MOVE_ENDURE MOVE_OVERHEAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [637] = { + .species = SPECIES_MEGANIUM, + .moves = {MOVE_EARTHQUAKE MOVE_FLAIL MOVE_ENDURE MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_JOLLY + }, + [638] = { + .species = SPECIES_ESPEON, + .moves = {MOVE_PSYCHIC MOVE_BITE MOVE_WISH MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [639] = { + .species = SPECIES_UMBREON, + .moves = {MOVE_SWAGGER MOVE_PSYCH_UP MOVE_ATTRACT MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [640] = { + .species = SPECIES_BLASTOISE, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [641] = { + .species = SPECIES_FERALIGATR, + .moves = {MOVE_HYDRO_PUMP MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [642] = { + .species = SPECIES_AGGRON, + .moves = {MOVE_SURF MOVE_THUNDER MOVE_FIRE_BLAST MOVE_BLIZZARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [643] = { + .species = SPECIES_BLAZIKEN, + .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_ENDURE MOVE_REVERSAL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [644] = { + .species = SPECIES_WALREIN, + .moves = {MOVE_SHEER_COLD MOVE_FISSURE MOVE_SURF MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [645] = { + .species = SPECIES_SCEPTILE, + .moves = {MOVE_LEAF_BLADE MOVE_EARTHQUAKE MOVE_CRUSH_CLAW MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [646] = { + .species = SPECIES_CHARIZARD, + .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_BITE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [647] = { + .species = SPECIES_TYPHLOSION, + .moves = {MOVE_EARTHQUAKE MOVE_OVERHEAT MOVE_ENDURE MOVE_REVERSAL}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [648] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_DOUBLE_EDGE MOVE_PSYCHIC MOVE_CONFUSE_RAY MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [649] = { + .species = SPECIES_CROBAT, + .moves = {MOVE_AIR_CUTTER MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_SCREECH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [650] = { + .species = SPECIES_SWAMPERT, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_BRAVE + }, + [651] = { + .species = SPECIES_GYARADOS, + .moves = {MOVE_SURF MOVE_THUNDER MOVE_RAIN_DANCE MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [652] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [653] = { + .species = SPECIES_KINGDRA, + .moves = {MOVE_FLAIL MOVE_HYDRO_PUMP MOVE_DRAGON_DANCE MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [654] = { + .species = SPECIES_BLISSEY, + .moves = {MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_CALM_MIND MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [655] = { + .species = SPECIES_MILOTIC, + .moves = {MOVE_SURF MOVE_BLIZZARD MOVE_ATTRACT MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [656] = { + .species = SPECIES_ARCANINE, + .moves = {MOVE_OVERHEAT MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [657] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [658] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_EARTHQUAKE MOVE_METEOR_MASH MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [659] = { + .species = SPECIES_SLAKING, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_AERIAL_ACE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_ADAMANT + }, + [660] = { + .species = SPECIES_DUGTRIO, + .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_FISSURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [661] = { + .species = SPECIES_MEDICHAM, + .moves = {MOVE_MEGA_KICK MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [662] = { + .species = SPECIES_MISDREAVUS, + .moves = {MOVE_DESTINY_BOND MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [663] = { + .species = SPECIES_FEAROW, + .moves = {MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_STEEL_WING MOVE_SKY_ATTACK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [664] = { + .species = SPECIES_GRANBULL, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_BRAVE + }, + [665] = { + .species = SPECIES_JYNX, + .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_LOVELY_KISS MOVE_FAKE_TEARS}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [666] = { + .species = SPECIES_DUSCLOPS, + .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_CURSE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [667] = { + .species = SPECIES_DODRIO, + .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_DRILL_PECK MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [668] = { + .species = SPECIES_MR_MIME, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [669] = { + .species = SPECIES_LANTURN, + .moves = {MOVE_SURF MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [670] = { + .species = SPECIES_BRELOOM, + .moves = {MOVE_FOCUS_PUNCH MOVE_SLUDGE_BOMB MOVE_SPORE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [671] = { + .species = SPECIES_FORRETRESS, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [672] = { + .species = SPECIES_WHISCASH, + .moves = {MOVE_FISSURE MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [673] = { + .species = SPECIES_XATU, + .moves = {MOVE_PSYCHIC MOVE_DRILL_PECK MOVE_SHADOW_BALL MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [674] = { + .species = SPECIES_SKARMORY, + .moves = {MOVE_DRILL_PECK MOVE_STEEL_WING MOVE_COUNTER MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [675] = { + .species = SPECIES_MAROWAK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_MEGA_KICK}, + .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [676] = { + .species = SPECIES_QUAGSIRE, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_AMNESIA}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_SASSY + }, + [677] = { + .species = SPECIES_CLEFABLE, + .moves = {MOVE_MEGA_KICK MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [678] = { + .species = SPECIES_HARIYAMA, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [679] = { + .species = SPECIES_RAICHU, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_PROTECT MOVE_MEGA_KICK}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [680] = { + .species = SPECIES_DEWGONG, + .moves = {MOVE_SHEER_COLD MOVE_ICE_BEAM MOVE_SURF MOVE_SIGNAL_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [681] = { + .species = SPECIES_MANECTRIC, + .moves = {MOVE_THUNDERBOLT MOVE_CRUNCH MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [682] = { + .species = SPECIES_VILEPLUME, + .moves = {MOVE_SOLAR_BEAM MOVE_SLUDGE_BOMB MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [683] = { + .species = SPECIES_VICTREEBEL, + .moves = {MOVE_GIGA_DRAIN MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_SYNTHESIS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [684] = { + .species = SPECIES_ELECTRODE, + .moves = {MOVE_EXPLOSION MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_NAUGHTY + }, + [685] = { + .species = SPECIES_EXPLOUD, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_OVERHEAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [686] = { + .species = SPECIES_SHIFTRY, + .moves = {MOVE_EXPLOSION MOVE_GIGA_DRAIN MOVE_MEGA_KICK MOVE_FAKE_OUT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [687] = { + .species = SPECIES_GLALIE, + .moves = {MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [688] = { + .species = SPECIES_LUDICOLO, + .moves = {MOVE_LEECH_SEED MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_TOXIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [689] = { + .species = SPECIES_HYPNO, + .moves = {MOVE_PSYCHIC MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [690] = { + .species = SPECIES_GOLEM, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [691] = { + .species = SPECIES_RHYDON, + .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_HORN_DRILL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [692] = { + .species = SPECIES_ALAKAZAM, + .moves = {MOVE_PSYCHIC MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [693] = { + .species = SPECIES_WEEZING, + .moves = {MOVE_EXPLOSION MOVE_SLUDGE_BOMB MOVE_FRUSTRATION MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [694] = { + .species = SPECIES_KANGASKHAN, + .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [695] = { + .species = SPECIES_ELECTABUZZ, + .moves = {MOVE_THUNDERBOLT MOVE_PSYCHIC MOVE_MEGA_KICK MOVE_CROSS_CHOP}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [696] = { + .species = SPECIES_TAUROS, + .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_TOMB MOVE_THUNDERBOLT MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [697] = { + .species = SPECIES_SLOWBRO, + .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_SASSY + }, + [698] = { + .species = SPECIES_SLOWKING, + .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_ICE_BEAM MOVE_FLAMETHROWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [699] = { + .species = SPECIES_MILTANK, + .moves = {MOVE_DOUBLE_EDGE MOVE_CURSE MOVE_DOUBLE_TEAM MOVE_MILK_DRINK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [700] = { + .species = SPECIES_ALTARIA, + .moves = {MOVE_DRAGON_CLAW MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [701] = { + .species = SPECIES_NIDOQUEEN, + .moves = {MOVE_SUPERPOWER MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [702] = { + .species = SPECIES_NIDOKING, + .moves = {MOVE_MEGAHORN MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_THUNDER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [703] = { + .species = SPECIES_MAGMAR, + .moves = {MOVE_FLAMETHROWER MOVE_PSYCHIC MOVE_CROSS_CHOP MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [704] = { + .species = SPECIES_CRADILY, + .moves = {MOVE_TOXIC MOVE_INGRAIN MOVE_MIRROR_COAT MOVE_GIGA_DRAIN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [705] = { + .species = SPECIES_ARMALDO, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [706] = { + .species = SPECIES_GOLDUCK, + .moves = {MOVE_SURF MOVE_CROSS_CHOP MOVE_ICE_BEAM MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [707] = { + .species = SPECIES_RAPIDASH, + .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_IRON_TAIL MOVE_DOUBLE_KICK}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [708] = { + .species = SPECIES_MUK, + .moves = {MOVE_SLUDGE_BOMB MOVE_BRICK_BREAK MOVE_GIGA_DRAIN MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_BRAVE + }, + [709] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [710] = { + .species = SPECIES_AMPHAROS, + .moves = {MOVE_THUNDERBOLT MOVE_FIRE_PUNCH MOVE_THUNDER_WAVE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [711] = { + .species = SPECIES_SCIZOR, + .moves = {MOVE_SILVER_WIND MOVE_SWORDS_DANCE MOVE_AGILITY MOVE_BATON_PASS}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [712] = { + .species = SPECIES_HERACROSS, + .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_REVERSAL MOVE_ENDURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [713] = { + .species = SPECIES_URSARING, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [714] = { + .species = SPECIES_HOUNDOOM, + .moves = {MOVE_OVERHEAT MOVE_SOLAR_BEAM MOVE_CRUNCH MOVE_SUNNY_DAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [715] = { + .species = SPECIES_DONPHAN, + .moves = {MOVE_FISSURE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_IRON_TAIL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [716] = { + .species = SPECIES_CLAYDOL, + .moves = {MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [717] = { + .species = SPECIES_WAILORD, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_FISSURE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [718] = { + .species = SPECIES_NINETALES, + .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_QUIRKY + }, + [719] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [720] = { + .species = SPECIES_SHUCKLE, + .moves = {MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_WRAP MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_CAREFUL + }, + [721] = { + .species = SPECIES_STEELIX, + .moves = {MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_DOUBLE_EDGE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [722] = { + .species = SPECIES_TENTACRUEL, + .moves = {MOVE_HYDRO_PUMP MOVE_SLUDGE_BOMB MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIRKY + }, + [723] = { + .species = SPECIES_AERODACTYL, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_FIRE_BLAST MOVE_BITE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [724] = { + .species = SPECIES_PORYGON2, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [725] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [726] = { + .species = SPECIES_EXEGGUTOR, + .moves = {MOVE_PSYCHIC MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [727] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [728] = { + .species = SPECIES_FLYGON, + .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_CLAW MOVE_DOUBLE_EDGE MOVE_CRUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [729] = { + .species = SPECIES_VENUSAUR, + .moves = {MOVE_SOLAR_BEAM MOVE_SLUDGE_BOMB MOVE_SUNNY_DAY MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [730] = { + .species = SPECIES_VAPOREON, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_ACID_ARMOR MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [731] = { + .species = SPECIES_JOLTEON, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_BITE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_TIMID + }, + [732] = { + .species = SPECIES_FLAREON, + .moves = {MOVE_OVERHEAT MOVE_SUNNY_DAY MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [733] = { + .species = SPECIES_MEGANIUM, + .moves = {MOVE_GIGA_DRAIN MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_BODY_SLAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [734] = { + .species = SPECIES_ESPEON, + .moves = {MOVE_PSYCHIC MOVE_BITE MOVE_ATTRACT MOVE_CALM_MIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [735] = { + .species = SPECIES_UMBREON, + .moves = {MOVE_CONFUSE_RAY MOVE_TOXIC MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [736] = { + .species = SPECIES_BLASTOISE, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [737] = { + .species = SPECIES_FERALIGATR, + .moves = {MOVE_HYDRO_PUMP MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [738] = { + .species = SPECIES_AGGRON, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [739] = { + .species = SPECIES_BLAZIKEN, + .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_THUNDER_PUNCH MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [740] = { + .species = SPECIES_WALREIN, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_SHEER_COLD}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [741] = { + .species = SPECIES_SCEPTILE, + .moves = {MOVE_LEAF_BLADE MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_THUNDER_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [742] = { + .species = SPECIES_CHARIZARD, + .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [743] = { + .species = SPECIES_TYPHLOSION, + .moves = {MOVE_OVERHEAT MOVE_THUNDER_PUNCH MOVE_EARTHQUAKE MOVE_CRUSH_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [744] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_PSYCHIC}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [745] = { + .species = SPECIES_CROBAT, + .moves = {MOVE_SLUDGE_BOMB MOVE_AERIAL_ACE MOVE_SHADOW_BALL MOVE_CONFUSE_RAY}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [746] = { + .species = SPECIES_SWAMPERT, + .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [747] = { + .species = SPECIES_GYARADOS, + .moves = {MOVE_RETURN MOVE_EARTHQUAKE MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [748] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [749] = { + .species = SPECIES_KINGDRA, + .moves = {MOVE_DOUBLE_EDGE MOVE_ICE_BEAM MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [750] = { + .species = SPECIES_BLISSEY, + .moves = {MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_COUNTER MOVE_SOFT_BOILED}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_BOLD + }, + [751] = { + .species = SPECIES_MILOTIC, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RECOVER MOVE_MIRROR_COAT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [752] = { + .species = SPECIES_ARCANINE, + .moves = {MOVE_OVERHEAT MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [753] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [754] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [755] = { + .species = SPECIES_SLAKING, + .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_YAWN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, + .nature = NATURE_MODEST + }, + [756] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_ICE_BEAM MOVE_WATER_PULSE MOVE_ICY_WIND MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [757] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [758] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_FLAMETHROWER MOVE_AERIAL_ACE MOVE_MUD_SLAP MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [759] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [760] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_TEAM MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [761] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_DOUBLE_TEAM MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [762] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_SUPERPOWER MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [763] = { + .species = SPECIES_REGICE, + .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_AMNESIA MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [764] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_METAL_CLAW MOVE_CURSE MOVE_AMNESIA MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [765] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [766] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [767] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_SUBSTITUTE MOVE_TOXIC MOVE_BLIZZARD MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [768] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DRILL_PECK MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [769] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_OVERHEAT MOVE_AERIAL_ACE MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [770] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [771] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_SOLAR_BEAM MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [772] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_TOXIC MOVE_DIVE MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [773] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [774] = { + .species = SPECIES_REGICE, + .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_BLIZZARD MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [775] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [776] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [777] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [778] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_ICE_BEAM MOVE_FACADE MOVE_AERIAL_ACE MOVE_PROTECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [779] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_SUBSTITUTE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [780] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_DOUBLE_TEAM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [781] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_QUICK_ATTACK MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [782] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_EDGE MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [783] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAIN_DANCE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [784] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_ROCK_SLIDE MOVE_EARTHQUAKE MOVE_CURSE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [785] = { + .species = SPECIES_REGICE, + .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_QUIET + }, + [786] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_ANCIENT_POWER MOVE_AMNESIA MOVE_COUNTER MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [787] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [788] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [789] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_REST MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [790] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [791] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_STEEL_WING MOVE_SAFEGUARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_QUIET + }, + [792] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_BITE MOVE_THUNDER_WAVE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [793] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FLAMETHROWER MOVE_BITE MOVE_DOUBLE_TEAM MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [794] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BITE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [795] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_CAREFUL + }, + [796] = { + .species = SPECIES_REGICE, + .moves = {MOVE_ICE_BEAM MOVE_HAIL MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [797] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_ANCIENT_POWER MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_IMPISH + }, + [798] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_MIST_BALL MOVE_SHADOW_BALL MOVE_CHARM MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [799] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_LUSTER_PURGE MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [800] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT MOVE_FIRE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [801] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT MOVE_ICE_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [802] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_FIRE_PUNCH MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [803] = { + .species = SPECIES_GENGAR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [804] = { + .species = SPECIES_URSARING, + .moves = {MOVE_MEGA_KICK MOVE_AERIAL_ACE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [805] = { + .species = SPECIES_URSARING, + .moves = {MOVE_HYPER_BEAM MOVE_YAWN MOVE_SWORDS_DANCE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [806] = { + .species = SPECIES_URSARING, + .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_BULK_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [807] = { + .species = SPECIES_URSARING, + .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [808] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [809] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_COUNTER MOVE_ROCK_TOMB}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [810] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [811] = { + .species = SPECIES_MACHAMP, + .moves = {MOVE_REVENGE MOVE_ROCK_SLIDE MOVE_FACADE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [812] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ENDURE MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [813] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_WILL_O_WISP MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, + .nature = NATURE_TIMID + }, + [814] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_WILL_O_WISP MOVE_DESTINY_BOND}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BOLD + }, + [815] = { + .species = SPECIES_GARDEVOIR, + .moves = {MOVE_PSYCHIC MOVE_MAGICAL_LEAF MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [816] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_RECOVER MOVE_LIGHT_SCREEN}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [817] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_SURF MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [818] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_COSMIC_POWER MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [819] = { + .species = SPECIES_STARMIE, + .moves = {MOVE_SURF MOVE_THUNDERBOLT MOVE_COSMIC_POWER MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [820] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_IRON_TAIL MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [821] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_RAIN_DANCE MOVE_BLIZZARD}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [822] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SHEER_COLD MOVE_HORN_DRILL MOVE_REST MOVE_SLEEP_TALK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [823] = { + .species = SPECIES_LAPRAS, + .moves = {MOVE_SHEER_COLD MOVE_HORN_DRILL MOVE_SING MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_CALM + }, + [824] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [825] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [826] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_HYPER_BEAM MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [827] = { + .species = SPECIES_SNORLAX, + .moves = {MOVE_RETURN MOVE_SHADOW_BALL MOVE_BELLY_DRUM MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [828] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [829] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_HEADBUTT MOVE_AERIAL_ACE MOVE_CRUNCH MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_HARDY + }, + [830] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [831] = { + .species = SPECIES_SALAMENCE, + .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [832] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_JOLLY + }, + [833] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [834] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [835] = { + .species = SPECIES_METAGROSS, + .moves = {MOVE_METEOR_MASH MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [836] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_HYPER_BEAM MOVE_FOCUS_PUNCH MOVE_ROCK_SLIDE MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [837] = { + .species = SPECIES_REGIROCK, + .moves = {MOVE_SWAGGER MOVE_PSYCH_UP MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [838] = { + .species = SPECIES_REGICE, + .moves = {MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_CURSE MOVE_COUNTER}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_BRAVE + }, + [839] = { + .species = SPECIES_REGICE, + .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_SLEEP_TALK MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [840] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_TOXIC MOVE_DOUBLE_TEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [841] = { + .species = SPECIES_REGISTEEL, + .moves = {MOVE_SUPERPOWER MOVE_AERIAL_ACE MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [842] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [843] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_MIST_BALL MOVE_DRAGON_CLAW MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [844] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_SWAGGER MOVE_PSYCH_UP}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [845] = { + .species = SPECIES_LATIAS, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [846] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [847] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_LUSTER_PURGE MOVE_SHADOW_BALL MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [848] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_DRAGON_DANCE MOVE_RECOVER}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [849] = { + .species = SPECIES_LATIOS, + .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [850] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_BRICK_BREAK MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [851] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [852] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_HYPER_BEAM MOVE_ATTRACT MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, + .nature = NATURE_ADAMANT + }, + [853] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_HYPER_BEAM MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [854] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_OUTRAGE MOVE_DOUBLE_EDGE MOVE_THUNDER_WAVE MOVE_ROAR}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [855] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_SURF MOVE_FLAMETHROWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [856] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_SURF MOVE_ICE_BEAM}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [857] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_DRAGON_CLAW MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_BRICK_BREAK}, + .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [858] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_THUNDER MOVE_SURF MOVE_RAIN_DANCE MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [859] = { + .species = SPECIES_DRAGONITE, + .moves = {MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_SUNNY_DAY MOVE_EARTHQUAKE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_DOCILE + }, + [860] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_THUNDERBOLT MOVE_SURF}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [861] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUNCH MOVE_THUNDERBOLT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [862] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [863] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_CRUNCH MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_FLAMETHROWER}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [864] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [865] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CURSE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [866] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_ROCK_SLIDE MOVE_AERIAL_ACE MOVE_BRICK_BREAK MOVE_CURSE}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [867] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_ROCK_SLIDE MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [868] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ATTRACT}, + .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_HARDY + }, + [869] = { + .species = SPECIES_TYRANITAR, + .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_ADAMANT + }, + [870] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_AGILITY MOVE_SWAGGER}, + .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [871] = { + .species = SPECIES_ARTICUNO, + .moves = {MOVE_ICE_BEAM MOVE_AERIAL_ACE MOVE_REFLECT MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [872] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_THUNDER_WAVE}, + .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [873] = { + .species = SPECIES_ZAPDOS, + .moves = {MOVE_THUNDER MOVE_DRILL_PECK MOVE_RAIN_DANCE MOVE_DOUBLE_EDGE}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [874] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_OVERHEAT MOVE_SUNNY_DAY MOVE_SWAGGER MOVE_FACADE}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_DOCILE + }, + [875] = { + .species = SPECIES_MOLTRES, + .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_AERIAL_ACE MOVE_STEEL_WING}, + .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, + .nature = NATURE_DOCILE + }, + [876] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_DOUBLE_EDGE MOVE_ROAR MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, + .nature = NATURE_MODEST + }, + [877] = { + .species = SPECIES_RAIKOU, + .moves = {MOVE_THUNDERBOLT MOVE_CALM_MIND MOVE_SUBSTITUTE MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [878] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FIRE_BLAST MOVE_DOUBLE_EDGE MOVE_ENDURE MOVE_REFLECT}, + .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_DOCILE + }, + [879] = { + .species = SPECIES_ENTEI, + .moves = {MOVE_FLAMETHROWER MOVE_CALM_MIND MOVE_ROAR MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, + .nature = NATURE_MODEST + }, + [880] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_ICY_WIND}, + .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, + .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + }, + [881] = { + .species = SPECIES_SUICUNE, + .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_REST}, + .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, + .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, + .nature = NATURE_MODEST + } +}; diff --git a/src/data/battle_frontier/battle_frontier_trainer_mons.h b/src/data/battle_frontier/battle_frontier_trainer_mons.h new file mode 100644 index 000000000..d0e21172b --- /dev/null +++ b/src/data/battle_frontier/battle_frontier_trainer_mons.h @@ -0,0 +1,15229 @@ +const u16 gBattleFrontierTrainerMons_Brady[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Conner[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bradley[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Cybil[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rodette[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Peggy[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Keith[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Grayson[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Glenn[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Liliana[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Elise[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zoey[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Manuel[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Russ[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dustin[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tina[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gillian[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zoe[] = +{ + 5, + 20, + 21, + 25, + 27, + 35, + 46, + 47, + 48, + 50, + 53, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 119, + 121, + 124, + 127, + 146, + 147, + 154, + 158, + 160, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Chen[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Al[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Mitch[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Anne[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alize[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lauren[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kipp[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jason[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_John[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ann[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Eileen[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Carlie[] = +{ + 5, + 6, + 7, + 14, + 19, + 28, + 35, + 42, + 45, + 48, + 50, + 55, + 59, + 60, + 68, + 73, + 83, + 84, + 86, + 87, + 90, + 96, + 97, + 98, + 99, + 103, + 105, + 106, + 109, + 112, + 114, + 121, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gordon[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 50, + 51, + 54, + 56, + 68, + 72, + 73, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ayden[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 50, + 51, + 54, + 56, + 68, + 72, + 73, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marco[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 50, + 51, + 54, + 56, + 68, + 72, + 73, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Cierra[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 51, + 54, + 56, + 68, + 72, + 73, + 76, + 83, + 84, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 118, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marcy[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 51, + 54, + 56, + 68, + 72, + 73, + 76, + 83, + 84, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 118, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kathy[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 26, + 32, + 34, + 36, + 43, + 51, + 54, + 56, + 68, + 72, + 73, + 76, + 83, + 84, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 105, + 107, + 109, + 111, + 113, + 116, + 117, + 118, + 123, + 124, + 128, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Peyton[] = +{ + 84, + 85, + 87, + 88, + 89, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 105, + 106, + 107, + 109, + 112, + 113, + 117, + 120, + 121, + 123, + 129, + 134, + 142, + 143, + 145, + 148, + 149, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Julian[] = +{ + 84, + 85, + 87, + 88, + 89, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 105, + 106, + 107, + 109, + 112, + 113, + 117, + 120, + 121, + 123, + 129, + 134, + 142, + 143, + 145, + 148, + 149, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Quinn[] = +{ + 84, + 85, + 87, + 88, + 89, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 105, + 106, + 107, + 109, + 112, + 113, + 117, + 120, + 121, + 123, + 129, + 134, + 142, + 143, + 145, + 148, + 149, + 151, + 152, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Haylee[] = +{ + 1, + 5, + 6, + 10, + 13, + 14, + 16, + 17, + 18, + 19, + 20, + 23, + 24, + 26, + 28, + 29, + 31, + 32, + 33, + 34, + 35, + 36, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 54, + 56, + 59, + 61, + 65, + 66, + 67, + 68, + 71, + 72, + 79, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Amanda[] = +{ + 1, + 5, + 6, + 10, + 13, + 14, + 16, + 17, + 18, + 19, + 20, + 23, + 24, + 26, + 28, + 29, + 31, + 32, + 33, + 34, + 35, + 36, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 54, + 56, + 59, + 61, + 65, + 66, + 67, + 68, + 71, + 72, + 79, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Stacy[] = +{ + 1, + 5, + 6, + 10, + 13, + 14, + 16, + 17, + 18, + 19, + 20, + 23, + 24, + 26, + 28, + 29, + 31, + 32, + 33, + 34, + 35, + 36, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 54, + 56, + 59, + 61, + 65, + 66, + 67, + 68, + 71, + 72, + 79, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rafael[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Oliver[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Payton[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Pamela[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Eliza[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marisa[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lewis[] = +{ + 2, + 3, + 4, + 8, + 9, + 21, + 27, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 80, + 112, + 132, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Yoshi[] = +{ + 2, + 3, + 4, + 11, + 12, + 21, + 27, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 80, + 112, + 132, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Destin[] = +{ + 2, + 3, + 4, + 21, + 27, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 80, + 112, + 132, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Keon[] = +{ + 5, + 21, + 25, + 27, + 35, + 39, + 40, + 41, + 42, + 46, + 47, + 48, + 50, + 52, + 53, + 57, + 58, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 121, + 124, + 127, + 132, + 141, + 146, + 147, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Stuart[] = +{ + 5, + 21, + 25, + 27, + 35, + 39, + 40, + 41, + 42, + 46, + 47, + 48, + 50, + 52, + 53, + 57, + 58, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 121, + 124, + 127, + 132, + 141, + 146, + 147, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nestor[] = +{ + 5, + 21, + 25, + 27, + 35, + 39, + 40, + 41, + 42, + 46, + 47, + 48, + 50, + 52, + 53, + 57, + 58, + 62, + 63, + 69, + 75, + 78, + 79, + 80, + 84, + 90, + 92, + 99, + 100, + 102, + 106, + 110, + 112, + 114, + 121, + 124, + 127, + 132, + 141, + 146, + 147, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Derrick[] = +{ + 21, + 27, + 29, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 61, + 62, + 63, + 69, + 80, + 92, + 102, + 112, + 125, + 129, + 132, + 140, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bryson[] = +{ + 21, + 27, + 29, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 61, + 62, + 63, + 69, + 80, + 92, + 102, + 112, + 125, + 129, + 132, + 140, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Clayton[] = +{ + 21, + 27, + 29, + 39, + 40, + 41, + 42, + 52, + 57, + 58, + 61, + 62, + 63, + 69, + 80, + 92, + 102, + 112, + 125, + 129, + 132, + 140, + 141, + 153, + 154, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Trenton[] = +{ + 6, + 7, + 55, + 60, + 68, + 73, + 83, + 86, + 87, + 105, + 111, + 116, + 123, + 124, + 128, + 134, + 138, + 139, + 151, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jenson[] = +{ + 6, + 7, + 55, + 60, + 68, + 73, + 83, + 86, + 87, + 105, + 111, + 116, + 123, + 124, + 128, + 134, + 138, + 139, + 151, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Wesley[] = +{ + 6, + 7, + 55, + 60, + 68, + 73, + 83, + 86, + 87, + 105, + 111, + 116, + 123, + 124, + 128, + 134, + 138, + 139, + 151, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Anton[] = +{ + 31, + 39, + 58, + 67, + 70, + 74, + 75, + 78, + 85, + 104, + 108, + 120, + 122, + 133, + 138, + 139, + 140, + 141, + 150, + 151, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lawson[] = +{ + 31, + 39, + 58, + 67, + 70, + 74, + 75, + 78, + 85, + 104, + 108, + 120, + 122, + 133, + 138, + 139, + 140, + 141, + 150, + 151, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Sammy[] = +{ + 31, + 39, + 58, + 67, + 70, + 74, + 75, + 78, + 85, + 104, + 108, + 120, + 122, + 133, + 138, + 139, + 140, + 141, + 150, + 151, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Arnie[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Adrian[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tristan[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Juliana[] = +{ + 0, + 14, + 19, + 28, + 42, + 58, + 59, + 67, + 68, + 85, + 118, + 120, + 123, + 155, + 156, + 193, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rylee[] = +{ + 0, + 14, + 19, + 28, + 42, + 58, + 59, + 67, + 68, + 85, + 118, + 120, + 123, + 155, + 156, + 193, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Chelsea[] = +{ + 0, + 14, + 19, + 28, + 42, + 58, + 59, + 67, + 68, + 85, + 118, + 120, + 123, + 155, + 156, + 193, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Danela[] = +{ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 10, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lizbeth[] = +{ + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Amelia[] = +{ + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jillian[] = +{ + 0, + 5, + 18, + 19, + 29, + 35, + 48, + 50, + 52, + 61, + 69, + 75, + 78, + 84, + 90, + 94, + 99, + 100, + 101, + 102, + 106, + 112, + 114, + 121, + 125, + 129, + 130, + 131, + 140, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Abbie[] = +{ + 0, + 5, + 18, + 19, + 29, + 35, + 48, + 50, + 52, + 61, + 69, + 75, + 78, + 84, + 90, + 94, + 99, + 100, + 101, + 102, + 106, + 112, + 114, + 121, + 125, + 129, + 130, + 131, + 140, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Briana[] = +{ + 0, + 5, + 18, + 19, + 29, + 35, + 48, + 50, + 52, + 61, + 69, + 75, + 78, + 84, + 90, + 94, + 99, + 100, + 101, + 102, + 106, + 112, + 114, + 121, + 125, + 129, + 130, + 131, + 140, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Antonio[] = +{ + 5, + 10, + 20, + 35, + 48, + 49, + 50, + 62, + 63, + 64, + 66, + 71, + 75, + 77, + 78, + 84, + 90, + 92, + 99, + 106, + 108, + 112, + 114, + 115, + 116, + 119, + 121, + 122, + 143, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jaden[] = +{ + 5, + 10, + 20, + 35, + 48, + 49, + 50, + 62, + 63, + 64, + 66, + 71, + 75, + 77, + 78, + 84, + 90, + 92, + 99, + 106, + 108, + 112, + 114, + 115, + 116, + 119, + 121, + 122, + 143, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dakota[] = +{ + 5, + 10, + 20, + 35, + 48, + 49, + 50, + 62, + 63, + 64, + 66, + 71, + 75, + 77, + 78, + 84, + 90, + 92, + 99, + 106, + 108, + 112, + 114, + 115, + 116, + 119, + 121, + 122, + 143, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Brayden[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 25, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 45, + 51, + 54, + 56, + 72, + 91, + 93, + 95, + 106, + 107, + 113, + 117, + 118, + 135, + 137, + 142, + 144, + 145, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Corson[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 25, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 45, + 51, + 54, + 56, + 72, + 91, + 93, + 95, + 106, + 107, + 113, + 117, + 118, + 135, + 137, + 142, + 144, + 145, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Trevin[] = +{ + 1, + 13, + 16, + 17, + 23, + 24, + 25, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 45, + 51, + 54, + 56, + 72, + 91, + 93, + 95, + 106, + 107, + 113, + 117, + 118, + 135, + 137, + 142, + 144, + 145, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Patrick[] = +{ + 15, + 22, + 50, + 67, + 70, + 71, + 74, + 77, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 104, + 109, + 111, + 120, + 124, + 128, + 131, + 133, + 134, + 138, + 139, + 151, + 155, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kaden[] = +{ + 15, + 22, + 50, + 67, + 70, + 71, + 74, + 77, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 104, + 109, + 111, + 120, + 124, + 128, + 131, + 133, + 134, + 138, + 139, + 151, + 155, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Maxwell[] = +{ + 15, + 22, + 50, + 67, + 70, + 71, + 74, + 77, + 81, + 82, + 83, + 86, + 87, + 96, + 97, + 98, + 99, + 103, + 104, + 109, + 111, + 120, + 124, + 128, + 131, + 133, + 134, + 138, + 139, + 151, + 155, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Daryl[] = +{ + 15, + 22, + 31, + 39, + 50, + 51, + 58, + 67, + 70, + 74, + 75, + 81, + 82, + 85, + 104, + 120, + 122, + 132, + 133, + 138, + 139, + 140, + 141, + 142, + 144, + 150, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kenneth[] = +{ + 15, + 22, + 31, + 39, + 50, + 51, + 58, + 67, + 70, + 74, + 75, + 81, + 82, + 85, + 104, + 120, + 122, + 132, + 133, + 138, + 139, + 140, + 141, + 142, + 144, + 150, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rich[] = +{ + 15, + 22, + 31, + 39, + 50, + 51, + 58, + 67, + 70, + 74, + 75, + 81, + 82, + 85, + 104, + 120, + 122, + 132, + 133, + 138, + 139, + 140, + 141, + 142, + 144, + 150, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Caden[] = +{ + 30, + 62, + 63, + 65, + 70, + 74, + 77, + 78, + 85, + 88, + 89, + 95, + 108, + 119, + 122, + 133, + 136, + 149, + 150, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marlon[] = +{ + 30, + 62, + 63, + 65, + 70, + 74, + 77, + 78, + 85, + 88, + 89, + 95, + 108, + 119, + 122, + 133, + 136, + 149, + 150, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nash[] = +{ + 30, + 62, + 63, + 65, + 70, + 74, + 77, + 78, + 85, + 88, + 89, + 95, + 108, + 119, + 122, + 133, + 136, + 149, + 150, + 152, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Robby[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 50, + 51, + 54, + 56, + 67, + 70, + 72, + 74, + 75, + 81, + 82, + 85, + 91, + 93, + 104, + 107, + 113, + 117, + 120, + 132, + 133, + 135, + 137, + 142, + 144, + 145, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Reece[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 50, + 51, + 54, + 56, + 67, + 70, + 72, + 74, + 75, + 81, + 82, + 85, + 91, + 93, + 104, + 107, + 113, + 117, + 120, + 132, + 133, + 135, + 137, + 142, + 144, + 145, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kathryn[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 50, + 51, + 54, + 56, + 67, + 70, + 72, + 74, + 75, + 81, + 82, + 85, + 91, + 93, + 104, + 107, + 113, + 117, + 120, + 132, + 133, + 135, + 137, + 142, + 144, + 145, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ellen[] = +{ + 1, + 13, + 15, + 16, + 17, + 22, + 23, + 24, + 26, + 32, + 33, + 34, + 36, + 37, + 38, + 43, + 44, + 50, + 51, + 54, + 56, + 67, + 70, + 72, + 74, + 75, + 81, + 82, + 85, + 91, + 93, + 104, + 107, + 113, + 117, + 120, + 132, + 133, + 135, + 137, + 142, + 144, + 145, + 156, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ramon[] = +{ + 15, + 22, + 50, + 71, + 72, + 76, + 77, + 81, + 82, + 83, + 84, + 87, + 96, + 97, + 98, + 99, + 103, + 107, + 109, + 111, + 113, + 117, + 118, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Arthur[] = +{ + 15, + 22, + 50, + 71, + 72, + 76, + 77, + 81, + 82, + 83, + 84, + 87, + 96, + 97, + 98, + 99, + 103, + 107, + 109, + 111, + 113, + 117, + 118, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alondra[] = +{ + 15, + 22, + 50, + 71, + 72, + 76, + 77, + 81, + 82, + 83, + 84, + 87, + 96, + 97, + 98, + 99, + 103, + 107, + 109, + 111, + 113, + 117, + 118, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Adriana[] = +{ + 15, + 22, + 50, + 71, + 72, + 76, + 77, + 81, + 82, + 83, + 84, + 87, + 96, + 97, + 98, + 99, + 103, + 107, + 109, + 111, + 113, + 117, + 118, + 131, + 134, + 138, + 139, + 142, + 144, + 145, + 151, + 155, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Malik[] = +{ + 10, + 15, + 22, + 49, + 50, + 64, + 66, + 71, + 72, + 77, + 78, + 81, + 82, + 91, + 93, + 107, + 108, + 113, + 115, + 117, + 122, + 135, + 137, + 142, + 143, + 144, + 145, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jill[] = +{ + 10, + 15, + 22, + 49, + 50, + 64, + 66, + 71, + 72, + 77, + 78, + 81, + 82, + 91, + 93, + 107, + 108, + 113, + 115, + 117, + 122, + 135, + 137, + 142, + 143, + 144, + 145, + 148, + 152, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Erik[] = +{ + 162, + 164, + 168, + 178, + 183, + 184, + 189, + 197, + 199, + 200, + 203, + 204, + 207, + 210, + 213, + 214, + 218, + 220, + 221, + 224, + 227, + 231, + 232, + 233, + 234, + 235, + 236, + 238, + 240, + 243, + 245, + 246, + 250, + 263, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Yazmin[] = +{ + 162, + 164, + 168, + 178, + 183, + 184, + 189, + 197, + 199, + 200, + 203, + 204, + 207, + 210, + 213, + 214, + 218, + 220, + 221, + 224, + 227, + 231, + 232, + 233, + 234, + 235, + 236, + 238, + 240, + 243, + 245, + 246, + 250, + 263, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jamal[] = +{ + 170, + 176, + 178, + 182, + 189, + 190, + 192, + 196, + 211, + 212, + 213, + 219, + 228, + 230, + 232, + 233, + 234, + 236, + 242, + 245, + 249, + 253, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 265, + 266, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Leslie[] = +{ + 170, + 176, + 178, + 182, + 189, + 190, + 192, + 196, + 211, + 212, + 213, + 219, + 228, + 230, + 232, + 233, + 234, + 236, + 242, + 245, + 249, + 253, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 265, + 266, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dave[] = +{ + 162, + 164, + 168, + 178, + 183, + 186, + 187, + 189, + 197, + 199, + 200, + 203, + 204, + 206, + 207, + 214, + 215, + 218, + 220, + 221, + 224, + 227, + 232, + 233, + 234, + 235, + 236, + 240, + 244, + 246, + 250, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Carlo[] = +{ + 162, + 164, + 168, + 178, + 183, + 186, + 187, + 189, + 197, + 199, + 200, + 203, + 204, + 206, + 207, + 214, + 215, + 218, + 220, + 221, + 224, + 227, + 232, + 233, + 234, + 235, + 236, + 240, + 244, + 246, + 250, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emilia[] = +{ + 162, + 164, + 168, + 178, + 183, + 186, + 187, + 189, + 197, + 199, + 200, + 203, + 204, + 206, + 207, + 214, + 215, + 218, + 220, + 221, + 224, + 227, + 232, + 233, + 234, + 235, + 236, + 240, + 244, + 246, + 250, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dalia[] = +{ + 162, + 164, + 168, + 178, + 183, + 186, + 187, + 189, + 197, + 199, + 200, + 203, + 204, + 206, + 207, + 214, + 215, + 218, + 220, + 221, + 224, + 227, + 232, + 233, + 234, + 235, + 236, + 240, + 244, + 246, + 250, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hitomi[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ricardo[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Shizuka[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Joana[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kelly[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rayna[] = +{ + 164, + 166, + 175, + 178, + 181, + 189, + 191, + 193, + 194, + 195, + 197, + 199, + 200, + 202, + 203, + 205, + 206, + 207, + 210, + 215, + 218, + 220, + 221, + 222, + 223, + 225, + 227, + 230, + 232, + 233, + 234, + 235, + 236, + 240, + 241, + 246, + 247, + 252, + 254, + 262, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Evan[] = +{ + 162, + 163, + 164, + 165, + 166, + 167, + 168, + 169, + 170, + 171, + 172, + 173, + 174, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, + 183, + 184, + 185, + 186, + 187, + 188, + 189, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 199, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jordan[] = +{ + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 209, + 210, + 211, + 212, + 213, + 214, + 215, + 216, + 217, + 218, + 219, + 220, + 221, + 222, + 223, + 224, + 225, + 226, + 227, + 228, + 229, + 230, + 231, + 232, + 233, + 234, + 235, + 236, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Joel[] = +{ + 237, + 238, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 249, + 250, + 251, + 252, + 253, + 254, + 255, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 263, + 264, + 265, + 266, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kristen[] = +{ + 162, + 163, + 164, + 165, + 166, + 167, + 168, + 169, + 170, + 171, + 172, + 173, + 174, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, + 183, + 184, + 185, + 186, + 187, + 188, + 189, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 199, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Selphy[] = +{ + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 209, + 210, + 211, + 212, + 213, + 214, + 215, + 216, + 217, + 218, + 219, + 220, + 221, + 222, + 223, + 224, + 225, + 226, + 227, + 228, + 229, + 230, + 231, + 232, + 233, + 234, + 235, + 236, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Chloe[] = +{ + 237, + 238, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 249, + 250, + 251, + 252, + 253, + 254, + 255, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 263, + 264, + 265, + 266, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Norton[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lukas[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zach[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kaitlyn[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Breanna[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kendra[] = +{ + 267, + 268, + 273, + 274, + 276, + 284, + 289, + 290, + 291, + 292, + 307, + 308, + 311, + 312, + 314, + 317, + 325, + 327, + 328, + 329, + 331, + 332, + 340, + 342, + 347, + 349, + 351, + 352, + 354, + 356, + 359, + 363, + 370, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Molly[] = +{ + 268, + 270, + 272, + 274, + 282, + 284, + 289, + 290, + 303, + 307, + 311, + 314, + 317, + 322, + 327, + 328, + 331, + 336, + 340, + 342, + 344, + 347, + 352, + 353, + 354, + 356, + 359, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jazmin[] = +{ + 268, + 270, + 272, + 274, + 282, + 284, + 289, + 290, + 303, + 307, + 311, + 314, + 317, + 322, + 327, + 328, + 331, + 336, + 340, + 342, + 344, + 347, + 352, + 353, + 354, + 356, + 359, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kelsey[] = +{ + 268, + 270, + 272, + 274, + 282, + 284, + 289, + 290, + 303, + 307, + 311, + 314, + 317, + 322, + 327, + 328, + 331, + 336, + 340, + 342, + 344, + 347, + 352, + 353, + 354, + 356, + 359, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jalen[] = +{ + 269, + 271, + 275, + 279, + 280, + 281, + 283, + 285, + 286, + 287, + 293, + 294, + 295, + 300, + 302, + 307, + 310, + 311, + 320, + 322, + 326, + 330, + 332, + 335, + 344, + 345, + 346, + 348, + 350, + 353, + 357, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Griffen[] = +{ + 269, + 271, + 275, + 279, + 280, + 281, + 283, + 285, + 286, + 287, + 293, + 294, + 295, + 300, + 302, + 307, + 310, + 311, + 320, + 322, + 326, + 330, + 332, + 335, + 344, + 345, + 346, + 348, + 350, + 353, + 357, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Xander[] = +{ + 269, + 271, + 275, + 279, + 280, + 281, + 283, + 285, + 286, + 287, + 293, + 294, + 295, + 300, + 302, + 307, + 310, + 311, + 320, + 322, + 326, + 330, + 332, + 335, + 344, + 345, + 346, + 348, + 350, + 353, + 357, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marvin[] = +{ + 267, + 268, + 269, + 270, + 271, + 272, + 273, + 274, + 275, + 276, + 277, + 278, + 279, + 280, + 281, + 282, + 283, + 284, + 285, + 286, + 287, + 288, + 289, + 290, + 291, + 292, + 293, + 294, + 295, + 296, + 297, + 298, + 299, + 300, + 301, + 302, + 303, + 304, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Brennan[] = +{ + 305, + 306, + 307, + 308, + 309, + 310, + 311, + 312, + 313, + 314, + 315, + 316, + 317, + 318, + 319, + 320, + 321, + 322, + 323, + 324, + 325, + 326, + 327, + 328, + 329, + 330, + 331, + 332, + 333, + 334, + 335, + 336, + 337, + 338, + 339, + 340, + 341, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Baley[] = +{ + 159, + 160, + 161, + 172, + 173, + 177, + 198, + 226, + 238, + 263, + 264, + 277, + 278, + 282, + 303, + 331, + 343, + 368, + 369, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zackary[] = +{ + 271, + 283, + 294, + 295, + 298, + 299, + 300, + 311, + 315, + 320, + 327, + 328, + 330, + 335, + 337, + 338, + 339, + 341, + 346, + 364, + 365, + 366, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gabriel[] = +{ + 342, + 343, + 344, + 345, + 346, + 347, + 348, + 349, + 350, + 351, + 352, + 353, + 354, + 355, + 356, + 357, + 358, + 359, + 360, + 361, + 362, + 363, + 364, + 365, + 366, + 367, + 368, + 369, + 370, + 371, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emily[] = +{ + 272, + 301, + 309, + 330, + 348, + 349, + 350, + 359, + 360, + 362, + 363, + 365, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jordyn[] = +{ + 267, + 269, + 270, + 272, + 273, + 276, + 279, + 284, + 288, + 302, + 304, + 305, + 308, + 309, + 312, + 316, + 319, + 322, + 323, + 325, + 326, + 329, + 331, + 332, + 336, + 340, + 344, + 345, + 351, + 353, + 355, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Sofia[] = +{ + 270, + 272, + 274, + 276, + 279, + 282, + 285, + 290, + 293, + 313, + 314, + 321, + 334, + 340, + 348, + 356, + 359, + 360, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Braden[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kayden[] = +{ + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Cooper[] = +{ + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Julia[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Amara[] = +{ + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lynn[] = +{ + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jovan[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dominic[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nikolas[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Valeria[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Delaney[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Meghan[] = +{ + 238, + 331, + 343, + 368, + 369, + 375, + 376, + 379, + 382, + 383, + 389, + 394, + 395, + 397, + 398, + 400, + 406, + 408, + 411, + 416, + 417, + 423, + 424, + 425, + 432, + 436, + 438, + 441, + 445, + 453, + 460, + 462, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Roberto[] = +{ + 386, + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 453, + 454, + 456, + 459, + 461, + 463, + 464, + 465, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Damian[] = +{ + 386, + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 453, + 454, + 456, + 459, + 461, + 463, + 464, + 465, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Brody[] = +{ + 386, + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 453, + 454, + 456, + 459, + 461, + 463, + 464, + 465, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Graham[] = +{ + 386, + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 453, + 454, + 456, + 459, + 461, + 463, + 464, + 465, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tylor[] = +{ + 374, + 381, + 382, + 385, + 388, + 389, + 391, + 392, + 394, + 409, + 411, + 412, + 419, + 430, + 432, + 436, + 440, + 456, + 460, + 462, + 463, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jaren[] = +{ + 374, + 381, + 382, + 385, + 388, + 389, + 391, + 392, + 394, + 409, + 411, + 412, + 419, + 430, + 432, + 436, + 440, + 456, + 460, + 462, + 463, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Cordell[] = +{ + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jazlyn[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Zachery[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Johan[] = +{ + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Shea[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kaila[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Isiah[] = +{ + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Garrett[] = +{ + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Haylie[] = +{ + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Megan[] = +{ + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Issac[] = +{ + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Quinton[] = +{ + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Salma[] = +{ + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ansley[] = +{ + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Holden[] = +{ + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 480, + 481, + 490, + 491, + 494, + 496, + 512, + 513, + 519, + 520, + 528, + 534, + 537, + 541, + 549, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Luca[] = +{ + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 480, + 481, + 490, + 491, + 494, + 496, + 512, + 513, + 519, + 520, + 528, + 534, + 537, + 541, + 549, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jamison[] = +{ + 282, + 331, + 343, + 368, + 369, + 469, + 472, + 475, + 476, + 478, + 481, + 484, + 490, + 491, + 497, + 500, + 501, + 509, + 510, + 513, + 516, + 517, + 519, + 520, + 524, + 528, + 530, + 533, + 534, + 537, + 542, + 553, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gunnar[] = +{ + 282, + 331, + 343, + 368, + 369, + 469, + 472, + 475, + 476, + 478, + 481, + 484, + 490, + 491, + 497, + 500, + 501, + 509, + 510, + 513, + 516, + 517, + 519, + 520, + 524, + 528, + 530, + 533, + 534, + 537, + 542, + 553, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Craig[] = +{ + 471, + 474, + 475, + 479, + 483, + 485, + 488, + 493, + 495, + 496, + 502, + 504, + 505, + 506, + 507, + 514, + 521, + 525, + 530, + 532, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 556, + 557, + 558, + 559, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Pierce[] = +{ + 471, + 474, + 475, + 479, + 483, + 485, + 488, + 493, + 495, + 496, + 502, + 504, + 505, + 506, + 507, + 514, + 521, + 525, + 530, + 532, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 556, + 557, + 558, + 559, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Regina[] = +{ + 471, + 474, + 475, + 479, + 483, + 485, + 488, + 493, + 495, + 496, + 502, + 504, + 505, + 506, + 507, + 514, + 521, + 525, + 530, + 532, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 556, + 557, + 558, + 559, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alison[] = +{ + 471, + 474, + 475, + 479, + 483, + 485, + 488, + 493, + 495, + 496, + 502, + 504, + 505, + 506, + 507, + 514, + 521, + 525, + 530, + 532, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 556, + 557, + 558, + 559, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hank[] = +{ + 277, + 278, + 282, + 303, + 331, + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 481, + 513, + 519, + 520, + 528, + 575, + 609, + 615, + 616, + 624, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Earl[] = +{ + 277, + 278, + 282, + 303, + 331, + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 481, + 513, + 519, + 520, + 528, + 575, + 609, + 615, + 616, + 624, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ramiro[] = +{ + 316, + 333, + 347, + 350, + 354, + 358, + 361, + 362, + 363, + 364, + 573, + 576, + 621, + 626, + 631, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hunter[] = +{ + 316, + 333, + 347, + 350, + 354, + 358, + 361, + 362, + 363, + 364, + 573, + 576, + 621, + 626, + 631, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Aiden[] = +{ + 564, + 575, + 576, + 578, + 579, + 580, + 594, + 595, + 605, + 606, + 608, + 609, + 615, + 619, + 620, + 624, + 625, + 627, + 632, + 642, + 650, + 658, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Xavier[] = +{ + 564, + 575, + 576, + 578, + 579, + 580, + 594, + 595, + 605, + 606, + 608, + 609, + 615, + 619, + 620, + 624, + 625, + 627, + 632, + 642, + 650, + 658, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Clinton[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jesse[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Eduardo[] = +{ + 268, + 307, + 317, + 349, + 352, + 573, + 583, + 585, + 588, + 590, + 599, + 614, + 618, + 635, + 639, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hal[] = +{ + 268, + 307, + 317, + 349, + 352, + 573, + 583, + 585, + 588, + 590, + 599, + 614, + 618, + 635, + 639, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gage[] = +{ + 289, + 318, + 319, + 329, + 355, + 375, + 379, + 385, + 386, + 457, + 473, + 477, + 482, + 484, + 553, + 567, + 571, + 577, + 578, + 649, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Arnold[] = +{ + 289, + 318, + 319, + 329, + 355, + 375, + 379, + 385, + 386, + 457, + 473, + 477, + 482, + 484, + 553, + 567, + 571, + 577, + 578, + 649, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jarrett[] = +{ + 565, + 573, + 576, + 580, + 582, + 584, + 592, + 601, + 602, + 610, + 621, + 623, + 626, + 631, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Garett[] = +{ + 565, + 573, + 576, + 580, + 582, + 584, + 592, + 601, + 602, + 610, + 621, + 623, + 626, + 631, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emanuel[] = +{ + 564, + 565, + 574, + 579, + 582, + 594, + 595, + 605, + 606, + 608, + 609, + 616, + 619, + 620, + 623, + 624, + 625, + 627, + 642, + 643, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gustavo[] = +{ + 564, + 565, + 574, + 579, + 582, + 594, + 595, + 605, + 606, + 608, + 609, + 616, + 619, + 620, + 623, + 624, + 625, + 627, + 642, + 643, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kameron[] = +{ + 568, + 581, + 589, + 598, + 600, + 603, + 607, + 611, + 617, + 618, + 622, + 636, + 643, + 646, + 647, + 652, + 654, + 656, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alfredo[] = +{ + 568, + 581, + 589, + 598, + 600, + 603, + 607, + 611, + 617, + 618, + 622, + 636, + 643, + 646, + 647, + 652, + 654, + 656, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ruben[] = +{ + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lamar[] = +{ + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jaxon[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Logan[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emilee[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Josie[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Armando[] = +{ + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Skyler[] = +{ + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ruth[] = +{ + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Melody[] = +{ + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Pedro[] = +{ + 347, + 661, + 664, + 669, + 672, + 676, + 677, + 678, + 680, + 685, + 688, + 694, + 696, + 697, + 698, + 699, + 706, + 713, + 717, + 719, + 722, + 724, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 748, + 749, + 750, + 751, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Erick[] = +{ + 347, + 661, + 664, + 669, + 672, + 676, + 677, + 678, + 680, + 685, + 688, + 694, + 696, + 697, + 698, + 699, + 706, + 713, + 717, + 719, + 722, + 724, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 748, + 749, + 750, + 751, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Elaine[] = +{ + 664, + 665, + 669, + 672, + 676, + 677, + 680, + 685, + 687, + 688, + 694, + 696, + 697, + 698, + 699, + 706, + 713, + 717, + 722, + 724, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 748, + 749, + 750, + 751, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Joyce[] = +{ + 664, + 665, + 669, + 672, + 676, + 677, + 680, + 685, + 687, + 688, + 694, + 696, + 697, + 698, + 699, + 706, + 713, + 717, + 722, + 724, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 748, + 749, + 750, + 751, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Todd[] = +{ + 267, + 273, + 305, + 312, + 325, + 332, + 352, + 662, + 665, + 668, + 669, + 670, + 672, + 673, + 676, + 677, + 679, + 680, + 682, + 688, + 697, + 698, + 699, + 700, + 707, + 710, + 718, + 720, + 724, + 725, + 728, + 730, + 731, + 732, + 734, + 735, + 744, + 748, + 750, + 751, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gavin[] = +{ + 267, + 273, + 305, + 312, + 325, + 332, + 352, + 662, + 665, + 668, + 669, + 670, + 672, + 673, + 676, + 677, + 679, + 680, + 682, + 688, + 697, + 698, + 699, + 700, + 707, + 710, + 718, + 720, + 724, + 725, + 728, + 730, + 731, + 732, + 734, + 735, + 744, + 748, + 750, + 751, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Malory[] = +{ + 267, + 273, + 305, + 312, + 325, + 332, + 352, + 662, + 665, + 668, + 669, + 670, + 672, + 673, + 676, + 677, + 679, + 680, + 682, + 688, + 697, + 698, + 699, + 700, + 707, + 710, + 718, + 720, + 724, + 725, + 728, + 730, + 731, + 732, + 734, + 735, + 744, + 748, + 750, + 751, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Esther[] = +{ + 267, + 273, + 305, + 312, + 325, + 332, + 352, + 662, + 665, + 668, + 669, + 670, + 672, + 673, + 676, + 677, + 679, + 680, + 682, + 688, + 697, + 698, + 699, + 700, + 707, + 710, + 718, + 720, + 724, + 725, + 728, + 730, + 731, + 732, + 734, + 735, + 744, + 748, + 750, + 751, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Oscar[] = +{ + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Wilson[] = +{ + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Clare[] = +{ + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tess[] = +{ + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Leon[] = +{ + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + 534, + 535, + 536, + 537, + 538, + 539, + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alonzo[] = +{ + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Vince[] = +{ + 421, + 425, + 431, + 437, + 439, + 456, + 460, + 465, + 466, + 517, + 521, + 527, + 533, + 535, + 552, + 556, + 561, + 562, + 613, + 617, + 623, + 629, + 631, + 648, + 652, + 657, + 658, + 709, + 713, + 719, + 725, + 727, + 744, + 748, + 753, + 754, + 766, + 777, + 788, + 799, + 800, + 801, + 802, + 803, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bryon[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 766, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 777, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 788, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 799, + 836, + 837, + 838, + 839, + 840, + 841, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ava[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Miriam[] = +{ + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Carrie[] = +{ + 421, + 425, + 431, + 437, + 439, + 456, + 460, + 465, + 466, + 517, + 521, + 527, + 533, + 535, + 552, + 556, + 561, + 562, + 613, + 617, + 623, + 629, + 631, + 648, + 652, + 657, + 658, + 709, + 713, + 719, + 725, + 727, + 744, + 748, + 753, + 754, + 765, + 776, + 787, + 798, + 800, + 801, + 802, + 803, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 842, + 843, + 844, + 845, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gillian2[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 765, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 776, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 787, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 798, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Tyler[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Chaz[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nelson[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 766, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 777, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 788, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 799, + 836, + 837, + 838, + 839, + 840, + 841, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Shania[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Stella[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dorine[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 765, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 776, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 787, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 798, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Maddox[] = +{ + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 454, + 456, + 459, + 461, + 463, + 465, + 499, + 508, + 509, + 510, + 529, + 531, + 536, + 546, + 550, + 552, + 555, + 557, + 559, + 561, + 595, + 604, + 605, + 606, + 625, + 627, + 632, + 642, + 646, + 648, + 651, + 653, + 655, + 657, + 691, + 700, + 701, + 702, + 721, + 723, + 728, + 738, + 742, + 744, + 747, + 749, + 751, + 753, + 765, + 766, + 776, + 777, + 787, + 788, + 798, + 799, + 828, + 829, + 830, + 831, + 842, + 843, + 844, + 845, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Davin[] = +{ + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 454, + 456, + 459, + 461, + 463, + 465, + 499, + 508, + 509, + 510, + 529, + 531, + 536, + 546, + 550, + 552, + 555, + 557, + 559, + 561, + 595, + 604, + 605, + 606, + 625, + 627, + 632, + 642, + 646, + 648, + 651, + 653, + 655, + 657, + 691, + 700, + 701, + 702, + 721, + 723, + 728, + 738, + 742, + 744, + 747, + 749, + 751, + 753, + 765, + 766, + 776, + 777, + 787, + 788, + 798, + 799, + 828, + 829, + 830, + 831, + 842, + 843, + 844, + 845, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Trevon[] = +{ + 403, + 412, + 413, + 414, + 433, + 435, + 440, + 450, + 454, + 456, + 459, + 461, + 463, + 465, + 499, + 508, + 509, + 510, + 529, + 531, + 536, + 546, + 550, + 552, + 555, + 557, + 559, + 561, + 595, + 604, + 605, + 606, + 625, + 627, + 632, + 642, + 646, + 648, + 651, + 653, + 655, + 657, + 691, + 700, + 701, + 702, + 721, + 723, + 728, + 738, + 742, + 744, + 747, + 749, + 751, + 753, + 765, + 766, + 776, + 777, + 787, + 788, + 798, + 799, + 828, + 829, + 830, + 831, + 842, + 843, + 844, + 845, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Mateo[] = +{ + 373, + 382, + 390, + 402, + 403, + 416, + 417, + 424, + 431, + 432, + 435, + 450, + 451, + 469, + 480, + 486, + 498, + 499, + 512, + 513, + 520, + 527, + 528, + 531, + 546, + 547, + 565, + 574, + 582, + 594, + 595, + 608, + 609, + 616, + 623, + 624, + 627, + 642, + 643, + 661, + 670, + 678, + 690, + 691, + 704, + 705, + 712, + 719, + 720, + 723, + 738, + 739, + 808, + 809, + 810, + 811, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bret[] = +{ + 373, + 382, + 390, + 415, + 419, + 424, + 426, + 430, + 431, + 444, + 451, + 454, + 455, + 464, + 469, + 480, + 486, + 511, + 515, + 520, + 522, + 526, + 527, + 540, + 547, + 550, + 551, + 560, + 565, + 574, + 582, + 607, + 611, + 616, + 618, + 622, + 623, + 636, + 643, + 646, + 647, + 656, + 661, + 670, + 678, + 703, + 707, + 712, + 714, + 718, + 719, + 732, + 739, + 742, + 743, + 752, + 808, + 809, + 810, + 811, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Raul[] = +{ + 373, + 382, + 383, + 386, + 390, + 423, + 424, + 431, + 433, + 450, + 451, + 466, + 469, + 480, + 481, + 482, + 486, + 519, + 520, + 527, + 529, + 546, + 547, + 562, + 565, + 574, + 575, + 578, + 582, + 615, + 616, + 623, + 625, + 642, + 643, + 658, + 661, + 670, + 671, + 674, + 678, + 711, + 712, + 719, + 721, + 738, + 739, + 754, + 808, + 809, + 810, + 811, + 832, + 833, + 834, + 835, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Kay[] = +{ + 373, + 382, + 387, + 390, + 402, + 403, + 413, + 414, + 424, + 427, + 431, + 433, + 451, + 469, + 470, + 480, + 486, + 498, + 499, + 509, + 510, + 520, + 523, + 527, + 529, + 547, + 565, + 574, + 579, + 582, + 594, + 595, + 605, + 606, + 616, + 619, + 623, + 625, + 643, + 661, + 670, + 675, + 678, + 690, + 691, + 701, + 702, + 712, + 715, + 719, + 721, + 739, + 808, + 809, + 810, + 811, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Elena[] = +{ + 373, + 382, + 390, + 415, + 419, + 424, + 426, + 430, + 431, + 444, + 451, + 454, + 455, + 464, + 469, + 480, + 486, + 511, + 515, + 520, + 522, + 526, + 527, + 540, + 547, + 550, + 551, + 560, + 565, + 574, + 582, + 607, + 611, + 616, + 618, + 622, + 623, + 636, + 643, + 646, + 647, + 656, + 661, + 670, + 678, + 703, + 707, + 712, + 714, + 718, + 719, + 732, + 739, + 742, + 743, + 752, + 808, + 809, + 810, + 811, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alana[] = +{ + 373, + 382, + 383, + 386, + 390, + 423, + 424, + 431, + 433, + 450, + 451, + 466, + 469, + 480, + 481, + 482, + 486, + 519, + 520, + 527, + 529, + 546, + 547, + 562, + 565, + 574, + 575, + 578, + 582, + 615, + 616, + 623, + 625, + 642, + 643, + 658, + 661, + 670, + 671, + 674, + 678, + 711, + 712, + 719, + 721, + 738, + 739, + 754, + 808, + 809, + 810, + 811, + 832, + 833, + 834, + 835, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alexas[] = +{ + 382, + 387, + 403, + 423, + 424, + 425, + 431, + 433, + 435, + 450, + 459, + 461, + 465, + 466, + 470, + 480, + 499, + 519, + 520, + 521, + 527, + 529, + 531, + 546, + 555, + 557, + 561, + 562, + 574, + 579, + 595, + 615, + 616, + 617, + 623, + 625, + 627, + 642, + 651, + 653, + 657, + 658, + 670, + 675, + 691, + 711, + 712, + 713, + 719, + 721, + 723, + 738, + 747, + 749, + 753, + 754, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Weston[] = +{ + 374, + 377, + 404, + 421, + 422, + 426, + 437, + 439, + 446, + 451, + 453, + 457, + 458, + 472, + 475, + 500, + 517, + 518, + 522, + 533, + 535, + 542, + 547, + 549, + 553, + 554, + 566, + 569, + 596, + 613, + 614, + 618, + 629, + 631, + 638, + 643, + 645, + 649, + 650, + 662, + 665, + 692, + 709, + 710, + 714, + 725, + 727, + 734, + 739, + 741, + 745, + 746, + 762, + 763, + 764, + 766, + 773, + 774, + 775, + 777, + 784, + 785, + 786, + 788, + 795, + 796, + 797, + 799, + 800, + 801, + 802, + 803, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 836, + 837, + 838, + 839, + 840, + 841, + 846, + 847, + 848, + 849, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jasper[] = +{ + 378, + 388, + 400, + 409, + 410, + 411, + 416, + 429, + 432, + 438, + 447, + 452, + 456, + 460, + 462, + 463, + 471, + 476, + 496, + 505, + 506, + 507, + 512, + 525, + 528, + 534, + 543, + 548, + 552, + 556, + 558, + 559, + 570, + 580, + 592, + 601, + 602, + 603, + 608, + 621, + 624, + 630, + 639, + 644, + 648, + 652, + 654, + 655, + 666, + 676, + 688, + 697, + 698, + 699, + 704, + 717, + 720, + 726, + 735, + 740, + 744, + 748, + 750, + 751, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 836, + 837, + 838, + 839, + 840, + 841, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nadia[] = +{ + 382, + 387, + 403, + 423, + 424, + 425, + 431, + 433, + 435, + 450, + 459, + 461, + 465, + 466, + 470, + 480, + 499, + 519, + 520, + 521, + 527, + 529, + 531, + 546, + 555, + 557, + 561, + 562, + 574, + 579, + 595, + 615, + 616, + 617, + 623, + 625, + 627, + 642, + 651, + 653, + 657, + 658, + 670, + 675, + 691, + 711, + 712, + 713, + 719, + 721, + 723, + 738, + 747, + 749, + 753, + 754, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Miranda[] = +{ + 374, + 377, + 404, + 421, + 422, + 426, + 437, + 439, + 446, + 451, + 453, + 457, + 458, + 472, + 475, + 500, + 517, + 518, + 522, + 533, + 535, + 542, + 547, + 549, + 553, + 554, + 566, + 569, + 596, + 613, + 614, + 618, + 629, + 631, + 638, + 643, + 645, + 649, + 650, + 662, + 665, + 692, + 709, + 710, + 714, + 725, + 727, + 734, + 739, + 741, + 745, + 746, + 762, + 763, + 764, + 765, + 773, + 774, + 775, + 776, + 784, + 785, + 786, + 787, + 795, + 796, + 797, + 798, + 800, + 801, + 802, + 803, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Emma[] = +{ + 378, + 388, + 400, + 409, + 410, + 411, + 416, + 429, + 432, + 438, + 447, + 452, + 456, + 460, + 462, + 463, + 471, + 476, + 496, + 505, + 506, + 507, + 512, + 525, + 528, + 534, + 543, + 548, + 552, + 556, + 558, + 559, + 570, + 580, + 592, + 601, + 602, + 603, + 608, + 621, + 624, + 630, + 639, + 644, + 648, + 652, + 654, + 655, + 666, + 676, + 688, + 697, + 698, + 699, + 704, + 717, + 720, + 726, + 735, + 740, + 744, + 748, + 750, + 751, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 836, + 837, + 838, + 839, + 840, + 841, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Rolando[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 756, + 757, + 758, + 766, + 767, + 768, + 769, + 777, + 778, + 779, + 780, + 788, + 789, + 790, + 791, + 799, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 846, + 847, + 848, + 849, + 870, + 871, + 872, + 873, + 874, + 875, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Stanly[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 759, + 760, + 761, + 766, + 770, + 771, + 772, + 777, + 781, + 782, + 783, + 788, + 792, + 793, + 794, + 799, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 846, + 847, + 848, + 849, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dario[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 762, + 763, + 764, + 766, + 773, + 774, + 775, + 777, + 784, + 785, + 786, + 788, + 795, + 796, + 797, + 799, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + 846, + 847, + 848, + 849, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Karlee[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 756, + 757, + 758, + 765, + 767, + 768, + 769, + 776, + 778, + 779, + 780, + 787, + 789, + 790, + 791, + 798, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 842, + 843, + 844, + 845, + 870, + 871, + 872, + 873, + 874, + 875, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jaylin[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 759, + 760, + 761, + 765, + 770, + 771, + 772, + 776, + 781, + 782, + 783, + 787, + 792, + 793, + 794, + 798, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 842, + 843, + 844, + 845, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ingrid[] = +{ + 185, + 290, + 377, + 380, + 385, + 401, + 404, + 409, + 410, + 428, + 437, + 438, + 439, + 446, + 466, + 475, + 478, + 484, + 497, + 500, + 505, + 506, + 524, + 533, + 534, + 535, + 542, + 562, + 569, + 572, + 577, + 593, + 596, + 601, + 602, + 620, + 629, + 630, + 631, + 638, + 658, + 665, + 668, + 673, + 689, + 692, + 697, + 698, + 716, + 725, + 726, + 727, + 734, + 754, + 762, + 763, + 764, + 765, + 773, + 774, + 775, + 776, + 784, + 785, + 786, + 787, + 795, + 796, + 797, + 798, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Delilah[] = +{ + 347, + 352, + 374, + 378, + 398, + 421, + 426, + 447, + 472, + 476, + 494, + 517, + 522, + 543, + 566, + 570, + 590, + 613, + 618, + 639, + 662, + 666, + 686, + 709, + 714, + 735, + 800, + 801, + 802, + 803, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Carly[] = +{ + 344, + 374, + 378, + 394, + 395, + 405, + 413, + 414, + 420, + 421, + 434, + 441, + 457, + 472, + 476, + 490, + 491, + 501, + 509, + 510, + 516, + 517, + 530, + 537, + 553, + 566, + 570, + 586, + 587, + 597, + 605, + 606, + 612, + 613, + 626, + 633, + 649, + 662, + 666, + 682, + 683, + 693, + 701, + 702, + 708, + 709, + 722, + 729, + 745, + 800, + 801, + 802, + 803, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Lexie[] = +{ + 344, + 347, + 352, + 394, + 395, + 398, + 405, + 413, + 414, + 420, + 421, + 426, + 434, + 441, + 447, + 457, + 490, + 491, + 494, + 501, + 509, + 510, + 516, + 517, + 522, + 530, + 537, + 543, + 553, + 586, + 587, + 590, + 597, + 605, + 606, + 612, + 613, + 618, + 626, + 633, + 639, + 649, + 682, + 683, + 686, + 693, + 701, + 702, + 708, + 709, + 714, + 722, + 729, + 735, + 745, + 800, + 801, + 802, + 803, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Miller[] = +{ + 345, + 376, + 386, + 387, + 397, + 399, + 402, + 403, + 406, + 408, + 411, + 413, + 414, + 425, + 427, + 429, + 433, + 435, + 440, + 441, + 445, + 448, + 449, + 450, + 452, + 454, + 456, + 458, + 459, + 460, + 462, + 465, + 466, + 467, + 470, + 474, + 482, + 493, + 495, + 498, + 499, + 502, + 504, + 507, + 509, + 510, + 521, + 523, + 525, + 529, + 531, + 536, + 537, + 541, + 544, + 545, + 546, + 548, + 550, + 552, + 554, + 555, + 556, + 558, + 561, + 562, + 563, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Marv[] = +{ + 345, + 568, + 578, + 579, + 589, + 591, + 594, + 595, + 598, + 600, + 603, + 605, + 606, + 617, + 619, + 621, + 625, + 627, + 632, + 633, + 637, + 640, + 641, + 642, + 644, + 646, + 648, + 650, + 651, + 652, + 654, + 657, + 658, + 659, + 664, + 674, + 675, + 685, + 687, + 690, + 691, + 694, + 696, + 699, + 701, + 702, + 713, + 715, + 717, + 721, + 723, + 728, + 729, + 733, + 736, + 737, + 738, + 740, + 742, + 744, + 746, + 747, + 748, + 750, + 753, + 754, + 755, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Layton[] = +{ + 345, + 425, + 433, + 435, + 445, + 450, + 454, + 456, + 458, + 459, + 460, + 465, + 466, + 521, + 529, + 531, + 541, + 546, + 550, + 552, + 554, + 555, + 556, + 561, + 562, + 617, + 625, + 627, + 637, + 642, + 646, + 648, + 650, + 651, + 652, + 657, + 658, + 713, + 721, + 723, + 733, + 738, + 742, + 744, + 746, + 747, + 748, + 753, + 754, + 804, + 805, + 806, + 807, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Brooks[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gregory[] = +{ + 421, + 425, + 431, + 437, + 439, + 456, + 460, + 465, + 466, + 517, + 521, + 527, + 533, + 535, + 552, + 556, + 561, + 562, + 613, + 617, + 623, + 629, + 631, + 648, + 652, + 657, + 658, + 709, + 713, + 719, + 725, + 727, + 744, + 748, + 753, + 754, + 765, + 766, + 776, + 777, + 787, + 788, + 798, + 799, + 800, + 801, + 802, + 803, + 804, + 805, + 806, + 807, + 808, + 809, + 810, + 811, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + 824, + 825, + 826, + 827, + 828, + 829, + 830, + 831, + 832, + 833, + 834, + 835, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Reese[] = +{ + 756, + 757, + 758, + 759, + 760, + 761, + 762, + 763, + 764, + 765, + 766, + 767, + 768, + 769, + 770, + 771, + 772, + 773, + 774, + 775, + 776, + 777, + 778, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 787, + 788, + 789, + 790, + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 798, + 799, + 836, + 837, + 838, + 839, + 840, + 841, + 842, + 843, + 844, + 845, + 846, + 847, + 848, + 849, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + 870, + 871, + 872, + 873, + 874, + 875, + 876, + 877, + 878, + 879, + 880, + 881, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Mason[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Toby[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dorothy[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Piper[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Finn[] = +{ + 317, + 371, + 373, + 377, + 390, + 392, + 399, + 431, + 452, + 456, + 469, + 475, + 486, + 488, + 495, + 527, + 548, + 552, + 565, + 569, + 573, + 576, + 580, + 582, + 584, + 591, + 592, + 601, + 602, + 610, + 621, + 623, + 626, + 631, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + 661, + 665, + 669, + 672, + 676, + 678, + 680, + 687, + 688, + 697, + 698, + 706, + 717, + 719, + 722, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 749, + 751, + 808, + 809, + 810, + 811, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Samir[] = +{ + 317, + 371, + 373, + 377, + 390, + 392, + 399, + 431, + 452, + 456, + 469, + 475, + 486, + 488, + 495, + 527, + 548, + 552, + 565, + 569, + 573, + 576, + 580, + 582, + 584, + 591, + 592, + 601, + 602, + 610, + 621, + 623, + 626, + 631, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + 661, + 665, + 669, + 672, + 676, + 678, + 680, + 687, + 688, + 697, + 698, + 706, + 717, + 719, + 722, + 727, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 749, + 751, + 808, + 809, + 810, + 811, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Fiona[] = +{ + 317, + 371, + 373, + 377, + 381, + 384, + 388, + 390, + 392, + 399, + 400, + 409, + 410, + 418, + 429, + 431, + 434, + 439, + 442, + 448, + 449, + 452, + 456, + 458, + 459, + 461, + 463, + 469, + 471, + 475, + 479, + 483, + 486, + 488, + 495, + 496, + 505, + 506, + 514, + 525, + 527, + 530, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 557, + 559, + 565, + 569, + 582, + 584, + 591, + 623, + 644, + 648, + 661, + 665, + 678, + 680, + 687, + 719, + 740, + 744, + 808, + 809, + 810, + 811, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gloria[] = +{ + 317, + 371, + 373, + 377, + 381, + 384, + 388, + 390, + 392, + 399, + 400, + 409, + 410, + 418, + 429, + 431, + 434, + 439, + 442, + 448, + 449, + 452, + 456, + 458, + 459, + 461, + 463, + 469, + 471, + 475, + 479, + 483, + 486, + 488, + 495, + 496, + 505, + 506, + 514, + 525, + 527, + 530, + 535, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 557, + 559, + 565, + 569, + 582, + 584, + 591, + 623, + 644, + 648, + 661, + 665, + 678, + 680, + 687, + 719, + 740, + 744, + 808, + 809, + 810, + 811, + 816, + 817, + 818, + 819, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Nico[] = +{ + 660, + 661, + 662, + 663, + 664, + 665, + 666, + 667, + 668, + 669, + 670, + 671, + 672, + 673, + 674, + 675, + 676, + 677, + 678, + 679, + 680, + 681, + 682, + 683, + 684, + 685, + 686, + 687, + 688, + 689, + 690, + 691, + 692, + 693, + 694, + 695, + 696, + 697, + 698, + 699, + 700, + 701, + 702, + 703, + 704, + 705, + 706, + 707, + 708, + 709, + 710, + 711, + 712, + 713, + 714, + 715, + 716, + 717, + 718, + 719, + 720, + 721, + 722, + 723, + 724, + 725, + 726, + 727, + 728, + 729, + 730, + 731, + 732, + 733, + 734, + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750, + 751, + 752, + 753, + 754, + 755, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Jeremy[] = +{ + 564, + 565, + 566, + 567, + 568, + 569, + 570, + 571, + 572, + 573, + 574, + 575, + 576, + 577, + 578, + 579, + 580, + 581, + 582, + 583, + 584, + 585, + 586, + 587, + 588, + 589, + 590, + 591, + 592, + 593, + 594, + 595, + 596, + 597, + 598, + 599, + 600, + 601, + 602, + 603, + 604, + 605, + 606, + 607, + 608, + 609, + 610, + 611, + 612, + 613, + 614, + 615, + 616, + 617, + 618, + 619, + 620, + 621, + 622, + 623, + 624, + 625, + 626, + 627, + 628, + 629, + 630, + 631, + 632, + 633, + 634, + 635, + 636, + 637, + 638, + 639, + 640, + 641, + 642, + 643, + 644, + 645, + 646, + 647, + 648, + 649, + 650, + 651, + 652, + 653, + 654, + 655, + 656, + 657, + 658, + 659, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Caitlin[] = +{ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, + 482, + 483, + 484, + 485, + 486, + 487, + 488, + 489, + 490, + 491, + 492, + 493, + 494, + 495, + 496, + 497, + 498, + 499, + 500, + 501, + 502, + 503, + 504, + 505, + 506, + 507, + 508, + 509, + 510, + 511, + 512, + 513, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 524, + 525, + 526, + 527, + 528, + 529, + 530, + 531, + 532, + 533, + 534, + 535, + 536, + 537, + 538, + 539, + 540, + 541, + 542, + 543, + 544, + 545, + 546, + 547, + 548, + 549, + 550, + 551, + 552, + 553, + 554, + 555, + 556, + 557, + 558, + 559, + 560, + 561, + 562, + 563, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Reena[] = +{ + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382, + 383, + 384, + 385, + 386, + 387, + 388, + 389, + 390, + 391, + 392, + 393, + 394, + 395, + 396, + 397, + 398, + 399, + 400, + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, + 414, + 415, + 416, + 417, + 418, + 419, + 420, + 421, + 422, + 423, + 424, + 425, + 426, + 427, + 428, + 429, + 430, + 431, + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443, + 444, + 445, + 446, + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460, + 461, + 462, + 463, + 464, + 465, + 466, + 467, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Avery[] = +{ + 21, + 238, + 282, + 303, + 331, + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 481, + 513, + 519, + 520, + 528, + 575, + 609, + 615, + 616, + 624, + 671, + 705, + 711, + 712, + 720, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Liam[] = +{ + 21, + 238, + 282, + 303, + 331, + 343, + 368, + 369, + 383, + 417, + 423, + 424, + 432, + 481, + 513, + 519, + 520, + 528, + 575, + 609, + 615, + 616, + 624, + 671, + 705, + 711, + 712, + 720, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Theo[] = +{ + 333, + 347, + 350, + 354, + 358, + 361, + 362, + 363, + 364, + 371, + 381, + 384, + 429, + 434, + 439, + 479, + 483, + 525, + 530, + 535, + 573, + 576, + 621, + 626, + 631, + 669, + 672, + 717, + 722, + 727, + 816, + 817, + 818, + 819, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bailey[] = +{ + 333, + 347, + 350, + 354, + 358, + 361, + 362, + 363, + 364, + 371, + 381, + 384, + 429, + 434, + 439, + 479, + 483, + 525, + 530, + 535, + 573, + 576, + 621, + 626, + 631, + 669, + 672, + 717, + 722, + 727, + 816, + 817, + 818, + 819, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Hugo[] = +{ + 383, + 386, + 402, + 403, + 416, + 417, + 423, + 432, + 433, + 435, + 450, + 466, + 481, + 482, + 498, + 499, + 512, + 513, + 519, + 528, + 529, + 531, + 546, + 562, + 575, + 578, + 594, + 595, + 608, + 609, + 615, + 624, + 625, + 627, + 642, + 658, + 671, + 674, + 690, + 691, + 704, + 705, + 711, + 720, + 721, + 723, + 738, + 754, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Bryce[] = +{ + 383, + 386, + 402, + 403, + 416, + 417, + 423, + 432, + 433, + 435, + 450, + 466, + 481, + 482, + 498, + 499, + 512, + 513, + 519, + 528, + 529, + 531, + 546, + 562, + 575, + 578, + 594, + 595, + 608, + 609, + 615, + 624, + 625, + 627, + 642, + 658, + 671, + 674, + 690, + 691, + 704, + 705, + 711, + 720, + 721, + 723, + 738, + 754, + 762, + 763, + 764, + 773, + 774, + 775, + 784, + 785, + 786, + 795, + 796, + 797, + 832, + 833, + 834, + 835, + 836, + 837, + 838, + 839, + 840, + 841, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gideon[] = +{ + 441, + 445, + 448, + 449, + 451, + 453, + 454, + 455, + 458, + 537, + 541, + 544, + 545, + 547, + 549, + 550, + 551, + 554, + 633, + 637, + 640, + 641, + 643, + 645, + 646, + 647, + 650, + 729, + 733, + 736, + 737, + 739, + 741, + 742, + 743, + 746, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Triston[] = +{ + 441, + 445, + 448, + 449, + 451, + 453, + 454, + 455, + 458, + 537, + 541, + 544, + 545, + 547, + 549, + 550, + 551, + 554, + 633, + 637, + 640, + 641, + 643, + 645, + 646, + 647, + 650, + 729, + 733, + 736, + 737, + 739, + 741, + 742, + 743, + 746, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Charles[] = +{ + 352, + 381, + 391, + 393, + 396, + 398, + 407, + 422, + 426, + 443, + 447, + 479, + 487, + 489, + 492, + 494, + 503, + 518, + 522, + 539, + 543, + 573, + 583, + 585, + 588, + 590, + 599, + 614, + 618, + 635, + 639, + 669, + 679, + 681, + 684, + 686, + 695, + 710, + 714, + 731, + 735, + 756, + 757, + 758, + 767, + 768, + 769, + 778, + 779, + 780, + 789, + 790, + 791, + 870, + 871, + 872, + 873, + 874, + 875, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Raymond[] = +{ + 374, + 376, + 381, + 404, + 407, + 422, + 439, + 443, + 459, + 472, + 500, + 506, + 507, + 518, + 532, + 546, + 566, + 585, + 588, + 628, + 635, + 679, + 681, + 684, + 710, + 731, + 785, + 795, + 796, + 797, + 817, + 842, + 843, + 846, + 847, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dirk[] = +{ + 355, + 375, + 379, + 385, + 386, + 412, + 435, + 440, + 454, + 457, + 459, + 465, + 473, + 477, + 482, + 484, + 508, + 531, + 536, + 550, + 553, + 555, + 561, + 567, + 571, + 577, + 578, + 604, + 627, + 632, + 646, + 649, + 651, + 657, + 663, + 667, + 673, + 674, + 700, + 723, + 728, + 742, + 745, + 747, + 753, + 756, + 757, + 758, + 767, + 768, + 769, + 778, + 779, + 780, + 789, + 790, + 791, + 828, + 829, + 830, + 831, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Harold[] = +{ + 355, + 375, + 379, + 385, + 386, + 412, + 435, + 440, + 454, + 457, + 459, + 465, + 473, + 477, + 482, + 484, + 508, + 531, + 536, + 550, + 553, + 555, + 561, + 567, + 571, + 577, + 578, + 604, + 627, + 632, + 646, + 649, + 651, + 657, + 663, + 667, + 673, + 674, + 700, + 723, + 728, + 742, + 745, + 747, + 753, + 756, + 757, + 758, + 767, + 768, + 769, + 778, + 779, + 780, + 789, + 790, + 791, + 828, + 829, + 830, + 831, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Omar[] = +{ + 373, + 388, + 390, + 392, + 400, + 409, + 410, + 418, + 431, + 442, + 448, + 449, + 452, + 456, + 458, + 459, + 461, + 463, + 469, + 471, + 486, + 488, + 496, + 505, + 506, + 514, + 527, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 557, + 559, + 565, + 580, + 582, + 584, + 592, + 601, + 602, + 610, + 623, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + 661, + 676, + 678, + 680, + 688, + 697, + 698, + 706, + 719, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 749, + 751, + 808, + 809, + 810, + 811, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Peter[] = +{ + 373, + 388, + 390, + 392, + 400, + 409, + 410, + 418, + 431, + 442, + 448, + 449, + 452, + 456, + 458, + 459, + 461, + 463, + 469, + 471, + 486, + 488, + 496, + 505, + 506, + 514, + 527, + 538, + 544, + 545, + 548, + 552, + 554, + 555, + 557, + 559, + 565, + 580, + 582, + 584, + 592, + 601, + 602, + 610, + 623, + 634, + 640, + 641, + 644, + 648, + 650, + 651, + 653, + 655, + 661, + 676, + 678, + 680, + 688, + 697, + 698, + 706, + 719, + 730, + 736, + 737, + 740, + 744, + 746, + 747, + 749, + 751, + 808, + 809, + 810, + 811, + 820, + 821, + 822, + 823, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dev[] = +{ + 372, + 387, + 402, + 403, + 413, + 414, + 416, + 417, + 427, + 428, + 432, + 433, + 435, + 440, + 450, + 466, + 468, + 470, + 498, + 499, + 509, + 510, + 512, + 513, + 523, + 524, + 528, + 529, + 531, + 536, + 546, + 562, + 564, + 579, + 594, + 595, + 605, + 606, + 608, + 609, + 619, + 620, + 624, + 625, + 627, + 632, + 642, + 658, + 660, + 675, + 690, + 691, + 701, + 702, + 704, + 705, + 715, + 716, + 720, + 721, + 723, + 728, + 738, + 754, + 832, + 833, + 834, + 835, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Corey[] = +{ + 372, + 387, + 402, + 403, + 413, + 414, + 416, + 417, + 427, + 428, + 432, + 433, + 435, + 440, + 450, + 466, + 468, + 470, + 498, + 499, + 509, + 510, + 512, + 513, + 523, + 524, + 528, + 529, + 531, + 536, + 546, + 562, + 564, + 579, + 594, + 595, + 605, + 606, + 608, + 609, + 619, + 620, + 624, + 625, + 627, + 632, + 642, + 658, + 660, + 675, + 690, + 691, + 701, + 702, + 704, + 705, + 715, + 716, + 720, + 721, + 723, + 728, + 738, + 754, + 832, + 833, + 834, + 835, + 860, + 861, + 862, + 863, + 864, + 865, + 866, + 867, + 868, + 869, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Andre[] = +{ + 374, + 378, + 415, + 419, + 421, + 426, + 430, + 444, + 451, + 454, + 455, + 464, + 472, + 476, + 511, + 515, + 517, + 522, + 526, + 540, + 547, + 550, + 551, + 560, + 566, + 570, + 607, + 611, + 613, + 618, + 622, + 636, + 643, + 646, + 647, + 656, + 662, + 666, + 703, + 707, + 709, + 714, + 718, + 732, + 739, + 742, + 743, + 752, + 800, + 801, + 802, + 803, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Ferris[] = +{ + 374, + 378, + 415, + 419, + 421, + 426, + 430, + 444, + 451, + 454, + 455, + 464, + 472, + 476, + 511, + 515, + 517, + 522, + 526, + 540, + 547, + 550, + 551, + 560, + 566, + 570, + 607, + 611, + 613, + 618, + 622, + 636, + 643, + 646, + 647, + 656, + 662, + 666, + 703, + 707, + 709, + 714, + 718, + 732, + 739, + 742, + 743, + 752, + 800, + 801, + 802, + 803, + 850, + 851, + 852, + 853, + 854, + 855, + 856, + 857, + 858, + 859, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Alivia[] = +{ + 399, + 400, + 409, + 422, + 438, + 441, + 445, + 448, + 449, + 451, + 452, + 454, + 455, + 489, + 492, + 493, + 503, + 526, + 532, + 535, + 536, + 560, + 573, + 583, + 590, + 592, + 608, + 611, + 620, + 651, + 682, + 688, + 714, + 729, + 732, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Paige[] = +{ + 399, + 400, + 409, + 422, + 438, + 441, + 445, + 448, + 449, + 451, + 452, + 454, + 455, + 489, + 492, + 493, + 503, + 526, + 532, + 535, + 536, + 560, + 573, + 583, + 590, + 592, + 608, + 611, + 620, + 651, + 682, + 688, + 714, + 729, + 732, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Anya[] = +{ + 442, + 443, + 444, + 446, + 447, + 538, + 539, + 540, + 542, + 543, + 634, + 635, + 636, + 638, + 639, + 730, + 731, + 732, + 734, + 735, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Dawn[] = +{ + 377, + 381, + 410, + 421, + 422, + 443, + 456, + 460, + 461, + 471, + 472, + 473, + 484, + 491, + 502, + 503, + 507, + 508, + 515, + 520, + 540, + 549, + 569, + 574, + 583, + 586, + 601, + 622, + 624, + 639, + 644, + 655, + 734, + 804, + 810, + 815, + 823, + 831, + 843, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Abby[] = +{ + 185, + 290, + 313, + 334, + 348, + 359, + 360, + 377, + 380, + 382, + 385, + 394, + 395, + 398, + 400, + 401, + 404, + 409, + 410, + 416, + 437, + 438, + 439, + 441, + 445, + 446, + 453, + 475, + 478, + 480, + 484, + 490, + 491, + 494, + 496, + 497, + 500, + 505, + 506, + 512, + 533, + 534, + 535, + 537, + 541, + 542, + 549, + 569, + 572, + 574, + 577, + 586, + 587, + 590, + 592, + 593, + 596, + 601, + 602, + 608, + 629, + 630, + 631, + 633, + 637, + 638, + 645, + 665, + 668, + 670, + 673, + 682, + 683, + 686, + 688, + 689, + 692, + 697, + 698, + 704, + 725, + 726, + 727, + 729, + 733, + 734, + 741, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + -1 +}; + +const u16 gBattleFrontierTrainerMons_Gretel[] = +{ + 185, + 290, + 313, + 334, + 348, + 359, + 360, + 377, + 380, + 382, + 385, + 394, + 395, + 398, + 400, + 401, + 404, + 409, + 410, + 416, + 437, + 438, + 439, + 441, + 445, + 446, + 453, + 475, + 478, + 480, + 484, + 490, + 491, + 494, + 496, + 497, + 500, + 505, + 506, + 512, + 533, + 534, + 535, + 537, + 541, + 542, + 549, + 569, + 572, + 574, + 577, + 586, + 587, + 590, + 592, + 593, + 596, + 601, + 602, + 608, + 629, + 630, + 631, + 633, + 637, + 638, + 645, + 665, + 668, + 670, + 673, + 682, + 683, + 686, + 688, + 689, + 692, + 697, + 698, + 704, + 725, + 726, + 727, + 729, + 733, + 734, + 741, + 812, + 813, + 814, + 815, + 816, + 817, + 818, + 819, + -1 +}; diff --git a/src/data/battle_frontier/battle_frontier_trainers.h b/src/data/battle_frontier/battle_frontier_trainers.h new file mode 100644 index 000000000..2b6b0d443 --- /dev/null +++ b/src/data/battle_frontier/battle_frontier_trainers.h @@ -0,0 +1,2403 @@ +const struct BattleFrontierTrainer gBattleFrontierTrainers[] = +{ + [0] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("BRAD"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, -1, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Brady + }, + [1] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("CONNE"), + .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, -1, -1}, + .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, -1}, + .speechLose = {EC_WORD_DARN, EC_WORD_ELLIPSIS, EC_WORD_LOSING, EC_WORD_DOES, EC_WORD_BUG, EC_WORD_ME}, + .monSets = gBattleFrontierTrainerMons_Conner + }, + [2] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("BRADLE"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_TODAY}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, -1, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_TOMORROW, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_WE, EC_WORD_REALLY, EC_WORD_BATTLE}, + .monSets = gBattleFrontierTrainerMons_Bradley + }, + [3] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("CYBI"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_NOT_VERY, EC_WORD_SCARY, EC_WORD_AT, EC_WORD_ALL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_SAD, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(STRUGGLE)}, + .speechLose = {EC_WORD_THIS, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_TO_ME, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Cybil + }, + [4] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("RODETT"), + .speechBefore = {EC_WORD_OH, EC_WORD_THIS, EC_WORD_IS, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_HOW, EC_WORD_STRONG, EC_WORD_I_AM, EC_WORD_EXCL}, + .speechLose = {EC_WORD_OH_DEAR, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_NO, EC_WORD_GOOD}, + .monSets = gBattleFrontierTrainerMons_Rodette + }, + [5] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("PEGG"), + .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_BE, EC_WORD_DESTROYED, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_THANKS, EC_WORD_TO, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Peggy + }, + [6] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("KEIT"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_JUST, EC_WORD_STUDY, EC_WORD_YOU, EC_WORD_KNOW}, + .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Keith + }, + [7] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("GRAYSO"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_BATTLE, EC_WORD_ISN_T, EC_WORD_CHILD_S_PLAY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_LIKE, EC_WORD_TOYS, EC_WORD_TO, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Grayson + }, + [8] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("GLEN"), + .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, -1}, + .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, -1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_COOL}, + .monSets = gBattleFrontierTrainerMons_Glenn + }, + [9] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("LILIAN"), + .speechBefore = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN}, + .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_SURRENDER, EC_WORD_IN, EC_WORD_ME}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Liliana + }, + [10] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("ELIS"), + .speechBefore = {EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_FROM, EC_WORD_MY, EC_WORD_FATHER}, + .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_EXCL, EC_WORD_FATHER, EC_WORD_I_VE, EC_WORD_WON}, + .speechLose = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FATHER, EC_WORD_FOR, EC_WORD_I_VE, EC_WORD_LOST}, + .monSets = gBattleFrontierTrainerMons_Elise + }, + [11] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("ZOE"), + .speechBefore = {EC_WORD_PLEASE, EC_WORD_BATTLE, EC_WORD_LIKE, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, -1, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .speechLose = {EC_WORD_WERE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_BEING, EC_WORD_SERIOUS, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Zoey + }, + [12] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("MANUE"), + .speechBefore = {EC_WORD_ME, EC_WORD_LOSE, EC_WORD_QUES, EC_WORD_THAT_S, EC_WORD_PREPOSTEROUS, EC_WORD_EXCL}, + .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, -1, -1, -1}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER}, + .monSets = gBattleFrontierTrainerMons_Manuel + }, + [13] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("RUS"), + .speechBefore = {EC_WORD_THEY, EC_WORD_ALL, EC_WORD_WANT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PARTY}, + .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_DO, EC_WORD_THAT, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Russ + }, + [14] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("DUSTI"), + .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, -1}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, -1}, + .monSets = gBattleFrontierTrainerMons_Dustin + }, + [15] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("TIN"), + .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(SWEET_KISS)}, + .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_YOUR, EC_MOVE2(SWEET_KISS), EC_WORD_FROM, EC_WORD_MY, EC_POKEMON2(JYNX)}, + .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_A, EC_MOVE(SWIFT), EC_MOVE2(MEGA_KICK), EC_WORD_INSTEAD}, + .monSets = gBattleFrontierTrainerMons_Tina + }, + [16] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("GILLIA"), + .speechBefore = {EC_WORD_THE, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_IS, EC_WORD_SO, EC_WORD_YESTERDAY}, + .speechWin = {EC_WORD_POKEMON, EC_WORD_NEVER, EC_WORD_GO, EC_WORD_OUT, EC_WORD_OF, EC_WORD_FASHION}, + .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Gillian + }, + [17] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("ZO"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_A, EC_WORD_WORRY, EC_WORD_AT, EC_WORD_ALL}, + .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SKILL}, + .monSets = gBattleFrontierTrainerMons_Zoe + }, + [18] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("CHE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_TODAY}, + .speechWin = {EC_WORD_I_AM, EC_WORD_READY, EC_WORD_TO, EC_WORD_GO, EC_WORD_ON, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_MOVE(FOCUS_ENERGY), EC_WORD_AND, EC_WORD_TOUGHNESS}, + .monSets = gBattleFrontierTrainerMons_Chen + }, + [19] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("A"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_LOOK, EC_WORD_SAYS, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_RIGHT, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH}, + .monSets = gBattleFrontierTrainerMons_Al + }, + [20] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("MITC"), + .speechBefore = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_IS, EC_WORD_MY, EC_WORD_ALLY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Mitch + }, + [21] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("ANN"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_NOW}, + .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Anne + }, + [22] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("ALIZ"), + .speechBefore = {EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_ME}, + .speechWin = {EC_WORD_YUP, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG}, + .speechLose = {EC_WORD_I_AM, EC_WORD_WEAK, EC_WORD_ELLIPSIS, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_CUTE}, + .monSets = gBattleFrontierTrainerMons_Alize + }, + [23] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("LAURE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_ALSO, EC_WORD_GOOD}, + .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_I_WAS, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_GOOD}, + .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_WEIRD, EC_WORD_DREAM, EC_WORD_THAT_WAS, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Lauren + }, + [24] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("KIP"), + .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GO, EC_MOVE2(SURF)}, + .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_OFF, EC_WORD_TO, EC_MOVE2(SURF)}, + .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Kipp + }, + [25] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("JASO"), + .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, -1}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, -1}, + .speechLose = {EC_WORD_WOW, EC_WORD_THAT, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_STRATEGY}, + .monSets = gBattleFrontierTrainerMons_Jason + }, + [26] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("JOH"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_SO, EC_WORD_WHAT, EC_WORD_IF_I_LOSE, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_John + }, + [27] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("AN"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_IT, EC_WORD_REALLY, EC_WORD_IS}, + .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_I, EC_WORD_CAN, EC_WORD_CRY}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SAD, EC_WORD_I, EC_WORD_WILL, EC_WORD_CRY}, + .monSets = gBattleFrontierTrainerMons_Ann + }, + [28] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("EILEE"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_OK_QUES}, + .speechWin = {EC_WORD_SO, EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_FEELING}, + .speechLose = {EC_WORD_AN, EC_WORD_ADULT, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Eileen + }, + [29] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("CARLI"), + .speechBefore = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_IS, EC_WORD_FOR, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_WILL, EC_WORD_BE, EC_WORD_AWESOME}, + .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Carlie + }, + [30] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("GORDO"), + .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON}, + .speechLose = {EC_WORD_NOTHING, EC_WORD_IS, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_FOR, EC_WORD_ME}, + .monSets = gBattleFrontierTrainerMons_Gordon + }, + [31] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("AYDE"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_WATER, EC_WORD_TO, EC_WORD_COOL, EC_WORD_DOWN}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_ICE, EC_WORD_COLD}, + .monSets = gBattleFrontierTrainerMons_Ayden + }, + [32] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("MARC"), + .speechBefore = {EC_WORD_I, EC_MOVE2(SURF), EC_WORD_IN, EC_WORD_THE, EC_WORD_WINTER, EC_WORD_TOO}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_MOVE2(SURF), EC_WORD_RIGHT, EC_WORD_NOW}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(BEAT_UP), EC_WORD_MY, EC_MOVE2(SURF), EC_WORD_BOARD}, + .monSets = gBattleFrontierTrainerMons_Marco + }, + [33] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("CIERR"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_MY, EC_WORD_SWIFT_SWIM}, + .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, -1}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_BETTER, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Cierra + }, + [34] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("MARC"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL}, + .speechWin = {EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_NOT, EC_WORD_THE, EC_WORD_KNOCKOUT, EC_WORD_I, EC_WORD_MEAN}, + .monSets = gBattleFrontierTrainerMons_Marcy + }, + [35] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("KATH"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_WON, EC_WORD_EVERY, EC_WORD_MATCH, EC_WORD_TODAY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_GREAT, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, + .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_HAVE, EC_WORD_LOST}, + .monSets = gBattleFrontierTrainerMons_Kathy + }, + [36] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("PEYTO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_DISAPPOINTED, EC_WORD_WITH, EC_WORD_MY, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_IF, EC_WORD_WE, EC_WORD_WIN, EC_WORD_TOGETHER}, + .speechLose = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_MORE, EC_WORD_IF_I_LOSE}, + .monSets = gBattleFrontierTrainerMons_Peyton + }, + [37] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("JULIA"), + .speechBefore = {EC_WORD_YOU, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_RIGHT, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_OUT, EC_WORD_OF, EC_WORD_THE, EC_WORD_QUESTION}, + .speechLose = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Julian + }, + [38] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("QUIN"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_BUT, EC_WORD_A, EC_WORD_DREAM}, + .speechWin = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_BEAUTIFUL, EC_WORD_DREAM, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWFUL, EC_MOVE(NIGHTMARE), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Quinn + }, + [39] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("HAYLE"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_I_AM, EC_WORD_FEELING}, + .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_OVERWHELMING, EC_WORD_JOY, EC_WORD_OVER, EC_WORD_THIS}, + .speechLose = {EC_WORD_DESTROYED, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_FEELING}, + .monSets = gBattleFrontierTrainerMons_Haylee + }, + [40] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("AMAND"), + .speechBefore = {EC_WORD_I, EC_WORD_COME, EC_WORD_FROM, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_FAMILY}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_RIGHT, EC_WORD_NOW}, + .monSets = gBattleFrontierTrainerMons_Amanda + }, + [41] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("STAC"), + .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_THEIR, EC_WORD_OWN, EC_WORD_CUTE_CHARM}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_WHAT, EC_WORD_I, EC_WORD_MEAN, EC_WORD_QUES}, + .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_NOT, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Stacy + }, + [42] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("RAFAE"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_SOME, EC_WORD_SPIRIT}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_WELL, EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_OUR, EC_WORD_SPIRIT}, + .monSets = gBattleFrontierTrainerMons_Rafael + }, + [43] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("OLIVE"), + .speechBefore = {EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_WORKS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAN, EC_WORD_I_AM}, + .monSets = gBattleFrontierTrainerMons_Oliver + }, + [44] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("PAYTO"), + .speechBefore = {EC_WORD_I, EC_WORD_TRAIN, EC_WORD_FROM, EC_WORD_THE, EC_WORD_EGG, EC_WORD_UP}, + .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, -1, -1, -1}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Payton + }, + [45] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("PAMEL"), + .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_ADORE, EC_WORD_A, EC_WORD_KIND, EC_WORD_TRAINER}, + .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_AND, EC_WORD_YOU_RE, EC_WORD_ALSO, EC_WORD_STRONG}, + .monSets = gBattleFrontierTrainerMons_Pamela + }, + [46] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("ELIZ"), + .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_CHILDREN}, + .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POKEMON}, + .speechLose = {EC_WORD_OH_DEAR, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THIS}, + .monSets = gBattleFrontierTrainerMons_Eliza + }, + [47] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("MARIS"), + .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, -1}, + .speechWin = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BETTER}, + .speechLose = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Marisa + }, + [48] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("LEWI"), + .speechBefore = {EC_WORD_A_LITTLE, EC_WORD_BUG, EC_WORD_IS, EC_WORD_SCARY, EC_WORD_QUES, EC_WORD_HAHAHA}, + .speechWin = {EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL, EC_WORD_A, EC_WORD_SCARY, EC_WORD_BUG}, + .speechLose = {EC_WORD_OH, EC_WORD_A, EC_WORD_BUG, EC_WORD_ISN_T, EC_WORD_SCARY, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Lewis + }, + [49] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("YOSH"), + .speechBefore = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_LOVEY_DOVEY}, + .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, -1}, + .monSets = gBattleFrontierTrainerMons_Yoshi + }, + [50] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("DESTI"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), -1, -1}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, -1}, + .monSets = gBattleFrontierTrainerMons_Destin + }, + [51] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("KEO"), + .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FOR, EC_WORD_MY, EC_WORD_OVERWHELMING, EC_WORD_POWER}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Keon + }, + [52] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("STUAR"), + .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_YOU, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_THE, EC_WORD_MASTER, EC_WORD_OF, EC_WORD_COOL, EC_WORD_THAT_S, EC_WORD_ME}, + .speechLose = {EC_WORD_I, EC_WORD_SEE, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_SO, EC_WORD_COOL}, + .monSets = gBattleFrontierTrainerMons_Stuart + }, + [53] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("NESTO"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_REALLY, EC_WORD_SMOOTH, EC_WORD_MOVE}, + .speechWin = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_NOTHING, EC_WORD_SMOOTH, EC_WORD_ABOUT, EC_WORD_THAT}, + .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Nestor + }, + [54] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("DERRIC"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(MEDITATE), EC_WORD_LIKE, EC_WORD_ME}, + .speechWin = {EC_WORD_HOW, EC_WORD_I, EC_MOVE2(MEDITATE), EC_WORD_IS, EC_WORD_JUST, EC_WORD_BEAUTIFUL}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(MEDITATE), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(CALM_MIND)}, + .monSets = gBattleFrontierTrainerMons_Derrick + }, + [55] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("BRYSO"), + .speechBefore = {EC_MOVE2(POISON_POWDER), EC_WORD_IS, EC_WORD_IN, EC_WORD_OUR, EC_MOVE2(COTTON_SPORE), EC_WORD_MOVE}, + .speechWin = {EC_WORD_HOW_DO, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_OUR, EC_MOVE2(POISON_POWDER), EC_WORD_QUES}, + .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Bryson + }, + [56] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("CLAYTO"), + .speechBefore = {EC_WORD_HUH_QUES, -1, -1, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, -1}, + .speechWin = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_POKENAV}, + .speechLose = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SENSE}, + .monSets = gBattleFrontierTrainerMons_Clayton + }, + [57] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("TRENTO"), + .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, -1}, + .speechWin = {EC_WORD_MMM, EC_WORD_DO, EC_WORD_YOU, EC_WORD_WANT, EC_WORD_SOME, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_GOT, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_WATER, EC_WORD_SHOPPING}, + .monSets = gBattleFrontierTrainerMons_Trenton + }, + [58] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("JENSO"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_DOWNCAST}, + .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THE, EC_MOVE(CUT)}, + .speechLose = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_TRAINER, EC_WORD_WHO_IS, EC_WORD_FEELING, EC_WORD_DOWNCAST}, + .monSets = gBattleFrontierTrainerMons_Jenson + }, + [59] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("WESLE"), + .speechBefore = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_IS, EC_WORD_HOW, EC_WORD_I, EC_WORD_CRY}, + .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_EXCL}, + .speechLose = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_EXCL, EC_POKEMON2(MEW), EC_WORD_EXCL_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Wesley + }, + [60] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("ANTO"), + .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_FOR, EC_WORD_ME, EC_WORD_TO, EC_MOVE(THRASH)}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THAT, EC_WORD_EXCL}, + .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_LOSS, EC_WORD_TO, EC_MOVE2(SWALLOW)}, + .monSets = gBattleFrontierTrainerMons_Anton + }, + [61] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("LAWSO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_NOT, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NOT, EC_WORD_AT, EC_WORD_ALL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_AND, EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Lawson + }, + [62] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("SAMM"), + .speechBefore = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK}, + .speechWin = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_JUST, EC_WORD_INCREDIBLE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_CRY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_PARTY, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Sammy + }, + [63] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("ARNI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_RIVAL}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE}, + .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON_T, EC_WORD_ACCEPT, EC_WORD_THIS}, + .monSets = gBattleFrontierTrainerMons_Arnie + }, + [64] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("ADRIA"), + .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, -1, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, -1, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, -1, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Adrian + }, + [65] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("TRISTA"), + .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, -1, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, + .speechWin = {EC_WORD_SEE, EC_WORD_QUES, -1, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_IN, EC_WORD_BATTLE}, + .monSets = gBattleFrontierTrainerMons_Tristan + }, + [66] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("JULIAN"), + .speechBefore = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SHOPPING, EC_WORD_TOO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL}, + .speechLose = {EC_WORD_I, EC_WORD_SO, EC_WORD_WANT, EC_WORD_ANOTHER, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL}, + .monSets = gBattleFrontierTrainerMons_Juliana + }, + [67] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("RYLE"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS}, + .speechWin = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_GUTS}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GUTSY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SUPER}, + .monSets = gBattleFrontierTrainerMons_Rylee + }, + [68] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("CHELSE"), + .speechBefore = {EC_WORD_I, EC_WORD_SERIOUSLY, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, -1}, + .monSets = gBattleFrontierTrainerMons_Chelsea + }, + [69] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("DANEL"), + .speechBefore = {EC_WORD_YOU, EC_WORD_MUST_BE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_NOW, EC_WORD_EXCL}, + .speechWin = {EC_WORD_OH_DEAR, EC_WORD_TOO_WEAK, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_GIVE_UP, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GOOD, EC_WORD_AND, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, + .monSets = gBattleFrontierTrainerMons_Danela + }, + [70] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("LIZBET"), + .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(PRESENT)}, + .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_A_LITTLE, EC_WORD_PRAISE, EC_WORD_AS, EC_WORD_YOUR, EC_MOVE2(PRESENT)}, + .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES_EXCL, EC_WORD_HERE_IT_IS, EC_WORD_A, EC_MOVE(DOUBLE_SLAP)}, + .monSets = gBattleFrontierTrainerMons_Lizbeth + }, + [71] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("AMELI"), + .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_CUTE, EC_WORD_FASHION, EC_WORD_APPEAL}, + .speechWin = {EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_A, EC_WORD_DISASTER}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AWFUL, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_HOME}, + .monSets = gBattleFrontierTrainerMons_Amelia + }, + [72] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("JILLIA"), + .speechBefore = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_THAT, EC_WORD_I, EC_WORD_SMELL, EC_WORD_QUES}, + .speechWin = {EC_WORD_IT_S, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_TASTY, EC_WORD_WATER}, + .speechLose = {EC_WORD_IT_S, EC_WORD_YOUR, EC_WORD_OFFENSIVE, EC_WORD_STENCH, EC_WORD_THAT_S, EC_WORD_WHAT}, + .monSets = gBattleFrontierTrainerMons_Jillian + }, + [73] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("ABBI"), + .speechBefore = {EC_WORD_YOU, EC_WORD_TRY, EC_WORD_MY, EC_WORD_SECRET, EC_MOVE(AROMATHERAPY), EC_WORD_OK_QUES}, + .speechWin = {EC_WORD_MY, EC_MOVE(AROMATHERAPY), EC_WORD_IS, EC_WORD_TERRIBLE, EC_WORD_FOR, EC_WORD_YOU}, + .speechLose = {EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_SMELL, EC_WORD_A, EC_WORD_THING, EC_WORD_QUES_EXCL}, + .monSets = gBattleFrontierTrainerMons_Abbie + }, + [74] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("BRIAN"), + .speechBefore = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_WORKS, EC_WORD_TOO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_MISS, EC_WORD_HIM, EC_WORD_MORE, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LONESOME, EC_WORD_WITHOUT, EC_WORD_HIM, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Briana + }, + [75] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("ANTONI"), + .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_WORD_GO, EC_WORD_GO}, + .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_DON_T, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_DANCE}, + .speechLose = {EC_WORD_GO, EC_WORD_GO, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_MOVE(FLAIL), EC_WORD_ABOUT}, + .monSets = gBattleFrontierTrainerMons_Antonio + }, + [76] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("JADE"), + .speechBefore = {EC_WORD_HELLO, EC_WORD_I, EC_WORD_THINK, EC_WORD_I, EC_WORD_ADORE, EC_WORD_YOU}, + .speechWin = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_MOVE(THRASH), EC_WORD_IN, EC_MOVE2(FRUSTRATION)}, + .speechLose = {EC_WORD_THIS_IS_IT_EXCL, -1, -1, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Jaden + }, + [77] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("DAKOT"), + .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER}, + .speechWin = {EC_WORD_GOT, EC_WORD_IT, EC_WORD_QUES, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER}, + .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Dakota + }, + [78] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("BRAYDE"), + .speechBefore = {EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ARE, EC_WORD_USELESS, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_COLLECT, EC_WORD_NORMAL, EC_WORD_VERSION, EC_WORD_TOYS}, + .speechLose = {EC_WORD_I, EC_MOVE2(ATTRACT), EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Brayden + }, + [79] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("CORSO"), + .speechBefore = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(BEAT_UP), EC_WORD_ON, EC_WORD_YOU}, + .speechWin = {EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_COOL}, + .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, -1, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Corson + }, + [80] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("TREVI"), + .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NONE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ME}, + .speechWin = {EC_WORD_YES_SIR_EXCL, -1, -1, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST}, + .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, -1, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Trevin + }, + [81] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("PATRIC"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, -1}, + .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, -1}, + .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Patrick + }, + [82] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("KADE"), + .speechBefore = {EC_WORD_WHAT, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_UP, EC_WORD_TO, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_WERE, EC_WORD_A, EC_WORD_SURPRISE, EC_WORD_TO_ME, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_WHO, EC_WORD_I_AM, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Kaden + }, + [83] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("MAXWEL"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_RIVAL, EC_WORD_IS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND}, + .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, -1}, + .monSets = gBattleFrontierTrainerMons_Maxwell + }, + [84] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("DARY"), + .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_MOVE(CHARGE)}, + .speechWin = {EC_WORD_AM, EC_WORD_I, EC_WORD_OVERWHELMING, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_A, EC_WORD_LEGEND, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Daryl + }, + [85] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("KENNET"), + .speechBefore = {EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_MOVE2(SLACK_OFF), EC_WORD_WITH, EC_WORD_ME}, + .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_MOVE2(TAUNT), EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Kenneth + }, + [86] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("RIC"), + .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, -1}, + .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, -1}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, -1}, + .monSets = gBattleFrontierTrainerMons_Rich + }, + [87] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("CADE"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, -1, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_SO, EC_WORD_HOT}, + .monSets = gBattleFrontierTrainerMons_Caden + }, + [88] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("MARLO"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_QUES}, + .speechWin = {EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_HUH_QUES, EC_WORD_THAT_S, EC_WORD_TOTALLY, EC_WORD_COOL}, + .speechLose = {EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_QUES, EC_WORD_IS, EC_WORD_POKENAV, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Marlon + }, + [89] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("NAS"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_I, EC_WORD_LEFT, EC_WORD_YOU, EC_WORD_JUST, EC_WORD_AN, EC_MOVE2(EMBER)}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, -1, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE}, + .monSets = gBattleFrontierTrainerMons_Nash + }, + [90] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("ROBB"), + .speechBefore = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_LEADER, EC_WORD_WITH, EC_WORD_REFRESHING, EC_WORD_SERENE_GRACE}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(THRASH), EC_WORD_MY, EC_WORD_TOYS, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Robby + }, + [91] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("REEC"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(QUICK_ATTACK), EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_A, EC_MOVE2(TELEPORT)}, + .speechWin = {EC_WORD_LIKE, EC_WORD_I, EC_WORD_SAID, EC_WORD_I_AM, EC_WORD_DARN, EC_WORD_FAST}, + .speechLose = {EC_WORD_I_WAS, EC_WORD_KIDDING, EC_WORD_ABOUT, EC_WORD_THAT, EC_MOVE2(TELEPORT), EC_WORD_THING}, + .monSets = gBattleFrontierTrainerMons_Reece + }, + [92] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("KATHRY"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_TRAIN, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_QUES}, + .speechWin = {EC_WORD_DON_T, EC_MOVE2(TAUNT), EC_WORD_ME, EC_WORD_LIKE, EC_WORD_THAT, EC_WORD_OK_QUES}, + .speechLose = {EC_WORD_WHY, EC_WORD_COULDN_T, EC_WORD_I, EC_WORD_WIN, EC_WORD_THIS, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Kathryn + }, + [93] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("ELLE"), + .speechBefore = {EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_AN, EC_WORD_EGG, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_VICTORY, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Ellen + }, + [94] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("RAMO"), + .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, -1, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION}, + .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_THAT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, + .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_SECRET, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_HAPPY}, + .monSets = gBattleFrontierTrainerMons_Ramon + }, + [95] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("ARTHU"), + .speechBefore = {EC_WORD_HERE_I_COME, EC_WORD_FEELING, EC_WORD_READY, EC_WORD_FOR, EC_WORD_IT, EC_WORD_ALL}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, -1}, + .monSets = gBattleFrontierTrainerMons_Arthur + }, + [96] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("ALONDR"), + .speechBefore = {EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_IS, EC_WORD_A, EC_WORD_GREAT, EC_WORD_DAY}, + .speechWin = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_WILL, EC_WORD_BE, EC_WORD_A, EC_WORD_LEGEND}, + .speechLose = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_LEFT, EC_WORD_ME, EC_WORD_COLD, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Alondra + }, + [97] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("ADRIAN"), + .speechBefore = {EC_WORD_COME, EC_WORD_SEE, EC_WORD_AN, EC_WORD_INCREDIBLE, EC_WORD_SWIFT_SWIM, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_MAKE, EC_WORD_IT, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_EASY}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, -1}, + .monSets = gBattleFrontierTrainerMons_Adriana + }, + [98] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("MALI"), + .speechBefore = {EC_WORD_OH, EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_WON, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED}, + .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED}, + .monSets = gBattleFrontierTrainerMons_Malik + }, + [99] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("JIL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_GIVES, EC_WORD_UP, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Jill + }, + [100] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("ERI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_FROM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, + .monSets = gBattleFrontierTrainerMons_Erik + }, + [101] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("YAZMI"), + .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_RUN, EC_WORD_THAN, EC_WORD_BIKE}, + .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_WOULD, EC_WORD_MUCH, EC_WORD_RATHER, EC_WORD_RUN}, + .speechLose = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_RUN_AWAY}, + .monSets = gBattleFrontierTrainerMons_Yazmin + }, + [102] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("JAMA"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_FATHER}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_BABY}, + .speechLose = {EC_WORD_MY, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_TOTALLY, EC_WORD_AWESOME}, + .monSets = gBattleFrontierTrainerMons_Jamal + }, + [103] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("LESLI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_MOTHER}, + .speechWin = {EC_WORD_A, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_A_LITTLE, EC_WORD_CHALLENGE}, + .speechLose = {EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_BE, EC_WORD_ANGRY}, + .monSets = gBattleFrontierTrainerMons_Leslie + }, + [104] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("DAV"), + .speechBefore = {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_TODAY, EC_WORD_QUES}, + .speechWin = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_ENJOY, EC_WORD_SOME, EC_WORD_SPORTS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_PLAY, EC_WORD_A, EC_WORD_GAME}, + .monSets = gBattleFrontierTrainerMons_Dave + }, + [105] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("CARL"), + .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Carlo + }, + [106] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("EMILI"), + .speechBefore = {EC_WORD_ME, EC_WORD_WORRY, EC_WORD_QUES, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NONE}, + .speechWin = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_FANTASTIC, EC_WORD_EXCL}, + .speechLose = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_ENTERTAINING, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Emilia + }, + [107] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("DALI"), + .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, -1}, + .speechWin = {EC_WORD_DON_T, EC_WORD_COME, EC_WORD_NEAR, EC_WORD_MY, EC_WORD_BIKE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_MY, EC_WORD_BEST, EC_WORD_FRIEND}, + .monSets = gBattleFrontierTrainerMons_Dalia + }, + [108] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("HITOM"), + .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_HAH, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, -1, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL}, + .monSets = gBattleFrontierTrainerMons_Hitomi + }, + [109] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("RICARD"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_PLAY, EC_WORD_TIME, EC_WORD_IS, EC_WORD_OVER}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Ricardo + }, + [110] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("SHIZUK"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_PERFECT, EC_WORD_IN, EC_WORD_EVERY, EC_WORD_WAY, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Shizuka + }, + [111] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("JOAN"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_RIGHT, EC_WORD_AWAY}, + .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_WINNER, EC_WORD_HEAR, EC_WORD_ME, EC_MOVE2(ROAR)}, + .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_ACCEPT, EC_WORD_THAT, EC_MOVE(OUTRAGE)}, + .monSets = gBattleFrontierTrainerMons_Joana + }, + [112] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("KELL"), + .speechBefore = {EC_WORD_MY, EC_WORD_NIGHT, EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_SCARY}, + .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, -1}, + .speechLose = {EC_WORD_THE, EC_WORD_HOME, EC_WORD_WORK, EC_WORD_IS, EC_WORD_AWFULLY, EC_WORD_SCARY}, + .monSets = gBattleFrontierTrainerMons_Kelly + }, + [113] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("RAYN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_WHEN, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_POWER}, + .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Rayna + }, + [114] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("EVA"), + .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, -1}, + .speechWin = {EC_WORD_OH, EC_WORD_EXCL, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_VICTORY}, + .speechLose = {EC_WORD_THE, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_OF, EC_WORD_A, EC_WORD_LOSS}, + .monSets = gBattleFrontierTrainerMons_Evan + }, + [115] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("JORDA"), + .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, -1, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Jordan + }, + [116] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("JOE"), + .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, + .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Joel + }, + [117] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("KRISTE"), + .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, -1, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_JUST, EC_WORD_A_LITTLE, EC_WORD_KID, EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_EXCL}, + .speechLose = {EC_WORD_A, EC_WORD_TOUGH, EC_WORD_KID, EC_WORD_HUH_QUES, EC_WORD_HUMPH, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Kristen + }, + [118] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("SELPH"), + .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, -1, -1, -1}, + .speechWin = {EC_WORD_OH, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES}, + .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Selphy + }, + [119] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("CHLO"), + .speechBefore = {EC_WORD_COME, EC_WORD_WE, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BATTLE, EC_WORD_NOW}, + .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, -1, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_OH, EC_WORD_EXCL, -1, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE}, + .monSets = gBattleFrontierTrainerMons_Chloe + }, + [120] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("NORTO"), + .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, -1, -1}, + .speechWin = {EC_WORD_EXCUSE_ME, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_PUSHOVER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Norton + }, + [121] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("LUKA"), + .speechBefore = {EC_WORD_MY, EC_WORD_JOKING, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_EXISTS, EC_WORD_TO, EC_WORD_SHINE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, -1}, + .monSets = gBattleFrontierTrainerMons_Lukas + }, + [122] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("ZAC"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_EXCELLENT, EC_MOVE2(MIMIC), EC_WORD_OF, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_LIKE, EC_WORD_A_LITTLE, EC_POKEMON2(TOGEPI), EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_LIKE, EC_WORD_A, EC_POKEMON2(MANKEY), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Zach + }, + [123] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("KAITLY"), + .speechBefore = {EC_WORD_I, EC_WORD_CRUSH, EC_WORD_THINGS, EC_WORD_WITH, EC_WORD_PSYCHIC, EC_WORD_POWER}, + .speechWin = {EC_WORD_MY, EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_THE, EC_WORD_NEWS}, + .speechLose = {EC_WORD_NO, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_WORD_THIS, EC_WORD_WON_T, EC_WORD_DO}, + .monSets = gBattleFrontierTrainerMons_Kaitlyn + }, + [124] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("BREANN"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAVE, EC_WORD_SOME, EC_WORD_MORE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, -1}, + .monSets = gBattleFrontierTrainerMons_Breanna + }, + [125] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("KENDR"), + .speechBefore = {EC_WORD_IF, EC_WORD_YOU_RE, EC_WORD_SMART, EC_WORD_STOP, EC_WORD_RIGHT, EC_WORD_NOW}, + .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_STOP}, + .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Kendra + }, + [126] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("MOLL"), + .speechBefore = {EC_WORD_WILL, EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_TOYS, EC_WORD_NOW}, + .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Molly + }, + [127] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("JAZMI"), + .speechBefore = {EC_WORD_I, EC_WORD_FORECAST, EC_WORD_TERRIBLE, EC_WORD_THINGS, EC_WORD_FOR, EC_WORD_YOU}, + .speechWin = {EC_WORD_THERE, EC_WORD_WASN_T, EC_WORD_MY, EC_WORD_FORECAST, EC_WORD_RIGHT, EC_WORD_QUES}, + .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_DIDN_T, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THIS}, + .monSets = gBattleFrontierTrainerMons_Jazmin + }, + [128] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("KELSE"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_SLEPT, EC_WORD_IN, EC_WORD_DAYS, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_WILL, EC_WORD_BE, EC_WORD_EXCELLENT, EC_WORD_NOW}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Kelsey + }, + [129] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("JALE"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_ALLOW, EC_WORD_POKEMON, EC_WORD_TO, EC_MOVE(THRASH)}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_ANGRY, EC_WORD_QUES}, + .speechLose = {EC_WORD_WHY, EC_WORD_IS, EC_WORD_THIS, EC_WORD_SO, EC_WORD_HARD, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Jalen + }, + [130] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("GRIFFE"), + .speechBefore = {EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(SLUDGE), EC_WORD_TO, EC_MOVE2(TRANSFORM), EC_WORD_MYSELF}, + .speechWin = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_MOVE2(ACID_ARMOR)}, + .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_WORD_SUCTION_CUPS}, + .monSets = gBattleFrontierTrainerMons_Griffen + }, + [131] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("XANDE"), + .speechBefore = {EC_WORD_I, EC_WORD_GOT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ON, EC_WORD_RENTAL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_MY, EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_WON}, + .speechLose = {EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_UP, EC_WORD_TO, EC_MOVE2(SCRATCH)}, + .monSets = gBattleFrontierTrainerMons_Xander + }, + [132] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("MARVI"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_UP, EC_WORD_TO, EC_WORD_THE, EC_WORD_CHALLENGE, EC_WORD_QUES}, + .speechWin = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU_RE, EC_WORD_GOOD, EC_WORD_ENOUGH}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PERFECT, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .monSets = gBattleFrontierTrainerMons_Marvin + }, + [133] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("BRENNA"), + .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_TO, EC_WORD_SEE, EC_WORD_THE, EC_WORD_NEWS}, + .speechWin = {EC_WORD_COMICS, EC_WORD_GET, EC_WORD_DAMP, EC_WORD_FROM, EC_WORD_DRIZZLE, EC_WORD_QUES}, + .speechLose = {EC_WORD_THE, EC_WORD_TIGHT, EC_WORD_MONEY, EC_WORD_LIVING, EC_WORD_CHANNEL, EC_WORD_QUES_EXCL}, + .monSets = gBattleFrontierTrainerMons_Brennan + }, + [134] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("BALE"), + .speechBefore = {EC_MOVE(SCREECH), EC_WORD_IS, EC_WORD_LIKE, EC_WORD_MUSIC, EC_WORD_TO_ME, EC_WORD_EXCL}, + .speechWin = {EC_WORD_MY, EC_MOVE(SCREECH), EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Baley + }, + [135] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("ZACKAR"), + .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_MOVE(DIG), EC_WORD_IT, EC_WORD_YO, EC_WORD_QUES}, + .speechWin = {EC_MOVE2(TAKE_DOWN), EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YO, EC_WORD_YO}, + .speechLose = {EC_WORD_BREAK, EC_WORD_DOWN, EC_MOVE2(DIVE), EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME}, + .monSets = gBattleFrontierTrainerMons_Zackary + }, + [136] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("GABRIE"), + .speechBefore = {EC_MOVE2(POUND), EC_WORD_THE, EC_WORD_THICK_FAT, EC_WORD_ON, EC_WORD_MY, EC_MOVE2(BELLY_DRUM)}, + .speechWin = {EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM)}, + .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Gabriel + }, + [137] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("EMIL"), + .speechBefore = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A_TINY_BIT, EC_WORD_OF, EC_MOVE(HYPNOSIS), EC_WORD_QUES}, + .speechWin = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WORKS, EC_WORD_TO, EC_WORD_PERFECTION}, + .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WENT, EC_WORD_BADLY, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Emily + }, + [138] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("JORDY"), + .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_MY, EC_WORD_SECRET, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_AS, EC_WORD_I, EC_WORD_APPEAR, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Jordyn + }, + [139] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("SOFI"), + .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), -1}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_FEELING, EC_WORD_THAT, EC_WORD_I, EC_WORD_GET}, + .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, -1}, + .monSets = gBattleFrontierTrainerMons_Sofia + }, + [140] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("BRADE"), + .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, -1, EC_WORD_THIS_IS_IT_EXCL, -1, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PRETTY, EC_WORD_AWESOME, EC_WORD_ABOUT, EC_WORD_MYSELF}, + .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Braden + }, + [141] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("KAYDE"), + .speechBefore = {EC_WORD_THEY, EC_WORD_OVERDO, EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ISN_T, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, -1}, + .monSets = gBattleFrontierTrainerMons_Kayden + }, + [142] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("COOPE"), + .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_ABSOLUTELY, EC_WORD_BE, EC_WORD_A, EC_WORD_PUSHOVER}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_TOO, EC_WORD_EXCITING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, -1, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY}, + .monSets = gBattleFrontierTrainerMons_Cooper + }, + [143] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("JULI"), + .speechBefore = {EC_WORD_SPIRIT, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN}, + .speechWin = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_THIS, EC_WORD_WITH, EC_WORD_SERENE_GRACE}, + .speechLose = {EC_WORD_FOR_NOW, EC_WORD_GOOD_BYE, EC_WORD_BUT, EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_OVER}, + .monSets = gBattleFrontierTrainerMons_Julia + }, + [144] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("AMAR"), + .speechBefore = {EC_WORD_WROOOAAR_EXCL, EC_WORD_EXCL_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_READY, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_LOSE, EC_WORD_MYSELF, EC_WORD_IF, EC_WORD_IT_S, EC_WORD_EXCITING}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_MOVE2(TACKLE), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Amara + }, + [145] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("LYN"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HIDDEN, EC_WORD_FOREVER}, + .speechWin = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_NOW, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_MOVE(SAFEGUARD), EC_WORD_YOUR, EC_WORD_OWN, EC_WORD_SECRET}, + .monSets = gBattleFrontierTrainerMons_Lynn + }, + [146] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("JOVA"), + .speechBefore = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_SADLY, EC_WORD_LACKING}, + .speechWin = {EC_WORD_MY, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_COOL, EC_WORD_ISN_T_IT_QUES}, + .speechLose = {EC_WORD_I_WAS, EC_WORD_MINUS, EC_WORD_MY, EC_WORD_NORMAL, EC_WORD_POWER, EC_WORD_TODAY}, + .monSets = gBattleFrontierTrainerMons_Jovan + }, + [147] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("DOMINI"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, -1}, + .speechLose = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_DOESN_T, EC_WORD_MISS, EC_WORD_A, EC_WORD_THING}, + .monSets = gBattleFrontierTrainerMons_Dominic + }, + [148] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("NIKOLA"), + .speechBefore = {EC_WORD_I, EC_MOVE2(MIMIC), EC_WORD_POKEMON, EC_WORD_AFTER, EC_WORD_EVERY, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_IF_I_WIN, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(TAUROS)}, + .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(MILTANK)}, + .monSets = gBattleFrontierTrainerMons_Nikolas + }, + [149] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("VALERI"), + .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_NOT, EC_MOVE2(GLARE)}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL, EC_WORD_I, EC_WORD_MEAN, EC_WORD_REALLY}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_A, EC_WORD_REALLY, EC_MOVE(SCARY_FACE), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Valeria + }, + [150] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("DELANE"), + .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OVER, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY}, + .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_FROM, EC_WORD_SCHOOL}, + .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_WORK, EC_WORD_NEXT, EC_WORD_WEEK}, + .monSets = gBattleFrontierTrainerMons_Delaney + }, + [151] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("MEGHA"), + .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OUT, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY}, + .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, -1}, + .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, -1}, + .monSets = gBattleFrontierTrainerMons_Meghan + }, + [152] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("ROBERT"), + .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BAD, EC_WORD_I_WAS, EC_WORD_JUST, EC_WORD_BETTER}, + .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Roberto + }, + [153] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("DAMIA"), + .speechBefore = {EC_WORD_MY, EC_WORD_PURE_POWER, EC_WORD_IS, EC_WORD_MACHINE, EC_WORD_LIKE, EC_WORD_EXCL}, + .speechWin = {EC_WORD_MY, EC_MOVE2(MACH_PUNCH), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)}, + .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, -1, EC_WORD_NO, EC_WORD_EXCL_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Damian + }, + [154] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("BROD"), + .speechBefore = {EC_WORD_MY, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SEEMS, EC_POKEMON(ODDISH), EC_WORD_QUES}, + .speechWin = {EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FAMILY, EC_WORD_STAY_AT_HOME, EC_WORD_LOOK, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_QUESTION, EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SERIOUSLY}, + .monSets = gBattleFrontierTrainerMons_Brody + }, + [155] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("GRAHA"), + .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, -1, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_BAD}, + .monSets = gBattleFrontierTrainerMons_Graham + }, + [156] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("TYLO"), + .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_MY, EC_MOVE2(HEAT_WAVE), EC_WORD_QUES}, + .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_BUT, EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_FOR, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Tylor + }, + [157] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("JARE"), + .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, -1}, + .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, -1}, + .monSets = gBattleFrontierTrainerMons_Jaren + }, + [158] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("CORDEL"), + .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_DECIDED, EC_WORD_ON, EC_WORD_SPIRIT}, + .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_ON, EC_WORD_MY, EC_WORD_WAY}, + .monSets = gBattleFrontierTrainerMons_Cordell + }, + [159] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("JAZLY"), + .speechBefore = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_REALLY, EC_WORD_AWESOME, EC_WORD_QUES}, + .speechWin = {EC_WORD_OH_YEAH, EC_WORD_WOW, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_SUPER}, + .speechLose = {EC_WORD_AN, EC_WORD_AVANT_GARDE, EC_WORD_POKEDEX, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_AWESOME}, + .monSets = gBattleFrontierTrainerMons_Jazlyn + }, + [160] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("ZACHER"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_MY, EC_WORD_OWN, EC_WORD_PLACE, EC_WORD_YEEHAW_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_FLATTEN, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Zachery + }, + [161] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("JOHA"), + .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_MOVE2(HELPING_HAND)}, + .speechLose = {EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_USE, EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_UP}, + .monSets = gBattleFrontierTrainerMons_Johan + }, + [162] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("SHE"), + .speechBefore = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_WITH, EC_WORD_BEAUTY, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_IN, EC_WORD_AN, EC_WORD_UGLY, EC_WORD_WAY}, + .speechLose = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_BEAUTY, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Shea + }, + [163] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("KAIL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_THIRSTY, EC_WORD_RIGHT, EC_WORD_NOW, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_I, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_WORD_COLD, EC_WORD_DRINK}, + .speechLose = {EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_HARD, EC_WORD_TO, EC_MOVE2(SWALLOW)}, + .monSets = gBattleFrontierTrainerMons_Kaila + }, + [164] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("ISIA"), + .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, -1}, + .speechWin = {EC_WORD_I, EC_MOVE2(TRICK), EC_WORD_MOTHER, EC_WORD_FOR, EC_WORD_MY, EC_WORD_ALLOWANCE}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_WANT, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE}, + .monSets = gBattleFrontierTrainerMons_Isiah + }, + [165] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, + .trainerName = _("GARRET"), + .speechBefore = {EC_WORD_I, EC_WORD_ENJOY, EC_WORD_COMICS, EC_WORD_AND, EC_WORD_THIS, EC_WORD_GAME}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_MUSIC, EC_WORD_IDOL, EC_WORD_TOO}, + .speechLose = {EC_WORD_BUT, EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE}, + .monSets = gBattleFrontierTrainerMons_Garrett + }, + [166] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("HAYLI"), + .speechBefore = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_SLEEP}, + .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A, EC_MOVE2(CALM_MIND)}, + .speechLose = {EC_WORD_MY, EC_WORD_INSOMNIA, EC_WORD_WILL, EC_WORD_GET, EC_WORD_BAD, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Haylie + }, + [167] = { + .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, + .trainerName = _("MEGA"), + .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_AN, EC_MOVE(AROMATHERAPY), EC_WORD_BATH}, + .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, -1}, + .speechLose = {EC_WORD_IF, EC_WORD_ONLY, EC_MOVE(AROMATHERAPY), EC_WORD_WERE, EC_WORD_LESS, EC_WORD_EXPENSIVE}, + .monSets = gBattleFrontierTrainerMons_Megan + }, + [168] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("ISSA"), + .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, -1, -1, -1}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(WATER_SPORT)}, + .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(MUD_SPORT)}, + .monSets = gBattleFrontierTrainerMons_Issac + }, + [169] = { + .facilityClass = FACILITY_CLASS_RICH_BOY, + .trainerName = _("QUINTO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, -1}, + .speechLose = {EC_WORD_HEY, EC_WORD_WHAT, EC_WORD_DID, EC_WORD_I, EC_WORD_DO, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Quinton + }, + [170] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("SALM"), + .speechBefore = {EC_WORD_YOU_VE, EC_WORD_GOT, EC_WORD_YOUR, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_EXCL}, + .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_YOU, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_OUT}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_I, EC_WORD_LOST}, + .monSets = gBattleFrontierTrainerMons_Salma + }, + [171] = { + .facilityClass = FACILITY_CLASS_LADY, + .trainerName = _("ANSLE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_ELLIPSIS, EC_WORD_DANCE, EC_WORD_FOR, EC_WORD_ME}, + .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, -1}, + .speechLose = {EC_WORD_TAKE, EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SOME, EC_WORD_OTHER, EC_WORD_PLACE}, + .monSets = gBattleFrontierTrainerMons_Ansley + }, + [172] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("HOLDE"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_COMMEMORATE, EC_WORD_MY, EC_WORD_COOLNESS, EC_WORD_IN, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, -1}, + .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, -1}, + .monSets = gBattleFrontierTrainerMons_Holden + }, + [173] = { + .facilityClass = FACILITY_CLASS_BUG_CATCHER, + .trainerName = _("LUC"), + .speechBefore = {EC_WORD_WE, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_COOL, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_IN, EC_WORD_A, EC_WORD_COOL, EC_WORD_WAY}, + .speechLose = {EC_WORD_HELLO, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_A, EC_WORD_KID}, + .monSets = gBattleFrontierTrainerMons_Luca + }, + [174] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("JAMISO"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(SECRET_POWER), EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_TO, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_USE, EC_MOVE(SMOKESCREEN), EC_WORD_TO, EC_WORD_ESCAPE}, + .monSets = gBattleFrontierTrainerMons_Jamison + }, + [175] = { + .facilityClass = FACILITY_CLASS_NINJA_BOY, + .trainerName = _("GUNNA"), + .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, -1}, + .speechWin = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_LOSE, EC_WORD_THAT, EC_MOVE(SCARY_FACE), EC_WORD_OF, EC_WORD_YOURS}, + .monSets = gBattleFrontierTrainerMons_Gunnar + }, + [176] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("CRAI"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_TRAIN}, + .speechWin = {EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_ISN_T, EC_WORD_HERE, EC_WORD_YET, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Craig + }, + [177] = { + .facilityClass = FACILITY_CLASS_TUBER_M, + .trainerName = _("PIERC"), + .speechBefore = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_A, EC_MOVE2(HEAT_WAVE), EC_WORD_LAST, EC_WORD_WEEK}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), -1}, + .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Pierce + }, + [178] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("REGIN"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PLAY, EC_WORD_IN, EC_WORD_WATER}, + .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_MUCH, EC_WORD_GOOD, EC_WORD_IN, EC_WORD_WATER}, + .monSets = gBattleFrontierTrainerMons_Regina + }, + [179] = { + .facilityClass = FACILITY_CLASS_TUBER_F, + .trainerName = _("ALISO"), + .speechBefore = {EC_WORD_THIS, EC_WORD_KINDERGARTEN, EC_WORD_MAGAZINE, EC_WORD_IS, EC_WORD_TOO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_HOW, EC_WORD_TO, EC_WORD_BUG, EC_WORD_YOUR, EC_WORD_TEACHER, EC_WORD_QUES}, + .speechLose = {EC_WORD_ENJOY, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SCHOOL, EC_WORD_DIET, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Alison + }, + [180] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("HAN"), + .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_A, EC_WORD_BUG, EC_WORD_EVENT, EC_WORD_SOON}, + .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_BUG, EC_WORD_FASHION, EC_WORD_SHOW, EC_WORD_EXCL}, + .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Hank + }, + [181] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("EAR"), + .speechBefore = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_IS, EC_WORD_HERE}, + .speechWin = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_AM, EC_WORD_I}, + .speechLose = {EC_WORD_SEE, EC_WORD_HOW, EC_WORD_FAST, EC_WORD_I, EC_WORD_RUN_AWAY, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Earl + }, + [182] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("RAMIR"), + .speechBefore = {EC_WORD_I, EC_WORD_WENT, EC_WORD_TO, EC_WORD_A, EC_WORD_FISHING, EC_WORD_SCHOOL}, + .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_I_AM, EC_WORD_IN, EC_WORD_THE, EC_WORD_FISHING, EC_WORD_HALL_OF_FAME}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_BACK, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Ramiro + }, + [183] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("HUNTE"), + .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_TOTALLY, EC_WORD_COOL, EC_MOVE(CROSS_CHOP)}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE(CROSS_CHOP)}, + .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Hunter + }, + [184] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("AIDE"), + .speechBefore = {EC_WORD_MY, EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_HEALTHY}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_HEALTHY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_HEALTHY, EC_WORD_THAN, EC_WORD_I_AM, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Aiden + }, + [185] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("XAVIE"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, -1, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, -1}, + .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, -1, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, + .monSets = gBattleFrontierTrainerMons_Xavier + }, + [186] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("CLINTO"), + .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_QUES}, + .speechWin = {EC_WORD_YOUR, EC_MOVE2(FURY_SWIPES), EC_WORD_YOUR, EC_MOVE(STRENGTH), EC_WORD_YOUNG, EC_WORD_TRAINER}, + .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Clinton + }, + [187] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("JESS"), + .speechBefore = {EC_WORD_THIS, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_FOR, EC_WORD_MY, EC_WORD_MOTHER}, + .speechWin = {EC_WORD_MOTHER, EC_WORD_WILL, EC_WORD_BE, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Jesse + }, + [188] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("EDUARD"), + .speechBefore = {EC_WORD_OUR, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ALL, EC_WORD_NIGHT}, + .speechWin = {EC_WORD_NIGHTTIME, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_I, EC_WORD_PLAY, EC_WORD_BEST}, + .speechLose = {EC_WORD_LET_S, EC_WORD_PARTY, EC_WORD_UNTIL, EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Eduardo + }, + [189] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("HA"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_HIP_AND, EC_WORD_HAPPENING, EC_WORD_OH_YEAH, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_TRENDY, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, + .monSets = gBattleFrontierTrainerMons_Hal + }, + [190] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("GAG"), + .speechBefore = {EC_WORD_HERE_IT_IS, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_HIDDEN, EC_WORD_MOVE}, + .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_VICTORY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, -1}, + .monSets = gBattleFrontierTrainerMons_Gage + }, + [191] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("ARNOL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_WEIRD, EC_WORD_FROM, EC_WORD_A, EC_WORD_DREAM}, + .speechWin = {EC_WORD_YOUR, EC_MOVE(SCARY_FACE), EC_WORD_WAS, EC_WORD_IN, EC_WORD_MY, EC_WORD_DREAM}, + .speechLose = {EC_WORD_MY, EC_WORD_INCREDIBLE, EC_WORD_DREAM, EC_WORD_WAS, EC_WORD_SO, EC_WORD_WEIRD}, + .monSets = gBattleFrontierTrainerMons_Arnold + }, + [192] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("JARRET"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_DANCE, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_YESTERDAY}, + .speechWin = {EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_APPRECIATE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE}, + .monSets = gBattleFrontierTrainerMons_Jarrett + }, + [193] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("GARET"), + .speechBefore = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A_LITTLE, EC_MOVE2(SWEET_KISS)}, + .speechWin = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_MY, EC_WORD_TREASURE}, + .speechLose = {EC_WORD_A, EC_WORD_TREASURE, EC_WORD_ISN_T, EC_WORD_ALWAYS, EC_WORD_ABOUT, EC_WORD_MONEY}, + .monSets = gBattleFrontierTrainerMons_Garett + }, + [194] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("EMANUE"), + .speechBefore = {EC_WORD_SMARTNESS, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN}, + .speechWin = {EC_WORD_I_AM, EC_WORD_NOT_VERY, EC_WORD_SMART, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON}, + .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_MOVE2(FAKE_OUT), EC_WORD_ME, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Emanuel + }, + [195] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("GUSTAV"), + .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, -1, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, -1}, + .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, -1, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_SURRENDER, EC_WORD_YET}, + .monSets = gBattleFrontierTrainerMons_Gustavo + }, + [196] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("KAMERO"), + .speechBefore = {EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK)}, + .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK), EC_MOVE(ASTONISH), EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_FALL, EC_WORD_FOR, EC_WORD_MY, EC_MOVE2(TRICK)}, + .monSets = gBattleFrontierTrainerMons_Kameron + }, + [197] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("ALFRED"), + .speechBefore = {EC_WORD_A, EC_WORD_FIERY, EC_WORD_GOURMET, EC_WORD_AM, EC_WORD_I, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TASTY, EC_WORD_GOURMET, EC_WORD_VICTORY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Alfredo + }, + [198] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("RUBE"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING}, + .speechWin = {EC_WORD_GET, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, + .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, -1}, + .monSets = gBattleFrontierTrainerMons_Ruben + }, + [199] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("LAMA"), + .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_MMM, EC_WORD_THIS, EC_WORD_IS, EC_WORD_QUITE, EC_WORD_TASTY, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Lamar + }, + [200] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("JAXO"), + .speechBefore = {EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_WANT}, + .speechWin = {EC_WORD_MY, EC_WORD_FATHER, EC_WORD_AND, EC_WORD_MOTHER, EC_WORD_WON_T, EC_WORD_ACCEPT}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Jaxon + }, + [201] = { + .facilityClass = FACILITY_CLASS_YOUNGSTER, + .trainerName = _("LOGA"), + .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_WILL, EC_WORD_STUDY, EC_WORD_FOR, EC_WORD_SCHOOL}, + .speechWin = {EC_WORD_ME, EC_WORD_STUDY, EC_WORD_QUES, EC_WORD_NOT_VERY, EC_WORD_LIKELY_TO, EC_WORD_SEE}, + .speechLose = {EC_WORD_NO, EC_WORD_THANKS, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SLEEP}, + .monSets = gBattleFrontierTrainerMons_Logan + }, + [202] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("EMILE"), + .speechBefore = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_KIND, EC_WORD_OF, EC_WORD_BATTLE, EC_WORD_OK_QUES}, + .speechWin = {EC_WORD_LET_S, EC_WORD_GO, EC_WORD_FOR, EC_WORD_AN, EC_MOVE(ICY_WIND), EC_MOVE2(SURF)}, + .speechLose = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A, EC_MOVE(ROCK_SLIDE), EC_WORD_SHOW, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Emilee + }, + [203] = { + .facilityClass = FACILITY_CLASS_LASS, + .trainerName = _("JOSI"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_FASHION, EC_WORD_CONTEST, EC_WORD_IS, EC_WORD_PRETTY}, + .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_MODE, EC_WORD_FASHION, EC_WORD_THINGS}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_LACKING, EC_WORD_IN, EC_WORD_FASHION, EC_WORD_SENSE}, + .monSets = gBattleFrontierTrainerMons_Josie + }, + [204] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("ARMAND"), + .speechBefore = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_TRADE, EC_WORD_ME, EC_WORD_A, EC_WORD_GRASS, EC_WORD_POKEMON, EC_WORD_PLEASE}, + .speechLose = {EC_WORD_THERE, EC_WORD_AREN_T, EC_WORD_ENOUGH, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON}, + .monSets = gBattleFrontierTrainerMons_Armando + }, + [205] = { + .facilityClass = FACILITY_CLASS_CAMPER, + .trainerName = _("SKYLE"), + .speechBefore = {EC_MOVE2(INGRAIN), EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_BATTLE, EC_WORD_MOVE}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MOVE, EC_WORD_ME, EC_WORD_NOW, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Skyler + }, + [206] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("RUT"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_STOP, EC_WORD_I, EC_WORD_DON_T, EC_WORD_ENJOY, EC_WORD_THIS}, + .monSets = gBattleFrontierTrainerMons_Ruth + }, + [207] = { + .facilityClass = FACILITY_CLASS_PICNICKER, + .trainerName = _("MELOD"), + .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_SUNDAY, EC_WORD_IS, EC_WORD_A, EC_MOVE2(SUNNY_DAY)}, + .speechWin = {EC_WORD_SUNDAY, EC_WORD_SEEMS, EC_WORD_FOREVER, EC_WORD_TO, EC_WORD_COME, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_THE, EC_WORD_FORECAST, EC_WORD_SAYS, EC_WORD_IT, EC_WORD_WILL, EC_MOVE(HAIL)}, + .monSets = gBattleFrontierTrainerMons_Melody + }, + [208] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("PEDR"), + .speechBefore = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WILL, EC_WORD_DO, EC_WORD_YOU, EC_WORD_GOOD}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_I, EC_WORD_SINK, EC_WORD_AN, EC_WORD_OPPONENT}, + .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, -1, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Pedro + }, + [209] = { + .facilityClass = FACILITY_CLASS_SWIMMER_M, + .trainerName = _("ERIC"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(TACKLE), EC_WORD_YOU, EC_WORD_DOWN, EC_WORD_EXCL}, + .speechWin = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_RUN_AWAY, EC_WORD_YOU, EC_WORD_LOSER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU, EC_WORD_WOULD, EC_MOVE(COUNTER)}, + .monSets = gBattleFrontierTrainerMons_Erick + }, + [210] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("ELAIN"), + .speechBefore = {EC_WORD_MY, EC_WORD_HEROINE, EC_WORD_ADVENTURE, EC_WORD_ISN_T, EC_WORD_GOING, EC_WORD_WELL}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED}, + .speechLose = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_HEROINE}, + .monSets = gBattleFrontierTrainerMons_Elaine + }, + [211] = { + .facilityClass = FACILITY_CLASS_SWIMMER_F, + .trainerName = _("JOYC"), + .speechBefore = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GO, EC_WORD_AHAHA, EC_WORD_EXCL}, + .speechWin = {EC_WORD_LALALA, EC_WORD_NO, EC_WORD_LOSING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_EXCL}, + .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, -1, EC_WORD_HUH_QUES, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Joyce + }, + [212] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("TOD"), + .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LIGHTNINGROD, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POWER}, + .speechWin = {EC_WORD_THAT_S, EC_WORD_ALL, EC_WORD_YOU, EC_WORD_COULD, EC_MOVE(ABSORB), EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_MOVE2(REFLECT), EC_WORD_MY, EC_WORD_POWER, EC_WORD_BACK, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Todd + }, + [213] = { + .facilityClass = FACILITY_CLASS_POKEFAN_M, + .trainerName = _("GAVI"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, -1}, + .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_MY, EC_WORD_MISTAKE, EC_WORD_WAS, EC_WORD_TOO, EC_WORD_EXPENSIVE, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Gavin + }, + [214] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("MALOR"), + .speechBefore = {EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_CUTE, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, -1, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .speechLose = {EC_WORD_TCH, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_NICE}, + .monSets = gBattleFrontierTrainerMons_Malory + }, + [215] = { + .facilityClass = FACILITY_CLASS_POKEFAN_F, + .trainerName = _("ESTHE"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_NICE, EC_MOVE2(PRESENT), EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_PLEASE, EC_WORD_GET, EC_WORD_ME, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_GAME}, + .speechLose = {EC_WORD_MESSAGE, EC_WORD_CARDS, EC_WORD_MAKE, EC_WORD_A, EC_WORD_WEAK, EC_MOVE2(PRESENT)}, + .monSets = gBattleFrontierTrainerMons_Esther + }, + [216] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("OSCA"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_IN, EC_WORD_FULL}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_YOUR, EC_WORD_FULL, EC_WORD_POWER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, -1}, + .monSets = gBattleFrontierTrainerMons_Oscar + }, + [217] = { + .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, + .trainerName = _("WILSO"), + .speechBefore = {EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_AN, EC_WORD_EARLY_BIRD}, + .speechWin = {EC_WORD_ALL, EC_WORD_WORK, EC_WORD_AND, EC_WORD_NO, EC_WORD_PLAY, EC_WORD_ELLIPSIS}, + .speechLose = {EC_MOVE(ENDURE), EC_WORD_IS, EC_WORD_ALL, EC_WORD_I, EC_WORD_CAN, EC_WORD_DO}, + .monSets = gBattleFrontierTrainerMons_Wilson + }, + [218] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("CLAR"), + .speechBefore = {EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_TRAINER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_A, EC_WORD_WIMPY, EC_WORD_TRAINER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_TRAINER, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Clare + }, + [219] = { + .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, + .trainerName = _("TES"), + .speechBefore = {EC_WORD_WANT, EC_WORD_SOME, EC_POKEMON(GULPIN), EC_WORD_DESIGN, EC_WORD_SWEETS, EC_WORD_QUES}, + .speechWin = {EC_WORD_THEY_RE, EC_WORD_A, EC_WORD_SECRET, EC_WORD_POKEMON, EC_WORD_GOURMET, EC_WORD_ITEM}, + .speechLose = {EC_WORD_THEY_RE, EC_WORD_TASTY, EC_WORD_EXCL, EC_WORD_REFRESHING, EC_WORD_TOO, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Tess + }, + [220] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("LEO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ANY, EC_WORD_OTHER, EC_WORD_TRAINER}, + .speechWin = {EC_WORD_I, EC_WORD_DID, EC_WORD_IT, EC_MOVE2(JUMP_KICK), EC_WORD_FOR, EC_WORD_JOY}, + .speechLose = {EC_WORD_BACK, EC_WORD_HOME, EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Leon + }, + [221] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("ALONZ"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_NOT, EC_WORD_LOST, EC_WORD_ONCE, EC_WORD_YET, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, -1}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Alonzo + }, + [222] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("VINC"), + .speechBefore = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL}, + .speechWin = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_RANK, EC_WORD_BELONGS_TO, EC_WORD_ME, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_APPEAL, EC_WORD_THIS, EC_MOVE(OUTRAGE), EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Vince + }, + [223] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_M, + .trainerName = _("BRYO"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(BARRAGE), EC_WORD_WILL, EC_MOVE2(SLAM), EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_COUNT_ON, EC_WORD_ANY, EC_WORD_LESS, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_JUST, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_IT, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Bryon + }, + [224] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("AV"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_TREASURE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_WORLD}, + .speechWin = {EC_WORD_MY, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_FULL, EC_WORD_OF, EC_WORD_WONDER}, + .speechLose = {EC_WORD_WHY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_TERRIBLE, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Ava + }, + [225] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("MIRIA"), + .speechBefore = {EC_WORD_OH, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_WITH, EC_WORD_A, EC_MOVE(SCARY_FACE)}, + .speechWin = {EC_WORD_AHAHA, EC_WORD_YOU, EC_WORD_ONLY, EC_WORD_LOOK, EC_WORD_SCARY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SCARY}, + .monSets = gBattleFrontierTrainerMons_Miriam + }, + [226] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("CARRI"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SHOW, EC_WORD_YOU, EC_WORD_GUTSY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_MOVE(SELF_DESTRUCT), EC_WORD_MODE, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Carrie + }, + [227] = { + .facilityClass = FACILITY_CLASS_COOLTRAINER_F, + .trainerName = _("GILLIA"), + .speechBefore = {EC_WORD_I, EC_WORD_SEEK, EC_WORD_A, EC_WORD_TRULY, EC_WORD_GREAT, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_A_LOT, EC_WORD_BETTER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A_LITTLE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE}, + .monSets = gBattleFrontierTrainerMons_Gillian2 + }, + [228] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("TYLE"), + .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_WON, EC_WORD_YO}, + .speechLose = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO}, + .monSets = gBattleFrontierTrainerMons_Tyler + }, + [229] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("CHA"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_POWER}, + .speechWin = {EC_WORD_THEY, EC_WORD_HAVE, EC_WORD_MORE, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YEAH, EC_MOVE2(TAKE_DOWN), EC_WORD_THEIR, EC_WORD_POWER, EC_WORD_A_TINY_BIT, EC_WORD_PLEASE}, + .monSets = gBattleFrontierTrainerMons_Chaz + }, + [230] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, + .trainerName = _("NELSO"), + .speechBefore = {EC_WORD_WELL_THEN, EC_WORD_WILL, EC_WORD_THIS, EC_WORD_POKEMON, EC_WORD_WORK, EC_WORD_QUES}, + .speechWin = {EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_IT, EC_WORD_WAS, EC_WORD_TOO_STRONG}, + .speechLose = {EC_WORD_IT, EC_WORD_DIDN_T, EC_WORD_MATCH_UP, EC_WORD_WELL, EC_WORD_I, EC_WORD_THINK}, + .monSets = gBattleFrontierTrainerMons_Nelson + }, + [231] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("SHANI"), + .speechBefore = {EC_WORD_ALL, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ABSOLUTELY, EC_WORD_ADORE, EC_WORD_ME}, + .speechWin = {EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_WITH, EC_WORD_CUTE_CHARM}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_SO, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_CUTE, EC_WORD_POKEMON}, + .monSets = gBattleFrontierTrainerMons_Shania + }, + [232] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("STELL"), + .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_WELL, EC_WORD_AREN_T, EC_WORD_THEY, EC_WORD_BORING, EC_WORD_QUES, EC_WORD_AHAHA}, + .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ALL_RIGHT}, + .monSets = gBattleFrontierTrainerMons_Stella + }, + [233] = { + .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, + .trainerName = _("DORIN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_GOOD, EC_WORD_QUES}, + .speechLose = {EC_WORD_THIS, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_AT, EC_WORD_ALL}, + .monSets = gBattleFrontierTrainerMons_Dorine + }, + [234] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("MADDO"), + .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_NO_1, EC_WORD_CHOICE}, + .speechWin = {EC_WORD_IT_S, EC_WORD_NO, EC_WORD_SECRET, EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_WIN}, + .speechLose = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_LOSE, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Maddox + }, + [235] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("DAVI"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_WROOOAAR_EXCL, -1, -1, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_WROOOAAR_EXCL, -1, -1, EC_WORD_WHY, EC_WORD_QUES_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Davin + }, + [236] = { + .facilityClass = FACILITY_CLASS_DRAGON_TAMER, + .trainerName = _("TREVO"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_ONLY, EC_WORD_WITH, EC_WORD_DRAGON, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_IS, EC_WORD_PERFECT}, + .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING}, + .monSets = gBattleFrontierTrainerMons_Trevon + }, + [237] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("MATE"), + .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_OVER, EC_WORD_SOON, EC_WORD_ENOUGH}, + .speechWin = {EC_WORD_WELL, EC_WORD_THAT, EC_WORD_DIDN_T, EC_WORD_TAKE, EC_WORD_VERY, EC_WORD_MUCH}, + .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Mateo + }, + [238] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("BRE"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ROCK_SOLID, EC_WORD_POKEMON, EC_WORD_THE, EC_WORD_BEST}, + .speechWin = {EC_WORD_TOUGHNESS, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO}, + .speechLose = {EC_WORD_I, EC_WORD_ALSO, EC_WORD_HAVE, EC_WORD_A, EC_WORD_PLUSH_DOLL, EC_WORD_COLLECTION}, + .monSets = gBattleFrontierTrainerMons_Bret + }, + [239] = { + .facilityClass = FACILITY_CLASS_BLACK_BELT, + .trainerName = _("RAU"), + .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, -1}, + .speechWin = {EC_WORD_HUMPH, EC_WORD_EXCL, EC_WORD_ANOTHER, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NOTHING, EC_WORD_WEAK, EC_WORD_ABOUT, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Raul + }, + [240] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("KA"), + .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_GOOD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_AT, EC_WORD_LAST, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Kay + }, + [241] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("ELEN"), + .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL}, + .speechWin = {EC_WORD_ISN_T, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_AWESOME, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Elena + }, + [242] = { + .facilityClass = FACILITY_CLASS_BATTLE_GIRL, + .trainerName = _("ALAN"), + .speechBefore = {EC_WORD_EAT, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK, EC_WORD_YOU, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, -1}, + .speechLose = {EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK}, + .monSets = gBattleFrontierTrainerMons_Alana + }, + [243] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("ALEXA"), + .speechBefore = {EC_WORD_GOOD, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_YOUNG, EC_WORD_TRAINER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, -1, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP}, + .speechLose = {EC_WORD_YOU, EC_WORD_ARE, EC_WORD_A, EC_WORD_STRONG, EC_WORD_TRAINER, EC_WORD_KID}, + .monSets = gBattleFrontierTrainerMons_Alexas + }, + [244] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("WESTO"), + .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_PLAY, EC_WORD_DOWN, EC_WORD_ALL_RIGHT, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_TO, EC_WORD_ATTACK}, + .speechLose = {EC_WORD_WELL, EC_WORD_WELL, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Weston + }, + [245] = { + .facilityClass = FACILITY_CLASS_EXPERT_M, + .trainerName = _("JASPE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OLD, EC_WORD_I_AM, EC_WORD_SKILLED, EC_WORD_EXCL}, + .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SHOCKED, EC_WORD_EXCL, EC_WORD_DOWN, EC_WORD_I, EC_WORD_GO}, + .monSets = gBattleFrontierTrainerMons_Jasper + }, + [246] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("NADI"), + .speechBefore = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_DOWN, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU}, + .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Nadia + }, + [247] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("MIRAND"), + .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, -1, EC_WORD_LET_S, EC_WORD_START, -1}, + .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_DONE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, + .speechLose = {EC_WORD_WELL, EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_I_AM, EC_WORD_TOO_WEAK}, + .monSets = gBattleFrontierTrainerMons_Miranda + }, + [248] = { + .facilityClass = FACILITY_CLASS_EXPERT_F, + .trainerName = _("EMM"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, -1}, + .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_IS, EC_WORD_RIGHT}, + .monSets = gBattleFrontierTrainerMons_Emma + }, + [249] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("ROLAND"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_SUPER, EC_WORD_POKEMON, EC_WORD_HERO, EC_WORD_EXCL}, + .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES}, + .speechLose = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BEAT, EC_WORD_A, EC_WORD_HERO}, + .monSets = gBattleFrontierTrainerMons_Rolando + }, + [250] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("STANL"), + .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH}, + .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, -1, -1}, + .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, -1}, + .monSets = gBattleFrontierTrainerMons_Stanly + }, + [251] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_M, + .trainerName = _("DARI"), + .speechBefore = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_SAYS, EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN}, + .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, -1}, + .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_SEE, EC_WORD_THIS, EC_MOVE(REVERSAL), EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Dario + }, + [252] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("KARLE"), + .speechBefore = {EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WILL, EC_WORD_COME, EC_WORD_OF, EC_WORD_THIS}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_THAT, EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WENT, EC_WORD_TO, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Karlee + }, + [253] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("JAYLI"), + .speechBefore = {EC_WORD_EVERY, EC_WORD_TRAINER, EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_IT_S, EC_WORD_MAKING, EC_WORD_ME, EC_MOVE(YAWN), EC_WORD_THAT, EC_WORD_BATTLE}, + .speechLose = {EC_WORD_I, EC_WORD_SLEPT, EC_WORD_AND, EC_WORD_SO, EC_WORD_I, EC_WORD_LOST}, + .monSets = gBattleFrontierTrainerMons_Jaylin + }, + [254] = { + .facilityClass = FACILITY_CLASS_PSYCHIC_F, + .trainerName = _("INGRI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_VERY, EC_WORD_MEAN, EC_WORD_TRAINER}, + .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_A, EC_WORD_GOOD, EC_WORD_MATCH, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_CAUSE, EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Ingrid + }, + [255] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("DELILA"), + .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, -1}, + .speechWin = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_WORD_ANGRY}, + .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GRUDGE), EC_WORD_WITH, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Delilah + }, + [256] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("CARL"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SCATTER, EC_WORD_SOME, EC_MOVE2(POISON_POWDER), EC_WORD_ABOUT}, + .speechWin = {EC_WORD_IT_S, EC_WORD_SCARY, EC_WORD_HOW, EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_WORKS}, + .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_YOU, EC_WORD_AND, EC_WORD_YOUR, EC_WORD_POKEMON}, + .monSets = gBattleFrontierTrainerMons_Carly + }, + [257] = { + .facilityClass = FACILITY_CLASS_HEX_MANIAC, + .trainerName = _("LEXI"), + .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_SCARY, EC_WORD_POKEMON, EC_WORD_QUES}, + .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, -1, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_SCARY, EC_WORD_THAN, EC_WORD_MY, EC_WORD_POKEMON}, + .monSets = gBattleFrontierTrainerMons_Lexie + }, + [258] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("MILLE"), + .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, -1, EC_WORD_HELLO, EC_WORD_QUES_EXCL, -1}, + .speechWin = {EC_WORD_HELLO, EC_WORD_MOTHER, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, + .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Miller + }, + [259] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("MAR"), + .speechBefore = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOSE, EC_WORD_YOUR, EC_MOVE(SWAGGER), EC_WORD_NOW}, + .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_MOVE(SWAGGER), EC_WORD_LEFT, EC_WORD_EH_QUES}, + .speechLose = {EC_WORD_GO, EC_WORD_ON, EC_MOVE(SWAGGER), EC_WORD_ALL, EC_WORD_YOU, EC_WORD_WANT}, + .monSets = gBattleFrontierTrainerMons_Marv + }, + [260] = { + .facilityClass = FACILITY_CLASS_POKEMANIAC, + .trainerName = _("LAYTO"), + .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_COOL, EC_WORD_EXCL}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOOK, EC_WORD_UP, EC_WORD_TO, EC_WORD_ME}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NO, EC_WORD_REALLY, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Layton + }, + [261] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("BROOK"), + .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_BATTLE}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_AND, EC_WORD_EXCITING, EC_WORD_TOO}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_HIGH, EC_WORD_IN, EC_WORD_LEVEL, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Brooks + }, + [262] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("GREGOR"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, -1}, + .speechWin = {EC_WORD_WHO, EC_WORD_SAYS, EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_OLD, EC_WORD_QUES}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD}, + .monSets = gBattleFrontierTrainerMons_Gregory + }, + [263] = { + .facilityClass = FACILITY_CLASS_GENTLEMAN, + .trainerName = _("REES"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, -1, -1}, + .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, -1}, + .speechLose = {EC_WORD_INSTEAD, EC_WORD_OF, EC_WORD_TELEVISION, EC_WORD_GET, EC_WORD_A, EC_WORD_BOOK}, + .monSets = gBattleFrontierTrainerMons_Reese + }, + [264] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("MASO"), + .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, -1}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW}, + .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Mason + }, + [265] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, + .trainerName = _("TOB"), + .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, -1, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN}, + .speechWin = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES}, + .speechLose = {EC_WORD_I, EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_AT, EC_WORD_SMARTNESS}, + .monSets = gBattleFrontierTrainerMons_Toby + }, + [266] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("DOROTH"), + .speechBefore = {EC_WORD_THE, EC_WORD_SPORTS, EC_WORD_WORLD, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_WIN, EC_WORD_WAS, EC_WORD_REFRESHING}, + .speechLose = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_WAS, EC_WORD_REFRESHING}, + .monSets = gBattleFrontierTrainerMons_Dorothy + }, + [267] = { + .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, + .trainerName = _("PIPE"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_YOU, EC_WORD_NEED, EC_WORD_A, EC_WORD_SPEED_BOOST, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_MORE, EC_WORD_GUTS}, + .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, -1, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Piper + }, + [268] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("FIN"), + .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(REST), EC_WORD_A_LITTLE}, + .monSets = gBattleFrontierTrainerMons_Finn + }, + [269] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + .trainerName = _("SAMI"), + .speechBefore = {EC_WORD_I, EC_MOVE2(DIVE), EC_WORD_BELOW, EC_WORD_THE, EC_MOVE2(SURF), EC_WORD_EXCL}, + .speechWin = {EC_WORD_YAHOO, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YOU, EC_WORD_EXCL}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, -1}, + .monSets = gBattleFrontierTrainerMons_Samir + }, + [270] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("FION"), + .speechBefore = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_LIMBER, EC_WORD_UP, EC_WORD_BEFORE, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_BE, EC_WORD_MORE, EC_WORD_READY}, + .speechLose = {EC_WORD_BEING, EC_WORD_LIMBER, EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_ME}, + .monSets = gBattleFrontierTrainerMons_Fiona + }, + [271] = { + .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + .trainerName = _("GLORI"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_ATTACK, EC_WORD_WITH, EC_WORD_SUCTION_CUPS}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_SUCTION_CUPS, EC_WORD_WORK}, + .monSets = gBattleFrontierTrainerMons_Gloria + }, + [272] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("NIC"), + .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, -1, -1}, + .speechWin = {EC_WORD_SORRY, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_DOWNCAST}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_WITH, EC_WORD_A, EC_MOVE2(SUPERSONIC), EC_WORD_SPEED_BOOST}, + .monSets = gBattleFrontierTrainerMons_Nico + }, + [273] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, + .trainerName = _("JEREM"), + .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_MASTER, EC_WORD_THAT_S, EC_WORD_MY, EC_WORD_DREAM}, + .speechWin = {EC_WORD_MY, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_FAR, EC_WORD_OFF, EC_WORD_EXCL}, + .speechLose = {EC_WORD_WHAT, EC_WORD_I, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_HAPPENING, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Jeremy + }, + [274] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("CAITLI"), + .speechBefore = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_QUES}, + .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_MORE, EC_WORD_TO_ME, EC_WORD_THAN, EC_WORD_CUTENESS}, + .speechLose = {EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_WORD_DOESN_T, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Caitlin + }, + [275] = { + .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, + .trainerName = _("REEN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_EXCL}, + .speechWin = {EC_WORD_OH, EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_YAHOO, EC_WORD_FOR, EC_WORD_ME}, + .speechLose = {EC_WORD_YAHOO, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_YOU}, + .monSets = gBattleFrontierTrainerMons_Reena + }, + [276] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("AVER"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_A_LOT, EC_WORD_OF, EC_WORD_BUG, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UNBELIEVABLE}, + .speechLose = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UPSIDE_DOWN}, + .monSets = gBattleFrontierTrainerMons_Avery + }, + [277] = { + .facilityClass = FACILITY_CLASS_BUG_MANIAC, + .trainerName = _("LIA"), + .speechBefore = {EC_WORD_WE, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_FIRE, EC_WORD_AND, EC_WORD_FLYING}, + .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, -1}, + .speechLose = {EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_WHAT, EC_WORD_WE, EC_WORD_DISLIKE, EC_WORD_HEY_QUES}, + .monSets = gBattleFrontierTrainerMons_Liam + }, + [278] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("THE"), + .speechBefore = {EC_WORD_FISHING, EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_IN, EC_WORD_LIFE}, + .speechWin = {EC_WORD_WATER, EC_WORD_POKEMON, EC_MOVE2(ATTRACT), EC_WORD_ME, EC_WORD_WITHOUT, EC_WORD_END}, + .speechLose = {EC_WORD_DON_T, EC_WORD_COUNT_ON, EC_WORD_THAT, EC_WORD_HAPPENING, EC_WORD_ANOTHER, EC_WORD_TIME}, + .monSets = gBattleFrontierTrainerMons_Theo + }, + [279] = { + .facilityClass = FACILITY_CLASS_FISHERMAN, + .trainerName = _("BAILE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_EASY}, + .speechWin = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_WORD_JOY}, + .speechLose = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(FRUSTRATION)}, + .monSets = gBattleFrontierTrainerMons_Bailey + }, + [280] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("HUG"), + .speechBefore = {EC_WORD_I, EC_WORD_TRY, EC_WORD_THE, EC_WORD_BEST, EC_WORD_I, EC_WORD_CAN}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_WIN, EC_WORD_IF, EC_WORD_I, EC_WORD_TRY, EC_WORD_ENOUGH}, + .speechLose = {EC_WORD_I, EC_WORD_DID, EC_WORD_TRY, EC_WORD_DIDN_T, EC_WORD_I, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Hugo + }, + [281] = { + .facilityClass = FACILITY_CLASS_RUIN_MANIAC, + .trainerName = _("BRYC"), + .speechBefore = {EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_VACATION, EC_WORD_UNTIL, EC_WORD_ONLY, EC_WORD_YESTERDAY}, + .speechWin = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SKILL, EC_WORD_YET}, + .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_SLEEP}, + .monSets = gBattleFrontierTrainerMons_Bryce + }, + [282] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("GIDEO"), + .speechBefore = {EC_WORD_WHAT_S_UP_QUES, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SCARY, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_SCARY, EC_WORD_EXCL}, + .speechLose = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_FASHION, EC_WORD_SENSE}, + .monSets = gBattleFrontierTrainerMons_Gideon + }, + [283] = { + .facilityClass = FACILITY_CLASS_COLLECTOR, + .trainerName = _("TRISTO"), + .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_POKEMON}, + .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, + .speechLose = {EC_WORD_SEE, EC_WORD_QUES, -1, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE}, + .monSets = gBattleFrontierTrainerMons_Triston + }, + [284] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("CHARLE"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_HOPELESS, EC_WORD_TO, EC_MOVE2(STRUGGLE), EC_WORD_WITH, EC_WORD_ME}, + .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Charles + }, + [285] = { + .facilityClass = FACILITY_CLASS_GUITARIST, + .trainerName = _("RAYMON"), + .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_HEAR, EC_WORD_MY, EC_WORD_SONG, EC_WORD_QUES}, + .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_SATISFIED, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE}, + .monSets = gBattleFrontierTrainerMons_Raymond + }, + [286] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("DIR"), + .speechBefore = {EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ABOVE, EC_WORD_THE, EC_MOVE2(REST)}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_RULE}, + .speechLose = {EC_WORD_AREN_T, EC_WORD_THERE, EC_WORD_MORE, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Dirk + }, + [287] = { + .facilityClass = FACILITY_CLASS_BIRD_KEEPER, + .trainerName = _("HAROL"), + .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_APPEAL, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES}, + .speechLose = {EC_WORD_SO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Harold + }, + [288] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("OMA"), + .speechBefore = {EC_WORD_LET_ME_WIN, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(PRESENT)}, + .speechWin = {EC_WORD_HERE, EC_WORD_YOU, EC_WORD_ARE, EC_WORD_SOME, EC_MOVE2(TOXIC), EC_WORD_SWEETS}, + .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES, EC_WORD_WHAT, EC_WORD_FOR, EC_WORD_QUES_EXCL}, + .monSets = gBattleFrontierTrainerMons_Omar + }, + [289] = { + .facilityClass = FACILITY_CLASS_SAILOR, + .trainerName = _("PETE"), + .speechBefore = {EC_WORD_I, EC_WORD_BRAG, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_OK_QUES}, + .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_LISTEN, EC_WORD_TO_ME, EC_WORD_BRAG}, + .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_YOU, EC_WORD_WON_T, EC_WORD_LISTEN, EC_WORD_TO_ME}, + .monSets = gBattleFrontierTrainerMons_Peter + }, + [290] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("DE"), + .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_GET, EC_WORD_A, EC_WORD_MOVE, EC_WORD_ON}, + .speechWin = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT}, + .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT}, + .monSets = gBattleFrontierTrainerMons_Dev + }, + [291] = { + .facilityClass = FACILITY_CLASS_HIKER, + .trainerName = _("CORE"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_TEACH, EC_WORD_YOU, EC_WORD_HOW, EC_WORD_TOUGH, EC_WORD_I_AM}, + .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_ME, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)}, + .speechLose = {EC_WORD_MY, EC_MOVE2(FRUSTRATION), EC_WORD_IS, EC_WORD_CLOSE, EC_WORD_TO, EC_MOVE2(ERUPTION)}, + .monSets = gBattleFrontierTrainerMons_Corey + }, + [292] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("ANDR"), + .speechBefore = {EC_WORD_NOW, EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_PERFECT, EC_WORD_FLAME_BODY}, + .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FIERY, EC_WORD_DANCE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_AN, EC_MOVE2(EXPLOSION), EC_WORD_HERE, EC_WORD_QUES}, + .monSets = gBattleFrontierTrainerMons_Andre + }, + [293] = { + .facilityClass = FACILITY_CLASS_KINDLER, + .trainerName = _("FERRI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THE, EC_WORD_OLD, EC_WORD_CLASS}, + .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_NO_1, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_ELLIPSIS}, + .monSets = gBattleFrontierTrainerMons_Ferris + }, + [294] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("ALIVI"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_GIDDY, EC_WORD_SO, EC_WORD_SHOULD, EC_WORD_YOU}, + .speechWin = {EC_WORD_IT, EC_WORD_WAS, EC_WORD_ALL, EC_WORD_TOGETHER, EC_WORD_TOO, EC_WORD_EASY}, + .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GIDDY, EC_WORD_UP, EC_WORD_AND, EC_WORD_AWAY}, + .monSets = gBattleFrontierTrainerMons_Alivia + }, + [295] = { + .facilityClass = FACILITY_CLASS_PARASOL_LADY, + .trainerName = _("PAIG"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, -1}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, + .speechLose = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON}, + .monSets = gBattleFrontierTrainerMons_Paige + }, + [296] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("ANY"), + .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_OH, EC_WORD_SO, EC_WORD_PRETTY, EC_WORD_FASHION}, + .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, -1}, + .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, -1, -1}, + .monSets = gBattleFrontierTrainerMons_Anya + }, + [297] = { + .facilityClass = FACILITY_CLASS_BEAUTY, + .trainerName = _("DAW"), + .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_YOU, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_MOVE, EC_WORD_ON, EC_WORD_EXCL}, + .monSets = gBattleFrontierTrainerMons_Dawn + }, + [298] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("ABB"), + .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_REFRESHING}, + .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, -1}, + .monSets = gBattleFrontierTrainerMons_Abby + }, + [299] = { + .facilityClass = FACILITY_CLASS_AROMA_LADY, + .trainerName = _("GRETE"), + .speechBefore = {EC_WORD_I, EC_WORD_CAUSE, EC_MOVE(OUTRAGE), EC_WORD_AS, EC_WORD_A, EC_WORD_TRAINER}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ONLY, EC_WORD_NATURAL, EC_WORD_SEE_YA, EC_WORD_BYE_BYE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_IT_S, EC_WORD_HARD, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_BUT, EC_WORD_CONGRATS}, + .monSets = gBattleFrontierTrainerMons_Gretel + } +}; diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h index 9a1539772..946ca0187 100644 --- a/src/data/battle_frontier/battle_tent.h +++ b/src/data/battle_frontier/battle_tent.h @@ -1,4 +1,3 @@ - // Slateport Battle Tent. const u16 gSlateportBattleTentTrainerMons_Jolie[] = { -- cgit v1.2.3 From d9287f32614fa93e9a962154cb1b9fd38039df58 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 4 Dec 2018 12:15:13 -0500 Subject: extern gTower trainer data --- include/battle_tower.h | 5 +++++ src/battle_tower.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/battle_tower.h b/include/battle_tower.h index e08f5e5c9..68f495524 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -33,6 +33,11 @@ struct FacilityMon u8 nature; }; +extern const u8 gTowerMaleFacilityClasses[30]; +extern const u8 gTowerMaleTrainerGfxIds[30]; +extern const u8 gTowerFemaleFacilityClasses[20]; +extern const u8 gTowerFemaleTrainerGfxIds[20]; + extern u16 gUnknown_03006298[]; extern const struct BattleFrontierTrainer *gFacilityTrainers; diff --git a/src/battle_tower.c b/src/battle_tower.c index f00db4c1d..7bc354c1d 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -263,8 +263,6 @@ const u8 gTowerFemaleTrainerGfxIds[] = EVENT_OBJ_GFX_LASS }; -extern const u8 sRubyFacilityClassToEmerald[82][2]; -/* const u8 sRubyFacilityClassToEmerald[82][2] = { {0x00, 0x0b}, @@ -344,7 +342,6 @@ const u8 sRubyFacilityClassToEmerald[82][2] = {0x4c, 0x4a}, {0x00, 0x00} }; -*/ const u8 *const gUnknown_085DCFD8[] = { -- cgit v1.2.3 From 9cfed8178998923171e4251efd9b60579b567bf3 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Wed, 5 Dec 2018 00:15:22 +0000 Subject: Document some more of pokedex.c --- src/pokedex.c | 114 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index 7578f9687..c478fc7b7 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -108,7 +108,7 @@ struct PokedexView u16 unk628; u16 unk62A; u8 unk62C; - u8 unk62D; + u8 initialVOffset; u8 unk62E; u8 unk62F; s16 unk630; @@ -157,18 +157,18 @@ void sub_80BBDE8(u8); void sub_80BBE70(u8); void sub_80BBEB8(u8); void sub_80BC0A8(u8); -void sub_80BC0F8(u8); +static void HandleButtonPress_StartMenu(u8); void sub_80BC2D4(u8); void sub_80BC360(u8); void sub_80BC3DC(u8); void sub_80BC47C(u8); bool8 sub_80BC514(u8); -void sub_80BC844(u8); +static void LoadPokedexBgPalette(u8); void sub_80BC890(void); void sub_80BC8D4(u8, u8); -void sub_80BD154(u16, u8, u8, u16); -void sub_80BD1F4(u16, u8, u8, u16); -u8 sub_80BD23C(u16, u8, u8); +static void CreateMonDexNum(u16, u8, u8, u16); +static void CreateCaughtBall(u16, u8, u8, u16); +static u8 CreateMonName(u16, u8, u8); void sub_80BD28C(u8, u8, u16); static void CreateInitialPokemonSprites(u16, u16); bool8 sub_80BD404(u8, u8, u8); @@ -180,7 +180,7 @@ u16 sub_80BDA8C(u16); u32 sub_80BDACC(u16, s16, s16); static void CreateInterfaceSprites(u8); void sub_80BE470(struct Sprite *sprite); -void sub_80BE604(struct Sprite *sprite); +static void SpriteCB_Scrollbar(struct Sprite *sprite); void sub_80BE658(struct Sprite *sprite); void sub_80BE758(struct Sprite *sprite); void sub_80BE780(struct Sprite *sprite); @@ -621,7 +621,7 @@ static const struct SpriteTemplate sScrollBarSpriteTemplate = .anims = sSpriteAnimTable_855D114, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80BE604, + .callback = SpriteCB_Scrollbar, }; static const struct SpriteTemplate sArrowSpriteTemplate = @@ -1275,7 +1275,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView) pokedexView->unk628 = 0; pokedexView->unk62A = 0; pokedexView->unk62C = 0; - pokedexView->unk62D = 0; + pokedexView->initialVOffset = 0; pokedexView->unk62E = 0; pokedexView->unk62F = 0; pokedexView->unk630 = 0; @@ -1346,7 +1346,7 @@ void CB2_Pokedex(void) sPokedexView->seenCount = GetNationalPokedexCount(0); sPokedexView->ownCount = GetNationalPokedexCount(1); } - sPokedexView->unk62D = 8; + sPokedexView->initialVOffset = 8; gMain.state++; break; case 3: @@ -1599,7 +1599,7 @@ void sub_80BBEB8(u8 taskId) sPokedexView->menuY = 0; sPokedexView->menuIsOpen = 1; sPokedexView->menuCursorPos = 0; - gTasks[taskId].func = sub_80BC0F8; + gTasks[taskId].func = HandleButtonPress_StartMenu; PlaySE(SE_SELECT); } else if (gMain.newKeys & SELECT_BUTTON) @@ -1633,7 +1633,7 @@ void sub_80BC0A8(u8 taskId) gTasks[taskId].func = sub_80BBEB8; } -void sub_80BC0F8(u8 taskId) +static void HandleButtonPress_StartMenu(u8 taskId) { SetGpuReg(REG_OFFSET_BG0VOFS, sPokedexView->menuY); @@ -1763,7 +1763,7 @@ bool8 sub_80BC514(u8 a) SetVBlankCallback(NULL); sPokedexView->unk64A = a; sub_80C09B0(0); - SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D); + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gBgTemplates_0855D298, 4); SetBgTilemapBuffer(3, AllocZeroed(0x800)); @@ -1782,7 +1782,7 @@ bool8 sub_80BC514(u8 a) sPokedexView->unk64C_1 = FALSE; else sPokedexView->unk64C_1 = TRUE; - sub_80BC844(sPokedexView->unk64C_1); + LoadPokedexBgPalette(sPokedexView->unk64C_1); InitWindows(sPokemonList_WindowTemplate); DeactivateAllTextPrinters(); PutWindowTilemap(0); @@ -1846,7 +1846,7 @@ bool8 sub_80BC514(u8 a) return FALSE; } -void sub_80BC844(u8 a) +static void LoadPokedexBgPalette(u8 a) { if (a == 1) LoadPalette(gPokedexHoennBg_Pal + 1, 1, 0xBE); @@ -2023,7 +2023,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) } } -void sub_80BCE2C(u8 windowId, u8 fontId, const u8* str, u8 left, u8 top) +static void PrintMonDexNumAndName(u8 windowId, u8 fontId, const u8* str, u8 left, u8 top) { u8 color[3]; @@ -2033,15 +2033,15 @@ void sub_80BCE2C(u8 windowId, u8 fontId, const u8* str, u8 left, u8 top) AddTextPrinterParameterized4(windowId, fontId, left * 8, (top * 8) + 1, 0, 0, color, -1, str); } -void sub_80BCE84(u8 a, u16 b, u16 c) +static void CreateMonListEntry(u8 direction, u16 b, u16 c) { s16 _b; u16 i; u16 r2; - switch (a) + switch (direction) { - case 0: + case 0: // Initial default: _b = b - 5; for (i = 0; i <= 10; i++) @@ -2055,21 +2055,21 @@ void sub_80BCE84(u8 a, u16 b, u16 c) sub_80BD28C(0x11, i * 2, c); if (sPokedexView->pokedexList[_b].seen) { - sub_80BD154(_b, 0x12, i * 2, c); - sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, i * 2, c); - sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, i * 2); + CreateMonDexNum(_b, 0x12, i * 2, c); + CreateCaughtBall(sPokedexView->pokedexList[_b].owned, 0x11, i * 2, c); + CreateMonName(sPokedexView->pokedexList[_b].dexNum, 0x16, i * 2); } else { - sub_80BD154(_b, 0x12, i * 2, c); - sub_80BD1F4(0, 0x11, i * 2, c); - sub_80BD23C(0, 0x16, i * 2); + CreateMonDexNum(_b, 0x12, i * 2, c); + CreateCaughtBall(0, 0x11, i * 2, c); + CreateMonName(0, 0x16, i * 2); } } _b++; } break; - case 1: + case 1: // Up _b = b - 5; if (_b < 0 || _b >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[_b].dexNum == 0xFFFF) { @@ -2080,19 +2080,19 @@ void sub_80BCE84(u8 a, u16 b, u16 c) sub_80BD28C(0x11, sPokedexView->unk630 * 2, c); if (sPokedexView->pokedexList[_b].seen) { - sub_80BD154(_b, 0x12, sPokedexView->unk630 * 2, c); - sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, sPokedexView->unk630 * 2, c); - sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, sPokedexView->unk630 * 2); + CreateMonDexNum(_b, 0x12, sPokedexView->unk630 * 2, c); + CreateCaughtBall(sPokedexView->pokedexList[_b].owned, 0x11, sPokedexView->unk630 * 2, c); + CreateMonName(sPokedexView->pokedexList[_b].dexNum, 0x16, sPokedexView->unk630 * 2); } else { - sub_80BD154(_b, 0x12, sPokedexView->unk630 * 2, c); - sub_80BD1F4(0, 0x11, sPokedexView->unk630 * 2, c); - sub_80BD23C(0, 0x16, sPokedexView->unk630 * 2); + CreateMonDexNum(_b, 0x12, sPokedexView->unk630 * 2, c); + CreateCaughtBall(0, 0x11, sPokedexView->unk630 * 2, c); + CreateMonName(0, 0x16, sPokedexView->unk630 * 2); } } break; - case 2: + case 2: // Down _b = b + 5; r2 = sPokedexView->unk630 + 10; if (r2 > 15) @@ -2104,15 +2104,15 @@ void sub_80BCE84(u8 a, u16 b, u16 c) sub_80BD28C(0x11, r2 * 2, c); if (sPokedexView->pokedexList[_b].seen) { - sub_80BD154(_b, 0x12, r2 * 2, c); - sub_80BD1F4(sPokedexView->pokedexList[_b].owned, 0x11, r2 * 2, c); - sub_80BD23C(sPokedexView->pokedexList[_b].dexNum, 0x16, r2 * 2); + CreateMonDexNum(_b, 0x12, r2 * 2, c); + CreateCaughtBall(sPokedexView->pokedexList[_b].owned, 0x11, r2 * 2, c); + CreateMonName(sPokedexView->pokedexList[_b].dexNum, 0x16, r2 * 2); } else { - sub_80BD154(_b, 0x12, r2 * 2, c); - sub_80BD1F4(0, 0x11, r2 * 2, c); - sub_80BD23C(0, 0x16, r2 * 2); + CreateMonDexNum(_b, 0x12, r2 * 2, c); + CreateCaughtBall(0, 0x11, r2 * 2, c); + CreateMonName(0, 0x16, r2 * 2); } } break; @@ -2120,7 +2120,7 @@ void sub_80BCE84(u8 a, u16 b, u16 c) CopyWindowToVram(0, 2); } -void sub_80BD154(u16 a, u8 left, u8 top, u16 unused) +static void CreateMonDexNum(u16 a, u8 left, u8 top, u16 unused) { u8 text[6]; u16 r6; @@ -2132,10 +2132,10 @@ void sub_80BD154(u16 a, u8 left, u8 top, u16 unused) text[2] = CHAR_0 + r6 / 100; text[3] = CHAR_0 + (r6 % 100) / 10; text[4] = CHAR_0 + (r6 % 100) % 10; - sub_80BCE2C(0, 7, text, left, top); + PrintMonDexNumAndName(0, 7, text, left, top); } -void sub_80BD1F4(u16 a, u8 x, u8 y, u16 unused) +static void CreateCaughtBall(u16 a, u8 x, u8 y, u16 unused) { if (a) BlitBitmapToWindow(0, gUnknown_0855D2BE, x * 8, y * 8, 8, 16); @@ -2143,7 +2143,7 @@ void sub_80BD1F4(u16 a, u8 x, u8 y, u16 unused) FillWindowPixelRect(0, 0, x * 8, y * 8, 8, 16); } -u8 sub_80BD23C(u16 num, u8 left, u8 top) +static u8 CreateMonName(u16 num, u8 left, u8 top) { const u8* str; @@ -2152,7 +2152,7 @@ u8 sub_80BD23C(u16 num, u8 left, u8 top) str = gSpeciesNames[num]; else str = sText_TenDashes; - sub_80BCE2C(0, 7, str, left, top); + PrintMonDexNumAndName(0, 7, str, left, top); return StringLength(str); } @@ -2197,8 +2197,8 @@ static void CreateInitialPokemonSprites(u16 selectedMon, u16 b) gSprites[spriteId].data[5] = 32; } - sub_80BCE84(0, selectedMon, b); - SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D); + CreateMonListEntry(0, selectedMon, b); + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset); sPokedexView->unk630 = 0; sPokedexView->unk632 = 0; @@ -2223,7 +2223,7 @@ bool8 sub_80BD404(u8 a, u8 b, u8 c) gSprites[sPokedexView->unk61E[i]].data[5] += b; } foo = 16 * (c - sPokedexView->unk62E) / c; - SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk632 * 16 - foo); + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset + sPokedexView->unk632 * 16 - foo); sPokedexView->unk62C -= sPokedexView->unk628; break; case 2: @@ -2233,7 +2233,7 @@ bool8 sub_80BD404(u8 a, u8 b, u8 c) gSprites[sPokedexView->unk61E[i]].data[5] -= b; } foo = 16 * (c - sPokedexView->unk62E) / c; - SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk632 * 16 + foo); + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset + sPokedexView->unk632 * 16 + foo); sPokedexView->unk62C += sPokedexView->unk628; break; } @@ -2241,7 +2241,7 @@ bool8 sub_80BD404(u8 a, u8 b, u8 c) } else { - SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->unk62D + sPokedexView->unk630 * 16); + SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset + sPokedexView->unk630 * 16); return TRUE; } } @@ -2296,7 +2296,7 @@ u16 sub_80BD69C(u16 selectedMon, u16 b) r10 = 1; selectedMon = sub_80C0E0C(1, selectedMon, 0, sPokedexView->pokemonListCount - 1); CreateNewPokemonSprite(1, selectedMon); - sub_80BCE84(1, selectedMon, b); + CreateMonListEntry(1, selectedMon, b); PlaySE(SE_Z_SCROLL); } else if ((gMain.heldKeys & DPAD_DOWN) && (selectedMon < sPokedexView->pokemonListCount - 1)) @@ -2304,7 +2304,7 @@ u16 sub_80BD69C(u16 selectedMon, u16 b) r10 = 2; selectedMon = sub_80C0E0C(0, selectedMon, 0, sPokedexView->pokemonListCount - 1); CreateNewPokemonSprite(2, selectedMon); - sub_80BCE84(2, selectedMon, b); + CreateMonListEntry(2, selectedMon, b); PlaySE(SE_Z_SCROLL); } else if ((gMain.newKeys & DPAD_LEFT) && (selectedMon > 0)) @@ -2740,7 +2740,7 @@ void sub_80BE4E0(struct Sprite *sprite) } } -void sub_80BE604(struct Sprite *sprite) +static void SpriteCB_Scrollbar(struct Sprite *sprite) { if (sPokedexView->unk64A != 0 && sPokedexView->unk64A != 3) DestroySprite(sprite); @@ -2925,7 +2925,7 @@ void sub_80BEA24(u8 taskId) case 2: sub_80BFCDC(0xD); sub_80BFD0C(sPokedexView->selectedScreen, 0xD); - sub_80BC844(sPokedexView->unk64C_1); + LoadPokedexBgPalette(sPokedexView->unk64C_1); gMain.state++; break; case 3: @@ -3153,7 +3153,7 @@ void sub_80BF0AC(u8 taskId) case 1: sub_80BFCF4(0xD); sub_80BFD7C(0, 0xD); - sub_80BC844(sPokedexView->unk64C_1); + LoadPokedexBgPalette(sPokedexView->unk64C_1); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256); gMain.state++; break; @@ -3219,7 +3219,7 @@ void sub_80BF250(u8 taskId) case 2: sub_80BFCF4(0xD); sub_80BFD7C(1, 0xD); - sub_80BC844(sPokedexView->unk64C_1); + LoadPokedexBgPalette(sPokedexView->unk64C_1); gMain.state++; break; case 3: @@ -3411,7 +3411,7 @@ void sub_80BF82C(u8 taskId) case 2: sub_80BFCF4(0xD); sub_80BFD7C(2, 0xD); - sub_80BC844(sPokedexView->unk64C_1); + LoadPokedexBgPalette(sPokedexView->unk64C_1); gMain.state++; break; case 3: @@ -3757,7 +3757,7 @@ void sub_80BFE38(u8 taskId) sub_80C0D30(1, gTasks[taskId].data[1]); CopyWindowToVram(1, 2); ResetPaletteFade(); - sub_80BC844(0); + LoadPokedexBgPalette(0); gTasks[taskId].data[0]++; break; case 2: -- cgit v1.2.3 From 2347e36d60258f82b0a9ee2c16619e54f5a65118 Mon Sep 17 00:00:00 2001 From: Melody Date: Wed, 5 Dec 2018 10:09:19 -0500 Subject: =?UTF-8?q?document=20pok=C3=A9dex=20options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/constants/pokemon.h | 2 + include/strings.h | 76 ++++++++--------- src/pokedex.c | 201 ++++++++++++++++++++++++-------------------- src/strings.c | 76 ++++++++--------- 4 files changed, 188 insertions(+), 167 deletions(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 1a4741574..f63d755ad 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -2,6 +2,7 @@ #define GUARD_CONSTANTS_POKEMON_H // Pokemon types +#define TYPE_NONE 0xFF #define TYPE_NORMAL 0x00 #define TYPE_FIGHTING 0x01 #define TYPE_FLYING 0x02 @@ -22,6 +23,7 @@ #define TYPE_DARK 0x11 #define NUMBER_OF_MON_TYPES 0x12 + // Pokemon egg groups #define EGG_GROUP_NONE 0 #define EGG_GROUP_MONSTER 1 diff --git a/include/strings.h b/include/strings.h index 887ccdfe6..22d12aa18 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1000,44 +1000,44 @@ extern const u8 gUnknown_085E8840[]; extern const u8 gUnknown_085E887C[]; extern const u8 gUnknown_085E88A6[]; extern const u8 gUnknown_085E88C8[]; -extern const u8 gUnknown_085E88DF[]; -extern const u8 gUnknown_085E88E9[]; -extern const u8 gUnknown_085E88F6[]; -extern const u8 gUnknown_085E8905[]; -extern const u8 gUnknown_085E8911[]; -extern const u8 gUnknown_085E891F[]; -extern const u8 gUnknown_085E892D[]; -extern const u8 gUnknown_085E893A[]; -extern const u8 gUnknown_085E8948[]; -extern const u8 gUnknown_085E894C[]; -extern const u8 gUnknown_085E8950[]; -extern const u8 gUnknown_085E8954[]; -extern const u8 gUnknown_085E8958[]; -extern const u8 gUnknown_085E895C[]; -extern const u8 gUnknown_085E8960[]; -extern const u8 gUnknown_085E8964[]; -extern const u8 gUnknown_085E8968[]; -extern const u8 gUnknown_085E896B[]; -extern const u8 gUnknown_085E896F[]; -extern const u8 gUnknown_085E8974[]; -extern const u8 gUnknown_085E897B[]; -extern const u8 gUnknown_085E8981[]; -extern const u8 gUnknown_085E8987[]; -extern const u8 gUnknown_085E898D[]; -extern const u8 gUnknown_085E8994[]; -extern const u8 gUnknown_085E8999[]; -extern const u8 gUnknown_085E899F[]; -extern const u8 gUnknown_085E89A4[]; -extern const u8 gUnknown_085E89BB[]; -extern const u8 gUnknown_085E89D4[]; -extern const u8 gUnknown_085E8A02[]; -extern const u8 gUnknown_085E8A37[]; -extern const u8 gUnknown_085E8A73[]; -extern const u8 gUnknown_085E8AAF[]; -extern const u8 gUnknown_085E8AEA[]; -extern const u8 gUnknown_085E8B25[]; -extern const u8 gUnknown_085E8B26[]; -extern const u8 gUnknown_085E8B35[]; +extern const u8 gText_DexHoennTitle[]; +extern const u8 gText_DexNatTitle[]; +extern const u8 gText_DexSortNumericalTitle[]; +extern const u8 gText_DexSortAtoZTitle[]; +extern const u8 gText_DexSortHeaviestTitle[]; +extern const u8 gText_DexSortLightestTitle[]; +extern const u8 gText_DexSortTallestTitle[]; +extern const u8 gText_DexSortSmallestTitle[]; +extern const u8 gText_DexSearchAlphaABC[]; +extern const u8 gText_DexSearchAlphaDEF[]; +extern const u8 gText_DexSearchAlphaGHI[]; +extern const u8 gText_DexSearchAlphaJKL[]; +extern const u8 gText_DexSearchAlphaMNO[]; +extern const u8 gText_DexSearchAlphaPQR[]; +extern const u8 gText_DexSearchAlphaSTU[]; +extern const u8 gText_DexSearchAlphaVWX[]; +extern const u8 gText_DexSearchAlphaYZ[]; +extern const u8 gText_DexSearchColorRed[]; +extern const u8 gText_DexSearchColorBlue[]; +extern const u8 gText_DexSearchColorYellow[]; +extern const u8 gText_DexSearchColorGreen[]; +extern const u8 gText_DexSearchColorBlack[]; +extern const u8 gText_DexSearchColorBrown[]; +extern const u8 gText_DexSearchColorPurple[]; +extern const u8 gText_DexSearchColorGray[]; +extern const u8 gText_DexSearchColorWhite[]; +extern const u8 gText_DexSearchColorPink[]; +extern const u8 gText_DexHoennDescription[]; +extern const u8 gText_DexNatDescription[]; +extern const u8 gText_DexSortNumericalDescription[]; +extern const u8 gText_DexSortAtoZDescription[]; +extern const u8 gText_DexSortHeaviestDescription[]; +extern const u8 gText_DexSortLightestDescription[]; +extern const u8 gText_DexSortTallestDescription[]; +extern const u8 ggText_DexSortSmallestDescription[]; +extern const u8 gText_DexEmptyString[]; +extern const u8 gText_DexSearchDontSpecify[]; +extern const u8 gText_DexSearchTypeNone[]; extern const u8 gUnknown_085EAEC3[]; extern const u8 gUnknown_085EAED6[]; diff --git a/src/pokedex.c b/src/pokedex.c index 7578f9687..b865ead36 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -42,15 +42,15 @@ static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL; u8 gUnknown_030060B0; void (*gUnknown_030060B4)(void); -struct UnknownStruct2 +struct PokedexOption { - const u8 *text1; - const u8 *text2; + const u8 *description; + const u8 *title; }; struct UnknownStruct1 { - const struct UnknownStruct2 *pokedexList; + const struct PokedexOption *pokedexList; u8 unk4; u8 unk5; u16 unk6; @@ -1069,90 +1069,109 @@ static const u8 gUnknown_0856EDF0[][4] = {0xFF, 0xFF, 4, 0xFF}, }; -static const struct UnknownStruct2 gUnknown_0856EE0C[] = +static const struct PokedexOption gDexModeOptions[] = { - {gUnknown_085E89A4, gUnknown_085E88DF}, - {gUnknown_085E89BB, gUnknown_085E88E9}, + {gText_DexHoennDescription, gText_DexHoennTitle}, + {gText_DexNatDescription, gText_DexNatTitle}, {NULL, NULL}, }; -static const struct UnknownStruct2 gUnknown_0856EE24[] = +static const struct PokedexOption gDexSortOptions[] = { - {gUnknown_085E89D4, gUnknown_085E88F6}, - {gUnknown_085E8A02, gUnknown_085E8905}, - {gUnknown_085E8A37, gUnknown_085E8911}, - {gUnknown_085E8A73, gUnknown_085E891F}, - {gUnknown_085E8AAF, gUnknown_085E892D}, - {gUnknown_085E8AEA, gUnknown_085E893A}, + {gText_DexSortNumericalDescription, gText_DexSortNumericalTitle}, + {gText_DexSortAtoZDescription, gText_DexSortAtoZTitle}, + {gText_DexSortHeaviestDescription, gText_DexSortHeaviestTitle}, + {gText_DexSortLightestDescription, gText_DexSortLightestTitle}, + {gText_DexSortTallestDescription, gText_DexSortTallestTitle}, + {ggText_DexSortSmallestDescription, gText_DexSortSmallestTitle}, {NULL, NULL}, }; -static const struct UnknownStruct2 gUnknown_0856EE5C[] = -{ - {gUnknown_085E8B25, gUnknown_085E8B26}, - {gUnknown_085E8B25, gUnknown_085E8948}, - {gUnknown_085E8B25, gUnknown_085E894C}, - {gUnknown_085E8B25, gUnknown_085E8950}, - {gUnknown_085E8B25, gUnknown_085E8954}, - {gUnknown_085E8B25, gUnknown_085E8958}, - {gUnknown_085E8B25, gUnknown_085E895C}, - {gUnknown_085E8B25, gUnknown_085E8960}, - {gUnknown_085E8B25, gUnknown_085E8964}, - {gUnknown_085E8B25, gUnknown_085E8968}, +static const struct PokedexOption gDexSearchAlphaOptions[] = +{ + {gText_DexEmptyString, gText_DexSearchDontSpecify}, + {gText_DexEmptyString, gText_DexSearchAlphaABC}, + {gText_DexEmptyString, gText_DexSearchAlphaDEF}, + {gText_DexEmptyString, gText_DexSearchAlphaGHI}, + {gText_DexEmptyString, gText_DexSearchAlphaJKL}, + {gText_DexEmptyString, gText_DexSearchAlphaMNO}, + {gText_DexEmptyString, gText_DexSearchAlphaPQR}, + {gText_DexEmptyString, gText_DexSearchAlphaSTU}, + {gText_DexEmptyString, gText_DexSearchAlphaVWX}, + {gText_DexEmptyString, gText_DexSearchAlphaYZ}, {NULL, NULL}, }; -static const struct UnknownStruct2 gUnknown_0856EEB4[] = -{ - {gUnknown_085E8B25, gUnknown_085E8B26}, - {gUnknown_085E8B25, gUnknown_085E896B}, - {gUnknown_085E8B25, gUnknown_085E896F}, - {gUnknown_085E8B25, gUnknown_085E8974}, - {gUnknown_085E8B25, gUnknown_085E897B}, - {gUnknown_085E8B25, gUnknown_085E8981}, - {gUnknown_085E8B25, gUnknown_085E8987}, - {gUnknown_085E8B25, gUnknown_085E898D}, - {gUnknown_085E8B25, gUnknown_085E8994}, - {gUnknown_085E8B25, gUnknown_085E8999}, - {gUnknown_085E8B25, gUnknown_085E899F}, +static const struct PokedexOption gDexSearchColorOptions[] = +{ + {gText_DexEmptyString, gText_DexSearchDontSpecify}, + {gText_DexEmptyString, gText_DexSearchColorRed}, + {gText_DexEmptyString, gText_DexSearchColorBlue}, + {gText_DexEmptyString, gText_DexSearchColorYellow}, + {gText_DexEmptyString, gText_DexSearchColorGreen}, + {gText_DexEmptyString, gText_DexSearchColorBlack}, + {gText_DexEmptyString, gText_DexSearchColorBrown}, + {gText_DexEmptyString, gText_DexSearchColorPurple}, + {gText_DexEmptyString, gText_DexSearchColorGray}, + {gText_DexEmptyString, gText_DexSearchColorWhite}, + {gText_DexEmptyString, gText_DexSearchColorPink}, {NULL, NULL}, }; -static const struct UnknownStruct2 gUnknown_0856EF14[] = -{ - {gUnknown_085E8B25, gUnknown_085E8B35}, - {gUnknown_085E8B25, gTypeNames[TYPE_NORMAL]}, - {gUnknown_085E8B25, gTypeNames[TYPE_FIGHTING]}, - {gUnknown_085E8B25, gTypeNames[TYPE_FLYING]}, - {gUnknown_085E8B25, gTypeNames[TYPE_POISON]}, - {gUnknown_085E8B25, gTypeNames[TYPE_GROUND]}, - {gUnknown_085E8B25, gTypeNames[TYPE_ROCK]}, - {gUnknown_085E8B25, gTypeNames[TYPE_BUG]}, - {gUnknown_085E8B25, gTypeNames[TYPE_GHOST]}, - {gUnknown_085E8B25, gTypeNames[TYPE_STEEL]}, - {gUnknown_085E8B25, gTypeNames[TYPE_FIRE]}, - {gUnknown_085E8B25, gTypeNames[TYPE_WATER]}, - {gUnknown_085E8B25, gTypeNames[TYPE_GRASS]}, - {gUnknown_085E8B25, gTypeNames[TYPE_ELECTRIC]}, - {gUnknown_085E8B25, gTypeNames[TYPE_PSYCHIC]}, - {gUnknown_085E8B25, gTypeNames[TYPE_ICE]}, - {gUnknown_085E8B25, gTypeNames[TYPE_DRAGON]}, - {gUnknown_085E8B25, gTypeNames[TYPE_DARK]}, +static const struct PokedexOption gDexSearchTypeOptions[] = +{ + {gText_DexEmptyString, gText_DexSearchTypeNone}, + {gText_DexEmptyString, gTypeNames[TYPE_NORMAL]}, + {gText_DexEmptyString, gTypeNames[TYPE_FIGHTING]}, + {gText_DexEmptyString, gTypeNames[TYPE_FLYING]}, + {gText_DexEmptyString, gTypeNames[TYPE_POISON]}, + {gText_DexEmptyString, gTypeNames[TYPE_GROUND]}, + {gText_DexEmptyString, gTypeNames[TYPE_ROCK]}, + {gText_DexEmptyString, gTypeNames[TYPE_BUG]}, + {gText_DexEmptyString, gTypeNames[TYPE_GHOST]}, + {gText_DexEmptyString, gTypeNames[TYPE_STEEL]}, + {gText_DexEmptyString, gTypeNames[TYPE_FIRE]}, + {gText_DexEmptyString, gTypeNames[TYPE_WATER]}, + {gText_DexEmptyString, gTypeNames[TYPE_GRASS]}, + {gText_DexEmptyString, gTypeNames[TYPE_ELECTRIC]}, + {gText_DexEmptyString, gTypeNames[TYPE_PSYCHIC]}, + {gText_DexEmptyString, gTypeNames[TYPE_ICE]}, + {gText_DexEmptyString, gTypeNames[TYPE_DRAGON]}, + {gText_DexEmptyString, gTypeNames[TYPE_DARK]}, {NULL, NULL}, }; static const u8 gUnknown_0856EFAC[] = {0x00, 0x01}; static const u8 gUnknown_0856EFAE[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05}; -static const u8 gUnknown_0856EFB4[] = {0xFF, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17}; +static const u8 gDexSearchTypeIds[] = { + TYPE_NONE, + TYPE_NORMAL, + TYPE_FIGHTING, + TYPE_FLYING, + TYPE_POISON, + TYPE_GROUND, + TYPE_ROCK, + TYPE_BUG, + TYPE_GHOST, + TYPE_STEEL, + TYPE_FIRE, + TYPE_WATER, + TYPE_GRASS, + TYPE_ELECTRIC, + TYPE_PSYCHIC, + TYPE_ICE, + TYPE_DRAGON, + TYPE_DARK, +}; static const struct UnknownStruct1 gUnknown_0856EFC8[] = { - {gUnknown_0856EE5C, 6, 7, 10}, - {gUnknown_0856EEB4, 8, 9, 11}, - {gUnknown_0856EF14, 10,11, 18}, - {gUnknown_0856EF14, 12, 13, 18}, - {gUnknown_0856EE24, 4, 5, 6}, - {gUnknown_0856EE0C, 2, 3, 2}, + {gDexSearchAlphaOptions, 6, 7, 10}, + {gDexSearchColorOptions, 8, 9, 11}, + {gDexSearchTypeOptions, 10, 11, NUMBER_OF_MON_TYPES}, + {gDexSearchTypeOptions, 12, 13, NUMBER_OF_MON_TYPES}, + {gDexSortOptions, 4, 5, 6}, + {gDexModeOptions, 2, 3, 2}, }; static const struct BgTemplate gUnknown_0856EFF8[] = @@ -4690,15 +4709,15 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by type - if (type1 != 0xFF || type2 != 0xFF) + if (type1 != TYPE_NONE || type2 != TYPE_NONE) { - if (type1 == 0xFF) + if (type1 == TYPE_NONE) { type1 = type2; - type2 = 0xFF; + type2 = TYPE_NONE; } - if (type2 == 0xFF) + if (type2 == TYPE_NONE) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -5095,7 +5114,7 @@ void sub_80C1B64(u8 taskId) void sub_80C1BCC(u8 taskId) { u8 r1; - const struct UnknownStruct2 *r8; + const struct PokedexOption *r8; u16 *p1; u16 *p2; u16 r2; @@ -5148,7 +5167,7 @@ void sub_80C1BCC(u8 taskId) if (r3) { PlaySE(SE_SELECT); - sub_80C2618(r8[*p1 + *p2].text1); + sub_80C2618(r8[*p1 + *p2].description); CopyWindowToVram(0, 2); } return; @@ -5172,7 +5191,7 @@ void sub_80C1BCC(u8 taskId) if (r3) { PlaySE(SE_SELECT); - sub_80C2618(r8[*p1 + *p2].text1); + sub_80C2618(r8[*p1 + *p2].description); CopyWindowToVram(0, 2); } return; @@ -5391,24 +5410,24 @@ void sub_80C20F8(u8 taskId) sub_80C12B0(0x28, 0x10, 0x60, 0x50); var = gTasks[taskId].data[6] + gTasks[taskId].data[7]; - sub_80C1270(gUnknown_0856EE5C[var].text2, 0x2D, 0x11); + sub_80C1270(gDexSearchAlphaOptions[var].title, 0x2D, 0x11); var = gTasks[taskId].data[8] + gTasks[taskId].data[9]; - sub_80C1270(gUnknown_0856EEB4[var].text2, 0x2D, 0x21); + sub_80C1270(gDexSearchColorOptions[var].title, 0x2D, 0x21); var = gTasks[taskId].data[10] + gTasks[taskId].data[11]; - sub_80C1270(gUnknown_0856EF14[var].text2, 0x2D, 0x31); + sub_80C1270(gDexSearchTypeOptions[var].title, 0x2D, 0x31); var = gTasks[taskId].data[12] + gTasks[taskId].data[13]; - sub_80C1270(gUnknown_0856EF14[var].text2, 0x5D, 0x31); + sub_80C1270(gDexSearchTypeOptions[var].title, 0x5D, 0x31); var = gTasks[taskId].data[4] + gTasks[taskId].data[5]; - sub_80C1270(gUnknown_0856EE24[var].text2, 0x2D, 0x41); + sub_80C1270(gDexSortOptions[var].title, 0x2D, 0x41); if (IsNationalPokedexEnabled()) { var = gTasks[taskId].data[2] + gTasks[taskId].data[3]; - sub_80C1270(gUnknown_0856EE0C[var].text2, 0x2D, 0x51); + sub_80C1270(gDexModeOptions[var].title, 0x2D, 0x51); } } @@ -5447,45 +5466,45 @@ void sub_80C21D4(u8 a) void sub_80C2294(u8 taskId) { - const struct UnknownStruct2 *r6 = gUnknown_0856EFC8[gTasks[taskId].data[1]].pokedexList; + const struct PokedexOption *r6 = gUnknown_0856EFC8[gTasks[taskId].data[1]].pokedexList; const u16 *r8 = &gTasks[taskId].data[gUnknown_0856EFC8[gTasks[taskId].data[1]].unk4]; const u16 *r7 = &gTasks[taskId].data[gUnknown_0856EFC8[gTasks[taskId].data[1]].unk5]; u16 i; u16 j; sub_80C267C(); - for (i = 0, j = *r7; i < 6 && r6[j].text2 != NULL; i++, j++) - sub_80C2668(i, r6[j].text2); - sub_80C2618(r6[*r8 + *r7].text1); + for (i = 0, j = *r7; i < 6 && r6[j].title != NULL; i++, j++) + sub_80C2668(i, r6[j].title); + sub_80C2618(r6[*r8 + *r7].description); } u8 sub_80C2318(u8 taskId, u8 b) { const u16 *ptr1 = &gTasks[taskId].data[gUnknown_0856EFC8[b].unk4]; const u16 *ptr2 = &gTasks[taskId].data[gUnknown_0856EFC8[b].unk5]; - u16 r2 = *ptr1 + *ptr2; + u16 type = *ptr1 + *ptr2; switch (b) { default: return 0; case 5: - return gUnknown_0856EFAC[r2]; + return gUnknown_0856EFAC[type]; case 4: - return gUnknown_0856EFAE[r2]; + return gUnknown_0856EFAE[type]; case 0: - if (r2 == 0) + if (type == 0) return 0xFF; else - return r2; + return type; case 1: - if (r2 == 0) + if (type == 0) return 0xFF; else - return r2 - 1; + return type - 1; case 2: case 3: - return gUnknown_0856EFB4[r2]; + return gDexSearchTypeIds[type]; } } diff --git a/src/strings.c b/src/strings.c index 5dcf97e2b..3cf801c7c 100644 --- a/src/strings.c +++ b/src/strings.c @@ -121,44 +121,44 @@ const u8 gUnknown_085E8840[] = _("List by the first letter in the name.\nSpotted const u8 gUnknown_085E887C[] = _("List by body color.\nSpotted POKéMON only."); const u8 gUnknown_085E88A6[] = _("List by type.\nOwned POKéMON only."); const u8 gUnknown_085E88C8[] = _("Execute search/switch."); -const u8 gUnknown_085E88DF[] = _("HOENN DEX"); -const u8 gUnknown_085E88E9[] = _("NATIONAL DEX"); -const u8 gUnknown_085E88F6[] = _("NUMERICAL MODE"); -const u8 gUnknown_085E8905[] = _("A TO Z MODE"); -const u8 gUnknown_085E8911[] = _("HEAVIEST MODE"); -const u8 gUnknown_085E891F[] = _("LIGHTEST MODE"); -const u8 gUnknown_085E892D[] = _("TALLEST MODE"); -const u8 gUnknown_085E893A[] = _("SMALLEST MODE"); -const u8 gUnknown_085E8948[] = _("ABC"); -const u8 gUnknown_085E894C[] = _("DEF"); -const u8 gUnknown_085E8950[] = _("GHI"); -const u8 gUnknown_085E8954[] = _("JKL"); -const u8 gUnknown_085E8958[] = _("MNO"); -const u8 gUnknown_085E895C[] = _("PQR"); -const u8 gUnknown_085E8960[] = _("STU"); -const u8 gUnknown_085E8964[] = _("VWX"); -const u8 gUnknown_085E8968[] = _("YZ"); -const u8 gUnknown_085E896B[] = _("RED"); -const u8 gUnknown_085E896F[] = _("BLUE"); -const u8 gUnknown_085E8974[] = _("YELLOW"); -const u8 gUnknown_085E897B[] = _("GREEN"); -const u8 gUnknown_085E8981[] = _("BLACK"); -const u8 gUnknown_085E8987[] = _("BROWN"); -const u8 gUnknown_085E898D[] = _("PURPLE"); -const u8 gUnknown_085E8994[] = _("GRAY"); -const u8 gUnknown_085E8999[] = _("WHITE"); -const u8 gUnknown_085E899F[] = _("PINK"); -const u8 gUnknown_085E89A4[] = _("HOENN region’s POKéDEX"); -const u8 gUnknown_085E89BB[] = _("National edition POKéDEX"); -const u8 gUnknown_085E89D4[] = _("POKéMON are listed according to their\nnumber."); -const u8 gUnknown_085E8A02[] = _("Spotted and owned POKéMON are listed\nalphabetically."); -const u8 gUnknown_085E8A37[] = _("Owned POKéMON are listed from the\nheaviest to the lightest."); -const u8 gUnknown_085E8A73[] = _("Owned POKéMON are listed from the\nlightest to the heaviest."); -const u8 gUnknown_085E8AAF[] = _("Owned POKéMON are listed from the\ntallest to the smallest."); -const u8 gUnknown_085E8AEA[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); -const u8 gUnknown_085E8B25[] = _(""); -const u8 gUnknown_085E8B26[] = _("DON’T SPECIFY."); -const u8 gUnknown_085E8B35[] = _("NONE"); +const u8 gText_DexHoennTitle[] = _("HOENN DEX"); +const u8 gText_DexNatTitle[] = _("NATIONAL DEX"); +const u8 gText_DexSortNumericalTitle[] = _("NUMERICAL MODE"); +const u8 gText_DexSortAtoZTitle[] = _("A TO Z MODE"); +const u8 gText_DexSortHeaviestTitle[] = _("HEAVIEST MODE"); +const u8 gText_DexSortLightestTitle[] = _("LIGHTEST MODE"); +const u8 gText_DexSortTallestTitle[] = _("TALLEST MODE"); +const u8 gText_DexSortSmallestTitle[] = _("SMALLEST MODE"); +const u8 gText_DexSearchAlphaABC[] = _("ABC"); +const u8 gText_DexSearchAlphaDEF[] = _("DEF"); +const u8 gText_DexSearchAlphaGHI[] = _("GHI"); +const u8 gText_DexSearchAlphaJKL[] = _("JKL"); +const u8 gText_DexSearchAlphaMNO[] = _("MNO"); +const u8 gText_DexSearchAlphaPQR[] = _("PQR"); +const u8 gText_DexSearchAlphaSTU[] = _("STU"); +const u8 gText_DexSearchAlphaVWX[] = _("VWX"); +const u8 gText_DexSearchAlphaYZ[] = _("YZ"); +const u8 gText_DexSearchColorRed[] = _("RED"); +const u8 gText_DexSearchColorBlue[] = _("BLUE"); +const u8 gText_DexSearchColorYellow[] = _("YELLOW"); +const u8 gText_DexSearchColorGreen[] = _("GREEN"); +const u8 gText_DexSearchColorBlack[] = _("BLACK"); +const u8 gText_DexSearchColorBrown[] = _("BROWN"); +const u8 gText_DexSearchColorPurple[] = _("PURPLE"); +const u8 gText_DexSearchColorGray[] = _("GRAY"); +const u8 gText_DexSearchColorWhite[] = _("WHITE"); +const u8 gText_DexSearchColorPink[] = _("PINK"); +const u8 gText_DexHoennDescription[] = _("HOENN region’s POKéDEX"); +const u8 gText_DexNatDescription[] = _("National edition POKéDEX"); +const u8 gText_DexSortNumericalDescription[] = _("POKéMON are listed according to their\nnumber."); +const u8 gText_DexSortAtoZDescription[] = _("Spotted and owned POKéMON are listed\nalphabetically."); +const u8 gText_DexSortHeaviestDescription[] = _("Owned POKéMON are listed from the\nheaviest to the lightest."); +const u8 gText_DexSortLightestDescription[] = _("Owned POKéMON are listed from the\nlightest to the heaviest."); +const u8 gText_DexSortTallestDescription[] = _("Owned POKéMON are listed from the\ntallest to the smallest."); +const u8 ggText_DexSortSmallestDescription[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); +const u8 gText_DexEmptyString[] = _(""); +const u8 gText_DexSearchDontSpecify[] = _("DON’T SPECIFY."); +const u8 gText_DexSearchTypeNone[] = _("NONE"); const u8 gText_SelectorArrow[] = _("▶"); const u8 gUnknown_085E8B3C[] = _(" "); const u8 gText_WelcomeToHOF[] = _("Welcome to the HALL OF FAME!"); -- cgit v1.2.3 From a9e6154fa949d90bcc629cd980b180abe57b7474 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 5 Dec 2018 22:21:26 +0100 Subject: Finish porting battle frontier data --- include/battle_tower.h | 336 +--- include/constants/trainers.h | 2 + include/strings.h | 332 ++++ src/battle_dome.c | 11 +- src/battle_factory.c | 5 - src/battle_pike.c | 2 - src/battle_pyramid.c | 3 - src/battle_tent.c | 4 - src/battle_tower.c | 163 +- src/data/battle_frontier/battle_frontier_mons.h | 1766 ++++++++++---------- .../battle_frontier/battle_frontier_trainers.h | 1042 ++++++------ src/frontier_util.c | 2 - 12 files changed, 1826 insertions(+), 1842 deletions(-) diff --git a/include/battle_tower.h b/include/battle_tower.h index 68f495524..e361b9742 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -37,6 +37,11 @@ extern const u8 gTowerMaleFacilityClasses[30]; extern const u8 gTowerMaleTrainerGfxIds[30]; extern const u8 gTowerFemaleFacilityClasses[20]; extern const u8 gTowerFemaleTrainerGfxIds[20]; +extern const u16 gBattleFrontierHeldItems[]; +extern const struct FacilityMon gBattleFrontierMons[]; +extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; +extern const struct FacilityMon gSlateportBattleTentMons[]; +extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; extern u16 gUnknown_03006298[]; @@ -78,335 +83,4 @@ u8 sub_81660B8(u8 facilityClass); bool32 ValidateBattleTowerRecord(u8 recordId); // unused void sub_8166188(void); -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248297[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247749[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246864[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248661[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246662[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248321[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244549[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246244[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244383[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248467[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248553[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246741[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248725[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244939[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247291[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245464[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247313[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247470[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245535[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247991[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246605[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246020[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246449[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246831[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247854[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246051[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248401[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248671[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247484[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247629[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244413[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248369[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248892[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248781[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246791[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246571[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247838[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247942[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248751[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247724[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244618[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245406[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245087[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245196[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245740[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248128[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248477[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245923[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248829[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245013[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246686[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246082[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245851[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246760[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246478[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; -extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; - #endif //GUARD_BATTLE_TOWER_H diff --git a/include/constants/trainers.h b/include/constants/trainers.h index cf6eaf929..a0bda381a 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -200,6 +200,8 @@ #define FACILITY_CLASS_RS_BRENDAN 0x50 #define FACILITY_CLASS_RS_MAY 0x51 +#define FACILITY_CLASSES_COUNT 0x52 + #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 #define TRAINER_CLASS_HIKER 0x2 diff --git a/include/strings.h b/include/strings.h index 887ccdfe6..29807386d 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1275,6 +1275,338 @@ extern const u8 gText_082C8589[]; extern const u8 gText_082C85AE[]; extern const u8 gText_082C877B[]; +// Battle Tower. +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248297[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247749[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246864[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248661[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246662[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248321[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2465B5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244549[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246244[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244383[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F7B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247348[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248467[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248553[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246741[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245656[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248725[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244939[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471FB[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247291[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248614[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245464[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247313[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247470[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246529[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247238[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245535[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246FCC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247991[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246605[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246020[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246449[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246831[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247854[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246051[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248401[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248671[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247484[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247629[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244413[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248369[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248892[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248781[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246791[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246571[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248431[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487C9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247807[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246002[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247838[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248151[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247942[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248751[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247724[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248908[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244618[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467C4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245406[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248517[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245087[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245196[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245740[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248128[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247013[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248477[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245923[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248829[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245013[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246686[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247438[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246082[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245851[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246760[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246478[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; +extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; + // Battle Pyramid. extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[]; diff --git a/src/battle_dome.c b/src/battle_dome.c index 0f5721fb9..77d120bd4 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -26,6 +26,7 @@ #include "international_string_util.h" #include "trainer_pokemon_sprites.h" #include "scanline_effect.h" +#include "script_pokemon_util_80F87D8.h" #include "graphics.h" #include "constants/species.h" #include "constants/moves.h" @@ -57,19 +58,9 @@ struct UnkStruct_860DD10 }; extern void sub_81B8558(void); -extern u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId); -extern u8 GetFrontierBrainMonEvs(u8, u8); -extern u8 GetFrontierBrainMonNature(u8); -extern void sub_81A4C30(void); -extern u8 sub_81A3610(void); -extern u16 GetFrontierBrainMonSpecies(u8); -extern void ReducePlayerPartyToSelectedMons(void); extern u8 gSelectedOrderFromParty[]; -extern const u16 gBattleFrontierHeldItems[]; -extern const struct FacilityMon gBattleFrontierMons[]; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; extern const struct SpriteTemplate gUnknown_0860CFA8; // text diff --git a/src/battle_factory.c b/src/battle_factory.c index 1d7fbafc9..a693acfb6 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -13,11 +13,6 @@ #include "constants/trainers.h" #include "constants/moves.h" -extern const struct FacilityMon gBattleFrontierMons[]; -extern const struct FacilityMon gSlateportBattleTentMons[]; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; -extern const u16 gBattleFrontierHeldItems[]; - // IWRAM bss static IWRAM_DATA bool8 gUnknown_03001288; diff --git a/src/battle_pike.c b/src/battle_pike.c index 38d3e7d4a..39a911303 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -50,8 +50,6 @@ struct PikeWildMon u16 moves[4]; }; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; - // IWRAM bss static IWRAM_DATA u8 sRoomType; static IWRAM_DATA u8 sStatusMon; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 23343ba20..def071435 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -37,9 +37,6 @@ extern void door_upload_tiles(void); extern const struct MapLayout *const gMapLayouts[]; extern const u16 gUnknown_08D856C8[][16]; -extern const u16 gBattleFrontierHeldItems[]; -extern const struct FacilityMon gBattleFrontierMons[]; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; #define TOTAL_ROUNDS 20 #define PICKUP_ITEMS_PER_ROUND 10 diff --git a/src/battle_tent.c b/src/battle_tent.c index c7e70912c..d66c093e9 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -14,10 +14,6 @@ #include "constants/items.h" #include "constants/region_map_sections.h" -extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; -extern const struct FacilityMon gSlateportBattleTentMons[]; -extern const u16 gBattleFrontierHeldItems[]; - // This file's functions. static void sub_81B99D4(void); static void sub_81B9A28(void); diff --git a/src/battle_tower.c b/src/battle_tower.c index 7bc354c1d..08009faab 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -10,6 +10,7 @@ #include "international_string_util.h" #include "battle.h" #include "frontier_util.h" +#include "strings.h" #include "recorded_battle.h" #include "easy_chat.h" #include "gym_leader_rematch.h" @@ -23,14 +24,13 @@ #include "tv.h" #include "battle_factory.h" #include "constants/battle_frontier.h" +#include "constants/items.h" #include "constants/trainers.h" #include "constants/event_objects.h" #include "constants/moves.h" #include "constants/species.h" #include "constants/easy_chat.h" -extern void sub_81A4C30(void); - extern const u16 gUnknown_085DFA46[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; @@ -76,7 +76,7 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT static u8 SetTentPtrsGetLevel(void); // Const rom data. -const u16 gBattleFrontierHeldItems[] = +const u16 gBattleFrontierHeldItems[] = { ITEM_NONE, ITEM_KINGS_ROCK, @@ -147,7 +147,7 @@ const u16 gBattleFrontierHeldItems[] = #include "data/battle_frontier/battle_frontier_trainers.h" #include "data/battle_frontier/battle_frontier_mons.h" -const u8 gTowerMaleFacilityClasses[] = +const u8 gTowerMaleFacilityClasses[30] = { FACILITY_CLASS_RUIN_MANIAC, FACILITY_CLASS_TUBER_M, @@ -181,7 +181,7 @@ const u8 gTowerMaleFacilityClasses[] = FACILITY_CLASS_HIKER }; -const u8 gTowerFemaleFacilityClasses[] = +const u8 gTowerFemaleFacilityClasses[20] = { FACILITY_CLASS_AROMA_LADY, FACILITY_CLASS_TUBER_F, @@ -205,7 +205,7 @@ const u8 gTowerFemaleFacilityClasses[] = FACILITY_CLASS_LASS }; -const u8 gTowerMaleTrainerGfxIds[] = +const u8 gTowerMaleTrainerGfxIds[30] = { EVENT_OBJ_GFX_HIKER, EVENT_OBJ_GFX_TUBER_M, @@ -239,7 +239,7 @@ const u8 gTowerMaleTrainerGfxIds[] = EVENT_OBJ_GFX_HIKER }; -const u8 gTowerFemaleTrainerGfxIds[] = +const u8 gTowerFemaleTrainerGfxIds[20] = { EVENT_OBJ_GFX_WOMAN_2, EVENT_OBJ_GFX_TUBER_F, @@ -263,7 +263,7 @@ const u8 gTowerFemaleTrainerGfxIds[] = EVENT_OBJ_GFX_LASS }; -const u8 sRubyFacilityClassToEmerald[82][2] = +static const u8 sRubyFacilityClassToEmerald[][2] = { {0x00, 0x0b}, {0x01, 0x01}, @@ -340,10 +340,9 @@ const u8 sRubyFacilityClassToEmerald[82][2] = {0x4a, 0x48}, {0x4b, 0x49}, {0x4c, 0x4a}, - {0x00, 0x00} }; -const u8 *const gUnknown_085DCFD8[] = +static const u8 *const gUnknown_085DCFD8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244383, BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7, @@ -352,7 +351,7 @@ const u8 *const gUnknown_085DCFD8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6 }; -const u8 *const gUnknown_085DCFEC[] = +static const u8 *const gUnknown_085DCFEC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF, BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E, @@ -361,7 +360,7 @@ const u8 *const gUnknown_085DCFEC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5 }; -const u8 *const gUnknown_085DD000[] = +static const u8 *const gUnknown_085DD000[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8, BattleFrontier_BattleTowerMultiBattleRoom_Text_244618, @@ -370,7 +369,7 @@ const u8 *const gUnknown_085DD000[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4 }; -const u8 *const gUnknown_085DD014[] = +static const u8 *const gUnknown_085DD014[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5, BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D, @@ -379,7 +378,7 @@ const u8 *const gUnknown_085DD014[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7 }; -const u8 *const gUnknown_085DD028[] = +static const u8 *const gUnknown_085DD028[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD, BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5, @@ -388,7 +387,7 @@ const u8 *const gUnknown_085DD028[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6 }; -const u8 *const gUnknown_085DD03C[] = +static const u8 *const gUnknown_085DD03C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23, BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9, @@ -397,7 +396,7 @@ const u8 *const gUnknown_085DD03C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93 }; -const u8 *const gUnknown_085DD050[] = +static const u8 *const gUnknown_085DD050[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2, BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18, @@ -406,7 +405,7 @@ const u8 *const gUnknown_085DD050[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07 }; -const u8 *const gUnknown_085DD064[] = +static const u8 *const gUnknown_085DD064[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36, BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82, @@ -415,7 +414,7 @@ const u8 *const gUnknown_085DD064[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B }; -const u8 *const gUnknown_085DD078[] = +static const u8 *const gUnknown_085DD078[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E, BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA, @@ -424,7 +423,7 @@ const u8 *const gUnknown_085DD078[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98 }; -const u8 *const gUnknown_085DD08C[] = +static const u8 *const gUnknown_085DD08C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3, BattleFrontier_BattleTowerMultiBattleRoom_Text_245013, @@ -433,7 +432,7 @@ const u8 *const gUnknown_085DD08C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0 }; -const u8 *const gUnknown_085DD0A0[] = +static const u8 *const gUnknown_085DD0A0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6, BattleFrontier_BattleTowerMultiBattleRoom_Text_245196, @@ -442,7 +441,7 @@ const u8 *const gUnknown_085DD0A0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A }; -const u8 *const gUnknown_085DD0B4[] = +static const u8 *const gUnknown_085DD0B4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF, BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4, @@ -451,7 +450,7 @@ const u8 *const gUnknown_085DD0B4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3 }; -const u8 *const gUnknown_085DD0C8[] = +static const u8 *const gUnknown_085DD0C8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6, BattleFrontier_BattleTowerMultiBattleRoom_Text_245535, @@ -460,7 +459,7 @@ const u8 *const gUnknown_085DD0C8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245656 }; -const u8 *const gUnknown_085DD0DC[] = +static const u8 *const gUnknown_085DD0DC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A, BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5, @@ -469,7 +468,7 @@ const u8 *const gUnknown_085DD0DC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F }; -const u8 *const gUnknown_085DD0F0[] = +static const u8 *const gUnknown_085DD0F0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245851, BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C, @@ -478,7 +477,7 @@ const u8 *const gUnknown_085DD0F0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F }; -const u8 *const gUnknown_085DD104[] = +static const u8 *const gUnknown_085DD104[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE, BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7, @@ -487,7 +486,7 @@ const u8 *const gUnknown_085DD104[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E }; -const u8 *const gUnknown_085DD118[] = +static const u8 *const gUnknown_085DD118[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79, BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91, @@ -496,7 +495,7 @@ const u8 *const gUnknown_085DD118[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D }; -const u8 *const gUnknown_085DD12C[] = +static const u8 *const gUnknown_085DD12C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66, BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F, @@ -505,7 +504,7 @@ const u8 *const gUnknown_085DD12C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07 }; -const u8 *const gUnknown_085DD140[] = +static const u8 *const gUnknown_085DD140[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B, BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60, @@ -514,7 +513,7 @@ const u8 *const gUnknown_085DD140[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0 }; -const u8 *const gUnknown_085DD154[] = +static const u8 *const gUnknown_085DD154[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20, BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41, @@ -523,7 +522,7 @@ const u8 *const gUnknown_085DD154[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC }; -const u8 *const gUnknown_085DD168[] = +static const u8 *const gUnknown_085DD168[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B, BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58, @@ -532,7 +531,7 @@ const u8 *const gUnknown_085DD168[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246002 }; -const u8 *const gUnknown_085DD17C[] = +static const u8 *const gUnknown_085DD17C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246020, BattleFrontier_BattleTowerMultiBattleRoom_Text_246051, @@ -541,7 +540,7 @@ const u8 *const gUnknown_085DD17C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D }; -const u8 *const gUnknown_085DD190[] = +static const u8 *const gUnknown_085DD190[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D, @@ -550,7 +549,7 @@ const u8 *const gUnknown_085DD190[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5 }; -const u8 *const gUnknown_085DD1A4[] = +static const u8 *const gUnknown_085DD1A4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A, BattleFrontier_BattleTowerMultiBattleRoom_Text_246244, @@ -559,7 +558,7 @@ const u8 *const gUnknown_085DD1A4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4 }; -const u8 *const gUnknown_085DD1B8[] = +static const u8 *const gUnknown_085DD1B8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F, BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C, @@ -568,7 +567,7 @@ const u8 *const gUnknown_085DD1B8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF }; -const u8 *const gUnknown_085DD1CC[] = +static const u8 *const gUnknown_085DD1CC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246449, BattleFrontier_BattleTowerMultiBattleRoom_Text_246478, @@ -577,7 +576,7 @@ const u8 *const gUnknown_085DD1CC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246529 }; -const u8 *const gUnknown_085DD1E0[] = +static const u8 *const gUnknown_085DD1E0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246571, BattleFrontier_BattleTowerMultiBattleRoom_Text_24658C, @@ -586,7 +585,7 @@ const u8 *const gUnknown_085DD1E0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A }; -const u8 *const gUnknown_085DD1F4[] = +static const u8 *const gUnknown_085DD1F4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246662, BattleFrontier_BattleTowerMultiBattleRoom_Text_246686, @@ -595,7 +594,7 @@ const u8 *const gUnknown_085DD1F4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A }; -const u8 *const gUnknown_085DD208[] = +static const u8 *const gUnknown_085DD208[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246741, BattleFrontier_BattleTowerMultiBattleRoom_Text_246760, @@ -604,7 +603,7 @@ const u8 *const gUnknown_085DD208[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6 }; -const u8 *const gUnknown_085DD21C[] = +static const u8 *const gUnknown_085DD21C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF, BattleFrontier_BattleTowerMultiBattleRoom_Text_246831, @@ -613,7 +612,7 @@ const u8 *const gUnknown_085DD21C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE }; -const u8 *const gUnknown_085DD230[] = +static const u8 *const gUnknown_085DD230[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B, @@ -622,7 +621,7 @@ const u8 *const gUnknown_085DD230[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1 }; -const u8 *const gUnknown_085DD244[] = +static const u8 *const gUnknown_085DD244[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22, BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E, @@ -631,7 +630,7 @@ const u8 *const gUnknown_085DD244[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7 }; -const u8 *const gUnknown_085DD258[] = +static const u8 *const gUnknown_085DD258[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B, BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F, @@ -640,7 +639,7 @@ const u8 *const gUnknown_085DD258[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9 }; -const u8 *const gUnknown_085DD26C[] = +static const u8 *const gUnknown_085DD26C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22, BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35, @@ -649,7 +648,7 @@ const u8 *const gUnknown_085DD26C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9 }; -const u8 *const gUnknown_085DD280[] = +static const u8 *const gUnknown_085DD280[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D, BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F, @@ -658,7 +657,7 @@ const u8 *const gUnknown_085DD280[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3 }; -const u8 *const gUnknown_085DD294[] = +static const u8 *const gUnknown_085DD294[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A, BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39, @@ -667,7 +666,7 @@ const u8 *const gUnknown_085DD294[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE }; -const u8 *const gUnknown_085DD2A8[] = +static const u8 *const gUnknown_085DD2A8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21, BattleFrontier_BattleTowerMultiBattleRoom_Text_246F4C, @@ -676,7 +675,7 @@ const u8 *const gUnknown_085DD2A8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247013 }; -const u8 *const gUnknown_085DD2BC[] = +static const u8 *const gUnknown_085DD2BC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D, @@ -685,7 +684,7 @@ const u8 *const gUnknown_085DD2BC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A }; -const u8 *const gUnknown_085DD2D0[] = +static const u8 *const gUnknown_085DD2D0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C, BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D, @@ -694,7 +693,7 @@ const u8 *const gUnknown_085DD2D0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247238 }; -const u8 *const gUnknown_085DD2E4[] = +static const u8 *const gUnknown_085DD2E4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247268, BattleFrontier_BattleTowerMultiBattleRoom_Text_247291, @@ -703,7 +702,7 @@ const u8 *const gUnknown_085DD2E4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247348 }; -const u8 *const gUnknown_085DD2F8[] = +static const u8 *const gUnknown_085DD2F8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F, @@ -712,7 +711,7 @@ const u8 *const gUnknown_085DD2F8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247438 }; -const u8 *const gUnknown_085DD30C[] = +static const u8 *const gUnknown_085DD30C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247470, BattleFrontier_BattleTowerMultiBattleRoom_Text_247484, @@ -721,7 +720,7 @@ const u8 *const gUnknown_085DD30C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D }; -const u8 *const gUnknown_085DD320[] = +static const u8 *const gUnknown_085DD320[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A, BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C, @@ -730,7 +729,7 @@ const u8 *const gUnknown_085DD320[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5 }; -const u8 *const gUnknown_085DD334[] = +static const u8 *const gUnknown_085DD334[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D, BattleFrontier_BattleTowerMultiBattleRoom_Text_247629, @@ -739,7 +738,7 @@ const u8 *const gUnknown_085DD334[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED }; -const u8 *const gUnknown_085DD348[] = +static const u8 *const gUnknown_085DD348[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247724, BattleFrontier_BattleTowerMultiBattleRoom_Text_247749, @@ -748,7 +747,7 @@ const u8 *const gUnknown_085DD348[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247807 }; -const u8 *const gUnknown_085DD35C[] = +static const u8 *const gUnknown_085DD35C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247838, BattleFrontier_BattleTowerMultiBattleRoom_Text_247854, @@ -757,7 +756,7 @@ const u8 *const gUnknown_085DD35C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D }; -const u8 *const gUnknown_085DD370[] = +static const u8 *const gUnknown_085DD370[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247942, BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F, @@ -766,7 +765,7 @@ const u8 *const gUnknown_085DD370[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18 }; -const u8 *const gUnknown_085DD384[] = +static const u8 *const gUnknown_085DD384[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51, BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76, @@ -775,7 +774,7 @@ const u8 *const gUnknown_085DD384[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16 }; -const u8 *const gUnknown_085DD398[] = +static const u8 *const gUnknown_085DD398[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E, BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62, @@ -784,7 +783,7 @@ const u8 *const gUnknown_085DD398[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23 }; -const u8 *const gUnknown_085DD3AC[] = +static const u8 *const gUnknown_085DD3AC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E, BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C, @@ -793,7 +792,7 @@ const u8 *const gUnknown_085DD3AC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E }; -const u8 *const gUnknown_085DD3C0[] = +static const u8 *const gUnknown_085DD3C0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97, BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7, @@ -802,7 +801,7 @@ const u8 *const gUnknown_085DD3C0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E }; -const u8 *const gUnknown_085DD3D4[] = +static const u8 *const gUnknown_085DD3D4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1, BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5, @@ -811,7 +810,7 @@ const u8 *const gUnknown_085DD3D4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D }; -const u8 *const gUnknown_085DD3E8[] = +static const u8 *const gUnknown_085DD3E8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3, BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7, @@ -820,7 +819,7 @@ const u8 *const gUnknown_085DD3E8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E }; -const u8 *const gUnknown_085DD3FC[] = +static const u8 *const gUnknown_085DD3FC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D, BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB, @@ -829,7 +828,7 @@ const u8 *const gUnknown_085DD3FC[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248151 }; -const u8 *const gUnknown_085DD410[] = +static const u8 *const gUnknown_085DD410[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E, BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9, @@ -838,7 +837,7 @@ const u8 *const gUnknown_085DD410[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F }; -const u8 *const gUnknown_085DD424[] = +static const u8 *const gUnknown_085DD424[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248297, BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1, @@ -847,7 +846,7 @@ const u8 *const gUnknown_085DD424[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D }; -const u8 *const gUnknown_085DD438[] = +static const u8 *const gUnknown_085DD438[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248369, BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D, @@ -856,7 +855,7 @@ const u8 *const gUnknown_085DD438[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248431 }; -const u8 *const gUnknown_085DD44C[] = +static const u8 *const gUnknown_085DD44C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248467, BattleFrontier_BattleTowerMultiBattleRoom_Text_248477, @@ -865,7 +864,7 @@ const u8 *const gUnknown_085DD44C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248517 }; -const u8 *const gUnknown_085DD460[] = +static const u8 *const gUnknown_085DD460[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248553, BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A, @@ -874,7 +873,7 @@ const u8 *const gUnknown_085DD460[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248614 }; -const u8 *const gUnknown_085DD474[] = +static const u8 *const gUnknown_085DD474[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E, BattleFrontier_BattleTowerMultiBattleRoom_Text_248661, @@ -883,7 +882,7 @@ const u8 *const gUnknown_085DD474[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF }; -const u8 *const gUnknown_085DD488[] = +static const u8 *const gUnknown_085DD488[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248725, BattleFrontier_BattleTowerMultiBattleRoom_Text_248751, @@ -892,7 +891,7 @@ const u8 *const gUnknown_085DD488[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7 }; -const u8 *const gUnknown_085DD49C[] = +static const u8 *const gUnknown_085DD49C[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248829, BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B, @@ -901,7 +900,7 @@ const u8 *const gUnknown_085DD49C[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248908 }; -const u8 *const gUnknown_085DD4B0[] = +static const u8 *const gUnknown_085DD4B0[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B, BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F, @@ -910,7 +909,7 @@ const u8 *const gUnknown_085DD4B0[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7 }; -const u8 *const gUnknown_085DD4C4[] = +static const u8 *const gUnknown_085DD4C4[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10, BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40, @@ -919,7 +918,7 @@ const u8 *const gUnknown_085DD4C4[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB }; -const u8 *const gUnknown_085DD4D8[] = +static const u8 *const gUnknown_085DD4D8[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22, BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39, @@ -928,7 +927,7 @@ const u8 *const gUnknown_085DD4D8[] = BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE }; -const u8 *const gUnknown_085DD4EC[] = +static const u8 *const gUnknown_085DD4EC[] = { BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E, BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B, @@ -941,7 +940,7 @@ struct { u32 facilityClass; const u8 *const *strings; -} const gUnknown_085DD500[50] = +} const gUnknown_085DD500[] = { {0x00000047, gUnknown_085DD118}, {0x0000002b, gUnknown_085DD12C}, @@ -995,7 +994,7 @@ struct {0x00000007, gUnknown_085DD4EC} }; -const u8 *const *const gUnknown_085DD690[] = +static const u8 *const *const gUnknown_085DD690[] = { gUnknown_085DCFD8, gUnknown_085DCFEC, @@ -3298,12 +3297,13 @@ bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct Em { dst->lvlMode = src->lvlMode; dst->winStreak = src->winStreak; - for (i = 0; i < (signed) ARRAY_COUNT(sRubyFacilityClassToEmerald); i++) + // BUG: Reading outside the array. sRubyFacilityClassToEmerald has less than FACILITY_CLASSES_COUNT entries. + for (i = 0; i < FACILITY_CLASSES_COUNT; i++) { if (sRubyFacilityClassToEmerald[i][0] == src->facilityClass) break; } - if (i != ARRAY_COUNT(sRubyFacilityClassToEmerald)) + if (i != FACILITY_CLASSES_COUNT) dst->facilityClass = sRubyFacilityClassToEmerald[i][1]; else dst->facilityClass = FACILITY_CLASS_YOUNGSTER; @@ -3346,12 +3346,13 @@ bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, stru { dst->lvlMode = src->lvlMode; dst->winStreak = src->winStreak; - for (i = 0; i < (signed) ARRAY_COUNT(sRubyFacilityClassToEmerald); i++) + // BUG: Reading outside the array. sRubyFacilityClassToEmerald has less than FACILITY_CLASSES_COUNT entries. + for (i = 0; i < FACILITY_CLASSES_COUNT; i++) { if (sRubyFacilityClassToEmerald[i][1] == src->facilityClass) break; } - if (i != ARRAY_COUNT(sRubyFacilityClassToEmerald)) + if (i != FACILITY_CLASSES_COUNT) dst->facilityClass = sRubyFacilityClassToEmerald[i][0]; else dst->facilityClass = 0x24; // FACILITY_CLASS_YOUNGSTER in Ruby/Sapphire. diff --git a/src/data/battle_frontier/battle_frontier_mons.h b/src/data/battle_frontier/battle_frontier_mons.h index 371b0f170..44cfb8036 100644 --- a/src/data/battle_frontier/battle_frontier_mons.h +++ b/src/data/battle_frontier/battle_frontier_mons.h @@ -1,6175 +1,6175 @@ -const struct FacilityMon gBattleFrontierMons[] = +const struct FacilityMon gBattleFrontierMons[] = { [0] = { .species = SPECIES_SUNKERN, - .moves = {MOVE_MEGA_DRAIN MOVE_HELPING_HAND MOVE_SUNNY_DAY MOVE_LIGHT_SCREEN}, + .moves = {MOVE_MEGA_DRAIN, MOVE_HELPING_HAND, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [1] = { .species = SPECIES_AZURILL, - .moves = {MOVE_WATER_PULSE MOVE_ATTRACT MOVE_SING MOVE_CHARM}, + .moves = {MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RASH }, [2] = { .species = SPECIES_CATERPIE, - .moves = {MOVE_TACKLE MOVE_STRING_SHOT MOVE_NONE MOVE_NONE}, + .moves = {MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [3] = { .species = SPECIES_WEEDLE, - .moves = {MOVE_POISON_STING MOVE_STRING_SHOT MOVE_NONE MOVE_NONE}, + .moves = {MOVE_POISON_STING, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [4] = { .species = SPECIES_WURMPLE, - .moves = {MOVE_TACKLE MOVE_STRING_SHOT MOVE_POISON_STING MOVE_NONE}, + .moves = {MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_POISON_STING, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [5] = { .species = SPECIES_RALTS, - .moves = {MOVE_CONFUSION MOVE_IMPRISON MOVE_DOUBLE_TEAM MOVE_LIGHT_SCREEN}, + .moves = {MOVE_CONFUSION, MOVE_IMPRISON, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [6] = { .species = SPECIES_MAGIKARP, - .moves = {MOVE_FLAIL MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_FLAIL, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [7] = { .species = SPECIES_FEEBAS, - .moves = {MOVE_FLAIL MOVE_MIRROR_COAT MOVE_NONE MOVE_NONE}, + .moves = {MOVE_FLAIL, MOVE_MIRROR_COAT, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [8] = { .species = SPECIES_METAPOD, - .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [9] = { .species = SPECIES_KAKUNA, - .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [10] = { .species = SPECIES_PICHU, - .moves = {MOVE_SWEET_KISS MOVE_THUNDER_WAVE MOVE_ATTRACT MOVE_SHOCK_WAVE}, + .moves = {MOVE_SWEET_KISS, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_SHOCK_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RASH }, [11] = { .species = SPECIES_SILCOON, - .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [12] = { .species = SPECIES_CASCOON, - .moves = {MOVE_HARDEN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [13] = { .species = SPECIES_IGGLYBUFF, - .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_ATTRACT MOVE_SEISMIC_TOSS}, + .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_SEISMIC_TOSS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [14] = { .species = SPECIES_WOOPER, - .moves = {MOVE_YAWN MOVE_DIG MOVE_WATER_PULSE MOVE_RAIN_DANCE}, + .moves = {MOVE_YAWN, MOVE_DIG, MOVE_WATER_PULSE, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [15] = { .species = SPECIES_TYROGUE, - .moves = {MOVE_MACH_PUNCH MOVE_PROTECT MOVE_DOUBLE_TEAM MOVE_FACADE}, + .moves = {MOVE_MACH_PUNCH, MOVE_PROTECT, MOVE_DOUBLE_TEAM, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [16] = { .species = SPECIES_SENTRET, - .moves = {MOVE_QUICK_ATTACK MOVE_FOLLOW_ME MOVE_HELPING_HAND MOVE_ASSIST}, + .moves = {MOVE_QUICK_ATTACK, MOVE_FOLLOW_ME, MOVE_HELPING_HAND, MOVE_ASSIST}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [17] = { .species = SPECIES_CLEFFA, - .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_ATTRACT MOVE_METRONOME}, + .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_METRONOME}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SERIOUS }, [18] = { .species = SPECIES_SEEDOT, - .moves = {MOVE_BULLET_SEED MOVE_BIDE MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .moves = {MOVE_BULLET_SEED, MOVE_BIDE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [19] = { .species = SPECIES_LOTAD, - .moves = {MOVE_RAIN_DANCE MOVE_WATER_PULSE MOVE_SUNNY_DAY MOVE_MEGA_DRAIN}, + .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_SUNNY_DAY, MOVE_MEGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [20] = { .species = SPECIES_POOCHYENA, - .moves = {MOVE_CRUNCH MOVE_SWAGGER MOVE_ROAR MOVE_SAND_ATTACK}, + .moves = {MOVE_CRUNCH, MOVE_SWAGGER, MOVE_ROAR, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [21] = { .species = SPECIES_SHEDINJA, - .moves = {MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_SILVER_WIND MOVE_GRUDGE}, + .moves = {MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_SILVER_WIND, MOVE_GRUDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_NAIVE }, [22] = { .species = SPECIES_MAKUHITA, - .moves = {MOVE_FAKE_OUT MOVE_SEISMIC_TOSS MOVE_DETECT MOVE_WHIRLWIND}, + .moves = {MOVE_FAKE_OUT, MOVE_SEISMIC_TOSS, MOVE_DETECT, MOVE_WHIRLWIND}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [23] = { .species = SPECIES_WHISMUR, - .moves = {MOVE_UPROAR MOVE_SWAGGER MOVE_BODY_SLAM MOVE_SMELLING_SALT}, + .moves = {MOVE_UPROAR, MOVE_SWAGGER, MOVE_BODY_SLAM, MOVE_SMELLING_SALT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [24] = { .species = SPECIES_ZIGZAGOON, - .moves = {MOVE_HEADBUTT MOVE_PIN_MISSILE MOVE_SWIFT MOVE_SAND_ATTACK}, + .moves = {MOVE_HEADBUTT, MOVE_PIN_MISSILE, MOVE_SWIFT, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_TIMID }, [25] = { .species = SPECIES_ZUBAT, - .moves = {MOVE_POISON_FANG MOVE_WHIRLWIND MOVE_CONFUSE_RAY MOVE_AERIAL_ACE}, + .moves = {MOVE_POISON_FANG, MOVE_WHIRLWIND, MOVE_CONFUSE_RAY, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [26] = { .species = SPECIES_TOGEPI, - .moves = {MOVE_RETURN MOVE_YAWN MOVE_WISH MOVE_SWEET_KISS}, + .moves = {MOVE_RETURN, MOVE_YAWN, MOVE_WISH, MOVE_SWEET_KISS}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [27] = { .species = SPECIES_SPINARAK, - .moves = {MOVE_SIGNAL_BEAM MOVE_NIGHT_SHADE MOVE_SPIDER_WEB MOVE_SCARY_FACE}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_NIGHT_SHADE, MOVE_SPIDER_WEB, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [28] = { .species = SPECIES_MARILL, - .moves = {MOVE_WATER_PULSE MOVE_RAIN_DANCE MOVE_LIGHT_SCREEN MOVE_RETURN}, + .moves = {MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_LIGHT_SCREEN, MOVE_RETURN}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [29] = { .species = SPECIES_HOPPIP, - .moves = {MOVE_MEGA_DRAIN MOVE_LEECH_SEED MOVE_SLEEP_POWDER MOVE_STUN_SPORE}, + .moves = {MOVE_MEGA_DRAIN, MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_STUN_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_LAX }, [30] = { .species = SPECIES_SLUGMA, - .moves = {MOVE_EMBER MOVE_ROCK_SLIDE MOVE_YAWN MOVE_BODY_SLAM}, + .moves = {MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_YAWN, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [31] = { .species = SPECIES_SWINUB, - .moves = {MOVE_ICY_WIND MOVE_DIG MOVE_ROCK_TOMB MOVE_ENDURE}, + .moves = {MOVE_ICY_WIND, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_GENTLE }, [32] = { .species = SPECIES_SMEARGLE, - .moves = {MOVE_EXTREME_SPEED MOVE_FAKE_OUT MOVE_QUICK_ATTACK MOVE_MACH_PUNCH}, + .moves = {MOVE_EXTREME_SPEED, MOVE_FAKE_OUT, MOVE_QUICK_ATTACK, MOVE_MACH_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [33] = { .species = SPECIES_PIDGEY, - .moves = {MOVE_GUST MOVE_SAND_ATTACK MOVE_WHIRLWIND MOVE_QUICK_ATTACK}, + .moves = {MOVE_GUST, MOVE_SAND_ATTACK, MOVE_WHIRLWIND, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [34] = { .species = SPECIES_RATTATA, - .moves = {MOVE_HYPER_FANG MOVE_PURSUIT MOVE_QUICK_ATTACK MOVE_SWAGGER}, + .moves = {MOVE_HYPER_FANG, MOVE_PURSUIT, MOVE_QUICK_ATTACK, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [35] = { .species = SPECIES_WYNAUT, - .moves = {MOVE_ENCORE MOVE_COUNTER MOVE_MIRROR_COAT MOVE_CHARM}, + .moves = {MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_JOLLY }, [36] = { .species = SPECIES_SKITTY, - .moves = {MOVE_SING MOVE_ATTRACT MOVE_CHARM MOVE_DOUBLE_SLAP}, + .moves = {MOVE_SING, MOVE_ATTRACT, MOVE_CHARM, MOVE_DOUBLE_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [37] = { .species = SPECIES_SPEAROW, - .moves = {MOVE_FURY_ATTACK MOVE_PURSUIT MOVE_MIRROR_MOVE MOVE_PROTECT}, + .moves = {MOVE_FURY_ATTACK, MOVE_PURSUIT, MOVE_MIRROR_MOVE, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [38] = { .species = SPECIES_HOOTHOOT, - .moves = {MOVE_CONFUSION MOVE_HYPNOSIS MOVE_SUPERSONIC MOVE_REFLECT}, + .moves = {MOVE_CONFUSION, MOVE_HYPNOSIS, MOVE_SUPERSONIC, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [39] = { .species = SPECIES_DIGLETT, - .moves = {MOVE_MAGNITUDE MOVE_SLASH MOVE_ROCK_TOMB MOVE_SAND_ATTACK}, + .moves = {MOVE_MAGNITUDE, MOVE_SLASH, MOVE_ROCK_TOMB, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_NAIVE }, [40] = { .species = SPECIES_LEDYBA, - .moves = {MOVE_PSYBEAM MOVE_AGILITY MOVE_BATON_PASS MOVE_LIGHT_SCREEN}, + .moves = {MOVE_PSYBEAM, MOVE_AGILITY, MOVE_BATON_PASS, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BASHFUL }, [41] = { .species = SPECIES_NINCADA, - .moves = {MOVE_MUD_SLAP MOVE_DIG MOVE_TOXIC MOVE_PROTECT}, + .moves = {MOVE_MUD_SLAP, MOVE_DIG, MOVE_TOXIC, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [42] = { .species = SPECIES_SURSKIT, - .moves = {MOVE_BUBBLE_BEAM MOVE_RAIN_DANCE MOVE_SWEET_SCENT MOVE_QUICK_ATTACK}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_RAIN_DANCE, MOVE_SWEET_SCENT, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [43] = { .species = SPECIES_JIGGLYPUFF, - .moves = {MOVE_SING MOVE_WISH MOVE_MIMIC MOVE_DOUBLE_SLAP}, + .moves = {MOVE_SING, MOVE_WISH, MOVE_MIMIC, MOVE_DOUBLE_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [44] = { .species = SPECIES_TAILLOW, - .moves = {MOVE_FLY MOVE_QUICK_ATTACK MOVE_ENDEAVOR MOVE_FOCUS_ENERGY}, + .moves = {MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_ENDEAVOR, MOVE_FOCUS_ENERGY}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [45] = { .species = SPECIES_WINGULL, - .moves = {MOVE_WATER_PULSE MOVE_FLY MOVE_QUICK_ATTACK MOVE_STEEL_WING}, + .moves = {MOVE_WATER_PULSE, MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [46] = { .species = SPECIES_NIDORAN_M, - .moves = {MOVE_DOUBLE_KICK MOVE_POISON_STING MOVE_DISABLE MOVE_HELPING_HAND}, + .moves = {MOVE_DOUBLE_KICK, MOVE_POISON_STING, MOVE_DISABLE, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [47] = { .species = SPECIES_NIDORAN_F, - .moves = {MOVE_CRUNCH MOVE_DOUBLE_KICK MOVE_FLATTER MOVE_HELPING_HAND}, + .moves = {MOVE_CRUNCH, MOVE_DOUBLE_KICK, MOVE_FLATTER, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [48] = { .species = SPECIES_KIRLIA, - .moves = {MOVE_CONFUSION MOVE_WILL_O_WISP MOVE_FUTURE_SIGHT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_CONFUSION, MOVE_WILL_O_WISP, MOVE_FUTURE_SIGHT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [49] = { .species = SPECIES_MAREEP, - .moves = {MOVE_SHOCK_WAVE MOVE_FLASH MOVE_REFLECT MOVE_COTTON_SPORE}, + .moves = {MOVE_SHOCK_WAVE, MOVE_FLASH, MOVE_REFLECT, MOVE_COTTON_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [50] = { .species = SPECIES_MEDITITE, - .moves = {MOVE_HI_JUMP_KICK MOVE_MEDITATE MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [51] = { .species = SPECIES_SLAKOTH, - .moves = {MOVE_YAWN MOVE_SCRATCH MOVE_ENCORE MOVE_COUNTER}, + .moves = {MOVE_YAWN, MOVE_SCRATCH, MOVE_ENCORE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [52] = { .species = SPECIES_PARAS, - .moves = {MOVE_SPORE MOVE_LEECH_LIFE MOVE_SLASH MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SPORE, MOVE_LEECH_LIFE, MOVE_SLASH, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [53] = { .species = SPECIES_EKANS, - .moves = {MOVE_ACID MOVE_DIG MOVE_SCREECH MOVE_TORMENT}, + .moves = {MOVE_ACID, MOVE_DIG, MOVE_SCREECH, MOVE_TORMENT}, .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [54] = { .species = SPECIES_DITTO, - .moves = {MOVE_TRANSFORM MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_TRANSFORM, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_METAL_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [55] = { .species = SPECIES_BARBOACH, - .moves = {MOVE_MAGNITUDE MOVE_WATER_PULSE MOVE_SPARK MOVE_FUTURE_SIGHT}, + .moves = {MOVE_MAGNITUDE, MOVE_WATER_PULSE, MOVE_SPARK, MOVE_FUTURE_SIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_BASHFUL }, [56] = { .species = SPECIES_MEOWTH, - .moves = {MOVE_SLASH MOVE_BITE MOVE_SCREECH MOVE_FAKE_OUT}, + .moves = {MOVE_SLASH, MOVE_BITE, MOVE_SCREECH, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [57] = { .species = SPECIES_PINECO, - .moves = {MOVE_SELF_DESTRUCT MOVE_TAKE_DOWN MOVE_REFLECT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SELF_DESTRUCT, MOVE_TAKE_DOWN, MOVE_REFLECT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [58] = { .species = SPECIES_TRAPINCH, - .moves = {MOVE_TOXIC MOVE_DIG MOVE_SANDSTORM MOVE_SAND_ATTACK}, + .moves = {MOVE_TOXIC, MOVE_DIG, MOVE_SANDSTORM, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SERIOUS }, [59] = { .species = SPECIES_SPHEAL, - .moves = {MOVE_ICE_BALL MOVE_WATER_PULSE MOVE_HAIL MOVE_MUD_SLAP}, + .moves = {MOVE_ICE_BALL, MOVE_WATER_PULSE, MOVE_HAIL, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [60] = { .species = SPECIES_HORSEA, - .moves = {MOVE_WATER_GUN MOVE_AGILITY MOVE_ICY_WIND MOVE_TWISTER}, + .moves = {MOVE_WATER_GUN, MOVE_AGILITY, MOVE_ICY_WIND, MOVE_TWISTER}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [61] = { .species = SPECIES_SHROOMISH, - .moves = {MOVE_SPORE MOVE_BULLET_SEED MOVE_LEECH_SEED MOVE_HEADBUTT}, + .moves = {MOVE_SPORE, MOVE_BULLET_SEED, MOVE_LEECH_SEED, MOVE_HEADBUTT}, .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [62] = { .species = SPECIES_SHUPPET, - .moves = {MOVE_WILL_O_WISP MOVE_NIGHT_SHADE MOVE_GRUDGE MOVE_KNOCK_OFF}, + .moves = {MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_GRUDGE, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RASH }, [63] = { .species = SPECIES_DUSKULL, - .moves = {MOVE_SKILL_SWAP MOVE_NIGHT_SHADE MOVE_DISABLE MOVE_CONFUSE_RAY}, + .moves = {MOVE_SKILL_SWAP, MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [64] = { .species = SPECIES_ELECTRIKE, - .moves = {MOVE_SPARK MOVE_THUNDER_WAVE MOVE_ROAR MOVE_QUICK_ATTACK}, + .moves = {MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [65] = { .species = SPECIES_VULPIX, - .moves = {MOVE_WILL_O_WISP MOVE_CONFUSE_RAY MOVE_FIRE_SPIN MOVE_QUICK_ATTACK}, + .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [66] = { .species = SPECIES_PIKACHU, - .moves = {MOVE_THUNDER_PUNCH MOVE_THUNDER_WAVE MOVE_DOUBLE_TEAM MOVE_QUICK_ATTACK}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_THUNDER_WAVE, MOVE_DOUBLE_TEAM, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LIGHT_BALL, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [67] = { .species = SPECIES_SANDSHREW, - .moves = {MOVE_DIG MOVE_ROCK_TOMB MOVE_SANDSTORM MOVE_SAND_ATTACK}, + .moves = {MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [68] = { .species = SPECIES_POLIWAG, - .moves = {MOVE_HYPNOSIS MOVE_ICY_WIND MOVE_WATER_GUN MOVE_RAIN_DANCE}, + .moves = {MOVE_HYPNOSIS, MOVE_ICY_WIND, MOVE_WATER_GUN, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [69] = { .species = SPECIES_BELLSPROUT, - .moves = {MOVE_RAZOR_LEAF MOVE_ACID MOVE_STUN_SPORE MOVE_WRAP}, + .moves = {MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_STUN_SPORE, MOVE_WRAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_LAX }, [70] = { .species = SPECIES_GEODUDE, - .moves = {MOVE_MAGNITUDE MOVE_ROCK_BLAST MOVE_STRENGTH MOVE_PROTECT}, + .moves = {MOVE_MAGNITUDE, MOVE_ROCK_BLAST, MOVE_STRENGTH, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [71] = { .species = SPECIES_DRATINI, - .moves = {MOVE_OUTRAGE MOVE_THUNDER_WAVE MOVE_SUPERSONIC MOVE_WATER_PULSE}, + .moves = {MOVE_OUTRAGE, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_WATER_PULSE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [72] = { .species = SPECIES_SNUBBULL, - .moves = {MOVE_BITE MOVE_CHARM MOVE_SWAGGER MOVE_SCARY_FACE}, + .moves = {MOVE_BITE, MOVE_CHARM, MOVE_SWAGGER, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [73] = { .species = SPECIES_REMORAID, - .moves = {MOVE_BUBBLE_BEAM MOVE_AURORA_BEAM MOVE_PSYBEAM MOVE_PROTECT}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [74] = { .species = SPECIES_LARVITAR, - .moves = {MOVE_THRASH MOVE_ROCK_SLIDE MOVE_DIG MOVE_DRAGON_DANCE}, + .moves = {MOVE_THRASH, MOVE_ROCK_SLIDE, MOVE_DIG, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [75] = { .species = SPECIES_BALTOY, - .moves = {MOVE_PSYBEAM MOVE_ANCIENT_POWER MOVE_LIGHT_SCREEN MOVE_MUD_SLAP}, + .moves = {MOVE_PSYBEAM, MOVE_ANCIENT_POWER, MOVE_LIGHT_SCREEN, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_NAUGHTY }, [76] = { .species = SPECIES_SNORUNT, - .moves = {MOVE_ICY_WIND MOVE_HEADBUTT MOVE_LEER MOVE_BITE}, + .moves = {MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_LEER, MOVE_BITE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [77] = { .species = SPECIES_BAGON, - .moves = {MOVE_DRAGON_BREATH MOVE_HEADBUTT MOVE_BRICK_BREAK MOVE_SCARY_FACE}, + .moves = {MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [78] = { .species = SPECIES_BELDUM, - .moves = {MOVE_TAKE_DOWN MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [79] = { .species = SPECIES_GULPIN, - .moves = {MOVE_TOXIC MOVE_YAWN MOVE_PAIN_SPLIT MOVE_ATTRACT}, + .moves = {MOVE_TOXIC, MOVE_YAWN, MOVE_PAIN_SPLIT, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SERIOUS }, [80] = { .species = SPECIES_VENONAT, - .moves = {MOVE_PSYBEAM MOVE_SUPERSONIC MOVE_STUN_SPORE MOVE_SKILL_SWAP}, + .moves = {MOVE_PSYBEAM, MOVE_SUPERSONIC, MOVE_STUN_SPORE, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [81] = { .species = SPECIES_MANKEY, - .moves = {MOVE_KARATE_CHOP MOVE_LOW_KICK MOVE_SCREECH MOVE_SWAGGER}, + .moves = {MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SCREECH, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [82] = { .species = SPECIES_MACHOP, - .moves = {MOVE_SEISMIC_TOSS MOVE_REVENGE MOVE_ROCK_TOMB MOVE_SCARY_FACE}, + .moves = {MOVE_SEISMIC_TOSS, MOVE_REVENGE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [83] = { .species = SPECIES_SHELLDER, - .moves = {MOVE_ICICLE_SPEAR MOVE_SUPERSONIC MOVE_CLAMP MOVE_WITHDRAW}, + .moves = {MOVE_ICICLE_SPEAR, MOVE_SUPERSONIC, MOVE_CLAMP, MOVE_WITHDRAW}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [84] = { .species = SPECIES_SMOOCHUM, - .moves = {MOVE_SWEET_KISS MOVE_SING MOVE_MUD_SLAP MOVE_FAKE_OUT}, + .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_MUD_SLAP, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [85] = { .species = SPECIES_NUMEL, - .moves = {MOVE_EMBER MOVE_MAGNITUDE MOVE_ROCK_TOMB MOVE_SANDSTORM}, + .moves = {MOVE_EMBER, MOVE_MAGNITUDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [86] = { .species = SPECIES_CARVANHA, - .moves = {MOVE_BITE MOVE_SCREECH MOVE_SCARY_FACE MOVE_SWAGGER}, + .moves = {MOVE_BITE, MOVE_SCREECH, MOVE_SCARY_FACE, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [87] = { .species = SPECIES_CORPHISH, - .moves = {MOVE_CRABHAMMER MOVE_WATER_PULSE MOVE_MUD_SLAP MOVE_PROTECT}, + .moves = {MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [88] = { .species = SPECIES_CHARMANDER, - .moves = {MOVE_FIRE_SPIN MOVE_METAL_CLAW MOVE_SMOKESCREEN MOVE_SCARY_FACE}, + .moves = {MOVE_FIRE_SPIN, MOVE_METAL_CLAW, MOVE_SMOKESCREEN, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [89] = { .species = SPECIES_CYNDAQUIL, - .moves = {MOVE_EMBER MOVE_SWIFT MOVE_QUICK_ATTACK MOVE_SMOKESCREEN}, + .moves = {MOVE_EMBER, MOVE_SWIFT, MOVE_QUICK_ATTACK, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [90] = { .species = SPECIES_ABRA, - .moves = {MOVE_MIMIC MOVE_METRONOME MOVE_FLASH MOVE_SEISMIC_TOSS}, + .moves = {MOVE_MIMIC, MOVE_METRONOME, MOVE_FLASH, MOVE_SEISMIC_TOSS}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [91] = { .species = SPECIES_DODUO, - .moves = {MOVE_FURY_ATTACK MOVE_UPROAR MOVE_MUD_SLAP MOVE_FAINT_ATTACK}, + .moves = {MOVE_FURY_ATTACK, MOVE_UPROAR, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [92] = { .species = SPECIES_GASTLY, - .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_NIGHT_SHADE MOVE_CONFUSE_RAY}, + .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_NIGHT_SHADE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [93] = { .species = SPECIES_SWABLU, - .moves = {MOVE_TAKE_DOWN MOVE_DREAM_EATER MOVE_SING MOVE_ATTRACT}, + .moves = {MOVE_TAKE_DOWN, MOVE_DREAM_EATER, MOVE_SING, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [94] = { .species = SPECIES_TREECKO, - .moves = {MOVE_BULLET_SEED MOVE_AERIAL_ACE MOVE_QUICK_ATTACK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_BULLET_SEED, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_LONELY }, [95] = { .species = SPECIES_TORCHIC, - .moves = {MOVE_FIRE_SPIN MOVE_QUICK_ATTACK MOVE_SAND_ATTACK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [96] = { .species = SPECIES_MUDKIP, - .moves = {MOVE_WHIRLPOOL MOVE_ENDEAVOR MOVE_MUD_SPORT MOVE_MUD_SLAP}, + .moves = {MOVE_WHIRLPOOL, MOVE_ENDEAVOR, MOVE_MUD_SPORT, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [97] = { .species = SPECIES_SQUIRTLE, - .moves = {MOVE_WATER_PULSE MOVE_BITE MOVE_WITHDRAW MOVE_PROTECT}, + .moves = {MOVE_WATER_PULSE, MOVE_BITE, MOVE_WITHDRAW, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [98] = { .species = SPECIES_TOTODILE, - .moves = {MOVE_SLASH MOVE_WATER_PULSE MOVE_SCREECH MOVE_ICY_WIND}, + .moves = {MOVE_SLASH, MOVE_WATER_PULSE, MOVE_SCREECH, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [99] = { .species = SPECIES_SLOWPOKE, - .moves = {MOVE_CONFUSION MOVE_DISABLE MOVE_WATER_PULSE MOVE_YAWN}, + .moves = {MOVE_CONFUSION, MOVE_DISABLE, MOVE_WATER_PULSE, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [100] = { .species = SPECIES_BULBASAUR, - .moves = {MOVE_RAZOR_LEAF MOVE_SWEET_SCENT MOVE_SLEEP_POWDER MOVE_LIGHT_SCREEN}, + .moves = {MOVE_RAZOR_LEAF, MOVE_SWEET_SCENT, MOVE_SLEEP_POWDER, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [101] = { .species = SPECIES_CHIKORITA, - .moves = {MOVE_SECRET_POWER MOVE_BULLET_SEED MOVE_MUD_SLAP MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SECRET_POWER, MOVE_BULLET_SEED, MOVE_MUD_SLAP, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [102] = { .species = SPECIES_ODDISH, - .moves = {MOVE_ACID MOVE_STUN_SPORE MOVE_SWEET_SCENT MOVE_MOONLIGHT}, + .moves = {MOVE_ACID, MOVE_STUN_SPORE, MOVE_SWEET_SCENT, MOVE_MOONLIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [103] = { .species = SPECIES_PSYDUCK, - .moves = {MOVE_CONFUSION MOVE_FURY_SWIPES MOVE_AERIAL_ACE MOVE_DISABLE}, + .moves = {MOVE_CONFUSION, MOVE_FURY_SWIPES, MOVE_AERIAL_ACE, MOVE_DISABLE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HASTY }, [104] = { .species = SPECIES_CUBONE, - .moves = {MOVE_BONE_CLUB MOVE_HEADBUTT MOVE_BRICK_BREAK MOVE_AERIAL_ACE}, + .moves = {MOVE_BONE_CLUB, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [105] = { .species = SPECIES_GOLDEEN, - .moves = {MOVE_WATERFALL MOVE_FURY_ATTACK MOVE_AGILITY MOVE_PSYBEAM}, + .moves = {MOVE_WATERFALL, MOVE_FURY_ATTACK, MOVE_AGILITY, MOVE_PSYBEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [106] = { .species = SPECIES_NATU, - .moves = {MOVE_NIGHT_SHADE MOVE_FUTURE_SIGHT MOVE_CONFUSE_RAY MOVE_FLASH}, + .moves = {MOVE_NIGHT_SHADE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_FLASH}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [107] = { .species = SPECIES_CLEFAIRY, - .moves = {MOVE_FOLLOW_ME MOVE_RETURN MOVE_ENCORE MOVE_SING}, + .moves = {MOVE_FOLLOW_ME, MOVE_RETURN, MOVE_ENCORE, MOVE_SING}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [108] = { .species = SPECIES_MAGNEMITE, - .moves = {MOVE_SHOCK_WAVE MOVE_SUPERSONIC MOVE_METAL_SOUND MOVE_REFLECT}, + .moves = {MOVE_SHOCK_WAVE, MOVE_SUPERSONIC, MOVE_METAL_SOUND, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_GENTLE }, [109] = { .species = SPECIES_SEEL, - .moves = {MOVE_AURORA_BEAM MOVE_DIVE MOVE_BODY_SLAM MOVE_FAKE_OUT}, + .moves = {MOVE_AURORA_BEAM, MOVE_DIVE, MOVE_BODY_SLAM, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [110] = { .species = SPECIES_GRIMER, - .moves = {MOVE_SLUDGE MOVE_ROCK_TOMB MOVE_ACID_ARMOR MOVE_MINIMIZE}, + .moves = {MOVE_SLUDGE, MOVE_ROCK_TOMB, MOVE_ACID_ARMOR, MOVE_MINIMIZE}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [111] = { .species = SPECIES_KRABBY, - .moves = {MOVE_CRABHAMMER MOVE_MUD_SHOT MOVE_FLAIL MOVE_KNOCK_OFF}, + .moves = {MOVE_CRABHAMMER, MOVE_MUD_SHOT, MOVE_FLAIL, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [112] = { .species = SPECIES_EXEGGCUTE, - .moves = {MOVE_CONFUSION MOVE_ANCIENT_POWER MOVE_LEECH_SEED MOVE_LIGHT_SCREEN}, + .moves = {MOVE_CONFUSION, MOVE_ANCIENT_POWER, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [113] = { .species = SPECIES_EEVEE, - .moves = {MOVE_CHARM MOVE_ATTRACT MOVE_FLAIL MOVE_ENDURE}, + .moves = {MOVE_CHARM, MOVE_ATTRACT, MOVE_FLAIL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [114] = { .species = SPECIES_DROWZEE, - .moves = {MOVE_CONFUSION MOVE_HEADBUTT MOVE_DISABLE MOVE_BARRIER}, + .moves = {MOVE_CONFUSION, MOVE_HEADBUTT, MOVE_DISABLE, MOVE_BARRIER}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [115] = { .species = SPECIES_VOLTORB, - .moves = {MOVE_SPARK MOVE_SCREECH MOVE_ROLLOUT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SPARK, MOVE_SCREECH, MOVE_ROLLOUT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [116] = { .species = SPECIES_CHINCHOU, - .moves = {MOVE_SPARK MOVE_DIVE MOVE_CONFUSE_RAY MOVE_TAKE_DOWN}, + .moves = {MOVE_SPARK, MOVE_DIVE, MOVE_CONFUSE_RAY, MOVE_TAKE_DOWN}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [117] = { .species = SPECIES_TEDDIURSA, - .moves = {MOVE_SECRET_POWER MOVE_FAKE_TEARS MOVE_FAINT_ATTACK MOVE_REST}, + .moves = {MOVE_SECRET_POWER, MOVE_FAKE_TEARS, MOVE_FAINT_ATTACK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [118] = { .species = SPECIES_DELIBIRD, - .moves = {MOVE_PRESENT MOVE_ICE_BALL MOVE_AERIAL_ACE MOVE_HAIL}, + .moves = {MOVE_PRESENT, MOVE_ICE_BALL, MOVE_AERIAL_ACE, MOVE_HAIL}, .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [119] = { .species = SPECIES_HOUNDOUR, - .moves = {MOVE_CRUNCH MOVE_EMBER MOVE_ROAR MOVE_PROTECT}, + .moves = {MOVE_CRUNCH, MOVE_EMBER, MOVE_ROAR, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [120] = { .species = SPECIES_PHANPY, - .moves = {MOVE_ROLLOUT MOVE_DEFENSE_CURL MOVE_ROCK_TOMB MOVE_SANDSTORM}, + .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_ROCK_TOMB, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [121] = { .species = SPECIES_SPOINK, - .moves = {MOVE_PSYWAVE MOVE_BOUNCE MOVE_MAGIC_COAT MOVE_CONFUSE_RAY}, + .moves = {MOVE_PSYWAVE, MOVE_BOUNCE, MOVE_MAGIC_COAT, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [122] = { .species = SPECIES_ARON, - .moves = {MOVE_METAL_CLAW MOVE_AERIAL_ACE MOVE_METAL_SOUND MOVE_ROAR}, + .moves = {MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_METAL_SOUND, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [123] = { .species = SPECIES_LUVDISC, - .moves = {MOVE_SWEET_KISS MOVE_ATTRACT MOVE_DIVE MOVE_RAIN_DANCE}, + .moves = {MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_DIVE, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [124] = { .species = SPECIES_TENTACOOL, - .moves = {MOVE_BUBBLE_BEAM MOVE_ACID MOVE_BARRIER MOVE_WRAP}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER, MOVE_WRAP}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [125] = { .species = SPECIES_CACNEA, - .moves = {MOVE_NEEDLE_ARM MOVE_FAINT_ATTACK MOVE_COTTON_SPORE MOVE_SAND_ATTACK}, + .moves = {MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_COTTON_SPORE, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [126] = { .species = SPECIES_UNOWN, - .moves = {MOVE_HIDDEN_POWER MOVE_NONE MOVE_NONE MOVE_NONE}, + .moves = {MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [127] = { .species = SPECIES_KOFFING, - .moves = {MOVE_SLUDGE MOVE_SMOKESCREEN MOVE_TORMENT MOVE_HAZE}, + .moves = {MOVE_SLUDGE, MOVE_SMOKESCREEN, MOVE_TORMENT, MOVE_HAZE}, .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [128] = { .species = SPECIES_STARYU, - .moves = {MOVE_BUBBLE_BEAM MOVE_MINIMIZE MOVE_SWIFT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_MINIMIZE, MOVE_SWIFT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [129] = { .species = SPECIES_SKIPLOOM, - .moves = {MOVE_MEGA_DRAIN MOVE_CONFUSION MOVE_COTTON_SPORE MOVE_SYNTHESIS}, + .moves = {MOVE_MEGA_DRAIN, MOVE_CONFUSION, MOVE_COTTON_SPORE, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [130] = { .species = SPECIES_NUZLEAF, - .moves = {MOVE_EXTRASENSORY MOVE_FAKE_OUT MOVE_RAZOR_WIND MOVE_FAINT_ATTACK}, + .moves = {MOVE_EXTRASENSORY, MOVE_FAKE_OUT, MOVE_RAZOR_WIND, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [131] = { .species = SPECIES_LOMBRE, - .moves = {MOVE_WATER_PULSE MOVE_FAKE_OUT MOVE_BRICK_BREAK MOVE_ABSORB}, + .moves = {MOVE_WATER_PULSE, MOVE_FAKE_OUT, MOVE_BRICK_BREAK, MOVE_ABSORB}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [132] = { .species = SPECIES_VIBRAVA, - .moves = {MOVE_DRAGON_BREATH MOVE_DIG MOVE_SCREECH MOVE_ROCK_TOMB}, + .moves = {MOVE_DRAGON_BREATH, MOVE_DIG, MOVE_SCREECH, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [133] = { .species = SPECIES_RHYHORN, - .moves = {MOVE_ROCK_BLAST MOVE_DIG MOVE_SCARY_FACE MOVE_ROAR}, + .moves = {MOVE_ROCK_BLAST, MOVE_DIG, MOVE_SCARY_FACE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [134] = { .species = SPECIES_CLAMPERL, - .moves = {MOVE_DIVE MOVE_TOXIC MOVE_IRON_DEFENSE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_DIVE, MOVE_TOXIC, MOVE_IRON_DEFENSE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [135] = { .species = SPECIES_PIDGEOTTO, - .moves = {MOVE_AERIAL_ACE MOVE_QUICK_ATTACK MOVE_FEATHER_DANCE MOVE_SAND_ATTACK}, + .moves = {MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_FEATHER_DANCE, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [136] = { .species = SPECIES_GROWLITHE, - .moves = {MOVE_FLAME_WHEEL MOVE_BITE MOVE_ROAR MOVE_AGILITY}, + .moves = {MOVE_FLAME_WHEEL, MOVE_BITE, MOVE_ROAR, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [137] = { .species = SPECIES_FARFETCHD, - .moves = {MOVE_SLASH MOVE_KNOCK_OFF MOVE_SWORDS_DANCE MOVE_AGILITY}, + .moves = {MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_STICK, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [138] = { .species = SPECIES_OMANYTE, - .moves = {MOVE_MUD_SHOT MOVE_WATER_GUN MOVE_ANCIENT_POWER MOVE_TICKLE}, + .moves = {MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ANCIENT_POWER, MOVE_TICKLE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [139] = { .species = SPECIES_KABUTO, - .moves = {MOVE_MEGA_DRAIN MOVE_ANCIENT_POWER MOVE_SAND_ATTACK MOVE_PROTECT}, + .moves = {MOVE_MEGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_SAND_ATTACK, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [140] = { .species = SPECIES_LILEEP, - .moves = {MOVE_ANCIENT_POWER MOVE_ACID MOVE_INGRAIN MOVE_CONFUSE_RAY}, + .moves = {MOVE_ANCIENT_POWER, MOVE_ACID, MOVE_INGRAIN, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [141] = { .species = SPECIES_ANORITH, - .moves = {MOVE_METAL_CLAW MOVE_FURY_CUTTER MOVE_ANCIENT_POWER MOVE_WATER_GUN}, + .moves = {MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_ANCIENT_POWER, MOVE_WATER_GUN}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [142] = { .species = SPECIES_AIPOM, - .moves = {MOVE_FURY_SWIPES MOVE_SAND_ATTACK MOVE_BATON_PASS MOVE_AGILITY}, + .moves = {MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_BATON_PASS, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [143] = { .species = SPECIES_ELEKID, - .moves = {MOVE_THUNDER_PUNCH MOVE_QUICK_ATTACK MOVE_SWIFT MOVE_LIGHT_SCREEN}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_QUICK_ATTACK, MOVE_SWIFT, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAIVE }, [144] = { .species = SPECIES_LOUDRED, - .moves = {MOVE_STOMP MOVE_HOWL MOVE_ASTONISH MOVE_SUPERSONIC}, + .moves = {MOVE_STOMP, MOVE_HOWL, MOVE_ASTONISH, MOVE_SUPERSONIC}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [145] = { .species = SPECIES_SPINDA, - .moves = {MOVE_DIZZY_PUNCH MOVE_TEETER_DANCE MOVE_PSYBEAM MOVE_FAINT_ATTACK}, + .moves = {MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [146] = { .species = SPECIES_NIDORINA, - .moves = {MOVE_DOUBLE_KICK MOVE_BITE MOVE_AERIAL_ACE MOVE_FLATTER}, + .moves = {MOVE_DOUBLE_KICK, MOVE_BITE, MOVE_AERIAL_ACE, MOVE_FLATTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [147] = { .species = SPECIES_NIDORINO, - .moves = {MOVE_DOUBLE_KICK MOVE_WATER_PULSE MOVE_MUD_SLAP MOVE_FLATTER}, + .moves = {MOVE_DOUBLE_KICK, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_FLATTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [148] = { .species = SPECIES_FLAAFFY, - .moves = {MOVE_SHOCK_WAVE MOVE_THUNDER_WAVE MOVE_COTTON_SPORE MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_COTTON_SPORE, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MILD }, [149] = { .species = SPECIES_MAGBY, - .moves = {MOVE_FIRE_PUNCH MOVE_SMOKESCREEN MOVE_CONFUSE_RAY MOVE_SMOG}, + .moves = {MOVE_FIRE_PUNCH, MOVE_SMOKESCREEN, MOVE_CONFUSE_RAY, MOVE_SMOG}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [150] = { .species = SPECIES_NOSEPASS, - .moves = {MOVE_ROCK_SLIDE MOVE_SHOCK_WAVE MOVE_THUNDER_WAVE MOVE_SANDSTORM}, + .moves = {MOVE_ROCK_SLIDE, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [151] = { .species = SPECIES_CORSOLA, - .moves = {MOVE_BUBBLE_BEAM MOVE_MIRROR_COAT MOVE_ATTRACT MOVE_ANCIENT_POWER}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_MIRROR_COAT, MOVE_ATTRACT, MOVE_ANCIENT_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [152] = { .species = SPECIES_MAWILE, - .moves = {MOVE_CRUNCH MOVE_FAKE_TEARS MOVE_IRON_DEFENSE MOVE_BATON_PASS}, + .moves = {MOVE_CRUNCH, MOVE_FAKE_TEARS, MOVE_IRON_DEFENSE, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [153] = { .species = SPECIES_BUTTERFREE, - .moves = {MOVE_SILVER_WIND MOVE_PSYBEAM MOVE_TOXIC MOVE_WHIRLWIND}, + .moves = {MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_WHIRLWIND}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [154] = { .species = SPECIES_BEEDRILL, - .moves = {MOVE_TWINEEDLE MOVE_PURSUIT MOVE_ENDEAVOR MOVE_AGILITY}, + .moves = {MOVE_TWINEEDLE, MOVE_PURSUIT, MOVE_ENDEAVOR, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_NAUGHTY }, [155] = { .species = SPECIES_POLIWHIRL, - .moves = {MOVE_WATER_PULSE MOVE_DOUBLE_SLAP MOVE_ICY_WIND MOVE_RAIN_DANCE}, + .moves = {MOVE_WATER_PULSE, MOVE_DOUBLE_SLAP, MOVE_ICY_WIND, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [156] = { .species = SPECIES_ONIX, - .moves = {MOVE_ROCK_SLIDE MOVE_BIND MOVE_DRAGON_BREATH MOVE_SANDSTORM}, + .moves = {MOVE_ROCK_SLIDE, MOVE_BIND, MOVE_DRAGON_BREATH, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [157] = { .species = SPECIES_BEAUTIFLY, - .moves = {MOVE_SILVER_WIND MOVE_MEGA_DRAIN MOVE_ATTRACT MOVE_WHIRLWIND}, + .moves = {MOVE_SILVER_WIND, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_WHIRLWIND}, .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [158] = { .species = SPECIES_DUSTOX, - .moves = {MOVE_SILVER_WIND MOVE_TOXIC MOVE_PSYBEAM MOVE_WHIRLWIND}, + .moves = {MOVE_SILVER_WIND, MOVE_TOXIC, MOVE_PSYBEAM, MOVE_WHIRLWIND}, .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [159] = { .species = SPECIES_LEDIAN, - .moves = {MOVE_COMET_PUNCH MOVE_BATON_PASS MOVE_SWORDS_DANCE MOVE_AGILITY}, + .moves = {MOVE_COMET_PUNCH, MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_BASHFUL }, [160] = { .species = SPECIES_ARIADOS, - .moves = {MOVE_SIGNAL_BEAM MOVE_SPIDER_WEB MOVE_NIGHT_SHADE MOVE_TOXIC}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_SPIDER_WEB, MOVE_NIGHT_SHADE, MOVE_TOXIC}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SERIOUS }, [161] = { .species = SPECIES_YANMA, - .moves = {MOVE_SIGNAL_BEAM MOVE_AERIAL_ACE MOVE_DOUBLE_TEAM MOVE_DETECT}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_DETECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [162] = { .species = SPECIES_DELCATTY, - .moves = {MOVE_SECRET_POWER MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM MOVE_HEAL_BELL}, + .moves = {MOVE_SECRET_POWER, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_HEAL_BELL}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [163] = { .species = SPECIES_SABLEYE, - .moves = {MOVE_FAINT_ATTACK MOVE_CONFUSE_RAY MOVE_KNOCK_OFF MOVE_FAKE_OUT}, + .moves = {MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_KNOCK_OFF, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [164] = { .species = SPECIES_LICKITUNG, - .moves = {MOVE_SLAM MOVE_BRICK_BREAK MOVE_LICK MOVE_MUD_SLAP}, + .moves = {MOVE_SLAM, MOVE_BRICK_BREAK, MOVE_LICK, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [165] = { .species = SPECIES_WEEPINBELL, - .moves = {MOVE_RAZOR_LEAF MOVE_ACID MOVE_WRAP MOVE_SWEET_SCENT}, + .moves = {MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_WRAP, MOVE_SWEET_SCENT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [166] = { .species = SPECIES_GRAVELER, - .moves = {MOVE_MAGNITUDE MOVE_ROCK_THROW MOVE_DEFENSE_CURL MOVE_BRICK_BREAK}, + .moves = {MOVE_MAGNITUDE, MOVE_ROCK_THROW, MOVE_DEFENSE_CURL, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [167] = { .species = SPECIES_GLOOM, - .moves = {MOVE_PETAL_DANCE MOVE_ACID MOVE_STUN_SPORE MOVE_MOONLIGHT}, + .moves = {MOVE_PETAL_DANCE, MOVE_ACID, MOVE_STUN_SPORE, MOVE_MOONLIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [168] = { .species = SPECIES_PORYGON, - .moves = {MOVE_PSYBEAM MOVE_ICY_WIND MOVE_RECYCLE MOVE_AGILITY}, + .moves = {MOVE_PSYBEAM, MOVE_ICY_WIND, MOVE_RECYCLE, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [169] = { .species = SPECIES_KADABRA, - .moves = {MOVE_CONFUSION MOVE_ROLE_PLAY MOVE_FUTURE_SIGHT MOVE_DISABLE}, + .moves = {MOVE_CONFUSION, MOVE_ROLE_PLAY, MOVE_FUTURE_SIGHT, MOVE_DISABLE}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [170] = { .species = SPECIES_WAILMER, - .moves = {MOVE_WHIRLPOOL MOVE_ROAR MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .moves = {MOVE_WHIRLPOOL, MOVE_ROAR, MOVE_DEFENSE_CURL, MOVE_ROLLOUT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [171] = { .species = SPECIES_ROSELIA, - .moves = {MOVE_MAGICAL_LEAF MOVE_TOXIC MOVE_GRASS_WHISTLE MOVE_COTTON_SPORE}, + .moves = {MOVE_MAGICAL_LEAF, MOVE_TOXIC, MOVE_GRASS_WHISTLE, MOVE_COTTON_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [172] = { .species = SPECIES_VOLBEAT, - .moves = {MOVE_SILVER_WIND MOVE_CONFUSE_RAY MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .moves = {MOVE_SILVER_WIND, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [173] = { .species = SPECIES_ILLUMISE, - .moves = {MOVE_SILVER_WIND MOVE_WISH MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .moves = {MOVE_SILVER_WIND, MOVE_WISH, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [174] = { .species = SPECIES_IVYSAUR, - .moves = {MOVE_PETAL_DANCE MOVE_GROWTH MOVE_SWEET_SCENT MOVE_FURY_CUTTER}, + .moves = {MOVE_PETAL_DANCE, MOVE_GROWTH, MOVE_SWEET_SCENT, MOVE_FURY_CUTTER}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [175] = { .species = SPECIES_CHARMELEON, - .moves = {MOVE_SLASH MOVE_FIRE_SPIN MOVE_SWORDS_DANCE MOVE_AERIAL_ACE}, + .moves = {MOVE_SLASH, MOVE_FIRE_SPIN, MOVE_SWORDS_DANCE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [176] = { .species = SPECIES_WARTORTLE, - .moves = {MOVE_WATER_PULSE MOVE_BITE MOVE_MUD_SLAP MOVE_YAWN}, + .moves = {MOVE_WATER_PULSE, MOVE_BITE, MOVE_MUD_SLAP, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [177] = { .species = SPECIES_PARASECT, - .moves = {MOVE_SLASH MOVE_PSYBEAM MOVE_STUN_SPORE MOVE_FLASH}, + .moves = {MOVE_SLASH, MOVE_PSYBEAM, MOVE_STUN_SPORE, MOVE_FLASH}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RASH }, [178] = { .species = SPECIES_MACHOKE, - .moves = {MOVE_LOW_KICK MOVE_ROCK_TOMB MOVE_FORESIGHT MOVE_SCARY_FACE}, + .moves = {MOVE_LOW_KICK, MOVE_ROCK_TOMB, MOVE_FORESIGHT, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [179] = { .species = SPECIES_HAUNTER, - .moves = {MOVE_SHADOW_PUNCH MOVE_CONFUSE_RAY MOVE_SPITE MOVE_GRUDGE}, + .moves = {MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_SPITE, MOVE_GRUDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RASH }, [180] = { .species = SPECIES_BAYLEEF, - .moves = {MOVE_RAZOR_LEAF MOVE_TOXIC MOVE_SAFEGUARD MOVE_LIGHT_SCREEN}, + .moves = {MOVE_RAZOR_LEAF, MOVE_TOXIC, MOVE_SAFEGUARD, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [181] = { .species = SPECIES_QUILAVA, - .moves = {MOVE_FLAME_WHEEL MOVE_FURY_SWIPES MOVE_SWIFT MOVE_SMOKESCREEN}, + .moves = {MOVE_FLAME_WHEEL, MOVE_FURY_SWIPES, MOVE_SWIFT, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [182] = { .species = SPECIES_CROCONAW, - .moves = {MOVE_SLASH MOVE_WATER_PULSE MOVE_BITE MOVE_SCARY_FACE}, + .moves = {MOVE_SLASH, MOVE_WATER_PULSE, MOVE_BITE, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [183] = { .species = SPECIES_TOGETIC, - .moves = {MOVE_AERIAL_ACE MOVE_MAGICAL_LEAF MOVE_WISH MOVE_FOLLOW_ME}, + .moves = {MOVE_AERIAL_ACE, MOVE_MAGICAL_LEAF, MOVE_WISH, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [184] = { .species = SPECIES_MURKROW, - .moves = {MOVE_FAINT_ATTACK MOVE_FLY MOVE_TORMENT MOVE_TAUNT}, + .moves = {MOVE_FAINT_ATTACK, MOVE_FLY, MOVE_TORMENT, MOVE_TAUNT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [185] = { .species = SPECIES_WOBBUFFET, - .moves = {MOVE_COUNTER MOVE_MIRROR_COAT MOVE_CHARM MOVE_SAFEGUARD}, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM, MOVE_SAFEGUARD}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [186] = { .species = SPECIES_PLUSLE, - .moves = {MOVE_SPARK MOVE_FAKE_TEARS MOVE_QUICK_ATTACK MOVE_HELPING_HAND}, + .moves = {MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [187] = { .species = SPECIES_MINUN, - .moves = {MOVE_SPARK MOVE_CHARM MOVE_ENCORE MOVE_HELPING_HAND}, + .moves = {MOVE_SPARK, MOVE_CHARM, MOVE_ENCORE, MOVE_HELPING_HAND}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [188] = { .species = SPECIES_GROVYLE, - .moves = {MOVE_FURY_CUTTER MOVE_ENDEAVOR MOVE_BRICK_BREAK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FURY_CUTTER, MOVE_ENDEAVOR, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [189] = { .species = SPECIES_COMBUSKEN, - .moves = {MOVE_EMBER MOVE_DOUBLE_KICK MOVE_QUICK_ATTACK MOVE_SAND_ATTACK}, + .moves = {MOVE_EMBER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [190] = { .species = SPECIES_MARSHTOMP, - .moves = {MOVE_MUD_SHOT MOVE_WATER_GUN MOVE_ROCK_TOMB MOVE_MUD_SLAP}, + .moves = {MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ROCK_TOMB, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [191] = { .species = SPECIES_PONYTA, - .moves = {MOVE_FIRE_SPIN MOVE_BOUNCE MOVE_QUICK_ATTACK MOVE_TAIL_WHIP}, + .moves = {MOVE_FIRE_SPIN, MOVE_BOUNCE, MOVE_QUICK_ATTACK, MOVE_TAIL_WHIP}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [192] = { .species = SPECIES_AZUMARILL, - .moves = {MOVE_BUBBLE_BEAM MOVE_FACADE MOVE_DIG MOVE_PROTECT}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_FACADE, MOVE_DIG, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [193] = { .species = SPECIES_SUDOWOODO, - .moves = {MOVE_ROCK_SLIDE MOVE_FAINT_ATTACK MOVE_SANDSTORM MOVE_BLOCK}, + .moves = {MOVE_ROCK_SLIDE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM, MOVE_BLOCK}, .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [194] = { .species = SPECIES_MAGCARGO, - .moves = {MOVE_ROCK_SLIDE MOVE_EMBER MOVE_ACID_ARMOR MOVE_SANDSTORM}, + .moves = {MOVE_ROCK_SLIDE, MOVE_EMBER, MOVE_ACID_ARMOR, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [195] = { .species = SPECIES_PUPITAR, - .moves = {MOVE_DIG MOVE_BITE MOVE_SCARY_FACE MOVE_SANDSTORM}, + .moves = {MOVE_DIG, MOVE_BITE, MOVE_SCARY_FACE, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [196] = { .species = SPECIES_SEALEO, - .moves = {MOVE_ICE_BALL MOVE_HAIL MOVE_SNORE MOVE_REST}, + .moves = {MOVE_ICE_BALL, MOVE_HAIL, MOVE_SNORE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [197] = { .species = SPECIES_RATICATE, - .moves = {MOVE_ENDEAVOR MOVE_PURSUIT MOVE_SCARY_FACE MOVE_QUICK_ATTACK}, + .moves = {MOVE_ENDEAVOR, MOVE_PURSUIT, MOVE_SCARY_FACE, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAIVE }, [198] = { .species = SPECIES_MASQUERAIN, - .moves = {MOVE_SILVER_WIND MOVE_AERIAL_ACE MOVE_ICY_WIND MOVE_STUN_SPORE}, + .moves = {MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_ICY_WIND, MOVE_STUN_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_RELAXED }, [199] = { .species = SPECIES_FURRET, - .moves = {MOVE_SLAM MOVE_PROTECT MOVE_HELPING_HAND MOVE_FOLLOW_ME}, + .moves = {MOVE_SLAM, MOVE_PROTECT, MOVE_HELPING_HAND, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_SERIOUS }, [200] = { .species = SPECIES_DUNSPARCE, - .moves = {MOVE_HEADBUTT MOVE_GLARE MOVE_DEFENSE_CURL MOVE_ROLLOUT}, + .moves = {MOVE_HEADBUTT, MOVE_GLARE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [201] = { .species = SPECIES_DRAGONAIR, - .moves = {MOVE_DRAGON_BREATH MOVE_LEER MOVE_WRAP MOVE_SAFEGUARD}, + .moves = {MOVE_DRAGON_BREATH, MOVE_LEER, MOVE_WRAP, MOVE_SAFEGUARD}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [202] = { .species = SPECIES_MIGHTYENA, - .moves = {MOVE_BITE MOVE_POISON_FANG MOVE_TAUNT MOVE_ROAR}, + .moves = {MOVE_BITE, MOVE_POISON_FANG, MOVE_TAUNT, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_TIMID }, [203] = { .species = SPECIES_LINOONE, - .moves = {MOVE_SECRET_POWER MOVE_SAND_ATTACK MOVE_COVET MOVE_TICKLE}, + .moves = {MOVE_SECRET_POWER, MOVE_SAND_ATTACK, MOVE_COVET, MOVE_TICKLE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [204] = { .species = SPECIES_CASTFORM, - .moves = {MOVE_EMBER MOVE_WATER_PULSE MOVE_SHOCK_WAVE MOVE_ICY_WIND}, + .moves = {MOVE_EMBER, MOVE_WATER_PULSE, MOVE_SHOCK_WAVE, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HASTY }, [205] = { .species = SPECIES_SHELGON, - .moves = {MOVE_HEADBUTT MOVE_DRAGON_BREATH MOVE_PROTECT MOVE_SCARY_FACE}, + .moves = {MOVE_HEADBUTT, MOVE_DRAGON_BREATH, MOVE_PROTECT, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [206] = { .species = SPECIES_METANG, - .moves = {MOVE_METAL_CLAW MOVE_CONFUSION MOVE_PURSUIT MOVE_SCARY_FACE}, + .moves = {MOVE_METAL_CLAW, MOVE_CONFUSION, MOVE_PURSUIT, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [207] = { .species = SPECIES_WIGGLYTUFF, - .moves = {MOVE_SING MOVE_DISABLE MOVE_WISH MOVE_SECRET_POWER}, + .moves = {MOVE_SING, MOVE_DISABLE, MOVE_WISH, MOVE_SECRET_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [208] = { .species = SPECIES_SUNFLORA, - .moves = {MOVE_PETAL_DANCE MOVE_INGRAIN MOVE_LEECH_SEED MOVE_LIGHT_SCREEN}, + .moves = {MOVE_PETAL_DANCE, MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [209] = { .species = SPECIES_CHIMECHO, - .moves = {MOVE_PSYWAVE MOVE_TAKE_DOWN MOVE_HEAL_BELL MOVE_SAFEGUARD}, + .moves = {MOVE_PSYWAVE, MOVE_TAKE_DOWN, MOVE_HEAL_BELL, MOVE_SAFEGUARD}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [210] = { .species = SPECIES_GLIGAR, - .moves = {MOVE_METAL_CLAW MOVE_DIG MOVE_AERIAL_ACE MOVE_QUICK_ATTACK}, + .moves = {MOVE_METAL_CLAW, MOVE_DIG, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HASTY }, [211] = { .species = SPECIES_QWILFISH, - .moves = {MOVE_BUBBLE_BEAM MOVE_PIN_MISSILE MOVE_SPIKES MOVE_MINIMIZE}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_PIN_MISSILE, MOVE_SPIKES, MOVE_MINIMIZE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_IMPISH }, [212] = { .species = SPECIES_SNEASEL, - .moves = {MOVE_FAINT_ATTACK MOVE_FAKE_OUT MOVE_ICY_WIND MOVE_QUICK_ATTACK}, + .moves = {MOVE_FAINT_ATTACK, MOVE_FAKE_OUT, MOVE_ICY_WIND, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [213] = { .species = SPECIES_PELIPPER, - .moves = {MOVE_WATER_PULSE MOVE_AERIAL_ACE MOVE_STOCKPILE MOVE_SWALLOW}, + .moves = {MOVE_WATER_PULSE, MOVE_AERIAL_ACE, MOVE_STOCKPILE, MOVE_SWALLOW}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [214] = { .species = SPECIES_SWELLOW, - .moves = {MOVE_FLY MOVE_ENDEAVOR MOVE_FACADE MOVE_QUICK_ATTACK}, + .moves = {MOVE_FLY, MOVE_ENDEAVOR, MOVE_FACADE, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [215] = { .species = SPECIES_LAIRON, - .moves = {MOVE_METAL_CLAW MOVE_ROCK_TOMB MOVE_IRON_DEFENSE MOVE_PROTECT}, + .moves = {MOVE_METAL_CLAW, MOVE_ROCK_TOMB, MOVE_IRON_DEFENSE, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [216] = { .species = SPECIES_TANGELA, - .moves = {MOVE_MEGA_DRAIN MOVE_SLAM MOVE_TOXIC MOVE_BIND}, + .moves = {MOVE_MEGA_DRAIN, MOVE_SLAM, MOVE_TOXIC, MOVE_BIND}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [217] = { .species = SPECIES_ARBOK, - .moves = {MOVE_POISON_FANG MOVE_DIG MOVE_BITE MOVE_GLARE}, + .moves = {MOVE_POISON_FANG, MOVE_DIG, MOVE_BITE, MOVE_GLARE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [218] = { .species = SPECIES_PERSIAN, - .moves = {MOVE_FAKE_OUT MOVE_SLASH MOVE_TORMENT MOVE_SWAGGER}, + .moves = {MOVE_FAKE_OUT, MOVE_SLASH, MOVE_TORMENT, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [219] = { .species = SPECIES_SEADRA, - .moves = {MOVE_AURORA_BEAM MOVE_SMOKESCREEN MOVE_WATER_GUN MOVE_RAIN_DANCE}, + .moves = {MOVE_AURORA_BEAM, MOVE_SMOKESCREEN, MOVE_WATER_GUN, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [220] = { .species = SPECIES_KECLEON, - .moves = {MOVE_SECRET_POWER MOVE_PSYBEAM MOVE_MAGIC_COAT MOVE_SEISMIC_TOSS}, + .moves = {MOVE_SECRET_POWER, MOVE_PSYBEAM, MOVE_MAGIC_COAT, MOVE_SEISMIC_TOSS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAIVE }, [221] = { .species = SPECIES_VIGOROTH, - .moves = {MOVE_SLASH MOVE_COUNTER MOVE_ENCORE MOVE_UPROAR}, + .moves = {MOVE_SLASH, MOVE_COUNTER, MOVE_ENCORE, MOVE_UPROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_LONELY }, [222] = { .species = SPECIES_LUNATONE, - .moves = {MOVE_CONFUSION MOVE_COSMIC_POWER MOVE_LIGHT_SCREEN MOVE_SANDSTORM}, + .moves = {MOVE_CONFUSION, MOVE_COSMIC_POWER, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [223] = { .species = SPECIES_SOLROCK, - .moves = {MOVE_CONFUSION MOVE_FIRE_SPIN MOVE_LIGHT_SCREEN MOVE_SANDSTORM}, + .moves = {MOVE_CONFUSION, MOVE_FIRE_SPIN, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [224] = { .species = SPECIES_NOCTOWL, - .moves = {MOVE_CONFUSION MOVE_AERIAL_ACE MOVE_FAINT_ATTACK MOVE_REFLECT}, + .moves = {MOVE_CONFUSION, MOVE_AERIAL_ACE, MOVE_FAINT_ATTACK, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [225] = { .species = SPECIES_SANDSLASH, - .moves = {MOVE_CRUSH_CLAW MOVE_ROCK_SLIDE MOVE_SWIFT MOVE_SANDSTORM}, + .moves = {MOVE_CRUSH_CLAW, MOVE_ROCK_SLIDE, MOVE_SWIFT, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [226] = { .species = SPECIES_VENOMOTH, - .moves = {MOVE_SILVER_WIND MOVE_PSYBEAM MOVE_SLEEP_POWDER MOVE_SKILL_SWAP}, + .moves = {MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_SLEEP_POWDER, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [227] = { .species = SPECIES_CHANSEY, - .moves = {MOVE_METRONOME MOVE_REFRESH MOVE_DEFENSE_CURL MOVE_MINIMIZE}, + .moves = {MOVE_METRONOME, MOVE_REFRESH, MOVE_DEFENSE_CURL, MOVE_MINIMIZE}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [228] = { .species = SPECIES_SEAKING, - .moves = {MOVE_WATER_PULSE MOVE_PSYBEAM MOVE_SWIFT MOVE_AGILITY}, + .moves = {MOVE_WATER_PULSE, MOVE_PSYBEAM, MOVE_SWIFT, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [229] = { .species = SPECIES_JUMPLUFF, - .moves = {MOVE_AERIAL_ACE MOVE_SWAGGER MOVE_PSYCH_UP MOVE_SYNTHESIS}, + .moves = {MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [230] = { .species = SPECIES_PILOSWINE, - .moves = {MOVE_DIG MOVE_ANCIENT_POWER MOVE_HAIL MOVE_LIGHT_SCREEN}, + .moves = {MOVE_DIG, MOVE_ANCIENT_POWER, MOVE_HAIL, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [231] = { .species = SPECIES_GOLBAT, - .moves = {MOVE_AIR_CUTTER MOVE_CONFUSE_RAY MOVE_TOXIC MOVE_STEEL_WING}, + .moves = {MOVE_AIR_CUTTER, MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [232] = { .species = SPECIES_PRIMEAPE, - .moves = {MOVE_KARATE_CHOP MOVE_COUNTER MOVE_SWAGGER MOVE_SCREECH}, + .moves = {MOVE_KARATE_CHOP, MOVE_COUNTER, MOVE_SWAGGER, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [233] = { .species = SPECIES_HITMONLEE, - .moves = {MOVE_ROLLING_KICK MOVE_BRICK_BREAK MOVE_FOCUS_ENERGY MOVE_FACADE}, + .moves = {MOVE_ROLLING_KICK, MOVE_BRICK_BREAK, MOVE_FOCUS_ENERGY, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [234] = { .species = SPECIES_HITMONCHAN, - .moves = {MOVE_MACH_PUNCH MOVE_SKY_UPPERCUT MOVE_DETECT MOVE_COUNTER}, + .moves = {MOVE_MACH_PUNCH, MOVE_SKY_UPPERCUT, MOVE_DETECT, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [235] = { .species = SPECIES_GIRAFARIG, - .moves = {MOVE_PSYBEAM MOVE_STOMP MOVE_WISH MOVE_SKILL_SWAP}, + .moves = {MOVE_PSYBEAM, MOVE_STOMP, MOVE_WISH, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [236] = { .species = SPECIES_HITMONTOP, - .moves = {MOVE_TRIPLE_KICK MOVE_DIG MOVE_MACH_PUNCH MOVE_QUICK_ATTACK}, + .moves = {MOVE_TRIPLE_KICK, MOVE_DIG, MOVE_MACH_PUNCH, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [237] = { .species = SPECIES_BANETTE, - .moves = {MOVE_NIGHT_SHADE MOVE_WILL_O_WISP MOVE_SPITE MOVE_KNOCK_OFF}, + .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SPITE, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [238] = { .species = SPECIES_NINJASK, - .moves = {MOVE_BATON_PASS MOVE_SWORDS_DANCE MOVE_ENDURE MOVE_DIG}, + .moves = {MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_ENDURE, MOVE_DIG}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MILD }, [239] = { .species = SPECIES_SEVIPER, - .moves = {MOVE_POISON_TAIL MOVE_BITE MOVE_GLARE MOVE_SCREECH}, + .moves = {MOVE_POISON_TAIL, MOVE_BITE, MOVE_GLARE, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [240] = { .species = SPECIES_ZANGOOSE, - .moves = {MOVE_SLASH MOVE_DOUBLE_KICK MOVE_ROAR MOVE_QUICK_ATTACK}, + .moves = {MOVE_SLASH, MOVE_DOUBLE_KICK, MOVE_ROAR, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [241] = { .species = SPECIES_CAMERUPT, - .moves = {MOVE_MAGNITUDE MOVE_PROTECT MOVE_SANDSTORM MOVE_ROCK_SLIDE}, + .moves = {MOVE_MAGNITUDE, MOVE_PROTECT, MOVE_SANDSTORM, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [242] = { .species = SPECIES_SHARPEDO, - .moves = {MOVE_SLASH MOVE_BITE MOVE_WATER_PULSE MOVE_SCARY_FACE}, + .moves = {MOVE_SLASH, MOVE_BITE, MOVE_WATER_PULSE, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [243] = { .species = SPECIES_TROPIUS, - .moves = {MOVE_MAGICAL_LEAF MOVE_WHIRLWIND MOVE_AERIAL_ACE MOVE_STEEL_WING}, + .moves = {MOVE_MAGICAL_LEAF, MOVE_WHIRLWIND, MOVE_AERIAL_ACE, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [244] = { .species = SPECIES_MAGNETON, - .moves = {MOVE_SHOCK_WAVE MOVE_SONIC_BOOM MOVE_THUNDER_WAVE MOVE_SUPERSONIC}, + .moves = {MOVE_SHOCK_WAVE, MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_LONELY }, [245] = { .species = SPECIES_MANTINE, - .moves = {MOVE_BUBBLE_BEAM MOVE_AERIAL_ACE MOVE_RAIN_DANCE MOVE_ICY_WIND}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_AERIAL_ACE, MOVE_RAIN_DANCE, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [246] = { .species = SPECIES_STANTLER, - .moves = {MOVE_EXTRASENSORY MOVE_CONFUSE_RAY MOVE_STOMP MOVE_SAND_ATTACK}, + .moves = {MOVE_EXTRASENSORY, MOVE_CONFUSE_RAY, MOVE_STOMP, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_GENTLE }, [247] = { .species = SPECIES_ABSOL, - .moves = {MOVE_BITE MOVE_RAZOR_WIND MOVE_FUTURE_SIGHT MOVE_QUICK_ATTACK}, + .moves = {MOVE_BITE, MOVE_RAZOR_WIND, MOVE_FUTURE_SIGHT, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [248] = { .species = SPECIES_SWALOT, - .moves = {MOVE_STOCKPILE MOVE_SWALLOW MOVE_SPIT_UP MOVE_SLUDGE}, + .moves = {MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_SLUDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIRKY }, [249] = { .species = SPECIES_CRAWDAUNT, - .moves = {MOVE_BUBBLE_BEAM MOVE_VICE_GRIP MOVE_KNOCK_OFF MOVE_PROTECT}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_VICE_GRIP, MOVE_KNOCK_OFF, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [250] = { .species = SPECIES_PIDGEOT, - .moves = {MOVE_AERIAL_ACE MOVE_FEATHER_DANCE MOVE_MUD_SLAP MOVE_FAINT_ATTACK}, + .moves = {MOVE_AERIAL_ACE, MOVE_FEATHER_DANCE, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [251] = { .species = SPECIES_GRUMPIG, - .moves = {MOVE_PSYBEAM MOVE_CONFUSE_RAY MOVE_FUTURE_SIGHT MOVE_MAGIC_COAT}, + .moves = {MOVE_PSYBEAM, MOVE_CONFUSE_RAY, MOVE_FUTURE_SIGHT, MOVE_MAGIC_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [252] = { .species = SPECIES_TORKOAL, - .moves = {MOVE_EMBER MOVE_FIRE_SPIN MOVE_SMOKESCREEN MOVE_AMNESIA}, + .moves = {MOVE_EMBER, MOVE_FIRE_SPIN, MOVE_SMOKESCREEN, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [253] = { .species = SPECIES_KINGLER, - .moves = {MOVE_CRABHAMMER MOVE_METAL_CLAW MOVE_MUD_SHOT MOVE_PROTECT}, + .moves = {MOVE_CRABHAMMER, MOVE_METAL_CLAW, MOVE_MUD_SHOT, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [254] = { .species = SPECIES_CACTURNE, - .moves = {MOVE_NEEDLE_ARM MOVE_FAINT_ATTACK MOVE_ACID MOVE_MEGA_PUNCH}, + .moves = {MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_ACID, MOVE_MEGA_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_HASTY }, [255] = { .species = SPECIES_BELLOSSOM, - .moves = {MOVE_PETAL_DANCE MOVE_SAFEGUARD MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .moves = {MOVE_PETAL_DANCE, MOVE_SAFEGUARD, MOVE_SUNNY_DAY, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [256] = { .species = SPECIES_OCTILLERY, - .moves = {MOVE_OCTAZOOKA MOVE_AURORA_BEAM MOVE_PSYBEAM MOVE_ROCK_BLAST}, + .moves = {MOVE_OCTAZOOKA, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_ROCK_BLAST}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [257] = { .species = SPECIES_HUNTAIL, - .moves = {MOVE_WHIRLPOOL MOVE_SCARY_FACE MOVE_MUD_SLAP MOVE_BITE}, + .moves = {MOVE_WHIRLPOOL, MOVE_SCARY_FACE, MOVE_MUD_SLAP, MOVE_BITE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [258] = { .species = SPECIES_GOREBYSS, - .moves = {MOVE_WHIRLPOOL MOVE_AMNESIA MOVE_ICY_WIND MOVE_CONFUSION}, + .moves = {MOVE_WHIRLPOOL, MOVE_AMNESIA, MOVE_ICY_WIND, MOVE_CONFUSION}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [259] = { .species = SPECIES_RELICANTH, - .moves = {MOVE_ANCIENT_POWER MOVE_WATER_PULSE MOVE_HARDEN MOVE_AMNESIA}, + .moves = {MOVE_ANCIENT_POWER, MOVE_WATER_PULSE, MOVE_HARDEN, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [260] = { .species = SPECIES_OMASTAR, - .moves = {MOVE_BUBBLE_BEAM MOVE_SPIKE_CANNON MOVE_TICKLE MOVE_ANCIENT_POWER}, + .moves = {MOVE_BUBBLE_BEAM, MOVE_SPIKE_CANNON, MOVE_TICKLE, MOVE_ANCIENT_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [261] = { .species = SPECIES_KABUTOPS, - .moves = {MOVE_SLASH MOVE_DIG MOVE_FURY_CUTTER MOVE_KNOCK_OFF}, + .moves = {MOVE_SLASH, MOVE_DIG, MOVE_FURY_CUTTER, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [262] = { .species = SPECIES_POLIWRATH, - .moves = {MOVE_SUBMISSION MOVE_DIG MOVE_ROCK_TOMB MOVE_BUBBLE_BEAM}, + .moves = {MOVE_SUBMISSION, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_BUBBLE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [263] = { .species = SPECIES_SCYTHER, - .moves = {MOVE_FURY_CUTTER MOVE_AERIAL_ACE MOVE_LIGHT_SCREEN MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FURY_CUTTER, MOVE_AERIAL_ACE, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [264] = { .species = SPECIES_PINSIR, - .moves = {MOVE_SUBMISSION MOVE_FOCUS_ENERGY MOVE_SWORDS_DANCE MOVE_REVENGE}, + .moves = {MOVE_SUBMISSION, MOVE_FOCUS_ENERGY, MOVE_SWORDS_DANCE, MOVE_REVENGE}, .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_NAUGHTY }, [265] = { .species = SPECIES_POLITOED, - .moves = {MOVE_DIVE MOVE_DIG MOVE_HYPNOSIS MOVE_SWAGGER}, + .moves = {MOVE_DIVE, MOVE_DIG, MOVE_HYPNOSIS, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [266] = { .species = SPECIES_CLOYSTER, - .moves = {MOVE_AURORA_BEAM MOVE_SPIKE_CANNON MOVE_SUPERSONIC MOVE_PROTECT}, + .moves = {MOVE_AURORA_BEAM, MOVE_SPIKE_CANNON, MOVE_SUPERSONIC, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [267] = { .species = SPECIES_DELCATTY, - .moves = {MOVE_FAKE_TEARS MOVE_SING MOVE_THUNDERBOLT MOVE_ICE_BEAM}, + .moves = {MOVE_FAKE_TEARS, MOVE_SING, MOVE_THUNDERBOLT, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [268] = { .species = SPECIES_SABLEYE, - .moves = {MOVE_SHADOW_BALL MOVE_FAINT_ATTACK MOVE_CONFUSE_RAY MOVE_RECOVER}, + .moves = {MOVE_SHADOW_BALL, MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [269] = { .species = SPECIES_LICKITUNG, - .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_SHADOW_BALL MOVE_ROCK_SLIDE}, + .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [270] = { .species = SPECIES_WEEPINBELL, - .moves = {MOVE_SLUDGE_BOMB MOVE_RAZOR_LEAF MOVE_SLEEP_POWDER MOVE_REFLECT}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_RAZOR_LEAF, MOVE_SLEEP_POWDER, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIRKY }, [271] = { .species = SPECIES_GRAVELER, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_COUNTER}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [272] = { .species = SPECIES_GLOOM, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SLUDGE_BOMB MOVE_MOONLIGHT}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SLUDGE_BOMB, MOVE_MOONLIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [273] = { .species = SPECIES_PORYGON, - .moves = {MOVE_TRI_ATTACK MOVE_PSYCHIC MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_TRI_ATTACK, MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [274] = { .species = SPECIES_KADABRA, - .moves = {MOVE_PSYCHIC MOVE_THUNDER_WAVE MOVE_REFLECT MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_REFLECT, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [275] = { .species = SPECIES_WAILMER, - .moves = {MOVE_WATER_SPOUT MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_REST}, + .moves = {MOVE_WATER_SPOUT, MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [276] = { .species = SPECIES_ROSELIA, - .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_GRASS_WHISTLE MOVE_SYNTHESIS}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_GRASS_WHISTLE, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [277] = { .species = SPECIES_VOLBEAT, - .moves = {MOVE_SIGNAL_BEAM MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_TAIL_GLOW}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_TAIL_GLOW}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [278] = { .species = SPECIES_ILLUMISE, - .moves = {MOVE_SILVER_WIND MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_GIGA_DRAIN}, + .moves = {MOVE_SILVER_WIND, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [279] = { .species = SPECIES_IVYSAUR, - .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_SLEEP_POWDER MOVE_LEECH_SEED}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_LEECH_SEED}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [280] = { .species = SPECIES_CHARMELEON, - .moves = {MOVE_FLAMETHROWER MOVE_SLASH MOVE_ANCIENT_POWER MOVE_DRAGON_RAGE}, + .moves = {MOVE_FLAMETHROWER, MOVE_SLASH, MOVE_ANCIENT_POWER, MOVE_DRAGON_RAGE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [281] = { .species = SPECIES_WARTORTLE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAPID_SPIN MOVE_PROTECT}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAPID_SPIN, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [282] = { .species = SPECIES_PARASECT, - .moves = {MOVE_SPORE MOVE_GIGA_DRAIN MOVE_DIG MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SPORE, MOVE_GIGA_DRAIN, MOVE_DIG, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [283] = { .species = SPECIES_MACHOKE, - .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_FORESIGHT MOVE_SCARY_FACE}, + .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FORESIGHT, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [284] = { .species = SPECIES_HAUNTER, - .moves = {MOVE_PSYCHIC MOVE_HYPNOSIS MOVE_NIGHTMARE MOVE_CONFUSE_RAY}, + .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [285] = { .species = SPECIES_BAYLEEF, - .moves = {MOVE_GIGA_DRAIN MOVE_BODY_SLAM MOVE_GRASS_WHISTLE MOVE_REST}, + .moves = {MOVE_GIGA_DRAIN, MOVE_BODY_SLAM, MOVE_GRASS_WHISTLE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [286] = { .species = SPECIES_QUILAVA, - .moves = {MOVE_FLAMETHROWER MOVE_CRUSH_CLAW MOVE_BODY_SLAM MOVE_SMOKESCREEN}, + .moves = {MOVE_FLAMETHROWER, MOVE_CRUSH_CLAW, MOVE_BODY_SLAM, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [287] = { .species = SPECIES_CROCONAW, - .moves = {MOVE_MEGA_KICK MOVE_AERIAL_ACE MOVE_ROCK_SLIDE MOVE_DIG}, + .moves = {MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_DIG}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [288] = { .species = SPECIES_TOGETIC, - .moves = {MOVE_RETURN MOVE_SWEET_KISS MOVE_AERIAL_ACE MOVE_YAWN}, + .moves = {MOVE_RETURN, MOVE_SWEET_KISS, MOVE_AERIAL_ACE, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [289] = { .species = SPECIES_MURKROW, - .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [290] = { .species = SPECIES_WOBBUFFET, - .moves = {MOVE_COUNTER MOVE_MIRROR_COAT MOVE_ENCORE MOVE_DESTINY_BOND}, + .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_ENCORE, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_CAREFUL }, [291] = { .species = SPECIES_PLUSLE, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_SEISMIC_TOSS MOVE_WISH}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_SEISMIC_TOSS, MOVE_WISH}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [292] = { .species = SPECIES_MINUN, - .moves = {MOVE_THUNDERBOLT MOVE_ATTRACT MOVE_CHARM MOVE_WISH}, + .moves = {MOVE_THUNDERBOLT, MOVE_ATTRACT, MOVE_CHARM, MOVE_WISH}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [293] = { .species = SPECIES_GROVYLE, - .moves = {MOVE_GIGA_DRAIN MOVE_CRUSH_CLAW MOVE_SCREECH MOVE_ROCK_TOMB}, + .moves = {MOVE_GIGA_DRAIN, MOVE_CRUSH_CLAW, MOVE_SCREECH, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [294] = { .species = SPECIES_COMBUSKEN, - .moves = {MOVE_FLAMETHROWER MOVE_SKY_UPPERCUT MOVE_SLASH MOVE_SAND_ATTACK}, + .moves = {MOVE_FLAMETHROWER, MOVE_SKY_UPPERCUT, MOVE_SLASH, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [295] = { .species = SPECIES_MARSHTOMP, - .moves = {MOVE_MUDDY_WATER MOVE_EARTHQUAKE MOVE_MUD_SLAP MOVE_PROTECT}, + .moves = {MOVE_MUDDY_WATER, MOVE_EARTHQUAKE, MOVE_MUD_SLAP, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [296] = { .species = SPECIES_PONYTA, - .moves = {MOVE_FLAMETHROWER MOVE_BODY_SLAM MOVE_DOUBLE_KICK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FLAMETHROWER, MOVE_BODY_SLAM, MOVE_DOUBLE_KICK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [297] = { .species = SPECIES_AZUMARILL, - .moves = {MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_IRON_TAIL MOVE_DIG}, + .moves = {MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_IRON_TAIL, MOVE_DIG}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [298] = { .species = SPECIES_SUDOWOODO, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_LOW_KICK MOVE_SELF_DESTRUCT}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_LOW_KICK, MOVE_SELF_DESTRUCT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [299] = { .species = SPECIES_MAGCARGO, - .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BODY_SLAM}, + .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [300] = { .species = SPECIES_PUPITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUNCH MOVE_SCARY_FACE}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [301] = { .species = SPECIES_SEALEO, - .moves = {MOVE_ICE_BEAM MOVE_SURF MOVE_BODY_SLAM MOVE_HAIL}, + .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_BODY_SLAM, MOVE_HAIL}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [302] = { .species = SPECIES_RATICATE, - .moves = {MOVE_SUPER_FANG MOVE_HYPER_FANG MOVE_SHADOW_BALL MOVE_SCARY_FACE}, + .moves = {MOVE_SUPER_FANG, MOVE_HYPER_FANG, MOVE_SHADOW_BALL, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [303] = { .species = SPECIES_MASQUERAIN, - .moves = {MOVE_HYDRO_PUMP MOVE_ICE_BEAM MOVE_GIGA_DRAIN MOVE_STUN_SPORE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_GIGA_DRAIN, MOVE_STUN_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [304] = { .species = SPECIES_FURRET, - .moves = {MOVE_TRICK MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_FOLLOW_ME}, + .moves = {MOVE_TRICK, MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [305] = { .species = SPECIES_DUNSPARCE, - .moves = {MOVE_ICE_BEAM MOVE_ROCK_TOMB MOVE_BITE MOVE_SHADOW_BALL}, + .moves = {MOVE_ICE_BEAM, MOVE_ROCK_TOMB, MOVE_BITE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [306] = { .species = SPECIES_DRAGONAIR, - .moves = {MOVE_RETURN MOVE_REST MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE}, + .moves = {MOVE_RETURN, MOVE_REST, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [307] = { .species = SPECIES_MIGHTYENA, - .moves = {MOVE_CRUNCH MOVE_SHADOW_BALL MOVE_FRUSTRATION MOVE_SCARY_FACE}, + .moves = {MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIRKY }, [308] = { .species = SPECIES_LINOONE, - .moves = {MOVE_TRICK MOVE_FRUSTRATION MOVE_THUNDER_WAVE MOVE_SAND_ATTACK}, + .moves = {MOVE_TRICK, MOVE_FRUSTRATION, MOVE_THUNDER_WAVE, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [309] = { .species = SPECIES_CASTFORM, - .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_WATER_PULSE}, + .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_WATER_PULSE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [310] = { .species = SPECIES_SHELGON, - .moves = {MOVE_FRUSTRATION MOVE_DRAGON_DANCE MOVE_CRUNCH MOVE_SCARY_FACE}, + .moves = {MOVE_FRUSTRATION, MOVE_DRAGON_DANCE, MOVE_CRUNCH, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [311] = { .species = SPECIES_METANG, - .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_BODY_SLAM MOVE_SCARY_FACE}, + .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_BODY_SLAM, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [312] = { .species = SPECIES_WIGGLYTUFF, - .moves = {MOVE_FAKE_TEARS MOVE_SING MOVE_DREAM_EATER MOVE_BRICK_BREAK}, + .moves = {MOVE_FAKE_TEARS, MOVE_SING, MOVE_DREAM_EATER, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [313] = { .species = SPECIES_SUNFLORA, - .moves = {MOVE_GIGA_DRAIN MOVE_GRASS_WHISTLE MOVE_GROWTH MOVE_DOUBLE_TEAM}, + .moves = {MOVE_GIGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_GROWTH, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [314] = { .species = SPECIES_CHIMECHO, - .moves = {MOVE_PSYCHIC MOVE_HYPNOSIS MOVE_DREAM_EATER MOVE_HEAL_BELL}, + .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEAL_BELL}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [315] = { .species = SPECIES_GLIGAR, - .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_GUILLOTINE MOVE_SCREECH}, + .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_GUILLOTINE, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [316] = { .species = SPECIES_QWILFISH, - .moves = {MOVE_REVENGE MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_DESTINY_BOND}, + .moves = {MOVE_REVENGE, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [317] = { .species = SPECIES_SNEASEL, - .moves = {MOVE_CRUSH_CLAW MOVE_BRICK_BREAK MOVE_AERIAL_ACE MOVE_SCREECH}, + .moves = {MOVE_CRUSH_CLAW, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_JOLLY }, [318] = { .species = SPECIES_PELIPPER, - .moves = {MOVE_SURF MOVE_BLIZZARD MOVE_AERIAL_ACE MOVE_PROTECT}, + .moves = {MOVE_SURF, MOVE_BLIZZARD, MOVE_AERIAL_ACE, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [319] = { .species = SPECIES_SWELLOW, - .moves = {MOVE_FACADE MOVE_AERIAL_ACE MOVE_PURSUIT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PURSUIT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [320] = { .species = SPECIES_LAIRON, - .moves = {MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_ROAR MOVE_PROTECT}, + .moves = {MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROAR, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [321] = { .species = SPECIES_TANGELA, - .moves = {MOVE_GIGA_DRAIN MOVE_STUN_SPORE MOVE_REST MOVE_AMNESIA}, + .moves = {MOVE_GIGA_DRAIN, MOVE_STUN_SPORE, MOVE_REST, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [322] = { .species = SPECIES_ARBOK, - .moves = {MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_GLARE}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_GLARE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [323] = { .species = SPECIES_PERSIAN, - .moves = {MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_ROAR MOVE_FAKE_OUT}, + .moves = {MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_ROAR, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [324] = { .species = SPECIES_SEADRA, - .moves = {MOVE_HYDRO_PUMP MOVE_FRUSTRATION MOVE_DRAGON_BREATH MOVE_DRAGON_DANCE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_FRUSTRATION, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [325] = { .species = SPECIES_KECLEON, - .moves = {MOVE_TRICK MOVE_BRICK_BREAK MOVE_SHADOW_BALL MOVE_SKILL_SWAP}, + .moves = {MOVE_TRICK, MOVE_BRICK_BREAK, MOVE_SHADOW_BALL, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [326] = { .species = SPECIES_VIGOROTH, - .moves = {MOVE_CRUSH_CLAW MOVE_REVERSAL MOVE_ENDURE MOVE_SHADOW_BALL}, + .moves = {MOVE_CRUSH_CLAW, MOVE_REVERSAL, MOVE_ENDURE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [327] = { .species = SPECIES_LUNATONE, - .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_COSMIC_POWER MOVE_CALM_MIND}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_CALM_MIND}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [328] = { .species = SPECIES_SOLROCK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COSMIC_POWER MOVE_OVERHEAT}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COSMIC_POWER, MOVE_OVERHEAT}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [329] = { .species = SPECIES_NOCTOWL, - .moves = {MOVE_PSYCHIC MOVE_FAINT_ATTACK MOVE_AERIAL_ACE MOVE_REFLECT}, + .moves = {MOVE_PSYCHIC, MOVE_FAINT_ATTACK, MOVE_AERIAL_ACE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [330] = { .species = SPECIES_SANDSLASH, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUSH_CLAW MOVE_SANDSTORM}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUSH_CLAW, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [331] = { .species = SPECIES_VENOMOTH, - .moves = {MOVE_SIGNAL_BEAM MOVE_PSYCHIC MOVE_SLUDGE_BOMB MOVE_GIGA_DRAIN}, + .moves = {MOVE_SIGNAL_BEAM, MOVE_PSYCHIC, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [332] = { .species = SPECIES_CHANSEY, - .moves = {MOVE_SEISMIC_TOSS MOVE_SHADOW_BALL MOVE_DOUBLE_TEAM MOVE_SOFT_BOILED}, + .moves = {MOVE_SEISMIC_TOSS, MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_RELAXED }, [333] = { .species = SPECIES_SEAKING, - .moves = {MOVE_HORN_DRILL MOVE_MEGAHORN MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_HORN_DRILL, MOVE_MEGAHORN, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [334] = { .species = SPECIES_JUMPLUFF, - .moves = {MOVE_LEECH_SEED MOVE_SLEEP_POWDER MOVE_GIGA_DRAIN MOVE_DOUBLE_TEAM}, + .moves = {MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [335] = { .species = SPECIES_PILOSWINE, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BODY_SLAM MOVE_ROAR}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [336] = { .species = SPECIES_GOLBAT, - .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_AIR_CUTTER}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [337] = { .species = SPECIES_PRIMEAPE, - .moves = {MOVE_CROSS_CHOP MOVE_ROCK_TOMB MOVE_OVERHEAT MOVE_BULK_UP}, + .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_TOMB, MOVE_OVERHEAT, MOVE_BULK_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [338] = { .species = SPECIES_HITMONLEE, - .moves = {MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_FORESIGHT MOVE_ROCK_TOMB}, + .moves = {MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_FORESIGHT, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [339] = { .species = SPECIES_HITMONCHAN, - .moves = {MOVE_DYNAMIC_PUNCH MOVE_MACH_PUNCH MOVE_DETECT MOVE_COUNTER}, + .moves = {MOVE_DYNAMIC_PUNCH, MOVE_MACH_PUNCH, MOVE_DETECT, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [340] = { .species = SPECIES_GIRAFARIG, - .moves = {MOVE_PSYCHIC MOVE_CRUNCH MOVE_BATON_PASS MOVE_AGILITY}, + .moves = {MOVE_PSYCHIC, MOVE_CRUNCH, MOVE_BATON_PASS, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [341] = { .species = SPECIES_HITMONTOP, - .moves = {MOVE_DOUBLE_EDGE MOVE_SEISMIC_TOSS MOVE_ROCK_SLIDE MOVE_COUNTER}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SEISMIC_TOSS, MOVE_ROCK_SLIDE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [342] = { .species = SPECIES_BANETTE, - .moves = {MOVE_SHADOW_BALL MOVE_FRUSTRATION MOVE_SCREECH MOVE_WILL_O_WISP}, + .moves = {MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCREECH, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [343] = { .species = SPECIES_NINJASK, - .moves = {MOVE_SLASH MOVE_SHADOW_BALL MOVE_SWORDS_DANCE MOVE_BATON_PASS}, + .moves = {MOVE_SLASH, MOVE_SHADOW_BALL, MOVE_SWORDS_DANCE, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [344] = { .species = SPECIES_SEVIPER, - .moves = {MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_GIGA_DRAIN}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [345] = { .species = SPECIES_ZANGOOSE, - .moves = {MOVE_CRUSH_CLAW MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_AERIAL_ACE}, + .moves = {MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [346] = { .species = SPECIES_CAMERUPT, - .moves = {MOVE_EARTHQUAKE MOVE_ERUPTION MOVE_BODY_SLAM MOVE_SCARY_FACE}, + .moves = {MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_BODY_SLAM, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [347] = { .species = SPECIES_SHARPEDO, - .moves = {MOVE_DOUBLE_EDGE MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_SURF}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [348] = { .species = SPECIES_TROPIUS, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_BODY_SLAM}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [349] = { .species = SPECIES_MAGNETON, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_THUNDER_WAVE MOVE_METAL_SOUND}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [350] = { .species = SPECIES_MANTINE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAIN_DANCE MOVE_CONFUSE_RAY}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [351] = { .species = SPECIES_STANTLER, - .moves = {MOVE_FRUSTRATION MOVE_SHADOW_BALL MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .moves = {MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [352] = { .species = SPECIES_ABSOL, - .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_AERIAL_ACE MOVE_IRON_TAIL}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_IRON_TAIL}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [353] = { .species = SPECIES_SWALOT, - .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_BODY_SLAM MOVE_COUNTER}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_BODY_SLAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [354] = { .species = SPECIES_CRAWDAUNT, - .moves = {MOVE_GUILLOTINE MOVE_FRUSTRATION MOVE_ANCIENT_POWER MOVE_AERIAL_ACE}, + .moves = {MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [355] = { .species = SPECIES_PIDGEOT, - .moves = {MOVE_RETURN MOVE_AERIAL_ACE MOVE_STEEL_WING MOVE_MUD_SLAP}, + .moves = {MOVE_RETURN, MOVE_AERIAL_ACE, MOVE_STEEL_WING, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [356] = { .species = SPECIES_GRUMPIG, - .moves = {MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [357] = { .species = SPECIES_TORKOAL, - .moves = {MOVE_OVERHEAT MOVE_BODY_SLAM MOVE_SMOKESCREEN MOVE_PROTECT}, + .moves = {MOVE_OVERHEAT, MOVE_BODY_SLAM, MOVE_SMOKESCREEN, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [358] = { .species = SPECIES_KINGLER, - .moves = {MOVE_GUILLOTINE MOVE_ROCK_TOMB MOVE_FLAIL MOVE_ENDURE}, + .moves = {MOVE_GUILLOTINE, MOVE_ROCK_TOMB, MOVE_FLAIL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [359] = { .species = SPECIES_CACTURNE, - .moves = {MOVE_MEGA_KICK MOVE_TEETER_DANCE MOVE_FAINT_ATTACK MOVE_SANDSTORM}, + .moves = {MOVE_MEGA_KICK, MOVE_TEETER_DANCE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_HARDY }, [360] = { .species = SPECIES_BELLOSSOM, - .moves = {MOVE_SOLAR_BEAM MOVE_ATTRACT MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .moves = {MOVE_SOLAR_BEAM, MOVE_ATTRACT, MOVE_SUNNY_DAY, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [361] = { .species = SPECIES_OCTILLERY, - .moves = {MOVE_OCTAZOOKA MOVE_FIRE_BLAST MOVE_THUNDER_WAVE MOVE_MUD_SLAP}, + .moves = {MOVE_OCTAZOOKA, MOVE_FIRE_BLAST, MOVE_THUNDER_WAVE, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [362] = { .species = SPECIES_HUNTAIL, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_CRUNCH MOVE_BODY_SLAM}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [363] = { .species = SPECIES_GOREBYSS, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_PSYCHIC MOVE_BODY_SLAM}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_PSYCHIC, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [364] = { .species = SPECIES_RELICANTH, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AMNESIA MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [365] = { .species = SPECIES_OMASTAR, - .moves = {MOVE_HYDRO_PUMP MOVE_RAIN_DANCE MOVE_ICE_BEAM MOVE_PROTECT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_ICE_BEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [366] = { .species = SPECIES_KABUTOPS, - .moves = {MOVE_SLASH MOVE_ROCK_SLIDE MOVE_FLAIL MOVE_ENDURE}, + .moves = {MOVE_SLASH, MOVE_ROCK_SLIDE, MOVE_FLAIL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [367] = { .species = SPECIES_POLIWRATH, - .moves = {MOVE_BRICK_BREAK MOVE_HYPNOSIS MOVE_REST MOVE_BELLY_DRUM}, + .moves = {MOVE_BRICK_BREAK, MOVE_HYPNOSIS, MOVE_REST, MOVE_BELLY_DRUM}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [368] = { .species = SPECIES_SCYTHER, - .moves = {MOVE_SILVER_WIND MOVE_AERIAL_ACE MOVE_SWORDS_DANCE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [369] = { .species = SPECIES_PINSIR, - .moves = {MOVE_GUILLOTINE MOVE_SWORDS_DANCE MOVE_FLAIL MOVE_ENDURE}, + .moves = {MOVE_GUILLOTINE, MOVE_SWORDS_DANCE, MOVE_FLAIL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_JOLLY }, [370] = { .species = SPECIES_POLITOED, - .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_MUD_SLAP MOVE_SWAGGER}, + .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_MUD_SLAP, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [371] = { .species = SPECIES_CLOYSTER, - .moves = {MOVE_DIVE MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .moves = {MOVE_DIVE, MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [372] = { .species = SPECIES_DUGTRIO, - .moves = {MOVE_EARTHQUAKE MOVE_TRI_ATTACK MOVE_SLASH MOVE_SAND_TOMB}, + .moves = {MOVE_EARTHQUAKE, MOVE_TRI_ATTACK, MOVE_SLASH, MOVE_SAND_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [373] = { .species = SPECIES_MEDICHAM, - .moves = {MOVE_PSYCHIC MOVE_HI_JUMP_KICK MOVE_CALM_MIND MOVE_BATON_PASS}, + .moves = {MOVE_PSYCHIC, MOVE_HI_JUMP_KICK, MOVE_CALM_MIND, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [374] = { .species = SPECIES_MISDREAVUS, - .moves = {MOVE_PAIN_SPLIT MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE}, + .moves = {MOVE_PAIN_SPLIT, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [375] = { .species = SPECIES_FEAROW, - .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_FACADE MOVE_MUD_SLAP}, + .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_FACADE, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [376] = { .species = SPECIES_GRANBULL, - .moves = {MOVE_MEGA_KICK MOVE_SMELLING_SALT MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_MEGA_KICK, MOVE_SMELLING_SALT, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [377] = { .species = SPECIES_JYNX, - .moves = {MOVE_ICE_BEAM MOVE_FAKE_OUT MOVE_LOVELY_KISS MOVE_ATTRACT}, + .moves = {MOVE_ICE_BEAM, MOVE_FAKE_OUT, MOVE_LOVELY_KISS, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [378] = { .species = SPECIES_DUSCLOPS, - .moves = {MOVE_WILL_O_WISP MOVE_SEISMIC_TOSS MOVE_PAIN_SPLIT MOVE_CONFUSE_RAY}, + .moves = {MOVE_WILL_O_WISP, MOVE_SEISMIC_TOSS, MOVE_PAIN_SPLIT, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [379] = { .species = SPECIES_DODRIO, - .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [380] = { .species = SPECIES_MR_MIME, - .moves = {MOVE_PSYCHIC MOVE_MAGICAL_LEAF MOVE_FAKE_OUT MOVE_REFLECT}, + .moves = {MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_FAKE_OUT, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [381] = { .species = SPECIES_LANTURN, - .moves = {MOVE_SURF MOVE_CONFUSE_RAY MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .moves = {MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [382] = { .species = SPECIES_BRELOOM, - .moves = {MOVE_SKY_UPPERCUT MOVE_MACH_PUNCH MOVE_HEADBUTT MOVE_COUNTER}, + .moves = {MOVE_SKY_UPPERCUT, MOVE_MACH_PUNCH, MOVE_HEADBUTT, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [383] = { .species = SPECIES_FORRETRESS, - .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_LIGHT_SCREEN MOVE_SPIKES}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_LIGHT_SCREEN, MOVE_SPIKES}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [384] = { .species = SPECIES_WHISCASH, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AMNESIA MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [385] = { .species = SPECIES_XATU, - .moves = {MOVE_DRILL_PECK MOVE_NIGHT_SHADE MOVE_WISH MOVE_FUTURE_SIGHT}, + .moves = {MOVE_DRILL_PECK, MOVE_NIGHT_SHADE, MOVE_WISH, MOVE_FUTURE_SIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [386] = { .species = SPECIES_SKARMORY, - .moves = {MOVE_STEEL_WING MOVE_AIR_CUTTER MOVE_COUNTER MOVE_AGILITY}, + .moves = {MOVE_STEEL_WING, MOVE_AIR_CUTTER, MOVE_COUNTER, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [387] = { .species = SPECIES_MAROWAK, - .moves = {MOVE_BONEMERANG MOVE_ROCK_SLIDE MOVE_ICY_WIND MOVE_HEADBUTT}, + .moves = {MOVE_BONEMERANG, MOVE_ROCK_SLIDE, MOVE_ICY_WIND, MOVE_HEADBUTT}, .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [388] = { .species = SPECIES_QUAGSIRE, - .moves = {MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_COUNTER MOVE_MUD_SLAP}, + .moves = {MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_MUD_SLAP}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [389] = { .species = SPECIES_CLEFABLE, - .moves = {MOVE_METRONOME MOVE_DOUBLE_TEAM MOVE_REFLECT MOVE_FOLLOW_ME}, + .moves = {MOVE_METRONOME, MOVE_DOUBLE_TEAM, MOVE_REFLECT, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BRAVE }, [390] = { .species = SPECIES_HARIYAMA, - .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_FAKE_OUT}, + .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [391] = { .species = SPECIES_RAICHU, - .moves = {MOVE_THUNDERBOLT MOVE_QUICK_ATTACK MOVE_LIGHT_SCREEN MOVE_DOUBLE_TEAM}, + .moves = {MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [392] = { .species = SPECIES_DEWGONG, - .moves = {MOVE_ICE_BEAM MOVE_ICY_WIND MOVE_HEADBUTT MOVE_FAKE_OUT}, + .moves = {MOVE_ICE_BEAM, MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [393] = { .species = SPECIES_MANECTRIC, - .moves = {MOVE_THUNDERBOLT MOVE_FLASH MOVE_QUICK_ATTACK MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_FLASH, MOVE_QUICK_ATTACK, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [394] = { .species = SPECIES_VILEPLUME, - .moves = {MOVE_SLUDGE_BOMB MOVE_PETAL_DANCE MOVE_MOONLIGHT MOVE_AROMATHERAPY}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_PETAL_DANCE, MOVE_MOONLIGHT, MOVE_AROMATHERAPY}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [395] = { .species = SPECIES_VICTREEBEL, - .moves = {MOVE_GIGA_DRAIN MOVE_SLEEP_POWDER MOVE_SWEET_SCENT MOVE_SYNTHESIS}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SLEEP_POWDER, MOVE_SWEET_SCENT, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [396] = { .species = SPECIES_ELECTRODE, - .moves = {MOVE_THUNDERBOLT MOVE_SWIFT MOVE_LIGHT_SCREEN MOVE_PROTECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_SWIFT, MOVE_LIGHT_SCREEN, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [397] = { .species = SPECIES_EXPLOUD, - .moves = {MOVE_HYPER_VOICE MOVE_SHADOW_BALL MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_HYPER_VOICE, MOVE_SHADOW_BALL, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [398] = { .species = SPECIES_SHIFTRY, - .moves = {MOVE_GIGA_DRAIN MOVE_FAINT_ATTACK MOVE_QUICK_ATTACK MOVE_FAKE_OUT}, + .moves = {MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [399] = { .species = SPECIES_GLALIE, - .moves = {MOVE_ICE_BEAM MOVE_CRUNCH MOVE_HAIL MOVE_PROTECT}, + .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_HAIL, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [400] = { .species = SPECIES_LUDICOLO, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [401] = { .species = SPECIES_HYPNO, - .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_HYPNOSIS}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_HYPNOSIS}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [402] = { .species = SPECIES_GOLEM, - .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_COUNTER MOVE_ROCK_TOMB}, + .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_COUNTER, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [403] = { .species = SPECIES_RHYDON, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_TOMB MOVE_SCARY_FACE MOVE_BRICK_BREAK}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [404] = { .species = SPECIES_ALAKAZAM, - .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDER_WAVE}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [405] = { .species = SPECIES_WEEZING, - .moves = {MOVE_SLUDGE_BOMB MOVE_WILL_O_WISP MOVE_SHADOW_BALL MOVE_SMOKESCREEN}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [406] = { .species = SPECIES_KANGASKHAN, - .moves = {MOVE_DIZZY_PUNCH MOVE_BRICK_BREAK MOVE_COUNTER MOVE_FAKE_OUT}, + .moves = {MOVE_DIZZY_PUNCH, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [407] = { .species = SPECIES_ELECTABUZZ, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_BRICK_BREAK MOVE_LIGHT_SCREEN}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [408] = { .species = SPECIES_TAUROS, - .moves = {MOVE_EARTHQUAKE MOVE_THRASH MOVE_SWAGGER MOVE_FACADE}, + .moves = {MOVE_EARTHQUAKE, MOVE_THRASH, MOVE_SWAGGER, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [409] = { .species = SPECIES_SLOWBRO, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_HEADBUTT MOVE_ICE_PUNCH}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_HEADBUTT, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [410] = { .species = SPECIES_SLOWKING, - .moves = {MOVE_PSYCHIC MOVE_BRICK_BREAK MOVE_AMNESIA MOVE_ATTRACT}, + .moves = {MOVE_PSYCHIC, MOVE_BRICK_BREAK, MOVE_AMNESIA, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [411] = { .species = SPECIES_MILTANK, - .moves = {MOVE_FACADE MOVE_SHADOW_BALL MOVE_COUNTER MOVE_MILK_DRINK}, + .moves = {MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_MILK_DRINK}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [412] = { .species = SPECIES_ALTARIA, - .moves = {MOVE_DRAGON_CLAW MOVE_AERIAL_ACE MOVE_REFRESH MOVE_BODY_SLAM}, + .moves = {MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_REFRESH, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [413] = { .species = SPECIES_NIDOQUEEN, - .moves = {MOVE_SLUDGE_BOMB MOVE_DOUBLE_KICK MOVE_BODY_SLAM MOVE_COUNTER}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [414] = { .species = SPECIES_NIDOKING, - .moves = {MOVE_HORN_DRILL MOVE_DOUBLE_KICK MOVE_BODY_SLAM MOVE_COUNTER}, + .moves = {MOVE_HORN_DRILL, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [415] = { .species = SPECIES_MAGMAR, - .moves = {MOVE_FLAMETHROWER MOVE_SMOKESCREEN MOVE_BRICK_BREAK MOVE_BARRIER}, + .moves = {MOVE_FLAMETHROWER, MOVE_SMOKESCREEN, MOVE_BRICK_BREAK, MOVE_BARRIER}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [416] = { .species = SPECIES_CRADILY, - .moves = {MOVE_GIGA_DRAIN MOVE_ROCK_SLIDE MOVE_BARRIER MOVE_CONFUSE_RAY}, + .moves = {MOVE_GIGA_DRAIN, MOVE_ROCK_SLIDE, MOVE_BARRIER, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [417] = { .species = SPECIES_ARMALDO, - .moves = {MOVE_SLASH MOVE_AERIAL_ACE MOVE_ANCIENT_POWER MOVE_PROTECT}, + .moves = {MOVE_SLASH, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [418] = { .species = SPECIES_GOLDUCK, - .moves = {MOVE_HYDRO_PUMP MOVE_DIG MOVE_BRICK_BREAK MOVE_LIGHT_SCREEN}, + .moves = {MOVE_HYDRO_PUMP, MOVE_DIG, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [419] = { .species = SPECIES_RAPIDASH, - .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_KICK MOVE_QUICK_ATTACK MOVE_PROTECT}, + .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIET }, [420] = { .species = SPECIES_MUK, - .moves = {MOVE_SLUDGE_BOMB MOVE_BODY_SLAM MOVE_SCREECH MOVE_MINIMIZE}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_BODY_SLAM, MOVE_SCREECH, MOVE_MINIMIZE}, .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [421] = { .species = SPECIES_GENGAR, - .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_CONFUSE_RAY, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_TIMID }, [422] = { .species = SPECIES_AMPHAROS, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_THUNDER_WAVE MOVE_ATTRACT}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [423] = { .species = SPECIES_SCIZOR, - .moves = {MOVE_METAL_CLAW MOVE_AERIAL_ACE MOVE_COUNTER MOVE_QUICK_ATTACK}, + .moves = {MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_COUNTER, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [424] = { .species = SPECIES_HERACROSS, - .moves = {MOVE_MEGAHORN MOVE_BRICK_BREAK MOVE_ROCK_TOMB MOVE_COUNTER}, + .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_ROCK_TOMB, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [425] = { .species = SPECIES_URSARING, - .moves = {MOVE_MEGA_KICK MOVE_CRUNCH MOVE_AERIAL_ACE MOVE_COUNTER}, + .moves = {MOVE_MEGA_KICK, MOVE_CRUNCH, MOVE_AERIAL_ACE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [426] = { .species = SPECIES_HOUNDOOM, - .moves = {MOVE_FLAMETHROWER MOVE_SHADOW_BALL MOVE_COUNTER MOVE_WILL_O_WISP}, + .moves = {MOVE_FLAMETHROWER, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [427] = { .species = SPECIES_DONPHAN, - .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_SWAGGER MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [428] = { .species = SPECIES_CLAYDOL, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [429] = { .species = SPECIES_WAILORD, - .moves = {MOVE_SURF MOVE_ICY_WIND MOVE_BODY_SLAM MOVE_ROAR}, + .moves = {MOVE_SURF, MOVE_ICY_WIND, MOVE_BODY_SLAM, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [430] = { .species = SPECIES_NINETALES, - .moves = {MOVE_FLAMETHROWER MOVE_ROAR MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .moves = {MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [431] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_SCARY_FACE}, + .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [432] = { .species = SPECIES_SHUCKLE, - .moves = {MOVE_ROLLOUT MOVE_DEFENSE_CURL MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BRAVE }, [433] = { .species = SPECIES_STEELIX, - .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_BREATH MOVE_ROCK_TOMB MOVE_ROAR}, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_ROCK_TOMB, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [434] = { .species = SPECIES_TENTACRUEL, - .moves = {MOVE_SLUDGE_BOMB MOVE_ICY_WIND MOVE_BARRIER MOVE_CONFUSE_RAY}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_ICY_WIND, MOVE_BARRIER, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_IMPISH }, [435] = { .species = SPECIES_AERODACTYL, - .moves = {MOVE_ANCIENT_POWER MOVE_DRAGON_BREATH MOVE_AERIAL_ACE MOVE_ROAR}, + .moves = {MOVE_ANCIENT_POWER, MOVE_DRAGON_BREATH, MOVE_AERIAL_ACE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [436] = { .species = SPECIES_PORYGON2, - .moves = {MOVE_TRI_ATTACK MOVE_AERIAL_ACE MOVE_SHADOW_BALL MOVE_RECOVER}, + .moves = {MOVE_TRI_ATTACK, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [437] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_DREAM_EATER MOVE_HYPNOSIS MOVE_MAGICAL_LEAF MOVE_REFLECT}, + .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_MAGICAL_LEAF, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_TIMID }, [438] = { .species = SPECIES_EXEGGUTOR, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [439] = { .species = SPECIES_STARMIE, - .moves = {MOVE_PSYCHIC MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [440] = { .species = SPECIES_FLYGON, - .moves = {MOVE_EARTHQUAKE MOVE_STEEL_WING MOVE_FAINT_ATTACK MOVE_FACADE}, + .moves = {MOVE_EARTHQUAKE, MOVE_STEEL_WING, MOVE_FAINT_ATTACK, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [441] = { .species = SPECIES_VENUSAUR, - .moves = {MOVE_GIGA_DRAIN MOVE_SUNNY_DAY MOVE_SYNTHESIS MOVE_SLEEP_POWDER}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_SLEEP_POWDER}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [442] = { .species = SPECIES_VAPOREON, - .moves = {MOVE_SURF MOVE_ROAR MOVE_BITE MOVE_QUICK_ATTACK}, + .moves = {MOVE_SURF, MOVE_ROAR, MOVE_BITE, MOVE_QUICK_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [443] = { .species = SPECIES_JOLTEON, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_ATTRACT MOVE_PROTECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [444] = { .species = SPECIES_FLAREON, - .moves = {MOVE_FLAMETHROWER MOVE_ROAR MOVE_BITE MOVE_SAND_ATTACK}, + .moves = {MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_BITE, MOVE_SAND_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [445] = { .species = SPECIES_MEGANIUM, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_LIGHT_SCREEN MOVE_SYNTHESIS}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [446] = { .species = SPECIES_ESPEON, - .moves = {MOVE_PSYCHIC MOVE_CHARM MOVE_CALM_MIND MOVE_BATON_PASS}, + .moves = {MOVE_PSYCHIC, MOVE_CHARM, MOVE_CALM_MIND, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [447] = { .species = SPECIES_UMBREON, - .moves = {MOVE_CONFUSE_RAY MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM MOVE_BATON_PASS}, + .moves = {MOVE_CONFUSE_RAY, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [448] = { .species = SPECIES_BLASTOISE, - .moves = {MOVE_HYDRO_PUMP MOVE_RAIN_DANCE MOVE_BITE MOVE_SEISMIC_TOSS}, + .moves = {MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_BITE, MOVE_SEISMIC_TOSS}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [449] = { .species = SPECIES_FERALIGATR, - .moves = {MOVE_SURF MOVE_RAIN_DANCE MOVE_AERIAL_ACE MOVE_ROAR}, + .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_AERIAL_ACE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [450] = { .species = SPECIES_AGGRON, - .moves = {MOVE_IRON_TAIL MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROAR}, + .moves = {MOVE_IRON_TAIL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [451] = { .species = SPECIES_BLAZIKEN, - .moves = {MOVE_FLAMETHROWER MOVE_SUNNY_DAY MOVE_DOUBLE_KICK MOVE_ROAR}, + .moves = {MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_DOUBLE_KICK, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [452] = { .species = SPECIES_WALREIN, - .moves = {MOVE_BLIZZARD MOVE_HAIL MOVE_YAWN MOVE_PROTECT}, + .moves = {MOVE_BLIZZARD, MOVE_HAIL, MOVE_YAWN, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [453] = { .species = SPECIES_SCEPTILE, - .moves = {MOVE_LEAF_BLADE MOVE_LEECH_SEED MOVE_AERIAL_ACE MOVE_DETECT}, + .moves = {MOVE_LEAF_BLADE, MOVE_LEECH_SEED, MOVE_AERIAL_ACE, MOVE_DETECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [454] = { .species = SPECIES_CHARIZARD, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_ROAR MOVE_SCARY_FACE}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_ROAR, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [455] = { .species = SPECIES_TYPHLOSION, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_SMOKESCREEN MOVE_ROAR}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SMOKESCREEN, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [456] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SURF MOVE_ATTRACT MOVE_CONFUSE_RAY MOVE_SING}, + .moves = {MOVE_SURF, MOVE_ATTRACT, MOVE_CONFUSE_RAY, MOVE_SING}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [457] = { .species = SPECIES_CROBAT, - .moves = {MOVE_SLUDGE_BOMB MOVE_BITE MOVE_ASTONISH MOVE_SCREECH}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_BITE, MOVE_ASTONISH, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [458] = { .species = SPECIES_SWAMPERT, - .moves = {MOVE_EARTHQUAKE MOVE_COUNTER MOVE_REST MOVE_CURSE}, + .moves = {MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REST, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [459] = { .species = SPECIES_GYARADOS, - .moves = {MOVE_RETURN MOVE_BITE MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE}, + .moves = {MOVE_RETURN, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [460] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_FACADE MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [461] = { .species = SPECIES_KINGDRA, - .moves = {MOVE_HYDRO_PUMP MOVE_DRAGON_BREATH MOVE_ICY_WIND MOVE_ATTRACT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_DRAGON_BREATH, MOVE_ICY_WIND, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [462] = { .species = SPECIES_BLISSEY, - .moves = {MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_SING MOVE_SOFT_BOILED}, + .moves = {MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_SING, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [463] = { .species = SPECIES_MILOTIC, - .moves = {MOVE_HYDRO_PUMP MOVE_ICY_WIND MOVE_RECOVER MOVE_MIRROR_COAT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICY_WIND, MOVE_RECOVER, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [464] = { .species = SPECIES_ARCANINE, - .moves = {MOVE_FLAMETHROWER MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_BODY_SLAM}, + .moves = {MOVE_FLAMETHROWER, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [465] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_DRAGON_CLAW MOVE_AERIAL_ACE MOVE_HEADBUTT MOVE_ROCK_SLIDE}, + .moves = {MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_HEADBUTT, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [466] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_METEOR_MASH MOVE_AERIAL_ACE MOVE_FACADE MOVE_LIGHT_SCREEN}, + .moves = {MOVE_METEOR_MASH, MOVE_AERIAL_ACE, MOVE_FACADE, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [467] = { .species = SPECIES_SLAKING, - .moves = {MOVE_YAWN MOVE_BULK_UP MOVE_SWAGGER MOVE_AERIAL_ACE}, + .moves = {MOVE_YAWN, MOVE_BULK_UP, MOVE_SWAGGER, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [468] = { .species = SPECIES_DUGTRIO, - .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_AERIAL_ACE MOVE_TRI_ATTACK}, + .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_TRI_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [469] = { .species = SPECIES_MEDICHAM, - .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_PSYCHIC MOVE_FAKE_OUT}, + .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_PSYCHIC, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [470] = { .species = SPECIES_MAROWAK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_ICY_WIND}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [471] = { .species = SPECIES_QUAGSIRE, - .moves = {MOVE_CURSE MOVE_ATTRACT MOVE_YAWN MOVE_ANCIENT_POWER}, + .moves = {MOVE_CURSE, MOVE_ATTRACT, MOVE_YAWN, MOVE_ANCIENT_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_SASSY }, [472] = { .species = SPECIES_MISDREAVUS, - .moves = {MOVE_PSYCHIC MOVE_ATTRACT MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .moves = {MOVE_PSYCHIC, MOVE_ATTRACT, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [473] = { .species = SPECIES_FEAROW, - .moves = {MOVE_DRILL_PECK MOVE_TRI_ATTACK MOVE_ATTRACT MOVE_PURSUIT}, + .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_ATTRACT, MOVE_PURSUIT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [474] = { .species = SPECIES_GRANBULL, - .moves = {MOVE_OVERHEAT MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FACADE}, + .moves = {MOVE_OVERHEAT, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_QUIET }, [475] = { .species = SPECIES_JYNX, - .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_LOVELY_KISS MOVE_PROTECT}, + .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_LOVELY_KISS, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [476] = { .species = SPECIES_DUSCLOPS, - .moves = {MOVE_TOXIC MOVE_CONFUSE_RAY MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [477] = { .species = SPECIES_DODRIO, - .moves = {MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_FAINT_ATTACK MOVE_PROTECT}, + .moves = {MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_FAINT_ATTACK, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [478] = { .species = SPECIES_MR_MIME, - .moves = {MOVE_BATON_PASS MOVE_SWAGGER MOVE_PSYCH_UP MOVE_PSYCHIC}, + .moves = {MOVE_BATON_PASS, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_PSYCHIC}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [479] = { .species = SPECIES_LANTURN, - .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_THUNDERBOLT MOVE_SURF}, + .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [480] = { .species = SPECIES_BRELOOM, - .moves = {MOVE_GIGA_DRAIN MOVE_LEECH_SEED MOVE_FOCUS_PUNCH MOVE_SPORE}, + .moves = {MOVE_GIGA_DRAIN, MOVE_LEECH_SEED, MOVE_FOCUS_PUNCH, MOVE_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [481] = { .species = SPECIES_FORRETRESS, - .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_COUNTER MOVE_PROTECT}, + .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_COUNTER, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [482] = { .species = SPECIES_SKARMORY, - .moves = {MOVE_SPIKES MOVE_ROAR MOVE_DRILL_PECK MOVE_TOXIC}, + .moves = {MOVE_SPIKES, MOVE_ROAR, MOVE_DRILL_PECK, MOVE_TOXIC}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [483] = { .species = SPECIES_WHISCASH, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_SPARK MOVE_FUTURE_SIGHT}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_SPARK, MOVE_FUTURE_SIGHT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [484] = { .species = SPECIES_XATU, - .moves = {MOVE_FLY MOVE_TOXIC MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .moves = {MOVE_FLY, MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [485] = { .species = SPECIES_CLEFABLE, - .moves = {MOVE_METEOR_MASH MOVE_COSMIC_POWER MOVE_DOUBLE_TEAM MOVE_FOLLOW_ME}, + .moves = {MOVE_METEOR_MASH, MOVE_COSMIC_POWER, MOVE_DOUBLE_TEAM, MOVE_FOLLOW_ME}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [486] = { .species = SPECIES_HARIYAMA, - .moves = {MOVE_CROSS_CHOP MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .moves = {MOVE_CROSS_CHOP, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [487] = { .species = SPECIES_RAICHU, - .moves = {MOVE_THUNDERBOLT MOVE_REVERSAL MOVE_ENDURE MOVE_AGILITY}, + .moves = {MOVE_THUNDERBOLT, MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [488] = { .species = SPECIES_DEWGONG, - .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_ENCORE MOVE_DISABLE}, + .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_ENCORE, MOVE_DISABLE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [489] = { .species = SPECIES_MANECTRIC, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_CRUNCH MOVE_ROAR}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [490] = { .species = SPECIES_VILEPLUME, - .moves = {MOVE_INGRAIN MOVE_DOUBLE_TEAM MOVE_TOXIC MOVE_GIGA_DRAIN}, + .moves = {MOVE_INGRAIN, MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [491] = { .species = SPECIES_VICTREEBEL, - .moves = {MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_SLEEP_POWDER MOVE_ATTRACT}, + .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_SERIOUS }, [492] = { .species = SPECIES_ELECTRODE, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_SWAGGER}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [493] = { .species = SPECIES_EXPLOUD, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_EARTHQUAKE MOVE_COUNTER}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [494] = { .species = SPECIES_SHIFTRY, - .moves = {MOVE_LEECH_SEED MOVE_DIG MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_LEECH_SEED, MOVE_DIG, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_IMPISH }, [495] = { .species = SPECIES_GLALIE, - .moves = {MOVE_EXPLOSION MOVE_ENDURE MOVE_BODY_SLAM MOVE_ICY_WIND}, + .moves = {MOVE_EXPLOSION, MOVE_ENDURE, MOVE_BODY_SLAM, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [496] = { .species = SPECIES_LUDICOLO, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [497] = { .species = SPECIES_HYPNO, - .moves = {MOVE_HYPNOSIS MOVE_NIGHTMARE MOVE_DREAM_EATER MOVE_PSYCHIC}, + .moves = {MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_DREAM_EATER, MOVE_PSYCHIC}, .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [498] = { .species = SPECIES_GOLEM, - .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [499] = { .species = SPECIES_RHYDON, - .moves = {MOVE_EARTHQUAKE MOVE_HORN_DRILL MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .moves = {MOVE_EARTHQUAKE, MOVE_HORN_DRILL, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [500] = { .species = SPECIES_ALAKAZAM, - .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [501] = { .species = SPECIES_WEEZING, - .moves = {MOVE_MEMENTO MOVE_SLUDGE_BOMB MOVE_FACADE MOVE_DESTINY_BOND}, + .moves = {MOVE_MEMENTO, MOVE_SLUDGE_BOMB, MOVE_FACADE, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [502] = { .species = SPECIES_KANGASKHAN, - .moves = {MOVE_CRUSH_CLAW MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_REST}, + .moves = {MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [503] = { .species = SPECIES_ELECTABUZZ, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_ATTRACT MOVE_FOCUS_PUNCH}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_ATTRACT, MOVE_FOCUS_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [504] = { .species = SPECIES_TAUROS, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [505] = { .species = SPECIES_SLOWBRO, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_YAWN}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_MODEST }, [506] = { .species = SPECIES_SLOWKING, - .moves = {MOVE_YAWN MOVE_THUNDER_WAVE MOVE_SURF MOVE_PSYCHIC}, + .moves = {MOVE_YAWN, MOVE_THUNDER_WAVE, MOVE_SURF, MOVE_PSYCHIC}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [507] = { .species = SPECIES_MILTANK, - .moves = {MOVE_FOCUS_PUNCH MOVE_SHADOW_BALL MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [508] = { .species = SPECIES_ALTARIA, - .moves = {MOVE_PERISH_SONG MOVE_DRAGON_BREATH MOVE_PURSUIT MOVE_ATTRACT}, + .moves = {MOVE_PERISH_SONG, MOVE_DRAGON_BREATH, MOVE_PURSUIT, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [509] = { .species = SPECIES_NIDOQUEEN, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [510] = { .species = SPECIES_NIDOKING, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_BRICK_BREAK}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [511] = { .species = SPECIES_MAGMAR, - .moves = {MOVE_FIRE_BLAST MOVE_SMOKESCREEN MOVE_THUNDER_PUNCH MOVE_CONFUSE_RAY}, + .moves = {MOVE_FIRE_BLAST, MOVE_SMOKESCREEN, MOVE_THUNDER_PUNCH, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [512] = { .species = SPECIES_CRADILY, - .moves = {MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [513] = { .species = SPECIES_ARMALDO, - .moves = {MOVE_IRON_TAIL MOVE_ANCIENT_POWER MOVE_BRICK_BREAK MOVE_KNOCK_OFF}, + .moves = {MOVE_IRON_TAIL, MOVE_ANCIENT_POWER, MOVE_BRICK_BREAK, MOVE_KNOCK_OFF}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [514] = { .species = SPECIES_GOLDUCK, - .moves = {MOVE_CROSS_CHOP MOVE_SURF MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_CROSS_CHOP, MOVE_SURF, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [515] = { .species = SPECIES_RAPIDASH, - .moves = {MOVE_FIRE_BLAST MOVE_BOUNCE MOVE_DOUBLE_TEAM MOVE_ATTRACT}, + .moves = {MOVE_FIRE_BLAST, MOVE_BOUNCE, MOVE_DOUBLE_TEAM, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [516] = { .species = SPECIES_MUK, - .moves = {MOVE_CURSE MOVE_REST MOVE_SLUDGE_BOMB MOVE_DYNAMIC_PUNCH}, + .moves = {MOVE_CURSE, MOVE_REST, MOVE_SLUDGE_BOMB, MOVE_DYNAMIC_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [517] = { .species = SPECIES_GENGAR, - .moves = {MOVE_SLUDGE_BOMB MOVE_SHADOW_BALL MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [518] = { .species = SPECIES_AMPHAROS, - .moves = {MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_FOCUS_PUNCH MOVE_THUNDER_WAVE}, + .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_FOCUS_PUNCH, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [519] = { .species = SPECIES_SCIZOR, - .moves = {MOVE_SILVER_WIND MOVE_STEEL_WING MOVE_SWORDS_DANCE MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SILVER_WIND, MOVE_STEEL_WING, MOVE_SWORDS_DANCE, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [520] = { .species = SPECIES_HERACROSS, - .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ATTRACT MOVE_BULK_UP}, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_BULK_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_JOLLY }, [521] = { .species = SPECIES_URSARING, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_COUNTER}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [522] = { .species = SPECIES_HOUNDOOM, - .moves = {MOVE_FIRE_BLAST MOVE_CRUNCH MOVE_ROAR MOVE_REST}, + .moves = {MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_ROAR, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [523] = { .species = SPECIES_DONPHAN, - .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_EARTHQUAKE MOVE_ROCK_TOMB}, + .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [524] = { .species = SPECIES_CLAYDOL, - .moves = {MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_COSMIC_POWER}, + .moves = {MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_COSMIC_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [525] = { .species = SPECIES_WAILORD, - .moves = {MOVE_DOUBLE_EDGE MOVE_REST MOVE_CURSE MOVE_AMNESIA}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_CURSE, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [526] = { .species = SPECIES_NINETALES, - .moves = {MOVE_HEAT_WAVE MOVE_BODY_SLAM MOVE_GRUDGE MOVE_SUNNY_DAY}, + .moves = {MOVE_HEAT_WAVE, MOVE_BODY_SLAM, MOVE_GRUDGE, MOVE_SUNNY_DAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [527] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_BULK_UP MOVE_REST}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_BULK_UP, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [528] = { .species = SPECIES_SHUCKLE, - .moves = {MOVE_SANDSTORM MOVE_DIG MOVE_FLASH MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SANDSTORM, MOVE_DIG, MOVE_FLASH, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_CAREFUL }, [529] = { .species = SPECIES_STEELIX, - .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_BREATH MOVE_SANDSTORM MOVE_BLOCK}, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_SANDSTORM, MOVE_BLOCK}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [530] = { .species = SPECIES_TENTACRUEL, - .moves = {MOVE_TOXIC MOVE_GIGA_DRAIN MOVE_CONFUSE_RAY MOVE_SURF}, + .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [531] = { .species = SPECIES_AERODACTYL, - .moves = {MOVE_HYPER_BEAM MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ANCIENT_POWER}, + .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [532] = { .species = SPECIES_PORYGON2, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [533] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [534] = { .species = SPECIES_EXEGGUTOR, - .moves = {MOVE_RETURN MOVE_CURSE MOVE_SLEEP_POWDER MOVE_REST}, + .moves = {MOVE_RETURN, MOVE_CURSE, MOVE_SLEEP_POWDER, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [535] = { .species = SPECIES_STARMIE, - .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_RAIN_DANCE MOVE_RECOVER}, + .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [536] = { .species = SPECIES_FLYGON, - .moves = {MOVE_SOLAR_BEAM MOVE_FIRE_BLAST MOVE_CRUNCH MOVE_SUNNY_DAY}, + .moves = {MOVE_SOLAR_BEAM, MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_SUNNY_DAY}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [537] = { .species = SPECIES_VENUSAUR, - .moves = {MOVE_LEECH_SEED MOVE_GIGA_DRAIN MOVE_DOUBLE_TEAM MOVE_LIGHT_SCREEN}, + .moves = {MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [538] = { .species = SPECIES_VAPOREON, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BODY_SLAM MOVE_SHADOW_BALL}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [539] = { .species = SPECIES_JOLTEON, - .moves = {MOVE_THUNDERBOLT MOVE_DIG MOVE_DOUBLE_KICK MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_DIG, MOVE_DOUBLE_KICK, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [540] = { .species = SPECIES_FLAREON, - .moves = {MOVE_CURSE MOVE_ATTRACT MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .moves = {MOVE_CURSE, MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_RELAXED }, [541] = { .species = SPECIES_MEGANIUM, - .moves = {MOVE_LEECH_SEED MOVE_SUBSTITUTE MOVE_DOUBLE_TEAM MOVE_GRASS_WHISTLE}, + .moves = {MOVE_LEECH_SEED, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_GRASS_WHISTLE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [542] = { .species = SPECIES_ESPEON, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [543] = { .species = SPECIES_UMBREON, - .moves = {MOVE_CURSE MOVE_SCREECH MOVE_DOUBLE_TEAM MOVE_DOUBLE_EDGE}, + .moves = {MOVE_CURSE, MOVE_SCREECH, MOVE_DOUBLE_TEAM, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [544] = { .species = SPECIES_BLASTOISE, - .moves = {MOVE_HYDRO_PUMP MOVE_MEGA_KICK MOVE_BRICK_BREAK MOVE_MIRROR_COAT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [545] = { .species = SPECIES_FERALIGATR, - .moves = {MOVE_SURF MOVE_DRAGON_CLAW MOVE_BRICK_BREAK MOVE_SCARY_FACE}, + .moves = {MOVE_SURF, MOVE_DRAGON_CLAW, MOVE_BRICK_BREAK, MOVE_SCARY_FACE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_SASSY }, [546] = { .species = SPECIES_AGGRON, - .moves = {MOVE_FOCUS_PUNCH MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_THUNDER_WAVE}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [547] = { .species = SPECIES_BLAZIKEN, - .moves = {MOVE_BLAZE_KICK MOVE_MEGA_KICK MOVE_THUNDER_PUNCH MOVE_BRICK_BREAK}, + .moves = {MOVE_BLAZE_KICK, MOVE_MEGA_KICK, MOVE_THUNDER_PUNCH, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [548] = { .species = SPECIES_WALREIN, - .moves = {MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_CURSE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_QUIRKY }, [549] = { .species = SPECIES_SCEPTILE, - .moves = {MOVE_LEAF_BLADE MOVE_THUNDER_PUNCH MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_LEAF_BLADE, MOVE_THUNDER_PUNCH, MOVE_ATTRACT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [550] = { .species = SPECIES_CHARIZARD, - .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE MOVE_SMOKESCREEN}, + .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE, MOVE_SMOKESCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [551] = { .species = SPECIES_TYPHLOSION, - .moves = {MOVE_FLAMETHROWER MOVE_THUNDER_PUNCH MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .moves = {MOVE_FLAMETHROWER, MOVE_THUNDER_PUNCH, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [552] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BODY_SLAM MOVE_ROAR}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_TIMID }, [553] = { .species = SPECIES_CROBAT, - .moves = {MOVE_TOXIC MOVE_GIGA_DRAIN MOVE_CONFUSE_RAY MOVE_DOUBLE_TEAM}, + .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [554] = { .species = SPECIES_SWAMPERT, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_COUNTER MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [555] = { .species = SPECIES_GYARADOS, - .moves = {MOVE_HYDRO_PUMP MOVE_THUNDERBOLT MOVE_FIRE_BLAST MOVE_BLIZZARD}, + .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_BLIZZARD}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [556] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CURSE MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [557] = { .species = SPECIES_KINGDRA, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_DRAGON_BREATH MOVE_REST}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [558] = { .species = SPECIES_BLISSEY, - .moves = {MOVE_SEISMIC_TOSS MOVE_SING MOVE_ATTRACT MOVE_SUBSTITUTE}, + .moves = {MOVE_SEISMIC_TOSS, MOVE_SING, MOVE_ATTRACT, MOVE_SUBSTITUTE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [559] = { .species = SPECIES_MILOTIC, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_SAFEGUARD MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_SAFEGUARD, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [560] = { .species = SPECIES_ARCANINE, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_CRUNCH MOVE_ROAR}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_CRUNCH, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [561] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_DOUBLE_EDGE MOVE_CRUNCH MOVE_SWAGGER MOVE_PROTECT}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_SWAGGER, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [562] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_EARTHQUAKE MOVE_METEOR_MASH MOVE_PSYCH_UP MOVE_SWAGGER}, + .moves = {MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_PSYCH_UP, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [563] = { .species = SPECIES_SLAKING, - .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_YAWN MOVE_AMNESIA}, + .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_YAWN, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [564] = { .species = SPECIES_DUGTRIO, - .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_FISSURE}, + .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_FISSURE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [565] = { .species = SPECIES_MEDICHAM, - .moves = {MOVE_DYNAMIC_PUNCH MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_DYNAMIC_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_HARDY }, [566] = { .species = SPECIES_MISDREAVUS, - .moves = {MOVE_PERISH_SONG MOVE_MEAN_LOOK MOVE_THUNDER_WAVE MOVE_CONFUSE_RAY}, + .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [567] = { .species = SPECIES_FEAROW, - .moves = {MOVE_DRILL_PECK MOVE_RETURN MOVE_STEEL_WING MOVE_FAINT_ATTACK}, + .moves = {MOVE_DRILL_PECK, MOVE_RETURN, MOVE_STEEL_WING, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [568] = { .species = SPECIES_GRANBULL, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_SLUDGE_BOMB MOVE_ROCK_SLIDE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [569] = { .species = SPECIES_JYNX, - .moves = {MOVE_DREAM_EATER MOVE_LOVELY_KISS MOVE_ATTRACT MOVE_SUBSTITUTE}, + .moves = {MOVE_DREAM_EATER, MOVE_LOVELY_KISS, MOVE_ATTRACT, MOVE_SUBSTITUTE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [570] = { .species = SPECIES_DUSCLOPS, - .moves = {MOVE_PSYCH_UP MOVE_SWAGGER MOVE_SHADOW_BALL MOVE_EARTHQUAKE}, + .moves = {MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [571] = { .species = SPECIES_DODRIO, - .moves = {MOVE_DOUBLE_EDGE MOVE_DRILL_PECK MOVE_STEEL_WING MOVE_FAINT_ATTACK}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_FAINT_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [572] = { .species = SPECIES_MR_MIME, - .moves = {MOVE_TRICK MOVE_TORMENT MOVE_PSYCHIC MOVE_THUNDERBOLT}, + .moves = {MOVE_TRICK, MOVE_TORMENT, MOVE_PSYCHIC, MOVE_THUNDERBOLT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [573] = { .species = SPECIES_LANTURN, - .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_CONFUSE_RAY MOVE_RAIN_DANCE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_CONFUSE_RAY, MOVE_RAIN_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [574] = { .species = SPECIES_BRELOOM, - .moves = {MOVE_IRON_TAIL MOVE_FOCUS_PUNCH MOVE_ATTRACT MOVE_SPORE}, + .moves = {MOVE_IRON_TAIL, MOVE_FOCUS_PUNCH, MOVE_ATTRACT, MOVE_SPORE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [575] = { .species = SPECIES_FORRETRESS, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_GIGA_DRAIN MOVE_ZAP_CANNON}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_ZAP_CANNON}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [576] = { .species = SPECIES_WHISCASH, - .moves = {MOVE_SLEEP_TALK MOVE_REST MOVE_SURF MOVE_FISSURE}, + .moves = {MOVE_SLEEP_TALK, MOVE_REST, MOVE_SURF, MOVE_FISSURE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_HARDY }, [577] = { .species = SPECIES_XATU, - .moves = {MOVE_DRILL_PECK MOVE_PSYCHIC MOVE_GIGA_DRAIN MOVE_STEEL_WING}, + .moves = {MOVE_DRILL_PECK, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [578] = { .species = SPECIES_SKARMORY, - .moves = {MOVE_TOXIC MOVE_CURSE MOVE_REST MOVE_FLY}, + .moves = {MOVE_TOXIC, MOVE_CURSE, MOVE_REST, MOVE_FLY}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [579] = { .species = SPECIES_MAROWAK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_BRICK_BREAK}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [580] = { .species = SPECIES_QUAGSIRE, - .moves = {MOVE_EARTHQUAKE MOVE_SLUDGE_BOMB MOVE_DOUBLE_EDGE MOVE_CURSE}, + .moves = {MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [581] = { .species = SPECIES_CLEFABLE, - .moves = {MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_FLAMETHROWER MOVE_MAGICAL_LEAF}, + .moves = {MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_FLAMETHROWER, MOVE_MAGICAL_LEAF}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [582] = { .species = SPECIES_HARIYAMA, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_FACADE}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [583] = { .species = SPECIES_RAICHU, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_IRON_TAIL MOVE_ATTRACT}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_IRON_TAIL, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [584] = { .species = SPECIES_DEWGONG, - .moves = {MOVE_HORN_DRILL MOVE_SHEER_COLD MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_HORN_DRILL, MOVE_SHEER_COLD, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [585] = { .species = SPECIES_MANECTRIC, - .moves = {MOVE_THUNDERBOLT MOVE_IRON_TAIL MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [586] = { .species = SPECIES_VILEPLUME, - .moves = {MOVE_ATTRACT MOVE_STUN_SPORE MOVE_SLUDGE_BOMB MOVE_GIGA_DRAIN}, + .moves = {MOVE_ATTRACT, MOVE_STUN_SPORE, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [587] = { .species = SPECIES_VICTREEBEL, - .moves = {MOVE_STUN_SPORE MOVE_INGRAIN MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB}, + .moves = {MOVE_STUN_SPORE, MOVE_INGRAIN, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [588] = { .species = SPECIES_ELECTRODE, - .moves = {MOVE_EXPLOSION MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_ENDURE}, + .moves = {MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_NAUGHTY }, [589] = { .species = SPECIES_EXPLOUD, - .moves = {MOVE_OVERHEAT MOVE_ICE_BEAM MOVE_THUNDER_PUNCH MOVE_EXTRASENSORY}, + .moves = {MOVE_OVERHEAT, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_EXTRASENSORY}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [590] = { .species = SPECIES_SHIFTRY, - .moves = {MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_EXPLOSION MOVE_SYNTHESIS}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [591] = { .species = SPECIES_GLALIE, - .moves = {MOVE_BLIZZARD MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .moves = {MOVE_BLIZZARD, MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [592] = { .species = SPECIES_LUDICOLO, - .moves = {MOVE_LEECH_SEED MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_GIGA_DRAIN}, + .moves = {MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [593] = { .species = SPECIES_HYPNO, - .moves = {MOVE_PSYCH_UP MOVE_SWAGGER MOVE_MEGA_KICK MOVE_SHADOW_BALL}, + .moves = {MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_MEGA_KICK, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [594] = { .species = SPECIES_GOLEM, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_BRICK_BREAK}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [595] = { .species = SPECIES_RHYDON, - .moves = {MOVE_MEGAHORN MOVE_CRUSH_CLAW MOVE_EARTHQUAKE MOVE_HORN_DRILL}, + .moves = {MOVE_MEGAHORN, MOVE_CRUSH_CLAW, MOVE_EARTHQUAKE, MOVE_HORN_DRILL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [596] = { .species = SPECIES_ALAKAZAM, - .moves = {MOVE_TRICK MOVE_DISABLE MOVE_PSYCHIC MOVE_SKILL_SWAP}, + .moves = {MOVE_TRICK, MOVE_DISABLE, MOVE_PSYCHIC, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [597] = { .species = SPECIES_WEEZING, - .moves = {MOVE_EXPLOSION MOVE_SLUDGE_BOMB MOVE_FLAMETHROWER MOVE_THUNDERBOLT}, + .moves = {MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [598] = { .species = SPECIES_KANGASKHAN, - .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_THUNDERBOLT MOVE_EARTHQUAKE}, + .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [599] = { .species = SPECIES_ELECTABUZZ, - .moves = {MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_THUNDERBOLT MOVE_CROSS_CHOP}, + .moves = {MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDERBOLT, MOVE_CROSS_CHOP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [600] = { .species = SPECIES_TAUROS, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ICE_BEAM}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [601] = { .species = SPECIES_SLOWBRO, - .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ATTRACT}, + .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_QUIET }, [602] = { .species = SPECIES_SLOWKING, - .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [603] = { .species = SPECIES_MILTANK, - .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [604] = { .species = SPECIES_ALTARIA, - .moves = {MOVE_SING MOVE_DRAGON_DANCE MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_SING, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [605] = { .species = SPECIES_NIDOQUEEN, - .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_CRUNCH}, + .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_CRUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [606] = { .species = SPECIES_NIDOKING, - .moves = {MOVE_HORN_DRILL MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_SURF}, + .moves = {MOVE_HORN_DRILL, MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [607] = { .species = SPECIES_MAGMAR, - .moves = {MOVE_MEGA_KICK MOVE_CROSS_CHOP MOVE_IRON_TAIL MOVE_COUNTER}, + .moves = {MOVE_MEGA_KICK, MOVE_CROSS_CHOP, MOVE_IRON_TAIL, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_IMPISH }, [608] = { .species = SPECIES_CRADILY, - .moves = {MOVE_SUBSTITUTE MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_RECOVER}, + .moves = {MOVE_SUBSTITUTE, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [609] = { .species = SPECIES_ARMALDO, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_SWORDS_DANCE}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_SWORDS_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [610] = { .species = SPECIES_GOLDUCK, - .moves = {MOVE_HYDRO_PUMP MOVE_CROSS_CHOP MOVE_BLIZZARD MOVE_PROTECT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [611] = { .species = SPECIES_RAPIDASH, - .moves = {MOVE_OVERHEAT MOVE_SOLAR_BEAM MOVE_SUNNY_DAY MOVE_HYPNOSIS}, + .moves = {MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_HYPNOSIS}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [612] = { .species = SPECIES_MUK, - .moves = {MOVE_SLUDGE_BOMB MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_PUNCH}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_QUIET }, [613] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_GIGA_DRAIN MOVE_SKILL_SWAP}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_GIGA_DRAIN, MOVE_SKILL_SWAP}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [614] = { .species = SPECIES_AMPHAROS, - .moves = {MOVE_THUNDERBOLT MOVE_MEGA_KICK MOVE_IRON_TAIL MOVE_BRICK_BREAK}, + .moves = {MOVE_THUNDERBOLT, MOVE_MEGA_KICK, MOVE_IRON_TAIL, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [615] = { .species = SPECIES_SCIZOR, - .moves = {MOVE_REVERSAL MOVE_ENDURE MOVE_AGILITY MOVE_SLASH}, + .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY, MOVE_SLASH}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_CAREFUL }, [616] = { .species = SPECIES_HERACROSS, - .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [617] = { .species = SPECIES_URSARING, - .moves = {MOVE_FIRE_PUNCH MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH MOVE_CRUNCH}, + .moves = {MOVE_FIRE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_CRUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [618] = { .species = SPECIES_HOUNDOOM, - .moves = {MOVE_OVERHEAT MOVE_SHADOW_BALL MOVE_SLUDGE_BOMB MOVE_DOUBLE_EDGE}, + .moves = {MOVE_OVERHEAT, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [619] = { .species = SPECIES_DONPHAN, - .moves = {MOVE_FISSURE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SECRET_POWER}, + .moves = {MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SECRET_POWER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [620] = { .species = SPECIES_CLAYDOL, - .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_SOLAR_BEAM MOVE_SUNNY_DAY}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [621] = { .species = SPECIES_WAILORD, - .moves = {MOVE_HYDRO_PUMP MOVE_FISSURE MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_HYDRO_PUMP, MOVE_FISSURE, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [622] = { .species = SPECIES_NINETALES, - .moves = {MOVE_FIRE_BLAST MOVE_IRON_TAIL MOVE_CONFUSE_RAY MOVE_ATTRACT}, + .moves = {MOVE_FIRE_BLAST, MOVE_IRON_TAIL, MOVE_CONFUSE_RAY, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [623] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_FIRE_BLAST MOVE_THUNDER_PUNCH MOVE_ICE_PUNCH}, + .moves = {MOVE_CROSS_CHOP, MOVE_FIRE_BLAST, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [624] = { .species = SPECIES_SHUCKLE, - .moves = {MOVE_SUBSTITUTE MOVE_ATTRACT MOVE_TOXIC MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_TOXIC, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_CAREFUL }, [625] = { .species = SPECIES_STEELIX, - .moves = {MOVE_EARTHQUAKE MOVE_BODY_SLAM MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_ROCK_SLIDE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [626] = { .species = SPECIES_TENTACRUEL, - .moves = {MOVE_SURF MOVE_GIGA_DRAIN MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_GIGA_DRAIN, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [627] = { .species = SPECIES_AERODACTYL, - .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_FIRE_BLAST MOVE_DRAGON_CLAW}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_DRAGON_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [628] = { .species = SPECIES_PORYGON2, - .moves = {MOVE_PSYCHIC MOVE_TRI_ATTACK MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_TRI_ATTACK, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [629] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_FIRE_PUNCH MOVE_MAGICAL_LEAF}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH, MOVE_MAGICAL_LEAF}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [630] = { .species = SPECIES_EXEGGUTOR, - .moves = {MOVE_LEECH_SEED MOVE_GIGA_DRAIN MOVE_TOXIC MOVE_EXPLOSION}, + .moves = {MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [631] = { .species = SPECIES_STARMIE, - .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM}, + .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [632] = { .species = SPECIES_FLYGON, - .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_CLAW MOVE_FLAMETHROWER MOVE_GIGA_DRAIN}, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [633] = { .species = SPECIES_VENUSAUR, - .moves = {MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_SLEEP_POWDER}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SLEEP_POWDER}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [634] = { .species = SPECIES_VAPOREON, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_ACID_ARMOR MOVE_BATON_PASS}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [635] = { .species = SPECIES_JOLTEON, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_AGILITY MOVE_BATON_PASS}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_AGILITY, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [636] = { .species = SPECIES_FLAREON, - .moves = {MOVE_SHADOW_BALL MOVE_FLAIL MOVE_ENDURE MOVE_OVERHEAT}, + .moves = {MOVE_SHADOW_BALL, MOVE_FLAIL, MOVE_ENDURE, MOVE_OVERHEAT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [637] = { .species = SPECIES_MEGANIUM, - .moves = {MOVE_EARTHQUAKE MOVE_FLAIL MOVE_ENDURE MOVE_GIGA_DRAIN}, + .moves = {MOVE_EARTHQUAKE, MOVE_FLAIL, MOVE_ENDURE, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_JOLLY }, [638] = { .species = SPECIES_ESPEON, - .moves = {MOVE_PSYCHIC MOVE_BITE MOVE_WISH MOVE_REFLECT}, + .moves = {MOVE_PSYCHIC, MOVE_BITE, MOVE_WISH, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [639] = { .species = SPECIES_UMBREON, - .moves = {MOVE_SWAGGER MOVE_PSYCH_UP MOVE_ATTRACT MOVE_SHADOW_BALL}, + .moves = {MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ATTRACT, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [640] = { .species = SPECIES_BLASTOISE, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_COUNTER}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [641] = { .species = SPECIES_FERALIGATR, - .moves = {MOVE_HYDRO_PUMP MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_ROCK_SLIDE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [642] = { .species = SPECIES_AGGRON, - .moves = {MOVE_SURF MOVE_THUNDER MOVE_FIRE_BLAST MOVE_BLIZZARD}, + .moves = {MOVE_SURF, MOVE_THUNDER, MOVE_FIRE_BLAST, MOVE_BLIZZARD}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [643] = { .species = SPECIES_BLAZIKEN, - .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_ENDURE MOVE_REVERSAL}, + .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_REVERSAL}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [644] = { .species = SPECIES_WALREIN, - .moves = {MOVE_SHEER_COLD MOVE_FISSURE MOVE_SURF MOVE_ATTRACT}, + .moves = {MOVE_SHEER_COLD, MOVE_FISSURE, MOVE_SURF, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [645] = { .species = SPECIES_SCEPTILE, - .moves = {MOVE_LEAF_BLADE MOVE_EARTHQUAKE MOVE_CRUSH_CLAW MOVE_AERIAL_ACE}, + .moves = {MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [646] = { .species = SPECIES_CHARIZARD, - .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_BITE MOVE_BRICK_BREAK}, + .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_BITE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [647] = { .species = SPECIES_TYPHLOSION, - .moves = {MOVE_EARTHQUAKE MOVE_OVERHEAT MOVE_ENDURE MOVE_REVERSAL}, + .moves = {MOVE_EARTHQUAKE, MOVE_OVERHEAT, MOVE_ENDURE, MOVE_REVERSAL}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [648] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_DOUBLE_EDGE MOVE_PSYCHIC MOVE_CONFUSE_RAY MOVE_DRAGON_DANCE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [649] = { .species = SPECIES_CROBAT, - .moves = {MOVE_AIR_CUTTER MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_SCREECH}, + .moves = {MOVE_AIR_CUTTER, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_SCREECH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [650] = { .species = SPECIES_SWAMPERT, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_COUNTER}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_BRAVE }, [651] = { .species = SPECIES_GYARADOS, - .moves = {MOVE_SURF MOVE_THUNDER MOVE_RAIN_DANCE MOVE_EARTHQUAKE}, + .moves = {MOVE_SURF, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [652] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [653] = { .species = SPECIES_KINGDRA, - .moves = {MOVE_FLAIL MOVE_HYDRO_PUMP MOVE_DRAGON_DANCE MOVE_ENDURE}, + .moves = {MOVE_FLAIL, MOVE_HYDRO_PUMP, MOVE_DRAGON_DANCE, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [654] = { .species = SPECIES_BLISSEY, - .moves = {MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_CALM_MIND MOVE_SOFT_BOILED}, + .moves = {MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_CALM_MIND, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [655] = { .species = SPECIES_MILOTIC, - .moves = {MOVE_SURF MOVE_BLIZZARD MOVE_ATTRACT MOVE_RECOVER}, + .moves = {MOVE_SURF, MOVE_BLIZZARD, MOVE_ATTRACT, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [656] = { .species = SPECIES_ARCANINE, - .moves = {MOVE_OVERHEAT MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_AERIAL_ACE}, + .moves = {MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [657] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_ENDURE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [658] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_EARTHQUAKE MOVE_METEOR_MASH MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [659] = { .species = SPECIES_SLAKING, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_AERIAL_ACE MOVE_BRICK_BREAK}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_ADAMANT }, [660] = { .species = SPECIES_DUGTRIO, - .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_ROCK_SLIDE MOVE_FISSURE}, + .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FISSURE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [661] = { .species = SPECIES_MEDICHAM, - .moves = {MOVE_MEGA_KICK MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ROCK_SLIDE}, + .moves = {MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [662] = { .species = SPECIES_MISDREAVUS, - .moves = {MOVE_DESTINY_BOND MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT}, + .moves = {MOVE_DESTINY_BOND, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_TIMID }, [663] = { .species = SPECIES_FEAROW, - .moves = {MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_STEEL_WING MOVE_SKY_ATTACK}, + .moves = {MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SKY_ATTACK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [664] = { .species = SPECIES_GRANBULL, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_SHADOW_BALL}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_BRAVE }, [665] = { .species = SPECIES_JYNX, - .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_LOVELY_KISS MOVE_FAKE_TEARS}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_LOVELY_KISS, MOVE_FAKE_TEARS}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [666] = { .species = SPECIES_DUSCLOPS, - .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_CURSE MOVE_REST}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_CURSE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [667] = { .species = SPECIES_DODRIO, - .moves = {MOVE_FLAIL MOVE_ENDURE MOVE_DRILL_PECK MOVE_FACADE}, + .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_DRILL_PECK, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [668] = { .species = SPECIES_MR_MIME, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [669] = { .species = SPECIES_LANTURN, - .moves = {MOVE_SURF MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_CONFUSE_RAY}, + .moves = {MOVE_SURF, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [670] = { .species = SPECIES_BRELOOM, - .moves = {MOVE_FOCUS_PUNCH MOVE_SLUDGE_BOMB MOVE_SPORE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SLUDGE_BOMB, MOVE_SPORE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [671] = { .species = SPECIES_FORRETRESS, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DOUBLE_EDGE}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [672] = { .species = SPECIES_WHISCASH, - .moves = {MOVE_FISSURE MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM}, + .moves = {MOVE_FISSURE, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [673] = { .species = SPECIES_XATU, - .moves = {MOVE_PSYCHIC MOVE_DRILL_PECK MOVE_SHADOW_BALL MOVE_CONFUSE_RAY}, + .moves = {MOVE_PSYCHIC, MOVE_DRILL_PECK, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [674] = { .species = SPECIES_SKARMORY, - .moves = {MOVE_DRILL_PECK MOVE_STEEL_WING MOVE_COUNTER MOVE_ROCK_SLIDE}, + .moves = {MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_COUNTER, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [675] = { .species = SPECIES_MAROWAK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_SWORDS_DANCE MOVE_MEGA_KICK}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_MEGA_KICK}, .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [676] = { .species = SPECIES_QUAGSIRE, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_AMNESIA}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_AMNESIA}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_SASSY }, [677] = { .species = SPECIES_CLEFABLE, - .moves = {MOVE_MEGA_KICK MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_SOFT_BOILED}, + .moves = {MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [678] = { .species = SPECIES_HARIYAMA, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_FAKE_OUT}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [679] = { .species = SPECIES_RAICHU, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_PROTECT MOVE_MEGA_KICK}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_PROTECT, MOVE_MEGA_KICK}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [680] = { .species = SPECIES_DEWGONG, - .moves = {MOVE_SHEER_COLD MOVE_ICE_BEAM MOVE_SURF MOVE_SIGNAL_BEAM}, + .moves = {MOVE_SHEER_COLD, MOVE_ICE_BEAM, MOVE_SURF, MOVE_SIGNAL_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [681] = { .species = SPECIES_MANECTRIC, - .moves = {MOVE_THUNDERBOLT MOVE_CRUNCH MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [682] = { .species = SPECIES_VILEPLUME, - .moves = {MOVE_SOLAR_BEAM MOVE_SLUDGE_BOMB MOVE_SUNNY_DAY MOVE_SYNTHESIS}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [683] = { .species = SPECIES_VICTREEBEL, - .moves = {MOVE_GIGA_DRAIN MOVE_DOUBLE_EDGE MOVE_SLUDGE_BOMB MOVE_SYNTHESIS}, + .moves = {MOVE_GIGA_DRAIN, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_SYNTHESIS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [684] = { .species = SPECIES_ELECTRODE, - .moves = {MOVE_EXPLOSION MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_MIRROR_COAT}, + .moves = {MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_NAUGHTY }, [685] = { .species = SPECIES_EXPLOUD, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_OVERHEAT}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_OVERHEAT}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [686] = { .species = SPECIES_SHIFTRY, - .moves = {MOVE_EXPLOSION MOVE_GIGA_DRAIN MOVE_MEGA_KICK MOVE_FAKE_OUT}, + .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_MEGA_KICK, MOVE_FAKE_OUT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [687] = { .species = SPECIES_GLALIE, - .moves = {MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_SHADOW_BALL}, + .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [688] = { .species = SPECIES_LUDICOLO, - .moves = {MOVE_LEECH_SEED MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_TOXIC}, + .moves = {MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_TOXIC}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [689] = { .species = SPECIES_HYPNO, - .moves = {MOVE_PSYCHIC MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [690] = { .species = SPECIES_GOLEM, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DOUBLE_EDGE}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [691] = { .species = SPECIES_RHYDON, - .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_HORN_DRILL}, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_HORN_DRILL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [692] = { .species = SPECIES_ALAKAZAM, - .moves = {MOVE_PSYCHIC MOVE_THUNDER_PUNCH MOVE_FIRE_PUNCH MOVE_ICE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [693] = { .species = SPECIES_WEEZING, - .moves = {MOVE_EXPLOSION MOVE_SLUDGE_BOMB MOVE_FRUSTRATION MOVE_SHADOW_BALL}, + .moves = {MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FRUSTRATION, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [694] = { .species = SPECIES_KANGASKHAN, - .moves = {MOVE_MEGA_KICK MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_SHADOW_BALL}, + .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [695] = { .species = SPECIES_ELECTABUZZ, - .moves = {MOVE_THUNDERBOLT MOVE_PSYCHIC MOVE_MEGA_KICK MOVE_CROSS_CHOP}, + .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_MEGA_KICK, MOVE_CROSS_CHOP}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [696] = { .species = SPECIES_TAUROS, - .moves = {MOVE_DOUBLE_EDGE MOVE_ROCK_TOMB MOVE_THUNDERBOLT MOVE_SURF}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_TOMB, MOVE_THUNDERBOLT, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [697] = { .species = SPECIES_SLOWBRO, - .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM}, + .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_SASSY }, [698] = { .species = SPECIES_SLOWKING, - .moves = {MOVE_PSYCHIC MOVE_SURF MOVE_ICE_BEAM MOVE_FLAMETHROWER}, + .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [699] = { .species = SPECIES_MILTANK, - .moves = {MOVE_DOUBLE_EDGE MOVE_CURSE MOVE_DOUBLE_TEAM MOVE_MILK_DRINK}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_CURSE, MOVE_DOUBLE_TEAM, MOVE_MILK_DRINK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [700] = { .species = SPECIES_ALTARIA, - .moves = {MOVE_DRAGON_CLAW MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ICE_BEAM}, + .moves = {MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [701] = { .species = SPECIES_NIDOQUEEN, - .moves = {MOVE_SUPERPOWER MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .moves = {MOVE_SUPERPOWER, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [702] = { .species = SPECIES_NIDOKING, - .moves = {MOVE_MEGAHORN MOVE_SLUDGE_BOMB MOVE_EARTHQUAKE MOVE_THUNDER}, + .moves = {MOVE_MEGAHORN, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_THUNDER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [703] = { .species = SPECIES_MAGMAR, - .moves = {MOVE_FLAMETHROWER MOVE_PSYCHIC MOVE_CROSS_CHOP MOVE_CONFUSE_RAY}, + .moves = {MOVE_FLAMETHROWER, MOVE_PSYCHIC, MOVE_CROSS_CHOP, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [704] = { .species = SPECIES_CRADILY, - .moves = {MOVE_TOXIC MOVE_INGRAIN MOVE_MIRROR_COAT MOVE_GIGA_DRAIN}, + .moves = {MOVE_TOXIC, MOVE_INGRAIN, MOVE_MIRROR_COAT, MOVE_GIGA_DRAIN}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [705] = { .species = SPECIES_ARMALDO, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [706] = { .species = SPECIES_GOLDUCK, - .moves = {MOVE_SURF MOVE_CROSS_CHOP MOVE_ICE_BEAM MOVE_AERIAL_ACE}, + .moves = {MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [707] = { .species = SPECIES_RAPIDASH, - .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_IRON_TAIL MOVE_DOUBLE_KICK}, + .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_IRON_TAIL, MOVE_DOUBLE_KICK}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [708] = { .species = SPECIES_MUK, - .moves = {MOVE_SLUDGE_BOMB MOVE_BRICK_BREAK MOVE_GIGA_DRAIN MOVE_EXPLOSION}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_BRICK_BREAK, MOVE_GIGA_DRAIN, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_BRAVE }, [709] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_FIRE_PUNCH MOVE_ICE_PUNCH MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [710] = { .species = SPECIES_AMPHAROS, - .moves = {MOVE_THUNDERBOLT MOVE_FIRE_PUNCH MOVE_THUNDER_WAVE MOVE_REFLECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_THUNDER_WAVE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [711] = { .species = SPECIES_SCIZOR, - .moves = {MOVE_SILVER_WIND MOVE_SWORDS_DANCE MOVE_AGILITY MOVE_BATON_PASS}, + .moves = {MOVE_SILVER_WIND, MOVE_SWORDS_DANCE, MOVE_AGILITY, MOVE_BATON_PASS}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [712] = { .species = SPECIES_HERACROSS, - .moves = {MOVE_MEGAHORN MOVE_EARTHQUAKE MOVE_REVERSAL MOVE_ENDURE}, + .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_REVERSAL, MOVE_ENDURE}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [713] = { .species = SPECIES_URSARING, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AERIAL_ACE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [714] = { .species = SPECIES_HOUNDOOM, - .moves = {MOVE_OVERHEAT MOVE_SOLAR_BEAM MOVE_CRUNCH MOVE_SUNNY_DAY}, + .moves = {MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_CRUNCH, MOVE_SUNNY_DAY}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [715] = { .species = SPECIES_DONPHAN, - .moves = {MOVE_FISSURE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_IRON_TAIL}, + .moves = {MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_IRON_TAIL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [716] = { .species = SPECIES_CLAYDOL, - .moves = {MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_EXPLOSION}, + .moves = {MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [717] = { .species = SPECIES_WAILORD, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_FISSURE}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_FISSURE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [718] = { .species = SPECIES_NINETALES, - .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_CONFUSE_RAY MOVE_WILL_O_WISP}, + .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_QUIRKY }, [719] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_FLAMETHROWER MOVE_ROCK_SLIDE}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [720] = { .species = SPECIES_SHUCKLE, - .moves = {MOVE_TOXIC MOVE_DOUBLE_TEAM MOVE_WRAP MOVE_REST}, + .moves = {MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_WRAP, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_CAREFUL }, [721] = { .species = SPECIES_STEELIX, - .moves = {MOVE_EARTHQUAKE MOVE_IRON_TAIL MOVE_DOUBLE_EDGE MOVE_EXPLOSION}, + .moves = {MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [722] = { .species = SPECIES_TENTACRUEL, - .moves = {MOVE_HYDRO_PUMP MOVE_SLUDGE_BOMB MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .moves = {MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIRKY }, [723] = { .species = SPECIES_AERODACTYL, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_FIRE_BLAST MOVE_BITE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_BITE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [724] = { .species = SPECIES_PORYGON2, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [725] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_FIRE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [726] = { .species = SPECIES_EXEGGUTOR, - .moves = {MOVE_PSYCHIC MOVE_GIGA_DRAIN MOVE_SLUDGE_BOMB MOVE_EXPLOSION}, + .moves = {MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [727] = { .species = SPECIES_STARMIE, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [728] = { .species = SPECIES_FLYGON, - .moves = {MOVE_EARTHQUAKE MOVE_DRAGON_CLAW MOVE_DOUBLE_EDGE MOVE_CRUNCH}, + .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_DOUBLE_EDGE, MOVE_CRUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [729] = { .species = SPECIES_VENUSAUR, - .moves = {MOVE_SOLAR_BEAM MOVE_SLUDGE_BOMB MOVE_SUNNY_DAY MOVE_EARTHQUAKE}, + .moves = {MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [730] = { .species = SPECIES_VAPOREON, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_ACID_ARMOR MOVE_REST}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [731] = { .species = SPECIES_JOLTEON, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_BITE MOVE_SHADOW_BALL}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BITE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_TIMID }, [732] = { .species = SPECIES_FLAREON, - .moves = {MOVE_OVERHEAT MOVE_SUNNY_DAY MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL}, + .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [733] = { .species = SPECIES_MEGANIUM, - .moves = {MOVE_GIGA_DRAIN MOVE_EARTHQUAKE MOVE_ANCIENT_POWER MOVE_BODY_SLAM}, + .moves = {MOVE_GIGA_DRAIN, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_BODY_SLAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [734] = { .species = SPECIES_ESPEON, - .moves = {MOVE_PSYCHIC MOVE_BITE MOVE_ATTRACT MOVE_CALM_MIND}, + .moves = {MOVE_PSYCHIC, MOVE_BITE, MOVE_ATTRACT, MOVE_CALM_MIND}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [735] = { .species = SPECIES_UMBREON, - .moves = {MOVE_CONFUSE_RAY MOVE_TOXIC MOVE_FAINT_ATTACK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [736] = { .species = SPECIES_BLASTOISE, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [737] = { .species = SPECIES_FERALIGATR, - .moves = {MOVE_HYDRO_PUMP MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [738] = { .species = SPECIES_AGGRON, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_AERIAL_ACE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [739] = { .species = SPECIES_BLAZIKEN, - .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_THUNDER_PUNCH MOVE_ROCK_SLIDE}, + .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_THUNDER_PUNCH, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [740] = { .species = SPECIES_WALREIN, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_EARTHQUAKE MOVE_SHEER_COLD}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_SHEER_COLD}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [741] = { .species = SPECIES_SCEPTILE, - .moves = {MOVE_LEAF_BLADE MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_THUNDER_PUNCH}, + .moves = {MOVE_LEAF_BLADE, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_THUNDER_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [742] = { .species = SPECIES_CHARIZARD, - .moves = {MOVE_OVERHEAT MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ROCK_SLIDE}, + .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [743] = { .species = SPECIES_TYPHLOSION, - .moves = {MOVE_OVERHEAT MOVE_THUNDER_PUNCH MOVE_EARTHQUAKE MOVE_CRUSH_CLAW}, + .moves = {MOVE_OVERHEAT, MOVE_THUNDER_PUNCH, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [744] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_PSYCHIC}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_PSYCHIC}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [745] = { .species = SPECIES_CROBAT, - .moves = {MOVE_SLUDGE_BOMB MOVE_AERIAL_ACE MOVE_SHADOW_BALL MOVE_CONFUSE_RAY}, + .moves = {MOVE_SLUDGE_BOMB, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [746] = { .species = SPECIES_SWAMPERT, - .moves = {MOVE_SURF MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [747] = { .species = SPECIES_GYARADOS, - .moves = {MOVE_RETURN MOVE_EARTHQUAKE MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_RETURN, MOVE_EARTHQUAKE, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [748] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_DOUBLE_EDGE MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_CURSE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [749] = { .species = SPECIES_KINGDRA, - .moves = {MOVE_DOUBLE_EDGE MOVE_ICE_BEAM MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_ICE_BEAM, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [750] = { .species = SPECIES_BLISSEY, - .moves = {MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_COUNTER MOVE_SOFT_BOILED}, + .moves = {MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_COUNTER, MOVE_SOFT_BOILED}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_BOLD }, [751] = { .species = SPECIES_MILOTIC, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RECOVER MOVE_MIRROR_COAT}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_MIRROR_COAT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [752] = { .species = SPECIES_ARCANINE, - .moves = {MOVE_OVERHEAT MOVE_EXTREME_SPEED MOVE_CRUNCH MOVE_DOUBLE_EDGE}, + .moves = {MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [753] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [754] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_EARTHQUAKE MOVE_SHADOW_BALL}, + .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [755] = { .species = SPECIES_SLAKING, - .moves = {MOVE_THUNDERBOLT MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_YAWN}, + .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_YAWN}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK, .nature = NATURE_MODEST }, [756] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_ICE_BEAM MOVE_WATER_PULSE MOVE_ICY_WIND MOVE_ROAR}, + .moves = {MOVE_ICE_BEAM, MOVE_WATER_PULSE, MOVE_ICY_WIND, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [757] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [758] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_FLAMETHROWER MOVE_AERIAL_ACE MOVE_MUD_SLAP MOVE_ROAR}, + .moves = {MOVE_FLAMETHROWER, MOVE_AERIAL_ACE, MOVE_MUD_SLAP, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [759] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [760] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_TEAM MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [761] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_DOUBLE_TEAM MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_SURF, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [762] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_SUPERPOWER MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .moves = {MOVE_SUPERPOWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [763] = { .species = SPECIES_REGICE, - .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_AMNESIA MOVE_REST}, + .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_AMNESIA, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [764] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_METAL_CLAW MOVE_CURSE MOVE_AMNESIA MOVE_REST}, + .moves = {MOVE_METAL_CLAW, MOVE_CURSE, MOVE_AMNESIA, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [765] = { .species = SPECIES_LATIAS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [766] = { .species = SPECIES_LATIOS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [767] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_SUBSTITUTE MOVE_TOXIC MOVE_BLIZZARD MOVE_DOUBLE_TEAM}, + .moves = {MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_BLIZZARD, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [768] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DRILL_PECK MOVE_DOUBLE_TEAM}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DRILL_PECK, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [769] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_OVERHEAT MOVE_AERIAL_ACE MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .moves = {MOVE_OVERHEAT, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [770] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_DOUBLE_TEAM MOVE_REFLECT}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [771] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_SOLAR_BEAM MOVE_REFLECT}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [772] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_TOXIC MOVE_DIVE MOVE_DOUBLE_TEAM MOVE_PROTECT}, + .moves = {MOVE_TOXIC, MOVE_DIVE, MOVE_DOUBLE_TEAM, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [773] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_EXPLOSION}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [774] = { .species = SPECIES_REGICE, - .moves = {MOVE_THUNDER MOVE_RAIN_DANCE MOVE_BLIZZARD MOVE_BRICK_BREAK}, + .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [775] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [776] = { .species = SPECIES_LATIAS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [777] = { .species = SPECIES_LATIOS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [778] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_ICE_BEAM MOVE_FACADE MOVE_AERIAL_ACE MOVE_PROTECT}, + .moves = {MOVE_ICE_BEAM, MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PROTECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [779] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_SUBSTITUTE}, + .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_SUBSTITUTE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [780] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_FIRE_BLAST MOVE_SUNNY_DAY MOVE_DOUBLE_TEAM MOVE_REST}, + .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_DOUBLE_TEAM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [781] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_QUICK_ATTACK MOVE_ROAR}, + .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [782] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FLAMETHROWER MOVE_DOUBLE_EDGE MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_EDGE, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [783] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_RAIN_DANCE MOVE_ROAR}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [784] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_ROCK_SLIDE MOVE_EARTHQUAKE MOVE_CURSE MOVE_REST}, + .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_CURSE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [785] = { .species = SPECIES_REGICE, - .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_THUNDER_WAVE MOVE_EXPLOSION}, + .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_QUIET }, [786] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_ANCIENT_POWER MOVE_AMNESIA MOVE_COUNTER MOVE_EXPLOSION}, + .moves = {MOVE_ANCIENT_POWER, MOVE_AMNESIA, MOVE_COUNTER, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [787] = { .species = SPECIES_LATIAS, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [788] = { .species = SPECIES_LATIOS, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_EARTHQUAKE}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [789] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_REST MOVE_REFLECT}, + .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [790] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_THUNDER_WAVE MOVE_LIGHT_SCREEN}, + .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [791] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_STEEL_WING MOVE_SAFEGUARD}, + .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SAFEGUARD}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_QUIET }, [792] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_BITE MOVE_THUNDER_WAVE MOVE_REFLECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [793] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FLAMETHROWER MOVE_BITE MOVE_DOUBLE_TEAM MOVE_REFLECT}, + .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [794] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_BITE MOVE_REFLECT}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BITE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [795] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_ROCK_SLIDE MOVE_BRICK_BREAK MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_CAREFUL }, [796] = { .species = SPECIES_REGICE, - .moves = {MOVE_ICE_BEAM MOVE_HAIL MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_ICE_BEAM, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [797] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_ANCIENT_POWER MOVE_EARTHQUAKE MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_IMPISH }, [798] = { .species = SPECIES_LATIAS, - .moves = {MOVE_MIST_BALL MOVE_SHADOW_BALL MOVE_CHARM MOVE_REFLECT}, + .moves = {MOVE_MIST_BALL, MOVE_SHADOW_BALL, MOVE_CHARM, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [799] = { .species = SPECIES_LATIOS, - .moves = {MOVE_LUSTER_PURGE MOVE_THUNDERBOLT MOVE_ICE_BEAM MOVE_DRAGON_CLAW}, + .moves = {MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [800] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT MOVE_FIRE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [801] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_THUNDERBOLT MOVE_ICE_PUNCH}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [802] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_FIRE_PUNCH MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [803] = { .species = SPECIES_GENGAR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_ICE_PUNCH MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [804] = { .species = SPECIES_URSARING, - .moves = {MOVE_MEGA_KICK MOVE_AERIAL_ACE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .moves = {MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [805] = { .species = SPECIES_URSARING, - .moves = {MOVE_HYPER_BEAM MOVE_YAWN MOVE_SWORDS_DANCE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_HYPER_BEAM, MOVE_YAWN, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [806] = { .species = SPECIES_URSARING, - .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_BULK_UP}, + .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BULK_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [807] = { .species = SPECIES_URSARING, - .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_CRUNCH MOVE_BRICK_BREAK}, + .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [808] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE}, + .moves = {MOVE_CROSS_CHOP, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [809] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_CROSS_CHOP MOVE_EARTHQUAKE MOVE_COUNTER MOVE_ROCK_TOMB}, + .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_ROCK_TOMB}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [810] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [811] = { .species = SPECIES_MACHAMP, - .moves = {MOVE_REVENGE MOVE_ROCK_SLIDE MOVE_FACADE MOVE_COUNTER}, + .moves = {MOVE_REVENGE, MOVE_ROCK_SLIDE, MOVE_FACADE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [812] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_ENDURE MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ENDURE, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [813] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_WILL_O_WISP MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP, .nature = NATURE_TIMID }, [814] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_CALM_MIND MOVE_WILL_O_WISP MOVE_DESTINY_BOND}, + .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BOLD }, [815] = { .species = SPECIES_GARDEVOIR, - .moves = {MOVE_PSYCHIC MOVE_MAGICAL_LEAF MOVE_ATTRACT MOVE_DOUBLE_TEAM}, + .moves = {MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_ATTRACT, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [816] = { .species = SPECIES_STARMIE, - .moves = {MOVE_SURF MOVE_PSYCHIC MOVE_RECOVER MOVE_LIGHT_SCREEN}, + .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_RECOVER, MOVE_LIGHT_SCREEN}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [817] = { .species = SPECIES_STARMIE, - .moves = {MOVE_SURF MOVE_CONFUSE_RAY MOVE_THUNDER_WAVE MOVE_RECOVER}, + .moves = {MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [818] = { .species = SPECIES_STARMIE, - .moves = {MOVE_PSYCHIC MOVE_ICE_BEAM MOVE_COSMIC_POWER MOVE_RECOVER}, + .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [819] = { .species = SPECIES_STARMIE, - .moves = {MOVE_SURF MOVE_THUNDERBOLT MOVE_COSMIC_POWER MOVE_RECOVER}, + .moves = {MOVE_SURF, MOVE_THUNDERBOLT, MOVE_COSMIC_POWER, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [820] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_PSYCHIC MOVE_THUNDERBOLT MOVE_IRON_TAIL MOVE_DOUBLE_EDGE}, + .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [821] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_HYDRO_PUMP MOVE_THUNDER MOVE_RAIN_DANCE MOVE_BLIZZARD}, + .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [822] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SHEER_COLD MOVE_HORN_DRILL MOVE_REST MOVE_SLEEP_TALK}, + .moves = {MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_REST, MOVE_SLEEP_TALK}, .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [823] = { .species = SPECIES_LAPRAS, - .moves = {MOVE_SHEER_COLD MOVE_HORN_DRILL MOVE_SING MOVE_ATTRACT}, + .moves = {MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_SING, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_CALM }, [824] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_MEGA_KICK MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_COUNTER}, + .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [825] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_BRICK_BREAK MOVE_COUNTER}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [826] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_HYPER_BEAM MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_CURSE}, + .moves = {MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [827] = { .species = SPECIES_SNORLAX, - .moves = {MOVE_RETURN MOVE_SHADOW_BALL MOVE_BELLY_DRUM MOVE_REST}, + .moves = {MOVE_RETURN, MOVE_SHADOW_BALL, MOVE_BELLY_DRUM, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [828] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_FACADE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE}, + .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [829] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_HEADBUTT MOVE_AERIAL_ACE MOVE_CRUNCH MOVE_DRAGON_DANCE}, + .moves = {MOVE_HEADBUTT, MOVE_AERIAL_ACE, MOVE_CRUNCH, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_HARDY }, [830] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_BRICK_BREAK}, + .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [831] = { .species = SPECIES_SALAMENCE, - .moves = {MOVE_FLAMETHROWER MOVE_DRAGON_CLAW MOVE_CRUNCH MOVE_ATTRACT}, + .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [832] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_EXPLOSION MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_BRICK_BREAK}, + .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_JOLLY }, [833] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_METEOR_MASH MOVE_PSYCHIC MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [834] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_ICE_PUNCH MOVE_THUNDER_PUNCH}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [835] = { .species = SPECIES_METAGROSS, - .moves = {MOVE_METEOR_MASH MOVE_EARTHQUAKE MOVE_BRICK_BREAK MOVE_EXPLOSION}, + .moves = {MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [836] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_HYPER_BEAM MOVE_FOCUS_PUNCH MOVE_ROCK_SLIDE MOVE_DOUBLE_TEAM}, + .moves = {MOVE_HYPER_BEAM, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [837] = { .species = SPECIES_REGIROCK, - .moves = {MOVE_SWAGGER MOVE_PSYCH_UP MOVE_ROCK_SLIDE MOVE_EXPLOSION}, + .moves = {MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ROCK_SLIDE, MOVE_EXPLOSION}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [838] = { .species = SPECIES_REGICE, - .moves = {MOVE_EARTHQUAKE MOVE_ICE_BEAM MOVE_CURSE MOVE_COUNTER}, + .moves = {MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_COUNTER}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_BRAVE }, [839] = { .species = SPECIES_REGICE, - .moves = {MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_SLEEP_TALK MOVE_REST}, + .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_SLEEP_TALK, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [840] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_FOCUS_PUNCH MOVE_SUBSTITUTE MOVE_TOXIC MOVE_DOUBLE_TEAM}, + .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_DOUBLE_TEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [841] = { .species = SPECIES_REGISTEEL, - .moves = {MOVE_SUPERPOWER MOVE_AERIAL_ACE MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_SUPERPOWER, MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [842] = { .species = SPECIES_LATIAS, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_RECOVER}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [843] = { .species = SPECIES_LATIAS, - .moves = {MOVE_MIST_BALL MOVE_DRAGON_CLAW MOVE_ATTRACT MOVE_THUNDER_WAVE}, + .moves = {MOVE_MIST_BALL, MOVE_DRAGON_CLAW, MOVE_ATTRACT, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [844] = { .species = SPECIES_LATIAS, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_SWAGGER MOVE_PSYCH_UP}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [845] = { .species = SPECIES_LATIAS, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [846] = { .species = SPECIES_LATIOS, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE MOVE_CALM_MIND MOVE_RECOVER}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [847] = { .species = SPECIES_LATIOS, - .moves = {MOVE_LUSTER_PURGE MOVE_SHADOW_BALL MOVE_DRAGON_CLAW MOVE_THUNDER_WAVE}, + .moves = {MOVE_LUSTER_PURGE, MOVE_SHADOW_BALL, MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [848] = { .species = SPECIES_LATIOS, - .moves = {MOVE_EARTHQUAKE MOVE_SHADOW_BALL MOVE_DRAGON_DANCE MOVE_RECOVER}, + .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_DRAGON_DANCE, MOVE_RECOVER}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [849] = { .species = SPECIES_LATIOS, - .moves = {MOVE_PSYCHIC MOVE_SHADOW_BALL MOVE_EARTHQUAKE MOVE_AERIAL_ACE}, + .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE}, .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [850] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_BRICK_BREAK MOVE_DRAGON_DANCE}, + .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [851] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_EARTHQUAKE MOVE_DOUBLE_EDGE MOVE_AERIAL_ACE MOVE_DRAGON_DANCE}, + .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [852] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_HYPER_BEAM MOVE_ATTRACT MOVE_DOUBLE_TEAM MOVE_THUNDER_WAVE}, + .moves = {MOVE_HYPER_BEAM, MOVE_ATTRACT, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK, .nature = NATURE_ADAMANT }, [853] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_HYPER_BEAM MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_HYPER_BEAM, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [854] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_OUTRAGE MOVE_DOUBLE_EDGE MOVE_THUNDER_WAVE MOVE_ROAR}, + .moves = {MOVE_OUTRAGE, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE, MOVE_ROAR}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [855] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_SURF MOVE_FLAMETHROWER}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_FLAMETHROWER}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [856] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_DRAGON_CLAW MOVE_THUNDERBOLT MOVE_SURF MOVE_ICE_BEAM}, + .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [857] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_DRAGON_CLAW MOVE_FLAMETHROWER MOVE_ICE_BEAM MOVE_BRICK_BREAK}, + .moves = {MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_BRICK_BREAK}, .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [858] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_THUNDER MOVE_SURF MOVE_RAIN_DANCE MOVE_EARTHQUAKE}, + .moves = {MOVE_THUNDER, MOVE_SURF, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [859] = { .species = SPECIES_DRAGONITE, - .moves = {MOVE_FIRE_BLAST MOVE_BLIZZARD MOVE_SUNNY_DAY MOVE_EARTHQUAKE}, + .moves = {MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_DOCILE }, [860] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_THUNDERBOLT MOVE_SURF}, + .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_THUNDERBOLT, MOVE_SURF}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [861] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CRUNCH MOVE_THUNDERBOLT}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_THUNDERBOLT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [862] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_COUNTER MOVE_DRAGON_DANCE}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [863] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_CRUNCH MOVE_ICE_BEAM MOVE_THUNDERBOLT MOVE_FLAMETHROWER}, + .moves = {MOVE_CRUNCH, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [864] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [865] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_CURSE MOVE_REST}, + .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [866] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_ROCK_SLIDE MOVE_AERIAL_ACE MOVE_BRICK_BREAK MOVE_CURSE}, + .moves = {MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_CURSE}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [867] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_ROCK_SLIDE MOVE_THUNDER_WAVE MOVE_DRAGON_DANCE MOVE_REST}, + .moves = {MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [868] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_CRUNCH MOVE_EARTHQUAKE MOVE_AERIAL_ACE MOVE_ATTRACT}, + .moves = {MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ATTRACT}, .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_HARDY }, [869] = { .species = SPECIES_TYRANITAR, - .moves = {MOVE_DOUBLE_EDGE MOVE_EARTHQUAKE MOVE_ROCK_SLIDE MOVE_DRAGON_DANCE}, + .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_ADAMANT }, [870] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_BLIZZARD MOVE_DOUBLE_EDGE MOVE_AGILITY MOVE_SWAGGER}, + .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_AGILITY, MOVE_SWAGGER}, .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [871] = { .species = SPECIES_ARTICUNO, - .moves = {MOVE_ICE_BEAM MOVE_AERIAL_ACE MOVE_REFLECT MOVE_REST}, + .moves = {MOVE_ICE_BEAM, MOVE_AERIAL_ACE, MOVE_REFLECT, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [872] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDERBOLT MOVE_DRILL_PECK MOVE_DOUBLE_EDGE MOVE_THUNDER_WAVE}, + .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE}, .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [873] = { .species = SPECIES_ZAPDOS, - .moves = {MOVE_THUNDER MOVE_DRILL_PECK MOVE_RAIN_DANCE MOVE_DOUBLE_EDGE}, + .moves = {MOVE_THUNDER, MOVE_DRILL_PECK, MOVE_RAIN_DANCE, MOVE_DOUBLE_EDGE}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [874] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_OVERHEAT MOVE_SUNNY_DAY MOVE_SWAGGER MOVE_FACADE}, + .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_SWAGGER, MOVE_FACADE}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_DOCILE }, [875] = { .species = SPECIES_MOLTRES, - .moves = {MOVE_OVERHEAT MOVE_DOUBLE_EDGE MOVE_AERIAL_ACE MOVE_STEEL_WING}, + .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_STEEL_WING}, .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK, .nature = NATURE_DOCILE }, [876] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_DOUBLE_EDGE MOVE_ROAR MOVE_REFLECT}, + .moves = {MOVE_THUNDERBOLT, MOVE_DOUBLE_EDGE, MOVE_ROAR, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED, .nature = NATURE_MODEST }, [877] = { .species = SPECIES_RAIKOU, - .moves = {MOVE_THUNDERBOLT MOVE_CALM_MIND MOVE_SUBSTITUTE MOVE_REST}, + .moves = {MOVE_THUNDERBOLT, MOVE_CALM_MIND, MOVE_SUBSTITUTE, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [878] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FIRE_BLAST MOVE_DOUBLE_EDGE MOVE_ENDURE MOVE_REFLECT}, + .moves = {MOVE_FIRE_BLAST, MOVE_DOUBLE_EDGE, MOVE_ENDURE, MOVE_REFLECT}, .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_DOCILE }, [879] = { .species = SPECIES_ENTEI, - .moves = {MOVE_FLAMETHROWER MOVE_CALM_MIND MOVE_ROAR MOVE_REST}, + .moves = {MOVE_FLAMETHROWER, MOVE_CALM_MIND, MOVE_ROAR, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE, .nature = NATURE_MODEST }, [880] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_ICY_WIND}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_ICY_WIND}, .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY, .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP, .nature = NATURE_MODEST }, [881] = { .species = SPECIES_SUICUNE, - .moves = {MOVE_SURF MOVE_ICE_BEAM MOVE_CALM_MIND MOVE_REST}, + .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_REST}, .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY, .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP, .nature = NATURE_MODEST diff --git a/src/data/battle_frontier/battle_frontier_trainers.h b/src/data/battle_frontier/battle_frontier_trainers.h index 2b6b0d443..faef40656 100644 --- a/src/data/battle_frontier/battle_frontier_trainers.h +++ b/src/data/battle_frontier/battle_frontier_trainers.h @@ -1,32 +1,32 @@ -const struct BattleFrontierTrainer gBattleFrontierTrainers[] = +const struct BattleFrontierTrainer gBattleFrontierTrainers[] = { [0] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("BRAD"), + .trainerName = _("BRADY"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_EXCL}, - .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, -1}, - .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, -1, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, + .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, 0xFFFF}, + .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, 0xFFFF, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Brady }, [1] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("CONNE"), - .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, -1, -1}, - .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, -1}, + .trainerName = _("CONNER"), + .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, 0xFFFF, 0xFFFF}, + .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, 0xFFFF}, .speechLose = {EC_WORD_DARN, EC_WORD_ELLIPSIS, EC_WORD_LOSING, EC_WORD_DOES, EC_WORD_BUG, EC_WORD_ME}, .monSets = gBattleFrontierTrainerMons_Conner }, [2] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("BRADLE"), + .trainerName = _("BRADLEY"), .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_TODAY}, - .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, -1, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, 0xFFFF, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL}, .speechLose = {EC_WORD_TOMORROW, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_WE, EC_WORD_REALLY, EC_WORD_BATTLE}, .monSets = gBattleFrontierTrainerMons_Bradley }, [3] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("CYBI"), + .trainerName = _("CYBIL"), .speechBefore = {EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_NOT_VERY, EC_WORD_SCARY, EC_WORD_AT, EC_WORD_ALL}, .speechWin = {EC_WORD_IT_S, EC_WORD_SAD, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(STRUGGLE)}, .speechLose = {EC_WORD_THIS, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_TO_ME, EC_WORD_EXCL}, @@ -34,7 +34,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [4] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("RODETT"), + .trainerName = _("RODETTE"), .speechBefore = {EC_WORD_OH, EC_WORD_THIS, EC_WORD_IS, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_EXCL}, .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_HOW, EC_WORD_STRONG, EC_WORD_I_AM, EC_WORD_EXCL}, .speechLose = {EC_WORD_OH_DEAR, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_NO, EC_WORD_GOOD}, @@ -42,39 +42,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [5] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("PEGG"), + .trainerName = _("PEGGY"), .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_BE, EC_WORD_DESTROYED, EC_WORD_EXCL}, - .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL}, + .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_THANKS, EC_WORD_TO, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Peggy }, [6] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("KEIT"), + .trainerName = _("KEITH"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_JUST, EC_WORD_STUDY, EC_WORD_YOU, EC_WORD_KNOW}, - .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Keith }, [7] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("GRAYSO"), + .trainerName = _("GRAYSON"), .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_BATTLE, EC_WORD_ISN_T, EC_WORD_CHILD_S_PLAY, EC_WORD_EXCL}, - .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_LIKE, EC_WORD_TOYS, EC_WORD_TO, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Grayson }, [8] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("GLEN"), - .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, -1}, - .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, -1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, + .trainerName = _("GLENN"), + .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, 0xFFFF}, + .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, 0xFFFF, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM}, .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_COOL}, .monSets = gBattleFrontierTrainerMons_Glenn }, [9] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("LILIAN"), + .trainerName = _("LILIANA"), .speechBefore = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN}, .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_SURRENDER, EC_WORD_IN, EC_WORD_ME}, .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_ELLIPSIS}, @@ -82,7 +82,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [10] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("ELIS"), + .trainerName = _("ELISE"), .speechBefore = {EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_FROM, EC_WORD_MY, EC_WORD_FATHER}, .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_EXCL, EC_WORD_FATHER, EC_WORD_I_VE, EC_WORD_WON}, .speechLose = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FATHER, EC_WORD_FOR, EC_WORD_I_VE, EC_WORD_LOST}, @@ -90,23 +90,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [11] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("ZOE"), + .trainerName = _("ZOEY"), .speechBefore = {EC_WORD_PLEASE, EC_WORD_BATTLE, EC_WORD_LIKE, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT}, - .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, -1, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, .speechLose = {EC_WORD_WERE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_BEING, EC_WORD_SERIOUS, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Zoey }, [12] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("MANUE"), + .trainerName = _("MANUEL"), .speechBefore = {EC_WORD_ME, EC_WORD_LOSE, EC_WORD_QUES, EC_WORD_THAT_S, EC_WORD_PREPOSTEROUS, EC_WORD_EXCL}, - .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, -1, -1, -1}, - .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER}, + .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, 0xFFFF, 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER}, .monSets = gBattleFrontierTrainerMons_Manuel }, [13] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("RUS"), + .trainerName = _("RUSS"), .speechBefore = {EC_WORD_THEY, EC_WORD_ALL, EC_WORD_WANT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_POKEMON}, .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PARTY}, .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_DO, EC_WORD_THAT, EC_WORD_QUES}, @@ -114,15 +114,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [14] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("DUSTI"), - .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, -1}, - .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, -1}, + .trainerName = _("DUSTIN"), + .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, 0xFFFF}, + .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Dustin }, [15] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("TIN"), + .trainerName = _("TINA"), .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(SWEET_KISS)}, .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_YOUR, EC_MOVE2(SWEET_KISS), EC_WORD_FROM, EC_WORD_MY, EC_POKEMON2(JYNX)}, .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_A, EC_MOVE(SWIFT), EC_MOVE2(MEGA_KICK), EC_WORD_INSTEAD}, @@ -130,23 +130,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [16] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("GILLIA"), + .trainerName = _("GILLIAN"), .speechBefore = {EC_WORD_THE, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_IS, EC_WORD_SO, EC_WORD_YESTERDAY}, .speechWin = {EC_WORD_POKEMON, EC_WORD_NEVER, EC_WORD_GO, EC_WORD_OUT, EC_WORD_OF, EC_WORD_FASHION}, - .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, -1, -1}, + .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Gillian }, [17] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("ZO"), + .trainerName = _("ZOE"), .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_A, EC_WORD_WORRY, EC_WORD_AT, EC_WORD_ALL}, - .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, -1}, + .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SKILL}, .monSets = gBattleFrontierTrainerMons_Zoe }, [18] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("CHE"), + .trainerName = _("CHEN"), .speechBefore = {EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_TODAY}, .speechWin = {EC_WORD_I_AM, EC_WORD_READY, EC_WORD_TO, EC_WORD_GO, EC_WORD_ON, EC_WORD_EXCL}, .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_MOVE(FOCUS_ENERGY), EC_WORD_AND, EC_WORD_TOUGHNESS}, @@ -154,31 +154,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [19] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("A"), + .trainerName = _("AL"), .speechBefore = {EC_WORD_YOUR, EC_WORD_LOOK, EC_WORD_SAYS, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH}, - .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, -1}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_RIGHT, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH}, .monSets = gBattleFrontierTrainerMons_Al }, [20] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("MITC"), + .trainerName = _("MITCH"), .speechBefore = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_IS, EC_WORD_MY, EC_WORD_ALLY, EC_WORD_EXCL}, .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES}, - .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Mitch }, [21] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("ANN"), + .trainerName = _("ANNE"), .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_NOW}, - .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Anne }, [22] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("ALIZ"), + .trainerName = _("ALIZE"), .speechBefore = {EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_ME}, .speechWin = {EC_WORD_YUP, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG}, .speechLose = {EC_WORD_I_AM, EC_WORD_WEAK, EC_WORD_ELLIPSIS, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_CUTE}, @@ -186,7 +186,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [23] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("LAURE"), + .trainerName = _("LAUREN"), .speechBefore = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_ALSO, EC_WORD_GOOD}, .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_I_WAS, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_GOOD}, .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_WEIRD, EC_WORD_DREAM, EC_WORD_THAT_WAS, EC_WORD_EXCL}, @@ -194,7 +194,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [24] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("KIP"), + .trainerName = _("KIPP"), .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GO, EC_MOVE2(SURF)}, .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_OFF, EC_WORD_TO, EC_MOVE2(SURF)}, .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, @@ -202,23 +202,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [25] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("JASO"), - .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, -1}, - .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, -1}, + .trainerName = _("JASON"), + .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, 0xFFFF}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, 0xFFFF}, .speechLose = {EC_WORD_WOW, EC_WORD_THAT, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_STRATEGY}, .monSets = gBattleFrontierTrainerMons_Jason }, [26] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("JOH"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, -1}, + .trainerName = _("JOHN"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, 0xFFFF}, .speechWin = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_SO, EC_WORD_WHAT, EC_WORD_IF_I_LOSE, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_John }, [27] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("AN"), + .trainerName = _("ANN"), .speechBefore = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_IT, EC_WORD_REALLY, EC_WORD_IS}, .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_I, EC_WORD_CAN, EC_WORD_CRY}, .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SAD, EC_WORD_I, EC_WORD_WILL, EC_WORD_CRY}, @@ -226,7 +226,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [28] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("EILEE"), + .trainerName = _("EILEEN"), .speechBefore = {EC_WORD_LET_S, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_OK_QUES}, .speechWin = {EC_WORD_SO, EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_FEELING}, .speechLose = {EC_WORD_AN, EC_WORD_ADULT, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_QUES}, @@ -234,23 +234,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [29] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("CARLI"), + .trainerName = _("CARLIE"), .speechBefore = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_IS, EC_WORD_FOR, EC_WORD_POKEMON}, .speechWin = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_WILL, EC_WORD_BE, EC_WORD_AWESOME}, - .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Carlie }, [30] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("GORDO"), - .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON}, + .trainerName = _("GORDON"), + .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON}, .speechLose = {EC_WORD_NOTHING, EC_WORD_IS, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_FOR, EC_WORD_ME}, .monSets = gBattleFrontierTrainerMons_Gordon }, [31] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("AYDE"), + .trainerName = _("AYDEN"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE}, .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_WATER, EC_WORD_TO, EC_WORD_COOL, EC_WORD_DOWN}, .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_ICE, EC_WORD_COLD}, @@ -258,7 +258,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [32] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("MARC"), + .trainerName = _("MARCO"), .speechBefore = {EC_WORD_I, EC_MOVE2(SURF), EC_WORD_IN, EC_WORD_THE, EC_WORD_WINTER, EC_WORD_TOO}, .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_MOVE2(SURF), EC_WORD_RIGHT, EC_WORD_NOW}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(BEAT_UP), EC_WORD_MY, EC_MOVE2(SURF), EC_WORD_BOARD}, @@ -266,15 +266,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [33] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("CIERR"), + .trainerName = _("CIERRA"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_MY, EC_WORD_SWIFT_SWIM}, - .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_BETTER, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Cierra }, [34] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("MARC"), + .trainerName = _("MARCY"), .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL}, .speechWin = {EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_EXCL}, .speechLose = {EC_WORD_THAT_S, EC_WORD_NOT, EC_WORD_THE, EC_WORD_KNOCKOUT, EC_WORD_I, EC_WORD_MEAN}, @@ -282,7 +282,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [35] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("KATH"), + .trainerName = _("KATHY"), .speechBefore = {EC_WORD_I_VE, EC_WORD_WON, EC_WORD_EVERY, EC_WORD_MATCH, EC_WORD_TODAY, EC_WORD_EXCL}, .speechWin = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_GREAT, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_HAVE, EC_WORD_LOST}, @@ -290,7 +290,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [36] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("PEYTO"), + .trainerName = _("PEYTON"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_DISAPPOINTED, EC_WORD_WITH, EC_WORD_MY, EC_WORD_POKEMON}, .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_IF, EC_WORD_WE, EC_WORD_WIN, EC_WORD_TOGETHER}, .speechLose = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_MORE, EC_WORD_IF_I_LOSE}, @@ -298,7 +298,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [37] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("JULIA"), + .trainerName = _("JULIAN"), .speechBefore = {EC_WORD_YOU, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_RIGHT, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_OUT, EC_WORD_OF, EC_WORD_THE, EC_WORD_QUESTION}, .speechLose = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_EXCL}, @@ -306,7 +306,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [38] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("QUIN"), + .trainerName = _("QUINN"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_BUT, EC_WORD_A, EC_WORD_DREAM}, .speechWin = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_BEAUTIFUL, EC_WORD_DREAM, EC_WORD_EXCL}, .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWFUL, EC_MOVE(NIGHTMARE), EC_WORD_EXCL}, @@ -314,7 +314,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [39] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("HAYLE"), + .trainerName = _("HAYLEE"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_I_AM, EC_WORD_FEELING}, .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_OVERWHELMING, EC_WORD_JOY, EC_WORD_OVER, EC_WORD_THIS}, .speechLose = {EC_WORD_DESTROYED, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_FEELING}, @@ -322,15 +322,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [40] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("AMAND"), + .trainerName = _("AMANDA"), .speechBefore = {EC_WORD_I, EC_WORD_COME, EC_WORD_FROM, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_FAMILY}, - .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_RIGHT, EC_WORD_NOW}, .monSets = gBattleFrontierTrainerMons_Amanda }, [41] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("STAC"), + .trainerName = _("STACY"), .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_THEIR, EC_WORD_OWN, EC_WORD_CUTE_CHARM}, .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_WHAT, EC_WORD_I, EC_WORD_MEAN, EC_WORD_QUES}, .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_NOT, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_QUES}, @@ -338,15 +338,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [42] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("RAFAE"), + .trainerName = _("RAFAEL"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_SOME, EC_WORD_SPIRIT}, - .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_WELL, EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_OUR, EC_WORD_SPIRIT}, .monSets = gBattleFrontierTrainerMons_Rafael }, [43] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("OLIVE"), + .trainerName = _("OLIVER"), .speechBefore = {EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL}, .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_WORKS, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAN, EC_WORD_I_AM}, @@ -354,23 +354,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [44] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("PAYTO"), + .trainerName = _("PAYTON"), .speechBefore = {EC_WORD_I, EC_WORD_TRAIN, EC_WORD_FROM, EC_WORD_THE, EC_WORD_EGG, EC_WORD_UP}, - .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, -1, -1, -1}, - .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Payton }, [45] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("PAMEL"), + .trainerName = _("PAMELA"), .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_ADORE, EC_WORD_A, EC_WORD_KIND, EC_WORD_TRAINER}, - .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, -1}, + .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, 0xFFFF}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_AND, EC_WORD_YOU_RE, EC_WORD_ALSO, EC_WORD_STRONG}, .monSets = gBattleFrontierTrainerMons_Pamela }, [46] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("ELIZ"), + .trainerName = _("ELIZA"), .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_CHILDREN}, .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POKEMON}, .speechLose = {EC_WORD_OH_DEAR, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THIS}, @@ -378,15 +378,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [47] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("MARIS"), - .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, -1}, + .trainerName = _("MARISA"), + .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, 0xFFFF}, .speechWin = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BETTER}, .speechLose = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Marisa }, [48] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("LEWI"), + .trainerName = _("LEWIS"), .speechBefore = {EC_WORD_A_LITTLE, EC_WORD_BUG, EC_WORD_IS, EC_WORD_SCARY, EC_WORD_QUES, EC_WORD_HAHAHA}, .speechWin = {EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL, EC_WORD_A, EC_WORD_SCARY, EC_WORD_BUG}, .speechLose = {EC_WORD_OH, EC_WORD_A, EC_WORD_BUG, EC_WORD_ISN_T, EC_WORD_SCARY, EC_WORD_ELLIPSIS}, @@ -394,31 +394,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [49] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("YOSH"), + .trainerName = _("YOSHI"), .speechBefore = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_LOVEY_DOVEY}, .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_EXCL}, - .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Yoshi }, [50] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("DESTI"), - .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, -1}, - .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), -1, -1}, - .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, -1}, + .trainerName = _("DESTIN"), + .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, 0xFFFF}, + .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Destin }, [51] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("KEO"), - .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, -1}, + .trainerName = _("KEON"), + .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FOR, EC_WORD_MY, EC_WORD_OVERWHELMING, EC_WORD_POWER}, - .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, -1, -1, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Keon }, [52] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("STUAR"), + .trainerName = _("STUART"), .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_YOU, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE}, .speechWin = {EC_WORD_THE, EC_WORD_MASTER, EC_WORD_OF, EC_WORD_COOL, EC_WORD_THAT_S, EC_WORD_ME}, .speechLose = {EC_WORD_I, EC_WORD_SEE, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_SO, EC_WORD_COOL}, @@ -426,15 +426,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [53] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("NESTO"), + .trainerName = _("NESTOR"), .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_REALLY, EC_WORD_SMOOTH, EC_WORD_MOVE}, .speechWin = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_NOTHING, EC_WORD_SMOOTH, EC_WORD_ABOUT, EC_WORD_THAT}, - .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Nestor }, [54] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("DERRIC"), + .trainerName = _("DERRICK"), .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(MEDITATE), EC_WORD_LIKE, EC_WORD_ME}, .speechWin = {EC_WORD_HOW, EC_WORD_I, EC_MOVE2(MEDITATE), EC_WORD_IS, EC_WORD_JUST, EC_WORD_BEAUTIFUL}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(MEDITATE), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(CALM_MIND)}, @@ -442,31 +442,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [55] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("BRYSO"), + .trainerName = _("BRYSON"), .speechBefore = {EC_MOVE2(POISON_POWDER), EC_WORD_IS, EC_WORD_IN, EC_WORD_OUR, EC_MOVE2(COTTON_SPORE), EC_WORD_MOVE}, .speechWin = {EC_WORD_HOW_DO, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_OUR, EC_MOVE2(POISON_POWDER), EC_WORD_QUES}, - .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, -1, -1}, + .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Bryson }, [56] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("CLAYTO"), - .speechBefore = {EC_WORD_HUH_QUES, -1, -1, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, -1}, + .trainerName = _("CLAYTON"), + .speechBefore = {EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, 0xFFFF}, .speechWin = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_POKENAV}, .speechLose = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SENSE}, .monSets = gBattleFrontierTrainerMons_Clayton }, [57] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("TRENTO"), - .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, -1}, + .trainerName = _("TRENTON"), + .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, 0xFFFF}, .speechWin = {EC_WORD_MMM, EC_WORD_DO, EC_WORD_YOU, EC_WORD_WANT, EC_WORD_SOME, EC_WORD_QUES}, .speechLose = {EC_WORD_I, EC_WORD_GOT, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_WATER, EC_WORD_SHOPPING}, .monSets = gBattleFrontierTrainerMons_Trenton }, [58] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("JENSO"), + .trainerName = _("JENSON"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_DOWNCAST}, .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THE, EC_MOVE(CUT)}, .speechLose = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_TRAINER, EC_WORD_WHO_IS, EC_WORD_FEELING, EC_WORD_DOWNCAST}, @@ -474,15 +474,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [59] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("WESLE"), + .trainerName = _("WESLEY"), .speechBefore = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_IS, EC_WORD_HOW, EC_WORD_I, EC_WORD_CRY}, .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_EXCL}, - .speechLose = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_EXCL, EC_POKEMON2(MEW), EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_EXCL, EC_POKEMON2(MEW), EC_WORD_EXCL_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Wesley }, [60] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("ANTO"), + .trainerName = _("ANTON"), .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_FOR, EC_WORD_ME, EC_WORD_TO, EC_MOVE(THRASH)}, .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THAT, EC_WORD_EXCL}, .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_LOSS, EC_WORD_TO, EC_MOVE2(SWALLOW)}, @@ -490,15 +490,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [61] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("LAWSO"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, -1}, + .trainerName = _("LAWSON"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_NOT, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NOT, EC_WORD_AT, EC_WORD_ALL}, .speechLose = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_AND, EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Lawson }, [62] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("SAMM"), + .trainerName = _("SAMMY"), .speechBefore = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK}, .speechWin = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_JUST, EC_WORD_INCREDIBLE, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_CRY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_PARTY, EC_WORD_ELLIPSIS}, @@ -506,7 +506,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [63] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("ARNI"), + .trainerName = _("ARNIE"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_RIVAL}, .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE}, .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON_T, EC_WORD_ACCEPT, EC_WORD_THIS}, @@ -514,23 +514,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [64] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("ADRIA"), - .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, -1, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, -1}, - .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, -1, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, -1}, - .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, -1, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, -1}, + .trainerName = _("ADRIAN"), + .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, 0xFFFF, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, 0xFFFF, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Adrian }, [65] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("TRISTA"), - .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, -1, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, - .speechWin = {EC_WORD_SEE, EC_WORD_QUES, -1, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, + .trainerName = _("TRISTAN"), + .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, + .speechWin = {EC_WORD_SEE, EC_WORD_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS}, .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_IN, EC_WORD_BATTLE}, .monSets = gBattleFrontierTrainerMons_Tristan }, [66] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("JULIAN"), + .trainerName = _("JULIANA"), .speechBefore = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SHOPPING, EC_WORD_TOO, EC_WORD_MUCH}, .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL}, .speechLose = {EC_WORD_I, EC_WORD_SO, EC_WORD_WANT, EC_WORD_ANOTHER, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL}, @@ -538,7 +538,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [67] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("RYLE"), + .trainerName = _("RYLEE"), .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS}, .speechWin = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_GUTS}, .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GUTSY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SUPER}, @@ -546,15 +546,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [68] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("CHELSE"), + .trainerName = _("CHELSEA"), .speechBefore = {EC_WORD_I, EC_WORD_SERIOUSLY, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL}, - .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, -1}, - .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, -1}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, 0xFFFF}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Chelsea }, [69] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("DANEL"), + .trainerName = _("DANELA"), .speechBefore = {EC_WORD_YOU, EC_WORD_MUST_BE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_NOW, EC_WORD_EXCL}, .speechWin = {EC_WORD_OH_DEAR, EC_WORD_TOO_WEAK, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_GIVE_UP, EC_WORD_EXCL}, .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GOOD, EC_WORD_AND, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, @@ -562,7 +562,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [70] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("LIZBET"), + .trainerName = _("LIZBETH"), .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(PRESENT)}, .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_A_LITTLE, EC_WORD_PRAISE, EC_WORD_AS, EC_WORD_YOUR, EC_MOVE2(PRESENT)}, .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES_EXCL, EC_WORD_HERE_IT_IS, EC_WORD_A, EC_MOVE(DOUBLE_SLAP)}, @@ -570,7 +570,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [71] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("AMELI"), + .trainerName = _("AMELIA"), .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_CUTE, EC_WORD_FASHION, EC_WORD_APPEAL}, .speechWin = {EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_A, EC_WORD_DISASTER}, .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AWFUL, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_HOME}, @@ -578,7 +578,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [72] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("JILLIA"), + .trainerName = _("JILLIAN"), .speechBefore = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_THAT, EC_WORD_I, EC_WORD_SMELL, EC_WORD_QUES}, .speechWin = {EC_WORD_IT_S, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_TASTY, EC_WORD_WATER}, .speechLose = {EC_WORD_IT_S, EC_WORD_YOUR, EC_WORD_OFFENSIVE, EC_WORD_STENCH, EC_WORD_THAT_S, EC_WORD_WHAT}, @@ -586,7 +586,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [73] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("ABBI"), + .trainerName = _("ABBIE"), .speechBefore = {EC_WORD_YOU, EC_WORD_TRY, EC_WORD_MY, EC_WORD_SECRET, EC_MOVE(AROMATHERAPY), EC_WORD_OK_QUES}, .speechWin = {EC_WORD_MY, EC_MOVE(AROMATHERAPY), EC_WORD_IS, EC_WORD_TERRIBLE, EC_WORD_FOR, EC_WORD_YOU}, .speechLose = {EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_SMELL, EC_WORD_A, EC_WORD_THING, EC_WORD_QUES_EXCL}, @@ -594,7 +594,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [74] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("BRIAN"), + .trainerName = _("BRIANA"), .speechBefore = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_WORKS, EC_WORD_TOO, EC_WORD_MUCH}, .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_MISS, EC_WORD_HIM, EC_WORD_MORE, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LONESOME, EC_WORD_WITHOUT, EC_WORD_HIM, EC_WORD_ELLIPSIS}, @@ -602,7 +602,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [75] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("ANTONI"), + .trainerName = _("ANTONIO"), .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_WORD_GO, EC_WORD_GO}, .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_DON_T, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_DANCE}, .speechLose = {EC_WORD_GO, EC_WORD_GO, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_MOVE(FLAIL), EC_WORD_ABOUT}, @@ -610,23 +610,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [76] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("JADE"), + .trainerName = _("JADEN"), .speechBefore = {EC_WORD_HELLO, EC_WORD_I, EC_WORD_THINK, EC_WORD_I, EC_WORD_ADORE, EC_WORD_YOU}, .speechWin = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_MOVE(THRASH), EC_WORD_IN, EC_MOVE2(FRUSTRATION)}, - .speechLose = {EC_WORD_THIS_IS_IT_EXCL, -1, -1, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THIS_IS_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Jaden }, [77] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("DAKOT"), + .trainerName = _("DAKOTA"), .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER}, .speechWin = {EC_WORD_GOT, EC_WORD_IT, EC_WORD_QUES, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER}, - .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Dakota }, [78] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("BRAYDE"), + .trainerName = _("BRAYDEN"), .speechBefore = {EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ARE, EC_WORD_USELESS, EC_WORD_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_COLLECT, EC_WORD_NORMAL, EC_WORD_VERSION, EC_WORD_TOYS}, .speechLose = {EC_WORD_I, EC_MOVE2(ATTRACT), EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ELLIPSIS}, @@ -634,31 +634,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [79] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("CORSO"), + .trainerName = _("CORSON"), .speechBefore = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(BEAT_UP), EC_WORD_ON, EC_WORD_YOU}, .speechWin = {EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_COOL}, - .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, -1, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU}, + .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Corson }, [80] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("TREVI"), + .trainerName = _("TREVIN"), .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NONE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ME}, - .speechWin = {EC_WORD_YES_SIR_EXCL, -1, -1, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST}, - .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, -1, -1, -1, -1}, + .speechWin = {EC_WORD_YES_SIR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST}, + .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Trevin }, [81] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("PATRIC"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, -1}, - .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, -1}, + .trainerName = _("PATRICK"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, 0xFFFF}, + .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, 0xFFFF}, .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Patrick }, [82] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("KADE"), + .trainerName = _("KADEN"), .speechBefore = {EC_WORD_WHAT, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_UP, EC_WORD_TO, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_WERE, EC_WORD_A, EC_WORD_SURPRISE, EC_WORD_TO_ME, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_WHO, EC_WORD_I_AM, EC_WORD_ELLIPSIS}, @@ -666,15 +666,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [83] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("MAXWEL"), - .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, -1}, + .trainerName = _("MAXWELL"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, 0xFFFF}, .speechWin = {EC_WORD_MY, EC_WORD_RIVAL, EC_WORD_IS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND}, - .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Maxwell }, [84] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("DARY"), + .trainerName = _("DARYL"), .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_MOVE(CHARGE)}, .speechWin = {EC_WORD_AM, EC_WORD_I, EC_WORD_OVERWHELMING, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_A, EC_WORD_LEGEND, EC_WORD_EXCL}, @@ -682,31 +682,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [85] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("KENNET"), + .trainerName = _("KENNETH"), .speechBefore = {EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_MOVE2(SLACK_OFF), EC_WORD_WITH, EC_WORD_ME}, .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_MOVE2(TAUNT), EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES}, - .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, -1, -1, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Kenneth }, [86] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("RIC"), - .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, -1}, - .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, -1}, - .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, -1}, + .trainerName = _("RICH"), + .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, 0xFFFF}, + .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, 0xFFFF}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Rich }, [87] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("CADE"), - .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, -1, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, -1}, + .trainerName = _("CADEN"), + .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, 0xFFFF, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_SO, EC_WORD_HOT}, .monSets = gBattleFrontierTrainerMons_Caden }, [88] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("MARLO"), + .trainerName = _("MARLON"), .speechBefore = {EC_WORD_A, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_QUES}, .speechWin = {EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_HUH_QUES, EC_WORD_THAT_S, EC_WORD_TOTALLY, EC_WORD_COOL}, .speechLose = {EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_QUES, EC_WORD_IS, EC_WORD_POKENAV, EC_WORD_QUES}, @@ -714,15 +714,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [89] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("NAS"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, -1}, + .trainerName = _("NASH"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_I, EC_WORD_LEFT, EC_WORD_YOU, EC_WORD_JUST, EC_WORD_AN, EC_MOVE2(EMBER)}, - .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, -1, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE}, .monSets = gBattleFrontierTrainerMons_Nash }, [90] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("ROBB"), + .trainerName = _("ROBBY"), .speechBefore = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_EXCL}, .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_LEADER, EC_WORD_WITH, EC_WORD_REFRESHING, EC_WORD_SERENE_GRACE}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(THRASH), EC_WORD_MY, EC_WORD_TOYS, EC_WORD_EXCL}, @@ -730,7 +730,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [91] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("REEC"), + .trainerName = _("REECE"), .speechBefore = {EC_WORD_MY, EC_MOVE2(QUICK_ATTACK), EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_A, EC_MOVE2(TELEPORT)}, .speechWin = {EC_WORD_LIKE, EC_WORD_I, EC_WORD_SAID, EC_WORD_I_AM, EC_WORD_DARN, EC_WORD_FAST}, .speechLose = {EC_WORD_I_WAS, EC_WORD_KIDDING, EC_WORD_ABOUT, EC_WORD_THAT, EC_MOVE2(TELEPORT), EC_WORD_THING}, @@ -738,7 +738,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [92] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("KATHRY"), + .trainerName = _("KATHRYN"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_TRAIN, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_QUES}, .speechWin = {EC_WORD_DON_T, EC_MOVE2(TAUNT), EC_WORD_ME, EC_WORD_LIKE, EC_WORD_THAT, EC_WORD_OK_QUES}, .speechLose = {EC_WORD_WHY, EC_WORD_COULDN_T, EC_WORD_I, EC_WORD_WIN, EC_WORD_THIS, EC_WORD_QUES}, @@ -746,31 +746,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [93] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("ELLE"), + .trainerName = _("ELLEN"), .speechBefore = {EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_AN, EC_WORD_EGG, EC_WORD_EXCL}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_VICTORY, EC_WORD_FOR, EC_WORD_ME}, - .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Ellen }, [94] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("RAMO"), - .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, -1, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION}, + .trainerName = _("RAMON"), + .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, 0xFFFF, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION}, .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_THAT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_SECRET, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_HAPPY}, .monSets = gBattleFrontierTrainerMons_Ramon }, [95] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("ARTHU"), + .trainerName = _("ARTHUR"), .speechBefore = {EC_WORD_HERE_I_COME, EC_WORD_FEELING, EC_WORD_READY, EC_WORD_FOR, EC_WORD_IT, EC_WORD_ALL}, - .speechWin = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL}, - .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, -1}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL}, + .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Arthur }, [96] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("ALONDR"), + .trainerName = _("ALONDRA"), .speechBefore = {EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_IS, EC_WORD_A, EC_WORD_GREAT, EC_WORD_DAY}, .speechWin = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_WILL, EC_WORD_BE, EC_WORD_A, EC_WORD_LEGEND}, .speechLose = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_LEFT, EC_WORD_ME, EC_WORD_COLD, EC_WORD_ELLIPSIS}, @@ -778,15 +778,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [97] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("ADRIAN"), + .trainerName = _("ADRIANA"), .speechBefore = {EC_WORD_COME, EC_WORD_SEE, EC_WORD_AN, EC_WORD_INCREDIBLE, EC_WORD_SWIFT_SWIM, EC_WORD_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_MAKE, EC_WORD_IT, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_EASY}, - .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Adriana }, [98] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("MALI"), + .trainerName = _("MALIK"), .speechBefore = {EC_WORD_OH, EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_WON, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED}, .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED}, @@ -794,23 +794,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [99] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("JIL"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, -1}, + .trainerName = _("JILL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_GIVES, EC_WORD_UP, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Jill }, [100] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("ERI"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, -1}, + .trainerName = _("ERIK"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_THANK_YOU, EC_WORD_FROM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL}, - .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, + .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, .monSets = gBattleFrontierTrainerMons_Erik }, [101] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("YAZMI"), + .trainerName = _("YAZMIN"), .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_RUN, EC_WORD_THAN, EC_WORD_BIKE}, .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_WOULD, EC_WORD_MUCH, EC_WORD_RATHER, EC_WORD_RUN}, .speechLose = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_RUN_AWAY}, @@ -818,7 +818,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [102] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("JAMA"), + .trainerName = _("JAMAL"), .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_FATHER}, .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_BABY}, .speechLose = {EC_WORD_MY, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_TOTALLY, EC_WORD_AWESOME}, @@ -826,7 +826,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [103] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("LESLI"), + .trainerName = _("LESLIE"), .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_MOTHER}, .speechWin = {EC_WORD_A, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_A_LITTLE, EC_WORD_CHALLENGE}, .speechLose = {EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_BE, EC_WORD_ANGRY}, @@ -834,7 +834,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [104] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("DAV"), + .trainerName = _("DAVE"), .speechBefore = {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_TODAY, EC_WORD_QUES}, .speechWin = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_ENJOY, EC_WORD_SOME, EC_WORD_SPORTS, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_PLAY, EC_WORD_A, EC_WORD_GAME}, @@ -842,15 +842,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [105] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("CARL"), - .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, -1}, + .trainerName = _("CARLO"), + .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF}, .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_EXCL}, - .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Carlo }, [106] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("EMILI"), + .trainerName = _("EMILIA"), .speechBefore = {EC_WORD_ME, EC_WORD_WORRY, EC_WORD_QUES, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NONE}, .speechWin = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_FANTASTIC, EC_WORD_EXCL}, .speechLose = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_ENTERTAINING, EC_WORD_EXCL}, @@ -858,39 +858,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [107] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("DALI"), - .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, -1}, + .trainerName = _("DALIA"), + .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, 0xFFFF}, .speechWin = {EC_WORD_DON_T, EC_WORD_COME, EC_WORD_NEAR, EC_WORD_MY, EC_WORD_BIKE, EC_WORD_EXCL}, .speechLose = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_MY, EC_WORD_BEST, EC_WORD_FRIEND}, .monSets = gBattleFrontierTrainerMons_Dalia }, [108] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("HITOM"), - .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_HAH, EC_WORD_EXCL_EXCL, -1}, - .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, -1, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, - .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL}, + .trainerName = _("HITOMI"), + .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_HAH, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, + .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL}, .monSets = gBattleFrontierTrainerMons_Hitomi }, [109] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("RICARD"), + .trainerName = _("RICARDO"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_PLAY, EC_WORD_TIME, EC_WORD_IS, EC_WORD_OVER}, - .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Ricardo }, [110] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("SHIZUK"), + .trainerName = _("SHIZUKA"), .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_EXCL}, - .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, 0xFFFF}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_PERFECT, EC_WORD_IN, EC_WORD_EVERY, EC_WORD_WAY, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Shizuka }, [111] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("JOAN"), + .trainerName = _("JOANA"), .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_RIGHT, EC_WORD_AWAY}, .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_WINNER, EC_WORD_HEAR, EC_WORD_ME, EC_MOVE2(ROAR)}, .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_ACCEPT, EC_WORD_THAT, EC_MOVE(OUTRAGE)}, @@ -898,87 +898,87 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [112] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("KELL"), + .trainerName = _("KELLY"), .speechBefore = {EC_WORD_MY, EC_WORD_NIGHT, EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_SCARY}, - .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, -1}, + .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, 0xFFFF}, .speechLose = {EC_WORD_THE, EC_WORD_HOME, EC_WORD_WORK, EC_WORD_IS, EC_WORD_AWFULLY, EC_WORD_SCARY}, .monSets = gBattleFrontierTrainerMons_Kelly }, [113] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("RAYN"), + .trainerName = _("RAYNA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_WHEN, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_POWER}, - .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, -1}, - .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, + .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, 0xFFFF}, + .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Rayna }, [114] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("EVA"), - .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, -1}, + .trainerName = _("EVAN"), + .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, 0xFFFF}, .speechWin = {EC_WORD_OH, EC_WORD_EXCL, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_VICTORY}, .speechLose = {EC_WORD_THE, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_OF, EC_WORD_A, EC_WORD_LOSS}, .monSets = gBattleFrontierTrainerMons_Evan }, [115] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("JORDA"), - .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, -1}, - .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, -1, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, + .trainerName = _("JORDAN"), + .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, 0xFFFF, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Jordan }, [116] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("JOE"), - .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, - .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, - .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, -1, -1, -1, -1}, + .trainerName = _("JOEL"), + .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Joel }, [117] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("KRISTE"), - .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, -1, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS}, + .trainerName = _("KRISTEN"), + .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_JUST, EC_WORD_A_LITTLE, EC_WORD_KID, EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_EXCL}, .speechLose = {EC_WORD_A, EC_WORD_TOUGH, EC_WORD_KID, EC_WORD_HUH_QUES, EC_WORD_HUMPH, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Kristen }, [118] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("SELPH"), - .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, -1, -1, -1}, + .trainerName = _("SELPHY"), + .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, 0xFFFF, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_OH, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES}, .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Selphy }, [119] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("CHLO"), + .trainerName = _("CHLOE"), .speechBefore = {EC_WORD_COME, EC_WORD_WE, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BATTLE, EC_WORD_NOW}, - .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, -1, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL}, - .speechLose = {EC_WORD_OH, EC_WORD_EXCL, -1, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE}, + .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, 0xFFFF, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL}, + .speechLose = {EC_WORD_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE}, .monSets = gBattleFrontierTrainerMons_Chloe }, [120] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("NORTO"), - .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, -1, -1}, + .trainerName = _("NORTON"), + .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_EXCUSE_ME, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_PUSHOVER, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Norton }, [121] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("LUKA"), + .trainerName = _("LUKAS"), .speechBefore = {EC_WORD_MY, EC_WORD_JOKING, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_EXISTS, EC_WORD_TO, EC_WORD_SHINE, EC_WORD_EXCL}, - .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, -1}, + .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Lukas }, [122] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("ZAC"), + .trainerName = _("ZACH"), .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_EXCELLENT, EC_MOVE2(MIMIC), EC_WORD_OF, EC_WORD_POKEMON}, .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_LIKE, EC_WORD_A_LITTLE, EC_POKEMON2(TOGEPI), EC_WORD_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_LIKE, EC_WORD_A, EC_POKEMON2(MANKEY), EC_WORD_EXCL}, @@ -986,7 +986,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [123] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("KAITLY"), + .trainerName = _("KAITLYN"), .speechBefore = {EC_WORD_I, EC_WORD_CRUSH, EC_WORD_THINGS, EC_WORD_WITH, EC_WORD_PSYCHIC, EC_WORD_POWER}, .speechWin = {EC_WORD_MY, EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_THE, EC_WORD_NEWS}, .speechLose = {EC_WORD_NO, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_WORD_THIS, EC_WORD_WON_T, EC_WORD_DO}, @@ -994,31 +994,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [124] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("BREANN"), + .trainerName = _("BREANNA"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_EXCL}, .speechWin = {EC_WORD_HAVE, EC_WORD_SOME, EC_WORD_MORE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_EXCL}, - .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, -1}, + .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Breanna }, [125] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("KENDR"), + .trainerName = _("KENDRA"), .speechBefore = {EC_WORD_IF, EC_WORD_YOU_RE, EC_WORD_SMART, EC_WORD_STOP, EC_WORD_RIGHT, EC_WORD_NOW}, .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_STOP}, - .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Kendra }, [126] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("MOLL"), + .trainerName = _("MOLLY"), .speechBefore = {EC_WORD_WILL, EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES}, .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_TOYS, EC_WORD_NOW}, - .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Molly }, [127] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("JAZMI"), + .trainerName = _("JAZMIN"), .speechBefore = {EC_WORD_I, EC_WORD_FORECAST, EC_WORD_TERRIBLE, EC_WORD_THINGS, EC_WORD_FOR, EC_WORD_YOU}, .speechWin = {EC_WORD_THERE, EC_WORD_WASN_T, EC_WORD_MY, EC_WORD_FORECAST, EC_WORD_RIGHT, EC_WORD_QUES}, .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_DIDN_T, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THIS}, @@ -1026,7 +1026,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [128] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("KELSE"), + .trainerName = _("KELSEY"), .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_SLEPT, EC_WORD_IN, EC_WORD_DAYS, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_WILL, EC_WORD_BE, EC_WORD_EXCELLENT, EC_WORD_NOW}, .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_ELLIPSIS}, @@ -1034,7 +1034,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [129] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("JALE"), + .trainerName = _("JALEN"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_ALLOW, EC_WORD_POKEMON, EC_WORD_TO, EC_MOVE(THRASH)}, .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_ANGRY, EC_WORD_QUES}, .speechLose = {EC_WORD_WHY, EC_WORD_IS, EC_WORD_THIS, EC_WORD_SO, EC_WORD_HARD, EC_WORD_QUES}, @@ -1042,7 +1042,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [130] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("GRIFFE"), + .trainerName = _("GRIFFEN"), .speechBefore = {EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(SLUDGE), EC_WORD_TO, EC_MOVE2(TRANSFORM), EC_WORD_MYSELF}, .speechWin = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_MOVE2(ACID_ARMOR)}, .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_WORD_SUCTION_CUPS}, @@ -1050,7 +1050,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [131] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("XANDE"), + .trainerName = _("XANDER"), .speechBefore = {EC_WORD_I, EC_WORD_GOT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ON, EC_WORD_RENTAL}, .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_MY, EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_WON}, .speechLose = {EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_UP, EC_WORD_TO, EC_MOVE2(SCRATCH)}, @@ -1058,7 +1058,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [132] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("MARVI"), + .trainerName = _("MARVIN"), .speechBefore = {EC_WORD_YOU_RE, EC_WORD_UP, EC_WORD_TO, EC_WORD_THE, EC_WORD_CHALLENGE, EC_WORD_QUES}, .speechWin = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU_RE, EC_WORD_GOOD, EC_WORD_ENOUGH}, .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PERFECT, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, @@ -1066,7 +1066,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [133] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("BRENNA"), + .trainerName = _("BRENNAN"), .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_TO, EC_WORD_SEE, EC_WORD_THE, EC_WORD_NEWS}, .speechWin = {EC_WORD_COMICS, EC_WORD_GET, EC_WORD_DAMP, EC_WORD_FROM, EC_WORD_DRIZZLE, EC_WORD_QUES}, .speechLose = {EC_WORD_THE, EC_WORD_TIGHT, EC_WORD_MONEY, EC_WORD_LIVING, EC_WORD_CHANNEL, EC_WORD_QUES_EXCL}, @@ -1074,15 +1074,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [134] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("BALE"), + .trainerName = _("BALEY"), .speechBefore = {EC_MOVE(SCREECH), EC_WORD_IS, EC_WORD_LIKE, EC_WORD_MUSIC, EC_WORD_TO_ME, EC_WORD_EXCL}, .speechWin = {EC_WORD_MY, EC_MOVE(SCREECH), EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST}, - .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, -1, -1, -1}, + .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Baley }, [135] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("ZACKAR"), + .trainerName = _("ZACKARY"), .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_MOVE(DIG), EC_WORD_IT, EC_WORD_YO, EC_WORD_QUES}, .speechWin = {EC_MOVE2(TAKE_DOWN), EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YO, EC_WORD_YO}, .speechLose = {EC_WORD_BREAK, EC_WORD_DOWN, EC_MOVE2(DIVE), EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME}, @@ -1090,15 +1090,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [136] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("GABRIE"), + .trainerName = _("GABRIEL"), .speechBefore = {EC_MOVE2(POUND), EC_WORD_THE, EC_WORD_THICK_FAT, EC_WORD_ON, EC_WORD_MY, EC_MOVE2(BELLY_DRUM)}, .speechWin = {EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM)}, - .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Gabriel }, [137] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("EMIL"), + .trainerName = _("EMILY"), .speechBefore = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A_TINY_BIT, EC_WORD_OF, EC_MOVE(HYPNOSIS), EC_WORD_QUES}, .speechWin = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WORKS, EC_WORD_TO, EC_WORD_PERFECTION}, .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WENT, EC_WORD_BADLY, EC_WORD_ELLIPSIS}, @@ -1106,7 +1106,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [138] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("JORDY"), + .trainerName = _("JORDYN"), .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_MY, EC_WORD_SECRET, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_AS, EC_WORD_I, EC_WORD_APPEAR, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_QUES}, @@ -1114,39 +1114,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [139] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("SOFI"), - .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), -1}, + .trainerName = _("SOFIA"), + .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), 0xFFFF}, .speechWin = {EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_FEELING, EC_WORD_THAT, EC_WORD_I, EC_WORD_GET}, - .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Sofia }, [140] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("BRADE"), - .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, -1, EC_WORD_THIS_IS_IT_EXCL, -1, -1}, + .trainerName = _("BRADEN"), + .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, 0xFFFF, EC_WORD_THIS_IS_IT_EXCL, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PRETTY, EC_WORD_AWESOME, EC_WORD_ABOUT, EC_WORD_MYSELF}, - .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL}, + .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Braden }, [141] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("KAYDE"), + .trainerName = _("KAYDEN"), .speechBefore = {EC_WORD_THEY, EC_WORD_OVERDO, EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ISN_T, EC_WORD_FOR, EC_WORD_ME}, - .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, -1}, + .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Kayden }, [142] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("COOPE"), + .trainerName = _("COOPER"), .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_ABSOLUTELY, EC_WORD_BE, EC_WORD_A, EC_WORD_PUSHOVER}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_TOO, EC_WORD_EXCITING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_ELLIPSIS}, - .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, -1, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY}, + .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, 0xFFFF, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY}, .monSets = gBattleFrontierTrainerMons_Cooper }, [143] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("JULI"), + .trainerName = _("JULIA"), .speechBefore = {EC_WORD_SPIRIT, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN}, .speechWin = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_THIS, EC_WORD_WITH, EC_WORD_SERENE_GRACE}, .speechLose = {EC_WORD_FOR_NOW, EC_WORD_GOOD_BYE, EC_WORD_BUT, EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_OVER}, @@ -1154,7 +1154,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [144] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("AMAR"), + .trainerName = _("AMARA"), .speechBefore = {EC_WORD_WROOOAAR_EXCL, EC_WORD_EXCL_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_READY, EC_WORD_EXCL_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_LOSE, EC_WORD_MYSELF, EC_WORD_IF, EC_WORD_IT_S, EC_WORD_EXCITING}, .speechLose = {EC_WORD_THAT_S, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_MOVE2(TACKLE), EC_WORD_EXCL}, @@ -1162,7 +1162,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [145] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("LYN"), + .trainerName = _("LYNN"), .speechBefore = {EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HIDDEN, EC_WORD_FOREVER}, .speechWin = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_NOW, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_MOVE(SAFEGUARD), EC_WORD_YOUR, EC_WORD_OWN, EC_WORD_SECRET}, @@ -1170,7 +1170,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [146] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("JOVA"), + .trainerName = _("JOVAN"), .speechBefore = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_SADLY, EC_WORD_LACKING}, .speechWin = {EC_WORD_MY, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_COOL, EC_WORD_ISN_T_IT_QUES}, .speechLose = {EC_WORD_I_WAS, EC_WORD_MINUS, EC_WORD_MY, EC_WORD_NORMAL, EC_WORD_POWER, EC_WORD_TODAY}, @@ -1178,15 +1178,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [147] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("DOMINI"), - .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, -1}, - .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, -1}, + .trainerName = _("DOMINIC"), + .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, 0xFFFF}, + .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, 0xFFFF}, .speechLose = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_DOESN_T, EC_WORD_MISS, EC_WORD_A, EC_WORD_THING}, .monSets = gBattleFrontierTrainerMons_Dominic }, [148] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("NIKOLA"), + .trainerName = _("NIKOLAS"), .speechBefore = {EC_WORD_I, EC_MOVE2(MIMIC), EC_WORD_POKEMON, EC_WORD_AFTER, EC_WORD_EVERY, EC_WORD_BATTLE}, .speechWin = {EC_WORD_IF_I_WIN, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(TAUROS)}, .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(MILTANK)}, @@ -1194,7 +1194,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [149] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("VALERI"), + .trainerName = _("VALERIA"), .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_NOT, EC_MOVE2(GLARE)}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL, EC_WORD_I, EC_WORD_MEAN, EC_WORD_REALLY}, .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_A, EC_WORD_REALLY, EC_MOVE(SCARY_FACE), EC_WORD_EXCL}, @@ -1202,7 +1202,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [150] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("DELANE"), + .trainerName = _("DELANEY"), .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OVER, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY}, .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_FROM, EC_WORD_SCHOOL}, .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_WORK, EC_WORD_NEXT, EC_WORD_WEEK}, @@ -1210,31 +1210,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [151] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("MEGHA"), + .trainerName = _("MEGHAN"), .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OUT, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY}, - .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, -1}, - .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, -1}, + .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, 0xFFFF}, + .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Meghan }, [152] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("ROBERT"), - .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, -1}, + .trainerName = _("ROBERTO"), + .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BAD, EC_WORD_I_WAS, EC_WORD_JUST, EC_WORD_BETTER}, - .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Roberto }, [153] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("DAMIA"), + .trainerName = _("DAMIAN"), .speechBefore = {EC_WORD_MY, EC_WORD_PURE_POWER, EC_WORD_IS, EC_WORD_MACHINE, EC_WORD_LIKE, EC_WORD_EXCL}, .speechWin = {EC_WORD_MY, EC_MOVE2(MACH_PUNCH), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)}, - .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, -1, EC_WORD_NO, EC_WORD_EXCL_EXCL, -1}, + .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_EXCL_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Damian }, [154] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("BROD"), + .trainerName = _("BRODY"), .speechBefore = {EC_WORD_MY, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SEEMS, EC_POKEMON(ODDISH), EC_WORD_QUES}, .speechWin = {EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FAMILY, EC_WORD_STAY_AT_HOME, EC_WORD_LOOK, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_QUESTION, EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SERIOUSLY}, @@ -1242,39 +1242,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [155] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("GRAHA"), - .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, -1, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1}, + .trainerName = _("GRAHAM"), + .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF}, .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_BAD}, .monSets = gBattleFrontierTrainerMons_Graham }, [156] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("TYLO"), + .trainerName = _("TYLOR"), .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_MY, EC_MOVE2(HEAT_WAVE), EC_WORD_QUES}, - .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_BUT, EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_FOR, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Tylor }, [157] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("JARE"), - .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, -1}, - .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, -1}, - .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, -1}, + .trainerName = _("JAREN"), + .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, 0xFFFF}, + .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, 0xFFFF}, + .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Jaren }, [158] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("CORDEL"), + .trainerName = _("CORDELL"), .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_DECIDED, EC_WORD_ON, EC_WORD_SPIRIT}, - .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_ON, EC_WORD_MY, EC_WORD_WAY}, .monSets = gBattleFrontierTrainerMons_Cordell }, [159] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("JAZLY"), + .trainerName = _("JAZLYN"), .speechBefore = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_REALLY, EC_WORD_AWESOME, EC_WORD_QUES}, .speechWin = {EC_WORD_OH_YEAH, EC_WORD_WOW, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_SUPER}, .speechLose = {EC_WORD_AN, EC_WORD_AVANT_GARDE, EC_WORD_POKEDEX, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_AWESOME}, @@ -1282,7 +1282,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [160] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("ZACHER"), + .trainerName = _("ZACHERY"), .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_MY, EC_WORD_OWN, EC_WORD_PLACE, EC_WORD_YEEHAW_EXCL}, .speechWin = {EC_WORD_IT_S, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME}, .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_FLATTEN, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_EXCL}, @@ -1290,15 +1290,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [161] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("JOHA"), - .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, -1}, + .trainerName = _("JOHAN"), + .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, 0xFFFF}, .speechWin = {EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_MOVE2(HELPING_HAND)}, .speechLose = {EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_USE, EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_UP}, .monSets = gBattleFrontierTrainerMons_Johan }, [162] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("SHE"), + .trainerName = _("SHEA"), .speechBefore = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_WITH, EC_WORD_BEAUTY, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_IN, EC_WORD_AN, EC_WORD_UGLY, EC_WORD_WAY}, .speechLose = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_BEAUTY, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, @@ -1306,7 +1306,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [163] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("KAIL"), + .trainerName = _("KAILA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_THIRSTY, EC_WORD_RIGHT, EC_WORD_NOW, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_I, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_WORD_COLD, EC_WORD_DRINK}, .speechLose = {EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_HARD, EC_WORD_TO, EC_MOVE2(SWALLOW)}, @@ -1314,15 +1314,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [164] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("ISIA"), - .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, -1}, + .trainerName = _("ISIAH"), + .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, 0xFFFF}, .speechWin = {EC_WORD_I, EC_MOVE2(TRICK), EC_WORD_MOTHER, EC_WORD_FOR, EC_WORD_MY, EC_WORD_ALLOWANCE}, .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_WANT, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE}, .monSets = gBattleFrontierTrainerMons_Isiah }, [165] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_M, - .trainerName = _("GARRET"), + .trainerName = _("GARRETT"), .speechBefore = {EC_WORD_I, EC_WORD_ENJOY, EC_WORD_COMICS, EC_WORD_AND, EC_WORD_THIS, EC_WORD_GAME}, .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_MUSIC, EC_WORD_IDOL, EC_WORD_TOO}, .speechLose = {EC_WORD_BUT, EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE}, @@ -1330,7 +1330,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [166] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("HAYLI"), + .trainerName = _("HAYLIE"), .speechBefore = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_SLEEP}, .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A, EC_MOVE2(CALM_MIND)}, .speechLose = {EC_WORD_MY, EC_WORD_INSOMNIA, EC_WORD_WILL, EC_WORD_GET, EC_WORD_BAD, EC_WORD_ELLIPSIS}, @@ -1338,31 +1338,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [167] = { .facilityClass = FACILITY_CLASS_SCHOOL_KID_F, - .trainerName = _("MEGA"), + .trainerName = _("MEGAN"), .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_AN, EC_MOVE(AROMATHERAPY), EC_WORD_BATH}, - .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, -1}, + .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, 0xFFFF}, .speechLose = {EC_WORD_IF, EC_WORD_ONLY, EC_MOVE(AROMATHERAPY), EC_WORD_WERE, EC_WORD_LESS, EC_WORD_EXPENSIVE}, .monSets = gBattleFrontierTrainerMons_Megan }, [168] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("ISSA"), - .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, -1, -1, -1}, + .trainerName = _("ISSAC"), + .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, 0xFFFF, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(WATER_SPORT)}, .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(MUD_SPORT)}, .monSets = gBattleFrontierTrainerMons_Issac }, [169] = { .facilityClass = FACILITY_CLASS_RICH_BOY, - .trainerName = _("QUINTO"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, -1}, - .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, -1}, + .trainerName = _("QUINTON"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, 0xFFFF}, + .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, 0xFFFF}, .speechLose = {EC_WORD_HEY, EC_WORD_WHAT, EC_WORD_DID, EC_WORD_I, EC_WORD_DO, EC_WORD_QUES}, .monSets = gBattleFrontierTrainerMons_Quinton }, [170] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("SALM"), + .trainerName = _("SALMA"), .speechBefore = {EC_WORD_YOU_VE, EC_WORD_GOT, EC_WORD_YOUR, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_EXCL}, .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_YOU, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_OUT}, .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_I, EC_WORD_LOST}, @@ -1370,23 +1370,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [171] = { .facilityClass = FACILITY_CLASS_LADY, - .trainerName = _("ANSLE"), + .trainerName = _("ANSLEY"), .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_ELLIPSIS, EC_WORD_DANCE, EC_WORD_FOR, EC_WORD_ME}, - .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, -1}, + .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, 0xFFFF}, .speechLose = {EC_WORD_TAKE, EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SOME, EC_WORD_OTHER, EC_WORD_PLACE}, .monSets = gBattleFrontierTrainerMons_Ansley }, [172] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("HOLDE"), + .trainerName = _("HOLDEN"), .speechBefore = {EC_WORD_LET_S, EC_WORD_COMMEMORATE, EC_WORD_MY, EC_WORD_COOLNESS, EC_WORD_IN, EC_WORD_BATTLE}, - .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, -1}, - .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, -1}, + .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, 0xFFFF}, + .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Holden }, [173] = { .facilityClass = FACILITY_CLASS_BUG_CATCHER, - .trainerName = _("LUC"), + .trainerName = _("LUCA"), .speechBefore = {EC_WORD_WE, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_COOL, EC_WORD_BATTLE}, .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_IN, EC_WORD_A, EC_WORD_COOL, EC_WORD_WAY}, .speechLose = {EC_WORD_HELLO, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_A, EC_WORD_KID}, @@ -1394,47 +1394,47 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [174] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("JAMISO"), + .trainerName = _("JAMISON"), .speechBefore = {EC_WORD_MY, EC_MOVE2(SECRET_POWER), EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_TO, EC_WORD_POKEMON}, - .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_USE, EC_MOVE(SMOKESCREEN), EC_WORD_TO, EC_WORD_ESCAPE}, .monSets = gBattleFrontierTrainerMons_Jamison }, [175] = { .facilityClass = FACILITY_CLASS_NINJA_BOY, - .trainerName = _("GUNNA"), - .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, -1}, + .trainerName = _("GUNNAR"), + .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, 0xFFFF}, .speechWin = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS}, .speechLose = {EC_WORD_PLEASE, EC_WORD_LOSE, EC_WORD_THAT, EC_MOVE(SCARY_FACE), EC_WORD_OF, EC_WORD_YOURS}, .monSets = gBattleFrontierTrainerMons_Gunnar }, [176] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("CRAI"), + .trainerName = _("CRAIG"), .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_TRAIN}, .speechWin = {EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_ISN_T, EC_WORD_HERE, EC_WORD_YET, EC_WORD_ELLIPSIS}, - .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Craig }, [177] = { .facilityClass = FACILITY_CLASS_TUBER_M, - .trainerName = _("PIERC"), + .trainerName = _("PIERCE"), .speechBefore = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_A, EC_MOVE2(HEAT_WAVE), EC_WORD_LAST, EC_WORD_WEEK}, - .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), -1}, - .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), 0xFFFF}, + .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Pierce }, [178] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("REGIN"), + .trainerName = _("REGINA"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PLAY, EC_WORD_IN, EC_WORD_WATER}, - .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, -1}, + .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, 0xFFFF}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_MUCH, EC_WORD_GOOD, EC_WORD_IN, EC_WORD_WATER}, .monSets = gBattleFrontierTrainerMons_Regina }, [179] = { .facilityClass = FACILITY_CLASS_TUBER_F, - .trainerName = _("ALISO"), + .trainerName = _("ALISON"), .speechBefore = {EC_WORD_THIS, EC_WORD_KINDERGARTEN, EC_WORD_MAGAZINE, EC_WORD_IS, EC_WORD_TOO, EC_WORD_MUCH}, .speechWin = {EC_WORD_HOW, EC_WORD_TO, EC_WORD_BUG, EC_WORD_YOUR, EC_WORD_TEACHER, EC_WORD_QUES}, .speechLose = {EC_WORD_ENJOY, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SCHOOL, EC_WORD_DIET, EC_WORD_QUES}, @@ -1442,7 +1442,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [180] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("HAN"), + .trainerName = _("HANK"), .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_A, EC_WORD_BUG, EC_WORD_EVENT, EC_WORD_SOON}, .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_BUG, EC_WORD_FASHION, EC_WORD_SHOW, EC_WORD_EXCL}, .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_QUES}, @@ -1450,7 +1450,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [181] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("EAR"), + .trainerName = _("EARL"), .speechBefore = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_IS, EC_WORD_HERE}, .speechWin = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_AM, EC_WORD_I}, .speechLose = {EC_WORD_SEE, EC_WORD_HOW, EC_WORD_FAST, EC_WORD_I, EC_WORD_RUN_AWAY, EC_WORD_EXCL}, @@ -1458,7 +1458,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [182] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("RAMIR"), + .trainerName = _("RAMIRO"), .speechBefore = {EC_WORD_I, EC_WORD_WENT, EC_WORD_TO, EC_WORD_A, EC_WORD_FISHING, EC_WORD_SCHOOL}, .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_I_AM, EC_WORD_IN, EC_WORD_THE, EC_WORD_FISHING, EC_WORD_HALL_OF_FAME}, .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_BACK, EC_WORD_ELLIPSIS}, @@ -1466,15 +1466,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [183] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("HUNTE"), + .trainerName = _("HUNTER"), .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_TOTALLY, EC_WORD_COOL, EC_MOVE(CROSS_CHOP)}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE(CROSS_CHOP)}, - .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, -1}, + .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Hunter }, [184] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("AIDE"), + .trainerName = _("AIDEN"), .speechBefore = {EC_WORD_MY, EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_HEALTHY}, .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_HEALTHY, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_HEALTHY, EC_WORD_THAN, EC_WORD_I_AM, EC_WORD_ELLIPSIS}, @@ -1482,31 +1482,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [185] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("XAVIE"), - .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, -1, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL}, - .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, -1}, - .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, -1, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, + .trainerName = _("XAVIER"), + .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, 0xFFFF, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, 0xFFFF}, + .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL}, .monSets = gBattleFrontierTrainerMons_Xavier }, [186] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("CLINTO"), + .trainerName = _("CLINTON"), .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_QUES}, .speechWin = {EC_WORD_YOUR, EC_MOVE2(FURY_SWIPES), EC_WORD_YOUR, EC_MOVE(STRENGTH), EC_WORD_YOUNG, EC_WORD_TRAINER}, - .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, + .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Clinton }, [187] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("JESS"), + .trainerName = _("JESSE"), .speechBefore = {EC_WORD_THIS, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_FOR, EC_WORD_MY, EC_WORD_MOTHER}, .speechWin = {EC_WORD_MOTHER, EC_WORD_WILL, EC_WORD_BE, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_ME}, - .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Jesse }, [188] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("EDUARD"), + .trainerName = _("EDUARDO"), .speechBefore = {EC_WORD_OUR, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ALL, EC_WORD_NIGHT}, .speechWin = {EC_WORD_NIGHTTIME, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_I, EC_WORD_PLAY, EC_WORD_BEST}, .speechLose = {EC_WORD_LET_S, EC_WORD_PARTY, EC_WORD_UNTIL, EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_EXCL}, @@ -1514,23 +1514,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [189] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("HA"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, -1}, + .trainerName = _("HAL"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, 0xFFFF}, .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_HIP_AND, EC_WORD_HAPPENING, EC_WORD_OH_YEAH, EC_WORD_EXCL}, .speechLose = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_TRENDY, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, .monSets = gBattleFrontierTrainerMons_Hal }, [190] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("GAG"), + .trainerName = _("GAGE"), .speechBefore = {EC_WORD_HERE_IT_IS, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_HIDDEN, EC_WORD_MOVE}, .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_VICTORY, EC_WORD_EXCL}, - .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, -1}, + .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Gage }, [191] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("ARNOL"), + .trainerName = _("ARNOLD"), .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_WEIRD, EC_WORD_FROM, EC_WORD_A, EC_WORD_DREAM}, .speechWin = {EC_WORD_YOUR, EC_MOVE(SCARY_FACE), EC_WORD_WAS, EC_WORD_IN, EC_WORD_MY, EC_WORD_DREAM}, .speechLose = {EC_WORD_MY, EC_WORD_INCREDIBLE, EC_WORD_DREAM, EC_WORD_WAS, EC_WORD_SO, EC_WORD_WEIRD}, @@ -1538,7 +1538,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [192] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("JARRET"), + .trainerName = _("JARRETT"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_DANCE, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_YESTERDAY}, .speechWin = {EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_APPRECIATE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE}, @@ -1546,7 +1546,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [193] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("GARET"), + .trainerName = _("GARETT"), .speechBefore = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A_LITTLE, EC_MOVE2(SWEET_KISS)}, .speechWin = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_MY, EC_WORD_TREASURE}, .speechLose = {EC_WORD_A, EC_WORD_TREASURE, EC_WORD_ISN_T, EC_WORD_ALWAYS, EC_WORD_ABOUT, EC_WORD_MONEY}, @@ -1554,7 +1554,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [194] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("EMANUE"), + .trainerName = _("EMANUEL"), .speechBefore = {EC_WORD_SMARTNESS, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN}, .speechWin = {EC_WORD_I_AM, EC_WORD_NOT_VERY, EC_WORD_SMART, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON}, .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_MOVE2(FAKE_OUT), EC_WORD_ME, EC_WORD_QUES}, @@ -1562,15 +1562,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [195] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("GUSTAV"), - .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, -1, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, -1}, - .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, -1, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, + .trainerName = _("GUSTAVO"), + .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, 0xFFFF, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, 0xFFFF, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_SURRENDER, EC_WORD_YET}, .monSets = gBattleFrontierTrainerMons_Gustavo }, [196] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("KAMERO"), + .trainerName = _("KAMERON"), .speechBefore = {EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK)}, .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK), EC_MOVE(ASTONISH), EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_FALL, EC_WORD_FOR, EC_WORD_MY, EC_MOVE2(TRICK)}, @@ -1578,31 +1578,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [197] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("ALFRED"), + .trainerName = _("ALFREDO"), .speechBefore = {EC_WORD_A, EC_WORD_FIERY, EC_WORD_GOURMET, EC_WORD_AM, EC_WORD_I, EC_WORD_EXCL}, .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TASTY, EC_WORD_GOURMET, EC_WORD_VICTORY, EC_WORD_EXCL}, - .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, -1}, + .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Alfredo }, [198] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("RUBE"), + .trainerName = _("RUBEN"), .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING}, .speechWin = {EC_WORD_GET, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE}, - .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, -1}, + .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Ruben }, [199] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("LAMA"), - .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, -1}, + .trainerName = _("LAMAR"), + .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, 0xFFFF}, .speechWin = {EC_WORD_MMM, EC_WORD_THIS, EC_WORD_IS, EC_WORD_QUITE, EC_WORD_TASTY, EC_WORD_ELLIPSIS}, - .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, -1}, + .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Lamar }, [200] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("JAXO"), + .trainerName = _("JAXON"), .speechBefore = {EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_WANT}, .speechWin = {EC_WORD_MY, EC_WORD_FATHER, EC_WORD_AND, EC_WORD_MOTHER, EC_WORD_WON_T, EC_WORD_ACCEPT}, .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_EXCL}, @@ -1610,7 +1610,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [201] = { .facilityClass = FACILITY_CLASS_YOUNGSTER, - .trainerName = _("LOGA"), + .trainerName = _("LOGAN"), .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_WILL, EC_WORD_STUDY, EC_WORD_FOR, EC_WORD_SCHOOL}, .speechWin = {EC_WORD_ME, EC_WORD_STUDY, EC_WORD_QUES, EC_WORD_NOT_VERY, EC_WORD_LIKELY_TO, EC_WORD_SEE}, .speechLose = {EC_WORD_NO, EC_WORD_THANKS, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SLEEP}, @@ -1618,7 +1618,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [202] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("EMILE"), + .trainerName = _("EMILEE"), .speechBefore = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_KIND, EC_WORD_OF, EC_WORD_BATTLE, EC_WORD_OK_QUES}, .speechWin = {EC_WORD_LET_S, EC_WORD_GO, EC_WORD_FOR, EC_WORD_AN, EC_MOVE(ICY_WIND), EC_MOVE2(SURF)}, .speechLose = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A, EC_MOVE(ROCK_SLIDE), EC_WORD_SHOW, EC_WORD_QUES}, @@ -1626,7 +1626,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [203] = { .facilityClass = FACILITY_CLASS_LASS, - .trainerName = _("JOSI"), + .trainerName = _("JOSIE"), .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_FASHION, EC_WORD_CONTEST, EC_WORD_IS, EC_WORD_PRETTY}, .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_MODE, EC_WORD_FASHION, EC_WORD_THINGS}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_LACKING, EC_WORD_IN, EC_WORD_FASHION, EC_WORD_SENSE}, @@ -1634,7 +1634,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [204] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("ARMAND"), + .trainerName = _("ARMANDO"), .speechBefore = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON}, .speechWin = {EC_WORD_TRADE, EC_WORD_ME, EC_WORD_A, EC_WORD_GRASS, EC_WORD_POKEMON, EC_WORD_PLEASE}, .speechLose = {EC_WORD_THERE, EC_WORD_AREN_T, EC_WORD_ENOUGH, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON}, @@ -1642,23 +1642,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [205] = { .facilityClass = FACILITY_CLASS_CAMPER, - .trainerName = _("SKYLE"), + .trainerName = _("SKYLER"), .speechBefore = {EC_MOVE2(INGRAIN), EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_BATTLE, EC_WORD_MOVE}, .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MOVE, EC_WORD_ME, EC_WORD_NOW, EC_WORD_EXCL}, - .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Skyler }, [206] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("RUT"), + .trainerName = _("RUTH"), .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_BATTLE}, - .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_PLEASE, EC_WORD_STOP, EC_WORD_I, EC_WORD_DON_T, EC_WORD_ENJOY, EC_WORD_THIS}, .monSets = gBattleFrontierTrainerMons_Ruth }, [207] = { .facilityClass = FACILITY_CLASS_PICNICKER, - .trainerName = _("MELOD"), + .trainerName = _("MELODY"), .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_SUNDAY, EC_WORD_IS, EC_WORD_A, EC_MOVE2(SUNNY_DAY)}, .speechWin = {EC_WORD_SUNDAY, EC_WORD_SEEMS, EC_WORD_FOREVER, EC_WORD_TO, EC_WORD_COME, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_THE, EC_WORD_FORECAST, EC_WORD_SAYS, EC_WORD_IT, EC_WORD_WILL, EC_MOVE(HAIL)}, @@ -1666,15 +1666,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [208] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("PEDR"), + .trainerName = _("PEDRO"), .speechBefore = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WILL, EC_WORD_DO, EC_WORD_YOU, EC_WORD_GOOD}, .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_I, EC_WORD_SINK, EC_WORD_AN, EC_WORD_OPPONENT}, - .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, -1, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, + .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Pedro }, [209] = { .facilityClass = FACILITY_CLASS_SWIMMER_M, - .trainerName = _("ERIC"), + .trainerName = _("ERICK"), .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(TACKLE), EC_WORD_YOU, EC_WORD_DOWN, EC_WORD_EXCL}, .speechWin = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_RUN_AWAY, EC_WORD_YOU, EC_WORD_LOSER, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU, EC_WORD_WOULD, EC_MOVE(COUNTER)}, @@ -1682,7 +1682,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [210] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("ELAIN"), + .trainerName = _("ELAINE"), .speechBefore = {EC_WORD_MY, EC_WORD_HEROINE, EC_WORD_ADVENTURE, EC_WORD_ISN_T, EC_WORD_GOING, EC_WORD_WELL}, .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED}, .speechLose = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_HEROINE}, @@ -1690,15 +1690,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [211] = { .facilityClass = FACILITY_CLASS_SWIMMER_F, - .trainerName = _("JOYC"), + .trainerName = _("JOYCE"), .speechBefore = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GO, EC_WORD_AHAHA, EC_WORD_EXCL}, .speechWin = {EC_WORD_LALALA, EC_WORD_NO, EC_WORD_LOSING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_EXCL}, - .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, -1, EC_WORD_HUH_QUES, -1, -1}, + .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Joyce }, [212] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("TOD"), + .trainerName = _("TODD"), .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LIGHTNINGROD, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POWER}, .speechWin = {EC_WORD_THAT_S, EC_WORD_ALL, EC_WORD_YOU, EC_WORD_COULD, EC_MOVE(ABSORB), EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_MOVE2(REFLECT), EC_WORD_MY, EC_WORD_POWER, EC_WORD_BACK, EC_WORD_QUES}, @@ -1706,23 +1706,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [213] = { .facilityClass = FACILITY_CLASS_POKEFAN_M, - .trainerName = _("GAVI"), - .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, -1}, - .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, -1}, + .trainerName = _("GAVIN"), + .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, 0xFFFF}, + .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_MY, EC_WORD_MISTAKE, EC_WORD_WAS, EC_WORD_TOO, EC_WORD_EXPENSIVE, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Gavin }, [214] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("MALOR"), + .trainerName = _("MALORY"), .speechBefore = {EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_CUTE, EC_WORD_POKEMON}, - .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, -1, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, + .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH}, .speechLose = {EC_WORD_TCH, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_NICE}, .monSets = gBattleFrontierTrainerMons_Malory }, [215] = { .facilityClass = FACILITY_CLASS_POKEFAN_F, - .trainerName = _("ESTHE"), + .trainerName = _("ESTHER"), .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_NICE, EC_MOVE2(PRESENT), EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_PLEASE, EC_WORD_GET, EC_WORD_ME, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_GAME}, .speechLose = {EC_WORD_MESSAGE, EC_WORD_CARDS, EC_WORD_MAKE, EC_WORD_A, EC_WORD_WEAK, EC_MOVE2(PRESENT)}, @@ -1730,15 +1730,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [216] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("OSCA"), + .trainerName = _("OSCAR"), .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_IN, EC_WORD_FULL}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_YOUR, EC_WORD_FULL, EC_WORD_POWER, EC_WORD_EXCL}, - .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, -1}, + .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Oscar }, [217] = { .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, - .trainerName = _("WILSO"), + .trainerName = _("WILSON"), .speechBefore = {EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_AN, EC_WORD_EARLY_BIRD}, .speechWin = {EC_WORD_ALL, EC_WORD_WORK, EC_WORD_AND, EC_WORD_NO, EC_WORD_PLAY, EC_WORD_ELLIPSIS}, .speechLose = {EC_MOVE(ENDURE), EC_WORD_IS, EC_WORD_ALL, EC_WORD_I, EC_WORD_CAN, EC_WORD_DO}, @@ -1746,7 +1746,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [218] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("CLAR"), + .trainerName = _("CLARE"), .speechBefore = {EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_TRAINER, EC_WORD_EXCL}, .speechWin = {EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_A, EC_WORD_WIMPY, EC_WORD_TRAINER, EC_WORD_EXCL}, .speechLose = {EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_TRAINER, EC_WORD_EXCL}, @@ -1754,7 +1754,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [219] = { .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F, - .trainerName = _("TES"), + .trainerName = _("TESS"), .speechBefore = {EC_WORD_WANT, EC_WORD_SOME, EC_POKEMON(GULPIN), EC_WORD_DESIGN, EC_WORD_SWEETS, EC_WORD_QUES}, .speechWin = {EC_WORD_THEY_RE, EC_WORD_A, EC_WORD_SECRET, EC_WORD_POKEMON, EC_WORD_GOURMET, EC_WORD_ITEM}, .speechLose = {EC_WORD_THEY_RE, EC_WORD_TASTY, EC_WORD_EXCL, EC_WORD_REFRESHING, EC_WORD_TOO, EC_WORD_EXCL}, @@ -1762,7 +1762,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [220] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("LEO"), + .trainerName = _("LEON"), .speechBefore = {EC_WORD_I_AM, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ANY, EC_WORD_OTHER, EC_WORD_TRAINER}, .speechWin = {EC_WORD_I, EC_WORD_DID, EC_WORD_IT, EC_MOVE2(JUMP_KICK), EC_WORD_FOR, EC_WORD_JOY}, .speechLose = {EC_WORD_BACK, EC_WORD_HOME, EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_ELLIPSIS}, @@ -1770,15 +1770,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [221] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("ALONZ"), + .trainerName = _("ALONZO"), .speechBefore = {EC_WORD_I_VE, EC_WORD_NOT, EC_WORD_LOST, EC_WORD_ONCE, EC_WORD_YET, EC_WORD_EXCL}, - .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, -1}, - .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, 0xFFFF}, + .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Alonzo }, [222] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("VINC"), + .trainerName = _("VINCE"), .speechBefore = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL}, .speechWin = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_RANK, EC_WORD_BELONGS_TO, EC_WORD_ME, EC_WORD_EXCL}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_APPEAL, EC_WORD_THIS, EC_MOVE(OUTRAGE), EC_WORD_EXCL}, @@ -1786,7 +1786,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [223] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_M, - .trainerName = _("BRYO"), + .trainerName = _("BRYON"), .speechBefore = {EC_WORD_MY, EC_MOVE2(BARRAGE), EC_WORD_WILL, EC_MOVE2(SLAM), EC_WORD_YOU, EC_WORD_EXCL}, .speechWin = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_COUNT_ON, EC_WORD_ANY, EC_WORD_LESS, EC_WORD_QUES}, .speechLose = {EC_WORD_I, EC_WORD_JUST, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_IT, EC_WORD_ELLIPSIS}, @@ -1794,7 +1794,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [224] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("AV"), + .trainerName = _("AVA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_TREASURE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_WORLD}, .speechWin = {EC_WORD_MY, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_FULL, EC_WORD_OF, EC_WORD_WONDER}, .speechLose = {EC_WORD_WHY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_TERRIBLE, EC_WORD_QUES}, @@ -1802,7 +1802,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [225] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("MIRIA"), + .trainerName = _("MIRIAM"), .speechBefore = {EC_WORD_OH, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_WITH, EC_WORD_A, EC_MOVE(SCARY_FACE)}, .speechWin = {EC_WORD_AHAHA, EC_WORD_YOU, EC_WORD_ONLY, EC_WORD_LOOK, EC_WORD_SCARY, EC_WORD_EXCL}, .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SCARY}, @@ -1810,15 +1810,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [226] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("CARRI"), + .trainerName = _("CARRIE"), .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SHOW, EC_WORD_YOU, EC_WORD_GUTSY, EC_WORD_EXCL}, - .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_MOVE(SELF_DESTRUCT), EC_WORD_MODE, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Carrie }, [227] = { .facilityClass = FACILITY_CLASS_COOLTRAINER_F, - .trainerName = _("GILLIA"), + .trainerName = _("GILLIAN"), .speechBefore = {EC_WORD_I, EC_WORD_SEEK, EC_WORD_A, EC_WORD_TRULY, EC_WORD_GREAT, EC_WORD_BATTLE}, .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_A_LOT, EC_WORD_BETTER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A_LITTLE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE}, @@ -1826,15 +1826,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [228] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("TYLE"), - .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL}, - .speechWin = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_WON, EC_WORD_YO}, - .speechLose = {EC_WORD_YO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO}, + .trainerName = _("TYLER"), + .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL}, + .speechWin = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_WON, EC_WORD_YO}, + .speechLose = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO}, .monSets = gBattleFrontierTrainerMons_Tyler }, [229] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("CHA"), + .trainerName = _("CHAZ"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_POWER}, .speechWin = {EC_WORD_THEY, EC_WORD_HAVE, EC_WORD_MORE, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_EXCL}, .speechLose = {EC_WORD_YEAH, EC_MOVE2(TAKE_DOWN), EC_WORD_THEIR, EC_WORD_POWER, EC_WORD_A_TINY_BIT, EC_WORD_PLEASE}, @@ -1842,7 +1842,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [230] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, - .trainerName = _("NELSO"), + .trainerName = _("NELSON"), .speechBefore = {EC_WORD_WELL_THEN, EC_WORD_WILL, EC_WORD_THIS, EC_WORD_POKEMON, EC_WORD_WORK, EC_WORD_QUES}, .speechWin = {EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_IT, EC_WORD_WAS, EC_WORD_TOO_STRONG}, .speechLose = {EC_WORD_IT, EC_WORD_DIDN_T, EC_WORD_MATCH_UP, EC_WORD_WELL, EC_WORD_I, EC_WORD_THINK}, @@ -1850,7 +1850,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [231] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("SHANI"), + .trainerName = _("SHANIA"), .speechBefore = {EC_WORD_ALL, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ABSOLUTELY, EC_WORD_ADORE, EC_WORD_ME}, .speechWin = {EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_WITH, EC_WORD_CUTE_CHARM}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_SO, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_CUTE, EC_WORD_POKEMON}, @@ -1858,7 +1858,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [232] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("STELL"), + .trainerName = _("STELLA"), .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POKEMON}, .speechWin = {EC_WORD_WELL, EC_WORD_AREN_T, EC_WORD_THEY, EC_WORD_BORING, EC_WORD_QUES, EC_WORD_AHAHA}, .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ALL_RIGHT}, @@ -1866,15 +1866,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [233] = { .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, - .trainerName = _("DORIN"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, -1}, + .trainerName = _("DORINE"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, 0xFFFF}, .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_GOOD, EC_WORD_QUES}, .speechLose = {EC_WORD_THIS, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_AT, EC_WORD_ALL}, .monSets = gBattleFrontierTrainerMons_Dorine }, [234] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("MADDO"), + .trainerName = _("MADDOX"), .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_NO_1, EC_WORD_CHOICE}, .speechWin = {EC_WORD_IT_S, EC_WORD_NO, EC_WORD_SECRET, EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_WIN}, .speechLose = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_LOSE, EC_WORD_EXCL}, @@ -1882,15 +1882,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [235] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("DAVI"), - .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_WROOOAAR_EXCL, -1, -1, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, -1}, - .speechLose = {EC_WORD_WROOOAAR_EXCL, -1, -1, EC_WORD_WHY, EC_WORD_QUES_EXCL, -1}, + .trainerName = _("DAVIN"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_WHY, EC_WORD_QUES_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Davin }, [236] = { .facilityClass = FACILITY_CLASS_DRAGON_TAMER, - .trainerName = _("TREVO"), + .trainerName = _("TREVON"), .speechBefore = {EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_ONLY, EC_WORD_WITH, EC_WORD_DRAGON, EC_WORD_POKEMON}, .speechWin = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_IS, EC_WORD_PERFECT}, .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING}, @@ -1898,7 +1898,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [237] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("MATE"), + .trainerName = _("MATEO"), .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_OVER, EC_WORD_SOON, EC_WORD_ENOUGH}, .speechWin = {EC_WORD_WELL, EC_WORD_THAT, EC_WORD_DIDN_T, EC_WORD_TAKE, EC_WORD_VERY, EC_WORD_MUCH}, .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_EXCL}, @@ -1906,7 +1906,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [238] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("BRE"), + .trainerName = _("BRET"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ROCK_SOLID, EC_WORD_POKEMON, EC_WORD_THE, EC_WORD_BEST}, .speechWin = {EC_WORD_TOUGHNESS, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO}, .speechLose = {EC_WORD_I, EC_WORD_ALSO, EC_WORD_HAVE, EC_WORD_A, EC_WORD_PLUSH_DOLL, EC_WORD_COLLECTION}, @@ -1914,23 +1914,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [239] = { .facilityClass = FACILITY_CLASS_BLACK_BELT, - .trainerName = _("RAU"), - .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, -1}, + .trainerName = _("RAUL"), + .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, 0xFFFF}, .speechWin = {EC_WORD_HUMPH, EC_WORD_EXCL, EC_WORD_ANOTHER, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NOTHING, EC_WORD_WEAK, EC_WORD_ABOUT, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Raul }, [240] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("KA"), - .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, -1}, + .trainerName = _("KAY"), + .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, 0xFFFF}, .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS}, .speechLose = {EC_WORD_GOOD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_AT, EC_WORD_LAST, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Kay }, [241] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("ELEN"), + .trainerName = _("ELENA"), .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL}, .speechWin = {EC_WORD_ISN_T, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_AWESOME, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_QUES}, @@ -1938,23 +1938,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [242] = { .facilityClass = FACILITY_CLASS_BATTLE_GIRL, - .trainerName = _("ALAN"), + .trainerName = _("ALANA"), .speechBefore = {EC_WORD_EAT, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK, EC_WORD_YOU, EC_WORD_EXCL}, - .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, 0xFFFF}, .speechLose = {EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK}, .monSets = gBattleFrontierTrainerMons_Alana }, [243] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("ALEXA"), + .trainerName = _("ALEXAS"), .speechBefore = {EC_WORD_GOOD, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_YOUNG, EC_WORD_TRAINER, EC_WORD_EXCL}, - .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, -1, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP}, + .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, 0xFFFF, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP}, .speechLose = {EC_WORD_YOU, EC_WORD_ARE, EC_WORD_A, EC_WORD_STRONG, EC_WORD_TRAINER, EC_WORD_KID}, .monSets = gBattleFrontierTrainerMons_Alexas }, [244] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("WESTO"), + .trainerName = _("WESTON"), .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_PLAY, EC_WORD_DOWN, EC_WORD_ALL_RIGHT, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_TO, EC_WORD_ATTACK}, .speechLose = {EC_WORD_WELL, EC_WORD_WELL, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_ELLIPSIS}, @@ -1962,39 +1962,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [245] = { .facilityClass = FACILITY_CLASS_EXPERT_M, - .trainerName = _("JASPE"), + .trainerName = _("JASPER"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OLD, EC_WORD_I_AM, EC_WORD_SKILLED, EC_WORD_EXCL}, - .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_SHOCKED, EC_WORD_EXCL, EC_WORD_DOWN, EC_WORD_I, EC_WORD_GO}, .monSets = gBattleFrontierTrainerMons_Jasper }, [246] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("NADI"), + .trainerName = _("NADIA"), .speechBefore = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_DOWN, EC_WORD_EXCL}, - .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU}, - .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, -1}, + .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU}, + .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Nadia }, [247] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("MIRAND"), - .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, -1, EC_WORD_LET_S, EC_WORD_START, -1}, + .trainerName = _("MIRANDA"), + .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, 0xFFFF, EC_WORD_LET_S, EC_WORD_START, 0xFFFF}, .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_DONE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES}, .speechLose = {EC_WORD_WELL, EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_I_AM, EC_WORD_TOO_WEAK}, .monSets = gBattleFrontierTrainerMons_Miranda }, [248] = { .facilityClass = FACILITY_CLASS_EXPERT_F, - .trainerName = _("EMM"), - .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, -1}, - .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, -1}, + .trainerName = _("EMMA"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, 0xFFFF}, + .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, 0xFFFF}, .speechLose = {EC_WORD_WHAT, EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_IS, EC_WORD_RIGHT}, .monSets = gBattleFrontierTrainerMons_Emma }, [249] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("ROLAND"), + .trainerName = _("ROLANDO"), .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_SUPER, EC_WORD_POKEMON, EC_WORD_HERO, EC_WORD_EXCL}, .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES}, .speechLose = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BEAT, EC_WORD_A, EC_WORD_HERO}, @@ -2002,31 +2002,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [250] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("STANL"), + .trainerName = _("STANLY"), .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH}, - .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, -1, -1}, - .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, -1}, + .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, 0xFFFF, 0xFFFF}, + .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Stanly }, [251] = { .facilityClass = FACILITY_CLASS_PSYCHIC_M, - .trainerName = _("DARI"), + .trainerName = _("DARIO"), .speechBefore = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_SAYS, EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN}, - .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, -1}, + .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_SEE, EC_WORD_THIS, EC_MOVE(REVERSAL), EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Dario }, [252] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("KARLE"), + .trainerName = _("KARLEE"), .speechBefore = {EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WILL, EC_WORD_COME, EC_WORD_OF, EC_WORD_THIS}, - .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_THAT, EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WENT, EC_WORD_TO, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Karlee }, [253] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("JAYLI"), + .trainerName = _("JAYLIN"), .speechBefore = {EC_WORD_EVERY, EC_WORD_TRAINER, EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS}, .speechWin = {EC_WORD_IT_S, EC_WORD_MAKING, EC_WORD_ME, EC_MOVE(YAWN), EC_WORD_THAT, EC_WORD_BATTLE}, .speechLose = {EC_WORD_I, EC_WORD_SLEPT, EC_WORD_AND, EC_WORD_SO, EC_WORD_I, EC_WORD_LOST}, @@ -2034,7 +2034,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [254] = { .facilityClass = FACILITY_CLASS_PSYCHIC_F, - .trainerName = _("INGRI"), + .trainerName = _("INGRID"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_VERY, EC_WORD_MEAN, EC_WORD_TRAINER}, .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_A, EC_WORD_GOOD, EC_WORD_MATCH, EC_WORD_QUES}, .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_CAUSE, EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_ELLIPSIS}, @@ -2042,15 +2042,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [255] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("DELILA"), - .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, -1}, + .trainerName = _("DELILAH"), + .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, 0xFFFF}, .speechWin = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_WORD_ANGRY}, .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GRUDGE), EC_WORD_WITH, EC_WORD_YOU}, .monSets = gBattleFrontierTrainerMons_Delilah }, [256] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("CARL"), + .trainerName = _("CARLY"), .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SCATTER, EC_WORD_SOME, EC_MOVE2(POISON_POWDER), EC_WORD_ABOUT}, .speechWin = {EC_WORD_IT_S, EC_WORD_SCARY, EC_WORD_HOW, EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_WORKS}, .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_YOU, EC_WORD_AND, EC_WORD_YOUR, EC_WORD_POKEMON}, @@ -2058,23 +2058,23 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [257] = { .facilityClass = FACILITY_CLASS_HEX_MANIAC, - .trainerName = _("LEXI"), + .trainerName = _("LEXIE"), .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_SCARY, EC_WORD_POKEMON, EC_WORD_QUES}, - .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, -1, -1}, + .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, 0xFFFF, 0xFFFF}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_SCARY, EC_WORD_THAN, EC_WORD_MY, EC_WORD_POKEMON}, .monSets = gBattleFrontierTrainerMons_Lexie }, [258] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("MILLE"), - .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, -1, EC_WORD_HELLO, EC_WORD_QUES_EXCL, -1}, + .trainerName = _("MILLER"), + .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, 0xFFFF, EC_WORD_HELLO, EC_WORD_QUES_EXCL, 0xFFFF}, .speechWin = {EC_WORD_HELLO, EC_WORD_MOTHER, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL}, - .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Miller }, [259] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("MAR"), + .trainerName = _("MARV"), .speechBefore = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOSE, EC_WORD_YOUR, EC_MOVE(SWAGGER), EC_WORD_NOW}, .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_MOVE(SWAGGER), EC_WORD_LEFT, EC_WORD_EH_QUES}, .speechLose = {EC_WORD_GO, EC_WORD_ON, EC_MOVE(SWAGGER), EC_WORD_ALL, EC_WORD_YOU, EC_WORD_WANT}, @@ -2082,7 +2082,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [260] = { .facilityClass = FACILITY_CLASS_POKEMANIAC, - .trainerName = _("LAYTO"), + .trainerName = _("LAYTON"), .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_COOL, EC_WORD_EXCL}, .speechWin = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOOK, EC_WORD_UP, EC_WORD_TO, EC_WORD_ME}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NO, EC_WORD_REALLY, EC_WORD_EXCL}, @@ -2090,7 +2090,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [261] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("BROOK"), + .trainerName = _("BROOKS"), .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_BATTLE}, .speechWin = {EC_WORD_THAT_WAS, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_AND, EC_WORD_EXCITING, EC_WORD_TOO}, .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_HIGH, EC_WORD_IN, EC_WORD_LEVEL, EC_WORD_ELLIPSIS}, @@ -2098,39 +2098,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [262] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("GREGOR"), - .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, -1}, + .trainerName = _("GREGORY"), + .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, 0xFFFF}, .speechWin = {EC_WORD_WHO, EC_WORD_SAYS, EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_OLD, EC_WORD_QUES}, .speechLose = {EC_WORD_PLEASE, EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD}, .monSets = gBattleFrontierTrainerMons_Gregory }, [263] = { .facilityClass = FACILITY_CLASS_GENTLEMAN, - .trainerName = _("REES"), - .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, -1, -1}, - .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, -1}, + .trainerName = _("REESE"), + .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, 0xFFFF, 0xFFFF}, + .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, 0xFFFF}, .speechLose = {EC_WORD_INSTEAD, EC_WORD_OF, EC_WORD_TELEVISION, EC_WORD_GET, EC_WORD_A, EC_WORD_BOOK}, .monSets = gBattleFrontierTrainerMons_Reese }, [264] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("MASO"), - .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, -1}, - .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, -1, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW}, - .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, -1, -1, -1}, + .trainerName = _("MASON"), + .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, 0xFFFF}, + .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW}, + .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Mason }, [265] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, - .trainerName = _("TOB"), - .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, -1, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN}, + .trainerName = _("TOBY"), + .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, 0xFFFF, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN}, .speechWin = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES}, .speechLose = {EC_WORD_I, EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_AT, EC_WORD_SMARTNESS}, .monSets = gBattleFrontierTrainerMons_Toby }, [266] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("DOROTH"), + .trainerName = _("DOROTHY"), .speechBefore = {EC_WORD_THE, EC_WORD_SPORTS, EC_WORD_WORLD, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_POKEMON}, .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_WIN, EC_WORD_WAS, EC_WORD_REFRESHING}, .speechLose = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_WAS, EC_WORD_REFRESHING}, @@ -2138,31 +2138,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [267] = { .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, - .trainerName = _("PIPE"), + .trainerName = _("PIPER"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_YOU, EC_WORD_NEED, EC_WORD_A, EC_WORD_SPEED_BOOST, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_MORE, EC_WORD_GUTS}, - .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, -1, -1, -1}, + .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Piper }, [268] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("FIN"), - .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, -1}, - .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, -1}, + .trainerName = _("FINN"), + .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, 0xFFFF}, + .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, 0xFFFF}, .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(REST), EC_WORD_A_LITTLE}, .monSets = gBattleFrontierTrainerMons_Finn }, [269] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, - .trainerName = _("SAMI"), + .trainerName = _("SAMIR"), .speechBefore = {EC_WORD_I, EC_MOVE2(DIVE), EC_WORD_BELOW, EC_WORD_THE, EC_MOVE2(SURF), EC_WORD_EXCL}, .speechWin = {EC_WORD_YAHOO, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YOU, EC_WORD_EXCL}, - .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, -1}, + .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Samir }, [270] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("FION"), + .trainerName = _("FIONA"), .speechBefore = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_LIMBER, EC_WORD_UP, EC_WORD_BEFORE, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_BE, EC_WORD_MORE, EC_WORD_READY}, .speechLose = {EC_WORD_BEING, EC_WORD_LIMBER, EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_ME}, @@ -2170,7 +2170,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [271] = { .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, - .trainerName = _("GLORI"), + .trainerName = _("GLORIA"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_ATTACK, EC_WORD_WITH, EC_WORD_SUCTION_CUPS}, .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU}, .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_SUCTION_CUPS, EC_WORD_WORK}, @@ -2178,15 +2178,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [272] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("NIC"), - .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, -1, -1}, + .trainerName = _("NICO"), + .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, 0xFFFF, 0xFFFF}, .speechWin = {EC_WORD_SORRY, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_DOWNCAST}, .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_WITH, EC_WORD_A, EC_MOVE2(SUPERSONIC), EC_WORD_SPEED_BOOST}, .monSets = gBattleFrontierTrainerMons_Nico }, [273] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, - .trainerName = _("JEREM"), + .trainerName = _("JEREMY"), .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_MASTER, EC_WORD_THAT_S, EC_WORD_MY, EC_WORD_DREAM}, .speechWin = {EC_WORD_MY, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_FAR, EC_WORD_OFF, EC_WORD_EXCL}, .speechLose = {EC_WORD_WHAT, EC_WORD_I, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_HAPPENING, EC_WORD_ELLIPSIS}, @@ -2194,7 +2194,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [274] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("CAITLI"), + .trainerName = _("CAITLIN"), .speechBefore = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_QUES}, .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_MORE, EC_WORD_TO_ME, EC_WORD_THAN, EC_WORD_CUTENESS}, .speechLose = {EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_WORD_DOESN_T, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES}, @@ -2202,7 +2202,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [275] = { .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, - .trainerName = _("REEN"), + .trainerName = _("REENA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_EXCL}, .speechWin = {EC_WORD_OH, EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_YAHOO, EC_WORD_FOR, EC_WORD_ME}, .speechLose = {EC_WORD_YAHOO, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_YOU}, @@ -2210,7 +2210,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [276] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("AVER"), + .trainerName = _("AVERY"), .speechBefore = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_A_LOT, EC_WORD_OF, EC_WORD_BUG, EC_WORD_POKEMON}, .speechWin = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UNBELIEVABLE}, .speechLose = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UPSIDE_DOWN}, @@ -2218,15 +2218,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [277] = { .facilityClass = FACILITY_CLASS_BUG_MANIAC, - .trainerName = _("LIA"), + .trainerName = _("LIAM"), .speechBefore = {EC_WORD_WE, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_FIRE, EC_WORD_AND, EC_WORD_FLYING}, - .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, -1}, + .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, 0xFFFF}, .speechLose = {EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_WHAT, EC_WORD_WE, EC_WORD_DISLIKE, EC_WORD_HEY_QUES}, .monSets = gBattleFrontierTrainerMons_Liam }, [278] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("THE"), + .trainerName = _("THEO"), .speechBefore = {EC_WORD_FISHING, EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_IN, EC_WORD_LIFE}, .speechWin = {EC_WORD_WATER, EC_WORD_POKEMON, EC_MOVE2(ATTRACT), EC_WORD_ME, EC_WORD_WITHOUT, EC_WORD_END}, .speechLose = {EC_WORD_DON_T, EC_WORD_COUNT_ON, EC_WORD_THAT, EC_WORD_HAPPENING, EC_WORD_ANOTHER, EC_WORD_TIME}, @@ -2234,7 +2234,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [279] = { .facilityClass = FACILITY_CLASS_FISHERMAN, - .trainerName = _("BAILE"), + .trainerName = _("BAILEY"), .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_EASY}, .speechWin = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_WORD_JOY}, .speechLose = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(FRUSTRATION)}, @@ -2242,7 +2242,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [280] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("HUG"), + .trainerName = _("HUGO"), .speechBefore = {EC_WORD_I, EC_WORD_TRY, EC_WORD_THE, EC_WORD_BEST, EC_WORD_I, EC_WORD_CAN}, .speechWin = {EC_WORD_I, EC_WORD_CAN_WIN, EC_WORD_IF, EC_WORD_I, EC_WORD_TRY, EC_WORD_ENOUGH}, .speechLose = {EC_WORD_I, EC_WORD_DID, EC_WORD_TRY, EC_WORD_DIDN_T, EC_WORD_I, EC_WORD_QUES}, @@ -2250,7 +2250,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [281] = { .facilityClass = FACILITY_CLASS_RUIN_MANIAC, - .trainerName = _("BRYC"), + .trainerName = _("BRYCE"), .speechBefore = {EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_VACATION, EC_WORD_UNTIL, EC_WORD_ONLY, EC_WORD_YESTERDAY}, .speechWin = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SKILL, EC_WORD_YET}, .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_SLEEP}, @@ -2258,7 +2258,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [282] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("GIDEO"), + .trainerName = _("GIDEON"), .speechBefore = {EC_WORD_WHAT_S_UP_QUES, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SCARY, EC_WORD_QUES}, .speechWin = {EC_WORD_I_AM, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_SCARY, EC_WORD_EXCL}, .speechLose = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_FASHION, EC_WORD_SENSE}, @@ -2266,31 +2266,31 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [283] = { .facilityClass = FACILITY_CLASS_COLLECTOR, - .trainerName = _("TRISTO"), + .trainerName = _("TRISTON"), .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_POKEMON}, .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL}, - .speechLose = {EC_WORD_SEE, EC_WORD_QUES, -1, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE}, + .speechLose = {EC_WORD_SEE, EC_WORD_QUES, 0xFFFF, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE}, .monSets = gBattleFrontierTrainerMons_Triston }, [284] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("CHARLE"), + .trainerName = _("CHARLES"), .speechBefore = {EC_WORD_IT_S, EC_WORD_HOPELESS, EC_WORD_TO, EC_MOVE2(STRUGGLE), EC_WORD_WITH, EC_WORD_ME}, - .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, -1}, + .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Charles }, [285] = { .facilityClass = FACILITY_CLASS_GUITARIST, - .trainerName = _("RAYMON"), + .trainerName = _("RAYMOND"), .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_HEAR, EC_WORD_MY, EC_WORD_SONG, EC_WORD_QUES}, - .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_SATISFIED, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE}, .monSets = gBattleFrontierTrainerMons_Raymond }, [286] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("DIR"), + .trainerName = _("DIRK"), .speechBefore = {EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ABOVE, EC_WORD_THE, EC_MOVE2(REST)}, .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_RULE}, .speechLose = {EC_WORD_AREN_T, EC_WORD_THERE, EC_WORD_MORE, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_QUES}, @@ -2298,7 +2298,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [287] = { .facilityClass = FACILITY_CLASS_BIRD_KEEPER, - .trainerName = _("HAROL"), + .trainerName = _("HAROLD"), .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_APPEAL, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES}, .speechLose = {EC_WORD_SO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES}, @@ -2306,7 +2306,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [288] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("OMA"), + .trainerName = _("OMAR"), .speechBefore = {EC_WORD_LET_ME_WIN, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(PRESENT)}, .speechWin = {EC_WORD_HERE, EC_WORD_YOU, EC_WORD_ARE, EC_WORD_SOME, EC_MOVE2(TOXIC), EC_WORD_SWEETS}, .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES, EC_WORD_WHAT, EC_WORD_FOR, EC_WORD_QUES_EXCL}, @@ -2314,7 +2314,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [289] = { .facilityClass = FACILITY_CLASS_SAILOR, - .trainerName = _("PETE"), + .trainerName = _("PETER"), .speechBefore = {EC_WORD_I, EC_WORD_BRAG, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_OK_QUES}, .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_LISTEN, EC_WORD_TO_ME, EC_WORD_BRAG}, .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_YOU, EC_WORD_WON_T, EC_WORD_LISTEN, EC_WORD_TO_ME}, @@ -2322,7 +2322,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [290] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("DE"), + .trainerName = _("DEV"), .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_GET, EC_WORD_A, EC_WORD_MOVE, EC_WORD_ON}, .speechWin = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT}, .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT}, @@ -2330,7 +2330,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [291] = { .facilityClass = FACILITY_CLASS_HIKER, - .trainerName = _("CORE"), + .trainerName = _("COREY"), .speechBefore = {EC_WORD_LET_S, EC_WORD_TEACH, EC_WORD_YOU, EC_WORD_HOW, EC_WORD_TOUGH, EC_WORD_I_AM}, .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_ME, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)}, .speechLose = {EC_WORD_MY, EC_MOVE2(FRUSTRATION), EC_WORD_IS, EC_WORD_CLOSE, EC_WORD_TO, EC_MOVE2(ERUPTION)}, @@ -2338,7 +2338,7 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [292] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("ANDR"), + .trainerName = _("ANDRE"), .speechBefore = {EC_WORD_NOW, EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_PERFECT, EC_WORD_FLAME_BODY}, .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FIERY, EC_WORD_DANCE, EC_WORD_EXCL}, .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_AN, EC_MOVE2(EXPLOSION), EC_WORD_HERE, EC_WORD_QUES}, @@ -2346,15 +2346,15 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [293] = { .facilityClass = FACILITY_CLASS_KINDLER, - .trainerName = _("FERRI"), + .trainerName = _("FERRIS"), .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THE, EC_WORD_OLD, EC_WORD_CLASS}, - .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_NO_1, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_ELLIPSIS}, .monSets = gBattleFrontierTrainerMons_Ferris }, [294] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("ALIVI"), + .trainerName = _("ALIVIA"), .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_GIDDY, EC_WORD_SO, EC_WORD_SHOULD, EC_WORD_YOU}, .speechWin = {EC_WORD_IT, EC_WORD_WAS, EC_WORD_ALL, EC_WORD_TOGETHER, EC_WORD_TOO, EC_WORD_EASY}, .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GIDDY, EC_WORD_UP, EC_WORD_AND, EC_WORD_AWAY}, @@ -2362,39 +2362,39 @@ const struct BattleFrontierTrainer gBattleFrontierTrainers[] = }, [295] = { .facilityClass = FACILITY_CLASS_PARASOL_LADY, - .trainerName = _("PAIG"), - .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, -1}, - .speechWin = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, - .speechLose = {EC_WORD_THAT_S_IT_EXCL, -1, -1, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON}, + .trainerName = _("PAIGE"), + .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, 0xFFFF}, + .speechWin = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH}, + .speechLose = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON}, .monSets = gBattleFrontierTrainerMons_Paige }, [296] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("ANY"), + .trainerName = _("ANYA"), .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_OH, EC_WORD_SO, EC_WORD_PRETTY, EC_WORD_FASHION}, - .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, -1}, - .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, -1, -1}, + .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, 0xFFFF}, + .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, 0xFFFF, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Anya }, [297] = { .facilityClass = FACILITY_CLASS_BEAUTY, - .trainerName = _("DAW"), - .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, -1}, - .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, -1}, + .trainerName = _("DAWN"), + .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, 0xFFFF}, + .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, 0xFFFF}, .speechLose = {EC_WORD_YOU, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_MOVE, EC_WORD_ON, EC_WORD_EXCL}, .monSets = gBattleFrontierTrainerMons_Dawn }, [298] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("ABB"), + .trainerName = _("ABBY"), .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_REFRESHING}, - .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, -1}, - .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, -1}, + .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, 0xFFFF}, + .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, 0xFFFF}, .monSets = gBattleFrontierTrainerMons_Abby }, [299] = { .facilityClass = FACILITY_CLASS_AROMA_LADY, - .trainerName = _("GRETE"), + .trainerName = _("GRETEL"), .speechBefore = {EC_WORD_I, EC_WORD_CAUSE, EC_MOVE(OUTRAGE), EC_WORD_AS, EC_WORD_A, EC_WORD_TRAINER}, .speechWin = {EC_WORD_IT_S, EC_WORD_ONLY, EC_WORD_NATURAL, EC_WORD_SEE_YA, EC_WORD_BYE_BYE, EC_WORD_EXCL}, .speechLose = {EC_WORD_IT_S, EC_WORD_HARD, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_BUT, EC_WORD_CONGRATS}, diff --git a/src/frontier_util.c b/src/frontier_util.c index 5af7b3db7..f29248089 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -48,8 +48,6 @@ struct FrontierBrainMon u16 moves[4]; }; -extern const struct BattleFrontierTrainer gBattleFrontierTrainers[]; - extern void sub_81B8558(void); // This file's functions. -- cgit v1.2.3 From 3909b6408c0125fe311d49a3029a2806993615f7 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Thu, 29 Nov 2018 19:24:28 +0800 Subject: Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 Some of the INVALID_ are likely erroneously placed, due to lack of documentation --- include/alloc.h | 22 ++++ include/global.h | 8 ++ include/malloc.h | 22 ---- ld_script.txt | 2 +- src/alloc.c | 210 ++++++++++++++++++++++++++++++ src/apprentice.c | 12 +- src/bard_music.c | 2 +- src/battle_ai_script_commands.c | 24 ++-- src/battle_ai_switch_items.c | 8 +- src/battle_anim.c | 48 +++---- src/battle_anim_80A5C6C.c | 4 +- src/battle_anim_80A9C70.c | 10 +- src/battle_anim_sound_tasks.c | 4 +- src/battle_anim_utility_funcs.c | 4 +- src/battle_arena.c | 2 +- src/battle_controller_link_opponent.c | 4 +- src/battle_controller_link_partner.c | 4 +- src/battle_controller_opponent.c | 4 +- src/battle_controller_player.c | 8 +- src/battle_controller_player_partner.c | 6 +- src/battle_controller_recorded_opponent.c | 4 +- src/battle_controller_recorded_player.c | 4 +- src/battle_controller_wally.c | 2 +- src/battle_controllers.c | 2 +- src/battle_dome.c | 96 +++++++------- src/battle_factory.c | 4 +- src/battle_factory_screen.c | 2 +- src/battle_gfx_sfx_util.c | 4 +- src/battle_interface.c | 28 ++-- src/battle_main.c | 26 ++-- src/battle_message.c | 4 +- src/battle_pike.c | 6 +- src/battle_pyramid.c | 4 +- src/battle_pyramid_bag.c | 38 +++--- src/battle_records.c | 2 +- src/battle_script_commands.c | 52 ++++---- src/battle_setup.c | 20 +-- src/battle_tent.c | 2 +- src/battle_tower.c | 10 +- src/battle_transition.c | 14 +- src/battle_tv.c | 20 +-- src/battle_util.c | 20 +-- src/battle_util2.c | 2 +- src/berry_blender.c | 6 +- src/berry_fix_program.c | 2 +- src/berry_tag_screen.c | 2 +- src/bg.c | 36 ++--- src/blit.c | 6 +- src/braille_puzzles.c | 2 +- src/cable_club.c | 6 +- src/contest.c | 18 +-- src/contest_effect.c | 28 ++-- src/credits.c | 2 +- src/data2b.c | 2 +- src/daycare.c | 16 +-- src/decompress.c | 2 +- src/decoration.c | 16 +-- src/dewford_trend.c | 2 +- src/diploma.c | 2 +- src/easy_chat.c | 2 +- src/egg_hatch.c | 2 +- src/event_object_movement.c | 54 ++++---- src/evolution_scene.c | 6 +- src/field_control_avatar.c | 6 +- src/field_door.c | 2 +- src/field_effect.c | 22 ++-- src/field_message_box.c | 2 +- src/field_player_avatar.c | 2 +- src/field_region_map.c | 2 +- src/field_specials.c | 22 ++-- src/fieldmap.c | 4 +- src/fldeff_cut.c | 4 +- src/fldeff_groundshake.c | 4 +- src/fossil_specials.c | 4 +- src/frontier_util.c | 14 +- src/ground.c | 2 +- src/hall_of_fame.c | 44 +++---- src/intro.c | 2 +- src/intro_credits_graphics.c | 2 +- src/item.c | 2 +- src/item_icon.c | 4 +- src/item_menu.c | 38 +++--- src/item_menu_icons.c | 8 +- src/learn_move.c | 20 +-- src/librfu_rfu.c | 2 +- src/librfu_stwi.c | 2 +- src/link.c | 6 +- src/link_rfu.c | 36 ++--- src/list_menu.c | 8 +- src/load_save.c | 2 +- src/mail.c | 2 +- src/mail_data.c | 18 +-- src/main.c | 2 +- src/malloc.c | 210 ------------------------------ src/mauville_old_man.c | 6 +- src/menu.c | 30 ++--- src/mossdeep_gym.c | 2 +- src/naming_screen.c | 4 +- src/overworld.c | 8 +- src/palette.c | 2 +- src/player_pc.c | 2 +- src/pokeblock.c | 12 +- src/pokeblock_feed.c | 2 +- src/pokedex.c | 38 +++--- src/pokedex_cry_screen.c | 2 +- src/pokemon.c | 48 +++---- src/pokemon_animation.c | 20 +-- src/pokemon_icon.c | 6 +- src/pokemon_size_record.c | 2 +- src/pokemon_storage_system.c | 4 +- src/pokemon_summary_screen.c | 60 ++++----- src/rayquaza_scene.c | 2 +- src/record_mixing.c | 6 +- src/recorded_battle.c | 4 +- src/region_map.c | 2 +- src/reset_rtc_screen.c | 2 +- src/reset_save_heap.c | 2 +- src/rock.c | 2 +- src/rom_8011DC0.c | 18 +-- src/rom_8034C54.c | 8 +- src/rom_81520A8.c | 2 +- src/rotating_gate.c | 4 +- src/rtc.c | 10 +- src/safari_zone.c | 6 +- src/save.c | 50 +++---- src/save_location.c | 8 +- src/scanline_effect.c | 8 +- src/scrcmd.c | 4 +- src/script.c | 12 +- src/script_menu.c | 28 ++-- src/script_movement.c | 8 +- src/script_pokemon_util_80F87D8.c | 4 +- src/secret_base.c | 8 +- src/shop.c | 22 ++-- src/slot_machine.c | 12 +- src/smokescreen.c | 2 +- src/sound.c | 4 +- src/sprite.c | 64 ++++----- src/task.c | 4 +- src/text.c | 4 +- src/trader.c | 2 +- src/trainer_pokemon_sprites.c | 42 +++--- src/tv.c | 112 ++++++++-------- src/unk_pokedex_area_screen_helper.c | 2 +- src/use_pokeblock.c | 2 +- src/walda_phrase.c | 2 +- src/wild_encounter.c | 16 +-- src/window.c | 40 +++--- sym_bss.txt | 2 +- 149 files changed, 1135 insertions(+), 1127 deletions(-) create mode 100644 include/alloc.h delete mode 100644 include/malloc.h create mode 100644 src/alloc.c delete mode 100644 src/malloc.c diff --git a/include/alloc.h b/include/alloc.h new file mode 100644 index 000000000..f2dcf6d46 --- /dev/null +++ b/include/alloc.h @@ -0,0 +1,22 @@ +#ifndef GUARD_ALLOC_H +#define GUARD_ALLOC_H + +#define HEAP_SIZE 0x1C000 +#define malloc Alloc +#define calloc(ct, sz) AllocZeroed((ct) * (sz)) +#define free Free + +#define FREE_AND_SET_NULL(ptr) \ +{ \ + free(ptr); \ + ptr = NULL; \ +} + +extern u8 gHeap[]; + +void *Alloc(u32 size); +void *AllocZeroed(u32 size); +void Free(void *pointer); +void InitHeap(void *pointer, u32 size); + +#endif // GUARD_ALLOC_H diff --git a/include/global.h b/include/global.h index cc8df049f..1bca4c344 100644 --- a/include/global.h +++ b/include/global.h @@ -25,6 +25,14 @@ #define INCBIN_S32 {0} #endif // IDE support +// Invalid / Out of Bound Placeholder values +#define INVALID_U8 0xFF +#define INVALID_U16 0xFFFF +#define INVALID_U32 0xFFFFFFFF +#define INVALID_S8 -1 +#define INVALID_S16 -1 +#define INVALID_S32 -1 + #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0])) #define SWAP(a, b, temp) \ diff --git a/include/malloc.h b/include/malloc.h deleted file mode 100644 index c215f56c0..000000000 --- a/include/malloc.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef GUARD_MALLOC_H -#define GUARD_MALLOC_H - -#define HEAP_SIZE 0x1C000 -#define malloc Alloc -#define calloc(ct, sz) AllocZeroed((ct) * (sz)) -#define free Free - -#define FREE_AND_SET_NULL(ptr) \ -{ \ - free(ptr); \ - ptr = NULL; \ -} - -extern u8 gHeap[]; - -void *Alloc(u32 size); -void *AllocZeroed(u32 size); -void Free(void *pointer); -void InitHeap(void *pointer, u32 size); - -#endif // GUARD_MALLOC_H diff --git a/ld_script.txt b/ld_script.txt index ddafe6ecf..c629c9f34 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -43,7 +43,7 @@ SECTIONS { { asm/crt0.o(.text); src/main.o(.text); - src/malloc.o(.text); + src/alloc.o(.text); src/dma3_manager.o(.text); src/gpu_regs.o(.text); src/bg.o(.text); diff --git a/src/alloc.c b/src/alloc.c new file mode 100644 index 000000000..2944bc1c6 --- /dev/null +++ b/src/alloc.c @@ -0,0 +1,210 @@ +#include "global.h" + +static void *sHeapStart; +static u32 sHeapSize; +static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss) + +#define MALLOC_SYSTEM_ID 0xA3A3 + +struct MemBlock { + // Whether this block is currently allocated. + bool16 flag; + + // Magic number used for error checking. Should equal MALLOC_SYSTEM_ID. + u16 magic; + + // Size of the block (not including this header struct). + u32 size; + + // Previous block pointer. Equals sHeapStart if this is the first block. + struct MemBlock *prev; + + // Next block pointer. Equals sHeapStart if this is the last block. + struct MemBlock *next; + + // Data in the memory block. (Arrays of length 0 are a GNU extension.) + u8 data[0]; +}; + +void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size) +{ + struct MemBlock *header = (struct MemBlock *)block; + + header->flag = FALSE; + header->magic = MALLOC_SYSTEM_ID; + header->size = size; + header->prev = prev; + header->next = next; +} + +void PutFirstMemBlockHeader(void *block, u32 size) +{ + PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock)); +} + +void *AllocInternal(void *heapStart, u32 size) +{ + struct MemBlock *pos = (struct MemBlock *)heapStart; + struct MemBlock *head = pos; + struct MemBlock *splitBlock; + u32 foundBlockSize; + + // Alignment + if (size & 3) + size = 4 * ((size / 4) + 1); + + for (;;) { + // Loop through the blocks looking for unused block that's big enough. + + if (!pos->flag) { + foundBlockSize = pos->size; + + if (foundBlockSize >= size) { + if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) { + // The block isn't much bigger than the requested size, + // so just use it. + pos->flag = TRUE; + } else { + // The block is significantly bigger than the requested + // size, so split the rest into a separate block. + foundBlockSize -= sizeof(struct MemBlock); + foundBlockSize -= size; + + splitBlock = (struct MemBlock *)(pos->data + size); + + pos->flag = TRUE; + pos->size = size; + + PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize); + + pos->next = splitBlock; + + if (splitBlock->next != head) + splitBlock->next->prev = splitBlock; + } + + return pos->data; + } + } + + if (pos->next == head) + return NULL; + + pos = pos->next; + } +} + +void FreeInternal(void *heapStart, void *pointer) +{ + if (pointer) { + struct MemBlock *head = (struct MemBlock *)heapStart; + struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock)); + block->flag = FALSE; + + // If the freed block isn't the last one, merge with the next block + // if it's not in use. + if (block->next != head) { + if (!block->next->flag) { + block->size += sizeof(struct MemBlock) + block->next->size; + block->next->magic = 0; + block->next = block->next->next; + if (block->next != head) + block->next->prev = block; + } + } + + // If the freed block isn't the first one, merge with the previous block + // if it's not in use. + if (block != head) { + if (!block->prev->flag) { + block->prev->next = block->next; + + if (block->next != head) + block->next->prev = block->prev; + + block->magic = 0; + block->prev->size += sizeof(struct MemBlock) + block->size; + } + } + } +} + +void *AllocZeroedInternal(void *heapStart, u32 size) +{ + void *mem = AllocInternal(heapStart, size); + + if (mem != NULL) { + if (size & 3) + size = 4 * ((size / 4) + 1); + + CpuFill32(0, mem, size); + } + + return mem; +} + +bool32 CheckMemBlockInternal(void *heapStart, void *pointer) +{ + struct MemBlock *head = (struct MemBlock *)heapStart; + struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock)); + + if (block->magic != MALLOC_SYSTEM_ID) + return FALSE; + + if (block->next->magic != MALLOC_SYSTEM_ID) + return FALSE; + + if (block->next != head && block->next->prev != block) + return FALSE; + + if (block->prev->magic != MALLOC_SYSTEM_ID) + return FALSE; + + if (block->prev != head && block->prev->next != block) + return FALSE; + + if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size)) + return FALSE; + + return TRUE; +} + +void InitHeap(void *heapStart, u32 heapSize) +{ + sHeapStart = heapStart; + sHeapSize = heapSize; + PutFirstMemBlockHeader(heapStart, heapSize); +} + +void *Alloc(u32 size) +{ + AllocInternal(sHeapStart, size); +} + +void *AllocZeroed(u32 size) +{ + AllocZeroedInternal(sHeapStart, size); +} + +void Free(void *pointer) +{ + FreeInternal(sHeapStart, pointer); +} + +bool32 CheckMemBlock(void *pointer) +{ + return CheckMemBlockInternal(sHeapStart, pointer); +} + +bool32 CheckHeap() +{ + struct MemBlock *pos = (struct MemBlock *)sHeapStart; + + do { + if (!CheckMemBlockInternal(sHeapStart, pos->data)) + return FALSE; + pos = pos->next; + } while (pos != (struct MemBlock *)sHeapStart); + + return TRUE; +} diff --git a/src/apprentice.c b/src/apprentice.c index 499f85094..faed3756c 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -9,7 +9,7 @@ #include "item.h" #include "item_menu.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "new_game.h" #include "party_menu.h" @@ -1079,7 +1079,7 @@ void ResetApprenticeStruct(struct Apprentice *apprentice) u8 i; for (i = 0; i < 6; i++) - apprentice->easyChatWords[i] |= 0xFFFF; + apprentice->easyChatWords[i] |= INVALID_U16; apprentice->playerName[0] = EOS; apprentice->id = 16; @@ -1093,7 +1093,7 @@ void ResetAllApprenticeData(void) for (i = 0; i < 4; i++) { for (j = 0; j < 6; j++) - gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= 0xFFFF; + gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= INVALID_U16; gSaveBlock2Ptr->apprentices[i].id = 16; gSaveBlock2Ptr->apprentices[i].playerName[0] = EOS; gSaveBlock2Ptr->apprentices[i].lvlMode = 0; @@ -1290,7 +1290,7 @@ static u16 sub_819FF98(u8 arg0) else level = 60; - for (j = 0; learnset[j] != 0xFFFF; j++) + for (j = 0; learnset[j] != INVALID_U16; j++) { if ((learnset[j] & 0xFE00) > (level << 9)) break; @@ -1393,7 +1393,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves) level = 60; learnset = gLevelUpLearnsets[species]; - for (i = 0; learnset[i] != 0xFFFF; i++) + for (i = 0; learnset[i] != INVALID_U16; i++) { if ((learnset[i] & 0xFE00) > (level << 9)) break; @@ -2236,7 +2236,7 @@ static void sub_81A1370(void) } r10 = 0xFFFF; - r9 = -1; + r9 = INVALID_S32; for (i = 1; i < 4; i++) { if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId) diff --git a/src/bard_music.c b/src/bard_music.c index 6c2578071..4c28233c2 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -54,7 +54,7 @@ void GetWordPhonemes(struct BardSong *song, u16 word) for (i = 0; i < 6; i ++) { sound = &song->sound[i]; - if (sound->var00 != 0xFF) + if (sound->var00 != INVALID_U8) { song->phonemes[i].length = sound->var01 + gBardSoundLengthTable[sound->var00]; song->phonemes[i].pitch = CalcWordPitch(word + 30, i); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 3e7064eb5..e6c089b1b 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -276,7 +276,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = EFFECT_SUPERPOWER, EFFECT_ERUPTION, EFFECT_OVERHEAT, - 0xFFFF + INVALID_U16 }; // code @@ -463,8 +463,8 @@ static u8 ChooseMoveOrAction_Doubles(void) { if (i == sBattler_AI || gBattleMons[i].hp == 0) { - actionOrMoveIndex[i] = -1; - bestMovePointsForTarget[i] = -1; + actionOrMoveIndex[i] = INVALID_U8; + bestMovePointsForTarget[i] = INVALID_S16 ; } else { @@ -530,7 +530,7 @@ static u8 ChooseMoveOrAction_Doubles(void) // Don't use a move against ally if it has less than 100 points. if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100) { - bestMovePointsForTarget[i] = -1; + bestMovePointsForTarget[i] = INVALID_S16; mostViableMovesScores[0] = mostViableMovesScores[0]; // Needed to match. } } @@ -1003,7 +1003,7 @@ static void BattleAICmd_if_in_bytes(void) { const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != 0xFF) + while (*ptr != INVALID_U8) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1019,7 +1019,7 @@ static void BattleAICmd_if_not_in_bytes(void) { const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != 0xFF) + while (*ptr != INVALID_U8) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1035,7 +1035,7 @@ static void BattleAICmd_if_in_hwords(void) { const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != 0xFFFF) + while (*ptr != INVALID_U16) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1051,7 +1051,7 @@ static void BattleAICmd_if_not_in_hwords(void) { const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != 0xFFFF) + while (*ptr != INVALID_U16) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1167,14 +1167,14 @@ static void BattleAICmd_get_how_powerful_move_is(void) s32 i, checkedMove; s32 moveDmgs[4]; - for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++) { if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == sDiscouragedPowerfulMoveEffects[i]) break; } if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power > 1 - && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF) + && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16) { gDynamicBasePower = 0; *(&gBattleStruct->dynamicMoveType) = 0; @@ -1184,14 +1184,14 @@ static void BattleAICmd_get_how_powerful_move_is(void) for (checkedMove = 0; checkedMove < 4; checkedMove++) { - for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++) { if (gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i]) break; } if (gBattleMons[sBattler_AI].moves[checkedMove] != MOVE_NONE - && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF + && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16 && gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].power > 1) { gCurrentMove = gBattleMons[sBattler_AI].moves[checkedMove]; diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index ad25b483c..d6a8e1336 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -126,7 +126,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) return FALSE; if (gLastLandedMoves[gActiveBattler] == 0) return FALSE; - if (gLastLandedMoves[gActiveBattler] == 0xFFFF) + if (gLastLandedMoves[gActiveBattler] == INVALID_U16) return FALSE; if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0) return FALSE; @@ -221,7 +221,7 @@ static bool8 ShouldSwitchIfNaturalCure(void) if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 2) return FALSE; - if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1) + if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == INVALID_U16) && Random() & 1) { *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); @@ -331,9 +331,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) if (gLastLandedMoves[gActiveBattler] == 0) return FALSE; - if (gLastLandedMoves[gActiveBattler] == 0xFFFF) + if (gLastLandedMoves[gActiveBattler] == INVALID_U16) return FALSE; - if (gLastHitBy[gActiveBattler] == 0xFF) + if (gLastHitBy[gActiveBattler] == INVALID_U8) return FALSE; if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0) return FALSE; diff --git a/src/battle_anim.c b/src/battle_anim.c index e8720fcfb..68ffed834 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1452,14 +1452,14 @@ void ClearBattleAnimationVars(void) // Clear index array. for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) - sAnimSpriteIndexArray[i] |= 0xFFFF; + sAnimSpriteIndexArray[i] |= INVALID_U16; // Clear anim args. for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; - sMonAnimTaskIdArray[0] = 0xFF; - sMonAnimTaskIdArray[1] = 0xFF; + sMonAnimTaskIdArray[0] = INVALID_U8; + sMonAnimTaskIdArray[1] = INVALID_U8; gAnimMoveTurn = 0; sAnimBackgroundFadeState = 0; sAnimMoveIndex = 0; @@ -1505,19 +1505,19 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; - sMonAnimTaskIdArray[0] = 0xFF; - sMonAnimTaskIdArray[1] = 0xFF; + sMonAnimTaskIdArray[0] = INVALID_U8; + sMonAnimTaskIdArray[1] = INVALID_U8; sBattleAnimScriptPtr = animsTable[tableId]; gAnimScriptActive = TRUE; gAnimFramesToWait = 0; gAnimScriptCallback = RunAnimScriptCommand; for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) - sAnimSpriteIndexArray[i] |= 0xFFFF; + sAnimSpriteIndexArray[i] |= INVALID_U16; if (isMoveAnim) { - for (i = 0; gMovesWithQuietBGM[i] != 0xFFFF; i++) + for (i = 0; gMovesWithQuietBGM[i] != INVALID_U16; i++) { if (tableId == gMovesWithQuietBGM[i]) { @@ -1558,7 +1558,7 @@ static void AddSpriteIndex(u16 index) for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { - if (sAnimSpriteIndexArray[i] == 0xFFFF) + if (sAnimSpriteIndexArray[i] == INVALID_U16) { sAnimSpriteIndexArray[i] = index; return; @@ -1574,7 +1574,7 @@ static void ClearSpriteIndex(u16 index) { if (sAnimSpriteIndexArray[i] == index) { - sAnimSpriteIndexArray[i] |= 0xFFFF; + sAnimSpriteIndexArray[i] |= INVALID_U16; return; } } @@ -1712,7 +1712,7 @@ static void ScriptCmd_delay(void) sBattleAnimScriptPtr++; gAnimFramesToWait = sBattleAnimScriptPtr[0]; if (gAnimFramesToWait == 0) - gAnimFramesToWait = -1; + gAnimFramesToWait = INVALID_S8; sBattleAnimScriptPtr++; gAnimScriptCallback = WaitAnimFrameCount; } @@ -1746,7 +1746,7 @@ static void ScriptCmd_end(void) // Keep waiting as long as there are animations to be done. if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0 - || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF) + || sMonAnimTaskIdArray[0] != INVALID_U8 || sMonAnimTaskIdArray[1] != INVALID_U8) { sSoundAnimFramesToWait = 0; gAnimFramesToWait = 1; @@ -1773,11 +1773,11 @@ static void ScriptCmd_end(void) for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { - if (sAnimSpriteIndexArray[i] != 0xFFFF) + if (sAnimSpriteIndexArray[i] != INVALID_U16) { FreeSpriteTilesByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag); FreeSpritePaletteByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag); - sAnimSpriteIndexArray[i] |= 0xFFFF; // set terminator. + sAnimSpriteIndexArray[i] |= INVALID_U16; // set terminator. } } @@ -2122,9 +2122,9 @@ static void ScriptCmd_clearmonbg(void) else battlerId = gBattleAnimTarget; - if (sMonAnimTaskIdArray[0] != 0xFF) + if (sMonAnimTaskIdArray[0] != INVALID_U8) gSprites[gBattlerSpriteIds[battlerId]].invisible = FALSE; - if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF) + if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != INVALID_U8) gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = FALSE; else animBattlerId = 0; @@ -2148,17 +2148,17 @@ static void sub_80A4980(u8 taskId) else to_BG2 = TRUE; - if (sMonAnimTaskIdArray[0] != 0xFF) + if (sMonAnimTaskIdArray[0] != INVALID_U8) { sub_80A477C(to_BG2); DestroyTask(sMonAnimTaskIdArray[0]); - sMonAnimTaskIdArray[0] = 0xFF; + sMonAnimTaskIdArray[0] = INVALID_U8; } if (gTasks[taskId].data[0] > 1) { sub_80A477C(to_BG2 ^ 1); DestroyTask(sMonAnimTaskIdArray[1]); - sMonAnimTaskIdArray[1] = 0xFF; + sMonAnimTaskIdArray[1] = INVALID_U8; } DestroyTask(taskId); } @@ -2421,7 +2421,7 @@ static void Task_FadeToBg(u8 taskId) { s16 bgId = gTasks[taskId].tBackgroundId; - if (bgId == -1) + if (bgId == INVALID_S16) LoadDefaultBg(); else LoadMoveBg(bgId); @@ -2477,7 +2477,7 @@ static void ScriptCmd_restorebg(void) sBattleAnimScriptPtr++; taskId = CreateTask(Task_FadeToBg, 5); - gTasks[taskId].tBackgroundId = -1; + gTasks[taskId].tBackgroundId = INVALID_S16; sAnimBackgroundFadeState = 1; } @@ -3001,7 +3001,7 @@ static void ScriptCmd_invisible(void) u8 spriteId; spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) gSprites[spriteId].invisible = TRUE; sBattleAnimScriptPtr += 2; @@ -3012,7 +3012,7 @@ static void ScriptCmd_visible(void) u8 spriteId; spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) gSprites[spriteId].invisible = FALSE; sBattleAnimScriptPtr += 2; @@ -3039,7 +3039,7 @@ static void ScriptCmd_doublebattle_2D(void) r4 = sub_80A8364(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) { gSprites[spriteId].invisible = FALSE; if (r4 == 2) @@ -3075,7 +3075,7 @@ static void ScriptCmd_doublebattle_2E(void) spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } - if (spriteId != 0xFF && r4 == 2) + if (spriteId != INVALID_U8 && r4 == 2) gSprites[spriteId].oam.priority = 2; } } diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index 2ac6cca90..1a2c279ec 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -7,7 +7,7 @@ #include "decompress.h" #include "dma3.h" #include "gpu_regs.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "pokemon_icon.h" #include "sprite.h" @@ -1590,7 +1590,7 @@ s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 whichBattler) } } } - return -1; + return INVALID_S16; } void obj_delete_but_dont_free_vram(struct Sprite *sprite) diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c index f1245a032..c329a134d 100644 --- a/src/battle_anim_80A9C70.c +++ b/src/battle_anim_80A9C70.c @@ -183,7 +183,7 @@ void sub_80A9EF4(u8 taskId) SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); spriteId = CreateSprite(&gUnknown_0853EF48, x, y, 4); - if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF) + if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == INVALID_U16) gSprites[spriteId].invisible = TRUE; SetSubspriteTables(&gSprites[spriteId], gUnknown_0853EF40); gTasks[taskId].data[15] = spriteId; @@ -315,10 +315,10 @@ void AnimTask_StatsChange(u8 taskId) CASE(MINUS2, STAT_ACC): goesDown = TRUE; animStatId = 2; sharply = TRUE; break; CASE(MINUS2, STAT_EVASION): goesDown = TRUE; animStatId = 4; sharply = TRUE; break; - case STAT_ANIM_MULTIPLE_PLUS1: goesDown = FALSE; animStatId = 0xFF; sharply = FALSE; break; - case STAT_ANIM_MULTIPLE_PLUS2: goesDown = FALSE; animStatId = 0xFF; sharply = TRUE; break; - case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE; animStatId = 0xFF; sharply = FALSE; break; - case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE; animStatId = 0xFF; sharply = TRUE; break; + case STAT_ANIM_MULTIPLE_PLUS1: goesDown = FALSE; animStatId = INVALID_U8; sharply = FALSE; break; + case STAT_ANIM_MULTIPLE_PLUS2: goesDown = FALSE; animStatId = INVALID_U8; sharply = TRUE; break; + case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE; animStatId = INVALID_U8; sharply = FALSE; break; + case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE; animStatId = INVALID_U8; sharply = TRUE; break; default: DestroyAnimVisualTask(taskId); diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 07fb604b8..36738d36e 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -214,7 +214,7 @@ void sub_8158E9C(u8 taskId) if (species != SPECIES_NONE) { - if (gBattleAnimArgs[1] == 0xFF) + if (gBattleAnimArgs[1] == INVALID_U8) PlayCry3(species, pan, 9); else PlayCry3(species, pan, 7); @@ -238,7 +238,7 @@ static void sub_8158FF4(u8 taskId) } else { - if (gTasks[taskId].data[0] == 0xFF) + if (gTasks[taskId].data[0] == INVALID_U8) { if (!IsCryPlaying()) { diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 6dfebe77f..5ed30ddc0 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -3,7 +3,7 @@ #include "contest.h" #include "gpu_regs.h" #include "graphics.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "sound.h" #include "sprite.h" @@ -82,7 +82,7 @@ void sub_8116664(u8 taskId) animBattlers[1] = gBattleAnimTarget; break; case 5: - animBattlers[0] = 0xFF; + animBattlers[0] = INVALID_U8; break; case 6: selectedPalettes = 0; diff --git a/src/battle_arena.c b/src/battle_arena.c index cd2c976da..591fc82b9 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -449,7 +449,7 @@ static const union AnimCmd *const sSpriteAnimTable_8611F4C[] = static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon = { .tileTag = 0x3E8, - .paletteTag = 0xFFFF, + .paletteTag = INVALID_U16, .oam = &sOamData_8611F24, .anims = sSpriteAnimTable_8611F4C, .images = NULL, diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 8cbc62aab..d65c61884 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -212,7 +212,7 @@ static void sub_8064470(void) static void sub_80644D8(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; LinkOpponentBufferExecCompleted(); @@ -395,7 +395,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 0cd15f39e..8bbbcbfd1 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -203,7 +203,7 @@ static void sub_814AF54(void) static void sub_814AFBC(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; LinkPartnerBufferExecCompleted(); @@ -279,7 +279,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index c057e8575..0aeb24c32 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -220,7 +220,7 @@ static void sub_805F240(void) static void sub_805F2A8(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; OpponentBufferExecCompleted(); @@ -389,7 +389,7 @@ static void CompleteOnHealthbarDone(void) { s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 2bd5ef365..3053e6c37 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -635,7 +635,7 @@ u32 sub_8057FBC(void) // unused PlaySE(SE_SELECT); gBattle_BG0_X = 0; gBattle_BG0_Y = 0x140; - var = 0xFF; + var = INVALID_U8; } if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1) { @@ -936,7 +936,7 @@ static void sub_80588B4(void) static void sub_8058924(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerBufferExecCompleted(); @@ -1119,7 +1119,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -1221,7 +1221,7 @@ static void sub_8059400(u8 taskId) newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (newExpPoints == -1) // The bar has been filled with given exp points. + if (newExpPoints == INVALID_S16) // The bar has been filled with given exp points. { u8 level; s32 currExp; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 02dd1383b..775b7676f 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -218,7 +218,7 @@ static void sub_81BAE98(void) static void sub_81BAF00(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerPartnerBufferExecCompleted(); @@ -294,7 +294,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -397,7 +397,7 @@ static void sub_81BB4E4(u8 taskId) r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (r4 == -1) + if (r4 == INVALID_S16) { u8 level; s32 currExp; diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 0cf3634dc..842facd44 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -213,7 +213,7 @@ static void sub_81865C8(void) static void sub_8186630(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; RecordedOpponentBufferExecCompleted(); @@ -377,7 +377,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 4d7fdc01e..60bec78b1 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -202,7 +202,7 @@ static void sub_81899F0(void) static void sub_8189A58(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; RecordedPlayerBufferExecCompleted(); @@ -360,7 +360,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 5d87c4f90..9078ef577 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -348,7 +348,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) + if (hpValue != INVALID_S16) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index a6d6e9294..e24549d82 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -51,7 +51,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { gBattlerControllerFuncs[i] = nullsub_21; - gBattlerPositions[i] = 0xFF; + gBattlerPositions[i] = INVALID_U8; gActionSelectionCursor[i] = 0; gMoveSelectionCursor[i] = 0; } diff --git a/src/battle_dome.c b/src/battle_dome.c index 0f5721fb9..f03de7505 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -8,7 +8,7 @@ #include "event_data.h" #include "overworld.h" #include "util.h" -#include "malloc.h" +#include "alloc.h" #include "string_util.h" #include "random.h" #include "task.h" @@ -3032,7 +3032,7 @@ static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2) s32 i = 0; s32 typePower = TYPE_x1; - if (move == MOVE_NONE || move == 0xFFFF || gBattleMoves[move].power == 0) + if (move == MOVE_NONE || move == INVALID_U16 || gBattleMoves[move].power == 0) return 0; defType1 = gBaseStats[targetSpecies].type1; @@ -3434,14 +3434,14 @@ static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) if (j != val) return gUnknown_0860D14C[j]; else - return 0xFF; + return INVALID_U8; } else { if (!gSaveBlock2Ptr->frontier.domeTrainers[sIdToOpponentId[i][roundId]].isEliminated) return sIdToOpponentId[i][roundId]; else - return 0xFF; + return INVALID_U8; } } @@ -3562,7 +3562,7 @@ static void sub_8190400(u8 taskId) SetVBlankCallback(VblankCb0_BattleDome); sBattleDomeStruct = AllocZeroed(sizeof(*sBattleDomeStruct)); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) - sBattleDomeStruct->arr[i] |= 0xFF; + sBattleDomeStruct->arr[i] |= INVALID_U8; LoadMonIconPalettes(); i = CreateTask(sub_8190CD4, 0); gTasks[i].data[0] = 0; @@ -3624,7 +3624,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 192) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3644,7 +3644,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -32) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3664,7 +3664,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 272) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3684,7 +3684,7 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -32) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3714,7 +3714,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 176) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; sub_80D2EF8(sprite); } } @@ -3736,7 +3736,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -16) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; sub_80D2EF8(sprite); } } @@ -3758,7 +3758,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 256) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; sub_80D2EF8(sprite); } } @@ -3780,7 +3780,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -16) { - sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; + sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; sub_80D2EF8(sprite); } } @@ -4005,7 +4005,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4016,7 +4016,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4029,7 +4029,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4040,7 +4040,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4121,7 +4121,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4132,7 +4132,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4145,7 +4145,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4156,7 +4156,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4204,7 +4204,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4215,7 +4215,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4228,7 +4228,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4239,7 +4239,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4287,7 +4287,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4298,7 +4298,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4311,7 +4311,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4322,7 +4322,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4368,7 +4368,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4379,7 +4379,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4392,7 +4392,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4403,7 +4403,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4451,7 +4451,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4462,7 +4462,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4475,7 +4475,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4486,7 +4486,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4556,12 +4556,12 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } @@ -4569,12 +4569,12 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (sBattleDomeStruct->arr[i] != 0xFF) + if (sBattleDomeStruct->arr[i] != INVALID_U8) sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } @@ -5483,13 +5483,13 @@ static u8 sub_8193BDC(u8 taskId) } else { - if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != 0xFF) + if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != INVALID_U8) arrId = 0; - else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != 0xFF) + else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != INVALID_U8) arrId = 1; - else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != 0xFF) + else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != INVALID_U8) arrId = 2; - else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != 0xFF) + else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != INVALID_U8) arrId = 3; } @@ -6314,21 +6314,21 @@ static void DecideRoundWinners(u8 roundId) tournamentId1 = i; tournamentId2 = TournamentIdOfOpponent(roundId, gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId); // Frontier Brain always wins, check tournamentId1. - if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != 0xFF) + if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != INVALID_U8) { gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1; gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId; gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId); } // Frontier Brain always wins, check tournamentId2. - else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != 0xFF) + else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != INVALID_U8) { gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1; gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId; gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId); } // Decide which one of two trainers wins! - else if (tournamentId2 != 0xFF) + else if (tournamentId2 != INVALID_U8) { // BUG: points1 and points2 are not cleared at the beginning of the loop resulting in not fair results. diff --git a/src/battle_factory.c b/src/battle_factory.c index 1d7fbafc9..dd82da746 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -202,9 +202,9 @@ static void sub_81A5E94(void) gUnknown_03001288 = FALSE; for (i = 0; i < 6; i++) - gSaveBlock2Ptr->frontier.field_E70[i].monId |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_E70[i].monId |= INVALID_U16; for (i = 0; i < 3; i++) - gUnknown_03006298[i] |= 0xFFFF; + gUnknown_03006298[i] |= INVALID_U16; saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 42a9b579c..60b233daf 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -10,7 +10,7 @@ #include "palette.h" #include "task.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "gpu_regs.h" #include "string_util.h" diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 6f9d2db80..88dbb5360 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -6,7 +6,7 @@ #include "constants/battle_anim.h" #include "battle_interface.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "graphics.h" #include "random.h" #include "util.h" @@ -122,7 +122,7 @@ void FreeBattleSpritesData(void) u16 ChooseMoveAndTargetInBattlePalace(void) { s32 i, var1, var2; - s32 chosenMoveId = -1; + s32 chosenMoveId = INVALID_S32; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF); s32 percent = Random() % 100; diff --git a/src/battle_interface.c b/src/battle_interface.c index c7eb11293..fd6d2a0ab 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -589,17 +589,17 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) for (; i > -1; i--) { - array[i] = 0xFF; + array[i] = INVALID_U8; } - if (arrayPtr[3] == 0xFF) + if (arrayPtr[3] == INVALID_U8) arrayPtr[3] = 0; if (arg2 == 0) { for (i = 0, j = 0; i < 4; i++) { - if (array[j] == 0xFF) + if (array[j] == INVALID_U8) { arg1[j] &= 0xFC00; arg1[j] |= 0x1E; @@ -622,7 +622,7 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) { for (i = 0; i < 4; i++) { - if (array[i] == 0xFF) + if (array[i] == INVALID_U8) { arg1[i] &= 0xFC00; arg1[i] |= 0x1E; @@ -1580,7 +1580,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (i = 0; i < PARTY_SIZE; i++) { - if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg + if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg { gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].data[7] = 1; @@ -1599,7 +1599,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (i = 0, var = 5, j = 0; j < PARTY_SIZE; j++) { - if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg + if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg { gSprites[ballIconSpritesIds[var]].oam.tileNum += 1; gSprites[ballIconSpritesIds[var]].data[7] = 1; @@ -1628,7 +1628,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (var = 5, i = 0; i < PARTY_SIZE; i++) { - if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg + if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg { gSprites[ballIconSpritesIds[var]].oam.tileNum += 1; gSprites[ballIconSpritesIds[var]].data[7] = 1; @@ -1648,7 +1648,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (var = 0, i = 0, j = 0; j < PARTY_SIZE; j++) { - if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg + if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg { gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].data[7] = 1; @@ -1765,7 +1765,7 @@ static void sub_8073E64(u8 taskId) s32 i; u8 battlerId = gTasks[taskId].tBattler; - if (--gTasks[taskId].tData15 == -1) + if (--gTasks[taskId].tData15 == INVALID_S16) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -1808,7 +1808,7 @@ static void sub_8073F98(u8 taskId) { SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8)); } - else if (gTasks[taskId].tData15 == -1) + else if (gTasks[taskId].tData15 == INVALID_S16) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -2289,7 +2289,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)) MoveBattleBarGraphically(battlerId, whichBar); - if (currentBarValue == -1) + if (currentBarValue == INVALID_S32) gBattleSpritesDataPtr->battleBars[battlerId].currValue = 0; return currentBarValue; @@ -2376,12 +2376,12 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (maxValue < scale) { if (newValue == Q_24_8_TO_INT(*currValue) && (*currValue & 0xFF) == 0) - return -1; + return INVALID_S32; } else { if (newValue == *currValue) // we're done, the bar's value has been updated - return -1; + return INVALID_S32; } if (maxValue < scale) // handle cases of max var having less pixels than the whole bar @@ -2403,7 +2403,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c *currValue -= toAdd; ret = Q_24_8_TO_INT(*currValue); // try round up - if ((*currValue & 0xFF) > 0) + if ((*currValue & INVALID_U8) > 0) ret++; if (ret <= newValue) { diff --git a/src/battle_main.c b/src/battle_main.c index de0becd2a..19e85f1cf 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -23,7 +23,7 @@ #include "link_rfu.h" #include "load_save.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "m4a.h" #include "palette.h" #include "party_menu.h" @@ -500,7 +500,7 @@ const struct TrainerMoney gTrainerMoneyTable[] = {TRAINER_CLASS_HIKER, 10}, {TRAINER_CLASS_YOUNG_COUPLE, 8}, {TRAINER_CLASS_WINSTRATE, 10}, - {0xFF, 5}, + {INVALID_U8, 5}, }; #include "data/text/abilities.h" @@ -2251,7 +2251,7 @@ static void sub_8038F34(void) ShowBg(0); ShowBg(1); ShowBg(2); - gBattleCommunication[1] = 0xFF; + gBattleCommunication[1] = INVALID_U8; gBattleCommunication[MULTIUSE_STATE]++; break; case 1: @@ -2993,7 +2993,7 @@ static void BattleStartClearSetData(void) gLastLandedMoves[i] = 0; gLastHitByType[i] = 0; gLastResultingMoves[i] = 0; - gLastHitBy[i] = 0xFF; + gLastHitBy[i] = INVALID_U8; gLockedMoves[i] = 0; gLastPrintedMoves[i] = 0; gBattleResources->flags->flags[i] = 0; @@ -3161,7 +3161,7 @@ void SwitchInClearSetData(void) gLastHitByType[gActiveBattler] = 0; gLastResultingMoves[gActiveBattler] = 0; gLastPrintedMoves[gActiveBattler] = 0; - gLastHitBy[gActiveBattler] = 0xFF; + gLastHitBy[gActiveBattler] = INVALID_U8; *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 0) = 0; *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 1) = 0; @@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void) gBattleResources->flags->flags[gActiveBattler] = 0; gCurrentMove = 0; - gBattleStruct->field_DA = 0xFF; + gBattleStruct->field_DA = INVALID_U8; ClearBattlerMoveHistory(gActiveBattler); ClearBattlerAbilityHistory(gActiveBattler); @@ -3253,7 +3253,7 @@ void FaintClearSetData(void) gLastHitByType[gActiveBattler] = 0; gLastResultingMoves[gActiveBattler] = 0; gLastPrintedMoves[gActiveBattler] = 0; - gLastHitBy[gActiveBattler] = 0xFF; + gLastHitBy[gActiveBattler] = INVALID_U8; *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 0) = 0; *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 1) = 0; @@ -3440,7 +3440,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = INVALID_U16; hpStatus[i].status = 0; } else @@ -3458,7 +3458,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = INVALID_U16; hpStatus[i].status = 0; } else @@ -3484,7 +3484,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = INVALID_U16; hpStatus[i].status = 0; } else @@ -3991,7 +3991,7 @@ void BattleTurnPassed(void) return; } - if (gBattleResults.battleTurnCounter < 0xFF) + if (gBattleResults.battleTurnCounter < INVALID_U8) { gBattleResults.battleTurnCounter++; gBattleStruct->field_DA++; @@ -4375,7 +4375,7 @@ static void HandleTurnActionSelectionState(void) return; default: sub_818603C(2); - if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF) + if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == INVALID_U16) { gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); @@ -5740,7 +5740,7 @@ static void HandleAction_ThrowPokeblock(void) gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1; gLastUsedItem = gBattleBufferB[gBattlerAttacker][2]; - if (gBattleResults.pokeblockThrows < 0xFF) + if (gBattleResults.pokeblockThrows < INVALID_U8) gBattleResults.pokeblockThrows++; if (gBattleStruct->safariPkblThrowCounter < 3) gBattleStruct->safariPkblThrowCounter++; diff --git a/src/battle_message.c b/src/battle_message.c index 47c4cbe1d..c483740f6 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1156,7 +1156,7 @@ const u16 gCaughtMonStringIds[] = const u16 gTrappingMoves[] = { - MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xFFFF + MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, INVALID_U16 }; const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!"); @@ -2967,7 +2967,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) printerTemplate.bgColor = textInfo[windowId].bgColor; printerTemplate.shadowColor = textInfo[windowId].shadowColor; - if (printerTemplate.x == 0xFF) + if (printerTemplate.x == INVALID_U8) { u32 width = sub_80397C4(gBattleScripting.windowsType, windowId); s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(printerTemplate.fontId, printerTemplate.currentChar, width, printerTemplate.letterSpacing); diff --git a/src/battle_pike.c b/src/battle_pike.c index 38d3e7d4a..590fd3d74 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -9,7 +9,7 @@ #include "task.h" #include "battle_tower.h" #include "party_menu.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "script.h" #include "battle_setup.h" @@ -1228,7 +1228,7 @@ static void sub_81A7E60(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 sub_81A7EC4(void) { - if (FindTaskIdByFunc(sub_81A7D54) == 0xFF) + if (FindTaskIdByFunc(sub_81A7D54) == INVALID_U8) return TRUE; else return FALSE; @@ -1448,7 +1448,7 @@ static void sub_81A84B4(void) u8 i; for (i = 0; i < 14; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; } static void sub_81A84EC(void) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 23343ba20..36c757c93 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -21,7 +21,7 @@ #include "main.h" #include "load_save.h" #include "script.h" -#include "malloc.h" +#include "alloc.h" #include "overworld.h" #include "event_scripts.h" #include "constants/battle_frontier.h" @@ -1541,7 +1541,7 @@ void sub_81AA1D8(void) u8 var0, var1; for (i = 0; i < 8; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; id = sub_81AA9E4(); sub_81AA33C(&var0, &var1); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 2225a3e55..8b3a509b9 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -17,7 +17,7 @@ #include "list_menu.h" #include "mail.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" @@ -388,11 +388,11 @@ void sub_81C4F98(u8 a0, void (*callback)(void)) gPyramidBagCursorData.callback = callback; gPyramidBagResources->callback2 = NULL; - gPyramidBagResources->unk814 = 0xFF; - gPyramidBagResources->scrollIndicatorsTaskId = 0xFF; + gPyramidBagResources->unk814 = INVALID_U8; + gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8; - memset(gPyramidBagResources->itemsSpriteIds, 0xFF, sizeof(gPyramidBagResources->itemsSpriteIds)); - memset(gPyramidBagResources->windowIds, 0xFF, sizeof(gPyramidBagResources->windowIds)); + memset(gPyramidBagResources->itemsSpriteIds, INVALID_U8, sizeof(gPyramidBagResources->itemsSpriteIds)); + memset(gPyramidBagResources->windowIds, INVALID_U8, sizeof(gPyramidBagResources->windowIds)); SetMainCallback2(sub_81C504C); } @@ -604,7 +604,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen PlaySE(SE_SELECT); sub_81C6F20(); } - if (gPyramidBagResources->unk814 == 0xFF) + if (gPyramidBagResources->unk814 == INVALID_U8) { sub_81C6FF8(gPyramidBagResources->unk815 ^ 1); if (itemIndex != LIST_B_PRESSED) @@ -622,7 +622,7 @@ static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y) if (itemIndex == LIST_B_PRESSED) return; - if (gPyramidBagResources->unk814 != 0xFF) + if (gPyramidBagResources->unk814 != INVALID_U8) { if (gPyramidBagResources->unk814 == (u8)(itemIndex)) sub_81C5AB8(y, 1); @@ -657,16 +657,16 @@ static void PrintItemDescription(s32 listMenuId) static void AddScrollArrow(void) { - if (gPyramidBagResources->scrollIndicatorsTaskId == 0xFF) + if (gPyramidBagResources->scrollIndicatorsTaskId == INVALID_U8) gPyramidBagResources->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(2, 172, 12, 148, gPyramidBagResources->listMenuCount - gPyramidBagResources->listMenuMaxShown, 0xB5E, 0xB5E, &gPyramidBagCursorData.scrollPosition); } static void RemoveScrollArrow(void) { - if (gPyramidBagResources->scrollIndicatorsTaskId != 0xFF) + if (gPyramidBagResources->scrollIndicatorsTaskId != INVALID_U8) { RemoveScrollIndicatorArrowPair(gPyramidBagResources->scrollIndicatorsTaskId); - gPyramidBagResources->scrollIndicatorsTaskId = 0xFF; + gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8; } } @@ -803,7 +803,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1) static void sub_81C5AB8(u8 y, u8 arg1) { - if (arg1 == 0xFF) + if (arg1 == INVALID_U8) FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1); @@ -1323,7 +1323,7 @@ static void PerformItemSwap(u8 taskId) else { MovePyramidBagItemSlotInList(data[1], var); - gPyramidBagResources->unk814 = 0xFF; + gPyramidBagResources->unk814 = INVALID_U8; sub_81C7028(TRUE); DestroyListMenuTask(data[0], scrollOffset, selectedRow); if (data[1] < var) @@ -1340,7 +1340,7 @@ static void sub_81C6A14(u8 taskId) u16 *scrollOffset = &gPyramidBagCursorData.scrollPosition; u16 *selectedRow = &gPyramidBagCursorData.cursorPosition; - gPyramidBagResources->unk814 = 0xFF; + gPyramidBagResources->unk814 = INVALID_U8; sub_81C7028(TRUE); DestroyListMenuTask(data[0], scrollOffset, selectedRow); if (data[1] < *scrollOffset + *selectedRow) @@ -1427,7 +1427,7 @@ static u8 sub_81C6D08(u8 windowArrayId) static u8 sub_81C6D24(u8 windowArrayId) { u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; - if (*windowId == 0xFF) + if (*windowId == INVALID_U8) { *windowId = AddWindow(&gUnknown_0861F350[windowArrayId]); SetWindowBorderStyle(*windowId, FALSE, 1, 0xE); @@ -1439,13 +1439,13 @@ static u8 sub_81C6D24(u8 windowArrayId) static void sub_81C6D6C(u8 windowArrayId) { u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; - if (*windowId != 0xFF) + if (*windowId != INVALID_U8) { sub_8198070(*windowId, FALSE); ClearWindowTilemap(*windowId); RemoveWindow(*windowId); schedule_bg_copy_tilemap_to_vram(1); - *windowId = 0xFF; + *windowId = INVALID_U8; } } @@ -1473,13 +1473,13 @@ static void sub_81C6E1C(void) static void sub_81C6E38(u8 itemSpriteArrayId) { u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId]; - if (*spriteId != 0xFF) + if (*spriteId != INVALID_U8) { FreeSpriteTilesByTag(ITEM_IMAGE_TAG + itemSpriteArrayId); FreeSpritePaletteByTag(ITEM_IMAGE_TAG + itemSpriteArrayId); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = 0xFF; + *spriteId = INVALID_U8; } } @@ -1524,7 +1524,7 @@ static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId) { u8 itemSpriteId; u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId + 1]; - if (*spriteId == 0xFF) + if (*spriteId == INVALID_U8) { FreeSpriteTilesByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId); FreeSpritePaletteByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId); diff --git a/src/battle_records.c b/src/battle_records.c index f64b5f494..f9c40d8de 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -18,7 +18,7 @@ #include "international_string_util.h" #include "sound.h" #include "constants/songs.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "constants/game_stat.h" diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6a7ca1725..53f8defa5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -763,8 +763,8 @@ static const struct SpriteTemplate sSpriteTemplate_MonIconOnLvlUpBox = static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / 4, USHRT_MAX / 8}; #define MIMIC_FORBIDDEN_END 0xFFFE -#define METRONOME_FORBIDDEN_END 0xFFFF -#define ASSIST_FORBIDDEN_END 0xFFFF +#define METRONOME_FORBIDDEN_END INVALID_U16 +#define ASSIST_FORBIDDEN_END INVALID_U16 static const u16 sMovesForbiddenToCopy[] = { @@ -822,7 +822,7 @@ static const u16 sWeightToDamageTable[] = 500, 60, 1000, 80, 2000, 100, - 0xFFFF, 0xFFFF + INVALID_U16, INVALID_U16 }; static const u16 sPickupItems[] = @@ -1976,7 +1976,7 @@ static void atk0C_datahpupdate(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gSpecialStatuses[gActiveBattler].dmg == 0) - gSpecialStatuses[gActiveBattler].dmg = 0xFFFF; + gSpecialStatuses[gActiveBattler].dmg = INVALID_U16; } gBattlescriptCurrInstr += 2; } @@ -2579,7 +2579,7 @@ void SetMoveEffect(bool8 primary, u8 certain) u16 PayDay = gPaydayMoney; gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5); if (PayDay > gPaydayMoney) - gPaydayMoney = 0xFFFF; + gPaydayMoney = INVALID_U16; } BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; @@ -4520,7 +4520,7 @@ static void atk49_moveend(void) u8 arg1, arg2; u16 originallyUsedMove; - if (gChosenMove == 0xFFFF) + if (gChosenMove == INVALID_U16) originallyUsedMove = 0; else originallyUsedMove = gChosenMove; @@ -4593,7 +4593,7 @@ static void atk49_moveend(void) break; case ATK49_CHOICE_MOVE: // update choice band move if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND - || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF)) + || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != INVALID_U16)) goto LOOP; if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED)) { @@ -4708,8 +4708,8 @@ static void atk49_moveend(void) } else { - gLastMoves[gBattlerAttacker] = 0xFFFF; - gLastResultingMoves[gBattlerAttacker] = 0xFFFF; + gLastMoves[gBattlerAttacker] = INVALID_U16; + gLastResultingMoves[gBattlerAttacker] = INVALID_U16; } if (!(gHitMarker & HITMARKER_FAINTED(gBattlerTarget))) @@ -4717,7 +4717,7 @@ static void atk49_moveend(void) if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - if (gChosenMove == 0xFFFF) + if (gChosenMove == INVALID_U16) { gLastLandedMoves[gBattlerTarget] = gChosenMove; } @@ -4729,7 +4729,7 @@ static void atk49_moveend(void) } else { - gLastLandedMoves[gBattlerTarget] = 0xFFFF; + gLastLandedMoves[gBattlerTarget] = INVALID_U16; } } gBattleScripting.atk49_state++; @@ -5662,7 +5662,7 @@ static void atk59_handlelearnnewmove(void) { gBattlescriptCurrInstr = jumpPtr2; } - else if (ret == 0xFFFF) + else if (ret == INVALID_U16) { gBattlescriptCurrInstr += 10; } @@ -6015,7 +6015,7 @@ static void atk61_drawpartystatussummary(void) if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatuses[i].hp = 0xFFFF; + hpStatuses[i].hp = INVALID_U16; hpStatuses[i].status = 0; } else @@ -6930,7 +6930,7 @@ static void atk7C_trymirrormove(void) move = *(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0) | (*(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) << 8); - if (move != 0 && move != 0xFFFF) + if (move != 0 && move != INVALID_U16) { movesArray[validMovesCount] = move; validMovesCount++; @@ -6941,7 +6941,7 @@ static void atk7C_trymirrormove(void) move = *(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 0) | (*(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 1) << 8); - if (move != 0 && move != 0xFFFF) + if (move != 0 && move != INVALID_U16) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = move; @@ -7094,7 +7094,7 @@ bool8 UproarWakeUpCheck(u8 battlerId) gBattleScripting.battler = i; - if (gBattlerTarget == 0xFF) + if (gBattlerTarget == INVALID_U8) gBattlerTarget = i; else if (gBattlerTarget == i) gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -8008,7 +8008,7 @@ static void atk9A_setfocusenergy(void) static void atk9B_transformdataexecution(void) { - gChosenMove = 0xFFFF; + gChosenMove = INVALID_U16; gBattlescriptCurrInstr++; if (gBattleMons[gBattlerTarget].status2 & STATUS2_TRANSFORMED || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE) @@ -8088,12 +8088,12 @@ static bool8 IsMoveUncopyableByMimic(u16 move) static void atk9D_mimicattackcopy(void) { - gChosenMove = 0xFFFF; + gChosenMove = INVALID_U16; if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget]) || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED || gLastMoves[gBattlerTarget] == 0 - || gLastMoves[gBattlerTarget] == 0xFFFF) + || gLastMoves[gBattlerTarget] == INVALID_U16) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8296,7 +8296,7 @@ static void atkA5_painsplitdmgcalc(void) storeLoc[3] = (painSplitHp & 0xFF000000) >> 24; gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff; - gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; + gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16; gBattlescriptCurrInstr += 5; } @@ -8309,7 +8309,7 @@ static void atkA5_painsplitdmgcalc(void) static void atkA6_settypetorandomresistance(void) // conversion 2 { if (gLastLandedMoves[gBattlerAttacker] == 0 - || gLastLandedMoves[gBattlerAttacker] == 0xFFFF) + || gLastLandedMoves[gBattlerAttacker] == INVALID_U16) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8376,12 +8376,12 @@ static void atkA7_setalwayshitflag(void) static void atkA8_copymovepermanently(void) // sketch { - gChosenMove = 0xFFFF; + gChosenMove = INVALID_U16; if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE && gLastPrintedMoves[gBattlerTarget] != 0 - && gLastPrintedMoves[gBattlerTarget] != 0xFFFF + && gLastPrintedMoves[gBattlerTarget] != INVALID_U16 && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH) { s32 i; @@ -8550,7 +8550,7 @@ static void atkAC_remaininghptopower(void) static void atkAD_tryspiteppreduce(void) { if (gLastMoves[gBattlerTarget] != 0 - && gLastMoves[gBattlerTarget] != 0xFFFF) + && gLastMoves[gBattlerTarget] != INVALID_U16) { s32 i; @@ -9671,13 +9671,13 @@ static void atkDC_trysetgrudge(void) static void atkDD_weightdamagecalculation(void) { s32 i; - for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2) + for (i = 0; sWeightToDamageTable[i] != INVALID_U16; i += 2) { if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1)) break; } - if (sWeightToDamageTable[i] != 0xFFFF) + if (sWeightToDamageTable[i] != INVALID_U16) gDynamicBasePower = sWeightToDamageTable[i + 1]; else gDynamicBasePower = 120; diff --git a/src/battle_setup.c b/src/battle_setup.c index 4243d2f3f..0b5cd9e21 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1530,7 +1530,7 @@ static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *tab return i; } - return -1; + return INVALID_S32; } static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) @@ -1548,7 +1548,7 @@ static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 tra } } - return -1; + return INVALID_S32; } static bool32 sub_80B1D94(s32 rematchTableId) @@ -1640,7 +1640,7 @@ static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table, { s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; if (tableId >= 100) return FALSE; @@ -1654,7 +1654,7 @@ static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 t { s32 tableId = TrainerIdToRematchTableId(table, trainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; if (tableId >= 100) return FALSE; @@ -1670,7 +1670,7 @@ static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 s32 i; s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; trainerEntry = &table[tableId]; @@ -1691,7 +1691,7 @@ static u16 GetLastBeatenRematchTrainerIdFromTable(const struct RematchTrainer *t s32 i; s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; trainerEntry = &table[tableId]; @@ -1710,7 +1710,7 @@ static void ClearTrainerWantRematchState(const struct RematchTrainer *table, u16 { s32 tableId = TrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId != -1) + if (tableId != INVALID_S32) gSaveBlock1Ptr->trainerRematches[tableId] = 0; } @@ -1724,7 +1724,7 @@ static u32 GetTrainerMatchCallFlag(u32 trainerId) return FLAG_MATCH_CALL_REGISTERED + i; } - return 0xFFFF; + return INVALID_U16; } static void RegisterTrainerInMatchCall(void) @@ -1732,7 +1732,7 @@ static void RegisterTrainerInMatchCall(void) if (FlagGet(FLAG_HAS_MATCH_CALL)) { u32 matchCallFlagId = GetTrainerMatchCallFlag(gTrainerBattleOpponent_A); - if (matchCallFlagId != 0xFFFF) + if (matchCallFlagId != INVALID_U16) FlagSet(matchCallFlagId); } } @@ -1741,7 +1741,7 @@ static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBa { s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == -1) + if (tableId == INVALID_S32) return FALSE; if (!HasTrainerBeenFought(table[tableId].trainerIds[1])) return FALSE; diff --git a/src/battle_tent.c b/src/battle_tent.c index c7e70912c..836b2b6de 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -364,7 +364,7 @@ static void sub_81BA040(void) } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); gTrainerBattleOpponent_A = trainerId; - while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != 0xFFFF) + while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != INVALID_U16) setsCount++; if (setsCount > 8) break; diff --git a/src/battle_tower.c b/src/battle_tower.c index f9dfcabd1..c74cfd9a0 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -973,7 +973,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) // Attempt to fill the trainer's party with random Pokemon until 3 have been // successfully chosen. The trainer's party may not have duplicate pokemon species // or duplicate held items. - for (bfMonCount = 0; monSets[bfMonCount] != 0xFFFF; bfMonCount++) + for (bfMonCount = 0; monSets[bfMonCount] != INVALID_U16; bfMonCount++) ; i = 0; otID = Random32(); @@ -1081,11 +1081,11 @@ u16 RandomizeFacilityTrainerMonSet(u16 trainerId) u8 bfMonCount = 0; u32 monSetId = monSets[bfMonCount]; - while (monSetId != 0xFFFF) + while (monSetId != INVALID_U16) { bfMonCount++; monSetId = monSets[bfMonCount]; - if (monSetId == 0xFFFF) + if (monSetId == INVALID_U16) break; } @@ -2641,11 +2641,11 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) bfMonCount = 0; monSetId = monSets[bfMonCount]; - while (monSetId != 0xFFFF) + while (monSetId != INVALID_U16) { bfMonCount++; monSetId = monSets[bfMonCount]; - if (monSetId == 0xFFFF) + if (monSetId == INVALID_U16) break; } diff --git a/src/battle_transition.c b/src/battle_transition.c index 94b9e78f9..f15514f50 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -7,7 +7,7 @@ #include "field_effect.h" #include "gpu_regs.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "overworld.h" #include "palette.h" #include "random.h" @@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = static const struct SpriteTemplate gUnknown_085C8E68 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4105, .oam = &gEventObjectBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, @@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = static const struct SpriteTemplate sSpriteTemplate_85C8EBC = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -998,7 +998,7 @@ static bool8 Transition_Phase1(struct Task *task) static bool8 Transition_WaitForPhase1(struct Task *task) { - if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF) + if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == INVALID_U8) { task->tState++; return TRUE; @@ -1019,7 +1019,7 @@ static bool8 Transition_Phase2(struct Task *task) static bool8 Transition_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; - if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF) + if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == INVALID_U8) task->tTransitionDone = TRUE; return FALSE; } @@ -3605,7 +3605,7 @@ static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 IsPhase1Done(void) { - if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF) + if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == INVALID_U8) return TRUE; else return FALSE; diff --git a/src/battle_tv.c b/src/battle_tv.c index 535046fd1..edd506708 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -26,9 +26,9 @@ static const u16 sVariableDmgMoves[] = MOVE_WATER_SPOUT, MOVE_DREAM_EATER, MOVE_WEATHER_BALL, MOVE_SNORE, MOVE_PAIN_SPLIT, MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_RETURN, MOVE_ENDEAVOR, - MOVE_PRESENT, MOVE_REVENGE, 0xFFFF, + MOVE_PRESENT, MOVE_REVENGE, INVALID_U16, // those are handled by the function itself - MOVE_MAGNITUDE, MOVE_PSYWAVE, 0xFFFF + MOVE_MAGNITUDE, MOVE_PSYWAVE, INVALID_U16 }; static const u16 sUnknown_0860A4E0[] = @@ -199,7 +199,7 @@ static const u16 sUnknown_0860A8A4[] = STRINGID_PKMNAFFLICTEDBYCURSE, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_PKMNLOCKEDINNIGHTMARE, STRINGID_PKMNHURTBY, STRINGID_PKMNHURTBYBURN, STRINGID_PKMNHURTBYPOISON, STRINGID_PKMNHURTBYSPIKES, STRINGID_ATTACKERFAINTED, STRINGID_TARGETFAINTED, - STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, 0xFFFF + STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, INVALID_U16 }; // code @@ -625,9 +625,9 @@ static bool8 sub_817E0B8(u16 stringId) if (sUnknown_0860A8A4[i] == stringId) break; i++; - } while (sUnknown_0860A8A4[i] != 0xFFFF); + } while (sUnknown_0860A8A4[i] != INVALID_U16); - if (sUnknown_0860A8A4[i] == 0xFFFF) + if (sUnknown_0860A8A4[i] == INVALID_U16) return TRUE; else return FALSE; @@ -1164,7 +1164,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) break; } i += 2; - } while (ptr[i] != 0xFFFF); + } while (ptr[i] != INVALID_U16); break; case 19: tvPtr->side[arg2 ^ 1].faintCause = 0; @@ -1415,9 +1415,9 @@ static void TrySetBattleSeminarShow(void) if (currMoveSaved == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != 0xFFFF); + } while (sVariableDmgMoves[i] != INVALID_U16); - if (sVariableDmgMoves[i] != 0xFFFF) + if (sVariableDmgMoves[i] != INVALID_U16) return; dmgByMove[gMoveSelectionCursor[gBattlerAttacker]] = gBattleMoveDamage; @@ -1490,9 +1490,9 @@ static bool8 ShouldCalculateDamage(u16 moveId, s32 *dmg, u16 *powerOverride) if (moveId == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != 0xFFFF); + } while (sVariableDmgMoves[i] != INVALID_U16); - if (sVariableDmgMoves[i] != 0xFFFF) + if (sVariableDmgMoves[i] != INVALID_U16) { *dmg = 0; return FALSE; diff --git a/src/battle_util.c b/src/battle_util.c index 251a545c9..12ca6bc9c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -29,7 +29,7 @@ extern u8 weather_get_current(void); static const u16 sSoundMovesTable[] = { MOVE_GROWL, MOVE_ROAR, MOVE_SING, MOVE_SUPERSONIC, MOVE_SCREECH, MOVE_SNORE, - MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, 0xFFFF + MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, INVALID_U16 }; u8 GetBattlerForBattleScript(u8 caseId) @@ -382,7 +382,7 @@ u8 TrySetCantSelectMoveBattleScript(void) gPotentialItemEffectBattler = gActiveBattler; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != move) { gCurrentMove = *choicedMove; gLastUsedItem = gBattleMons[gActiveBattler].item; @@ -442,7 +442,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) unusableMoves |= gBitTable[i]; if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i]) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; } return unusableMoves; @@ -451,7 +451,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) bool8 AreAllMovesUnusable(void) { u8 unusable; - unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF); + unusable = CheckMoveLimitations(gActiveBattler, 0, INVALID_U8); if (unusable == 0xF) // All moves are unusable. { @@ -1137,7 +1137,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) gBattlerTarget = gActiveBattler; gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler]; gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler]; - gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; + gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16; BattleScriptExecute(BattleScript_MonTookFutureAttack); if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0 @@ -1996,12 +1996,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA case ABILITYEFFECT_MOVES_BLOCK: // 2 if (gLastUsedAbility == ABILITY_SOUNDPROOF) { - for (i = 0; sSoundMovesTable[i] != 0xFFFF; i++) + for (i = 0; sSoundMovesTable[i] != INVALID_U16; i++) { if (sSoundMovesTable[i] == move) break; } - if (sSoundMovesTable[i] != 0xFFFF) + if (sSoundMovesTable[i] != INVALID_U16) { if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) gHitMarker |= HITMARKER_NO_PPDEDUCT; @@ -2527,7 +2527,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA break; } - if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != 0xFF) + if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != INVALID_U8) RecordAbilityBattle(battler, gLastUsedAbility); } @@ -3213,7 +3213,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case HOLD_EFFECT_SHELL_BELL: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && gSpecialStatuses[gBattlerTarget].dmg != 0 - && gSpecialStatuses[gBattlerTarget].dmg != 0xFFFF + && gSpecialStatuses[gBattlerTarget].dmg != INVALID_U16 && gBattlerAttacker != gBattlerTarget && gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP && gBattleMons[gBattlerAttacker].hp != 0) @@ -3394,7 +3394,7 @@ u8 IsMonDisobedient(void) calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8; if (calc < obedienceLevel) { - calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], 0xFF); + calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], INVALID_U8); if (calc == 0xF) // all moves cannot be used { gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3; diff --git a/src/battle_util2.c b/src/battle_util2.c index 5881abf25..a9891814c 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -1,7 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_controllers.h" -#include "malloc.h" +#include "alloc.h" #include "pokemon.h" #include "event_data.h" #include "constants/abilities.h" diff --git a/src/berry_blender.c b/src/berry_blender.c index 7320e905f..e977bdbeb 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -12,7 +12,7 @@ #include "bg.h" #include "palette.h" #include "decompress.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "text.h" #include "text_window.h" @@ -1455,7 +1455,7 @@ static void sub_808074C(void) for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->field_96[i] = 0xFF; + sBerryBlenderData->field_96[i] = INVALID_U8; sBerryBlenderData->field_8E[i] = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i]; } for (j = 0; j < BLENDER_MAX_PLAYERS; j++) @@ -1479,7 +1479,7 @@ static void Blender_PrintPlayerNames(void) for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_8E[i] != 0xFF) + if (sBerryBlenderData->field_8E[i] != INVALID_U8) { sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]] = sBerryBlenderData->syncArrowSprite2Ids[i]; StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]]], i); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index a90906d05..d87509e10 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -1,7 +1,7 @@ #include "global.h" #include "gpu_regs.h" #include "multiboot.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "graphics.h" #include "main.h" diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 39927ab99..22f99a426 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -21,7 +21,7 @@ #include "string_util.h" #include "strings.h" #include "bg.h" -#include "malloc.h" +#include "alloc.h" #include "scanline_effect.h" #include "gpu_regs.h" #include "graphics.h" diff --git a/src/bg.c b/src/bg.c index a41075ad7..fd6ffca6e 100644 --- a/src/bg.c +++ b/src/bg.c @@ -87,37 +87,37 @@ void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenS { if (IsInvalidBg(bg) == FALSE) { - if (charBaseIndex != 0xFF) + if (charBaseIndex != INVALID_U8) { sGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3; } - if (mapBaseIndex != 0xFF) + if (mapBaseIndex != INVALID_U8) { sGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F; } - if (screenSize != 0xFF) + if (screenSize != INVALID_U8) { sGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3; } - if (paletteMode != 0xFF) + if (paletteMode != INVALID_U8) { sGpuBgConfigs.configs[bg].paletteMode = paletteMode; } - if (priority != 0xFF) + if (priority != INVALID_U8) { sGpuBgConfigs.configs[bg].priority = priority & 0x3; } - if (mosaic != 0xFF) + if (mosaic != INVALID_U8) { sGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1; } - if (wraparound != 0xFF) + if (wraparound != INVALID_U8) { sGpuBgConfigs.configs[bg].wraparound = wraparound; } @@ -154,7 +154,7 @@ u16 GetBgControlAttribute(u8 bg, u8 attributeId) } } - return 0xFF; + return INVALID_U8; } u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode) @@ -379,7 +379,7 @@ u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset) cursor = LoadBgVram(bg, src, size, tileOffset, DISPCNT_MODE_1); - if (cursor == 0xFF) + if (cursor == INVALID_U8) { return -1; } @@ -400,7 +400,7 @@ u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset) cursor = LoadBgVram(bg, src, size, destOffset * 2, DISPCNT_MODE_2); - if (cursor == 0xFF) + if (cursor == INVALID_U8) { return -1; } @@ -480,25 +480,25 @@ void SetBgAttribute(u8 bg, u8 attributeId, u8 value) switch (attributeId) { case 1: - SetBgControlAttributes(bg, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); + SetBgControlAttributes(bg, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); break; case 2: - SetBgControlAttributes(bg, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); break; case 3: - SetBgControlAttributes(bg, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); break; case 4: - SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8); break; case 7: - SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8); break; case 5: - SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8); break; case 6: - SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value); + SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value); break; } } @@ -1284,7 +1284,7 @@ u32 GetBgType(u8 bg) break; } - return 0xFFFF; + return INVALID_U16; } bool32 IsInvalidBg32(u8 bg) diff --git a/src/blit.c b/src/blit.c index b4d5f7de5..2ba0e489c 100644 --- a/src/blit.c +++ b/src/blit.c @@ -3,7 +3,7 @@ void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height) { - BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, 0xFF); + BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, INVALID_U8); } void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey) @@ -33,7 +33,7 @@ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 sr multiplierSrcY = (src->width + (src->width & 7)) >> 3; multiplierDstY = (dst->width + (dst->width & 7)) >> 3; - if (colorKey == 0xFF) + if (colorKey == INVALID_U8) { for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++) { @@ -132,7 +132,7 @@ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, multiplierSrcY = (src->width + (src->width & 7)) >> 3; multiplierDstY = (dst->width + (dst->width & 7)) >> 3; - if (colorKey == 0xFF) + if (colorKey == INVALID_U8) { for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++) { diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index b17ffad33..6a2e42c4e 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -465,7 +465,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void) } varValue = VarGet(0x403B); - if (varValue != 0xFFFF || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) + if (varValue != INVALID_U16 || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) return FALSE; if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21) diff --git a/src/cable_club.c b/src/cable_club.c index 56154d5bf..649534711 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -70,7 +70,7 @@ static void sub_80B3220(u8 taskId); static void sub_80B236C(u8 arg0, u8 arg1) { - if (FindTaskIdByFunc(sub_80B2634) == 0xFF) + if (FindTaskIdByFunc(sub_80B2634) == INVALID_U8) { u8 taskId1; @@ -604,7 +604,7 @@ void sub_80B2EA8(void) { u32 taskId = FindTaskIdByFunc(sub_80B2EE4); - if (taskId == 0xFF) + if (taskId == INVALID_U8) { taskId = CreateTask(sub_80B2EE4, 80); gTasks[taskId].data[0] = 0; @@ -702,7 +702,7 @@ void sub_80B3028(void) u8 sub_80B3050(void) { if (FuncIsActiveTask(sub_80B3144) != FALSE) - return 0xFF; + return INVALID_U8; switch (gSpecialVar_0x8004) { diff --git a/src/contest.c b/src/contest.c index 0c3a041b0..716ed5dfc 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1,7 +1,7 @@ #include "global.h" #include "gpu_regs.h" #include "bg.h" -#include "malloc.h" +#include "alloc.h" #include "constants/items.h" #include "constants/event_objects.h" #include "constants/moves.h" @@ -324,7 +324,7 @@ void sub_80D787C(void) *gContestResources->field_0 = (struct Contest){}; for (i = 0; i < 4; i++) { - gContestResources->field_0->unk19206[i] = 0xFF; + gContestResources->field_0->unk19206[i] = INVALID_U8; } for (i = 0; i < 4; i++) { @@ -344,7 +344,7 @@ void sub_80D787C(void) sub_80DCE58(0); for (i = 0; i < 4; i++) { - gContestResources->field_4[i].nextTurnOrder = 0xFF; + gContestResources->field_4[i].nextTurnOrder = INVALID_U8; gContestResources->field_0->unk19218[i] = gUnknown_02039F26[i]; } sub_80DD590(); @@ -2097,7 +2097,7 @@ void sub_80DAB8C(u8 contestType, u8 rank) opponents[opponentsCount++] = i; } } - opponents[opponentsCount] = 0xFF; + opponents[opponentsCount] = INVALID_U8; // Choose three random opponents from the list for (i = 0; i < 3; i++) @@ -2106,7 +2106,7 @@ void sub_80DAB8C(u8 contestType, u8 rank) s32 j; gContestMons[i] = gContestOpponents[opponents[rnd]]; - for (j = rnd; opponents[j] != 0xFF; j++) + for (j = rnd; opponents[j] != INVALID_U8; j++) opponents[j] = opponents[j + 1]; opponentsCount--; } @@ -2151,7 +2151,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) else if (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough) opponents[opponentsCount++] = i; } - opponents[opponentsCount] = 0xFF; + opponents[opponentsCount] = INVALID_U8; for (i = 0; i < 4 - gUnknown_02039F30; i++) { u16 rnd = sub_80F903C() % opponentsCount; @@ -2160,7 +2160,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) gContestMons[gUnknown_02039F30 + i] = gContestOpponents[opponents[rnd]]; sub_80DF9D4(gContestMons[gUnknown_02039F30 + i].trainerName); sub_80DF9E0(gContestMons[gUnknown_02039F30 + i].nickname, GAME_LANGUAGE); - for (j = rnd; opponents[j] != 0xFF; j++) + for (j = rnd; opponents[j] != INVALID_U8; j++) opponents[j] = opponents[j + 1]; opponentsCount--; } @@ -2591,7 +2591,7 @@ void prints_contest_move_description(u16 a) ContestBG_FillBoxWithIncrementingTile(0, categoryTile, 0x0b, 0x1f, 0x05, 0x01, 0x11, 0x01); ContestBG_FillBoxWithIncrementingTile(0, categoryTile + 0x10, 0x0b, 0x20, 0x05, 0x01, 0x11, 0x01); - if (gContestEffects[gContestMoves[a].effect].appeal == 0xFF) + if (gContestEffects[gContestMoves[a].effect].appeal == INVALID_U8) numHearts = 0; else numHearts = gContestEffects[gContestMoves[a].effect].appeal / 10; @@ -2600,7 +2600,7 @@ void prints_contest_move_description(u16 a) ContestBG_FillBoxWithTile(0, 0x5035, 0x15, 0x1f, 0x08, 0x01, 0x11); ContestBG_FillBoxWithTile(0, 0x5012, 0x15, 0x1f, numHearts, 0x01, 0x11); - if (gContestEffects[gContestMoves[a].effect].jam == 0xFF) + if (gContestEffects[gContestMoves[a].effect].jam == INVALID_U8) numHearts = 0; else numHearts = gContestEffects[gContestMoves[a].effect].jam / 10; diff --git a/src/contest_effect.c b/src/contest_effect.c index 760d74d69..6f1c19fe2 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -144,7 +144,7 @@ static void ContestEffect_StartleFrontMon(void) break; } shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; idx = WasAtLeastOneOpponentJammed(); } if (idx == 0) @@ -168,7 +168,7 @@ static void ContestEffect_StartlePrevMons(void) shared192D0.jamQueue[j++] = i; } - shared192D0.jamQueue[j] = 0xFF; + shared192D0.jamQueue[j] = INVALID_U8; idx = WasAtLeastOneOpponentJammed(); } if (idx == 0) @@ -211,7 +211,7 @@ static void ContestEffect_StartlePrevMons2(void) u8 rval, jam; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; rval = Random() % 10; if (rval == 0) @@ -288,7 +288,7 @@ static void ContestEffect_StartleMonWithJudgesAttention(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; if (WasAtLeastOneOpponentJammed()) numStartled++; } @@ -393,7 +393,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) s16 oddsMod[4]; s16 odds[4]; - memset(contestantIds, 0xFF, ARRAY_COUNT(contestantIds)); + memset(contestantIds, INVALID_U8, ARRAY_COUNT(contestantIds)); for (i = 0, numAfter = 0; i < 4; i++) { if (shared192D0.turnOrder[shared192D0.contestant] < shared192D0.turnOrder[i] && @@ -431,7 +431,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) } if (odds[0] != 0) { - for (i = 0; contestantIds[i] != 0xFF; i++) + for (i = 0; contestantIds[i] != INVALID_U8; i++) { if (Random() % 100 < odds[i] + oddsMod[contestantIds[i]]) { @@ -504,7 +504,7 @@ static void ContestEffect_BadlyStartlesMonsInGoodCondition(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; if (WasAtLeastOneOpponentJammed()) numHit++; } @@ -755,7 +755,7 @@ static void ContestEffect_NextAppealEarlier(void) for (i = 0; i < 4; i++) turnOrder[i] = sContestantStatus[i].nextTurnOrder; - turnOrder[shared192D0.contestant] = 0xFF; + turnOrder[shared192D0.contestant] = INVALID_U8; for (i = 0; i < 4; i++) { @@ -797,7 +797,7 @@ static void ContestEffect_NextAppealLater(void) for (i = 0; i < 4; i++) turnOrder[i] = sContestantStatus[i].nextTurnOrder; - turnOrder[shared192D0.contestant] = 0xFF; + turnOrder[shared192D0.contestant] = INVALID_U8; for (i = 3; i > -1; i--) { @@ -855,12 +855,12 @@ static void ContestEffect_ScrambleNextTurnOrder(void) for (j = 0; j < 4; j++) { - if (unselectedContestants[j] != 0xFF) + if (unselectedContestants[j] != INVALID_U8) { if (rval == 0) { turnOrder[j] = i; - unselectedContestants[j] = 0xFF; + unselectedContestants[j] = INVALID_U8; break; } else @@ -906,7 +906,7 @@ static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; if (WasAtLeastOneOpponentJammed()) numJammed++; } @@ -974,7 +974,7 @@ static void JamByMoveCategory(u8 category) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = 0xFF; + shared192D0.jamQueue[1] = INVALID_U8; if (WasAtLeastOneOpponentJammed()) numJammed++; } @@ -1013,7 +1013,7 @@ static bool8 WasAtLeastOneOpponentJammed(void) s16 jamBuffer[4] = {0}; int i; - for (i = 0; shared192D0.jamQueue[i] != 0xFF; i++) + for (i = 0; shared192D0.jamQueue[i] != INVALID_U8; i++) { u8 contestant = shared192D0.jamQueue[i]; if (CanUnnerveContestant(contestant)) diff --git a/src/credits.c b/src/credits.c index df17ec70b..02b01c072 100644 --- a/src/credits.c +++ b/src/credits.c @@ -3,7 +3,7 @@ #include "main.h" #include "task.h" #include "bg.h" -#include "malloc.h" +#include "alloc.h" #include "window.h" #include "text.h" #include "menu.h" diff --git a/src/data2b.c b/src/data2b.c index 022903375..bb1baa266 100644 --- a/src/data2b.c +++ b/src/data2b.c @@ -1,7 +1,7 @@ #include "global.h" #include "data2.h" #include "graphics.h" -#include "malloc.h" +#include "alloc.h" #include "constants/species.h" const u16 gUnknown_082FF1D8[] = INCBIN_U16("graphics/link/minigame_digits.gbapal"); diff --git a/src/daycare.c b/src/daycare.c index 2356b36f5..227451f48 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -251,7 +251,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon) while ((learnedMove = MonTryLearningNewMove(mon, firstMove)) != 0) { firstMove = FALSE; - if (learnedMove == 0xFFFF) + if (learnedMove == INVALID_U16) { // Mon already knows 4 moves. DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn); @@ -535,7 +535,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) s32 i, j; u8 temp[NUM_STATS]; - ivs[selectedIv] = 0xff; + ivs[selectedIv] = INVALID_U8; for (i = 0; i < NUM_STATS; i++) { temp[i] = ivs[i]; @@ -544,7 +544,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) j = 0; for (i = 0; i < NUM_STATS; i++) { - if (temp[i] != 0xff) + if (temp[i] != INVALID_U8) ivs[j++] = temp[i]; } } @@ -684,7 +684,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); break; } @@ -703,7 +703,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); } } @@ -728,7 +728,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == INVALID_U16) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]); break; } @@ -773,7 +773,7 @@ static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *dayca if (motherItem == ITEM_LIGHT_BALL || fatherItem == ITEM_LIGHT_BALL) { - if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == 0xFFFF) + if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == INVALID_U16) DeleteFirstMoveAndGiveMoveToMon(mon, MOVE_VOLT_TACKLE); } } @@ -909,7 +909,7 @@ static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare) } // try to trigger poke sex - if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == 0xFF) + if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == INVALID_U8) { u8 loveScore = GetDaycareCompatibilityScore(daycare); if (loveScore > (Random() * 100u) / USHRT_MAX) diff --git a/src/decompress.c b/src/decompress.c index da1df436b..287a03e55 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -2,7 +2,7 @@ #include "decompress.h" #include "constants/species.h" #include "text.h" -#include "malloc.h" +#include "alloc.h" #include "pokemon.h" EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0}; diff --git a/src/decoration.c b/src/decoration.c index eb85b4f5c..11fd59286 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1,7 +1,7 @@ #include "global.h" #include "constants/decorations.h" #include "decompress.h" -#include "malloc.h" +#include "alloc.h" #include "text.h" #include "string_util.h" #include "international_string_util.h" @@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = { }; const struct SpriteTemplate sDecorSelectorSpriteTemplate = { - 0xffff, + INVALID_U16, OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG, &sDecorSelectorOam, sDecorSelectorAnims, @@ -409,7 +409,7 @@ const struct SpriteFrameImage Unknown_085A73FC = { }; const struct SpriteTemplate gUnknown_085A7404 = { - 0xFFFF, + INVALID_U16, OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG, &Unknown_085A73E8, Unknown_085A73F8, @@ -881,7 +881,7 @@ void sub_81274A0(u8 a0, s32 a1, u8 a2) void sub_8127500(void) { - if (sDecorPCBuffer->unk_522 == 0xFF) + if (sDecorPCBuffer->unk_522 == INVALID_U8) { sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo); } @@ -889,10 +889,10 @@ void sub_8127500(void) void sub_8127554(void) { - if (sDecorPCBuffer->unk_522 != 0xFF) + if (sDecorPCBuffer->unk_522 != INVALID_U8) { RemoveScrollIndicatorArrowPair(sDecorPCBuffer->unk_522); - sDecorPCBuffer->unk_522 = 0xFF; + sDecorPCBuffer->unk_522 = INVALID_U8; } } @@ -910,7 +910,7 @@ void sub_812759C(u8 taskId) sub_81269D4(3); sub_8127718(sCurDecorationCategory); sDecorPCBuffer = calloc(1, sizeof(struct DecorPCBuffer)); - sDecorPCBuffer->unk_522 = 0xFF; + sDecorPCBuffer->unk_522 = INVALID_U8; sub_8127284(); sub_81272C8(); sub_81272F8(); @@ -1188,7 +1188,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor) v0 = 0; } v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j); - if (v1 != 0xFFFF) + if (v1 != INVALID_U16) { MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1); } diff --git a/src/dewford_trend.c b/src/dewford_trend.c index 3050ebecf..cad5ef9c2 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -3,7 +3,7 @@ #include "easy_chat.h" #include "event_data.h" #include "link.h" -#include "malloc.h" +#include "alloc.h" #include "random.h" #include "text.h" #include "tv.h" diff --git a/src/diploma.c b/src/diploma.c index f8556eb7d..b3d5a48fa 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -5,7 +5,7 @@ #include "gpu_regs.h" #include "scanline_effect.h" #include "task.h" -#include "malloc.h" +#include "alloc.h" #include "decompress.h" #include "bg.h" #include "window.h" diff --git a/src/easy_chat.c b/src/easy_chat.c index e4233fb7f..25ef069e4 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1,7 +1,7 @@ // Includes #include "global.h" -#include "malloc.h" +#include "alloc.h" #include "constants/songs.h" #include "sound.h" #include "overworld.h" diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 4b7ee9a61..77296c707 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -17,7 +17,7 @@ #include "menu.h" #include "trig.h" #include "random.h" -#include "malloc.h" +#include "alloc.h" #include "dma3.h" #include "gpu_regs.h" #include "bg.h" diff --git a/src/event_object_movement.c b/src/event_object_movement.c index e509c7738..0606364cd 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -9,7 +9,7 @@ #include "field_effect_helpers.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "malloc.h" +#include "alloc.h" #include "mauville_old_man.h" #include "metatile_behavior.h" #include "overworld.h" @@ -129,7 +129,7 @@ static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; -const struct SpriteTemplate gCameraSpriteTemplate = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; +const struct SpriteTemplate gCameraSpriteTemplate = {0, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_0, @@ -1093,10 +1093,10 @@ const u8 gUnknown_0850DC3F[][4] = { static void ClearEventObject(struct EventObject *eventObject) { *eventObject = (struct EventObject){}; - eventObject->localId = 0xFF; - eventObject->mapNum = 0xFF; - eventObject->mapGroup = 0xFF; - eventObject->movementActionId = 0xFF; + eventObject->localId = INVALID_U8; + eventObject->mapNum = INVALID_U8; + eventObject->mapGroup = INVALID_U8; + eventObject->movementActionId = INVALID_U8; } static void ClearAllEventObjects(void) @@ -1537,7 +1537,7 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl { eventObject->invisible = TRUE; } - *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; + *(u16 *)&spriteTemplate->paletteTag = INVALID_U16; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { @@ -1666,7 +1666,7 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x spriteTemplate = malloc(sizeof(struct SpriteTemplate)); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); - if (spriteTemplate->paletteTag != 0xFFFF) + if (spriteTemplate->paletteTag != INVALID_U16) { LoadEventObjectPalette(spriteTemplate->paletteTag); } @@ -1692,7 +1692,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); - *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; + *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; x += 7; y += 7; sub_80930E0(&x, &y, 8, 16); @@ -1849,7 +1849,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) spriteFrameImage.size = graphicsInfo->size; MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; - *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; + *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1864,7 +1864,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) paletteSlot -= 16; sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; + *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; spriteId = CreateSprite(&spriteTemplate, 0, 0, 0); if (spriteId != MAX_SPRITES) { @@ -2146,9 +2146,9 @@ void Unused_LoadEventObjectPaletteSet(u16 *paletteTags) static u8 sub_808E8F4(const struct SpritePalette *spritePalette) { - if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xFF) + if (IndexOfSpritePaletteTag(spritePalette->tag) != INVALID_U8) { - return 0xFF; + return INVALID_U8; } return LoadSpritePalette(spritePalette); } @@ -2181,7 +2181,7 @@ static u8 FindEventObjectPaletteIndexByTag(u16 tag) return i; } } - return 0xFF; + return INVALID_U8; } void LoadPlayerObjectReflectionPalette(u16 tag, u8 slot) @@ -2513,7 +2513,7 @@ u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - return 0xFF; + return INVALID_U8; } return gEventObjects[eventObjectId].trainerType; } @@ -2529,7 +2529,7 @@ u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - return 0xFF; + return INVALID_U8; } return gEventObjects[eventObjectId].trainerRange_berryTreeId; } @@ -4374,7 +4374,7 @@ bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Spri bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } @@ -4553,7 +4553,7 @@ movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerI bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } @@ -4699,7 +4699,7 @@ static void ClearEventObjectMovement(struct EventObject *eventObject, struct Spr eventObject->singleMovementActive = 0; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; - eventObject->movementActionId = 0xFF; + eventObject->movementActionId = INVALID_U8; sprite->data[1] = 0; } @@ -5105,7 +5105,7 @@ bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) { - if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) + if (eventObject->heldMovementActive && eventObject->movementActionId != INVALID_U8) return TRUE; return FALSE; @@ -5138,7 +5138,7 @@ void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) void EventObjectClearHeldMovement(struct EventObject *eventObject) { - eventObject->movementActionId = 0xFF; + eventObject->movementActionId = INVALID_U8; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; gSprites[eventObject->spriteId].data[1] = 0; @@ -5167,7 +5167,7 @@ u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) if (eventObject->heldMovementActive) return eventObject->movementActionId; - return 0xFF; + return INVALID_U8; } void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) @@ -5279,7 +5279,7 @@ static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject { if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { - eventObject->movementActionId = 0xFF; + eventObject->movementActionId = INVALID_U8; sprite->data[2] = 0; return TRUE; } @@ -5706,7 +5706,7 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba eventObject->triggerGroundEffectsOnMove = TRUE; eventObject->disableCoveringGroundEffects = TRUE; } - else if (result == 0xFF) + else if (result == INVALID_U8) { ShiftStillEventObjectCoords(eventObject); eventObject->triggerGroundEffectsOnStop = TRUE; @@ -5728,7 +5728,7 @@ u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite) bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8094188(eventObject, sprite) == 0xFF) + if (sub_8094188(eventObject, sprite) == INVALID_U8) { return TRUE; } @@ -5737,7 +5737,7 @@ bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_809419C(eventObject, sprite) == 0xFF) + if (sub_809419C(eventObject, sprite) == INVALID_U8) { return TRUE; } @@ -9122,7 +9122,7 @@ void CreateLevitateMovementTask(struct EventObject *eventObject) StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); eventObject->warpArrowSpriteId = taskId; - task->data[3] = 0xFFFF; + task->data[3] = INVALID_U16; } static void ApplyLevitateMovement(u8 taskId) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 0d2072a15..25d85a855 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -2,7 +2,7 @@ #include "evolution_scene.h" #include "evolution_graphics.h" #include "sprite.h" -#include "malloc.h" +#include "alloc.h" #include "task.h" #include "palette.h" #include "main.h" @@ -748,7 +748,7 @@ static void Task_EvolutionScene(u8 taskID) GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy10(gBattleTextBuff1, text); - if (var == 0xFFFF) // no place to learn it + if (var == INVALID_U16) // no place to learn it gTasks[taskID].tState = 22; else if (var == 0xFFFE) // it already knows that move break; @@ -1105,7 +1105,7 @@ static void Task_TradeEvolutionScene(u8 taskID) GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy10(gBattleTextBuff1, text); - if (var == 0xFFFF) + if (var == INVALID_U16) gTasks[taskID].tState = 20; else if (var == 0xFFFE) break; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index c52f5190f..1dce3169e 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -266,7 +266,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil else eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) return NULL; for (i = 0; i < 4; i++) @@ -287,14 +287,14 @@ static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 const u8 *script; eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; // Look for an event object on the other side of the counter. eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) return NULL; } diff --git a/src/field_door.c b/src/field_door.c index c197aca14..a1fe5bb97 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -695,7 +695,7 @@ static void DrawClosedDoorTiles(const struct DoorGraphics *gfx, u32 x, u32 y) static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame, u32 x, u32 y) { - if (frame->offset == 0xFFFF) + if (frame->offset == INVALID_U16) { DrawClosedDoorTiles(gfx, x, y); if (sub_808A964()) diff --git a/src/field_effect.c b/src/field_effect.c index 935501130..91d61ef2f 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -305,7 +305,7 @@ const union AnimCmd *const gNewGameBirchImageAnimTable[] = { }; const struct SpriteTemplate gNewGameBirchObjectTemplate = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4102, .oam = &gNewGameBirchOamAttributes, .anims = gNewGameBirchImageAnimTable, @@ -383,7 +383,7 @@ const union AnimCmd *const gSpriteAnimTable_855C300[] = { }; const struct SpriteTemplate gSpriteTemplate_855C304 = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4103, .oam = &gOamData_855C218, .anims = gSpriteAnimTable_855C2F8, @@ -393,7 +393,7 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = { }; const struct SpriteTemplate gSpriteTemplate_855C31C = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4100, .oam = &gOamData_855C220, .anims = gSpriteAnimTable_855C2F8, @@ -403,7 +403,7 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = { }; const struct SpriteTemplate gSpriteTemplate_855C334 = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4112, .oam = &gOamData_855C220, .anims = gSpriteAnimTable_855C300, @@ -413,7 +413,7 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = { }; const struct SpriteTemplate gSpriteTemplate_855C34C = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4112, .oam = &gOamData_855C26C, .anims = gSpriteAnimTable_855C300, @@ -618,7 +618,7 @@ u32 FieldEffectScript_ReadWord(u8 **script) void FieldEffectScript_LoadTiles(u8 **script) { struct SpriteSheet *sheet = (struct SpriteSheet *)FieldEffectScript_ReadWord(script); - if (GetSpriteTileStartByTag(sheet->tag) == 0xFFFF) + if (GetSpriteTileStartByTag(sheet->tag) == INVALID_U16) LoadSpriteSheet(sheet); (*script) += 4; } @@ -665,7 +665,7 @@ void FieldEffectFreeTilesIfUnused(u16 tileStart) u8 i; u16 tag = GetSpriteTileTagByTileStart(tileStart); - if (tag != 0xFFFF) + if (tag != INVALID_U16) { for (i = 0; i < MAX_SPRITES; i++) if (gSprites[i].inUse && gSprites[i].usingSheet && tileStart == gSprites[i].sheetTileStart) @@ -679,7 +679,7 @@ void FieldEffectFreePaletteIfUnused(u8 paletteNum) u8 i; u16 tag = GetSpritePaletteTagByPaletteNum(paletteNum); - if (tag != 0xFFFF) + if (tag != INVALID_U16) { for (i = 0; i < MAX_SPRITES; i++) if (gSprites[i].inUse && gSprites[i].oam.paletteNum == paletteNum) @@ -761,7 +761,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority) { s32 spriteId = CreateMonPicSprite_HandleDeoxys(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); - if (spriteId == 0xFFFF) + if (spriteId == INVALID_U16) return MAX_SPRITES; else return spriteId; @@ -772,7 +772,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, d, g); u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); - if (spriteId == 0xFFFF) + if (spriteId == INVALID_U16) return MAX_SPRITES; else return spriteId; @@ -3591,7 +3591,7 @@ const union AnimCmd *const gSpriteAnimTable_855C5DC[] = { }; const struct SpriteTemplate gUnknown_0855C5EC = { - .tileTag = 0xffff, + .tileTag = INVALID_U16, .paletteTag = 4378, .oam = &gOamData_855C218, .anims = gSpriteAnimTable_855C5DC, diff --git a/src/field_message_box.c b/src/field_message_box.c index 46da9e9e5..0725ca8c7 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -53,7 +53,7 @@ void task_add_textbox(void) void task_del_textbox(void) { u8 taskId = FindTaskIdByFunc(sub_8098154); - if (taskId != 0xFF) + if (taskId != INVALID_U8) DestroyTask(taskId); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index a5aa23e32..7da89fe83 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1389,7 +1389,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) u8 eventObjectId; struct EventObject *eventObject; - playerEventObjTemplate.localId = 0xFF; + playerEventObjTemplate.localId = INVALID_U8; playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); playerEventObjTemplate.x = x - 7; playerEventObjTemplate.y = y - 7; diff --git a/src/field_region_map.c b/src/field_region_map.c index 40f48e668..d49ce3a4e 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -3,7 +3,7 @@ #include "gpu_regs.h" #include "international_string_util.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "palette.h" #include "region_map.h" diff --git a/src/field_specials.c b/src/field_specials.c index 4da751b27..629f2d0de 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -20,7 +20,7 @@ #include "link.h" #include "list_menu.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "match_call.h" #include "menu.h" #include "overworld.h" @@ -1957,12 +1957,12 @@ void sub_8139D98(void) bool32 warp0_in_pokecenter(void) { - static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xffff }; + static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, INVALID_U16 }; int i; u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum; - for (i = 0; gUnknown_085B2C2A[i] != 0xFFFF; i++) + for (i = 0; gUnknown_085B2C2A[i] != INVALID_U16; i++) { if (gUnknown_085B2C2A[i] == map) return TRUE; @@ -2946,10 +2946,10 @@ void sub_813AA44(void) static void sub_813AA60(u16 a0, u16 a1) { - static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff }; - static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff }; - static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff }; - static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff }; + static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, INVALID_U16 }; + static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, INVALID_U16 }; + static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, INVALID_U16 }; + static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, INVALID_U16 }; static const u8 *const gUnknown_085B3170[] = { BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA, @@ -3004,7 +3004,7 @@ static void sub_813AA60(u16 a0, u16 a1) { case 3: AddTextPrinterParameterized2(0, 1, gUnknown_085B3170[a1], 0, NULL, 2, 1, 3); - if (gUnknown_085B312C[a1] == 0xFFFF) + if (gUnknown_085B312C[a1] == INVALID_U16) { sub_813ABD4(gUnknown_085B312C[a1]); } @@ -3017,7 +3017,7 @@ static void sub_813AA60(u16 a0, u16 a1) break; case 4: AddTextPrinterParameterized2(0, 1, gUnknown_085B319C[a1], 0, NULL, 2, 1, 3); - if (gUnknown_085B3142[a1] == 0xFFFF) + if (gUnknown_085B3142[a1] == INVALID_U16) { sub_813ABD4(gUnknown_085B3142[a1]); } @@ -3841,13 +3841,13 @@ bool32 sub_813B9C0(void) MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - 0xffff + INVALID_U16 }; int i; u16 map = (gSaveBlock1Ptr->location.mapGroup << 8) + gSaveBlock1Ptr->location.mapNum; - for (i = 0; gUnknown_085B3444[i] != 0xFFFF; i++) + for (i = 0; gUnknown_085B3444[i] != INVALID_U16; i++) { if (gUnknown_085B3444[i] == map) { diff --git a/src/fieldmap.c b/src/fieldmap.c index 0d8a706b1..aef17d49d 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -496,7 +496,7 @@ u16 GetBehaviorByMetatileId(u16 metatile) } else { - return 0xff; + return INVALID_U8; } } @@ -922,7 +922,7 @@ void sub_8088B94(int x, int y, int a2) bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2) { - if (a2 == 0xFF) + if (a2 == INVALID_U8) return FALSE; if (a2 == 0) diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 230a95e0b..2cffd5d41 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -6,7 +6,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "fldeff_cut.h" -#include "malloc.h" +#include "alloc.h" #include "metatile_behavior.h" #include "overworld.h" #include "party_menu.h" @@ -164,7 +164,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectP static const struct SpriteTemplate sSpriteTemplate_CutGrass = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x1000, .oam = &sOamData_CutGrass, .anims = sSpriteAnimTable_CutGrass, diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index e9a46bb86..3bbc489c1 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -2,7 +2,7 @@ #include "event_data.h" #include "event_object_movement.h" #include "field_camera.h" -#include "malloc.h" +#include "alloc.h" #include "random.h" #include "roulette_util.h" #include "script.h" @@ -236,7 +236,7 @@ static void sub_81BE968(void) u8 taskId; taskId = FindTaskIdByFunc(sub_81BE9C0); - if(taskId != 0xFF) + if(taskId != INVALID_U8) gTasks[taskId].data[0]++; } diff --git a/src/fossil_specials.c b/src/fossil_specials.c index 8164a3a78..8f6e38e91 100644 --- a/src/fossil_specials.c +++ b/src/fossil_specials.c @@ -8,7 +8,7 @@ #include "fieldmap.h" #include "global.fieldmap.h" #include "gpu_regs.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "random.h" #include "script.h" @@ -302,7 +302,7 @@ static void sub_81BED50(u8 taskId) case 4: UnsetBgTilemapBuffer(0); anotherTaskId = FindTaskIdByFunc(sub_81BEBB4); - if (anotherTaskId != 0xFF) + if (anotherTaskId != INVALID_U8) DestroyTask(anotherTaskId); sUnknown_0203CF14[1] = sUnknown_0203CF14[0] = 0; sub_81BEB90(); diff --git a/src/frontier_util.c b/src/frontier_util.c index 5af7b3db7..e799f96c8 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -24,7 +24,7 @@ #include "data2.h" #include "record_mixing.h" #include "strings.h" -#include "malloc.h" +#include "alloc.h" #include "save.h" #include "load_save.h" #include "battle_dome.h" @@ -681,7 +681,7 @@ static const u8 sFacilityToBrainEventObjGfx[][2] = const u16 gFrontierBannedSpecies[] = { SPECIES_MEW, SPECIES_MEWTWO, SPECIES_HO_OH, SPECIES_LUGIA, SPECIES_CELEBI, - SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF + SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, INVALID_U16 }; static const u8 *const gUnknown_08611CB0[][2] = @@ -1829,7 +1829,7 @@ void sub_81A3ACC(void) s32 i; for (i = 0; i < 20; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; + gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; } static void sub_81A3B00(void) @@ -1974,10 +1974,10 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL if (species == SPECIES_EGG || species == SPECIES_NONE) return; - for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF && gFrontierBannedSpecies[i] != species; i++) + for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16 && gFrontierBannedSpecies[i] != species; i++) ; - if (gFrontierBannedSpecies[i] != 0xFFFF) + if (gFrontierBannedSpecies[i] != INVALID_U16) return; if (lvlMode == FRONTIER_LVL_50 && monLevel > 50) return; @@ -2060,7 +2060,7 @@ static void sub_81A3FD4(void) s32 i; s32 caughtBannedMons = 0; s32 species = gFrontierBannedSpecies[0]; - for (i = 0; species != 0xFFFF; i++, species = gFrontierBannedSpecies[i]) + for (i = 0; species != INVALID_U16; i++, species = gFrontierBannedSpecies[i]) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT)) caughtBannedMons++; @@ -2068,7 +2068,7 @@ static void sub_81A3FD4(void) gStringVar1[0] = EOS; gSpecialVar_0x8004 = 1; count = 0; - for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF; i++) + for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16; i++) count = sub_81A3DD0(gFrontierBannedSpecies[i], count, caughtBannedMons); if (count == 0) diff --git a/src/ground.c b/src/ground.c index 6cb7b8557..abfeb3f3e 100644 --- a/src/ground.c +++ b/src/ground.c @@ -588,7 +588,7 @@ void sub_81152DC(u8 taskId) break; default: task->data[9] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - if (task->data[9] == 0xFF) + if (task->data[9] == INVALID_U8) { DestroyAnimVisualTask(taskId); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 315990256..b75243b84 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -6,7 +6,7 @@ #include "pokemon.h" #include "text.h" #include "text_window.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "graphics.h" #include "main.h" @@ -467,11 +467,11 @@ static void Task_Hof_InitMonData(u8 taskId) sUnknown_0203BCD4 = 0; gTasks[taskId].tDisplayedMonId = 0; - gTasks[taskId].tPlayerSpriteID = 0xFF; + gTasks[taskId].tPlayerSpriteID = INVALID_U8; for (i = 0; i < PARTY_SIZE; i++) { - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } if (gTasks[taskId].tDontSaveData) @@ -522,7 +522,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) static void Task_Hof_TrySaveData(u8 taskId) { gGameContinueCallback = CB2_DoHallOfFameScreenDontSaveData; - if (TrySavingData(SAVE_HALL_OF_FAME) == 0xFF && gDamagedSaveSectors != 0) + if (TrySavingData(SAVE_HALL_OF_FAME) == INVALID_U8 && gDamagedSaveSectors != 0) { UnsetBgTilemapBuffer(1); UnsetBgTilemapBuffer(3); @@ -645,7 +645,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId) BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB_BLACK); for (i = 0; i < PARTY_SIZE; i++) { - if (gTasks[taskId].tMonSpriteId(i) != 0xFF) + if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 0; } @@ -668,7 +668,7 @@ static void sub_8173DC0(u8 taskId) u16 i; for (i = 0; i < PARTY_SIZE; i++) { - if (gTasks[taskId].tMonSpriteId(i) != 0xFF) + if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24)); @@ -752,7 +752,7 @@ static void Task_Hof_HandleExit(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u8 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) { FreeOamMatrix(gSprites[spriteId].oam.matrixNum); FreeAndDestroyMonPicSprite(spriteId); @@ -847,7 +847,7 @@ void CB2_DoHallOfFamePC(void) for (i = 0; i < PARTY_SIZE; i++) { - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } sHofMonPtr = AllocZeroed(0x2000); @@ -937,7 +937,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId) } else { - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } } @@ -967,7 +967,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u16 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) gSprites[spriteId].oam.priority = 1; } @@ -999,10 +999,10 @@ static void Task_HofPC_HandleInput(u8 taskId) for (i = 0; i < 6; i++) { u8 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) { FreeAndDestroyMonPicSprite(spriteId); - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } } if (gTasks[taskId].tCurrPageNo != 0) @@ -1060,10 +1060,10 @@ static void Task_HofPC_HandleExit(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u16 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != 0xFF) + if (spriteId != INVALID_U8) { FreeAndDestroyMonPicSprite(spriteId); - gTasks[taskId].tMonSpriteId(i) = 0xFF; + gTasks[taskId].tMonSpriteId(i) = INVALID_U8; } } @@ -1130,7 +1130,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u { stringPtr = StringCopy(text, gText_Number); dexNumber = SpeciesToPokedexNum(currMon->species); - if (dexNumber != 0xFFFF) + if (dexNumber != INVALID_U16) { stringPtr[0] = (dexNumber / 100) + CHAR_0; stringPtr++; @@ -1417,7 +1417,7 @@ void sub_8175280(void) gSpecialVar_0x8004 = 180; taskId = CreateTask(sub_8175364, 0); - if (taskId != 0xFF) + if (taskId != INVALID_U8) { gTasks[taskId].data[1] = gSpecialVar_0x8004; gSpecialVar_0x8005 = taskId; @@ -1428,7 +1428,7 @@ static void sub_81752C0(void) { u8 taskId; - if ((taskId = FindTaskIdByFunc(sub_8175364)) != 0xFF) + if ((taskId = FindTaskIdByFunc(sub_8175364)) != INVALID_U8) DestroyTask(taskId); sub_8152254(); @@ -1473,7 +1473,7 @@ static void sub_8175364(u8 taskId) { DestroyTask(taskId); gSpecialVar_0x8004 = var; - gSpecialVar_0x8005 = 0xFFFF; + gSpecialVar_0x8005 = INVALID_U16; } LoadCompressedObjectPic(sHallOfFame_ConfettiSpriteSheet); LoadCompressedObjectPalette(sHallOfFame_ConfettiSpritePalette); @@ -1483,7 +1483,7 @@ static void sub_8175364(u8 taskId) if (data[1] != 0 && data[1] % 3 == 0) { var = sub_81524C4(&sOamData_85E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var); - if (var != 0xFF) + if (var != INVALID_U8) { sub_8152438(var, sub_81752F4); if ((Random() & 3) == 0) @@ -1496,12 +1496,12 @@ static void sub_8175364(u8 taskId) if (data[1] != 0) data[1]--; else if (data[15] == 0) - data[0] = 0xFF; + data[0] = INVALID_U8; break; - case 0xFF: + case INVALID_U8: sub_81752C0(); gSpecialVar_0x8004 = var; - gSpecialVar_0x8005 = 0xFFFF; + gSpecialVar_0x8005 = INVALID_U16; break; } } diff --git a/src/intro.c b/src/intro.c index 5a0e13869..44d1c086d 100644 --- a/src/intro.c +++ b/src/intro.c @@ -5,7 +5,7 @@ #include "task.h" #include "title_screen.h" #include "libgcnmultiboot.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "link.h" #include "multiboot_pokemon_colosseum.h" diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 20a360901..1b4e9e15a 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -58,7 +58,7 @@ static void sub_817B7C4(struct Sprite *sprite); static void nullsub_66(struct Sprite *sprite); static const struct SpriteTemplate gUnknown_085F504C = { - 2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C + 2000, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C }; static const struct CompressedSpriteSheet gUnknown_085F5064[] = { diff --git a/src/item.c b/src/item.c index 6d2dbd561..e2583ddb1 100644 --- a/src/item.c +++ b/src/item.c @@ -4,7 +4,7 @@ #include "string_util.h" #include "text.h" #include "event_data.h" -#include "malloc.h" +#include "alloc.h" #include "secret_base.h" #include "item_menu.h" #include "strings.h" diff --git a/src/item_icon.c b/src/item_icon.c index 41c6589f5..2af938ff8 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -2,7 +2,7 @@ #include "decompress.h" #include "graphics.h" #include "item_icon.h" -#include "malloc.h" +#include "alloc.h" #include "sprite.h" #include "constants/items.h" @@ -161,7 +161,7 @@ u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tile const void *GetItemIconPicOrPalette(u16 itemId, u8 which) { - if (itemId == 0xFFFF) + if (itemId == INVALID_U16) itemId = ITEM_FIELD_ARROW; else if (itemId >= ITEMS_COUNT) itemId = 0; diff --git a/src/item_menu.c b/src/item_menu.c index 1744a1bfa..5b18b06ec 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -23,7 +23,7 @@ #include "link.h" #include "mail.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "map_name_popup.h" #include "menu.h" #include "money.h" @@ -532,11 +532,11 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) if (temp <= 1) gUnknown_0203CE54->unk81B = 1; gUnknown_0203CE54->unk0 = 0; - gUnknown_0203CE54->unk81A = 0xFF; + gUnknown_0203CE54->unk81A = INVALID_U8; gUnknown_0203CE54->unk81E = -1; gUnknown_0203CE54->unk81F = -1; - memset(gUnknown_0203CE54->unk804, 0xFF, sizeof(gUnknown_0203CE54->unk804)); - memset(gUnknown_0203CE54->unk810, 0xFF, 10); + memset(gUnknown_0203CE54->unk804, INVALID_U8, sizeof(gUnknown_0203CE54->unk804)); + memset(gUnknown_0203CE54->unk810, INVALID_U8, 10); SetMainCallback2(CB2_Bag); } } @@ -819,7 +819,7 @@ void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused) PlaySE(SE_SELECT); ShakeBagVisual(); } - if (gUnknown_0203CE54->unk81A == 0xFF) + if (gUnknown_0203CE54->unk81A == INVALID_U8) { RemoveBagItemIconSprite(1 ^ gUnknown_0203CE54->unk81B_1); if (a != -2) @@ -840,7 +840,7 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) int offset; if (item_index_in_pocket != -2) { - if (gUnknown_0203CE54->unk81A != 0xFF) + if (gUnknown_0203CE54->unk81A != INVALID_U8) { if (gUnknown_0203CE54->unk81A == (u8)item_index_in_pocket) bag_menu_print_cursor(a, 2); @@ -897,7 +897,7 @@ void bag_menu_print_cursor_(u8 a, u8 b) void bag_menu_print_cursor(u8 a, u8 b) { - if (b == 0xFF) + if (b == INVALID_U8) FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b); @@ -906,32 +906,32 @@ void bag_menu_print_cursor(u8 a, u8 b) void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81E == 0xFF) + if (gUnknown_0203CE54->unk81E == INVALID_U8) gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); } void sub_81AB824(void) { - if (gUnknown_0203CE54->unk81E != 0xFF) + if (gUnknown_0203CE54->unk81E != INVALID_U8) { RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81E); - gUnknown_0203CE54->unk81E = 0xFF; + gUnknown_0203CE54->unk81E = INVALID_U8; } sub_81AB89C(); } void bag_menu_add_list_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == 0xFF) + if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == INVALID_U8) gUnknown_0203CE54->unk81F = AddScrollIndicatorArrowPair(&gUnknown_08614094, &gUnknown_0203CE58.unk6); } void sub_81AB89C(void) { - if (gUnknown_0203CE54->unk81F != 0xFF) + if (gUnknown_0203CE54->unk81F != INVALID_U8) { RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81F); - gUnknown_0203CE54->unk81F = 0xFF; + gUnknown_0203CE54->unk81F = INVALID_U8; } } @@ -2303,7 +2303,7 @@ u8 sub_81AE124(u8 a) u8 bag_menu_add_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr == 0xFF) + if (*ptr == INVALID_U8) { *ptr = AddWindow(&gUnknown_086141AC[a]); SetWindowBorderStyle(*ptr, 0, 1, 14); @@ -2315,20 +2315,20 @@ u8 bag_menu_add_window(u8 a) void bag_menu_remove_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr != 0xFF) + if (*ptr != INVALID_U8) { sub_8198070(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); - *ptr = 0xFF; + *ptr = INVALID_U8; } } u8 AddItemMessageWindow(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr == 0xFF) + if (*ptr == INVALID_U8) *ptr = AddWindow(&gUnknown_086141AC[a]); return *ptr; } @@ -2336,13 +2336,13 @@ u8 AddItemMessageWindow(u8 a) void bag_menu_RemoveBagItem_message_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr != 0xFF) + if (*ptr != INVALID_U8) { sub_8197DF8(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); - *ptr = 0xFF; + *ptr = INVALID_U8; } } diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 85b42b9b3..67add5926 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -301,7 +301,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FC74[] = static const struct SpriteTemplate gUnknown_0857FC7C = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x7544, .oam = &sOamData_857FBD0, .anims = sSpriteAnimTable_857FBE0, @@ -410,13 +410,13 @@ static const struct SpriteTemplate gUnknown_0857FE10 = void RemoveBagSprite(u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id]; - if (*spriteId != 0xFF) + if (*spriteId != INVALID_U8) { FreeSpriteTilesByTag(id + 100); FreeSpritePaletteByTag(id + 100); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = 0xFF; + *spriteId = INVALID_U8; } } @@ -516,7 +516,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite) void AddBagItemIconSprite(u16 itemId, u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2]; - if (*spriteId == 0xFF) + if (*spriteId == INVALID_U8) { u8 iconSpriteId; diff --git a/src/learn_move.c b/src/learn_move.c index 7717a5193..cb8bb66ff 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -9,7 +9,7 @@ #include "gpu_regs.h" #include "learn_move.h" #include "list_menu.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" @@ -381,7 +381,7 @@ static void LearnMoveMain(void) if (selection == 0) { - if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF) + if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != INVALID_U16) { sub_816084C(gText_PkmnLearnedMove4); gSpecialVar_0x8004 = 1; @@ -727,12 +727,12 @@ static void CreateHearts(void) static void AddScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF) + if (sLearnMoveStruct->scrollArrowTaskId2 == INVALID_U8) { sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset); } - if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF) + if (sLearnMoveStruct->scrollArrowTaskId1 == INVALID_U8) { gTempScrollArrowTemplate = gUnknown_085CEBD0; gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce; @@ -742,16 +742,16 @@ static void AddScrollArrows(void) static void RemoveScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF) + if (sLearnMoveStruct->scrollArrowTaskId2 != INVALID_U8) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2); - sLearnMoveStruct->scrollArrowTaskId2 = 0xFF; + sLearnMoveStruct->scrollArrowTaskId2 = INVALID_U8; } - if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF) + if (sLearnMoveStruct->scrollArrowTaskId1 != INVALID_U8) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1); - sLearnMoveStruct->scrollArrowTaskId1 = 0xFF; + sLearnMoveStruct->scrollArrowTaskId1 = INVALID_U8; } } @@ -792,7 +792,7 @@ void ShowHideHearts(s32 item) { numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10); - if (numHearts == 0xFF) + if (numHearts == INVALID_U8) { numHearts = 0; } @@ -812,7 +812,7 @@ void ShowHideHearts(s32 item) numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10); - if (numHearts == 0xFF) + if (numHearts == INVALID_U8) { numHearts = 0; } diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index c5aa25c10..2f706fcc8 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -64,7 +64,7 @@ v12 = (u16*)((u32)&sub_82E53F4 & ~1); v13 = (u16*)gUnknown_03007898->unk_8; - for (i = 47; i != 0xFFFF; i--) + for (i = 47; i != INVALID_U16; i--) { *v13 = *v12; ++v12; diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c index 556b79bf8..81363ae0d 100644 --- a/src/librfu_stwi.c +++ b/src/librfu_stwi.c @@ -116,7 +116,7 @@ u16 STWI_read_status(u8 index) case 3: return gRfuState->activeCommand; default: - return 0xFFFF; + return INVALID_U16; } } diff --git a/src/link.c b/src/link.c index 687a6c07b..e4bd5053c 100644 --- a/src/link.c +++ b/src/link.c @@ -2,7 +2,7 @@ // Includes #include "global.h" #include "m4a.h" -#include "malloc.h" +#include "alloc.h" #include "reset_save_heap.h" #include "save.h" #include "bg.h" @@ -2250,7 +2250,7 @@ static bool8 DoHandshake(void) u16 minRecv; playerCount = 0; - minRecv = 0xFFFF; + minRecv = INVALID_U16; if (gLink.handshakeAsMaster == TRUE) { REG_SIOMLT_SEND = MASTER_HANDSHAKE; @@ -2274,7 +2274,7 @@ static bool8 DoHandshake(void) } else { - if (gLink.tempRecvBuffer[i] != 0xFFFF) + if (gLink.tempRecvBuffer[i] != INVALID_U16) { playerCount = 0; } diff --git a/src/link_rfu.c b/src/link_rfu.c index 308ad615c..fe5676770 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "alloc.h" #include "battle.h" #include "berry_blender.h" #include "decompress.h" @@ -7,7 +8,6 @@ #include "librfu.h" #include "link.h" #include "link_rfu.h" -#include "malloc.h" #include "overworld.h" #include "random.h" #include "palette.h" @@ -276,7 +276,7 @@ const struct { { gBlockSendBuffer, 40 } }; const u16 gUnknown_082ED6E0[] = { - 0x0002, 0x7f7d, 0x0000, 0xffff + 0x0002, 0x7f7d, 0x0000, INVALID_U16 }; const char sUnref_082ED6E8[][15] = { @@ -436,7 +436,7 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6) } for (i = 0, buffer = r6; i < 16; i++) { - if (*buffer++ == 0xFFFF) + if (*buffer++ == INVALID_U16) { break; } @@ -754,7 +754,7 @@ void sub_800C54C(u32 a0) switch (gUnknown_03004140.unk_04) { case 23: - r2 = sub_800BEC0() == 0x8001 ? 0x44 : 0xFF; + r2 = sub_800BEC0() == 0x8001 ? 0x44 : INVALID_U8; gUnknown_03004140.unk_04 = gUnknown_03004140.unk_05 = 0; sub_800D30C(r2, 0); break; @@ -1168,7 +1168,7 @@ static void sub_800C7B4(u16 r8, u16 r6) gUnknown_03004140.unk_00 &= ~gUnknown_03004140.unk_14; if (gUnknown_03004140.unk_07) { - if (gUnknown_03007890->unk_00 == 0xFF) + if (gUnknown_03007890->unk_00 == INVALID_U8) { if (gUnknown_03004140.unk_07 == 8) { @@ -1183,7 +1183,7 @@ static void sub_800C7B4(u16 r8, u16 r6) } } } - if (gUnknown_03007890->unk_00 == 0xFF) + if (gUnknown_03007890->unk_00 == INVALID_U8) { if (gUnknown_03004140.unk_04 == 0) { @@ -1198,7 +1198,7 @@ static void sub_800C7B4(u16 r8, u16 r6) break; case 38: sub_800D20C(); - if (gUnknown_03007890->unk_00 != 0xFF) + if (gUnknown_03007890->unk_00 != INVALID_U8) { sub_800D30C(0x50, 0x00); } @@ -1241,7 +1241,7 @@ static void sub_800C7B4(u16 r8, u16 r6) sub_800D610(); } } - if (r8 == 0xFF) + if (r8 == INVALID_U8) { sub_800D30C(0xf2, 0x00); sub_800D610(); @@ -1322,7 +1322,7 @@ static void sub_800CF34(void) if (gUnknown_03007880[i]->unk_61 == 1) { r5 = 0x02; - for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -1469,7 +1469,7 @@ static u8 sub_800D294(void) for (i = 0; i < gUnknown_03007890->unk_08; i++) { - for (ptr = gUnknown_03004140.unk_20; *ptr != 0xffff; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -2242,12 +2242,12 @@ void sub_800E084(void) void sub_800E0E8(void) { - if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF) + if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == INVALID_U16) { LoadCompressedObjectPic(&sWirelessStatusIndicatorSpriteSheet); } LoadSpritePalette(&sWirelessStatusIndicatorSpritePalette); - gWirelessStatusIndicatorSpriteId = 0xFF; + gWirelessStatusIndicatorSpriteId = INVALID_U8; } u8 sub_800E124(void) @@ -2277,7 +2277,7 @@ void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum) void sub_800E174(void) { - if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) + if (gWirelessStatusIndicatorSpriteId != INVALID_U8 && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) { struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId]; u8 signalStrength = 255; @@ -2461,7 +2461,7 @@ void sub_800E604(void) u8 unk_ee_bak = gUnknown_03005000.unk_ee; CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000); gUnknown_03005000.unk_ee = unk_ee_bak; - gUnknown_03005000.unk_0c = 0xFF; + gUnknown_03005000.unk_0c = INVALID_U8; if (gUnknown_03005000.unk_ee != 4) { gUnknown_03005000.unk_ee = 0; @@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void) { if (gUnknown_03005000.unk_14[i][1]) { - if (gUnknown_03005000.unk_cee[i] != 0xff && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) + if (gUnknown_03005000.unk_cee[i] != INVALID_U8 && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) { if (++gUnknown_03005000.unk_cea[i] > 4) sub_8011170(0x8100); @@ -3778,7 +3778,7 @@ bool32 sub_8010454(u32 a0) s32 i; for (i = 0; gUnknown_082ED6E0[i] != a0; i++) { - if (gUnknown_082ED6E0[i] == 0xffff) + if (gUnknown_082ED6E0[i] == INVALID_U16) return FALSE; } return TRUE; @@ -3881,7 +3881,7 @@ bool32 sub_80105EC(void) bool32 sub_801064C(u16 a0, const u8 *a1) { u8 r1 = sub_8011CE4(a1, a0); - if (r1 == 0xFF) + if (r1 == INVALID_U8) return TRUE; if (gUnknown_03005000.unk_cd1[r1] == 9) return TRUE; @@ -3906,7 +3906,7 @@ void sub_80106D4(void) u32 sub_8010714(u16 a0, const u8 *a1) { u8 r0 = sub_8011CE4(a1, a0); - if (r0 == 0xff) + if (r0 == INVALID_U8) return 2; if (gUnknown_03007880[r0]->unk_0 == 0) return 1; diff --git a/src/list_menu.c b/src/list_menu.c index 6907a75a3..e066d1e9c 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -8,7 +8,7 @@ #include "trig.h" #include "decompress.h" #include "palette.h" -#include "malloc.h" +#include "alloc.h" #include "strings.h" #include "sound.h" #include "constants/songs.h" @@ -392,7 +392,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu s32 i; u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow); - for (i = 0; rect[i].palNum != 0xFF; i++) + for (i = 0; rect[i].palNum != INVALID_U8; i++) { PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId, rect[i].x, @@ -465,7 +465,7 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId) } } -#define TASK_NONE 0xFF +#define TASK_NONE INVALID_U8 void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow) { @@ -1143,7 +1143,7 @@ static void Task_ScrollIndicatorArrowPair(u8 taskId) struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data; u16 currItem = (*data->scrollOffset); - if (currItem == data->fullyUpThreshold && currItem != 0xFFFF) + if (currItem == data->fullyUpThreshold && currItem != INVALID_U16) gSprites[data->topSpriteId].invisible = TRUE; else gSprites[data->topSpriteId].invisible = FALSE; diff --git a/src/load_save.c b/src/load_save.c index 960a98981..8ecf89959 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -4,7 +4,7 @@ #include "main.h" #include "pokemon.h" #include "random.h" -#include "malloc.h" +#include "alloc.h" #include "item.h" #include "overworld.h" #include "decoration_inventory.h" diff --git a/src/mail.c b/src/mail.c index 513900746..7b096ed00 100644 --- a/src/mail.c +++ b/src/mail.c @@ -17,7 +17,7 @@ #include "bg.h" #include "pokemon_icon.h" #include "constants/species.h" -#include "malloc.h" +#include "alloc.h" #include "easy_chat.h" extern const u16 gMailPalette_Orange[]; diff --git a/src/mail_data.c b/src/mail_data.c index 809dcc2a8..cf75636b3 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -20,7 +20,7 @@ void ClearMailStruct(struct MailStruct *mail) s32 i; for (i = 0; i < MAIL_WORDS_COUNT; i++) - mail->words[i] = 0xFFFF; + mail->words[i] = INVALID_U16; for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) mail->playerName[i] = EOS; @@ -35,7 +35,7 @@ void ClearMailStruct(struct MailStruct *mail) bool8 MonHasMail(struct Pokemon *mon) { u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM); - if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF) + if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != INVALID_U8) return TRUE; else return FALSE; @@ -56,7 +56,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) if (gSaveBlock1Ptr->mail[id].itemId == 0) { for (i = 0; i < MAIL_WORDS_COUNT; i++) - gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF; + gSaveBlock1Ptr->mail[id].words[i] = INVALID_U16; for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++) gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i]; @@ -76,7 +76,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) } } - return 0xFF; + return INVALID_U8; } u16 SpeciesToMailSpecies(u16 species, u32 personality) @@ -113,8 +113,8 @@ u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail) u16 itemId = mail->itemId; u8 mailId = GiveMailToMon(mon, itemId); - if (mailId == 0xFF) - return 0xFF; + if (mailId == INVALID_U8) + return INVALID_U8; gSaveBlock1Ptr->mail[mailId] = *mail; @@ -142,7 +142,7 @@ void TakeMailFromMon(struct Pokemon *mon) { mailId = GetMonData(mon, MON_DATA_MAIL); gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE; - mailId = 0xFF; + mailId = INVALID_U8; heldItem[0] = ITEM_NONE; heldItem[1] = ITEM_NONE << 8; SetMonData(mon, MON_DATA_MAIL, &mailId); @@ -163,7 +163,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon) newHeldItem[0] = ITEM_NONE; newHeldItem[1] = ITEM_NONE << 8; - newMailId = 0xFF; + newMailId = INVALID_U8; for (i = PARTY_SIZE; i < MAIL_COUNT; i++) { @@ -177,7 +177,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon) } } - return 0xFF; + return INVALID_U8; } bool8 ItemIsMail(u16 itemId) diff --git a/src/main.c b/src/main.c index d069ab3bc..c4962286c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ #include "global.h" #include "crt0.h" -#include "malloc.h" +#include "alloc.h" #include "link.h" #include "link_rfu.h" #include "librfu.h" diff --git a/src/malloc.c b/src/malloc.c deleted file mode 100644 index 1d64351c3..000000000 --- a/src/malloc.c +++ /dev/null @@ -1,210 +0,0 @@ -#include "global.h" - -static void *sHeapStart; -static u32 sHeapSize; -static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss) - -#define MALLOC_SYSTEM_ID 0xA3A3 - -struct MemBlock { - // Whether this block is currently allocated. - bool16 flag; - - // Magic number used for error checking. Should equal MALLOC_SYSTEM_ID. - u16 magic; - - // Size of the block (not including this header struct). - u32 size; - - // Previous block pointer. Equals sHeapStart if this is the first block. - struct MemBlock *prev; - - // Next block pointer. Equals sHeapStart if this is the last block. - struct MemBlock *next; - - // Data in the memory block. (Arrays of length 0 are a GNU extension.) - u8 data[0]; -}; - -void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size) -{ - struct MemBlock *header = (struct MemBlock *)block; - - header->flag = FALSE; - header->magic = MALLOC_SYSTEM_ID; - header->size = size; - header->prev = prev; - header->next = next; -} - -void PutFirstMemBlockHeader(void *block, u32 size) -{ - PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock)); -} - -void *AllocInternal(void *heapStart, u32 size) -{ - struct MemBlock *pos = (struct MemBlock *)heapStart; - struct MemBlock *head = pos; - struct MemBlock *splitBlock; - u32 foundBlockSize; - - // Alignment - if (size & 3) - size = 4 * ((size / 4) + 1); - - for (;;) { - // Loop through the blocks looking for unused block that's big enough. - - if (!pos->flag) { - foundBlockSize = pos->size; - - if (foundBlockSize >= size) { - if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) { - // The block isn't much bigger than the requested size, - // so just use it. - pos->flag = TRUE; - } else { - // The block is significantly bigger than the requested - // size, so split the rest into a separate block. - foundBlockSize -= sizeof(struct MemBlock); - foundBlockSize -= size; - - splitBlock = (struct MemBlock *)(pos->data + size); - - pos->flag = TRUE; - pos->size = size; - - PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize); - - pos->next = splitBlock; - - if (splitBlock->next != head) - splitBlock->next->prev = splitBlock; - } - - return pos->data; - } - } - - if (pos->next == head) - return NULL; - - pos = pos->next; - } -} - -void FreeInternal(void *heapStart, void *pointer) -{ - if (pointer) { - struct MemBlock *head = (struct MemBlock *)heapStart; - struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock)); - block->flag = FALSE; - - // If the freed block isn't the last one, merge with the next block - // if it's not in use. - if (block->next != head) { - if (!block->next->flag) { - block->size += sizeof(struct MemBlock) + block->next->size; - block->next->magic = 0; - block->next = block->next->next; - if (block->next != head) - block->next->prev = block; - } - } - - // If the freed block isn't the first one, merge with the previous block - // if it's not in use. - if (block != head) { - if (!block->prev->flag) { - block->prev->next = block->next; - - if (block->next != head) - block->next->prev = block->prev; - - block->magic = 0; - block->prev->size += sizeof(struct MemBlock) + block->size; - } - } - } -} - -void *AllocZeroedInternal(void *heapStart, u32 size) -{ - void *mem = AllocInternal(heapStart, size); - - if (mem != NULL) { - if (size & 3) - size = 4 * ((size / 4) + 1); - - CpuFill32(0, mem, size); - } - - return mem; -} - -bool32 CheckMemBlockInternal(void *heapStart, void *pointer) -{ - struct MemBlock *head = (struct MemBlock *)heapStart; - struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock)); - - if (block->magic != MALLOC_SYSTEM_ID) - return FALSE; - - if (block->next->magic != MALLOC_SYSTEM_ID) - return FALSE; - - if (block->next != head && block->next->prev != block) - return FALSE; - - if (block->prev->magic != MALLOC_SYSTEM_ID) - return FALSE; - - if (block->prev != head && block->prev->next != block) - return FALSE; - - if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size)) - return FALSE; - - return TRUE; -} - -void InitHeap(void *heapStart, u32 heapSize) -{ - sHeapStart = heapStart; - sHeapSize = heapSize; - PutFirstMemBlockHeader(heapStart, heapSize); -} - -void *Alloc(u32 size) -{ - AllocInternal(sHeapStart, size); -} - -void *AllocZeroed(u32 size) -{ - AllocZeroedInternal(sHeapStart, size); -} - -void Free(void *pointer) -{ - FreeInternal(sHeapStart, pointer); -} - -bool32 CheckMemBlock(void *pointer) -{ - return CheckMemBlockInternal(sHeapStart, pointer); -} - -bool32 CheckHeap() -{ - struct MemBlock *pos = (struct MemBlock *)sHeapStart; - - do { - if (!CheckMemBlockInternal(sHeapStart, pos->data)) - return FALSE; - pos = pos->next; - } while (pos != (struct MemBlock *)sHeapStart); - - return TRUE; -} diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 110ec068e..2fd60cd5b 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -250,7 +250,7 @@ void ScrSpecial_HipsterTeachWord(void) { u16 var = sub_811F01C(); - if (var == 0xFFFF) + if (var == INVALID_U16) { gSpecialVar_Result = FALSE; } @@ -283,7 +283,7 @@ void ScrSpecial_GenerateGiddyLine(void) if (giddy->taleCounter == 0) InitGiddyTaleList(); - if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array? + if (giddy->randomWords[giddy->taleCounter] != INVALID_U16) // is not the last element of the array? { u8 *stringPtr; u32 adjective = Random(); @@ -348,7 +348,7 @@ static void InitGiddyTaleList(void) r1 = Random() % 10; if (r1 < 3 && r7 < 8) { - giddy->randomWords[i] = 0xFFFF; + giddy->randomWords[i] = INVALID_U16; r7++; } else diff --git a/src/menu.c b/src/menu.c index dde0e0a1a..e1dd136d1 100644 --- a/src/menu.c +++ b/src/menu.c @@ -7,7 +7,7 @@ #include "main.h" #include "sound.h" #include "menu_helpers.h" -#include "malloc.h" +#include "alloc.h" #include "task.h" #include "dma3.h" #include "string_util.h" @@ -140,8 +140,8 @@ extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId); void sub_81971D0(void) { InitWindows(gUnknown_0860F098); - gStartMenuWindowId = 0xFF; - gUnknown_0203CD8D = 0xFF; + gStartMenuWindowId = INVALID_U8; + gUnknown_0203CD8D = INVALID_U8; } void sub_81971F4(void) @@ -486,7 +486,7 @@ u8 GetPlayerTextSpeedDelay(void) u8 sub_81979C4(u8 a1) { - if (gStartMenuWindowId == 0xFF) + if (gStartMenuWindowId == INVALID_U8) gStartMenuWindowId = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139); return gStartMenuWindowId; } @@ -498,10 +498,10 @@ u8 GetStartMenuWindowId(void) void RemoveStartMenuWindow(void) { - if (gStartMenuWindowId != 0xFF) + if (gStartMenuWindowId != INVALID_U8) { RemoveWindow(gStartMenuWindowId); - gStartMenuWindowId = 0xFF; + gStartMenuWindowId = INVALID_U8; } } @@ -517,7 +517,7 @@ u16 sub_8197A38(void) u8 AddMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D == 0xFF) + if (gUnknown_0203CD8D == INVALID_U8) gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107); return gUnknown_0203CD8D; } @@ -529,10 +529,10 @@ u8 GetMapNamePopUpWindowId(void) void RemoveMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D != 0xFF) + if (gUnknown_0203CD8D != INVALID_U8) { RemoveWindow(gUnknown_0203CD8D); - gUnknown_0203CD8D = 0xFF; + gUnknown_0203CD8D = INVALID_U8; } } @@ -808,7 +808,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram) { u16 width = 0; - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) { PutWindowTilemap(gUnknown_0203CDA0); FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF); @@ -830,7 +830,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo u8 color[3]; u16 width = 0; - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) { if (a3 != 0) { @@ -865,13 +865,13 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo void sub_81982D8(void) { - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) CopyWindowToVram(gUnknown_0203CDA0, 3); } void sub_81982F0(void) { - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) { FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF); CopyWindowToVram(gUnknown_0203CDA0, 3); @@ -880,13 +880,13 @@ void sub_81982F0(void) void sub_8198314(void) { - if (gUnknown_0203CDA0 != 0xFF) + if (gUnknown_0203CDA0 != INVALID_U8) { FillWindowPixelBuffer(gUnknown_0203CDA0, 0); ClearWindowTilemap(gUnknown_0203CDA0); CopyWindowToVram(gUnknown_0203CDA0, 3); RemoveWindow(gUnknown_0203CDA0); - gUnknown_0203CDA0 = 0xFF; + gUnknown_0203CDA0 = INVALID_U8; } } diff --git a/src/mossdeep_gym.c b/src/mossdeep_gym.c index cd377ad83..07920fe4c 100644 --- a/src/mossdeep_gym.c +++ b/src/mossdeep_gym.c @@ -1,7 +1,7 @@ #include "global.h" #include "event_object_movement.h" #include "fieldmap.h" -#include "malloc.h" +#include "alloc.h" #include "mossdeep_gym.h" #include "script_movement.h" #include "constants/event_object_movement_constants.h" diff --git a/src/naming_screen.c b/src/naming_screen.c index 9902df04c..12ff4240f 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1,6 +1,6 @@ #include "global.h" #include "naming_screen.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "task.h" #include "sprite.h" @@ -2141,7 +2141,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore = static const struct SpriteTemplate gUnknown_0858C180 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x0000, .oam = &gOamData_858BFEC, .anims = gSpriteAnimTable_858C0BC, diff --git a/src/overworld.c b/src/overworld.c index 3193ec0d3..13c36819f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -27,7 +27,7 @@ #include "link_rfu.h" #include "load_save.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "m4a.h" #include "map_name_popup.h" #include "menu.h" @@ -1110,7 +1110,7 @@ static bool16 IsInflitratedSpaceCenter(struct WarpData *warp) u16 GetLocationMusic(struct WarpData *warp) { if (NoMusicInSotopolisWithLegendaries(warp) == TRUE) - return 0xFFFF; + return INVALID_U16; else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE) return MUS_OOAME; else if (IsInflitratedSpaceCenter(warp) == TRUE) @@ -1171,7 +1171,7 @@ void Overworld_PlaySpecialMapMusic(void) { u16 music = GetCurrLocationDefaultMusic(); - if (music != MUS_OOAME && music != 0xFFFF) + if (music != MUS_OOAME && music != INVALID_U16) { if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; @@ -1201,7 +1201,7 @@ static void sub_8085810(void) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); - if (newMusic != MUS_OOAME && newMusic != 0xFFFF) + if (newMusic != MUS_OOAME && newMusic != INVALID_U16) { if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI) return; diff --git a/src/palette.c b/src/palette.c index 1e92f4bba..3c7485d05 100644 --- a/src/palette.c +++ b/src/palette.c @@ -63,7 +63,7 @@ static EWRAM_DATA u32 sPlttBufferTransferPending = 0; EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0}; static const struct PaletteStructTemplate gDummyPaletteStructTemplate = { - .uid = 0xFFFF, + .uid = INVALID_U16, .pst_field_B_5 = 1 }; diff --git a/src/player_pc.c b/src/player_pc.c index 59ba36350..f42d59147 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -15,7 +15,7 @@ #include "list_menu.h" #include "mail.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" diff --git a/src/pokeblock.c b/src/pokeblock.c index 01343c6eb..41d6dcc8f 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -13,7 +13,7 @@ #include "lilycove_lady.h" #include "list_menu.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" @@ -435,7 +435,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void)) sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu)); sPokeblockMenu->caseId = caseId; sPokeblockMenu->callbackOnUse = NULL; - sPokeblockMenu->unkTaskId = 0xFF; + sPokeblockMenu->unkTaskId = INVALID_U8; sPokeblockMenu->isSwapping = FALSE; sSavedPokeblockData.callback = callback; @@ -901,7 +901,7 @@ static void sub_8136344(void) static void sub_81363BC(void) { - if (sPokeblockMenu->unkTaskId == 0xFF) + if (sPokeblockMenu->unkTaskId == INVALID_U8) { sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed, 0x456, 0x456, &sSavedPokeblockData.lastItemPage); @@ -910,10 +910,10 @@ static void sub_81363BC(void) static void sub_8136418(void) { - if (sPokeblockMenu->unkTaskId != 0xFF) + if (sPokeblockMenu->unkTaskId != INVALID_U8) { RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId); - sPokeblockMenu->unkTaskId = 0xFF; + sPokeblockMenu->unkTaskId = INVALID_U8; } } @@ -1016,7 +1016,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId) break; case LIST_B_PRESSED: PlaySE(SE_SELECT); - gSpecialVar_Result = 0xFFFF; + gSpecialVar_Result = INVALID_U16; gSpecialVar_ItemId = 0; FadePaletteAndSetTaskToClosePokeblockCase(taskId); break; diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 0a8f1b8c2..91dbd1c99 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -7,7 +7,7 @@ #include "gpu_regs.h" #include "graphics.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "m4a.h" diff --git a/src/pokedex.c b/src/pokedex.c index 7578f9687..4e28c8a14 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -8,7 +8,7 @@ #include "graphics.h" #include "international_string_util.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "m4a.h" #include "overworld.h" @@ -1271,7 +1271,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView) pokedexView->seenCount = 0; pokedexView->ownCount = 0; for (i = 0; i <= 3; i++) - pokedexView->unk61E[i] |= 0xFFFF; + pokedexView->unk61E[i] |= INVALID_U16; pokedexView->unk628 = 0; pokedexView->unk62A = 0; pokedexView->unk62C = 0; @@ -2459,7 +2459,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y) return spriteId; } } - return 0xFFFF; + return INVALID_U16; } static void CreateInterfaceSprites(u8 a) @@ -2717,8 +2717,8 @@ void sub_80BE4E0(struct Sprite *sprite) sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256; var = 0x10000 / gSineTable[sprite->data[5] + 0x40]; - if (var > 0xFFFF) - var = 0xFFFF; + if (var > INVALID_U16) + var = INVALID_U16; SetOamMatrix(sprite->data[1] + 1, 0x100, 0, 0, var); sprite->oam.matrixNum = data1 + 1; @@ -4627,12 +4627,12 @@ u32 sub_80C0E68(u16 a) u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot) { num = NationalPokedexNumToSpecies(num); - return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF); + return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, INVALID_U16); } u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot) { - return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, 0xFFFF); + return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, INVALID_U16); } int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2) @@ -4655,7 +4655,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 sPokedexView->pokemonListCount = resultsCount; // Search by name - if (abcGroup != 0xFF) + if (abcGroup != INVALID_U8) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4674,7 +4674,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by body color - if (bodyColor != 0xFF) + if (bodyColor != INVALID_U8) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4690,15 +4690,15 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by type - if (type1 != 0xFF || type2 != 0xFF) + if (type1 != INVALID_U8 || type2 != INVALID_U8) { - if (type1 == 0xFF) + if (type1 == INVALID_U8) { type1 = type2; - type2 = 0xFF; + type2 = INVALID_U8; } - if (type2 == 0xFF) + if (type2 == INVALID_U8) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4987,7 +4987,7 @@ void sub_80C170C(u8 taskId) return; } - if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != 0xFF) + if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != INVALID_U8) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][0]; @@ -4995,7 +4995,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != 0xFF) + if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != INVALID_U8) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][1]; @@ -5003,7 +5003,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != 0xFF) + if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != INVALID_U8) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][2]; @@ -5011,7 +5011,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != 0xFF) + if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != INVALID_U8) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][3]; @@ -5475,12 +5475,12 @@ u8 sub_80C2318(u8 taskId, u8 b) return gUnknown_0856EFAE[r2]; case 0: if (r2 == 0) - return 0xFF; + return INVALID_U8; else return r2; case 1: if (r2 == 0) - return 0xFF; + return INVALID_U8; else return r2 - 1; case 2: diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index f3eeeed07..4a9227b99 100755 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -2,7 +2,7 @@ #include "bg.h" #include "m4a.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "pokedex_cry_screen.h" #include "sound.h" diff --git a/src/pokemon.c b/src/pokemon.c index f528ce331..1f8d5339b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -12,7 +12,7 @@ #include "item.h" #include "link.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "m4a.h" #include "pokedex.h" #include "pokeblock.h" @@ -2300,7 +2300,7 @@ static const u8 sHoldEffectToType[][2] = const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = { { // B_POSITION_PLAYER_LEFT - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2309,7 +2309,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = sub_8039BB4, }, { // B_POSITION_OPPONENT_LEFT - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACA8, .anims = NULL, @@ -2318,7 +2318,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = oac_poke_opponent, }, { // B_POSITION_PLAYER_RIGHT - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2327,7 +2327,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = sub_8039BB4, }, { // B_POSITION_OPPONENT_RIGHT - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACA8, .anims = NULL, @@ -2340,7 +2340,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = static const struct SpriteTemplate gUnknown_08329DF8[] = { { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2349,7 +2349,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2358,7 +2358,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2367,7 +2367,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2376,7 +2376,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2385,7 +2385,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2394,7 +2394,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2403,7 +2403,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2450,7 +2450,7 @@ static const s8 gUnknown_08329ECE[][3] = static const u16 sHMMoves[] = { MOVE_CUT, MOVE_FLY, MOVE_SURF, MOVE_STRENGTH, MOVE_FLASH, - MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, 0xFFFF + MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, INVALID_U16 }; static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] = @@ -2485,8 +2485,8 @@ static const struct OamData sOamData_8329F20 = static const struct SpriteTemplate gUnknown_08329F28 = { - .tileTag = 0xFFFF, - .paletteTag = 0xFFFF, + .tileTag = INVALID_U16, + .paletteTag = INVALID_U16, .oam = &sOamData_8329F20, .anims = gDummySpriteAnimTable, .images = NULL, @@ -3286,7 +3286,7 @@ u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move) if (existingMove == move) return -2; } - return -1; + return INVALID_U16; } u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) @@ -3303,7 +3303,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) } } - return -1; + return INVALID_U16; } void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot) @@ -3341,7 +3341,7 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon) move = (gLevelUpLearnsets[species][i] & 0x1FF); - if (GiveMoveToBoxMon(boxMon, move) == 0xFFFF) + if (GiveMoveToBoxMon(boxMon, move) == INVALID_U16) DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, move); } } @@ -6495,7 +6495,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves) { u16 moveLevel; - if (gLevelUpLearnsets[species][i] == 0xFFFF) + if (gLevelUpLearnsets[species][i] == INVALID_U16) break; moveLevel = gLevelUpLearnsets[species][i] & 0xFE00; @@ -6524,7 +6524,7 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves) u8 numMoves = 0; int i; - for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != 0xFFFF; i++) + for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != INVALID_U16; i++) moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF; return numMoves; @@ -6549,7 +6549,7 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon) { u16 moveLevel; - if (gLevelUpLearnsets[species][i] == 0xFFFF) + if (gLevelUpLearnsets[species][i] == INVALID_U16) break; moveLevel = gLevelUpLearnsets[species][i] & 0xFE00; @@ -6584,7 +6584,7 @@ u16 SpeciesToPokedexNum(u16 species) species = SpeciesToHoennPokedexNum(species); if (species <= 202) return species; - return 0xFFFF; + return INVALID_U16; } } @@ -6747,7 +6747,7 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u bool32 IsHMMove2(u16 move) { int i = 0; - while (sHMMoves[i] != 0xFFFF) + while (sHMMoves[i] != INVALID_U16) { if (sHMMoves[i++] == move) return TRUE; diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 989bce37d..c9a4f5c91 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -588,7 +588,7 @@ static const u8 sUnknown_0860AA64[][2] = {0, 2}, {1, 2}, {0, 2}, - {0, 0xFF} + {0, INVALID_U8} }; static const u8 sUnknown_0860AA80[][2] = @@ -1666,7 +1666,7 @@ static void sub_818031C(struct Sprite *sprite) else amplitude = 0; - if (var5 == 0xFF) + if (var5 == INVALID_U8) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->pos2.y = 0; @@ -2570,7 +2570,7 @@ static void pokemonanimfunc_2C(struct Sprite *sprite) sprite->data[4] = 0; } - if (sUnknown_0860AA64[sprite->data[6]][1] == 0xFF) + if (sUnknown_0860AA64[sprite->data[6]][1] == INVALID_U8) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; } @@ -4157,17 +4157,17 @@ static void sub_8183574(struct Sprite *sprite) u8 var9 = sprite->data[6]; u8 var5 = sUnknown_0860AA80[sprite->data[5]][0]; u8 var2 = var5; - if (var5 != 0xFF) + if (var5 != INVALID_U8) var5 = sprite->data[7]; else - var5 = 0xFF; // needed to match + var5 = INVALID_U8; // needed to match var6 = sUnknown_0860AA80[sprite->data[5]][1]; var7 = 0; if (var2 != 0xFE) var7 = (var6 - var9) * var5 / var6; - if (var5 == 0xFF) + if (var5 == INVALID_U8) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->pos2.y = 0; @@ -5278,7 +5278,7 @@ static const struct YellowBlendStruct sUnknown_0860ADCC[] = {0, 1}, {1, 1}, {0, 1}, - {0, 0xFF} + {0, INVALID_U8} }; static const struct YellowBlendStruct sUnknown_0860AE1C[] = @@ -5296,7 +5296,7 @@ static const struct YellowBlendStruct sUnknown_0860AE1C[] = {0, 2}, {1, 2}, {0, 2}, - {0, 0xFF} + {0, INVALID_U8} }; static const struct YellowBlendStruct sUnknown_0860AE54[] = @@ -5310,7 +5310,7 @@ static const struct YellowBlendStruct sUnknown_0860AE54[] = {0, 20}, {1, 1}, {0, 1}, - {0, 0xFF} + {0, INVALID_U8} }; static const struct YellowBlendStruct *const sUnknown_0860AE7C[] = @@ -5324,7 +5324,7 @@ static void BackAnimBlendYellow(struct Sprite *sprite) { const struct YellowBlendStruct *array = sUnknown_0860AE7C[sprite->data[3]]; sub_8184770(sprite); - if (array[sprite->data[6]].field_1 == 0xFF) + if (array[sprite->data[6]].field_1 == INVALID_U8) { sprite->pos2.x = 0; sprite->callback = SpriteCB_SetDummyOnAnimEnd; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 994cc520e..5926f9513 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1153,14 +1153,14 @@ void SafeLoadMonIconPalette(u16 species) if (species > SPECIES_EGG) species = 260; palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } void LoadMonIconPalette(u16 species) { u8 palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } @@ -1287,7 +1287,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x, struct SpriteTemplate spriteTemplate = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = iconTemplate->paletteTag, .oam = iconTemplate->oam, .anims = iconTemplate->anims, diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 2d9a2f08f..f90a6b8c2 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -109,7 +109,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size) static u8 CompareMonSize(u16 species, u16 *sizeRecord) { - if (gSpecialVar_Result == 0xFF) + if (gSpecialVar_Result == INVALID_U8) { return 0; } diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 465b97da2..30e16da28 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -134,7 +134,7 @@ s16 GetFirstFreeBoxSpot(u8 boxId) return i; } - return -1; // all spots are taken + return INVALID_S16; // all spots are taken } u8 CountPartyNonEggMons(void) @@ -426,7 +426,7 @@ s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx return i; } } - return -1; + return INVALID_S16; } void ResetPokemonStorageSystem(void) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index f152e70a4..bef127cce 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -19,7 +19,7 @@ #include "item.h" #include "link.h" #include "m4a.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "mon_markings.h" @@ -1152,7 +1152,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 17: pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0); - if (pssData->spriteIds[0] != 0xFF) + if (pssData->spriteIds[0] != INVALID_U8) { pssData->unk40F0 = 0; gMain.state++; @@ -1509,7 +1509,7 @@ static void sub_81C0604(u8 taskId, s8 a) r4_2 = sub_81C08F8(a); } - if (r4_2 != -1) + if (r4_2 != INVALID_S8) { PlaySE(SE_SELECT); if (pssData->summary.unk7 != 0) @@ -1564,7 +1564,7 @@ static void sub_81C0704(u8 taskId) break; case 8: pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]); - if (pssData->spriteIds[0] == 0xFF) + if (pssData->spriteIds[0] == INVALID_U8) return; gSprites[pssData->spriteIds[0]].data[2] = 1; sub_81C0E24(); @@ -1601,9 +1601,9 @@ static s8 sub_81C08F8(s8 a) if (pssData->currPageIndex == PSS_PAGE_INFO) { if (a == -1 && pssData->curMonIndex == 0) - return -1; + return INVALID_S8; else if (a == 1 && pssData->curMonIndex >= pssData->maxMonIndex) - return -1; + return INVALID_S8; else return pssData->curMonIndex + a; } @@ -1615,7 +1615,7 @@ static s8 sub_81C08F8(s8 a) { index += a; if (index < 0 || index > pssData->maxMonIndex) - return -1; + return INVALID_S8; } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0); return index; } @@ -1643,7 +1643,7 @@ static s8 sub_81C09B4(s8 a) r5 += a; if (r5 < 0 || r5 >= 6) - return -1; + return INVALID_S8; b = c[r5]; if (sub_81C0A50(&mon[b]) == TRUE) return b; @@ -2341,7 +2341,7 @@ static void sub_81C1DA4(u16 a, s16 b) else { u8 taskId = FindTaskIdByFunc(sub_81C1E20); - if (taskId == 0xFF) + if (taskId == INVALID_U8) { taskId = CreateTask(sub_81C1E20, 8); } @@ -2392,7 +2392,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move) else { u8 taskId = FindTaskIdByFunc(sub_81C1F80); - if (taskId == 0xFF) + if (taskId == INVALID_U8) taskId = CreateTask(sub_81C1F80, 8); gTasks[taskId].data[0] = b; gTasks[taskId].data[1] = a; @@ -2580,12 +2580,12 @@ static void sub_81C240C(u16 move) { effectValue = gContestEffects[gContestMoves[move].effect].appeal; - if (effectValue != 0xFF) + if (effectValue != INVALID_U8) effectValue /= 10; for (i = 0; i < 8; i++) { - if (effectValue != 0xFF && i < effectValue) + if (effectValue != INVALID_U8 && i < effectValue) { tilemap[(i / 4 * 32) + (i & 3) + 0x1E6] = 0x103A; } @@ -2597,12 +2597,12 @@ static void sub_81C240C(u16 move) effectValue = gContestEffects[gContestMoves[move].effect].jam; - if (effectValue != 0xFF) + if (effectValue != INVALID_U8) effectValue /= 10; for (i = 0; i < 8; i++) { - if (effectValue != 0xFF && i < effectValue) + if (effectValue != INVALID_U8 && i < effectValue) { tilemap[(i / 4 * 32) + (i & 3) + 0x226] = 0x103C; } @@ -2634,7 +2634,7 @@ static void sub_81C2554(void) } for (i = 0; i < 8; i++) { - pssData->windowIds[i] = 0xFF; + pssData->windowIds[i] = INVALID_U8; } } @@ -2661,7 +2661,7 @@ static void sub_81C2628(void) struct Pokemon *mon = &pssData->currentMon; struct PokeSummary *summary = &pssData->summary; u16 dexNum = SpeciesToPokedexNum(summary->species); - if (dexNum != 0xFFFF) + if (dexNum != INVALID_U16) { StringCopy(gStringVar1, &gText_UnkCtrlF908Clear01[0]); ConvertIntToDecimalStringN(gStringVar2, dexNum, 2, 3); @@ -2895,7 +2895,7 @@ static void sub_81C2C38(u8 a) static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId) { u8 *windowIdPtr = &(pssData->windowIds[templateId]); - if (*windowIdPtr == 0xFF) + if (*windowIdPtr == INVALID_U8) { *windowIdPtr = AddWindow(&template[templateId]); FillWindowPixelBuffer(*windowIdPtr, 0); @@ -2906,11 +2906,11 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) { u8 *windowIdPtr = &(pssData->windowIds[windowIndex]); - if (*windowIdPtr != 0xFF) + if (*windowIdPtr != INVALID_U8) { ClearWindowTilemap(*windowIdPtr); RemoveWindow(*windowIdPtr); - *windowIdPtr = 0xFF; + *windowIdPtr = INVALID_U8; } } @@ -2919,7 +2919,7 @@ static void sub_81C2D9C(u8 pageIndex) u16 i; for (i = 0; i < 8; i++) { - if (pssData->windowIds[i] != 0xFF) + if (pssData->windowIds[i] != INVALID_U8) FillWindowPixelBuffer(pssData->windowIds[i], 0); } gUnknown_0861CE54[pageIndex](); @@ -3651,16 +3651,16 @@ static void sub_81C4190(void) for (i = 0; i < 28; i++) { - pssData->spriteIds[i] = 0xFF; + pssData->spriteIds[i] = INVALID_U8; } } static void DestroySpriteInArray(u8 spriteArrayId) { - if (pssData->spriteIds[spriteArrayId] != 0xFF) + if (pssData->spriteIds[spriteArrayId] != INVALID_U8) { DestroySprite(&gSprites[pssData->spriteIds[spriteArrayId]]); - pssData->spriteIds[spriteArrayId] = 0xFF; + pssData->spriteIds[spriteArrayId] = INVALID_U8; } } @@ -3675,7 +3675,7 @@ static void sub_81C424C(void) for (i = 3; i < 28; i++) { - if (pssData->spriteIds[i] != 0xFF) + if (pssData->spriteIds[i] != INVALID_U8) sub_81C4204(i, TRUE); } } @@ -3704,7 +3704,7 @@ static void sub_81C42C8(void) for (i = 3; i < 8; i++) { - if (pssData->spriteIds[i] == 0xFF) + if (pssData->spriteIds[i] == INVALID_U8) pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); sub_81C4204(i, TRUE); @@ -3851,13 +3851,13 @@ static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1) } } (*a1)++; - return -1; + return INVALID_S8; case 1: pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid); LoadCompressedObjectPalette(pal); SetMultiuseSpriteTemplateToPokemon(pal->tag, 1); (*a1)++; - return -1; + return INVALID_S8; } } @@ -3921,10 +3921,10 @@ void SummaryScreen_SetUnknownTaskId(u8 a0) void SummaryScreen_DestroyUnknownTask(void) { - if (sUnknownTaskId != 0xFF) + if (sUnknownTaskId != INVALID_U8) { DestroyTask(sUnknownTaskId); - sUnknownTaskId = 0xFF; + sUnknownTaskId = INVALID_U8; } } @@ -3994,7 +3994,7 @@ static void CreateSetStatusSprite(void) u8 *spriteId = &pssData->spriteIds[2]; u8 anim; - if (*spriteId == 0xFF) + if (*spriteId == INVALID_U8) { *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0); } diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 4783f73c0..d0f65c4b0 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -5,7 +5,7 @@ #include "graphics.h" #include "bg.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "scanline_effect.h" #include "menu.h" diff --git a/src/record_mixing.c b/src/record_mixing.c index df4a1a720..4a4941294 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1,5 +1,5 @@ #include "global.h" -#include "malloc.h" +#include "alloc.h" #include "random.h" #include "constants/items.h" #include "text.h" @@ -1763,7 +1763,7 @@ static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1) for (i = 0; i < 3; i++) { s32 highestWinStreak = 0; - s32 highestId = -1; + s32 highestId = INVALID_S32; for (j = 0; j < 6; j++) { if (arg1[j].winStreak > highestWinStreak) @@ -1788,7 +1788,7 @@ static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1) for (i = 0; i < 3; i++) { s32 highestWinStreak = 0; - s32 highestId = -1; + s32 highestId = INVALID_S32; for (j = 0; j < 6; j++) { if (arg1[j].winStreak > highestWinStreak) diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 5d79cb789..3fc08ff3f 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -9,7 +9,7 @@ #include "string_util.h" #include "palette.h" #include "save.h" -#include "malloc.h" +#include "alloc.h" #include "util.h" #include "task.h" #include "text.h" @@ -221,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId) ResetPaletteFadeControl(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); - return -1; + return INVALID_U8; } else { diff --git a/src/region_map.c b/src/region_map.c index 262a7d020..d7b53d631 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -2,7 +2,7 @@ #include "main.h" #include "text.h" #include "menu.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "palette.h" #include "party_menu.h" diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 34444cbf4..da94c5c46 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -160,7 +160,7 @@ static const union AnimCmd *const sSpriteAnimTable_85104E4[] = static const struct SpriteTemplate sSpriteTemplate_85104F0 = { - .tileTag = 0xFFFF, + .tileTag = INVALID_U16, .paletteTag = 0x1000, .oam = &sOamData_08510464, .anims = sSpriteAnimTable_85104E4, diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c index 1d90448b2..d7c93a75c 100644 --- a/src/reset_save_heap.c +++ b/src/reset_save_heap.c @@ -6,7 +6,7 @@ #include "save.h" #include "new_game.h" #include "overworld.h" -#include "malloc.h" +#include "alloc.h" void sub_81700F8(void) { diff --git a/src/rock.c b/src/rock.c index 3b8e505d8..b50ecc155 100644 --- a/src/rock.c +++ b/src/rock.c @@ -738,7 +738,7 @@ void sub_811131C(struct Sprite *sprite) if (TranslateAnimArc(sprite)) { u8 taskId = FindTaskIdByFunc(sub_81110A4); - if (taskId != 0xFF) + if (taskId != INVALID_U8) gTasks[taskId].data[11]--; DestroySprite(sprite); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index a197598de..ef82cbf0a 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -7,7 +7,7 @@ #include "link.h" #include "link_rfu.h" #include "librfu.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "list_menu.h" #include "menu_helpers.h" @@ -961,7 +961,7 @@ u8 sub_80132D4(struct UnkStruct_Main0 *arg0) if (var == 1) { id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); - if (id != 0xFF) + if (id != INVALID_U8) { data->field_0->arr[i].unk = data->field_4->arr[id].unk0; data->field_0->arr[i].field_18 = var; @@ -1382,7 +1382,7 @@ void sub_8013C7C(u8 taskId) case 3: if (sub_8013E44() == 1) PlaySE(SE_PC_LOGIN); - if (gTasks[taskId].data[15] == 0xFF) + if (gTasks[taskId].data[15] == INVALID_U8) data->state = 10; break; case 10: @@ -1401,14 +1401,14 @@ void sub_8013C7C(u8 taskId) bool32 sub_8013D88(u32 arg0, u32 id) { - if (id == 0xFF) + if (id == INVALID_U8) return TRUE; if (id <= ARRAY_COUNT(gUnknown_082F04D8)) // UB: <= may access data outside the array { const u8 *bytes = gUnknown_082F04D8[id]; - while ((*(bytes) != 0xFF)) + while ((*(bytes) != INVALID_U8)) { if ((*bytes) == arg0) return TRUE; @@ -1454,7 +1454,7 @@ u8 sub_8013E44(void) if (data->field_0->arr[i].field_1A_0 != 0) { id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); - if (id != 0xFF) + if (id != INVALID_U8) { if (data->field_0->arr[i].field_1A_0 == 1) { @@ -1500,7 +1500,7 @@ u8 sub_8013E44(void) for (id = 0; id < 4; id++) { - if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != 0xFF) + if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != INVALID_U8) ret = 1; } @@ -2178,7 +2178,7 @@ void sub_8014F48(u8 taskId) break; case 0: id = ListMenuHandleInputGetItemId(data->listTaskId); - if (gMain.newKeys & A_BUTTON && id != -1) + if (gMain.newKeys & A_BUTTON && id != INVALID_S32) { // this unused variable along with the assignment is needed to match u32 unusedVar; @@ -2732,7 +2732,7 @@ void sub_80156E0(u8 taskId) break; case 6: var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244); - if (var5 != -1) + if (var5 != INVALID_S32) { if (gReceivedRemoteLinkPlayers == 0) { diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c index be6d6614a..47d9eaf70 100644 --- a/src/rom_8034C54.c +++ b/src/rom_8034C54.c @@ -1,6 +1,6 @@ #include "global.h" #include "rom_8034C54.h" -#include "malloc.h" +#include "alloc.h" #include "decompress.h" #include "main.h" @@ -255,7 +255,7 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) u32 r5 = arg0->field_14; gUnknown_03000DD4 = arg0->firstOamId; gUnknown_03000DD8 = 0; - gUnknown_03000DDC = -1; + gUnknown_03000DDC = INVALID_S32; while (r5 != 0) { @@ -263,12 +263,12 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) arg1 -= (r4 * r5); r5 /= 10; - if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0) + if (r4 != 0 || gUnknown_03000DDC != INVALID_S32 || r5 == 0) { gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart; gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0; - if (gUnknown_03000DDC == -1) + if (gUnknown_03000DDC == INVALID_S32) gUnknown_03000DDC = gUnknown_03000DD8; } else diff --git a/src/rom_81520A8.c b/src/rom_81520A8.c index f6d14d49c..f06823594 100644 --- a/src/rom_81520A8.c +++ b/src/rom_81520A8.c @@ -1,6 +1,6 @@ #include "global.h" #include "rom_81520A8.h" -#include "malloc.h" +#include "alloc.h" #include "main.h" #include "rom_8034C54.h" diff --git a/src/rotating_gate.c b/src/rotating_gate.c index f617321af..395ced06e 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -461,7 +461,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_RotatingGate[] = static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = { .tileTag = ROTATING_GATE_TILE_TAG, - .paletteTag = 0xFFFF, + .paletteTag = INVALID_U16, .oam = &sOamData_RotatingGateLarge, .anims = sSpriteAnimTable_RotatingGateLarge, .images = NULL, @@ -472,7 +472,7 @@ static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = static const struct SpriteTemplate sSpriteTemplate_RotatingGateRegular = { .tileTag = ROTATING_GATE_TILE_TAG, - .paletteTag = 0xFFFF, + .paletteTag = INVALID_U16, .oam = &sOamData_RotatingGateRegular, .anims = sSpriteAnimTable_RotatingGateRegular, .images = NULL, diff --git a/src/rtc.c b/src/rtc.c index 3f413d0e3..7553d7629 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -46,12 +46,12 @@ void RtcRestoreInterrupts(void) u32 ConvertBcdToBinary(u8 bcd) { if (bcd > 0x9F) - return 0xFF; + return INVALID_U8; if ((bcd & 0xF) <= 9) return (10 * ((bcd >> 4) & 0xF)) + (bcd & 0xF); else - return 0xFF; + return INVALID_U8; } bool8 IsLeapYear(u32 year) @@ -166,17 +166,17 @@ u16 RtcCheckInfo(struct SiiRtcInfo *rtc) year = ConvertBcdToBinary(rtc->year); - if (year == 0xFF) + if (year == INVALID_U8) errorFlags |= RTC_ERR_INVALID_YEAR; month = ConvertBcdToBinary(rtc->month); - if (month == 0xFF || month == 0 || month > 12) + if (month == INVALID_U8 || month == 0 || month > 12) errorFlags |= RTC_ERR_INVALID_MONTH; value = ConvertBcdToBinary(rtc->day); - if (value == 0xFF) + if (value == INVALID_U8) errorFlags |= RTC_ERR_INVALID_DAY; if (month == MONTH_FEB) diff --git a/src/safari_zone.c b/src/safari_zone.c index accf94981..69914b565 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -185,7 +185,7 @@ struct Pokeblock *SafariZoneGetPokeblockInFront(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -195,7 +195,7 @@ struct Pokeblock *SafariZoneGetActivePokeblock(void) { GetPokeblockFeederWithinRange(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -245,7 +245,7 @@ bool8 GetInFrontFeederPokeblockAndSteps(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) { return FALSE; } diff --git a/src/save.c b/src/save.c index 4ae516fc9..de103864b 100644 --- a/src/save.c +++ b/src/save.c @@ -160,7 +160,7 @@ static u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location if (gDamagedSaveSectors != 0) // skip the damaged sector. { - retVal = 0xFF; + retVal = INVALID_U8; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -220,7 +220,7 @@ static u8 TryWriteSector(u8 sector, u8 *data) if (ProgramFlashSectorAndVerify(sector, data) != 0) // is damaged? { SetDamagedSectorBits(ENABLE, sector); // set damaged sector bits. - return 0xFF; + return INVALID_U8; } else { @@ -263,14 +263,14 @@ static u8 sub_81529D4(u16 a1, const struct SaveSectionLocation *location) gUnknown_03006208++; if (gDamagedSaveSectors) { - retVal = 0xFF; + retVal = INVALID_U8; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } } else { - retVal = 0xFF; + retVal = INVALID_U8; } return retVal; @@ -284,7 +284,7 @@ static u8 sub_8152A34(u16 a1, const struct SaveSectionLocation *location) if (gDamagedSaveSectors) { - retVal = 0xFF; + retVal = INVALID_U8; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -329,15 +329,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location) { if (ProgramFlashByte(sector, i, ((u8 *)gFastSaveSection)[i])) { - status = 0xFF; + status = INVALID_U8; break; } } - if (status == 0xFF) + if (status == INVALID_U8) { SetDamagedSectorBits(ENABLE, sector); - return 0xFF; + return INVALID_U8; } else { @@ -347,15 +347,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location) { if (ProgramFlashByte(sector, 0xFF9 + i, ((u8 *)gFastSaveSection)[0xFF9 + i])) { - status = 0xFF; + status = INVALID_U8; break; } } - if (status == 0xFF) + if (status == INVALID_U8) { SetDamagedSectorBits(ENABLE, sector); - return 0xFF; + return INVALID_U8; } else { @@ -379,7 +379,7 @@ static u8 sav12_xor_get(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return 0xFF; + return INVALID_U8; } else { @@ -402,7 +402,7 @@ static u8 sub_8152CAC(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return 0xFF; + return INVALID_U8; } else { @@ -425,7 +425,7 @@ static u8 sub_8152D44(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return 0xFF; + return INVALID_U8; } else { @@ -440,7 +440,7 @@ static u8 sub_8152DD0(u16 a1, const struct SaveSectionLocation *location) gFastSaveSection = &gSaveDataBuffer; if (a1 != 0xFFFF) { - retVal = 0xFF; + retVal = INVALID_U8; } else { @@ -715,8 +715,8 @@ u8 TrySavingData(u8 saveType) { if (gFlashMemoryPresent != TRUE) { - gUnknown_03006294 = 0xFF; - return 0xFF; + gUnknown_03006294 = INVALID_U8; + return INVALID_U8; } HandleSavingData(saveType); @@ -728,8 +728,8 @@ u8 TrySavingData(u8 saveType) else { DoSaveFailedScreen(saveType); - gUnknown_03006294 = 0xFF; - return 0xFF; + gUnknown_03006294 = INVALID_U8; + return INVALID_U8; } } @@ -748,7 +748,7 @@ bool8 sub_81533AC(void) // trade.s save u8 retVal = sub_81529D4(SECTOR_SAVE_SLOT_LENGTH, gRamSaveSectionLocations); if (gDamagedSaveSectors) DoSaveFailedScreen(0); - if (retVal == 0xFF) + if (retVal == INVALID_U8) return TRUE; else return FALSE; @@ -808,7 +808,7 @@ u8 Save_LoadGameData(u8 a1) if (gFlashMemoryPresent != TRUE) { gSaveFileStatus = 4; - return 0xFF; + return INVALID_U8; } UpdateSaveAddresses(); @@ -861,10 +861,10 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst) u8* savData; if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE) - return 0xFF; + return INVALID_U8; ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection)); if (*(u32*)(&gSaveDataBuffer.data[0]) != 0xB39D) - return 0xFF; + return INVALID_U8; // copies whole save section except u32 counter i = 0; size = 0xFFB; @@ -882,7 +882,7 @@ u32 sub_8153634(u8 sector, u8* src) void* savDataBuffer; if (sector != 30 && sector != 31) - return 0xFF; + return INVALID_U8; savDataBuffer = &gSaveDataBuffer; *(u32*)(savDataBuffer) = 0xB39D; @@ -894,7 +894,7 @@ u32 sub_8153634(u8 sector, u8* src) for (; i <= size; i++) savData[i] = src[i]; if (ProgramFlashSectorAndVerify(sector, savDataBuffer) != 0) - return 0xFF; + return INVALID_U8; return 1; } diff --git a/src/save_location.c b/src/save_location.c index d49afa736..f7d3aa60b 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -12,7 +12,7 @@ static bool32 IsCurMapInLocationList(const u16 *list) s32 i; u16 locSum = (gSaveBlock1Ptr->location.mapGroup << 8) + (gSaveBlock1Ptr->location.mapNum); - for (i = 0; list[i] != 0xFFFF; i++) + for (i = 0; list[i] != INVALID_U16; i++) { if (list[i] == locSum) return TRUE; @@ -61,7 +61,7 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - 0xFFFF, + INVALID_U16, }; static bool32 IsCurMapPokeCenter(void) @@ -72,7 +72,7 @@ static bool32 IsCurMapPokeCenter(void) static const u16 sSaveLocationReloadLocList[] = // There's only 1 location, and it's presumed its for the save reload feature for battle tower. { MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, - 0xFFFF, + INVALID_U16, }; static bool32 IsCurMapReloadLocation(void) @@ -83,7 +83,7 @@ static bool32 IsCurMapReloadLocation(void) // Nulled out list. Unknown what this would have been. static const u16 sUnknown_0861440E[] = { - 0xFFFF, + INVALID_U16, }; static bool32 sub_81AFCEC(void) diff --git a/src/scanline_effect.c b/src/scanline_effect.c index a9ae9427b..2e264ee29 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -22,10 +22,10 @@ void ScanlineEffect_Stop(void) { gScanlineEffect.state = 0; DmaStop(0); - if (gScanlineEffect.waveTaskId != 0xFF) + if (gScanlineEffect.waveTaskId != INVALID_U8) { DestroyTask(gScanlineEffect.waveTaskId); - gScanlineEffect.waveTaskId = 0xFF; + gScanlineEffect.waveTaskId = INVALID_U8; } } @@ -40,7 +40,7 @@ void ScanlineEffect_Clear(void) gScanlineEffect.state = 0; gScanlineEffect.unused16 = 0; gScanlineEffect.unused17 = 0; - gScanlineEffect.waveTaskId = 0xFF; + gScanlineEffect.waveTaskId = INVALID_U8; } void ScanlineEffect_SetParams(struct ScanlineEffectParams params) @@ -132,7 +132,7 @@ static void TaskFunc_UpdateWavePerFrame(u8 taskId) if (sShouldStopWaveTask) { DestroyTask(taskId); - gScanlineEffect.waveTaskId = 0xFF; + gScanlineEffect.waveTaskId = INVALID_U8; } else { diff --git a/src/scrcmd.c b/src/scrcmd.c index 310387337..4217f7237 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -790,7 +790,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) u16 y; PlayerGetDestCoords(&x, &y); - if (mapGroup == 0xFF && mapNum == 0xFF) + if (mapGroup == INVALID_U8 && mapNum == INVALID_U8) SetFixedHoleWarpAsDestination(x - 7, y - 7); else Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); @@ -1491,7 +1491,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) if (width > 0x1C) width = 0x1C; - for (i = 0, height = 4; gStringVar4[i] != 0xFF;) + for (i = 0, height = 4; gStringVar4[i] != INVALID_U8;) { if (gStringVar4[i++] == 0xFE) height += 3; diff --git a/src/script.c b/src/script.c index c61ae7183..4e133a188 100644 --- a/src/script.c +++ b/src/script.c @@ -391,11 +391,11 @@ bool32 sub_80991F8(void) struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; if (scriptData->magic != RAM_SCRIPT_MAGIC) return FALSE; - if (scriptData->mapGroup != 0xFF) + if (scriptData->mapGroup != INVALID_U8) return FALSE; - if (scriptData->mapNum != 0xFF) + if (scriptData->mapNum != INVALID_U8) return FALSE; - if (scriptData->objectId != 0xFF) + if (scriptData->objectId != INVALID_U8) return FALSE; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) return FALSE; @@ -409,11 +409,11 @@ u8 *sub_8099244(void) return NULL; if (scriptData->magic != RAM_SCRIPT_MAGIC) return NULL; - if (scriptData->mapGroup != 0xFF) + if (scriptData->mapGroup != INVALID_U8) return NULL; - if (scriptData->mapNum != 0xFF) + if (scriptData->mapNum != INVALID_U8) return NULL; - if (scriptData->objectId != 0xFF) + if (scriptData->objectId != INVALID_U8) return NULL; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) { diff --git a/src/script_menu.c b/src/script_menu.c index 2aa546288..fcb2d17a2 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1040,7 +1040,7 @@ bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress) } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, 0); return TRUE; } @@ -1054,7 +1054,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, defaultChoice); return TRUE; } @@ -1201,7 +1201,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; DisplayYesNoMenu(); taskId = CreateTask(Task_HandleYesNoInput, 0x50); return TRUE; @@ -1211,7 +1211,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) // unused bool8 IsScriptActive(void) { - if (gSpecialVar_Result == 0xFF) + if (gSpecialVar_Result == INVALID_U8) return FALSE; else return TRUE; @@ -1261,7 +1261,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr int i; u8 newWidth; - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; width = 0; for (i = 0; i < gMultichoiceLists[multichoiceId].count; i++) @@ -1320,7 +1320,7 @@ bool8 ScrSpecial_CreatePCMenu(void) } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; CreatePCMenu(); return TRUE; } @@ -1389,7 +1389,7 @@ bool8 sub_80E2548(void) } else { - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; sub_80E2578(); return TRUE; } @@ -1407,7 +1407,7 @@ static void sub_80E2578(void) for (i = 0; i < ARRAY_COUNT(gUnknown_03001124); i++) { - gUnknown_03001124[i] |= 0xFF; + gUnknown_03001124[i] |= INVALID_U8; } GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH); @@ -1508,7 +1508,7 @@ static void sub_80E2578(void) for (j = 0; j < ARRAY_COUNT(gUnknown_0858BB80); j++) { u8 test = gUnknown_03001124[j]; - if (test != 0xFF) + if (test != INVALID_U8) { pixelWidth = display_text_and_get_width(gUnknown_0858BB80[test], pixelWidth); } @@ -1520,7 +1520,7 @@ static void sub_80E2578(void) for (temp = 0, i = 0; i < ARRAY_COUNT(gUnknown_0858BB80); i++) { - if (gUnknown_03001124[i] != 0xFF) + if (gUnknown_03001124[i] != INVALID_U8) { AddTextPrinterParameterized(windowId, 1, gUnknown_0858BB80[gUnknown_03001124[i]], 8, temp * 16 + 1, TEXT_SPEED_FF, NULL); temp++; @@ -1575,7 +1575,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) u8 taskId; u8 spriteId; - if (FindTaskIdByFunc(Task_PokemonPicWindow) != 0xFF) + if (FindTaskIdByFunc(Task_PokemonPicWindow) != INVALID_U8) { return FALSE; } @@ -1599,7 +1599,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) { u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow); - if (taskId == 0xFF) + if (taskId == INVALID_U8) return NULL; gTasks[taskId].tState++; return IsPicboxClosed; @@ -1607,7 +1607,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) static bool8 IsPicboxClosed(void) { - if (FindTaskIdByFunc(Task_PokemonPicWindow) == 0xFF) + if (FindTaskIdByFunc(Task_PokemonPicWindow) == INVALID_U8) return TRUE; else return FALSE; @@ -1672,7 +1672,7 @@ bool16 sp106_CreateStartMenu(void) return FALSE; } - gSpecialVar_Result = 0xFF; + gSpecialVar_Result = INVALID_U8; CreateStartMenu(); return TRUE; } diff --git a/src/script_movement.c b/src/script_movement.c index 9fee9e060..54e6f9995 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -50,7 +50,7 @@ void sub_80D338C(void) u8 taskId; taskId = sub_80D33F4(); - if (taskId != 0xFF) + if (taskId != INVALID_U8) { UnfreezeObjects(taskId); DestroyTask(taskId); @@ -65,7 +65,7 @@ static void sub_80D33AC(u8 priority) taskId = CreateTask(sub_80D3660, priority); for (i = 1; i < 16; i++) - gTasks[taskId].data[i] = 0xFFFF; + gTasks[taskId].data[i] = INVALID_U16; } static u8 sub_80D33F4(void) @@ -188,7 +188,7 @@ static void UnfreezeObjects(u8 taskId) pEventObjId = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < 16; i++, pEventObjId++) { - if (*pEventObjId != 0xFF) + if (*pEventObjId != INVALID_U8) UnfreezeEventObject(&gEventObjects[*pEventObjId]); } } @@ -201,7 +201,7 @@ static void sub_80D3660(u8 taskId) for (i = 0; i < 16; i++) { sub_80D3508(taskId, i, &var); - if (var != 0xFF) + if (var != INVALID_U8) sub_80A2490(taskId, i, var, sub_80D35CC(i)); } } diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 7fc61f953..77c1a88e0 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -318,7 +318,7 @@ void ShowContestEntryMonPic(void) u8 taskId; u8 left, top; - if (FindTaskIdByFunc(sub_80F8EE8) == 0xFF) + if (FindTaskIdByFunc(sub_80F8EE8) == INVALID_U8) { AllocateMonSpritesGfx(); left = 10; @@ -361,7 +361,7 @@ void ShowContestEntryMonPic(void) void sub_80F8EB8(void) { u8 taskId = FindTaskIdByFunc(sub_80F8EE8); - if (taskId != 0xFF) + if (taskId != INVALID_U8) { gTasks[taskId].data[0]++; FreeMonSpritesGfx(); diff --git a/src/secret_base.c b/src/secret_base.c index 8436d8520..78e6bd7d0 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -3,7 +3,7 @@ #include "global.h" #include "constants/bg_event_constants.h" #include "constants/decorations.h" -#include "malloc.h" +#include "alloc.h" #include "main.h" #include "task.h" #include "palette.h" @@ -1385,7 +1385,7 @@ s16 sub_80EA990(u8 secretBaseRecordId) return i; } } - return -1; + return INVALID_S16; } u8 sub_80EA9D8(void) @@ -1427,7 +1427,7 @@ u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language) secretBaseRecordId = sub_80EA990(base->secretBaseId); if (secretBaseRecordId != 0) { - if (secretBaseRecordId != -1) + if (secretBaseRecordId != INVALID_S16) { if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1) { @@ -1757,7 +1757,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx) gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0; } } - if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF) + if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != INVALID_U16) { gSaveBlock1Ptr->secretBases[0].sbr_field_e ++; } diff --git a/src/shop.c b/src/shop.c index a0eddee01..c0359bda0 100755 --- a/src/shop.c +++ b/src/shop.c @@ -17,7 +17,7 @@ #include "item_menu.h" #include "list_menu.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "menu_helpers.h" #include "money.h" @@ -446,9 +446,9 @@ static void CB2_InitBuyMenu(void) ResetTasks(); clear_scheduled_bg_copies_to_vram(); gShopDataPtr = AllocZeroed(sizeof(struct ShopData)); - gShopDataPtr->scrollIndicatorsTaskId = 0xFF; - gShopDataPtr->itemSpriteIds[0] = -1; - gShopDataPtr->itemSpriteIds[1] = -1; + gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8; + gShopDataPtr->itemSpriteIds[0] = INVALID_U8; + gShopDataPtr->itemSpriteIds[1] = INVALID_U8; BuyMenuBuildListMenuTemplate(); BuyMenuInitBgs(); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); @@ -580,7 +580,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y) static void BuyMenuAddScrollIndicatorArrows(void) { - if (gShopDataPtr->scrollIndicatorsTaskId == 0xFF && gMartInfo.itemCount + 1 > 8) + if (gShopDataPtr->scrollIndicatorsTaskId == INVALID_U8 && gMartInfo.itemCount + 1 > 8) { gShopDataPtr->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized( SCROLL_ARROW_UP, @@ -596,10 +596,10 @@ static void BuyMenuAddScrollIndicatorArrows(void) static void BuyMenuRemoveScrollIndicatorArrows(void) { - if (gShopDataPtr->scrollIndicatorsTaskId != 0xFF) + if (gShopDataPtr->scrollIndicatorsTaskId != INVALID_U8) { RemoveScrollIndicatorArrowPair(gShopDataPtr->scrollIndicatorsTaskId); - gShopDataPtr->scrollIndicatorsTaskId = 0xFF; + gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8; } } @@ -613,10 +613,10 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) { u8 spriteId; u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot]; - if (*spriteIdPtr != 0xFF) + if (*spriteIdPtr != INVALID_U8) return; - if (gMartInfo.martType == MART_TYPE_0 || item == 0xFFFF) + if (gMartInfo.martType == MART_TYPE_0 || item == INVALID_U16) { spriteId = AddItemIconSprite(iconSlot + 2110, iconSlot + 2110, item); if (spriteId != MAX_SPRITES) @@ -637,13 +637,13 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) static void BuyMenuRemoveItemIcon(u16 item, u8 iconSlot) { u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot]; - if (*spriteIdPtr == 0xFF) + if (*spriteIdPtr == INVALID_U8) return; FreeSpriteTilesByTag(iconSlot + 2110); FreeSpritePaletteByTag(iconSlot + 2110); DestroySprite(&gSprites[*spriteIdPtr]); - *spriteIdPtr = 0xFF; + *spriteIdPtr = INVALID_U8; } static void BuyMenuInitBgs(void) diff --git a/src/slot_machine.c b/src/slot_machine.c index 01ef6d85c..97fe0b146 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -14,7 +14,7 @@ #include "util.h" #include "text.h" #include "menu.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "gpu_regs.h" #include "coins.h" @@ -1637,7 +1637,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */bool8 sub_8102A44(void) { - if (FindTaskIdByFunc(sub_8102A64) == 0xff) + if (FindTaskIdByFunc(sub_8102A64) == INVALID_U8) return TRUE; else return FALSE; @@ -2672,7 +2672,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_810432C(void) { - if (FindTaskIdByFunc(sub_810434C) == 0xFF) + if (FindTaskIdByFunc(sub_810434C) == INVALID_U8) return TRUE; return FALSE; } @@ -3007,7 +3007,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_8104AEC(void) { - if (FindTaskIdByFunc(sub_8104B0C) == 0xFF) + if (FindTaskIdByFunc(sub_8104B0C) == INVALID_U8) return TRUE; else return FALSE; @@ -3108,7 +3108,7 @@ s16 sub_8102D5C(s16 a0) task = gTasks + sSlotMachine->unk3D; task->data[1] = arg0; - for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++) + for (i = 0; gUnknown_083ED048[arg0][i].unk00 != INVALID_U8; i++) { u8 spriteId; spriteId = sub_8105BB4( @@ -3138,7 +3138,7 @@ s16 sub_8102D5C(s16 a0) { u8 i; struct Task *task = gTasks + sSlotMachine->unk3D; - if ((u16)task->data[1] != 0xFFFF) + if ((u16)task->data[1] != INVALID_U16) gUnknown_083ED064[task->data[1]](); for (i = 4; i < 16; i++) { diff --git a/src/smokescreen.c b/src/smokescreen.c index 9b37cd234..1119e9e90 100644 --- a/src/smokescreen.c +++ b/src/smokescreen.c @@ -12,7 +12,7 @@ u8 sub_807521C(s16 x, s16 y, u8 a3) u8 spriteId1, spriteId2, spriteId3, spriteId4; struct Sprite *mainSprite; - if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == 0xFFFF) + if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == INVALID_U16) { LoadCompressedObjectPicUsingHeap(&gUnknown_0831C620); LoadCompressedObjectPaletteUsingHeap(&gUnknown_0831C628); diff --git a/src/sound.c b/src/sound.c index ba3f659cc..7798700c3 100644 --- a/src/sound.c +++ b/src/sound.c @@ -247,7 +247,7 @@ void FadeInNewBGM(u16 songNum, u8 speed) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == INVALID_U16) songNum = 0; m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_BGM); @@ -544,7 +544,7 @@ void PlayBGM(u16 songNum) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == INVALID_U16) songNum = 0; m4aSongNumStart(songNum); } diff --git a/src/sprite.c b/src/sprite.c index 4087dd8c4..3f0223dee 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -108,7 +108,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *); 0 \ } -#define ANIM_END 0xFFFF +#define ANIM_END INVALID_U16 #define AFFINE_ANIM_END 0x7FFF // forward declarations @@ -204,7 +204,7 @@ const union AffineAnimCmd * const gDummySpriteAffineAnimTable[] = { &sDummyAffin const struct SpriteTemplate gDummySpriteTemplate = { .tileTag = 0, - .paletteTag = 0xFFFF, + .paletteTag = INVALID_U16, .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, @@ -572,12 +572,12 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); - if (template->tileTag == 0xFFFF) + if (template->tileTag == INVALID_U16) { s16 tileNum; sprite->images = template->images; tileNum = AllocSpriteTiles((u8)(sprite->images->size / TILE_SIZE_4BPP)); - if (tileNum == -1) + if (tileNum == INVALID_S16) { ResetSprite(sprite); return MAX_SPRITES; @@ -595,7 +595,7 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) InitSpriteAffineAnim(sprite); - if (template->paletteTag != 0xFFFF) + if (template->paletteTag != INVALID_U16) sprite->oam.paletteNum = IndexOfSpritePaletteTag(template->paletteTag); return index; @@ -740,7 +740,7 @@ s16 AllocSpriteTiles(u16 tileCount) i++; if (i == TOTAL_OBJ_TILE_COUNT) - return -1; + return INVALID_S16; } start = i; @@ -751,7 +751,7 @@ s16 AllocSpriteTiles(u16 tileCount) i++; if (i == TOTAL_OBJ_TILE_COUNT) - return -1; + return INVALID_S16; if (!SPRITE_TILE_IS_ALLOCATED(i)) numTilesFound++; @@ -877,7 +877,7 @@ void ResetAllSprites(void) void FreeSpriteTiles(struct Sprite *sprite) { - if (sprite->template->tileTag != 0xFFFF) + if (sprite->template->tileTag != INVALID_U16) FreeSpriteTilesByTag(sprite->template->tileTag); } @@ -923,7 +923,7 @@ void BeginAnim(struct Sprite *sprite) sprite->animLoopCounter = 0; imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; - if (imageValue != -1) + if (imageValue != INVALID_S16) { sprite->animBeginning = FALSE; duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; @@ -1441,7 +1441,7 @@ u8 AllocOamMatrix(void) bit <<= 1; } - return 0xFF; + return INVALID_U8; } void FreeOamMatrix(u8 matrixNum) @@ -1462,7 +1462,7 @@ void FreeOamMatrix(u8 matrixNum) void InitSpriteAffineAnim(struct Sprite *sprite) { u8 matrixNum = AllocOamMatrix(); - if (matrixNum != 0xFF) + if (matrixNum != INVALID_U8) { CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); sprite->oam.matrixNum = matrixNum; @@ -1508,7 +1508,7 @@ void LoadSpriteSheets(const struct SpriteSheet *sheets) void FreeSpriteTilesByTag(u16 tag) { u8 index = IndexOfSpriteTileTag(tag); - if (index != 0xFF) + if (index != INVALID_U8) { u16 i; u16 *rangeStarts; @@ -1523,7 +1523,7 @@ void FreeSpriteTilesByTag(u16 tag) for (i = start; i < start + count; i++) FREE_SPRITE_TILE(i); - sSpriteTileRangeTags[index] = 0xFFFF; + sSpriteTileRangeTags[index] = INVALID_U16; } } @@ -1533,7 +1533,7 @@ void FreeSpriteTileRanges(void) for (i = 0; i < MAX_SPRITES; i++) { - sSpriteTileRangeTags[i] = 0xFFFF; + sSpriteTileRangeTags[i] = INVALID_U16; SET_SPRITE_TILE_RANGE(i, 0, 0); } } @@ -1541,8 +1541,8 @@ void FreeSpriteTileRanges(void) u16 GetSpriteTileStartByTag(u16 tag) { u8 index = IndexOfSpriteTileTag(tag); - if (index == 0xFF) - return 0xFFFF; + if (index == INVALID_U8) + return INVALID_U16; return sSpriteTileRanges[index * 2]; } @@ -1554,7 +1554,7 @@ u8 IndexOfSpriteTileTag(u16 tag) if (sSpriteTileRangeTags[i] == tag) return i; - return 0xFF; + return INVALID_U8; } u16 GetSpriteTileTagByTileStart(u16 start) @@ -1563,16 +1563,16 @@ u16 GetSpriteTileTagByTileStart(u16 start) for (i = 0; i < MAX_SPRITES; i++) { - if (sSpriteTileRangeTags[i] != 0xFFFF && sSpriteTileRanges[i * 2] == start) + if (sSpriteTileRangeTags[i] != INVALID_U16 && sSpriteTileRanges[i * 2] == start) return sSpriteTileRangeTags[i]; } - return 0xFFFF; + return INVALID_U16; } void AllocSpriteTileRange(u16 tag, u16 start, u16 count) { - u8 freeIndex = IndexOfSpriteTileTag(0xFFFF); + u8 freeIndex = IndexOfSpriteTileTag(INVALID_U16); sSpriteTileRangeTags[freeIndex] = tag; SET_SPRITE_TILE_RANGE(freeIndex, start, count); } @@ -1582,21 +1582,21 @@ void FreeAllSpritePalettes(void) u8 i; gReservedSpritePaletteCount = 0; for (i = 0; i < 16; i++) - sSpritePaletteTags[i] = 0xFFFF; + sSpritePaletteTags[i] = INVALID_U16; } u8 LoadSpritePalette(const struct SpritePalette *palette) { u8 index = IndexOfSpritePaletteTag(palette->tag); - if (index != 0xFF) + if (index != INVALID_U8) return index; - index = IndexOfSpritePaletteTag(0xFFFF); + index = IndexOfSpritePaletteTag(INVALID_U16); - if (index == 0xFF) + if (index == INVALID_U8) { - return 0xFF; + return INVALID_U8; } else { @@ -1610,7 +1610,7 @@ void LoadSpritePalettes(const struct SpritePalette *palettes) { u8 i; for (i = 0; palettes[i].data != NULL; i++) - if (LoadSpritePalette(&palettes[i]) == 0xFF) + if (LoadSpritePalette(&palettes[i]) == INVALID_U8) break; } @@ -1621,10 +1621,10 @@ void DoLoadSpritePalette(const u16 *src, u16 paletteOffset) u8 AllocSpritePalette(u16 tag) { - u8 index = IndexOfSpritePaletteTag(0xFFFF); - if (index == 0xFF) + u8 index = IndexOfSpritePaletteTag(INVALID_U16); + if (index == INVALID_U8) { - return 0xFF; + return INVALID_U8; } else { @@ -1640,7 +1640,7 @@ u8 IndexOfSpritePaletteTag(u16 tag) if (sSpritePaletteTags[i] == tag) return i; - return 0xFF; + return INVALID_U8; } u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) @@ -1651,8 +1651,8 @@ u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) void FreeSpritePaletteByTag(u16 tag) { u8 index = IndexOfSpritePaletteTag(tag); - if (index != 0xFF) - sSpritePaletteTags[index] = 0xFFFF; + if (index != INVALID_U8) + sSpritePaletteTags[index] = INVALID_U16; } void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables) diff --git a/src/task.c b/src/task.c index f067e21b4..2a77b8a9b 100644 --- a/src/task.c +++ b/src/task.c @@ -19,7 +19,7 @@ void ResetTasks(void) gTasks[i].func = TaskDummy; gTasks[i].prev = i; gTasks[i].next = i + 1; - gTasks[i].priority = -1; + gTasks[i].priority = INVALID_S8; memset(gTasks[i].data, 0, sizeof(gTasks[i].data)); } @@ -186,7 +186,7 @@ u8 FindTaskIdByFunc(TaskFunc func) if (gTasks[i].isActive == TRUE && gTasks[i].func == func) return (u8)i; - return -1; + return INVALID_U8; } u8 GetTaskCount(void) diff --git a/src/text.c b/src/text.c index 07c15596e..44895722d 100644 --- a/src/text.c +++ b/src/text.c @@ -1877,7 +1877,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) if (func == NULL) return 0; - if (letterSpacing == -1) + if (letterSpacing == INVALID_S16) localLetterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); else localLetterSpacing = letterSpacing; @@ -1953,7 +1953,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) func = GetFontWidthFunc(*++str); if (func == NULL) return 0; - if (letterSpacing == -1) + if (letterSpacing == INVALID_S16) localLetterSpacing = GetFontAttribute(*str, FONTATTR_LETTER_SPACING); break; case 0x11: diff --git a/src/trader.c b/src/trader.c index e23efb4ce..afb0cca48 100644 --- a/src/trader.c +++ b/src/trader.c @@ -155,7 +155,7 @@ void ScrSpecial_IsDecorationFull(void) { gSpecialVar_Result = FALSE; if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category - && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == -1) + && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == INVALID_S8) { sub_8127250(gStringVar2, gDecorations[gSpecialVar_0x8004].category); gSpecialVar_Result = TRUE; diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index 040310901..fd97623fe 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -1,7 +1,7 @@ #include "global.h" #include "sprite.h" #include "window.h" -#include "malloc.h" +#include "alloc.h" #include "constants/species.h" #include "palette.h" #include "decompress.h" @@ -107,9 +107,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 { if (!isTrainer) { - if (paletteTag == 0xFFFF) + if (paletteTag == INVALID_U16) { - sCreatingSpriteTemplate.paletteTag |= 0xFFFF; + sCreatingSpriteTemplate.paletteTag |= INVALID_U16; LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20); } else @@ -120,9 +120,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 } else { - if (paletteTag == 0xFFFF) + if (paletteTag == INVALID_U16) { - sCreatingSpriteTemplate.paletteTag |= 0xFFFF; + sCreatingSpriteTemplate.paletteTag |= INVALID_U16; LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20); } else @@ -166,30 +166,30 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront } if (i == PICS_COUNT) { - return 0xFFFF; + return INVALID_U16; } framePics = Alloc(4 * 0x800); if (!framePics) { - return 0xFFFF; + return INVALID_U16; } images = Alloc(4 * sizeof(struct SpriteFrameImage)); if (!images) { Free(framePics); - return 0xFFFF; + return INVALID_U16; } if (DecompressPic(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys)) { // debug trap? - return 0xFFFF; + return INVALID_U16; } for (j = 0; j < 4; j ++) { images[j].data = framePics + 0x800 * j; images[j].size = 0x800; } - sCreatingSpriteTemplate.tileTag = 0xFFFF; + sCreatingSpriteTemplate.tileTag = INVALID_U16; sCreatingSpriteTemplate.oam = &gUnknown_0860B064; AssignSpriteAnimsTable(isTrainer); sCreatingSpriteTemplate.images = images; @@ -197,7 +197,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront sCreatingSpriteTemplate.callback = DummyPicSpriteCallback; LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer); spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0); - if (paletteTag == 0xFFFF) + if (paletteTag == INVALID_U16) { gSprites[spriteId].oam.paletteNum = paletteSlot; } @@ -232,12 +232,12 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 } if (i == PICS_COUNT) { - return 0xFFFF; + return INVALID_U16; } framePics = Alloc(4 * 0x800); if (!framePics) { - return 0xFFFF; + return INVALID_U16; } if (flags & 0x80) { @@ -252,19 +252,19 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 if (!images) { Free(framePics); - return 0xFFFF; + return INVALID_U16; } if (DecompressPic(species, personality, flags, framePics, FALSE, FALSE)) { // debug trap? - return 0xFFFF; + return INVALID_U16; } for (j = 0; j < 4; j ++) { images[j].data = framePics + 0x800 * j; images[j].size = 0x800; } - sCreatingSpriteTemplate.tileTag = 0xFFFF; + sCreatingSpriteTemplate.tileTag = INVALID_U16; sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species]; sCreatingSpriteTemplate.images = images; if (flags2 == 0x01) @@ -285,7 +285,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 sCreatingSpriteTemplate.callback = DummyPicSpriteCallback; LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, FALSE); spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0); - if (paletteTag == 0xFFFF) + if (paletteTag == INVALID_U16) { gSprites[spriteId].oam.paletteNum = paletteSlot; } @@ -312,11 +312,11 @@ static u16 FreeAndDestroyPicSpriteInternal(u16 spriteId) } if (i == PICS_COUNT) { - return 0xFFFF; + return INVALID_U16; } framePics = sSpritePics[i].frames; images = sSpritePics[i].images; - if (sSpritePics[i].paletteTag != 0xFFFF) + if (sSpritePics[i].paletteTag != INVALID_U16) { FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum)); } @@ -331,7 +331,7 @@ static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, { if (DecompressPic_HandleDeoxys(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE)) { - return 0xFFFF; + return INVALID_U16; } LoadPicPaletteBySlot(species, otId, personality, paletteSlot, isTrainer); return 0; @@ -349,7 +349,7 @@ static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, Free(framePics); return 0; } - return 0xFFFF; + return INVALID_U16; } static u16 CreateMonPicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys) diff --git a/src/tv.c b/src/tv.c index d3d1e797b..0c5c3f564 100644 --- a/src/tv.c +++ b/src/tv.c @@ -30,7 +30,7 @@ #include "text.h" #include "script_menu.h" #include "naming_screen.h" -#include "malloc.h" +#include "alloc.h" #include "region_map.h" #include "constants/region_map_sections.h" #include "decoration.h" @@ -799,7 +799,7 @@ u8 special_0x44(void) j --; } } while (j != selIdx); - return 0xFF; + return INVALID_U8; } u8 FindAnyTVShowOnTheAir(void) @@ -807,9 +807,9 @@ u8 FindAnyTVShowOnTheAir(void) u8 response; response = special_0x44(); - if (response == 0xFF) + if (response == INVALID_U8) { - return 0xFF; + return INVALID_U8; } if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[response].common.kind == TVSHOW_MASS_OUTBREAK) { @@ -833,7 +833,7 @@ void UpdateTVScreensOnMap(int width, int height) { SetTVMetatilesOnMap(width, height, 0x3); } - else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xff || FindAnyTVNewsOnTheAir() != 0xff || IsTVShowInSearchOfTrainersAiring())) + else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != INVALID_U8 || FindAnyTVNewsOnTheAir() != INVALID_U8 || IsTVShowInSearchOfTrainersAiring())) { FlagClear(FLAG_SYS_TV_WATCH); SetTVMetatilesOnMap(width, height, 0x3); @@ -887,7 +887,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void) return i; } } - return 0xFF; + return INVALID_U8; } u8 special_0x4a(void) @@ -932,7 +932,7 @@ void GabbyAndTyBeforeInterview(void) gSaveBlock1Ptr->gabbyAndTyData.mon1 = gBattleResults.playerMon1Species; gSaveBlock1Ptr->gabbyAndTyData.mon2 = gBattleResults.playerMon2Species; gSaveBlock1Ptr->gabbyAndTyData.lastMove = gBattleResults.lastUsedMovePlayer; - if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != 0xFF) + if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != INVALID_U8) { gSaveBlock1Ptr->gabbyAndTyData.battleNum ++; } @@ -1007,7 +1007,7 @@ bool8 IsTVShowInSearchOfTrainersAiring(void) bool8 GabbyAndTyGetLastQuote(void) { - if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == 0xFFFF) + if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == INVALID_U16) { return FALSE; } @@ -1125,7 +1125,7 @@ void PutPokemonTodayCaughtOnAir(void) if (!rbernoulli(1, 1) && StringCompare(gSpeciesNames[gBattleResults.caughtMonSpecies], gBattleResults.caughtMonNick)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) { for (i = 0; i < 11; i ++) { @@ -1206,7 +1206,7 @@ void PutPokemonTodayFailedOnTheAir(void) if (ct > 2 && (gBattleOutcome == B_OUTCOME_MON_FLED || gBattleOutcome == B_OUTCOME_WON)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->pokemonTodayFailed.kind = TVSHOW_POKEMON_TODAY_FAILED; @@ -1282,7 +1282,7 @@ void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlaye u8 name[32]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BATTLE_UPDATE); if (gSpecialVar_Result != 1) @@ -1329,7 +1329,7 @@ bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unus u8 name[32]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == -1) + if (sCurTVShowSlot == INVALID_S8) { return FALSE; } @@ -1396,7 +1396,7 @@ void ContestLiveUpdates_BeforeInterview_1(u8 a0) DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24); sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[24]; show->contestLiveUpdates.round1Rank = a0; @@ -1410,7 +1410,7 @@ void ContestLiveUpdates_BeforeInterview_2(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->contestLiveUpdates.round2Rank = a0; } @@ -1422,7 +1422,7 @@ void ContestLiveUpdates_BeforeInterview_3(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->contestLiveUpdates.appealFlags1 = a0; } @@ -1434,7 +1434,7 @@ void ContestLiveUpdates_BeforeInterview_4(u16 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->contestLiveUpdates.move = a0; } @@ -1446,7 +1446,7 @@ void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->contestLiveUpdates.winningSpecies = gContestMons[a1].species; StringCopy(show->contestLiveUpdates.winningTrainerName, gContestMons[a1].trainerName); @@ -1507,7 +1507,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 a0) show = &gSaveBlock1Ptr->tvShows[24]; InterviewBefore_BravoTrainerPkmnProfile(); sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24); show->bravoTrainer.move = a0; @@ -1521,7 +1521,7 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show->bravoTrainer.contestResult = a0; show->bravoTrainer.contestCategory = gSpecialVar_ContestCategory; @@ -1577,7 +1577,7 @@ void SaveRecordedItemPurchasesForTVShow(void) && !rbernoulli(1, 3)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE) { TV_SortPurchasesByQuantity(); if (gMartPurchaseHistory[0].quantity >= 20) @@ -1742,7 +1742,7 @@ static void sub_80ED718(void) if (!rbernoulli(1, 200)) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { outbreakIdx = Random() % ARRAY_COUNT(sPokeOutbreakSpeciesList); show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; @@ -1843,7 +1843,7 @@ void sub_80ED950(bool8 flag) PutFishingAdviceShowOnTheAir(); } sPokemonAnglerAttemptCounters &= 0xFF; - if (sPokemonAnglerAttemptCounters != 0xFF) + if (sPokemonAnglerAttemptCounters != INVALID_U8) { sPokemonAnglerAttemptCounters += 0x01; } @@ -1855,7 +1855,7 @@ void sub_80ED950(bool8 flag) PutFishingAdviceShowOnTheAir(); } sPokemonAnglerAttemptCounters &= 0xFF00; - if (sPokemonAnglerAttemptCounters >> 8 != 0xFF) + if (sPokemonAnglerAttemptCounters >> 8 != INVALID_U8) { sPokemonAnglerAttemptCounters += 0x0100; } @@ -1867,7 +1867,7 @@ void PutFishingAdviceShowOnTheAir(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->pokemonAngler.kind = TVSHOW_FISHING_ADVICE; @@ -1910,7 +1910,7 @@ void sub_80EDA80(void) if (!rbernoulli(1, 1)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE) { show2 = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show2->worldOfMasters.kind = TVSHOW_WORLD_OF_MASTERS; @@ -1936,7 +1936,7 @@ void sub_80EDB44(void) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TODAYS_RIVAL_TRAINER, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->rivalTrainer.kind = TVSHOW_TODAYS_RIVAL_TRAINER; @@ -1984,7 +1984,7 @@ void sub_80EDC60(const u16 *words) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->trendWatcher.kind = TVSHOW_TREND_WATCHER; @@ -2003,7 +2003,7 @@ void sub_80EDCE8(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->treasureInvestigators.kind = TVSHOW_TREASURE_INVESTIGATORS; @@ -2024,7 +2024,7 @@ void sub_80EDD78(u16 nCoinsPaidOut) u16 nCoinsWon; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE) { flag = FALSE; switch (sFindThatGamerWhichGame) @@ -2207,7 +2207,7 @@ void TV_PutSecretBaseVisitOnTheAir(void) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_VISIT, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->secretBaseVisit.kind = TVSHOW_SECRET_BASE_VISIT; @@ -2227,7 +2227,7 @@ void sub_80EE184(void) u16 balls; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->breakingNews.kind = TVSHOW_BREAKING_NEWS; @@ -2298,7 +2298,7 @@ void sub_80EE2CC(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->lottoWinner.kind = TVSHOW_LOTTO_WINNER; @@ -2318,7 +2318,7 @@ void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u1 u8 j; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->battleSeminar.kind = TVSHOW_BATTLE_SEMINAR; @@ -2347,7 +2347,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->safariFanClub.kind = TVSHOW_SAFARI_FAN_CLUB; @@ -2365,7 +2365,7 @@ void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->cuties.kind = TVSHOW_CUTIES; @@ -2440,7 +2440,7 @@ void sub_80EE72C(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB; @@ -2456,7 +2456,7 @@ void sub_80EE72C(void) bool8 sub_80EE7C0(void) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == -1) + if (sCurTVShowSlot == INVALID_S8) { return TRUE; } @@ -2493,7 +2493,7 @@ bool8 sub_80EE818(void) } } sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == -1) + if (sCurTVShowSlot == INVALID_S8) { return FALSE; } @@ -2557,7 +2557,7 @@ void sub_80EEA70(void) if (HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_SECRETS, FALSE) != TRUE) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->secretBaseSecrets.kind = TVSHOW_SECRET_BASE_SECRETS; @@ -2608,7 +2608,7 @@ static void sub_80EEBF4(u8 actionIdx) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_NUMBER_ONE, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->numberOne.kind = TVSHOW_NUMBER_ONE; @@ -2665,7 +2665,7 @@ static void sub_80EED88(void) if (FlagGet(FLAG_SYS_GAME_CLEAR)) { sCurTVShowSlot = sub_80EEE30(gSaveBlock1Ptr->pokeNews); - if (sCurTVShowSlot != -1 && rbernoulli(1, 100) != TRUE) + if (sCurTVShowSlot != INVALID_S8 && rbernoulli(1, 100) != TRUE) { newsKind = (Random() % 4) + POKENEWS_SLATEPORT; if (sub_80EF0E4(newsKind) != TRUE) @@ -2689,7 +2689,7 @@ s8 sub_80EEE30(PokeNews *pokeNews) return i; } } - return -1; + return INVALID_S8; } void ClearPokemonNews(void) @@ -2742,7 +2742,7 @@ u8 FindAnyTVNewsOnTheAir(void) return i; } } - return -1; + return INVALID_U8; } void DoPokeNews(void) @@ -2751,7 +2751,7 @@ void DoPokeNews(void) u16 n; i = FindAnyTVNewsOnTheAir(); - if (i == 0xFF) + if (i == INVALID_U8) { gSpecialVar_Result = FALSE; } @@ -3252,7 +3252,7 @@ static void sub_80EFA88(void) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); gSpecialVar_0x8006 = sCurTVShowSlot; - if (sCurTVShowSlot == -1) + if (sCurTVShowSlot == INVALID_S8) { gSpecialVar_Result = TRUE; } @@ -3273,7 +3273,7 @@ s8 FindEmptyTVSlotWithinFirstFiveShowsOfArray(TVShow *shows) return i; } } - return -1; + return INVALID_S8; } s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows) @@ -3287,7 +3287,7 @@ s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows) return i; } } - return -1; + return INVALID_S8; } bool8 TV_BernoulliTrial(u16 ratio) @@ -3310,7 +3310,7 @@ void TV_FanClubLetter_RandomWordToStringVar3(TVShow *show) { i = 0; } - if (show->fanclubLetter.words[i] != 0xFFFF) + if (show->fanclubLetter.words[i] != INVALID_U16) { break; } @@ -3677,7 +3677,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2 sRecordMixingPartnersWithoutShowsToShare = i; } sTVShowMixingCurSlot = sub_80F06D0(argslist[i][0]); - if (sTVShowMixingCurSlot == -1) + if (sTVShowMixingCurSlot == INVALID_S8) { sRecordMixingPartnersWithoutShowsToShare ++; if (sRecordMixingPartnersWithoutShowsToShare == sTVShowMixingNumPlayers) @@ -3690,7 +3690,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2 for (j = 0; j < sTVShowMixingNumPlayers - 1; j ++) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(argslist[(i + j + 1) % sTVShowMixingNumPlayers][0]); - if (sCurTVShowSlot != -1 + if (sCurTVShowSlot != INVALID_S8 && sub_80F049C(&argslist[(i + j + 1) % sTVShowMixingNumPlayers][0], &argslist[i][0], (i + j + 1) % sTVShowMixingNumPlayers) == 1) { break; @@ -3801,7 +3801,7 @@ static s8 sub_80F06D0(TVShow *tvShows) return i; } } - return -1; + return INVALID_S8; } #ifdef NONMATCHING @@ -4486,12 +4486,12 @@ static void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews pla for (j = 0; j < sTVShowNewsMixingNumPlayers; j ++) { sTVShowMixingCurSlot = sub_80F0ECC(*argslist[j], i); - if (sTVShowMixingCurSlot != -1) + if (sTVShowMixingCurSlot != INVALID_S8) { for (k = 0; k < sTVShowNewsMixingNumPlayers - 1; k++) { sCurTVShowSlot = sub_80EEE30(*argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers]); - if (sCurTVShowSlot != -1) + if (sCurTVShowSlot != INVALID_S8) { sub_80F0E58(argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers], argslist[j]); } @@ -4538,7 +4538,7 @@ static s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx) { if (pokeNews[idx].kind == POKENEWS_NONE) { - return -1; + return INVALID_S8; } return idx; } @@ -7425,7 +7425,7 @@ static void DoTVShowSecretBaseSecrets(void) } break; default: - for (i = 0; i < 0xFFFF; i ++) + for (i = 0; i < INVALID_U16; i ++) { sTVSecretBaseSecretsRandomValues[1] = Random() % bitCount; if (sTVSecretBaseSecretsRandomValues[1] != sTVSecretBaseSecretsRandomValues[0]) @@ -7447,7 +7447,7 @@ static void DoTVShowSecretBaseSecrets(void) } else { - for (i = 0; i < 0xFFFF; i ++) + for (i = 0; i < INVALID_U16; i ++) { sTVSecretBaseSecretsRandomValues[2] = Random() % bitCount; if (sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[0] && sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[1]) diff --git a/src/unk_pokedex_area_screen_helper.c b/src/unk_pokedex_area_screen_helper.c index 6b88069bb..67fd52cb5 100644 --- a/src/unk_pokedex_area_screen_helper.c +++ b/src/unk_pokedex_area_screen_helper.c @@ -2,7 +2,7 @@ #include "main.h" #include "menu.h" #include "bg.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "unk_pokedex_area_screen_helper.h" diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 72c33100f..762019ecd 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -1,7 +1,7 @@ #include "global.h" #include "main.h" #include "pokeblock.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "pokenav.h" #include "scanline_effect.h" diff --git a/src/walda_phrase.c b/src/walda_phrase.c index ff2ee7399..44da22f31 100644 --- a/src/walda_phrase.c +++ b/src/walda_phrase.c @@ -176,7 +176,7 @@ static void sub_81D9C90(u8 *array, s32 arg1, s32 arg2) s32 i, j; u8 var1, var2; - for (i = arg2 - 1; i != -1; i--) + for (i = arg2 - 1; i != INVALID_S32; i--) { var1 = (array[0] & 0x80) >> 7; diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 9b3c70ad7..8fb7d08d6 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -4825,7 +4825,7 @@ static u16 GetCurrentMapWildMonHeaderId(void) for (i = 0; ; i++) { const struct WildPokemonHeader *wildHeader = &gWildMonHeaders[i]; - if (wildHeader->mapGroup == 0xFF) + if (wildHeader->mapGroup == INVALID_U8) break; if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup && @@ -4845,7 +4845,7 @@ static u16 GetCurrentMapWildMonHeaderId(void) } } - return -1; + return INVALID_S16; } static u8 PickWildMonNature(void) @@ -5079,7 +5079,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi return FALSE; headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == 0xFFFF) // invalid + if (headerId == INVALID_U16) { if (gMapHeader.mapLayoutId == 0x166) { @@ -5190,7 +5190,7 @@ void RockSmashWildEncounter(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != 0xFFFF) + if (headerId != INVALID_U16) { const struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerId].rockSmashMonsInfo; @@ -5222,7 +5222,7 @@ bool8 SweetScentWildEncounter(void) PlayerGetDestCoords(&x, &y); headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == 0xFFFF) // invalid + if (headerId == INVALID_U16) { if (gMapHeader.mapLayoutId == 0x166) { @@ -5292,7 +5292,7 @@ bool8 DoesCurrentMapHaveFishingMons(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != 0xFFFF && gWildMonHeaders[headerId].fishingMonsInfo != NULL) + if (headerId != INVALID_U16 && gWildMonHeaders[headerId].fishingMonsInfo != NULL) return TRUE; else return FALSE; @@ -5326,7 +5326,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon) *isWaterMon = FALSE; headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == 0xFFFF) + if (headerId == INVALID_U16) return SPECIES_NONE; landMonsInfo = gWildMonHeaders[headerId].landMonsInfo; waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; @@ -5358,7 +5358,7 @@ u16 GetLocalWaterMon(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != 0xFFFF) + if (headerId != INVALID_U16) { const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; diff --git a/src/window.c b/src/window.c index 8efd1c281..d5b996df1 100644 --- a/src/window.c +++ b/src/window.c @@ -1,6 +1,6 @@ #include "global.h" #include "window.h" -#include "malloc.h" +#include "alloc.h" #include "bg.h" #include "blit.h" @@ -52,12 +52,12 @@ bool16 InitWindows(const struct WindowTemplate *templates) gWindows[i].tileData = NULL; } - for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != 0xFF && i < 0x20; ++i, bgLayer = templates[i].bg) + for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != INVALID_U8 && i < 0x20; ++i, bgLayer = templates[i].bg) { if (gUnneededFireRedVariable == 1) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, templates[i].width * templates[i].height, 0); - if (allocatedBaseBlock == -1) + if (allocatedBaseBlock == INVALID_S32) return FALSE; } @@ -65,7 +65,7 @@ bool16 InitWindows(const struct WindowTemplate *templates) { attrib = GetBgAttribute(bgLayer, 0x8); - if (attrib != 0xFFFF) + if (attrib != INVALID_U16) { allocatedTilemapBuffer = AllocZeroed(attrib); @@ -121,12 +121,12 @@ u16 AddWindow(const struct WindowTemplate *template) for (win = 0; win < WINDOWS_MAX; ++win) { - if ((bgLayer = gWindows[win].window.bg) == 0xFF) + if ((bgLayer = gWindows[win].window.bg) == INVALID_U8) break; } if (win == WINDOWS_MAX) - return 0xFF; + return INVALID_U8; bgLayer = template->bg; allocatedBaseBlock = 0; @@ -135,20 +135,20 @@ u16 AddWindow(const struct WindowTemplate *template) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0); - if (allocatedBaseBlock == -1) - return 0xFF; + if (allocatedBaseBlock == INVALID_S32) + return INVALID_U8; } if (gUnknown_03002F70[bgLayer] == NULL) { attrib = GetBgAttribute(bgLayer, 0x8); - if (attrib != 0xFFFF) + if (attrib != INVALID_U16) { allocatedTilemapBuffer = AllocZeroed(attrib); if (allocatedTilemapBuffer == NULL) - return 0xFF; + return INVALID_U8; for (i = 0; i < attrib; ++i) allocatedTilemapBuffer[i] = 0; @@ -167,7 +167,7 @@ u16 AddWindow(const struct WindowTemplate *template) Free(gUnknown_03002F70[bgLayer]); gUnknown_03002F70[bgLayer] = allocatedTilemapBuffer; } - return 0xFF; + return INVALID_U8; } gWindows[win].tileData = allocatedTilemapBuffer; @@ -190,12 +190,12 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template) for (win = 0; win < WINDOWS_MAX; ++win) { - if (gWindows[win].window.bg == 0xFF) + if (gWindows[win].window.bg == INVALID_U8) break; } if (win == WINDOWS_MAX) - return 0xFF; + return INVALID_U8; bgLayer = template->bg; allocatedBaseBlock = 0; @@ -204,8 +204,8 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0); - if (allocatedBaseBlock == -1) - return 0xFF; + if (allocatedBaseBlock == INVALID_S32) + return INVALID_U8; } gWindows[win].window = *template; @@ -609,21 +609,21 @@ u16 AddWindow8Bit(struct WindowTemplate *template) for (windowId = 0; windowId < 32; windowId++) { - if (gWindows[windowId].window.bg == 0xFF) + if (gWindows[windowId].window.bg == INVALID_U8) break; } if (windowId == WINDOWS_MAX) - return 0xFF; + return INVALID_U8; bgLayer = template->bg; if (gUnknown_03002F70[bgLayer] == 0) { u16 attribute = GetBgAttribute(bgLayer, 8); - if (attribute != 0xFFFF) + if (attribute != INVALID_U16) { s32 i; memAddress = Alloc(attribute); if (memAddress == NULL) - return 0xFF; + return INVALID_U8; for (i = 0; i < attribute; i++) // if we're going to zero out the memory anyway, why not call AllocZeroed? memAddress[i] = 0; gUnknown_03002F70[bgLayer] = memAddress; @@ -638,7 +638,7 @@ u16 AddWindow8Bit(struct WindowTemplate *template) Free(gUnknown_03002F70[bgLayer]); gUnknown_03002F70[bgLayer] = NULL; } - return 0xFF; + return INVALID_U8; } else { diff --git a/sym_bss.txt b/sym_bss.txt index d006e1364..996187c26 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -1,5 +1,5 @@ .include "src/main.o" - .include "src/malloc.o" + .include "src/alloc.o" .include "src/dma3_manager.o" .include "src/gpu_regs.o" .include "src/bg.o" -- cgit v1.2.3 From 405f1bb529809b8169364737087189df0fcca1d2 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Thu, 29 Nov 2018 19:52:18 +0800 Subject: Fix sym_ indentation --- sym_bss.txt | 6 +-- sym_common.txt | 130 ++++++++++++++++++++++++++++----------------------------- sym_ewram.txt | 126 +++++++++++++++++++++++++++---------------------------- 3 files changed, 131 insertions(+), 131 deletions(-) diff --git a/sym_bss.txt b/sym_bss.txt index 996187c26..fe0648e34 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -5,9 +5,9 @@ .include "src/bg.o" .include "src/text.o" .include "src/sprite.o" - .include "src/link.o" - .include "src/link_rfu.o" - .include "src/rom_8011DC0.o" + .include "src/link.o" + .include "src/link_rfu.o" + .include "src/rom_8011DC0.o" .include "src/rtc.o" .include "src/main_menu.o" .include "src/rom_8034C54.o" diff --git a/sym_common.txt b/sym_common.txt index 20d87f877..e8d1654c0 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -1,125 +1,125 @@ - .space 0x8 - .include "main.o" - .include "bg.o" - .include "window.o" - .include "text.o" - .include "sprite.o" - .include "link.o" - .include "link_rfu.o" - .include "rtc.o" - .include "battle_main.o" - .include "random.o" - .include "load_save.o" - .include "berry_blender.o" - .include "overworld.o" - .include "fieldmap.o" - .include "field_camera.o" - .include "field_control_avatar.o" - .include "start_menu.o" - .include "sound.o" - .include "task.o" - .include "trainer_see.o" - .include "pokedex.o" - .include "contest.o" - .include "tv.o" - .include "mauville_old_man.o" + .space 0x8 + .include "main.o" + .include "bg.o" + .include "window.o" + .include "text.o" + .include "sprite.o" + .include "link.o" + .include "link_rfu.o" + .include "rtc.o" + .include "battle_main.o" + .include "random.o" + .include "load_save.o" + .include "berry_blender.o" + .include "overworld.o" + .include "fieldmap.o" + .include "field_camera.o" + .include "field_control_avatar.o" + .include "start_menu.o" + .include "sound.o" + .include "task.o" + .include "trainer_see.o" + .include "pokedex.o" + .include "contest.o" + .include "tv.o" + .include "mauville_old_man.o" gUnknown_03006164: @ 3006164 - .space 0x4 + .space 0x4 gUnknown_03006168: @ 3006168 - .space 0x4 + .space 0x4 gUnknown_0300616C: @ 300616C - .space 0x4 + .space 0x4 gUnknown_03006170: @ 3006170 - .space 0x4 + .space 0x4 gUnknown_03006174: @ 3006174 - .space 0x4 + .space 0x4 gUnknown_03006178: @ 3006178 - .space 0x4 + .space 0x4 gUnknown_0300617C: @ 300617C - .space 0x4 + .space 0x4 gUnknown_03006180: @ 3006180 - .space 0x4 + .space 0x4 gUnknown_03006184: @ 3006184 - .space 0x4 + .space 0x4 gUnknown_03006188: @ 3006188 - .space 0x8 + .space 0x8 gUnknown_03006190: @ 3006190 - .space 0x10 + .space 0x10 gUnknown_030061A0: @ 30061A0 - .space 0x20 + .space 0x20 gUnknown_030061C0: @ 30061C0 - .space 0x4 + .space 0x4 gUnknown_030061C4: @ 30061C4 - .space 0xC + .space 0xC - .include "field_specials.o" + .include "field_specials.o" gCB2_AfterEvolution: @ 30061E8 - .space 0x4 + .space 0x4 gDexCryScreenState: @ 30061EC - .space 0x4 + .space 0x4 - .include "save.o" - .include "battle_tower.o" - .include "intro.o" + .include "save.o" + .include "battle_tower.o" + .include "intro.o" gUnknown_030062DC: @ 30062DC - .space 0x4 + .space 0x4 gUnknown_030062E0: @ 30062E0 - .space 0x4 + .space 0x4 gUnknown_030062E4: @ 30062E4 - .space 0x4 + .space 0x4 - .include "battle_factory_screen.o" - .include "apprentice.o" - - .space 0x8 - - .include "list_menu.o" + .include "battle_factory_screen.o" + .include "apprentice.o" + + .space 0x8 + + .include "list_menu.o" gUnknown_03006328: @ 3006328 - .space 0x48 + .space 0x48 gUnknown_03006370: @ 3006370 - .space 0x10 + .space 0x10 - .include "m4a_2.o" - .include "agb_flash.o" + .include "m4a_2.o" + .include "agb_flash.o" gRfuState: @ 3007868 - .space 0x8 + .space 0x8 gUnknown_03007870: @ 3007870 - .space 0x10 + .space 0x10 gUnknown_03007880: @ 3007880 - .space 0x10 + .space 0x10 gUnknown_03007890: @ 3007890 - .space 0x4 + .space 0x4 gUnknown_03007894: @ 3007894 - .space 0x4 + .space 0x4 gUnknown_03007898: @ 3007898 - .space 0x8 + .space 0x8 gUnknown_030078A0: @ 30078A0 - .space 0xC + .space 0xC diff --git a/sym_ewram.txt b/sym_ewram.txt index 19146b72d..af6480536 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1,8 +1,8 @@ - .include "src/decompress.o" + .include "src/decompress.o" .include "src/main.o" - .include "src/window.o" - .include "src/text.o" - .include "src/sprite.o" + .include "src/window.o" + .include "src/text.o" + .include "src/sprite.o" .include "src/string_util.o" .include "src/link.o" .include "src/link_rfu.o" @@ -110,7 +110,7 @@ gUnknown_02022D00: @ 2022D00 .include "src/pokemon.o" .include "src/random.o" .include "src/daycare.o" - .include "src/load_save.o" + .include "src/load_save.o" gUnknown_02032184: @ 2032184 .space 0x4 @@ -129,29 +129,29 @@ gUnknown_0203229C: @ 203229C gUnknown_020322A0: @ 20322A0 .space 0x4 - - .include "src/berry_blender.o" - .include "src/new_game.o" + + .include "src/berry_blender.o" + .include "src/new_game.o" .include "src/overworld.o" .include "src/fieldmap.o" .include "src/field_camera.o" .include "src/field_player_avatar.o" - .include "src/event_object_movement.o" - .include "src/field_message_box.o" + .include "src/event_object_movement.o" + .include "src/field_message_box.o" - .align 2 + .align 2 gUnknown_020375C0: @ 20375C0 .space 0x4 - .include "src/scrcmd.o" - .include "src/field_control_avatar.o" - .include "src/event_data.o" - .include "src/start_menu.o" + .include "src/scrcmd.o" + .include "src/field_control_avatar.o" + .include "src/event_data.o" + .include "src/start_menu.o" .include "src/tileset_anims.o" .include "src/palette.o" - .include "src/sound.o" - .include "src/battle_anim.o" - .include "src/battle_anim_80A5C6C.o" + .include "src/sound.o" + .include "src/battle_anim.o" + .include "src/battle_anim_80A5C6C.o" .space 0xC gUnknown_02038454: @ 2038454 @@ -174,11 +174,11 @@ gUnknown_02038BC6: @ 2038BC6 .include "src/battle_setup.o" .include "src/trainer_see.o" - .include "src/wild_encounter.o" - .include "src/field_effect.o" - .include "src/scanline_effect.o" - .include "src/option_menu.o" - .include "src/pokedex.o" + .include "src/wild_encounter.o" + .include "src/field_effect.o" + .include "src/scanline_effect.o" + .include "src/option_menu.o" + .include "src/pokedex.o" gTrainerCards: @ 2039B58 .space 0x14 @@ -283,20 +283,20 @@ gUnknown_02039F5C: @ 2039F5C gUnknown_02039F5D: @ 2039F5D .space 0x3 - .include "src/shop.o" - .include "src/fldeff_escalator.o" - .include "src/script_menu.o" - .include "src/naming_screen.o" - .include "src/money.o" - .include "src/record_mixing.o" - .include "src/secret_base.o" - .include "src/tv.o" + .include "src/shop.o" + .include "src/fldeff_escalator.o" + .include "src/script_menu.o" + .include "src/naming_screen.o" + .include "src/money.o" + .include "src/record_mixing.o" + .include "src/secret_base.o" + .include "src/tv.o" gUnknown_0203A034: @ 203A034 .space 0x4 - .include "src/rotating_gate.o" - .include "src/safari_zone.o" + .include "src/rotating_gate.o" + .include "src/safari_zone.o" gUnknown_0203A0F4: @ 203A0F4 .space 0x4 @@ -323,13 +323,13 @@ gUnknown_0203A120: @ 203A120 .include "src/mon_markings.o" .include "src/mauville_old_man.o" - .include "src/mail.o" - .include "src/menu_helpers.o" + .include "src/mail.o" + .include "src/menu_helpers.o" .include "src/region_map.o" - .include "src/decoration.o" - .include "src/slot_machine.o" - .include "src/battle_ai_script_commands.o" - + .include "src/decoration.o" + .include "src/slot_machine.o" + .include "src/battle_ai_script_commands.o" + .align 2 gPlayerFacingPosition: @ 203AB40 .space 0x8 @@ -347,9 +347,9 @@ gUnknown_0203AB8C: @ 203AB8C .space 0x4 .include "src/pokedex_cry_screen.o" - .include "src/coins.o" - .include "src/battle_transition.o" - .include "src/battle_message.o" + .include "src/coins.o" + .include "src/battle_transition.o" + .include "src/battle_message.o" gUnknown_0203ABAC: @ 203ABAC .space 0x4 @@ -372,8 +372,8 @@ gUnknown_0203ABB4: @ 203ABB4 gUnknown_0203ABB5: @ 203ABB5 .space 0x3 - .include "src/rom_81520A8.o" - .include "src/save.o" + .include "src/rom_81520A8.o" + .include "src/save.o" .include "src/mystery_event_script.o" .include "src/learn_move.o" .include "src/decoration_inventory.o" @@ -383,20 +383,20 @@ gUnknown_0203ABB5: @ 203ABB5 .include "src/player_pc.o" .include "src/intro.o" .include "src/field_region_map.o" - .include "src/hall_of_fame.o" - .include "src/credits.o" - .include "src/lottery_corner.o" - .include "src/diploma.o" - .include "src/berry_tag_screen.o" - .include "src/mystery_event_menu.o" - .include "src/save_failed_screen.o" - .include "src/braille_puzzles.o" + .include "src/hall_of_fame.o" + .include "src/credits.o" + .include "src/lottery_corner.o" + .include "src/diploma.o" + .include "src/berry_tag_screen.o" + .include "src/mystery_event_menu.o" + .include "src/save_failed_screen.o" + .include "src/braille_puzzles.o" .include "src/pokeblock_feed.o" .include "src/intro_credits_graphics.o" - .include "src/recorded_battle.o" - .include "src/trainer_pokemon_sprites.o" - .include "src/lilycove_lady.o" - .include "src/battle_dome.o" + .include "src/recorded_battle.o" + .include "src/trainer_pokemon_sprites.o" + .include "src/lilycove_lady.o" + .include "src/battle_dome.o" gUnknown_0203CD80: @ 203CD80 .space 0x8 @@ -404,13 +404,13 @@ gUnknown_0203CD80: @ 203CD80 gUnknown_0203CD88: @ 203CD88 .space 0x4 - .include "src/menu.o" - .include "src/battle_factory_screen.o" - .include "src/mossdeep_gym.o" - .include "src/item_menu.o" - .include "src/list_menu.o" - .include "src/dynamic_placeholder_text_util.o" - .include "src/item_icon.o" + .include "src/menu.o" + .include "src/battle_factory_screen.o" + .include "src/mossdeep_gym.o" + .include "src/item_menu.o" + .include "src/list_menu.o" + .include "src/dynamic_placeholder_text_util.o" + .include "src/item_icon.o" gUnknown_0203CEC4: @ 203CEC4 .space 0x4 -- cgit v1.2.3 From f9ff7316d5c7277eb7482e30121388cd65f4ecfc Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Wed, 5 Dec 2018 22:31:01 +0800 Subject: Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs --- include/global.h | 8 - src/apprentice.c | 328 +- src/bard_music.c | 2 +- src/battle_ai_script_commands.c | 24 +- src/battle_ai_switch_items.c | 8 +- src/battle_anim.c | 144 +- src/battle_anim_80A5C6C.c | 2 +- src/battle_anim_80A9C70.c | 10 +- src/battle_anim_sound_tasks.c | 90 +- src/battle_anim_utility_funcs.c | 2 +- src/battle_arena.c | 2 +- src/battle_controller_link_opponent.c | 4 +- src/battle_controller_link_partner.c | 4 +- src/battle_controller_opponent.c | 4 +- src/battle_controller_player.c | 8 +- src/battle_controller_player_partner.c | 6 +- src/battle_controller_recorded_opponent.c | 4 +- src/battle_controller_recorded_player.c | 4 +- src/battle_controller_wally.c | 2 +- src/battle_controllers.c | 2 +- src/battle_dome.c | 1306 +- src/battle_factory.c | 4 +- src/battle_gfx_sfx_util.c | 2 +- src/battle_interface.c | 448 +- src/battle_main.c | 172 +- src/battle_message.c | 1148 +- src/battle_pike.c | 4 +- src/battle_pyramid.c | 2 +- src/battle_pyramid_bag.c | 36 +- src/battle_script_commands.c | 234 +- src/battle_setup.c | 20 +- src/battle_tent.c | 2 +- src/battle_tower.c | 10 +- src/battle_transition.c | 48 +- src/battle_tv.c | 614 +- src/battle_util.c | 20 +- src/berry_blender.c | 4 +- src/bg.c | 36 +- src/blit.c | 6 +- src/braille_puzzles.c | 2 +- src/cable_club.c | 6 +- src/contest.c | 16 +- src/contest_effect.c | 28 +- src/data/contest_moves.h | 6000 +++--- .../event_object_graphics_info_pointers.h | 492 +- .../field_event_obj/movement_action_func_tables.h | 1216 +- src/data/graphics/items.h | 2 +- src/data/pokemon_graphics/back_pic_coordinates.h | 2642 ++- src/data/pokemon_graphics/enemy_mon_elevation.h | 826 +- src/data/pokemon_graphics/front_pic_coordinates.h | 2642 ++- src/data/text/item_descriptions.h | 2 +- src/data/text/move_descriptions.h | 1418 +- src/data/trainer_parties.h | 19750 +++++++++---------- src/daycare.c | 16 +- src/decompress.c | 594 +- src/decoration.c | 14 +- src/event_object_movement.c | 826 +- src/evolution_scene.c | 4 +- src/field_control_avatar.c | 6 +- src/field_door.c | 2 +- src/field_effect.c | 22 +- src/field_effect_helpers.c | 18 +- src/field_message_box.c | 2 +- src/field_player_avatar.c | 2 +- src/field_specials.c | 52 +- src/fieldmap.c | 4 +- src/fldeff_cut.c | 2 +- src/fldeff_groundshake.c | 2 +- src/fossil_specials.c | 198 +- src/frontier_util.c | 12 +- src/gpu_regs.c | 210 +- src/ground.c | 2 +- src/hall_of_fame.c | 42 +- src/intro.c | 4 +- src/intro_credits_graphics.c | 2 +- src/item.c | 268 +- src/item_icon.c | 2 +- src/item_menu.c | 36 +- src/item_menu_icons.c | 8 +- src/landmark.c | 4 +- src/learn_move.c | 18 +- src/librfu_rfu.c | 2 +- src/librfu_stwi.c | 2 +- src/link.c | 4 +- src/link_rfu.c | 34 +- src/list_menu.c | 38 +- src/mail_data.c | 18 +- src/main_menu.c | 38 +- src/mauville_old_man.c | 6 +- src/menu.c | 488 +- src/metatile_behavior.c | 480 +- src/naming_screen.c | 2 +- src/new_game.c | 16 +- src/overworld.c | 60 +- src/palette.c | 2 +- src/pokeblock.c | 10 +- src/pokeblock_feed.c | 50 +- src/pokedex.c | 749 +- src/pokedex_area_screen.c | 2 +- src/pokemon.c | 60 +- src/pokemon_animation.c | 178 +- src/pokemon_icon.c | 6 +- src/pokemon_size_record.c | 2 +- src/pokemon_storage_system.c | 4 +- src/pokemon_summary_screen.c | 58 +- src/rayquaza_scene.c | 14 +- src/record_mixing.c | 4 +- src/recorded_battle.c | 2 +- src/reset_rtc_screen.c | 2 +- src/rock.c | 2 +- src/rom_8011DC0.c | 16 +- src/rom_8034C54.c | 6 +- src/rotating_gate.c | 4 +- src/rtc.c | 10 +- src/safari_zone.c | 6 +- src/save.c | 50 +- src/save_location.c | 8 +- src/scanline_effect.c | 8 +- src/scrcmd.c | 10 +- src/script.c | 12 +- src/script_menu.c | 28 +- src/script_movement.c | 8 +- src/script_pokemon_util_80F87D8.c | 4 +- src/secret_base.c | 6 +- src/shop.c | 20 +- src/slot_machine.c | 146 +- src/smokescreen.c | 2 +- src/sound.c | 4 +- src/sprite.c | 64 +- src/strings.c | 36 +- src/task.c | 4 +- src/text.c | 4 +- src/title_screen.c | 16 +- src/trader.c | 2 +- src/trainer_pokemon_sprites.c | 40 +- src/trainer_see.c | 22 +- src/tv.c | 110 +- src/walda_phrase.c | 2 +- src/wild_encounter.c | 6444 +++--- src/window.c | 38 +- 140 files changed, 27722 insertions(+), 23929 deletions(-) diff --git a/include/global.h b/include/global.h index 1bca4c344..cc8df049f 100644 --- a/include/global.h +++ b/include/global.h @@ -25,14 +25,6 @@ #define INCBIN_S32 {0} #endif // IDE support -// Invalid / Out of Bound Placeholder values -#define INVALID_U8 0xFF -#define INVALID_U16 0xFFFF -#define INVALID_U32 0xFFFFFFFF -#define INVALID_S8 -1 -#define INVALID_S16 -1 -#define INVALID_S32 -1 - #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0])) #define SWAP(a, b, temp) \ diff --git a/src/apprentice.c b/src/apprentice.c index faed3756c..ec8fea27b 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1079,7 +1079,7 @@ void ResetApprenticeStruct(struct Apprentice *apprentice) u8 i; for (i = 0; i < 6; i++) - apprentice->easyChatWords[i] |= INVALID_U16; + apprentice->easyChatWords[i] |= 0xFFFF; apprentice->playerName[0] = EOS; apprentice->id = 16; @@ -1093,7 +1093,7 @@ void ResetAllApprenticeData(void) for (i = 0; i < 4; i++) { for (j = 0; j < 6; j++) - gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= INVALID_U16; + gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= 0xFFFF; gSaveBlock2Ptr->apprentices[i].id = 16; gSaveBlock2Ptr->apprentices[i].playerName[0] = EOS; gSaveBlock2Ptr->apprentices[i].lvlMode = 0; @@ -1290,7 +1290,7 @@ static u16 sub_819FF98(u8 arg0) else level = 60; - for (j = 0; learnset[j] != INVALID_U16; j++) + for (j = 0; learnset[j] != 0xFFFF; j++) { if ((learnset[j] & 0xFE00) > (level << 9)) break; @@ -1393,7 +1393,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves) level = 60; learnset = gLevelUpLearnsets[species]; - for (i = 0; learnset[i] != INVALID_U16; i++) + for (i = 0; learnset[i] != 0xFFFF; i++) { if ((learnset[i] & 0xFE00) > (level << 9)) break; @@ -2047,172 +2047,172 @@ NAKED static void sub_81A1224(void) { asm_unified("\n\ - push {r4-r7,lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6,r7}\n\ - ldr r1, =gSaveBlock2Ptr\n\ - ldr r3, [r1]\n\ - adds r0, r3, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - adds r7, r1, 0\n\ - cmp r0, 0x2\n\ - bhi _081A1242\n\ - b _081A1362\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + ldr r1, =gSaveBlock2Ptr\n\ + ldr r3, [r1]\n\ + adds r0, r3, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + adds r7, r1, 0\n\ + cmp r0, 0x2\n\ + bhi _081A1242\n\ + b _081A1362\n\ _081A1242:\n\ - movs r5, 0\n\ - movs r2, 0\n\ - adds r0, r3, 0\n\ - adds r0, 0xB8\n\ - ldrb r0, [r0]\n\ - lsls r0, 30\n\ - ldr r1, =gSpecialVar_0x8005\n\ - mov r12, r1\n\ - ldr r1, =gSpecialVar_Result\n\ - mov r8, r1\n\ - cmp r0, 0\n\ - beq _081A127C\n\ - adds r3, r7, 0\n\ + movs r5, 0\n\ + movs r2, 0\n\ + adds r0, r3, 0\n\ + adds r0, 0xB8\n\ + ldrb r0, [r0]\n\ + lsls r0, 30\n\ + ldr r1, =gSpecialVar_0x8005\n\ + mov r12, r1\n\ + ldr r1, =gSpecialVar_Result\n\ + mov r8, r1\n\ + cmp r0, 0\n\ + beq _081A127C\n\ + adds r3, r7, 0\n\ _081A125C:\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - cmp r2, 0x8\n\ - bhi _081A127C\n\ - ldr r0, [r3]\n\ - lsls r1, r2, 2\n\ - adds r0, r1\n\ - adds r0, 0xB8\n\ - ldrb r0, [r0]\n\ - lsls r0, 30\n\ - cmp r0, 0\n\ - bne _081A125C\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + cmp r2, 0x8\n\ + bhi _081A127C\n\ + ldr r0, [r3]\n\ + lsls r1, r2, 2\n\ + adds r0, r1\n\ + adds r0, 0xB8\n\ + ldrb r0, [r0]\n\ + lsls r0, 30\n\ + cmp r0, 0\n\ + bne _081A125C\n\ _081A127C:\n\ - movs r4, 0\n\ - cmp r4, r5\n\ - bcs _081A1322\n\ - ldr r0, [r7]\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - cmp r4, r0\n\ - bge _081A1322\n\ - adds r6, r7, 0\n\ - mov r9, r4\n\ + movs r4, 0\n\ + cmp r4, r5\n\ + bcs _081A1322\n\ + ldr r0, [r7]\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + cmp r4, r0\n\ + bge _081A1322\n\ + adds r6, r7, 0\n\ + mov r9, r4\n\ _081A1296:\n\ - ldr r3, [r6]\n\ - lsls r0, r4, 2\n\ - adds r2, r3, r0\n\ - adds r0, r2, 0\n\ - adds r0, 0xB8\n\ - ldrb r1, [r0]\n\ - lsls r0, r1, 30\n\ - lsrs r0, 30\n\ - cmp r0, 0x1\n\ - bne _081A1308\n\ - lsrs r0, r1, 6\n\ - cmp r0, 0\n\ - beq _081A1308\n\ - adds r0, r2, 0\n\ - adds r0, 0xBA\n\ - ldrh r0, [r0]\n\ - mov r2, r12\n\ - ldrh r2, [r2]\n\ - cmp r0, r2\n\ - bne _081A1308\n\ - adds r0, r3, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - lsls r0, 2\n\ - adds r0, r3, r0\n\ - adds r0, 0xB8\n\ - ldrb r2, [r0]\n\ - movs r1, 0x3F\n\ - ands r1, r2\n\ - strb r1, [r0]\n\ - ldr r1, [r6]\n\ - adds r0, r1, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - lsls r0, 2\n\ - adds r1, r0\n\ - mov r2, r12\n\ - ldrh r0, [r2]\n\ - adds r1, 0xBA\n\ - strh r0, [r1]\n\ - mov r1, r9\n\ - mov r0, r8\n\ - strh r1, [r0]\n\ - b _081A1362\n\ - .pool\n\ + ldr r3, [r6]\n\ + lsls r0, r4, 2\n\ + adds r2, r3, r0\n\ + adds r0, r2, 0\n\ + adds r0, 0xB8\n\ + ldrb r1, [r0]\n\ + lsls r0, r1, 30\n\ + lsrs r0, 30\n\ + cmp r0, 0x1\n\ + bne _081A1308\n\ + lsrs r0, r1, 6\n\ + cmp r0, 0\n\ + beq _081A1308\n\ + adds r0, r2, 0\n\ + adds r0, 0xBA\n\ + ldrh r0, [r0]\n\ + mov r2, r12\n\ + ldrh r2, [r2]\n\ + cmp r0, r2\n\ + bne _081A1308\n\ + adds r0, r3, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + lsls r0, 2\n\ + adds r0, r3, r0\n\ + adds r0, 0xB8\n\ + ldrb r2, [r0]\n\ + movs r1, 0x3F\n\ + ands r1, r2\n\ + strb r1, [r0]\n\ + ldr r1, [r6]\n\ + adds r0, r1, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + lsls r0, 2\n\ + adds r1, r0\n\ + mov r2, r12\n\ + ldrh r0, [r2]\n\ + adds r1, 0xBA\n\ + strh r0, [r1]\n\ + mov r1, r9\n\ + mov r0, r8\n\ + strh r1, [r0]\n\ + b _081A1362\n\ + .pool\n\ _081A1308:\n\ - adds r0, r4, 0x1\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - cmp r4, r5\n\ - bcs _081A1322\n\ - ldr r0, [r6]\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - cmp r4, r0\n\ - blt _081A1296\n\ + adds r0, r4, 0x1\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, r5\n\ + bcs _081A1322\n\ + ldr r0, [r6]\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + cmp r4, r0\n\ + blt _081A1296\n\ _081A1322:\n\ - ldr r2, [r7]\n\ - adds r0, r2, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - lsls r0, 2\n\ - adds r2, r0\n\ - adds r2, 0xB8\n\ - ldrb r1, [r2]\n\ - movs r0, 0x3F\n\ - ands r0, r1\n\ - movs r1, 0x40\n\ - orrs r0, r1\n\ - strb r0, [r2]\n\ - ldr r1, [r7]\n\ - adds r0, r1, 0\n\ - adds r0, 0xB1\n\ - ldrb r0, [r0]\n\ - lsls r0, 26\n\ - lsrs r0, 28\n\ - subs r0, 0x3\n\ - lsls r0, 2\n\ - adds r1, r0\n\ - mov r2, r12\n\ - ldrh r0, [r2]\n\ - adds r1, 0xBA\n\ - strh r0, [r1]\n\ - movs r0, 0x1\n\ - mov r1, r8\n\ - strh r0, [r1]\n\ + ldr r2, [r7]\n\ + adds r0, r2, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + lsls r0, 2\n\ + adds r2, r0\n\ + adds r2, 0xB8\n\ + ldrb r1, [r2]\n\ + movs r0, 0x3F\n\ + ands r0, r1\n\ + movs r1, 0x40\n\ + orrs r0, r1\n\ + strb r0, [r2]\n\ + ldr r1, [r7]\n\ + adds r0, r1, 0\n\ + adds r0, 0xB1\n\ + ldrb r0, [r0]\n\ + lsls r0, 26\n\ + lsrs r0, 28\n\ + subs r0, 0x3\n\ + lsls r0, 2\n\ + adds r1, r0\n\ + mov r2, r12\n\ + ldrh r0, [r2]\n\ + adds r1, 0xBA\n\ + strh r0, [r1]\n\ + movs r0, 0x1\n\ + mov r1, r8\n\ + strh r0, [r1]\n\ _081A1362:\n\ - pop {r3,r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ "); } #endif // NONMATCHING @@ -2236,7 +2236,7 @@ static void sub_81A1370(void) } r10 = 0xFFFF; - r9 = INVALID_S32; + r9 = -1; for (i = 1; i < 4; i++) { if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId) diff --git a/src/bard_music.c b/src/bard_music.c index 4c28233c2..6c2578071 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -54,7 +54,7 @@ void GetWordPhonemes(struct BardSong *song, u16 word) for (i = 0; i < 6; i ++) { sound = &song->sound[i]; - if (sound->var00 != INVALID_U8) + if (sound->var00 != 0xFF) { song->phonemes[i].length = sound->var01 + gBardSoundLengthTable[sound->var00]; song->phonemes[i].pitch = CalcWordPitch(word + 30, i); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e6c089b1b..687d81419 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -276,7 +276,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = EFFECT_SUPERPOWER, EFFECT_ERUPTION, EFFECT_OVERHEAT, - INVALID_U16 + 0xFFFF }; // code @@ -463,8 +463,8 @@ static u8 ChooseMoveOrAction_Doubles(void) { if (i == sBattler_AI || gBattleMons[i].hp == 0) { - actionOrMoveIndex[i] = INVALID_U8; - bestMovePointsForTarget[i] = INVALID_S16 ; + actionOrMoveIndex[i] = 0xFF; + bestMovePointsForTarget[i] = -1 ; } else { @@ -530,7 +530,7 @@ static u8 ChooseMoveOrAction_Doubles(void) // Don't use a move against ally if it has less than 100 points. if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100) { - bestMovePointsForTarget[i] = INVALID_S16; + bestMovePointsForTarget[i] = -1; mostViableMovesScores[0] = mostViableMovesScores[0]; // Needed to match. } } @@ -1003,7 +1003,7 @@ static void BattleAICmd_if_in_bytes(void) { const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != INVALID_U8) + while (*ptr != 0xFF) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1019,7 +1019,7 @@ static void BattleAICmd_if_not_in_bytes(void) { const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != INVALID_U8) + while (*ptr != 0xFF) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1035,7 +1035,7 @@ static void BattleAICmd_if_in_hwords(void) { const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != INVALID_U16) + while (*ptr != 0xFFFF) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1051,7 +1051,7 @@ static void BattleAICmd_if_not_in_hwords(void) { const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1); - while (*ptr != INVALID_U16) + while (*ptr != 0xFFFF) { if (AI_THINKING_STRUCT->funcResult == *ptr) { @@ -1167,14 +1167,14 @@ static void BattleAICmd_get_how_powerful_move_is(void) s32 i, checkedMove; s32 moveDmgs[4]; - for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++) + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) { if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == sDiscouragedPowerfulMoveEffects[i]) break; } if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power > 1 - && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16) + && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF) { gDynamicBasePower = 0; *(&gBattleStruct->dynamicMoveType) = 0; @@ -1184,14 +1184,14 @@ static void BattleAICmd_get_how_powerful_move_is(void) for (checkedMove = 0; checkedMove < 4; checkedMove++) { - for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++) + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) { if (gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i]) break; } if (gBattleMons[sBattler_AI].moves[checkedMove] != MOVE_NONE - && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16 + && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF && gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].power > 1) { gCurrentMove = gBattleMons[sBattler_AI].moves[checkedMove]; diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index d6a8e1336..ad25b483c 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -126,7 +126,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) return FALSE; if (gLastLandedMoves[gActiveBattler] == 0) return FALSE; - if (gLastLandedMoves[gActiveBattler] == INVALID_U16) + if (gLastLandedMoves[gActiveBattler] == 0xFFFF) return FALSE; if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0) return FALSE; @@ -221,7 +221,7 @@ static bool8 ShouldSwitchIfNaturalCure(void) if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 2) return FALSE; - if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == INVALID_U16) && Random() & 1) + if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1) { *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); @@ -331,9 +331,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) if (gLastLandedMoves[gActiveBattler] == 0) return FALSE; - if (gLastLandedMoves[gActiveBattler] == INVALID_U16) + if (gLastLandedMoves[gActiveBattler] == 0xFFFF) return FALSE; - if (gLastHitBy[gActiveBattler] == INVALID_U8) + if (gLastHitBy[gActiveBattler] == 0xFF) return FALSE; if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0) return FALSE; diff --git a/src/battle_anim.c b/src/battle_anim.c index 68ffed834..95c6f7b3c 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1386,54 +1386,54 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] = static void (* const sScriptCmdTable[])(void) = { - ScriptCmd_loadspritegfx, - ScriptCmd_unloadspritegfx, - ScriptCmd_createsprite, - ScriptCmd_createvisualtask, - ScriptCmd_delay, - ScriptCmd_waitforvisualfinish, - ScriptCmd_hang1, - ScriptCmd_hang2, - ScriptCmd_end, - ScriptCmd_playse, - ScriptCmd_monbg, - ScriptCmd_clearmonbg, - ScriptCmd_setalpha, - ScriptCmd_blendoff, - ScriptCmd_call, - ScriptCmd_return, - ScriptCmd_setarg, - ScriptCmd_choosetwoturnanim, - ScriptCmd_jumpifmoveturn, - ScriptCmd_goto, - ScriptCmd_fadetobg, - ScriptCmd_restorebg, - ScriptCmd_waitbgfadeout, - ScriptCmd_waitbgfadein, - ScriptCmd_changebg, - ScriptCmd_playsewithpan, - ScriptCmd_setpan, - ScriptCmd_panse_1B, - ScriptCmd_loopsewithpan, - ScriptCmd_waitplaysewithpan, - ScriptCmd_setbldcnt, - ScriptCmd_createsoundtask, - ScriptCmd_waitsound, - ScriptCmd_jumpargeq, - ScriptCmd_monbg_22, - ScriptCmd_clearmonbg_23, - ScriptCmd_jumpifcontest, - ScriptCmd_fadetobgfromset, - ScriptCmd_panse_26, - ScriptCmd_panse_27, - ScriptCmd_monbgprio_28, - ScriptCmd_monbgprio_29, - ScriptCmd_monbgprio_2A, - ScriptCmd_invisible, - ScriptCmd_visible, - ScriptCmd_doublebattle_2D, - ScriptCmd_doublebattle_2E, - ScriptCmd_stopsound + ScriptCmd_loadspritegfx, + ScriptCmd_unloadspritegfx, + ScriptCmd_createsprite, + ScriptCmd_createvisualtask, + ScriptCmd_delay, + ScriptCmd_waitforvisualfinish, + ScriptCmd_hang1, + ScriptCmd_hang2, + ScriptCmd_end, + ScriptCmd_playse, + ScriptCmd_monbg, + ScriptCmd_clearmonbg, + ScriptCmd_setalpha, + ScriptCmd_blendoff, + ScriptCmd_call, + ScriptCmd_return, + ScriptCmd_setarg, + ScriptCmd_choosetwoturnanim, + ScriptCmd_jumpifmoveturn, + ScriptCmd_goto, + ScriptCmd_fadetobg, + ScriptCmd_restorebg, + ScriptCmd_waitbgfadeout, + ScriptCmd_waitbgfadein, + ScriptCmd_changebg, + ScriptCmd_playsewithpan, + ScriptCmd_setpan, + ScriptCmd_panse_1B, + ScriptCmd_loopsewithpan, + ScriptCmd_waitplaysewithpan, + ScriptCmd_setbldcnt, + ScriptCmd_createsoundtask, + ScriptCmd_waitsound, + ScriptCmd_jumpargeq, + ScriptCmd_monbg_22, + ScriptCmd_clearmonbg_23, + ScriptCmd_jumpifcontest, + ScriptCmd_fadetobgfromset, + ScriptCmd_panse_26, + ScriptCmd_panse_27, + ScriptCmd_monbgprio_28, + ScriptCmd_monbgprio_29, + ScriptCmd_monbgprio_2A, + ScriptCmd_invisible, + ScriptCmd_visible, + ScriptCmd_doublebattle_2D, + ScriptCmd_doublebattle_2E, + ScriptCmd_stopsound }; // code @@ -1452,14 +1452,14 @@ void ClearBattleAnimationVars(void) // Clear index array. for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) - sAnimSpriteIndexArray[i] |= INVALID_U16; + sAnimSpriteIndexArray[i] |= 0xFFFF; // Clear anim args. for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; - sMonAnimTaskIdArray[0] = INVALID_U8; - sMonAnimTaskIdArray[1] = INVALID_U8; + sMonAnimTaskIdArray[0] = 0xFF; + sMonAnimTaskIdArray[1] = 0xFF; gAnimMoveTurn = 0; sAnimBackgroundFadeState = 0; sAnimMoveIndex = 0; @@ -1505,19 +1505,19 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; - sMonAnimTaskIdArray[0] = INVALID_U8; - sMonAnimTaskIdArray[1] = INVALID_U8; + sMonAnimTaskIdArray[0] = 0xFF; + sMonAnimTaskIdArray[1] = 0xFF; sBattleAnimScriptPtr = animsTable[tableId]; gAnimScriptActive = TRUE; gAnimFramesToWait = 0; gAnimScriptCallback = RunAnimScriptCommand; for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) - sAnimSpriteIndexArray[i] |= INVALID_U16; + sAnimSpriteIndexArray[i] |= 0xFFFF; if (isMoveAnim) { - for (i = 0; gMovesWithQuietBGM[i] != INVALID_U16; i++) + for (i = 0; gMovesWithQuietBGM[i] != 0xFFFF; i++) { if (tableId == gMovesWithQuietBGM[i]) { @@ -1558,7 +1558,7 @@ static void AddSpriteIndex(u16 index) for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { - if (sAnimSpriteIndexArray[i] == INVALID_U16) + if (sAnimSpriteIndexArray[i] == 0xFFFF) { sAnimSpriteIndexArray[i] = index; return; @@ -1574,7 +1574,7 @@ static void ClearSpriteIndex(u16 index) { if (sAnimSpriteIndexArray[i] == index) { - sAnimSpriteIndexArray[i] |= INVALID_U16; + sAnimSpriteIndexArray[i] |= 0xFFFF; return; } } @@ -1712,7 +1712,7 @@ static void ScriptCmd_delay(void) sBattleAnimScriptPtr++; gAnimFramesToWait = sBattleAnimScriptPtr[0]; if (gAnimFramesToWait == 0) - gAnimFramesToWait = INVALID_S8; + gAnimFramesToWait = -1; sBattleAnimScriptPtr++; gAnimScriptCallback = WaitAnimFrameCount; } @@ -1746,7 +1746,7 @@ static void ScriptCmd_end(void) // Keep waiting as long as there are animations to be done. if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0 - || sMonAnimTaskIdArray[0] != INVALID_U8 || sMonAnimTaskIdArray[1] != INVALID_U8) + || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF) { sSoundAnimFramesToWait = 0; gAnimFramesToWait = 1; @@ -1773,11 +1773,11 @@ static void ScriptCmd_end(void) for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++) { - if (sAnimSpriteIndexArray[i] != INVALID_U16) + if (sAnimSpriteIndexArray[i] != 0xFFFF) { FreeSpriteTilesByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag); FreeSpritePaletteByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag); - sAnimSpriteIndexArray[i] |= INVALID_U16; // set terminator. + sAnimSpriteIndexArray[i] |= 0xFFFF; // set terminator. } } @@ -2122,9 +2122,9 @@ static void ScriptCmd_clearmonbg(void) else battlerId = gBattleAnimTarget; - if (sMonAnimTaskIdArray[0] != INVALID_U8) + if (sMonAnimTaskIdArray[0] != 0xFF) gSprites[gBattlerSpriteIds[battlerId]].invisible = FALSE; - if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != INVALID_U8) + if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF) gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = FALSE; else animBattlerId = 0; @@ -2148,17 +2148,17 @@ static void sub_80A4980(u8 taskId) else to_BG2 = TRUE; - if (sMonAnimTaskIdArray[0] != INVALID_U8) + if (sMonAnimTaskIdArray[0] != 0xFF) { sub_80A477C(to_BG2); DestroyTask(sMonAnimTaskIdArray[0]); - sMonAnimTaskIdArray[0] = INVALID_U8; + sMonAnimTaskIdArray[0] = 0xFF; } if (gTasks[taskId].data[0] > 1) { sub_80A477C(to_BG2 ^ 1); DestroyTask(sMonAnimTaskIdArray[1]); - sMonAnimTaskIdArray[1] = INVALID_U8; + sMonAnimTaskIdArray[1] = 0xFF; } DestroyTask(taskId); } @@ -2421,7 +2421,7 @@ static void Task_FadeToBg(u8 taskId) { s16 bgId = gTasks[taskId].tBackgroundId; - if (bgId == INVALID_S16) + if (bgId == -1) LoadDefaultBg(); else LoadMoveBg(bgId); @@ -2477,7 +2477,7 @@ static void ScriptCmd_restorebg(void) sBattleAnimScriptPtr++; taskId = CreateTask(Task_FadeToBg, 5); - gTasks[taskId].tBackgroundId = INVALID_S16; + gTasks[taskId].tBackgroundId = -1; sAnimBackgroundFadeState = 1; } @@ -3001,7 +3001,7 @@ static void ScriptCmd_invisible(void) u8 spriteId; spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) gSprites[spriteId].invisible = TRUE; sBattleAnimScriptPtr += 2; @@ -3012,7 +3012,7 @@ static void ScriptCmd_visible(void) u8 spriteId; spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) gSprites[spriteId].invisible = FALSE; sBattleAnimScriptPtr += 2; @@ -3039,7 +3039,7 @@ static void ScriptCmd_doublebattle_2D(void) r4 = sub_80A8364(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) { gSprites[spriteId].invisible = FALSE; if (r4 == 2) @@ -3075,7 +3075,7 @@ static void ScriptCmd_doublebattle_2E(void) spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } - if (spriteId != INVALID_U8 && r4 == 2) + if (spriteId != 0xFF && r4 == 2) gSprites[spriteId].oam.priority = 2; } } diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index 1a2c279ec..8ba1a8222 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -1590,7 +1590,7 @@ s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 whichBattler) } } } - return INVALID_S16; + return -1; } void obj_delete_but_dont_free_vram(struct Sprite *sprite) diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c index c329a134d..f1245a032 100644 --- a/src/battle_anim_80A9C70.c +++ b/src/battle_anim_80A9C70.c @@ -183,7 +183,7 @@ void sub_80A9EF4(u8 taskId) SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); spriteId = CreateSprite(&gUnknown_0853EF48, x, y, 4); - if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == INVALID_U16) + if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF) gSprites[spriteId].invisible = TRUE; SetSubspriteTables(&gSprites[spriteId], gUnknown_0853EF40); gTasks[taskId].data[15] = spriteId; @@ -315,10 +315,10 @@ void AnimTask_StatsChange(u8 taskId) CASE(MINUS2, STAT_ACC): goesDown = TRUE; animStatId = 2; sharply = TRUE; break; CASE(MINUS2, STAT_EVASION): goesDown = TRUE; animStatId = 4; sharply = TRUE; break; - case STAT_ANIM_MULTIPLE_PLUS1: goesDown = FALSE; animStatId = INVALID_U8; sharply = FALSE; break; - case STAT_ANIM_MULTIPLE_PLUS2: goesDown = FALSE; animStatId = INVALID_U8; sharply = TRUE; break; - case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE; animStatId = INVALID_U8; sharply = FALSE; break; - case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE; animStatId = INVALID_U8; sharply = TRUE; break; + case STAT_ANIM_MULTIPLE_PLUS1: goesDown = FALSE; animStatId = 0xFF; sharply = FALSE; break; + case STAT_ANIM_MULTIPLE_PLUS2: goesDown = FALSE; animStatId = 0xFF; sharply = TRUE; break; + case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE; animStatId = 0xFF; sharply = FALSE; break; + case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE; animStatId = 0xFF; sharply = TRUE; break; default: DestroyAnimVisualTask(taskId); diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 36738d36e..e5f0cd165 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -214,7 +214,7 @@ void sub_8158E9C(u8 taskId) if (species != SPECIES_NONE) { - if (gBattleAnimArgs[1] == INVALID_U8) + if (gBattleAnimArgs[1] == 0xFF) PlayCry3(species, pan, 9); else PlayCry3(species, pan, 7); @@ -238,7 +238,7 @@ static void sub_8158FF4(u8 taskId) } else { - if (gTasks[taskId].data[0] == INVALID_U8) + if (gTasks[taskId].data[0] == 0xFF) { if (!IsCryPlaying()) { @@ -389,50 +389,50 @@ void sub_8159308(u8 taskId) NAKED void sub_8159308(u8 taskId) { - asm_unified(" push {r4,r5,lr}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - adds r5, r0, 0\n\ - ldr r1, =gTasks\n\ - lsls r0, r5, 2\n\ - adds r0, r5\n\ - lsls r0, 3\n\ - adds r4, r0, r1\n\ - ldrh r2, [r4, 0xE]\n\ - ldrh r0, [r4, 0x1C]\n\ - adds r1, r0, 0x1\n\ - strh r1, [r4, 0x1C]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r3, 0x12\n\ - ldrsh r1, [r4, r3]\n\ - cmp r0, r1\n\ - bne _08159342\n\ - movs r0, 0\n\ - strh r0, [r4, 0x1C]\n\ - ldrh r1, [r4, 0x1E]\n\ - adds r0, r2, r1\n\ - strh r0, [r4, 0x1E]\n\ - movs r2, 0x1E\n\ - ldrsh r0, [r4, r2]\n\ - bl KeepPanInRange\n\ - strh r0, [r4, 0x1E]\n\ + asm_unified(" push {r4,r5,lr}\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + adds r5, r0, 0\n\ + ldr r1, =gTasks\n\ + lsls r0, r5, 2\n\ + adds r0, r5\n\ + lsls r0, 3\n\ + adds r4, r0, r1\n\ + ldrh r2, [r4, 0xE]\n\ + ldrh r0, [r4, 0x1C]\n\ + adds r1, r0, 0x1\n\ + strh r1, [r4, 0x1C]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + movs r3, 0x12\n\ + ldrsh r1, [r4, r3]\n\ + cmp r0, r1\n\ + bne _08159342\n\ + movs r0, 0\n\ + strh r0, [r4, 0x1C]\n\ + ldrh r1, [r4, 0x1E]\n\ + adds r0, r2, r1\n\ + strh r0, [r4, 0x1E]\n\ + movs r2, 0x1E\n\ + ldrsh r0, [r4, r2]\n\ + bl KeepPanInRange\n\ + strh r0, [r4, 0x1E]\n\ _08159342:\n\ - ldr r1, =gUnknown_02038440\n\ - ldrh r0, [r4, 0x1E]\n\ - strb r0, [r1]\n\ - movs r3, 0x1E\n\ - ldrsh r1, [r4, r3]\n\ - movs r2, 0xC\n\ - ldrsh r0, [r4, r2]\n\ - cmp r1, r0\n\ - bne _0815935A\n\ - adds r0, r5, 0\n\ - bl DestroyAnimVisualTask\n\ + ldr r1, =gUnknown_02038440\n\ + ldrh r0, [r4, 0x1E]\n\ + strb r0, [r1]\n\ + movs r3, 0x1E\n\ + ldrsh r1, [r4, r3]\n\ + movs r2, 0xC\n\ + ldrsh r0, [r4, r2]\n\ + cmp r1, r0\n\ + bne _0815935A\n\ + adds r0, r5, 0\n\ + bl DestroyAnimVisualTask\n\ _0815935A:\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .pool"); + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .pool"); } #endif diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 5ed30ddc0..c3d0fe90f 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -82,7 +82,7 @@ void sub_8116664(u8 taskId) animBattlers[1] = gBattleAnimTarget; break; case 5: - animBattlers[0] = INVALID_U8; + animBattlers[0] = 0xFF; break; case 6: selectedPalettes = 0; diff --git a/src/battle_arena.c b/src/battle_arena.c index 591fc82b9..cd2c976da 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -449,7 +449,7 @@ static const union AnimCmd *const sSpriteAnimTable_8611F4C[] = static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon = { .tileTag = 0x3E8, - .paletteTag = INVALID_U16, + .paletteTag = 0xFFFF, .oam = &sOamData_8611F24, .anims = sSpriteAnimTable_8611F4C, .images = NULL, diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index d65c61884..8cbc62aab 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -212,7 +212,7 @@ static void sub_8064470(void) static void sub_80644D8(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; LinkOpponentBufferExecCompleted(); @@ -395,7 +395,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 8bbbcbfd1..0cd15f39e 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -203,7 +203,7 @@ static void sub_814AF54(void) static void sub_814AFBC(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; LinkPartnerBufferExecCompleted(); @@ -279,7 +279,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 0aeb24c32..c057e8575 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -220,7 +220,7 @@ static void sub_805F240(void) static void sub_805F2A8(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; OpponentBufferExecCompleted(); @@ -389,7 +389,7 @@ static void CompleteOnHealthbarDone(void) { s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 3053e6c37..2bd5ef365 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -635,7 +635,7 @@ u32 sub_8057FBC(void) // unused PlaySE(SE_SELECT); gBattle_BG0_X = 0; gBattle_BG0_Y = 0x140; - var = INVALID_U8; + var = 0xFF; } if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1) { @@ -936,7 +936,7 @@ static void sub_80588B4(void) static void sub_8058924(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerBufferExecCompleted(); @@ -1119,7 +1119,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -1221,7 +1221,7 @@ static void sub_8059400(u8 taskId) newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (newExpPoints == INVALID_S16) // The bar has been filled with given exp points. + if (newExpPoints == -1) // The bar has been filled with given exp points. { u8 level; s32 currExp; diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 775b7676f..02dd1383b 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -218,7 +218,7 @@ static void sub_81BAE98(void) static void sub_81BAF00(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerPartnerBufferExecCompleted(); @@ -294,7 +294,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -397,7 +397,7 @@ static void sub_81BB4E4(u8 taskId) r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (r4 == INVALID_S16) + if (r4 == -1) { u8 level; s32 currExp; diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 842facd44..0cf3634dc 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -213,7 +213,7 @@ static void sub_81865C8(void) static void sub_8186630(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; RecordedOpponentBufferExecCompleted(); @@ -377,7 +377,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 60bec78b1..4d7fdc01e 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -202,7 +202,7 @@ static void sub_81899F0(void) static void sub_8189A58(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; RecordedPlayerBufferExecCompleted(); @@ -360,7 +360,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 9078ef577..5d87c4f90 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -348,7 +348,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index e24549d82..a6d6e9294 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -51,7 +51,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void) for (i = 0; i < MAX_BATTLERS_COUNT; i++) { gBattlerControllerFuncs[i] = nullsub_21; - gBattlerPositions[i] = INVALID_U8; + gBattlerPositions[i] = 0xFF; gActionSelectionCursor[i] = 0; gMoveSelectionCursor[i] = 0; } diff --git a/src/battle_dome.c b/src/battle_dome.c index f03de7505..29b41c5db 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -256,361 +256,361 @@ static EWRAM_DATA u8 *sTilemapBuffer = NULL; // Const rom data. static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = { - [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_KARATE_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DOUBLE_SLAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_COMET_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_MEGA_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_PAY_DAY] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_FIRE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_ICE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_THUNDER_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SCRATCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_VICE_GRIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_GUILLOTINE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_RAZOR_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SWORDS_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0}, - [MOVE_CUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WING_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WHIRLWIND] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FLY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BIND] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_VINE_WHIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_STOMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DOUBLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MEGA_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ROLLING_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SAND_ATTACK] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HEADBUTT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_HORN_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FURY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_HORN_DRILL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BODY_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_WRAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_TAKE_DOWN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_THRASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DOUBLE_EDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TAIL_WHIP] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_POISON_STING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_TWINEEDLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_PIN_MISSILE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LEER] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_BITE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_GROWL] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ROAR] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SING] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SUPERSONIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SONIC_BOOM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DISABLE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ACID] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_EMBER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_FLAMETHROWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, - [MOVE_MIST] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_WATER_GUN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HYDRO_PUMP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0}, - [MOVE_SURF] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0}, - [MOVE_ICE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, - [MOVE_BLIZZARD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1}, - [MOVE_PSYBEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_BUBBLE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_AURORA_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_HYPER_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0}, - [MOVE_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DRILL_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SUBMISSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LOW_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_COUNTER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_SEISMIC_TOSS] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_STRENGTH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ABSORB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MEGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_LEECH_SEED] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GROWTH] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_RAZOR_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SOLAR_BEAM] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0}, - [MOVE_POISON_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_STUN_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SLEEP_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_PETAL_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_STRING_SHOT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DRAGON_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FIRE_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_THUNDER_SHOCK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_THUNDERBOLT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, - [MOVE_THUNDER_WAVE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_THUNDER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1}, - [MOVE_ROCK_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_EARTHQUAKE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0}, - [MOVE_FISSURE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0}, - [MOVE_DIG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TOXIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_CONFUSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_PSYCHIC] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, - [MOVE_HYPNOSIS] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_MEDITATE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_AGILITY] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_QUICK_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TELEPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_NIGHT_SHADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MIMIC] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SCREECH] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DOUBLE_TEAM] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_RECOVER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_HARDEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_MINIMIZE] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SMOKESCREEN] = {0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CONFUSE_RAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WITHDRAW] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DEFENSE_CURL] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BARRIER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LIGHT_SCREEN] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_HAZE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_REFLECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_FOCUS_ENERGY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BIDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_METRONOME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, - [MOVE_MIRROR_MOVE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, - [MOVE_SELF_DESTRUCT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, - [MOVE_EGG_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0}, - [MOVE_LICK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SMOG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SLUDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_BONE_CLUB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_FIRE_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, - [MOVE_WATERFALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CLAMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SWIFT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SKULL_BASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_SPIKE_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CONSTRICT] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_AMNESIA] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_KINESIS] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SOFT_BOILED] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HI_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GLARE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DREAM_EATER] = {1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_POISON_GAS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BARRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LEECH_LIFE] = {0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_LOVELY_KISS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SKY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, - [MOVE_TRANSFORM] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BUBBLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DIZZY_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FLASH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_PSYWAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SPLASH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ACID_ARMOR] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_CRABHAMMER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0}, - [MOVE_EXPLOSION] = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0}, - [MOVE_FURY_SWIPES] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BONEMERANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_REST] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ROCK_SLIDE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_HYPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SHARPEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_CONVERSION] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_TRI_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SUPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SLASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SUBSTITUTE] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_STRUGGLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_SKETCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0}, - [MOVE_TRIPLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_THIEF] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SPIDER_WEB] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MIND_READER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_NIGHTMARE] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FLAME_WHEEL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SNORE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_CURSE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_FLAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CONVERSION_2] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_AEROBLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_COTTON_SPORE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_REVERSAL] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SPITE] = {0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_POWDER_SNOW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_PROTECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0}, - [MOVE_MACH_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SCARY_FACE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_FAINT_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SWEET_KISS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BELLY_DRUM] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SLUDGE_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1}, - [MOVE_MUD_SLAP] = {0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_OCTAZOOKA] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SPIKES] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ZAP_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1}, - [MOVE_FORESIGHT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DESTINY_BOND] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_PERISH_SONG] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_ICY_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_DETECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_BONE_RUSH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LOCK_ON] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_OUTRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1}, - [MOVE_SANDSTORM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GIGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_ENDURE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_CHARM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ROLLOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_FALSE_SWIPE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SWAGGER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_MILK_DRINK] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SPARK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_FURY_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_STEEL_WING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_MEAN_LOOK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_ATTRACT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SLEEP_TALK] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, - [MOVE_HEAL_BELL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_RETURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_PRESENT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0}, - [MOVE_FRUSTRATION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SAFEGUARD] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_PAIN_SPLIT] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SACRED_FIRE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1}, - [MOVE_MAGNITUDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DYNAMIC_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1}, - [MOVE_MEGAHORN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0}, - [MOVE_DRAGON_BREATH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_BATON_PASS] = {1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ENCORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_PURSUIT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_RAPID_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SWEET_SCENT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_IRON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1}, - [MOVE_METAL_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_VITAL_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_MORNING_SUN] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_SYNTHESIS] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_MOONLIGHT] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_HIDDEN_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CROSS_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0}, - [MOVE_TWISTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_RAIN_DANCE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_SUNNY_DAY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_CRUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_MIRROR_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_PSYCH_UP] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_EXTREME_SPEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_ANCIENT_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1}, - [MOVE_SHADOW_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_FUTURE_SIGHT] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ROCK_SMASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_WHIRLPOOL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_BEAT_UP] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FAKE_OUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_UPROAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_STOCKPILE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SPIT_UP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_SWALLOW] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_HEAT_WAVE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1}, - [MOVE_HAIL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_TORMENT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FLATTER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WILL_O_WISP] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_MEMENTO] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FACADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FOCUS_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_SMELLING_SALT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FOLLOW_ME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_NATURE_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_CHARGE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TAUNT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HELPING_HAND] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TRICK] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ROLE_PLAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_WISH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ASSIST] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_INGRAIN] = {1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_SUPERPOWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0}, - [MOVE_MAGIC_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_RECYCLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_REVENGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_BRICK_BREAK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_YAWN] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_KNOCK_OFF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_ENDEAVOR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_ERUPTION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, - [MOVE_SKILL_SWAP] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_IMPRISON] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_REFRESH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_GRUDGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_SNATCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, - [MOVE_SECRET_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DIVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ARM_THRUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CAMOUFLAGE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TAIL_GLOW] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_LUSTER_PURGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1}, - [MOVE_MIST_BALL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1}, - [MOVE_FEATHER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_TEETER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_BLAZE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_MUD_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ICE_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_NEEDLE_ARM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SLACK_OFF] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_HYPER_VOICE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, - [MOVE_POISON_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_CRUSH_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_BLAST_BURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_HYDRO_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_METEOR_MASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1}, - [MOVE_ASTONISH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_WEATHER_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_AROMATHERAPY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - [MOVE_FAKE_TEARS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_AIR_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_OVERHEAT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1}, - [MOVE_ODOR_SLEUTH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_ROCK_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SILVER_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1}, - [MOVE_METAL_SOUND] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_GRASS_WHISTLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_TICKLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_COSMIC_POWER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_WATER_SPOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, - [MOVE_SIGNAL_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SHADOW_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_EXTRASENSORY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_SKY_UPPERCUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SAND_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_SHEER_COLD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0}, - [MOVE_MUDDY_WATER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1}, - [MOVE_BULLET_SEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_AERIAL_ACE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ICICLE_SPEAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_IRON_DEFENSE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BLOCK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, - [MOVE_HOWL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_DRAGON_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_FRENZY_PLANT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_BULK_UP] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_BOUNCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1}, - [MOVE_MUD_SHOT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, - [MOVE_POISON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_COVET] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_VOLT_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0}, - [MOVE_MAGICAL_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_WATER_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_CALM_MIND] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_LEAF_BLADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, - [MOVE_DRAGON_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_ROCK_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_SHOCK_WAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, - [MOVE_WATER_PULSE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, - [MOVE_DOOM_DESIRE] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, - [MOVE_PSYCHO_BOOST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_KARATE_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DOUBLE_SLAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_COMET_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_MEGA_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_PAY_DAY] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_FIRE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_ICE_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_THUNDER_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SCRATCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_VICE_GRIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_GUILLOTINE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_RAZOR_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SWORDS_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0}, + [MOVE_CUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WING_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WHIRLWIND] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FLY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BIND] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_VINE_WHIP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_STOMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DOUBLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MEGA_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ROLLING_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SAND_ATTACK] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HEADBUTT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_HORN_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FURY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_HORN_DRILL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BODY_SLAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_WRAP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_TAKE_DOWN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_THRASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DOUBLE_EDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TAIL_WHIP] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_POISON_STING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_TWINEEDLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_PIN_MISSILE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LEER] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_BITE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_GROWL] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ROAR] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SING] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SUPERSONIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SONIC_BOOM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DISABLE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ACID] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_EMBER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_FLAMETHROWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, + [MOVE_MIST] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_WATER_GUN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HYDRO_PUMP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0}, + [MOVE_SURF] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0}, + [MOVE_ICE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, + [MOVE_BLIZZARD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1}, + [MOVE_PSYBEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_BUBBLE_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_AURORA_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_HYPER_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0}, + [MOVE_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DRILL_PECK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SUBMISSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LOW_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_COUNTER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_SEISMIC_TOSS] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_STRENGTH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ABSORB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MEGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_LEECH_SEED] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GROWTH] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_RAZOR_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SOLAR_BEAM] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0}, + [MOVE_POISON_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_STUN_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SLEEP_POWDER] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_PETAL_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_STRING_SHOT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DRAGON_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FIRE_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_THUNDER_SHOCK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_THUNDERBOLT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, + [MOVE_THUNDER_WAVE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_THUNDER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1}, + [MOVE_ROCK_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_EARTHQUAKE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0}, + [MOVE_FISSURE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0}, + [MOVE_DIG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TOXIC] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_CONFUSION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_PSYCHIC] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1}, + [MOVE_HYPNOSIS] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_MEDITATE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_AGILITY] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_QUICK_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_RAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TELEPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_NIGHT_SHADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MIMIC] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SCREECH] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DOUBLE_TEAM] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_RECOVER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_HARDEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_MINIMIZE] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SMOKESCREEN] = {0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CONFUSE_RAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WITHDRAW] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DEFENSE_CURL] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BARRIER] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LIGHT_SCREEN] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_HAZE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_REFLECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_FOCUS_ENERGY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BIDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_METRONOME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, + [MOVE_MIRROR_MOVE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, + [MOVE_SELF_DESTRUCT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, + [MOVE_EGG_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0}, + [MOVE_LICK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SMOG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SLUDGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_BONE_CLUB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_FIRE_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_WATERFALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CLAMP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SWIFT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SKULL_BASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_SPIKE_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CONSTRICT] = {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_AMNESIA] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_KINESIS] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SOFT_BOILED] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HI_JUMP_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GLARE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DREAM_EATER] = {1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_POISON_GAS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BARRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LEECH_LIFE] = {0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_LOVELY_KISS] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SKY_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_TRANSFORM] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BUBBLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DIZZY_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SPORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FLASH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_PSYWAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SPLASH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ACID_ARMOR] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_CRABHAMMER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0}, + [MOVE_EXPLOSION] = {0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0}, + [MOVE_FURY_SWIPES] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BONEMERANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_REST] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ROCK_SLIDE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_HYPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SHARPEN] = {0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_CONVERSION] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_TRI_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SUPER_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SLASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SUBSTITUTE] = {0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_STRUGGLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_SKETCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0}, + [MOVE_TRIPLE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_THIEF] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SPIDER_WEB] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MIND_READER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_NIGHTMARE] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FLAME_WHEEL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SNORE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_CURSE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_FLAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CONVERSION_2] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_AEROBLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_COTTON_SPORE] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_REVERSAL] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SPITE] = {0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_POWDER_SNOW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_PROTECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0}, + [MOVE_MACH_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SCARY_FACE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_FAINT_ATTACK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SWEET_KISS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BELLY_DRUM] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SLUDGE_BOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1}, + [MOVE_MUD_SLAP] = {0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_OCTAZOOKA] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SPIKES] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ZAP_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1}, + [MOVE_FORESIGHT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DESTINY_BOND] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_PERISH_SONG] = {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_ICY_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_DETECT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_BONE_RUSH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LOCK_ON] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_OUTRAGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 1}, + [MOVE_SANDSTORM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GIGA_DRAIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_ENDURE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_CHARM] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ROLLOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_FALSE_SWIPE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SWAGGER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_MILK_DRINK] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SPARK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_FURY_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_STEEL_WING] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_MEAN_LOOK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_ATTRACT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SLEEP_TALK] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}, + [MOVE_HEAL_BELL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_RETURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_PRESENT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0}, + [MOVE_FRUSTRATION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SAFEGUARD] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_PAIN_SPLIT] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SACRED_FIRE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_MAGNITUDE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DYNAMIC_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1}, + [MOVE_MEGAHORN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0}, + [MOVE_DRAGON_BREATH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_BATON_PASS] = {1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ENCORE] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_PURSUIT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_RAPID_SPIN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SWEET_SCENT] = {0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_IRON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1}, + [MOVE_METAL_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_VITAL_THROW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_MORNING_SUN] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_SYNTHESIS] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_MOONLIGHT] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_HIDDEN_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CROSS_CHOP] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0}, + [MOVE_TWISTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_RAIN_DANCE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_SUNNY_DAY] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_CRUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_MIRROR_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_PSYCH_UP] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_EXTREME_SPEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_ANCIENT_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1}, + [MOVE_SHADOW_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_FUTURE_SIGHT] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ROCK_SMASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_WHIRLPOOL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_BEAT_UP] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FAKE_OUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_UPROAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_STOCKPILE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SPIT_UP] = {1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_SWALLOW] = {1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_HEAT_WAVE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1}, + [MOVE_HAIL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_TORMENT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FLATTER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WILL_O_WISP] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_MEMENTO] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FACADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FOCUS_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_SMELLING_SALT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FOLLOW_ME] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_NATURE_POWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_CHARGE] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TAUNT] = {0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HELPING_HAND] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TRICK] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ROLE_PLAY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_WISH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ASSIST] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_INGRAIN] = {1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_SUPERPOWER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0}, + [MOVE_MAGIC_COAT] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_RECYCLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_REVENGE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_BRICK_BREAK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_YAWN] = {1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_KNOCK_OFF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_ENDEAVOR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_ERUPTION] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, + [MOVE_SKILL_SWAP] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_IMPRISON] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_REFRESH] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_GRUDGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_SNATCH] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0}, + [MOVE_SECRET_POWER] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DIVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ARM_THRUST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CAMOUFLAGE] = {0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TAIL_GLOW] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_LUSTER_PURGE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1}, + [MOVE_MIST_BALL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1}, + [MOVE_FEATHER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_TEETER_DANCE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_BLAZE_KICK] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_MUD_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ICE_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_NEEDLE_ARM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SLACK_OFF] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_HYPER_VOICE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0}, + [MOVE_POISON_FANG] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_CRUSH_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_BLAST_BURN] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_HYDRO_CANNON] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_METEOR_MASH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1}, + [MOVE_ASTONISH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_WEATHER_BALL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_AROMATHERAPY] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0}, + [MOVE_FAKE_TEARS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_AIR_CUTTER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_OVERHEAT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1}, + [MOVE_ODOR_SLEUTH] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_ROCK_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SILVER_WIND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1}, + [MOVE_METAL_SOUND] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_GRASS_WHISTLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_TICKLE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_COSMIC_POWER] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_WATER_SPOUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0}, + [MOVE_SIGNAL_BEAM] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SHADOW_PUNCH] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_EXTRASENSORY] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_SKY_UPPERCUT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SAND_TOMB] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_SHEER_COLD] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0}, + [MOVE_MUDDY_WATER] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1}, + [MOVE_BULLET_SEED] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_AERIAL_ACE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ICICLE_SPEAR] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_IRON_DEFENSE] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BLOCK] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0}, + [MOVE_HOWL] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_DRAGON_CLAW] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_FRENZY_PLANT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_BULK_UP] = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_BOUNCE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1}, + [MOVE_MUD_SHOT] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, + [MOVE_POISON_TAIL] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_COVET] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_VOLT_TACKLE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0}, + [MOVE_MAGICAL_LEAF] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_WATER_SPORT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_CALM_MIND] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_LEAF_BLADE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, + [MOVE_DRAGON_DANCE] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_ROCK_BLAST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_SHOCK_WAVE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, + [MOVE_WATER_PULSE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1}, + [MOVE_DOOM_DESIRE] = {0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0}, + [MOVE_PSYCHO_BOOST] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 1}, }; static const u8 gUnknown_0860C988[][DOME_TOURNAMENT_TRAINERS_COUNT] = @@ -3032,7 +3032,7 @@ static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2) s32 i = 0; s32 typePower = TYPE_x1; - if (move == MOVE_NONE || move == INVALID_U16 || gBattleMoves[move].power == 0) + if (move == MOVE_NONE || move == 0xFFFF || gBattleMoves[move].power == 0) return 0; defType1 = gBaseStats[targetSpecies].type1; @@ -3148,239 +3148,239 @@ NAKED static s32 GetTypeEffectivenessPoints(s32 move, s32 species, s32 arg2) { asm_unified("\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x8\n\ - adds r3, r0, 0\n\ - adds r4, r1, 0\n\ - str r2, [sp]\n\ - movs r6, 0\n\ - movs r2, 0x14\n\ - cmp r3, 0\n\ - beq _0818FFF0\n\ - ldr r0, =0x0000ffff\n\ - cmp r3, r0\n\ - beq _0818FFF0\n\ - ldr r0, =gBattleMoves\n\ - lsls r1, r3, 1\n\ - adds r1, r3\n\ - lsls r1, 2\n\ - adds r3, r1, r0\n\ - ldrb r0, [r3, 0x1]\n\ - cmp r0, 0\n\ - bne _0818FFFC\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x8\n\ + adds r3, r0, 0\n\ + adds r4, r1, 0\n\ + str r2, [sp]\n\ + movs r6, 0\n\ + movs r2, 0x14\n\ + cmp r3, 0\n\ + beq _0818FFF0\n\ + ldr r0, =0x0000ffff\n\ + cmp r3, r0\n\ + beq _0818FFF0\n\ + ldr r0, =gBattleMoves\n\ + lsls r1, r3, 1\n\ + adds r1, r3\n\ + lsls r1, 2\n\ + adds r3, r1, r0\n\ + ldrb r0, [r3, 0x1]\n\ + cmp r0, 0\n\ + bne _0818FFFC\n\ _0818FFF0:\n\ - movs r0, 0\n\ - b _08190156\n\ - .pool\n\ + movs r0, 0\n\ + b _08190156\n\ + .pool\n\ _0818FFFC:\n\ - ldr r1, =gBaseStats\n\ - lsls r0, r4, 3\n\ - subs r0, r4\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - ldrb r1, [r0, 0x6]\n\ - mov r10, r1\n\ - ldrb r1, [r0, 0x7]\n\ - mov r9, r1\n\ - ldrb r0, [r0, 0x16]\n\ - mov r8, r0\n\ - ldrb r3, [r3, 0x2]\n\ - str r3, [sp, 0x4]\n\ - cmp r0, 0x1A\n\ - bne _0819002C\n\ - cmp r3, 0x4\n\ - bne _0819002C\n\ - ldr r0, [sp]\n\ - cmp r0, 0x1\n\ - bne _081900AA\n\ - movs r2, 0x8\n\ - b _081900A4\n\ - .pool\n\ + ldr r1, =gBaseStats\n\ + lsls r0, r4, 3\n\ + subs r0, r4\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldrb r1, [r0, 0x6]\n\ + mov r10, r1\n\ + ldrb r1, [r0, 0x7]\n\ + mov r9, r1\n\ + ldrb r0, [r0, 0x16]\n\ + mov r8, r0\n\ + ldrb r3, [r3, 0x2]\n\ + str r3, [sp, 0x4]\n\ + cmp r0, 0x1A\n\ + bne _0819002C\n\ + cmp r3, 0x4\n\ + bne _0819002C\n\ + ldr r0, [sp]\n\ + cmp r0, 0x1\n\ + bne _081900AA\n\ + movs r2, 0x8\n\ + b _081900A4\n\ + .pool\n\ _0819002C:\n\ - ldr r0, =gTypeEffectiveness\n\ - adds r1, r6, r0\n\ - ldrb r0, [r1]\n\ - ldr r7, =gTypeEffectiveness\n\ - cmp r0, 0xFF\n\ - beq _081900A4\n\ - adds r4, r1, 0\n\ + ldr r0, =gTypeEffectiveness\n\ + adds r1, r6, r0\n\ + ldrb r0, [r1]\n\ + ldr r7, =gTypeEffectiveness\n\ + cmp r0, 0xFF\n\ + beq _081900A4\n\ + adds r4, r1, 0\n\ _0819003A:\n\ - ldrb r0, [r4]\n\ - cmp r0, 0xFE\n\ - beq _08190096\n\ - ldrb r0, [r4]\n\ - ldr r1, [sp, 0x4]\n\ - cmp r0, r1\n\ - bne _08190096\n\ - ldrb r0, [r4, 0x1]\n\ - adds r5, r6, 0x1\n\ - cmp r0, r10\n\ - bne _0819006C\n\ - adds r1, r6, 0x2\n\ - mov r0, r8\n\ - cmp r0, 0x19\n\ - bne _0819005E\n\ - ldrb r0, [r4, 0x2]\n\ - cmp r0, 0x28\n\ - bne _0819006C\n\ + ldrb r0, [r4]\n\ + cmp r0, 0xFE\n\ + beq _08190096\n\ + ldrb r0, [r4]\n\ + ldr r1, [sp, 0x4]\n\ + cmp r0, r1\n\ + bne _08190096\n\ + ldrb r0, [r4, 0x1]\n\ + adds r5, r6, 0x1\n\ + cmp r0, r10\n\ + bne _0819006C\n\ + adds r1, r6, 0x2\n\ + mov r0, r8\n\ + cmp r0, 0x19\n\ + bne _0819005E\n\ + ldrb r0, [r4, 0x2]\n\ + cmp r0, 0x28\n\ + bne _0819006C\n\ _0819005E:\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - muls r0, r2\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - adds r2, r0, 0\n\ + adds r0, r1, r7\n\ + ldrb r0, [r0]\n\ + muls r0, r2\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + adds r2, r0, 0\n\ _0819006C:\n\ - adds r0, r5, r7\n\ - ldrb r0, [r0]\n\ - cmp r0, r9\n\ - bne _08190096\n\ - cmp r10, r9\n\ - beq _08190096\n\ - adds r1, r6, 0x2\n\ - mov r0, r8\n\ - cmp r0, 0x19\n\ - bne _08190088\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x28\n\ - bne _08190096\n\ + adds r0, r5, r7\n\ + ldrb r0, [r0]\n\ + cmp r0, r9\n\ + bne _08190096\n\ + cmp r10, r9\n\ + beq _08190096\n\ + adds r1, r6, 0x2\n\ + mov r0, r8\n\ + cmp r0, 0x19\n\ + bne _08190088\n\ + adds r0, r1, r7\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x28\n\ + bne _08190096\n\ _08190088:\n\ - adds r0, r1, r7\n\ - ldrb r0, [r0]\n\ - muls r0, r2\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - adds r2, r0, 0\n\ + adds r0, r1, r7\n\ + ldrb r0, [r0]\n\ + muls r0, r2\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + adds r2, r0, 0\n\ _08190096:\n\ - adds r4, 0x3\n\ - adds r6, 0x3\n\ - ldr r1, =gTypeEffectiveness\n\ - adds r0, r6, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0xFF\n\ - bne _0819003A\n\ + adds r4, 0x3\n\ + adds r6, 0x3\n\ + ldr r1, =gTypeEffectiveness\n\ + adds r0, r6, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0xFF\n\ + bne _0819003A\n\ _081900A4:\n\ - ldr r0, [sp]\n\ - cmp r0, 0x1\n\ - beq _081900E0\n\ + ldr r0, [sp]\n\ + cmp r0, 0x1\n\ + beq _081900E0\n\ _081900AA:\n\ - ldr r1, [sp]\n\ - cmp r1, 0x1\n\ - bgt _081900BC\n\ - cmp r1, 0\n\ - beq _081900C4\n\ - b _08190154\n\ - .pool\n\ + ldr r1, [sp]\n\ + cmp r1, 0x1\n\ + bgt _081900BC\n\ + cmp r1, 0\n\ + beq _081900C4\n\ + b _08190154\n\ + .pool\n\ _081900BC:\n\ - ldr r0, [sp]\n\ - cmp r0, 0x2\n\ - beq _08190114\n\ - b _08190154\n\ + ldr r0, [sp]\n\ + cmp r0, 0x2\n\ + beq _08190114\n\ + b _08190154\n\ _081900C4:\n\ - cmp r2, 0xA\n\ - beq _08190146\n\ - cmp r2, 0xA\n\ - ble _08190146\n\ - cmp r2, 0x28\n\ - beq _0819014A\n\ - cmp r2, 0x28\n\ - bgt _081900DA\n\ - cmp r2, 0x14\n\ - beq _08190104\n\ - b _08190146\n\ + cmp r2, 0xA\n\ + beq _08190146\n\ + cmp r2, 0xA\n\ + ble _08190146\n\ + cmp r2, 0x28\n\ + beq _0819014A\n\ + cmp r2, 0x28\n\ + bgt _081900DA\n\ + cmp r2, 0x14\n\ + beq _08190104\n\ + b _08190146\n\ _081900DA:\n\ - cmp r2, 0x50\n\ - bne _08190146\n\ - b _08190100\n\ + cmp r2, 0x50\n\ + bne _08190146\n\ + b _08190100\n\ _081900E0:\n\ - cmp r2, 0xA\n\ - beq _08190104\n\ - cmp r2, 0xA\n\ - bgt _081900F2\n\ - cmp r2, 0\n\ - beq _08190100\n\ - cmp r2, 0x5\n\ - beq _0819014A\n\ - b _08190146\n\ + cmp r2, 0xA\n\ + beq _08190104\n\ + cmp r2, 0xA\n\ + bgt _081900F2\n\ + cmp r2, 0\n\ + beq _08190100\n\ + cmp r2, 0x5\n\ + beq _0819014A\n\ + b _08190146\n\ _081900F2:\n\ - cmp r2, 0x28\n\ - beq _08190108\n\ - cmp r2, 0x28\n\ - ble _08190146\n\ - cmp r2, 0x50\n\ - beq _0819010E\n\ - b _08190146\n\ + cmp r2, 0x28\n\ + beq _08190108\n\ + cmp r2, 0x28\n\ + ble _08190146\n\ + cmp r2, 0x50\n\ + beq _0819010E\n\ + b _08190146\n\ _08190100:\n\ - movs r2, 0x8\n\ - b _08190154\n\ + movs r2, 0x8\n\ + b _08190154\n\ _08190104:\n\ - movs r2, 0x2\n\ - b _08190154\n\ + movs r2, 0x2\n\ + b _08190154\n\ _08190108:\n\ - movs r2, 0x2\n\ - negs r2, r2\n\ - b _08190154\n\ + movs r2, 0x2\n\ + negs r2, r2\n\ + b _08190154\n\ _0819010E:\n\ - movs r2, 0x4\n\ - negs r2, r2\n\ - b _08190154\n\ + movs r2, 0x4\n\ + negs r2, r2\n\ + b _08190154\n\ _08190114:\n\ - cmp r2, 0xA\n\ - beq _08190146\n\ - cmp r2, 0xA\n\ - bgt _08190126\n\ - cmp r2, 0\n\ - beq _0819013A\n\ - cmp r2, 0x5\n\ - beq _08190140\n\ - b _08190146\n\ + cmp r2, 0xA\n\ + beq _08190146\n\ + cmp r2, 0xA\n\ + bgt _08190126\n\ + cmp r2, 0\n\ + beq _0819013A\n\ + cmp r2, 0x5\n\ + beq _08190140\n\ + b _08190146\n\ _08190126:\n\ - cmp r2, 0x28\n\ - beq _0819014E\n\ - cmp r2, 0x28\n\ - bgt _08190134\n\ - cmp r2, 0x14\n\ - beq _0819014A\n\ - b _08190146\n\ + cmp r2, 0x28\n\ + beq _0819014E\n\ + cmp r2, 0x28\n\ + bgt _08190134\n\ + cmp r2, 0x14\n\ + beq _0819014A\n\ + b _08190146\n\ _08190134:\n\ - cmp r2, 0x50\n\ - beq _08190152\n\ - b _08190146\n\ + cmp r2, 0x50\n\ + beq _08190152\n\ + b _08190146\n\ _0819013A:\n\ - movs r2, 0x10\n\ - negs r2, r2\n\ - b _08190154\n\ + movs r2, 0x10\n\ + negs r2, r2\n\ + b _08190154\n\ _08190140:\n\ - movs r2, 0x8\n\ - negs r2, r2\n\ - b _08190154\n\ + movs r2, 0x8\n\ + negs r2, r2\n\ + b _08190154\n\ _08190146:\n\ - movs r2, 0\n\ - b _08190154\n\ + movs r2, 0\n\ + b _08190154\n\ _0819014A:\n\ - movs r2, 0x4\n\ - b _08190154\n\ + movs r2, 0x4\n\ + b _08190154\n\ _0819014E:\n\ - movs r2, 0xC\n\ - b _08190154\n\ + movs r2, 0xC\n\ + b _08190154\n\ _08190152:\n\ - movs r2, 0x14\n\ + movs r2, 0x14\n\ _08190154:\n\ - adds r0, r2, 0\n\ + adds r0, r2, 0\n\ _08190156:\n\ - add sp, 0x8\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ + add sp, 0x8\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ "); } #endif // NONMATCHING @@ -3434,14 +3434,14 @@ static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) if (j != val) return gUnknown_0860D14C[j]; else - return INVALID_U8; + return 0xFF; } else { if (!gSaveBlock2Ptr->frontier.domeTrainers[sIdToOpponentId[i][roundId]].isEliminated) return sIdToOpponentId[i][roundId]; else - return INVALID_U8; + return 0xFF; } } @@ -3562,7 +3562,7 @@ static void sub_8190400(u8 taskId) SetVBlankCallback(VblankCb0_BattleDome); sBattleDomeStruct = AllocZeroed(sizeof(*sBattleDomeStruct)); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) - sBattleDomeStruct->arr[i] |= INVALID_U8; + sBattleDomeStruct->arr[i] |= 0xFF; LoadMonIconPalettes(); i = CreateTask(sub_8190CD4, 0); gTasks[i].data[0] = 0; @@ -3624,7 +3624,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 192) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3644,7 +3644,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -32) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3664,7 +3664,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 272) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3684,7 +3684,7 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -32) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; FreeAndDestroyTrainerPicSprite(sprite->data[3]); } } @@ -3714,7 +3714,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite) { if (sprite->pos1.y >= 176) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -3736,7 +3736,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite) { if (sprite->pos1.y <= -16) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -3758,7 +3758,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite) { if (sprite->pos1.x >= 256) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -3780,7 +3780,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite) { if (sprite->pos1.x <= -16) { - sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8; + sBattleDomeStruct->arr[sprite->data[2]] = 0xFF; sub_80D2EF8(sprite); } } @@ -4005,7 +4005,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4016,7 +4016,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4029,7 +4029,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4040,7 +4040,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4121,7 +4121,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4132,7 +4132,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4145,7 +4145,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4156,7 +4156,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4204,7 +4204,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4215,7 +4215,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4228,7 +4228,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4239,7 +4239,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4287,7 +4287,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4298,7 +4298,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4311,7 +4311,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4322,7 +4322,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4368,7 +4368,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4379,7 +4379,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4392,7 +4392,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4403,7 +4403,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4451,7 +4451,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4462,7 +4462,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1; @@ -4475,7 +4475,7 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4486,7 +4486,7 @@ static void sub_8190CD4(u8 taskId) } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) { gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight; gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2]; @@ -4556,12 +4556,12 @@ static void sub_8190CD4(u8 taskId) { if (i < 2) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } @@ -4569,12 +4569,12 @@ static void sub_8190CD4(u8 taskId) { if (i < 10) { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]); } else { - if (sBattleDomeStruct->arr[i] != INVALID_U8) + if (sBattleDomeStruct->arr[i] != 0xFF) sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]); } } @@ -5483,13 +5483,13 @@ static u8 sub_8193BDC(u8 taskId) } else { - if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != INVALID_U8) + if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != 0xFF) arrId = 0; - else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != INVALID_U8) + else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != 0xFF) arrId = 1; - else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != INVALID_U8) + else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != 0xFF) arrId = 2; - else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != INVALID_U8) + else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != 0xFF) arrId = 3; } @@ -6204,58 +6204,58 @@ static void sub_8194F58(void) monLevel = 50; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) - { - monTypesBits = 0; - statSums[i] = 0; - ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); - for (j = 0; j < 3; j++) - { - CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species, - monLevel, ivs, - gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].evSpread, - gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].nature, - statValues); - - statSums[i] += statValues[STAT_ATK]; - statSums[i] += statValues[STAT_DEF]; - statSums[i] += statValues[STAT_SPATK]; - statSums[i] += statValues[STAT_SPDEF]; - statSums[i] += statValues[STAT_SPEED]; - statSums[i] += statValues[STAT_HP]; - monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type1]; - monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type2]; - } - - // Because GF hates temporary vars, trainerId acts like monTypesCount here. - for (trainerId = 0, j = 0; j < 32; j++) - { - if (monTypesBits & 1) - trainerId++; - monTypesBits >>= 1; - } - statSums[i] += (trainerId * monLevel) / 20; - } - - for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT - 1; i++) - { - for (j = i + 1; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++) - { - if (statSums[i] < statSums[j]) - { - SwapDomeTrainers(i, j, statSums); - } - else if (statSums[i] == statSums[j]) - { + { + monTypesBits = 0; + statSums[i] = 0; + ivs = GetDomeTrainerMonIvs(gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); + for (j = 0; j < 3; j++) + { + CalcDomeMonStats(gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species, + monLevel, ivs, + gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].evSpread, + gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].nature, + statValues); + + statSums[i] += statValues[STAT_ATK]; + statSums[i] += statValues[STAT_DEF]; + statSums[i] += statValues[STAT_SPATK]; + statSums[i] += statValues[STAT_SPDEF]; + statSums[i] += statValues[STAT_SPEED]; + statSums[i] += statValues[STAT_HP]; + monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type1]; + monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[i][j]].species].type2]; + } + + // Because GF hates temporary vars, trainerId acts like monTypesCount here. + for (trainerId = 0, j = 0; j < 32; j++) + { + if (monTypesBits & 1) + trainerId++; + monTypesBits >>= 1; + } + statSums[i] += (trainerId * monLevel) / 20; + } + + for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT - 1; i++) + { + for (j = i + 1; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++) + { + if (statSums[i] < statSums[j]) + { + SwapDomeTrainers(i, j, statSums); + } + else if (statSums[i] == statSums[j]) + { if (gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId > gSaveBlock2Ptr->frontier.domeTrainers[j].trainerId) SwapDomeTrainers(i, j, statSums); - } - } - } + } + } + } - Free(statSums); - Free(statValues); + Free(statSums); + Free(statValues); - for (i = 0; i < 4; i++) + for (i = 0; i < 4; i++) DecideRoundWinners(i); gSaveBlock2Ptr->frontier.lvlMode = lvlMode; @@ -6314,21 +6314,21 @@ static void DecideRoundWinners(u8 roundId) tournamentId1 = i; tournamentId2 = TournamentIdOfOpponent(roundId, gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId); // Frontier Brain always wins, check tournamentId1. - if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != INVALID_U8) + if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != 0xFF) { gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1; gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId; gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId); } // Frontier Brain always wins, check tournamentId2. - else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != INVALID_U8) + else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != 0xFF) { gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1; gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId; gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId); } // Decide which one of two trainers wins! - else if (tournamentId2 != INVALID_U8) + else if (tournamentId2 != 0xFF) { // BUG: points1 and points2 are not cleared at the beginning of the loop resulting in not fair results. diff --git a/src/battle_factory.c b/src/battle_factory.c index dd82da746..1d7fbafc9 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -202,9 +202,9 @@ static void sub_81A5E94(void) gUnknown_03001288 = FALSE; for (i = 0; i < 6; i++) - gSaveBlock2Ptr->frontier.field_E70[i].monId |= INVALID_U16; + gSaveBlock2Ptr->frontier.field_E70[i].monId |= 0xFFFF; for (i = 0; i < 3; i++) - gUnknown_03006298[i] |= INVALID_U16; + gUnknown_03006298[i] |= 0xFFFF; saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); gTrainerBattleOpponent_A = 0; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 88dbb5360..8d7ed2dce 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -122,7 +122,7 @@ void FreeBattleSpritesData(void) u16 ChooseMoveAndTargetInBattlePalace(void) { s32 i, var1, var2; - s32 chosenMoveId = INVALID_S32; + s32 chosenMoveId = -1; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF); s32 percent = Random() % 100; diff --git a/src/battle_interface.c b/src/battle_interface.c index fd6d2a0ab..9fd8e116a 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -543,11 +543,11 @@ enum static const u16 sStatusIconColors[] = { - RGB(24, 12, 24), // PAL_STATUS_PSN - RGB(23, 23, 3), // PAL_STATUS_PAR - RGB(20, 20, 17), // PAL_STATUS_SLP - RGB(17, 22, 28), // PAL_STATUS_FRZ - RGB(28, 14, 10) // PAL_STATUS_BRN + [PAL_STATUS_PSN] = RGB(24, 12, 24), + [PAL_STATUS_PAR] = RGB(23, 23, 3), + [PAL_STATUS_SLP] = RGB(20, 20, 17), + [PAL_STATUS_FRZ] = RGB(17, 22, 28), + [PAL_STATUS_BRN] = RGB(28, 14, 10), }; static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2 @@ -589,17 +589,17 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) for (; i > -1; i--) { - array[i] = INVALID_U8; + array[i] = 0xFF; } - if (arrayPtr[3] == INVALID_U8) + if (arrayPtr[3] == 0xFF) arrayPtr[3] = 0; if (arg2 == 0) { for (i = 0, j = 0; i < 4; i++) { - if (array[j] == INVALID_U8) + if (array[j] == 0xFF) { arg1[j] &= 0xFC00; arg1[j] |= 0x1E; @@ -622,7 +622,7 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) { for (i = 0; i < 4; i++) { - if (array[i] == INVALID_U8) + if (array[i] == 0xFF) { arg1[i] &= 0xFC00; arg1[i] |= 0x1E; @@ -647,225 +647,225 @@ NAKED static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2) { asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x4\n\ - adds r7, r1, 0\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - mov r10, r2\n\ - movs r3, 0\n\ - movs r2, 0\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + adds r7, r1, 0\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + mov r10, r2\n\ + movs r3, 0\n\ + movs r2, 0\n\ _08072324:\n\ - lsls r0, r3, 24\n\ - asrs r0, 24\n\ - mov r3, sp\n\ - adds r1, r3, r0\n\ - strb r2, [r1]\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _08072324\n\ - movs r3, 0x3\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - mov r9, r0\n\ - mov r8, sp\n\ + lsls r0, r3, 24\n\ + asrs r0, 24\n\ + mov r3, sp\n\ + adds r1, r3, r0\n\ + strb r2, [r1]\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x3\n\ + ble _08072324\n\ + movs r3, 0x3\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + mov r9, r0\n\ + mov r8, sp\n\ _08072344:\n\ - lsls r0, r5, 16\n\ - asrs r6, r0, 16\n\ - cmp r6, 0\n\ - ble _08072372\n\ - lsls r4, r3, 24\n\ - asrs r4, 24\n\ - mov r1, sp\n\ - adds r5, r1, r4\n\ - adds r0, r6, 0\n\ - movs r1, 0xA\n\ - bl __modsi3\n\ - strb r0, [r5]\n\ - adds r0, r6, 0\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - subs r4, 0x1\n\ - lsls r4, 24\n\ - lsrs r3, r4, 24\n\ - b _08072344\n\ + lsls r0, r5, 16\n\ + asrs r6, r0, 16\n\ + cmp r6, 0\n\ + ble _08072372\n\ + lsls r4, r3, 24\n\ + asrs r4, 24\n\ + mov r1, sp\n\ + adds r5, r1, r4\n\ + adds r0, r6, 0\n\ + movs r1, 0xA\n\ + bl __modsi3\n\ + strb r0, [r5]\n\ + adds r0, r6, 0\n\ + movs r1, 0xA\n\ + bl __divsi3\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + subs r4, 0x1\n\ + lsls r4, 24\n\ + lsrs r3, r4, 24\n\ + b _08072344\n\ _08072372:\n\ - lsls r1, r3, 24\n\ - asrs r0, r1, 24\n\ - cmp r0, r9\n\ - ble _08072396\n\ - movs r4, 0xFF\n\ - movs r3, 0x1\n\ - negs r3, r3\n\ + lsls r1, r3, 24\n\ + asrs r0, r1, 24\n\ + cmp r0, r9\n\ + ble _08072396\n\ + movs r4, 0xFF\n\ + movs r3, 0x1\n\ + negs r3, r3\n\ _08072380:\n\ - asrs r2, r1, 24\n\ - mov r5, sp\n\ - adds r1, r5, r2\n\ - ldrb r0, [r1]\n\ - orrs r0, r4\n\ - strb r0, [r1]\n\ - subs r2, 0x1\n\ - lsls r1, r2, 24\n\ - asrs r0, r1, 24\n\ - cmp r0, r3\n\ - bgt _08072380\n\ + asrs r2, r1, 24\n\ + mov r5, sp\n\ + adds r1, r5, r2\n\ + ldrb r0, [r1]\n\ + orrs r0, r4\n\ + strb r0, [r1]\n\ + subs r2, 0x1\n\ + lsls r1, r2, 24\n\ + asrs r0, r1, 24\n\ + cmp r0, r3\n\ + bgt _08072380\n\ _08072396:\n\ - mov r1, r8\n\ - ldrb r0, [r1, 0x3]\n\ - cmp r0, 0xFF\n\ - bne _080723A2\n\ - movs r0, 0\n\ - strb r0, [r1, 0x3]\n\ + mov r1, r8\n\ + ldrb r0, [r1, 0x3]\n\ + cmp r0, 0xFF\n\ + bne _080723A2\n\ + movs r0, 0\n\ + strb r0, [r1, 0x3]\n\ _080723A2:\n\ - mov r2, r10\n\ - cmp r2, 0\n\ - bne _08072432\n\ - movs r3, 0\n\ - movs r1, 0\n\ - movs r6, 0xFC\n\ - lsls r6, 8\n\ - movs r5, 0x1E\n\ - mov r12, r5\n\ + mov r2, r10\n\ + cmp r2, 0\n\ + bne _08072432\n\ + movs r3, 0\n\ + movs r1, 0\n\ + movs r6, 0xFC\n\ + lsls r6, 8\n\ + movs r5, 0x1E\n\ + mov r12, r5\n\ _080723B4:\n\ - lsls r1, 24\n\ - asrs r2, r1, 24\n\ - mov r0, sp\n\ - adds r5, r0, r2\n\ - ldrb r0, [r5]\n\ - mov r8, r1\n\ - cmp r0, 0xFF\n\ - bne _080723EA\n\ - lsls r1, r2, 1\n\ - adds r1, r7\n\ - ldrh r2, [r1]\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - mov r2, r12\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - lsls r3, 24\n\ - asrs r1, r3, 23\n\ - adds r1, r7\n\ - adds r1, 0x40\n\ - ldrh r2, [r1]\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - mov r5, r12\n\ - orrs r0, r5\n\ - strh r0, [r1]\n\ - b _0807241A\n\ + lsls r1, 24\n\ + asrs r2, r1, 24\n\ + mov r0, sp\n\ + adds r5, r0, r2\n\ + ldrb r0, [r5]\n\ + mov r8, r1\n\ + cmp r0, 0xFF\n\ + bne _080723EA\n\ + lsls r1, r2, 1\n\ + adds r1, r7\n\ + ldrh r2, [r1]\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + mov r2, r12\n\ + orrs r0, r2\n\ + strh r0, [r1]\n\ + lsls r3, 24\n\ + asrs r1, r3, 23\n\ + adds r1, r7\n\ + adds r1, 0x40\n\ + ldrh r2, [r1]\n\ + adds r0, r6, 0\n\ + ands r0, r2\n\ + mov r5, r12\n\ + orrs r0, r5\n\ + strh r0, [r1]\n\ + b _0807241A\n\ _080723EA:\n\ - lsls r2, 1\n\ - adds r2, r7\n\ - ldrh r0, [r2]\n\ - adds r1, r6, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x14\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - lsls r4, r3, 24\n\ - asrs r3, r4, 24\n\ - lsls r2, r3, 1\n\ - adds r2, r7\n\ - adds r2, 0x40\n\ - ldrh r0, [r2]\n\ - adds r1, r6, 0\n\ - ands r1, r0\n\ - mov r5, sp\n\ - adds r0, r5, r3\n\ - ldrb r0, [r0]\n\ - adds r0, 0x34\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - adds r3, r4, 0\n\ + lsls r2, 1\n\ + adds r2, r7\n\ + ldrh r0, [r2]\n\ + adds r1, r6, 0\n\ + ands r1, r0\n\ + ldrb r0, [r5]\n\ + adds r0, 0x14\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ + lsls r4, r3, 24\n\ + asrs r3, r4, 24\n\ + lsls r2, r3, 1\n\ + adds r2, r7\n\ + adds r2, 0x40\n\ + ldrh r0, [r2]\n\ + adds r1, r6, 0\n\ + ands r1, r0\n\ + mov r5, sp\n\ + adds r0, r5, r3\n\ + ldrb r0, [r0]\n\ + adds r0, 0x34\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ + adds r3, r4, 0\n\ _0807241A:\n\ - movs r0, 0x80\n\ - lsls r0, 17\n\ - add r0, r8\n\ - lsrs r1, r0, 24\n\ - movs r2, 0x80\n\ - lsls r2, 17\n\ - adds r0, r3, r2\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _080723B4\n\ - b _08072496\n\ + movs r0, 0x80\n\ + lsls r0, 17\n\ + add r0, r8\n\ + lsrs r1, r0, 24\n\ + movs r2, 0x80\n\ + lsls r2, 17\n\ + adds r0, r3, r2\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x3\n\ + ble _080723B4\n\ + b _08072496\n\ _08072432:\n\ - movs r3, 0\n\ - movs r4, 0xFC\n\ - lsls r4, 8\n\ - movs r6, 0x1E\n\ + movs r3, 0\n\ + movs r4, 0xFC\n\ + lsls r4, 8\n\ + movs r6, 0x1E\n\ _0807243A:\n\ - lsls r1, r3, 24\n\ - asrs r2, r1, 24\n\ - mov r3, sp\n\ - adds r5, r3, r2\n\ - ldrb r0, [r5]\n\ - adds r3, r1, 0\n\ - cmp r0, 0xFF\n\ - bne _08072466\n\ - lsls r1, r2, 1\n\ - adds r1, r7\n\ - ldrh r2, [r1]\n\ - adds r0, r4, 0\n\ - ands r0, r2\n\ - orrs r0, r6\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r2, [r1]\n\ - adds r0, r4, 0\n\ - ands r0, r2\n\ - orrs r0, r6\n\ - strh r0, [r1]\n\ - b _08072488\n\ + lsls r1, r3, 24\n\ + asrs r2, r1, 24\n\ + mov r3, sp\n\ + adds r5, r3, r2\n\ + ldrb r0, [r5]\n\ + adds r3, r1, 0\n\ + cmp r0, 0xFF\n\ + bne _08072466\n\ + lsls r1, r2, 1\n\ + adds r1, r7\n\ + ldrh r2, [r1]\n\ + adds r0, r4, 0\n\ + ands r0, r2\n\ + orrs r0, r6\n\ + strh r0, [r1]\n\ + adds r1, 0x40\n\ + ldrh r2, [r1]\n\ + adds r0, r4, 0\n\ + ands r0, r2\n\ + orrs r0, r6\n\ + strh r0, [r1]\n\ + b _08072488\n\ _08072466:\n\ - lsls r2, 1\n\ - adds r2, r7\n\ - ldrh r0, [r2]\n\ - adds r1, r4, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x14\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - adds r2, 0x40\n\ - ldrh r0, [r2]\n\ - adds r1, r4, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x34\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ + lsls r2, 1\n\ + adds r2, r7\n\ + ldrh r0, [r2]\n\ + adds r1, r4, 0\n\ + ands r1, r0\n\ + ldrb r0, [r5]\n\ + adds r0, 0x14\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ + adds r2, 0x40\n\ + ldrh r0, [r2]\n\ + adds r1, r4, 0\n\ + ands r1, r0\n\ + ldrb r0, [r5]\n\ + adds r0, 0x34\n\ + orrs r1, r0\n\ + strh r1, [r2]\n\ _08072488:\n\ - movs r5, 0x80\n\ - lsls r5, 17\n\ - adds r0, r3, r5\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _0807243A\n\ + movs r5, 0x80\n\ + lsls r5, 17\n\ + adds r0, r3, r5\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x3\n\ + ble _0807243A\n\ _08072496:\n\ - add sp, 0x4\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided"); } @@ -1580,7 +1580,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (i = 0; i < PARTY_SIZE; i++) { - if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg + if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg { gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].data[7] = 1; @@ -1599,7 +1599,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (i = 0, var = 5, j = 0; j < PARTY_SIZE; j++) { - if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg + if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg { gSprites[ballIconSpritesIds[var]].oam.tileNum += 1; gSprites[ballIconSpritesIds[var]].data[7] = 1; @@ -1628,7 +1628,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (var = 5, i = 0; i < PARTY_SIZE; i++) { - if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg + if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg { gSprites[ballIconSpritesIds[var]].oam.tileNum += 1; gSprites[ballIconSpritesIds[var]].data[7] = 1; @@ -1648,7 +1648,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, { for (var = 0, i = 0, j = 0; j < PARTY_SIZE; j++) { - if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg + if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg { gSprites[ballIconSpritesIds[i]].oam.tileNum += 1; gSprites[ballIconSpritesIds[i]].data[7] = 1; @@ -1765,7 +1765,7 @@ static void sub_8073E64(u8 taskId) s32 i; u8 battlerId = gTasks[taskId].tBattler; - if (--gTasks[taskId].tData15 == INVALID_S16) + if (--gTasks[taskId].tData15 == -1) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -1808,7 +1808,7 @@ static void sub_8073F98(u8 taskId) { SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8)); } - else if (gTasks[taskId].tData15 == INVALID_S16) + else if (gTasks[taskId].tData15 == -1) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -2289,7 +2289,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars)) MoveBattleBarGraphically(battlerId, whichBar); - if (currentBarValue == INVALID_S32) + if (currentBarValue == -1) gBattleSpritesDataPtr->battleBars[battlerId].currValue = 0; return currentBarValue; @@ -2376,12 +2376,12 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c if (maxValue < scale) { if (newValue == Q_24_8_TO_INT(*currValue) && (*currValue & 0xFF) == 0) - return INVALID_S32; + return -1; } else { if (newValue == *currValue) // we're done, the bar's value has been updated - return INVALID_S32; + return -1; } if (maxValue < scale) // handle cases of max var having less pixels than the whole bar @@ -2403,7 +2403,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c *currValue -= toAdd; ret = Q_24_8_TO_INT(*currValue); // try round up - if ((*currValue & INVALID_U8) > 0) + if ((*currValue & 0xFF) > 0) ret++; if (ret <= newValue) { diff --git a/src/battle_main.c b/src/battle_main.c index 19e85f1cf..9410946f6 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -500,7 +500,7 @@ const struct TrainerMoney gTrainerMoneyTable[] = {TRAINER_CLASS_HIKER, 10}, {TRAINER_CLASS_YOUNG_COUPLE, 8}, {TRAINER_CLASS_WINSTRATE, 10}, - {INVALID_U8, 5}, + {0xFF, 5}, }; #include "data/text/abilities.h" @@ -2251,7 +2251,7 @@ static void sub_8038F34(void) ShowBg(0); ShowBg(1); ShowBg(2); - gBattleCommunication[1] = INVALID_U8; + gBattleCommunication[1] = 0xFF; gBattleCommunication[MULTIUSE_STATE]++; break; case 1: @@ -2993,7 +2993,7 @@ static void BattleStartClearSetData(void) gLastLandedMoves[i] = 0; gLastHitByType[i] = 0; gLastResultingMoves[i] = 0; - gLastHitBy[i] = INVALID_U8; + gLastHitBy[i] = 0xFF; gLockedMoves[i] = 0; gLastPrintedMoves[i] = 0; gBattleResources->flags->flags[i] = 0; @@ -3161,7 +3161,7 @@ void SwitchInClearSetData(void) gLastHitByType[gActiveBattler] = 0; gLastResultingMoves[gActiveBattler] = 0; gLastPrintedMoves[gActiveBattler] = 0; - gLastHitBy[gActiveBattler] = INVALID_U8; + gLastHitBy[gActiveBattler] = 0xFF; *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 0) = 0; *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 1) = 0; @@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void) gBattleResources->flags->flags[gActiveBattler] = 0; gCurrentMove = 0; - gBattleStruct->field_DA = INVALID_U8; + gBattleStruct->field_DA = 0xFF; ClearBattlerMoveHistory(gActiveBattler); ClearBattlerAbilityHistory(gActiveBattler); @@ -3253,7 +3253,7 @@ void FaintClearSetData(void) gLastHitByType[gActiveBattler] = 0; gLastResultingMoves[gActiveBattler] = 0; gLastPrintedMoves[gActiveBattler] = 0; - gLastHitBy[gActiveBattler] = INVALID_U8; + gLastHitBy[gActiveBattler] = 0xFF; *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 0) = 0; *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 1) = 0; @@ -3440,7 +3440,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = INVALID_U16; + hpStatus[i].hp = 0xFFFF; hpStatus[i].status = 0; } else @@ -3458,7 +3458,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = INVALID_U16; + hpStatus[i].hp = 0xFFFF; hpStatus[i].status = 0; } else @@ -3484,7 +3484,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = INVALID_U16; + hpStatus[i].hp = 0xFFFF; hpStatus[i].status = 0; } else @@ -3610,85 +3610,85 @@ NAKED static void BattleIntroOpponent1SendsOutMonAnimation(void) { asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r2, [r0]\n\ - movs r0, 0x80\n\ - lsls r0, 17\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0803B298\n\ - movs r0, 0x80\n\ - lsls r0, 18\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _0803B298\n\ - movs r1, 0x80\n\ - lsls r1, 24\n\ - ands r1, r2\n\ - negs r0, r1\n\ - orrs r0, r1\n\ - lsrs r5, r0, 31\n\ - b _0803B29A\n\ - .pool\n\ + push {r4-r6,lr}\n\ + ldr r0, =gBattleTypeFlags\n\ + ldr r2, [r0]\n\ + movs r0, 0x80\n\ + lsls r0, 17\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0803B298\n\ + movs r0, 0x80\n\ + lsls r0, 18\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0803B298\n\ + movs r1, 0x80\n\ + lsls r1, 24\n\ + ands r1, r2\n\ + negs r0, r1\n\ + orrs r0, r1\n\ + lsrs r5, r0, 31\n\ + b _0803B29A\n\ + .pool\n\ _0803B288:\n\ - ldr r1, =gBattleMainFunc\n\ - ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\ - b _0803B2F0\n\ - .pool\n\ + ldr r1, =gBattleMainFunc\n\ + ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\ + b _0803B2F0\n\ + .pool\n\ _0803B298:\n\ - movs r5, 0x1\n\ + movs r5, 0x1\n\ _0803B29A:\n\ - ldr r0, =gBattleControllerExecFlags\n\ - ldr r2, [r0]\n\ - cmp r2, 0\n\ - bne _0803B2F2\n\ - ldr r0, =gActiveBattler\n\ - strb r2, [r0]\n\ - ldr r1, =gBattlersCount\n\ - adds r4, r0, 0\n\ - ldrb r1, [r1]\n\ - cmp r2, r1\n\ - bcs _0803B2EC\n\ - adds r6, r4, 0\n\ + ldr r0, =gBattleControllerExecFlags\n\ + ldr r2, [r0]\n\ + cmp r2, 0\n\ + bne _0803B2F2\n\ + ldr r0, =gActiveBattler\n\ + strb r2, [r0]\n\ + ldr r1, =gBattlersCount\n\ + adds r4, r0, 0\n\ + ldrb r1, [r1]\n\ + cmp r2, r1\n\ + bcs _0803B2EC\n\ + adds r6, r4, 0\n\ _0803B2B2:\n\ - ldrb r0, [r4]\n\ - bl GetBattlerPosition\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, r5\n\ - bne _0803B2D8\n\ - movs r0, 0\n\ - bl BtlController_EmitIntroTrainerBallThrow\n\ - ldrb r0, [r4]\n\ - bl MarkBattlerForControllerExec\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r0, [r0]\n\ - ldr r1, =0x00008040\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0803B288\n\ + ldrb r0, [r4]\n\ + bl GetBattlerPosition\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, r5\n\ + bne _0803B2D8\n\ + movs r0, 0\n\ + bl BtlController_EmitIntroTrainerBallThrow\n\ + ldrb r0, [r4]\n\ + bl MarkBattlerForControllerExec\n\ + ldr r0, =gBattleTypeFlags\n\ + ldr r0, [r0]\n\ + ldr r1, =0x00008040\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0803B288\n\ _0803B2D8:\n\ - ldrb r0, [r6]\n\ - adds r0, 0x1\n\ - strb r0, [r6]\n\ - ldr r1, =gBattlersCount\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - ldr r4, =gActiveBattler\n\ - ldrb r1, [r1]\n\ - cmp r0, r1\n\ - bcc _0803B2B2\n\ + ldrb r0, [r6]\n\ + adds r0, 0x1\n\ + strb r0, [r6]\n\ + ldr r1, =gBattlersCount\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + ldr r4, =gActiveBattler\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcc _0803B2B2\n\ _0803B2EC:\n\ - ldr r1, =gBattleMainFunc\n\ - ldr r0, =BattleIntroRecordMonsToDex\n\ + ldr r1, =gBattleMainFunc\n\ + ldr r0, =BattleIntroRecordMonsToDex\n\ _0803B2F0:\n\ - str r0, [r1]\n\ + str r0, [r1]\n\ _0803B2F2:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ .syntax divided"); } #endif // NONMATCHING @@ -3991,7 +3991,7 @@ void BattleTurnPassed(void) return; } - if (gBattleResults.battleTurnCounter < INVALID_U8) + if (gBattleResults.battleTurnCounter < 0xFF) { gBattleResults.battleTurnCounter++; gBattleStruct->field_DA++; @@ -4375,7 +4375,7 @@ static void HandleTurnActionSelectionState(void) return; default: sub_818603C(2); - if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == INVALID_U16) + if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF) { gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN; RecordedBattle_ClearBattlerAction(gActiveBattler, 1); @@ -4591,10 +4591,10 @@ static void sub_803CDF8(void) void SwapTurnOrder(u8 id1, u8 id2) { - u32 temp; + u32 temp; - SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp); - SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp); + SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp); + SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp); } u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) @@ -5740,7 +5740,7 @@ static void HandleAction_ThrowPokeblock(void) gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1; gLastUsedItem = gBattleBufferB[gBattlerAttacker][2]; - if (gBattleResults.pokeblockThrows < INVALID_U8) + if (gBattleResults.pokeblockThrows < 0xFF) gBattleResults.pokeblockThrows++; if (gBattleStruct->safariPkblThrowCounter < 3) gBattleStruct->safariPkblThrowCounter++; diff --git a/src/battle_message.c b/src/battle_message.c index c483740f6..c5acf75c0 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1156,7 +1156,7 @@ const u16 gCaughtMonStringIds[] = const u16 gTrappingMoves[] = { - MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, INVALID_U16 + MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xFFFF }; const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!"); @@ -1299,14 +1299,14 @@ static const u8 sText_RefCommenceBattle[] = _("REFEREE: {B_PLAYER_MON1_NAME} VS const u8 * const gRefereeStringsTable[] = { sText_RefIfNothingIsDecided, - sText_RefThatsIt, - sText_RefJudgeMind, - sText_RefJudgeSkill, - sText_RefJudgeBody, - sText_RefJudgement1, - sText_RefJudgement2, - sText_RefJudgement3, - sText_RefCommenceBattle, + sText_RefThatsIt, + sText_RefJudgeMind, + sText_RefJudgeSkill, + sText_RefJudgeBody, + sText_RefJudgement1, + sText_RefJudgement2, + sText_RefJudgement3, + sText_RefCommenceBattle, }; static const u8 sText_QuestionForfeitMatch[] = _("Would you like to forfeit the match\nand quit now?"); @@ -1368,574 +1368,574 @@ static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = { // The corresponding WindowTemplate is gStandardBattleWindowTemplates[] within src/battle_bg.c - { // 0 Standard battle message - .fillValue = 0xFF, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 1, - .fgColor = 1, - .bgColor = 15, - .shadowColor = 6, - }, - { // 1 "What will (pokemon) do?" - .fillValue = 0xFF, - .fontId = 1, - .x = 1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 15, - .shadowColor = 6, - }, - { // 2 "Fight/Pokemon/Bag/Run" - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 3 Top left move - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 4 Top right move - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 5 Bottom left move - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 6 Bottom right move - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 7 "PP" - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 12, - .bgColor = 14, - .shadowColor = 11, - }, - { // 8 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 9 PP remaining - .fillValue = 0xEE, - .fontId = 1, - .x = 2, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 12, - .bgColor = 14, - .shadowColor = 11, - }, - { // 10 "type" - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 11 "switch which?" - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 12 "gText_BattleYesNoChoice" - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 13 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 14 - .fillValue = 0x0, - .fontId = 1, - .x = 32, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 2, - }, - { // 15 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 16 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 17 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 18 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 19 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 20 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 21 - .fillValue = 0x0, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 6, - }, - { // 22 - .fillValue = 0x0, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 6, - }, - { // 23 - .fillValue = 0x0, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 6, - }, + { // 0 Standard battle message + .fillValue = 0xFF, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 1 "What will (pokemon) do?" + .fillValue = 0xFF, + .fontId = 1, + .x = 1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 2 "Fight/Pokemon/Bag/Run" + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 3 Top left move + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 4 Top right move + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 5 Bottom left move + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 6 Bottom right move + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 7 "PP" + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 8 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 9 PP remaining + .fillValue = 0xEE, + .fontId = 1, + .x = 2, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 10 "type" + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 11 "switch which?" + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 12 "gText_BattleYesNoChoice" + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 13 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 14 + .fillValue = 0x0, + .fontId = 1, + .x = 32, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 2, + }, + { // 15 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 16 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 17 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 18 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 19 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 20 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 21 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, + { // 22 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, + { // 23 + .fillValue = 0x0, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 6, + }, }; static const struct BattleWindowText sTextOnWindowsInfo_Arena[] = { - { // 0 - .fillValue = 0xFF, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 1, - .fgColor = 1, - .bgColor = 15, - .shadowColor = 6, - }, - { // 1 - .fillValue = 0xFF, - .fontId = 1, - .x = 1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 15, - .shadowColor = 6, - }, - { // 2 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 3 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 4 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 5 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 6 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 7 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 12, - .bgColor = 14, - .shadowColor = 11, - }, - { // 8 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 9 - .fillValue = 0xEE, - .fontId = 1, - .x = 2, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 12, - .bgColor = 14, - .shadowColor = 11, - }, - { // 10 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 11 - .fillValue = 0xEE, - .fontId = 7, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 12 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 13 - .fillValue = 0xEE, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 14 - .fillValue = 0x0, - .fontId = 1, - .x = 32, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 0, - .shadowColor = 2, - }, - { // 15 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 1, - .bgColor = 14, - .shadowColor = 15, - }, - { // 16 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 17 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 18 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 19 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 20 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 21 - .fillValue = 0xEE, - .fontId = 1, - .x = -1, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 0, - .fgColor = 13, - .bgColor = 14, - .shadowColor = 15, - }, - { // 22 - .fillValue = 0x11, - .fontId = 1, - .x = 0, - .y = 1, - .letterSpacing = 0, - .lineSpacing = 0, - .speed = 1, - .fgColor = 2, - .bgColor = 1, - .shadowColor = 3, - }, + { // 0 + .fillValue = 0xFF, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 1 + .fillValue = 0xFF, + .fontId = 1, + .x = 1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 15, + .shadowColor = 6, + }, + { // 2 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 3 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 4 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 5 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 6 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 7 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 8 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 9 + .fillValue = 0xEE, + .fontId = 1, + .x = 2, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 12, + .bgColor = 14, + .shadowColor = 11, + }, + { // 10 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 11 + .fillValue = 0xEE, + .fontId = 7, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 12 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 13 + .fillValue = 0xEE, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 14 + .fillValue = 0x0, + .fontId = 1, + .x = 32, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 0, + .shadowColor = 2, + }, + { // 15 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 1, + .bgColor = 14, + .shadowColor = 15, + }, + { // 16 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 17 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 18 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 19 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 20 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 21 + .fillValue = 0xEE, + .fontId = 1, + .x = -1, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 0, + .fgColor = 13, + .bgColor = 14, + .shadowColor = 15, + }, + { // 22 + .fillValue = 0x11, + .fontId = 1, + .x = 0, + .y = 1, + .letterSpacing = 0, + .lineSpacing = 0, + .speed = 1, + .fgColor = 2, + .bgColor = 1, + .shadowColor = 3, + }, }; static const struct BattleWindowText *const sBattleTextOnWindowsInfo[] = @@ -2967,7 +2967,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) printerTemplate.bgColor = textInfo[windowId].bgColor; printerTemplate.shadowColor = textInfo[windowId].shadowColor; - if (printerTemplate.x == INVALID_U8) + if (printerTemplate.x == 0xFF) { u32 width = sub_80397C4(gBattleScripting.windowsType, windowId); s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(printerTemplate.fontId, printerTemplate.currentChar, width, printerTemplate.letterSpacing); diff --git a/src/battle_pike.c b/src/battle_pike.c index 590fd3d74..d86677e48 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -1228,7 +1228,7 @@ static void sub_81A7E60(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 sub_81A7EC4(void) { - if (FindTaskIdByFunc(sub_81A7D54) == INVALID_U8) + if (FindTaskIdByFunc(sub_81A7D54) == 0xFF) return TRUE; else return FALSE; @@ -1448,7 +1448,7 @@ static void sub_81A84B4(void) u8 i; for (i = 0; i < 14; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; + gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; } static void sub_81A84EC(void) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 36c757c93..f27af2615 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1541,7 +1541,7 @@ void sub_81AA1D8(void) u8 var0, var1; for (i = 0; i < 8; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; + gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; id = sub_81AA9E4(); sub_81AA33C(&var0, &var1); diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index 8b3a509b9..8a6348522 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -388,11 +388,11 @@ void sub_81C4F98(u8 a0, void (*callback)(void)) gPyramidBagCursorData.callback = callback; gPyramidBagResources->callback2 = NULL; - gPyramidBagResources->unk814 = INVALID_U8; - gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8; + gPyramidBagResources->unk814 = 0xFF; + gPyramidBagResources->scrollIndicatorsTaskId = 0xFF; - memset(gPyramidBagResources->itemsSpriteIds, INVALID_U8, sizeof(gPyramidBagResources->itemsSpriteIds)); - memset(gPyramidBagResources->windowIds, INVALID_U8, sizeof(gPyramidBagResources->windowIds)); + memset(gPyramidBagResources->itemsSpriteIds, 0xFF, sizeof(gPyramidBagResources->itemsSpriteIds)); + memset(gPyramidBagResources->windowIds, 0xFF, sizeof(gPyramidBagResources->windowIds)); SetMainCallback2(sub_81C504C); } @@ -604,7 +604,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen PlaySE(SE_SELECT); sub_81C6F20(); } - if (gPyramidBagResources->unk814 == INVALID_U8) + if (gPyramidBagResources->unk814 == 0xFF) { sub_81C6FF8(gPyramidBagResources->unk815 ^ 1); if (itemIndex != LIST_B_PRESSED) @@ -622,7 +622,7 @@ static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y) if (itemIndex == LIST_B_PRESSED) return; - if (gPyramidBagResources->unk814 != INVALID_U8) + if (gPyramidBagResources->unk814 != 0xFF) { if (gPyramidBagResources->unk814 == (u8)(itemIndex)) sub_81C5AB8(y, 1); @@ -657,16 +657,16 @@ static void PrintItemDescription(s32 listMenuId) static void AddScrollArrow(void) { - if (gPyramidBagResources->scrollIndicatorsTaskId == INVALID_U8) + if (gPyramidBagResources->scrollIndicatorsTaskId == 0xFF) gPyramidBagResources->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(2, 172, 12, 148, gPyramidBagResources->listMenuCount - gPyramidBagResources->listMenuMaxShown, 0xB5E, 0xB5E, &gPyramidBagCursorData.scrollPosition); } static void RemoveScrollArrow(void) { - if (gPyramidBagResources->scrollIndicatorsTaskId != INVALID_U8) + if (gPyramidBagResources->scrollIndicatorsTaskId != 0xFF) { RemoveScrollIndicatorArrowPair(gPyramidBagResources->scrollIndicatorsTaskId); - gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8; + gPyramidBagResources->scrollIndicatorsTaskId = 0xFF; } } @@ -803,7 +803,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1) static void sub_81C5AB8(u8 y, u8 arg1) { - if (arg1 == INVALID_U8) + if (arg1 == 0xFF) FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1); @@ -1323,7 +1323,7 @@ static void PerformItemSwap(u8 taskId) else { MovePyramidBagItemSlotInList(data[1], var); - gPyramidBagResources->unk814 = INVALID_U8; + gPyramidBagResources->unk814 = 0xFF; sub_81C7028(TRUE); DestroyListMenuTask(data[0], scrollOffset, selectedRow); if (data[1] < var) @@ -1340,7 +1340,7 @@ static void sub_81C6A14(u8 taskId) u16 *scrollOffset = &gPyramidBagCursorData.scrollPosition; u16 *selectedRow = &gPyramidBagCursorData.cursorPosition; - gPyramidBagResources->unk814 = INVALID_U8; + gPyramidBagResources->unk814 = 0xFF; sub_81C7028(TRUE); DestroyListMenuTask(data[0], scrollOffset, selectedRow); if (data[1] < *scrollOffset + *selectedRow) @@ -1427,7 +1427,7 @@ static u8 sub_81C6D08(u8 windowArrayId) static u8 sub_81C6D24(u8 windowArrayId) { u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; - if (*windowId == INVALID_U8) + if (*windowId == 0xFF) { *windowId = AddWindow(&gUnknown_0861F350[windowArrayId]); SetWindowBorderStyle(*windowId, FALSE, 1, 0xE); @@ -1439,13 +1439,13 @@ static u8 sub_81C6D24(u8 windowArrayId) static void sub_81C6D6C(u8 windowArrayId) { u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId]; - if (*windowId != INVALID_U8) + if (*windowId != 0xFF) { sub_8198070(*windowId, FALSE); ClearWindowTilemap(*windowId); RemoveWindow(*windowId); schedule_bg_copy_tilemap_to_vram(1); - *windowId = INVALID_U8; + *windowId = 0xFF; } } @@ -1473,13 +1473,13 @@ static void sub_81C6E1C(void) static void sub_81C6E38(u8 itemSpriteArrayId) { u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId]; - if (*spriteId != INVALID_U8) + if (*spriteId != 0xFF) { FreeSpriteTilesByTag(ITEM_IMAGE_TAG + itemSpriteArrayId); FreeSpritePaletteByTag(ITEM_IMAGE_TAG + itemSpriteArrayId); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = INVALID_U8; + *spriteId = 0xFF; } } @@ -1524,7 +1524,7 @@ static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId) { u8 itemSpriteId; u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId + 1]; - if (*spriteId == INVALID_U8) + if (*spriteId == 0xFF) { FreeSpriteTilesByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId); FreeSpritePaletteByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 53f8defa5..610d0050e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] = static const u8* const sMoveEffectBS_Ptrs[] = { - BattleScript_MoveEffectSleep, // 0 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP - BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON - BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN - BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE - BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS - BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC - BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION - BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH - BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK - BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR - BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY - BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING - BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM - BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN - BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 + BattleScript_MoveEffectSleep, // 0 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP + BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON + BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN + BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE + BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS + BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC + BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION + BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH + BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK + BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR + BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY + BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING + BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP + BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM + BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN + BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN + BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 }; static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; @@ -763,8 +763,8 @@ static const struct SpriteTemplate sSpriteTemplate_MonIconOnLvlUpBox = static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / 4, USHRT_MAX / 8}; #define MIMIC_FORBIDDEN_END 0xFFFE -#define METRONOME_FORBIDDEN_END INVALID_U16 -#define ASSIST_FORBIDDEN_END INVALID_U16 +#define METRONOME_FORBIDDEN_END 0xFFFF +#define ASSIST_FORBIDDEN_END 0xFFFF static const u16 sMovesForbiddenToCopy[] = { @@ -822,44 +822,44 @@ static const u16 sWeightToDamageTable[] = 500, 60, 1000, 80, 2000, 100, - INVALID_U16, INVALID_U16 + 0xFFFF, 0xFFFF }; static const u16 sPickupItems[] = { ITEM_POTION, - ITEM_ANTIDOTE, - ITEM_SUPER_POTION, - ITEM_GREAT_BALL, - ITEM_REPEL, - ITEM_ESCAPE_ROPE, - ITEM_X_ATTACK, - ITEM_FULL_HEAL, - ITEM_ULTRA_BALL, - ITEM_HYPER_POTION, - ITEM_RARE_CANDY, - ITEM_PROTEIN, - ITEM_REVIVE, - ITEM_HP_UP, - ITEM_FULL_RESTORE, - ITEM_MAX_REVIVE, - ITEM_PP_UP, - ITEM_MAX_ELIXIR, + ITEM_ANTIDOTE, + ITEM_SUPER_POTION, + ITEM_GREAT_BALL, + ITEM_REPEL, + ITEM_ESCAPE_ROPE, + ITEM_X_ATTACK, + ITEM_FULL_HEAL, + ITEM_ULTRA_BALL, + ITEM_HYPER_POTION, + ITEM_RARE_CANDY, + ITEM_PROTEIN, + ITEM_REVIVE, + ITEM_HP_UP, + ITEM_FULL_RESTORE, + ITEM_MAX_REVIVE, + ITEM_PP_UP, + ITEM_MAX_ELIXIR, }; static const u16 sRarePickupItems[] = { ITEM_HYPER_POTION, - ITEM_NUGGET, - ITEM_KINGS_ROCK, - ITEM_FULL_RESTORE, - ITEM_ETHER, - ITEM_WHITE_HERB, - ITEM_TM44_REST, - ITEM_ELIXIR, - ITEM_TM01_FOCUS_PUNCH, - ITEM_LEFTOVERS, - ITEM_TM26_EARTHQUAKE, + ITEM_NUGGET, + ITEM_KINGS_ROCK, + ITEM_FULL_RESTORE, + ITEM_ETHER, + ITEM_WHITE_HERB, + ITEM_TM44_REST, + ITEM_ELIXIR, + ITEM_TM01_FOCUS_PUNCH, + ITEM_LEFTOVERS, + ITEM_TM26_EARTHQUAKE, }; static const u8 sPickupProbabilities[] = @@ -917,10 +917,10 @@ const ALIGNED(4) u8 gUnknown_0831C494[][4] = static const u8 sUnknown_0831C4F8[] = { - 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00, - 0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01, - 0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02, - 0x03, 0x00, 0x00, 0x00 + 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00, + 0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01, + 0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02, + 0x03, 0x00, 0x00, 0x00 }; static void atk00_attackcanceler(void) @@ -1976,7 +1976,7 @@ static void atk0C_datahpupdate(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gSpecialStatuses[gActiveBattler].dmg == 0) - gSpecialStatuses[gActiveBattler].dmg = INVALID_U16; + gSpecialStatuses[gActiveBattler].dmg = 0xFFFF; } gBattlescriptCurrInstr += 2; } @@ -2579,7 +2579,7 @@ void SetMoveEffect(bool8 primary, u8 certain) u16 PayDay = gPaydayMoney; gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5); if (PayDay > gPaydayMoney) - gPaydayMoney = INVALID_U16; + gPaydayMoney = 0xFFFF; } BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; @@ -3403,8 +3403,8 @@ static void atk23_getexp(void) PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId) - // buffer 'gained' or 'gained a boosted' - PREPARE_STRING_BUFFER(gBattleTextBuff2, i) + // buffer 'gained' or 'gained a boosted' + PREPARE_STRING_BUFFER(gBattleTextBuff2, i) PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage) @@ -4490,24 +4490,24 @@ static void atk48_playstatchangeanimation(void) enum { - ATK49_RAGE, - ATK49_DEFROST, - ATK49_SYNCHRONIZE_TARGET, - ATK49_MOVE_END_ABILITIES, - ATK49_STATUS_IMMUNITY_ABILITIES, - ATK49_SYNCHRONIZE_ATTACKER, - ATK49_CHOICE_MOVE, - ATK49_CHANGED_ITEMS, - ATK49_ATTACKER_INVISIBLE, - ATK49_ATTACKER_VISIBLE, - ATK49_TARGET_VISIBLE, - ATK49_ITEM_EFFECTS_ALL, - ATK49_KINGSROCK_SHELLBELL, - ATK49_SUBSTITUTE, - ATK49_UPDATE_LAST_MOVES, - ATK49_MIRROR_MOVE, - ATK49_NEXT_TARGET, - ATK49_COUNT, + ATK49_RAGE, + ATK49_DEFROST, + ATK49_SYNCHRONIZE_TARGET, + ATK49_MOVE_END_ABILITIES, + ATK49_STATUS_IMMUNITY_ABILITIES, + ATK49_SYNCHRONIZE_ATTACKER, + ATK49_CHOICE_MOVE, + ATK49_CHANGED_ITEMS, + ATK49_ATTACKER_INVISIBLE, + ATK49_ATTACKER_VISIBLE, + ATK49_TARGET_VISIBLE, + ATK49_ITEM_EFFECTS_ALL, + ATK49_KINGSROCK_SHELLBELL, + ATK49_SUBSTITUTE, + ATK49_UPDATE_LAST_MOVES, + ATK49_MIRROR_MOVE, + ATK49_NEXT_TARGET, + ATK49_COUNT, }; static void atk49_moveend(void) @@ -4520,7 +4520,7 @@ static void atk49_moveend(void) u8 arg1, arg2; u16 originallyUsedMove; - if (gChosenMove == INVALID_U16) + if (gChosenMove == 0xFFFF) originallyUsedMove = 0; else originallyUsedMove = gChosenMove; @@ -4593,7 +4593,7 @@ static void atk49_moveend(void) break; case ATK49_CHOICE_MOVE: // update choice band move if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND - || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != INVALID_U16)) + || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF)) goto LOOP; if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED)) { @@ -4708,8 +4708,8 @@ static void atk49_moveend(void) } else { - gLastMoves[gBattlerAttacker] = INVALID_U16; - gLastResultingMoves[gBattlerAttacker] = INVALID_U16; + gLastMoves[gBattlerAttacker] = 0xFFFF; + gLastResultingMoves[gBattlerAttacker] = 0xFFFF; } if (!(gHitMarker & HITMARKER_FAINTED(gBattlerTarget))) @@ -4717,7 +4717,7 @@ static void atk49_moveend(void) if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - if (gChosenMove == INVALID_U16) + if (gChosenMove == 0xFFFF) { gLastLandedMoves[gBattlerTarget] = gChosenMove; } @@ -4729,7 +4729,7 @@ static void atk49_moveend(void) } else { - gLastLandedMoves[gBattlerTarget] = INVALID_U16; + gLastLandedMoves[gBattlerTarget] = 0xFFFF; } } gBattleScripting.atk49_state++; @@ -5560,7 +5560,7 @@ static void atk52_switchineffects(void) gDisableStructs[gActiveBattler].truantUnknownBit = 0; if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0) - && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) + && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) { gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED); @@ -5662,7 +5662,7 @@ static void atk59_handlelearnnewmove(void) { gBattlescriptCurrInstr = jumpPtr2; } - else if (ret == INVALID_U16) + else if (ret == 0xFFFF) { gBattlescriptCurrInstr += 10; } @@ -6015,7 +6015,7 @@ static void atk61_drawpartystatussummary(void) if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatuses[i].hp = INVALID_U16; + hpStatuses[i].hp = 0xFFFF; hpStatuses[i].status = 0; } else @@ -6930,7 +6930,7 @@ static void atk7C_trymirrormove(void) move = *(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0) | (*(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) << 8); - if (move != 0 && move != INVALID_U16) + if (move != 0 && move != 0xFFFF) { movesArray[validMovesCount] = move; validMovesCount++; @@ -6941,7 +6941,7 @@ static void atk7C_trymirrormove(void) move = *(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 0) | (*(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 1) << 8); - if (move != 0 && move != INVALID_U16) + if (move != 0 && move != 0xFFFF) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = move; @@ -7094,7 +7094,7 @@ bool8 UproarWakeUpCheck(u8 battlerId) gBattleScripting.battler = i; - if (gBattlerTarget == INVALID_U8) + if (gBattlerTarget == 0xFF) gBattlerTarget = i; else if (gBattlerTarget == i) gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -8008,7 +8008,7 @@ static void atk9A_setfocusenergy(void) static void atk9B_transformdataexecution(void) { - gChosenMove = INVALID_U16; + gChosenMove = 0xFFFF; gBattlescriptCurrInstr++; if (gBattleMons[gBattlerTarget].status2 & STATUS2_TRANSFORMED || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE) @@ -8088,12 +8088,12 @@ static bool8 IsMoveUncopyableByMimic(u16 move) static void atk9D_mimicattackcopy(void) { - gChosenMove = INVALID_U16; + gChosenMove = 0xFFFF; if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget]) || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED || gLastMoves[gBattlerTarget] == 0 - || gLastMoves[gBattlerTarget] == INVALID_U16) + || gLastMoves[gBattlerTarget] == 0xFFFF) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8296,7 +8296,7 @@ static void atkA5_painsplitdmgcalc(void) storeLoc[3] = (painSplitHp & 0xFF000000) >> 24; gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff; - gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16; + gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; gBattlescriptCurrInstr += 5; } @@ -8309,7 +8309,7 @@ static void atkA5_painsplitdmgcalc(void) static void atkA6_settypetorandomresistance(void) // conversion 2 { if (gLastLandedMoves[gBattlerAttacker] == 0 - || gLastLandedMoves[gBattlerAttacker] == INVALID_U16) + || gLastLandedMoves[gBattlerAttacker] == 0xFFFF) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8376,12 +8376,12 @@ static void atkA7_setalwayshitflag(void) static void atkA8_copymovepermanently(void) // sketch { - gChosenMove = INVALID_U16; + gChosenMove = 0xFFFF; if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE && gLastPrintedMoves[gBattlerTarget] != 0 - && gLastPrintedMoves[gBattlerTarget] != INVALID_U16 + && gLastPrintedMoves[gBattlerTarget] != 0xFFFF && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH) { s32 i; @@ -8550,7 +8550,7 @@ static void atkAC_remaininghptopower(void) static void atkAD_tryspiteppreduce(void) { if (gLastMoves[gBattlerTarget] != 0 - && gLastMoves[gBattlerTarget] != INVALID_U16) + && gLastMoves[gBattlerTarget] != 0xFFFF) { s32 i; @@ -9671,13 +9671,13 @@ static void atkDC_trysetgrudge(void) static void atkDD_weightdamagecalculation(void) { s32 i; - for (i = 0; sWeightToDamageTable[i] != INVALID_U16; i += 2) + for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2) { if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1)) break; } - if (sWeightToDamageTable[i] != INVALID_U16) + if (sWeightToDamageTable[i] != 0xFFFF) gDynamicBasePower = sWeightToDamageTable[i + 1]; else gDynamicBasePower = 120; diff --git a/src/battle_setup.c b/src/battle_setup.c index 0b5cd9e21..4243d2f3f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1530,7 +1530,7 @@ static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *tab return i; } - return INVALID_S32; + return -1; } static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) @@ -1548,7 +1548,7 @@ static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 tra } } - return INVALID_S32; + return -1; } static bool32 sub_80B1D94(s32 rematchTableId) @@ -1640,7 +1640,7 @@ static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table, { s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; if (tableId >= 100) return FALSE; @@ -1654,7 +1654,7 @@ static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 t { s32 tableId = TrainerIdToRematchTableId(table, trainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; if (tableId >= 100) return FALSE; @@ -1670,7 +1670,7 @@ static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 s32 i; s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; trainerEntry = &table[tableId]; @@ -1691,7 +1691,7 @@ static u16 GetLastBeatenRematchTrainerIdFromTable(const struct RematchTrainer *t s32 i; s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; trainerEntry = &table[tableId]; @@ -1710,7 +1710,7 @@ static void ClearTrainerWantRematchState(const struct RematchTrainer *table, u16 { s32 tableId = TrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId != INVALID_S32) + if (tableId != -1) gSaveBlock1Ptr->trainerRematches[tableId] = 0; } @@ -1724,7 +1724,7 @@ static u32 GetTrainerMatchCallFlag(u32 trainerId) return FLAG_MATCH_CALL_REGISTERED + i; } - return INVALID_U16; + return 0xFFFF; } static void RegisterTrainerInMatchCall(void) @@ -1732,7 +1732,7 @@ static void RegisterTrainerInMatchCall(void) if (FlagGet(FLAG_HAS_MATCH_CALL)) { u32 matchCallFlagId = GetTrainerMatchCallFlag(gTrainerBattleOpponent_A); - if (matchCallFlagId != INVALID_U16) + if (matchCallFlagId != 0xFFFF) FlagSet(matchCallFlagId); } } @@ -1741,7 +1741,7 @@ static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBa { s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); - if (tableId == INVALID_S32) + if (tableId == -1) return FALSE; if (!HasTrainerBeenFought(table[tableId].trainerIds[1])) return FALSE; diff --git a/src/battle_tent.c b/src/battle_tent.c index 836b2b6de..c7e70912c 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -364,7 +364,7 @@ static void sub_81BA040(void) } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum); gTrainerBattleOpponent_A = trainerId; - while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != INVALID_U16) + while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != 0xFFFF) setsCount++; if (setsCount > 8) break; diff --git a/src/battle_tower.c b/src/battle_tower.c index c74cfd9a0..f9dfcabd1 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -973,7 +973,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount) // Attempt to fill the trainer's party with random Pokemon until 3 have been // successfully chosen. The trainer's party may not have duplicate pokemon species // or duplicate held items. - for (bfMonCount = 0; monSets[bfMonCount] != INVALID_U16; bfMonCount++) + for (bfMonCount = 0; monSets[bfMonCount] != 0xFFFF; bfMonCount++) ; i = 0; otID = Random32(); @@ -1081,11 +1081,11 @@ u16 RandomizeFacilityTrainerMonSet(u16 trainerId) u8 bfMonCount = 0; u32 monSetId = monSets[bfMonCount]; - while (monSetId != INVALID_U16) + while (monSetId != 0xFFFF) { bfMonCount++; monSetId = monSets[bfMonCount]; - if (monSetId == INVALID_U16) + if (monSetId == 0xFFFF) break; } @@ -2641,11 +2641,11 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount) bfMonCount = 0; monSetId = monSets[bfMonCount]; - while (monSetId != INVALID_U16) + while (monSetId != 0xFFFF) { bfMonCount++; monSetId = monSets[bfMonCount]; - if (monSetId == INVALID_U16) + if (monSetId == 0xFFFF) break; } diff --git a/src/battle_transition.c b/src/battle_transition.c index f15514f50..f74102467 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -612,32 +612,32 @@ static const s16 gUnknown_085C8CF2[] = {4, 517, -1}; static const s16 *const gUnknown_085C8CF8[] = { - gUnknown_085C8C90, - gUnknown_085C8CA4, - gUnknown_085C8C98, - gUnknown_085C8C9E, - gUnknown_085C8CEA, - gUnknown_085C8CE4, - gUnknown_085C8CF2, - gUnknown_085C8CDE + gUnknown_085C8C90, + gUnknown_085C8CA4, + gUnknown_085C8C98, + gUnknown_085C8C9E, + gUnknown_085C8CEA, + gUnknown_085C8CE4, + gUnknown_085C8CF2, + gUnknown_085C8CDE }; static const s16 *const gUnknown_085C8D18[] = { - gUnknown_085C8CBC, - gUnknown_085C8CB0, - gUnknown_085C8CB6, - gUnknown_085C8CAA, - gUnknown_085C8CCA, - gUnknown_085C8CD8, - gUnknown_085C8CC4, - gUnknown_085C8CD2 + gUnknown_085C8CBC, + gUnknown_085C8CB0, + gUnknown_085C8CB6, + gUnknown_085C8CAA, + gUnknown_085C8CCA, + gUnknown_085C8CD8, + gUnknown_085C8CC4, + gUnknown_085C8CD2 }; static const s16 *const *const gUnknown_085C8D38[] = { - gUnknown_085C8CF8, - gUnknown_085C8D18 + gUnknown_085C8CF8, + gUnknown_085C8D18 }; static const TransitionStateFunc sPhase2_Groudon_Funcs[] = @@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] = static const struct SpriteTemplate gUnknown_085C8E68 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4105, .oam = &gEventObjectBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, @@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] = static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EA4 = static const struct SpriteTemplate sSpriteTemplate_85C8EBC = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4106, .oam = &gOamData_85C8E80, .anims = sSpriteAnimTable_85C8EA0, @@ -998,7 +998,7 @@ static bool8 Transition_Phase1(struct Task *task) static bool8 Transition_WaitForPhase1(struct Task *task) { - if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == INVALID_U8) + if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF) { task->tState++; return TRUE; @@ -1019,7 +1019,7 @@ static bool8 Transition_Phase2(struct Task *task) static bool8 Transition_WaitForPhase2(struct Task *task) { task->tTransitionDone = FALSE; - if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == INVALID_U8) + if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF) task->tTransitionDone = TRUE; return FALSE; } @@ -3605,7 +3605,7 @@ static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) static bool8 IsPhase1Done(void) { - if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == INVALID_U8) + if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF) return TRUE; else return FALSE; diff --git a/src/battle_tv.c b/src/battle_tv.c index edd506708..487b6baac 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -26,9 +26,9 @@ static const u16 sVariableDmgMoves[] = MOVE_WATER_SPOUT, MOVE_DREAM_EATER, MOVE_WEATHER_BALL, MOVE_SNORE, MOVE_PAIN_SPLIT, MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_RETURN, MOVE_ENDEAVOR, - MOVE_PRESENT, MOVE_REVENGE, INVALID_U16, + MOVE_PRESENT, MOVE_REVENGE, 0xFFFF, // those are handled by the function itself - MOVE_MAGNITUDE, MOVE_PSYWAVE, INVALID_U16 + MOVE_MAGNITUDE, MOVE_PSYWAVE, 0xFFFF }; static const u16 sUnknown_0860A4E0[] = @@ -199,7 +199,7 @@ static const u16 sUnknown_0860A8A4[] = STRINGID_PKMNAFFLICTEDBYCURSE, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_PKMNLOCKEDINNIGHTMARE, STRINGID_PKMNHURTBY, STRINGID_PKMNHURTBYBURN, STRINGID_PKMNHURTBYPOISON, STRINGID_PKMNHURTBYSPIKES, STRINGID_ATTACKERFAINTED, STRINGID_TARGETFAINTED, - STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, INVALID_U16 + STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, 0xFFFF }; // code @@ -625,9 +625,9 @@ static bool8 sub_817E0B8(u16 stringId) if (sUnknown_0860A8A4[i] == stringId) break; i++; - } while (sUnknown_0860A8A4[i] != INVALID_U16); + } while (sUnknown_0860A8A4[i] != 0xFFFF); - if (sUnknown_0860A8A4[i] == INVALID_U16) + if (sUnknown_0860A8A4[i] == 0xFFFF) return TRUE; else return FALSE; @@ -815,324 +815,324 @@ void TryPutLinkBattleTvShowOnAir(void) { asm_unified( "push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x20\n\ - movs r0, 0\n\ - str r0, [sp]\n\ - movs r1, 0\n\ - str r1, [sp, 0x4]\n\ - movs r2, 0\n\ - str r2, [sp, 0x8]\n\ - ldr r3, =0x00007fff\n\ - str r3, [sp, 0xC]\n\ - movs r4, 0\n\ - str r4, [sp, 0x10]\n\ - movs r7, 0\n\ - str r7, [sp, 0x14]\n\ - mov r8, r0\n\ - ldr r0, =gBattleStruct\n\ - ldr r1, [r0]\n\ - adds r0, r1, 0\n\ - adds r0, 0xB3\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _0817E42A\n\ - b _0817E670\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x20\n\ + movs r0, 0\n\ + str r0, [sp]\n\ + movs r1, 0\n\ + str r1, [sp, 0x4]\n\ + movs r2, 0\n\ + str r2, [sp, 0x8]\n\ + ldr r3, =0x00007fff\n\ + str r3, [sp, 0xC]\n\ + movs r4, 0\n\ + str r4, [sp, 0x10]\n\ + movs r7, 0\n\ + str r7, [sp, 0x14]\n\ + mov r8, r0\n\ + ldr r0, =gBattleStruct\n\ + ldr r1, [r0]\n\ + adds r0, r1, 0\n\ + adds r0, 0xB3\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _0817E42A\n\ + b _0817E670\n\ _0817E42A:\n\ - movs r2, 0xD2\n\ - lsls r2, 1\n\ - adds r2, r1\n\ - mov r10, r2\n\ - movs r6, 0\n\ + movs r2, 0xD2\n\ + lsls r2, 1\n\ + adds r2, r1\n\ + mov r10, r2\n\ + movs r6, 0\n\ _0817E434:\n\ - movs r0, 0x64\n\ - adds r4, r6, 0\n\ - muls r4, r0\n\ - ldr r0, =gPlayerParty\n\ - adds r0, r4, r0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _0817E454\n\ - mov r0, r8\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ + movs r0, 0x64\n\ + adds r4, r6, 0\n\ + muls r4, r0\n\ + ldr r0, =gPlayerParty\n\ + adds r0, r4, r0\n\ + movs r1, 0xB\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r0, 0\n\ + beq _0817E454\n\ + mov r0, r8\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ _0817E454:\n\ - ldr r5, =gEnemyParty\n\ - adds r0, r4, r5\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _0817E46A\n\ - adds r0, r7, 0x1\n\ - lsls r0, 24\n\ - lsrs r7, r0, 24\n\ + ldr r5, =gEnemyParty\n\ + adds r0, r4, r5\n\ + movs r1, 0xB\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r0, 0\n\ + beq _0817E46A\n\ + adds r0, r7, 0x1\n\ + lsls r0, 24\n\ + lsrs r7, r0, 24\n\ _0817E46A:\n\ - adds r6, 0x1\n\ - cmp r6, 0x5\n\ - ble _0817E434\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r0, [r0]\n\ - movs r1, 0x2\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0817E47E\n\ - b _0817E670\n\ + adds r6, 0x1\n\ + cmp r6, 0x5\n\ + ble _0817E434\n\ + ldr r0, =gBattleTypeFlags\n\ + ldr r0, [r0]\n\ + movs r1, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0817E47E\n\ + b _0817E670\n\ _0817E47E:\n\ - cmp r8, r7\n\ - beq _0817E484\n\ - b _0817E670\n\ + cmp r8, r7\n\ + beq _0817E484\n\ + b _0817E670\n\ _0817E484:\n\ - movs r6, 0\n\ - lsls r3, r6, 1\n\ - str r3, [sp, 0x18]\n\ - movs r4, 0x64\n\ - mov r8, r4\n\ + movs r6, 0\n\ + lsls r3, r6, 1\n\ + str r3, [sp, 0x18]\n\ + movs r4, 0x64\n\ + mov r8, r4\n\ _0817E48E:\n\ - mov r1, r8\n\ - muls r1, r6\n\ - ldr r0, =gPlayerParty\n\ - adds r4, r1, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r7, r0, 16\n\ - adds r0, r6, 0x1\n\ - mov r9, r0\n\ - cmp r7, 0\n\ - beq _0817E4EE\n\ - adds r0, r4, 0\n\ - movs r1, 0x2D\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _0817E4EE\n\ - movs r4, 0\n\ - lsls r0, r6, 3\n\ - mov r2, r10\n\ - adds r1, r0, r2\n\ - movs r3, 0x3\n\ + mov r1, r8\n\ + muls r1, r6\n\ + ldr r0, =gPlayerParty\n\ + adds r4, r1, r0\n\ + adds r0, r4, 0\n\ + movs r1, 0xB\n\ + movs r2, 0\n\ + bl GetMonData\n\ + lsls r0, 16\n\ + lsrs r7, r0, 16\n\ + adds r0, r6, 0x1\n\ + mov r9, r0\n\ + cmp r7, 0\n\ + beq _0817E4EE\n\ + adds r0, r4, 0\n\ + movs r1, 0x2D\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r0, 0\n\ + bne _0817E4EE\n\ + movs r4, 0\n\ + lsls r0, r6, 3\n\ + mov r2, r10\n\ + adds r1, r0, r2\n\ + movs r3, 0x3\n\ _0817E4C4:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - ldrh r4, [r1]\n\ - adds r0, r4\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - adds r1, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _0817E4C4\n\ - ldr r1, [sp, 0x8]\n\ - lsls r0, r1, 16\n\ - lsls r1, r4, 16\n\ - cmp r0, r1\n\ - bge _0817E4EE\n\ - lsls r0, r6, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x10]\n\ - lsrs r1, 16\n\ - str r1, [sp, 0x8]\n\ - str r7, [sp]\n\ + lsls r0, r4, 16\n\ + asrs r0, 16\n\ + ldrh r4, [r1]\n\ + adds r0, r4\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + adds r1, 0x2\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _0817E4C4\n\ + ldr r1, [sp, 0x8]\n\ + lsls r0, r1, 16\n\ + lsls r1, r4, 16\n\ + cmp r0, r1\n\ + bge _0817E4EE\n\ + lsls r0, r6, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0x10]\n\ + lsrs r1, 16\n\ + str r1, [sp, 0x8]\n\ + str r7, [sp]\n\ _0817E4EE:\n\ - mov r0, r8\n\ - muls r0, r6\n\ - ldr r2, =gEnemyParty\n\ - adds r4, r0, r2\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r7, r0, 16\n\ - ldr r3, [sp, 0x8]\n\ - lsls r3, 16\n\ - str r3, [sp, 0x1C]\n\ - cmp r7, 0\n\ - beq _0817E5A0\n\ - adds r0, r4, 0\n\ - movs r1, 0x2D\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _0817E5A0\n\ - movs r4, 0\n\ - ldr r0, [sp, 0xC]\n\ - lsls r2, r0, 16\n\ - movs r3, 0x1\n\ - lsls r1, r3, 1\n\ - adds r1, 0x1\n\ - lsls r1, 4\n\ - lsls r0, r6, 3\n\ - adds r0, r1\n\ - mov r3, r10\n\ - adds r1, r0, r3\n\ - movs r3, 0x3\n\ + mov r0, r8\n\ + muls r0, r6\n\ + ldr r2, =gEnemyParty\n\ + adds r4, r0, r2\n\ + adds r0, r4, 0\n\ + movs r1, 0xB\n\ + movs r2, 0\n\ + bl GetMonData\n\ + lsls r0, 16\n\ + lsrs r7, r0, 16\n\ + ldr r3, [sp, 0x8]\n\ + lsls r3, 16\n\ + str r3, [sp, 0x1C]\n\ + cmp r7, 0\n\ + beq _0817E5A0\n\ + adds r0, r4, 0\n\ + movs r1, 0x2D\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r0, 0\n\ + bne _0817E5A0\n\ + movs r4, 0\n\ + ldr r0, [sp, 0xC]\n\ + lsls r2, r0, 16\n\ + movs r3, 0x1\n\ + lsls r1, r3, 1\n\ + adds r1, 0x1\n\ + lsls r1, 4\n\ + lsls r0, r6, 3\n\ + adds r0, r1\n\ + mov r3, r10\n\ + adds r1, r0, r3\n\ + movs r3, 0x3\n\ _0817E534:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - ldrh r4, [r1]\n\ - adds r0, r4\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - adds r1, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _0817E534\n\ - asrs r1, r2, 16\n\ - lsls r5, r4, 16\n\ - asrs r0, r5, 16\n\ - cmp r1, r0\n\ - bne _0817E590\n\ - mov r0, r8\n\ - muls r0, r6\n\ - ldr r1, =gEnemyParty\n\ - adds r0, r1\n\ - movs r1, 0x19\n\ - movs r2, 0\n\ - bl GetMonData\n\ - adds r4, r0, 0\n\ - ldr r2, [sp, 0x14]\n\ - mov r0, r8\n\ - muls r0, r2\n\ - ldr r3, =gEnemyParty\n\ - adds r0, r3\n\ - movs r1, 0x19\n\ - movs r2, 0\n\ - bl GetMonData\n\ - cmp r4, r0\n\ - bls _0817E5A0\n\ - b _0817E594\n\ - .pool\n\ + lsls r0, r4, 16\n\ + asrs r0, 16\n\ + ldrh r4, [r1]\n\ + adds r0, r4\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + adds r1, 0x2\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _0817E534\n\ + asrs r1, r2, 16\n\ + lsls r5, r4, 16\n\ + asrs r0, r5, 16\n\ + cmp r1, r0\n\ + bne _0817E590\n\ + mov r0, r8\n\ + muls r0, r6\n\ + ldr r1, =gEnemyParty\n\ + adds r0, r1\n\ + movs r1, 0x19\n\ + movs r2, 0\n\ + bl GetMonData\n\ + adds r4, r0, 0\n\ + ldr r2, [sp, 0x14]\n\ + mov r0, r8\n\ + muls r0, r2\n\ + ldr r3, =gEnemyParty\n\ + adds r0, r3\n\ + movs r1, 0x19\n\ + movs r2, 0\n\ + bl GetMonData\n\ + cmp r4, r0\n\ + bls _0817E5A0\n\ + b _0817E594\n\ + .pool\n\ _0817E590:\n\ - cmp r1, r0\n\ - ble _0817E5A0\n\ + cmp r1, r0\n\ + ble _0817E5A0\n\ _0817E594:\n\ - lsls r0, r6, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x14]\n\ - lsrs r5, 16\n\ - str r5, [sp, 0xC]\n\ - str r7, [sp, 0x4]\n\ + lsls r0, r6, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0x14]\n\ + lsrs r5, 16\n\ + str r5, [sp, 0xC]\n\ + str r7, [sp, 0x4]\n\ _0817E5A0:\n\ - mov r6, r9\n\ - cmp r6, 0x5\n\ - bgt _0817E5A8\n\ - b _0817E48E\n\ + mov r6, r9\n\ + cmp r6, 0x5\n\ + bgt _0817E5A8\n\ + b _0817E48E\n\ _0817E5A8:\n\ - movs r4, 0\n\ - movs r6, 0\n\ - movs r3, 0\n\ - ldr r5, =gPlayerParty\n\ - ldr r7, [sp, 0x10]\n\ - lsls r0, r7, 3\n\ - mov r1, r10\n\ - adds r2, r0, r1\n\ + movs r4, 0\n\ + movs r6, 0\n\ + movs r3, 0\n\ + ldr r5, =gPlayerParty\n\ + ldr r7, [sp, 0x10]\n\ + lsls r0, r7, 3\n\ + mov r1, r10\n\ + adds r2, r0, r1\n\ _0817E5B8:\n\ - lsls r0, r4, 16\n\ - asrs r0, 16\n\ - movs r7, 0\n\ - ldrsh r1, [r2, r7]\n\ - cmp r0, r1\n\ - bge _0817E5C8\n\ - ldrh r4, [r2]\n\ - adds r6, r3, 0\n\ + lsls r0, r4, 16\n\ + asrs r0, 16\n\ + movs r7, 0\n\ + ldrsh r1, [r2, r7]\n\ + cmp r0, r1\n\ + bge _0817E5C8\n\ + ldrh r4, [r2]\n\ + adds r6, r3, 0\n\ _0817E5C8:\n\ - adds r2, 0x2\n\ - adds r3, 0x1\n\ - cmp r3, 0x3\n\ - ble _0817E5B8\n\ - movs r0, 0x64\n\ - ldr r1, [sp, 0x10]\n\ - muls r0, r1\n\ - adds r0, r5\n\ - adds r1, r6, 0\n\ - adds r1, 0xD\n\ - movs r2, 0\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - ldr r2, [sp, 0x1C]\n\ - cmp r2, 0\n\ - beq _0817E670\n\ - cmp r4, 0\n\ - beq _0817E670\n\ - ldr r0, =gBattleTypeFlags\n\ - ldr r0, [r0]\n\ - movs r1, 0x40\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _0817E65C\n\ - ldr r3, [sp, 0x10]\n\ - cmp r3, 0x2\n\ - bhi _0817E620\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r0, [r0]\n\ - bl GetLinkTrainerFlankId\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - beq _0817E630\n\ - b _0817E670\n\ - .pool\n\ + adds r2, 0x2\n\ + adds r3, 0x1\n\ + cmp r3, 0x3\n\ + ble _0817E5B8\n\ + movs r0, 0x64\n\ + ldr r1, [sp, 0x10]\n\ + muls r0, r1\n\ + adds r0, r5\n\ + adds r1, r6, 0\n\ + adds r1, 0xD\n\ + movs r2, 0\n\ + bl GetMonData\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + ldr r2, [sp, 0x1C]\n\ + cmp r2, 0\n\ + beq _0817E670\n\ + cmp r4, 0\n\ + beq _0817E670\n\ + ldr r0, =gBattleTypeFlags\n\ + ldr r0, [r0]\n\ + movs r1, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0817E65C\n\ + ldr r3, [sp, 0x10]\n\ + cmp r3, 0x2\n\ + bhi _0817E620\n\ + ldr r0, =gBattleScripting\n\ + adds r0, 0x25\n\ + ldrb r0, [r0]\n\ + bl GetLinkTrainerFlankId\n\ + lsls r0, 16\n\ + cmp r0, 0\n\ + beq _0817E630\n\ + b _0817E670\n\ + .pool\n\ _0817E620:\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r0, [r0]\n\ - bl GetLinkTrainerFlankId\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - beq _0817E670\n\ + ldr r0, =gBattleScripting\n\ + adds r0, 0x25\n\ + ldrb r0, [r0]\n\ + bl GetLinkTrainerFlankId\n\ + lsls r0, 16\n\ + cmp r0, 0\n\ + beq _0817E670\n\ _0817E630:\n\ - movs r3, 0\n\ - ldr r7, [sp, 0x14]\n\ - cmp r7, 0x2\n\ - bls _0817E63A\n\ - movs r3, 0x1\n\ + movs r3, 0\n\ + ldr r7, [sp, 0x14]\n\ + cmp r7, 0x2\n\ + bls _0817E63A\n\ + movs r3, 0x1\n\ _0817E63A:\n\ - lsls r0, r3, 24\n\ - lsrs r0, 24\n\ - ldr r1, =gBattleScripting\n\ - adds r1, 0x25\n\ - ldrb r1, [r1]\n\ - bl sub_806EF84\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - adds r1, r4, 0\n\ - ldr r2, [sp]\n\ - ldr r3, [sp, 0x4]\n\ - bl PutBattleUpdateOnTheAir\n\ - b _0817E670\n\ - .pool\n\ + lsls r0, r3, 24\n\ + lsrs r0, 24\n\ + ldr r1, =gBattleScripting\n\ + adds r1, 0x25\n\ + ldrb r1, [r1]\n\ + bl sub_806EF84\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + adds r1, r4, 0\n\ + ldr r2, [sp]\n\ + ldr r3, [sp, 0x4]\n\ + bl PutBattleUpdateOnTheAir\n\ + b _0817E670\n\ + .pool\n\ _0817E65C:\n\ - ldr r0, =gBattleScripting\n\ - adds r0, 0x25\n\ - ldrb r1, [r0]\n\ - movs r0, 0x1\n\ - eors r0, r1\n\ - adds r1, r4, 0\n\ - ldr r2, [sp]\n\ - ldr r3, [sp, 0x4]\n\ - bl PutBattleUpdateOnTheAir\n\ + ldr r0, =gBattleScripting\n\ + adds r0, 0x25\n\ + ldrb r1, [r0]\n\ + movs r0, 0x1\n\ + eors r0, r1\n\ + adds r1, r4, 0\n\ + ldr r2, [sp]\n\ + ldr r3, [sp, 0x4]\n\ + bl PutBattleUpdateOnTheAir\n\ _0817E670:\n\ - add sp, 0x20\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool"); + add sp, 0x20\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool"); } #endif @@ -1164,7 +1164,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) break; } i += 2; - } while (ptr[i] != INVALID_U16); + } while (ptr[i] != 0xFFFF); break; case 19: tvPtr->side[arg2 ^ 1].faintCause = 0; @@ -1415,9 +1415,9 @@ static void TrySetBattleSeminarShow(void) if (currMoveSaved == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != INVALID_U16); + } while (sVariableDmgMoves[i] != 0xFFFF); - if (sVariableDmgMoves[i] != INVALID_U16) + if (sVariableDmgMoves[i] != 0xFFFF) return; dmgByMove[gMoveSelectionCursor[gBattlerAttacker]] = gBattleMoveDamage; @@ -1490,9 +1490,9 @@ static bool8 ShouldCalculateDamage(u16 moveId, s32 *dmg, u16 *powerOverride) if (moveId == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != INVALID_U16); + } while (sVariableDmgMoves[i] != 0xFFFF); - if (sVariableDmgMoves[i] != INVALID_U16) + if (sVariableDmgMoves[i] != 0xFFFF) { *dmg = 0; return FALSE; diff --git a/src/battle_util.c b/src/battle_util.c index 12ca6bc9c..251a545c9 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -29,7 +29,7 @@ extern u8 weather_get_current(void); static const u16 sSoundMovesTable[] = { MOVE_GROWL, MOVE_ROAR, MOVE_SING, MOVE_SUPERSONIC, MOVE_SCREECH, MOVE_SNORE, - MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, INVALID_U16 + MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, 0xFFFF }; u8 GetBattlerForBattleScript(u8 caseId) @@ -382,7 +382,7 @@ u8 TrySetCantSelectMoveBattleScript(void) gPotentialItemEffectBattler = gActiveBattler; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != move) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move) { gCurrentMove = *choicedMove; gLastUsedItem = gBattleMons[gActiveBattler].item; @@ -442,7 +442,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) unusableMoves |= gBitTable[i]; if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != gBattleMons[battlerId].moves[i]) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; } return unusableMoves; @@ -451,7 +451,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) bool8 AreAllMovesUnusable(void) { u8 unusable; - unusable = CheckMoveLimitations(gActiveBattler, 0, INVALID_U8); + unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF); if (unusable == 0xF) // All moves are unusable. { @@ -1137,7 +1137,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) gBattlerTarget = gActiveBattler; gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler]; gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler]; - gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16; + gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; BattleScriptExecute(BattleScript_MonTookFutureAttack); if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0 @@ -1996,12 +1996,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA case ABILITYEFFECT_MOVES_BLOCK: // 2 if (gLastUsedAbility == ABILITY_SOUNDPROOF) { - for (i = 0; sSoundMovesTable[i] != INVALID_U16; i++) + for (i = 0; sSoundMovesTable[i] != 0xFFFF; i++) { if (sSoundMovesTable[i] == move) break; } - if (sSoundMovesTable[i] != INVALID_U16) + if (sSoundMovesTable[i] != 0xFFFF) { if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS) gHitMarker |= HITMARKER_NO_PPDEDUCT; @@ -2527,7 +2527,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA break; } - if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != INVALID_U8) + if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != 0xFF) RecordAbilityBattle(battler, gLastUsedAbility); } @@ -3213,7 +3213,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) case HOLD_EFFECT_SHELL_BELL: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && gSpecialStatuses[gBattlerTarget].dmg != 0 - && gSpecialStatuses[gBattlerTarget].dmg != INVALID_U16 + && gSpecialStatuses[gBattlerTarget].dmg != 0xFFFF && gBattlerAttacker != gBattlerTarget && gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP && gBattleMons[gBattlerAttacker].hp != 0) @@ -3394,7 +3394,7 @@ u8 IsMonDisobedient(void) calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8; if (calc < obedienceLevel) { - calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], INVALID_U8); + calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], 0xFF); if (calc == 0xF) // all moves cannot be used { gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3; diff --git a/src/berry_blender.c b/src/berry_blender.c index e977bdbeb..87d76bb07 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1455,7 +1455,7 @@ static void sub_808074C(void) for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - sBerryBlenderData->field_96[i] = INVALID_U8; + sBerryBlenderData->field_96[i] = 0xFF; sBerryBlenderData->field_8E[i] = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i]; } for (j = 0; j < BLENDER_MAX_PLAYERS; j++) @@ -1479,7 +1479,7 @@ static void Blender_PrintPlayerNames(void) for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { - if (sBerryBlenderData->field_8E[i] != INVALID_U8) + if (sBerryBlenderData->field_8E[i] != 0xFF) { sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]] = sBerryBlenderData->syncArrowSprite2Ids[i]; StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]]], i); diff --git a/src/bg.c b/src/bg.c index fd6ffca6e..a41075ad7 100644 --- a/src/bg.c +++ b/src/bg.c @@ -87,37 +87,37 @@ void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenS { if (IsInvalidBg(bg) == FALSE) { - if (charBaseIndex != INVALID_U8) + if (charBaseIndex != 0xFF) { sGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3; } - if (mapBaseIndex != INVALID_U8) + if (mapBaseIndex != 0xFF) { sGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F; } - if (screenSize != INVALID_U8) + if (screenSize != 0xFF) { sGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3; } - if (paletteMode != INVALID_U8) + if (paletteMode != 0xFF) { sGpuBgConfigs.configs[bg].paletteMode = paletteMode; } - if (priority != INVALID_U8) + if (priority != 0xFF) { sGpuBgConfigs.configs[bg].priority = priority & 0x3; } - if (mosaic != INVALID_U8) + if (mosaic != 0xFF) { sGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1; } - if (wraparound != INVALID_U8) + if (wraparound != 0xFF) { sGpuBgConfigs.configs[bg].wraparound = wraparound; } @@ -154,7 +154,7 @@ u16 GetBgControlAttribute(u8 bg, u8 attributeId) } } - return INVALID_U8; + return 0xFF; } u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode) @@ -379,7 +379,7 @@ u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset) cursor = LoadBgVram(bg, src, size, tileOffset, DISPCNT_MODE_1); - if (cursor == INVALID_U8) + if (cursor == 0xFF) { return -1; } @@ -400,7 +400,7 @@ u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset) cursor = LoadBgVram(bg, src, size, destOffset * 2, DISPCNT_MODE_2); - if (cursor == INVALID_U8) + if (cursor == 0xFF) { return -1; } @@ -480,25 +480,25 @@ void SetBgAttribute(u8 bg, u8 attributeId, u8 value) switch (attributeId) { case 1: - SetBgControlAttributes(bg, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); break; case 2: - SetBgControlAttributes(bg, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF); break; case 3: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF); break; case 4: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF); break; case 7: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF); break; case 5: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8); + SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF); break; case 6: - SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value); + SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value); break; } } @@ -1284,7 +1284,7 @@ u32 GetBgType(u8 bg) break; } - return INVALID_U16; + return 0xFFFF; } bool32 IsInvalidBg32(u8 bg) diff --git a/src/blit.c b/src/blit.c index 2ba0e489c..b4d5f7de5 100644 --- a/src/blit.c +++ b/src/blit.c @@ -3,7 +3,7 @@ void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height) { - BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, INVALID_U8); + BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, 0xFF); } void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey) @@ -33,7 +33,7 @@ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 sr multiplierSrcY = (src->width + (src->width & 7)) >> 3; multiplierDstY = (dst->width + (dst->width & 7)) >> 3; - if (colorKey == INVALID_U8) + if (colorKey == 0xFF) { for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++) { @@ -132,7 +132,7 @@ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, multiplierSrcY = (src->width + (src->width & 7)) >> 3; multiplierDstY = (dst->width + (dst->width & 7)) >> 3; - if (colorKey == INVALID_U8) + if (colorKey == 0xFF) { for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++) { diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index 6a2e42c4e..b17ffad33 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -465,7 +465,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void) } varValue = VarGet(0x403B); - if (varValue != INVALID_U16 || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) + if (varValue != 0xFFFF || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF) return FALSE; if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21) diff --git a/src/cable_club.c b/src/cable_club.c index 649534711..56154d5bf 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -70,7 +70,7 @@ static void sub_80B3220(u8 taskId); static void sub_80B236C(u8 arg0, u8 arg1) { - if (FindTaskIdByFunc(sub_80B2634) == INVALID_U8) + if (FindTaskIdByFunc(sub_80B2634) == 0xFF) { u8 taskId1; @@ -604,7 +604,7 @@ void sub_80B2EA8(void) { u32 taskId = FindTaskIdByFunc(sub_80B2EE4); - if (taskId == INVALID_U8) + if (taskId == 0xFF) { taskId = CreateTask(sub_80B2EE4, 80); gTasks[taskId].data[0] = 0; @@ -702,7 +702,7 @@ void sub_80B3028(void) u8 sub_80B3050(void) { if (FuncIsActiveTask(sub_80B3144) != FALSE) - return INVALID_U8; + return 0xFF; switch (gSpecialVar_0x8004) { diff --git a/src/contest.c b/src/contest.c index 716ed5dfc..0c4397f30 100644 --- a/src/contest.c +++ b/src/contest.c @@ -324,7 +324,7 @@ void sub_80D787C(void) *gContestResources->field_0 = (struct Contest){}; for (i = 0; i < 4; i++) { - gContestResources->field_0->unk19206[i] = INVALID_U8; + gContestResources->field_0->unk19206[i] = 0xFF; } for (i = 0; i < 4; i++) { @@ -344,7 +344,7 @@ void sub_80D787C(void) sub_80DCE58(0); for (i = 0; i < 4; i++) { - gContestResources->field_4[i].nextTurnOrder = INVALID_U8; + gContestResources->field_4[i].nextTurnOrder = 0xFF; gContestResources->field_0->unk19218[i] = gUnknown_02039F26[i]; } sub_80DD590(); @@ -2097,7 +2097,7 @@ void sub_80DAB8C(u8 contestType, u8 rank) opponents[opponentsCount++] = i; } } - opponents[opponentsCount] = INVALID_U8; + opponents[opponentsCount] = 0xFF; // Choose three random opponents from the list for (i = 0; i < 3; i++) @@ -2106,7 +2106,7 @@ void sub_80DAB8C(u8 contestType, u8 rank) s32 j; gContestMons[i] = gContestOpponents[opponents[rnd]]; - for (j = rnd; opponents[j] != INVALID_U8; j++) + for (j = rnd; opponents[j] != 0xFF; j++) opponents[j] = opponents[j + 1]; opponentsCount--; } @@ -2151,7 +2151,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) else if (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough) opponents[opponentsCount++] = i; } - opponents[opponentsCount] = INVALID_U8; + opponents[opponentsCount] = 0xFF; for (i = 0; i < 4 - gUnknown_02039F30; i++) { u16 rnd = sub_80F903C() % opponentsCount; @@ -2160,7 +2160,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame) gContestMons[gUnknown_02039F30 + i] = gContestOpponents[opponents[rnd]]; sub_80DF9D4(gContestMons[gUnknown_02039F30 + i].trainerName); sub_80DF9E0(gContestMons[gUnknown_02039F30 + i].nickname, GAME_LANGUAGE); - for (j = rnd; opponents[j] != INVALID_U8; j++) + for (j = rnd; opponents[j] != 0xFF; j++) opponents[j] = opponents[j + 1]; opponentsCount--; } @@ -2591,7 +2591,7 @@ void prints_contest_move_description(u16 a) ContestBG_FillBoxWithIncrementingTile(0, categoryTile, 0x0b, 0x1f, 0x05, 0x01, 0x11, 0x01); ContestBG_FillBoxWithIncrementingTile(0, categoryTile + 0x10, 0x0b, 0x20, 0x05, 0x01, 0x11, 0x01); - if (gContestEffects[gContestMoves[a].effect].appeal == INVALID_U8) + if (gContestEffects[gContestMoves[a].effect].appeal == 0xFF) numHearts = 0; else numHearts = gContestEffects[gContestMoves[a].effect].appeal / 10; @@ -2600,7 +2600,7 @@ void prints_contest_move_description(u16 a) ContestBG_FillBoxWithTile(0, 0x5035, 0x15, 0x1f, 0x08, 0x01, 0x11); ContestBG_FillBoxWithTile(0, 0x5012, 0x15, 0x1f, numHearts, 0x01, 0x11); - if (gContestEffects[gContestMoves[a].effect].jam == INVALID_U8) + if (gContestEffects[gContestMoves[a].effect].jam == 0xFF) numHearts = 0; else numHearts = gContestEffects[gContestMoves[a].effect].jam / 10; diff --git a/src/contest_effect.c b/src/contest_effect.c index 6f1c19fe2..760d74d69 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -144,7 +144,7 @@ static void ContestEffect_StartleFrontMon(void) break; } shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; idx = WasAtLeastOneOpponentJammed(); } if (idx == 0) @@ -168,7 +168,7 @@ static void ContestEffect_StartlePrevMons(void) shared192D0.jamQueue[j++] = i; } - shared192D0.jamQueue[j] = INVALID_U8; + shared192D0.jamQueue[j] = 0xFF; idx = WasAtLeastOneOpponentJammed(); } if (idx == 0) @@ -211,7 +211,7 @@ static void ContestEffect_StartlePrevMons2(void) u8 rval, jam; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; rval = Random() % 10; if (rval == 0) @@ -288,7 +288,7 @@ static void ContestEffect_StartleMonWithJudgesAttention(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; if (WasAtLeastOneOpponentJammed()) numStartled++; } @@ -393,7 +393,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) s16 oddsMod[4]; s16 odds[4]; - memset(contestantIds, INVALID_U8, ARRAY_COUNT(contestantIds)); + memset(contestantIds, 0xFF, ARRAY_COUNT(contestantIds)); for (i = 0, numAfter = 0; i < 4; i++) { if (shared192D0.turnOrder[shared192D0.contestant] < shared192D0.turnOrder[i] && @@ -431,7 +431,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void) } if (odds[0] != 0) { - for (i = 0; contestantIds[i] != INVALID_U8; i++) + for (i = 0; contestantIds[i] != 0xFF; i++) { if (Random() % 100 < odds[i] + oddsMod[contestantIds[i]]) { @@ -504,7 +504,7 @@ static void ContestEffect_BadlyStartlesMonsInGoodCondition(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; if (WasAtLeastOneOpponentJammed()) numHit++; } @@ -755,7 +755,7 @@ static void ContestEffect_NextAppealEarlier(void) for (i = 0; i < 4; i++) turnOrder[i] = sContestantStatus[i].nextTurnOrder; - turnOrder[shared192D0.contestant] = INVALID_U8; + turnOrder[shared192D0.contestant] = 0xFF; for (i = 0; i < 4; i++) { @@ -797,7 +797,7 @@ static void ContestEffect_NextAppealLater(void) for (i = 0; i < 4; i++) turnOrder[i] = sContestantStatus[i].nextTurnOrder; - turnOrder[shared192D0.contestant] = INVALID_U8; + turnOrder[shared192D0.contestant] = 0xFF; for (i = 3; i > -1; i--) { @@ -855,12 +855,12 @@ static void ContestEffect_ScrambleNextTurnOrder(void) for (j = 0; j < 4; j++) { - if (unselectedContestants[j] != INVALID_U8) + if (unselectedContestants[j] != 0xFF) { if (rval == 0) { turnOrder[j] = i; - unselectedContestants[j] = INVALID_U8; + unselectedContestants[j] = 0xFF; break; } else @@ -906,7 +906,7 @@ static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; if (WasAtLeastOneOpponentJammed()) numJammed++; } @@ -974,7 +974,7 @@ static void JamByMoveCategory(u8 category) else shared192D0.jam = 10; shared192D0.jamQueue[0] = i; - shared192D0.jamQueue[1] = INVALID_U8; + shared192D0.jamQueue[1] = 0xFF; if (WasAtLeastOneOpponentJammed()) numJammed++; } @@ -1013,7 +1013,7 @@ static bool8 WasAtLeastOneOpponentJammed(void) s16 jamBuffer[4] = {0}; int i; - for (i = 0; shared192D0.jamQueue[i] != INVALID_U8; i++) + for (i = 0; shared192D0.jamQueue[i] != 0xFF; i++) { u8 contestant = shared192D0.jamQueue[i]; if (CanUnnerveContestant(contestant)) diff --git a/src/data/contest_moves.h b/src/data/contest_moves.h index ae560c833..5460ac806 100644 --- a/src/data/contest_moves.h +++ b/src/data/contest_moves.h @@ -1,2889 +1,3129 @@ const struct ContestMove gContestMoves[MOVES_COUNT] = { - [MOVE_NONE] = {0}, - - [MOVE_POUND] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_POUND, - .comboMoves = {0}, - }, - - [MOVE_KARATE_CHOP] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_DOUBLE_SLAP] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_POUND}, - }, - - [MOVE_COMET_PUNCH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MEGA_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_PAY_DAY] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FIRE_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_FIRE_PUNCH, - .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH}, - }, - - [MOVE_ICE_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_ICE_PUNCH, - .comboMoves = {COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH}, - }, - - [MOVE_THUNDER_PUNCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_THUNDER_PUNCH, - .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH}, - }, - - [MOVE_SCRATCH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SCRATCH, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_VICE_GRIP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_VICE_GRIP, - .comboMoves = {0}, - }, - - [MOVE_GUILLOTINE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_VICE_GRIP}, - }, - - [MOVE_RAZOR_WIND] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SWORDS_DANCE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SWORDS_DANCE, - .comboMoves = {0}, - }, - - [MOVE_CUT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_GUST] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WING_ATTACK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WHIRLWIND] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FLY] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BIND] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_VICE_GRIP}, - }, - - [MOVE_SLAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_POUND}, - }, - - [MOVE_VINE_WHIP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_STOMP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0,{0, COMBO_STARTER_LEER}, - }, - - [MOVE_DOUBLE_KICK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MEGA_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_JUMP_KICK] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_ROLLING_KICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SAND_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SAND_ATTACK, - .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_HEADBUTT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_HORN_ATTACK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_HORN_ATTACK, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_FURY_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK}, - }, - - [MOVE_HORN_DRILL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HORN_ATTACK}, - }, - - [MOVE_TACKLE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN}, - }, - - [MOVE_BODY_SLAM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WRAP] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TAKE_DOWN] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, - }, - - [MOVE_THRASH] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAGE}, - }, - - [MOVE_DOUBLE_EDGE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, - }, - - [MOVE_TAIL_WHIP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_POISON_STING] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TWINEEDLE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PIN_MISSILE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LEER] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_LEER, - .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_BITE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_GROWL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_ROAR] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SING] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SING, - .comboMoves = {0}, - }, - - [MOVE_SUPERSONIC] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SONIC_BOOM] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DISABLE] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ACID] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EMBER] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_FLAMETHROWER] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MIST] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WATER_GUN] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT}, - }, - - [MOVE_HYDRO_PUMP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SURF] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SURF, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE}, - }, - - [MOVE_ICE_BEAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BLIZZARD] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL}, - }, - - [MOVE_PSYBEAM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_BUBBLE_BEAM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_AURORA_BEAM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_HYPER_BEAM] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PECK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_PECK, - .comboMoves = {0}, - }, - - [MOVE_DRILL_PECK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_PECK}, - }, - - [MOVE_SUBMISSION] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_LOW_KICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_COUNTER] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_SEISMIC_TOSS] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_STRENGTH] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ABSORB] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_MEGA_DRAIN] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_LEECH_SEED] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_GROWTH] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_GROWTH, - .comboMoves = {0}, - }, - - [MOVE_RAZOR_LEAF] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_SOLAR_BEAM] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH}, - }, - - [MOVE_POISON_POWDER] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_STUN_SPORE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_SLEEP_POWDER] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWEET_SCENT}, - }, - - [MOVE_PETAL_DANCE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_STRING_SHOT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_STRING_SHOT, - .comboMoves = {0}, - }, - - [MOVE_DRAGON_RAGE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_RAGE, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE}, - }, - - [MOVE_FIRE_SPIN] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_THUNDER_SHOCK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDERBOLT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDER_WAVE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_THUNDER] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_ROCK_THROW] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_ROCK_THROW, - .comboMoves = {0}, - }, - - [MOVE_EARTHQUAKE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_EARTHQUAKE, - .comboMoves = {0}, - }, - - [MOVE_FISSURE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_EARTHQUAKE}, - }, - - [MOVE_DIG] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TOXIC] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CONFUSION] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CONFUSION, - .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_PSYCHIC] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_PSYCHIC, - .comboMoves = {COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_HYPNOSIS] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_HYPNOSIS, - .comboMoves = {0}, - }, - - [MOVE_MEDITATE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_AGILITY] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, - }, - - [MOVE_QUICK_ATTACK] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, - }, - - [MOVE_RAGE] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_RAGE, - .comboMoves = {0}, - }, - - [MOVE_TELEPORT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION}, - }, - - [MOVE_NIGHT_SHADE] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MIMIC] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SCREECH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DOUBLE_TEAM] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DOUBLE_TEAM, - .comboMoves = {0}, - }, - - [MOVE_RECOVER] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_HARDEN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_HARDEN, - .comboMoves = {0}, - }, - - [MOVE_MINIMIZE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SMOKESCREEN] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SMOG}, - }, - - [MOVE_CONFUSE_RAY] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WITHDRAW] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DEFENSE_CURL] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_DEFENSE_CURL, - .comboMoves = {0}, - }, - - [MOVE_BARRIER] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LIGHT_SCREEN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_HAZE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_REFLECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_FOCUS_ENERGY] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_FOCUS_ENERGY, - .comboMoves = {0}, - }, - - [MOVE_BIDE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_METRONOME] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MIRROR_MOVE] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SELF_DESTRUCT] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EGG_BOMB] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SOFT_BOILED}, - }, - - [MOVE_LICK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SMOG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SMOG, - .comboMoves = {0}, - }, - - [MOVE_SLUDGE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SLUDGE, - .comboMoves = {COMBO_STARTER_SLUDGE_BOMB}, - }, - - [MOVE_BONE_CLUB] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONE_CLUB, - .comboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH}, - }, - - [MOVE_FIRE_BLAST] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_WATERFALL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_CLAMP] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SWIFT] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SKULL_BASH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPIKE_CANNON] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CONSTRICT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_AMNESIA] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_KINESIS] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_KINESIS, - .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION}, - }, - - [MOVE_SOFT_BOILED] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SOFT_BOILED, - .comboMoves = {0}, - }, - - [MOVE_HI_JUMP_KICK] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MIND_READER}, - }, - - [MOVE_GLARE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LEER}, - }, - - [MOVE_DREAM_EATER] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_POISON_GAS] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BARRAGE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LEECH_LIFE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LOVELY_KISS] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SKY_ATTACK] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TRANSFORM] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BUBBLE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DIZZY_PUNCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPORE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FLASH] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PSYWAVE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_SPLASH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ACID_ARMOR] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CRABHAMMER] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_EXPLOSION] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FURY_SWIPES] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCRATCH}, - }, - - [MOVE_BONEMERANG] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONEMERANG, - .comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH}, - }, - - [MOVE_REST] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_REST, - .comboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN}, - }, - - [MOVE_ROCK_SLIDE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ROCK_THROW}, - }, - - [MOVE_HYPER_FANG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHARPEN] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CONVERSION] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TRI_ATTACK] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_SUPER_FANG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_SLASH] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH}, - }, - - [MOVE_SUBSTITUTE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_STRUGGLE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SKETCH] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TRIPLE_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_THIEF] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPIDER_WEB] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STRING_SHOT}, - }, - - [MOVE_MIND_READER] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_MIND_READER, - .comboMoves = {0}, - }, - - [MOVE_NIGHTMARE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HYPNOSIS}, - }, - - [MOVE_FLAME_WHEEL] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SNORE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_REST}, - }, - - [MOVE_CURSE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_CURSE, - .comboMoves = {0}, - }, - - [MOVE_FLAIL] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_CONVERSION_2] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_AEROBLAST] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_COTTON_SPORE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_REVERSAL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_SPITE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_POWDER_SNOW] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_POWDER_SNOW, - .comboMoves = {COMBO_STARTER_HAIL}, - }, - - [MOVE_PROTECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_HARDEN}, - }, - - [MOVE_MACH_PUNCH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SCARY_FACE] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SCARY_FACE, - .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_LEER}, - }, - - [MOVE_FAINT_ATTACK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND}, - }, - - [MOVE_SWEET_KISS] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_BELLY_DRUM] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_BELLY_DRUM, - .comboMoves = {0}, - }, - - [MOVE_SLUDGE_BOMB] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SLUDGE_BOMB, - .comboMoves = {COMBO_STARTER_SLUDGE}, - }, - - [MOVE_MUD_SLAP] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_MUD_SLAP, - .comboMoves = {COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_OCTAZOOKA] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_SPIKES] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ZAP_CANNON] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_FORESIGHT] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DESTINY_BOND] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE}, - }, - - [MOVE_PERISH_SONG] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING}, - }, - - [MOVE_ICY_WIND] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DETECT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_BONE_RUSH] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_BONE_RUSH, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG}, - }, - - [MOVE_LOCK_ON] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_LOCK_ON, - .comboMoves = {0}, - }, - - [MOVE_OUTRAGE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SANDSTORM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_SANDSTORM, - .comboMoves = {0}, - }, - - [MOVE_GIGA_DRAIN] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_ENDURE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_ENDURE, - .comboMoves = {0}, - }, - - [MOVE_CHARM] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_CHARM, - .comboMoves = {0}, - }, - - [MOVE_ROLLOUT] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN}, - }, - - [MOVE_FALSE_SWIPE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_SWAGGER] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MILK_DRINK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SPARK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_FURY_CUTTER] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_STEEL_WING] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MEAN_LOOK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_MEAN_LOOK, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_ATTRACT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SLEEP_TALK] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_REST}, - }, - - [MOVE_HEAL_BELL] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_RETURN] = - { - .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PRESENT] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FRUSTRATION] = - { - .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SAFEGUARD] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PAIN_SPLIT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_SACRED_FIRE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MAGNITUDE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DYNAMIC_PUNCH] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, - }, - - [MOVE_MEGAHORN] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DRAGON_BREATH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_BREATH, - .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE}, - }, - - [MOVE_BATON_PASS] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ENCORE] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PURSUIT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_RAPID_SPIN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SWEET_SCENT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_SWEET_SCENT, - .comboMoves = {0}, - }, - - [MOVE_IRON_TAIL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_METAL_CLAW] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_METAL_SOUND}, - }, - - [MOVE_VITAL_THROW] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_MORNING_SUN] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SYNTHESIS] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MOONLIGHT] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HIDDEN_POWER] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CROSS_CHOP] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_TWISTER] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_RAIN_DANCE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_RAIN_DANCE, - .comboMoves = {0}, - }, - - [MOVE_SUNNY_DAY] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_SUNNY_DAY, - .comboMoves = {0}, - }, - - [MOVE_CRUNCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SCARY_FACE}, - }, - - [MOVE_MIRROR_COAT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_TAUNT}, - }, - - [MOVE_PSYCH_UP] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EXTREME_SPEED] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ANCIENT_POWER] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHADOW_BALL] = - { - .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FUTURE_SIGHT] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_ROCK_SMASH] = - { - .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WHIRLPOOL] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_BEAT_UP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FAKE_OUT] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_FAKE_OUT, - .comboMoves = {0}, - }, - - [MOVE_UPROAR] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_STOCKPILE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = COMBO_STARTER_STOCKPILE, - .comboMoves = {0}, - }, - - [MOVE_SPIT_UP] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STOCKPILE}, - }, - - [MOVE_SWALLOW] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_STOCKPILE}, - }, - - [MOVE_HEAT_WAVE] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HAIL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_HAIL, - .comboMoves = {0}, - }, - - [MOVE_TORMENT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FLATTER] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARM}, - }, - - [MOVE_WILL_O_WISP] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MEMENTO] = - { - .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FACADE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FOCUS_PUNCH] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_SMELLING_SALT] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FOLLOW_ME] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_NATURE_POWER] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CHARGE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CHARGE, - .comboMoves = {0}, - }, - - [MOVE_TAUNT] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_TAUNT, - .comboMoves = {0}, - }, - - [MOVE_HELPING_HAND] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TRICK] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ROLE_PLAY] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WISH] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ASSIST] = - { - .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_INGRAIN] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SUPERPOWER] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_LOCK_ON}, - }, - - [MOVE_MAGIC_COAT] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_RECYCLE] = - { - .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_REVENGE] = - { - .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BRICK_BREAK] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_YAWN] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_YAWN, - .comboMoves = {0}, - }, - - [MOVE_KNOCK_OFF] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_ENDEAVOR] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE}, - }, - - [MOVE_ERUPTION] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_SKILL_SWAP] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_IMPRISON] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_REFRESH] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING}, - }, - - [MOVE_GRUDGE] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CURSE}, - }, - - [MOVE_SNATCH] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SECRET_POWER] = - { - .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DIVE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = COMBO_STARTER_DIVE, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF}, - }, - - [MOVE_ARM_THRUST] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT}, - }, - - [MOVE_CAMOUFLAGE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TAIL_GLOW] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_LUSTER_PURGE] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_MIST_BALL] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, - - [MOVE_FEATHER_DANCE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TEETER_DANCE] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BLAZE_KICK] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_MUD_SPORT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_MUD_SPORT, - .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT}, - }, - - [MOVE_ICE_BALL] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_NEEDLE_ARM] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SLACK_OFF] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_YAWN}, - }, - - [MOVE_HYPER_VOICE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_POISON_FANG] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_CRUSH_CLAW] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, - }, - - [MOVE_BLAST_BURN] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_HYDRO_CANNON] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_METEOR_MASH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ASTONISH] = - { - .effect = CONTEST_EFFECT_STARTLE_PREV_MON, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WEATHER_BALL] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_AROMATHERAPY] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_FAKE_TEARS] = - { - .effect = CONTEST_EFFECT_BETTER_IF_LAST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_AIR_CUTTER] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_OVERHEAT] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SUNNY_DAY}, - }, - - [MOVE_ODOR_SLEUTH] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ROCK_TOMB] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_ROCK_THROW}, - }, - - [MOVE_SILVER_WIND] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_METAL_SOUND] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_METAL_SOUND, - .comboMoves = {0}, - }, - - [MOVE_GRASS_WHISTLE] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_TICKLE] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_COSMIC_POWER] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_WATER_SPOUT] = - { - .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_SIGNAL_BEAM] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHADOW_PUNCH] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_EXTRASENSORY] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SKY_UPPERCUT] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, - }, - - [MOVE_SAND_TOMB] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_SANDSTORM}, - }, - - [MOVE_SHEER_COLD] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MUDDY_WATER] = - { - .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_BULLET_SEED] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_AERIAL_ACE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_ICICLE_SPEAR] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_IRON_DEFENSE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BLOCK] = - { - .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_HOWL] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DRAGON_CLAW] = - { - .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE}, - }, - - [MOVE_FRENZY_PLANT] = - { - .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_BULK_UP] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_BOUNCE] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_MUD_SHOT] = - { - .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_POISON_TAIL] = - { - .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_COVET] = - { - .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_VOLT_TACKLE] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_MAGICAL_LEAF] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_GROWTH}, - }, - - [MOVE_WATER_SPORT] = - { - .effect = CONTEST_EFFECT_HIGHLY_APPEALING, - .contestCategory = CONTEST_CATEGORY_CUTE, - .comboStarterId = COMBO_STARTER_WATER_SPORT, - .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT}, - }, - - [MOVE_CALM_MIND] = - { - .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = COMBO_STARTER_CALM_MIND, - .comboMoves = {0}, - }, - - [MOVE_LEAF_BLADE] = - { - .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_DRAGON_DANCE] = - { - .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = COMBO_STARTER_DRAGON_DANCE, - .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH}, - }, - - [MOVE_ROCK_BLAST] = - { - .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, - .contestCategory = CONTEST_CATEGORY_TOUGH, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_SHOCK_WAVE] = - { - .effect = CONTEST_EFFECT_BETTER_IF_FIRST, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CHARGE}, - }, - - [MOVE_WATER_PULSE] = - { - .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, - .contestCategory = CONTEST_CATEGORY_BEAUTY, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_RAIN_DANCE}, - }, - - [MOVE_DOOM_DESIRE] = - { - .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, - .contestCategory = CONTEST_CATEGORY_COOL, - .comboStarterId = 0, - .comboMoves = {0}, - }, - - [MOVE_PSYCHO_BOOST] = - { - .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, - .contestCategory = CONTEST_CATEGORY_SMART, - .comboStarterId = 0, - .comboMoves = {COMBO_STARTER_CALM_MIND}, - }, + [MOVE_NONE] = {0}, + + [MOVE_POUND] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_POUND, + .comboMoves = {0}, + }, + + [MOVE_KARATE_CHOP] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_DOUBLE_SLAP] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_POUND}, + }, + + [MOVE_COMET_PUNCH] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MEGA_PUNCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + }, + + [MOVE_PAY_DAY] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FIRE_PUNCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_FIRE_PUNCH, + .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH}, + }, + + [MOVE_ICE_PUNCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_ICE_PUNCH, + .comboMoves = {COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH}, + }, + + [MOVE_THUNDER_PUNCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_THUNDER_PUNCH, + .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH}, + }, + + [MOVE_SCRATCH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SCRATCH, + .comboMoves = {COMBO_STARTER_LEER}, + }, + + [MOVE_VICE_GRIP] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_VICE_GRIP, + .comboMoves = {0}, + }, + + [MOVE_GUILLOTINE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_VICE_GRIP}, + }, + + [MOVE_RAZOR_WIND] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SWORDS_DANCE] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_SWORDS_DANCE, + .comboMoves = {0}, + }, + + [MOVE_CUT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_GUST] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WING_ATTACK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WHIRLWIND] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FLY] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BIND] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_VICE_GRIP}, + }, + + [MOVE_SLAM] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_POUND}, + }, + + [MOVE_VINE_WHIP] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_STOMP] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0,{0, COMBO_STARTER_LEER}, + }, + + [MOVE_DOUBLE_KICK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MEGA_KICK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + }, + + [MOVE_JUMP_KICK] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MIND_READER}, + }, + + [MOVE_ROLLING_KICK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SAND_ATTACK] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_SAND_ATTACK, + .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM}, + }, + + [MOVE_HEADBUTT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_HORN_ATTACK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_HORN_ATTACK, + .comboMoves = {COMBO_STARTER_LEER}, + }, + + [MOVE_FURY_ATTACK] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK}, + }, + + [MOVE_HORN_DRILL] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HORN_ATTACK}, + }, + + [MOVE_TACKLE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN}, + }, + + [MOVE_BODY_SLAM] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WRAP] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TAKE_DOWN] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, + }, + + [MOVE_THRASH] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAGE}, + }, + + [MOVE_DOUBLE_EDGE] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN}, + }, + + [MOVE_TAIL_WHIP] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARM}, + }, + + [MOVE_POISON_STING] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TWINEEDLE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PIN_MISSILE] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LEER] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_LEER, + .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE}, + }, + + [MOVE_BITE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE}, + }, + + [MOVE_GROWL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARM}, + }, + + [MOVE_ROAR] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SING] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_SING, + .comboMoves = {0}, + }, + + [MOVE_SUPERSONIC] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SONIC_BOOM] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DISABLE] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ACID] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EMBER] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_FLAMETHROWER] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MIST] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WATER_GUN] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT}, + }, + + [MOVE_HYDRO_PUMP] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_SURF] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_SURF, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE}, + }, + + [MOVE_ICE_BEAM] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BLIZZARD] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL}, + }, + + [MOVE_PSYBEAM] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_BUBBLE_BEAM] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_AURORA_BEAM] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_HYPER_BEAM] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PECK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_PECK, + .comboMoves = {0}, + }, + + [MOVE_DRILL_PECK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_PECK}, + }, + + [MOVE_SUBMISSION] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MIND_READER}, + }, + + [MOVE_LOW_KICK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_COUNTER] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_TAUNT}, + }, + + [MOVE_SEISMIC_TOSS] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FAKE_OUT}, + }, + + [MOVE_STRENGTH] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ABSORB] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_MEGA_DRAIN] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_LEECH_SEED] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_GROWTH] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_GROWTH, + .comboMoves = {0}, + }, + + [MOVE_RAZOR_LEAF] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_SOLAR_BEAM] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH}, + }, + + [MOVE_POISON_POWDER] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWEET_SCENT}, + }, + + [MOVE_STUN_SPORE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWEET_SCENT}, + }, + + [MOVE_SLEEP_POWDER] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWEET_SCENT}, + }, + + [MOVE_PETAL_DANCE] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_STRING_SHOT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_STRING_SHOT, + .comboMoves = {0}, + }, + + [MOVE_DRAGON_RAGE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_DRAGON_RAGE, + .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE}, + }, + + [MOVE_FIRE_SPIN] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_THUNDER_SHOCK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_THUNDERBOLT] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_THUNDER_WAVE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_THUNDER] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_ROCK_THROW] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_ROCK_THROW, + .comboMoves = {0}, + }, + + [MOVE_EARTHQUAKE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_EARTHQUAKE, + .comboMoves = {0}, + }, + + [MOVE_FISSURE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_EARTHQUAKE}, + }, + + [MOVE_DIG] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TOXIC] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CONFUSION] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_CONFUSION, + .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_PSYCHIC] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_PSYCHIC, + .comboMoves = {COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_HYPNOSIS] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_HYPNOSIS, + .comboMoves = {0}, + }, + + [MOVE_MEDITATE] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_AGILITY] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, + }, + + [MOVE_QUICK_ATTACK] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DOUBLE_TEAM}, + }, + + [MOVE_RAGE] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_RAGE, + .comboMoves = {0}, + }, + + [MOVE_TELEPORT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION}, + }, + + [MOVE_NIGHT_SHADE] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MIMIC] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SCREECH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DOUBLE_TEAM] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_DOUBLE_TEAM, + .comboMoves = {0}, + }, + + [MOVE_RECOVER] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_HARDEN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_HARDEN, + .comboMoves = {0}, + }, + + [MOVE_MINIMIZE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SMOKESCREEN] = + { + .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SMOG}, + }, + + [MOVE_CONFUSE_RAY] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WITHDRAW] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_DEFENSE_CURL] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_DEFENSE_CURL, + .comboMoves = {0}, + }, + + [MOVE_BARRIER] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LIGHT_SCREEN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_HAZE] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_REFLECT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_FOCUS_ENERGY] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_FOCUS_ENERGY, + .comboMoves = {0}, + }, + + [MOVE_BIDE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_METRONOME] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MIRROR_MOVE] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SELF_DESTRUCT] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EGG_BOMB] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SOFT_BOILED}, + }, + + [MOVE_LICK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SMOG] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SMOG, + .comboMoves = {0}, + }, + + [MOVE_SLUDGE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SLUDGE, + .comboMoves = {COMBO_STARTER_SLUDGE_BOMB}, + }, + + [MOVE_BONE_CLUB] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_BONE_CLUB, + .comboMoves = {COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH}, + }, + + [MOVE_FIRE_BLAST] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_WATERFALL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_CLAMP] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_SWIFT] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKULL_BASH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPIKE_CANNON] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CONSTRICT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_AMNESIA] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_KINESIS] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_KINESIS, + .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION}, + }, + + [MOVE_SOFT_BOILED] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_SOFT_BOILED, + .comboMoves = {0}, + }, + + [MOVE_HI_JUMP_KICK] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MIND_READER}, + }, + + [MOVE_GLARE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LEER}, + }, + + [MOVE_DREAM_EATER] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_POISON_GAS] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BARRAGE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LEECH_LIFE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LOVELY_KISS] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKY_ATTACK] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TRANSFORM] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BUBBLE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_DIZZY_PUNCH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPORE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FLASH] = + { + .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PSYWAVE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_SPLASH] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ACID_ARMOR] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CRABHAMMER] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_EXPLOSION] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FURY_SWIPES] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SCRATCH}, + }, + + [MOVE_BONEMERANG] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_BONEMERANG, + .comboMoves = {COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH}, + }, + + [MOVE_REST] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_REST, + .comboMoves = {COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN}, + }, + + [MOVE_ROCK_SLIDE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ROCK_THROW}, + }, + + [MOVE_HYPER_FANG] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHARPEN] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CONVERSION] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TRI_ATTACK] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_SUPER_FANG] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SCARY_FACE}, + }, + + [MOVE_SLASH] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH}, + }, + + [MOVE_SUBSTITUTE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_STRUGGLE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKETCH] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TRIPLE_KICK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_THIEF] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPIDER_WEB] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_STRING_SHOT}, + }, + + [MOVE_MIND_READER] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_MIND_READER, + .comboMoves = {0}, + }, + + [MOVE_NIGHTMARE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HYPNOSIS}, + }, + + [MOVE_FLAME_WHEEL] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_SNORE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_REST}, + }, + + [MOVE_CURSE] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_CURSE, + .comboMoves = {0}, + }, + + [MOVE_FLAIL] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE}, + }, + + [MOVE_CONVERSION_2] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_AEROBLAST] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_COTTON_SPORE] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_REVERSAL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE}, + }, + + [MOVE_SPITE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CURSE}, + }, + + [MOVE_POWDER_SNOW] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_POWDER_SNOW, + .comboMoves = {COMBO_STARTER_HAIL}, + }, + + [MOVE_PROTECT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_HARDEN}, + }, + + [MOVE_MACH_PUNCH] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SCARY_FACE] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SCARY_FACE, + .comboMoves = {COMBO_STARTER_RAGE, COMBO_STARTER_LEER}, + }, + + [MOVE_FAINT_ATTACK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND}, + }, + + [MOVE_SWEET_KISS] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARM}, + }, + + [MOVE_BELLY_DRUM] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_BELLY_DRUM, + .comboMoves = {0}, + }, + + [MOVE_SLUDGE_BOMB] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SLUDGE_BOMB, + .comboMoves = {COMBO_STARTER_SLUDGE}, + }, + + [MOVE_MUD_SLAP] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_MUD_SLAP, + .comboMoves = {COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM}, + }, + + [MOVE_OCTAZOOKA] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_SPIKES] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ZAP_CANNON] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_FORESIGHT] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DESTINY_BOND] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE}, + }, + + [MOVE_PERISH_SONG] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING}, + }, + + [MOVE_ICY_WIND] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DETECT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_TAUNT}, + }, + + [MOVE_BONE_RUSH] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_BONE_RUSH, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG}, + }, + + [MOVE_LOCK_ON] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_LOCK_ON, + .comboMoves = {0}, + }, + + [MOVE_OUTRAGE] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SANDSTORM] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_SANDSTORM, + .comboMoves = {0}, + }, + + [MOVE_GIGA_DRAIN] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_ENDURE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_ENDURE, + .comboMoves = {0}, + }, + + [MOVE_CHARM] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_CHARM, + .comboMoves = {0}, + }, + + [MOVE_ROLLOUT] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN}, + }, + + [MOVE_FALSE_SWIPE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_SWAGGER] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MILK_DRINK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SPARK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_FURY_CUTTER] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_STEEL_WING] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MEAN_LOOK] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_MEAN_LOOK, + .comboMoves = {COMBO_STARTER_CURSE}, + }, + + [MOVE_ATTRACT] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SLEEP_TALK] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_REST}, + }, + + [MOVE_HEAL_BELL] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_RETURN] = + { + .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PRESENT] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FRUSTRATION] = + { + .effect = CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SAFEGUARD] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PAIN_SPLIT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE}, + }, + + [MOVE_SACRED_FIRE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MAGNITUDE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DYNAMIC_PUNCH] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER}, + }, + + [MOVE_MEGAHORN] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DRAGON_BREATH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_DRAGON_BREATH, + .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE}, + }, + + [MOVE_BATON_PASS] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ENCORE] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PURSUIT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_RAPID_SPIN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SWEET_SCENT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_SWEET_SCENT, + .comboMoves = {0}, + }, + + [MOVE_IRON_TAIL] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_METAL_CLAW] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_METAL_SOUND}, + }, + + [MOVE_VITAL_THROW] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FAKE_OUT}, + }, + + [MOVE_MORNING_SUN] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_SYNTHESIS] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MOONLIGHT] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_HIDDEN_POWER] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CROSS_CHOP] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_TWISTER] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_RAIN_DANCE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_RAIN_DANCE, + .comboMoves = {0}, + }, + + [MOVE_SUNNY_DAY] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_SUNNY_DAY, + .comboMoves = {0}, + }, + + [MOVE_CRUNCH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SCARY_FACE}, + }, + + [MOVE_MIRROR_COAT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_TAUNT}, + }, + + [MOVE_PSYCH_UP] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EXTREME_SPEED] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_EARLIER, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ANCIENT_POWER] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHADOW_BALL] = + { + .effect = CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FUTURE_SIGHT] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_ROCK_SMASH] = + { + .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WHIRLPOOL] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_BEAT_UP] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FAKE_OUT] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_FAKE_OUT, + .comboMoves = {0}, + }, + + [MOVE_UPROAR] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_STOCKPILE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = COMBO_STARTER_STOCKPILE, + .comboMoves = {0}, + }, + + [MOVE_SPIT_UP] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_STOCKPILE}, + }, + + [MOVE_SWALLOW] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_STOCKPILE}, + }, + + [MOVE_HEAT_WAVE] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_HAIL] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_HAIL, + .comboMoves = {0}, + }, + + [MOVE_TORMENT] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FLATTER] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARM}, + }, + + [MOVE_WILL_O_WISP] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MEMENTO] = + { + .effect = CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FACADE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FOCUS_PUNCH] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_SMELLING_SALT] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FOLLOW_ME] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_NATURE_POWER] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CHARGE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_CHARGE, + .comboMoves = {0}, + }, + + [MOVE_TAUNT] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_TAUNT, + .comboMoves = {0}, + }, + + [MOVE_HELPING_HAND] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TRICK] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ROLE_PLAY] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WISH] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ASSIST] = + { + .effect = CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_INGRAIN] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SUPERPOWER] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_LOCK_ON}, + }, + + [MOVE_MAGIC_COAT] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_RECYCLE] = + { + .effect = CONTEST_EFFECT_REPETITION_NOT_BORING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_REVENGE] = + { + .effect = CONTEST_EFFECT_NEXT_APPEAL_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BRICK_BREAK] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_YAWN] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_YAWN, + .comboMoves = {0}, + }, + + [MOVE_KNOCK_OFF] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FAKE_OUT}, + }, + + [MOVE_ENDEAVOR] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE}, + }, + + [MOVE_ERUPTION] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_SKILL_SWAP] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_IMPRISON] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_REFRESH] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING}, + }, + + [MOVE_GRUDGE] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CURSE}, + }, + + [MOVE_SNATCH] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SECRET_POWER] = + { + .effect = CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DIVE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = COMBO_STARTER_DIVE, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF}, + }, + + [MOVE_ARM_THRUST] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT}, + }, + + [MOVE_CAMOUFLAGE] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TAIL_GLOW] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_LUSTER_PURGE] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_MIST_BALL] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, + + [MOVE_FEATHER_DANCE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TEETER_DANCE] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BLAZE_KICK] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_MUD_SPORT] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_MUD_SPORT, + .comboMoves = {COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT}, + }, + + [MOVE_ICE_BALL] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_NEEDLE_ARM] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SLACK_OFF] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_YAWN}, + }, + + [MOVE_HYPER_VOICE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_POISON_FANG] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_CRUSH_CLAW] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SWORDS_DANCE}, + }, + + [MOVE_BLAST_BURN] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_HYDRO_CANNON] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_METEOR_MASH] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ASTONISH] = + { + .effect = CONTEST_EFFECT_STARTLE_PREV_MON, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WEATHER_BALL] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM}, + }, + + [MOVE_AROMATHERAPY] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_FAKE_TEARS] = + { + .effect = CONTEST_EFFECT_BETTER_IF_LAST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_AIR_CUTTER] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_OVERHEAT] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SUNNY_DAY}, + }, + + [MOVE_ODOR_SLEUTH] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ROCK_TOMB] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_ROCK_THROW}, + }, + + [MOVE_SILVER_WIND] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_METAL_SOUND] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_METAL_SOUND, + .comboMoves = {0}, + }, + + [MOVE_GRASS_WHISTLE] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_TICKLE] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_COSMIC_POWER] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_WATER_SPOUT] = + { + .effect = CONTEST_EFFECT_BETTER_WHEN_LATER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_SIGNAL_BEAM] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHADOW_PUNCH] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_EXTRASENSORY] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SKY_UPPERCUT] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_FOCUS_ENERGY}, + }, + + [MOVE_SAND_TOMB] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_SANDSTORM}, + }, + + [MOVE_SHEER_COLD] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MUDDY_WATER] = + { + .effect = CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_BULLET_SEED] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_AERIAL_ACE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_ICICLE_SPEAR] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_IRON_DEFENSE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BLOCK] = + { + .effect = CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_HOWL] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DRAGON_CLAW] = + { + .effect = CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE}, + }, + + [MOVE_FRENZY_PLANT] = + { + .effect = CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_BULK_UP] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_BOUNCE] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_MUD_SHOT] = + { + .effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_POISON_TAIL] = + { + .effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_COVET] = + { + .effect = CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_VOLT_TACKLE] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_MAGICAL_LEAF] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_GROWTH}, + }, + + [MOVE_WATER_SPORT] = + { + .effect = CONTEST_EFFECT_HIGHLY_APPEALING, + .contestCategory = CONTEST_CATEGORY_CUTE, + .comboStarterId = COMBO_STARTER_WATER_SPORT, + .comboMoves = {COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT}, + }, + + [MOVE_CALM_MIND] = + { + .effect = CONTEST_EFFECT_AVOID_STARTLE_ONCE, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = COMBO_STARTER_CALM_MIND, + .comboMoves = {0}, + }, + + [MOVE_LEAF_BLADE] = + { + .effect = CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_DRAGON_DANCE] = + { + .effect = CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = COMBO_STARTER_DRAGON_DANCE, + .comboMoves = {COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH}, + }, + + [MOVE_ROCK_BLAST] = + { + .effect = CONTEST_EFFECT_BETTER_IF_SAME_TYPE, + .contestCategory = CONTEST_CATEGORY_TOUGH, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_SHOCK_WAVE] = + { + .effect = CONTEST_EFFECT_BETTER_IF_FIRST, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CHARGE}, + }, + + [MOVE_WATER_PULSE] = + { + .effect = CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER, + .contestCategory = CONTEST_CATEGORY_BEAUTY, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_RAIN_DANCE}, + }, + + [MOVE_DOOM_DESIRE] = + { + .effect = CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, + .contestCategory = CONTEST_CATEGORY_COOL, + .comboStarterId = 0, + .comboMoves = {0}, + }, + + [MOVE_PSYCHO_BOOST] = + { + .effect = CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, + .contestCategory = CONTEST_CATEGORY_SMART, + .comboStarterId = 0, + .comboMoves = {COMBO_STARTER_CALM_MIND}, + }, }; const struct ContestEffect gContestEffects[] = { - {0, 40, 0}, // CONTEST_EFFECT_HIGHLY_APPEALING - {0, 60, 0}, // CONTEST_EFFECT_USER_MORE_EASILY_STARTLED - {0, 80, 0}, // CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES - {0, 30, 0}, // CONTEST_EFFECT_REPETITION_NOT_BORING - {1, 20, 0}, // CONTEST_EFFECT_AVOID_STARTLE_ONCE - {1, 10, 0}, // CONTEST_EFFECT_AVOID_STARTLE - {1, 30, 0}, // CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY - {1, 30, 0}, // CONTEST_EFFECT_USER_LESS_EASILY_STARTLED - {2, 30, 20}, // CONTEST_EFFECT_STARTLE_FRONT_MON - {3, 30, 10}, // CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS - {2, 20, 30}, // CONTEST_EFFECT_STARTLE_PREV_MON - {3, 20, 20}, // CONTEST_EFFECT_STARTLE_PREV_MONS - {2, 10, 40}, // CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON - {3, 10, 30}, // CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS - {2, 30, 20}, // CONTEST_EFFECT_STARTLE_PREV_MON_2 - {3, 30, 10}, // CONTEST_EFFECT_STARTLE_PREV_MONS_2 - {4, 30, 0}, // CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION - {3, 40, 40}, // CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL - {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL - {4, 20, 0}, // CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS - {4, 20, 0}, // CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS - {4, 30, 0}, // CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS - {3, 30, 10}, // CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION - {5, 20, 0}, // CONTEST_EFFECT_BETTER_IF_FIRST - {5, 20, 0}, // CONTEST_EFFECT_BETTER_IF_LAST - {5, 10, 0}, // CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES - {5, 10, 0}, // CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE - {5, 10, 0}, // CONTEST_EFFECT_BETTER_WHEN_LATER - {5, 10, 0}, // CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING - {5, 20, 0}, // CONTEST_EFFECT_BETTER_IF_SAME_TYPE - {5, 20, 0}, // CONTEST_EFFECT_BETTER_IF_DIFF_TYPE - {5, 30, 0}, // CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL - {5, 10, 0}, // CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS - {5, 10, 0}, // CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION - {6, 30, 0}, // CONTEST_EFFECT_NEXT_APPEAL_EARLIER - {6, 30, 0}, // CONTEST_EFFECT_NEXT_APPEAL_LATER - {6, 30, 0}, // CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER - {6, 30, 0}, // CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER - {5, 10, 0}, // CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST - {3, 20, 10}, // CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS - {5, 10, 0}, // CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED - {4, 30, 0} // CONTEST_EFFECT_DONT_EXCITE_AUDIENCE + [CONTEST_EFFECT_HIGHLY_APPEALING] = + { + .effectType = 0, + .appeal = 40, + .jam = 0, + }, + [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED] = + { + .effectType = 0, + .appeal = 60, + .jam = 0, + }, + [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES] = + { + .effectType = 0, + .appeal = 80, + .jam = 0, + }, + [CONTEST_EFFECT_REPETITION_NOT_BORING] = + { + .effectType = 0, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_AVOID_STARTLE_ONCE] = + { + .effectType = 1, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_AVOID_STARTLE] = + { + .effectType = 1, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY] = + { + .effectType = 1, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_USER_LESS_EASILY_STARTLED] = + { + .effectType = 1, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_STARTLE_FRONT_MON] = + { + .effectType = 2, + .appeal = 30, + .jam = 20, + }, + [CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS] = + { + .effectType = 3, + .appeal = 30, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_PREV_MON] = + { + .effectType = 2, + .appeal = 20, + .jam = 30, + }, + [CONTEST_EFFECT_STARTLE_PREV_MONS] = + { + .effectType = 3, + .appeal = 20, + .jam = 20, + }, + [CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON] = + { + .effectType = 2, + .appeal = 10, + .jam = 40, + }, + [CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS] = + { + .effectType = 3, + .appeal = 10, + .jam = 30, + }, + [CONTEST_EFFECT_STARTLE_PREV_MON_2] = + { + .effectType = 2, + .appeal = 30, + .jam = 20, + }, + [CONTEST_EFFECT_STARTLE_PREV_MONS_2] = + { + .effectType = 3, + .appeal = 30, + .jam = 10, + }, + [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION] = + { + .effectType = 4, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN] = + { + .effectType = 3, + .appeal = 40, + .jam = 40, + }, + [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS] = + { + .effectType = 4, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS] = + { + .effectType = 4, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS] = + { + .effectType = 4, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] = + { + .effectType = 3, + .appeal = 30, + .jam = 10, + }, + [CONTEST_EFFECT_BETTER_IF_FIRST] = + { + .effectType = 5, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_IF_LAST] = + { + .effectType = 5, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_WHEN_LATER] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_IF_SAME_TYPE] = + { + .effectType = 5, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE] = + { + .effectType = 5, + .appeal = 20, + .jam = 0, + }, + [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL] = + { + .effectType = 5, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_NEXT_APPEAL_EARLIER] = + { + .effectType = 6, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_NEXT_APPEAL_LATER] = + { + .effectType = 6, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER] = + { + .effectType = 6, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER] = + { + .effectType = 6, + .appeal = 30, + .jam = 0, + }, + [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS] = + { + .effectType = 3, + .appeal = 20, + .jam = 10, + }, + [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED] = + { + .effectType = 5, + .appeal = 10, + .jam = 0, + }, + [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE] = + { + .effectType = 4, + .appeal = 30, + .jam = 0, + }, }; // A lookup table with TRUE for each combo starter ID and FALSE for ID 0, diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index f57e294c3..2f504737a 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -247,253 +247,253 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldM const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = { - &gEventObjectGraphicsInfo_BrendanNormal, - &gEventObjectGraphicsInfo_BrendanMachBike, - &gEventObjectGraphicsInfo_BrendanSurfing, - &gEventObjectGraphicsInfo_BrendanFieldMove, - &gEventObjectGraphicsInfo_QuintyPlump, - &gEventObjectGraphicsInfo_NinjaBoy, - &gEventObjectGraphicsInfo_Twin, - &gEventObjectGraphicsInfo_Boy1, - &gEventObjectGraphicsInfo_Girl1, - &gEventObjectGraphicsInfo_Boy2, - &gEventObjectGraphicsInfo_Girl2, - &gEventObjectGraphicsInfo_LittleBoy, - &gEventObjectGraphicsInfo_LittleGirl, - &gEventObjectGraphicsInfo_Boy3, - &gEventObjectGraphicsInfo_Girl3, - &gEventObjectGraphicsInfo_RichBoy, - &gEventObjectGraphicsInfo_Woman1, - &gEventObjectGraphicsInfo_FatMan, - &gEventObjectGraphicsInfo_PokefanF, - &gEventObjectGraphicsInfo_Man1, - &gEventObjectGraphicsInfo_Woman2, - &gEventObjectGraphicsInfo_ExpertM, - &gEventObjectGraphicsInfo_ExpertF, - &gEventObjectGraphicsInfo_Man2, - &gEventObjectGraphicsInfo_Woman3, - &gEventObjectGraphicsInfo_PokefanM, - &gEventObjectGraphicsInfo_Woman4, - &gEventObjectGraphicsInfo_Cook, - &gEventObjectGraphicsInfo_LinkReceptionist, - &gEventObjectGraphicsInfo_OldMan, - &gEventObjectGraphicsInfo_OldWoman, - &gEventObjectGraphicsInfo_Camper, - &gEventObjectGraphicsInfo_Picnicker, - &gEventObjectGraphicsInfo_Man3, - &gEventObjectGraphicsInfo_Woman5, - &gEventObjectGraphicsInfo_Youngster, - &gEventObjectGraphicsInfo_BugCatcher, - &gEventObjectGraphicsInfo_PsychicM, - &gEventObjectGraphicsInfo_SchoolKidM, - &gEventObjectGraphicsInfo_Maniac, - &gEventObjectGraphicsInfo_HexManiac, - &gEventObjectGraphicsInfo_Rayquaza1, - &gEventObjectGraphicsInfo_SwimmerM, - &gEventObjectGraphicsInfo_SwimmerF, - &gEventObjectGraphicsInfo_BlackBelt, - &gEventObjectGraphicsInfo_Beauty, - &gEventObjectGraphicsInfo_Scientist1, - &gEventObjectGraphicsInfo_Lass, - &gEventObjectGraphicsInfo_Gentleman, - &gEventObjectGraphicsInfo_Sailor, - &gEventObjectGraphicsInfo_Fisherman, - &gEventObjectGraphicsInfo_RunningTriathleteM, - &gEventObjectGraphicsInfo_RunningTriathleteF, - &gEventObjectGraphicsInfo_TuberF, - &gEventObjectGraphicsInfo_TuberM, - &gEventObjectGraphicsInfo_Hiker, - &gEventObjectGraphicsInfo_CyclingTriathleteM, - &gEventObjectGraphicsInfo_CyclingTriathleteF, - &gEventObjectGraphicsInfo_Nurse, - &gEventObjectGraphicsInfo_ItemBall, - &gEventObjectGraphicsInfo_BerryTree, - &gEventObjectGraphicsInfo_BerryTreeEarlyStages, - &gEventObjectGraphicsInfo_BerryTreeLateStages, - &gEventObjectGraphicsInfo_BrendanAcroBike, - &gEventObjectGraphicsInfo_ProfBirch, - &gEventObjectGraphicsInfo_Man4, - &gEventObjectGraphicsInfo_Man5, - &gEventObjectGraphicsInfo_ReporterM, - &gEventObjectGraphicsInfo_ReporterF, - &gEventObjectGraphicsInfo_Bard, - &gEventObjectGraphicsInfo_Anabel, - &gEventObjectGraphicsInfo_Tucker, - &gEventObjectGraphicsInfo_Greta, - &gEventObjectGraphicsInfo_Spenser, - &gEventObjectGraphicsInfo_Noland, - &gEventObjectGraphicsInfo_Lucy, - &gEventObjectGraphicsInfo_UnusedNatuDoll, - &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, - &gEventObjectGraphicsInfo_UnusedSquirtleDoll, - &gEventObjectGraphicsInfo_UnusedWooperDoll, - &gEventObjectGraphicsInfo_UnusedPikachuDoll, - &gEventObjectGraphicsInfo_UnusedPorygon2Doll, - &gEventObjectGraphicsInfo_CuttableTree, - &gEventObjectGraphicsInfo_MartEmployee, - &gEventObjectGraphicsInfo_RooftopSaleWoman, - &gEventObjectGraphicsInfo_Teala, - &gEventObjectGraphicsInfo_BreakableRock, - &gEventObjectGraphicsInfo_PushableBoulder, - &gEventObjectGraphicsInfo_MrBrineysBoat, - &gEventObjectGraphicsInfo_MayNormal, - &gEventObjectGraphicsInfo_MayMachBike, - &gEventObjectGraphicsInfo_MayAcroBike, - &gEventObjectGraphicsInfo_MaySurfing, - &gEventObjectGraphicsInfo_MayFieldMove, - &gEventObjectGraphicsInfo_Truck, - &gEventObjectGraphicsInfo_VigorothCarryingBox, - &gEventObjectGraphicsInfo_VigorothFacingAway, - &gEventObjectGraphicsInfo_BirchsBag, - &gEventObjectGraphicsInfo_EnemyZigzagoon, - &gEventObjectGraphicsInfo_Artist, - &gEventObjectGraphicsInfo_RivalBrendanNormal, - &gEventObjectGraphicsInfo_RivalBrendanMachBike, - &gEventObjectGraphicsInfo_RivalBrendanAcroBike, - &gEventObjectGraphicsInfo_RivalBrendanSurfing, - &gEventObjectGraphicsInfo_RivalBrendanFieldMove, - &gEventObjectGraphicsInfo_RivalMayNormal, - &gEventObjectGraphicsInfo_RivalMayMachBike, - &gEventObjectGraphicsInfo_RivalMayAcroBike, - &gEventObjectGraphicsInfo_RivalMaySurfing, - &gEventObjectGraphicsInfo_RivalMayFieldMove, - &gEventObjectGraphicsInfo_Cameraman, - &gEventObjectGraphicsInfo_BrendanUnderwater, - &gEventObjectGraphicsInfo_MayUnderwater, - &gEventObjectGraphicsInfo_MovingBox, - &gEventObjectGraphicsInfo_CableCar, - &gEventObjectGraphicsInfo_Scientist2, - &gEventObjectGraphicsInfo_DevonEmployee, - &gEventObjectGraphicsInfo_AquaMemberM, - &gEventObjectGraphicsInfo_AquaMemberF, - &gEventObjectGraphicsInfo_MagmaMemberM, - &gEventObjectGraphicsInfo_MagmaMemberF, - &gEventObjectGraphicsInfo_Sidney, - &gEventObjectGraphicsInfo_Phoebe, - &gEventObjectGraphicsInfo_Glacia, - &gEventObjectGraphicsInfo_Drake, - &gEventObjectGraphicsInfo_Roxanne, - &gEventObjectGraphicsInfo_Brawly, - &gEventObjectGraphicsInfo_Wattson, - &gEventObjectGraphicsInfo_Flannery, - &gEventObjectGraphicsInfo_Norman, - &gEventObjectGraphicsInfo_Winona, - &gEventObjectGraphicsInfo_Liza, - &gEventObjectGraphicsInfo_Tate, - &gEventObjectGraphicsInfo_Wallace, - &gEventObjectGraphicsInfo_Steven, - &gEventObjectGraphicsInfo_Wally, - &gEventObjectGraphicsInfo_RubySapphireLittleBoy, - &gEventObjectGraphicsInfo_BrendanFishing, - &gEventObjectGraphicsInfo_MayFishing, - &gEventObjectGraphicsInfo_HotSpringsOldWoman, - &gEventObjectGraphicsInfo_SSTidal, - &gEventObjectGraphicsInfo_SubmarineShadow, - &gEventObjectGraphicsInfo_PichuDoll, - &gEventObjectGraphicsInfo_PikachuDoll, - &gEventObjectGraphicsInfo_MarillDoll, - &gEventObjectGraphicsInfo_TogepiDoll, - &gEventObjectGraphicsInfo_CyndaquilDoll, - &gEventObjectGraphicsInfo_ChikoritaDoll, - &gEventObjectGraphicsInfo_TotodileDoll, - &gEventObjectGraphicsInfo_JigglypuffDoll, - &gEventObjectGraphicsInfo_MeowthDoll, - &gEventObjectGraphicsInfo_ClefairyDoll, - &gEventObjectGraphicsInfo_DittoDoll, - &gEventObjectGraphicsInfo_SmoochumDoll, - &gEventObjectGraphicsInfo_TreeckoDoll, - &gEventObjectGraphicsInfo_TorchicDoll, - &gEventObjectGraphicsInfo_MudkipDoll, - &gEventObjectGraphicsInfo_DuskullDoll, - &gEventObjectGraphicsInfo_WynautDoll, - &gEventObjectGraphicsInfo_BaltoyDoll, - &gEventObjectGraphicsInfo_KecleonDoll, - &gEventObjectGraphicsInfo_AzurillDoll, - &gEventObjectGraphicsInfo_SkittyDoll, - &gEventObjectGraphicsInfo_SwabluDoll, - &gEventObjectGraphicsInfo_GulpinDoll, - &gEventObjectGraphicsInfo_LotadDoll, - &gEventObjectGraphicsInfo_SeedotDoll, - &gEventObjectGraphicsInfo_PikaCushion, - &gEventObjectGraphicsInfo_RoundCushion, - &gEventObjectGraphicsInfo_KissCushion, - &gEventObjectGraphicsInfo_ZigzagCushion, - &gEventObjectGraphicsInfo_SpinCushion, - &gEventObjectGraphicsInfo_DiamondCushion, - &gEventObjectGraphicsInfo_BallCushion, - &gEventObjectGraphicsInfo_GrassCushion, - &gEventObjectGraphicsInfo_FireCushion, - &gEventObjectGraphicsInfo_WaterCushion, - &gEventObjectGraphicsInfo_BigSnorlaxDoll, - &gEventObjectGraphicsInfo_BigRhydonDoll, - &gEventObjectGraphicsInfo_BigLaprasDoll, - &gEventObjectGraphicsInfo_BigVenusaurDoll, - &gEventObjectGraphicsInfo_BigCharizardDoll, - &gEventObjectGraphicsInfo_BigBlastoiseDoll, - &gEventObjectGraphicsInfo_BigWailmerDoll, - &gEventObjectGraphicsInfo_BigRegirockDoll, - &gEventObjectGraphicsInfo_BigRegiceDoll, - &gEventObjectGraphicsInfo_BigRegisteelDoll, - &gEventObjectGraphicsInfo_Latias, - &gEventObjectGraphicsInfo_Latios, - &gEventObjectGraphicsInfo_GameboyKid, - &gEventObjectGraphicsInfo_ContestJudge, - &gEventObjectGraphicsInfo_BrendanWatering, - &gEventObjectGraphicsInfo_MayWatering, - &gEventObjectGraphicsInfo_BrendanDecorating, - &gEventObjectGraphicsInfo_MayDecorating, - &gEventObjectGraphicsInfo_Archie, - &gEventObjectGraphicsInfo_Maxie, - &gEventObjectGraphicsInfo_Kyogre1, - &gEventObjectGraphicsInfo_Groudon1, - &gEventObjectGraphicsInfo_Fossil, - &gEventObjectGraphicsInfo_Regirock, - &gEventObjectGraphicsInfo_Regice, - &gEventObjectGraphicsInfo_Registeel, - &gEventObjectGraphicsInfo_Skitty, - &gEventObjectGraphicsInfo_Kecleon1, - &gEventObjectGraphicsInfo_Kyogre2, - &gEventObjectGraphicsInfo_Groudon2, - &gEventObjectGraphicsInfo_Rayquaza2, - &gEventObjectGraphicsInfo_Zigzagoon, - &gEventObjectGraphicsInfo_Pikachu, - &gEventObjectGraphicsInfo_Azumarill, - &gEventObjectGraphicsInfo_Wingull, - &gEventObjectGraphicsInfo_Kecleon2, - &gEventObjectGraphicsInfo_TuberMSwimming, - &gEventObjectGraphicsInfo_Azurill, - &gEventObjectGraphicsInfo_Mom, - &gEventObjectGraphicsInfo_LinkBrendan, - &gEventObjectGraphicsInfo_LinkMay, - &gEventObjectGraphicsInfo_Juan, - &gEventObjectGraphicsInfo_Scott, - &gEventObjectGraphicsInfo_Poochyena, - &gEventObjectGraphicsInfo_Kyogre3, - &gEventObjectGraphicsInfo_Groudon3, - &gEventObjectGraphicsInfo_MysteryEventDeliveryman, - &gEventObjectGraphicsInfo_Statue, - &gEventObjectGraphicsInfo_Kirlia, - &gEventObjectGraphicsInfo_Dusclops, - &gEventObjectGraphicsInfo_UnionRoomAttendant, - &gEventObjectGraphicsInfo_Sudowoodo, - &gEventObjectGraphicsInfo_Mew, - &gEventObjectGraphicsInfo_Red, - &gEventObjectGraphicsInfo_Leaf, - &gEventObjectGraphicsInfo_Deoxys, - &gEventObjectGraphicsInfo_BirthIslandStone, - &gEventObjectGraphicsInfo_Brandon, - &gEventObjectGraphicsInfo_RubySapphireBrendan, - &gEventObjectGraphicsInfo_RubySapphireMay, - &gEventObjectGraphicsInfo_Lugia, - &gEventObjectGraphicsInfo_HoOh, + &gEventObjectGraphicsInfo_BrendanNormal, + &gEventObjectGraphicsInfo_BrendanMachBike, + &gEventObjectGraphicsInfo_BrendanSurfing, + &gEventObjectGraphicsInfo_BrendanFieldMove, + &gEventObjectGraphicsInfo_QuintyPlump, + &gEventObjectGraphicsInfo_NinjaBoy, + &gEventObjectGraphicsInfo_Twin, + &gEventObjectGraphicsInfo_Boy1, + &gEventObjectGraphicsInfo_Girl1, + &gEventObjectGraphicsInfo_Boy2, + &gEventObjectGraphicsInfo_Girl2, + &gEventObjectGraphicsInfo_LittleBoy, + &gEventObjectGraphicsInfo_LittleGirl, + &gEventObjectGraphicsInfo_Boy3, + &gEventObjectGraphicsInfo_Girl3, + &gEventObjectGraphicsInfo_RichBoy, + &gEventObjectGraphicsInfo_Woman1, + &gEventObjectGraphicsInfo_FatMan, + &gEventObjectGraphicsInfo_PokefanF, + &gEventObjectGraphicsInfo_Man1, + &gEventObjectGraphicsInfo_Woman2, + &gEventObjectGraphicsInfo_ExpertM, + &gEventObjectGraphicsInfo_ExpertF, + &gEventObjectGraphicsInfo_Man2, + &gEventObjectGraphicsInfo_Woman3, + &gEventObjectGraphicsInfo_PokefanM, + &gEventObjectGraphicsInfo_Woman4, + &gEventObjectGraphicsInfo_Cook, + &gEventObjectGraphicsInfo_LinkReceptionist, + &gEventObjectGraphicsInfo_OldMan, + &gEventObjectGraphicsInfo_OldWoman, + &gEventObjectGraphicsInfo_Camper, + &gEventObjectGraphicsInfo_Picnicker, + &gEventObjectGraphicsInfo_Man3, + &gEventObjectGraphicsInfo_Woman5, + &gEventObjectGraphicsInfo_Youngster, + &gEventObjectGraphicsInfo_BugCatcher, + &gEventObjectGraphicsInfo_PsychicM, + &gEventObjectGraphicsInfo_SchoolKidM, + &gEventObjectGraphicsInfo_Maniac, + &gEventObjectGraphicsInfo_HexManiac, + &gEventObjectGraphicsInfo_Rayquaza1, + &gEventObjectGraphicsInfo_SwimmerM, + &gEventObjectGraphicsInfo_SwimmerF, + &gEventObjectGraphicsInfo_BlackBelt, + &gEventObjectGraphicsInfo_Beauty, + &gEventObjectGraphicsInfo_Scientist1, + &gEventObjectGraphicsInfo_Lass, + &gEventObjectGraphicsInfo_Gentleman, + &gEventObjectGraphicsInfo_Sailor, + &gEventObjectGraphicsInfo_Fisherman, + &gEventObjectGraphicsInfo_RunningTriathleteM, + &gEventObjectGraphicsInfo_RunningTriathleteF, + &gEventObjectGraphicsInfo_TuberF, + &gEventObjectGraphicsInfo_TuberM, + &gEventObjectGraphicsInfo_Hiker, + &gEventObjectGraphicsInfo_CyclingTriathleteM, + &gEventObjectGraphicsInfo_CyclingTriathleteF, + &gEventObjectGraphicsInfo_Nurse, + &gEventObjectGraphicsInfo_ItemBall, + &gEventObjectGraphicsInfo_BerryTree, + &gEventObjectGraphicsInfo_BerryTreeEarlyStages, + &gEventObjectGraphicsInfo_BerryTreeLateStages, + &gEventObjectGraphicsInfo_BrendanAcroBike, + &gEventObjectGraphicsInfo_ProfBirch, + &gEventObjectGraphicsInfo_Man4, + &gEventObjectGraphicsInfo_Man5, + &gEventObjectGraphicsInfo_ReporterM, + &gEventObjectGraphicsInfo_ReporterF, + &gEventObjectGraphicsInfo_Bard, + &gEventObjectGraphicsInfo_Anabel, + &gEventObjectGraphicsInfo_Tucker, + &gEventObjectGraphicsInfo_Greta, + &gEventObjectGraphicsInfo_Spenser, + &gEventObjectGraphicsInfo_Noland, + &gEventObjectGraphicsInfo_Lucy, + &gEventObjectGraphicsInfo_UnusedNatuDoll, + &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, + &gEventObjectGraphicsInfo_UnusedSquirtleDoll, + &gEventObjectGraphicsInfo_UnusedWooperDoll, + &gEventObjectGraphicsInfo_UnusedPikachuDoll, + &gEventObjectGraphicsInfo_UnusedPorygon2Doll, + &gEventObjectGraphicsInfo_CuttableTree, + &gEventObjectGraphicsInfo_MartEmployee, + &gEventObjectGraphicsInfo_RooftopSaleWoman, + &gEventObjectGraphicsInfo_Teala, + &gEventObjectGraphicsInfo_BreakableRock, + &gEventObjectGraphicsInfo_PushableBoulder, + &gEventObjectGraphicsInfo_MrBrineysBoat, + &gEventObjectGraphicsInfo_MayNormal, + &gEventObjectGraphicsInfo_MayMachBike, + &gEventObjectGraphicsInfo_MayAcroBike, + &gEventObjectGraphicsInfo_MaySurfing, + &gEventObjectGraphicsInfo_MayFieldMove, + &gEventObjectGraphicsInfo_Truck, + &gEventObjectGraphicsInfo_VigorothCarryingBox, + &gEventObjectGraphicsInfo_VigorothFacingAway, + &gEventObjectGraphicsInfo_BirchsBag, + &gEventObjectGraphicsInfo_EnemyZigzagoon, + &gEventObjectGraphicsInfo_Artist, + &gEventObjectGraphicsInfo_RivalBrendanNormal, + &gEventObjectGraphicsInfo_RivalBrendanMachBike, + &gEventObjectGraphicsInfo_RivalBrendanAcroBike, + &gEventObjectGraphicsInfo_RivalBrendanSurfing, + &gEventObjectGraphicsInfo_RivalBrendanFieldMove, + &gEventObjectGraphicsInfo_RivalMayNormal, + &gEventObjectGraphicsInfo_RivalMayMachBike, + &gEventObjectGraphicsInfo_RivalMayAcroBike, + &gEventObjectGraphicsInfo_RivalMaySurfing, + &gEventObjectGraphicsInfo_RivalMayFieldMove, + &gEventObjectGraphicsInfo_Cameraman, + &gEventObjectGraphicsInfo_BrendanUnderwater, + &gEventObjectGraphicsInfo_MayUnderwater, + &gEventObjectGraphicsInfo_MovingBox, + &gEventObjectGraphicsInfo_CableCar, + &gEventObjectGraphicsInfo_Scientist2, + &gEventObjectGraphicsInfo_DevonEmployee, + &gEventObjectGraphicsInfo_AquaMemberM, + &gEventObjectGraphicsInfo_AquaMemberF, + &gEventObjectGraphicsInfo_MagmaMemberM, + &gEventObjectGraphicsInfo_MagmaMemberF, + &gEventObjectGraphicsInfo_Sidney, + &gEventObjectGraphicsInfo_Phoebe, + &gEventObjectGraphicsInfo_Glacia, + &gEventObjectGraphicsInfo_Drake, + &gEventObjectGraphicsInfo_Roxanne, + &gEventObjectGraphicsInfo_Brawly, + &gEventObjectGraphicsInfo_Wattson, + &gEventObjectGraphicsInfo_Flannery, + &gEventObjectGraphicsInfo_Norman, + &gEventObjectGraphicsInfo_Winona, + &gEventObjectGraphicsInfo_Liza, + &gEventObjectGraphicsInfo_Tate, + &gEventObjectGraphicsInfo_Wallace, + &gEventObjectGraphicsInfo_Steven, + &gEventObjectGraphicsInfo_Wally, + &gEventObjectGraphicsInfo_RubySapphireLittleBoy, + &gEventObjectGraphicsInfo_BrendanFishing, + &gEventObjectGraphicsInfo_MayFishing, + &gEventObjectGraphicsInfo_HotSpringsOldWoman, + &gEventObjectGraphicsInfo_SSTidal, + &gEventObjectGraphicsInfo_SubmarineShadow, + &gEventObjectGraphicsInfo_PichuDoll, + &gEventObjectGraphicsInfo_PikachuDoll, + &gEventObjectGraphicsInfo_MarillDoll, + &gEventObjectGraphicsInfo_TogepiDoll, + &gEventObjectGraphicsInfo_CyndaquilDoll, + &gEventObjectGraphicsInfo_ChikoritaDoll, + &gEventObjectGraphicsInfo_TotodileDoll, + &gEventObjectGraphicsInfo_JigglypuffDoll, + &gEventObjectGraphicsInfo_MeowthDoll, + &gEventObjectGraphicsInfo_ClefairyDoll, + &gEventObjectGraphicsInfo_DittoDoll, + &gEventObjectGraphicsInfo_SmoochumDoll, + &gEventObjectGraphicsInfo_TreeckoDoll, + &gEventObjectGraphicsInfo_TorchicDoll, + &gEventObjectGraphicsInfo_MudkipDoll, + &gEventObjectGraphicsInfo_DuskullDoll, + &gEventObjectGraphicsInfo_WynautDoll, + &gEventObjectGraphicsInfo_BaltoyDoll, + &gEventObjectGraphicsInfo_KecleonDoll, + &gEventObjectGraphicsInfo_AzurillDoll, + &gEventObjectGraphicsInfo_SkittyDoll, + &gEventObjectGraphicsInfo_SwabluDoll, + &gEventObjectGraphicsInfo_GulpinDoll, + &gEventObjectGraphicsInfo_LotadDoll, + &gEventObjectGraphicsInfo_SeedotDoll, + &gEventObjectGraphicsInfo_PikaCushion, + &gEventObjectGraphicsInfo_RoundCushion, + &gEventObjectGraphicsInfo_KissCushion, + &gEventObjectGraphicsInfo_ZigzagCushion, + &gEventObjectGraphicsInfo_SpinCushion, + &gEventObjectGraphicsInfo_DiamondCushion, + &gEventObjectGraphicsInfo_BallCushion, + &gEventObjectGraphicsInfo_GrassCushion, + &gEventObjectGraphicsInfo_FireCushion, + &gEventObjectGraphicsInfo_WaterCushion, + &gEventObjectGraphicsInfo_BigSnorlaxDoll, + &gEventObjectGraphicsInfo_BigRhydonDoll, + &gEventObjectGraphicsInfo_BigLaprasDoll, + &gEventObjectGraphicsInfo_BigVenusaurDoll, + &gEventObjectGraphicsInfo_BigCharizardDoll, + &gEventObjectGraphicsInfo_BigBlastoiseDoll, + &gEventObjectGraphicsInfo_BigWailmerDoll, + &gEventObjectGraphicsInfo_BigRegirockDoll, + &gEventObjectGraphicsInfo_BigRegiceDoll, + &gEventObjectGraphicsInfo_BigRegisteelDoll, + &gEventObjectGraphicsInfo_Latias, + &gEventObjectGraphicsInfo_Latios, + &gEventObjectGraphicsInfo_GameboyKid, + &gEventObjectGraphicsInfo_ContestJudge, + &gEventObjectGraphicsInfo_BrendanWatering, + &gEventObjectGraphicsInfo_MayWatering, + &gEventObjectGraphicsInfo_BrendanDecorating, + &gEventObjectGraphicsInfo_MayDecorating, + &gEventObjectGraphicsInfo_Archie, + &gEventObjectGraphicsInfo_Maxie, + &gEventObjectGraphicsInfo_Kyogre1, + &gEventObjectGraphicsInfo_Groudon1, + &gEventObjectGraphicsInfo_Fossil, + &gEventObjectGraphicsInfo_Regirock, + &gEventObjectGraphicsInfo_Regice, + &gEventObjectGraphicsInfo_Registeel, + &gEventObjectGraphicsInfo_Skitty, + &gEventObjectGraphicsInfo_Kecleon1, + &gEventObjectGraphicsInfo_Kyogre2, + &gEventObjectGraphicsInfo_Groudon2, + &gEventObjectGraphicsInfo_Rayquaza2, + &gEventObjectGraphicsInfo_Zigzagoon, + &gEventObjectGraphicsInfo_Pikachu, + &gEventObjectGraphicsInfo_Azumarill, + &gEventObjectGraphicsInfo_Wingull, + &gEventObjectGraphicsInfo_Kecleon2, + &gEventObjectGraphicsInfo_TuberMSwimming, + &gEventObjectGraphicsInfo_Azurill, + &gEventObjectGraphicsInfo_Mom, + &gEventObjectGraphicsInfo_LinkBrendan, + &gEventObjectGraphicsInfo_LinkMay, + &gEventObjectGraphicsInfo_Juan, + &gEventObjectGraphicsInfo_Scott, + &gEventObjectGraphicsInfo_Poochyena, + &gEventObjectGraphicsInfo_Kyogre3, + &gEventObjectGraphicsInfo_Groudon3, + &gEventObjectGraphicsInfo_MysteryEventDeliveryman, + &gEventObjectGraphicsInfo_Statue, + &gEventObjectGraphicsInfo_Kirlia, + &gEventObjectGraphicsInfo_Dusclops, + &gEventObjectGraphicsInfo_UnionRoomAttendant, + &gEventObjectGraphicsInfo_Sudowoodo, + &gEventObjectGraphicsInfo_Mew, + &gEventObjectGraphicsInfo_Red, + &gEventObjectGraphicsInfo_Leaf, + &gEventObjectGraphicsInfo_Deoxys, + &gEventObjectGraphicsInfo_BirthIslandStone, + &gEventObjectGraphicsInfo_Brandon, + &gEventObjectGraphicsInfo_RubySapphireBrendan, + &gEventObjectGraphicsInfo_RubySapphireMay, + &gEventObjectGraphicsInfo_Lugia, + &gEventObjectGraphicsInfo_HoOh, }; const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { - &gEventObjectGraphicsInfo_Bard, - &gEventObjectGraphicsInfo_Hipster, - &gEventObjectGraphicsInfo_Trader, - &gEventObjectGraphicsInfo_Storyteller, - &gEventObjectGraphicsInfo_Giddy, - &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, + &gEventObjectGraphicsInfo_Bard, + &gEventObjectGraphicsInfo_Hipster, + &gEventObjectGraphicsInfo_Trader, + &gEventObjectGraphicsInfo_Storyteller, + &gEventObjectGraphicsInfo_Giddy, + &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, + &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, }; diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h index fb9f4b2cd..712988f5e 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/field_event_obj/movement_action_func_tables.h @@ -422,1092 +422,1092 @@ u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *); u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *); u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = { - gMovementActionFuncs_FaceDown, // MOVEMENT_ACTION_FACE_DOWN - gMovementActionFuncs_FaceUp, // MOVEMENT_ACTION_FACE_UP - gMovementActionFuncs_FaceLeft, // MOVEMENT_ACTION_FACE_LEFT - gMovementActionFuncs_FaceRight, // MOVEMENT_ACTION_FACE_RIGHT - gMovementActionFuncs_WalkSlowDown, // MOVEMENT_ACTION_WALK_SLOW_DOWN - gMovementActionFuncs_WalkSlowUp, // MOVEMENT_ACTION_WALK_SLOW_UP - gMovementActionFuncs_WalkSlowLeft, // MOVEMENT_ACTION_WALK_SLOW_LEFT - gMovementActionFuncs_WalkSlowRight, // MOVEMENT_ACTION_WALK_SLOW_RIGHT - gMovementActionFuncs_WalkNormalDown, // MOVEMENT_ACTION_WALK_NORMAL_DOWN - gMovementActionFuncs_WalkNormalUp, // MOVEMENT_ACTION_WALK_NORMAL_UP - gMovementActionFuncs_WalkNormalLeft, // MOVEMENT_ACTION_WALK_NORMAL_LEFT - gMovementActionFuncs_WalkNormalRight, // MOVEMENT_ACTION_WALK_NORMAL_RIGHT - gMovementActionFuncs_Jump2Down, // MOVEMENT_ACTION_JUMP_2_DOWN - gMovementActionFuncs_Jump2Up, // MOVEMENT_ACTION_JUMP_2_UP - gMovementActionFuncs_Jump2Left, // MOVEMENT_ACTION_JUMP_2_LEFT - gMovementActionFuncs_Jump2Right, // MOVEMENT_ACTION_JUMP_2_RIGHT - gMovementActionFuncs_Delay1, // MOVEMENT_ACTION_DELAY_1 - gMovementActionFuncs_Delay2, // MOVEMENT_ACTION_DELAY_2 - gMovementActionFuncs_Delay4, // MOVEMENT_ACTION_DELAY_4 - gMovementActionFuncs_Delay8, // MOVEMENT_ACTION_DELAY_8 - gMovementActionFuncs_Delay16, // MOVEMENT_ACTION_DELAY_16 - gMovementActionFuncs_WalkFastDown, // MOVEMENT_ACTION_WALK_FAST_DOWN - gMovementActionFuncs_WalkFastUp, // MOVEMENT_ACTION_WALK_FAST_UP - gMovementActionFuncs_WalkFastLeft, // MOVEMENT_ACTION_WALK_FAST_LEFT - gMovementActionFuncs_WalkFastRight, // MOVEMENT_ACTION_WALK_FAST_RIGHT - gMovementActionFuncs_WalkInPlaceSlowDown, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN - gMovementActionFuncs_WalkInPlaceSlowUp, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP - gMovementActionFuncs_WalkInPlaceSlowLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT - gMovementActionFuncs_WalkInPlaceSlowRight, // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT - gMovementActionFuncs_WalkInPlaceNormalDown, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN - gMovementActionFuncs_WalkInPlaceNormalUp, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP - gMovementActionFuncs_WalkInPlaceNormalLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT - gMovementActionFuncs_WalkInPlaceNormalRight, // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT - gMovementActionFuncs_WalkInPlaceFastDown, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN - gMovementActionFuncs_WalkInPlaceFastUp, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP - gMovementActionFuncs_WalkInPlaceFastLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT - gMovementActionFuncs_WalkInPlaceFastRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT - gMovementActionFuncs_WalkInPlaceFastestDown, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN - gMovementActionFuncs_WalkInPlaceFastestUp, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP - gMovementActionFuncs_WalkInPlaceFastestLeft, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT - gMovementActionFuncs_WalkInPlaceFastestRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT - gMovementActionFuncs_RideWaterCurrentDown, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN - gMovementActionFuncs_RideWaterCurrentUp, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP - gMovementActionFuncs_RideWaterCurrentLeft, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT - gMovementActionFuncs_RideWaterCurrentRight, // MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT - gMovementActionFuncs_WalkFastestDown, // MOVEMENT_ACTION_WALK_FASTEST_DOWN - gMovementActionFuncs_WalkFastestUp, // MOVEMENT_ACTION_WALK_FASTEST_UP - gMovementActionFuncs_WalkFastestLeft, // MOVEMENT_ACTION_WALK_FASTEST_LEFT - gMovementActionFuncs_WalkFastestRight, // MOVEMENT_ACTION_WALK_FASTEST_RIGHT - gMovementActionFuncs_SlideDown, // MOVEMENT_ACTION_SLIDE_DOWN - gMovementActionFuncs_SlideUp, // MOVEMENT_ACTION_SLIDE_UP - gMovementActionFuncs_SlideLeft, // MOVEMENT_ACTION_SLIDE_LEFT - gMovementActionFuncs_SlideRight, // MOVEMENT_ACTION_SLIDE_RIGHT - gMovementActionFuncs_PlayerRunDown, // MOVEMENT_ACTION_PLAYER_RUN_DOWN - gMovementActionFuncs_PlayerRunUp, // MOVEMENT_ACTION_PLAYER_RUN_UP - gMovementActionFuncs_PlayerRunLeft, // MOVEMENT_ACTION_PLAYER_RUN_LEFT - gMovementActionFuncs_PlayerRunRight, // MOVEMENT_ACTION_PLAYER_RUN_RIGHT - gMovementActionFuncs_StartAnimInDirection, // MOVEMENT_ACTION_START_ANIM_IN_DIRECTION - gMovementActionFuncs_JumpSpecialDown, // MOVEMENT_ACTION_JUMP_SPECIAL_DOWN - gMovementActionFuncs_JumpSpecialUp, // MOVEMENT_ACTION_JUMP_SPECIAL_UP - gMovementActionFuncs_JumpSpecialLeft, // MOVEMENT_ACTION_JUMP_SPECIAL_LEFT - gMovementActionFuncs_JumpSpecialRight, // MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT - gMovementActionFuncs_FacePlayer, // MOVEMENT_ACTION_FACE_PLAYER - gMovementActionFuncs_FaceAwayPlayer, // MOVEMENT_ACTION_FACE_AWAY_PLAYER - gMovementActionFuncs_LockFacingDirection, // MOVEMENT_ACTION_LOCK_FACING_DIRECTION - gMovementActionFuncs_UnlockFacingDirection, // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION - gMovementActionFuncs_JumpDown, // MOVEMENT_ACTION_JUMP_DOWN - gMovementActionFuncs_JumpUp, // MOVEMENT_ACTION_JUMP_UP - gMovementActionFuncs_JumpLeft, // MOVEMENT_ACTION_JUMP_LEFT - gMovementActionFuncs_JumpRight, // MOVEMENT_ACTION_JUMP_RIGHT - gMovementActionFuncs_JumpInPlaceDown, // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN - gMovementActionFuncs_JumpInPlaceUp, // MOVEMENT_ACTION_JUMP_IN_PLACE_UP - gMovementActionFuncs_JumpInPlaceLeft, // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT - gMovementActionFuncs_JumpInPlaceRight, // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT - gMovementActionFuncs_JumpInPlaceDownUp, // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP - gMovementActionFuncs_JumpInPlaceUpDown, // MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN - gMovementActionFuncs_JumpInPlaceLeftRight, // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT - gMovementActionFuncs_JumpInPlaceRightLeft, // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT - gMovementActionFuncs_FaceOriginalDirection, // MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION - gMovementActionFuncs_NurseJoyBowDown, // MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN - gMovementActionFuncs_EnableJumpLandingGroundEffect, // MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT - gMovementActionFuncs_DisableJumpLandingGroundEffect, // MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT - gMovementActionFuncs_DisableAnimation, // MOVEMENT_ACTION_DISABLE_ANIMATION - gMovementActionFuncs_RestoreAnimation, // MOVEMENT_ACTION_RESTORE_ANIMATION - gMovementActionFuncs_SetInvisible, // MOVEMENT_ACTION_SET_INVISIBLE - gMovementActionFuncs_SetVisible, // MOVEMENT_ACTION_SET_VISIBLE - gMovementActionFuncs_EmoteExclamationMark, // MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK - gMovementActionFuncs_EmoteQuestionMark, // MOVEMENT_ACTION_EMOTE_QUESTION_MARK - gMovementActionFuncs_EmoteHeart, // MOVEMENT_ACTION_EMOTE_HEART - gMovementActionFuncs_RevealTrainer, // MOVEMENT_ACTION_REVEAL_TRAINER - gMovementActionFuncs_RockSmashBreak, // MOVEMENT_ACTION_ROCK_SMASH_BREAK - gMovementActionFuncs_CutTree, // MOVEMENT_ACTION_CUT_TREE - gMovementActionFuncs_SetFixedPriority, // MOVEMENT_ACTION_SET_FIXED_PRIORITY - gMovementActionFuncs_ClearFixedPriority, // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY - gMovementActionFuncs_InitAffineAnim, // MOVEMENT_ACTION_INIT_AFFINE_ANIM - gMovementActionFuncs_ClearAffineAnim, // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM - gMovementActionFuncs_Unknown1, // MOVEMENT_ACTION_UNKNOWN1 - gMovementActionFuncs_Unknown2, // MOVEMENT_ACTION_UNKNOWN2 - gMovementActionFuncs_WalkDownStartAffine, // MOVEMENT_ACTION_WALK_DOWN_START_AFFINE - gMovementActionFuncs_WalkDownAffine, // MOVEMENT_ACTION_WALK_DOWN_AFFINE - gMovementActionFuncs_AcroWheelieFaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN - gMovementActionFuncs_AcroWheelieFaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP - gMovementActionFuncs_AcroWheelieFaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT - gMovementActionFuncs_AcroWheelieFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT - gMovementActionFuncs_AcroPopWheelieDown, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN - gMovementActionFuncs_AcroPopWheelieUp, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP - gMovementActionFuncs_AcroPopWheelieLeft, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT - gMovementActionFuncs_AcroPopWheelieRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT - gMovementActionFuncs_AcroEndWheelieFaceDown, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN - gMovementActionFuncs_AcroEndWheelieFaceUp, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP - gMovementActionFuncs_AcroEndWheelieFaceLeft, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT - gMovementActionFuncs_AcroEndWheelieFaceRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT - gMovementActionFuncs_AcroWheelieHopFaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN - gMovementActionFuncs_AcroWheelieHopFaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP - gMovementActionFuncs_AcroWheelieHopFaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT - gMovementActionFuncs_AcroWheelieHopFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT - gMovementActionFuncs_AcroWheelieHopDown, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN - gMovementActionFuncs_AcroWheelieHopUp, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP - gMovementActionFuncs_AcroWheelieHopLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT - gMovementActionFuncs_AcroWheelieHopRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT - gMovementActionFuncs_AcroWheelieJumpDown, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN - gMovementActionFuncs_AcroWheelieJumpUp, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP - gMovementActionFuncs_AcroWheelieJumpLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT - gMovementActionFuncs_AcroWheelieJumpRight, // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT - gMovementActionFuncs_AcroWheelieInPlaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN - gMovementActionFuncs_AcroWheelieInPlaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP - gMovementActionFuncs_AcroWheelieInPlaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT - gMovementActionFuncs_AcroWheelieInPlaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT - gMovementActionFuncs_AcroPopWheelieMoveDown, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN - gMovementActionFuncs_AcroPopWheelieMoveUp, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP - gMovementActionFuncs_AcroPopWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT - gMovementActionFuncs_AcroPopWheelieMoveRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT - gMovementActionFuncs_AcroWheelieMoveDown, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN - gMovementActionFuncs_AcroWheelieMoveUp, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP - gMovementActionFuncs_AcroWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT - gMovementActionFuncs_AcroWheelieMoveRight, // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT - gMovementActionFuncs_AcroEndWheelieMoveDown, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN - gMovementActionFuncs_AcroEndWheelieMoveUp, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP - gMovementActionFuncs_AcroEndWheelieMoveLeft, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT - gMovementActionFuncs_AcroEndWheelieMoveRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT - gMovementActionFuncs_WalkNormalDiagonalUpLeft, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT - gMovementActionFuncs_WalkNormalDiagonalUpRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT - gMovementActionFuncs_WalkNormalDiagonalDownLeft, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT - gMovementActionFuncs_WalkNormalDiagonalDownRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT - gMovementActionFuncs_WalkSlowDiagonalUpLeft, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT - gMovementActionFuncs_WalkSlowDiagonalUpRight, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT - gMovementActionFuncs_WalkSlowDiagonalDownLeft, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT - gMovementActionFuncs_WalkSlowDiagonalDownRight, // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT - gMovementActionFuncs_StoreAndLockAnim, // MOVEMENT_ACTION_STORE_AND_LOCK_ANIM - gMovementActionFuncs_FreeAndUnlockAnim, // MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM - gMovementActionFuncs_WalkLeftAffine, // MOVEMENT_ACTION_WALK_LEFT_AFFINE - gMovementActionFuncs_WalkRightAffine, // MOVEMENT_ACTION_WALK_RIGHT_AFFINE - gMovementActionFuncs_Levitate, // MOVEMENT_ACTION_LEVITATE - gMovementActionFuncs_StopLevitate, // MOVEMENT_ACTION_STOP_LEVITATE - gMovementActionFuncs_DestroyExtraTaskIfAtTop, // MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP - gMovementActionFuncs_Figure8, // MOVEMENT_ACTION_FIGURE_8 - gMovementActionFuncs_FlyUp, // MOVEMENT_ACTION_FLY_UP - gMovementActionFuncs_FlyDown, // MOVEMENT_ACTION_FLY_DOWN + [MOVEMENT_ACTION_FACE_DOWN] = gMovementActionFuncs_FaceDown, + [MOVEMENT_ACTION_FACE_UP] = gMovementActionFuncs_FaceUp, + [MOVEMENT_ACTION_FACE_LEFT] = gMovementActionFuncs_FaceLeft, + [MOVEMENT_ACTION_FACE_RIGHT] = gMovementActionFuncs_FaceRight, + [MOVEMENT_ACTION_WALK_SLOW_DOWN] = gMovementActionFuncs_WalkSlowDown, + [MOVEMENT_ACTION_WALK_SLOW_UP] = gMovementActionFuncs_WalkSlowUp, + [MOVEMENT_ACTION_WALK_SLOW_LEFT] = gMovementActionFuncs_WalkSlowLeft, + [MOVEMENT_ACTION_WALK_SLOW_RIGHT] = gMovementActionFuncs_WalkSlowRight, + [MOVEMENT_ACTION_WALK_NORMAL_DOWN] = gMovementActionFuncs_WalkNormalDown, + [MOVEMENT_ACTION_WALK_NORMAL_UP] = gMovementActionFuncs_WalkNormalUp, + [MOVEMENT_ACTION_WALK_NORMAL_LEFT] = gMovementActionFuncs_WalkNormalLeft, + [MOVEMENT_ACTION_WALK_NORMAL_RIGHT] = gMovementActionFuncs_WalkNormalRight, + [MOVEMENT_ACTION_JUMP_2_DOWN] = gMovementActionFuncs_Jump2Down, + [MOVEMENT_ACTION_JUMP_2_UP] = gMovementActionFuncs_Jump2Up, + [MOVEMENT_ACTION_JUMP_2_LEFT] = gMovementActionFuncs_Jump2Left, + [MOVEMENT_ACTION_JUMP_2_RIGHT] = gMovementActionFuncs_Jump2Right, + [MOVEMENT_ACTION_DELAY_1] = gMovementActionFuncs_Delay1, + [MOVEMENT_ACTION_DELAY_2] = gMovementActionFuncs_Delay2, + [MOVEMENT_ACTION_DELAY_4] = gMovementActionFuncs_Delay4, + [MOVEMENT_ACTION_DELAY_8] = gMovementActionFuncs_Delay8, + [MOVEMENT_ACTION_DELAY_16] = gMovementActionFuncs_Delay16, + [MOVEMENT_ACTION_WALK_FAST_DOWN] = gMovementActionFuncs_WalkFastDown, + [MOVEMENT_ACTION_WALK_FAST_UP] = gMovementActionFuncs_WalkFastUp, + [MOVEMENT_ACTION_WALK_FAST_LEFT] = gMovementActionFuncs_WalkFastLeft, + [MOVEMENT_ACTION_WALK_FAST_RIGHT] = gMovementActionFuncs_WalkFastRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN] = gMovementActionFuncs_WalkInPlaceSlowDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP] = gMovementActionFuncs_WalkInPlaceSlowUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT] = gMovementActionFuncs_WalkInPlaceSlowLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT] = gMovementActionFuncs_WalkInPlaceSlowRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN] = gMovementActionFuncs_WalkInPlaceNormalDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP] = gMovementActionFuncs_WalkInPlaceNormalUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT] = gMovementActionFuncs_WalkInPlaceNormalLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT] = gMovementActionFuncs_WalkInPlaceNormalRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN] = gMovementActionFuncs_WalkInPlaceFastDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP] = gMovementActionFuncs_WalkInPlaceFastUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT] = gMovementActionFuncs_WalkInPlaceFastLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT] = gMovementActionFuncs_WalkInPlaceFastRight, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN] = gMovementActionFuncs_WalkInPlaceFastestDown, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP] = gMovementActionFuncs_WalkInPlaceFastestUp, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT] = gMovementActionFuncs_WalkInPlaceFastestLeft, + [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT] = gMovementActionFuncs_WalkInPlaceFastestRight, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN] = gMovementActionFuncs_RideWaterCurrentDown, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP] = gMovementActionFuncs_RideWaterCurrentUp, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT] = gMovementActionFuncs_RideWaterCurrentLeft, + [MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT] = gMovementActionFuncs_RideWaterCurrentRight, + [MOVEMENT_ACTION_WALK_FASTEST_DOWN] = gMovementActionFuncs_WalkFastestDown, + [MOVEMENT_ACTION_WALK_FASTEST_UP] = gMovementActionFuncs_WalkFastestUp, + [MOVEMENT_ACTION_WALK_FASTEST_LEFT] = gMovementActionFuncs_WalkFastestLeft, + [MOVEMENT_ACTION_WALK_FASTEST_RIGHT] = gMovementActionFuncs_WalkFastestRight, + [MOVEMENT_ACTION_SLIDE_DOWN] = gMovementActionFuncs_SlideDown, + [MOVEMENT_ACTION_SLIDE_UP] = gMovementActionFuncs_SlideUp, + [MOVEMENT_ACTION_SLIDE_LEFT] = gMovementActionFuncs_SlideLeft, + [MOVEMENT_ACTION_SLIDE_RIGHT] = gMovementActionFuncs_SlideRight, + [MOVEMENT_ACTION_PLAYER_RUN_DOWN] = gMovementActionFuncs_PlayerRunDown, + [MOVEMENT_ACTION_PLAYER_RUN_UP] = gMovementActionFuncs_PlayerRunUp, + [MOVEMENT_ACTION_PLAYER_RUN_LEFT] = gMovementActionFuncs_PlayerRunLeft, + [MOVEMENT_ACTION_PLAYER_RUN_RIGHT] = gMovementActionFuncs_PlayerRunRight, + [MOVEMENT_ACTION_START_ANIM_IN_DIRECTION] = gMovementActionFuncs_StartAnimInDirection, + [MOVEMENT_ACTION_JUMP_SPECIAL_DOWN] = gMovementActionFuncs_JumpSpecialDown, + [MOVEMENT_ACTION_JUMP_SPECIAL_UP] = gMovementActionFuncs_JumpSpecialUp, + [MOVEMENT_ACTION_JUMP_SPECIAL_LEFT] = gMovementActionFuncs_JumpSpecialLeft, + [MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT] = gMovementActionFuncs_JumpSpecialRight, + [MOVEMENT_ACTION_FACE_PLAYER] = gMovementActionFuncs_FacePlayer, + [MOVEMENT_ACTION_FACE_AWAY_PLAYER] = gMovementActionFuncs_FaceAwayPlayer, + [MOVEMENT_ACTION_LOCK_FACING_DIRECTION] = gMovementActionFuncs_LockFacingDirection, + [MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION] = gMovementActionFuncs_UnlockFacingDirection, + [MOVEMENT_ACTION_JUMP_DOWN] = gMovementActionFuncs_JumpDown, + [MOVEMENT_ACTION_JUMP_UP] = gMovementActionFuncs_JumpUp, + [MOVEMENT_ACTION_JUMP_LEFT] = gMovementActionFuncs_JumpLeft, + [MOVEMENT_ACTION_JUMP_RIGHT] = gMovementActionFuncs_JumpRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN] = gMovementActionFuncs_JumpInPlaceDown, + [MOVEMENT_ACTION_JUMP_IN_PLACE_UP] = gMovementActionFuncs_JumpInPlaceUp, + [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT] = gMovementActionFuncs_JumpInPlaceLeft, + [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT] = gMovementActionFuncs_JumpInPlaceRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP] = gMovementActionFuncs_JumpInPlaceDownUp, + [MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN] = gMovementActionFuncs_JumpInPlaceUpDown, + [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT] = gMovementActionFuncs_JumpInPlaceLeftRight, + [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT] = gMovementActionFuncs_JumpInPlaceRightLeft, + [MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION] = gMovementActionFuncs_FaceOriginalDirection, + [MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN] = gMovementActionFuncs_NurseJoyBowDown, + [MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT] = gMovementActionFuncs_EnableJumpLandingGroundEffect, + [MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT] = gMovementActionFuncs_DisableJumpLandingGroundEffect, + [MOVEMENT_ACTION_DISABLE_ANIMATION] = gMovementActionFuncs_DisableAnimation, + [MOVEMENT_ACTION_RESTORE_ANIMATION] = gMovementActionFuncs_RestoreAnimation, + [MOVEMENT_ACTION_SET_INVISIBLE] = gMovementActionFuncs_SetInvisible, + [MOVEMENT_ACTION_SET_VISIBLE] = gMovementActionFuncs_SetVisible, + [MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK] = gMovementActionFuncs_EmoteExclamationMark, + [MOVEMENT_ACTION_EMOTE_QUESTION_MARK] = gMovementActionFuncs_EmoteQuestionMark, + [MOVEMENT_ACTION_EMOTE_HEART] = gMovementActionFuncs_EmoteHeart, + [MOVEMENT_ACTION_REVEAL_TRAINER] = gMovementActionFuncs_RevealTrainer, + [MOVEMENT_ACTION_ROCK_SMASH_BREAK] = gMovementActionFuncs_RockSmashBreak, + [MOVEMENT_ACTION_CUT_TREE] = gMovementActionFuncs_CutTree, + [MOVEMENT_ACTION_SET_FIXED_PRIORITY] = gMovementActionFuncs_SetFixedPriority, + [MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = gMovementActionFuncs_ClearFixedPriority, + [MOVEMENT_ACTION_INIT_AFFINE_ANIM] = gMovementActionFuncs_InitAffineAnim, + [MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = gMovementActionFuncs_ClearAffineAnim, + [MOVEMENT_ACTION_UNKNOWN1] = gMovementActionFuncs_Unknown1, + [MOVEMENT_ACTION_UNKNOWN2] = gMovementActionFuncs_Unknown2, + [MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = gMovementActionFuncs_WalkDownStartAffine, + [MOVEMENT_ACTION_WALK_DOWN_AFFINE] = gMovementActionFuncs_WalkDownAffine, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroWheelieFaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP] = gMovementActionFuncs_AcroWheelieFaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT] = gMovementActionFuncs_AcroWheelieFaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT] = gMovementActionFuncs_AcroWheelieFaceRight, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN] = gMovementActionFuncs_AcroPopWheelieDown, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP] = gMovementActionFuncs_AcroPopWheelieUp, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT] = gMovementActionFuncs_AcroPopWheelieLeft, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT] = gMovementActionFuncs_AcroPopWheelieRight, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroEndWheelieFaceDown, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP] = gMovementActionFuncs_AcroEndWheelieFaceUp, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT] = gMovementActionFuncs_AcroEndWheelieFaceLeft, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT] = gMovementActionFuncs_AcroEndWheelieFaceRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN] = gMovementActionFuncs_AcroWheelieHopFaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP] = gMovementActionFuncs_AcroWheelieHopFaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT] = gMovementActionFuncs_AcroWheelieHopFaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT] = gMovementActionFuncs_AcroWheelieHopFaceRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN] = gMovementActionFuncs_AcroWheelieHopDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP] = gMovementActionFuncs_AcroWheelieHopUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT] = gMovementActionFuncs_AcroWheelieHopLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT] = gMovementActionFuncs_AcroWheelieHopRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN] = gMovementActionFuncs_AcroWheelieJumpDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP] = gMovementActionFuncs_AcroWheelieJumpUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT] = gMovementActionFuncs_AcroWheelieJumpLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT] = gMovementActionFuncs_AcroWheelieJumpRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN] = gMovementActionFuncs_AcroWheelieInPlaceDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP] = gMovementActionFuncs_AcroWheelieInPlaceUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT] = gMovementActionFuncs_AcroWheelieInPlaceLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT] = gMovementActionFuncs_AcroWheelieInPlaceRight, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroPopWheelieMoveDown, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroPopWheelieMoveUp, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroPopWheelieMoveLeft, + [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroPopWheelieMoveRight, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroWheelieMoveDown, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroWheelieMoveUp, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroWheelieMoveLeft, + [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroWheelieMoveRight, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroEndWheelieMoveDown, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroEndWheelieMoveUp, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroEndWheelieMoveLeft, + [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroEndWheelieMoveRight, + [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT] = gMovementActionFuncs_WalkNormalDiagonalUpLeft, + [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkNormalDiagonalUpRight, + [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkNormalDiagonalDownLeft, + [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkNormalDiagonalDownRight, + [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT] = gMovementActionFuncs_WalkSlowDiagonalUpLeft, + [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalUpRight, + [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkSlowDiagonalDownLeft, + [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalDownRight, + [MOVEMENT_ACTION_STORE_AND_LOCK_ANIM] = gMovementActionFuncs_StoreAndLockAnim, + [MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM] = gMovementActionFuncs_FreeAndUnlockAnim, + [MOVEMENT_ACTION_WALK_LEFT_AFFINE] = gMovementActionFuncs_WalkLeftAffine, + [MOVEMENT_ACTION_WALK_RIGHT_AFFINE] = gMovementActionFuncs_WalkRightAffine, + [MOVEMENT_ACTION_LEVITATE] = gMovementActionFuncs_Levitate, + [MOVEMENT_ACTION_STOP_LEVITATE] = gMovementActionFuncs_StopLevitate, + [MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP] = gMovementActionFuncs_DestroyExtraTaskIfAtTop, + [MOVEMENT_ACTION_FIGURE_8] = gMovementActionFuncs_Figure8, + [MOVEMENT_ACTION_FLY_UP] = gMovementActionFuncs_FlyUp, + [MOVEMENT_ACTION_FLY_DOWN] = gMovementActionFuncs_FlyDown, }; u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceDown_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceDown_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceUp_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceUp_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceLeft_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceLeft_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceRight_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceRight_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gUnknown_0850DEE8[])(u8) = { - GetMoveDirectionAnimNum, - GetMoveDirectionFastAnimNum, - GetMoveDirectionFastAnimNum, - GetMoveDirectionFasterAnimNum, - GetMoveDirectionFastestAnimNum, + GetMoveDirectionAnimNum, + GetMoveDirectionFastAnimNum, + GetMoveDirectionFastAnimNum, + GetMoveDirectionFasterAnimNum, + GetMoveDirectionFastestAnimNum, }; u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDiagonalUpLeft_Step0, - MovementAction_WalkSlowDiagonalUpLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDiagonalUpLeft_Step0, + MovementAction_WalkSlowDiagonalUpLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDiagonalUpRight_Step0, - MovementAction_WalkSlowDiagonalUpRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDiagonalUpRight_Step0, + MovementAction_WalkSlowDiagonalUpRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDiagonalDownLeft_Step0, - MovementAction_WalkSlowDiagonalDownLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDiagonalDownLeft_Step0, + MovementAction_WalkSlowDiagonalDownLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDiagonalDownRight_Step0, - MovementAction_WalkSlowDiagonalDownRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDiagonalDownRight_Step0, + MovementAction_WalkSlowDiagonalDownRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowDown_Step0, - MovementAction_WalkSlowDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowDown_Step0, + MovementAction_WalkSlowDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowUp_Step0, - MovementAction_WalkSlowUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowUp_Step0, + MovementAction_WalkSlowUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowLeft_Step0, - MovementAction_WalkSlowLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowLeft_Step0, + MovementAction_WalkSlowLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkSlowRight_Step0, - MovementAction_WalkSlowRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkSlowRight_Step0, + MovementAction_WalkSlowRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDiagonalUpLeft_Step0, - MovementAction_WalkNormalDiagonalUpLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDiagonalUpLeft_Step0, + MovementAction_WalkNormalDiagonalUpLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDiagonalUpRight_Step0, - MovementAction_WalkNormalDiagonalUpRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDiagonalUpRight_Step0, + MovementAction_WalkNormalDiagonalUpRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDiagonalDownLeft_Step0, - MovementAction_WalkNormalDiagonalDownLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDiagonalDownLeft_Step0, + MovementAction_WalkNormalDiagonalDownLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDiagonalDownRight_Step0, - MovementAction_WalkNormalDiagonalDownRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDiagonalDownRight_Step0, + MovementAction_WalkNormalDiagonalDownRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalDown_Step0, - MovementAction_WalkNormalDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalDown_Step0, + MovementAction_WalkNormalDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalUp_Step0, - MovementAction_WalkNormalUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalUp_Step0, + MovementAction_WalkNormalUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalLeft_Step0, - MovementAction_WalkNormalLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalLeft_Step0, + MovementAction_WalkNormalLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkNormalRight_Step0, - MovementAction_WalkNormalRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkNormalRight_Step0, + MovementAction_WalkNormalRight_Step1, + MovementAction_PauseSpriteAnim, }; const s16 gUnknown_0850DFBC[] = {0, 1, 1}; const s16 gUnknown_0850DFC2[] = {0, 0, 1}; u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = { - MovementAction_Jump2Down_Step0, - MovementAction_Jump2Down_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Jump2Down_Step0, + MovementAction_Jump2Down_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = { - MovementAction_Jump2Up_Step0, - MovementAction_Jump2Up_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Jump2Up_Step0, + MovementAction_Jump2Up_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = { - MovementAction_Jump2Left_Step0, - MovementAction_Jump2Left_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Jump2Left_Step0, + MovementAction_Jump2Left_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = { - MovementAction_Jump2Right_Step0, - MovementAction_Jump2Right_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Jump2Right_Step0, + MovementAction_Jump2Right_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay1_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay1_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay2_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay2_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay4_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay4_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay8_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay8_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = { - MovementAction_Delay16_Step0, - MovementAction_Delay_Step1, - MovementAction_Finish, + MovementAction_Delay16_Step0, + MovementAction_Delay_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastDown_Step0, - MovementAction_WalkFastDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastDown_Step0, + MovementAction_WalkFastDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastUp_Step0, - MovementAction_WalkFastUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastUp_Step0, + MovementAction_WalkFastUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastLeft_Step0, - MovementAction_WalkFastLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastLeft_Step0, + MovementAction_WalkFastLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastRight_Step0, - MovementAction_WalkFastRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastRight_Step0, + MovementAction_WalkFastRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceSlowDown_Step0, - MovementAction_WalkInPlaceSlow_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceSlowDown_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceSlowUp_Step0, - MovementAction_WalkInPlaceSlow_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceSlowUp_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceSlowLeft_Step0, - MovementAction_WalkInPlaceSlow_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceSlowLeft_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceSlowRight_Step0, - MovementAction_WalkInPlaceSlow_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceSlowRight_Step0, + MovementAction_WalkInPlaceSlow_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceNormalDown_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceNormalDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceNormalUp_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceNormalUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceNormalLeft_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceNormalLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceNormalRight_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceNormalRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastDown_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastUp_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastLeft_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastRight_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestDown_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastestDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestUp_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastestUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestLeft_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastestLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkInPlaceFastestRight_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkInPlaceFastestRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_RideWaterCurrentDown_Step0, - MovementAction_RideWaterCurrentDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_RideWaterCurrentDown_Step0, + MovementAction_RideWaterCurrentDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_RideWaterCurrentUp_Step0, - MovementAction_RideWaterCurrentUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_RideWaterCurrentUp_Step0, + MovementAction_RideWaterCurrentUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_RideWaterCurrentLeft_Step0, - MovementAction_RideWaterCurrentLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_RideWaterCurrentLeft_Step0, + MovementAction_RideWaterCurrentLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_RideWaterCurrentRight_Step0, - MovementAction_RideWaterCurrentRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_RideWaterCurrentRight_Step0, + MovementAction_RideWaterCurrentRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastestDown_Step0, - MovementAction_WalkFastestDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastestDown_Step0, + MovementAction_WalkFastestDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastestUp_Step0, - MovementAction_WalkFastestUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastestUp_Step0, + MovementAction_WalkFastestUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastestLeft_Step0, - MovementAction_WalkFastestLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastestLeft_Step0, + MovementAction_WalkFastestLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkFastestRight_Step0, - MovementAction_WalkFastestRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkFastestRight_Step0, + MovementAction_WalkFastestRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_SlideDown_Step0, - MovementAction_SlideDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_SlideDown_Step0, + MovementAction_SlideDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_SlideUp_Step0, - MovementAction_SlideUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_SlideUp_Step0, + MovementAction_SlideUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_SlideLeft_Step0, - MovementAction_SlideLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_SlideLeft_Step0, + MovementAction_SlideLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_SlideRight_Step0, - MovementAction_SlideRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_SlideRight_Step0, + MovementAction_SlideRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_PlayerRunDown_Step0, - MovementAction_PlayerRunDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_PlayerRunDown_Step0, + MovementAction_PlayerRunDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_PlayerRunUp_Step0, - MovementAction_PlayerRunUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_PlayerRunUp_Step0, + MovementAction_PlayerRunUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_PlayerRunLeft_Step0, - MovementAction_PlayerRunLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_PlayerRunLeft_Step0, + MovementAction_PlayerRunLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_PlayerRunRight_Step0, - MovementAction_PlayerRunRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_PlayerRunRight_Step0, + MovementAction_PlayerRunRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = { - MovementAction_StartAnimInDirection_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_StartAnimInDirection_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpSpecialDown_Step0, - MovementAction_JumpSpecialDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpSpecialDown_Step0, + MovementAction_JumpSpecialDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpSpecialUp_Step0, - MovementAction_JumpSpecialUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpSpecialUp_Step0, + MovementAction_JumpSpecialUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpSpecialLeft_Step0, - MovementAction_JumpSpecialLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpSpecialLeft_Step0, + MovementAction_JumpSpecialLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpSpecialRight_Step0, - MovementAction_JumpSpecialRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpSpecialRight_Step0, + MovementAction_JumpSpecialRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = { - MovementAction_FacePlayer_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FacePlayer_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceAwayPlayer_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceAwayPlayer_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = { - MovementAction_LockFacingDirection_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_LockFacingDirection_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnlockFacingDirection_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_UnlockFacingDirection_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpDown_Step0, - MovementAction_JumpDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpDown_Step0, + MovementAction_JumpDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpUp_Step0, - MovementAction_JumpUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpUp_Step0, + MovementAction_JumpUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpLeft_Step0, - MovementAction_JumpLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpLeft_Step0, + MovementAction_JumpLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpRight_Step0, - MovementAction_JumpRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpRight_Step0, + MovementAction_JumpRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceDown_Step0, - MovementAction_JumpInPlaceDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceDown_Step0, + MovementAction_JumpInPlaceDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceUp_Step0, - MovementAction_JumpInPlaceUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceUp_Step0, + MovementAction_JumpInPlaceUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceLeft_Step0, - MovementAction_JumpInPlaceLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceLeft_Step0, + MovementAction_JumpInPlaceLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceRight_Step0, - MovementAction_JumpInPlaceRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceRight_Step0, + MovementAction_JumpInPlaceRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceDownUp_Step0, - MovementAction_JumpInPlaceDownUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceDownUp_Step0, + MovementAction_JumpInPlaceDownUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceUpDown_Step0, - MovementAction_JumpInPlaceUpDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceUpDown_Step0, + MovementAction_JumpInPlaceUpDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceLeftRight_Step0, - MovementAction_JumpInPlaceLeftRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceLeftRight_Step0, + MovementAction_JumpInPlaceLeftRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_JumpInPlaceRightLeft_Step0, - MovementAction_JumpInPlaceRightLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_JumpInPlaceRightLeft_Step0, + MovementAction_JumpInPlaceRightLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = { - MovementAction_FaceOriginalDirection_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_FaceOriginalDirection_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_NurseJoyBowDown_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_NurseJoyBowDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { - MovementAction_EnableJumpLandingGroundEffect_Step0, - MovementAction_Finish, + MovementAction_EnableJumpLandingGroundEffect_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { - MovementAction_DisableJumpLandingGroundEffect_Step0, - MovementAction_Finish, + MovementAction_DisableJumpLandingGroundEffect_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = { - MovementAction_DisableAnimation_Step0, - MovementAction_Finish, + MovementAction_DisableAnimation_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = { - MovementAction_RestoreAnimation_Step0, - MovementAction_Finish, + MovementAction_RestoreAnimation_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = { - MovementAction_SetInvisible_Step0, - MovementAction_Finish, + MovementAction_SetInvisible_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = { - MovementAction_SetVisible_Step0, - MovementAction_Finish, + MovementAction_SetVisible_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = { - MovementAction_EmoteExclamationMark_Step0, - MovementAction_Finish, + MovementAction_EmoteExclamationMark_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = { - MovementAction_EmoteQuestionMark_Step0, - MovementAction_Finish, + MovementAction_EmoteQuestionMark_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = { - MovementAction_EmoteHeart_Step0, - MovementAction_Finish, + MovementAction_EmoteHeart_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = { - MovementAction_RevealTrainer_Step0, - MovementAction_RevealTrainer_Step1, - MovementAction_Finish, + MovementAction_RevealTrainer_Step0, + MovementAction_RevealTrainer_Step1, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = { - MovementAction_RockSmashBreak_Step0, - MovementAction_RockSmashBreak_Step1, - MovementAction_RockSmashBreak_Step2, - MovementAction_Finish, + MovementAction_RockSmashBreak_Step0, + MovementAction_RockSmashBreak_Step1, + MovementAction_RockSmashBreak_Step2, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = { - MovementAction_CutTree_Step0, - MovementAction_CutTree_Step1, - MovementAction_CutTree_Step2, - MovementAction_Finish, + MovementAction_CutTree_Step0, + MovementAction_CutTree_Step1, + MovementAction_CutTree_Step2, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = { - MovementAction_SetFixedPriority_Step0, - MovementAction_Finish, + MovementAction_SetFixedPriority_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = { - MovementAction_ClearFixedPriority_Step0, - MovementAction_Finish, + MovementAction_ClearFixedPriority_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = { - MovementAction_InitAffineAnim_Step0, - MovementAction_Finish, + MovementAction_InitAffineAnim_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = { - MovementAction_ClearAffineAnim_Step0, - MovementAction_Finish, + MovementAction_ClearAffineAnim_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *) = { - MovementAction_Unknown1_Step0, - MovementAction_Finish, + MovementAction_Unknown1_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *) = { - MovementAction_Unknown2_Step0, - MovementAction_Finish, + MovementAction_Unknown2_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkDownStartAffine_Step0, - MovementAction_WalkDownStartAffine_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkDownStartAffine_Step0, + MovementAction_WalkDownStartAffine_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkDownAffine_Step0, - MovementAction_WalkDownAffine_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkDownAffine_Step0, + MovementAction_WalkDownAffine_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkLeftAffine_Step0, - MovementAction_WalkLeftAffine_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkLeftAffine_Step0, + MovementAction_WalkLeftAffine_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = { - MovementAction_WalkRightAffine_Step0, - MovementAction_WalkRightAffine_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_WalkRightAffine_Step0, + MovementAction_WalkRightAffine_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieFaceDown_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieFaceDown_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieFaceUp_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieFaceUp_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieFaceLeft_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieFaceLeft_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieFaceRight_Step0, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieFaceRight_Step0, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieDown_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieUp_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieLeft_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieRight_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieFaceDown_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieFaceDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieFaceUp_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieFaceUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieFaceLeft_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieFaceLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieFaceRight_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieFaceRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnusedAcroActionDown_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_UnusedAcroActionDown_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnusedAcroActionUp_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_UnusedAcroActionUp_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnusedAcroActionLeft_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_UnusedAcroActionLeft_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_UnusedAcroActionRight_Step0, - MovementAction_WaitSpriteAnim, - MovementAction_PauseSpriteAnim, + MovementAction_UnusedAcroActionRight_Step0, + MovementAction_WaitSpriteAnim, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = { - MovementAction_Figure8_Step0, - MovementAction_Figure8_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_Figure8_Step0, + MovementAction_Figure8_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopFaceDown_Step0, - MovementAction_AcroWheelieHopFaceDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopFaceDown_Step0, + MovementAction_AcroWheelieHopFaceDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopFaceUp_Step0, - MovementAction_AcroWheelieHopFaceUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopFaceUp_Step0, + MovementAction_AcroWheelieHopFaceUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopFaceLeft_Step0, - MovementAction_AcroWheelieHopFaceLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopFaceLeft_Step0, + MovementAction_AcroWheelieHopFaceLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopFaceRight_Step0, - MovementAction_AcroWheelieHopFaceRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopFaceRight_Step0, + MovementAction_AcroWheelieHopFaceRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopDown_Step0, - MovementAction_AcroWheelieHopDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopDown_Step0, + MovementAction_AcroWheelieHopDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopUp_Step0, - MovementAction_AcroWheelieHopUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopUp_Step0, + MovementAction_AcroWheelieHopUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopLeft_Step0, - MovementAction_AcroWheelieHopLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopLeft_Step0, + MovementAction_AcroWheelieHopLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieHopRight_Step0, - MovementAction_AcroWheelieHopRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieHopRight_Step0, + MovementAction_AcroWheelieHopRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieJumpDown_Step0, - MovementAction_AcroWheelieJumpDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieJumpDown_Step0, + MovementAction_AcroWheelieJumpDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieJumpUp_Step0, - MovementAction_AcroWheelieJumpUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieJumpUp_Step0, + MovementAction_AcroWheelieJumpUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieJumpLeft_Step0, - MovementAction_AcroWheelieJumpLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieJumpLeft_Step0, + MovementAction_AcroWheelieJumpLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieJumpRight_Step0, - MovementAction_AcroWheelieJumpRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieJumpRight_Step0, + MovementAction_AcroWheelieJumpRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieInPlaceDown_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieInPlaceDown_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieInPlaceUp_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieInPlaceUp_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieInPlaceLeft_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieInPlaceLeft_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieInPlaceRight_Step0, - MovementAction_WalkInPlace_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieInPlaceRight_Step0, + MovementAction_WalkInPlace_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieMoveDown_Step0, - MovementAction_AcroPopWheelieMoveDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieMoveDown_Step0, + MovementAction_AcroPopWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieMoveUp_Step0, - MovementAction_AcroPopWheelieMoveUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieMoveUp_Step0, + MovementAction_AcroPopWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieMoveLeft_Step0, - MovementAction_AcroPopWheelieMoveLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieMoveLeft_Step0, + MovementAction_AcroPopWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroPopWheelieMoveRight_Step0, - MovementAction_AcroPopWheelieMoveRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroPopWheelieMoveRight_Step0, + MovementAction_AcroPopWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieMoveDown_Step0, - MovementAction_AcroWheelieMoveDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieMoveDown_Step0, + MovementAction_AcroWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieMoveUp_Step0, - MovementAction_AcroWheelieMoveUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieMoveUp_Step0, + MovementAction_AcroWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieMoveLeft_Step0, - MovementAction_AcroWheelieMoveLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieMoveLeft_Step0, + MovementAction_AcroWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroWheelieMoveRight_Step0, - MovementAction_AcroWheelieMoveRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroWheelieMoveRight_Step0, + MovementAction_AcroWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieMoveDown_Step0, - MovementAction_AcroEndWheelieMoveDown_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieMoveDown_Step0, + MovementAction_AcroEndWheelieMoveDown_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieMoveUp_Step0, - MovementAction_AcroEndWheelieMoveUp_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieMoveUp_Step0, + MovementAction_AcroEndWheelieMoveUp_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieMoveLeft_Step0, - MovementAction_AcroEndWheelieMoveLeft_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieMoveLeft_Step0, + MovementAction_AcroEndWheelieMoveLeft_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { - MovementAction_AcroEndWheelieMoveRight_Step0, - MovementAction_AcroEndWheelieMoveRight_Step1, - MovementAction_PauseSpriteAnim, + MovementAction_AcroEndWheelieMoveRight_Step0, + MovementAction_AcroEndWheelieMoveRight_Step1, + MovementAction_PauseSpriteAnim, }; u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = { - MovementAction_Levitate_Step0, - MovementAction_Finish, + MovementAction_Levitate_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = { - MovementAction_StopLevitate_Step0, - MovementAction_Finish, + MovementAction_StopLevitate_Step0, + MovementAction_Finish, }; u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *) = { - MovementAction_DestroyExtraTaskIfAtTop_Step0, - MovementAction_Finish, + MovementAction_DestroyExtraTaskIfAtTop_Step0, + MovementAction_Finish, }; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 0f91c2250..0c4a6e21b 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -134,7 +134,7 @@ const u32 gItemIconPalette_GreenShard[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz"); const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz"); -const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); +const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz"); const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz"); const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz"); diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index ab64c6f20..cdb28f8c3 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1,444 +1,2206 @@ +#include "constants/species.h" + const struct MonCoords gMonBackPicCoords[] = { - [SPECIES_NONE] = {0x88, 0x00}, - [SPECIES_BULBASAUR] = {0x64, 0x10}, - [SPECIES_IVYSAUR] = {0x66, 0x09}, - [SPECIES_VENUSAUR] = {0x87, 0x07}, - [SPECIES_CHARMANDER] = {0x65, 0x0e}, - [SPECIES_CHARMELEON] = {0x66, 0x09}, - [SPECIES_CHARIZARD] = {0x87, 0x04}, - [SPECIES_SQUIRTLE] = {0x65, 0x0e}, - [SPECIES_WARTORTLE] = {0x76, 0x0a}, - [SPECIES_BLASTOISE] = {0x86, 0x08}, - [SPECIES_CATERPIE] = {0x55, 0x0f}, - [SPECIES_METAPOD] = {0x65, 0x0c}, - [SPECIES_BUTTERFREE] = {0x87, 0x06}, - [SPECIES_WEEDLE] = {0x56, 0x0b}, - [SPECIES_KAKUNA] = {0x46, 0x0a}, - [SPECIES_BEEDRILL] = {0x86, 0x09}, - [SPECIES_PIDGEY] = {0x66, 0x08}, - [SPECIES_PIDGEOTTO] = {0x85, 0x0c}, - [SPECIES_PIDGEOT] = {0x78, 0x02}, - [SPECIES_RATTATA] = {0x65, 0x0d}, - [SPECIES_RATICATE] = {0x75, 0x0d}, - [SPECIES_SPEAROW] = {0x65, 0x0c}, - [SPECIES_FEAROW] = {0x87, 0x05}, - [SPECIES_EKANS] = {0x66, 0x09}, - [SPECIES_ARBOK] = {0x77, 0x04}, - [SPECIES_PIKACHU] = {0x77, 0x07}, - [SPECIES_RAICHU] = {0x66, 0x08}, - [SPECIES_SANDSHREW] = {0x65, 0x0d}, - [SPECIES_SANDSLASH] = {0x86, 0x09}, - [SPECIES_NIDORAN_F] = {0x55, 0x0c}, - [SPECIES_NIDORINA] = {0x86, 0x0a}, - [SPECIES_NIDOQUEEN] = {0x77, 0x06}, - [SPECIES_NIDORAN_M] = {0x56, 0x08}, - [SPECIES_NIDORINO] = {0x86, 0x09}, - [SPECIES_NIDOKING] = {0x88, 0x03}, - [SPECIES_CLEFAIRY] = {0x65, 0x0d}, - [SPECIES_CLEFABLE] = {0x76, 0x0a}, - [SPECIES_VULPIX] = {0x76, 0x09}, - [SPECIES_NINETALES] = {0x77, 0x05}, - [SPECIES_JIGGLYPUFF] = {0x65, 0x0d}, - [SPECIES_WIGGLYTUFF] = {0x66, 0x08}, - [SPECIES_ZUBAT] = {0x76, 0x0b}, - [SPECIES_GOLBAT] = {0x87, 0x06}, - [SPECIES_ODDISH] = {0x56, 0x0b}, - [SPECIES_GLOOM] = {0x66, 0x0a}, - [SPECIES_VILEPLUME] = {0x87, 0x07}, - [SPECIES_PARAS] = {0x63, 0x14}, - [SPECIES_PARASECT] = {0x87, 0x07}, - [SPECIES_VENONAT] = {0x77, 0x06}, - [SPECIES_VENOMOTH] = {0x77, 0x04}, - [SPECIES_DIGLETT] = {0x54, 0x10}, - [SPECIES_DUGTRIO] = {0x66, 0x0b}, - [SPECIES_MEOWTH] = {0x65, 0x0c}, - [SPECIES_PERSIAN] = {0x87, 0x07}, - [SPECIES_PSYDUCK] = {0x67, 0x07}, - [SPECIES_GOLDUCK] = {0x77, 0x05}, - [SPECIES_MANKEY] = {0x76, 0x0b}, - [SPECIES_PRIMEAPE] = {0x77, 0x07}, - [SPECIES_GROWLITHE] = {0x66, 0x08}, - [SPECIES_ARCANINE] = {0x87, 0x06}, - [SPECIES_POLIWAG] = {0x74, 0x10}, - [SPECIES_POLIWHIRL] = {0x65, 0x0c}, - [SPECIES_POLIWRATH] = {0x86, 0x0b}, - [SPECIES_ABRA] = {0x66, 0x0b}, - [SPECIES_KADABRA] = {0x76, 0x08}, - [SPECIES_ALAKAZAM] = {0x67, 0x05}, - [SPECIES_MACHOP] = {0x65, 0x0c}, - [SPECIES_MACHOKE] = {0x76, 0x09}, - [SPECIES_MACHAMP] = {0x67, 0x04}, - [SPECIES_BELLSPROUT] = {0x66, 0x0a}, - [SPECIES_WEEPINBELL] = {0x66, 0x09}, - [SPECIES_VICTREEBEL] = {0x87, 0x06}, - [SPECIES_TENTACOOL] = {0x56, 0x0a}, - [SPECIES_TENTACRUEL] = {0x86, 0x0b}, - [SPECIES_GEODUDE] = {0x66, 0x0b}, - [SPECIES_GRAVELER] = {0x75, 0x0c}, - [SPECIES_GOLEM] = {0x84, 0x10}, - [SPECIES_PONYTA] = {0x66, 0x09}, - [SPECIES_RAPIDASH] = {0x87, 0x05}, - [SPECIES_SLOWPOKE] = {0x85, 0x0e}, - [SPECIES_SLOWBRO] = {0x86, 0x0a}, - [SPECIES_MAGNEMITE] = {0x43, 0x14}, - [SPECIES_MAGNETON] = {0x66, 0x0a}, - [SPECIES_FARFETCHD] = {0x66, 0x0a}, - [SPECIES_DODUO] = {0x66, 0x08}, - [SPECIES_DODRIO] = {0x88, 0x01}, - [SPECIES_SEEL] = {0x66, 0x0a}, - [SPECIES_DEWGONG] = {0x77, 0x05}, - [SPECIES_GRIMER] = {0x75, 0x0c}, - [SPECIES_MUK] = {0x87, 0x05}, - [SPECIES_SHELLDER] = {0x76, 0x0b}, - [SPECIES_CLOYSTER] = {0x87, 0x06}, - [SPECIES_GASTLY] = {0x85, 0x0e}, - [SPECIES_HAUNTER] = {0x76, 0x08}, - [SPECIES_GENGAR] = {0x76, 0x09}, - [SPECIES_ONIX] = {0x78, 0x00}, - [SPECIES_DROWZEE] = {0x65, 0x0d}, - [SPECIES_HYPNO] = {0x66, 0x09}, - [SPECIES_KRABBY] = {0x66, 0x0a}, - [SPECIES_KINGLER] = {0x77, 0x04}, - [SPECIES_VOLTORB] = {0x55, 0x0e}, - [SPECIES_ELECTRODE] = {0x65, 0x0d}, - [SPECIES_EXEGGCUTE] = {0x65, 0x0d}, - [SPECIES_EXEGGUTOR] = {0x87, 0x04}, - [SPECIES_CUBONE] = {0x66, 0x0a}, - [SPECIES_MAROWAK] = {0x66, 0x08}, - [SPECIES_HITMONLEE] = {0x65, 0x0c}, - [SPECIES_HITMONCHAN] = {0x65, 0x0c}, - [SPECIES_LICKITUNG] = {0x65, 0x0e}, - [SPECIES_KOFFING] = {0x66, 0x09}, - [SPECIES_WEEZING] = {0x77, 0x06}, - [SPECIES_RHYHORN] = {0x85, 0x0c}, - [SPECIES_RHYDON] = {0x88, 0x03}, - [SPECIES_CHANSEY] = {0x86, 0x0b}, - [SPECIES_TANGELA] = {0x85, 0x0e}, - [SPECIES_KANGASKHAN] = {0x77, 0x05}, - [SPECIES_HORSEA] = {0x66, 0x09}, - [SPECIES_SEADRA] = {0x66, 0x08}, - [SPECIES_GOLDEEN] = {0x66, 0x08}, - [SPECIES_SEAKING] = {0x76, 0x0b}, - [SPECIES_STARYU] = {0x65, 0x0d}, - [SPECIES_STARMIE] = {0x85, 0x0e}, - [SPECIES_MR_MIME] = {0x85, 0x0d}, - [SPECIES_SCYTHER] = {0x77, 0x07}, - [SPECIES_JYNX] = {0x86, 0x0a}, - [SPECIES_ELECTABUZZ] = {0x66, 0x08}, - [SPECIES_MAGMAR] = {0x66, 0x08}, - [SPECIES_PINSIR] = {0x66, 0x09}, - [SPECIES_TAUROS] = {0x85, 0x0d}, - [SPECIES_MAGIKARP] = {0x76, 0x09}, - [SPECIES_GYARADOS] = {0x78, 0x00}, - [SPECIES_LAPRAS] = {0x77, 0x04}, - [SPECIES_DITTO] = {0x54, 0x11}, - [SPECIES_EEVEE] = {0x66, 0x0a}, - [SPECIES_VAPOREON] = {0x66, 0x0a}, - [SPECIES_JOLTEON] = {0x87, 0x06}, - [SPECIES_FLAREON] = {0x67, 0x05}, - [SPECIES_PORYGON] = {0x65, 0x0d}, - [SPECIES_OMANYTE] = {0x66, 0x0a}, - [SPECIES_OMASTAR] = {0x66, 0x08}, - [SPECIES_KABUTO] = {0x65, 0x0d}, - [SPECIES_KABUTOPS] = {0x77, 0x05}, - [SPECIES_AERODACTYL] = {0x86, 0x08}, - [SPECIES_SNORLAX] = {0x86, 0x0b}, - [SPECIES_ARTICUNO] = {0x65, 0x0c}, - [SPECIES_ZAPDOS] = {0x76, 0x0b}, - [SPECIES_MOLTRES] = {0x87, 0x04}, - [SPECIES_DRATINI] = {0x66, 0x09}, - [SPECIES_DRAGONAIR] = {0x78, 0x00}, - [SPECIES_DRAGONITE] = {0x87, 0x06}, - [SPECIES_MEWTWO] = {0x78, 0x01}, - [SPECIES_MEW] = {0x66, 0x08}, - [SPECIES_CHIKORITA] = {0x56, 0x0a}, - [SPECIES_BAYLEEF] = {0x66, 0x08}, - [SPECIES_MEGANIUM] = {0x78, 0x00}, - [SPECIES_CYNDAQUIL] = {0x76, 0x09}, - [SPECIES_QUILAVA] = {0x87, 0x04}, - [SPECIES_TYPHLOSION] = {0x87, 0x04}, - [SPECIES_TOTODILE] = {0x66, 0x0b}, - [SPECIES_CROCONAW] = {0x67, 0x07}, - [SPECIES_FERALIGATR] = {0x88, 0x01}, - [SPECIES_SENTRET] = {0x67, 0x05}, - [SPECIES_FURRET] = {0x66, 0x08}, - [SPECIES_HOOTHOOT] = {0x66, 0x08}, - [SPECIES_NOCTOWL] = {0x68, 0x03}, - [SPECIES_LEDYBA] = {0x76, 0x0b}, - [SPECIES_LEDIAN] = {0x77, 0x07}, - [SPECIES_SPINARAK] = {0x73, 0x15}, - [SPECIES_ARIADOS] = {0x86, 0x0b}, - [SPECIES_CROBAT] = {0x87, 0x05}, - [SPECIES_CHINCHOU] = {0x86, 0x08}, - [SPECIES_LANTURN] = {0x86, 0x08}, - [SPECIES_PICHU] = {0x66, 0x0b}, - [SPECIES_CLEFFA] = {0x65, 0x0f}, - [SPECIES_IGGLYBUFF] = {0x66, 0x0b}, - [SPECIES_TOGEPI] = {0x54, 0x10}, - [SPECIES_TOGETIC] = {0x66, 0x08}, - [SPECIES_NATU] = {0x54, 0x11}, - [SPECIES_XATU] = {0x76, 0x08}, - [SPECIES_MAREEP] = {0x66, 0x09}, - [SPECIES_FLAAFFY] = {0x66, 0x09}, - [SPECIES_AMPHAROS] = {0x88, 0x01}, - [SPECIES_BELLOSSOM] = {0x66, 0x0b}, - [SPECIES_MARILL] = {0x75, 0x0c}, - [SPECIES_AZUMARILL] = {0x86, 0x08}, - [SPECIES_SUDOWOODO] = {0x66, 0x08}, - [SPECIES_POLITOED] = {0x66, 0x09}, - [SPECIES_HOPPIP] = {0x66, 0x0b}, - [SPECIES_SKIPLOOM] = {0x65, 0x0d}, - [SPECIES_JUMPLUFF] = {0x87, 0x04}, - [SPECIES_AIPOM] = {0x66, 0x09}, - [SPECIES_SUNKERN] = {0x56, 0x0a}, - [SPECIES_SUNFLORA] = {0x66, 0x08}, - [SPECIES_YANMA] = {0x77, 0x04}, - [SPECIES_WOOPER] = {0x85, 0x0f}, - [SPECIES_QUAGSIRE] = {0x76, 0x08}, - [SPECIES_ESPEON] = {0x76, 0x0b}, - [SPECIES_UMBREON] = {0x87, 0x04}, - [SPECIES_MURKROW] = {0x66, 0x09}, - [SPECIES_SLOWKING] = {0x66, 0x08}, - [SPECIES_MISDREAVUS] = {0x66, 0x0a}, - [SPECIES_UNOWN] = {0x36, 0x08}, - [SPECIES_WOBBUFFET] = {0x75, 0x0c}, - [SPECIES_GIRAFARIG] = {0x87, 0x05}, - [SPECIES_PINECO] = {0x65, 0x0f}, - [SPECIES_FORRETRESS] = {0x84, 0x10}, - [SPECIES_DUNSPARCE] = {0x85, 0x0f}, - [SPECIES_GLIGAR] = {0x87, 0x05}, - [SPECIES_STEELIX] = {0x88, 0x00}, - [SPECIES_SNUBBULL] = {0x76, 0x0a}, - [SPECIES_GRANBULL] = {0x87, 0x05}, - [SPECIES_QWILFISH] = {0x77, 0x07}, - [SPECIES_SCIZOR] = {0x77, 0x04}, - [SPECIES_SHUCKLE] = {0x56, 0x0b}, - [SPECIES_HERACROSS] = {0x77, 0x04}, - [SPECIES_SNEASEL] = {0x66, 0x08}, - [SPECIES_TEDDIURSA] = {0x66, 0x08}, - [SPECIES_URSARING] = {0x88, 0x03}, - [SPECIES_SLUGMA] = {0x66, 0x08}, - [SPECIES_MAGCARGO] = {0x76, 0x09}, - [SPECIES_SWINUB] = {0x63, 0x15}, - [SPECIES_PILOSWINE] = {0x75, 0x0d}, - [SPECIES_CORSOLA] = {0x65, 0x0c}, - [SPECIES_REMORAID] = {0x75, 0x0d}, - [SPECIES_OCTILLERY] = {0x66, 0x0a}, - [SPECIES_DELIBIRD] = {0x67, 0x06}, - [SPECIES_MANTINE] = {0x87, 0x07}, - [SPECIES_SKARMORY] = {0x87, 0x04}, - [SPECIES_HOUNDOUR] = {0x55, 0x0c}, - [SPECIES_HOUNDOOM] = {0x87, 0x07}, - [SPECIES_KINGDRA] = {0x87, 0x06}, - [SPECIES_PHANPY] = {0x65, 0x0e}, - [SPECIES_DONPHAN] = {0x85, 0x0d}, - [SPECIES_PORYGON2] = {0x76, 0x0a}, - [SPECIES_STANTLER] = {0x78, 0x03}, - [SPECIES_SMEARGLE] = {0x76, 0x0a}, - [SPECIES_TYROGUE] = {0x66, 0x08}, - [SPECIES_HITMONTOP] = {0x87, 0x05}, - [SPECIES_SMOOCHUM] = {0x56, 0x09}, - [SPECIES_ELEKID] = {0x66, 0x08}, - [SPECIES_MAGBY] = {0x66, 0x0b}, - [SPECIES_MILTANK] = {0x87, 0x07}, - [SPECIES_BLISSEY] = {0x85, 0x0d}, - [SPECIES_RAIKOU] = {0x86, 0x0a}, - [SPECIES_ENTEI] = {0x87, 0x06}, - [SPECIES_SUICUNE] = {0x88, 0x03}, - [SPECIES_LARVITAR] = {0x66, 0x08}, - [SPECIES_PUPITAR] = {0x67, 0x05}, - [SPECIES_TYRANITAR] = {0x88, 0x00}, - [SPECIES_LUGIA] = {0x88, 0x01}, - [SPECIES_HO_OH] = {0x88, 0x01}, - [SPECIES_CELEBI] = {0x66, 0x08}, - [SPECIES_OLD_UNOWN_B] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_C] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_D] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_E] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_F] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_G] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_H] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_I] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_J] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_K] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_L] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_M] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_N] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_O] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_P] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_Q] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_R] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_S] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_T] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_U] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_V] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_W] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_X] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_Y] = {0x88, 0x02}, - [SPECIES_OLD_UNOWN_Z] = {0x88, 0x02}, - [SPECIES_TREECKO] = {0x87, 0x06}, - [SPECIES_GROVYLE] = {0x86, 0x08}, - [SPECIES_SCEPTILE] = {0x88, 0x01}, - [SPECIES_TORCHIC] = {0x67, 0x05}, - [SPECIES_COMBUSKEN] = {0x88, 0x00}, - [SPECIES_BLAZIKEN] = {0x88, 0x00}, - [SPECIES_MUDKIP] = {0x77, 0x05}, - [SPECIES_MARSHTOMP] = {0x87, 0x04}, - [SPECIES_SWAMPERT] = {0x87, 0x05}, - [SPECIES_POOCHYENA] = {0x76, 0x09}, - [SPECIES_MIGHTYENA] = {0x87, 0x04}, - [SPECIES_ZIGZAGOON] = {0x76, 0x0b}, - [SPECIES_LINOONE] = {0x85, 0x0f}, - [SPECIES_WURMPLE] = {0x76, 0x0b}, - [SPECIES_SILCOON] = {0x83, 0x15}, - [SPECIES_BEAUTIFLY] = {0x88, 0x00}, - [SPECIES_CASCOON] = {0x73, 0x14}, - [SPECIES_DUSTOX] = {0x83, 0x14}, - [SPECIES_LOTAD] = {0x75, 0x0f}, - [SPECIES_LOMBRE] = {0x86, 0x08}, - [SPECIES_LUDICOLO] = {0x86, 0x0a}, - [SPECIES_SEEDOT] = {0x86, 0x09}, - [SPECIES_NUZLEAF] = {0x76, 0x0a}, - [SPECIES_SHIFTRY] = {0x86, 0x08}, - [SPECIES_NINCADA] = {0x83, 0x14}, - [SPECIES_NINJASK] = {0x86, 0x08}, - [SPECIES_SHEDINJA] = {0x77, 0x06}, - [SPECIES_TAILLOW] = {0x64, 0x11}, - [SPECIES_SWELLOW] = {0x86, 0x08}, - [SPECIES_SHROOMISH] = {0x85, 0x0d}, - [SPECIES_BRELOOM] = {0x87, 0x04}, - [SPECIES_SPINDA] = {0x77, 0x04}, - [SPECIES_WINGULL] = {0x85, 0x0e}, - [SPECIES_PELIPPER] = {0x87, 0x06}, - [SPECIES_SURSKIT] = {0x86, 0x0b}, - [SPECIES_MASQUERAIN] = {0x88, 0x00}, - [SPECIES_WAILMER] = {0x83, 0x15}, - [SPECIES_WAILORD] = {0x83, 0x16}, - [SPECIES_SKITTY] = {0x86, 0x0a}, - [SPECIES_DELCATTY] = {0x86, 0x08}, - [SPECIES_KECLEON] = {0x87, 0x06}, - [SPECIES_BALTOY] = {0x86, 0x08}, - [SPECIES_CLAYDOL] = {0x87, 0x07}, - [SPECIES_NOSEPASS] = {0x85, 0x0c}, - [SPECIES_TORKOAL] = {0x86, 0x0a}, - [SPECIES_SABLEYE] = {0x76, 0x08}, - [SPECIES_BARBOACH] = {0x66, 0x0a}, - [SPECIES_WHISCASH] = {0x86, 0x0a}, - [SPECIES_LUVDISC] = {0x46, 0x0a}, - [SPECIES_CORPHISH] = {0x77, 0x07}, - [SPECIES_CRAWDAUNT] = {0x87, 0x05}, - [SPECIES_FEEBAS] = {0x67, 0x07}, - [SPECIES_MILOTIC] = {0x68, 0x02}, - [SPECIES_CARVANHA] = {0x87, 0x07}, - [SPECIES_SHARPEDO] = {0x88, 0x02}, - [SPECIES_TRAPINCH] = {0x75, 0x0e}, - [SPECIES_VIBRAVA] = {0x74, 0x11}, - [SPECIES_FLYGON] = {0x88, 0x02}, - [SPECIES_MAKUHITA] = {0x76, 0x0b}, - [SPECIES_HARIYAMA] = {0x87, 0x07}, - [SPECIES_ELECTRIKE] = {0x84, 0x10}, - [SPECIES_MANECTRIC] = {0x87, 0x04}, - [SPECIES_NUMEL] = {0x86, 0x0b}, - [SPECIES_CAMERUPT] = {0x84, 0x13}, - [SPECIES_SPHEAL] = {0x64, 0x12}, - [SPECIES_SEALEO] = {0x86, 0x0a}, - [SPECIES_WALREIN] = {0x87, 0x06}, - [SPECIES_CACNEA] = {0x85, 0x0f}, - [SPECIES_CACTURNE] = {0x87, 0x07}, - [SPECIES_SNORUNT] = {0x76, 0x0a}, - [SPECIES_GLALIE] = {0x85, 0x0c}, - [SPECIES_LUNATONE] = {0x87, 0x05}, - [SPECIES_SOLROCK] = {0x87, 0x05}, - [SPECIES_AZURILL] = {0x86, 0x0a}, - [SPECIES_SPOINK] = {0x56, 0x0b}, - [SPECIES_GRUMPIG] = {0x87, 0x04}, - [SPECIES_PLUSLE] = {0x76, 0x08}, - [SPECIES_MINUN] = {0x76, 0x08}, - [SPECIES_MAWILE] = {0x87, 0x04}, - [SPECIES_MEDITITE] = {0x76, 0x0b}, - [SPECIES_MEDICHAM] = {0x68, 0x03}, - [SPECIES_SWABLU] = {0x86, 0x09}, - [SPECIES_ALTARIA] = {0x87, 0x06}, - [SPECIES_WYNAUT] = {0x77, 0x07}, - [SPECIES_DUSKULL] = {0x66, 0x0b}, - [SPECIES_DUSCLOPS] = {0x86, 0x08}, - [SPECIES_ROSELIA] = {0x86, 0x08}, - [SPECIES_SLAKOTH] = {0x85, 0x0f}, - [SPECIES_VIGOROTH] = {0x86, 0x0a}, - [SPECIES_SLAKING] = {0x86, 0x08}, - [SPECIES_GULPIN] = {0x66, 0x0b}, - [SPECIES_SWALOT] = {0x77, 0x06}, - [SPECIES_TROPIUS] = {0x87, 0x07}, - [SPECIES_WHISMUR] = {0x85, 0x0d}, - [SPECIES_LOUDRED] = {0x86, 0x09}, - [SPECIES_EXPLOUD] = {0x88, 0x03}, - [SPECIES_CLAMPERL] = {0x85, 0x0d}, - [SPECIES_HUNTAIL] = {0x68, 0x02}, - [SPECIES_GOREBYSS] = {0x77, 0x05}, - [SPECIES_ABSOL] = {0x78, 0x03}, - [SPECIES_SHUPPET] = {0x77, 0x06}, - [SPECIES_BANETTE] = {0x65, 0x0c}, - [SPECIES_SEVIPER] = {0x88, 0x03}, - [SPECIES_ZANGOOSE] = {0x88, 0x01}, - [SPECIES_RELICANTH] = {0x86, 0x0a}, - [SPECIES_ARON] = {0x54, 0x11}, - [SPECIES_LAIRON] = {0x84, 0x11}, - [SPECIES_AGGRON] = {0x87, 0x07}, - [SPECIES_CASTFORM] = {0x45, 0x0d}, - [SPECIES_VOLBEAT] = {0x76, 0x08}, - [SPECIES_ILLUMISE] = {0x67, 0x06}, - [SPECIES_LILEEP] = {0x86, 0x09}, - [SPECIES_CRADILY] = {0x77, 0x04}, - [SPECIES_ANORITH] = {0x83, 0x17}, - [SPECIES_ARMALDO] = {0x77, 0x05}, - [SPECIES_RALTS] = {0x45, 0x0d}, - [SPECIES_KIRLIA] = {0x57, 0x06}, - [SPECIES_GARDEVOIR] = {0x77, 0x04}, - [SPECIES_BAGON] = {0x66, 0x08}, - [SPECIES_SHELGON] = {0x85, 0x0d}, - [SPECIES_SALAMENCE] = {0x77, 0x06}, - [SPECIES_BELDUM] = {0x66, 0x0a}, - [SPECIES_METANG] = {0x84, 0x10}, - [SPECIES_METAGROSS] = {0x83, 0x14}, - [SPECIES_REGIROCK] = {0x86, 0x0a}, - [SPECIES_REGICE] = {0x85, 0x0e}, - [SPECIES_REGISTEEL] = {0x85, 0x0e}, - [SPECIES_KYOGRE] = {0x84, 0x13}, - [SPECIES_GROUDON] = {0x87, 0x07}, - [SPECIES_RAYQUAZA] = {0x78, 0x00}, - [SPECIES_LATIAS] = {0x88, 0x02}, - [SPECIES_LATIOS] = {0x88, 0x03}, - [SPECIES_JIRACHI] = {0x87, 0x05}, - [SPECIES_DEOXYS] = {0x86, 0x09}, - [SPECIES_CHIMECHO] = {0x47, 0x07}, - [SPECIES_EGG] = {0x36, 0x0a}, - [SPECIES_UNOWN_B] = {0x56, 0x09}, - [SPECIES_UNOWN_C] = {0x67, 0x06}, - [SPECIES_UNOWN_D] = {0x56, 0x08}, - [SPECIES_UNOWN_E] = {0x56, 0x0a}, - [SPECIES_UNOWN_F] = {0x66, 0x0a}, - [SPECIES_UNOWN_G] = {0x57, 0x05}, - [SPECIES_UNOWN_H] = {0x66, 0x08}, - [SPECIES_UNOWN_I] = {0x37, 0x07}, - [SPECIES_UNOWN_J] = {0x46, 0x09}, - [SPECIES_UNOWN_K] = {0x57, 0x07}, - [SPECIES_UNOWN_L] = {0x46, 0x0a}, - [SPECIES_UNOWN_M] = {0x65, 0x0d}, - [SPECIES_UNOWN_N] = {0x65, 0x0d}, - [SPECIES_UNOWN_O] = {0x66, 0x08}, - [SPECIES_UNOWN_P] = {0x46, 0x0a}, - [SPECIES_UNOWN_Q] = {0x55, 0x0f}, - [SPECIES_UNOWN_R] = {0x45, 0x0c}, - [SPECIES_UNOWN_S] = {0x57, 0x04}, - [SPECIES_UNOWN_T] = {0x45, 0x0d}, - [SPECIES_UNOWN_U] = {0x65, 0x0d}, - [SPECIES_UNOWN_V] = {0x56, 0x0b}, - [SPECIES_UNOWN_W] = {0x55, 0x0d}, - [SPECIES_UNOWN_X] = {0x55, 0x0f}, - [SPECIES_UNOWN_Y] = {0x46, 0x0a}, - [SPECIES_UNOWN_Z] = {0x46, 0x0a}, - [SPECIES_UNOWN_EMARK] = {0x37, 0x06}, - [SPECIES_UNOWN_QMARK] = {0x47, 0x06}, + [SPECIES_NONE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_BULBASAUR] = + { + .coords = 0x64, + .y_offset = 0x10, + }, + [SPECIES_IVYSAUR] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_VENUSAUR] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_CHARMANDER] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_CHARMELEON] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_CHARIZARD] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SQUIRTLE] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_WARTORTLE] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_BLASTOISE] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_CATERPIE] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_METAPOD] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_BUTTERFREE] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_WEEDLE] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_KAKUNA] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_BEEDRILL] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_PIDGEY] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_PIDGEOTTO] = + { + .coords = 0x85, + .y_offset = 0x0c, + }, + [SPECIES_PIDGEOT] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_RATTATA] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_RATICATE] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_SPEAROW] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_FEAROW] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_EKANS] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_ARBOK] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_PIKACHU] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_RAICHU] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_SANDSHREW] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_SANDSLASH] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_NIDORAN_F] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_NIDORINA] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_NIDOQUEEN] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_NIDORAN_M] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_NIDORINO] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_NIDOKING] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_CLEFAIRY] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_CLEFABLE] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_VULPIX] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_NINETALES] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_JIGGLYPUFF] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_WIGGLYTUFF] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ZUBAT] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_GOLBAT] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_ODDISH] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_GLOOM] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_VILEPLUME] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_PARAS] = + { + .coords = 0x63, + .y_offset = 0x14, + }, + [SPECIES_PARASECT] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_VENONAT] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_VENOMOTH] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_DIGLETT] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_DUGTRIO] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_MEOWTH] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_PERSIAN] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_PSYDUCK] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_GOLDUCK] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_MANKEY] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_PRIMEAPE] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_GROWLITHE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ARCANINE] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_POLIWAG] = + { + .coords = 0x74, + .y_offset = 0x10, + }, + [SPECIES_POLIWHIRL] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_POLIWRATH] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_ABRA] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_KADABRA] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_ALAKAZAM] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_MACHOP] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_MACHOKE] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_MACHAMP] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_BELLSPROUT] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_WEEPINBELL] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_VICTREEBEL] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_TENTACOOL] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_TENTACRUEL] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_GEODUDE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_GRAVELER] = + { + .coords = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_GOLEM] = + { + .coords = 0x84, + .y_offset = 0x10, + }, + [SPECIES_PONYTA] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_RAPIDASH] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_SLOWPOKE] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_SLOWBRO] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_MAGNEMITE] = + { + .coords = 0x43, + .y_offset = 0x14, + }, + [SPECIES_MAGNETON] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_FARFETCHD] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DODUO] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_DODRIO] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SEEL] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DEWGONG] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_GRIMER] = + { + .coords = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_MUK] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_SHELLDER] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_CLOYSTER] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_GASTLY] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_HAUNTER] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_GENGAR] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_ONIX] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_DROWZEE] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_HYPNO] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_KRABBY] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_KINGLER] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_VOLTORB] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_ELECTRODE] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_EXEGGCUTE] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_EXEGGUTOR] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_CUBONE] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_MAROWAK] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_HITMONLEE] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_HITMONCHAN] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_LICKITUNG] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_KOFFING] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_WEEZING] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_RHYHORN] = + { + .coords = 0x85, + .y_offset = 0x0c, + }, + [SPECIES_RHYDON] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_CHANSEY] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_TANGELA] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_KANGASKHAN] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_HORSEA] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SEADRA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_GOLDEEN] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_SEAKING] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_STARYU] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_STARMIE] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_MR_MIME] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_SCYTHER] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_JYNX] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_ELECTABUZZ] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MAGMAR] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_PINSIR] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_TAUROS] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_MAGIKARP] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_GYARADOS] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_LAPRAS] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_DITTO] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_EEVEE] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_VAPOREON] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_JOLTEON] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_FLAREON] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_PORYGON] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_OMANYTE] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_OMASTAR] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_KABUTO] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_KABUTOPS] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_AERODACTYL] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SNORLAX] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_ARTICUNO] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_ZAPDOS] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_MOLTRES] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_DRATINI] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_DRAGONAIR] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_DRAGONITE] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_MEWTWO] = + { + .coords = 0x78, + .y_offset = 0x01, + }, + [SPECIES_MEW] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_CHIKORITA] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_BAYLEEF] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MEGANIUM] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_CYNDAQUIL] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_QUILAVA] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_TYPHLOSION] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_TOTODILE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_CROCONAW] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_FERALIGATR] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SENTRET] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_FURRET] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_HOOTHOOT] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_NOCTOWL] = + { + .coords = 0x68, + .y_offset = 0x03, + }, + [SPECIES_LEDYBA] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_LEDIAN] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_SPINARAK] = + { + .coords = 0x73, + .y_offset = 0x15, + }, + [SPECIES_ARIADOS] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_CROBAT] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_CHINCHOU] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_LANTURN] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_PICHU] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_CLEFFA] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_IGGLYBUFF] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_TOGEPI] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_TOGETIC] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_NATU] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_XATU] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MAREEP] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_FLAAFFY] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_AMPHAROS] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_BELLOSSOM] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_MARILL] = + { + .coords = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_AZUMARILL] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SUDOWOODO] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_POLITOED] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_HOPPIP] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SKIPLOOM] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_JUMPLUFF] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_AIPOM] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SUNKERN] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_SUNFLORA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_YANMA] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_WOOPER] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_QUAGSIRE] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_ESPEON] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_UMBREON] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_MURKROW] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SLOWKING] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MISDREAVUS] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN] = + { + .coords = 0x36, + .y_offset = 0x08, + }, + [SPECIES_WOBBUFFET] = + { + .coords = 0x75, + .y_offset = 0x0c, + }, + [SPECIES_GIRAFARIG] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_PINECO] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_FORRETRESS] = + { + .coords = 0x84, + .y_offset = 0x10, + }, + [SPECIES_DUNSPARCE] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_GLIGAR] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_STEELIX] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SNUBBULL] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_GRANBULL] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_QWILFISH] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_SCIZOR] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SHUCKLE] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_HERACROSS] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SNEASEL] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_TEDDIURSA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_URSARING] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_SLUGMA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MAGCARGO] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_SWINUB] = + { + .coords = 0x63, + .y_offset = 0x15, + }, + [SPECIES_PILOSWINE] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_CORSOLA] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_REMORAID] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_OCTILLERY] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DELIBIRD] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_MANTINE] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_SKARMORY] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_HOUNDOUR] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_HOUNDOOM] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_KINGDRA] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_PHANPY] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_DONPHAN] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_PORYGON2] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_STANTLER] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_SMEARGLE] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_TYROGUE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_HITMONTOP] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_SMOOCHUM] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_ELEKID] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_MAGBY] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_MILTANK] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_BLISSEY] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_RAIKOU] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_ENTEI] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_SUICUNE] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_LARVITAR] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_PUPITAR] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_TYRANITAR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LUGIA] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_HO_OH] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CELEBI] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_OLD_UNOWN_B] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_C] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_D] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_E] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_F] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_G] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_H] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_I] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_J] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_K] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_L] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_M] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_N] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_O] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_P] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_Q] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_R] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_S] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_T] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_U] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_V] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_W] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_X] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_Y] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_OLD_UNOWN_Z] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_TREECKO] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_GROVYLE] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SCEPTILE] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_TORCHIC] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_COMBUSKEN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_BLAZIKEN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MUDKIP] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_MARSHTOMP] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SWAMPERT] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_POOCHYENA] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_MIGHTYENA] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_ZIGZAGOON] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_LINOONE] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_WURMPLE] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_SILCOON] = + { + .coords = 0x83, + .y_offset = 0x15, + }, + [SPECIES_BEAUTIFLY] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CASCOON] = + { + .coords = 0x73, + .y_offset = 0x14, + }, + [SPECIES_DUSTOX] = + { + .coords = 0x83, + .y_offset = 0x14, + }, + [SPECIES_LOTAD] = + { + .coords = 0x75, + .y_offset = 0x0f, + }, + [SPECIES_LOMBRE] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_LUDICOLO] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SEEDOT] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_NUZLEAF] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_SHIFTRY] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_NINCADA] = + { + .coords = 0x83, + .y_offset = 0x14, + }, + [SPECIES_NINJASK] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SHEDINJA] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_TAILLOW] = + { + .coords = 0x64, + .y_offset = 0x11, + }, + [SPECIES_SWELLOW] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SHROOMISH] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_BRELOOM] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SPINDA] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_WINGULL] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_PELIPPER] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_SURSKIT] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_MASQUERAIN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_WAILMER] = + { + .coords = 0x83, + .y_offset = 0x15, + }, + [SPECIES_WAILORD] = + { + .coords = 0x83, + .y_offset = 0x16, + }, + [SPECIES_SKITTY] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_DELCATTY] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_KECLEON] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_BALTOY] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_CLAYDOL] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_NOSEPASS] = + { + .coords = 0x85, + .y_offset = 0x0c, + }, + [SPECIES_TORKOAL] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SABLEYE] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_BARBOACH] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_WHISCASH] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_LUVDISC] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_CORPHISH] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_CRAWDAUNT] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_FEEBAS] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_MILOTIC] = + { + .coords = 0x68, + .y_offset = 0x02, + }, + [SPECIES_CARVANHA] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_SHARPEDO] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_TRAPINCH] = + { + .coords = 0x75, + .y_offset = 0x0e, + }, + [SPECIES_VIBRAVA] = + { + .coords = 0x74, + .y_offset = 0x11, + }, + [SPECIES_FLYGON] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_MAKUHITA] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_HARIYAMA] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_ELECTRIKE] = + { + .coords = 0x84, + .y_offset = 0x10, + }, + [SPECIES_MANECTRIC] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_NUMEL] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_CAMERUPT] = + { + .coords = 0x84, + .y_offset = 0x13, + }, + [SPECIES_SPHEAL] = + { + .coords = 0x64, + .y_offset = 0x12, + }, + [SPECIES_SEALEO] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_WALREIN] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_CACNEA] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_CACTURNE] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_SNORUNT] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_GLALIE] = + { + .coords = 0x85, + .y_offset = 0x0c, + }, + [SPECIES_LUNATONE] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_SOLROCK] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_AZURILL] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SPOINK] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_GRUMPIG] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_PLUSLE] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MINUN] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MAWILE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_MEDITITE] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_MEDICHAM] = + { + .coords = 0x68, + .y_offset = 0x03, + }, + [SPECIES_SWABLU] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_ALTARIA] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_WYNAUT] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_DUSKULL] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_DUSCLOPS] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_ROSELIA] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_SLAKOTH] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_VIGOROTH] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SLAKING] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_GULPIN] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SWALOT] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_TROPIUS] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_WHISMUR] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_LOUDRED] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_EXPLOUD] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_CLAMPERL] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_HUNTAIL] = + { + .coords = 0x68, + .y_offset = 0x02, + }, + [SPECIES_GOREBYSS] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ABSOL] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_SHUPPET] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_BANETTE] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_SEVIPER] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_ZANGOOSE] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_RELICANTH] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_ARON] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_LAIRON] = + { + .coords = 0x84, + .y_offset = 0x11, + }, + [SPECIES_AGGRON] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_CASTFORM] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_VOLBEAT] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_ILLUMISE] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_LILEEP] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_CRADILY] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_ANORITH] = + { + .coords = 0x83, + .y_offset = 0x17, + }, + [SPECIES_ARMALDO] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_RALTS] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_KIRLIA] = + { + .coords = 0x57, + .y_offset = 0x06, + }, + [SPECIES_GARDEVOIR] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_BAGON] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_SHELGON] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_SALAMENCE] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_BELDUM] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_METANG] = + { + .coords = 0x84, + .y_offset = 0x10, + }, + [SPECIES_METAGROSS] = + { + .coords = 0x83, + .y_offset = 0x14, + }, + [SPECIES_REGIROCK] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_REGICE] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_REGISTEEL] = + { + .coords = 0x85, + .y_offset = 0x0e, + }, + [SPECIES_KYOGRE] = + { + .coords = 0x84, + .y_offset = 0x13, + }, + [SPECIES_GROUDON] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_RAYQUAZA] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_LATIAS] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_LATIOS] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_JIRACHI] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_DEOXYS] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_CHIMECHO] = + { + .coords = 0x47, + .y_offset = 0x07, + }, + [SPECIES_EGG] = + { + .coords = 0x36, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_B] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_UNOWN_C] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_UNOWN_D] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_UNOWN_E] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_F] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_G] = + { + .coords = 0x57, + .y_offset = 0x05, + }, + [SPECIES_UNOWN_H] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_UNOWN_I] = + { + .coords = 0x37, + .y_offset = 0x07, + }, + [SPECIES_UNOWN_J] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_UNOWN_K] = + { + .coords = 0x57, + .y_offset = 0x07, + }, + [SPECIES_UNOWN_L] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_M] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_N] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_O] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_UNOWN_P] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_Q] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_UNOWN_R] = + { + .coords = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_UNOWN_S] = + { + .coords = 0x57, + .y_offset = 0x04, + }, + [SPECIES_UNOWN_T] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_U] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_V] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_UNOWN_W] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_UNOWN_X] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_UNOWN_Y] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_Z] = + { + .coords = 0x46, + .y_offset = 0x0a, + }, + [SPECIES_UNOWN_EMARK] = + { + .coords = 0x37, + .y_offset = 0x06, + }, + [SPECIES_UNOWN_QMARK] = + { + .coords = 0x47, + .y_offset = 0x06, + }, }; diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 80e2a415a..61fd943a2 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -1,417 +1,419 @@ +#include "constants/species.h" + // This determines how much higher above the usual position the enemy Pokémon // is during battle. Species that float or fly have nonzero values. const u8 gEnemyMonElevation[] = { - 0, // 0 - 0, // SPECIES_BULBASAUR - 0, // SPECIES_IVYSAUR - 0, // SPECIES_VENUSAUR - 0, // SPECIES_CHARMANDER - 0, // SPECIES_CHARMELEON - 0, // SPECIES_CHARIZARD - 0, // SPECIES_SQUIRTLE - 0, // SPECIES_WARTORTLE - 0, // SPECIES_BLASTOISE - 0, // SPECIES_CATERPIE - 0, // SPECIES_METAPOD - 8, // SPECIES_BUTTERFREE - 0, // SPECIES_WEEDLE - 0, // SPECIES_KAKUNA - 8, // SPECIES_BEEDRILL - 16, // SPECIES_PIDGEY - 0, // SPECIES_PIDGEOTTO - 4, // SPECIES_PIDGEOT - 0, // SPECIES_RATTATA - 0, // SPECIES_RATICATE - 0, // SPECIES_SPEAROW - 6, // SPECIES_FEAROW - 0, // SPECIES_EKANS - 0, // SPECIES_ARBOK - 0, // SPECIES_PIKACHU - 0, // SPECIES_RAICHU - 0, // SPECIES_SANDSHREW - 0, // SPECIES_SANDSLASH - 0, // SPECIES_NIDORAN_F - 0, // SPECIES_NIDORINA - 0, // SPECIES_NIDOQUEEN - 0, // SPECIES_NIDORAN_M - 0, // SPECIES_NIDORINO - 0, // SPECIES_NIDOKING - 0, // SPECIES_CLEFAIRY - 0, // SPECIES_CLEFABLE - 0, // SPECIES_VULPIX - 0, // SPECIES_NINETALES - 0, // SPECIES_JIGGLYPUFF - 0, // SPECIES_WIGGLYTUFF - 8, // SPECIES_ZUBAT - 8, // SPECIES_GOLBAT - 0, // SPECIES_ODDISH - 0, // SPECIES_GLOOM - 0, // SPECIES_VILEPLUME - 0, // SPECIES_PARAS - 0, // SPECIES_PARASECT - 0, // SPECIES_VENONAT - 8, // SPECIES_VENOMOTH - 0, // SPECIES_DIGLETT - 0, // SPECIES_DUGTRIO - 0, // SPECIES_MEOWTH - 0, // SPECIES_PERSIAN - 0, // SPECIES_PSYDUCK - 0, // SPECIES_GOLDUCK - 0, // SPECIES_MANKEY - 0, // SPECIES_PRIMEAPE - 0, // SPECIES_GROWLITHE - 0, // SPECIES_ARCANINE - 0, // SPECIES_POLIWAG - 0, // SPECIES_POLIWHIRL - 0, // SPECIES_POLIWRATH - 0, // SPECIES_ABRA - 0, // SPECIES_KADABRA - 0, // SPECIES_ALAKAZAM - 0, // SPECIES_MACHOP - 0, // SPECIES_MACHOKE - 0, // SPECIES_MACHAMP - 0, // SPECIES_BELLSPROUT - 0, // SPECIES_WEEPINBELL - 0, // SPECIES_VICTREEBEL - 0, // SPECIES_TENTACOOL - 0, // SPECIES_TENTACRUEL - 16, // SPECIES_GEODUDE - 0, // SPECIES_GRAVELER - 0, // SPECIES_GOLEM - 0, // SPECIES_PONYTA - 0, // SPECIES_RAPIDASH - 0, // SPECIES_SLOWPOKE - 0, // SPECIES_SLOWBRO - 16, // SPECIES_MAGNEMITE - 8, // SPECIES_MAGNETON - 0, // SPECIES_FARFETCHD - 0, // SPECIES_DODUO - 0, // SPECIES_DODRIO - 0, // SPECIES_SEEL - 0, // SPECIES_DEWGONG - 0, // SPECIES_GRIMER - 0, // SPECIES_MUK - 0, // SPECIES_SHELLDER - 0, // SPECIES_CLOYSTER - 4, // SPECIES_GASTLY - 4, // SPECIES_HAUNTER - 0, // SPECIES_GENGAR - 0, // SPECIES_ONIX - 0, // SPECIES_DROWZEE - 0, // SPECIES_HYPNO - 0, // SPECIES_KRABBY - 0, // SPECIES_KINGLER - 10, // SPECIES_VOLTORB - 12, // SPECIES_ELECTRODE - 0, // SPECIES_EXEGGCUTE - 0, // SPECIES_EXEGGUTOR - 0, // SPECIES_CUBONE - 0, // SPECIES_MAROWAK - 0, // SPECIES_HITMONLEE - 0, // SPECIES_HITMONCHAN - 0, // SPECIES_LICKITUNG - 8, // SPECIES_KOFFING - 6, // SPECIES_WEEZING - 0, // SPECIES_RHYHORN - 0, // SPECIES_RHYDON - 0, // SPECIES_CHANSEY - 0, // SPECIES_TANGELA - 0, // SPECIES_KANGASKHAN - 0, // SPECIES_HORSEA - 0, // SPECIES_SEADRA - 0, // SPECIES_GOLDEEN - 0, // SPECIES_SEAKING - 0, // SPECIES_STARYU - 0, // SPECIES_STARMIE - 0, // SPECIES_MR_MIME - 0, // SPECIES_SCYTHER - 0, // SPECIES_JYNX - 0, // SPECIES_ELECTABUZZ - 0, // SPECIES_MAGMAR - 0, // SPECIES_PINSIR - 0, // SPECIES_TAUROS - 0, // SPECIES_MAGIKARP - 0, // SPECIES_GYARADOS - 0, // SPECIES_LAPRAS - 0, // SPECIES_DITTO - 0, // SPECIES_EEVEE - 0, // SPECIES_VAPOREON - 0, // SPECIES_JOLTEON - 0, // SPECIES_FLAREON - 0, // SPECIES_PORYGON - 0, // SPECIES_OMANYTE - 0, // SPECIES_OMASTAR - 0, // SPECIES_KABUTO - 0, // SPECIES_KABUTOPS - 7, // SPECIES_AERODACTYL - 0, // SPECIES_SNORLAX - 6, // SPECIES_ARTICUNO - 8, // SPECIES_ZAPDOS - 5, // SPECIES_MOLTRES - 0, // SPECIES_DRATINI - 0, // SPECIES_DRAGONAIR - 6, // SPECIES_DRAGONITE - 0, // SPECIES_MEWTWO - 8, // SPECIES_MEW - 0, // SPECIES_CHIKORITA - 0, // SPECIES_BAYLEEF - 0, // SPECIES_MEGANIUM - 0, // SPECIES_CYNDAQUIL - 0, // SPECIES_QUILAVA - 0, // SPECIES_TYPHLOSION - 0, // SPECIES_TOTODILE - 0, // SPECIES_CROCONAW - 0, // SPECIES_FERALIGATR - 0, // SPECIES_SENTRET - 0, // SPECIES_FURRET - 0, // SPECIES_HOOTHOOT - 0, // SPECIES_NOCTOWL - 0, // SPECIES_LEDYBA - 8, // SPECIES_LEDIAN - 0, // SPECIES_SPINARAK - 0, // SPECIES_ARIADOS - 6, // SPECIES_CROBAT - 0, // SPECIES_CHINCHOU - 0, // SPECIES_LANTURN - 0, // SPECIES_PICHU - 0, // SPECIES_CLEFFA - 0, // SPECIES_IGGLYBUFF - 0, // SPECIES_TOGEPI - 0, // SPECIES_TOGETIC - 0, // SPECIES_NATU - 0, // SPECIES_XATU - 0, // SPECIES_MAREEP - 0, // SPECIES_FLAAFFY - 0, // SPECIES_AMPHAROS - 0, // SPECIES_BELLOSSOM - 0, // SPECIES_MARILL - 0, // SPECIES_AZUMARILL - 0, // SPECIES_SUDOWOODO - 0, // SPECIES_POLITOED - 11, // SPECIES_HOPPIP - 12, // SPECIES_SKIPLOOM - 9, // SPECIES_JUMPLUFF - 0, // SPECIES_AIPOM - 0, // SPECIES_SUNKERN - 0, // SPECIES_SUNFLORA - 8, // SPECIES_YANMA - 0, // SPECIES_WOOPER - 0, // SPECIES_QUAGSIRE - 0, // SPECIES_ESPEON - 0, // SPECIES_UMBREON - 0, // SPECIES_MURKROW - 0, // SPECIES_SLOWKING - 8, // SPECIES_MISDREAVUS - 8, // SPECIES_UNOWN - 0, // SPECIES_WOBBUFFET - 0, // SPECIES_GIRAFARIG - 0, // SPECIES_PINECO - 0, // SPECIES_FORRETRESS - 0, // SPECIES_DUNSPARCE - 6, // SPECIES_GLIGAR - 0, // SPECIES_STEELIX - 0, // SPECIES_SNUBBULL - 0, // SPECIES_GRANBULL - 0, // SPECIES_QWILFISH - 0, // SPECIES_SCIZOR - 0, // SPECIES_SHUCKLE - 0, // SPECIES_HERACROSS - 0, // SPECIES_SNEASEL - 0, // SPECIES_TEDDIURSA - 0, // SPECIES_URSARING - 0, // SPECIES_SLUGMA - 0, // SPECIES_MAGCARGO - 0, // SPECIES_SWINUB - 0, // SPECIES_PILOSWINE - 0, // SPECIES_CORSOLA - 0, // SPECIES_REMORAID - 0, // SPECIES_OCTILLERY - 0, // SPECIES_DELIBIRD - 0, // SPECIES_MANTINE - 0, // SPECIES_SKARMORY - 0, // SPECIES_HOUNDOUR - 0, // SPECIES_HOUNDOOM - 0, // SPECIES_KINGDRA - 0, // SPECIES_PHANPY - 0, // SPECIES_DONPHAN - 0, // SPECIES_PORYGON2 - 0, // SPECIES_STANTLER - 0, // SPECIES_SMEARGLE - 0, // SPECIES_TYROGUE - 0, // SPECIES_HITMONTOP - 0, // SPECIES_SMOOCHUM - 0, // SPECIES_ELEKID - 0, // SPECIES_MAGBY - 0, // SPECIES_MILTANK - 0, // SPECIES_BLISSEY - 0, // SPECIES_RAIKOU - 0, // SPECIES_ENTEI - 0, // SPECIES_SUICUNE - 0, // SPECIES_LARVITAR - 0, // SPECIES_PUPITAR - 0, // SPECIES_TYRANITAR - 6, // SPECIES_LUGIA - 6, // SPECIES_HO_OH - 15, // SPECIES_CELEBI - 0, // 252 - 0, // 253 - 0, // 254 - 0, // 255 - 0, // 256 - 0, // 257 - 0, // 258 - 0, // 259 - 0, // 260 - 0, // 261 - 0, // 262 - 0, // 263 - 0, // 264 - 0, // 265 - 0, // 266 - 0, // 267 - 0, // 268 - 0, // 269 - 0, // 270 - 0, // 271 - 0, // 272 - 0, // 273 - 0, // 274 - 0, // 275 - 0, // 276 - 0, // SPECIES_TREECKO - 0, // SPECIES_GROVYLE - 0, // SPECIES_SCEPTILE - 0, // SPECIES_TORCHIC - 0, // SPECIES_COMBUSKEN - 0, // SPECIES_BLAZIKEN - 0, // SPECIES_MUDKIP - 0, // SPECIES_MARSHTOMP - 0, // SPECIES_SWAMPERT - 0, // SPECIES_POOCHYENA - 0, // SPECIES_MIGHTYENA - 0, // SPECIES_ZIGZAGOON - 0, // SPECIES_LINOONE - 0, // SPECIES_WURMPLE - 0, // SPECIES_SILCOON - 8, // SPECIES_BEAUTIFLY - 0, // SPECIES_CASCOON - 10, // SPECIES_DUSTOX - 0, // SPECIES_LOTAD - 0, // SPECIES_LOMBRE - 0, // SPECIES_LUDICOLO - 0, // SPECIES_SEEDOT - 0, // SPECIES_NUZLEAF - 0, // SPECIES_SHIFTRY - 0, // SPECIES_NINCADA - 10, // SPECIES_NINJASK - 8, // SPECIES_SHEDINJA - 0, // SPECIES_TAILLOW - 0, // SPECIES_SWELLOW - 0, // SPECIES_SHROOMISH - 0, // SPECIES_BRELOOM - 0, // SPECIES_SPINDA - 16, // SPECIES_WINGULL - 8, // SPECIES_PELIPPER - 0, // SPECIES_SURSKIT - 10, // SPECIES_MASQUERAIN - 0, // SPECIES_WAILMER - 0, // SPECIES_WAILORD - 0, // SPECIES_SKITTY - 0, // SPECIES_DELCATTY - 0, // SPECIES_KECLEON - 4, // SPECIES_BALTOY - 10, // SPECIES_CLAYDOL - 0, // SPECIES_NOSEPASS - 0, // SPECIES_TORKOAL - 0, // SPECIES_SABLEYE - 0, // SPECIES_BARBOACH - 0, // SPECIES_WHISCASH - 0, // SPECIES_LUVDISC - 0, // SPECIES_CORPHISH - 0, // SPECIES_CRAWDAUNT - 0, // SPECIES_FEEBAS - 0, // SPECIES_MILOTIC - 0, // SPECIES_CARVANHA - 0, // SPECIES_SHARPEDO - 0, // SPECIES_TRAPINCH - 0, // SPECIES_VIBRAVA - 7, // SPECIES_FLYGON - 0, // SPECIES_MAKUHITA - 0, // SPECIES_HARIYAMA - 0, // SPECIES_ELECTRIKE - 0, // SPECIES_MANECTRIC - 0, // SPECIES_NUMEL - 0, // SPECIES_CAMERUPT - 0, // SPECIES_SPHEAL - 0, // SPECIES_SEALEO - 0, // SPECIES_WALREIN - 0, // SPECIES_CACNEA - 0, // SPECIES_CACTURNE - 0, // SPECIES_SNORUNT - 12, // SPECIES_GLALIE - 13, // SPECIES_LUNATONE - 4, // SPECIES_SOLROCK - 0, // SPECIES_AZURILL - 0, // SPECIES_SPOINK - 0, // SPECIES_GRUMPIG - 0, // SPECIES_PLUSLE - 0, // SPECIES_MINUN - 0, // SPECIES_MAWILE - 0, // SPECIES_MEDITITE - 0, // SPECIES_MEDICHAM - 12, // SPECIES_SWABLU - 8, // SPECIES_ALTARIA - 0, // SPECIES_WYNAUT - 9, // SPECIES_DUSKULL - 0, // SPECIES_DUSCLOPS - 0, // SPECIES_ROSELIA - 0, // SPECIES_SLAKOTH - 0, // SPECIES_VIGOROTH - 0, // SPECIES_SLAKING - 0, // SPECIES_GULPIN - 0, // SPECIES_SWALOT - 0, // SPECIES_TROPIUS - 0, // SPECIES_WHISMUR - 0, // SPECIES_LOUDRED - 0, // SPECIES_EXPLOUD - 0, // SPECIES_CLAMPERL - 0, // SPECIES_HUNTAIL - 0, // SPECIES_GOREBYSS - 0, // SPECIES_ABSOL - 12, // SPECIES_SHUPPET - 8, // SPECIES_BANETTE - 0, // SPECIES_SEVIPER - 0, // SPECIES_ZANGOOSE - 0, // SPECIES_RELICANTH - 0, // SPECIES_ARON - 0, // SPECIES_LAIRON - 0, // SPECIES_AGGRON - 16, // SPECIES_CASTFORM - 0, // SPECIES_VOLBEAT - 0, // SPECIES_ILLUMISE - 0, // SPECIES_LILEEP - 0, // SPECIES_CRADILY - 0, // SPECIES_ANORITH - 0, // SPECIES_ARMALDO - 0, // SPECIES_RALTS - 0, // SPECIES_KIRLIA - 0, // SPECIES_GARDEVOIR - 0, // SPECIES_BAGON - 0, // SPECIES_SHELGON - 0, // SPECIES_SALAMENCE - 8, // SPECIES_BELDUM - 0, // SPECIES_METANG - 0, // SPECIES_METAGROSS - 0, // SPECIES_REGIROCK - 0, // SPECIES_REGICE - 0, // SPECIES_REGISTEEL - 0, // SPECIES_KYOGRE - 0, // SPECIES_GROUDON - 6, // SPECIES_RAYQUAZA - 6, // SPECIES_LATIAS - 6, // SPECIES_LATIOS - 12, // SPECIES_JIRACHI - 8, // SPECIES_DEOXYS - 12, // SPECIES_CHIMECHO + [SPECIES_NONE] = 0, + [SPECIES_BULBASAUR] = 0, + [SPECIES_IVYSAUR] = 0, + [SPECIES_VENUSAUR] = 0, + [SPECIES_CHARMANDER] = 0, + [SPECIES_CHARMELEON] = 0, + [SPECIES_CHARIZARD] = 0, + [SPECIES_SQUIRTLE] = 0, + [SPECIES_WARTORTLE] = 0, + [SPECIES_BLASTOISE] = 0, + [SPECIES_CATERPIE] = 0, + [SPECIES_METAPOD] = 0, + [SPECIES_BUTTERFREE] = 8, + [SPECIES_WEEDLE] = 0, + [SPECIES_KAKUNA] = 0, + [SPECIES_BEEDRILL] = 8, + [SPECIES_PIDGEY] = 16, + [SPECIES_PIDGEOTTO] = 0, + [SPECIES_PIDGEOT] = 4, + [SPECIES_RATTATA] = 0, + [SPECIES_RATICATE] = 0, + [SPECIES_SPEAROW] = 0, + [SPECIES_FEAROW] = 6, + [SPECIES_EKANS] = 0, + [SPECIES_ARBOK] = 0, + [SPECIES_PIKACHU] = 0, + [SPECIES_RAICHU] = 0, + [SPECIES_SANDSHREW] = 0, + [SPECIES_SANDSLASH] = 0, + [SPECIES_NIDORAN_F] = 0, + [SPECIES_NIDORINA] = 0, + [SPECIES_NIDOQUEEN] = 0, + [SPECIES_NIDORAN_M] = 0, + [SPECIES_NIDORINO] = 0, + [SPECIES_NIDOKING] = 0, + [SPECIES_CLEFAIRY] = 0, + [SPECIES_CLEFABLE] = 0, + [SPECIES_VULPIX] = 0, + [SPECIES_NINETALES] = 0, + [SPECIES_JIGGLYPUFF] = 0, + [SPECIES_WIGGLYTUFF] = 0, + [SPECIES_ZUBAT] = 8, + [SPECIES_GOLBAT] = 8, + [SPECIES_ODDISH] = 0, + [SPECIES_GLOOM] = 0, + [SPECIES_VILEPLUME] = 0, + [SPECIES_PARAS] = 0, + [SPECIES_PARASECT] = 0, + [SPECIES_VENONAT] = 0, + [SPECIES_VENOMOTH] = 8, + [SPECIES_DIGLETT] = 0, + [SPECIES_DUGTRIO] = 0, + [SPECIES_MEOWTH] = 0, + [SPECIES_PERSIAN] = 0, + [SPECIES_PSYDUCK] = 0, + [SPECIES_GOLDUCK] = 0, + [SPECIES_MANKEY] = 0, + [SPECIES_PRIMEAPE] = 0, + [SPECIES_GROWLITHE] = 0, + [SPECIES_ARCANINE] = 0, + [SPECIES_POLIWAG] = 0, + [SPECIES_POLIWHIRL] = 0, + [SPECIES_POLIWRATH] = 0, + [SPECIES_ABRA] = 0, + [SPECIES_KADABRA] = 0, + [SPECIES_ALAKAZAM] = 0, + [SPECIES_MACHOP] = 0, + [SPECIES_MACHOKE] = 0, + [SPECIES_MACHAMP] = 0, + [SPECIES_BELLSPROUT] = 0, + [SPECIES_WEEPINBELL] = 0, + [SPECIES_VICTREEBEL] = 0, + [SPECIES_TENTACOOL] = 0, + [SPECIES_TENTACRUEL] = 0, + [SPECIES_GEODUDE] = 16, + [SPECIES_GRAVELER] = 0, + [SPECIES_GOLEM] = 0, + [SPECIES_PONYTA] = 0, + [SPECIES_RAPIDASH] = 0, + [SPECIES_SLOWPOKE] = 0, + [SPECIES_SLOWBRO] = 0, + [SPECIES_MAGNEMITE] = 16, + [SPECIES_MAGNETON] = 8, + [SPECIES_FARFETCHD] = 0, + [SPECIES_DODUO] = 0, + [SPECIES_DODRIO] = 0, + [SPECIES_SEEL] = 0, + [SPECIES_DEWGONG] = 0, + [SPECIES_GRIMER] = 0, + [SPECIES_MUK] = 0, + [SPECIES_SHELLDER] = 0, + [SPECIES_CLOYSTER] = 0, + [SPECIES_GASTLY] = 4, + [SPECIES_HAUNTER] = 4, + [SPECIES_GENGAR] = 0, + [SPECIES_ONIX] = 0, + [SPECIES_DROWZEE] = 0, + [SPECIES_HYPNO] = 0, + [SPECIES_KRABBY] = 0, + [SPECIES_KINGLER] = 0, + [SPECIES_VOLTORB] = 10, + [SPECIES_ELECTRODE] = 12, + [SPECIES_EXEGGCUTE] = 0, + [SPECIES_EXEGGUTOR] = 0, + [SPECIES_CUBONE] = 0, + [SPECIES_MAROWAK] = 0, + [SPECIES_HITMONLEE] = 0, + [SPECIES_HITMONCHAN] = 0, + [SPECIES_LICKITUNG] = 0, + [SPECIES_KOFFING] = 8, + [SPECIES_WEEZING] = 6, + [SPECIES_RHYHORN] = 0, + [SPECIES_RHYDON] = 0, + [SPECIES_CHANSEY] = 0, + [SPECIES_TANGELA] = 0, + [SPECIES_KANGASKHAN] = 0, + [SPECIES_HORSEA] = 0, + [SPECIES_SEADRA] = 0, + [SPECIES_GOLDEEN] = 0, + [SPECIES_SEAKING] = 0, + [SPECIES_STARYU] = 0, + [SPECIES_STARMIE] = 0, + [SPECIES_MR_MIME] = 0, + [SPECIES_SCYTHER] = 0, + [SPECIES_JYNX] = 0, + [SPECIES_ELECTABUZZ] = 0, + [SPECIES_MAGMAR] = 0, + [SPECIES_PINSIR] = 0, + [SPECIES_TAUROS] = 0, + [SPECIES_MAGIKARP] = 0, + [SPECIES_GYARADOS] = 0, + [SPECIES_LAPRAS] = 0, + [SPECIES_DITTO] = 0, + [SPECIES_EEVEE] = 0, + [SPECIES_VAPOREON] = 0, + [SPECIES_JOLTEON] = 0, + [SPECIES_FLAREON] = 0, + [SPECIES_PORYGON] = 0, + [SPECIES_OMANYTE] = 0, + [SPECIES_OMASTAR] = 0, + [SPECIES_KABUTO] = 0, + [SPECIES_KABUTOPS] = 0, + [SPECIES_AERODACTYL] = 7, + [SPECIES_SNORLAX] = 0, + [SPECIES_ARTICUNO] = 6, + [SPECIES_ZAPDOS] = 8, + [SPECIES_MOLTRES] = 5, + [SPECIES_DRATINI] = 0, + [SPECIES_DRAGONAIR] = 0, + [SPECIES_DRAGONITE] = 6, + [SPECIES_MEWTWO] = 0, + [SPECIES_MEW] = 8, + [SPECIES_CHIKORITA] = 0, + [SPECIES_BAYLEEF] = 0, + [SPECIES_MEGANIUM] = 0, + [SPECIES_CYNDAQUIL] = 0, + [SPECIES_QUILAVA] = 0, + [SPECIES_TYPHLOSION] = 0, + [SPECIES_TOTODILE] = 0, + [SPECIES_CROCONAW] = 0, + [SPECIES_FERALIGATR] = 0, + [SPECIES_SENTRET] = 0, + [SPECIES_FURRET] = 0, + [SPECIES_HOOTHOOT] = 0, + [SPECIES_NOCTOWL] = 0, + [SPECIES_LEDYBA] = 0, + [SPECIES_LEDIAN] = 8, + [SPECIES_SPINARAK] = 0, + [SPECIES_ARIADOS] = 0, + [SPECIES_CROBAT] = 6, + [SPECIES_CHINCHOU] = 0, + [SPECIES_LANTURN] = 0, + [SPECIES_PICHU] = 0, + [SPECIES_CLEFFA] = 0, + [SPECIES_IGGLYBUFF] = 0, + [SPECIES_TOGEPI] = 0, + [SPECIES_TOGETIC] = 0, + [SPECIES_NATU] = 0, + [SPECIES_XATU] = 0, + [SPECIES_MAREEP] = 0, + [SPECIES_FLAAFFY] = 0, + [SPECIES_AMPHAROS] = 0, + [SPECIES_BELLOSSOM] = 0, + [SPECIES_MARILL] = 0, + [SPECIES_AZUMARILL] = 0, + [SPECIES_SUDOWOODO] = 0, + [SPECIES_POLITOED] = 0, + [SPECIES_HOPPIP] = 11, + [SPECIES_SKIPLOOM] = 12, + [SPECIES_JUMPLUFF] = 9, + [SPECIES_AIPOM] = 0, + [SPECIES_SUNKERN] = 0, + [SPECIES_SUNFLORA] = 0, + [SPECIES_YANMA] = 8, + [SPECIES_WOOPER] = 0, + [SPECIES_QUAGSIRE] = 0, + [SPECIES_ESPEON] = 0, + [SPECIES_UMBREON] = 0, + [SPECIES_MURKROW] = 0, + [SPECIES_SLOWKING] = 0, + [SPECIES_MISDREAVUS] = 8, + [SPECIES_UNOWN] = 8, + [SPECIES_WOBBUFFET] = 0, + [SPECIES_GIRAFARIG] = 0, + [SPECIES_PINECO] = 0, + [SPECIES_FORRETRESS] = 0, + [SPECIES_DUNSPARCE] = 0, + [SPECIES_GLIGAR] = 6, + [SPECIES_STEELIX] = 0, + [SPECIES_SNUBBULL] = 0, + [SPECIES_GRANBULL] = 0, + [SPECIES_QWILFISH] = 0, + [SPECIES_SCIZOR] = 0, + [SPECIES_SHUCKLE] = 0, + [SPECIES_HERACROSS] = 0, + [SPECIES_SNEASEL] = 0, + [SPECIES_TEDDIURSA] = 0, + [SPECIES_URSARING] = 0, + [SPECIES_SLUGMA] = 0, + [SPECIES_MAGCARGO] = 0, + [SPECIES_SWINUB] = 0, + [SPECIES_PILOSWINE] = 0, + [SPECIES_CORSOLA] = 0, + [SPECIES_REMORAID] = 0, + [SPECIES_OCTILLERY] = 0, + [SPECIES_DELIBIRD] = 0, + [SPECIES_MANTINE] = 0, + [SPECIES_SKARMORY] = 0, + [SPECIES_HOUNDOUR] = 0, + [SPECIES_HOUNDOOM] = 0, + [SPECIES_KINGDRA] = 0, + [SPECIES_PHANPY] = 0, + [SPECIES_DONPHAN] = 0, + [SPECIES_PORYGON2] = 0, + [SPECIES_STANTLER] = 0, + [SPECIES_SMEARGLE] = 0, + [SPECIES_TYROGUE] = 0, + [SPECIES_HITMONTOP] = 0, + [SPECIES_SMOOCHUM] = 0, + [SPECIES_ELEKID] = 0, + [SPECIES_MAGBY] = 0, + [SPECIES_MILTANK] = 0, + [SPECIES_BLISSEY] = 0, + [SPECIES_RAIKOU] = 0, + [SPECIES_ENTEI] = 0, + [SPECIES_SUICUNE] = 0, + [SPECIES_LARVITAR] = 0, + [SPECIES_PUPITAR] = 0, + [SPECIES_TYRANITAR] = 0, + [SPECIES_LUGIA] = 6, + [SPECIES_HO_OH] = 6, + [SPECIES_CELEBI] = 15, + [252] = 0, + [253] = 0, + [254] = 0, + [255] = 0, + [256] = 0, + [257] = 0, + [258] = 0, + [259] = 0, + [260] = 0, + [261] = 0, + [262] = 0, + [263] = 0, + [264] = 0, + [265] = 0, + [266] = 0, + [267] = 0, + [268] = 0, + [269] = 0, + [270] = 0, + [271] = 0, + [272] = 0, + [273] = 0, + [274] = 0, + [275] = 0, + [276] = 0, + [SPECIES_TREECKO] = 0, + [SPECIES_GROVYLE] = 0, + [SPECIES_SCEPTILE] = 0, + [SPECIES_TORCHIC] = 0, + [SPECIES_COMBUSKEN] = 0, + [SPECIES_BLAZIKEN] = 0, + [SPECIES_MUDKIP] = 0, + [SPECIES_MARSHTOMP] = 0, + [SPECIES_SWAMPERT] = 0, + [SPECIES_POOCHYENA] = 0, + [SPECIES_MIGHTYENA] = 0, + [SPECIES_ZIGZAGOON] = 0, + [SPECIES_LINOONE] = 0, + [SPECIES_WURMPLE] = 0, + [SPECIES_SILCOON] = 0, + [SPECIES_BEAUTIFLY] = 8, + [SPECIES_CASCOON] = 0, + [SPECIES_DUSTOX] = 10, + [SPECIES_LOTAD] = 0, + [SPECIES_LOMBRE] = 0, + [SPECIES_LUDICOLO] = 0, + [SPECIES_SEEDOT] = 0, + [SPECIES_NUZLEAF] = 0, + [SPECIES_SHIFTRY] = 0, + [SPECIES_NINCADA] = 0, + [SPECIES_NINJASK] = 10, + [SPECIES_SHEDINJA] = 8, + [SPECIES_TAILLOW] = 0, + [SPECIES_SWELLOW] = 0, + [SPECIES_SHROOMISH] = 0, + [SPECIES_BRELOOM] = 0, + [SPECIES_SPINDA] = 0, + [SPECIES_WINGULL] = 16, + [SPECIES_PELIPPER] = 8, + [SPECIES_SURSKIT] = 0, + [SPECIES_MASQUERAIN] = 10, + [SPECIES_WAILMER] = 0, + [SPECIES_WAILORD] = 0, + [SPECIES_SKITTY] = 0, + [SPECIES_DELCATTY] = 0, + [SPECIES_KECLEON] = 0, + [SPECIES_BALTOY] = 4, + [SPECIES_CLAYDOL] = 10, + [SPECIES_NOSEPASS] = 0, + [SPECIES_TORKOAL] = 0, + [SPECIES_SABLEYE] = 0, + [SPECIES_BARBOACH] = 0, + [SPECIES_WHISCASH] = 0, + [SPECIES_LUVDISC] = 0, + [SPECIES_CORPHISH] = 0, + [SPECIES_CRAWDAUNT] = 0, + [SPECIES_FEEBAS] = 0, + [SPECIES_MILOTIC] = 0, + [SPECIES_CARVANHA] = 0, + [SPECIES_SHARPEDO] = 0, + [SPECIES_TRAPINCH] = 0, + [SPECIES_VIBRAVA] = 0, + [SPECIES_FLYGON] = 7, + [SPECIES_MAKUHITA] = 0, + [SPECIES_HARIYAMA] = 0, + [SPECIES_ELECTRIKE] = 0, + [SPECIES_MANECTRIC] = 0, + [SPECIES_NUMEL] = 0, + [SPECIES_CAMERUPT] = 0, + [SPECIES_SPHEAL] = 0, + [SPECIES_SEALEO] = 0, + [SPECIES_WALREIN] = 0, + [SPECIES_CACNEA] = 0, + [SPECIES_CACTURNE] = 0, + [SPECIES_SNORUNT] = 0, + [SPECIES_GLALIE] = 12, + [SPECIES_LUNATONE] = 13, + [SPECIES_SOLROCK] = 4, + [SPECIES_AZURILL] = 0, + [SPECIES_SPOINK] = 0, + [SPECIES_GRUMPIG] = 0, + [SPECIES_PLUSLE] = 0, + [SPECIES_MINUN] = 0, + [SPECIES_MAWILE] = 0, + [SPECIES_MEDITITE] = 0, + [SPECIES_MEDICHAM] = 0, + [SPECIES_SWABLU] = 12, + [SPECIES_ALTARIA] = 8, + [SPECIES_WYNAUT] = 0, + [SPECIES_DUSKULL] = 9, + [SPECIES_DUSCLOPS] = 0, + [SPECIES_ROSELIA] = 0, + [SPECIES_SLAKOTH] = 0, + [SPECIES_VIGOROTH] = 0, + [SPECIES_SLAKING] = 0, + [SPECIES_GULPIN] = 0, + [SPECIES_SWALOT] = 0, + [SPECIES_TROPIUS] = 0, + [SPECIES_WHISMUR] = 0, + [SPECIES_LOUDRED] = 0, + [SPECIES_EXPLOUD] = 0, + [SPECIES_CLAMPERL] = 0, + [SPECIES_HUNTAIL] = 0, + [SPECIES_GOREBYSS] = 0, + [SPECIES_ABSOL] = 0, + [SPECIES_SHUPPET] = 12, + [SPECIES_BANETTE] = 8, + [SPECIES_SEVIPER] = 0, + [SPECIES_ZANGOOSE] = 0, + [SPECIES_RELICANTH] = 0, + [SPECIES_ARON] = 0, + [SPECIES_LAIRON] = 0, + [SPECIES_AGGRON] = 0, + [SPECIES_CASTFORM] = 16, + [SPECIES_VOLBEAT] = 0, + [SPECIES_ILLUMISE] = 0, + [SPECIES_LILEEP] = 0, + [SPECIES_CRADILY] = 0, + [SPECIES_ANORITH] = 0, + [SPECIES_ARMALDO] = 0, + [SPECIES_RALTS] = 0, + [SPECIES_KIRLIA] = 0, + [SPECIES_GARDEVOIR] = 0, + [SPECIES_BAGON] = 0, + [SPECIES_SHELGON] = 0, + [SPECIES_SALAMENCE] = 0, + [SPECIES_BELDUM] = 8, + [SPECIES_METANG] = 0, + [SPECIES_METAGROSS] = 0, + [SPECIES_REGIROCK] = 0, + [SPECIES_REGICE] = 0, + [SPECIES_REGISTEEL] = 0, + [SPECIES_KYOGRE] = 0, + [SPECIES_GROUDON] = 0, + [SPECIES_RAYQUAZA] = 6, + [SPECIES_LATIAS] = 6, + [SPECIES_LATIOS] = 6, + [SPECIES_JIRACHI] = 12, + [SPECIES_DEOXYS] = 8, + [SPECIES_CHIMECHO] = 12, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 923df2cde..a01f0360f 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -1,443 +1,2205 @@ +#include "constants/species.h" + const struct MonCoords gMonFrontPicCoords[] = { - {0x88, 0x00}, // SPECIES_NONE - {0x45, 0x0e}, // SPECIES_BULBASAUR - {0x56, 0x0a}, // SPECIES_IVYSAUR - {0x88, 0x03}, // SPECIES_VENUSAUR - {0x55, 0x0c}, // SPECIES_CHARMANDER - {0x66, 0x09}, // SPECIES_CHARMELEON - {0x88, 0x01}, // SPECIES_CHARIZARD - {0x65, 0x0d}, // SPECIES_SQUIRTLE - {0x66, 0x08}, // SPECIES_WARTORTLE - {0x88, 0x00}, // SPECIES_BLASTOISE - {0x45, 0x10}, // SPECIES_CATERPIE - {0x54, 0x14}, // SPECIES_METAPOD - {0x76, 0x09}, // SPECIES_BUTTERFREE - {0x54, 0x12}, // SPECIES_WEEDLE - {0x45, 0x0e}, // SPECIES_KAKUNA - {0x86, 0x09}, // SPECIES_BEEDRILL - {0x65, 0x0d}, // SPECIES_PIDGEY - {0x67, 0x0b}, // SPECIES_PIDGEOTTO - {0x88, 0x01}, // SPECIES_PIDGEOT - {0x44, 0x10}, // SPECIES_RATTATA - {0x66, 0x0b}, // SPECIES_RATICATE - {0x45, 0x0f}, // SPECIES_SPEAROW - {0x78, 0x00}, // SPECIES_FEAROW - {0x65, 0x0c}, // SPECIES_EKANS - {0x88, 0x02}, // SPECIES_ARBOK - {0x67, 0x09}, // SPECIES_PIKACHU - {0x67, 0x04}, // SPECIES_RAICHU - {0x55, 0x0e}, // SPECIES_SANDSHREW - {0x76, 0x09}, // SPECIES_SANDSLASH - {0x45, 0x0f}, // SPECIES_NIDORAN_F - {0x66, 0x0b}, // SPECIES_NIDORINA - {0x78, 0x03}, // SPECIES_NIDOQUEEN - {0x55, 0x0c}, // SPECIES_NIDORAN_M - {0x66, 0x09}, // SPECIES_NIDORINO - {0x78, 0x02}, // SPECIES_NIDOKING - {0x55, 0x10}, // SPECIES_CLEFAIRY - {0x66, 0x08}, // SPECIES_CLEFABLE - {0x65, 0x0c}, // SPECIES_VULPIX - {0x88, 0x03}, // SPECIES_NINETALES - {0x45, 0x10}, // SPECIES_JIGGLYPUFF - {0x67, 0x08}, // SPECIES_WIGGLYTUFF - {0x67, 0x06}, // SPECIES_ZUBAT - {0x88, 0x03}, // SPECIES_GOLBAT - {0x45, 0x0f}, // SPECIES_ODDISH - {0x66, 0x0a}, // SPECIES_GLOOM - {0x77, 0x06}, // SPECIES_VILEPLUME - {0x55, 0x0f}, // SPECIES_PARAS - {0x86, 0x08}, // SPECIES_PARASECT - {0x66, 0x08}, // SPECIES_VENONAT - {0x88, 0x02}, // SPECIES_VENOMOTH - {0x54, 0x12}, // SPECIES_DIGLETT - {0x75, 0x0d}, // SPECIES_DUGTRIO - {0x55, 0x0c}, // SPECIES_MEOWTH - {0x77, 0x07}, // SPECIES_PERSIAN - {0x56, 0x09}, // SPECIES_PSYDUCK - {0x78, 0x02}, // SPECIES_GOLDUCK - {0x65, 0x0e}, // SPECIES_MANKEY - {0x77, 0x07}, // SPECIES_PRIMEAPE - {0x66, 0x0b}, // SPECIES_GROWLITHE - {0x88, 0x02}, // SPECIES_ARCANINE - {0x74, 0x13}, // SPECIES_POLIWAG - {0x76, 0x0a}, // SPECIES_POLIWHIRL - {0x76, 0x08}, // SPECIES_POLIWRATH - {0x66, 0x0b}, // SPECIES_ABRA - {0x77, 0x05}, // SPECIES_KADABRA - {0x87, 0x04}, // SPECIES_ALAKAZAM - {0x56, 0x0b}, // SPECIES_MACHOP - {0x67, 0x06}, // SPECIES_MACHOKE - {0x88, 0x01}, // SPECIES_MACHAMP - {0x65, 0x0f}, // SPECIES_BELLSPROUT - {0x66, 0x0b}, // SPECIES_WEEPINBELL - {0x77, 0x05}, // SPECIES_VICTREEBEL - {0x46, 0x09}, // SPECIES_TENTACOOL - {0x87, 0x04}, // SPECIES_TENTACRUEL - {0x54, 0x12}, // SPECIES_GEODUDE - {0x87, 0x04}, // SPECIES_GRAVELER - {0x77, 0x05}, // SPECIES_GOLEM - {0x66, 0x08}, // SPECIES_PONYTA - {0x88, 0x01}, // SPECIES_RAPIDASH - {0x66, 0x0b}, // SPECIES_SLOWPOKE - {0x86, 0x08}, // SPECIES_SLOWBRO - {0x43, 0x15}, // SPECIES_MAGNEMITE - {0x76, 0x08}, // SPECIES_MAGNETON - {0x66, 0x09}, // SPECIES_FARFETCHD - {0x57, 0x05}, // SPECIES_DODUO - {0x88, 0x00}, // SPECIES_DODRIO - {0x76, 0x0a}, // SPECIES_SEEL - {0x87, 0x07}, // SPECIES_DEWGONG - {0x65, 0x0c}, // SPECIES_GRIMER - {0x87, 0x04}, // SPECIES_MUK - {0x55, 0x10}, // SPECIES_SHELLDER - {0x87, 0x05}, // SPECIES_CLOYSTER - {0x77, 0x06}, // SPECIES_GASTLY - {0x77, 0x05}, // SPECIES_HAUNTER - {0x77, 0x05}, // SPECIES_GENGAR - {0x78, 0x02}, // SPECIES_ONIX - {0x77, 0x07}, // SPECIES_DROWZEE - {0x77, 0x04}, // SPECIES_HYPNO - {0x65, 0x0d}, // SPECIES_KRABBY - {0x88, 0x03}, // SPECIES_KINGLER - {0x44, 0x13}, // SPECIES_VOLTORB - {0x55, 0x0e}, // SPECIES_ELECTRODE - {0x87, 0x07}, // SPECIES_EXEGGCUTE - {0x88, 0x00}, // SPECIES_EXEGGUTOR - {0x55, 0x0f}, // SPECIES_CUBONE - {0x76, 0x0b}, // SPECIES_MAROWAK - {0x87, 0x04}, // SPECIES_HITMONLEE - {0x67, 0x04}, // SPECIES_HITMONCHAN - {0x86, 0x08}, // SPECIES_LICKITUNG - {0x66, 0x08}, // SPECIES_KOFFING - {0x88, 0x02}, // SPECIES_WEEZING - {0x76, 0x09}, // SPECIES_RHYHORN - {0x88, 0x02}, // SPECIES_RHYDON - {0x76, 0x09}, // SPECIES_CHANSEY - {0x67, 0x07}, // SPECIES_TANGELA - {0x88, 0x00}, // SPECIES_KANGASKHAN - {0x45, 0x0f}, // SPECIES_HORSEA - {0x67, 0x07}, // SPECIES_SEADRA - {0x66, 0x0a}, // SPECIES_GOLDEEN - {0x77, 0x04}, // SPECIES_SEAKING - {0x66, 0x0a}, // SPECIES_STARYU - {0x77, 0x06}, // SPECIES_STARMIE - {0x66, 0x08}, // SPECIES_MR_MIME - {0x88, 0x00}, // SPECIES_SCYTHER - {0x77, 0x04}, // SPECIES_JYNX - {0x78, 0x02}, // SPECIES_ELECTABUZZ - {0x77, 0x04}, // SPECIES_MAGMAR - {0x77, 0x04}, // SPECIES_PINSIR - {0x78, 0x00}, // SPECIES_TAUROS - {0x67, 0x06}, // SPECIES_MAGIKARP - {0x88, 0x08}, // SPECIES_GYARADOS - {0x85, 0x0d}, // SPECIES_LAPRAS - {0x54, 0x11}, // SPECIES_DITTO - {0x56, 0x09}, // SPECIES_EEVEE - {0x67, 0x06}, // SPECIES_VAPOREON - {0x76, 0x09}, // SPECIES_JOLTEON - {0x66, 0x0a}, // SPECIES_FLAREON - {0x55, 0x0d}, // SPECIES_PORYGON - {0x45, 0x0f}, // SPECIES_OMANYTE - {0x67, 0x07}, // SPECIES_OMASTAR - {0x54, 0x11}, // SPECIES_KABUTO - {0x88, 0x03}, // SPECIES_KABUTOPS - {0x88, 0x01}, // SPECIES_AERODACTYL - {0x87, 0x05}, // SPECIES_SNORLAX - {0x88, 0x03}, // SPECIES_ARTICUNO - {0x87, 0x04}, // SPECIES_ZAPDOS - {0x88, 0x00}, // SPECIES_MOLTRES - {0x75, 0x0e}, // SPECIES_DRATINI - {0x87, 0x06}, // SPECIES_DRAGONAIR - {0x88, 0x00}, // SPECIES_DRAGONITE - {0x88, 0x00}, // SPECIES_MEWTWO - {0x55, 0x0d}, // SPECIES_MEW - {0x75, 0x0d}, // SPECIES_CHIKORITA - {0x77, 0x04}, // SPECIES_BAYLEEF - {0x88, 0x00}, // SPECIES_MEGANIUM - {0x55, 0x0e}, // SPECIES_CYNDAQUIL - {0x76, 0x08}, // SPECIES_QUILAVA - {0x78, 0x00}, // SPECIES_TYPHLOSION - {0x55, 0x0f}, // SPECIES_TOTODILE - {0x67, 0x06}, // SPECIES_CROCONAW - {0x88, 0x00}, // SPECIES_FERALIGATR - {0x47, 0x04}, // SPECIES_SENTRET - {0x67, 0x07}, // SPECIES_FURRET - {0x55, 0x0d}, // SPECIES_HOOTHOOT - {0x58, 0x03}, // SPECIES_NOCTOWL - {0x56, 0x0c}, // SPECIES_LEDYBA - {0x67, 0x04}, // SPECIES_LEDIAN - {0x54, 0x13}, // SPECIES_SPINARAK - {0x87, 0x05}, // SPECIES_ARIADOS - {0x88, 0x00}, // SPECIES_CROBAT - {0x75, 0x10}, // SPECIES_CHINCHOU - {0x87, 0x0b}, // SPECIES_LANTURN - {0x45, 0x0c}, // SPECIES_PICHU - {0x44, 0x14}, // SPECIES_CLEFFA - {0x44, 0x12}, // SPECIES_IGGLYBUFF - {0x34, 0x14}, // SPECIES_TOGEPI - {0x46, 0x09}, // SPECIES_TOGETIC - {0x44, 0x14}, // SPECIES_NATU - {0x47, 0x07}, // SPECIES_XATU - {0x55, 0x10}, // SPECIES_MAREEP - {0x56, 0x0a}, // SPECIES_FLAAFFY - {0x77, 0x05}, // SPECIES_AMPHAROS - {0x45, 0x0e}, // SPECIES_BELLOSSOM - {0x65, 0x0e}, // SPECIES_MARILL - {0x76, 0x09}, // SPECIES_AZUMARILL - {0x67, 0x06}, // SPECIES_SUDOWOODO - {0x67, 0x06}, // SPECIES_POLITOED - {0x66, 0x0a}, // SPECIES_HOPPIP - {0x55, 0x0f}, // SPECIES_SKIPLOOM - {0x77, 0x07}, // SPECIES_JUMPLUFF - {0x58, 0x03}, // SPECIES_AIPOM - {0x44, 0x10}, // SPECIES_SUNKERN - {0x56, 0x08}, // SPECIES_SUNFLORA - {0x86, 0x0a}, // SPECIES_YANMA - {0x54, 0x10}, // SPECIES_WOOPER - {0x77, 0x07}, // SPECIES_QUAGSIRE - {0x66, 0x08}, // SPECIES_ESPEON - {0x67, 0x08}, // SPECIES_UMBREON - {0x66, 0x0b}, // SPECIES_MURKROW - {0x58, 0x01}, // SPECIES_SLOWKING - {0x55, 0x0c}, // SPECIES_MISDREAVUS - {0x35, 0x0f}, // SPECIES_UNOWN - {0x77, 0x06}, // SPECIES_WOBBUFFET - {0x88, 0x03}, // SPECIES_GIRAFARIG - {0x56, 0x0a}, // SPECIES_PINECO - {0x76, 0x09}, // SPECIES_FORRETRESS - {0x74, 0x11}, // SPECIES_DUNSPARCE - {0x78, 0x03}, // SPECIES_GLIGAR - {0x88, 0x00}, // SPECIES_STEELIX - {0x55, 0x0d}, // SPECIES_SNUBBULL - {0x57, 0x06}, // SPECIES_GRANBULL - {0x56, 0x0a}, // SPECIES_QWILFISH - {0x88, 0x00}, // SPECIES_SCIZOR - {0x66, 0x09}, // SPECIES_SHUCKLE - {0x88, 0x03}, // SPECIES_HERACROSS - {0x67, 0x05}, // SPECIES_SNEASEL - {0x45, 0x0d}, // SPECIES_TEDDIURSA - {0x78, 0x01}, // SPECIES_URSARING - {0x45, 0x0d}, // SPECIES_SLUGMA - {0x57, 0x0d}, // SPECIES_MAGCARGO - {0x43, 0x14}, // SPECIES_SWINUB - {0x66, 0x08}, // SPECIES_PILOSWINE - {0x65, 0x0c}, // SPECIES_CORSOLA - {0x55, 0x0e}, // SPECIES_REMORAID - {0x66, 0x0a}, // SPECIES_OCTILLERY - {0x56, 0x08}, // SPECIES_DELIBIRD - {0x88, 0x01}, // SPECIES_MANTINE - {0x88, 0x00}, // SPECIES_SKARMORY - {0x56, 0x0b}, // SPECIES_HOUNDOUR - {0x77, 0x05}, // SPECIES_HOUNDOOM - {0x78, 0x04}, // SPECIES_KINGDRA - {0x54, 0x10}, // SPECIES_PHANPY - {0x86, 0x08}, // SPECIES_DONPHAN - {0x55, 0x0f}, // SPECIES_PORYGON2 - {0x88, 0x00}, // SPECIES_STANTLER - {0x77, 0x06}, // SPECIES_SMEARGLE - {0x46, 0x09}, // SPECIES_TYROGUE - {0x67, 0x05}, // SPECIES_HITMONTOP - {0x35, 0x0f}, // SPECIES_SMOOCHUM - {0x76, 0x0a}, // SPECIES_ELEKID - {0x45, 0x0d}, // SPECIES_MAGBY - {0x77, 0x04}, // SPECIES_MILTANK - {0x77, 0x06}, // SPECIES_BLISSEY - {0x88, 0x00}, // SPECIES_RAIKOU - {0x88, 0x00}, // SPECIES_ENTEI - {0x88, 0x00}, // SPECIES_SUICUNE - {0x46, 0x09}, // SPECIES_LARVITAR - {0x56, 0x09}, // SPECIES_PUPITAR - {0x88, 0x00}, // SPECIES_TYRANITAR - {0x88, 0x00}, // SPECIES_LUGIA - {0x88, 0x00}, // SPECIES_HO_OH - {0x55, 0x0e}, // SPECIES_CELEBI - {0x87, 0x04}, // SPECIES_OLD_UNOWN_B - {0x87, 0x04}, // SPECIES_OLD_UNOWN_C - {0x87, 0x04}, // SPECIES_OLD_UNOWN_D - {0x87, 0x04}, // SPECIES_OLD_UNOWN_E - {0x87, 0x04}, // SPECIES_OLD_UNOWN_F - {0x87, 0x04}, // SPECIES_OLD_UNOWN_G - {0x87, 0x04}, // SPECIES_OLD_UNOWN_H - {0x87, 0x04}, // SPECIES_OLD_UNOWN_I - {0x87, 0x04}, // SPECIES_OLD_UNOWN_J - {0x87, 0x04}, // SPECIES_OLD_UNOWN_K - {0x87, 0x04}, // SPECIES_OLD_UNOWN_L - {0x87, 0x04}, // SPECIES_OLD_UNOWN_M - {0x87, 0x04}, // SPECIES_OLD_UNOWN_N - {0x87, 0x04}, // SPECIES_OLD_UNOWN_O - {0x87, 0x04}, // SPECIES_OLD_UNOWN_P - {0x87, 0x04}, // SPECIES_OLD_UNOWN_Q - {0x87, 0x04}, // SPECIES_OLD_UNOWN_R - {0x87, 0x04}, // SPECIES_OLD_UNOWN_S - {0x87, 0x04}, // SPECIES_OLD_UNOWN_T - {0x87, 0x04}, // SPECIES_OLD_UNOWN_U - {0x87, 0x04}, // SPECIES_OLD_UNOWN_V - {0x87, 0x04}, // SPECIES_OLD_UNOWN_W - {0x87, 0x04}, // SPECIES_OLD_UNOWN_X - {0x87, 0x04}, // SPECIES_OLD_UNOWN_Y - {0x87, 0x04}, // SPECIES_OLD_UNOWN_Z - {0x66, 0x08}, // SPECIES_TREECKO - {0x87, 0x04}, // SPECIES_GROVYLE - {0x88, 0x00}, // SPECIES_SCEPTILE - {0x56, 0x08}, // SPECIES_TORCHIC - {0x88, 0x01}, // SPECIES_COMBUSKEN - {0x88, 0x00}, // SPECIES_BLAZIKEN - {0x56, 0x0c}, // SPECIES_MUDKIP - {0x67, 0x06}, // SPECIES_MARSHTOMP - {0x88, 0x00}, // SPECIES_SWAMPERT - {0x55, 0x0c}, // SPECIES_POOCHYENA - {0x87, 0x04}, // SPECIES_MIGHTYENA - {0x85, 0x0f}, // SPECIES_ZIGZAGOON - {0x78, 0x03}, // SPECIES_LINOONE - {0x45, 0x0e}, // SPECIES_WURMPLE - {0x75, 0x11}, // SPECIES_SILCOON - {0x86, 0x09}, // SPECIES_BEAUTIFLY - {0x74, 0x10}, // SPECIES_CASCOON - {0x86, 0x0f}, // SPECIES_DUSTOX - {0x65, 0x0e}, // SPECIES_LOTAD - {0x66, 0x09}, // SPECIES_LOMBRE - {0x88, 0x00}, // SPECIES_LUDICOLO - {0x46, 0x10}, // SPECIES_SEEDOT - {0x56, 0x08}, // SPECIES_NUZLEAF - {0x88, 0x02}, // SPECIES_SHIFTRY - {0x74, 0x12}, // SPECIES_NINCADA - {0x86, 0x0a}, // SPECIES_NINJASK - {0x66, 0x0a}, // SPECIES_SHEDINJA - {0x64, 0x10}, // SPECIES_TAILLOW - {0x87, 0x06}, // SPECIES_SWELLOW - {0x54, 0x10}, // SPECIES_SHROOMISH - {0x77, 0x04}, // SPECIES_BRELOOM - {0x68, 0x08}, // SPECIES_SPINDA - {0x84, 0x18}, // SPECIES_WINGULL - {0x77, 0x04}, // SPECIES_PELIPPER - {0x65, 0x0f}, // SPECIES_SURSKIT - {0x88, 0x01}, // SPECIES_MASQUERAIN - {0x75, 0x0f}, // SPECIES_WAILMER - {0x87, 0x0a}, // SPECIES_WAILORD - {0x66, 0x0b}, // SPECIES_SKITTY - {0x66, 0x08}, // SPECIES_DELCATTY - {0x67, 0x07}, // SPECIES_KECLEON - {0x55, 0x10}, // SPECIES_BALTOY - {0x78, 0x06}, // SPECIES_CLAYDOL - {0x56, 0x0c}, // SPECIES_NOSEPASS - {0x88, 0x02}, // SPECIES_TORKOAL - {0x66, 0x09}, // SPECIES_SABLEYE - {0x46, 0x0b}, // SPECIES_BARBOACH - {0x76, 0x09}, // SPECIES_WHISCASH - {0x46, 0x18}, // SPECIES_LUVDISC - {0x66, 0x0c}, // SPECIES_CORPHISH - {0x88, 0x01}, // SPECIES_CRAWDAUNT - {0x46, 0x0d}, // SPECIES_FEEBAS - {0x88, 0x00}, // SPECIES_MILOTIC - {0x67, 0x06}, // SPECIES_CARVANHA - {0x78, 0x03}, // SPECIES_SHARPEDO - {0x54, 0x10}, // SPECIES_TRAPINCH - {0x86, 0x0c}, // SPECIES_VIBRAVA - {0x88, 0x01}, // SPECIES_FLYGON - {0x65, 0x0c}, // SPECIES_MAKUHITA - {0x88, 0x01}, // SPECIES_HARIYAMA - {0x64, 0x12}, // SPECIES_ELECTRIKE - {0x67, 0x04}, // SPECIES_MANECTRIC - {0x65, 0x0f}, // SPECIES_NUMEL - {0x87, 0x09}, // SPECIES_CAMERUPT - {0x65, 0x10}, // SPECIES_SPHEAL - {0x86, 0x0a}, // SPECIES_SEALEO - {0x88, 0x01}, // SPECIES_WALREIN - {0x74, 0x10}, // SPECIES_CACNEA - {0x88, 0x00}, // SPECIES_CACTURNE - {0x56, 0x0b}, // SPECIES_SNORUNT - {0x76, 0x0a}, // SPECIES_GLALIE - {0x66, 0x09}, // SPECIES_LUNATONE - {0x88, 0x01}, // SPECIES_SOLROCK - {0x55, 0x0f}, // SPECIES_AZURILL - {0x46, 0x09}, // SPECIES_SPOINK - {0x77, 0x05}, // SPECIES_GRUMPIG - {0x56, 0x0e}, // SPECIES_PLUSLE - {0x66, 0x0c}, // SPECIES_MINUN - {0x76, 0x08}, // SPECIES_MAWILE - {0x65, 0x0c}, // SPECIES_MEDITITE - {0x68, 0x01}, // SPECIES_MEDICHAM - {0x76, 0x11}, // SPECIES_SWABLU - {0x88, 0x02}, // SPECIES_ALTARIA - {0x55, 0x0c}, // SPECIES_WYNAUT - {0x66, 0x0a}, // SPECIES_DUSKULL - {0x77, 0x05}, // SPECIES_DUSCLOPS - {0x76, 0x08}, // SPECIES_ROSELIA - {0x74, 0x12}, // SPECIES_SLAKOTH - {0x78, 0x00}, // SPECIES_VIGOROTH - {0x86, 0x08}, // SPECIES_SLAKING - {0x55, 0x12}, // SPECIES_GULPIN - {0x66, 0x08}, // SPECIES_SWALOT - {0x88, 0x00}, // SPECIES_TROPIUS - {0x55, 0x0e}, // SPECIES_WHISMUR - {0x78, 0x03}, // SPECIES_LOUDRED - {0x88, 0x01}, // SPECIES_EXPLOUD - {0x55, 0x0e}, // SPECIES_CLAMPERL - {0x78, 0x03}, // SPECIES_HUNTAIL - {0x86, 0x0b}, // SPECIES_GOREBYSS - {0x68, 0x00}, // SPECIES_ABSOL - {0x56, 0x0e}, // SPECIES_SHUPPET - {0x55, 0x0c}, // SPECIES_BANETTE - {0x77, 0x08}, // SPECIES_SEVIPER - {0x87, 0x05}, // SPECIES_ZANGOOSE - {0x77, 0x0b}, // SPECIES_RELICANTH - {0x43, 0x14}, // SPECIES_ARON - {0x75, 0x0d}, // SPECIES_LAIRON - {0x88, 0x00}, // SPECIES_AGGRON - {0x34, 0x11}, // SPECIES_CASTFORM - {0x66, 0x08}, // SPECIES_VOLBEAT - {0x56, 0x08}, // SPECIES_ILLUMISE - {0x67, 0x07}, // SPECIES_LILEEP - {0x78, 0x00}, // SPECIES_CRADILY - {0x66, 0x08}, // SPECIES_ANORITH - {0x88, 0x00}, // SPECIES_ARMALDO - {0x35, 0x0f}, // SPECIES_RALTS - {0x47, 0x06}, // SPECIES_KIRLIA - {0x78, 0x01}, // SPECIES_GARDEVOIR - {0x56, 0x0b}, // SPECIES_BAGON - {0x66, 0x09}, // SPECIES_SHELGON - {0x87, 0x04}, // SPECIES_SALAMENCE - {0x55, 0x0f}, // SPECIES_BELDUM - {0x87, 0x07}, // SPECIES_METANG - {0x87, 0x06}, // SPECIES_METAGROSS - {0x78, 0x04}, // SPECIES_REGIROCK - {0x88, 0x02}, // SPECIES_REGICE - {0x88, 0x03}, // SPECIES_REGISTEEL - {0x87, 0x04}, // SPECIES_KYOGRE - {0x88, 0x01}, // SPECIES_GROUDON - {0x88, 0x00}, // SPECIES_RAYQUAZA - {0x88, 0x01}, // SPECIES_LATIAS - {0x88, 0x02}, // SPECIES_LATIOS - {0x66, 0x0d}, // SPECIES_JIRACHI - {0x88, 0x01}, // SPECIES_DEOXYS - {0x37, 0x06}, // SPECIES_CHIMECHO - {0x33, 0x14}, // SPECIES_EGG - {0x34, 0x10}, // SPECIES_UNOWN_B - {0x44, 0x10}, // SPECIES_UNOWN_C - {0x44, 0x10}, // SPECIES_UNOWN_D - {0x44, 0x11}, // SPECIES_UNOWN_E - {0x44, 0x11}, // SPECIES_UNOWN_F - {0x35, 0x0e}, // SPECIES_UNOWN_G - {0x44, 0x10}, // SPECIES_UNOWN_H - {0x34, 0x10}, // SPECIES_UNOWN_I - {0x34, 0x11}, // SPECIES_UNOWN_J - {0x44, 0x11}, // SPECIES_UNOWN_K - {0x34, 0x13}, // SPECIES_UNOWN_L - {0x44, 0x13}, // SPECIES_UNOWN_M - {0x43, 0x14}, // SPECIES_UNOWN_N - {0x44, 0x10}, // SPECIES_UNOWN_O - {0x34, 0x13}, // SPECIES_UNOWN_P - {0x43, 0x15}, // SPECIES_UNOWN_Q - {0x34, 0x13}, // SPECIES_UNOWN_R - {0x45, 0x0c}, // SPECIES_UNOWN_S - {0x34, 0x12}, // SPECIES_UNOWN_T - {0x44, 0x12}, // SPECIES_UNOWN_U - {0x44, 0x12}, // SPECIES_UNOWN_V - {0x44, 0x13}, // SPECIES_UNOWN_W - {0x33, 0x15}, // SPECIES_UNOWN_X - {0x34, 0x11}, // SPECIES_UNOWN_Y - {0x34, 0x10}, // SPECIES_UNOWN_Z - {0x35, 0x0f}, // SPECIES_UNOWN_EMARK - {0x35, 0x0d}, // SPECIES_UNOWN_QMARK + [SPECIES_NONE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_BULBASAUR] = + { + .coords = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_IVYSAUR] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_VENUSAUR] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_CHARMANDER] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_CHARMELEON] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_CHARIZARD] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SQUIRTLE] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_WARTORTLE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_BLASTOISE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CATERPIE] = + { + .coords = 0x45, + .y_offset = 0x10, + }, + [SPECIES_METAPOD] = + { + .coords = 0x54, + .y_offset = 0x14, + }, + [SPECIES_BUTTERFREE] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_WEEDLE] = + { + .coords = 0x54, + .y_offset = 0x12, + }, + [SPECIES_KAKUNA] = + { + .coords = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_BEEDRILL] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_PIDGEY] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_PIDGEOTTO] = + { + .coords = 0x67, + .y_offset = 0x0b, + }, + [SPECIES_PIDGEOT] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_RATTATA] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_RATICATE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SPEAROW] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_FEAROW] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_EKANS] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_ARBOK] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_PIKACHU] = + { + .coords = 0x67, + .y_offset = 0x09, + }, + [SPECIES_RAICHU] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_SANDSHREW] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_SANDSLASH] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_NIDORAN_F] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_NIDORINA] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_NIDOQUEEN] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_NIDORAN_M] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_NIDORINO] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_NIDOKING] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_CLEFAIRY] = + { + .coords = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLEFABLE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_VULPIX] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_NINETALES] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_JIGGLYPUFF] = + { + .coords = 0x45, + .y_offset = 0x10, + }, + [SPECIES_WIGGLYTUFF] = + { + .coords = 0x67, + .y_offset = 0x08, + }, + [SPECIES_ZUBAT] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_GOLBAT] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_ODDISH] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_GLOOM] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_VILEPLUME] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_PARAS] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_PARASECT] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_VENONAT] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_VENOMOTH] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_DIGLETT] = + { + .coords = 0x54, + .y_offset = 0x12, + }, + [SPECIES_DUGTRIO] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_MEOWTH] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_PERSIAN] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_PSYDUCK] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_GOLDUCK] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_MANKEY] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_PRIMEAPE] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_GROWLITHE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_ARCANINE] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_POLIWAG] = + { + .coords = 0x74, + .y_offset = 0x13, + }, + [SPECIES_POLIWHIRL] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_POLIWRATH] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_ABRA] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_KADABRA] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ALAKAZAM] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_MACHOP] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_MACHOKE] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_MACHAMP] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_BELLSPROUT] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_WEEPINBELL] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_VICTREEBEL] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_TENTACOOL] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_TENTACRUEL] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_GEODUDE] = + { + .coords = 0x54, + .y_offset = 0x12, + }, + [SPECIES_GRAVELER] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_GOLEM] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_PONYTA] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_RAPIDASH] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SLOWPOKE] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SLOWBRO] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_MAGNEMITE] = + { + .coords = 0x43, + .y_offset = 0x15, + }, + [SPECIES_MAGNETON] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_FARFETCHD] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_DODUO] = + { + .coords = 0x57, + .y_offset = 0x05, + }, + [SPECIES_DODRIO] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SEEL] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_DEWGONG] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_GRIMER] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_MUK] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SHELLDER] = + { + .coords = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLOYSTER] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_GASTLY] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_HAUNTER] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_GENGAR] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ONIX] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_DROWZEE] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_HYPNO] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_KRABBY] = + { + .coords = 0x65, + .y_offset = 0x0d, + }, + [SPECIES_KINGLER] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_VOLTORB] = + { + .coords = 0x44, + .y_offset = 0x13, + }, + [SPECIES_ELECTRODE] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_EXEGGCUTE] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_EXEGGUTOR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CUBONE] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_MAROWAK] = + { + .coords = 0x76, + .y_offset = 0x0b, + }, + [SPECIES_HITMONLEE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_HITMONCHAN] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_LICKITUNG] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_KOFFING] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_WEEZING] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_RHYHORN] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_RHYDON] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_CHANSEY] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_TANGELA] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_KANGASKHAN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HORSEA] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_SEADRA] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_GOLDEEN] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_SEAKING] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_STARYU] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_STARMIE] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_MR_MIME] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_SCYTHER] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_JYNX] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_ELECTABUZZ] = + { + .coords = 0x78, + .y_offset = 0x02, + }, + [SPECIES_MAGMAR] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_PINSIR] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_TAUROS] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_MAGIKARP] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_GYARADOS] = + { + .coords = 0x88, + .y_offset = 0x08, + }, + [SPECIES_LAPRAS] = + { + .coords = 0x85, + .y_offset = 0x0d, + }, + [SPECIES_DITTO] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_EEVEE] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_VAPOREON] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_JOLTEON] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_FLAREON] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_PORYGON] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_OMANYTE] = + { + .coords = 0x45, + .y_offset = 0x0f, + }, + [SPECIES_OMASTAR] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_KABUTO] = + { + .coords = 0x54, + .y_offset = 0x11, + }, + [SPECIES_KABUTOPS] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_AERODACTYL] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SNORLAX] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_ARTICUNO] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_ZAPDOS] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_MOLTRES] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_DRATINI] = + { + .coords = 0x75, + .y_offset = 0x0e, + }, + [SPECIES_DRAGONAIR] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_DRAGONITE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MEWTWO] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MEW] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_CHIKORITA] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_BAYLEEF] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_MEGANIUM] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CYNDAQUIL] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_QUILAVA] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_TYPHLOSION] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_TOTODILE] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_CROCONAW] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_FERALIGATR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SENTRET] = + { + .coords = 0x47, + .y_offset = 0x04, + }, + [SPECIES_FURRET] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_HOOTHOOT] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_NOCTOWL] = + { + .coords = 0x58, + .y_offset = 0x03, + }, + [SPECIES_LEDYBA] = + { + .coords = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_LEDIAN] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_SPINARAK] = + { + .coords = 0x54, + .y_offset = 0x13, + }, + [SPECIES_ARIADOS] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_CROBAT] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CHINCHOU] = + { + .coords = 0x75, + .y_offset = 0x10, + }, + [SPECIES_LANTURN] = + { + .coords = 0x87, + .y_offset = 0x0b, + }, + [SPECIES_PICHU] = + { + .coords = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_CLEFFA] = + { + .coords = 0x44, + .y_offset = 0x14, + }, + [SPECIES_IGGLYBUFF] = + { + .coords = 0x44, + .y_offset = 0x12, + }, + [SPECIES_TOGEPI] = + { + .coords = 0x34, + .y_offset = 0x14, + }, + [SPECIES_TOGETIC] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_NATU] = + { + .coords = 0x44, + .y_offset = 0x14, + }, + [SPECIES_XATU] = + { + .coords = 0x47, + .y_offset = 0x07, + }, + [SPECIES_MAREEP] = + { + .coords = 0x55, + .y_offset = 0x10, + }, + [SPECIES_FLAAFFY] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_AMPHAROS] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_BELLOSSOM] = + { + .coords = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_MARILL] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_AZUMARILL] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_SUDOWOODO] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_POLITOED] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_HOPPIP] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_SKIPLOOM] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_JUMPLUFF] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_AIPOM] = + { + .coords = 0x58, + .y_offset = 0x03, + }, + [SPECIES_SUNKERN] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_SUNFLORA] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_YANMA] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_WOOPER] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_QUAGSIRE] = + { + .coords = 0x77, + .y_offset = 0x07, + }, + [SPECIES_ESPEON] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_UMBREON] = + { + .coords = 0x67, + .y_offset = 0x08, + }, + [SPECIES_MURKROW] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_SLOWKING] = + { + .coords = 0x58, + .y_offset = 0x01, + }, + [SPECIES_MISDREAVUS] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_UNOWN] = + { + .coords = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_WOBBUFFET] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_GIRAFARIG] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_PINECO] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_FORRETRESS] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_DUNSPARCE] = + { + .coords = 0x74, + .y_offset = 0x11, + }, + [SPECIES_GLIGAR] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_STEELIX] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SNUBBULL] = + { + .coords = 0x55, + .y_offset = 0x0d, + }, + [SPECIES_GRANBULL] = + { + .coords = 0x57, + .y_offset = 0x06, + }, + [SPECIES_QWILFISH] = + { + .coords = 0x56, + .y_offset = 0x0a, + }, + [SPECIES_SCIZOR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SHUCKLE] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_HERACROSS] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_SNEASEL] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_TEDDIURSA] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_URSARING] = + { + .coords = 0x78, + .y_offset = 0x01, + }, + [SPECIES_SLUGMA] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_MAGCARGO] = + { + .coords = 0x57, + .y_offset = 0x0d, + }, + [SPECIES_SWINUB] = + { + .coords = 0x43, + .y_offset = 0x14, + }, + [SPECIES_PILOSWINE] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_CORSOLA] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_REMORAID] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_OCTILLERY] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DELIBIRD] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_MANTINE] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_SKARMORY] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HOUNDOUR] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_HOUNDOOM] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_KINGDRA] = + { + .coords = 0x78, + .y_offset = 0x04, + }, + [SPECIES_PHANPY] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_DONPHAN] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_PORYGON2] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_STANTLER] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SMEARGLE] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_TYROGUE] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_HITMONTOP] = + { + .coords = 0x67, + .y_offset = 0x05, + }, + [SPECIES_SMOOCHUM] = + { + .coords = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_ELEKID] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_MAGBY] = + { + .coords = 0x45, + .y_offset = 0x0d, + }, + [SPECIES_MILTANK] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_BLISSEY] = + { + .coords = 0x77, + .y_offset = 0x06, + }, + [SPECIES_RAIKOU] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_ENTEI] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SUICUNE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LARVITAR] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_PUPITAR] = + { + .coords = 0x56, + .y_offset = 0x09, + }, + [SPECIES_TYRANITAR] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LUGIA] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_HO_OH] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CELEBI] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_OLD_UNOWN_B] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_C] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_D] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_E] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_F] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_G] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_H] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_I] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_J] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_K] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_L] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_M] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_N] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_O] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_P] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_Q] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_R] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_S] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_T] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_U] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_V] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_W] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_X] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_Y] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_OLD_UNOWN_Z] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_TREECKO] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_GROVYLE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_SCEPTILE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_TORCHIC] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_COMBUSKEN] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_BLAZIKEN] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_MUDKIP] = + { + .coords = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_MARSHTOMP] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_SWAMPERT] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_POOCHYENA] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_MIGHTYENA] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_ZIGZAGOON] = + { + .coords = 0x85, + .y_offset = 0x0f, + }, + [SPECIES_LINOONE] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_WURMPLE] = + { + .coords = 0x45, + .y_offset = 0x0e, + }, + [SPECIES_SILCOON] = + { + .coords = 0x75, + .y_offset = 0x11, + }, + [SPECIES_BEAUTIFLY] = + { + .coords = 0x86, + .y_offset = 0x09, + }, + [SPECIES_CASCOON] = + { + .coords = 0x74, + .y_offset = 0x10, + }, + [SPECIES_DUSTOX] = + { + .coords = 0x86, + .y_offset = 0x0f, + }, + [SPECIES_LOTAD] = + { + .coords = 0x65, + .y_offset = 0x0e, + }, + [SPECIES_LOMBRE] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_LUDICOLO] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SEEDOT] = + { + .coords = 0x46, + .y_offset = 0x10, + }, + [SPECIES_NUZLEAF] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_SHIFTRY] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_NINCADA] = + { + .coords = 0x74, + .y_offset = 0x12, + }, + [SPECIES_NINJASK] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_SHEDINJA] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_TAILLOW] = + { + .coords = 0x64, + .y_offset = 0x10, + }, + [SPECIES_SWELLOW] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_SHROOMISH] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_BRELOOM] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SPINDA] = + { + .coords = 0x68, + .y_offset = 0x08, + }, + [SPECIES_WINGULL] = + { + .coords = 0x84, + .y_offset = 0x18, + }, + [SPECIES_PELIPPER] = + { + .coords = 0x77, + .y_offset = 0x04, + }, + [SPECIES_SURSKIT] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_MASQUERAIN] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_WAILMER] = + { + .coords = 0x75, + .y_offset = 0x0f, + }, + [SPECIES_WAILORD] = + { + .coords = 0x87, + .y_offset = 0x0a, + }, + [SPECIES_SKITTY] = + { + .coords = 0x66, + .y_offset = 0x0b, + }, + [SPECIES_DELCATTY] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_KECLEON] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_BALTOY] = + { + .coords = 0x55, + .y_offset = 0x10, + }, + [SPECIES_CLAYDOL] = + { + .coords = 0x78, + .y_offset = 0x06, + }, + [SPECIES_NOSEPASS] = + { + .coords = 0x56, + .y_offset = 0x0c, + }, + [SPECIES_TORKOAL] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_SABLEYE] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_BARBOACH] = + { + .coords = 0x46, + .y_offset = 0x0b, + }, + [SPECIES_WHISCASH] = + { + .coords = 0x76, + .y_offset = 0x09, + }, + [SPECIES_LUVDISC] = + { + .coords = 0x46, + .y_offset = 0x18, + }, + [SPECIES_CORPHISH] = + { + .coords = 0x66, + .y_offset = 0x0c, + }, + [SPECIES_CRAWDAUNT] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_FEEBAS] = + { + .coords = 0x46, + .y_offset = 0x0d, + }, + [SPECIES_MILOTIC] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CARVANHA] = + { + .coords = 0x67, + .y_offset = 0x06, + }, + [SPECIES_SHARPEDO] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_TRAPINCH] = + { + .coords = 0x54, + .y_offset = 0x10, + }, + [SPECIES_VIBRAVA] = + { + .coords = 0x86, + .y_offset = 0x0c, + }, + [SPECIES_FLYGON] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_MAKUHITA] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_HARIYAMA] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_ELECTRIKE] = + { + .coords = 0x64, + .y_offset = 0x12, + }, + [SPECIES_MANECTRIC] = + { + .coords = 0x67, + .y_offset = 0x04, + }, + [SPECIES_NUMEL] = + { + .coords = 0x65, + .y_offset = 0x0f, + }, + [SPECIES_CAMERUPT] = + { + .coords = 0x87, + .y_offset = 0x09, + }, + [SPECIES_SPHEAL] = + { + .coords = 0x65, + .y_offset = 0x10, + }, + [SPECIES_SEALEO] = + { + .coords = 0x86, + .y_offset = 0x0a, + }, + [SPECIES_WALREIN] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CACNEA] = + { + .coords = 0x74, + .y_offset = 0x10, + }, + [SPECIES_CACTURNE] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_SNORUNT] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_GLALIE] = + { + .coords = 0x76, + .y_offset = 0x0a, + }, + [SPECIES_LUNATONE] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SOLROCK] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_AZURILL] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_SPOINK] = + { + .coords = 0x46, + .y_offset = 0x09, + }, + [SPECIES_GRUMPIG] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_PLUSLE] = + { + .coords = 0x56, + .y_offset = 0x0e, + }, + [SPECIES_MINUN] = + { + .coords = 0x66, + .y_offset = 0x0c, + }, + [SPECIES_MAWILE] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_MEDITITE] = + { + .coords = 0x65, + .y_offset = 0x0c, + }, + [SPECIES_MEDICHAM] = + { + .coords = 0x68, + .y_offset = 0x01, + }, + [SPECIES_SWABLU] = + { + .coords = 0x76, + .y_offset = 0x11, + }, + [SPECIES_ALTARIA] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_WYNAUT] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_DUSKULL] = + { + .coords = 0x66, + .y_offset = 0x0a, + }, + [SPECIES_DUSCLOPS] = + { + .coords = 0x77, + .y_offset = 0x05, + }, + [SPECIES_ROSELIA] = + { + .coords = 0x76, + .y_offset = 0x08, + }, + [SPECIES_SLAKOTH] = + { + .coords = 0x74, + .y_offset = 0x12, + }, + [SPECIES_VIGOROTH] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_SLAKING] = + { + .coords = 0x86, + .y_offset = 0x08, + }, + [SPECIES_GULPIN] = + { + .coords = 0x55, + .y_offset = 0x12, + }, + [SPECIES_SWALOT] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_TROPIUS] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_WHISMUR] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_LOUDRED] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_EXPLOUD] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CLAMPERL] = + { + .coords = 0x55, + .y_offset = 0x0e, + }, + [SPECIES_HUNTAIL] = + { + .coords = 0x78, + .y_offset = 0x03, + }, + [SPECIES_GOREBYSS] = + { + .coords = 0x86, + .y_offset = 0x0b, + }, + [SPECIES_ABSOL] = + { + .coords = 0x68, + .y_offset = 0x00, + }, + [SPECIES_SHUPPET] = + { + .coords = 0x56, + .y_offset = 0x0e, + }, + [SPECIES_BANETTE] = + { + .coords = 0x55, + .y_offset = 0x0c, + }, + [SPECIES_SEVIPER] = + { + .coords = 0x77, + .y_offset = 0x08, + }, + [SPECIES_ZANGOOSE] = + { + .coords = 0x87, + .y_offset = 0x05, + }, + [SPECIES_RELICANTH] = + { + .coords = 0x77, + .y_offset = 0x0b, + }, + [SPECIES_ARON] = + { + .coords = 0x43, + .y_offset = 0x14, + }, + [SPECIES_LAIRON] = + { + .coords = 0x75, + .y_offset = 0x0d, + }, + [SPECIES_AGGRON] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_CASTFORM] = + { + .coords = 0x34, + .y_offset = 0x11, + }, + [SPECIES_VOLBEAT] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ILLUMISE] = + { + .coords = 0x56, + .y_offset = 0x08, + }, + [SPECIES_LILEEP] = + { + .coords = 0x67, + .y_offset = 0x07, + }, + [SPECIES_CRADILY] = + { + .coords = 0x78, + .y_offset = 0x00, + }, + [SPECIES_ANORITH] = + { + .coords = 0x66, + .y_offset = 0x08, + }, + [SPECIES_ARMALDO] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_RALTS] = + { + .coords = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_KIRLIA] = + { + .coords = 0x47, + .y_offset = 0x06, + }, + [SPECIES_GARDEVOIR] = + { + .coords = 0x78, + .y_offset = 0x01, + }, + [SPECIES_BAGON] = + { + .coords = 0x56, + .y_offset = 0x0b, + }, + [SPECIES_SHELGON] = + { + .coords = 0x66, + .y_offset = 0x09, + }, + [SPECIES_SALAMENCE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_BELDUM] = + { + .coords = 0x55, + .y_offset = 0x0f, + }, + [SPECIES_METANG] = + { + .coords = 0x87, + .y_offset = 0x07, + }, + [SPECIES_METAGROSS] = + { + .coords = 0x87, + .y_offset = 0x06, + }, + [SPECIES_REGIROCK] = + { + .coords = 0x78, + .y_offset = 0x04, + }, + [SPECIES_REGICE] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_REGISTEEL] = + { + .coords = 0x88, + .y_offset = 0x03, + }, + [SPECIES_KYOGRE] = + { + .coords = 0x87, + .y_offset = 0x04, + }, + [SPECIES_GROUDON] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_RAYQUAZA] = + { + .coords = 0x88, + .y_offset = 0x00, + }, + [SPECIES_LATIAS] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_LATIOS] = + { + .coords = 0x88, + .y_offset = 0x02, + }, + [SPECIES_JIRACHI] = + { + .coords = 0x66, + .y_offset = 0x0d, + }, + [SPECIES_DEOXYS] = + { + .coords = 0x88, + .y_offset = 0x01, + }, + [SPECIES_CHIMECHO] = + { + .coords = 0x37, + .y_offset = 0x06, + }, + [SPECIES_EGG] = + { + .coords = 0x33, + .y_offset = 0x14, + }, + [SPECIES_UNOWN_B] = + { + .coords = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_C] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_D] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_E] = + { + .coords = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_F] = + { + .coords = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_G] = + { + .coords = 0x35, + .y_offset = 0x0e, + }, + [SPECIES_UNOWN_H] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_I] = + { + .coords = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_J] = + { + .coords = 0x34, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_K] = + { + .coords = 0x44, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_L] = + { + .coords = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_M] = + { + .coords = 0x44, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_N] = + { + .coords = 0x43, + .y_offset = 0x14, + }, + [SPECIES_UNOWN_O] = + { + .coords = 0x44, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_P] = + { + .coords = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_Q] = + { + .coords = 0x43, + .y_offset = 0x15, + }, + [SPECIES_UNOWN_R] = + { + .coords = 0x34, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_S] = + { + .coords = 0x45, + .y_offset = 0x0c, + }, + [SPECIES_UNOWN_T] = + { + .coords = 0x34, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_U] = + { + .coords = 0x44, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_V] = + { + .coords = 0x44, + .y_offset = 0x12, + }, + [SPECIES_UNOWN_W] = + { + .coords = 0x44, + .y_offset = 0x13, + }, + [SPECIES_UNOWN_X] = + { + .coords = 0x33, + .y_offset = 0x15, + }, + [SPECIES_UNOWN_Y] = + { + .coords = 0x34, + .y_offset = 0x11, + }, + [SPECIES_UNOWN_Z] = + { + .coords = 0x34, + .y_offset = 0x10, + }, + [SPECIES_UNOWN_EMARK] = + { + .coords = 0x35, + .y_offset = 0x0f, + }, + [SPECIES_UNOWN_QMARK] = + { + .coords = 0x35, + .y_offset = 0x0d, + }, }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index ff0b680dd..8de5183ec 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -7,7 +7,7 @@ const u8 gPokeBallItemDescription[] = _("A tool used for\ncatching wild\nPOKéMO const u8 gSafariBallItemDescription[] = _("A special BALL that\nis used only in the\nSAFARI ZONE."); const u8 gNetBallItemDescription[] = _("A BALL that works\nwell on WATER- and\nBUG-type POKéMON."); const u8 gDiveBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\non the ocean floor."); -const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); +const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\ncaught before."); const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns."); const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly."); diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 3642f66b1..5818186fe 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -1,1421 +1,1421 @@ static const u8 sNullDescription[] = _( - ""); + ""); static const u8 sPoundDescription[] = _( - "Pounds the foe with\n" - "forelegs or tail."); + "Pounds the foe with\n" + "forelegs or tail."); static const u8 sKarateChopDescription[] = _( - "A chopping attack with a\n" - "high critical-hit ratio."); + "A chopping attack with a\n" + "high critical-hit ratio."); static const u8 sDoubleSlapDescription[] = _( - "Repeatedly slaps the foe\n" - "2 to 5 times."); + "Repeatedly slaps the foe\n" + "2 to 5 times."); static const u8 sCometPunchDescription[] = _( - "Repeatedly punches the foe\n" - "2 to 5 times."); + "Repeatedly punches the foe\n" + "2 to 5 times."); static const u8 sMegaPunchDescription[] = _( - "A strong punch thrown with\n" - "incredible power."); + "A strong punch thrown with\n" + "incredible power."); static const u8 sPayDayDescription[] = _( - "Throws coins at the foe.\n" - "Money is recovered after."); + "Throws coins at the foe.\n" + "Money is recovered after."); static const u8 sFirePunchDescription[] = _( - "A fiery punch that may burn\n" - "the foe."); + "A fiery punch that may burn\n" + "the foe."); static const u8 sIcePunchDescription[] = _( - "An icy punch that may\n" - "freeze the foe."); + "An icy punch that may\n" + "freeze the foe."); static const u8 sThunderPunchDescription[] = _( - "An electrified punch that\n" - "may paralyze the foe."); + "An electrified punch that\n" + "may paralyze the foe."); static const u8 sScratchDescription[] = _( - "Scratches the foe with\n" - "sharp claws."); + "Scratches the foe with\n" + "sharp claws."); static const u8 sViceGripDescription[] = _( - "Grips the foe with large and\n" - "powerful pincers."); + "Grips the foe with large and\n" + "powerful pincers."); static const u8 sGuillotineDescription[] = _( - "A powerful pincer attack\n" - "that may cause fainting."); + "A powerful pincer attack\n" + "that may cause fainting."); static const u8 sRazorWindDescription[] = _( - "A 2-turn move that strikes\n" - "the foe on the 2nd turn."); + "A 2-turn move that strikes\n" + "the foe on the 2nd turn."); static const u8 sSwordsDanceDescription[] = _( - "A fighting dance that\n" - "sharply raises ATTACK."); + "A fighting dance that\n" + "sharply raises ATTACK."); static const u8 sCutDescription[] = _( - "Cuts the foe with sharp\n" - "scythes, claws, etc."); + "Cuts the foe with sharp\n" + "scythes, claws, etc."); static const u8 sGustDescription[] = _( - "Strikes the foe with a gust\n" - "of wind whipped up by wings."); + "Strikes the foe with a gust\n" + "of wind whipped up by wings."); static const u8 sWingAttackDescription[] = _( - "Strikes the foe with wings\n" - "spread wide."); + "Strikes the foe with wings\n" + "spread wide."); static const u8 sWhirlwindDescription[] = _( - "Blows away the foe with\n" - "wind and ends the battle."); + "Blows away the foe with\n" + "wind and ends the battle."); static const u8 sFlyDescription[] = _( - "Flies up on the first turn,\n" - "then strikes the next turn."); + "Flies up on the first turn,\n" + "then strikes the next turn."); static const u8 sBindDescription[] = _( - "Binds and squeezes the foe\n" - "for 2 to 5 turns."); + "Binds and squeezes the foe\n" + "for 2 to 5 turns."); static const u8 sSlamDescription[] = _( - "Slams the foe with a long\n" - "tail, vine, etc."); + "Slams the foe with a long\n" + "tail, vine, etc."); static const u8 sVineWhipDescription[] = _( - "Strikes the foe with\n" - "slender, whiplike vines."); + "Strikes the foe with\n" + "slender, whiplike vines."); static const u8 sStompDescription[] = _( - "Stomps the enemy with a big\n" - "foot. May cause flinching."); + "Stomps the enemy with a big\n" + "foot. May cause flinching."); static const u8 sDoubleKickDescription[] = _( - "A double-kicking attack\n" - "that strikes the foe twice."); + "A double-kicking attack\n" + "that strikes the foe twice."); static const u8 sMegaKickDescription[] = _( - "An extremely powerful kick\n" - "with intense force."); + "An extremely powerful kick\n" + "with intense force."); static const u8 sJumpKickDescription[] = _( - "A strong jumping kick. May\n" - "miss and hurt the kicker."); + "A strong jumping kick. May\n" + "miss and hurt the kicker."); static const u8 sRollingKickDescription[] = _( - "A fast kick delivered from\n" - "a rapid spin."); + "A fast kick delivered from\n" + "a rapid spin."); static const u8 sSandAttackDescription[] = _( - "Reduces the foe’s accuracy\n" - "by hurling sand in its face."); + "Reduces the foe’s accuracy\n" + "by hurling sand in its face."); static const u8 sHeadbuttDescription[] = _( - "A ramming attack that may\n" - "cause flinching."); + "A ramming attack that may\n" + "cause flinching."); static const u8 sHornAttackDescription[] = _( - "Jabs the foe with sharp\n" - "horns."); + "Jabs the foe with sharp\n" + "horns."); static const u8 sFuryAttackDescription[] = _( - "Jabs the foe 2 to 5 times\n" - "with sharp horns, etc."); + "Jabs the foe 2 to 5 times\n" + "with sharp horns, etc."); static const u8 sHornDrillDescription[] = _( - "A one-hit KO attack that\n" - "uses a horn like a drill."); + "A one-hit KO attack that\n" + "uses a horn like a drill."); static const u8 sTackleDescription[] = _( - "Charges the foe with a full-\n" - "body tackle."); + "Charges the foe with a full-\n" + "body tackle."); static const u8 sBodySlamDescription[] = _( - "A full-body slam that may\n" - "cause paralysis."); + "A full-body slam that may\n" + "cause paralysis."); static const u8 sWrapDescription[] = _( - "Wraps and squeezes the foe\n" - "2 to 5 times with vines, etc."); + "Wraps and squeezes the foe\n" + "2 to 5 times with vines, etc."); static const u8 sTakeDownDescription[] = _( - "A reckless charge attack\n" - "that also hurts the user."); + "A reckless charge attack\n" + "that also hurts the user."); static const u8 sThrashDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); + "A rampage of 2 to 3 turns\n" + "that confuses the user."); static const u8 sDoubleEdgeDescription[] = _( - "A life-risking tackle that\n" - "also hurts the user."); + "A life-risking tackle that\n" + "also hurts the user."); static const u8 sTailWhipDescription[] = _( - "Wags the tail to lower the\n" - "foe’s DEFENSE."); + "Wags the tail to lower the\n" + "foe’s DEFENSE."); static const u8 sPoisonStingDescription[] = _( - "A toxic attack with barbs,\n" - "etc., that may poison."); + "A toxic attack with barbs,\n" + "etc., that may poison."); static const u8 sTwineedleDescription[] = _( - "Stingers on the forelegs\n" - "jab the foe twice."); + "Stingers on the forelegs\n" + "jab the foe twice."); static const u8 sPinMissileDescription[] = _( - "Sharp pins are fired to\n" - "strike 2 to 5 times."); + "Sharp pins are fired to\n" + "strike 2 to 5 times."); static const u8 sLeerDescription[] = _( - "Frightens the foe with a\n" - "leer to lower DEFENSE."); + "Frightens the foe with a\n" + "leer to lower DEFENSE."); static const u8 sBiteDescription[] = _( - "Bites with vicious fangs.\n" - "May cause flinching."); + "Bites with vicious fangs.\n" + "May cause flinching."); static const u8 sGrowlDescription[] = _( - "Growls cutely to reduce the\n" - "foe’s ATTACK."); + "Growls cutely to reduce the\n" + "foe’s ATTACK."); static const u8 sRoarDescription[] = _( - "Makes the foe flee to end\n" - "the battle."); + "Makes the foe flee to end\n" + "the battle."); static const u8 sSingDescription[] = _( - "A soothing song lulls the\n" - "foe into a deep slumber."); + "A soothing song lulls the\n" + "foe into a deep slumber."); static const u8 sSupersonicDescription[] = _( - "Emits bizarre sound waves\n" - "that may confuse the foe."); + "Emits bizarre sound waves\n" + "that may confuse the foe."); static const u8 sSonicBoomDescription[] = _( - "Launches shock waves that\n" - "always inflict 20 HP damage."); + "Launches shock waves that\n" + "always inflict 20 HP damage."); static const u8 sDisableDescription[] = _( - "Psychically disables one of\n" - "the foe’s moves."); + "Psychically disables one of\n" + "the foe’s moves."); static const u8 sAcidDescription[] = _( - "Sprays a hide-melting acid.\n" - "May lower DEFENSE."); + "Sprays a hide-melting acid.\n" + "May lower DEFENSE."); static const u8 sEmberDescription[] = _( - "A weak fire attack that may\n" - "inflict a burn."); + "A weak fire attack that may\n" + "inflict a burn."); static const u8 sFlamethrowerDescription[] = _( - "A powerful fire attack that\n" - "may inflict a burn."); + "A powerful fire attack that\n" + "may inflict a burn."); static const u8 sMistDescription[] = _( - "Creates a mist that stops\n" - "reduction of abilities."); + "Creates a mist that stops\n" + "reduction of abilities."); static const u8 sWaterGunDescription[] = _( - "Squirts water to attack\n" - "the foe."); + "Squirts water to attack\n" + "the foe."); static const u8 sHydroPumpDescription[] = _( - "Blasts water at high power\n" - "to strike the foe."); + "Blasts water at high power\n" + "to strike the foe."); static const u8 sSurfDescription[] = _( - "Creates a huge wave, then\n" - "crashes it down on the foe."); + "Creates a huge wave, then\n" + "crashes it down on the foe."); static const u8 sIceBeamDescription[] = _( - "Blasts the foe with an icy\n" - "beam that may freeze it."); + "Blasts the foe with an icy\n" + "beam that may freeze it."); static const u8 sBlizzardDescription[] = _( - "Hits the foe with an icy\n" - "storm that may freeze it."); + "Hits the foe with an icy\n" + "storm that may freeze it."); static const u8 sPsybeamDescription[] = _( - "Fires a peculiar ray that\n" - "may confuse the foe."); + "Fires a peculiar ray that\n" + "may confuse the foe."); static const u8 sBubbleBeamDescription[] = _( - "Forcefully sprays bubbles\n" - "that may lower SPEED."); + "Forcefully sprays bubbles\n" + "that may lower SPEED."); static const u8 sAuroraBeamDescription[] = _( - "Fires a rainbow-colored\n" - "beam that may lower ATTACK."); + "Fires a rainbow-colored\n" + "beam that may lower ATTACK."); static const u8 sHyperBeamDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); + "Powerful, but leaves the\n" + "user immobile the next turn."); static const u8 sPeckDescription[] = _( - "Attacks the foe with a\n" - "jabbing beak, etc."); + "Attacks the foe with a\n" + "jabbing beak, etc."); static const u8 sDrillPeckDescription[] = _( - "A corkscrewing attack with\n" - "the beak acting as a drill."); + "A corkscrewing attack with\n" + "the beak acting as a drill."); static const u8 sSubmissionDescription[] = _( - "A reckless body slam that\n" - "also hurts the user."); + "A reckless body slam that\n" + "also hurts the user."); static const u8 sLowKickDescription[] = _( - "A kick that inflicts more\n" - "damage on heavier foes."); + "A kick that inflicts more\n" + "damage on heavier foes."); static const u8 sCounterDescription[] = _( - "Retaliates any physical hit\n" - "with double the power."); + "Retaliates any physical hit\n" + "with double the power."); static const u8 sSeismicTossDescription[] = _( - "Inflicts damage identical\n" - "to the user’s level."); + "Inflicts damage identical\n" + "to the user’s level."); static const u8 sStrengthDescription[] = _( - "Builds enormous power,\n" - "then slams the foe."); + "Builds enormous power,\n" + "then slams the foe."); static const u8 sAbsorbDescription[] = _( - "An attack that absorbs\n" - "half the damage inflicted."); + "An attack that absorbs\n" + "half the damage inflicted."); static const u8 sMegaDrainDescription[] = _( - "An attack that absorbs\n" - "half the damage inflicted."); + "An attack that absorbs\n" + "half the damage inflicted."); static const u8 sLeechSeedDescription[] = _( - "Plants a seed on the foe to\n" - "steal HP on every turn."); + "Plants a seed on the foe to\n" + "steal HP on every turn."); static const u8 sGrowthDescription[] = _( - "Forces the body to grow\n" - "and heightens SP. ATK."); + "Forces the body to grow\n" + "and heightens SP. ATK."); static const u8 sRazorLeafDescription[] = _( - "Cuts the enemy with leaves.\n" - "High critical-hit ratio."); + "Cuts the enemy with leaves.\n" + "High critical-hit ratio."); static const u8 sSolarBeamDescription[] = _( - "Absorbs light in one turn,\n" - "then attacks next turn."); + "Absorbs light in one turn,\n" + "then attacks next turn."); static const u8 sPoisonPowderDescription[] = _( - "Scatters a toxic powder\n" - "that may poison the foe."); + "Scatters a toxic powder\n" + "that may poison the foe."); static const u8 sStunSporeDescription[] = _( - "Scatters a powder that may\n" - "paralyze the foe."); + "Scatters a powder that may\n" + "paralyze the foe."); static const u8 sSleepPowderDescription[] = _( - "Scatters a powder that may\n" - "cause the foe to sleep."); + "Scatters a powder that may\n" + "cause the foe to sleep."); static const u8 sPetalDanceDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); + "A rampage of 2 to 3 turns\n" + "that confuses the user."); static const u8 sStringShotDescription[] = _( - "Binds the foe with string\n" - "to reduce its SPEED."); + "Binds the foe with string\n" + "to reduce its SPEED."); static const u8 sDragonRageDescription[] = _( - "Launches shock waves that\n" - "always inflict 40 HP damage."); + "Launches shock waves that\n" + "always inflict 40 HP damage."); static const u8 sFireSpinDescription[] = _( - "Traps the foe in a ring of\n" - "fire for 2 to 5 turns."); + "Traps the foe in a ring of\n" + "fire for 2 to 5 turns."); static const u8 sThunderShockDescription[] = _( - "An electrical attack that\n" - "may paralyze the foe."); + "An electrical attack that\n" + "may paralyze the foe."); static const u8 sThunderboltDescription[] = _( - "A strong electrical attack\n" - "that may paralyze the foe."); + "A strong electrical attack\n" + "that may paralyze the foe."); static const u8 sThunderWaveDescription[] = _( - "A weak jolt of electricity\n" - "that paralyzes the foe."); + "A weak jolt of electricity\n" + "that paralyzes the foe."); static const u8 sThunderDescription[] = _( - "A lightning attack that may\n" - "cause paralysis."); + "A lightning attack that may\n" + "cause paralysis."); static const u8 sRockThrowDescription[] = _( - "Throws small rocks to\n" - "strike the foe."); + "Throws small rocks to\n" + "strike the foe."); static const u8 sEarthquakeDescription[] = _( - "A powerful quake, but has\n" - "no effect on flying foes."); + "A powerful quake, but has\n" + "no effect on flying foes."); static const u8 sFissureDescription[] = _( - "A one-hit KO move that\n" - "drops the foe in a fissure."); + "A one-hit KO move that\n" + "drops the foe in a fissure."); static const u8 sDigDescription[] = _( - "Digs underground the first\n" - "turn and strikes next turn."); + "Digs underground the first\n" + "turn and strikes next turn."); static const u8 sToxicDescription[] = _( - "Poisons the foe with an\n" - "intensifying toxin."); + "Poisons the foe with an\n" + "intensifying toxin."); static const u8 sConfusionDescription[] = _( - "A psychic attack that may\n" - "cause confusion."); + "A psychic attack that may\n" + "cause confusion."); static const u8 sPsychicDescription[] = _( - "A powerful psychic attack\n" - "that may lower SP. DEF."); + "A powerful psychic attack\n" + "that may lower SP. DEF."); static const u8 sHypnosisDescription[] = _( - "A hypnotizing move that\n" - "may induce sleep."); + "A hypnotizing move that\n" + "may induce sleep."); static const u8 sMeditateDescription[] = _( - "Meditates in a peaceful\n" - "fashion to raise ATTACK."); + "Meditates in a peaceful\n" + "fashion to raise ATTACK."); static const u8 sAgilityDescription[] = _( - "Relaxes the body to sharply\n" - "boost SPEED."); + "Relaxes the body to sharply\n" + "boost SPEED."); static const u8 sQuickAttackDescription[] = _( - "An extremely fast attack\n" - "that always strikes first."); + "An extremely fast attack\n" + "that always strikes first."); static const u8 sRageDescription[] = _( - "Raises the user’s ATTACK\n" - "every time it is hit."); + "Raises the user’s ATTACK\n" + "every time it is hit."); static const u8 sTeleportDescription[] = _( - "A psychic move for fleeing\n" - "from battle instantly."); + "A psychic move for fleeing\n" + "from battle instantly."); static const u8 sNightShadeDescription[] = _( - "Inflicts damage identical\n" - "to the user’s level."); + "Inflicts damage identical\n" + "to the user’s level."); static const u8 sMimicDescription[] = _( - "Copies a move used by the\n" - "foe during one battle."); + "Copies a move used by the\n" + "foe during one battle."); static const u8 sScreechDescription[] = _( - "Emits a screech to sharply\n" - "reduce the foe’s DEFENSE."); + "Emits a screech to sharply\n" + "reduce the foe’s DEFENSE."); static const u8 sDoubleTeamDescription[] = _( - "Creates illusory copies to\n" - "raise evasiveness."); + "Creates illusory copies to\n" + "raise evasiveness."); static const u8 sRecoverDescription[] = _( - "Recovers up to half the\n" - "user’s maximum HP."); + "Recovers up to half the\n" + "user’s maximum HP."); static const u8 sHardenDescription[] = _( - "Stiffens the body’s \n" - "muscles to raise DEFENSE."); + "Stiffens the body’s \n" + "muscles to raise DEFENSE."); static const u8 sMinimizeDescription[] = _( - "Minimizes the user’s size\n" - "to raise evasiveness."); + "Minimizes the user’s size\n" + "to raise evasiveness."); static const u8 sSmokescreenDescription[] = _( - "Lowers the foe’s accuracy\n" - "using smoke, ink, etc."); + "Lowers the foe’s accuracy\n" + "using smoke, ink, etc."); static const u8 sConfuseRayDescription[] = _( - "A sinister ray that\n" - "confuses the foe."); + "A sinister ray that\n" + "confuses the foe."); static const u8 sWithdrawDescription[] = _( - "Withdraws the body into its\n" - "hard shell to raise DEFENSE."); + "Withdraws the body into its\n" + "hard shell to raise DEFENSE."); static const u8 sDefenseCurlDescription[] = _( - "Curls up to conceal weak\n" - "spots and raise DEFENSE."); + "Curls up to conceal weak\n" + "spots and raise DEFENSE."); static const u8 sBarrierDescription[] = _( - "Creates a barrier that\n" - "sharply raises DEFENSE."); + "Creates a barrier that\n" + "sharply raises DEFENSE."); static const u8 sLightScreenDescription[] = _( - "Creates a wall of light that\n" - "lowers SP. ATK damage."); + "Creates a wall of light that\n" + "lowers SP. ATK damage."); static const u8 sHazeDescription[] = _( - "Creates a black haze that\n" - "eliminates all stat changes."); + "Creates a black haze that\n" + "eliminates all stat changes."); static const u8 sReflectDescription[] = _( - "Creates a wall of light that\n" - "weakens physical attacks."); + "Creates a wall of light that\n" + "weakens physical attacks."); static const u8 sFocusEnergyDescription[] = _( - "Focuses power to raise the\n" - "critical-hit ratio."); + "Focuses power to raise the\n" + "critical-hit ratio."); static const u8 sBideDescription[] = _( - "Endures attack for 2\n" - "turns to retaliate double."); + "Endures attack for 2\n" + "turns to retaliate double."); static const u8 sMetronomeDescription[] = _( - "Waggles a finger to use any\n" - "POKéMON move at random."); + "Waggles a finger to use any\n" + "POKéMON move at random."); static const u8 sMirrorMoveDescription[] = _( - "Counters the foe’s attack\n" - "with the same move."); + "Counters the foe’s attack\n" + "with the same move."); static const u8 sSelfDestructDescription[] = _( - "Inflicts severe damage but\n" - "makes the user faint."); + "Inflicts severe damage but\n" + "makes the user faint."); static const u8 sEggBombDescription[] = _( - "An egg is forcibly hurled at\n" - "the foe."); + "An egg is forcibly hurled at\n" + "the foe."); static const u8 sLickDescription[] = _( - "Licks with a long tongue to\n" - "injure. May also paralyze."); + "Licks with a long tongue to\n" + "injure. May also paralyze."); static const u8 sSmogDescription[] = _( - "An exhaust-gas attack\n" - "that may also poison."); + "An exhaust-gas attack\n" + "that may also poison."); static const u8 sSludgeDescription[] = _( - "Sludge is hurled to inflict\n" - "damage. May also poison."); + "Sludge is hurled to inflict\n" + "damage. May also poison."); static const u8 sBoneClubDescription[] = _( - "Clubs the foe with a bone.\n" - "May cause flinching."); + "Clubs the foe with a bone.\n" + "May cause flinching."); static const u8 sFireBlastDescription[] = _( - "Incinerates everything it\n" - "strikes. May cause a burn."); + "Incinerates everything it\n" + "strikes. May cause a burn."); static const u8 sWaterfallDescription[] = _( - "Charges the foe with speed\n" - "to climb waterfalls."); + "Charges the foe with speed\n" + "to climb waterfalls."); static const u8 sClampDescription[] = _( - "Traps and squeezes the\n" - "foe for 2 to 5 turns."); + "Traps and squeezes the\n" + "foe for 2 to 5 turns."); static const u8 sSwiftDescription[] = _( - "Sprays star-shaped rays\n" - "that never miss."); + "Sprays star-shaped rays\n" + "that never miss."); static const u8 sSkullBashDescription[] = _( - "Tucks in the head, then\n" - "attacks on the next turn."); + "Tucks in the head, then\n" + "attacks on the next turn."); static const u8 sSpikeCannonDescription[] = _( - "Launches sharp spikes that\n" - "strike 2 to 5 times."); + "Launches sharp spikes that\n" + "strike 2 to 5 times."); static const u8 sConstrictDescription[] = _( - "Constricts to inflict pain.\n" - "May lower SPEED."); + "Constricts to inflict pain.\n" + "May lower SPEED."); static const u8 sAmnesiaDescription[] = _( - "Forgets about something\n" - "and sharply raises SP. DEF."); + "Forgets about something\n" + "and sharply raises SP. DEF."); static const u8 sKinesisDescription[] = _( - "Distracts the foe.\n" - "May lower accuracy."); + "Distracts the foe.\n" + "May lower accuracy."); static const u8 sSoftBoiledDescription[] = _( - "Recovers up to half the\n" - "user’s maximum HP."); + "Recovers up to half the\n" + "user’s maximum HP."); static const u8 sHiJumpKickDescription[] = _( - "A jumping knee kick. If it\n" - "misses, the user is hurt."); + "A jumping knee kick. If it\n" + "misses, the user is hurt."); static const u8 sGlareDescription[] = _( - "Intimidates and frightens\n" - "the foe into paralysis."); + "Intimidates and frightens\n" + "the foe into paralysis."); static const u8 sDreamEaterDescription[] = _( - "Takes one half the damage\n" - "inflicted on a sleeping foe."); + "Takes one half the damage\n" + "inflicted on a sleeping foe."); static const u8 sPoisonGasDescription[] = _( - "Envelops the foe in a toxic\n" - "gas that may poison."); + "Envelops the foe in a toxic\n" + "gas that may poison."); static const u8 sBarrageDescription[] = _( - "Hurls round objects at the\n" - "foe 2 to 5 times."); + "Hurls round objects at the\n" + "foe 2 to 5 times."); static const u8 sLeechLifeDescription[] = _( - "An attack that steals half\n" - "the damage inflicted."); + "An attack that steals half\n" + "the damage inflicted."); static const u8 sLovelyKissDescription[] = _( - "Demands a kiss with a scary\n" - "face that induces sleep."); + "Demands a kiss with a scary\n" + "face that induces sleep."); static const u8 sSkyAttackDescription[] = _( - "Searches out weak spots,\n" - "then strikes the next turn."); + "Searches out weak spots,\n" + "then strikes the next turn."); static const u8 sTransformDescription[] = _( - "Alters the user’s cells to\n" - "become a copy of the foe."); + "Alters the user’s cells to\n" + "become a copy of the foe."); static const u8 sBubbleDescription[] = _( - "An attack using bubbles.\n" - "May lower the foe’s SPEED."); + "An attack using bubbles.\n" + "May lower the foe’s SPEED."); static const u8 sDizzyPunchDescription[] = _( - "A rhythmic punch that may\n" - "confuse the foe."); + "A rhythmic punch that may\n" + "confuse the foe."); static const u8 sSporeDescription[] = _( - "Scatters a cloud of spores\n" - "that always induce sleep."); + "Scatters a cloud of spores\n" + "that always induce sleep."); static const u8 sFlashDescription[] = _( - "Looses a powerful blast of\n" - "light that cuts accuracy."); + "Looses a powerful blast of\n" + "light that cuts accuracy."); static const u8 sPsywaveDescription[] = _( - "Attacks with a psychic\n" - "wave of varying intensity."); + "Attacks with a psychic\n" + "wave of varying intensity."); static const u8 sSplashDescription[] = _( - "It’s just a splash...\n" - "Has no effect whatsoever."); + "It’s just a splash...\n" + "Has no effect whatsoever."); static const u8 sAcidArmorDescription[] = _( - "Liquifies the user’s body\n" - "to sharply raise DEFENSE."); + "Liquifies the user’s body\n" + "to sharply raise DEFENSE."); static const u8 sCrabhammerDescription[] = _( - "Hammers with a pincer. Has a\n" - "high critical-hit ratio."); + "Hammers with a pincer. Has a\n" + "high critical-hit ratio."); static const u8 sExplosionDescription[] = _( - "Inflicts severe damage but\n" - "makes the user faint."); + "Inflicts severe damage but\n" + "makes the user faint."); static const u8 sFurySwipesDescription[] = _( - "Rakes the foe with sharp\n" - "claws, etc., 2 to 5 times."); + "Rakes the foe with sharp\n" + "claws, etc., 2 to 5 times."); static const u8 sBonemerangDescription[] = _( - "Throws a bone boomerang\n" - "that strikes twice."); + "Throws a bone boomerang\n" + "that strikes twice."); static const u8 sRestDescription[] = _( - "The user sleeps for 2 turns,\n" - "restoring HP and status."); + "The user sleeps for 2 turns,\n" + "restoring HP and status."); static const u8 sRockSlideDescription[] = _( - "Large boulders are hurled.\n" - "May cause flinching."); + "Large boulders are hurled.\n" + "May cause flinching."); static const u8 sHyperFangDescription[] = _( - "Attacks with sharp fangs.\n" - "May cause flinching."); + "Attacks with sharp fangs.\n" + "May cause flinching."); static const u8 sSharpenDescription[] = _( - "Reduces the polygon count\n" - "and raises ATTACK."); + "Reduces the polygon count\n" + "and raises ATTACK."); static const u8 sConversionDescription[] = _( - "Changes the user’s type\n" - "into a known move’s type."); + "Changes the user’s type\n" + "into a known move’s type."); static const u8 sTriAttackDescription[] = _( - "Fires three types of beams\n" - "at the same time."); + "Fires three types of beams\n" + "at the same time."); static const u8 sSuperFangDescription[] = _( - "Attacks with sharp fangs\n" - "and cuts half the foe’s HP."); + "Attacks with sharp fangs\n" + "and cuts half the foe’s HP."); static const u8 sSlashDescription[] = _( - "Slashes with claws, etc. Has\n" - "a high critical-hit ratio."); + "Slashes with claws, etc. Has\n" + "a high critical-hit ratio."); static const u8 sSubstituteDescription[] = _( - "Creates a decoy using 1/4\n" - "of the user’s maximum HP."); + "Creates a decoy using 1/4\n" + "of the user’s maximum HP."); static const u8 sStruggleDescription[] = _( - "Used only if all PP are gone.\n" - "Also hurts the user a little."); + "Used only if all PP are gone.\n" + "Also hurts the user a little."); static const u8 sSketchDescription[] = _( - "Copies the foe’s last move\n" - "permanently."); + "Copies the foe’s last move\n" + "permanently."); static const u8 sTripleKickDescription[] = _( - "Kicks the foe 3 times in a\n" - "row with rising intensity."); + "Kicks the foe 3 times in a\n" + "row with rising intensity."); static const u8 sThiefDescription[] = _( - "While attacking, it may\n" - "steal the foe’s held item."); + "While attacking, it may\n" + "steal the foe’s held item."); static const u8 sSpiderWebDescription[] = _( - "Ensnares the foe to stop it\n" - "from fleeing or switching."); + "Ensnares the foe to stop it\n" + "from fleeing or switching."); static const u8 sMindReaderDescription[] = _( - "Senses the foe’s action to\n" - "ensure the next move’s hit."); + "Senses the foe’s action to\n" + "ensure the next move’s hit."); static const u8 sNightmareDescription[] = _( - "Inflicts 1/4 damage on a\n" - "sleeping foe every turn."); + "Inflicts 1/4 damage on a\n" + "sleeping foe every turn."); static const u8 sFlameWheelDescription[] = _( - "A fiery charge attack that\n" - "may inflict a burn."); + "A fiery charge attack that\n" + "may inflict a burn."); static const u8 sSnoreDescription[] = _( - "A loud attack that can be\n" - "used only while asleep."); + "A loud attack that can be\n" + "used only while asleep."); static const u8 sCurseDescription[] = _( - "A move that functions\n" - "differently for GHOSTS."); + "A move that functions\n" + "differently for GHOSTS."); static const u8 sFlailDescription[] = _( - "Inflicts more damage when\n" - "the user’s HP is down."); + "Inflicts more damage when\n" + "the user’s HP is down."); static const u8 sConversion2Description[] = _( - "Makes the user resistant\n" - "to the last attack’s type."); + "Makes the user resistant\n" + "to the last attack’s type."); static const u8 sAeroblastDescription[] = _( - "Launches a vacuumed blast.\n" - "High critical-hit ratio."); + "Launches a vacuumed blast.\n" + "High critical-hit ratio."); static const u8 sCottonSporeDescription[] = _( - "Spores cling to the foe,\n" - "sharply reducing SPEED."); + "Spores cling to the foe,\n" + "sharply reducing SPEED."); static const u8 sReversalDescription[] = _( - "Inflicts more damage when\n" - "the user’s HP is down."); + "Inflicts more damage when\n" + "the user’s HP is down."); static const u8 sSpiteDescription[] = _( - "Spitefully cuts the PP\n" - "of the foe’s last move."); + "Spitefully cuts the PP\n" + "of the foe’s last move."); static const u8 sPowderSnowDescription[] = _( - "Blasts the foe with a snowy\n" - "gust. May cause freezing."); + "Blasts the foe with a snowy\n" + "gust. May cause freezing."); static const u8 sProtectDescription[] = _( - "Evades attack, but may fail\n" - "if used in succession."); + "Evades attack, but may fail\n" + "if used in succession."); static const u8 sMachPunchDescription[] = _( - "A punch is thrown at wicked\n" - "speed to strike first."); + "A punch is thrown at wicked\n" + "speed to strike first."); static const u8 sScaryFaceDescription[] = _( - "Frightens with a scary face\n" - "to sharply reduce SPEED."); + "Frightens with a scary face\n" + "to sharply reduce SPEED."); static const u8 sFaintAttackDescription[] = _( - "Draws the foe close, then\n" - "strikes without fail."); + "Draws the foe close, then\n" + "strikes without fail."); static const u8 sSweetKissDescription[] = _( - "Demands a kiss with a cute\n" - "look. May cause confusion."); + "Demands a kiss with a cute\n" + "look. May cause confusion."); static const u8 sBellyDrumDescription[] = _( - "Maximizes ATTACK while\n" - "sacrificing HP."); + "Maximizes ATTACK while\n" + "sacrificing HP."); static const u8 sSludgeBombDescription[] = _( - "Sludge is hurled to inflict\n" - "damage. May also poison."); + "Sludge is hurled to inflict\n" + "damage. May also poison."); static const u8 sMudSlapDescription[] = _( - "Hurls mud in the foe’s face\n" - "to reduce its accuracy."); + "Hurls mud in the foe’s face\n" + "to reduce its accuracy."); static const u8 sOctazookaDescription[] = _( - "Fires a lump of ink to\n" - "damage and cut accuracy."); + "Fires a lump of ink to\n" + "damage and cut accuracy."); static const u8 sSpikesDescription[] = _( - "Sets spikes that hurt a \n" - "foe switching in."); + "Sets spikes that hurt a \n" + "foe switching in."); static const u8 sZapCannonDescription[] = _( - "Powerful and sure to cause\n" - "paralysis, but inaccurate."); + "Powerful and sure to cause\n" + "paralysis, but inaccurate."); static const u8 sForesightDescription[] = _( - "Negates the foe’s efforts\n" - "to heighten evasiveness."); + "Negates the foe’s efforts\n" + "to heighten evasiveness."); static const u8 sDestinyBondDescription[] = _( - "If the user faints, the foe\n" - "is also made to faint."); + "If the user faints, the foe\n" + "is also made to faint."); static const u8 sPerishSongDescription[] = _( - "Any POKéMON hearing this\n" - "song faints in 3 turns."); + "Any POKéMON hearing this\n" + "song faints in 3 turns."); static const u8 sIcyWindDescription[] = _( - "A chilling attack that\n" - "lowers the foe’s SPEED."); + "A chilling attack that\n" + "lowers the foe’s SPEED."); static const u8 sDetectDescription[] = _( - "Evades attack, but may fail\n" - "if used in succession."); + "Evades attack, but may fail\n" + "if used in succession."); static const u8 sBoneRushDescription[] = _( - "Strikes the foe with a bone\n" - "in hand 2 to 5 times."); + "Strikes the foe with a bone\n" + "in hand 2 to 5 times."); static const u8 sLockOnDescription[] = _( - "Locks on to the foe to\n" - "ensure the next move hits."); + "Locks on to the foe to\n" + "ensure the next move hits."); static const u8 sOutrageDescription[] = _( - "A rampage of 2 to 3 turns\n" - "that confuses the user."); + "A rampage of 2 to 3 turns\n" + "that confuses the user."); static const u8 sSandstormDescription[] = _( - "Causes a sandstorm that\n" - "rages for several turns."); + "Causes a sandstorm that\n" + "rages for several turns."); static const u8 sGigaDrainDescription[] = _( - "An attack that steals half\n" - "the damage inflicted."); + "An attack that steals half\n" + "the damage inflicted."); static const u8 sEndureDescription[] = _( - "Endures any attack for\n" - "1 turn, leaving at least 1HP."); + "Endures any attack for\n" + "1 turn, leaving at least 1HP."); static const u8 sCharmDescription[] = _( - "Charms the foe and sharply\n" - "reduces its ATTACK."); + "Charms the foe and sharply\n" + "reduces its ATTACK."); static const u8 sRolloutDescription[] = _( - "An attack lasting 5 turns\n" - "with rising intensity."); + "An attack lasting 5 turns\n" + "with rising intensity."); static const u8 sFalseSwipeDescription[] = _( - "An attack that leaves the\n" - "foe with at least 1 HP."); + "An attack that leaves the\n" + "foe with at least 1 HP."); static const u8 sSwaggerDescription[] = _( - "Confuses the foe, but also\n" - "sharply raises ATTACK."); + "Confuses the foe, but also\n" + "sharply raises ATTACK."); static const u8 sMilkDrinkDescription[] = _( - "Recovers up to half the\n" - "user’s maximum HP."); + "Recovers up to half the\n" + "user’s maximum HP."); static const u8 sSparkDescription[] = _( - "An electrified tackle that\n" - "may paralyze the foe."); + "An electrified tackle that\n" + "may paralyze the foe."); static const u8 sFuryCutterDescription[] = _( - "An attack that intensifies\n" - "on each successive hit."); + "An attack that intensifies\n" + "on each successive hit."); static const u8 sSteelWingDescription[] = _( - "Strikes the foe with hard\n" - "wings spread wide."); + "Strikes the foe with hard\n" + "wings spread wide."); static const u8 sMeanLookDescription[] = _( - "Fixes the foe with a mean\n" - "look that prevents escape."); + "Fixes the foe with a mean\n" + "look that prevents escape."); static const u8 sAttractDescription[] = _( - "Makes the opposite gender\n" - "less likely to attack."); + "Makes the opposite gender\n" + "less likely to attack."); static const u8 sSleepTalkDescription[] = _( - "Uses an available move\n" - "randomly while asleep."); + "Uses an available move\n" + "randomly while asleep."); static const u8 sHealBellDescription[] = _( - "Chimes soothingly to heal\n" - "all status abnormalities."); + "Chimes soothingly to heal\n" + "all status abnormalities."); static const u8 sReturnDescription[] = _( - "An attack that increases\n" - "in power with friendship."); + "An attack that increases\n" + "in power with friendship."); static const u8 sPresentDescription[] = _( - "A gift in the form of a\n" - "bomb. May restore HP."); + "A gift in the form of a\n" + "bomb. May restore HP."); static const u8 sFrustrationDescription[] = _( - "An attack that is stronger\n" - "if the TRAINER is disliked."); + "An attack that is stronger\n" + "if the TRAINER is disliked."); static const u8 sSafeguardDescription[] = _( - "A mystical force prevents\n" - "all status problems."); + "A mystical force prevents\n" + "all status problems."); static const u8 sPainSplitDescription[] = _( - "Adds the user and foe’s HP,\n" - "then shares them equally."); + "Adds the user and foe’s HP,\n" + "then shares them equally."); static const u8 sSacredFireDescription[] = _( - "A mystical fire attack that\n" - "may inflict a burn."); + "A mystical fire attack that\n" + "may inflict a burn."); static const u8 sMagnitudeDescription[] = _( - "A ground-shaking attack\n" - "of random intensity."); + "A ground-shaking attack\n" + "of random intensity."); static const u8 sDynamicPunchDescription[] = _( - "Powerful and sure to cause\n" - "confusion, but inaccurate."); + "Powerful and sure to cause\n" + "confusion, but inaccurate."); static const u8 sMegahornDescription[] = _( - "A brutal ramming attack\n" - "using out-thrust horns."); + "A brutal ramming attack\n" + "using out-thrust horns."); static const u8 sDragonBreathDescription[] = _( - "Strikes the foe with an\n" - "incredible blast of breath."); + "Strikes the foe with an\n" + "incredible blast of breath."); static const u8 sBatonPassDescription[] = _( - "Switches out the user while\n" - "keeping effects in play."); + "Switches out the user while\n" + "keeping effects in play."); static const u8 sEncoreDescription[] = _( - "Makes the foe repeat its\n" - "last move over 2 to 6 turns."); + "Makes the foe repeat its\n" + "last move over 2 to 6 turns."); static const u8 sPursuitDescription[] = _( - "Inflicts bad damage if used\n" - "on a foe switching out."); + "Inflicts bad damage if used\n" + "on a foe switching out."); static const u8 sRapidSpinDescription[] = _( - "Spins the body at high\n" - "speed to strike the foe."); + "Spins the body at high\n" + "speed to strike the foe."); static const u8 sSweetScentDescription[] = _( - "Allures the foe to reduce\n" - "evasiveness."); + "Allures the foe to reduce\n" + "evasiveness."); static const u8 sIronTailDescription[] = _( - "Attacks with a rock-hard\n" - "tail. May lower DEFENSE."); + "Attacks with a rock-hard\n" + "tail. May lower DEFENSE."); static const u8 sMetalClawDescription[] = _( - "A claw attack that may\n" - "raise the user’s ATTACK."); + "A claw attack that may\n" + "raise the user’s ATTACK."); static const u8 sVitalThrowDescription[] = _( - "Makes the user’s move last,\n" - "but it never misses."); + "Makes the user’s move last,\n" + "but it never misses."); static const u8 sMorningSunDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); + "Restores HP. The amount\n" + "varies with the weather."); static const u8 sSynthesisDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); + "Restores HP. The amount\n" + "varies with the weather."); static const u8 sMoonlightDescription[] = _( - "Restores HP. The amount\n" - "varies with the weather."); + "Restores HP. The amount\n" + "varies with the weather."); static const u8 sHiddenPowerDescription[] = _( - "The effectiveness varies\n" - "with the user."); + "The effectiveness varies\n" + "with the user."); static const u8 sCrossChopDescription[] = _( - "A double-chopping attack.\n" - "High critical-hit ratio."); + "A double-chopping attack.\n" + "High critical-hit ratio."); static const u8 sTwisterDescription[] = _( - "Whips up a vicious twister\n" - "to tear at the foe."); + "Whips up a vicious twister\n" + "to tear at the foe."); static const u8 sRainDanceDescription[] = _( - "Boosts the power of WATER-\n" - "type moves for 5 turns."); + "Boosts the power of WATER-\n" + "type moves for 5 turns."); static const u8 sSunnyDayDescription[] = _( - "Boosts the power of FIRE-\n" - "type moves for 5 turns."); + "Boosts the power of FIRE-\n" + "type moves for 5 turns."); static const u8 sCrunchDescription[] = _( - "Crunches with sharp fangs.\n" - "May lower SP. DEF."); + "Crunches with sharp fangs.\n" + "May lower SP. DEF."); static const u8 sMirrorCoatDescription[] = _( - "Counters the foe’s special\n" - "attack at double the power."); + "Counters the foe’s special\n" + "attack at double the power."); static const u8 sPsychUpDescription[] = _( - "Copies the foe’s effect(s)\n" - "and gives to the user."); + "Copies the foe’s effect(s)\n" + "and gives to the user."); static const u8 sExtremeSpeedDescription[] = _( - "An extremely fast and\n" - "powerful attack."); + "An extremely fast and\n" + "powerful attack."); static const u8 sAncientPowerDescription[] = _( - "An attack that may raise\n" - "all stats."); + "An attack that may raise\n" + "all stats."); static const u8 sShadowBallDescription[] = _( - "Hurls a black blob that may\n" - "lower the foe’s SP. DEF."); + "Hurls a black blob that may\n" + "lower the foe’s SP. DEF."); static const u8 sFutureSightDescription[] = _( - "Heightens inner power to\n" - "strike 2 turns later."); + "Heightens inner power to\n" + "strike 2 turns later."); static const u8 sRockSmashDescription[] = _( - "A rock-crushing attack\n" - "that may lower DEFENSE."); + "A rock-crushing attack\n" + "that may lower DEFENSE."); static const u8 sWhirlpoolDescription[] = _( - "Traps and hurts the foe in\n" - "a whirlpool for 2 to 5 turns."); + "Traps and hurts the foe in\n" + "a whirlpool for 2 to 5 turns."); static const u8 sBeatUpDescription[] = _( - "Summons party POKéMON to\n" - "join in the attack."); + "Summons party POKéMON to\n" + "join in the attack."); static const u8 sFakeOutDescription[] = _( - "A 1st-turn, 1st-strike move\n" - "that causes flinching."); + "A 1st-turn, 1st-strike move\n" + "that causes flinching."); static const u8 sUproarDescription[] = _( - "Causes an uproar for 2 to 5\n" - "turns and prevents sleep."); + "Causes an uproar for 2 to 5\n" + "turns and prevents sleep."); static const u8 sStockpileDescription[] = _( - "Charges up power for up to\n" - "3 turns."); + "Charges up power for up to\n" + "3 turns."); static const u8 sSpitUpDescription[] = _( - "Releases stockpiled power\n" - "(the more the better)."); + "Releases stockpiled power\n" + "(the more the better)."); static const u8 sSwallowDescription[] = _( - "Absorbs stockpiled power\n" - "and restores HP."); + "Absorbs stockpiled power\n" + "and restores HP."); static const u8 sHeatWaveDescription[] = _( - "Exhales a hot breath on the\n" - "foe. May inflict a burn."); + "Exhales a hot breath on the\n" + "foe. May inflict a burn."); static const u8 sHailDescription[] = _( - "Summons a hailstorm that\n" - "strikes every turn."); + "Summons a hailstorm that\n" + "strikes every turn."); static const u8 sTormentDescription[] = _( - "Torments the foe and stops\n" - "successive use of a move."); + "Torments the foe and stops\n" + "successive use of a move."); static const u8 sFlatterDescription[] = _( - "Confuses the foe, but\n" - "raises its SP. ATK."); + "Confuses the foe, but\n" + "raises its SP. ATK."); static const u8 sWillOWispDescription[] = _( - "Inflicts a burn on the foe\n" - "with intense fire."); + "Inflicts a burn on the foe\n" + "with intense fire."); static const u8 sMementoDescription[] = _( - "The user faints and lowers\n" - "the foe’s abilities."); + "The user faints and lowers\n" + "the foe’s abilities."); static const u8 sFacadeDescription[] = _( - "Boosts ATTACK when burned,\n" - "paralyzed, or poisoned."); + "Boosts ATTACK when burned,\n" + "paralyzed, or poisoned."); static const u8 sFocusPunchDescription[] = _( - "A powerful loyalty attack.\n" - "The user flinches if hit."); + "A powerful loyalty attack.\n" + "The user flinches if hit."); static const u8 sSmellingSaltDescription[] = _( - "Powerful against paralyzed\n" - "foes, but also heals them."); + "Powerful against paralyzed\n" + "foes, but also heals them."); static const u8 sFollowMeDescription[] = _( - "Draws attention to make\n" - "foes attack only the user."); + "Draws attention to make\n" + "foes attack only the user."); static const u8 sNaturePowerDescription[] = _( - "The type of attack varies\n" - "depending on the location."); + "The type of attack varies\n" + "depending on the location."); static const u8 sChargeDescription[] = _( - "Charges power to boost the\n" - "electric move used next."); + "Charges power to boost the\n" + "electric move used next."); static const u8 sTauntDescription[] = _( - "Taunts the foe into only\n" - "using attack moves."); + "Taunts the foe into only\n" + "using attack moves."); static const u8 sHelpingHandDescription[] = _( - "Boosts the power of the\n" - "recipient’s moves."); + "Boosts the power of the\n" + "recipient’s moves."); static const u8 sTrickDescription[] = _( - "Tricks the foe into trading\n" - "held items."); + "Tricks the foe into trading\n" + "held items."); static const u8 sRolePlayDescription[] = _( - "Mimics the target and\n" - "copies its special ability."); + "Mimics the target and\n" + "copies its special ability."); static const u8 sWishDescription[] = _( - "A wish that restores HP.\n" - "It takes time to work."); + "A wish that restores HP.\n" + "It takes time to work."); static const u8 sAssistDescription[] = _( - "Attacks randomly with one\n" - "of the partner’s moves."); + "Attacks randomly with one\n" + "of the partner’s moves."); static const u8 sIngrainDescription[] = _( - "Lays roots that restore HP.\n" - "The user can’t switch out."); + "Lays roots that restore HP.\n" + "The user can’t switch out."); static const u8 sSuperpowerDescription[] = _( - "Boosts strength sharply,\n" - "but lowers abilities."); + "Boosts strength sharply,\n" + "but lowers abilities."); static const u8 sMagicCoatDescription[] = _( - "Reflects special effects\n" - "back to the attacker."); + "Reflects special effects\n" + "back to the attacker."); static const u8 sRecycleDescription[] = _( - "Recycles a used item for\n" - "one more use."); + "Recycles a used item for\n" + "one more use."); static const u8 sRevengeDescription[] = _( - "An attack that gains power\n" - "if injured by the foe."); + "An attack that gains power\n" + "if injured by the foe."); static const u8 sBrickBreakDescription[] = _( - "Destroys barriers such as\n" - "REFLECT and causes damage."); + "Destroys barriers such as\n" + "REFLECT and causes damage."); static const u8 sYawnDescription[] = _( - "Lulls the foe into yawning,\n" - "then sleeping next turn."); + "Lulls the foe into yawning,\n" + "then sleeping next turn."); static const u8 sKnockOffDescription[] = _( - "Knocks down the foe’s held\n" - "item to prevent its use."); + "Knocks down the foe’s held\n" + "item to prevent its use."); static const u8 sEndeavorDescription[] = _( - "Gains power if the user’s HP\n" - "is lower than the foe’s HP."); + "Gains power if the user’s HP\n" + "is lower than the foe’s HP."); static const u8 sEruptionDescription[] = _( - "The higher the user’s HP,\n" - "the more damage caused."); + "The higher the user’s HP,\n" + "the more damage caused."); static const u8 sSkillSwapDescription[] = _( - "The user swaps special\n" - "abilities with the target."); + "The user swaps special\n" + "abilities with the target."); static const u8 sImprisonDescription[] = _( - "Prevents foes from using\n" - "moves known by the user."); + "Prevents foes from using\n" + "moves known by the user."); static const u8 sRefreshDescription[] = _( - "Heals poisoning, paralysis,\n" - "or a burn."); + "Heals poisoning, paralysis,\n" + "or a burn."); static const u8 sGrudgeDescription[] = _( - "If the user faints, deletes\n" - "all PP of foe’s last move."); + "If the user faints, deletes\n" + "all PP of foe’s last move."); static const u8 sSnatchDescription[] = _( - "Steals the effects of the\n" - "move the target uses next."); + "Steals the effects of the\n" + "move the target uses next."); static const u8 sSecretPowerDescription[] = _( - "An attack with effects\n" - "that vary by location."); + "An attack with effects\n" + "that vary by location."); static const u8 sDiveDescription[] = _( - "Dives underwater the first\n" - "turn and strikes next turn."); + "Dives underwater the first\n" + "turn and strikes next turn."); static const u8 sArmThrustDescription[] = _( - "Straight-arm punches that\n" - "strike the foe 2 to 5 times."); + "Straight-arm punches that\n" + "strike the foe 2 to 5 times."); static const u8 sCamouflageDescription[] = _( - "Alters the POKéMON’s type\n" - "depending on the location."); + "Alters the POKéMON’s type\n" + "depending on the location."); static const u8 sTailGlowDescription[] = _( - "Flashes a light that sharply\n" - "raises SP. ATK."); + "Flashes a light that sharply\n" + "raises SP. ATK."); static const u8 sLusterPurgeDescription[] = _( - "Attacks with a burst of\n" - "light. May lower SP. DEF."); + "Attacks with a burst of\n" + "light. May lower SP. DEF."); static const u8 sMistBallDescription[] = _( - "Attacks with a flurry of\n" - "down. May lower SP. ATK."); + "Attacks with a flurry of\n" + "down. May lower SP. ATK."); static const u8 sFeatherDanceDescription[] = _( - "Envelops the foe with down\n" - "to sharply reduce ATTACK."); + "Envelops the foe with down\n" + "to sharply reduce ATTACK."); static const u8 sTeeterDanceDescription[] = _( - "Confuses all POKéMON on\n" - "the scene."); + "Confuses all POKéMON on\n" + "the scene."); static const u8 sBlazeKickDescription[] = _( - "A kick with a high critical-\n" - "hit ratio. May cause a burn."); + "A kick with a high critical-\n" + "hit ratio. May cause a burn."); static const u8 sMudSportDescription[] = _( - "Covers the user in mud to\n" - "raise electrical resistance."); + "Covers the user in mud to\n" + "raise electrical resistance."); static const u8 sIceBallDescription[] = _( - "A 5-turn attack that gains\n" - "power on successive hits."); + "A 5-turn attack that gains\n" + "power on successive hits."); static const u8 sNeedleArmDescription[] = _( - "Attacks with thorny arms.\n" - "May cause flinching."); + "Attacks with thorny arms.\n" + "May cause flinching."); static const u8 sSlackOffDescription[] = _( - "Slacks off and restores\n" - "half the maximum HP."); + "Slacks off and restores\n" + "half the maximum HP."); static const u8 sHyperVoiceDescription[] = _( - "A loud attack that uses\n" - "sound waves to injure."); + "A loud attack that uses\n" + "sound waves to injure."); static const u8 sPoisonFangDescription[] = _( - "A sharp-fanged attack.\n" - "May badly poison the foe."); + "A sharp-fanged attack.\n" + "May badly poison the foe."); static const u8 sCrushClawDescription[] = _( - "Tears at the foe with sharp\n" - "claws. May lower DEFENSE."); + "Tears at the foe with sharp\n" + "claws. May lower DEFENSE."); static const u8 sBlastBurnDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); + "Powerful, but leaves the\n" + "user immobile the next turn."); static const u8 sHydroCannonDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); + "Powerful, but leaves the\n" + "user immobile the next turn."); static const u8 sMeteorMashDescription[] = _( - "Fires a meteor-like punch.\n" - "May raise ATTACK."); + "Fires a meteor-like punch.\n" + "May raise ATTACK."); static const u8 sAstonishDescription[] = _( - "An attack that may shock\n" - "the foe into flinching."); + "An attack that may shock\n" + "the foe into flinching."); static const u8 sWeatherBallDescription[] = _( - "The move’s type and power\n" - "change with the weather."); + "The move’s type and power\n" + "change with the weather."); static const u8 sAromatherapyDescription[] = _( - "Heals all status problems\n" - "with a soothing scent."); + "Heals all status problems\n" + "with a soothing scent."); static const u8 sFakeTearsDescription[] = _( - "Feigns crying to sharply\n" - "lower the foe’s SP. DEF."); + "Feigns crying to sharply\n" + "lower the foe’s SP. DEF."); static const u8 sAirCutterDescription[] = _( - "Hacks with razorlike wind.\n" - "High critical-hit ratio."); + "Hacks with razorlike wind.\n" + "High critical-hit ratio."); static const u8 sOverheatDescription[] = _( - "Allows a full-power attack,\n" - "but sharply lowers SP. ATK."); + "Allows a full-power attack,\n" + "but sharply lowers SP. ATK."); static const u8 sOdorSleuthDescription[] = _( - "Negates the foe’s efforts\n" - "to heighten evasiveness."); + "Negates the foe’s efforts\n" + "to heighten evasiveness."); static const u8 sRockTombDescription[] = _( - "Stops the foe from moving\n" - "with rocks and cuts SPEED."); + "Stops the foe from moving\n" + "with rocks and cuts SPEED."); static const u8 sSilverWindDescription[] = _( - "A powdery attack that may\n" - "raise abilities."); + "A powdery attack that may\n" + "raise abilities."); static const u8 sMetalSoundDescription[] = _( - "Emits a horrible screech\n" - "that sharply lowers SP. DEF."); + "Emits a horrible screech\n" + "that sharply lowers SP. DEF."); static const u8 sGrassWhistleDescription[] = _( - "Lulls the foe into sleep\n" - "with a pleasant melody."); + "Lulls the foe into sleep\n" + "with a pleasant melody."); static const u8 sTickleDescription[] = _( - "Makes the foe laugh to\n" - "lower ATTACK and DEFENSE."); + "Makes the foe laugh to\n" + "lower ATTACK and DEFENSE."); static const u8 sCosmicPowerDescription[] = _( - "Raises DEFENSE and SP. DEF\n" - "with a mystic power."); + "Raises DEFENSE and SP. DEF\n" + "with a mystic power."); static const u8 sWaterSpoutDescription[] = _( - "Inflicts more damage if the\n" - "user’s HP is high."); + "Inflicts more damage if the\n" + "user’s HP is high."); static const u8 sSignalBeamDescription[] = _( - "A strange beam attack that\n" - "may confuse the foe."); + "A strange beam attack that\n" + "may confuse the foe."); static const u8 sShadowPunchDescription[] = _( - "An unavoidable punch that\n" - "is thrown from shadows."); + "An unavoidable punch that\n" + "is thrown from shadows."); static const u8 sExtrasensoryDescription[] = _( - "Attacks with a peculiar\n" - "power. May cause flinching."); + "Attacks with a peculiar\n" + "power. May cause flinching."); static const u8 sSkyUppercutDescription[] = _( - "An uppercut thrown as if\n" - "leaping into the sky."); + "An uppercut thrown as if\n" + "leaping into the sky."); static const u8 sSandTombDescription[] = _( - "Traps and hurts the foe in\n" - "quicksand for 2 to 5 turns."); + "Traps and hurts the foe in\n" + "quicksand for 2 to 5 turns."); static const u8 sSheerColdDescription[] = _( - "A chilling attack that\n" - "causes fainting if it hits."); + "A chilling attack that\n" + "causes fainting if it hits."); static const u8 sMuddyWaterDescription[] = _( - "Attacks with muddy water.\n" - "May lower accuracy."); + "Attacks with muddy water.\n" + "May lower accuracy."); static const u8 sBulletSeedDescription[] = _( - "Shoots 2 to 5 seeds in a row\n" - "to strike the foe."); + "Shoots 2 to 5 seeds in a row\n" + "to strike the foe."); static const u8 sAerialAceDescription[] = _( - "An extremely speedy and\n" - "unavoidable attack."); + "An extremely speedy and\n" + "unavoidable attack."); static const u8 sIcicleSpearDescription[] = _( - "Attacks the foe by firing\n" - "2 to 5 icicles in a row."); + "Attacks the foe by firing\n" + "2 to 5 icicles in a row."); static const u8 sIronDefenseDescription[] = _( - "Hardens the body’s surface\n" - "to sharply raise DEFENSE."); + "Hardens the body’s surface\n" + "to sharply raise DEFENSE."); static const u8 sBlockDescription[] = _( - "Blocks the foe’s way to\n" - "prevent escape."); + "Blocks the foe’s way to\n" + "prevent escape."); static const u8 sHowlDescription[] = _( - "Howls to raise the spirit\n" - "and boosts ATTACK."); + "Howls to raise the spirit\n" + "and boosts ATTACK."); static const u8 sDragonClawDescription[] = _( - "Slashes the foe with sharp\n" - "claws."); + "Slashes the foe with sharp\n" + "claws."); static const u8 sFrenzyPlantDescription[] = _( - "Powerful, but leaves the\n" - "user immobile the next turn."); + "Powerful, but leaves the\n" + "user immobile the next turn."); static const u8 sBulkUpDescription[] = _( - "Bulks up the body to boost\n" - "both ATTACK and DEFENSE."); + "Bulks up the body to boost\n" + "both ATTACK and DEFENSE."); static const u8 sBounceDescription[] = _( - "Bounces up, then down the\n" - "next turn. May paralyze."); + "Bounces up, then down the\n" + "next turn. May paralyze."); static const u8 sMudShotDescription[] = _( - "Hurls mud at the foe and\n" - "reduces SPEED."); + "Hurls mud at the foe and\n" + "reduces SPEED."); static const u8 sPoisonTailDescription[] = _( - "Has a high critical-hit\n" - "ratio. May also poison."); + "Has a high critical-hit\n" + "ratio. May also poison."); static const u8 sCovetDescription[] = _( - "Cutely begs to obtain an\n" - "item held by the foe."); + "Cutely begs to obtain an\n" + "item held by the foe."); static const u8 sVoltTackleDescription[] = _( - "A life-risking tackle that\n" - "slightly hurts the user."); + "A life-risking tackle that\n" + "slightly hurts the user."); static const u8 sMagicalLeafDescription[] = _( - "Attacks with a strange leaf\n" - "that cannot be evaded."); + "Attacks with a strange leaf\n" + "that cannot be evaded."); static const u8 sWaterSportDescription[] = _( - "The user becomes soaked to\n" - "raise resistance to fire."); + "The user becomes soaked to\n" + "raise resistance to fire."); static const u8 sCalmMindDescription[] = _( - "Raises SP. ATK and SP. DEF\n" - "by focusing the mind."); + "Raises SP. ATK and SP. DEF\n" + "by focusing the mind."); static const u8 sLeafBladeDescription[] = _( - "Slashes with a sharp leaf.\n" - "High critical-hit ratio."); + "Slashes with a sharp leaf.\n" + "High critical-hit ratio."); static const u8 sDragonDanceDescription[] = _( - "A mystical dance that ups\n" - "ATTACK and SPEED."); + "A mystical dance that ups\n" + "ATTACK and SPEED."); static const u8 sRockBlastDescription[] = _( - "Hurls boulders at the foe\n" - "2 to 5 times in a row."); + "Hurls boulders at the foe\n" + "2 to 5 times in a row."); static const u8 sShockWaveDescription[] = _( - "A fast and unavoidable\n" - "electric attack."); + "A fast and unavoidable\n" + "electric attack."); static const u8 sWaterPulseDescription[] = _( - "Attacks with ultrasonic\n" - "waves. May confuse the foe."); + "Attacks with ultrasonic\n" + "waves. May confuse the foe."); static const u8 sDoomDesireDescription[] = _( - "Summons strong sunlight to\n" - "attack 2 turns later."); + "Summons strong sunlight to\n" + "attack 2 turns later."); static const u8 sPsychoBoostDescription[] = _( - "Allows a full-power attack,\n" - "but sharply lowers SP. ATK."); + "Allows a full-power attack,\n" + "but sharply lowers SP. ATK."); // MOVE_NONE is ignored in this table. Make sure to always subtract 1 before getting the right pointer. const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] = diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 20a6ec75d..b4438e5b3 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1,12436 +1,12436 @@ const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer1[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_GEODUDE, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle1[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_SKITTY, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_LOTAD, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_SEEDOT, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_TAILLOW, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_LOTAD, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SEEDOT, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcel[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SHIFTRY, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SHIFTRY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alberto[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_PELIPPER, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_XATU, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ed[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_ZANGOOSE, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_SEVIPER, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ZANGOOSE, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SEVIPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Declan[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fredrick[] = { - { - .iv = 100, - .lvl = 30, - .species = SPECIES_MAKUHITA, - }, - { - .iv = 100, - .lvl = 30, - .species = SPECIES_MACHOKE, - } + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt[] = { - { - .iv = 50, - .lvl = 34, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 50, - .lvl = 34, - .species = SPECIES_GOLBAT, - } + { + .iv = 50, + .lvl = 34, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_GOLBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Zander[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_HARIYAMA, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = { - { - .iv = 50, - .lvl = 28, - .species = SPECIES_CARVANHA, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 50, + .lvl = 28, + .species = SPECIES_CARVANHA, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = { - { - .iv = 100, - .lvl = 37, - .species = SPECIES_SHARPEDO, - }, - { - .iv = 100, - .lvl = 37, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 100, + .lvl = 37, + .species = SPECIES_SHARPEDO, + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie[] = { - { - .iv = 150, - .lvl = 41, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 150, - .lvl = 41, - .species = SPECIES_CROBAT, - }, - { - .iv = 150, - .lvl = 43, - .species = SPECIES_SHARPEDO, - } + { + .iv = 150, + .lvl = 41, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 41, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leah[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_SPOINK, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_SPOINK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ROSELIA, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ROSELIA, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Felix[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_CLAYDOL, - .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CLAYDOL, + .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GLOOM, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GLOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_ROSELIA, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_GLOOM, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_ROSELIA, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GLOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_GLOOM, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_ROSELIA, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GLOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_BRELOOM, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_GLOOM, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_ROSELIA, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_GLOOM, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = { - { - .iv = 50, - .lvl = 23, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 50, + .lvl = 23, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = { - { - .iv = 50, - .lvl = 27, - .species = SPECIES_BALTOY, - .moves = MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER - }, - { - .iv = 50, - .lvl = 27, - .species = SPECIES_SANDSHREW, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - }, - { - .iv = 50, - .lvl = 27, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 50, + .lvl = 27, + .species = SPECIES_BALTOY, + .moves = MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER + }, + { + .iv = 50, + .lvl = 27, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + }, + { + .iv = 50, + .lvl = 27, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = { - { - .iv = 100, - .lvl = 25, - .species = SPECIES_SANDSHREW, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - }, - { - .iv = 100, - .lvl = 25, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 100, + .lvl = 25, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + }, + { + .iv = 100, + .lvl = 25, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = { - { - .iv = 60, - .lvl = 27, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 60, + .lvl = 27, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = { - { - .iv = 70, - .lvl = 30, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 70, + .lvl = 30, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = { - { - .iv = 80, - .lvl = 33, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 80, + .lvl = 33, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = { - { - .iv = 90, - .lvl = 36, - .species = SPECIES_SANDSLASH, - .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING - } + { + .iv = 90, + .lvl = 36, + .species = SPECIES_SANDSLASH, + .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = { - { - .iv = 50, - .lvl = 17, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 50, - .lvl = 17, - .species = SPECIES_WHISMUR, - } + { + .iv = 50, + .lvl = 17, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 50, + .lvl = 17, + .species = SPECIES_WHISMUR, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_LOUDRED, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = { - { - .iv = 150, - .lvl = 30, - .species = SPECIES_MAGNETON, - }, - { - .iv = 150, - .lvl = 30, - .species = SPECIES_LOUDRED, - } + { + .iv = 150, + .lvl = 30, + .species = SPECIES_MAGNETON, + }, + { + .iv = 150, + .lvl = 30, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = { - { - .iv = 200, - .lvl = 33, - .species = SPECIES_MAGNETON, - }, - { - .iv = 200, - .lvl = 33, - .species = SPECIES_LOUDRED, - } + { + .iv = 200, + .lvl = 33, + .species = SPECIES_MAGNETON, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = { - { - .iv = 250, - .lvl = 36, - .species = SPECIES_MAGNETON, - }, - { - .iv = 250, - .lvl = 36, - .species = SPECIES_LOUDRED, - } + { + .iv = 250, + .lvl = 36, + .species = SPECIES_MAGNETON, + }, + { + .iv = 250, + .lvl = 36, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = { - { - .iv = 250, - .lvl = 39, - .species = SPECIES_MAGNETON, - .moves = MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT - }, - { - .iv = 250, - .lvl = 39, - .species = SPECIES_EXPLOUD, - .moves = MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE - } + { + .iv = 250, + .lvl = 39, + .species = SPECIES_MAGNETON, + .moves = MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT + }, + { + .iv = 250, + .lvl = 39, + .species = SPECIES_EXPLOUD, + .moves = MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = { - { - .iv = 10, - .lvl = 12, - .species = SPECIES_AZURILL, - }, - { - .iv = 10, - .lvl = 12, - .species = SPECIES_AZURILL, - } + { + .iv = 10, + .lvl = 12, + .species = SPECIES_AZURILL, + }, + { + .iv = 10, + .lvl = 12, + .species = SPECIES_AZURILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austina[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_MARILL, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_MARILL, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_MARILL, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MARILL, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_MARILL, - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_MARILL, - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MARILL, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = { - { - .iv = 40, - .lvl = 35, - .species = SPECIES_AZUMARILL, - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_AZUMARILL, - } + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AZUMARILL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = { - { - .iv = 10, - .lvl = 13, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 10, + .lvl = 13, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = { - { - .iv = 0, - .lvl = 12, - .species = SPECIES_AZURILL, - }, - { - .iv = 0, - .lvl = 12, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 12, + .species = SPECIES_AZURILL, + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_LINOONE, - .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = { - { - .iv = 20, - .lvl = 30, - .species = SPECIES_LINOONE, - .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 20, + .lvl = 30, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = { - { - .iv = 30, - .lvl = 33, - .species = SPECIES_LINOONE, - .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 30, + .lvl = 33, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_LINOONE, - .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Randall[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_SWELLOW, - .heldItem = ITEM_NONE, - .moves = MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SWELLOW, + .heldItem = ITEM_NONE, + .moves = MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Parker[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_George[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_SLAKOTH, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_SLAKOTH, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Berke[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_VIGOROTH, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_VIGOROTH, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Braxton[] = { - { - .iv = 100, - .lvl = 28, - .species = SPECIES_SWELLOW, - .moves = MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR - }, - { - .iv = 100, - .lvl = 28, - .species = SPECIES_TRAPINCH, - .moves = MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB - }, - { - .iv = 100, - .lvl = 28, - .species = SPECIES_WAILMER, - .moves = MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE - }, - { - .iv = 100, - .lvl = 28, - .species = SPECIES_MAGNETON, - .moves = MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM - }, - { - .iv = 100, - .lvl = 28, - .species = SPECIES_SHIFTRY, - .moves = MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER - } + { + .iv = 100, + .lvl = 28, + .species = SPECIES_SWELLOW, + .moves = MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_TRAPINCH, + .moves = MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_WAILMER, + .moves = MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_MAGNETON, + .moves = MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM + }, + { + .iv = 100, + .lvl = 28, + .species = SPECIES_SHIFTRY, + .moves = MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = { - { - .iv = 100, - .lvl = 44, - .species = SPECIES_SABLEYE, - }, - { - .iv = 100, - .lvl = 44, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 100, - .lvl = 44, - .species = SPECIES_SHARPEDO, - } + { + .iv = 100, + .lvl = 44, + .species = SPECIES_SABLEYE, + }, + { + .iv = 100, + .lvl = 44, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 100, + .lvl = 44, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = { - { - .iv = 100, - .lvl = 46, - .species = SPECIES_MAWILE, - }, - { - .iv = 100, - .lvl = 46, - .species = SPECIES_STARMIE, - } + { + .iv = 100, + .lvl = 46, + .species = SPECIES_MAWILE, + }, + { + .iv = 100, + .lvl = 46, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_WAILMER, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_MAKUHITA, - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_WAILMER, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_CACTURNE, - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_PELIPPER, - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_CACTURNE, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_MAGNETON, - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_MUK, - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_MAGNETON, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_MUK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_SWELLOW, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_MAWILE, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_KADABRA, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SWELLOW, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_MAWILE, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_DODRIO, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_KADABRA, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_ELECTRODE, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_SHIFTRY, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_DODRIO, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KADABRA, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_ELECTRODE, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SHIFTRY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_KECLEON, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_GRAVELER, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_WAILORD, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_KECLEON, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_GRAVELER, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_WAILORD, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = { - { - .iv = 110, - .lvl = 26, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_WAILMER, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_MAKUHITA, - } + { + .iv = 110, + .lvl = 26, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_WAILMER, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = { - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_WAILMER, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MAKUHITA, - } + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_WAILMER, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = { - { - .iv = 130, - .lvl = 32, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_WAILMER, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_MAKUHITA, - } + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_WAILMER, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = { - { - .iv = 140, - .lvl = 35, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 140, - .lvl = 35, - .species = SPECIES_WAILMER, - }, - { - .iv = 140, - .lvl = 35, - .species = SPECIES_HARIYAMA, - } + { + .iv = 140, + .lvl = 35, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_WAILMER, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = { - { - .iv = 100, - .lvl = 33, - .species = SPECIES_GRAVELER, - }, - { - .iv = 100, - .lvl = 33, - .species = SPECIES_LUDICOLO, - } + { + .iv = 100, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 100, + .lvl = 33, + .species = SPECIES_LUDICOLO, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Mary[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_DELCATTY, - .heldItem = ITEM_NONE, - .moves = MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_NONE, + .moves = MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Alexia[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_WIGGLYTUFF, - .heldItem = ITEM_NONE, - .moves = MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_WIGGLYTUFF, + .heldItem = ITEM_NONE, + .moves = MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Jody[] = { - { - .iv = 255, - .lvl = 26, - .species = SPECIES_ZANGOOSE, - .heldItem = ITEM_NONE, - .moves = MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE - } + { + .iv = 255, + .lvl = 26, + .species = SPECIES_ZANGOOSE, + .heldItem = ITEM_NONE, + .moves = MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_MAWILE, - .moves = MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_ROSELIA, - .moves = MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_PELIPPER, - .moves = MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_MAWILE, + .moves = MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_ROSELIA, + .moves = MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + .moves = MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keira[] = { - { - .iv = 100, - .lvl = 45, - .species = SPECIES_LAIRON, - }, - { - .iv = 100, - .lvl = 45, - .species = SPECIES_MANECTRIC, - } + { + .iv = 100, + .lvl = 45, + .species = SPECIES_LAIRON, + }, + { + .iv = 100, + .lvl = 45, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_WINGULL, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_NUMEL, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_ROSELIA, - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_WINGULL, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_NUMEL, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = { - { - .iv = 200, - .lvl = 30, - .species = SPECIES_SABLEYE, - } + { + .iv = 200, + .lvl = 30, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = { - { - .iv = 100, - .lvl = 45, - .species = SPECIES_ROSELIA, - } + { + .iv = 100, + .lvl = 45, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = { - { - .iv = 100, - .lvl = 45, - .species = SPECIES_CLAYDOL, - } + { + .iv = 100, + .lvl = 45, + .species = SPECIES_CLAYDOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_TORKOAL, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_LUDICOLO, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_TORKOAL, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_LUDICOLO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_SKARMORY, - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_SABLEYE, - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SKARMORY, + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = { - { - .iv = 100, - .lvl = 42, - .species = SPECIES_SANDSLASH, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_NINETALES, - }, - { - .iv = 100, - .lvl = 42, - .species = SPECIES_TROPIUS, - } + { + .iv = 100, + .lvl = 42, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_NINETALES, + }, + { + .iv = 100, + .lvl = 42, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = { - { - .iv = 110, - .lvl = 26, - .species = SPECIES_WINGULL, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_NUMEL, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_ROSELIA, - } + { + .iv = 110, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_NUMEL, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = { - { - .iv = 120, - .lvl = 29, - .species = SPECIES_PELIPPER, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_NUMEL, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_ROSELIA, - } + { + .iv = 120, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_NUMEL, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = { - { - .iv = 130, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_NUMEL, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_ROSELIA, - } + { + .iv = 130, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_NUMEL, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = { - { - .iv = 140, - .lvl = 34, - .species = SPECIES_PELIPPER, - }, - { - .iv = 140, - .lvl = 34, - .species = SPECIES_CAMERUPT, - }, - { - .iv = 140, - .lvl = 34, - .species = SPECIES_ROSELIA, - } + { + .iv = 140, + .lvl = 34, + .species = SPECIES_PELIPPER, + }, + { + .iv = 140, + .lvl = 34, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 140, + .lvl = 34, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_BANETTE, - }, - { - .iv = 0, - .lvl = 41, - .species = SPECIES_LUNATONE, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_BANETTE, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_DUSKULL, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_SHUPPET, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_DUSKULL, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SHUPPET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_DUSKULL, - }, - { - .iv = 0, - .lvl = 29, - .species = SPECIES_SHUPPET, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_DUSKULL, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SHUPPET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SABLEYE, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = { - { - .iv = 50, - .lvl = 32, - .species = SPECIES_SHUPPET, - } + { + .iv = 50, + .lvl = 32, + .species = SPECIES_SHUPPET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = { - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SABLEYE, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SPOINK, - } + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SABLEYE, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SPOINK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = { - { - .iv = 20, - .lvl = 35, - .species = SPECIES_SPOINK, - }, - { - .iv = 20, - .lvl = 35, - .species = SPECIES_SABLEYE, - } + { + .iv = 20, + .lvl = 35, + .species = SPECIES_SPOINK, + }, + { + .iv = 20, + .lvl = 35, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = { - { - .iv = 30, - .lvl = 40, - .species = SPECIES_SPOINK, - }, - { - .iv = 30, - .lvl = 40, - .species = SPECIES_SABLEYE, - } + { + .iv = 30, + .lvl = 40, + .species = SPECIES_SPOINK, + }, + { + .iv = 30, + .lvl = 40, + .species = SPECIES_SABLEYE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = { - { - .iv = 40, - .lvl = 42, - .species = SPECIES_DUSKULL, - }, - { - .iv = 40, - .lvl = 42, - .species = SPECIES_SABLEYE, - }, - { - .iv = 40, - .lvl = 42, - .species = SPECIES_GRUMPIG, - } + { + .iv = 40, + .lvl = 42, + .species = SPECIES_DUSKULL, + }, + { + .iv = 40, + .lvl = 42, + .species = SPECIES_SABLEYE, + }, + { + .iv = 40, + .lvl = 42, + .species = SPECIES_GRUMPIG, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = { - { - .iv = 0, - .lvl = 7, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 7, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Daphne[] = { - { - .iv = 100, - .lvl = 39, - .species = SPECIES_LUVDISC, - .heldItem = ITEM_NUGGET, - .moves = MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_LUVDISC, - .heldItem = ITEM_NUGGET, - .moves = MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE - } + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NUGGET, + .moves = MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NUGGET, + .moves = MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Cindy2[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET, - .moves = MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET, + .moves = MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna[] = { - { - .iv = 150, - .lvl = 40, - .species = SPECIES_SEAKING, - .heldItem = ITEM_NUGGET - } + { + .iv = 150, + .lvl = 40, + .species = SPECIES_SEAKING, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Naomi[] = { - { - .iv = 100, - .lvl = 45, - .species = SPECIES_ROSELIA, - .heldItem = ITEM_NUGGET - } + { + .iv = 100, + .lvl = 45, + .species = SPECIES_ROSELIA, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = { - { - .iv = 20, - .lvl = 30, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 20, + .lvl = 30, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = { - { - .iv = 30, - .lvl = 33, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 30, + .lvl = 33, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET, - .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET, + .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 0, - .lvl = 29, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = { - { - .iv = 100, - .lvl = 40, - .species = SPECIES_GOLDEEN, - } + { + .iv = 100, + .lvl = 40, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = { - { - .iv = 150, - .lvl = 40, - .species = SPECIES_AZUMARILL, - } + { + .iv = 150, + .lvl = 40, + .species = SPECIES_AZUMARILL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = { - { - .iv = 100, - .lvl = 35, - .species = SPECIES_CLAMPERL, - .moves = MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE - }, - { - .iv = 100, - .lvl = 37, - .species = SPECIES_CORPHISH, - .moves = MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_LOMBRE, - .moves = MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE - } + { + .iv = 100, + .lvl = 35, + .species = SPECIES_CLAMPERL, + .moves = MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_CORPHISH, + .moves = MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_LOMBRE, + .moves = MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = { - { - .iv = 100, - .lvl = 39, - .species = SPECIES_CARVANHA, - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_SHARPEDO, - } + { + .iv = 100, + .lvl = 39, + .species = SPECIES_CARVANHA, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = { - { - .iv = 10, - .lvl = 35, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 10, - .lvl = 35, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 10, + .lvl = 35, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = { - { - .iv = 20, - .lvl = 38, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 20, - .lvl = 38, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 20, + .lvl = 38, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 20, + .lvl = 38, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = { - { - .iv = 30, - .lvl = 41, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 30, + .lvl = 41, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = { - { - .iv = 40, - .lvl = 44, - .species = SPECIES_KECLEON, - .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK - }, - { - .iv = 40, - .lvl = 44, - .species = SPECIES_SEVIPER, - .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH - } + { + .iv = 40, + .lvl = 44, + .species = SPECIES_KECLEON, + .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK + }, + { + .iv = 40, + .lvl = 44, + .species = SPECIES_SEVIPER, + .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = { - { - .iv = 0, - .lvl = 7, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 7, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mollie[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WHISCASH, - }, - { - .iv = 200, - .lvl = 33, - .species = SPECIES_MEDITITE, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WHISCASH, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_AZUMARILL, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_AZUMARILL, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NUGGET, - .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NUGGET, + .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_ARON, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ARON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia1[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_HORSEA, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_HORSEA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_RHYHORN, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_RHYHORN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = { - { - .iv = 0, - .lvl = 20, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 20, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_LAIRON, - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_LAIRON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_LAIRON, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_RHYHORN, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LAIRON, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_RHYHORN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_LAIRON, - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_RHYHORN, - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_LAIRON, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_RHYHORN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = { - { - .iv = 40, - .lvl = 35, - .species = SPECIES_AGGRON, - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_RHYDON, - } + { + .iv = 40, + .lvl = 35, + .species = SPECIES_AGGRON, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_RHYDON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dominik[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = { - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - } + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = { - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - } + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolen[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_HORSEA, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_HORSEA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CARVANHA, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_PELIPPER, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Santiago[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACRUEL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SEALEO, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEALEO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SPHEAL, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SPHEAL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = { - { - .iv = 10, - .lvl = 30, - .species = SPECIES_SHARPEDO, - } + { + .iv = 10, + .lvl = 30, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_SHARPEDO, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_STARYU, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_SHARPEDO, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_STARYU, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_STARMIE, - }, - { - .iv = 40, - .lvl = 39, - .species = SPECIES_SHARPEDO, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_STARMIE, + }, + { + .iv = 40, + .lvl = 39, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takao[] = { - { - .iv = 127, - .lvl = 13, - .species = SPECIES_MACHOP, - } + { + .iv = 127, + .lvl = 13, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = { - { - .iv = 50, - .lvl = 32, - .species = SPECIES_MACHOP, - }, - { - .iv = 200, - .lvl = 32, - .species = SPECIES_MACHOKE, - } + { + .iv = 50, + .lvl = 32, + .species = SPECIES_MACHOP, + }, + { + .iv = 200, + .lvl = 32, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = { - { - .iv = 100, - .lvl = 34, - .species = SPECIES_HARIYAMA, - } + { + .iv = 100, + .lvl = 34, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = { - { - .iv = 100, - .lvl = 24, - .species = SPECIES_MACHOP, - }, - { - .iv = 150, - .lvl = 28, - .species = SPECIES_MACHOKE, - } + { + .iv = 100, + .lvl = 24, + .species = SPECIES_MACHOP, + }, + { + .iv = 150, + .lvl = 28, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = { - { - .iv = 100, - .lvl = 19, - .species = SPECIES_MACHOP, - } + { + .iv = 100, + .lvl = 19, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = { - { - .iv = 110, - .lvl = 27, - .species = SPECIES_MACHOKE, - } + { + .iv = 110, + .lvl = 27, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = { - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MACHOP, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MACHOKE, - } + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MACHOP, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = { - { - .iv = 130, - .lvl = 31, - .species = SPECIES_MACHOP, - }, - { - .iv = 130, - .lvl = 31, - .species = SPECIES_MACHOKE, - }, - { - .iv = 130, - .lvl = 31, - .species = SPECIES_MACHOKE, - } + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOP, + }, + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOKE, + }, + { + .iv = 130, + .lvl = 31, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = { - { - .iv = 140, - .lvl = 33, - .species = SPECIES_MACHOP, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 33, - .species = SPECIES_MACHOKE, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 33, - .species = SPECIES_MACHOKE, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 33, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_BLACK_BELT - } + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOP, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOKE, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHOKE, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 33, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_BLACK_BELT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = { - { - .iv = 100, - .lvl = 26, - .species = SPECIES_MAKUHITA, - }, - { - .iv = 100, - .lvl = 26, - .species = SPECIES_MACHOKE, - } + { + .iv = 100, + .lvl = 26, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 100, + .lvl = 26, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = { - { - .iv = 100, - .lvl = 19, - .species = SPECIES_MACHOP, - } + { + .iv = 100, + .lvl = 19, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = { - { - .iv = 100, - .lvl = 32, - .species = SPECIES_HARIYAMA, - } + { + .iv = 100, + .lvl = 32, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Kirk[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_ELECTRIKE, - .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_VOLTORB, - .moves = MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ELECTRIKE, + .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLTORB, + .moves = MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_VOLTORB, - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLTORB, + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando1[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_LOUDRED, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 0, - .lvl = 15, - .species = SPECIES_WHISMUR, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_WHISMUR, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_WHISMUR, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WHISMUR, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_LOUDRED, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_LOUDRED, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_MAGNETON, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_LOUDRED, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_MAGNETON, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_MAGNETON, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_LOUDRED, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_MAGNETON, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_EXPLOUD, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_MAGNETON, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_MAGNETON, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_EXPLOUD, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_NUMEL, - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = { - { - .iv = 100, - .lvl = 22, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 22, - .species = SPECIES_SLUGMA, - } + { + .iv = 100, + .lvl = 22, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 22, + .species = SPECIES_SLUGMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_NUMEL, - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jace[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_SLUGMA, - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_SLUGMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Keegan[] = { - { - .iv = 120, - .lvl = 23, - .species = SPECIES_SLUGMA, - } + { + .iv = 120, + .lvl = 23, + .species = SPECIES_SLUGMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_SLUGMA, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_WINGULL, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SLUGMA, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_PELIPPER, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_PELIPPER, - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = { - { - .iv = 40, - .lvl = 35, - .species = SPECIES_MAGCARGO, - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_PELIPPER, - } + { + .iv = 40, + .lvl = 35, + .species = SPECIES_MAGCARGO, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = { - { - .iv = 0, - .lvl = 23, - .species = SPECIES_SANDSHREW, - .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH - } + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Beau[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_BALTOY, - .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - }, - { - .iv = 0, - .lvl = 21, - .species = SPECIES_SANDSHREW, - .moves = MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG - }, - { - .iv = 0, - .lvl = 21, - .species = SPECIES_BALTOY, - .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SANDSHREW, + .moves = MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = { - { - .iv = 0, - .lvl = 24, - .species = SPECIES_KECLEON, - } + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KECLEON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = { - { - .iv = 0, - .lvl = 20, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 20, - .species = SPECIES_TAILLOW, - } + { + .iv = 0, + .lvl = 20, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Autumn[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SANDSHREW, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_TAILLOW, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_LINOONE, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_SWELLOW, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SWELLOW, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_LINOONE, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_LINOONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_SWELLOW, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_SANDSLASH, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_LINOONE, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_LINOONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = { - { - .iv = 100, - .lvl = 26, - .species = SPECIES_SURSKIT, - } + { + .iv = 100, + .lvl = 26, + .species = SPECIES_SURSKIT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = { - { - .iv = 100, - .lvl = 24, - .species = SPECIES_WURMPLE, - }, - { - .iv = 100, - .lvl = 24, - .species = SPECIES_SILCOON, - }, - { - .iv = 100, - .lvl = 24, - .species = SPECIES_BEAUTIFLY, - } + { + .iv = 100, + .lvl = 24, + .species = SPECIES_WURMPLE, + }, + { + .iv = 100, + .lvl = 24, + .species = SPECIES_SILCOON, + }, + { + .iv = 100, + .lvl = 24, + .species = SPECIES_BEAUTIFLY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_WURMPLE, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_CASCOON, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_DUSTOX, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_WURMPLE, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_CASCOON, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_DUSTOX, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey1[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_SURSKIT, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_SURSKIT, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_SURSKIT, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_SURSKIT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = { - { - .iv = 150, - .lvl = 16, - .species = SPECIES_DUSTOX, - }, - { - .iv = 150, - .lvl = 16, - .species = SPECIES_BEAUTIFLY, - } + { + .iv = 150, + .lvl = 16, + .species = SPECIES_DUSTOX, + }, + { + .iv = 150, + .lvl = 16, + .species = SPECIES_BEAUTIFLY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey2[] = { - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SURSKIT, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SURSKIT, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SURSKIT, - } + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SURSKIT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey3[] = { - { - .iv = 20, - .lvl = 34, - .species = SPECIES_SURSKIT, - }, - { - .iv = 20, - .lvl = 34, - .species = SPECIES_SURSKIT, - }, - { - .iv = 20, - .lvl = 34, - .species = SPECIES_MASQUERAIN, - } + { + .iv = 20, + .lvl = 34, + .species = SPECIES_SURSKIT, + }, + { + .iv = 20, + .lvl = 34, + .species = SPECIES_SURSKIT, + }, + { + .iv = 20, + .lvl = 34, + .species = SPECIES_MASQUERAIN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeffrey4[] = { - { - .iv = 30, - .lvl = 36, - .species = SPECIES_SURSKIT, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_WURMPLE, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_SURSKIT, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_MASQUERAIN, - } + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_WURMPLE, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MASQUERAIN, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Jeffrey5[] = { - { - .iv = 40, - .lvl = 38, - .species = SPECIES_SURSKIT, - .heldItem = ITEM_NONE - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_DUSTOX, - .heldItem = ITEM_NONE - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_SURSKIT, - .heldItem = ITEM_NONE - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_MASQUERAIN, - .heldItem = ITEM_SILVER_POWDER - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_BEAUTIFLY, - .heldItem = ITEM_NONE - } + { + .iv = 40, + .lvl = 38, + .species = SPECIES_SURSKIT, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_DUSTOX, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_SURSKIT, + .heldItem = ITEM_NONE + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_MASQUERAIN, + .heldItem = ITEM_SILVER_POWDER + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_BEAUTIFLY, + .heldItem = ITEM_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_ABRA, - .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ABRA, + .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_KIRLIA, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KIRLIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_RALTS, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Blake[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_GIRAFARIG, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_GIRAFARIG, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_RALTS, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_RALTS, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KIRLIA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KIRLIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_KADABRA, - }, - { - .iv = 0, - .lvl = 41, - .species = SPECIES_SOLROCK, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_SOLROCK, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = { - { - .iv = 10, - .lvl = 33, - .species = SPECIES_KADABRA, - }, - { - .iv = 10, - .lvl = 33, - .species = SPECIES_SOLROCK, - } + { + .iv = 10, + .lvl = 33, + .species = SPECIES_KADABRA, + }, + { + .iv = 10, + .lvl = 33, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = { - { - .iv = 20, - .lvl = 38, - .species = SPECIES_KADABRA, - }, - { - .iv = 20, - .lvl = 38, - .species = SPECIES_SOLROCK, - } + { + .iv = 20, + .lvl = 38, + .species = SPECIES_KADABRA, + }, + { + .iv = 20, + .lvl = 38, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = { - { - .iv = 30, - .lvl = 41, - .species = SPECIES_KADABRA, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_SOLROCK, - } + { + .iv = 30, + .lvl = 41, + .species = SPECIES_KADABRA, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_SOLROCK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = { - { - .iv = 40, - .lvl = 45, - .species = SPECIES_SOLROCK, - }, - { - .iv = 40, - .lvl = 45, - .species = SPECIES_ALAKAZAM, - } + { + .iv = 40, + .lvl = 45, + .species = SPECIES_SOLROCK, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_ALAKAZAM, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_ABRA, - .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ABRA, + .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_KIRLIA, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KIRLIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_XATU, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_KADABRA, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WOBBUFFET, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_NATU, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KADABRA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WOBBUFFET, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NATU, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_KIRLIA, - }, - { - .iv = 0, - .lvl = 41, - .species = SPECIES_XATU, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KIRLIA, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_KADABRA, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_LUNATONE, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = { - { - .iv = 10, - .lvl = 34, - .species = SPECIES_KADABRA, - }, - { - .iv = 10, - .lvl = 34, - .species = SPECIES_LUNATONE, - } + { + .iv = 10, + .lvl = 34, + .species = SPECIES_KADABRA, + }, + { + .iv = 10, + .lvl = 34, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = { - { - .iv = 20, - .lvl = 37, - .species = SPECIES_KADABRA, - }, - { - .iv = 20, - .lvl = 37, - .species = SPECIES_LUNATONE, - } + { + .iv = 20, + .lvl = 37, + .species = SPECIES_KADABRA, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = { - { - .iv = 30, - .lvl = 40, - .species = SPECIES_KADABRA, - }, - { - .iv = 30, - .lvl = 40, - .species = SPECIES_LUNATONE, - } + { + .iv = 30, + .lvl = 40, + .species = SPECIES_KADABRA, + }, + { + .iv = 30, + .lvl = 40, + .species = SPECIES_LUNATONE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = { - { - .iv = 40, - .lvl = 43, - .species = SPECIES_LUNATONE, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_ALAKAZAM, - } + { + .iv = 40, + .lvl = 43, + .species = SPECIES_LUNATONE, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_ALAKAZAM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MANECTRIC, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Micah[] = { - { - .iv = 0, - .lvl = 44, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 0, - .lvl = 44, - .species = SPECIES_MANECTRIC, - } + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_ZANGOOSE, - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_ZANGOOSE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = { - { - .iv = 10, - .lvl = 34, - .species = SPECIES_MANECTRIC, - } + { + .iv = 10, + .lvl = 34, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = { - { - .iv = 20, - .lvl = 36, - .species = SPECIES_LINOONE, - .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - }, - { - .iv = 20, - .lvl = 36, - .species = SPECIES_MANECTRIC, - .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR - } + { + .iv = 20, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = { - { - .iv = 30, - .lvl = 39, - .species = SPECIES_LINOONE, - .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - }, - { - .iv = 30, - .lvl = 39, - .species = SPECIES_MANECTRIC, - .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE - } + { + .iv = 30, + .lvl = 39, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = { - { - .iv = 40, - .lvl = 41, - .species = SPECIES_LINOONE, - .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_GOLDUCK, - .moves = MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_MANECTRIC, - .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR - } + { + .iv = 40, + .lvl = 41, + .species = SPECIES_LINOONE, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_GOLDUCK, + .moves = MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = { - { - .iv = 250, - .lvl = 46, - .species = SPECIES_MIGHTYENA, - .heldItem = ITEM_NONE, - .moves = MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH - }, - { - .iv = 250, - .lvl = 48, - .species = SPECIES_SHIFTRY, - .heldItem = ITEM_NONE, - .moves = MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY - }, - { - .iv = 250, - .lvl = 46, - .species = SPECIES_CACTURNE, - .heldItem = ITEM_NONE, - .moves = MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE - }, - { - .iv = 250, - .lvl = 48, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE - }, - { - .iv = 255, - .lvl = 49, - .species = SPECIES_ABSOL, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH - } + { + .iv = 250, + .lvl = 46, + .species = SPECIES_MIGHTYENA, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_SHIFTRY, + .heldItem = ITEM_NONE, + .moves = MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY + }, + { + .iv = 250, + .lvl = 46, + .species = SPECIES_CACTURNE, + .heldItem = ITEM_NONE, + .moves = MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_ABSOL, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = { - { - .iv = 250, - .lvl = 48, - .species = SPECIES_DUSCLOPS, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT - }, - { - .iv = 250, - .lvl = 49, - .species = SPECIES_BANETTE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK - }, - { - .iv = 250, - .lvl = 50, - .species = SPECIES_SABLEYE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK - }, - { - .iv = 250, - .lvl = 49, - .species = SPECIES_BANETTE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_DUSCLOPS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE - } + { + .iv = 250, + .lvl = 48, + .species = SPECIES_DUSCLOPS, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT + }, + { + .iv = 250, + .lvl = 49, + .species = SPECIES_BANETTE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK + }, + { + .iv = 250, + .lvl = 50, + .species = SPECIES_SABLEYE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK + }, + { + .iv = 250, + .lvl = 49, + .species = SPECIES_BANETTE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_DUSCLOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = { - { - .iv = 250, - .lvl = 50, - .species = SPECIES_SEALEO, - .heldItem = ITEM_NONE, - .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL - }, - { - .iv = 250, - .lvl = 50, - .species = SPECIES_GLALIE, - .heldItem = ITEM_NONE, - .moves = MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM - }, - { - .iv = 250, - .lvl = 52, - .species = SPECIES_SEALEO, - .heldItem = ITEM_NONE, - .moves = MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD - }, - { - .iv = 250, - .lvl = 52, - .species = SPECIES_GLALIE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_WALREIN, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD - } + { + .iv = 250, + .lvl = 50, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL + }, + { + .iv = 250, + .lvl = 50, + .species = SPECIES_GLALIE, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM + }, + { + .iv = 250, + .lvl = 52, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD + }, + { + .iv = 250, + .lvl = 52, + .species = SPECIES_GLALIE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_WALREIN, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = { - { - .iv = 250, - .lvl = 52, - .species = SPECIES_SHELGON, - .heldItem = ITEM_NONE, - .moves = MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE - }, - { - .iv = 250, - .lvl = 54, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_NONE, - .moves = MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE - }, - { - .iv = 250, - .lvl = 53, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_NONE, - .moves = MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM - }, - { - .iv = 250, - .lvl = 53, - .species = SPECIES_FLYGON, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_SALAMENCE, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH - } + { + .iv = 250, + .lvl = 52, + .species = SPECIES_SHELGON, + .heldItem = ITEM_NONE, + .moves = MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE + }, + { + .iv = 250, + .lvl = 54, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE, + .moves = MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE + }, + { + .iv = 250, + .lvl = 53, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_NONE, + .moves = MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM + }, + { + .iv = 250, + .lvl = 53, + .species = SPECIES_FLYGON, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SALAMENCE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne1[] = { - { - .iv = 100, - .lvl = 12, - .species = SPECIES_GEODUDE, - .heldItem = ITEM_NONE, - .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB - }, - { - .iv = 100, - .lvl = 12, - .species = SPECIES_GEODUDE, - .heldItem = ITEM_NONE, - .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB - }, - { - .iv = 200, - .lvl = 15, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB - } + { + .iv = 100, + .lvl = 12, + .species = SPECIES_GEODUDE, + .heldItem = ITEM_NONE, + .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB + }, + { + .iv = 100, + .lvl = 12, + .species = SPECIES_GEODUDE, + .heldItem = ITEM_NONE, + .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB + }, + { + .iv = 200, + .lvl = 15, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly1[] = { - { - .iv = 100, - .lvl = 16, - .species = SPECIES_MACHOP, - .heldItem = ITEM_NONE, - .moves = MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP - }, - { - .iv = 100, - .lvl = 16, - .species = SPECIES_MEDITITE, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP - }, - { - .iv = 200, - .lvl = 19, - .species = SPECIES_MAKUHITA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP - } + { + .iv = 100, + .lvl = 16, + .species = SPECIES_MACHOP, + .heldItem = ITEM_NONE, + .moves = MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP + }, + { + .iv = 100, + .lvl = 16, + .species = SPECIES_MEDITITE, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP + }, + { + .iv = 200, + .lvl = 19, + .species = SPECIES_MAKUHITA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson1[] = { - { - .iv = 200, - .lvl = 20, - .species = SPECIES_VOLTORB, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE - }, - { - .iv = 200, - .lvl = 20, - .species = SPECIES_ELECTRIKE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL - }, - { - .iv = 220, - .lvl = 22, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_NONE, - .moves = MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM - }, - { - .iv = 250, - .lvl = 24, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL - } + { + .iv = 200, + .lvl = 20, + .species = SPECIES_VOLTORB, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE + }, + { + .iv = 200, + .lvl = 20, + .species = SPECIES_ELECTRIKE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL + }, + { + .iv = 220, + .lvl = 22, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_NONE, + .moves = MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM + }, + { + .iv = 250, + .lvl = 24, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery1[] = { - { - .iv = 200, - .lvl = 24, - .species = SPECIES_NUMEL, - .heldItem = ITEM_NONE, - .moves = MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - }, - { - .iv = 200, - .lvl = 24, - .species = SPECIES_SLUGMA, - .heldItem = ITEM_NONE, - .moves = MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY - }, - { - .iv = 250, - .lvl = 26, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_NONE, - .moves = MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT - }, - { - .iv = 250, - .lvl = 29, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT - } + { + .iv = 200, + .lvl = 24, + .species = SPECIES_NUMEL, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + }, + { + .iv = 200, + .lvl = 24, + .species = SPECIES_SLUGMA, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY + }, + { + .iv = 250, + .lvl = 26, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_NONE, + .moves = MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT + }, + { + .iv = 250, + .lvl = 29, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman1[] = { - { - .iv = 200, - .lvl = 27, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE - }, - { - .iv = 200, - .lvl = 27, - .species = SPECIES_VIGOROTH, - .heldItem = ITEM_NONE, - .moves = MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK - }, - { - .iv = 200, - .lvl = 29, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NONE, - .moves = MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT - }, - { - .iv = 250, - .lvl = 31, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK - } + { + .iv = 200, + .lvl = 27, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE + }, + { + .iv = 200, + .lvl = 27, + .species = SPECIES_VIGOROTH, + .heldItem = ITEM_NONE, + .moves = MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK + }, + { + .iv = 200, + .lvl = 29, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NONE, + .moves = MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT + }, + { + .iv = 250, + .lvl = 31, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona1[] = { - { - .iv = 210, - .lvl = 29, - .species = SPECIES_SWABLU, - .heldItem = ITEM_NONE, - .moves = MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE - }, - { - .iv = 210, - .lvl = 29, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS - }, - { - .iv = 210, - .lvl = 30, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 220, - .lvl = 31, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 33, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE - } + { + .iv = 210, + .lvl = 29, + .species = SPECIES_SWABLU, + .heldItem = ITEM_NONE, + .moves = MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE + }, + { + .iv = 210, + .lvl = 29, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS + }, + { + .iv = 210, + .lvl = 30, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 220, + .lvl = 31, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 33, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza1[] = { - { - .iv = 250, - .lvl = 41, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 250, - .lvl = 41, - .species = SPECIES_XATU, - .heldItem = ITEM_NONE, - .moves = MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 250, - .lvl = 42, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND - }, - { - .iv = 250, - .lvl = 42, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 250, + .lvl = 41, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 250, + .lvl = 41, + .species = SPECIES_XATU, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 250, + .lvl = 42, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND + }, + { + .iv = 250, + .lvl = 42, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan1[] = { - { - .iv = 200, - .lvl = 41, - .species = SPECIES_LUVDISC, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL - }, - { - .iv = 200, - .lvl = 41, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE - }, - { - .iv = 200, - .lvl = 43, - .species = SPECIES_SEALEO, - .heldItem = ITEM_NONE, - .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE - }, - { - .iv = 200, - .lvl = 43, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER - }, - { - .iv = 250, - .lvl = 46, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 200, + .lvl = 41, + .species = SPECIES_LUVDISC, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL + }, + { + .iv = 200, + .lvl = 41, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE + }, + { + .iv = 200, + .lvl = 43, + .species = SPECIES_SEALEO, + .heldItem = ITEM_NONE, + .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE + }, + { + .iv = 200, + .lvl = 43, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER + }, + { + .iv = 250, + .lvl = 46, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = { - { - .iv = 10, - .lvl = 9, - .species = SPECIES_RALTS, - } + { + .iv = 10, + .lvl = 9, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = { - { - .iv = 10, - .lvl = 17, - .species = SPECIES_RALTS, - } + { + .iv = 10, + .lvl = 17, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = { - { - .iv = 10, - .lvl = 15, - .species = SPECIES_NUMEL, - }, - { - .iv = 10, - .lvl = 15, - .species = SPECIES_ODDISH, - }, - { - .iv = 10, - .lvl = 15, - .species = SPECIES_WINGULL, - } + { + .iv = 10, + .lvl = 15, + .species = SPECIES_NUMEL, + }, + { + .iv = 10, + .lvl = 15, + .species = SPECIES_ODDISH, + }, + { + .iv = 10, + .lvl = 15, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = { - { - .iv = 20, - .lvl = 26, - .species = SPECIES_RALTS, - }, - { - .iv = 20, - .lvl = 26, - .species = SPECIES_MEDITITE, - } + { + .iv = 20, + .lvl = 26, + .species = SPECIES_RALTS, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = { - { - .iv = 30, - .lvl = 29, - .species = SPECIES_KIRLIA, - }, - { - .iv = 30, - .lvl = 29, - .species = SPECIES_MEDITITE, - } + { + .iv = 30, + .lvl = 29, + .species = SPECIES_KIRLIA, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = { - { - .iv = 40, - .lvl = 32, - .species = SPECIES_KIRLIA, - }, - { - .iv = 40, - .lvl = 32, - .species = SPECIES_MEDICHAM, - } + { + .iv = 40, + .lvl = 32, + .species = SPECIES_KIRLIA, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_MEDICHAM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = { - { - .iv = 50, - .lvl = 34, - .species = SPECIES_KIRLIA, - }, - { - .iv = 50, - .lvl = 34, - .species = SPECIES_BANETTE, - }, - { - .iv = 50, - .lvl = 34, - .species = SPECIES_MEDICHAM, - } + { + .iv = 50, + .lvl = 34, + .species = SPECIES_KIRLIA, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_BANETTE, + }, + { + .iv = 50, + .lvl = 34, + .species = SPECIES_MEDICHAM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = { - { - .iv = 10, - .lvl = 9, - .species = SPECIES_SHROOMISH, - } + { + .iv = 10, + .lvl = 9, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = { - { - .iv = 10, - .lvl = 16, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 16, - .species = SPECIES_BEAUTIFLY, - } + { + .iv = 10, + .lvl = 16, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 16, + .species = SPECIES_BEAUTIFLY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = { - { - .iv = 20, - .lvl = 26, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 20, - .lvl = 26, - .species = SPECIES_WHISMUR, - } + { + .iv = 20, + .lvl = 26, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_WHISMUR, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = { - { - .iv = 30, - .lvl = 29, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 30, - .lvl = 29, - .species = SPECIES_LOUDRED, - } + { + .iv = 30, + .lvl = 29, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = { - { - .iv = 40, - .lvl = 32, - .species = SPECIES_BRELOOM, - }, - { - .iv = 40, - .lvl = 32, - .species = SPECIES_LOUDRED, - } + { + .iv = 40, + .lvl = 32, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = { - { - .iv = 50, - .lvl = 35, - .species = SPECIES_BRELOOM, - }, - { - .iv = 50, - .lvl = 35, - .species = SPECIES_EXPLOUD, - } + { + .iv = 50, + .lvl = 35, + .species = SPECIES_BRELOOM, + }, + { + .iv = 50, + .lvl = 35, + .species = SPECIES_EXPLOUD, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_SPINDA, - .moves = MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE - }, - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SLAKING, - .moves = MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SPINDA, + .moves = MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SLAKING, + .moves = MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MAKUHITA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = { - { - .iv = 10, - .lvl = 28, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 10, - .lvl = 30, - .species = SPECIES_MAKUHITA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 10, + .lvl = 28, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = { - { - .iv = 20, - .lvl = 31, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_MAKUHITA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 20, + .lvl = 31, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_LINOONE, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_MAKUHITA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_LINOONE, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MAKUHITA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_LINOONE, - .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH - }, - { - .iv = 40, - .lvl = 38, - .species = SPECIES_HARIYAMA, - .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_LINOONE, + .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH + }, + { + .iv = 40, + .lvl = 38, + .species = SPECIES_HARIYAMA, + .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = { - { - .iv = 25, - .lvl = 16, - .species = SPECIES_TAILLOW, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 25, - .lvl = 16, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 25, + .lvl = 16, + .species = SPECIES_TAILLOW, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 25, + .lvl = 16, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 36, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 40, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 12, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - }, - { - .iv = 0, - .lvl = 42, - .species = SPECIES_DELCATTY, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 40, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + }, + { + .iv = 0, + .lvl = 42, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SKITTY, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SKITTY, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_DELCATTY, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = { - { - .iv = 0, - .lvl = 38, - .species = SPECIES_DELCATTY, - .heldItem = ITEM_SITRUS_BERRY - } + { + .iv = 0, + .lvl = 38, + .species = SPECIES_DELCATTY, + .heldItem = ITEM_SITRUS_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = { - { - .iv = 50, - .lvl = 17, - .species = SPECIES_ROSELIA, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 50, + .lvl = 17, + .species = SPECIES_ROSELIA, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_PIKACHU, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_PIKACHU, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Bethany[] = { - { - .iv = 100, - .lvl = 35, - .species = SPECIES_AZURILL, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 100, - .lvl = 37, - .species = SPECIES_MARILL, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_AZUMARILL, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 100, + .lvl = 35, + .species = SPECIES_AZURILL, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_MARILL, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_AZUMARILL, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = { - { - .iv = 40, - .lvl = 35, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_SITRUS_BERRY - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_MINUN, - .heldItem = ITEM_SITRUS_BERRY - } + { + .iv = 40, + .lvl = 35, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_SITRUS_BERRY + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_MINUN, + .heldItem = ITEM_SITRUS_BERRY + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = { - { - .iv = 200, - .lvl = 27, - .species = SPECIES_HARIYAMA, - } + { + .iv = 200, + .lvl = 27, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = { - { - .iv = 210, - .lvl = 33, - .species = SPECIES_HARIYAMA, - .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG - } + { + .iv = 210, + .lvl = 33, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = { - { - .iv = 220, - .lvl = 36, - .species = SPECIES_HARIYAMA, - .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG - } + { + .iv = 220, + .lvl = 36, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = { - { - .iv = 230, - .lvl = 39, - .species = SPECIES_HARIYAMA, - .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG - } + { + .iv = 230, + .lvl = 39, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = { - { - .iv = 240, - .lvl = 42, - .species = SPECIES_HARIYAMA, - .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG - } + { + .iv = 240, + .lvl = 42, + .species = SPECIES_HARIYAMA, + .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = { - { - .iv = 200, - .lvl = 18, - .species = SPECIES_MEDITITE, - .moves = MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT - } + { + .iv = 200, + .lvl = 18, + .species = SPECIES_MEDITITE, + .moves = MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = { - { - .iv = 200, - .lvl = 21, - .species = SPECIES_MEDITITE, - }, - { - .iv = 200, - .lvl = 21, - .species = SPECIES_MAKUHITA, - } + { + .iv = 200, + .lvl = 21, + .species = SPECIES_MEDITITE, + }, + { + .iv = 200, + .lvl = 21, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = { - { - .iv = 210, - .lvl = 30, - .species = SPECIES_MEDITITE, - }, - { - .iv = 210, - .lvl = 30, - .species = SPECIES_MAKUHITA, - } + { + .iv = 210, + .lvl = 30, + .species = SPECIES_MEDITITE, + }, + { + .iv = 210, + .lvl = 30, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = { - { - .iv = 220, - .lvl = 33, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 220, - .lvl = 33, - .species = SPECIES_HARIYAMA, - } + { + .iv = 220, + .lvl = 33, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 220, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = { - { - .iv = 230, - .lvl = 36, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 230, - .lvl = 36, - .species = SPECIES_HARIYAMA, - } + { + .iv = 230, + .lvl = 36, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 230, + .lvl = 36, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = { - { - .iv = 240, - .lvl = 39, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 240, - .lvl = 39, - .species = SPECIES_HARIYAMA, - } + { + .iv = 240, + .lvl = 39, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 240, + .lvl = 39, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 7, - .species = SPECIES_SEEDOT, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_SEEDOT, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = { - { - .iv = 100, - .lvl = 10, - .species = SPECIES_GEODUDE, - .moves = MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE - } + { + .iv = 100, + .lvl = 10, + .species = SPECIES_GEODUDE, + .moves = MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = { - { - .iv = 110, - .lvl = 8, - .species = SPECIES_GEODUDE, - }, - { - .iv = 120, - .lvl = 8, - .species = SPECIES_GEODUDE, - } + { + .iv = 110, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 120, + .lvl = 8, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_MACHOP, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = { - { - .iv = 150, - .lvl = 17, - .species = SPECIES_ZIGZAGOON, - .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT - }, - { - .iv = 150, - .lvl = 17, - .species = SPECIES_GULPIN, - .moves = MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND - } + { + .iv = 150, + .lvl = 17, + .species = SPECIES_ZIGZAGOON, + .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT + }, + { + .iv = 150, + .lvl = 17, + .species = SPECIES_GULPIN, + .moves = MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Quincy[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_SLAKING, - .moves = MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_DUSCLOPS, - .moves = MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SLAKING, + .moves = MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_DUSCLOPS, + .moves = MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Katelynn[] = { - { - .iv = 100, - .lvl = 43, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND - }, - { - .iv = 100, - .lvl = 43, - .species = SPECIES_SLAKING, - .moves = MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK - } + { + .iv = 100, + .lvl = 43, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND + }, + { + .iv = 100, + .lvl = 43, + .species = SPECIES_SLAKING, + .moves = MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaylen[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_TRAPINCH, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_TRAPINCH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_ARON, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ARON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_SWELLOW, - }, - { - .iv = 20, - .lvl = 30, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SWELLOW, + }, + { + .iv = 20, + .lvl = 30, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SWELLOW, - }, - { - .iv = 30, - .lvl = 29, - .species = SPECIES_LINOONE, - }, - { - .iv = 30, - .lvl = 33, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 29, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 33, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_SWELLOW, - }, - { - .iv = 40, - .lvl = 32, - .species = SPECIES_LINOONE, - }, - { - .iv = 40, - .lvl = 36, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 32, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 16, - .species = SPECIES_ZIGZAGOON, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ZIGZAGOON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = { - { - .iv = 0, - .lvl = 4, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 3, - .species = SPECIES_TAILLOW, - } + { + .iv = 0, + .lvl = 4, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_ARON, - }, - { - .iv = 0, - .lvl = 13, - .species = SPECIES_ELECTRIKE, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 13, + .species = SPECIES_ELECTRIKE, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wallace[] = { - { - .iv = 255, - .lvl = 57, - .species = SPECIES_WAILORD, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_TENTACRUEL, - .heldItem = ITEM_NONE, - .moves = MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_LUDICOLO, - .heldItem = ITEM_NONE, - .moves = MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_GYARADOS, - .heldItem = ITEM_NONE, - .moves = MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_MILOTIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC - } + { + .iv = 255, + .lvl = 57, + .species = SPECIES_WAILORD, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_TENTACRUEL, + .heldItem = ITEM_NONE, + .moves = MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_LUDICOLO, + .heldItem = ITEM_NONE, + .moves = MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_GYARADOS, + .heldItem = ITEM_NONE, + .moves = MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_MILOTIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 10, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MAGIKARP, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGIKARP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 7, - .species = SPECIES_MAGIKARP, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_MAGIKARP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_BARBOACH, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_BARBOACH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = { - { - .iv = 0, - .lvl = 10, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 7, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 10, - .species = SPECIES_MAGIKARP, - } + { + .iv = 0, + .lvl = 10, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 7, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_MAGIKARP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = { - { - .iv = 10, - .lvl = 11, - .species = SPECIES_TENTACOOL, - } + { + .iv = 10, + .lvl = 11, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_BARBOACH, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_BARBOACH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_WAILMER, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WAILMER, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = { - { - .iv = 10, - .lvl = 24, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 10, - .lvl = 27, - .species = SPECIES_GYARADOS, - }, - { - .iv = 10, - .lvl = 27, - .species = SPECIES_GYARADOS, - } + { + .iv = 10, + .lvl = 24, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_GYARADOS, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_GYARADOS, - }, - { - .iv = 20, - .lvl = 26, - .species = SPECIES_CARVANHA, - }, - { - .iv = 20, - .lvl = 26, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_GYARADOS, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_GYARADOS, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_CARVANHA, + }, + { + .iv = 20, + .lvl = 26, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_GYARADOS, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_CARVANHA, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_TENTACRUEL, - }, - { - .iv = 31, - .lvl = 31, - .species = SPECIES_GYARADOS, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GYARADOS, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_CARVANHA, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 31, + .lvl = 31, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GYARADOS, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_SHARPEDO, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GYARADOS, - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GYARADOS, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_SHARPEDO, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GYARADOS, + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 21, - .species = SPECIES_GYARADOS, - }, - { - .iv = 0, - .lvl = 23, - .species = SPECIES_GYARADOS, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GYARADOS, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_GYARADOS, - }, - { - .iv = 0, - .lvl = 35, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 21, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_GYARADOS, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = { - { - .iv = 20, - .lvl = 6, - .species = SPECIES_VOLTORB, - }, - { - .iv = 20, - .lvl = 6, - .species = SPECIES_VOLTORB, - }, - { - .iv = 200, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 20, + .lvl = 6, + .species = SPECIES_VOLTORB, + }, + { + .iv = 20, + .lvl = 6, + .species = SPECIES_VOLTORB, + }, + { + .iv = 200, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = { - { - .iv = 10, - .lvl = 30, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = { - { - .iv = 30, - .lvl = 36, - .species = SPECIES_MAGNETON, - } + { + .iv = 30, + .lvl = 36, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = { - { - .iv = 40, - .lvl = 39, - .species = SPECIES_MAGNETON, - } + { + .iv = 40, + .lvl = 39, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = { - { - .iv = 80, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 80, - .lvl = 14, - .species = SPECIES_MAGNEMITE, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_VOLTORB, - } + { + .iv = 80, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 80, + .lvl = 14, + .species = SPECIES_MAGNEMITE, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_VOLTORB, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = { - { - .iv = 10, - .lvl = 28, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 10, + .lvl = 28, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = { - { - .iv = 20, - .lvl = 31, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 20, + .lvl = 31, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_MAGNETON, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_MAGNETON, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_MAGNETON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_DODUO, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = { - { - .iv = 10, - .lvl = 28, - .species = SPECIES_DODUO, - } + { + .iv = 10, + .lvl = 28, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = { - { - .iv = 20, - .lvl = 31, - .species = SPECIES_DODUO, - } + { + .iv = 20, + .lvl = 31, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_DODRIO, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_DODRIO, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_DODUO, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = { - { - .iv = 10, - .lvl = 28, - .species = SPECIES_DODUO, - } + { + .iv = 10, + .lvl = 28, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = { - { - .iv = 20, - .lvl = 31, - .species = SPECIES_DODUO, - } + { + .iv = 20, + .lvl = 31, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_DODRIO, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_DODRIO, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camden[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_STARYU, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Demetrius[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_ELECTRIKE, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo1[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_STARYU, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WINGULL, - }, - { - .iv = 80, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 80, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = { - { - .iv = 10, - .lvl = 39, - .species = SPECIES_STARYU, - } + { + .iv = 10, + .lvl = 39, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = { - { - .iv = 20, - .lvl = 42, - .species = SPECIES_STARYU, - } + { + .iv = 20, + .lvl = 42, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = { - { - .iv = 30, - .lvl = 45, - .species = SPECIES_STARMIE, - } + { + .iv = 30, + .lvl = 45, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = { - { - .iv = 40, - .lvl = 48, - .species = SPECIES_STARMIE, - } + { + .iv = 40, + .lvl = 48, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isobel[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donny[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WINGULL, - }, - { - .iv = 160, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + }, + { + .iv = 160, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Talia[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_WINGULL, - }, - { - .iv = 240, - .lvl = 33, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_WINGULL, + }, + { + .iv = 240, + .lvl = 33, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = { - { - .iv = 10, - .lvl = 39, - .species = SPECIES_STARYU, - } + { + .iv = 10, + .lvl = 39, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = { - { - .iv = 20, - .lvl = 42, - .species = SPECIES_STARYU, - } + { + .iv = 20, + .lvl = 42, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = { - { - .iv = 30, - .lvl = 45, - .species = SPECIES_STARMIE, - } + { + .iv = 30, + .lvl = 45, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = { - { - .iv = 40, - .lvl = 48, - .species = SPECIES_STARMIE, - } + { + .iv = 40, + .lvl = 48, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = { - { - .iv = 100, - .lvl = 37, - .species = SPECIES_ALTARIA, - }, - { - .iv = 100, - .lvl = 37, - .species = SPECIES_ALTARIA, - } + { + .iv = 100, + .lvl = 37, + .species = SPECIES_ALTARIA, + }, + { + .iv = 100, + .lvl = 37, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = { - { - .iv = 110, - .lvl = 41, - .species = SPECIES_ALTARIA, - }, - { - .iv = 110, - .lvl = 41, - .species = SPECIES_ALTARIA, - } + { + .iv = 110, + .lvl = 41, + .species = SPECIES_ALTARIA, + }, + { + .iv = 110, + .lvl = 41, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = { - { - .iv = 120, - .lvl = 44, - .species = SPECIES_ALTARIA, - }, - { - .iv = 120, - .lvl = 44, - .species = SPECIES_ALTARIA, - } + { + .iv = 120, + .lvl = 44, + .species = SPECIES_ALTARIA, + }, + { + .iv = 120, + .lvl = 44, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = { - { - .iv = 130, - .lvl = 46, - .species = SPECIES_BAGON, - }, - { - .iv = 130, - .lvl = 46, - .species = SPECIES_ALTARIA, - }, - { - .iv = 130, - .lvl = 46, - .species = SPECIES_ALTARIA, - } + { + .iv = 130, + .lvl = 46, + .species = SPECIES_BAGON, + }, + { + .iv = 130, + .lvl = 46, + .species = SPECIES_ALTARIA, + }, + { + .iv = 130, + .lvl = 46, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = { - { - .iv = 140, - .lvl = 49, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 49, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_NONE - }, - { - .iv = 140, - .lvl = 49, - .species = SPECIES_SHELGON, - .heldItem = ITEM_DRAGON_FANG - } + { + .iv = 140, + .lvl = 49, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 49, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_NONE + }, + { + .iv = 140, + .lvl = 49, + .species = SPECIES_SHELGON, + .heldItem = ITEM_DRAGON_FANG + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Aaron[] = { - { - .iv = 255, - .lvl = 34, - .species = SPECIES_BAGON, - .moves = MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER - } + { + .iv = 255, + .lvl = 34, + .species = SPECIES_BAGON, + .moves = MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TROPIUS, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_SWELLOW, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_DODUO, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_SKARMORY, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_TROPIUS, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_DODUO, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SKARMORY, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Humberto[] = { - { - .iv = 250, - .lvl = 30, - .species = SPECIES_SKARMORY, - } + { + .iv = 250, + .lvl = 30, + .species = SPECIES_SKARMORY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Presley[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_TROPIUS, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_XATU, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_TROPIUS, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwardo[] = { - { - .iv = 150, - .lvl = 29, - .species = SPECIES_DODUO, - }, - { - .iv = 150, - .lvl = 29, - .species = SPECIES_PELIPPER, - } + { + .iv = 150, + .lvl = 29, + .species = SPECIES_DODUO, + }, + { + .iv = 150, + .lvl = 29, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NATU, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_SWABLU, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_SWELLOW, - }, - { - .iv = 0, - .lvl = 36, - .species = SPECIES_PELIPPER, - }, - { - .iv = 0, - .lvl = 36, - .species = SPECIES_XATU, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TAILLOW, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SWELLOW, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = { - { - .iv = 10, - .lvl = 32, - .species = SPECIES_NATU, - }, - { - .iv = 10, - .lvl = 32, - .species = SPECIES_SWABLU, - } + { + .iv = 10, + .lvl = 32, + .species = SPECIES_NATU, + }, + { + .iv = 10, + .lvl = 32, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = { - { - .iv = 20, - .lvl = 35, - .species = SPECIES_NATU, - }, - { - .iv = 20, - .lvl = 35, - .species = SPECIES_ALTARIA, - } + { + .iv = 20, + .lvl = 35, + .species = SPECIES_NATU, + }, + { + .iv = 20, + .lvl = 35, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = { - { - .iv = 30, - .lvl = 38, - .species = SPECIES_NATU, - }, - { - .iv = 30, - .lvl = 38, - .species = SPECIES_ALTARIA, - } + { + .iv = 30, + .lvl = 38, + .species = SPECIES_NATU, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = { - { - .iv = 40, - .lvl = 41, - .species = SPECIES_ALTARIA, - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_XATU, - } + { + .iv = 40, + .lvl = 41, + .species = SPECIES_ALTARIA, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = { - { - .iv = 150, - .lvl = 33, - .species = SPECIES_NATU, - }, - { - .iv = 150, - .lvl = 33, - .species = SPECIES_SWELLOW, - } + { + .iv = 150, + .lvl = 33, + .species = SPECIES_NATU, + }, + { + .iv = 150, + .lvl = 33, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_TROPIUS, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_NINJASK, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_NINJASK, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_KOFFING, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NINJASK, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Dianne[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_LANTURN, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_LANTURN, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jani[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_KOFFING, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NINJASK, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_KOFFING, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = { - { - .iv = 0, - .lvl = 24, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = { - { - .iv = 20, - .lvl = 27, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - } + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = { - { - .iv = 30, - .lvl = 30, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - } + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_KOFFING, - .heldItem = ITEM_NONE, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_KOFFING, - .heldItem = ITEM_NONE, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_KOFFING, - .heldItem = ITEM_NONE, - .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT - }, - { - .iv = 40, - .lvl = 35, - .species = SPECIES_WEEZING, - .heldItem = ITEM_SMOKE_BALL, - .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_KOFFING, + .heldItem = ITEM_NONE, + .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT + }, + { + .iv = 40, + .lvl = 35, + .species = SPECIES_WEEZING, + .heldItem = ITEM_SMOKE_BALL, + .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jocelyn[] = { - { - .iv = 127, - .lvl = 13, - .species = SPECIES_MEDITITE, - } + { + .iv = 127, + .lvl = 13, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = { - { - .iv = 150, - .lvl = 13, - .species = SPECIES_MEDITITE, - } + { + .iv = 150, + .lvl = 13, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = { - { - .iv = 100, - .lvl = 18, - .species = SPECIES_MEDITITE, - }, - { - .iv = 100, - .lvl = 18, - .species = SPECIES_MAKUHITA, - } + { + .iv = 100, + .lvl = 18, + .species = SPECIES_MEDITITE, + }, + { + .iv = 100, + .lvl = 18, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_MEDITITE, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paula[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_BRELOOM, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = { - { - .iv = 110, - .lvl = 26, - .species = SPECIES_MEDITITE, - }, - { - .iv = 110, - .lvl = 26, - .species = SPECIES_MAKUHITA, - } + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MEDITITE, + }, + { + .iv = 110, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = { - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MEDITITE, - }, - { - .iv = 120, - .lvl = 29, - .species = SPECIES_MAKUHITA, - } + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MEDITITE, + }, + { + .iv = 120, + .lvl = 29, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = { - { - .iv = 130, - .lvl = 32, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 130, - .lvl = 32, - .species = SPECIES_HARIYAMA, - } + { + .iv = 130, + .lvl = 32, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 130, + .lvl = 32, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = { - { - .iv = 140, - .lvl = 35, - .species = SPECIES_MEDICHAM, - }, - { - .iv = 140, - .lvl = 35, - .species = SPECIES_HARIYAMA, - } + { + .iv = 140, + .lvl = 35, + .species = SPECIES_MEDICHAM, + }, + { + .iv = 140, + .lvl = 35, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_NUMEL, - .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Angelica[] = { - { - .iv = 50, - .lvl = 30, - .species = SPECIES_CASTFORM, - .moves = MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE - } + { + .iv = 50, + .lvl = 30, + .species = SPECIES_CASTFORM, + .moves = MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = { - { - .iv = 10, - .lvl = 29, - .species = SPECIES_NUMEL, - .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - } + { + .iv = 10, + .lvl = 29, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = { - { - .iv = 20, - .lvl = 32, - .species = SPECIES_NUMEL, - .moves = MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - } + { + .iv = 20, + .lvl = 32, + .species = SPECIES_NUMEL, + .moves = MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_ROSELIA, - .moves = MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY - }, - { - .iv = 30, - .lvl = 34, - .species = SPECIES_NUMEL, - .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_ROSELIA, + .moves = MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_NUMEL, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_ROSELIA, - .moves = MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_CAMERUPT, - .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_ROSELIA, + .moves = MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_CAMERUPT, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Imani[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyla[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_HORSEA, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_HORSEA, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = { - { - .iv = 0, - .lvl = 24, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 24, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SEAKING, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SPHEAL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SPHEAL, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SEAKING, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_AZUMARILL, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_AZUMARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sienna[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LUVDISC, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SEAKING, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_HORSEA, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SEADRA, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_HORSEA, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SEADRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_LANTURN, - }, - { - .iv = 0, - .lvl = 34, - .species = SPECIES_PELIPPER, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 34, + .species = SPECIES_PELIPPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LUVDISC, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlee[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_SEAKING, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = { - { - .iv = 0, - .lvl = 38, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 38, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_STARYU, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_STARYU, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_LUVDISC, - }, - { - .iv = 0, - .lvl = 45, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 45, - .species = SPECIES_STARMIE, - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SANDSHREW, - .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_BALTOY, - .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_BALTOY, + .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SANDSHREW, - .moves = MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_MARILL, - .moves = MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + .moves = MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_MARILL, + .moves = MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_TAILLOW, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_LOMBRE, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_LOMBRE, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = { - { - .iv = 0, - .lvl = 23, - .species = SPECIES_SKITTY, - }, - { - .iv = 0, - .lvl = 23, - .species = SPECIES_SWABLU, - } + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_ODDISH, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SWABLU, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_ODDISH, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Cedric[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_WOBBUFFET, - .moves = MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_WOBBUFFET, + .moves = MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_GLOOM, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_SWABLU, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_GLOOM, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_BRELOOM, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_GLOOM, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_SWABLU, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_BRELOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GLOOM, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_BRELOOM, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_GLOOM, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SWABLU, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_BRELOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_GLOOM, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = { - { - .iv = 40, - .lvl = 40, - .species = SPECIES_BRELOOM, - }, - { - .iv = 40, - .lvl = 40, - .species = SPECIES_VILEPLUME, - }, - { - .iv = 40, - .lvl = 40, - .species = SPECIES_ALTARIA, - } + { + .iv = 40, + .lvl = 40, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_VILEPLUME, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_ALTARIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_PLUSLE, - }, - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MINUN, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_PLUSLE, + }, + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MINUN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_PLUSLE, - }, - { - .iv = 10, - .lvl = 27, - .species = SPECIES_MINUN, - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_PLUSLE, + }, + { + .iv = 10, + .lvl = 27, + .species = SPECIES_MINUN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = { - { - .iv = 0, - .lvl = 6, - .species = SPECIES_SEEDOT, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_LOTAD, - } + { + .iv = 0, + .lvl = 6, + .species = SPECIES_SEEDOT, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_LOTAD, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_BEAUTIFLY, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_DUSTOX, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_BEAUTIFLY, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DUSTOX, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_PLUSLE, - }, - { - .iv = 0, - .lvl = 9, - .species = SPECIES_MINUN, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_PLUSLE, + }, + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MINUN, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = { - { - .iv = 0, - .lvl = 10, - .species = SPECIES_DUSKULL, - .moves = MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 10, - .species = SPECIES_SHROOMISH, - .moves = MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 10, + .species = SPECIES_DUSKULL, + .moves = MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_SHROOMISH, + .moves = MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = { - { - .iv = 20, - .lvl = 30, - .species = SPECIES_PLUSLE, - }, - { - .iv = 20, - .lvl = 30, - .species = SPECIES_MINUN, - } + { + .iv = 20, + .lvl = 30, + .species = SPECIES_PLUSLE, + }, + { + .iv = 20, + .lvl = 30, + .species = SPECIES_MINUN, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = { - { - .iv = 30, - .lvl = 33, - .species = SPECIES_PLUSLE, - .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND - }, - { - .iv = 30, - .lvl = 33, - .species = SPECIES_MINUN, - .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND - } + { + .iv = 30, + .lvl = 33, + .species = SPECIES_PLUSLE, + .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND + }, + { + .iv = 30, + .lvl = 33, + .species = SPECIES_MINUN, + .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_PLUSLE, - .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND - }, - { - .iv = 40, - .lvl = 36, - .species = SPECIES_MINUN, - .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_PLUSLE, + .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MINUN, + .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = { - { - .iv = 10, - .lvl = 12, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 12, - .species = SPECIES_MACHOP, - } + { + .iv = 10, + .lvl = 12, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 12, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = { - { - .iv = 0, - .lvl = 13, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 13, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_MACHOP, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = { - { - .iv = 0, - .lvl = 44, - .species = SPECIES_TENTACRUEL, - }, - { - .iv = 0, - .lvl = 44, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 44, + .species = SPECIES_TENTACRUEL, + }, + { + .iv = 0, + .lvl = 44, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_MACHOP, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_PELIPPER, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SPHEAL, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SPHEAL, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = { - { - .iv = 10, - .lvl = 36, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 36, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 10, - .lvl = 36, - .species = SPECIES_MACHOKE, - } + { + .iv = 10, + .lvl = 36, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 36, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 10, + .lvl = 36, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = { - { - .iv = 20, - .lvl = 39, - .species = SPECIES_PELIPPER, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_MACHOKE, - } + { + .iv = 20, + .lvl = 39, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = { - { - .iv = 30, - .lvl = 42, - .species = SPECIES_PELIPPER, - }, - { - .iv = 30, - .lvl = 42, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 30, - .lvl = 42, - .species = SPECIES_MACHOKE, - } + { + .iv = 30, + .lvl = 42, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 42, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 30, + .lvl = 42, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = { - { - .iv = 40, - .lvl = 45, - .species = SPECIES_PELIPPER, - }, - { - .iv = 40, - .lvl = 45, - .species = SPECIES_MACHOKE, - }, - { - .iv = 40, - .lvl = 45, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 40, + .lvl = 45, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 45, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eli[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_NUMEL, - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Annika[] = { - { - .iv = 100, - .lvl = 39, - .species = SPECIES_FEEBAS, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_FEEBAS, - .heldItem = ITEM_ORAN_BERRY, - .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT - } + { + .iv = 100, + .lvl = 39, + .species = SPECIES_FEEBAS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_FEEBAS, + .heldItem = ITEM_ORAN_BERRY, + .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jazmyn[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_ABSOL, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ABSOL, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Jonas[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_KOFFING, - .moves = MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_KOFFING, + .moves = MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Kayley[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CASTFORM, - .moves = MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CASTFORM, + .moves = MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Auron[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MACHAMP, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MACHAMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = { - { - .iv = 150, - .lvl = 33, - .species = SPECIES_MACHOKE, - }, - { - .iv = 150, - .lvl = 33, - .species = SPECIES_SPHEAL, - } + { + .iv = 150, + .lvl = 33, + .species = SPECIES_MACHOKE, + }, + { + .iv = 150, + .lvl = 33, + .species = SPECIES_SPHEAL, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Marley[] = { - { - .iv = 255, - .lvl = 34, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_NONE, - .moves = MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT - } + { + .iv = 255, + .lvl = 34, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_NONE, + .moves = MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reyna[] = { - { - .iv = 50, - .lvl = 33, - .species = SPECIES_MEDITITE, - }, - { - .iv = 200, - .lvl = 33, - .species = SPECIES_HARIYAMA, - } + { + .iv = 50, + .lvl = 33, + .species = SPECIES_MEDITITE, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hudson[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Conor[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_CHINCHOU, - }, - { - .iv = 200, - .lvl = 33, - .species = SPECIES_HARIYAMA, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 200, + .lvl = 33, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ZANGOOSE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SEVIPER, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ZANGOOSE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SEVIPER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_CAMERUPT, - }, - { - .iv = 100, - .lvl = 38, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 100, - .lvl = 40, - .species = SPECIES_GOLBAT, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 100, + .lvl = 38, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 100, + .lvl = 40, + .species = SPECIES_GOLBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 29, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 32, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 0, - .lvl = 35, - .species = SPECIES_SHIFTRY, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_SHIFTRY, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = { - { - .iv = 150, - .lvl = 44, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 43, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 44, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 41, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 45, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 44, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 41, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 45, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_TREECKO, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TREECKO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_WINGULL, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_GROVYLE, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_PELIPPER, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_GROVYLE, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_TORCHIC, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TORCHIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_PELIPPER, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_MUDKIP, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MUDKIP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_TREECKO, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TREECKO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_GROVYLE, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_GROVYLE, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_TORCHIC, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_TORCHIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_PELIPPER, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_PELIPPER, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_MUDKIP, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_MUDKIP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 50, - .lvl = 18, - .species = SPECIES_SLUGMA, - }, - { - .iv = 100, - .lvl = 20, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 18, + .species = SPECIES_SLUGMA, + }, + { + .iv = 100, + .lvl = 20, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_SLUGMA, - }, - { - .iv = 150, - .lvl = 31, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 31, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_WHISMUR, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_ARON, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_TAILLOW, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_MAKUHITA, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WHISMUR, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Davis[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_PINSIR, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_PINSIR, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Mitchell[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_LUNATONE, - .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_SOLROCK, - .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_LUNATONE, + .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_SOLROCK, + .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = { - { - .iv = 10, - .lvl = 22, - .species = SPECIES_LOUDRED, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_LINOONE, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_ARON, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_SWELLOW, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_MAKUHITA, - } + { + .iv = 10, + .lvl = 22, + .species = SPECIES_LOUDRED, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_LINOONE, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_ARON, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SWELLOW, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = { - { - .iv = 20, - .lvl = 25, - .species = SPECIES_LOUDRED, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_LINOONE, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_ARON, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_SWELLOW, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_HARIYAMA, - } + { + .iv = 20, + .lvl = 25, + .species = SPECIES_LOUDRED, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_ARON, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_SWELLOW, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = { - { - .iv = 30, - .lvl = 28, - .species = SPECIES_LOUDRED, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_LINOONE, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_ARON, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_SWELLOW, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_HARIYAMA, - } + { + .iv = 30, + .lvl = 28, + .species = SPECIES_LOUDRED, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_ARON, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_SWELLOW, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = { - { - .iv = 40, - .lvl = 31, - .species = SPECIES_LOUDRED, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_LINOONE, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_LAIRON, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_SWELLOW, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_HARIYAMA, - } + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LOUDRED, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_LAIRON, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_HARIYAMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = { - { - .iv = 0, - .lvl = 11, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_SKITTY, - }, - { - .iv = 0, - .lvl = 11, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 11, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 11, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Halle[] = { - { - .iv = 0, - .lvl = 43, - .species = SPECIES_SABLEYE, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_ABSOL, - } + { + .iv = 0, + .lvl = 43, + .species = SPECIES_SABLEYE, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_ABSOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Garrison[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_SANDSLASH, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_SANDSLASH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = { - { - .iv = 10, - .lvl = 22, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_MARILL, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_ROSELIA, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_SKITTY, - }, - { - .iv = 10, - .lvl = 22, - .species = SPECIES_GOLDEEN, - } + { + .iv = 10, + .lvl = 22, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_ROSELIA, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_SKITTY, + }, + { + .iv = 10, + .lvl = 22, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = { - { - .iv = 20, - .lvl = 25, - .species = SPECIES_PELIPPER, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_BRELOOM, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_MARILL, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_ROSELIA, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_DELCATTY, - }, - { - .iv = 20, - .lvl = 25, - .species = SPECIES_GOLDEEN, - } + { + .iv = 20, + .lvl = 25, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_BRELOOM, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_MARILL, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_ROSELIA, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_DELCATTY, + }, + { + .iv = 20, + .lvl = 25, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = { - { - .iv = 30, - .lvl = 28, - .species = SPECIES_PELIPPER, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_BRELOOM, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_MARILL, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_ROSELIA, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_DELCATTY, - }, - { - .iv = 30, - .lvl = 28, - .species = SPECIES_GOLDEEN, - } + { + .iv = 30, + .lvl = 28, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_BRELOOM, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_MARILL, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_ROSELIA, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_DELCATTY, + }, + { + .iv = 30, + .lvl = 28, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = { - { - .iv = 40, - .lvl = 31, - .species = SPECIES_PELIPPER, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_BRELOOM, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_AZUMARILL, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_ROSELIA, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_DELCATTY, - }, - { - .iv = 40, - .lvl = 31, - .species = SPECIES_SEAKING, - } + { + .iv = 40, + .lvl = 31, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_BRELOOM, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_ROSELIA, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_DELCATTY, + }, + { + .iv = 40, + .lvl = 31, + .species = SPECIES_SEAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = { - { - .iv = 50, - .lvl = 27, - .species = SPECIES_BRELOOM, - } + { + .iv = 50, + .lvl = 27, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lorenzo[] = { - { - .iv = 50, - .lvl = 28, - .species = SPECIES_SEEDOT, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_NUZLEAF, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_LOMBRE, - } + { + .iv = 50, + .lvl = 28, + .species = SPECIES_SEEDOT, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = { - { - .iv = 50, - .lvl = 39, - .species = SPECIES_CACTURNE, - } + { + .iv = 50, + .lvl = 39, + .species = SPECIES_CACTURNE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = { - { - .iv = 60, - .lvl = 31, - .species = SPECIES_BRELOOM, - } + { + .iv = 60, + .lvl = 31, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = { - { - .iv = 70, - .lvl = 34, - .species = SPECIES_BRELOOM, - } + { + .iv = 70, + .lvl = 34, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = { - { - .iv = 80, - .lvl = 37, - .species = SPECIES_BRELOOM, - } + { + .iv = 80, + .lvl = 37, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = { - { - .iv = 90, - .lvl = 39, - .species = SPECIES_KECLEON, - }, - { - .iv = 90, - .lvl = 39, - .species = SPECIES_BRELOOM, - } + { + .iv = 90, + .lvl = 39, + .species = SPECIES_KECLEON, + }, + { + .iv = 90, + .lvl = 39, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = { - { - .iv = 50, - .lvl = 26, - .species = SPECIES_GLOOM, - }, - { - .iv = 50, - .lvl = 26, - .species = SPECIES_ROSELIA, - } + { + .iv = 50, + .lvl = 26, + .species = SPECIES_GLOOM, + }, + { + .iv = 50, + .lvl = 26, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = { - { - .iv = 50, - .lvl = 28, - .species = SPECIES_LOTAD, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_LOMBRE, - }, - { - .iv = 50, - .lvl = 28, - .species = SPECIES_NUZLEAF, - } + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_LOMBRE, + }, + { + .iv = 50, + .lvl = 28, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = { - { - .iv = 50, - .lvl = 38, - .species = SPECIES_SWABLU, - }, - { - .iv = 50, - .lvl = 38, - .species = SPECIES_ROSELIA, - } + { + .iv = 50, + .lvl = 38, + .species = SPECIES_SWABLU, + }, + { + .iv = 50, + .lvl = 38, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = { - { - .iv = 60, - .lvl = 30, - .species = SPECIES_GLOOM, - }, - { - .iv = 60, - .lvl = 30, - .species = SPECIES_ROSELIA, - } + { + .iv = 60, + .lvl = 30, + .species = SPECIES_GLOOM, + }, + { + .iv = 60, + .lvl = 30, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = { - { - .iv = 70, - .lvl = 33, - .species = SPECIES_GLOOM, - }, - { - .iv = 70, - .lvl = 33, - .species = SPECIES_ROSELIA, - } + { + .iv = 70, + .lvl = 33, + .species = SPECIES_GLOOM, + }, + { + .iv = 70, + .lvl = 33, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = { - { - .iv = 80, - .lvl = 36, - .species = SPECIES_GLOOM, - }, - { - .iv = 80, - .lvl = 36, - .species = SPECIES_ROSELIA, - } + { + .iv = 80, + .lvl = 36, + .species = SPECIES_GLOOM, + }, + { + .iv = 80, + .lvl = 36, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = { - { - .iv = 90, - .lvl = 39, - .species = SPECIES_BELLOSSOM, - }, - { - .iv = 90, - .lvl = 39, - .species = SPECIES_ROSELIA, - } + { + .iv = 90, + .lvl = 39, + .species = SPECIES_BELLOSSOM, + }, + { + .iv = 90, + .lvl = 39, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julio[] = { - { - .iv = 0, - .lvl = 21, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 21, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = { - { - .iv = 50, - .lvl = 35, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 50, - .lvl = 35, - .species = SPECIES_GOLBAT, - } + { + .iv = 50, + .lvl = 35, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 50, + .lvl = 35, + .species = SPECIES_GOLBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 30, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 30, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = { - { - .iv = 50, - .lvl = 22, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 50, - .lvl = 22, - .species = SPECIES_NUMEL, - } + { + .iv = 50, + .lvl = 22, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marc[] = { - { - .iv = 120, - .lvl = 8, - .species = SPECIES_GEODUDE, - }, - { - .iv = 130, - .lvl = 8, - .species = SPECIES_GEODUDE, - } + { + .iv = 120, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 130, + .lvl = 8, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenden[] = { - { - .iv = 100, - .lvl = 13, - .species = SPECIES_MACHOP, - } + { + .iv = 100, + .lvl = 13, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lilith[] = { - { - .iv = 150, - .lvl = 13, - .species = SPECIES_MEDITITE, - } + { + .iv = 150, + .lvl = 13, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristian[] = { - { - .iv = 200, - .lvl = 13, - .species = SPECIES_MAKUHITA, - } + { + .iv = 200, + .lvl = 13, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sylvia[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_MEDITITE, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonardo[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Athena[] = { - { - .iv = 100, - .lvl = 32, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE - }, - { - .iv = 100, - .lvl = 32, - .species = SPECIES_LINOONE, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE - } + { + .iv = 100, + .lvl = 32, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE + }, + { + .iv = 100, + .lvl = 32, + .species = SPECIES_LINOONE, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harrison[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = { - { - .iv = 0, - .lvl = 20, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 20, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarence[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terry[] = { - { - .iv = 0, - .lvl = 37, - .species = SPECIES_GIRAFARIG, - } + { + .iv = 0, + .lvl = 37, + .species = SPECIES_GIRAFARIG, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nate[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_SPOINK, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_SPOINK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kathleen[] = { - { - .iv = 100, - .lvl = 36, - .species = SPECIES_KADABRA, - } + { + .iv = 100, + .lvl = 36, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clifford[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_GIRAFARIG, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_GIRAFARIG, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicholas[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_WOBBUFFET, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_WOBBUFFET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Macey[] = { - { - .iv = 0, - .lvl = 36, - .species = SPECIES_NATU, - } + { + .iv = 0, + .lvl = 36, + .species = SPECIES_NATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_LOTAD, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_TORCHIC, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TORCHIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_TREECKO, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TREECKO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paxton[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SWELLOW, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_BRELOOM, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabella[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_ZUBAT, - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_ZUBAT, + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = { - { - .iv = 50, - .lvl = 18, - .species = SPECIES_NUMEL, - }, - { - .iv = 50, - .lvl = 20, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 50, - .lvl = 22, - .species = SPECIES_NUMEL, - }, - { - .iv = 50, - .lvl = 22, - .species = SPECIES_ZUBAT, - } + { + .iv = 50, + .lvl = 18, + .species = SPECIES_NUMEL, + }, + { + .iv = 50, + .lvl = 20, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_NUMEL, + }, + { + .iv = 50, + .lvl = 22, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonathan[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_KECLEON, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_LOUDRED, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_KECLEON, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_SLUGMA, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_MUDKIP, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_SLUGMA, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_MUDKIP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_WINGULL, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_TREECKO, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_WINGULL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TREECKO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = { - { - .iv = 150, - .lvl = 37, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 150, - .lvl = 38, - .species = SPECIES_CROBAT, - }, - { - .iv = 150, - .lvl = 39, - .species = SPECIES_CAMERUPT, - } + { + .iv = 150, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 38, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 39, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = { - { - .iv = 150, - .lvl = 24, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 150, - .lvl = 24, - .species = SPECIES_ZUBAT, - }, - { - .iv = 150, - .lvl = 25, - .species = SPECIES_CAMERUPT, - } + { + .iv = 150, + .lvl = 24, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 24, + .species = SPECIES_ZUBAT, + }, + { + .iv = 150, + .lvl = 25, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = { - { - .iv = 0, - .lvl = 4, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 4, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 4, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 4, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = { - { - .iv = 0, - .lvl = 6, - .species = SPECIES_LOTAD, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 6, + .species = SPECIES_LOTAD, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = { - { - .iv = 100, - .lvl = 15, - .species = SPECIES_MARILL, - }, - { - .iv = 100, - .lvl = 15, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 100, - .lvl = 15, - .species = SPECIES_NUMEL, - } + { + .iv = 100, + .lvl = 15, + .species = SPECIES_MARILL, + }, + { + .iv = 100, + .lvl = 15, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 100, + .lvl = 15, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_LOMBRE, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_SHROOMISH, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_LOMBRE, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_LOMBRE, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_BRELOOM, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_LOMBRE, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = { - { - .iv = 30, - .lvl = 32, - .species = SPECIES_LOMBRE, - }, - { - .iv = 30, - .lvl = 32, - .species = SPECIES_BRELOOM, - } + { + .iv = 30, + .lvl = 32, + .species = SPECIES_LOMBRE, + }, + { + .iv = 30, + .lvl = 32, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = { - { - .iv = 40, - .lvl = 34, - .species = SPECIES_SWELLOW, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_LOMBRE, - }, - { - .iv = 40, - .lvl = 34, - .species = SPECIES_BRELOOM, - } + { + .iv = 40, + .lvl = 34, + .species = SPECIES_SWELLOW, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_LOMBRE, + }, + { + .iv = 40, + .lvl = 34, + .species = SPECIES_BRELOOM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_ODDISH, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_ODDISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_SKITTY, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SKITTY, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = { - { - .iv = 100, - .lvl = 40, - .species = SPECIES_LUVDISC, - } + { + .iv = 100, + .lvl = 40, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = { - { - .iv = 100, - .lvl = 39, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_WAILMER, - } + { + .iv = 100, + .lvl = 39, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = { - { - .iv = 0, - .lvl = 4, - .species = SPECIES_WURMPLE, - }, - { - .iv = 0, - .lvl = 4, - .species = SPECIES_WURMPLE, - } + { + .iv = 0, + .lvl = 4, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 4, + .species = SPECIES_WURMPLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = { - { - .iv = 0, - .lvl = 3, - .species = SPECIES_WURMPLE, - }, - { - .iv = 0, - .lvl = 3, - .species = SPECIES_WURMPLE, - }, - { - .iv = 0, - .lvl = 3, - .species = SPECIES_WURMPLE, - }, - { - .iv = 0, - .lvl = 3, - .species = SPECIES_WURMPLE, - } + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + }, + { + .iv = 0, + .lvl = 3, + .species = SPECIES_WURMPLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = { - { - .iv = 50, - .lvl = 8, - .species = SPECIES_WURMPLE, - }, - { - .iv = 50, - .lvl = 8, - .species = SPECIES_NINCADA, - } + { + .iv = 50, + .lvl = 8, + .species = SPECIES_WURMPLE, + }, + { + .iv = 50, + .lvl = 8, + .species = SPECIES_NINCADA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NINCADA, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NINJASK, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINCADA, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_ILLUMISE, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_NINJASK, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = { - { - .iv = 0, - .lvl = 6, - .species = SPECIES_NINCADA, - }, - { - .iv = 0, - .lvl = 6, - .species = SPECIES_NINCADA, - } + { + .iv = 0, + .lvl = 6, + .species = SPECIES_NINCADA, + }, + { + .iv = 0, + .lvl = 6, + .species = SPECIES_NINCADA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = { - { - .iv = 10, - .lvl = 27, - .species = SPECIES_NINJASK, - } + { + .iv = 10, + .lvl = 27, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = { - { - .iv = 20, - .lvl = 29, - .species = SPECIES_DUSTOX, - }, - { - .iv = 20, - .lvl = 29, - .species = SPECIES_NINJASK, - } + { + .iv = 20, + .lvl = 29, + .species = SPECIES_DUSTOX, + }, + { + .iv = 20, + .lvl = 29, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = { - { - .iv = 30, - .lvl = 31, - .species = SPECIES_SURSKIT, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_DUSTOX, - }, - { - .iv = 30, - .lvl = 31, - .species = SPECIES_NINJASK, - } + { + .iv = 30, + .lvl = 31, + .species = SPECIES_SURSKIT, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_DUSTOX, + }, + { + .iv = 30, + .lvl = 31, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_SURSKIT, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_NINJASK, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_DUSTOX, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_NINJASK, - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_SURSKIT, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_NINJASK, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_DUSTOX, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_NINJASK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_NUMEL, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MACHOP, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_NUMEL, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 17, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 16, - .species = SPECIES_GEODUDE, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 17, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_MACHOP, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_NOSEPASS, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_GRAVELER, - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_GEODUDE, - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = { - { - .iv = 0, - .lvl = 20, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 20, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 20, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_WAILMER, - .moves = MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_WAILMER, + .moves = MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = { - { - .iv = 0, - .lvl = 10, - .species = SPECIES_PELIPPER, - .moves = MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE - }, - { - .iv = 0, - .lvl = 10, - .species = SPECIES_POOCHYENA, - .moves = MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE - } + { + .iv = 0, + .lvl = 10, + .species = SPECIES_PELIPPER, + .moves = MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE + }, + { + .iv = 0, + .lvl = 10, + .species = SPECIES_POOCHYENA, + .moves = MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = { - { - .iv = 0, - .lvl = 16, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 16, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 16, - .species = SPECIES_MACHOP, - } + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 16, + .species = SPECIES_MACHOP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = { - { - .iv = 10, - .lvl = 24, - .species = SPECIES_GEODUDE, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_GEODUDE, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_GEODUDE, - }, - { - .iv = 10, - .lvl = 24, - .species = SPECIES_GRAVELER, - } + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 24, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = { - { - .iv = 20, - .lvl = 27, - .species = SPECIES_GEODUDE, - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_GEODUDE, - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_GRAVELER, - }, - { - .iv = 20, - .lvl = 27, - .species = SPECIES_GRAVELER, - } + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GEODUDE, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GEODUDE, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GRAVELER, + }, + { + .iv = 20, + .lvl = 27, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = { - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GEODUDE, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GRAVELER, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GRAVELER, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GRAVELER, - } + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GEODUDE, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GRAVELER, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GRAVELER, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GRAVELER, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GOLEM, - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GRAVELER, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GOLEM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_DELCATTY, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_MANECTRIC, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_DELCATTY, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_LUVDISC, - }, - { - .iv = 0, - .lvl = 45, - .species = SPECIES_LUVDISC, - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + }, + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LUVDISC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan1[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_ILLUMISE, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan2[] = { - { - .iv = 10, - .lvl = 30, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 10, - .lvl = 30, - .species = SPECIES_ILLUMISE, - } + { + .iv = 10, + .lvl = 30, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_ILLUMISE, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan4[] = { - { - .iv = 30, - .lvl = 36, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 30, - .lvl = 36, - .species = SPECIES_ILLUMISE, - } + { + .iv = 30, + .lvl = 36, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 30, + .lvl = 36, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_KiraAndDan5[] = { - { - .iv = 40, - .lvl = 39, - .species = SPECIES_VOLBEAT, - }, - { - .iv = 40, - .lvl = 39, - .species = SPECIES_ILLUMISE, - } + { + .iv = 40, + .lvl = 39, + .species = SPECIES_VOLBEAT, + }, + { + .iv = 40, + .lvl = 39, + .species = SPECIES_ILLUMISE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = { - { - .iv = 0, - .lvl = 13, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 13, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Gerald[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_KECLEON, - .moves = MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_KECLEON, + .moves = MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_MEDITITE, - .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_MEDITITE, - .moves = MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MEDITITE, + .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_MEDITITE, + .moves = MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Danielle[] = { - { - .iv = 100, - .lvl = 23, - .species = SPECIES_MEDITITE, - .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH - } + { + .iv = 100, + .lvl = 23, + .species = SPECIES_MEDITITE, + .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_KOFFING, - .moves = MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NINJASK, - .moves = MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_KOFFING, + .moves = MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINJASK, + .moves = MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Riley[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NINCADA, - .moves = MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_KOFFING, - .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NINCADA, + .moves = MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_KOFFING, + .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = { - { - .iv = 150, - .lvl = 29, - .species = SPECIES_SWELLOW, - }, - { - .iv = 150, - .lvl = 29, - .species = SPECIES_XATU, - } + { + .iv = 150, + .lvl = 29, + .species = SPECIES_SWELLOW, + }, + { + .iv = 150, + .lvl = 29, + .species = SPECIES_XATU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ashley[] = { - { - .iv = 100, - .lvl = 27, - .species = SPECIES_SWABLU, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_SWABLU, - }, - { - .iv = 100, - .lvl = 27, - .species = SPECIES_SWABLU, - } + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + }, + { + .iv = 100, + .lvl = 27, + .species = SPECIES_SWABLU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = { - { - .iv = 30, - .lvl = 16, - .species = SPECIES_RALTS, - } + { + .iv = 30, + .lvl = 16, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = { - { - .iv = 150, - .lvl = 47, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 46, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 47, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 44, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 48, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 47, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 46, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 47, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 48, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = { - { - .iv = 150, - .lvl = 50, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 49, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 50, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 47, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 51, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 50, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 49, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 50, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 47, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 51, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = { - { - .iv = 150, - .lvl = 53, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 52, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 53, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 50, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 54, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 53, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 52, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 53, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 50, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 54, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = { - { - .iv = 150, - .lvl = 56, - .species = SPECIES_ALTARIA, - .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE - }, - { - .iv = 150, - .lvl = 55, - .species = SPECIES_DELCATTY, - .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK - }, - { - .iv = 150, - .lvl = 56, - .species = SPECIES_ROSELIA, - .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC - }, - { - .iv = 150, - .lvl = 53, - .species = SPECIES_MAGNETON, - .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH - }, - { - .iv = 250, - .lvl = 57, - .species = SPECIES_GARDEVOIR, - .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT - } + { + .iv = 150, + .lvl = 56, + .species = SPECIES_ALTARIA, + .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE + }, + { + .iv = 150, + .lvl = 55, + .species = SPECIES_DELCATTY, + .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK + }, + { + .iv = 150, + .lvl = 56, + .species = SPECIES_ROSELIA, + .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC + }, + { + .iv = 150, + .lvl = 53, + .species = SPECIES_MAGNETON, + .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH + }, + { + .iv = 250, + .lvl = 57, + .species = SPECIES_GARDEVOIR, + .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan13[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_GROVYLE, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan14[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan15[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_GROVYLE, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_GROVYLE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_COMBUSKEN, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_COMBUSKEN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May13[] = { - { - .iv = 150, - .lvl = 31, - .species = SPECIES_TROPIUS, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 150, - .lvl = 32, - .species = SPECIES_SLUGMA, - }, - { - .iv = 200, - .lvl = 34, - .species = SPECIES_MARSHTOMP, - } + { + .iv = 150, + .lvl = 31, + .species = SPECIES_TROPIUS, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 150, + .lvl = 32, + .species = SPECIES_SLUGMA, + }, + { + .iv = 200, + .lvl = 34, + .species = SPECIES_MARSHTOMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = { - { - .iv = 0, - .lvl = 30, - .species = SPECIES_WAILMER, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 30, + .species = SPECIES_WAILMER, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_CARVANHA, - }, - { - .iv = 0, - .lvl = 34, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_CARVANHA, + }, + { + .iv = 0, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 35, - .species = SPECIES_GYARADOS, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_GYARADOS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = { - { - .iv = 100, - .lvl = 34, - .species = SPECIES_GLOOM, - }, - { - .iv = 100, - .lvl = 34, - .species = SPECIES_AZUMARILL, - } + { + .iv = 100, + .lvl = 34, + .species = SPECIES_GLOOM, + }, + { + .iv = 100, + .lvl = 34, + .species = SPECIES_AZUMARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = { - { - .iv = 100, - .lvl = 34, - .species = SPECIES_SHIFTRY, - }, - { - .iv = 100, - .lvl = 34, - .species = SPECIES_NOSEPASS, - } + { + .iv = 100, + .lvl = 34, + .species = SPECIES_SHIFTRY, + }, + { + .iv = 100, + .lvl = 34, + .species = SPECIES_NOSEPASS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji1[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_MACHOKE, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = { - { - .iv = 0, - .lvl = 31, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 31, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 36, - .species = SPECIES_WAILMER, - } + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 31, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 36, + .species = SPECIES_WAILMER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SWELLOW, - }, - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SKARMORY, - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SWELLOW, + }, + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SKARMORY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SPHEAL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SPHEAL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_CHINCHOU, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CHINCHOU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SPINDA, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SPINDA, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SPINDA, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SPINDA, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = { - { - .iv = 0, - .lvl = 32, - .species = SPECIES_SWABLU, - .moves = MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE - }, - { - .iv = 0, - .lvl = 35, - .species = SPECIES_NUMEL, - .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE - } + { + .iv = 0, + .lvl = 32, + .species = SPECIES_SWABLU, + .moves = MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE + }, + { + .iv = 0, + .lvl = 35, + .species = SPECIES_NUMEL, + .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ROSELIA, - .moves = MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED - }, - { - .iv = 0, - .lvl = 20, - .species = SPECIES_GRAVELER, - .moves = MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + .moves = MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_GRAVELER, + .moves = MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_DUSTOX, - .moves = MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT - }, - { - .iv = 0, - .lvl = 27, - .species = SPECIES_BEAUTIFLY, - .moves = MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_DUSTOX, + .moves = MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT + }, + { + .iv = 0, + .lvl = 27, + .species = SPECIES_BEAUTIFLY, + .moves = MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = { - { - .iv = 200, - .lvl = 39, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 200, - .lvl = 39, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 200, + .lvl = 39, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 200, + .lvl = 39, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = { - { - .iv = 210, - .lvl = 43, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 210, - .lvl = 43, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 210, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 210, + .lvl = 43, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = { - { - .iv = 220, - .lvl = 46, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 220, - .lvl = 46, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 220, + .lvl = 46, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 220, + .lvl = 46, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = { - { - .iv = 230, - .lvl = 49, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 230, - .lvl = 49, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 230, + .lvl = 49, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 230, + .lvl = 49, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = { - { - .iv = 240, - .lvl = 52, - .species = SPECIES_MEDICHAM, - .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT - }, - { - .iv = 240, - .lvl = 52, - .species = SPECIES_HARIYAMA, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM - } + { + .iv = 240, + .lvl = 52, + .species = SPECIES_MEDICHAM, + .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT + }, + { + .iv = 240, + .lvl = 52, + .species = SPECIES_HARIYAMA, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = { - { - .iv = 0, - .lvl = 35, - .species = SPECIES_AZUMARILL, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_WINGULL, - } + { + .iv = 0, + .lvl = 35, + .species = SPECIES_AZUMARILL, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy1[] = { - { - .iv = 0, - .lvl = 34, - .species = SPECIES_CHINCHOU, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 34, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy2[] = { - { - .iv = 0, - .lvl = 42, - .species = SPECIES_CHINCHOU, - }, - { - .iv = 0, - .lvl = 40, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 42, + .species = SPECIES_CHINCHOU, + }, + { + .iv = 0, + .lvl = 40, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy3[] = { - { - .iv = 0, - .lvl = 45, - .species = SPECIES_LANTURN, - }, - { - .iv = 0, - .lvl = 43, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 45, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 43, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy4[] = { - { - .iv = 0, - .lvl = 48, - .species = SPECIES_LANTURN, - }, - { - .iv = 0, - .lvl = 46, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 48, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 46, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LilaAndRoy5[] = { - { - .iv = 0, - .lvl = 51, - .species = SPECIES_LANTURN, - }, - { - .iv = 0, - .lvl = 49, - .species = SPECIES_SHARPEDO, - } + { + .iv = 0, + .lvl = 51, + .species = SPECIES_LANTURN, + }, + { + .iv = 0, + .lvl = 49, + .species = SPECIES_SHARPEDO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = { - { - .iv = 0, - .lvl = 27, - .species = SPECIES_GOLDEEN, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 27, + .species = SPECIES_GOLDEEN, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MAGIKARP, - }, - { - .iv = 0, - .lvl = 20, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_FEEBAS, - }, - { - .iv = 0, - .lvl = 23, - .species = SPECIES_CARVANHA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MAGIKARP, + }, + { + .iv = 0, + .lvl = 20, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_FEEBAS, + }, + { + .iv = 0, + .lvl = 23, + .species = SPECIES_CARVANHA, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Dawson[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_POOCHYENA, - .heldItem = ITEM_NONE - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_POOCHYENA, + .heldItem = ITEM_NONE + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Sarah[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_LOTAD, - .heldItem = ITEM_NONE - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_ZIGZAGOON, - .heldItem = ITEM_NUGGET - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_LOTAD, + .heldItem = ITEM_NONE + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_ZIGZAGOON, + .heldItem = ITEM_NUGGET + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darian[] = { - { - .iv = 0, - .lvl = 9, - .species = SPECIES_MAGIKARP, - } + { + .iv = 0, + .lvl = 9, + .species = SPECIES_MAGIKARP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hailey[] = { - { - .iv = 0, - .lvl = 13, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 13, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chandler[] = { - { - .iv = 0, - .lvl = 12, - .species = SPECIES_TENTACOOL, - }, - { - .iv = 0, - .lvl = 12, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 12, + .species = SPECIES_TENTACOOL, + }, + { + .iv = 0, + .lvl = 12, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonItemDefaultMoves gTrainerParty_Kaleb[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_MINUN, - .heldItem = ITEM_ORAN_BERRY - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_PLUSLE, - .heldItem = ITEM_ORAN_BERRY - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_MINUN, + .heldItem = ITEM_ORAN_BERRY + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_PLUSLE, + .heldItem = ITEM_ORAN_BERRY + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joseph[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_VOLTORB, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_VOLTORB, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alyssa[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MAGNEMITE, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MAGNEMITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marcos[] = { - { - .iv = 100, - .lvl = 15, - .species = SPECIES_VOLTORB, - } + { + .iv = 100, + .lvl = 15, + .species = SPECIES_VOLTORB, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rhett[] = { - { - .iv = 100, - .lvl = 15, - .species = SPECIES_MAKUHITA, - } + { + .iv = 100, + .lvl = 15, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tyron[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SANDSHREW, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celina[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ROSELIA, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bianca[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SHROOMISH, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SHROOMISH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hayden[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophie[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_LOMBRE, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Coby[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_SKARMORY, - }, - { - .iv = 0, - .lvl = 19, - .species = SPECIES_SWELLOW, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_SKARMORY, + }, + { + .iv = 0, + .lvl = 19, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lawrence[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_BALTOY, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SANDSHREW, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wyatt[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ARON, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ARON, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ARON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelina[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_LOMBRE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_LOMBRE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kai[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_BARBOACH, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_BARBOACH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlotte[] = { - { - .iv = 0, - .lvl = 19, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 19, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Deandre[] = { - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ARON, - }, - { - .iv = 0, - .lvl = 14, - .species = SPECIES_ELECTRIKE, - } + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ARON, + }, + { + .iv = 0, + .lvl = 14, + .species = SPECIES_ELECTRIKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_BALTOY, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_BALTOY, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_BALTOY, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_POOCHYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_POOCHYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_ZUBAT, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_ZUBAT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_MIGHTYENA, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_MIGHTYENA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_BALTOY, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BALTOY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha3[] = { - { - .iv = 75, - .lvl = 26, - .species = SPECIES_NUMEL, - }, - { - .iv = 75, - .lvl = 28, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 75, - .lvl = 30, - .species = SPECIES_ZUBAT, - }, - { - .iv = 75, - .lvl = 33, - .species = SPECIES_CAMERUPT, - } + { + .iv = 75, + .lvl = 26, + .species = SPECIES_NUMEL, + }, + { + .iv = 75, + .lvl = 28, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 75, + .lvl = 30, + .species = SPECIES_ZUBAT, + }, + { + .iv = 75, + .lvl = 33, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_PELIPPER, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_CAMERUPT, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_PELIPPER, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = { - { - .iv = 150, - .lvl = 42, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 150, - .lvl = 43, - .species = SPECIES_CROBAT, - }, - { - .iv = 150, - .lvl = 44, - .species = SPECIES_CAMERUPT, - } + { + .iv = 150, + .lvl = 42, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 150, + .lvl = 43, + .species = SPECIES_CROBAT, + }, + { + .iv = 150, + .lvl = 44, + .species = SPECIES_CAMERUPT, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pete[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isabelle[] = { - { - .iv = 0, - .lvl = 15, - .species = SPECIES_MARILL, - } + { + .iv = 0, + .lvl = 15, + .species = SPECIES_MARILL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres1[] = { - { - .iv = 50, - .lvl = 25, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 50, - .lvl = 25, - .species = SPECIES_SANDSHREW, - } + { + .iv = 50, + .lvl = 25, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 50, + .lvl = 25, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Josue[] = { - { - .iv = 50, - .lvl = 25, - .species = SPECIES_TAILLOW, - }, - { - .iv = 50, - .lvl = 25, - .species = SPECIES_WINGULL, - } + { + .iv = 50, + .lvl = 25, + .species = SPECIES_TAILLOW, + }, + { + .iv = 50, + .lvl = 25, + .species = SPECIES_WINGULL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Camron[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_STARYU, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory1[] = { - { - .iv = 0, - .lvl = 24, - .species = SPECIES_WINGULL, - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_MACHOP, - }, - { - .iv = 0, - .lvl = 24, - .species = SPECIES_TENTACOOL, - } + { + .iv = 0, + .lvl = 24, + .species = SPECIES_WINGULL, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_MACHOP, + }, + { + .iv = 0, + .lvl = 24, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carolina[] = { - { - .iv = 50, - .lvl = 24, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 50, - .lvl = 24, - .species = SPECIES_SWELLOW, - }, - { - .iv = 50, - .lvl = 24, - .species = SPECIES_MANECTRIC, - } + { + .iv = 50, + .lvl = 24, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 50, + .lvl = 24, + .species = SPECIES_SWELLOW, + }, + { + .iv = 50, + .lvl = 24, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elijah[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SKARMORY, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SKARMORY, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SKARMORY, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SKARMORY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Celia[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_MARILL, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_LOMBRE, - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_MARILL, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_LOMBRE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryan[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_SANDSLASH, - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_SANDSLASH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Branden[] = { - { - .iv = 0, - .lvl = 22, - .species = SPECIES_TAILLOW, - }, - { - .iv = 0, - .lvl = 22, - .species = SPECIES_NUZLEAF, - } + { + .iv = 0, + .lvl = 22, + .species = SPECIES_TAILLOW, + }, + { + .iv = 0, + .lvl = 22, + .species = SPECIES_NUZLEAF, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bryant[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_NUMEL, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SLUGMA, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_NUMEL, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SLUGMA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shayla[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_ROSELIA, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_ROSELIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kyra[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_DODUO, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_DODRIO, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DODUO, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_DODRIO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jaiden[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_NINJASK, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GULPIN, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_NINJASK, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GULPIN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alix[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KADABRA, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_KIRLIA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KADABRA, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_KIRLIA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Helene[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MEDITITE, - }, - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MAKUHITA, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Marlene[] = { - { - .iv = 0, - .lvl = 18, - .species = SPECIES_MEDITITE, - }, - { - .iv = 0, - .lvl = 18, - .species = SPECIES_SPOINK, - } + { + .iv = 0, + .lvl = 18, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 18, + .species = SPECIES_SPOINK, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Devan[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_GEODUDE, - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_GEODUDE, - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_GEODUDE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johnson[] = { - { - .iv = 0, - .lvl = 8, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 0, - .lvl = 8, - .species = SPECIES_LOTAD, - } + { + .iv = 0, + .lvl = 8, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 0, + .lvl = 8, + .species = SPECIES_LOTAD, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melina[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_DODUO, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_DODUO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandi[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_RALTS, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_RALTS, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aisha[] = { - { - .iv = 0, - .lvl = 17, - .species = SPECIES_MEDITITE, - } + { + .iv = 0, + .lvl = 17, + .species = SPECIES_MEDITITE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makayla[] = { - { - .iv = 0, - .lvl = 33, - .species = SPECIES_ROSELIA, - }, - { - .iv = 0, - .lvl = 33, - .species = SPECIES_MEDICHAM, - } + { + .iv = 0, + .lvl = 33, + .species = SPECIES_ROSELIA, + }, + { + .iv = 0, + .lvl = 33, + .species = SPECIES_MEDICHAM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fabian[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_MANECTRIC, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_MANECTRIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dayton[] = { - { - .iv = 0, - .lvl = 25, - .species = SPECIES_SLUGMA, - }, - { - .iv = 0, - .lvl = 25, - .species = SPECIES_NUMEL, - } + { + .iv = 0, + .lvl = 25, + .species = SPECIES_SLUGMA, + }, + { + .iv = 0, + .lvl = 25, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rachel[] = { - { - .iv = 0, - .lvl = 26, - .species = SPECIES_GOLDEEN, - } + { + .iv = 0, + .lvl = 26, + .species = SPECIES_GOLDEEN, + } }; const struct TrainerMonNoItemCustomMoves gTrainerParty_Leonel[] = { - { - .iv = 100, - .lvl = 30, - .species = SPECIES_MANECTRIC, - .moves = MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE - } + { + .iv = 100, + .lvl = 30, + .species = SPECIES_MANECTRIC, + .moves = MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Callie[] = { - { - .iv = 0, - .lvl = 28, - .species = SPECIES_MEDITITE, - }, - { - .iv = 0, - .lvl = 28, - .species = SPECIES_MAKUHITA, - } + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MEDITITE, + }, + { + .iv = 0, + .lvl = 28, + .species = SPECIES_MAKUHITA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cale[] = { - { - .iv = 0, - .lvl = 29, - .species = SPECIES_DUSTOX, - }, - { - .iv = 0, - .lvl = 29, - .species = SPECIES_BEAUTIFLY, - } + { + .iv = 0, + .lvl = 29, + .species = SPECIES_DUSTOX, + }, + { + .iv = 0, + .lvl = 29, + .species = SPECIES_BEAUTIFLY, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Myles[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_MAKUHITA, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_TROPIUS, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_NUMEL, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_TROPIUS, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pat[] = { - { - .iv = 10, - .lvl = 25, - .species = SPECIES_POOCHYENA, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_SHROOMISH, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_MARILL, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 10, - .lvl = 25, - .species = SPECIES_GULPIN, - } + { + .iv = 10, + .lvl = 25, + .species = SPECIES_POOCHYENA, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SHROOMISH, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_MARILL, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 10, + .lvl = 25, + .species = SPECIES_GULPIN, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin1[] = { - { - .iv = 100, - .lvl = 29, - .species = SPECIES_LOUDRED, - }, - { - .iv = 100, - .lvl = 29, - .species = SPECIES_VIGOROTH, - } + { + .iv = 100, + .lvl = 29, + .species = SPECIES_LOUDRED, + }, + { + .iv = 100, + .lvl = 29, + .species = SPECIES_VIGOROTH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May14[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_LOTAD, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_TORCHIC, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_LOTAD, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_TORCHIC, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May15[] = { - { - .iv = 25, - .lvl = 13, - .species = SPECIES_TORKOAL, - }, - { - .iv = 50, - .lvl = 15, - .species = SPECIES_MUDKIP, - } + { + .iv = 25, + .lvl = 13, + .species = SPECIES_TORKOAL, + }, + { + .iv = 50, + .lvl = 15, + .species = SPECIES_MUDKIP, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne2[] = { - { - .iv = 255, - .lvl = 32, - .species = SPECIES_GOLEM, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION - }, - { - .iv = 255, - .lvl = 35, - .species = SPECIES_KABUTO, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 35, - .species = SPECIES_ONIX, - .heldItem = ITEM_NONE, - .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 37, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - } + { + .iv = 255, + .lvl = 32, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_KABUTO, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne3[] = { - { - .iv = 255, - .lvl = 37, - .species = SPECIES_OMANYTE, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - }, - { - .iv = 255, - .lvl = 37, - .species = SPECIES_GOLEM, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_KABUTOPS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_ONIX, - .heldItem = ITEM_NONE, - .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 42, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - } + { + .iv = 255, + .lvl = 37, + .species = SPECIES_OMANYTE, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne4[] = { - { - .iv = 255, - .lvl = 42, - .species = SPECIES_OMASTAR, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - }, - { - .iv = 255, - .lvl = 42, - .species = SPECIES_GOLEM, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_KABUTOPS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_ONIX, - .heldItem = ITEM_NONE, - .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - } + { + .iv = 255, + .lvl = 42, + .species = SPECIES_OMASTAR, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_ONIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Roxanne5[] = { - { - .iv = 255, - .lvl = 47, - .species = SPECIES_AERODACTYL, - .heldItem = ITEM_NONE, - .moves = MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_GOLEM, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_OMASTAR, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_KABUTOPS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_STEELIX, - .heldItem = ITEM_NONE, - .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 52, - .species = SPECIES_NOSEPASS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE - } + { + .iv = 255, + .lvl = 47, + .species = SPECIES_AERODACTYL, + .heldItem = ITEM_NONE, + .moves = MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_GOLEM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_OMASTAR, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_KABUTOPS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_STEELIX, + .heldItem = ITEM_NONE, + .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_NOSEPASS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly2[] = { - { - .iv = 255, - .lvl = 33, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 33, - .species = SPECIES_MEDITITE, - .heldItem = ITEM_NONE, - .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 35, - .species = SPECIES_HITMONTOP, - .heldItem = ITEM_NONE, - .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - }, - { - .iv = 255, - .lvl = 37, - .species = SPECIES_HARIYAMA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 33, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 33, + .species = SPECIES_MEDITITE, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 35, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 37, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly3[] = { - { - .iv = 255, - .lvl = 38, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 38, - .species = SPECIES_MEDICHAM, - .heldItem = ITEM_NONE, - .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_HITMONTOP, - .heldItem = ITEM_NONE, - .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - }, - { - .iv = 255, - .lvl = 42, - .species = SPECIES_HARIYAMA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly4[] = { - { - .iv = 255, - .lvl = 40, - .species = SPECIES_HITMONCHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_MEDICHAM, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_HITMONTOP, - .heldItem = ITEM_NONE, - .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_HARIYAMA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 40, + .species = SPECIES_HITMONCHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Brawly5[] = { - { - .iv = 255, - .lvl = 46, - .species = SPECIES_HITMONLEE, - .heldItem = ITEM_NONE, - .moves = MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_HITMONCHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_MACHAMP, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_MEDICHAM, - .heldItem = ITEM_NONE, - .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_HITMONTOP, - .heldItem = ITEM_NONE, - .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK - }, - { - .iv = 255, - .lvl = 52, - .species = SPECIES_HARIYAMA, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HITMONLEE, + .heldItem = ITEM_NONE, + .moves = MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HITMONCHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MACHAMP, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MEDICHAM, + .heldItem = ITEM_NONE, + .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_HITMONTOP, + .heldItem = ITEM_NONE, + .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_HARIYAMA, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson2[] = { - { - .iv = 255, - .lvl = 36, - .species = SPECIES_MAREEP, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 36, - .species = SPECIES_ELECTRODE, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 38, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - } + { + .iv = 255, + .lvl = 36, + .species = SPECIES_MAREEP, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 36, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson3[] = { - { - .iv = 255, - .lvl = 39, - .species = SPECIES_PIKACHU, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE - }, - { - .iv = 255, - .lvl = 41, - .species = SPECIES_FLAAFFY, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 41, - .species = SPECIES_ELECTRODE, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - } + { + .iv = 255, + .lvl = 39, + .species = SPECIES_PIKACHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_FLAAFFY, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson4[] = { - { - .iv = 255, - .lvl = 44, - .species = SPECIES_RAICHU, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_AMPHAROS, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_ELECTRODE, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - } + { + .iv = 255, + .lvl = 44, + .species = SPECIES_RAICHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_AMPHAROS, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Wattson5[] = { - { - .iv = 255, - .lvl = 50, - .species = SPECIES_ELECTABUZZ, - .heldItem = ITEM_NONE, - .moves = MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_RAICHU, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_AMPHAROS, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_ELECTRODE, - .heldItem = ITEM_NONE, - .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_MAGNETON, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_MANECTRIC, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT - } + { + .iv = 255, + .lvl = 50, + .species = SPECIES_ELECTABUZZ, + .heldItem = ITEM_NONE, + .moves = MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_RAICHU, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_AMPHAROS, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_ELECTRODE, + .heldItem = ITEM_NONE, + .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_MAGNETON, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_MANECTRIC, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery2[] = { - { - .iv = 255, - .lvl = 38, - .species = SPECIES_MAGCARGO, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 36, - .species = SPECIES_PONYTA, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - }, - { - .iv = 255, - .lvl = 38, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - }, - { - .iv = 255, - .lvl = 40, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - } + { + .iv = 255, + .lvl = 38, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 36, + .species = SPECIES_PONYTA, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 40, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery3[] = { - { - .iv = 255, - .lvl = 41, - .species = SPECIES_GROWLITHE, - .heldItem = ITEM_NONE, - .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_MAGCARGO, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 41, - .species = SPECIES_PONYTA, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - } + { + .iv = 255, + .lvl = 41, + .species = SPECIES_GROWLITHE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_PONYTA, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery4[] = { - { - .iv = 255, - .lvl = 46, - .species = SPECIES_HOUNDOUR, - .heldItem = ITEM_NONE, - .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_GROWLITHE, - .heldItem = ITEM_NONE, - .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_MAGCARGO, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_RAPIDASH, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - } + { + .iv = 255, + .lvl = 46, + .species = SPECIES_HOUNDOUR, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_GROWLITHE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_RAPIDASH, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Flannery5[] = { - { - .iv = 255, - .lvl = 51, - .species = SPECIES_ARCANINE, - .heldItem = ITEM_NONE, - .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_MAGCARGO, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_HOUNDOOM, - .heldItem = ITEM_NONE, - .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_RAPIDASH, - .heldItem = ITEM_NONE, - .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_CAMERUPT, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_TORKOAL, - .heldItem = ITEM_WHITE_HERB, - .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT - } + { + .iv = 255, + .lvl = 51, + .species = SPECIES_ARCANINE, + .heldItem = ITEM_NONE, + .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_MAGCARGO, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_HOUNDOOM, + .heldItem = ITEM_NONE, + .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_RAPIDASH, + .heldItem = ITEM_NONE, + .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_CAMERUPT, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_TORKOAL, + .heldItem = ITEM_WHITE_HERB, + .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman2[] = { - { - .iv = 255, - .lvl = 42, - .species = SPECIES_CHANSEY, - .heldItem = ITEM_NONE, - .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 42, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 42, + .species = SPECIES_CHANSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 42, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman3[] = { - { - .iv = 255, - .lvl = 47, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - }, - { - .iv = 255, - .lvl = 47, - .species = SPECIES_CHANSEY, - .heldItem = ITEM_NONE, - .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_KANGASKHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 47, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 47, + .species = SPECIES_CHANSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman4[] = { - { - .iv = 255, - .lvl = 52, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - }, - { - .iv = 255, - .lvl = 52, - .species = SPECIES_BLISSEY, - .heldItem = ITEM_NONE, - .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_KANGASKHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 52, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 52, + .species = SPECIES_BLISSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Norman5[] = { - { - .iv = 255, - .lvl = 57, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST - }, - { - .iv = 255, - .lvl = 57, - .species = SPECIES_BLISSEY, - .heldItem = ITEM_NONE, - .moves = MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_KANGASKHAN, - .heldItem = ITEM_NONE, - .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL - }, - { - .iv = 255, - .lvl = 57, - .species = SPECIES_TAUROS, - .heldItem = ITEM_NONE, - .moves = MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_SPINDA, - .heldItem = ITEM_NONE, - .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS - }, - { - .iv = 255, - .lvl = 60, - .species = SPECIES_SLAKING, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 57, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST + }, + { + .iv = 255, + .lvl = 57, + .species = SPECIES_BLISSEY, + .heldItem = ITEM_NONE, + .moves = MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_KANGASKHAN, + .heldItem = ITEM_NONE, + .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL + }, + { + .iv = 255, + .lvl = 57, + .species = SPECIES_TAUROS, + .heldItem = ITEM_NONE, + .moves = MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SPINDA, + .heldItem = ITEM_NONE, + .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_SLAKING, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona2[] = { - { - .iv = 255, - .lvl = 40, - .species = SPECIES_DRATINI, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 38, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 41, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 40, + .species = SPECIES_DRATINI, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 38, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 41, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona3[] = { - { - .iv = 255, - .lvl = 43, - .species = SPECIES_HOOTHOOT, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - }, - { - .iv = 255, - .lvl = 43, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 45, - .species = SPECIES_DRAGONAIR, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 43, + .species = SPECIES_HOOTHOOT, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 43, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 45, + .species = SPECIES_DRAGONAIR, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona4[] = { - { - .iv = 255, - .lvl = 48, - .species = SPECIES_NOCTOWL, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - }, - { - .iv = 255, - .lvl = 49, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_DRAGONAIR, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 48, + .species = SPECIES_NOCTOWL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_DRAGONAIR, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Winona5[] = { - { - .iv = 255, - .lvl = 53, - .species = SPECIES_NOCTOWL, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER - }, - { - .iv = 255, - .lvl = 54, - .species = SPECIES_TROPIUS, - .heldItem = ITEM_NONE, - .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_PELIPPER, - .heldItem = ITEM_NONE, - .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_DRAGONITE, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE - }, - { - .iv = 255, - .lvl = 60, - .species = SPECIES_ALTARIA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE - } + { + .iv = 255, + .lvl = 53, + .species = SPECIES_NOCTOWL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_TROPIUS, + .heldItem = ITEM_NONE, + .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_PELIPPER, + .heldItem = ITEM_NONE, + .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_DRAGONITE, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_ALTARIA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza2[] = { - { - .iv = 255, - .lvl = 48, - .species = SPECIES_SLOWPOKE, - .heldItem = ITEM_NONE, - .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 49, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 49, - .species = SPECIES_XATU, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 50, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 255, + .lvl = 48, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 49, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 50, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza3[] = { - { - .iv = 255, - .lvl = 53, - .species = SPECIES_DROWZEE, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_SLOWPOKE, - .heldItem = ITEM_NONE, - .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 54, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 54, - .species = SPECIES_XATU, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 55, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 255, + .lvl = 53, + .species = SPECIES_DROWZEE, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 54, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 55, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza4[] = { - { - .iv = 255, - .lvl = 58, - .species = SPECIES_HYPNO, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 59, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_SLOWPOKE, - .heldItem = ITEM_NONE, - .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 59, - .species = SPECIES_XATU, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 60, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 60, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 255, + .lvl = 58, + .species = SPECIES_HYPNO, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 59, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_SLOWPOKE, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 59, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 60, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza5[] = { - { - .iv = 255, - .lvl = 63, - .species = SPECIES_HYPNO, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 64, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN - }, - { - .iv = 255, - .lvl = 63, - .species = SPECIES_SLOWKING, - .heldItem = ITEM_NONE, - .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT - }, - { - .iv = 255, - .lvl = 64, - .species = SPECIES_XATU, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 65, - .species = SPECIES_LUNATONE, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND - }, - { - .iv = 255, - .lvl = 65, - .species = SPECIES_SOLROCK, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER - } + { + .iv = 255, + .lvl = 63, + .species = SPECIES_HYPNO, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 64, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_SLOWKING, + .heldItem = ITEM_NONE, + .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT + }, + { + .iv = 255, + .lvl = 64, + .species = SPECIES_XATU, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 65, + .species = SPECIES_LUNATONE, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND + }, + { + .iv = 255, + .lvl = 65, + .species = SPECIES_SOLROCK, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan2[] = { - { - .iv = 255, - .lvl = 46, - .species = SPECIES_POLIWAG, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - }, - { - .iv = 255, - .lvl = 46, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_WALREIN, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 48, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 255, + .lvl = 46, + .species = SPECIES_POLIWAG, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 46, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 48, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan3[] = { - { - .iv = 255, - .lvl = 50, - .species = SPECIES_POLIWHIRL, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - }, - { - .iv = 255, - .lvl = 51, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_WALREIN, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 53, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 255, + .lvl = 50, + .species = SPECIES_POLIWHIRL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 51, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 53, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan4[] = { - { - .iv = 255, - .lvl = 56, - .species = SPECIES_LAPRAS, - .heldItem = ITEM_NONE, - .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - }, - { - .iv = 255, - .lvl = 56, - .species = SPECIES_POLIWHIRL, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_WALREIN, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM - }, - { - .iv = 255, - .lvl = 58, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 61, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 255, + .lvl = 56, + .species = SPECIES_LAPRAS, + .heldItem = ITEM_NONE, + .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 56, + .species = SPECIES_POLIWHIRL, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM + }, + { + .iv = 255, + .lvl = 58, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 61, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Juan5[] = { - { - .iv = 255, - .lvl = 61, - .species = SPECIES_LAPRAS, - .heldItem = ITEM_NONE, - .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY - }, - { - .iv = 255, - .lvl = 63, - .species = SPECIES_WHISCASH, - .heldItem = ITEM_NONE, - .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE - }, - { - .iv = 255, - .lvl = 61, - .species = SPECIES_POLITOED, - .heldItem = ITEM_NONE, - .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG - }, - { - .iv = 255, - .lvl = 63, - .species = SPECIES_WALREIN, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD - }, - { - .iv = 255, - .lvl = 63, - .species = SPECIES_CRAWDAUNT, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM - }, - { - .iv = 255, - .lvl = 66, - .species = SPECIES_KINGDRA, - .heldItem = ITEM_CHESTO_BERRY, - .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST - } + { + .iv = 255, + .lvl = 61, + .species = SPECIES_LAPRAS, + .heldItem = ITEM_NONE, + .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_WHISCASH, + .heldItem = ITEM_NONE, + .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE + }, + { + .iv = 255, + .lvl = 61, + .species = SPECIES_POLITOED, + .heldItem = ITEM_NONE, + .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_WALREIN, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD + }, + { + .iv = 255, + .lvl = 63, + .species = SPECIES_CRAWDAUNT, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM + }, + { + .iv = 255, + .lvl = 66, + .species = SPECIES_KINGDRA, + .heldItem = ITEM_CHESTO_BERRY, + .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Angelo[] = { - { - .iv = 100, - .lvl = 17, - .species = SPECIES_ILLUMISE, - .heldItem = ITEM_NONE, - .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE - }, - { - .iv = 100, - .lvl = 17, - .species = SPECIES_VOLBEAT, - .heldItem = ITEM_NONE, - .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE - } + { + .iv = 100, + .lvl = 17, + .species = SPECIES_ILLUMISE, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE + }, + { + .iv = 100, + .lvl = 17, + .species = SPECIES_VOLBEAT, + .heldItem = ITEM_NONE, + .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darius[] = { - { - .iv = 200, - .lvl = 30, - .species = SPECIES_TROPIUS, - } + { + .iv = 200, + .lvl = 30, + .species = SPECIES_TROPIUS, + } }; const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = { - { - .iv = 255, - .lvl = 77, - .species = SPECIES_SKARMORY, - .heldItem = ITEM_NONE, - .moves = MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING - }, - { - .iv = 255, - .lvl = 75, - .species = SPECIES_CLAYDOL, - .heldItem = ITEM_NONE, - .moves = MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE - }, - { - .iv = 255, - .lvl = 76, - .species = SPECIES_AGGRON, - .heldItem = ITEM_NONE, - .moves = MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW - }, - { - .iv = 255, - .lvl = 76, - .species = SPECIES_CRADILY, - .heldItem = ITEM_NONE, - .moves = MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY - }, - { - .iv = 255, - .lvl = 76, - .species = SPECIES_ARMALDO, - .heldItem = ITEM_NONE, - .moves = MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH - }, - { - .iv = 255, - .lvl = 78, - .species = SPECIES_METAGROSS, - .heldItem = ITEM_SITRUS_BERRY, - .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL - } + { + .iv = 255, + .lvl = 77, + .species = SPECIES_SKARMORY, + .heldItem = ITEM_NONE, + .moves = MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING + }, + { + .iv = 255, + .lvl = 75, + .species = SPECIES_CLAYDOL, + .heldItem = ITEM_NONE, + .moves = MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_AGGRON, + .heldItem = ITEM_NONE, + .moves = MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_CRADILY, + .heldItem = ITEM_NONE, + .moves = MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY + }, + { + .iv = 255, + .lvl = 76, + .species = SPECIES_ARMALDO, + .heldItem = ITEM_NONE, + .moves = MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH + }, + { + .iv = 255, + .lvl = 78, + .species = SPECIES_METAGROSS, + .heldItem = ITEM_SITRUS_BERRY, + .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anabel[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spenser[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greta[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Noland[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucy[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BELDUM, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BELDUM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres2[] = { - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SANDSHREW, - } + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_NOSEPASS, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_SANDSHREW, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres4[] = { - { - .iv = 30, - .lvl = 35, - .species = SPECIES_NOSEPASS, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_SANDSHREW, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_SANDSHREW, - } + { + .iv = 30, + .lvl = 35, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SANDSHREW, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SANDSHREW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andres5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_NOSEPASS, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_SANDSLASH, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_SANDSLASH, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_NOSEPASS, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SANDSLASH, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SANDSLASH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory2[] = { - { - .iv = 10, - .lvl = 30, - .species = SPECIES_WINGULL, - }, - { - .iv = 10, - .lvl = 30, - .species = SPECIES_MACHOP, - }, - { - .iv = 10, - .lvl = 30, - .species = SPECIES_TENTACOOL, - } + { + .iv = 10, + .lvl = 30, + .species = SPECIES_WINGULL, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_MACHOP, + }, + { + .iv = 10, + .lvl = 30, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory3[] = { - { - .iv = 20, - .lvl = 32, - .species = SPECIES_PELIPPER, - }, - { - .iv = 20, - .lvl = 32, - .species = SPECIES_MACHOP, - }, - { - .iv = 20, - .lvl = 32, - .species = SPECIES_TENTACOOL, - } + { + .iv = 20, + .lvl = 32, + .species = SPECIES_PELIPPER, + }, + { + .iv = 20, + .lvl = 32, + .species = SPECIES_MACHOP, + }, + { + .iv = 20, + .lvl = 32, + .species = SPECIES_TENTACOOL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory4[] = { - { - .iv = 30, - .lvl = 34, - .species = SPECIES_PELIPPER, - }, - { - .iv = 30, - .lvl = 34, - .species = SPECIES_MACHOP, - }, - { - .iv = 30, - .lvl = 34, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 30, + .lvl = 34, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_MACHOP, + }, + { + .iv = 30, + .lvl = 34, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cory5[] = { - { - .iv = 40, - .lvl = 36, - .species = SPECIES_PELIPPER, - }, - { - .iv = 40, - .lvl = 36, - .species = SPECIES_MACHOKE, - }, - { - .iv = 40, - .lvl = 36, - .species = SPECIES_TENTACRUEL, - } + { + .iv = 40, + .lvl = 36, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 36, + .species = SPECIES_TENTACRUEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo2[] = { - { - .iv = 10, - .lvl = 37, - .species = SPECIES_STARYU, - }, - { - .iv = 10, - .lvl = 37, - .species = SPECIES_STARYU, - } + { + .iv = 10, + .lvl = 37, + .species = SPECIES_STARYU, + }, + { + .iv = 10, + .lvl = 37, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo3[] = { - { - .iv = 20, - .lvl = 39, - .species = SPECIES_WINGULL, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_STARYU, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_STARYU, - } + { + .iv = 20, + .lvl = 39, + .species = SPECIES_WINGULL, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_STARYU, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo4[] = { - { - .iv = 30, - .lvl = 41, - .species = SPECIES_PELIPPER, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_STARYU, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_STARYU, - } + { + .iv = 30, + .lvl = 41, + .species = SPECIES_PELIPPER, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_STARYU, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_STARYU, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo5[] = { - { - .iv = 40, - .lvl = 43, - .species = SPECIES_PELIPPER, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_STARMIE, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_STARMIE, - } + { + .iv = 40, + .lvl = 43, + .species = SPECIES_PELIPPER, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_STARMIE, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_STARMIE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji2[] = { - { - .iv = 10, - .lvl = 37, - .species = SPECIES_MACHOKE, - }, - { - .iv = 10, - .lvl = 37, - .species = SPECIES_MACHOKE, - } + { + .iv = 10, + .lvl = 37, + .species = SPECIES_MACHOKE, + }, + { + .iv = 10, + .lvl = 37, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji3[] = { - { - .iv = 20, - .lvl = 39, - .species = SPECIES_MAKUHITA, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_MACHOKE, - }, - { - .iv = 20, - .lvl = 39, - .species = SPECIES_MACHOKE, - } + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MAKUHITA, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + }, + { + .iv = 20, + .lvl = 39, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji4[] = { - { - .iv = 30, - .lvl = 41, - .species = SPECIES_HARIYAMA, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_MACHOKE, - }, - { - .iv = 30, - .lvl = 41, - .species = SPECIES_MACHOKE, - } + { + .iv = 30, + .lvl = 41, + .species = SPECIES_HARIYAMA, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_MACHOKE, + }, + { + .iv = 30, + .lvl = 41, + .species = SPECIES_MACHOKE, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji5[] = { - { - .iv = 40, - .lvl = 43, - .species = SPECIES_HARIYAMA, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_MACHAMP, - }, - { - .iv = 40, - .lvl = 43, - .species = SPECIES_MACHAMP, - } + { + .iv = 40, + .lvl = 43, + .species = SPECIES_HARIYAMA, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_MACHAMP, + }, + { + .iv = 40, + .lvl = 43, + .species = SPECIES_MACHAMP, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin2[] = { - { - .iv = 110, - .lvl = 35, - .species = SPECIES_LOUDRED, - }, - { - .iv = 110, - .lvl = 35, - .species = SPECIES_VIGOROTH, - } + { + .iv = 110, + .lvl = 35, + .species = SPECIES_LOUDRED, + }, + { + .iv = 110, + .lvl = 35, + .species = SPECIES_VIGOROTH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin3[] = { - { - .iv = 120, - .lvl = 37, - .species = SPECIES_SPINDA, - }, - { - .iv = 120, - .lvl = 37, - .species = SPECIES_LOUDRED, - }, - { - .iv = 120, - .lvl = 37, - .species = SPECIES_VIGOROTH, - } + { + .iv = 120, + .lvl = 37, + .species = SPECIES_SPINDA, + }, + { + .iv = 120, + .lvl = 37, + .species = SPECIES_LOUDRED, + }, + { + .iv = 120, + .lvl = 37, + .species = SPECIES_VIGOROTH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin4[] = { - { - .iv = 130, - .lvl = 39, - .species = SPECIES_SPINDA, - }, - { - .iv = 130, - .lvl = 39, - .species = SPECIES_LOUDRED, - }, - { - .iv = 100, - .lvl = 39, - .species = SPECIES_VIGOROTH, - } + { + .iv = 130, + .lvl = 39, + .species = SPECIES_SPINDA, + }, + { + .iv = 130, + .lvl = 39, + .species = SPECIES_LOUDRED, + }, + { + .iv = 100, + .lvl = 39, + .species = SPECIES_VIGOROTH, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cristin5[] = { - { - .iv = 140, - .lvl = 41, - .species = SPECIES_SPINDA, - }, - { - .iv = 140, - .lvl = 41, - .species = SPECIES_EXPLOUD, - }, - { - .iv = 140, - .lvl = 41, - .species = SPECIES_SLAKING, - } + { + .iv = 140, + .lvl = 41, + .species = SPECIES_SPINDA, + }, + { + .iv = 140, + .lvl = 41, + .species = SPECIES_EXPLOUD, + }, + { + .iv = 140, + .lvl = 41, + .species = SPECIES_SLAKING, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando2[] = { - { - .iv = 10, - .lvl = 35, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 10, - .lvl = 35, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 10, - .lvl = 35, - .species = SPECIES_LOUDRED, - } + { + .iv = 10, + .lvl = 35, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 10, + .lvl = 35, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando3[] = { - { - .iv = 20, - .lvl = 37, - .species = SPECIES_ELECTRIKE, - }, - { - .iv = 20, - .lvl = 37, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 20, - .lvl = 37, - .species = SPECIES_LOUDRED, - } + { + .iv = 20, + .lvl = 37, + .species = SPECIES_ELECTRIKE, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 20, + .lvl = 37, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando4[] = { - { - .iv = 30, - .lvl = 39, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 30, - .lvl = 39, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 30, - .lvl = 39, - .species = SPECIES_LOUDRED, - } + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 30, + .lvl = 39, + .species = SPECIES_LOUDRED, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fernando5[] = { - { - .iv = 40, - .lvl = 41, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_MANECTRIC, - }, - { - .iv = 40, - .lvl = 41, - .species = SPECIES_EXPLOUD, - } + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_MANECTRIC, + }, + { + .iv = 40, + .lvl = 41, + .species = SPECIES_EXPLOUD, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer2[] = { - { - .iv = 10, - .lvl = 26, - .species = SPECIES_GEODUDE, - }, - { - .iv = 10, - .lvl = 26, - .species = SPECIES_NUMEL, - } + { + .iv = 10, + .lvl = 26, + .species = SPECIES_GEODUDE, + }, + { + .iv = 10, + .lvl = 26, + .species = SPECIES_NUMEL, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer3[] = { - { - .iv = 20, - .lvl = 28, - .species = SPECIES_MACHOP, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_NUMEL, - }, - { - .iv = 20, - .lvl = 28, - .species = SPECIES_GRAVELER, - } + { + .iv = 20, + .lvl = 28, + .species = SPECIES_MACHOP, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_NUMEL, + }, + { + .iv = 20, + .lvl = 28, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer4[] = { - { - .iv = 30, - .lvl = 30, - .species = SPECIES_MACHOP, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_NUMEL, - }, - { - .iv = 30, - .lvl = 30, - .species = SPECIES_GRAVELER, - } + { + .iv = 30, + .lvl = 30, + .species = SPECIES_MACHOP, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_NUMEL, + }, + { + .iv = 30, + .lvl = 30, + .species = SPECIES_GRAVELER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sawyer5[] = { - { - .iv = 40, - .lvl = 33, - .species = SPECIES_MACHOKE, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_CAMERUPT, - }, - { - .iv = 40, - .lvl = 33, - .species = SPECIES_GOLEM, - } + { + .iv = 40, + .lvl = 33, + .species = SPECIES_MACHOKE, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_CAMERUPT, + }, + { + .iv = 40, + .lvl = 33, + .species = SPECIES_GOLEM, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle2[] = { - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SKITTY, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_ZIGZAGOON, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_LOTAD, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_SEEDOT, - }, - { - .iv = 10, - .lvl = 31, - .species = SPECIES_TAILLOW, - } + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SKITTY, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_ZIGZAGOON, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_LOTAD, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_SEEDOT, + }, + { + .iv = 10, + .lvl = 31, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle3[] = { - { - .iv = 20, - .lvl = 33, - .species = SPECIES_SKITTY, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_LINOONE, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_LOMBRE, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_NUZLEAF, - }, - { - .iv = 20, - .lvl = 33, - .species = SPECIES_TAILLOW, - } + { + .iv = 20, + .lvl = 33, + .species = SPECIES_SKITTY, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_LINOONE, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_LOMBRE, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 20, + .lvl = 33, + .species = SPECIES_TAILLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle4[] = { - { - .iv = 30, - .lvl = 35, - .species = SPECIES_DELCATTY, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_LINOONE, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_LOMBRE, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_NUZLEAF, - }, - { - .iv = 30, - .lvl = 35, - .species = SPECIES_SWELLOW, - } + { + .iv = 30, + .lvl = 35, + .species = SPECIES_DELCATTY, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_LINOONE, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_LOMBRE, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_NUZLEAF, + }, + { + .iv = 30, + .lvl = 35, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gabrielle5[] = { - { - .iv = 40, - .lvl = 37, - .species = SPECIES_DELCATTY, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_MIGHTYENA, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_LINOONE, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_LUDICOLO, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_SHIFTRY, - }, - { - .iv = 40, - .lvl = 37, - .species = SPECIES_SWELLOW, - } + { + .iv = 40, + .lvl = 37, + .species = SPECIES_DELCATTY, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_MIGHTYENA, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_LINOONE, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_LUDICOLO, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SHIFTRY, + }, + { + .iv = 40, + .lvl = 37, + .species = SPECIES_SWELLOW, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia2[] = { - { - .iv = 10, - .lvl = 34, - .species = SPECIES_WAILMER, - }, - { - .iv = 10, - .lvl = 34, - .species = SPECIES_HORSEA, - } + { + .iv = 10, + .lvl = 34, + .species = SPECIES_WAILMER, + }, + { + .iv = 10, + .lvl = 34, + .species = SPECIES_HORSEA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia3[] = { - { - .iv = 20, - .lvl = 36, - .species = SPECIES_LUVDISC, - }, - { - .iv = 20, - .lvl = 36, - .species = SPECIES_WAILMER, - }, - { - .iv = 20, - .lvl = 36, - .species = SPECIES_SEADRA, - } + { + .iv = 20, + .lvl = 36, + .species = SPECIES_LUVDISC, + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_WAILMER, + }, + { + .iv = 20, + .lvl = 36, + .species = SPECIES_SEADRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia4[] = { - { - .iv = 30, - .lvl = 38, - .species = SPECIES_LUVDISC, - }, - { - .iv = 30, - .lvl = 38, - .species = SPECIES_WAILMER, - }, - { - .iv = 30, - .lvl = 38, - .species = SPECIES_SEADRA, - } + { + .iv = 30, + .lvl = 38, + .species = SPECIES_LUVDISC, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_WAILMER, + }, + { + .iv = 30, + .lvl = 38, + .species = SPECIES_SEADRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thalia5[] = { - { - .iv = 40, - .lvl = 40, - .species = SPECIES_LUVDISC, - }, - { - .iv = 40, - .lvl = 40, - .species = SPECIES_WAILORD, - }, - { - .iv = 40, - .lvl = 40, - .species = SPECIES_KINGDRA, - } + { + .iv = 40, + .lvl = 40, + .species = SPECIES_LUVDISC, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_WAILORD, + }, + { + .iv = 40, + .lvl = 40, + .species = SPECIES_KINGDRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mariela[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_CHIMECHO, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_CHIMECHO, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alvaro[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_BANETTE, - }, - { - .iv = 0, - .lvl = 41, - .species = SPECIES_KADABRA, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_BANETTE, + }, + { + .iv = 0, + .lvl = 41, + .species = SPECIES_KADABRA, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Everett[] = { - { - .iv = 0, - .lvl = 41, - .species = SPECIES_WOBBUFFET, - } + { + .iv = 0, + .lvl = 41, + .species = SPECIES_WOBBUFFET, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Red[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_CHARMANDER, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_CHARMANDER, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leaf[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_BULBASAUR, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_BULBASAUR, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan16[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_GROUDON, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_GROUDON, + } }; const struct TrainerMonNoItemDefaultMoves gTrainerParty_May16[] = { - { - .iv = 0, - .lvl = 5, - .species = SPECIES_KYOGRE, - } + { + .iv = 0, + .lvl = 5, + .species = SPECIES_KYOGRE, + } }; diff --git a/src/daycare.c b/src/daycare.c index 227451f48..5b166d3de 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -251,7 +251,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon) while ((learnedMove = MonTryLearningNewMove(mon, firstMove)) != 0) { firstMove = FALSE; - if (learnedMove == INVALID_U16) + if (learnedMove == 0xFFFF) { // Mon already knows 4 moves. DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn); @@ -535,7 +535,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) s32 i, j; u8 temp[NUM_STATS]; - ivs[selectedIv] = INVALID_U8; + ivs[selectedIv] = 0xFF; for (i = 0; i < NUM_STATS; i++) { temp[i] = ivs[i]; @@ -544,7 +544,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) j = 0; for (i = 0; i < NUM_STATS; i++) { - if (temp[i] != INVALID_U8) + if (temp[i] != 0xFF) ivs[j++] = temp[i]; } } @@ -684,7 +684,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); break; } @@ -703,7 +703,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); } } @@ -728,7 +728,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == INVALID_U16) + if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]); break; } @@ -773,7 +773,7 @@ static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *dayca if (motherItem == ITEM_LIGHT_BALL || fatherItem == ITEM_LIGHT_BALL) { - if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == INVALID_U16) + if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(mon, MOVE_VOLT_TACKLE); } } @@ -909,7 +909,7 @@ static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare) } // try to trigger poke sex - if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == INVALID_U8) + if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == 0xFF) { u8 loveScore = GetDaycareCompatibilityScore(daycare); if (loveScore > (Random() * 100u) / USHRT_MAX) diff --git a/src/decompress.c b/src/decompress.c index 287a03e55..24d23209f 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -122,346 +122,346 @@ void sub_803471C() { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x24\n\ - mov r9, r0\n\ - str r1, [sp]\n\ - str r2, [sp, 0x4]\n\ - adds r5, r3, 0\n\ - movs r0, 0x1\n\ - mov r1, r9\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _0803473C\n\ - b _080348D4\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x24\n\ + mov r9, r0\n\ + str r1, [sp]\n\ + str r2, [sp, 0x4]\n\ + adds r5, r3, 0\n\ + movs r0, 0x1\n\ + mov r1, r9\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0803473C\n\ + b _080348D4\n\ _0803473C:\n\ - asrs r0, r1, 1\n\ - adds r0, 0x4\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x8]\n\ - movs r0, 0\n\ - ldr r2, [sp]\n\ - cmp r0, r2\n\ - blt _08034750\n\ - b _08034964\n\ + asrs r0, r1, 1\n\ + adds r0, 0x4\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + str r0, [sp, 0x8]\n\ + movs r0, 0\n\ + ldr r2, [sp]\n\ + cmp r0, r2\n\ + blt _08034750\n\ + b _08034964\n\ _08034750:\n\ - movs r4, 0x8\n\ - subs r1, r4, r1\n\ - str r1, [sp, 0x10]\n\ + movs r4, 0x8\n\ + subs r1, r4, r1\n\ + str r1, [sp, 0x10]\n\ _08034756:\n\ - movs r7, 0\n\ - adds r0, 0x1\n\ - str r0, [sp, 0x14]\n\ - ldr r0, [sp, 0x10]\n\ - cmp r7, r0\n\ - bge _080347D2\n\ - ldr r1, [sp, 0x8]\n\ - lsls r1, 8\n\ - str r1, [sp, 0x18]\n\ - movs r2, 0\n\ - mov r10, r2\n\ - mov r0, r9\n\ - movs r4, 0x8\n\ - subs r0, r4, r0\n\ - str r0, [sp, 0xC]\n\ + movs r7, 0\n\ + adds r0, 0x1\n\ + str r0, [sp, 0x14]\n\ + ldr r0, [sp, 0x10]\n\ + cmp r7, r0\n\ + bge _080347D2\n\ + ldr r1, [sp, 0x8]\n\ + lsls r1, 8\n\ + str r1, [sp, 0x18]\n\ + movs r2, 0\n\ + mov r10, r2\n\ + mov r0, r9\n\ + movs r4, 0x8\n\ + subs r0, r4, r0\n\ + str r0, [sp, 0xC]\n\ _08034774:\n\ - movs r3, 0\n\ - asrs r0, r7, 1\n\ - adds r1, r7, 0\n\ - movs r2, 0x1\n\ - ands r1, r2\n\ - str r1, [sp, 0x20]\n\ - lsls r0, 8\n\ - mov r8, r0\n\ - mov r12, r5\n\ + movs r3, 0\n\ + asrs r0, r7, 1\n\ + adds r1, r7, 0\n\ + movs r2, 0x1\n\ + ands r1, r2\n\ + str r1, [sp, 0x20]\n\ + lsls r0, 8\n\ + mov r8, r0\n\ + mov r12, r5\n\ _08034786:\n\ - lsls r1, r3, 5\n\ - ldr r4, [sp, 0x18]\n\ - adds r0, r5, r4\n\ - adds r0, r1\n\ - mov r1, r8\n\ - adds r2, r0, r1\n\ - mov r1, r12\n\ - add r1, r8\n\ - movs r6, 0xF\n\ + lsls r1, r3, 5\n\ + ldr r4, [sp, 0x18]\n\ + adds r0, r5, r4\n\ + adds r0, r1\n\ + mov r1, r8\n\ + adds r2, r0, r1\n\ + mov r1, r12\n\ + add r1, r8\n\ + movs r6, 0xF\n\ _08034798:\n\ - ldr r4, [sp, 0x20]\n\ - cmp r4, 0\n\ - bne _080347A8\n\ - strb r4, [r1]\n\ - add r4, sp, 0x20\n\ - ldrb r4, [r4]\n\ - strb r4, [r2, 0x10]\n\ - b _080347B6\n\ + ldr r4, [sp, 0x20]\n\ + cmp r4, 0\n\ + bne _080347A8\n\ + strb r4, [r1]\n\ + add r4, sp, 0x20\n\ + ldrb r4, [r4]\n\ + strb r4, [r2, 0x10]\n\ + b _080347B6\n\ _080347A8:\n\ - mov r0, r10\n\ - strb r0, [r1, 0x10]\n\ - movs r4, 0x80\n\ - lsls r4, 1\n\ - adds r4, r2, r4\n\ - str r4, [sp, 0x1C]\n\ - strb r0, [r4]\n\ + mov r0, r10\n\ + strb r0, [r1, 0x10]\n\ + movs r4, 0x80\n\ + lsls r4, 1\n\ + adds r4, r2, r4\n\ + str r4, [sp, 0x1C]\n\ + strb r0, [r4]\n\ _080347B6:\n\ - adds r2, 0x1\n\ - adds r1, 0x1\n\ - subs r6, 0x1\n\ - cmp r6, 0\n\ - bge _08034798\n\ - movs r0, 0x20\n\ - add r12, r0\n\ - adds r3, 0x1\n\ - cmp r3, 0x7\n\ - ble _08034786\n\ - adds r7, 0x1\n\ - ldr r1, [sp, 0xC]\n\ - cmp r7, r1\n\ - blt _08034774\n\ + adds r2, 0x1\n\ + adds r1, 0x1\n\ + subs r6, 0x1\n\ + cmp r6, 0\n\ + bge _08034798\n\ + movs r0, 0x20\n\ + add r12, r0\n\ + adds r3, 0x1\n\ + cmp r3, 0x7\n\ + ble _08034786\n\ + adds r7, 0x1\n\ + ldr r1, [sp, 0xC]\n\ + cmp r7, r1\n\ + blt _08034774\n\ _080347D2:\n\ - movs r7, 0\n\ - movs r2, 0\n\ + movs r7, 0\n\ + movs r2, 0\n\ _080347D6:\n\ - movs r6, 0\n\ - adds r4, r7, 0x1\n\ - mov r8, r4\n\ - lsls r4, r7, 5\n\ + movs r6, 0\n\ + adds r4, r7, 0x1\n\ + mov r8, r4\n\ + lsls r4, r7, 5\n\ _080347DE:\n\ - adds r0, r6, 0x1\n\ - mov r10, r0\n\ - lsls r1, r6, 8\n\ - adds r0, r1, 0\n\ - adds r0, 0xC0\n\ - adds r0, r5, r0\n\ - adds r0, r4\n\ - adds r1, r5, r1\n\ - adds r1, r4\n\ - movs r3, 0x1F\n\ + adds r0, r6, 0x1\n\ + mov r10, r0\n\ + lsls r1, r6, 8\n\ + adds r0, r1, 0\n\ + adds r0, 0xC0\n\ + adds r0, r5, r0\n\ + adds r0, r4\n\ + adds r1, r5, r1\n\ + adds r1, r4\n\ + movs r3, 0x1F\n\ _080347F2:\n\ - strb r2, [r1]\n\ - strb r2, [r0]\n\ - adds r0, 0x1\n\ - adds r1, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _080347F2\n\ - mov r6, r10\n\ - cmp r6, 0x7\n\ - ble _080347DE\n\ - mov r7, r8\n\ - cmp r7, 0x1\n\ - ble _080347D6\n\ - mov r1, r9\n\ - cmp r1, 0x5\n\ - bne _08034818\n\ - movs r2, 0x90\n\ - lsls r2, 1\n\ - adds r5, r2\n\ + strb r2, [r1]\n\ + strb r2, [r0]\n\ + adds r0, 0x1\n\ + adds r1, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _080347F2\n\ + mov r6, r10\n\ + cmp r6, 0x7\n\ + ble _080347DE\n\ + mov r7, r8\n\ + cmp r7, 0x1\n\ + ble _080347D6\n\ + mov r1, r9\n\ + cmp r1, 0x5\n\ + bne _08034818\n\ + movs r2, 0x90\n\ + lsls r2, 1\n\ + adds r5, r2\n\ _08034818:\n\ - movs r7, 0\n\ - cmp r7, r9\n\ - bge _080348AE\n\ + movs r7, 0\n\ + cmp r7, r9\n\ + bge _080348AE\n\ _0803481E:\n\ - movs r3, 0\n\ - adds r7, 0x1\n\ - mov r8, r7\n\ - cmp r3, r9\n\ - bge _0803488E\n\ + movs r3, 0\n\ + adds r7, 0x1\n\ + mov r8, r7\n\ + cmp r3, r9\n\ + bge _0803488E\n\ _08034828:\n\ - adds r3, 0x1\n\ - mov r10, r3\n\ - ldr r4, [sp, 0x4]\n\ - adds r4, 0x20\n\ - adds r7, r5, 0\n\ - adds r7, 0x20\n\ - movs r0, 0x12\n\ - adds r0, r5\n\ - mov r12, r0\n\ - ldr r2, [sp, 0x4]\n\ - adds r3, r5, 0\n\ - movs r6, 0x3\n\ + adds r3, 0x1\n\ + mov r10, r3\n\ + ldr r4, [sp, 0x4]\n\ + adds r4, 0x20\n\ + adds r7, r5, 0\n\ + adds r7, 0x20\n\ + movs r0, 0x12\n\ + adds r0, r5\n\ + mov r12, r0\n\ + ldr r2, [sp, 0x4]\n\ + adds r3, r5, 0\n\ + movs r6, 0x3\n\ _08034840:\n\ - ldrb r0, [r2]\n\ - mov r1, r12\n\ - strb r0, [r1]\n\ - ldrb r0, [r2, 0x1]\n\ - strb r0, [r1, 0x1]\n\ - ldrb r0, [r2, 0x2]\n\ - strb r0, [r1, 0x1E]\n\ - ldrb r0, [r2, 0x3]\n\ - strb r0, [r1, 0x1F]\n\ - movs r0, 0x81\n\ - lsls r0, 1\n\ - adds r1, r3, r0\n\ - ldrb r0, [r2, 0x10]\n\ - strb r0, [r1]\n\ - ldr r0, =0x00000103\n\ - adds r1, r3, r0\n\ - ldrb r0, [r2, 0x11]\n\ - strb r0, [r1]\n\ - movs r0, 0x90\n\ - lsls r0, 1\n\ - adds r1, r3, r0\n\ - ldrb r0, [r2, 0x12]\n\ - strb r0, [r1]\n\ - ldr r0, =0x00000121\n\ - adds r1, r3, r0\n\ - ldrb r0, [r2, 0x13]\n\ - strb r0, [r1]\n\ - movs r1, 0x4\n\ - add r12, r1\n\ - adds r2, 0x4\n\ - adds r3, 0x4\n\ - subs r6, 0x1\n\ - cmp r6, 0\n\ - bge _08034840\n\ - str r4, [sp, 0x4]\n\ - adds r5, r7, 0\n\ - mov r3, r10\n\ - cmp r3, r9\n\ - blt _08034828\n\ + ldrb r0, [r2]\n\ + mov r1, r12\n\ + strb r0, [r1]\n\ + ldrb r0, [r2, 0x1]\n\ + strb r0, [r1, 0x1]\n\ + ldrb r0, [r2, 0x2]\n\ + strb r0, [r1, 0x1E]\n\ + ldrb r0, [r2, 0x3]\n\ + strb r0, [r1, 0x1F]\n\ + movs r0, 0x81\n\ + lsls r0, 1\n\ + adds r1, r3, r0\n\ + ldrb r0, [r2, 0x10]\n\ + strb r0, [r1]\n\ + ldr r0, =0x00000103\n\ + adds r1, r3, r0\n\ + ldrb r0, [r2, 0x11]\n\ + strb r0, [r1]\n\ + movs r0, 0x90\n\ + lsls r0, 1\n\ + adds r1, r3, r0\n\ + ldrb r0, [r2, 0x12]\n\ + strb r0, [r1]\n\ + ldr r0, =0x00000121\n\ + adds r1, r3, r0\n\ + ldrb r0, [r2, 0x13]\n\ + strb r0, [r1]\n\ + movs r1, 0x4\n\ + add r12, r1\n\ + adds r2, 0x4\n\ + adds r3, 0x4\n\ + subs r6, 0x1\n\ + cmp r6, 0\n\ + bge _08034840\n\ + str r4, [sp, 0x4]\n\ + adds r5, r7, 0\n\ + mov r3, r10\n\ + cmp r3, r9\n\ + blt _08034828\n\ _0803488E:\n\ - mov r2, r9\n\ - cmp r2, 0x7\n\ - bne _080348A0\n\ - adds r5, 0x20\n\ - b _080348A8\n\ - .pool\n\ + mov r2, r9\n\ + cmp r2, 0x7\n\ + bne _080348A0\n\ + adds r5, 0x20\n\ + b _080348A8\n\ + .pool\n\ _080348A0:\n\ - mov r4, r9\n\ - cmp r4, 0x5\n\ - bne _080348A8\n\ - adds r5, 0x60\n\ + mov r4, r9\n\ + cmp r4, 0x5\n\ + bne _080348A8\n\ + adds r5, 0x60\n\ _080348A8:\n\ - mov r7, r8\n\ - cmp r7, r9\n\ - blt _0803481E\n\ + mov r7, r8\n\ + cmp r7, r9\n\ + blt _0803481E\n\ _080348AE:\n\ - mov r0, r9\n\ - cmp r0, 0x7\n\ - bne _080348BC\n\ - movs r1, 0x80\n\ - lsls r1, 1\n\ - adds r5, r1\n\ - b _080348C8\n\ + mov r0, r9\n\ + cmp r0, 0x7\n\ + bne _080348BC\n\ + movs r1, 0x80\n\ + lsls r1, 1\n\ + adds r5, r1\n\ + b _080348C8\n\ _080348BC:\n\ - mov r2, r9\n\ - cmp r2, 0x5\n\ - bne _080348C8\n\ - movs r4, 0xF0\n\ - lsls r4, 1\n\ - adds r5, r4\n\ + mov r2, r9\n\ + cmp r2, 0x5\n\ + bne _080348C8\n\ + movs r4, 0xF0\n\ + lsls r4, 1\n\ + adds r5, r4\n\ _080348C8:\n\ - ldr r0, [sp, 0x14]\n\ - ldr r1, [sp]\n\ - cmp r0, r1\n\ - bge _080348D2\n\ - b _08034756\n\ + ldr r0, [sp, 0x14]\n\ + ldr r1, [sp]\n\ + cmp r0, r1\n\ + bge _080348D2\n\ + b _08034756\n\ _080348D2:\n\ - b _08034964\n\ + b _08034964\n\ _080348D4:\n\ - movs r6, 0\n\ - ldr r2, [sp]\n\ - cmp r6, r2\n\ - bge _08034964\n\ + movs r6, 0\n\ + ldr r2, [sp]\n\ + cmp r6, r2\n\ + bge _08034964\n\ _080348DC:\n\ - adds r6, 0x1\n\ - mov r10, r6\n\ - mov r4, r9\n\ - cmp r4, 0x6\n\ - bne _080348F4\n\ - movs r0, 0\n\ - movs r3, 0xFF\n\ + adds r6, 0x1\n\ + mov r10, r6\n\ + mov r4, r9\n\ + cmp r4, 0x6\n\ + bne _080348F4\n\ + movs r0, 0\n\ + movs r3, 0xFF\n\ _080348EA:\n\ - strb r0, [r5]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _080348EA\n\ + strb r0, [r5]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _080348EA\n\ _080348F4:\n\ - movs r7, 0\n\ - cmp r7, r9\n\ - bge _08034948\n\ + movs r7, 0\n\ + cmp r7, r9\n\ + bge _08034948\n\ _080348FA:\n\ - adds r7, 0x1\n\ - mov r8, r7\n\ - mov r1, r9\n\ - lsls r0, r1, 5\n\ - cmp r1, 0x6\n\ - bne _08034914\n\ - movs r1, 0\n\ - movs r3, 0x1F\n\ + adds r7, 0x1\n\ + mov r8, r7\n\ + mov r1, r9\n\ + lsls r0, r1, 5\n\ + cmp r1, 0x6\n\ + bne _08034914\n\ + movs r1, 0\n\ + movs r3, 0x1F\n\ _0803490A:\n\ - strb r1, [r5]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _0803490A\n\ + strb r1, [r5]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _0803490A\n\ _08034914:\n\ - adds r1, r0, 0\n\ - cmp r1, 0\n\ - ble _0803492E\n\ - adds r3, r1, 0\n\ + adds r1, r0, 0\n\ + cmp r1, 0\n\ + ble _0803492E\n\ + adds r3, r1, 0\n\ _0803491C:\n\ - ldr r2, [sp, 0x4]\n\ - ldrb r0, [r2]\n\ - strb r0, [r5]\n\ - adds r2, 0x1\n\ - str r2, [sp, 0x4]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bne _0803491C\n\ + ldr r2, [sp, 0x4]\n\ + ldrb r0, [r2]\n\ + strb r0, [r5]\n\ + adds r2, 0x1\n\ + str r2, [sp, 0x4]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bne _0803491C\n\ _0803492E:\n\ - mov r4, r9\n\ - cmp r4, 0x6\n\ - bne _08034942\n\ - movs r0, 0\n\ - movs r3, 0x1F\n\ + mov r4, r9\n\ + cmp r4, 0x6\n\ + bne _08034942\n\ + movs r0, 0\n\ + movs r3, 0x1F\n\ _08034938:\n\ - strb r0, [r5]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _08034938\n\ + strb r0, [r5]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _08034938\n\ _08034942:\n\ - mov r7, r8\n\ - cmp r7, r9\n\ - blt _080348FA\n\ + mov r7, r8\n\ + cmp r7, r9\n\ + blt _080348FA\n\ _08034948:\n\ - mov r0, r9\n\ - cmp r0, 0x6\n\ - bne _0803495C\n\ - movs r0, 0\n\ - movs r3, 0xFF\n\ + mov r0, r9\n\ + cmp r0, 0x6\n\ + bne _0803495C\n\ + movs r0, 0\n\ + movs r3, 0xFF\n\ _08034952:\n\ - strb r0, [r5]\n\ - adds r5, 0x1\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _08034952\n\ + strb r0, [r5]\n\ + adds r5, 0x1\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _08034952\n\ _0803495C:\n\ - mov r6, r10\n\ - ldr r1, [sp]\n\ - cmp r6, r1\n\ - blt _080348DC\n\ + mov r6, r10\n\ + ldr r1, [sp]\n\ + cmp r6, r1\n\ + blt _080348DC\n\ _08034964:\n\ - add sp, 0x24\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ + add sp, 0x24\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided"); } u32 GetDecompressedDataSize(const u32 *ptr) { - const u8 *ptr8 = (const u8 *)ptr; + const u8 *ptr8 = (const u8 *)ptr; return (ptr8[3] << 16) | (ptr8[2] << 8) | (ptr8[1]); } diff --git a/src/decoration.c b/src/decoration.c index 11fd59286..b45dec334 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = { }; const struct SpriteTemplate sDecorSelectorSpriteTemplate = { - INVALID_U16, + 0xFFFF, OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG, &sDecorSelectorOam, sDecorSelectorAnims, @@ -409,7 +409,7 @@ const struct SpriteFrameImage Unknown_085A73FC = { }; const struct SpriteTemplate gUnknown_085A7404 = { - INVALID_U16, + 0xFFFF, OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG, &Unknown_085A73E8, Unknown_085A73F8, @@ -881,7 +881,7 @@ void sub_81274A0(u8 a0, s32 a1, u8 a2) void sub_8127500(void) { - if (sDecorPCBuffer->unk_522 == INVALID_U8) + if (sDecorPCBuffer->unk_522 == 0xFF) { sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo); } @@ -889,10 +889,10 @@ void sub_8127500(void) void sub_8127554(void) { - if (sDecorPCBuffer->unk_522 != INVALID_U8) + if (sDecorPCBuffer->unk_522 != 0xFF) { RemoveScrollIndicatorArrowPair(sDecorPCBuffer->unk_522); - sDecorPCBuffer->unk_522 = INVALID_U8; + sDecorPCBuffer->unk_522 = 0xFF; } } @@ -910,7 +910,7 @@ void sub_812759C(u8 taskId) sub_81269D4(3); sub_8127718(sCurDecorationCategory); sDecorPCBuffer = calloc(1, sizeof(struct DecorPCBuffer)); - sDecorPCBuffer->unk_522 = INVALID_U8; + sDecorPCBuffer->unk_522 = 0xFF; sub_8127284(); sub_81272C8(); sub_81272F8(); @@ -1188,7 +1188,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor) v0 = 0; } v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j); - if (v1 != INVALID_U16) + if (v1 != 0xFFFF) { MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1); } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 0606364cd..ef125e564 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -129,7 +129,7 @@ static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; -const struct SpriteTemplate gCameraSpriteTemplate = {0, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; +const struct SpriteTemplate gCameraSpriteTemplate = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject}; void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_0, @@ -142,255 +142,255 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { - MovementType_None, // MOVEMENT_TYPE_NONE - MovementType_LookAround, // MOVEMENT_TYPE_LOOK_AROUND - MovementType_WanderAround, // MOVEMENT_TYPE_WANDER_AROUND - MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_UP - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_DOWN - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_LEFT - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_RIGHT - MovementType_Player, // MOVEMENT_TYPE_PLAYER - MovementType_BerryTreeGrowth, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - MovementType_FaceDownAndUp, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - MovementType_FaceLeftAndRight, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - MovementType_FaceUpAndLeft, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - MovementType_FaceUpAndRight, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - MovementType_FaceDownAndLeft, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - MovementType_FaceDownAndRight, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - MovementType_FaceDownUpAndLeft, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - MovementType_FaceDownUpAndRight, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - MovementType_FaceUpRightAndLeft, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - MovementType_FaceDownRightAndLeft, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - MovementType_RotateCounterclockwise, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - MovementType_RotateClockwise, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - MovementType_WalkSequenceUpRightLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - MovementType_WalkSequenceRightLeftDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - MovementType_WalkSequenceDownUpRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - MovementType_WalkSequenceLeftDownUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - MovementType_WalkSequenceUpLeftRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - MovementType_WalkSequenceLeftRightDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - MovementType_WalkSequenceDownUpLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - MovementType_WalkSequenceRightDownUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - MovementType_WalkSequenceLeftUpDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - MovementType_WalkSequenceUpDownRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - MovementType_WalkSequenceRightLeftUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - MovementType_WalkSequenceDownRightLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - MovementType_WalkSequenceRightUpDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - MovementType_WalkSequenceUpDownLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - MovementType_WalkSequenceLeftRightUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - MovementType_WalkSequenceDownLeftRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - MovementType_WalkSequenceUpLeftDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - MovementType_WalkSequenceDownRightUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - MovementType_WalkSequenceLeftDownRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - MovementType_WalkSequenceRightUpLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - MovementType_WalkSequenceUpRightDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - MovementType_WalkSequenceDownLeftUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - MovementType_WalkSequenceLeftUpRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - MovementType_WalkSequenceRightDownLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - MovementType_TreeDisguise, // MOVEMENT_TYPE_TREE_DISGUISE - MovementType_MountainDisguise, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - MovementType_Hidden, // MOVEMENT_TYPE_HIDDEN - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - MovementType_Invisible, // MOVEMENT_TYPE_INVISIBLE - MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN - MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP - MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT - MovementType_WalkSlowlyInPlace, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + [MOVEMENT_TYPE_NONE] = MovementType_None, + [MOVEMENT_TYPE_LOOK_AROUND] = MovementType_LookAround, + [MOVEMENT_TYPE_WANDER_AROUND] = MovementType_WanderAround, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = MovementType_WanderUpAndDown, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = MovementType_WanderUpAndDown, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = MovementType_WanderLeftAndRight, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = MovementType_WanderLeftAndRight, + [MOVEMENT_TYPE_FACE_UP] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_DOWN] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_LEFT] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_RIGHT] = MovementType_FaceDirection, + [MOVEMENT_TYPE_PLAYER] = MovementType_Player, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = MovementType_BerryTreeGrowth, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = MovementType_FaceDownAndUp, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = MovementType_FaceLeftAndRight, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = MovementType_FaceUpAndLeft, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = MovementType_FaceUpAndRight, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = MovementType_FaceDownAndLeft, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = MovementType_FaceDownAndRight, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = MovementType_FaceDownUpAndLeft, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = MovementType_FaceDownUpAndRight, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = MovementType_FaceUpRightAndLeft, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = MovementType_FaceDownRightAndLeft, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = MovementType_RotateCounterclockwise, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = MovementType_RotateClockwise, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = MovementType_WalkSequenceUpRightLeftDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = MovementType_WalkSequenceRightLeftDownUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = MovementType_WalkSequenceDownUpRightLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = MovementType_WalkSequenceLeftDownUpRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = MovementType_WalkSequenceUpLeftRightDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = MovementType_WalkSequenceLeftRightDownUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = MovementType_WalkSequenceDownUpLeftRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = MovementType_WalkSequenceRightDownUpLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = MovementType_WalkSequenceLeftUpDownRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = MovementType_WalkSequenceUpDownRightLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = MovementType_WalkSequenceRightLeftUpDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = MovementType_WalkSequenceDownRightLeftUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = MovementType_WalkSequenceRightUpDownLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = MovementType_WalkSequenceUpDownLeftRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = MovementType_WalkSequenceLeftRightUpDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = MovementType_WalkSequenceDownLeftRightUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = MovementType_WalkSequenceUpLeftDownRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = MovementType_WalkSequenceDownRightUpLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = MovementType_WalkSequenceLeftDownRightUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = MovementType_WalkSequenceRightUpLeftDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = MovementType_WalkSequenceUpRightDownLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = MovementType_WalkSequenceDownLeftUpRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = MovementType_WalkSequenceLeftUpRightDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = MovementType_WalkSequenceRightDownLeftUp, + [MOVEMENT_TYPE_COPY_PLAYER] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_TREE_DISGUISE] = MovementType_TreeDisguise, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = MovementType_MountainDisguise, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = MovementType_CopyPlayerInGrass, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = MovementType_CopyPlayerInGrass, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass, + [MOVEMENT_TYPE_HIDDEN] = MovementType_Hidden, + [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = MovementType_JogInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = MovementType_RunInPlace, + [MOVEMENT_TYPE_INVISIBLE] = MovementType_Invisible, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = MovementType_WalkSlowlyInPlace, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = MovementType_WalkSlowlyInPlace, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = MovementType_WalkSlowlyInPlace, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = MovementType_WalkSlowlyInPlace, }; const u8 gRangedMovementTypes[] = { - 0, // MOVEMENT_TYPE_NONE - 0, // MOVEMENT_TYPE_LOOK_AROUND - 1, // MOVEMENT_TYPE_WANDER_AROUND - 1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - 1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - 1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - 1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_UP - 0, // MOVEMENT_TYPE_FACE_DOWN - 0, // MOVEMENT_TYPE_FACE_LEFT - 0, // MOVEMENT_TYPE_FACE_RIGHT - 0, // MOVEMENT_TYPE_PLAYER - 0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - 0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - 0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - 1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - 1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - 1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - 1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - 1, // MOVEMENT_TYPE_COPY_PLAYER - 1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - 1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - 1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - 0, // MOVEMENT_TYPE_TREE_DISGUISE - 0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - 1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - 0, // MOVEMENT_TYPE_HIDDEN - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_INVISIBLE - 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP - 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + [MOVEMENT_TYPE_NONE] = 0, + [MOVEMENT_TYPE_LOOK_AROUND] = 0, + [MOVEMENT_TYPE_WANDER_AROUND] = 1, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = 1, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = 1, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = 1, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = 1, + [MOVEMENT_TYPE_FACE_UP] = 0, + [MOVEMENT_TYPE_FACE_DOWN] = 0, + [MOVEMENT_TYPE_FACE_LEFT] = 0, + [MOVEMENT_TYPE_FACE_RIGHT] = 0, + [MOVEMENT_TYPE_PLAYER] = 0, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = 0, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = 0, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = 0, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = 1, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = 1, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = 1, + [MOVEMENT_TYPE_COPY_PLAYER] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = 1, + [MOVEMENT_TYPE_TREE_DISGUISE] = 0, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = 0, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = 1, + [MOVEMENT_TYPE_HIDDEN] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_INVISIBLE] = 0, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = 0, }; const u8 gInitialMovementTypeFacingDirections[] = { - DIR_SOUTH, // MOVEMENT_TYPE_NONE - DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND - DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND - DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN - DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_FACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_PLAYER - DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER - DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE - DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + [MOVEMENT_TYPE_NONE] = DIR_SOUTH, + [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST, + [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST, + [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST, + [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_EAST, }; #define EVENT_OBJ_PAL_TAG_0 0x1103 @@ -668,181 +668,181 @@ const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; #include "data/field_event_obj/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { - 0, // DIR_NONE - 0, // DIR_SOUTH - 1, // DIR_NORTH - 2, // DIR_WEST - 3, // DIR_EAST - 0, // DIR_SOUTHWEST - 0, // DIR_SOUTHEAST - 1, // DIR_NORTHWEST - 1, // DIR_NORTHEAST + [DIR_NONE] = 0, + [DIR_SOUTH] = 0, + [DIR_NORTH] = 1, + [DIR_WEST] = 2, + [DIR_EAST] = 3, + [DIR_SOUTHWEST] = 0, + [DIR_SOUTHEAST] = 0, + [DIR_NORTHWEST] = 1, + [DIR_NORTHEAST] = 1, }; const u8 gMoveDirectionAnimNums[] = { - 4, // DIR_NONE - 4, // DIR_SOUTH - 5, // DIR_NORTH - 6, // DIR_WEST - 7, // DIR_EAST - 4, // DIR_SOUTHWEST - 4, // DIR_SOUTHEAST - 5, // DIR_NORTHWEST - 5, // DIR_NORTHEAST + [DIR_NONE] = 4, + [DIR_SOUTH] = 4, + [DIR_NORTH] = 5, + [DIR_WEST] = 6, + [DIR_EAST] = 7, + [DIR_SOUTHWEST] = 4, + [DIR_SOUTHEAST] = 4, + [DIR_NORTHWEST] = 5, + [DIR_NORTHEAST] = 5, }; const u8 gMoveDirectionFastAnimNums[] = { - 8, // DIR_NONE - 8, // DIR_SOUTH - 9, // DIR_NORTH - 10, // DIR_WEST - 11, // DIR_EAST - 8, // DIR_SOUTHWEST - 8, // DIR_SOUTHEAST - 9, // DIR_NORTHWEST - 9, // DIR_NORTHEAST + [DIR_NONE] = 8, + [DIR_SOUTH] = 8, + [DIR_NORTH] = 9, + [DIR_WEST] = 10, + [DIR_EAST] = 11, + [DIR_SOUTHWEST] = 8, + [DIR_SOUTHEAST] = 8, + [DIR_NORTHWEST] = 9, + [DIR_NORTHEAST] = 9, }; const u8 gMoveDirectionFasterAnimNums[] = { - 12, // DIR_NONE - 12, // DIR_SOUTH - 13, // DIR_NORTH - 14, // DIR_WEST - 15, // DIR_EAST - 12, // DIR_SOUTHWEST - 12, // DIR_SOUTHEAST - 13, // DIR_NORTHWEST - 13, // DIR_NORTHEAST + [DIR_NONE] = 12, + [DIR_SOUTH] = 12, + [DIR_NORTH] = 13, + [DIR_WEST] = 14, + [DIR_EAST] = 15, + [DIR_SOUTHWEST] = 12, + [DIR_SOUTHEAST] = 12, + [DIR_NORTHWEST] = 13, + [DIR_NORTHEAST] = 13, }; const u8 gMoveDirectionFastestAnimNums[] = { - 16, // DIR_NONE - 16, // DIR_SOUTH - 17, // DIR_NORTH - 18, // DIR_WEST - 19, // DIR_EAST - 16, // DIR_SOUTHWEST - 16, // DIR_SOUTHEAST - 17, // DIR_NORTHWEST - 17, // DIR_NORTHEAST + [DIR_NONE] = 16, + [DIR_SOUTH] = 16, + [DIR_NORTH] = 17, + [DIR_WEST] = 18, + [DIR_EAST] = 19, + [DIR_SOUTHWEST] = 16, + [DIR_SOUTHEAST] = 16, + [DIR_NORTHWEST] = 17, + [DIR_NORTHEAST] = 17, }; const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon - 20, // DIR_NONE - 20, // DIR_SOUTH - 21, // DIR_NORTH - 22, // DIR_WEST - 23, // DIR_EAST - 20, // DIR_SOUTHWEST - 20, // DIR_SOUTHEAST - 21, // DIR_NORTHWEST - 21, // DIR_NORTHEAST + [DIR_NONE] = 20, + [DIR_SOUTH] = 20, + [DIR_NORTH] = 21, + [DIR_WEST] = 22, + [DIR_EAST] = 23, + [DIR_SOUTHWEST] = 20, + [DIR_SOUTHEAST] = 20, + [DIR_NORTHWEST] = 21, + [DIR_NORTHEAST] = 21, }; const u8 gAcroWheelieDirectionAnimNums[] = { - 20, // DIR_NONE - 20, // DIR_SOUTH - 21, // DIR_NORTH - 22, // DIR_WEST - 23, // DIR_EAST - 20, // DIR_SOUTHWEST - 20, // DIR_SOUTHEAST - 21, // DIR_NORTHWEST - 21, // DIR_NORTHEAST + [DIR_NONE] = 20, + [DIR_SOUTH] = 20, + [DIR_NORTH] = 21, + [DIR_WEST] = 22, + [DIR_EAST] = 23, + [DIR_SOUTHWEST] = 20, + [DIR_SOUTHEAST] = 20, + [DIR_NORTHWEST] = 21, + [DIR_NORTHEAST] = 21, }; const u8 gUnrefAnimNums_08375633[] = { - 24, // DIR_NONE - 24, // DIR_SOUTH - 25, // DIR_NORTH - 26, // DIR_WEST - 27, // DIR_EAST - 24, // DIR_SOUTHWEST - 24, // DIR_SOUTHEAST - 25, // DIR_NORTHWEST - 25, // DIR_NORTHEAST + [DIR_NONE] = 24, + [DIR_SOUTH] = 24, + [DIR_NORTH] = 25, + [DIR_WEST] = 26, + [DIR_EAST] = 27, + [DIR_SOUTHWEST] = 24, + [DIR_SOUTHEAST] = 24, + [DIR_NORTHWEST] = 25, + [DIR_NORTHEAST] = 25, }; const u8 gAcroEndWheelieDirectionAnimNums[] = { - 28, // DIR_NONE - 28, // DIR_SOUTH - 29, // DIR_NORTH - 30, // DIR_WEST - 31, // DIR_EAST - 28, // DIR_SOUTHWEST - 28, // DIR_SOUTHEAST - 29, // DIR_NORTHWEST - 29, // DIR_NORTHEAST + [DIR_NONE] = 28, + [DIR_SOUTH] = 28, + [DIR_NORTH] = 29, + [DIR_WEST] = 30, + [DIR_EAST] = 31, + [DIR_SOUTHWEST] = 28, + [DIR_SOUTHEAST] = 28, + [DIR_NORTHWEST] = 29, + [DIR_NORTHEAST] = 29, }; const u8 gAcroUnusedActionDirectionAnimNums[] = { - 32, // DIR_NONE - 32, // DIR_SOUTH - 33, // DIR_NORTH - 34, // DIR_WEST - 35, // DIR_EAST - 32, // DIR_SOUTHWEST - 32, // DIR_SOUTHEAST - 33, // DIR_NORTHWEST - 33, // DIR_NORTHEAST + [DIR_NONE] = 32, + [DIR_SOUTH] = 32, + [DIR_NORTH] = 33, + [DIR_WEST] = 34, + [DIR_EAST] = 35, + [DIR_SOUTHWEST] = 32, + [DIR_SOUTHEAST] = 32, + [DIR_NORTHWEST] = 33, + [DIR_NORTHEAST] = 33, }; const u8 gAcroWheeliePedalDirectionAnimNums[] = { - 36, // DIR_NONE - 36, // DIR_SOUTH - 37, // DIR_NORTH - 38, // DIR_WEST - 39, // DIR_EAST - 36, // DIR_SOUTHWEST - 36, // DIR_SOUTHEAST - 37, // DIR_NORTHWEST - 37, // DIR_NORTHEAST + [DIR_NONE] = 36, + [DIR_SOUTH] = 36, + [DIR_NORTH] = 37, + [DIR_WEST] = 38, + [DIR_EAST] = 39, + [DIR_SOUTHWEST] = 36, + [DIR_SOUTHEAST] = 36, + [DIR_NORTHWEST] = 37, + [DIR_NORTHEAST] = 37, }; const u8 gFishingDirectionAnimNums[] = { - 0, // DIR_NONE - 0, // DIR_SOUTH - 1, // DIR_NORTH - 2, // DIR_WEST - 3, // DIR_EAST - 0, // DIR_SOUTHWEST - 0, // DIR_SOUTHEAST - 1, // DIR_NORTHWEST - 1, // DIR_NORTHEAST + [DIR_NONE] = 0, + [DIR_SOUTH] = 0, + [DIR_NORTH] = 1, + [DIR_WEST] = 2, + [DIR_EAST] = 3, + [DIR_SOUTHWEST] = 0, + [DIR_SOUTHEAST] = 0, + [DIR_NORTHWEST] = 1, + [DIR_NORTHEAST] = 1, }; const u8 gFishingNoCatchDirectionAnimNums[] = { - 4, // DIR_NONE - 4, // DIR_SOUTH - 5, // DIR_NORTH - 6, // DIR_WEST - 7, // DIR_EAST - 4, // DIR_SOUTHWEST - 4, // DIR_SOUTHEAST - 5, // DIR_NORTHWEST - 5, // DIR_NORTHEAST + [DIR_NONE] = 4, + [DIR_SOUTH] = 4, + [DIR_NORTH] = 5, + [DIR_WEST] = 6, + [DIR_EAST] = 7, + [DIR_SOUTHWEST] = 4, + [DIR_SOUTHEAST] = 4, + [DIR_NORTHWEST] = 5, + [DIR_NORTHEAST] = 5, }; const u8 gFishingBiteDirectionAnimNums[] = { - 8, // DIR_NONE - 8, // DIR_SOUTH - 9, // DIR_NORTH - 10, // DIR_WEST - 11, // DIR_EAST - 8, // DIR_SOUTHWEST - 8, // DIR_SOUTHEAST - 9, // DIR_NORTHWEST - 9, // DIR_NORTHEAST + [DIR_NONE] = 8, + [DIR_SOUTH] = 8, + [DIR_NORTH] = 9, + [DIR_WEST] = 10, + [DIR_EAST] = 11, + [DIR_SOUTHWEST] = 8, + [DIR_SOUTHEAST] = 8, + [DIR_NORTHWEST] = 9, + [DIR_NORTHEAST] = 9, }; const u8 gRunningDirectionAnimNums[] = { - 20, // DIR_NONE - 20, // DIR_SOUTH - 21, // DIR_NORTH - 22, // DIR_WEST - 23, // DIR_EAST - 20, // DIR_SOUTHWEST - 20, // DIR_SOUTHEAST - 21, // DIR_NORTHWEST - 21, // DIR_NORTHEAST + [DIR_NONE] = 20, + [DIR_SOUTH] = 20, + [DIR_NORTH] = 21, + [DIR_WEST] = 22, + [DIR_EAST] = 23, + [DIR_SOUTHWEST] = 20, + [DIR_SOUTHEAST] = 20, + [DIR_NORTHWEST] = 21, + [DIR_NORTHEAST] = 21, }; const u8 gTrainerFacingDirectionMovementTypes[] = { - MOVEMENT_TYPE_FACE_DOWN, // DIR_NONE - MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTH - MOVEMENT_TYPE_FACE_UP, // DIR_NORTH - MOVEMENT_TYPE_FACE_LEFT, // DIR_WEST - MOVEMENT_TYPE_FACE_RIGHT, // DIR_EAST - MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTHWEST - MOVEMENT_TYPE_FACE_DOWN, // DIR_SOUTHEAST - MOVEMENT_TYPE_FACE_UP, // DIR_NORTHWEST - MOVEMENT_TYPE_FACE_UP, // DIR_NORTHEAST + [DIR_NONE] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_SOUTH] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_NORTH] = MOVEMENT_TYPE_FACE_UP, + [DIR_WEST] = MOVEMENT_TYPE_FACE_LEFT, + [DIR_EAST] = MOVEMENT_TYPE_FACE_RIGHT, + [DIR_SOUTHWEST] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_SOUTHEAST] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_NORTHWEST] = MOVEMENT_TYPE_FACE_UP, + [DIR_NORTHEAST] = MOVEMENT_TYPE_FACE_UP, }; bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = { @@ -1093,10 +1093,10 @@ const u8 gUnknown_0850DC3F[][4] = { static void ClearEventObject(struct EventObject *eventObject) { *eventObject = (struct EventObject){}; - eventObject->localId = INVALID_U8; - eventObject->mapNum = INVALID_U8; - eventObject->mapGroup = INVALID_U8; - eventObject->movementActionId = INVALID_U8; + eventObject->localId = 0xFF; + eventObject->mapNum = 0xFF; + eventObject->mapGroup = 0xFF; + eventObject->movementActionId = 0xFF; } static void ClearAllEventObjects(void) @@ -1537,7 +1537,7 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl { eventObject->invisible = TRUE; } - *(u16 *)&spriteTemplate->paletteTag = INVALID_U16; + *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { @@ -1666,7 +1666,7 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x spriteTemplate = malloc(sizeof(struct SpriteTemplate)); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); - if (spriteTemplate->paletteTag != INVALID_U16) + if (spriteTemplate->paletteTag != 0xFFFF) { LoadEventObjectPalette(spriteTemplate->paletteTag); } @@ -1692,7 +1692,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); - *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; + *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; x += 7; y += 7; sub_80930E0(&x, &y, 8, 16); @@ -1849,7 +1849,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) spriteFrameImage.size = graphicsInfo->size; MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; - *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; + *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1864,7 +1864,7 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) paletteSlot -= 16; sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - *(u16 *)&spriteTemplate.paletteTag = INVALID_U16; + *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; spriteId = CreateSprite(&spriteTemplate, 0, 0, 0); if (spriteId != MAX_SPRITES) { @@ -2146,9 +2146,9 @@ void Unused_LoadEventObjectPaletteSet(u16 *paletteTags) static u8 sub_808E8F4(const struct SpritePalette *spritePalette) { - if (IndexOfSpritePaletteTag(spritePalette->tag) != INVALID_U8) + if (IndexOfSpritePaletteTag(spritePalette->tag) != 0xFF) { - return INVALID_U8; + return 0xFF; } return LoadSpritePalette(spritePalette); } @@ -2181,7 +2181,7 @@ static u8 FindEventObjectPaletteIndexByTag(u16 tag) return i; } } - return INVALID_U8; + return 0xFF; } void LoadPlayerObjectReflectionPalette(u16 tag, u8 slot) @@ -2513,7 +2513,7 @@ u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - return INVALID_U8; + return 0xFF; } return gEventObjects[eventObjectId].trainerType; } @@ -2529,7 +2529,7 @@ u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) { - return INVALID_U8; + return 0xFF; } return gEventObjects[eventObjectId].trainerRange_berryTreeId; } @@ -4374,7 +4374,7 @@ bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Spri bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } @@ -4553,7 +4553,7 @@ movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerI bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == INVALID_U8 || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } @@ -4699,7 +4699,7 @@ static void ClearEventObjectMovement(struct EventObject *eventObject, struct Spr eventObject->singleMovementActive = 0; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; - eventObject->movementActionId = INVALID_U8; + eventObject->movementActionId = 0xFF; sprite->data[1] = 0; } @@ -5105,7 +5105,7 @@ bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) { - if (eventObject->heldMovementActive && eventObject->movementActionId != INVALID_U8) + if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) return TRUE; return FALSE; @@ -5138,7 +5138,7 @@ void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) void EventObjectClearHeldMovement(struct EventObject *eventObject) { - eventObject->movementActionId = INVALID_U8; + eventObject->movementActionId = 0xFF; eventObject->heldMovementActive = FALSE; eventObject->heldMovementFinished = FALSE; gSprites[eventObject->spriteId].data[1] = 0; @@ -5167,7 +5167,7 @@ u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) if (eventObject->heldMovementActive) return eventObject->movementActionId; - return INVALID_U8; + return 0xFF; } void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) @@ -5279,7 +5279,7 @@ static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject { if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) { - eventObject->movementActionId = INVALID_U8; + eventObject->movementActionId = 0xFF; sprite->data[2] = 0; return TRUE; } @@ -5706,7 +5706,7 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba eventObject->triggerGroundEffectsOnMove = TRUE; eventObject->disableCoveringGroundEffects = TRUE; } - else if (result == INVALID_U8) + else if (result == 0xFF) { ShiftStillEventObjectCoords(eventObject); eventObject->triggerGroundEffectsOnStop = TRUE; @@ -5728,7 +5728,7 @@ u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite) bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_8094188(eventObject, sprite) == INVALID_U8) + if (sub_8094188(eventObject, sprite) == 0xFF) { return TRUE; } @@ -5737,7 +5737,7 @@ bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite) { - if (sub_809419C(eventObject, sprite) == INVALID_U8) + if (sub_809419C(eventObject, sprite) == 0xFF) { return TRUE; } @@ -9122,7 +9122,7 @@ void CreateLevitateMovementTask(struct EventObject *eventObject) StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); eventObject->warpArrowSpriteId = taskId; - task->data[3] = INVALID_U16; + task->data[3] = 0xFFFF; } static void ApplyLevitateMovement(u8 taskId) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 25d85a855..1070c69e9 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -748,7 +748,7 @@ static void Task_EvolutionScene(u8 taskID) GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy10(gBattleTextBuff1, text); - if (var == INVALID_U16) // no place to learn it + if (var == 0xFFFF) // no place to learn it gTasks[taskID].tState = 22; else if (var == 0xFFFE) // it already knows that move break; @@ -1105,7 +1105,7 @@ static void Task_TradeEvolutionScene(u8 taskID) GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy10(gBattleTextBuff1, text); - if (var == INVALID_U16) + if (var == 0xFFFF) gTasks[taskID].tState = 20; else if (var == 0xFFFE) break; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 1dce3169e..c52f5190f 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -266,7 +266,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil else eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) return NULL; for (i = 0; i < 4; i++) @@ -287,14 +287,14 @@ static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 const u8 *script; eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; // Look for an event object on the other side of the counter. eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8) + if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) return NULL; } diff --git a/src/field_door.c b/src/field_door.c index a1fe5bb97..c197aca14 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -695,7 +695,7 @@ static void DrawClosedDoorTiles(const struct DoorGraphics *gfx, u32 x, u32 y) static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame, u32 x, u32 y) { - if (frame->offset == INVALID_U16) + if (frame->offset == 0xFFFF) { DrawClosedDoorTiles(gfx, x, y); if (sub_808A964()) diff --git a/src/field_effect.c b/src/field_effect.c index 91d61ef2f..40e15c733 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -305,7 +305,7 @@ const union AnimCmd *const gNewGameBirchImageAnimTable[] = { }; const struct SpriteTemplate gNewGameBirchObjectTemplate = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4102, .oam = &gNewGameBirchOamAttributes, .anims = gNewGameBirchImageAnimTable, @@ -383,7 +383,7 @@ const union AnimCmd *const gSpriteAnimTable_855C300[] = { }; const struct SpriteTemplate gSpriteTemplate_855C304 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4103, .oam = &gOamData_855C218, .anims = gSpriteAnimTable_855C2F8, @@ -393,7 +393,7 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = { }; const struct SpriteTemplate gSpriteTemplate_855C31C = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4100, .oam = &gOamData_855C220, .anims = gSpriteAnimTable_855C2F8, @@ -403,7 +403,7 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = { }; const struct SpriteTemplate gSpriteTemplate_855C334 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4112, .oam = &gOamData_855C220, .anims = gSpriteAnimTable_855C300, @@ -413,7 +413,7 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = { }; const struct SpriteTemplate gSpriteTemplate_855C34C = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4112, .oam = &gOamData_855C26C, .anims = gSpriteAnimTable_855C300, @@ -618,7 +618,7 @@ u32 FieldEffectScript_ReadWord(u8 **script) void FieldEffectScript_LoadTiles(u8 **script) { struct SpriteSheet *sheet = (struct SpriteSheet *)FieldEffectScript_ReadWord(script); - if (GetSpriteTileStartByTag(sheet->tag) == INVALID_U16) + if (GetSpriteTileStartByTag(sheet->tag) == 0xFFFF) LoadSpriteSheet(sheet); (*script) += 4; } @@ -665,7 +665,7 @@ void FieldEffectFreeTilesIfUnused(u16 tileStart) u8 i; u16 tag = GetSpriteTileTagByTileStart(tileStart); - if (tag != INVALID_U16) + if (tag != 0xFFFF) { for (i = 0; i < MAX_SPRITES; i++) if (gSprites[i].inUse && gSprites[i].usingSheet && tileStart == gSprites[i].sheetTileStart) @@ -679,7 +679,7 @@ void FieldEffectFreePaletteIfUnused(u8 paletteNum) u8 i; u16 tag = GetSpritePaletteTagByPaletteNum(paletteNum); - if (tag != INVALID_U16) + if (tag != 0xFFFF) { for (i = 0; i < MAX_SPRITES; i++) if (gSprites[i].inUse && gSprites[i].oam.paletteNum == paletteNum) @@ -761,7 +761,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority) { s32 spriteId = CreateMonPicSprite_HandleDeoxys(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); - if (spriteId == INVALID_U16) + if (spriteId == 0xFFFF) return MAX_SPRITES; else return spriteId; @@ -772,7 +772,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, d, g); u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); - if (spriteId == INVALID_U16) + if (spriteId == 0xFFFF) return MAX_SPRITES; else return spriteId; @@ -3591,7 +3591,7 @@ const union AnimCmd *const gSpriteAnimTable_855C5DC[] = { }; const struct SpriteTemplate gUnknown_0855C5EC = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 4378, .oam = &gOamData_855C218, .anims = gSpriteAnimTable_855C5DC, diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index a68a72c76..3046eccd5 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1007,15 +1007,15 @@ void UpdateSurfBlobFieldEffect(struct Sprite *sprite) static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite) { u8 surfBlobDirectionAnims[] = { - 0, // DIR_NONE - 0, // DIR_SOUTH - 1, // DIR_NORTH - 2, // DIR_WEST - 3, // DIR_EAST - 0, - 0, - 1, - 1, + [DIR_NONE] = 0, + [DIR_SOUTH] = 0, + [DIR_NORTH] = 1, + [DIR_WEST] = 2, + [DIR_EAST] = 3, + [DIR_SOUTHWEST] = 0, + [DIR_SOUTHEAST] = 0, + [DIR_NORTHWEST] = 1, + [DIR_NORTHEAST] = 1, }; if (sub_8155640(sprite) == 0) diff --git a/src/field_message_box.c b/src/field_message_box.c index 0725ca8c7..46da9e9e5 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -53,7 +53,7 @@ void task_add_textbox(void) void task_del_textbox(void) { u8 taskId = FindTaskIdByFunc(sub_8098154); - if (taskId != INVALID_U8) + if (taskId != 0xFF) DestroyTask(taskId); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 7da89fe83..a5aa23e32 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1389,7 +1389,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) u8 eventObjectId; struct EventObject *eventObject; - playerEventObjTemplate.localId = INVALID_U8; + playerEventObjTemplate.localId = 0xFF; playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); playerEventObjTemplate.x = x - 7; playerEventObjTemplate.y = y - 7; diff --git a/src/field_specials.c b/src/field_specials.c index 629f2d0de..b47df09fc 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1691,22 +1691,22 @@ const struct WindowTemplate gUnknown_085B2BAC = { }; const u8 *const gElevatorFloorsTable[] = { - gText_B4F, - gText_B3F, - gText_B2F, - gText_B1F, - gText_1F, - gText_2F, - gText_3F, - gText_4F, - gText_5F, - gText_6F, - gText_7F, - gText_8F, - gText_9F, - gText_10F, - gText_11F, - gText_Rooftop + gText_B4F, + gText_B3F, + gText_B2F, + gText_B1F, + gText_1F, + gText_2F, + gText_3F, + gText_4F, + gText_5F, + gText_6F, + gText_7F, + gText_8F, + gText_9F, + gText_10F, + gText_11F, + gText_Rooftop }; const u16 gUnknown_085B2BF4[][3] = @@ -1957,12 +1957,12 @@ void sub_8139D98(void) bool32 warp0_in_pokecenter(void) { - static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, INVALID_U16 }; + static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xFFFF }; int i; u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum; - for (i = 0; gUnknown_085B2C2A[i] != INVALID_U16; i++) + for (i = 0; gUnknown_085B2C2A[i] != 0xFFFF; i++) { if (gUnknown_085B2C2A[i] == map) return TRUE; @@ -2946,10 +2946,10 @@ void sub_813AA44(void) static void sub_813AA60(u16 a0, u16 a1) { - static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, INVALID_U16 }; - static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, INVALID_U16 }; - static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, INVALID_U16 }; - static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, INVALID_U16 }; + static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xFFFF }; + static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xFFFF }; + static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xFFFF }; + static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xFFFF }; static const u8 *const gUnknown_085B3170[] = { BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA, @@ -3004,7 +3004,7 @@ static void sub_813AA60(u16 a0, u16 a1) { case 3: AddTextPrinterParameterized2(0, 1, gUnknown_085B3170[a1], 0, NULL, 2, 1, 3); - if (gUnknown_085B312C[a1] == INVALID_U16) + if (gUnknown_085B312C[a1] == 0xFFFF) { sub_813ABD4(gUnknown_085B312C[a1]); } @@ -3017,7 +3017,7 @@ static void sub_813AA60(u16 a0, u16 a1) break; case 4: AddTextPrinterParameterized2(0, 1, gUnknown_085B319C[a1], 0, NULL, 2, 1, 3); - if (gUnknown_085B3142[a1] == INVALID_U16) + if (gUnknown_085B3142[a1] == 0xFFFF) { sub_813ABD4(gUnknown_085B3142[a1]); } @@ -3841,13 +3841,13 @@ bool32 sub_813B9C0(void) MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - INVALID_U16 + 0xFFFF }; int i; u16 map = (gSaveBlock1Ptr->location.mapGroup << 8) + gSaveBlock1Ptr->location.mapNum; - for (i = 0; gUnknown_085B3444[i] != INVALID_U16; i++) + for (i = 0; gUnknown_085B3444[i] != 0xFFFF; i++) { if (gUnknown_085B3444[i] == map) { diff --git a/src/fieldmap.c b/src/fieldmap.c index aef17d49d..7e1fc03eb 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -496,7 +496,7 @@ u16 GetBehaviorByMetatileId(u16 metatile) } else { - return INVALID_U8; + return 0xFF; } } @@ -922,7 +922,7 @@ void sub_8088B94(int x, int y, int a2) bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2) { - if (a2 == INVALID_U8) + if (a2 == 0xFF) return FALSE; if (a2 == 0) diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 2cffd5d41..6a310efd2 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -164,7 +164,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectP static const struct SpriteTemplate sSpriteTemplate_CutGrass = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0x1000, .oam = &sOamData_CutGrass, .anims = sSpriteAnimTable_CutGrass, diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index 3bbc489c1..b9af24fb1 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -236,7 +236,7 @@ static void sub_81BE968(void) u8 taskId; taskId = FindTaskIdByFunc(sub_81BE9C0); - if(taskId != INVALID_U8) + if(taskId != 0xFF) gTasks[taskId].data[0]++; } diff --git a/src/fossil_specials.c b/src/fossil_specials.c index 8f6e38e91..dfdb999a9 100644 --- a/src/fossil_specials.c +++ b/src/fossil_specials.c @@ -302,7 +302,7 @@ static void sub_81BED50(u8 taskId) case 4: UnsetBgTilemapBuffer(0); anotherTaskId = FindTaskIdByFunc(sub_81BEBB4); - if (anotherTaskId != INVALID_U8) + if (anotherTaskId != 0xFF) DestroyTask(anotherTaskId); sUnknown_0203CF14[1] = sUnknown_0203CF14[0] = 0; sub_81BEB90(); @@ -458,104 +458,104 @@ static void sub_81BF2B8(u8* a, u16 b, u8 c, u8 d, u8 e) { asm_unified("\n\ push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x8\n\ - str r0, [sp]\n\ - mov r10, r1\n\ - adds r6, r2, 0\n\ - mov r8, r3\n\ - ldr r0, [sp, 0x28]\n\ - mov r9, r0\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - mov r10, r1\n\ - lsls r6, 24\n\ - lsrs r6, 24\n\ - mov r0, r8\n\ - lsls r0, 24\n\ - mov r8, r0\n\ - lsrs r7, r0, 24\n\ - mov r1, r9\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r9, r1\n\ - mov r0, r10\n\ - adds r1, r7, 0\n\ - bl __divsi3\n\ - adds r5, r0, 0\n\ - lsls r5, 24\n\ - lsrs r4, r5, 24\n\ - ldr r3, =gUnknown_030012A8\n\ - strh r4, [r3]\n\ - mov r0, r10\n\ - adds r1, r7, 0\n\ - str r3, [sp, 0x4]\n\ - bl __modsi3\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - ldr r3, [sp, 0x4]\n\ - strh r2, [r3, 0x2]\n\ - movs r1, 0x7\n\ - ands r4, r1\n\ - ands r2, r1\n\ - strh r4, [r3, 0x4]\n\ - strh r2, [r3, 0x6]\n\ - lsrs r0, 27\n\ - lsrs r5, 27\n\ - strh r0, [r3, 0x8]\n\ - strh r5, [r3, 0xA]\n\ - mov r1, r8\n\ - lsrs r1, 27\n\ - lsls r1, 6\n\ - mov r8, r1\n\ - mov r1, r8\n\ - muls r1, r5\n\ - lsls r0, 6\n\ - adds r1, r0\n\ - lsls r1, 16\n\ - lsrs r1, 16\n\ - strh r1, [r3, 0xC]\n\ - lsls r4, 3\n\ - adds r4, r2\n\ - adds r1, r4\n\ - lsls r4, r1, 16\n\ - lsrs r4, 17\n\ - strh r1, [r3, 0xE]\n\ - movs r1, 0x1\n\ - mov r0, r10\n\ - ands r1, r0\n\ - movs r2, 0x1\n\ - eors r1, r2\n\ - lsls r0, r1, 2\n\ - lsls r6, r0\n\ - eors r1, r2\n\ - lsls r1, 2\n\ - movs r0, 0xF\n\ - lsls r0, r1\n\ - orrs r6, r0\n\ - lsls r6, 24\n\ - lsrs r6, 24\n\ - mov r1, r9\n\ - lsls r1, 5\n\ - mov r9, r1\n\ - add r9, r4\n\ - ldr r1, [sp]\n\ - add r1, r9\n\ - ldrb r0, [r1]\n\ - ands r6, r0\n\ - strb r6, [r1]\n\ - add sp, 0x8\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x8\n\ + str r0, [sp]\n\ + mov r10, r1\n\ + adds r6, r2, 0\n\ + mov r8, r3\n\ + ldr r0, [sp, 0x28]\n\ + mov r9, r0\n\ + lsls r1, 16\n\ + lsrs r1, 16\n\ + mov r10, r1\n\ + lsls r6, 24\n\ + lsrs r6, 24\n\ + mov r0, r8\n\ + lsls r0, 24\n\ + mov r8, r0\n\ + lsrs r7, r0, 24\n\ + mov r1, r9\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + mov r9, r1\n\ + mov r0, r10\n\ + adds r1, r7, 0\n\ + bl __divsi3\n\ + adds r5, r0, 0\n\ + lsls r5, 24\n\ + lsrs r4, r5, 24\n\ + ldr r3, =gUnknown_030012A8\n\ + strh r4, [r3]\n\ + mov r0, r10\n\ + adds r1, r7, 0\n\ + str r3, [sp, 0x4]\n\ + bl __modsi3\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + ldr r3, [sp, 0x4]\n\ + strh r2, [r3, 0x2]\n\ + movs r1, 0x7\n\ + ands r4, r1\n\ + ands r2, r1\n\ + strh r4, [r3, 0x4]\n\ + strh r2, [r3, 0x6]\n\ + lsrs r0, 27\n\ + lsrs r5, 27\n\ + strh r0, [r3, 0x8]\n\ + strh r5, [r3, 0xA]\n\ + mov r1, r8\n\ + lsrs r1, 27\n\ + lsls r1, 6\n\ + mov r8, r1\n\ + mov r1, r8\n\ + muls r1, r5\n\ + lsls r0, 6\n\ + adds r1, r0\n\ + lsls r1, 16\n\ + lsrs r1, 16\n\ + strh r1, [r3, 0xC]\n\ + lsls r4, 3\n\ + adds r4, r2\n\ + adds r1, r4\n\ + lsls r4, r1, 16\n\ + lsrs r4, 17\n\ + strh r1, [r3, 0xE]\n\ + movs r1, 0x1\n\ + mov r0, r10\n\ + ands r1, r0\n\ + movs r2, 0x1\n\ + eors r1, r2\n\ + lsls r0, r1, 2\n\ + lsls r6, r0\n\ + eors r1, r2\n\ + lsls r1, 2\n\ + movs r0, 0xF\n\ + lsls r0, r1\n\ + orrs r6, r0\n\ + lsls r6, 24\n\ + lsrs r6, 24\n\ + mov r1, r9\n\ + lsls r1, 5\n\ + mov r9, r1\n\ + add r9, r4\n\ + ldr r1, [sp]\n\ + add r1, r9\n\ + ldrb r0, [r1]\n\ + ands r6, r0\n\ + strb r6, [r1]\n\ + add sp, 0x8\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ "); } #endif // NONMATCHING diff --git a/src/frontier_util.c b/src/frontier_util.c index e799f96c8..528cce699 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -681,7 +681,7 @@ static const u8 sFacilityToBrainEventObjGfx[][2] = const u16 gFrontierBannedSpecies[] = { SPECIES_MEW, SPECIES_MEWTWO, SPECIES_HO_OH, SPECIES_LUGIA, SPECIES_CELEBI, - SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, INVALID_U16 + SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF }; static const u8 *const gUnknown_08611CB0[][2] = @@ -1829,7 +1829,7 @@ void sub_81A3ACC(void) s32 i; for (i = 0; i < 20; i++) - gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16; + gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF; } static void sub_81A3B00(void) @@ -1974,10 +1974,10 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL if (species == SPECIES_EGG || species == SPECIES_NONE) return; - for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16 && gFrontierBannedSpecies[i] != species; i++) + for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF && gFrontierBannedSpecies[i] != species; i++) ; - if (gFrontierBannedSpecies[i] != INVALID_U16) + if (gFrontierBannedSpecies[i] != 0xFFFF) return; if (lvlMode == FRONTIER_LVL_50 && monLevel > 50) return; @@ -2060,7 +2060,7 @@ static void sub_81A3FD4(void) s32 i; s32 caughtBannedMons = 0; s32 species = gFrontierBannedSpecies[0]; - for (i = 0; species != INVALID_U16; i++, species = gFrontierBannedSpecies[i]) + for (i = 0; species != 0xFFFF; i++, species = gFrontierBannedSpecies[i]) { if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT)) caughtBannedMons++; @@ -2068,7 +2068,7 @@ static void sub_81A3FD4(void) gStringVar1[0] = EOS; gSpecialVar_0x8004 = 1; count = 0; - for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16; i++) + for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF; i++) count = sub_81A3DD0(gFrontierBannedSpecies[i], count, caughtBannedMons); if (count == 0) diff --git a/src/gpu_regs.c b/src/gpu_regs.c index 805f23b48..2d48b304a 100644 --- a/src/gpu_regs.c +++ b/src/gpu_regs.c @@ -20,166 +20,166 @@ static void UpdateRegDispstatIntrBits(u16 regIE); void InitGpuRegManager(void) { - s32 i; + s32 i; - for (i = 0; i < GPU_REG_BUF_SIZE; i++) + for (i = 0; i < GPU_REG_BUF_SIZE; i++) { - sGpuRegBuffer[i] = 0; - sGpuRegWaitingList[i] = EMPTY_SLOT; - } + sGpuRegBuffer[i] = 0; + sGpuRegWaitingList[i] = EMPTY_SLOT; + } - sGpuRegBufferLocked = FALSE; - sShouldSyncRegIE = FALSE; - sRegIE = 0; + sGpuRegBufferLocked = FALSE; + sShouldSyncRegIE = FALSE; + sRegIE = 0; } static void CopyBufferedValueToGpuReg(u8 regOffset) { - if (regOffset == REG_OFFSET_DISPSTAT) + if (regOffset == REG_OFFSET_DISPSTAT) { - REG_DISPSTAT &= ~(DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); - REG_DISPSTAT |= GPU_REG_BUF(REG_OFFSET_DISPSTAT); - } - else + REG_DISPSTAT &= ~(DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); + REG_DISPSTAT |= GPU_REG_BUF(REG_OFFSET_DISPSTAT); + } + else { - GPU_REG(regOffset) = GPU_REG_BUF(regOffset); - } + GPU_REG(regOffset) = GPU_REG_BUF(regOffset); + } } void CopyBufferedValuesToGpuRegs(void) { - if (!sGpuRegBufferLocked) + if (!sGpuRegBufferLocked) { - s32 i; + s32 i; - for (i = 0; i < GPU_REG_BUF_SIZE; i++) + for (i = 0; i < GPU_REG_BUF_SIZE; i++) { - u8 regOffset = sGpuRegWaitingList[i]; - if (regOffset == EMPTY_SLOT) - return; - CopyBufferedValueToGpuReg(regOffset); - sGpuRegWaitingList[i] = EMPTY_SLOT; - } - } + u8 regOffset = sGpuRegWaitingList[i]; + if (regOffset == EMPTY_SLOT) + return; + CopyBufferedValueToGpuReg(regOffset); + sGpuRegWaitingList[i] = EMPTY_SLOT; + } + } } void SetGpuReg(u8 regOffset, u16 value) { - if (regOffset < GPU_REG_BUF_SIZE) - { - u16 vcount; - - GPU_REG_BUF(regOffset) = value; - vcount = REG_VCOUNT & 0xFF; - - if ((vcount >= 161 && vcount <= 225) - || (REG_DISPCNT & DISPCNT_FORCED_BLANK)) { - CopyBufferedValueToGpuReg(regOffset); - } else { - s32 i; - - sGpuRegBufferLocked = TRUE; - - for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { - if (sGpuRegWaitingList[i] == regOffset) { - sGpuRegBufferLocked = FALSE; - return; - } - } - - sGpuRegWaitingList[i] = regOffset; - sGpuRegBufferLocked = FALSE; - } - } + if (regOffset < GPU_REG_BUF_SIZE) + { + u16 vcount; + + GPU_REG_BUF(regOffset) = value; + vcount = REG_VCOUNT & 0xFF; + + if ((vcount >= 161 && vcount <= 225) + || (REG_DISPCNT & DISPCNT_FORCED_BLANK)) { + CopyBufferedValueToGpuReg(regOffset); + } else { + s32 i; + + sGpuRegBufferLocked = TRUE; + + for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { + if (sGpuRegWaitingList[i] == regOffset) { + sGpuRegBufferLocked = FALSE; + return; + } + } + + sGpuRegWaitingList[i] = regOffset; + sGpuRegBufferLocked = FALSE; + } + } } void SetGpuReg_ForcedBlank(u8 regOffset, u16 value) { - if (regOffset < GPU_REG_BUF_SIZE) - { - GPU_REG_BUF(regOffset) = value; - - if (REG_DISPCNT & DISPCNT_FORCED_BLANK) { - CopyBufferedValueToGpuReg(regOffset); - } else { - s32 i; - - sGpuRegBufferLocked = TRUE; - - for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { - if (sGpuRegWaitingList[i] == regOffset) { - sGpuRegBufferLocked = FALSE; - return; - } - } - - sGpuRegWaitingList[i] = regOffset; - sGpuRegBufferLocked = FALSE; - } - } + if (regOffset < GPU_REG_BUF_SIZE) + { + GPU_REG_BUF(regOffset) = value; + + if (REG_DISPCNT & DISPCNT_FORCED_BLANK) { + CopyBufferedValueToGpuReg(regOffset); + } else { + s32 i; + + sGpuRegBufferLocked = TRUE; + + for (i = 0; i < GPU_REG_BUF_SIZE && sGpuRegWaitingList[i] != EMPTY_SLOT; i++) { + if (sGpuRegWaitingList[i] == regOffset) { + sGpuRegBufferLocked = FALSE; + return; + } + } + + sGpuRegWaitingList[i] = regOffset; + sGpuRegBufferLocked = FALSE; + } + } } u16 GetGpuReg(u8 regOffset) { - if (regOffset == REG_OFFSET_DISPSTAT) - return REG_DISPSTAT; + if (regOffset == REG_OFFSET_DISPSTAT) + return REG_DISPSTAT; - if (regOffset == REG_OFFSET_VCOUNT) - return REG_VCOUNT; + if (regOffset == REG_OFFSET_VCOUNT) + return REG_VCOUNT; - return GPU_REG_BUF(regOffset); + return GPU_REG_BUF(regOffset); } void SetGpuRegBits(u8 regOffset, u16 mask) { - u16 regValue = GPU_REG_BUF(regOffset); - SetGpuReg(regOffset, regValue | mask); + u16 regValue = GPU_REG_BUF(regOffset); + SetGpuReg(regOffset, regValue | mask); } void ClearGpuRegBits(u8 regOffset, u16 mask) { - u16 regValue = GPU_REG_BUF(regOffset); - SetGpuReg(regOffset, regValue & ~mask); + u16 regValue = GPU_REG_BUF(regOffset); + SetGpuReg(regOffset, regValue & ~mask); } static void SyncRegIE(void) { - if (sShouldSyncRegIE) { - u16 temp = REG_IME; - REG_IME = 0; - REG_IE = sRegIE; - REG_IME = temp; - sShouldSyncRegIE = FALSE; - } + if (sShouldSyncRegIE) { + u16 temp = REG_IME; + REG_IME = 0; + REG_IE = sRegIE; + REG_IME = temp; + sShouldSyncRegIE = FALSE; + } } void EnableInterrupts(u16 mask) { - sRegIE |= mask; - sShouldSyncRegIE = TRUE; - SyncRegIE(); - UpdateRegDispstatIntrBits(sRegIE); + sRegIE |= mask; + sShouldSyncRegIE = TRUE; + SyncRegIE(); + UpdateRegDispstatIntrBits(sRegIE); } void DisableInterrupts(u16 mask) { - sRegIE &= ~mask; - sShouldSyncRegIE = TRUE; - SyncRegIE(); - UpdateRegDispstatIntrBits(sRegIE); + sRegIE &= ~mask; + sShouldSyncRegIE = TRUE; + SyncRegIE(); + UpdateRegDispstatIntrBits(sRegIE); } static void UpdateRegDispstatIntrBits(u16 regIE) { - u16 oldValue = GetGpuReg(REG_OFFSET_DISPSTAT) & (DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); - u16 newValue = 0; + u16 oldValue = GetGpuReg(REG_OFFSET_DISPSTAT) & (DISPSTAT_HBLANK_INTR | DISPSTAT_VBLANK_INTR); + u16 newValue = 0; - if (regIE & INTR_FLAG_VBLANK) - newValue |= DISPSTAT_VBLANK_INTR; + if (regIE & INTR_FLAG_VBLANK) + newValue |= DISPSTAT_VBLANK_INTR; - if (regIE & INTR_FLAG_HBLANK) - newValue |= DISPSTAT_HBLANK_INTR; + if (regIE & INTR_FLAG_HBLANK) + newValue |= DISPSTAT_HBLANK_INTR; - if (oldValue != newValue) - SetGpuReg(REG_OFFSET_DISPSTAT, newValue); + if (oldValue != newValue) + SetGpuReg(REG_OFFSET_DISPSTAT, newValue); } diff --git a/src/ground.c b/src/ground.c index abfeb3f3e..6cb7b8557 100644 --- a/src/ground.c +++ b/src/ground.c @@ -588,7 +588,7 @@ void sub_81152DC(u8 taskId) break; default: task->data[9] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - if (task->data[9] == INVALID_U8) + if (task->data[9] == 0xFF) { DestroyAnimVisualTask(taskId); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index b75243b84..ad5673036 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -467,11 +467,11 @@ static void Task_Hof_InitMonData(u8 taskId) sUnknown_0203BCD4 = 0; gTasks[taskId].tDisplayedMonId = 0; - gTasks[taskId].tPlayerSpriteID = INVALID_U8; + gTasks[taskId].tPlayerSpriteID = 0xFF; for (i = 0; i < PARTY_SIZE; i++) { - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } if (gTasks[taskId].tDontSaveData) @@ -522,7 +522,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) static void Task_Hof_TrySaveData(u8 taskId) { gGameContinueCallback = CB2_DoHallOfFameScreenDontSaveData; - if (TrySavingData(SAVE_HALL_OF_FAME) == INVALID_U8 && gDamagedSaveSectors != 0) + if (TrySavingData(SAVE_HALL_OF_FAME) == 0xFF && gDamagedSaveSectors != 0) { UnsetBgTilemapBuffer(1); UnsetBgTilemapBuffer(3); @@ -645,7 +645,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId) BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB_BLACK); for (i = 0; i < PARTY_SIZE; i++) { - if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8) + if (gTasks[taskId].tMonSpriteId(i) != 0xFF) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 0; } @@ -668,7 +668,7 @@ static void sub_8173DC0(u8 taskId) u16 i; for (i = 0; i < PARTY_SIZE; i++) { - if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8) + if (gTasks[taskId].tMonSpriteId(i) != 0xFF) gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1; } BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24)); @@ -752,7 +752,7 @@ static void Task_Hof_HandleExit(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u8 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) { FreeOamMatrix(gSprites[spriteId].oam.matrixNum); FreeAndDestroyMonPicSprite(spriteId); @@ -847,7 +847,7 @@ void CB2_DoHallOfFamePC(void) for (i = 0; i < PARTY_SIZE; i++) { - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } sHofMonPtr = AllocZeroed(0x2000); @@ -937,7 +937,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId) } else { - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } } @@ -967,7 +967,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u16 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) gSprites[spriteId].oam.priority = 1; } @@ -999,10 +999,10 @@ static void Task_HofPC_HandleInput(u8 taskId) for (i = 0; i < 6; i++) { u8 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) { FreeAndDestroyMonPicSprite(spriteId); - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } } if (gTasks[taskId].tCurrPageNo != 0) @@ -1060,10 +1060,10 @@ static void Task_HofPC_HandleExit(u8 taskId) for (i = 0; i < PARTY_SIZE; i++) { u16 spriteId = gTasks[taskId].tMonSpriteId(i); - if (spriteId != INVALID_U8) + if (spriteId != 0xFF) { FreeAndDestroyMonPicSprite(spriteId); - gTasks[taskId].tMonSpriteId(i) = INVALID_U8; + gTasks[taskId].tMonSpriteId(i) = 0xFF; } } @@ -1130,7 +1130,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u { stringPtr = StringCopy(text, gText_Number); dexNumber = SpeciesToPokedexNum(currMon->species); - if (dexNumber != INVALID_U16) + if (dexNumber != 0xFFFF) { stringPtr[0] = (dexNumber / 100) + CHAR_0; stringPtr++; @@ -1417,7 +1417,7 @@ void sub_8175280(void) gSpecialVar_0x8004 = 180; taskId = CreateTask(sub_8175364, 0); - if (taskId != INVALID_U8) + if (taskId != 0xFF) { gTasks[taskId].data[1] = gSpecialVar_0x8004; gSpecialVar_0x8005 = taskId; @@ -1428,7 +1428,7 @@ static void sub_81752C0(void) { u8 taskId; - if ((taskId = FindTaskIdByFunc(sub_8175364)) != INVALID_U8) + if ((taskId = FindTaskIdByFunc(sub_8175364)) != 0xFF) DestroyTask(taskId); sub_8152254(); @@ -1473,7 +1473,7 @@ static void sub_8175364(u8 taskId) { DestroyTask(taskId); gSpecialVar_0x8004 = var; - gSpecialVar_0x8005 = INVALID_U16; + gSpecialVar_0x8005 = 0xFFFF; } LoadCompressedObjectPic(sHallOfFame_ConfettiSpriteSheet); LoadCompressedObjectPalette(sHallOfFame_ConfettiSpritePalette); @@ -1483,7 +1483,7 @@ static void sub_8175364(u8 taskId) if (data[1] != 0 && data[1] % 3 == 0) { var = sub_81524C4(&sOamData_85E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var); - if (var != INVALID_U8) + if (var != 0xFF) { sub_8152438(var, sub_81752F4); if ((Random() & 3) == 0) @@ -1496,12 +1496,12 @@ static void sub_8175364(u8 taskId) if (data[1] != 0) data[1]--; else if (data[15] == 0) - data[0] = INVALID_U8; + data[0] = 0xFF; break; - case INVALID_U8: + case 0xFF: sub_81752C0(); gSpecialVar_0x8004 = var; - gSpecialVar_0x8005 = INVALID_U16; + gSpecialVar_0x8005 = 0xFFFF; break; } } diff --git a/src/intro.c b/src/intro.c index 44d1c086d..94692e6ec 100644 --- a/src/intro.c +++ b/src/intro.c @@ -62,10 +62,10 @@ static const u32 gIntro3MiscTiles[] = INCBIN_U32("graphics/intro/intro3_misc.4bp static const u16 gIntro1FlygonPalette[] = INCBIN_U16("graphics/intro/intro1_flygon.gbapal"); static const u32 gIntro1EonTiles_Unused[] = INCBIN_U32("graphics/intro/intro1_eon.4bpp.lz"); static const u8 sUnknownBytes[] = { - 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D, + 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x02, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x02, 0x0D, 0x0E, 0x0F, 0x10, - 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00 + 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00 }; static const struct CompressedSpriteSheet gUnknown_085E4A74[] = { diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 1b4e9e15a..20a360901 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -58,7 +58,7 @@ static void sub_817B7C4(struct Sprite *sprite); static void nullsub_66(struct Sprite *sprite); static const struct SpriteTemplate gUnknown_085F504C = { - 2000, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C + 2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C }; static const struct CompressedSpriteSheet gUnknown_085F5064[] = { diff --git a/src/item.c b/src/item.c index e2583ddb1..6a1f1955a 100644 --- a/src/item.c +++ b/src/item.c @@ -244,152 +244,152 @@ NAKED bool8 CheckBagHasSpace(u16 itemId, u16 count) { asm_unified("push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x4\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - mov r8, r0\n\ - lsls r1, 16\n\ - lsrs r5, r1, 16\n\ - bl ItemId_GetPocket\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080D6906\n\ - bl InBattlePyramid\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080D6838\n\ - ldr r0, =0x00004004\n\ - bl FlagGet\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x1\n\ - bne _080D684C\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r8, r0\n\ + lsls r1, 16\n\ + lsrs r5, r1, 16\n\ + bl ItemId_GetPocket\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080D6906\n\ + bl InBattlePyramid\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080D6838\n\ + ldr r0, =0x00004004\n\ + bl FlagGet\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0x1\n\ + bne _080D684C\n\ _080D6838:\n\ - mov r0, r8\n\ - adds r1, r5, 0\n\ - bl CheckPyramidBagHasSpace\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - b _080D6916\n\ - .pool\n\ + mov r0, r8\n\ + adds r1, r5, 0\n\ + bl CheckPyramidBagHasSpace\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + b _080D6916\n\ + .pool\n\ _080D684C:\n\ - mov r0, r8\n\ - bl ItemId_GetPocket\n\ - subs r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - ldr r7, =0x000003e7\n\ - cmp r2, 0x3\n\ - beq _080D6860\n\ - movs r7, 0x63\n\ + mov r0, r8\n\ + bl ItemId_GetPocket\n\ + subs r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + ldr r7, =0x000003e7\n\ + cmp r2, 0x3\n\ + beq _080D6860\n\ + movs r7, 0x63\n\ _080D6860:\n\ - movs r6, 0\n\ - ldr r1, =gBagPockets\n\ - lsls r4, r2, 3\n\ - adds r0, r4, r1\n\ - mov r9, r4\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r6, r0\n\ - bcs _080D68BC\n\ - subs r0, r2, 0x2\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r10, r0\n\ + movs r6, 0\n\ + ldr r1, =gBagPockets\n\ + lsls r4, r2, 3\n\ + adds r0, r4, r1\n\ + mov r9, r4\n\ + ldrb r0, [r0, 0x4]\n\ + cmp r6, r0\n\ + bcs _080D68BC\n\ + subs r0, r2, 0x2\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r10, r0\n\ _080D6878:\n\ - adds r0, r4, r1\n\ - ldr r1, [r0]\n\ - lsls r0, r6, 2\n\ - adds r1, r0, r1\n\ - ldrh r0, [r1]\n\ - cmp r0, r8\n\ - bne _080D68AC\n\ - adds r0, r1, 0x2\n\ - str r2, [sp]\n\ - bl GetBagItemQuantity\n\ - lsls r0, 16\n\ - lsrs r1, r0, 16\n\ - adds r0, r1, r5\n\ - ldr r2, [sp]\n\ - cmp r0, r7\n\ - ble _080D6914\n\ - mov r0, r10\n\ - cmp r0, 0x1\n\ - bls _080D6906\n\ - subs r0, r7, r1\n\ - subs r0, r5, r0\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - cmp r5, 0\n\ - beq _080D6914\n\ + adds r0, r4, r1\n\ + ldr r1, [r0]\n\ + lsls r0, r6, 2\n\ + adds r1, r0, r1\n\ + ldrh r0, [r1]\n\ + cmp r0, r8\n\ + bne _080D68AC\n\ + adds r0, r1, 0x2\n\ + str r2, [sp]\n\ + bl GetBagItemQuantity\n\ + lsls r0, 16\n\ + lsrs r1, r0, 16\n\ + adds r0, r1, r5\n\ + ldr r2, [sp]\n\ + cmp r0, r7\n\ + ble _080D6914\n\ + mov r0, r10\n\ + cmp r0, 0x1\n\ + bls _080D6906\n\ + subs r0, r7, r1\n\ + subs r0, r5, r0\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + cmp r5, 0\n\ + beq _080D6914\n\ _080D68AC:\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - ldr r1, =gBagPockets\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r6, r0\n\ - bcc _080D6878\n\ + adds r0, r6, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + ldr r1, =gBagPockets\n\ + adds r0, r4, r1\n\ + ldrb r0, [r0, 0x4]\n\ + cmp r6, r0\n\ + bcc _080D6878\n\ _080D68BC:\n\ - cmp r5, 0\n\ - beq _080D6914\n\ - movs r6, 0\n\ - ldr r3, =gBagPockets\n\ - mov r1, r9\n\ - adds r0, r1, r3\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r6, r0\n\ - bcs _080D6902\n\ - adds r4, r3, 0\n\ - subs r0, r2, 0x2\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ + cmp r5, 0\n\ + beq _080D6914\n\ + movs r6, 0\n\ + ldr r3, =gBagPockets\n\ + mov r1, r9\n\ + adds r0, r1, r3\n\ + ldrb r0, [r0, 0x4]\n\ + cmp r6, r0\n\ + bcs _080D6902\n\ + adds r4, r3, 0\n\ + subs r0, r2, 0x2\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ _080D68D6:\n\ - adds r0, r1, r4\n\ - ldr r1, [r0]\n\ - lsls r0, r6, 2\n\ - adds r0, r1\n\ - ldrh r0, [r0]\n\ - cmp r0, 0\n\ - bne _080D68F2\n\ - cmp r5, r7\n\ - bls _080D6914\n\ - cmp r2, 0x1\n\ - bls _080D6906\n\ - subs r0, r5, r7\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ + adds r0, r1, r4\n\ + ldr r1, [r0]\n\ + lsls r0, r6, 2\n\ + adds r0, r1\n\ + ldrh r0, [r0]\n\ + cmp r0, 0\n\ + bne _080D68F2\n\ + cmp r5, r7\n\ + bls _080D6914\n\ + cmp r2, 0x1\n\ + bls _080D6906\n\ + subs r0, r5, r7\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ _080D68F2:\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - mov r1, r9\n\ - adds r0, r1, r3\n\ - ldrb r0, [r0, 0x4]\n\ - cmp r6, r0\n\ - bcc _080D68D6\n\ + adds r0, r6, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + mov r1, r9\n\ + adds r0, r1, r3\n\ + ldrb r0, [r0, 0x4]\n\ + cmp r6, r0\n\ + bcc _080D68D6\n\ _080D6902:\n\ - cmp r5, 0\n\ - beq _080D6914\n\ + cmp r5, 0\n\ + beq _080D6914\n\ _080D6906:\n\ - movs r0, 0\n\ - b _080D6916\n\ - .pool\n\ + movs r0, 0\n\ + b _080D6916\n\ + .pool\n\ _080D6914:\n\ - movs r0, 0x1\n\ + movs r0, 0x1\n\ _080D6916:\n\ - add sp, 0x4\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1"); + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1"); } #endif // NONMATCHING diff --git a/src/item_icon.c b/src/item_icon.c index 2af938ff8..d037782bd 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -161,7 +161,7 @@ u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tile const void *GetItemIconPicOrPalette(u16 itemId, u8 which) { - if (itemId == INVALID_U16) + if (itemId == 0xFFFF) itemId = ITEM_FIELD_ARROW; else if (itemId >= ITEMS_COUNT) itemId = 0; diff --git a/src/item_menu.c b/src/item_menu.c index 5b18b06ec..2c75a80f2 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -532,11 +532,11 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) if (temp <= 1) gUnknown_0203CE54->unk81B = 1; gUnknown_0203CE54->unk0 = 0; - gUnknown_0203CE54->unk81A = INVALID_U8; + gUnknown_0203CE54->unk81A = 0xFF; gUnknown_0203CE54->unk81E = -1; gUnknown_0203CE54->unk81F = -1; - memset(gUnknown_0203CE54->unk804, INVALID_U8, sizeof(gUnknown_0203CE54->unk804)); - memset(gUnknown_0203CE54->unk810, INVALID_U8, 10); + memset(gUnknown_0203CE54->unk804, 0xFF, sizeof(gUnknown_0203CE54->unk804)); + memset(gUnknown_0203CE54->unk810, 0xFF, 10); SetMainCallback2(CB2_Bag); } } @@ -819,7 +819,7 @@ void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused) PlaySE(SE_SELECT); ShakeBagVisual(); } - if (gUnknown_0203CE54->unk81A == INVALID_U8) + if (gUnknown_0203CE54->unk81A == 0xFF) { RemoveBagItemIconSprite(1 ^ gUnknown_0203CE54->unk81B_1); if (a != -2) @@ -840,7 +840,7 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) int offset; if (item_index_in_pocket != -2) { - if (gUnknown_0203CE54->unk81A != INVALID_U8) + if (gUnknown_0203CE54->unk81A != 0xFF) { if (gUnknown_0203CE54->unk81A == (u8)item_index_in_pocket) bag_menu_print_cursor(a, 2); @@ -897,7 +897,7 @@ void bag_menu_print_cursor_(u8 a, u8 b) void bag_menu_print_cursor(u8 a, u8 b) { - if (b == INVALID_U8) + if (b == 0xFF) FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1)); else bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b); @@ -906,32 +906,32 @@ void bag_menu_print_cursor(u8 a, u8 b) void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81E == INVALID_U8) + if (gUnknown_0203CE54->unk81E == 0xFF) gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); } void sub_81AB824(void) { - if (gUnknown_0203CE54->unk81E != INVALID_U8) + if (gUnknown_0203CE54->unk81E != 0xFF) { RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81E); - gUnknown_0203CE54->unk81E = INVALID_U8; + gUnknown_0203CE54->unk81E = 0xFF; } sub_81AB89C(); } void bag_menu_add_list_scroll_arrow_indicators_maybe(void) { - if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == INVALID_U8) + if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == 0xFF) gUnknown_0203CE54->unk81F = AddScrollIndicatorArrowPair(&gUnknown_08614094, &gUnknown_0203CE58.unk6); } void sub_81AB89C(void) { - if (gUnknown_0203CE54->unk81F != INVALID_U8) + if (gUnknown_0203CE54->unk81F != 0xFF) { RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81F); - gUnknown_0203CE54->unk81F = INVALID_U8; + gUnknown_0203CE54->unk81F = 0xFF; } } @@ -2303,7 +2303,7 @@ u8 sub_81AE124(u8 a) u8 bag_menu_add_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr == INVALID_U8) + if (*ptr == 0xFF) { *ptr = AddWindow(&gUnknown_086141AC[a]); SetWindowBorderStyle(*ptr, 0, 1, 14); @@ -2315,20 +2315,20 @@ u8 bag_menu_add_window(u8 a) void bag_menu_remove_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr != INVALID_U8) + if (*ptr != 0xFF) { sub_8198070(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); - *ptr = INVALID_U8; + *ptr = 0xFF; } } u8 AddItemMessageWindow(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr == INVALID_U8) + if (*ptr == 0xFF) *ptr = AddWindow(&gUnknown_086141AC[a]); return *ptr; } @@ -2336,13 +2336,13 @@ u8 AddItemMessageWindow(u8 a) void bag_menu_RemoveBagItem_message_window(u8 a) { u8 *ptr = &gUnknown_0203CE54->unk810[a]; - if (*ptr != INVALID_U8) + if (*ptr != 0xFF) { sub_8197DF8(*ptr, 0); ClearWindowTilemap(*ptr); RemoveWindow(*ptr); schedule_bg_copy_tilemap_to_vram(1); - *ptr = INVALID_U8; + *ptr = 0xFF; } } diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 67add5926..85b42b9b3 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -301,7 +301,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FC74[] = static const struct SpriteTemplate gUnknown_0857FC7C = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0x7544, .oam = &sOamData_857FBD0, .anims = sSpriteAnimTable_857FBE0, @@ -410,13 +410,13 @@ static const struct SpriteTemplate gUnknown_0857FE10 = void RemoveBagSprite(u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id]; - if (*spriteId != INVALID_U8) + if (*spriteId != 0xFF) { FreeSpriteTilesByTag(id + 100); FreeSpritePaletteByTag(id + 100); FreeSpriteOamMatrix(&gSprites[*spriteId]); DestroySprite(&gSprites[*spriteId]); - *spriteId = INVALID_U8; + *spriteId = 0xFF; } } @@ -516,7 +516,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite) void AddBagItemIconSprite(u16 itemId, u8 id) { u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2]; - if (*spriteId == INVALID_U8) + if (*spriteId == 0xFF) { u8 iconSpriteId; diff --git a/src/landmark.c b/src/landmark.c index 4eade159a..0f8ee1a75 100644 --- a/src/landmark.c +++ b/src/landmark.c @@ -338,8 +338,8 @@ static const struct Landmark *const Landmarks_MtChimney_2[] = static const struct LandmarkList gLandmarkLists[] = { - {MAPSEC_ROUTE_103, 2, Landmarks_Route103_2}, - {MAPSEC_ROUTE_104, 0, Landmarks_Route104_0}, + {MAPSEC_ROUTE_103, 2, Landmarks_Route103_2}, + {MAPSEC_ROUTE_104, 0, Landmarks_Route104_0}, {MAPSEC_ROUTE_104, 1, Landmarks_Route104_1}, {MAPSEC_ROUTE_105, 0, Landmarks_Route105_0}, {MAPSEC_ROUTE_106, 1, Landmarks_Route106_1}, diff --git a/src/learn_move.c b/src/learn_move.c index cb8bb66ff..4e02cedd3 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -381,7 +381,7 @@ static void LearnMoveMain(void) if (selection == 0) { - if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != INVALID_U16) + if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF) { sub_816084C(gText_PkmnLearnedMove4); gSpecialVar_0x8004 = 1; @@ -727,12 +727,12 @@ static void CreateHearts(void) static void AddScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 == INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF) { sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset); } - if (sLearnMoveStruct->scrollArrowTaskId1 == INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF) { gTempScrollArrowTemplate = gUnknown_085CEBD0; gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce; @@ -742,16 +742,16 @@ static void AddScrollArrows(void) static void RemoveScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 != INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2); - sLearnMoveStruct->scrollArrowTaskId2 = INVALID_U8; + sLearnMoveStruct->scrollArrowTaskId2 = 0xFF; } - if (sLearnMoveStruct->scrollArrowTaskId1 != INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1); - sLearnMoveStruct->scrollArrowTaskId1 = INVALID_U8; + sLearnMoveStruct->scrollArrowTaskId1 = 0xFF; } } @@ -792,7 +792,7 @@ void ShowHideHearts(s32 item) { numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10); - if (numHearts == INVALID_U8) + if (numHearts == 0xFF) { numHearts = 0; } @@ -812,7 +812,7 @@ void ShowHideHearts(s32 item) numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10); - if (numHearts == INVALID_U8) + if (numHearts == 0xFF) { numHearts = 0; } diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index 2f706fcc8..c5aa25c10 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -64,7 +64,7 @@ v12 = (u16*)((u32)&sub_82E53F4 & ~1); v13 = (u16*)gUnknown_03007898->unk_8; - for (i = 47; i != INVALID_U16; i--) + for (i = 47; i != 0xFFFF; i--) { *v13 = *v12; ++v12; diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c index 81363ae0d..556b79bf8 100644 --- a/src/librfu_stwi.c +++ b/src/librfu_stwi.c @@ -116,7 +116,7 @@ u16 STWI_read_status(u8 index) case 3: return gRfuState->activeCommand; default: - return INVALID_U16; + return 0xFFFF; } } diff --git a/src/link.c b/src/link.c index e4bd5053c..79df699ef 100644 --- a/src/link.c +++ b/src/link.c @@ -2250,7 +2250,7 @@ static bool8 DoHandshake(void) u16 minRecv; playerCount = 0; - minRecv = INVALID_U16; + minRecv = 0xFFFF; if (gLink.handshakeAsMaster == TRUE) { REG_SIOMLT_SEND = MASTER_HANDSHAKE; @@ -2274,7 +2274,7 @@ static bool8 DoHandshake(void) } else { - if (gLink.tempRecvBuffer[i] != INVALID_U16) + if (gLink.tempRecvBuffer[i] != 0xFFFF) { playerCount = 0; } diff --git a/src/link_rfu.c b/src/link_rfu.c index fe5676770..2c6e22475 100644 --- a/src/link_rfu.c +++ b/src/link_rfu.c @@ -276,7 +276,7 @@ const struct { { gBlockSendBuffer, 40 } }; const u16 gUnknown_082ED6E0[] = { - 0x0002, 0x7f7d, 0x0000, INVALID_U16 + 0x0002, 0x7f7d, 0x0000, 0xFFFF }; const char sUnref_082ED6E8[][15] = { @@ -436,7 +436,7 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6) } for (i = 0, buffer = r6; i < 16; i++) { - if (*buffer++ == INVALID_U16) + if (*buffer++ == 0xFFFF) { break; } @@ -754,7 +754,7 @@ void sub_800C54C(u32 a0) switch (gUnknown_03004140.unk_04) { case 23: - r2 = sub_800BEC0() == 0x8001 ? 0x44 : INVALID_U8; + r2 = sub_800BEC0() == 0x8001 ? 0x44 : 0xFF; gUnknown_03004140.unk_04 = gUnknown_03004140.unk_05 = 0; sub_800D30C(r2, 0); break; @@ -1168,7 +1168,7 @@ static void sub_800C7B4(u16 r8, u16 r6) gUnknown_03004140.unk_00 &= ~gUnknown_03004140.unk_14; if (gUnknown_03004140.unk_07) { - if (gUnknown_03007890->unk_00 == INVALID_U8) + if (gUnknown_03007890->unk_00 == 0xFF) { if (gUnknown_03004140.unk_07 == 8) { @@ -1183,7 +1183,7 @@ static void sub_800C7B4(u16 r8, u16 r6) } } } - if (gUnknown_03007890->unk_00 == INVALID_U8) + if (gUnknown_03007890->unk_00 == 0xFF) { if (gUnknown_03004140.unk_04 == 0) { @@ -1198,7 +1198,7 @@ static void sub_800C7B4(u16 r8, u16 r6) break; case 38: sub_800D20C(); - if (gUnknown_03007890->unk_00 != INVALID_U8) + if (gUnknown_03007890->unk_00 != 0xFF) { sub_800D30C(0x50, 0x00); } @@ -1241,7 +1241,7 @@ static void sub_800C7B4(u16 r8, u16 r6) sub_800D610(); } } - if (r8 == INVALID_U8) + if (r8 == 0xFF) { sub_800D30C(0xf2, 0x00); sub_800D610(); @@ -1322,7 +1322,7 @@ static void sub_800CF34(void) if (gUnknown_03007880[i]->unk_61 == 1) { r5 = 0x02; - for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -1469,7 +1469,7 @@ static u8 sub_800D294(void) for (i = 0; i < gUnknown_03007890->unk_08; i++) { - for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++) + for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++) { if (gUnknown_03007890->unk_14[i].unk_04 == *ptr) { @@ -2242,12 +2242,12 @@ void sub_800E084(void) void sub_800E0E8(void) { - if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == INVALID_U16) + if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF) { LoadCompressedObjectPic(&sWirelessStatusIndicatorSpriteSheet); } LoadSpritePalette(&sWirelessStatusIndicatorSpritePalette); - gWirelessStatusIndicatorSpriteId = INVALID_U8; + gWirelessStatusIndicatorSpriteId = 0xFF; } u8 sub_800E124(void) @@ -2277,7 +2277,7 @@ void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum) void sub_800E174(void) { - if (gWirelessStatusIndicatorSpriteId != INVALID_U8 && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) + if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) { struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId]; u8 signalStrength = 255; @@ -2461,7 +2461,7 @@ void sub_800E604(void) u8 unk_ee_bak = gUnknown_03005000.unk_ee; CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000); gUnknown_03005000.unk_ee = unk_ee_bak; - gUnknown_03005000.unk_0c = INVALID_U8; + gUnknown_03005000.unk_0c = 0xFF; if (gUnknown_03005000.unk_ee != 4) { gUnknown_03005000.unk_ee = 0; @@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void) { if (gUnknown_03005000.unk_14[i][1]) { - if (gUnknown_03005000.unk_cee[i] != INVALID_U8 && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) + if (gUnknown_03005000.unk_cee[i] != 0xFF && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7)) { if (++gUnknown_03005000.unk_cea[i] > 4) sub_8011170(0x8100); @@ -3778,7 +3778,7 @@ bool32 sub_8010454(u32 a0) s32 i; for (i = 0; gUnknown_082ED6E0[i] != a0; i++) { - if (gUnknown_082ED6E0[i] == INVALID_U16) + if (gUnknown_082ED6E0[i] == 0xFFFF) return FALSE; } return TRUE; @@ -3881,7 +3881,7 @@ bool32 sub_80105EC(void) bool32 sub_801064C(u16 a0, const u8 *a1) { u8 r1 = sub_8011CE4(a1, a0); - if (r1 == INVALID_U8) + if (r1 == 0xFF) return TRUE; if (gUnknown_03005000.unk_cd1[r1] == 9) return TRUE; @@ -3906,7 +3906,7 @@ void sub_80106D4(void) u32 sub_8010714(u16 a0, const u8 *a1) { u8 r0 = sub_8011CE4(a1, a0); - if (r0 == INVALID_U8) + if (r0 == 0xFF) return 2; if (gUnknown_03007880[r0]->unk_0 == 0) return 1; diff --git a/src/list_menu.c b/src/list_menu.c index e066d1e9c..caf4b798d 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -392,7 +392,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu s32 i; u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow); - for (i = 0; rect[i].palNum != INVALID_U8; i++) + for (i = 0; rect[i].palNum != 0xFF; i++) { PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId, rect[i].x, @@ -465,7 +465,7 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId) } } -#define TASK_NONE INVALID_U8 +#define TASK_NONE 0xFF void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow) { @@ -953,52 +953,52 @@ void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value) case 0: case 1: data->field_4 = (void*)(value); - break; + break; case 2: data->field_C = value; - break; + break; case 3: data->field_E = value; - break; + break; case 4: data->field_10 = value; - break; + break; case 5: data->field_11 = value; - break; + break; case 6: data->field_12 = value; - break; + break; case 7: data->field_13 = value; - break; + break; case 8: data->field_14_0 = value; - break; + break; case 9: data->field_14_1 = value; - break; + break; case 10: data->field_15_0 = value; - break; + break; case 11: data->field_15_1 = value; - break; + break; case 12: data->field_16_0 = value; - break; + break; case 13: data->field_16_1 = value; - break; + break; case 14: data->field_16_2 = value; - break; + break; case 15: data->field_17_0 = value; - break; + break; case 16: data->field_17_1 = value; - break; + break; } } @@ -1143,7 +1143,7 @@ static void Task_ScrollIndicatorArrowPair(u8 taskId) struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data; u16 currItem = (*data->scrollOffset); - if (currItem == data->fullyUpThreshold && currItem != INVALID_U16) + if (currItem == data->fullyUpThreshold && currItem != 0xFFFF) gSprites[data->topSpriteId].invisible = TRUE; else gSprites[data->topSpriteId].invisible = FALSE; diff --git a/src/mail_data.c b/src/mail_data.c index cf75636b3..809dcc2a8 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -20,7 +20,7 @@ void ClearMailStruct(struct MailStruct *mail) s32 i; for (i = 0; i < MAIL_WORDS_COUNT; i++) - mail->words[i] = INVALID_U16; + mail->words[i] = 0xFFFF; for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) mail->playerName[i] = EOS; @@ -35,7 +35,7 @@ void ClearMailStruct(struct MailStruct *mail) bool8 MonHasMail(struct Pokemon *mon) { u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM); - if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != INVALID_U8) + if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF) return TRUE; else return FALSE; @@ -56,7 +56,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) if (gSaveBlock1Ptr->mail[id].itemId == 0) { for (i = 0; i < MAIL_WORDS_COUNT; i++) - gSaveBlock1Ptr->mail[id].words[i] = INVALID_U16; + gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF; for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++) gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i]; @@ -76,7 +76,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) } } - return INVALID_U8; + return 0xFF; } u16 SpeciesToMailSpecies(u16 species, u32 personality) @@ -113,8 +113,8 @@ u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail) u16 itemId = mail->itemId; u8 mailId = GiveMailToMon(mon, itemId); - if (mailId == INVALID_U8) - return INVALID_U8; + if (mailId == 0xFF) + return 0xFF; gSaveBlock1Ptr->mail[mailId] = *mail; @@ -142,7 +142,7 @@ void TakeMailFromMon(struct Pokemon *mon) { mailId = GetMonData(mon, MON_DATA_MAIL); gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE; - mailId = INVALID_U8; + mailId = 0xFF; heldItem[0] = ITEM_NONE; heldItem[1] = ITEM_NONE << 8; SetMonData(mon, MON_DATA_MAIL, &mailId); @@ -163,7 +163,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon) newHeldItem[0] = ITEM_NONE; newHeldItem[1] = ITEM_NONE << 8; - newMailId = INVALID_U8; + newMailId = 0xFF; for (i = PARTY_SIZE; i < MAIL_COUNT; i++) { @@ -177,7 +177,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon) } } - return INVALID_U8; + return 0xFF; } bool8 ItemIsMail(u16 itemId) diff --git a/src/main_menu.c b/src/main_menu.c index ee777d106..e11f783eb 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -335,25 +335,25 @@ static const struct MenuAction sMenuActions_Gender[] = { static const u8 *const gMalePresetNames[] = { gText_DefaultNameStu, - gText_DefaultNameMilton, - gText_DefaultNameTom, - gText_DefaultNameKenny, - gText_DefaultNameReid, - gText_DefaultNameJude, - gText_DefaultNameJaxson, - gText_DefaultNameEaston, - gText_DefaultNameWalker, - gText_DefaultNameTeru, - gText_DefaultNameJohnny, - gText_DefaultNameBrett, - gText_DefaultNameSeth, - gText_DefaultNameTerry, - gText_DefaultNameCasey, - gText_DefaultNameDarren, - gText_DefaultNameLandon, - gText_DefaultNameCollin, - gText_DefaultNameStanley, - gText_DefaultNameQuincy + gText_DefaultNameMilton, + gText_DefaultNameTom, + gText_DefaultNameKenny, + gText_DefaultNameReid, + gText_DefaultNameJude, + gText_DefaultNameJaxson, + gText_DefaultNameEaston, + gText_DefaultNameWalker, + gText_DefaultNameTeru, + gText_DefaultNameJohnny, + gText_DefaultNameBrett, + gText_DefaultNameSeth, + gText_DefaultNameTerry, + gText_DefaultNameCasey, + gText_DefaultNameDarren, + gText_DefaultNameLandon, + gText_DefaultNameCollin, + gText_DefaultNameStanley, + gText_DefaultNameQuincy }; static const u8 *const gFemalePresetNames[] = { diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 2fd60cd5b..110ec068e 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -250,7 +250,7 @@ void ScrSpecial_HipsterTeachWord(void) { u16 var = sub_811F01C(); - if (var == INVALID_U16) + if (var == 0xFFFF) { gSpecialVar_Result = FALSE; } @@ -283,7 +283,7 @@ void ScrSpecial_GenerateGiddyLine(void) if (giddy->taleCounter == 0) InitGiddyTaleList(); - if (giddy->randomWords[giddy->taleCounter] != INVALID_U16) // is not the last element of the array? + if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array? { u8 *stringPtr; u32 adjective = Random(); @@ -348,7 +348,7 @@ static void InitGiddyTaleList(void) r1 = Random() % 10; if (r1 < 3 && r7 < 8) { - giddy->randomWords[i] = INVALID_U16; + giddy->randomWords[i] = 0xFFFF; r7++; } else diff --git a/src/menu.c b/src/menu.c index e1dd136d1..61096138a 100644 --- a/src/menu.c +++ b/src/menu.c @@ -140,8 +140,8 @@ extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId); void sub_81971D0(void) { InitWindows(gUnknown_0860F098); - gStartMenuWindowId = INVALID_U8; - gUnknown_0203CD8D = INVALID_U8; + gStartMenuWindowId = 0xFF; + gUnknown_0203CD8D = 0xFF; } void sub_81971F4(void) @@ -486,7 +486,7 @@ u8 GetPlayerTextSpeedDelay(void) u8 sub_81979C4(u8 a1) { - if (gStartMenuWindowId == INVALID_U8) + if (gStartMenuWindowId == 0xFF) gStartMenuWindowId = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139); return gStartMenuWindowId; } @@ -498,10 +498,10 @@ u8 GetStartMenuWindowId(void) void RemoveStartMenuWindow(void) { - if (gStartMenuWindowId != INVALID_U8) + if (gStartMenuWindowId != 0xFF) { RemoveWindow(gStartMenuWindowId); - gStartMenuWindowId = INVALID_U8; + gStartMenuWindowId = 0xFF; } } @@ -517,7 +517,7 @@ u16 sub_8197A38(void) u8 AddMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D == INVALID_U8) + if (gUnknown_0203CD8D == 0xFF) gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107); return gUnknown_0203CD8D; } @@ -529,10 +529,10 @@ u8 GetMapNamePopUpWindowId(void) void RemoveMapNamePopUpWindow(void) { - if (gUnknown_0203CD8D != INVALID_U8) + if (gUnknown_0203CD8D != 0xFF) { RemoveWindow(gUnknown_0203CD8D); - gUnknown_0203CD8D = INVALID_U8; + gUnknown_0203CD8D = 0xFF; } } @@ -808,7 +808,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram) { u16 width = 0; - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) { PutWindowTilemap(gUnknown_0203CDA0); FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF); @@ -830,7 +830,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo u8 color[3]; u16 width = 0; - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) { if (a3 != 0) { @@ -865,13 +865,13 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo void sub_81982D8(void) { - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) CopyWindowToVram(gUnknown_0203CDA0, 3); } void sub_81982F0(void) { - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) { FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF); CopyWindowToVram(gUnknown_0203CDA0, 3); @@ -880,13 +880,13 @@ void sub_81982F0(void) void sub_8198314(void) { - if (gUnknown_0203CDA0 != INVALID_U8) + if (gUnknown_0203CDA0 != 0xFF) { FillWindowPixelBuffer(gUnknown_0203CDA0, 0); ClearWindowTilemap(gUnknown_0203CDA0); CopyWindowToVram(gUnknown_0203CDA0, 3); RemoveWindow(gUnknown_0203CDA0); - gUnknown_0203CDA0 = INVALID_U8; + gUnknown_0203CDA0 = 0xFF; } } @@ -2096,253 +2096,253 @@ void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 NAKED void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7) { - asm("push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, #0x28\n\ - str r0, [sp]\n\ - str r1, [sp, #0x4]\n\ - ldr r0, [sp, #0x48]\n\ - ldr r4, [sp, #0x4C]\n\ - ldr r1, [sp, #0x50]\n\ - ldr r5, [sp, #0x54]\n\ - lsl r2, #16\n\ - lsr r2, #16\n\ - str r2, [sp, #0x8]\n\ - lsl r3, #16\n\ - lsr r3, #16\n\ - lsl r0, #16\n\ - lsr r0, #16\n\ - str r0, [sp, #0xC]\n\ - lsl r4, #16\n\ - lsr r4, #16\n\ - lsl r1, #16\n\ - lsr r1, #16\n\ - lsl r5, #16\n\ - lsr r5, #16\n\ - ldr r2, [sp, #0x4]\n\ - ldrh r0, [r2, #0x4]\n\ - ldr r2, [sp, #0xC]\n\ - sub r0, r2\n\ - ldr r2, [sp, #0x8]\n\ - add r2, r1, r2\n\ - str r2, [sp, #0x10]\n\ - cmp r0, r1\n\ - bge _0819A0CC\n\ - ldr r1, [sp, #0x8]\n\ - add r0, r1\n\ - str r0, [sp, #0x10]\n\ + asm("push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, #0x28\n\ + str r0, [sp]\n\ + str r1, [sp, #0x4]\n\ + ldr r0, [sp, #0x48]\n\ + ldr r4, [sp, #0x4C]\n\ + ldr r1, [sp, #0x50]\n\ + ldr r5, [sp, #0x54]\n\ + lsl r2, #16\n\ + lsr r2, #16\n\ + str r2, [sp, #0x8]\n\ + lsl r3, #16\n\ + lsr r3, #16\n\ + lsl r0, #16\n\ + lsr r0, #16\n\ + str r0, [sp, #0xC]\n\ + lsl r4, #16\n\ + lsr r4, #16\n\ + lsl r1, #16\n\ + lsr r1, #16\n\ + lsl r5, #16\n\ + lsr r5, #16\n\ + ldr r2, [sp, #0x4]\n\ + ldrh r0, [r2, #0x4]\n\ + ldr r2, [sp, #0xC]\n\ + sub r0, r2\n\ + ldr r2, [sp, #0x8]\n\ + add r2, r1, r2\n\ + str r2, [sp, #0x10]\n\ + cmp r0, r1\n\ + bge _0819A0CC\n\ + ldr r1, [sp, #0x8]\n\ + add r0, r1\n\ + str r0, [sp, #0x10]\n\ _0819A0CC:\n\ - ldr r2, [sp, #0x4]\n\ - ldrh r1, [r2, #0x6]\n\ - sub r0, r1, r4\n\ - cmp r0, r5\n\ - bge _0819A0DE\n\ - add r0, r3, r1\n\ - sub r0, r4\n\ - str r0, [sp, #0x14]\n\ - b _0819A0E2\n\ + ldr r2, [sp, #0x4]\n\ + ldrh r1, [r2, #0x6]\n\ + sub r0, r1, r4\n\ + cmp r0, r5\n\ + bge _0819A0DE\n\ + add r0, r3, r1\n\ + sub r0, r4\n\ + str r0, [sp, #0x14]\n\ + b _0819A0E2\n\ _0819A0DE:\n\ - add r5, r3, r5\n\ - str r5, [sp, #0x14]\n\ + add r5, r3, r5\n\ + str r5, [sp, #0x14]\n\ _0819A0E2:\n\ - ldr r0, [sp]\n\ - ldrh r1, [r0, #0x4]\n\ - mov r2, #0x7\n\ - add r0, r1, #0\n\ - and r0, r2\n\ - add r1, r0\n\ - asr r1, #3\n\ - str r1, [sp, #0x18]\n\ - ldr r0, [sp, #0x4]\n\ - ldrh r1, [r0, #0x4]\n\ - add r0, r1, #0\n\ - and r0, r2\n\ - add r1, r0\n\ - asr r1, #3\n\ - str r1, [sp, #0x1C]\n\ - mov r12, r3\n\ - mov r8, r4\n\ - ldr r1, [sp, #0x14]\n\ - cmp r12, r1\n\ - blt _0819A10C\n\ - b _0819A24A\n\ + ldr r0, [sp]\n\ + ldrh r1, [r0, #0x4]\n\ + mov r2, #0x7\n\ + add r0, r1, #0\n\ + and r0, r2\n\ + add r1, r0\n\ + asr r1, #3\n\ + str r1, [sp, #0x18]\n\ + ldr r0, [sp, #0x4]\n\ + ldrh r1, [r0, #0x4]\n\ + add r0, r1, #0\n\ + and r0, r2\n\ + add r1, r0\n\ + asr r1, #3\n\ + str r1, [sp, #0x1C]\n\ + mov r12, r3\n\ + mov r8, r4\n\ + ldr r1, [sp, #0x14]\n\ + cmp r12, r1\n\ + blt _0819A10C\n\ + b _0819A24A\n\ _0819A10C:\n\ - ldr r5, [sp, #0x8]\n\ - ldr r6, [sp, #0xC]\n\ - mov r2, r12\n\ - add r2, #0x1\n\ - str r2, [sp, #0x20]\n\ - mov r0, r8\n\ - add r0, #0x1\n\ - str r0, [sp, #0x24]\n\ - ldr r1, [sp, #0x10]\n\ - cmp r5, r1\n\ - blt _0819A124\n\ - b _0819A23A\n\ + ldr r5, [sp, #0x8]\n\ + ldr r6, [sp, #0xC]\n\ + mov r2, r12\n\ + add r2, #0x1\n\ + str r2, [sp, #0x20]\n\ + mov r0, r8\n\ + add r0, #0x1\n\ + str r0, [sp, #0x24]\n\ + ldr r1, [sp, #0x10]\n\ + cmp r5, r1\n\ + blt _0819A124\n\ + b _0819A23A\n\ _0819A124:\n\ - mov r7, #0x1\n\ - mov r2, #0xF0\n\ - mov r10, r2\n\ - mov r0, #0xF\n\ - mov r9, r0\n\ + mov r7, #0x1\n\ + mov r2, #0xF0\n\ + mov r10, r2\n\ + mov r0, #0xF\n\ + mov r9, r0\n\ _0819A12E:\n\ - asr r0, r5, #1\n\ - mov r1, #0x3\n\ - and r0, r1\n\ - ldr r2, [sp]\n\ - ldr r1, [r2]\n\ - add r1, r0\n\ - asr r0, r5, #3\n\ - lsl r0, #5\n\ - add r1, r0\n\ - mov r2, r12\n\ - asr r0, r2, #3\n\ - ldr r2, [sp, #0x18]\n\ - mul r0, r2\n\ - lsl r0, #5\n\ - add r1, r0\n\ - mov r2, r12\n\ - lsl r0, r2, #29\n\ - lsr r0, #27\n\ - add r3, r1, r0\n\ - asr r0, r6, #1\n\ - mov r1, #0x3\n\ - and r0, r1\n\ - ldr r2, [sp, #0x4]\n\ - ldr r1, [r2]\n\ - add r1, r0\n\ - asr r0, r6, #3\n\ - lsl r0, #5\n\ - add r1, r0\n\ - mov r2, r8\n\ - asr r0, r2, #3\n\ - ldr r2, [sp, #0x1C]\n\ - mul r0, r2\n\ - lsl r0, #5\n\ - add r1, r0\n\ - mov r2, r8\n\ - lsl r0, r2, #29\n\ - lsr r0, #27\n\ - add r4, r1, r0\n\ - add r0, r4, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1DA\n\ - sub r4, #0x1\n\ - add r0, r6, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1B2\n\ - ldrh r0, [r4]\n\ - ldr r2, =0x00000fff\n\ - and r2, r0\n\ - add r0, r5, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1A8\n\ - ldrb r1, [r3]\n\ - mov r0, r10\n\ - and r0, r1\n\ - lsl r0, #8\n\ - b _0819A22A\n\ - .pool\n\ + asr r0, r5, #1\n\ + mov r1, #0x3\n\ + and r0, r1\n\ + ldr r2, [sp]\n\ + ldr r1, [r2]\n\ + add r1, r0\n\ + asr r0, r5, #3\n\ + lsl r0, #5\n\ + add r1, r0\n\ + mov r2, r12\n\ + asr r0, r2, #3\n\ + ldr r2, [sp, #0x18]\n\ + mul r0, r2\n\ + lsl r0, #5\n\ + add r1, r0\n\ + mov r2, r12\n\ + lsl r0, r2, #29\n\ + lsr r0, #27\n\ + add r3, r1, r0\n\ + asr r0, r6, #1\n\ + mov r1, #0x3\n\ + and r0, r1\n\ + ldr r2, [sp, #0x4]\n\ + ldr r1, [r2]\n\ + add r1, r0\n\ + asr r0, r6, #3\n\ + lsl r0, #5\n\ + add r1, r0\n\ + mov r2, r8\n\ + asr r0, r2, #3\n\ + ldr r2, [sp, #0x1C]\n\ + mul r0, r2\n\ + lsl r0, #5\n\ + add r1, r0\n\ + mov r2, r8\n\ + lsl r0, r2, #29\n\ + lsr r0, #27\n\ + add r4, r1, r0\n\ + add r0, r4, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1DA\n\ + sub r4, #0x1\n\ + add r0, r6, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1B2\n\ + ldrh r0, [r4]\n\ + ldr r2, =0x00000fff\n\ + and r2, r0\n\ + add r0, r5, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1A8\n\ + ldrb r1, [r3]\n\ + mov r0, r10\n\ + and r0, r1\n\ + lsl r0, #8\n\ + b _0819A22A\n\ + .pool\n\ _0819A1A8:\n\ - ldrb r1, [r3]\n\ - mov r0, r9\n\ - and r0, r1\n\ - lsl r0, #12\n\ - b _0819A22A\n\ + ldrb r1, [r3]\n\ + mov r0, r9\n\ + and r0, r1\n\ + lsl r0, #12\n\ + b _0819A22A\n\ _0819A1B2:\n\ - ldrh r0, [r4]\n\ - ldr r2, =0x0000f0ff\n\ - and r2, r0\n\ - add r0, r5, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1D0\n\ - ldrb r1, [r3]\n\ - mov r0, r10\n\ - and r0, r1\n\ - lsl r0, #4\n\ - b _0819A22A\n\ - .pool\n\ + ldrh r0, [r4]\n\ + ldr r2, =0x0000f0ff\n\ + and r2, r0\n\ + add r0, r5, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1D0\n\ + ldrb r1, [r3]\n\ + mov r0, r10\n\ + and r0, r1\n\ + lsl r0, #4\n\ + b _0819A22A\n\ + .pool\n\ _0819A1D0:\n\ - ldrb r1, [r3]\n\ - mov r0, r9\n\ - and r0, r1\n\ - lsl r0, #8\n\ - b _0819A22A\n\ + ldrb r1, [r3]\n\ + mov r0, r9\n\ + and r0, r1\n\ + lsl r0, #8\n\ + b _0819A22A\n\ _0819A1DA:\n\ - add r0, r6, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A206\n\ - ldrh r0, [r4]\n\ - ldr r2, =0x0000ff0f\n\ - and r2, r0\n\ - add r0, r5, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A1FC\n\ - ldrb r1, [r3]\n\ - mov r0, r10\n\ - b _0819A228\n\ - .pool\n\ + add r0, r6, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A206\n\ + ldrh r0, [r4]\n\ + ldr r2, =0x0000ff0f\n\ + and r2, r0\n\ + add r0, r5, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A1FC\n\ + ldrb r1, [r3]\n\ + mov r0, r10\n\ + b _0819A228\n\ + .pool\n\ _0819A1FC:\n\ - ldrb r1, [r3]\n\ - mov r0, r9\n\ - and r0, r1\n\ - lsl r0, #4\n\ - b _0819A22A\n\ + ldrb r1, [r3]\n\ + mov r0, r9\n\ + and r0, r1\n\ + lsl r0, #4\n\ + b _0819A22A\n\ _0819A206:\n\ - ldrh r0, [r4]\n\ - ldr r2, =0x0000fff0\n\ - and r2, r0\n\ - add r0, r5, #0\n\ - and r0, r7\n\ - cmp r0, #0\n\ - beq _0819A224\n\ - ldrb r1, [r3]\n\ - mov r0, r10\n\ - and r0, r1\n\ - lsr r0, #4\n\ - b _0819A22A\n\ - .pool\n\ + ldrh r0, [r4]\n\ + ldr r2, =0x0000fff0\n\ + and r2, r0\n\ + add r0, r5, #0\n\ + and r0, r7\n\ + cmp r0, #0\n\ + beq _0819A224\n\ + ldrb r1, [r3]\n\ + mov r0, r10\n\ + and r0, r1\n\ + lsr r0, #4\n\ + b _0819A22A\n\ + .pool\n\ _0819A224:\n\ - ldrb r1, [r3]\n\ - mov r0, r9\n\ + ldrb r1, [r3]\n\ + mov r0, r9\n\ _0819A228:\n\ - and r0, r1\n\ + and r0, r1\n\ _0819A22A:\n\ - orr r2, r0\n\ - strh r2, [r4]\n\ - add r5, #0x1\n\ - add r6, #0x1\n\ - ldr r0, [sp, #0x10]\n\ - cmp r5, r0\n\ - bge _0819A23A\n\ - b _0819A12E\n\ + orr r2, r0\n\ + strh r2, [r4]\n\ + add r5, #0x1\n\ + add r6, #0x1\n\ + ldr r0, [sp, #0x10]\n\ + cmp r5, r0\n\ + bge _0819A23A\n\ + b _0819A12E\n\ _0819A23A:\n\ - ldr r1, [sp, #0x20]\n\ - mov r12, r1\n\ - ldr r2, [sp, #0x24]\n\ - mov r8, r2\n\ - ldr r0, [sp, #0x14]\n\ - cmp r12, r0\n\ - bge _0819A24A\n\ - b _0819A10C\n\ + ldr r1, [sp, #0x20]\n\ + mov r12, r1\n\ + ldr r2, [sp, #0x24]\n\ + mov r8, r2\n\ + ldr r0, [sp, #0x14]\n\ + cmp r12, r0\n\ + bge _0819A24A\n\ + b _0819A10C\n\ _0819A24A:\n\ - add sp, #0x28\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n"); + add sp, #0x28\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n"); } #endif diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 2bae89ecf..8a2c3ad91 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -10,246 +10,246 @@ // wonder what the third flag is supposed to do static const u8 sTileBitAttributes[] = { - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NORMAL - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_WALL - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_TALL_GRASS - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_LONG_GRASS - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_04 - TILE_ATTRIBUTES(FALSE, FALSE, TRUE), // MB_UNUSED_05 - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_DEEP_SAND - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHORT_GRASS - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_UNUSED_CAVE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LONG_GRASS_SOUTH_EDGE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NO_RUNNING - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_INDOOR_ENCOUNTER - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MOUNTAIN_TOP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BATTLE_PYRAMID_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MOSSDEEP_GYM_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MT_PYRE_HOLE - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_POND_WATER - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEMI_DEEP_WATER - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_DEEP_WATER - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATERFALL - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_SOOTOPOLIS_DEEP_WATER - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_OCEAN_WATER - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PUDDLE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHALLOW_WATER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_NO_SURFACING - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_STAIRS_OUTSIDE_ABANDONED_SHIP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SHOAL_CAVE_ENTRANCE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1D - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1F - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ICE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SAND - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEAWEED - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_23 - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_ASHGRASS - TILE_ATTRIBUTES(TRUE, FALSE, TRUE), // MB_FOOTPRINTS - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_THIN_ICE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_ICE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_HOT_SPRINGS - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LAVARIDGE_GYM_B1F_WARP - TILE_ATTRIBUTES(TRUE, TRUE, TRUE), // MB_SEAWEED_NO_SURFACING - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_REFLECTION_UNDER_BRIDGE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2C - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2D - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2F - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_EAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_WEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTHEAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_NORTHWEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTHEAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTHWEST - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_EAST - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_WEST - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_NORTH - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_SOUTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_NORTHEAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_NORTHWEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_SOUTHEAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_JUMP_SOUTHWEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_EAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_WEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_NORTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WALK_SOUTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_EAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_WEST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_NORTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SLIDE_SOUTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_8_FLOOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_49 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_4A - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4B - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4C - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4D - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4F - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_EASTWARD_CURRENT - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WESTWARD_CURRENT - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_NORTHWARD_CURRENT - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_SOUTHWARD_CURRENT - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_54 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_55 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_56 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_57 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_58 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_59 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5A - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5B - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5C - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5D - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5F - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NON_ANIMATED_DOOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LADDER - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_EAST_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_WEST_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_NORTH_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SOUTH_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_FLOOR_HOLE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_AQUA_HIDEOUT_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LAVARIDGE_GYM_1F_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ANIMATED_DOOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UP_ESCALATOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_DOWN_ESCALATOR - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATER_DOOR - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_WATER_SOUTH_ARROW_WARP - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_DEEP_SOUTH_WARP - TILE_ATTRIBUTES(TRUE, TRUE, FALSE), // MB_UNUSED_6F - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WARP_OR_BRIDGE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_71 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_1 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_VERTICAL_LOG_1 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_VERTICAL_LOG_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_HORIZONTAL_LOG_1 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PACIFIDLOG_HORIZONTAL_LOG_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_FORTREE_BRIDGE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_79 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_SOUTH_BRIDGE_1 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_SOUTH_BRIDGE_2 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_3 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_4 - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_UNUSED_7E - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ROUTE110_BRIDGE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_COUNTER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_81 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_82 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_1 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_REGION_MAP - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TELEVISION - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEBLOCK_FEEDER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_88 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SLOT_MACHINE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROULETTE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CLOSED_SOOTOPOLIS_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PETALBURG_GYM_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_RUNNING_SHOES_INSTRUCTION - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_QUESTIONNAIRE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9E - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9F - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BERRY_TREE_SOIL - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A1 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A2 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A3 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A4 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A5 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A6 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A7 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A8 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A9 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AA - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AD - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_PC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_REGISTER_PC - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_UNUSED - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BLOCK_DECORATION - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_DECORATION - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_LARGE_MAT_EDGE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_B6 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_NORTH_WALL - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_BALLOON - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_IMPASSABLE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_GLITTER_MAT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_JUMP_MAT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_SPIN_MAT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_SOUND_MAT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_BREAKABLE_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SAND_ORNAMENT - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_SOUTH_AND_NORTH - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_IMPASSABLE_WEST_AND_EAST - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_HOLE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_LARGE_MAT_CENTER - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_SECRET_BASE_TV_SHIELD - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_PLAYER_ROOM_PC_ON - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C6 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_POSTER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C8 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C9 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CA - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CD - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CF - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_MUDDY_SLOPE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_BUMPY_SLOPE - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_CRACKED_FLOOR - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ISOLATED_VERTICAL_RAIL - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_ISOLATED_HORIZONTAL_RAIL - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_VERTICAL_RAIL - TILE_ATTRIBUTES(TRUE, FALSE, FALSE), // MB_HORIZONTAL_RAIL - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D7 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D8 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D9 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DA - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DD - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PICTURE_BOOK_SHELF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BOOKSHELF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEMON_CENTER_BOOKSHELF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_VASE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRASH_CAN - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SHOP_SHELF - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BLUEPRINT - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_2 - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WIRELESS_BOX_RESULTS - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRAINER_HILL_TIMER - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNKNOWN_CLOSED_DOOR - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EB - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EC - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_ED - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EE - TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EF + [MB_NORMAL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TALL_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_LONG_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_UNUSED_04] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_05] = TILE_ATTRIBUTES(FALSE, FALSE, TRUE), + [MB_DEEP_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_SHORT_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_CAVE] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_LONG_GRASS_SOUTH_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_NO_RUNNING] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_INDOOR_ENCOUNTER] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_MOUNTAIN_TOP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_BATTLE_PYRAMID_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_MOSSDEEP_GYM_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_MT_PYRE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_POND_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_SEMI_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_WATERFALL] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_OCEAN_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_PUDDLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SHALLOW_WATER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_STAIRS_OUTSIDE_ABANDONED_SHIP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SHOAL_CAVE_ENTRANCE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_1D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_1E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_1F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SEAWEED] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_UNUSED_23] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ASHGRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_FOOTPRINTS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE), + [MB_THIN_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_CRACKED_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_HOT_SPRINGS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_LAVARIDGE_GYM_B1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SEAWEED_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE), + [MB_REFLECTION_UNDER_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_2C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_2D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_2E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_2F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_IMPASSABLE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_JUMP_EAST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_JUMP_WEST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_JUMP_NORTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_JUMP_SOUTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_JUMP_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_JUMP_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_JUMP_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_JUMP_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WALK_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WALK_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WALK_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WALK_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SLIDE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SLIDE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SLIDE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SLIDE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_TRICK_HOUSE_PUZZLE_8_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_49] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_4A] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_4B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_4C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_4D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_4E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_4F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_EASTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_WESTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_NORTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_SOUTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_UNUSED_54] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_55] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_56] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_57] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_58] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_59] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5A] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_5F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_NON_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_LADDER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_EAST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WEST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_NORTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_CRACKED_FLOOR_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_AQUA_HIDEOUT_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_LAVARIDGE_GYM_1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UP_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_DOWN_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_WATER_DOOR] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_WATER_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_DEEP_SOUTH_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_6F] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE), + [MB_WARP_OR_BRIDGE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_71] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_NORTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_NORTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PACIFIDLOG_VERTICAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PACIFIDLOG_VERTICAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PACIFIDLOG_HORIZONTAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PACIFIDLOG_HORIZONTAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_FORTREE_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_79] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_ROUTE120_SOUTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_SOUTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_NORTH_BRIDGE_3] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE120_NORTH_BRIDGE_4] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_7E] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ROUTE110_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_COUNTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_81] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_82] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_CABLE_BOX_RESULTS_1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_REGION_MAP] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TELEVISION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_POKEBLOCK_FEEDER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_88] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SLOT_MACHINE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_ROULETTE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_CLOSED_SOOTOPOLIS_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TRICK_HOUSE_PUZZLE_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_PETALBURG_GYM_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_RUNNING_SHOES_INSTRUCTION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_QUESTIONNAIRE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_RED_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_RED_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_BROWN_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_YELLOW_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_TREE_LEFT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_SHRUB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_SHRUB_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_BLUE_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_TREE_RIGHT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_9E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_9F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_BERRY_TREE_SOIL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A3] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A4] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A5] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_A9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_AF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_REGISTER_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_UNUSED] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_BLOCK_DECORATION] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_DECORATION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_LARGE_MAT_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_B6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_NORTH_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_BALLOON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_IMPASSABLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_GLITTER_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_JUMP_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_SPIN_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_SOUND_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_BREAKABLE_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_SAND_ORNAMENT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_IMPASSABLE_SOUTH_AND_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_IMPASSABLE_WEST_AND_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_LARGE_MAT_CENTER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_SECRET_BASE_TV_SHIELD] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_PLAYER_ROOM_PC_ON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_C6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SECRET_BASE_POSTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_C8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_C9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_CF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_MUDDY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_BUMPY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_CRACKED_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ISOLATED_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_ISOLATED_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE), + [MB_UNUSED_D7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_D8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_D9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_DF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_PICTURE_BOOK_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_POKEMON_CENTER_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_VASE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TRASH_CAN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_SHOP_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_BLUEPRINT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_EE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), + [MB_UNUSED_EF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE), }; bool8 MetatileBehavior_IsATile(u8 metatileBehavior) diff --git a/src/naming_screen.c b/src/naming_screen.c index 12ff4240f..0a0bd3b7d 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -2141,7 +2141,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore = static const struct SpriteTemplate gUnknown_0858C180 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0x0000, .oam = &gOamData_858BFEC, .anims = gSpriteAnimTable_858C0BC, diff --git a/src/new_game.c b/src/new_game.c index 18b128624..4804b28f3 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -205,14 +205,14 @@ void NewGameInitData(void) ScriptContext2_RunNewScript(EventScript_2715DE); ResetMiniGamesResults(); copy_strings_to_sav1(); - SetLilycoveLady(); - ResetAllApprenticeData(); - ClearRankingHallRecords(); - sub_8195E10(); - sub_801AFD8(); - sub_800E5AC(); - sub_81D54BC(); - ResetContestLinkResults(); + SetLilycoveLady(); + ResetAllApprenticeData(); + ClearRankingHallRecords(); + sub_8195E10(); + sub_801AFD8(); + sub_800E5AC(); + sub_81D54BC(); + ResetContestLinkResults(); } static void ResetMiniGamesResults(void) diff --git a/src/overworld.c b/src/overworld.c index 13c36819f..12e02a9b5 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -296,15 +296,51 @@ static const u8 sUnusedData[] = const struct UCoords32 gDirectionToVectors[] = { - { 0, 0}, // DIR_NONE - { 0, 1}, // DIR_SOUTH - { 0, -1}, // DIR_NORTH - {-1, 0}, // DIR_WEST - { 1, 0}, // DIR_EAST - {-1, 1}, // DIR_SOUTHWEST - { 1, 1}, // DIR_SOUTHEAST - {-1, -1}, // DIR_NORTHWEST - { 1, -1}, // DIR_NORTHEAST + [DIR_NONE] = + { + .x = 0, + .y = 0, + }, + [DIR_SOUTH] = + { + .x = 0, + .y = 1, + }, + [DIR_NORTH] = + { + .x = 0, + .y = -1, + }, + [DIR_WEST] = + { + .x = -1, + .y = 0, + }, + [DIR_EAST] = + { + .x = 1, + .y = 0, + }, + [DIR_SOUTHWEST] = + { + .x = -1, + .y = 1, + }, + [DIR_SOUTHEAST] = + { + .x = 1, + .y = 1, + }, + [DIR_NORTHWEST] = + { + .x = -1, + .y = -1, + }, + [DIR_NORTHEAST] = + { + .x = 1, + .y = -1, + }, }; static const struct BgTemplate gUnknown_08339DAC[] = @@ -1110,7 +1146,7 @@ static bool16 IsInflitratedSpaceCenter(struct WarpData *warp) u16 GetLocationMusic(struct WarpData *warp) { if (NoMusicInSotopolisWithLegendaries(warp) == TRUE) - return INVALID_U16; + return 0xFFFF; else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE) return MUS_OOAME; else if (IsInflitratedSpaceCenter(warp) == TRUE) @@ -1171,7 +1207,7 @@ void Overworld_PlaySpecialMapMusic(void) { u16 music = GetCurrLocationDefaultMusic(); - if (music != MUS_OOAME && music != INVALID_U16) + if (music != MUS_OOAME && music != 0xFFFF) { if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; @@ -1201,7 +1237,7 @@ static void sub_8085810(void) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); - if (newMusic != MUS_OOAME && newMusic != INVALID_U16) + if (newMusic != MUS_OOAME && newMusic != 0xFFFF) { if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI) return; diff --git a/src/palette.c b/src/palette.c index 3c7485d05..1e92f4bba 100644 --- a/src/palette.c +++ b/src/palette.c @@ -63,7 +63,7 @@ static EWRAM_DATA u32 sPlttBufferTransferPending = 0; EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0}; static const struct PaletteStructTemplate gDummyPaletteStructTemplate = { - .uid = INVALID_U16, + .uid = 0xFFFF, .pst_field_B_5 = 1 }; diff --git a/src/pokeblock.c b/src/pokeblock.c index 41d6dcc8f..1418588b8 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -435,7 +435,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void)) sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu)); sPokeblockMenu->caseId = caseId; sPokeblockMenu->callbackOnUse = NULL; - sPokeblockMenu->unkTaskId = INVALID_U8; + sPokeblockMenu->unkTaskId = 0xFF; sPokeblockMenu->isSwapping = FALSE; sSavedPokeblockData.callback = callback; @@ -901,7 +901,7 @@ static void sub_8136344(void) static void sub_81363BC(void) { - if (sPokeblockMenu->unkTaskId == INVALID_U8) + if (sPokeblockMenu->unkTaskId == 0xFF) { sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed, 0x456, 0x456, &sSavedPokeblockData.lastItemPage); @@ -910,10 +910,10 @@ static void sub_81363BC(void) static void sub_8136418(void) { - if (sPokeblockMenu->unkTaskId != INVALID_U8) + if (sPokeblockMenu->unkTaskId != 0xFF) { RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId); - sPokeblockMenu->unkTaskId = INVALID_U8; + sPokeblockMenu->unkTaskId = 0xFF; } } @@ -1016,7 +1016,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId) break; case LIST_B_PRESSED: PlaySE(SE_SELECT); - gSpecialVar_Result = INVALID_U16; + gSpecialVar_Result = 0xFFFF; gSpecialVar_ItemId = 0; FadePaletteAndSetTaskToClosePokeblockCase(taskId); break; diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 91dbd1c99..2271d7adf 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -88,31 +88,31 @@ EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0}; // const rom data static const u8 sNatureToMonPokeblockAnim[][2] = { - { 0, 0 }, // HARDY - { 3, 0 }, // LONELY - { 4, 1 }, // BRAVE - { 5, 0 }, // ADAMANT - { 10, 0 }, // NAUGHTY - { 13, 0 }, // BOLD - { 15, 0 }, // DOCILE - { 16, 2 }, // RELAXED - { 18, 0 }, // IMPISH - { 19, 0 }, // LAX - { 20, 0 }, // TIMID - { 25, 0 }, // HASTY - { 27, 3 }, // SERIOUS - { 28, 0 }, // JOLLY - { 29, 0 }, // NAIVE - { 33, 4 }, // MODEST - { 36, 0 }, // MILD - { 37, 0 }, // QUIET - { 39, 0 }, // BASHFUL - { 42, 0 }, // RASH - { 45, 0 }, // CALM - { 46, 5 }, // GENTLE - { 47, 6 }, // SASSY - { 48, 0 }, // CAREFUL - { 53, 0 }, // QUIRKY + [NATURE_HARDY] = { 0, 0 }, + [NATURE_LONELY] = { 3, 0 }, + [NATURE_BRAVE] = { 4, 1 }, + [NATURE_ADAMANT] = { 5, 0 }, + [NATURE_NAUGHTY] = { 10, 0 }, + [NATURE_BOLD] = { 13, 0 }, + [NATURE_DOCILE] = { 15, 0 }, + [NATURE_RELAXED] = { 16, 2 }, + [NATURE_IMPISH] = { 18, 0 }, + [NATURE_LAX] = { 19, 0 }, + [NATURE_TIMID] = { 20, 0 }, + [NATURE_HASTY] = { 25, 0 }, + [NATURE_SERIOUS] = { 27, 3 }, + [NATURE_JOLLY] = { 28, 0 }, + [NATURE_NAIVE] = { 29, 0 }, + [NATURE_MODEST] = { 33, 4 }, + [NATURE_MILD] = { 36, 0 }, + [NATURE_QUIET] = { 37, 0 }, + [NATURE_BASHFUL] = { 39, 0 }, + [NATURE_RASH] = { 42, 0 }, + [NATURE_CALM] = { 45, 0 }, + [NATURE_GENTLE] = { 46, 5 }, + [NATURE_SASSY] = { 47, 6 }, + [NATURE_CAREFUL] = { 48, 0 }, + [NATURE_QUIRKY] = { 53, 0 }, }; static const s16 sMonPokeblockAnims[][10] = diff --git a/src/pokedex.c b/src/pokedex.c index 4e28c8a14..0a12ae57e 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1271,7 +1271,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView) pokedexView->seenCount = 0; pokedexView->ownCount = 0; for (i = 0; i <= 3; i++) - pokedexView->unk61E[i] |= INVALID_U16; + pokedexView->unk61E[i] |= 0xFFFF; pokedexView->unk628 = 0; pokedexView->unk62A = 0; pokedexView->unk62C = 0; @@ -2459,7 +2459,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y) return spriteId; } } - return INVALID_U16; + return 0xFFFF; } static void CreateInterfaceSprites(u8 a) @@ -2717,8 +2717,8 @@ void sub_80BE4E0(struct Sprite *sprite) sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256; var = 0x10000 / gSineTable[sprite->data[5] + 0x40]; - if (var > INVALID_U16) - var = INVALID_U16; + if (var > 0xFFFF) + var = 0xFFFF; SetOamMatrix(sprite->data[1] + 1, 0x100, 0, 0, var); sprite->oam.matrixNum = data1 + 1; @@ -3558,61 +3558,61 @@ void sub_80BFD0C(u8 a, u16 unused) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ - movs r0, 0x1\n\ - bl GetBgTilemapBuffer\n\ - adds r7, r0, 0\n\ - movs r1, 0\n\ + mov r7, r8\n\ + push {r7}\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + movs r0, 0x1\n\ + bl GetBgTilemapBuffer\n\ + adds r7, r0, 0\n\ + movs r1, 0\n\ _080BFD22:\n\ - lsls r0, r1, 3\n\ - subs r0, r1\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - movs r3, 0x80\n\ - lsls r3, 7\n\ - cmp r1, r8\n\ - bne _080BFD38\n\ - movs r3, 0x80\n\ - lsls r3, 6\n\ + lsls r0, r1, 3\n\ + subs r0, r1\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + movs r3, 0x80\n\ + lsls r3, 7\n\ + cmp r1, r8\n\ + bne _080BFD38\n\ + movs r3, 0x80\n\ + lsls r3, 6\n\ _080BFD38:\n\ - movs r2, 0\n\ - adds r6, r1, 0x1\n\ - ldr r4, =0x00000fff\n\ + movs r2, 0\n\ + adds r6, r1, 0x1\n\ + ldr r4, =0x00000fff\n\ _080BFD3E:\n\ - adds r1, r5, r2\n\ - lsls r1, 1\n\ - adds r1, r7\n\ - ldrh r0, [r1]\n\ - ands r0, r4\n\ - orrs r0, r3\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r0, [r1]\n\ - ands r0, r4\n\ - orrs r0, r3\n\ - strh r0, [r1]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - cmp r2, 0x6\n\ - bls _080BFD3E\n\ - lsls r0, r6, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, 0x3\n\ - bls _080BFD22\n\ - movs r0, 0x1\n\ - bl CopyBgTilemapBufferToVram\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + adds r1, r5, r2\n\ + lsls r1, 1\n\ + adds r1, r7\n\ + ldrh r0, [r1]\n\ + ands r0, r4\n\ + orrs r0, r3\n\ + strh r0, [r1]\n\ + adds r1, 0x40\n\ + ldrh r0, [r1]\n\ + ands r0, r4\n\ + orrs r0, r3\n\ + strh r0, [r1]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + cmp r2, 0x6\n\ + bls _080BFD3E\n\ + lsls r0, r6, 24\n\ + lsrs r1, r0, 24\n\ + cmp r1, 0x3\n\ + bls _080BFD22\n\ + movs r0, 0x1\n\ + bl CopyBgTilemapBufferToVram\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ .syntax divided\n"); } #endif @@ -3648,66 +3648,66 @@ void sub_80BFD7C(u8 a, u16 b) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ - movs r0, 0x1\n\ - bl GetBgTilemapBuffer\n\ - adds r7, r0, 0\n\ - movs r1, 0\n\ + mov r7, r8\n\ + push {r7}\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + movs r0, 0x1\n\ + bl GetBgTilemapBuffer\n\ + adds r7, r0, 0\n\ + movs r1, 0\n\ _080BFD92:\n\ - lsls r0, r1, 3\n\ - subs r0, r1\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - cmp r1, r8\n\ - beq _080BFDA4\n\ - cmp r1, 0x3\n\ - bne _080BFDAA\n\ + lsls r0, r1, 3\n\ + subs r0, r1\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + cmp r1, r8\n\ + beq _080BFDA4\n\ + cmp r1, 0x3\n\ + bne _080BFDAA\n\ _080BFDA4:\n\ - movs r3, 0x80\n\ - lsls r3, 6\n\ - b _080BFDAE\n\ + movs r3, 0x80\n\ + lsls r3, 6\n\ + b _080BFDAE\n\ _080BFDAA:\n\ - movs r3, 0x80\n\ - lsls r3, 7\n\ + movs r3, 0x80\n\ + lsls r3, 7\n\ _080BFDAE:\n\ - movs r2, 0\n\ - adds r5, r1, 0x1\n\ - ldr r4, =0x00000fff\n\ + movs r2, 0\n\ + adds r5, r1, 0x1\n\ + ldr r4, =0x00000fff\n\ _080BFDB4:\n\ - adds r1, r6, r2\n\ - lsls r1, 1\n\ - adds r1, r7\n\ - ldrh r0, [r1]\n\ - ands r0, r4\n\ - orrs r0, r3\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r0, [r1]\n\ - ands r0, r4\n\ - orrs r0, r3\n\ - strh r0, [r1]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - cmp r2, 0x6\n\ - bls _080BFDB4\n\ - lsls r0, r5, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, 0x3\n\ - bls _080BFD92\n\ - movs r0, 0x1\n\ - bl CopyBgTilemapBufferToVram\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + adds r1, r6, r2\n\ + lsls r1, 1\n\ + adds r1, r7\n\ + ldrh r0, [r1]\n\ + ands r0, r4\n\ + orrs r0, r3\n\ + strh r0, [r1]\n\ + adds r1, 0x40\n\ + ldrh r0, [r1]\n\ + ands r0, r4\n\ + orrs r0, r3\n\ + strh r0, [r1]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r2, r0, 24\n\ + cmp r2, 0x6\n\ + bls _080BFDB4\n\ + lsls r0, r5, 24\n\ + lsrs r1, r0, 24\n\ + cmp r1, 0x3\n\ + bls _080BFD92\n\ + movs r0, 0x1\n\ + bl CopyBgTilemapBufferToVram\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ .syntax divided\n"); } #endif @@ -4012,216 +4012,216 @@ void sub_80C0460(u16 weight, u8 left, u8 top) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x14\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r10, r1\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - str r2, [sp, 0x10]\n\ - ldr r5, =0x000186a0\n\ - muls r0, r5\n\ - ldr r1, =0x000011b8\n\ - bl __divsi3\n\ - adds r7, r0, 0\n\ - movs r1, 0xA\n\ - bl __umodsi3\n\ - cmp r0, 0x4\n\ - bls _080C0494\n\ - adds r7, 0xA\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x14\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + mov r10, r1\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + str r2, [sp, 0x10]\n\ + ldr r5, =0x000186a0\n\ + muls r0, r5\n\ + ldr r1, =0x000011b8\n\ + bl __divsi3\n\ + adds r7, r0, 0\n\ + movs r1, 0xA\n\ + bl __umodsi3\n\ + cmp r0, 0x4\n\ + bls _080C0494\n\ + adds r7, 0xA\n\ _080C0494:\n\ - movs r0, 0\n\ - mov r8, r0\n\ - mov r4, sp\n\ - adds r0, r7, 0\n\ - adds r1, r5, 0\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - strb r0, [r4]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0xA1\n\ - bne _080C04C0\n\ - movs r6, 0x1\n\ - mov r1, sp\n\ - movs r0, 0x77\n\ - strb r0, [r1]\n\ - b _080C04C6\n\ - .pool\n\ + movs r0, 0\n\ + mov r8, r0\n\ + mov r4, sp\n\ + adds r0, r7, 0\n\ + adds r1, r5, 0\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + strb r0, [r4]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0xA1\n\ + bne _080C04C0\n\ + movs r6, 0x1\n\ + mov r1, sp\n\ + movs r0, 0x77\n\ + strb r0, [r1]\n\ + b _080C04C6\n\ + .pool\n\ _080C04C0:\n\ - movs r1, 0x1\n\ - mov r8, r1\n\ - movs r6, 0x1\n\ + movs r1, 0x1\n\ + mov r8, r1\n\ + movs r6, 0x1\n\ _080C04C6:\n\ - ldr r1, =0x000186a0\n\ - adds r0, r7, 0\n\ - bl __umodsi3\n\ - adds r7, r0, 0\n\ - mov r4, sp\n\ - adds r4, 0x1\n\ - ldr r1, =0x00002710\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - strb r0, [r4]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0xA1\n\ - bne _080C0504\n\ - mov r2, r8\n\ - cmp r2, 0\n\ - bne _080C0504\n\ - adds r1, r6, 0\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - add r1, sp\n\ - movs r0, 0x77\n\ - strb r0, [r1]\n\ - b _080C050E\n\ - .pool\n\ + ldr r1, =0x000186a0\n\ + adds r0, r7, 0\n\ + bl __umodsi3\n\ + adds r7, r0, 0\n\ + mov r4, sp\n\ + adds r4, 0x1\n\ + ldr r1, =0x00002710\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + strb r0, [r4]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0xA1\n\ + bne _080C0504\n\ + mov r2, r8\n\ + cmp r2, 0\n\ + bne _080C0504\n\ + adds r1, r6, 0\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + add r1, sp\n\ + movs r0, 0x77\n\ + strb r0, [r1]\n\ + b _080C050E\n\ + .pool\n\ _080C0504:\n\ - movs r3, 0x1\n\ - mov r8, r3\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ + movs r3, 0x1\n\ + mov r8, r3\n\ + adds r0, r6, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ _080C050E:\n\ - ldr r1, =0x00002710\n\ - adds r0, r7, 0\n\ - bl __umodsi3\n\ - adds r7, r0, 0\n\ - mov r0, sp\n\ - adds r4, r0, r6\n\ - movs r1, 0xFA\n\ - lsls r1, 2\n\ - adds r0, r7, 0\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - strb r0, [r4]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0xA1\n\ - bne _080C054C\n\ - mov r1, r8\n\ - cmp r1, 0\n\ - bne _080C054C\n\ - adds r1, r6, 0\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - add r1, sp\n\ - movs r0, 0x77\n\ - strb r0, [r1]\n\ - b _080C0552\n\ - .pool\n\ + ldr r1, =0x00002710\n\ + adds r0, r7, 0\n\ + bl __umodsi3\n\ + adds r7, r0, 0\n\ + mov r0, sp\n\ + adds r4, r0, r6\n\ + movs r1, 0xFA\n\ + lsls r1, 2\n\ + adds r0, r7, 0\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + strb r0, [r4]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0xA1\n\ + bne _080C054C\n\ + mov r1, r8\n\ + cmp r1, 0\n\ + bne _080C054C\n\ + adds r1, r6, 0\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + add r1, sp\n\ + movs r0, 0x77\n\ + strb r0, [r1]\n\ + b _080C0552\n\ + .pool\n\ _080C054C:\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ + adds r0, r6, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ _080C0552:\n\ - movs r1, 0xFA\n\ - lsls r1, 2\n\ - adds r0, r7, 0\n\ - bl __umodsi3\n\ - adds r7, r0, 0\n\ - adds r1, r6, 0\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r5, r6, 0\n\ - mov r2, sp\n\ - adds r4, r2, r1\n\ - adds r0, r7, 0\n\ - movs r1, 0x64\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - movs r3, 0\n\ - mov r9, r3\n\ - strb r0, [r4]\n\ - adds r0, r7, 0\n\ - movs r1, 0x64\n\ - bl __umodsi3\n\ - adds r7, r0, 0\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r1, r6, 0\n\ - mov r2, sp\n\ - adds r0, r2, r5\n\ - movs r3, 0xAD\n\ - mov r8, r3\n\ - mov r2, r8\n\ - strb r2, [r0]\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r5, r6, 0\n\ - mov r3, sp\n\ - adds r4, r3, r1\n\ - adds r0, r7, 0\n\ - movs r1, 0xA\n\ - bl __udivsi3\n\ - adds r0, 0xA1\n\ - strb r0, [r4]\n\ - adds r0, r5, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r1, r6, 0\n\ - mov r2, sp\n\ - adds r0, r2, r5\n\ - mov r3, r9\n\ - strb r3, [r0]\n\ - adds r0, r1, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r2, r6, 0\n\ - add r1, sp\n\ - movs r0, 0xE0\n\ - strb r0, [r1]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r3, r6, 0\n\ - mov r0, sp\n\ - adds r1, r0, r2\n\ - movs r0, 0xD6\n\ - strb r0, [r1]\n\ - adds r0, r3, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - adds r2, r6, 0\n\ - mov r0, sp\n\ - adds r1, r0, r3\n\ - movs r0, 0xE7\n\ - strb r0, [r1]\n\ - adds r0, r2, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r3, sp\n\ - adds r1, r3, r2\n\ - mov r2, r8\n\ - strb r2, [r1]\n\ - adds r1, r3, r0\n\ - movs r0, 0xFF\n\ - strb r0, [r1]\n\ - mov r0, sp\n\ - mov r1, r10\n\ - ldr r2, [sp, 0x10]\n\ - bl sub_80BE8DC\n\ - add sp, 0x14\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ + movs r1, 0xFA\n\ + lsls r1, 2\n\ + adds r0, r7, 0\n\ + bl __umodsi3\n\ + adds r7, r0, 0\n\ + adds r1, r6, 0\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r5, r6, 0\n\ + mov r2, sp\n\ + adds r4, r2, r1\n\ + adds r0, r7, 0\n\ + movs r1, 0x64\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + movs r3, 0\n\ + mov r9, r3\n\ + strb r0, [r4]\n\ + adds r0, r7, 0\n\ + movs r1, 0x64\n\ + bl __umodsi3\n\ + adds r7, r0, 0\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r1, r6, 0\n\ + mov r2, sp\n\ + adds r0, r2, r5\n\ + movs r3, 0xAD\n\ + mov r8, r3\n\ + mov r2, r8\n\ + strb r2, [r0]\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r5, r6, 0\n\ + mov r3, sp\n\ + adds r4, r3, r1\n\ + adds r0, r7, 0\n\ + movs r1, 0xA\n\ + bl __udivsi3\n\ + adds r0, 0xA1\n\ + strb r0, [r4]\n\ + adds r0, r5, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r1, r6, 0\n\ + mov r2, sp\n\ + adds r0, r2, r5\n\ + mov r3, r9\n\ + strb r3, [r0]\n\ + adds r0, r1, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r2, r6, 0\n\ + add r1, sp\n\ + movs r0, 0xE0\n\ + strb r0, [r1]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r3, r6, 0\n\ + mov r0, sp\n\ + adds r1, r0, r2\n\ + movs r0, 0xD6\n\ + strb r0, [r1]\n\ + adds r0, r3, 0x1\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + adds r2, r6, 0\n\ + mov r0, sp\n\ + adds r1, r0, r3\n\ + movs r0, 0xE7\n\ + strb r0, [r1]\n\ + adds r0, r2, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r3, sp\n\ + adds r1, r3, r2\n\ + mov r2, r8\n\ + strb r2, [r1]\n\ + adds r1, r3, r0\n\ + movs r0, 0xFF\n\ + strb r0, [r1]\n\ + mov r0, sp\n\ + mov r1, r10\n\ + ldr r2, [sp, 0x10]\n\ + bl sub_80BE8DC\n\ + add sp, 0x14\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided\n"); } #endif @@ -4627,12 +4627,12 @@ u32 sub_80C0E68(u16 a) u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot) { num = NationalPokedexNumToSpecies(num); - return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, INVALID_U16); + return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF); } u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot) { - return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, INVALID_U16); + return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, 0xFFFF); } int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2) @@ -4655,7 +4655,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 sPokedexView->pokemonListCount = resultsCount; // Search by name - if (abcGroup != INVALID_U8) + if (abcGroup != 0xFF) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4674,7 +4674,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by body color - if (bodyColor != INVALID_U8) + if (bodyColor != 0xFF) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4690,15 +4690,15 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 } // Search by type - if (type1 != INVALID_U8 || type2 != INVALID_U8) + if (type1 != 0xFF || type2 != 0xFF) { - if (type1 == INVALID_U8) + if (type1 == 0xFF) { type1 = type2; - type2 = INVALID_U8; + type2 = 0xFF; } - if (type2 == INVALID_U8) + if (type2 == 0xFF) { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { @@ -4744,7 +4744,6 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 sPokedexView->pokedexList[i].dexNum = 0xFFFF; sPokedexView->pokedexList[i].seen = FALSE; sPokedexView->pokedexList[i].owned = FALSE; - } } @@ -4987,7 +4986,7 @@ void sub_80C170C(u8 taskId) return; } - if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != INVALID_U8) + if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][0]; @@ -4995,7 +4994,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != INVALID_U8) + if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][1]; @@ -5003,7 +5002,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != INVALID_U8) + if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][2]; @@ -5011,7 +5010,7 @@ void sub_80C170C(u8 taskId) CopyWindowToVram(0, 2); CopyBgTilemapBufferToVram(3); } - if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != INVALID_U8) + if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != 0xFF) { PlaySE(SE_SELECT); gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][3]; @@ -5215,54 +5214,54 @@ void sub_80C1D98(u8 a, u8 b, u8 c, u8 d) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - adds r4, r3, 0\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - mov r8, r1\n\ - lsls r2, 24\n\ - lsrs r5, r2, 24\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - movs r0, 0x3\n\ - bl GetBgTilemapBuffer\n\ - adds r2, r0, 0\n\ - movs r3, 0\n\ - cmp r3, r4\n\ - bcs _080C1DEC\n\ - lsls r0, r5, 6\n\ - adds r7, r0, r2\n\ - ldr r5, =0x00000fff\n\ - lsls r2, r6, 12\n\ + mov r7, r8\n\ + push {r7}\n\ + adds r4, r3, 0\n\ + lsls r0, 24\n\ + lsrs r6, r0, 24\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + mov r8, r1\n\ + lsls r2, 24\n\ + lsrs r5, r2, 24\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + movs r0, 0x3\n\ + bl GetBgTilemapBuffer\n\ + adds r2, r0, 0\n\ + movs r3, 0\n\ + cmp r3, r4\n\ + bcs _080C1DEC\n\ + lsls r0, r5, 6\n\ + adds r7, r0, r2\n\ + ldr r5, =0x00000fff\n\ + lsls r2, r6, 12\n\ _080C1DC8:\n\ - mov r0, r8\n\ - adds r1, r0, r3\n\ - lsls r1, 1\n\ - adds r1, r7\n\ - ldrh r0, [r1]\n\ - ands r0, r5\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r0, [r1]\n\ - ands r0, r5\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - adds r0, r3, 0x1\n\ - lsls r0, 16\n\ - lsrs r3, r0, 16\n\ - cmp r3, r4\n\ - bcc _080C1DC8\n\ + mov r0, r8\n\ + adds r1, r0, r3\n\ + lsls r1, 1\n\ + adds r1, r7\n\ + ldrh r0, [r1]\n\ + ands r0, r5\n\ + orrs r0, r2\n\ + strh r0, [r1]\n\ + adds r1, 0x40\n\ + ldrh r0, [r1]\n\ + ands r0, r5\n\ + orrs r0, r2\n\ + strh r0, [r1]\n\ + adds r0, r3, 0x1\n\ + lsls r0, 16\n\ + lsrs r3, r0, 16\n\ + cmp r3, r4\n\ + bcc _080C1DC8\n\ _080C1DEC:\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .pool\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ .syntax divided\n"); } #endif @@ -5475,12 +5474,12 @@ u8 sub_80C2318(u8 taskId, u8 b) return gUnknown_0856EFAE[r2]; case 0: if (r2 == 0) - return INVALID_U8; + return 0xFF; else return r2; case 1: if (r2 == 0) - return INVALID_U8; + return 0xFF; else return r2 - 1; case 2: diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index 843812723..30a127c71 100755 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -4,7 +4,7 @@ #include "gpu_regs.h" #include "graphics.h" #include "main.h" -#include "malloc.h" +#include "alloc.h" #include "menu.h" #include "overworld.h" #include "palette.h" diff --git a/src/pokemon.c b/src/pokemon.c index 1f8d5339b..dbef22338 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2300,7 +2300,7 @@ static const u8 sHoldEffectToType[][2] = const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = { { // B_POSITION_PLAYER_LEFT - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2309,7 +2309,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = sub_8039BB4, }, { // B_POSITION_OPPONENT_LEFT - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACA8, .anims = NULL, @@ -2318,7 +2318,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = oac_poke_opponent, }, { // B_POSITION_PLAYER_RIGHT - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2327,7 +2327,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = .callback = sub_8039BB4, }, { // B_POSITION_OPPONENT_RIGHT - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACA8, .anims = NULL, @@ -2340,7 +2340,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] = static const struct SpriteTemplate gUnknown_08329DF8[] = { { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2349,7 +2349,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2358,7 +2358,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2367,7 +2367,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2376,7 +2376,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2385,7 +2385,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2394,7 +2394,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2403,7 +2403,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] = .callback = sub_8039BB4, }, { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0, .oam = &gUnknown_0831ACB0, .anims = NULL, @@ -2450,20 +2450,20 @@ static const s8 gUnknown_08329ECE[][3] = static const u16 sHMMoves[] = { MOVE_CUT, MOVE_FLY, MOVE_SURF, MOVE_STRENGTH, MOVE_FLASH, - MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, INVALID_U16 + MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, 0xFFFF }; static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] = { {SPECIES_NONE, ITEM_NONE}, {SPECIES_MAREEP, ITEM_GANLON_BERRY}, - {SPECIES_PINECO, ITEM_APICOT_BERRY}, - {SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM}, - {SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY}, - {SPECIES_AIPOM, ITEM_BERRY_JUICE}, - {SPECIES_SHUCKLE, ITEM_BERRY_JUICE}, - {SPECIES_STANTLER, ITEM_PETAYA_BERRY}, - {SPECIES_SMEARGLE, ITEM_SALAC_BERRY}, + {SPECIES_PINECO, ITEM_APICOT_BERRY}, + {SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM}, + {SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY}, + {SPECIES_AIPOM, ITEM_BERRY_JUICE}, + {SPECIES_SHUCKLE, ITEM_BERRY_JUICE}, + {SPECIES_STANTLER, ITEM_PETAYA_BERRY}, + {SPECIES_SMEARGLE, ITEM_SALAC_BERRY}, }; static const struct OamData sOamData_8329F20 = @@ -2485,8 +2485,8 @@ static const struct OamData sOamData_8329F20 = static const struct SpriteTemplate gUnknown_08329F28 = { - .tileTag = INVALID_U16, - .paletteTag = INVALID_U16, + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, .oam = &sOamData_8329F20, .anims = gDummySpriteAnimTable, .images = NULL, @@ -3286,7 +3286,7 @@ u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move) if (existingMove == move) return -2; } - return INVALID_U16; + return 0xFFFF; } u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) @@ -3303,7 +3303,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move) } } - return INVALID_U16; + return 0xFFFF; } void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot) @@ -3341,7 +3341,7 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon) move = (gLevelUpLearnsets[species][i] & 0x1FF); - if (GiveMoveToBoxMon(boxMon, move) == INVALID_U16) + if (GiveMoveToBoxMon(boxMon, move) == 0xFFFF) DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, move); } } @@ -6495,7 +6495,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves) { u16 moveLevel; - if (gLevelUpLearnsets[species][i] == INVALID_U16) + if (gLevelUpLearnsets[species][i] == 0xFFFF) break; moveLevel = gLevelUpLearnsets[species][i] & 0xFE00; @@ -6524,7 +6524,7 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves) u8 numMoves = 0; int i; - for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != INVALID_U16; i++) + for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != 0xFFFF; i++) moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF; return numMoves; @@ -6549,7 +6549,7 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon) { u16 moveLevel; - if (gLevelUpLearnsets[species][i] == INVALID_U16) + if (gLevelUpLearnsets[species][i] == 0xFFFF) break; moveLevel = gLevelUpLearnsets[species][i] & 0xFE00; @@ -6584,7 +6584,7 @@ u16 SpeciesToPokedexNum(u16 species) species = SpeciesToHoennPokedexNum(species); if (species <= 202) return species; - return INVALID_U16; + return 0xFFFF; } } @@ -6747,7 +6747,7 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u bool32 IsHMMove2(u16 move) { int i = 0; - while (sHMMoves[i] != INVALID_U16) + while (sHMMoves[i] != 0xFFFF) { if (sHMMoves[i++] == move) return TRUE; diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index c9a4f5c91..edaedbabd 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -588,7 +588,7 @@ static const u8 sUnknown_0860AA64[][2] = {0, 2}, {1, 2}, {0, 2}, - {0, INVALID_U8} + {0, 0xFF} }; static const u8 sUnknown_0860AA80[][2] = @@ -787,30 +787,30 @@ static const u8 sBackAnimationIds[] = static const u8 sBackAnimNatureModTable[] = { 0x00, // NATURE_HARDY - 0x02, // NATURE_LONELY - 0x00, // NATURE_BRAVE - 0x00, // NATURE_ADAMANT - 0x00, // NATURE_NAUGHTY - 0x01, // NATURE_BOLD - 0x01, // NATURE_DOCILE - 0x01, // NATURE_RELAXED - 0x00, // NATURE_IMPISH - 0x01, // NATURE_LAX - 0x02, // NATURE_TIMID - 0x00, // NATURE_HASTY - 0x01, // NATURE_SERIOUS - 0x00, // NATURE_JOLLY - 0x00, // NATURE_NAIVE - 0x02, // NATURE_MODEST - 0x02, // NATURE_MILD - 0x02, // NATURE_QUIET - 0x02, // NATURE_BASHFUL - 0x01, // NATURE_RASH - 0x01, // NATURE_CALM - 0x02, // NATURE_GENTLE - 0x01, // NATURE_SASSY - 0x02, // NATURE_CAREFUL - 0x01, // NATURE_QUIRKY + 0x02, // NATURE_LONELY + 0x00, // NATURE_BRAVE + 0x00, // NATURE_ADAMANT + 0x00, // NATURE_NAUGHTY + 0x01, // NATURE_BOLD + 0x01, // NATURE_DOCILE + 0x01, // NATURE_RELAXED + 0x00, // NATURE_IMPISH + 0x01, // NATURE_LAX + 0x02, // NATURE_TIMID + 0x00, // NATURE_HASTY + 0x01, // NATURE_SERIOUS + 0x00, // NATURE_JOLLY + 0x00, // NATURE_NAIVE + 0x02, // NATURE_MODEST + 0x02, // NATURE_MILD + 0x02, // NATURE_QUIET + 0x02, // NATURE_BASHFUL + 0x01, // NATURE_RASH + 0x01, // NATURE_CALM + 0x02, // NATURE_GENTLE + 0x01, // NATURE_SASSY + 0x02, // NATURE_CAREFUL + 0x01, // NATURE_QUIRKY }; static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] = @@ -1164,67 +1164,67 @@ NAKED static void sub_817F9F4(struct Sprite *sprite) { asm(".syntax unified\n\ - push {r4,lr}\n\ - adds r4, r0, 0\n\ - movs r0, 0x32\n\ - ldrsh r1, [r4, r0]\n\ - movs r0, 0xC0\n\ - lsls r0, 1\n\ - cmp r1, r0\n\ - ble _0817FA14\n\ - ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\ - str r0, [r4, 0x1C]\n\ - movs r0, 0\n\ - strh r0, [r4, 0x24]\n\ - b _0817FA5E\n\ - .pool\n\ + push {r4,lr}\n\ + adds r4, r0, 0\n\ + movs r0, 0x32\n\ + ldrsh r1, [r4, r0]\n\ + movs r0, 0xC0\n\ + lsls r0, 1\n\ + cmp r1, r0\n\ + ble _0817FA14\n\ + ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\ + str r0, [r4, 0x1C]\n\ + movs r0, 0\n\ + strh r0, [r4, 0x24]\n\ + b _0817FA5E\n\ + .pool\n\ _0817FA14:\n\ - adds r0, r1, 0\n\ - cmp r1, 0\n\ - bge _0817FA1C\n\ - adds r0, 0x7F\n\ + adds r0, r1, 0\n\ + cmp r1, 0\n\ + bge _0817FA1C\n\ + adds r0, 0x7F\n\ _0817FA1C:\n\ - asrs r2, r0, 7\n\ - lsls r0, r2, 16\n\ - asrs r0, 16\n\ - cmp r0, 0\n\ - blt _0817FA60\n\ - cmp r0, 0x1\n\ - ble _0817FA48\n\ - cmp r0, 0x3\n\ - bgt _0817FA60\n\ - ldr r2, =0xffffff00\n\ - adds r1, r2\n\ - lsls r0, r1, 16\n\ - asrs r0, 16\n\ - movs r1, 0x2E\n\ - ldrsh r2, [r4, r1]\n\ - lsls r1, r2, 1\n\ - adds r1, r2\n\ - lsls r1, 16\n\ - b _0817FA56\n\ - .pool\n\ + asrs r2, r0, 7\n\ + lsls r0, r2, 16\n\ + asrs r0, 16\n\ + cmp r0, 0\n\ + blt _0817FA60\n\ + cmp r0, 0x1\n\ + ble _0817FA48\n\ + cmp r0, 0x3\n\ + bgt _0817FA60\n\ + ldr r2, =0xffffff00\n\ + adds r1, r2\n\ + lsls r0, r1, 16\n\ + asrs r0, 16\n\ + movs r1, 0x2E\n\ + ldrsh r2, [r4, r1]\n\ + lsls r1, r2, 1\n\ + adds r1, r2\n\ + lsls r1, 16\n\ + b _0817FA56\n\ + .pool\n\ _0817FA48:\n\ - lsls r0, r2, 7\n\ - subs r0, r1, r0\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r2, 0x2E\n\ - ldrsh r1, [r4, r2]\n\ - lsls r1, 17\n\ + lsls r0, r2, 7\n\ + subs r0, r1, r0\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + movs r2, 0x2E\n\ + ldrsh r1, [r4, r2]\n\ + lsls r1, 17\n\ _0817FA56:\n\ - asrs r1, 16\n\ - bl Sin\n\ - negs r0, r0\n\ + asrs r1, 16\n\ + bl Sin\n\ + negs r0, r0\n\ _0817FA5E:\n\ - strh r0, [r4, 0x26]\n\ + strh r0, [r4, 0x26]\n\ _0817FA60:\n\ - ldrh r0, [r4, 0x32]\n\ - adds r0, 0xC\n\ - strh r0, [r4, 0x32]\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ + ldrh r0, [r4, 0x32]\n\ + adds r0, 0xC\n\ + strh r0, [r4, 0x32]\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ .syntax divided"); } @@ -1666,7 +1666,7 @@ static void sub_818031C(struct Sprite *sprite) else amplitude = 0; - if (var5 == INVALID_U8) + if (var5 == 0xFF) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->pos2.y = 0; @@ -2570,7 +2570,7 @@ static void pokemonanimfunc_2C(struct Sprite *sprite) sprite->data[4] = 0; } - if (sUnknown_0860AA64[sprite->data[6]][1] == INVALID_U8) + if (sUnknown_0860AA64[sprite->data[6]][1] == 0xFF) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; } @@ -4157,17 +4157,17 @@ static void sub_8183574(struct Sprite *sprite) u8 var9 = sprite->data[6]; u8 var5 = sUnknown_0860AA80[sprite->data[5]][0]; u8 var2 = var5; - if (var5 != INVALID_U8) + if (var5 != 0xFF) var5 = sprite->data[7]; else - var5 = INVALID_U8; // needed to match + var5 = 0xFF; // needed to match var6 = sUnknown_0860AA80[sprite->data[5]][1]; var7 = 0; if (var2 != 0xFE) var7 = (var6 - var9) * var5 / var6; - if (var5 == INVALID_U8) + if (var5 == 0xFF) { sprite->callback = SpriteCB_SetDummyOnAnimEnd; sprite->pos2.y = 0; @@ -5278,7 +5278,7 @@ static const struct YellowBlendStruct sUnknown_0860ADCC[] = {0, 1}, {1, 1}, {0, 1}, - {0, INVALID_U8} + {0, 0xFF} }; static const struct YellowBlendStruct sUnknown_0860AE1C[] = @@ -5296,7 +5296,7 @@ static const struct YellowBlendStruct sUnknown_0860AE1C[] = {0, 2}, {1, 2}, {0, 2}, - {0, INVALID_U8} + {0, 0xFF} }; static const struct YellowBlendStruct sUnknown_0860AE54[] = @@ -5310,7 +5310,7 @@ static const struct YellowBlendStruct sUnknown_0860AE54[] = {0, 20}, {1, 1}, {0, 1}, - {0, INVALID_U8} + {0, 0xFF} }; static const struct YellowBlendStruct *const sUnknown_0860AE7C[] = @@ -5324,7 +5324,7 @@ static void BackAnimBlendYellow(struct Sprite *sprite) { const struct YellowBlendStruct *array = sUnknown_0860AE7C[sprite->data[3]]; sub_8184770(sprite); - if (array[sprite->data[6]].field_1 == INVALID_U8) + if (array[sprite->data[6]].field_1 == 0xFF) { sprite->pos2.x = 0; sprite->callback = SpriteCB_SetDummyOnAnimEnd; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 5926f9513..994cc520e 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1153,14 +1153,14 @@ void SafeLoadMonIconPalette(u16 species) if (species > SPECIES_EGG) species = 260; palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } void LoadMonIconPalette(u16 species) { u8 palIndex = gMonIconPaletteIndices[species]; - if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8) + if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF) LoadSpritePalette(&gMonIconPaletteTable[palIndex]); } @@ -1287,7 +1287,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x, struct SpriteTemplate spriteTemplate = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = iconTemplate->paletteTag, .oam = iconTemplate->oam, .anims = iconTemplate->anims, diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index f90a6b8c2..2d9a2f08f 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -109,7 +109,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size) static u8 CompareMonSize(u16 species, u16 *sizeRecord) { - if (gSpecialVar_Result == INVALID_U8) + if (gSpecialVar_Result == 0xFF) { return 0; } diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 30e16da28..465b97da2 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -134,7 +134,7 @@ s16 GetFirstFreeBoxSpot(u8 boxId) return i; } - return INVALID_S16; // all spots are taken + return -1; // all spots are taken } u8 CountPartyNonEggMons(void) @@ -426,7 +426,7 @@ s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx return i; } } - return INVALID_S16; + return -1; } void ResetPokemonStorageSystem(void) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index bef127cce..f1c248a1a 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1152,7 +1152,7 @@ static bool8 SummaryScreen_LoadGraphics(void) break; case 17: pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0); - if (pssData->spriteIds[0] != INVALID_U8) + if (pssData->spriteIds[0] != 0xFF) { pssData->unk40F0 = 0; gMain.state++; @@ -1509,7 +1509,7 @@ static void sub_81C0604(u8 taskId, s8 a) r4_2 = sub_81C08F8(a); } - if (r4_2 != INVALID_S8) + if (r4_2 != -1) { PlaySE(SE_SELECT); if (pssData->summary.unk7 != 0) @@ -1564,7 +1564,7 @@ static void sub_81C0704(u8 taskId) break; case 8: pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]); - if (pssData->spriteIds[0] == INVALID_U8) + if (pssData->spriteIds[0] == 0xFF) return; gSprites[pssData->spriteIds[0]].data[2] = 1; sub_81C0E24(); @@ -1601,9 +1601,9 @@ static s8 sub_81C08F8(s8 a) if (pssData->currPageIndex == PSS_PAGE_INFO) { if (a == -1 && pssData->curMonIndex == 0) - return INVALID_S8; + return -1; else if (a == 1 && pssData->curMonIndex >= pssData->maxMonIndex) - return INVALID_S8; + return -1; else return pssData->curMonIndex + a; } @@ -1615,7 +1615,7 @@ static s8 sub_81C08F8(s8 a) { index += a; if (index < 0 || index > pssData->maxMonIndex) - return INVALID_S8; + return -1; } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0); return index; } @@ -1643,7 +1643,7 @@ static s8 sub_81C09B4(s8 a) r5 += a; if (r5 < 0 || r5 >= 6) - return INVALID_S8; + return -1; b = c[r5]; if (sub_81C0A50(&mon[b]) == TRUE) return b; @@ -2341,7 +2341,7 @@ static void sub_81C1DA4(u16 a, s16 b) else { u8 taskId = FindTaskIdByFunc(sub_81C1E20); - if (taskId == INVALID_U8) + if (taskId == 0xFF) { taskId = CreateTask(sub_81C1E20, 8); } @@ -2392,7 +2392,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move) else { u8 taskId = FindTaskIdByFunc(sub_81C1F80); - if (taskId == INVALID_U8) + if (taskId == 0xFF) taskId = CreateTask(sub_81C1F80, 8); gTasks[taskId].data[0] = b; gTasks[taskId].data[1] = a; @@ -2580,12 +2580,12 @@ static void sub_81C240C(u16 move) { effectValue = gContestEffects[gContestMoves[move].effect].appeal; - if (effectValue != INVALID_U8) + if (effectValue != 0xFF) effectValue /= 10; for (i = 0; i < 8; i++) { - if (effectValue != INVALID_U8 && i < effectValue) + if (effectValue != 0xFF && i < effectValue) { tilemap[(i / 4 * 32) + (i & 3) + 0x1E6] = 0x103A; } @@ -2597,12 +2597,12 @@ static void sub_81C240C(u16 move) effectValue = gContestEffects[gContestMoves[move].effect].jam; - if (effectValue != INVALID_U8) + if (effectValue != 0xFF) effectValue /= 10; for (i = 0; i < 8; i++) { - if (effectValue != INVALID_U8 && i < effectValue) + if (effectValue != 0xFF && i < effectValue) { tilemap[(i / 4 * 32) + (i & 3) + 0x226] = 0x103C; } @@ -2634,7 +2634,7 @@ static void sub_81C2554(void) } for (i = 0; i < 8; i++) { - pssData->windowIds[i] = INVALID_U8; + pssData->windowIds[i] = 0xFF; } } @@ -2661,7 +2661,7 @@ static void sub_81C2628(void) struct Pokemon *mon = &pssData->currentMon; struct PokeSummary *summary = &pssData->summary; u16 dexNum = SpeciesToPokedexNum(summary->species); - if (dexNum != INVALID_U16) + if (dexNum != 0xFFFF) { StringCopy(gStringVar1, &gText_UnkCtrlF908Clear01[0]); ConvertIntToDecimalStringN(gStringVar2, dexNum, 2, 3); @@ -2895,7 +2895,7 @@ static void sub_81C2C38(u8 a) static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId) { u8 *windowIdPtr = &(pssData->windowIds[templateId]); - if (*windowIdPtr == INVALID_U8) + if (*windowIdPtr == 0xFF) { *windowIdPtr = AddWindow(&template[templateId]); FillWindowPixelBuffer(*windowIdPtr, 0); @@ -2906,11 +2906,11 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex) { u8 *windowIdPtr = &(pssData->windowIds[windowIndex]); - if (*windowIdPtr != INVALID_U8) + if (*windowIdPtr != 0xFF) { ClearWindowTilemap(*windowIdPtr); RemoveWindow(*windowIdPtr); - *windowIdPtr = INVALID_U8; + *windowIdPtr = 0xFF; } } @@ -2919,7 +2919,7 @@ static void sub_81C2D9C(u8 pageIndex) u16 i; for (i = 0; i < 8; i++) { - if (pssData->windowIds[i] != INVALID_U8) + if (pssData->windowIds[i] != 0xFF) FillWindowPixelBuffer(pssData->windowIds[i], 0); } gUnknown_0861CE54[pageIndex](); @@ -3651,16 +3651,16 @@ static void sub_81C4190(void) for (i = 0; i < 28; i++) { - pssData->spriteIds[i] = INVALID_U8; + pssData->spriteIds[i] = 0xFF; } } static void DestroySpriteInArray(u8 spriteArrayId) { - if (pssData->spriteIds[spriteArrayId] != INVALID_U8) + if (pssData->spriteIds[spriteArrayId] != 0xFF) { DestroySprite(&gSprites[pssData->spriteIds[spriteArrayId]]); - pssData->spriteIds[spriteArrayId] = INVALID_U8; + pssData->spriteIds[spriteArrayId] = 0xFF; } } @@ -3675,7 +3675,7 @@ static void sub_81C424C(void) for (i = 3; i < 28; i++) { - if (pssData->spriteIds[i] != INVALID_U8) + if (pssData->spriteIds[i] != 0xFF) sub_81C4204(i, TRUE); } } @@ -3704,7 +3704,7 @@ static void sub_81C42C8(void) for (i = 3; i < 8; i++) { - if (pssData->spriteIds[i] == INVALID_U8) + if (pssData->spriteIds[i] == 0xFF) pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); sub_81C4204(i, TRUE); @@ -3851,13 +3851,13 @@ static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1) } } (*a1)++; - return INVALID_S8; + return -1; case 1: pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid); LoadCompressedObjectPalette(pal); SetMultiuseSpriteTemplateToPokemon(pal->tag, 1); (*a1)++; - return INVALID_S8; + return -1; } } @@ -3921,10 +3921,10 @@ void SummaryScreen_SetUnknownTaskId(u8 a0) void SummaryScreen_DestroyUnknownTask(void) { - if (sUnknownTaskId != INVALID_U8) + if (sUnknownTaskId != 0xFF) { DestroyTask(sUnknownTaskId); - sUnknownTaskId = INVALID_U8; + sUnknownTaskId = 0xFF; } } @@ -3994,7 +3994,7 @@ static void CreateSetStatusSprite(void) u8 *spriteId = &pssData->spriteIds[2]; u8 anim; - if (*spriteId == INVALID_U8) + if (*spriteId == 0xFF) { *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0); } diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index d0f65c4b0..b22e1db32 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -89,13 +89,13 @@ static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y); // const rom data static const TaskFunc sTasksForAnimations[] = { - Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT_PRE - Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT - Task_RayTakesFlightAnim, // RAY_ANIM_TAKES_FLIGHT - Task_RayDescendsAnim, // RAY_ANIM_DESCENDS - Task_RayChargesAnim, // RAY_ANIM_CHARGES - Task_RayChasesAwayAnim, // RAY_ANIM_CHACES_AWAY - Task_EndAfterFadeScreen // RAY_ANIM_END + [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim, + [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim, + [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim, + [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim, + [RAY_ANIM_CHARGES] = Task_RayChargesAnim, + [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim, + [RAY_ANIM_END] = Task_EndAfterFadeScreen, }; static const struct OamData sOamData_862A6BC = diff --git a/src/record_mixing.c b/src/record_mixing.c index 4a4941294..975b51386 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1763,7 +1763,7 @@ static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1) for (i = 0; i < 3; i++) { s32 highestWinStreak = 0; - s32 highestId = INVALID_S32; + s32 highestId = -1; for (j = 0; j < 6; j++) { if (arg1[j].winStreak > highestWinStreak) @@ -1788,7 +1788,7 @@ static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1) for (i = 0; i < 3; i++) { s32 highestWinStreak = 0; - s32 highestId = INVALID_S32; + s32 highestId = -1; for (j = 0; j < 6; j++) { if (arg1[j].winStreak > highestWinStreak) diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 3fc08ff3f..81935b7c6 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -221,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId) ResetPaletteFadeControl(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); SetMainCallback2(CB2_QuitRecordedBattle); - return INVALID_U8; + return 0xFF; } else { diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index da94c5c46..34444cbf4 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -160,7 +160,7 @@ static const union AnimCmd *const sSpriteAnimTable_85104E4[] = static const struct SpriteTemplate sSpriteTemplate_85104F0 = { - .tileTag = INVALID_U16, + .tileTag = 0xFFFF, .paletteTag = 0x1000, .oam = &sOamData_08510464, .anims = sSpriteAnimTable_85104E4, diff --git a/src/rock.c b/src/rock.c index b50ecc155..3b8e505d8 100644 --- a/src/rock.c +++ b/src/rock.c @@ -738,7 +738,7 @@ void sub_811131C(struct Sprite *sprite) if (TranslateAnimArc(sprite)) { u8 taskId = FindTaskIdByFunc(sub_81110A4); - if (taskId != INVALID_U8) + if (taskId != 0xFF) gTasks[taskId].data[11]--; DestroySprite(sprite); diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index ef82cbf0a..0553b9cf4 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -961,7 +961,7 @@ u8 sub_80132D4(struct UnkStruct_Main0 *arg0) if (var == 1) { id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); - if (id != INVALID_U8) + if (id != 0xFF) { data->field_0->arr[i].unk = data->field_4->arr[id].unk0; data->field_0->arr[i].field_18 = var; @@ -1382,7 +1382,7 @@ void sub_8013C7C(u8 taskId) case 3: if (sub_8013E44() == 1) PlaySE(SE_PC_LOGIN); - if (gTasks[taskId].data[15] == INVALID_U8) + if (gTasks[taskId].data[15] == 0xFF) data->state = 10; break; case 10: @@ -1401,14 +1401,14 @@ void sub_8013C7C(u8 taskId) bool32 sub_8013D88(u32 arg0, u32 id) { - if (id == INVALID_U8) + if (id == 0xFF) return TRUE; if (id <= ARRAY_COUNT(gUnknown_082F04D8)) // UB: <= may access data outside the array { const u8 *bytes = gUnknown_082F04D8[id]; - while ((*(bytes) != INVALID_U8)) + while ((*(bytes) != 0xFF)) { if ((*bytes) == arg0) return TRUE; @@ -1454,7 +1454,7 @@ u8 sub_8013E44(void) if (data->field_0->arr[i].field_1A_0 != 0) { id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr); - if (id != INVALID_U8) + if (id != 0xFF) { if (data->field_0->arr[i].field_1A_0 == 1) { @@ -1500,7 +1500,7 @@ u8 sub_8013E44(void) for (id = 0; id < 4; id++) { - if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != INVALID_U8) + if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != 0xFF) ret = 1; } @@ -2178,7 +2178,7 @@ void sub_8014F48(u8 taskId) break; case 0: id = ListMenuHandleInputGetItemId(data->listTaskId); - if (gMain.newKeys & A_BUTTON && id != INVALID_S32) + if (gMain.newKeys & A_BUTTON && id != -1) { // this unused variable along with the assignment is needed to match u32 unusedVar; @@ -2732,7 +2732,7 @@ void sub_80156E0(u8 taskId) break; case 6: var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244); - if (var5 != INVALID_S32) + if (var5 != -1) { if (gReceivedRemoteLinkPlayers == 0) { diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c index 47d9eaf70..e175ecc64 100644 --- a/src/rom_8034C54.c +++ b/src/rom_8034C54.c @@ -255,7 +255,7 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) u32 r5 = arg0->field_14; gUnknown_03000DD4 = arg0->firstOamId; gUnknown_03000DD8 = 0; - gUnknown_03000DDC = INVALID_S32; + gUnknown_03000DDC = -1; while (r5 != 0) { @@ -263,12 +263,12 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2) arg1 -= (r4 * r5); r5 /= 10; - if (r4 != 0 || gUnknown_03000DDC != INVALID_S32 || r5 == 0) + if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0) { gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart; gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0; - if (gUnknown_03000DDC == INVALID_S32) + if (gUnknown_03000DDC == -1) gUnknown_03000DDC = gUnknown_03000DD8; } else diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 395ced06e..f617321af 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -461,7 +461,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_RotatingGate[] = static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = { .tileTag = ROTATING_GATE_TILE_TAG, - .paletteTag = INVALID_U16, + .paletteTag = 0xFFFF, .oam = &sOamData_RotatingGateLarge, .anims = sSpriteAnimTable_RotatingGateLarge, .images = NULL, @@ -472,7 +472,7 @@ static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge = static const struct SpriteTemplate sSpriteTemplate_RotatingGateRegular = { .tileTag = ROTATING_GATE_TILE_TAG, - .paletteTag = INVALID_U16, + .paletteTag = 0xFFFF, .oam = &sOamData_RotatingGateRegular, .anims = sSpriteAnimTable_RotatingGateRegular, .images = NULL, diff --git a/src/rtc.c b/src/rtc.c index 7553d7629..3f413d0e3 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -46,12 +46,12 @@ void RtcRestoreInterrupts(void) u32 ConvertBcdToBinary(u8 bcd) { if (bcd > 0x9F) - return INVALID_U8; + return 0xFF; if ((bcd & 0xF) <= 9) return (10 * ((bcd >> 4) & 0xF)) + (bcd & 0xF); else - return INVALID_U8; + return 0xFF; } bool8 IsLeapYear(u32 year) @@ -166,17 +166,17 @@ u16 RtcCheckInfo(struct SiiRtcInfo *rtc) year = ConvertBcdToBinary(rtc->year); - if (year == INVALID_U8) + if (year == 0xFF) errorFlags |= RTC_ERR_INVALID_YEAR; month = ConvertBcdToBinary(rtc->month); - if (month == INVALID_U8 || month == 0 || month > 12) + if (month == 0xFF || month == 0 || month > 12) errorFlags |= RTC_ERR_INVALID_MONTH; value = ConvertBcdToBinary(rtc->day); - if (value == INVALID_U8) + if (value == 0xFF) errorFlags |= RTC_ERR_INVALID_DAY; if (month == MONTH_FEB) diff --git a/src/safari_zone.c b/src/safari_zone.c index 69914b565..accf94981 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -185,7 +185,7 @@ struct Pokeblock *SafariZoneGetPokeblockInFront(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == INVALID_U16) + if (gSpecialVar_Result == 0xFFFF) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -195,7 +195,7 @@ struct Pokeblock *SafariZoneGetActivePokeblock(void) { GetPokeblockFeederWithinRange(); - if (gSpecialVar_Result == INVALID_U16) + if (gSpecialVar_Result == 0xFFFF) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -245,7 +245,7 @@ bool8 GetInFrontFeederPokeblockAndSteps(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == INVALID_U16) + if (gSpecialVar_Result == 0xFFFF) { return FALSE; } diff --git a/src/save.c b/src/save.c index de103864b..4ae516fc9 100644 --- a/src/save.c +++ b/src/save.c @@ -160,7 +160,7 @@ static u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location if (gDamagedSaveSectors != 0) // skip the damaged sector. { - retVal = INVALID_U8; + retVal = 0xFF; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -220,7 +220,7 @@ static u8 TryWriteSector(u8 sector, u8 *data) if (ProgramFlashSectorAndVerify(sector, data) != 0) // is damaged? { SetDamagedSectorBits(ENABLE, sector); // set damaged sector bits. - return INVALID_U8; + return 0xFF; } else { @@ -263,14 +263,14 @@ static u8 sub_81529D4(u16 a1, const struct SaveSectionLocation *location) gUnknown_03006208++; if (gDamagedSaveSectors) { - retVal = INVALID_U8; + retVal = 0xFF; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } } else { - retVal = INVALID_U8; + retVal = 0xFF; } return retVal; @@ -284,7 +284,7 @@ static u8 sub_8152A34(u16 a1, const struct SaveSectionLocation *location) if (gDamagedSaveSectors) { - retVal = INVALID_U8; + retVal = 0xFF; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -329,15 +329,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location) { if (ProgramFlashByte(sector, i, ((u8 *)gFastSaveSection)[i])) { - status = INVALID_U8; + status = 0xFF; break; } } - if (status == INVALID_U8) + if (status == 0xFF) { SetDamagedSectorBits(ENABLE, sector); - return INVALID_U8; + return 0xFF; } else { @@ -347,15 +347,15 @@ static u8 ClearSaveData_2(u16 a1, const struct SaveSectionLocation *location) { if (ProgramFlashByte(sector, 0xFF9 + i, ((u8 *)gFastSaveSection)[0xFF9 + i])) { - status = INVALID_U8; + status = 0xFF; break; } } - if (status == INVALID_U8) + if (status == 0xFF) { SetDamagedSectorBits(ENABLE, sector); - return INVALID_U8; + return 0xFF; } else { @@ -379,7 +379,7 @@ static u8 sav12_xor_get(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return INVALID_U8; + return 0xFF; } else { @@ -402,7 +402,7 @@ static u8 sub_8152CAC(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return INVALID_U8; + return 0xFF; } else { @@ -425,7 +425,7 @@ static u8 sub_8152D44(u16 a1, const struct SaveSectionLocation *location) SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return INVALID_U8; + return 0xFF; } else { @@ -440,7 +440,7 @@ static u8 sub_8152DD0(u16 a1, const struct SaveSectionLocation *location) gFastSaveSection = &gSaveDataBuffer; if (a1 != 0xFFFF) { - retVal = INVALID_U8; + retVal = 0xFF; } else { @@ -715,8 +715,8 @@ u8 TrySavingData(u8 saveType) { if (gFlashMemoryPresent != TRUE) { - gUnknown_03006294 = INVALID_U8; - return INVALID_U8; + gUnknown_03006294 = 0xFF; + return 0xFF; } HandleSavingData(saveType); @@ -728,8 +728,8 @@ u8 TrySavingData(u8 saveType) else { DoSaveFailedScreen(saveType); - gUnknown_03006294 = INVALID_U8; - return INVALID_U8; + gUnknown_03006294 = 0xFF; + return 0xFF; } } @@ -748,7 +748,7 @@ bool8 sub_81533AC(void) // trade.s save u8 retVal = sub_81529D4(SECTOR_SAVE_SLOT_LENGTH, gRamSaveSectionLocations); if (gDamagedSaveSectors) DoSaveFailedScreen(0); - if (retVal == INVALID_U8) + if (retVal == 0xFF) return TRUE; else return FALSE; @@ -808,7 +808,7 @@ u8 Save_LoadGameData(u8 a1) if (gFlashMemoryPresent != TRUE) { gSaveFileStatus = 4; - return INVALID_U8; + return 0xFF; } UpdateSaveAddresses(); @@ -861,10 +861,10 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst) u8* savData; if (sector != SECTOR_ID_TRAINER_HILL && sector != SECTOR_ID_RECORDED_BATTLE) - return INVALID_U8; + return 0xFF; ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection)); if (*(u32*)(&gSaveDataBuffer.data[0]) != 0xB39D) - return INVALID_U8; + return 0xFF; // copies whole save section except u32 counter i = 0; size = 0xFFB; @@ -882,7 +882,7 @@ u32 sub_8153634(u8 sector, u8* src) void* savDataBuffer; if (sector != 30 && sector != 31) - return INVALID_U8; + return 0xFF; savDataBuffer = &gSaveDataBuffer; *(u32*)(savDataBuffer) = 0xB39D; @@ -894,7 +894,7 @@ u32 sub_8153634(u8 sector, u8* src) for (; i <= size; i++) savData[i] = src[i]; if (ProgramFlashSectorAndVerify(sector, savDataBuffer) != 0) - return INVALID_U8; + return 0xFF; return 1; } diff --git a/src/save_location.c b/src/save_location.c index f7d3aa60b..d49afa736 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -12,7 +12,7 @@ static bool32 IsCurMapInLocationList(const u16 *list) s32 i; u16 locSum = (gSaveBlock1Ptr->location.mapGroup << 8) + (gSaveBlock1Ptr->location.mapNum); - for (i = 0; list[i] != INVALID_U16; i++) + for (i = 0; list[i] != 0xFFFF; i++) { if (list[i] == locSum) return TRUE; @@ -61,7 +61,7 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - INVALID_U16, + 0xFFFF, }; static bool32 IsCurMapPokeCenter(void) @@ -72,7 +72,7 @@ static bool32 IsCurMapPokeCenter(void) static const u16 sSaveLocationReloadLocList[] = // There's only 1 location, and it's presumed its for the save reload feature for battle tower. { MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, - INVALID_U16, + 0xFFFF, }; static bool32 IsCurMapReloadLocation(void) @@ -83,7 +83,7 @@ static bool32 IsCurMapReloadLocation(void) // Nulled out list. Unknown what this would have been. static const u16 sUnknown_0861440E[] = { - INVALID_U16, + 0xFFFF, }; static bool32 sub_81AFCEC(void) diff --git a/src/scanline_effect.c b/src/scanline_effect.c index 2e264ee29..a9ae9427b 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -22,10 +22,10 @@ void ScanlineEffect_Stop(void) { gScanlineEffect.state = 0; DmaStop(0); - if (gScanlineEffect.waveTaskId != INVALID_U8) + if (gScanlineEffect.waveTaskId != 0xFF) { DestroyTask(gScanlineEffect.waveTaskId); - gScanlineEffect.waveTaskId = INVALID_U8; + gScanlineEffect.waveTaskId = 0xFF; } } @@ -40,7 +40,7 @@ void ScanlineEffect_Clear(void) gScanlineEffect.state = 0; gScanlineEffect.unused16 = 0; gScanlineEffect.unused17 = 0; - gScanlineEffect.waveTaskId = INVALID_U8; + gScanlineEffect.waveTaskId = 0xFF; } void ScanlineEffect_SetParams(struct ScanlineEffectParams params) @@ -132,7 +132,7 @@ static void TaskFunc_UpdateWavePerFrame(u8 taskId) if (sShouldStopWaveTask) { DestroyTask(taskId); - gScanlineEffect.waveTaskId = INVALID_U8; + gScanlineEffect.waveTaskId = 0xFF; } else { diff --git a/src/scrcmd.c b/src/scrcmd.c index 4217f7237..f486b93a6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -790,7 +790,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) u16 y; PlayerGetDestCoords(&x, &y); - if (mapGroup == INVALID_U8 && mapNum == INVALID_U8) + if (mapGroup == 0xFF && mapNum == 0xFF) SetFixedHoleWarpAsDestination(x - 7, y - 7); else Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); @@ -1491,7 +1491,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) if (width > 0x1C) width = 0x1C; - for (i = 0, height = 4; gStringVar4[i] != INVALID_U8;) + for (i = 0, height = 4; gStringVar4[i] != 0xFF;) { if (gStringVar4[i++] == 0xFE) height += 3; @@ -2238,8 +2238,8 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_808D074(GetPlayerFacingDirection()); - sub_80B0244(); + sub_808D074(GetPlayerFacingDirection()); + sub_80B0244(); ResetInitialPlayerAvatarState(); return TRUE; } @@ -2292,7 +2292,7 @@ bool8 ScrCmd_warpE0(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_80AF79C(); + sub_80AF79C(); ResetInitialPlayerAvatarState(); return TRUE; } diff --git a/src/script.c b/src/script.c index 4e133a188..c61ae7183 100644 --- a/src/script.c +++ b/src/script.c @@ -391,11 +391,11 @@ bool32 sub_80991F8(void) struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; if (scriptData->magic != RAM_SCRIPT_MAGIC) return FALSE; - if (scriptData->mapGroup != INVALID_U8) + if (scriptData->mapGroup != 0xFF) return FALSE; - if (scriptData->mapNum != INVALID_U8) + if (scriptData->mapNum != 0xFF) return FALSE; - if (scriptData->objectId != INVALID_U8) + if (scriptData->objectId != 0xFF) return FALSE; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) return FALSE; @@ -409,11 +409,11 @@ u8 *sub_8099244(void) return NULL; if (scriptData->magic != RAM_SCRIPT_MAGIC) return NULL; - if (scriptData->mapGroup != INVALID_U8) + if (scriptData->mapGroup != 0xFF) return NULL; - if (scriptData->mapNum != INVALID_U8) + if (scriptData->mapNum != 0xFF) return NULL; - if (scriptData->objectId != INVALID_U8) + if (scriptData->objectId != 0xFF) return NULL; if (CalculateRamScriptChecksum() != gSaveBlock1Ptr->ramScript.checksum) { diff --git a/src/script_menu.c b/src/script_menu.c index fcb2d17a2..2aa546288 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1040,7 +1040,7 @@ bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress) } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, 0); return TRUE; } @@ -1054,7 +1054,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8 } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; DrawMultichoiceMenu(left, top, multichoiceId, ignoreBPress, defaultChoice); return TRUE; } @@ -1201,7 +1201,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; DisplayYesNoMenu(); taskId = CreateTask(Task_HandleYesNoInput, 0x50); return TRUE; @@ -1211,7 +1211,7 @@ bool8 ScriptMenu_YesNo(u8 left, u8 top) // unused bool8 IsScriptActive(void) { - if (gSpecialVar_Result == INVALID_U8) + if (gSpecialVar_Result == 0xFF) return FALSE; else return TRUE; @@ -1261,7 +1261,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr int i; u8 newWidth; - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; width = 0; for (i = 0; i < gMultichoiceLists[multichoiceId].count; i++) @@ -1320,7 +1320,7 @@ bool8 ScrSpecial_CreatePCMenu(void) } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; CreatePCMenu(); return TRUE; } @@ -1389,7 +1389,7 @@ bool8 sub_80E2548(void) } else { - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; sub_80E2578(); return TRUE; } @@ -1407,7 +1407,7 @@ static void sub_80E2578(void) for (i = 0; i < ARRAY_COUNT(gUnknown_03001124); i++) { - gUnknown_03001124[i] |= INVALID_U8; + gUnknown_03001124[i] |= 0xFF; } GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH); @@ -1508,7 +1508,7 @@ static void sub_80E2578(void) for (j = 0; j < ARRAY_COUNT(gUnknown_0858BB80); j++) { u8 test = gUnknown_03001124[j]; - if (test != INVALID_U8) + if (test != 0xFF) { pixelWidth = display_text_and_get_width(gUnknown_0858BB80[test], pixelWidth); } @@ -1520,7 +1520,7 @@ static void sub_80E2578(void) for (temp = 0, i = 0; i < ARRAY_COUNT(gUnknown_0858BB80); i++) { - if (gUnknown_03001124[i] != INVALID_U8) + if (gUnknown_03001124[i] != 0xFF) { AddTextPrinterParameterized(windowId, 1, gUnknown_0858BB80[gUnknown_03001124[i]], 8, temp * 16 + 1, TEXT_SPEED_FF, NULL); temp++; @@ -1575,7 +1575,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) u8 taskId; u8 spriteId; - if (FindTaskIdByFunc(Task_PokemonPicWindow) != INVALID_U8) + if (FindTaskIdByFunc(Task_PokemonPicWindow) != 0xFF) { return FALSE; } @@ -1599,7 +1599,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) { u8 taskId = FindTaskIdByFunc(Task_PokemonPicWindow); - if (taskId == INVALID_U8) + if (taskId == 0xFF) return NULL; gTasks[taskId].tState++; return IsPicboxClosed; @@ -1607,7 +1607,7 @@ bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void) static bool8 IsPicboxClosed(void) { - if (FindTaskIdByFunc(Task_PokemonPicWindow) == INVALID_U8) + if (FindTaskIdByFunc(Task_PokemonPicWindow) == 0xFF) return TRUE; else return FALSE; @@ -1672,7 +1672,7 @@ bool16 sp106_CreateStartMenu(void) return FALSE; } - gSpecialVar_Result = INVALID_U8; + gSpecialVar_Result = 0xFF; CreateStartMenu(); return TRUE; } diff --git a/src/script_movement.c b/src/script_movement.c index 54e6f9995..9fee9e060 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -50,7 +50,7 @@ void sub_80D338C(void) u8 taskId; taskId = sub_80D33F4(); - if (taskId != INVALID_U8) + if (taskId != 0xFF) { UnfreezeObjects(taskId); DestroyTask(taskId); @@ -65,7 +65,7 @@ static void sub_80D33AC(u8 priority) taskId = CreateTask(sub_80D3660, priority); for (i = 1; i < 16; i++) - gTasks[taskId].data[i] = INVALID_U16; + gTasks[taskId].data[i] = 0xFFFF; } static u8 sub_80D33F4(void) @@ -188,7 +188,7 @@ static void UnfreezeObjects(u8 taskId) pEventObjId = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < 16; i++, pEventObjId++) { - if (*pEventObjId != INVALID_U8) + if (*pEventObjId != 0xFF) UnfreezeEventObject(&gEventObjects[*pEventObjId]); } } @@ -201,7 +201,7 @@ static void sub_80D3660(u8 taskId) for (i = 0; i < 16; i++) { sub_80D3508(taskId, i, &var); - if (var != INVALID_U8) + if (var != 0xFF) sub_80A2490(taskId, i, var, sub_80D35CC(i)); } } diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 77c1a88e0..7fc61f953 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -318,7 +318,7 @@ void ShowContestEntryMonPic(void) u8 taskId; u8 left, top; - if (FindTaskIdByFunc(sub_80F8EE8) == INVALID_U8) + if (FindTaskIdByFunc(sub_80F8EE8) == 0xFF) { AllocateMonSpritesGfx(); left = 10; @@ -361,7 +361,7 @@ void ShowContestEntryMonPic(void) void sub_80F8EB8(void) { u8 taskId = FindTaskIdByFunc(sub_80F8EE8); - if (taskId != INVALID_U8) + if (taskId != 0xFF) { gTasks[taskId].data[0]++; FreeMonSpritesGfx(); diff --git a/src/secret_base.c b/src/secret_base.c index 78e6bd7d0..4bf1709d2 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1385,7 +1385,7 @@ s16 sub_80EA990(u8 secretBaseRecordId) return i; } } - return INVALID_S16; + return -1; } u8 sub_80EA9D8(void) @@ -1427,7 +1427,7 @@ u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language) secretBaseRecordId = sub_80EA990(base->secretBaseId); if (secretBaseRecordId != 0) { - if (secretBaseRecordId != INVALID_S16) + if (secretBaseRecordId != -1) { if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1) { @@ -1757,7 +1757,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx) gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0; } } - if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != INVALID_U16) + if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF) { gSaveBlock1Ptr->secretBases[0].sbr_field_e ++; } diff --git a/src/shop.c b/src/shop.c index c0359bda0..b08d94545 100755 --- a/src/shop.c +++ b/src/shop.c @@ -446,9 +446,9 @@ static void CB2_InitBuyMenu(void) ResetTasks(); clear_scheduled_bg_copies_to_vram(); gShopDataPtr = AllocZeroed(sizeof(struct ShopData)); - gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8; - gShopDataPtr->itemSpriteIds[0] = INVALID_U8; - gShopDataPtr->itemSpriteIds[1] = INVALID_U8; + gShopDataPtr->scrollIndicatorsTaskId = 0xFF; + gShopDataPtr->itemSpriteIds[0] = 0xFF; + gShopDataPtr->itemSpriteIds[1] = 0xFF; BuyMenuBuildListMenuTemplate(); BuyMenuInitBgs(); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); @@ -580,7 +580,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y) static void BuyMenuAddScrollIndicatorArrows(void) { - if (gShopDataPtr->scrollIndicatorsTaskId == INVALID_U8 && gMartInfo.itemCount + 1 > 8) + if (gShopDataPtr->scrollIndicatorsTaskId == 0xFF && gMartInfo.itemCount + 1 > 8) { gShopDataPtr->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized( SCROLL_ARROW_UP, @@ -596,10 +596,10 @@ static void BuyMenuAddScrollIndicatorArrows(void) static void BuyMenuRemoveScrollIndicatorArrows(void) { - if (gShopDataPtr->scrollIndicatorsTaskId != INVALID_U8) + if (gShopDataPtr->scrollIndicatorsTaskId != 0xFF) { RemoveScrollIndicatorArrowPair(gShopDataPtr->scrollIndicatorsTaskId); - gShopDataPtr->scrollIndicatorsTaskId = INVALID_U8; + gShopDataPtr->scrollIndicatorsTaskId = 0xFF; } } @@ -613,10 +613,10 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) { u8 spriteId; u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot]; - if (*spriteIdPtr != INVALID_U8) + if (*spriteIdPtr != 0xFF) return; - if (gMartInfo.martType == MART_TYPE_0 || item == INVALID_U16) + if (gMartInfo.martType == MART_TYPE_0 || item == 0xFFFF) { spriteId = AddItemIconSprite(iconSlot + 2110, iconSlot + 2110, item); if (spriteId != MAX_SPRITES) @@ -637,13 +637,13 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot) static void BuyMenuRemoveItemIcon(u16 item, u8 iconSlot) { u8 *spriteIdPtr = &gShopDataPtr->itemSpriteIds[iconSlot]; - if (*spriteIdPtr == INVALID_U8) + if (*spriteIdPtr == 0xFF) return; FreeSpriteTilesByTag(iconSlot + 2110); FreeSpritePaletteByTag(iconSlot + 2110); DestroySprite(&gSprites[*spriteIdPtr]); - *spriteIdPtr = INVALID_U8; + *spriteIdPtr = 0xFF; } static void BuyMenuInitBgs(void) diff --git a/src/slot_machine.c b/src/slot_machine.c index 97fe0b146..0871506cd 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1637,7 +1637,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) /*static */bool8 sub_8102A44(void) { - if (FindTaskIdByFunc(sub_8102A64) == INVALID_U8) + if (FindTaskIdByFunc(sub_8102A64) == 0xFF) return TRUE; else return FALSE; @@ -2672,7 +2672,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_810432C(void) { - if (FindTaskIdByFunc(sub_810434C) == INVALID_U8) + if (FindTaskIdByFunc(sub_810434C) == 0xFF) return TRUE; return FALSE; } @@ -3007,7 +3007,7 @@ s16 sub_8102D5C(s16 a0) /*static */bool8 sub_8104AEC(void) { - if (FindTaskIdByFunc(sub_8104B0C) == INVALID_U8) + if (FindTaskIdByFunc(sub_8104B0C) == 0xFF) return TRUE; else return FALSE; @@ -3108,7 +3108,7 @@ s16 sub_8102D5C(s16 a0) task = gTasks + sSlotMachine->unk3D; task->data[1] = arg0; - for (i = 0; gUnknown_083ED048[arg0][i].unk00 != INVALID_U8; i++) + for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++) { u8 spriteId; spriteId = sub_8105BB4( @@ -3138,7 +3138,7 @@ s16 sub_8102D5C(s16 a0) { u8 i; struct Task *task = gTasks + sSlotMachine->unk3D; - if ((u16)task->data[1] != INVALID_U16) + if ((u16)task->data[1] != 0xFFFF) gUnknown_083ED064[task->data[1]](); for (i = 4; i < 16; i++) { @@ -4201,74 +4201,74 @@ extern const u16 gSlotMachineMenu_Pal[]; /*static */void SlotMachineSetup_8_0(void) { gUnknown_0203AAF4 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAF4[0].data = gUnknown_0203AAD4; - gUnknown_0203AAF4[0].size = 0x600; - - gUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAF8[0].data = gUnknown_0203AAD4 + 0x600; - gUnknown_0203AAF8[0].size = 0x200; - - gUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AAFC[0].data = gUnknown_0203AAD4 + 0x800; - gUnknown_0203AAFC[0].size = 0x200; - - gUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB00[0].data = gUnknown_0203AAD4 + 0xA00; - gUnknown_0203AB00[0].size = 0x200; - - gUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB04[0].data = gUnknown_0203AAD4 + 0xC00; - gUnknown_0203AB04[0].size = 0x300; - - gUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB08[0].data = gUnknown_0203AAD4 + 0x1000; - gUnknown_0203AB08[0].size = 0x400; - - gUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB0C[0].data = gUnknown_0203AAD4 + 0x1400; - gUnknown_0203AB0C[0].size = 0x200; - - gUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB10[0].data = gUnknown_0203AAD4 + 0x1600; - gUnknown_0203AB10[0].size = 0x300; - - gUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB14[0].data = gUnknown_0203AAD4 + 0x1900; - gUnknown_0203AB14[0].size = 0x300; - - gUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB18[0].data = gUnknown_0203AAD4 + 0x1C00; - gUnknown_0203AB18[0].size = 0x200; - gUnknown_0203AB18[1].data = gUnknown_0203AAD4 + 0x1E00; - gUnknown_0203AB18[1].size = 0x200; - - gUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); - gUnknown_0203AB1C[0].data = gUnknown_0203AAD4 + 0x2000; - gUnknown_0203AB1C[0].size = 640; - - gUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5); - gUnknown_0203AB20[0].data = gUnknown_0203AAD4 + 0x2280; - gUnknown_0203AB20[0].size = 0x80; - gUnknown_0203AB20[1].data = gUnknown_0203AAD4 + 0x2300; - gUnknown_0203AB20[1].size = 0x80; - gUnknown_0203AB20[2].data = gUnknown_0203AAD4 + 0x2380; - gUnknown_0203AB20[2].size = 0x80; - gUnknown_0203AB20[3].data = gUnknown_0203AAD4 + 0x2400; - gUnknown_0203AB20[3].size = 0x80; - gUnknown_0203AB20[4].data = gUnknown_0203AAD4 + 0x2480; - gUnknown_0203AB20[4].size = 0x80; - - gUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB24[0].data = gUnknown_0203AAD4 + 0x2600; - gUnknown_0203AB24[0].size = 0x480; - gUnknown_0203AB24[1].data = gUnknown_0203AAD4 + 10880; - gUnknown_0203AB24[1].size = 0x480; - - gUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); - gUnknown_0203AB28[0].data = gUnknown_0203AAD4 + 0x2F00; - gUnknown_0203AB28[0].size = 0x180; - gUnknown_0203AB28[1].data = gUnknown_0203AAD4 + 0x3080; - gUnknown_0203AB28[1].size = 0x180; + gUnknown_0203AAF4[0].data = gUnknown_0203AAD4; + gUnknown_0203AAF4[0].size = 0x600; + + gUnknown_0203AAF8 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AAF8[0].data = gUnknown_0203AAD4 + 0x600; + gUnknown_0203AAF8[0].size = 0x200; + + gUnknown_0203AAFC = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AAFC[0].data = gUnknown_0203AAD4 + 0x800; + gUnknown_0203AAFC[0].size = 0x200; + + gUnknown_0203AB00 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB00[0].data = gUnknown_0203AAD4 + 0xA00; + gUnknown_0203AB00[0].size = 0x200; + + gUnknown_0203AB04 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB04[0].data = gUnknown_0203AAD4 + 0xC00; + gUnknown_0203AB04[0].size = 0x300; + + gUnknown_0203AB08 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB08[0].data = gUnknown_0203AAD4 + 0x1000; + gUnknown_0203AB08[0].size = 0x400; + + gUnknown_0203AB0C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB0C[0].data = gUnknown_0203AAD4 + 0x1400; + gUnknown_0203AB0C[0].size = 0x200; + + gUnknown_0203AB10 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB10[0].data = gUnknown_0203AAD4 + 0x1600; + gUnknown_0203AB10[0].size = 0x300; + + gUnknown_0203AB14 = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB14[0].data = gUnknown_0203AAD4 + 0x1900; + gUnknown_0203AB14[0].size = 0x300; + + gUnknown_0203AB18 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + gUnknown_0203AB18[0].data = gUnknown_0203AAD4 + 0x1C00; + gUnknown_0203AB18[0].size = 0x200; + gUnknown_0203AB18[1].data = gUnknown_0203AAD4 + 0x1E00; + gUnknown_0203AB18[1].size = 0x200; + + gUnknown_0203AB1C = AllocZeroed(sizeof(struct SpriteFrameImage) * 1); + gUnknown_0203AB1C[0].data = gUnknown_0203AAD4 + 0x2000; + gUnknown_0203AB1C[0].size = 640; + + gUnknown_0203AB20 = AllocZeroed(sizeof(struct SpriteFrameImage) * 5); + gUnknown_0203AB20[0].data = gUnknown_0203AAD4 + 0x2280; + gUnknown_0203AB20[0].size = 0x80; + gUnknown_0203AB20[1].data = gUnknown_0203AAD4 + 0x2300; + gUnknown_0203AB20[1].size = 0x80; + gUnknown_0203AB20[2].data = gUnknown_0203AAD4 + 0x2380; + gUnknown_0203AB20[2].size = 0x80; + gUnknown_0203AB20[3].data = gUnknown_0203AAD4 + 0x2400; + gUnknown_0203AB20[3].size = 0x80; + gUnknown_0203AB20[4].data = gUnknown_0203AAD4 + 0x2480; + gUnknown_0203AB20[4].size = 0x80; + + gUnknown_0203AB24 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + gUnknown_0203AB24[0].data = gUnknown_0203AAD4 + 0x2600; + gUnknown_0203AB24[0].size = 0x480; + gUnknown_0203AB24[1].data = gUnknown_0203AAD4 + 10880; + gUnknown_0203AB24[1].size = 0x480; + + gUnknown_0203AB28 = AllocZeroed(sizeof(struct SpriteFrameImage) * 2); + gUnknown_0203AB28[0].data = gUnknown_0203AAD4 + 0x2F00; + gUnknown_0203AB28[0].size = 0x180; + gUnknown_0203AB28[1].data = gUnknown_0203AAD4 + 0x3080; + gUnknown_0203AB28[1].size = 0x180; } const u8 sReelSymbols[][21] = diff --git a/src/smokescreen.c b/src/smokescreen.c index 1119e9e90..9b37cd234 100644 --- a/src/smokescreen.c +++ b/src/smokescreen.c @@ -12,7 +12,7 @@ u8 sub_807521C(s16 x, s16 y, u8 a3) u8 spriteId1, spriteId2, spriteId3, spriteId4; struct Sprite *mainSprite; - if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == INVALID_U16) + if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == 0xFFFF) { LoadCompressedObjectPicUsingHeap(&gUnknown_0831C620); LoadCompressedObjectPaletteUsingHeap(&gUnknown_0831C628); diff --git a/src/sound.c b/src/sound.c index 7798700c3..ba3f659cc 100644 --- a/src/sound.c +++ b/src/sound.c @@ -247,7 +247,7 @@ void FadeInNewBGM(u16 songNum, u8 speed) { if (gDisableMusic) songNum = 0; - if (songNum == INVALID_U16) + if (songNum == 0xFFFF) songNum = 0; m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_BGM); @@ -544,7 +544,7 @@ void PlayBGM(u16 songNum) { if (gDisableMusic) songNum = 0; - if (songNum == INVALID_U16) + if (songNum == 0xFFFF) songNum = 0; m4aSongNumStart(songNum); } diff --git a/src/sprite.c b/src/sprite.c index 3f0223dee..4087dd8c4 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -108,7 +108,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *); 0 \ } -#define ANIM_END INVALID_U16 +#define ANIM_END 0xFFFF #define AFFINE_ANIM_END 0x7FFF // forward declarations @@ -204,7 +204,7 @@ const union AffineAnimCmd * const gDummySpriteAffineAnimTable[] = { &sDummyAffin const struct SpriteTemplate gDummySpriteTemplate = { .tileTag = 0, - .paletteTag = INVALID_U16, + .paletteTag = 0xFFFF, .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, @@ -572,12 +572,12 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); - if (template->tileTag == INVALID_U16) + if (template->tileTag == 0xFFFF) { s16 tileNum; sprite->images = template->images; tileNum = AllocSpriteTiles((u8)(sprite->images->size / TILE_SIZE_4BPP)); - if (tileNum == INVALID_S16) + if (tileNum == -1) { ResetSprite(sprite); return MAX_SPRITES; @@ -595,7 +595,7 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) InitSpriteAffineAnim(sprite); - if (template->paletteTag != INVALID_U16) + if (template->paletteTag != 0xFFFF) sprite->oam.paletteNum = IndexOfSpritePaletteTag(template->paletteTag); return index; @@ -740,7 +740,7 @@ s16 AllocSpriteTiles(u16 tileCount) i++; if (i == TOTAL_OBJ_TILE_COUNT) - return INVALID_S16; + return -1; } start = i; @@ -751,7 +751,7 @@ s16 AllocSpriteTiles(u16 tileCount) i++; if (i == TOTAL_OBJ_TILE_COUNT) - return INVALID_S16; + return -1; if (!SPRITE_TILE_IS_ALLOCATED(i)) numTilesFound++; @@ -877,7 +877,7 @@ void ResetAllSprites(void) void FreeSpriteTiles(struct Sprite *sprite) { - if (sprite->template->tileTag != INVALID_U16) + if (sprite->template->tileTag != 0xFFFF) FreeSpriteTilesByTag(sprite->template->tileTag); } @@ -923,7 +923,7 @@ void BeginAnim(struct Sprite *sprite) sprite->animLoopCounter = 0; imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; - if (imageValue != INVALID_S16) + if (imageValue != -1) { sprite->animBeginning = FALSE; duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; @@ -1441,7 +1441,7 @@ u8 AllocOamMatrix(void) bit <<= 1; } - return INVALID_U8; + return 0xFF; } void FreeOamMatrix(u8 matrixNum) @@ -1462,7 +1462,7 @@ void FreeOamMatrix(u8 matrixNum) void InitSpriteAffineAnim(struct Sprite *sprite) { u8 matrixNum = AllocOamMatrix(); - if (matrixNum != INVALID_U8) + if (matrixNum != 0xFF) { CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); sprite->oam.matrixNum = matrixNum; @@ -1508,7 +1508,7 @@ void LoadSpriteSheets(const struct SpriteSheet *sheets) void FreeSpriteTilesByTag(u16 tag) { u8 index = IndexOfSpriteTileTag(tag); - if (index != INVALID_U8) + if (index != 0xFF) { u16 i; u16 *rangeStarts; @@ -1523,7 +1523,7 @@ void FreeSpriteTilesByTag(u16 tag) for (i = start; i < start + count; i++) FREE_SPRITE_TILE(i); - sSpriteTileRangeTags[index] = INVALID_U16; + sSpriteTileRangeTags[index] = 0xFFFF; } } @@ -1533,7 +1533,7 @@ void FreeSpriteTileRanges(void) for (i = 0; i < MAX_SPRITES; i++) { - sSpriteTileRangeTags[i] = INVALID_U16; + sSpriteTileRangeTags[i] = 0xFFFF; SET_SPRITE_TILE_RANGE(i, 0, 0); } } @@ -1541,8 +1541,8 @@ void FreeSpriteTileRanges(void) u16 GetSpriteTileStartByTag(u16 tag) { u8 index = IndexOfSpriteTileTag(tag); - if (index == INVALID_U8) - return INVALID_U16; + if (index == 0xFF) + return 0xFFFF; return sSpriteTileRanges[index * 2]; } @@ -1554,7 +1554,7 @@ u8 IndexOfSpriteTileTag(u16 tag) if (sSpriteTileRangeTags[i] == tag) return i; - return INVALID_U8; + return 0xFF; } u16 GetSpriteTileTagByTileStart(u16 start) @@ -1563,16 +1563,16 @@ u16 GetSpriteTileTagByTileStart(u16 start) for (i = 0; i < MAX_SPRITES; i++) { - if (sSpriteTileRangeTags[i] != INVALID_U16 && sSpriteTileRanges[i * 2] == start) + if (sSpriteTileRangeTags[i] != 0xFFFF && sSpriteTileRanges[i * 2] == start) return sSpriteTileRangeTags[i]; } - return INVALID_U16; + return 0xFFFF; } void AllocSpriteTileRange(u16 tag, u16 start, u16 count) { - u8 freeIndex = IndexOfSpriteTileTag(INVALID_U16); + u8 freeIndex = IndexOfSpriteTileTag(0xFFFF); sSpriteTileRangeTags[freeIndex] = tag; SET_SPRITE_TILE_RANGE(freeIndex, start, count); } @@ -1582,21 +1582,21 @@ void FreeAllSpritePalettes(void) u8 i; gReservedSpritePaletteCount = 0; for (i = 0; i < 16; i++) - sSpritePaletteTags[i] = INVALID_U16; + sSpritePaletteTags[i] = 0xFFFF; } u8 LoadSpritePalette(const struct SpritePalette *palette) { u8 index = IndexOfSpritePaletteTag(palette->tag); - if (index != INVALID_U8) + if (index != 0xFF) return index; - index = IndexOfSpritePaletteTag(INVALID_U16); + index = IndexOfSpritePaletteTag(0xFFFF); - if (index == INVALID_U8) + if (index == 0xFF) { - return INVALID_U8; + return 0xFF; } else { @@ -1610,7 +1610,7 @@ void LoadSpritePalettes(const struct SpritePalette *palettes) { u8 i; for (i = 0; palettes[i].data != NULL; i++) - if (LoadSpritePalette(&palettes[i]) == INVALID_U8) + if (LoadSpritePalette(&palettes[i]) == 0xFF) break; } @@ -1621,10 +1621,10 @@ void DoLoadSpritePalette(const u16 *src, u16 paletteOffset) u8 AllocSpritePalette(u16 tag) { - u8 index = IndexOfSpritePaletteTag(INVALID_U16); - if (index == INVALID_U8) + u8 index = IndexOfSpritePaletteTag(0xFFFF); + if (index == 0xFF) { - return INVALID_U8; + return 0xFF; } else { @@ -1640,7 +1640,7 @@ u8 IndexOfSpritePaletteTag(u16 tag) if (sSpritePaletteTags[i] == tag) return i; - return INVALID_U8; + return 0xFF; } u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) @@ -1651,8 +1651,8 @@ u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) void FreeSpritePaletteByTag(u16 tag) { u8 index = IndexOfSpritePaletteTag(tag); - if (index != INVALID_U8) - sSpritePaletteTags[index] = INVALID_U16; + if (index != 0xFF) + sSpritePaletteTags[index] = 0xFFFF; } void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables) diff --git a/src/strings.c b/src/strings.c index 5dcf97e2b..dd674d348 100644 --- a/src/strings.c +++ b/src/strings.c @@ -255,25 +255,25 @@ const u8 gText_ThePC[] = _("the PC"); const u8 *const gReturnToXStringsTable[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheShop, - gText_TheField, - gText_TheField, - gText_ThePC, - gText_TheField, - gText_TheField, - gText_TheField, - gText_TheBattle, - gText_ThePC + gText_TheBattle, + gText_ThePokemonList, + gText_TheShop, + gText_TheField, + gText_TheField, + gText_ThePC, + gText_TheField, + gText_TheField, + gText_TheField, + gText_TheBattle, + gText_ThePC }; const u8 *const gReturnToXStringsTable2[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheField + gText_TheBattle, + gText_ThePokemonList, + gText_TheField }; const u8 gText_ReturnToVar1[] = _("Return to\n{STR_VAR_1}."); @@ -286,10 +286,10 @@ const u8 gText_KeyItemsPocket[] = _("KEY ITEMS"); const u8 *const gPocketNamesStringsTable[] = { gText_ItemsPocket, - gText_PokeBallsPocket, - gText_TMHMPocket, - gText_BerriesPocket, - gText_KeyItemsPocket + gText_PokeBallsPocket, + gText_TMHMPocket, + gText_BerriesPocket, + gText_KeyItemsPocket }; const u8 gText_UnkF908Var1Clear7Var2[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}"); diff --git a/src/task.c b/src/task.c index 2a77b8a9b..14b97a361 100644 --- a/src/task.c +++ b/src/task.c @@ -19,7 +19,7 @@ void ResetTasks(void) gTasks[i].func = TaskDummy; gTasks[i].prev = i; gTasks[i].next = i + 1; - gTasks[i].priority = INVALID_S8; + gTasks[i].priority = -1; memset(gTasks[i].data, 0, sizeof(gTasks[i].data)); } @@ -186,7 +186,7 @@ u8 FindTaskIdByFunc(TaskFunc func) if (gTasks[i].isActive == TRUE && gTasks[i].func == func) return (u8)i; - return INVALID_U8; + return 0xFF; } u8 GetTaskCount(void) diff --git a/src/text.c b/src/text.c index 44895722d..07c15596e 100644 --- a/src/text.c +++ b/src/text.c @@ -1877,7 +1877,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) if (func == NULL) return 0; - if (letterSpacing == INVALID_S16) + if (letterSpacing == -1) localLetterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); else localLetterSpacing = letterSpacing; @@ -1953,7 +1953,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) func = GetFontWidthFunc(*++str); if (func == NULL) return 0; - if (letterSpacing == INVALID_S16) + if (letterSpacing == -1) localLetterSpacing = GetFontAttribute(*str, FONTATTR_LETTER_SPACING); break; case 0x11: diff --git a/src/title_screen.c b/src/title_screen.c index 70a1a3449..d60e3fc0b 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -66,14 +66,14 @@ static const u32 sTitleScreenCloudsGfx[] = INCBIN_U32("graphics/title_screen/clo const u16 gUnknown_0853FF70[] = { - 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710, - 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10, - 0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008, - 0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, - 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710, + 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10, + 0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008, + 0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000, + 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, + 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, }; static const struct OamData sVersionBannerLeftOamData = diff --git a/src/trader.c b/src/trader.c index afb0cca48..e23efb4ce 100644 --- a/src/trader.c +++ b/src/trader.c @@ -155,7 +155,7 @@ void ScrSpecial_IsDecorationFull(void) { gSpecialVar_Result = FALSE; if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category - && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == INVALID_S8) + && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == -1) { sub_8127250(gStringVar2, gDecorations[gSpecialVar_0x8004].category); gSpecialVar_Result = TRUE; diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c index fd97623fe..f5354a1e8 100644 --- a/src/trainer_pokemon_sprites.c +++ b/src/trainer_pokemon_sprites.c @@ -107,9 +107,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 { if (!isTrainer) { - if (paletteTag == INVALID_U16) + if (paletteTag == 0xFFFF) { - sCreatingSpriteTemplate.paletteTag |= INVALID_U16; + sCreatingSpriteTemplate.paletteTag |= 0xFFFF; LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20); } else @@ -120,9 +120,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8 } else { - if (paletteTag == INVALID_U16) + if (paletteTag == 0xFFFF) { - sCreatingSpriteTemplate.paletteTag |= INVALID_U16; + sCreatingSpriteTemplate.paletteTag |= 0xFFFF; LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20); } else @@ -166,30 +166,30 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront } if (i == PICS_COUNT) { - return INVALID_U16; + return 0xFFFF; } framePics = Alloc(4 * 0x800); if (!framePics) { - return INVALID_U16; + return 0xFFFF; } images = Alloc(4 * sizeof(struct SpriteFrameImage)); if (!images) { Free(framePics); - return INVALID_U16; + return 0xFFFF; } if (DecompressPic(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys)) { // debug trap? - return INVALID_U16; + return 0xFFFF; } for (j = 0; j < 4; j ++) { images[j].data = framePics + 0x800 * j; images[j].size = 0x800; } - sCreatingSpriteTemplate.tileTag = INVALID_U16; + sCreatingSpriteTemplate.tileTag = 0xFFFF; sCreatingSpriteTemplate.oam = &gUnknown_0860B064; AssignSpriteAnimsTable(isTrainer); sCreatingSpriteTemplate.images = images; @@ -197,7 +197,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront sCreatingSpriteTemplate.callback = DummyPicSpriteCallback; LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer); spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0); - if (paletteTag == INVALID_U16) + if (paletteTag == 0xFFFF) { gSprites[spriteId].oam.paletteNum = paletteSlot; } @@ -232,12 +232,12 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 } if (i == PICS_COUNT) { - return INVALID_U16; + return 0xFFFF; } framePics = Alloc(4 * 0x800); if (!framePics) { - return INVALID_U16; + return 0xFFFF; } if (flags & 0x80) { @@ -252,19 +252,19 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 if (!images) { Free(framePics); - return INVALID_U16; + return 0xFFFF; } if (DecompressPic(species, personality, flags, framePics, FALSE, FALSE)) { // debug trap? - return INVALID_U16; + return 0xFFFF; } for (j = 0; j < 4; j ++) { images[j].data = framePics + 0x800 * j; images[j].size = 0x800; } - sCreatingSpriteTemplate.tileTag = INVALID_U16; + sCreatingSpriteTemplate.tileTag = 0xFFFF; sCreatingSpriteTemplate.anims = gMonAnimationsSpriteAnimsPtrTable[species]; sCreatingSpriteTemplate.images = images; if (flags2 == 0x01) @@ -285,7 +285,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1 sCreatingSpriteTemplate.callback = DummyPicSpriteCallback; LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, FALSE); spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0); - if (paletteTag == INVALID_U16) + if (paletteTag == 0xFFFF) { gSprites[spriteId].oam.paletteNum = paletteSlot; } @@ -312,11 +312,11 @@ static u16 FreeAndDestroyPicSpriteInternal(u16 spriteId) } if (i == PICS_COUNT) { - return INVALID_U16; + return 0xFFFF; } framePics = sSpritePics[i].frames; images = sSpritePics[i].images; - if (sSpritePics[i].paletteTag != INVALID_U16) + if (sSpritePics[i].paletteTag != 0xFFFF) { FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum)); } @@ -331,7 +331,7 @@ static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, { if (DecompressPic_HandleDeoxys(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE)) { - return INVALID_U16; + return 0xFFFF; } LoadPicPaletteBySlot(species, otId, personality, paletteSlot, isTrainer); return 0; @@ -349,7 +349,7 @@ static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, Free(framePics); return 0; } - return INVALID_U16; + return 0xFFFF; } static u16 CreateMonPicSprite(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys) diff --git a/src/trainer_see.c b/src/trainer_see.c index d3d450de4..17781bf4e 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -75,17 +75,17 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = { sub_80B4178, - sub_80B417C, - sub_80B41C0, - sub_80B4200, - sub_80B425C, - sub_80B4318, - sub_80B435C, - sub_80B4390, - sub_80B43AC, - sub_80B43E0, - sub_80B4438, - sub_80B44AC + sub_80B417C, + sub_80B41C0, + sub_80B4200, + sub_80B425C, + sub_80B4318, + sub_80B435C, + sub_80B4390, + sub_80B43AC, + sub_80B43E0, + sub_80B4438, + sub_80B44AC }; static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = diff --git a/src/tv.c b/src/tv.c index 0c5c3f564..f77e93cb7 100644 --- a/src/tv.c +++ b/src/tv.c @@ -799,7 +799,7 @@ u8 special_0x44(void) j --; } } while (j != selIdx); - return INVALID_U8; + return 0xFF; } u8 FindAnyTVShowOnTheAir(void) @@ -807,9 +807,9 @@ u8 FindAnyTVShowOnTheAir(void) u8 response; response = special_0x44(); - if (response == INVALID_U8) + if (response == 0xFF) { - return INVALID_U8; + return 0xFF; } if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE && gSaveBlock1Ptr->tvShows[response].common.kind == TVSHOW_MASS_OUTBREAK) { @@ -833,7 +833,7 @@ void UpdateTVScreensOnMap(int width, int height) { SetTVMetatilesOnMap(width, height, 0x3); } - else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != INVALID_U8 || FindAnyTVNewsOnTheAir() != INVALID_U8 || IsTVShowInSearchOfTrainersAiring())) + else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xFF || FindAnyTVNewsOnTheAir() != 0xFF || IsTVShowInSearchOfTrainersAiring())) { FlagClear(FLAG_SYS_TV_WATCH); SetTVMetatilesOnMap(width, height, 0x3); @@ -887,7 +887,7 @@ u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void) return i; } } - return INVALID_U8; + return 0xFF; } u8 special_0x4a(void) @@ -932,7 +932,7 @@ void GabbyAndTyBeforeInterview(void) gSaveBlock1Ptr->gabbyAndTyData.mon1 = gBattleResults.playerMon1Species; gSaveBlock1Ptr->gabbyAndTyData.mon2 = gBattleResults.playerMon2Species; gSaveBlock1Ptr->gabbyAndTyData.lastMove = gBattleResults.lastUsedMovePlayer; - if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != INVALID_U8) + if (gSaveBlock1Ptr->gabbyAndTyData.battleNum != 0xFF) { gSaveBlock1Ptr->gabbyAndTyData.battleNum ++; } @@ -1007,7 +1007,7 @@ bool8 IsTVShowInSearchOfTrainersAiring(void) bool8 GabbyAndTyGetLastQuote(void) { - if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == INVALID_U16) + if (gSaveBlock1Ptr->gabbyAndTyData.quote[0] == 0xFFFF) { return FALSE; } @@ -1125,7 +1125,7 @@ void PutPokemonTodayCaughtOnAir(void) if (!rbernoulli(1, 1) && StringCompare(gSpeciesNames[gBattleResults.caughtMonSpecies], gBattleResults.caughtMonNick)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_CAUGHT, FALSE) != TRUE) { for (i = 0; i < 11; i ++) { @@ -1206,7 +1206,7 @@ void PutPokemonTodayFailedOnTheAir(void) if (ct > 2 && (gBattleOutcome == B_OUTCOME_MON_FLED || gBattleOutcome == B_OUTCOME_WON)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->pokemonTodayFailed.kind = TVSHOW_POKEMON_TODAY_FAILED; @@ -1282,7 +1282,7 @@ void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlaye u8 name[32]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BATTLE_UPDATE); if (gSpecialVar_Result != 1) @@ -1329,7 +1329,7 @@ bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unus u8 name[32]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == INVALID_S8) + if (sCurTVShowSlot == -1) { return FALSE; } @@ -1396,7 +1396,7 @@ void ContestLiveUpdates_BeforeInterview_1(u8 a0) DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24); sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[24]; show->contestLiveUpdates.round1Rank = a0; @@ -1410,7 +1410,7 @@ void ContestLiveUpdates_BeforeInterview_2(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->contestLiveUpdates.round2Rank = a0; } @@ -1422,7 +1422,7 @@ void ContestLiveUpdates_BeforeInterview_3(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->contestLiveUpdates.appealFlags1 = a0; } @@ -1434,7 +1434,7 @@ void ContestLiveUpdates_BeforeInterview_4(u16 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->contestLiveUpdates.move = a0; } @@ -1446,7 +1446,7 @@ void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->contestLiveUpdates.winningSpecies = gContestMons[a1].species; StringCopy(show->contestLiveUpdates.winningTrainerName, gContestMons[a1].trainerName); @@ -1507,7 +1507,7 @@ void BravoTrainerPokemonProfile_BeforeInterview1(u16 a0) show = &gSaveBlock1Ptr->tvShows[24]; InterviewBefore_BravoTrainerPkmnProfile(); sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { DeleteTVShowInArrayByIdx(gSaveBlock1Ptr->tvShows, 24); show->bravoTrainer.move = a0; @@ -1521,7 +1521,7 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0) show = &gSaveBlock1Ptr->tvShows[24]; sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show->bravoTrainer.contestResult = a0; show->bravoTrainer.contestCategory = gSpecialVar_ContestCategory; @@ -1577,7 +1577,7 @@ void SaveRecordedItemPurchasesForTVShow(void) && !rbernoulli(1, 3)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE) { TV_SortPurchasesByQuantity(); if (gMartPurchaseHistory[0].quantity >= 20) @@ -1742,7 +1742,7 @@ static void sub_80ED718(void) if (!rbernoulli(1, 200)) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { outbreakIdx = Random() % ARRAY_COUNT(sPokeOutbreakSpeciesList); show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; @@ -1843,7 +1843,7 @@ void sub_80ED950(bool8 flag) PutFishingAdviceShowOnTheAir(); } sPokemonAnglerAttemptCounters &= 0xFF; - if (sPokemonAnglerAttemptCounters != INVALID_U8) + if (sPokemonAnglerAttemptCounters != 0xFF) { sPokemonAnglerAttemptCounters += 0x01; } @@ -1855,7 +1855,7 @@ void sub_80ED950(bool8 flag) PutFishingAdviceShowOnTheAir(); } sPokemonAnglerAttemptCounters &= 0xFF00; - if (sPokemonAnglerAttemptCounters >> 8 != INVALID_U8) + if (sPokemonAnglerAttemptCounters >> 8 != 0xFF) { sPokemonAnglerAttemptCounters += 0x0100; } @@ -1867,7 +1867,7 @@ void PutFishingAdviceShowOnTheAir(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FISHING_ADVICE, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->pokemonAngler.kind = TVSHOW_FISHING_ADVICE; @@ -1910,7 +1910,7 @@ void sub_80EDA80(void) if (!rbernoulli(1, 1)) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_WORLD_OF_MASTERS, FALSE) != TRUE) { show2 = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show2->worldOfMasters.kind = TVSHOW_WORLD_OF_MASTERS; @@ -1936,7 +1936,7 @@ void sub_80EDB44(void) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TODAYS_RIVAL_TRAINER, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->rivalTrainer.kind = TVSHOW_TODAYS_RIVAL_TRAINER; @@ -1984,7 +1984,7 @@ void sub_80EDC60(const u16 *words) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREND_WATCHER, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->trendWatcher.kind = TVSHOW_TREND_WATCHER; @@ -2003,7 +2003,7 @@ void sub_80EDCE8(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TREASURE_INVESTIGATORS, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->treasureInvestigators.kind = TVSHOW_TREASURE_INVESTIGATORS; @@ -2024,7 +2024,7 @@ void sub_80EDD78(u16 nCoinsPaidOut) u16 nCoinsWon; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_FIND_THAT_GAMER, FALSE) != TRUE) { flag = FALSE; switch (sFindThatGamerWhichGame) @@ -2207,7 +2207,7 @@ void TV_PutSecretBaseVisitOnTheAir(void) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_VISIT, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->secretBaseVisit.kind = TVSHOW_SECRET_BASE_VISIT; @@ -2227,7 +2227,7 @@ void sub_80EE184(void) u16 balls; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BREAKING_NEWS, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->breakingNews.kind = TVSHOW_BREAKING_NEWS; @@ -2298,7 +2298,7 @@ void sub_80EE2CC(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_LOTTO_WINNER, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->lottoWinner.kind = TVSHOW_LOTTO_WINNER; @@ -2318,7 +2318,7 @@ void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u1 u8 j; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_BATTLE_SEMINAR, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->battleSeminar.kind = TVSHOW_BATTLE_SEMINAR; @@ -2347,7 +2347,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SAFARI_FAN_CLUB, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->safariFanClub.kind = TVSHOW_SAFARI_FAN_CLUB; @@ -2365,7 +2365,7 @@ void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_CUTIES, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->cuties.kind = TVSHOW_CUTIES; @@ -2440,7 +2440,7 @@ void sub_80EE72C(void) TVShow *show; sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE) + if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_TRAINER_FAN_CLUB, FALSE) != TRUE) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->trainerFanClub.kind = TVSHOW_TRAINER_FAN_CLUB; @@ -2456,7 +2456,7 @@ void sub_80EE72C(void) bool8 sub_80EE7C0(void) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == INVALID_S8) + if (sCurTVShowSlot == -1) { return TRUE; } @@ -2493,7 +2493,7 @@ bool8 sub_80EE818(void) } } sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot == INVALID_S8) + if (sCurTVShowSlot == -1) { return FALSE; } @@ -2557,7 +2557,7 @@ void sub_80EEA70(void) if (HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SECRET_BASE_SECRETS, FALSE) != TRUE) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->secretBaseSecrets.kind = TVSHOW_SECRET_BASE_SECRETS; @@ -2608,7 +2608,7 @@ static void sub_80EEBF4(u8 actionIdx) HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_NUMBER_ONE, TRUE); sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot]; show->numberOne.kind = TVSHOW_NUMBER_ONE; @@ -2665,7 +2665,7 @@ static void sub_80EED88(void) if (FlagGet(FLAG_SYS_GAME_CLEAR)) { sCurTVShowSlot = sub_80EEE30(gSaveBlock1Ptr->pokeNews); - if (sCurTVShowSlot != INVALID_S8 && rbernoulli(1, 100) != TRUE) + if (sCurTVShowSlot != -1 && rbernoulli(1, 100) != TRUE) { newsKind = (Random() % 4) + POKENEWS_SLATEPORT; if (sub_80EF0E4(newsKind) != TRUE) @@ -2689,7 +2689,7 @@ s8 sub_80EEE30(PokeNews *pokeNews) return i; } } - return INVALID_S8; + return -1; } void ClearPokemonNews(void) @@ -2742,7 +2742,7 @@ u8 FindAnyTVNewsOnTheAir(void) return i; } } - return INVALID_U8; + return 0xFF; } void DoPokeNews(void) @@ -2751,7 +2751,7 @@ void DoPokeNews(void) u16 n; i = FindAnyTVNewsOnTheAir(); - if (i == INVALID_U8) + if (i == 0xFF) { gSpecialVar_Result = FALSE; } @@ -3252,7 +3252,7 @@ static void sub_80EFA88(void) { sCurTVShowSlot = FindEmptyTVSlotWithinFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows); gSpecialVar_0x8006 = sCurTVShowSlot; - if (sCurTVShowSlot == INVALID_S8) + if (sCurTVShowSlot == -1) { gSpecialVar_Result = TRUE; } @@ -3273,7 +3273,7 @@ s8 FindEmptyTVSlotWithinFirstFiveShowsOfArray(TVShow *shows) return i; } } - return INVALID_S8; + return -1; } s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows) @@ -3287,7 +3287,7 @@ s8 FindEmptyTVSlotBeyondFirstFiveShowsOfArray(TVShow *shows) return i; } } - return INVALID_S8; + return -1; } bool8 TV_BernoulliTrial(u16 ratio) @@ -3310,7 +3310,7 @@ void TV_FanClubLetter_RandomWordToStringVar3(TVShow *show) { i = 0; } - if (show->fanclubLetter.words[i] != INVALID_U16) + if (show->fanclubLetter.words[i] != 0xFFFF) { break; } @@ -3677,7 +3677,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2 sRecordMixingPartnersWithoutShowsToShare = i; } sTVShowMixingCurSlot = sub_80F06D0(argslist[i][0]); - if (sTVShowMixingCurSlot == INVALID_S8) + if (sTVShowMixingCurSlot == -1) { sRecordMixingPartnersWithoutShowsToShare ++; if (sRecordMixingPartnersWithoutShowsToShare == sTVShowMixingNumPlayers) @@ -3690,7 +3690,7 @@ static void sub_80F0358(TVShow player1[25], TVShow player2[25], TVShow player3[2 for (j = 0; j < sTVShowMixingNumPlayers - 1; j ++) { sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(argslist[(i + j + 1) % sTVShowMixingNumPlayers][0]); - if (sCurTVShowSlot != INVALID_S8 + if (sCurTVShowSlot != -1 && sub_80F049C(&argslist[(i + j + 1) % sTVShowMixingNumPlayers][0], &argslist[i][0], (i + j + 1) % sTVShowMixingNumPlayers) == 1) { break; @@ -3801,7 +3801,7 @@ static s8 sub_80F06D0(TVShow *tvShows) return i; } } - return INVALID_S8; + return -1; } #ifdef NONMATCHING @@ -4486,12 +4486,12 @@ static void sub_80F0D60(PokeNews player1[16], PokeNews player2[16], PokeNews pla for (j = 0; j < sTVShowNewsMixingNumPlayers; j ++) { sTVShowMixingCurSlot = sub_80F0ECC(*argslist[j], i); - if (sTVShowMixingCurSlot != INVALID_S8) + if (sTVShowMixingCurSlot != -1) { for (k = 0; k < sTVShowNewsMixingNumPlayers - 1; k++) { sCurTVShowSlot = sub_80EEE30(*argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers]); - if (sCurTVShowSlot != INVALID_S8) + if (sCurTVShowSlot != -1) { sub_80F0E58(argslist[(j + k + 1) % sTVShowNewsMixingNumPlayers], argslist[j]); } @@ -4538,7 +4538,7 @@ static s8 sub_80F0ECC(PokeNews *pokeNews, u8 idx) { if (pokeNews[idx].kind == POKENEWS_NONE) { - return INVALID_S8; + return -1; } return idx; } @@ -7425,7 +7425,7 @@ static void DoTVShowSecretBaseSecrets(void) } break; default: - for (i = 0; i < INVALID_U16; i ++) + for (i = 0; i < 0xFFFF; i ++) { sTVSecretBaseSecretsRandomValues[1] = Random() % bitCount; if (sTVSecretBaseSecretsRandomValues[1] != sTVSecretBaseSecretsRandomValues[0]) @@ -7447,7 +7447,7 @@ static void DoTVShowSecretBaseSecrets(void) } else { - for (i = 0; i < INVALID_U16; i ++) + for (i = 0; i < 0xFFFF; i ++) { sTVSecretBaseSecretsRandomValues[2] = Random() % bitCount; if (sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[0] && sTVSecretBaseSecretsRandomValues[2] != sTVSecretBaseSecretsRandomValues[1]) diff --git a/src/walda_phrase.c b/src/walda_phrase.c index 44da22f31..ff2ee7399 100644 --- a/src/walda_phrase.c +++ b/src/walda_phrase.c @@ -176,7 +176,7 @@ static void sub_81D9C90(u8 *array, s32 arg1, s32 arg2) s32 i, j; u8 var1, var2; - for (i = arg2 - 1; i != INVALID_S32; i--) + for (i = arg2 - 1; i != -1; i--) { var1 = (array[0] & 0x80) >> 7; diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 8fb7d08d6..3a8adaf15 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -43,4554 +43,4554 @@ EWRAM_DATA static u32 sFeebasRngValue = 0; // const rom data const struct WildPokemon gRoute101_LandMons[] = { - {2, 2, SPECIES_WURMPLE}, - {2, 2, SPECIES_POOCHYENA}, - {2, 2, SPECIES_WURMPLE}, - {3, 3, SPECIES_WURMPLE}, - {3, 3, SPECIES_POOCHYENA}, - {3, 3, SPECIES_POOCHYENA}, - {3, 3, SPECIES_WURMPLE}, - {3, 3, SPECIES_POOCHYENA}, - {2, 2, SPECIES_ZIGZAGOON}, - {2, 2, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_ZIGZAGOON}, + {2, 2, SPECIES_WURMPLE}, + {2, 2, SPECIES_POOCHYENA}, + {2, 2, SPECIES_WURMPLE}, + {3, 3, SPECIES_WURMPLE}, + {3, 3, SPECIES_POOCHYENA}, + {3, 3, SPECIES_POOCHYENA}, + {3, 3, SPECIES_WURMPLE}, + {3, 3, SPECIES_POOCHYENA}, + {2, 2, SPECIES_ZIGZAGOON}, + {2, 2, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_ZIGZAGOON}, }; const struct WildPokemonInfo gRoute101_LandMonsInfo = {20, gRoute101_LandMons}; const struct WildPokemon gRoute102_LandMons[] = { - {3, 3, SPECIES_POOCHYENA}, - {3, 3, SPECIES_WURMPLE}, - {4, 4, SPECIES_POOCHYENA}, - {4, 4, SPECIES_WURMPLE}, - {3, 3, SPECIES_LOTAD}, - {4, 4, SPECIES_LOTAD}, - {3, 3, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_ZIGZAGOON}, - {4, 4, SPECIES_ZIGZAGOON}, - {4, 4, SPECIES_RALTS}, - {4, 4, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_SEEDOT}, + {3, 3, SPECIES_POOCHYENA}, + {3, 3, SPECIES_WURMPLE}, + {4, 4, SPECIES_POOCHYENA}, + {4, 4, SPECIES_WURMPLE}, + {3, 3, SPECIES_LOTAD}, + {4, 4, SPECIES_LOTAD}, + {3, 3, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_ZIGZAGOON}, + {4, 4, SPECIES_ZIGZAGOON}, + {4, 4, SPECIES_RALTS}, + {4, 4, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_SEEDOT}, }; const struct WildPokemonInfo gRoute102_LandMonsInfo = {20, gRoute102_LandMons}; const struct WildPokemon gRoute102_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute102_WaterMonsInfo = {4, gRoute102_WaterMons}; const struct WildPokemon gRoute102_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_CORPHISH}, - {25, 30, SPECIES_CORPHISH}, - {30, 35, SPECIES_CORPHISH}, - {20, 25, SPECIES_CORPHISH}, - {35, 40, SPECIES_CORPHISH}, - {40, 45, SPECIES_CORPHISH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_CORPHISH}, + {25, 30, SPECIES_CORPHISH}, + {30, 35, SPECIES_CORPHISH}, + {20, 25, SPECIES_CORPHISH}, + {35, 40, SPECIES_CORPHISH}, + {40, 45, SPECIES_CORPHISH}, }; const struct WildPokemonInfo gRoute102_FishingMonsInfo = {30, gRoute102_FishingMons}; const struct WildPokemon gRoute103_LandMons[] = { - {2, 2, SPECIES_POOCHYENA}, - {3, 3, SPECIES_POOCHYENA}, - {3, 3, SPECIES_POOCHYENA}, - {4, 4, SPECIES_POOCHYENA}, - {2, 2, SPECIES_WINGULL}, - {3, 3, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_ZIGZAGOON}, - {4, 4, SPECIES_ZIGZAGOON}, - {3, 3, SPECIES_WINGULL}, - {3, 3, SPECIES_WINGULL}, - {2, 2, SPECIES_WINGULL}, - {4, 4, SPECIES_WINGULL}, + {2, 2, SPECIES_POOCHYENA}, + {3, 3, SPECIES_POOCHYENA}, + {3, 3, SPECIES_POOCHYENA}, + {4, 4, SPECIES_POOCHYENA}, + {2, 2, SPECIES_WINGULL}, + {3, 3, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_ZIGZAGOON}, + {4, 4, SPECIES_ZIGZAGOON}, + {3, 3, SPECIES_WINGULL}, + {3, 3, SPECIES_WINGULL}, + {2, 2, SPECIES_WINGULL}, + {4, 4, SPECIES_WINGULL}, }; const struct WildPokemonInfo gRoute103_LandMonsInfo = {20, gRoute103_LandMons}; const struct WildPokemon gRoute103_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute103_WaterMonsInfo = {4, gRoute103_WaterMons}; const struct WildPokemon gRoute103_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute103_FishingMonsInfo = {30, gRoute103_FishingMons}; const struct WildPokemon gRoute104_LandMons[] = { - {4, 4, SPECIES_POOCHYENA}, - {4, 4, SPECIES_WURMPLE}, - {5, 5, SPECIES_POOCHYENA}, - {5, 5, SPECIES_MARILL}, - {4, 4, SPECIES_MARILL}, - {5, 5, SPECIES_POOCHYENA}, - {4, 4, SPECIES_TAILLOW}, - {5, 5, SPECIES_TAILLOW}, - {4, 4, SPECIES_WINGULL}, - {4, 4, SPECIES_WINGULL}, - {3, 3, SPECIES_WINGULL}, - {5, 5, SPECIES_WINGULL}, + {4, 4, SPECIES_POOCHYENA}, + {4, 4, SPECIES_WURMPLE}, + {5, 5, SPECIES_POOCHYENA}, + {5, 5, SPECIES_MARILL}, + {4, 4, SPECIES_MARILL}, + {5, 5, SPECIES_POOCHYENA}, + {4, 4, SPECIES_TAILLOW}, + {5, 5, SPECIES_TAILLOW}, + {4, 4, SPECIES_WINGULL}, + {4, 4, SPECIES_WINGULL}, + {3, 3, SPECIES_WINGULL}, + {5, 5, SPECIES_WINGULL}, }; const struct WildPokemonInfo gRoute104_LandMonsInfo = {20, gRoute104_LandMons}; const struct WildPokemon gRoute104_WaterMons[] = { - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute104_WaterMonsInfo = {4, gRoute104_WaterMons}; const struct WildPokemon gRoute104_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {25, 30, SPECIES_MAGIKARP}, - {30, 35, SPECIES_MAGIKARP}, - {20, 25, SPECIES_MAGIKARP}, - {35, 40, SPECIES_MAGIKARP}, - {40, 45, SPECIES_MAGIKARP}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {25, 30, SPECIES_MAGIKARP}, + {30, 35, SPECIES_MAGIKARP}, + {20, 25, SPECIES_MAGIKARP}, + {35, 40, SPECIES_MAGIKARP}, + {40, 45, SPECIES_MAGIKARP}, }; const struct WildPokemonInfo gRoute104_FishingMonsInfo = {30, gRoute104_FishingMons}; const struct WildPokemon gRoute105_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute105_WaterMonsInfo = {4, gRoute105_WaterMons}; const struct WildPokemon gRoute105_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute105_FishingMonsInfo = {30, gRoute105_FishingMons}; const struct WildPokemon gRoute110_LandMons[] = { - {12, 12, SPECIES_POOCHYENA}, - {12, 12, SPECIES_ELECTRIKE}, - {12, 12, SPECIES_GULPIN}, - {13, 13, SPECIES_ELECTRIKE}, - {13, 13, SPECIES_MINUN}, - {13, 13, SPECIES_ODDISH}, - {13, 13, SPECIES_MINUN}, - {13, 13, SPECIES_GULPIN}, - {12, 12, SPECIES_WINGULL}, - {12, 12, SPECIES_WINGULL}, - {12, 12, SPECIES_PLUSLE}, - {13, 13, SPECIES_PLUSLE}, + {12, 12, SPECIES_POOCHYENA}, + {12, 12, SPECIES_ELECTRIKE}, + {12, 12, SPECIES_GULPIN}, + {13, 13, SPECIES_ELECTRIKE}, + {13, 13, SPECIES_MINUN}, + {13, 13, SPECIES_ODDISH}, + {13, 13, SPECIES_MINUN}, + {13, 13, SPECIES_GULPIN}, + {12, 12, SPECIES_WINGULL}, + {12, 12, SPECIES_WINGULL}, + {12, 12, SPECIES_PLUSLE}, + {13, 13, SPECIES_PLUSLE}, }; const struct WildPokemonInfo gRoute110_LandMonsInfo = {20, gRoute110_LandMons}; const struct WildPokemon gRoute110_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute110_WaterMonsInfo = {4, gRoute110_WaterMons}; const struct WildPokemon gRoute110_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute110_FishingMonsInfo = {30, gRoute110_FishingMons}; const struct WildPokemon gRoute111_LandMons[] = { - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {19, 19, SPECIES_BALTOY}, - {21, 21, SPECIES_BALTOY}, - {19, 19, SPECIES_SANDSHREW}, - {19, 19, SPECIES_TRAPINCH}, - {20, 20, SPECIES_BALTOY}, - {20, 20, SPECIES_CACNEA}, - {22, 22, SPECIES_CACNEA}, - {22, 22, SPECIES_CACNEA}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {19, 19, SPECIES_BALTOY}, + {21, 21, SPECIES_BALTOY}, + {19, 19, SPECIES_SANDSHREW}, + {19, 19, SPECIES_TRAPINCH}, + {20, 20, SPECIES_BALTOY}, + {20, 20, SPECIES_CACNEA}, + {22, 22, SPECIES_CACNEA}, + {22, 22, SPECIES_CACNEA}, }; const struct WildPokemonInfo gRoute111_LandMonsInfo = {10, gRoute111_LandMons}; const struct WildPokemon gRoute111_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute111_WaterMonsInfo = {4, gRoute111_WaterMons}; const struct WildPokemon gRoute111_RockSmashMons[] = { - {10, 15, SPECIES_GEODUDE}, - {5, 10, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, + {10, 15, SPECIES_GEODUDE}, + {5, 10, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gRoute111_RockSmashMonsInfo = {20, gRoute111_RockSmashMons}; const struct WildPokemon gRoute111_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {20, 25, SPECIES_BARBOACH}, - {35, 40, SPECIES_BARBOACH}, - {40, 45, SPECIES_BARBOACH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {20, 25, SPECIES_BARBOACH}, + {35, 40, SPECIES_BARBOACH}, + {40, 45, SPECIES_BARBOACH}, }; const struct WildPokemonInfo gRoute111_FishingMonsInfo = {30, gRoute111_FishingMons}; const struct WildPokemon gRoute112_LandMons[] = { - {15, 15, SPECIES_NUMEL}, - {15, 15, SPECIES_NUMEL}, - {15, 15, SPECIES_MARILL}, - {14, 14, SPECIES_NUMEL}, - {14, 14, SPECIES_NUMEL}, - {14, 14, SPECIES_MARILL}, - {16, 16, SPECIES_NUMEL}, - {16, 16, SPECIES_MARILL}, - {16, 16, SPECIES_NUMEL}, - {16, 16, SPECIES_NUMEL}, - {16, 16, SPECIES_NUMEL}, - {16, 16, SPECIES_NUMEL}, + {15, 15, SPECIES_NUMEL}, + {15, 15, SPECIES_NUMEL}, + {15, 15, SPECIES_MARILL}, + {14, 14, SPECIES_NUMEL}, + {14, 14, SPECIES_NUMEL}, + {14, 14, SPECIES_MARILL}, + {16, 16, SPECIES_NUMEL}, + {16, 16, SPECIES_MARILL}, + {16, 16, SPECIES_NUMEL}, + {16, 16, SPECIES_NUMEL}, + {16, 16, SPECIES_NUMEL}, + {16, 16, SPECIES_NUMEL}, }; const struct WildPokemonInfo gRoute112_LandMonsInfo = {20, gRoute112_LandMons}; const struct WildPokemon gRoute113_LandMons[] = { - {15, 15, SPECIES_SPINDA}, - {15, 15, SPECIES_SPINDA}, - {15, 15, SPECIES_SLUGMA}, - {14, 14, SPECIES_SPINDA}, - {14, 14, SPECIES_SPINDA}, - {14, 14, SPECIES_SLUGMA}, - {16, 16, SPECIES_SPINDA}, - {16, 16, SPECIES_SLUGMA}, - {16, 16, SPECIES_SPINDA}, - {16, 16, SPECIES_SKARMORY}, - {16, 16, SPECIES_SPINDA}, - {16, 16, SPECIES_SKARMORY}, + {15, 15, SPECIES_SPINDA}, + {15, 15, SPECIES_SPINDA}, + {15, 15, SPECIES_SLUGMA}, + {14, 14, SPECIES_SPINDA}, + {14, 14, SPECIES_SPINDA}, + {14, 14, SPECIES_SLUGMA}, + {16, 16, SPECIES_SPINDA}, + {16, 16, SPECIES_SLUGMA}, + {16, 16, SPECIES_SPINDA}, + {16, 16, SPECIES_SKARMORY}, + {16, 16, SPECIES_SPINDA}, + {16, 16, SPECIES_SKARMORY}, }; const struct WildPokemonInfo gRoute113_LandMonsInfo = {20, gRoute113_LandMons}; const struct WildPokemon gRoute114_LandMons[] = { - {16, 16, SPECIES_SWABLU}, - {16, 16, SPECIES_LOTAD}, - {17, 17, SPECIES_SWABLU}, - {15, 15, SPECIES_SWABLU}, - {15, 15, SPECIES_LOTAD}, - {16, 16, SPECIES_LOMBRE}, - {16, 16, SPECIES_LOMBRE}, - {18, 18, SPECIES_LOMBRE}, - {17, 17, SPECIES_SEVIPER}, - {15, 15, SPECIES_SEVIPER}, - {17, 17, SPECIES_SEVIPER}, - {15, 15, SPECIES_NUZLEAF}, + {16, 16, SPECIES_SWABLU}, + {16, 16, SPECIES_LOTAD}, + {17, 17, SPECIES_SWABLU}, + {15, 15, SPECIES_SWABLU}, + {15, 15, SPECIES_LOTAD}, + {16, 16, SPECIES_LOMBRE}, + {16, 16, SPECIES_LOMBRE}, + {18, 18, SPECIES_LOMBRE}, + {17, 17, SPECIES_SEVIPER}, + {15, 15, SPECIES_SEVIPER}, + {17, 17, SPECIES_SEVIPER}, + {15, 15, SPECIES_NUZLEAF}, }; const struct WildPokemonInfo gRoute114_LandMonsInfo = {20, gRoute114_LandMons}; const struct WildPokemon gRoute114_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute114_WaterMonsInfo = {4, gRoute114_WaterMons}; const struct WildPokemon gRoute114_RockSmashMons[] = { - {10, 15, SPECIES_GEODUDE}, - {5, 10, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, + {10, 15, SPECIES_GEODUDE}, + {5, 10, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gRoute114_RockSmashMonsInfo = {20, gRoute114_RockSmashMons}; const struct WildPokemon gRoute114_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {20, 25, SPECIES_BARBOACH}, - {35, 40, SPECIES_BARBOACH}, - {40, 45, SPECIES_BARBOACH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {20, 25, SPECIES_BARBOACH}, + {35, 40, SPECIES_BARBOACH}, + {40, 45, SPECIES_BARBOACH}, }; const struct WildPokemonInfo gRoute114_FishingMonsInfo = {30, gRoute114_FishingMons}; const struct WildPokemon gRoute116_LandMons[] = { - {6, 6, SPECIES_POOCHYENA}, - {6, 6, SPECIES_WHISMUR}, - {6, 6, SPECIES_NINCADA}, - {7, 7, SPECIES_ABRA}, - {7, 7, SPECIES_NINCADA}, - {6, 6, SPECIES_TAILLOW}, - {7, 7, SPECIES_TAILLOW}, - {8, 8, SPECIES_TAILLOW}, - {7, 7, SPECIES_POOCHYENA}, - {8, 8, SPECIES_POOCHYENA}, - {7, 7, SPECIES_SKITTY}, - {8, 8, SPECIES_SKITTY}, + {6, 6, SPECIES_POOCHYENA}, + {6, 6, SPECIES_WHISMUR}, + {6, 6, SPECIES_NINCADA}, + {7, 7, SPECIES_ABRA}, + {7, 7, SPECIES_NINCADA}, + {6, 6, SPECIES_TAILLOW}, + {7, 7, SPECIES_TAILLOW}, + {8, 8, SPECIES_TAILLOW}, + {7, 7, SPECIES_POOCHYENA}, + {8, 8, SPECIES_POOCHYENA}, + {7, 7, SPECIES_SKITTY}, + {8, 8, SPECIES_SKITTY}, }; const struct WildPokemonInfo gRoute116_LandMonsInfo = {20, gRoute116_LandMons}; const struct WildPokemon gRoute117_LandMons[] = { - {13, 13, SPECIES_POOCHYENA}, - {13, 13, SPECIES_ODDISH}, - {14, 14, SPECIES_POOCHYENA}, - {14, 14, SPECIES_ODDISH}, - {13, 13, SPECIES_MARILL}, - {13, 13, SPECIES_ODDISH}, - {13, 13, SPECIES_ILLUMISE}, - {13, 13, SPECIES_ILLUMISE}, - {14, 14, SPECIES_ILLUMISE}, - {14, 14, SPECIES_ILLUMISE}, - {13, 13, SPECIES_VOLBEAT}, - {13, 13, SPECIES_SEEDOT}, + {13, 13, SPECIES_POOCHYENA}, + {13, 13, SPECIES_ODDISH}, + {14, 14, SPECIES_POOCHYENA}, + {14, 14, SPECIES_ODDISH}, + {13, 13, SPECIES_MARILL}, + {13, 13, SPECIES_ODDISH}, + {13, 13, SPECIES_ILLUMISE}, + {13, 13, SPECIES_ILLUMISE}, + {14, 14, SPECIES_ILLUMISE}, + {14, 14, SPECIES_ILLUMISE}, + {13, 13, SPECIES_VOLBEAT}, + {13, 13, SPECIES_SEEDOT}, }; const struct WildPokemonInfo gRoute117_LandMonsInfo = {20, gRoute117_LandMons}; const struct WildPokemon gRoute117_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute117_WaterMonsInfo = {4, gRoute117_WaterMons}; const struct WildPokemon gRoute117_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_CORPHISH}, - {25, 30, SPECIES_CORPHISH}, - {30, 35, SPECIES_CORPHISH}, - {20, 25, SPECIES_CORPHISH}, - {35, 40, SPECIES_CORPHISH}, - {40, 45, SPECIES_CORPHISH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_CORPHISH}, + {25, 30, SPECIES_CORPHISH}, + {30, 35, SPECIES_CORPHISH}, + {20, 25, SPECIES_CORPHISH}, + {35, 40, SPECIES_CORPHISH}, + {40, 45, SPECIES_CORPHISH}, }; const struct WildPokemonInfo gRoute117_FishingMonsInfo = {30, gRoute117_FishingMons}; const struct WildPokemon gRoute118_LandMons[] = { - {24, 24, SPECIES_ZIGZAGOON}, - {24, 24, SPECIES_ELECTRIKE}, - {26, 26, SPECIES_ZIGZAGOON}, - {26, 26, SPECIES_ELECTRIKE}, - {26, 26, SPECIES_LINOONE}, - {26, 26, SPECIES_MANECTRIC}, - {25, 25, SPECIES_WINGULL}, - {25, 25, SPECIES_WINGULL}, - {26, 26, SPECIES_WINGULL}, - {26, 26, SPECIES_WINGULL}, - {27, 27, SPECIES_WINGULL}, - {25, 25, SPECIES_KECLEON}, + {24, 24, SPECIES_ZIGZAGOON}, + {24, 24, SPECIES_ELECTRIKE}, + {26, 26, SPECIES_ZIGZAGOON}, + {26, 26, SPECIES_ELECTRIKE}, + {26, 26, SPECIES_LINOONE}, + {26, 26, SPECIES_MANECTRIC}, + {25, 25, SPECIES_WINGULL}, + {25, 25, SPECIES_WINGULL}, + {26, 26, SPECIES_WINGULL}, + {26, 26, SPECIES_WINGULL}, + {27, 27, SPECIES_WINGULL}, + {25, 25, SPECIES_KECLEON}, }; const struct WildPokemonInfo gRoute118_LandMonsInfo = {20, gRoute118_LandMons}; const struct WildPokemon gRoute118_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute118_WaterMonsInfo = {4, gRoute118_WaterMons}; const struct WildPokemon gRoute118_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_CARVANHA}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_CARVANHA}, - {20, 25, SPECIES_CARVANHA}, - {35, 40, SPECIES_CARVANHA}, - {40, 45, SPECIES_CARVANHA}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_CARVANHA}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_CARVANHA}, + {20, 25, SPECIES_CARVANHA}, + {35, 40, SPECIES_CARVANHA}, + {40, 45, SPECIES_CARVANHA}, }; const struct WildPokemonInfo gRoute118_FishingMonsInfo = {30, gRoute118_FishingMons}; const struct WildPokemon gRoute124_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute124_WaterMonsInfo = {4, gRoute124_WaterMons}; const struct WildPokemon gRoute124_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute124_FishingMonsInfo = {30, gRoute124_FishingMons}; const struct WildPokemon gPetalburgWoods_LandMons[] = { - {5, 5, SPECIES_POOCHYENA}, - {5, 5, SPECIES_WURMPLE}, - {5, 5, SPECIES_SHROOMISH}, - {6, 6, SPECIES_POOCHYENA}, - {5, 5, SPECIES_SILCOON}, - {5, 5, SPECIES_CASCOON}, - {6, 6, SPECIES_WURMPLE}, - {6, 6, SPECIES_SHROOMISH}, - {5, 5, SPECIES_TAILLOW}, - {5, 5, SPECIES_SLAKOTH}, - {6, 6, SPECIES_TAILLOW}, - {6, 6, SPECIES_SLAKOTH}, + {5, 5, SPECIES_POOCHYENA}, + {5, 5, SPECIES_WURMPLE}, + {5, 5, SPECIES_SHROOMISH}, + {6, 6, SPECIES_POOCHYENA}, + {5, 5, SPECIES_SILCOON}, + {5, 5, SPECIES_CASCOON}, + {6, 6, SPECIES_WURMPLE}, + {6, 6, SPECIES_SHROOMISH}, + {5, 5, SPECIES_TAILLOW}, + {5, 5, SPECIES_SLAKOTH}, + {6, 6, SPECIES_TAILLOW}, + {6, 6, SPECIES_SLAKOTH}, }; const struct WildPokemonInfo gPetalburgWoods_LandMonsInfo = {20, gPetalburgWoods_LandMons}; const struct WildPokemon gRusturfTunnel_LandMons[] = { - {6, 6, SPECIES_WHISMUR}, - {7, 7, SPECIES_WHISMUR}, - {6, 6, SPECIES_WHISMUR}, - {6, 6, SPECIES_WHISMUR}, - {7, 7, SPECIES_WHISMUR}, - {7, 7, SPECIES_WHISMUR}, - {5, 5, SPECIES_WHISMUR}, - {8, 8, SPECIES_WHISMUR}, - {5, 5, SPECIES_WHISMUR}, - {8, 8, SPECIES_WHISMUR}, - {5, 5, SPECIES_WHISMUR}, - {8, 8, SPECIES_WHISMUR}, + {6, 6, SPECIES_WHISMUR}, + {7, 7, SPECIES_WHISMUR}, + {6, 6, SPECIES_WHISMUR}, + {6, 6, SPECIES_WHISMUR}, + {7, 7, SPECIES_WHISMUR}, + {7, 7, SPECIES_WHISMUR}, + {5, 5, SPECIES_WHISMUR}, + {8, 8, SPECIES_WHISMUR}, + {5, 5, SPECIES_WHISMUR}, + {8, 8, SPECIES_WHISMUR}, + {5, 5, SPECIES_WHISMUR}, + {8, 8, SPECIES_WHISMUR}, }; const struct WildPokemonInfo gRusturfTunnel_LandMonsInfo = {10, gRusturfTunnel_LandMons}; const struct WildPokemon gGraniteCave_1F_LandMons[] = { - {7, 7, SPECIES_ZUBAT}, - {8, 8, SPECIES_MAKUHITA}, - {7, 7, SPECIES_MAKUHITA}, - {8, 8, SPECIES_ZUBAT}, - {9, 9, SPECIES_MAKUHITA}, - {8, 8, SPECIES_ABRA}, - {10, 10, SPECIES_MAKUHITA}, - {6, 6, SPECIES_MAKUHITA}, - {7, 7, SPECIES_GEODUDE}, - {8, 8, SPECIES_GEODUDE}, - {6, 6, SPECIES_GEODUDE}, - {9, 9, SPECIES_GEODUDE}, + {7, 7, SPECIES_ZUBAT}, + {8, 8, SPECIES_MAKUHITA}, + {7, 7, SPECIES_MAKUHITA}, + {8, 8, SPECIES_ZUBAT}, + {9, 9, SPECIES_MAKUHITA}, + {8, 8, SPECIES_ABRA}, + {10, 10, SPECIES_MAKUHITA}, + {6, 6, SPECIES_MAKUHITA}, + {7, 7, SPECIES_GEODUDE}, + {8, 8, SPECIES_GEODUDE}, + {6, 6, SPECIES_GEODUDE}, + {9, 9, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gGraniteCave_1F_LandMonsInfo = {10, gGraniteCave_1F_LandMons}; const struct WildPokemon gGraniteCave_B1F_LandMons[] = { - {9, 9, SPECIES_ZUBAT}, - {10, 10, SPECIES_ARON}, - {9, 9, SPECIES_ARON}, - {11, 11, SPECIES_ARON}, - {10, 10, SPECIES_ZUBAT}, - {9, 9, SPECIES_ABRA}, - {10, 10, SPECIES_MAKUHITA}, - {11, 11, SPECIES_MAKUHITA}, - {10, 10, SPECIES_SABLEYE}, - {10, 10, SPECIES_SABLEYE}, - {9, 9, SPECIES_SABLEYE}, - {11, 11, SPECIES_SABLEYE}, + {9, 9, SPECIES_ZUBAT}, + {10, 10, SPECIES_ARON}, + {9, 9, SPECIES_ARON}, + {11, 11, SPECIES_ARON}, + {10, 10, SPECIES_ZUBAT}, + {9, 9, SPECIES_ABRA}, + {10, 10, SPECIES_MAKUHITA}, + {11, 11, SPECIES_MAKUHITA}, + {10, 10, SPECIES_SABLEYE}, + {10, 10, SPECIES_SABLEYE}, + {9, 9, SPECIES_SABLEYE}, + {11, 11, SPECIES_SABLEYE}, }; const struct WildPokemonInfo gGraniteCave_B1F_LandMonsInfo = {10, gGraniteCave_B1F_LandMons}; const struct WildPokemon gMtPyre_1F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, }; const struct WildPokemonInfo gMtPyre_1F_LandMonsInfo = {10, gMtPyre_1F_LandMons}; const struct WildPokemon gVictoryRoad_1F_LandMons[] = { - {40, 40, SPECIES_GOLBAT}, - {40, 40, SPECIES_HARIYAMA}, - {40, 40, SPECIES_LAIRON}, - {40, 40, SPECIES_LOUDRED}, - {36, 36, SPECIES_ZUBAT}, - {36, 36, SPECIES_MAKUHITA}, - {38, 38, SPECIES_GOLBAT}, - {38, 38, SPECIES_HARIYAMA}, - {36, 36, SPECIES_ARON}, - {36, 36, SPECIES_WHISMUR}, - {36, 36, SPECIES_ARON}, - {36, 36, SPECIES_WHISMUR}, + {40, 40, SPECIES_GOLBAT}, + {40, 40, SPECIES_HARIYAMA}, + {40, 40, SPECIES_LAIRON}, + {40, 40, SPECIES_LOUDRED}, + {36, 36, SPECIES_ZUBAT}, + {36, 36, SPECIES_MAKUHITA}, + {38, 38, SPECIES_GOLBAT}, + {38, 38, SPECIES_HARIYAMA}, + {36, 36, SPECIES_ARON}, + {36, 36, SPECIES_WHISMUR}, + {36, 36, SPECIES_ARON}, + {36, 36, SPECIES_WHISMUR}, }; const struct WildPokemonInfo gVictoryRoad_1F_LandMonsInfo = {10, gVictoryRoad_1F_LandMons}; const struct WildPokemon gSafariZone_South_LandMons[] = { - {25, 25, SPECIES_ODDISH}, - {27, 27, SPECIES_ODDISH}, - {25, 25, SPECIES_GIRAFARIG}, - {27, 27, SPECIES_GIRAFARIG}, - {25, 25, SPECIES_NATU}, - {25, 25, SPECIES_DODUO}, - {25, 25, SPECIES_GLOOM}, - {27, 27, SPECIES_WOBBUFFET}, - {25, 25, SPECIES_PIKACHU}, - {27, 27, SPECIES_WOBBUFFET}, - {27, 27, SPECIES_PIKACHU}, - {29, 29, SPECIES_WOBBUFFET}, + {25, 25, SPECIES_ODDISH}, + {27, 27, SPECIES_ODDISH}, + {25, 25, SPECIES_GIRAFARIG}, + {27, 27, SPECIES_GIRAFARIG}, + {25, 25, SPECIES_NATU}, + {25, 25, SPECIES_DODUO}, + {25, 25, SPECIES_GLOOM}, + {27, 27, SPECIES_WOBBUFFET}, + {25, 25, SPECIES_PIKACHU}, + {27, 27, SPECIES_WOBBUFFET}, + {27, 27, SPECIES_PIKACHU}, + {29, 29, SPECIES_WOBBUFFET}, }; const struct WildPokemonInfo gSafariZone_South_LandMonsInfo = {25, gSafariZone_South_LandMons}; const struct WildPokemon gUnderwater2_WaterMons[] = { - {20, 30, SPECIES_CLAMPERL}, - {20, 30, SPECIES_CHINCHOU}, - {30, 35, SPECIES_CLAMPERL}, - {30, 35, SPECIES_RELICANTH}, - {30, 35, SPECIES_RELICANTH}, + {20, 30, SPECIES_CLAMPERL}, + {20, 30, SPECIES_CHINCHOU}, + {30, 35, SPECIES_CLAMPERL}, + {30, 35, SPECIES_RELICANTH}, + {30, 35, SPECIES_RELICANTH}, }; const struct WildPokemonInfo gUnderwater2_WaterMonsInfo = {4, gUnderwater2_WaterMons}; const struct WildPokemon gAbandonedShip_Rooms_B1F_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACRUEL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACRUEL}, }; const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_WaterMonsInfo = {4, gAbandonedShip_Rooms_B1F_WaterMons}; const struct WildPokemon gAbandonedShip_Rooms_B1F_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_TENTACOOL}, - {25, 30, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACRUEL}, - {25, 30, SPECIES_TENTACRUEL}, - {20, 25, SPECIES_TENTACRUEL}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_TENTACOOL}, + {25, 30, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACRUEL}, + {25, 30, SPECIES_TENTACRUEL}, + {20, 25, SPECIES_TENTACRUEL}, }; const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_FishingMonsInfo = {20, gAbandonedShip_Rooms_B1F_FishingMons}; const struct WildPokemon gGraniteCave_B2F_LandMons[] = { - {10, 10, SPECIES_ZUBAT}, - {11, 11, SPECIES_ARON}, - {10, 10, SPECIES_ARON}, - {11, 11, SPECIES_ZUBAT}, - {12, 12, SPECIES_ARON}, - {10, 10, SPECIES_ABRA}, - {10, 10, SPECIES_SABLEYE}, - {11, 11, SPECIES_SABLEYE}, - {12, 12, SPECIES_SABLEYE}, - {10, 10, SPECIES_SABLEYE}, - {12, 12, SPECIES_SABLEYE}, - {10, 10, SPECIES_SABLEYE}, + {10, 10, SPECIES_ZUBAT}, + {11, 11, SPECIES_ARON}, + {10, 10, SPECIES_ARON}, + {11, 11, SPECIES_ZUBAT}, + {12, 12, SPECIES_ARON}, + {10, 10, SPECIES_ABRA}, + {10, 10, SPECIES_SABLEYE}, + {11, 11, SPECIES_SABLEYE}, + {12, 12, SPECIES_SABLEYE}, + {10, 10, SPECIES_SABLEYE}, + {12, 12, SPECIES_SABLEYE}, + {10, 10, SPECIES_SABLEYE}, }; const struct WildPokemonInfo gGraniteCave_B2F_LandMonsInfo = {10, gGraniteCave_B2F_LandMons}; const struct WildPokemon gGraniteCave_B2F_RockSmashMons[] = { - {10, 15, SPECIES_GEODUDE}, - {10, 20, SPECIES_NOSEPASS}, - {5, 10, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, + {10, 15, SPECIES_GEODUDE}, + {10, 20, SPECIES_NOSEPASS}, + {5, 10, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gGraniteCave_B2F_RockSmashMonsInfo = {20, gGraniteCave_B2F_RockSmashMons}; const struct WildPokemon gFieryPath_LandMons[] = { - {15, 15, SPECIES_NUMEL}, - {15, 15, SPECIES_KOFFING}, - {16, 16, SPECIES_NUMEL}, - {15, 15, SPECIES_MACHOP}, - {15, 15, SPECIES_TORKOAL}, - {15, 15, SPECIES_SLUGMA}, - {16, 16, SPECIES_KOFFING}, - {16, 16, SPECIES_MACHOP}, - {14, 14, SPECIES_TORKOAL}, - {16, 16, SPECIES_TORKOAL}, - {14, 14, SPECIES_GRIMER}, - {14, 14, SPECIES_GRIMER}, + {15, 15, SPECIES_NUMEL}, + {15, 15, SPECIES_KOFFING}, + {16, 16, SPECIES_NUMEL}, + {15, 15, SPECIES_MACHOP}, + {15, 15, SPECIES_TORKOAL}, + {15, 15, SPECIES_SLUGMA}, + {16, 16, SPECIES_KOFFING}, + {16, 16, SPECIES_MACHOP}, + {14, 14, SPECIES_TORKOAL}, + {16, 16, SPECIES_TORKOAL}, + {14, 14, SPECIES_GRIMER}, + {14, 14, SPECIES_GRIMER}, }; const struct WildPokemonInfo gFieryPath_LandMonsInfo = {10, gFieryPath_LandMons}; const struct WildPokemon gMeteorFalls_B1F_2R_LandMons[] = { - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {30, 30, SPECIES_BAGON}, - {35, 35, SPECIES_SOLROCK}, - {35, 35, SPECIES_BAGON}, - {37, 37, SPECIES_SOLROCK}, - {25, 25, SPECIES_BAGON}, - {39, 39, SPECIES_SOLROCK}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {30, 30, SPECIES_BAGON}, + {35, 35, SPECIES_SOLROCK}, + {35, 35, SPECIES_BAGON}, + {37, 37, SPECIES_SOLROCK}, + {25, 25, SPECIES_BAGON}, + {39, 39, SPECIES_SOLROCK}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gMeteorFalls_B1F_2R_LandMonsInfo = {10, gMeteorFalls_B1F_2R_LandMons}; const struct WildPokemon gMeteorFalls_B1F_2R_WaterMons[] = { - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, - {25, 35, SPECIES_SOLROCK}, - {15, 25, SPECIES_SOLROCK}, - {5, 15, SPECIES_SOLROCK}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, + {25, 35, SPECIES_SOLROCK}, + {15, 25, SPECIES_SOLROCK}, + {5, 15, SPECIES_SOLROCK}, }; const struct WildPokemonInfo gMeteorFalls_B1F_2R_WaterMonsInfo = {4, gMeteorFalls_B1F_2R_WaterMons}; const struct WildPokemon gMeteorFalls_B1F_2R_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {30, 35, SPECIES_WHISCASH}, - {35, 40, SPECIES_WHISCASH}, - {40, 45, SPECIES_WHISCASH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {30, 35, SPECIES_WHISCASH}, + {35, 40, SPECIES_WHISCASH}, + {40, 45, SPECIES_WHISCASH}, }; const struct WildPokemonInfo gMeteorFalls_B1F_2R_FishingMonsInfo = {30, gMeteorFalls_B1F_2R_FishingMons}; const struct WildPokemon gJaggedPass_LandMons[] = { - {21, 21, SPECIES_NUMEL}, - {21, 21, SPECIES_NUMEL}, - {21, 21, SPECIES_MACHOP}, - {20, 20, SPECIES_NUMEL}, - {20, 20, SPECIES_SPOINK}, - {20, 20, SPECIES_MACHOP}, - {21, 21, SPECIES_SPOINK}, - {22, 22, SPECIES_MACHOP}, - {22, 22, SPECIES_NUMEL}, - {22, 22, SPECIES_SPOINK}, - {22, 22, SPECIES_NUMEL}, - {22, 22, SPECIES_SPOINK}, + {21, 21, SPECIES_NUMEL}, + {21, 21, SPECIES_NUMEL}, + {21, 21, SPECIES_MACHOP}, + {20, 20, SPECIES_NUMEL}, + {20, 20, SPECIES_SPOINK}, + {20, 20, SPECIES_MACHOP}, + {21, 21, SPECIES_SPOINK}, + {22, 22, SPECIES_MACHOP}, + {22, 22, SPECIES_NUMEL}, + {22, 22, SPECIES_SPOINK}, + {22, 22, SPECIES_NUMEL}, + {22, 22, SPECIES_SPOINK}, }; const struct WildPokemonInfo gJaggedPass_LandMonsInfo = {20, gJaggedPass_LandMons}; const struct WildPokemon gRoute106_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute106_WaterMonsInfo = {4, gRoute106_WaterMons}; const struct WildPokemon gRoute106_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute106_FishingMonsInfo = {30, gRoute106_FishingMons}; const struct WildPokemon gRoute107_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute107_WaterMonsInfo = {4, gRoute107_WaterMons}; const struct WildPokemon gRoute107_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute107_FishingMonsInfo = {30, gRoute107_FishingMons}; const struct WildPokemon gRoute108_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute108_WaterMonsInfo = {4, gRoute108_WaterMons}; const struct WildPokemon gRoute108_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute108_FishingMonsInfo = {30, gRoute108_FishingMons}; const struct WildPokemon gRoute109_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute109_WaterMonsInfo = {4, gRoute109_WaterMons}; const struct WildPokemon gRoute109_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute109_FishingMonsInfo = {30, gRoute109_FishingMons}; const struct WildPokemon gRoute115_LandMons[] = { - {23, 23, SPECIES_SWABLU}, - {23, 23, SPECIES_TAILLOW}, - {25, 25, SPECIES_SWABLU}, - {24, 24, SPECIES_TAILLOW}, - {25, 25, SPECIES_TAILLOW}, - {25, 25, SPECIES_SWELLOW}, - {24, 24, SPECIES_JIGGLYPUFF}, - {25, 25, SPECIES_JIGGLYPUFF}, - {24, 24, SPECIES_WINGULL}, - {24, 24, SPECIES_WINGULL}, - {26, 26, SPECIES_WINGULL}, - {25, 25, SPECIES_WINGULL}, + {23, 23, SPECIES_SWABLU}, + {23, 23, SPECIES_TAILLOW}, + {25, 25, SPECIES_SWABLU}, + {24, 24, SPECIES_TAILLOW}, + {25, 25, SPECIES_TAILLOW}, + {25, 25, SPECIES_SWELLOW}, + {24, 24, SPECIES_JIGGLYPUFF}, + {25, 25, SPECIES_JIGGLYPUFF}, + {24, 24, SPECIES_WINGULL}, + {24, 24, SPECIES_WINGULL}, + {26, 26, SPECIES_WINGULL}, + {25, 25, SPECIES_WINGULL}, }; const struct WildPokemonInfo gRoute115_LandMonsInfo = {20, gRoute115_LandMons}; const struct WildPokemon gRoute115_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute115_WaterMonsInfo = {4, gRoute115_WaterMons}; const struct WildPokemon gRoute115_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute115_FishingMonsInfo = {30, gRoute115_FishingMons}; const struct WildPokemon gNewMauville_Inside_LandMons[] = { - {24, 24, SPECIES_VOLTORB}, - {24, 24, SPECIES_MAGNEMITE}, - {25, 25, SPECIES_VOLTORB}, - {25, 25, SPECIES_MAGNEMITE}, - {23, 23, SPECIES_VOLTORB}, - {23, 23, SPECIES_MAGNEMITE}, - {26, 26, SPECIES_VOLTORB}, - {26, 26, SPECIES_MAGNEMITE}, - {22, 22, SPECIES_VOLTORB}, - {22, 22, SPECIES_MAGNEMITE}, - {26, 26, SPECIES_ELECTRODE}, - {26, 26, SPECIES_MAGNETON}, + {24, 24, SPECIES_VOLTORB}, + {24, 24, SPECIES_MAGNEMITE}, + {25, 25, SPECIES_VOLTORB}, + {25, 25, SPECIES_MAGNEMITE}, + {23, 23, SPECIES_VOLTORB}, + {23, 23, SPECIES_MAGNEMITE}, + {26, 26, SPECIES_VOLTORB}, + {26, 26, SPECIES_MAGNEMITE}, + {22, 22, SPECIES_VOLTORB}, + {22, 22, SPECIES_MAGNEMITE}, + {26, 26, SPECIES_ELECTRODE}, + {26, 26, SPECIES_MAGNETON}, }; const struct WildPokemonInfo gNewMauville_Inside_LandMonsInfo = {10, gNewMauville_Inside_LandMons}; const struct WildPokemon gRoute119_LandMons[] = { - {25, 25, SPECIES_ZIGZAGOON}, - {25, 25, SPECIES_LINOONE}, - {27, 27, SPECIES_ZIGZAGOON}, - {25, 25, SPECIES_ODDISH}, - {27, 27, SPECIES_LINOONE}, - {26, 26, SPECIES_ODDISH}, - {27, 27, SPECIES_ODDISH}, - {24, 24, SPECIES_ODDISH}, - {25, 25, SPECIES_TROPIUS}, - {26, 26, SPECIES_TROPIUS}, - {27, 27, SPECIES_TROPIUS}, - {25, 25, SPECIES_KECLEON}, + {25, 25, SPECIES_ZIGZAGOON}, + {25, 25, SPECIES_LINOONE}, + {27, 27, SPECIES_ZIGZAGOON}, + {25, 25, SPECIES_ODDISH}, + {27, 27, SPECIES_LINOONE}, + {26, 26, SPECIES_ODDISH}, + {27, 27, SPECIES_ODDISH}, + {24, 24, SPECIES_ODDISH}, + {25, 25, SPECIES_TROPIUS}, + {26, 26, SPECIES_TROPIUS}, + {27, 27, SPECIES_TROPIUS}, + {25, 25, SPECIES_KECLEON}, }; const struct WildPokemonInfo gRoute119_LandMonsInfo = {15, gRoute119_LandMons}; const struct WildPokemon gRoute119_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute119_WaterMonsInfo = {4, gRoute119_WaterMons}; const struct WildPokemon gRoute119_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_CARVANHA}, - {25, 30, SPECIES_CARVANHA}, - {30, 35, SPECIES_CARVANHA}, - {20, 25, SPECIES_CARVANHA}, - {35, 40, SPECIES_CARVANHA}, - {40, 45, SPECIES_CARVANHA}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_CARVANHA}, + {25, 30, SPECIES_CARVANHA}, + {30, 35, SPECIES_CARVANHA}, + {20, 25, SPECIES_CARVANHA}, + {35, 40, SPECIES_CARVANHA}, + {40, 45, SPECIES_CARVANHA}, }; const struct WildPokemonInfo gRoute119_FishingMonsInfo = {30, gRoute119_FishingMons}; const struct WildPokemon gRoute120_LandMons[] = { - {25, 25, SPECIES_POOCHYENA}, - {25, 25, SPECIES_MIGHTYENA}, - {27, 27, SPECIES_MIGHTYENA}, - {25, 25, SPECIES_ODDISH}, - {25, 25, SPECIES_MARILL}, - {26, 26, SPECIES_ODDISH}, - {27, 27, SPECIES_ODDISH}, - {27, 27, SPECIES_MARILL}, - {25, 25, SPECIES_ABSOL}, - {27, 27, SPECIES_ABSOL}, - {25, 25, SPECIES_KECLEON}, - {25, 25, SPECIES_SEEDOT}, + {25, 25, SPECIES_POOCHYENA}, + {25, 25, SPECIES_MIGHTYENA}, + {27, 27, SPECIES_MIGHTYENA}, + {25, 25, SPECIES_ODDISH}, + {25, 25, SPECIES_MARILL}, + {26, 26, SPECIES_ODDISH}, + {27, 27, SPECIES_ODDISH}, + {27, 27, SPECIES_MARILL}, + {25, 25, SPECIES_ABSOL}, + {27, 27, SPECIES_ABSOL}, + {25, 25, SPECIES_KECLEON}, + {25, 25, SPECIES_SEEDOT}, }; const struct WildPokemonInfo gRoute120_LandMonsInfo = {20, gRoute120_LandMons}; const struct WildPokemon gRoute120_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {20, 30, SPECIES_GOLDEEN}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_GOLDEEN}, }; const struct WildPokemonInfo gRoute120_WaterMonsInfo = {4, gRoute120_WaterMons}; const struct WildPokemon gRoute120_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {20, 25, SPECIES_BARBOACH}, - {35, 40, SPECIES_BARBOACH}, - {40, 45, SPECIES_BARBOACH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {20, 25, SPECIES_BARBOACH}, + {35, 40, SPECIES_BARBOACH}, + {40, 45, SPECIES_BARBOACH}, }; const struct WildPokemonInfo gRoute120_FishingMonsInfo = {30, gRoute120_FishingMons}; const struct WildPokemon gRoute121_LandMons[] = { - {26, 26, SPECIES_POOCHYENA}, - {26, 26, SPECIES_SHUPPET}, - {26, 26, SPECIES_MIGHTYENA}, - {28, 28, SPECIES_SHUPPET}, - {28, 28, SPECIES_MIGHTYENA}, - {26, 26, SPECIES_ODDISH}, - {28, 28, SPECIES_ODDISH}, - {28, 28, SPECIES_GLOOM}, - {26, 26, SPECIES_WINGULL}, - {27, 27, SPECIES_WINGULL}, - {28, 28, SPECIES_WINGULL}, - {25, 25, SPECIES_KECLEON}, + {26, 26, SPECIES_POOCHYENA}, + {26, 26, SPECIES_SHUPPET}, + {26, 26, SPECIES_MIGHTYENA}, + {28, 28, SPECIES_SHUPPET}, + {28, 28, SPECIES_MIGHTYENA}, + {26, 26, SPECIES_ODDISH}, + {28, 28, SPECIES_ODDISH}, + {28, 28, SPECIES_GLOOM}, + {26, 26, SPECIES_WINGULL}, + {27, 27, SPECIES_WINGULL}, + {28, 28, SPECIES_WINGULL}, + {25, 25, SPECIES_KECLEON}, }; const struct WildPokemonInfo gRoute121_LandMonsInfo = {20, gRoute121_LandMons}; const struct WildPokemon gRoute121_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute121_WaterMonsInfo = {4, gRoute121_WaterMons}; const struct WildPokemon gRoute121_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute121_FishingMonsInfo = {30, gRoute121_FishingMons}; const struct WildPokemon gRoute122_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute122_WaterMonsInfo = {4, gRoute122_WaterMons}; const struct WildPokemon gRoute122_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute122_FishingMonsInfo = {30, gRoute122_FishingMons}; const struct WildPokemon gRoute123_LandMons[] = { - {26, 26, SPECIES_POOCHYENA}, - {26, 26, SPECIES_SHUPPET}, - {26, 26, SPECIES_MIGHTYENA}, - {28, 28, SPECIES_SHUPPET}, - {28, 28, SPECIES_MIGHTYENA}, - {26, 26, SPECIES_ODDISH}, - {28, 28, SPECIES_ODDISH}, - {28, 28, SPECIES_GLOOM}, - {26, 26, SPECIES_WINGULL}, - {27, 27, SPECIES_WINGULL}, - {28, 28, SPECIES_WINGULL}, - {25, 25, SPECIES_KECLEON}, + {26, 26, SPECIES_POOCHYENA}, + {26, 26, SPECIES_SHUPPET}, + {26, 26, SPECIES_MIGHTYENA}, + {28, 28, SPECIES_SHUPPET}, + {28, 28, SPECIES_MIGHTYENA}, + {26, 26, SPECIES_ODDISH}, + {28, 28, SPECIES_ODDISH}, + {28, 28, SPECIES_GLOOM}, + {26, 26, SPECIES_WINGULL}, + {27, 27, SPECIES_WINGULL}, + {28, 28, SPECIES_WINGULL}, + {25, 25, SPECIES_KECLEON}, }; const struct WildPokemonInfo gRoute123_LandMonsInfo = {20, gRoute123_LandMons}; const struct WildPokemon gRoute123_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute123_WaterMonsInfo = {4, gRoute123_WaterMons}; const struct WildPokemon gRoute123_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute123_FishingMonsInfo = {30, gRoute123_FishingMons}; const struct WildPokemon gMtPyre_2F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, }; const struct WildPokemonInfo gMtPyre_2F_LandMonsInfo = {10, gMtPyre_2F_LandMons}; const struct WildPokemon gMtPyre_3F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, }; const struct WildPokemonInfo gMtPyre_3F_LandMonsInfo = {10, gMtPyre_3F_LandMons}; const struct WildPokemon gMtPyre_4F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {27, 27, SPECIES_DUSKULL}, - {27, 27, SPECIES_DUSKULL}, - {25, 25, SPECIES_DUSKULL}, - {29, 29, SPECIES_DUSKULL}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {27, 27, SPECIES_DUSKULL}, + {27, 27, SPECIES_DUSKULL}, + {25, 25, SPECIES_DUSKULL}, + {29, 29, SPECIES_DUSKULL}, }; const struct WildPokemonInfo gMtPyre_4F_LandMonsInfo = {10, gMtPyre_4F_LandMons}; const struct WildPokemon gMtPyre_5F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {27, 27, SPECIES_DUSKULL}, - {27, 27, SPECIES_DUSKULL}, - {25, 25, SPECIES_DUSKULL}, - {29, 29, SPECIES_DUSKULL}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {27, 27, SPECIES_DUSKULL}, + {27, 27, SPECIES_DUSKULL}, + {25, 25, SPECIES_DUSKULL}, + {29, 29, SPECIES_DUSKULL}, }; const struct WildPokemonInfo gMtPyre_5F_LandMonsInfo = {10, gMtPyre_5F_LandMons}; const struct WildPokemon gMtPyre_6F_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {23, 23, SPECIES_SHUPPET}, - {22, 22, SPECIES_SHUPPET}, - {27, 27, SPECIES_DUSKULL}, - {27, 27, SPECIES_DUSKULL}, - {25, 25, SPECIES_DUSKULL}, - {29, 29, SPECIES_DUSKULL}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {23, 23, SPECIES_SHUPPET}, + {22, 22, SPECIES_SHUPPET}, + {27, 27, SPECIES_DUSKULL}, + {27, 27, SPECIES_DUSKULL}, + {25, 25, SPECIES_DUSKULL}, + {29, 29, SPECIES_DUSKULL}, }; const struct WildPokemonInfo gMtPyre_6F_LandMonsInfo = {10, gMtPyre_6F_LandMons}; const struct WildPokemon gMtPyre_Exterior_LandMons[] = { - {27, 27, SPECIES_SHUPPET}, - {27, 27, SPECIES_SHUPPET}, - {28, 28, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {29, 29, SPECIES_VULPIX}, - {27, 27, SPECIES_VULPIX}, - {29, 29, SPECIES_VULPIX}, - {25, 25, SPECIES_VULPIX}, - {27, 27, SPECIES_WINGULL}, - {27, 27, SPECIES_WINGULL}, - {26, 26, SPECIES_WINGULL}, - {28, 28, SPECIES_WINGULL}, + {27, 27, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {28, 28, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {29, 29, SPECIES_VULPIX}, + {27, 27, SPECIES_VULPIX}, + {29, 29, SPECIES_VULPIX}, + {25, 25, SPECIES_VULPIX}, + {27, 27, SPECIES_WINGULL}, + {27, 27, SPECIES_WINGULL}, + {26, 26, SPECIES_WINGULL}, + {28, 28, SPECIES_WINGULL}, }; const struct WildPokemonInfo gMtPyre_Exterior_LandMonsInfo = {10, gMtPyre_Exterior_LandMons}; const struct WildPokemon gMtPyre_Summit_LandMons[] = { - {28, 28, SPECIES_SHUPPET}, - {29, 29, SPECIES_SHUPPET}, - {27, 27, SPECIES_SHUPPET}, - {26, 26, SPECIES_SHUPPET}, - {30, 30, SPECIES_SHUPPET}, - {25, 25, SPECIES_SHUPPET}, - {24, 24, SPECIES_SHUPPET}, - {28, 28, SPECIES_DUSKULL}, - {26, 26, SPECIES_DUSKULL}, - {30, 30, SPECIES_DUSKULL}, - {28, 28, SPECIES_CHIMECHO}, - {28, 28, SPECIES_CHIMECHO}, + {28, 28, SPECIES_SHUPPET}, + {29, 29, SPECIES_SHUPPET}, + {27, 27, SPECIES_SHUPPET}, + {26, 26, SPECIES_SHUPPET}, + {30, 30, SPECIES_SHUPPET}, + {25, 25, SPECIES_SHUPPET}, + {24, 24, SPECIES_SHUPPET}, + {28, 28, SPECIES_DUSKULL}, + {26, 26, SPECIES_DUSKULL}, + {30, 30, SPECIES_DUSKULL}, + {28, 28, SPECIES_CHIMECHO}, + {28, 28, SPECIES_CHIMECHO}, }; const struct WildPokemonInfo gMtPyre_Summit_LandMonsInfo = {10, gMtPyre_Summit_LandMons}; const struct WildPokemon gGraniteCave_StevensRoom_LandMons[] = { - {7, 7, SPECIES_ZUBAT}, - {8, 8, SPECIES_MAKUHITA}, - {7, 7, SPECIES_MAKUHITA}, - {8, 8, SPECIES_ZUBAT}, - {9, 9, SPECIES_MAKUHITA}, - {8, 8, SPECIES_ABRA}, - {10, 10, SPECIES_MAKUHITA}, - {6, 6, SPECIES_MAKUHITA}, - {7, 7, SPECIES_ARON}, - {8, 8, SPECIES_ARON}, - {7, 7, SPECIES_ARON}, - {8, 8, SPECIES_ARON}, + {7, 7, SPECIES_ZUBAT}, + {8, 8, SPECIES_MAKUHITA}, + {7, 7, SPECIES_MAKUHITA}, + {8, 8, SPECIES_ZUBAT}, + {9, 9, SPECIES_MAKUHITA}, + {8, 8, SPECIES_ABRA}, + {10, 10, SPECIES_MAKUHITA}, + {6, 6, SPECIES_MAKUHITA}, + {7, 7, SPECIES_ARON}, + {8, 8, SPECIES_ARON}, + {7, 7, SPECIES_ARON}, + {8, 8, SPECIES_ARON}, }; const struct WildPokemonInfo gGraniteCave_StevensRoom_LandMonsInfo = {10, gGraniteCave_StevensRoom_LandMons}; const struct WildPokemon gRoute125_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute125_WaterMonsInfo = {4, gRoute125_WaterMons}; const struct WildPokemon gRoute125_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute125_FishingMonsInfo = {30, gRoute125_FishingMons}; const struct WildPokemon gRoute126_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute126_WaterMonsInfo = {4, gRoute126_WaterMons}; const struct WildPokemon gRoute126_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute126_FishingMonsInfo = {30, gRoute126_FishingMons}; const struct WildPokemon gRoute127_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute127_WaterMonsInfo = {4, gRoute127_WaterMons}; const struct WildPokemon gRoute127_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute127_FishingMonsInfo = {30, gRoute127_FishingMons}; const struct WildPokemon gRoute128_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute128_WaterMonsInfo = {4, gRoute128_WaterMons}; const struct WildPokemon gRoute128_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_LUVDISC}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_LUVDISC}, - {30, 35, SPECIES_WAILMER}, - {30, 35, SPECIES_CORSOLA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_LUVDISC}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_LUVDISC}, + {30, 35, SPECIES_WAILMER}, + {30, 35, SPECIES_CORSOLA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute128_FishingMonsInfo = {30, gRoute128_FishingMons}; const struct WildPokemon gRoute129_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_WAILORD}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_WAILORD}, }; const struct WildPokemonInfo gRoute129_WaterMonsInfo = {4, gRoute129_WaterMons}; const struct WildPokemon gRoute129_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute129_FishingMonsInfo = {30, gRoute129_FishingMons}; const struct WildPokemon gRoute130_LandMons[] = { - {30, 30, SPECIES_WYNAUT}, - {35, 35, SPECIES_WYNAUT}, - {25, 25, SPECIES_WYNAUT}, - {40, 40, SPECIES_WYNAUT}, - {20, 20, SPECIES_WYNAUT}, - {45, 45, SPECIES_WYNAUT}, - {15, 15, SPECIES_WYNAUT}, - {50, 50, SPECIES_WYNAUT}, - {10, 10, SPECIES_WYNAUT}, - {5, 5, SPECIES_WYNAUT}, - {10, 10, SPECIES_WYNAUT}, - {5, 5, SPECIES_WYNAUT}, + {30, 30, SPECIES_WYNAUT}, + {35, 35, SPECIES_WYNAUT}, + {25, 25, SPECIES_WYNAUT}, + {40, 40, SPECIES_WYNAUT}, + {20, 20, SPECIES_WYNAUT}, + {45, 45, SPECIES_WYNAUT}, + {15, 15, SPECIES_WYNAUT}, + {50, 50, SPECIES_WYNAUT}, + {10, 10, SPECIES_WYNAUT}, + {5, 5, SPECIES_WYNAUT}, + {10, 10, SPECIES_WYNAUT}, + {5, 5, SPECIES_WYNAUT}, }; const struct WildPokemonInfo gRoute130_LandMonsInfo = {20, gRoute130_LandMons}; const struct WildPokemon gRoute130_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute130_WaterMonsInfo = {4, gRoute130_WaterMons}; const struct WildPokemon gRoute130_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute130_FishingMonsInfo = {30, gRoute130_FishingMons}; const struct WildPokemon gRoute131_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute131_WaterMonsInfo = {4, gRoute131_WaterMons}; const struct WildPokemon gRoute131_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute131_FishingMonsInfo = {30, gRoute131_FishingMons}; const struct WildPokemon gRoute132_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute132_WaterMonsInfo = {4, gRoute132_WaterMons}; const struct WildPokemon gRoute132_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_HORSEA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_HORSEA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute132_FishingMonsInfo = {30, gRoute132_FishingMons}; const struct WildPokemon gRoute133_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute133_WaterMonsInfo = {4, gRoute133_WaterMons}; const struct WildPokemon gRoute133_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_HORSEA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_HORSEA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute133_FishingMonsInfo = {30, gRoute133_FishingMons}; const struct WildPokemon gRoute134_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gRoute134_WaterMonsInfo = {4, gRoute134_WaterMons}; const struct WildPokemon gRoute134_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_HORSEA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_HORSEA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gRoute134_FishingMonsInfo = {30, gRoute134_FishingMons}; const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACRUEL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACRUEL}, }; const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo = {4, gAbandonedShip_HiddenFloorCorridors_WaterMons}; const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_TENTACOOL}, - {25, 30, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACOOL}, - {30, 35, SPECIES_TENTACRUEL}, - {25, 30, SPECIES_TENTACRUEL}, - {20, 25, SPECIES_TENTACRUEL}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_TENTACOOL}, + {25, 30, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACOOL}, + {30, 35, SPECIES_TENTACRUEL}, + {25, 30, SPECIES_TENTACRUEL}, + {20, 25, SPECIES_TENTACRUEL}, }; const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo = {20, gAbandonedShip_HiddenFloorCorridors_FishingMons}; const struct WildPokemon gSeafloorCavern_Room1_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room1_LandMonsInfo = {4, gSeafloorCavern_Room1_LandMons}; const struct WildPokemon gSeafloorCavern_Room2_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room2_LandMonsInfo = {4, gSeafloorCavern_Room2_LandMons}; const struct WildPokemon gSeafloorCavern_Room3_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room3_LandMonsInfo = {4, gSeafloorCavern_Room3_LandMons}; const struct WildPokemon gSeafloorCavern_Room4_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room4_LandMonsInfo = {4, gSeafloorCavern_Room4_LandMons}; const struct WildPokemon gSeafloorCavern_Room5_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room5_LandMonsInfo = {4, gSeafloorCavern_Room5_LandMons}; const struct WildPokemon gSeafloorCavern_Room6_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room6_LandMonsInfo = {4, gSeafloorCavern_Room6_LandMons}; const struct WildPokemon gSeafloorCavern_Room6_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room6_WaterMonsInfo = {4, gSeafloorCavern_Room6_WaterMons}; const struct WildPokemon gSeafloorCavern_Room6_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gSeafloorCavern_Room6_FishingMonsInfo = {10, gSeafloorCavern_Room6_FishingMons}; const struct WildPokemon gSeafloorCavern_Room7_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room7_LandMonsInfo = {4, gSeafloorCavern_Room7_LandMons}; const struct WildPokemon gSeafloorCavern_Room7_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room7_WaterMonsInfo = {4, gSeafloorCavern_Room7_WaterMons}; const struct WildPokemon gSeafloorCavern_Room7_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gSeafloorCavern_Room7_FishingMonsInfo = {10, gSeafloorCavern_Room7_FishingMons}; const struct WildPokemon gSeafloorCavern_Room8_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Room8_LandMonsInfo = {4, gSeafloorCavern_Room8_LandMons}; const struct WildPokemon gSeafloorCavern_Entrance_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gSeafloorCavern_Entrance_WaterMonsInfo = {4, gSeafloorCavern_Entrance_WaterMons}; const struct WildPokemon gSeafloorCavern_Entrance_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gSeafloorCavern_Entrance_FishingMonsInfo = {10, gSeafloorCavern_Entrance_FishingMons}; const struct WildPokemon gCaveOfOrigin_Entrance_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {33, 33, SPECIES_ZUBAT}, - {28, 28, SPECIES_ZUBAT}, - {29, 29, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {35, 35, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {33, 33, SPECIES_ZUBAT}, + {28, 28, SPECIES_ZUBAT}, + {29, 29, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {35, 35, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_Entrance_LandMonsInfo = {4, gCaveOfOrigin_Entrance_LandMons}; const struct WildPokemon gCaveOfOrigin_1F_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {30, 30, SPECIES_SABLEYE}, - {32, 32, SPECIES_SABLEYE}, - {34, 34, SPECIES_SABLEYE}, - {33, 33, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {30, 30, SPECIES_SABLEYE}, + {32, 32, SPECIES_SABLEYE}, + {34, 34, SPECIES_SABLEYE}, + {33, 33, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_1F_LandMonsInfo = {4, gCaveOfOrigin_1F_LandMons}; const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap1_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {30, 30, SPECIES_SABLEYE}, - {32, 32, SPECIES_SABLEYE}, - {34, 34, SPECIES_SABLEYE}, - {33, 33, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {30, 30, SPECIES_SABLEYE}, + {32, 32, SPECIES_SABLEYE}, + {34, 34, SPECIES_SABLEYE}, + {33, 33, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap1_LandMons}; const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap2_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {30, 30, SPECIES_SABLEYE}, - {32, 32, SPECIES_SABLEYE}, - {34, 34, SPECIES_SABLEYE}, - {33, 33, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {30, 30, SPECIES_SABLEYE}, + {32, 32, SPECIES_SABLEYE}, + {34, 34, SPECIES_SABLEYE}, + {33, 33, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap2_LandMons}; const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap3_LandMons[] = { - {30, 30, SPECIES_ZUBAT}, - {31, 31, SPECIES_ZUBAT}, - {32, 32, SPECIES_ZUBAT}, - {30, 30, SPECIES_SABLEYE}, - {32, 32, SPECIES_SABLEYE}, - {34, 34, SPECIES_SABLEYE}, - {33, 33, SPECIES_ZUBAT}, - {34, 34, SPECIES_ZUBAT}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {36, 36, SPECIES_GOLBAT}, + {30, 30, SPECIES_ZUBAT}, + {31, 31, SPECIES_ZUBAT}, + {32, 32, SPECIES_ZUBAT}, + {30, 30, SPECIES_SABLEYE}, + {32, 32, SPECIES_SABLEYE}, + {34, 34, SPECIES_SABLEYE}, + {33, 33, SPECIES_ZUBAT}, + {34, 34, SPECIES_ZUBAT}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {36, 36, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap3_LandMons}; const struct WildPokemon gNewMauville_Entrance_LandMons[] = { - {24, 24, SPECIES_VOLTORB}, - {24, 24, SPECIES_MAGNEMITE}, - {25, 25, SPECIES_VOLTORB}, - {25, 25, SPECIES_MAGNEMITE}, - {23, 23, SPECIES_VOLTORB}, - {23, 23, SPECIES_MAGNEMITE}, - {26, 26, SPECIES_VOLTORB}, - {26, 26, SPECIES_MAGNEMITE}, - {22, 22, SPECIES_VOLTORB}, - {22, 22, SPECIES_MAGNEMITE}, - {22, 22, SPECIES_VOLTORB}, - {22, 22, SPECIES_MAGNEMITE}, + {24, 24, SPECIES_VOLTORB}, + {24, 24, SPECIES_MAGNEMITE}, + {25, 25, SPECIES_VOLTORB}, + {25, 25, SPECIES_MAGNEMITE}, + {23, 23, SPECIES_VOLTORB}, + {23, 23, SPECIES_MAGNEMITE}, + {26, 26, SPECIES_VOLTORB}, + {26, 26, SPECIES_MAGNEMITE}, + {22, 22, SPECIES_VOLTORB}, + {22, 22, SPECIES_MAGNEMITE}, + {22, 22, SPECIES_VOLTORB}, + {22, 22, SPECIES_MAGNEMITE}, }; const struct WildPokemonInfo gNewMauville_Entrance_LandMonsInfo = {10, gNewMauville_Entrance_LandMons}; const struct WildPokemon gSafariZone_Southwest_LandMons[] = { - {25, 25, SPECIES_ODDISH}, - {27, 27, SPECIES_ODDISH}, - {25, 25, SPECIES_GIRAFARIG}, - {27, 27, SPECIES_GIRAFARIG}, - {25, 25, SPECIES_NATU}, - {27, 27, SPECIES_DODUO}, - {25, 25, SPECIES_GLOOM}, - {27, 27, SPECIES_WOBBUFFET}, - {25, 25, SPECIES_PIKACHU}, - {27, 27, SPECIES_WOBBUFFET}, - {27, 27, SPECIES_PIKACHU}, - {29, 29, SPECIES_WOBBUFFET}, + {25, 25, SPECIES_ODDISH}, + {27, 27, SPECIES_ODDISH}, + {25, 25, SPECIES_GIRAFARIG}, + {27, 27, SPECIES_GIRAFARIG}, + {25, 25, SPECIES_NATU}, + {27, 27, SPECIES_DODUO}, + {25, 25, SPECIES_GLOOM}, + {27, 27, SPECIES_WOBBUFFET}, + {25, 25, SPECIES_PIKACHU}, + {27, 27, SPECIES_WOBBUFFET}, + {27, 27, SPECIES_PIKACHU}, + {29, 29, SPECIES_WOBBUFFET}, }; const struct WildPokemonInfo gSafariZone_Southwest_LandMonsInfo = {25, gSafariZone_Southwest_LandMons}; const struct WildPokemon gSafariZone_Southwest_WaterMons[] = { - {20, 30, SPECIES_PSYDUCK}, - {20, 30, SPECIES_PSYDUCK}, - {30, 35, SPECIES_PSYDUCK}, - {30, 35, SPECIES_PSYDUCK}, - {30, 35, SPECIES_PSYDUCK}, + {20, 30, SPECIES_PSYDUCK}, + {20, 30, SPECIES_PSYDUCK}, + {30, 35, SPECIES_PSYDUCK}, + {30, 35, SPECIES_PSYDUCK}, + {30, 35, SPECIES_PSYDUCK}, }; const struct WildPokemonInfo gSafariZone_Southwest_WaterMonsInfo = {9, gSafariZone_Southwest_WaterMons}; const struct WildPokemon gSafariZone_Southwest_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 25, SPECIES_GOLDEEN}, - {10, 30, SPECIES_GOLDEEN}, - {25, 30, SPECIES_GOLDEEN}, - {30, 35, SPECIES_GOLDEEN}, - {30, 35, SPECIES_SEAKING}, - {35, 40, SPECIES_SEAKING}, - {25, 30, SPECIES_SEAKING}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 25, SPECIES_GOLDEEN}, + {10, 30, SPECIES_GOLDEEN}, + {25, 30, SPECIES_GOLDEEN}, + {30, 35, SPECIES_GOLDEEN}, + {30, 35, SPECIES_SEAKING}, + {35, 40, SPECIES_SEAKING}, + {25, 30, SPECIES_SEAKING}, }; const struct WildPokemonInfo gSafariZone_Southwest_FishingMonsInfo = {35, gSafariZone_Southwest_FishingMons}; const struct WildPokemon gSafariZone_North_LandMons[] = { - {27, 27, SPECIES_PHANPY}, - {27, 27, SPECIES_ODDISH}, - {29, 29, SPECIES_PHANPY}, - {29, 29, SPECIES_ODDISH}, - {27, 27, SPECIES_NATU}, - {29, 29, SPECIES_GLOOM}, - {31, 31, SPECIES_GLOOM}, - {29, 29, SPECIES_NATU}, - {29, 29, SPECIES_XATU}, - {27, 27, SPECIES_HERACROSS}, - {31, 31, SPECIES_XATU}, - {29, 29, SPECIES_HERACROSS}, + {27, 27, SPECIES_PHANPY}, + {27, 27, SPECIES_ODDISH}, + {29, 29, SPECIES_PHANPY}, + {29, 29, SPECIES_ODDISH}, + {27, 27, SPECIES_NATU}, + {29, 29, SPECIES_GLOOM}, + {31, 31, SPECIES_GLOOM}, + {29, 29, SPECIES_NATU}, + {29, 29, SPECIES_XATU}, + {27, 27, SPECIES_HERACROSS}, + {31, 31, SPECIES_XATU}, + {29, 29, SPECIES_HERACROSS}, }; const struct WildPokemonInfo gSafariZone_North_LandMonsInfo = {25, gSafariZone_North_LandMons}; const struct WildPokemon gSafariZone_North_RockSmashMons[] = { - {10, 15, SPECIES_GEODUDE}, - {5, 10, SPECIES_GEODUDE}, - {15, 20, SPECIES_GEODUDE}, - {20, 25, SPECIES_GEODUDE}, - {25, 30, SPECIES_GEODUDE}, + {10, 15, SPECIES_GEODUDE}, + {5, 10, SPECIES_GEODUDE}, + {15, 20, SPECIES_GEODUDE}, + {20, 25, SPECIES_GEODUDE}, + {25, 30, SPECIES_GEODUDE}, }; const struct WildPokemonInfo gSafariZone_North_RockSmashMonsInfo = {25, gSafariZone_North_RockSmashMons}; const struct WildPokemon gSafariZone_Northwest_LandMons[] = { - {27, 27, SPECIES_RHYHORN}, - {27, 27, SPECIES_ODDISH}, - {29, 29, SPECIES_RHYHORN}, - {29, 29, SPECIES_ODDISH}, - {27, 27, SPECIES_DODUO}, - {29, 29, SPECIES_GLOOM}, - {31, 31, SPECIES_GLOOM}, - {29, 29, SPECIES_DODUO}, - {29, 29, SPECIES_DODRIO}, - {27, 27, SPECIES_PINSIR}, - {31, 31, SPECIES_DODRIO}, - {29, 29, SPECIES_PINSIR}, + {27, 27, SPECIES_RHYHORN}, + {27, 27, SPECIES_ODDISH}, + {29, 29, SPECIES_RHYHORN}, + {29, 29, SPECIES_ODDISH}, + {27, 27, SPECIES_DODUO}, + {29, 29, SPECIES_GLOOM}, + {31, 31, SPECIES_GLOOM}, + {29, 29, SPECIES_DODUO}, + {29, 29, SPECIES_DODRIO}, + {27, 27, SPECIES_PINSIR}, + {31, 31, SPECIES_DODRIO}, + {29, 29, SPECIES_PINSIR}, }; const struct WildPokemonInfo gSafariZone_Northwest_LandMonsInfo = {25, gSafariZone_Northwest_LandMons}; const struct WildPokemon gSafariZone_Northwest_WaterMons[] = { - {20, 30, SPECIES_PSYDUCK}, - {20, 30, SPECIES_PSYDUCK}, - {30, 35, SPECIES_PSYDUCK}, - {30, 35, SPECIES_GOLDUCK}, - {25, 40, SPECIES_GOLDUCK}, + {20, 30, SPECIES_PSYDUCK}, + {20, 30, SPECIES_PSYDUCK}, + {30, 35, SPECIES_PSYDUCK}, + {30, 35, SPECIES_GOLDUCK}, + {25, 40, SPECIES_GOLDUCK}, }; const struct WildPokemonInfo gSafariZone_Northwest_WaterMonsInfo = {9, gSafariZone_Northwest_WaterMons}; const struct WildPokemon gSafariZone_Northwest_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 25, SPECIES_GOLDEEN}, - {10, 30, SPECIES_GOLDEEN}, - {25, 30, SPECIES_GOLDEEN}, - {30, 35, SPECIES_GOLDEEN}, - {30, 35, SPECIES_SEAKING}, - {35, 40, SPECIES_SEAKING}, - {25, 30, SPECIES_SEAKING}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 25, SPECIES_GOLDEEN}, + {10, 30, SPECIES_GOLDEEN}, + {25, 30, SPECIES_GOLDEEN}, + {30, 35, SPECIES_GOLDEEN}, + {30, 35, SPECIES_SEAKING}, + {35, 40, SPECIES_SEAKING}, + {25, 30, SPECIES_SEAKING}, }; const struct WildPokemonInfo gSafariZone_Northwest_FishingMonsInfo = {35, gSafariZone_Northwest_FishingMons}; const struct WildPokemon gVictoryRoad_B1F_LandMons[] = { - {40, 40, SPECIES_GOLBAT}, - {40, 40, SPECIES_HARIYAMA}, - {40, 40, SPECIES_LAIRON}, - {40, 40, SPECIES_LAIRON}, - {38, 38, SPECIES_GOLBAT}, - {38, 38, SPECIES_HARIYAMA}, - {42, 42, SPECIES_GOLBAT}, - {42, 42, SPECIES_HARIYAMA}, - {42, 42, SPECIES_LAIRON}, - {38, 38, SPECIES_MAWILE}, - {42, 42, SPECIES_LAIRON}, - {38, 38, SPECIES_MAWILE}, + {40, 40, SPECIES_GOLBAT}, + {40, 40, SPECIES_HARIYAMA}, + {40, 40, SPECIES_LAIRON}, + {40, 40, SPECIES_LAIRON}, + {38, 38, SPECIES_GOLBAT}, + {38, 38, SPECIES_HARIYAMA}, + {42, 42, SPECIES_GOLBAT}, + {42, 42, SPECIES_HARIYAMA}, + {42, 42, SPECIES_LAIRON}, + {38, 38, SPECIES_MAWILE}, + {42, 42, SPECIES_LAIRON}, + {38, 38, SPECIES_MAWILE}, }; const struct WildPokemonInfo gVictoryRoad_B1F_LandMonsInfo = {10, gVictoryRoad_B1F_LandMons}; const struct WildPokemon gVictoryRoad_B1F_RockSmashMons[] = { - {30, 40, SPECIES_GRAVELER}, - {30, 40, SPECIES_GEODUDE}, - {35, 40, SPECIES_GRAVELER}, - {35, 40, SPECIES_GRAVELER}, - {35, 40, SPECIES_GRAVELER}, + {30, 40, SPECIES_GRAVELER}, + {30, 40, SPECIES_GEODUDE}, + {35, 40, SPECIES_GRAVELER}, + {35, 40, SPECIES_GRAVELER}, + {35, 40, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gVictoryRoad_B1F_RockSmashMonsInfo = {20, gVictoryRoad_B1F_RockSmashMons}; const struct WildPokemon gVictoryRoad_B2F_LandMons[] = { - {40, 40, SPECIES_GOLBAT}, - {40, 40, SPECIES_SABLEYE}, - {40, 40, SPECIES_LAIRON}, - {40, 40, SPECIES_LAIRON}, - {42, 42, SPECIES_GOLBAT}, - {42, 42, SPECIES_SABLEYE}, - {44, 44, SPECIES_GOLBAT}, - {44, 44, SPECIES_SABLEYE}, - {42, 42, SPECIES_LAIRON}, - {42, 42, SPECIES_MAWILE}, - {44, 44, SPECIES_LAIRON}, - {44, 44, SPECIES_MAWILE}, + {40, 40, SPECIES_GOLBAT}, + {40, 40, SPECIES_SABLEYE}, + {40, 40, SPECIES_LAIRON}, + {40, 40, SPECIES_LAIRON}, + {42, 42, SPECIES_GOLBAT}, + {42, 42, SPECIES_SABLEYE}, + {44, 44, SPECIES_GOLBAT}, + {44, 44, SPECIES_SABLEYE}, + {42, 42, SPECIES_LAIRON}, + {42, 42, SPECIES_MAWILE}, + {44, 44, SPECIES_LAIRON}, + {44, 44, SPECIES_MAWILE}, }; const struct WildPokemonInfo gVictoryRoad_B2F_LandMonsInfo = {10, gVictoryRoad_B2F_LandMons}; const struct WildPokemon gVictoryRoad_B2F_WaterMons[] = { - {30, 35, SPECIES_GOLBAT}, - {25, 30, SPECIES_GOLBAT}, - {35, 40, SPECIES_GOLBAT}, - {35, 40, SPECIES_GOLBAT}, - {35, 40, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, + {25, 30, SPECIES_GOLBAT}, + {35, 40, SPECIES_GOLBAT}, + {35, 40, SPECIES_GOLBAT}, + {35, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gVictoryRoad_B2F_WaterMonsInfo = {4, gVictoryRoad_B2F_WaterMons}; const struct WildPokemon gVictoryRoad_B2F_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {30, 35, SPECIES_WHISCASH}, - {35, 40, SPECIES_WHISCASH}, - {40, 45, SPECIES_WHISCASH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {30, 35, SPECIES_WHISCASH}, + {35, 40, SPECIES_WHISCASH}, + {40, 45, SPECIES_WHISCASH}, }; const struct WildPokemonInfo gVictoryRoad_B2F_FishingMonsInfo = {30, gVictoryRoad_B2F_FishingMons}; const struct WildPokemon gMeteorFalls_1F_1R_LandMons[] = { - {16, 16, SPECIES_ZUBAT}, - {17, 17, SPECIES_ZUBAT}, - {18, 18, SPECIES_ZUBAT}, - {15, 15, SPECIES_ZUBAT}, - {14, 14, SPECIES_ZUBAT}, - {16, 16, SPECIES_SOLROCK}, - {18, 18, SPECIES_SOLROCK}, - {14, 14, SPECIES_SOLROCK}, - {19, 19, SPECIES_ZUBAT}, - {20, 20, SPECIES_ZUBAT}, - {19, 19, SPECIES_ZUBAT}, - {20, 20, SPECIES_ZUBAT}, + {16, 16, SPECIES_ZUBAT}, + {17, 17, SPECIES_ZUBAT}, + {18, 18, SPECIES_ZUBAT}, + {15, 15, SPECIES_ZUBAT}, + {14, 14, SPECIES_ZUBAT}, + {16, 16, SPECIES_SOLROCK}, + {18, 18, SPECIES_SOLROCK}, + {14, 14, SPECIES_SOLROCK}, + {19, 19, SPECIES_ZUBAT}, + {20, 20, SPECIES_ZUBAT}, + {19, 19, SPECIES_ZUBAT}, + {20, 20, SPECIES_ZUBAT}, }; const struct WildPokemonInfo gMeteorFalls_1F_1R_LandMonsInfo = {10, gMeteorFalls_1F_1R_LandMons}; const struct WildPokemon gMeteorFalls_1F_1R_WaterMons[] = { - {5, 35, SPECIES_ZUBAT}, - {30, 35, SPECIES_ZUBAT}, - {25, 35, SPECIES_SOLROCK}, - {15, 25, SPECIES_SOLROCK}, - {5, 15, SPECIES_SOLROCK}, + {5, 35, SPECIES_ZUBAT}, + {30, 35, SPECIES_ZUBAT}, + {25, 35, SPECIES_SOLROCK}, + {15, 25, SPECIES_SOLROCK}, + {5, 15, SPECIES_SOLROCK}, }; const struct WildPokemonInfo gMeteorFalls_1F_1R_WaterMonsInfo = {4, gMeteorFalls_1F_1R_WaterMons}; const struct WildPokemon gMeteorFalls_1F_1R_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {20, 25, SPECIES_BARBOACH}, - {35, 40, SPECIES_BARBOACH}, - {40, 45, SPECIES_BARBOACH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {20, 25, SPECIES_BARBOACH}, + {35, 40, SPECIES_BARBOACH}, + {40, 45, SPECIES_BARBOACH}, }; const struct WildPokemonInfo gMeteorFalls_1F_1R_FishingMonsInfo = {30, gMeteorFalls_1F_1R_FishingMons}; const struct WildPokemon gMeteorFalls_1F_2R_LandMons[] = { - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_SOLROCK}, - {33, 33, SPECIES_SOLROCK}, - {37, 37, SPECIES_SOLROCK}, - {35, 35, SPECIES_GOLBAT}, - {39, 39, SPECIES_SOLROCK}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_SOLROCK}, + {33, 33, SPECIES_SOLROCK}, + {37, 37, SPECIES_SOLROCK}, + {35, 35, SPECIES_GOLBAT}, + {39, 39, SPECIES_SOLROCK}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gMeteorFalls_1F_2R_LandMonsInfo = {10, gMeteorFalls_1F_2R_LandMons}; const struct WildPokemon gMeteorFalls_1F_2R_WaterMons[] = { - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, - {25, 35, SPECIES_SOLROCK}, - {15, 25, SPECIES_SOLROCK}, - {5, 15, SPECIES_SOLROCK}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, + {25, 35, SPECIES_SOLROCK}, + {15, 25, SPECIES_SOLROCK}, + {5, 15, SPECIES_SOLROCK}, }; const struct WildPokemonInfo gMeteorFalls_1F_2R_WaterMonsInfo = {4, gMeteorFalls_1F_2R_WaterMons}; const struct WildPokemon gMeteorFalls_1F_2R_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {30, 35, SPECIES_WHISCASH}, - {35, 40, SPECIES_WHISCASH}, - {40, 45, SPECIES_WHISCASH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {30, 35, SPECIES_WHISCASH}, + {35, 40, SPECIES_WHISCASH}, + {40, 45, SPECIES_WHISCASH}, }; const struct WildPokemonInfo gMeteorFalls_1F_2R_FishingMonsInfo = {30, gMeteorFalls_1F_2R_FishingMons}; const struct WildPokemon gMeteorFalls_B1F_1R_LandMons[] = { - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_SOLROCK}, - {33, 33, SPECIES_SOLROCK}, - {37, 37, SPECIES_SOLROCK}, - {35, 35, SPECIES_GOLBAT}, - {39, 39, SPECIES_SOLROCK}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_SOLROCK}, + {33, 33, SPECIES_SOLROCK}, + {37, 37, SPECIES_SOLROCK}, + {35, 35, SPECIES_GOLBAT}, + {39, 39, SPECIES_SOLROCK}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gMeteorFalls_B1F_1R_LandMonsInfo = {10, gMeteorFalls_B1F_1R_LandMons}; const struct WildPokemon gMeteorFalls_B1F_1R_WaterMons[] = { - {30, 35, SPECIES_GOLBAT}, - {30, 35, SPECIES_GOLBAT}, - {25, 35, SPECIES_SOLROCK}, - {15, 25, SPECIES_SOLROCK}, - {5, 15, SPECIES_SOLROCK}, + {30, 35, SPECIES_GOLBAT}, + {30, 35, SPECIES_GOLBAT}, + {25, 35, SPECIES_SOLROCK}, + {15, 25, SPECIES_SOLROCK}, + {5, 15, SPECIES_SOLROCK}, }; const struct WildPokemonInfo gMeteorFalls_B1F_1R_WaterMonsInfo = {4, gMeteorFalls_B1F_1R_WaterMons}; const struct WildPokemon gMeteorFalls_B1F_1R_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_BARBOACH}, - {25, 30, SPECIES_BARBOACH}, - {30, 35, SPECIES_BARBOACH}, - {30, 35, SPECIES_WHISCASH}, - {35, 40, SPECIES_WHISCASH}, - {40, 45, SPECIES_WHISCASH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_BARBOACH}, + {25, 30, SPECIES_BARBOACH}, + {30, 35, SPECIES_BARBOACH}, + {30, 35, SPECIES_WHISCASH}, + {35, 40, SPECIES_WHISCASH}, + {40, 45, SPECIES_WHISCASH}, }; const struct WildPokemonInfo gMeteorFalls_B1F_1R_FishingMonsInfo = {30, gMeteorFalls_B1F_1R_FishingMons}; const struct WildPokemon gShoalCave_LowTideStairsRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {32, 32, SPECIES_ZUBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {32, 32, SPECIES_ZUBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideStairsRoom_LandMonsInfo = {10, gShoalCave_LowTideStairsRoom_LandMons}; const struct WildPokemon gShoalCave_LowTideLowerRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {32, 32, SPECIES_ZUBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {32, 32, SPECIES_ZUBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideLowerRoom_LandMonsInfo = {10, gShoalCave_LowTideLowerRoom_LandMons}; const struct WildPokemon gShoalCave_LowTideInnerRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {32, 32, SPECIES_ZUBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {32, 32, SPECIES_ZUBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_LandMonsInfo = {10, gShoalCave_LowTideInnerRoom_LandMons}; const struct WildPokemon gShoalCave_LowTideInnerRoom_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {25, 30, SPECIES_SPHEAL}, - {25, 30, SPECIES_SPHEAL}, - {25, 35, SPECIES_SPHEAL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {25, 30, SPECIES_SPHEAL}, + {25, 30, SPECIES_SPHEAL}, + {25, 35, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_WaterMonsInfo = {4, gShoalCave_LowTideInnerRoom_WaterMons}; const struct WildPokemon gShoalCave_LowTideInnerRoom_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_FishingMonsInfo = {10, gShoalCave_LowTideInnerRoom_FishingMons}; const struct WildPokemon gShoalCave_LowTideEntranceRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {32, 32, SPECIES_ZUBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, - {32, 32, SPECIES_GOLBAT}, - {32, 32, SPECIES_SPHEAL}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {32, 32, SPECIES_ZUBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, + {32, 32, SPECIES_GOLBAT}, + {32, 32, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_LandMonsInfo = {10, gShoalCave_LowTideEntranceRoom_LandMons}; const struct WildPokemon gShoalCave_LowTideEntranceRoom_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {5, 35, SPECIES_ZUBAT}, - {25, 30, SPECIES_SPHEAL}, - {25, 30, SPECIES_SPHEAL}, - {25, 35, SPECIES_SPHEAL}, + {5, 35, SPECIES_TENTACOOL}, + {5, 35, SPECIES_ZUBAT}, + {25, 30, SPECIES_SPHEAL}, + {25, 30, SPECIES_SPHEAL}, + {25, 35, SPECIES_SPHEAL}, }; const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_WaterMonsInfo = {4, gShoalCave_LowTideEntranceRoom_WaterMons}; const struct WildPokemon gShoalCave_LowTideEntranceRoom_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_FishingMonsInfo = {10, gShoalCave_LowTideEntranceRoom_FishingMons}; const struct WildPokemon gLilycoveCity_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gLilycoveCity_WaterMonsInfo = {4, gLilycoveCity_WaterMons}; const struct WildPokemon gLilycoveCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_STARYU}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_STARYU}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gLilycoveCity_FishingMonsInfo = {10, gLilycoveCity_FishingMons}; const struct WildPokemon gDewfordTown_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gDewfordTown_WaterMonsInfo = {4, gDewfordTown_WaterMons}; const struct WildPokemon gDewfordTown_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gDewfordTown_FishingMonsInfo = {10, gDewfordTown_FishingMons}; const struct WildPokemon gSlateportCity_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gSlateportCity_WaterMonsInfo = {4, gSlateportCity_WaterMons}; const struct WildPokemon gSlateportCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_WAILMER}, - {20, 25, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_WAILMER}, + {20, 25, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gSlateportCity_FishingMonsInfo = {10, gSlateportCity_FishingMons}; const struct WildPokemon gMossdeepCity_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gMossdeepCity_WaterMonsInfo = {4, gMossdeepCity_WaterMons}; const struct WildPokemon gMossdeepCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gMossdeepCity_FishingMonsInfo = {10, gMossdeepCity_FishingMons}; const struct WildPokemon gPacifidlogTown_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gPacifidlogTown_WaterMonsInfo = {4, gPacifidlogTown_WaterMons}; const struct WildPokemon gPacifidlogTown_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_SHARPEDO}, - {30, 35, SPECIES_WAILMER}, - {25, 30, SPECIES_WAILMER}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_SHARPEDO}, + {30, 35, SPECIES_WAILMER}, + {25, 30, SPECIES_WAILMER}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gPacifidlogTown_FishingMonsInfo = {10, gPacifidlogTown_FishingMons}; const struct WildPokemon gEverGrandeCity_WaterMons[] = { - {5, 35, SPECIES_TENTACOOL}, - {10, 30, SPECIES_WINGULL}, - {15, 25, SPECIES_WINGULL}, - {25, 30, SPECIES_PELIPPER}, - {25, 30, SPECIES_PELIPPER}, + {5, 35, SPECIES_TENTACOOL}, + {10, 30, SPECIES_WINGULL}, + {15, 25, SPECIES_WINGULL}, + {25, 30, SPECIES_PELIPPER}, + {25, 30, SPECIES_PELIPPER}, }; const struct WildPokemonInfo gEverGrandeCity_WaterMonsInfo = {4, gEverGrandeCity_WaterMons}; const struct WildPokemon gEverGrandeCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_LUVDISC}, - {10, 30, SPECIES_WAILMER}, - {30, 35, SPECIES_LUVDISC}, - {30, 35, SPECIES_WAILMER}, - {30, 35, SPECIES_CORSOLA}, - {35, 40, SPECIES_WAILMER}, - {40, 45, SPECIES_WAILMER}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_LUVDISC}, + {10, 30, SPECIES_WAILMER}, + {30, 35, SPECIES_LUVDISC}, + {30, 35, SPECIES_WAILMER}, + {30, 35, SPECIES_CORSOLA}, + {35, 40, SPECIES_WAILMER}, + {40, 45, SPECIES_WAILMER}, }; const struct WildPokemonInfo gEverGrandeCity_FishingMonsInfo = {10, gEverGrandeCity_FishingMons}; const struct WildPokemon gPetalburgCity_WaterMons[] = { - {20, 30, SPECIES_MARILL}, - {10, 20, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, - {5, 10, SPECIES_MARILL}, + {20, 30, SPECIES_MARILL}, + {10, 20, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, + {5, 10, SPECIES_MARILL}, }; const struct WildPokemonInfo gPetalburgCity_WaterMonsInfo = {1, gPetalburgCity_WaterMons}; const struct WildPokemon gPetalburgCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_GOLDEEN}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_GOLDEEN}, - {10, 30, SPECIES_CORPHISH}, - {25, 30, SPECIES_CORPHISH}, - {30, 35, SPECIES_CORPHISH}, - {20, 25, SPECIES_CORPHISH}, - {35, 40, SPECIES_CORPHISH}, - {40, 45, SPECIES_CORPHISH}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_GOLDEEN}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_GOLDEEN}, + {10, 30, SPECIES_CORPHISH}, + {25, 30, SPECIES_CORPHISH}, + {30, 35, SPECIES_CORPHISH}, + {20, 25, SPECIES_CORPHISH}, + {35, 40, SPECIES_CORPHISH}, + {40, 45, SPECIES_CORPHISH}, }; const struct WildPokemonInfo gPetalburgCity_FishingMonsInfo = {10, gPetalburgCity_FishingMons}; const struct WildPokemon gUnderwater1_WaterMons[] = { - {20, 30, SPECIES_CLAMPERL}, - {20, 30, SPECIES_CHINCHOU}, - {30, 35, SPECIES_CLAMPERL}, - {30, 35, SPECIES_RELICANTH}, - {30, 35, SPECIES_RELICANTH}, + {20, 30, SPECIES_CLAMPERL}, + {20, 30, SPECIES_CHINCHOU}, + {30, 35, SPECIES_CLAMPERL}, + {30, 35, SPECIES_RELICANTH}, + {30, 35, SPECIES_RELICANTH}, }; const struct WildPokemonInfo gUnderwater1_WaterMonsInfo = {4, gUnderwater1_WaterMons}; const struct WildPokemon gShoalCave_LowTideIceRoom_LandMons[] = { - {26, 26, SPECIES_ZUBAT}, - {26, 26, SPECIES_SPHEAL}, - {28, 28, SPECIES_ZUBAT}, - {28, 28, SPECIES_SPHEAL}, - {30, 30, SPECIES_ZUBAT}, - {30, 30, SPECIES_SPHEAL}, - {26, 26, SPECIES_SNORUNT}, - {32, 32, SPECIES_SPHEAL}, - {30, 30, SPECIES_GOLBAT}, - {28, 28, SPECIES_SNORUNT}, - {32, 32, SPECIES_GOLBAT}, - {30, 30, SPECIES_SNORUNT}, + {26, 26, SPECIES_ZUBAT}, + {26, 26, SPECIES_SPHEAL}, + {28, 28, SPECIES_ZUBAT}, + {28, 28, SPECIES_SPHEAL}, + {30, 30, SPECIES_ZUBAT}, + {30, 30, SPECIES_SPHEAL}, + {26, 26, SPECIES_SNORUNT}, + {32, 32, SPECIES_SPHEAL}, + {30, 30, SPECIES_GOLBAT}, + {28, 28, SPECIES_SNORUNT}, + {32, 32, SPECIES_GOLBAT}, + {30, 30, SPECIES_SNORUNT}, }; const struct WildPokemonInfo gShoalCave_LowTideIceRoom_LandMonsInfo = {10, gShoalCave_LowTideIceRoom_LandMons}; const struct WildPokemon gSkyPillar_1F_LandMons[] = { - {33, 33, SPECIES_SABLEYE}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {34, 34, SPECIES_SABLEYE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_BANETTE}, - {38, 38, SPECIES_BANETTE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_CLAYDOL}, + {33, 33, SPECIES_SABLEYE}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {34, 34, SPECIES_SABLEYE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_BANETTE}, + {38, 38, SPECIES_BANETTE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_CLAYDOL}, }; const struct WildPokemonInfo gSkyPillar_1F_LandMonsInfo = {10, gSkyPillar_1F_LandMons}; const struct WildPokemon gSootopolisCity_WaterMons[] = { - {5, 35, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {15, 25, SPECIES_MAGIKARP}, - {25, 30, SPECIES_MAGIKARP}, - {25, 30, SPECIES_MAGIKARP}, + {5, 35, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {15, 25, SPECIES_MAGIKARP}, + {25, 30, SPECIES_MAGIKARP}, + {25, 30, SPECIES_MAGIKARP}, }; const struct WildPokemonInfo gSootopolisCity_WaterMonsInfo = {1, gSootopolisCity_WaterMons}; const struct WildPokemon gSootopolisCity_FishingMons[] = { - {5, 10, SPECIES_MAGIKARP}, - {5, 10, SPECIES_TENTACOOL}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {10, 30, SPECIES_MAGIKARP}, - {30, 35, SPECIES_MAGIKARP}, - {30, 35, SPECIES_MAGIKARP}, - {35, 40, SPECIES_GYARADOS}, - {35, 45, SPECIES_GYARADOS}, - {5, 45, SPECIES_GYARADOS}, + {5, 10, SPECIES_MAGIKARP}, + {5, 10, SPECIES_TENTACOOL}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {10, 30, SPECIES_MAGIKARP}, + {30, 35, SPECIES_MAGIKARP}, + {30, 35, SPECIES_MAGIKARP}, + {35, 40, SPECIES_GYARADOS}, + {35, 45, SPECIES_GYARADOS}, + {5, 45, SPECIES_GYARADOS}, }; const struct WildPokemonInfo gSootopolisCity_FishingMonsInfo = {10, gSootopolisCity_FishingMons}; const struct WildPokemon gSkyPillar_3F_LandMons[] = { - {33, 33, SPECIES_SABLEYE}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {34, 34, SPECIES_SABLEYE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_BANETTE}, - {38, 38, SPECIES_BANETTE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_CLAYDOL}, + {33, 33, SPECIES_SABLEYE}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {34, 34, SPECIES_SABLEYE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_BANETTE}, + {38, 38, SPECIES_BANETTE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_CLAYDOL}, }; const struct WildPokemonInfo gSkyPillar_3F_LandMonsInfo = {10, gSkyPillar_3F_LandMons}; const struct WildPokemon gSkyPillar_5F_LandMons[] = { - {33, 33, SPECIES_SABLEYE}, - {34, 34, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {34, 34, SPECIES_SABLEYE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_BANETTE}, - {38, 38, SPECIES_BANETTE}, - {36, 36, SPECIES_CLAYDOL}, - {37, 37, SPECIES_CLAYDOL}, - {38, 38, SPECIES_ALTARIA}, - {39, 39, SPECIES_ALTARIA}, - {39, 39, SPECIES_ALTARIA}, + {33, 33, SPECIES_SABLEYE}, + {34, 34, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {34, 34, SPECIES_SABLEYE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_BANETTE}, + {38, 38, SPECIES_BANETTE}, + {36, 36, SPECIES_CLAYDOL}, + {37, 37, SPECIES_CLAYDOL}, + {38, 38, SPECIES_ALTARIA}, + {39, 39, SPECIES_ALTARIA}, + {39, 39, SPECIES_ALTARIA}, }; const struct WildPokemonInfo gSkyPillar_5F_LandMonsInfo = {10, gSkyPillar_5F_LandMons}; const struct WildPokemon gSafariZone_Southeast_LandMons[] = { - {33, 33, SPECIES_SUNKERN}, - {34, 34, SPECIES_MAREEP}, - {35, 35, SPECIES_SUNKERN}, - {36, 36, SPECIES_MAREEP}, - {34, 34, SPECIES_AIPOM}, - {33, 33, SPECIES_SPINARAK}, - {35, 35, SPECIES_HOOTHOOT}, - {34, 34, SPECIES_SNUBBULL}, - {36, 36, SPECIES_STANTLER}, - {37, 37, SPECIES_GLIGAR}, - {39, 39, SPECIES_STANTLER}, - {40, 40, SPECIES_GLIGAR}, + {33, 33, SPECIES_SUNKERN}, + {34, 34, SPECIES_MAREEP}, + {35, 35, SPECIES_SUNKERN}, + {36, 36, SPECIES_MAREEP}, + {34, 34, SPECIES_AIPOM}, + {33, 33, SPECIES_SPINARAK}, + {35, 35, SPECIES_HOOTHOOT}, + {34, 34, SPECIES_SNUBBULL}, + {36, 36, SPECIES_STANTLER}, + {37, 37, SPECIES_GLIGAR}, + {39, 39, SPECIES_STANTLER}, + {40, 40, SPECIES_GLIGAR}, }; const struct WildPokemonInfo gSafariZone_Southeast_LandMonsInfo = {25, gSafariZone_Southeast_LandMons}; const struct WildPokemon gSafariZone_Southeast_WaterMons[] = { - {25, 30, SPECIES_WOOPER}, - {25, 30, SPECIES_MARILL}, - {25, 30, SPECIES_MARILL}, - {30, 35, SPECIES_MARILL}, - {35, 40, SPECIES_QUAGSIRE}, + {25, 30, SPECIES_WOOPER}, + {25, 30, SPECIES_MARILL}, + {25, 30, SPECIES_MARILL}, + {30, 35, SPECIES_MARILL}, + {35, 40, SPECIES_QUAGSIRE}, }; const struct WildPokemonInfo gSafariZone_Southeast_WaterMonsInfo = {9, gSafariZone_Southeast_WaterMons}; const struct WildPokemon gSafariZone_Southeast_FishingMons[] = { - {25, 30, SPECIES_MAGIKARP}, - {25, 30, SPECIES_GOLDEEN}, - {25, 30, SPECIES_MAGIKARP}, - {25, 30, SPECIES_GOLDEEN}, - {30, 35, SPECIES_REMORAID}, - {25, 30, SPECIES_GOLDEEN}, - {25, 30, SPECIES_REMORAID}, - {30, 35, SPECIES_REMORAID}, - {30, 35, SPECIES_REMORAID}, - {35, 40, SPECIES_OCTILLERY}, + {25, 30, SPECIES_MAGIKARP}, + {25, 30, SPECIES_GOLDEEN}, + {25, 30, SPECIES_MAGIKARP}, + {25, 30, SPECIES_GOLDEEN}, + {30, 35, SPECIES_REMORAID}, + {25, 30, SPECIES_GOLDEEN}, + {25, 30, SPECIES_REMORAID}, + {30, 35, SPECIES_REMORAID}, + {30, 35, SPECIES_REMORAID}, + {35, 40, SPECIES_OCTILLERY}, }; const struct WildPokemonInfo gSafariZone_Southeast_FishingMonsInfo = {35, gSafariZone_Southeast_FishingMons}; const struct WildPokemon gSafariZone_Northeast_LandMons[] = { - {33, 33, SPECIES_AIPOM}, - {34, 34, SPECIES_TEDDIURSA}, - {35, 35, SPECIES_AIPOM}, - {36, 36, SPECIES_TEDDIURSA}, - {34, 34, SPECIES_SUNKERN}, - {33, 33, SPECIES_LEDYBA}, - {35, 35, SPECIES_HOOTHOOT}, - {34, 34, SPECIES_PINECO}, - {36, 36, SPECIES_HOUNDOUR}, - {37, 37, SPECIES_MILTANK}, - {39, 39, SPECIES_HOUNDOUR}, - {40, 40, SPECIES_MILTANK}, + {33, 33, SPECIES_AIPOM}, + {34, 34, SPECIES_TEDDIURSA}, + {35, 35, SPECIES_AIPOM}, + {36, 36, SPECIES_TEDDIURSA}, + {34, 34, SPECIES_SUNKERN}, + {33, 33, SPECIES_LEDYBA}, + {35, 35, SPECIES_HOOTHOOT}, + {34, 34, SPECIES_PINECO}, + {36, 36, SPECIES_HOUNDOUR}, + {37, 37, SPECIES_MILTANK}, + {39, 39, SPECIES_HOUNDOUR}, + {40, 40, SPECIES_MILTANK}, }; const struct WildPokemonInfo gSafariZone_Northeast_LandMonsInfo = {25, gSafariZone_Northeast_LandMons}; const struct WildPokemon gSafariZone_Northeast_RockSmashMons[] = { - {25, 30, SPECIES_SHUCKLE}, - {20, 25, SPECIES_SHUCKLE}, - {30, 35, SPECIES_SHUCKLE}, - {30, 35, SPECIES_SHUCKLE}, - {35, 40, SPECIES_SHUCKLE}, + {25, 30, SPECIES_SHUCKLE}, + {20, 25, SPECIES_SHUCKLE}, + {30, 35, SPECIES_SHUCKLE}, + {30, 35, SPECIES_SHUCKLE}, + {35, 40, SPECIES_SHUCKLE}, }; const struct WildPokemonInfo gSafariZone_Northeast_RockSmashMonsInfo = {25, gSafariZone_Northeast_RockSmashMons}; const struct WildPokemon gMagmaHideout_1F_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_1F_LandMonsInfo = {10, gMagmaHideout_1F_LandMons}; const struct WildPokemon gMagmaHideout_2F_1R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_2F_1R_LandMonsInfo = {10, gMagmaHideout_2F_1R_LandMons}; const struct WildPokemon gMagmaHideout_2F_2R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_2F_2R_LandMonsInfo = {10, gMagmaHideout_2F_2R_LandMons}; const struct WildPokemon gMagmaHideout_3F_1R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_3F_1R_LandMonsInfo = {10, gMagmaHideout_3F_1R_LandMons}; const struct WildPokemon gMagmaHideout_3F_2R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_3F_2R_LandMonsInfo = {10, gMagmaHideout_3F_2R_LandMons}; const struct WildPokemon gMagmaHideout_4F_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_4F_LandMonsInfo = {10, gMagmaHideout_4F_LandMons}; const struct WildPokemon gMagmaHideout_3F_3R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_3F_3R_LandMonsInfo = {10, gMagmaHideout_3F_3R_LandMons}; const struct WildPokemon gMagmaHideout_2F_3R_LandMons[] = { - {27, 27, SPECIES_GEODUDE}, - {28, 28, SPECIES_TORKOAL}, - {28, 28, SPECIES_GEODUDE}, - {30, 30, SPECIES_TORKOAL}, - {29, 29, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GEODUDE}, - {30, 30, SPECIES_GRAVELER}, - {30, 30, SPECIES_GRAVELER}, - {31, 31, SPECIES_GRAVELER}, - {32, 32, SPECIES_GRAVELER}, - {33, 33, SPECIES_GRAVELER}, + {27, 27, SPECIES_GEODUDE}, + {28, 28, SPECIES_TORKOAL}, + {28, 28, SPECIES_GEODUDE}, + {30, 30, SPECIES_TORKOAL}, + {29, 29, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GEODUDE}, + {30, 30, SPECIES_GRAVELER}, + {30, 30, SPECIES_GRAVELER}, + {31, 31, SPECIES_GRAVELER}, + {32, 32, SPECIES_GRAVELER}, + {33, 33, SPECIES_GRAVELER}, }; const struct WildPokemonInfo gMagmaHideout_2F_3R_LandMonsInfo = {10, gMagmaHideout_2F_3R_LandMons}; const struct WildPokemon gMirageTower_1F_LandMons[] = { - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {22, 22, SPECIES_SANDSHREW}, - {22, 22, SPECIES_TRAPINCH}, - {23, 23, SPECIES_SANDSHREW}, - {23, 23, SPECIES_TRAPINCH}, - {24, 24, SPECIES_SANDSHREW}, - {24, 24, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {22, 22, SPECIES_SANDSHREW}, + {22, 22, SPECIES_TRAPINCH}, + {23, 23, SPECIES_SANDSHREW}, + {23, 23, SPECIES_TRAPINCH}, + {24, 24, SPECIES_SANDSHREW}, + {24, 24, SPECIES_TRAPINCH}, }; const struct WildPokemonInfo gMirageTower_1F_LandMonsInfo = {10, gMirageTower_1F_LandMons}; const struct WildPokemon gMirageTower_2F_LandMons[] = { - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {22, 22, SPECIES_SANDSHREW}, - {22, 22, SPECIES_TRAPINCH}, - {23, 23, SPECIES_SANDSHREW}, - {23, 23, SPECIES_TRAPINCH}, - {24, 24, SPECIES_SANDSHREW}, - {24, 24, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {22, 22, SPECIES_SANDSHREW}, + {22, 22, SPECIES_TRAPINCH}, + {23, 23, SPECIES_SANDSHREW}, + {23, 23, SPECIES_TRAPINCH}, + {24, 24, SPECIES_SANDSHREW}, + {24, 24, SPECIES_TRAPINCH}, }; const struct WildPokemonInfo gMirageTower_2F_LandMonsInfo = {10, gMirageTower_2F_LandMons}; const struct WildPokemon gMirageTower_3F_LandMons[] = { - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {22, 22, SPECIES_SANDSHREW}, - {22, 22, SPECIES_TRAPINCH}, - {23, 23, SPECIES_SANDSHREW}, - {23, 23, SPECIES_TRAPINCH}, - {24, 24, SPECIES_SANDSHREW}, - {24, 24, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {22, 22, SPECIES_SANDSHREW}, + {22, 22, SPECIES_TRAPINCH}, + {23, 23, SPECIES_SANDSHREW}, + {23, 23, SPECIES_TRAPINCH}, + {24, 24, SPECIES_SANDSHREW}, + {24, 24, SPECIES_TRAPINCH}, }; const struct WildPokemonInfo gMirageTower_3F_LandMonsInfo = {10, gMirageTower_3F_LandMons}; const struct WildPokemon gMirageTower_4F_LandMons[] = { - {21, 21, SPECIES_SANDSHREW}, - {21, 21, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {20, 20, SPECIES_SANDSHREW}, - {20, 20, SPECIES_TRAPINCH}, - {22, 22, SPECIES_SANDSHREW}, - {22, 22, SPECIES_TRAPINCH}, - {23, 23, SPECIES_SANDSHREW}, - {23, 23, SPECIES_TRAPINCH}, - {24, 24, SPECIES_SANDSHREW}, - {24, 24, SPECIES_TRAPINCH}, + {21, 21, SPECIES_SANDSHREW}, + {21, 21, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {20, 20, SPECIES_SANDSHREW}, + {20, 20, SPECIES_TRAPINCH}, + {22, 22, SPECIES_SANDSHREW}, + {22, 22, SPECIES_TRAPINCH}, + {23, 23, SPECIES_SANDSHREW}, + {23, 23, SPECIES_TRAPINCH}, + {24, 24, SPECIES_SANDSHREW}, + {24, 24, SPECIES_TRAPINCH}, }; const struct WildPokemonInfo gMirageTower_4F_LandMonsInfo = {10, gMirageTower_4F_LandMons}; const struct WildPokemon gDesertUnderpass_LandMons[] = { - {38, 38, SPECIES_DITTO}, - {35, 35, SPECIES_WHISMUR}, - {40, 40, SPECIES_DITTO}, - {40, 40, SPECIES_LOUDRED}, - {41, 41, SPECIES_DITTO}, - {36, 36, SPECIES_WHISMUR}, - {38, 38, SPECIES_LOUDRED}, - {42, 42, SPECIES_DITTO}, - {38, 38, SPECIES_WHISMUR}, - {43, 43, SPECIES_DITTO}, - {44, 44, SPECIES_LOUDRED}, - {45, 45, SPECIES_DITTO}, + {38, 38, SPECIES_DITTO}, + {35, 35, SPECIES_WHISMUR}, + {40, 40, SPECIES_DITTO}, + {40, 40, SPECIES_LOUDRED}, + {41, 41, SPECIES_DITTO}, + {36, 36, SPECIES_WHISMUR}, + {38, 38, SPECIES_LOUDRED}, + {42, 42, SPECIES_DITTO}, + {38, 38, SPECIES_WHISMUR}, + {43, 43, SPECIES_DITTO}, + {44, 44, SPECIES_LOUDRED}, + {45, 45, SPECIES_DITTO}, }; const struct WildPokemonInfo gDesertUnderpass_LandMonsInfo = {10, gDesertUnderpass_LandMons}; const struct WildPokemon gArtisanCave_B1F_LandMons[] = { - {40, 40, SPECIES_SMEARGLE}, - {41, 41, SPECIES_SMEARGLE}, - {42, 42, SPECIES_SMEARGLE}, - {43, 43, SPECIES_SMEARGLE}, - {44, 44, SPECIES_SMEARGLE}, - {45, 45, SPECIES_SMEARGLE}, - {46, 46, SPECIES_SMEARGLE}, - {47, 47, SPECIES_SMEARGLE}, - {48, 48, SPECIES_SMEARGLE}, - {49, 49, SPECIES_SMEARGLE}, - {50, 50, SPECIES_SMEARGLE}, - {50, 50, SPECIES_SMEARGLE}, + {40, 40, SPECIES_SMEARGLE}, + {41, 41, SPECIES_SMEARGLE}, + {42, 42, SPECIES_SMEARGLE}, + {43, 43, SPECIES_SMEARGLE}, + {44, 44, SPECIES_SMEARGLE}, + {45, 45, SPECIES_SMEARGLE}, + {46, 46, SPECIES_SMEARGLE}, + {47, 47, SPECIES_SMEARGLE}, + {48, 48, SPECIES_SMEARGLE}, + {49, 49, SPECIES_SMEARGLE}, + {50, 50, SPECIES_SMEARGLE}, + {50, 50, SPECIES_SMEARGLE}, }; const struct WildPokemonInfo gArtisanCave_B1F_LandMonsInfo = {10, gArtisanCave_B1F_LandMons}; const struct WildPokemon gArtisanCave_1F_LandMons[] = { - {40, 40, SPECIES_SMEARGLE}, - {41, 41, SPECIES_SMEARGLE}, - {42, 42, SPECIES_SMEARGLE}, - {43, 43, SPECIES_SMEARGLE}, - {44, 44, SPECIES_SMEARGLE}, - {45, 45, SPECIES_SMEARGLE}, - {46, 46, SPECIES_SMEARGLE}, - {47, 47, SPECIES_SMEARGLE}, - {48, 48, SPECIES_SMEARGLE}, - {49, 49, SPECIES_SMEARGLE}, - {50, 50, SPECIES_SMEARGLE}, - {50, 50, SPECIES_SMEARGLE}, + {40, 40, SPECIES_SMEARGLE}, + {41, 41, SPECIES_SMEARGLE}, + {42, 42, SPECIES_SMEARGLE}, + {43, 43, SPECIES_SMEARGLE}, + {44, 44, SPECIES_SMEARGLE}, + {45, 45, SPECIES_SMEARGLE}, + {46, 46, SPECIES_SMEARGLE}, + {47, 47, SPECIES_SMEARGLE}, + {48, 48, SPECIES_SMEARGLE}, + {49, 49, SPECIES_SMEARGLE}, + {50, 50, SPECIES_SMEARGLE}, + {50, 50, SPECIES_SMEARGLE}, }; const struct WildPokemonInfo gArtisanCave_1F_LandMonsInfo = {10, gArtisanCave_1F_LandMons}; const struct WildPokemon gAlteringCave1_LandMons[] = { - {10, 10, SPECIES_ZUBAT}, - {12, 12, SPECIES_ZUBAT}, - {8, 8, SPECIES_ZUBAT}, - {14, 14, SPECIES_ZUBAT}, - {10, 10, SPECIES_ZUBAT}, - {12, 12, SPECIES_ZUBAT}, - {16, 16, SPECIES_ZUBAT}, - {6, 6, SPECIES_ZUBAT}, - {8, 8, SPECIES_ZUBAT}, - {14, 14, SPECIES_ZUBAT}, - {8, 8, SPECIES_ZUBAT}, - {14, 14, SPECIES_ZUBAT}, + {10, 10, SPECIES_ZUBAT}, + {12, 12, SPECIES_ZUBAT}, + {8, 8, SPECIES_ZUBAT}, + {14, 14, SPECIES_ZUBAT}, + {10, 10, SPECIES_ZUBAT}, + {12, 12, SPECIES_ZUBAT}, + {16, 16, SPECIES_ZUBAT}, + {6, 6, SPECIES_ZUBAT}, + {8, 8, SPECIES_ZUBAT}, + {14, 14, SPECIES_ZUBAT}, + {8, 8, SPECIES_ZUBAT}, + {14, 14, SPECIES_ZUBAT}, }; const struct WildPokemonInfo gAlteringCave1_LandMonsInfo = {7, gAlteringCave1_LandMons}; const struct WildPokemon gAlteringCave2_LandMons[] = { - {7, 7, SPECIES_MAREEP}, - {9, 9, SPECIES_MAREEP}, - {5, 5, SPECIES_MAREEP}, - {11, 11, SPECIES_MAREEP}, - {7, 7, SPECIES_MAREEP}, - {9, 9, SPECIES_MAREEP}, - {13, 13, SPECIES_MAREEP}, - {3, 3, SPECIES_MAREEP}, - {5, 5, SPECIES_MAREEP}, - {11, 11, SPECIES_MAREEP}, - {5, 5, SPECIES_MAREEP}, - {11, 11, SPECIES_MAREEP}, + {7, 7, SPECIES_MAREEP}, + {9, 9, SPECIES_MAREEP}, + {5, 5, SPECIES_MAREEP}, + {11, 11, SPECIES_MAREEP}, + {7, 7, SPECIES_MAREEP}, + {9, 9, SPECIES_MAREEP}, + {13, 13, SPECIES_MAREEP}, + {3, 3, SPECIES_MAREEP}, + {5, 5, SPECIES_MAREEP}, + {11, 11, SPECIES_MAREEP}, + {5, 5, SPECIES_MAREEP}, + {11, 11, SPECIES_MAREEP}, }; const struct WildPokemonInfo gAlteringCave2_LandMonsInfo = {7, gAlteringCave2_LandMons}; const struct WildPokemon gAlteringCave3_LandMons[] = { - {23, 23, SPECIES_PINECO}, - {25, 25, SPECIES_PINECO}, - {22, 22, SPECIES_PINECO}, - {27, 27, SPECIES_PINECO}, - {23, 23, SPECIES_PINECO}, - {25, 25, SPECIES_PINECO}, - {29, 29, SPECIES_PINECO}, - {19, 19, SPECIES_PINECO}, - {21, 21, SPECIES_PINECO}, - {27, 27, SPECIES_PINECO}, - {21, 21, SPECIES_PINECO}, - {27, 27, SPECIES_PINECO}, + {23, 23, SPECIES_PINECO}, + {25, 25, SPECIES_PINECO}, + {22, 22, SPECIES_PINECO}, + {27, 27, SPECIES_PINECO}, + {23, 23, SPECIES_PINECO}, + {25, 25, SPECIES_PINECO}, + {29, 29, SPECIES_PINECO}, + {19, 19, SPECIES_PINECO}, + {21, 21, SPECIES_PINECO}, + {27, 27, SPECIES_PINECO}, + {21, 21, SPECIES_PINECO}, + {27, 27, SPECIES_PINECO}, }; const struct WildPokemonInfo gAlteringCave3_LandMonsInfo = {7, gAlteringCave3_LandMons}; const struct WildPokemon gAlteringCave4_LandMons[] = { - {16, 16, SPECIES_HOUNDOUR}, - {18, 18, SPECIES_HOUNDOUR}, - {14, 14, SPECIES_HOUNDOUR}, - {20, 20, SPECIES_HOUNDOUR}, - {16, 16, SPECIES_HOUNDOUR}, - {18, 18, SPECIES_HOUNDOUR}, - {22, 22, SPECIES_HOUNDOUR}, - {12, 12, SPECIES_HOUNDOUR}, - {14, 14, SPECIES_HOUNDOUR}, - {20, 20, SPECIES_HOUNDOUR}, - {14, 14, SPECIES_HOUNDOUR}, - {20, 20, SPECIES_HOUNDOUR}, + {16, 16, SPECIES_HOUNDOUR}, + {18, 18, SPECIES_HOUNDOUR}, + {14, 14, SPECIES_HOUNDOUR}, + {20, 20, SPECIES_HOUNDOUR}, + {16, 16, SPECIES_HOUNDOUR}, + {18, 18, SPECIES_HOUNDOUR}, + {22, 22, SPECIES_HOUNDOUR}, + {12, 12, SPECIES_HOUNDOUR}, + {14, 14, SPECIES_HOUNDOUR}, + {20, 20, SPECIES_HOUNDOUR}, + {14, 14, SPECIES_HOUNDOUR}, + {20, 20, SPECIES_HOUNDOUR}, }; const struct WildPokemonInfo gAlteringCave4_LandMonsInfo = {7, gAlteringCave4_LandMons}; const struct WildPokemon gAlteringCave5_LandMons[] = { - {10, 10, SPECIES_TEDDIURSA}, - {12, 12, SPECIES_TEDDIURSA}, - {8, 8, SPECIES_TEDDIURSA}, - {14, 14, SPECIES_TEDDIURSA}, - {10, 10, SPECIES_TEDDIURSA}, - {12, 12, SPECIES_TEDDIURSA}, - {16, 16, SPECIES_TEDDIURSA}, - {6, 6, SPECIES_TEDDIURSA}, - {8, 8, SPECIES_TEDDIURSA}, - {14, 14, SPECIES_TEDDIURSA}, - {8, 8, SPECIES_TEDDIURSA}, - {14, 14, SPECIES_TEDDIURSA}, + {10, 10, SPECIES_TEDDIURSA}, + {12, 12, SPECIES_TEDDIURSA}, + {8, 8, SPECIES_TEDDIURSA}, + {14, 14, SPECIES_TEDDIURSA}, + {10, 10, SPECIES_TEDDIURSA}, + {12, 12, SPECIES_TEDDIURSA}, + {16, 16, SPECIES_TEDDIURSA}, + {6, 6, SPECIES_TEDDIURSA}, + {8, 8, SPECIES_TEDDIURSA}, + {14, 14, SPECIES_TEDDIURSA}, + {8, 8, SPECIES_TEDDIURSA}, + {14, 14, SPECIES_TEDDIURSA}, }; const struct WildPokemonInfo gAlteringCave5_LandMonsInfo = {7, gAlteringCave5_LandMons}; const struct WildPokemon gAlteringCave6_LandMons[] = { - {22, 22, SPECIES_AIPOM}, - {24, 24, SPECIES_AIPOM}, - {20, 20, SPECIES_AIPOM}, - {26, 26, SPECIES_AIPOM}, - {22, 22, SPECIES_AIPOM}, - {24, 24, SPECIES_AIPOM}, - {28, 28, SPECIES_AIPOM}, - {18, 18, SPECIES_AIPOM}, - {20, 20, SPECIES_AIPOM}, - {26, 26, SPECIES_AIPOM}, - {20, 20, SPECIES_AIPOM}, - {26, 26, SPECIES_AIPOM}, + {22, 22, SPECIES_AIPOM}, + {24, 24, SPECIES_AIPOM}, + {20, 20, SPECIES_AIPOM}, + {26, 26, SPECIES_AIPOM}, + {22, 22, SPECIES_AIPOM}, + {24, 24, SPECIES_AIPOM}, + {28, 28, SPECIES_AIPOM}, + {18, 18, SPECIES_AIPOM}, + {20, 20, SPECIES_AIPOM}, + {26, 26, SPECIES_AIPOM}, + {20, 20, SPECIES_AIPOM}, + {26, 26, SPECIES_AIPOM}, }; const struct WildPokemonInfo gAlteringCave6_LandMonsInfo = {7, gAlteringCave6_LandMons}; const struct WildPokemon gAlteringCave7_LandMons[] = { - {22, 22, SPECIES_SHUCKLE}, - {24, 24, SPECIES_SHUCKLE}, - {20, 20, SPECIES_SHUCKLE}, - {26, 26, SPECIES_SHUCKLE}, - {22, 22, SPECIES_SHUCKLE}, - {24, 24, SPECIES_SHUCKLE}, - {28, 28, SPECIES_SHUCKLE}, - {18, 18, SPECIES_SHUCKLE}, - {20, 20, SPECIES_SHUCKLE}, - {26, 26, SPECIES_SHUCKLE}, - {20, 20, SPECIES_SHUCKLE}, - {26, 26, SPECIES_SHUCKLE}, + {22, 22, SPECIES_SHUCKLE}, + {24, 24, SPECIES_SHUCKLE}, + {20, 20, SPECIES_SHUCKLE}, + {26, 26, SPECIES_SHUCKLE}, + {22, 22, SPECIES_SHUCKLE}, + {24, 24, SPECIES_SHUCKLE}, + {28, 28, SPECIES_SHUCKLE}, + {18, 18, SPECIES_SHUCKLE}, + {20, 20, SPECIES_SHUCKLE}, + {26, 26, SPECIES_SHUCKLE}, + {20, 20, SPECIES_SHUCKLE}, + {26, 26, SPECIES_SHUCKLE}, }; const struct WildPokemonInfo gAlteringCave7_LandMonsInfo = {7, gAlteringCave7_LandMons}; const struct WildPokemon gAlteringCave8_LandMons[] = { - {22, 22, SPECIES_STANTLER}, - {24, 24, SPECIES_STANTLER}, - {20, 20, SPECIES_STANTLER}, - {26, 26, SPECIES_STANTLER}, - {22, 22, SPECIES_STANTLER}, - {24, 24, SPECIES_STANTLER}, - {28, 28, SPECIES_STANTLER}, - {18, 18, SPECIES_STANTLER}, - {20, 20, SPECIES_STANTLER}, - {26, 26, SPECIES_STANTLER}, - {20, 20, SPECIES_STANTLER}, - {26, 26, SPECIES_STANTLER}, + {22, 22, SPECIES_STANTLER}, + {24, 24, SPECIES_STANTLER}, + {20, 20, SPECIES_STANTLER}, + {26, 26, SPECIES_STANTLER}, + {22, 22, SPECIES_STANTLER}, + {24, 24, SPECIES_STANTLER}, + {28, 28, SPECIES_STANTLER}, + {18, 18, SPECIES_STANTLER}, + {20, 20, SPECIES_STANTLER}, + {26, 26, SPECIES_STANTLER}, + {20, 20, SPECIES_STANTLER}, + {26, 26, SPECIES_STANTLER}, }; const struct WildPokemonInfo gAlteringCave8_LandMonsInfo = {7, gAlteringCave8_LandMons}; const struct WildPokemon gAlteringCave9_LandMons[] = { - {22, 22, SPECIES_SMEARGLE}, - {24, 24, SPECIES_SMEARGLE}, - {20, 20, SPECIES_SMEARGLE}, - {26, 26, SPECIES_SMEARGLE}, - {22, 22, SPECIES_SMEARGLE}, - {24, 24, SPECIES_SMEARGLE}, - {28, 28, SPECIES_SMEARGLE}, - {18, 18, SPECIES_SMEARGLE}, - {20, 20, SPECIES_SMEARGLE}, - {26, 26, SPECIES_SMEARGLE}, - {20, 20, SPECIES_SMEARGLE}, - {26, 26, SPECIES_SMEARGLE}, + {22, 22, SPECIES_SMEARGLE}, + {24, 24, SPECIES_SMEARGLE}, + {20, 20, SPECIES_SMEARGLE}, + {26, 26, SPECIES_SMEARGLE}, + {22, 22, SPECIES_SMEARGLE}, + {24, 24, SPECIES_SMEARGLE}, + {28, 28, SPECIES_SMEARGLE}, + {18, 18, SPECIES_SMEARGLE}, + {20, 20, SPECIES_SMEARGLE}, + {26, 26, SPECIES_SMEARGLE}, + {20, 20, SPECIES_SMEARGLE}, + {26, 26, SPECIES_SMEARGLE}, }; const struct WildPokemonInfo gAlteringCave9_LandMonsInfo = {7, gAlteringCave9_LandMons}; const struct WildPokemon gMeteorFalls_StevensCave_LandMons[] = { - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_GOLBAT}, - {33, 33, SPECIES_GOLBAT}, - {35, 35, SPECIES_SOLROCK}, - {33, 33, SPECIES_SOLROCK}, - {37, 37, SPECIES_SOLROCK}, - {35, 35, SPECIES_GOLBAT}, - {39, 39, SPECIES_SOLROCK}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, - {38, 38, SPECIES_GOLBAT}, - {40, 40, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_GOLBAT}, + {33, 33, SPECIES_GOLBAT}, + {35, 35, SPECIES_SOLROCK}, + {33, 33, SPECIES_SOLROCK}, + {37, 37, SPECIES_SOLROCK}, + {35, 35, SPECIES_GOLBAT}, + {39, 39, SPECIES_SOLROCK}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, + {38, 38, SPECIES_GOLBAT}, + {40, 40, SPECIES_GOLBAT}, }; const struct WildPokemonInfo gMeteorFalls_StevensCave_LandMonsInfo = {10, gMeteorFalls_StevensCave_LandMons}; const struct WildPokemonHeader gWildMonHeaders[] = { - { - .mapGroup = MAP_GROUP(ROUTE101), - .mapNum = MAP_NUM(ROUTE101), - .landMonsInfo = &gRoute101_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE102), - .mapNum = MAP_NUM(ROUTE102), - .landMonsInfo = &gRoute102_LandMonsInfo, - .waterMonsInfo = &gRoute102_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute102_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE103), - .mapNum = MAP_NUM(ROUTE103), - .landMonsInfo = &gRoute103_LandMonsInfo, - .waterMonsInfo = &gRoute103_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute103_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE104), - .mapNum = MAP_NUM(ROUTE104), - .landMonsInfo = &gRoute104_LandMonsInfo, - .waterMonsInfo = &gRoute104_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute104_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE105), - .mapNum = MAP_NUM(ROUTE105), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute105_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute105_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE110), - .mapNum = MAP_NUM(ROUTE110), - .landMonsInfo = &gRoute110_LandMonsInfo, - .waterMonsInfo = &gRoute110_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute110_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE111), - .mapNum = MAP_NUM(ROUTE111), - .landMonsInfo = &gRoute111_LandMonsInfo, - .waterMonsInfo = &gRoute111_WaterMonsInfo, - .rockSmashMonsInfo = &gRoute111_RockSmashMonsInfo, - .fishingMonsInfo = &gRoute111_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE112), - .mapNum = MAP_NUM(ROUTE112), - .landMonsInfo = &gRoute112_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE113), - .mapNum = MAP_NUM(ROUTE113), - .landMonsInfo = &gRoute113_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE114), - .mapNum = MAP_NUM(ROUTE114), - .landMonsInfo = &gRoute114_LandMonsInfo, - .waterMonsInfo = &gRoute114_WaterMonsInfo, - .rockSmashMonsInfo = &gRoute114_RockSmashMonsInfo, - .fishingMonsInfo = &gRoute114_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE116), - .mapNum = MAP_NUM(ROUTE116), - .landMonsInfo = &gRoute116_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE117), - .mapNum = MAP_NUM(ROUTE117), - .landMonsInfo = &gRoute117_LandMonsInfo, - .waterMonsInfo = &gRoute117_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute117_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE118), - .mapNum = MAP_NUM(ROUTE118), - .landMonsInfo = &gRoute118_LandMonsInfo, - .waterMonsInfo = &gRoute118_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute118_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE124), - .mapNum = MAP_NUM(ROUTE124), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute124_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute124_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(PETALBURG_WOODS), - .mapNum = MAP_NUM(PETALBURG_WOODS), - .landMonsInfo = &gPetalburgWoods_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(RUSTURF_TUNNEL), - .mapNum = MAP_NUM(RUSTURF_TUNNEL), - .landMonsInfo = &gRusturfTunnel_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(GRANITE_CAVE_1F), - .mapNum = MAP_NUM(GRANITE_CAVE_1F), - .landMonsInfo = &gGraniteCave_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(GRANITE_CAVE_B1F), - .mapNum = MAP_NUM(GRANITE_CAVE_B1F), - .landMonsInfo = &gGraniteCave_B1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_1F), - .mapNum = MAP_NUM(MT_PYRE_1F), - .landMonsInfo = &gMtPyre_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(VICTORY_ROAD_1F), - .mapNum = MAP_NUM(VICTORY_ROAD_1F), - .landMonsInfo = &gVictoryRoad_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH), - .landMonsInfo = &gSafariZone_South_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(UNDERWATER2), - .mapNum = MAP_NUM(UNDERWATER2), - .landMonsInfo = NULL, - .waterMonsInfo = &gUnderwater2_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F), - .mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F), - .landMonsInfo = NULL, - .waterMonsInfo = &gAbandonedShip_Rooms_B1F_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gAbandonedShip_Rooms_B1F_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(GRANITE_CAVE_B2F), - .mapNum = MAP_NUM(GRANITE_CAVE_B2F), - .landMonsInfo = &gGraniteCave_B2F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = &gGraniteCave_B2F_RockSmashMonsInfo, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(FIERY_PATH), - .mapNum = MAP_NUM(FIERY_PATH), - .landMonsInfo = &gFieryPath_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R), - .mapNum = MAP_NUM(METEOR_FALLS_B1F_2R), - .landMonsInfo = &gMeteorFalls_B1F_2R_LandMonsInfo, - .waterMonsInfo = &gMeteorFalls_B1F_2R_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMeteorFalls_B1F_2R_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(JAGGED_PASS), - .mapNum = MAP_NUM(JAGGED_PASS), - .landMonsInfo = &gJaggedPass_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE106), - .mapNum = MAP_NUM(ROUTE106), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute106_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute106_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE107), - .mapNum = MAP_NUM(ROUTE107), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute107_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute107_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE108), - .mapNum = MAP_NUM(ROUTE108), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute108_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute108_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE109), - .mapNum = MAP_NUM(ROUTE109), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute109_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute109_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE115), - .mapNum = MAP_NUM(ROUTE115), - .landMonsInfo = &gRoute115_LandMonsInfo, - .waterMonsInfo = &gRoute115_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute115_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE), - .mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE), - .landMonsInfo = &gNewMauville_Inside_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE119), - .mapNum = MAP_NUM(ROUTE119), - .landMonsInfo = &gRoute119_LandMonsInfo, - .waterMonsInfo = &gRoute119_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute119_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE120), - .mapNum = MAP_NUM(ROUTE120), - .landMonsInfo = &gRoute120_LandMonsInfo, - .waterMonsInfo = &gRoute120_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute120_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE121), - .mapNum = MAP_NUM(ROUTE121), - .landMonsInfo = &gRoute121_LandMonsInfo, - .waterMonsInfo = &gRoute121_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute121_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE122), - .mapNum = MAP_NUM(ROUTE122), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute122_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute122_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE123), - .mapNum = MAP_NUM(ROUTE123), - .landMonsInfo = &gRoute123_LandMonsInfo, - .waterMonsInfo = &gRoute123_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute123_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_2F), - .mapNum = MAP_NUM(MT_PYRE_2F), - .landMonsInfo = &gMtPyre_2F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_3F), - .mapNum = MAP_NUM(MT_PYRE_3F), - .landMonsInfo = &gMtPyre_3F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_4F), - .mapNum = MAP_NUM(MT_PYRE_4F), - .landMonsInfo = &gMtPyre_4F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_5F), - .mapNum = MAP_NUM(MT_PYRE_5F), - .landMonsInfo = &gMtPyre_5F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_6F), - .mapNum = MAP_NUM(MT_PYRE_6F), - .landMonsInfo = &gMtPyre_6F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR), - .mapNum = MAP_NUM(MT_PYRE_EXTERIOR), - .landMonsInfo = &gMtPyre_Exterior_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MT_PYRE_SUMMIT), - .mapNum = MAP_NUM(MT_PYRE_SUMMIT), - .landMonsInfo = &gMtPyre_Summit_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM), - .mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM), - .landMonsInfo = &gGraniteCave_StevensRoom_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ROUTE125), - .mapNum = MAP_NUM(ROUTE125), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute125_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute125_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE126), - .mapNum = MAP_NUM(ROUTE126), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute126_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute126_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE127), - .mapNum = MAP_NUM(ROUTE127), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute127_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute127_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE128), - .mapNum = MAP_NUM(ROUTE128), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute128_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute128_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE129), - .mapNum = MAP_NUM(ROUTE129), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute129_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute129_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE130), - .mapNum = MAP_NUM(ROUTE130), - .landMonsInfo = &gRoute130_LandMonsInfo, - .waterMonsInfo = &gRoute130_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute130_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE131), - .mapNum = MAP_NUM(ROUTE131), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute131_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute131_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE132), - .mapNum = MAP_NUM(ROUTE132), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute132_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute132_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE133), - .mapNum = MAP_NUM(ROUTE133), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute133_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute133_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ROUTE134), - .mapNum = MAP_NUM(ROUTE134), - .landMonsInfo = NULL, - .waterMonsInfo = &gRoute134_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gRoute134_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), - .mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), - .landMonsInfo = NULL, - .waterMonsInfo = &gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1), - .landMonsInfo = &gSeafloorCavern_Room1_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2), - .landMonsInfo = &gSeafloorCavern_Room2_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3), - .landMonsInfo = &gSeafloorCavern_Room3_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4), - .landMonsInfo = &gSeafloorCavern_Room4_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5), - .landMonsInfo = &gSeafloorCavern_Room5_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6), - .landMonsInfo = &gSeafloorCavern_Room6_LandMonsInfo, - .waterMonsInfo = &gSeafloorCavern_Room6_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSeafloorCavern_Room6_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7), - .landMonsInfo = &gSeafloorCavern_Room7_LandMonsInfo, - .waterMonsInfo = &gSeafloorCavern_Room7_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSeafloorCavern_Room7_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8), - .landMonsInfo = &gSeafloorCavern_Room8_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE), - .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE), - .landMonsInfo = NULL, - .waterMonsInfo = &gSeafloorCavern_Entrance_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSeafloorCavern_Entrance_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE), - .landMonsInfo = &gCaveOfOrigin_Entrance_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F), - .landMonsInfo = &gCaveOfOrigin_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), - .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), - .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), - .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE), - .mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE), - .landMonsInfo = &gNewMauville_Entrance_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST), - .landMonsInfo = &gSafariZone_Southwest_LandMonsInfo, - .waterMonsInfo = &gSafariZone_Southwest_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTH), - .landMonsInfo = &gSafariZone_North_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST), - .landMonsInfo = &gSafariZone_Northwest_LandMonsInfo, - .waterMonsInfo = &gSafariZone_Northwest_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSafariZone_Northwest_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(VICTORY_ROAD_B1F), - .mapNum = MAP_NUM(VICTORY_ROAD_B1F), - .landMonsInfo = &gVictoryRoad_B1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = &gVictoryRoad_B1F_RockSmashMonsInfo, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(VICTORY_ROAD_B2F), - .mapNum = MAP_NUM(VICTORY_ROAD_B2F), - .landMonsInfo = &gVictoryRoad_B2F_LandMonsInfo, - .waterMonsInfo = &gVictoryRoad_B2F_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gVictoryRoad_B2F_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R), - .mapNum = MAP_NUM(METEOR_FALLS_1F_1R), - .landMonsInfo = &gMeteorFalls_1F_1R_LandMonsInfo, - .waterMonsInfo = &gMeteorFalls_1F_1R_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMeteorFalls_1F_1R_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R), - .mapNum = MAP_NUM(METEOR_FALLS_1F_2R), - .landMonsInfo = &gMeteorFalls_1F_2R_LandMonsInfo, - .waterMonsInfo = &gMeteorFalls_1F_2R_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMeteorFalls_1F_2R_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R), - .mapNum = MAP_NUM(METEOR_FALLS_B1F_1R), - .landMonsInfo = &gMeteorFalls_B1F_1R_LandMonsInfo, - .waterMonsInfo = &gMeteorFalls_B1F_1R_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMeteorFalls_B1F_1R_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), - .landMonsInfo = &gShoalCave_LowTideStairsRoom_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), - .landMonsInfo = &gShoalCave_LowTideLowerRoom_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), - .landMonsInfo = &gShoalCave_LowTideInnerRoom_LandMonsInfo, - .waterMonsInfo = &gShoalCave_LowTideInnerRoom_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gShoalCave_LowTideInnerRoom_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), - .landMonsInfo = &gShoalCave_LowTideEntranceRoom_LandMonsInfo, - .waterMonsInfo = &gShoalCave_LowTideEntranceRoom_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gShoalCave_LowTideEntranceRoom_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(LILYCOVE_CITY), - .mapNum = MAP_NUM(LILYCOVE_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gLilycoveCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gLilycoveCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(DEWFORD_TOWN), - .mapNum = MAP_NUM(DEWFORD_TOWN), - .landMonsInfo = NULL, - .waterMonsInfo = &gDewfordTown_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gDewfordTown_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SLATEPORT_CITY), - .mapNum = MAP_NUM(SLATEPORT_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gSlateportCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSlateportCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(MOSSDEEP_CITY), - .mapNum = MAP_NUM(MOSSDEEP_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gMossdeepCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gMossdeepCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(PACIFIDLOG_TOWN), - .mapNum = MAP_NUM(PACIFIDLOG_TOWN), - .landMonsInfo = NULL, - .waterMonsInfo = &gPacifidlogTown_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gPacifidlogTown_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(EVER_GRANDE_CITY), - .mapNum = MAP_NUM(EVER_GRANDE_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gEverGrandeCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gEverGrandeCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(PETALBURG_CITY), - .mapNum = MAP_NUM(PETALBURG_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gPetalburgCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gPetalburgCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(UNDERWATER1), - .mapNum = MAP_NUM(UNDERWATER1), - .landMonsInfo = NULL, - .waterMonsInfo = &gUnderwater1_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), - .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), - .landMonsInfo = &gShoalCave_LowTideIceRoom_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SKY_PILLAR_1F), - .mapNum = MAP_NUM(SKY_PILLAR_1F), - .landMonsInfo = &gSkyPillar_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SOOTOPOLIS_CITY), - .mapNum = MAP_NUM(SOOTOPOLIS_CITY), - .landMonsInfo = NULL, - .waterMonsInfo = &gSootopolisCity_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSootopolisCity_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SKY_PILLAR_3F), - .mapNum = MAP_NUM(SKY_PILLAR_3F), - .landMonsInfo = &gSkyPillar_3F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SKY_PILLAR_5F), - .mapNum = MAP_NUM(SKY_PILLAR_5F), - .landMonsInfo = &gSkyPillar_5F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), - .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo, - .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo, - }, - { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), - .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_1F), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_1F), - .landMonsInfo = &gMagmaHideout_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_1R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_1R), - .landMonsInfo = &gMagmaHideout_2F_1R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_2R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_2R), - .landMonsInfo = &gMagmaHideout_2F_2R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_1R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_1R), - .landMonsInfo = &gMagmaHideout_3F_1R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_2R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_2R), - .landMonsInfo = &gMagmaHideout_3F_2R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_4F), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_4F), - .landMonsInfo = &gMagmaHideout_4F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_3R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_3R), - .landMonsInfo = &gMagmaHideout_3F_3R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_3R), - .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_3R), - .landMonsInfo = &gMagmaHideout_2F_3R_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MIRAGE_TOWER_1F), - .mapNum = MAP_NUM(MIRAGE_TOWER_1F), - .landMonsInfo = &gMirageTower_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MIRAGE_TOWER_2F), - .mapNum = MAP_NUM(MIRAGE_TOWER_2F), - .landMonsInfo = &gMirageTower_2F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MIRAGE_TOWER_3F), - .mapNum = MAP_NUM(MIRAGE_TOWER_3F), - .landMonsInfo = &gMirageTower_3F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(MIRAGE_TOWER_4F), - .mapNum = MAP_NUM(MIRAGE_TOWER_4F), - .landMonsInfo = &gMirageTower_4F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(DESERT_UNDERPASS), - .mapNum = MAP_NUM(DESERT_UNDERPASS), - .landMonsInfo = &gDesertUnderpass_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ARTISAN_CAVE_B1F), - .mapNum = MAP_NUM(ARTISAN_CAVE_B1F), - .landMonsInfo = &gArtisanCave_B1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ARTISAN_CAVE_1F), - .mapNum = MAP_NUM(ARTISAN_CAVE_1F), - .landMonsInfo = &gArtisanCave_1F_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave1_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave2_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave3_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave4_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave5_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave6_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave7_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave8_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(ALTERING_CAVE), - .mapNum = MAP_NUM(ALTERING_CAVE), - .landMonsInfo = &gAlteringCave9_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(METEOR_FALLS_STEVENS_CAVE), - .mapNum = MAP_NUM(METEOR_FALLS_STEVENS_CAVE), - .landMonsInfo = &gMeteorFalls_StevensCave_LandMonsInfo, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = MAP_GROUP(UNDEFINED), - .mapNum = MAP_NUM(UNDEFINED), - .landMonsInfo = NULL, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, + { + .mapGroup = MAP_GROUP(ROUTE101), + .mapNum = MAP_NUM(ROUTE101), + .landMonsInfo = &gRoute101_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE102), + .mapNum = MAP_NUM(ROUTE102), + .landMonsInfo = &gRoute102_LandMonsInfo, + .waterMonsInfo = &gRoute102_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute102_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE103), + .mapNum = MAP_NUM(ROUTE103), + .landMonsInfo = &gRoute103_LandMonsInfo, + .waterMonsInfo = &gRoute103_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute103_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE104), + .mapNum = MAP_NUM(ROUTE104), + .landMonsInfo = &gRoute104_LandMonsInfo, + .waterMonsInfo = &gRoute104_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute104_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE105), + .mapNum = MAP_NUM(ROUTE105), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute105_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute105_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE110), + .mapNum = MAP_NUM(ROUTE110), + .landMonsInfo = &gRoute110_LandMonsInfo, + .waterMonsInfo = &gRoute110_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute110_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE111), + .mapNum = MAP_NUM(ROUTE111), + .landMonsInfo = &gRoute111_LandMonsInfo, + .waterMonsInfo = &gRoute111_WaterMonsInfo, + .rockSmashMonsInfo = &gRoute111_RockSmashMonsInfo, + .fishingMonsInfo = &gRoute111_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE112), + .mapNum = MAP_NUM(ROUTE112), + .landMonsInfo = &gRoute112_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE113), + .mapNum = MAP_NUM(ROUTE113), + .landMonsInfo = &gRoute113_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE114), + .mapNum = MAP_NUM(ROUTE114), + .landMonsInfo = &gRoute114_LandMonsInfo, + .waterMonsInfo = &gRoute114_WaterMonsInfo, + .rockSmashMonsInfo = &gRoute114_RockSmashMonsInfo, + .fishingMonsInfo = &gRoute114_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE116), + .mapNum = MAP_NUM(ROUTE116), + .landMonsInfo = &gRoute116_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE117), + .mapNum = MAP_NUM(ROUTE117), + .landMonsInfo = &gRoute117_LandMonsInfo, + .waterMonsInfo = &gRoute117_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute117_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE118), + .mapNum = MAP_NUM(ROUTE118), + .landMonsInfo = &gRoute118_LandMonsInfo, + .waterMonsInfo = &gRoute118_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute118_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE124), + .mapNum = MAP_NUM(ROUTE124), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute124_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute124_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(PETALBURG_WOODS), + .mapNum = MAP_NUM(PETALBURG_WOODS), + .landMonsInfo = &gPetalburgWoods_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(RUSTURF_TUNNEL), + .mapNum = MAP_NUM(RUSTURF_TUNNEL), + .landMonsInfo = &gRusturfTunnel_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_1F), + .mapNum = MAP_NUM(GRANITE_CAVE_1F), + .landMonsInfo = &gGraniteCave_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_B1F), + .mapNum = MAP_NUM(GRANITE_CAVE_B1F), + .landMonsInfo = &gGraniteCave_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_1F), + .mapNum = MAP_NUM(MT_PYRE_1F), + .landMonsInfo = &gMtPyre_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_1F), + .mapNum = MAP_NUM(VICTORY_ROAD_1F), + .landMonsInfo = &gVictoryRoad_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH), + .landMonsInfo = &gSafariZone_South_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(UNDERWATER2), + .mapNum = MAP_NUM(UNDERWATER2), + .landMonsInfo = NULL, + .waterMonsInfo = &gUnderwater2_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F), + .mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F), + .landMonsInfo = NULL, + .waterMonsInfo = &gAbandonedShip_Rooms_B1F_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gAbandonedShip_Rooms_B1F_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_B2F), + .mapNum = MAP_NUM(GRANITE_CAVE_B2F), + .landMonsInfo = &gGraniteCave_B2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &gGraniteCave_B2F_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(FIERY_PATH), + .mapNum = MAP_NUM(FIERY_PATH), + .landMonsInfo = &gFieryPath_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R), + .mapNum = MAP_NUM(METEOR_FALLS_B1F_2R), + .landMonsInfo = &gMeteorFalls_B1F_2R_LandMonsInfo, + .waterMonsInfo = &gMeteorFalls_B1F_2R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMeteorFalls_B1F_2R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(JAGGED_PASS), + .mapNum = MAP_NUM(JAGGED_PASS), + .landMonsInfo = &gJaggedPass_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE106), + .mapNum = MAP_NUM(ROUTE106), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute106_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute106_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE107), + .mapNum = MAP_NUM(ROUTE107), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute107_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute107_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE108), + .mapNum = MAP_NUM(ROUTE108), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute108_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute108_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE109), + .mapNum = MAP_NUM(ROUTE109), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute109_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute109_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE115), + .mapNum = MAP_NUM(ROUTE115), + .landMonsInfo = &gRoute115_LandMonsInfo, + .waterMonsInfo = &gRoute115_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute115_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE), + .mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE), + .landMonsInfo = &gNewMauville_Inside_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE119), + .mapNum = MAP_NUM(ROUTE119), + .landMonsInfo = &gRoute119_LandMonsInfo, + .waterMonsInfo = &gRoute119_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute119_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE120), + .mapNum = MAP_NUM(ROUTE120), + .landMonsInfo = &gRoute120_LandMonsInfo, + .waterMonsInfo = &gRoute120_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute120_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE121), + .mapNum = MAP_NUM(ROUTE121), + .landMonsInfo = &gRoute121_LandMonsInfo, + .waterMonsInfo = &gRoute121_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute121_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE122), + .mapNum = MAP_NUM(ROUTE122), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute122_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute122_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE123), + .mapNum = MAP_NUM(ROUTE123), + .landMonsInfo = &gRoute123_LandMonsInfo, + .waterMonsInfo = &gRoute123_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute123_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_2F), + .mapNum = MAP_NUM(MT_PYRE_2F), + .landMonsInfo = &gMtPyre_2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_3F), + .mapNum = MAP_NUM(MT_PYRE_3F), + .landMonsInfo = &gMtPyre_3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_4F), + .mapNum = MAP_NUM(MT_PYRE_4F), + .landMonsInfo = &gMtPyre_4F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_5F), + .mapNum = MAP_NUM(MT_PYRE_5F), + .landMonsInfo = &gMtPyre_5F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_6F), + .mapNum = MAP_NUM(MT_PYRE_6F), + .landMonsInfo = &gMtPyre_6F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR), + .mapNum = MAP_NUM(MT_PYRE_EXTERIOR), + .landMonsInfo = &gMtPyre_Exterior_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_SUMMIT), + .mapNum = MAP_NUM(MT_PYRE_SUMMIT), + .landMonsInfo = &gMtPyre_Summit_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM), + .mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM), + .landMonsInfo = &gGraniteCave_StevensRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE125), + .mapNum = MAP_NUM(ROUTE125), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute125_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute125_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE126), + .mapNum = MAP_NUM(ROUTE126), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute126_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute126_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE127), + .mapNum = MAP_NUM(ROUTE127), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute127_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute127_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE128), + .mapNum = MAP_NUM(ROUTE128), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute128_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute128_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE129), + .mapNum = MAP_NUM(ROUTE129), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute129_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute129_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE130), + .mapNum = MAP_NUM(ROUTE130), + .landMonsInfo = &gRoute130_LandMonsInfo, + .waterMonsInfo = &gRoute130_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute130_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE131), + .mapNum = MAP_NUM(ROUTE131), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute131_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute131_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE132), + .mapNum = MAP_NUM(ROUTE132), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute132_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute132_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE133), + .mapNum = MAP_NUM(ROUTE133), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute133_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute133_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE134), + .mapNum = MAP_NUM(ROUTE134), + .landMonsInfo = NULL, + .waterMonsInfo = &gRoute134_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gRoute134_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), + .mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), + .landMonsInfo = NULL, + .waterMonsInfo = &gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1), + .landMonsInfo = &gSeafloorCavern_Room1_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2), + .landMonsInfo = &gSeafloorCavern_Room2_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3), + .landMonsInfo = &gSeafloorCavern_Room3_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4), + .landMonsInfo = &gSeafloorCavern_Room4_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5), + .landMonsInfo = &gSeafloorCavern_Room5_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6), + .landMonsInfo = &gSeafloorCavern_Room6_LandMonsInfo, + .waterMonsInfo = &gSeafloorCavern_Room6_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSeafloorCavern_Room6_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7), + .landMonsInfo = &gSeafloorCavern_Room7_LandMonsInfo, + .waterMonsInfo = &gSeafloorCavern_Room7_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSeafloorCavern_Room7_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8), + .landMonsInfo = &gSeafloorCavern_Room8_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE), + .landMonsInfo = NULL, + .waterMonsInfo = &gSeafloorCavern_Entrance_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSeafloorCavern_Entrance_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE), + .landMonsInfo = &gCaveOfOrigin_Entrance_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F), + .landMonsInfo = &gCaveOfOrigin_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), + .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), + .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), + .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE), + .mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE), + .landMonsInfo = &gNewMauville_Entrance_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST), + .landMonsInfo = &gSafariZone_Southwest_LandMonsInfo, + .waterMonsInfo = &gSafariZone_Southwest_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTH), + .landMonsInfo = &gSafariZone_North_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST), + .landMonsInfo = &gSafariZone_Northwest_LandMonsInfo, + .waterMonsInfo = &gSafariZone_Northwest_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSafariZone_Northwest_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_B1F), + .mapNum = MAP_NUM(VICTORY_ROAD_B1F), + .landMonsInfo = &gVictoryRoad_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &gVictoryRoad_B1F_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_B2F), + .mapNum = MAP_NUM(VICTORY_ROAD_B2F), + .landMonsInfo = &gVictoryRoad_B2F_LandMonsInfo, + .waterMonsInfo = &gVictoryRoad_B2F_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gVictoryRoad_B2F_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R), + .mapNum = MAP_NUM(METEOR_FALLS_1F_1R), + .landMonsInfo = &gMeteorFalls_1F_1R_LandMonsInfo, + .waterMonsInfo = &gMeteorFalls_1F_1R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMeteorFalls_1F_1R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R), + .mapNum = MAP_NUM(METEOR_FALLS_1F_2R), + .landMonsInfo = &gMeteorFalls_1F_2R_LandMonsInfo, + .waterMonsInfo = &gMeteorFalls_1F_2R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMeteorFalls_1F_2R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R), + .mapNum = MAP_NUM(METEOR_FALLS_B1F_1R), + .landMonsInfo = &gMeteorFalls_B1F_1R_LandMonsInfo, + .waterMonsInfo = &gMeteorFalls_B1F_1R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMeteorFalls_B1F_1R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), + .landMonsInfo = &gShoalCave_LowTideStairsRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), + .landMonsInfo = &gShoalCave_LowTideLowerRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), + .landMonsInfo = &gShoalCave_LowTideInnerRoom_LandMonsInfo, + .waterMonsInfo = &gShoalCave_LowTideInnerRoom_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gShoalCave_LowTideInnerRoom_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), + .landMonsInfo = &gShoalCave_LowTideEntranceRoom_LandMonsInfo, + .waterMonsInfo = &gShoalCave_LowTideEntranceRoom_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gShoalCave_LowTideEntranceRoom_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(LILYCOVE_CITY), + .mapNum = MAP_NUM(LILYCOVE_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gLilycoveCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gLilycoveCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(DEWFORD_TOWN), + .mapNum = MAP_NUM(DEWFORD_TOWN), + .landMonsInfo = NULL, + .waterMonsInfo = &gDewfordTown_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gDewfordTown_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SLATEPORT_CITY), + .mapNum = MAP_NUM(SLATEPORT_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gSlateportCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSlateportCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(MOSSDEEP_CITY), + .mapNum = MAP_NUM(MOSSDEEP_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gMossdeepCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gMossdeepCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(PACIFIDLOG_TOWN), + .mapNum = MAP_NUM(PACIFIDLOG_TOWN), + .landMonsInfo = NULL, + .waterMonsInfo = &gPacifidlogTown_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gPacifidlogTown_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(EVER_GRANDE_CITY), + .mapNum = MAP_NUM(EVER_GRANDE_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gEverGrandeCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gEverGrandeCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(PETALBURG_CITY), + .mapNum = MAP_NUM(PETALBURG_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gPetalburgCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gPetalburgCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(UNDERWATER1), + .mapNum = MAP_NUM(UNDERWATER1), + .landMonsInfo = NULL, + .waterMonsInfo = &gUnderwater1_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), + .landMonsInfo = &gShoalCave_LowTideIceRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_1F), + .mapNum = MAP_NUM(SKY_PILLAR_1F), + .landMonsInfo = &gSkyPillar_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SOOTOPOLIS_CITY), + .mapNum = MAP_NUM(SOOTOPOLIS_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &gSootopolisCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSootopolisCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_3F), + .mapNum = MAP_NUM(SKY_PILLAR_3F), + .landMonsInfo = &gSkyPillar_3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_5F), + .mapNum = MAP_NUM(SKY_PILLAR_5F), + .landMonsInfo = &gSkyPillar_5F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), + .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo, + .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), + .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_1F), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_1F), + .landMonsInfo = &gMagmaHideout_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_1R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_1R), + .landMonsInfo = &gMagmaHideout_2F_1R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_2R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_2R), + .landMonsInfo = &gMagmaHideout_2F_2R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_1R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_1R), + .landMonsInfo = &gMagmaHideout_3F_1R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_2R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_2R), + .landMonsInfo = &gMagmaHideout_3F_2R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_4F), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_4F), + .landMonsInfo = &gMagmaHideout_4F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_3R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_3R), + .landMonsInfo = &gMagmaHideout_3F_3R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_3R), + .mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_3R), + .landMonsInfo = &gMagmaHideout_2F_3R_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MIRAGE_TOWER_1F), + .mapNum = MAP_NUM(MIRAGE_TOWER_1F), + .landMonsInfo = &gMirageTower_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MIRAGE_TOWER_2F), + .mapNum = MAP_NUM(MIRAGE_TOWER_2F), + .landMonsInfo = &gMirageTower_2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MIRAGE_TOWER_3F), + .mapNum = MAP_NUM(MIRAGE_TOWER_3F), + .landMonsInfo = &gMirageTower_3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MIRAGE_TOWER_4F), + .mapNum = MAP_NUM(MIRAGE_TOWER_4F), + .landMonsInfo = &gMirageTower_4F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(DESERT_UNDERPASS), + .mapNum = MAP_NUM(DESERT_UNDERPASS), + .landMonsInfo = &gDesertUnderpass_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ARTISAN_CAVE_B1F), + .mapNum = MAP_NUM(ARTISAN_CAVE_B1F), + .landMonsInfo = &gArtisanCave_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ARTISAN_CAVE_1F), + .mapNum = MAP_NUM(ARTISAN_CAVE_1F), + .landMonsInfo = &gArtisanCave_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave1_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave2_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave3_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave4_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave5_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave6_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave7_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave8_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ALTERING_CAVE), + .mapNum = MAP_NUM(ALTERING_CAVE), + .landMonsInfo = &gAlteringCave9_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_STEVENS_CAVE), + .mapNum = MAP_NUM(METEOR_FALLS_STEVENS_CAVE), + .landMonsInfo = &gMeteorFalls_StevensCave_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(UNDEFINED), + .mapNum = MAP_NUM(UNDEFINED), + .landMonsInfo = NULL, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemon gBattlePyramidPlaceholders_1[] = { - {5, 5, SPECIES_BULBASAUR}, - {5, 5, SPECIES_BULBASAUR}, - {5, 5, SPECIES_BULBASAUR}, - {5, 5, SPECIES_BULBASAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_BULBASAUR}, + {5, 5, SPECIES_BULBASAUR}, + {5, 5, SPECIES_BULBASAUR}, + {5, 5, SPECIES_BULBASAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_CHARMANDER}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_1Info = {4, gBattlePyramidPlaceholders_1}; const struct WildPokemon gBattlePyramidPlaceholders_2[] = { - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_IVYSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_IVYSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMANDER}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_2Info = {4, gBattlePyramidPlaceholders_2}; const struct WildPokemon gBattlePyramidPlaceholders_3[] = { - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_VENUSAUR}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_VENUSAUR}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARIZARD}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_3Info = {4, gBattlePyramidPlaceholders_3}; const struct WildPokemon gBattlePyramidPlaceholders_4[] = { - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMANDER}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMANDER}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_SQUIRTLE}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_4Info = {4, gBattlePyramidPlaceholders_4}; const struct WildPokemon gBattlePyramidPlaceholders_5[] = { - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_WARTORTLE}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_5Info = {4, gBattlePyramidPlaceholders_5}; const struct WildPokemon gBattlePyramidPlaceholders_6[] = { - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_6Info = {4, gBattlePyramidPlaceholders_6}; const struct WildPokemon gBattlePyramidPlaceholders_7[] = { - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_WARTORTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_SQUIRTLE}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARIZARD}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, - {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_WARTORTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_SQUIRTLE}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARIZARD}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, + {5, 5, SPECIES_CHARMELEON}, }; const struct WildPokemonInfo gBattlePyramidPlaceholders_7Info = {8, gBattlePyramidPlaceholders_7}; const struct WildPokemonHeader gBattlePyramidWildMonHeaders[] = { - { - .mapGroup = 0, - .mapNum = 1, - .landMonsInfo = &gBattlePyramidPlaceholders_1Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 2, - .landMonsInfo = &gBattlePyramidPlaceholders_2Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 3, - .landMonsInfo = &gBattlePyramidPlaceholders_3Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 4, - .landMonsInfo = &gBattlePyramidPlaceholders_4Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 5, - .landMonsInfo = &gBattlePyramidPlaceholders_5Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 6, - .landMonsInfo = &gBattlePyramidPlaceholders_6Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 7, - .landMonsInfo = &gBattlePyramidPlaceholders_7Info, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 255, - .mapNum = 255, - .landMonsInfo = NULL, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, + { + .mapGroup = 0, + .mapNum = 1, + .landMonsInfo = &gBattlePyramidPlaceholders_1Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 2, + .landMonsInfo = &gBattlePyramidPlaceholders_2Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 3, + .landMonsInfo = &gBattlePyramidPlaceholders_3Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 4, + .landMonsInfo = &gBattlePyramidPlaceholders_4Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 5, + .landMonsInfo = &gBattlePyramidPlaceholders_5Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 6, + .landMonsInfo = &gBattlePyramidPlaceholders_6Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 7, + .landMonsInfo = &gBattlePyramidPlaceholders_7Info, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 255, + .mapNum = 255, + .landMonsInfo = NULL, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemon gBattlePikeMons_1[] = { - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_DUSCLOPS}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_DUSCLOPS}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, }; const struct WildPokemonInfo gBattlePikeMonsInfo_1 = {10, gBattlePikeMons_1}; const struct WildPokemon gBattlePikeMons_2[] = { - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_ELECTRODE}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_ELECTRODE}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, }; const struct WildPokemonInfo gBattlePikeMonsInfo_2 = {10, gBattlePikeMons_2}; const struct WildPokemon gBattlePikeMons_3[] = { - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_BRELOOM}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_BRELOOM}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, }; const struct WildPokemonInfo gBattlePikeMonsInfo_3 = {10, gBattlePikeMons_3}; const struct WildPokemon gBattlePikeMons_4[] = { - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_WOBBUFFET}, - {5, 5, SPECIES_SEVIPER}, - {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_WOBBUFFET}, + {5, 5, SPECIES_SEVIPER}, + {5, 5, SPECIES_MILOTIC}, }; const struct WildPokemonInfo gBattlePikeMonsInfo_4 = {10, gBattlePikeMons_4}; const struct WildPokemonHeader gBattlePikeWildMonHeaders[] = { - { - .mapGroup = 0, - .mapNum = 1, - .landMonsInfo = &gBattlePikeMonsInfo_1, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 2, - .landMonsInfo = &gBattlePikeMonsInfo_2, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 3, - .landMonsInfo = &gBattlePikeMonsInfo_3, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 0, - .mapNum = 4, - .landMonsInfo = &gBattlePikeMonsInfo_4, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, - { - .mapGroup = 255, - .mapNum = 255, - .landMonsInfo = NULL, - .waterMonsInfo = NULL, - .rockSmashMonsInfo = NULL, - .fishingMonsInfo = NULL, - }, + { + .mapGroup = 0, + .mapNum = 1, + .landMonsInfo = &gBattlePikeMonsInfo_1, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 2, + .landMonsInfo = &gBattlePikeMonsInfo_2, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 3, + .landMonsInfo = &gBattlePikeMonsInfo_3, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 0, + .mapNum = 4, + .landMonsInfo = &gBattlePikeMonsInfo_4, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = 255, + .mapNum = 255, + .landMonsInfo = NULL, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, }; const struct WildPokemon gWildFeebasRoute119Data = {20, 25, SPECIES_FEEBAS}; const u16 gRoute119WaterTileData[] = { - 0, 0x2D, 0, - 0x2E, 0x5B, 0x83, - 0x5C, 0x8B, 0x12A, + 0, 0x2D, 0, + 0x2E, 0x5B, 0x83, + 0x5C, 0x8B, 0x12A, }; // code @@ -4825,7 +4825,7 @@ static u16 GetCurrentMapWildMonHeaderId(void) for (i = 0; ; i++) { const struct WildPokemonHeader *wildHeader = &gWildMonHeaders[i]; - if (wildHeader->mapGroup == INVALID_U8) + if (wildHeader->mapGroup == 0xFF) break; if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup && @@ -4845,7 +4845,7 @@ static u16 GetCurrentMapWildMonHeaderId(void) } } - return INVALID_S16; + return -1; } static u8 PickWildMonNature(void) @@ -5079,7 +5079,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi return FALSE; headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == INVALID_U16) + if (headerId == 0xFFFF) { if (gMapHeader.mapLayoutId == 0x166) { @@ -5190,7 +5190,7 @@ void RockSmashWildEncounter(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != INVALID_U16) + if (headerId != 0xFFFF) { const struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerId].rockSmashMonsInfo; @@ -5222,7 +5222,7 @@ bool8 SweetScentWildEncounter(void) PlayerGetDestCoords(&x, &y); headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == INVALID_U16) + if (headerId == 0xFFFF) { if (gMapHeader.mapLayoutId == 0x166) { @@ -5292,7 +5292,7 @@ bool8 DoesCurrentMapHaveFishingMons(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != INVALID_U16 && gWildMonHeaders[headerId].fishingMonsInfo != NULL) + if (headerId != 0xFFFF && gWildMonHeaders[headerId].fishingMonsInfo != NULL) return TRUE; else return FALSE; @@ -5326,7 +5326,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon) *isWaterMon = FALSE; headerId = GetCurrentMapWildMonHeaderId(); - if (headerId == INVALID_U16) + if (headerId == 0xFFFF) return SPECIES_NONE; landMonsInfo = gWildMonHeaders[headerId].landMonsInfo; waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; @@ -5358,7 +5358,7 @@ u16 GetLocalWaterMon(void) { u16 headerId = GetCurrentMapWildMonHeaderId(); - if (headerId != INVALID_U16) + if (headerId != 0xFFFF) { const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; diff --git a/src/window.c b/src/window.c index d5b996df1..4e1a38eff 100644 --- a/src/window.c +++ b/src/window.c @@ -52,12 +52,12 @@ bool16 InitWindows(const struct WindowTemplate *templates) gWindows[i].tileData = NULL; } - for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != INVALID_U8 && i < 0x20; ++i, bgLayer = templates[i].bg) + for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != 0xFF && i < 0x20; ++i, bgLayer = templates[i].bg) { if (gUnneededFireRedVariable == 1) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, templates[i].width * templates[i].height, 0); - if (allocatedBaseBlock == INVALID_S32) + if (allocatedBaseBlock == -1) return FALSE; } @@ -65,7 +65,7 @@ bool16 InitWindows(const struct WindowTemplate *templates) { attrib = GetBgAttribute(bgLayer, 0x8); - if (attrib != INVALID_U16) + if (attrib != 0xFFFF) { allocatedTilemapBuffer = AllocZeroed(attrib); @@ -121,12 +121,12 @@ u16 AddWindow(const struct WindowTemplate *template) for (win = 0; win < WINDOWS_MAX; ++win) { - if ((bgLayer = gWindows[win].window.bg) == INVALID_U8) + if ((bgLayer = gWindows[win].window.bg) == 0xFF) break; } if (win == WINDOWS_MAX) - return INVALID_U8; + return 0xFF; bgLayer = template->bg; allocatedBaseBlock = 0; @@ -135,20 +135,20 @@ u16 AddWindow(const struct WindowTemplate *template) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0); - if (allocatedBaseBlock == INVALID_S32) - return INVALID_U8; + if (allocatedBaseBlock == -1) + return 0xFF; } if (gUnknown_03002F70[bgLayer] == NULL) { attrib = GetBgAttribute(bgLayer, 0x8); - if (attrib != INVALID_U16) + if (attrib != 0xFFFF) { allocatedTilemapBuffer = AllocZeroed(attrib); if (allocatedTilemapBuffer == NULL) - return INVALID_U8; + return 0xFF; for (i = 0; i < attrib; ++i) allocatedTilemapBuffer[i] = 0; @@ -167,7 +167,7 @@ u16 AddWindow(const struct WindowTemplate *template) Free(gUnknown_03002F70[bgLayer]); gUnknown_03002F70[bgLayer] = allocatedTilemapBuffer; } - return INVALID_U8; + return 0xFF; } gWindows[win].tileData = allocatedTilemapBuffer; @@ -190,12 +190,12 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template) for (win = 0; win < WINDOWS_MAX; ++win) { - if (gWindows[win].window.bg == INVALID_U8) + if (gWindows[win].window.bg == 0xFF) break; } if (win == WINDOWS_MAX) - return INVALID_U8; + return 0xFF; bgLayer = template->bg; allocatedBaseBlock = 0; @@ -204,8 +204,8 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template) { allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0); - if (allocatedBaseBlock == INVALID_S32) - return INVALID_U8; + if (allocatedBaseBlock == -1) + return 0xFF; } gWindows[win].window = *template; @@ -609,21 +609,21 @@ u16 AddWindow8Bit(struct WindowTemplate *template) for (windowId = 0; windowId < 32; windowId++) { - if (gWindows[windowId].window.bg == INVALID_U8) + if (gWindows[windowId].window.bg == 0xFF) break; } if (windowId == WINDOWS_MAX) - return INVALID_U8; + return 0xFF; bgLayer = template->bg; if (gUnknown_03002F70[bgLayer] == 0) { u16 attribute = GetBgAttribute(bgLayer, 8); - if (attribute != INVALID_U16) + if (attribute != 0xFFFF) { s32 i; memAddress = Alloc(attribute); if (memAddress == NULL) - return INVALID_U8; + return 0xFF; for (i = 0; i < attribute; i++) // if we're going to zero out the memory anyway, why not call AllocZeroed? memAddress[i] = 0; gUnknown_03002F70[bgLayer] = memAddress; @@ -638,7 +638,7 @@ u16 AddWindow8Bit(struct WindowTemplate *template) Free(gUnknown_03002F70[bgLayer]); gUnknown_03002F70[bgLayer] = NULL; } - return INVALID_U8; + return 0xFF; } else { -- cgit v1.2.3 From 4fc3fa9e44fb3de091b5e1b157915e1b8fb6510b Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Fri, 7 Dec 2018 20:16:19 +0800 Subject: Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines --- src/battle_script_commands.c | 78 +- src/data/graphics/items.h | 2 +- src/data/item_icon_table.h | 116 +- src/data/pokemon_graphics/enemy_mon_elevation.h | 50 +- src/data/text/item_descriptions.h | 2 +- src/pokemon.c | 1658 ++++++++++++----------- src/pokemon_animation.c | 48 +- 7 files changed, 978 insertions(+), 976 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 610d0050e..59631b78c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] = static const u8* const sMoveEffectBS_Ptrs[] = { - BattleScript_MoveEffectSleep, // 0 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP - BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON - BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN - BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE - BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS - BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC - BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION - BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH - BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK - BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR - BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY - BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING - BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM - BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN - BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 + BattleScript_MoveEffectSleep, // 0 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP + BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON + BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN + BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE + BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS + BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC + BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION + BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH + BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK + BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR + BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY + BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING + BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP + BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM + BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP + BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN + BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS + BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN + BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 }; static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 0c4a6e21b..26da9061d 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -134,7 +134,7 @@ const u32 gItemIconPalette_GreenShard[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz"); const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz"); -const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); +const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz"); const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz"); const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index f55a8468e..c36969ab5 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -311,64 +311,64 @@ const u32 *const gItemIconTable[][2] = [ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil}, [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope}, // TMs / HMs - [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM01 - [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM}, // TM02 - [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM03 - [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM04 - [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM05 - [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM06 - [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM07 - [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM08 - [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM09 - [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM10 - [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM11 - [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM12 - [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM13 - [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM14 - [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM15 - [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM16 - [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM17 - [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM18 - [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM19 - [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM20 - [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM21 - [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM22 - [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM23 - [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM24 - [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM25 - [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM26 - [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM27 - [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM28 - [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM29 - [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM}, // TM30 - [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM31 - [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM32 - [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM33 - [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM34 - [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM35 - [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM36 - [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM37 - [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM38 - [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM39 - [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM}, // TM40 - [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM41 - [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM42 - [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM43 - [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM44 - [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM45 - [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM46 - [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM47 - [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM48 - [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM49 - [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM50 - [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM01 - [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, // HM02 - [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM03 - [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM04 - [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM05 - [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, // HM06 - [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM07 - [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM08 + [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, + [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM}, + [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, + [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, + [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, + [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, + [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, + [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, + [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, + [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, + [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, + [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, + [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, + [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, + [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, + [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, + [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, + [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, + [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, + [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM}, + [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, + [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, + [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, + [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, + [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, + [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, + [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, + [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM}, + [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, + [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, + [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, + [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, + [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, + [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, + [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, + [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, + [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, + [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, + [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, + [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, + [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, + [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // ???????? [ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, [ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 61fd943a2..c8f079a5c 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -256,31 +256,31 @@ const u8 gEnemyMonElevation[] = [SPECIES_LUGIA] = 6, [SPECIES_HO_OH] = 6, [SPECIES_CELEBI] = 15, - [252] = 0, - [253] = 0, - [254] = 0, - [255] = 0, - [256] = 0, - [257] = 0, - [258] = 0, - [259] = 0, - [260] = 0, - [261] = 0, - [262] = 0, - [263] = 0, - [264] = 0, - [265] = 0, - [266] = 0, - [267] = 0, - [268] = 0, - [269] = 0, - [270] = 0, - [271] = 0, - [272] = 0, - [273] = 0, - [274] = 0, - [275] = 0, - [276] = 0, + [SPECIES_OLD_UNOWN_B] = 0, + [SPECIES_OLD_UNOWN_C] = 0, + [SPECIES_OLD_UNOWN_D] = 0, + [SPECIES_OLD_UNOWN_E] = 0, + [SPECIES_OLD_UNOWN_F] = 0, + [SPECIES_OLD_UNOWN_G] = 0, + [SPECIES_OLD_UNOWN_H] = 0, + [SPECIES_OLD_UNOWN_I] = 0, + [SPECIES_OLD_UNOWN_J] = 0, + [SPECIES_OLD_UNOWN_K] = 0, + [SPECIES_OLD_UNOWN_L] = 0, + [SPECIES_OLD_UNOWN_M] = 0, + [SPECIES_OLD_UNOWN_N] = 0, + [SPECIES_OLD_UNOWN_O] = 0, + [SPECIES_OLD_UNOWN_P] = 0, + [SPECIES_OLD_UNOWN_Q] = 0, + [SPECIES_OLD_UNOWN_R] = 0, + [SPECIES_OLD_UNOWN_S] = 0, + [SPECIES_OLD_UNOWN_T] = 0, + [SPECIES_OLD_UNOWN_U] = 0, + [SPECIES_OLD_UNOWN_V] = 0, + [SPECIES_OLD_UNOWN_W] = 0, + [SPECIES_OLD_UNOWN_X] = 0, + [SPECIES_OLD_UNOWN_Y] = 0, + [SPECIES_OLD_UNOWN_Z] = 0, [SPECIES_TREECKO] = 0, [SPECIES_GROVYLE] = 0, [SPECIES_SCEPTILE] = 0, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 8de5183ec..26193bfd5 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -7,7 +7,7 @@ const u8 gPokeBallItemDescription[] = _("A tool used for\ncatching wild\nPOKéMO const u8 gSafariBallItemDescription[] = _("A special BALL that\nis used only in the\nSAFARI ZONE."); const u8 gNetBallItemDescription[] = _("A BALL that works\nwell on WATER- and\nBUG-type POKéMON."); const u8 gDiveBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\non the ocean floor."); -const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); +const u8 gNestBallItemDescription[] = _("A BALL that works\nbetter on weaker\nPOKéMON."); const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON\ncaught before."); const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns."); const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly."); diff --git a/src/pokemon.c b/src/pokemon.c index dbef22338..7a7d672f5 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1405,834 +1405,836 @@ const s8 gNatureStatTable[][5] = #include "data/pokemon/evolution.h" #include "data/pokemon/level_up_learnset_pointers.h" +// These two tables are zero-based. + static const u8 sMonFrontAnimIdsTable[] = { - 0x06, // SPECIES_BULBASAUR - 0x17, // SPECIES_IVYSAUR - 0x2f, // SPECIES_VENUSAUR - 0x52, // SPECIES_CHARMANDER - 0x25, // SPECIES_CHARMELEON - 0x10, // SPECIES_CHARIZARD - 0x0b, // SPECIES_SQUIRTLE - 0x13, // SPECIES_WARTORTLE - 0x19, // SPECIES_BLASTOISE - 0x0b, // SPECIES_CATERPIE - 0x0b, // SPECIES_METAPOD - 0x1d, // SPECIES_BUTTERFREE - 0x46, // SPECIES_WEEDLE - 0x20, // SPECIES_KAKUNA - 0x02, // SPECIES_BEEDRILL - 0x47, // SPECIES_PIDGEY - 0x17, // SPECIES_PIDGEOTTO - 0x29, // SPECIES_PIDGEOT - 0x43, // SPECIES_RATTATA - 0x2b, // SPECIES_RATICATE - 0x18, // SPECIES_SPEAROW - 0x2b, // SPECIES_FEAROW - 0x16, // SPECIES_EKANS - 0x17, // SPECIES_ARBOK - 0x2c, // SPECIES_PIKACHU - 0x17, // SPECIES_RAICHU - 0x2d, // SPECIES_SANDSHREW - 0x17, // SPECIES_SANDSLASH - 0x00, // SPECIES_NIDORAN_F - 0x17, // SPECIES_NIDORINA - 0x0f, // SPECIES_NIDOQUEEN - 0x09, // SPECIES_NIDORAN_M - 0x13, // SPECIES_NIDORINO - 0x0f, // SPECIES_NIDOKING - 0x00, // SPECIES_CLEFAIRY - 0x4a, // SPECIES_CLEFABLE - 0x17, // SPECIES_VULPIX - 0x10, // SPECIES_NINETALES - 0x48, // SPECIES_JIGGLYPUFF - 0x31, // SPECIES_WIGGLYTUFF - 0x00, // SPECIES_ZUBAT - 0x1d, // SPECIES_GOLBAT - 0x00, // SPECIES_ODDISH - 0x45, // SPECIES_GLOOM - 0x49, // SPECIES_VILEPLUME - 0x46, // SPECIES_PARAS - 0x0f, // SPECIES_PARASECT - 0x06, // SPECIES_VENONAT - 0x4b, // SPECIES_VENOMOTH - 0x10, // SPECIES_DIGLETT - 0x4c, // SPECIES_DUGTRIO - 0x52, // SPECIES_MEOWTH - 0x17, // SPECIES_PERSIAN - 0x06, // SPECIES_PSYDUCK - 0x4c, // SPECIES_GOLDUCK - 0x32, // SPECIES_MANKEY - 0x48, // SPECIES_PRIMEAPE - 0x25, // SPECIES_GROWLITHE - 0x02, // SPECIES_ARCANINE - 0x00, // SPECIES_POLIWAG - 0x32, // SPECIES_POLIWHIRL - 0x19, // SPECIES_POLIWRATH - 0x31, // SPECIES_ABRA - 0x09, // SPECIES_KADABRA - 0x17, // SPECIES_ALAKAZAM - 0x00, // SPECIES_MACHOP - 0x10, // SPECIES_MACHOKE - 0x31, // SPECIES_MACHAMP - 0x17, // SPECIES_BELLSPROUT - 0x0d, // SPECIES_WEEPINBELL - 0x32, // SPECIES_VICTREEBEL - 0x00, // SPECIES_TENTACOOL - 0x00, // SPECIES_TENTACRUEL - 0x48, // SPECIES_GEODUDE - 0x48, // SPECIES_GRAVELER - 0x2f, // SPECIES_GOLEM - 0x20, // SPECIES_PONYTA - 0x11, // SPECIES_RAPIDASH - 0x45, // SPECIES_SLOWPOKE - 0x0b, // SPECIES_SLOWBRO - 0x54, // SPECIES_MAGNEMITE - 0x2c, // SPECIES_MAGNETON - 0x48, // SPECIES_FARFETCHD - 0x4c, // SPECIES_DODUO - 0x41, // SPECIES_DODRIO - 0x0b, // SPECIES_SEEL - 0x45, // SPECIES_DEWGONG - 0x46, // SPECIES_GRIMER - 0x30, // SPECIES_MUK - 0x12, // SPECIES_SHELLDER - 0x1d, // SPECIES_CLOYSTER - 0x15, // SPECIES_GASTLY - 0x35, // SPECIES_HAUNTER - 0x3a, // SPECIES_GENGAR - 0x43, // SPECIES_ONIX - 0x4f, // SPECIES_DROWZEE - 0x09, // SPECIES_HYPNO - 0x03, // SPECIES_KRABBY - 0x4b, // SPECIES_KINGLER - 0x00, // SPECIES_VOLTORB - 0x00, // SPECIES_ELECTRODE - 0x46, // SPECIES_EXEGGCUTE - 0x32, // SPECIES_EXEGGUTOR - 0x48, // SPECIES_CUBONE - 0x05, // SPECIES_MAROWAK - 0x16, // SPECIES_HITMONLEE - 0x09, // SPECIES_HITMONCHAN - 0x45, // SPECIES_LICKITUNG - 0x13, // SPECIES_KOFFING - 0x04, // SPECIES_WEEZING - 0x10, // SPECIES_RHYHORN - 0x13, // SPECIES_RHYDON - 0x45, // SPECIES_CHANSEY - 0x48, // SPECIES_TANGELA - 0x17, // SPECIES_KANGASKHAN - 0x12, // SPECIES_HORSEA - 0x04, // SPECIES_SEADRA - 0x0d, // SPECIES_GOLDEEN - 0x1c, // SPECIES_SEAKING - 0x4e, // SPECIES_STARYU - 0x12, // SPECIES_STARMIE - 0x46, // SPECIES_MR_MIME - 0x02, // SPECIES_SCYTHER - 0x17, // SPECIES_JYNX - 0x2c, // SPECIES_ELECTABUZZ - 0x0f, // SPECIES_MAGMAR - 0x09, // SPECIES_PINSIR - 0x19, // SPECIES_TAUROS - 0x05, // SPECIES_MAGIKARP - 0x48, // SPECIES_GYARADOS - 0x17, // SPECIES_LAPRAS - 0x01, // SPECIES_DITTO - 0x17, // SPECIES_EEVEE - 0x17, // SPECIES_VAPOREON - 0x00, // SPECIES_JOLTEON - 0x17, // SPECIES_FLAREON - 0x52, // SPECIES_PORYGON - 0x51, // SPECIES_OMANYTE - 0x09, // SPECIES_OMASTAR - 0x1d, // SPECIES_KABUTO - 0x0f, // SPECIES_KABUTOPS - 0x47, // SPECIES_AERODACTYL - 0x0b, // SPECIES_SNORLAX - 0x09, // SPECIES_ARTICUNO - 0x2c, // SPECIES_ZAPDOS - 0x45, // SPECIES_MOLTRES - 0x00, // SPECIES_DRATINI - 0x10, // SPECIES_DRAGONAIR - 0x47, // SPECIES_DRAGONITE - 0x09, // SPECIES_MEWTWO - 0x0d, // SPECIES_MEW - 0x00, // SPECIES_CHIKORITA - 0x00, // SPECIES_BAYLEEF - 0x17, // SPECIES_MEGANIUM - 0x52, // SPECIES_CYNDAQUIL - 0x17, // SPECIES_QUILAVA - 0x10, // SPECIES_TYPHLOSION - 0x31, // SPECIES_TOTODILE - 0x0f, // SPECIES_CROCONAW - 0x0f, // SPECIES_FERALIGATR - 0x00, // SPECIES_SENTRET - 0x32, // SPECIES_FURRET - 0x47, // SPECIES_HOOTHOOT - 0x17, // SPECIES_NOCTOWL - 0x52, // SPECIES_LEDYBA - 0x47, // SPECIES_LEDIAN - 0x4f, // SPECIES_SPINARAK - 0x0f, // SPECIES_ARIADOS - 0x00, // SPECIES_CROBAT - 0x45, // SPECIES_CHINCHOU - 0x51, // SPECIES_LANTURN - 0x1e, // SPECIES_PICHU - 0x52, // SPECIES_CLEFFA - 0x0c, // SPECIES_IGGLYBUFF - 0x0b, // SPECIES_TOGEPI - 0x00, // SPECIES_TOGETIC - 0x31, // SPECIES_NATU - 0x09, // SPECIES_XATU - 0x00, // SPECIES_MAREEP - 0x1e, // SPECIES_FLAAFFY - 0x2c, // SPECIES_AMPHAROS - 0x0b, // SPECIES_BELLOSSOM - 0x00, // SPECIES_MARILL - 0x4a, // SPECIES_AZUMARILL - 0x46, // SPECIES_SUDOWOODO - 0x32, // SPECIES_POLITOED - 0x1c, // SPECIES_HOPPIP - 0x18, // SPECIES_SKIPLOOM - 0x51, // SPECIES_JUMPLUFF - 0x32, // SPECIES_AIPOM - 0x52, // SPECIES_SUNKERN - 0x00, // SPECIES_SUNFLORA - 0x2b, // SPECIES_YANMA - 0x00, // SPECIES_WOOPER - 0x16, // SPECIES_QUAGSIRE - 0x09, // SPECIES_ESPEON - 0x10, // SPECIES_UMBREON - 0x00, // SPECIES_MURKROW - 0x13, // SPECIES_SLOWKING - 0x1c, // SPECIES_MISDREAVUS - 0x0a, // SPECIES_UNOWN - 0x30, // SPECIES_WOBBUFFET - 0x1e, // SPECIES_GIRAFARIG - 0x0b, // SPECIES_PINECO - 0x10, // SPECIES_FORRETRESS - 0x00, // SPECIES_DUNSPARCE - 0x13, // SPECIES_GLIGAR - 0x0f, // SPECIES_STEELIX - 0x17, // SPECIES_SNUBBULL - 0x10, // SPECIES_GRANBULL - 0x3a, // SPECIES_QWILFISH - 0x02, // SPECIES_SCIZOR - 0x0b, // SPECIES_SHUCKLE - 0x41, // SPECIES_HERACROSS - 0x16, // SPECIES_SNEASEL - 0x17, // SPECIES_TEDDIURSA - 0x10, // SPECIES_URSARING - 0x17, // SPECIES_SLUGMA - 0x17, // SPECIES_MAGCARGO - 0x00, // SPECIES_SWINUB - 0x0f, // SPECIES_PILOSWINE - 0x03, // SPECIES_CORSOLA - 0x52, // SPECIES_REMORAID - 0x17, // SPECIES_OCTILLERY - 0x52, // SPECIES_DELIBIRD - 0x0d, // SPECIES_MANTINE - 0x17, // SPECIES_SKARMORY - 0x17, // SPECIES_HOUNDOUR - 0x10, // SPECIES_HOUNDOOM - 0x42, // SPECIES_KINGDRA - 0x32, // SPECIES_PHANPY - 0x19, // SPECIES_DONPHAN - 0x00, // SPECIES_PORYGON2 - 0x00, // SPECIES_STANTLER - 0x31, // SPECIES_SMEARGLE - 0x16, // SPECIES_TYROGUE - 0x02, // SPECIES_HITMONTOP - 0x09, // SPECIES_SMOOCHUM - 0x2c, // SPECIES_ELEKID - 0x00, // SPECIES_MAGBY - 0x45, // SPECIES_MILTANK - 0x00, // SPECIES_BLISSEY - 0x2c, // SPECIES_RAIKOU - 0x09, // SPECIES_ENTEI - 0x10, // SPECIES_SUICUNE - 0x52, // SPECIES_LARVITAR - 0x10, // SPECIES_PUPITAR - 0x0f, // SPECIES_TYRANITAR - 0x3a, // SPECIES_LUGIA - 0x09, // SPECIES_HO_OH - 0x18, // SPECIES_CELEBI - 0x00, // 252 - 0x00, // 253 - 0x00, // 254 - 0x00, // 255 - 0x00, // 256 - 0x00, // 257 - 0x00, // 258 - 0x00, // 259 - 0x00, // 260 - 0x00, // 261 - 0x00, // 262 - 0x00, // 263 - 0x00, // 264 - 0x00, // 265 - 0x00, // 266 - 0x00, // 267 - 0x00, // 268 - 0x00, // 269 - 0x00, // 270 - 0x00, // 271 - 0x00, // 272 - 0x00, // 273 - 0x00, // 274 - 0x00, // 275 - 0x00, // 276 - 0x00, // SPECIES_TREECKO - 0x17, // SPECIES_GROVYLE - 0x10, // SPECIES_SCEPTILE - 0x16, // SPECIES_TORCHIC - 0x06, // SPECIES_COMBUSKEN - 0x0f, // SPECIES_BLAZIKEN - 0x01, // SPECIES_MUDKIP - 0x04, // SPECIES_MARSHTOMP - 0x1e, // SPECIES_SWAMPERT - 0x10, // SPECIES_POOCHYENA - 0x10, // SPECIES_MIGHTYENA - 0x03, // SPECIES_ZIGZAGOON - 0x09, // SPECIES_LINOONE - 0x00, // SPECIES_WURMPLE - 0x00, // SPECIES_SILCOON - 0x04, // SPECIES_BEAUTIFLY - 0x04, // SPECIES_CASCOON - 0x06, // SPECIES_DUSTOX - 0x00, // SPECIES_LOTAD - 0x00, // SPECIES_LOMBRE - 0x49, // SPECIES_LUDICOLO - 0x05, // SPECIES_SEEDOT - 0x00, // SPECIES_NUZLEAF - 0x02, // SPECIES_SHIFTRY - 0x00, // SPECIES_NINCADA - 0x46, // SPECIES_NINJASK - 0x1c, // SPECIES_SHEDINJA - 0x1e, // SPECIES_TAILLOW - 0x01, // SPECIES_SWELLOW - 0x00, // SPECIES_SHROOMISH - 0x00, // SPECIES_BRELOOM - 0x31, // SPECIES_SPINDA - 0x1b, // SPECIES_WINGULL - 0x1c, // SPECIES_PELIPPER - 0x00, // SPECIES_SURSKIT - 0x00, // SPECIES_MASQUERAIN - 0x01, // SPECIES_WAILMER - 0x1c, // SPECIES_WAILORD - 0x00, // SPECIES_SKITTY - 0x17, // SPECIES_DELCATTY - 0x35, // SPECIES_KECLEON - 0x1d, // SPECIES_BALTOY - 0x51, // SPECIES_CLAYDOL - 0x49, // SPECIES_NOSEPASS - 0x17, // SPECIES_TORKOAL - 0x15, // SPECIES_SABLEYE - 0x49, // SPECIES_BARBOACH - 0x49, // SPECIES_WHISCASH - 0x1d, // SPECIES_LUVDISC - 0x10, // SPECIES_CORPHISH - 0x09, // SPECIES_CRAWDAUNT - 0x49, // SPECIES_FEEBAS - 0x22, // SPECIES_MILOTIC - 0x49, // SPECIES_CARVANHA - 0x56, // SPECIES_SHARPEDO - 0x10, // SPECIES_TRAPINCH - 0x0f, // SPECIES_VIBRAVA - 0x4b, // SPECIES_FLYGON - 0x0b, // SPECIES_MAKUHITA - 0x34, // SPECIES_HARIYAMA - 0x00, // SPECIES_ELECTRIKE - 0x00, // SPECIES_MANECTRIC - 0x04, // SPECIES_NUMEL - 0x10, // SPECIES_CAMERUPT - 0x53, // SPECIES_SPHEAL - 0x17, // SPECIES_SEALEO - 0x0f, // SPECIES_WALREIN - 0x49, // SPECIES_CACNEA - 0x04, // SPECIES_CACTURNE - 0x45, // SPECIES_SNORUNT - 0x0a, // SPECIES_GLALIE - 0x0e, // SPECIES_LUNATONE - 0x08, // SPECIES_SOLROCK - 0x00, // SPECIES_AZURILL - 0x56, // SPECIES_SPOINK - 0x32, // SPECIES_GRUMPIG - 0x00, // SPECIES_PLUSLE - 0x01, // SPECIES_MINUN - 0x00, // SPECIES_MAWILE - 0x05, // SPECIES_MEDITITE - 0x45, // SPECIES_MEDICHAM - 0x04, // SPECIES_SWABLU - 0x16, // SPECIES_ALTARIA - 0x32, // SPECIES_WYNAUT - 0x0a, // SPECIES_DUSKULL - 0x02, // SPECIES_DUSCLOPS - 0x45, // SPECIES_ROSELIA - 0x45, // SPECIES_SLAKOTH - 0x31, // SPECIES_VIGOROTH - 0x45, // SPECIES_SLAKING - 0x00, // SPECIES_GULPIN - 0x45, // SPECIES_SWALOT - 0x10, // SPECIES_TROPIUS - 0x03, // SPECIES_WHISMUR - 0x49, // SPECIES_LOUDRED - 0x19, // SPECIES_EXPLOUD - 0x12, // SPECIES_CLAMPERL - 0x09, // SPECIES_HUNTAIL - 0x1c, // SPECIES_GOREBYSS - 0x11, // SPECIES_ABSOL - 0x1c, // SPECIES_SHUPPET - 0x0d, // SPECIES_BANETTE - 0x17, // SPECIES_SEVIPER - 0x09, // SPECIES_ZANGOOSE - 0x1a, // SPECIES_RELICANTH - 0x45, // SPECIES_ARON - 0x00, // SPECIES_LAIRON - 0x19, // SPECIES_AGGRON - 0x1d, // SPECIES_CASTFORM - 0x00, // SPECIES_VOLBEAT - 0x05, // SPECIES_ILLUMISE - 0x17, // SPECIES_LILEEP - 0x19, // SPECIES_CRADILY - 0x12, // SPECIES_ANORITH - 0x10, // SPECIES_ARMALDO - 0x45, // SPECIES_RALTS - 0x00, // SPECIES_KIRLIA - 0x00, // SPECIES_GARDEVOIR - 0x19, // SPECIES_BAGON - 0x04, // SPECIES_SHELGON - 0x0f, // SPECIES_SALAMENCE - 0x0f, // SPECIES_BELDUM - 0x04, // SPECIES_METANG - 0x10, // SPECIES_METAGROSS - 0x01, // SPECIES_REGIROCK - 0x44, // SPECIES_REGICE - 0x09, // SPECIES_REGISTEEL - 0x2d, // SPECIES_KYOGRE - 0x10, // SPECIES_GROUDON - 0x0f, // SPECIES_RAYQUAZA - 0x2d, // SPECIES_LATIAS - 0x10, // SPECIES_LATIOS - 0x0d, // SPECIES_JIRACHI - 0x1b, // SPECIES_DEOXYS - 0x1d, // SPECIES_CHIMECHO + [SPECIES_BULBASAUR-1] = 0x06, + [SPECIES_IVYSAUR-1] = 0x17, + [SPECIES_VENUSAUR-1] = 0x2f, + [SPECIES_CHARMANDER-1] = 0x52, + [SPECIES_CHARMELEON-1] = 0x25, + [SPECIES_CHARIZARD-1] = 0x10, + [SPECIES_SQUIRTLE-1] = 0x0b, + [SPECIES_WARTORTLE-1] = 0x13, + [SPECIES_BLASTOISE-1] = 0x19, + [SPECIES_CATERPIE-1] = 0x0b, + [SPECIES_METAPOD-1] = 0x0b, + [SPECIES_BUTTERFREE-1] = 0x1d, + [SPECIES_WEEDLE-1] = 0x46, + [SPECIES_KAKUNA-1] = 0x20, + [SPECIES_BEEDRILL-1] = 0x02, + [SPECIES_PIDGEY-1] = 0x47, + [SPECIES_PIDGEOTTO-1] = 0x17, + [SPECIES_PIDGEOT-1] = 0x29, + [SPECIES_RATTATA-1] = 0x43, + [SPECIES_RATICATE-1] = 0x2b, + [SPECIES_SPEAROW-1] = 0x18, + [SPECIES_FEAROW-1] = 0x2b, + [SPECIES_EKANS-1] = 0x16, + [SPECIES_ARBOK-1] = 0x17, + [SPECIES_PIKACHU-1] = 0x2c, + [SPECIES_RAICHU-1] = 0x17, + [SPECIES_SANDSHREW-1] = 0x2d, + [SPECIES_SANDSLASH-1] = 0x17, + [SPECIES_NIDORAN_F-1] = 0x00, + [SPECIES_NIDORINA-1] = 0x17, + [SPECIES_NIDOQUEEN-1] = 0x0f, + [SPECIES_NIDORAN_M-1] = 0x09, + [SPECIES_NIDORINO-1] = 0x13, + [SPECIES_NIDOKING-1] = 0x0f, + [SPECIES_CLEFAIRY-1] = 0x00, + [SPECIES_CLEFABLE-1] = 0x4a, + [SPECIES_VULPIX-1] = 0x17, + [SPECIES_NINETALES-1] = 0x10, + [SPECIES_JIGGLYPUFF-1] = 0x48, + [SPECIES_WIGGLYTUFF-1] = 0x31, + [SPECIES_ZUBAT-1] = 0x00, + [SPECIES_GOLBAT-1] = 0x1d, + [SPECIES_ODDISH-1] = 0x00, + [SPECIES_GLOOM-1] = 0x45, + [SPECIES_VILEPLUME-1] = 0x49, + [SPECIES_PARAS-1] = 0x46, + [SPECIES_PARASECT-1] = 0x0f, + [SPECIES_VENONAT-1] = 0x06, + [SPECIES_VENOMOTH-1] = 0x4b, + [SPECIES_DIGLETT-1] = 0x10, + [SPECIES_DUGTRIO-1] = 0x4c, + [SPECIES_MEOWTH-1] = 0x52, + [SPECIES_PERSIAN-1] = 0x17, + [SPECIES_PSYDUCK-1] = 0x06, + [SPECIES_GOLDUCK-1] = 0x4c, + [SPECIES_MANKEY-1] = 0x32, + [SPECIES_PRIMEAPE-1] = 0x48, + [SPECIES_GROWLITHE-1] = 0x25, + [SPECIES_ARCANINE-1] = 0x02, + [SPECIES_POLIWAG-1] = 0x00, + [SPECIES_POLIWHIRL-1] = 0x32, + [SPECIES_POLIWRATH-1] = 0x19, + [SPECIES_ABRA-1] = 0x31, + [SPECIES_KADABRA-1] = 0x09, + [SPECIES_ALAKAZAM-1] = 0x17, + [SPECIES_MACHOP-1] = 0x00, + [SPECIES_MACHOKE-1] = 0x10, + [SPECIES_MACHAMP-1] = 0x31, + [SPECIES_BELLSPROUT-1] = 0x17, + [SPECIES_WEEPINBELL-1] = 0x0d, + [SPECIES_VICTREEBEL-1] = 0x32, + [SPECIES_TENTACOOL-1] = 0x00, + [SPECIES_TENTACRUEL-1] = 0x00, + [SPECIES_GEODUDE-1] = 0x48, + [SPECIES_GRAVELER-1] = 0x48, + [SPECIES_GOLEM-1] = 0x2f, + [SPECIES_PONYTA-1] = 0x20, + [SPECIES_RAPIDASH-1] = 0x11, + [SPECIES_SLOWPOKE-1] = 0x45, + [SPECIES_SLOWBRO-1] = 0x0b, + [SPECIES_MAGNEMITE-1] = 0x54, + [SPECIES_MAGNETON-1] = 0x2c, + [SPECIES_FARFETCHD-1] = 0x48, + [SPECIES_DODUO-1] = 0x4c, + [SPECIES_DODRIO-1] = 0x41, + [SPECIES_SEEL-1] = 0x0b, + [SPECIES_DEWGONG-1] = 0x45, + [SPECIES_GRIMER-1] = 0x46, + [SPECIES_MUK-1] = 0x30, + [SPECIES_SHELLDER-1] = 0x12, + [SPECIES_CLOYSTER-1] = 0x1d, + [SPECIES_GASTLY-1] = 0x15, + [SPECIES_HAUNTER-1] = 0x35, + [SPECIES_GENGAR-1] = 0x3a, + [SPECIES_ONIX-1] = 0x43, + [SPECIES_DROWZEE-1] = 0x4f, + [SPECIES_HYPNO-1] = 0x09, + [SPECIES_KRABBY-1] = 0x03, + [SPECIES_KINGLER-1] = 0x4b, + [SPECIES_VOLTORB-1] = 0x00, + [SPECIES_ELECTRODE-1] = 0x00, + [SPECIES_EXEGGCUTE-1] = 0x46, + [SPECIES_EXEGGUTOR-1] = 0x32, + [SPECIES_CUBONE-1] = 0x48, + [SPECIES_MAROWAK-1] = 0x05, + [SPECIES_HITMONLEE-1] = 0x16, + [SPECIES_HITMONCHAN-1] = 0x09, + [SPECIES_LICKITUNG-1] = 0x45, + [SPECIES_KOFFING-1] = 0x13, + [SPECIES_WEEZING-1] = 0x04, + [SPECIES_RHYHORN-1] = 0x10, + [SPECIES_RHYDON-1] = 0x13, + [SPECIES_CHANSEY-1] = 0x45, + [SPECIES_TANGELA-1] = 0x48, + [SPECIES_KANGASKHAN-1] = 0x17, + [SPECIES_HORSEA-1] = 0x12, + [SPECIES_SEADRA-1] = 0x04, + [SPECIES_GOLDEEN-1] = 0x0d, + [SPECIES_SEAKING-1] = 0x1c, + [SPECIES_STARYU-1] = 0x4e, + [SPECIES_STARMIE-1] = 0x12, + [SPECIES_MR_MIME-1] = 0x46, + [SPECIES_SCYTHER-1] = 0x02, + [SPECIES_JYNX-1] = 0x17, + [SPECIES_ELECTABUZZ-1] = 0x2c, + [SPECIES_MAGMAR-1] = 0x0f, + [SPECIES_PINSIR-1] = 0x09, + [SPECIES_TAUROS-1] = 0x19, + [SPECIES_MAGIKARP-1] = 0x05, + [SPECIES_GYARADOS-1] = 0x48, + [SPECIES_LAPRAS-1] = 0x17, + [SPECIES_DITTO-1] = 0x01, + [SPECIES_EEVEE-1] = 0x17, + [SPECIES_VAPOREON-1] = 0x17, + [SPECIES_JOLTEON-1] = 0x00, + [SPECIES_FLAREON-1] = 0x17, + [SPECIES_PORYGON-1] = 0x52, + [SPECIES_OMANYTE-1] = 0x51, + [SPECIES_OMASTAR-1] = 0x09, + [SPECIES_KABUTO-1] = 0x1d, + [SPECIES_KABUTOPS-1] = 0x0f, + [SPECIES_AERODACTYL-1] = 0x47, + [SPECIES_SNORLAX-1] = 0x0b, + [SPECIES_ARTICUNO-1] = 0x09, + [SPECIES_ZAPDOS-1] = 0x2c, + [SPECIES_MOLTRES-1] = 0x45, + [SPECIES_DRATINI-1] = 0x00, + [SPECIES_DRAGONAIR-1] = 0x10, + [SPECIES_DRAGONITE-1] = 0x47, + [SPECIES_MEWTWO-1] = 0x09, + [SPECIES_MEW-1] = 0x0d, + [SPECIES_CHIKORITA-1] = 0x00, + [SPECIES_BAYLEEF-1] = 0x00, + [SPECIES_MEGANIUM-1] = 0x17, + [SPECIES_CYNDAQUIL-1] = 0x52, + [SPECIES_QUILAVA-1] = 0x17, + [SPECIES_TYPHLOSION-1] = 0x10, + [SPECIES_TOTODILE-1] = 0x31, + [SPECIES_CROCONAW-1] = 0x0f, + [SPECIES_FERALIGATR-1] = 0x0f, + [SPECIES_SENTRET-1] = 0x00, + [SPECIES_FURRET-1] = 0x32, + [SPECIES_HOOTHOOT-1] = 0x47, + [SPECIES_NOCTOWL-1] = 0x17, + [SPECIES_LEDYBA-1] = 0x52, + [SPECIES_LEDIAN-1] = 0x47, + [SPECIES_SPINARAK-1] = 0x4f, + [SPECIES_ARIADOS-1] = 0x0f, + [SPECIES_CROBAT-1] = 0x00, + [SPECIES_CHINCHOU-1] = 0x45, + [SPECIES_LANTURN-1] = 0x51, + [SPECIES_PICHU-1] = 0x1e, + [SPECIES_CLEFFA-1] = 0x52, + [SPECIES_IGGLYBUFF-1] = 0x0c, + [SPECIES_TOGEPI-1] = 0x0b, + [SPECIES_TOGETIC-1] = 0x00, + [SPECIES_NATU-1] = 0x31, + [SPECIES_XATU-1] = 0x09, + [SPECIES_MAREEP-1] = 0x00, + [SPECIES_FLAAFFY-1] = 0x1e, + [SPECIES_AMPHAROS-1] = 0x2c, + [SPECIES_BELLOSSOM-1] = 0x0b, + [SPECIES_MARILL-1] = 0x00, + [SPECIES_AZUMARILL-1] = 0x4a, + [SPECIES_SUDOWOODO-1] = 0x46, + [SPECIES_POLITOED-1] = 0x32, + [SPECIES_HOPPIP-1] = 0x1c, + [SPECIES_SKIPLOOM-1] = 0x18, + [SPECIES_JUMPLUFF-1] = 0x51, + [SPECIES_AIPOM-1] = 0x32, + [SPECIES_SUNKERN-1] = 0x52, + [SPECIES_SUNFLORA-1] = 0x00, + [SPECIES_YANMA-1] = 0x2b, + [SPECIES_WOOPER-1] = 0x00, + [SPECIES_QUAGSIRE-1] = 0x16, + [SPECIES_ESPEON-1] = 0x09, + [SPECIES_UMBREON-1] = 0x10, + [SPECIES_MURKROW-1] = 0x00, + [SPECIES_SLOWKING-1] = 0x13, + [SPECIES_MISDREAVUS-1] = 0x1c, + [SPECIES_UNOWN-1] = 0x0a, + [SPECIES_WOBBUFFET-1] = 0x30, + [SPECIES_GIRAFARIG-1] = 0x1e, + [SPECIES_PINECO-1] = 0x0b, + [SPECIES_FORRETRESS-1] = 0x10, + [SPECIES_DUNSPARCE-1] = 0x00, + [SPECIES_GLIGAR-1] = 0x13, + [SPECIES_STEELIX-1] = 0x0f, + [SPECIES_SNUBBULL-1] = 0x17, + [SPECIES_GRANBULL-1] = 0x10, + [SPECIES_QWILFISH-1] = 0x3a, + [SPECIES_SCIZOR-1] = 0x02, + [SPECIES_SHUCKLE-1] = 0x0b, + [SPECIES_HERACROSS-1] = 0x41, + [SPECIES_SNEASEL-1] = 0x16, + [SPECIES_TEDDIURSA-1] = 0x17, + [SPECIES_URSARING-1] = 0x10, + [SPECIES_SLUGMA-1] = 0x17, + [SPECIES_MAGCARGO-1] = 0x17, + [SPECIES_SWINUB-1] = 0x00, + [SPECIES_PILOSWINE-1] = 0x0f, + [SPECIES_CORSOLA-1] = 0x03, + [SPECIES_REMORAID-1] = 0x52, + [SPECIES_OCTILLERY-1] = 0x17, + [SPECIES_DELIBIRD-1] = 0x52, + [SPECIES_MANTINE-1] = 0x0d, + [SPECIES_SKARMORY-1] = 0x17, + [SPECIES_HOUNDOUR-1] = 0x17, + [SPECIES_HOUNDOOM-1] = 0x10, + [SPECIES_KINGDRA-1] = 0x42, + [SPECIES_PHANPY-1] = 0x32, + [SPECIES_DONPHAN-1] = 0x19, + [SPECIES_PORYGON2-1] = 0x00, + [SPECIES_STANTLER-1] = 0x00, + [SPECIES_SMEARGLE-1] = 0x31, + [SPECIES_TYROGUE-1] = 0x16, + [SPECIES_HITMONTOP-1] = 0x02, + [SPECIES_SMOOCHUM-1] = 0x09, + [SPECIES_ELEKID-1] = 0x2c, + [SPECIES_MAGBY-1] = 0x00, + [SPECIES_MILTANK-1] = 0x45, + [SPECIES_BLISSEY-1] = 0x00, + [SPECIES_RAIKOU-1] = 0x2c, + [SPECIES_ENTEI-1] = 0x09, + [SPECIES_SUICUNE-1] = 0x10, + [SPECIES_LARVITAR-1] = 0x52, + [SPECIES_PUPITAR-1] = 0x10, + [SPECIES_TYRANITAR-1] = 0x0f, + [SPECIES_LUGIA-1] = 0x3a, + [SPECIES_HO_OH-1] = 0x09, + [SPECIES_CELEBI-1] = 0x18, + [SPECIES_OLD_UNOWN_B-1] = 0x00, + [SPECIES_OLD_UNOWN_C-1] = 0x00, + [SPECIES_OLD_UNOWN_D-1] = 0x00, + [SPECIES_OLD_UNOWN_E-1] = 0x00, + [SPECIES_OLD_UNOWN_F-1] = 0x00, + [SPECIES_OLD_UNOWN_G-1] = 0x00, + [SPECIES_OLD_UNOWN_H-1] = 0x00, + [SPECIES_OLD_UNOWN_I-1] = 0x00, + [SPECIES_OLD_UNOWN_J-1] = 0x00, + [SPECIES_OLD_UNOWN_K-1] = 0x00, + [SPECIES_OLD_UNOWN_L-1] = 0x00, + [SPECIES_OLD_UNOWN_M-1] = 0x00, + [SPECIES_OLD_UNOWN_N-1] = 0x00, + [SPECIES_OLD_UNOWN_O-1] = 0x00, + [SPECIES_OLD_UNOWN_P-1] = 0x00, + [SPECIES_OLD_UNOWN_Q-1] = 0x00, + [SPECIES_OLD_UNOWN_R-1] = 0x00, + [SPECIES_OLD_UNOWN_S-1] = 0x00, + [SPECIES_OLD_UNOWN_T-1] = 0x00, + [SPECIES_OLD_UNOWN_U-1] = 0x00, + [SPECIES_OLD_UNOWN_V-1] = 0x00, + [SPECIES_OLD_UNOWN_W-1] = 0x00, + [SPECIES_OLD_UNOWN_X-1] = 0x00, + [SPECIES_OLD_UNOWN_Y-1] = 0x00, + [SPECIES_OLD_UNOWN_Z-1] = 0x00, + [SPECIES_TREECKO-1] = 0x00, + [SPECIES_GROVYLE-1] = 0x17, + [SPECIES_SCEPTILE-1] = 0x10, + [SPECIES_TORCHIC-1] = 0x16, + [SPECIES_COMBUSKEN-1] = 0x06, + [SPECIES_BLAZIKEN-1] = 0x0f, + [SPECIES_MUDKIP-1] = 0x01, + [SPECIES_MARSHTOMP-1] = 0x04, + [SPECIES_SWAMPERT-1] = 0x1e, + [SPECIES_POOCHYENA-1] = 0x10, + [SPECIES_MIGHTYENA-1] = 0x10, + [SPECIES_ZIGZAGOON-1] = 0x03, + [SPECIES_LINOONE-1] = 0x09, + [SPECIES_WURMPLE-1] = 0x00, + [SPECIES_SILCOON-1] = 0x00, + [SPECIES_BEAUTIFLY-1] = 0x04, + [SPECIES_CASCOON-1] = 0x04, + [SPECIES_DUSTOX-1] = 0x06, + [SPECIES_LOTAD-1] = 0x00, + [SPECIES_LOMBRE-1] = 0x00, + [SPECIES_LUDICOLO-1] = 0x49, + [SPECIES_SEEDOT-1] = 0x05, + [SPECIES_NUZLEAF-1] = 0x00, + [SPECIES_SHIFTRY-1] = 0x02, + [SPECIES_NINCADA-1] = 0x00, + [SPECIES_NINJASK-1] = 0x46, + [SPECIES_SHEDINJA-1] = 0x1c, + [SPECIES_TAILLOW-1] = 0x1e, + [SPECIES_SWELLOW-1] = 0x01, + [SPECIES_SHROOMISH-1] = 0x00, + [SPECIES_BRELOOM-1] = 0x00, + [SPECIES_SPINDA-1] = 0x31, + [SPECIES_WINGULL-1] = 0x1b, + [SPECIES_PELIPPER-1] = 0x1c, + [SPECIES_SURSKIT-1] = 0x00, + [SPECIES_MASQUERAIN-1] = 0x00, + [SPECIES_WAILMER-1] = 0x01, + [SPECIES_WAILORD-1] = 0x1c, + [SPECIES_SKITTY-1] = 0x00, + [SPECIES_DELCATTY-1] = 0x17, + [SPECIES_KECLEON-1] = 0x35, + [SPECIES_BALTOY-1] = 0x1d, + [SPECIES_CLAYDOL-1] = 0x51, + [SPECIES_NOSEPASS-1] = 0x49, + [SPECIES_TORKOAL-1] = 0x17, + [SPECIES_SABLEYE-1] = 0x15, + [SPECIES_BARBOACH-1] = 0x49, + [SPECIES_WHISCASH-1] = 0x49, + [SPECIES_LUVDISC-1] = 0x1d, + [SPECIES_CORPHISH-1] = 0x10, + [SPECIES_CRAWDAUNT-1] = 0x09, + [SPECIES_FEEBAS-1] = 0x49, + [SPECIES_MILOTIC-1] = 0x22, + [SPECIES_CARVANHA-1] = 0x49, + [SPECIES_SHARPEDO-1] = 0x56, + [SPECIES_TRAPINCH-1] = 0x10, + [SPECIES_VIBRAVA-1] = 0x0f, + [SPECIES_FLYGON-1] = 0x4b, + [SPECIES_MAKUHITA-1] = 0x0b, + [SPECIES_HARIYAMA-1] = 0x34, + [SPECIES_ELECTRIKE-1] = 0x00, + [SPECIES_MANECTRIC-1] = 0x00, + [SPECIES_NUMEL-1] = 0x04, + [SPECIES_CAMERUPT-1] = 0x10, + [SPECIES_SPHEAL-1] = 0x53, + [SPECIES_SEALEO-1] = 0x17, + [SPECIES_WALREIN-1] = 0x0f, + [SPECIES_CACNEA-1] = 0x49, + [SPECIES_CACTURNE-1] = 0x04, + [SPECIES_SNORUNT-1] = 0x45, + [SPECIES_GLALIE-1] = 0x0a, + [SPECIES_LUNATONE-1] = 0x0e, + [SPECIES_SOLROCK-1] = 0x08, + [SPECIES_AZURILL-1] = 0x00, + [SPECIES_SPOINK-1] = 0x56, + [SPECIES_GRUMPIG-1] = 0x32, + [SPECIES_PLUSLE-1] = 0x00, + [SPECIES_MINUN-1] = 0x01, + [SPECIES_MAWILE-1] = 0x00, + [SPECIES_MEDITITE-1] = 0x05, + [SPECIES_MEDICHAM-1] = 0x45, + [SPECIES_SWABLU-1] = 0x04, + [SPECIES_ALTARIA-1] = 0x16, + [SPECIES_WYNAUT-1] = 0x32, + [SPECIES_DUSKULL-1] = 0x0a, + [SPECIES_DUSCLOPS-1] = 0x02, + [SPECIES_ROSELIA-1] = 0x45, + [SPECIES_SLAKOTH-1] = 0x45, + [SPECIES_VIGOROTH-1] = 0x31, + [SPECIES_SLAKING-1] = 0x45, + [SPECIES_GULPIN-1] = 0x00, + [SPECIES_SWALOT-1] = 0x45, + [SPECIES_TROPIUS-1] = 0x10, + [SPECIES_WHISMUR-1] = 0x03, + [SPECIES_LOUDRED-1] = 0x49, + [SPECIES_EXPLOUD-1] = 0x19, + [SPECIES_CLAMPERL-1] = 0x12, + [SPECIES_HUNTAIL-1] = 0x09, + [SPECIES_GOREBYSS-1] = 0x1c, + [SPECIES_ABSOL-1] = 0x11, + [SPECIES_SHUPPET-1] = 0x1c, + [SPECIES_BANETTE-1] = 0x0d, + [SPECIES_SEVIPER-1] = 0x17, + [SPECIES_ZANGOOSE-1] = 0x09, + [SPECIES_RELICANTH-1] = 0x1a, + [SPECIES_ARON-1] = 0x45, + [SPECIES_LAIRON-1] = 0x00, + [SPECIES_AGGRON-1] = 0x19, + [SPECIES_CASTFORM-1] = 0x1d, + [SPECIES_VOLBEAT-1] = 0x00, + [SPECIES_ILLUMISE-1] = 0x05, + [SPECIES_LILEEP-1] = 0x17, + [SPECIES_CRADILY-1] = 0x19, + [SPECIES_ANORITH-1] = 0x12, + [SPECIES_ARMALDO-1] = 0x10, + [SPECIES_RALTS-1] = 0x45, + [SPECIES_KIRLIA-1] = 0x00, + [SPECIES_GARDEVOIR-1] = 0x00, + [SPECIES_BAGON-1] = 0x19, + [SPECIES_SHELGON-1] = 0x04, + [SPECIES_SALAMENCE-1] = 0x0f, + [SPECIES_BELDUM-1] = 0x0f, + [SPECIES_METANG-1] = 0x04, + [SPECIES_METAGROSS-1] = 0x10, + [SPECIES_REGIROCK-1] = 0x01, + [SPECIES_REGICE-1] = 0x44, + [SPECIES_REGISTEEL-1] = 0x09, + [SPECIES_KYOGRE-1] = 0x2d, + [SPECIES_GROUDON-1] = 0x10, + [SPECIES_RAYQUAZA-1] = 0x0f, + [SPECIES_LATIAS-1] = 0x2d, + [SPECIES_LATIOS-1] = 0x10, + [SPECIES_JIRACHI-1] = 0x0d, + [SPECIES_DEOXYS-1] = 0x1b, + [SPECIES_CHIMECHO-1] = 0x1d, }; static const u8 sMonAnimationDelayTable[] = { - 0x00, // SPECIES_BULBASAUR - 0x00, // SPECIES_IVYSAUR - 0x00, // SPECIES_VENUSAUR - 0x00, // SPECIES_CHARMANDER - 0x00, // SPECIES_CHARMELEON - 0x00, // SPECIES_CHARIZARD - 0x00, // SPECIES_SQUIRTLE - 0x00, // SPECIES_WARTORTLE - 0x32, // SPECIES_BLASTOISE - 0x00, // SPECIES_CATERPIE - 0x00, // SPECIES_METAPOD - 0x00, // SPECIES_BUTTERFREE - 0x0a, // SPECIES_WEEDLE - 0x14, // SPECIES_KAKUNA - 0x23, // SPECIES_BEEDRILL - 0x00, // SPECIES_PIDGEY - 0x19, // SPECIES_PIDGEOTTO - 0x00, // SPECIES_PIDGEOT - 0x00, // SPECIES_RATTATA - 0x00, // SPECIES_RATICATE - 0x00, // SPECIES_SPEAROW - 0x02, // SPECIES_FEAROW - 0x1e, // SPECIES_EKANS - 0x00, // SPECIES_ARBOK - 0x00, // SPECIES_PIKACHU - 0x00, // SPECIES_RAICHU - 0x00, // SPECIES_SANDSHREW - 0x00, // SPECIES_SANDSLASH - 0x1c, // SPECIES_NIDORAN_F - 0x00, // SPECIES_NIDORINA - 0x00, // SPECIES_NIDOQUEEN - 0x00, // SPECIES_NIDORAN_M - 0x00, // SPECIES_NIDORINO - 0x19, // SPECIES_NIDOKING - 0x00, // SPECIES_CLEFAIRY - 0x00, // SPECIES_CLEFABLE - 0x00, // SPECIES_VULPIX - 0x00, // SPECIES_NINETALES - 0x00, // SPECIES_JIGGLYPUFF - 0x00, // SPECIES_WIGGLYTUFF - 0x00, // SPECIES_ZUBAT - 0x00, // SPECIES_GOLBAT - 0x00, // SPECIES_ODDISH - 0x00, // SPECIES_GLOOM - 0x00, // SPECIES_VILEPLUME - 0x0a, // SPECIES_PARAS - 0x2d, // SPECIES_PARASECT - 0x14, // SPECIES_VENONAT - 0x00, // SPECIES_VENOMOTH - 0x19, // SPECIES_DIGLETT - 0x23, // SPECIES_DUGTRIO - 0x28, // SPECIES_MEOWTH - 0x14, // SPECIES_PERSIAN - 0x00, // SPECIES_PSYDUCK - 0x00, // SPECIES_GOLDUCK - 0x14, // SPECIES_MANKEY - 0x00, // SPECIES_PRIMEAPE - 0x1e, // SPECIES_GROWLITHE - 0x28, // SPECIES_ARCANINE - 0x00, // SPECIES_POLIWAG - 0x05, // SPECIES_POLIWHIRL - 0x00, // SPECIES_POLIWRATH - 0x00, // SPECIES_ABRA - 0x00, // SPECIES_KADABRA - 0x00, // SPECIES_ALAKAZAM - 0x00, // SPECIES_MACHOP - 0x00, // SPECIES_MACHOKE - 0x00, // SPECIES_MACHAMP - 0x00, // SPECIES_BELLSPROUT - 0x03, // SPECIES_WEEPINBELL - 0x00, // SPECIES_VICTREEBEL - 0x00, // SPECIES_TENTACOOL - 0x00, // SPECIES_TENTACRUEL - 0x00, // SPECIES_GEODUDE - 0x00, // SPECIES_GRAVELER - 0x00, // SPECIES_GOLEM - 0x00, // SPECIES_PONYTA - 0x00, // SPECIES_RAPIDASH - 0x00, // SPECIES_SLOWPOKE - 0x00, // SPECIES_SLOWBRO - 0x00, // SPECIES_MAGNEMITE - 0x00, // SPECIES_MAGNETON - 0x00, // SPECIES_FARFETCHD - 0x00, // SPECIES_DODUO - 0x00, // SPECIES_DODRIO - 0x00, // SPECIES_SEEL - 0x00, // SPECIES_DEWGONG - 0x00, // SPECIES_GRIMER - 0x2d, // SPECIES_MUK - 0x14, // SPECIES_SHELLDER - 0x00, // SPECIES_CLOYSTER - 0x00, // SPECIES_GASTLY - 0x17, // SPECIES_HAUNTER - 0x00, // SPECIES_GENGAR - 0x00, // SPECIES_ONIX - 0x30, // SPECIES_DROWZEE - 0x28, // SPECIES_HYPNO - 0x00, // SPECIES_KRABBY - 0x00, // SPECIES_KINGLER - 0x00, // SPECIES_VOLTORB - 0x00, // SPECIES_ELECTRODE - 0x00, // SPECIES_EXEGGCUTE - 0x00, // SPECIES_EXEGGUTOR - 0x00, // SPECIES_CUBONE - 0x00, // SPECIES_MAROWAK - 0x00, // SPECIES_HITMONLEE - 0x19, // SPECIES_HITMONCHAN - 0x00, // SPECIES_LICKITUNG - 0x00, // SPECIES_KOFFING - 0x00, // SPECIES_WEEZING - 0x00, // SPECIES_RHYHORN - 0x00, // SPECIES_RHYDON - 0x00, // SPECIES_CHANSEY - 0x00, // SPECIES_TANGELA - 0x00, // SPECIES_KANGASKHAN - 0x00, // SPECIES_HORSEA - 0x00, // SPECIES_SEADRA - 0x00, // SPECIES_GOLDEEN - 0x00, // SPECIES_SEAKING - 0x00, // SPECIES_STARYU - 0x00, // SPECIES_STARMIE - 0x00, // SPECIES_MR_MIME - 0x0a, // SPECIES_SCYTHER - 0x00, // SPECIES_JYNX - 0x00, // SPECIES_ELECTABUZZ - 0x00, // SPECIES_MAGMAR - 0x00, // SPECIES_PINSIR - 0x0a, // SPECIES_TAUROS - 0x00, // SPECIES_MAGIKARP - 0x00, // SPECIES_GYARADOS - 0x00, // SPECIES_LAPRAS - 0x00, // SPECIES_DITTO - 0x00, // SPECIES_EEVEE - 0x00, // SPECIES_VAPOREON - 0x00, // SPECIES_JOLTEON - 0x00, // SPECIES_FLAREON - 0x00, // SPECIES_PORYGON - 0x00, // SPECIES_OMANYTE - 0x00, // SPECIES_OMASTAR - 0x00, // SPECIES_KABUTO - 0x00, // SPECIES_KABUTOPS - 0x00, // SPECIES_AERODACTYL - 0x00, // SPECIES_SNORLAX - 0x00, // SPECIES_ARTICUNO - 0x00, // SPECIES_ZAPDOS - 0x00, // SPECIES_MOLTRES - 0x00, // SPECIES_DRATINI - 0x00, // SPECIES_DRAGONAIR - 0x00, // SPECIES_DRAGONITE - 0x00, // SPECIES_MEWTWO - 0x00, // SPECIES_MEW - 0x00, // SPECIES_CHIKORITA - 0x00, // SPECIES_BAYLEEF - 0x00, // SPECIES_MEGANIUM - 0x00, // SPECIES_CYNDAQUIL - 0x00, // SPECIES_QUILAVA - 0x14, // SPECIES_TYPHLOSION - 0x00, // SPECIES_TOTODILE - 0x00, // SPECIES_CROCONAW - 0x05, // SPECIES_FERALIGATR - 0x00, // SPECIES_SENTRET - 0x00, // SPECIES_FURRET - 0x00, // SPECIES_HOOTHOOT - 0x00, // SPECIES_NOCTOWL - 0x00, // SPECIES_LEDYBA - 0x00, // SPECIES_LEDIAN - 0x00, // SPECIES_SPINARAK - 0x00, // SPECIES_ARIADOS - 0x00, // SPECIES_CROBAT - 0x00, // SPECIES_CHINCHOU - 0x00, // SPECIES_LANTURN - 0x00, // SPECIES_PICHU - 0x00, // SPECIES_CLEFFA - 0x00, // SPECIES_IGGLYBUFF - 0x00, // SPECIES_TOGEPI - 0x00, // SPECIES_TOGETIC - 0x1e, // SPECIES_NATU - 0x00, // SPECIES_XATU - 0x32, // SPECIES_MAREEP - 0x00, // SPECIES_FLAAFFY - 0x0a, // SPECIES_AMPHAROS - 0x00, // SPECIES_BELLOSSOM - 0x00, // SPECIES_MARILL - 0x00, // SPECIES_AZUMARILL - 0x00, // SPECIES_SUDOWOODO - 0x28, // SPECIES_POLITOED - 0x00, // SPECIES_HOPPIP - 0x00, // SPECIES_SKIPLOOM - 0x00, // SPECIES_JUMPLUFF - 0x00, // SPECIES_AIPOM - 0x00, // SPECIES_SUNKERN - 0x00, // SPECIES_SUNFLORA - 0x00, // SPECIES_YANMA - 0x00, // SPECIES_WOOPER - 0x00, // SPECIES_QUAGSIRE - 0x00, // SPECIES_ESPEON - 0x00, // SPECIES_UMBREON - 0x00, // SPECIES_MURKROW - 0x00, // SPECIES_SLOWKING - 0x00, // SPECIES_MISDREAVUS - 0x00, // SPECIES_UNOWN - 0x00, // SPECIES_WOBBUFFET - 0x00, // SPECIES_GIRAFARIG - 0x00, // SPECIES_PINECO - 0x00, // SPECIES_FORRETRESS - 0x0a, // SPECIES_DUNSPARCE - 0x00, // SPECIES_GLIGAR - 0x2d, // SPECIES_STEELIX - 0x00, // SPECIES_SNUBBULL - 0x00, // SPECIES_GRANBULL - 0x27, // SPECIES_QWILFISH - 0x13, // SPECIES_SCIZOR - 0x00, // SPECIES_SHUCKLE - 0x00, // SPECIES_HERACROSS - 0x00, // SPECIES_SNEASEL - 0x00, // SPECIES_TEDDIURSA - 0x00, // SPECIES_URSARING - 0x00, // SPECIES_SLUGMA - 0x00, // SPECIES_MAGCARGO - 0x00, // SPECIES_SWINUB - 0x00, // SPECIES_PILOSWINE - 0x00, // SPECIES_CORSOLA - 0x00, // SPECIES_REMORAID - 0x14, // SPECIES_OCTILLERY - 0x00, // SPECIES_DELIBIRD - 0x00, // SPECIES_MANTINE - 0x00, // SPECIES_SKARMORY - 0x00, // SPECIES_HOUNDOUR - 0x00, // SPECIES_HOUNDOOM - 0x00, // SPECIES_KINGDRA - 0x00, // SPECIES_PHANPY - 0x00, // SPECIES_DONPHAN - 0x00, // SPECIES_PORYGON2 - 0x00, // SPECIES_STANTLER - 0x00, // SPECIES_SMEARGLE - 0x00, // SPECIES_TYROGUE - 0x00, // SPECIES_HITMONTOP - 0x28, // SPECIES_SMOOCHUM - 0x00, // SPECIES_ELEKID - 0x00, // SPECIES_MAGBY - 0x00, // SPECIES_MILTANK - 0x00, // SPECIES_BLISSEY - 0x00, // SPECIES_RAIKOU - 0x00, // SPECIES_ENTEI - 0x00, // SPECIES_SUICUNE - 0x00, // SPECIES_LARVITAR - 0x00, // SPECIES_PUPITAR - 0x0a, // SPECIES_TYRANITAR - 0x14, // SPECIES_LUGIA - 0x00, // SPECIES_HO_OH - 0x00, // SPECIES_CELEBI - 0x00, // 252 - 0x00, // 253 - 0x00, // 254 - 0x00, // 255 - 0x00, // 256 - 0x00, // 257 - 0x00, // 258 - 0x00, // 259 - 0x00, // 260 - 0x00, // 261 - 0x00, // 262 - 0x00, // 263 - 0x00, // 264 - 0x00, // 265 - 0x00, // 266 - 0x00, // 267 - 0x00, // 268 - 0x00, // 269 - 0x00, // 270 - 0x00, // 271 - 0x00, // 272 - 0x00, // 273 - 0x00, // 274 - 0x00, // 275 - 0x00, // 276 - 0x00, // SPECIES_TREECKO - 0x00, // SPECIES_GROVYLE - 0x00, // SPECIES_SCEPTILE - 0x00, // SPECIES_TORCHIC - 0x00, // SPECIES_COMBUSKEN - 0x00, // SPECIES_BLAZIKEN - 0x00, // SPECIES_MUDKIP - 0x00, // SPECIES_MARSHTOMP - 0x00, // SPECIES_SWAMPERT - 0x00, // SPECIES_POOCHYENA - 0x00, // SPECIES_MIGHTYENA - 0x00, // SPECIES_ZIGZAGOON - 0x00, // SPECIES_LINOONE - 0x00, // SPECIES_WURMPLE - 0x00, // SPECIES_SILCOON - 0x00, // SPECIES_BEAUTIFLY - 0x00, // SPECIES_CASCOON - 0x00, // SPECIES_DUSTOX - 0x00, // SPECIES_LOTAD - 0x00, // SPECIES_LOMBRE - 0x00, // SPECIES_LUDICOLO - 0x00, // SPECIES_SEEDOT - 0x00, // SPECIES_NUZLEAF - 0x00, // SPECIES_SHIFTRY - 0x00, // SPECIES_NINCADA - 0x00, // SPECIES_NINJASK - 0x00, // SPECIES_SHEDINJA - 0x00, // SPECIES_TAILLOW - 0x00, // SPECIES_SWELLOW - 0x00, // SPECIES_SHROOMISH - 0x00, // SPECIES_BRELOOM - 0x00, // SPECIES_SPINDA - 0x00, // SPECIES_WINGULL - 0x00, // SPECIES_PELIPPER - 0x00, // SPECIES_SURSKIT - 0x00, // SPECIES_MASQUERAIN - 0x00, // SPECIES_WAILMER - 0x0a, // SPECIES_WAILORD - 0x00, // SPECIES_SKITTY - 0x00, // SPECIES_DELCATTY - 0x1e, // SPECIES_KECLEON - 0x00, // SPECIES_BALTOY - 0x00, // SPECIES_CLAYDOL - 0x00, // SPECIES_NOSEPASS - 0x00, // SPECIES_TORKOAL - 0x00, // SPECIES_SABLEYE - 0x00, // SPECIES_BARBOACH - 0x00, // SPECIES_WHISCASH - 0x00, // SPECIES_LUVDISC - 0x00, // SPECIES_CORPHISH - 0x00, // SPECIES_CRAWDAUNT - 0x00, // SPECIES_FEEBAS - 0x2d, // SPECIES_MILOTIC - 0x00, // SPECIES_CARVANHA - 0x00, // SPECIES_SHARPEDO - 0x00, // SPECIES_TRAPINCH - 0x00, // SPECIES_VIBRAVA - 0x00, // SPECIES_FLYGON - 0x00, // SPECIES_MAKUHITA - 0x00, // SPECIES_HARIYAMA - 0x00, // SPECIES_ELECTRIKE - 0x00, // SPECIES_MANECTRIC - 0x00, // SPECIES_NUMEL - 0x00, // SPECIES_CAMERUPT - 0x0f, // SPECIES_SPHEAL - 0x00, // SPECIES_SEALEO - 0x00, // SPECIES_WALREIN - 0x00, // SPECIES_CACNEA - 0x00, // SPECIES_CACTURNE - 0x14, // SPECIES_SNORUNT - 0x00, // SPECIES_GLALIE - 0x00, // SPECIES_LUNATONE - 0x00, // SPECIES_SOLROCK - 0x00, // SPECIES_AZURILL - 0x00, // SPECIES_SPOINK - 0x0f, // SPECIES_GRUMPIG - 0x00, // SPECIES_PLUSLE - 0x00, // SPECIES_MINUN - 0x00, // SPECIES_MAWILE - 0x00, // SPECIES_MEDITITE - 0x00, // SPECIES_MEDICHAM - 0x00, // SPECIES_SWABLU - 0x00, // SPECIES_ALTARIA - 0x0f, // SPECIES_WYNAUT - 0x00, // SPECIES_DUSKULL - 0x1e, // SPECIES_DUSCLOPS - 0x00, // SPECIES_ROSELIA - 0x00, // SPECIES_SLAKOTH - 0x00, // SPECIES_VIGOROTH - 0x00, // SPECIES_SLAKING - 0x00, // SPECIES_GULPIN - 0x00, // SPECIES_SWALOT - 0x00, // SPECIES_TROPIUS - 0x00, // SPECIES_WHISMUR - 0x00, // SPECIES_LOUDRED - 0x00, // SPECIES_EXPLOUD - 0x00, // SPECIES_CLAMPERL - 0x00, // SPECIES_HUNTAIL - 0x00, // SPECIES_GOREBYSS - 0x2d, // SPECIES_ABSOL - 0x00, // SPECIES_SHUPPET - 0x00, // SPECIES_BANETTE - 0x00, // SPECIES_SEVIPER - 0x00, // SPECIES_ZANGOOSE - 0x00, // SPECIES_RELICANTH - 0x00, // SPECIES_ARON - 0x00, // SPECIES_LAIRON - 0x00, // SPECIES_AGGRON - 0x00, // SPECIES_CASTFORM - 0x00, // SPECIES_VOLBEAT - 0x00, // SPECIES_ILLUMISE - 0x00, // SPECIES_LILEEP - 0x00, // SPECIES_CRADILY - 0x00, // SPECIES_ANORITH - 0x00, // SPECIES_ARMALDO - 0x00, // SPECIES_RALTS - 0x00, // SPECIES_KIRLIA - 0x00, // SPECIES_GARDEVOIR - 0x00, // SPECIES_BAGON - 0x00, // SPECIES_SHELGON - 0x46, // SPECIES_SALAMENCE - 0x00, // SPECIES_BELDUM - 0x00, // SPECIES_METANG - 0x00, // SPECIES_METAGROSS - 0x00, // SPECIES_REGIROCK - 0x00, // SPECIES_REGICE - 0x00, // SPECIES_REGISTEEL - 0x3c, // SPECIES_KYOGRE - 0x00, // SPECIES_GROUDON - 0x3c, // SPECIES_RAYQUAZA - 0x00, // SPECIES_LATIAS - 0x00, // SPECIES_LATIOS - 0x00, // SPECIES_JIRACHI - 0x00, // SPECIES_DEOXYS - 0x00, // SPECIES_CHIMECHO + [SPECIES_BULBASAUR-1] = 0x00, + [SPECIES_IVYSAUR-1] = 0x00, + [SPECIES_VENUSAUR-1] = 0x00, + [SPECIES_CHARMANDER-1] = 0x00, + [SPECIES_CHARMELEON-1] = 0x00, + [SPECIES_CHARIZARD-1] = 0x00, + [SPECIES_SQUIRTLE-1] = 0x00, + [SPECIES_WARTORTLE-1] = 0x00, + [SPECIES_BLASTOISE-1] = 0x32, + [SPECIES_CATERPIE-1] = 0x00, + [SPECIES_METAPOD-1] = 0x00, + [SPECIES_BUTTERFREE-1] = 0x00, + [SPECIES_WEEDLE-1] = 0x0a, + [SPECIES_KAKUNA-1] = 0x14, + [SPECIES_BEEDRILL-1] = 0x23, + [SPECIES_PIDGEY-1] = 0x00, + [SPECIES_PIDGEOTTO-1] = 0x19, + [SPECIES_PIDGEOT-1] = 0x00, + [SPECIES_RATTATA-1] = 0x00, + [SPECIES_RATICATE-1] = 0x00, + [SPECIES_SPEAROW-1] = 0x00, + [SPECIES_FEAROW-1] = 0x02, + [SPECIES_EKANS-1] = 0x1e, + [SPECIES_ARBOK-1] = 0x00, + [SPECIES_PIKACHU-1] = 0x00, + [SPECIES_RAICHU-1] = 0x00, + [SPECIES_SANDSHREW-1] = 0x00, + [SPECIES_SANDSLASH-1] = 0x00, + [SPECIES_NIDORAN_F-1] = 0x1c, + [SPECIES_NIDORINA-1] = 0x00, + [SPECIES_NIDOQUEEN-1] = 0x00, + [SPECIES_NIDORAN_M-1] = 0x00, + [SPECIES_NIDORINO-1] = 0x00, + [SPECIES_NIDOKING-1] = 0x19, + [SPECIES_CLEFAIRY-1] = 0x00, + [SPECIES_CLEFABLE-1] = 0x00, + [SPECIES_VULPIX-1] = 0x00, + [SPECIES_NINETALES-1] = 0x00, + [SPECIES_JIGGLYPUFF-1] = 0x00, + [SPECIES_WIGGLYTUFF-1] = 0x00, + [SPECIES_ZUBAT-1] = 0x00, + [SPECIES_GOLBAT-1] = 0x00, + [SPECIES_ODDISH-1] = 0x00, + [SPECIES_GLOOM-1] = 0x00, + [SPECIES_VILEPLUME-1] = 0x00, + [SPECIES_PARAS-1] = 0x0a, + [SPECIES_PARASECT-1] = 0x2d, + [SPECIES_VENONAT-1] = 0x14, + [SPECIES_VENOMOTH-1] = 0x00, + [SPECIES_DIGLETT-1] = 0x19, + [SPECIES_DUGTRIO-1] = 0x23, + [SPECIES_MEOWTH-1] = 0x28, + [SPECIES_PERSIAN-1] = 0x14, + [SPECIES_PSYDUCK-1] = 0x00, + [SPECIES_GOLDUCK-1] = 0x00, + [SPECIES_MANKEY-1] = 0x14, + [SPECIES_PRIMEAPE-1] = 0x00, + [SPECIES_GROWLITHE-1] = 0x1e, + [SPECIES_ARCANINE-1] = 0x28, + [SPECIES_POLIWAG-1] = 0x00, + [SPECIES_POLIWHIRL-1] = 0x05, + [SPECIES_POLIWRATH-1] = 0x00, + [SPECIES_ABRA-1] = 0x00, + [SPECIES_KADABRA-1] = 0x00, + [SPECIES_ALAKAZAM-1] = 0x00, + [SPECIES_MACHOP-1] = 0x00, + [SPECIES_MACHOKE-1] = 0x00, + [SPECIES_MACHAMP-1] = 0x00, + [SPECIES_BELLSPROUT-1] = 0x00, + [SPECIES_WEEPINBELL-1] = 0x03, + [SPECIES_VICTREEBEL-1] = 0x00, + [SPECIES_TENTACOOL-1] = 0x00, + [SPECIES_TENTACRUEL-1] = 0x00, + [SPECIES_GEODUDE-1] = 0x00, + [SPECIES_GRAVELER-1] = 0x00, + [SPECIES_GOLEM-1] = 0x00, + [SPECIES_PONYTA-1] = 0x00, + [SPECIES_RAPIDASH-1] = 0x00, + [SPECIES_SLOWPOKE-1] = 0x00, + [SPECIES_SLOWBRO-1] = 0x00, + [SPECIES_MAGNEMITE-1] = 0x00, + [SPECIES_MAGNETON-1] = 0x00, + [SPECIES_FARFETCHD-1] = 0x00, + [SPECIES_DODUO-1] = 0x00, + [SPECIES_DODRIO-1] = 0x00, + [SPECIES_SEEL-1] = 0x00, + [SPECIES_DEWGONG-1] = 0x00, + [SPECIES_GRIMER-1] = 0x00, + [SPECIES_MUK-1] = 0x2d, + [SPECIES_SHELLDER-1] = 0x14, + [SPECIES_CLOYSTER-1] = 0x00, + [SPECIES_GASTLY-1] = 0x00, + [SPECIES_HAUNTER-1] = 0x17, + [SPECIES_GENGAR-1] = 0x00, + [SPECIES_ONIX-1] = 0x00, + [SPECIES_DROWZEE-1] = 0x30, + [SPECIES_HYPNO-1] = 0x28, + [SPECIES_KRABBY-1] = 0x00, + [SPECIES_KINGLER-1] = 0x00, + [SPECIES_VOLTORB-1] = 0x00, + [SPECIES_ELECTRODE-1] = 0x00, + [SPECIES_EXEGGCUTE-1] = 0x00, + [SPECIES_EXEGGUTOR-1] = 0x00, + [SPECIES_CUBONE-1] = 0x00, + [SPECIES_MAROWAK-1] = 0x00, + [SPECIES_HITMONLEE-1] = 0x00, + [SPECIES_HITMONCHAN-1] = 0x19, + [SPECIES_LICKITUNG-1] = 0x00, + [SPECIES_KOFFING-1] = 0x00, + [SPECIES_WEEZING-1] = 0x00, + [SPECIES_RHYHORN-1] = 0x00, + [SPECIES_RHYDON-1] = 0x00, + [SPECIES_CHANSEY-1] = 0x00, + [SPECIES_TANGELA-1] = 0x00, + [SPECIES_KANGASKHAN-1] = 0x00, + [SPECIES_HORSEA-1] = 0x00, + [SPECIES_SEADRA-1] = 0x00, + [SPECIES_GOLDEEN-1] = 0x00, + [SPECIES_SEAKING-1] = 0x00, + [SPECIES_STARYU-1] = 0x00, + [SPECIES_STARMIE-1] = 0x00, + [SPECIES_MR_MIME-1] = 0x00, + [SPECIES_SCYTHER-1] = 0x0a, + [SPECIES_JYNX-1] = 0x00, + [SPECIES_ELECTABUZZ-1] = 0x00, + [SPECIES_MAGMAR-1] = 0x00, + [SPECIES_PINSIR-1] = 0x00, + [SPECIES_TAUROS-1] = 0x0a, + [SPECIES_MAGIKARP-1] = 0x00, + [SPECIES_GYARADOS-1] = 0x00, + [SPECIES_LAPRAS-1] = 0x00, + [SPECIES_DITTO-1] = 0x00, + [SPECIES_EEVEE-1] = 0x00, + [SPECIES_VAPOREON-1] = 0x00, + [SPECIES_JOLTEON-1] = 0x00, + [SPECIES_FLAREON-1] = 0x00, + [SPECIES_PORYGON-1] = 0x00, + [SPECIES_OMANYTE-1] = 0x00, + [SPECIES_OMASTAR-1] = 0x00, + [SPECIES_KABUTO-1] = 0x00, + [SPECIES_KABUTOPS-1] = 0x00, + [SPECIES_AERODACTYL-1] = 0x00, + [SPECIES_SNORLAX-1] = 0x00, + [SPECIES_ARTICUNO-1] = 0x00, + [SPECIES_ZAPDOS-1] = 0x00, + [SPECIES_MOLTRES-1] = 0x00, + [SPECIES_DRATINI-1] = 0x00, + [SPECIES_DRAGONAIR-1] = 0x00, + [SPECIES_DRAGONITE-1] = 0x00, + [SPECIES_MEWTWO-1] = 0x00, + [SPECIES_MEW-1] = 0x00, + [SPECIES_CHIKORITA-1] = 0x00, + [SPECIES_BAYLEEF-1] = 0x00, + [SPECIES_MEGANIUM-1] = 0x00, + [SPECIES_CYNDAQUIL-1] = 0x00, + [SPECIES_QUILAVA-1] = 0x00, + [SPECIES_TYPHLOSION-1] = 0x14, + [SPECIES_TOTODILE-1] = 0x00, + [SPECIES_CROCONAW-1] = 0x00, + [SPECIES_FERALIGATR-1] = 0x05, + [SPECIES_SENTRET-1] = 0x00, + [SPECIES_FURRET-1] = 0x00, + [SPECIES_HOOTHOOT-1] = 0x00, + [SPECIES_NOCTOWL-1] = 0x00, + [SPECIES_LEDYBA-1] = 0x00, + [SPECIES_LEDIAN-1] = 0x00, + [SPECIES_SPINARAK-1] = 0x00, + [SPECIES_ARIADOS-1] = 0x00, + [SPECIES_CROBAT-1] = 0x00, + [SPECIES_CHINCHOU-1] = 0x00, + [SPECIES_LANTURN-1] = 0x00, + [SPECIES_PICHU-1] = 0x00, + [SPECIES_CLEFFA-1] = 0x00, + [SPECIES_IGGLYBUFF-1] = 0x00, + [SPECIES_TOGEPI-1] = 0x00, + [SPECIES_TOGETIC-1] = 0x00, + [SPECIES_NATU-1] = 0x1e, + [SPECIES_XATU-1] = 0x00, + [SPECIES_MAREEP-1] = 0x32, + [SPECIES_FLAAFFY-1] = 0x00, + [SPECIES_AMPHAROS-1] = 0x0a, + [SPECIES_BELLOSSOM-1] = 0x00, + [SPECIES_MARILL-1] = 0x00, + [SPECIES_AZUMARILL-1] = 0x00, + [SPECIES_SUDOWOODO-1] = 0x00, + [SPECIES_POLITOED-1] = 0x28, + [SPECIES_HOPPIP-1] = 0x00, + [SPECIES_SKIPLOOM-1] = 0x00, + [SPECIES_JUMPLUFF-1] = 0x00, + [SPECIES_AIPOM-1] = 0x00, + [SPECIES_SUNKERN-1] = 0x00, + [SPECIES_SUNFLORA-1] = 0x00, + [SPECIES_YANMA-1] = 0x00, + [SPECIES_WOOPER-1] = 0x00, + [SPECIES_QUAGSIRE-1] = 0x00, + [SPECIES_ESPEON-1] = 0x00, + [SPECIES_UMBREON-1] = 0x00, + [SPECIES_MURKROW-1] = 0x00, + [SPECIES_SLOWKING-1] = 0x00, + [SPECIES_MISDREAVUS-1] = 0x00, + [SPECIES_UNOWN-1] = 0x00, + [SPECIES_WOBBUFFET-1] = 0x00, + [SPECIES_GIRAFARIG-1] = 0x00, + [SPECIES_PINECO-1] = 0x00, + [SPECIES_FORRETRESS-1] = 0x00, + [SPECIES_DUNSPARCE-1] = 0x0a, + [SPECIES_GLIGAR-1] = 0x00, + [SPECIES_STEELIX-1] = 0x2d, + [SPECIES_SNUBBULL-1] = 0x00, + [SPECIES_GRANBULL-1] = 0x00, + [SPECIES_QWILFISH-1] = 0x27, + [SPECIES_SCIZOR-1] = 0x13, + [SPECIES_SHUCKLE-1] = 0x00, + [SPECIES_HERACROSS-1] = 0x00, + [SPECIES_SNEASEL-1] = 0x00, + [SPECIES_TEDDIURSA-1] = 0x00, + [SPECIES_URSARING-1] = 0x00, + [SPECIES_SLUGMA-1] = 0x00, + [SPECIES_MAGCARGO-1] = 0x00, + [SPECIES_SWINUB-1] = 0x00, + [SPECIES_PILOSWINE-1] = 0x00, + [SPECIES_CORSOLA-1] = 0x00, + [SPECIES_REMORAID-1] = 0x00, + [SPECIES_OCTILLERY-1] = 0x14, + [SPECIES_DELIBIRD-1] = 0x00, + [SPECIES_MANTINE-1] = 0x00, + [SPECIES_SKARMORY-1] = 0x00, + [SPECIES_HOUNDOUR-1] = 0x00, + [SPECIES_HOUNDOOM-1] = 0x00, + [SPECIES_KINGDRA-1] = 0x00, + [SPECIES_PHANPY-1] = 0x00, + [SPECIES_DONPHAN-1] = 0x00, + [SPECIES_PORYGON2-1] = 0x00, + [SPECIES_STANTLER-1] = 0x00, + [SPECIES_SMEARGLE-1] = 0x00, + [SPECIES_TYROGUE-1] = 0x00, + [SPECIES_HITMONTOP-1] = 0x00, + [SPECIES_SMOOCHUM-1] = 0x28, + [SPECIES_ELEKID-1] = 0x00, + [SPECIES_MAGBY-1] = 0x00, + [SPECIES_MILTANK-1] = 0x00, + [SPECIES_BLISSEY-1] = 0x00, + [SPECIES_RAIKOU-1] = 0x00, + [SPECIES_ENTEI-1] = 0x00, + [SPECIES_SUICUNE-1] = 0x00, + [SPECIES_LARVITAR-1] = 0x00, + [SPECIES_PUPITAR-1] = 0x00, + [SPECIES_TYRANITAR-1] = 0x0a, + [SPECIES_LUGIA-1] = 0x14, + [SPECIES_HO_OH-1] = 0x00, + [SPECIES_CELEBI-1] = 0x00, + [SPECIES_OLD_UNOWN_B-1] = 0x00, + [SPECIES_OLD_UNOWN_C-1] = 0x00, + [SPECIES_OLD_UNOWN_D-1] = 0x00, + [SPECIES_OLD_UNOWN_E-1] = 0x00, + [SPECIES_OLD_UNOWN_F-1] = 0x00, + [SPECIES_OLD_UNOWN_G-1] = 0x00, + [SPECIES_OLD_UNOWN_H-1] = 0x00, + [SPECIES_OLD_UNOWN_I-1] = 0x00, + [SPECIES_OLD_UNOWN_J-1] = 0x00, + [SPECIES_OLD_UNOWN_K-1] = 0x00, + [SPECIES_OLD_UNOWN_L-1] = 0x00, + [SPECIES_OLD_UNOWN_M-1] = 0x00, + [SPECIES_OLD_UNOWN_N-1] = 0x00, + [SPECIES_OLD_UNOWN_O-1] = 0x00, + [SPECIES_OLD_UNOWN_P-1] = 0x00, + [SPECIES_OLD_UNOWN_Q-1] = 0x00, + [SPECIES_OLD_UNOWN_R-1] = 0x00, + [SPECIES_OLD_UNOWN_S-1] = 0x00, + [SPECIES_OLD_UNOWN_T-1] = 0x00, + [SPECIES_OLD_UNOWN_U-1] = 0x00, + [SPECIES_OLD_UNOWN_V-1] = 0x00, + [SPECIES_OLD_UNOWN_W-1] = 0x00, + [SPECIES_OLD_UNOWN_X-1] = 0x00, + [SPECIES_OLD_UNOWN_Y-1] = 0x00, + [SPECIES_OLD_UNOWN_Z-1] = 0x00, + [SPECIES_TREECKO-1] = 0x00, + [SPECIES_GROVYLE-1] = 0x00, + [SPECIES_SCEPTILE-1] = 0x00, + [SPECIES_TORCHIC-1] = 0x00, + [SPECIES_COMBUSKEN-1] = 0x00, + [SPECIES_BLAZIKEN-1] = 0x00, + [SPECIES_MUDKIP-1] = 0x00, + [SPECIES_MARSHTOMP-1] = 0x00, + [SPECIES_SWAMPERT-1] = 0x00, + [SPECIES_POOCHYENA-1] = 0x00, + [SPECIES_MIGHTYENA-1] = 0x00, + [SPECIES_ZIGZAGOON-1] = 0x00, + [SPECIES_LINOONE-1] = 0x00, + [SPECIES_WURMPLE-1] = 0x00, + [SPECIES_SILCOON-1] = 0x00, + [SPECIES_BEAUTIFLY-1] = 0x00, + [SPECIES_CASCOON-1] = 0x00, + [SPECIES_DUSTOX-1] = 0x00, + [SPECIES_LOTAD-1] = 0x00, + [SPECIES_LOMBRE-1] = 0x00, + [SPECIES_LUDICOLO-1] = 0x00, + [SPECIES_SEEDOT-1] = 0x00, + [SPECIES_NUZLEAF-1] = 0x00, + [SPECIES_SHIFTRY-1] = 0x00, + [SPECIES_NINCADA-1] = 0x00, + [SPECIES_NINJASK-1] = 0x00, + [SPECIES_SHEDINJA-1] = 0x00, + [SPECIES_TAILLOW-1] = 0x00, + [SPECIES_SWELLOW-1] = 0x00, + [SPECIES_SHROOMISH-1] = 0x00, + [SPECIES_BRELOOM-1] = 0x00, + [SPECIES_SPINDA-1] = 0x00, + [SPECIES_WINGULL-1] = 0x00, + [SPECIES_PELIPPER-1] = 0x00, + [SPECIES_SURSKIT-1] = 0x00, + [SPECIES_MASQUERAIN-1] = 0x00, + [SPECIES_WAILMER-1] = 0x00, + [SPECIES_WAILORD-1] = 0x0a, + [SPECIES_SKITTY-1] = 0x00, + [SPECIES_DELCATTY-1] = 0x00, + [SPECIES_KECLEON-1] = 0x1e, + [SPECIES_BALTOY-1] = 0x00, + [SPECIES_CLAYDOL-1] = 0x00, + [SPECIES_NOSEPASS-1] = 0x00, + [SPECIES_TORKOAL-1] = 0x00, + [SPECIES_SABLEYE-1] = 0x00, + [SPECIES_BARBOACH-1] = 0x00, + [SPECIES_WHISCASH-1] = 0x00, + [SPECIES_LUVDISC-1] = 0x00, + [SPECIES_CORPHISH-1] = 0x00, + [SPECIES_CRAWDAUNT-1] = 0x00, + [SPECIES_FEEBAS-1] = 0x00, + [SPECIES_MILOTIC-1] = 0x2d, + [SPECIES_CARVANHA-1] = 0x00, + [SPECIES_SHARPEDO-1] = 0x00, + [SPECIES_TRAPINCH-1] = 0x00, + [SPECIES_VIBRAVA-1] = 0x00, + [SPECIES_FLYGON-1] = 0x00, + [SPECIES_MAKUHITA-1] = 0x00, + [SPECIES_HARIYAMA-1] = 0x00, + [SPECIES_ELECTRIKE-1] = 0x00, + [SPECIES_MANECTRIC-1] = 0x00, + [SPECIES_NUMEL-1] = 0x00, + [SPECIES_CAMERUPT-1] = 0x00, + [SPECIES_SPHEAL-1] = 0x0f, + [SPECIES_SEALEO-1] = 0x00, + [SPECIES_WALREIN-1] = 0x00, + [SPECIES_CACNEA-1] = 0x00, + [SPECIES_CACTURNE-1] = 0x00, + [SPECIES_SNORUNT-1] = 0x14, + [SPECIES_GLALIE-1] = 0x00, + [SPECIES_LUNATONE-1] = 0x00, + [SPECIES_SOLROCK-1] = 0x00, + [SPECIES_AZURILL-1] = 0x00, + [SPECIES_SPOINK-1] = 0x00, + [SPECIES_GRUMPIG-1] = 0x0f, + [SPECIES_PLUSLE-1] = 0x00, + [SPECIES_MINUN-1] = 0x00, + [SPECIES_MAWILE-1] = 0x00, + [SPECIES_MEDITITE-1] = 0x00, + [SPECIES_MEDICHAM-1] = 0x00, + [SPECIES_SWABLU-1] = 0x00, + [SPECIES_ALTARIA-1] = 0x00, + [SPECIES_WYNAUT-1] = 0x0f, + [SPECIES_DUSKULL-1] = 0x00, + [SPECIES_DUSCLOPS-1] = 0x1e, + [SPECIES_ROSELIA-1] = 0x00, + [SPECIES_SLAKOTH-1] = 0x00, + [SPECIES_VIGOROTH-1] = 0x00, + [SPECIES_SLAKING-1] = 0x00, + [SPECIES_GULPIN-1] = 0x00, + [SPECIES_SWALOT-1] = 0x00, + [SPECIES_TROPIUS-1] = 0x00, + [SPECIES_WHISMUR-1] = 0x00, + [SPECIES_LOUDRED-1] = 0x00, + [SPECIES_EXPLOUD-1] = 0x00, + [SPECIES_CLAMPERL-1] = 0x00, + [SPECIES_HUNTAIL-1] = 0x00, + [SPECIES_GOREBYSS-1] = 0x00, + [SPECIES_ABSOL-1] = 0x2d, + [SPECIES_SHUPPET-1] = 0x00, + [SPECIES_BANETTE-1] = 0x00, + [SPECIES_SEVIPER-1] = 0x00, + [SPECIES_ZANGOOSE-1] = 0x00, + [SPECIES_RELICANTH-1] = 0x00, + [SPECIES_ARON-1] = 0x00, + [SPECIES_LAIRON-1] = 0x00, + [SPECIES_AGGRON-1] = 0x00, + [SPECIES_CASTFORM-1] = 0x00, + [SPECIES_VOLBEAT-1] = 0x00, + [SPECIES_ILLUMISE-1] = 0x00, + [SPECIES_LILEEP-1] = 0x00, + [SPECIES_CRADILY-1] = 0x00, + [SPECIES_ANORITH-1] = 0x00, + [SPECIES_ARMALDO-1] = 0x00, + [SPECIES_RALTS-1] = 0x00, + [SPECIES_KIRLIA-1] = 0x00, + [SPECIES_GARDEVOIR-1] = 0x00, + [SPECIES_BAGON-1] = 0x00, + [SPECIES_SHELGON-1] = 0x00, + [SPECIES_SALAMENCE-1] = 0x46, + [SPECIES_BELDUM-1] = 0x00, + [SPECIES_METANG-1] = 0x00, + [SPECIES_METAGROSS-1] = 0x00, + [SPECIES_REGIROCK-1] = 0x00, + [SPECIES_REGICE-1] = 0x00, + [SPECIES_REGISTEEL-1] = 0x00, + [SPECIES_KYOGRE-1] = 0x3c, + [SPECIES_GROUDON-1] = 0x00, + [SPECIES_RAYQUAZA-1] = 0x3c, + [SPECIES_LATIAS-1] = 0x00, + [SPECIES_LATIOS-1] = 0x00, + [SPECIES_JIRACHI-1] = 0x00, + [SPECIES_DEOXYS-1] = 0x00, + [SPECIES_CHIMECHO-1] = 0x00, }; const u8 gUnknown_08329D22[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values @@ -2458,12 +2460,12 @@ static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] = {SPECIES_NONE, ITEM_NONE}, {SPECIES_MAREEP, ITEM_GANLON_BERRY}, {SPECIES_PINECO, ITEM_APICOT_BERRY}, - {SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM}, - {SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY}, - {SPECIES_AIPOM, ITEM_BERRY_JUICE}, - {SPECIES_SHUCKLE, ITEM_BERRY_JUICE}, - {SPECIES_STANTLER, ITEM_PETAYA_BERRY}, - {SPECIES_SMEARGLE, ITEM_SALAC_BERRY}, + {SPECIES_HOUNDOUR, ITEM_BIG_MUSHROOM}, + {SPECIES_TEDDIURSA, ITEM_PETAYA_BERRY}, + {SPECIES_AIPOM, ITEM_BERRY_JUICE}, + {SPECIES_SHUCKLE, ITEM_BERRY_JUICE}, + {SPECIES_STANTLER, ITEM_PETAYA_BERRY}, + {SPECIES_SMEARGLE, ITEM_SALAC_BERRY}, }; static const struct OamData sOamData_8329F20 = diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index edaedbabd..6aa7593ca 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -786,30 +786,30 @@ static const u8 sBackAnimationIds[] = static const u8 sBackAnimNatureModTable[] = { - 0x00, // NATURE_HARDY - 0x02, // NATURE_LONELY - 0x00, // NATURE_BRAVE - 0x00, // NATURE_ADAMANT - 0x00, // NATURE_NAUGHTY - 0x01, // NATURE_BOLD - 0x01, // NATURE_DOCILE - 0x01, // NATURE_RELAXED - 0x00, // NATURE_IMPISH - 0x01, // NATURE_LAX - 0x02, // NATURE_TIMID - 0x00, // NATURE_HASTY - 0x01, // NATURE_SERIOUS - 0x00, // NATURE_JOLLY - 0x00, // NATURE_NAIVE - 0x02, // NATURE_MODEST - 0x02, // NATURE_MILD - 0x02, // NATURE_QUIET - 0x02, // NATURE_BASHFUL - 0x01, // NATURE_RASH - 0x01, // NATURE_CALM - 0x02, // NATURE_GENTLE - 0x01, // NATURE_SASSY - 0x02, // NATURE_CAREFUL + [NATURE_HARDY] = 0x00, + [NATURE_LONELY] = 0x02, + [NATURE_BRAVE] = 0x00, + [NATURE_ADAMANT] = 0x00, + [NATURE_NAUGHTY] = 0x00, + [NATURE_BOLD] = 0x01, + [NATURE_DOCILE] = 0x01, + [NATURE_RELAXED] = 0x01, + [NATURE_IMPISH] = 0x00, + [NATURE_LAX] = 0x01, + [NATURE_TIMID] = 0x02, + [NATURE_HASTY] = 0x00, + [NATURE_SERIOUS] = 0x01, + [NATURE_JOLLY] = 0x00, + [NATURE_NAIVE] = 0x00, + [NATURE_MODEST] = 0x02, + [NATURE_MILD] = 0x02, + [NATURE_QUIET] = 0x02, + [NATURE_BASHFUL] = 0x02, + [NATURE_RASH] = 0x01, + [NATURE_CALM] = 0x01, + [NATURE_GENTLE] = 0x02, + [NATURE_SASSY] = 0x01, + [NATURE_CAREFUL] = 0x02, 0x01, // NATURE_QUIRKY }; -- cgit v1.2.3 From f24584cd3121c1773da2312f0720dc466799698c Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Fri, 7 Dec 2018 21:01:59 +0800 Subject: Tabs -> spaces & align in include/ --- include/constants/battle_string_ids.h | 746 +++++++++++++++++----------------- include/gba/isagbprint.h | 18 +- include/global.fieldmap.h | 4 +- include/graphics.h | 2 +- include/pokemon_summary_screen.h | 8 +- include/save.h | 6 +- include/shop.h | 22 +- 7 files changed, 403 insertions(+), 403 deletions(-) diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index db9ed59bd..9e0d8e0be 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -5,382 +5,382 @@ #define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved -#define STRINGID_INTROMSG 0 +#define STRINGID_INTROMSG 0 #define STRINGID_INTROSENDOUT 1 -#define STRINGID_RETURNMON 2 +#define STRINGID_RETURNMON 2 #define STRINGID_SWITCHINMON 3 -#define STRINGID_USEDMOVE 4 -#define STRINGID_BATTLEEND 5 +#define STRINGID_USEDMOVE 4 +#define STRINGID_BATTLEEND 5 // todo: make some of those names less vague: attacker/target vs pkmn, etc. -#define STRINGID_TRAINER1LOSETEXT 12 -#define STRINGID_PKMNGAINEDEXP 13 -#define STRINGID_PKMNGREWTOLV 14 -#define STRINGID_PKMNLEARNEDMOVE 15 -#define STRINGID_TRYTOLEARNMOVE1 16 -#define STRINGID_TRYTOLEARNMOVE2 17 -#define STRINGID_TRYTOLEARNMOVE3 18 -#define STRINGID_PKMNFORGOTMOVE 19 -#define STRINGID_STOPLEARNINGMOVE 20 -#define STRINGID_DIDNOTLEARNMOVE 21 -#define STRINGID_PKMNLEARNEDMOVE2 22 -#define STRINGID_ATTACKMISSED 23 -#define STRINGID_PKMNPROTECTEDITSELF 24 -#define STRINGID_STATSWONTINCREASE2 25 -#define STRINGID_AVOIDEDDAMAGE 26 -#define STRINGID_ITDOESNTAFFECT 27 -#define STRINGID_ATTACKERFAINTED 28 -#define STRINGID_TARGETFAINTED 29 -#define STRINGID_PLAYERGOTMONEY 30 -#define STRINGID_PLAYERWHITEOUT 31 -#define STRINGID_PLAYERWHITEOUT2 32 -#define STRINGID_PREVENTSESCAPE 33 -#define STRINGID_HITXTIMES 34 -#define STRINGID_PKMNFELLASLEEP 35 -#define STRINGID_PKMNMADESLEEP 36 -#define STRINGID_PKMNALREADYASLEEP 37 -#define STRINGID_PKMNALREADYASLEEP2 38 -#define STRINGID_PKMNWASNTAFFECTED 39 -#define STRINGID_PKMNWASPOISONED 40 -#define STRINGID_PKMNPOISONEDBY 41 -#define STRINGID_PKMNHURTBYPOISON 42 -#define STRINGID_PKMNALREADYPOISONED 43 -#define STRINGID_PKMNBADLYPOISONED 44 -#define STRINGID_PKMNENERGYDRAINED 45 -#define STRINGID_PKMNWASBURNED 46 -#define STRINGID_PKMNBURNEDBY 47 -#define STRINGID_PKMNHURTBYBURN 48 -#define STRINGID_PKMNWASFROZEN 49 -#define STRINGID_PKMNFROZENBY 50 -#define STRINGID_PKMNISFROZEN 51 -#define STRINGID_PKMNWASDEFROSTED 52 -#define STRINGID_PKMNWASDEFROSTED2 53 -#define STRINGID_PKMNWASDEFROSTEDBY 54 -#define STRINGID_PKMNWASPARALYZED 55 -#define STRINGID_PKMNWASPARALYZEDBY 56 -#define STRINGID_PKMNISPARALYZED 57 -#define STRINGID_PKMNISALREADYPARALYZED 58 -#define STRINGID_PKMNHEALEDPARALYSIS 59 -#define STRINGID_PKMNDREAMEATEN 60 -#define STRINGID_STATSWONTINCREASE 61 -#define STRINGID_STATSWONTDECREASE 62 -#define STRINGID_TEAMSTOPPEDWORKING 63 -#define STRINGID_FOESTOPPEDWORKING 64 -#define STRINGID_PKMNISCONFUSED 65 -#define STRINGID_PKMNHEALEDCONFUSION 66 -#define STRINGID_PKMNWASCONFUSED 67 -#define STRINGID_PKMNALREADYCONFUSED 68 -#define STRINGID_PKMNFELLINLOVE 69 -#define STRINGID_PKMNINLOVE 70 -#define STRINGID_PKMNIMMOBILIZEDBYLOVE 71 -#define STRINGID_PKMNBLOWNAWAY 72 -#define STRINGID_PKMNCHANGEDTYPE 73 -#define STRINGID_PKMNFLINCHED 74 -#define STRINGID_PKMNREGAINEDHEALTH 75 -#define STRINGID_PKMNHPFULL 76 -#define STRINGID_PKMNRAISEDSPDEF 77 -#define STRINGID_PKMNRAISEDDEF 78 -#define STRINGID_PKMNCOVEREDBYVEIL 79 -#define STRINGID_PKMNUSEDSAFEGUARD 80 -#define STRINGID_PKMNSAFEGUARDEXPIRED 81 -#define STRINGID_PKMNWENTTOSLEEP 82 -#define STRINGID_PKMNSLEPTHEALTHY 83 -#define STRINGID_PKMNWHIPPEDWHIRLWIND 84 -#define STRINGID_PKMNTOOKSUNLIGHT 85 -#define STRINGID_PKMNLOWEREDHEAD 86 -#define STRINGID_PKMNISGLOWING 87 -#define STRINGID_PKMNFLEWHIGH 88 -#define STRINGID_PKMNDUGHOLE 89 -#define STRINGID_PKMNSQUEEZEDBYBIND 90 -#define STRINGID_PKMNTRAPPEDINVORTEX 91 -#define STRINGID_PKMNWRAPPEDBY 92 -#define STRINGID_PKMNCLAMPED 93 -#define STRINGID_PKMNHURTBY 94 -#define STRINGID_PKMNFREEDFROM 95 -#define STRINGID_PKMNCRASHED 96 -#define STRINGID_PKMNSHROUDEDINMIST 97 -#define STRINGID_PKMNPROTECTEDBYMIST 98 -#define STRINGID_PKMNGETTINGPUMPED 99 -#define STRINGID_PKMNHITWITHRECOIL 100 -#define STRINGID_PKMNPROTECTEDITSELF2 101 -#define STRINGID_PKMNBUFFETEDBYSANDSTORM 102 -#define STRINGID_PKMNPELTEDBYHAIL 103 -#define STRINGID_PKMNSEEDED 104 -#define STRINGID_PKMNEVADEDATTACK 105 -#define STRINGID_PKMNSAPPEDBYLEECHSEED 106 -#define STRINGID_PKMNFASTASLEEP 107 -#define STRINGID_PKMNWOKEUP 108 -#define STRINGID_PKMNUPROARKEPTAWAKE 109 -#define STRINGID_PKMNWOKEUPINUPROAR 110 -#define STRINGID_PKMNCAUSEDUPROAR 111 -#define STRINGID_PKMNMAKINGUPROAR 112 -#define STRINGID_PKMNCALMEDDOWN 113 -#define STRINGID_PKMNCANTSLEEPINUPROAR 114 -#define STRINGID_PKMNSTOCKPILED 115 -#define STRINGID_PKMNCANTSTOCKPILE 116 -#define STRINGID_PKMNCANTSLEEPINUPROAR2 117 -#define STRINGID_UPROARKEPTPKMNAWAKE 118 -#define STRINGID_PKMNSTAYEDAWAKEUSING 119 -#define STRINGID_PKMNSTORINGENERGY 120 -#define STRINGID_PKMNUNLEASHEDENERGY 121 -#define STRINGID_PKMNFATIGUECONFUSION 122 -#define STRINGID_PKMNPICKEDUPITEM 123 -#define STRINGID_PKMNUNAFFECTED 124 -#define STRINGID_PKMNTRANSFORMEDINTO 125 -#define STRINGID_PKMNMADESUBSTITUTE 126 -#define STRINGID_PKMNHASSUBSTITUTE 127 -#define STRINGID_SUBSTITUTEDAMAGED 128 -#define STRINGID_PKMNSUBSTITUTEFADED 129 -#define STRINGID_PKMNMUSTRECHARGE 130 -#define STRINGID_PKMNRAGEBUILDING 131 -#define STRINGID_PKMNMOVEWASDISABLED 132 -#define STRINGID_PKMNMOVEISDISABLED 133 -#define STRINGID_PKMNMOVEDISABLEDNOMORE 134 -#define STRINGID_PKMNGOTENCORE 135 -#define STRINGID_PKMNENCOREENDED 136 -#define STRINGID_PKMNTOOKAIM 137 -#define STRINGID_PKMNSKETCHEDMOVE 138 -#define STRINGID_PKMNTRYINGTOTAKEFOE 139 -#define STRINGID_PKMNTOOKFOE 140 -#define STRINGID_PKMNREDUCEDPP 141 -#define STRINGID_PKMNSTOLEITEM 142 -#define STRINGID_TARGETCANTESCAPENOW 143 -#define STRINGID_PKMNFELLINTONIGHTMARE 144 -#define STRINGID_PKMNLOCKEDINNIGHTMARE 145 -#define STRINGID_PKMNLAIDCURSE 146 -#define STRINGID_PKMNAFFLICTEDBYCURSE 147 -#define STRINGID_SPIKESSCATTERED 148 -#define STRINGID_PKMNHURTBYSPIKES 149 -#define STRINGID_PKMNIDENTIFIED 150 -#define STRINGID_PKMNPERISHCOUNTFELL 151 -#define STRINGID_PKMNBRACEDITSELF 152 -#define STRINGID_PKMNENDUREDHIT 153 -#define STRINGID_MAGNITUDESTRENGTH 154 -#define STRINGID_PKMNCUTHPMAXEDATTACK 155 -#define STRINGID_PKMNCOPIEDSTATCHANGES 156 -#define STRINGID_PKMNGOTFREE 157 -#define STRINGID_PKMNSHEDLEECHSEED 158 -#define STRINGID_PKMNBLEWAWAYSPIKES 159 -#define STRINGID_PKMNFLEDFROMBATTLE 160 -#define STRINGID_PKMNFORESAWATTACK 161 -#define STRINGID_PKMNTOOKATTACK 162 -#define STRINGID_PKMNATTACK 163 -#define STRINGID_PKMNCENTERATTENTION 164 -#define STRINGID_PKMNCHARGINGPOWER 165 -#define STRINGID_NATUREPOWERTURNEDINTO 166 -#define STRINGID_PKMNSTATUSNORMAL 167 -#define STRINGID_PKMNHASNOMOVESLEFT 168 -#define STRINGID_PKMNSUBJECTEDTOTORMENT 169 -#define STRINGID_PKMNCANTUSEMOVETORMENT 170 -#define STRINGID_PKMNTIGHTENINGFOCUS 171 -#define STRINGID_PKMNFELLFORTAUNT 172 -#define STRINGID_PKMNCANTUSEMOVETAUNT 173 -#define STRINGID_PKMNREADYTOHELP 174 -#define STRINGID_PKMNSWITCHEDITEMS 175 -#define STRINGID_PKMNCOPIEDFOE 176 -#define STRINGID_PKMNMADEWISH 177 -#define STRINGID_PKMNWISHCAMETRUE 178 -#define STRINGID_PKMNPLANTEDROOTS 179 -#define STRINGID_PKMNABSORBEDNUTRIENTS 180 -#define STRINGID_PKMNANCHOREDITSELF 181 -#define STRINGID_PKMNWASMADEDROWSY 182 -#define STRINGID_PKMNKNOCKEDOFF 183 -#define STRINGID_PKMNSWAPPEDABILITIES 184 -#define STRINGID_PKMNSEALEDOPPONENTMOVE 185 -#define STRINGID_PKMNCANTUSEMOVESEALED 186 -#define STRINGID_PKMNWANTSGRUDGE 187 -#define STRINGID_PKMNLOSTPPGRUDGE 188 -#define STRINGID_PKMNSHROUDEDITSELF 189 -#define STRINGID_PKMNMOVEBOUNCED 190 -#define STRINGID_PKMNWAITSFORTARGET 191 -#define STRINGID_PKMNSNATCHEDMOVE 192 -#define STRINGID_PKMNMADEITRAIN 193 -#define STRINGID_PKMNRAISEDSPEED 194 -#define STRINGID_PKMNPROTECTEDBY 195 -#define STRINGID_PKMNPREVENTSUSAGE 196 -#define STRINGID_PKMNRESTOREDHPUSING 197 -#define STRINGID_PKMNCHANGEDTYPEWITH 198 -#define STRINGID_PKMNPREVENTSPARALYSISWITH 199 -#define STRINGID_PKMNPREVENTSROMANCEWITH 200 -#define STRINGID_PKMNPREVENTSPOISONINGWITH 201 -#define STRINGID_PKMNPREVENTSCONFUSIONWITH 202 -#define STRINGID_PKMNRAISEDFIREPOWERWITH 203 -#define STRINGID_PKMNANCHORSITSELFWITH 204 -#define STRINGID_PKMNCUTSATTACKWITH 205 -#define STRINGID_PKMNPREVENTSSTATLOSSWITH 206 -#define STRINGID_PKMNHURTSWITH 207 -#define STRINGID_PKMNTRACED 208 -#define STRINGID_STATSHARPLY 209 -#define STRINGID_STATROSE 210 -#define STRINGID_STATHARSHLY 211 -#define STRINGID_STATFELL 212 -#define STRINGID_PKMNSSTATCHANGED 213 -#define STRINGID_PKMNSSTATCHANGED2 214 -#define STRINGID_PKMNSSTATCHANGED3 215 -#define STRINGID_PKMNSSTATCHANGED4 216 -#define STRINGID_CRITICALHIT 217 -#define STRINGID_ONEHITKO 218 -#define STRINGID_123POOF 219 -#define STRINGID_ANDELLIPSIS 220 -#define STRINGID_NOTVERYEFFECTIVE 221 -#define STRINGID_SUPEREFFECTIVE 222 -#define STRINGID_GOTAWAYSAFELY 223 -#define STRINGID_WILDPKMNFLED 224 -#define STRINGID_NORUNNINGFROMTRAINERS 225 -#define STRINGID_CANTESCAPE 226 -#define STRINGID_DONTLEAVEBIRCH 227 -#define STRINGID_BUTNOTHINGHAPPENED 228 -#define STRINGID_BUTITFAILED 229 -#define STRINGID_ITHURTCONFUSION 230 -#define STRINGID_MIRRORMOVEFAILED 231 -#define STRINGID_STARTEDTORAIN 232 -#define STRINGID_DOWNPOURSTARTED 233 -#define STRINGID_RAINCONTINUES 234 -#define STRINGID_DOWNPOURCONTINUES 235 -#define STRINGID_RAINSTOPPED 236 -#define STRINGID_SANDSTORMBREWED 237 -#define STRINGID_SANDSTORMRAGES 238 -#define STRINGID_SANDSTORMSUBSIDED 239 -#define STRINGID_SUNLIGHTGOTBRIGHT 240 -#define STRINGID_SUNLIGHTSTRONG 241 -#define STRINGID_SUNLIGHTFADED 242 -#define STRINGID_STARTEDHAIL 243 -#define STRINGID_HAILCONTINUES 244 -#define STRINGID_HAILSTOPPED 245 -#define STRINGID_FAILEDTOSPITUP 246 -#define STRINGID_FAILEDTOSWALLOW 247 -#define STRINGID_WINDBECAMEHEATWAVE 248 -#define STRINGID_STATCHANGESGONE 249 -#define STRINGID_COINSSCATTERED 250 -#define STRINGID_TOOWEAKFORSUBSTITUTE 251 -#define STRINGID_SHAREDPAIN 252 -#define STRINGID_BELLCHIMED 253 -#define STRINGID_FAINTINTHREE 254 -#define STRINGID_NOPPLEFT 255 -#define STRINGID_BUTNOPPLEFT 256 -#define STRINGID_PLAYERUSEDITEM 257 -#define STRINGID_WALLYUSEDITEM 258 -#define STRINGID_TRAINERBLOCKEDBALL 259 -#define STRINGID_DONTBEATHIEF 260 -#define STRINGID_ITDODGEDBALL 261 -#define STRINGID_YOUMISSEDPKMN 262 -#define STRINGID_PKMNBROKEFREE 263 -#define STRINGID_ITAPPEAREDCAUGHT 264 -#define STRINGID_AARGHALMOSTHADIT 265 -#define STRINGID_SHOOTSOCLOSE 266 -#define STRINGID_GOTCHAPKMNCAUGHT 267 -#define STRINGID_GOTCHAPKMNCAUGHT2 268 -#define STRINGID_GIVENICKNAMECAPTURED 269 -#define STRINGID_PKMNSENTTOPC 270 -#define STRINGID_PKMNDATAADDEDTODEX 271 -#define STRINGID_ITISRAINING 272 -#define STRINGID_SANDSTORMISRAGING 273 -#define STRINGID_CANTESCAPE2 274 -#define STRINGID_PKMNIGNORESASLEEP 275 -#define STRINGID_PKMNIGNOREDORDERS 276 -#define STRINGID_PKMNBEGANTONAP 277 -#define STRINGID_PKMNLOAFING 278 -#define STRINGID_PKMNWONTOBEY 279 -#define STRINGID_PKMNTURNEDAWAY 280 -#define STRINGID_PKMNPRETENDNOTNOTICE 281 -#define STRINGID_ENEMYABOUTTOSWITCHPKMN 282 -#define STRINGID_CREPTCLOSER 283 -#define STRINGID_CANTGETCLOSER 284 -#define STRINGID_PKMNWATCHINGCAREFULLY 285 -#define STRINGID_PKMNCURIOUSABOUTX 286 -#define STRINGID_PKMNENTHRALLEDBYX 287 -#define STRINGID_PKMNIGNOREDX 288 -#define STRINGID_THREWPOKEBLOCKATPKMN 289 -#define STRINGID_OUTOFSAFARIBALLS 290 -#define STRINGID_PKMNSITEMCUREDPARALYSIS 291 -#define STRINGID_PKMNSITEMCUREDPOISON 292 -#define STRINGID_PKMNSITEMHEALEDBURN 293 -#define STRINGID_PKMNSITEMDEFROSTEDIT 294 -#define STRINGID_PKMNSITEMWOKEIT 295 -#define STRINGID_PKMNSITEMSNAPPEDOUT 296 -#define STRINGID_PKMNSITEMCUREDPROBLEM 297 -#define STRINGID_PKMNSITEMRESTOREDHEALTH 298 -#define STRINGID_PKMNSITEMRESTOREDPP 299 -#define STRINGID_PKMNSITEMRESTOREDSTATUS 300 -#define STRINGID_PKMNSITEMRESTOREDHPALITTLE 301 -#define STRINGID_ITEMALLOWSONLYYMOVE 302 -#define STRINGID_PKMNHUNGONWITHX 303 -#define STRINGID_EMPTYSTRING3 304 -#define STRINGID_PKMNSXPREVENTSBURNS 305 -#define STRINGID_PKMNSXBLOCKSY 306 -#define STRINGID_PKMNSXRESTOREDHPALITTLE2 307 -#define STRINGID_PKMNSXWHIPPEDUPSANDSTORM 308 -#define STRINGID_PKMNSXPREVENTSYLOSS 309 -#define STRINGID_PKMNSXINFATUATEDY 310 -#define STRINGID_PKMNSXMADEYINEFFECTIVE 311 -#define STRINGID_PKMNSXCUREDYPROBLEM 312 -#define STRINGID_ITSUCKEDLIQUIDOOZE 313 -#define STRINGID_PKMNTRANSFORMED 314 -#define STRINGID_ELECTRICITYWEAKENED 315 -#define STRINGID_FIREWEAKENED 316 -#define STRINGID_PKMNHIDUNDERWATER 317 -#define STRINGID_PKMNSPRANGUP 318 -#define STRINGID_HMMOVESCANTBEFORGOTTEN 319 -#define STRINGID_XFOUNDONEY 320 -#define STRINGID_PLAYERDEFEATEDTRAINER1 321 -#define STRINGID_SOOTHINGAROMA 322 -#define STRINGID_ITEMSCANTBEUSEDNOW 323 -#define STRINGID_FORXCOMMAYZ 324 -#define STRINGID_USINGXTHEYOFZN 325 -#define STRINGID_PKMNUSEDXTOGETPUMPED 326 -#define STRINGID_PKMNSXMADEYUSELESS 327 -#define STRINGID_PKMNTRAPPEDBYSANDTOMB 328 -#define STRINGID_EMPTYSTRING4 329 -#define STRINGID_ABOOSTED 330 -#define STRINGID_PKMNSXINTENSIFIEDSUN 331 -#define STRINGID_PKMNMAKESGROUNDMISS 332 -#define STRINGID_YOUTHROWABALLNOWRIGHT 333 -#define STRINGID_PKMNSXTOOKATTACK 334 -#define STRINGID_PKMNCHOSEXASDESTINY 335 -#define STRINGID_PKMNLOSTFOCUS 336 -#define STRINGID_USENEXTPKMN 337 -#define STRINGID_PKMNFLEDUSINGITS 338 -#define STRINGID_PKMNFLEDUSING 339 -#define STRINGID_PKMNWASDRAGGEDOUT 340 -#define STRINGID_PREVENTEDFROMWORKING 341 -#define STRINGID_PKMNSITEMNORMALIZEDSTATUS 342 -#define STRINGID_TRAINER1USEDITEM 343 -#define STRINGID_BOXISFULL 344 -#define STRINGID_PKMNAVOIDEDATTACK 345 -#define STRINGID_PKMNSXMADEITINEFFECTIVE 346 -#define STRINGID_PKMNSXPREVENTSFLINCHING 347 -#define STRINGID_PKMNALREADYHASBURN 348 -#define STRINGID_STATSWONTDECREASE2 349 -#define STRINGID_PKMNSXBLOCKSY2 350 -#define STRINGID_PKMNSXWOREOFF 351 -#define STRINGID_PKMNRAISEDDEFALITTLE 352 -#define STRINGID_PKMNRAISEDSPDEFALITTLE 353 -#define STRINGID_THEWALLSHATTERED 354 -#define STRINGID_PKMNSXPREVENTSYSZ 355 -#define STRINGID_PKMNSXCUREDITSYPROBLEM 356 -#define STRINGID_ATTACKERCANTESCAPE 357 -#define STRINGID_PKMNOBTAINEDX 358 -#define STRINGID_PKMNOBTAINEDX2 359 -#define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360 -#define STRINGID_BUTNOEFFECT 361 -#define STRINGID_PKMNSXHADNOEFFECTONY 362 -#define STRINGID_TWOENEMIESDEFEATED 363 -#define STRINGID_TRAINER2LOSETEXT 364 -#define STRINGID_PKMNINCAPABLEOFPOWER 365 -#define STRINGID_GLINTAPPEARSINEYE 366 -#define STRINGID_PKMNGETTINGINTOPOSITION 367 -#define STRINGID_PKMNBEGANGROWLINGDEEPLY 368 -#define STRINGID_PKMNEAGERFORMORE 369 -#define STRINGID_DEFEATEDOPPONENTBYREFEREE 370 -#define STRINGID_LOSTTOOPPONENTBYREFEREE 371 -#define STRINGID_TIEDOPPONENTBYREFEREE 372 -#define STRINGID_QUESTIONFORFEITMATCH 373 -#define STRINGID_FORFEITEDMATCH 374 -#define STRINGID_PKMNTRANSFERREDSOMEONESPC 375 -#define STRINGID_PKMNTRANSFERREDLANETTESPC 376 -#define STRINGID_PKMNBOXSOMEONESPCFULL 377 -#define STRINGID_PKMNBOXLANETTESPCFULL 378 -#define STRINGID_TRAINER1WINTEXT 379 -#define STRINGID_TRAINER2WINTEXT 380 +#define STRINGID_TRAINER1LOSETEXT 12 +#define STRINGID_PKMNGAINEDEXP 13 +#define STRINGID_PKMNGREWTOLV 14 +#define STRINGID_PKMNLEARNEDMOVE 15 +#define STRINGID_TRYTOLEARNMOVE1 16 +#define STRINGID_TRYTOLEARNMOVE2 17 +#define STRINGID_TRYTOLEARNMOVE3 18 +#define STRINGID_PKMNFORGOTMOVE 19 +#define STRINGID_STOPLEARNINGMOVE 20 +#define STRINGID_DIDNOTLEARNMOVE 21 +#define STRINGID_PKMNLEARNEDMOVE2 22 +#define STRINGID_ATTACKMISSED 23 +#define STRINGID_PKMNPROTECTEDITSELF 24 +#define STRINGID_STATSWONTINCREASE2 25 +#define STRINGID_AVOIDEDDAMAGE 26 +#define STRINGID_ITDOESNTAFFECT 27 +#define STRINGID_ATTACKERFAINTED 28 +#define STRINGID_TARGETFAINTED 29 +#define STRINGID_PLAYERGOTMONEY 30 +#define STRINGID_PLAYERWHITEOUT 31 +#define STRINGID_PLAYERWHITEOUT2 32 +#define STRINGID_PREVENTSESCAPE 33 +#define STRINGID_HITXTIMES 34 +#define STRINGID_PKMNFELLASLEEP 35 +#define STRINGID_PKMNMADESLEEP 36 +#define STRINGID_PKMNALREADYASLEEP 37 +#define STRINGID_PKMNALREADYASLEEP2 38 +#define STRINGID_PKMNWASNTAFFECTED 39 +#define STRINGID_PKMNWASPOISONED 40 +#define STRINGID_PKMNPOISONEDBY 41 +#define STRINGID_PKMNHURTBYPOISON 42 +#define STRINGID_PKMNALREADYPOISONED 43 +#define STRINGID_PKMNBADLYPOISONED 44 +#define STRINGID_PKMNENERGYDRAINED 45 +#define STRINGID_PKMNWASBURNED 46 +#define STRINGID_PKMNBURNEDBY 47 +#define STRINGID_PKMNHURTBYBURN 48 +#define STRINGID_PKMNWASFROZEN 49 +#define STRINGID_PKMNFROZENBY 50 +#define STRINGID_PKMNISFROZEN 51 +#define STRINGID_PKMNWASDEFROSTED 52 +#define STRINGID_PKMNWASDEFROSTED2 53 +#define STRINGID_PKMNWASDEFROSTEDBY 54 +#define STRINGID_PKMNWASPARALYZED 55 +#define STRINGID_PKMNWASPARALYZEDBY 56 +#define STRINGID_PKMNISPARALYZED 57 +#define STRINGID_PKMNISALREADYPARALYZED 58 +#define STRINGID_PKMNHEALEDPARALYSIS 59 +#define STRINGID_PKMNDREAMEATEN 60 +#define STRINGID_STATSWONTINCREASE 61 +#define STRINGID_STATSWONTDECREASE 62 +#define STRINGID_TEAMSTOPPEDWORKING 63 +#define STRINGID_FOESTOPPEDWORKING 64 +#define STRINGID_PKMNISCONFUSED 65 +#define STRINGID_PKMNHEALEDCONFUSION 66 +#define STRINGID_PKMNWASCONFUSED 67 +#define STRINGID_PKMNALREADYCONFUSED 68 +#define STRINGID_PKMNFELLINLOVE 69 +#define STRINGID_PKMNINLOVE 70 +#define STRINGID_PKMNIMMOBILIZEDBYLOVE 71 +#define STRINGID_PKMNBLOWNAWAY 72 +#define STRINGID_PKMNCHANGEDTYPE 73 +#define STRINGID_PKMNFLINCHED 74 +#define STRINGID_PKMNREGAINEDHEALTH 75 +#define STRINGID_PKMNHPFULL 76 +#define STRINGID_PKMNRAISEDSPDEF 77 +#define STRINGID_PKMNRAISEDDEF 78 +#define STRINGID_PKMNCOVEREDBYVEIL 79 +#define STRINGID_PKMNUSEDSAFEGUARD 80 +#define STRINGID_PKMNSAFEGUARDEXPIRED 81 +#define STRINGID_PKMNWENTTOSLEEP 82 +#define STRINGID_PKMNSLEPTHEALTHY 83 +#define STRINGID_PKMNWHIPPEDWHIRLWIND 84 +#define STRINGID_PKMNTOOKSUNLIGHT 85 +#define STRINGID_PKMNLOWEREDHEAD 86 +#define STRINGID_PKMNISGLOWING 87 +#define STRINGID_PKMNFLEWHIGH 88 +#define STRINGID_PKMNDUGHOLE 89 +#define STRINGID_PKMNSQUEEZEDBYBIND 90 +#define STRINGID_PKMNTRAPPEDINVORTEX 91 +#define STRINGID_PKMNWRAPPEDBY 92 +#define STRINGID_PKMNCLAMPED 93 +#define STRINGID_PKMNHURTBY 94 +#define STRINGID_PKMNFREEDFROM 95 +#define STRINGID_PKMNCRASHED 96 +#define STRINGID_PKMNSHROUDEDINMIST 97 +#define STRINGID_PKMNPROTECTEDBYMIST 98 +#define STRINGID_PKMNGETTINGPUMPED 99 +#define STRINGID_PKMNHITWITHRECOIL 100 +#define STRINGID_PKMNPROTECTEDITSELF2 101 +#define STRINGID_PKMNBUFFETEDBYSANDSTORM 102 +#define STRINGID_PKMNPELTEDBYHAIL 103 +#define STRINGID_PKMNSEEDED 104 +#define STRINGID_PKMNEVADEDATTACK 105 +#define STRINGID_PKMNSAPPEDBYLEECHSEED 106 +#define STRINGID_PKMNFASTASLEEP 107 +#define STRINGID_PKMNWOKEUP 108 +#define STRINGID_PKMNUPROARKEPTAWAKE 109 +#define STRINGID_PKMNWOKEUPINUPROAR 110 +#define STRINGID_PKMNCAUSEDUPROAR 111 +#define STRINGID_PKMNMAKINGUPROAR 112 +#define STRINGID_PKMNCALMEDDOWN 113 +#define STRINGID_PKMNCANTSLEEPINUPROAR 114 +#define STRINGID_PKMNSTOCKPILED 115 +#define STRINGID_PKMNCANTSTOCKPILE 116 +#define STRINGID_PKMNCANTSLEEPINUPROAR2 117 +#define STRINGID_UPROARKEPTPKMNAWAKE 118 +#define STRINGID_PKMNSTAYEDAWAKEUSING 119 +#define STRINGID_PKMNSTORINGENERGY 120 +#define STRINGID_PKMNUNLEASHEDENERGY 121 +#define STRINGID_PKMNFATIGUECONFUSION 122 +#define STRINGID_PKMNPICKEDUPITEM 123 +#define STRINGID_PKMNUNAFFECTED 124 +#define STRINGID_PKMNTRANSFORMEDINTO 125 +#define STRINGID_PKMNMADESUBSTITUTE 126 +#define STRINGID_PKMNHASSUBSTITUTE 127 +#define STRINGID_SUBSTITUTEDAMAGED 128 +#define STRINGID_PKMNSUBSTITUTEFADED 129 +#define STRINGID_PKMNMUSTRECHARGE 130 +#define STRINGID_PKMNRAGEBUILDING 131 +#define STRINGID_PKMNMOVEWASDISABLED 132 +#define STRINGID_PKMNMOVEISDISABLED 133 +#define STRINGID_PKMNMOVEDISABLEDNOMORE 134 +#define STRINGID_PKMNGOTENCORE 135 +#define STRINGID_PKMNENCOREENDED 136 +#define STRINGID_PKMNTOOKAIM 137 +#define STRINGID_PKMNSKETCHEDMOVE 138 +#define STRINGID_PKMNTRYINGTOTAKEFOE 139 +#define STRINGID_PKMNTOOKFOE 140 +#define STRINGID_PKMNREDUCEDPP 141 +#define STRINGID_PKMNSTOLEITEM 142 +#define STRINGID_TARGETCANTESCAPENOW 143 +#define STRINGID_PKMNFELLINTONIGHTMARE 144 +#define STRINGID_PKMNLOCKEDINNIGHTMARE 145 +#define STRINGID_PKMNLAIDCURSE 146 +#define STRINGID_PKMNAFFLICTEDBYCURSE 147 +#define STRINGID_SPIKESSCATTERED 148 +#define STRINGID_PKMNHURTBYSPIKES 149 +#define STRINGID_PKMNIDENTIFIED 150 +#define STRINGID_PKMNPERISHCOUNTFELL 151 +#define STRINGID_PKMNBRACEDITSELF 152 +#define STRINGID_PKMNENDUREDHIT 153 +#define STRINGID_MAGNITUDESTRENGTH 154 +#define STRINGID_PKMNCUTHPMAXEDATTACK 155 +#define STRINGID_PKMNCOPIEDSTATCHANGES 156 +#define STRINGID_PKMNGOTFREE 157 +#define STRINGID_PKMNSHEDLEECHSEED 158 +#define STRINGID_PKMNBLEWAWAYSPIKES 159 +#define STRINGID_PKMNFLEDFROMBATTLE 160 +#define STRINGID_PKMNFORESAWATTACK 161 +#define STRINGID_PKMNTOOKATTACK 162 +#define STRINGID_PKMNATTACK 163 +#define STRINGID_PKMNCENTERATTENTION 164 +#define STRINGID_PKMNCHARGINGPOWER 165 +#define STRINGID_NATUREPOWERTURNEDINTO 166 +#define STRINGID_PKMNSTATUSNORMAL 167 +#define STRINGID_PKMNHASNOMOVESLEFT 168 +#define STRINGID_PKMNSUBJECTEDTOTORMENT 169 +#define STRINGID_PKMNCANTUSEMOVETORMENT 170 +#define STRINGID_PKMNTIGHTENINGFOCUS 171 +#define STRINGID_PKMNFELLFORTAUNT 172 +#define STRINGID_PKMNCANTUSEMOVETAUNT 173 +#define STRINGID_PKMNREADYTOHELP 174 +#define STRINGID_PKMNSWITCHEDITEMS 175 +#define STRINGID_PKMNCOPIEDFOE 176 +#define STRINGID_PKMNMADEWISH 177 +#define STRINGID_PKMNWISHCAMETRUE 178 +#define STRINGID_PKMNPLANTEDROOTS 179 +#define STRINGID_PKMNABSORBEDNUTRIENTS 180 +#define STRINGID_PKMNANCHOREDITSELF 181 +#define STRINGID_PKMNWASMADEDROWSY 182 +#define STRINGID_PKMNKNOCKEDOFF 183 +#define STRINGID_PKMNSWAPPEDABILITIES 184 +#define STRINGID_PKMNSEALEDOPPONENTMOVE 185 +#define STRINGID_PKMNCANTUSEMOVESEALED 186 +#define STRINGID_PKMNWANTSGRUDGE 187 +#define STRINGID_PKMNLOSTPPGRUDGE 188 +#define STRINGID_PKMNSHROUDEDITSELF 189 +#define STRINGID_PKMNMOVEBOUNCED 190 +#define STRINGID_PKMNWAITSFORTARGET 191 +#define STRINGID_PKMNSNATCHEDMOVE 192 +#define STRINGID_PKMNMADEITRAIN 193 +#define STRINGID_PKMNRAISEDSPEED 194 +#define STRINGID_PKMNPROTECTEDBY 195 +#define STRINGID_PKMNPREVENTSUSAGE 196 +#define STRINGID_PKMNRESTOREDHPUSING 197 +#define STRINGID_PKMNCHANGEDTYPEWITH 198 +#define STRINGID_PKMNPREVENTSPARALYSISWITH 199 +#define STRINGID_PKMNPREVENTSROMANCEWITH 200 +#define STRINGID_PKMNPREVENTSPOISONINGWITH 201 +#define STRINGID_PKMNPREVENTSCONFUSIONWITH 202 +#define STRINGID_PKMNRAISEDFIREPOWERWITH 203 +#define STRINGID_PKMNANCHORSITSELFWITH 204 +#define STRINGID_PKMNCUTSATTACKWITH 205 +#define STRINGID_PKMNPREVENTSSTATLOSSWITH 206 +#define STRINGID_PKMNHURTSWITH 207 +#define STRINGID_PKMNTRACED 208 +#define STRINGID_STATSHARPLY 209 +#define STRINGID_STATROSE 210 +#define STRINGID_STATHARSHLY 211 +#define STRINGID_STATFELL 212 +#define STRINGID_PKMNSSTATCHANGED 213 +#define STRINGID_PKMNSSTATCHANGED2 214 +#define STRINGID_PKMNSSTATCHANGED3 215 +#define STRINGID_PKMNSSTATCHANGED4 216 +#define STRINGID_CRITICALHIT 217 +#define STRINGID_ONEHITKO 218 +#define STRINGID_123POOF 219 +#define STRINGID_ANDELLIPSIS 220 +#define STRINGID_NOTVERYEFFECTIVE 221 +#define STRINGID_SUPEREFFECTIVE 222 +#define STRINGID_GOTAWAYSAFELY 223 +#define STRINGID_WILDPKMNFLED 224 +#define STRINGID_NORUNNINGFROMTRAINERS 225 +#define STRINGID_CANTESCAPE 226 +#define STRINGID_DONTLEAVEBIRCH 227 +#define STRINGID_BUTNOTHINGHAPPENED 228 +#define STRINGID_BUTITFAILED 229 +#define STRINGID_ITHURTCONFUSION 230 +#define STRINGID_MIRRORMOVEFAILED 231 +#define STRINGID_STARTEDTORAIN 232 +#define STRINGID_DOWNPOURSTARTED 233 +#define STRINGID_RAINCONTINUES 234 +#define STRINGID_DOWNPOURCONTINUES 235 +#define STRINGID_RAINSTOPPED 236 +#define STRINGID_SANDSTORMBREWED 237 +#define STRINGID_SANDSTORMRAGES 238 +#define STRINGID_SANDSTORMSUBSIDED 239 +#define STRINGID_SUNLIGHTGOTBRIGHT 240 +#define STRINGID_SUNLIGHTSTRONG 241 +#define STRINGID_SUNLIGHTFADED 242 +#define STRINGID_STARTEDHAIL 243 +#define STRINGID_HAILCONTINUES 244 +#define STRINGID_HAILSTOPPED 245 +#define STRINGID_FAILEDTOSPITUP 246 +#define STRINGID_FAILEDTOSWALLOW 247 +#define STRINGID_WINDBECAMEHEATWAVE 248 +#define STRINGID_STATCHANGESGONE 249 +#define STRINGID_COINSSCATTERED 250 +#define STRINGID_TOOWEAKFORSUBSTITUTE 251 +#define STRINGID_SHAREDPAIN 252 +#define STRINGID_BELLCHIMED 253 +#define STRINGID_FAINTINTHREE 254 +#define STRINGID_NOPPLEFT 255 +#define STRINGID_BUTNOPPLEFT 256 +#define STRINGID_PLAYERUSEDITEM 257 +#define STRINGID_WALLYUSEDITEM 258 +#define STRINGID_TRAINERBLOCKEDBALL 259 +#define STRINGID_DONTBEATHIEF 260 +#define STRINGID_ITDODGEDBALL 261 +#define STRINGID_YOUMISSEDPKMN 262 +#define STRINGID_PKMNBROKEFREE 263 +#define STRINGID_ITAPPEAREDCAUGHT 264 +#define STRINGID_AARGHALMOSTHADIT 265 +#define STRINGID_SHOOTSOCLOSE 266 +#define STRINGID_GOTCHAPKMNCAUGHT 267 +#define STRINGID_GOTCHAPKMNCAUGHT2 268 +#define STRINGID_GIVENICKNAMECAPTURED 269 +#define STRINGID_PKMNSENTTOPC 270 +#define STRINGID_PKMNDATAADDEDTODEX 271 +#define STRINGID_ITISRAINING 272 +#define STRINGID_SANDSTORMISRAGING 273 +#define STRINGID_CANTESCAPE2 274 +#define STRINGID_PKMNIGNORESASLEEP 275 +#define STRINGID_PKMNIGNOREDORDERS 276 +#define STRINGID_PKMNBEGANTONAP 277 +#define STRINGID_PKMNLOAFING 278 +#define STRINGID_PKMNWONTOBEY 279 +#define STRINGID_PKMNTURNEDAWAY 280 +#define STRINGID_PKMNPRETENDNOTNOTICE 281 +#define STRINGID_ENEMYABOUTTOSWITCHPKMN 282 +#define STRINGID_CREPTCLOSER 283 +#define STRINGID_CANTGETCLOSER 284 +#define STRINGID_PKMNWATCHINGCAREFULLY 285 +#define STRINGID_PKMNCURIOUSABOUTX 286 +#define STRINGID_PKMNENTHRALLEDBYX 287 +#define STRINGID_PKMNIGNOREDX 288 +#define STRINGID_THREWPOKEBLOCKATPKMN 289 +#define STRINGID_OUTOFSAFARIBALLS 290 +#define STRINGID_PKMNSITEMCUREDPARALYSIS 291 +#define STRINGID_PKMNSITEMCUREDPOISON 292 +#define STRINGID_PKMNSITEMHEALEDBURN 293 +#define STRINGID_PKMNSITEMDEFROSTEDIT 294 +#define STRINGID_PKMNSITEMWOKEIT 295 +#define STRINGID_PKMNSITEMSNAPPEDOUT 296 +#define STRINGID_PKMNSITEMCUREDPROBLEM 297 +#define STRINGID_PKMNSITEMRESTOREDHEALTH 298 +#define STRINGID_PKMNSITEMRESTOREDPP 299 +#define STRINGID_PKMNSITEMRESTOREDSTATUS 300 +#define STRINGID_PKMNSITEMRESTOREDHPALITTLE 301 +#define STRINGID_ITEMALLOWSONLYYMOVE 302 +#define STRINGID_PKMNHUNGONWITHX 303 +#define STRINGID_EMPTYSTRING3 304 +#define STRINGID_PKMNSXPREVENTSBURNS 305 +#define STRINGID_PKMNSXBLOCKSY 306 +#define STRINGID_PKMNSXRESTOREDHPALITTLE2 307 +#define STRINGID_PKMNSXWHIPPEDUPSANDSTORM 308 +#define STRINGID_PKMNSXPREVENTSYLOSS 309 +#define STRINGID_PKMNSXINFATUATEDY 310 +#define STRINGID_PKMNSXMADEYINEFFECTIVE 311 +#define STRINGID_PKMNSXCUREDYPROBLEM 312 +#define STRINGID_ITSUCKEDLIQUIDOOZE 313 +#define STRINGID_PKMNTRANSFORMED 314 +#define STRINGID_ELECTRICITYWEAKENED 315 +#define STRINGID_FIREWEAKENED 316 +#define STRINGID_PKMNHIDUNDERWATER 317 +#define STRINGID_PKMNSPRANGUP 318 +#define STRINGID_HMMOVESCANTBEFORGOTTEN 319 +#define STRINGID_XFOUNDONEY 320 +#define STRINGID_PLAYERDEFEATEDTRAINER1 321 +#define STRINGID_SOOTHINGAROMA 322 +#define STRINGID_ITEMSCANTBEUSEDNOW 323 +#define STRINGID_FORXCOMMAYZ 324 +#define STRINGID_USINGXTHEYOFZN 325 +#define STRINGID_PKMNUSEDXTOGETPUMPED 326 +#define STRINGID_PKMNSXMADEYUSELESS 327 +#define STRINGID_PKMNTRAPPEDBYSANDTOMB 328 +#define STRINGID_EMPTYSTRING4 329 +#define STRINGID_ABOOSTED 330 +#define STRINGID_PKMNSXINTENSIFIEDSUN 331 +#define STRINGID_PKMNMAKESGROUNDMISS 332 +#define STRINGID_YOUTHROWABALLNOWRIGHT 333 +#define STRINGID_PKMNSXTOOKATTACK 334 +#define STRINGID_PKMNCHOSEXASDESTINY 335 +#define STRINGID_PKMNLOSTFOCUS 336 +#define STRINGID_USENEXTPKMN 337 +#define STRINGID_PKMNFLEDUSINGITS 338 +#define STRINGID_PKMNFLEDUSING 339 +#define STRINGID_PKMNWASDRAGGEDOUT 340 +#define STRINGID_PREVENTEDFROMWORKING 341 +#define STRINGID_PKMNSITEMNORMALIZEDSTATUS 342 +#define STRINGID_TRAINER1USEDITEM 343 +#define STRINGID_BOXISFULL 344 +#define STRINGID_PKMNAVOIDEDATTACK 345 +#define STRINGID_PKMNSXMADEITINEFFECTIVE 346 +#define STRINGID_PKMNSXPREVENTSFLINCHING 347 +#define STRINGID_PKMNALREADYHASBURN 348 +#define STRINGID_STATSWONTDECREASE2 349 +#define STRINGID_PKMNSXBLOCKSY2 350 +#define STRINGID_PKMNSXWOREOFF 351 +#define STRINGID_PKMNRAISEDDEFALITTLE 352 +#define STRINGID_PKMNRAISEDSPDEFALITTLE 353 +#define STRINGID_THEWALLSHATTERED 354 +#define STRINGID_PKMNSXPREVENTSYSZ 355 +#define STRINGID_PKMNSXCUREDITSYPROBLEM 356 +#define STRINGID_ATTACKERCANTESCAPE 357 +#define STRINGID_PKMNOBTAINEDX 358 +#define STRINGID_PKMNOBTAINEDX2 359 +#define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360 +#define STRINGID_BUTNOEFFECT 361 +#define STRINGID_PKMNSXHADNOEFFECTONY 362 +#define STRINGID_TWOENEMIESDEFEATED 363 +#define STRINGID_TRAINER2LOSETEXT 364 +#define STRINGID_PKMNINCAPABLEOFPOWER 365 +#define STRINGID_GLINTAPPEARSINEYE 366 +#define STRINGID_PKMNGETTINGINTOPOSITION 367 +#define STRINGID_PKMNBEGANGROWLINGDEEPLY 368 +#define STRINGID_PKMNEAGERFORMORE 369 +#define STRINGID_DEFEATEDOPPONENTBYREFEREE 370 +#define STRINGID_LOSTTOOPPONENTBYREFEREE 371 +#define STRINGID_TIEDOPPONENTBYREFEREE 372 +#define STRINGID_QUESTIONFORFEITMATCH 373 +#define STRINGID_FORFEITEDMATCH 374 +#define STRINGID_PKMNTRANSFERREDSOMEONESPC 375 +#define STRINGID_PKMNTRANSFERREDLANETTESPC 376 +#define STRINGID_PKMNBOXSOMEONESPCFULL 377 +#define STRINGID_PKMNBOXLANETTESPCFULL 378 +#define STRINGID_TRAINER1WINTEXT 379 +#define STRINGID_TRAINER2WINTEXT 380 #endif // GUARD_CONSTANTS_BATTLE_STRING_IDS_H diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h index c5eb456c3..1be3852e3 100644 --- a/include/gba/isagbprint.h +++ b/include/gba/isagbprint.h @@ -5,7 +5,7 @@ #define AGBPrintInit() #define AGBPutc(cChr) #define AGBPrint(pBuf) -#define AGBPrintf(pBuf, ...) +#define AGBPrintf(pBuf, ...) #define AGBPrintFlush1Block() #define AGBPrintFlush() #define AGBAssert(pFile, nLine, pExpression, nStopProgram) @@ -21,30 +21,30 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP #undef AGB_ASSERT #ifdef NDEBUG -#define AGB_ASSERT(exp) +#define AGB_ASSERT(exp) #else -#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); +#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); #endif #undef AGB_WARNING #ifdef NDEBUG -#define AGB_WARNING(exp) +#define AGB_WARNING(exp) #else -#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); +#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); #endif // for matching purposes #ifdef NDEBUG -#define AGB_ASSERT_EX(exp, file, line) +#define AGB_ASSERT_EX(exp, file, line) #else -#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); +#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); #endif #ifdef NDEBUG -#define AGB_WARNING_EX(exp, file, line) +#define AGB_WARNING_EX(exp, file, line) #else -#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); +#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); #endif #endif // GUARD_GBA_ISAGBPRINT_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 1f14880f0..5ed9b250a 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -294,10 +294,10 @@ struct PlayerAvatar /*0x09*/ u8 newDirBackup; // during bike movement, the new direction as opposed to player's direction is backed up here. /*0x0A*/ u8 bikeFrameCounter; // on the mach bike, when this value is 1, the bike is moving but not accelerating yet for 1 tile. on the acro bike, this acts as a timer for acro bike. /*0x0B*/ u8 bikeSpeed; - // acro bike only + // acro bike only /*0x0C*/ u32 directionHistory; // up/down/left/right history is stored in each nybble, but using the field directions and not the io inputs. /*0x10*/ u32 abStartSelectHistory; // same as above but for A + B + start + select only - // these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update. + // these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update. /*0x14*/ u8 dirTimerHistory[8]; /*0x1C*/ u8 abStartSelectTimerHistory[8]; }; diff --git a/include/graphics.h b/include/graphics.h index f51d7fa47..b51926b8d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3360,7 +3360,7 @@ extern const u32 gRaySceneHushBg_Gfx[]; extern const u32 gRaySceneHushRing_Gfx[]; // Pokeballs -extern const u32 gItemIcon_MasterBall[]; +extern const u32 gItemIcon_MasterBall[]; extern const u32 gItemIconPalette_MasterBall[]; extern const u32 gItemIcon_UltraBall[]; extern const u32 gItemIconPalette_UltraBall[]; diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index a8eee9c18..5dc37c70d 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -17,10 +17,10 @@ enum PokemonSummaryScreenMode enum PokemonSummaryScreenPage { - PSS_PAGE_INFO, - PSS_PAGE_SKILLS, - PSS_PAGE_BATTLE_MOVES, - PSS_PAGE_CONTEST_MOVES, + PSS_PAGE_INFO, + PSS_PAGE_SKILLS, + PSS_PAGE_BATTLE_MOVES, + PSS_PAGE_CONTEST_MOVES, }; #endif // GUARD_POKEMON_SUMMARY_SCREEN_H diff --git a/include/save.h b/include/save.h index b151f1064..42ce8b3f3 100644 --- a/include/save.h +++ b/include/save.h @@ -25,8 +25,8 @@ struct UnkSaveSection struct SaveSectionOffsets { - u16 toAdd; - u16 size; + u16 toAdd; + u16 size; }; // Emerald changes this definition to be the sectors per slot. @@ -48,7 +48,7 @@ enum SAVE_NORMAL, SAVE_LINK, //EREADER_SAVE, // deprecated in Emerald - SAVE_LINK2, // unknown 2nd link save + SAVE_LINK2, // unknown 2nd link save SAVE_HALL_OF_FAME, SAVE_OVERWRITE_DIFFERENT_FILE, SAVE_HALL_OF_FAME_ERASE_BEFORE // unused diff --git a/include/shop.h b/include/shop.h index 7f2d877dc..1e4ffdb5c 100644 --- a/include/shop.h +++ b/include/shop.h @@ -17,7 +17,7 @@ enum X_COORD, Y_COORD, ANIM_NUM, - LAYER_TYPE + LAYER_TYPE }; struct MartInfo @@ -32,16 +32,16 @@ struct MartInfo struct ShopData { - /*0x0000*/ u16 tilemapBuffers[4][0x400]; - /*0x2000*/ u32 totalCost; - /*0x2004*/ u16 itemsShowed; - /*0x2006*/ u16 selectedRow; - /*0x2008*/ u16 scrollOffset; - /*0x200A*/ u8 maxQuantity; - /*0x200B*/ u8 scrollIndicatorsTaskId; - /*0x200C*/ u8 iconSlot; - /*0x200D*/ u8 itemSpriteIds[2]; - /*0x2010*/ s16 viewportObjects[16][5]; + /*0x0000*/ u16 tilemapBuffers[4][0x400]; + /*0x2000*/ u32 totalCost; + /*0x2004*/ u16 itemsShowed; + /*0x2006*/ u16 selectedRow; + /*0x2008*/ u16 scrollOffset; + /*0x200A*/ u8 maxQuantity; + /*0x200B*/ u8 scrollIndicatorsTaskId; + /*0x200C*/ u8 iconSlot; + /*0x200D*/ u8 itemSpriteIds[2]; + /*0x2010*/ s16 viewportObjects[16][5]; }; void CreatePokemartMenu(const u16 *); -- cgit v1.2.3 From 2615ece23bd9463f3e43fca40eac1adcabeb2813 Mon Sep 17 00:00:00 2001 From: Melody Date: Fri, 7 Dec 2018 10:41:08 -0500 Subject: Use normal apostrophes like adults --- charmap.txt | 2 +- data/event_scripts.s | 1586 ++++++++++---------- data/maps/AbandonedShip_CaptainsOffice/scripts.inc | 6 +- data/maps/AbandonedShip_Corridors_1F/scripts.inc | 6 +- data/maps/AbandonedShip_Corridors_B1F/scripts.inc | 6 +- .../AbandonedShip_HiddenFloorRooms/scripts.inc | 4 +- data/maps/AbandonedShip_Rooms2_1F/scripts.inc | 40 +- data/maps/AbandonedShip_Rooms2_B1F/scripts.inc | 4 +- data/maps/AbandonedShip_Rooms_1F/scripts.inc | 18 +- data/maps/AbandonedShip_Rooms_B1F/scripts.inc | 4 +- data/maps/AquaHideout_1F/scripts.inc | 20 +- data/maps/AquaHideout_B1F/scripts.inc | 14 +- data/maps/AquaHideout_B2F/scripts.inc | 24 +- .../scripts.inc | 24 +- .../BattleFrontier_BattleArenaLobby/scripts.inc | 14 +- .../scripts.inc | 32 +- .../BattleFrontier_BattleDomeLobby/scripts.inc | 32 +- .../scripts.inc | 6 +- .../scripts.inc | 32 +- .../BattleFrontier_BattleFactoryLobby/scripts.inc | 34 +- .../scripts.inc | 10 +- .../scripts.inc | 10 +- .../scripts.inc | 6 +- .../BattleFrontier_BattlePalaceLobby/scripts.inc | 22 +- .../BattleFrontier_BattlePikeLobby/scripts.inc | 18 +- .../scripts.inc | 28 +- .../scripts.inc | 2 +- .../scripts.inc | 82 +- .../scripts.inc | 108 +- .../BattleFrontier_BattlePyramidLobby/scripts.inc | 32 +- .../BattleFrontier_BattlePyramidTop/scripts.inc | 22 +- .../scripts.inc | 16 +- .../BattleFrontier_BattleTowerLobby/scripts.inc | 72 +- .../scripts.inc | 570 +++---- data/maps/BattleFrontier_Lounge1/scripts.inc | 28 +- data/maps/BattleFrontier_Lounge2/scripts.inc | 92 +- data/maps/BattleFrontier_Lounge3/scripts.inc | 180 +-- data/maps/BattleFrontier_Lounge4/scripts.inc | 4 +- data/maps/BattleFrontier_Lounge5/scripts.inc | 4 +- data/maps/BattleFrontier_Lounge6/scripts.inc | 18 +- data/maps/BattleFrontier_Lounge7/scripts.inc | 48 +- data/maps/BattleFrontier_Lounge8/scripts.inc | 12 +- data/maps/BattleFrontier_Mart/scripts.inc | 12 +- data/maps/BattleFrontier_OutsideEast/scripts.inc | 64 +- data/maps/BattleFrontier_OutsideWest/scripts.inc | 68 +- .../BattleFrontier_PokemonCenter_1F/scripts.inc | 8 +- data/maps/BattleFrontier_RankingHall/scripts.inc | 10 +- data/maps/BattleFrontier_ReceptionGate/scripts.inc | 22 +- data/maps/BattleFrontier_ScottsHouse/scripts.inc | 48 +- data/maps/CaveOfOrigin_B1F/scripts.inc | 26 +- data/maps/DewfordTown/scripts.inc | 64 +- data/maps/DewfordTown_Gym/scripts.inc | 68 +- data/maps/DewfordTown_Hall/scripts.inc | 62 +- data/maps/DewfordTown_House1/scripts.inc | 4 +- data/maps/DewfordTown_House2/scripts.inc | 10 +- data/maps/DewfordTown_PokemonCenter_1F/scripts.inc | 6 +- data/maps/EverGrandeCity_ChampionsRoom/scripts.inc | 24 +- data/maps/EverGrandeCity_DrakesRoom/scripts.inc | 2 +- data/maps/EverGrandeCity_GlaciasRoom/scripts.inc | 4 +- data/maps/EverGrandeCity_HallOfFame/scripts.inc | 2 +- data/maps/EverGrandeCity_PhoebesRoom/scripts.inc | 10 +- .../EverGrandeCity_PokemonCenter_1F/scripts.inc | 10 +- .../EverGrandeCity_PokemonLeague_1F/scripts.inc | 4 +- data/maps/EverGrandeCity_SidneysRoom/scripts.inc | 14 +- data/maps/FallarborTown/scripts.inc | 18 +- .../FallarborTown_BattleTentCorridor/scripts.inc | 8 +- .../maps/FallarborTown_BattleTentLobby/scripts.inc | 16 +- data/maps/FallarborTown_House1/scripts.inc | 14 +- data/maps/FallarborTown_House2/scripts.inc | 14 +- data/maps/FallarborTown_Mart/scripts.inc | 6 +- .../FallarborTown_PokemonCenter_1F/scripts.inc | 10 +- data/maps/FortreeCity/scripts.inc | 12 +- data/maps/FortreeCity_DecorationShop/scripts.inc | 6 +- data/maps/FortreeCity_Gym/scripts.inc | 46 +- data/maps/FortreeCity_House1/scripts.inc | 14 +- data/maps/FortreeCity_House3/scripts.inc | 8 +- data/maps/FortreeCity_House4/scripts.inc | 4 +- data/maps/FortreeCity_House5/scripts.inc | 4 +- data/maps/FortreeCity_Mart/scripts.inc | 4 +- data/maps/FortreeCity_PokemonCenter_1F/scripts.inc | 16 +- data/maps/GraniteCave_1F/scripts.inc | 6 +- data/maps/GraniteCave_StevensRoom/scripts.inc | 14 +- data/maps/InsideOfTruck/scripts.inc | 2 +- data/maps/JaggedPass/scripts.inc | 32 +- data/maps/LavaridgeTown/scripts.inc | 34 +- data/maps/LavaridgeTown_Gym_1F/scripts.inc | 68 +- data/maps/LavaridgeTown_HerbShop/scripts.inc | 6 +- data/maps/LavaridgeTown_House/scripts.inc | 2 +- data/maps/LavaridgeTown_Mart/scripts.inc | 4 +- .../LavaridgeTown_PokemonCenter_1F/scripts.inc | 4 +- data/maps/LilycoveCity/scripts.inc | 116 +- data/maps/LilycoveCity_ContestHall/scripts.inc | 62 +- data/maps/LilycoveCity_ContestLobby/scripts.inc | 22 +- .../maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc | 14 +- .../maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc | 36 +- .../scripts.inc | 10 +- .../LilycoveCity_DepartmentStore_1F/scripts.inc | 14 +- .../LilycoveCity_DepartmentStore_2F/scripts.inc | 4 +- .../LilycoveCity_DepartmentStore_3F/scripts.inc | 2 +- .../LilycoveCity_DepartmentStore_4F/scripts.inc | 4 +- .../LilycoveCity_DepartmentStore_5F/scripts.inc | 6 +- data/maps/LilycoveCity_Harbor/scripts.inc | 16 +- data/maps/LilycoveCity_House1/scripts.inc | 2 +- data/maps/LilycoveCity_House2/scripts.inc | 4 +- data/maps/LilycoveCity_House3/scripts.inc | 28 +- data/maps/LilycoveCity_House4/scripts.inc | 8 +- .../LilycoveCity_LilycoveMuseum_1F/scripts.inc | 38 +- .../LilycoveCity_LilycoveMuseum_2F/scripts.inc | 32 +- .../LilycoveCity_MoveDeletersHouse/scripts.inc | 8 +- .../maps/LilycoveCity_PokemonCenter_1F/scripts.inc | 6 +- .../LilycoveCity_PokemonTrainerFanClub/scripts.inc | 124 +- data/maps/LittlerootTown/scripts.inc | 34 +- .../LittlerootTown_BrendansHouse_1F/scripts.inc | 34 +- .../LittlerootTown_BrendansHouse_2F/scripts.inc | 6 +- data/maps/LittlerootTown_MaysHouse_1F/scripts.inc | 36 +- data/maps/LittlerootTown_MaysHouse_2F/scripts.inc | 40 +- .../LittlerootTown_ProfessorBirchsLab/scripts.inc | 140 +- data/maps/MagmaHideout_1F/scripts.inc | 20 +- data/maps/MagmaHideout_2F_1R/scripts.inc | 10 +- data/maps/MagmaHideout_2F_2R/scripts.inc | 20 +- data/maps/MagmaHideout_3F_1R/scripts.inc | 14 +- data/maps/MagmaHideout_3F_2R/scripts.inc | 6 +- data/maps/MagmaHideout_4F/scripts.inc | 34 +- data/maps/MauvilleCity/scripts.inc | 84 +- data/maps/MauvilleCity_BikeShop/scripts.inc | 30 +- data/maps/MauvilleCity_GameCorner/scripts.inc | 40 +- data/maps/MauvilleCity_Gym/scripts.inc | 52 +- data/maps/MauvilleCity_House2/scripts.inc | 10 +- data/maps/MauvilleCity_Mart/scripts.inc | 2 +- .../maps/MauvilleCity_PokemonCenter_1F/scripts.inc | 12 +- .../maps/MauvilleCity_PokemonCenter_2F/scripts.inc | 2 +- data/maps/MeteorFalls_1F_1R/scripts.inc | 30 +- data/maps/MeteorFalls_1F_2R/scripts.inc | 48 +- data/maps/MeteorFalls_StevensCave/scripts.inc | 10 +- data/maps/MossdeepCity/scripts.inc | 42 +- data/maps/MossdeepCity_GameCorner_1F/scripts.inc | 8 +- data/maps/MossdeepCity_Gym/scripts.inc | 78 +- data/maps/MossdeepCity_House1/scripts.inc | 6 +- data/maps/MossdeepCity_House2/scripts.inc | 6 +- data/maps/MossdeepCity_House3/scripts.inc | 6 +- data/maps/MossdeepCity_House4/scripts.inc | 6 +- data/maps/MossdeepCity_Mart/scripts.inc | 2 +- data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc | 48 +- data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | 52 +- data/maps/MossdeepCity_StevensHouse/scripts.inc | 26 +- data/maps/MtChimney/scripts.inc | 118 +- data/maps/MtPyre_1F/scripts.inc | 2 +- data/maps/MtPyre_2F/scripts.inc | 46 +- data/maps/MtPyre_3F/scripts.inc | 8 +- data/maps/MtPyre_5F/scripts.inc | 8 +- data/maps/MtPyre_6F/scripts.inc | 6 +- data/maps/MtPyre_Summit/scripts.inc | 26 +- data/maps/OldaleTown/scripts.inc | 12 +- data/maps/OldaleTown_House2/scripts.inc | 2 +- data/maps/OldaleTown_Mart/scripts.inc | 8 +- data/maps/OldaleTown_PokemonCenter_1F/scripts.inc | 6 +- data/maps/PacifidlogTown/scripts.inc | 6 +- data/maps/PacifidlogTown_House1/scripts.inc | 4 +- data/maps/PacifidlogTown_House2/scripts.inc | 16 +- data/maps/PacifidlogTown_House3/scripts.inc | 16 +- data/maps/PacifidlogTown_House4/scripts.inc | 8 +- data/maps/PacifidlogTown_House5/scripts.inc | 2 +- .../PacifidlogTown_PokemonCenter_1F/scripts.inc | 2 +- data/maps/PetalburgCity/scripts.inc | 24 +- data/maps/PetalburgCity_Gym/scripts.inc | 152 +- data/maps/PetalburgCity_House2/scripts.inc | 2 +- data/maps/PetalburgCity_Mart/scripts.inc | 4 +- .../PetalburgCity_PokemonCenter_1F/scripts.inc | 12 +- data/maps/PetalburgCity_WallysHouse/scripts.inc | 34 +- data/maps/PetalburgWoods/scripts.inc | 56 +- data/maps/Route101/scripts.inc | 8 +- data/maps/Route102/scripts.inc | 10 +- data/maps/Route103/scripts.inc | 26 +- data/maps/Route104/scripts.inc | 62 +- data/maps/Route104_MrBrineysHouse/scripts.inc | 26 +- data/maps/Route105/scripts.inc | 6 +- data/maps/Route109/scripts.inc | 30 +- data/maps/Route109_SeashoreHouse/scripts.inc | 38 +- data/maps/Route110/scripts.inc | 60 +- .../scripts.inc | 6 +- .../scripts.inc | 6 +- data/maps/Route110_TrickHouseEnd/scripts.inc | 30 +- data/maps/Route110_TrickHouseEntrance/scripts.inc | 46 +- data/maps/Route110_TrickHousePuzzle1/scripts.inc | 10 +- data/maps/Route110_TrickHousePuzzle2/scripts.inc | 12 +- data/maps/Route110_TrickHousePuzzle3/scripts.inc | 22 +- data/maps/Route110_TrickHousePuzzle4/scripts.inc | 10 +- data/maps/Route110_TrickHousePuzzle5/scripts.inc | 8 +- data/maps/Route110_TrickHousePuzzle6/scripts.inc | 14 +- data/maps/Route110_TrickHousePuzzle7/scripts.inc | 26 +- data/maps/Route110_TrickHousePuzzle8/scripts.inc | 14 +- data/maps/Route111/scripts.inc | 46 +- data/maps/Route111_OldLadysRestStop/scripts.inc | 12 +- .../Route111_WinstrateFamilysHouse/scripts.inc | 18 +- data/maps/Route112/scripts.inc | 8 +- data/maps/Route113/scripts.inc | 6 +- data/maps/Route113_GlassWorkshop/scripts.inc | 42 +- data/maps/Route114/scripts.inc | 4 +- data/maps/Route114_FossilManiacsHouse/scripts.inc | 8 +- data/maps/Route114_FossilManiacsTunnel/scripts.inc | 20 +- data/maps/Route114_LanettesHouse/scripts.inc | 10 +- data/maps/Route115/scripts.inc | 4 +- data/maps/Route116/scripts.inc | 26 +- data/maps/Route116_TunnelersRestHouse/scripts.inc | 12 +- data/maps/Route117/scripts.inc | 4 +- data/maps/Route118/scripts.inc | 16 +- data/maps/Route119/scripts.inc | 50 +- data/maps/Route119_WeatherInstitute_1F/scripts.inc | 24 +- data/maps/Route119_WeatherInstitute_2F/scripts.inc | 40 +- data/maps/Route120/scripts.inc | 12 +- data/maps/Route121/scripts.inc | 2 +- data/maps/Route123/scripts.inc | 10 +- data/maps/Route124/scripts.inc | 2 +- .../scripts.inc | 22 +- data/maps/Route128/scripts.inc | 14 +- data/maps/RustboroCity/scripts.inc | 86 +- data/maps/RustboroCity_CuttersHouse/scripts.inc | 8 +- data/maps/RustboroCity_DevonCorp_1F/scripts.inc | 18 +- data/maps/RustboroCity_DevonCorp_2F/scripts.inc | 38 +- data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 42 +- data/maps/RustboroCity_Flat1_2F/scripts.inc | 52 +- data/maps/RustboroCity_Flat2_1F/scripts.inc | 2 +- data/maps/RustboroCity_Flat2_2F/scripts.inc | 8 +- data/maps/RustboroCity_Flat2_3F/scripts.inc | 4 +- data/maps/RustboroCity_Gym/scripts.inc | 66 +- data/maps/RustboroCity_House1/scripts.inc | 8 +- data/maps/RustboroCity_House2/scripts.inc | 4 +- data/maps/RustboroCity_House3/scripts.inc | 6 +- data/maps/RustboroCity_Mart/scripts.inc | 4 +- .../maps/RustboroCity_PokemonCenter_1F/scripts.inc | 6 +- data/maps/RustboroCity_PokemonSchool/scripts.inc | 54 +- data/maps/RusturfTunnel/scripts.inc | 18 +- data/maps/SSTidalCorridor/scripts.inc | 22 +- data/maps/SSTidalLowerDeck/scripts.inc | 14 +- data/maps/SSTidalRooms/scripts.inc | 38 +- data/maps/SeafloorCavern_Entrance/scripts.inc | 16 +- data/maps/SeafloorCavern_Room1/scripts.inc | 10 +- data/maps/SeafloorCavern_Room3/scripts.inc | 12 +- data/maps/SeafloorCavern_Room4/scripts.inc | 8 +- data/maps/SeafloorCavern_Room9/scripts.inc | 36 +- data/maps/SkyPillar_Outside/scripts.inc | 24 +- data/maps/SlateportCity/scripts.inc | 118 +- .../SlateportCity_BattleTentCorridor/scripts.inc | 60 +- .../maps/SlateportCity_BattleTentLobby/scripts.inc | 20 +- data/maps/SlateportCity_Harbor/scripts.inc | 44 +- data/maps/SlateportCity_House1/scripts.inc | 10 +- data/maps/SlateportCity_House2/scripts.inc | 2 +- .../SlateportCity_OceanicMuseum_1F/scripts.inc | 30 +- .../SlateportCity_OceanicMuseum_2F/scripts.inc | 52 +- .../SlateportCity_PokemonCenter_1F/scripts.inc | 4 +- data/maps/SlateportCity_PokemonFanClub/scripts.inc | 22 +- .../SlateportCity_SternsShipyard_1F/scripts.inc | 24 +- .../SlateportCity_SternsShipyard_2F/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 94 +- data/maps/SootopolisCity_Gym_1F/scripts.inc | 12 +- data/maps/SootopolisCity_Gym_B1F/scripts.inc | 30 +- data/maps/SootopolisCity_House1/scripts.inc | 6 +- data/maps/SootopolisCity_House3/scripts.inc | 6 +- data/maps/SootopolisCity_House4/scripts.inc | 6 +- data/maps/SootopolisCity_House6/scripts.inc | 8 +- data/maps/SootopolisCity_House7/scripts.inc | 2 +- .../SootopolisCity_LotadAndSeedotHouse/scripts.inc | 28 +- data/maps/SootopolisCity_Mart/scripts.inc | 4 +- .../scripts.inc | 8 +- .../SootopolisCity_PokemonCenter_1F/scripts.inc | 12 +- data/maps/TrainerHill_Entrance/scripts.inc | 32 +- data/maps/VerdanturfTown/scripts.inc | 16 +- .../VerdanturfTown_BattleTentCorridor/scripts.inc | 8 +- .../VerdanturfTown_BattleTentLobby/scripts.inc | 22 +- .../scripts.inc | 14 +- data/maps/VerdanturfTown_Mart/scripts.inc | 6 +- .../VerdanturfTown_PokemonCenter_1F/scripts.inc | 6 +- data/maps/VerdanturfTown_WandasHouse/scripts.inc | 46 +- data/maps/VictoryRoad_1F/scripts.inc | 36 +- data/maps/VictoryRoad_B1F/scripts.inc | 20 +- data/maps/VictoryRoad_B2F/scripts.inc | 28 +- data/mystery_event_msg.s | 6 +- data/pokenav.s | 94 +- data/rom_8011DC0.s | 98 +- data/scripts/apprentice.inc | 1226 +++++++-------- data/scripts/berry_tree.inc | 10 +- data/scripts/cable_club.inc | 56 +- data/scripts/contest_hall.inc | 44 +- data/scripts/day_care.inc | 32 +- data/scripts/field_move_scripts.inc | 12 +- data/scripts/mauville_man.inc | 86 +- data/scripts/mystery_event_club.inc | 22 +- data/scripts/pokeblocks.inc | 118 +- data/scripts/safari_zone.inc | 54 +- data/scripts/secret_power_tm.inc | 20 +- data/text/berries.inc | 70 +- data/text/berry_descriptions.inc | 6 +- data/text/birch_speech.inc | 14 +- data/text/contest_strings.inc | 108 +- data/text/easy_chat/easy_chat_group_actions.s | 2 +- data/text/easy_chat/easy_chat_group_battle.s | 2 +- data/text/easy_chat/easy_chat_group_endings.s | 22 +- data/text/easy_chat/easy_chat_group_greetings.s | 4 +- data/text/easy_chat/easy_chat_group_hobbies.s | 2 +- data/text/easy_chat/easy_chat_group_misc.s | 2 +- data/text/easy_chat/easy_chat_group_people.s | 20 +- data/text/easy_chat/easy_chat_group_speech.s | 2 +- data/text/eon_ticket.inc | 6 +- data/text/lottery_corner.inc | 26 +- data/text/pokedex_rating.inc | 26 +- data/text/pokemon_news.inc | 104 +- data/text/roulette.inc | 8 +- data/text/save.inc | 6 +- data/text/shoal_cave.inc | 14 +- data/text/trainers.inc | 1536 +++++++++---------- data/text/tv.inc | 926 ++++++------ data/text_input_strings.s | 2 +- data/trade.s | 2 +- src/battle_message.c | 278 ++-- src/berry.c | 6 +- src/berry_blender.c | 4 +- src/data/items.h | 4 +- src/data/pokemon/pokedex_text.h | 156 +- src/data/region_map/region_map_entries.h | 2 +- src/data/text/abilities.h | 8 +- src/data/text/item_descriptions.h | 38 +- src/data/text/move_descriptions.h | 112 +- src/data/text/species_names.h | 2 +- src/landmark.c | 14 +- src/mystery_event_msg.c | 2 +- src/naming_screen.c | 2 +- src/strings.c | 302 ++-- 327 files changed, 7189 insertions(+), 7189 deletions(-) diff --git a/charmap.txt b/charmap.txt index a736b40f2..2ccac19d3 100644 --- a/charmap.txt +++ b/charmap.txt @@ -80,7 +80,7 @@ RIGHT_ARROW = 7C '“' = B1 'â€' = B2 '‘' = B3 -'’' = B4 +'\'' = B4 '♂' = B5 '♀' = B6 'Â¥' = B7 diff --git a/data/event_scripts.s b/data/event_scripts.s index e4fb20cd6..7d7d1528e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -619,10 +619,10 @@ EventScript_23B6D7:: @ 823B6D7 end gText_23B6E0:: @ 823B6E0 - .string "There’s a small indent in the wall.$" + .string "There's a small indent in the wall.$" gText_23B704:: @ 823B704 - .string "There’s a small indent in the wall.\p" + .string "There's a small indent in the wall.\p" .string "Use the SECRET POWER?$" gText_23B73E:: @ 823B73E @@ -3119,25 +3119,25 @@ gText_WhichPCShouldBeAccessed:: @ 827266F .string "Which PC should be accessed?$" gUnknown_0827268C:: @ 827268C - .string "Accessed SOMEONE’S PC.$" + .string "Accessed SOMEONE'S PC.$" gUnknown_082726A3:: @ 82726A3 .string "POKéMON Storage System opened.$" gUnknown_082726C2:: @ 82726C2 - .string "Accessed {PLAYER}’s PC.$" + .string "Accessed {PLAYER}'s PC.$" gUnknown_082726D4:: @ 82726D4 - .string "Accessed LANETTE’s PC.$" + .string "Accessed LANETTE's PC.$" gUnknown_082726EB:: @ 82726EB .string "Hello, and welcome to\nthe POKéMON CENTER.\pWe restore your tired POKéMON\nto full health.\pWould you like to rest your POKéMON?$" gUnknown_08272768:: @ 8272768 - .string "Okay, I’ll take your POKéMON\nfor a few seconds.$" + .string "Okay, I'll take your POKéMON\nfor a few seconds.$" gUnknown_08272798:: @ 8272798 - .string "Thank you for waiting.\pWe’ve restored your POKéMON\nto full health.$" + .string "Thank you for waiting.\pWe've restored your POKéMON\nto full health.$" gUnknown_082727DB:: @ 82727DB .string "We hope to see you again!$" @@ -3146,13 +3146,13 @@ gUnknown_082727F5:: @ 82727F5 .string "Hello, and welcome to\nthe POKéMON CENTER.\pWe restore your tired POKéMON\nto full health.\pWould you like to…$" gUnknown_08272860:: @ 8272860 - .string "Th-that card…\nCould it be… The GOLD CARD?!\pOh, the gold color is brilliant!\nThe four stars seem to sparkle!\pI’ve seen several TRAINERS with\na SILVER CARD before, but, {PLAYER},\lyou’re the first TRAINER I’ve ever\lseen with a GOLD CARD!\pOkay, {PLAYER}, please allow me\nthe honor of resting your POKéMON!$" + .string "Th-that card…\nCould it be… The GOLD CARD?!\pOh, the gold color is brilliant!\nThe four stars seem to sparkle!\pI've seen several TRAINERS with\na SILVER CARD before, but, {PLAYER},\lyou're the first TRAINER I've ever\lseen with a GOLD CARD!\pOkay, {PLAYER}, please allow me\nthe honor of resting your POKéMON!$" gUnknown_08272982:: @ 8272982 - .string "I’m delighted to see you, {PLAYER}!\nYou want the usual, am I right?$" + .string "I'm delighted to see you, {PLAYER}!\nYou want the usual, am I right?$" gUnknown_082729C0:: @ 82729C0 - .string "Okay, I’ll take your POKéMON\nfor a few seconds.$" + .string "Okay, I'll take your POKéMON\nfor a few seconds.$" gUnknown_082729F0:: @ 82729F0 .string "Thank you for waiting.$" @@ -3191,7 +3191,7 @@ gUnknown_08272B09:: @ 8272B09 .string "Obtained the {STR_VAR_2}!$" gUnknown_08272B1A:: @ 8272B1A - .string "Too bad! There’s no room left for\nanother {STR_VAR_2}…$" + .string "Too bad! There's no room left for\nanother {STR_VAR_2}…$" gUnknown_08272B48:: @ 8272B48 .string "The {STR_VAR_2} was transferred\nto the PC.$" @@ -3209,13 +3209,13 @@ gUnknown_08272C1D:: @ 8272C1D .string "Welcome to LILYCOVE DEPARTMENT STORE.\pWhich floor would you like?$" gUnknown_08272C5F:: @ 8272C5F - .string "The sandstorm is vicious.\nIt’s impossible to keep going.$" + .string "The sandstorm is vicious.\nIt's impossible to keep going.$" gUnknown_08272C98:: @ 8272C98 .string "An item in the BAG can be\nregistered to SELECT for easy use.$" gUnknown_08272CD5:: @ 8272CD5 - .string "There’s an e-mail from POKéMON TRAINER\nSCHOOL.\p… … … … … …\pA POKéMON may learn up to four moves.\pA TRAINER’s expertise is tested on the\nmove sets chosen for POKéMON.\p… … … … … …$" + .string "There's an e-mail from POKéMON TRAINER\nSCHOOL.\p… … … … … …\pA POKéMON may learn up to four moves.\pA TRAINER's expertise is tested on the\nmove sets chosen for POKéMON.\p… … … … … …$" gUnknown_08272D87:: @ 8272D87 .string "{PLAYER} booted up the PC.$" @@ -3233,7 +3233,7 @@ gUnknown_08272E0F:: @ 8272E0F .string "Registered {STR_VAR_1} {STR_VAR_2}\nin the POKéNAV.$" gUnknown_08272E30:: @ 8272E30 - .string "Do you know the TM SECRET POWER?\pOur group, we love the TM SECRET\nPOWER.\pOne of our members will give it to you.\nCome back and show me if you get it.\pWe’ll accept you as a member and sell\nyou good stuff in secrecy.$" + .string "Do you know the TM SECRET POWER?\pOur group, we love the TM SECRET\nPOWER.\pOne of our members will give it to you.\nCome back and show me if you get it.\pWe'll accept you as a member and sell\nyou good stuff in secrecy.$" gUnknown_08272F07:: @ 8272F07 .string "Your POKéMON may be infected with\nPOKéRUS.\pLittle is known about the POKéRUS\nexcept that they are microscopic life-\lforms that attach to POKéMON.\pWhile infected, POKéMON are said to\ngrow exceptionally well.$" @@ -3247,16 +3247,16 @@ gUnknown_0827304E:: @ 827304E .string "There is a big hole in the wall.$" gUnknown_0827306F:: @ 827306F - .string "I’m terribly sorry.\nThe POKéMON WIRELESS CLUB is\lundergoing adjustments now.$" + .string "I'm terribly sorry.\nThe POKéMON WIRELESS CLUB is\lundergoing adjustments now.$" gUnknown_082730BC:: @ 82730BC .string "It appears to be undergoing\nadjustments…$" gUnknown_082730E5:: @ 82730E5 - .string "I’m terribly sorry. The TRADE CENTER\nis undergoing inspections.$" + .string "I'm terribly sorry. The TRADE CENTER\nis undergoing inspections.$" gUnknown_08273125:: @ 8273125 - .string "I’m terribly sorry. The RECORD CORNER\nis under preparation.$" + .string "I'm terribly sorry. The RECORD CORNER\nis under preparation.$" gUnknown_08273161:: @ 8273161 .string "{PLAYER} handed over the\n{STR_VAR_1}.$" @@ -3268,25 +3268,25 @@ gUnknown_082731A9:: @ 82731A9 .string "{PLAYER} found one {STR_VAR_1}\n{STR_VAR_2}!$" gUnknown_082731BD:: @ 82731BD - .string "The weird tree doesn’t like the\nWAILMER PAIL!\pThe weird tree attacked!$" + .string "The weird tree doesn't like the\nWAILMER PAIL!\pThe weird tree attacked!$" gUnknown_08273204:: @ 8273204 .string "The {STR_VAR_1} flew away!$" gText_PkmnTransferredSomeonesPC:: @ 8273216 - .string "{STR_VAR_2} was transferred to\nSOMEONE’S PC.\pIt was placed in \nBOX “{STR_VAR_1}.â€$" + .string "{STR_VAR_2} was transferred to\nSOMEONE'S PC.\pIt was placed in \nBOX “{STR_VAR_1}.â€$" gText_PkmnTransferredLanettesPC:: @ 8273256 - .string "{STR_VAR_2} was transferred to\nLANETTE’S PC.\pIt was placed in \nBOX “{STR_VAR_1}.â€$" + .string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\pIt was placed in \nBOX “{STR_VAR_1}.â€$" gText_PkmnBoxSomeonesPCFull:: @ 8273296 - .string "BOX “{STR_VAR_3}†on\nSOMEONE’S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.â€$" + .string "BOX “{STR_VAR_3}†on\nSOMEONE'S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.â€$" gText_PkmnBoxLanettesPCFull:: @ 82732D9 - .string "BOX “{STR_VAR_3}†on\nLANETTE’S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.â€$" + .string "BOX “{STR_VAR_3}†on\nLANETTE'S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.â€$" gUnknown_0827331C:: @ 827331C - .string "There’s no more room for POKéMON!\pThe POKéMON BOXES are full and\ncan’t accept any more!$" + .string "There's no more room for POKéMON!\pThe POKéMON BOXES are full and\ncan't accept any more!$" gUnknown_08273374:: @ 8273374 .string "Do you want to give a nickname to\nthis {STR_VAR_1}?$" @@ -4134,7 +4134,7 @@ SecretBase_RedCave1_Text_2748A0: @ 82748A0 .string "Have you made a SECRET BASE already?\p" .string "I went here, there, everywhere before\n" .string "choosing this place.\p" - .string "Since you’re already here, how would\n" + .string "Since you're already here, how would\n" .string "you like to battle?$" SecretBase_RedCave1_Text_274939: @ 8274939 @@ -4143,10 +4143,10 @@ SecretBase_RedCave1_Text_274939: @ 8274939 SecretBase_RedCave1_Text_27494D: @ 827494D .string "Hunh?\n" - .string "Oh, you can’t now…$" + .string "Oh, you can't now…$" SecretBase_RedCave1_Text_274966:: @ 8274966 - .string "Waaargh! You’re too strong!\n" + .string "Waaargh! You're too strong!\n" .string "About me losing… Please keep it secret!$" SecretBase_RedCave1_Text_2749AA: @ 82749AA @@ -4160,10 +4160,10 @@ SecretBase_RedCave1_Text_2749ED: @ 82749ED .string "Feel free to hang out!$" SecretBase_RedCave1_Text_274A64: @ 8274A64 - .string "There’re a lot of places where\n" + .string "There're a lot of places where\n" .string "you can make a SECRET BASE.\p" .string "But I like this spot best.\n" - .string "Don’t you think it’s nice?\p" + .string "Don't you think it's nice?\p" .string "Oh, would you like to have a battle?$" SecretBase_RedCave1_Text_274AFA: @ 8274AFA @@ -4171,41 +4171,41 @@ SecretBase_RedCave1_Text_274AFA: @ 8274AFA SecretBase_RedCave1_Text_274B0B: @ 8274B0B .string "Oh…\n" - .string "You can’t now, okay.$" + .string "You can't now, okay.$" SecretBase_RedCave1_Text_274B24:: @ 8274B24 - .string "Hmmm… It’s our loss…\n" - .string "But don’t tell anyone!\l" - .string "It’s a confidential secret!$" + .string "Hmmm… It's our loss…\n" + .string "But don't tell anyone!\l" + .string "It's a confidential secret!$" SecretBase_RedCave1_Text_274B6C: @ 8274B6C - .string "If you’re in this area again,\n" - .string "I hope you’ll visit me.$" + .string "If you're in this area again,\n" + .string "I hope you'll visit me.$" SecretBase_RedCave1_Text_274BA2: @ 8274BA2 - .string "There’re a lot of places where you can\n" + .string "There're a lot of places where you can\n" .string "make a SECRET BASE.\p" .string "But I like this spot best.\n" - .string "Don’t you think it’s nice?$" + .string "Don't you think it's nice?$" SecretBase_RedCave1_Text_274C13: @ 8274C13 .string "This is a popular spot.\n" - .string "It’s always taken.\p" + .string "It's always taken.\p" .string "Oh! Were you thinking about\n" .string "taking this spot, too?\p" - .string "I’ll tell you what, you can have this\n" + .string "I'll tell you what, you can have this\n" .string "spot if you can beat me.$" SecretBase_RedCave1_Text_274CB0: @ 8274CB0 .string "Okay!\n" - .string "I’m going to defend my SECRET BASE!$" + .string "I'm going to defend my SECRET BASE!$" SecretBase_RedCave1_Text_274CDA: @ 8274CDA .string "Hunh? Is that right?\n" - .string "You’re not interested in this spot?$" + .string "You're not interested in this spot?$" SecretBase_RedCave1_Text_274D13:: @ 8274D13 - .string "I can’t keep going!\n" + .string "I can't keep going!\n" .string "I surrender!$" SecretBase_RedCave1_Text_274D34: @ 8274D34 @@ -4214,7 +4214,7 @@ SecretBase_RedCave1_Text_274D34: @ 8274D34 SecretBase_RedCave1_Text_274D69: @ 8274D69 .string "This is a popular spot.\n" - .string "It’s always taken.\p" + .string "It's always taken.\p" .string "I waited a long time for it to open.\n" .string "I finally got to use it!$" @@ -4225,14 +4225,14 @@ SecretBase_RedCave1_Text_274DD2: @ 8274DD2 .string "Would you like to see how strong I am?$" SecretBase_RedCave1_Text_274E41: @ 8274E41 - .string "I’m going to go all out!$" + .string "I'm going to go all out!$" SecretBase_RedCave1_Text_274E5A: @ 8274E5A .string "Oh.\n" .string "Some other time, then!$" SecretBase_RedCave1_Text_274E75:: @ 8274E75 - .string "Hmm… I’ve still got lots to learn.\n" + .string "Hmm… I've still got lots to learn.\n" .string "I have to study some more.$" SecretBase_RedCave1_Text_274EB3: @ 8274EB3 @@ -4252,14 +4252,14 @@ SecretBase_RedCave1_Text_274F39: @ 8274F39 .string "So, how would you like a battle?$" SecretBase_RedCave1_Text_274FCA: @ 8274FCA - .string "That’s the way!$" + .string "That's the way!$" SecretBase_RedCave1_Text_274FDA: @ 8274FDA - .string "When you’re ready, give me a shout!$" + .string "When you're ready, give me a shout!$" SecretBase_RedCave1_Text_274FFE:: @ 8274FFE .string "Aww! Done in!\n" - .string "But it’s still fun to battle!$" + .string "But it's still fun to battle!$" SecretBase_RedCave1_Text_27502A: @ 827502A .string "Well, anyway, I should go buy some\n" @@ -4310,7 +4310,7 @@ SecretBase_RedCave1_Text_275287: @ 8275287 .string "have a battle?$" SecretBase_RedCave1_Text_275315: @ 8275315 - .string "I’m not going down easily!$" + .string "I'm not going down easily!$" SecretBase_RedCave1_Text_275330: @ 8275330 .string "Oh… Are you maybe tired from searching\n" @@ -4320,7 +4320,7 @@ SecretBase_RedCave1_Text_275367:: @ 8275367 .string "I went down…$" SecretBase_RedCave1_Text_275374: @ 8275374 - .string "Where’s your SECRET BASE?\n" + .string "Where's your SECRET BASE?\n" .string "I should go visit you there.$" SecretBase_RedCave1_Text_2753AB: @ 82753AB @@ -4337,17 +4337,17 @@ SecretBase_RedCave1_Text_275405: @ 8275405 SecretBase_RedCave1_Text_2754B2: @ 82754B2 .string "This is my SECRET BASE.\n" - .string "I can’t lose!$" + .string "I can't lose!$" SecretBase_RedCave1_Text_2754D8: @ 82754D8 - .string "I’ll battle with you anytime.$" + .string "I'll battle with you anytime.$" SecretBase_RedCave1_Text_2754F6:: @ 82754F6 .string "Huh?\n" .string "Did I just lose?$" SecretBase_RedCave1_Text_27550C: @ 827550C - .string "I won’t lose at collecting decorations.\n" + .string "I won't lose at collecting decorations.\n" .string "Come visit again!$" SecretBase_RedCave1_Text_275546: @ 8275546 @@ -4361,22 +4361,22 @@ SecretBase_RedCave1_Text_2755D2: @ 82755D2 .string "with my favorite decorations.\p" .string "I raise my favorite POKéMON and grow\n" .string "stronger with it.\p" - .string "That’s what I do.\n" + .string "That's what I do.\n" .string "Want to battle with me?$" SecretBase_RedCave1_Text_275679: @ 8275679 - .string "Show me what you’re made of!$" + .string "Show me what you're made of!$" SecretBase_RedCave1_Text_275696: @ 8275696 - .string "I guess there are times when you’re not\n" + .string "I guess there are times when you're not\n" .string "into it.$" SecretBase_RedCave1_Text_2756C7:: @ 82756C7 - .string "I know exactly what you’re made of now.$" + .string "I know exactly what you're made of now.$" SecretBase_RedCave1_Text_2756EF: @ 82756EF .string "We can both become stronger.\n" - .string "Let’s keep at it!$" + .string "Let's keep at it!$" SecretBase_RedCave1_Text_27571E: @ 827571E .string "I found a spot I liked, and I did it up\n" @@ -4395,19 +4395,19 @@ SecretBase_RedCave1_Text_2757B5: @ 82757B5 .string "Want to see my taste in battling?$" SecretBase_RedCave1_Text_275884: @ 8275884 - .string "There’s no holding back!$" + .string "There's no holding back!$" SecretBase_RedCave1_Text_27589D: @ 827589D - .string "I’ll be happy to demonstrate my style\n" + .string "I'll be happy to demonstrate my style\n" .string "anytime.$" SecretBase_RedCave1_Text_2758CC:: @ 82758CC - .string "You’re supremely talented!\n" + .string "You're supremely talented!\n" .string "Your power seems to be limitless…$" SecretBase_RedCave1_Text_275909: @ 8275909 .string "What did you think of my style?\n" - .string "I’ll keep on polishing it!$" + .string "I'll keep on polishing it!$" SecretBase_RedCave1_Text_275944: @ 8275944 .string "You can learn a lot about the taste\n" @@ -5164,7 +5164,7 @@ Text_2766AA: @ 82766AA Text_276707: @ 8276707 .string "Do you want to register\n" - .string "{STR_VAR_1}’s SECRET BASE?$" + .string "{STR_VAR_1}'s SECRET BASE?$" Text_276731: @ 8276731 .string "This data is already registered.\n" @@ -5233,11 +5233,11 @@ gUnknown_0827E8DA:: @ 827E8DA .string "Link standby!$" gUnknown_0827E8E8:: @ 827E8E8 - .string "The winner is {STR_VAR_1}’s {STR_VAR_2}!\n" + .string "The winner is {STR_VAR_1}'s {STR_VAR_2}!\n" .string "Congratulations!$" gUnknown_0827E910:: @ 827E910 - .string "The winner is {STR_VAR_1}’s {STR_VAR_2}!{PAUSE_UNTIL_PRESS}$" + .string "The winner is {STR_VAR_1}'s {STR_VAR_2}!{PAUSE_UNTIL_PRESS}$" gUnknown_0827E929:: @ 827E929 .string "Primary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" @@ -5254,7 +5254,7 @@ gUnknown_0827E973:: @ 827E973 gUnknown_0827E992:: @ 827E992 .string "The most impressive POKéMON:\n" - .string "{STR_VAR_1}’s {STR_VAR_2}{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1}'s {STR_VAR_2}{PAUSE_UNTIL_PRESS}$" gUnknown_0827E9B9:: @ 827E9B9 .string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" @@ -5265,7 +5265,7 @@ gUnknown_0827E9CD:: @ 827E9CD gUnknown_0827EA0C:: @ 827EA0C .string "{STR_VAR_1}\n" - .string "{STR_VAR_2}’s {STR_VAR_3}$" + .string "{STR_VAR_2}'s {STR_VAR_3}$" gUnknown_0827EA17:: @ 827EA17 .string "CONTEST$" @@ -5313,22 +5313,22 @@ gContestPaintingCool3:: .string "very great {STR_VAR_1}$" gContestPaintingBeauty1:: - .string "This century’s last Venus--\n" + .string "This century's last Venus--\n" .string "the beautiful {STR_VAR_1}$" gContestPaintingBeauty2:: - .string "{STR_VAR_1}’s dazzling,\n" + .string "{STR_VAR_1}'s dazzling,\n" .string "glittering smile$" gContestPaintingBeauty3:: - .string "POKéMON CENTER’s super idol--\n" + .string "POKéMON CENTER's super idol--\n" .string "the incomparable {STR_VAR_1}$" gContestPaintingCute1:: .string "The lovely and sweet {STR_VAR_1}$" gContestPaintingCute2:: - .string "The pretty {STR_VAR_1}’s\n" + .string "The pretty {STR_VAR_1}'s\n" .string "winning portrait$" gContestPaintingCute3:: @@ -5344,7 +5344,7 @@ gContestPaintingSmart2:: .string "above all POKéMON$" gContestPaintingSmart3:: - .string "The excellent {STR_VAR_1}’s\n" + .string "The excellent {STR_VAR_1}'s\n" .string "moment of elegance$" gContestPaintingTough1:: @@ -5897,7 +5897,7 @@ gOtherText_Is:: @ 82942FD gOtherText_DontYouAgree:: @ 8294301 .string "\n" - .string "Don’t you agree?$" + .string "Don't you agree?$" gUnknown_08294313:: @ 8294313 .string "I so want to go on a vacation.\n" @@ -5905,10 +5905,10 @@ gUnknown_08294313:: @ 8294313 gUnknown_08294359:: @ 8294359 .string "I bought crayons with 120 colors!\n" - .string "Don’t you think that’s nice?$" + .string "Don't you think that's nice?$" gUnknown_08294398:: @ 8294398 - .string "Wouldn’t it be nice if we could float\n" + .string "Wouldn't it be nice if we could float\n" .string "away on a cloud of bubbles?$" gUnknown_082943DA:: @ 82943DA @@ -5916,7 +5916,7 @@ gUnknown_082943DA:: @ 82943DA .string "they wash away. It makes me sad.$" gUnknown_0829441C:: @ 829441C - .string "What’s the bottom of the sea like?\n" + .string "What's the bottom of the sea like?\n" .string "Just once I would so love to go!$" gUnknown_08294460:: @ 8294460 @@ -5925,11 +5925,11 @@ gUnknown_08294460:: @ 8294460 gUnknown_082944A0:: @ 82944A0 .string "Lying back in the green grass…\n" - .string "Oh, it’s so, so nice!$" + .string "Oh, it's so, so nice!$" gUnknown_082944D5:: @ 82944D5 .string "SECRET BASES are so wonderful!\n" - .string "Can’t you feel the excitement?$" + .string "Can't you feel the excitement?$" .include "data/text/trainers.inc" @@ -5938,7 +5938,7 @@ EventScript_RepelWoreOff:: @ 82A4B2A end Text_RepelWoreOff: @ 82A4B33 - .string "REPEL’s effect wore off…$" + .string "REPEL's effect wore off…$" .include "data/scripts/safari_zone.inc" @@ -5980,10 +5980,10 @@ MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D .include "data/text/shoal_cave.inc" Text_2A81E5: @ 82A81E5 - .string "There’s a set of POKéMON picture books.$" + .string "There's a set of POKéMON picture books.$" Text_2A820D: @ 82A820D - .string "It’s filled with all sorts of books.$" + .string "It's filled with all sorts of books.$" Text_2A8232: @ 82A8232 .string "POKéMON magazines!\n" @@ -5997,7 +5997,7 @@ Text_2A8276: @ 82A8276 .string "But, it was empty.$" Text_2A82B3: @ 82A82B3 - .string "It’s empty.$" + .string "It's empty.$" Text_2A82BF: @ 82A82BF .string "The shelves brim with all sorts of\n" @@ -6005,7 +6005,7 @@ Text_2A82BF: @ 82A82BF Text_2A82F7: @ 82A82F7 .string "A blueprint of some sort?\n" - .string "It’s too complicated!$" + .string "It's too complicated!$" GraniteCave_B1F_MapScript2_2A8327: @ 82A8327 MirageTower_2F_MapScript2_2A8327: @ 82A8327 @@ -6645,10 +6645,10 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8A56:: @ 82A8A56 end LilycoveCity_PokemonCenter_1F_Text_2A8A69: @ 82A8A69 - .string "I’m the FAVOR LADY…$" + .string "I'm the FAVOR LADY…$" LilycoveCity_PokemonCenter_1F_Text_2A8A7D: @ 82A8A7D - .string "I’ve recently developed an obsession\n" + .string "I've recently developed an obsession\n" .string "for {STR_VAR_1} things…$" LilycoveCity_PokemonCenter_1F_Text_2A8AB1: @ 82A8AB1 @@ -6659,7 +6659,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A8ACE: @ 82A8ACE .string "Before, I think it was {STR_VAR_3}…\p" .string "{STR_VAR_3} gave me one {STR_VAR_2},\n" .string "saying it was {STR_VAR_1}.\p" - .string "But it wasn’t {STR_VAR_1}.\n" + .string "But it wasn't {STR_VAR_1}.\n" .string "Not in the least bit.$" LilycoveCity_PokemonCenter_1F_Text_2A8B36: @ 82A8B36 @@ -6678,25 +6678,25 @@ LilycoveCity_PokemonCenter_1F_Text_2A8BAD: @ 82A8BAD LilycoveCity_PokemonCenter_1F_Text_2A8BCD: @ 82A8BCD .string "Is that so?\n" - .string "Then, it’s good-bye…$" + .string "Then, it's good-bye…$" LilycoveCity_PokemonCenter_1F_Text_2A8BEE: @ 82A8BEE .string "Oh…\n" - .string "You’re not willing to share?$" + .string "You're not willing to share?$" LilycoveCity_PokemonCenter_1F_Text_2A8C0F: @ 82A8C0F .string "Oh?\n" .string "That {STR_VAR_2} is {STR_VAR_1}?\p" .string "…Oh, is that right?\p" .string "Well, I owe you a thanks anyway.\n" - .string "I’ll try to cherish it…$" + .string "I'll try to cherish it…$" LilycoveCity_PokemonCenter_1F_Text_2A8C6F: @ 82A8C6F .string "Oh…\p" - .string "That’s a quite {STR_VAR_1}\n" + .string "That's a quite {STR_VAR_1}\n" .string "{STR_VAR_2}…\p" - .string "Isn’t it nice?\n" - .string "It’s so dreamy…\p" + .string "Isn't it nice?\n" + .string "It's so dreamy…\p" .string "Thank you…\n" .string "I will cherish this…$" @@ -6711,28 +6711,28 @@ LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8 .string "of my life!$" LilycoveCity_PokemonCenter_1F_Text_2A8D5D: @ 82A8D5D - .string "I’ll give you this wonderful item in\n" + .string "I'll give you this wonderful item in\n" .string "return for your fabulous gift.\p" .string "I hope you will cherish it…$" LilycoveCity_PokemonCenter_1F_Text_2A8DBD: @ 82A8DBD - .string "Oh, you can’t have it if you don’t have\n" + .string "Oh, you can't have it if you don't have\n" .string "the space for it.\p" .string "Please come see me when you get\n" .string "your BAG organized…$" LilycoveCity_PokemonCenter_1F_Text_2A8E2B: @ 82A8E2B - .string "I’m the QUIZ LADY!\n" + .string "I'm the QUIZ LADY!\n" .string "I love quizzes!$" LilycoveCity_PokemonCenter_1F_Text_2A8E4E: @ 82A8E4E .string "Oh?\p" - .string "I’m waiting for a challenger to answer\n" + .string "I'm waiting for a challenger to answer\n" .string "the quiz you made.\p" .string "We can chat another time, okay?$" LilycoveCity_PokemonCenter_1F_Text_2A8EAC: @ 82A8EAC - .string "I’m waiting for someone to challenge\n" + .string "I'm waiting for someone to challenge\n" .string "a quiz this {STR_VAR_1} thought up!$" LilycoveCity_PokemonCenter_1F_Text_2A8EEC: @ 82A8EEC @@ -6751,20 +6751,20 @@ LilycoveCity_PokemonCenter_1F_Text_2A8F65: @ 82A8F65 LilycoveCity_PokemonCenter_1F_Text_2A8F7E: @ 82A8F7E .string "Awww!\n" - .string "You’re going to quit?$" + .string "You're going to quit?$" LilycoveCity_PokemonCenter_1F_Text_2A8F9A: @ 82A8F9A .string "Please take the quiz challenge\n" .string "another time!$" LilycoveCity_PokemonCenter_1F_Text_2A8FC7: @ 82A8FC7 - .string "You’re amazing! You’ve got it right!\n" - .string "You’re one sharp customer!$" + .string "You're amazing! You've got it right!\n" + .string "You're one sharp customer!$" LilycoveCity_PokemonCenter_1F_Text_2A9007: @ 82A9007 .string "Congratulations!\n" - .string "You’ve got the quiz right!\p" - .string "You’ve won a prize provided by\n" + .string "You've got the quiz right!\p" + .string "You've won a prize provided by\n" .string "{STR_VAR_1}!$" LilycoveCity_PokemonCenter_1F_Text_2A9056: @ 82A9056 @@ -6797,18 +6797,18 @@ LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153 .string "is pick the prize for the person that\l" .string "answers your quiz correctly.\p" .string "But beware, if the person taking\n" - .string "the quiz can’t get it right, I get to\l" + .string "the quiz can't get it right, I get to\l" .string "keep the prize!$" LilycoveCity_PokemonCenter_1F_Text_2A9212: @ 82A9212 - .string "If you don’t choose a prize,\n" - .string "your quiz can’t be made.\p" + .string "If you don't choose a prize,\n" + .string "your quiz can't be made.\p" .string "Are you going to quit making\n" .string "your quiz?$" LilycoveCity_PokemonCenter_1F_Text_2A9270: @ 82A9270 .string "Oh, how nice!\n" - .string "That’s a wonderful prize!\p" + .string "That's a wonderful prize!\p" .string "Next, you need to write your quiz\n" .string "question and its answer.$" @@ -6822,12 +6822,12 @@ LilycoveCity_PokemonCenter_1F_Text_2A9305: @ 82A9305 LilycoveCity_PokemonCenter_1F_Text_2A9336: @ 82A9336 .string "Thank you!\n" - .string "You’ve put together a nice quiz.\p" - .string "I’ll go look for someone who’ll take\n" + .string "You've put together a nice quiz.\p" + .string "I'll go look for someone who'll take\n" .string "your quiz challenge right away.$" LilycoveCity_PokemonCenter_1F_Text_2A93A7: @ 82A93A7 - .string "I’m the CONTEST LADY!\n" + .string "I'm the CONTEST LADY!\n" .string "I sure do love CONTESTS!$" LilycoveCity_PokemonCenter_1F_Text_2A93D6: @ 82A93D6 @@ -6835,26 +6835,26 @@ LilycoveCity_PokemonCenter_1F_Text_2A93D6: @ 82A93D6 LilycoveCity_PokemonCenter_1F_Text_2A93F4: @ 82A93F4 .string "This is my friend {STR_VAR_1}!\n" - .string "It’s the epitome of {STR_VAR_2}!\p" + .string "It's the epitome of {STR_VAR_2}!\p" .string "But I think that it will display\n" .string "even more {STR_VAR_2}!$" LilycoveCity_PokemonCenter_1F_Text_2A9451: @ 82A9451 .string "So, I need your help!\p" .string "Please, may I have one {POKEBLOCK}?\n" - .string "All I’m asking for is one!\p" + .string "All I'm asking for is one!\p" .string "…Oh, but…\n" - .string "Don’t you have a {POKEBLOCK} CASE?\l" - .string "That’s no good. Next time, then!$" + .string "Don't you have a {POKEBLOCK} CASE?\l" + .string "That's no good. Next time, then!$" LilycoveCity_PokemonCenter_1F_Text_2A94E8: @ 82A94E8 .string "So, I need your help!\p" .string "Please, may I have one {POKEBLOCK}?\n" - .string "All I’m asking for is one!$" + .string "All I'm asking for is one!$" LilycoveCity_PokemonCenter_1F_Text_2A9537: @ 82A9537 .string "Awww!\n" - .string "I can’t have one {POKEBLOCK}?!$" + .string "I can't have one {POKEBLOCK}?!$" LilycoveCity_PokemonCenter_1F_Text_2A9556: @ 82A9556 .string "Sheesh!\n" @@ -6863,11 +6863,11 @@ LilycoveCity_PokemonCenter_1F_Text_2A9556: @ 82A9556 LilycoveCity_PokemonCenter_1F_Text_2A9571: @ 82A9571 .string "Yay!\n" .string "Thank you!\p" - .string "I’ll feed my POKéMON your {POKEBLOCK}\n" + .string "I'll feed my POKéMON your {POKEBLOCK}\n" .string "right away.$" LilycoveCity_PokemonCenter_1F_Text_2A95AD: @ 82A95AD - .string "…It doesn’t seem to have changed\n" + .string "…It doesn't seem to have changed\n" .string "in any way at all…\p" .string "Hmm…\p" .string "Oh, well!\n" @@ -6875,8 +6875,8 @@ LilycoveCity_PokemonCenter_1F_Text_2A95AD: @ 82A95AD LilycoveCity_PokemonCenter_1F_Text_2A9605: @ 82A9605 .string "Oh, yay!\n" - .string "It’s really delighted!\p" - .string "I think it really improved {STR_VAR_1}’s\n" + .string "It's really delighted!\p" + .string "I think it really improved {STR_VAR_1}'s\n" .string "{STR_VAR_2} quality, too.\p" .string "Thank you so much!$" @@ -6885,7 +6885,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A9669: @ 82A9669 .string "I think we may be ready to enter\n" .string "some CONTESTS.\p" .string "If you see us in one somewhere,\n" - .string "I hope you’ll cheer for us.$" + .string "I hope you'll cheer for us.$" LilycoveCity_PokemonCenter_1F_Text_2A96DA: @ 82A96DA .string "{STR_VAR_1}: Guguuh!$" @@ -6906,13 +6906,13 @@ BattleFrontier_PokeNav_2A971C:: @ 82A971C .string "Hi! {PLAYER}{STRING 5}, hello!\n" .string "This is {STR_VAR_1}.\p" .string "I saw this {STR_VAR_2} a while back\n" - .string "but I couldn’t catch it.\p" + .string "but I couldn't catch it.\p" .string "It was so close, too!\n" .string "Well, see you again!$" BattleFrontier_PokeNav_2A9798:: @ 82A9798 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "I tried to catch a nice {STR_VAR_2}\n" .string "a little while ago.\p" .string "But, it got away.\n" @@ -6921,7 +6921,7 @@ BattleFrontier_PokeNav_2A9798:: @ 82A9798 BattleFrontier_PokeNav_2A9813:: @ 82A9813 .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\p" + .string "It's me, {STR_VAR_1}.\p" .string "I just took a shot at catching\n" .string "this {STR_VAR_2}, but it took off.\p" .string "I came oh so close, too!\p" @@ -6935,13 +6935,13 @@ BattleFrontier_PokeNav_2A98A8:: @ 82A98A8 .string "I came close to getting one.\p" .string "It was just a while back.\n" .string "I thought I had it but it escaped.\p" - .string "If I see it again, I’ll get it for\n" + .string "If I see it again, I'll get it for\n" .string "sure, though.\p" .string "Okay, catch you later.$" BattleFrontier_PokeNav_2A9977:: @ 82A9977 .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\l" + .string "It's {STR_VAR_1}.\l" .string "Catching any POKéMON lately?\p" .string "A little while ago I came close to\n" .string "nabbing one, but it got loose.\p" @@ -6957,11 +6957,11 @@ BattleFrontier_PokeNav_2A99FD:: @ 82A99FD BattleFrontier_PokeNav_2A9A78:: @ 82A9A78 .string "…Uh, {PLAYER}{STRING 5}?\n" - .string "It’s me, {STR_VAR_1}.\p" + .string "It's me, {STR_VAR_1}.\p" .string "Oh, wait! Wait!\n" .string "I can catch this {STR_VAR_2}…\p" .string "Aaarrrgh! It bolted loose!\n" - .string "That wasn’t just close!$" + .string "That wasn't just close!$" BattleFrontier_PokeNav_2A9AE8:: @ 82A9AE8 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" @@ -6978,7 +6978,7 @@ BattleFrontier_PokeNav_2A9BA7:: @ 82A9BA7 .string "This is {STR_VAR_1}!\p" .string "So? Are you getting more POKéMON\n" .string "together?\p" - .string "I’m having a rotten time of it!\n" + .string "I'm having a rotten time of it!\n" .string "They all get away from me!\p" .string "See you!$" @@ -7001,17 +7001,17 @@ BattleFrontier_PokeNav_2A9CC8:: @ 82A9CC8 BattleFrontier_PokeNav_2A9D44:: @ 82A9D44 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\l" + .string "It's me, {STR_VAR_1}.\l" .string "Are you still catching POKéMON?\p" - .string "I’ve been trying to catch them\n" - .string "myself, but it’s not so easy.\p" + .string "I've been trying to catch them\n" + .string "myself, but it's not so easy.\p" .string "The way of POKéMON is deep!$" BattleFrontier_PokeNav_2A9DD7:: @ 82A9DD7 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" .string "Have you been catching POKéMON?\p" - .string "I’ve been trying to catch them\n" + .string "I've been trying to catch them\n" .string "myself, but with little success.\p" .string "The way of POKéMON is deep!$" @@ -7027,11 +7027,11 @@ BattleFrontier_PokeNav_2A9E70:: @ 82A9E70 BattleFrontier_PokeNav_2A9EFD:: @ 82A9EFD .string "Hey, {PLAYER}!\n" .string "This is {STR_VAR_1}!\p" - .string "I’ve been thinking about trying\n" + .string "I've been thinking about trying\n" .string "to catch me some POKéMON.\p" - .string "But I can’t seem to find any.\n" - .string "It’s a real puzzler for me!\p" - .string "I’m at my wit’s end!\n" + .string "But I can't seem to find any.\n" + .string "It's a real puzzler for me!\p" + .string "I'm at my wit's end!\n" .string "See you around!$" BattleFrontier_PokeNav_2A9FAB:: @ 82A9FAB @@ -7044,7 +7044,7 @@ BattleFrontier_PokeNav_2A9FAB:: @ 82A9FAB BattleFrontier_PokeNav_2AA028:: @ 82AA028 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "I challenged someone else after\n" .string "we battled.\p" .string "I came close, but I ended up\n" @@ -7052,7 +7052,7 @@ BattleFrontier_PokeNav_2AA028:: @ 82AA028 BattleFrontier_PokeNav_2AA099:: @ 82AA099 .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\p" + .string "It's me, {STR_VAR_1}.\p" .string "I just got cleaned in a battle.\p" .string "I guess I need to raise my team\n" .string "some more!$" @@ -7061,33 +7061,33 @@ BattleFrontier_PokeNav_2AA100:: @ 82AA100 .string "Hey, {PLAYER}.\n" .string "{STR_VAR_1} here.\p" .string "I tried another battle yesterday,\n" - .string "but I couldn’t pull out the win.\p" + .string "but I couldn't pull out the win.\p" .string "My team needs more raising.\n" .string "Okay, catch you later.$" BattleFrontier_PokeNav_2AA188:: @ 82AA188 .string "Hiya, {PLAYER}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "How are things with you?\p" - .string "I’ve been battling on,\n" - .string "but I haven’t won very often.\p" - .string "I can’t get it together.\n" + .string "I've been battling on,\n" + .string "but I haven't won very often.\p" + .string "I can't get it together.\n" .string "Right, take care!$" BattleFrontier_PokeNav_2AA214:: @ 82AA214 .string "Hey, {PLAYER}.\n" .string "{STR_VAR_1} here.\p" - .string "How’s it going for you?\p" - .string "I’ve been battling hard lately,\n" + .string "How's it going for you?\p" + .string "I've been battling hard lately,\n" .string "but to little success.\p" - .string "I can’t get into the groove.\n" + .string "I can't get into the groove.\n" .string "You take care.$" BattleFrontier_PokeNav_2AA2A1:: @ 82AA2A1 .string "{STR_VAR_1} here.\n" - .string "How’s it going lately?\p" + .string "How's it going lately?\p" .string "I lost a battle yesterday,\n" - .string "and it’s filled my thoughts.\p" + .string "and it's filled my thoughts.\p" .string "I have to devise a plan…\n" .string "See you.$" @@ -7125,16 +7125,16 @@ BattleFrontier_PokeNav_2AA4C5:: @ 82AA4C5 BattleFrontier_PokeNav_2AA520:: @ 82AA520 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\l" + .string "It's me, {STR_VAR_1}.\l" .string "Are you still battling hard?\p" - .string "As for me, I lost recently, so I’ve\n" + .string "As for me, I lost recently, so I've\n" .string "been training my team all over.\p" - .string "Let’s meet again.$" + .string "Let's meet again.$" BattleFrontier_PokeNav_2AA5AD:: @ 82AA5AD .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\p" - .string "I hope you’ve been keeping well.\p" + .string "I hope you've been keeping well.\p" .string "I was in a battle just a little\n" .string "while before this.\p" .string "{PLAYER}{STRING 5}, try to be active like me.\n" @@ -7158,18 +7158,18 @@ BattleFrontier_PokeNav_2AA6AF:: @ 82AA6AF BattleFrontier_PokeNav_2AA730:: @ 82AA730 .string "Hello, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}!\p" + .string "It's {STR_VAR_1}!\p" .string "I had a battle yesterday and\n" - .string "I won! It’s fantastic!$" + .string "I won! It's fantastic!$" BattleFrontier_PokeNav_2AA77A:: @ 82AA77A .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}!\l" - .string "How’s your battling?\p" + .string "It's me, {STR_VAR_1}!\l" + .string "How's your battling?\p" .string "Me, I had a battle the other day,\n" .string "and my {STR_VAR_2} came up huge!\p" .string "The next time I battle you,\n" - .string "{PLAYER}, it won’t be me losing!$" + .string "{PLAYER}, it won't be me losing!$" BattleFrontier_PokeNav_2AA81C:: @ 82AA81C .string "Hey, {PLAYER}.\n" @@ -7181,35 +7181,35 @@ BattleFrontier_PokeNav_2AA81C:: @ 82AA81C BattleFrontier_PokeNav_2AA88C:: @ 82AA88C .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "How are things with you?\n" .string "Battling much?\p" .string "I just won a while back!\n" .string "My {STR_VAR_2} was brilliant!\p" - .string "You wait. I’m going to beat you\n" + .string "You wait. I'm going to beat you\n" .string "next time! Right, take care!$" BattleFrontier_PokeNav_2AA934:: @ 82AA934 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\p" - .string "How’s it going for you?\p" - .string "I’ve been riding a hot streak.\n" + .string "How's it going for you?\p" + .string "I've been riding a hot streak.\n" .string "Why, I just won a battle.\p" .string "When we have our next battle,\n" - .string "I’m sure not going to lose!$" + .string "I'm sure not going to lose!$" BattleFrontier_PokeNav_2AA9D3:: @ 82AA9D3 .string "{PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here.\p" .string "My {STR_VAR_2} is a force!\n" .string "It won me another battle just now!\p" - .string "I can’t wait to have a rematch\n" + .string "I can't wait to have a rematch\n" .string "with you.$" BattleFrontier_PokeNav_2AAA40:: @ 82AAA40 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\p" - .string "I hope you’ve been well.\n" + .string "I hope you've been well.\n" .string "I wanted to tell you I just won.\p" .string "My {STR_VAR_2} worked especially\n" .string "hard to get the win.\p" @@ -7222,7 +7222,7 @@ BattleFrontier_PokeNav_2AAAE4:: @ 82AAAE4 .string "Mine just won a battle!\p" .string "My {STR_VAR_2} was spectacular,\n" .string "I must say!\p" - .string "I wish I could’ve shown you!\n" + .string "I wish I could've shown you!\n" .string "See you again!$" BattleFrontier_PokeNav_2AAB8C:: @ 82AAB8C @@ -7239,25 +7239,25 @@ BattleFrontier_PokeNav_2AAC25:: @ 82AAC25 .string "This is {STR_VAR_1}.\p" .string "Been in any battles lately?\n" .string "I just won another one today!\p" - .string "I’m on a roll! Gahahaha!\n" + .string "I'm on a roll! Gahahaha!\n" .string "Well, see you!$" BattleFrontier_PokeNav_2AAC9D:: @ 82AAC9D .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\p" - .string "I trust you’ve been well?\n" - .string "I’m still bursting with life!\p" + .string "It's me, {STR_VAR_1}.\p" + .string "I trust you've been well?\n" + .string "I'm still bursting with life!\p" .string "Why, just now, I won another match.\n" - .string "I’m not stepping aside to you\l" + .string "I'm not stepping aside to you\l" .string "youngsters yet!$" BattleFrontier_PokeNav_2AAD41:: @ 82AAD41 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\p" - .string "I hope you’ve been keeping well.\n" + .string "I hope you've been keeping well.\n" .string "I still have a bounce in my step!\p" .string "Why, I just won a battle yet again.\n" - .string "Oh, I won’t lose to young people\l" + .string "Oh, I won't lose to young people\l" .string "quite yet!\p" .string "See you again!$" @@ -7272,28 +7272,28 @@ BattleFrontier_PokeNav_2AAE00:: @ 82AAE00 BattleFrontier_PokeNav_2AAE7F:: @ 82AAE7F .string "Hi! {PLAYER}, hello!\n" .string "This is {STR_VAR_1}.\p" - .string "Huh? Wait, you’re near\n" + .string "Huh? Wait, you're near\n" .string "{STR_VAR_2}?\p" .string "Oh, wow, we have to battle, then!\n" - .string "I’ll be waiting! See you!$" + .string "I'll be waiting! See you!$" BattleFrontier_PokeNav_2AAEF1:: @ 82AAEF1 .string "Hello, {PLAYER}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "Oh? You happen to be around\n" .string "{STR_VAR_2} right now?\p" .string "Would you like to battle now?\n" - .string "I’ll wait for you! See you!$" + .string "I'll wait for you! See you!$" BattleFrontier_PokeNav_2AAF69:: @ 82AAF69 .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\p" + .string "It's me, {STR_VAR_1}.\p" .string "Oh, hey, are you near\n" .string "{STR_VAR_2} right now?\p" .string "How would you like to battle with\n" .string "me right now?\p" - .string "I’m not losing again!\n" - .string "I’ll be waiting! Catch you soon!$" + .string "I'm not losing again!\n" + .string "I'll be waiting! Catch you soon!$" BattleFrontier_PokeNav_2AB010:: @ 82AB010 .string "Hey, {PLAYER}{STRING 5}.\n" @@ -7301,26 +7301,26 @@ BattleFrontier_PokeNav_2AB010:: @ 82AB010 .string "Whereabouts are you now?\n" .string "Huh? {STR_VAR_2}?\p" .string "Want to battle now?\n" - .string "I’ll wait for you. See you!$" + .string "I'll wait for you. See you!$" BattleFrontier_PokeNav_2AB076:: @ 82AB076 .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\l" + .string "It's {STR_VAR_1}.\l" .string "How are things with you?\p" - .string "You’re where now?\n" + .string "You're where now?\n" .string "{STR_VAR_2}?\p" .string "Well, how about we have a quick\n" .string "rematch right away?\p" - .string "I’ll keep an eye out for you.\n" + .string "I'll keep an eye out for you.\n" .string "See you soon!$" BattleFrontier_PokeNav_2AB11A:: @ 82AB11A .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\l" .string "How are your POKéMON keeping?\p" - .string "Oh, is that right? You’re around\n" + .string "Oh, is that right? You're around\n" .string "{STR_VAR_2}?\p" - .string "Well, then, we’d better have\n" + .string "Well, then, we'd better have\n" .string "a rematch.\p" .string "I can wait, sure.\n" .string "See you!$" @@ -7330,37 +7330,37 @@ BattleFrontier_PokeNav_2AB1B4:: @ 82AB1B4 .string "{STR_VAR_1} here…\p" .string "Oh, you happen to be around\n" .string "{STR_VAR_2}?\p" - .string "Then, let’s battle.\n" + .string "Then, let's battle.\n" .string "Right away, I mean.\p" - .string "I’ll show you my POKéMON.\n" - .string "I’ll wait for you.$" + .string "I'll show you my POKéMON.\n" + .string "I'll wait for you.$" BattleFrontier_PokeNav_2AB23D:: @ 82AB23D .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\p" - .string "I hope you’re doing well.\n" - .string "Oh, you’re near {STR_VAR_2}.\p" + .string "I hope you're doing well.\n" + .string "Oh, you're near {STR_VAR_2}.\p" .string "Would you like to have a battle\n" .string "with me, then?\p" - .string "I’ll wait for you.\n" + .string "I'll wait for you.\n" .string "See you soon!$" BattleFrontier_PokeNav_2AB2E9:: @ 82AB2E9 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "Are you keeping up?\n" - .string "Oh, you’re near {STR_VAR_2}?\p" - .string "Oh, well, then don’t you think we\n" + .string "Oh, you're near {STR_VAR_2}?\p" + .string "Oh, well, then don't you think we\n" .string "should battle?\p" - .string "Don’t keep me waiting too long!$" + .string "Don't keep me waiting too long!$" BattleFrontier_PokeNav_2AB382:: @ 82AB382 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "How are things with you?\n" - .string "Oh, you’re near {STR_VAR_2}.\p" + .string "Oh, you're near {STR_VAR_2}.\p" .string "We should have a battle now, then.\p" - .string "I’m ready and waiting.\n" + .string "I'm ready and waiting.\n" .string "Be quick!$" BattleFrontier_PokeNav_2AB410:: @ 82AB410 @@ -7369,16 +7369,16 @@ BattleFrontier_PokeNav_2AB410:: @ 82AB410 .string "Ah, so where you are now is\n" .string "{STR_VAR_2}?\p" .string "Well, then, we just have to have\n" - .string "a battle, don’t you think?\p" - .string "I’ll wait around for you!\n" + .string "a battle, don't you think?\p" + .string "I'll wait around for you!\n" .string "See you real quick!$" BattleFrontier_PokeNav_2AB4B0:: @ 82AB4B0 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\l" + .string "It's me, {STR_VAR_1}.\l" .string "Where might you be now?\p" .string "{STR_VAR_2}?\n" - .string "That’s quite close by!\p" + .string "That's quite close by!\p" .string "What do you say we have a battle\n" .string "now?\p" .string "I can wait.\n" @@ -7387,47 +7387,47 @@ BattleFrontier_PokeNav_2AB4B0:: @ 82AB4B0 BattleFrontier_PokeNav_2AB538:: @ 82AB538 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\p" - .string "I hope you’ve been keeping well.\n" - .string "Oh, you’re near {STR_VAR_2}?\p" - .string "Since that’s not very far away,\n" + .string "I hope you've been keeping well.\n" + .string "Oh, you're near {STR_VAR_2}?\p" + .string "Since that's not very far away,\n" .string "come see me for a battle.\p" - .string "I’ll wait for you.\n" + .string "I'll wait for you.\n" .string "Bye for now.$" BattleFrontier_PokeNav_2AB5E4:: @ 82AB5E4 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" - .string "You’re what? …{STR_VAR_2}?\n" - .string "That’s very close.\p" - .string "Don’t you think we ought to have\n" + .string "You're what? …{STR_VAR_2}?\n" + .string "That's very close.\p" + .string "Don't you think we ought to have\n" .string "a battle?\p" - .string "I’ll be looking for you!\n" + .string "I'll be looking for you!\n" .string "Bye-bye!$" BattleFrontier_PokeNav_2AB670:: @ 82AB670 .string "Hi! {PLAYER}, hello!\n" .string "This is {STR_VAR_1}.\p" .string "Want to have a battle with me?\p" - .string "I’ll be waiting for you around\n" + .string "I'll be waiting for you around\n" .string "{STR_VAR_2}!$" BattleFrontier_PokeNav_2AB6CD:: @ 82AB6CD .string "Hello, {PLAYER}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "Would you like to have a battle\n" .string "with me again?\p" .string "You can find me around\n" - .string "{STR_VAR_2}. I’ll be waiting!$" + .string "{STR_VAR_2}. I'll be waiting!$" BattleFrontier_PokeNav_2AB73C:: @ 82AB73C .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\p" + .string "It's me, {STR_VAR_1}.\p" .string "My POKéMON have grown a lot\n" .string "tougher since last time.\p" - .string "I want to see how strong they’ve\n" + .string "I want to see how strong they've\n" .string "become with your POKéMON, {PLAYER}.\p" - .string "So, let’s have a battle!\p" - .string "I’ll be waiting for you around\n" + .string "So, let's have a battle!\p" + .string "I'll be waiting for you around\n" .string "{STR_VAR_2}.$" BattleFrontier_PokeNav_2AB808:: @ 82AB808 @@ -7438,24 +7438,24 @@ BattleFrontier_PokeNav_2AB808:: @ 82AB808 .string "tough lately.\p" .string "Hey, how would you like to have\n" .string "another battle with me?\p" - .string "Let’s meet up around\n" + .string "Let's meet up around\n" .string "{STR_VAR_2}, okay?$" BattleFrontier_PokeNav_2AB8B7:: @ 82AB8B7 .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "My POKéMON are growing up in\n" .string "decent ways.\p" - .string "I’d really like to have another\n" + .string "I'd really like to have another\n" .string "battle with you.\p" - .string "I’ll keep an eye out for you around\n" + .string "I'll keep an eye out for you around\n" .string "{STR_VAR_2}. See you soon!$" BattleFrontier_PokeNav_2AB95D:: @ 82AB95D .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\l" - .string "I hope you’re on top of things.\p" - .string "I was thinking I’d like another\n" + .string "I hope you're on top of things.\p" + .string "I was thinking I'd like another\n" .string "battle with you. What do you say?\p" .string "If you feel like a battle,\n" .string "come to {STR_VAR_2}.\p" @@ -7466,19 +7466,19 @@ BattleFrontier_PokeNav_2ABA03:: @ 82ABA03 .string "{STR_VAR_1} here…\l" .string "So? Are your POKéMON growing?\p" .string "Mine sure got stronger.\n" - .string "I’d like to show you.\p" - .string "I’ll be around {STR_VAR_2}.\n" + .string "I'd like to show you.\p" + .string "I'll be around {STR_VAR_2}.\n" .string "Come see me for a match.\p" .string "See you around.$" BattleFrontier_PokeNav_2ABA9F:: @ 82ABA9F .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\p" - .string "I hope you’re doing well.\n" + .string "I hope you're doing well.\n" .string "My POKéMON are very frisky.\p" - .string "If you’re ever in the area, please\n" + .string "If you're ever in the area, please\n" .string "give me a rematch.\p" - .string "I’ll be around {STR_VAR_2}.\n" + .string "I'll be around {STR_VAR_2}.\n" .string "Until then, good-bye!$" BattleFrontier_PokeNav_2ABB62:: @ 82ABB62 @@ -7486,9 +7486,9 @@ BattleFrontier_PokeNav_2ABB62:: @ 82ABB62 .string "This is {STR_VAR_1}!\l" .string "How are your POKéMON doing?\p" .string "My POKéMON keep getting better.\n" - .string "I’d like to show you, {PLAYER}{STRING 5}.\p" - .string "I’m around {STR_VAR_2} now,\n" - .string "so let’s battle if you’re close by.\p" + .string "I'd like to show you, {PLAYER}{STRING 5}.\p" + .string "I'm around {STR_VAR_2} now,\n" + .string "so let's battle if you're close by.\p" .string "Hope I see you soon!$" BattleFrontier_PokeNav_2ABC26:: @ 82ABC26 @@ -7497,10 +7497,10 @@ BattleFrontier_PokeNav_2ABC26:: @ 82ABC26 .string "So, how are things with you?\p" .string "My POKéMON have grown much\n" .string "stronger than before.\p" - .string "I’d love another battle with you,\n" + .string "I'd love another battle with you,\n" .string "{PLAYER}{STRING 5}.\p" - .string "I’ll be around {STR_VAR_2}.\n" - .string "Come see me if you’re close.$" + .string "I'll be around {STR_VAR_2}.\n" + .string "Come see me if you're close.$" BattleFrontier_PokeNav_2ABCE9:: @ 82ABCE9 .string "Ah, {PLAYER}{STRING 5}.\n" @@ -7509,17 +7509,17 @@ BattleFrontier_PokeNav_2ABCE9:: @ 82ABCE9 .string "My POKéMON are full of life.\n" .string "They appear to be looking forward\l" .string "to seeing your POKéMON, {PLAYER}{STRING 5}.\p" - .string "I’m around {STR_VAR_2} now.\n" - .string "I hope you’ll seek us out.$" + .string "I'm around {STR_VAR_2} now.\n" + .string "I hope you'll seek us out.$" BattleFrontier_PokeNav_2ABDA2:: @ 82ABDA2 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\p" + .string "It's me, {STR_VAR_1}.\p" .string "I should tell you, my POKéMON have\n" .string "grown to be quite robust lately.\p" .string "I would like to see them in a battle\n" .string "with you, {PLAYER}{STRING 5}.\p" - .string "We’ll be around {STR_VAR_2}.\n" + .string "We'll be around {STR_VAR_2}.\n" .string "Come see us anytime!$" BattleFrontier_PokeNav_2ABE5E:: @ 82ABE5E @@ -7527,10 +7527,10 @@ BattleFrontier_PokeNav_2ABE5E:: @ 82ABE5E .string "This is {STR_VAR_1}!\l" .string "Are your POKéMON keeping well?\p" .string "My POKéMON have been so healthy,\n" - .string "they don’t look capable of losing!\p" + .string "they don't look capable of losing!\p" .string "I would surely love to have another\n" .string "battle with you.\p" - .string "If you’re near {STR_VAR_2},\n" + .string "If you're near {STR_VAR_2},\n" .string "do come see us.$" BattleFrontier_PokeNav_2ABF36:: @ 82ABF36 @@ -7539,19 +7539,19 @@ BattleFrontier_PokeNav_2ABF36:: @ 82ABF36 .string "Keeping well, I hope.\p" .string "Oh, yes! My POKéMON are\n" .string "much stronger than before.\p" - .string "Don’t you think we ought to have\n" + .string "Don't you think we ought to have\n" .string "a battle, {PLAYER}{STRING 5}?\p" - .string "We’ll be waiting for you around\n" + .string "We'll be waiting for you around\n" .string "{STR_VAR_2}.\p" .string "Come see us anytime, okay?$" BattleFrontier_PokeNav_2AC009:: @ 82AC009 - .string "It’s me, the mountain-loving\n" + .string "It's me, the mountain-loving\n" .string "{STR_VAR_1}!\p" .string "Well, since we met, have you grown\n" .string "to appreciate the mountains more?\p" .string "I rarely see you in the mountains…\p" - .string "Next time, we’ll meet somewhere\n" + .string "Next time, we'll meet somewhere\n" .string "around {STR_VAR_2}.$" BattleFrontier_PokeNav_2AC0BD:: @ 82AC0BD @@ -7561,14 +7561,14 @@ BattleFrontier_PokeNav_2AC0BD:: @ 82AC0BD .string "about you.\p" .string "I told her about a strong TRAINER\n" .string "who raises POKéMON with care.\p" - .string "I hope you’ll become a TRAINER\n" + .string "I hope you'll become a TRAINER\n" .string "that everyone will admire.\p" .string "I hope we meet again!$" BattleFrontier_PokeNav_2AC18C:: @ 82AC18C - .string "Hello! It’s {STR_VAR_1}.\p" + .string "Hello! It's {STR_VAR_1}.\p" .string "I love where I am now.\n" - .string "It’s pleasant with sweet aromas!\p" + .string "It's pleasant with sweet aromas!\p" .string "I think someone planted BERRIES,\n" .string "and they burst into bloom.\p" .string "See you again sometime!$" @@ -7576,62 +7576,62 @@ BattleFrontier_PokeNav_2AC18C:: @ 82AC18C BattleFrontier_PokeNav_2AC228:: @ 82AC228 .string "Hello! Thirty years of exploration,\n" .string "{STR_VAR_1} at your service!\p" - .string "It seems that you’re energetically\n" + .string "It seems that you're energetically\n" .string "traveling here and there.\p" .string "Have you discovered any new ruins?\n" .string "Please tell if you have!\p" - .string "Now, if you’ll excuse me,\n" + .string "Now, if you'll excuse me,\n" .string "I have ruins to explore.$" BattleFrontier_PokeNav_2AC30C:: @ 82AC30C - .string "It’s {STR_VAR_1}!\p" - .string "Know what I’m doing today?\n" + .string "It's {STR_VAR_1}!\p" + .string "Know what I'm doing today?\n" .string "Looking at waves from the beach!\p" .string "Sigh… The waves are all sparkly.\n" .string "The sea is the prettiest from here.\l" - .string "I’m getting hungry, so bye-bye!$" + .string "I'm getting hungry, so bye-bye!$" BattleFrontier_PokeNav_2AC3B6:: @ 82AC3B6 .string "Munch-chew…\n" - .string "Oh, hi, it’s {STR_VAR_1}.\l" + .string "Oh, hi, it's {STR_VAR_1}.\l" .string "I love eating on the beach.\p" .string "My POKéMON and I have been doing\n" - .string "great. We’re fully fueled!\l" - .string "I’m going for a swim. Bye!$" + .string "great. We're fully fueled!\l" + .string "I'm going for a swim. Bye!$" BattleFrontier_PokeNav_2AC446:: @ 82AC446 .string "Hello, this is {STR_VAR_1}…\p" - .string "I’ve grown a little jaded with this\n" + .string "I've grown a little jaded with this\n" .string "whole COOLTRAINER thing…\p" - .string "Everyone thinks I’m a perfect\n" + .string "Everyone thinks I'm a perfect\n" .string "TRAINER, and that makes me try to\l" .string "live up to that expectation.\p" .string "But I guess that goes with being\n" .string "a COOLTRAINER.\p" - .string "I’ll just have to buckle down…\n" + .string "I'll just have to buckle down…\n" .string "and grin and bear it.\p" - .string "You’re the only person that I could\n" + .string "You're the only person that I could\n" .string "confide in like this.\p" .string "But when I see you next,\n" - .string "don’t worry, I won’t whine!$" + .string "don't worry, I won't whine!$" BattleFrontier_PokeNav_2AC5C7:: @ 82AC5C7 - .string "Yahoo, it’s {STR_VAR_1}!\n" + .string "Yahoo, it's {STR_VAR_1}!\n" .string "How do you do?\p" - .string "I’ve been raising my POKéMON with\n" + .string "I've been raising my POKéMON with\n" .string "you as the target.\p" - .string "I don’t intend to lose when we\n" + .string "I don't intend to lose when we\n" .string "battle again.\p" - .string "Isn’t it great to have TRAINER\n" - .string "friends? Let’s meet again!$" + .string "Isn't it great to have TRAINER\n" + .string "friends? Let's meet again!$" BattleFrontier_PokeNav_2AC682:: @ 82AC682 - .string "It’s {STR_VAR_1}…\n" + .string "It's {STR_VAR_1}…\n" .string "Right now, behind you…\l" - .string "Wasn’t there something…?\p" + .string "Wasn't there something…?\p" .string "The power of the POKéMON that\n" .string "sleep here at MT. PYRE…\p" - .string "It’s telling me about you…\p" + .string "It's telling me about you…\p" .string "You should walk away quickly and\n" .string "never once look back…\p" .string "Giggle…\n" @@ -7640,24 +7640,24 @@ BattleFrontier_PokeNav_2AC682:: @ 82AC682 BattleFrontier_PokeNav_2AC755:: @ 82AC755 .string "This is {STR_VAR_1}.\n" .string "How do you do?\p" - .string "Isn’t it convenient that we can\n" + .string "Isn't it convenient that we can\n" .string "chat like this at a distance?\p" .string "Before, if I wanted to speak with\n" .string "anyone, I had to have my father\l" .string "drive me…\p" .string "I should be going now.\n" - .string "I’m glad we had this chat.$" + .string "I'm glad we had this chat.$" BattleFrontier_PokeNav_2AC82C:: @ 82AC82C - .string "It’s {STR_VAR_1}!\n" + .string "It's {STR_VAR_1}!\n" .string "Will you listen to this?\p" .string "I like the SAFARI ZONE a lot,\n" .string "but whenever I go, I get lost!\p" .string "All that tall grass!\n" - .string "And it’s much too spread out!\p" + .string "And it's much too spread out!\p" .string "I feel better getting that off\n" .string "my chest!\p" - .string "I’m off to the SAFARI ZONE again!\n" + .string "I'm off to the SAFARI ZONE again!\n" .string "Catch you!$" BattleFrontier_PokeNav_2AC914:: @ 82AC914 @@ -7665,33 +7665,33 @@ BattleFrontier_PokeNav_2AC914:: @ 82AC914 .string "Yes, correct, I am rich, yes.\p" .string "I should tell you, my wealth has\n" .string "grown since we last met.\p" - .string "What’s more, my POKéMON have also\n" + .string "What's more, my POKéMON have also\n" .string "grown stronger.\p" - .string "I can’t shake the feeling that\n" + .string "I can't shake the feeling that\n" .string "this world exists for me!\p" .string "Oh, no need to say a word!\n" - .string "Everyone knows it’s true!\p" + .string "Everyone knows it's true!\p" .string "Oh, you must excuse me, I have this\n" .string "formal dinner to attend.$" BattleFrontier_PokeNav_2ACA59:: @ 82ACA59 .string "Ufufufufu…\n" - .string "It’s me, {STR_VAR_1}…\p" - .string "Can you guess what I’m seeing?\n" + .string "It's me, {STR_VAR_1}…\p" + .string "Can you guess what I'm seeing?\n" .string "A pair of {STR_VAR_2} in a battle.\p" - .string "Maybe I’ll try catching the winner…\n" + .string "Maybe I'll try catching the winner…\n" .string "Ufufufufufu…\p" - .string "I… I’m kind of busy now.\n" + .string "I… I'm kind of busy now.\n" .string "I have to go.$" BattleFrontier_PokeNav_2ACB02:: @ 82ACB02 - .string "Oh, it’s {STR_VAR_1}!\p" - .string "I was just thinking I’m getting\n" + .string "Oh, it's {STR_VAR_1}!\p" + .string "I was just thinking I'm getting\n" .string "bored of the ABANDONED SHIP.\p" - .string "But since I’m already here,\n" + .string "But since I'm already here,\n" .string "and I want to beat you once,\l" - .string "I’ll be sticking around a bit more.\p" - .string "If you feel compelled, why don’t\n" + .string "I'll be sticking around a bit more.\p" + .string "If you feel compelled, why don't\n" .string "you come see me?\p" .string "I think today will be the day that\n" .string "I finally challenge the man next\l" @@ -7699,7 +7699,7 @@ BattleFrontier_PokeNav_2ACB02:: @ 82ACB02 .string "Be seeing you!$" BattleFrontier_PokeNav_2ACC3F:: @ 82ACC3F - .string "I’m {STR_VAR_1}!\n" + .string "I'm {STR_VAR_1}!\n" .string "The man of the sea!\p" .string "You know what I think?\p" .string "The TRAINERS out at sea are\n" @@ -7707,59 +7707,59 @@ BattleFrontier_PokeNav_2ACC3F:: @ 82ACC3F .string "You should learn from me and train\n" .string "in the sea…\p" .string "Whoops, giant surf rising!\p" - .string "It’s a great training opportunity!\n" + .string "It's a great training opportunity!\n" .string "Sorry, but I have to go!$" BattleFrontier_PokeNav_2ACD2F:: @ 82ACD2F - .string "It’s {STR_VAR_1}! Listen, I’ve been\n" + .string "It's {STR_VAR_1}! Listen, I've been\n" .string "teaching karate to my POKéMON.\p" - .string "But now they’re better than me!\n" - .string "I’ve done nothing but lose to them!\p" + .string "But now they're better than me!\n" + .string "I've done nothing but lose to them!\p" .string "But even though I may lose to\n" - .string "POKéMON, I won’t lose to another\l" + .string "POKéMON, I won't lose to another\l" .string "TRAINER, no sir!\p" .string "We have to battle again!\n" .string "Ugwaah!$" BattleFrontier_PokeNav_2ACE1E:: @ 82ACE1E - .string "It’s me, {STR_VAR_1}.\n" - .string "How’re your travels unwinding?\p" + .string "It's me, {STR_VAR_1}.\n" + .string "How're your travels unwinding?\p" .string "…Whoa, is that right?\n" .string "Sounds awfully stimulating!\p" .string "I think I could write a song about\n" .string "one of your episodes.\p" - .string "…Oh, hey, I’m feeling it.\n" + .string "…Oh, hey, I'm feeling it.\n" .string "I hear the riffs in my head.\p" - .string "I’d better get this tune properly\n" - .string "written, so I’ve got to fly! Later!$" + .string "I'd better get this tune properly\n" + .string "written, so I've got to fly! Later!$" BattleFrontier_PokeNav_2ACF32:: @ 82ACF32 .string "This is {STR_VAR_1}…\n" .string "Hear my new song.\p" .string "Lalala, {STR_VAR_2}, {STR_VAR_2}!\n" .string "Why are you that {STR_VAR_2}?\l" - .string "Why can’t I be you, {STR_VAR_2}?\l" + .string "Why can't I be you, {STR_VAR_2}?\l" .string "Lala, {STR_VAR_2} and {STR_VAR_1},\l" .string "{STR_VAR_1} and {STR_VAR_2}…\p" .string "Repeat chorus, fade…$" BattleFrontier_PokeNav_2ACFBE:: @ 82ACFBE - .string "I’m {STR_VAR_1}, you know,\n" + .string "I'm {STR_VAR_1}, you know,\n" .string "the camping expert!\p" - .string "When we battled, I couldn’t help\n" + .string "When we battled, I couldn't help\n" .string "but lose to you.\p" .string "After all, my expertise is in\n" .string "camping.\p" .string "But win or lose, I like to battle\n" - .string "when I’m camping.\p" + .string "when I'm camping.\p" .string "Battle with us again, okay?\n" - .string "Oh, and let’s go camping, too!$" + .string "Oh, and let's go camping, too!$" BattleFrontier_PokeNav_2AD0AC:: @ 82AD0AC - .string "It’s me, me, {STR_VAR_1}!\p" - .string "I’d like to climb other mountains\n" + .string "It's me, me, {STR_VAR_1}!\p" + .string "I'd like to climb other mountains\n" .string "than this one, to be honest.\p" - .string "But I’m not sure if there’d be any\n" + .string "But I'm not sure if there'd be any\n" .string "ladies like on MT. CHIMNEY.\p" .string "If you know any other mountain\n" .string "with ladies around, let me know!\p" @@ -7768,10 +7768,10 @@ BattleFrontier_PokeNav_2AD0AC:: @ 82AD0AC BattleFrontier_PokeNav_2AD194:: @ 82AD194 .string "… … … … … …\n" .string "… … … … … …\l" - .string "It’s {STR_VAR_1}…\p" + .string "It's {STR_VAR_1}…\p" .string "… … … … … …\n" .string "… … … … … …\l" - .string "That’s all today…$" + .string "That's all today…$" BattleFrontier_PokeNav_2AD1DF:: @ 82AD1DF .string "This is {STR_VAR_1}. Today, I had\n" @@ -7780,100 +7780,100 @@ BattleFrontier_PokeNav_2AD1DF:: @ 82AD1DF .string "by day and by night.\p" .string "You have a rival like that, yes?\n" .string "I wish it were me…\p" - .string "I’m glad you heard me out.\n" + .string "I'm glad you heard me out.\n" .string "See you!$" BattleFrontier_PokeNav_2AD2A8:: @ 82AD2A8 - .string "It’s {STR_VAR_1}.\p" - .string "When there’s a strong TRAINER\n" + .string "It's {STR_VAR_1}.\p" + .string "When there's a strong TRAINER\n" .string "nearby, I can sometimes sense that\l" .string "somehow.\p" .string "Did you pass close by, {PLAYER}{STRING 5}?\n" .string "Maybe it was you.\p" - .string "I’ll be waiting for your visit.\n" + .string "I'll be waiting for your visit.\n" .string "Bye!$" BattleFrontier_PokeNav_2AD34F:: @ 82AD34F .string "Hello, this is {STR_VAR_1}.\n" .string "You sound well, {PLAYER}{STRING 5}.\p" - .string "I’ve traveled around the world,\n" - .string "but I must say I’ve taken a great\l" + .string "I've traveled around the world,\n" + .string "but I must say I've taken a great\l" .string "shine to this region.\p" .string "I plan to stay here a while.\n" .string "Perhaps we can meet again?\p" - .string "I’ve not forgotten your dazzling\n" + .string "I've not forgotten your dazzling\n" .string "techniques.\p" .string "I do hope for a rematch.$" BattleFrontier_PokeNav_2AD44E:: @ 82AD44E - .string "Snivel… It’s… {STR_VAR_1}…\n" + .string "Snivel… It's… {STR_VAR_1}…\n" .string "…Sob…\p" .string "ROXANNE chewed me out in class\n" .string "today.\p" - .string "But I don’t dislike her or anything.\p" + .string "But I don't dislike her or anything.\p" .string "ROXANNE tells me exactly what\n" .string "I did wrong so I can learn from it.\p" - .string "You bet I’ll be going to\n" - .string "the TRAINER’S SCHOOL tomorrow!\p" + .string "You bet I'll be going to\n" + .string "the TRAINER'S SCHOOL tomorrow!\p" .string "See you later!$" BattleFrontier_PokeNav_2AD53A:: @ 82AD53A - .string "It’s {STR_VAR_1}!\p" + .string "It's {STR_VAR_1}!\p" .string "ROXANNE let me battle with her\n" .string "yesterday.\p" .string "The results…\n" .string "Terrible, like you needed to ask.\p" .string "But I was delighted that ROXANNE\n" .string "would even let me challenge her!\p" - .string "You wouldn’t believe how much\n" + .string "You wouldn't believe how much\n" .string "more I admire her!\p" - .string "I’m going to really focus and work!\n" - .string "I’d better go!$" + .string "I'm going to really focus and work!\n" + .string "I'd better go!$" BattleFrontier_PokeNav_2AD642:: @ 82AD642 - .string "Hi, it’s ANNA! I’m with my junior\n" + .string "Hi, it's ANNA! I'm with my junior\n" .string "partner MEG again today.\p" .string "I really love caring for MEG and\n" - .string "POKéMON. They’re so cute!\p" + .string "POKéMON. They're so cute!\p" .string "I wish I could look after them\n" .string "as if they were my siblings!\p" .string "Oh, hi, MEG!\n" .string "Did you get the buns?\p" - .string "Huh? No, no, I’m not treating you\n" + .string "Huh? No, no, I'm not treating you\n" .string "like my personal slave!\p" .string "You lost the match, so you have\n" .string "to go buy the bread as punishment!\p" - .string "I wouldn’t treat you like a slave,\n" - .string "MEG! You’re too special to me!\p" + .string "I wouldn't treat you like a slave,\n" + .string "MEG! You're too special to me!\p" .string "I have to go now.\n" - .string "It’s time for our snack!$" + .string "It's time for our snack!$" BattleFrontier_PokeNav_2AD801:: @ 82AD801 .string "I love POKéMON!\n" - .string "It’s {STR_VAR_1} from the FAN CLUB!\p" + .string "It's {STR_VAR_1} from the FAN CLUB!\p" .string "You have to hear this!\n" .string "My sweet POKéMON…\p" .string "Snort! Wahaha!\n" - .string "I can’t say any more! It’s a secret!\l" - .string "It’s just too cute for words!\p" + .string "I can't say any more! It's a secret!\l" + .string "It's just too cute for words!\p" .string "Oh, my sweet {STR_VAR_2} is begging\n" .string "for a {POKEBLOCK}!\p" - .string "It’s the picture of cuteness!\p" - .string "Sorry, but I can’t talk now!\n" - .string "You’ll have to hear this next time!$" + .string "It's the picture of cuteness!\p" + .string "Sorry, but I can't talk now!\n" + .string "You'll have to hear this next time!$" BattleFrontier_PokeNav_2AD92E:: @ 82AD92E .string "Ohoho!\p" - .string "This is {STR_VAR_1}! I can’t wait to\n" + .string "This is {STR_VAR_1}! I can't wait to\n" .string "tell you about my darling POKéMON!\p" .string "Please, you must listen to this.\n" - .string "It’s about my darling {STR_VAR_2}.\p" + .string "It's about my darling {STR_VAR_2}.\p" .string "Whenever anyone picks it up,\n" .string "it leaps straight into my arms!\p" .string "Oh… Oh… Could there be anything\n" .string "more blissful?\p" .string "Oh, it feels so heavenly!\p" - .string "I’m so glad I could share some of\n" + .string "I'm so glad I could share some of\n" .string "my happiness with you.\p" .string "Well, I must be going.\n" .string "Bye, now!$" @@ -7891,58 +7891,58 @@ BattleFrontier_PokeNav_2ADA8F:: @ 82ADA8F .string "I shall leave you in good spirits!$" BattleFrontier_PokeNav_2ADB9B:: @ 82ADB9B - .string "It’s {STR_VAR_1}.\n" - .string "I’m glad to chat with you!\p" + .string "It's {STR_VAR_1}.\n" + .string "I'm glad to chat with you!\p" .string "I am feeling alive and refreshed\n" .string "soaking in this hot-spring tub.\p" - .string "I’ve been battling young TRAINERS\n" - .string "since we met, but you’re still\l" + .string "I've been battling young TRAINERS\n" + .string "since we met, but you're still\l" .string "the best of the lot.\p" - .string "I imagine you’ll become an EXPERT\n" + .string "I imagine you'll become an EXPERT\n" .string "in your old age! Ohohoho…$" BattleFrontier_PokeNav_2ADC92:: @ 82ADC92 .string "Yay! This is {STR_VAR_1}!\n" - .string "What’s up?\p" + .string "What's up?\p" .string "I might be imagining this, but when\n" .string "I win battles, my shorts seem to\l" .string "feel, like, better. Materially.\p" .string "What do I mean by that?\n" - .string "It’s kind of hard to explain, but…\l" + .string "It's kind of hard to explain, but…\l" .string "How would I say this now…\l" .string "My shorts feel silkier!\p" .string "And when I battled you, {PLAYER}{STRING 5},\n" .string "my shorts felt icky and coarse.\p" .string "… … … … … …\n" - .string "You didn’t really believe that?\l" - .string "Ehehehe, that’s all! Bye now!$" + .string "You didn't really believe that?\l" + .string "Ehehehe, that's all! Bye now!$" BattleFrontier_PokeNav_2ADE08:: @ 82ADE08 .string "Ahoy!\n" .string "{STR_VAR_1} here!\p" - .string "As always, I’m fishing with wild\n" + .string "As always, I'm fishing with wild\n" .string "abandon!\p" .string "Are there other places I can fish\n" .string "than the sea and rivers?\p" .string "I get these powerful urges to\n" .string "fish just about anywhere!\p" .string "Oh, gosh, darn it!\n" - .string "My line’s tangled up!\p" + .string "My line's tangled up!\p" .string "Gotta go!\n" .string "Find me some new fishing spots!$" BattleFrontier_PokeNav_2ADF07:: @ 82ADF07 - .string "Hey, there! It’s {STR_VAR_1}.\n" + .string "Hey, there! It's {STR_VAR_1}.\n" .string "Are you taking it casually?\p" .string "Ever since I was a kid, you know,\n" - .string "I’ve always been placid, huh?\p" + .string "I've always been placid, huh?\p" .string "I never was much for getting all\n" .string "stressed or rushing things.\p" - .string "But wouldn’t you know it,\n" - .string "I’m now a TRIATHLETE.\p" - .string "You just can’t tell where life will\n" + .string "But wouldn't you know it,\n" + .string "I'm now a TRIATHLETE.\p" + .string "You just can't tell where life will\n" .string "take you, if you get my drift.\p" - .string "You’re a TRAINER now, but who\n" + .string "You're a TRAINER now, but who\n" .string "knows what the future holds, huh?\p" .string "Imagine yourself as a teacher,\n" .string "or maybe an artist. Cool, huh?\p" @@ -7951,52 +7951,52 @@ BattleFrontier_PokeNav_2ADF07:: @ 82ADF07 BattleFrontier_PokeNav_2AE0D9:: @ 82AE0D9 .string "This is {STR_VAR_1}!\n" - .string "I’m cycling right now.\p" + .string "I'm cycling right now.\p" .string "I love swimming and running,\n" .string "but cycling is my first love!\p" .string "It makes my whole body feel as if\n" - .string "I’m one with the wind.\p" + .string "I'm one with the wind.\p" .string "It exhilarates me as if I were\n" .string "flying!\p" - .string "Okay! Today, I’m going to set a new\n" + .string "Okay! Today, I'm going to set a new\n" .string "CYCLING ROAD record!\p" .string "You should make the challenge, too!\n" .string "See you!$" BattleFrontier_PokeNav_2AE1FD:: @ 82AE1FD - .string "Yo, this is {STR_VAR_1}! I’m smack\n" + .string "Yo, this is {STR_VAR_1}! I'm smack\n" .string "in the middle of a triathlon!\p" - .string "But, hey, I’ve always got time to\n" + .string "But, hey, I've always got time to\n" .string "shoot the breeze!\p" .string "Working out with POKéMON feels\n" .string "mighty good!\p" .string "Without exchanging words, we synch\n" .string "as if we shared a heart.\p" - .string "It’s inspiring!\p" + .string "It's inspiring!\p" .string "Gasp… Chatting while running…\n" - .string "I’m getting run down…\l" + .string "I'm getting run down…\l" .string "Gasp… Have…to…go…$" BattleFrontier_PokeNav_2AE327:: @ 82AE327 - .string "Hi, it’s {STR_VAR_1}.\n" + .string "Hi, it's {STR_VAR_1}.\n" .string "If you want to improve endurance,\l" .string "high-altitude training is it!\p" .string "Try running on a mountaintop.\n" - .string "You’ll be gasping in no time!\p" - .string "I’m getting oxygen starved, too!\n" + .string "You'll be gasping in no time!\p" + .string "I'm getting oxygen starved, too!\n" .string "See you!$" BattleFrontier_PokeNav_2AE3DA:: @ 82AE3DA - .string "Oh, it’s {STR_VAR_1}, hello.\p" - .string "I’ve been swimming a lot but I still\n" - .string "can’t seem to reach EVERGRANDE.\p" - .string "Maybe I’m just going in circles.\p" - .string "No, no, that can’t be possible.\n" + .string "Oh, it's {STR_VAR_1}, hello.\p" + .string "I've been swimming a lot but I still\n" + .string "can't seem to reach EVERGRANDE.\p" + .string "Maybe I'm just going in circles.\p" + .string "No, no, that can't be possible.\n" .string "Wahahaha.\l" .string "Take care!$" BattleFrontier_PokeNav_2AE489:: @ 82AE489 - .string "Hey, it’s {STR_VAR_1}…\n" + .string "Hey, it's {STR_VAR_1}…\n" .string "Whoops!\p" .string "Splash!\p" .string "Blug-blug-blug-blug…\p" @@ -8006,17 +8006,17 @@ BattleFrontier_PokeNav_2AE489:: @ 82AE489 .string "I just put on some suntan oil.\p" .string "So my POKéNAV went whoopsy\n" .string "out of my hand into the water!\p" - .string "But, boy, DEVON’s POKéNAV is built\n" + .string "But, boy, DEVON's POKéNAV is built\n" .string "tough. It survived that dunking!\p" - .string "Anyways, I’m busy sunbathing,\n" - .string "so let’s chat another time.$" + .string "Anyways, I'm busy sunbathing,\n" + .string "so let's chat another time.$" BattleFrontier_PokeNav_2AE5CD:: @ 82AE5CD .string "Hello, this is {STR_VAR_1}.\p" .string "Out of the three triathlon events,\n" .string "I like swimming best.\p" .string "But if I stay in the sea too long,\n" - .string "won’t I get all prune-like?\p" + .string "won't I get all prune-like?\p" .string "Ooh, triathlon is such a grueling\n" .string "test of human endurance! Bye!$" @@ -8031,7 +8031,7 @@ BattleFrontier_PokeNav_2AE704:: @ 82AE704 .string "{STR_VAR_1} here.\p" .string "My {STR_VAR_2} has grown even more\n" .string "tough than that last time.\p" - .string "I’m not going to lose again to you.\n" + .string "I'm not going to lose again to you.\n" .string "You wait till next time!\p" .string "See you around!$" @@ -8060,65 +8060,65 @@ BattleFrontier_PokeNav_2AE8E6:: @ 82AE8E6 .string "ash will stop falling?\p" .string "If it gets too deep, it will cover\n" .string "up the pattern on my parasol…\p" - .string "Let’s promise to meet again!$" + .string "Let's promise to meet again!$" BattleFrontier_PokeNav_2AE998:: @ 82AE998 .string "Hi, {STR_VAR_1} here.\p" - .string "Did you know that it’s easier to\n" + .string "Did you know that it's easier to\n" .string "float in the sea than a pool?\p" .string "Just by lying still, your body will\n" .string "float on its own.\p" .string "But if you float for too long,\n" - .string "watch that you don’t get carried\l" + .string "watch that you don't get carried\l" .string "off too far out.\p" .string "…Where am I, anyway?\n" - .string "I’d better go!$" + .string "I'd better go!$" BattleFrontier_PokeNav_2AEA8F:: @ 82AEA8F .string "Oh, {PLAYER}{STRING 5}, hello!\n" .string "This is {STR_VAR_1}.\l" - .string "I’m up in the mountains now.\p" + .string "I'm up in the mountains now.\p" .string "But the ground is too bumpy.\n" - .string "I can’t pitch my tent here…\p" + .string "I can't pitch my tent here…\p" .string "Oh, I had a brilliant idea!\p" .string "Maybe I can get my POKéMON to tamp\n" .string "the ground flat here!\p" - .string "I’m going to try that!\n" + .string "I'm going to try that!\n" .string "Bye-bye!$" BattleFrontier_PokeNav_2AEB77:: @ 82AEB77 .string "Oh, hi, hi, this is {STR_VAR_1}!\p" - .string "I’m raising POKéMON with LIV!\n" - .string "We’re trying very hard!\p" + .string "I'm raising POKéMON with LIV!\n" + .string "We're trying very hard!\p" .string "If we try harder, can we become\n" .string "number one? Bye-bye!$" BattleFrontier_PokeNav_2AEBFA:: @ 82AEBFA .string "{STR_VAR_1} here!\p" - .string "I’m a SAILOR, but I’m not on a boat\n" + .string "I'm a SAILOR, but I'm not on a boat\n" .string "now.\p" .string "It makes me wonder--what should\n" .string "a SAILOR on land be called?\p" - .string "That’s what I’ve been thinking\n" + .string "That's what I've been thinking\n" .string "while staring out across the waves.\p" .string "All right, next time!$" BattleFrontier_PokeNav_2AECC1:: @ 82AECC1 - .string "It’s {STR_VAR_1}.\n" + .string "It's {STR_VAR_1}.\n" .string "So? Get any more POKéMON?\p" .string "If you catch a new POKéMON,\n" .string "you have to come show me.\p" - .string "I won’t whine for it, honest.\n" - .string "I’ll be waiting. See you.$" + .string "I won't whine for it, honest.\n" + .string "I'll be waiting. See you.$" BattleFrontier_PokeNav_2AED52:: @ 82AED52 .string "This is {STR_VAR_1}.\p" .string "Are you raising your POKéMON\n" .string "in the optimal way?\p" .string "The air is clean where I am.\n" - .string "It’s the perfect environment for\l" + .string "It's the perfect environment for\l" .string "raising POKéMON.\p" - .string "If you’re going to focus on raising\n" + .string "If you're going to focus on raising\n" .string "POKéMON, you should come out to\l" .string "{STR_VAR_2}. Take care now.$" @@ -8139,23 +8139,23 @@ BattleFrontier_PokeNav_2AEEF4:: @ 82AEEF4 .string "cooperate with POKéMON more.\p" .string "That would be ideal.\n" .string "I really think so.\p" - .string "I think you’re on the right track!\n" + .string "I think you're on the right track!\n" .string "Catch you later!$" BattleFrontier_PokeNav_2AEFDA:: @ 82AEFDA - .string "Hi, it’s {STR_VAR_1}. You know,\n" - .string "the TRAINER who’s always prepared!\p" + .string "Hi, it's {STR_VAR_1}. You know,\n" + .string "the TRAINER who's always prepared!\p" .string "{PLAYER}{STRING 5}, do you have enough items?\n" .string "Are your POKéMON fit for action?\p" .string "Keeping everything perfect around\n" .string "you all the time is the secret to\l" .string "keeping your journey going.\p" - .string "I’d better go check my own\n" + .string "I'd better go check my own\n" .string "supplies! Be vigilant!$" BattleFrontier_PokeNav_2AF0E7:: @ 82AF0E7 - .string "It’s {STR_VAR_1}!\n" - .string "It’s {STR_VAR_1}!\p" + .string "It's {STR_VAR_1}!\n" + .string "It's {STR_VAR_1}!\p" .string "{STR_VAR_2} is a very busy\n" .string "thoroughfare, so I get challenged\l" .string "by all kinds of TRAINERS every day.\p" @@ -8165,8 +8165,8 @@ BattleFrontier_PokeNav_2AF0E7:: @ 82AF0E7 .string "Tell me about it next time, okay?$" BattleFrontier_PokeNav_2AF1B8:: @ 82AF1B8 - .string "It’s me, {STR_VAR_1}.\p" - .string "I’m popular because I have lots\n" + .string "It's me, {STR_VAR_1}.\p" + .string "I'm popular because I have lots\n" .string "of BUG POKéMON, right?\p" .string "Well, I took a bunch of my fave\n" .string "bugs to school today.\p" @@ -8179,38 +8179,38 @@ BattleFrontier_PokeNav_2AF1B8:: @ 82AF1B8 BattleFrontier_PokeNav_2AF2C4:: @ 82AF2C4 .string "Hah! Hah! Hah! Hah!\p" - .string "Hi! It’s {STR_VAR_1}! Hah! Hah!\p" + .string "Hi! It's {STR_VAR_1}! Hah! Hah!\p" .string "Trying to chat…\n" .string "While climbing…\l" .string "Is harsh exercise… Hah! Hah!\p" .string "Urgh! Oof…\n" - .string "It’s steeper now…\l" - .string "We’ll chat…another time…\l" + .string "It's steeper now…\l" + .string "We'll chat…another time…\l" .string "Hah! Hah! Hah!$" BattleFrontier_PokeNav_2AF371:: @ 82AF371 .string "Oh, hi!\p" - .string "I’m still searching for treasures\n" + .string "I'm still searching for treasures\n" .string "with KIRA!\p" - .string "Maybe there isn’t any treasure\n" + .string "Maybe there isn't any treasure\n" .string "here at all…\p" .string "But the important thing is for me\n" .string "to search alongside KIRA.\p" .string "Oh, hey, KIRA!\n" .string "Wh-why are you angry?\p" - .string "I’m not ignoring you, honey!\n" - .string "You’re my one and only!\p" + .string "I'm not ignoring you, honey!\n" + .string "You're my one and only!\p" .string "…{PLAYER}, I have to go, bye!$" BattleFrontier_PokeNav_2AF480:: @ 82AF480 .string "This is {STR_VAR_1}!\p" - .string "I went to DEWFORD’s GYM again\n" + .string "I went to DEWFORD's GYM again\n" .string "for training.\p" .string "BRAWLY, the GYM LEADER, seems\n" .string "to be tougher now.\p" .string "Something about being toughened\n" .string "by the wild waves…\p" - .string "But he’s still as cool as ever.\n" + .string "But he's still as cool as ever.\n" .string "The ladies adore him!\l" .string "It makes me envious, frankly.\p" .string "I wonder… Is his friend BRUNO\n" @@ -8218,17 +8218,17 @@ BattleFrontier_PokeNav_2AF480:: @ 82AF480 .string "You know, all sweaty or smelly,\n" .string "and prone to calling people\l" .string "“big wave,†that sort of thing.\p" - .string "But, hey, this jealousy thing isn’t\n" + .string "But, hey, this jealousy thing isn't\n" .string "very seemly, is it?\p" .string "Forget this chat ever happened,\n" .string "how about it? So long!$" BattleFrontier_PokeNav_2AF671:: @ 82AF671 - .string "It’s a pleasure to chat with\n" + .string "It's a pleasure to chat with\n" .string "a young TRAINER like you.\p" .string "I imagine that you will continue to\n" .string "enjoy POKéMON whatever your age.\p" - .string "Wouldn’t it be good if you had\n" + .string "Wouldn't it be good if you had\n" .string "a partnership like ours?\p" .string "Of course, {PLAYER}{STRING 5}, you already\n" .string "enjoy the trust and companionship\l" @@ -8241,7 +8241,7 @@ BattleFrontier_PokeNav_2AF671:: @ 82AF671 BattleFrontier_PokeNav_2AF7D8:: @ 82AF7D8 .string "Hi, this is {STR_VAR_1}!\n" .string "We just won a battle!\p" - .string "We don’t win often, but it was this\n" + .string "We don't win often, but it was this\n" .string "cool SWIMMER guy.\p" .string "My sister was steamed!\p" .string "She wanted to pretend that she\n" @@ -8259,34 +8259,34 @@ BattleFrontier_PokeNav_2AF8F7:: @ 82AF8F7 .string "ruin to explore.\p" .string "But the tides somehow seemed to\n" .string "carry me back where I started.\p" - .string "I’m still weak at battling, too…\n" + .string "I'm still weak at battling, too…\n" .string "Feel free to mock me…\l" - .string "But I won’t give up.\p" + .string "But I won't give up.\p" .string "My day will come when I discover\n" .string "a new ruin!\p" - .string "That’s all I have to say!\n" + .string "That's all I have to say!\n" .string "Farewell for now!$" BattleFrontier_PokeNav_2AFA39:: @ 82AFA39 .string "Ahoy there!\n" - .string "It’s me, {STR_VAR_1}!\l" - .string "I’m out on ROUTE 108 now!\l" + .string "It's me, {STR_VAR_1}!\l" + .string "I'm out on ROUTE 108 now!\l" .string "In other words, where I always am!\p" .string "Today, a gorgeous SWIMMER \n" .string "swam by me!\p" .string "So I startled her with a shout!\p" .string "And she gave me a nasty glare!\p" - .string "That’s all from ROUTE 108!\n" + .string "That's all from ROUTE 108!\n" .string "Brought to you by {STR_VAR_1}!$" BattleFrontier_PokeNav_2AFB26:: @ 82AFB26 - .string "It’s {STR_VAR_1}!\p" - .string "I’m kind of busy, but I figured\n" - .string "I should let you know that I’ve\l" + .string "It's {STR_VAR_1}!\p" + .string "I'm kind of busy, but I figured\n" + .string "I should let you know that I've\l" .string "beaten five TRAINERS again today.\p" .string "If I keep this pace up, I can\n" .string "probably beat you next time.\p" - .string "I think we’ll be good rivals,\n" + .string "I think we'll be good rivals,\n" .string "you and I. Good-bye for now!$" BattleFrontier_PokeNav_2AFC07:: @ 82AFC07 @@ -8294,43 +8294,43 @@ BattleFrontier_PokeNav_2AFC07:: @ 82AFC07 .string "I heard the news!\p" .string "They say you did excellent at\n" .string "the {STR_VAR_2}.\p" - .string "It’s awesome, {STR_VAR_3} straight wins?\n" + .string "It's awesome, {STR_VAR_3} straight wins?\n" .string "See you!$" BattleFrontier_PokeNav_2AFC78:: @ 82AFC78 - .string "Hello, it’s {STR_VAR_1}!\n" + .string "Hello, it's {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won {STR_VAR_3} straight\n" .string "battles at the {STR_VAR_2}.\p" - .string "That’s special! I should try\n" + .string "That's special! I should try\n" .string "harder, too! See you!$" BattleFrontier_PokeNav_2AFCFF:: @ 82AFCFF .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\p" + .string "It's me, {STR_VAR_1}.\p" .string "I heard you went on a tear at\n" .string "the {STR_VAR_2}!\p" .string "A big {STR_VAR_3}-win streak…\n" - .string "That is a big record, isn’t it?\p" - .string "I’d better get it together, too!\n" + .string "That is a big record, isn't it?\p" + .string "I'd better get it together, too!\n" .string "Catch you soon!$" BattleFrontier_PokeNav_2AFDA7:: @ 82AFDA7 .string "Hey, {PLAYER}{STRING 5}.\n" - .string "{STR_VAR_1} here. What’s up?\p" - .string "There’s a rumor going around that\n" + .string "{STR_VAR_1} here. What's up?\p" + .string "There's a rumor going around that\n" .string "you strung together {STR_VAR_3} straight\l" .string "wins at the {STR_VAR_2}.\p" - .string "I’d better step it up, too.\n" + .string "I'd better step it up, too.\n" .string "See you!$" BattleFrontier_PokeNav_2AFE3D:: @ 82AFE3D .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "You were at the {STR_VAR_2}\n" .string "and won {STR_VAR_3} battles in a row?\l" - .string "Isn’t that something!\p" - .string "I’d better work on my POKéMON more.\n" + .string "Isn't that something!\p" + .string "I'd better work on my POKéMON more.\n" .string "See you soon!$" BattleFrontier_PokeNav_2AFECA:: @ 82AFECA @@ -8354,11 +8354,11 @@ BattleFrontier_PokeNav_2AFF64:: @ 82AFF64 BattleFrontier_PokeNav_2AFFF0:: @ 82AFFF0 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" - .string "I hope you’re doing well.\p" - .string "Oh, but, you are. I’ve heard that\n" + .string "I hope you're doing well.\p" + .string "Oh, but, you are. I've heard that\n" .string "you won {STR_VAR_3} matches in a row at\l" .string "the {STR_VAR_2}.\p" - .string "That’s very impressive!\n" + .string "That's very impressive!\n" .string "I hope you stay successful.$" BattleFrontier_PokeNav_2B00B5:: @ 82B00B5 @@ -8367,40 +8367,40 @@ BattleFrontier_PokeNav_2B00B5:: @ 82B00B5 .string "I heard! Your {STR_VAR_3}-win streak at\n" .string "the {STR_VAR_2}!\p" .string "That is so cool!\n" - .string "I’d better try harder, too!$" + .string "I'd better try harder, too!$" BattleFrontier_PokeNav_2B0129:: @ 82B0129 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "You won {STR_VAR_3} straight battles at\n" .string "the {STR_VAR_2}?\p" - .string "That’s quite the accomplishment.\n" + .string "That's quite the accomplishment.\n" .string "I need to work harder.$" BattleFrontier_PokeNav_2B01A5:: @ 82B01A5 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" - .string "I hear you’re the terror of\n" + .string "I hear you're the terror of\n" .string "the {STR_VAR_2}?\p" .string "You won, what, {STR_VAR_3} matches in\n" .string "a row?\p" - .string "You’re good, you.\n" + .string "You're good, you.\n" .string "I wonder how many I can win?$" BattleFrontier_PokeNav_2B0232:: @ 82B0232 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\l" + .string "It's me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" .string "Someone passed on word about you.\n" .string "How you won {STR_VAR_3} straight battles\l" .string "at a place named {STR_VAR_2}?\p" - .string "That’s quite the tale.\n" + .string "That's quite the tale.\n" .string "See you!$" BattleFrontier_PokeNav_2B02D9:: @ 82B02D9 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" - .string "I hope you’ve been keeping well.\p" + .string "I hope you've been keeping well.\p" .string "They say you won {STR_VAR_3} straight\n" .string "battles at the {STR_VAR_2}.\p" .string "I admire your energy!\n" @@ -8410,9 +8410,9 @@ BattleFrontier_PokeNav_2B0366:: @ 82B0366 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "I heard about you!\n" - .string "Didn’t you just win {STR_VAR_3} battles in\l" + .string "Didn't you just win {STR_VAR_3} battles in\l" .string "a row at the {STR_VAR_2}?\p" - .string "You’re an inspiration!\n" + .string "You're an inspiration!\n" .string "Bye-bye!$" BattleFrontier_PokeNav_2B03E6:: @ 82B03E6 @@ -8420,43 +8420,43 @@ BattleFrontier_PokeNav_2B03E6:: @ 82B03E6 .string "I heard the news!\p" .string "They say you did excellent at\n" .string "the {STR_VAR_2}.\p" - .string "It’s awesome--{STR_VAR_3} straight wins?\n" + .string "It's awesome--{STR_VAR_3} straight wins?\n" .string "See you!$" BattleFrontier_PokeNav_2B0457:: @ 82B0457 - .string "Hello, it’s {STR_VAR_1}!\n" + .string "Hello, it's {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won {STR_VAR_3} straight\n" .string "battles at the {STR_VAR_2}.\p" - .string "That’s special! I should try\n" + .string "That's special! I should try\n" .string "harder, too! See you!$" BattleFrontier_PokeNav_2B04DE:: @ 82B04DE .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\p" + .string "It's me, {STR_VAR_1}.\p" .string "I heard you went on a tear at\n" .string "the {STR_VAR_2}!\p" .string "A big {STR_VAR_3}-win streak…\n" - .string "That is a big record, isn’t it?\p" - .string "I’d better get it together, too!\n" + .string "That is a big record, isn't it?\p" + .string "I'd better get it together, too!\n" .string "Catch you soon!$" BattleFrontier_PokeNav_2B0586:: @ 82B0586 .string "Hey, {PLAYER}{STRING 5}.\n" - .string "{STR_VAR_1} here. What’s up?\p" - .string "There’s a rumor going around that\n" + .string "{STR_VAR_1} here. What's up?\p" + .string "There's a rumor going around that\n" .string "you strung together {STR_VAR_3} straight\l" .string "wins at the {STR_VAR_2}.\p" - .string "I’d better step it up, too.\n" + .string "I'd better step it up, too.\n" .string "See you!$" BattleFrontier_PokeNav_2B061C:: @ 82B061C .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "You were at the {STR_VAR_2}\n" .string "and won {STR_VAR_3} battles in a row?\l" - .string "Isn’t that something!\p" - .string "Me? I’d say I’m coming along.\n" + .string "Isn't that something!\p" + .string "Me? I'd say I'm coming along.\n" .string "See you soon!$" BattleFrontier_PokeNav_2B06A3:: @ 82B06A3 @@ -8465,7 +8465,7 @@ BattleFrontier_PokeNav_2B06A3:: @ 82B06A3 .string "By the way, I heard you pulled off\n" .string "the feat of {STR_VAR_3} straight wins at\l" .string "the {STR_VAR_2}.\p" - .string "I’d better try harder myself!\n" + .string "I'd better try harder myself!\n" .string "See you soon!$" BattleFrontier_PokeNav_2B073B:: @ 82B073B @@ -8480,12 +8480,12 @@ BattleFrontier_PokeNav_2B073B:: @ 82B073B BattleFrontier_PokeNav_2B07C7:: @ 82B07C7 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" - .string "I hope you’re doing well.\p" - .string "Oh, but, you are. I’ve heard that\n" + .string "I hope you're doing well.\p" + .string "Oh, but, you are. I've heard that\n" .string "you won {STR_VAR_3} matches in a row at\l" .string "the {STR_VAR_2}.\p" - .string "That’s very impressive!\n" - .string "I’d better work on my POKéMON, too!$" + .string "That's very impressive!\n" + .string "I'd better work on my POKéMON, too!$" BattleFrontier_PokeNav_2B0894:: @ 82B0894 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" @@ -8493,40 +8493,40 @@ BattleFrontier_PokeNav_2B0894:: @ 82B0894 .string "I heard! Your {STR_VAR_3}-win streak at\n" .string "the {STR_VAR_2}!\p" .string "That is so cool!\n" - .string "I’d better try harder, too!$" + .string "I'd better try harder, too!$" BattleFrontier_PokeNav_2B0908:: @ 82B0908 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "You won {STR_VAR_3} straight battles at\n" .string "the {STR_VAR_2}?\p" - .string "That’s quite the accomplishment.\n" + .string "That's quite the accomplishment.\n" .string "I need to work harder.$" BattleFrontier_PokeNav_2B0984:: @ 82B0984 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" - .string "I hear you’re the terror of\n" + .string "I hear you're the terror of\n" .string "the {STR_VAR_2}?\p" .string "You won, what, {STR_VAR_3} matches in\n" .string "a row?\p" - .string "You’re good, you.\n" + .string "You're good, you.\n" .string "I wonder how many I can win?$" BattleFrontier_PokeNav_2B0A11:: @ 82B0A11 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\l" + .string "It's me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" .string "Someone passed on word about you.\n" .string "How you won {STR_VAR_3} straight battles\l" .string "at a place named {STR_VAR_2}?\p" - .string "That’s quite the tale.\n" + .string "That's quite the tale.\n" .string "See you!$" BattleFrontier_PokeNav_2B0AB8:: @ 82B0AB8 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" - .string "I hope you’ve been keeping well.\p" + .string "I hope you've been keeping well.\p" .string "They say you won {STR_VAR_3} straight\n" .string "battles at the {STR_VAR_2}.\p" .string "I admire your energy!\n" @@ -8536,9 +8536,9 @@ BattleFrontier_PokeNav_2B0B45:: @ 82B0B45 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "I heard about you!\p" - .string "Didn’t you just win {STR_VAR_3} battles in\n" + .string "Didn't you just win {STR_VAR_3} battles in\n" .string "a row at the {STR_VAR_2}?\p" - .string "You’re an inspiration!\n" + .string "You're an inspiration!\n" .string "Bye-bye!$" BattleFrontier_PokeNav_2B0BC5:: @ 82B0BC5 @@ -8547,21 +8547,21 @@ BattleFrontier_PokeNav_2B0BC5:: @ 82B0BC5 .string "I heard the news!\p" .string "You became the champion at\n" .string "the {STR_VAR_2} {STR_VAR_3} times?\p" - .string "It’s awesome! I have to do better!\n" + .string "It's awesome! I have to do better!\n" .string "See you!$" BattleFrontier_PokeNav_2B0C4A:: @ 82B0C4A - .string "Hello, it’s {STR_VAR_1}!\n" + .string "Hello, it's {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won {STR_VAR_3} titles\n" .string "at the {STR_VAR_2}.\p" - .string "That’s super! I wonder if I can\n" + .string "That's super! I wonder if I can\n" .string "become a champion?$" BattleFrontier_PokeNav_2B0CC7:: @ 82B0CC7 .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\l" - .string "How’s it going?\p" + .string "It's me, {STR_VAR_1}.\l" + .string "How's it going?\p" .string "I heard you won events {STR_VAR_3} times\n" .string "at the {STR_VAR_2}!\p" .string "Make it one more next time!\n" @@ -8572,15 +8572,15 @@ BattleFrontier_PokeNav_2B0D4A:: @ 82B0D4A .string "{STR_VAR_1} here.\p" .string "I heard you became the champion\n" .string "at the {STR_VAR_2} {STR_VAR_3} times.\p" - .string "Sounds like you’re working hard.\n" - .string "I’ll try to keep up!$" + .string "Sounds like you're working hard.\n" + .string "I'll try to keep up!$" BattleFrontier_PokeNav_2B0DC8:: @ 82B0DC8 .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "I heard you won {STR_VAR_3} times\n" .string "outright at the {STR_VAR_2}.\p" - .string "I’d better get with it, too!\n" + .string "I'd better get with it, too!\n" .string "See you soon!$" BattleFrontier_PokeNav_2B0E35:: @ 82B0E35 @@ -8589,7 +8589,7 @@ BattleFrontier_PokeNav_2B0E35:: @ 82B0E35 .string "By the way, I heard you became\n" .string "the champion {STR_VAR_3} times at\l" .string "the {STR_VAR_2}.\p" - .string "I’d better raise my POKéMON before\n" + .string "I'd better raise my POKéMON before\n" .string "you pull farther ahead.$" BattleFrontier_PokeNav_2B0ED1:: @ 82B0ED1 @@ -8597,7 +8597,7 @@ BattleFrontier_PokeNav_2B0ED1:: @ 82B0ED1 .string "{STR_VAR_1} here.\p" .string "You were at the {STR_VAR_2}\n" .string "and became the champ {STR_VAR_3} times?\p" - .string "That’s neat. By the way, have you\n" + .string "That's neat. By the way, have you\n" .string "caught any rare POKéMON lately?\p" .string "Oh, is that right.\n" .string "Okay, bye.$" @@ -8605,9 +8605,9 @@ BattleFrontier_PokeNav_2B0ED1:: @ 82B0ED1 BattleFrontier_PokeNav_2B0F72:: @ 82B0F72 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" - .string "I hope you’re doing well.\l" + .string "I hope you're doing well.\l" .string "Oh, but, you are.\p" - .string "I’ve heard that you won {STR_VAR_3} titles\n" + .string "I've heard that you won {STR_VAR_3} titles\n" .string "at the {STR_VAR_2}.\p" .string "I must raise my POKéMON like you.\n" .string "See you again.$" @@ -8618,20 +8618,20 @@ BattleFrontier_PokeNav_2B102A:: @ 82B102A .string "I heard! You took the title\n" .string "{STR_VAR_3} times at the {STR_VAR_2}!\p" .string "That is so cool!\n" - .string "I’d better try harder, too!$" + .string "I'd better try harder, too!$" BattleFrontier_PokeNav_2B10A7:: @ 82B10A7 .string "Oh, {PLAYER}{STRING 5}, hello.\n" .string "This is {STR_VAR_1}.\p" .string "You won {STR_VAR_3} straight times at\n" .string "the {STR_VAR_2}?\p" - .string "That’s quite the accomplishment.\n" + .string "That's quite the accomplishment.\n" .string "I need to work harder.$" BattleFrontier_PokeNav_2B1121:: @ 82B1121 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" - .string "I hear you’re the terror of\n" + .string "I hear you're the terror of\n" .string "the {STR_VAR_2}?\p" .string "You won, what, {STR_VAR_3} straight times\n" .string "now?\p" @@ -8642,17 +8642,17 @@ BattleFrontier_PokeNav_2B1121:: @ 82B1121 BattleFrontier_PokeNav_2B11D3:: @ 82B11D3 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\l" + .string "It's me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" - .string "You’ve won {STR_VAR_3} events at a place\n" + .string "You've won {STR_VAR_3} events at a place\n" .string "named {STR_VAR_2}?\p" - .string "That’s quite the tale.\n" + .string "That's quite the tale.\n" .string "See you!$" BattleFrontier_PokeNav_2B124D:: @ 82B124D .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" - .string "I hope you’ve been keeping well.\p" + .string "I hope you've been keeping well.\p" .string "They say you won {STR_VAR_3} events\n" .string "at the {STR_VAR_2}?\p" .string "I admire your energy!\n" @@ -8662,9 +8662,9 @@ BattleFrontier_PokeNav_2B12D0:: @ 82B12D0 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "I heard about you!\p" - .string "Didn’t you win {STR_VAR_3} titles\n" + .string "Didn't you win {STR_VAR_3} titles\n" .string "at the {STR_VAR_2}?\p" - .string "You’re an inspiration!\n" + .string "You're an inspiration!\n" .string "See you again!$" BattleFrontier_PokeNav_2B1347:: @ 82B1347 @@ -8673,11 +8673,11 @@ BattleFrontier_PokeNav_2B1347:: @ 82B1347 .string "I heard the news!\p" .string "You got through {STR_VAR_3} rooms\n" .string "at the {STR_VAR_2}!\p" - .string "That’s awesome!\n" + .string "That's awesome!\n" .string "See you!$" BattleFrontier_PokeNav_2B13B1:: @ 82B13B1 - .string "Hello, it’s {STR_VAR_1}!\n" + .string "Hello, it's {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won your way through\n" .string "{STR_VAR_3} rooms at the {STR_VAR_2}.\p" @@ -8686,8 +8686,8 @@ BattleFrontier_PokeNav_2B13B1:: @ 82B13B1 BattleFrontier_PokeNav_2B142B:: @ 82B142B .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\l" - .string "How’s it going?\p" + .string "It's me, {STR_VAR_1}.\l" + .string "How's it going?\p" .string "I heard you won through {STR_VAR_3} rooms\n" .string "at the {STR_VAR_2}!\p" .string "Try to do even better next time!\n" @@ -8698,15 +8698,15 @@ BattleFrontier_PokeNav_2B14B4:: @ 82B14B4 .string "{STR_VAR_1} here.\p" .string "I heard you blew through {STR_VAR_3} rooms\n" .string "at the {STR_VAR_2}.\p" - .string "I’d better train my POKéMON and\n" + .string "I'd better train my POKéMON and\n" .string "try to keep up!$" BattleFrontier_PokeNav_2B1525:: @ 82B1525 .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "I heard you got past {STR_VAR_3} rooms\n" .string "at the {STR_VAR_2}.\p" - .string "I’d better get with it, too!\n" + .string "I'd better get with it, too!\n" .string "See you soon!$" BattleFrontier_PokeNav_2B158E:: @ 82B158E @@ -8714,7 +8714,7 @@ BattleFrontier_PokeNav_2B158E:: @ 82B158E .string "{STR_VAR_1} here. How are you?\p" .string "By the way, I heard you got through\n" .string "{STR_VAR_3} rooms at the {STR_VAR_2}.\p" - .string "I’d better raise my POKéMON before\n" + .string "I'd better raise my POKéMON before\n" .string "you pull further ahead.$" BattleFrontier_PokeNav_2B1622:: @ 82B1622 @@ -8722,18 +8722,18 @@ BattleFrontier_PokeNav_2B1622:: @ 82B1622 .string "{STR_VAR_1} here.\p" .string "You were at the {STR_VAR_2}\n" .string "and won your way past {STR_VAR_3} rooms?\p" - .string "That’s wicked.\p" + .string "That's wicked.\p" .string "Oh, there goes a rare POKéMON!\n" .string "Okay, bye.$" BattleFrontier_PokeNav_2B169D:: @ 82B169D .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" - .string "I hope you’re doing well.\l" + .string "I hope you're doing well.\l" .string "Oh, but, you are.\p" - .string "I’ve heard that you got through\n" + .string "I've heard that you got through\n" .string "{STR_VAR_3} rooms at the {STR_VAR_2}.\p" - .string "That’s quite impressive!\n" + .string "That's quite impressive!\n" .string "I must raise my POKéMON like you.\l" .string "See you again.$" @@ -8743,23 +8743,23 @@ BattleFrontier_PokeNav_2B1775:: @ 82B1775 .string "I heard! You won your way through\n" .string "{STR_VAR_3} rooms at the {STR_VAR_2}!\p" .string "That is so cool!\n" - .string "I’d better try harder, too!$" + .string "I'd better try harder, too!$" BattleFrontier_PokeNav_2B17F8:: @ 82B17F8 .string "Oh, {PLAYER}{STRING 5}, hello.\n" .string "This is {STR_VAR_1}.\p" .string "You won your way past {STR_VAR_3} rooms\n" .string "at the {STR_VAR_2}?\p" - .string "That’s quite the accomplishment.\n" + .string "That's quite the accomplishment.\n" .string "I need to work harder.$" BattleFrontier_PokeNav_2B1877:: @ 82B1877 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" - .string "I hear you’re the terror of\n" + .string "I hear you're the terror of\n" .string "the {STR_VAR_2}?\p" .string "You got through, what, {STR_VAR_3} rooms?\n" - .string "That’s gotta count for something.\p" + .string "That's gotta count for something.\p" .string "I wonder if I can ever become\n" .string "a champion?\p" .string "…Pretty well impossible?\n" @@ -8767,17 +8767,17 @@ BattleFrontier_PokeNav_2B1877:: @ 82B1877 BattleFrontier_PokeNav_2B1946:: @ 82B1946 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\l" + .string "It's me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" - .string "You’ve won through {STR_VAR_3} rooms at\n" + .string "You've won through {STR_VAR_3} rooms at\n" .string "a place named {STR_VAR_2}?\p" - .string "That’s quite the tale.\n" + .string "That's quite the tale.\n" .string "See you!$" BattleFrontier_PokeNav_2B19C7:: @ 82B19C7 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" - .string "I hope you’ve been keeping well.\p" + .string "I hope you've been keeping well.\p" .string "They say you won in {STR_VAR_3} rooms\n" .string "at the {STR_VAR_2}?\p" .string "I admire your energy!\n" @@ -8787,9 +8787,9 @@ BattleFrontier_PokeNav_2B1A4C:: @ 82B1A4C .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "I heard about you!\p" - .string "Didn’t you get through {STR_VAR_3} rooms\n" + .string "Didn't you get through {STR_VAR_3} rooms\n" .string "at the {STR_VAR_2}?\p" - .string "You’re an inspiration!\n" + .string "You're an inspiration!\n" .string "See you again!$" BattleFrontier_PokeNav_2B1ACA:: @ 82B1ACA @@ -8798,21 +8798,21 @@ BattleFrontier_PokeNav_2B1ACA:: @ 82B1ACA .string "I heard the news!\p" .string "You climbed {STR_VAR_3} floors inside\n" .string "the {STR_VAR_2}, right?\p" - .string "That’s awesome!\n" + .string "That's awesome!\n" .string "I should try that challenge.$" BattleFrontier_PokeNav_2B1B50:: @ 82B1B50 - .string "Hello, it’s {STR_VAR_1}!\n" + .string "Hello, it's {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won your way through\n" .string "{STR_VAR_3} floors in the {STR_VAR_2}.\p" - .string "Wow, that’s fantastic!\n" - .string "I’d better raise my POKéMON, too!$" + .string "Wow, that's fantastic!\n" + .string "I'd better raise my POKéMON, too!$" BattleFrontier_PokeNav_2B1BE4:: @ 82B1BE4 .string "Hey there, {PLAYER}!\n" - .string "It’s me, {STR_VAR_1}.\l" - .string "How’s it going?\p" + .string "It's me, {STR_VAR_1}.\l" + .string "How's it going?\p" .string "I heard you climbed {STR_VAR_3} floors\n" .string "in the {STR_VAR_2}!\p" .string "Try to do even better next time!\n" @@ -8823,15 +8823,15 @@ BattleFrontier_PokeNav_2B1C6A:: @ 82B1C6A .string "{STR_VAR_1} here.\p" .string "I heard you scaled {STR_VAR_3} floors\n" .string "in the {STR_VAR_2}.\p" - .string "I’d better work hard and try\n" + .string "I'd better work hard and try\n" .string "to keep up!$" BattleFrontier_PokeNav_2B1CCF:: @ 82B1CCF .string "Hiya, {PLAYER}{STRING 5}!\n" - .string "It’s {STR_VAR_1}.\p" + .string "It's {STR_VAR_1}.\p" .string "I heard you climbed {STR_VAR_3} floors\n" .string "in the {STR_VAR_2}.\p" - .string "I’d better get with it, too!\n" + .string "I'd better get with it, too!\n" .string "See you soon!$" BattleFrontier_PokeNav_2B1D38:: @ 82B1D38 @@ -8839,7 +8839,7 @@ BattleFrontier_PokeNav_2B1D38:: @ 82B1D38 .string "{STR_VAR_1} here. How are you?\p" .string "By the way, I heard you got through\n" .string "{STR_VAR_3} floors in the {STR_VAR_2}.\p" - .string "I’d better raise my POKéMON before\n" + .string "I'd better raise my POKéMON before\n" .string "you pull further ahead.$" BattleFrontier_PokeNav_2B1DCD:: @ 82B1DCD @@ -8855,11 +8855,11 @@ BattleFrontier_PokeNav_2B1DCD:: @ 82B1DCD BattleFrontier_PokeNav_2B1E4B:: @ 82B1E4B .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" - .string "I hope you’re doing well.\l" + .string "I hope you're doing well.\l" .string "Oh, but, you are.\p" - .string "I’ve heard that you got through\n" + .string "I've heard that you got through\n" .string "{STR_VAR_3} floors in the {STR_VAR_2}.\p" - .string "That’s quite impressive!\n" + .string "That's quite impressive!\n" .string "I must raise my POKéMON like you.\l" .string "See you again.$" @@ -8869,23 +8869,23 @@ BattleFrontier_PokeNav_2B1F24:: @ 82B1F24 .string "I heard! You won your way through\n" .string "{STR_VAR_3} floors in the {STR_VAR_2}!\p" .string "That is so cool!\n" - .string "I’d better try harder, too!$" + .string "I'd better try harder, too!$" BattleFrontier_PokeNav_2B1FA8:: @ 82B1FA8 .string "Oh, {PLAYER}{STRING 5}, hello.\n" .string "This is {STR_VAR_1}.\p" .string "You climbed {STR_VAR_3} floors inside\n" .string "the {STR_VAR_2}?\p" - .string "That’s quite the accomplishment.\n" + .string "That's quite the accomplishment.\n" .string "I need to work harder.$" BattleFrontier_PokeNav_2B2022:: @ 82B2022 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" - .string "I hear you’re the terror of\n" + .string "I hear you're the terror of\n" .string "the {STR_VAR_2}?\p" .string "You rose through, what, {STR_VAR_3} floors?\n" - .string "That’s gotta count for something.\p" + .string "That's gotta count for something.\p" .string "I wonder if I can ever become\n" .string "a champion?\p" .string "…Pretty well impossible?\n" @@ -8893,17 +8893,17 @@ BattleFrontier_PokeNav_2B2022:: @ 82B2022 BattleFrontier_PokeNav_2B20F3:: @ 82B20F3 .string "Hello, {PLAYER}{STRING 5}.\n" - .string "It’s me, {STR_VAR_1}.\l" + .string "It's me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" - .string "You’ve won through {STR_VAR_3} floors in\n" + .string "You've won through {STR_VAR_3} floors in\n" .string "a place named {STR_VAR_2}?\p" - .string "That’s quite the tale.\n" + .string "That's quite the tale.\n" .string "See you!$" BattleFrontier_PokeNav_2B2175:: @ 82B2175 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" - .string "I hope you’ve been keeping well.\p" + .string "I hope you've been keeping well.\p" .string "They say you climbed {STR_VAR_3} floors\n" .string "in the {STR_VAR_2}?\p" .string "I admire your energy!\n" @@ -8913,9 +8913,9 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "I heard about you!\p" - .string "Didn’t you get through {STR_VAR_3} floors\n" + .string "Didn't you get through {STR_VAR_3} floors\n" .string "in the {STR_VAR_2}?\p" - .string "You’re an inspiration!\n" + .string "You're an inspiration!\n" .string "See you again!$" gText_Mom_Pokenav_2B227B:: @ 82B227B @@ -8932,19 +8932,19 @@ gText_Mom_Pokenav_2B2310:: @ 82B2310 .string "away in the PETALBURG GYM.\p" .string "He comes home every so often.\n" .string "But he goes back to the GYM when\l" - .string "he’s eaten everything he can.\p" - .string "I’m guessing that losing to you\n" + .string "he's eaten everything he can.\p" + .string "I'm guessing that losing to you\n" .string "was a big blow to his pride!$" gText_Mom_Pokenav_2B23F3:: @ 82B23F3 .string "MOM: {PLAYER}…\n" - .string "Don’t worry about me or the house.\p" + .string "Don't worry about me or the house.\p" .string "Wear those RUNNING SHOES until\n" .string "they fall apart, honey!$" gText_Roxanne_Pokenav_2B2456:: @ 82B2456 .string "ROXANNE: Oh, hello, {PLAYER}!\p" - .string "I’ve been hard at work retraining\n" + .string "I've been hard at work retraining\n" .string "since we met.\p" .string "I will still need some more time\n" .string "before I can reopen the GYM.\p" @@ -8954,7 +8954,7 @@ gText_Roxanne_Pokenav_2B2456:: @ 82B2456 gText_Roxanne_Pokenav_2B250E:: @ 82B250E .string "ROXANNE: Is this {PLAYER}?\n" .string "Congratulations!\l" - .string "I’ve been hearing about you!\p" + .string "I've been hearing about you!\p" .string "As for me, I need some more time\n" .string "before I can reopen the GYM.\p" .string "But when I do, please visit my GYM\n" @@ -8977,8 +8977,8 @@ gText_Brawly_Pokenav_2B2659:: @ 82B2659 .string "had together.\p" .string "I intend to do my training over,\n" .string "then reopen the GYM.\p" - .string "It’s going to take some time before\n" - .string "I’m ready to run the GYM again.\p" + .string "It's going to take some time before\n" + .string "I'm ready to run the GYM again.\p" .string "But if I can reopen the GYM,\n" .string "I want you to challenge us again.$" @@ -8989,44 +8989,44 @@ gText_Brawly_Pokenav_2B275D:: @ 82B275D .string "on tidal winds!\p" .string "It appears as if I need to work on\n" .string "my training some more.\p" - .string "It’s going to take some time before\n" - .string "I’m ready to run the GYM again.\p" + .string "It's going to take some time before\n" + .string "I'm ready to run the GYM again.\p" .string "But if I can reopen the GYM,\n" .string "I want you to challenge us again.$" gText_Brawly_Pokenav_2B286F:: @ 82B286F .string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n" - .string "My GYM’s ready for action!\p" + .string "My GYM's ready for action!\p" .string "Come back to DEWFORD anytime\n" .string "for another challenge!$" gText_Brawly_Pokenav_2B28D1:: @ 82B28D1 - .string "BRAWLY: {PLAYER}{STRING 5}, I don’t think\n" - .string "I’ll ever get bored of battling you!$" + .string "BRAWLY: {PLAYER}{STRING 5}, I don't think\n" + .string "I'll ever get bored of battling you!$" gText_Wattson_Pokenav_2B2912:: @ 82B2912 - .string "WATTSON: Oh, it’s you!\p" - .string "After you left, I’ve been redoing\n" + .string "WATTSON: Oh, it's you!\p" + .string "After you left, I've been redoing\n" .string "my training from scratch.\p" - .string "I’d say I could use a wee bit more\n" + .string "I'd say I could use a wee bit more\n" .string "time to reopen my GYM.\p" - .string "You’ll have to wait till then!\n" + .string "You'll have to wait till then!\n" .string "Wahahahaha!$" gText_Wattson_Pokenav_2B29CA:: @ 82B29CA .string "WATTSON: Wahahahaha!\p" - .string "You’ve really done it, haven’t you?\n" - .string "I’ve been getting word about you!\p" + .string "You've really done it, haven't you?\n" + .string "I've been getting word about you!\p" .string "It seems I need to retrain some\n" .string "more still.\p" - .string "I’d say I could use a wee bit more\n" + .string "I'd say I could use a wee bit more\n" .string "time to reopen my GYM.\p" - .string "You’ll have to wait till then!\n" + .string "You'll have to wait till then!\n" .string "Wahahahaha!$" gText_Wattson_Pokenav_2B2AB6:: @ 82B2AB6 - .string "WATTSON: Oh, it’s you!\n" - .string "My GYM’s ready!\p" + .string "WATTSON: Oh, it's you!\n" + .string "My GYM's ready!\p" .string "Visit MAUVILLE anytime!\n" .string "Wahahahaha!$" @@ -9039,8 +9039,8 @@ gText_Flannery_Pokenav_2B2B4D:: @ 82B2B4D .string "FLANNERY: {PLAYER}…\p" .string "When we battled, I learned exactly\n" .string "how immature I was.\p" - .string "But I’m not done yet!\p" - .string "I’m going to redo my training and\n" + .string "But I'm not done yet!\p" + .string "I'm going to redo my training and\n" .string "reopen the GYM.\p" .string "When the time comes, {PLAYER},\n" .string "please challenge us again.$" @@ -9052,39 +9052,39 @@ gText_Flannery_Pokenav_2B2C0E:: @ 82B2C0E .string "us like the heat of a volcano!\p" .string "Our training is coming along very\n" .string "well here.\p" - .string "When the GYM’s ready, a mark will\n" + .string "When the GYM's ready, a mark will\n" .string "appear beside my name in the\l" .string "MATCH CALL list.$" gText_Flannery_Pokenav_2B2CF1:: @ 82B2CF1 .string "FLANNERY: Oh, {PLAYER}?\n" - .string "Our GYM’s ready!\p" + .string "Our GYM's ready!\p" .string "Come to LAVARIDGE for a soak\n" .string "in the hot spring and a challenge!$" gText_Flannery_Pokenav_2B2D54:: @ 82B2D54 .string "FLANNERY: {PLAYER}…\n" - .string "I’m positive that you keep getting\l" + .string "I'm positive that you keep getting\l" .string "better at training every time.$" gText_Winona_Pokenav_2B2DA4:: @ 82B2DA4 .string "WINONA: Hello, {PLAYER}!\p" - .string "Thanks to our battle, I’ve come\n" + .string "Thanks to our battle, I've come\n" .string "to understand my weak points!\p" - .string "When I reopen the GYM, I won’t go\n" + .string "When I reopen the GYM, I won't go\n" .string "down in defeat again!$" gText_Winona_Pokenav_2B2E2B:: @ 82B2E2B - .string "WINONA: You’ve done it, {PLAYER}!\p" + .string "WINONA: You've done it, {PLAYER}!\p" .string "News about the new CHAMPION\n" .string "has reached us in FORTREE!\p" .string "But… The next time we battle,\n" - .string "it’s not going to end the same way.$" + .string "it's not going to end the same way.$" gText_Winona_Pokenav_2B2EC2:: @ 82B2EC2 .string "WINONA: Is this {PLAYER}?\n" .string "Our GYM is back in operation!\p" - .string "We’re waiting for you in FORTREE!$" + .string "We're waiting for you in FORTREE!$" gText_Winona_Pokenav_2B2F16:: @ 82B2F16 .string "WINONA: {PLAYER}…\n" @@ -9094,13 +9094,13 @@ gText_Winona_Pokenav_2B2F16:: @ 82B2F16 .string "you never lost sight of your dream.$" gText_TateLiza_Pokenav_2B2F97:: @ 82B2F97 - .string "TATE: Oh! You’re…\n" + .string "TATE: Oh! You're…\n" .string "LIZA: {PLAYER}!\p" - .string "TATE: We’re in training again…\n" + .string "TATE: We're in training again…\n" .string "LIZA: So we can reopen our GYM!\p" .string "TATE: When our GYM is ready…\n" .string "LIZA: When our GYM is ready…\p" - .string "TATE: A mark’ll appear by our name…\n" + .string "TATE: A mark'll appear by our name…\n" .string "LIZA: On the MATCH CALL list.$" gText_TateLiza_Pokenav_2B306E:: @ 82B306E @@ -9110,7 +9110,7 @@ gText_TateLiza_Pokenav_2B306E:: @ 82B306E .string "LIZA: Still in training!\p" .string "TATE: We need some more time, but…\n" .string "LIZA: When our GYM is ready…\p" - .string "TATE: A mark’ll appear by our name…\n" + .string "TATE: A mark'll appear by our name…\n" .string "LIZA: On the MATCH CALL list.$" gText_TateLiza_Pokenav_2B3158:: @ 82B3158 @@ -9138,8 +9138,8 @@ gText_Juan_Pokenav_2B3249:: @ 82B3249 gText_Juan_Pokenav_2B32EC:: @ 82B32EC .string "JUAN: Fufu… {PLAYER}{STRING 5}…\n" - .string "You’ve finally achieved your goal.\p" - .string "My eye for appraising talent wasn’t\n" + .string "You've finally achieved your goal.\p" + .string "My eye for appraising talent wasn't\n" .string "mistaken…\p" .string "I wish for another chance to meet\n" .string "you, for you have scaled the peak\l" @@ -9165,20 +9165,20 @@ gText_Sidney_Pokenav_2B34CC:: @ 82B34CC .string "If you want to battle with me\n" .string "again, you come on back whenever\l" .string "you like to the POKéMON LEAGUE.\p" - .string "I’ll always be here!\n" - .string "I’ll be waiting!$" + .string "I'll always be here!\n" + .string "I'll be waiting!$" gText_Phoebe_Pokenav_2B3561:: @ 82B3561 .string "PHOEBE: Hi, {PLAYER}!\p" .string "How about coming back here again\n" .string "sometime?\p" - .string "I’d like to see how much tighter\n" + .string "I'd like to see how much tighter\n" .string "your bond has grown with your\l" .string "POKéMON.$" gText_Glacia_Pokenav_2B35E4:: @ 82B35E4 .string "GLACIA: Hello, {PLAYER}.\p" - .string "I trust you haven’t become\n" + .string "I trust you haven't become\n" .string "complacent with your power?\p" .string "If you feel the need to cool your\n" .string "hot emotions just a little, do come\l" @@ -9194,18 +9194,18 @@ gText_Drake_Pokenav_2B368B:: @ 82B368B .string "However, if you wish to have real\n" .string "battles, there is no substitute for\l" .string "the POKéMON LEAGUE!\p" - .string "Don’t you agree, {PLAYER}?$" + .string "Don't you agree, {PLAYER}?$" gText_Wallace_Pokenav_2B3790:: @ 82B3790 .string "WALLACE: Hello, {PLAYER}{STRING 5}.\n" .string "Have you met STEVEN?\p" .string "He is…\n" .string "Actually incredibly skilled.\p" - .string "However, he’s an odd soul who\n" + .string "However, he's an odd soul who\n" .string "rarely battles.\p" .string "Instead, he would rather look for\n" .string "rare stones.\p" - .string "I’m sure he’s digging in a cave or\n" + .string "I'm sure he's digging in a cave or\n" .string "a craggy mountain somewhere.\p" .string "But what is a rare stone exactly?\n" .string "All I can think of is a METEORITE…$" @@ -9219,7 +9219,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B38C1: @ 82B38C1 .string "I saw a giant green POKéMON\n" .string "flying high in the sky.\p" .string "I…\n" - .string "I’ve never seen anything like it.\p" + .string "I've never seen anything like it.\p" .string "I wonder what it was.\n" .string "Is this maybe a major discovery?\p" .string "… … … … … …\n" @@ -9232,9 +9232,9 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 .string "I was in PACIFIDLOG just now.\p" .string "I saw this huge green POKéMON\n" .string "flying across the sky.\p" - .string "I’ve never seen anything that\n" + .string "I've never seen anything that\n" .string "amazing before.\p" - .string "I wish you could’ve seen it,\n" + .string "I wish you could've seen it,\n" .string "{PLAYER}.\p" .string "… … … … … …\n" .string "… … … … … Click!$" @@ -9251,7 +9251,7 @@ gText_May_Pokenav_2B3B3F:: @ 2B3B3F .string "You know how little towns like\n" .string "PETALBURG and DEWFORD have GYMS?\p" .string "For some reason, the big port of\n" - .string "SLATEPORT doesn’t have a GYM.\p" + .string "SLATEPORT doesn't have a GYM.\p" .string "When they finally build a GYM there,\n" .string "I should apply to be the LEADER.$" @@ -9275,9 +9275,9 @@ gText_May_Pokenav_2B3CF3:: @ 2B3CF3 gText_May_Pokenav_2B3D4B:: @ 2B3D4B .string "MAY: {PLAYER}{STRING 5}, how are you?\p" - .string "I’m out on ROUTE 111 now.\p" - .string "I’m going to get a rest at an old\n" - .string "lady’s house.\p" + .string "I'm out on ROUTE 111 now.\p" + .string "I'm going to get a rest at an old\n" + .string "lady's house.\p" .string "She lives just north of\n" .string "the desert.$" @@ -9291,8 +9291,8 @@ gText_May_Pokenav_2B3DD1:: @ 2B3DD1 gText_May_Pokenav_2B3E69:: @ 2B3E69 .string "MAY: {PLAYER}{STRING 5}, yahoo!\n" - .string "I’m on ROUTE 119 now.\p" - .string "There’s a big river here, and\n" + .string "I'm on ROUTE 119 now.\p" + .string "There's a big river here, and\n" .string "it often rains.\p" .string "I got soaked!$" @@ -9300,7 +9300,7 @@ gText_May_Pokenav_2B3ECD:: @ 2B3ECD .string "MAY: {PLAYER}{STRING 5}, hi.\p" .string "MT. PYRE is a memorial to POKéMON\n" .string "whose lives have ended.\p" - .string "Maybe as a result, it’s infested\n" + .string "Maybe as a result, it's infested\n" .string "with many GHOST-type POKéMON!$" gText_May_Pokenav_2B3F2B:: @ 2B3F2B @@ -9320,12 +9320,12 @@ gText_May_Pokenav_2B3FFB:: @ 2B3FFB gText_May_Pokenav_2B402B:: @ 2B402B .string "MAY: Hi, {PLAYER}{STRING 5}!\n" - .string "Don’t you think it’s neat?\p" - .string "Even if you don’t have a boat,\n" + .string "Don't you think it's neat?\p" + .string "Even if you don't have a boat,\n" .string "you can cross the sea using\l" - .string "a POKéMON’s move.\p" - .string "Did you know there’s more?\p" - .string "There’s a POKéMON move that lets\n" + .string "a POKéMON's move.\p" + .string "Did you know there's more?\p" + .string "There's a POKéMON move that lets\n" .string "you go to the bottom of the sea.$" gText_May_Pokenav_2B414B:: @ 2B414B @@ -9341,7 +9341,7 @@ gText_May_Pokenav_2B414B:: @ 2B414B gText_May_Pokenav_2B4228:: @ 2B4228 .string "MAY: Hi, {PLAYER}{STRING 5}!\p" - .string "How’s it going?\n" + .string "How's it going?\n" .string "Are you filling your POKéDEX?\p" .string "I heard a rumor that there are\n" .string "super-ancient POKéMON out there.\l" @@ -9353,15 +9353,15 @@ gText_May_Pokenav_2B42E0:: @ 2B42E0 .string "I heard the rumors!\p" .string "You beat the SOOTOPOLIS GYM\n" .string "LEADER?\p" - .string "That means you don’t have far\n" + .string "That means you don't have far\n" .string "to go, do you?$" gText_May_Pokenav_2B4350:: @ 2B4350 - .string "MAY: There isn’t a single TRAINER\n" - .string "left in HOENN who doesn’t know who\l" + .string "MAY: There isn't a single TRAINER\n" + .string "left in HOENN who doesn't know who\l" .string "you are, {PLAYER}{STRING 5}!\p" - .string "When I tell people that I’m friends\n" - .string "with you, {PLAYER}{STRING 5}, they’re all\l" + .string "When I tell people that I'm friends\n" + .string "with you, {PLAYER}{STRING 5}, they're all\l" .string "surprised!$" gText_Brendan_Pokenav_2B43EF:: @ 2B43EF @@ -9374,10 +9374,10 @@ gText_Brendan_Pokenav_2B43EF:: @ 2B43EF gText_Brendan_Pokenav_2B4486:: @ 2B4486 .string "BRENDAN: Hey, {PLAYER}!\p" - .string "I don’t get how little towns like\n" + .string "I don't get how little towns like\n" .string "PETALBURG and DEWFORD have GYMS.\p" .string "I mean, not when the big port of\n" - .string "SLATEPORT doesn’t have a GYM.\p" + .string "SLATEPORT doesn't have a GYM.\p" .string "When they finally build a GYM there,\n" .string "I should apply to be the LEADER.$" @@ -9401,11 +9401,11 @@ gText_Brendan_Pokenav_2B463F:: @ 2B463F .string "Did you know that?$" gText_Brendan_Pokenav_2B46B7:: @ 2B46B7 - .string "BRENDAN: {PLAYER}, what’s up?\p" - .string "Hey, I’m out on ROUTE 111 now.\p" - .string "I’m going to rest up at an old\n" - .string "lady’s house north of the desert.\p" - .string "If you’re in the area, you should\n" + .string "BRENDAN: {PLAYER}, what's up?\p" + .string "Hey, I'm out on ROUTE 111 now.\p" + .string "I'm going to rest up at an old\n" + .string "lady's house north of the desert.\p" + .string "If you're in the area, you should\n" .string "visit her, too.$" gText_Brendan_Pokenav_2B4761:: @ 2B4761 @@ -9414,12 +9414,12 @@ gText_Brendan_Pokenav_2B4761:: @ 2B4761 .string "TOWER in the desert?\p" .string "They say, like a mirage, it can be\n" .string "seen only sometimes.\p" - .string "I’d like to see that!$" + .string "I'd like to see that!$" gText_Brendan_Pokenav_2B47F4:: @ 2B47F4 - .string "BRENDAN: Who’s this? Oh, {PLAYER}?\n" - .string "Guess what? I’m on ROUTE 119 now.\p" - .string "There’s a big river here, and\n" + .string "BRENDAN: Who's this? Oh, {PLAYER}?\n" + .string "Guess what? I'm on ROUTE 119 now.\p" + .string "There's a big river here, and\n" .string "it rains all the time.\p" .string "I got soaked to the bone!$" @@ -9427,7 +9427,7 @@ gText_Brendan_Pokenav_2B4882:: @ 2B4882 .string "BRENDAN: {PLAYER}!\p" .string "MT. PYRE is a memorial to POKéMON\n" .string "whose lives have ended.\p" - .string "That’s probably why it’s infested\n" + .string "That's probably why it's infested\n" .string "with many GHOST-type POKéMON!$" gText_Brendan_Pokenav_2B4909:: @ 2B4909 @@ -9448,11 +9448,11 @@ gText_Brendan_Pokenav_2B49C4:: @ 2B49C4 gText_Brendan_Pokenav_2B4A44:: @ 2B4A44 .string "BRENDAN: Hey there, {PLAYER}!\n" - .string "Don’t you think it’s awesome?\p" - .string "Even if you don’t have a boat,\n" + .string "Don't you think it's awesome?\p" + .string "Even if you don't have a boat,\n" .string "you can cross the sea using\l" - .string "a POKéMON’s move.\p" - .string "And, there’s a move that lets you\n" + .string "a POKéMON's move.\p" + .string "And, there's a move that lets you\n" .string "travel to the bottom of the sea.\p" .string "Man, POKéMON can do anything!$" @@ -9468,31 +9468,31 @@ gText_Brendan_Pokenav_2B4B28:: @ 2B4B28 gText_Brendan_Pokenav_2B4C15:: @ 2B4C15 .string "BRENDAN: Hey there, {PLAYER}!\p" - .string "How’s it going? Filling up your\n" + .string "How's it going? Filling up your\n" .string "POKéDEX successfully?\p" .string "I heard a rumor that there are\n" .string "super-ancient POKéMON out there.\l" .string "And not just one--three!\p" - .string "I’d love to catch even one…$" + .string "I'd love to catch even one…$" gText_Brendan_Pokenav_2B4CD8:: @ 2B4CD8 .string "BRENDAN: {PLAYER}!\n" .string "I heard the rumors!\p" .string "You beat the SOOTOPOLIS GYM\n" .string "LEADER? Awesome!\p" - .string "You’re getting awful close now!$" + .string "You're getting awful close now!$" gText_Brendan_Pokenav_2B4D46:: @ 2B4D46 - .string "BRENDAN: There isn’t a TRAINER in\n" - .string "all of HOENN who doesn’t know who\l" + .string "BRENDAN: There isn't a TRAINER in\n" + .string "all of HOENN who doesn't know who\l" .string "you are, {PLAYER}!\p" - .string "When I tell people that I’m friends\n" + .string "When I tell people that I'm friends\n" .string "with you, {PLAYER}, they get pretty\l" .string "envious!$" gText_Wally_Pokenav_2B4DE2:: @ 2B4DE2 .string "WALLY: Oh, {PLAYER}!\p" - .string "I’ve been getting healthier and\n" + .string "I've been getting healthier and\n" .string "more physically fit.\p" .string "I hope I can become a TRAINER like\n" .string "you soon, {PLAYER}!$" @@ -9500,46 +9500,46 @@ gText_Wally_Pokenav_2B4DE2:: @ 2B4DE2 gText_Wally_Pokenav_2B4E57:: @ 2B4E57 .string "WALLY: {PLAYER}, hello!\p" .string "After RUSTURF TUNNEL went\n" - .string "through, WANDA’s been very happy!$" + .string "through, WANDA's been very happy!$" gText_Wally_Pokenav_2B4EA5:: @ 2B4EA5 .string "WALLY: Oh, {PLAYER}!\p" - .string "I… I left my uncle’s place in\n" + .string "I… I left my uncle's place in\n" .string "VERDANTURF without telling anyone.\p" - .string "I wonder if he’s furious with me…\p" + .string "I wonder if he's furious with me…\p" .string "{PLAYER}, you understand how\n" - .string "I feel, don’t you?$" + .string "I feel, don't you?$" gText_Wally_Pokenav_2B4F41:: @ 2B4F41 .string "WALLY: {PLAYER}?\n" - .string "It’s me, WALLY!\p" + .string "It's me, WALLY!\p" .string "The world of TRAINERS is amazing!\p" .string "When I have my POKéMON with me,\n" .string "all sorts of people say hi!\p" - .string "It’s as if everyone’s getting\n" + .string "It's as if everyone's getting\n" .string "connected through POKéMON!$" gText_Wally_Pokenav_2B4FF3:: @ 2B4FF3 - .string "WALLY: {PLAYER}? It’s awesome!\n" + .string "WALLY: {PLAYER}? It's awesome!\n" .string "That RALTS we caught together?\l" .string "It evolved, {PLAYER}!\p" - .string "Maybe I’m talented…\p" - .string "Oh, but I shouldn’t get a big head\n" + .string "Maybe I'm talented…\p" + .string "Oh, but I shouldn't get a big head\n" .string "like that!\p" - .string "After all, it’s the POKéMON that\n" + .string "After all, it's the POKéMON that\n" .string "should be praised!$" gText_Wally_Pokenav_2B50B1:: @ 2B50B1 .string "… … … … … …\n" .string "… … … … … …\p" .string "WALLY appears to be out of\n" - .string "the POKéNAV’s service area…$" + .string "the POKéNAV's service area…$" gText_Wally_Pokenav_2B5100:: @ 2B5100 .string "WALLY: Oh, {PLAYER}!\p" .string "Before I met you, I hardly ever\n" .string "left my house…\p" - .string "But now, I’m on an adventure with\n" + .string "But now, I'm on an adventure with\n" .string "my very own POKéMON…\p" .string "{PLAYER}…\n" .string "Thank you…$" @@ -9556,9 +9556,9 @@ gText_Scott_Pokenav_2B5184:: @ 2B5184 .string "everywhere, too. Busy, busy!$" gText_Scott_Pokenav_2B5275:: @ 2B5275 - .string "SCOTT: I’m on ROUTE 119 right now.\n" - .string "It’s teeming with TRAINERS!\p" - .string "It’s also overgrown with tall grass\n" + .string "SCOTT: I'm on ROUTE 119 right now.\n" + .string "It's teeming with TRAINERS!\p" + .string "It's also overgrown with tall grass\n" .string "everywhere, it seems.\p" .string "Walking around in shorts here\n" .string "makes me all ticklish!$" @@ -9569,41 +9569,41 @@ gText_Scott_Pokenav_2B5323:: @ 2B5323 .string "MT. PYRE?\p" .string "The place is a memorial to POKéMON\n" .string "that have passed away.\p" - .string "It’s somewhere every TRAINER\n" + .string "It's somewhere every TRAINER\n" .string "should climb to the top of once.$" gText_Scott_Pokenav_2B53DB:: @ 2B53DB .string "SCOTT: Hi, {PLAYER}{STRING 5}!\p" - .string "I’ve been hearing about these odd\n" + .string "I've been hearing about these odd\n" .string "gangs being a nuisance.\p" .string "TEAM MAGMA and TEAM AQUA,\n" .string "I think they were.\p" - .string "I would think there’d be some\n" + .string "I would think there'd be some\n" .string "skilled TRAINERS among them.\p" - .string "…But if they’re thugs…$" + .string "…But if they're thugs…$" gText_Scott_Pokenav_2B54A5:: @ 2B54A5 .string "SCOTT: Oh, hi, {PLAYER}{STRING 5}.\p" .string "Might there be tough TRAINERS\n" .string "at the bottom of the sea?\p" - .string "I can’t go check for myself.\n" - .string "I can’t swim, for one.\l" - .string "And I don’t raise POKéMON…$" + .string "I can't go check for myself.\n" + .string "I can't swim, for one.\l" + .string "And I don't raise POKéMON…$" gText_Scott_Pokenav_2B5541:: @ 2B5541 .string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p" .string "You know that you can challenge\n" - .string "the POKéMON LEAGUE when you’ve\l" + .string "the POKéMON LEAGUE when you've\l" .string "collected all the GYM BADGES?\p" .string "With your talent, becoming the\n" - .string "CHAMPION isn’t a pipe dream.\p" + .string "CHAMPION isn't a pipe dream.\p" .string "But did you know?\n" - .string "There’s somewhere even better.\p" - .string "But, that’s all I’m willing to say\n" + .string "There's somewhere even better.\p" + .string "But, that's all I'm willing to say\n" .string "for the time being.\p" - .string "It’s something you can look\n" + .string "It's something you can look\n" .string "forward to.\p" - .string "When you’ve won your way through\n" + .string "When you've won your way through\n" .string "the POKéMON LEAGUE into the HALL\l" .string "OF FAME!$" @@ -9611,18 +9611,18 @@ gText_Scott_Pokenav_2B56CA:: @ 2B56CA .string "… … … … … …\n" .string "… … … … … …\p" .string "SCOTT appears to be out of\n" - .string "the POKéNAV’s service area…$" + .string "the POKéNAV's service area…$" gText_Norman_Pokenav_2B5719:: @ 82B5719 - .string "DAD: In RUSTBORO, there’s a man\n" + .string "DAD: In RUSTBORO, there's a man\n" .string "that goes by the odd name of\l" .string "the CUTTER.\p" - .string "If you’re in the area, you should\n" + .string "If you're in the area, you should\n" .string "pay him a visit.$" gText_Norman_Pokenav_2B5795:: @ 82B5795 .string "DAD: Hm… Little by little, but also\n" - .string "very surely, you’re getting\l" + .string "very surely, you're getting\l" .string "tougher, {PLAYER}.\p" .string "The stronger you get, the farther\n" .string "and higher you soar from Mother\l" @@ -9631,24 +9631,24 @@ gText_Norman_Pokenav_2B5795:: @ 82B5795 gText_Norman_Pokenav_2B584D:: @ 82B584D .string "DAD: I see…\n" - .string "You’ve collected four GYM BADGES…\p" - .string "There’s no avoiding it now.\n" + .string "You've collected four GYM BADGES…\p" + .string "There's no avoiding it now.\n" .string "We will battle like I promised.\p" .string "Come anytime.\n" - .string "We’ll all be waiting for you!$" + .string "We'll all be waiting for you!$" gText_Norman_Pokenav_2B58E3:: @ 82B58E3 - .string "DAD: {PLAYER}! You’d better go visit\n" + .string "DAD: {PLAYER}! You'd better go visit\n" .string "Mother every so often.\p" - .string "I’m going to remain here and\n" + .string "I'm going to remain here and\n" .string "redouble my training.\p" .string "The way of battling is deep\n" .string "and unforgiving!$" gText_Norman_Pokenav_2B5979:: @ 82B5979 .string "DAD: Oh, hi, {PLAYER}!\p" - .string "What’s that? MAGMA EMBLEM?\n" - .string "I don’t know what that’s about.\p" + .string "What's that? MAGMA EMBLEM?\n" + .string "I don't know what that's about.\p" .string "But with a name like that, it may\n" .string "be somehow linked to a volcano!$" @@ -9660,17 +9660,17 @@ gText_Norman_Pokenav_2B5A07:: @ 82B5A07 gText_Norman_Pokenav_2B5A69:: @ 82B5A69 .string "DAD: {PLAYER}!\p" - .string "Who would’ve thought you’d become\n" + .string "Who would've thought you'd become\n" .string "the POKéMON LEAGUE CHAMPION…\p" .string "Okay!\n" - .string "I won’t be left behind!$" + .string "I won't be left behind!$" gText_Norman_Pokenav_2B5ACF:: @ 82B5ACF .string "DAD: Hm? {PLAYER}?\n" .string "What good timing!\p" - .string "This time, I’m going to challenge\n" + .string "This time, I'm going to challenge\n" .string "you to battle.\p" - .string "I’m waiting in the PETALBURG GYM.\n" + .string "I'm waiting in the PETALBURG GYM.\n" .string "Accept my challenge anytime!$" gText_Norman_Pokenav_2B5B5E:: @ 82B5B5E @@ -9690,37 +9690,37 @@ gText_Steven_Pokenav_2B5B95:: @ 82B5B95 gText_Steven_Pokenav_2B5C53:: @ 82B5C53 .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" - .string "I’ve met a lot of different\n" + .string "I've met a lot of different\n" .string "TRAINERS so far.\p" - .string "But you’re one of a kind.\n" - .string "You’re not like anyone else.$" + .string "But you're one of a kind.\n" + .string "You're not like anyone else.$" gText_Steven_Pokenav_2B5CC9:: @ 82B5CC9 .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" - .string "When you’re on an adventure with\n" + .string "When you're on an adventure with\n" .string "your POKéMON, what do you think?\p" .string "Do you consider them to be strong\n" .string "partners?\p" .string "Do you think of them as fun\n" .string "companions?\p" .string "Depending on how you think, your\n" - .string "adventure’s significance changes.$" + .string "adventure's significance changes.$" gText_Steven_Pokenav_2B5DB4:: @ 82B5DB4 .string "STEVEN: Hello?\n" .string "{PLAYER}{STRING 5}?\p" - .string "I’m involved in a spot of trouble\n" + .string "I'm involved in a spot of trouble\n" .string "at the SPACE CENTER.\p" - .string "I’m sorry, but I can’t talk now.\n" + .string "I'm sorry, but I can't talk now.\n" .string "Bye!$" gText_Steven_Pokenav_2B5E26:: @ 82B5E26 .string "STEVEN: Oh!\n" .string "{PLAYER}{STRING 5}!\p" - .string "There’s no need to talk.\n" - .string "It’s past time for talking.\p" + .string "There's no need to talk.\n" + .string "It's past time for talking.\p" .string "You have to believe in yourself\n" - .string "and do what’s right.$" + .string "and do what's right.$" gText_Steven_Pokenav_2B5EA2:: @ 82B5EA2 .string "… … … … … …\p" @@ -9737,12 +9737,12 @@ gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9 Route101_Text_2B5F52: @ 82B5F52 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" - .string "I’ve already heard about you!\p" - .string "It seems your POKéNAV’s been\n" + .string "I've already heard about you!\p" + .string "It seems your POKéNAV's been\n" .string "upgraded with MATCH CALL.\p" .string "Well, I should register, too!\p" - .string "That way, I’d be able to examine\n" - .string "your POKéDEX even while you’re\l" + .string "That way, I'd be able to examine\n" + .string "your POKéDEX even while you're\l" .string "out in the field.\p" .string "… … … … … …$" @@ -9764,30 +9764,30 @@ gText_MrStone_Pokenav_2B60C0:: @ 82B60C0 .string "You seem to be quite happy!\p" .string "Hm…\n" .string "How could I know that?\p" - .string "It’s because I’m looking down at\n" + .string "It's because I'm looking down at\n" .string "you from my office window!\p" .string "Wahahaha!\n" .string "See you again!$" gText_MrStone_Pokenav_2B61E6:: @ 82B61E6 .string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p" - .string "What’s wrong? Have you forgotten\n" + .string "What's wrong? Have you forgotten\n" .string "about that little errand of mine?\p" .string "I need you to deliver my letter\n" .string "to STEVEN in DEWFORD.\p" .string "After that, deliver our parcel to\n" .string "CAPT. STERN in SLATEPORT.\p" - .string "You remember, don’t you?\p" + .string "You remember, don't you?\p" .string "Now, since I am a busy PRESIDENT,\n" .string "I have to go! Bye-bye!$" gText_MrStone_Pokenav_2B6302:: @ 82B6302 .string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p" - .string "Ah, so you’ve met STEVEN!\n" - .string "I’d better reward you, then!\p" + .string "Ah, so you've met STEVEN!\n" + .string "I'd better reward you, then!\p" .string "When you visit RUSTBORO again,\n" .string "come see me at my office.\p" - .string "I’ll be waiting for you!$" + .string "I'll be waiting for you!$" gText_MrStone_Pokenav_2B63A0:: @ 82B63A0 .string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p" @@ -9795,23 +9795,23 @@ gText_MrStone_Pokenav_2B63A0:: @ 82B63A0 .string "digging the RUSTURF TUNNEL?\p" .string "But we shut down the operation to\n" .string "protect the POKéMON in the area.\p" - .string "It’s a no-brainer, really.\p" - .string "It’s more important to let POKéMON\n" + .string "It's a no-brainer, really.\p" + .string "It's more important to let POKéMON\n" .string "live in peace than worry about our\l" .string "own convenience.$" gText_MrStone_Pokenav_2B64A2:: @ 82B64A2 .string "MR. STONE: Hello, hello, {PLAYER}{STRING 5}!\p" .string "I heard from someone in PETALBURG\n" - .string "that you’re NORMAN’s child!\p" - .string "No wonder you’re such a capable\n" + .string "that you're NORMAN's child!\p" + .string "No wonder you're such a capable\n" .string "being!$" gText_MrStone_Pokenav_2B6526:: @ 82B6526 - .string "MR. STONE: What’s that?\p" + .string "MR. STONE: What's that?\p" .string "You battled your own father and\n" .string "defeated him?\p" - .string "That’s astounding!\p" + .string "That's astounding!\p" .string "I had no idea that I befriended\n" .string "someone so special! Wahaha!$" @@ -9820,39 +9820,39 @@ gText_MrStone_Pokenav_2B65BB:: @ 82B65BB .string "This is DEVON CORPORATI…\l" .string "Oh, hello, {PLAYER}!\p" .string "Our PRESIDENT was here a little\n" - .string "while ago, but he’s gone out.\p" + .string "while ago, but he's gone out.\p" .string "Our PRESIDENT is busy, but you\n" .string "seem to be just as busy, {PLAYER}.$" gText_MrStone_Pokenav_2B6664:: @ 82B6664 - .string "…Huh? …What’s that?\p" + .string "…Huh? …What's that?\p" .string "GROU… Yes? …DON?\p" - .string "You’re breaking up…\n" - .string "…can’t hear…\p" + .string "You're breaking up…\n" + .string "…can't hear…\p" .string "BZZZZ…$" gText_MrStone_Pokenav_2B66B1:: @ 82B66B1 - .string "…Huh? …What’s that?\p" + .string "…Huh? …What's that?\p" .string "Seaflo… Yes? …Caver…?\p" - .string "You’re breaking up…\n" - .string "…can’t hear…\p" + .string "You're breaking up…\n" + .string "…can't hear…\p" .string "BZZZZ…$" gText_MrStone_Pokenav_2B6703:: @ 82B6703 - .string "MR. STONE: {PLAYER}{STRING 5}! It’s me!\p" + .string "MR. STONE: {PLAYER}{STRING 5}! It's me!\p" .string "You were apparently involved in all\n" .string "sorts of things, but I, being busy,\l" - .string "haven’t a clue exactly what!\p" + .string "haven't a clue exactly what!\p" .string "However, I urge you to take\n" .string "the road you believe in and walk it.\p" - .string "I’ll always be in your corner!\n" + .string "I'll always be in your corner!\n" .string "Take care!$" gText_MrStone_Pokenav_2B67ED:: @ 82B67ED .string "MR. STONE: … … … … … …\n" .string "Is this maybe {PLAYER}{STRING 5}?\p" .string "Your voice is so full of confidence,\n" - .string "I didn’t recognize you right off!\p" + .string "I didn't recognize you right off!\p" .string "Hm! You must come visit us at DEVON\n" .string "sometime!$" @@ -9880,7 +9880,7 @@ gBattleDomeOpponentPotential7:: .string "A better-than-average team.$" gBattleDomeOpponentPotential8:: - .string "This tournament’s average team.$" + .string "This tournament's average team.$" gBattleDomeOpponentPotential9:: .string "A team with average potential.$" @@ -10532,7 +10532,7 @@ LilycoveCity_ContestLobby_Text_2C4332: @ 82C4332 LilycoveCity_ContestLobby_Text_2C439D: @ 82C439D .string "Hmmm!\p" - .string "You haven’t got a single BERRY!\p" + .string "You haven't got a single BERRY!\p" .string "I shall be here all day!\n" .string "Hurry back with some BERRIES!$" @@ -10546,21 +10546,21 @@ LilycoveCity_ContestLobby_Text_2C43FA: @ 82C43FA LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C .string "Hmmm!\p" .string "Ah, but it is a simple process!\p" - .string "When the BLENDER’s arrow comes to\n" + .string "When the BLENDER's arrow comes to\n" .string "your marker, just press the A Button.\p" - .string "That’s all you have to do.\p" + .string "That's all you have to do.\p" .string "When you see how precisely I press\n" .string "the A Button, you will understand.$" LilycoveCity_ContestLobby_Text_2C451B: @ 82C451B .string "Fine!\p" - .string "Let’s get started, then!\p" + .string "Let's get started, then!\p" .string "All together with the BLEND MASTER,\n" - .string "let’s BERRY BLENDER!$" + .string "let's BERRY BLENDER!$" LilycoveCity_ContestLobby_Text_2C4573: @ 82C4573 .string "Hmmm!\p" - .string "You don’t appear to have gotten\n" + .string "You don't appear to have gotten\n" .string "the {POKEBLOCK} CASE!\p" .string "I shall be here all day!\n" .string "Obtain the {POKEBLOCK} CASE and hurry back!$" @@ -10594,7 +10594,7 @@ LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1 .string "the BLEND MASTER truly great.$" LilycoveCity_ContestLobby_Text_2C4763: @ 82C4763 - .string "The BLEND MASTER’s supposed to work\n" + .string "The BLEND MASTER's supposed to work\n" .string "on his skills deep in the mountains.\p" .string "Sometimes, he comes to LILYCOVE\n" .string "to blend BERRIES all day long.$" @@ -10627,7 +10627,7 @@ FallarborTown_BattleTentLobby_Text_2C48AC: @ 82C48AC .string "three turns, it goes to judging.\p" .string "If you wish to interrupt your challenge,\n" .string "please save the game.\p" - .string "If you don’t save, you will not be able\n" + .string "If you don't save, you will not be able\n" .string "to continue with your challenge.\p" .string "If you pull off the feat of beating\n" .string "three TRAINERS in succession,\l" @@ -10720,7 +10720,7 @@ FallarborTown_BattleTentLobby_Text_2C504C: @ 82C504C VerdanturfTown_BattleTentLobby_Text_2C50C3: @ 82C50C3 .string "I welcome you to the BATTLE TENT\n" .string "VERDANTURF SITE!\p" - .string "Here, the TRAINER’s trust toward\n" + .string "Here, the TRAINER's trust toward\n" .string "POKéMON is tested.$" VerdanturfTown_BattleTentLobby_Text_2C5129: @ 82C5129 @@ -10744,7 +10744,7 @@ VerdanturfTown_BattleTentLobby_Text_2C5163: @ 82C5163 .string "we will present you with a prize.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" VerdanturfTown_BattleTentLobby_Text_2C539A: @ 82C539A @@ -10794,7 +10794,7 @@ VerdanturfTown_BattleTentLobby_Text_2C56A2: @ 82C56A2 VerdanturfTown_BattleTentLobby_Text_2C56B8: @ 82C56B8 .string "I feel privileged for having seen\n" - .string "your POKéMON’s exploits.\p" + .string "your POKéMON's exploits.\p" .string "The results will be recorded.\n" .string "I must ask you to briefly wait.$" @@ -10836,7 +10836,7 @@ SlateportCity_BattleTentLobby_Text_2C589C: @ 82C589C .string "a row, you will earn a fine prize.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" SlateportCity_BattleTentLobby_Text_2C5AA5: @ 82C5AA5 @@ -10870,7 +10870,7 @@ SlateportCity_BattleTentLobby_Text_2C5C30: @ 82C5C30 SlateportCity_BattleTentLobby_Text_2C5C6F: @ 82C5C6F .string "Congratulations!\n" - .string "You’ve won three straight matches!\p" + .string "You've won three straight matches!\p" .string "I will return your POKéMON in exchange\n" .string "for our rental POKéMON.\p" .string "I must also save your event results.\n" @@ -10887,18 +10887,18 @@ SlateportCity_BattleTentLobby_Text_2C5D52: @ 82C5D52 .string "let me know.$" SlateportCity_BattleTentLobby_Text_2C5DA7: @ 82C5DA7 - .string "We’ve been waiting for you!\p" + .string "We've been waiting for you!\p" .string "Before we resume your challenge,\n" .string "I must save the game.$" SlateportCity_BattleTentLobby_Text_2C5DFA: @ 82C5DFA - .string "I’m sorry to say this, but you didn’t\n" + .string "I'm sorry to say this, but you didn't\n" .string "save before you quit playing last time.\p" .string "As a result, you have been disqualified\n" .string "from your challenge.$" SlateportCity_BattleTentLobby_Text_2C5E85: @ 82C5E85 - .string "We’ll return your personal POKéMON.$" + .string "We'll return your personal POKéMON.$" SlateportCity_BattleTentLobby_Text_2C5EA9: @ 82C5EA9 .string "{PLAYER} received the prize\n" @@ -10926,14 +10926,14 @@ SlateportCity_BattleTentLobby_Text_2C5F9D: @ 82C5F9D SlateportCity_BattleTentLobby_Text_2C6020: @ 82C6020 .string "After every battle you win, you may\n" .string "swap for one of your defeated\l" - .string "opponent’s POKéMON.\p" + .string "opponent's POKéMON.\p" .string "You will not be able to swap POKéMON\n" .string "with the third TRAINER in the event.$" SlateportCity_BattleTentLobby_Text_2C60C0: @ 82C60C0 .string "There are two key points to be aware\n" .string "of when swapping POKéMON.\p" - .string "First, when swapping, you can’t check\n" + .string "First, when swapping, you can't check\n" .string "the stats of the POKéMON you are\l" .string "about to receive.\p" .string "Second, the POKéMON on your team\n" @@ -11001,7 +11001,7 @@ VerdanturfTown_BattleTentLobby_Text_2C6612: @ 82C6612 VerdanturfTown_BattleTentLobby_Text_2C671E: @ 82C671E .string "Depending on its nature, a POKéMON may\n" - .string "start using moves that don’t match its\l" + .string "start using moves that don't match its\l" .string "nature when it is in trouble.\p" .string "If a POKéMON begins behaving oddly\n" .string "in a pinch, watch it carefully.$" @@ -11019,33 +11019,33 @@ VerdanturfTown_BattleTentLobby_Text_2C6878: @ 82C6878 .string "rules are listed.$" LilycoveCity_Harbor_Text_2C68A5: @ 82C68A5 - .string "What’s up, youngster?\p" - .string "What, it’s you who’s supposed to have\n" + .string "What's up, youngster?\p" + .string "What, it's you who's supposed to have\n" .string "a tattered old map?\p" - .string "Let’s have a look.\n" + .string "Let's have a look.\n" .string "… … … … … …\p" .string "Boy, this is quite a ways away.\n" - .string "I’m afraid I can’t help you…$" + .string "I'm afraid I can't help you…$" LilycoveCity_Harbor_Text_2C6951: @ 82C6951 .string "BRINEY: Hold on a second!\p" - .string "What’s the idea of turning down\n" + .string "What's the idea of turning down\n" .string "someone that I owe so much to?$" LilycoveCity_Harbor_Text_2C69AA: @ 82C69AA - .string "{PLAYER}{KUN}, I’m terribly sorry.\p" + .string "{PLAYER}{KUN}, I'm terribly sorry.\p" .string "You came to me seeking my help,\n" .string "and we almost turned you away.\p" .string "Well, let me make things right.\p" - .string "We’ll sail right away, of course!\p" - .string "Let’s find this island on\n" + .string "We'll sail right away, of course!\p" + .string "Let's find this island on\n" .string "this OLD SEA MAP!$" LilycoveCity_Harbor_Text_2C6A71: @ 82C6A71 .string "Is it you who brought that odd\n" .string "ticket?\p" - .string "Where you’re trying to go is an island\n" - .string "that’s far, far away.\p" + .string "Where you're trying to go is an island\n" + .string "that's far, far away.\p" .string "No one knows what awaits there…\p" .string "The very thought excites my blood\n" .string "as a sailing man!\p" @@ -11076,7 +11076,7 @@ LilycoveCity_Harbor_Text_2C6BD4: @ 82C6BD4 NavelRock_Harbor_Text_2C6CE6: @ 82C6CE6 .string "Did… Did you hear that?\n" .string "That low growling from deep in there.\p" - .string "Are you sure it’s safe?\n" + .string "Are you sure it's safe?\n" .string "Do you think we should leave?$" FarawayIsland_Entrance_Text_2C6D5A: @ 82C6D5A @@ -11096,16 +11096,16 @@ MauvilleCity_Text_2C6E05: @ 82C6E05 SlateportCity_PokemonFanClub_Text_2C6E37: @ 82C6E37 .string "Heh! My POKéMON totally rules!\n" - .string "It’s cooler than any POKéMON!\p" + .string "It's cooler than any POKéMON!\p" .string "I was lipping off with a swagger in\n" .string "my step like that when the CHAIRMAN\l" .string "chewed me out.\p" .string "That took the swagger out of my step.\p" - .string "If you’d like, I’ll teach the move\n" + .string "If you'd like, I'll teach the move\n" .string "SWAGGER to a POKéMON of yours.$" SlateportCity_PokemonFanClub_Text_2C6F33: @ 82C6F33 - .string "What, no? Can’t you get into\n" + .string "What, no? Can't you get into\n" .string "the spirit of things?$" SlateportCity_PokemonFanClub_Text_2C6F66: @ 82C6F66 @@ -11113,7 +11113,7 @@ SlateportCity_PokemonFanClub_Text_2C6F66: @ 82C6F66 .string "learn how to SWAGGER?$" SlateportCity_PokemonFanClub_Text_2C6F9E: @ 82C6F9E - .string "I’ll just praise my POKéMON from now\n" + .string "I'll just praise my POKéMON from now\n" .string "on without the swagger.$" MauvilleCity_Text_2C6FDB: @ 82C6FDB @@ -11125,30 +11125,30 @@ MauvilleCity_Text_2C6FDB: @ 82C6FDB .string "Do you think your POKéMON will\n" .string "want to roll, too?\p" .string "I can teach one the move ROLLOUT\n" - .string "if you’d like.$" + .string "if you'd like.$" MauvilleCity_Text_2C70C4: @ 82C70C4 - .string "You don’t need to be shy about it.\n" - .string "Let’s roll!$" + .string "You don't need to be shy about it.\n" + .string "Let's roll!$" MauvilleCity_Text_2C70F3: @ 82C70F3 - .string "Ehehe, sure thing! It’d be great if\n" + .string "Ehehe, sure thing! It'd be great if\n" .string "the POKéMON looked like me.$" MauvilleCity_Text_2C7133: @ 82C7133 .string "Rolling around in the grass makes me\n" - .string "happy. Come on, let’s roll!$" + .string "happy. Come on, let's roll!$" VerdanturfTown_PokemonCenter_1F_Text_2C7174: @ 82C7174 - .string "There’s a move that gets stronger\n" + .string "There's a move that gets stronger\n" .string "when you keep using it in a row.\p" - .string "It’s a BUG-type move, and it is\n" + .string "It's a BUG-type move, and it is\n" .string "wickedly cool.\p" - .string "It’s called FURY CUTTER.\n" + .string "It's called FURY CUTTER.\n" .string "Want me to teach it to a POKéMON?$" VerdanturfTown_PokemonCenter_1F_Text_2C7221: @ 82C7221 - .string "We’re not on the same wavelength.$" + .string "We're not on the same wavelength.$" VerdanturfTown_PokemonCenter_1F_Text_2C7243: @ 82C7243 .string "Yay!\n" @@ -11184,27 +11184,27 @@ LavaridgeTown_House_Text_2C73F6: @ 82C73F6 FallarborTown_Mart_Text_2C7449: @ 82C7449 .string "I want all sorts of things!\n" .string "But I used up my allowance…\p" - .string "Wouldn’t it be nice if there were\n" + .string "Wouldn't it be nice if there were\n" .string "a spell that made money appear when\l" .string "you waggle a finger?\p" .string "If you want, I can teach your POKéMON\n" .string "the move METRONOME.\p" - .string "Money won’t appear, but your POKéMON\n" + .string "Money won't appear, but your POKéMON\n" .string "will waggle a finger. Yes?$" FallarborTown_Mart_Text_2C7556: @ 82C7556 - .string "Okay. I’ll be here if you change\n" + .string "Okay. I'll be here if you change\n" .string "your mind.$" FallarborTown_Mart_Text_2C7582: @ 82C7582 - .string "Okay! I’ll teach it!\n" + .string "Okay! I'll teach it!\n" .string "Which POKéMON should I teach?$" FallarborTown_Mart_Text_2C75B5: @ 82C75B5 .string "When a POKéMON waggles its finger\n" .string "like a METRONOME, all sorts of nice\l" .string "things happen.\p" - .string "Wouldn’t it be nice if we could\n" + .string "Wouldn't it be nice if we could\n" .string "use it, too?$" FortreeCity_House2_Text_2C7637: @ 82C7637 @@ -11224,7 +11224,7 @@ FortreeCity_House2_Text_2C7721: @ 82C7721 .string "Which POKéMON should I teach?$" FortreeCity_House2_Text_2C775A: @ 82C775A - .string "I’ve never once gotten my wife’s\n" + .string "I've never once gotten my wife's\n" .string "coin trick right.\p" .string "I would be happy if I got it right\n" .string "even as I SLEEP TALK…$" @@ -11235,7 +11235,7 @@ LilycoveCity_DepartmentStoreRooftop_Text_2C77C6: @ 82C77C6 .string "I think about how nice it would be\n" .string "if there were more than just one me\l" .string "so I could enjoy all sorts of lives.\p" - .string "Of course it’s not possible.\n" + .string "Of course it's not possible.\n" .string "Giggle…\p" .string "I know! Would you be interested in\n" .string "having a POKéMON learn SUBSTITUTE?$" @@ -11253,27 +11253,27 @@ LilycoveCity_DepartmentStoreRooftop_Text_2C7911: @ 82C7911 LilycoveCity_DepartmentStoreRooftop_Text_2C794B: @ 82C794B .string "We human beings should enjoy our\n" .string "own lives to the utmost!\p" - .string "I hope you’ll get that way, too!$" + .string "I hope you'll get that way, too!$" MossdeepCity_Text_2C79A6: @ 82C79A6 - .string "I can’t do this anymore!\p" - .string "It’s utterly hopeless!\p" - .string "I’m a FIGHTING-type TRAINER,\n" - .string "so I can’t win at the MOSSDEEP GYM\l" + .string "I can't do this anymore!\p" + .string "It's utterly hopeless!\p" + .string "I'm a FIGHTING-type TRAINER,\n" + .string "so I can't win at the MOSSDEEP GYM\l" .string "no matter how hard I try!\p" .string "Argh! Punch! Punch! Punch!\n" .string "Punch! Punch! Punch!\p" - .string "What, don’t look at me that way!\n" - .string "I’m only hitting the ground!\p" + .string "What, don't look at me that way!\n" + .string "I'm only hitting the ground!\p" .string "Or do you want me to teach your\n" .string "POKéMON DYNAMICPUNCH?$" MossdeepCity_Text_2C7AD4: @ 82C7AD4 - .string "Darn! You’re even making fun of me?\n" + .string "Darn! You're even making fun of me?\n" .string "Punch! Punch! Punch!$" MossdeepCity_Text_2C7B0D: @ 82C7B0D - .string "What? You do? You’re a good person!\n" + .string "What? You do? You're a good person!\n" .string "Which POKéMON should I teach?$" MossdeepCity_Text_2C7B4F: @ 82C7B4F @@ -11282,12 +11282,12 @@ MossdeepCity_Text_2C7B4F: @ 82C7B4F SootopolisCity_PokemonCenter_1F_Text_2C7B8E: @ 82C7B8E .string "Sigh…\p" - .string "SOOTOPOLIS’s GYM LEADER is really\n" + .string "SOOTOPOLIS's GYM LEADER is really\n" .string "lovably admirable.\p" .string "But that also means I have many\n" .string "rivals for his attention.\p" - .string "He’s got appeal with a DOUBLE-EDGE.\n" - .string "I couldn’t even catch his eye.\p" + .string "He's got appeal with a DOUBLE-EDGE.\n" + .string "I couldn't even catch his eye.\p" .string "Please, let me teach your POKéMON\n" .string "the move DOUBLE-EDGE!$" @@ -11300,21 +11300,21 @@ SootopolisCity_PokemonCenter_1F_Text_2C7C98: @ 82C7C98 .string "DOUBLE-EDGE?$" SootopolisCity_PokemonCenter_1F_Text_2C7CC8: @ 82C7CC8 - .string "I won’t live for love anymore!\n" - .string "I’ll become tough!$" + .string "I won't live for love anymore!\n" + .string "I'll become tough!$" PacifidlogTown_PokemonCenter_1F_Text_2C7CFA: @ 82C7CFA - .string "I don’t intend to be going nowhere\n" + .string "I don't intend to be going nowhere\n" .string "fast in the sticks like this forever.\p" - .string "You watch me, I’ll get out to the city\n" + .string "You watch me, I'll get out to the city\n" .string "and become a huge hit.\p" - .string "Seriously, I’m going to cause\n" + .string "Seriously, I'm going to cause\n" .string "a huge EXPLOSION of popularity!\p" - .string "If you overheard that, I’ll happily\n" + .string "If you overheard that, I'll happily\n" .string "teach EXPLOSION to your POKéMON!$" PacifidlogTown_PokemonCenter_1F_Text_2C7E04: @ 82C7E04 - .string "Gaah! You’re turning me down because\n" + .string "Gaah! You're turning me down because\n" .string "I live in the country?$" PacifidlogTown_PokemonCenter_1F_Text_2C7E40: @ 82C7E40 @@ -11322,10 +11322,10 @@ PacifidlogTown_PokemonCenter_1F_Text_2C7E40: @ 82C7E40 .string "Which POKéMON wants to blow up?$" PacifidlogTown_PokemonCenter_1F_Text_2C7E7A: @ 82C7E7A - .string "For a long time, I’ve taught POKéMON\n" - .string "how to use EXPLOSION, but I’ve yet\l" + .string "For a long time, I've taught POKéMON\n" + .string "how to use EXPLOSION, but I've yet\l" .string "to ignite my own EXPLOSION…\p" - .string "Maybe it’s because deep down,\n" + .string "Maybe it's because deep down,\n" .string "I would rather stay here…$" SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 @@ -11752,31 +11752,31 @@ EventScript_TestSignpostMsg:: @ 82C8436 end gText_082C843F:: @ 82C843F - .string "It’s very disappointing…$" + .string "It's very disappointing…$" gText_082C8458:: @ 82C8458 .string "Okay, I understand…$" gText_082C846C:: @ 82C846C - .string "I’m terribly sorry…$" + .string "I'm terribly sorry…$" gText_082C8480:: @ 82C8480 .string "Thank you…$" gText_082C848B:: @ 82C848B - .string "Ahahaha! Aren’t you embarrassed?\n" - .string "Everyone’s watching!$" + .string "Ahahaha! Aren't you embarrassed?\n" + .string "Everyone's watching!$" gText_082C84C1:: @ 82C84C1 .string "Grr…\n" .string "What the…$" gText_082C84D0:: @ 82C84D0 - .string "My DOME ACE title isn’t just for show!$" + .string "My DOME ACE title isn't just for show!$" gText_082C84F7:: @ 82C84F7 .string "Ahahaha!\n" - .string "You’re inspiring!$" + .string "You're inspiring!$" gText_082C8512:: @ 82C8512 .string "Way to work!\n" @@ -11784,11 +11784,11 @@ gText_082C8512:: @ 82C8512 gText_082C853B:: @ 82C853B .string "Good job!\n" - .string "You know what you’re doing!$" + .string "You know what you're doing!$" gText_082C8561:: @ 82C8561 .string "Hey, hey, hey!\n" - .string "You’re finished already?$" + .string "You're finished already?$" gText_082C8589:: @ 82C8589 .string "What happened here?$" @@ -11823,7 +11823,7 @@ gText_082C8611:: @ 82C8611 gText_082C8628:: @ 82C8628 .string "Your POKéMON are wimpy because\n" - .string "you’re wimpy as a TRAINER!$" + .string "you're wimpy as a TRAINER!$" gText_082C8662:: @ 82C8662 .string "Ah…\n" @@ -11838,19 +11838,19 @@ gText_082C86B3:: @ 82C86B3 .string "Hahahaha!$" gText_082C86C3:: @ 82C86C3 - .string "Hey! What’s wrong with you!\n" - .string "Let’s see some effort! Get up!$" + .string "Hey! What's wrong with you!\n" + .string "Let's see some effort! Get up!$" gText_082C86FE:: @ 82C86FE - .string "That’s it! You’ve done great!\n" - .string "You’ve worked hard for this!$" + .string "That's it! You've done great!\n" + .string "You've worked hard for this!$" gText_082C8739:: @ 82C8739 - .string "Hey! Don’t you give up now!\n" - .string "Get up! Don’t lose faith in yourself!$" + .string "Hey! Don't you give up now!\n" + .string "Get up! Don't lose faith in yourself!$" gText_082C877B:: @ 82C877B - .string "That’s it! You’ve done it!\n" + .string "That's it! You've done it!\n" .string "You kept working for this!$" .align 2 diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index 0cec9f04e..e40ddad1e 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -26,13 +26,13 @@ AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A end AbandonedShip_CaptainsOffice_Text_238824: @ 8238824 - .string "I’m investigating this ship on behalf\n" + .string "I'm investigating this ship on behalf\n" .string "of CAPT. STERN.\p" .string "He also asked me to find a SCANNER,\n" - .string "but I haven’t had any success…$" + .string "but I haven't had any success…$" AbandonedShip_CaptainsOffice_Text_23889D: @ 823889D - .string "Oh! That’s a SCANNER!\p" + .string "Oh! That's a SCANNER!\p" .string "Listen, can I get you to deliver that\n" .string "to CAPT. STERN?\p" .string "I want to investigate this ship a\n" diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 348e3f6fd..15fda4194 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -11,16 +11,16 @@ AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE end AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 - .string "What’s so funny about having my inner\n" + .string "What's so funny about having my inner\n" .string "tube aboard the ship?$" AbandonedShip_Corridors_1F_Text_237A01: @ 8237A01 .string "Whoa, you overwhelmed me!$" AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B - .string "It’s not easy throwing POKé BALLS\n" + .string "It's not easy throwing POKé BALLS\n" .string "while hanging on to an inner tube!$" AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60 - .string "Isn’t it fun here?\n" + .string "Isn't it fun here?\n" .string "I get excited just being here!$" diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 9cf3ca04a..4715e5566 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -63,17 +63,17 @@ AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A .string "How about a quick battle?$" AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80 - .string "Whoops, I’m sunk!$" + .string "Whoops, I'm sunk!$" AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92 - .string "The ship’s bottom has sunk into the\n" + .string "The ship's bottom has sunk into the\n" .string "depths.\p" .string "If a POKéMON knew how to go underwater,\n" .string "we might make some progress…$" AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03 .string "Yay!\n" - .string "It’s a ship!$" + .string "It's a ship!$" AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15 .string "The door is locked.\p" diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 2cc0806ec..c89163af2 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -143,6 +143,6 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 end AbandonedShip_HiddenFloorRooms_Text_238DFE: @ 8238DFE - .string "It’s bright and shiny!\n" - .string "But it’s just trash…$" + .string "It's bright and shiny!\n" + .string "But it's just trash…$" diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 981b62c36..5c934f263 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -56,16 +56,16 @@ AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D .string "we discovered a TRAINER!$" AbandonedShip_Rooms2_1F_Text_2381DA: @ 82381DA - .string "DAN: We couldn’t win even though\n" + .string "DAN: We couldn't win even though\n" .string "we worked together…$" AbandonedShip_Rooms2_1F_Text_23820F: @ 823820F - .string "DAN: We can’t find any treasures…\n" + .string "DAN: We can't find any treasures…\n" .string "I wonder if someone got them already?$" AbandonedShip_Rooms2_1F_Text_238257: @ 8238257 - .string "DAN: You don’t even have two POKéMON.\n" - .string "You can’t expect to beat us like that.$" + .string "DAN: You don't even have two POKéMON.\n" + .string "You can't expect to beat us like that.$" AbandonedShip_Rooms2_1F_Text_2382A4: @ 82382A4 .string "KIRA: Oh?\n" @@ -77,39 +77,39 @@ AbandonedShip_Rooms2_1F_Text_2382F4: @ 82382F4 AbandonedShip_Rooms2_1F_Text_23830A: @ 823830A .string "KIRA: Where could the treasures be?\p" - .string "I’ve already decided what I’m buying\n" + .string "I've already decided what I'm buying\n" .string "when we find the treasures!$" AbandonedShip_Rooms2_1F_Text_23836F: @ 823836F - .string "KIRA: Oh, you don’t have two POKéMON?\n" - .string "We’ll have to battle some other time!$" + .string "KIRA: Oh, you don't have two POKéMON?\n" + .string "We'll have to battle some other time!$" AbandonedShip_Rooms2_1F_Text_2383BB: @ 82383BB .string "KIRA: Oh, you make me so angry!\n" - .string "I’m going to register you for that!$" + .string "I'm going to register you for that!$" AbandonedShip_Rooms2_1F_Text_2383FF: @ 82383FF - .string "DAN: We’ve been searching for\n" + .string "DAN: We've been searching for\n" .string "treasures all this time.\p" .string "Our POKéMON have grown stronger, too.\n" .string "Let us show you, okay?$" AbandonedShip_Rooms2_1F_Text_238473: @ 8238473 - .string "DAN: You’re strong, as usual!$" + .string "DAN: You're strong, as usual!$" AbandonedShip_Rooms2_1F_Text_238491: @ 8238491 - .string "DAN: We can’t find any treasures,\n" + .string "DAN: We can't find any treasures,\n" .string "we lose at POKéMON…\p" .string "I want to go home… But if I say that,\n" .string "she gets all angry with me…$" AbandonedShip_Rooms2_1F_Text_238509: @ 8238509 - .string "DAN: You don’t even have two POKéMON.\n" - .string "You can’t expect to beat us like that.$" + .string "DAN: You don't even have two POKéMON.\n" + .string "You can't expect to beat us like that.$" AbandonedShip_Rooms2_1F_Text_238556: @ 8238556 .string "KIRA: Oh? We meet again!\p" - .string "Just like us, you still haven’t given up\n" + .string "Just like us, you still haven't given up\n" .string "searching for treasures, have you?\p" .string "Want to make it so the loser has\n" .string "to give up searching?$" @@ -118,21 +118,21 @@ AbandonedShip_Rooms2_1F_Text_2385F2: @ 82385F2 .string "KIRA: Oh, we lost again…$" AbandonedShip_Rooms2_1F_Text_23860B: @ 823860B - .string "KIRA: We’re not leaving until we raise\n" + .string "KIRA: We're not leaving until we raise\n" .string "our POKéMON some more and we find\l" .string "the treasures here!$" AbandonedShip_Rooms2_1F_Text_238668: @ 8238668 - .string "KIRA: Oh, you don’t have two POKéMON?\n" - .string "We’ll have to battle some other time!$" + .string "KIRA: Oh, you don't have two POKéMON?\n" + .string "We'll have to battle some other time!$" AbandonedShip_Rooms2_1F_Text_2386B4: @ 82386B4 - .string "I’m not good at swimming,\n" + .string "I'm not good at swimming,\n" .string "but I am good at battles!$" AbandonedShip_Rooms2_1F_Text_2386E8: @ 82386E8 .string "Oops.\n" - .string "That didn’t go very well.$" + .string "That didn't go very well.$" AbandonedShip_Rooms2_1F_Text_238708: @ 8238708 .string "Walking around barefoot in this ship\n" @@ -140,7 +140,7 @@ AbandonedShip_Rooms2_1F_Text_238708: @ 8238708 AbandonedShip_Rooms2_1F_Text_23873F: @ 823873F .string "Strength and compassion…\n" - .string "Those are a TRAINER’s treasures!$" + .string "Those are a TRAINER's treasures!$" AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 .string "Ah, there is something about you\n" diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc index 0a3671f04..a0b9e3946 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -7,7 +7,7 @@ AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E .string "This is a perfect place to go exploring!\n" - .string "It’s exciting here!\p" - .string "I bet there’re amazing treasures on\n" + .string "It's exciting here!\p" + .string "I bet there're amazing treasures on\n" .string "board.$" diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 055cf140b..d64c027a3 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -33,7 +33,7 @@ AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE end AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15 - .string "Ships of this sort are rare, so I’m\n" + .string "Ships of this sort are rare, so I'm\n" .string "taking a look around.\p" .string "Hmhm…\n" .string "There appear to be other cabins…$" @@ -47,11 +47,11 @@ AbandonedShip_Rooms_1F_Text_237BB8: @ 8237BB8 AbandonedShip_Rooms_1F_Text_237BDB: @ 8237BDB .string "The man next door…\p" - .string "He says he’s just sightseeing,\n" - .string "but I don’t know about that.$" + .string "He says he's just sightseeing,\n" + .string "but I don't know about that.$" AbandonedShip_Rooms_1F_Text_237C2A: @ 8237C2A - .string "You’re such a tough TRAINER!\n" + .string "You're such a tough TRAINER!\n" .string "Let me register you as a memento!$" AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69 @@ -59,20 +59,20 @@ AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69 .string "come back? You must really be curious!$" AbandonedShip_Rooms_1F_Text_237CB2: @ 8237CB2 - .string "Aren’t you too strong?$" + .string "Aren't you too strong?$" AbandonedShip_Rooms_1F_Text_237CC9: @ 8237CC9 - .string "I’m sure that man’s up to something!\n" + .string "I'm sure that man's up to something!\n" .string "He just acts so suspiciously!$" AbandonedShip_Rooms_1F_Text_237D0C: @ 8237D0C .string "Waaah!\n" - .string "I’ve been found! …Huh?$" + .string "I've been found! …Huh?$" AbandonedShip_Rooms_1F_Text_237D2A: @ 8237D2A - .string "Oh, you’re not my mom.$" + .string "Oh, you're not my mom.$" AbandonedShip_Rooms_1F_Text_237D41: @ 8237D41 - .string "I’m in trouble with my mom, so I ran.\n" + .string "I'm in trouble with my mom, so I ran.\n" .string "Keep it a secret where I am!$" diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index d2937cd2d..470ae8987 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -12,7 +12,7 @@ AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF .string "Urrrrppp…\p" - .string "I’m getting queasy just being aboard\n" + .string "I'm getting queasy just being aboard\n" .string "this ship…\p" - .string "It’s not even moving, but…$" + .string "It's not even moving, but…$" diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index c23b511b4..8eb5e60b9 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -56,11 +56,11 @@ AquaHideout_1F_EventScript_233513:: @ 8233513 AquaHideout_1F_Text_23351D: @ 823351D .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here! He’s gone off to\n" + .string "Our BOSS isn't here! He's gone off to\n" .string "snatch something important!\p" .string "… …\n" .string "Where did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" + .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" AquaHideout_1F_Text_2335E3: @ 82335E3 @@ -74,21 +74,21 @@ AquaHideout_1F_Text_2335E3: @ 82335E3 AquaHideout_1F_Text_23367D: @ 823367D .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here!\n" - .string "He’s gone off to jack a submarine!\p" + .string "Our BOSS isn't here!\n" + .string "He's gone off to jack a submarine!\p" .string "… …\n" .string "Where did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" + .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" AquaHideout_1F_Text_233739: @ 8233739 .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here! He’s on his way to\n" + .string "Our BOSS isn't here! He's on his way to\n" .string "MT. PYRE on ROUTE 122!\p" .string "… …\n" .string "Why did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" + .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" AquaHideout_1F_Text_2337FA: @ 82337FA @@ -101,11 +101,11 @@ AquaHideout_1F_Text_2337FA: @ 82337FA AquaHideout_1F_Text_233884: @ 8233884 .string "What? What? What do you want with\n" .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here!\n" - .string "He’s on his way to SLATEPORT CITY!\p" + .string "Our BOSS isn't here!\n" + .string "He's on his way to SLATEPORT CITY!\p" .string "… …\n" .string "Why did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" + .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" AquaHideout_1F_Text_23393D: @ 823393D diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 2073dea29..9c660d8b1 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -121,12 +121,12 @@ AquaHideout_B1F_Text_233B03: @ 8233B03 .string "our HIDEOUT, you have me to beat!$" AquaHideout_B1F_Text_233B4A: @ 8233B4A - .string "I can’t win at all…$" + .string "I can't win at all…$" AquaHideout_B1F_Text_233B5E: @ 8233B5E - .string "Our HIDEOUT’s secret?\p" - .string "Well, let’s just say…\n" - .string "There’s a submarine at the far end!\p" + .string "Our HIDEOUT's secret?\p" + .string "Well, let's just say…\n" + .string "There's a submarine at the far end!\p" .string "But, by now…\n" .string "Kekekeke…$" @@ -146,7 +146,7 @@ AquaHideout_B1F_Text_233C41: @ 8233C41 AquaHideout_B1F_Text_233C89: @ 8233C89 .string "Yawn… Keeping watch over the\n" - .string "HIDEOUT bores me. I’ll take you on.$" + .string "HIDEOUT bores me. I'll take you on.$" AquaHideout_B1F_Text_233CCA: @ 8233CCA .string "Yawn…\n" @@ -160,12 +160,12 @@ AquaHideout_B1F_Text_233D1B: @ 8233D1B .string "Hey!\n" .string "You there!\p" .string "Which do you think is cooler?\n" - .string "TEAM AQUA’s uniform or TEAM MAGMA’s?$" + .string "TEAM AQUA's uniform or TEAM MAGMA's?$" AquaHideout_B1F_Text_233D6E: @ 8233D6E .string "I lost in a cool way…$" AquaHideout_B1F_Text_233D84: @ 8233D84 .string "If you have a cool uniform, you look\n" - .string "good even in a loss, don’t you think?$" + .string "good even in a loss, don't you think?$" diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index a2bd702e6..584a1a3e1 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -91,10 +91,10 @@ AquaHideout_B2F_Text_233EDD: @ 8233EDD .string "Got here already, did you?\n" .string "We underestimated you!\p" .string "But this is it!\p" - .string "I’m a cut above the GRUNTS you’ve seen\n" + .string "I'm a cut above the GRUNTS you've seen\n" .string "so far.\p" - .string "I’m not stalling for time.\n" - .string "I’m going to pulverize you!$" + .string "I'm not stalling for time.\n" + .string "I'm going to pulverize you!$" AquaHideout_B2F_Text_233F8D: @ 8233F8D .string "Hehehe…\n" @@ -109,7 +109,7 @@ AquaHideout_B2F_Text_233FF2: @ 8233FF2 .string "Hehehe!\p" .string "Our BOSS has already gone on his way to\n" .string "some cave under the sea!\p" - .string "If you’re going to give chase, you’d\n" + .string "If you're going to give chase, you'd\n" .string "better search the big, wide sea beyond\l" .string "LILYCOVE.\p" .string "But will you find it then?\n" @@ -128,19 +128,19 @@ AquaHideout_B2F_Text_234112: @ 8234112 .string "Is this good enough?$" AquaHideout_B2F_Text_23412D: @ 823412D - .string "Warp panels, the HIDEOUT’s pride\n" + .string "Warp panels, the HIDEOUT's pride\n" .string "and joy!\p" - .string "You’re clueless about where you are,\n" - .string "aren’t you?\p" + .string "You're clueless about where you are,\n" + .string "aren't you?\p" .string "Fluster and tire out the enemy, then\n" - .string "lower the boom! That’s our plan!$" + .string "lower the boom! That's our plan!$" AquaHideout_B2F_Text_2341CE: @ 82341CE - .string "What’s wrong with you?\n" - .string "You’re not tired at all!$" + .string "What's wrong with you?\n" + .string "You're not tired at all!$" AquaHideout_B2F_Text_2341FE: @ 82341FE - .string "That reminds me… I can’t remember\n" + .string "That reminds me… I can't remember\n" .string "where I put the MASTER BALL.\p" .string "If I fail to guard it, our BOSS will\n" .string "chew me out…$" @@ -155,6 +155,6 @@ AquaHideout_B2F_Text_2342CC: @ 82342CC .string "the warp panels…$" AquaHideout_B2F_Text_2342FF: @ 82342FF - .string "I’ll have to learn about how I can\n" + .string "I'll have to learn about how I can\n" .string "battle more effectively…$" diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 60329d24f..75ac9a4ec 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -652,22 +652,22 @@ BattleFrontier_BattleArenaBattleRoom_Text_25804E: @ 825804E .string "Hmhm…$" BattleFrontier_BattleArenaBattleRoom_Text_258068: @ 8258068 - .string "I don’t know how to say it, but…\n" + .string "I don't know how to say it, but…\n" .string "To put it bluntly, you look pretty weak.\l" - .string "Are you sure you’re up for me?\p" + .string "Are you sure you're up for me?\p" .string "Hmm…\p" .string "Well, all right!\n" - .string "We’ll take things easy to start with!$" + .string "We'll take things easy to start with!$" BattleFrontier_BattleArenaBattleRoom_Text_25810D: @ 825810D - .string "Okay! Let’s see you ignite my passion\n" + .string "Okay! Let's see you ignite my passion\n" .string "for battle!$" BattleFrontier_BattleArenaBattleRoom_Text_25813F: @ 825813F .string "GRETA: Ow, wait a second!\n" .string "You are tough after all!\p" .string "I like you!\n" - .string "Let’s see your FRONTIER PASS.$" + .string "Let's see your FRONTIER PASS.$" BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C .string "The Guts Symbol was embossed on\n" @@ -675,8 +675,8 @@ BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C BattleFrontier_BattleArenaBattleRoom_Text_2581CF: @ 82581CF .string "Hmm…\p" - .string "It’s going to be fun the next time!\n" - .string "I’m looking forward to it!$" + .string "It's going to be fun the next time!\n" + .string "I'm looking forward to it!$" BattleFrontier_BattleArenaBattleRoom_Text_258213: @ 8258213 .string "GRETA: Hey! Howdy!\n" @@ -690,16 +690,16 @@ BattleFrontier_BattleArenaBattleRoom_Text_2582A2: @ 82582A2 .string "So, are you ready?$" BattleFrontier_BattleArenaBattleRoom_Text_2582BB: @ 82582BB - .string "I won’t allow a halfhearted effort!\n" + .string "I won't allow a halfhearted effort!\n" .string "Be ready for a thrashing!$" BattleFrontier_BattleArenaBattleRoom_Text_2582F9: @ 82582F9 .string "Come on, REFEREE!\n" - .string "Let’s get this started!$" + .string "Let's get this started!$" BattleFrontier_BattleArenaBattleRoom_Text_258323: @ 8258323 .string "GRETA: Gaaah! Blown away!\n" - .string "Let’s see your FRONTIER PASS!$" + .string "Let's see your FRONTIER PASS!$" BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B .string "The Guts Symbol took on\n" @@ -708,5 +708,5 @@ BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B BattleFrontier_BattleArenaBattleRoom_Text_258383: @ 8258383 .string "Arrrgh!\n" .string "This is so infuriating!\p" - .string "If we ever battle again, I won’t lose!\n" - .string "Don’t you forget it! Bye-bye!$" + .string "If we ever battle again, I won't lose!\n" + .string "Don't you forget it! Bye-bye!$" diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 406d9f37d..36f864c14 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -440,7 +440,7 @@ BattleFrontier_BattleArenaLobby_Text_25624C: @ 825624C .string "three turns, it goes to judging.\p" .string "If you wish to interrupt your challenge,\n" .string "please save the game.\p" - .string "If you don’t save, you will not be able\n" + .string "If you don't save, you will not be able\n" .string "to continue with your challenge.\p" .string "If you pull off the feat of beating\n" .string "seven TRAINERS in succession,\l" @@ -541,19 +541,19 @@ BattleFrontier_BattleArenaLobby_Text_256B19: @ 8256B19 .string "match on your FRONTIER PASS?$" BattleFrontier_BattleArenaLobby_Text_256B5C: @ 8256B5C - .string "I lost on the REFEREE’s decision…\p" - .string "I don’t think it was a good idea to only\n" + .string "I lost on the REFEREE's decision…\p" + .string "I don't think it was a good idea to only\n" .string "use defensive moves and not attack…$" BattleFrontier_BattleArenaLobby_Text_256BCB: @ 8256BCB .string "I won in judging!\p" .string "Landing hits consistently on\n" - .string "the opponent’s POKéMON worked!$" + .string "the opponent's POKéMON worked!$" BattleFrontier_BattleArenaLobby_Text_256C19: @ 8256C19 .string "Our match was declared a draw.\p" .string "When we ran out of time, both my\n" - .string "POKéMON and the opponent’s had about\l" + .string "POKéMON and the opponent's had about\l" .string "the same amount of HP left.$" BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A @@ -569,7 +569,7 @@ BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A BattleFrontier_BattleArenaLobby_Text_256DB8: @ 8256DB8 FallarborTown_BattleTentLobby_Text_256DB8: @ 8256DB8 - .string "The Set KO Tourney’s rules are listed.$" + .string "The Set KO Tourney's rules are listed.$" BattleFrontier_BattleArenaLobby_Text_256DDF: @ 8256DDF FallarborTown_BattleTentLobby_Text_256DDF: @ 8256DDF @@ -586,7 +586,7 @@ FallarborTown_BattleTentLobby_Text_256E02: @ 8256E02 .string "The REFEREE will choose the winner\n" .string "based on how the POKéMON battled.\p" .string "Also, a POKéMON cannot be switched out\n" - .string "until its battle’s outcome is decided.$" + .string "until its battle's outcome is decided.$" BattleFrontier_BattleArenaLobby_Text_256F43: @ 8256F43 FallarborTown_BattleTentLobby_Text_256F43: @ 8256F43 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index c8338d110..2d147e426 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -1055,7 +1055,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86 .string "What an unbelievable finish!\n" .string "We have a double knockout!\p" .string "In this event, the Battle Tournament\n" - .string "rules call for a REFEREE’S decision.\p" + .string "rules call for a REFEREE'S decision.\p" .string "Please wait while the judging\n" .string "is under way.$" @@ -1155,7 +1155,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CEBE: @ 824CEBE BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE .string "And now… The TRAINER standing in\n" - .string "{PLAYER}’s record-setting path…\p" + .string "{PLAYER}'s record-setting path…\p" .string "Yes! The one and only!\n" .string "The BATTLE DOME COMMISSIONER!\l" .string "Our very own DOME ACE!\l" @@ -1168,21 +1168,21 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CF7A: @ 824CF7A BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE .string "TUCKER: Ahahah!\p" .string "Do you hear it? This crowd!\n" - .string "They’re all itching to see our match!\p" + .string "They're all itching to see our match!\p" .string "Ahahah!\p" - .string "I bet you’re twitching all over from\n" + .string "I bet you're twitching all over from\n" .string "the tension of getting to battle me!\p" - .string "But don’t you worry about a thing!\p" - .string "I’m the no. 1 star of the BATTLE DOME!\n" + .string "But don't you worry about a thing!\p" + .string "I'm the no. 1 star of the BATTLE DOME!\n" .string "I, TUCKER the DOME ACE, will bathe you\l" .string "in my brilliant glow!$" BattleFrontier_BattleDomeBattleRoom_Text_24D0D9: @ 824D0D9 .string "Your strategy!\n" - .string "Let’s see it!$" + .string "Let's see it!$" BattleFrontier_BattleDomeBattleRoom_Text_24D0F6: @ 824D0F6 - .string "Unbelievable! It’s incredible!\n" + .string "Unbelievable! It's incredible!\n" .string "The victor is {PLAYER}!$" BattleFrontier_BattleDomeBattleRoom_Text_24D127: @ 824D127 @@ -1200,7 +1200,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D1AA: @ 824D1AA BattleFrontier_BattleDomeBattleRoom_Text_24D1E0: @ 824D1E0 .string "… … … … … …\p" - .string "I sorely underestimated you. I won’t\n" + .string "I sorely underestimated you. I won't\n" .string "make the same mistake next time…$" BattleFrontier_BattleDomeBattleRoom_Text_24D232: @ 824D232 @@ -1214,7 +1214,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C .string "Finally, the legend has returned!\p" .string "Yes, the name of that legend!\n" .string "Our very own DOME ACE!\l" - .string "It’s none other than TUCKER!$" + .string "It's none other than TUCKER!$" BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319 .string "TUCKER: Ah…\n" @@ -1233,9 +1233,9 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D43E: @ 824D43E .string "I possess! Right here and now!$" BattleFrontier_BattleDomeBattleRoom_Text_24D47F: @ 824D47F - .string "TUCKER: You’re genuinely fantastic!\p" - .string "Never before! I haven’t ever lost in the\n" - .string "times I’ve had to unleash my power.\p" + .string "TUCKER: You're genuinely fantastic!\p" + .string "Never before! I haven't ever lost in the\n" + .string "times I've had to unleash my power.\p" .string "Yes, quite fantastic!\n" .string "Your FRONTIER PASS, please?$" @@ -1244,7 +1244,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D522: @ 824D522 .string "a golden shine!$" BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D - .string "You’re strong, but above all,\n" + .string "You're strong, but above all,\n" .string "you have a unique charm!\p" .string "In you, I see a definite potential for\n" .string "a superstar like me.\p" @@ -1272,6 +1272,6 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D6BE: @ 824D6BE .string "The winner is…\n" .string "Oh, my goodness!\l" .string "The winner is our very own DOME ACE!\l" - .string "It’s TUCKER!\p" + .string "It's TUCKER!\p" .string "Congratulations! And thank you!\n" - .string "Let’s hear it for the DOME ACE, TUCKER!$" + .string "Let's hear it for the DOME ACE, TUCKER!$" diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index f66674444..a4a719090 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -556,14 +556,14 @@ BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E .string "The other two POKéMON can battle\n" .string "one at a time.\p" .string "Choose the two battling POKéMON after\n" - .string "examining the opponent’s trio.\p" + .string "examining the opponent's trio.\p" .string "You win the tournament by defeating\n" .string "four TRAINERS.\p" .string "Battle Points are awarded to\n" .string "the tournament winner.\p" .string "If you want to interrupt your\n" .string "tournament, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleDomeLobby_Text_24A1C6: @ 824A1C6 @@ -581,7 +581,7 @@ BattleFrontier_BattleDomeLobby_Text_24A26E: @ 824A26E BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" + .string "You don't have three eligible POKéMON.\p" .string "Also, the POKéMON must be holding\n" .string "different kinds of items.\p" .string "EGGS{STR_VAR_1} ineligible.\p" @@ -589,7 +589,7 @@ BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353 .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" + .string "You don't have three eligible POKéMON.\p" .string "You must have three different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -603,7 +603,7 @@ BattleFrontier_BattleDomeLobby_Text_24A437: @ 824A437 BattleFrontier_BattleDomeLobby_Text_24A45F: @ 824A45F .string "Excuse me!\p" - .string "You didn’t save before you quit your\n" + .string "You didn't save before you quit your\n" .string "challenge last time.\p" .string "Because of that, your challenge so far\n" .string "has been disqualified. Sorry!$" @@ -633,7 +633,7 @@ BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6 .string "Please wait.$" BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE - .string "We’ve been waiting for you!$" + .string "We've been waiting for you!$" BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A .string "Before I show you to the BATTLE DOME,\n" @@ -661,30 +661,30 @@ BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721 .string "The remaining two POKéMON must take\n" .string "part in a DOUBLE BATTLE.\p" .string "Choose the two battling POKéMON after\n" - .string "examining the opponent’s trio.\p" + .string "examining the opponent's trio.\p" .string "You win the tournament by defeating\n" .string "four TRAINERS.\p" .string "Battle Points are awarded to\n" .string "the tournament winner.\p" .string "If you want to interrupt your\n" .string "tournament, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966 - .string "They’re the results of the last\n" + .string "They're the results of the last\n" .string "Level 50 SINGLE BATTLE Tournament.$" BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9 - .string "They’re the results of the last\n" + .string "They're the results of the last\n" .string "Level 50 DOUBLE BATTLE Tournament.$" BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC - .string "They’re the results of the last\n" + .string "They're the results of the last\n" .string "Open Level SINGLE BATTLE Tournament.$" BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31 - .string "They’re the results of the last\n" + .string "They're the results of the last\n" .string "Open Level DOUBLE BATTLE Tournament.$" BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76 @@ -697,7 +697,7 @@ BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76 BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06 .string "The BATTLE FRONTIER…\n" - .string "I’ve long dreamed about a place like it.$" + .string "I've long dreamed about a place like it.$" BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44 .string "The BATTLE DOME\n" @@ -722,9 +722,9 @@ BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76 .string "Of course I got trashed…$" BattleFrontier_BattleDomeLobby_Text_24ACD3: @ 824ACD3 - .string "I would’ve won if I’d kept this POKéMON\n" + .string "I would've won if I'd kept this POKéMON\n" .string "held in reserve.\p" - .string "You need to check your opponent’s\n" + .string "You need to check your opponent's\n" .string "POKéMON carefully before choosing\l" .string "your battling POKéMON.$" @@ -764,7 +764,7 @@ BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C .string "The Tournament Tree will provide\n" .string "several kinds of data.\p" .string "The data on view includes the previous\n" - .string "tournament’s results, the POKéMON held\l" + .string "tournament's results, the POKéMON held\l" .string "by TRAINERS, and the battle styles of\l" .string "TRAINERS.$" diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index ee23f919e..28d634162 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -325,7 +325,7 @@ BattleFrontier_BattleDomePreBattleRoom_Text_24B748: @ 824B748 BattleFrontier_BattleDomePreBattleRoom_Text_24B760: @ 824B760 .string "Thank you for competing!\p" - .string "I’ll restore your POKéMON to\n" + .string "I'll restore your POKéMON to\n" .string "full health.$" BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3: @ 824B7A3 @@ -358,11 +358,11 @@ BattleFrontier_BattleDomePreBattleRoom_Text_24B8E6: @ 824B8E6 BattleFrontier_BattleDomePreBattleRoom_Text_24B94E: @ 824B94E .string "Congratulations for advancing\n" .string "to the final match.\p" - .string "You’re one win from the championship.\n" + .string "You're one win from the championship.\n" .string "Are you ready?$" BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5: @ 824B9B5 - .string "{PLAYER}’s next opponent\n" + .string "{PLAYER}'s next opponent\n" .string "is this TRAINER.$" BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9: @ 824B9D9 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 8e08404cd..ab3ea4d7c 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -318,21 +318,21 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2: @ 825B1E2 .string "Get a move on!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB: @ 825B1FB - .string "Hey, my name’s NOLAND!\n" - .string "I’m basically in charge of this place,\l" - .string "which is why I’m the FACTORY HEAD!\p" + .string "Hey, my name's NOLAND!\n" + .string "I'm basically in charge of this place,\l" + .string "which is why I'm the FACTORY HEAD!\p" .string "I had a look at your Battle Swap data.\p" .string "You seem to have the right idea,\n" - .string "but you’re still square in your head!\p" - .string "Listen up, okay? Knowledge isn’t only\n" + .string "but you're still square in your head!\p" + .string "Listen up, okay? Knowledge isn't only\n" .string "about reading books or doing desk work.\p" .string "Just doing that sort of thing…\n" .string "It may as well be useless!\p" .string "You have to experience things with\n" .string "your heart and your body, understand?\p" - .string "I’ll take you on under the same\n" + .string "I'll take you on under the same\n" .string "conditions as you.\p" - .string "I’ll be using rental POKéMON, too!$" + .string "I'll be using rental POKéMON, too!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1 .string "Shake out every last bit of your\n" @@ -340,7 +340,7 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1 BattleFrontier_BattleFactoryBattleRoom_Text_25B42D: @ 825B42D .string "NOLAND: Smart going!\n" - .string "Let’s see your FRONTIER PASS.$" + .string "Let's see your FRONTIER PASS.$" BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460 .string "The Knowledge Symbol was embossed\n" @@ -348,19 +348,19 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460 BattleFrontier_BattleFactoryBattleRoom_Text_25B498: @ 825B498 .string "Heh…\n" - .string "You’re a pretty bright spark…\p" - .string "Next time, I’ll come after you hard.\n" + .string "You're a pretty bright spark…\p" + .string "Next time, I'll come after you hard.\n" .string "No holds barred, understand?\p" .string "You keep up your studies!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B517: @ 825B517 - .string "NOLAND: Hey, hey! How’s it going?\n" + .string "NOLAND: Hey, hey! How's it going?\n" .string "You keeping up with your studies?\p" .string "…Oh?\p" - .string "You’ve taken on a harder look than\n" + .string "You've taken on a harder look than\n" .string "the last time I saw you.\p" .string "Now, this should be fun!\n" - .string "I’m getting excited, hey!$" + .string "I'm getting excited, hey!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF .string "All right!\n" @@ -368,9 +368,9 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7: @ 825B5E7 .string "NOLAND: What the…\n" - .string "You’re getting out of my league!\p" + .string "You're getting out of my league!\p" .string "Sheesh!\n" - .string "Let’s see that FRONTIER PASS!$" + .string "Let's see that FRONTIER PASS!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640 .string "The Knowledge Symbol took on\n" @@ -378,7 +378,7 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640 BattleFrontier_BattleFactoryBattleRoom_Text_25B66D: @ 825B66D .string "Pfft, man!\p" - .string "That’s absolutely the last time\n" + .string "That's absolutely the last time\n" .string "I lose to you!\p" .string "We have to do this again, hey?$" diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 0c6c35071..b387fc048 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -413,7 +413,7 @@ BattleFrontier_BattleFactoryLobby_Text_2589B3: @ 82589B3 .string "a row, you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save, you will be\n" + .string "If you don't save, you will be\n" .string "disqualified from your challenge.$" BattleFrontier_BattleFactoryLobby_Text_258BC5: @ 8258BC5 @@ -446,7 +446,7 @@ BattleFrontier_BattleFactoryLobby_Text_258D54: @ 8258D54 .string "for our rental POKéMON.$" BattleFrontier_BattleFactoryLobby_Text_258D93: @ 8258D93 - .string "Congratulations! You’ve won seven\n" + .string "Congratulations! You've won seven\n" .string "straight Battle Swap matches!$" BattleFrontier_BattleFactoryLobby_Text_258DD3: @ 8258DD3 @@ -460,18 +460,18 @@ BattleFrontier_BattleFactoryLobby_Text_258E1C: @ 8258E1C .string "some Battle Points.$" BattleFrontier_BattleFactoryLobby_Text_258E77: @ 8258E77 - .string "We’ve been waiting for you!\p" + .string "We've been waiting for you!\p" .string "Before we resume your challenge,\n" .string "I must save the game.$" BattleFrontier_BattleFactoryLobby_Text_258ECA: @ 8258ECA - .string "I’m sorry to say this, but you didn’t\n" + .string "I'm sorry to say this, but you didn't\n" .string "save before you quit playing last time.\p" .string "As a result, you have been disqualified\n" .string "from your challenge.$" BattleFrontier_BattleFactoryLobby_Text_258F55: @ 8258F55 - .string "We’ll return your personal POKéMON.$" + .string "We'll return your personal POKéMON.$" BattleFrontier_BattleFactoryLobby_Text_258F79: @ 8258F79 .string "{PLAYER} received the prize\n" @@ -503,7 +503,7 @@ BattleFrontier_BattleFactoryLobby_Text_259058: @ 8259058 .string "a row, you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleFactoryLobby_Text_25926A: @ 825926A @@ -531,11 +531,11 @@ BattleFrontier_BattleFactoryLobby_Text_2593D7: @ 82593D7 .string "Hi!\n" .string "You, there!\p" .string "Are you thinking that the events here\n" - .string "are easy since you don’t need to have\l" + .string "are easy since you don't need to have\l" .string "a raised team of POKéMON?\p" - .string "I wouldn’t be too sure about winning\n" + .string "I wouldn't be too sure about winning\n" .string "that easily.\p" - .string "If you don’t have thorough knowledge\n" + .string "If you don't have thorough knowledge\n" .string "about POKéMON and their moves,\l" .string "it will be tough to keep winning.$" @@ -545,20 +545,20 @@ BattleFrontier_BattleFactoryLobby_Text_2594E5: @ 82594E5 .string "They wiped the floor with us…$" BattleFrontier_BattleFactoryLobby_Text_259547: @ 8259547 - .string "Things haven’t been going my way\n" + .string "Things haven't been going my way\n" .string "at all.\p" - .string "You need to check your opponent’s\n" + .string "You need to check your opponent's\n" .string "POKéMON during battle to see if\l" - .string "they’re any good.$" + .string "they're any good.$" BattleFrontier_BattleFactoryLobby_Text_2595C4: @ 82595C4 .string "You know how the staff here give you\n" .string "a few hints about your next opponent?\p" - .string "Well, I’m a full-grown man, but I have\n" + .string "Well, I'm a full-grown man, but I have\n" .string "trouble figuring out their hints.$" BattleFrontier_BattleFactoryLobby_Text_259658: @ 8259658 - .string "Like, I’m really tough, but I get bored\n" + .string "Like, I'm really tough, but I get bored\n" .string "really easily, so I just kept swapping\l" .string "and battling over and over.\p" .string "So anyway, when I kept entering\n" @@ -589,14 +589,14 @@ BattleFrontier_BattleFactoryLobby_Text_2597FB: @ 82597FB BattleFrontier_BattleFactoryLobby_Text_25987E: @ 825987E .string "After every battle you win, you may\n" .string "swap for one of your defeated\l" - .string "opponent’s POKéMON.\p" + .string "opponent's POKéMON.\p" .string "You will not be able to swap POKéMON\n" .string "with the seventh TRAINER in the event.$" BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920 .string "There are two key points to be aware\n" .string "of when swapping POKéMON.\p" - .string "First, when swapping, you can’t check\n" + .string "First, when swapping, you can't check\n" .string "the stats of the POKéMON you are\l" .string "about to receive.\p" .string "Second, the POKéMON on your team\n" @@ -607,5 +607,5 @@ BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920 BattleFrontier_BattleFactoryLobby_Text_259A5E: @ 8259A5E .string "In the Open Level, the rental POKéMON\n" - .string "and the opposing TRAINERS’ POKéMON\l" + .string "and the opposing TRAINERS' POKéMON\l" .string "are all Level 100.$" diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index e41efdc85..a212ce38f 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -567,7 +567,7 @@ SlateportCity_BattleTentCorridor_Text_25A37A: @ 825A37A .string "Battle Swap challenge?$" BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4: @ 825A3B4 - .string "I’ve conducted a little investigation\n" + .string "I've conducted a little investigation\n" .string "about your upcoming opponent.$" BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8: @ 825A3F8 @@ -656,7 +656,7 @@ Text_StyleHighRisk: @ 825A94C Text_StyleDependsOnFlow: @ 825A98C .string "The favorite battle style appears to\n" - .string "depend on the battle’s flow.$" + .string "depend on the battle's flow.$" Text_StyleTotalPreparation: @ 825A9CE .string "The favorite battle style appears to\n" @@ -712,9 +712,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58: @ 825AC58 BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89: @ 825AC89 .string "Oh, my…\n" .string "Sorry to keep you waiting!\p" - .string "I have a message from this facility’s\n" + .string "I have a message from this facility's\n" .string "boss, the FACTORY HEAD.\p" - .string "He says, “We’re going to do it!\n" + .string "He says, “We're going to do it!\n" .string "Come here right now!â€$" BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20 @@ -722,5 +722,5 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20 .string "Are you prepared to face him?$" BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61: @ 825AD61 - .string "I’m terribly sorry, but I can’t tell you\n" + .string "I'm terribly sorry, but I can't tell you\n" .string "anything about the FACTORY HEAD.$" diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 2b8f8d763..ccada959e 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -600,26 +600,26 @@ BattleFrontier_BattlePalaceBattleRoom_Text_25036D: @ 825036D .string "My, my, if only you could maintain that\n" .string "facade of distinguished authority…\p" .string "Here!\n" - .string "Let’s see your FRONTIER PASS!$" + .string "Let's see your FRONTIER PASS!$" BattleFrontier_BattlePalaceBattleRoom_Text_2503DC: @ 82503DC .string "The Spirits Symbol was embossed on\n" .string "the FRONTIER PASS!$" BattleFrontier_BattlePalaceBattleRoom_Text_250412: @ 8250412 - .string "SPENSER: Your POKéMON’s eyes are \n" + .string "SPENSER: Your POKéMON's eyes are \n" .string "truly clear and unclouded.\p" .string "I will eagerly await the next\n" .string "opportunity to see you.$" BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485 .string "SPENSER: Gwahahah!\n" - .string "You’ve battled your way up again?\p" + .string "You've battled your way up again?\p" .string "You must have developed a truly\n" .string "formidable bond with your POKéMON.\p" .string "So be it!\p" - .string "This time, I won’t bluster or hold back.\n" - .string "This time, there’s no fooling around.\p" + .string "This time, I won't bluster or hold back.\n" + .string "This time, there's no fooling around.\p" .string "Ready now?\n" .string "Prepare to lose!$" diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 2af0d954f..199a67fa6 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -141,18 +141,18 @@ BattleFrontier_BattlePalaceCorridor_Text_24F65B: @ 824F65B .string "Rather than trying to make a POKéMON\n" .string "do what it dislikes, try to let it do\l" .string "what it likes and is good at doing.\p" - .string "Put yourself in the POKéMON’s position\n" + .string "Put yourself in the POKéMON's position\n" .string "and consider what moves it would like.$" BattleFrontier_BattlePalaceCorridor_Text_24F718: @ 824F718 - .string "A POKéMON’s nature is a remarkable\n" + .string "A POKéMON's nature is a remarkable\n" .string "thing…\p" .string "Some POKéMON behave in a completely\n" .string "different way when they are cornered.$" BattleFrontier_BattlePalaceCorridor_Text_24F78C: @ 824F78C .string "Are you beginning to understand how\n" - .string "a POKéMON’s nature makes it behave?$" + .string "a POKéMON's nature makes it behave?$" BattleFrontier_BattlePalaceCorridor_Text_24F7D4: @ 824F7D4 .string "Ah… I see a strong, heartfelt bond\n" diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index cf3ecfb14..c81331ddc 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -477,7 +477,7 @@ BattleFrontier_BattlePalaceLobby_Text_24DE17: @ 824DE17 .string "we will present you with Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, you must save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattlePalaceLobby_Text_24E0D8: @ 824E0D8 @@ -529,7 +529,7 @@ BattleFrontier_BattlePalaceLobby_Text_24E408: @ 824E408 BattleFrontier_BattlePalaceLobby_Text_24E41E: @ 824E41E .string "I feel privileged for having seen\n" - .string "your POKéMON’s exploits.\p" + .string "your POKéMON's exploits.\p" .string "The results will be recorded.\n" .string "I must ask you to briefly wait.$" @@ -578,13 +578,13 @@ BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3 .string "hardy POKéMON are the best.\p" .string "Offense is the best defense!\n" .string "A relentless attack is the ultimate!\p" - .string "But that’s not what I wanted to chat\n" + .string "But that's not what I wanted to chat\n" .string "about.\p" .string "Every so often a really cute lady\n" .string "swings by here.\p" .string "She says that she can tell what\n" .string "POKéMON are thinking.\p" - .string "I don’t know about that part,\n" + .string "I don't know about that part,\n" .string "but she is really cute.\p" .string "Huh?\n" .string "Why are you looking at me like that?$" @@ -594,7 +594,7 @@ BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851 .string "It appears that the nature of POKéMON\n" .string "and the moves that they have been\l" .string "taught are the keys to battle here.\p" - .string "To be more precise, it’s how well\n" + .string "To be more precise, it's how well\n" .string "the moves match the nature of\l" .string "the POKéMON.\p" .string "If your POKéMON is in trouble and\n" @@ -604,18 +604,18 @@ BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851 BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992 .string "My POKéMON is usually very docile.\p" - .string "But when it’s in a BATTLE HALL,\n" + .string "But when it's in a BATTLE HALL,\n" .string "it sometimes seems to become\l" .string "transformed into something wicked!\p" .string "It becomes totally intimidating.\n" - .string "It’s shocking, even.$" + .string "It's shocking, even.$" BattleFrontier_BattlePalaceLobby_Text_24EA4B: @ 824EA4B .string "I wonder what sort of nature a POKéMON\n" .string "would have if it favored enfeebling its\l" .string "opponents and chipping away slowly.\p" - .string "I’d be surprised if it was a LAX nature.\p" - .string "But, nah, that can’t be right.$" + .string "I'd be surprised if it was a LAX nature.\p" + .string "But, nah, that can't be right.$" BattleFrontier_BattlePalaceLobby_Text_24EB06: @ 824EB06 .string "Where the hearts of TRAINERS\n" @@ -648,7 +648,7 @@ BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2 .string "we will present you with Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattlePalaceLobby_Text_24EE81: @ 824EE81 @@ -722,7 +722,7 @@ VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8 BattleFrontier_BattlePalaceLobby_Text_24F3F4: @ 824F3F4 VerdanturfTown_BattleTentLobby_Text_24F3F4: @ 824F3F4 .string "Depending on its nature, a POKéMON may\n" - .string "start using moves that don’t match its\l" + .string "start using moves that don't match its\l" .string "nature when it is in trouble.\p" .string "If a POKéMON begins behaving oddly\n" .string "in a pinch, watch it carefully.$" diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 278bd0407..e4f3e1a6e 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -352,7 +352,7 @@ BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5 .string "simple…\p" .string "Choose one of three paths and make\n" .string "your way to the goal room at the end\l" - .string "of the BATTLE PIKE. It’s that simple.\p" + .string "of the BATTLE PIKE. It's that simple.\p" .string "However, what happens on the chosen\n" .string "path depends entirely on the luck\l" .string "of the challenger…\p" @@ -361,7 +361,7 @@ BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5 .string "If you want to interrupt your\n" .string "challenge, please have a word with\l" .string "our staff in the big rooms on the way.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattlePikeLobby_Text_25BE02: @ 825BE02 @@ -452,29 +452,29 @@ BattleFrontier_BattlePikeLobby_Text_25C3D9: @ 825C3D9 BattleFrontier_BattlePikeLobby_Text_25C422: @ 825C422 .string "Arrgh! I blew my chance!\n" .string "I was one room away from the goal!\p" - .string "In this place, you’d better watch out\n" + .string "In this place, you'd better watch out\n" .string "for poison, freezing, and so on.$" BattleFrontier_BattlePikeLobby_Text_25C4A5: @ 825C4A5 - .string "I’ve completed the challenge 10 times\n" - .string "now, but I’ve never had to battle\l" + .string "I've completed the challenge 10 times\n" + .string "now, but I've never had to battle\l" .string "a TRAINER once.$" BattleFrontier_BattlePikeLobby_Text_25C4FD: @ 825C4FD .string "Listen! Listen!\p" - .string "Don’t you think that the special\n" + .string "Don't you think that the special\n" .string "abilities of POKéMON will be useful\l" .string "here?$" BattleFrontier_BattlePikeLobby_Text_25C558: @ 825C558 .string "What is this weird place?\n" - .string "I can’t figure it out at all!\p" - .string "I’ve taken the challenge a bunch\n" + .string "I can't figure it out at all!\p" + .string "I've taken the challenge a bunch\n" .string "of times, but all I ever do is run into\l" .string "TRAINERS whichever path I choose.$" BattleFrontier_BattlePikeLobby_Text_25C5FB: @ 825C5FB - .string "The Battle Choice’s rules are listed.$" + .string "The Battle Choice's rules are listed.$" BattleFrontier_BattlePikeLobby_Text_25C621: @ 825C621 .string "Which heading do you want to read?$" diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 3778d4af6..79a10880a 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -709,8 +709,8 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DA13: @ 825DA13 .string "Battle Choice challenge…$" BattleFrontier_BattlePikeRandomRoom1_Text_25DA51: @ 825DA51 - .string "Ah, you’re a lucky one.\n" - .string "I’m in somewhat-good spirits now.\p" + .string "Ah, you're a lucky one.\n" + .string "I'm in somewhat-good spirits now.\p" .string "I will restore one of your POKéMON\n" .string "to full health.$" @@ -721,7 +721,7 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DABE: @ 825DABE BattleFrontier_BattlePikeRandomRoom1_Text_25DAE1: @ 825DAE1 .string "Excuse me…\p" .string "Would you care for a battle?\n" - .string "I’ll restore your POKéMON if you win.$" + .string "I'll restore your POKéMON if you win.$" BattleFrontier_BattlePikeRandomRoom1_Text_25DB2F: @ 825DB2F .string "Very well…\n" @@ -772,7 +772,7 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DC97: @ 825DC97 BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF: @ 825DCAF .string "Look here!\n" - .string "That’s quite enough!$" + .string "That's quite enough!$" BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF: @ 825DCCF .string "I must apologize to you…\p" @@ -815,12 +815,12 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DED2: @ 825DED2 .string "For I am the PIKE QUEEN…\p" .string "You already know it, but to advance,\n" .string "you must defeat me…\p" - .string "…I’m not one for idle chatter.\n" + .string "…I'm not one for idle chatter.\n" .string "Hurry. Come on…$" BattleFrontier_BattlePikeRandomRoom1_Text_25DF71: @ 825DF71 .string "Your luck…\n" - .string "I hope you didn’t use it all up here…$" + .string "I hope you didn't use it all up here…$" BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2: @ 825DFA2 .string "LUCY: … … … … … …\n" @@ -831,18 +831,18 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0: @ 825DFD0 .string "the FRONTIER PASS!$" BattleFrontier_BattlePikeRandomRoom1_Text_25E003: @ 825E003 - .string "…That’s all there is…\n" + .string "…That's all there is…\n" .string "Disappear already…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E02C: @ 825E02C .string "LUCY: …You again…\p" .string "… … … … … …\p" - .string "…I’ve trampled flowers and braved\n" + .string "…I've trampled flowers and braved\n" .string "storms to get to where I am…\p" - .string "I don’t feel any compulsion to keep\n" + .string "I don't feel any compulsion to keep\n" .string "losing to the same opponent…\p" .string "… … … … … …\n" - .string "Fine… I’ll do it…$" + .string "Fine… I'll do it…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8: @ 825E0E8 .string "Now!\n" @@ -857,14 +857,14 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25E118: @ 825E118 .string "a golden shine!$" BattleFrontier_BattlePikeRandomRoom1_Text_25E140: @ 825E140 - .string "…You, I won’t forget…\n" + .string "…You, I won't forget…\n" .string "…Ever…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E15D: @ 825E15D .string "I welcome you…\p" .string "Giggle…\n" .string "You seem to be bereft of luck…\p" - .string "If only you hadn’t chosen this room,\n" + .string "If only you hadn't chosen this room,\n" .string "your POKéMON could have been healed…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD: @ 825E1DD @@ -888,8 +888,8 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25E311: @ 825E311 .string "I shall go fetch our master…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E32E: @ 825E32E - .string "Ah, you’re a lucky one!\n" - .string "I’m in good spirits now.\p" + .string "Ah, you're a lucky one!\n" + .string "I'm in good spirits now.\p" .string "I will restore two of your POKéMON\n" .string "to full health!$" diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 3d42b2e36..ab40b6ff0 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -326,7 +326,7 @@ BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C: @ 825CD3C .string "Battle Choice challenge?$" BattleFrontier_BattlePikeThreePathRoom_Text_25CD75: @ 825CD75 - .string "We’ve been awaiting your return…\p" + .string "We've been awaiting your return…\p" .string "Before resuming your Battle Choice\n" .string "challenge, let me save the game…$" diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc index 6e85b849a..91a42ebde 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -485,143 +485,143 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_25F890: @ 825F890 .string "Please choose a prize from this list.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6: @ 825F8B6 - .string "You’ve chosen the KISS POSTER.\n" + .string "You've chosen the KISS POSTER.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6: @ 825F8E6 - .string "You’ve chosen the KISS CUSHION.\n" + .string "You've chosen the KISS CUSHION.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917: @ 825F917 - .string "You’ve chosen the SMOOCHUM DOLL.\n" + .string "You've chosen the SMOOCHUM DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949: @ 825F949 - .string "You’ve chosen the TOGEPI DOLL.\n" + .string "You've chosen the TOGEPI DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979: @ 825F979 - .string "You’ve chosen the MEOWTH DOLL.\n" + .string "You've chosen the MEOWTH DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9: @ 825F9A9 - .string "You’ve chosen the CLEFAIRY DOLL.\n" + .string "You've chosen the CLEFAIRY DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB: @ 825F9DB - .string "You’ve chosen the DITTO DOLL.\n" + .string "You've chosen the DITTO DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A: @ 825FA0A - .string "You’ve chosen the CYNDAQUIL DOLL.\n" + .string "You've chosen the CYNDAQUIL DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D: @ 825FA3D - .string "You’ve chosen the CHIKORITA DOLL.\n" + .string "You've chosen the CHIKORITA DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70: @ 825FA70 - .string "You’ve chosen the TOTODILE DOLL.\n" + .string "You've chosen the TOTODILE DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2: @ 825FAA2 - .string "You’ve chosen the LAPRAS DOLL.\n" + .string "You've chosen the LAPRAS DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2: @ 825FAD2 - .string "You’ve chosen the SNORLAX DOLL.\n" + .string "You've chosen the SNORLAX DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03: @ 825FB03 - .string "You’ve chosen the VENUSAUR DOLL.\n" + .string "You've chosen the VENUSAUR DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35: @ 825FB35 - .string "You’ve chosen the CHARIZARD DOLL.\n" + .string "You've chosen the CHARIZARD DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68: @ 825FB68 - .string "You’ve chosen the BLASTOISE DOLL.\n" + .string "You've chosen the BLASTOISE DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B: @ 825FB9B - .string "You’ve chosen the PROTEIN.\n" + .string "You've chosen the PROTEIN.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7: @ 825FBC7 - .string "You’ve chosen the CALCIUM.\n" + .string "You've chosen the CALCIUM.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3: @ 825FBF3 - .string "You’ve chosen the IRON.\n" + .string "You've chosen the IRON.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C: @ 825FC1C - .string "You’ve chosen the ZINC.\n" + .string "You've chosen the ZINC.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45: @ 825FC45 - .string "You’ve chosen the CARBOS.\n" + .string "You've chosen the CARBOS.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70: @ 825FC70 - .string "You’ve chosen the HP UP.\n" + .string "You've chosen the HP UP.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A: @ 825FC9A - .string "You’ve chosen the BRIGHTPOWDER.\n" + .string "You've chosen the BRIGHTPOWDER.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB: @ 825FCCB - .string "You’ve chosen the WHITE HERB.\n" + .string "You've chosen the WHITE HERB.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA: @ 825FCFA - .string "You’ve chosen the QUICK CLAW.\n" + .string "You've chosen the QUICK CLAW.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29: @ 825FD29 - .string "You’ve chosen the MENTAL HERB.\n" + .string "You've chosen the MENTAL HERB.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59: @ 825FD59 - .string "You’ve chosen the CHOICE BAND.\n" + .string "You've chosen the CHOICE BAND.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89: @ 825FD89 - .string "You’ve chosen the KING’S ROCK.\n" + .string "You've chosen the KING'S ROCK.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9: @ 825FDB9 - .string "You’ve chosen the FOCUS BAND.\n" + .string "You've chosen the FOCUS BAND.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8: @ 825FDE8 - .string "You’ve chosen the SCOPE LENS.\n" + .string "You've chosen the SCOPE LENS.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17: @ 825FE17 - .string "You’ve chosen the LEFTOVERS.\n" + .string "You've chosen the LEFTOVERS.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45: @ 825FE45 .string "Thank you!\n" - .string "We’ll send it to your PC at home.$" + .string "We'll send it to your PC at home.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72: @ 825FE72 .string "Here is your prize!$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86: @ 825FE86 - .string "I’m so sorry…\n" - .string "You don’t have enough Battle Points…$" + .string "I'm so sorry…\n" + .string "You don't have enough Battle Points…$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9: @ 825FEB9 - .string "I’m so sorry…\n" + .string "I'm so sorry…\n" .string "Your PC appears to be full…$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3: @ 825FEE3 - .string "I’m so sorry…\n" - .string "You don’t have space to hold it…$" + .string "I'm so sorry…\n" + .string "You don't have space to hold it…$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12: @ 825FF12 .string "Thank you very much.\p" @@ -629,7 +629,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12: @ 825FF12 .string "saved up Battle Points.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D: @ 825FF5D - .string "Oh, they’re so nice!\n" + .string "Oh, they're so nice!\n" .string "I wish I had them!\l" .string "Cute cushions!\l" .string "Big plush DOLLS!\l" @@ -638,7 +638,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D: @ 825FF5D BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0: @ 825FFD0 .string "Leave it to your mommy!\p" - .string "If it’s anything you want, I’ll go\n" + .string "If it's anything you want, I'll go\n" .string "through anything to get it, honey!$" BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E: @ 826002E @@ -650,10 +650,10 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E: @ 826002E BattleFrontier_BattlePointExchangeServiceCorner_Text_260099: @ 8260099 .string "Hah?\n" .string "What are you gawking at?\p" - .string "I don’t like you staring at my plush\n" + .string "I don't like you staring at my plush\n" .string "doll like that.\p" .string "If you want it, go get one yourself!\n" - .string "Isn’t that right, SMOOCHUM?$" + .string "Isn't that right, SMOOCHUM?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D: @ 826012D .string "Did you know?\p" @@ -748,7 +748,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_260542:: @ 8260542 .string "reduce accuracy.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_260575:: @ 8260575 - .string "Raises a move’s power, but permits\n" + .string "Raises a move's power, but permits\n" .string "only that move.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8:: @ 82605A8 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 3aa041fb4..cff9197f8 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -190,19 +190,19 @@ gText_BattlePyramidConfirmRetire:: @ 8252CFB .string "PYRAMID quest?$" BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D - .string "This floor’s exit is in\n" + .string "This floor's exit is in\n" .string "that direction: {UP_ARROW}$" BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57 - .string "This floor’s exit is in\n" + .string "This floor's exit is in\n" .string "that direction: {LEFT_ARROW}$" BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81 - .string "This floor’s exit is in\n" + .string "This floor's exit is in\n" .string "that direction: {RIGHT_ARROW}$" BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB - .string "This floor’s exit is in\n" + .string "This floor's exit is in\n" .string "that direction: {DOWN_ARROW}$" BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5 @@ -255,19 +255,19 @@ BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5 .string "The exit?\n" - .string "It’s that {UP_ARROW} way.$" + .string "It's that {UP_ARROW} way.$" BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000 .string "The exit?\n" - .string "It’s that {LEFT_ARROW} way.$" + .string "It's that {LEFT_ARROW} way.$" BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B .string "The exit?\n" - .string "It’s that {RIGHT_ARROW} way.$" + .string "It's that {RIGHT_ARROW} way.$" BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036 .string "The exit?\n" - .string "It’s that {DOWN_ARROW} way.$" + .string "It's that {DOWN_ARROW} way.$" BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051 .string "The exit happens to be in\n" @@ -327,159 +327,159 @@ BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B .string "Are you looking for items?\p" - .string "There isn’t anything left to\n" + .string "There isn't anything left to\n" .string "be found!$" BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are eight items\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are seven items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are six items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are five items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are four items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are three items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are two items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There is just one item\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" - .string "There isn’t anything left\n" + .string "There isn't anything left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are eight items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are seven items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are six items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are five items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are four items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are three items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are two items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980 - .string "How’s your stock of items holding up?\p" - .string "I reckon there’s but one item left\n" + .string "How's your stock of items holding up?\p" + .string "I reckon there's but one item left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are no more items\n" .string "waiting to be found on this floor.\l" .string "You take care now!$" BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be eight more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be seven more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be six more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be five more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be four more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be three more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be two more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appears to be only one more\n" .string "item on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be no more\n" .string "items on the ground.$" @@ -597,12 +597,12 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A .string "You were really awesome!\p" - .string "But there’s still one tough\n" + .string "But there's still one tough\n" .string "TRAINER other than me!$" BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6 .string "You were really awesome!\p" - .string "There’s no one left that\n" + .string "There's no one left that\n" .string "can beat you!$" BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6 @@ -637,8 +637,8 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC .string "This is so upsetting!\p" - .string "But there’s one TRAINER left!\n" - .string "I’m sure you will be humbled!$" + .string "But there's one TRAINER left!\n" + .string "I'm sure you will be humbled!$" BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E .string "This is so upsetting!\p" @@ -646,43 +646,43 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E .string "who can engage you!$" BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767 - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are seven more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9 - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are six more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829 - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are five more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are four more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are three more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are two more TRAINERS\n" .string "on this floor. Can you beat them both?$" BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE - .string "That’s pretty impressive!\p" - .string "But there’s still one more TRAINER\n" + .string "That's pretty impressive!\p" + .string "But there's still one more TRAINER\n" .string "on this floor. Can you prevail?$" BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B - .string "That’s pretty impressive!\p" - .string "You’ve gone through all the TRAINERS\n" + .string "That's pretty impressive!\p" + .string "You've gone through all the TRAINERS\n" .string "on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59 @@ -714,7 +714,7 @@ BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1 .string "with the one TRAINER left on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E - .string "There isn’t a single person left who\n" + .string "There isn't a single person left who\n" .string "can defeat you now…$" BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77 @@ -779,5 +779,5 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F .string "the last remaining TRAINER?$" BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 - .string "There aren’t any TRAINERS left that\n" + .string "There aren't any TRAINERS left that\n" .string "can take you on now…$" diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 9b5ea145e..d890b2d06 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -626,7 +626,7 @@ BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C .string "If you want to interrupt your\n" .string "challenge, you must select “RESTâ€\l" .string "and save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattlePyramidLobby_Text_251248: @ 8251248 @@ -696,21 +696,21 @@ BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6 .string "You did not save before ending\n" .string "your challenge the last time.\p" .string "Consequently, your challenge has\n" - .string "been disqualified, I’m sorry to say.\p" - .string "Here is the BAG we’ve been holding\n" + .string "been disqualified, I'm sorry to say.\p" + .string "Here is the BAG we've been holding\n" .string "for you.\p" .string "{PLAYER} got the BAG back.$" BattleFrontier_BattlePyramidLobby_Text_2517B5: @ 82517B5 .string "Excellent to see you back!\p" - .string "You’ve conquered the PYRAMID!\n" + .string "You've conquered the PYRAMID!\n" .string "How splendid!$" BattleFrontier_BattlePyramidLobby_Text_2517FC: @ 82517FC .string "Ah, a slight problem.\p" .string "At least one POKéMON is holding\n" .string "an item.\p" - .string "I’m sorry to say, items obtained in\n" + .string "I'm sorry to say, items obtained in\n" .string "the PYRAMID cannot be taken away.$" BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881 @@ -719,8 +719,8 @@ BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881 BattleFrontier_BattlePyramidLobby_Text_2518C6: @ 82518C6 .string "The BATTLE BAG cannot hold all your\n" - .string "items, I’m sorry to say.\p" - .string "Please pick the items you’ll keep in the\n" + .string "items, I'm sorry to say.\p" + .string "Please pick the items you'll keep in the\n" .string "BATTLE BAG, and with your POKéMON.$" BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F @@ -728,7 +728,7 @@ BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F .string "holding an item.$" BattleFrontier_BattlePyramidLobby_Text_25197E: @ 825197E - .string "Please pick the items you’ll keep in the\n" + .string "Please pick the items you'll keep in the\n" .string "BATTLE BAG, and with your POKéMON.$" BattleFrontier_BattlePyramidLobby_Text_2519CA: @ 82519CA @@ -739,7 +739,7 @@ BattleFrontier_BattlePyramidLobby_Text_2519F8: @ 82519F8 .string "The BATTLE BAG you used will be kept\n" .string "in readiness for your next challenge.\p" .string "{PLAYER} turned the BATTLE BAG over\n" - .string "for the BAG’s return.$" + .string "for the BAG's return.$" BattleFrontier_BattlePyramidLobby_Text_251A77: @ 8251A77 .string "I must record your results.\n" @@ -756,12 +756,12 @@ BattleFrontier_BattlePyramidLobby_Text_251AE2: @ 8251AE2 BattleFrontier_BattlePyramidLobby_Text_251AFC: @ 8251AFC .string "…Ah…\n" .string "Your BAG appears to be filled.\p" - .string "Please return after you’ve organized\n" - .string "your BAG’s contents.$" + .string "Please return after you've organized\n" + .string "your BAG's contents.$" BattleFrontier_BattlePyramidLobby_Text_251B5A: @ 8251B5A .string "How disappointing for you…\p" - .string "Here is the BAG we’ve been holding\n" + .string "Here is the BAG we've been holding\n" .string "for you.\p" .string "{PLAYER} got the BAG back.$" @@ -818,7 +818,7 @@ BattleFrontier_BattlePyramidLobby_Text_251EA1: @ 8251EA1 .string "I sense terrific energy rising from\n" .string "the ground below…\p" .string "…And, I see your POKéMON unable to\n" - .string "escape the power’s clutches…$" + .string "escape the power's clutches…$" BattleFrontier_BattlePyramidLobby_Text_251F17: @ 8251F17 .string "I see ICE-type POKéMON…\p" @@ -908,7 +908,7 @@ BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA .string "If you run fast, TRAINERS may notice\n" .string "and come after you for a battle.\p" .string "So, if you want to avoid TRAINERS,\n" - .string "don’t catch their eyes, but sneak\l" + .string "don't catch their eyes, but sneak\l" .string "cautiously and quietly past them.$" BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595 @@ -919,8 +919,8 @@ BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595 BattleFrontier_BattlePyramidLobby_Text_2525F4: @ 82525F4 .string "Welcome back!\n" - .string "You’ve done the unthinkable!\p" - .string "You’ve defeated the PYRAMID KING\n" + .string "You've done the unthinkable!\p" + .string "You've defeated the PYRAMID KING\n" .string "and conquered the BATTLE PYRAMID!$" BattleFrontier_BattlePyramidLobby_Text_252662: @ 8252662 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 7454dd10a..d7a1a3c3b 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -267,7 +267,7 @@ BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 .string "It is a delight to see you here!\n" .string "You have reached the summit of\l" .string "the BATTLE PYRAMID!\p" - .string "Above here is the PYRAMID’s\n" + .string "Above here is the PYRAMID's\n" .string "lookout point.\p" .string "It is a place open only to those\n" .string "who have conquered the PYRAMID.\p" @@ -275,7 +275,7 @@ BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 .string "Up you go!$" BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8 - .string "The PYRAMID’s new conqueror!\n" + .string "The PYRAMID's new conqueror!\n" .string "Let the name {PLAYER} be known!$" BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F @@ -293,7 +293,7 @@ BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 .string "Young adventurer…\p" - .string "Wouldn’t you agree that explorations\n" + .string "Wouldn't you agree that explorations\n" .string "are the grandest of adventures?\p" .string "Your own wits!\p" .string "Your own strength!\p" @@ -304,9 +304,9 @@ BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E .string "Aah, yes, indeed this life is grand!\n" .string "Grand, it is! Eh?\p" - .string "I’m BRANDON!\p" - .string "I’m the PYRAMID KING, which means\n" - .string "I’m in charge here.\p" + .string "I'm BRANDON!\p" + .string "I'm the PYRAMID KING, which means\n" + .string "I'm in charge here.\p" .string "Most people call me the chief!\p" .string "You coming here means you have\n" .string "that much confidence in yourself,\l" @@ -321,7 +321,7 @@ BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846 BattleFrontier_BattlePyramidTop_Text_255873: @ 8255873 .string "BRANDON: Hahahah! Grand it was!\n" .string "Grand, yes, indeed!\p" - .string "Well done! You’ve earned recognition!\n" + .string "Well done! You've earned recognition!\n" .string "Your FRONTIER PASS, please!$" BattleFrontier_BattlePyramidTop_Text_2558E9: @ 82558E9 @@ -333,7 +333,7 @@ BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D .string "I look forward to our next meeting!$" BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951 - .string "BRANDON: …You’ve finally returned,\n" + .string "BRANDON: …You've finally returned,\n" .string "young explorer…\p" .string "Your love of adventure seems to come\n" .string "deep from within your heart…\p" @@ -353,14 +353,14 @@ BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1 .string "Everything you have!\n" - .string "I’m braced for it all!$" + .string "I'm braced for it all!$" BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD .string "BRANDON: Hahahah!\n" .string "Remarkable!\l" - .string "Yes, it’s grand, indeed!\p" + .string "Yes, it's grand, indeed!\p" .string "Young explorer!\p" - .string "You’ve bested me through and through!\n" + .string "You've bested me through and through!\n" .string "Here! I want you to have this!$" BattleFrontier_BattlePyramidTop_Text_255B59: @ 8255B59 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 2a0a2ce48..83b78d40e 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -556,7 +556,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3 .string "FRONTIER PASS?$" BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD - .string "{PLAYER}’s battle was recorded\n" + .string "{PLAYER}'s battle was recorded\n" .string "on the FRONTIER PASS.$" BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC @@ -597,7 +597,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579 .string "about you…\p" .string "In all honesty, what I have heard does\n" .string "not seem attractive in any way…\p" - .string "The reason I’ve come to see you…\n" + .string "The reason I've come to see you…\n" .string "Well, there is but one reason…$" BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C @@ -616,7 +616,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744 .string "… … … … … …\p" .string "You have confidence in your POKéMON\n" - .string "battling talent, don’t you?\p" + .string "battling talent, don't you?\p" .string "I urge you to keep battling and\n" .string "keep on winning.\p" .string "I will be waiting for you.\n" @@ -626,14 +626,14 @@ BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9 .string "ANABEL: You really did come back to\n" .string "see me…\p" .string "… … … … … …\p" - .string "You’ve won straight matches to see me…\n" - .string "I won’t have to hold back against you…\p" - .string "It’s been too long now…\p" - .string "Too long since I’ve been able to battle\n" + .string "You've won straight matches to see me…\n" + .string "I won't have to hold back against you…\p" + .string "It's been too long now…\p" + .string "Too long since I've been able to battle\n" .string "without thinking about anything…$" BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0 - .string "Let’s begin, shall we?$" + .string "Let's begin, shall we?$" BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7 .string "ANABEL: Fufu, congratulations…\n" diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 018dbfb31..0911ea5f2 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -1117,18 +1117,18 @@ BattleFrontier_BattleTowerLobby_EventScript_23F558:: @ 823F558 end BattleFrontier_BattleTowerLobby_EventScript_23F55A: @ 823F55A - .string "I’ll direct you to your BATTLE ROOM now.$" + .string "I'll direct you to your BATTLE ROOM now.$" BattleFrontier_BattleTowerLobby_Text_23F583: @ 823F583 .string "Excuse me!\p" - .string "You didn’t save before you quit your\n" + .string "You didn't save before you quit your\n" .string "challenge last time.\p" .string "Because of that, your challenge so far\n" .string "has been disqualified. Sorry!$" BattleFrontier_BattleTowerLobby_Text_23F60D: @ 823F60D .string "Congratulations!\n" - .string "You’ve beaten all seven TRAINERS!\p" + .string "You've beaten all seven TRAINERS!\p" .string "$" BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641 @@ -1154,7 +1154,7 @@ BattleFrontier_BattleTowerLobby_Text_23F70F: @ 823F70F .string "Please wait.$" BattleFrontier_BattleTowerLobby_Text_23F737: @ 823F737 - .string "We’ve been waiting for you!\p" + .string "We've been waiting for you!\p" .string "$" BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754 @@ -1162,7 +1162,7 @@ BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754 .string "progress will be saved. Please wait.$" BattleFrontier_BattleTowerLobby_Text_23F79D: @ 823F79D - .string "You’re finally about to face the\n" + .string "You're finally about to face the\n" .string "50th TRAINER.\p" .string "From here on, every time you beat seven\n" .string "TRAINERS in a row, your POKéMON will\l" @@ -1181,16 +1181,16 @@ BattleFrontier_BattleTowerLobby_Text_23F89F: @ 823F89F BattleFrontier_BattleTowerLobby_Text_23F8CD: @ 823F8CD .string "Excuse me, do you have a moment?\p" .string "Can you describe your feelings when\n" - .string "you’re about to begin a BATTLE TOWER\l" - .string "match, or when you’ve either won or\l" + .string "you're about to begin a BATTLE TOWER\l" + .string "match, or when you've either won or\l" .string "lost a match?$" BattleFrontier_BattleTowerLobby_Text_23F969: @ 823F969 .string "Okay, what are your feelings when\n" - .string "you’re about to begin a match?$" + .string "you're about to begin a match?$" BattleFrontier_BattleTowerLobby_Text_23F9AA: @ 823F9AA - .string "What do you feel when you’ve won\n" + .string "What do you feel when you've won\n" .string "a match?$" BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4 @@ -1198,29 +1198,29 @@ BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4 .string "you have lost a match?$" BattleFrontier_BattleTowerLobby_Text_23FA0F: @ 823FA0F - .string "Oh, so you don’t think much about it?\n" - .string "You’re one cool customer.$" + .string "Oh, so you don't think much about it?\n" + .string "You're one cool customer.$" BattleFrontier_BattleTowerLobby_Text_23FA4F: @ 823FA4F .string "Hunh? You changed your mind?\n" - .string "I guess you’re fickle.$" + .string "I guess you're fickle.$" BattleFrontier_BattleTowerLobby_Text_23FA83: @ 823FA83 - .string "Okay, so that’s how you feel?\n" - .string "That’s quite original.\p" + .string "Okay, so that's how you feel?\n" + .string "That's quite original.\p" .string "Thanks!$" BattleFrontier_BattleTowerLobby_Text_23FAC0: @ 823FAC0 .string "The number of matches you win in a row\n" .string "is recorded.\p" - .string "I’d better not get beaten in\n" + .string "I'd better not get beaten in\n" .string "an embarrassing way!$" BattleFrontier_BattleTowerLobby_Text_23FB26: @ 823FB26 - .string "Once you’ve entered the BATTLE TOWER,\n" - .string "you can’t leave until you either lose\l" + .string "Once you've entered the BATTLE TOWER,\n" + .string "you can't leave until you either lose\l" .string "or you beat seven TRAINERS in a row.\p" - .string "You’d best be certain that you’re up\n" + .string "You'd best be certain that you're up\n" .string "to the challenge.$" BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE @@ -1266,7 +1266,7 @@ BattleFrontier_BattleTowerLobby_Text_23FE3C: @ 823FE3C BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F .string "Excuse me!\p" - .string "You don’t have {STR_VAR_2} eligible POKéMON.\p" + .string "You don't have {STR_VAR_2} eligible POKéMON.\p" .string "You must have {STR_VAR_2} different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -1276,7 +1276,7 @@ BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D .string "Excuse me!\p" - .string "You don’t have {STR_VAR_2} eligible POKéMON.\p" + .string "You don't have {STR_VAR_2} eligible POKéMON.\p" .string "You must have {STR_VAR_2} different POKéMON\n" .string "to enter.\p" .string "They also must be holding different\n" @@ -1286,7 +1286,7 @@ BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027 .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" + .string "You don't have three eligible POKéMON.\p" .string "You must have three different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -1296,7 +1296,7 @@ BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027 BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" + .string "You don't have three eligible POKéMON.\p" .string "You must have three different POKéMON\n" .string "to enter.\p" .string "They also must be holding different\n" @@ -1306,7 +1306,7 @@ BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB .string "Excuse me!\p" - .string "You don’t have four eligible POKéMON.\p" + .string "You don't have four eligible POKéMON.\p" .string "You must have four different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -1316,7 +1316,7 @@ BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD .string "Excuse me!\p" - .string "You don’t have four eligible POKéMON.\p" + .string "You don't have four eligible POKéMON.\p" .string "You must have four different POKéMON\n" .string "to enter.\p" .string "They also must be holding different\n" @@ -1326,7 +1326,7 @@ BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B .string "Excuse me!\p" - .string "You don’t have two eligible POKéMON.\p" + .string "You don't have two eligible POKéMON.\p" .string "You must have two different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -1336,7 +1336,7 @@ BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B BattleFrontier_BattleTowerLobby_Text_24046B: @ 824046B .string "Excuse me!\p" - .string "You don’t have two eligible POKéMON.\p" + .string "You don't have two eligible POKéMON.\p" .string "You must have two different POKéMON\n" .string "to enter.\p" .string "They also must be holding different\n" @@ -1356,7 +1356,7 @@ BattleFrontier_BattleTowerLobby_Text_2405B3: @ 82405B3 .string "BATTLE ROOM challenge?$" BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC - .string "The BATTLE TOWER’s SINGLE BATTLE\n" + .string "The BATTLE TOWER's SINGLE BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "SINGLE BATTLES with three POKéMON.\p" .string "There are many SINGLE BATTLE ROOMS\n" @@ -1367,7 +1367,7 @@ BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC .string "you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleTowerLobby_Text_2407A6: @ 82407A6 @@ -1386,7 +1386,7 @@ BattleFrontier_BattleTowerLobby_Text_24085E: @ 824085E .string "BATTLE ROOM challenge?$" BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897 - .string "The BATTLE TOWER’s DOUBLE BATTLE\n" + .string "The BATTLE TOWER's DOUBLE BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "DOUBLE BATTLES with four POKéMON.\p" .string "There are many DOUBLE BATTLE ROOMS\n" @@ -1397,7 +1397,7 @@ BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897 .string "you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleTowerLobby_Text_240A50: @ 8240A50 @@ -1416,7 +1416,7 @@ BattleFrontier_BattleTowerLobby_Text_240B06: @ 8240B06 .string "BATTLE ROOM challenge?$" BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E - .string "The BATTLE TOWER’s MULTI BATTLE\n" + .string "The BATTLE TOWER's MULTI BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "MULTI BATTLES.\p" .string "For MULTI BATTLES, you must partner\n" @@ -1435,7 +1435,7 @@ BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E .string "teams, you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleTowerLobby_Text_240DDB: @ 8240DDB @@ -1454,7 +1454,7 @@ BattleFrontier_BattleTowerLobby_Text_240E95: @ 8240E95 .string "BATTLE ROOM challenge?$" BattleFrontier_BattleTowerLobby_Text_240ED2: @ 8240ED2 - .string "The BATTLE TOWER’s MULTI BATTLE\n" + .string "The BATTLE TOWER's MULTI BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "MULTI BATTLES with a friend.\p" .string "You must link with your friend using\n" @@ -1482,7 +1482,7 @@ BattleFrontier_BattleTowerLobby_Text_241198: @ 8241198 .string "You have chosen the same kind of\n" .string "POKéMON as your friend.\p" .string "Please choose two POKéMON different\n" - .string "from your friend’s, match the level\l" + .string "from your friend's, match the level\l" .string "you wish to enter, and register again.$" BattleFrontier_BattleTowerLobby_Text_241240: @ 8241240 @@ -1515,7 +1515,7 @@ BattleFrontier_BattleTowerLobby_Text_241378: @ 8241378 BattleFrontier_BattleTowerLobby_Text_2413DE: @ 82413DE .string "Please choose two POKéMON different\n" - .string "from your friend’s, match the level\l" + .string "from your friend's, match the level\l" .string "you wish to enter, and register again.$" BattleFrontier_BattleTowerLobby_Text_24144D: @ 824144D @@ -1570,7 +1570,7 @@ BattleFrontier_BattleTowerLobby_Text_241777: @ 8241777 .string "find a partner to form a tag team for\l" .string "the MULTI BATTLE ROOM challenge.\p" .string "Choose the best partner for you by\n" - .string "examining other TRAINERS’\l" + .string "examining other TRAINERS'\l" .string "POKéMON and their moves.\p" .string "You may choose a new tag partner\n" .string "after winning seven straight matches.$" diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index b2b05a054..b0c35a7fc 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -312,11 +312,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149 .string "MULTI BATTLE ROOM.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" .string "You can call me {STR_VAR_3}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA - .string "On {STR_VAR_1}’s advice, I brought\n" + .string "On {STR_VAR_1}'s advice, I brought\n" .string "one {STR_VAR_3} with {STR_VAR_2} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 @@ -325,14 +325,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E .string "Thank you!\n" - .string "I’ll go register right now.$" + .string "I'll go register right now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255 .string "I really wanted to form a tag team\n" .string "with you, {PLAYER}…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286 - .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" .string "My name is {STR_VAR_3}.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 @@ -341,21 +341,21 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Please, let’s form a tag team!$" + .string "Please, let's form a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313 .string "Thank you very much!\n" - .string "I’ll be done with registration quickly!$" + .string "I'll be done with registration quickly!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350 .string "{PLAYER}, I was hoping that I could\n" .string "partner up with you…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383 - .string "Um, my name’s {STR_VAR_3}, and I’m\n" - .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice.\p" + .string "Um, my name's {STR_VAR_3}, and I'm\n" + .string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice.\p" .string "Snivel…\p" - .string "I’m sorry!\n" + .string "I'm sorry!\n" .string "This tension is making me cry…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7 @@ -370,18 +370,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B .string "Oh, really? You will?\n" .string "Awesome! Wicked! Awoooh!\p" - .string "Oh… I’m sorry…\n" - .string "I’m so happy, I’m crying…\p" - .string "I’ll go register right away.\n" - .string "Please don’t go away!$" + .string "Oh… I'm sorry…\n" + .string "I'm so happy, I'm crying…\p" + .string "I'll go register right away.\n" + .string "Please don't go away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6 .string "Oh, b-but…\n" .string "Sob… Waaaaah!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF - .string "Hi, there! I’m {STR_VAR_3}!\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + .string "Hi, there! I'm {STR_VAR_3}!\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E .string "{STR_VAR_3} recommended my crew.\n" @@ -389,20 +389,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549 .string "one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s what I have! Cool, huh?\p" + .string "that's what I have! Cool, huh?\p" .string "So come on!\n" - .string "Let’s form a tag team!$" + .string "Let's form a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B .string "Yay! Great!\n" - .string "Okay, I’ll go register, okay?$" + .string "Okay, I'll go register, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5 .string "Aww, why?\n" .string "I wanted to team up, {PLAYER}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8 - .string "I’m {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" + .string "I'm {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" .string "of the famous {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 @@ -411,50 +411,50 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643 .string "and one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s my pair.\p" + .string "that's my pair.\p" .string "Please, will you join me in\n" .string "a tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F .string "Thank you!\n" - .string "I’ll register right away!$" + .string "I'll register right away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4 .string "{PLAYER}, I had been hoping to join\n" .string "you in a tag team…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5 - .string "Um… I’m sincerely happy that you\n" + .string "Um… I'm sincerely happy that you\n" .string "would take the time to talk to me.\p" - .string "I’m {STR_VAR_3}.\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…$" + .string "I'm {STR_VAR_3}.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D .string "{STR_VAR_3} gave me advice.\n" - .string "I’m very grateful for it.\p" + .string "I'm very grateful for it.\p" .string "I have a team of one {STR_VAR_2}\n" .string "with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E .string "one {STR_VAR_2} with {STR_VAR_1}.\n" - .string "I know I’m asking a lot…\p" - .string "I don’t think you’ll be willing to,\n" + .string "I know I'm asking a lot…\p" + .string "I don't think you'll be willing to,\n" .string "but may I join you as a partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C - .string "Really? I can’t believe it!\n" - .string "I can’t believe you’ll let me join you!\l" - .string "I… I won’t let you down!\p" - .string "Um… If it’s really okay, I’ll go register\n" + .string "Really? I can't believe it!\n" + .string "I can't believe you'll let me join you!\l" + .string "I… I won't let you down!\p" + .string "Um… If it's really okay, I'll go register\n" .string "right this instant!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7 .string "Oh…\n" - .string "I didn’t think I was good enough…$" + .string "I didn't think I was good enough…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD - .string "Hi, I’m {STR_VAR_3}.\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + .string "Hi, I'm {STR_VAR_3}.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5 .string "{STR_VAR_3} told me that it would be\n" @@ -469,18 +469,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989 .string "Okay, glad to join you!\n" - .string "I hope you won’t mess things up for me!\l" - .string "I’ll do my registration now.$" + .string "I hope you won't mess things up for me!\l" + .string "I'll do my registration now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6 .string "Huh? Why did you turn me down?\n" - .string "You’re no judge of character!$" + .string "You're no judge of character!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23 - .string "I’m {STR_VAR_3} and I’m a TRIATHLETE.\n" - .string "I’m busy every day what with jogging,\l" + .string "I'm {STR_VAR_3} and I'm a TRIATHLETE.\n" + .string "I'm busy every day what with jogging,\l" .string "training, and rapping.\p" - .string "I also happen to be {STR_VAR_1}’s\n" + .string "I also happen to be {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9 @@ -491,12 +491,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}.\p" .string "I put a lot of effort into raising\n" - .string "them, even though I’m busy.\p" - .string "Let’s form a tag team\n" + .string "them, even though I'm busy.\p" + .string "Let's form a tag team\n" .string "and give it a go!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52 - .string "Thanks, that’s the spirit!\n" + .string "Thanks, that's the spirit!\n" .string "Hang tight while I go register, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 @@ -505,8 +505,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2 .string "Hi!\n" - .string "How’s it going?\p" - .string "I’m {STR_VAR_3}, {STR_VAR_1}’s\n" + .string "How's it going?\p" + .string "I'm {STR_VAR_3}, {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice. Glad to meet you!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18 @@ -518,20 +518,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "Of course I raised them superbly!\p" .string "So, want to team up?\n" - .string "I’m sure it’ll be a great combo!$" + .string "I'm sure it'll be a great combo!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6 .string "Yay, I think this will be fun!\n" - .string "I’ll go register!$" + .string "I'll go register!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07 - .string "Oh, you’re mean!\n" + .string "Oh, you're mean!\n" .string "I come recommended, you know.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36 .string "Please let me introduce myself.\n" .string "I am {STR_VAR_3}.\p" - .string "I serve as {STR_VAR_1}’s\n" + .string "I serve as {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82 @@ -544,7 +544,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6 .string "Please agree to a tag team with me!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE - .string "Oh… I’m delighted!\n" + .string "Oh… I'm delighted!\n" .string "I promise to give you my best!\p" .string "Of course I will register us!\n" .string "Please wait!$" @@ -555,12 +555,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E .string "Eek! You spoke to me!\n" - .string "I… I’m overjoyed!\p" - .string "I’m {STR_VAR_3}! I’m {STR_VAR_1}’s\n" + .string "I… I'm overjoyed!\p" + .string "I'm {STR_VAR_3}! I'm {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA - .string "On {STR_VAR_3}’s advice, I trained\n" + .string "On {STR_VAR_3}'s advice, I trained\n" .string "one {STR_VAR_1}-using {STR_VAR_2}$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 @@ -572,16 +572,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F .string "Eek! I… I feel giddy!\n" .string "Thank you so much!\l" - .string "I’ll go register us right away!$" + .string "I'll go register us right away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98 - .string "Waaah! Don’t you feel any pity?\n" + .string "Waaah! Don't you feel any pity?\n" .string "But that makes you cooler…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3 - .string "Yeehaw! I’m {STR_VAR_1}’s\n" + .string "Yeehaw! I'm {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice!\p" - .string "{STR_VAR_3}’s my name, hello, hello!$" + .string "{STR_VAR_3}'s my name, hello, hello!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013 .string "My mentor {STR_VAR_3} recommended\n" @@ -591,24 +591,24 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D .string "and one {STR_VAR_1}-master\n" .string "{STR_VAR_2}.\p" .string "Good stuff, huh?\n" - .string "You’ll partner with me, won’t you?$" + .string "You'll partner with me, won't you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087 .string "Okay, excellent!\n" - .string "I’ll get the registration done quickly!$" + .string "I'll get the registration done quickly!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0 .string "Gwaaah!\n" - .string "You’re a calculating one, {PLAYER}!$" + .string "You're a calculating one, {PLAYER}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6 - .string "Hey! There’s big trouble! This is\n" - .string "the BATTLE TOWER’s last day!\p" + .string "Hey! There's big trouble! This is\n" + .string "the BATTLE TOWER's last day!\p" .string "… … … … … …\n" - .string "I’m only joking!\p" + .string "I'm only joking!\p" .string "People call me {STR_VAR_3} and I do, too!\n" - .string "I’m {STR_VAR_1}’s 1,000th apprentice!\l" - .string "Actually, I’m no. {STR_VAR_2}!$" + .string "I'm {STR_VAR_1}'s 1,000th apprentice!\l" + .string "Actually, I'm no. {STR_VAR_2}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 .string "{STR_VAR_3} gave me some advice.\n" @@ -616,29 +616,29 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD .string "{STR_VAR_2} with {STR_VAR_1}.\n" - .string "I’ve got ten of each kind!\l" + .string "I've got ten of each kind!\l" .string "Actually, just one of each!\p" .string "How about it?\n" .string "Want to try tag battles with me?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F .string "Yippee!\n" - .string "I’ll give you a POKéMON as my thanks!\p" + .string "I'll give you a POKéMON as my thanks!\p" .string "Just joking! But I will really go do\n" .string "the registration, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A - .string "Oh, that’s so cold! I’ll have to wreck\n" + .string "Oh, that's so cold! I'll have to wreck\n" .string "the BATTLE TOWER for that!\p" - .string "Of course I won’t!$" + .string "Of course I won't!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF - .string "Hey, there, I’m rockin’ and a-rollin’!\n" - .string "POKéMON, I be controllin’!\p" - .string "I’m {STR_VAR_3} the rappin’ SAILOR.\n" - .string "Don’t be mistakin’ me for no wailer!\p" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" - .string "Me, you shouldn’t be quick to dismiss!$" + .string "Hey, there, I'm rockin' and a-rollin'!\n" + .string "POKéMON, I be controllin'!\p" + .string "I'm {STR_VAR_3} the rappin' SAILOR.\n" + .string "Don't be mistakin' me for no wailer!\p" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" + .string "Me, you shouldn't be quick to dismiss!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4 .string "With the advice of {STR_VAR_3} I did\n" @@ -656,14 +656,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464 .string "Our registration, I will go file!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3 - .string "Oh, hey, {PLAYER}, now that’s cold!\n" + .string "Oh, hey, {PLAYER}, now that's cold!\n" .string "If I may be so bold!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6 .string "Yippee-yahoo!\n" - .string "Oh, don’t run! I was just having fun!\p" - .string "Howdy! I’m {STR_VAR_3}!\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + .string "Oh, don't run! I was just having fun!\p" + .string "Howdy! I'm {STR_VAR_3}!\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535 .string "{STR_VAR_3} told me what to do.\n" @@ -674,28 +674,28 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F .string "{STR_VAR_2}, I did choose.\p" .string "So, what do you say?\n" .string "Come on, make my day!\p" - .string "Please, I’m begging you!\n" - .string "Let me join you, don’t leave me blue!$" + .string "Please, I'm begging you!\n" + .string "Let me join you, don't leave me blue!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC .string "Yeahah! Luck is with me!\n" .string "It sure makes me happy!\p" .string "Before we go join the fray,\n" - .string "I’ll go register right away!$" + .string "I'll go register right away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656 - .string "You’re turning me down?\n" - .string "{PLAYER}, you’re making me frown!$" + .string "You're turning me down?\n" + .string "{PLAYER}, you're making me frown!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A .string "Cough!\p" .string "Oh, sorry, I have a cold.\n" .string "My POKéMON are fine, though.\p" - .string "My name’s {STR_VAR_3}, {STR_VAR_1}’s\n" + .string "My name's {STR_VAR_3}, {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice. Cough!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5 - .string "I took {STR_VAR_3}’s advice to heart\n" + .string "I took {STR_VAR_3}'s advice to heart\n" .string "and put together my team of\l" .string "one {STR_VAR_2} with {STR_VAR_1} and$" @@ -703,9 +703,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "I trained them every day,\n" .string "even in wind and rain.\p" - .string "That’s why I have this cold,\n" + .string "That's why I have this cold,\n" .string "I think.\p" - .string "That’s what I’m about.\n" + .string "That's what I'm about.\n" .string "Want to be my tag partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 @@ -714,36 +714,36 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 .string "Hang on while I go register.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F - .string "Oh, you won’t?\n" - .string "{PLAYER}, I think we’d make a good pair.$" + .string "Oh, you won't?\n" + .string "{PLAYER}, I think we'd make a good pair.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851 .string "Oh, hello!\n" .string "This is nerve-racking.\p" - .string "I’m {STR_VAR_3}.\n" - .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" + .string "I'm {STR_VAR_3}.\n" + .string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C - .string "{STR_VAR_3} said this team’ll be good--\n" + .string "{STR_VAR_3} said this team'll be good--\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "I’m feeling self-conscious about this,\n" + .string "I'm feeling self-conscious about this,\n" .string "but will you let me join you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923 .string "Oh, gee, thank you!\n" - .string "I feel bashful, but I’ll do my best!\p" - .string "I’ll go get the registration done.$" + .string "I feel bashful, but I'll do my best!\p" + .string "I'll go get the registration done.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F - .string "Oh, please don’t say no!\n" + .string "Oh, please don't say no!\n" .string "I feel self-conscious enough already…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE - .string "I am {STR_VAR_3}, and that’s no lie.\n" - .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" + .string "I am {STR_VAR_3}, and that's no lie.\n" + .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7 .string "{STR_VAR_3} recommended my team.\p" @@ -759,7 +759,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4 .string "You really will accept me?\n" .string "It would be too terrible otherwise.\p" - .string "But since you’ve agreed, this is fine.\n" + .string "But since you've agreed, this is fine.\n" .string "I shall go register the both of us.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E @@ -767,7 +767,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E .string "Is this your idea of a joke?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79 - .string "I’m {STR_VAR_1}, and I’m a LASS!$" + .string "I'm {STR_VAR_1}, and I'm a LASS!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91 .string "What I have are one {STR_VAR_2}\n" @@ -780,15 +780,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05 .string "Thank you!\n" - .string "I’ll go do the registration!$" + .string "I'll go do the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D - .string "You don’t want to be my partner?\n" - .string "You’ll regret it later!$" + .string "You don't want to be my partner?\n" + .string "You'll regret it later!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66 .string "Hello!\p" - .string "I’m YOUNGSTER {STR_VAR_1}!$" + .string "I'm YOUNGSTER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F .string "Want to know what I have?\n" @@ -796,20 +796,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "You’ll be my tag-team partner,\n" - .string "won’t you?$" + .string "You'll be my tag-team partner,\n" + .string "won't you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6 .string "Yay!\n" - .string "I’ll go and register, okay?$" + .string "I'll go and register, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07 - .string "Aww! If you’d form a tag team with\n" - .string "my POKéMON, we’d be unstoppable!$" + .string "Aww! If you'd form a tag team with\n" + .string "my POKéMON, we'd be unstoppable!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B .string "Yahoo!\n" - .string "I’m HIKER {STR_VAR_1}!$" + .string "I'm HIKER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60 .string "Know what I have with me?\n" @@ -822,18 +822,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7 .string "Yahoo!\n" - .string "I’ll go do the registering, then.$" + .string "I'll go do the registering, then.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0 - .string "I would’ve liked to battle with you\n" + .string "I would've liked to battle with you\n" .string "at my side.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20 .string "Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a BEAUTY!$" + .string "I'm {STR_VAR_1}, and I'm a BEAUTY!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41 - .string "Do you know what I’ve been raising?\n" + .string "Do you know what I've been raising?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 @@ -843,20 +843,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD .string "Wonderful!\n" - .string "I’ll get the registration done now!$" + .string "I'll get the registration done now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC .string "How disappointing!\p" - .string "We two together--we would’ve been\n" + .string "We two together--we would've been\n" .string "the best!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B .string "Yo!\p" .string "You know who I am?\n" - .string "I’m {STR_VAR_1} the FISHERMAN!$" + .string "I'm {STR_VAR_1} the FISHERMAN!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58 - .string "I’ve got with me a team of one\n" + .string "I've got with me a team of one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 @@ -867,7 +867,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6 .string "Good, good!\n" .string "Leave it up to me!\p" - .string "I’ll go and register us now.$" + .string "I'll go and register us now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002 .string "We matched up perfectly, too…$" @@ -890,11 +890,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5 .string "I shall handle the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D - .string "I’m sure that you will regret not\n" + .string "I'm sure that you will regret not\n" .string "having me as your partner.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A - .string "I’m TRIATHLETE {STR_VAR_1}!$" + .string "I'm TRIATHLETE {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D .string "What I have…\n" @@ -902,21 +902,21 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D .string "one {STR_VAR_2} with {STR_VAR_1}!\n" - .string "That’s my pair!\p" + .string "That's my pair!\p" .string "Please?\n" .string "Will you form a tag team with me?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7 .string "Gee, thanks!\n" - .string "I’ll go register at the counter.$" + .string "I'll go register at the counter.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5 - .string "We two together, we would’ve been\n" + .string "We two together, we would've been\n" .string "tough for certain!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A .string "Hiya!\n" - .string "I’m BUG CATCHER {STR_VAR_1}!$" + .string "I'm BUG CATCHER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244 .string "Check out what I have!\n" @@ -929,39 +929,39 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA .string "Gotcha!\p" - .string "I’ll go do the registration stuff\n" + .string "I'll go do the registration stuff\n" .string "at the counter.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4 .string "Aww, my POKéMON are awesome.\n" - .string "I hope you won’t regret this!$" + .string "I hope you won't regret this!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F .string "Good day!\n" - .string "I’m SCHOOL KID {STR_VAR_1}!$" + .string "I'm SCHOOL KID {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C - .string "What I’ve been raising are one\n" + .string "What I've been raising are one\n" .string "{STR_VAR_2} that uses {STR_VAR_1}$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B .string "and one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" - .string "Not too bad, don’t you think?\n" + .string "Not too bad, don't you think?\n" .string "Would you care to form a tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5 .string "Thank you very much!\n" - .string "I’ll get done with the registration.$" + .string "I'll get done with the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF - .string "That’s too bad…\p" + .string "That's too bad…\p" .string "I was hoping that I could learn\n" .string "from you as your partner…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449 .string "Yo! Let me tell you who I am!\n" - .string "I’m RICH BOY {STR_VAR_1}!$" + .string "I'm RICH BOY {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 .string "Guess what I got!\n" @@ -969,17 +969,17 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "I’m willing to offer you the chance\n" + .string "I'm willing to offer you the chance\n" .string "to be in a tag team with me.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE .string "Smart move!\p" - .string "I’ll finish up the registration\n" + .string "I'll finish up the registration\n" .string "process quick!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529 - .string "You’d turn me of all people down?\n" - .string "You’ll regret that decision for sure!$" + .string "You'd turn me of all people down?\n" + .string "You'll regret that decision for sure!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571 .string "Hiyah!\n" @@ -1005,10 +1005,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662 .string "Hi, there!\n" - .string "I’m {STR_VAR_1}, and I’m a TUBER!$" + .string "I'm {STR_VAR_1}, and I'm a TUBER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686 - .string "I’ll tell you what I have.\n" + .string "I'll tell you what I have.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 @@ -1017,10 +1017,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6 .string "Thank you!\n" - .string "I’ll go register us now!$" + .string "I'll go register us now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A - .string "If we’d become partners, we could\n" + .string "If we'd become partners, we could\n" .string "have been so strong!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741 @@ -1044,11 +1044,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6 .string "I so longed to join you…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF - .string "How do you do? I’m {STR_VAR_1},\n" - .string "and I’m a POKéMON BREEDER!$" + .string "How do you do? I'm {STR_VAR_1},\n" + .string "and I'm a POKéMON BREEDER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831 - .string "I’m raising a couple good ones!\n" + .string "I'm raising a couple good ones!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 @@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7 .string "Thank you kindly!\p" - .string "I’ll go take care of the registration\n" + .string "I'll go take care of the registration\n" .string "stuff, so you wait right here!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE @@ -1067,7 +1067,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B .string "Well, hello!\n" - .string "I’m TRIATHLETE {STR_VAR_1}!$" + .string "I'm TRIATHLETE {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B .string "Want to know what I run with?\n" @@ -1080,16 +1080,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4 .string "Good going!\p" - .string "I’ll be quick and get the registration\n" + .string "I'll be quick and get the registration\n" .string "all done!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1 - .string "You and me, we would’ve been tops.\n" - .string "It’s too bad…$" + .string "You and me, we would've been tops.\n" + .string "It's too bad…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22 - .string "Hey, there! My name’s {STR_VAR_1}!\n" - .string "I’m a TRIATHLETE!$" + .string "Hey, there! My name's {STR_VAR_1}!\n" + .string "I'm a TRIATHLETE!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E .string "I go on runs with my durable team--\n" @@ -1102,17 +1102,17 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF .string "All right!\n" - .string "I’ll go register in a flash!$" + .string "I'll go register in a flash!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7 .string "I really wanted to battle as your\n" .string "tag-team partner…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B - .string "I’m BATTLE GIRL {STR_VAR_1}!$" + .string "I'm BATTLE GIRL {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F - .string "I’ve been toughening up one\n" + .string "I've been toughening up one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B @@ -1122,7 +1122,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2 .string "Why, thanks!\p" - .string "I’ll get the registration done\n" + .string "I'll get the registration done\n" .string "right now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 @@ -1130,29 +1130,29 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 .string "the ultimate tag team…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22 - .string "I’m TRIATHLETE {STR_VAR_1}!$" + .string "I'm TRIATHLETE {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35 - .string "I’ve been running with one {STR_VAR_2}\n" + .string "I've been running with one {STR_VAR_2}\n" .string "that knows how to use {STR_VAR_1}$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C .string "and one {STR_VAR_2} with {STR_VAR_1}!\p" .string "We could be in a tag team.\n" - .string "Wouldn’t that be great?$" + .string "Wouldn't that be great?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3 .string "Thank you!\p" - .string "I’ll go register us, and that’s\n" + .string "I'll go register us, and that's\n" .string "right now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9 - .string "Aww, that’s too bad. We would’ve been\n" + .string "Aww, that's too bad. We would've been\n" .string "the toughest tag team around!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D .string "Me?\n" - .string "I’m TUBER {STR_VAR_1}!$" + .string "I'm TUBER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F .string "What do I have with me?\n" @@ -1161,16 +1161,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Hey?\n" - .string "You’ll team up with me, right?$" + .string "You'll team up with me, right?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E .string "Okay!\p" - .string "I’ll go register!\n" - .string "Let’s be excellent together!$" + .string "I'll go register!\n" + .string "Let's be excellent together!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3 .string "My POKéMON are tough for sure…\n" - .string "It’s too bad you don’t want to team up.$" + .string "It's too bad you don't want to team up.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A .string "Yay-hey!\n" @@ -1183,15 +1183,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Yay-hey! Pretty wild, huh?\n" - .string "We’ll have to do a duet in a tag team!$" + .string "We'll have to do a duet in a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6 .string "Yay-hey! Right on!\n" - .string "I’ll do that registration stuff now!$" + .string "I'll do that registration stuff now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE .string "My POKéMON rock hard!\n" - .string "You’ll be sorry, I tell you!$" + .string "You'll be sorry, I tell you!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21 .string "Pleased to meet you.\n" @@ -1216,8 +1216,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013 .string "opportunity…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B - .string "Hello, I’m {STR_VAR_1},\n" - .string "and I’m a POKéFAN.$" + .string "Hello, I'm {STR_VAR_1},\n" + .string "and I'm a POKéFAN.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D .string "I have with me now one {STR_VAR_2}\n" @@ -1226,22 +1226,22 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Do you like what you see?\n" - .string "Why don’t you be my tag partner?$" + .string "Why don't you be my tag partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD .string "Thank you!\n" - .string "I’ll look after the registration!$" + .string "I'll look after the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A .string "My POKéMON are top grade…\n" - .string "It’s too bad you can’t appreciate that.$" + .string "It's too bad you can't appreciate that.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C .string "Hm!\n" .string "I am {STR_VAR_1}, and an EXPERT am I!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D - .string "The POKéMON that I’ve toughened up are\n" + .string "The POKéMON that I've toughened up are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7 @@ -1259,30 +1259,30 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268 .string "Hello, hello.\n" - .string "I’m {STR_VAR_1}, and I’m an EXPERT.$" + .string "I'm {STR_VAR_1}, and I'm an EXPERT.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291 - .string "I’ve raised my POKéMON thoroughly.\n" + .string "I've raised my POKéMON thoroughly.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7 .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they’re what I have.\p" - .string "Wouldn’t you like to team up with me?$" + .string "they're what I have.\p" + .string "Wouldn't you like to team up with me?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313 .string "Good, good.\n" - .string "I’ll see to the registration right away.$" + .string "I'll see to the registration right away.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348 .string "Perhaps we can form a team the next\n" .string "time we meet.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A - .string "I’m DRAGON TAMER {STR_VAR_1}!$" + .string "I'm DRAGON TAMER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F - .string "The team I’ve been toughening up is\n" + .string "The team I've been toughening up is\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 @@ -1291,15 +1291,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 .string "Want to be my partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB - .string "Okay, I’ll give it my best!\n" - .string "I’ll go register now, all right?$" + .string "Okay, I'll give it my best!\n" + .string "I'll go register now, all right?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438 - .string "You’re not going to find many tougher\n" + .string "You're not going to find many tougher\n" .string "partners than me!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470 - .string "I’m BIRD KEEPER {STR_VAR_1}!$" + .string "I'm BIRD KEEPER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 .string "What POKéMON do I have?\n" @@ -1307,19 +1307,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Don’t you think we’d make a decent\n" + .string "Don't you think we'd make a decent\n" .string "tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC .string "Great, thanks!\n" - .string "I’ll look after the registration!$" + .string "I'll look after the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D .string "My POKéMON and I are strong.\n" .string "What a letdown.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A - .string "I’m NINJA BOY {STR_VAR_1}!$" + .string "I'm NINJA BOY {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C .string "My POKéMON team consists of one\n" @@ -1327,19 +1327,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Let’s be in a tag team together!$" + .string "Let's be in a tag team together!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC .string "Yay!\n" .string "Let me go register!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5 - .string "You’ll regret not having my tough\n" + .string "You'll regret not having my tough\n" .string "POKéMON on your side!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D .string "Hello!\n" - .string "I’m PARASOL LADY {STR_VAR_1}!$" + .string "I'm PARASOL LADY {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 .string "Escorting me now are my {STR_VAR_2}\n" @@ -1348,13 +1348,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655 .string "one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" - .string "Aren’t they nice?\n" + .string "Aren't they nice?\n" .string "Care to join us in a tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B .string "Thanks a bunch!\p" - .string "I’ll go register at the counter.\n" - .string "Let’s not disappoint each other!$" + .string "I'll go register at the counter.\n" + .string "Let's not disappoint each other!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED .string "My POKéMON are tremendously strong.\n" @@ -1362,7 +1362,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724 .string "Hello.\n" - .string "I’m {STR_VAR_1}, and I’m a BUG MANIAC!$" + .string "I'm {STR_VAR_1}, and I'm a BUG MANIAC!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749 .string "I have found my POKéMON, yes.\n" @@ -1377,15 +1377,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE .string "Okay!\n" .string "Understood!\p" - .string "I won’t be long with the registration!$" + .string "I won't be long with the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807 - .string "With the POKéMON I found, we wouldn’t\n" + .string "With the POKéMON I found, we wouldn't\n" .string "have lost…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838 .string "Ahoy, there!\n" - .string "I’m SAILOR {STR_VAR_1}!$" + .string "I'm SAILOR {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 .string "Let me show you my pride and joy!\n" @@ -1393,20 +1393,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Of course you’re not going to turn\n" + .string "Of course you're not going to turn\n" .string "me down. We will team up, right?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD - .string "I didn’t expect any less!\n" - .string "I’ll go register now.$" + .string "I didn't expect any less!\n" + .string "I'll go register now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D - .string "We would’ve stormed through\n" + .string "We would've stormed through\n" .string "the opposition! Too bad!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942 - .string "Hi, I’m {STR_VAR_1}.\n" - .string "I’m a COLLECTOR.$" + .string "Hi, I'm {STR_VAR_1}.\n" + .string "I'm a COLLECTOR.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F .string "The jewels in my collection are\n" @@ -1419,16 +1419,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE .string "Oh, yeah!\p" - .string "Well, let’s not waste any time.\n" - .string "I’ll go register the two of us.$" + .string "Well, let's not waste any time.\n" + .string "I'll go register the two of us.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18 - .string "Well, that’s upsetting.\n" - .string "You don’t appreciate my POKéMON.$" + .string "Well, that's upsetting.\n" + .string "You don't appreciate my POKéMON.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51 - .string "Howdy, I’m {STR_VAR_1}.\n" - .string "I’m a POKéMON RANGER.$" + .string "Howdy, I'm {STR_VAR_1}.\n" + .string "I'm a POKéMON RANGER.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 .string "Keeping me company are one\n" @@ -1436,20 +1436,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Don’t you think we’d make an impressive\n" + .string "Don't you think we'd make an impressive\n" .string "tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3 - .string "That’s super!\n" - .string "I’ll deal with the registration now.$" + .string "That's super!\n" + .string "I'll deal with the registration now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16 .string "Next time, choose my POKéMON,\n" .string "will you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E - .string "My name’s {STR_VAR_1}.\n" - .string "I’m a POKéMON RANGER!$" + .string "My name's {STR_VAR_1}.\n" + .string "I'm a POKéMON RANGER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62 .string "Let me tell you about my team. I have\n" @@ -1461,15 +1461,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B .string "with my little posse?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7 - .string "We’ll be at our best!\n" - .string "I’ll get the registration done quick!$" + .string "We'll be at our best!\n" + .string "I'll get the registration done quick!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23 - .string "I hope you’ll choose my POKéMON\n" + .string "I hope you'll choose my POKéMON\n" .string "next time.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E - .string "Pleased to meet you. I’m {STR_VAR_1}.\n" + .string "Pleased to meet you. I'm {STR_VAR_1}.\n" .string "I consider myself an AROMA LADY.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C @@ -1483,7 +1483,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2 .string "Would you care to be my partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07 - .string "I’m honored by your acceptance.\n" + .string "I'm honored by your acceptance.\n" .string "I will go register right this instant.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E @@ -1492,7 +1492,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97 .string "Want to know who I am?\n" - .string "I’m {STR_VAR_1}, the RUIN MANIAC!$" + .string "I'm {STR_VAR_1}, the RUIN MANIAC!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7 .string "The POKéMON that I have with me are\n" @@ -1504,15 +1504,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE .string "How about you and I partner up?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E - .string "That’s a sound decision!\n" - .string "I’ll go do the registration paperwork.$" + .string "That's a sound decision!\n" + .string "I'll go do the registration paperwork.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E .string "Hmm…\n" .string "I think my POKéMON are tough…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1 - .string "I’m COOLTRAINER {STR_VAR_1}!$" + .string "I'm COOLTRAINER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 .string "The POKéMON I have right now are one\n" @@ -1521,22 +1521,22 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9 .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "Cool, huh?\p" - .string "Don’t you think it’d be pretty cool\n" + .string "Don't you think it'd be pretty cool\n" .string "if we made a tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F .string "Cool!\n" - .string "I’ll go do the registration in a flash!$" + .string "I'll go do the registration in a flash!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D - .string "I thought that we’d make just\n" + .string "I thought that we'd make just\n" .string "the greatest team ever.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3 - .string "I’m COOLTRAINER {STR_VAR_1}!$" + .string "I'm COOLTRAINER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7 - .string "The team I’ve been raising has one\n" + .string "The team I've been raising has one\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 @@ -1546,7 +1546,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031 .string "Sounds A-OK!\n" - .string "I’d better do the registration.$" + .string "I'd better do the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E .string "I was thinking how we would be\n" @@ -1554,7 +1554,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D .string "Heyo!\n" - .string "I’m {STR_VAR_1}, the POKéMANIAC!$" + .string "I'm {STR_VAR_1}, the POKéMANIAC!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB .string "What does a guy like me have?\n" @@ -1562,21 +1562,21 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC .string "one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s what!\p" - .string "Let’s do it!\n" - .string "We’ll stomp around as a tag team!$" + .string "that's what!\p" + .string "Let's do it!\n" + .string "We'll stomp around as a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128 .string "Good call!\n" - .string "I’ll register the both of us!$" + .string "I'll register the both of us!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151 .string "My POKéMON are brutal!\n" - .string "It’s not my fault if you regret this!$" + .string "It's not my fault if you regret this!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E .string "Yo, there!\n" - .string "I’m KINDLER {STR_VAR_1}!$" + .string "I'm KINDLER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9 .string "You know what my training cooked up?\n" @@ -1589,22 +1589,22 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221 .string "All right!\n" - .string "I’ll get on with the registration.$" + .string "I'll get on with the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F - .string "Promise you’ll partner up with me\n" + .string "Promise you'll partner up with me\n" .string "the next time we run into each other.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297 - .string "I’m {STR_VAR_1}, and I’m a CAMPER!$" + .string "I'm {STR_VAR_1}, and I'm a CAMPER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1 - .string "I’ve been raising one {STR_VAR_1}-\n" + .string "I've been raising one {STR_VAR_1}-\n" .string "using {STR_VAR_2} and one$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC .string "{STR_VAR_1}-using {STR_VAR_2}.\p" - .string "Do you think it’d be fun to team up?\n" + .string "Do you think it'd be fun to team up?\n" .string "I bet it would be!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321 @@ -1617,10 +1617,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369 .string "Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a PICNICKER!$" + .string "I'm {STR_VAR_1}, and I'm a PICNICKER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D - .string "The POKéMON I’ve been taking are\n" + .string "The POKéMON I've been taking are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1 @@ -1637,10 +1637,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431 .string "some other time.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467 - .string "I’m PSYCHIC {STR_VAR_1}!$" + .string "I'm PSYCHIC {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477 - .string "The twosome I’ve been raising are\n" + .string "The twosome I've been raising are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC @@ -1650,35 +1650,35 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7 .string "Sure thing!\n" - .string "I’ll take care of the registration!$" + .string "I'll take care of the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517 - .string "If we meet again, that’s when I’d like\n" + .string "If we meet again, that's when I'd like\n" .string "to team up with you.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553 - .string "I’m {STR_VAR_1}.\n" - .string "I’m a PSYCHIC.$" + .string "I'm {STR_VAR_1}.\n" + .string "I'm a PSYCHIC.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they’re my disciples.\p" - .string "Doesn’t the idea of forming a tag-team\n" + .string "they're my disciples.\p" + .string "Doesn't the idea of forming a tag-team\n" .string "partnership intrigue you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5 .string "Thank you.\n" - .string "I’ll go deal with the registration.$" + .string "I'll go deal with the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614 .string "I hope there will be another chance\n" .string "to forge an alliance.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E - .string "I’m SCHOOL KID {STR_VAR_1}!$" + .string "I'm SCHOOL KID {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661 .string "One {STR_VAR_1}-using {STR_VAR_2}$" @@ -1691,18 +1691,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6 .string "Ooh, thank you!\n" - .string "I’ll register at the counter right away!$" + .string "I'll register at the counter right away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF .string "Please?\n" .string "May I join you the next time?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725 - .string "Hiya! The name’s {STR_VAR_1}!\n" - .string "I’m a POKéMON BREEDER!$" + .string "Hiya! The name's {STR_VAR_1}!\n" + .string "I'm a POKéMON BREEDER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751 - .string "The POKéMON I’ve raised are one\n" + .string "The POKéMON I've raised are one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781 @@ -1719,48 +1719,48 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7 .string "all right?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829 - .string "I’m {STR_VAR_1}, and I’m proud to say\n" + .string "I'm {STR_VAR_1}, and I'm proud to say\n" .string "that I am a POKéFAN.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B - .string "The darling POKéMON I’ve raised are\n" + .string "The darling POKéMON I've raised are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Aren’t they just the cutest?\n" + .string "Aren't they just the cutest?\n" .string "We ought to make a team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8 .string "Thank you, dear!\n" - .string "I’ll be on my way to register!$" + .string "I'll be on my way to register!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908 .string "My darling POKéMON are the best,\n" - .string "I’ll have you know. How annoying!$" + .string "I'll have you know. How annoying!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B - .string "Hi, I’m SWIMMER {STR_VAR_1}.$" + .string "Hi, I'm SWIMMER {STR_VAR_1}.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F .string "One {STR_VAR_1}-using {STR_VAR_2}$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2} are what I’ve trained.\p" - .string "You and me, let’s make a tag team.$" + .string "{STR_VAR_2} are what I've trained.\p" + .string "You and me, let's make a tag team.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD - .string "That’s cool!\n" - .string "I’ll register the two of us.$" + .string "That's cool!\n" + .string "I'll register the two of us.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7 .string "If we meet again, you owe me\n" .string "a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10 - .string "What’s happening?\n" - .string "I’m {STR_VAR_1}, and I’m a TRIATHLETE.$" + .string "What's happening?\n" + .string "I'm {STR_VAR_1}, and I'm a TRIATHLETE.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 .string "I got a couple decent POKéMON.\n" @@ -1768,7 +1768,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "It’d be neat if we made a tag team\n" + .string "It'd be neat if we made a tag team\n" .string "together, so how about it?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 @@ -1776,47 +1776,47 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 .string "You wait while I register, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB - .string "I expect you’ll let me join you\n" - .string "next time, how’s that?$" + .string "I expect you'll let me join you\n" + .string "next time, how's that?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22 - .string "I’m the TRIATHLETE {STR_VAR_1}!$" + .string "I'm the TRIATHLETE {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39 .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C .string "another {STR_VAR_2} that knows how\n" - .string "to use {STR_VAR_1}. That’s my pair.\p" + .string "to use {STR_VAR_1}. That's my pair.\p" .string "What do you think?\n" - .string "We’d make a good team, I’d say.$" + .string "We'd make a good team, I'd say.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4 .string "I like that answer!\n" - .string "I’ll get done with registration fast!$" + .string "I'll get done with registration fast!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE - .string "You’ll give me another chance to form\n" - .string "a partnership, won’t you?$" + .string "You'll give me another chance to form\n" + .string "a partnership, won't you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E .string "Hi, there! Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a SWIMMER!$" + .string "I'm {STR_VAR_1}, and I'm a SWIMMER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B - .string "Check out what I’ve been raising!\n" + .string "Check out what I've been raising!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Sweet, huh?\n" - .string "It’d be sweet to form a team, too!$" + .string "It'd be sweet to form a team, too!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF .string "Much obliged!\n" - .string "I’ll get this registration thing done!$" + .string "I'll get this registration thing done!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04 .string "If we meet again, you have to team up\n" - .string "with me. You’ll do that, right?$" + .string "with me. You'll do that, right?$" diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index b8b199ee2..ea1ae17a0 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -167,13 +167,13 @@ BattleFrontier_Lounge1_Text_25E95F: @ 825E95F .string "I am the man they revere as\l" .string "the legendary top POKéMON BREEDER!\p" .string "If you ever become as seasoned as me,\n" - .string "you’ll see the abilities of POKéMON\l" + .string "you'll see the abilities of POKéMON\l" .string "at a glance.\p" - .string "You’re a TRAINER. Doesn’t it interest\n" - .string "you to know your own POKéMON’s\l" + .string "You're a TRAINER. Doesn't it interest\n" + .string "you to know your own POKéMON's\l" .string "abilities?\p" .string "Here!\n" - .string "Let’s have a look at your POKéMON!$" + .string "Let's have a look at your POKéMON!$" BattleFrontier_Lounge1_Text_25EA92: @ 825EA92 .string "…Hmm…\p" @@ -221,19 +221,19 @@ BattleFrontier_Lounge1_Text_25ED0E: @ 825ED0E BattleFrontier_Lounge1_Text_25ED4E: @ 825ED4E .string "That stat is relatively good.\n" - .string "…Hm… That’s how I call it.$" + .string "…Hm… That's how I call it.$" BattleFrontier_Lounge1_Text_25ED87: @ 825ED87 .string "That stat is quite impressive.\n" - .string "…Hm… That’s how I call it.$" + .string "…Hm… That's how I call it.$" BattleFrontier_Lounge1_Text_25EDC1: @ 825EDC1 .string "That stat is outstanding!\n" - .string "…Hm… That’s how I call it.$" + .string "…Hm… That's how I call it.$" BattleFrontier_Lounge1_Text_25EDF6: @ 825EDF6 - .string "It’s flawless! A thing of perfection!\n" - .string "…Hm… That’s how I call it.$" + .string "It's flawless! A thing of perfection!\n" + .string "…Hm… That's how I call it.$" BattleFrontier_Lounge1_Text_25EE37: @ 825EE37 .string "What?\n" @@ -247,23 +247,23 @@ BattleFrontier_Lounge1_Text_25EEA6: @ 825EEA6 .string "Save it for next time!$" BattleFrontier_Lounge1_Text_25EEF6: @ 825EEF6 - .string "Ah, youngster! Do your POKéMON’s\n" + .string "Ah, youngster! Do your POKéMON's\n" .string "abilities intrigue you?\p" .string "Here, here!\n" - .string "Let’s have a look at your POKéMON!$" + .string "Let's have a look at your POKéMON!$" BattleFrontier_Lounge1_Text_25EF5E: @ 825EF5E - .string "An expert I am, but even I can’t tell\n" + .string "An expert I am, but even I can't tell\n" .string "anything about an unhatched POKéMON!\p" .string "Show me a POKéMON!\n" .string "A POKéMON is what I need to see!$" BattleFrontier_Lounge1_Text_25EFDD: @ 825EFDD .string "He said my POKéMON is outstanding!\n" - .string "I’m glad I raised it carefully!$" + .string "I'm glad I raised it carefully!$" BattleFrontier_Lounge1_Text_25F020: @ 825F020 .string "He said my POKéMON is outstanding!\n" - .string "But I didn’t do anything special\l" + .string "But I didn't do anything special\l" .string "raising it…$" diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index fed3672be..a044e3439 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -119,12 +119,12 @@ BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D BattleFrontier_Lounge2_Text_260766:: @ 8260766 .string "Howdy! When it comes to news about\n" - .string "the BATTLE FRONTIER, I’m no. 1.\p" + .string "the BATTLE FRONTIER, I'm no. 1.\p" .string "You can think of me as\n" .string "the FRONTIER MANIAC.\p" .string "Just checking, but you are a TRAINER,\n" - .string "isn’t that right?\p" - .string "I’ll happily share the hottest news\n" + .string "isn't that right?\p" + .string "I'll happily share the hottest news\n" .string "I gathered about the BATTLE FRONTIER.$" BattleFrontier_Lounge2_Text_260857:: @ 8260857 @@ -133,29 +133,29 @@ BattleFrontier_Lounge2_Text_260857:: @ 8260857 BattleFrontier_Lounge2_Text_2608A1:: @ 82608A1 .string "Well? Well? Well?\p" - .string "I’m sure my information’s been\n" + .string "I'm sure my information's been\n" .string "seriously useful to you, right?$" BattleFrontier_Lounge2_Text_2608F2:: @ 82608F2 - .string "Let’s see now…\p" + .string "Let's see now…\p" .string "It sounds like the {STR_VAR_1}\n" .string "is the hottest place going.$" BattleFrontier_Lounge2_Text_260933:: @ 8260933 - .string "Let’s see now…\p" + .string "Let's see now…\p" .string "It sounds like BATTLE TOWER\n" .string "{STR_VAR_1} is the hottest.$" BattleFrontier_Lounge2_Text_260971:: @ 8260971 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this mysterious TRAINER called\n" + .string "It's this mysterious TRAINER called\n" .string "the SALON MAIDEN that runs the place.$" BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E .string "Have you battled the SALON MAIDEN?\p" - .string "When she’s measuring up her opponent,\n" + .string "When she's measuring up her opponent,\n" .string "she apparently uses these POKéMON:\p" .string "A PSYCHIC-type PSI POKéMON,\n" .string "a FIRE-type VOLCANO POKéMON,\l" @@ -163,23 +163,23 @@ BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7 .string "Have you battled the SALON MAIDEN\n" - .string "when she’s serious?\p" - .string "When she’s battling flat out,\n" + .string "when she's serious?\p" + .string "When she's battling flat out,\n" .string "she apparently uses these POKéMON:\p" .string "A DRAGON & PSYCHIC EON POKéMON,\n" .string "an ELECTRIC-type THUNDER POKéMON,\l" .string "and a NORMAL-type SLEEPING POKéMON.$" BattleFrontier_Lounge2_Text_260BC4:: @ 8260BC4 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this flamboyant TRAINER called\n" + .string "It's this flamboyant TRAINER called\n" .string "the DOME ACE that runs the place.$" BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D .string "Have you battled the DOME ACE?\p" - .string "When he’s treating the opponent\n" + .string "When he's treating the opponent\n" .string "lightly, he uses these three POKéMON:\p" .string "A DRAGON & FLYING DRAGON POKéMON,\n" .string "a WATER & GROUND MUD FISH POKéMON,\l" @@ -187,8 +187,8 @@ BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A .string "Have you battled the DOME ACE\n" - .string "when he’s serious?\p" - .string "When he’s demonstrating his strategy,\n" + .string "when he's serious?\p" + .string "When he's demonstrating his strategy,\n" .string "he uses these three POKéMON:\p" .string "A DRAGON & FLYING EON POKéMON,\n" .string "a WATER & GROUND MUD FISH POKéMON,\l" @@ -196,10 +196,10 @@ BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A .string "POKéMON.$" BattleFrontier_Lounge2_Text_260E1E:: @ 8260E1E - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this freaky TRAINER called\n" + .string "It's this freaky TRAINER called\n" .string "the FACTORY HEAD that runs the place.$" BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7 @@ -212,23 +212,23 @@ BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7 BattleFrontier_Lounge2_Text_260F74:: @ 8260F74 .string "Have you battled the FACTORY HEAD\n" - .string "when he’s serious?\p" + .string "when he's serious?\p" .string "When he goes seriously to battle,\n" .string "he still gets three rental POKéMON.\p" .string "He battles under virtually the same\n" .string "conditions as you.$" BattleFrontier_Lounge2_Text_261026:: @ 8261026 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this scary TRAINER called\n" + .string "It's this scary TRAINER called\n" .string "the PIKE QUEEN that runs the place.$" BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC .string "Have you battled the PIKE QUEEN\n" .string "before?\p" - .string "When she’s in a good mood, they say\n" + .string "When she's in a good mood, they say\n" .string "she uses these three POKéMON:\p" .string "A POISON-type FANG SNAKE POKéMON,\n" .string "a BUG & ROCK MOLD POKéMON,\l" @@ -236,8 +236,8 @@ BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC BattleFrontier_Lounge2_Text_261194:: @ 8261194 .string "Have you battled the PIKE QUEEN\n" - .string "when she’s serious?\p" - .string "When she’s seriously annoyed, they say\n" + .string "when she's serious?\p" + .string "When she's seriously annoyed, they say\n" .string "she uses these three POKéMON:\p" .string "A POISON-type FANG SNAKE POKéMON,\n" .string "a STEEL & GROUND IRON SNAKE POKéMON,\l" @@ -245,16 +245,16 @@ BattleFrontier_Lounge2_Text_261194:: @ 8261194 .string "POKéMON.$" BattleFrontier_Lounge2_Text_261282:: @ 8261282 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this cute TRAINER called\n" + .string "It's this cute TRAINER called\n" .string "the ARENA TYCOON that runs the place.$" BattleFrontier_Lounge2_Text_261329:: @ 8261329 .string "Have you battled the ARENA TYCOON\n" .string "before?\p" - .string "When she’s assessing the foe’s ability,\n" + .string "When she's assessing the foe's ability,\n" .string "she supposedly uses these POKéMON:\p" .string "A BUG & FIGHTING SINGLE HORN POKéMON,\n" .string "a DARK-type MOONLIGHT POKéMON,\l" @@ -262,7 +262,7 @@ BattleFrontier_Lounge2_Text_261329:: @ 8261329 BattleFrontier_Lounge2_Text_261403:: @ 8261403 .string "Have you battled the ARENA TYCOON\n" - .string "when she’s serious?\p" + .string "when she's serious?\p" .string "When she battles for keeps,\n" .string "she supposedly uses these POKéMON:\p" .string "A DARK-type MOONLIGHT POKéMON,\n" @@ -271,41 +271,41 @@ BattleFrontier_Lounge2_Text_261403:: @ 8261403 .string "MUSHROOM POKéMON.$" BattleFrontier_Lounge2_Text_2614E6:: @ 82614E6 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this sinister TRAINER called\n" + .string "It's this sinister TRAINER called\n" .string "the PALACE MAVEN that runs the place.$" BattleFrontier_Lounge2_Text_261591:: @ 8261591 .string "Have you battled the PALACE MAVEN\n" .string "before?\p" - .string "When he’s testing the opponent’s\n" - .string "spirit, he’s said to use these POKéMON:\p" + .string "When he's testing the opponent's\n" + .string "spirit, he's said to use these POKéMON:\p" .string "A POISON & FLYING-type BAT POKéMON,\n" .string "a NORMAL-type LAZY POKéMON, and a\l" .string "WATER- & ICE-type TRANSPORT POKéMON.$" BattleFrontier_Lounge2_Text_26166F:: @ 826166F .string "Have you battled the PALACE MAVEN\n" - .string "when he’s serious?\p" + .string "when he's serious?\p" .string "When he throws his entire might into\n" - .string "battle, he’s said to use these POKéMON:\p" + .string "battle, he's said to use these POKéMON:\p" .string "A FIRE-type LEGENDARY POKéMON,\n" .string "a NORMAL-type LAZY POKéMON,\l" .string "and a WATER-type AURORA POKéMON.$" BattleFrontier_Lounge2_Text_26174D:: @ 826174D - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this fiery-hot TRAINER called\n" + .string "It's this fiery-hot TRAINER called\n" .string "the PYRAMID KING that runs the place.$" BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9 .string "Have you battled the PYRAMID KING\n" .string "before?\p" - .string "When he’s checking the foe’s power,\n" + .string "When he's checking the foe's power,\n" .string "he apparently uses these POKéMON:\p" .string "A ROCK-type ROCK PEAK POKéMON,\n" .string "an ICE-type ICEBERG POKéMON,\l" @@ -313,8 +313,8 @@ BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9 BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4 .string "Have you battled the PYRAMID KING\n" - .string "when he’s serious?\p" - .string "When he’s pumped with hot power,\n" + .string "when he's serious?\p" + .string "When he's pumped with hot power,\n" .string "he apparently uses these POKéMON:\p" .string "An ICE & FLYING FREEZE POKéMON, an\n" .string "ELECTRIC & FLYING ELECTRIC POKéMON,\l" @@ -326,7 +326,7 @@ BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC .string "you can enter DOUBLE BATTLES.\p" .string "But the DOUBLE BATTLE ROOMS of\n" .string "the BATTLE TOWER are, like, basic!\p" - .string "They’re where you should learn about\n" + .string "They're where you should learn about\n" .string "how DOUBLE BATTLES are played here\l" .string "in the BATTLE FRONTIER.$" @@ -337,7 +337,7 @@ BattleFrontier_Lounge2_Text_261A91:: @ 8261A91 .string "DOUBLE BATTLES.$" BattleFrontier_Lounge2_Text_261B0C:: @ 8261B0C - .string "Once you’re confident and comfortable\n" + .string "Once you're confident and comfortable\n" .string "with DOUBLE BATTLES here, you should\l" .string "think about challenging other places\l" .string "offering DOUBLE BATTLES.$" @@ -350,24 +350,24 @@ BattleFrontier_Lounge2_Text_261B95:: @ 8261B95 .string "You should look carefully!$" BattleFrontier_Lounge2_Text_261C1A:: @ 8261C1A - .string "If you’re with a friend, head for the\n" + .string "If you're with a friend, head for the\n" .string "LINK MULTI BATTLE ROOM.\p" .string "If you play with a strong friend,\n" .string "you can expect to see tough foes!$" BattleFrontier_Lounge2_Text_261C9C:: @ 8261C9C .string "What amazing news-gathering power!\n" - .string "My mentor’s like none other!$" + .string "My mentor's like none other!$" BattleFrontier_Lounge2_Text_261CDC:: @ 8261CDC .string "What amazing powers of observation!\n" - .string "My mentor’s like none other!$" + .string "My mentor's like none other!$" BattleFrontier_Lounge2_Text_261D1D:: @ 8261D1D .string "What amazing power of persuasion!\n" - .string "My mentor’s like none other!$" + .string "My mentor's like none other!$" BattleFrontier_Lounge2_Text_261D5C:: @ 8261D5C .string "…What is this place?\n" - .string "It’s scaring me…$" + .string "It's scaring me…$" diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index e1e6c68a5..26cbeebcf 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -212,9 +212,9 @@ BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 end BattleFrontier_Lounge3_Text_261FFE:: @ 8261FFE - .string "…What’s that you want?\p" - .string "Can’t you see we’re kind of busy here?\n" - .string "Can’t your business wait till later?$" + .string "…What's that you want?\p" + .string "Can't you see we're kind of busy here?\n" + .string "Can't your business wait till later?$" BattleFrontier_Lounge3_Text_262061:: @ 8262061 .string "…Huh?\n" @@ -228,7 +228,7 @@ BattleFrontier_Lounge3_Text_262061:: @ 8262061 .string "First, we pick one of the facilities\n" .string "in the BATTLE FRONTIER.\p" .string "Then, we each pick a different TRAINER\n" - .string "who’s taking that facility’s challenge,\l" + .string "who's taking that facility's challenge,\l" .string "and bet with our Battle Points.\p" .string "The guy who bet on the TRAINER with\n" .string "the best record takes all the Battle\l" @@ -237,99 +237,99 @@ BattleFrontier_Lounge3_Text_262061:: @ 8262061 .string "So, anyway…$" BattleFrontier_Lounge3_Text_262261:: @ 8262261 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "TOWER’s SINGLE BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "TOWER's SINGLE BATTLE ROOMS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26230D:: @ 826230D - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "TOWER’s DOUBLE BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "TOWER's DOUBLE BATTLE ROOMS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_2623B9:: @ 82623B9 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "TOWER’s MULTI BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "TOWER's MULTI BATTLE ROOMS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_262464:: @ 8262464 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "DOME’s SINGLE BATTLE Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "DOME's SINGLE BATTLE Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26250E:: @ 826250E - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "DOME’s DOUBLE BATTLE Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "DOME's DOUBLE BATTLE Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_2625B8:: @ 82625B8 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "FACTORY’s Battle Swap Single Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "FACTORY's Battle Swap Single Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26266A:: @ 826266A - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "FACTORY’s Battle Swap Double Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "FACTORY's Battle Swap Double Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26271C:: @ 826271C - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "PALACE’s SINGLE BATTLE HALLS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "PALACE's SINGLE BATTLE HALLS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_2627C9:: @ 82627C9 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "PALACE’s DOUBLE BATTLE HALLS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "PALACE's DOUBLE BATTLE HALLS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_262876:: @ 8262876 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "ARENA’s Set KO Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "ARENA's Set KO Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26291A:: @ 826291A - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE PIKE’s\l" + .string "What I'm looking for is a TRAINER who's\n" + .string "going to be entering the BATTLE PIKE's\l" .string "Battle Choice.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_2629BC:: @ 82629BC - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "PYRAMID’s Battle Quest.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "PYRAMID's Battle Quest.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_262A60:: @ 8262A60 - .string "I’ll see to it that you benefit, too.\n" + .string "I'll see to it that you benefit, too.\n" .string "So how about it?\l" .string "How about entering that event for me?$" BattleFrontier_Lounge3_Text_262ABD:: @ 8262ABD - .string "All right, that’s perfect.\n" + .string "All right, that's perfect.\n" .string "So, uh… How about spotting me some\l" .string "of your Battle Points?\p" - .string "Trust me, I’ll show you my gratitude\n" + .string "Trust me, I'll show you my gratitude\n" .string "afterward.$" BattleFrontier_Lounge3_Text_262B42:: @ 8262B42 @@ -338,104 +338,104 @@ BattleFrontier_Lounge3_Text_262B42:: @ 8262B42 BattleFrontier_Lounge3_Text_262B6E:: @ 8262B6E .string "Oh, no, no, no!\n" - .string "You don’t have enough Battle Points!\p" - .string "I wish you wouldn’t monkey around and\n" - .string "waste everyone’s time!$" + .string "You don't have enough Battle Points!\p" + .string "I wish you wouldn't monkey around and\n" + .string "waste everyone's time!$" BattleFrontier_Lounge3_Text_262BE0:: @ 8262BE0 .string "Heheh! Thanks much!\n" .string "So, off you go!$" BattleFrontier_Lounge3_Text_262C04:: @ 8262C04 - .string "Get to the BATTLE TOWER’s\n" + .string "Get to the BATTLE TOWER's\n" .string "SINGLE BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262C90:: @ 8262C90 - .string "Get to the BATTLE TOWER’s\n" + .string "Get to the BATTLE TOWER's\n" .string "DOUBLE BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262D1C:: @ 8262D1C - .string "Get to the BATTLE TOWER’s\n" + .string "Get to the BATTLE TOWER's\n" .string "MULTI BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262DA7:: @ 8262DA7 - .string "Get to the BATTLE DOME’s\n" + .string "Get to the BATTLE DOME's\n" .string "SINGLE BATTLE Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262E34:: @ 8262E34 - .string "Get to the BATTLE DOME’s\n" + .string "Get to the BATTLE DOME's\n" .string "DOUBLE BATTLE Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262EC1:: @ 8262EC1 - .string "Get to the BATTLE FACTORY’s\n" + .string "Get to the BATTLE FACTORY's\n" .string "Battle Swap Single Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262F56:: @ 8262F56 - .string "Get to the BATTLE FACTORY’s\n" + .string "Get to the BATTLE FACTORY's\n" .string "Battle Swap Double Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262FEB:: @ 8262FEB - .string "Get to the BATTLE PALACE’s\n" + .string "Get to the BATTLE PALACE's\n" .string "SINGLE BATTLE HALLS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_263078:: @ 8263078 - .string "Get to the BATTLE PALACE’s\n" + .string "Get to the BATTLE PALACE's\n" .string "DOUBLE BATTLE HALLS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_263105:: @ 8263105 - .string "Get to the BATTLE ARENA’s\n" + .string "Get to the BATTLE ARENA's\n" .string "Set KO Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_26318C:: @ 826318C - .string "Get to the BATTLE PIKE’s\n" + .string "Get to the BATTLE PIKE's\n" .string "Battle Choice pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_263211:: @ 8263211 - .string "Get to the BATTLE PYRAMID’s\n" + .string "Get to the BATTLE PYRAMID's\n" .string "Battle Quest pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_263298:: @ 8263298 - .string "Oh, it’s you…\n" + .string "Oh, it's you…\n" .string "Nice try…\p" - .string "I hate to break it to you, but I can’t\n" + .string "I hate to break it to you, but I can't\n" .string "return your Battle Points…\p" - .string "I guess we’ll have to let it motivate\n" + .string "I guess we'll have to let it motivate\n" .string "us to try harder next time!$" BattleFrontier_Lounge3_Text_263334:: @ 8263334 @@ -443,8 +443,8 @@ BattleFrontier_Lounge3_Text_263334:: @ 8263334 .string "Hello there, champ!\p" .string "I knew you could!\n" .string "I knew you would!\l" - .string "We’re both big winners!\p" - .string "I’ll return your Battle Points and,\n" + .string "We're both big winners!\p" + .string "I'll return your Battle Points and,\n" .string "of course, a little extra from me!$" BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4 @@ -452,11 +452,11 @@ BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4 .string "{STR_VAR_1} Battle Points.$" BattleFrontier_Lounge3_Text_2633F2:: @ 82633F2 - .string "If you’re up for another challenge,\n" + .string "If you're up for another challenge,\n" .string "please do think of me!$" BattleFrontier_Lounge3_Text_26342D:: @ 826342D - .string "Not interested?! You shouldn’t be\n" + .string "Not interested?! You shouldn't be\n" .string "so afraid to take a chance!$" BattleFrontier_Lounge3_Text_26346B:: @ 826346B @@ -469,7 +469,7 @@ BattleFrontier_Lounge3_Text_26346F:: @ 826346F BattleFrontier_Lounge3_Text_2634C9:: @ 82634C9 .string "That TRAINER…\p" - .string "He’s good, but he gets rattled too\n" + .string "He's good, but he gets rattled too\n" .string "easily to survive the BATTLE DOME…$" BattleFrontier_Lounge3_Text_26351D:: @ 826351D diff --git a/data/maps/BattleFrontier_Lounge4/scripts.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc index 5e666c9ef..407720915 100644 --- a/data/maps/BattleFrontier_Lounge4/scripts.inc +++ b/data/maps/BattleFrontier_Lounge4/scripts.inc @@ -14,12 +14,12 @@ BattleFrontier_Lounge4_EventScript_26359F:: @ 826359F end BattleFrontier_Lounge4_Text_2635A8: @ 82635A8 - .string "I wonder if they’ll be airing interviews\n" + .string "I wonder if they'll be airing interviews\n" .string "with tough TRAINERS today?$" BattleFrontier_Lounge4_Text_2635EC: @ 82635EC .string "If I opened a restaurant here,\n" - .string "it’d make money for sure.$" + .string "it'd make money for sure.$" BattleFrontier_Lounge4_Text_263625: @ 8263625 .string "Whew…\p" diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc index 6c3ca56fd..65a5d2556 100644 --- a/data/maps/BattleFrontier_Lounge5/scripts.inc +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -187,8 +187,8 @@ BattleFrontier_Lounge5_Text_264E8F:: @ 8264E8F .string "it will turn sneaky!$" BattleFrontier_Lounge5_Text_264EEE:: @ 8264EEE - .string "That’s silly! An EGG is asleep!\n" - .string "I can’t talk to it!$" + .string "That's silly! An EGG is asleep!\n" + .string "I can't talk to it!$" BattleFrontier_Lounge5_Text_264F22:: @ 8264F22 .string "How charming!\n" diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index 2f929f082..495a604d4 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -52,31 +52,31 @@ BattleFrontier_Lounge6_EventScript_265083:: @ 8265083 BattleFrontier_Lounge6_Text_26508D: @ 826508D .string "My POKéMON is a {STR_VAR_2}.\n" .string "Do you know it?\l" - .string "It’s quite cute and rather nice.\p" + .string "It's quite cute and rather nice.\p" .string "This little one, I could trade with\n" .string "pride!\p" .string "Would you like to trade me a {STR_VAR_1}\n" .string "for my {STR_VAR_2}?$" BattleFrontier_Lounge6_Text_265128: @ 8265128 - .string "Oh, it’s adorable!\n" + .string "Oh, it's adorable!\n" .string "Thank you!\l" - .string "I promise I’ll be good to it!\p" - .string "Oh! I hope you’ll be good to\n" + .string "I promise I'll be good to it!\p" + .string "Oh! I hope you'll be good to\n" .string "my {STR_VAR_2}, too!$" BattleFrontier_Lounge6_Text_26518D: @ 826518D - .string "Oh, I’m sorry!\n" - .string "I don’t intend to trade for anything\l" + .string "Oh, I'm sorry!\n" + .string "I don't intend to trade for anything\l" .string "but a {STR_VAR_1}.$" BattleFrontier_Lounge6_Text_2651CB: @ 82651CB - .string "Oh, you won’t?\n" - .string "Well, that’s fine, too.\l" + .string "Oh, you won't?\n" + .string "Well, that's fine, too.\l" .string "Please come visit us again.$" BattleFrontier_Lounge6_Text_26520E: @ 826520E .string "Giggle!\n" .string "A SKITTY is so much cuter than I had\l" - .string "imagined. I’m delighted!$" + .string "imagined. I'm delighted!$" diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 882f7a7eb..f395a27bc 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -291,19 +291,19 @@ BattleFrontier_Lounge7_EventScript_2656E4:: @ 82656E4 BattleFrontier_Lounge7_Text_2656ED: @ 82656ED .string "Buhahaha!\p" - .string "You couldn’t tell it from looking now,\n" + .string "You couldn't tell it from looking now,\n" .string "but I used to be one tough TRAINER.\p" .string "I had a reputation as the toughest\n" .string "BEAUTY around, I tell you!\p" .string "… … … … … …\p" .string "What is it now?\n" - .string "You don’t believe me.\p" - .string "I’m not like that blowhard woman over\n" - .string "there. I’m actually talented!\p" + .string "You don't believe me.\p" + .string "I'm not like that blowhard woman over\n" + .string "there. I'm actually talented!\p" .string "Let me prove it to you.\n" .string "I can teach your POKéMON special and\l" .string "yet cute moves.\p" - .string "But my lessons don’t come free.\n" + .string "But my lessons don't come free.\n" .string "How about paying for the moves I teach\l" .string "with a wee bit of Battle Points?$" @@ -326,33 +326,33 @@ BattleFrontier_Lounge7_Text_26595A: @ 826595A BattleFrontier_Lounge7_Text_265997: @ 8265997 .string "What the…\n" - .string "You haven’t got enough Battle Points!$" + .string "You haven't got enough Battle Points!$" BattleFrontier_Lounge7_Text_2659C7: @ 82659C7 .string "Do you see how skilled I am now?\n" - .string "I’ll take your Battle Points, thanks!$" + .string "I'll take your Battle Points, thanks!$" BattleFrontier_Lounge7_Text_265A0E: @ 8265A0E - .string "What’s that?\n" - .string "You don’t want to…\p" + .string "What's that?\n" + .string "You don't want to…\p" .string "If you want to see how skilled I am,\n" .string "you come see me anytime!$" BattleFrontier_Lounge7_Text_265A6C: @ 8265A6C .string "Ihihihi!\p" - .string "I know it’s hard to see now, but I used\n" + .string "I know it's hard to see now, but I used\n" .string "to be one fantastic TRAINER.\p" .string "I had a reputation as the most\n" .string "invincible SWIMMER around, I tell you!\p" .string "… … … … … …\p" - .string "What’s wrong?\n" - .string "You don’t believe me.\p" - .string "I’m not like that buffoonish woman over\n" - .string "there. I’m actually experienced!\p" + .string "What's wrong?\n" + .string "You don't believe me.\p" + .string "I'm not like that buffoonish woman over\n" + .string "there. I'm actually experienced!\p" .string "I can prove it to you.\n" .string "I can teach your POKéMON hard and\l" .string "yet pretty moves.\p" - .string "But my lessons don’t come free.\n" + .string "But my lessons don't come free.\n" .string "How about paying for the moves I teach\l" .string "with a wee bit of Battle Points?$" @@ -364,31 +364,31 @@ BattleFrontier_Lounge7_Text_265C2C: @ 8265C2C BattleFrontier_Lounge7_Text_265C6F: @ 8265C6F .string "Those ladies, the way they bad-mouth\n" .string "each other, you probably think that\l" - .string "they don’t get along.\p" - .string "But if that were true, they wouldn’t\n" + .string "they don't get along.\p" + .string "But if that were true, they wouldn't\n" .string "stay out here together, would they?$" BattleFrontier_Lounge7_Text_265D17: @ 8265D17 .string "When I was just a wee YOUNGSTER,\n" .string "those ladies were strong and beautiful.\p" .string "They were idols among us TRAINERS.\p" - .string "Even now, age hasn’t dulled their\n" + .string "Even now, age hasn't dulled their\n" .string "abilities.\p" .string "In fact, their POKéMON moves have\n" .string "grown even more polished.\p" - .string "But… For some reason, I can’t help\n" + .string "But… For some reason, I can't help\n" .string "but feel this…\p" .string "Time is so cruel…$" BattleFrontier_Lounge7_Text_265E30:: @ 8265E30 .string "Recovers up to\n" - .string "half the user’s\n" + .string "half the user's\n" .string "maximum HP.$" BattleFrontier_Lounge7_Text_265E5B:: @ 8265E5B .string "Inflicts damage\n" .string "identical to the\n" - .string "user’s level.$" + .string "user's level.$" BattleFrontier_Lounge7_Text_265E8A:: @ 8265E8A .string "Recovers half the\n" @@ -442,7 +442,7 @@ BattleFrontier_Lounge7_Text_26603E:: @ 826603E BattleFrontier_Lounge7_Text_266070:: @ 8266070 .string "Hurls mud in the\n" - .string "foe’s face to re-\n" + .string "foe's face to re-\n" .string "duce its accuracy.$" BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6 @@ -453,7 +453,7 @@ BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6 BattleFrontier_Lounge7_Text_2660D0:: @ 82660D0 .string "A chilling attack\n" .string "that lowers the\n" - .string "foe’s SPEED.$" + .string "foe's SPEED.$" BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF .string "Endures any at-\n" @@ -461,7 +461,7 @@ BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF .string "leaving 1HP.$" BattleFrontier_Lounge7_Text_26612D:: @ 826612D - .string "Copies the foe’s\n" + .string "Copies the foe's\n" .string "effect(s) and\n" .string "gives to the user.$" diff --git a/data/maps/BattleFrontier_Lounge8/scripts.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc index e6399433e..3a6f78fd7 100644 --- a/data/maps/BattleFrontier_Lounge8/scripts.inc +++ b/data/maps/BattleFrontier_Lounge8/scripts.inc @@ -22,15 +22,15 @@ BattleFrontier_Lounge8_Text_2676E5: @ 82676E5 .string "Spirit…\l" .string "Bravery…\l" .string "And ability…\p" - .string "Well, I’m all set in every way!\n" - .string "I’ll be unstoppable at every building!\p" + .string "Well, I'm all set in every way!\n" + .string "I'll be unstoppable at every building!\p" .string "Huh? POKéMON?\n" - .string "What’s that?$" + .string "What's that?$" BattleFrontier_Lounge8_Text_26779C: @ 826779C .string "Do you know about the FRONTIER\n" .string "BRAINS?\p" - .string "That’s what SCOTT calls the seven\n" + .string "That's what SCOTT calls the seven\n" .string "special TRAINERS that run the seven\l" .string "facilities in the BATTLE FRONTIER.$" @@ -39,7 +39,7 @@ BattleFrontier_Lounge8_Text_26782C: @ 826782C .string "told me that I have a lot of talent\l" .string "for battling!\p" .string "I like POKéMON CONTESTS more!\p" - .string "But I’m no good at CONTESTS!\p" + .string "But I'm no good at CONTESTS!\p" .string "I guess having talent and liking\n" - .string "something aren’t the same.$" + .string "something aren't the same.$" diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index f3708b565..725fce863 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -49,18 +49,18 @@ BattleFrontier_Mart_EventScript_267B20:: @ 8267B20 BattleFrontier_Mart_Text_267B29: @ 8267B29 .string "We came here to chaperon our\n" .string "grandson.\p" - .string "But since we’re here, we thought\n" + .string "But since we're here, we thought\n" .string "we should get some souvenirs.$" BattleFrontier_Mart_Text_267B8F: @ 8267B8F .string "Dear, what do you think of this?\n" - .string "Wouldn’t this make a nice gift?\p" - .string "It’s…PRO…TE…IN?\n" - .string "It sounds delicious, doesn’t it?$" + .string "Wouldn't this make a nice gift?\p" + .string "It's…PRO…TE…IN?\n" + .string "It sounds delicious, doesn't it?$" BattleFrontier_Mart_Text_267C01: @ 8267C01 - .string "A lot of the BATTLE FRONTIER’s\n" - .string "facilities don’t allow the use of items\l" + .string "A lot of the BATTLE FRONTIER's\n" + .string "facilities don't allow the use of items\l" .string "during battles.\p" .string "That rule makes things tougher than\n" .string "they already are!$" diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index be0bdc809..fe034442e 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -265,22 +265,22 @@ BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C .string "Wow!\n" - .string "It’s huge!\p" + .string "It's huge!\p" .string "The BATTLE TOWER feels special.\n" - .string "It’s different from the others.$" + .string "It's different from the others.$" BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC .string "My grand ambition is to conquer both\n" .string "the BATTLE FRONTIER and the POKéMON\l" .string "LEAGUE.\p" .string "And if my dream comes true…\p" - .string "I… I’m going to ask MIMI next door\n" + .string "I… I'm going to ask MIMI next door\n" .string "if she will be friends with me!$" BattleFrontier_OutsideEast_Text_24308C: @ 824308C - .string "The BATTLE PYRAMID’s too harsh!\n" - .string "I just can’t make it to the top!\p" - .string "Since I’m out of options, maybe I can\n" + .string "The BATTLE PYRAMID's too harsh!\n" + .string "I just can't make it to the top!\p" + .string "Since I'm out of options, maybe I can\n" .string "climb the outside…$" BattleFrontier_OutsideEast_Text_243106: @ 8243106 @@ -291,23 +291,23 @@ BattleFrontier_OutsideEast_Text_243106: @ 8243106 .string "and in utter and total desperation?$" BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5 - .string "I didn’t sleep for a week, but then\n" + .string "I didn't sleep for a week, but then\n" .string "I put together the ultimate team!\p" - .string "I can’t see myself losing, no joke.\n" - .string "We’re storming the BATTLE ARENA!$" + .string "I can't see myself losing, no joke.\n" + .string "We're storming the BATTLE ARENA!$" BattleFrontier_OutsideEast_Text_243230: @ 8243230 .string "Did SCOTT bring you here, too?\n" .string "What is it with that guy?\p" .string "It sounds like he really does know\n" .string "how to spot talented TRAINERS, but…\p" - .string "I’ve never seen him battling in person\n" + .string "I've never seen him battling in person\n" .string "ever.$" BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD .string "ZIGG!\n" .string "I believe in you, little buddy!\p" - .string "I’ll make my little ZIGG any favorite\n" + .string "I'll make my little ZIGG any favorite\n" .string "tasty treats you like if you win!$" BattleFrontier_OutsideEast_Text_24334B: @ 824334B @@ -315,11 +315,11 @@ BattleFrontier_OutsideEast_Text_24334B: @ 824334B BattleFrontier_OutsideEast_Text_243363: @ 8243363 .string "People call me a busybody,\n" - .string "but I can’t help it.\p" - .string "Your hat’s on crooked!\n" + .string "but I can't help it.\p" + .string "Your hat's on crooked!\n" .string "Oh, no, trash on the ground!\l" - .string "Oops, it’s almost dinnertime!\p" - .string "I don’t know if I can stand to just\n" + .string "Oops, it's almost dinnertime!\p" + .string "I don't know if I can stand to just\n" .string "watch at the BATTLE PALACE…$" BattleFrontier_OutsideEast_Text_243425: @ 8243425 @@ -329,24 +329,24 @@ BattleFrontier_OutsideEast_Text_243425: @ 8243425 .string "another shot at glory.$" BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0 - .string "I’m fast on my BIKE, and that goes for\n" + .string "I'm fast on my BIKE, and that goes for\n" .string "the way I battle, too.\p" .string "I win matches in the blink of\n" .string "an eye!$" BattleFrontier_OutsideEast_Text_243504: @ 8243504 - .string "I’m better than my daddy\n" + .string "I'm better than my daddy\n" .string "at POKéMON.$" BattleFrontier_OutsideEast_Text_243529: @ 8243529 .string "Go on, my baby sweetie!\n" .string "Go rack up some wins for Daddy!\p" - .string "You’re just like your mother,\n" - .string "so you’ll be dominating!$" + .string "You're just like your mother,\n" + .string "so you'll be dominating!$" BattleFrontier_OutsideEast_Text_243598: @ 8243598 - .string "It wasn’t easy getting here,\n" - .string "but I’d heard about this knockout\l" + .string "It wasn't easy getting here,\n" + .string "but I'd heard about this knockout\l" .string "pretty girl at the BATTLE ARENA.\p" .string "Instead of her, do you know what\n" .string "I found?\p" @@ -365,18 +365,18 @@ BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2 .string "When there comes a confident TRAINER\n" .string "reaching for the golden pinnacle,\l" .string "there shall appear a man among men.\p" - .string "Don’t know that legend?\n" + .string "Don't know that legend?\n" .string "Well, of course not!\l" .string "I just made it up!\p" - .string "What’s it supposed to mean?\n" - .string "That, my friend, I can’t say!$" + .string "What's it supposed to mean?\n" + .string "That, my friend, I can't say!$" BattleFrontier_OutsideEast_Text_243809: @ 8243809 .string "Man! Oh man!\n" - .string "I’ve never lost once before!\p" + .string "I've never lost once before!\p" .string "But I got wiped out with no saving\n" .string "grace at all!\p" - .string "And then I’m told I don’t have any\n" + .string "And then I'm told I don't have any\n" .string "talent?! Man!$" BattleFrontier_OutsideEast_Text_243895: @ 8243895 @@ -389,14 +389,14 @@ BattleFrontier_OutsideEast_Text_243895: @ 8243895 BattleFrontier_OutsideEast_Text_243943: @ 8243943 .string "Yes!\n" - .string "I’ve finally got enough Battle Points!\p" - .string "I guess I’ll trade for another giant\n" + .string "I've finally got enough Battle Points!\p" + .string "I guess I'll trade for another giant\n" .string "plush DOLL!$" BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0 .string "Oh, yeah, okay!\n" .string "So this is the RANKING HALL!\p" - .string "I’d like to go down in history as\n" + .string "I'd like to go down in history as\n" .string "a super champ and have my name\l" .string "recorded here for posterity.$" @@ -405,8 +405,8 @@ BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B BattleFrontier_OutsideEast_Text_243A53: @ 8243A53 .string "Ooh, darling, you are so wonderful!\p" - .string "Ooh, I just can’t wait anymore!\p" - .string "Let’s go to a MULTI BATTLE ROOM\n" + .string "Ooh, I just can't wait anymore!\p" + .string "Let's go to a MULTI BATTLE ROOM\n" .string "right this instant!\p" .string "If we get together in the BATTLE SALON,\n" .string "the power of our love will overcome\l" @@ -415,7 +415,7 @@ BattleFrontier_OutsideEast_Text_243A53: @ 8243A53 .string "will topple like dominoes!$" BattleFrontier_OutsideEast_Text_243B68: @ 8243B68 - .string "The BATTLE FRONTIER isn’t exclusively\n" + .string "The BATTLE FRONTIER isn't exclusively\n" .string "for tough TRAINERS.\p" .string "Many people with special abilities\n" .string "have been invited, it seems.\p" diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index a735e7ffd..b01b0eb2d 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -329,14 +329,14 @@ BattleFrontier_OutsideWest_Text_23D808: @ 823D808 .string "May I see your TICKET?$" BattleFrontier_OutsideWest_Text_23D842: @ 823D842 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" + .string "{PLAYER} doesn't have the TICKET…\p" + .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" BattleFrontier_OutsideWest_Text_23D89D: @ 823D89D .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" + .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" BattleFrontier_OutsideWest_Text_23D8F2: @ 823D8F2 @@ -356,13 +356,13 @@ BattleFrontier_OutsideWest_Text_23D97A: @ 823D97A .string "Then, where would you like to go?$" BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C - .string "I’m the best out of all my friends.\n" + .string "I'm the best out of all my friends.\n" .string "But here…\l" - .string "I’ve been useless!$" + .string "I've been useless!$" BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD .string "I want to go to the BATTLE TOWER,\n" - .string "but I can’t find it even though I have\l" + .string "but I can't find it even though I have\l" .string "a map of the BATTLE FRONTIER.\p" .string "This place is just too big!$" @@ -373,40 +373,40 @@ BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60 .string "Urrrrp…$" BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF - .string "It’s not as if just anyone can come\n" + .string "It's not as if just anyone can come\n" .string "here, you know?\p" - .string "Only those TRAINERS who’ve been\n" + .string "Only those TRAINERS who've been\n" .string "recognized as tough are brought here.\p" - .string "That’s why many TRAINERS don’t even\n" + .string "That's why many TRAINERS don't even\n" .string "know about the BATTLE FRONTIER.$" BattleFrontier_OutsideWest_Text_23DB7D: @ 823DB7D .string "Hey, bro…\p" .string "Are you sure we can make challenges\n" - .string "even if we don’t have any POKéMON?$" + .string "even if we don't have any POKéMON?$" BattleFrontier_OutsideWest_Text_23DBCE: @ 823DBCE .string "Uh…\n" - .string "I’m sure it’ll be okay.\p" + .string "I'm sure it'll be okay.\p" .string "I think…\p" .string "But remember that big scary guy?\n" - .string "He said, “I’ll lend you POKéMON!â€$" + .string "He said, “I'll lend you POKéMON!â€$" BattleFrontier_OutsideWest_Text_23DC36: @ 823DC36 - .string "That’s the BATTLE FACTORY.\n" + .string "That's the BATTLE FACTORY.\n" .string "You can rent strong POKéMON there.\p" .string "But it makes me wonder.\n" - .string "Who’s raising those rental POKéMON?$" + .string "Who's raising those rental POKéMON?$" BattleFrontier_OutsideWest_Text_23DCB0: @ 823DCB0 - .string "I’m scared of going into the BATTLE\n" + .string "I'm scared of going into the BATTLE\n" .string "PIKE because of SEVIPER…\p" .string "B-but I came all the way here, so I will\n" .string "try to conquer everything!\l" .string "…Shudder…$" BattleFrontier_OutsideWest_Text_23DD3B: @ 823DD3B - .string "Let’s play rock, paper, scissors!\n" + .string "Let's play rock, paper, scissors!\n" .string "One, two, three!\p" .string "… … … … … …$" @@ -417,53 +417,53 @@ BattleFrontier_OutsideWest_Text_23DD7A: @ 823DD7A BattleFrontier_OutsideWest_Text_23DDAD: @ 823DDAD .string "Oh, no…\n" .string "I lost.\p" - .string "I guess I’m not very lucky today.\n" - .string "I’ll put off my BATTLE PIKE challenge\l" + .string "I guess I'm not very lucky today.\n" + .string "I'll put off my BATTLE PIKE challenge\l" .string "until tomorrow.$" BattleFrontier_OutsideWest_Text_23DE15: @ 823DE15 - .string "I believe I’m the only person here who,\n" + .string "I believe I'm the only person here who,\n" .string "for some unknown reason, would choose\l" .string "fishing over battling.\p" - .string "Huh? You can’t catch anything here?\n" - .string "That’s disappointing…$" + .string "Huh? You can't catch anything here?\n" + .string "That's disappointing…$" BattleFrontier_OutsideWest_Text_23DEB4: @ 823DEB4 - .string "Today, I’m going to keep battling, no\n" + .string "Today, I'm going to keep battling, no\n" .string "matter what, until I get a Symbol.$" BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD - .string "Oh? You’re off to challenge\n" + .string "Oh? You're off to challenge\n" .string "the BATTLE DOME?\p" - .string "I’ll wish you the best of luck.\n" + .string "I'll wish you the best of luck.\n" .string "Let us both win our way up and meet\l" .string "in challenges.$" BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D .string "Grandpa, over here!\n" .string "The BATTLE DOME is here!\l" - .string "Go get ’em, Grandpa!$" + .string "Go get 'em, Grandpa!$" BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF .string "Ah, so this here is the BATTLE DOME?\n" - .string "I won’t let GENTLEMEN beat me!\p" + .string "I won't let GENTLEMEN beat me!\p" .string "But where is the entrance?$" BattleFrontier_OutsideWest_Text_23E01E: @ 823E01E .string "There used to be nothing here not all\n" .string "that long ago.\p" .string "But, now look at this place! Amazing!\n" - .string "I’ll bring my mother out to see this.$" + .string "I'll bring my mother out to see this.$" BattleFrontier_OutsideWest_Text_23E09F: @ 823E09F - .string "I’ve finally arrived at the BATTLE\n" + .string "I've finally arrived at the BATTLE\n" .string "FRONTIER!\p" - .string "I’m sure to grab attention with\n" + .string "I'm sure to grab attention with\n" .string "my looks and ability!$" BattleFrontier_OutsideWest_Text_23E102: @ 823E102 .string "Munch, munch…\p" - .string "It looks like this square’s filled with\n" + .string "It looks like this square's filled with\n" .string "tough people.\p" .string "Munch, munch…$" @@ -482,7 +482,7 @@ BattleFrontier_OutsideWest_Text_23E154: @ 823E154 BattleFrontier_OutsideWest_Text_23E273: @ 823E273 .string "Huh? Will you listen to yourself?\n" - .string "That’s nothing!\p" + .string "That's nothing!\p" .string "Why, the last time I cheered for him,\n" .string "our eyes met and sparks flew!$" @@ -504,7 +504,7 @@ BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E BattleFrontier_OutsideWest_Text_23E410: @ 823E410 .string "Those people squabbling over there…\p" - .string "It’s hard to believe, but they once\n" + .string "It's hard to believe, but they once\n" .string "were TRAINERS, and good ones, too.\p" .string "They used to be incredibly tough,\n" .string "and they were famous, too.\p" @@ -512,7 +512,7 @@ BattleFrontier_OutsideWest_Text_23E410: @ 823E410 .string "certain TRAINER at a tournament.\p" .string "They were so thoroughly whipped,\n" .string "they became smitten by the TRAINER.\p" - .string "Now they’re just fans of the TRAINER.\n" + .string "Now they're just fans of the TRAINER.\n" .string "They go cheer for their idol at the\l" .string "BATTLE DOME every day now.$" @@ -520,7 +520,7 @@ BattleFrontier_OutsideWest_Text_23E5A5: @ 823E5A5 .string "I heard a rumor that someone saw\n" .string "a POKéMON with an unusually long tail\l" .string "somewhere in the BATTLE FRONTIER.\p" - .string "It must be adorable. I’m sure of it…\p" + .string "It must be adorable. I'm sure of it…\p" .string "Oh, challenges can wait. I feel driven\n" .string "to find the delightful creature!$" diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index e37842cf5..42c6db053 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -39,19 +39,19 @@ BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944 .string "There was someone here using a \n" - .string "POKéMON I’ve never seen before.\p" + .string "POKéMON I've never seen before.\p" .string "I never learned about it at\n" - .string "TRAINER’S SCHOOL at least.\p" + .string "TRAINER'S SCHOOL at least.\p" .string "I wonder where you can catch POKéMON\n" .string "like that.$" BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB .string "Okay! Next stop, the BATTLE ARENA!\n" - .string "I’d better get the right POKéMON from\l" + .string "I'd better get the right POKéMON from\l" .string "the PC Storage System.$" BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B - .string "Giggle… I’m going to go through every\n" + .string "Giggle… I'm going to go through every\n" .string "challenge with just this baby!$" BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90 diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc index 65b093b32..f6a7715d1 100644 --- a/data/maps/BattleFrontier_RankingHall/scripts.inc +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -119,17 +119,17 @@ BattleFrontier_RankingHall_Text_25E666: @ 825E666 .string "Hi, is your name on this list?$" BattleFrontier_RankingHall_Text_25E685: @ 825E685 - .string "Wow, that’s super!\n" - .string "I’ll have to try harder, too!$" + .string "Wow, that's super!\n" + .string "I'll have to try harder, too!$" BattleFrontier_RankingHall_Text_25E6B6: @ 825E6B6 .string "Oh, is that right?\p" - .string "If you saw your friend’s name up here,\n" + .string "If you saw your friend's name up here,\n" .string "I bet it would make you work harder!$" BattleFrontier_RankingHall_Text_25E715: @ 825E715 .string "Hmm…\n" - .string "My name’s not up there…\p" - .string "Well, it’s only natural since I haven’t\n" + .string "My name's not up there…\p" + .string "Well, it's only natural since I haven't\n" .string "taken any challenges yet.$" diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index d5364a2af..30f3a10d5 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -304,7 +304,7 @@ BattleFrontier_ReceptionGate_Text_2665B2: @ 82665B2 BattleFrontier_ReceptionGate_Text_2665F7: @ 82665F7 .string "For a first-time visitor, we issue\n" .string "the FRONTIER PASS.\p" - .string "It’s for use at all the facilities\n" + .string "It's for use at all the facilities\n" .string "in the BATTLE FRONTIER.\p" .string "Here you are!$" @@ -321,7 +321,7 @@ BattleFrontier_ReceptionGate_Text_2666C6: @ 82666C6 .string "FRONTIER has to offer!$" BattleFrontier_ReceptionGate_Text_266703: @ 8266703 - .string "???: Well, if it isn’t {PLAYER}{KUN}!\n" + .string "???: Well, if it isn't {PLAYER}{KUN}!\n" .string "You came out here!$" BattleFrontier_ReceptionGate_Text_266733: @ 8266733 @@ -329,17 +329,17 @@ BattleFrontier_ReceptionGate_Text_266733: @ 8266733 .string "Good day to you, sir!$" BattleFrontier_ReceptionGate_Text_266764: @ 8266764 - .string "SCOTT: It’s great to see you here,\n" + .string "SCOTT: It's great to see you here,\n" .string "it really is!\p" - .string "I hope you’ll take your time and\n" + .string "I hope you'll take your time and\n" .string "explore everywhere.\p" - .string "Naturally, I hope you’ll also experience\n" + .string "Naturally, I hope you'll also experience\n" .string "the pure essence of battling.\p" .string "I also have my quarters here, so feel\n" .string "free to visit if you have time.$" BattleFrontier_ReceptionGate_Text_266857: @ 8266857 - .string "I’m your guide to the various facilities\n" + .string "I'm your guide to the various facilities\n" .string "here in the BATTLE FRONTIER.$" BattleFrontier_ReceptionGate_Text_26689D: @ 826689D @@ -347,7 +347,7 @@ BattleFrontier_ReceptionGate_Text_26689D: @ 826689D BattleFrontier_ReceptionGate_Text_2668C2: @ 82668C2 .string "It is the gigantic tower considered\n" - .string "to be the BATTLE FRONTIER’s symbol.\p" + .string "to be the BATTLE FRONTIER's symbol.\p" .string "There are four kinds of BATTLE ROOMS\n" .string "in the tower for SINGLE, DOUBLE, MULTI,\l" .string "and LINK MULTI BATTLES.$" @@ -412,7 +412,7 @@ BattleFrontier_ReceptionGate_Text_266DCB: @ 8266DCB .string "for fabulous prizes there.$" BattleFrontier_ReceptionGate_Text_266E66: @ 8266E66 - .string "I’m your guide to the basic rules that\n" + .string "I'm your guide to the basic rules that\n" .string "are common to all the challenges\l" .string "offered by the facilities in the BATTLE\l" .string "FRONTIER.$" @@ -422,7 +422,7 @@ BattleFrontier_ReceptionGate_Text_266EE0: @ 8266EE0 BattleFrontier_ReceptionGate_Text_266F04: @ 8266F04 .string "All the challenges at the BATTLE\n" - .string "FRONTIER’s facilities come in\l" + .string "FRONTIER's facilities come in\l" .string "two courses--Level 50 and Open Level.$" BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69 @@ -466,7 +466,7 @@ BattleFrontier_ReceptionGate_Text_267298: @ 8267298 .string "different items.$" BattleFrontier_ReceptionGate_Text_267357: @ 8267357 - .string "I’m your guide to the FRONTIER PASS.$" + .string "I'm your guide to the FRONTIER PASS.$" BattleFrontier_ReceptionGate_Text_26737C: @ 826737C .string "Which would you like to learn about?$" @@ -480,7 +480,7 @@ BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1 .string "To earn a symbol, TRAINERS may need\n" .string "to defeat other TRAINERS in a row,\l" .string "and may need to win events repeatedly.\p" - .string "It’s certainly not easy to win symbols.\n" + .string "It's certainly not easy to win symbols.\n" .string "I wish you the best of luck!$" BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3 diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 818fb92b0..6824df384 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -274,7 +274,7 @@ BattleFrontier_ScottsHouse_Text_263A3F: @ 8263A3F .string "Anyway, {PLAYER}{KUN}, let me formally\n" .string "welcome you to the BATTLE FRONTIER.\p" .string "This is my dream come true.\n" - .string "It took me years and years, but I’ve\l" + .string "It took me years and years, but I've\l" .string "finally given shape to my dream.$" BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29 @@ -286,10 +286,10 @@ BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29 .string "or time it took to make this real.$" BattleFrontier_ScottsHouse_Text_263BD4: @ 8263BD4 - .string "But that’s all in the past.\n" + .string "But that's all in the past.\n" .string "No point dwelling on that!\p" .string "All I want for you is to enjoy battling\n" - .string "to your heart’s content here.\p" + .string "to your heart's content here.\p" .string "{PLAYER}{KUN}, I want you to have this\n" .string "as a memento for all the time our\l" .string "paths crossed on our journeys.$" @@ -308,17 +308,17 @@ BattleFrontier_ScottsHouse_Text_263CD0: @ 8263CD0 .string "see fit, like trading them for items.$" BattleFrontier_ScottsHouse_Text_263DB8: @ 8263DB8 - .string "I’m expecting great things from you!$" + .string "I'm expecting great things from you!$" BattleFrontier_ScottsHouse_Text_263DDD: @ 8263DDD .string "SCOTT: Every TRAINER is an individual.\n" .string "They all lead lives of their own.\p" - .string "But when they’re in a battle,\n" - .string "it doesn’t matter who they are.\p" - .string "They’re all the same!\p" + .string "But when they're in a battle,\n" + .string "it doesn't matter who they are.\p" + .string "They're all the same!\p" .string "I love the purity of battle,\n" .string "where everyone is equal.\p" - .string "That’s why I go everywhere seeking\n" + .string "That's why I go everywhere seeking\n" .string "TRAINERS who are serious about\l" .string "battling, and invite them here.$" @@ -329,11 +329,11 @@ BattleFrontier_ScottsHouse_Text_263F12: @ 8263F12 .string "symbols from them?\p" .string "I handpicked the FRONTIER BRAINS\n" .string "as the toughest TRAINERS anywhere.\p" - .string "But I’m sure that seeing how tough\n" + .string "But I'm sure that seeing how tough\n" .string "you are will startle even them!$" BattleFrontier_ScottsHouse_Text_263FFE: @ 8263FFE - .string "SCOTT: You don’t just train for battle,\n" + .string "SCOTT: You don't just train for battle,\n" .string "right?\p" .string "I think I remember you working on\n" .string "a POKéDEX as well.\p" @@ -348,34 +348,34 @@ BattleFrontier_ScottsHouse_Text_2640BC: @ 82640BC .string "…Wait a second…\n" .string "Oh!\p" .string "Your FRONTIER PASS!\n" - .string "You’ve collected the full set\l" + .string "You've collected the full set\l" .string "of silver symbols!\p" - .string "That’s more than impressive!\n" + .string "That's more than impressive!\n" .string "You are tough, just as I suspected!\p" - .string "Normally, I wouldn’t do something\n" + .string "Normally, I wouldn't do something\n" .string "like this, but this is a special time!\p" .string "I want you to have this.\n" - .string "I’m sure you can put it to proper use.$" + .string "I'm sure you can put it to proper use.$" BattleFrontier_ScottsHouse_Text_264216: @ 8264216 - .string "SCOTT: I hope you’re enjoying\n" + .string "SCOTT: I hope you're enjoying\n" .string "everything in the BATTLE FRONTIER.\p" .string "…Wait a second…\n" .string "Oh, my disbelieving eyes!\p" .string "Your FRONTIER PASS!\n" - .string "You’ve gathered up the full set\l" + .string "You've gathered up the full set\l" .string "of gold symbols!\p" - .string "That’s more than stupendous!\n" - .string "You’re incredible, just as I suspected!\p" + .string "That's more than stupendous!\n" + .string "You're incredible, just as I suspected!\p" .string "… … … … … …\p" - .string "{PLAYER}, you’ve got to accept this!\p" + .string "{PLAYER}, you've got to accept this!\p" .string "I think you will be able to\n" .string "appreciate the value of my gift!$" BattleFrontier_ScottsHouse_Text_264373: @ 8264373 .string "I must say I have the gift of knowing\n" .string "a good TRAINER when I see one.\p" - .string "I’m so glad I had the foresight to\n" + .string "I'm so glad I had the foresight to\n" .string "bring you here!$" BattleFrontier_ScottsHouse_Text_2643EB: @ 82643EB @@ -386,18 +386,18 @@ BattleFrontier_ScottsHouse_Text_264412: @ 8264412 .string "SCOTT: Oh, I heard about you!\n" .string "How you ruled the BATTLE TOWER!\l" .string "You beat over 50 TRAINERS in a row?\p" - .string "That’s fantastic!\n" + .string "That's fantastic!\n" .string "I want you to have this!$" BattleFrontier_ScottsHouse_Text_26449F: @ 826449F .string "SCOTT: Oh, my! I heard about you!\n" .string "How you overwhelmed the BATTLE TOWER!\l" .string "You beat over 100 TRAINERS in a row?\p" - .string "That’s ridiculously spectacular!\n" - .string "You’ve got to have this!$" + .string "That's ridiculously spectacular!\n" + .string "You've got to have this!$" BattleFrontier_ScottsHouse_Text_264546: @ 8264546 - .string "I’ll be expecting to hear even greater\n" + .string "I'll be expecting to hear even greater\n" .string "things about you now!$" BattleFrontier_ScottsHouse_Text_264583: @ 8264583 diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 21ff3537b..cf7582e0d 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -61,27 +61,27 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D CaveOfOrigin_B1F_Text_23586E: @ 823586E .string "Ah, so you are {PLAYER}{KUN}?\n" - .string "I’ve heard tales of your exploits.\p" + .string "I've heard tales of your exploits.\p" .string "My name is WALLACE.\p" .string "I was once the GYM LEADER of\n" .string "SOOTOPOLIS, but something came up.\p" - .string "So now, I’ve entrusted my mentor JUAN\n" - .string "with the GYM’s operation.\p" + .string "So now, I've entrusted my mentor JUAN\n" + .string "with the GYM's operation.\p" .string "… … … … … …\n" .string "… … … … … …\p" .string "GROUDON and KYOGRE, the two POKéMON\n" .string "wreaking havoc here, are considered\l" .string "to be super-ancient POKéMON.\p" - .string "But there aren’t just two super-\n" + .string "But there aren't just two super-\n" .string "ancient POKéMON.\p" .string "There is one more somewhere.\p" .string "Somewhere, there is a super-\n" .string "ancient POKéMON named RAYQUAZA.\p" - .string "It’s said that it was RAYQUAZA that\n" + .string "It's said that it was RAYQUAZA that\n" .string "becalmed the two combatants in\l" .string "the distant past.\p" .string "But even I have no clue as to\n" - .string "RAYQUAZA’s whereabouts…$" + .string "RAYQUAZA's whereabouts…$" CaveOfOrigin_B1F_Text_235ACE: @ 8235ACE .string "WALLACE: {PLAYER}{KUN}, do you perhaps\n" @@ -90,7 +90,7 @@ CaveOfOrigin_B1F_Text_235ACE: @ 8235ACE CaveOfOrigin_B1F_Text_235B23: @ 8235B23 .string "WALLACE: The CAVE OF ORIGIN?\p" - .string "But that’s right here!\n" + .string "But that's right here!\n" .string "I need you to do better than that!\p" .string "Please, I need you to think about\n" .string "where RAYQUAZA might be right now.$" @@ -105,14 +105,14 @@ CaveOfOrigin_B1F_Text_235BBF: @ 8235BBF .string "more carefully for me?$" CaveOfOrigin_B1F_Text_235C99: @ 8235C99 - .string "WALLACE: Huh? You don’t remember?\n" - .string "Hmm… That’s a problem…\p" - .string "Can’t you remember somehow?$" + .string "WALLACE: Huh? You don't remember?\n" + .string "Hmm… That's a problem…\p" + .string "Can't you remember somehow?$" CaveOfOrigin_B1F_Text_235CEE: @ 8235CEE .string "WALLACE: The SKY PILLAR?\p" - .string "That’s it!\n" + .string "That's it!\n" .string "It must be the SKY PILLAR!\p" - .string "{PLAYER}{KUN}, there’s not a moment to lose!\n" - .string "We’ll head to the SKY PILLAR right away!$" + .string "{PLAYER}{KUN}, there's not a moment to lose!\n" + .string "We'll head to the SKY PILLAR right away!$" diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 07f7d9ac8..41abdcede 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -656,12 +656,12 @@ DewfordTown_Text_1E9A3D: @ 81E9A3D DewfordTown_Text_1E9A7F: @ 81E9A7F .string "DEWFORD HALL\n" - .string "“Everyone’s information exchange!â€$" + .string "“Everyone's information exchange!â€$" Route104_Text_1E9AAF: @ 81E9AAF .string "MR. BRINEY: Ahoy!\n" - .string "We’ve hit land in DEWFORD.\p" - .string "I suppose you’re off to deliver that\n" + .string "We've hit land in DEWFORD.\p" + .string "I suppose you're off to deliver that\n" .string "LETTER to, who was it now, STEVEN!$" DewfordTown_Text_1E9B24: @ 81E9B24 @@ -673,33 +673,33 @@ DewfordTown_Text_1E9B24: @ 81E9B24 DewfordTown_Text_1E9B7F: @ 81E9B7F .string "MR. BRINEY: PETALBURG it is, then!\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" DewfordTown_Text_1E9BD9: @ 81E9BD9 .string "MR. BRINEY: Then you go on and deliver\n" - .string "the LETTER. I’ll be waiting.$" + .string "the LETTER. I'll be waiting.$" Route104_Text_1E9C1D: @ 81E9C1D Route109_Text_1E9C1D: @ 81E9C1D .string "MR. BRINEY: Ahoy!\n" - .string "We’ve hit land in DEWFORD!\p" + .string "We've hit land in DEWFORD!\p" .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" DewfordTown_Text_1E9C8A: @ 81E9C8A .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" + .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" DewfordTown_Text_1E9CE5: @ 81E9CE5 .string "MR. BRINEY: PETALBURG, is it?\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" DewfordTown_Text_1E9D3A: @ 81E9D3A .string "MR. BRINEY: SLATEPORT, is it?\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" DewfordTown_Text_1E9D8F: @ 81E9D8F .string "MR. BRINEY: You just tell me whenever\n" @@ -711,11 +711,11 @@ DewfordTown_Text_1E9DD1: @ 81E9DD1 DewfordTown_Text_1E9E14: @ 81E9E14 .string "I hear you, and I like what\n" - .string "you’re saying!\p" - .string "I’ll give you one of my fishing RODS.$" + .string "you're saying!\p" + .string "I'll give you one of my fishing RODS.$" DewfordTown_Text_1E9E65: @ 81E9E65 - .string "And, as an added bonus, I’ll even throw\n" + .string "And, as an added bonus, I'll even throw\n" .string "in a little fishing advice!\p" .string "First, you want to face the water,\n" .string "then use the ROD.\p" @@ -728,19 +728,19 @@ DewfordTown_Text_1E9E65: @ 81E9E65 DewfordTown_Text_1E9F92: @ 81E9F92 .string "Oh, is that so?\n" - .string "That’s too bad, then.$" + .string "That's too bad, then.$" DewfordTown_Text_1E9FB8: @ 81E9FB8 .string "Yo!\n" - .string "How’s your fishing?$" + .string "How's your fishing?$" DewfordTown_Text_1E9FD0: @ 81E9FD0 - .string "Is that right! That’s great!\n" + .string "Is that right! That's great!\n" .string "Haul in some big ones!$" DewfordTown_Text_1EA004: @ 81EA004 - .string "Oh, hey, don’t get down on yourself!\n" - .string "I’ll give you a little fishing advice.\p" + .string "Oh, hey, don't get down on yourself!\n" + .string "I'll give you a little fishing advice.\p" .string "First, you want to face the water,\n" .string "then use the ROD.\p" .string "Focus your mind…\n" @@ -751,49 +751,49 @@ DewfordTown_Text_1EA004: @ 81EA004 .string "to haul them in.$" DewfordTown_Text_1EA136: @ 81EA136 - .string "I like what’s hip, happening, and trendy.\n" - .string "I’m always checking it out.\p" + .string "I like what's hip, happening, and trendy.\n" + .string "I'm always checking it out.\p" .string "Listen, have you heard about this new\n" .string "“{STR_VAR_1}â€?\p" - .string "That’s right!\n" + .string "That's right!\n" .string "Of course you know!\p" .string "I mean, sheesh,\n" .string "“{STR_VAR_1}â€â€¦\l" - .string "It’s the hottest thing in cool!\p" - .string "Wherever you’re from,\n" + .string "It's the hottest thing in cool!\p" + .string "Wherever you're from,\n" .string "“{STR_VAR_1}â€\l" .string "is the biggest happening thing, right?$" DewfordTown_Text_1EA242: @ 81EA242 .string "Hunh?\n" - .string "It’s not the hip and happening thing?\p" + .string "It's not the hip and happening thing?\p" .string "Well, hey, you have to tell me,\n" - .string "what’s new and what’s “inâ€?$" + .string "what's new and what's “inâ€?$" DewfordTown_Text_1EA2AA: @ 81EA2AA .string "Hunh?\n" .string "“{STR_VAR_2}â€?\p" .string "… …\p" - .string "…Uh… Yeah! That’s right!\n" + .string "…Uh… Yeah! That's right!\n" .string "Yeah, I knew that! Knew it all along!\p" .string "Of course I know about that!\n" .string "“{STR_VAR_2},†right?\p" - .string "Yeah, that’s it, it’s there!\n" - .string "Isn’t “{STR_VAR_2}â€\l" + .string "Yeah, that's it, it's there!\n" + .string "Isn't “{STR_VAR_2}â€\l" .string "the coolest, or what?\p" - .string "It’s the hippest thing in hip.\n" - .string "You think I’d not know about it?\p" + .string "It's the hippest thing in hip.\n" + .string "You think I'd not know about it?\p" .string "“{STR_VAR_1}â€â€¦\n" - .string "It’s, like, so five minutes ago.\p" + .string "It's, like, so five minutes ago.\p" .string "Now, “{STR_VAR_2}†is\n" - .string "what’s vital and in tune with the times!$" + .string "what's vital and in tune with the times!$" DewfordTown_Text_1EA3FE: @ 81EA3FE .string "Hmm…\n" .string "“{STR_VAR_2},†huh?\p" .string "But personally, I think\n" .string "“{STR_VAR_1}â€\l" - .string "is what’s real in cool.$" + .string "is what's real in cool.$" DewfordTown_Text_1EA443: @ 81EA443 .string "Well, if you hear of any happening new\n" diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index ade729c96..703888e98 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -314,23 +314,23 @@ DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC end DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6 - .string "Hey, how’s it going, CHAMPION-\n" + .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" - .string "DEWFORD’s GYM LEADER BRAWLY commands\n" + .string "DEWFORD's GYM LEADER BRAWLY commands\n" .string "FIGHTING-type POKéMON.\p" .string "Going against him with NORMAL-type\n" .string "POKéMON is asking for trouble.\p" .string "FIGHTING POKéMON will lay a serious\n" .string "smack down on NORMAL POKéMON,\l" .string "so be careful!\p" - .string "What’s worse, the GYM is as dark as\n" + .string "What's worse, the GYM is as dark as\n" .string "the ocean floor.\p" .string "But it will get brighter after defeating\n" .string "the TRAINERS in your way.\p" .string "Hey, okay, go for it!$" DewfordTown_Gym_Text_1FCB5C: @ 81FCB5C - .string "Whoah! It’s turned too bright in here!\p" + .string "Whoah! It's turned too bright in here!\p" .string "Your future is bright, too!$" DewfordTown_Gym_Text_1FCB9F: @ 81FCB9F @@ -345,24 +345,24 @@ DewfordTown_Gym_Text_1FCBCA: @ 81FCBCA .string "Your technique is commendable!$" DewfordTown_Gym_Text_1FCC0A: @ 81FCC0A - .string "There’s no need for BRAWLY to be\n" + .string "There's no need for BRAWLY to be\n" .string "involved!\p" - .string "I’ll crush you!$" + .string "I'll crush you!$" DewfordTown_Gym_Text_1FCC45: @ 81FCC45 .string "But… How?\n" .string "How could I lose so easily?$" DewfordTown_Gym_Text_1FCC6B: @ 81FCC6B - .string "I’m not going to waste this loss.\n" - .string "I’ll use it to motivate me to train!\p" - .string "One day I’ll become a GYM LEADER…\p" - .string "No, I’ll become the POKéMON LEAGUE\n" + .string "I'm not going to waste this loss.\n" + .string "I'll use it to motivate me to train!\p" + .string "One day I'll become a GYM LEADER…\p" + .string "No, I'll become the POKéMON LEAGUE\n" .string "CHAMPION!$" DewfordTown_Gym_Text_1FCD01: @ 81FCD01 - .string "Don’t you dare brush me off!\n" - .string "It’s not my fault if you cry!$" + .string "Don't you dare brush me off!\n" + .string "It's not my fault if you cry!$" DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C .string "Waaaaaaah!\n" @@ -371,8 +371,8 @@ DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C DewfordTown_Gym_Text_1FCD4F: @ 81FCD4F .string "I battle in the dark to make my heart\n" .string "stronger.\p" - .string "But because it’s so dark, I can never\n" - .string "see BRAWLY’s face…$" + .string "But because it's so dark, I can never\n" + .string "see BRAWLY's face…$" DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8 .string "Ufufu…\n" @@ -380,22 +380,22 @@ DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8 DewfordTown_Gym_Text_1FCDE5: @ 81FCDE5 .string "Oh, you…\n" - .string "I don’t want to know you!$" + .string "I don't want to know you!$" DewfordTown_Gym_Text_1FCE08: @ 81FCE08 .string "You deserve to stay lost and end up\n" .string "back at the entrance again!$" DewfordTown_Gym_Text_1FCE48: @ 81FCE48 - .string "I’ll show you the gumption of\n" + .string "I'll show you the gumption of\n" .string "a sailing man!$" DewfordTown_Gym_Text_1FCE75: @ 81FCE75 - .string "How’d this happen?\n" - .string "It’s not like me to lose this way!$" + .string "How'd this happen?\n" + .string "It's not like me to lose this way!$" DewfordTown_Gym_Text_1FCEAB: @ 81FCEAB - .string "Oh, aye! You’re worthy of seeing\n" + .string "Oh, aye! You're worthy of seeing\n" .string "our GYM LEADER.$" DewfordTown_Gym_Text_1FCEDC: @ 81FCEDC @@ -411,19 +411,19 @@ DewfordTown_Gym_Text_1FCF26: @ 81FCF26 .string "Go after that BADGE!$" DewfordTown_Gym_Text_1FCF44: @ 81FCF44 - .string "I’m BRAWLY!\n" - .string "DEWFORD’s GYM LEADER!\p" - .string "I’ve been churned in the rough waves\n" - .string "of these parts, and I’ve grown tough\l" + .string "I'm BRAWLY!\n" + .string "DEWFORD's GYM LEADER!\p" + .string "I've been churned in the rough waves\n" + .string "of these parts, and I've grown tough\l" .string "in the pitch-black cave!\p" .string "So you wanted to challenge me?\n" - .string "Let me see what you’re made of!$" + .string "Let me see what you're made of!$" DewfordTown_Gym_Text_1FD008: @ 81FD008 .string "Whoah, wow! You made a much bigger\n" .string "splash than I expected!\p" .string "You swamped me!\p" - .string "Okay, you’ve got me.\n" + .string "Okay, you've got me.\n" .string "Take this GYM BADGE!$" DewfordTown_Gym_Text_1FD07D: @ 81FD07D @@ -434,14 +434,14 @@ DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8 .string "The KNUCKLE BADGE makes all POKéMON\n" .string "up to Level 30, even those you get in\l" .string "trades, obey without question.\p" - .string "And, you’ll be able to use the HM move\n" + .string "And, you'll be able to use the HM move\n" .string "FLASH outside of battle.\p" - .string "If you’d like, use this TECHNICAL\n" + .string "If you'd like, use this TECHNICAL\n" .string "MACHINE, too.$" DewfordTown_Gym_Text_1FD181: @ 81FD181 .string "That TM08 contains BULK UP.\p" - .string "It’s a move that raises both ATTACK\n" + .string "It's a move that raises both ATTACK\n" .string "and DEFENSE stats.\p" .string "… … … … … …$" @@ -459,7 +459,7 @@ DewfordTown_Gym_Text_1FD272: @ 81FD272 DewfordTown_Gym_Text_1FD28B: @ 81FD28B .string "DEWFORD TOWN POKéMON GYM\p" - .string "BRAWLY’S CERTIFIED TRAINERS:\n" + .string "BRAWLY'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4 @@ -468,16 +468,16 @@ DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4 .string "A giant wave of a talent like you…\n" .string "I knew you would return!\p" .string "Show me how much higher\n" - .string "you’ve gone!$" + .string "you've gone!$" DewfordTown_Gym_Text_1FD367: @ 81FD367 .string "Wow!\n" .string "Swamped again!$" DewfordTown_Gym_Text_1FD37B: @ 81FD37B - .string "BRAWLY: Battling is vast and it’s deep.\n" - .string "You can’t see the bottom.\l" - .string "It’s just like the sea of HOENN!$" + .string "BRAWLY: Battling is vast and it's deep.\n" + .string "You can't see the bottom.\l" + .string "It's just like the sea of HOENN!$" DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE .string "BRAWLY: A wave may draw back, but it\n" @@ -486,6 +486,6 @@ DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE .string "I knew you would return!\p" .string "Oh? You only have one POKéMON\n" .string "that can battle.\p" - .string "I’m sorry, but I’d like you to come back\n" + .string "I'm sorry, but I'd like you to come back\n" .string "with at least two POKéMON.$" diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index fa142696c..bec9826f3 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -268,46 +268,46 @@ DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E end DewfordTown_Hall_Text_1FD818: @ 81FD818 - .string "What’s in vogue? Why, it has to be\n" + .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}â€!\p" - .string "I can’t imagine what life would be like\n" + .string "I can't imagine what life would be like\n" .string "without “{STR_VAR_1}â€!$" DewfordTown_Hall_Text_1FD877: @ 81FD877 - .string "What’s in vogue? Why, it has to be\n" + .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}â€!\p" - .string "But I’m getting kind of bored with it.\p" + .string "But I'm getting kind of bored with it.\p" .string "I should look for the next big thing.$" DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED - .string "I’m teaching my POKéMON about\n" + .string "I'm teaching my POKéMON about\n" .string "“{STR_VAR_1},â€\l" - .string "but it’s not going well.\p" - .string "It’s a bit too much, I think.$" + .string "but it's not going well.\p" + .string "It's a bit too much, I think.$" DewfordTown_Hall_Text_1FD948: @ 81FD948 - .string "I’m studying up on the hip and trendy\n" + .string "I'm studying up on the hip and trendy\n" .string "“{STR_VAR_1}†now.\p" - .string "Is it true that there’s a deep link\n" + .string "Is it true that there's a deep link\n" .string "between “{STR_VAR_1}â€\l" .string "and “{STR_VAR_2}â€?$" DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3 .string "Oh!\n" .string "So, my hunch was right!\p" - .string "I’m one step closer to being hip and\n" + .string "I'm one step closer to being hip and\n" .string "happening, yowza!$" DewfordTown_Hall_Text_1FDA06: @ 81FDA06 .string "What?!\n" .string "Is that so?!\p" - .string "It’s not easy for an older fellow like\n" + .string "It's not easy for an older fellow like\n" .string "me to keep up with trends!$" DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C .string "This whole business about\n" .string "“{STR_VAR_1}â€â€¦\l" - .string "Isn’t there a TV show on it?$" + .string "Isn't there a TV show on it?$" DewfordTown_Hall_Text_1FDA99: @ 81FDA99 .string "Across the sea…\p" @@ -326,7 +326,7 @@ DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 .string "“{STR_VAR_1}â€\l" .string "picture books.\p" .string "Heheh, I own!\n" - .string "I’m not sharing anything with you!$" + .string "I'm not sharing anything with you!$" DewfordTown_Hall_Text_1FDB89: @ 81FDB89 .string "IDENTIFYING GOOD\n" @@ -337,29 +337,29 @@ DewfordTown_Hall_Text_1FDB89: @ 81FDB89 .string "POKéMON…\p" .string "USEFUL\n" .string "“{STR_VAR_1}â€â€¦\p" - .string "It’s neatly jammed with books about\n" + .string "It's neatly jammed with books about\n" .string "“{STR_VAR_1}.â€$" DewfordTown_Hall_Text_1FDC05: @ 81FDC05 - .string "“{STR_VAR_1}’S\n" + .string "“{STR_VAR_1}'S\n" .string "SCREAM†is the title.$" DewfordTown_Hall_Text_1FDC21: @ 81FDC21 - .string "“{STR_VAR_1}’S\n" + .string "“{STR_VAR_1}'S\n" .string "SMILE†is the title.$" DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C - .string "It’s titled “THE LAST\n" + .string "It's titled “THE LAST\n" .string "{STR_VAR_1}â€.$" DewfordTown_Hall_Text_1FDC57: @ 81FDC57 - .string "It’s titled “THE BIRTH OF\n" + .string "It's titled “THE BIRTH OF\n" .string "{STR_VAR_1}â€.$" DewfordTown_Hall_Text_1FDC76: @ 81FDC76 .string "I saw “{STR_VAR_1}â€!\n" .string "Cool, huh?\p" - .string "It’s, like, the coolest thing going!\p" + .string "It's, like, the coolest thing going!\p" .string "It was awesome!\n" .string "It was the real thing, oh yeah!$" @@ -367,11 +367,11 @@ DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 .string "Oh, no, no, no.\p" .string "That alleged\n" .string "“{STR_VAR_1}â€\l" - .string "you claim to have seen--it’s not.\p" + .string "you claim to have seen--it's not.\p" .string "The authentic article is much…\n" .string "How should I say it?\l" .string "Sharper, yet more mellow!\p" - .string "Ah, no matter. It’s astonishing!$" + .string "Ah, no matter. It's astonishing!$" DewfordTown_Hall_Text_1FDD95: @ 81FDD95 .string "Hey, listen, I composed a theme song\n" @@ -409,7 +409,7 @@ DewfordTown_Hall_Text_1FDED8: @ 81FDED8 DewfordTown_Hall_Text_1FDF72: @ 81FDF72 .string "I was thinking, though…\p" - .string "Wouldn’t you agree that\n" + .string "Wouldn't you agree that\n" .string "“{STR_VAR_1}†has\l" .string "grown from being something trendy to\l" .string "being a part of our daily lives?$" @@ -417,33 +417,33 @@ DewfordTown_Hall_Text_1FDF72: @ 81FDF72 DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 .string "Beg pardon?\n" .string "That much, what?\p" - .string "However, it’s true that\n" + .string "However, it's true that\n" .string "“{STR_VAR_1}â€\l" .string "weighs heavily on your mind, whether\l" - .string "you’re awake or asleep.\p" - .string "Absolutely, you’re the\n" + .string "you're awake or asleep.\p" + .string "Absolutely, you're the\n" .string "“{STR_VAR_1}â€\l" .string "PROFESSOR, old sport!$" DewfordTown_Hall_Text_1FE09A: @ 81FE09A .string "If you and me team up as a combo,\n" - .string "we’ll be invincible when it comes to all\l" + .string "we'll be invincible when it comes to all\l" .string "things “{STR_VAR_1}â€!$" DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2 .string "Spot on, my friend!\p" .string "We shall be the\n" .string "“{STR_VAR_1}†DUO!\p" - .string "Isn’t that a ripe image?\n" + .string "Isn't that a ripe image?\n" .string "Hahahah!$" DewfordTown_Hall_Text_1FE142: @ 81FE142 .string "For me, SLUDGE BOMB is at the peak\n" - .string "of popularity. It’s the one.\p" - .string "Hunh? You’re telling me that you don’t\n" + .string "of popularity. It's the one.\p" + .string "Hunh? You're telling me that you don't\n" .string "know about SLUDGE BOMB?\p" - .string "That’s outright pitiful.\n" - .string "I’ll give you one.$" + .string "That's outright pitiful.\n" + .string "I'll give you one.$" DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED .string "I love SLUDGE BOMB.\p" diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc index d051cfc19..32706dbde 100644 --- a/data/maps/DewfordTown_House1/scripts.inc +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -20,7 +20,7 @@ DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 end DewfordTown_House1_Text_1FC3F3: @ 81FC3F3 - .string "There’s a lot to be said for living on\n" + .string "There's a lot to be said for living on\n" .string "a small island like this in harmony with\l" .string "POKéMON and the family.$" @@ -29,7 +29,7 @@ DewfordTown_House1_Text_1FC45B: @ 81FC45B .string "CITY when I married my husband here.\p" .string "Life goes by slowly on this little\n" .string "island. But being surrounded by the\l" - .string "beautiful sea--that’s happiness, too.$" + .string "beautiful sea--that's happiness, too.$" DewfordTown_House1_Text_1FC510: @ 81FC510 .string "ZIGZAGOON: Guguuh!$" diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index 2385b8328..c0de82dac 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -30,15 +30,15 @@ DewfordTown_House2_EventScript_1FE271:: @ 81FE271 DewfordTown_House2_Text_1FE27A: @ 81FE27A .string "Gorge your eyes on this!\p" - .string "It’s a SILK SCARF. It’s right at the\n" + .string "It's a SILK SCARF. It's right at the\n" .string "cutting edge of fashion, yeah!\p" .string "Oh, I can see your eyes twinkling!\n" .string "You appreciate my dazzling style!\p" - .string "Oh, you’re a delight!\n" + .string "Oh, you're a delight!\n" .string "Here you go. I want you to have it!$" DewfordTown_House2_Text_1FE356: @ 81FE356 - .string "Oh, you don’t have room?\p" + .string "Oh, you don't have room?\p" .string "Now, listen tight, this SCARF is a must-\n" .string "have! Why, I would sell all my items\l" .string "in order to get it!$" @@ -46,7 +46,7 @@ DewfordTown_House2_Text_1FE356: @ 81FE356 DewfordTown_House2_Text_1FE3D1: @ 81FE3D1 .string "The SILK SCARF raises the power of\n" .string "NORMAL-type moves.\p" - .string "It’s a marvelous SCARF that will go\n" + .string "It's a marvelous SCARF that will go\n" .string "with almost all POKéMON!$" DewfordTown_House2_Text_1FE444: @ 81FE444 @@ -54,6 +54,6 @@ DewfordTown_House2_Text_1FE444: @ 81FE444 .string "to visit DEWFORD?\p" .string "Did you maybe come here because you\n" .string "heard about BRAWLY?\p" - .string "He’s so cool…\n" + .string "He's so cool…\n" .string "Everyone idolizes him.$" diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index e01e37f7b..e21fd13af 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -25,13 +25,13 @@ DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E end DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557 - .string "There’s a stone cavern at the edge\n" + .string "There's a stone cavern at the edge\n" .string "of town.\p" - .string "I’ve heard you can find rare stones\n" + .string "I've heard you can find rare stones\n" .string "there.$" DewfordTown_PokemonCenter_1F_Text_1FC5AE: @ 81FC5AE - .string "Even if a POKéMON faints and can’t\n" + .string "Even if a POKéMON faints and can't\n" .string "battle, it can still use a move learned\l" .string "from a HIDDEN MACHINE (HM).$" diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 2bba37d4d..250a3012b 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -231,7 +231,7 @@ EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C .string "That was superb work, putting an end\l" .string "to that crisis all by yourself.\p" .string "Oops!\p" - .string "It wouldn’t be fair to say that you\n" + .string "It wouldn't be fair to say that you\n" .string "alone ended the crisis.\p" .string "You overcame that difficult situation\n" .string "by working as one with your POKéMON.\p" @@ -274,7 +274,7 @@ EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66 EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA .string "MAY: {PLAYER}{KUN}!\p" - .string "Here’s some advice before you challenge\n" + .string "Here's some advice before you challenge\n" .string "the CHAMPION…$" EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B @@ -282,7 +282,7 @@ EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B .string "What, what, what?\p" .string "{PLAYER}{KUN}…\n" .string "Could it be that…\l" - .string "It’s already over?$" + .string "It's already over?$" EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152 .string "BRENDAN: {PLAYER}!\p" @@ -292,19 +292,19 @@ EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152 EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2 .string "BRENDAN: {PLAYER}…\p" .string "Are you trying to tell me…\n" - .string "You’ve beaten the CHAMPION?$" + .string "You've beaten the CHAMPION?$" EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6 .string "PROF. BIRCH: See?\n" .string "What did I tell you, {RIVAL}?\p" - .string "Didn’t I tell you that you don’t need\n" + .string "Didn't I tell you that you don't need\n" .string "to worry about {PLAYER}{KUN}?\p" .string "… … … … … … … …\n" - .string "{PLAYER}{KUN}, you’ve finally done it.\p" + .string "{PLAYER}{KUN}, you've finally done it.\p" .string "When I heard that you defeated your\n" .string "own father at the PETALBURG GYM,\l" .string "I thought perhaps you had a chance…\p" - .string "But to think you’ve actually become\n" + .string "But to think you've actually become\n" .string "the CHAMPION!\p" .string "Ah, yes!\p" .string "What became of your POKéDEX?\n" @@ -322,25 +322,25 @@ EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399 .string "Come with me.$" EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB - .string "WALLACE: I’m sorry, but…\p" + .string "WALLACE: I'm sorry, but…\p" .string "From here on, only those TRAINERS who\n" .string "have become CHAMPIONS may enter.\p" - .string "You’ll have to wait outside with\n" + .string "You'll have to wait outside with\n" .string "PROF. BIRCH.$" EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479 .string "MAY: Groan…\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" - .string "I’m just joking! That’s okay!\n" - .string "That’s the rule!\p" + .string "I'm just joking! That's okay!\n" + .string "That's the rule!\p" .string "{PLAYER}{KUN}!\n" .string "Honestly, congratulations!$" EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5 .string "BRENDAN: Whaaaat?! … … … … …\n" .string "… … … … … … … …\p" - .string "It can’t be helped if that’s the rule.\p" + .string "It can't be helped if that's the rule.\p" .string "{PLAYER}, way to go!\n" .string "Congratulations!$" diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 519bb535f..b50e715aa 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -73,7 +73,7 @@ EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E .string "For us to battle with POKéMON as\n" .string "partners, do you know what it takes?\p" .string "Do you know what is needed?\p" - .string "If you don’t, then you will never\n" + .string "If you don't, then you will never\n" .string "prevail over me!$" EverGrandeCity_DrakesRoom_Text_228895: @ 8228895 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 0f7d2248d..141881cf9 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -64,7 +64,7 @@ EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC .string "Welcome, my name is GLACIA\n" .string "of the ELITE FOUR.\p" - .string "I’ve traveled from afar to HOENN\n" + .string "I've traveled from afar to HOENN\n" .string "so that I may hone my ice skills.\p" .string "But all I have seen are challenges by\n" .string "weak TRAINERS and their POKéMON.\p" @@ -76,7 +76,7 @@ EverGrandeCity_GlaciasRoom_Text_2285B4: @ 82285B4 .string "You and your POKéMON…\n" .string "How hot your spirits burn!\p" .string "The all-consuming heat overwhelms.\p" - .string "It’s no surprise that my icy skills\n" + .string "It's no surprise that my icy skills\n" .string "failed to harm you.$" EverGrandeCity_GlaciasRoom_Text_228640: @ 8228640 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 8f510c13e..2a871e18f 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -92,7 +92,7 @@ EverGrandeCity_HallOfFame_Text_22990E: @ 822990E .string "are honored.$" EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3 - .string "WALLACE: Come on, let’s record your\n" + .string "WALLACE: Come on, let's record your\n" .string "name as a TRAINER who triumphed over\l" .string "the POKéMON LEAGUE, and the names of\l" .string "the partners who battled with you.$" diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index a1062bab5..165c985ac 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -63,7 +63,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E .string "Ahahaha!\p" - .string "I’m PHOEBE of the ELITE FOUR.\n" + .string "I'm PHOEBE of the ELITE FOUR.\n" .string "I did my training on MT. PYRE.\p" .string "While I trained, I gained the ability\n" .string "to commune with GHOST-type POKéMON.\p" @@ -74,14 +74,14 @@ EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E EverGrandeCity_PhoebesRoom_Text_228325: @ 8228325 .string "Oh, darn.\n" - .string "I’ve gone and lost.$" + .string "I've gone and lost.$" EverGrandeCity_PhoebesRoom_Text_228343: @ 8228343 - .string "There’s a definite bond between you\n" + .string "There's a definite bond between you\n" .string "and your POKéMON, too.\p" - .string "I didn’t recognize it, so it’s only\n" + .string "I didn't recognize it, so it's only\n" .string "natural that I lost.\p" - .string "Yup, I’d like to see how far your bond\n" + .string "Yup, I'd like to see how far your bond\n" .string "will carry you.\p" .string "Go ahead, move on to the next room.$" diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index e1ec4c671..3fb16a5ab 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -81,24 +81,24 @@ EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA .string "The POKéMON LEAGUE is only a short\n" .string "distance after the VICTORY ROAD.\p" - .string "If you’ve come this far, what choice\n" + .string "If you've come this far, what choice\n" .string "do you have but to keep going?$" EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62 .string "The long and harrowing VICTORY ROAD…\p" - .string "It’s like reliving the path one has\n" + .string "It's like reliving the path one has\n" .string "traveled in life…\p" .string "Believe in your POKéMON and give it\n" .string "your very best!$" EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1 - .string "SCOTT: {PLAYER}{KUN}, you’ve clawed your\n" + .string "SCOTT: {PLAYER}{KUN}, you've clawed your\n" .string "way up to face the POKéMON LEAGUE!\p" - .string "I’m happy for you!\n" + .string "I'm happy for you!\n" .string "You made my cheering worthwhile!\p" .string "{PLAYER}{KUN}, if you were to become\n" .string "the POKéMON LEAGUE CHAMPION…\p" - .string "I’ll get in touch with you then.\p" + .string "I'll get in touch with you then.\p" .string "Okay, {PLAYER}{KUN}.\n" .string "Go for greatness!$" diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 7477cf5d5..0f3f6c33e 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -132,8 +132,8 @@ EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8 .string "all the GYM BADGES.$" EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787 - .string "You haven’t obtained all the BADGES.\p" - .string "If you’re bound for the POKéMON\n" + .string "You haven't obtained all the BADGES.\p" + .string "If you're bound for the POKéMON\n" .string "LEAGUE, you must return with them.$" EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index f8182bbf3..b283f166e 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -70,22 +70,22 @@ EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7 .string "Welcome, challenger!\n" - .string "I’m SIDNEY of the ELITE FOUR.\p" - .string "I like that look you’re giving me.\n" - .string "I guess you’ll give me a good match.\l" - .string "That’s good! Looking real good!\p" - .string "All right! You and me, let’s enjoy\n" + .string "I'm SIDNEY of the ELITE FOUR.\p" + .string "I like that look you're giving me.\n" + .string "I guess you'll give me a good match.\l" + .string "That's good! Looking real good!\p" + .string "All right! You and me, let's enjoy\n" .string "a battle that can only be staged\l" .string "here in the POKéMON LEAGUE!$" EverGrandeCity_SidneysRoom_Text_2280A2: @ 82280A2 .string "Well, how do you like that? I lost!\n" - .string "Eh, it was fun, so it doesn’t matter.$" + .string "Eh, it was fun, so it doesn't matter.$" EverGrandeCity_SidneysRoom_Text_2280EC: @ 82280EC .string "Well, listen to what this loser has\n" .string "to say.\p" - .string "You’ve got what it takes to go far.\n" + .string "You've got what it takes to go far.\n" .string "Now, go on to the next room and enjoy\l" .string "your next battle!$" diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 80dc91f9e..7a9d0b444 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -53,13 +53,13 @@ FallarborTown_EventScript_1EB262:: @ 81EB262 end FallarborTown_Text_1EB26B: @ 81EB26B - .string "Something’s happening,\n" - .string "and I don’t like it!\p" - .string "I’ve seen shady characters wandering\n" - .string "in and out of PROF. COZMO’s home…$" + .string "Something's happening,\n" + .string "and I don't like it!\p" + .string "I've seen shady characters wandering\n" + .string "in and out of PROF. COZMO's home…$" FallarborTown_Text_1EB2DE: @ 81EB2DE - .string "This region’s been known for meteors\n" + .string "This region's been known for meteors\n" .string "since the olden days.\p" .string "They say METEOR FALLS was gouged out\n" .string "by a falling meteorite long ago.$" @@ -67,7 +67,7 @@ FallarborTown_Text_1EB2DE: @ 81EB2DE FallarborTown_Text_1EB35F: @ 81EB35F .string "See! Take a look!\n" .string "This is my precious AZURILL!\p" - .string "It’s slick and smooth and plushy, too!$" + .string "It's slick and smooth and plushy, too!$" FallarborTown_Text_1EB3B5: @ 81EB3B5 .string "AZURILL: Rooreelooo.$" @@ -75,10 +75,10 @@ FallarborTown_Text_1EB3B5: @ 81EB3B5 FallarborTown_Text_1EB3CA: @ 81EB3CA .string "Have you already challenged FLANNERY,\n" .string "the LEADER of LAVARIDGE GYM?\p" - .string "The girl’s grandfather was famous.\n" + .string "The girl's grandfather was famous.\n" .string "He was one of the ELITE FOUR in the\l" .string "POKéMON LEAGUE at one point.\p" - .string "It wouldn’t surprise me to see FLANNERY\n" + .string "It wouldn't surprise me to see FLANNERY\n" .string "become a great TRAINER in her own\l" .string "right.$" @@ -91,6 +91,6 @@ FallarborTown_Text_1EB4FE: @ 81EB4FE .string "“A farm community with small gardens.â€$" FallarborTown_Text_1EB534: @ 81EB534 - .string "MOVE TUTOR’S HOUSE\n" + .string "MOVE TUTOR'S HOUSE\n" .string "“New moves taught to POKéMON.â€$" diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index f1a144a14..d21216208 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -53,10 +53,10 @@ FallarborTown_BattleTentCorridor_Text_200791: @ 8200791 .string "You can check them on your POKéNAV.$" FallarborTown_BattleTentCorridor_Text_200802: @ 8200802 - .string "I can’t beat GYM LEADERS…\p" - .string "I can’t win any CONTESTS…\p" - .string "I’ve been here, there, and everywhere,\n" - .string "and it’s all for naught…$" + .string "I can't beat GYM LEADERS…\p" + .string "I can't win any CONTESTS…\p" + .string "I've been here, there, and everywhere,\n" + .string "and it's all for naught…$" FallarborTown_BattleTentCorridor_Text_200876: @ 8200876 .string "POKéMON CONTESTS\n" diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 34906cfd3..aed9aa93f 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -358,9 +358,9 @@ FallarborTown_BattleTentLobby_EventScript_200302:: @ 8200302 FallarborTown_BattleTentLobby_Text_200304: @ 8200304 .string "Fufufufufu.\p" - .string "I’m going to make everyone think\n" - .string "I’m just a kid and let them play down.\p" - .string "Then, I’ll shock them and grab\n" + .string "I'm going to make everyone think\n" + .string "I'm just a kid and let them play down.\p" + .string "Then, I'll shock them and grab\n" .string "the title!$" FallarborTown_BattleTentLobby_Text_200382: @ 8200382 @@ -368,16 +368,16 @@ FallarborTown_BattleTentLobby_Text_200382: @ 8200382 .string "different events in different towns?\p" .string "My favorite is definitely the BATTLE\n" .string "TENT in FALLARBOR TOWN.\p" - .string "I think it’s fantastic how TRAINERS\n" + .string "I think it's fantastic how TRAINERS\n" .string "try to win with all their faith in\l" .string "their POKéMON.$" FallarborTown_BattleTentLobby_Text_20045A: @ 820045A .string "I heard something about some tent,\n" .string "so I came to camp out.\p" - .string "I didn’t know that tents these days\n" + .string "I didn't know that tents these days\n" .string "are so luxurious!\p" - .string "Since I’m here, I may as well try\n" + .string "Since I'm here, I may as well try\n" .string "my hand at battling!$" FallarborTown_BattleTentLobby_Text_200501: @ 8200501 @@ -385,13 +385,13 @@ FallarborTown_BattleTentLobby_Text_200501: @ 8200501 .string "So you came out to this BATTLE TENT!\p" .string "The people in these parts tend to be\n" .string "easygoing and laid-back.\p" - .string "But, you see, what I’m looking for are\n" + .string "But, you see, what I'm looking for are\n" .string "people with…\p" .string "How should I say this?\p" .string "Someone bursting with the desire\n" .string "and the drive to win.\p" .string "If there were a TRAINER like that,\n" - .string "I’d immediately…\p" + .string "I'd immediately…\p" .string "Whoops! Never mind!\n" .string "Keep working at it!$" diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index e759b43b3..470d80267 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -78,7 +78,7 @@ FallarborTown_House1_Text_200FEE: @ 8200FEE .string "conned into telling TEAM MAGMA where\l" .string "you can find METEORITES…\p" .string "That METEORITE from METEOR FALLS…\n" - .string "It’s never going to be mine now…$" + .string "It's never going to be mine now…$" FallarborTown_House1_Text_2010A2: @ 82010A2 .string "Oh!\n" @@ -88,7 +88,7 @@ FallarborTown_House1_Text_2010A2: @ 82010A2 .string "Is it the METEORITE that TEAM MAGMA\n" .string "took from METEOR FALLS?\p" .string "Please, may I have it?\p" - .string "I’m not asking for it for free.\n" + .string "I'm not asking for it for free.\n" .string "How about in exchange for this TM?$" FallarborTown_House1_Text_201159: @ 8201159 @@ -97,18 +97,18 @@ FallarborTown_House1_Text_201159: @ 8201159 .string "Please use it!$" FallarborTown_House1_Text_2011A5: @ 82011A5 - .string "PROF. COZMO: Oh, I can’t believe it.\n" + .string "PROF. COZMO: Oh, I can't believe it.\n" .string "This is really, really great!\p" .string "This is really going to help my research!$" FallarborTown_House1_Text_201212: @ 8201212 .string "PROF. COZMO: Oh, but…\n" - .string "I’m crushed with disappointment…$" + .string "I'm crushed with disappointment…$" FallarborTown_House1_Text_201249: @ 8201249 .string "PROF. COZMO: Please, may I have that\n" .string "METEORITE?\p" - .string "I’m not asking for it for free.\n" + .string "I'm not asking for it for free.\n" .string "How about in exchange for this TM?$" FallarborTown_House1_Text_2012BC: @ 82012BC @@ -118,9 +118,9 @@ FallarborTown_House1_Text_2012BC: @ 82012BC FallarborTown_House1_Text_201310: @ 8201310 .string "Poor PROF. COZMO…\n" - .string "He’s so depressed… I feel sorry for him.$" + .string "He's so depressed… I feel sorry for him.$" FallarborTown_House1_Text_20134B: @ 820134B .string "Look at PROF. COZMO…\n" - .string "He’s so happy! I think it’s cute.$" + .string "He's so happy! I think it's cute.$" diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index e1d072e49..2fddd2fd4 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -63,17 +63,17 @@ FallarborTown_House2_EventScript_201452:: @ 8201452 end FallarborTown_House2_Text_20145C: @ 820145C - .string "I’m the MOVE TUTOR.\p" + .string "I'm the MOVE TUTOR.\p" .string "I know all the moves that POKéMON\n" .string "learn--every one of them--and I can\l" .string "teach POKéMON those moves.\p" .string "I can teach a move to a POKéMON\n" - .string "of yours if you’d like.\p" - .string "I’ll do it for a HEART SCALE.\n" - .string "I’m collecting those now.$" + .string "of yours if you'd like.\p" + .string "I'll do it for a HEART SCALE.\n" + .string "I'm collecting those now.$" FallarborTown_House2_Text_201541: @ 8201541 - .string "Oh! That’s it! That’s an honest to\n" + .string "Oh! That's it! That's an honest to\n" .string "goodness HEART SCALE!\p" .string "Let me guess, you want me to teach\n" .string "a move?$" @@ -86,7 +86,7 @@ FallarborTown_House2_Text_2015C3: @ 82015C3 FallarborTown_House2_Text_2015DE: @ 82015DE .string "Sorry…\p" - .string "It doesn’t appear as if I have any move\n" + .string "It doesn't appear as if I have any move\n" .string "I can teach that POKéMON.$" FallarborTown_House2_Text_201627: @ 8201627 @@ -98,6 +98,6 @@ FallarborTown_House2_Text_201653: @ 8201653 .string "come back with a HEART SCALE.$" FallarborTown_House2_Text_201697: @ 8201697 - .string "Hunh? There isn’t a single move that\n" + .string "Hunh? There isn't a single move that\n" .string "I can teach an EGG.$" diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index 4b7e0253c..bd9de930c 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -48,10 +48,10 @@ FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 end FallarborTown_Mart_Text_1FFD19: @ 81FFD19 - .string "I’m having a hard time deciding if I\n" + .string "I'm having a hard time deciding if I\n" .string "should make my SKITTY evolve or not.\p" .string "I only have to use this MOON STONE,\n" - .string "but it’s so hard to decide…\p" + .string "but it's so hard to decide…\p" .string "If I make it evolve, it will become\n" .string "much stronger.\p" .string "But it will look so different, too.$" @@ -61,6 +61,6 @@ FallarborTown_Mart_Text_1FFDFA: @ 81FFDFA FallarborTown_Mart_Text_1FFE09: @ 81FFE09 .string "This NUGGET I found here…\n" - .string "I suppose I’ll have to sell it, seeing\l" + .string "I suppose I'll have to sell it, seeing\l" .string "as how it has no other use.$" diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 6138c615c..c9a7ef27c 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -84,17 +84,17 @@ FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60 FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B .string "Oh, hello.\n" .string "You are?\p" - .string "Okay, your name’s {PLAYER}{KUN}.\n" - .string "I can see that you’re a TRAINER.\p" + .string "Okay, your name's {PLAYER}{KUN}.\n" + .string "I can see that you're a TRAINER.\p" .string "So that means you use the POKéMON\n" .string "Storage System I developed.\p" .string "How I arrived at that conclusion is\n" .string "a simple deductive process.\p" .string "You spoke to me because you wanted\n" .string "to access something on this PC.\p" - .string "Oh, I’m sorry. I’m LANETTE.\p" - .string "Honestly, I’m glad to meet you--it’s\n" - .string "great you’re using the Storage System.\p" + .string "Oh, I'm sorry. I'm LANETTE.\p" + .string "Honestly, I'm glad to meet you--it's\n" + .string "great you're using the Storage System.\p" .string "If you could, please visit me at home.\n" .string "My house is on ROUTE 114.$" diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index ad126f3bf..948f443d2 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -101,26 +101,26 @@ FortreeCity_Text_1E2676: @ 81E2676 FortreeCity_Text_1E2738: @ 81E2738 .string "I want to go to the POKéMON GYM,\n" - .string "but something’s blocking the way.\p" + .string "but something's blocking the way.\p" .string "After all the bother I went through\n" .string "training on ROUTE 120…$" FortreeCity_Text_1E27B6: @ 81E27B6 - .string "I’ve got my pride-and-joy POKéMON\n" - .string "with me. This time, I’ll beat WINONA.$" + .string "I've got my pride-and-joy POKéMON\n" + .string "with me. This time, I'll beat WINONA.$" FortreeCity_Text_1E27FE: @ 81E27FE .string "The ground absorbs rainwater, and\n" .string "trees grow by drinking that water…\p" .string "Our FORTREE CITY exists because\n" - .string "there’s both water and soil.$" + .string "there's both water and soil.$" FortreeCity_Text_1E2880: @ 81E2880 .string "The CITY consists of homes built on\n" .string "trees.\p" .string "Perhaps because of that lifestyle,\n" .string "everyone is healthy and lively.\p" - .string "Why, even myself--I feel as if I’ve\n" + .string "Why, even myself--I feel as if I've\n" .string "grown thirty years younger.$" FortreeCity_Text_1E292E: @ 81E292E @@ -131,7 +131,7 @@ FortreeCity_Text_1E292E: @ 81E292E FortreeCity_Text_1E299D: @ 81E299D .string "There are POKéMON that evolve when\n" - .string "you trade them! That’s what I heard.$" + .string "you trade them! That's what I heard.$" FortreeCity_Text_1E29E5: @ 81E29E5 .string "Something unseeable is in the way.$" diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index a94fe04d4..5274daeda 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -60,13 +60,13 @@ FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064 FortreeCity_DecorationShop_Text_218078: @ 8218078 .string "Merchandise you buy here is sent to\n" .string "your own PC.\p" - .string "That’s fantastic! I wish they could\n" + .string "That's fantastic! I wish they could\n" .string "also deliver me home like that.$" FortreeCity_DecorationShop_Text_2180ED: @ 82180ED - .string "I’m buying a pretty desk and I’m\n" + .string "I'm buying a pretty desk and I'm\n" .string "putting my cute DOLLS on it.\p" - .string "If I don’t, when I decorate my\n" + .string "If I don't, when I decorate my\n" .string "SECRET BASE, my DOLLS will get\l" .string "dirty or poked with splinters.$" diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index fb91c5c1a..c56f0cbdb 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -140,19 +140,19 @@ FortreeCity_Gym_EventScript_21677B:: @ 821677B end FortreeCity_Gym_Text_216785: @ 8216785 - .string "Yo, how’s it going, CHAMPION-\n" + .string "Yo, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "FORTREE GYM LEADER WINONA is\n" .string "a master of FLYING-type POKéMON.\p" - .string "She’s waiting at the back of this GYM,\n" + .string "She's waiting at the back of this GYM,\n" .string "behind the rotating doors.\p" - .string "She’s waiting for new challengers\n" + .string "She's waiting for new challengers\n" .string "who are trying to take wing!\p" .string "Okay, go for it!$" FortreeCity_Gym_Text_21687D: @ 821687D .string "You did it!\n" - .string "You’ve achieved liftoff!$" + .string "You've achieved liftoff!$" FortreeCity_Gym_Text_2168A2: @ 82168A2 .string "Behold the elegant battle style of\n" @@ -160,7 +160,7 @@ FortreeCity_Gym_Text_2168A2: @ 82168A2 FortreeCity_Gym_Text_2168D3: @ 82168D3 .string "You…\n" - .string "You’re strong…$" + .string "You're strong…$" FortreeCity_Gym_Text_2168E7: @ 82168E7 .string "A TRAINER has to be smart to keep\n" @@ -172,7 +172,7 @@ FortreeCity_Gym_Text_21695A: @ 821695A .string "The lovers of BIRD POKéMON aspire\n" .string "to join this GYM.\p" .string "As a member of the FORTREE GYM,\n" - .string "I’m not allowed to lose!$" + .string "I'm not allowed to lose!$" FortreeCity_Gym_Text_2169C7: @ 82169C7 .string "It was too much of a load for me\n" @@ -181,26 +181,26 @@ FortreeCity_Gym_Text_2169C7: @ 82169C7 FortreeCity_Gym_Text_2169F1: @ 82169F1 .string "The world is huge, and there are\n" .string "countless tough TRAINERS.\p" - .string "I’m going to keep training and make\n" + .string "I'm going to keep training and make\n" .string "myself even stronger.$" FortreeCity_Gym_Text_216A66: @ 8216A66 - .string "There’s no need for WINONA, our GYM\n" + .string "There's no need for WINONA, our GYM\n" .string "LEADER, to deal with you!\p" - .string "I’m plenty good enough for you!$" + .string "I'm plenty good enough for you!$" FortreeCity_Gym_Text_216AC4: @ 8216AC4 .string "WINONA, I…\n" .string "I lost!$" FortreeCity_Gym_Text_216AD7: @ 8216AD7 - .string "WINONA is cute and she’s strong.\n" - .string "She’s the ultimate LEADER!\p" + .string "WINONA is cute and she's strong.\n" + .string "She's the ultimate LEADER!\p" .string "Blush…$" FortreeCity_Gym_Text_216B1A: @ 8216B1A .string "WINONA taught me personally!\n" - .string "You can’t beat me easily!$" + .string "You can't beat me easily!$" FortreeCity_Gym_Text_216B51: @ 8216B51 .string "I was beaten…$" @@ -212,20 +212,20 @@ FortreeCity_Gym_Text_216B5F: @ 8216B5F FortreeCity_Gym_Text_216B9E: @ 8216B9E .string "When WINONA takes to battle, her face\n" .string "shines with beautiful determination…\p" - .string "I’m not letting you witness that\n" + .string "I'm not letting you witness that\n" .string "lovely sight!$" FortreeCity_Gym_Text_216C18: @ 8216C18 .string "Urk!\n" - .string "I couldn’t stop you.$" + .string "I couldn't stop you.$" FortreeCity_Gym_Text_216C32: @ 8216C32 - .string "You’d better watch it!\n" - .string "Don’t get distracted staring at WINONA\l" - .string "or you’ll go crashing down in a heap!$" + .string "You'd better watch it!\n" + .string "Don't get distracted staring at WINONA\l" + .string "or you'll go crashing down in a heap!$" FortreeCity_Gym_Text_216C96: @ 8216C96 - .string "You’d better know that there are all\n" + .string "You'd better know that there are all\n" .string "sorts of FLYING-type POKéMON.\p" .string "You do know that, right?$" @@ -234,8 +234,8 @@ FortreeCity_Gym_Text_216CF2: @ 8216CF2 FortreeCity_Gym_Text_216D0F: @ 8216D0F .string "Sure, you beat me all right.\n" - .string "But you’d better watch it! Our LEADER\l" - .string "WINONA’s POKéMON are all business.$" + .string "But you'd better watch it! Our LEADER\l" + .string "WINONA's POKéMON are all business.$" FortreeCity_Gym_Text_216D75: @ 8216D75 .string "I am WINONA. I am the LEADER of\n" @@ -286,12 +286,12 @@ FortreeCity_Gym_Text_2170AE: @ 82170AE FortreeCity_Gym_Text_2170C7: @ 82170C7 .string "FORTREE CITY POKéMON GYM\p" - .string "WINONA’S CERTIFIED TRAINERS:\n" + .string "WINONA'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" FortreeCity_Gym_Text_217100: @ 8217100 .string "WINONA: We humans can never escape\n" - .string "gravity’s pull on the ground.\p" + .string "gravity's pull on the ground.\p" .string "But by striving for excellence,\n" .string "we have the power to soar!\p" .string "You have scaled the pinnacle as\n" @@ -311,7 +311,7 @@ FortreeCity_Gym_Text_21720B: @ 821720B FortreeCity_Gym_Text_217292: @ 8217292 .string "WINONA: We humans can never escape\n" - .string "gravity’s pull on the ground.\p" + .string "gravity's pull on the ground.\p" .string "But by striving for excellence,\n" .string "we have the power to soar!\p" .string "You have scaled the pinnacle as\n" diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 274057110..52a9793c3 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -67,12 +67,12 @@ FortreeCity_House1_EventScript_216368:: @ 8216368 FortreeCity_House1_Text_21637B: @ 821637B .string "Wrooooaaar! I need it!\n" .string "I have to get me a {STR_VAR_1}!\l" - .string "I’ll do anything for it!\p" + .string "I'll do anything for it!\p" .string "…Uh… Did you hear that?\n" .string "My shout from the bottom of my heart?\p" .string "Having heard that, you will trade\n" .string "your {STR_VAR_1} for my {STR_VAR_2},\l" - .string "won’t you?$" + .string "won't you?$" FortreeCity_House1_Text_216440: @ 8216440 .string "Oh, yeah, right on!\p" @@ -80,21 +80,21 @@ FortreeCity_House1_Text_216440: @ 8216440 .string "{STR_VAR_2}, you take care!$" FortreeCity_House1_Text_216474: @ 8216474 - .string "Uh, no, I don’t think so.\n" - .string "That isn’t a {STR_VAR_1}.$" + .string "Uh, no, I don't think so.\n" + .string "That isn't a {STR_VAR_1}.$" FortreeCity_House1_Text_21649F: @ 821649F - .string "No? You won’t trade me?\n" + .string "No? You won't trade me?\n" .string "Even after I bared my heart to you?$" FortreeCity_House1_Text_2164DB: @ 82164DB - .string "I’m going to make VOLBEAT super\n" + .string "I'm going to make VOLBEAT super\n" .string "strong from this moment on!\p" .string "I hope you do the same with PLUSLE!$" FortreeCity_House1_Text_21653B: @ 821653B .string "Trading POKéMON with others…\p" - .string "It’s as if you’re trading your own\n" + .string "It's as if you're trading your own\n" .string "memories with other people.$" FortreeCity_House1_Text_216597: @ 8216597 diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index 742a16411..fe1f6cfee 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -16,14 +16,14 @@ FortreeCity_House3_Text_217AFA: @ 8217AFA .string "I was searching for rare stones.\p" .string "Hoo, boy, he had some amazing POKéMON\n" .string "with him.\p" - .string "They weren’t just rare, they were\n" + .string "They weren't just rare, they were\n" .string "trained to terrifying extremes!\p" .string "He might even be stronger than the\n" .string "GYM LEADER in this town…$" FortreeCity_House3_Text_217C22: @ 8217C22 - .string "What’s that thing you have there?\p" + .string "What's that thing you have there?\p" .string "… … … … … …\p" - .string "Oh, it’s called a POKéDEX?\n" - .string "It’s really awesome!$" + .string "Oh, it's called a POKéDEX?\n" + .string "It's really awesome!$" diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 24d50afa3..eb6043ab3 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -70,7 +70,7 @@ FortreeCity_House4_Text_217D33: @ 8217D33 .string "By being together with POKéMON,\n" .string "people make more and more friends.\p" .string "And that brings the world closer\n" - .string "together. I think it’s wonderful!$" + .string "together. I think it's wonderful!$" FortreeCity_House4_Text_217DB9: @ 8217DB9 .string "There!\n" @@ -87,7 +87,7 @@ FortreeCity_House4_Text_217E05: @ 8217E05 .string "What is it holding?\p" .string "A MENTAL HERB?\n" .string "It must have picked it up somewhere.\p" - .string "But I’m not a TRAINER, so you can\n" + .string "But I'm not a TRAINER, so you can\n" .string "have it.$" FortreeCity_House4_Text_217EA8: @ 8217EA8 diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index cb0bc72fc..a40fe0e83 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -21,13 +21,13 @@ FortreeCity_House5_EventScript_217F04:: @ 8217F04 FortreeCity_House5_Text_217F17: @ 8217F17 .string "The tree houses of FORTREE are great!\p" - .string "I think it’s the number one town for\n" + .string "I think it's the number one town for\n" .string "living together with POKéMON.$" FortreeCity_House5_Text_217F80: @ 8217F80 .string "POKéMON and people have adapted to\n" .string "nature for survival.\p" - .string "There’s no need to make nature\n" + .string "There's no need to make nature\n" .string "conform to the way we want to live.$" FortreeCity_House5_Text_217FFB: @ 8217FFB diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index 25d7646b7..8d2f9b568 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -42,12 +42,12 @@ FortreeCity_Mart_EventScript_2176AA:: @ 82176AA FortreeCity_Mart_Text_2176B3: @ 82176B3 .string "SUPER REPEL lasts a long time,\n" .string "and it gets the job done.\p" - .string "It’s much better than an ordinary\n" + .string "It's much better than an ordinary\n" .string "REPEL.$" FortreeCity_Mart_Text_217715: @ 8217715 .string "I always stock up on more items than\n" - .string "I’m sure I’ll need.\p" + .string "I'm sure I'll need.\p" .string "You never know what might happen.\n" .string "Better to be safe than sorry!$" diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 24449ed2b..339cae9eb 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -31,25 +31,25 @@ FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410 .string "Listen, kid, are you working\n" .string "on a POKéDEX?\p" .string "Hmm… Go to the SAFARI ZONE.\n" - .string "That’s my suggestion.$" + .string "That's my suggestion.$" FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D .string "Have you done anything at\n" .string "the RECORD CORNER?\p" - .string "It’s pretty neat. It mixes and matches\n" + .string "It's pretty neat. It mixes and matches\n" .string "the records of TRAINERS.\p" - .string "I don’t know quite how it works,\n" - .string "but it’s cool. It’s exciting, even!$" + .string "I don't know quite how it works,\n" + .string "but it's cool. It's exciting, even!$" FortreeCity_PokemonCenter_1F_Text_21751F: @ 821751F .string "Oh, wow, you have a POKéNAV!\n" - .string "And it’s just like mine!\p" - .string "Do you know about POKéNAV’s\n" + .string "And it's just like mine!\p" + .string "Do you know about POKéNAV's\n" .string "MATCH CALL system?\p" .string "Access it, and you can chat with\n" .string "registered TRAINERS anytime.\p" .string "It also shows you which TRAINERS\n" .string "want a rematch with you.\p" - .string "It’s really nifty! Those DEVON guys\n" - .string "sure know what they’re doing!$" + .string "It's really nifty! Those DEVON guys\n" + .string "sure know what they're doing!$" diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index 0bbb708bd..28b95d578 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -21,14 +21,14 @@ GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A GraniteCave_1F_Text_22DA94: @ 822DA94 .string "Hey, you.\n" .string "It gets awfully dark ahead.\l" - .string "It’ll be tough trying to explore.\p" + .string "It'll be tough trying to explore.\p" .string "That guy who came by earlier…\n" .string "STEVEN, I think it was.\p" .string "He knew how to use FLASH, so he ought\n" .string "to be all right, but…\p" .string "Well, for us HIKERS, helping out those\n" .string "that we meet is our motto.\p" - .string "Here you go, I’ll pass this on to you.$" + .string "Here you go, I'll pass this on to you.$" GraniteCave_1F_Text_22DBB7: @ 822DBB7 .string "Teach that hidden move FLASH to\n" @@ -36,5 +36,5 @@ GraniteCave_1F_Text_22DBB7: @ 822DBB7 .string "It lights up even the inky darkness\n" .string "of caves.\p" .string "But, to use it, you need the GYM BADGE\n" - .string "from DEWFORD’s POKéMON GYM.$" + .string "from DEWFORD's POKéMON GYM.$" diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 473837fab..da0668bac 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -86,7 +86,7 @@ GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A .string "My name is STEVEN.\p" - .string "I’m interested in rare stones,\n" + .string "I'm interested in rare stones,\n" .string "so I travel here and there.\p" .string "Oh?\n" .string "A LETTER for me?$" @@ -96,7 +96,7 @@ GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD .string "You went through all this trouble to\n" .string "deliver that. I need to thank you.\p" .string "Let me see…\n" - .string "I’ll give you this TM.\p" + .string "I'll give you this TM.\p" .string "It contains my favorite move,\n" .string "STEEL WING.$" @@ -105,9 +105,9 @@ GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B .string "capable.\p" .string "If you keep training, you could even\n" .string "become the CHAMPION of the POKéMON\l" - .string "LEAGUE one day. That’s what I think.\p" - .string "I know, since we’ve gotten to know each\n" - .string "other, let’s register one another in\l" + .string "LEAGUE one day. That's what I think.\p" + .string "I know, since we've gotten to know each\n" + .string "other, let's register one another in\l" .string "our POKéNAVS.\p" .string "… … … … … …$" @@ -116,9 +116,9 @@ GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A .string "in the POKéNAV.$" GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C - .string "Now, I’ve got to hurry along.$" + .string "Now, I've got to hurry along.$" GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA .string "Oh, your BAG is full…\n" - .string "That’s too bad, then.$" + .string "That's too bad, then.$" diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index c995db5e4..100e4314d 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -55,6 +55,6 @@ InsideOfTruck_EventScript_23BF6C:: @ 823BF6C InsideOfTruck_Text_23BF75: @ 823BF75 .string "The box is printed with a POKéMON logo.\p" - .string "It’s a POKéMON brand moving and\n" + .string "It's a POKéMON brand moving and\n" .string "delivery service.$" diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 8a8832dec..d9a5f0849 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -155,8 +155,8 @@ JaggedPass_EventScript_230871:: @ 8230871 end JaggedPass_Text_230888: @ 8230888 - .string "MT. CHIMNEY’s JAGGED PASS…\p" - .string "Now this is what I’ve always wanted\n" + .string "MT. CHIMNEY's JAGGED PASS…\p" + .string "Now this is what I've always wanted\n" .string "in a mountain.\p" .string "This jagged bumpiness…\n" .string "It rocks my soul!$" @@ -170,8 +170,8 @@ JaggedPass_Text_230916: @ 8230916 .string "the mountains, I have you beat!$" JaggedPass_Text_230974: @ 8230974 - .string "This place isn’t your casual hike.\n" - .string "It’s not suited for a picnic.$" + .string "This place isn't your casual hike.\n" + .string "It's not suited for a picnic.$" JaggedPass_Text_2309B5: @ 82309B5 .string "Ohhh, no!\n" @@ -184,7 +184,7 @@ JaggedPass_Text_2309D8: @ 82309D8 JaggedPass_Text_230A2C: @ 8230A2C .string "Will you ever be back in this area?\n" - .string "If you do return, I’d like a rematch.$" + .string "If you do return, I'd like a rematch.$" JaggedPass_Text_230A76: @ 8230A76 .string "Picnics are fun wherever you go.\n" @@ -195,24 +195,24 @@ JaggedPass_Text_230AAA: @ 8230AAA .string "too bumpy!$" JaggedPass_Text_230AD7: @ 8230AD7 - .string "I’ll forget about losing and just\n" + .string "I'll forget about losing and just\n" .string "enjoy this bumpy hike.$" JaggedPass_Text_230B10: @ 8230B10 .string "JAGGED PASS is hard to walk on.\n" - .string "It’s a good place for training.$" + .string "It's a good place for training.$" JaggedPass_Text_230B50: @ 8230B50 .string "It was all over while we were still\n" .string "trying to find a good footing…$" JaggedPass_Text_230B93: @ 8230B93 - .string "If I had an ACRO BIKE, I’d be able to\n" + .string "If I had an ACRO BIKE, I'd be able to\n" .string "jump ledges.$" JaggedPass_Text_230BC6: @ 8230BC6 .string "When I get more used to this bumpiness,\n" - .string "I’ll be sure to win!\p" + .string "I'll be sure to win!\p" .string "Can you register me in your POKéNAV?$" JaggedPass_Text_230C28: @ 8230C28 @@ -220,7 +220,7 @@ JaggedPass_Text_230C28: @ 8230C28 .string "I sing while I climb now.$" JaggedPass_Text_230C60: @ 8230C60 - .string "It’s still not easy to battle on this\n" + .string "It's still not easy to battle on this\n" .string "bumpy ground…$" JaggedPass_Text_230C94: @ 8230C94 @@ -235,13 +235,13 @@ JaggedPass_Text_230CCB: @ 8230CCB JaggedPass_Text_230D2D: @ 8230D2D .string "Urrrgh…\p" - .string "I should’ve ducked into our HIDEOUT\n" + .string "I should've ducked into our HIDEOUT\n" .string "right away…$" JaggedPass_Text_230D65: @ 8230D65 .string "Okay, oh-kay!\n" - .string "I admit it--you’re strong!\p" - .string "Don’t worry about me.\n" + .string "I admit it--you're strong!\p" + .string "Don't worry about me.\n" .string "Go wherever you want!$" JaggedPass_Text_230DBA: @ 8230DBA @@ -249,15 +249,15 @@ JaggedPass_Text_230DBA: @ 8230DBA .string "to the MAGMA EMBLEM!$" JaggedPass_Text_230DF7: @ 8230DF7 - .string "Aiyeeh! It’s awfully scary to shoot\n" + .string "Aiyeeh! It's awfully scary to shoot\n" .string "down the mountain in one go!$" JaggedPass_Text_230E38: @ 8230E38 - .string "I feel like I’m falling apart…$" + .string "I feel like I'm falling apart…$" JaggedPass_Text_230E57: @ 8230E57 .string "My bicycle bounced around so much,\n" - .string "my rear end’s sore…$" + .string "my rear end's sore…$" JaggedPass_Text_230E8E: @ 8230E8E .string "I climb this hill every day.\n" diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 7eb9336f3..a42703900 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -303,34 +303,34 @@ LavaridgeTown_Text_1EA7C0: @ 81EA7C0 .string "have this.$" LavaridgeTown_Text_1EA897: @ 81EA897 - .string "MAY: With those GO-GOGGLES, you’ll\n" + .string "MAY: With those GO-GOGGLES, you'll\n" .string "have no trouble getting through the\l" .string "desert near ROUTE 111.\p" .string "But, wow, {PLAYER}{KUN}…\n" .string "Challenging GYMS…\p" - .string "You’re trying hard because you don’t\n" + .string "You're trying hard because you don't\n" .string "want to lose to me, I bet!\p" .string "{PLAYER}{KUN}, I think I should challenge\n" .string "your dad in PETALBURG GYM.\p" .string "See you again!$" LavaridgeTown_Text_1EA9A2: @ 81EA9A2 - .string "BRENDAN: {PLAYER}, hey, it’s been a while.\n" - .string "How’s it going?\p" + .string "BRENDAN: {PLAYER}, hey, it's been a while.\n" + .string "How's it going?\p" .string "Hmm…\n" - .string "That’s a decent collection of BADGES.\p" + .string "That's a decent collection of BADGES.\p" .string "All right, then.\n" .string "You may as well have this.$" LavaridgeTown_Text_1EAA2E: @ 81EAA2E - .string "BRENDAN: Keep those with you if you’re\n" + .string "BRENDAN: Keep those with you if you're\n" .string "planning on going into that desert near\l" .string "ROUTE 111.\p" .string "There should be some POKéMON that\n" .string "are exclusively desert-dwellers.\l" .string "You might look around for those.\p" .string "As for me…\n" - .string "I’m considering challenging NORMAN,\l" + .string "I'm considering challenging NORMAN,\l" .string "the GYM LEADER of PETALBURG.\p" .string "Unlike you, {PLAYER}, your dad looks like\n" .string "he really is tough.\p" @@ -338,10 +338,10 @@ LavaridgeTown_Text_1EAA2E: @ 81EAA2E LavaridgeTown_Text_1EAB80: @ 81EAB80 .string "I have here an EGG.\p" - .string "I’d hoped to hatch it by covering it in\n" + .string "I'd hoped to hatch it by covering it in\n" .string "hot sand by the hot springs.\l" - .string "But that doesn’t seem to be enough…\p" - .string "I’ve heard it would be best if it were\n" + .string "But that doesn't seem to be enough…\p" + .string "I've heard it would be best if it were\n" .string "kept together with POKéMON and\l" .string "carried about.\p" .string "You are a TRAINER, yes?\n" @@ -350,15 +350,15 @@ LavaridgeTown_Text_1EAB80: @ 81EAB80 .string "Will you take this EGG to hatch?$" LavaridgeTown_Text_1EACC0: @ 81EACC0 - .string "Good! I hope you’ll walk plenty with\n" + .string "Good! I hope you'll walk plenty with\n" .string "this here EGG!$" LavaridgeTown_Text_1EACF4: @ 81EACF4 .string "{PLAYER} received the EGG.$" LavaridgeTown_Text_1EAD09: @ 81EAD09 - .string "Oh? You’ve too many POKéMON.\n" - .string "There’s no room for this EGG…$" + .string "Oh? You've too many POKéMON.\n" + .string "There's no room for this EGG…$" LavaridgeTown_Text_1EAD44: @ 81EAD44 .string "As you wish, then…\p" @@ -368,12 +368,12 @@ LavaridgeTown_Text_1EAD44: @ 81EAD44 LavaridgeTown_Text_1EAD9E: @ 81EAD9E .string "Every so often, an EGG will be found at\n" .string "the POKéMON DAY CARE.\p" - .string "Or at least that’s how the rumor goes.$" + .string "Or at least that's how the rumor goes.$" LavaridgeTown_Text_1EAE03: @ 81EAE03 .string "We draw as much hot water as we need,\n" .string "and yet the hot springs never run dry.\p" - .string "Isn’t it magical?\p" + .string "Isn't it magical?\p" .string "These hot springs appear near active\n" .string "volcanoes. Veins of water under the\l" .string "ground are heated by magma to well up\l" @@ -388,7 +388,7 @@ LavaridgeTown_Text_1EAEE1: @ 81EAEE1 LavaridgeTown_Text_1EAF4E: @ 81EAF4E .string "Oh, you like hot springs, do you?\p" - .string "That’s surprising for one as young\n" + .string "That's surprising for one as young\n" .string "as you.$" LavaridgeTown_Text_1EAF9B: @ 81EAF9B @@ -403,7 +403,7 @@ LavaridgeTown_Text_1EB003: @ 81EB003 .string "a bubble bath, or even a lava bath…$" LavaridgeTown_Text_1EB092: @ 81EB092 - .string "They’re claiming that these hot springs\n" + .string "They're claiming that these hot springs\n" .string "are good for calming nervous tension,\l" .string "relieving aching muscles, solving\l" .string "romantic problems, and attracting\l" diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 77c4a7b5d..6a795a74c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -206,13 +206,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5 end LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF - .string "Hey, how’s it going, CHAMPION-\n" + .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" - .string "LAVARIDGE’s GYM LEADER FLANNERY\n" + .string "LAVARIDGE's GYM LEADER FLANNERY\n" .string "uses FIRE-type POKéMON.\p" .string "Her passion for POKéMON burns stronger\n" .string "and hotter than a volcano.\p" - .string "Don’t get too close to her--you’ll burn!\n" + .string "Don't get too close to her--you'll burn!\n" .string "Hose her down with water and then\l" .string "go for it!$" @@ -221,20 +221,20 @@ LavaridgeTown_Gym_1F_Text_1FEAB8: @ 81FEAB8 LavaridgeTown_Gym_1F_Text_1FEADE: @ 81FEADE .string "Owowowowow!\n" - .string "Yikes, it’s hot!$" + .string "Yikes, it's hot!$" LavaridgeTown_Gym_1F_Text_1FEAFB: @ 81FEAFB - .string "I’m blinded by sweat in my eyes…$" + .string "I'm blinded by sweat in my eyes…$" LavaridgeTown_Gym_1F_Text_1FEB1C: @ 81FEB1C .string "Being buried in hot sand promotes\n" .string "circulation.\p" - .string "It’s effective for healing pain in\n" + .string "It's effective for healing pain in\n" .string "your joints.$" LavaridgeTown_Gym_1F_Text_1FEB7B: @ 81FEB7B - .string "I’m trying to relieve my stress.\n" - .string "Don’t come along and stress me out!$" + .string "I'm trying to relieve my stress.\n" + .string "Don't come along and stress me out!$" LavaridgeTown_Gym_1F_Text_1FEBC0: @ 81FEBC0 .string "I hope FLANNERY flames you good!$" @@ -246,8 +246,8 @@ LavaridgeTown_Gym_1F_Text_1FEBE1: @ 81FEBE1 LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31 .string "You must be getting tired by now.\n" - .string "You’d like to rest in the hot sand,\l" - .string "wouldn’t you?\p" + .string "You'd like to rest in the hot sand,\l" + .string "wouldn't you?\p" .string "But you should know that maintaining\n" .string "your willpower is an important ability\l" .string "for all TRAINERS.$" @@ -258,7 +258,7 @@ LavaridgeTown_Gym_B1F_Text_1FECE3: @ 81FECE3 LavaridgeTown_Gym_B1F_Text_1FED02: @ 81FED02 .string "Your skill is real…\n" .string "But our LEADER FLANNERY is strong.\p" - .string "If you don’t watch yourself, you’ll be\n" + .string "If you don't watch yourself, you'll be\n" .string "burned seriously.$" LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72 @@ -266,7 +266,7 @@ LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72 .string "392-degree heat?$" LavaridgeTown_Gym_1F_Text_1FED9E: @ 81FED9E - .string "It didn’t burn hotly enough…$" + .string "It didn't burn hotly enough…$" LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB .string "The temperature of magma is\n" @@ -276,21 +276,21 @@ LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB LavaridgeTown_Gym_1F_Text_1FEE22: @ 81FEE22 .string "Um…\n" - .string "Okay, I’ll battle with you.$" + .string "Okay, I'll battle with you.$" LavaridgeTown_Gym_1F_Text_1FEE42: @ 81FEE42 - .string "Oh, but you’re too strong.$" + .string "Oh, but you're too strong.$" LavaridgeTown_Gym_1F_Text_1FEE5D: @ 81FEE5D - .string "I’m going to be a pretty and strong\n" + .string "I'm going to be a pretty and strong\n" .string "TRAINER just like FLANNERY.$" LavaridgeTown_Gym_B1F_Text_1FEE9D: @ 81FEE9D .string "Come on, get with it!\n" - .string "Let’s go before my feelings cool!$" + .string "Let's go before my feelings cool!$" LavaridgeTown_Gym_B1F_Text_1FEED5: @ 81FEED5 - .string "It’s so hot, and yet my heart is\n" + .string "It's so hot, and yet my heart is\n" .string "clutched by ice…$" LavaridgeTown_Gym_B1F_Text_1FEF07: @ 81FEF07 @@ -303,12 +303,12 @@ LavaridgeTown_Gym_B1F_Text_1FEF60: @ 81FEF60 .string "They flare in anticipation of my win!$" LavaridgeTown_Gym_B1F_Text_1FEFA7: @ 81FEFA7 - .string "Something didn’t go right.$" + .string "Something didn't go right.$" LavaridgeTown_Gym_B1F_Text_1FEFC2: @ 81FEFC2 .string "Well, so what? I say so what?\n" .string "I can walk on hot coals barefoot!\p" - .string "…Don’t even think about trying it!$" + .string "…Don't even think about trying it!$" LavaridgeTown_Gym_B1F_Text_1FF025: @ 81FF025 .string "As much as I love mountains,\n" @@ -320,16 +320,16 @@ LavaridgeTown_Gym_B1F_Text_1FF05F: @ 81FF05F LavaridgeTown_Gym_B1F_Text_1FF09A: @ 81FF09A .string "I stay here because I became a fan\n" - .string "of FLANNERY’s power.\p" + .string "of FLANNERY's power.\p" .string "Hehehehe.$" LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC .string "Welcome… No, wait.\p" - .string "Puny TRAINER, how good to see you’ve\n" + .string "Puny TRAINER, how good to see you've\n" .string "made it here!\p" .string "I have been entrusted with the…\n" .string "No, wait.\p" - .string "I am FLANNERY, and I’m the GYM\n" + .string "I am FLANNERY, and I'm the GYM\n" .string "LEADER here!\p" .string "Uh…\n" .string "Dare not underestimate me, though\l" @@ -341,12 +341,12 @@ LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233 .string "Oh…\n" .string "I guess I was trying too hard…\p" - .string "I… I’ve only recently become\n" + .string "I… I've only recently become\n" .string "a GYM LEADER.\p" .string "I tried too hard to be someone\n" - .string "I’m not.\p" + .string "I'm not.\p" .string "I have to do things my natural way. If\n" - .string "I don’t, my POKéMON will be confused.\p" + .string "I don't, my POKéMON will be confused.\p" .string "Thanks for teaching me that.\n" .string "For that, you deserve this.$" @@ -362,7 +362,7 @@ LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359 .string "And, it lets POKéMON use the HM move\n" .string "STRENGTH outside of battle.\p" .string "This is a token of my appreciation.\n" - .string "Don’t be shy about taking it!$" + .string "Don't be shy about taking it!$" LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C .string "That TM50 contains OVERHEAT.\p" @@ -386,16 +386,16 @@ LavaridgeTown_Gym_1F_Text_1FF5A9: @ 81FF5A9 LavaridgeTown_Gym_1F_Text_1FF5C4: @ 81FF5C4 .string "LAVARIDGE TOWN POKéMON GYM\p" - .string "FLANNERY’S CERTIFIED TRAINERS:\n" + .string "FLANNERY'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601 - .string "FLANNERY: Losing a battle isn’t going\n" + .string "FLANNERY: Losing a battle isn't going\n" .string "to deflate me.\p" .string "I love POKéMON.\n" .string "I love to battle.\l" .string "And… I love this GYM!\p" - .string "Let’s exchange superhot moves\n" + .string "Let's exchange superhot moves\n" .string "in another battle!$" LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F @@ -404,19 +404,19 @@ LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF .string "FLANNERY: I lost the match,\n" - .string "but I’m completely satisfied.\p" - .string "It’s not often I get to enjoy a battle\n" + .string "but I'm completely satisfied.\p" + .string "It's not often I get to enjoy a battle\n" .string "this heated.\p" - .string "Let’s have another one like this\n" + .string "Let's have another one like this\n" .string "again sometime!$" LavaridgeTown_Gym_1F_Text_1FF75E: @ 81FF75E - .string "FLANNERY: Losing a battle isn’t going\n" + .string "FLANNERY: Losing a battle isn't going\n" .string "to deflate me.\p" .string "I love POKéMON.\n" .string "I love to battle.\l" .string "And… I love this GYM!\p" - .string "Let’s exchange superhot moves\n" + .string "Let's exchange superhot moves\n" .string "in another battle!\p" .string "Oh, wait. Do you only have one POKéMON\n" .string "that can battle?\p" diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index 14e08bed2..b1d776fbd 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -48,13 +48,13 @@ LavaridgeTown_HerbShop_Text_1FE53E: @ 81FE53E .string "effective and inexpensive medicine!$" LavaridgeTown_HerbShop_Text_1FE584: @ 81FE584 - .string "You’ve come to look at herbal medicine\n" + .string "You've come to look at herbal medicine\n" .string "in LAVARIDGE?\p" - .string "That’s rather commendable.\p" + .string "That's rather commendable.\p" .string "I like you! Take this!$" LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB - .string "That CHARCOAL I gave you, it’s used\n" + .string "That CHARCOAL I gave you, it's used\n" .string "for making herbal medicine.\p" .string "It also does wonders when held by\n" .string "a POKéMON.\p" diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc index 19424af1a..2dc6bc76e 100644 --- a/data/maps/LavaridgeTown_House/scripts.inc +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -16,7 +16,7 @@ LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B end LavaridgeTown_House_Text_1FF92E: @ 81FF92E - .string "My wife’s warming an EGG in the hot\n" + .string "My wife's warming an EGG in the hot\n" .string "springs. This is what she told me.\p" .string "She left two POKéMON with the DAY CARE.\n" .string "And they discovered that EGG!$" diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index c3bb550cb..ff9772b1d 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -35,13 +35,13 @@ LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07 end LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10 - .string "Use X SPEED to add to a POKéMON’s\n" + .string "Use X SPEED to add to a POKéMON's\n" .string "SPEED in battle.\p" .string "That will help it get in the first\n" .string "strike--a decided advantage!$" LavaridgeTown_Mart_Text_1FFA83: @ 81FFA83 - .string "On MT. CHIMNEY’s peak, there’s a local\n" + .string "On MT. CHIMNEY's peak, there's a local\n" .string "specialty that you can buy only there.\p" .string "Give it to a POKéMON--it will be elated.$" diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index ee60c7d62..f4fabbf72 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -32,10 +32,10 @@ LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37 .string "I think POKéMON get closer to their\n" .string "TRAINERS if they spend time together.\p" .string "The longer the better.\n" - .string "That’s what I think.$" + .string "That's what I think.$" LavaridgeTown_PokemonCenter_1F_Text_1FFBAD: @ 81FFBAD - .string "It’s sort of magical how just sitting\n" + .string "It's sort of magical how just sitting\n" .string "in a hot-spring pool can invigorate.\p" .string "I wish I could let my POKéMON\n" .string "soak, too.$" diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 6b325d549..83b258c7e 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -443,18 +443,18 @@ LilycoveCity_Text_1E3061: @ 81E3061 .string "{PLAYER}{KUN}, are you shopping, too?\p" .string "I bought a whole bunch of DOLLS and\n" .string "POSTERS.\p" - .string "Of course, I’ve also caught a lot of\n" - .string "POKéMON, and I’m raising them\l" + .string "Of course, I've also caught a lot of\n" + .string "POKéMON, and I'm raising them\l" .string "properly, too.\p" - .string "Actually, I’m more worried if you’re\n" + .string "Actually, I'm more worried if you're\n" .string "raising POKéMON properly, {PLAYER}{KUN}.\p" - .string "I’ll battle with you, so you can show\n" + .string "I'll battle with you, so you can show\n" .string "me your POKéMON, {PLAYER}{KUN}.$" LilycoveCity_Text_1E318D: @ 81E318D - .string "MAY: Oh, why? {PLAYER}{KUN}, haven’t you\n" + .string "MAY: Oh, why? {PLAYER}{KUN}, haven't you\n" .string "been raising your POKéMON?\p" - .string "That’s not a very good showing as a\n" + .string "That's not a very good showing as a\n" .string "TRAINER…$" LilycoveCity_Text_1E31F5: @ 81E31F5 @@ -462,7 +462,7 @@ LilycoveCity_Text_1E31F5: @ 81E31F5 .string "check out your POKéMON!$" LilycoveCity_Text_1E3234: @ 81E3234 - .string "MAY: The POKéMON I raised won’t be\n" + .string "MAY: The POKéMON I raised won't be\n" .string "beaten by your POKéMON, {PLAYER}{KUN}!$" LilycoveCity_Text_1E3275: @ 81E3275 @@ -470,22 +470,22 @@ LilycoveCity_Text_1E3275: @ 81E3275 .string "I remember the battle I had with you,\n" .string "{PLAYER}{KUN}, on ROUTE 103.\p" .string "That battle helped you become this\n" - .string "strong, {PLAYER}{KUN}, didn’t it?$" + .string "strong, {PLAYER}{KUN}, didn't it?$" LilycoveCity_Text_1E32FB: @ 81E32FB - .string "MAY: I’m thinking of going back to\n" + .string "MAY: I'm thinking of going back to\n" .string "LITTLEROOT soon.\p" - .string "I’ve caught a decent group of POKéMON,\n" + .string "I've caught a decent group of POKéMON,\n" .string "and my POKéDEX is coming along, so\l" - .string "I’m going home to show my dad.$" + .string "I'm going home to show my dad.$" LilycoveCity_Text_1E3398: @ 81E3398 .string "{PLAYER}{KUN}, what are you going to do?\p" .string "Collect all the GYM BADGES and take\n" .string "the POKéMON LEAGUE challenge?\p" - .string "Well, while you’re collecting BADGES,\n" - .string "{PLAYER}{KUN}, I’m going to work on my\l" - .string "POKéDEX. I’ll complete it before you!\p" + .string "Well, while you're collecting BADGES,\n" + .string "{PLAYER}{KUN}, I'm going to work on my\l" + .string "POKéDEX. I'll complete it before you!\p" .string "See you!$" LilycoveCity_Text_1E346D: @ 81E346D @@ -494,8 +494,8 @@ LilycoveCity_Text_1E346D: @ 81E346D .string "challenge?\p" .string "Or, are you going to complete your\n" .string "POKéDEX?\p" - .string "I might’ve lost to you in battling,\n" - .string "but I’ll finish my POKéDEX before you!\p" + .string "I might've lost to you in battling,\n" + .string "but I'll finish my POKéDEX before you!\p" .string "See you!$" LilycoveCity_Text_1E353A: @ 81E353A @@ -504,53 +504,53 @@ LilycoveCity_Text_1E353A: @ 81E353A .string "challenge?\p" .string "Or, are you going to complete your\n" .string "POKéDEX?\p" - .string "I might’ve lost to you in battling,\n" - .string "but I’ll finish my POKéDEX before you!\p" + .string "I might've lost to you in battling,\n" + .string "but I'll finish my POKéDEX before you!\p" .string "See you!$" LilycoveCity_Text_1E3608: @ 81E3608 - .string "BRENDAN: Oh, hey, it’s {PLAYER}.\p" - .string "I’m running an errand for my dad.\n" - .string "No, I’m not buying any DOLLS.\p" - .string "Anyways, it’s been a while.\p" - .string "Want to have a battle to see who’s been\n" + .string "BRENDAN: Oh, hey, it's {PLAYER}.\p" + .string "I'm running an errand for my dad.\n" + .string "No, I'm not buying any DOLLS.\p" + .string "Anyways, it's been a while.\p" + .string "Want to have a battle to see who's been\n" .string "raising POKéMON better?$" LilycoveCity_Text_1E36BF: @ 81E36BF - .string "BRENDAN: Oh, what’s the matter?\n" - .string "Don’t have the confidence?$" + .string "BRENDAN: Oh, what's the matter?\n" + .string "Don't have the confidence?$" LilycoveCity_Text_1E36FA: @ 81E36FA - .string "BRENDAN: Want to battle to see who’s\n" + .string "BRENDAN: Want to battle to see who's\n" .string "been raising POKéMON better?$" LilycoveCity_Text_1E373C: @ 81E373C - .string "BRENDAN: Aww, but you know I’m not\n" + .string "BRENDAN: Aww, but you know I'm not\n" .string "going to lose to no {PLAYER}.$" LilycoveCity_Text_1E3777: @ 81E3777 .string "Humph…\n" - .string "You’ve done a lot of raising.\p" + .string "You've done a lot of raising.\p" .string "That stings a bit--I had a head start\n" .string "on you as a TRAINER…$" LilycoveCity_Text_1E37D7: @ 81E37D7 .string "BRENDAN: I…\n" .string "I plan on going home to LITTLEROOT.\p" - .string "You know I’m helping out my dad on his\n" - .string "POKéDEX. It’s coming together pretty\l" + .string "You know I'm helping out my dad on his\n" + .string "POKéDEX. It's coming together pretty\l" .string "decently, so I should go show him.$" LilycoveCity_Text_1E3876: @ 81E3876 .string "{PLAYER}, what are you going to do?\p" .string "Collect all the GYM BADGES and take\n" .string "the POKéMON LEAGUE challenge?\p" - .string "Maybe I’ll do that, too…\p" + .string "Maybe I'll do that, too…\p" .string "Well, anyway, hang in there!$" LilycoveCity_Text_1E390C: @ 81E390C .string "{PLAYER}, what are you going to do?\p" - .string "Since you’re that strong, are you\n" + .string "Since you're that strong, are you\n" .string "taking the POKéMON LEAGUE challenge?\p" .string "Heh, even me--if I trained my POKéMON\n" .string "a bit more, I should be stronger than\l" @@ -563,10 +563,10 @@ LilycoveCity_Text_1E39E3: @ 81E39E3 .string "challenge?\p" .string "Or, are you going to complete your\n" .string "POKéDEX?\p" - .string "Since you’re that strong, you should\n" + .string "Since you're that strong, you should\n" .string "consider the BATTLE FRONTIER.\p" .string "Heh, if I train my POKéMON a bit more,\n" - .string "I’ll get stronger than you, {PLAYER}.\p" + .string "I'll get stronger than you, {PLAYER}.\p" .string "Maybe I should go to the BATTLE\n" .string "FRONTIER.\p" .string "Well, anyway, hang in there!$" @@ -579,22 +579,22 @@ LilycoveCity_Text_1E3B2C: @ 81E3B2C .string "I was just talking to myself!$" LilycoveCity_Text_1E3B95: @ 81E3B95 - .string "I’m just a GRUNT, so I don’t know what\n" + .string "I'm just a GRUNT, so I don't know what\n" .string "the BOSS is thinking…\p" - .string "But being on TEAM AQUA, I know I’ll get\n" + .string "But being on TEAM AQUA, I know I'll get\n" .string "the chance to do big things!\p" .string "Wh-who are you?!\n" .string "I was just talking to myself!$" LilycoveCity_Text_1E3C46: @ 81E3C46 .string "Hey, you!\p" - .string "Don’t go near the cave in the cove!\p" - .string "Why? You don’t need a reason why!\n" - .string "I’m an adult, so you just listen to me!$" + .string "Don't go near the cave in the cove!\p" + .string "Why? You don't need a reason why!\n" + .string "I'm an adult, so you just listen to me!$" LilycoveCity_Text_1E3CBE: @ 81E3CBE .string "If this whole wide world becomes ours,\n" - .string "TEAM AQUA’s, it will be a happier\l" + .string "TEAM AQUA's, it will be a happier\l" .string "place for POKéMON, too.$" LilycoveCity_Text_1E3D1F: @ 81E3D1F @@ -603,11 +603,11 @@ LilycoveCity_Text_1E3D1F: @ 81E3D1F LilycoveCity_Text_1E3D4A: @ 81E3D4A .string "Hunh? What do you want?\p" - .string "You’re messing up our training,\n" + .string "You're messing up our training,\n" .string "so can you, like, get lost?$" LilycoveCity_Text_1E3D9E: @ 81E3D9E - .string "There’s a POKéMON CONTEST HALL\n" + .string "There's a POKéMON CONTEST HALL\n" .string "right in this here town. \p" .string "That means well-raised POKéMON will\n" .string "come from all over the country.\p" @@ -618,9 +618,9 @@ LilycoveCity_Text_1E3E3C: @ 81E3E3C .string "the cove at the edge of town?$" LilycoveCity_Text_1E3E7D: @ 81E3E7D - .string "I’m going to teach my POKéMON some new\n" + .string "I'm going to teach my POKéMON some new\n" .string "moves for entering a CONTEST.\p" - .string "So, I’m going to see the MOVE DELETER\n" + .string "So, I'm going to see the MOVE DELETER\n" .string "and make it forget HM moves.$" LilycoveCity_Text_1E3F05: @ 81E3F05 @@ -632,9 +632,9 @@ LilycoveCity_Text_1E3F05: @ 81E3F05 .string "only in this area?$" LilycoveCity_Text_1E3FAB: @ 81E3FAB - .string "TEAM AQUA’s been training their\n" + .string "TEAM AQUA's been training their\n" .string "WAILMER in the cove.\p" - .string "We SAILORS can’t get our boats out\n" + .string "We SAILORS can't get our boats out\n" .string "to sea with them in the way!$" LilycoveCity_Text_1E4020: @ 81E4020 @@ -648,7 +648,7 @@ LilycoveCity_Text_1E40AD: @ 81E40AD .string "I was taking a relaxing snooze at the\n" .string "seaside inn to the sound of waves…\p" .string "When someone stole my POKéMON!\p" - .string "Who’s the abductor?\n" + .string "Who's the abductor?\n" .string "TEAM AQUA? Is it TEAM AQUA?$" LilycoveCity_Text_1E4145: @ 81E4145 @@ -656,10 +656,10 @@ LilycoveCity_Text_1E4145: @ 81E4145 .string "It came back without me noticing!$" LilycoveCity_Text_1E417B: @ 81E417B - .string "I’m an ART DEALER.\p" + .string "I'm an ART DEALER.\p" .string "I am a buyer and seller of fine art,\n" .string "especially paintings.\p" - .string "I’ve heard that the MUSEUM here has\n" + .string "I've heard that the MUSEUM here has\n" .string "magnificent works on exhibit…$" LilycoveCity_Text_1E420B: @ 81E420B @@ -683,12 +683,12 @@ LilycoveCity_Text_1E42FC: @ 81E42FC .string "They call themselves\n" .string "the “nature-loving TEAM AQUAâ€!\p" .string "But what they do and what they say\n" - .string "don’t match at all!$" + .string "don't match at all!$" LilycoveCity_Text_1E43FF: @ 81E43FF .string "That cave in the cove…\p" - .string "I didn’t notice it right away,\n" - .string "but it’s completely empty now.\p" + .string "I didn't notice it right away,\n" + .string "but it's completely empty now.\p" .string "That TEAM AQUA lot, they must\n" .string "have gone away for good.$" @@ -713,7 +713,7 @@ LilycoveCity_Text_1E4534: @ 81E4534 LilycoveCity_Text_1E4571: @ 81E4571 .string "LILYCOVE MUSEUM\p" - .string "“{PLAYER}’s POKéMON Collection\n" + .string "“{PLAYER}'s POKéMON Collection\n" .string "on exhibit!â€$" LilycoveCity_Text_1E45A7: @ 81E45A7 @@ -741,7 +741,7 @@ LilycoveCity_Text_1E46BE: @ 81E46BE .string "you need!â€$" LilycoveCity_Text_1E473D: @ 81E473D - .string "MOVE DELETER’S HOUSE\p" + .string "MOVE DELETER'S HOUSE\p" .string "“Unwanted POKéMON moves deleted.â€$" LilycoveCity_Text_1E4774: @ 81E4774 @@ -752,18 +752,18 @@ LilycoveCity_Text_1E47A1: @ 81E47A1 .string "People have to work together to get it\n" .string "to spin faster.\p" .string "The faster you can make it spin, the\n" - .string "better {POKEBLOCK}S you can get, I’ve heard.$" + .string "better {POKEBLOCK}S you can get, I've heard.$" LilycoveCity_Text_1E4824: @ 81E4824 - .string "It’s used for making a kind of candy\n" + .string "It's used for making a kind of candy\n" .string "called a {POKEBLOCK}.\p" .string "If you give a good {POKEBLOCK} to a POKéMON,\n" .string "its condition will improve by a lot.$" LilycoveCity_Text_1E48A5: @ 81E48A5 - .string "I heard there’s a tower somewhere out\n" + .string "I heard there's a tower somewhere out\n" .string "on the sea routes.\p" - .string "It’s called the SKY PILLAR, I hear.$" + .string "It's called the SKY PILLAR, I hear.$" LilycoveCity_Text_1E4902: @ 81E4902 .string "I saw this tall tower somewhere\n" diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index 945f01fb0..f6a53cc5e 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -314,12 +314,12 @@ LilycoveCity_ContestHall_Text_21B74E: @ 821B74E .string "My abilities scare even me…$" LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7 - .string "I’ve entered a bunch of CONTESTS,\n" - .string "so I’m seeing how things work.\p" - .string "If you’re in a COOLNESS CONTEST,\n" + .string "I've entered a bunch of CONTESTS,\n" + .string "so I'm seeing how things work.\p" + .string "If you're in a COOLNESS CONTEST,\n" .string "cool moves go over as appeals.\p" .string "But smart moves and cute moves\n" - .string "don’t go over well, for instance.$" + .string "don't go over well, for instance.$" LilycoveCity_ContestHall_Text_21B899: @ 821B899 .string "That young man who won earlier had\n" @@ -328,15 +328,15 @@ LilycoveCity_ContestHall_Text_21B899: @ 821B899 .string "of those things?$" LilycoveCity_ContestHall_Text_21B911: @ 821B911 - .string "Whoa, isn’t this place humongous!\p" - .string "The tension in the air… It’s not\n" + .string "Whoa, isn't this place humongous!\p" + .string "The tension in the air… It's not\n" .string "like a CONTEST hall in the sticks.$" LilycoveCity_ContestHall_Text_21B977: @ 821B977 .string "MC: Okay, SMART POKéMON and their\n" .string "TRAINERS, are you ready?!\p" .string "Give it your best showing!\n" - .string "Let’s appeal!$" + .string "Let's appeal!$" LilycoveCity_ContestHall_Text_21B9DC: @ 821B9DC .string "JUDGE: Are you enjoying this CONTEST?\p" @@ -352,33 +352,33 @@ LilycoveCity_ContestHall_Text_21BA44: @ 821BA44 .string "ROCK SMASH.$" LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5 - .string "I’ve spent many a year, and all my\n" + .string "I've spent many a year, and all my\n" .string "wisdom besides, raising this POKéMON\l" .string "to be smart.\p" - .string "It won’t be easily bested by some\n" - .string "young pup’s POKéMON.\p" + .string "It won't be easily bested by some\n" + .string "young pup's POKéMON.\p" .string "My dear wife, are you seeing this?$" LilycoveCity_ContestHall_Text_21BB84: @ 821BB84 .string "There it is!\p" .string "If my POKéMON pulls a smart move next,\n" - .string "the audience’s excitement will peak!$" + .string "the audience's excitement will peak!$" LilycoveCity_ContestHall_Text_21BBDD: @ 821BBDD .string "Oh, dear, no!\p" - .string "My darling ZUBAT’s LEECH LIFE is so\n" + .string "My darling ZUBAT's LEECH LIFE is so\n" .string "cute I kept using it over and over!\p" - .string "But these mean people don’t appreciate\n" + .string "But these mean people don't appreciate\n" .string "it at all!$" LilycoveCity_ContestHall_Text_21BC65: @ 821BC65 - .string "Kiyaaah! You’re beautiful, Grandpa!$" + .string "Kiyaaah! You're beautiful, Grandpa!$" LilycoveCity_ContestHall_Text_21BC89: @ 821BC89 .string "Even when TRAINERS enter the same\n" .string "kind of POKéMON, they all seem to use\l" .string "different moves for appeals.\p" - .string "It’s just like the way people have\n" + .string "It's just like the way people have\n" .string "different styles for battling.$" LilycoveCity_ContestHall_Text_21BD30: @ 821BD30 @@ -386,10 +386,10 @@ LilycoveCity_ContestHall_Text_21BD30: @ 821BD30 .string "than their TRAINERS. By a lot.$" LilycoveCity_ContestHall_Text_21BD70: @ 821BD70 - .string "When all’s said and done, I still love\n" + .string "When all's said and done, I still love\n" .string "SMARTNESS CONTESTS.\p" .string "That intellectual green color…\n" - .string "It’s so… So… Cool.$" + .string "It's so… So… Cool.$" LilycoveCity_ContestHall_Text_21BDDD: @ 821BDDD .string "MC: Are you entering the BEAUTY\n" @@ -402,8 +402,8 @@ LilycoveCity_ContestHall_Text_21BE16: @ 821BE16 LilycoveCity_ContestHall_Text_21BE77: @ 821BE77 .string "A POKéMON this beautiful…\n" - .string "There isn’t another one like it.\p" - .string "Everyone’s eyes will be glued to\n" + .string "There isn't another one like it.\p" + .string "Everyone's eyes will be glued to\n" .string "my beauty.$" LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE @@ -411,14 +411,14 @@ LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE .string "I brushed and groomed my POKéMON\n" .string "carefully for this CONTEST…\p" .string "But I overdid it…\n" - .string "My POKéMON’s coat turned all scraggly…\p" + .string "My POKéMON's coat turned all scraggly…\p" .string "What should I do?$" LilycoveCity_ContestHall_Text_21BF6E: @ 821BF6E .string "This AURORA BEAM is so dazzling,\n" - .string "the JUDGE won’t be able to see it.\p" + .string "the JUDGE won't be able to see it.\p" .string "Uh, wait a second…\n" - .string "That’ll be meaningless, then!$" + .string "That'll be meaningless, then!$" LilycoveCity_ContestHall_Text_21BFE3: @ 821BFE3 .string "This pretty POKéMON looks just like\n" @@ -439,14 +439,14 @@ LilycoveCity_ContestHall_Text_21C0D8: @ 821C0D8 .string "I just love this sort of glitz!$" LilycoveCity_ContestHall_Text_21C137: @ 821C137 - .string "You can’t always win on just beauty\n" + .string "You can't always win on just beauty\n" .string "alone.\p" .string "You have to groom your POKéMON so\n" - .string "it’s nice and glossy like mine.$" + .string "it's nice and glossy like mine.$" LilycoveCity_ContestHall_Text_21C1A4: @ 821C1A4 .string "MC: Uh-oh! Hello!\n" - .string "We’re in the middle of a CONTEST!\p" + .string "We're in the middle of a CONTEST!\p" .string "Please enter at our registration\n" .string "counter and come out, okay?$" @@ -465,16 +465,16 @@ LilycoveCity_ContestHall_Text_21C2BB: @ 821C2BB .string "but put it in a CONTEST and look out!$" LilycoveCity_ContestHall_Text_21C307: @ 821C307 - .string "My POKéMON’s PETAL DANCE is a marvel\n" + .string "My POKéMON's PETAL DANCE is a marvel\n" .string "of elegance.\p" - .string "I won’t let anyone disturb its\n" + .string "I won't let anyone disturb its\n" .string "performance.$" LilycoveCity_ContestHall_Text_21C365: @ 821C365 - .string "Everyone’s POKéMON are very cute.\p" + .string "Everyone's POKéMON are very cute.\p" .string "However, if my POKéMON were to make\n" .string "a cute appeal…\p" - .string "I’m sure that it would be so much \n" + .string "I'm sure that it would be so much \n" .string "cuter than the others.$" LilycoveCity_ContestHall_Text_21C3F4: @ 821C3F4 @@ -487,13 +487,13 @@ LilycoveCity_ContestHall_Text_21C411: @ 821C411 LilycoveCity_ContestHall_Text_21C445: @ 821C445 .string "I think that girl over there is\n" .string "the cutest of the lot.\p" - .string "What’s that? They’re judging\n" + .string "What's that? They're judging\n" .string "POKéMON by their looks?$" LilycoveCity_ContestHall_Text_21C4B1: @ 821C4B1 .string "Ohh, seeing all these cute POKéMON,\n" .string "they make we want to get my own!\p" - .string "I’m going to go catch some!$" + .string "I'm going to go catch some!$" LilycoveCity_ContestHall_Text_21C512: @ 821C512 .string "BEAUTY CONTEST STAGE\n" diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 16c4dd915..a849925bd 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1031,15 +1031,15 @@ LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9 .string "Congratulations!\p" .string "I did a painting of your POKéMON to\n" .string "commemorate its victory…\p" - .string "Well, your POKéMON’s appeals were\n" + .string "Well, your POKéMON's appeals were\n" .string "so fantastic, it spurred me into\l" .string "painting better than I usually do.\l" .string "Look, see?$" LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78 - .string "What do you think? I’m confident in\n" - .string "what I’ve done, but do you like it?\p" - .string "A work of this caliber, it wouldn’t look\n" + .string "What do you think? I'm confident in\n" + .string "what I've done, but do you like it?\p" + .string "A work of this caliber, it wouldn't look\n" .string "out of place in an art museum.\p" .string "Huh? An art museum really is looking\n" .string "for paintings?\p" @@ -1048,14 +1048,14 @@ LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78 LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63 .string "What, really? Then, sure, I will take\n" .string "this painting there right now.\p" - .string "I’ll give it a proper title, too.\p" - .string "I hope they’ll like it and consider\n" + .string "I'll give it a proper title, too.\p" + .string "I hope they'll like it and consider\n" .string "exhibiting this.\p" .string "Please check if they did accept this.\n" .string "Thank you!$" LilycoveCity_ContestLobby_Text_21B030: @ 821B030 - .string "Oh, that’s right!\p" + .string "Oh, that's right!\p" .string "As a memento of me painting your\n" .string "POKéMON, please take this.$" @@ -1070,15 +1070,15 @@ LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD .string "Okay, see you!$" LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC - .string "Oh… Then, I guess I’ll just take\n" + .string "Oh… Then, I guess I'll just take\n" .string "this home with me…\p" .string "But, you know, I would like to take\n" .string "this to the art museum… Okay?$" LilycoveCity_ContestLobby_Text_21B132: @ 821B132 - .string "Oh, fine, that’s the way it is.\n" + .string "Oh, fine, that's the way it is.\n" .string "I will hang this in my own house.\p" - .string "I’ll just have to try harder next time.\n" + .string "I'll just have to try harder next time.\n" .string "Well, be seeing you.$" LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1 @@ -1092,7 +1092,7 @@ LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1 LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D .string "You can see a whole variety of\n" .string "POKéMON here.\p" - .string "That’s why I make this place a regular\n" + .string "That's why I make this place a regular\n" .string "part of my daily stroll.$" LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 9b434a0c2..18ef70cfd 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -79,7 +79,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 .string "Hm, so they doubled the guests by\n" .string "using POKéMON as attractions?\p" .string "Hm, well, maybe I should make a cute\n" - .string "POKéMON our inn’s mascot.\p" + .string "POKéMON our inn's mascot.\p" .string "I wonder if that will attract more\n" .string "guests to stay with us?$" @@ -91,12 +91,12 @@ LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B .string "Hey, down in front!\n" - .string "I can’t see the TV!$" + .string "I can't see the TV!$" LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3 - .string "Amazing! You’re telling me a POKéMON\n" - .string "found someone’s lost item?\p" - .string "That’s something. If we had some smart\n" + .string "Amazing! You're telling me a POKéMON\n" + .string "found someone's lost item?\p" + .string "That's something. If we had some smart\n" .string "POKéMON like that…\p" .string "We could recover anything that our\n" .string "guests mislaid…$" @@ -114,7 +114,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470 LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544 .string "Amazing! A house-sitting POKéMON\n" .string "caught a burglar?\p" - .string "That’s something. If we had a tough\n" + .string "That's something. If we had a tough\n" .string "POKéMON as a security guard…\p" .string "We would be able to provide our guests\n" .string "with greater safety.$" @@ -126,6 +126,6 @@ LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4 .string "a little while ago.\p" .string "They booked in as GAME FREAK,\n" .string "so I guess they must make games.\p" - .string "Uh-oh, I’d better get working on\n" + .string "Uh-oh, I'd better get working on\n" .string "their dinner!$" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index f92df5b42..33f67ff9a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -71,40 +71,40 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A end LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774 - .string "I’m the GAME DESIGNER.\p" + .string "I'm the GAME DESIGNER.\p" .string "Oh, is that right?\n" - .string "You’re working on a POKéDEX?\p" - .string "It’s tough trying to complete it,\n" - .string "but don’t give up.\p" + .string "You're working on a POKéDEX?\p" + .string "It's tough trying to complete it,\n" + .string "but don't give up.\p" .string "If you do complete it, please come\n" .string "show me.$" LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C - .string "Wow! That’s awesome!\n" - .string "Yep, it’s totally awesome!\p" + .string "Wow! That's awesome!\n" + .string "Yep, it's totally awesome!\p" .string "This POKéDEX is completely filled!\n" .string "You really must love POKéMON!\p" - .string "I’m so impressed!\p" + .string "I'm so impressed!\p" .string "Let me give you something in\n" .string "recognition of your feat!$" LilycoveCity_CoveLilyMotel_2F_Text_2188D6: @ 82188D6 - .string "Me? You’re talking to me?\n" - .string "I’m the PROGRAMMER.\p" + .string "Me? You're talking to me?\n" + .string "I'm the PROGRAMMER.\p" .string "I wonder what the SLOTS are\n" .string "like here.$" LilycoveCity_CoveLilyMotel_2F_Text_21892B: @ 821892B - .string "I’m the GRAPHIC ARTIST! Aren’t the\n" + .string "I'm the GRAPHIC ARTIST! Aren't the\n" .string "POKéMON of HOENN interesting?$" LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C - .string "The girl TUBERS, they’re cute, hey?\n" + .string "The girl TUBERS, they're cute, hey?\n" .string "To battle against a cute TUBER…\p" - .string "Whoop, it’s so awesome!\p" - .string "And the TWINS! Aren’t they cute?\n" + .string "Whoop, it's so awesome!\p" + .string "And the TWINS! Aren't they cute?\n" .string "A 2-on-2 battle with TWINS…\p" - .string "Whoop, it’s unbearably fun!$" + .string "Whoop, it's unbearably fun!$" LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21 .string "The sea breeze tickles my heart.\n" @@ -113,7 +113,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21 LilycoveCity_CoveLilyMotel_2F_Text_218A5B: @ 8218A5B .string "You never know when and where\n" .string "people will challenge you.\p" - .string "That’s why I never leave home without\n" + .string "That's why I never leave home without\n" .string "my GAME BOY ADVANCE.$" LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF @@ -127,8 +127,8 @@ LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF .string "entertaining, but…\p" .string "Consider me a purist--I prefer\n" .string "battles and tough TRAINERS.\p" - .string "But that’s just me.\p" - .string "{PLAYER}{KUN}, I hope you’ll enjoy everything\n" + .string "But that's just me.\p" + .string "{PLAYER}{KUN}, I hope you'll enjoy everything\n" .string "like the GYMS, CONTESTS, BATTLE TENT,\l" .string "the whole works!$" @@ -136,5 +136,5 @@ LilycoveCity_CoveLilyMotel_2F_Text_218C33: @ 8218C33 .string "SCOTT: I think it does take strategy\n" .string "to win a CONTEST.\p" .string "Devising CONTEST strategies is one way\n" - .string "of becoming a better TRAINER, I’d say.$" + .string "of becoming a better TRAINER, I'd say.$" diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index e683b8d07..dbb552409 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -203,22 +203,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22045E:: @ 822045E end LilycoveCity_DepartmentStoreRooftop_Text_220463: @ 8220463 - .string "Don’t they have set dates for their\n" + .string "Don't they have set dates for their\n" .string "clear-out sales?\p" .string "I watch TV, but they never show any\n" .string "commercials.$" LilycoveCity_DepartmentStoreRooftop_Text_2204C9: @ 82204C9 - .string "Yes! I’ve been waiting a long time for\n" + .string "Yes! I've been waiting a long time for\n" .string "this clear-out sale.\p" .string "They have items that you can only get\n" - .string "here. I’m going to load up, that I am!$" + .string "here. I'm going to load up, that I am!$" LilycoveCity_DepartmentStoreRooftop_Text_220552: @ 8220552 - .string "Ohh… I’m bone-dry thirsty!$" + .string "Ohh… I'm bone-dry thirsty!$" LilycoveCity_DepartmentStoreRooftop_Text_22056D: @ 822056D - .string "It’s a VENDING MACHINE.\n" + .string "It's a VENDING MACHINE.\n" .string "Which drink would you like?$" LilycoveCity_DepartmentStoreRooftop_Text_2205A1: @ 82205A1 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 942adedc8..fece7f16e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -156,14 +156,14 @@ LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866 LilycoveCity_DepartmentStore_1F_Text_21F88C: @ 821F88C .string "Whenever I come to the DEPARTMENT\n" .string "STORE, I always end up buying all sorts\l" - .string "of things because it’s so fun.$" + .string "of things because it's so fun.$" LilycoveCity_DepartmentStore_1F_Text_21F8F5: @ 821F8F5 .string "Today, my mom is going to buy me some\n" .string "nice furniture.$" LilycoveCity_DepartmentStore_1F_Text_21F92B: @ 821F92B - .string "I’m buying something for my AZUMARILL\n" + .string "I'm buying something for my AZUMARILL\n" .string "as a reward for winning a CONTEST.$" LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974 @@ -172,7 +172,7 @@ LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974 LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A .string "1F: SERVICE COUNTER\n" .string " LOTTERY CORNER\p" - .string "2F: TRAINER’S ZONE\p" + .string "2F: TRAINER'S ZONE\p" .string "3F: BATTLE COLLECTION\p" .string "4F: TM CORNER\p" .string "5F: POKé DOLL FLOOR\p" @@ -180,12 +180,12 @@ LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13 .string "Wireless Communication is a\n" - .string "lot of fun, isn’t it?\p" + .string "lot of fun, isn't it?\p" .string "I think it lets you do things that\n" - .string "weren’t possible before.\p" + .string "weren't possible before.\p" .string "For instance, you can now trade\n" - .string "with people you couldn’t before.\p" - .string "I think it’s going to be exciting!$" + .string "with people you couldn't before.\p" + .string "I think it's going to be exciting!$" LilycoveCity_DepartmentStore_1F_Text_21FAE5: @ 821FAE5 .string "I want to spread the word about how\n" diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index ca163acdd..4d4edf373 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -68,13 +68,13 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94 LilycoveCity_DepartmentStore_2F_Text_21FBAC: @ 821FBAC .string "Learn to use items properly.\n" - .string "That’s basic, really.$" + .string "That's basic, really.$" LilycoveCity_DepartmentStore_2F_Text_21FBDF: @ 821FBDF .string "My husband is waiting at home.\n" .string "What would make a good gift for him?$" LilycoveCity_DepartmentStore_2F_Text_21FC23: @ 821FC23 - .string "I’m leaving on a long journey soon.\n" + .string "I'm leaving on a long journey soon.\n" .string "I need to stock up on items.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index 8ecf415cd..053ff4632 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -66,7 +66,7 @@ LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1 LilycoveCity_DepartmentStore_3F_Text_21FD3B: @ 821FD3B .string "I want my POKéMON to have more\n" .string "endurance.\p" - .string "I’m trying to decide whether to raise\n" + .string "I'm trying to decide whether to raise\n" .string "DEFENSE with IRON, or SP. DEF with ZINC.$" LilycoveCity_DepartmentStore_3F_Text_21FDB4: @ 821FDB4 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index cee1cb0b7..d78baaf3d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -57,7 +57,7 @@ LilycoveCity_DepartmentStore_4F_Text_21FE50: @ 821FE50 .string "Hmm…\p" .string "An attacking move…\n" .string "Or a defensive move…\p" - .string "It’s no easy matter to decide which TM\n" + .string "It's no easy matter to decide which TM\n" .string "moves should be taught to POKéMON…$" LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7 @@ -67,6 +67,6 @@ LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7 .string "different kinds.$" LilycoveCity_DepartmentStore_4F_Text_21FF2D: @ 821FF2D - .string "I’d like to get all the different TMs,\n" + .string "I'd like to get all the different TMs,\n" .string "but a POKéMON learns only four moves.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index b7155e9e4..9f55dbc04 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -156,13 +156,13 @@ LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5 .string "just for my children.$" LilycoveCity_DepartmentStore_5F_Text_220122: @ 8220122 - .string "I’m not big enough to raise POKéMON,\n" - .string "so I’m getting a cute DOLL instead.$" + .string "I'm not big enough to raise POKéMON,\n" + .string "so I'm getting a cute DOLL instead.$" LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B .string "They sell many cute MATS here.\p" .string "I wonder which one I should get?\n" - .string "Maybe I’ll buy them all…$" + .string "Maybe I'll buy them all…$" LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4 .string "I think they closed the rooftop\n" diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index e537acb92..67ef01e09 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -579,8 +579,8 @@ LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1 .string "I beg your pardon?\n" - .string "You’re looking for a ship?\p" - .string "I’m sorry, the ferry service isn’t\n" + .string "You're looking for a ship?\p" + .string "I'm sorry, the ferry service isn't\n" .string "available at present…$" LilycoveCity_Harbor_Text_21E758: @ 821E758 @@ -589,14 +589,14 @@ LilycoveCity_Harbor_Text_21E758: @ 821E758 LilycoveCity_Harbor_Text_21E792: @ 821E792 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" + .string "{PLAYER} doesn't have the TICKET…\p" + .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" + .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" LilycoveCity_Harbor_Text_21E842: @ 821E842 @@ -618,13 +618,13 @@ LilycoveCity_Harbor_Text_21E8CC: @ 821E8CC LilycoveCity_Harbor_Text_21E8EE: @ 821E8EE .string "Until they finish making the ferry,\n" .string "we sailors have nothing to do…\p" - .string "I wish they’d get a move on, the folks\n" + .string "I wish they'd get a move on, the folks\n" .string "at the SHIPYARD in SLATEPORT.$" LilycoveCity_Harbor_Text_21E976: @ 821E976 .string "The ferry S.S. TIDAL is finally in\n" .string "operation.\p" .string "The folks at the SHIPYARD in SLATEPORT\n" - .string "must’ve worked extra hard.\p" - .string "Well, it’s my turn to get busy now!$" + .string "must've worked extra hard.\p" + .string "Well, it's my turn to get busy now!$" diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc index 1484a6a1f..ce09fa3dc 100644 --- a/data/maps/LilycoveCity_House1/scripts.inc +++ b/data/maps/LilycoveCity_House1/scripts.inc @@ -17,7 +17,7 @@ LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 LilycoveCity_House1_Text_21ECEA: @ 821ECEA .string "POKéMON are partners to people.\n" - .string "They aren’t our tools.\p" + .string "They aren't our tools.\p" .string "Unfortunately, there are some people\n" .string "who fail to understand that…$" diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 2a78e6df5..6069f0fa7 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -21,8 +21,8 @@ LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC end LilycoveCity_House2_Text_21EDB6: @ 821EDB6 - .string "Huh? What? What’s that?\p" - .string "I’m not near awake yet…\n" + .string "Huh? What? What's that?\p" + .string "I'm not near awake yet…\n" .string "You can have this…$" LilycoveCity_House2_Text_21EDF9: @ 821EDF9 diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index a05403de3..8c3f4f7ab 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -100,10 +100,10 @@ LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F LilycoveCity_House3_Text_21EF99: @ 821EF99 .string "Oh, my, my! Are you traveling alone?\n" - .string "But you’re so young! Good for you!\p" - .string "I’m sure my kids could learn a thing\n" + .string "But you're so young! Good for you!\p" + .string "I'm sure my kids could learn a thing\n" .string "or two from you!\p" - .string "Me? I’m a master of {POKEBLOCK}S.\p" + .string "Me? I'm a master of {POKEBLOCK}S.\p" .string "If I get serious just a little, why,\n" .string "I can concoct great {POKEBLOCK}S.\p" .string "Would you like to learn from me,\n" @@ -111,17 +111,17 @@ LilycoveCity_House3_Text_21EF99: @ 821EF99 LilycoveCity_House3_Text_21F0A9: @ 821F0A9 .string "Oh? Are you sure?\p" - .string "You shouldn’t always try to do\n" + .string "You shouldn't always try to do\n" .string "everything by yourself, dear!$" LilycoveCity_House3_Text_21F0F8: @ 821F0F8 - .string "Oh, good! You’re a smart soul!\n" + .string "Oh, good! You're a smart soul!\n" .string "This is a bit long, so listen up!\p" .string "Are you ready?\p" .string "If you look at {POKEBLOCK}S, you should see\n" .string "that they are rated on how they feel.\p" .string "The lower the feel rating,\n" - .string "the better it is. Don’t forget this!\p" + .string "the better it is. Don't forget this!\p" .string "A good {POKEBLOCK} has a low feel\n" .string "rating and a high level.\p" .string "A POKéMON can eat more good\n" @@ -129,19 +129,19 @@ LilycoveCity_House3_Text_21F0F8: @ 821F0F8 .string "And this is important.\p" .string "If you want to make smooth {POKEBLOCK}S,\n" .string "use different kinds of BERRIES.\p" - .string "Don’t be stingy--the kinds of BERRIES\n" + .string "Don't be stingy--the kinds of BERRIES\n" .string "affect the smoothness of {POKEBLOCK}S.\p" .string "And another thing.\p" .string "The more people blending BERRIES,\n" .string "the smoother the {POKEBLOCK}S.\p" - .string "That’s why you should talk to other\n" + .string "That's why you should talk to other\n" .string "people and make {POKEBLOCK}S together.\p" - .string "That’s about all you need to know to\n" + .string "That's about all you need to know to\n" .string "make good {POKEBLOCK}S.\p" .string "If everyone had POKéMON they love,\n" .string "smooth {POKEBLOCK}S, and a loving family,\l" .string "the world would be a happier place.\p" - .string "Don’t give up, dear!$" + .string "Don't give up, dear!$" LilycoveCity_House3_Text_21F430: @ 821F430 .string "When my wife gave birth to quadruplets,\n" @@ -150,8 +150,8 @@ LilycoveCity_House3_Text_21F430: @ 821F430 .string "it makes me happy.$" LilycoveCity_House3_Text_21F4A7: @ 821F4A7 - .string "We’re having MULTI BATTLES, but I know\n" - .string "I’m going to win.$" + .string "We're having MULTI BATTLES, but I know\n" + .string "I'm going to win.$" LilycoveCity_House3_Text_21F4E0: @ 821F4E0 .string "We like mixing stuff at\n" @@ -159,11 +159,11 @@ LilycoveCity_House3_Text_21F4E0: @ 821F4E0 .string "But what gets mixed up?$" LilycoveCity_House3_Text_21F523: @ 821F523 - .string "We’re going to make super {POKEBLOCK}S\n" + .string "We're going to make super {POKEBLOCK}S\n" .string "with a BERRY BLENDER!$" LilycoveCity_House3_Text_21F55A: @ 821F55A .string "I want to brag about how tough my\n" - .string "POKéMON is, so we’re going to enter\l" + .string "POKéMON is, so we're going to enter\l" .string "a CONTEST together.$" diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc index e3feb8e25..2306ff6df 100644 --- a/data/maps/LilycoveCity_House4/scripts.inc +++ b/data/maps/LilycoveCity_House4/scripts.inc @@ -10,12 +10,12 @@ LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE end LilycoveCity_House4_Text_21F5C7: @ 821F5C7 - .string "This planet’s biggest mysteries are\n" + .string "This planet's biggest mysteries are\n" .string "at the bottom of the sea.\p" - .string "Somebody said that, but I don’t know…$" + .string "Somebody said that, but I don't know…$" LilycoveCity_House4_Text_21F62B: @ 821F62B - .string "There’s a deep underwater trench\n" + .string "There's a deep underwater trench\n" .string "between MOSSDEEP and SOOTOPOLIS.\p" - .string "That’s what someone told me, anyway.$" + .string "That's what someone told me, anyway.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 9a7e466f0..f56102a99 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -170,9 +170,9 @@ LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B .string "featuring POKéMON.$" LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC - .string "I’m the CURATOR of this MUSEUM of\n" + .string "I'm the CURATOR of this MUSEUM of\n" .string "fine arts.\p" - .string "It’s heartening to see someone so\n" + .string "It's heartening to see someone so\n" .string "young as you in our MUSEUM.\p" .string "Have you viewed our collection of\n" .string "paintings already?$" @@ -189,7 +189,7 @@ LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98 LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8 .string "I see…\p" - .string "I’m honored that you would visit\n" + .string "I'm honored that you would visit\n" .string "us in spite of that.$" LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035 @@ -198,46 +198,46 @@ LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035 .string "Then, may I ask you to come with me?$" LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080 - .string "It’s a very old painting.\n" + .string "It's a very old painting.\n" .string "The paint is peeling here and there.$" LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF - .string "It’s an odd landscape with bizarre\n" + .string "It's an odd landscape with bizarre\n" .string "and fantastic scenery.$" LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9 - .string "It’s a painting of a beautiful, smiling\n" + .string "It's a painting of a beautiful, smiling\n" .string "woman with a POKéMON on her lap.$" LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142 - .string "It’s a painting of a legendary POKéMON\n" + .string "It's a painting of a legendary POKéMON\n" .string "from long ago.\p" .string "The artist painted this from\n" .string "imagination.$" LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2 - .string "It’s a painting of GRASS POKéMON\n" + .string "It's a painting of GRASS POKéMON\n" .string "swaying in a breeze.\p" - .string "They appear to be enjoying the wind’s\n" + .string "They appear to be enjoying the wind's\n" .string "gentle caress.$" LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D - .string "It’s a delicious-looking painting\n" + .string "It's a delicious-looking painting\n" .string "of BERRIES.\p" .string "This painting could make you hungry!$" LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260 - .string "It’s a replica of a famous sculpture.\p" + .string "It's a replica of a famous sculpture.\p" .string "It depicts an ancient BIRD POKéMON.$" LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA - .string "It’s a big POKé BALL carved from\n" + .string "It's a big POKé BALL carved from\n" .string "a black stone.\p" .string "It was apparently used in festivals\n" .string "in the olden days.$" LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311 - .string "It’s a huge stone tablet inscribed\n" + .string "It's a huge stone tablet inscribed\n" .string "with POKéMON and dense text in the\l" .string "small characters of an ancient,\l" .string "unreadable language.$" @@ -248,8 +248,8 @@ LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4 .string "Battling with POKéMON is fun,\n" - .string "I’ll grant you that.\p" - .string "But one mustn’t forget our love for\n" + .string "I'll grant you that.\p" + .string "But one mustn't forget our love for\n" .string "the fine arts.$" LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A @@ -261,14 +261,14 @@ LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA .string "This lady is pretty!\n" - .string "She’s like Mommy!$" + .string "She's like Mommy!$" LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1 .string "This POKéMON is adorable!\n" .string "Just like our little boy!$" LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515 - .string "I’d heard that this ART MUSEUM got\n" + .string "I'd heard that this ART MUSEUM got\n" .string "in some new paintings.\p" .string "So, naturally I hurried over.\p" .string "Are the new paintings up on\n" @@ -289,8 +289,8 @@ LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A .string "The ART MUSEUM has become a favorite\n" .string "tourist destination.\p" - .string "It’s great for LILYCOVE…\n" + .string "It's great for LILYCOVE…\n" .string "No, great for the HOENN region!\p" - .string "This is what I’ve heard--a lone TRAINER\n" + .string "This is what I've heard--a lone TRAINER\n" .string "procured all the paintings upstairs.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index a09d304b4..5f2b64aec 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -232,7 +232,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D .string "As you can plainly see, there is not\n" .string "a single painting on exhibit.\p" - .string "Here, I don’t wish to exhibit works of\n" + .string "Here, I don't wish to exhibit works of\n" .string "so-called classical art.\p" .string "Such classical works you can see on\n" .string "our ground floor.\p" @@ -246,7 +246,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D .string "forth into glorious life!$" LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4 - .string "I beg your pardon. I didn’t intend\n" + .string "I beg your pardon. I didn't intend\n" .string "to monopolize the conversation.\p" .string "Now, as you are young, and yet\n" .string "obviously well traveled…\p" @@ -254,7 +254,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4 .string "and works of art depicting them.\p" .string "If you were to come across such\n" .string "a painting, may we ask you to obtain\l" - .string "the artist’s permission to exhibit\l" + .string "the artist's permission to exhibit\l" .string "it here?$" LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3 @@ -263,18 +263,18 @@ LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3 .string "POKéMON.$" LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42 - .string "Thanks to you, we’ve added a new\n" + .string "Thanks to you, we've added a new\n" .string "painting to our collection!\p" - .string "I’ve heard it depicts your POKéMON.\n" + .string "I've heard it depicts your POKéMON.\n" .string "Truly magnificent!\p" .string "Thank you so very, very much!$" LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4 - .string "Ah! It’s you!\n" + .string "Ah! It's you!\n" .string "{PLAYER}!$" LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6 - .string "Isn’t this marvelous?\n" + .string "Isn't this marvelous?\n" .string "This collection of paintings!\p" .string "Each one of them flawless!\n" .string "None better than another!\p" @@ -292,36 +292,36 @@ LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B .string "Ah, so good to see you, {PLAYER}!\p" - .string "It’s an honor to have you visit us\n" + .string "It's an honor to have you visit us\n" .string "on your busy journeys.\p" .string "Please, relax and do enjoy your\n" .string "visit with us.$" LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0 - .string "It’s a picture frame with pink-colored\n" + .string "It's a picture frame with pink-colored\n" .string "adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3 - .string "It’s a picture frame with\n" + .string "It's a picture frame with\n" .string "yellow-colored adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008 - .string "It’s a picture frame with\n" + .string "It's a picture frame with\n" .string "blue-colored adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B - .string "It’s a picture frame with\n" + .string "It's a picture frame with\n" .string "red-colored adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D - .string "It’s a picture frame with\n" + .string "It's a picture frame with\n" .string "green-colored adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1 - .string "It’s a painting of POKéMON.$" + .string "It's a painting of POKéMON.$" LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD - .string "I’ve been away awhile, so the new\n" + .string "I've been away awhile, so the new\n" .string "paintings up here surprised me.\p" .string "I wish someone would paint my POKéMON\n" .string "this pretty.$" @@ -335,6 +335,6 @@ LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132 LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8 .string "Wow, is that right?\n" .string "These paintings are of your POKéMON.\p" - .string "Isn’t that just the ultimate joy for\n" + .string "Isn't that just the ultimate joy for\n" .string "a TRAINER?$" diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index aa69aa7ec..160dab557 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -73,7 +73,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0 LilycoveCity_MoveDeletersHouse_Text_21EAFD: @ 821EAFD .string "Uh…\n" - .string "Oh, yes, I’m the MOVE DELETER.\p" + .string "Oh, yes, I'm the MOVE DELETER.\p" .string "I can make POKéMON forget their moves.\p" .string "Would you like me to do that?$" @@ -85,10 +85,10 @@ LilycoveCity_MoveDeletersHouse_Text_21EB89: @ 821EB89 LilycoveCity_MoveDeletersHouse_Text_21EBA9: @ 821EBA9 .string "{STR_VAR_1} knows only one move\n" - .string "so it can’t be forgotten…$" + .string "so it can't be forgotten…$" LilycoveCity_MoveDeletersHouse_Text_21EBDA: @ 821EBDA - .string "Hm! {STR_VAR_1}’s {STR_VAR_2}?\n" + .string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n" .string "That move should be forgotten?$" LilycoveCity_MoveDeletersHouse_Text_21EC06: @ 821EC06 @@ -106,6 +106,6 @@ LilycoveCity_MoveDeletersHouse_Text_21EC78: @ 821EC78 LilycoveCity_MoveDeletersHouse_Text_21EC9C: @ 821EC9C .string "Hm!\p" - .string "Your {STR_VAR_1} doesn’t seem willing\n" + .string "Your {STR_VAR_1} doesn't seem willing\n" .string "to forget SURF.$" diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 0f643ad3e..5e51f7daa 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -53,16 +53,16 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614 LilycoveCity_PokemonCenter_1F_Text_21C61E: @ 821C61E .string "I wonder how many kinds of POKéMON\n" .string "there are in the world.\p" - .string "It’d be great to cross seas and\n" + .string "It'd be great to cross seas and\n" .string "trade POKéMON with people far away.$" LilycoveCity_PokemonCenter_1F_Text_21C69D: @ 821C69D - .string "I’ve been hearing about some rotten\n" + .string "I've been hearing about some rotten\n" .string "scoundrels who steal POKéMON and rip\l" .string "off METEORITES.$" LilycoveCity_PokemonCenter_1F_Text_21C6F6: @ 821C6F6 .string "Those rotten scoundrels who steal\n" .string "POKéMON and rip off METEORITES…\p" - .string "I haven’t seen them around recently.$" + .string "I haven't seen them around recently.$" diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index e8fc1886c..d4c0f4cea 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -612,50 +612,50 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00 .string "Oh, wow!\n" - .string "It’s {PLAYER}!$" + .string "It's {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12 - .string "I’ve heard the news!\n" - .string "You’re really strong, aren’t you?\p" + .string "I've heard the news!\n" + .string "You're really strong, aren't you?\p" .string "We always argue about who is the\n" .string "strongest of all TRAINERS here.\p" .string "So when I heard about you, I decided\n" .string "to be your fan!\p" - .string "I hope you’ll keep on battling other\n" + .string "I hope you'll keep on battling other\n" .string "tough TRAINERS.\p" - .string "That way, we’ll be able to see more\n" + .string "That way, we'll be able to see more\n" .string "of your hot, hot battles.\p" .string "That will make the others here see\n" .string "exactly how great you are.\p" - .string "Remember, I’m cheering for you,\n" + .string "Remember, I'm cheering for you,\n" .string "{PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_21D094: @ 821D094 .string "Yo, {PLAYER}!\n" - .string "You’re the one we want to win!$" + .string "You're the one we want to win!$" LilycoveCity_PokemonTrainerFanClub_Text_21D0BB: @ 821D0BB - .string "The others, they don’t know that\n" - .string "you’re the best of the best!\p" - .string "Isn’t that right, {PLAYER}?\n" - .string "Show them you’ve got guts!$" + .string "The others, they don't know that\n" + .string "you're the best of the best!\p" + .string "Isn't that right, {PLAYER}?\n" + .string "Show them you've got guts!$" LilycoveCity_PokemonTrainerFanClub_Text_21D12A: @ 821D12A .string "I hate to say this, but the TRAINER\n" - .string "everybody’s talking about is\l" + .string "everybody's talking about is\l" .string "{STR_VAR_1}, no question about it!\p" - .string "That TRAINER’s power…\n" - .string "It’s out of the ordinary.$" + .string "That TRAINER's power…\n" + .string "It's out of the ordinary.$" LilycoveCity_PokemonTrainerFanClub_Text_21D1B5: @ 821D1B5 - .string "Darn it… I’ve been telling people\n" + .string "Darn it… I've been telling people\n" .string "that {STR_VAR_1} is the best now…\p" .string "But no one wants to listen…$" LilycoveCity_PokemonTrainerFanClub_Text_21D20C: @ 821D20C - .string "I’ve been hearing things about\n" + .string "I've been hearing things about\n" .string "a tough new TRAINER.\p" - .string "This TRAINER’s supposed to be beating\n" + .string "This TRAINER's supposed to be beating\n" .string "GYM LEADERS, even.\p" .string "Do you know anything about this\n" .string "new TRAINER?$" @@ -664,37 +664,37 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D2A6: @ 821D2A6 .string "Oh!\n" .string "{PLAYER}!\p" .string "Go for it!\n" - .string "I’m pulling for you!$" + .string "I'm pulling for you!$" LilycoveCity_PokemonTrainerFanClub_Text_21D2CE: @ 821D2CE .string "Sigh…\n" .string "BRAWLY…\p" .string "Oh, no! Wait!\n" - .string "That’s not right! No, no, no!\p" - .string "I’m your fan through and through!\p" + .string "That's not right! No, no, no!\p" + .string "I'm your fan through and through!\p" .string "So make me proud!\n" .string "Go for it!$" LilycoveCity_PokemonTrainerFanClub_Text_21D347: @ 821D347 - .string "I can’t help it, I can only get to\n" + .string "I can't help it, I can only get to\n" .string "like BRAWLY…$" LilycoveCity_PokemonTrainerFanClub_Text_21D377: @ 821D377 .string "Nobody understands the charm of\n" .string "BRAWLY…\p" - .string "I don’t care!\p" - .string "Even if I’m the only one, I’m going\n" + .string "I don't care!\p" + .string "Even if I'm the only one, I'm going\n" .string "to keep cheering for BRAWLY!$" LilycoveCity_PokemonTrainerFanClub_Text_21D3EE: @ 821D3EE .string "Whatever anyone says, my favorite\n" - .string "TRAINER is DEWFORD’s GYM LEADER\l" + .string "TRAINER is DEWFORD's GYM LEADER\l" .string "BRAWLY!$" LilycoveCity_PokemonTrainerFanClub_Text_21D438: @ 821D438 - .string "You’ve surpassed your own father in\n" + .string "You've surpassed your own father in\n" .string "every regard!\p" - .string "I’m telling you, so there’s no question\n" + .string "I'm telling you, so there's no question\n" .string "about it at all!$" LilycoveCity_PokemonTrainerFanClub_Text_21D4A3: @ 821D4A3 @@ -708,20 +708,20 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D52E: @ 821D52E .string "NORMAN battled with more power,\n" .string "charisma, and showmanship than you.\p" .string "Even though people may say that\n" - .string "you’re strong…\p" - .string "You’ve still got a long way to go\n" + .string "you're strong…\p" + .string "You've still got a long way to go\n" .string "compared to your father.$" LilycoveCity_PokemonTrainerFanClub_Text_21D5DC: @ 821D5DC - .string "You’re beginning to get the same\n" + .string "You're beginning to get the same\n" .string "air of awe NORMAN exudes.\p" - .string "But there’s something conclusively\n" + .string "But there's something conclusively\n" .string "different between you and NORMAN.\p" - .string "I can’t tell you what that is.\n" - .string "You’ll have to find it yourself.$" + .string "I can't tell you what that is.\n" + .string "You'll have to find it yourself.$" LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C - .string "Everyone here, we’re all huge fans\n" + .string "Everyone here, we're all huge fans\n" .string "of POKéMON battles.\p" .string "We discuss who we consider to be\n" .string "the strongest of all TRAINERS.\p" @@ -729,16 +729,16 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C .string "we might even become your fans!$" LilycoveCity_PokemonTrainerFanClub_Text_21D751: @ 821D751 - .string "Oh, woweee! It’s {PLAYER}!\n" + .string "Oh, woweee! It's {PLAYER}!\n" .string "For real, too!\p" .string "Please, shake my hand, shake my hand!$" LilycoveCity_PokemonTrainerFanClub_Text_21D79B: @ 821D79B - .string "I’ll always cheer for you, {PLAYER}!\n" + .string "I'll always cheer for you, {PLAYER}!\n" .string "Always, always!\p" - .string "I don’t want to see you lose ever,\n" + .string "I don't want to see you lose ever,\n" .string "{PLAYER}.\p" - .string "Because I know you’re really,\n" + .string "Because I know you're really,\n" .string "really strong, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822 @@ -746,9 +746,9 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822 .string "Everyone thinks so, right, right?$" LilycoveCity_PokemonTrainerFanClub_Text_21D857: @ 821D857 - .string "{STR_VAR_1} really is cool, don’t\n" + .string "{STR_VAR_1} really is cool, don't\n" .string "you think so?\p" - .string "Even if it’s just me, I’m going to keep\n" + .string "Even if it's just me, I'm going to keep\n" .string "cheering my favorite TRAINER.$" LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4 @@ -759,14 +759,14 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4 .string "I wish there was a TRAINER like that…$" LilycoveCity_PokemonTrainerFanClub_Text_21D921: @ 821D921 - .string "Whoa! It’s {PLAYER}!\n" + .string "Whoa! It's {PLAYER}!\n" .string "Wicked!\p" .string "When I grow up, I want to be strong\n" .string "like you, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_21D96A: @ 821D96A - .string "Even if I’m the only one…\p" - .string "You’ll always be the only one\n" + .string "Even if I'm the only one…\p" + .string "You'll always be the only one\n" .string "I cheer for, {PLAYER}!\p" .string "Because I believe in you, {PLAYER}!$" @@ -775,10 +775,10 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D9D1: @ 821D9D1 .string "I want to shake hands with my hero.$" LilycoveCity_PokemonTrainerFanClub_Text_21DA0D: @ 821DA0D - .string "Even if I’m the only one…\p" - .string "I’m never going to stop being\n" - .string "{STR_VAR_1}’s fan!\p" - .string "Because I’ve heard, {STR_VAR_1}\n" + .string "Even if I'm the only one…\p" + .string "I'm never going to stop being\n" + .string "{STR_VAR_1}'s fan!\p" + .string "Because I've heard, {STR_VAR_1}\n" .string "never loses!$" LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73 @@ -786,54 +786,54 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73 .string "You are amazing after all!\p" .string "Ever since I set eyes on you,\n" .string "I knew that you were great.\p" - .string "It looks like my eyes didn’t deceive me.$" + .string "It looks like my eyes didn't deceive me.$" LilycoveCity_PokemonTrainerFanClub_Text_21DAF5: @ 821DAF5 .string "Who cares about the others.\n" - .string "I’m in your corner!\p" - .string "You don’t need to worry. Just get\n" + .string "I'm in your corner!\p" + .string "You don't need to worry. Just get\n" .string "out there and battle like always.$" LilycoveCity_PokemonTrainerFanClub_Text_21DB69: @ 821DB69 - .string "You’re a pretty decent TRAINER,\n" + .string "You're a pretty decent TRAINER,\n" .string "I think.\p" .string "But I also think that {STR_VAR_1}\n" .string "is number one right now.\p" - .string "That’s just my opinion.\n" - .string "Don’t worry about it too much.$" + .string "That's just my opinion.\n" + .string "Don't worry about it too much.$" LilycoveCity_PokemonTrainerFanClub_Text_21DBFB: @ 821DBFB .string "Wow, you really are strong.\n" .string "Maybe even stronger than {STR_VAR_1}.\p" .string "But {STR_VAR_1} needs me.\p" - .string "If I don’t cheer for {STR_VAR_1},\n" + .string "If I don't cheer for {STR_VAR_1},\n" .string "who will?$" LilycoveCity_PokemonTrainerFanClub_Text_21DC68: @ 821DC68 - .string "You’ve changed my mind!\n" - .string "You are strong, aren’t you?\p" - .string "I’d like you to tell me how you managed\n" + .string "You've changed my mind!\n" + .string "You are strong, aren't you?\p" + .string "I'd like you to tell me how you managed\n" .string "to get so strong!$" LilycoveCity_PokemonTrainerFanClub_Text_21DCD6: @ 821DCD6 .string "The tougher the situation, the more\n" .string "attractively you battle.\p" - .string "I can’t wait for your next battle!$" + .string "I can't wait for your next battle!$" LilycoveCity_PokemonTrainerFanClub_Text_21DD36: @ 821DD36 .string "Among the recently hot TRAINERS,\n" .string "{STR_VAR_1} is the standout.\p" - .string "That toughness, it’s simply not normal.\p" - .string "You’re doing okay, but you’re not in\n" + .string "That toughness, it's simply not normal.\p" + .string "You're doing okay, but you're not in\n" .string "the same class as {STR_VAR_1}.$" LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE .string "You are really popular…\p" - .string "You’re strong, and you’re caring to\n" + .string "You're strong, and you're caring to\n" .string "POKéMON. No one can knock you.\p" .string "But, you know, I believe in {STR_VAR_1}.\p" .string "{STR_VAR_1} is definitely stronger!\n" - .string "I’m positive!$" + .string "I'm positive!$" LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72 .string "You…\p" @@ -848,7 +848,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83 LilycoveCity_PokemonTrainerFanClub_Text_21DEFF: @ 821DEFF .string "Yes, I see strength in your eyes.\p" .string "But!\p" - .string "You still haven’t realized your\n" + .string "You still haven't realized your\n" .string "potential.$" LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 1f4e2593c..660a3984d 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -929,16 +929,16 @@ LittlerootTown_EventScript_1E8693:: @ 81E8693 return LittlerootTown_Text_1E86BC: @ 81E86BC - .string "MOM: {PLAYER}, we’re here, honey!\p" + .string "MOM: {PLAYER}, we're here, honey!\p" .string "It must be tiring riding with our things\n" .string "in the moving truck.\p" .string "Well, this is LITTLEROOT TOWN.\p" .string "How do you like it?\n" .string "This is our new home!\p" .string "It has a quaint feel, but it seems to be\n" - .string "an easy place to live, don’t you think?\p" + .string "an easy place to live, don't you think?\p" .string "And, you get your own room, {PLAYER}!\n" - .string "Let’s go inside.$" + .string "Let's go inside.$" LittlerootTown_Text_1E87E1: @ 81E87E1 .string "MOM: Wait, {PLAYER}!$" @@ -948,11 +948,11 @@ LittlerootTown_Text_1E87F0: @ 81E87F0 .string "introduce yourself to PROF. BIRCH?\p" .string "Oh! What an adorable POKéMON!\n" .string "You got it from PROF. BIRCH. How nice!\p" - .string "You’re your father’s child, all right.\n" + .string "You're your father's child, all right.\n" .string "You look good together with POKéMON!\p" - .string "Here, honey! If you’re going out on an\n" + .string "Here, honey! If you're going out on an\n" .string "adventure, wear these RUNNING SHOES.\p" - .string "They’ll put a zip in your step!$" + .string "They'll put a zip in your step!$" LittlerootTown_Text_1E8925: @ 81E8925 .string "{PLAYER} switched shoes with the\n" @@ -983,7 +983,7 @@ LittlerootTown_Text_1E8ACF: @ 81E8ACF LittlerootTown_Text_1E8B25: @ 81E8B25 .string "PROF. BIRCH spends days in his LAB\n" - .string "studying, then he’ll suddenly go out in\l" + .string "studying, then he'll suddenly go out in\l" .string "the wild to do more research…\p" .string "When does PROF. BIRCH spend time\n" .string "at home?$" @@ -994,21 +994,21 @@ LittlerootTown_Text_1E8BB8: @ 81E8BB8 .string "wild POKéMON will jump out!$" LittlerootTown_Text_1E8C07: @ 81E8C07 - .string "It’s dangerous if you don’t have\n" + .string "It's dangerous if you don't have\n" .string "your own POKéMON.$" LittlerootTown_Text_1E8C3A: @ 81E8C3A .string "Um, hi!\p" .string "There are scary POKéMON outside!\n" .string "I can hear their cries!\p" - .string "I want to go see what’s going on,\n" - .string "but I don’t have any POKéMON…\p" - .string "Can you go see what’s happening\n" + .string "I want to go see what's going on,\n" + .string "but I don't have any POKéMON…\p" + .string "Can you go see what's happening\n" .string "for me?$" LittlerootTown_Text_1E8CE3: @ 81E8CE3 .string "You saved PROF. BIRCH!\n" - .string "I’m so glad!$" + .string "I'm so glad!$" LittlerootTown_Text_1E8D07: @ 81E8D07 .string "Are you going to catch POKéMON?\n" @@ -1016,16 +1016,16 @@ LittlerootTown_Text_1E8D07: @ 81E8D07 LittlerootTown_Text_1E8D32: @ 81E8D32 .string "LITTLEROOT TOWN\n" - .string "“A town that can’t be shaded any hue.â€$" + .string "“A town that can't be shaded any hue.â€$" LittlerootTown_Text_1E8D69: @ 81E8D69 - .string "PROF. BIRCH’S POKéMON LAB$" + .string "PROF. BIRCH'S POKéMON LAB$" LittlerootTown_Text_1E8D83: @ 81E8D83 - .string "{PLAYER}’s HOUSE$" + .string "{PLAYER}'s HOUSE$" LittlerootTown_Text_1E8D8E: @ 81E8D8E - .string "PROF. BIRCH’S HOUSE$" + .string "PROF. BIRCH'S HOUSE$" LittlerootTown_Text_1E8DA2: @ 81E8DA2 .string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n" @@ -1036,5 +1036,5 @@ LittlerootTown_Text_1E8DA2: @ 81E8DA2 .string "Oh, yes. Do you still have the POKéDEX\n" .string "I gave you?\p" .string "I have something to show you.\n" - .string "Let’s go to my LAB.$" + .string "Let's go to my LAB.$" diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 4a0c9f082..4413a80d5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -296,21 +296,21 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C .string "MOM: See, {PLAYER}?\n" - .string "Isn’t it nice in here, too?$" + .string "Isn't it nice in here, too?$" LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46 - .string "The mover’s POKéMON do all the work\n" + .string "The mover's POKéMON do all the work\n" .string "of moving us in and cleaning up after.\l" .string "This is so convenient!\p" .string "{PLAYER}, your room is upstairs.\n" .string "Go check it out, dear!\p" .string "DAD bought you a new clock to mark\n" .string "our move here.\l" - .string "Don’t forget to set it!$" + .string "Don't forget to set it!$" LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24 .string "MOM: Well, {PLAYER}?\p" - .string "Aren’t you interested in seeing your\n" + .string "Aren't you interested in seeing your\n" .string "very own room?$" LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67 @@ -324,19 +324,19 @@ LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96 LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC - .string "MOM: Look! It’s PETALBURG GYM!\n" + .string "MOM: Look! It's PETALBURG GYM!\n" .string "Maybe DAD will be on!$" LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1 LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1 - .string "MOM: Oh… It’s over.\p" + .string "MOM: Oh… It's over.\p" .string "I think DAD was on, but we missed him.\n" .string "Too bad.$" LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35 LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35 .string "Oh, yes.\n" - .string "One of DAD’s friends lives in town.\p" + .string "One of DAD's friends lives in town.\p" .string "PROF. BIRCH is his name.\p" .string "He lives right next door, so you should\n" .string "go over and introduce yourself.$" @@ -358,10 +358,10 @@ LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73 .string "MOM: Oh? Did DAD give you that BADGE?\p" - .string "Then hereâ€™s something from your MOM!$" + .string "Then here's something from your MOM!$" LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE - .string "Don’t push yourself too hard, dear.\n" + .string "Don't push yourself too hard, dear.\n" .string "You can always come home.\p" .string "Go for it, honey!$" @@ -393,7 +393,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F .string "Better get going!$" LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 - .string "It’s the instruction booklet for the\n" + .string "It's the instruction booklet for the\n" .string "RUNNING SHOES.\p" .string "“Press the B Button to run while\n" .string "wearing your RUNNING SHOES.\p" @@ -402,11 +402,11 @@ LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E .string "DAD: Hm?\p" - .string "Hey, it’s {PLAYER}!\p" - .string "It’s been a while since I saw you,\n" + .string "Hey, it's {PLAYER}!\p" + .string "It's been a while since I saw you,\n" .string "but you look…stronger, somehow.\p" - .string "That’s the impression I get.\n" - .string "But your old man hasn’t given up yet!\p" + .string "That's the impression I get.\n" + .string "But your old man hasn't given up yet!\p" .string "Oh, yes, I have something for you.\n" .string "This came to you from someone named\l" .string "MR. BRINEY.$" @@ -417,9 +417,9 @@ LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE .string "SLATEPORT and LILYCOVE.$" LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B - .string "I’d better get back to PETALBURG GYM.\p" + .string "I'd better get back to PETALBURG GYM.\p" .string "MOM, thanks for looking after the house\n" - .string "while I’m away.$" + .string "while I'm away.$" LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9 .string "MOM: That DAD of yours…\p" @@ -447,5 +447,5 @@ LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351 .string "that POKéMON was?$" LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1 - .string "MOM: Well, isn’t that something!\n" + .string "MOM: Well, isn't that something!\n" .string "There are still unknown POKéMON.$" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index cdd8b83b0..2ebc9b900 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -293,12 +293,12 @@ LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A .string "MOM: {PLAYER}, how do you like your\n" .string "new room?\p" - .string "Good! Everything’s put away neatly!\p" + .string "Good! Everything's put away neatly!\p" .string "They finished moving everything in\n" .string "downstairs, too.\p" .string "POKéMON movers are so convenient!\p" .string "Oh, you should make sure that\n" - .string "everything’s all there on your desk.$" + .string "everything's all there on your desk.$" LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F .string "{PLAYER} flipped open the notebook.\p" @@ -313,6 +313,6 @@ LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 .string "HOENN region map.$" LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F - .string "It’s a Nintendo GameCube.\p" + .string "It's a Nintendo GameCube.\p" .string "A Game Boy Advance is connected to\n" .string "serve as the Controller.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index ef5ff3df1..824c4d930 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -338,7 +338,7 @@ LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5 .string "Oh, hello. And you are?\p" .string "… … … … … … … … …\n" .string "… … … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}, our new next-door\n" + .string "Oh, you're {PLAYER}{KUN}, our new next-door\n" .string "neighbor! Hi!\p" .string "We have a {STR_VAR_1} about the same\n" .string "age as you.\p" @@ -350,7 +350,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5 .string "Like child, like father.\p" .string "My husband is as wild about POKéMON\n" .string "as our child.\p" - .string "If he’s not at his LAB, he’s likely\n" + .string "If he's not at his LAB, he's likely\n" .string "scrabbling about in grassy places.$" LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37 @@ -363,14 +363,14 @@ LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93 .string "Oh, {RIVAL} went out to ROUTE 103\n" .string "just a little while ago.\p" .string "Like father, like child.\n" - .string "{RIVAL} can’t stay quietly at home.$" + .string "{RIVAL} can't stay quietly at home.$" LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01 - .string "I think it’s wonderful for people to\n" + .string "I think it's wonderful for people to\n" .string "travel with POKéMON.\p" .string "But you should go home every so often\n" - .string "to let your mother know you’re okay.\p" - .string "She might not say it, but I’m sure she\n" + .string "to let your mother know you're okay.\p" + .string "She might not say it, but I'm sure she\n" .string "worries about you, {PLAYER}{KUN}.$" LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 @@ -378,9 +378,9 @@ LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 .string "Who… Who are you?\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}.\n" + .string "Oh, you're {PLAYER}{KUN}.\n" .string "So your move was today.\p" - .string "Um… I’m MAY.\n" + .string "Um… I'm MAY.\n" .string "Glad to meet you!\p" .string "I…\n" .string "I have this dream of becoming friends\l" @@ -389,31 +389,31 @@ LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 .string "my dad, PROF. BIRCH.\p" .string "I was hoping that you would be nice,\n" .string "{PLAYER}{KUN}, and that we could be friends.\p" - .string "Oh, this is silly, isn’t it?\n" - .string "I… I’ve just met you, {PLAYER}{KUN}.\p" + .string "Oh, this is silly, isn't it?\n" + .string "I… I've just met you, {PLAYER}{KUN}.\p" .string "Eheheh…\p" .string "Oh, no! I forgot!\p" .string "I was supposed to go help Dad catch\n" .string "some wild POKéMON!\p" - .string "{PLAYER}{KUN}, I’ll catch you later!$" + .string "{PLAYER}{KUN}, I'll catch you later!$" LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4 .string "Hey!\n" .string "You…\p" .string "Who are you?\p" - .string "Oh, you’re {PLAYER}, aren’t you?\n" + .string "Oh, you're {PLAYER}, aren't you?\n" .string "Moved in next door, right?\p" - .string "I didn’t know that you’re a girl.\p" + .string "I didn't know that you're a girl.\p" .string "Dad, PROF. BIRCH, said that our new\n" - .string "next-door neighbor is a GYM LEADER’s\l" - .string "kid, so I assumed you’d be a guy.\p" - .string "My name’s BRENDAN.\n" + .string "next-door neighbor is a GYM LEADER's\l" + .string "kid, so I assumed you'd be a guy.\p" + .string "My name's BRENDAN.\n" .string "So, hi, neighbor!\p" - .string "Huh? Hey, {PLAYER}, don’t you have\n" + .string "Huh? Hey, {PLAYER}, don't you have\n" .string "a POKéMON?\p" .string "Do you want me to go catch you one?\p" .string "Aw, darn, I forgot…\p" - .string "I’m supposed to go help my dad catch\n" + .string "I'm supposed to go help my dad catch\n" .string "some wild POKéMON.\p" .string "Some other time, okay?$" diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 3d7e47d19..8a2ec10ac 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -337,9 +337,9 @@ LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C .string "Who… Who are you?\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}.\n" + .string "Oh, you're {PLAYER}{KUN}.\n" .string "So your move was today.\p" - .string "Um… I’m MAY.\n" + .string "Um… I'm MAY.\n" .string "Glad to meet you!\p" .string "I…\n" .string "I have this dream of becoming friends\l" @@ -348,13 +348,13 @@ LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C .string "my dad, PROF. BIRCH.\p" .string "I was hoping that you would be nice,\n" .string "{PLAYER}{KUN}, and that we could be friends.\p" - .string "Oh, this is silly, isn’t it?\n" - .string "I… I’ve just met you, {PLAYER}{KUN}.\p" + .string "Oh, this is silly, isn't it?\n" + .string "I… I've just met you, {PLAYER}{KUN}.\p" .string "Eheheh…\p" .string "Oh, no! I forgot!\p" .string "I was supposed to go help Dad catch\n" .string "some wild POKéMON!\p" - .string "{PLAYER}{KUN}, I’ll catch you later!$" + .string "{PLAYER}{KUN}, I'll catch you later!$" LittlerootTown_BrendansHouse_2F_Text_1F978A: @ 81F978A .string "POKéMON fully restored!\n" @@ -364,19 +364,19 @@ LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4 .string "Hey!\n" .string "You…\p" .string "Who are you?\p" - .string "Oh, you’re {PLAYER}, aren’t you?\n" + .string "Oh, you're {PLAYER}, aren't you?\n" .string "Moved in next door, right?\p" - .string "I didn’t know that you’re a girl.\p" + .string "I didn't know that you're a girl.\p" .string "Dad, PROF. BIRCH, said that our new\n" - .string "next-door neighbor is a GYM LEADER’s\l" - .string "kid, so I assumed you’d be a guy.\p" - .string "My name’s BRENDAN.\n" + .string "next-door neighbor is a GYM LEADER's\l" + .string "kid, so I assumed you'd be a guy.\p" + .string "My name's BRENDAN.\n" .string "So, hi, neighbor!\p" - .string "Huh? Hey, {PLAYER}, don’t you have\n" + .string "Huh? Hey, {PLAYER}, don't you have\n" .string "a POKéMON?\p" .string "Do you want me to go catch you one?\p" .string "Aw, darn, I forgot…\p" - .string "I’m supposed to go help my dad catch\n" + .string "I'm supposed to go help my dad catch\n" .string "some wild POKéMON.\p" .string "Some other time, okay?$" @@ -386,14 +386,14 @@ LittlerootTown_BrendansHouse_2F_Text_1F9962: @ 81F9962 LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991 LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991 - .string "It’s {RIVAL}’s POKé BALL!\p" + .string "It's {RIVAL}'s POKé BALL!\p" .string "Better leave it right where it is.$" LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 .string "MAY: {PLAYER}{KUN}!\p" .string "I was just checking my POKéDEX.\p" - .string "There’s still a lot of POKéMON that\n" - .string "I’ve seen but haven’t caught.\p" + .string "There's still a lot of POKéMON that\n" + .string "I've seen but haven't caught.\p" .string "And there are many others that\n" .string "I think will evolve.\p" .string "I wonder where I should go catch\n" @@ -402,11 +402,11 @@ LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E .string "MAY: I wonder where I should go catch\n" .string "some POKéMON next?\p" - .string "Wouldn’t it be funny if we ran into each\n" + .string "Wouldn't it be funny if we ran into each\n" .string "other, {PLAYER}{KUN}?$" LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D - .string "BRENDAN: Hey, it’s {PLAYER}.\p" + .string "BRENDAN: Hey, it's {PLAYER}.\p" .string "I was just checking out my POKéDEX.\p" .string "There are still many POKéMON that\n" .string "I need to catch, I know, but this\l" @@ -415,8 +415,8 @@ LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D .string "the urge to hit the road again.$" LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7 - .string "BRENDAN: I’m having a hard time deciding\n" + .string "BRENDAN: I'm having a hard time deciding\n" .string "where I should catch POKéMON next.\p" - .string "Hey, {PLAYER}, if I see you while I’m out\n" + .string "Hey, {PLAYER}, if I see you while I'm out\n" .string "catching POKéMON, I can pitch you a\l" - .string "battle if you’d like.$" + .string "battle if you'd like.$" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 22d5bc99b..ec6cd9738 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -697,55 +697,55 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 .string "Hunh? PROF. BIRCH?\p" - .string "The PROF’s away on fieldwork.\n" - .string "Ergo, he isn’t here.\p" + .string "The PROF's away on fieldwork.\n" + .string "Ergo, he isn't here.\p" .string "Oh, let me explain what fieldwork is.\p" .string "It is to study things in the natural\n" .string "environment, like fields and mountains,\l" .string "instead of a laboratory.\p" - .string "The PROF isn’t one for doing desk work.\n" - .string "He’s the type of person who would\l" + .string "The PROF isn't one for doing desk work.\n" + .string "He's the type of person who would\l" .string "rather go outside and experience\l" .string "things than read about them here.$" LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641 - .string "The PROF isn’t one for doing desk work.\n" - .string "He’s the type of person who would\l" + .string "The PROF isn't one for doing desk work.\n" + .string "He's the type of person who would\l" .string "rather go outside and experience\l" .string "things than read about them here.$" LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE .string "PROF. BIRCH is studying the habitats\n" .string "and distribution of POKéMON.\p" - .string "The PROF enjoys {RIVAL}’s help, too.\n" - .string "There’s a lot of love there.$" + .string "The PROF enjoys {RIVAL}'s help, too.\n" + .string "There's a lot of love there.$" LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" - .string "I’ve heard so much about you from\n" + .string "I've heard so much about you from\n" .string "your father.\p" - .string "I’ve heard that you don’t have your\n" + .string "I've heard that you don't have your\n" .string "own POKéMON yet.\p" .string "But the way you battled earlier,\n" .string "you pulled it off with aplomb!\p" - .string "I guess you have your father’s blood\n" + .string "I guess you have your father's blood\n" .string "in your veins after all!\p" .string "Oh, yes. As thanks for rescuing me,\n" - .string "I’d like you to have the POKéMON you\l" + .string "I'd like you to have the POKéMON you\l" .string "used earlier.\p" .string "{PLAYER} received the {STR_VAR_1}!$" LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1 - .string "PROF. BIRCH: While you’re at it, why not\n" + .string "PROF. BIRCH: While you're at it, why not\n" .string "give a nickname to that {STR_VAR_1}?$" LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6 .string "PROF. BIRCH: If you work at POKéMON\n" - .string "and gain experience, I think you’ll make\l" + .string "and gain experience, I think you'll make\l" .string "an extremely good TRAINER.\p" .string "My kid, {RIVAL}, is also studying\n" .string "POKéMON while helping me out.\p" - .string "{PLAYER}{KUN}, don’t you think it might be\n" + .string "{PLAYER}{KUN}, don't you think it might be\n" .string "a good idea to go see {RIVAL}?$" LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5 @@ -755,13 +755,13 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5 .string "means to be a TRAINER.$" LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35 - .string "PROF. BIRCH: Oh, don’t be that way.\n" + .string "PROF. BIRCH: Oh, don't be that way.\n" .string "You should go meet my kid.$" LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 .string "PROF. BIRCH: {RIVAL}?\n" .string "Gone home, I think.\p" - .string "Or maybe that kid’s scrabbling around\n" + .string "Or maybe that kid's scrabbling around\n" .string "in tall grass again somewhere…\p" .string "If you or your POKéMON get tired,\n" .string "you should get some rest at home.$" @@ -769,8 +769,8 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22 .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" .string "I heard you beat {RIVAL} on\n" - .string "your first try. That’s excellent!\p" - .string "{RIVAL}’s been helping with my research\n" + .string "your first try. That's excellent!\p" + .string "{RIVAL}'s been helping with my research\n" .string "for a long time.\p" .string "{RIVAL} has an extensive history as\n" .string "a TRAINER already.\p" @@ -789,31 +789,31 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B .string "with it.\p" .string "Whenever my kid catches a rare POKéMON\n" .string "and records its data in the POKéDEX,\l" - .string "why, {RIVAL} looks for me while I’m out\l" + .string "why, {RIVAL} looks for me while I'm out\l" .string "doing fieldwork, and shows me.$" LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F .string "PROF. BIRCH: Countless POKéMON\n" .string "await you!\p" - .string "Argh, I’m getting the itch to get out\n" + .string "Argh, I'm getting the itch to get out\n" .string "and do fieldwork again!$" LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7 .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" .string "You got a POKéDEX, too!\p" - .string "That’s great! Just like me!\n" - .string "I’ve got something for you, too!$" + .string "That's great! Just like me!\n" + .string "I've got something for you, too!$" LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40 - .string "MAY: It’s fun if you can get a lot of\n" + .string "MAY: It's fun if you can get a lot of\n" .string "POKéMON!\p" - .string "I’m going to look all over the place\n" + .string "I'm going to look all over the place\n" .string "because I want different POKéMON.\p" - .string "If I find any cute POKéMON, I’ll catch\n" + .string "If I find any cute POKéMON, I'll catch\n" .string "them with POKé BALLS!$" LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3 - .string "Oh? Your BAG’s full.$" + .string "Oh? Your BAG's full.$" LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08 .string "MAY: I wonder where I should go look\n" @@ -823,40 +823,40 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F .string "BRENDAN: Huh…\n" .string "So you got a POKéDEX, too.\p" .string "Well then, here.\n" - .string "I’ll give you these.$" + .string "I'll give you these.$" LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E - .string "BRENDAN: You know it’s more fun to\n" + .string "BRENDAN: You know it's more fun to\n" .string "have a whole bunch of POKéMON.\p" - .string "I’m going to explore all over the place\n" + .string "I'm going to explore all over the place\n" .string "to find different POKéMON.\p" .string "If I find any cool POKéMON, you bet\n" - .string "I’ll try to get them with POKé BALLS.$" + .string "I'll try to get them with POKé BALLS.$" LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D - .string "Hey, your BAG’s full.$" + .string "Hey, your BAG's full.$" LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073 .string "BRENDAN: Where should I look for\n" .string "POKéMON next…$" LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2 - .string "It’s a serious-looking machine.\n" + .string "It's a serious-looking machine.\n" .string "The PROF must use this for research.$" LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7 - .string "It’s a PC used for research.\n" + .string "It's a PC used for research.\n" .string "Better not mess around with it.$" LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124 - .string "It’s crammed with books on POKéMON.$" + .string "It's crammed with books on POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148 - .string "It’s a book that’s too hard to read.$" + .string "It's a book that's too hard to read.$" LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D .string "PROF. BIRCH: Now…\p" - .string "{PLAYER}{KUN} and {RIVAL}, I’ve had the two\n" + .string "{PLAYER}{KUN} and {RIVAL}, I've had the two\n" .string "of you help me study POKéMON.\p" .string "Thanks to your help, new facts\n" .string "are coming to light.\p" @@ -866,16 +866,16 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D .string "It goes to show how rich and varied\n" .string "the natural environments of HOENN\l" .string "happen to be.\p" - .string "That’s why I think it’s necessary for\n" + .string "That's why I think it's necessary for\n" .string "me to upgrade your POKéDEX to\l" .string "the NATIONAL Mode.\p" .string "Here, let me see your POKéDEX units.$" LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F .string "MAY: Eheheh!\p" - .string "It’s so cool that even my POKéDEX\n" + .string "It's so cool that even my POKéDEX\n" .string "is getting updated!\p" - .string "It’s because you went out and caught\n" + .string "It's because you went out and caught\n" .string "so many POKéMON, {PLAYER}{KUN}!$" LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E @@ -883,48 +883,48 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E .string "and checked out POKéMON.\p" .string "You can thank me for getting\n" .string "the NATIONAL Mode POKéDEX.\p" - .string "Yep, you’re lucky, {PLAYER}!$" + .string "Yep, you're lucky, {PLAYER}!$" LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419 .string "PROF. BIRCH: Okay, all done!$" LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436 - .string "{PLAYER}’s POKéDEX was upgraded\n" + .string "{PLAYER}'s POKéDEX was upgraded\n" .string "to the NATIONAL Mode!$" LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466 .string "PROF. BIRCH: But listen.\n" - .string "You’ve become the CHAMPION,\l" - .string "but your POKéMON journey isn’t over.\p" + .string "You've become the CHAMPION,\l" + .string "but your POKéMON journey isn't over.\p" .string "There is no end to the road\n" .string "that is POKéMON.\p" .string "Somewhere, there is a grassy patch\n" - .string "that’s waiting for you!$" + .string "that's waiting for you!$" LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528 - .string "MAY: I think I’ll take a short break\n" + .string "MAY: I think I'll take a short break\n" .string "from fieldwork.\p" - .string "I think I’ll help the PROF here for\n" + .string "I think I'll help the PROF here for\n" .string "a while.$" LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A .string "BRENDAN: For the time being,\n" - .string "I’m taking a break from fieldwork.\p" - .string "I’ll be helping out the PROF here\n" + .string "I'm taking a break from fieldwork.\p" + .string "I'll be helping out the PROF here\n" .string "for a while.$" LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" - .string "Let’s have a look at your POKéDEX.\p" + .string "Let's have a look at your POKéDEX.\p" .string "… … … … … …\n" .string "… … … … … …\p" - .string "Yes, there’s no doubt about it.\p" + .string "Yes, there's no doubt about it.\p" .string "You really have completed the HOENN\n" - .string "region’s POKéDEX.\p" - .string "That’s more than just impressive.\p" + .string "region's POKéDEX.\p" + .string "That's more than just impressive.\p" .string "I have a gift for you.\p" .string "Consider it my show of appreciation\n" - .string "for the fantastic work you’ve done.\p" + .string "for the fantastic work you've done.\p" .string "My gift is a rare POKéMON only found\n" .string "in another region!\p" .string "You can have any one of these\n" @@ -939,25 +939,25 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787 LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6 .string "PROF. BIRCH: The FIRE POKéMON\n" .string "CYNDAQUIL caught your eye!\p" - .string "You’re as sharp as ever!\p" + .string "You're as sharp as ever!\p" .string "So the CYNDAQUIL is your choice?$" LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869 .string "PROF. BIRCH: The WATER POKéMON\n" .string "TOTODILE is your choice!\p" .string "You know how to pick a good one.\p" - .string "So, you’ll take the TOTODILE?$" + .string "So, you'll take the TOTODILE?$" LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0 .string "PROF. BIRCH: The GRASS POKéMON\n" .string "CHIKORITA is your choice!\p" - .string "You sure know what you’re doing.\p" - .string "So, you’ll take the CHIKORITA?$" + .string "You sure know what you're doing.\p" + .string "So, you'll take the CHIKORITA?$" LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959 .string "PROF. BIRCH: Take your time before\n" .string "you decide.\p" - .string "They’re all invaluable POKéMON.$" + .string "They're all invaluable POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8 .string "PROF. BIRCH: I see!\n" @@ -973,19 +973,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C .string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n" - .string "You’ve completed the HOENN POKéDEX,\l" - .string "but your POKéMON journey isn’t over.\p" + .string "You've completed the HOENN POKéDEX,\l" + .string "but your POKéMON journey isn't over.\p" .string "There is no end to the road\n" .string "that is POKéMON.\p" .string "Somewhere, there is a grassy patch\n" - .string "that’s waiting for you!$" + .string "that's waiting for you!$" LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8 .string "You received the promised POKéMON.\n" .string "Better leave the others alone.$" LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A - .string "Oh, you don’t have any room for\n" + .string "Oh, you don't have any room for\n" .string "this POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 @@ -995,7 +995,7 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 .string "and sharpening your skills?\p" .string "Or are you going to try filling\n" .string "the NATIONAL POKéDEX?\p" - .string "I’m staying here to help the PROF.$" + .string "I'm staying here to help the PROF.$" LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D .string "BRENDAN: Rather than collecting\n" @@ -1016,15 +1016,15 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "SCOTT: Hi, hi, {PLAYER}!\n" - .string "It’s me, SCOTT.\p" - .string "I’m aboard the S.S. TIDAL now.\n" + .string "It's me, SCOTT.\p" + .string "I'm aboard the S.S. TIDAL now.\n" .string "It feels great to be on the sea!\p" .string "By the way…\p" - .string "There’s this place that I’d like to\n" + .string "There's this place that I'd like to\n" .string "invite you to for a visit.\p" - .string "If you’re interested, board a ferry\n" + .string "If you're interested, board a ferry\n" .string "at either SLATEPORT or LILYCOVE.\p" - .string "I’ll fill you in on the details when\n" - .string "we meet. I’ll be waiting!\p" + .string "I'll fill you in on the details when\n" + .string "we meet. I'll be waiting!\p" .string "… … … … … …\n" .string "… … … … … Click!$" diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index deb805bb5..56ad204a9 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -20,16 +20,16 @@ MagmaHideout_1F_Text_2398BA: @ 82398BA .string "When TEAM MAGMA has roll call, we get\n" .string "important guarding assignments in\l" .string "the order that we line up.\p" - .string "That’s why I’m stuck off in this corner.\n" - .string "I’m always late to roll call!$" + .string "That's why I'm stuck off in this corner.\n" + .string "I'm always late to roll call!$" MagmaHideout_1F_Text_239964: @ 8239964 - .string "I’m always late for training sessions,\n" + .string "I'm always late for training sessions,\n" .string "too!\p" - .string "I hate to say it, but I’m wimpy…$" + .string "I hate to say it, but I'm wimpy…$" MagmaHideout_1F_Text_2399B1: @ 82399B1 - .string "Okay, I’ll try to put a little more\n" + .string "Okay, I'll try to put a little more\n" .string "effort into things from now on…$" MagmaHideout_1F_Text_2399F5: @ 82399F5 @@ -39,15 +39,15 @@ MagmaHideout_1F_Text_2399F5: @ 82399F5 .string "across something that blew our minds!\p" .string "What did we find?\p" .string "Fuhahaha!\n" - .string "I’ll tell you if you beat me!$" + .string "I'll tell you if you beat me!$" MagmaHideout_1F_Text_239ABA: @ 8239ABA .string "Arrgh!\n" .string "Taken down!$" MagmaHideout_1F_Text_239ACD: @ 8239ACD - .string "I won’t tell you after all.\n" - .string "You’ll find out when you get there!\p" - .string "It’d be better if you saved surprises\n" - .string "to the end, don’t you think?$" + .string "I won't tell you after all.\n" + .string "You'll find out when you get there!\p" + .string "It'd be better if you saved surprises\n" + .string "to the end, don't you think?$" diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc index 9536ad433..9ea2ef6fe 100644 --- a/data/maps/MagmaHideout_2F_1R/scripts.inc +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -25,7 +25,7 @@ MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD .string "What, what, what?\p" .string "Only TEAM MAGMA members are supposed\n" .string "to be in here!\p" - .string "But you’re not dressed in TEAM MAGMA’s\n" + .string "But you're not dressed in TEAM MAGMA's\n" .string "uniform…\p" .string "You rouse my suspicion!\n" .string "Battle with me!$" @@ -40,7 +40,7 @@ MagmaHideout_2F_1R_Text_239C74: @ 8239C74 MagmaHideout_2F_1R_Text_239CAB: @ 8239CAB .string "Hold it right there!\p" - .string "You don’t really expect me to keep\n" + .string "You don't really expect me to keep\n" .string "my trap shut and let you waltz by me?$" MagmaHideout_2F_1R_Text_239D09: @ 8239D09 @@ -48,7 +48,7 @@ MagmaHideout_2F_1R_Text_239D09: @ 8239D09 .string "I concede!$" MagmaHideout_2F_1R_Text_239D1D: @ 8239D1D - .string "Maybe it would’ve been better if I did\n" + .string "Maybe it would've been better if I did\n" .string "just let you go unchallenged…$" MagmaHideout_2F_1R_Text_239D62: @ 8239D62 @@ -59,7 +59,7 @@ MagmaHideout_2F_1R_Text_239D75: @ 8239D75 .string "Graaah!$" MagmaHideout_2F_1R_Text_239D7D: @ 8239D7D - .string "I’ve already lost.\p" + .string "I've already lost.\p" .string "Do I really need to keep running\n" .string "around in a circle?$" @@ -71,5 +71,5 @@ MagmaHideout_2F_1R_Text_239DDA: @ 8239DDA .string "Mutter…$" MagmaHideout_2F_1R_Text_239DE2: @ 8239DE2 - .string "Actually, I’m no expert at battling…$" + .string "Actually, I'm no expert at battling…$" diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc index 4fc06770c..5539d26de 100644 --- a/data/maps/MagmaHideout_2F_2R/scripts.inc +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -22,8 +22,8 @@ MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D end MagmaHideout_2F_2R_Text_239E64: @ 8239E64 - .string "I don’t have a bone to pick with you.\n" - .string "I’m just following orders!$" + .string "I don't have a bone to pick with you.\n" + .string "I'm just following orders!$" MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5 .string "I may have lost, but…$" @@ -31,11 +31,11 @@ MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5 MagmaHideout_2F_2R_Text_239EBB: @ 8239EBB .string "We dug up something beyond belief!\n" .string "And, we got the BLUE ORB!\p" - .string "All that’s left is for our leader to…\n" + .string "All that's left is for our leader to…\n" .string "Fufufu… Fwahahaha!$" MagmaHideout_2F_2R_Text_239F31: @ 8239F31 - .string "I can’t stand heat. Maybe I should’ve\n" + .string "I can't stand heat. Maybe I should've\n" .string "joined TEAM AQUA instead…$" MagmaHideout_2F_2R_Text_239F71: @ 8239F71 @@ -43,7 +43,7 @@ MagmaHideout_2F_2R_Text_239F71: @ 8239F71 .string "TEAM MAGMA…$" MagmaHideout_2F_2R_Text_239FA1: @ 8239FA1 - .string "Don’t you get lonely for the sea\n" + .string "Don't you get lonely for the sea\n" .string "being in a place like this?$" MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE @@ -54,13 +54,13 @@ MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE .string "No, no, never mind!$" MagmaHideout_2F_2R_Text_23A050: @ 823A050 - .string "You’re a fiery battler.\n" + .string "You're a fiery battler.\n" .string "Just like a volcano!$" MagmaHideout_2F_2R_Text_23A07D: @ 823A07D .string "You just happened to win this time,\n" - .string "but that doesn’t matter.\p" - .string "TEAM MAGMA’s goal is about to be\n" + .string "but that doesn't matter.\p" + .string "TEAM MAGMA's goal is about to be\n" .string "reached!$" MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4 @@ -70,9 +70,9 @@ MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4 .string "Was it you who found it?$" MagmaHideout_2F_2R_Text_23A14C: @ 823A14C - .string "I’m having trouble believing this…$" + .string "I'm having trouble believing this…$" MagmaHideout_2F_2R_Text_23A16F: @ 823A16F - .string "I’m getting this feeling that our plan\n" + .string "I'm getting this feeling that our plan\n" .string "is going to end in failure…$" diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc index 69fd661b2..879cd282d 100644 --- a/data/maps/MagmaHideout_3F_1R/scripts.inc +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -17,27 +17,27 @@ MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 .string "My left ear is burning up!$" MagmaHideout_3F_1R_Text_23A229: @ 823A229 - .string "I’m getting heat exhaustion…$" + .string "I'm getting heat exhaustion…$" MagmaHideout_3F_1R_Text_23A246: @ 823A246 - .string "Do you think it’s odd that we’re wearing\n" + .string "Do you think it's odd that we're wearing\n" .string "hoods in this magma-filled volcano?$" MagmaHideout_3F_1R_Text_23A293: @ 823A293 .string "We joined so we can help our leader\n" .string "achieve his fantastic vision.\p" - .string "I don’t care if you’re with TEAM AQUA\n" - .string "or if you’re just some kid passing by.\p" + .string "I don't care if you're with TEAM AQUA\n" + .string "or if you're just some kid passing by.\p" .string "No one interferes with us and gets\n" .string "away with it!$" MagmaHideout_3F_1R_Text_23A353: @ 823A353 .string "Oh, no!\n" - .string "You’re not to be trusted at all!$" + .string "You're not to be trusted at all!$" MagmaHideout_3F_1R_Text_23A37C: @ 823A37C .string "Listen to me.\n" .string "TEAM MAGMA is right!\p" - .string "Don’t listen to TEAM AQUA.\n" - .string "Don’t believe their lies!$" + .string "Don't listen to TEAM AQUA.\n" + .string "Don't believe their lies!$" diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc index e4c232d32..14f7001fa 100644 --- a/data/maps/MagmaHideout_3F_2R/scripts.inc +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -11,8 +11,8 @@ MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC .string "says. But you know what?\p" .string "Doing stuff like digging up a super-\n" .string "ancient POKéMON and ripping off\l" - .string "someone’s METEORITE…\p" - .string "I think we’re going a little too far.\n" + .string "someone's METEORITE…\p" + .string "I think we're going a little too far.\n" .string "What do you think?$" MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB @@ -22,5 +22,5 @@ MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB MagmaHideout_3F_2R_Text_23A4EF: @ 823A4EF .string "You know, losing to you cleared my mind.\p" .string "The next time I see our leader,\n" - .string "I’m going to ask him about what we do.$" + .string "I'm going to ask him about what we do.$" diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 1eae21a57..714983999 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -130,14 +130,14 @@ MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 MagmaHideout_4F_Text_23A6E8: @ 823A6E8 .string "I want to see GROUDON, too, but they\n" - .string "won’t let me see even its tail…\p" - .string "It’s got me feeling really frustrated.\p" + .string "won't let me see even its tail…\p" + .string "It's got me feeling really frustrated.\p" .string "Oh, no!\n" .string "I blabbed about GROUDON!$" MagmaHideout_4F_Text_23A775: @ 823A775 - .string "I guess it’s impossible to win if one\n" - .string "doesn’t have a calm mind…$" + .string "I guess it's impossible to win if one\n" + .string "doesn't have a calm mind…$" MagmaHideout_4F_Text_23A7B5: @ 823A7B5 .string "I wonder if GROUDON even has a tail?$" @@ -149,15 +149,15 @@ MagmaHideout_4F_Text_23A7DA: @ 823A7DA MagmaHideout_4F_Text_23A81B: @ 823A81B .string "Grrr…\n" - .string "I’ve come so far, but now this?$" + .string "I've come so far, but now this?$" MagmaHideout_4F_Text_23A841: @ 823A841 .string "MAXIE, sir!\n" .string "An intruder is headed your way!$" MagmaHideout_4F_Text_23A86D: @ 823A86D - .string "You’re not finished yet!\n" - .string "You’re not getting by me easily!$" + .string "You're not finished yet!\n" + .string "You're not getting by me easily!$" MagmaHideout_4F_Text_23A8A7: @ 823A8A7 .string "Was I that easy to knock down?$" @@ -167,12 +167,12 @@ MagmaHideout_4F_Text_23A8C6: @ 823A8C6 MagmaHideout_4F_Text_23A8E1: @ 823A8E1 .string "Hehehe!\n" - .string "You made it this far, so I’ll tell you!\p" - .string "That’s right!\n" + .string "You made it this far, so I'll tell you!\p" + .string "That's right!\n" .string "Up ahead, GROUDON is sleeping!\p" .string "MAXIE went to GROUDON just seconds\n" .string "ago!\p" - .string "It’s going to awaken real soon!\n" + .string "It's going to awaken real soon!\n" .string "Hehe! Hehehe!$" MagmaHideout_4F_Text_23A994: @ 823A994 @@ -188,7 +188,7 @@ MagmaHideout_4F_Text_23A9F4: @ 823A9F4 .string "Nothing could awaken you from your\n" .string "sleep bathed in magma…\p" .string "This BLUE ORB is what you sought.\n" - .string "Wasn’t it?\p" + .string "Wasn't it?\p" .string "I have brought you the BLUE ORB.\n" .string "Let its shine awaken you!\p" .string "And show me…\n" @@ -196,14 +196,14 @@ MagmaHideout_4F_Text_23A9F4: @ 823A9F4 MagmaHideout_4F_Text_23AADA: @ 823AADA .string "MAXIE: GROUDON!\n" - .string "What’s wrong?\p" - .string "Wasn’t the BLUE ORB the key?\p" + .string "What's wrong?\p" + .string "Wasn't the BLUE ORB the key?\p" .string "GROUDON!\n" .string "Where have you gone…$" MagmaHideout_4F_Text_23AB33: @ 823AB33 .string "MAXIE: Oh, so it was you?\p" - .string "I’ve seen you poking around uninvited\n" + .string "I've seen you poking around uninvited\n" .string "here and there…\p" .string "I get it now!\n" .string "You must have pulled a cheap stunt!$" @@ -215,12 +215,12 @@ MagmaHideout_4F_Text_23ABB5: @ 823ABB5 MagmaHideout_4F_Text_23ABE2: @ 823ABE2 .string "MAXIE: There has to be some reason\n" .string "why GROUDON fled…\p" - .string "That’s what you’re trying to say,\n" - .string "aren’t you?\p" + .string "That's what you're trying to say,\n" + .string "aren't you?\p" .string "… … … … … …\n" .string "… … … … … …\p" .string "Humph…\n" - .string "You think I didn’t know that?\p" + .string "You think I didn't know that?\p" .string "With GROUDON gone, there is no longer\n" .string "any need for this blasted volcano.\p" .string "I am going after GROUDON, so this\n" diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index cc15974a2..17ace6e10 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -473,31 +473,31 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA end MauvilleCity_Text_1DF7DC: @ 81DF7DC - .string "UNCLE: It’s because of POKéMON that\n" - .string "this boy’s got more pep, I suppose…\l" - .string "But he’s become a bit too peppy…$" + .string "UNCLE: It's because of POKéMON that\n" + .string "this boy's got more pep, I suppose…\l" + .string "But he's become a bit too peppy…$" MauvilleCity_Text_1DF845: @ 81DF845 .string "WALLY: Aww, UNCLE, please?\p" .string "I want to challenge this GYM and see\n" - .string "how much better I’ve become.\p" + .string "how much better I've become.\p" .string "Please? May I, please?$" MauvilleCity_Text_1DF8B9: @ 81DF8B9 .string "UNCLE: Now hold on, WALLY.\p" .string "Since you started living with POKéMON,\n" .string "you have grown quite a lot stronger.\p" - .string "But don’t you think you’re pushing it\n" + .string "But don't you think you're pushing it\n" .string "to suddenly challenge a GYM?$" MauvilleCity_Text_1DF963: @ 81DF963 - .string "WALLY: I’m not pushing it.\p" + .string "WALLY: I'm not pushing it.\p" .string "If I combine forces with RALTS,\n" .string "we can beat anyone!$" MauvilleCity_Text_1DF9B2: @ 81DF9B2 .string "WALLY: Oh! Hi, {PLAYER}!\p" - .string "I’ve gotten a lot stronger since\n" + .string "I've gotten a lot stronger since\n" .string "we met.\p" .string "{PLAYER}, I want you and my UNCLE to\n" .string "understand that.\p" @@ -505,15 +505,15 @@ MauvilleCity_Text_1DF9B2: @ 81DF9B2 .string "a battle with me?$" MauvilleCity_Text_1DFA4A: @ 81DFA4A - .string "WALLY: Oh… If you won’t battle me,\n" - .string "{PLAYER}, my UNCLE won’t know that I’ve\l" + .string "WALLY: Oh… If you won't battle me,\n" + .string "{PLAYER}, my UNCLE won't know that I've\l" .string "become really strong.$" MauvilleCity_Text_1DFAA5: @ 81DFAA5 .string "UNCLE: {PLAYER}{KUN}, was it?\n" - .string "On WALLY’s behalf, can I ask you to\l" + .string "On WALLY's behalf, can I ask you to\l" .string "battle with him just this once?\p" - .string "I don’t think he’s going to listen to\n" + .string "I don't think he's going to listen to\n" .string "any reason the way he is now.$" MauvilleCity_Text_1DFB42: @ 81DFB42 @@ -531,31 +531,31 @@ MauvilleCity_Text_1DFB96: @ 81DFB96 MauvilleCity_Text_1DFBC3: @ 81DFBC3 .string "WALLY: UNCLE…\n" - .string "I’ll go back to VERDANTURF…$" + .string "I'll go back to VERDANTURF…$" MauvilleCity_Text_1DFBED: @ 81DFBED .string "{PLAYER}, thank you.\n" - .string "Being a TRAINER is tough, isn’t it?\p" - .string "It’s not enough just to have POKéMON\n" - .string "and make them battle. That isn’t what\l" + .string "Being a TRAINER is tough, isn't it?\p" + .string "It's not enough just to have POKéMON\n" + .string "and make them battle. That isn't what\l" .string "being a real TRAINER is about.$" MauvilleCity_Text_1DFC8A: @ 81DFC8A - .string "UNCLE: WALLY, there’s no need to be so\n" + .string "UNCLE: WALLY, there's no need to be so\n" .string "down on yourself.\p" - .string "Why, what’s keeping you from becoming\n" + .string "Why, what's keeping you from becoming\n" .string "stronger and stronger?\p" - .string "Come on, let’s go home.\n" - .string "Everyone’s waiting for you.$" + .string "Come on, let's go home.\n" + .string "Everyone's waiting for you.$" MauvilleCity_Text_1DFD34: @ 81DFD34 .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" .string "that you must be the TRAINER who kept\l" .string "an eye out for WALLY when he caught\l" .string "his POKéMON.\p" - .string "Why don’t you visit us in VERDANTURF\n" + .string "Why don't you visit us in VERDANTURF\n" .string "sometime?\l" - .string "I’m sure WALLY would enjoy it.$" + .string "I'm sure WALLY would enjoy it.$" MauvilleCity_Text_1DFDFB: @ 81DFDFB @@ -576,46 +576,46 @@ MauvilleCity_Text_1DFEB4: @ 81DFEB4 MauvilleCity_Text_1DFED5: @ 81DFED5 .string "SCOTT: Hehe…\n" .string "I was watching that match!\p" - .string "You’re friends with that boy WALLY,\n" - .string "aren’t you?\p" - .string "But you didn’t hold anything back\n" + .string "You're friends with that boy WALLY,\n" + .string "aren't you?\p" + .string "But you didn't hold anything back\n" .string "and beat him impressively.\p" - .string "Yeah! That’s what a real POKéMON\n" + .string "Yeah! That's what a real POKéMON\n" .string "battle is all about!\p" .string "I idolize TRAINERS like that!\p" .string "… … … … … …\n" - .string "I’ll be cheering for you!$" + .string "I'll be cheering for you!$" MauvilleCity_Text_1DFFE4: @ 81DFFE4 .string "WATTSON: Oh, {PLAYER}{KUN}!\n" .string "You look like you have a lot of zip!\l" - .string "That’s a good thing, wahahahaha!\p" - .string "Fine! I’ve decided!\n" + .string "That's a good thing, wahahahaha!\p" + .string "Fine! I've decided!\n" .string "I need a favor, {PLAYER}{KUN}!\p" .string "MAUVILLE CITY has an underground\n" .string "sector called NEW MAUVILLE.\p" - .string "{PLAYER}{KUN}, I’d like you to go there and\n" + .string "{PLAYER}{KUN}, I'd like you to go there and\n" .string "switch off the GENERATOR.\p" .string "The GENERATOR has been running a bit\n" - .string "haywire. It’s getting unsafe.\p" + .string "haywire. It's getting unsafe.\p" .string "Here, this is the KEY to get into\n" .string "NEW MAUVILLE.$" MauvilleCity_Text_1E0154: @ 81E0154 - .string "WATTSON: Don’t you worry about it.\n" - .string "It won’t be a challenge to you.\p" + .string "WATTSON: Don't you worry about it.\n" + .string "It won't be a challenge to you.\p" .string "The entrance to NEW MAUVILLE is just\n" .string "a short SURF away from ROUTE 110.\p" - .string "That’s it, then, you have my trust!\n" + .string "That's it, then, you have my trust!\n" .string "Wahahahaha!$" MauvilleCity_Text_1E020E: @ 81E020E .string "WATTSON: Wahahahaha!\p" - .string "I knew it, {PLAYER}{KUN}! I knew I’d made\n" + .string "I knew it, {PLAYER}{KUN}! I knew I'd made\n" .string "the right choice asking you!\p" .string "This is my thanks--a TM containing\n" .string "THUNDERBOLT!\p" - .string "Go on, you’ve earned it!$" + .string "Go on, you've earned it!$" MauvilleCity_Text_1E02AA: @ 81E02AA .string "WATTSON: Wahahahaha!\p" @@ -623,7 +623,7 @@ MauvilleCity_Text_1E02AA: @ 81E02AA .string "the young step up and take charge!$" MauvilleCity_Text_1E0301: @ 81E0301 - .string "You know, it’s cool to have POKéMON\n" + .string "You know, it's cool to have POKéMON\n" .string "battles and stuff…\p" .string "But if your POKéMON gets hurt,\n" .string "you have to nurse it back to health.$" @@ -635,12 +635,12 @@ MauvilleCity_Text_1E037C: @ 81E037C .string "people coming through.$" MauvilleCity_Text_1E03FB: @ 81E03FB - .string "Have you been to RYDEL’S CYCLES yet?\p" + .string "Have you been to RYDEL'S CYCLES yet?\p" .string "RYDEL, the owner, is a very generous\n" .string "man.$" MauvilleCity_Text_1E044A: @ 81E044A - .string "Even if you’re riding a BIKE,\n" + .string "Even if you're riding a BIKE,\n" .string "wild POKéMON could jump you.$" MauvilleCity_Text_1E0485: @ 81E0485 @@ -655,7 +655,7 @@ MauvilleCity_Text_1E04B7: @ 81E04B7 MauvilleCity_Text_1E0504: @ 81E0504 .string "“Ride in gravel and shake up your\n" .string "soul!â€\l" - .string "RYDEL’S CYCLES$" + .string "RYDEL'S CYCLES$" MauvilleCity_Text_1E053C: @ 81E053C .string "“The play spot for all!â€\n" @@ -663,14 +663,14 @@ MauvilleCity_Text_1E053C: @ 81E053C MauvilleCity_Text_1E056A: @ 81E056A .string "Hi, do you check out TV at all?\p" - .string "They’ve added a bunch of cool new\n" + .string "They've added a bunch of cool new\n" .string "shows recently.\p" - .string "TV is so cool. I’ve seen my friends on\n" + .string "TV is so cool. I've seen my friends on\n" .string "TV just out of the blue.\p" .string "And, sometimes, they even put you on TV\n" .string "without telling you.\p" .string "I wish I would be on TV sometime.\p" - .string "That’s why I think you should check\n" + .string "That's why I think you should check\n" .string "out TVs whenever you can.$" MauvilleCity_Text_1E0699: @ 81E0699 diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 2e0fac7c2..1634ee33c 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -187,11 +187,11 @@ MauvilleCity_BikeShop_Text_20EE22: @ 820EE22 .string "Well, well, what have we here?\n" .string "A most energetic customer!\p" .string "Me? You may call me RYDEL.\n" - .string "I’m the owner of this cycle shop.$" + .string "I'm the owner of this cycle shop.$" MauvilleCity_BikeShop_Text_20EE99: @ 820EE99 .string "RYDEL: Your RUNNING SHOES…\n" - .string "They’re awfully filthy.\p" + .string "They're awfully filthy.\p" .string "Did you come from far away?$" MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8 @@ -201,15 +201,15 @@ MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8 MauvilleCity_BikeShop_Text_20EF32: @ 820EF32 .string "RYDEL: Hm, hm… … … … …\p" - .string "You’re saying that you came all this\n" + .string "You're saying that you came all this\n" .string "way from LITTLEROOT?\p" .string "My goodness!\n" - .string "That’s ridiculously far!\p" + .string "That's ridiculously far!\p" .string "If you had one of my BIKES, you could\n" .string "go anywhere easily while feeling the\l" .string "gentle caress of the wind!\p" - .string "I’ll tell you what!\n" - .string "I’ll give you a BIKE!\p" + .string "I'll tell you what!\n" + .string "I'll give you a BIKE!\p" .string "Oh, wait a second!\p" .string "I forgot to tell you that there are\n" .string "two kinds of BIKES!\p" @@ -219,7 +219,7 @@ MauvilleCity_BikeShop_Text_20EF32: @ 820EF32 .string "to feel the wind with their bodies!\p" .string "And an ACRO BIKE is for those who\n" .string "prefer technical rides!\p" - .string "I’m a real sweetheart, so you can\n" + .string "I'm a real sweetheart, so you can\n" .string "have whichever one you like!\p" .string "Which one will you choose?$" @@ -239,7 +239,7 @@ MauvilleCity_BikeShop_Text_20F1FB: @ 820F1FB MauvilleCity_BikeShop_Text_20F22F: @ 820F22F .string "RYDEL: Okay, no problem!\n" - .string "I’ll switch BIKES for you!$" + .string "I'll switch BIKES for you!$" MauvilleCity_BikeShop_Text_20F263: @ 820F263 .string "{PLAYER} got the MACH BIKE exchanged\n" @@ -251,26 +251,26 @@ MauvilleCity_BikeShop_Text_20F294: @ 820F294 MauvilleCity_BikeShop_Text_20F2C4: @ 820F2C4 .string "RYDEL: Good, good!\n" - .string "I’m happy that you like it!$" + .string "I'm happy that you like it!$" MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3 .string "Oh? What happened to that BIKE\n" .string "I gave you?\p" .string "Oh, I get it, you stored it using your PC.\p" .string "Well, take it out of PC storage,\n" - .string "and I’ll be happy to exchange it!\p" + .string "and I'll be happy to exchange it!\p" .string "May the wind always be at your back\n" .string "on your adventure!$" MauvilleCity_BikeShop_Text_20F3C3: @ 820F3C3 - .string "I’m learning about BIKES while\n" + .string "I'm learning about BIKES while\n" .string "I work here.\p" .string "If you need advice on how to ride your\n" - .string "BIKE, there’re a couple handbooks in\l" + .string "BIKE, there're a couple handbooks in\l" .string "the back.$" MauvilleCity_BikeShop_Text_20F445: @ 820F445 - .string "It’s a handbook on the MACH BIKE.\p" + .string "It's a handbook on the MACH BIKE.\p" .string "Which page do you want to read?$" MauvilleCity_BikeShop_Text_20F487: @ 820F487 @@ -282,7 +282,7 @@ MauvilleCity_BikeShop_Text_20F487: @ 820F487 .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_20F550: @ 820F550 - .string "A MACH BIKE is speedy, but it can’t\n" + .string "A MACH BIKE is speedy, but it can't\n" .string "stop very quickly.\p" .string "It gets a little tricky to get around\n" .string "a corner.\p" @@ -300,7 +300,7 @@ MauvilleCity_BikeShop_Text_20F61A: @ 820F61A .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_20F6ED: @ 820F6ED - .string "It’s a handbook on the ACRO BIKE.\p" + .string "It's a handbook on the ACRO BIKE.\p" .string "Which page do you want to read?$" MauvilleCity_BikeShop_Text_20F72F: @ 820F72F diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 404cd62e7..135f48f23 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -677,12 +677,12 @@ MauvilleCity_GameCorner_Text_210460: @ 8210460 MauvilleCity_GameCorner_Text_21047E: @ 821047E .string "Okay, you wanted some COINS for\n" .string "the games?\p" - .string "But you don’t have a COIN CASE for\n" + .string "But you don't have a COIN CASE for\n" .string "stowing the COINS.$" MauvilleCity_GameCorner_Text_2104DF: @ 82104DF .string "Were you looking for COINS?\p" - .string "It’s Â¥1000 for 50 COINS.\n" + .string "It's Â¥1000 for 50 COINS.\n" .string "Would you like some?$" MauvilleCity_GameCorner_Text_210529: @ 8210529 @@ -690,7 +690,7 @@ MauvilleCity_GameCorner_Text_210529: @ 8210529 .string "Here are your COINS!$" MauvilleCity_GameCorner_Text_210553: @ 8210553 - .string "Um… You don’t appear to have\n" + .string "Um… You don't appear to have\n" .string "enough money…$" MauvilleCity_GameCorner_Text_21057E: @ 821057E @@ -698,7 +698,7 @@ MauvilleCity_GameCorner_Text_21057E: @ 821057E .string "Your COIN CASE is full.$" MauvilleCity_GameCorner_Text_21059A: @ 821059A - .string "Oh… You don’t need COINS, then?\n" + .string "Oh… You don't need COINS, then?\n" .string "Good luck on your adventure!$" MauvilleCity_GameCorner_Text_2105D7: @ 82105D7 @@ -715,13 +715,13 @@ MauvilleCity_GameCorner_Text_210629: @ 8210629 MauvilleCity_GameCorner_Text_210646: @ 8210646 .string "Thank you!\n" - .string "We’ll send it to your PC at home.$" + .string "We'll send it to your PC at home.$" MauvilleCity_GameCorner_Text_210673: @ 8210673 - .string "You don’t have enough COINS.$" + .string "You don't have enough COINS.$" MauvilleCity_GameCorner_Text_210690: @ 8210690 - .string "There isn’t any room available for\n" + .string "There isn't any room available for\n" .string "placing {STR_VAR_1}.$" MauvilleCity_GameCorner_Text_2106BF: @ 82106BF @@ -736,7 +736,7 @@ MauvilleCity_GameCorner_Text_21071B: @ 821071B .string "Here you go!$" MauvilleCity_GameCorner_Text_210728: @ 8210728 - .string "Oh, you can’t carry any more than that.$" + .string "Oh, you can't carry any more than that.$" MauvilleCity_GameCorner_Text_210750: @ 8210750 .string "I made a mistake and got two of\n" @@ -751,11 +751,11 @@ MauvilleCity_GameCorner_Text_2107A9: @ 82107A9 .string "You want it, but not right now?$" MauvilleCity_GameCorner_Text_2107CE: @ 82107CE - .string "Oh, don’t be so negative!\n" + .string "Oh, don't be so negative!\n" .string "You can have this!$" MauvilleCity_GameCorner_Text_2107FB: @ 82107FB - .string "There’s a prize I want, but I can’t win\n" + .string "There's a prize I want, but I can't win\n" .string "the jackpot.$" MauvilleCity_GameCorner_Text_210830: @ 8210830 @@ -772,16 +772,16 @@ MauvilleCity_GameCorner_Text_2108A0: @ 82108A0 MauvilleCity_GameCorner_Text_2108EF: @ 82108EF .string "MAUVILLE has something for\n" .string "everyone.\p" - .string "For me, it’s the GAME CORNER.$" + .string "For me, it's the GAME CORNER.$" MauvilleCity_GameCorner_Text_210932: @ 8210932 .string "The ROULETTE tables have different\n" .string "rates.\p" - .string "Check your COINS if you’re going to\n" + .string "Check your COINS if you're going to\n" .string "pick a table.$" MauvilleCity_GameCorner_Text_21098E: @ 821098E - .string "It’s easy to lose track of time in here. \n" + .string "It's easy to lose track of time in here. \n" .string "I should get back to work.$" MauvilleCity_GameCorner_Text_2109D3: @ 82109D3 @@ -790,21 +790,21 @@ MauvilleCity_GameCorner_Text_2109D3: @ 82109D3 MauvilleCity_GameCorner_Text_210A05: @ 8210A05 .string "This ROULETTE thing…\n" - .string "It’s rather demanding.\p" - .string "Win or lose, it’s only by luck.$" + .string "It's rather demanding.\p" + .string "Win or lose, it's only by luck.$" MauvilleCity_GameCorner_Text_210A51: @ 8210A51 .string "Up to three COINS can be used to play\n" .string "the SLOTS.$" MauvilleCity_GameCorner_Text_210A82: @ 8210A82 - .string "It’s very difficult to make it stop\n" + .string "It's very difficult to make it stop\n" .string "right on “7.â€\p" .string "If it stops on “7†during the REEL TIME\n" - .string "bonus game, you’ll receive extra COINS.$" + .string "bonus game, you'll receive extra COINS.$" MauvilleCity_GameCorner_Text_210B04: @ 8210B04 - .string "Here’s some information for you\n" + .string "Here's some information for you\n" .string "about the SLOTS.\p" .string "The more lightning bolts you stock,\n" .string "the more REEL TIME chances you get.\p" @@ -812,10 +812,10 @@ MauvilleCity_GameCorner_Text_210B04: @ 8210B04 .string "REEL TIME chances…\p" .string "It is possible to receive four regular\n" .string "bonuses, then a big bonus.\p" - .string "That would total 660 COINS, but it’s\n" + .string "That would total 660 COINS, but it's\n" .string "very difficult to get.$" MauvilleCity_GameCorner_Text_210C2E: @ 8210C2E - .string "You can’t play if you don’t have\n" + .string "You can't play if you don't have\n" .string "a COIN CASE.$" diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 5996fda47..fbc1d8b0b 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -278,22 +278,22 @@ MauvilleCity_Gym_EventScript_20E175:: @ 820E175 end MauvilleCity_Gym_Text_20E17F: @ 820E17F - .string "Hey, how’s it going, CHAMPION-\n" + .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "WATTSON, the LEADER of MAUVILLE\n" .string "GYM, uses ELECTRIC-type POKéMON.\p" .string "If you challenge him with WATER-type\n" - .string "POKéMON, he’ll zap them! Bzzt!\p" - .string "And, he’s put in switch-controlled\n" + .string "POKéMON, he'll zap them! Bzzt!\p" + .string "And, he's put in switch-controlled\n" .string "doors all over his GYM! Eccentric!\p" .string "Hey, go for it!$" MauvilleCity_Gym_Text_20E283: @ 820E283 - .string "Whoa, you’re electrifying!\n" - .string "You’ve powered the door open!$" + .string "Whoa, you're electrifying!\n" + .string "You've powered the door open!$" MauvilleCity_Gym_Text_20E2BC: @ 820E2BC - .string "My electric soul, it’ll shatter your\n" + .string "My electric soul, it'll shatter your\n" .string "dreams whole, whoa-yeahah!$" MauvilleCity_Gym_Text_20E2FC: @ 820E2FC @@ -301,12 +301,12 @@ MauvilleCity_Gym_Text_20E2FC: @ 820E2FC .string "over-driven electric, man!$" MauvilleCity_Gym_Text_20E336: @ 820E336 - .string "POKéMON and rock, it’s all about heart,\n" + .string "POKéMON and rock, it's all about heart,\n" .string "whoa-yeah!$" MauvilleCity_Gym_Text_20E369: @ 820E369 .string "I trained under WATTSON!\n" - .string "There ain’t no way I’ll lose easily!$" + .string "There ain't no way I'll lose easily!$" MauvilleCity_Gym_Text_20E3A7: @ 820E3A7 .string "Unplugged and turned off…$" @@ -318,25 +318,25 @@ MauvilleCity_Gym_Text_20E3C1: @ 820E3C1 .string "daddy was born, that tough coot.$" MauvilleCity_Gym_Text_20E443: @ 820E443 - .string "This GYM’s got puzzles!\n" - .string "Isn’t it fun?$" + .string "This GYM's got puzzles!\n" + .string "Isn't it fun?$" MauvilleCity_Gym_Text_20E469: @ 820E469 - .string "It’s no fun to lose…$" + .string "It's no fun to lose…$" MauvilleCity_Gym_Text_20E47E: @ 820E47E .string "WATTSON says he likes setting up\n" .string "little traps with switches.$" MauvilleCity_Gym_Text_20E4BB: @ 820E4BB - .string "With my charm and my POKéMON’s moves,\n" - .string "you’ll be shocked!$" + .string "With my charm and my POKéMON's moves,\n" + .string "you'll be shocked!$" MauvilleCity_Gym_Text_20E4F4: @ 820E4F4 - .string "I’m shocked by your power!$" + .string "I'm shocked by your power!$" MauvilleCity_Gym_Text_20E50F: @ 820E50F - .string "I’ve heard that MAUVILLE was founded\n" + .string "I've heard that MAUVILLE was founded\n" .string "by WATTSON.\p" .string "He was a TRAINER long before we\n" .string "became TRAINERS.\l" @@ -350,16 +350,16 @@ MauvilleCity_Gym_Text_20E5A8: @ 820E5A8 .string "My eyes are frazzled…$" MauvilleCity_Gym_Text_20E5C2: @ 820E5C2 - .string "MAUVILLE GYM’s WATTSON has a shiny\n" + .string "MAUVILLE GYM's WATTSON has a shiny\n" .string "forehead. It makes me happy!$" MauvilleCity_Gym_Text_20E602: @ 820E602 - .string "I’ve given up on my plans to convert\n" + .string "I've given up on my plans to convert\n" .string "the city, I have.\p" .string "And so, I put my time into making\n" .string "door traps in my GYM.\p" .string "Oh? Now, what are you doing here?\p" - .string "What’s that? You say you’ve gotten\n" + .string "What's that? You say you've gotten\n" .string "past all my rigged doors?\p" .string "Wahahahah!\n" .string "Now, that is amusing!\p" @@ -386,7 +386,7 @@ MauvilleCity_Gym_Text_20E7AA: @ 820E7AA MauvilleCity_Gym_Text_20E844: @ 820E844 .string "That TM34 there contains SHOCK WAVE.\p" - .string "It’s a trustworthy move that never\n" + .string "It's a trustworthy move that never\n" .string "misses! You can count on it!\p" .string "… … … … … …$" @@ -407,7 +407,7 @@ MauvilleCity_Gym_Text_20E952: @ 820E952 MauvilleCity_Gym_Text_20E96C: @ 820E96C .string "MAUVILLE CITY POKéMON GYM\p" - .string "WATTSON’S CERTIFIED TRAINERS:\n" + .string "WATTSON'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" MauvilleCity_Gym_Text_20E9A7: @ 820E9A7 @@ -415,20 +415,20 @@ MauvilleCity_Gym_Text_20E9A7: @ 820E9A7 .string "I know what you want.\l" .string "You want to battle my POKéMON!\p" .string "Wahahahaha!\p" - .string "I’ll make sparks fly from you!\n" - .string "Don’t say I didn’t warn you!$" + .string "I'll make sparks fly from you!\n" + .string "Don't say I didn't warn you!$" MauvilleCity_Gym_Text_20EA42: @ 820EA42 .string "Oof…\n" .string "Our batteries ran dry…$" MauvilleCity_Gym_Text_20EA5E: @ 820EA5E - .string "WATTSON: We’ll have to recharge our\n" + .string "WATTSON: We'll have to recharge our\n" .string "batteries again.\p" - .string "When we’re fully charged up, we’ll\n" + .string "When we're fully charged up, we'll\n" .string "gladly accept your challenge.\p" .string "So, come back again sometime,\n" - .string "won’t you?$" + .string "won't you?$" MauvilleCity_Gym_Text_20EAFD: @ 820EAFD .string "WATTSON: Ah-ha! Here at last!\n" @@ -436,7 +436,7 @@ MauvilleCity_Gym_Text_20EAFD: @ 820EAFD .string "You want to battle my POKéMON!\p" .string "Wahahahaha!\p" .string "Oops! Wait!\n" - .string "You’ve only one POKéMON with you!\p" + .string "You've only one POKéMON with you!\p" .string "Come see me with two or more\n" .string "POKéMON, all right?$" diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index dcee418c4..2256fd1fe 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -45,9 +45,9 @@ MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4 end MauvilleCity_House2_Text_210CEE: @ 8210CEE - .string "If I had a BIKE, it’d be easy to cycle to\n" + .string "If I had a BIKE, it'd be easy to cycle to\n" .string "SLATEPORT for some shopping.\p" - .string "I’d be able to buy HARBOR MAIL at the\n" + .string "I'd be able to buy HARBOR MAIL at the\n" .string "POKéMON MART in SLATEPORT…$" MauvilleCity_House2_Text_210D76: @ 8210D76 @@ -55,15 +55,15 @@ MauvilleCity_House2_Text_210D76: @ 8210D76 .string "Will you trade it for a COIN CASE?$" MauvilleCity_House2_Text_210DB3: @ 8210DB3 - .string "Oh, I’m so happy!\n" - .string "Okay, I’ll trade you a COIN CASE!$" + .string "Oh, I'm so happy!\n" + .string "Okay, I'll trade you a COIN CASE!$" MauvilleCity_House2_Text_210DE7: @ 8210DE7 .string "That COIN CASE can be used\n" .string "at the GAME CORNER.$" MauvilleCity_House2_Text_210E16: @ 8210E16 - .string "Oh, that’s disappointing.\p" + .string "Oh, that's disappointing.\p" .string "A COIN CASE is needed for the\n" .string "GAME CORNER.$" diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index d6c2c2fd4..44e36489a 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -48,6 +48,6 @@ MauvilleCity_Mart_Text_21112E: @ 821112E MauvilleCity_Mart_Text_2111D8: @ 82111D8 .string "Use a certain move, or use an item\n" .string "instead…\p" - .string "The TRAINER’s decisions determine how\n" + .string "The TRAINER's decisions determine how\n" .string "battles turn out, I think.$" diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 40914c740..1eac0efc9 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -36,19 +36,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98 MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1 .string "That man over there, he says weird\n" .string "things!\p" - .string "He’s funny in a weird way.\n" - .string "I doubt I’ll forget about him!$" + .string "He's funny in a weird way.\n" + .string "I doubt I'll forget about him!$" MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06 .string "When I accessed the RECORD CORNER,\n" - .string "the data for what’s hot in DEWFORD\l" + .string "the data for what's hot in DEWFORD\l" .string "got updated.\p" .string "Now that bit of data is the same\n" - .string "as my friend’s!$" + .string "as my friend's!$" MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A .string "A RECORD CORNER opened upstairs in\n" .string "the POKéMON CENTER.\p" - .string "I don’t know what it’s about, but it\n" - .string "sounds fun. I’ll go check it out!$" + .string "I don't know what it's about, but it\n" + .string "sounds fun. I'll go check it out!$" diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index 10b0eca4b..196d49a26 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -26,6 +26,6 @@ MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 .string "at the COLOSSEUM here?\p" .string "They put up your record on the wall\n" .string "for everyone to see.\p" - .string "It’s embarrassing if you lose more\n" + .string "It's embarrassing if you lose more\n" .string "often than you win…$" diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 4bfaa7ad9..23afa4845 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -240,34 +240,34 @@ MeteorFalls_1F_1R_Text_22BF47: @ 822BF47 MeteorFalls_1F_1R_Text_22BF84: @ 822BF84 .string "Heh?\p" - .string "I don’t know who you are, but if you get\n" - .string "in the way of TEAM MAGMA, don’t\l" + .string "I don't know who you are, but if you get\n" + .string "in the way of TEAM MAGMA, don't\l" .string "expect any mercy!$" MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4 .string "Hold it right there, TEAM MAGMA!\p" - .string "You’re badly mistaken if you think you\n" + .string "You're badly mistaken if you think you\n" .string "can have your way with the world!$" MeteorFalls_1F_1R_Text_22C04E: @ 822C04E .string "Hehehe!\n" .string "Even TEAM AQUA joins us!\p" - .string "But it’s too much trouble to deal with\n" + .string "But it's too much trouble to deal with\n" .string "you all…\p" - .string "Heh, it doesn’t matter!\p" - .string "We’ve got the METEORITE, so off to\n" + .string "Heh, it doesn't matter!\p" + .string "We've got the METEORITE, so off to\n" .string "MT. CHIMNEY we go!\p" .string "Hehehe! Be seeing you, you TEAM\n" .string "AQUA dingbats!$" MeteorFalls_1F_1R_Text_22C11C: @ 822C11C - .string "ARCHIE: Didn’t I see you before?\n" - .string "At SLATEPORT’s MUSEUM?\p" + .string "ARCHIE: Didn't I see you before?\n" + .string "At SLATEPORT's MUSEUM?\p" .string "Ah, so your name is {PLAYER}.\p" .string "At the time, I thought you were one\n" - .string "of TEAM MAGMA’s goons.\p" + .string "of TEAM MAGMA's goons.\p" .string "Humph…\n" - .string "You’re one odd kid.\p" + .string "You're one odd kid.\p" .string "TEAM MAGMA is a dangerous group of\n" .string "total fanatics.\p" .string "They engage in destruction, claiming\n" @@ -281,8 +281,8 @@ MeteorFalls_1F_1R_Text_22C268: @ 822C268 MeteorFalls_1F_1R_Text_22C292: @ 822C292 .string "ARCHIE: Yes, yes, we must!\n" - .string "We’ve got to hurry.\p" - .string "There’s no telling what TEAM MAGMA\n" + .string "We've got to hurry.\p" + .string "There's no telling what TEAM MAGMA\n" .string "will do at MT. CHIMNEY!$" MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC @@ -291,8 +291,8 @@ MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC .string "Farewell!$" MeteorFalls_1F_1R_Text_22C342: @ 822C342 - .string "I… I’m COZMO…\n" - .string "I’m a PROFESSOR…\p" + .string "I… I'm COZMO…\n" + .string "I'm a PROFESSOR…\p" .string "TEAM MAGMA asked me to guide them\n" .string "to METEOR FALLS…\p" .string "But they tricked me.\n" @@ -300,7 +300,7 @@ MeteorFalls_1F_1R_Text_22C342: @ 822C342 .string "And then another similar bunch,\n" .string "TEAM AQUA showed up.\p" .string "After that…\n" - .string "I don’t understand any of it.\p" + .string "I don't understand any of it.\p" .string "But that TEAM MAGMA…\p" .string "What are they going to do with that\n" .string "METEORITE at MT. CHIMNEY?$" diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 2deefd65d..c1427d1f2 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -71,7 +71,7 @@ MeteorFalls_1F_2R_Text_22C608: @ 822C608 MeteorFalls_1F_2R_Text_22C678: @ 822C678 .string "Urgh!\n" - .string "I didn’t expect you to be so strong!$" + .string "I didn't expect you to be so strong!$" MeteorFalls_1F_2R_Text_22C6A3: @ 822C6A3 .string "The road ahead remains long and harsh.\p" @@ -85,37 +85,37 @@ MeteorFalls_1F_2R_Text_22C6F6: @ 822C6F6 MeteorFalls_1F_2R_Text_22C73F: @ 822C73F .string "Since we met, we have trained hard\n" .string "with our sights on number one.\p" - .string "Help us see how much stronger we’ve\n" + .string "Help us see how much stronger we've\n" .string "become!$" MeteorFalls_1F_2R_Text_22C7AD: @ 822C7AD .string "Urgh!\n" - .string "I didn’t expect you to be so strong!$" + .string "I didn't expect you to be so strong!$" MeteorFalls_1F_2R_Text_22C7D8: @ 822C7D8 - .string "You’ve obviously kept up your\n" + .string "You've obviously kept up your\n" .string "POKéMON training.\p" .string "So long as you remain strong, I, too,\n" .string "can become stronger!$" MeteorFalls_1F_2R_Text_22C843: @ 822C843 - .string "JOHN: We’ve always battled POKéMON\n" + .string "JOHN: We've always battled POKéMON\n" .string "together as a twosome.\l" - .string "We’ve confidence in ourselves.$" + .string "We've confidence in ourselves.$" MeteorFalls_1F_2R_Text_22C89C: @ 822C89C .string "JOHN: Oh, my.\n" - .string "We’ve lost, dear wife.$" + .string "We've lost, dear wife.$" MeteorFalls_1F_2R_Text_22C8C1: @ 822C8C1 - .string "JOHN: We’ve been married for\n" + .string "JOHN: We've been married for\n" .string "fifty years.\p" - .string "Come to think of it, I’ve yet to beat\n" + .string "Come to think of it, I've yet to beat\n" .string "my dear wife in a battle.$" MeteorFalls_1F_2R_Text_22C92B: @ 822C92B .string "JOHN: Well, well, what a young TRAINER!\p" - .string "Will you battle with us? If so, you’ll\n" + .string "Will you battle with us? If so, you'll\n" .string "have to return with more POKéMON.$" MeteorFalls_1F_2R_Text_22C99C: @ 822C99C @@ -123,14 +123,14 @@ MeteorFalls_1F_2R_Text_22C99C: @ 822C99C .string "arises, will you battle with us again?$" MeteorFalls_1F_2R_Text_22C9E6: @ 822C9E6 - .string "JAY: We’ve been married for\n" + .string "JAY: We've been married for\n" .string "fifty years.\p" .string "The bond we share as a couple could\n" .string "never be broken.$" MeteorFalls_1F_2R_Text_22CA44: @ 822CA44 .string "JAY: Oh, dear.\n" - .string "We’ve lost, my dear husband.$" + .string "We've lost, my dear husband.$" MeteorFalls_1F_2R_Text_22CA70: @ 822CA70 .string "JAY: Fifty years of marriage…\p" @@ -138,19 +138,19 @@ MeteorFalls_1F_2R_Text_22CA70: @ 822CA70 .string "it with a POKéMON battle…$" MeteorFalls_1F_2R_Text_22CACD: @ 822CACD - .string "JAY: Well, well, aren’t you a young\n" + .string "JAY: Well, well, aren't you a young\n" .string "TRAINER?\p" - .string "If you’d care to battle with us, you’ll\n" + .string "If you'd care to battle with us, you'll\n" .string "have to come back with more POKéMON.$" MeteorFalls_1F_2R_Text_22CB47: @ 822CB47 - .string "JOHN: We’ve always battled POKéMON\n" + .string "JOHN: We've always battled POKéMON\n" .string "together as a twosome.\l" - .string "We’ve confidence in ourselves.$" + .string "We've confidence in ourselves.$" MeteorFalls_1F_2R_Text_22CBA0: @ 822CBA0 .string "JOHN: Oh, my.\n" - .string "We’ve lost, dear wife.$" + .string "We've lost, dear wife.$" MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5 .string "JOHN: Married for fifty years…\p" @@ -159,18 +159,18 @@ MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5 MeteorFalls_1F_2R_Text_22CC27: @ 822CC27 .string "JOHN: Well, well, what a young TRAINER!\p" - .string "Will you battle with us? If so, you’ll\n" + .string "Will you battle with us? If so, you'll\n" .string "have to return with more POKéMON.$" MeteorFalls_1F_2R_Text_22CC98: @ 822CC98 - .string "JAY: We’ve been married for\n" + .string "JAY: We've been married for\n" .string "fifty years.\p" - .string "We’ve supported each other all that\n" - .string "time. We’ve made ourselves strong.$" + .string "We've supported each other all that\n" + .string "time. We've made ourselves strong.$" MeteorFalls_1F_2R_Text_22CD08: @ 822CD08 .string "JAY: Oh, dear.\n" - .string "We’ve lost, my dear husband.$" + .string "We've lost, my dear husband.$" MeteorFalls_1F_2R_Text_22CD34: @ 822CD34 .string "JAY: Fifty years of marriage…\n" @@ -179,8 +179,8 @@ MeteorFalls_1F_2R_Text_22CD34: @ 822CD34 .string "happy memories together.$" MeteorFalls_1F_2R_Text_22CDAB: @ 822CDAB - .string "JAY: Well, well, aren’t you a young\n" + .string "JAY: Well, well, aren't you a young\n" .string "TRAINER?\p" - .string "If you’d care to battle with us, you’ll\n" + .string "If you'd care to battle with us, you'll\n" .string "have to come back with more POKéMON.$" diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 3d7722487..738a7b6cd 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -29,20 +29,20 @@ MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1 .string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n" - .string "I’m amazed you knew where to find me.\p" + .string "I'm amazed you knew where to find me.\p" .string "Do you, uh…maybe think of me as\n" .string "just a rock maniac?\p" - .string "No, that can’t be right.\p" + .string "No, that can't be right.\p" .string "We battled alongside each other at\n" .string "the SOOTOPOLIS SPACE CENTER.\p" .string "You should have a very good idea\n" .string "about how good I am.\p" - .string "Okay, {PLAYER}{KUN}, if you’re going to mount\n" + .string "Okay, {PLAYER}{KUN}, if you're going to mount\n" .string "a serious challenge, expect the worst!$" MeteorFalls_StevensCave_Text_23B32D: @ 823B32D .string "You…\n" - .string "I had no idea you’d become so strong…$" + .string "I had no idea you'd become so strong…$" MeteorFalls_StevensCave_Text_23B358: @ 823B358 .string "STEVEN: Come to think of it, ever since\n" @@ -54,5 +54,5 @@ MeteorFalls_StevensCave_Text_23B358: @ 823B358 .string "And where will you go from here?\p" .string "… … … … … …\n" .string "… … … … … …\p" - .string "Fufufu, even I couldn’t tell you that.$" + .string "Fufufu, even I couldn't tell you that.$" diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index e031501d4..fe037074f 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -312,19 +312,19 @@ MossdeepCity_Movement_1E4CE2: @ 81E4CE2 step_end MossdeepCity_Text_1E4CED: @ 81E4CED - .string "I got this from STEVEN, but I don’t\n" - .string "know what it’s good for.\p" - .string "I think it’s called KING’S ROCK.\n" + .string "I got this from STEVEN, but I don't\n" + .string "know what it's good for.\p" + .string "I think it's called KING'S ROCK.\n" .string "Do you want it?$" MossdeepCity_Text_1E4D5B: @ 81E4D5B .string "Why would you want it?\n" - .string "You’re weird.\p" + .string "You're weird.\p" .string "You can keep it, but keep it a secret\n" .string "from STEVEN.$" MossdeepCity_Text_1E4DB3: @ 81E4DB3 - .string "STEVEN’s house is right over there!$" + .string "STEVEN's house is right over there!$" MossdeepCity_Text_1E4DD7: @ 81E4DD7 .string "Yeah, you think so, too! What are you\n" @@ -333,19 +333,19 @@ MossdeepCity_Text_1E4DD7: @ 81E4DD7 MossdeepCity_Text_1E4E22: @ 81E4E22 .string "Around MOSSDEEP, you can see wild\n" .string "WAILMER.\p" - .string "It’s called, uh…\n" + .string "It's called, uh…\n" .string "What was it now…\p" .string "WAI, WAI, WAI…\p" .string "WAILMER watching!$" MossdeepCity_Text_1E4E90: @ 81E4E90 - .string "The island’s SPACE CENTER has been\n" + .string "The island's SPACE CENTER has been\n" .string "launching huge rockets.\p" - .string "There’s been some kind of an uproar\n" + .string "There's been some kind of an uproar\n" .string "over a letter they received recently.$" MossdeepCity_Text_1E4F15: @ 81E4F15 - .string "The island’s SPACE CENTER has been\n" + .string "The island's SPACE CENTER has been\n" .string "launching huge rockets.$" MossdeepCity_Text_1E4F50: @ 81E4F50 @@ -353,19 +353,19 @@ MossdeepCity_Text_1E4F50: @ 81E4F50 .string "TEAM AQUA set up shop in LILYCOVE.\p" .string "I also heard that someone came along\n" .string "and wiped the floor with them!\p" - .string "But MOSSDEEP here’s been targeted\n" + .string "But MOSSDEEP here's been targeted\n" .string "by that TEAM MAGMA.\p" - .string "If you want to know what they’re up to,\n" + .string "If you want to know what they're up to,\n" .string "go visit the SPACE CENTER.$" MossdeepCity_Text_1E5051: @ 81E5051 - .string "I’m a SAILOR, so the sea’s obviously\n" + .string "I'm a SAILOR, so the sea's obviously\n" .string "more important to me.\p" .string "But you know? When I get back on land\n" .string "after a long voyage, I do feel relief!$" MossdeepCity_Text_1E50D9: @ 81E50D9 - .string "Wouldn’t it be nice?\p" + .string "Wouldn't it be nice?\p" .string "If the whole world was covered in\n" .string "plants and flowers like this island?$" @@ -382,8 +382,8 @@ MossdeepCity_Text_1E5213: @ 81E5213 .string "A voyage on a ship is fine.\p" .string "But crossing the sea with POKéMON\n" .string "using SURF…\p" - .string "Now that’s an exhilarating trip!\n" - .string "Wouldn’t you agree, youngster?$" + .string "Now that's an exhilarating trip!\n" + .string "Wouldn't you agree, youngster?$" MossdeepCity_Text_1E529D: @ 81E529D .string "This rock has a special meaning to\n" @@ -393,10 +393,10 @@ MossdeepCity_Text_1E529D: @ 81E529D .string "When you make a wish, what do you use?\n" .string "Do you wish upon a star?\p" .string "I use a wish tag to make it happen.\n" - .string "That’s what I do.$" + .string "That's what I do.$" MossdeepCity_Text_1E5396: @ 81E5396 - .string "It’s a white rock.$" + .string "It's a white rock.$" MossdeepCity_Text_1E53A9: @ 81E53A9 .string "MOSSDEEP CITY POKéMON GYM\n" @@ -413,15 +413,15 @@ MossdeepCity_Text_1E541F: @ 81E541F MossdeepCity_Text_1E5453: @ 81E5453 .string "SCOTT: {PLAYER}{KUN}, feeling good?\n" - .string "I’m doing great!\p" - .string "I’d heard MOSSDEEP’s GYM LEADER is\n" + .string "I'm doing great!\p" + .string "I'd heard MOSSDEEP's GYM LEADER is\n" .string "pretty strong, so I decided to come\l" .string "take a look-see for myself.\p" - .string "But there’s something wrong about\n" + .string "But there's something wrong about\n" .string "this town.\p" .string "People are going on about a warning\n" .string "letter and the SPACE CENTER…\p" - .string "I don’t think it concerns me in any\n" + .string "I don't think it concerns me in any\n" .string "way, though.$" MossdeepCity_Text_1E5581: @ 81E5581 diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index e45e9eb66..ed10a8309 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -33,7 +33,7 @@ MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 .string "When I was young, I traveled the world\n" .string "as a POKéMON TRAINER.\p" - .string "Now that I’ve become an old buzzard,\n" + .string "Now that I've become an old buzzard,\n" .string "my only amusement is watching young\l" .string "TRAINERS battle.$" @@ -47,12 +47,12 @@ MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C .string "{STR_VAR_1}?$" MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64 - .string "You won’t battle? I’m disappointed\n" - .string "that I can’t see you battle…$" + .string "You won't battle? I'm disappointed\n" + .string "that I can't see you battle…$" MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4 .string "Oh, good, good!\p" - .string "But my house isn’t all that sturdy.\p" + .string "But my house isn't all that sturdy.\p" .string "Could I ask you to keep it down to\n" .string "a 3-on-3 match?$" diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 66c484365..f42b3f4e4 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -374,22 +374,22 @@ MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF end MossdeepCity_Gym_Text_220CD5: @ 8220CD5 - .string "Yo, how’s it going, CHAMPION-bound\n" + .string "Yo, how's it going, CHAMPION-bound\n" .string "{PLAYER}?\p" .string "The GYM LEADERS here use\n" .string "PSYCHIC-type POKéMON.\p" .string "If you go up against them with\n" .string "FIGHTING- or POISON-type POKéMON,\l" - .string "they’ll inflict horrible damage!\p" - .string "Plus, they’ll come at you with\n" + .string "they'll inflict horrible damage!\p" + .string "Plus, they'll come at you with\n" .string "outstanding combination attacks.\p" - .string "If you want to win, you’ll need to show\n" + .string "If you want to win, you'll need to show\n" .string "them how tight you are with your\l" .string "POKéMON. Go for it!$" MossdeepCity_Gym_Text_220E2A: @ 8220E2A - .string "Wow, you’re astounding!\n" - .string "You’re one great TRAINER!$" + .string "Wow, you're astounding!\n" + .string "You're one great TRAINER!$" MossdeepCity_Gym_Text_220E5C: @ 8220E5C .string "Battles hinge on the strength of your\n" @@ -401,7 +401,7 @@ MossdeepCity_Gym_Text_220EAC: @ 8220EAC MossdeepCity_Gym_Text_220ED3: @ 8220ED3 .string "The indecisive lose.\n" - .string "That’s my warning to you.$" + .string "That's my warning to you.$" MossdeepCity_Gym_Text_220F02: @ 8220F02 .string "Let me see your talent!$" @@ -420,7 +420,7 @@ MossdeepCity_Gym_Text_220FB0: @ 8220FB0 .string "BALL telekinetically!\p" .string "Wrooooooooaaaar!\n" .string "… … … … … … …\p" - .string "Sometimes, I’m out of sync…$" + .string "Sometimes, I'm out of sync…$" MossdeepCity_Gym_Text_221024: @ 8221024 .string "My POKéMON battling skills are out\n" @@ -431,22 +431,22 @@ MossdeepCity_Gym_Text_221055: @ 8221055 .string "psychically. But this dust bunny…\p" .string "Whoooooooooooooooh!\n" .string "… … … … … …\p" - .string "No, I’m not cheating!\n" - .string "I didn’t blow on it! Honestly!$" + .string "No, I'm not cheating!\n" + .string "I didn't blow on it! Honestly!$" MossdeepCity_Gym_Text_2210EE: @ 82210EE - .string "When you lose to me, don’t be too hard\n" + .string "When you lose to me, don't be too hard\n" .string "on yourself.\p" - .string "It’s not that you’re weak--I’m just\n" + .string "It's not that you're weak--I'm just\n" .string "too strong!$" MossdeepCity_Gym_Text_221152: @ 8221152 - .string "You’re just too strong!$" + .string "You're just too strong!$" MossdeepCity_Gym_Text_22116A: @ 822116A - .string "I’m not going to get down on myself for\n" + .string "I'm not going to get down on myself for\n" .string "losing. I just need to train harder.\p" - .string "Positive thinking--that’s my strong\n" + .string "Positive thinking--that's my strong\n" .string "point!$" MossdeepCity_Gym_Text_2211E2: @ 82211E2 @@ -462,16 +462,16 @@ MossdeepCity_Gym_Text_22123D: @ 822123D .string "You will wage a terrifically intense\n" .string "battle with our GYM LEADERS…\p" .string "The result…\n" - .string "You won’t hear it from me!$" + .string "You won't hear it from me!$" MossdeepCity_Gym_Text_2212A6: @ 82212A6 .string "The roads you have traveled…\n" .string "What you have experienced…\p" - .string "Come at me with everything you’ve\n" + .string "Come at me with everything you've\n" .string "learned!$" MossdeepCity_Gym_Text_221309: @ 8221309 - .string "You’ve traveled a path of greatness!$" + .string "You've traveled a path of greatness!$" MossdeepCity_Gym_Text_22132E: @ 822132E .string "A bright future awaits those who have\n" @@ -490,7 +490,7 @@ MossdeepCity_Gym_Text_2213F4: @ 82213F4 MossdeepCity_Gym_Text_221412: @ 8221412 .string "How dare you beat me…\p" - .string "It won’t be my fault if something\n" + .string "It won't be my fault if something\n" .string "horrible befalls you…$" MossdeepCity_Gym_Text_221460: @ 8221460 @@ -503,7 +503,7 @@ MossdeepCity_Gym_Text_2214A7: @ 82214A7 .string "Your battle style is fantastic!$" MossdeepCity_Gym_Text_2214D3: @ 82214D3 - .string "I… I don’t let defeat rattle m-me,\n" + .string "I… I don't let defeat rattle m-me,\n" .string "however b-badly.$" MossdeepCity_Gym_Text_221507: @ 8221507 @@ -530,7 +530,7 @@ MossdeepCity_Gym_Text_2215E2: @ 82215E2 .string "your youthful energy.$" MossdeepCity_Gym_Text_22161B: @ 822161B - .string "You’re not getting through to the end!\n" + .string "You're not getting through to the end!\n" .string "Not if I can help it!$" MossdeepCity_Gym_Text_221658: @ 8221658 @@ -538,7 +538,7 @@ MossdeepCity_Gym_Text_221658: @ 8221658 .string "strong?$" MossdeepCity_Gym_Text_221680: @ 8221680 - .string "Humph! You may be strong, but you’re\n" + .string "Humph! You may be strong, but you're\n" .string "not suitable for the PSYCHIC type!\p" .string "The way you battle is somehow brutal!$" @@ -551,7 +551,7 @@ MossdeepCity_Gym_Text_22172D: @ 822172D .string "Done in!$" MossdeepCity_Gym_Text_22173A: @ 822173A - .string "All right! I think I’ll develop a special\n" + .string "All right! I think I'll develop a special\n" .string "invincible POKéMON power next.$" MossdeepCity_Gym_Text_221783: @ 8221783 @@ -559,9 +559,9 @@ MossdeepCity_Gym_Text_221783: @ 8221783 .string "LIZA: Fufufu… Were you surprised?\p" .string "TATE: That there are two GYM LEADERS?\n" .string "LIZA: That there are two GYM LEADERS?\p" - .string "TATE: We’re twins!\n" - .string "LIZA: We’re twins!\p" - .string "TATE: We don’t need to talk because…\n" + .string "TATE: We're twins!\n" + .string "LIZA: We're twins!\p" + .string "TATE: We don't need to talk because…\n" .string "LIZA: We can each determine what…\p" .string "TATE: The other is thinking…\n" .string "LIZA: All in our minds!\p" @@ -571,7 +571,7 @@ MossdeepCity_Gym_Text_221783: @ 8221783 MossdeepCity_Gym_Text_2218EC: @ 82218EC .string "TATE: What?! Our combination…\n" .string "LIZA: Was shattered!\p" - .string "TATE: It can’t be helped. You’ve won…\n" + .string "TATE: It can't be helped. You've won…\n" .string "LIZA: So, in recognition, take this.$" MossdeepCity_Gym_Text_22196A: @ 822196A @@ -590,7 +590,7 @@ MossdeepCity_Gym_Text_221A40: @ 8221A40 .string "LIZA: CALM MIND!\p" .string "TATE: It raises SP. ATK and…\n" .string "LIZA: It raises SP. DEF!\p" - .string "TATE: It’s a move that’s perfect…\n" + .string "TATE: It's a move that's perfect…\n" .string "LIZA: For PSYCHIC POKéMON!\p" .string "… … … … … …$" @@ -603,14 +603,14 @@ MossdeepCity_Gym_Text_221B1D: @ 8221B1D .string "and your POKéMON is far stronger than\l" .string "the bond that we share as twins.\p" .string "LIZA: You will become even stronger!\n" - .string "We’ve battled you, so we know.$" + .string "We've battled you, so we know.$" MossdeepCity_Gym_Text_221BCE: @ 8221BCE .string "TATE: Hehehe… Were you surprised?\p" .string "LIZA: That there are two GYM LEADERS?\p" .string "TATE: Oops, you have only one…\n" .string "LIZA: POKéMON that can battle.\p" - .string "TATE: We can’t battle that way!\p" + .string "TATE: We can't battle that way!\p" .string "LIZA: If you want to challenge us,\n" .string "bring some more POKéMON.$" @@ -619,34 +619,34 @@ MossdeepCity_Gym_Text_221CB0: @ 8221CB0 MossdeepCity_Gym_Text_221CCA: @ 8221CCA .string "MOSSDEEP CITY POKéMON GYM\p" - .string "LIZA AND TATE’S CERTIFIED TRAINERS:\n" + .string "LIZA AND TATE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" MossdeepCity_Gym_Text_221D0B: @ 8221D0B .string "TATE: POKéMON…\n" .string "LIZA: POKéMON…\p" - .string "TATE: By changing the party’s mix…\n" + .string "TATE: By changing the party's mix…\n" .string "LIZA: The battle style changes.\p" .string "TATE: But me…\n" .string "LIZA: But me…\p" - .string "TATE: I’ll always be with LIZA!\n" - .string "LIZA: I’ll always be with TATE!\p" + .string "TATE: I'll always be with LIZA!\n" + .string "LIZA: I'll always be with TATE!\p" .string "TATE: Our combination…\n" - .string "LIZA: We’ll show you again and again!$" + .string "LIZA: We'll show you again and again!$" MossdeepCity_Gym_Text_221E05: @ 8221E05 .string "TATE: You and your POKéMON…\n" - .string "LIZA: It’s as if you were siblings!$" + .string "LIZA: It's as if you were siblings!$" MossdeepCity_Gym_Text_221E45: @ 8221E45 .string "TATE: You can knock us down,\n" - .string "but we’ll never stay down!\p" + .string "but we'll never stay down!\p" .string "LIZA: Because the two of us,\n" .string "we always support each other!$" MossdeepCity_Gym_Text_221EB8: @ 8221EB8 - .string "TATE: You’re back again…\n" - .string "LIZA: You’re back again…\p" + .string "TATE: You're back again…\n" + .string "LIZA: You're back again…\p" .string "TATE: To give us a rematch.\n" .string "LIZA: To give us a rematch.\p" .string "TATE: But…\n" diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index 056e2b057..4a5da3b16 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -28,12 +28,12 @@ MossdeepCity_House1_Text_22200F: @ 822200F MossdeepCity_House1_Text_22201D: @ 822201D .string "It likes {STR_VAR_1}S,\n" - .string "doesn’t it?\p" - .string "No, I’m positive of it! It definitely\n" + .string "doesn't it?\p" + .string "No, I'm positive of it! It definitely\n" .string "likes {STR_VAR_1}S!$" MossdeepCity_House1_Text_222068: @ 8222068 - .string "It doesn’t appear to like or dislike\n" + .string "It doesn't appear to like or dislike\n" .string "any {POKEBLOCK}S.$" MossdeepCity_House1_Text_222099: @ 8222099 diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 84dcc8244..863bb4eda 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -56,13 +56,13 @@ MossdeepCity_House2_Movement_222141: @ 8222141 MossdeepCity_House2_Text_222146: @ 8222146 .string "My little sister exchanges MAIL with\n" .string "her boyfriend in FORTREE.\p" - .string "I don’t envy her one bit at all.$" + .string "I don't envy her one bit at all.$" MossdeepCity_House2_Text_2221A6: @ 82221A6 - .string "Even though I can’t see my friend in\n" + .string "Even though I can't see my friend in\n" .string "FORTREE, my POKéMON carries MAIL\l" .string "back and forth for us.\p" - .string "I’m not lonesome, even though we’re\n" + .string "I'm not lonesome, even though we're\n" .string "apart.$" MossdeepCity_House2_Text_22222E: @ 822222E diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index be294f292..2d4fd04ad 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -32,19 +32,19 @@ MossdeepCity_House3_Text_222616: @ 8222616 .string "Say all you want, but this baby can\n" .string "catch POKéMON off the seafloor!\p" .string "What do you think?\n" - .string "You want it, don’t you?$" + .string "You want it, don't you?$" MossdeepCity_House3_Text_2226B6: @ 82226B6 .string "You bet, you bet!\n" .string "After all, a SUPER ROD is really super!$" MossdeepCity_House3_Text_2226F0: @ 82226F0 - .string "If there’s any water, try dropping in\n" + .string "If there's any water, try dropping in\n" .string "your ROD and see what bites!$" MossdeepCity_House3_Text_222733: @ 8222733 .string "Hunh?\n" - .string "Don’t you like to fish?$" + .string "Don't you like to fish?$" MossdeepCity_House3_Text_222751: @ 8222751 .string "Go after the seafloor POKéMON with\n" diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index 66d76aa41..627340b5c 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -43,11 +43,11 @@ MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E MossdeepCity_House4_Text_222E31: @ 8222E31 .string "My little brother says he likes to go\n" - .string "find people’s SECRET BASES.$" + .string "find people's SECRET BASES.$" MossdeepCity_House4_Text_222E73: @ 8222E73 .string "My little brother says he likes to\n" - .string "visit people’s SECRET BASES and have\l" + .string "visit people's SECRET BASES and have\l" .string "POKéMON battles.$" MossdeepCity_House4_Text_222ECC: @ 8222ECC @@ -56,7 +56,7 @@ MossdeepCity_House4_Text_222ECC: @ 8222ECC MossdeepCity_House4_Text_222EF7: @ 8222EF7 .string "You should make a SECRET BASE\n" - .string "somewhere. I’ll go find it!$" + .string "somewhere. I'll go find it!$" MossdeepCity_House4_Text_222F31: @ 8222F31 .string "SKITTY: Miyaan?$" diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index b995b396e..11c911c45 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -42,7 +42,7 @@ MossdeepCity_Mart_Text_222411: @ 8222411 .string "REVIVE is fantastic!\p" .string "Give it to a fainted POKéMON,\n" .string "and the POKéMON will arise.\p" - .string "But be careful, REVIVE doesn’t restore\n" + .string "But be careful, REVIVE doesn't restore\n" .string "the used-up PP of moves.$" MossdeepCity_Mart_Text_2224A0: @ 82224A0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 6027591ee..32eac1540 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -290,41 +290,41 @@ MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 step_end MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 - .string "The rocket’s launch is imminent!$" + .string "The rocket's launch is imminent!$" MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8 .string "The rocket launched safely!\n" - .string "That’s successful launch no. {STR_VAR_1}!$" + .string "That's successful launch no. {STR_VAR_1}!$" MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305 .string "I know that things are a little\n" .string "haywire right now, but…\p" - .string "The rocket’s launch is imminent!$" + .string "The rocket's launch is imminent!$" MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E .string "I know that things are a little\n" .string "haywire right now, but…\p" .string "The rocket launched safely!\n" - .string "That’s successful launch no. {STR_VAR_1}!$" + .string "That's successful launch no. {STR_VAR_1}!$" MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3 .string "A rocket launch demands perfection.\n" .string "Not even a 1% margin of error is allowed.\p" - .string "Even if it’s 99% okay, the whole thing\n" + .string "Even if it's 99% okay, the whole thing\n" .string "is useless if 1% happens to be no good.\p" .string "Despite that, we never stop trying.\n" - .string "Why? It’s a dream that never ends.$" + .string "Why? It's a dream that never ends.$" MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7 .string "Those MAGMA thugs have their sights\n" .string "set on our SPACE CENTER.\p" - .string "But we can’t allow anything that minor\n" + .string "But we can't allow anything that minor\n" .string "to interfere with our rocket launch!$" MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540 .string "I was taking a stroll down the beach\n" .string "when I found this.\p" - .string "It’s not anything I need, so you can\n" + .string "It's not anything I need, so you can\n" .string "have it.$" MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6 @@ -332,14 +332,14 @@ MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6 .string "its meteor showers for a long time.$" MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0 - .string "TEAM MAGMA can’t be allowed to steal\n" + .string "TEAM MAGMA can't be allowed to steal\n" .string "the rocket fuel.\p" .string "Oh, by the way, you can have this stone\n" .string "I found on the beach.$" MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664 .string "With TEAM MAGMA around, I guess\n" - .string "strolls on the beach aren’t safe.$" + .string "strolls on the beach aren't safe.$" MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6 .string "Some people claim that POKéMON came\n" @@ -349,7 +349,7 @@ MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8 .string "TEAM AQUA should take care of\n" .string "TEAM MAGMA!\p" .string "But if they did that, TEAM AQUA will\n" - .string "become bold and brazen, won’t they?$" + .string "become bold and brazen, won't they?$" MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B .string "A giant chunk of metal bursts through\n" @@ -361,46 +361,46 @@ MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5 .string "the skies and flies into space…\p" .string "But TEAM MAGMA wants to spoil\n" .string "that dream of mine!\p" - .string "I’m not having any of that!$" + .string "I'm not having any of that!$" MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849 .string "STEVEN: {PLAYER}{KUN}, have you read that\n" .string "proclamation already?\p" .string "TEAM MAGMA is coming after the rocket\n" .string "fuel on this island.\p" - .string "I don’t know what they’d need it for,\n" - .string "but they can’t be allowed to take it.\p" - .string "I’ll keep an eye on things for\n" + .string "I don't know what they'd need it for,\n" + .string "but they can't be allowed to take it.\p" + .string "I'll keep an eye on things for\n" .string "a while longer.\p" - .string "In the meantime, why don’t you go\n" + .string "In the meantime, why don't you go\n" .string "check out the town?$" MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C - .string "As promised, we’ve come for\n" + .string "As promised, we've come for\n" .string "the rocket fuel!$" MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999 .string "Ran out of fuel…$" MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA - .string "Don’t think you’re on a roll just\n" - .string "because you’ve beaten me!$" + .string "Don't think you're on a roll just\n" + .string "because you've beaten me!$" MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6 .string "We gave you fair warning!\n" - .string "There’s nothing sneaky about us!$" + .string "There's nothing sneaky about us!$" MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21 .string "Grrr…\n" - .string "We should’ve used sneaky treachery…$" + .string "We should've used sneaky treachery…$" MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B .string "Okay, I get it already! The next time,\n" - .string "we’ll come unannounced.$" + .string "we'll come unannounced.$" MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A .string "The rocket fuel the SPACE CENTER has\n" - .string "in storage--that’s what we’re after.\p" + .string "in storage--that's what we're after.\p" .string "We mean to take every last bit of it!$" MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA @@ -432,7 +432,7 @@ MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C .string "How are you? We are doing fine.\p" .string "“We will soon visit you to take your\n" .string "rocket fuel.\p" - .string "“Please don’t try to stop us.\n" + .string "“Please don't try to stop us.\n" .string "We will take the fuel no matter what.\p" .string "“Let there be more land!\n" .string " TEAM MAGMAâ€$" diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 22fcc1476..3c31ec06c 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -375,7 +375,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1 .string "MOSSDEEP has mainly sunny weather,\n" .string "and its winds are stable.\p" - .string "It’s an ideal location for launching\n" + .string "It's an ideal location for launching\n" .string "rockets.$" MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C @@ -385,13 +385,13 @@ MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253 .string "If only I was a little younger, I would\n" .string "have liked being an astronaut…\p" - .string "No… It’s not too late!\n" + .string "No… It's not too late!\n" .string "I can and will try!$" MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5 .string "If TEAM MAGMA takes the rocket fuel,\n" - .string "I won’t be able to go to space!\p" - .string "They can’t be allowed to get away\n" + .string "I won't be able to go to space!\p" + .string "They can't be allowed to get away\n" .string "with such an outrage!$" MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342 @@ -403,25 +403,25 @@ MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376 .string "Do they want to go to space, too?$" MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4 - .string "What’s wrong with you?\p" - .string "You’re outnumbered three to one,\n" + .string "What's wrong with you?\p" + .string "You're outnumbered three to one,\n" .string "but you still want to take us on?$" MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE .string "Good answer!\n" - .string "That’s what a smart person’ll do!$" + .string "That's what a smart person'll do!$" MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D .string "A reckless go-getter, are you?\n" - .string "Okay, I’ll go first!$" + .string "Okay, I'll go first!$" MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461 .string "I lost!\n" .string "But!$" MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E - .string "It’s too soon to be relieved!\n" - .string "I’m up next!$" + .string "It's too soon to be relieved!\n" + .string "I'm up next!$" MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499 .string "I lost, too!\n" @@ -429,11 +429,11 @@ MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499 MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB .string "I bet you want to take a break.\n" - .string "But I’m not about to let you do that!$" + .string "But I'm not about to let you do that!$" MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1 - .string "We should’ve taken a break…\n" - .string "That’s what we should’ve done…$" + .string "We should've taken a break…\n" + .string "That's what we should've done…$" MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C .string "Three of us here, and look at the sorry\n" @@ -450,34 +450,34 @@ MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9 .string "Hehehe!\p" .string "We come all the way here to get some\n" - .string "fuel, and we’re interfered with again!\p" - .string "If you’re going to mess with us too,\n" - .string "we’ll take care of you at the same time!$" + .string "fuel, and we're interfered with again!\p" + .string "If you're going to mess with us too,\n" + .string "we'll take care of you at the same time!$" MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B .string "MAXIE: Clear out of the way!\n" - .string "Don’t you dare interfere!$" + .string "Don't you dare interfere!$" MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2 .string "STEVEN: TEAM MAGMA…\p" - .string "What’s the point of stealing rocket\n" + .string "What's the point of stealing rocket\n" .string "fuel?$" MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0 - .string "MAXIE: Fufufu… Since you’re so\n" + .string "MAXIE: Fufufu… Since you're so\n" .string "curious, you deserve an explanation.\p" - .string "We’re going to jettison the entire\n" + .string "We're going to jettison the entire\n" .string "load into MT. CHIMNEY!\p" .string "With GROUDON gone, we have no need\n" .string "for that slag heap of a mountain!\p" - .string "So we’ll use the fuel’s power to make\n" + .string "So we'll use the fuel's power to make\n" .string "the volcano erupt!\p" .string "It will be savage!$" MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF .string "STEVEN: {PLAYER}{KUN}!\n" - .string "You’re going to help me?\p" - .string "Let’s go into battle together!\n" + .string "You're going to help me?\p" + .string "Let's go into battle together!\n" .string "Are you ready?$" MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854 @@ -489,7 +489,7 @@ MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C .string "I just want to expand the land mass…$" MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD - .string "I’m with our leader…$" + .string "I'm with our leader…$" MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 .string "MAXIE: We failed to make the volcano\n" @@ -503,7 +503,7 @@ MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 .string "If…\n" .string "If we, TEAM MAGMA, are wrong…\l" .string "… … … … … …\p" - .string "Then might TEAM AQUA’s goal to expand\n" + .string "Then might TEAM AQUA's goal to expand\n" .string "the sea also be equally misguided?$" MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC @@ -519,6 +519,6 @@ MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A .string "thanks for your support.\p" .string "Please come see me at home\n" .string "after this.\p" - .string "Oh, yes, I don’t live in RUSTBORO CITY.\n" + .string "Oh, yes, I don't live in RUSTBORO CITY.\n" .string "I live right here on this island.$" diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 2c8aef889..297af90d3 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -155,26 +155,26 @@ MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926 MossdeepCity_StevensHouse_Text_222936: @ 8222936 .string "STEVEN: {PLAYER}{KUN}…\p" - .string "As you can see, there’s not much here,\n" + .string "As you can see, there's not much here,\n" .string "but this is my home.\p" - .string "Thank you for all that you’ve done.\p" + .string "Thank you for all that you've done.\p" .string "This is my token of appreciation.\n" - .string "It’s the HIDDEN MACHINE DIVE.\p" - .string "No need to be shy--you’ve earned\n" + .string "It's the HIDDEN MACHINE DIVE.\p" + .string "No need to be shy--you've earned\n" .string "this HM.$" MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E - .string "STEVEN: While you’re using SURF, you\n" + .string "STEVEN: While you're using SURF, you\n" .string "should notice dark patches of water.\p" .string "Use DIVE if you come to deep water\n" - .string "like it. You’ll drop to the seafloor.\p" + .string "like it. You'll drop to the seafloor.\p" .string "When you want to come back up, use\n" .string "DIVE again.\p" - .string "In some places, it won’t be possible\n" + .string "In some places, it won't be possible\n" .string "for you to surface, though.$" MossdeepCity_StevensHouse_Text_222B11: @ 8222B11 - .string "STEVEN: Apparently, there’s an\n" + .string "STEVEN: Apparently, there's an\n" .string "underwater cavern between\l" .string "MOSSDEEP and SOOTOPOLIS.\p" .string "You know, the one that CAPT. STERN\n" @@ -197,23 +197,23 @@ MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A .string "it was.$" MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E - .string "It’s a letter.\p" + .string "It's a letter.\p" .string "… … … … … …\p" .string "To {PLAYER}{KUN}…\p" - .string "I’ve decided to do a little soul-\n" + .string "I've decided to do a little soul-\n" .string "searching and train on the road.\p" - .string "I don’t plan to return home for some\n" + .string "I don't plan to return home for some\n" .string "time.\p" .string "I have a favor to ask of you.\p" .string "I want you to take the POKé BALL on\n" .string "the desk.\p" .string "Inside it is a BELDUM, my favorite\n" .string "POKéMON.\p" - .string "I’m counting on you.\p" + .string "I'm counting on you.\p" .string "May our paths cross someday.\p" .string "STEVEN STONE$" MossdeepCity_StevensHouse_Text_222D97: @ 8222D97 - .string "It’s a collection of rare rocks and\n" + .string "It's a collection of rare rocks and\n" .string "stones assembled by STEVEN.$" diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index ddd8b8d42..88df5692e 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -553,7 +553,7 @@ MtChimney_EventScript_22F253:: @ 822F253 MtChimney_Text_22F26A: @ 822F26A .string "The power contained in the METEORITE…\p" .string "By amplifying its power with this\n" - .string "machine, MT. CHIMNEY’s volcanic\l" + .string "machine, MT. CHIMNEY's volcanic\l" .string "activity will instantly intensify…\p" .string "Its energy will grow deep inside\n" .string "the crater and…\l" @@ -564,11 +564,11 @@ MtChimney_Text_22F32E: @ 822F32E .string "Who are you?\p" .string "… … … … … …\n" .string "… … … … … …\p" - .string "I’d heard ARCHIE bemoaning a child\n" - .string "who’s been meddling in TEAM AQUA’s\l" + .string "I'd heard ARCHIE bemoaning a child\n" + .string "who's been meddling in TEAM AQUA's\l" .string "affairs.\p" .string "It must be you he meant.\p" - .string "Humph! So you’re thinking of\n" + .string "Humph! So you're thinking of\n" .string "interfering with us, TEAM MAGMA?\p" .string "Now you listen.\n" .string "Long ago, living things used the\l" @@ -584,7 +584,7 @@ MtChimney_Text_22F32E: @ 822F32E .string "Oh! There was no need for you to\n" .string "learn that much.\p" .string "But, no matter!\n" - .string "I’ll teach you the consequences of\l" + .string "I'll teach you the consequences of\l" .string "meddling in our grand design!$" MtChimney_Text_22F5CF: @ 822F5CF @@ -594,35 +594,35 @@ MtChimney_Text_22F5CF: @ 822F5CF MtChimney_Text_22F5F7: @ 822F5F7 .string "MAXIE: But, enough.\n" .string "I will back off this time.\p" - .string "But don’t think that this is the last\n" - .string "you’ve seen of TEAM MAGMA.\p" + .string "But don't think that this is the last\n" + .string "you've seen of TEAM MAGMA.\p" .string "Fufufu…\p" .string "Even without the METEORITE, if we\n" .string "obtain that ORB… Fufufu…$" MtChimney_Text_22F6AA: @ 822F6AA .string "Hehehe!\p" - .string "So you’ve come all the way here!\p" - .string "But you’re too late!\n" - .string "I’ve already delivered the METEORITE\l" + .string "So you've come all the way here!\p" + .string "But you're too late!\n" + .string "I've already delivered the METEORITE\l" .string "from METEOR FALLS to the BOSS!$" MtChimney_Text_22F72C: @ 822F72C .string "Hehehe…\p" - .string "Even though I’ve lost, if our leader\n" + .string "Even though I've lost, if our leader\n" .string "awakens that thing…$" MtChimney_Text_22F76D: @ 822F76D .string "BOSS, hurry!\n" - .string "Give it the METEORITE’s energy!\p" + .string "Give it the METEORITE's energy!\p" .string "Hehehe…$" MtChimney_Text_22F7A2: @ 822F7A2 .string "We of TEAM MAGMA are working hard for\n" - .string "everyone’s sake.\p" - .string "Like, if that thing’s power made more\n" - .string "land, there’d be more places to live.\p" - .string "Everyone’d be happy!$" + .string "everyone's sake.\p" + .string "Like, if that thing's power made more\n" + .string "land, there'd be more places to live.\p" + .string "Everyone'd be happy!$" MtChimney_Text_22F83A: @ 822F83A .string "Hunh?\n" @@ -635,9 +635,9 @@ MtChimney_Text_22F859: @ 822F859 .string "in our way?$" MtChimney_Text_22F8B6: @ 822F8B6 - .string "If there were more land, I’d be able\n" + .string "If there were more land, I'd be able\n" .string "to get a big house of my own!\p" - .string "I’m going to build it on hardened lava!$" + .string "I'm going to build it on hardened lava!$" MtChimney_Text_22F921: @ 822F921 .string "My dream of a big house…$" @@ -654,14 +654,14 @@ MtChimney_Text_22F9B2: @ 822F9B2 .string "METEORITES pack amazing power!$" MtChimney_Text_22F9D1: @ 822F9D1 - .string "You’d better not mess with us!\p" - .string "We’re trying to awaken that thing\n" + .string "You'd better not mess with us!\p" + .string "We're trying to awaken that thing\n" .string "for the benefit of everyone!$" MtChimney_Text_22FA2F: @ 822FA2F - .string "We’re TEAM MAGMA!\p" - .string "They’re TEAM AQUA!\p" - .string "It totally annoys me that they’d\n" + .string "We're TEAM MAGMA!\p" + .string "They're TEAM AQUA!\p" + .string "It totally annoys me that they'd\n" .string "use a name like ours!$" MtChimney_Text_22FA8B: @ 822FA8B @@ -669,25 +669,25 @@ MtChimney_Text_22FA8B: @ 822FA8B .string "Douse them in fire!$" MtChimney_Text_22FAA5: @ 822FAA5 - .string "We’re going to keep making more land!$" + .string "We're going to keep making more land!$" MtChimney_Text_22FACB: @ 822FACB .string "Bufoh!$" MtChimney_Text_22FAD2: @ 822FAD2 .string "ARCHIE: Grr, {PLAYER}!\n" - .string "I should’ve guessed you’d show up!\p" + .string "I should've guessed you'd show up!\p" .string "See for yourself what the fanatics\n" .string "of TEAM MAGMA are up to!\p" - .string "They’re trying to inject the stolen\n" - .string "METEORITE’s power into the volcano!\p" + .string "They're trying to inject the stolen\n" + .string "METEORITE's power into the volcano!\p" .string "Doing something like that will cause\n" - .string "the volcano’s eruption!$" + .string "the volcano's eruption!$" MtChimney_Text_22FBC7: @ 822FBC7 .string "ARCHIE: Grrr…\p" .string "I want to stop that MAXIE,\n" - .string "but I can’t!\p" + .string "but I can't!\p" .string "Not when I have my hands full battling\n" .string "three opponents at once!$" @@ -695,42 +695,42 @@ MtChimney_Text_22FC3D: @ 822FC3D .string "ARCHIE: {PLAYER}!\n" .string "Thank you!\p" .string "With your help, we thwarted TEAM\n" - .string "MAGMA’s destructive plan!\p" + .string "MAGMA's destructive plan!\p" .string "But… You…\n" .string "Whose side are you on?\p" - .string "Ah, it doesn’t matter.\p" + .string "Ah, it doesn't matter.\p" .string "We will remain vigilant and keep up\n" .string "our pursuit of TEAM MAGMA.\p" .string "{PLAYER}, we shall meet again!$" MtChimney_Text_22FD1F: @ 822FD1F .string "Darn… TEAM MAGMA outnumbers us!\n" - .string "We can’t keep up with them!$" + .string "We can't keep up with them!$" MtChimney_Text_22FD5B: @ 822FD5B - .string "If they expand the land, there’ll be\n" + .string "If they expand the land, there'll be\n" .string "less habitats for WATER POKéMON!$" MtChimney_Text_22FDA1: @ 822FDA1 - .string "We’re TEAM AQUA!\p" - .string "They’re TEAM MAGMA!\p" - .string "It burns me up that they’d use such\n" + .string "We're TEAM AQUA!\p" + .string "They're TEAM MAGMA!\p" + .string "It burns me up that they'd use such\n" .string "a confusing name!$" MtChimney_Text_22FDFC: @ 822FDFC .string "Bushaa!$" MtChimney_Text_22FE04: @ 822FE04 - .string "LAVA COOKIES are MT. CHIMNEY’s local\n" + .string "LAVA COOKIES are MT. CHIMNEY's local\n" .string "specialty.\p" - .string "Try one. It’s just Â¥200.$" + .string "Try one. It's just Â¥200.$" MtChimney_Text_22FE4D: @ 822FE4D .string "Thank you, dear!$" MtChimney_Text_22FE5E: @ 822FE5E - .string "Oh, dear. You can’t buy a thing if\n" - .string "you’ve not got the money.$" + .string "Oh, dear. You can't buy a thing if\n" + .string "you've not got the money.$" MtChimney_Text_22FE9B: @ 822FE9B .string "Oh, fine then.$" @@ -763,16 +763,16 @@ MtChimney_Text_22FFFA: @ 822FFFA .string "LAVARIDGE TOWN AHEAD$" MtChimney_Text_23001D: @ 823001D - .string "I’ve been to the hot springs and\n" + .string "I've been to the hot springs and\n" .string "refreshed my tired bones.\l" - .string "Right now I’m feeling strong!$" + .string "Right now I'm feeling strong!$" MtChimney_Text_230076: @ 8230076 .string "Oh, my goodness.\n" - .string "Now, aren’t you something!$" + .string "Now, aren't you something!$" MtChimney_Text_2300A2: @ 82300A2 - .string "Well, well, I’ve lost. I can’t call\n" + .string "Well, well, I've lost. I can't call\n" .string "myself an EXPERT now, can I?$" MtChimney_Text_2300E3: @ 82300E3 @@ -788,15 +788,15 @@ MtChimney_Text_230153: @ 8230153 MtChimney_Text_2301BB: @ 82301BB .string "Oh, my goodness.\n" - .string "Now, aren’t you something!$" + .string "Now, aren't you something!$" MtChimney_Text_2301E7: @ 82301E7 .string "Perhaps your heart has become one\n" .string "with the hearts of your POKéMON.$" MtChimney_Text_23022A: @ 823022A - .string "I’ve got the fire in me, baby.\n" - .string "I can’t stand it! I have to battle!$" + .string "I've got the fire in me, baby.\n" + .string "I can't stand it! I have to battle!$" MtChimney_Text_23026D: @ 823026D .string "Ooh, that was a scorching-hot match!$" @@ -806,15 +806,15 @@ MtChimney_Text_230292: @ 8230292 .string "me up, baby!$" MtChimney_Text_2302BD: @ 82302BD - .string "I’ve finally made it to MT. CHIMNEY.\n" + .string "I've finally made it to MT. CHIMNEY.\n" .string "I want to make my POKéMON battle!$" MtChimney_Text_230304: @ 8230304 .string "The way you battle…\n" - .string "It’s like a MT. CHIMNEY eruption!$" + .string "It's like a MT. CHIMNEY eruption!$" MtChimney_Text_23033A: @ 823033A - .string "Like I said, I’ve finally made it to\n" + .string "Like I said, I've finally made it to\n" .string "MT. CHIMNEY. It would be a shame if\l" .string "I only do a little sightseeing…\p" .string "I want to get in some battles and buy\n" @@ -822,15 +822,15 @@ MtChimney_Text_23033A: @ 823033A MtChimney_Text_2303DF: @ 82303DF .string "Since I bathed in the hot springs,\n" - .string "I’ve been feeling great!\l" - .string "I’m sure I’m going to win!$" + .string "I've been feeling great!\l" + .string "I'm sure I'm going to win!$" MtChimney_Text_230436: @ 8230436 .string "Yowch!\n" - .string "I’m getting a chill out of the water.$" + .string "I'm getting a chill out of the water.$" MtChimney_Text_230463: @ 8230463 - .string "I’ll have to take another dip in the\n" + .string "I'll have to take another dip in the\n" .string "hot springs. Want to join me?\p" .string "Just joking!$" @@ -839,7 +839,7 @@ MtChimney_Text_2304B3: @ 82304B3 .string "hot people around for company!$" MtChimney_Text_2304F7: @ 82304F7 - .string "Oh, you’re a real firebrand, too!$" + .string "Oh, you're a real firebrand, too!$" MtChimney_Text_230519: @ 8230519 .string "I think I need a dip in LAVARIDGE\n" @@ -850,14 +850,14 @@ MtChimney_Text_230557: @ 8230557 .string "Let me register you in my POKéNAV.$" MtChimney_Text_23059C: @ 823059C - .string "I’m happily surrounded by hot people\n" - .string "around these parts. I won’t lose!$" + .string "I'm happily surrounded by hot people\n" + .string "around these parts. I won't lose!$" MtChimney_Text_2305E3: @ 82305E3 - .string "Gosh, you’re still the same\n" + .string "Gosh, you're still the same\n" .string "firebrand as before!$" MtChimney_Text_230614: @ 8230614 .string "Actually, it really is hot here.\n" - .string "I’m overdressed for these parts.$" + .string "I'm overdressed for these parts.$" diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 755536d8d..c5f24ccc0 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -31,7 +31,7 @@ MtPyre_1F_Text_230F8A: @ 8230F8A .string "All sorts of beings wander the slopes\n" .string "of MT. PYRE…\p" .string "There is no telling what may happen.\n" - .string "Take this. It’s for your own good.$" + .string "Take this. It's for your own good.$" MtPyre_1F_Text_231005: @ 8231005 .string "Have a POKéMON hold that\n" diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 830ed5cf7..cdf2cb98b 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -49,62 +49,62 @@ MtPyre_2F_Text_2311A3: @ 82311A3 MtPyre_2F_Text_2311E6: @ 82311E6 .string "Ooch, ouch… There are holes in the\n" .string "ground here and there.\p" - .string "I didn’t notice and took a tumble from\n" + .string "I didn't notice and took a tumble from\n" .string "the floor above.$" MtPyre_2F_Text_231258: @ 8231258 .string "Hey! Are you searching for POKéMON?\n" - .string "You came along after me! You’re rude!$" + .string "You came along after me! You're rude!$" MtPyre_2F_Text_2312A2: @ 82312A2 .string "Ayieeeeh!\n" - .string "I’m sorry, forgive me, please!$" + .string "I'm sorry, forgive me, please!$" MtPyre_2F_Text_2312CB: @ 82312CB - .string "People don’t come here often, so\n" - .string "I thought there’d be rare POKéMON.$" + .string "People don't come here often, so\n" + .string "I thought there'd be rare POKéMON.$" MtPyre_2F_Text_23130F: @ 823130F - .string "LUKE: We’re here on a dare.\p" + .string "LUKE: We're here on a dare.\p" .string "Heheh, if I show her how cool I am,\n" - .string "she’ll fall for me. I know it!\p" - .string "I know! I’ll cream you and show her\n" + .string "she'll fall for me. I know it!\p" + .string "I know! I'll cream you and show her\n" .string "how cool I am!$" MtPyre_2F_Text_2313A1: @ 82313A1 .string "LUKE: Whoopsie!$" MtPyre_2F_Text_2313B1: @ 82313B1 - .string "LUKE: Well, we lost but that’s okay!\n" - .string "I’m right here by your side.\l" - .string "We’ll make it through this dare!$" + .string "LUKE: Well, we lost but that's okay!\n" + .string "I'm right here by your side.\l" + .string "We'll make it through this dare!$" MtPyre_2F_Text_231414: @ 8231414 .string "LUKE: If you want to take me on,\n" .string "bring some more POKéMON.\p" - .string "If you don’t, I won’t be able to show\n" + .string "If you don't, I won't be able to show\n" .string "off to my girl how cool I am!$" MtPyre_2F_Text_231492: @ 8231492 .string "DEZ: I came here on a dare with my\n" .string "boyfriend.\p" - .string "It’s really scary, but I’m with my\n" - .string "boyfriend. It’s okay.\p" - .string "I know! I’ll get my boyfriend to look\n" + .string "It's really scary, but I'm with my\n" + .string "boyfriend. It's okay.\p" + .string "I know! I'll get my boyfriend to look\n" .string "cool by beating you!$" MtPyre_2F_Text_231534: @ 8231534 - .string "DEZ: Waaaah! I’m scared!$" + .string "DEZ: Waaaah! I'm scared!$" MtPyre_2F_Text_23154D: @ 823154D - .string "DEZ: We’re lovey-dovey, so we don’t\n" + .string "DEZ: We're lovey-dovey, so we don't\n" .string "care if we lose!$" MtPyre_2F_Text_231582: @ 8231582 .string "DEZ: If you want to challenge us, you\n" .string "should bring at least two POKéMON.\p" - .string "My boyfriend’s strong.\n" - .string "Just one POKéMON won’t do at all.$" + .string "My boyfriend's strong.\n" + .string "Just one POKéMON won't do at all.$" MtPyre_2F_Text_231604: @ 8231604 .string "You are an unfamiliar sight…\n" @@ -112,17 +112,17 @@ MtPyre_2F_Text_231604: @ 8231604 MtPyre_2F_Text_231645: @ 8231645 .string "Hmm…\n" - .string "You’re durable.$" + .string "You're durable.$" MtPyre_2F_Text_23165A: @ 823165A .string "Our family has been TRAINERS here\n" - .string "since my great-grandmother’s time…\p" + .string "since my great-grandmother's time…\p" .string "It is my duty to protect this\n" .string "mountain…$" MtPyre_2F_Text_2316C7: @ 82316C7 .string "Kiyaaaaah!\n" - .string "I’m terrified!$" + .string "I'm terrified!$" MtPyre_2F_Text_2316E1: @ 82316E1 .string "Nooooooo!\n" @@ -131,5 +131,5 @@ MtPyre_2F_Text_2316E1: @ 82316E1 MtPyre_2F_Text_2316FB: @ 82316FB .string "I get freaked out every time I see\n" .string "anything move…\p" - .string "I shouldn’t have come here to train…$" + .string "I shouldn't have come here to train…$" diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 890fc4d22..42c39705c 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -57,7 +57,7 @@ MtPyre_3F_Text_2318DD: @ 82318DD MtPyre_3F_Text_2318F2: @ 82318F2 .string "This means my training is still not\n" .string "enough…\p" - .string "I’ve got to keep working toward the\n" + .string "I've got to keep working toward the\n" .string "summit…\p" .string "Go, me!$" @@ -66,7 +66,7 @@ MtPyre_3F_Text_231952: @ 8231952 MtPyre_3F_Text_23196A: @ 823196A .string "That was amazing!\n" - .string "You’re a very special TRAINER.$" + .string "You're a very special TRAINER.$" MtPyre_3F_Text_23199B: @ 823199B .string "POKéMON no longer of this world.\n" @@ -82,7 +82,7 @@ MtPyre_3F_Text_231A49: @ 8231A49 .string "Please, I need to see your POKéNAV.$" MtPyre_3F_Text_231AAB: @ 8231AAB - .string "Oh, it’s you…\p" + .string "Oh, it's you…\p" .string "Have you come to show me your grown\n" .string "POKéMON?$" @@ -96,5 +96,5 @@ MtPyre_3F_Text_231B0D: @ 8231B0D .string "And the POKéMON that you will meet\n" .string "in the future…\p" .string "They are all to be equally cherished.\n" - .string "I see that you’ve remembered that.$" + .string "I see that you've remembered that.$" diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 5a5365baf..cbd3b3afa 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -8,8 +8,8 @@ MtPyre_4F_EventScript_231C6E:: @ 8231C6E MtPyre_4F_Text_231C85: @ 8231C85 .string "I love all things horrifying…\n" - .string "It’s like a disease…\p" - .string "When I’m here…\n" + .string "It's like a disease…\p" + .string "When I'm here…\n" .string "I shiver with fear…$" MtPyre_4F_Text_231CDB: @ 8231CDB @@ -17,7 +17,7 @@ MtPyre_4F_Text_231CDB: @ 8231CDB MtPyre_4F_Text_231CEE: @ 8231CEE .string "I want to see dreadful things…\n" - .string "I can’t leave…\p" + .string "I can't leave…\p" .string "Stay…\n" - .string "Won’t you stay with me?$" + .string "Won't you stay with me?$" diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 62b4e87b7..92178b21b 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -29,7 +29,7 @@ MtPyre_6F_EventScript_231D9D:: @ 8231D9D end MtPyre_6F_Text_231DB4: @ 8231DB4 - .string "When I’m here…\n" + .string "When I'm here…\n" .string "A curious power flows into me…$" MtPyre_6F_Text_231DE2: @ 8231DE2 @@ -61,10 +61,10 @@ MtPyre_6F_Text_231F11: @ 8231F11 .string "Have no fear for I am here!$" MtPyre_6F_Text_231F4A: @ 8231F4A - .string "Weren’t you lost?$" + .string "Weren't you lost?$" MtPyre_6F_Text_231F5C: @ 8231F5C .string "I had this feeling that a lost TRAINER\n" .string "would be panicked and easy to beat.\p" - .string "It’s dirty and I won’t try it again…$" + .string "It's dirty and I won't try it again…$" diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index ee03362ed..13caaab1e 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -447,7 +447,7 @@ MtPyre_Summit_EventScript_232442:: @ 8232442 MtPyre_Summit_Text_232459: @ 8232459 .string "No! Those TEAM MAGMA goons got\n" .string "here ahead of us!\p" - .string "We can’t fall behind!$" + .string "We can't fall behind!$" MtPyre_Summit_Text_2324A0: @ 82324A0 .string "I thought you were one of the MAGMAS\n" @@ -455,36 +455,36 @@ MtPyre_Summit_Text_2324A0: @ 82324A0 MtPyre_Summit_Text_2324E0: @ 82324E0 .string "Yeah, so you are strong…\n" - .string "But there’re a lot of us!$" + .string "But there're a lot of us!$" MtPyre_Summit_Text_232513: @ 8232513 .string "Hah!\n" .string "Too bad for you!\p" - .string "If you came earlier, you only would’ve\n" + .string "If you came earlier, you only would've\n" .string "had to battle the wimpy TEAM MAGMA.\p" .string "But since you arrived now, you have\n" .string "to take on us toughies!$" MtPyre_Summit_Text_2325B0: @ 82325B0 - .string "Urgh… I should’ve let you take on\n" + .string "Urgh… I should've let you take on\n" .string "TEAM MAGMA first…$" MtPyre_Summit_Text_2325E4: @ 82325E4 - .string "You don’t know anything!\n" + .string "You don't know anything!\n" .string "So why are you messing with us?$" MtPyre_Summit_Text_23261D: @ 823261D .string "You…\n" .string "We saw you at MT. CHIMNEY.\p" - .string "You don’t belong to either TEAM,\n" + .string "You don't belong to either TEAM,\n" .string "so why would you be here?$" MtPyre_Summit_Text_232678: @ 8232678 - .string "If you’re going to mess with anyone,\n" + .string "If you're going to mess with anyone,\n" .string "let it be TEAM MAGMA…$" MtPyre_Summit_Text_2326B3: @ 82326B3 - .string "Heh, it doesn’t matter!\n" + .string "Heh, it doesn't matter!\n" .string "We bought ourselves some time!\p" .string "The BOSS should have snatched what\n" .string "he was after!$" @@ -492,8 +492,8 @@ MtPyre_Summit_Text_2326B3: @ 82326B3 MtPyre_Summit_Text_23271B: @ 823271B .string "Oh, I know!\n" .string "You tried to join TEAM MAGMA,\l" - .string "but they wouldn’t have you!\p" - .string "Well, don’t think that we’ll let you\n" + .string "but they wouldn't have you!\p" + .string "Well, don't think that we'll let you\n" .string "join our TEAM AQUA!$" MtPyre_Summit_Text_23279A: @ 823279A @@ -505,14 +505,14 @@ MtPyre_Summit_Text_2327D8: @ 82327D8 .string "with us members and our leader.$" MtPyre_Summit_Text_23281A: @ 823281A - .string "ARCHIE: TEAM MAGMA’s MAXIE got ahead\n" + .string "ARCHIE: TEAM MAGMA's MAXIE got ahead\n" .string "of us, but we also got what we wanted.\p" .string "The RED ORB preserved at MT. PYRE…\n" .string "I, ARCHIE, now have it in my possession!\p" .string "Fufufu… Now we can bring our ultimate\n" .string "objective to fruition!\p" .string "Okay, TEAM!\n" - .string "We’re pulling out!$" + .string "We're pulling out!$" MtPyre_Summit_Text_23290E: @ 823290E .string "Oh, no…\n" @@ -529,7 +529,7 @@ MtPyre_Summit_Text_23290E: @ 823290E .string "and took the BLUE ORB first?\p" .string "Well, in their haste, they left this\n" .string "behind.\p" - .string "I couldn’t imagine what exactly it\n" + .string "I couldn't imagine what exactly it\n" .string "could be.\p" .string "I would like you to have it.\n" .string "Perhaps it will be useful in some way.$" diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index faf2821f5..d2e808116 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -351,7 +351,7 @@ OldaleTown_Movement_1E918B: @ 81E918B step_end OldaleTown_Text_1E918E: @ 81E918E - .string "I want to take a rest, so I’m saving my\n" + .string "I want to take a rest, so I'm saving my\n" .string "progress.$" OldaleTown_Text_1E91C0: @ 81E91C0 @@ -364,17 +364,17 @@ OldaleTown_Text_1E91FD: @ 81E91FD .string "Just look for our blue roof.\p" .string "We sell a variety of goods including\n" .string "POKé BALLS for catching POKéMON.\p" - .string "Here, I’d like you to have this as\n" + .string "Here, I'd like you to have this as\n" .string "a promotional item.$" OldaleTown_Text_1E92AF: @ 81E92AF - .string "A POTION can be used anytime, so it’s\n" + .string "A POTION can be used anytime, so it's\n" .string "even more useful than a POKéMON CENTER\l" .string "in certain situations.$" OldaleTown_Text_1E9313: @ 81E9313 .string "Aaaaah! Wait!\n" - .string "Please don’t come in here.\p" + .string "Please don't come in here.\p" .string "I just discovered the footprints of\n" .string "a rare POKéMON!\p" .string "Wait until I finish sketching\n" @@ -395,10 +395,10 @@ OldaleTown_Text_1E93F8: @ 81E93F8 OldaleTown_Text_1E9462: @ 81E9462 .string "MAY: {PLAYER}{KUN}!\n" .string "Over here!\l" - .string "Let’s hurry home!$" + .string "Let's hurry home!$" OldaleTown_Text_1E948A: @ 81E948A - .string "BRENDAN: I’m heading back to my dad’s\n" + .string "BRENDAN: I'm heading back to my dad's\n" .string "LAB now.\l" .string "{PLAYER}, you should hustle back, too.$" diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc index 3f2adc9fa..74a9a06d3 100644 --- a/data/maps/OldaleTown_House2/scripts.inc +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -15,6 +15,6 @@ OldaleTown_House2_Text_1FBF6D: @ 81FBF6D OldaleTown_House2_Text_1FBFB0: @ 81FBFB0 .string "If the POKéMON with you become\n" - .string "stronger, you’ll be able to go farther\l" + .string "stronger, you'll be able to go farther\l" .string "away from here.$" diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index f73e2d9ff..4503a27a8 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -58,16 +58,16 @@ OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9 end OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2 - .string "The clerk says they’re all sold out.\n" - .string "I can’t buy any POKé BALLS.$" + .string "The clerk says they're all sold out.\n" + .string "I can't buy any POKé BALLS.$" OldaleTown_Mart_Text_1FC2F3: @ 81FC2F3 - .string "I’m going to buy a bunch of POKé BALLS\n" + .string "I'm going to buy a bunch of POKé BALLS\n" .string "and catch a bunch of POKéMON!$" OldaleTown_Mart_Text_1FC338: @ 81FC338 .string "If a POKéMON gets hurt and loses its HP\n" - .string "and faints, it won’t be able to battle.\p" + .string "and faints, it won't be able to battle.\p" .string "To prevent your POKéMON from fainting,\n" .string "restore its HP with a POTION.$" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 28d309662..af104c674 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -41,19 +41,19 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F OldaleTown_PokemonCenter_1F_Text_1FC059: @ 81FC059 .string "That PC in the corner there is\n" .string "for any POKéMON TRAINER to use.\p" - .string "Naturally, that means you’re welcome\n" + .string "Naturally, that means you're welcome\n" .string "to use it, too.$" OldaleTown_PokemonCenter_1F_Text_1FC0CD: @ 81FC0CD .string "POKéMON CENTERS are great!\p" .string "You can use their services as much\n" - .string "as you like, and it’s all for free.\l" + .string "as you like, and it's all for free.\l" .string "You never have to worry!$" OldaleTown_PokemonCenter_1F_Text_1FC148: @ 81FC148 .string "The POKéMON WIRELESS CLUB on\n" .string "the second floor was built recently.\p" - .string "But they say they’re still making\n" + .string "But they say they're still making\n" .string "adjustments.$" OldaleTown_PokemonCenter_1F_Text_1FC1B9: @ 81FC1B9 diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index ef64a7e2e..6125ed386 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -34,7 +34,7 @@ PacifidlogTown_Text_1EBAE7: @ 81EBAE7 .string "up swept away somewhere else.$" PacifidlogTown_Text_1EBB6C: @ 81EBB6C - .string "See, isn’t it neat?\n" + .string "See, isn't it neat?\n" .string "These houses are on water!\p" .string "I was born here!$" @@ -42,8 +42,8 @@ PacifidlogTown_Text_1EBBAC: @ 81EBBAC .string "The SKY PILLAR?\p" .string "…Oh, you must mean that tall, tall\n" .string "tower a little further out.\p" - .string "If you asked me, I wouldn’t climb it.\n" - .string "It’s too scary to get up that high.\p" + .string "If you asked me, I wouldn't climb it.\n" + .string "It's too scary to get up that high.\p" .string "Life at sea level in PACIFIDLOG,\n" .string "that suits me fine.$" diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc index 159575eec..937b645bc 100644 --- a/data/maps/PacifidlogTown_House1/scripts.inc +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -15,11 +15,11 @@ PacifidlogTown_House1_Text_20366F: @ 820366F .string "rock, ice, and steel.\p" .string "Each of them is said to hide away deep\n" .string "inside caves.\p" - .string "That’s the story I heard when I was\n" + .string "That's the story I heard when I was\n" .string "just a little kid.$" PacifidlogTown_House1_Text_20373A: @ 820373A .string "“Six dots open three doors.â€\p" - .string "Grandpa used to say that, but I don’t\n" + .string "Grandpa used to say that, but I don't\n" .string "know what he meant.$" diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index d603cbd2d..41242ab44 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -101,10 +101,10 @@ PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC PacifidlogTown_House2_Text_2038C7: @ 82038C7 .string "Er-hem!\p" - .string "I am the POKéMON FAN CLUB’s most\n" - .string "important person, the CHAIRMAN’s\l" + .string "I am the POKéMON FAN CLUB's most\n" + .string "important person, the CHAIRMAN's\l" .string "younger brother.\p" - .string "I’m here enjoying my vacation with\n" + .string "I'm here enjoying my vacation with\n" .string "POKéMON, yes, indeed.$" PacifidlogTown_House2_Text_20395B: @ 820395B @@ -118,7 +118,7 @@ PacifidlogTown_House2_Text_20396D: @ 820396D PacifidlogTown_House2_Text_2039CE: @ 82039CE .string "Hmm…\n" - .string "It’s not bad, but it’s also not good.\p" + .string "It's not bad, but it's also not good.\p" .string "You, as the TRAINER, need to put in\n" .string "some more effort.$" @@ -128,16 +128,16 @@ PacifidlogTown_House2_Text_203A2F: @ 8203A2F .string "deserves a TM like this.$" PacifidlogTown_House2_Text_203A85: @ 8203A85 - .string "If a POKéMON likes you a lot, RETURN’s\n" + .string "If a POKéMON likes you a lot, RETURN's\n" .string "power is enhanced.\p" - .string "If it doesn’t like you, FRUSTRATION’s\n" + .string "If it doesn't like you, FRUSTRATION's\n" .string "power goes up.$" PacifidlogTown_House2_Text_203AF4: @ 8203AF4 .string "Oh, yes. In about {STR_VAR_1} or so days,\n" .string "I should be getting a good TM or two.\p" .string "You should come see me then.\n" - .string "I’ll give you a TM that’s suitable for\l" + .string "I'll give you a TM that's suitable for\l" .string "your POKéMON.$" PacifidlogTown_House2_Text_203B8D: @ 8203B8D @@ -151,6 +151,6 @@ PacifidlogTown_House2_Text_203BCE: @ 8203BCE .string "AZURILL: Rururi!$" PacifidlogTown_House2_Text_203BDF: @ 8203BDF - .string "It doesn’t appear to like the TRAINER\n" + .string "It doesn't appear to like the TRAINER\n" .string "very much.$" diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 3fb023148..d7b83f70a 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -56,27 +56,27 @@ PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 PacifidlogTown_House3_Text_203CBE: @ 8203CBE .string "Check out this {STR_VAR_2}!\p" - .string "It’s the {STR_VAR_2} that I caught\n" + .string "It's the {STR_VAR_2} that I caught\n" .string "yesterday to celebrate my birthday!\p" .string "Oh, I can see that you want it!\n" - .string "After all, it’s priceless!\p" - .string "I’ll tell you what. I might be willing\n" + .string "After all, it's priceless!\p" + .string "I'll tell you what. I might be willing\n" .string "to trade it for a {STR_VAR_1}.$" PacifidlogTown_House3_Text_203D87: @ 8203D87 .string "Oh, so this is a {STR_VAR_1}?\p" - .string "It’s sort of like a {STR_VAR_2},\n" - .string "and yet it’s subtly different.\p" + .string "It's sort of like a {STR_VAR_2},\n" + .string "and yet it's subtly different.\p" .string "Thank you!$" PacifidlogTown_House3_Text_203DDE: @ 8203DDE - .string "No, no, no! I won’t accept any\n" + .string "No, no, no! I won't accept any\n" .string "less than a real {STR_VAR_1}!$" PacifidlogTown_House3_Text_203E12: @ 8203E12 - .string "Oh, so you’re not going to go through\n" + .string "Oh, so you're not going to go through\n" .string "with this?\p" - .string "That’s cool. I’m not desperate to make\n" + .string "That's cool. I'm not desperate to make\n" .string "a trade or anything.$" PacifidlogTown_House3_Text_203E7F: @ 8203E7F diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index d6fb43334..2e9a06e0b 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -33,7 +33,7 @@ PacifidlogTown_House4_Text_203F93: @ 8203F93 .string "People were saying they saw a POKéMON\n" .string "flying high above HOENN.\p" .string "Is it flying around all the time?\n" - .string "Doesn’t it need to rest somewhere?$" + .string "Doesn't it need to rest somewhere?$" PacifidlogTown_House4_Text_204017: @ 8204017 .string "A sky POKéMON!\n" @@ -45,11 +45,11 @@ PacifidlogTown_House4_Text_204035: @ 8204035 PacifidlogTown_House4_Text_20404E: @ 820404E .string "Yes?\n" .string "YES TOWN?\p" - .string "I’ve never heard of a place like that.$" + .string "I've never heard of a place like that.$" PacifidlogTown_House4_Text_204084: @ 8204084 - .string "No? That doesn’t make any sense.\n" + .string "No? That doesn't make any sense.\n" .string "You have to come from somewhere.\p" - .string "Oh! Wait! You’re not going to say you\n" + .string "Oh! Wait! You're not going to say you\n" .string "were born at the bottom of the sea?$" diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index 0e9af702f..d9d9f0c56 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -21,7 +21,7 @@ PacifidlogTown_House5_EventScript_204137:: @ 8204137 end PacifidlogTown_House5_Text_204140: @ 8204140 - .string "I can’t see MIRAGE ISLAND today…$" + .string "I can't see MIRAGE ISLAND today…$" PacifidlogTown_House5_Text_204161: @ 8204161 .string "Oh! Oh my!\n" diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index a4dc90bd6..ddad843fb 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -29,7 +29,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6 PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF .string "What color is your TRAINER CARD?\n" - .string "Mine’s copper!$" + .string "Mine's copper!$" PacifidlogTown_PokemonCenter_1F_Text_20350F: @ 820350F .string "PACIFIDLOG TOWN floats on top of\n" diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 4905c83d9..bdffb6814 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -722,21 +722,21 @@ PetalburgCity_Text_1DC881: @ 81DC881 .string "is in the town.$" PetalburgCity_Text_1DC91B: @ 81DC91B - .string "See? This is PETALBURG CITY’s GYM.$" + .string "See? This is PETALBURG CITY's GYM.$" PetalburgCity_Text_1DC93E: @ 81DC93E - .string "This is the GYM’s sign. Look for it\n" - .string "whenever you’re looking for a GYM.$" + .string "This is the GYM's sign. Look for it\n" + .string "whenever you're looking for a GYM.$" PetalburgCity_Text_1DC985: @ 81DC985 .string "My face is reflected in the water.\p" - .string "It’s a shining grin full of hope…\p" + .string "It's a shining grin full of hope…\p" .string "Or it could be a look of somber silence\n" .string "struggling with fear…\p" .string "What do you see reflected in your face?$" PetalburgCity_Text_1DCA30: @ 81DCA30 - .string "Let’s say you have six POKéMON.\n" + .string "Let's say you have six POKéMON.\n" .string "If you catch another one…\p" .string "It is automatically sent to a STORAGE\n" .string "BOX over a PC connection.$" @@ -751,21 +751,21 @@ PetalburgCity_Text_1DCAF1: @ 81DCAF1 .string "“Where people mingle with nature.â€$" PetalburgCity_Text_1DCB23: @ 81DCB23 - .string "WALLY’S HOUSE$" + .string "WALLY'S HOUSE$" PetalburgCity_Text_1DCB31: @ 81DCB31 .string "Excuse me!\p" - .string "Let me guess, from the way you’re\n" + .string "Let me guess, from the way you're\n" .string "dressed, are you a POKéMON TRAINER?$" PetalburgCity_Text_1DCB82: @ 81DCB82 .string "… … … … … …\p" .string "Well, maybe not.\n" - .string "Your clothes aren’t all that dirty.\p" - .string "You’re either a rookie TRAINER,\n" - .string "or maybe you’re just an ordinary kid.$" + .string "Your clothes aren't all that dirty.\p" + .string "You're either a rookie TRAINER,\n" + .string "or maybe you're just an ordinary kid.$" PetalburgCity_Text_1DCC09: @ 81DCC09 - .string "I’m roaming the land in search of\n" + .string "I'm roaming the land in search of\n" .string "talented TRAINERS.\p" - .string "I’m sorry to have taken your time.$" + .string "I'm sorry to have taken your time.$" diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 29459f5e5..6a58c20f7 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1252,32 +1252,32 @@ PetalburgCity_Gym_EventScript_205798:: @ 8205798 PetalburgCity_Gym_Text_2057A2: @ 82057A2 .string "DAD: Hm?\p" - .string "Well, if it isn’t {PLAYER}!\n" - .string "So you’re all finished moving in?\p" - .string "I’m surprised that you managed to\n" + .string "Well, if it isn't {PLAYER}!\n" + .string "So you're all finished moving in?\p" + .string "I'm surprised that you managed to\n" .string "get here by yourself.\p" .string "Oh, I see.\n" - .string "You’re with your POKéMON.\p" - .string "Hm… Then I guess you’re going to\n" + .string "You're with your POKéMON.\p" + .string "Hm… Then I guess you're going to\n" .string "become a TRAINER like me, {PLAYER}.\p" - .string "That’s great news!\n" - .string "I’ll be looking forward to it!$" + .string "That's great news!\n" + .string "I'll be looking forward to it!$" PetalburgCity_Gym_Text_2058B1: @ 82058B1 .string "Um… I…\n" - .string "I’d like to get a POKéMON, please…$" + .string "I'd like to get a POKéMON, please…$" PetalburgCity_Gym_Text_2058DB: @ 82058DB - .string "DAD: Hm? You’re… Uh… Oh, right.\n" - .string "You’re WALLY, right?$" + .string "DAD: Hm? You're… Uh… Oh, right.\n" + .string "You're WALLY, right?$" PetalburgCity_Gym_Text_205910: @ 8205910 - .string "WALLY: I’m going to go stay with my\n" + .string "WALLY: I'm going to go stay with my\n" .string "relatives in VERDANTURF TOWN.\p" .string "I thought I would be lonely by myself,\n" .string "so I wanted to take a POKéMON along.\p" - .string "But I’ve never caught a POKéMON before.\n" - .string "I don’t know how…$" + .string "But I've never caught a POKéMON before.\n" + .string "I don't know how…$" PetalburgCity_Gym_Text_2059D8: @ 82059D8 .string "DAD: Hm. I see.$" @@ -1289,13 +1289,13 @@ PetalburgCity_Gym_Text_2059E8: @ 82059E8 .string "safely catches a POKéMON.$" PetalburgCity_Gym_Text_205A46: @ 8205A46 - .string "WALLY, here, I’ll loan you my POKéMON.\p" + .string "WALLY, here, I'll loan you my POKéMON.\p" .string "WALLY received a ZIGZAGOON!$" PetalburgCity_Gym_Text_205A89: @ 8205A89 .string "WALLY: Oh, wow!\n" .string "A POKéMON!\p" - .string "DAD: Hm. I’ll give you a POKé BALL, too.\n" + .string "DAD: Hm. I'll give you a POKé BALL, too.\n" .string "Go for it!\p" .string "WALLY received a POKé BALL!$" @@ -1312,21 +1312,21 @@ PetalburgCity_Gym_Text_205B32: @ 8205B32 PetalburgCity_Gym_Text_205B4C: @ 8205B4C .string "WALLY: Thank you, yes, it did.\n" - .string "Here’s your POKéMON back.\p" + .string "Here's your POKéMON back.\p" .string "{PLAYER}, thank you for coming along\n" .string "with me.\p" .string "You two are why I was able to catch\n" .string "my POKéMON.\p" - .string "I promise I’ll take really good\n" + .string "I promise I'll take really good\n" .string "care of it.\p" - .string "Oh! My mom’s waiting for me,\n" + .string "Oh! My mom's waiting for me,\n" .string "so I have to go!\p" .string "Bye, {PLAYER}!$" PetalburgCity_Gym_Text_205C40: @ 8205C40 .string "DAD: Now…\p" .string "{PLAYER}, if you want to become a\n" - .string "strong TRAINER, here’s my advice.\p" + .string "strong TRAINER, here's my advice.\p" .string "Head for RUSTBORO CITY beyond this\n" .string "town.\p" .string "There, you should challenge\n" @@ -1335,23 +1335,23 @@ PetalburgCity_Gym_Text_205C40: @ 8205C40 .string "GYMS and defeat their LEADERS.\p" .string "Collect BADGES from them,\n" .string "understood?\p" - .string "Of course, I’m a GYM LEADER, too.\n" - .string "We’ll battle one day, {PLAYER}.\p" - .string "But that’s only after you become\n" + .string "Of course, I'm a GYM LEADER, too.\n" + .string "We'll battle one day, {PLAYER}.\p" + .string "But that's only after you become\n" .string "stronger.$" PetalburgCity_Gym_Text_205DB4: @ 8205DB4 - .string "DAD: Hm? Aren’t you going to the\n" + .string "DAD: Hm? Aren't you going to the\n" .string "POKéMON GYM in RUSTBORO CITY?\p" - .string "There’s no challenge for me to\n" + .string "There's no challenge for me to\n" .string "battle a greenhorn TRAINER.\p" .string "{PLAYER}, I want you to challenge me\n" .string "when you become a lot stronger.\p" - .string "I’ll battle you, {PLAYER}, when you\n" + .string "I'll battle you, {PLAYER}, when you\n" .string "can show me four GYM BADGES, okay?$" PetalburgCity_Gym_Text_205EAE: @ 8205EAE - .string "DAD: I see… So, you’ve beaten\n" + .string "DAD: I see… So, you've beaten\n" .string "the GYM LEADER in RUSTBORO CITY.\p" .string "But there are many more TRAINERS\n" .string "who are stronger than you, {PLAYER}.\p" @@ -1363,7 +1363,7 @@ PetalburgCity_Gym_Text_205F87: @ 8205F87 .string "DAD: Hm… {PLAYER}, you have gotten\n" .string "stronger.\p" .string "I can tell by the number of BADGES\n" - .string "that you’ve earned.$" + .string "that you've earned.$" PetalburgCity_Gym_Text_205FE5: @ 8205FE5 .string "DAD: Hm…\n" @@ -1371,18 +1371,18 @@ PetalburgCity_Gym_Text_205FE5: @ 8205FE5 .string "Fine, as I promised, we will have\n" .string "a POKéMON battle.\p" .string "{PLAYER}…\p" - .string "I’m so happy that I can have\n" + .string "I'm so happy that I can have\n" .string "a real battle with my own child.\p" .string "But, a battle is a battle!\p" .string "I will do everything in my power as\n" .string "a GYM LEADER to win.\p" - .string "{PLAYER}, you’d better give it your\n" + .string "{PLAYER}, you'd better give it your\n" .string "best shot, too!$" PetalburgCity_Gym_Text_206107: @ 8206107 .string "…\p" - .string "I… I can’t…\p" - .string "I can’t believe it. {PLAYER}…\p" + .string "I… I can't…\p" + .string "I can't believe it. {PLAYER}…\p" .string "I lost to {PLAYER}?\p" .string "But, rules are rules!\n" .string "Here, take this.$" @@ -1396,7 +1396,7 @@ PetalburgCity_Gym_Text_20618A: @ 820618A .string "of all your POKéMON will increase.\p" .string "POKéMON that know the HM move SURF\n" .string "will be able to travel over water.\p" - .string "This is my gift to you. {PLAYER}, I’m\n" + .string "This is my gift to you. {PLAYER}, I'm\n" .string "sure you can use it correctly.$" PetalburgCity_Gym_Text_206254: @ 8206254 @@ -1408,10 +1408,10 @@ PetalburgCity_Gym_Text_206254: @ 8206254 .string "situation into an advantage.$" PetalburgCity_Gym_Text_2062FB: @ 82062FB - .string "DAD: As the GYM LEADER, I can’t\n" + .string "DAD: As the GYM LEADER, I can't\n" .string "express how upset I am…\p" .string "But as a father, it makes me both\n" - .string "happy and a little sad. It’s odd…$" + .string "happy and a little sad. It's odd…$" PetalburgCity_Gym_Text_206377: @ 8206377 .string "Ah, there you are, {PLAYER}{KUN}!\p" @@ -1419,14 +1419,14 @@ PetalburgCity_Gym_Text_206377: @ 8206377 .string "I have something I want you to have.$" PetalburgCity_Gym_Text_2063CA: @ 82063CA - .string "NORMAN, you don’t mind, do you?\p" + .string "NORMAN, you don't mind, do you?\p" .string "Let me borrow your {PLAYER}{KUN} for\n" .string "a minute or two.$" PetalburgCity_Gym_Text_206417: @ 8206417 .string "DAD: {PLAYER}, you should go visit\n" .string "your mother every so often.\p" - .string "I’m going to stay here and redouble\n" + .string "I'm going to stay here and redouble\n" .string "my training.\p" .string "It would bother me as a TRAINER to\n" .string "not avenge my loss to you, {PLAYER}!$" @@ -1438,25 +1438,25 @@ PetalburgCity_Gym_Text_2064C3: @ 82064C3 .string "training would ever be enough.$" PetalburgCity_Gym_Text_206542: @ 8206542 - .string "Hey, how’s it going, CHAMPION-\n" + .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "The doors in this GYM open when you\n" .string "beat the awaiting TRAINERS.\p" .string "Whoops! The doors in this room are\n" - .string "already open, so don’t attack me!\p" + .string "already open, so don't attack me!\p" .string "The TRAINERS of PETALBURG GYM\n" .string "use all kinds of items.\p" .string "The door at the left leads to\n" .string "the SPEED ROOM.\p" .string "The door at the right leads to\n" .string "the ACCURACY ROOM.\p" - .string "The room’s name will be on\n" + .string "The room's name will be on\n" .string "the door, so choose carefully.\p" - .string "Once you’ve chosen the door…\n" + .string "Once you've chosen the door…\n" .string "Well, hey, go for it!$" PetalburgCity_Gym_Text_2066F3: @ 82066F3 - .string "{PLAYER}! Whoa! You’ve overcome even\n" + .string "{PLAYER}! Whoa! You've overcome even\n" .string "your own father!\p" .string "Like, whoa!\n" .string "What a stunning turn of events!$" @@ -1465,7 +1465,7 @@ PetalburgCity_Gym_Text_20674F: @ 820674F .string "The ability to attack before the\n" .string "opponent…\p" .string "Just that alone puts me at a great\n" - .string "advantage, don’t you agree?$" + .string "advantage, don't you agree?$" PetalburgCity_Gym_Text_2067B9: @ 82067B9 .string "That was a magnificent battle!$" @@ -1481,7 +1481,7 @@ PetalburgCity_Gym_Text_20685E: @ 820685E .string "Whomever you beat, and whomever you\n" .string "may lose to, you never shirk from\l" .string "training yourself and your POKéMON.\p" - .string "That’s what I think being a\n" + .string "That's what I think being a\n" .string "GYM LEADER is all about.$" PetalburgCity_Gym_Text_2068FD: @ 82068FD @@ -1490,7 +1490,7 @@ PetalburgCity_Gym_Text_2068FD: @ 82068FD .string "with your POKéMON!$" PetalburgCity_Gym_Text_20694F: @ 820694F - .string "I couldn’t confuse your team enough…\n" + .string "I couldn't confuse your team enough…\n" .string "You share a strong bond together.$" PetalburgCity_Gym_Text_206996: @ 8206996 @@ -1502,46 +1502,46 @@ PetalburgCity_Gym_Text_2069D9: @ 82069D9 .string "training has become a lot tougher.$" PetalburgCity_Gym_Text_206A1B: @ 8206A1B - .string "Just when you think you’re going to\n" + .string "Just when you think you're going to\n" .string "win, your opponent restores HP…\p" .string "Can you just imagine how awful that\n" .string "must feel?\p" - .string "I’ll show you exactly how awful it\n" + .string "I'll show you exactly how awful it\n" .string "feels!$" PetalburgCity_Gym_Text_206AB8: @ 8206AB8 - .string "I couldn’t restore HP enough…\n" + .string "I couldn't restore HP enough…\n" .string "What ATTACK power…$" PetalburgCity_Gym_Text_206AE9: @ 8206AE9 .string "I should have expected no less from\n" - .string "our LEADER’s kid.\p" - .string "No, wait! A TRAINER’s abilities are\n" + .string "our LEADER's kid.\p" + .string "No, wait! A TRAINER's abilities are\n" .string "earned only through effort.\p" .string "I lost because my own efforts\n" - .string "weren’t enough.\p" + .string "weren't enough.\p" .string "Go on! The ONE-HIT KO ROOM is next.$" PetalburgCity_Gym_Text_206BB1: @ 8206BB1 - .string "I’m going to keep training at GYMS.\n" - .string "One day, I’ll become a LEADER.$" + .string "I'm going to keep training at GYMS.\n" + .string "One day, I'll become a LEADER.$" PetalburgCity_Gym_Text_206BF4: @ 8206BF4 - .string "I’m not going to take it easy just\n" - .string "because you’re our LEADER’s kid.\p" - .string "I’ll show you how horrid it is for\n" + .string "I'm not going to take it easy just\n" + .string "because you're our LEADER's kid.\p" + .string "I'll show you how horrid it is for\n" .string "a POKéMON to take a critical hit!$" PetalburgCity_Gym_Text_206C7D: @ 8206C7D .string "Your power…\n" - .string "You’re the real deal.$" + .string "You're the real deal.$" PetalburgCity_Gym_Text_206C9F: @ 8206C9F .string "Your father really is strong.\n" - .string "He’s a TRAINER worth my respect.\p" + .string "He's a TRAINER worth my respect.\p" .string "And, I sense the same glow coming\n" .string "from you as your father.\p" - .string "I hope that you’ll stage a terrific\n" + .string "I hope that you'll stage a terrific\n" .string "battle with your father!$" PetalburgCity_Gym_Text_206D56: @ 8206D56 @@ -1552,7 +1552,7 @@ PetalburgCity_Gym_Text_206D56: @ 8206D56 PetalburgCity_Gym_Text_206DB2: @ 8206DB2 .string "Giggle…\n" .string "This is the ACCURACY ROOM.\p" - .string "It’s pretty nasty when every attack\n" + .string "It's pretty nasty when every attack\n" .string "lands without fail.$" PetalburgCity_Gym_Text_206E0D: @ 8206E0D @@ -1563,13 +1563,13 @@ PetalburgCity_Gym_Text_206E26: @ 8206E26 .string "TRAINERS waiting for you.\p" .string "The left is the DEFENSE ROOM, and\n" .string "the right is the RECOVERY ROOM.\p" - .string "Your POKéMON’s ATTACK power will be\n" + .string "Your POKéMON's ATTACK power will be\n" .string "on trial either way.$" PetalburgCity_Gym_Text_206ED8: @ 8206ED8 - .string "Do you know what we’re trying to\n" + .string "Do you know what we're trying to\n" .string "achieve as TRAINERS?\p" - .string "We’re striving to become soul mates\n" + .string "We're striving to become soul mates\n" .string "with our POKéMON.$" PetalburgCity_Gym_Text_206F44: @ 8206F44 @@ -1577,10 +1577,10 @@ PetalburgCity_Gym_Text_206F44: @ 8206F44 .string "reckless I can be in attack.$" PetalburgCity_Gym_Text_206F82: @ 8206F82 - .string "Our defenses weren’t enough…$" + .string "Our defenses weren't enough…$" PetalburgCity_Gym_Text_206F9F: @ 8206F9F - .string "I think you’ve taught me a valuable\n" + .string "I think you've taught me a valuable\n" .string "lesson here.\p" .string "Now, go on! The left door goes to\n" .string "the STRENGTH ROOM.\p" @@ -1596,22 +1596,22 @@ PetalburgCity_Gym_Text_207088: @ 8207088 .string "Our GYM LEADER told us to go all out\n" .string "and beat you.\p" .string "Even if you happen to be the\n" - .string "LEADER’s kid!$" + .string "LEADER's kid!$" PetalburgCity_Gym_Text_2070E6: @ 82070E6 .string "But… I went all out!$" PetalburgCity_Gym_Text_2070FB: @ 82070FB .string "The way you use your POKéMON…\n" - .string "It’s like your father’s style.\p" + .string "It's like your father's style.\p" .string "Go on through! The GYM LEADER, your\n" .string "father, is waiting!$" PetalburgCity_Gym_Text_207170: @ 8207170 - .string "Sure, it’s fine to make your POKéMON\n" + .string "Sure, it's fine to make your POKéMON\n" .string "stronger.\p" .string "But what decides the winner?\p" - .string "Why, it’s the feelings TRAINERS have\n" + .string "Why, it's the feelings TRAINERS have\n" .string "for their POKéMON.$" PetalburgCity_Gym_Text_2071F4: @ 82071F4 @@ -1651,7 +1651,7 @@ PetalburgCity_Gym_Text_2073A7: @ 82073A7 .string "Do you want to go through?$" PetalburgCity_Gym_Text_2073E4: @ 82073E4 - .string "“GYM LEADER’S ROOM\p" + .string "“GYM LEADER'S ROOM\p" .string "“See for yourself what POKéMON await\n" .string "you!†the sign says.\p" .string "Do you want to go through?$" @@ -1661,7 +1661,7 @@ PetalburgCity_Gym_Text_20744C: @ 820744C PetalburgCity_Gym_Text_207467: @ 8207467 .string "PETALBURG CITY POKéMON GYM\p" - .string "NORMAN’S CERTIFIED TRAINERS:\n" + .string "NORMAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" PetalburgCity_Gym_Text_2074A2: @ 82074A2 @@ -1669,12 +1669,12 @@ PetalburgCity_Gym_Text_2074A2: @ 82074A2 .string "I had a feeling that you would come.\p" .string "I would never refuse to accept\n" .string "a challenge from you.\p" - .string "You do understand, don’t you?\p" - .string "Inside a GYM, it doesn’t matter that\n" + .string "You do understand, don't you?\p" + .string "Inside a GYM, it doesn't matter that\n" .string "we are a parent and child.\p" .string "…No, because we are parent and child,\n" .string "we owe it to each other to do the best\l" - .string "we can. Isn’t that right, {PLAYER}?$" + .string "we can. Isn't that right, {PLAYER}?$" PetalburgCity_Gym_Text_2075CE: @ 82075CE .string "Uh… Haha…\n" @@ -1692,12 +1692,12 @@ PetalburgCity_Gym_Text_20764A: @ 820764A .string "I had a feeling that you would come.\p" .string "I would never refuse to accept\n" .string "a challenge from you.\p" - .string "You do understand, don’t you?\p" - .string "Inside a GYM, it doesn’t matter that\n" + .string "You do understand, don't you?\p" + .string "Inside a GYM, it doesn't matter that\n" .string "we are a parent and child.\p" .string "Hm? Wait a second, {PLAYER}.\p" .string "Do you only have one POKéMON that is\n" .string "capable of battle?\p" - .string "Sorry, but you’ll have to come back\n" + .string "Sorry, but you'll have to come back\n" .string "with at least two POKéMON.$" diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc index 4fe971339..2650e970c 100644 --- a/data/maps/PetalburgCity_House2/scripts.inc +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -10,7 +10,7 @@ PetalburgCity_House2_EventScript_2078FC:: @ 82078FC end PetalburgCity_House2_Text_207905: @ 8207905 - .string "NORMAN became our town’s new\n" + .string "NORMAN became our town's new\n" .string "GYM LEADER.\p" .string "I think he called his family over from\n" .string "somewhere far away.$" diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 9ee996374..f6d975615 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -75,8 +75,8 @@ PetalburgCity_Mart_Text_207DF1: @ 8207DF1 PetalburgCity_Mart_Text_207E60: @ 8207E60 .string "Do you use REPEL?\n" - .string "It keeps POKéMON away, so it’s\l" - .string "useful when you’re in a hurry.$" + .string "It keeps POKéMON away, so it's\l" + .string "useful when you're in a hurry.$" PetalburgCity_Mart_Text_207EB0: @ 8207EB0 .string "Do you have any ANTIDOTES with\n" diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index d0a279cf2..eb0150c08 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -76,23 +76,23 @@ PetalburgCity_PokemonCenter_1F_Text_207B09: @ 8207B09 PetalburgCity_PokemonCenter_1F_Text_207BB0: @ 8207BB0 .string "For example, your TREECKO\n" .string "is a GRASS type.\p" - .string "It’s strong against the WATER and\n" + .string "It's strong against the WATER and\n" .string "GROUND types.\p" - .string "But, it’s weak against FIRE-type\n" + .string "But, it's weak against FIRE-type\n" .string "POKéMON.$" PetalburgCity_PokemonCenter_1F_Text_207C35: @ 8207C35 .string "For example, your TORCHIC\n" .string "is a FIRE type.\p" - .string "It’s strong against the GRASS and\n" + .string "It's strong against the GRASS and\n" .string "BUG types.\p" - .string "But, it’s weak against WATER-type\n" + .string "But, it's weak against WATER-type\n" .string "POKéMON.$" PetalburgCity_PokemonCenter_1F_Text_207CB7: @ 8207CB7 .string "For example, your MUDKIP\n" .string "is a WATER type.\p" - .string "It’s strong against the FIRE type.\p" - .string "But, it’s weak against GRASS-type\n" + .string "It's strong against the FIRE type.\p" + .string "But, it's weak against GRASS-type\n" .string "and ELECTRIC-type POKéMON.$" diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index babfb6229..8ef530784 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -70,18 +70,18 @@ PetalburgCity_WallysHouse_EventScript_2042D5:: @ 82042D5 end PetalburgCity_WallysHouse_Text_2042DF: @ 82042DF - .string "You’re…\n" + .string "You're…\n" .string "Ah, you must be {PLAYER}{KUN}, right?\p" .string "Thank you for playing with WALLY a\n" .string "little while ago.\p" - .string "He’s been frail and sickly ever\n" + .string "He's been frail and sickly ever\n" .string "since he was a baby.\p" - .string "We’ve sent him to stay with my relatives\n" + .string "We've sent him to stay with my relatives\n" .string "in VERDANTURF TOWN for a while.\p" .string "The air is a lot cleaner there\n" .string "than it is here.\p" - .string "What’s that? Where’s WALLY?\n" - .string "He’s already left, our WALLY.\p" + .string "What's that? Where's WALLY?\n" + .string "He's already left, our WALLY.\p" .string "I wonder where he could have\n" .string "gotten by now?$" @@ -91,7 +91,7 @@ PetalburgCity_WallysHouse_Text_20444D: @ 820444D PetalburgCity_WallysHouse_Text_20446E: @ 820446E .string "{PLAYER}{KUN}! Please excuse us for\n" .string "dragging you here this way.\p" - .string "But our WALLY’s become very healthy\n" + .string "But our WALLY's become very healthy\n" .string "since he went to VERDANTURF TOWN.\p" .string "We owe it all to you!\p" .string "When WALLY left town, you helped\n" @@ -100,31 +100,31 @@ PetalburgCity_WallysHouse_Text_20446E: @ 820446E .string "happy.\p" .string "Actually, not just WALLY.\n" .string "It made me, his father, happy too.\p" - .string "Happy that he’s gained such a great\n" + .string "Happy that he's gained such a great\n" .string "friend as you.\p" - .string "This isn’t a bribe or anything, but\n" - .string "I’d really like you to have this.$" + .string "This isn't a bribe or anything, but\n" + .string "I'd really like you to have this.$" PetalburgCity_WallysHouse_Text_20461A: @ 820461A - .string "If your POKéMON can SURF, you’ll be\n" + .string "If your POKéMON can SURF, you'll be\n" .string "able to go to all sorts of places.$" PetalburgCity_WallysHouse_Text_204661: @ 8204661 - .string "WALLY’s coming home soon.\n" - .string "I’m looking forward to that.$" + .string "WALLY's coming home soon.\n" + .string "I'm looking forward to that.$" PetalburgCity_WallysHouse_Text_204698: @ 8204698 .string "Oh? You met WALLY in\n" .string "EVER GRANDE CITY?\p" - .string "Oh, {PLAYER}{KUN}, don’t be silly.\p" + .string "Oh, {PLAYER}{KUN}, don't be silly.\p" .string "He may have gotten healthy, but he\n" - .string "can’t go somewhere far away like\l" + .string "can't go somewhere far away like\l" .string "that all by himself.$" PetalburgCity_WallysHouse_Text_204732: @ 8204732 .string "WALLY was really happy when he told\n" .string "us that he caught a POKéMON.\p" - .string "It’s been ages since I’ve seen him\n" + .string "It's been ages since I've seen him\n" .string "smile like that.$" PetalburgCity_WallysHouse_Text_2047A7: @ 82047A7 @@ -133,7 +133,7 @@ PetalburgCity_WallysHouse_Text_2047A7: @ 82047A7 .string "But our WALLY left VERDANTURF TOWN\n" .string "without telling anyone.\p" .string "You know, WALLY is frail, but\n" - .string "he’s surprisingly strong-willed.\p" - .string "I’m sure that he’ll come back safe\n" + .string "he's surprisingly strong-willed.\p" + .string "I'm sure that he'll come back safe\n" .string "and sound one day!$" diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 82e49abb2..387955f73 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -334,7 +334,7 @@ PetalburgWoods_Text_22E34F: @ 822E34F PetalburgWoods_Text_22E3AA: @ 822E3AA .string "I was going to ambush you, but you\n" .string "had to dawdle in PETALBURG WOODS\l" - .string "forever, didn’t you?\p" + .string "forever, didn't you?\p" .string "I got sick of waiting, so here I am!$" PetalburgWoods_Text_22E428: @ 822E428 @@ -343,49 +343,49 @@ PetalburgWoods_Text_22E428: @ 822E428 PetalburgWoods_Text_22E457: @ 822E457 .string "Aiyeeeh!\p" - .string "You’re a POKéMON TRAINER, aren’t you?\n" - .string "You’ve got to help me, please!$" + .string "You're a POKéMON TRAINER, aren't you?\n" + .string "You've got to help me, please!$" PetalburgWoods_Text_22E4A5: @ 822E4A5 - .string "Hunh? What do you think you’re doing?\n" - .string "What, you’re going to protect him?\p" + .string "Hunh? What do you think you're doing?\n" + .string "What, you're going to protect him?\p" .string "No one who crosses TEAM AQUA\n" .string "gets any mercy, not even a kid!\p" .string "Come on and battle me!$" PetalburgWoods_Text_22E542: @ 822E542 - .string "You’re kidding me! You’re tough!$" + .string "You're kidding me! You're tough!$" PetalburgWoods_Text_22E563: @ 822E563 - .string "Grrr… You’ve got some nerve\n" + .string "Grrr… You've got some nerve\n" .string "meddling with TEAM AQUA!\l" .string "Come on and battle me again!\p" - .string "I wish I could say that, but I’m out of\n" + .string "I wish I could say that, but I'm out of\n" .string "POKéMON…\p" .string "And, hey, we of TEAM AQUA are also\n" .string "after something in RUSTBORO.\p" - .string "I’ll let you go today!$" + .string "I'll let you go today!$" PetalburgWoods_Text_22E63D: @ 822E63D .string "Whew…\n" .string "That was awfully close!\p" - .string "Thanks to you, he didn’t rob me of\n" + .string "Thanks to you, he didn't rob me of\n" .string "these important papers.\p" - .string "I know, I’ll give you a GREAT BALL as\n" + .string "I know, I'll give you a GREAT BALL as\n" .string "my thanks!$" PetalburgWoods_Text_22E6C7: @ 822E6C7 - .string "Didn’t that TEAM AQUA thug say\n" + .string "Didn't that TEAM AQUA thug say\n" .string "they were after something in\l" .string "RUSTBORO, too?$" PetalburgWoods_Text_22E712: @ 822E712 - .string "Uh-oh! It’s a crisis!\n" - .string "I can’t be wasting time!$" + .string "Uh-oh! It's a crisis!\n" + .string "I can't be wasting time!$" PetalburgWoods_Text_22E741: @ 822E741 - .string "You’re loaded with items.\n" - .string "I can’t give you this GREAT BALL.$" + .string "You're loaded with items.\n" + .string "I can't give you this GREAT BALL.$" PetalburgWoods_Text_22E77D: @ 822E77D .string "I caught a whole bunch of POKéMON!\p" @@ -394,18 +394,18 @@ PetalburgWoods_Text_22E77D: @ 822E77D PetalburgWoods_Text_22E7C1: @ 822E7C1 .string "I have all these POKéMON,\n" - .string "but I couldn’t win…$" + .string "but I couldn't win…$" PetalburgWoods_Text_22E7EF: @ 822E7EF .string "I caught a bunch of POKéMON.\n" - .string "Now I’m out of POKé BALLS.$" + .string "Now I'm out of POKé BALLS.$" PetalburgWoods_Text_22E827: @ 822E827 .string "If you take BUG POKéMON to school,\n" .string "you get to be instantly popular!$" PetalburgWoods_Text_22E86B: @ 822E86B - .string "I can’t be popular if I lose.$" + .string "I can't be popular if I lose.$" PetalburgWoods_Text_22E889: @ 822E889 .string "If you have a big BUG POKéMON,\n" @@ -414,24 +414,24 @@ PetalburgWoods_Text_22E889: @ 822E889 PetalburgWoods_Text_22E8C3: @ 822E8C3 .string "I want a rematch when my BUG\n" .string "POKéMON grow up!\p" - .string "I’m registering you in my POKéNAV!$" + .string "I'm registering you in my POKéNAV!$" PetalburgWoods_Text_22E914: @ 822E914 .string "I want a rematch when my BUG \n" .string "POKéMON grow up!\p" - .string "I’m registering you in my POKéNAV!$" + .string "I'm registering you in my POKéNAV!$" PetalburgWoods_Text_22E966: @ 822E966 .string "My BUG POKéMON have grown.\n" - .string "I’ll be popular again.$" + .string "I'll be popular again.$" PetalburgWoods_Text_22E998: @ 822E998 - .string "I can’t be popular if I lose.$" + .string "I can't be popular if I lose.$" PetalburgWoods_Text_22E9B6: @ 822E9B6 .string "You get to be popular if you have\n" .string "strong POKéMON, right?\l" - .string "So, I’ve been training hard.$" + .string "So, I've been training hard.$" PetalburgWoods_Text_22EA0C: @ 822EA0C .string "Yo, there!\n" @@ -442,18 +442,18 @@ PetalburgWoods_Text_22EA0C: @ 822EA0C PetalburgWoods_Text_22EA8B: @ 822EA8B .string "Sometimes, there are things on the\n" - .string "ground even if you can’t see them.\p" - .string "That’s why I always check where I’m\n" + .string "ground even if you can't see them.\p" + .string "That's why I always check where I'm\n" .string "walking.$" PetalburgWoods_Text_22EAFE: @ 822EAFE .string "Oh, neat!\n" - .string "That’s the BADGE from RUSTBORO GYM!\p" + .string "That's the BADGE from RUSTBORO GYM!\p" .string "You must be a TRAINER.\n" .string "You should try using this item.$" PetalburgWoods_Text_22EB63: @ 822EB63 - .string "It’s a MIRACLE SEED.\n" + .string "It's a MIRACLE SEED.\n" .string "If a POKéMON holds that item, its\l" .string "GRASS-type moves become stronger.\p" .string "Besides MIRACLE SEED, I think there are\n" diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 341f7a572..f724914ba 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -266,11 +266,11 @@ Route101_Text_1EBE9A: @ 81EBE9A .string "Hello! You over there!\n" .string "Please! Help!\p" .string "In my BAG!\n" - .string "There’s a POKé BALL!$" + .string "There's a POKé BALL!$" Route101_Text_1EBEDF: @ 81EBEDF .string "Wh-Where are you going?!\n" - .string "Don’t leave me like this!$" + .string "Don't leave me like this!$" Route101_Text_1EBF12: @ 81EBF12 .string "PROF. BIRCH: Whew…\p" @@ -279,14 +279,14 @@ Route101_Text_1EBF12: @ 81EBF12 .string "You saved me.\n" .string "Thanks a lot!\p" .string "Oh?\p" - .string "Hi, you’re {PLAYER}{KUN}!\p" + .string "Hi, you're {PLAYER}{KUN}!\p" .string "This is not the place to chat, so come\n" .string "by my POKéMON LAB later, okay?$" Route101_Text_1EBFDD: @ 81EBFDD .string "If POKéMON get tired, take them to\n" .string "a POKéMON CENTER.\p" - .string "There’s a POKéMON CENTER in OLDALE\n" + .string "There's a POKéMON CENTER in OLDALE\n" .string "TOWN right close by.$" Route101_Text_1EC04A: @ 81EC04A diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index 6eb35c32f..0a2ba36ba 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -80,28 +80,28 @@ Route102_EventScript_1EC1E1:: @ 81EC1E1 PetalburgCity_Text_1EC1F8: @ 81EC1F8 .string "WALLY: {PLAYER}…\n" .string "POKéMON hide in tall grass like this,\l" - .string "don’t they?\p" + .string "don't they?\p" .string "Please watch me and see if I can\n" .string "catch one properly.\p" .string "…Whoa!$" PetalburgCity_Text_1EC271: @ 81EC271 - .string "WALLY: I did it… It’s my…\n" + .string "WALLY: I did it… It's my…\n" .string "My POKéMON!$" PetalburgCity_Text_1EC297: @ 81EC297 .string "{PLAYER}, thank you!\n" - .string "Let’s go back to the GYM!$" + .string "Let's go back to the GYM!$" Route102_Text_1EC2C0: @ 81EC2C0 - .string "I’m…not very tall, so I sink right\n" + .string "I'm…not very tall, so I sink right\n" .string "into tall grass.\p" .string "The grass goes up my nose and…\n" .string "Fwafwafwafwafwa…\p" .string "Fwatchoo!$" Route102_Text_1EC32E: @ 81EC32E - .string "I’m going to catch a whole bunch of\n" + .string "I'm going to catch a whole bunch of\n" .string "POKéMON!$" Route102_Text_1EC35B: @ 81EC35B diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 063beaca7..e79ddd041 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -293,21 +293,21 @@ Route103_EventScript_1EC78F:: @ 81EC78F end Route103_Text_1EC7A6: @ 81EC7A6 - .string "MAY: Let’s see… The POKéMON found\n" + .string "MAY: Let's see… The POKéMON found\n" .string "on ROUTE 103 include…$" Route103_Text_1EC7DE: @ 81EC7DE .string "Oh, hi, {PLAYER}{KUN}!\p" .string "…Oh, I see, my dad gave you\n" .string "a POKéMON as a gift.\p" - .string "Since we’re here, let’s have a quick\n" + .string "Since we're here, let's have a quick\n" .string "battle!\p" - .string "I’ll give you a taste of what being\n" + .string "I'll give you a taste of what being\n" .string "a TRAINER is like.$" Route103_Text_1EC881: @ 81EC881 - .string "Wow! That’s great!\n" - .string "{PLAYER}{KUN}, you’re pretty good!$" + .string "Wow! That's great!\n" + .string "{PLAYER}{KUN}, you're pretty good!$" Route103_Text_1EC8AE: @ 81EC8AE .string "MAY: I think I know why my dad has\n" @@ -316,23 +316,23 @@ Route103_Text_1EC8AE: @ 81EC8AE .string "but it already likes you.\p" .string "You might be able to befriend any\n" .string "kind of POKéMON easily.\p" - .string "Well, it’s time to head back to\n" + .string "Well, it's time to head back to\n" .string "the LAB.$" Route103_Text_1EC989: @ 81EC989 - .string "BRENDAN: Okay, so it’s this one and\n" + .string "BRENDAN: Okay, so it's this one and\n" .string "that one that live on ROUTE 103…$" Route103_Text_1EC9CE: @ 81EC9CE - .string "Hey, it’s {PLAYER}!\p" + .string "Hey, it's {PLAYER}!\p" .string "…Oh, yeah, Dad gave you a POKéMON.\p" - .string "Since we’re here, how about a little\n" + .string "Since we're here, how about a little\n" .string "battle?\p" - .string "I’ll teach you what being a TRAINER’s\n" + .string "I'll teach you what being a TRAINER's\n" .string "about!$" Route103_Text_1ECA59: @ 81ECA59 - .string "Huh, {PLAYER}, you’re not too shabby.$" + .string "Huh, {PLAYER}, you're not too shabby.$" Route103_Text_1ECA79: @ 81ECA79 .string "BRENDAN: I think I get it.\n" @@ -350,8 +350,8 @@ Route103_Text_1ECB73: @ 81ECB73 Route103_Text_1ECBB5: @ 81ECBB5 .string "If you cross the sea from here,\n" - .string "it’ll be a shortcut to OLDALE TOWN.\p" - .string "Fufufu, that’s useful, isn’t it?$" + .string "it'll be a shortcut to OLDALE TOWN.\p" + .string "Fufufu, that's useful, isn't it?$" Route103_Text_1ECC1A: @ 81ECC1A .string "ROUTE 103\n" diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index fcef181eb..1d591793d 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1042,26 +1042,26 @@ Route104_Text_1ED5EC: @ 81ED5EC Route104_Text_1ED662: @ 81ED662 .string "The sea, huh?\p" - .string "I wonder what it’s like at the bottom\n" + .string "I wonder what it's like at the bottom\n" .string "of the sea?$" Route104_Text_1ED6A2: @ 81ED6A2 - .string "If you’re going to throw a POKé BALL,\n" + .string "If you're going to throw a POKé BALL,\n" .string "weaken the wild POKéMON first.\p" - .string "It will be easier to catch if it’s been\n" + .string "It will be easier to catch if it's been\n" .string "poisoned, burned, or lulled to sleep.$" Route104_Text_1ED735: @ 81ED735 - .string "You’re a thief if you try to steal\n" - .string "someone else’s POKéMON.\p" + .string "You're a thief if you try to steal\n" + .string "someone else's POKéMON.\p" .string "You should throw POKé BALLS only at\n" .string "wild POKéMON.$" Route104_Text_1ED7A2: @ 81ED7A2 - .string "Oh, no, I’m not a TRAINER.\p" - .string "But that’s right, if TRAINERS lock eyes,\n" - .string "it’s a challenge to battle.\p" - .string "If you don’t want to battle, stay out\n" + .string "Oh, no, I'm not a TRAINER.\p" + .string "But that's right, if TRAINERS lock eyes,\n" + .string "it's a challenge to battle.\p" + .string "If you don't want to battle, stay out\n" .string "of their sight.$" Route104_Text_1ED838: @ 81ED838 @@ -1075,7 +1075,7 @@ Route104_Text_1ED8E7: @ 81ED8E7 .string "A word of advice!\p" .string "A TM, TECHNICAL MACHINE, is good only\n" .string "for one-time use.\p" - .string "Once you use it, it’s gone.\n" + .string "Once you use it, it's gone.\n" .string "Think twice before using it!$" Route104_Text_1ED96A: @ 81ED96A @@ -1083,7 +1083,7 @@ Route104_Text_1ED96A: @ 81ED96A .string "saplings recently.\p" .string "It made me so happy, I went overboard\n" .string "shopping.\p" - .string "I don’t need this WHITE HERB anymore.\n" + .string "I don't need this WHITE HERB anymore.\n" .string "Would you take it, please?$" Route104_Text_1EDA0F: @ 81EDA0F @@ -1093,7 +1093,7 @@ Route104_Text_1EDA0F: @ 81EDA0F .string "shopping. Where should I put them?$" Route104_Text_1EDA8C: @ 81EDA8C - .string "MR. BRINEY’S COTTAGE$" + .string "MR. BRINEY'S COTTAGE$" Route104_Text_1EDAA1: @ 81EDAA1 .string "ROUTE 1O4\n" @@ -1130,18 +1130,18 @@ Route104_Text_1EDC8F: @ 81EDC8F Route104_Text_1EDCB1: @ 81EDCB1 .string "MAY: Oh, by the way, {PLAYER}{KUN},\n" - .string "how’s your POKéDEX coming along?$" + .string "how's your POKéDEX coming along?$" Route104_Text_1EDCED: @ 81EDCED - .string "Mine’s looking pretty decent.\n" + .string "Mine's looking pretty decent.\n" .string "So…\l" .string "How about a little battle?$" Route104_Text_1EDD2A: @ 81EDD2A - .string "MAY: Oh, what’s the matter?\p" - .string "Haven’t you caught or raised your\n" + .string "MAY: Oh, what's the matter?\p" + .string "Haven't you caught or raised your\n" .string "POKéMON very much?\p" - .string "That’s not very good for a TRAINER!$" + .string "That's not very good for a TRAINER!$" Route104_Text_1EDD9F: @ 81EDD9F .string "MAY: So, what do you think?\n" @@ -1149,25 +1149,25 @@ Route104_Text_1EDD9F: @ 81EDD9F Route104_Text_1EDDDB: @ 81EDDDB .string "MAY: You just became a TRAINER,\n" - .string "{PLAYER}{KUN}. I’m not going to lose!$" + .string "{PLAYER}{KUN}. I'm not going to lose!$" Route104_Text_1EDE18: @ 81EDE18 .string "Yikes!\n" - .string "You’re better than I expected!$" + .string "You're better than I expected!$" Route104_Text_1EDE3E: @ 81EDE3E - .string "MAY: I can tell you’ve gotten pretty\n" + .string "MAY: I can tell you've gotten pretty\n" .string "good with the way you handle POKéMON.\p" .string "But instead of only making them\n" .string "battle, you should be like MR. BRINEY.\p" - .string "It’s important to become friends with\n" + .string "It's important to become friends with\n" .string "POKéMON, too.$" Route104_Text_1EDF04: @ 81EDF04 .string "BRENDAN: Oh, hey, {PLAYER}!\p" .string "Cool, you had DEVON install the MATCH\n" .string "CALL system on your POKéNAV!\p" - .string "Let’s register each other in our\n" + .string "Let's register each other in our\n" .string "POKéNAVS so we can keep in touch.$" Route104_Text_1EDFA0: @ 81EDFA0 @@ -1175,35 +1175,35 @@ Route104_Text_1EDFA0: @ 81EDFA0 .string "in the POKéNAV.$" Route104_Text_1EDFC6: @ 81EDFC6 - .string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n" + .string "BRENDAN: {PLAYER}, how's your POKéDEX?\n" .string "Have you filled in any pages yet?$" Route104_Text_1EE009: @ 81EE009 - .string "Me, I’m doing great!\p" + .string "Me, I'm doing great!\p" .string "Want to check out how good I am with\n" .string "a battle?$" Route104_Text_1EE04D: @ 81EE04D - .string "BRENDAN: What’s the matter? Don’t have\n" + .string "BRENDAN: What's the matter? Don't have\n" .string "any confidence in your POKéMON?$" Route104_Text_1EE094: @ 81EE094 - .string "BRENDAN: What’s up?\n" + .string "BRENDAN: What's up?\n" .string "Want to have a battle with me?$" Route104_Text_1EE0C7: @ 81EE0C7 .string "BRENDAN: I know you just became\n" - .string "a TRAINER, but I won’t go easy!$" + .string "a TRAINER, but I won't go easy!$" Route104_Text_1EE107: @ 81EE107 .string "Hmm…\n" - .string "You’re pretty good.$" + .string "You're pretty good.$" Route104_Text_1EE120: @ 81EE120 - .string "BRENDAN: You’ve gotten pretty decent\n" + .string "BRENDAN: You've gotten pretty decent\n" .string "at handling POKéMON.\p" - .string "But, you know, you shouldn’t just be\n" + .string "But, you know, you shouldn't just be\n" .string "making POKéMON battle.\p" - .string "Like MR. BRINEY, it’s important to\n" + .string "Like MR. BRINEY, it's important to\n" .string "become friends with your POKéMON.$" diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 077f9fab4..e8fc402c5 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -107,24 +107,24 @@ Route104_MrBrineysHouse_Text_229E70: @ 8229E70 .string "Wait up, PEEKO!$" Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B - .string "Hm? You’re {PLAYER}{KUN}!\n" + .string "Hm? You're {PLAYER}{KUN}!\n" .string "You saved my darling PEEKO!\l" .string "We owe so much to you!\p" - .string "What’s that?\n" + .string "What's that?\n" .string "You want to sail with me?\p" .string "Hmhm…\p" .string "You have a LETTER bound for DEWFORD\n" .string "and a package for SLATEPORT, then?\p" .string "Quite the busy life you must lead!\p" - .string "But, certainly, what you’re asking is\n" + .string "But, certainly, what you're asking is\n" .string "no problem at all.\p" - .string "You’ve come to the right man!\n" - .string "We’ll set sail for DEWFORD.$" + .string "You've come to the right man!\n" + .string "We'll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9 .string "MR. BRINEY: DEWFORD it is, then!\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" Route104_MrBrineysHouse_Text_22A041: @ 822A041 .string "MR. BRINEY: Is that so?\n" @@ -135,24 +135,24 @@ Route104_MrBrineysHouse_Text_22A041: @ 822A041 Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD .string "MR. BRINEY: Ahoy!\n" .string "I know exactly what you want to say!\p" - .string "You’re to deliver a LETTER to DEWFORD\n" + .string "You're to deliver a LETTER to DEWFORD\n" .string "and a package to SLATEPORT.\p" .string "What you need me to do is no problem\n" - .string "at all--I’m the man for the job!\p" - .string "First, we’ll set sail for DEWFORD.$" + .string "at all--I'm the man for the job!\p" + .string "First, we'll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_22A18F: @ 822A18F .string "MR. BRINEY: Ahoy!\n" .string "I know exactly what you want to say!\p" - .string "You’re to deliver a package to\n" + .string "You're to deliver a package to\n" .string "CAPT. STERN in SLATEPORT.\p" .string "What you need me to do is no problem\n" - .string "at all--I’m the man for the job!\p" - .string "First, we’ll set sail for DEWFORD.$" + .string "at all--I'm the man for the job!\p" + .string "First, we'll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_22A268: @ 822A268 .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" + .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3 diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 18fe07cbe..617e84350 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -90,11 +90,11 @@ Route104_Text_1EE336: @ 81EE336 .string "… … … … … …\n" .string "Where are you now?\l" .string "It sounds windy wherever you are.\p" - .string "I just heard from DEVON’s MR. STONE\n" + .string "I just heard from DEVON's MR. STONE\n" .string "about your POKéNAV, so I decided\l" .string "to give you a call.\p" - .string "It sounds like you’re doing fine,\n" - .string "so that’s fine with me.\p" + .string "It sounds like you're doing fine,\n" + .string "so that's fine with me.\p" .string "You take care now.\p" .string "… … … … … …\n" .string "… … … … … Click!$" diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 050dad358..52f6437ae 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -481,12 +481,12 @@ Route109_EventScript_1EEC06:: @ 81EEC06 DewfordTown_Text_1EEC1D: @ 81EEC1D .string "MR. BRINEY: Ahoy!\n" - .string "We’ve made land in SLATEPORT!\p" - .string "I suppose you’re going to visit CAPT.\n" + .string "We've made land in SLATEPORT!\p" + .string "I suppose you're going to visit CAPT.\n" .string "STERN and deliver the DEVON GOODS?$" Route109_Text_1EEC96: @ 81EEC96 - .string "MR. BRINEY: I thought you’re supposed\n" + .string "MR. BRINEY: I thought you're supposed\n" .string "to deliver the DEVON GOODS.\p" .string "Would you like to sail back to\n" .string "DEWFORD, then?$" @@ -494,21 +494,21 @@ Route109_Text_1EEC96: @ 81EEC96 Route109_Text_1EED06: @ 81EED06 .string "MR. BRINEY: DEWFORD it is, then!\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" Route109_Text_1EED5E: @ 81EED5E .string "MR. BRINEY: Then you go on and deliver\n" - .string "the DEVON GOODS. I’ll be waiting.$" + .string "the DEVON GOODS. I'll be waiting.$" DewfordTown_Text_1EEDA7: @ 81EEDA7 - .string "MR. BRINEY: Ahoy! We’ve made land in\n" + .string "MR. BRINEY: Ahoy! We've made land in\n" .string "SLATEPORT!\p" .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" Route109_Text_1EEE17: @ 81EEE17 .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" + .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" Route109_Text_1EEE72: @ 81EEE72 @@ -517,30 +517,30 @@ Route109_Text_1EEE72: @ 81EEE72 Route109_Text_1EEEB4: @ 81EEEB4 .string "Yo, TRAINERS!\n" - .string "Whether you’re hot to trot,\l" + .string "Whether you're hot to trot,\l" .string "or cool cat not,\l" - .string "chill at my papa’s spot!$" + .string "chill at my papa's spot!$" Route109_Text_1EEF08: @ 81EEF08 .string "Little kids can dart around so quickly…\p" - .string "You don’t dare take your eyes off them\n" - .string "for an instant. It’s very taxing.\p" + .string "You don't dare take your eyes off them\n" + .string "for an instant. It's very taxing.\p" .string "Mine are with my POKéMON, so they\n" .string "should be okay, but…$" Route109_Text_1EEFB0: @ 81EEFB0 - .string "Our sand castle’s taking a long time\n" + .string "Our sand castle's taking a long time\n" .string "to make.$" Route109_Text_1EEFDE: @ 81EEFDE .string "You can have this!$" Route109_Text_1EEFF1: @ 81EEFF1 - .string "We’re going to get all the sand from\n" + .string "We're going to get all the sand from\n" .string "the beach and make a big castle!\p" - .string "And then we’re going to be a king and\n" + .string "And then we're going to be a king and\n" .string "queen.\p" - .string "We’ll let you be a servant.$" + .string "We'll let you be a servant.$" Route109_Text_1EF080: @ 81EF080 .string "The water around these parts is clean.\p" diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 323dc2bf8..fd0b224bc 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -116,13 +116,13 @@ Route109_SeashoreHouse_EventScript_269553:: @ 8269553 end Route109_SeashoreHouse_Text_269555: @ 8269555 - .string "I’m the owner of the SEASHORE HOUSE.\n" + .string "I'm the owner of the SEASHORE HOUSE.\n" .string "But you can call me MR. SEA!\p" .string "What I love above all is to see hot\n" .string "POKéMON battles.\p" .string "Let me see that your heart burns hot!\p" .string "If you can defeat all the TRAINERS\n" - .string "here, I’ll reward your efforts.$" + .string "here, I'll reward your efforts.$" Route109_SeashoreHouse_Text_269635: @ 8269635 .string "Show me some hot matches!\p" @@ -130,16 +130,16 @@ Route109_SeashoreHouse_Text_269635: @ 8269635 .string "that reason alone!$" Route109_SeashoreHouse_Text_269685: @ 8269685 - .string "You’re scorching hot!\n" + .string "You're scorching hot!\n" .string "Those battles blazed!\l" - .string "I’m more than just satisfied!\p" + .string "I'm more than just satisfied!\p" .string "As thanks for showing me your hot\n" .string "streak, I want you to take these.\p" - .string "It’s half a dozen bottles of SODA POP!$" + .string "It's half a dozen bottles of SODA POP!$" Route109_SeashoreHouse_Text_26973A: @ 826973A - .string "Oh, but hey, your BAG’s jammed full.\n" - .string "I’ll hang on to these for you.$" + .string "Oh, but hey, your BAG's jammed full.\n" + .string "I'll hang on to these for you.$" Route109_SeashoreHouse_Text_26977E: @ 826977E .string "Want to buy some SODA POP?\n" @@ -151,15 +151,15 @@ Route109_SeashoreHouse_Text_2697C8: @ 82697C8 .string "Here you go!$" Route109_SeashoreHouse_Text_2697D5: @ 82697D5 - .string "You don’t have the money.$" + .string "You don't have the money.$" Route109_SeashoreHouse_Text_2697EF: @ 82697EF .string "No?\n" - .string "That’s too bad.$" + .string "That's too bad.$" Route109_SeashoreHouse_Text_269803: @ 8269803 - .string "If you’re looking for a battle in the\n" - .string "SEASHORE HOUSE, you’ll find no\l" + .string "If you're looking for a battle in the\n" + .string "SEASHORE HOUSE, you'll find no\l" .string "hotter TRAINER than me, matey!$" Route109_SeashoreHouse_Text_269867: @ 8269867 @@ -167,27 +167,27 @@ Route109_SeashoreHouse_Text_269867: @ 8269867 .string "I can accept that loss, matey!$" Route109_SeashoreHouse_Text_26989D: @ 826989D - .string "Whenever I’m in SLATEPORT, I enjoy\n" + .string "Whenever I'm in SLATEPORT, I enjoy\n" .string "hot battles and ice-cold SODA POP!$" Route109_SeashoreHouse_Text_2698E3: @ 82698E3 - .string "Boring battles aren’t worth the effort.\p" + .string "Boring battles aren't worth the effort.\p" .string "Fiery hot battles are what toughen up\n" .string "TRAINERS and POKéMON!$" Route109_SeashoreHouse_Text_269947: @ 8269947 - .string "That’s hot!$" + .string "That's hot!$" Route109_SeashoreHouse_Text_269953: @ 8269953 - .string "Whew, I’m all thirsty.\n" - .string "Maybe I’ll have a SODA POP.$" + .string "Whew, I'm all thirsty.\n" + .string "Maybe I'll have a SODA POP.$" Route109_SeashoreHouse_Text_269986: @ 8269986 - .string "I’m going to show you how great\n" - .string "my POKéMON are, but don’t cry!$" + .string "I'm going to show you how great\n" + .string "my POKéMON are, but don't cry!$" Route109_SeashoreHouse_Text_2699C5: @ 82699C5 - .string "…I lost, but I won’t cry…$" + .string "…I lost, but I won't cry…$" Route109_SeashoreHouse_Text_2699DF: @ 82699DF .string "If one of my POKéMON knew the move\n" diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 9ff7667c5..c5d53b5b4 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -768,8 +768,8 @@ Route110_Movement_1EFB57: @ 81EFB57 step_end Route110_Text_1EFB5D: @ 81EFB5D - .string "TEAM AQUA’s activities…\n" - .string "We can’t talk about them yet.$" + .string "TEAM AQUA's activities…\n" + .string "We can't talk about them yet.$" Route110_Text_1EFB93: @ 81EFB93 .string "I want to get going to SLATEPORT and\n" @@ -777,11 +777,11 @@ Route110_Text_1EFB93: @ 81EFB93 Route110_Text_1EFBCA: @ 81EFBCA .string "This is my first job after joining\n" - .string "TEAM AQUA. It’s a little scary.$" + .string "TEAM AQUA. It's a little scary.$" Route110_Text_1EFC0D: @ 81EFC0D - .string "TEAM AQUA’s actions should bring\n" - .string "smiles to people’s faces!$" + .string "TEAM AQUA's actions should bring\n" + .string "smiles to people's faces!$" Route110_Text_1EFC48: @ 81EFC48 .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" @@ -792,51 +792,51 @@ Route110_Text_1EFC48: @ 81EFC48 Route110_Text_1EFCCB: @ 81EFCCB .string "Yikes!\n" - .string "You’re better than I expected!$" + .string "You're better than I expected!$" Route110_Text_1EFCF1: @ 81EFCF1 - .string "MAY: {PLAYER}{KUN}, you’ve been busy\n" - .string "training, too, haven’t you?\p" + .string "MAY: {PLAYER}{KUN}, you've been busy\n" + .string "training, too, haven't you?\p" .string "I think you deserve a reward!\n" .string "This is from me!$" Route110_Text_1EFD58: @ 81EFD58 - .string "MAY: That’s an ITEMFINDER.\p" - .string "Try it out. If there is an item that’s\n" + .string "MAY: That's an ITEMFINDER.\p" + .string "Try it out. If there is an item that's\n" .string "not visible, it emits a sound.\p" - .string "Okay, {PLAYER}{KUN}, let’s meet again!\p" - .string "I know it’s a little silly coming from\n" + .string "Okay, {PLAYER}{KUN}, let's meet again!\p" + .string "I know it's a little silly coming from\n" .string "me, but I think you should train a lot\l" .string "harder for the next time.$" Route110_Text_1EFE3F: @ 81EFE3F .string "BRENDAN: Hey, {PLAYER}.\n" .string "So this is where you were.\l" - .string "How’s it going?\p" + .string "How's it going?\p" .string "Have you been raising your POKéMON?\n" - .string "I’ll check for you.$" + .string "I'll check for you.$" Route110_Text_1EFEB4: @ 81EFEB4 .string "Hmm…\n" - .string "You’re pretty good.$" + .string "You're pretty good.$" Route110_Text_1EFECD: @ 81EFECD - .string "BRENDAN: {PLAYER}, you’ve trained\n" + .string "BRENDAN: {PLAYER}, you've trained\n" .string "without me noticing…\p" .string "Good enough!\n" .string "Here, take this.$" Route110_Text_1EFF1C: @ 81EFF1C - .string "BRENDAN: That’s an ITEMFINDER.\p" + .string "BRENDAN: That's an ITEMFINDER.\p" .string "Use it to root around for items that\n" - .string "aren’t visible.\p" + .string "aren't visible.\p" .string "If it senses something, it emits\n" .string "a sound.\p" - .string "Anyway, I’m off to look for new\n" + .string "Anyway, I'm off to look for new\n" .string "POKéMON.$" Route110_Text_1EFFC3: @ 81EFFC3 - .string "Wouldn’t it be great to ride a BIKE\n" + .string "Wouldn't it be great to ride a BIKE\n" .string "at full speed on CYCLING ROAD?$" Route110_Text_1F0006: @ 81F0006 @@ -846,7 +846,7 @@ Route110_Text_1F0006: @ 81F0006 Route110_Text_1F006A: @ 81F006A .string "Oh, hey, you got that BIKE from RYDEL!\p" - .string "Oh, it’s glaringly obvious.\n" + .string "Oh, it's glaringly obvious.\n" .string "It says right on your bike…\p" .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" @@ -857,9 +857,9 @@ Route110_Text_1F006A: @ 81F006A .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL…\n" - .string "That name’s everywhere.\p" + .string "That name's everywhere.\p" .string "You should ride it around all over\n" - .string "the place--it’s good advertising!$" + .string "the place--it's good advertising!$" Route110_Text_1F0261: @ 81F0261 .string "The two roads, one above, one below…\p" @@ -867,7 +867,7 @@ Route110_Text_1F0261: @ 81F0261 .string "Perhaps that is right and fair.$" Route110_Text_1F02CA: @ 81F02CA - .string "I don’t have a BIKE, so I’ll take\n" + .string "I don't have a BIKE, so I'll take\n" .string "a leisurely walk on the low road.$" Route110_Text_1F030E: @ 81F030E @@ -892,7 +892,7 @@ Route110_Text_1F0431: @ 81F0431 .string "Bravo! Splendid showing!\p" .string "Your love of cycling comes from deep\n" .string "within your heart.\l" - .string "You’ve shaken me to my very soul!$" + .string "You've shaken me to my very soul!$" Route110_Text_1F04A4: @ 81F04A4 .string "Your technique is remarkable.\p" @@ -902,7 +902,7 @@ Route110_Text_1F04A4: @ 81F04A4 Route110_Text_1F0500: @ 81F0500 .string "I would consider you a work in\n" .string "progress.\p" - .string "Still, I hope you don’t forget the\n" + .string "Still, I hope you don't forget the\n" .string "sheer pleasure of cycling.$" Route110_Text_1F0567: @ 81F0567 @@ -913,7 +913,7 @@ Route110_Text_1F0567: @ 81F0567 Route110_Text_1F05CE: @ 81F05CE .string "…I am aghast…\p" - .string "You’re perhaps not cut out for this\n" + .string "You're perhaps not cut out for this\n" .string "unfortunate cycling business.\p" .string "You ought to give serious thought to\n" .string "returning that BIKE to RYDEL.$" @@ -935,7 +935,7 @@ Route110_Text_1F0755: @ 81F0755 .string "MACH BIKES are rated for their number\l" .string "of collisions and their total times.\p" .string "ACRO BIKES do not qualify for rating.\n" - .string "They are easy to turn, so it’s not fair.$" + .string "They are easy to turn, so it's not fair.$" Route110_Text_1F0812: @ 81F0812 .string "ROUTE 110\n" @@ -996,12 +996,12 @@ Route110_Text_1F0AB5: @ 81F0AB5 Route110_Text_1F0AFF: @ 81F0AFF .string "Oh, I see!\n" .string "You two are running separately.\l" - .string "Well, that’s fine.\p" + .string "Well, that's fine.\p" .string "Oh, yes, I heard that your POKéNAV\n" .string "had the MATCH CALL system installed.\p" .string "Well, then, I should register you in\n" .string "my POKéNAV as well.\p" - .string "That way, even when we’re apart,\n" + .string "That way, even when we're apart,\n" .string "I can rate your POKéDEX anytime.\p" .string "… … … … … …$" diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index 571cda664..ee859748f 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -39,12 +39,12 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6 Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1 .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" + .string "and cycle as fast as you'd like.\p" .string "It feels great to go that fast, but try\n" .string "not to crash into anyone!$" Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48 - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" + .string "Sorry, you can't walk on CYCLING\n" + .string "ROAD. It's too dangerous.\p" .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 7bec38fa6..9bd6c845e 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -58,12 +58,12 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23 .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" + .string "and cycle as fast as you'd like.\p" .string "It feels great to go that fast, but try\n" .string "not to crash into anyone!$" Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" + .string "Sorry, you can't walk on CYCLING\n" + .string "ROAD. It's too dangerous.\p" .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 8d6da9a8c..892d9e65f 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -262,50 +262,50 @@ Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B Route110_TrickHouseEnd_Text_26B08D: @ 826B08D .string "Aak!\n" - .string "You’ve made it to me?\l" - .string "Hmmm… You’re sharp!$" + .string "You've made it to me?\l" + .string "Hmmm… You're sharp!$" Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC .string "It took me all night to plant all those\n" .string "trees…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two, three, four, five, six places!$" Route110_TrickHouseEnd_Text_26B13B: @ 826B13B .string "It took me all night to make the maze…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two, three, four, five places!$" Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD .string "It took me all night to prepare\n" .string "the wall panels…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two, three, four places!$" Route110_TrickHouseEnd_Text_26B223: @ 826B223 .string "It took me all night to shove in those\n" .string "boulders…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two, three places!$" Route110_TrickHouseEnd_Text_26B293: @ 826B293 .string "It took me all night to make MECHADOLLS\n" .string "and another to think up the quiz…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two places!$" Route110_TrickHouseEnd_Text_26B315: @ 826B315 .string "It took me all night to install\n" .string "the doors…\p" - .string "You’re almost my equal in greatness!$" + .string "You're almost my equal in greatness!$" Route110_TrickHouseEnd_Text_26B365: @ 826B365 .string "It took me all night setting up arrows…\p" - .string "You’re my equal in greatness!$" + .string "You're my equal in greatness!$" Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB .string "It took me all night polishing floors…\p" - .string "You’re above me in greatness!\n" + .string "You're above me in greatness!\n" .string "Possibly…$" Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA @@ -352,18 +352,18 @@ Route110_TrickHouseEnd_Text_26B73D: @ 826B73D Route110_TrickHouseEnd_Text_26B760: @ 826B760 .string "What? Have you no room for this?\n" .string "What manner of items do you carry?\p" - .string "But fine, since you’ve reached me,\n" + .string "But fine, since you've reached me,\n" .string "your reward will be with me till later.$" Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF .string "Scrub that smug smirk from your face!\n" - .string "It’s much too early to think you’ve won!\p" - .string "I’ll make new tricks to stump you, I will.\n" - .string "You may mock me only when you’re done.\p" + .string "It's much too early to think you've won!\p" + .string "I'll make new tricks to stump you, I will.\n" + .string "You may mock me only when you're done.\p" .string "Come back for the next exciting\n" .string "installment!$" Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD - .string "Now, now! You’re ignoring me now?\n" + .string "Now, now! You're ignoring me now?\n" .string "Now that, I consider heartbreaking!$" diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index e82c052fc..22750f536 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -772,47 +772,47 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459 return Route110_TrickHouseEntrance_Text_26A474: @ 826A474 - .string "You’re being watched…$" + .string "You're being watched…$" Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "beneath this desk? You’re sharp!$" + .string "beneath this desk? You're sharp!$" Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "behind this tree? You’re sharp!$" + .string "behind this tree? You're sharp!$" Route110_TrickHouseEntrance_Text_26A529: @ 826A529 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "in this dresser? You’re sharp!$" + .string "in this dresser? You're sharp!$" Route110_TrickHouseEntrance_Text_26A577: @ 826A577 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "beyond this window? You’re sharp!$" + .string "beyond this window? You're sharp!$" Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "in this planter? You’re sharp!$" + .string "in this planter? You're sharp!$" Route110_TrickHouseEntrance_Text_26A616: @ 826A616 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "in this cupboard? You’re sharp!$" + .string "in this cupboard? You're sharp!$" Route110_TrickHouseEntrance_Text_26A665: @ 826A665 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "behind this window? You’re sharp!$" + .string "behind this window? You're sharp!$" Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "beneath this cushion? You’re sharp!$" + .string "beneath this cushion? You're sharp!$" Route110_TrickHouseEntrance_Text_26A709: @ 826A709 .string "Behold!\p" @@ -823,9 +823,9 @@ Route110_TrickHouseEntrance_Text_26A709: @ 826A709 .string "Wahahaha! Glad to meet you!$" Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C - .string "You, you’ve come to challenge\n" - .string "my TRICK HOUSE, haven’t you?\p" - .string "That’s why you’re here, isn’t it?\n" + .string "You, you've come to challenge\n" + .string "my TRICK HOUSE, haven't you?\p" + .string "That's why you're here, isn't it?\n" .string "Yes, it is!\p" .string "Consider your challenge accepted!\p" .string "Enter through the scroll there,\n" @@ -833,7 +833,7 @@ Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C .string "I shall be waiting in the back!$" Route110_TrickHouseEntrance_Text_26A878: @ 826A878 - .string "It’s a scroll.$" + .string "It's a scroll.$" Route110_TrickHouseEntrance_Text_26A887: @ 826A887 .string "There is a big hole behind the scroll!\p" @@ -842,30 +842,30 @@ Route110_TrickHouseEntrance_Text_26A887: @ 826A887 Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD .string "There is a note affixed to the scroll…\p" .string "“I am leaving on a journey.\n" - .string "Don’t look for me. TRICK MASTERâ€$" + .string "Don't look for me. TRICK MASTERâ€$" Route110_TrickHouseEntrance_Text_26A921: @ 826A921 - .string "For the next time, I’ll use this trick,\n" + .string "For the next time, I'll use this trick,\n" .string "and that scheme, and those ruses…\p" - .string "Mufufufu… If I may say so, it’s\n" + .string "Mufufufu… If I may say so, it's\n" .string "brilliantly difficult, even for me!$" Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF .string "Hah? What?!\n" - .string "Oh, it’s you!\p" - .string "I’m in the midst of devising new tricky\n" + .string "Oh, it's you!\p" + .string "I'm in the midst of devising new tricky\n" .string "challenges!\p" - .string "It’s not too much to ask for a bit more\n" + .string "It's not too much to ask for a bit more\n" .string "time for me to think, is it now?\l" - .string "You wouldn’t begrudge me that?\l" + .string "You wouldn't begrudge me that?\l" .string "Come back in a little while!$" Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82 - .string "Ah, it’s you! You’re here to accept the\n" - .string "reward from before, isn’t that right?\l" + .string "Ah, it's you! You're here to accept the\n" + .string "reward from before, isn't that right?\l" .string "Yes, right I am!\p" .string "Here!\n" - .string "I’ll give it to you now!$" + .string "I'll give it to you now!$" Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00 .string "Hah?\n" diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index aeeec549d..036521ee4 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -46,7 +46,7 @@ Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D .string "The lock clicked open!$" Route110_TrickHousePuzzle1_Text_26B9FB: @ 826B9FB - .string "I’ll hack and slash my way to victory\n" + .string "I'll hack and slash my way to victory\n" .string "with the CUT we just learned!$" Route110_TrickHousePuzzle1_Text_26BA3F: @ 826BA3F @@ -61,11 +61,11 @@ Route110_TrickHousePuzzle1_Text_26BA82: @ 826BA82 .string "by accident…$" Route110_TrickHousePuzzle1_Text_26BAB0: @ 826BAB0 - .string "And now I’ve lost…$" + .string "And now I've lost…$" Route110_TrickHousePuzzle1_Text_26BAC3: @ 826BAC3 - .string "I lost my way, I lost a battle, and I’m\n" - .string "now even more lost… I can’t get out…$" + .string "I lost my way, I lost a battle, and I'm\n" + .string "now even more lost… I can't get out…$" Route110_TrickHousePuzzle1_Text_26BB10: @ 826BB10 .string "Just who is the TRICK MASTER?$" @@ -74,6 +74,6 @@ Route110_TrickHousePuzzle1_Text_26BB2E: @ 826BB2E .string "I lost while I was lost in thought!$" Route110_TrickHousePuzzle1_Text_26BB52: @ 826BB52 - .string "You’re strong!\n" + .string "You're strong!\n" .string "Just who are you?$" diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 80d09866b..60c7cdbce 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -115,7 +115,7 @@ Route110_TrickHousePuzzle2_Text_26BD25: @ 826BD25 .string "Which switch closes which hole?$" Route110_TrickHousePuzzle2_Text_26BD45: @ 826BD45 - .string "After that battle, I’m even more\n" + .string "After that battle, I'm even more\n" .string "confused!$" Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70 @@ -123,11 +123,11 @@ Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70 .string "for me?$" Route110_TrickHousePuzzle2_Text_26BD9E: @ 826BD9E - .string "Oh! You’re on your second TRICK HOUSE\n" + .string "Oh! You're on your second TRICK HOUSE\n" .string "challenge!$" Route110_TrickHousePuzzle2_Text_26BDCF: @ 826BDCF - .string "You’re good at battling too?$" + .string "You're good at battling too?$" Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC .string "The TRICK MASTER rigged all the tricks\n" @@ -135,12 +135,12 @@ Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC Route110_TrickHousePuzzle2_Text_26BE31: @ 826BE31 .string "I want to make my own GYM one day.\n" - .string "So, I’m studying how to set traps.$" + .string "So, I'm studying how to set traps.$" Route110_TrickHousePuzzle2_Text_26BE77: @ 826BE77 - .string "I didn’t study battling enough!$" + .string "I didn't study battling enough!$" Route110_TrickHousePuzzle2_Text_26BE97: @ 826BE97 - .string "You’re strong, aren’t you?\n" + .string "You're strong, aren't you?\n" .string "Maybe even enough to be a GYM LEADER!$" diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 2c94012fb..cadb6315a 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -327,34 +327,34 @@ Route110_TrickHousePuzzle3_Text_26C676: @ 826C676 .string "I keep coming back to this same place!$" Route110_TrickHousePuzzle3_Text_26C69D: @ 826C69D - .string "I’m already having trouble, and then\n" - .string "you have to beat me? It’s not fair!$" + .string "I'm already having trouble, and then\n" + .string "you have to beat me? It's not fair!$" Route110_TrickHousePuzzle3_Text_26C6E6: @ 826C6E6 - .string "It’s full of doors here!\n" - .string "It’s too small and dark in here! Help!$" + .string "It's full of doors here!\n" + .string "It's too small and dark in here! Help!$" Route110_TrickHousePuzzle3_Text_26C726: @ 826C726 - .string "I don’t know what’s going on here.\n" - .string "I’m starting to feel sad…$" + .string "I don't know what's going on here.\n" + .string "I'm starting to feel sad…$" Route110_TrickHousePuzzle3_Text_26C763: @ 826C763 - .string "You… You’re awful!$" + .string "You… You're awful!$" Route110_TrickHousePuzzle3_Text_26C776: @ 826C776 - .string "I know I’m weak!\n" + .string "I know I'm weak!\n" .string "And, I have no sense of direction!$" Route110_TrickHousePuzzle3_Text_26C7AA: @ 826C7AA - .string "I don’t get it. What would anyone want\n" + .string "I don't get it. What would anyone want\n" .string "with a house this bizarre?$" Route110_TrickHousePuzzle3_Text_26C7EC: @ 826C7EC - .string "I don’t get it.\n" + .string "I don't get it.\n" .string "How did I lose?$" Route110_TrickHousePuzzle3_Text_26C80C: @ 826C80C - .string "I don’t get it.\n" + .string "I don't get it.\n" .string "How many traps are in this house?\p" .string "You may be the one to solve that.$" diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 2cc97127b..3d1004b1c 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -36,7 +36,7 @@ Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3 .string "The lock clicked open!$" Route110_TrickHousePuzzle4_Text_26C92D: @ 826C92D - .string "It’s too much bother to think this out.\n" + .string "It's too much bother to think this out.\n" .string "I only wanted to battle!$" Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E @@ -44,7 +44,7 @@ Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E .string "the best!$" Route110_TrickHousePuzzle4_Text_26C9A2: @ 826C9A2 - .string "Wouldn’t you agree? You would go\n" + .string "Wouldn't you agree? You would go\n" .string "anywhere if TRAINERS were there.$" Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4 @@ -52,16 +52,16 @@ Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4 .string "aside with one finger!$" Route110_TrickHousePuzzle4_Text_26CA20: @ 826CA20 - .string "I can push boulders, but I can’t solve\n" + .string "I can push boulders, but I can't solve\n" .string "the puzzle…$" Route110_TrickHousePuzzle4_Text_26CA53: @ 826CA53 - .string "It’s not good enough to be brawny…\n" + .string "It's not good enough to be brawny…\n" .string "You have to use your head. Be brainy!$" Route110_TrickHousePuzzle4_Text_26CA9C: @ 826CA9C .string "The TRICK HOUSE is getting trickier,\n" - .string "isn’t it?$" + .string "isn't it?$" Route110_TrickHousePuzzle4_Text_26CACB: @ 826CACB .string "Aaak!$" diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 96c727dc0..330b4fcd7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1011,7 +1011,7 @@ Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9 Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA .string "CLICKETY-CLACK…\n" .string "MECHADOLL 2 AM I!\p" - .string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n" + .string "MECHADOLL 1'S QUIZ DIFFICULTY LEVEL\n" .string "IS SET TOO LOW.$" Route110_TrickHousePuzzle5_Text_26D940: @ 826D940 @@ -1066,18 +1066,18 @@ Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7 Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A .string "MECHADOLL 4 QUIZ.\p" - .string "In the TRAINER’S SCHOOL, how many\n" + .string "In the TRAINER'S SCHOOL, how many\n" .string "girl students were there?$" Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78 .string "CLICKETY-CLACK…\n" .string "MECHADOLL 5 AM I!\p" - .string "THE MASTER’S BEST AND PROUDEST\n" + .string "THE MASTER'S BEST AND PROUDEST\n" .string "ACHIEVEMENT AM I.$" Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB .string "MECHADOLL 5 QUIZ.\p" - .string "In SLATEPORT’s POKéMON FAN CLUB,\n" + .string "In SLATEPORT's POKéMON FAN CLUB,\n" .string "how many POKéMON were there?$" Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 4881ac87a..53c548c20 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -54,12 +54,12 @@ Route110_TrickHousePuzzle6_Text_26DE93: @ 826DE93 .string "house, I had to check it out.$" Route110_TrickHousePuzzle6_Text_26DED2: @ 826DED2 - .string "I’ve discovered a tough TRAINER!$" + .string "I've discovered a tough TRAINER!$" Route110_TrickHousePuzzle6_Text_26DEF3: @ 826DEF3 - .string "I’m sure having a good time checking\n" + .string "I'm sure having a good time checking\n" .string "this place out.\p" - .string "It’s a challenge I’ve found worth\n" + .string "It's a challenge I've found worth\n" .string "repeating!$" Route110_TrickHousePuzzle6_Text_26DF55: @ 826DF55 @@ -74,14 +74,14 @@ Route110_TrickHousePuzzle6_Text_26DFA0: @ 826DFA0 .string "I was trying to cheat.$" Route110_TrickHousePuzzle6_Text_26DFD7: @ 826DFD7 - .string "I’m getting dizzy from these rotating\n" + .string "I'm getting dizzy from these rotating\n" .string "doors…$" Route110_TrickHousePuzzle6_Text_26E004: @ 826E004 - .string "Everything’s spinning around and\n" - .string "around. I can’t take this anymore…$" + .string "Everything's spinning around and\n" + .string "around. I can't take this anymore…$" Route110_TrickHousePuzzle6_Text_26E048: @ 826E048 - .string "You don’t seem to be affected at all.\n" + .string "You don't seem to be affected at all.\n" .string "Or do you have your poker face on?$" diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3df92dc99..4004c2e2c 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -345,7 +345,7 @@ Route110_TrickHousePuzzle7_Text_26E481: @ 826E481 .string "like smoke. How does he do it?$" Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1 - .string "Aiyeeeh! You’re much too strong!\n" + .string "Aiyeeeh! You're much too strong!\n" .string "How do you do it?$" Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4 @@ -358,49 +358,49 @@ Route110_TrickHousePuzzle7_Text_26E531: @ 826E531 Route110_TrickHousePuzzle7_Text_26E564: @ 826E564 .string "Defeated!\n" - .string "It’s a bad sign…$" + .string "It's a bad sign…$" Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F - .string "I’ve circled the same spot over ten\n" - .string "times now… It’s ill fortune…$" + .string "I've circled the same spot over ten\n" + .string "times now… It's ill fortune…$" Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0 .string "Whoever wins will get through here\n" - .string "first. That’s the feeling I get.$" + .string "first. That's the feeling I get.$" Route110_TrickHousePuzzle7_Text_26E604: @ 826E604 .string "Oh!\n" .string "Well, go ahead, then!$" Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E - .string "You’re solving all the puzzles in the\n" - .string "TRICK HOUSE. That’s the feeling I get.$" + .string "You're solving all the puzzles in the\n" + .string "TRICK HOUSE. That's the feeling I get.$" Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B .string "Nufufufu, here at last!\n" - .string "Let’s get right with it!$" + .string "Let's get right with it!$" Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C - .string "You’re so casual about winning!$" + .string "You're so casual about winning!$" Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC - .string "Humph! I’m not upset!\n" + .string "Humph! I'm not upset!\n" .string "Not me!$" Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA .string "I ever so closely watched you coming!$" Route110_TrickHousePuzzle7_Text_26E700: @ 826E700 - .string "This outcome I didn’t see coming…$" + .string "This outcome I didn't see coming…$" Route110_TrickHousePuzzle7_Text_26E722: @ 826E722 .string "Well, anyway, we both picked a weird\n" .string "place to get acquainted.\p" .string "As one weirdo to another,\n" - .string "let’s do our best!$" + .string "let's do our best!$" Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D - .string "It’s awfully cramped in here…$" + .string "It's awfully cramped in here…$" Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB .string "Oh, yes, strong you are.$" diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 0f9155faf..31aeb9e3a 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -40,26 +40,26 @@ Route110_TrickHousePuzzle8_Text_26E8CD: @ 826E8CD .string "this far.$" Route110_TrickHousePuzzle8_Text_26E8F6: @ 826E8F6 - .string "That must mean you’re tough, too…$" + .string "That must mean you're tough, too…$" Route110_TrickHousePuzzle8_Text_26E918: @ 826E918 - .string "You’ve beaten the POKéMON LEAGUE\n" - .string "CHAMPION? That’s too much!$" + .string "You've beaten the POKéMON LEAGUE\n" + .string "CHAMPION? That's too much!$" Route110_TrickHousePuzzle8_Text_26E954: @ 826E954 .string "Consider yourself lucky to be\n" .string "battling me!$" Route110_TrickHousePuzzle8_Text_26E97F: @ 826E97F - .string "This isn’t right!\n" - .string "I can’t lose!$" + .string "This isn't right!\n" + .string "I can't lose!$" Route110_TrickHousePuzzle8_Text_26E99F: @ 826E99F - .string "It’s a miracle that you beat me.\n" + .string "It's a miracle that you beat me.\n" .string "You can brag about it.$" Route110_TrickHousePuzzle8_Text_26E9D7: @ 826E9D7 - .string "You’ve been slugging through the TRICK\n" + .string "You've been slugging through the TRICK\n" .string "HOUSE challenge, too.$" Route110_TrickHousePuzzle8_Text_26EA14: @ 826EA14 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index f03dc38ac..2be579ab6 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -592,8 +592,8 @@ Route111_EventScript_1F146C:: @ 81F146C end Route111_Text_1F1475: @ 81F1475 - .string "Hello! I take it you’re a traveler.\p" - .string "How’s this? What do you say to taking\n" + .string "Hello! I take it you're a traveler.\p" + .string "How's this? What do you say to taking\n" .string "on our family of four in a series of\l" .string "POKéMON battles?$" @@ -602,33 +602,33 @@ Route111_Text_1F14F5: @ 81F14F5 .string "Drop in, if you change your mind!$" Route111_Text_1F1523: @ 81F1523 - .string "That’s the spirit! I like you!$" + .string "That's the spirit! I like you!$" Route111_Text_1F1542: @ 81F1542 .string "Aiyah!\n" - .string "You’re a lot tougher than I expected!$" + .string "You're a lot tougher than I expected!$" Route111_Text_1F156F: @ 81F156F .string "Hey, all!\n" - .string "I’ve found a pretty strong TRAINER!$" + .string "I've found a pretty strong TRAINER!$" Route111_Text_1F159D: @ 81F159D - .string "Oh, my goodness! Aren’t you young?\p" + .string "Oh, my goodness! Aren't you young?\p" .string "You must be quite the TRAINER to beat\n" .string "my husband, though.\p" - .string "It’s my turn to battle now!$" + .string "It's my turn to battle now!$" Route111_Text_1F1616: @ 81F1616 .string "Oh, gosh!\n" - .string "I can’t get over how strong you are!$" + .string "I can't get over how strong you are!$" Route111_Text_1F1645: @ 81F1645 - .string "There’s a strong TRAINER here!\n" - .string "This one’s really strong!$" + .string "There's a strong TRAINER here!\n" + .string "This one's really strong!$" Route111_Text_1F167E: @ 81F167E - .string "You’re stronger than Mommy? Wow!\p" - .string "But I’m strong, too!\n" + .string "You're stronger than Mommy? Wow!\p" + .string "But I'm strong, too!\n" .string "Really! Honestly!$" Route111_Text_1F16C6: @ 81F16C6 @@ -641,7 +641,7 @@ Route111_Text_1F16DC: @ 81F16DC Route111_Text_1F16FB: @ 81F16FB .string "How dare you make my granddaughter\n" .string "cry!\p" - .string "For that, I’m going to smack you!\n" + .string "For that, I'm going to smack you!\n" .string "Prepare to lose!$" Route111_Text_1F1756: @ 81F1756 @@ -649,14 +649,14 @@ Route111_Text_1F1756: @ 81F1756 .string "My granddaughter was right…$" Route111_Text_1F1788: @ 81F1788 - .string "If you’re not in any hurry,\n" + .string "If you're not in any hurry,\n" .string "visit with us awhile.$" Route111_Text_1F17BA: @ 81F17BA - .string "If you don’t raise your POKéMON some\n" + .string "If you don't raise your POKéMON some\n" .string "more, it could be tough to keep winning\l" .string "up through the ranks.\p" - .string "I’ve heard the POKéMON LEAGUE’s\n" + .string "I've heard the POKéMON LEAGUE's\n" .string "ELITE FOUR are far stronger than\l" .string "any GYM LEADER.$" @@ -670,8 +670,8 @@ Route111_Text_1F18CE: @ 81F18CE .string "{DOWN_ARROW} MAUVILLE CITY$" Route111_Text_1F18E8: @ 81F18E8 - .string "“Our family’s hearts beat as one!â€\n" - .string "THE WINSTRATE’S HOUSE$" + .string "“Our family's hearts beat as one!â€\n" + .string "THE WINSTRATE'S HOUSE$" Route111_Text_1F1921: @ 81F1921 .string "ROUTE 111\n" @@ -682,12 +682,12 @@ Route111_Text_1F1937: @ 81F1937 .string "{LEFT_ARROW} ROUTE 113$" Route111_Text_1F194D: @ 81F194D - .string "OLD LADY’S REST STOP\n" + .string "OLD LADY'S REST STOP\n" .string "“Come in and rest your tired bones.â€$" Route111_Text_1F1987: @ 81F1987 .string "TRAINER TIPS\p" - .string "One of the indicators of a POKéMON’s\n" + .string "One of the indicators of a POKéMON's\n" .string "powerfulness is SP. ATK. It stands for\l" .string "“SPECIAL ATTACK.â€\p" .string "Likewise, SP. DEF stands for “SPECIAL\n" @@ -698,7 +698,7 @@ Route111_Text_1F1A22: @ 81F1A22 .string "around here somewhere.\p" .string "But for some reason, it can be seen\n" .string "sometimes, and sometimes not.\p" - .string "That’s why I call it the MIRAGE TOWER.$" + .string "That's why I call it the MIRAGE TOWER.$" Route111_Text_1F1AC7: @ 81F1AC7 .string "I see it!\n" @@ -707,7 +707,7 @@ Route111_Text_1F1AC7: @ 81F1AC7 .string "is clearly visible!\p" .string "But it looks so fragile…\n" .string "It could crumble away anytime…\p" - .string "I want to go inside it, but I can’t\n" + .string "I want to go inside it, but I can't\n" .string "get my courage up for it…$" Route111_Text_1F1B92: @ 81F1B92 @@ -720,7 +720,7 @@ Route111_Text_1F1B92: @ 81F1B92 Route111_Text_1F1C12: @ 81F1C12 .string "Since I spoke to you, the tower of sand\n" - .string "hasn’t been seen.\p" + .string "hasn't been seen.\p" .string "Perhaps it really was\n" .string "the MIRAGE TOWER…$" diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index d1dea14d3..f98e994b3 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -34,21 +34,21 @@ Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E Route111_OldLadysRestStop_Text_22A978: @ 822A978 .string "Oh, dear, dear.\n" - .string "Aren’t your POKéMON exhausted?\p" - .string "If you’d like, rest up here.\n" - .string "That’s a fine idea! You should do that.$" + .string "Aren't your POKéMON exhausted?\p" + .string "If you'd like, rest up here.\n" + .string "That's a fine idea! You should do that.$" Route111_OldLadysRestStop_Text_22A9EC: @ 822A9EC - .string "That’s right.\n" + .string "That's right.\n" .string "Take your time and rest up!$" Route111_OldLadysRestStop_Text_22AA16: @ 822AA16 .string "Oh, dear, dear.\n" .string "Are your POKéMON still tired?\p" .string "You should take another rest here.\n" - .string "That’s a fine idea. You should do that.$" + .string "That's a fine idea. You should do that.$" Route111_OldLadysRestStop_Text_22AA8F: @ 822AA8F .string "Is that so?\n" - .string "You don’t need to be shy about it.$" + .string "You don't need to be shy about it.$" diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index c1aca9b8f..8160d7623 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -60,19 +60,19 @@ Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C end Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539 - .string "You’re the first TRAINER I’ve seen who\n" + .string "You're the first TRAINER I've seen who\n" .string "deploys POKéMON so masterfully.\p" .string "But, I should tell you--my son is\n" .string "stronger than you.\p" .string "He even took the POKéMON LEAGUE\n" - .string "challenge, I’ll have you know.$" + .string "challenge, I'll have you know.$" Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4 .string "We use this MACHO BRACE to more\n" .string "effectively strengthen our POKéMON\l" .string "in training.\p" - .string "Since you’ve beaten all of us here,\n" - .string "I don’t know if you need it, but we\l" + .string "Since you've beaten all of us here,\n" + .string "I don't know if you need it, but we\l" .string "would like you to have our MACHO BRACE.$" Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4 @@ -81,16 +81,16 @@ Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4 Route111_WinstrateFamilysHouse_Text_22A6F7: @ 822A6F7 .string "Mommy is stronger than Daddy.\p" - .string "I’m stronger than Mommy.\p" - .string "And Grandma’s stronger than me!\p" + .string "I'm stronger than Mommy.\p" + .string "And Grandma's stronger than me!\p" .string "But my big brother is even stronger\n" .string "than Grandma.$" Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780 - .string "There’s no question that you’re strong.\p" + .string "There's no question that you're strong.\p" .string "But if you were to battle my grandson,\n" - .string "you’d end up crying in frustration.\p" - .string "He’s much stronger than any TRAINER\n" + .string "you'd end up crying in frustration.\p" + .string "He's much stronger than any TRAINER\n" .string "our family knows.\p" .string "He must be challenging the POKéMON\n" .string "LEAGUE CHAMPION by now.\p" diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index cb6a48dce..1abcdb6b4 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -116,16 +116,16 @@ Route112_Text_1F1F7A: @ 81F1F7A .string "we need a METEORITE to do it.$" Route112_Text_1F1FBA: @ 81F1FBA - .string "Oh, I get it now. That’s why the rest\n" + .string "Oh, I get it now. That's why the rest\n" .string "of the crew went out to FALLARBOR.$" Route112_Text_1F2003: @ 81F2003 .string "You got it. And until they come back,\n" - .string "we’re not to let anyone pass, right.$" + .string "we're not to let anyone pass, right.$" Route112_Text_1F204E: @ 81F204E - .string "Eh, I’d like to get to MAUVILLE, but if\n" - .string "I went down these ledges, it’d be no\l" + .string "Eh, I'd like to get to MAUVILLE, but if\n" + .string "I went down these ledges, it'd be no\l" .string "easy matter to get back to LAVARIDGE.$" Route112_Text_1F20C1: @ 81F20C1 diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 550029289..b9ece3b21 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -138,15 +138,15 @@ Route113_EventScript_1F2344:: @ 81F2344 end Route113_Text_1F235B: @ 81F235B - .string "Wahahaha! Today’s technology is a\n" + .string "Wahahaha! Today's technology is a\n" .string "wondrous thing!\p" .string "Take this volcanic ash here.\n" .string "It can be fashioned into glass.$" Route113_Text_1F23CA: @ 81F23CA - .string "It’s fun walking through the volcano’s\n" + .string "It's fun walking through the volcano's\n" .string "ashes on the ground and grass.\p" - .string "You can see where you walked--it’s\n" + .string "You can see where you walked--it's\n" .string "really neat!$" Route113_Text_1F2440: @ 81F2440 diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 7784cc79c..c211b6a1c 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -311,7 +311,7 @@ Route113_GlassWorkshop_EventScript_26F194:: @ 826F194 Route113_GlassWorkshop_Text_26F19D: @ 826F19D .string "This area is covered in volcanic ash,\n" .string "huff-puff!\p" - .string "I’m specially gifted, huff-puff.\p" + .string "I'm specially gifted, huff-puff.\p" .string "I make glass out of volcanic ash\n" .string "and make items, huff-puff.\p" .string "Go collect ashes with this, huff-puff.$" @@ -321,7 +321,7 @@ Route113_GlassWorkshop_Text_26F252: @ 826F252 .string "through piles of ash, huff-puff.\p" .string "And it will fill up with the volcanic ash,\n" .string "huff-puff.\p" - .string "Once you think you’ve collected a good\n" + .string "Once you think you've collected a good\n" .string "amount, come see me, huff-puff.$" Route113_GlassWorkshop_Text_26F312: @ 826F312 @@ -330,16 +330,16 @@ Route113_GlassWorkshop_Text_26F312: @ 826F312 Route113_GlassWorkshop_Text_26F34E: @ 826F34E .string "Hmmm…\n" - .string "There’s not enough ash here, huff-puff.\l" - .string "I can’t make glass with this, huff-puff.\p" - .string "Let’s see… {STR_VAR_1} is the number of steps\n" - .string "you’ll need to walk for me to make you\l" + .string "There's not enough ash here, huff-puff.\l" + .string "I can't make glass with this, huff-puff.\p" + .string "Let's see… {STR_VAR_1} is the number of steps\n" + .string "you'll need to walk for me to make you\l" .string "a BLUE FLUTE, huff-puff.$" Route113_GlassWorkshop_Text_26F40A: @ 826F40A .string "Oh!\n" - .string "You’ve got a lot of ashes, huff-puff!\p" - .string "I’ll make you a glass item, huff-puff!\n" + .string "You've got a lot of ashes, huff-puff!\p" + .string "I'll make you a glass item, huff-puff!\n" .string "Which one would you like, huff-puff?$" Route113_GlassWorkshop_Text_26F480: @ 826F480 @@ -351,47 +351,47 @@ Route113_GlassWorkshop_Text_26F4B5: @ 826F4B5 Route113_GlassWorkshop_Text_26F4DA: @ 826F4DA .string "A {STR_VAR_1} it is, then, huff-puff!\p" - .string "Okay! I’ll make it for you, huff-puff.\n" + .string "Okay! I'll make it for you, huff-puff.\n" .string "Just wait a little while, huff-puff.$" Route113_GlassWorkshop_Text_26F543: @ 826F543 .string "A {STR_VAR_1}, huff-puff?\p" - .string "There’s not enough ash here to make\n" + .string "There's not enough ash here to make\n" .string "that, though, huff-puff.\p" - .string "Let’s see… {STR_VAR_2} is the number of steps\n" - .string "you’ll need to walk through volcanic ash\l" + .string "Let's see… {STR_VAR_2} is the number of steps\n" + .string "you'll need to walk through volcanic ash\l" .string "for me to make that item, huff-puff.\p" .string "Which item would you rather have me\n" .string "make instead, huff-puff?$" Route113_GlassWorkshop_Text_26F641: @ 826F641 - .string "You’ve collected all that ash, but you\n" - .string "don’t want anything, huff-puff?$" + .string "You've collected all that ash, but you\n" + .string "don't want anything, huff-puff?$" Route113_GlassWorkshop_Text_26F688: @ 826F688 - .string "Ah, I’ve finished your {STR_VAR_1}.\n" + .string "Ah, I've finished your {STR_VAR_1}.\n" .string "Take it, huff-puff.$" Route113_GlassWorkshop_Text_26F6B7: @ 826F6B7 .string "Oh?\n" - .string "You’ve no room in your BAG, huff-puff.\p" - .string "I’ll hold on to it, so come back later,\n" + .string "You've no room in your BAG, huff-puff.\p" + .string "I'll hold on to it, so come back later,\n" .string "huff-puff.$" Route113_GlassWorkshop_Text_26F715: @ 826F715 .string "Oh?\n" - .string "You’ve no room in your PC, huff-puff?\p" - .string "I’ll hold on to it, so come back later,\n" + .string "You've no room in your PC, huff-puff?\p" + .string "I'll hold on to it, so come back later,\n" .string "huff-puff.$" Route113_GlassWorkshop_Text_26F772: @ 826F772 - .string "Hah? You haven’t got your SOOT SACK\n" + .string "Hah? You haven't got your SOOT SACK\n" .string "with you, huff-puff.\p" .string "You have to keep it with you to collect\n" .string "volcanic ash, huff-puff.$" Route113_GlassWorkshop_Text_26F7EC: @ 826F7EC - .string "It’s fun to blow a glass flute while\n" + .string "It's fun to blow a glass flute while\n" .string "my boss is talking.\p" .string "Huff-huff! Puff-puff!$" diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index e47a3660f..6adf20870 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -205,9 +205,9 @@ Route114_Text_1F28B3: @ 81F28B3 .string "RUSTBORO CITY THROUGH HERE$" Route114_Text_1F28DB: @ 81F28DB - .string "FOSSIL MANIAC’S HOUSE\n" + .string "FOSSIL MANIAC'S HOUSE\n" .string "“Fossils gratefully accepted!â€$" Route114_Text_1F2910: @ 81F2910 - .string "LANETTE’S HOUSE$" + .string "LANETTE'S HOUSE$" diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index eecb4fd0d..f2e62b451 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -33,8 +33,8 @@ Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C end Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 - .string "My big brother’s the FOSSIL MANIAC…\n" - .string "He’s a nice guy who loves FOSSILS…\p" + .string "My big brother's the FOSSIL MANIAC…\n" + .string "He's a nice guy who loves FOSSILS…\p" .string "He loves digging holes, too…\n" .string "He dug this hole by himself…\p" .string "You can have this, so you can DIG\n" @@ -42,7 +42,7 @@ Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48 .string "If you make a POKéMON DIG inside a\n" - .string "cave, you’re returned to the entrance…$" + .string "cave, you're returned to the entrance…$" Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92 .string "Rocks in peculiar shapes fill\n" @@ -52,5 +52,5 @@ Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2 .string "THE COMPOSITION OF STRATA…\n" .string "HOW RAIN SHAPES THE LAND…\l" .string "STONES, SOIL, AND ROCK…\p" - .string "It’s crammed with books.$" + .string "It's crammed with books.$" diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index fae011f32..7b2a91810 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -59,22 +59,22 @@ Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 end Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 - .string "I’m the FOSSIL MANIAC…\n" - .string "I’m a nice guy who loves FOSSILS…\p" + .string "I'm the FOSSIL MANIAC…\n" + .string "I'm a nice guy who loves FOSSILS…\p" .string "Do you want a FOSSIL?\p" .string "But the FOSSILS around these parts all\n" .string "belong to me… None for you…\p" - .string "If you can’t bear to go without\n" + .string "If you can't bear to go without\n" .string "a FOSSIL, look in a desert where there\l" .string "are boulders and sand that may hide\l" .string "FOSSILS…$" Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 - .string "You found a FOSSIL, didn’t you?\n" - .string "That’s so nice… It’s so dreamy…\p" + .string "You found a FOSSIL, didn't you?\n" + .string "That's so nice… It's so dreamy…\p" .string "What are you going to do with that\n" .string "FOSSIL?\p" - .string "From what I’ve heard, DEVON is doing\n" + .string "From what I've heard, DEVON is doing\n" .string "research on reviving POKéMON from\l" .string "FOSSILS…\p" .string "I love my FOSSILS, so I would never\n" @@ -82,15 +82,15 @@ Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC .string "FOSSILS are so… Wonderful…\n" - .string "It’s so dreamy…$" + .string "It's so dreamy…$" Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7 .string "Oh…\n" - .string "It’s not safe that way…\p" + .string "It's not safe that way…\p" .string "I was digging away, you see…\n" .string "When the whole wall collapsed…\p" - .string "I think there’s a giant cavern\n" + .string "I think there's a giant cavern\n" .string "underneath now…\p" - .string "But I’ve left it alone because I don’t\n" + .string "But I've left it alone because I don't\n" .string "think there are any FOSSILS there…$" diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index f90462c60..0145ee945 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -51,7 +51,7 @@ Route114_LanettesHouse_EventScript_22B345:: @ 822B345 Route114_LanettesHouse_Text_22B34E: @ 822B34E .string "LANETTE: Oh! {PLAYER}{KUN}!\p" - .string "I’m sorry everything is so cluttered…\n" + .string "I'm sorry everything is so cluttered…\n" .string "When I get engrossed in research,\l" .string "things end up this way…\p" .string "This is embarrassing… Please keep\n" @@ -64,8 +64,8 @@ Route114_LanettesHouse_Text_22B407: @ 822B407 .string "can tell which POKéMON are in them.$" Route114_LanettesHouse_Text_22B485: @ 822B485 - .string "It’s LANETTE’s research notes.\n" - .string "There’s information about BOXES.\p" + .string "It's LANETTE's research notes.\n" + .string "There's information about BOXES.\p" .string "Design BOXES to hold 30 POKéMON each.\p" .string "Each TRAINER should be able to store\n" .string "420 POKéMON on the PC system.\p" @@ -92,7 +92,7 @@ Route114_LanettesHouse_Text_22B6E4: @ 822B6E4 .string "{PLAYER} closed the notebook.$" Route114_LanettesHouse_Text_22B6FC: @ 822B6FC - .string "There’s an e-mail from someone on\n" + .string "There's an e-mail from someone on\n" .string "the PC.\p" .string "“… … … … … … …\p" .string "“Your Storage System offers more\n" @@ -101,7 +101,7 @@ Route114_LanettesHouse_Text_22B6FC: @ 822B6FC .string "that make it fun and useful, too.\p" .string "“It makes me proud that I played\n" .string "a part in its development.\p" - .string "“Here’s hoping that you’ll continue\n" + .string "“Here's hoping that you'll continue\n" .string "research in Storage Systems.\p" .string "“From BILL\n" .string "… … … … … … … …â€$" diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 3dcf7adee..6c74a0d5a 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -138,10 +138,10 @@ Route115_EventScript_1F2B3E:: @ 81F2B3E end Route115_Text_1F2B55: @ 81F2B55 - .string "Exploring a cave isn’t like walking\n" + .string "Exploring a cave isn't like walking\n" .string "on a road.\p" .string "You never know when wild POKéMON will\n" - .string "appear. It’s full of suspense.$" + .string "appear. It's full of suspense.$" Route115_Text_1F2BC9: @ 81F2BC9 .string "ROUTE 115\n" diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index af9210a36..2ad7ea58b 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -391,15 +391,15 @@ Route116_Text_1F3140: @ 81F3140 Route116_Text_1F3166: @ 81F3166 .string "Nnn… Roar!\n" - .string "What’s going on?\p" + .string "What's going on?\p" .string "I was digging the tunnel without any\n" .string "tools when some goon ordered me out!\p" - .string "That tunnel’s filled with POKéMON\n" + .string "That tunnel's filled with POKéMON\n" .string "that react badly to loud noises.\l" .string "They could cause an uproar.\p" - .string "That’s why we stopped using heavy\n" + .string "That's why we stopped using heavy\n" .string "equipment for tunneling…\p" - .string "I’m worried that the goon will do\n" + .string "I'm worried that the goon will do\n" .string "something stupid and startle the\l" .string "POKéMON into an uproar.$" @@ -409,8 +409,8 @@ Route116_Text_1F32C1: @ 81F32C1 .string "the tunnel! I can go back to digging!$" Route116_Text_1F3317: @ 81F3317 - .string "Oh! It’s you!\p" - .string "You’re that person who not only helped\n" + .string "Oh! It's you!\p" + .string "You're that person who not only helped\n" .string "me in PETALBURG WOODS, but also got\l" .string "back my stolen package and then even\l" .string "graciously delivered it to SLATEPORT!\p" @@ -435,7 +435,7 @@ Route116_Text_1F3521: @ 81F3521 Route116_Text_1F3593: @ 81F3593 .string "Your BAG is jam-packed.\n" - .string "I can’t give you this REPEAT BALL.$" + .string "I can't give you this REPEAT BALL.$" Route116_Text_1F35CE: @ 81F35CE .string "As a token of our appreciation for\n" @@ -454,19 +454,19 @@ Route116_Text_1F3688: @ 81F3688 Route116_Text_1F36B4: @ 81F36B4 .string "Hmm…\n" .string "These are BLACKGLASSES.\l" - .string "They’re not what I’m looking for…\p" - .string "Maybe my glasses aren’t around\n" + .string "They're not what I'm looking for…\p" + .string "Maybe my glasses aren't around\n" .string "here…$" Route116_Text_1F3718: @ 81F3718 .string "Hmm…\n" - .string "I can’t find my glasses anywhere…\l" - .string "Maybe they’re not around here…$" + .string "I can't find my glasses anywhere…\l" + .string "Maybe they're not around here…$" Route116_Text_1F375E: @ 81F375E .string "Hmm…\n" .string "These are BLACKGLASSES.\l" - .string "They’re not what I’m looking for…$" + .string "They're not what I'm looking for…$" Route116_Text_1F379D: @ 81F379D .string "ROUTE 116\n" @@ -479,7 +479,7 @@ Route116_Text_1F37B7: @ 81F37B7 .string "canceled.â€$" Route116_Text_1F380F: @ 81F380F - .string "TUNNELER’S REST HOUSE$" + .string "TUNNELER'S REST HOUSE$" Route116_Text_1F3825: @ 81F3825 .string "TRAINER TIPS\p" diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index 3e7204e75..af5a96675 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -36,22 +36,22 @@ Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B .string "It turns out that we would have had\n" .string "a negative effect on wild POKéMON in\l" .string "the area.\p" - .string "So, we’ve got nothing to do but loll\n" + .string "So, we've got nothing to do but loll\n" .string "around here doing nothing.$" Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F - .string "There’s a man digging his way to\n" + .string "There's a man digging his way to\n" .string "VERDANTURF all by his lonesome.\l" - .string "He’s desperate to get through.\p" + .string "He's desperate to get through.\p" .string "He says that if he digs little by little\n" - .string "without using machines, he won’t\l" - .string "disturb POKéMON, and he’ll avoid\l" + .string "without using machines, he won't\l" + .string "disturb POKéMON, and he'll avoid\l" .string "harming the natural environment.\p" .string "I wonder if he made it through yet.$" Route116_TunnelersRestHouse_Text_22BAAF: @ 822BAAF .string "To get to VERDANTURF without using\n" - .string "this TUNNEL, you’d have to cross the\l" + .string "this TUNNEL, you'd have to cross the\l" .string "sea to DEWFORD, sail on to SLATEPORT,\l" .string "then travel through MAUVILLE.$" diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index e80148cd7..1dbc7167e 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -189,12 +189,12 @@ Route117_EventScript_1F3C65:: @ 81F3C65 Route117_Text_1F3C7C: @ 81F3C7C .string "I left my POKéMON at the DAY CARE.\p" .string "When I got it back, it had a new move\n" - .string "that I didn’t teach it.\l" + .string "that I didn't teach it.\l" .string "I was really, really surprised.$" Route117_Text_1F3CFD: @ 81F3CFD .string "What do you think?\n" - .string "Aren’t these flowers pretty?\p" + .string "Aren't these flowers pretty?\p" .string "I planted them all!$" Route117_Text_1F3D41: @ 81F3D41 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index f88e0e9c3..8d1cf48e4 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -257,46 +257,46 @@ Route118_EventScript_1F40A7:: @ 81F40A7 Route118_Text_1F40BE: @ 81F40BE .string "STEVEN: Hi, {PLAYER}{KUN}!\p" - .string "It’s me, STEVEN!\n" + .string "It's me, STEVEN!\n" .string "We met in the cave near DEWFORD.\p" .string "Have you met many kinds of POKéMON\n" .string "since I last saw you?\p" .string "There are many, many kinds of POKéMON\n" .string "in this wide world of ours.\p" .string "If you wanted to raise only your\n" - .string "favorites, that’s fine.\p" + .string "favorites, that's fine.\p" .string "Perhaps you find it more fun to raise\n" .string "all sorts of POKéMON.\p" .string "As a TRAINER of POKéMON,\n" .string "what do you think?\p" - .string "Of course, it’s not any of my business.\p" + .string "Of course, it's not any of my business.\p" .string "It would be nice if we were to meet\n" .string "again somewhere.$" Route118_Text_1F427B: @ 81F427B .string "Hmm!\n" .string "A GOOD ROD is really good!\p" - .string "Wouldn’t you agree?$" + .string "Wouldn't you agree?$" Route118_Text_1F42AF: @ 81F42AF .string "Hmm!\n" - .string "We’re of identical minds!\p" + .string "We're of identical minds!\p" .string "Hmm!\n" .string "Take this GOOD ROD!$" Route118_Text_1F42E7: @ 81F42E7 - .string "Wherever there’s water, try your luck\n" + .string "Wherever there's water, try your luck\n" .string "at fishing.$" Route118_Text_1F4319: @ 81F4319 - .string "Don’t you like to fish?$" + .string "Don't you like to fish?$" Route118_Text_1F4331: @ 81F4331 .string "Try catching all sorts of POKéMON\n" .string "with your GOOD ROD.$" Route118_Text_1F4367: @ 81F4367 - .string "Even if there isn’t a boat, you can\n" + .string "Even if there isn't a boat, you can\n" .string "cross rivers and the sea if you have\l" .string "a POKéMON that knows SURF.\p" .string "POKéMON can be counted on to do so\n" diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 87acdeb84..fd1d127d1 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -506,7 +506,7 @@ Route119_Text_1F49FD: @ 81F49FD Route119_Text_1F4A98: @ 81F4A98 .string "Achah!\n" - .string "{PLAYER}{KUN}, you’re strong!\p" + .string "{PLAYER}{KUN}, you're strong!\p" .string "I was worried that you might be\n" .string "struggling with your training.$" @@ -517,39 +517,39 @@ Route119_Text_1F4AF3: @ 81F4AF3 Route119_Text_1F4B56: @ 81F4B56 .string "MAY: Use FLY, and your POKéMON will\n" - .string "instantly carry you to any town you’ve\l" + .string "instantly carry you to any town you've\l" .string "already visited.\p" .string "But, to use FLY, you have to get\n" .string "the GYM BADGE from FORTREE CITY.\l" - .string "That’s important, so don’t forget.\p" + .string "That's important, so don't forget.\p" .string "You should FLY home and visit\n" .string "LITTLEROOT for a change.\p" - .string "I bet your mom’s worried about you,\n" + .string "I bet your mom's worried about you,\n" .string "{PLAYER}{KUN}.\p" - .string "Well, let’s meet again somewhere!$" + .string "Well, let's meet again somewhere!$" Route119_Text_1F4C9A: @ 81F4C9A .string "BRENDAN: {PLAYER}! So this is where\n" - .string "you’ve been looking for POKéMON?\p" + .string "you've been looking for POKéMON?\p" .string "Let me see how good you got.\n" - .string "I’ll test you!\p" + .string "I'll test you!\p" .string "Now!\n" - .string "It’s a battle, so battle!$" + .string "It's a battle, so battle!$" Route119_Text_1F4D24: @ 81F4D24 .string "Hmm…\n" - .string "You’ve gotten pretty darn decent.$" + .string "You've gotten pretty darn decent.$" Route119_Text_1F4D4B: @ 81F4D4B - .string "BRENDAN: I’d say you’re good enough\n" + .string "BRENDAN: I'd say you're good enough\n" .string "to search for POKéMON anywhere.\p" - .string "Here, I’ll give you this.\n" + .string "Here, I'll give you this.\n" .string "Try it out.$" Route119_Text_1F4DB5: @ 81F4DB5 .string "BRENDAN: Use FLY, and your POKéMON\n" .string "instantly carries you to any town\l" - .string "you’ve already visited.\p" + .string "you've already visited.\p" .string "But you need the FORTREE GYM BADGE \n" .string "to do that.\p" .string "Anyway, I have to move along.$" @@ -559,55 +559,55 @@ Route119_Text_1F4E60: @ 81F4E60 .string "Way to go, {PLAYER}{KUN}!\p" .string "I just passed by a TRAINER riding\n" .string "a BIKE.\p" - .string "You just beat that TRAINER, didn’t you?\n" + .string "You just beat that TRAINER, didn't you?\n" .string "It was pretty obvious that you did.\p" .string "The kid looked really upset with\n" .string "a face all red from anger.\p" .string "I sure seem to run into you often.\n" .string "Are you off to FORTREE GYM next?\p" - .string "I expect that you’ll do well at the GYM.\n" - .string "Well, I’ll be seeing you!$" + .string "I expect that you'll do well at the GYM.\n" + .string "Well, I'll be seeing you!$" Route119_Text_1F4FBA: @ 81F4FBA .string "… … … … … …\n" .string "… … … … … Beep!\p" - .string "SCOTT: Hiya, {PLAYER}{KUN}, it’s me!\p" + .string "SCOTT: Hiya, {PLAYER}{KUN}, it's me!\p" .string "Just as I thought, you won at\n" .string "the FORTREE GYM.\p" .string "Your strength…\n" .string "Perhaps you really are the TRAINER\l" - .string "that I’ve been searching for.\p" + .string "that I've been searching for.\p" .string "Remember, you have a fan in me.\n" - .string "I’ll be cheering from the sidelines.\l" + .string "I'll be cheering from the sidelines.\l" .string "Keep up the great work!\p" .string "… … … … … …\n" .string "… … … … … Click!$" Route119_Text_1F50EB: @ 81F50EB - .string "We’re standing lookout here.\p" + .string "We're standing lookout here.\p" .string "Hey, you! Stay away from the WEATHER\n" - .string "INSTITUTE. It’s not safe.$" + .string "INSTITUTE. It's not safe.$" Route119_Text_1F5147: @ 81F5147 .string "Lookout duty is surprisingly boring.\p" - .string "Hey, you! Please don’t go near the\n" + .string "Hey, you! Please don't go near the\n" .string "WEATHER INSTITUTE.$" Route119_Text_1F51A2: @ 81F51A2 .string "I thought you FLY by catching a whole\n" .string "flock of BIRD POKéMON, and then\l" .string "hanging on to them somehow.\p" - .string "But it turns out there’s an HM move\n" + .string "But it turns out there's an HM move\n" .string "called FLY!\p" - .string "I wish I’d known about that a long\n" + .string "I wish I'd known about that a long\n" .string "time ago…$" Route119_Text_1F5261: @ 81F5261 .string "Tch…\n" - .string "It’s a no-go…\p" + .string "It's a no-go…\p" .string "The tall grass snares BIKE tires.\n" - .string "There’s no way you can cycle here.$" + .string "There's no way you can cycle here.$" Route119_Text_1F52B9: @ 81F52B9 .string "Can your POKéMON use its SECRET POWER\n" diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index f5b97bffa..3b36baf91 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -86,12 +86,12 @@ Route119_WeatherInstitute_1F_Text_26FBBB: @ 826FBBB Route119_WeatherInstitute_1F_Text_26FBD7: @ 826FBD7 .string "Our BOSS knows everything.\p" - .string "But I’m just a GRUNT. What would I know\n" - .string "about what he’s thinking?$" + .string "But I'm just a GRUNT. What would I know\n" + .string "about what he's thinking?$" Route119_WeatherInstitute_1F_Text_26FC34: @ 826FC34 .string "Huh?\n" - .string "What’s a kid doing here?$" + .string "What's a kid doing here?$" Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52 .string "Huh?\n" @@ -99,7 +99,7 @@ Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52 Route119_WeatherInstitute_1F_Text_26FC60: @ 826FC60 .string "Oh, no…\n" - .string "I’ll catch an earful for losing to a kid…\p" + .string "I'll catch an earful for losing to a kid…\p" .string "I should just take a nap in the bed…$" Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7 @@ -107,15 +107,15 @@ Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7 .string "upstairs!$" Route119_WeatherInstitute_1F_Text_26FCE5: @ 826FCE5 - .string "Wow, you’re really strong!\p" + .string "Wow, you're really strong!\p" .string "I wish I could be a POKéMON TRAINER\n" .string "like you!$" Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E .string "The PROFESSOR loves rain.\n" - .string "That’s a fact.\p" + .string "That's a fact.\p" .string "But if it keeps raining, people will be in\n" - .string "trouble. That’s another fact.\p" + .string "trouble. That's another fact.\p" .string "And thus, the PROFESSOR is studying\n" .string "if the rain can be put to good use.$" @@ -123,17 +123,17 @@ Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8 .string "On the 2nd floor of the INSTITUTE,\n" .string "we study the weather patterns over\l" .string "the HOENN region.\p" - .string "We’ve been noticing temporary and\n" + .string "We've been noticing temporary and\n" .string "isolated cases of droughts and\l" .string "heavy rain lately…$" Route119_WeatherInstitute_1F_Text_26FE94: @ 826FE94 .string "Hello!\n" - .string "We’ve been saved by your actions!\p" - .string "What I don’t understand is what on\n" + .string "We've been saved by your actions!\p" + .string "What I don't understand is what on\n" .string "earth the AQUAS were up to.$" Route119_WeatherInstitute_1F_Text_26FEFC: @ 826FEFC - .string "There’s a bed…\n" - .string "Let’s take a rest.$" + .string "There's a bed…\n" + .string "Let's take a rest.$" diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 1b7ba28de..35dd538df 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -220,10 +220,10 @@ Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B Route119_WeatherInstitute_2F_Text_27019C: @ 827019C .string "The INSTITUTE created a type of\n" .string "POKéMON that has something to do with\l" - .string "the weather. We’re here to take them!$" + .string "the weather. We're here to take them!$" Route119_WeatherInstitute_2F_Text_270208: @ 8270208 - .string "Our plan’s being spoiled by a kid?$" + .string "Our plan's being spoiled by a kid?$" Route119_WeatherInstitute_2F_Text_27022B: @ 827022B .string "If the POKéMON they made here can\n" @@ -231,7 +231,7 @@ Route119_WeatherInstitute_2F_Text_27022B: @ 827022B .string "TEAM AQUA definitely need it!$" Route119_WeatherInstitute_2F_Text_270292: @ 8270292 - .string "We’re TEAM AQUA!\n" + .string "We're TEAM AQUA!\n" .string "We appear wherever anything rare is\l" .string "found!$" @@ -239,14 +239,14 @@ Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE .string "You got me!$" Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA - .string "You don’t have any idea what we of\n" + .string "You don't have any idea what we of\n" .string "TEAM AQUA are working towards!\l" .string "You stay out of our way!$" Route119_WeatherInstitute_2F_Text_270335: @ 8270335 - .string "Don’t tell me you’re looking for that\n" + .string "Don't tell me you're looking for that\n" .string "weather POKéMON, too?\p" - .string "That’s a no-no!\n" + .string "That's a no-no!\n" .string "We were here to get it first!$" Route119_WeatherInstitute_2F_Text_27039F: @ 827039F @@ -255,25 +255,25 @@ Route119_WeatherInstitute_2F_Text_27039F: @ 827039F Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0 .string "Humph, so what?\n" .string "What we want…\p" - .string "What we really want isn’t here…\n" + .string "What we really want isn't here…\n" .string "Ihihihihi…$" Route119_WeatherInstitute_2F_Text_270409: @ 8270409 .string "Ahahahaha!\p" - .string "You’re going to meddle in TEAM AQUA’s\n" + .string "You're going to meddle in TEAM AQUA's\n" .string "affairs?\p" - .string "You’re either absolutely fearless,\n" + .string "You're either absolutely fearless,\n" .string "simply ignorant, or both!\p" - .string "You’re so cute, you’re disgusting!\n" - .string "I’ll put you down, kiddy!$" + .string "You're so cute, you're disgusting!\n" + .string "I'll put you down, kiddy!$" Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD .string "Ahahahaha!\n" - .string "You’re disgustingly strong!$" + .string "You're disgustingly strong!$" Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4 - .string "It’s bad enough to have TEAM MAGMA\n" - .string "blunder about, but now there’s you!\p" + .string "It's bad enough to have TEAM MAGMA\n" + .string "blunder about, but now there's you!\p" .string "What makes you want to sniff around\n" .string "in our business, anyway?$" @@ -286,19 +286,19 @@ Route119_WeatherInstitute_2F_Text_270568: @ 8270568 Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD .string "What?!\p" - .string "We can’t waste any more time here!\n" + .string "We can't waste any more time here!\n" .string "We have to hurry to MT. PYRE, too!\p" .string "Ahahahaha!\n" .string "TEAM MAGMA, just you wait!$" Route119_WeatherInstitute_2F_Text_270650: @ 8270650 .string "Thanks!\n" - .string "Thanks to you, we’re safe!\p" + .string "Thanks to you, we're safe!\p" .string "It might be an odd way of thanking you,\n" .string "but take this POKéMON.$" Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2 - .string "Hm? You don’t seem to have any room\n" + .string "Hm? You don't seem to have any room\n" .string "for this POKéMON.$" Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8 @@ -307,12 +307,12 @@ Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8 Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE .string "That POKéMON changes shape according\n" .string "to the weather conditions.\p" - .string "There’re plenty of them in the\n" + .string "There're plenty of them in the\n" .string "INSTITUTE--go ahead and take it.$" Route119_WeatherInstitute_2F_Text_27077E: @ 827077E - .string "I’ve been researching rain for many\n" - .string "years, but it’s ridiculous to think that\l" + .string "I've been researching rain for many\n" + .string "years, but it's ridiculous to think that\l" .string "humans can freely change the weather.$" Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 86bf1b10e..ba16b1a2f 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -391,8 +391,8 @@ Route120_EventScript_1F5981:: @ 81F5981 Route120_Text_1F5998: @ 81F5998 .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" - .string "It’s been a while.\p" - .string "There’s something here that you can’t\n" + .string "It's been a while.\p" + .string "There's something here that you can't\n" .string "see, right?\p" .string "Now, if I were to use this device on\n" .string "the invisible obstacle…\p" @@ -404,7 +404,7 @@ Route120_Text_1F5998: @ 81F5998 Route120_Text_1F5AAC: @ 81F5AAC .string "STEVEN: No?\p" - .string "I’ll wait here, so you can get ready.$" + .string "I'll wait here, so you can get ready.$" Route120_Text_1F5ADE: @ 81F5ADE .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" @@ -425,7 +425,7 @@ Route120_Text_1F5BAF: @ 81F5BAF .string "Your battle style is intriguing.\p" .string "Your POKéMON have obviously grown\n" .string "since I first met you in DEWFORD.\p" - .string "I’d like you to have this\n" + .string "I'd like you to have this\n" .string "DEVON SCOPE.\p" .string "Who knows, there may be other\n" .string "concealed POKéMON.$" @@ -434,8 +434,8 @@ Route120_Text_1F5C7B: @ 81F5C7B .string "STEVEN: {PLAYER}{KUN}.\p" .string "I enjoy seeing POKéMON and TRAINERS\n" .string "who strive together.\p" - .string "I think you’re doing great.\p" - .string "Well, let’s meet again somewhere.$" + .string "I think you're doing great.\p" + .string "Well, let's meet again somewhere.$" Route119_Text_1F5D00: @ 81F5D00 Route120_Text_1F5D00: @ 81F5D00 diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 84c7473e9..2d65779e7 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -173,7 +173,7 @@ Route121_EventScript_1F6043:: @ 81F6043 Route121_Text_1F605A: @ 81F605A .string "Okay!\n" - .string "We’re to move out to MT. PYRE!$" + .string "We're to move out to MT. PYRE!$" Route121_Text_1F607F: @ 81F607F .string "Ahead looms MT. PYRE…\p" diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index ab5b5abb9..f2484af83 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -183,13 +183,13 @@ Route123_Text_1F641E: @ 81F641E Route123_Text_1F645D: @ 81F645D .string "Oh?\p" .string "You like GRASS-type POKéMON, too,\n" - .string "don’t you?\p" - .string "I’m so happy, you can have this!\n" - .string "It’s a token of our friendship.$" + .string "don't you?\p" + .string "I'm so happy, you can have this!\n" + .string "It's a token of our friendship.$" Route123_Text_1F64CF: @ 81F64CF .string "I check trees with my GRASS-type\n" - .string "POKéMON. I’m like a tree doctor.$" + .string "POKéMON. I'm like a tree doctor.$" Route123_Text_1F6511: @ 81F6511 .string "{RIGHT_ARROW} ROUTE 123\n" @@ -200,5 +200,5 @@ Route123_Text_1F6529: @ 81F6529 .string "“Forbidden to the faint of heart.â€$" Route123_Text_1F6557: @ 81F6557 - .string "BERRY MASTER’S HOUSE$" + .string "BERRY MASTER'S HOUSE$" diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index d9d43b531..b7c40b034 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -104,5 +104,5 @@ Route124_EventScript_1F6722:: @ 81F6722 end Route124_Text_1F6739: @ 81F6739 - .string "HUNTER’S HOUSE$" + .string "HUNTER'S HOUSE$" diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 57b64eae8..8ac5ccf43 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -295,8 +295,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63 end Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C - .string "I’m the DIVING TREASURE HUNTER!\p" - .string "I’m the awesome dude who makes\n" + .string "I'm the DIVING TREASURE HUNTER!\p" + .string "I'm the awesome dude who makes\n" .string "deep-sea dives to gather treasures\l" .string "resting at the bottom.$" @@ -305,37 +305,37 @@ Route124_DivingTreasureHuntersHouse_Text_270FE5: @ 8270FE5 .string "tools made in ancient times?$" Route124_DivingTreasureHuntersHouse_Text_271027: @ 8271027 - .string "You haven’t got any treasures\n" + .string "You haven't got any treasures\n" .string "for me…\p" .string "If you see any SHARDS, like the RED\n" - .string "SHARD, you’ve got to trade it with me!$" + .string "SHARD, you've got to trade it with me!$" Route124_DivingTreasureHuntersHouse_Text_271098: @ 8271098 .string "Oh, hey! That…\n" - .string "That’s a SHARD! I’m looking for those!\p" - .string "Oh, man, you’ve got to trade that\n" - .string "with me! I’ll give you something good!$" + .string "That's a SHARD! I'm looking for those!\p" + .string "Oh, man, you've got to trade that\n" + .string "with me! I'll give you something good!$" Route124_DivingTreasureHuntersHouse_Text_271117: @ 8271117 .string "What do you want to trade?$" Route124_DivingTreasureHuntersHouse_Text_271132: @ 8271132 - .string "You’ll trade your {STR_VAR_1} for\n" + .string "You'll trade your {STR_VAR_1} for\n" .string "my {STR_VAR_2}, then?$" Route124_DivingTreasureHuntersHouse_Text_271158: @ 8271158 - .string "It’s a done deal!\n" + .string "It's a done deal!\n" .string "Use that wisely!$" Route124_DivingTreasureHuntersHouse_Text_27117B: @ 827117B .string "Do you want to trade something else?$" Route124_DivingTreasureHuntersHouse_Text_2711A0: @ 82711A0 - .string "Whoops, your BAG’s full.\n" + .string "Whoops, your BAG's full.\n" .string "Get rid of some items, friend!$" Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8 - .string "No? That’s a downer.\n" + .string "No? That's a downer.\n" .string "Well, if you change your mind, come back.$" Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index ec47bf39c..2443051f5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -263,7 +263,7 @@ Route128_Text_1F6E5A: @ 81F6E5A .string "completely out of control!$" Route128_Text_1F6F1E: @ 81F6F1E - .string "MAXIE: {PLAYER}, don’t say anything.\p" + .string "MAXIE: {PLAYER}, don't say anything.\p" .string "I know that I have no right to be\n" .string "critical of ARCHIE…\p" .string "But the way things are now, I doubt\n" @@ -278,7 +278,7 @@ Route128_Text_1F704F: @ 81F704F .string "MAXIE: This defies belief…\p" .string "Those super-ancient POKéMON…\p" .string "Their power is unbelievable.\n" - .string "They’ve upset the balance of nature…$" + .string "They've upset the balance of nature…$" Route128_Text_1F70C9: @ 81F70C9 .string "STEVEN: {PLAYER}{KUN}!\n" @@ -288,18 +288,18 @@ Route128_Text_1F70EA: @ 81F70EA .string "This is terrible…\p" .string "After the scorching heat wave ended,\n" .string "this deluge began.\p" - .string "If this doesn’t stop, all of HOENN…\n" + .string "If this doesn't stop, all of HOENN…\n" .string "No, the whole world will drown.\p" .string "This huge rain cloud is spreading\n" .string "from above SOOTOPOLIS…\p" .string "What in the world is taking place there?\p" - .string "There’s no point arguing here…\n" + .string "There's no point arguing here…\n" .string "SOOTOPOLIS might provide answers…$" Route128_Text_1F721B: @ 81F721B .string "{PLAYER}{KUN}…\n" - .string "I don’t know what you intend to do,\l" - .string "but don’t do anything reckless.\p" + .string "I don't know what you intend to do,\l" + .string "but don't do anything reckless.\p" .string "Okay.\n" - .string "I’m going to SOOTOPOLIS.$" + .string "I'm going to SOOTOPOLIS.$" diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index a524e3969..147c51177 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1050,21 +1050,21 @@ RustboroCity_Text_1E130D: @ 81E130D .string "realize what is required of them.$" RustboroCity_Text_1E139E: @ 81E139E - .string "Hey, that’s RUSTBORO’s GYM BADGE!\p" + .string "Hey, that's RUSTBORO's GYM BADGE!\p" .string "Out of all the POKéMON GYM BADGES,\n" - .string "RUSTBORO’s is the coolest, I’d say.$" + .string "RUSTBORO's is the coolest, I'd say.$" RustboroCity_Text_1E1407: @ 81E1407 .string "Oh? Who might you be?\n" - .string "You’re a new face around these parts.\p" + .string "You're a new face around these parts.\p" .string "Have you just transferred into the\n" - .string "POKéMON TRAINER’S SCHOOL?$" + .string "POKéMON TRAINER'S SCHOOL?$" RustboroCity_Text_1E1480: @ 81E1480 .string "I challenged the GYM LEADER, but…\p" - .string "It’s not going to be easy winning with\n" + .string "It's not going to be easy winning with\n" .string "my FIRE-type POKéMON…\p" - .string "FIRE-type POKéMON don’t match up\n" + .string "FIRE-type POKéMON don't match up\n" .string "well against ROCK-type POKéMON…$" RustboroCity_Text_1E1520: @ 81E1520 @@ -1083,11 +1083,11 @@ RustboroCity_Text_1E1589: @ 81E1589 RustboroCity_Text_1E1633: @ 81E1633 .string "Wow, you have POKéMON with you, too.\p" - .string "When I get bigger, I’m going to go\n" + .string "When I get bigger, I'm going to go\n" .string "places with POKéMON, too.$" RustboroCity_Text_1E1695: @ 81E1695 - .string "POKéMON TRAINER’S SCHOOL!\p" + .string "POKéMON TRAINER'S SCHOOL!\p" .string "If I go to this school, will I be able\n" .string "to catch rare POKéMON easily?$" @@ -1103,7 +1103,7 @@ RustboroCity_Text_1E174B: @ 81E174B RustboroCity_Text_1E1789: @ 81E1789 .string "A POKéMON you get in a trade from\n" .string "someone grows fast.\p" - .string "But if you don’t have certain GYM\n" + .string "But if you don't have certain GYM\n" .string "BADGES, it may not obey you…$" RustboroCity_Text_1E17FE: @ 81E17FE @@ -1112,16 +1112,16 @@ RustboroCity_Text_1E17FE: @ 81E17FE RustboroCity_Text_1E1817: @ 81E1817 .string "Wait! Pleeeaaase!\p" - .string "Don’t take my GOODS!$" + .string "Don't take my GOODS!$" RustboroCity_Text_1E183E: @ 81E183E - .string "Oh, it’s you!\p" - .string "You’re that fantastic TRAINER who\n" + .string "Oh, it's you!\p" + .string "You're that fantastic TRAINER who\n" .string "helped me in PETALBURG WOODS!\p" .string "Help me! I was robbed by TEAM AQUA!\n" .string "I have to get the DEVON GOODS back!\p" - .string "If I don’t…\n" - .string "I’m going to be in serious trouble.$" + .string "If I don't…\n" + .string "I'm going to be in serious trouble.$" RustboroCity_Text_1E1904: @ 81E1904 .string "That shady character, I think he took\n" @@ -1133,12 +1133,12 @@ RustboroCity_Text_1E194D: @ 81E194D .string "You did!\n" .string "You got them back!\p" .string "You really are a great TRAINER!\p" - .string "I know! As my thanks, I’ll give you\n" + .string "I know! As my thanks, I'll give you\n" .string "another GREAT BALL!$" RustboroCity_Text_1E19E5: @ 81E19E5 - .string "You’re loaded with items.\n" - .string "I can’t give you this GREAT BALL.$" + .string "You're loaded with items.\n" + .string "I can't give you this GREAT BALL.$" RustboroCity_Text_1E1A21: @ 81E1A21 .string "Excuse me, please!\n" @@ -1148,7 +1148,7 @@ RustboroCity_Text_1E1A49: @ 81E1A49 .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" .string "You had a MATCH CALL feature put\n" .string "on your POKéNAV!\p" - .string "Let’s register each other so we can\n" + .string "Let's register each other so we can\n" .string "contact one another anytime!\p" .string "… … … … … …$" @@ -1159,18 +1159,18 @@ RustboroCity_Text_1E1ADB: @ 81E1ADB RustboroCity_Text_1E1AFA: @ 81E1AFA .string "MAY: Oh, by the way, I passed\n" .string "MR. BRINEY in PETALBURG WOODS.\p" - .string "I guess he’s on his way home to his\n" + .string "I guess he's on his way home to his\n" .string "cottage by the sea.\p" - .string "How’s your POKéDEX coming along,\n" - .string "{PLAYER}{KUN}? Mine’s looking pretty decent!\p" + .string "How's your POKéDEX coming along,\n" + .string "{PLAYER}{KUN}? Mine's looking pretty decent!\p" .string "So…\n" .string "How about a little battle?$" RustboroCity_Text_1E1BD3: @ 81E1BD3 - .string "MAY: Oh, what’s the matter?\p" - .string "Haven’t you caught or raised your\n" + .string "MAY: Oh, what's the matter?\p" + .string "Haven't you caught or raised your\n" .string "POKéMON very much?\p" - .string "That’s not very good for a TRAINER!$" + .string "That's not very good for a TRAINER!$" RustboroCity_Text_1E1C48: @ 81E1C48 .string "MAY: So, what do you think?\n" @@ -1178,11 +1178,11 @@ RustboroCity_Text_1E1C48: @ 81E1C48 RustboroCity_Text_1E1C84: @ 81E1C84 .string "MAY: You just became a TRAINER,\n" - .string "{PLAYER}{KUN}. I’m not going to lose!$" + .string "{PLAYER}{KUN}. I'm not going to lose!$" RustboroCity_Text_1E1CC1: @ 81E1CC1 .string "Yikes!\n" - .string "You’re better than I expected!$" + .string "You're better than I expected!$" RustboroCity_Text_1E1CE7: @ 81E1CE7 .string "MAY: Oh, by the way, MR. BRINEY, who\n" @@ -1195,7 +1195,7 @@ RustboroCity_Text_1E1D7D: @ 81E1D7D .string "BRENDAN: Oh, hey, {PLAYER}!\p" .string "You had a MATCH CALL feature put\n" .string "on your POKéNAV! Cool!\p" - .string "Let’s register each other so we can\n" + .string "Let's register each other so we can\n" .string "get in touch anytime!\p" .string "… … … … … …$" @@ -1208,32 +1208,32 @@ RustboroCity_Text_1E1E34: @ 81E1E34 .string "by MR. BRINEY in PETALBURG WOODS.\p" .string "I bet he was on his way home to his\n" .string "cottage by the sea.\p" - .string "{PLAYER}, how’s your POKéDEX?\n" + .string "{PLAYER}, how's your POKéDEX?\n" .string "Have you filled in any pages yet?\p" .string "Mine rules.\p" .string "Want to have a battle to test how\n" - .string "far you’ve progressed?$" + .string "far you've progressed?$" RustboroCity_Text_1E1F2F: @ 81E1F2F - .string "BRENDAN: What’s the matter? Don’t have\n" + .string "BRENDAN: What's the matter? Don't have\n" .string "any confidence in your POKéMON?$" RustboroCity_Text_1E1F76: @ 81E1F76 - .string "BRENDAN: What’s up?\n" + .string "BRENDAN: What's up?\n" .string "Want to have a battle with me?$" RustboroCity_Text_1E1FA9: @ 81E1FA9 .string "BRENDAN: I know you just became\n" - .string "a TRAINER, but I won’t go easy!$" + .string "a TRAINER, but I won't go easy!$" RustboroCity_Text_1E1FE9: @ 81E1FE9 .string "Hmm…\n" - .string "You’re pretty good.$" + .string "You're pretty good.$" RustboroCity_Text_1E2002: @ 81E2002 .string "BRENDAN: By the way, you know\n" .string "MR. BRINEY? The guy I just passed?\p" - .string "I bet you didn’t know this, since you\n" + .string "I bet you didn't know this, since you\n" .string "just moved here, {PLAYER}, but\l" .string "MR. BRINEY was once a great sailor.$" @@ -1241,7 +1241,7 @@ RustboroCity_Text_1E20A6: @ 81E20A6 .string "“Timesaving tunnel nearing\n" .string "completion!â€\p" .string "…Is what it says on the sign, but\n" - .string "there’s also a big “X†splashed\l" + .string "there's also a big “X†splashed\l" .string "across it in red paint…$" RustboroCity_Text_1E2128: @ 81E2128 @@ -1265,15 +1265,15 @@ RustboroCity_Text_1E220B: @ 81E220B .string "nature and science.â€$" RustboroCity_Text_1E2253: @ 81E2253 - .string "POKéMON TRAINER’S SCHOOL\p" - .string "“We’ll teach you anything about\n" + .string "POKéMON TRAINER'S SCHOOL\p" + .string "“We'll teach you anything about\n" .string "POKéMON!â€$" RustboroCity_Text_1E2296: @ 81E2296 - .string "CUTTER’S HOUSE$" + .string "CUTTER'S HOUSE$" RustboroCity_Text_1E22A5: @ 81E22A5 - .string "I’ve been developing an added feature\n" + .string "I've been developing an added feature\n" .string "for the POKéNAV…\p" .string "And it turned out great!\p" .string "{PLAYER}, may I see that POKéNAV?\n" @@ -1295,16 +1295,16 @@ RustboroCity_Text_1E2449: @ 81E2449 .string "Please select the POKéNAV.$" RustboroCity_Text_1E2464: @ 81E2464 - .string "Okay, I’d better get back to work.\n" + .string "Okay, I'd better get back to work.\n" .string "Please take care, {PLAYER}!$" RustboroCity_Text_1E249D: @ 81E249D .string "Did you know this?\p" .string "You can have a 2-on-2 battle even\n" - .string "if you’re not with another TRAINER.\p" + .string "if you're not with another TRAINER.\p" .string "If you catch the eyes of two TRAINERS\n" .string "when you have two or more POKéMON,\l" - .string "they’ll both challenge you.\p" - .string "Don’t you think it’d be cool if you\n" + .string "they'll both challenge you.\p" + .string "Don't you think it'd be cool if you\n" .string "could beat two TRAINERS by yourself?$" diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index 6736af297..1ed908952 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -26,10 +26,10 @@ RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 .string "That determined expression…\n" .string "That limber way you move…\l" .string "And your well-trained POKéMON…\p" - .string "You’re obviously a skilled TRAINER!\p" - .string "No, wait, don’t say a word.\n" + .string "You're obviously a skilled TRAINER!\p" + .string "No, wait, don't say a word.\n" .string "I can tell just by looking at you.\p" - .string "I’m sure that you can put this\n" + .string "I'm sure that you can put this\n" .string "HIDDEN MACHINE to good use.\p" .string "No need to be modest or shy.\n" .string "Go on, take it!$" @@ -39,7 +39,7 @@ RustboroCity_CuttersHouse_Text_215D33: @ 8215D33 .string "short, is CUT.\p" .string "An HM move is one that can be used\n" .string "by POKéMON outside of battle.\p" - .string "Any POKéMON that’s learned CUT can\n" + .string "Any POKéMON that's learned CUT can\n" .string "chop down thin trees if the TRAINER\l" .string "has earned the STONE BADGE.\p" .string "And, unlike a TM, an HM can be used\n" diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index b5af318e8..e8314ba04 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -90,7 +90,7 @@ RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312 RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B .string "Hello and welcome to the DEVON\n" .string "CORPORATION.\p" - .string "We’re proud producers of items and\n" + .string "We're proud producers of items and\n" .string "medicine that enhance your life.$" RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B @@ -99,37 +99,37 @@ RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B RustboroCity_DevonCorp_1F_Text_2113D1: @ 82113D1 .string "Hey, those RUNNING SHOES!\n" - .string "They’re one of our products!\p" + .string "They're one of our products!\p" .string "It makes me happy when I see someone\n" .string "using something we made.$" RustboroCity_DevonCorp_1F_Text_211446: @ 8211446 .string "That stolen parcel…\p" - .string "Well, sure it’s important, but it’s not\n" + .string "Well, sure it's important, but it's not\n" .string "anything that anyone can use.\p" .string "In my estimation, that robber must not\n" .string "have been very bright.$" RustboroCity_DevonCorp_1F_Text_2114DE: @ 82114DE - .string "It sounds like they’ve recovered\n" + .string "It sounds like they've recovered\n" .string "the ripped-off DEVON GOODS.$" RustboroCity_DevonCorp_1F_Text_21151B: @ 821151B - .string "I’m sorry, only authorized people\n" + .string "I'm sorry, only authorized people\n" .string "are allowed to enter here.$" RustboroCity_DevonCorp_1F_Text_211558: @ 8211558 - .string "It’s beyond stupid.\n" + .string "It's beyond stupid.\n" .string "How could we get robbed?$" RustboroCity_DevonCorp_1F_Text_211585: @ 8211585 .string "Hi, there!\n" - .string "You’re always welcome here!$" + .string "You're always welcome here!$" RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC .string "Samples of rocks and metal are\n" .string "displayed in the glass case.\p" - .string "There’s a panel with some writing\n" + .string "There's a panel with some writing\n" .string "on it…\p" .string "“DEVON CORPORATION got its start as\n" .string "a producer of stones from quarries.\p" @@ -143,7 +143,7 @@ RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC RustboroCity_DevonCorp_1F_Text_211722: @ 8211722 .string "Prototypes and test products fill\n" .string "the glass display case.\p" - .string "There’s a panel with a description…\p" + .string "There's a panel with a description…\p" .string "“In addition to industrial products,\n" .string "DEVON now markets sundries and\l" .string "pharmaceuticals for better lifestyles.\p" diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index c656fcac4..fc8dd5f79 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -295,20 +295,20 @@ RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1 end RustboroCity_DevonCorp_2F_Text_211BFB: @ 8211BFB - .string "We’re developing a device for talking\n" + .string "We're developing a device for talking\n" .string "with POKéMON.\p" - .string "But we haven’t had much success…$" + .string "But we haven't had much success…$" RustboroCity_DevonCorp_2F_Text_211C50: @ 8211C50 - .string "I’m developing new kinds of\n" + .string "I'm developing new kinds of\n" .string "POKé BALLS…\p" - .string "But I haven’t made much headway…$" + .string "But I haven't made much headway…$" RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99 .string "We finally made new kinds of\n" .string "POKé BALLS!\p" .string "The REPEAT BALL makes it easier to\n" - .string "catch POKéMON you’ve caught before.\p" + .string "catch POKéMON you've caught before.\p" .string "The TIMER BALL gets better at catching\n" .string "POKéMON the longer a battle runs.\p" .string "Both are proudly developed by\n" @@ -322,25 +322,25 @@ RustboroCity_DevonCorp_2F_Text_211D9F: @ 8211D9F RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3 .string "Oh, wow!\n" - .string "That’s a POKéNAV!\p" + .string "That's a POKéNAV!\p" .string "It came about as a result of our\n" - .string "PRESIDENT’s desire to learn about\l" + .string "PRESIDENT's desire to learn about\l" .string "the feelings of POKéMON.\p" .string "Would you like me to describe its\n" .string "features in detail?\p" - .string "No, no. I think you’ll find out just by\n" + .string "No, no. I think you'll find out just by\n" .string "trying the POKéNAV out.$" RustboroCity_DevonCorp_2F_Text_211EE0: @ 8211EE0 - .string "I’m trying to develop a device that\n" + .string "I'm trying to develop a device that\n" .string "visually reproduces the dreams of\l" .string "POKéMON…\p" - .string "But it’s not going well.$" + .string "But it's not going well.$" RustboroCity_DevonCorp_2F_Text_211F48: @ 8211F48 - .string "I’ve been trying to develop a device\n" + .string "I've been trying to develop a device\n" .string "that resurrects POKéMON from fossils…\p" - .string "And, it’s working!$" + .string "And, it's working!$" RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6 .string "Wait! That thing you have there…\n" @@ -352,11 +352,11 @@ RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6 RustboroCity_DevonCorp_2F_Text_212046: @ 8212046 .string "Oh, is that so?\p" - .string "DEVON’s technological expertise\n" + .string "DEVON's technological expertise\n" .string "is outstanding, I tell you.$" RustboroCity_DevonCorp_2F_Text_212092: @ 8212092 - .string "Oh, now that’s a surprise!\n" + .string "Oh, now that's a surprise!\n" .string "You have not one, but two, fossils?\p" .string "Unfortunately, my machine can only\n" .string "regenerate one POKéMON at a time.\p" @@ -365,7 +365,7 @@ RustboroCity_DevonCorp_2F_Text_212092: @ 8212092 RustboroCity_DevonCorp_2F_Text_212153: @ 8212153 .string "Excellent!\n" - .string "Let’s do this right away.\p" + .string "Let's do this right away.\p" .string "{PLAYER} handed the {STR_VAR_1} to\n" .string "the DEVON RESEARCHER.$" @@ -389,19 +389,19 @@ RustboroCity_DevonCorp_2F_Text_2122CB: @ 82122CB .string "the DEVON RESEARCHER.$" RustboroCity_DevonCorp_2F_Text_2122F5: @ 82122F5 - .string "Uh-oh, you’ve got too many POKéMON.\n" + .string "Uh-oh, you've got too many POKéMON.\n" .string "You have no room for this one.$" RustboroCity_DevonCorp_2F_Text_212338: @ 8212338 - .string "I’m trying to develop a new feature\n" + .string "I'm trying to develop a new feature\n" .string "for the POKéNAV…\p" - .string "But it’s not going well.$" + .string "But it's not going well.$" RustboroCity_DevonCorp_2F_Text_212386: @ 8212386 .string "Well, now what shall I work on\n" .string "developing next?\p" .string "Our company allows us to make our\n" .string "inspirations into reality.\p" - .string "One couldn’t ask for a better\n" + .string "One couldn't ask for a better\n" .string "environment as an engineer.$" diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index f7681a6f6..dc170677a 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -201,40 +201,40 @@ RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600 end RustboroCity_DevonCorp_3F_Text_212609: @ 8212609 - .string "I’m MR. STONE, the PRESIDENT of\n" + .string "I'm MR. STONE, the PRESIDENT of\n" .string "the DEVON CORPORATION.\p" - .string "I’d just got word about you!\p" + .string "I'd just got word about you!\p" .string "You saved our staff not just once,\n" .string "but twice!\p" .string "I have a favor to ask of an amazing\n" .string "person like you.\p" - .string "I understand that you’re delivering\n" - .string "a package to SLATEPORT’s SHIPYARD.\p" + .string "I understand that you're delivering\n" + .string "a package to SLATEPORT's SHIPYARD.\p" .string "Well, on the way, could you stop off in\n" .string "DEWFORD TOWN?\p" - .string "I was hoping that you’d deliver a\n" + .string "I was hoping that you'd deliver a\n" .string "LETTER to STEVEN in DEWFORD.$" RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C .string "MR. STONE: Now, you should know that\n" .string "I am a great PRESIDENT.\p" - .string "So, I’d never be so cheap as to ask\n" + .string "So, I'd never be so cheap as to ask\n" .string "a favor for nothing in return.\p" - .string "That’s why I want you to have this!$" + .string "That's why I want you to have this!$" RustboroCity_DevonCorp_3F_Text_212820: @ 8212820 .string "{PLAYER} received a POKéNAV.$" RustboroCity_DevonCorp_3F_Text_212837: @ 8212837 .string "MR. STONE: That device…\p" - .string "It’s a POKéMON NAVIGATOR, or POKéNAV\n" + .string "It's a POKéMON NAVIGATOR, or POKéNAV\n" .string "for short.\p" - .string "It’s an indispensable tool for any\n" + .string "It's an indispensable tool for any\n" .string "TRAINER on an adventure.\p" .string "It has a map of the HOENN region.\p" .string "You can check the locations of\n" .string "DEWFORD and SLATEPORT easily!\p" - .string "By the way, I’ve heard that sinister\n" + .string "By the way, I've heard that sinister\n" .string "criminals--MAGMA and AQUA, I believe--\l" .string "have been making trouble far and wide.\p" .string "I think it would be best if you rested\n" @@ -245,7 +245,7 @@ RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2 .string "go with caution and care!$" RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09 - .string "MR. STONE: I’m counting on you!$" + .string "MR. STONE: I'm counting on you!$" RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29 .string "MR. STONE: You delivered my LETTER?\n" @@ -257,26 +257,26 @@ RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E .string "MR. STONE: A POKéMON holding that\n" .string "EXP. SHARE will be given some of the\l" .string "EXP Points from battle.\p" - .string "It will get EXP Points even if it didn’t\n" + .string "It will get EXP Points even if it didn't\n" .string "actually battle.\p" .string "I would say EXP. SHARE is quite useful\n" .string "for raising weak POKéMON.$" RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78 - .string "MR. STONE: Since my youth, I’ve immersed\n" + .string "MR. STONE: Since my youth, I've immersed\n" .string "myself in work.\p" - .string "Consequently, I’m not familiar with\n" + .string "Consequently, I'm not familiar with\n" .string "trends and that sort of thing.\p" .string "But do young people all want to be\n" .string "TRAINERS in the POKéMON LEAGUE?$" RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37 - .string "This is the DEVON CORPORATION’s\n" + .string "This is the DEVON CORPORATION's\n" .string "third floor.\p" - .string "Our PRESIDENT’s OFFICE is on\n" + .string "Our PRESIDENT's OFFICE is on\n" .string "this floor.\p" - .string "Anyway, I can’t tell you how much I’m\n" - .string "grateful for what you’ve done.\p" + .string "Anyway, I can't tell you how much I'm\n" + .string "grateful for what you've done.\p" .string "Um… By the way, that parcel\n" .string "you got back for us…\p" .string "Could I get you to deliver that to\n" @@ -285,7 +285,7 @@ RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37 .string "tried to take it again.\p" .string "Uh… Hehehe, so, uh, could I count\n" .string "on you to do that for me?\p" - .string "Oh, that’s right.\n" + .string "Oh, that's right.\n" .string "Could you wait here a second?$" RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8 @@ -301,11 +301,11 @@ RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41 .string "you should go see CAPT. STERN.$" RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88 - .string "DEVON’s new products, the REPEAT BALL\n" + .string "DEVON's new products, the REPEAT BALL\n" .string "and TIMER BALL, have become hugely\l" .string "popular among TRAINERS.$" RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9 - .string "It’s a collection of rare rocks and\n" + .string "It's a collection of rare rocks and\n" .string "stones assembled by the PRESIDENT.$" diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 2113da526..ae0bfcd8e 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -85,12 +85,12 @@ RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246 end RustboroCity_Flat1_2F_Text_21524F: @ 821524F - .string "Oh, it’s so hard every day…\p" - .string "What’s hard?\n" + .string "Oh, it's so hard every day…\p" + .string "What's hard?\n" .string "You need to ask?\p" - .string "It’s trying to figure out what to\n" + .string "It's trying to figure out what to\n" .string "make for meals every day.\p" - .string "It really isn’t easy coming up with\n" + .string "It really isn't easy coming up with\n" .string "meals every day.$" RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA @@ -98,80 +98,80 @@ RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA .string "Welcome to the PEPPER household.\p" .string "I have a question for you.\n" .string "Have you ever baby-sat?\p" - .string "You see, I’m a new father, so raising\n" + .string "You see, I'm a new father, so raising\n" .string "a child is all new to me.\p" .string "And I have a problem. My daughter\n" - .string "WALDA doesn’t laugh enough.\p" - .string "I think she’d laugh for me if I told\n" + .string "WALDA doesn't laugh enough.\p" + .string "I think she'd laugh for me if I told\n" .string "her something funny.\p" .string "Do you know of a funny word or\n" .string "phrase you can tell me?$" RustboroCity_Flat1_2F_Text_215448: @ 8215448 - .string "I’ve been saying “{STR_VAR_1}â€\n" + .string "I've been saying “{STR_VAR_1}â€\n" .string "to amuse her lately.\p" .string "Do you know of a better word or\n" .string "a phrase that might work?$" RustboroCity_Flat1_2F_Text_2154AD: @ 82154AD - .string "Oh, that’s wonderful.\n" - .string "So, let’s hear it, your suggestion.$" + .string "Oh, that's wonderful.\n" + .string "So, let's hear it, your suggestion.$" RustboroCity_Flat1_2F_Text_2154E7: @ 82154E7 .string "Oh, is that right?\p" .string "Well, if you come up with a good\n" - .string "suggestion, I’m all ears.$" + .string "suggestion, I'm all ears.$" RustboroCity_Flat1_2F_Text_215535: @ 8215535 .string "Ah, I see.\n" - .string "Well, let’s give it a try, shall we?$" + .string "Well, let's give it a try, shall we?$" RustboroCity_Flat1_2F_Text_215565: @ 8215565 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" - .string "Oh, yes! She’s laughing!\n" + .string "Oh, yes! She's laughing!\n" .string "Oh, I am as delighted as she!$" RustboroCity_Flat1_2F_Text_2155A4: @ 82155A4 .string "Ah, I see.\n" - .string "Well, let’s give it a try, shall we?$" + .string "Well, let's give it a try, shall we?$" RustboroCity_Flat1_2F_Text_2155D4: @ 82155D4 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" - .string "Hmmm… She’s not smiling at all.\n" + .string "Hmmm… She's not smiling at all.\n" .string "Maybe WALDA is one serious child…$" RustboroCity_Flat1_2F_Text_21561E: @ 821561E - .string "Oh, so you don’t know any good words.\n" - .string "I’d better think for myself, then.\p" + .string "Oh, so you don't know any good words.\n" + .string "I'd better think for myself, then.\p" .string "Hmm…\n" .string "How about “{STR_VAR_1}â€?\l" - .string "Let’s see if that will work.$" + .string "Let's see if that will work.$" RustboroCity_Flat1_2F_Text_215699: @ 8215699 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" - .string "Hmmm… She’s not smiling at all.\n" + .string "Hmmm… She's not smiling at all.\n" .string "Maybe WALDA is one serious child…$" RustboroCity_Flat1_2F_Text_2156E3: @ 82156E3 - .string "Oh, so you don’t know any good words.\n" - .string "I guess I’ll try to amuse her with\l" + .string "Oh, so you don't know any good words.\n" + .string "I guess I'll try to amuse her with\l" .string "the saying I used before.\p" .string "Anyways, if you have a good suggestion,\n" - .string "don’t hesitate in telling me, okay?$" + .string "don't hesitate in telling me, okay?$" RustboroCity_Flat1_2F_Text_215792: @ 8215792 .string "Thank you!\p" .string "Thanks to you, my darling WALDA\n" .string "laughed for me!\p" .string "Actually, I may not look all that\n" - .string "special, but I’m one of DEVON\l" - .string "CORPORATION’s top researchers.\p" + .string "special, but I'm one of DEVON\l" + .string "CORPORATION's top researchers.\p" .string "So, how about I do something in return\n" .string "for you?\p" - .string "I know, I’ll add some new wallpaper\n" + .string "I know, I'll add some new wallpaper\n" .string "patterns for the BOXES in the PC\l" .string "POKéMON Storage System.\p" .string "In the wallpaper pattern menu,\n" @@ -180,5 +180,5 @@ RustboroCity_Flat1_2F_Text_215792: @ 8215792 .string "wallpaper patterns.$" RustboroCity_Flat1_2F_Text_215923: @ 8215923 - .string "It’s a POKéMON plush DOLL!$" + .string "It's a POKéMON plush DOLL!$" diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc index 184ccdb72..8fc7e4972 100644 --- a/data/maps/RustboroCity_Flat2_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -16,7 +16,7 @@ RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 end RustboroCity_Flat2_1F_Text_215F93: @ 8215F93 - .string "DEVON CORPORATION’s workers live in\n" + .string "DEVON CORPORATION's workers live in\n" .string "this building.$" RustboroCity_Flat2_1F_Text_215FC6: @ 8215FC6 diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 9835f3622..d07babf0c 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -28,12 +28,12 @@ RustboroCity_Flat2_2F_Text_21601A: @ 821601A .string "a teeny, tiny company.$" RustboroCity_Flat2_2F_Text_21605A: @ 821605A - .string "My daddy’s working at the CORPORATION.\p" + .string "My daddy's working at the CORPORATION.\p" .string "My daddy made this!\n" - .string "But I can’t use it, so you can have it.$" + .string "But I can't use it, so you can have it.$" RustboroCity_Flat2_2F_Text_2160BD: @ 82160BD - .string "My daddy’s working at the CORPORATION.\p" - .string "When I grow up, I’m going to work for\n" + .string "My daddy's working at the CORPORATION.\p" + .string "When I grow up, I'm going to work for\n" .string "DEVON, too.$" diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc index c38e46cbf..dd5a86dae 100644 --- a/data/maps/RustboroCity_Flat2_3F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -10,10 +10,10 @@ RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120 end RustboroCity_Flat2_3F_Text_216129: @ 8216129 - .string "DEVON’s PRESIDENT likes to collect\n" + .string "DEVON's PRESIDENT likes to collect\n" .string "rare stones.$" RustboroCity_Flat2_3F_Text_216159: @ 8216159 - .string "I think the PRESIDENT’s son also\n" + .string "I think the PRESIDENT's son also\n" .string "collects rare stones.$" diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index f39374c64..6f161d048 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -111,22 +111,22 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B end RustboroCity_Gym_Text_21309D: @ 821309D - .string "Yo, how’s it going?\p" + .string "Yo, how's it going?\p" .string "Listen, my friend!\n" .string "Would you like to become the CHAMPION?\p" - .string "I’m no TRAINER, not me, but I can\n" + .string "I'm no TRAINER, not me, but I can\n" .string "sure give you winning advice.\p" - .string "That’s settled, then! We’ll aim for the\n" + .string "That's settled, then! We'll aim for the\n" .string "POKéMON CHAMPIONSHIP together!\p" - .string "It’s your job as a TRAINER to collect\n" + .string "It's your job as a TRAINER to collect\n" .string "GYM BADGES, am I right?\p" - .string "But GYM LEADERS aren’t pushovers!\p" - .string "And that’s where I come in!\n" - .string "I’m here to provide expert advice!\p" + .string "But GYM LEADERS aren't pushovers!\p" + .string "And that's where I come in!\n" + .string "I'm here to provide expert advice!\p" .string "ROXANNE, the GYM LEADER, is a user\n" .string "of ROCK-type POKéMON.\p" .string "The ROCK type is very durable, but\n" - .string "it can’t stand WATER-type and\l" + .string "it can't stand WATER-type and\l" .string "GRASS-type moves.\p" .string "Come see me afterwards, if you beat\n" .string "the GYM LEADER.\p" @@ -134,38 +134,38 @@ RustboroCity_Gym_Text_21309D: @ 821309D RustboroCity_Gym_Text_2132E2: @ 82132E2 .string "Whoa! What a breathtaking victory!\n" - .string "My cheering must’ve worked!\p" + .string "My cheering must've worked!\p" .string "Great!\n" .string "Check your TRAINER CARD.\p" .string "The STONE BADGE you got should be\n" .string "properly recorded on it.\p" .string "In other words…\p" - .string "You’ve climbed the first step on\n" + .string "You've climbed the first step on\n" .string "the stairs to the CHAMPIONSHIP!\p" - .string "That’s got to feel awesome!$" + .string "That's got to feel awesome!$" RustboroCity_Gym_Text_2133E9: @ 82133E9 - .string "Don’t take us GYM TRAINERS lightly!\n" - .string "I’ll show you why we’re better!$" + .string "Don't take us GYM TRAINERS lightly!\n" + .string "I'll show you why we're better!$" RustboroCity_Gym_Text_21342D: @ 821342D .string "You were too good for me…$" RustboroCity_Gym_Text_213447: @ 8213447 - .string "You haven’t seen anything of the ROCK\n" - .string "type’s terrifying power!$" + .string "You haven't seen anything of the ROCK\n" + .string "type's terrifying power!$" RustboroCity_Gym_Text_213486: @ 8213486 - .string "If you can’t beat me, you won’t stand\n" + .string "If you can't beat me, you won't stand\n" .string "a chance against ROXANNE!$" RustboroCity_Gym_Text_2134C6: @ 82134C6 - .string "Wow! You’ve got some potential!$" + .string "Wow! You've got some potential!$" RustboroCity_Gym_Text_2134E6: @ 82134E6 .string "ROXANNE is stronger than me by\n" .string "several times.\p" - .string "You’d better be on your guard!$" + .string "You'd better be on your guard!$" RustboroCity_Gym_Text_213533: @ 8213533 .string "We might be in the middle of town,\n" @@ -187,7 +187,7 @@ RustboroCity_Gym_Text_21362A: @ 821362A .string "POKéMON GYM LEADER.\p" .string "I became a GYM LEADER so that I might\n" .string "apply what I learned at the POKéMON\l" - .string "TRAINER’S SCHOOL in battle.\p" + .string "TRAINER'S SCHOOL in battle.\p" .string "Would you kindly demonstrate how you\n" .string "battle, and with which POKéMON?$" @@ -197,7 +197,7 @@ RustboroCity_Gym_Text_21370B: @ 821370B .string "It seems that I still have much more\n" .string "to learn…\p" .string "I understand.\p" - .string "The POKéMON LEAGUE’s rules state\n" + .string "The POKéMON LEAGUE's rules state\n" .string "that TRAINERS are to be given this\l" .string "if they defeat a GYM LEADER.\p" .string "Please accept the official POKéMON\n" @@ -235,7 +235,7 @@ RustboroCity_Gym_Text_213A21: @ 8213A21 RustboroCity_Gym_Text_213A3B: @ 8213A3B .string "RUSTBORO CITY POKéMON GYM\p" - .string "ROXANNE’S CERTIFIED TRAINERS:\n" + .string "ROXANNE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" @@ -244,14 +244,14 @@ RustboroCity_Gym_Text_213A76: @ 8213A76 .string "… … … … … Beep!\p" .string "ROXANNE: Oh, hello, {PLAYER}?\n" .string "This is ROXANNE of RUSTBORO CITY.\p" - .string "I heard from BRAWLY that you’re\n" + .string "I heard from BRAWLY that you're\n" .string "moving up through the ranks of\l" .string "TRAINERS at an incredible clip.\p" - .string "Well, I’d rather not think that\n" - .string "I can’t beat you.\p" + .string "Well, I'd rather not think that\n" + .string "I can't beat you.\p" .string "I promise, I will shape up my GYM\n" .string "so that you may challenge us again.\p" - .string "I hope you’ll be looking forward to\n" + .string "I hope you'll be looking forward to\n" .string "that occasion as much as me!\p" .string "… … … … … …\n" .string "… … … … … Click!$" @@ -261,12 +261,12 @@ RustboroCity_Gym_Text_213C01: @ 8213C01 .string "in the POKéNAV.$" RustboroCity_Gym_Text_213C2F: @ 8213C2F - .string "ROXANNE: I’m so glad to see you again.\n" - .string "I’m ROXANNE, the GYM LEADER here.\p" - .string "I’m sure we’ve both experienced many\n" + .string "ROXANNE: I'm so glad to see you again.\n" + .string "I'm ROXANNE, the GYM LEADER here.\p" + .string "I'm sure we've both experienced many\n" .string "battles since we last met.\p" .string "I would like to see how much better\n" - .string "we’ve become. Let us battle!$" + .string "we've become. Let us battle!$" RustboroCity_Gym_Text_213CF9: @ 8213CF9 .string "Grr…\n" @@ -279,12 +279,12 @@ RustboroCity_Gym_Text_213D12: @ 8213D12 .string "all that much more!$" RustboroCity_Gym_Text_213D93: @ 8213D93 - .string "ROXANNE: I’m so glad to see you again.\n" - .string "I’m ROXANNE, the GYM LEADER here.\p" - .string "I’m sure we’ve both experienced many\n" + .string "ROXANNE: I'm so glad to see you again.\n" + .string "I'm ROXANNE, the GYM LEADER here.\p" + .string "I'm sure we've both experienced many\n" .string "battles since we last met.\p" .string "I would like to see how much better\n" - .string "we’ve become…\p" + .string "we've become…\p" .string "Oh, no…\n" .string "You only have one POKéMON with you?\p" .string "Please return with at least one more\n" diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index ccf7ef046..8bc43c0c2 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -56,9 +56,9 @@ RustboroCity_House1_EventScript_2159DF:: @ 82159DF RustboroCity_House1_Text_2159E8: @ 82159E8 .string "Huh? My POKéMON is cute?\n" .string "Sure, I knew that.\p" - .string "But if you really want, I’m willing\n" + .string "But if you really want, I'm willing\n" .string "to trade it to you.\p" - .string "I’ll trade you my {STR_VAR_2} for\n" + .string "I'll trade you my {STR_VAR_2} for\n" .string "a {STR_VAR_1} if you want.$" RustboroCity_House1_Text_215A77: @ 8215A77 @@ -66,11 +66,11 @@ RustboroCity_House1_Text_215A77: @ 8215A77 .string "Please be good to my POKéMON.$" RustboroCity_House1_Text_215A9D: @ 8215A9D - .string "Huh? That doesn’t look anything like\n" + .string "Huh? That doesn't look anything like\n" .string "a {STR_VAR_1} to me.$" RustboroCity_House1_Text_215ACE: @ 8215ACE - .string "Oh, if you don’t want to, that’s okay.\n" + .string "Oh, if you don't want to, that's okay.\n" .string "But my POKéMON is cute, you know…$" RustboroCity_House1_Text_215B17: @ 8215B17 diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc index 37f3b4c43..632eb6877 100644 --- a/data/maps/RustboroCity_House2/scripts.inc +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -10,12 +10,12 @@ RustboroCity_House2_EventScript_215EBD:: @ 8215EBD end RustboroCity_House2_Text_215EC6: @ 8215EC6 - .string "The TRAINER’S SCHOOL is excellent.\p" + .string "The TRAINER'S SCHOOL is excellent.\p" .string "If you study there, you could even\n" .string "become a GYM LEADER.$" RustboroCity_House2_Text_215F21: @ 8215F21 .string "ROXANNE, the GYM LEADER, really knows\n" .string "a lot about POKéMON.\p" - .string "She’s really strong, too!$" + .string "She's really strong, too!$" diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc index 2d927086e..04992fbba 100644 --- a/data/maps/RustboroCity_House3/scripts.inc +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -22,14 +22,14 @@ RustboroCity_House3_EventScript_2161A3:: @ 82161A3 RustboroCity_House3_Text_2161B6: @ 82161B6 .string "For my own POKéMON, I give them\n" .string "perfectly suited nicknames!\p" - .string "It’s my expression of, uh…\n" - .string "originality, yes, that’s it!$" + .string "It's my expression of, uh…\n" + .string "originality, yes, that's it!$" RustboroCity_House3_Text_21622A: @ 821622A .string "But giving the name PEKACHU to\n" .string "a PIKACHU? It seems pointless.\p" .string "I suppose it is good to use a name\n" - .string "that’s easy to understand, but…$" + .string "that's easy to understand, but…$" RustboroCity_House3_Text_2162AB: @ 82162AB .string "PEKACHU: Peka!$" diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index ed91cf68e..17406b0ac 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -70,7 +70,7 @@ RustboroCity_Mart_EventScript_214F86:: @ 8214F86 end RustboroCity_Mart_Text_214F8F: @ 8214F8F - .string "I’m buying some PARLYZ HEALS and\n" + .string "I'm buying some PARLYZ HEALS and\n" .string "ANTIDOTES.\p" .string "Just in case I run into SHROOMISH\n" .string "in PETALBURG WOODS.$" @@ -82,7 +82,7 @@ RustboroCity_Mart_Text_214FF1: @ 8214FF1 .string "instead of ordinary POTIONS.$" RustboroCity_Mart_Text_21505C: @ 821505C - .string "I’m getting an ESCAPE ROPE just in\n" + .string "I'm getting an ESCAPE ROPE just in\n" .string "case I get lost in a cave.\p" .string "I just need to use it to get back to\n" .string "the entrance.$" diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 0a5a6ed92..f76603dbd 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -30,15 +30,15 @@ RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F .string "My POKéMON has a NAIVE nature, and my\n" - .string "friend’s has a JOLLY nature.\p" - .string "It’s fascinating how POKéMON have\n" + .string "friend's has a JOLLY nature.\p" + .string "It's fascinating how POKéMON have\n" .string "personalities!$" RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13 .string "Just like people, there are male and\n" .string "female POKéMON.\p" .string "But no one seems to have any idea how\n" - .string "they’re different.$" + .string "they're different.$" RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81 .string "The man next door gave me an HM!\p" diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 6ec120258..330afd30c 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -219,7 +219,7 @@ RustboroCity_PokemonSchool_Text_21411A: @ 821411A .string "steadily lose HP.\p" .string "The effects of poison remain after\n" .string "a battle.\p" - .string "A poisoned POKéMON’s HP will drop\n" + .string "A poisoned POKéMON's HP will drop\n" .string "while it is traveling.\p" .string "Heal a poisoning using an ANTIDOTE.$" @@ -241,7 +241,7 @@ RustboroCity_PokemonSchool_Text_21427D: @ 821427D RustboroCity_PokemonSchool_Text_214336: @ 8214336 .string "A burn reduces ATTACK power, and it\n" - .string "steadily reduces the victim’s HP.\p" + .string "steadily reduces the victim's HP.\p" .string "A burn lingers after battle.\n" .string "Cure a burn using a BURN HEAL.$" @@ -252,7 +252,7 @@ RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8 .string "Thaw it out using an ICE HEAL.$" RustboroCity_PokemonSchool_Text_214433: @ 8214433 - .string "Students who don’t study get a little\n" + .string "Students who don't study get a little\n" .string "taste of my QUICK CLAW.\p" .string "Whether or not you are a good student \n" .string "will be evident from the way you use\l" @@ -268,16 +268,16 @@ RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8 .string "topics to study!$" RustboroCity_PokemonSchool_Text_21459F: @ 821459F - .string "I’m trading POKéMON with my friend\n" + .string "I'm trading POKéMON with my friend\n" .string "right now.$" RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD .string "I always wanted a SEEDOT, and\n" - .string "I’m finally getting one!$" + .string "I'm finally getting one!$" RustboroCity_PokemonSchool_Text_214604: @ 8214604 .string "POKéMON can hold items, but they\n" - .string "don’t know what to do with man-made\l" + .string "don't know what to do with man-made\l" .string "items like POTION and ANTIDOTE.$" RustboroCity_PokemonSchool_Text_214669: @ 8214669 @@ -297,7 +297,7 @@ RustboroCity_PokemonSchool_Text_214719: @ 8214719 .string "down…$" RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 - .string "It’s this student’s notebook…\p" + .string "It's this student's notebook…\p" .string "POKéMON are to be caught using\n" .string "POKé BALLS.\p" .string "Up to six POKéMON can accompany\n" @@ -305,18 +305,18 @@ RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 .string "A TRAINER is someone who catches\n" .string "POKéMON, raises them, and battles\l" .string "with them.\p" - .string "A TRAINER’s mission is to defeat\n" + .string "A TRAINER's mission is to defeat\n" .string "the strong TRAINERS who await\l" .string "challengers in POKéMON GYMS.$" RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 - .string "Hello? Didn’t we meet before?\n" + .string "Hello? Didn't we meet before?\n" .string "I think back in PETALBURG CITY.\p" .string "Let me introduce myself.\n" - .string "My name’s SCOTT.\p" - .string "I’ve been traveling everywhere in\n" + .string "My name's SCOTT.\p" + .string "I've been traveling everywhere in\n" .string "search of outstanding TRAINERS.\p" - .string "More specifically, I’m looking for\n" + .string "More specifically, I'm looking for\n" .string "POKéMON battle experts.\p" .string "So, what brings you to this SCHOOL?\n" .string "Are you a TRAINER, too?\p" @@ -328,32 +328,32 @@ RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F .string "SCOTT: Hmm…\p" .string "The talent levels of the students here\n" - .string "are unknown. The potential’s there.$" + .string "are unknown. The potential's there.$" RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6 - .string "SCOTT: Oh, what’s that?\p" - .string "It’s a STONE BADGE, isn’t it?\n" - .string "That’s pretty impressive, I’d say.\p" - .string "But, you know, I would’ve loved to see\n" + .string "SCOTT: Oh, what's that?\p" + .string "It's a STONE BADGE, isn't it?\n" + .string "That's pretty impressive, I'd say.\p" + .string "But, you know, I would've loved to see\n" .string "you in battle.\p" - .string "It’s hard to tell what you’re like as\n" + .string "It's hard to tell what you're like as\n" .string "a TRAINER from a LEAGUE BADGE.$" RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A - .string "Hello? Didn’t we meet before?\n" + .string "Hello? Didn't we meet before?\n" .string "I think back in PETALBURG CITY.\p" .string "Let me introduce myself.\n" - .string "My name’s SCOTT.\p" - .string "I’ve been traveling everywhere in\n" + .string "My name's SCOTT.\p" + .string "I've been traveling everywhere in\n" .string "search of outstanding TRAINERS.\p" - .string "More specifically, I’m looking for\n" + .string "More specifically, I'm looking for\n" .string "POKéMON battle experts.\p" - .string "Oh, what’s that?\n" - .string "It’s a STONE BADGE, isn’t it?\p" - .string "That’s pretty impressive, I’d say, for\n" + .string "Oh, what's that?\n" + .string "It's a STONE BADGE, isn't it?\p" + .string "That's pretty impressive, I'd say, for\n" .string "a starting TRAINER like yourself.\p" - .string "But, you know, I would’ve loved to see\n" + .string "But, you know, I would've loved to see\n" .string "you in battle.\p" - .string "It’s hard to tell what you’re like as\n" + .string "It's hard to tell what you're like as\n" .string "a TRAINER from a LEAGUE BADGE.$" diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index c93f7d5c4..1eaaba66c 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -461,7 +461,7 @@ RusturfTunnel_Text_22D2E1: @ 822D2E1 RusturfTunnel_Text_22D395: @ 822D395 .string "PEEKO!\n" - .string "Am I glad to see you’re safe!$" + .string "Am I glad to see you're safe!$" RusturfTunnel_Text_22D3BA: @ 822D3BA .string "PEEKO owes her life to you!\p" @@ -471,8 +471,8 @@ RusturfTunnel_Text_22D3BA: @ 822D3BA .string "… … … … … … … …\p" .string "Ah, so you are {PLAYER}{KUN}!\n" .string "I sincerely thank you!\p" - .string "Now, if there’s anything that troubles\n" - .string "you, don’t hesitate to tell me!\p" + .string "Now, if there's anything that troubles\n" + .string "you, don't hesitate to tell me!\p" .string "You can usually find me in my cottage\n" .string "by the sea near PETALBURG WOODS.\p" .string "Come, PEEKO, we should make our way\n" @@ -481,7 +481,7 @@ RusturfTunnel_Text_22D3BA: @ 822D3BA RusturfTunnel_Text_22D510: @ 822D510 .string "… …\p" - .string "Why can’t they keep digging?\n" + .string "Why can't they keep digging?\n" .string "Is the bedrock too hard?\p" .string "My beloved awaits me in VERDANTURF\n" .string "TOWN just beyond here…\p" @@ -500,7 +500,7 @@ RusturfTunnel_Text_22D65C: @ 822D65C .string "Wow! You shattered that boulder\n" .string "blocking the way.\p" .string "To show you how much I appreciate it,\n" - .string "I’d like you to have this HM.$" + .string "I'd like you to have this HM.$" RusturfTunnel_Text_22D6D2: @ 822D6D2 .string "That HM contains STRENGTH.\p" @@ -511,13 +511,13 @@ RusturfTunnel_Text_22D6D2: @ 822D6D2 RusturfTunnel_Text_22D745: @ 822D745 .string "WANDA!\n" .string "Now I can see you anytime!\p" - .string "WANDA: That’s…wonderful.\p" + .string "WANDA: That's…wonderful.\p" .string "Please, take some rest at my home.$" RusturfTunnel_Text_22D7A3: @ 822D7A3 .string "On the other side of this rock…\n" .string "My boyfriend is there.\p" - .string "He… He’s not just digging the tunnel\n" + .string "He… He's not just digging the tunnel\n" .string "to come see me.\p" .string "He works his hands raw and rough\n" .string "for the benefit of everyone.$" @@ -525,7 +525,7 @@ RusturfTunnel_Text_22D7A3: @ 822D7A3 RusturfTunnel_Text_22D84D: @ 822D84D .string "What do you call a wild man up in the\n" .string "mountains? A mountain man, right?\p" - .string "So why don’t they call a POKéMON in\n" + .string "So why don't they call a POKéMON in\n" .string "the mountains a mountain POKéMON?$" RusturfTunnel_Text_22D8DB: @ 822D8DB @@ -535,5 +535,5 @@ RusturfTunnel_Text_22D8DB: @ 822D8DB RusturfTunnel_Text_22D8F9: @ 822D8F9 .string "They halted development here to\n" .string "protect POKéMON, right?\l" - .string "There’s a feel-good story!$" + .string "There's a feel-good story!$" diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 91780d608..15b0ba8e1 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -270,21 +270,21 @@ SSTidalCorridor_Movement_23C28B: @ 823C28B SSTidalCorridor_Text_23C28F: @ 823C28F .string "SCOTT: Well, hi, hi!\n" .string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p" - .string "Something’s come up, so I have to\n" + .string "Something's come up, so I have to\n" .string "disembark, but am I glad to see you!\p" .string "Congratulations, LEAGUE CHAMPION!\p" - .string "There’s a place I’d like to invite\n" + .string "There's a place I'd like to invite\n" .string "someone like you.\p" - .string "It’s the…\n" + .string "It's the…\n" .string "BATTLE FRONTIER!\p" - .string "What’s the place like?\n" - .string "You’ll understand when you see it!\p" - .string "I’ve spoken with the ship’s CAPTAIN\n" + .string "What's the place like?\n" + .string "You'll understand when you see it!\p" + .string "I've spoken with the ship's CAPTAIN\n" .string "about this.\p" .string "The next time you take a ferry,\n" .string "you should be able to sail to\l" .string "the BATTLE FRONTIER.\p" - .string "Okay, {PLAYER}{KUN}, I’ll be waiting for you\n" + .string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n" .string "at the BATTLE FRONTIER!$" SSTidalCorridor_Text_23C462: @ 823C462 @@ -308,15 +308,15 @@ SSTidalRooms_Text_23C553: @ 823C553 .string "Thank you for sailing with us.$" SSTidalCorridor_Text_23C596: @ 823C596 - .string "It’ll be some time before we make land,\n" + .string "It'll be some time before we make land,\n" .string "I reckon.\p" - .string "You can rest up in your cabin if you’d\n" - .string "like. Your cabin’s No. 2.\p" + .string "You can rest up in your cabin if you'd\n" + .string "like. Your cabin's No. 2.\p" .string "The bed in there is soft and plushy.\n" .string "I can attest to how comfy it is!$" SSTidalCorridor_Text_23C64F: @ 823C64F - .string "We’ve arrived!$" + .string "We've arrived!$" SSTidalCorridor_Text_23C65E: @ 823C65E .string "Go visit other cabins.\n" diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index b7e15a82d..68761376d 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -12,28 +12,28 @@ SSTidalLowerDeck_EventScript_23C830:: @ 823C830 end SSTidalLowerDeck_Text_23C847: @ 823C847 - .string "Arrrgh! I’m fed up and dog-tired of\n" + .string "Arrrgh! I'm fed up and dog-tired of\n" .string "cleaning this huge place!\p" - .string "Let’s have a quick battle!$" + .string "Let's have a quick battle!$" SSTidalLowerDeck_Text_23C8A0: @ 823C8A0 .string "Little bro, I lost!$" SSTidalLowerDeck_Text_23C8B4: @ 823C8B4 - .string "We’re the CLEANUP BROTHERS!\p" + .string "We're the CLEANUP BROTHERS!\p" .string "The old one dumps the detergent,\n" .string "and the young one does the scrubbing!$" SSTidalLowerDeck_Text_23C917: @ 823C917 - .string "This is the bottom of the ship’s hull.\n" - .string "There’s plenty of room.\l" - .string "It’ll be alright for a POKéMON battle.$" + .string "This is the bottom of the ship's hull.\n" + .string "There's plenty of room.\l" + .string "It'll be alright for a POKéMON battle.$" SSTidalLowerDeck_Text_23C97D: @ 823C97D .string "Big bro, I lost!$" SSTidalLowerDeck_Text_23C98E: @ 823C98E - .string "We’re the CLEANUP BROTHERS!\p" + .string "We're the CLEANUP BROTHERS!\p" .string "The old one dumps the detergent,\n" .string "and the young one does the scrubbing!$" diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 055973787..7d774e491 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -65,8 +65,8 @@ SSTidalRooms_EventScript_23CADB:: @ 823CADB end SSTidalRooms_Text_23CAF2: @ 823CAF2 - .string "There’s a bed…\n" - .string "Let’s take a rest.$" + .string "There's a bed…\n" + .string "Let's take a rest.$" SSTidalRooms_Text_23CB14: @ 823CB14 .string "I often sail to LILYCOVE CITY.\p" @@ -78,7 +78,7 @@ SSTidalRooms_Text_23CB58: @ 823CB58 SSTidalRooms_Text_23CB75: @ 823CB75 .string "I get so excited imagining what kinds\n" - .string "of POKéMON I’ll get to see in the next\l" + .string "of POKéMON I'll get to see in the next\l" .string "CONTEST. The anticipation of it thrills!$" SSTidalRooms_Text_23CBEB: @ 823CBEB @@ -101,43 +101,43 @@ SSTidalRooms_Text_23CC8A: @ 823CC8A SSTidalRooms_Text_23CCBB: @ 823CCBB .string "To be never ruffled in any situation is\n" - .string "the GENTLEMAN’s code of conduct.$" + .string "the GENTLEMAN's code of conduct.$" SSTidalRooms_Text_23CD04: @ 823CD04 .string "JED: I feel a little shy about this, but…\n" - .string "We’ll show you our lovey-dovey power!$" + .string "We'll show you our lovey-dovey power!$" SSTidalRooms_Text_23CD54: @ 823CD54 .string "JED: Sigh…$" SSTidalRooms_Text_23CD5F: @ 823CD5F - .string "JED: It’s the first time that our lovey-\n" - .string "dovey power couldn’t prevail!\l" + .string "JED: It's the first time that our lovey-\n" + .string "dovey power couldn't prevail!\l" .string "You must be an awesome TRAINER!$" SSTidalRooms_Text_23CDC6: @ 823CDC6 .string "JED: You only have one POKéMON?\n" - .string "Isn’t that just too lonesome?$" + .string "Isn't that just too lonesome?$" SSTidalRooms_Text_23CE04: @ 823CE04 .string "LEA: I feel a little silly, but…\n" - .string "We’ll show you our lovey-dovey power!$" + .string "We'll show you our lovey-dovey power!$" SSTidalRooms_Text_23CE4B: @ 823CE4B .string "LEA: Oh, boo!$" SSTidalRooms_Text_23CE59: @ 823CE59 - .string "LEA: I can’t believe it!\n" + .string "LEA: I can't believe it!\n" .string "Our lovey-dovey power failed…\l" .string "You must be an awesome TRAINER!$" SSTidalRooms_Text_23CEB0: @ 823CEB0 .string "LEA: I wanted to battle…\n" - .string "But you don’t even have two POKéMON…$" + .string "But you don't even have two POKéMON…$" SSTidalRooms_Text_23CEEE: @ 823CEEE - .string "Ah, you’ve come just in time.\p" - .string "I’m bored, you see.\n" + .string "Ah, you've come just in time.\p" + .string "I'm bored, you see.\n" .string "You may entertain me.$" SSTidalRooms_Text_23CF36: @ 823CF36 @@ -149,13 +149,13 @@ SSTidalRooms_Text_23CF45: @ 823CF45 .string "A yacht for me and POKéMON!$" SSTidalRooms_Text_23CF97: @ 823CF97 - .string "Oh, you’re such an adorable TRAINER.\n" + .string "Oh, you're such an adorable TRAINER.\n" .string "Would you like to have tea?\l" .string "Or would you rather battle?$" SSTidalRooms_Text_23CFF4: @ 823CFF4 .string "I see.\n" - .string "You’re the active sort.$" + .string "You're the active sort.$" SSTidalRooms_Text_23D013: @ 823D013 .string "A world cruise on a luxury liner has its\n" @@ -164,11 +164,11 @@ SSTidalRooms_Text_23D013: @ 823D013 .string "side to touring HOENN by ferry.$" SSTidalRooms_Text_23D098: @ 823D098 - .string "Uh… Hi! I… I’m not acting suspicious!\n" + .string "Uh… Hi! I… I'm not acting suspicious!\n" .string "Uh… You can have this! For free!\p" - .string "It… Honestly, I didn’t SNATCH it from\n" - .string "someone! I’d never do such a thing!\l" - .string "It’s clean! You can use it!$" + .string "It… Honestly, I didn't SNATCH it from\n" + .string "someone! I'd never do such a thing!\l" + .string "It's clean! You can use it!$" SSTidalRooms_Text_23D145: @ 823D145 .string "SNATCH steals the beneficial effects\n" diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index db5dd7f02..cb41b7ca6 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -66,28 +66,28 @@ SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 SeafloorCavern_Entrance_Text_234544: @ 8234544 .string "Hey!\n" .string "I remember your face!\p" - .string "If you’re here, it must mean that\n" - .string "you’re about to mess with us again!\p" + .string "If you're here, it must mean that\n" + .string "you're about to mess with us again!\p" .string "A punk like you, do you really think\n" .string "you can take on TEAM AQUA?\p" - .string "I’d say you’re too early by about\n" + .string "I'd say you're too early by about\n" .string "a trillion years!\p" - .string "You’re a perfect fit for the likes of\n" + .string "You're a perfect fit for the likes of\n" .string "TEAM MAGMA!\p" .string "Speaking of TEAM MAGMA, I hear they\n" .string "were spotted near MOSSDEEP.\p" - .string "That bunch of goons, they sure don’t\n" + .string "That bunch of goons, they sure don't\n" .string "look good near the sea!$" SeafloorCavern_Entrance_Text_2346C8: @ 82346C8 .string "A punk like you, do you really think\n" .string "you can take on TEAM AQUA?\p" - .string "I’d say you’re too early by about\n" + .string "I'd say you're too early by about\n" .string "a trillion years!\p" - .string "You’re a perfect fit for the likes of\n" + .string "You're a perfect fit for the likes of\n" .string "TEAM MAGMA!\p" .string "Speaking of TEAM MAGMA, I hear they\n" .string "were spotted near MOSSDEEP.\p" - .string "That bunch of goons, they sure don’t\n" + .string "That bunch of goons, they sure don't\n" .string "look good near the sea!$" diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 96ef36d38..92049e8ef 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -12,7 +12,7 @@ SeafloorCavern_Room1_EventScript_234803:: @ 8234803 end SeafloorCavern_Room1_Text_23481A: @ 823481A - .string "We don’t need a kid around!\n" + .string "We don't need a kid around!\n" .string "Go on home already!$" SeafloorCavern_Room1_Text_23484A: @ 823484A @@ -23,14 +23,14 @@ SeafloorCavern_Room1_Text_23485D: @ 823485D .string "boss around the GRUNTS…$" SeafloorCavern_Room1_Text_234898: @ 8234898 - .string "That submarine… It’s tiny inside.\n" - .string "I’m sore all over!$" + .string "That submarine… It's tiny inside.\n" + .string "I'm sore all over!$" SeafloorCavern_Room1_Text_2348CD: @ 82348CD .string "Losing makes me sore!$" SeafloorCavern_Room1_Text_2348E3: @ 82348E3 .string "That submarine we jacked, man,\n" - .string "it’s brutal as a ride.\l" - .string "It’s way too tight in there!$" + .string "it's brutal as a ride.\l" + .string "It's way too tight in there!$" diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 29bfcc89a..40913f407 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -16,11 +16,11 @@ SeafloorCavern_Room3_Text_234966: @ 8234966 .string "How did you manage to get here without\n" .string "a submarine?\l" .string "What an impressive child!\p" - .string "But… It won’t do to have you\n" + .string "But… It won't do to have you\n" .string "meddling about here.\p" .string "And, I do want payback for what\n" .string "happened at the WEATHER INSTITUTE…\p" - .string "I’m going to give you a little taste\n" + .string "I'm going to give you a little taste\n" .string "of pain! Resign yourself to it!$" SeafloorCavern_Room3_Text_234A79: @ 8234A79 @@ -29,8 +29,8 @@ SeafloorCavern_Room3_Text_234A79: @ 8234A79 SeafloorCavern_Room3_Text_234A8A: @ 8234A8A .string "Ahahahaha!\n" - .string "You’re so darn strong.\p" - .string "It’s terribly disappointing that you’re\n" + .string "You're so darn strong.\p" + .string "It's terribly disappointing that you're\n" .string "not a TEAM AQUA member.\p" .string "You could have enjoyed the fabulous\n" .string "world our BOSS has promised as\l" @@ -42,14 +42,14 @@ SeafloorCavern_Room3_Text_234B3A: @ 8234B3A .string "But meddlers like you use the power of\n" .string "POKéMON to mess with us even at\l" .string "a place like this!\p" - .string "Life just doesn’t work the way we\n" + .string "Life just doesn't work the way we\n" .string "need it to!$" SeafloorCavern_Room3_Text_234BFE: @ 8234BFE .string "Gwah!$" SeafloorCavern_Room3_Text_234C04: @ 8234C04 - .string "You know, we don’t dare question\n" + .string "You know, we don't dare question\n" .string "the motives of our leader.\p" .string "But here you are, just some punk,\n" .string "going up against our BOSS.\p" diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index 92e165c7b..132d24a32 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -19,12 +19,12 @@ SeafloorCavern_Room4_Text_234CF3: @ 8234CF3 .string "Lost it…$" SeafloorCavern_Room4_Text_234CFC: @ 8234CFC - .string "I can’t find the way out!\p" - .string "I’m not afraid. Don’t get me wrong!$" + .string "I can't find the way out!\p" + .string "I'm not afraid. Don't get me wrong!$" SeafloorCavern_Room4_Text_234D3A: @ 8234D3A .string "Who are you?\n" - .string "Where do you think you’re going?$" + .string "Where do you think you're going?$" SeafloorCavern_Room4_Text_234D68: @ 8234D68 .string "I failed to win!$" @@ -32,5 +32,5 @@ SeafloorCavern_Room4_Text_234D68: @ 8234D68 SeafloorCavern_Room4_Text_234D79: @ 8234D79 .string "My partner forgot the map in that\n" .string "submarine!\p" - .string "How’s that for being useless?$" + .string "How's that for being useless?$" diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 70e37ac5e..9406fcb6c 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -236,9 +236,9 @@ SeafloorCavern_Room9_Text_2350A6: @ 82350A6 .string "come…$" SeafloorCavern_Room9_Text_23512C: @ 823512C - .string "ARCHIE: It surprises me, how you’ve\n" + .string "ARCHIE: It surprises me, how you've\n" .string "managed to chase me here.\p" - .string "But that’s all over now.\p" + .string "But that's all over now.\p" .string "For the realization of my dream,\n" .string "you must disappear now!$" @@ -260,32 +260,32 @@ SeafloorCavern_Room9_Text_235279: @ 8235279 SeafloorCavern_Room9_Text_2352A7: @ 82352A7 .string "ARCHIE: What?!\p" - .string "I didn’t do anything.\n" + .string "I didn't do anything.\n" .string "Why did the RED ORB…\p" .string "Where did KYOGRE go?$" SeafloorCavern_Room9_Text_2352F6: @ 82352F6 - .string "ARCHIE: Hm? It’s a message from our\n" + .string "ARCHIE: Hm? It's a message from our\n" .string "members outside…$" SeafloorCavern_Room9_Text_23532B: @ 823532B .string "ARCHIE: Yes, what is it?\p" .string "Hm…\n" - .string "It’s raining heavily?\p" + .string "It's raining heavily?\p" .string "Good… That should have happened.\n" .string "That is why we awakened KYOGRE,\l" - .string "to realize TEAM AQUA’s vision of\l" + .string "to realize TEAM AQUA's vision of\l" .string "expanding the sea.\p" .string "What?!\p" - .string "It’s raining far harder than we\n" - .string "envisioned? You’re in danger?\p" - .string "That can’t be…\n" - .string "That’s just not possible…\p" + .string "It's raining far harder than we\n" + .string "envisioned? You're in danger?\p" + .string "That can't be…\n" + .string "That's just not possible…\p" .string "Hold your position and monitor\n" .string "the situation!$" SeafloorCavern_Room9_Text_23546F: @ 823546F - .string "ARCHIE: There’s something wrong…\p" + .string "ARCHIE: There's something wrong…\p" .string "The RED ORB is supposed to awaken\n" .string "and control KYOGRE…\p" .string "But… Why?\n" @@ -294,27 +294,27 @@ SeafloorCavern_Room9_Text_23546F: @ 823546F SeafloorCavern_Room9_Text_2354F0: @ 82354F0 .string "MAXIE: What have you wrought?\p" - .string "ARCHIE… You’ve finally awoken KYOGRE,\n" - .string "haven’t you?\p" + .string "ARCHIE… You've finally awoken KYOGRE,\n" + .string "haven't you?\p" .string "What will happen to the world if this\n" .string "downpour continues for all eternity?\p" - .string "The world’s landmass will drown in\n" + .string "The world's landmass will drown in\n" .string "the deepening sea…$" SeafloorCavern_Room9_Text_2355C2: @ 82355C2 .string "ARCHIE: W-what?!\n" - .string "Don’t get all high and mighty with me!\p" - .string "Wasn’t it you, TEAM MAGMA, that\n" + .string "Don't get all high and mighty with me!\p" + .string "Wasn't it you, TEAM MAGMA, that\n" .string "infuriated GROUDON?\p" .string "So long as I have this RED ORB,\n" .string "I should be able to control KYOGRE…\p" .string "I should be able to control it…$" SeafloorCavern_Room9_Text_235692: @ 8235692 - .string "MAXIE: We don’t have the time to\n" + .string "MAXIE: We don't have the time to\n" .string "argue about it here!\p" .string "Get outside and see for yourself!\p" - .string "See if what you’ve wrought is the\n" + .string "See if what you've wrought is the\n" .string "world that we desired!$" SeafloorCavern_Room9_Text_235723: @ 8235723 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index c809130b7..1b2a1e4c9 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -145,30 +145,30 @@ SkyPillar_Outside_Text_239402: @ 8239402 .string "The door is closed.$" SkyPillar_Outside_Text_239416: @ 8239416 - .string "WALLACE: Oh, my, I’m terribly sorry!\p" - .string "In my haste, I didn’t notice that\n" - .string "I’d left you behind!\p" - .string "I’ve opened the locked door of\n" + .string "WALLACE: Oh, my, I'm terribly sorry!\p" + .string "In my haste, I didn't notice that\n" + .string "I'd left you behind!\p" + .string "I've opened the locked door of\n" .string "the SKY PILLAR.\p" - .string "{PLAYER}{KUN}, let’s be on our way!$" + .string "{PLAYER}{KUN}, let's be on our way!$" SkyPillar_Outside_Text_2394BC: @ 82394BC - .string "WALLACE: It’s an earthquake!\p" - .string "There’s not a moment to waste!\n" - .string "We’ve got to hurry!$" + .string "WALLACE: It's an earthquake!\p" + .string "There's not a moment to waste!\n" + .string "We've got to hurry!$" SkyPillar_Outside_Text_23950C: @ 823950C .string "WALLACE: Hmm…\n" .string "The situation is getting worse…$" SkyPillar_Outside_Text_23953A: @ 823953A - .string "WALLACE: This isn’t good…\p" + .string "WALLACE: This isn't good…\p" .string "The weather distortion is spreading\n" .string "even here…\p" .string "{PLAYER}{KUN}.\p" .string "RAYQUAZA should be farther up\n" .string "from here.\p" - .string "I’m worried about SOOTOPOLIS.\n" - .string "I’ve got to go back.\p" + .string "I'm worried about SOOTOPOLIS.\n" + .string "I've got to go back.\p" .string "Everything is in your hands now.\n" - .string "Don’t fail us!$" + .string "Don't fail us!$" diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index d13953d0d..dc3a81650 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -948,7 +948,7 @@ SlateportCity_EventScript_1DD643:: @ 81DD643 end SlateportCity_Text_1DD64A: @ 81DD64A - .string "I’m the ENERGY GURU! I’ll go for it and\n" + .string "I'm the ENERGY GURU! I'll go for it and\n" .string "sell you what you need!$" SlateportCity_Text_1DD68A: @ 81DD68A @@ -969,7 +969,7 @@ SlateportCity_Text_1DD702: @ 81DD702 SlateportCity_Text_1DD722: @ 81DD722 .string "You have to go for it a little harder.\p" - .string "If you do, I’ll give your POKéMON\n" + .string "If you do, I'll give your POKéMON\n" .string "something nice.$" SlateportCity_Text_1DD77B: @ 81DD77B @@ -979,7 +979,7 @@ SlateportCity_Text_1DD77B: @ 81DD77B SlateportCity_Text_1DD7AD: @ 81DD7AD .string "The light of the lighthouse reaches\n" .string "dozens of miles away.\p" - .string "I wonder if it doesn’t startle POKéMON\n" + .string "I wonder if it doesn't startle POKéMON\n" .string "in the sea.$" SlateportCity_Text_1DD81A: @ 81DD81A @@ -1003,22 +1003,22 @@ SlateportCity_Text_1DD93D: @ 81DD93D SlateportCity_Text_1DD999: @ 81DD999 .string "If you put DOLLS or CUSHIONS on\n" - .string "the floor, they’ll get dirty.\p" - .string "I’m going to buy some BRICKS so my\n" - .string "DOLLS and CUSHIONS won’t get dirty\l" + .string "the floor, they'll get dirty.\p" + .string "I'm going to buy some BRICKS so my\n" + .string "DOLLS and CUSHIONS won't get dirty\l" .string "when I leave them out.$" SlateportCity_Text_1DDA34: @ 81DDA34 - .string "Wroooar! I’m going to compete in\n" + .string "Wroooar! I'm going to compete in\n" .string "the BATTLE TENT, too!\p" .string "But before that, I need to catch\n" .string "some POKéMON!$" SlateportCity_Text_1DDA9A: @ 81DDA9A - .string "Whew… I’m just bushed…\p" + .string "Whew… I'm just bushed…\p" .string "I hiked over from MAUVILLE CITY.\n" - .string "But, boy, this city’s huge.\p" - .string "If I’d known this, I would’ve ridden\n" + .string "But, boy, this city's huge.\p" + .string "If I'd known this, I would've ridden\n" .string "my BIKE here.$" SlateportCity_Text_1DDB21: @ 81DDB21 @@ -1039,7 +1039,7 @@ SlateportCity_Text_1DDBD5: @ 81DDBD5 SlateportCity_Text_1DDC4F: @ 81DDC4F .string "Hey, there! Quit pushing!\n" - .string "This is the line, can’t you see?$" + .string "This is the line, can't you see?$" SlateportCity_Text_1DDC8A: @ 81DDC8A .string "TEAM AQUA has a policy of\n" @@ -1052,17 +1052,17 @@ SlateportCity_Text_1DDCD5: @ 81DDCD5 .string "a MUSEUM now?$" SlateportCity_Text_1DDD18: @ 81DDD18 - .string "What’s the new scheme, I wonder?\p" - .string "Our BOSS is scary when he’s mad, so\n" - .string "I’d better not screw things up…$" + .string "What's the new scheme, I wonder?\p" + .string "Our BOSS is scary when he's mad, so\n" + .string "I'd better not screw things up…$" SlateportCity_Text_1DDD7D: @ 81DDD7D - .string "If there’s something we need in\n" + .string "If there's something we need in\n" .string "the MUSEUM, we should take it all!$" SlateportCity_Text_1DDDC0: @ 81DDDC0 .string "Hey, you there!\n" - .string "Don’t butt in!$" + .string "Don't butt in!$" SlateportCity_Text_1DDDDF: @ 81DDDDF .string "A long line, huh?\p" @@ -1079,26 +1079,26 @@ SlateportCity_Text_1DDE6E: @ 81DDE6E SlateportCity_Text_1DDE86: @ 81DDE86 .string "You want to read this sign?\n" - .string "I’ll read it for you!$" + .string "I'll read it for you!$" SlateportCity_Text_1DDEB8: @ 81DDEB8 - .string "Let’s see…\p" + .string "Let's see…\p" .string "Um… I think it says something like\n" .string "“the life in the sea is endless.â€\p" - .string "Yup, I’m pretty sure that’s what\n" + .string "Yup, I'm pretty sure that's what\n" .string "it says.$" SlateportCity_Text_1DDF32: @ 81DDF32 .string "Grumble…\p" - .string "I should’ve brought my Game Boy\n" - .string "Advance so I wouldn’t get bored in line…\p" + .string "I should've brought my Game Boy\n" + .string "Advance so I wouldn't get bored in line…\p" .string "Grumble…$" SlateportCity_Text_1DDF8D: @ 81DDF8D - .string "When this operation’s over, I’ll take\n" + .string "When this operation's over, I'll take\n" .string "you to a hot spring spa!\p" - .string "That’s what our leader said.\n" - .string "I can’t wait!$" + .string "That's what our leader said.\n" + .string "I can't wait!$" SlateportCity_Text_1DDFF7: @ 81DDFF7 .string "The sea is just so vast…\p" @@ -1116,20 +1116,20 @@ SlateportCity_Text_1DE0D2: @ 81DE0D2 .string "away and buy too much.$" SlateportCity_Text_1DE10E: @ 81DE10E - .string "If you want to change your POKéMON’s\n" - .string "nickname, you’ll have to get the NAME\l" + .string "If you want to change your POKéMON's\n" + .string "nickname, you'll have to get the NAME\l" .string "RATER to help you.$" SlateportCity_Text_1DE16C: @ 81DE16C .string "Any POKéMON you get in a trade,\n" - .string "you can’t change its nickname.\p" - .string "The original TRAINER’s love for that\n" + .string "you can't change its nickname.\p" + .string "The original TRAINER's love for that\n" .string "POKéMON is in the nickname.$" SlateportCity_Text_1DE1EC: @ 81DE1EC .string "Recently, a BATTLE TENT was built\n" .string "in SLATEPORT.\p" - .string "GYMS are fun, but the BATTLE TENT’s\n" + .string "GYMS are fun, but the BATTLE TENT's\n" .string "awesome in its own way.\p" .string "You should go find tough POKéMON\n" .string "for the BATTLE TENT!$" @@ -1137,13 +1137,13 @@ SlateportCity_Text_1DE1EC: @ 81DE1EC SlateportCity_Text_1DE28E: @ 81DE28E .string "I was hoping that it was a famous star\n" .string "so I could get an autograph.\p" - .string "But who’s that being interviewed?\n" - .string "Isn’t that CAPT. STERN?$" + .string "But who's that being interviewed?\n" + .string "Isn't that CAPT. STERN?$" SlateportCity_Text_1DE30C: @ 81DE30C .string "That lady interviewer is so cool\n" .string "and pretty.\p" - .string "When I grow up, I’m going to be\n" + .string "When I grow up, I'm going to be\n" .string "an international journalist!$" SlateportCity_Text_1DE376: @ 81DE376 @@ -1153,7 +1153,7 @@ SlateportCity_Text_1DE376: @ 81DE376 .string "What could it be?$" SlateportCity_Text_1DE3E2: @ 81DE3E2 - .string "What’s going on here?\p" + .string "What's going on here?\p" .string "Did the good CAPTAIN come back with\n" .string "a big fish from the ocean floor?$" @@ -1163,14 +1163,14 @@ SlateportCity_Text_1DE43D: @ 81DE43D SlateportCity_Text_1DE460: @ 81DE460 .string "A TV interview! Here!\n" - .string "The CAPTAIN’s a celebrity!$" + .string "The CAPTAIN's a celebrity!$" SlateportCity_Text_1DE491: @ 81DE491 .string "TY: Okay, CAPT. STERN, a big smile\n" .string "for the camera!$" SlateportCity_Text_1DE4C4: @ 81DE4C4 - .string "GABBY: I see, I see. You’ve had a most\n" + .string "GABBY: I see, I see. You've had a most\n" .string "invaluable experience…$" SlateportCity_Text_1DE502: @ 81DE502 @@ -1178,7 +1178,7 @@ SlateportCity_Text_1DE502: @ 81DE502 .string "move ahead with our exploration.$" SlateportCity_Text_1DE54A: @ 81DE54A - .string "GABBY: That’s wonderful, CAPT. STERN!\n" + .string "GABBY: That's wonderful, CAPT. STERN!\n" .string "Thank you for taking the time from\l" .string "your busy schedule to talk to us.\p" .string "We hope we can interview you again\n" @@ -1191,13 +1191,13 @@ SlateportCity_Text_1DE5F7: @ 81DE5F7 SlateportCity_Text_1DE64F: @ 81DE64F .string "Oh! {PLAYER}{KUN}!\n" - .string "You’re looking great!\p" + .string "You're looking great!\p" .string "We made a huge discovery on our last\n" .string "seafloor exploration.\p" .string "We found an underwater cavern on\n" .string "ROUTE 128.\p" - .string "We think it’s the habitat of a POKéMON\n" - .string "that’s said to have been long extinct.$" + .string "We think it's the habitat of a POKéMON\n" + .string "that's said to have been long extinct.$" SlateportCity_Text_1DE724: @ 81DE724 .string "Fufufu…\n" @@ -1217,9 +1217,9 @@ SlateportCity_Text_1DE7F7: @ 81DE7F7 .string "Where did it come from?$" SlateportCity_Text_1DE860: @ 81DE860 - .string "It’s from the HARBOR!\p" + .string "It's from the HARBOR!\p" .string "The submarine!\n" - .string "They’re trying to take it!$" + .string "They're trying to take it!$" SlateportCity_Text_1DE8A0: @ 81DE8A0 .string "{PLAYER}{KUN}!\n" @@ -1230,18 +1230,18 @@ SlateportCity_Text_1DE8BC: @ 81DE8BC .string "“Find it! The ultimate POKéMON!â€$" SlateportCity_Text_1DE8F8: @ 81DE8F8 - .string "STERN’S SHIPYARD\p" + .string "STERN'S SHIPYARD\p" .string "“Wanted: A sailor capable of sailing\n" .string "in all currents.â€$" SlateportCity_Text_1DE940: @ 81DE940 - .string "STERN’S SHIPYARD\p" + .string "STERN'S SHIPYARD\p" .string "“The ferry S.S. TIDAL nears\n" .string "completion for serving the ports of\l" .string "SLATEPORT and LILYCOVE.â€$" SlateportCity_Text_1DE9AA: @ 81DE9AA - .string "STERN’S SHIPYARD\p" + .string "STERN'S SHIPYARD\p" .string "“Boarding of the SLATEPORT-LILYCOVE\n" .string "ferry S.S. TIDAL is handled at the\l" .string "HARBOR.â€$" @@ -1277,7 +1277,7 @@ SlateportCity_Text_1DEB5A: @ 81DEB5A .string "the ferry S.S. TIDAL.â€$" SlateportCity_Text_1DEBA0: @ 81DEBA0 - .string "NAME RATER’S HOUSE\n" + .string "NAME RATER'S HOUSE\n" .string "“POKéMON nicknames rated.â€$" SlateportCity_Text_1DEBCE: @ 81DEBCE @@ -1292,7 +1292,7 @@ SlateportCity_Text_1DEBCE: @ 81DEBCE .string "Did you know that?\p" .string "You seem to have an interest\n" .string "in BERRIES!\p" - .string "I’ve got something good for someone\n" + .string "I've got something good for someone\n" .string "like you.$" SlateportCity_Text_1DED27: @ 81DED27 @@ -1319,7 +1319,7 @@ SlateportCity_Text_1DEE90: @ 81DEE90 .string "BERRY POWDER for one {STR_VAR_1}?$" SlateportCity_Text_1DEEC9: @ 81DEEC9 - .string "Oh, dear. You don’t have enough\n" + .string "Oh, dear. You don't have enough\n" .string "BERRY POWDER.$" SlateportCity_Text_1DEEF7: @ 81DEEF7 @@ -1333,16 +1333,16 @@ SlateportCity_Text_1DEF79: @ 81DEF79 .string "BERRY POWDER, bring it to me, please!$" SlateportCity_Text_1DEFBC: @ 81DEFBC - .string "Come back if you’d like to trade your\n" + .string "Come back if you'd like to trade your\n" .string "BERRY POWDER for some medicine.\p" - .string "I’m always running a bazaar here.\p" + .string "I'm always running a bazaar here.\p" .string "Did you know?$" SlateportCity_Text_1DF032: @ 81DF032 .string "SCOTT: Huh?\n" - .string "I’m sure I met you somewhere before.\p" + .string "I'm sure I met you somewhere before.\p" .string "Have I introduced myself to you?\n" - .string "If not, my name’s SCOTT.\p" + .string "If not, my name's SCOTT.\p" .string "I just saw TEAM AQUA run away from\n" .string "here like they were stung.\p" .string "Let me guess--you drove them away?$" @@ -1352,9 +1352,9 @@ SlateportCity_Text_1DF0FE: @ 81DF0FE .string "Maybe, just maybe, this TRAINER…$" SlateportCity_Text_1DF12B: @ 81DF12B - .string "SCOTT: All right! I think you’re going\n" + .string "SCOTT: All right! I think you're going\n" .string "to become a good friend.\p" - .string "So, let’s register each other in our\n" + .string "So, let's register each other in our\n" .string "POKéNAVS.\p" .string "… … … … … …$" @@ -1363,20 +1363,20 @@ SlateportCity_Text_1DF1A6: @ 81DF1A6 .string "in the POKéNAV.$" SlateportCity_Text_1DF1D3: @ 81DF1D3 - .string "SCOTT: What I’d like to do is tag along\n" + .string "SCOTT: What I'd like to do is tag along\n" .string "with you, but I do want to keep an eye\l" .string "on the talents of other people, too.\p" - .string "So, I’ll be off to roam other towns\n" + .string "So, I'll be off to roam other towns\n" .string "a bit more.\p" .string "Be seeing you, {PLAYER}{KUN}!$" SlateportCity_Text_1DF28C: @ 81DF28C .string "SCOTT: Oh, hey!\n" - .string "If it isn’t {PLAYER}{KUN}!\p" - .string "{PLAYER}{KUN}, let me guess--you’re going\n" + .string "If it isn't {PLAYER}{KUN}!\p" + .string "{PLAYER}{KUN}, let me guess--you're going\n" .string "to take the BATTLE TENT challenge?\p" - .string "Yeah! That’s a good idea!\n" - .string "That’s a really great idea!\p" + .string "Yeah! That's a good idea!\n" + .string "That's a really great idea!\p" .string "After all, a tough TRAINER is\n" .string "the perfect fit for the BATTLE TENT!\p" .string "Give it your best effort!$" diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 4e676460c..7eb935bf1 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -178,100 +178,100 @@ SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B .string "Using a certain move after another\n" .string "certain kind of move sometimes gets\l" .string "you extra attention.\p" - .string "If you know what you’re doing,\n" + .string "If you know what you're doing,\n" .string "you can score big in appeal.\p" .string "Of course, your opponents might try\n" - .string "disrupting your POKéMON’s showing.$" + .string "disrupting your POKéMON's showing.$" SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A - .string "My papa, he’s a CONTEST JUDGE.\p" + .string "My papa, he's a CONTEST JUDGE.\p" .string "I wonder what I should be when I\n" .string "grow up, a JUDGE or a GYM LEADER?$" SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC - .string "Hey, man, I’m like majorly cheesed,\n" + .string "Hey, man, I'm like majorly cheesed,\n" .string "you know. Like, you know, I just\l" .string "wanted to know why my POKéMON\l" .string "never won, you know, like, hey?\p" .string "So, like, I gave the JUDGE my two\n" - .string "cents, you know, they’re free.\p" - .string "And he wouldn’t hear me out, like, hey!\n" + .string "cents, you know, they're free.\p" + .string "And he wouldn't hear me out, like, hey!\n" .string "So, like, total bummer, man!\p" .string "Hey, like, you! Zip it, you know?\n" .string "Just, you know, take this!$" SlateportCity_BattleTentCorridor_Text_209322: @ 8209322 - .string "That’s, like, TM41, you know?\n" - .string "Hey, it’s TORMENT, you hearing me?\p" - .string "Like, it won’t let the other guy\n" + .string "That's, like, TM41, you know?\n" + .string "Hey, it's TORMENT, you hearing me?\p" + .string "Like, it won't let the other guy\n" .string "use the same move twice in a row, see?\p" .string "Hey, now, you listen here, like,\n" - .string "I’m not laying a torment on you!$" + .string "I'm not laying a torment on you!$" SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED .string "MC: Oh, my, my!\n" - .string "Now isn’t that a dandy of a POKéMON?\p" + .string "Now isn't that a dandy of a POKéMON?\p" .string "Please! Do step right up and take\n" .string "part in our splendid CONTESTS!\p" - .string "You’ll do well! I’m sure of it!\n" + .string "You'll do well! I'm sure of it!\n" .string "My eyes have never failed me!$" SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1 .string "JUDGE: Well, hello there!\n" - .string "I see that you’re a TRAINER!\p" - .string "Then, it just wouldn’t do for you\n" + .string "I see that you're a TRAINER!\p" + .string "Then, it just wouldn't do for you\n" .string "to miss a POKéMON CONTEST!\p" .string "Get a CONTEST PASS in VERDANTURF\n" .string "CITY and enter anytime!$" SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E - .string "It’s appeal time!\n" + .string "It's appeal time!\n" .string "What should I lead with?$" SlateportCity_BattleTentCorridor_Text_209579: @ 8209579 - .string "They didn’t pay much attention to\n" - .string "my POKéMON’s appeal…\p" - .string "Humph, that JUDGE, he doesn’t know\n" + .string "They didn't pay much attention to\n" + .string "my POKéMON's appeal…\p" + .string "Humph, that JUDGE, he doesn't know\n" .string "a good thing when he sees it.$" SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1 .string "Oh, hi! You must be a serious fan to get\n" .string "this close to the action.\p" - .string "I’ll reward your enthusiasm with\n" + .string "I'll reward your enthusiasm with\n" .string "this sage advice.\p" .string "If a move goes over really well,\n" .string "the audience will get excited.\p" .string "The POKéMON that makes its appeal\n" - .string "right when everyone’s excited…\p" - .string "Well, you’d think something good has\n" + .string "right when everyone's excited…\p" + .string "Well, you'd think something good has\n" .string "to happen!$" SlateportCity_BattleTentCorridor_Text_209718: @ 8209718 - .string "I can’t do this! I’m more freaked out\n" + .string "I can't do this! I'm more freaked out\n" .string "than my POKéMON.\p" - .string "I’m shivering and my heart is racing!$" + .string "I'm shivering and my heart is racing!$" SlateportCity_BattleTentCorridor_Text_209775: @ 8209775 - .string "A battle and a CONTEST aren’t the\n" + .string "A battle and a CONTEST aren't the\n" .string "same, but they are alike, too.\p" .string "You need to work hard and believe\n" - .string "in the POKéMON you’ve raised.$" + .string "in the POKéMON you've raised.$" SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6 - .string "That POKéMON looks like it’s on top\n" + .string "That POKéMON looks like it's on top\n" .string "of its game, huh?\p" .string "A POKéMON that does good in the\n" .string "secondary judging seems to be more\l" - .string "relaxed when it’s doing appeals.$" + .string "relaxed when it's doing appeals.$" SlateportCity_BattleTentCorridor_Text_209890: @ 8209890 .string "Will you look at that sorry sight?\p" - .string "Heh, my POKéMON’s absolutely better\n" + .string "Heh, my POKéMON's absolutely better\n" .string "than that lot!$" SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6 - .string "Don’t you get the urge to move with\n" - .string "POKéMON if they’re putting on an\l" + .string "Don't you get the urge to move with\n" + .string "POKéMON if they're putting on an\l" .string "energetic appeal?$" SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8cf551943..8e5c81e12 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -323,35 +323,35 @@ SlateportCity_BattleTentLobby_EventScript_208B4C:: @ 8208B4C end SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E - .string "So, like, I couldn’t find myself any\n" + .string "So, like, I couldn't find myself any\n" .string "POKéMON that were, like, for me.\p" .string "So, I figured, like, hey, I should file\n" .string "a complaint to the guy there?\p" - .string "And he wouldn’t hear me out, like, hey!\n" + .string "And he wouldn't hear me out, like, hey!\n" .string "So, like, total bummer, man!\p" .string "Hey, like, you! Zip it, you know?\n" .string "Just, you know, take this!$" SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C - .string "That’s, like, TM41, you know?\n" - .string "Hey, it’s TORMENT, you hearing me?\p" - .string "Like, it won’t let the other guy\n" + .string "That's, like, TM41, you know?\n" + .string "Hey, it's TORMENT, you hearing me?\p" + .string "Like, it won't let the other guy\n" .string "use the same move twice in a row, see?\p" .string "Hey, now, you listen here, like,\n" - .string "I’m not laying a torment on you!$" + .string "I'm not laying a torment on you!$" SlateportCity_BattleTentLobby_Text_208D27: @ 8208D27 - .string "I don’t really like BUG POKéMON,\n" - .string "but maybe I’ll try using some for\l" + .string "I don't really like BUG POKéMON,\n" + .string "but maybe I'll try using some for\l" .string "a change of pace.\p" .string "Who knows, I might even get to like\n" .string "them!$" SlateportCity_BattleTentLobby_Text_208DA6: @ 8208DA6 .string "You can battle all you want here even\n" - .string "if you don’t have any tough POKéMON.$" + .string "if you don't have any tough POKéMON.$" SlateportCity_BattleTentLobby_Text_208DF1: @ 8208DF1 - .string "Wouldn’t it be nice if they had more of\n" + .string "Wouldn't it be nice if they had more of\n" .string "a selection?$" diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index bad96e2b0..efc0ff565 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -407,8 +407,8 @@ SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11 SlateportCity_Harbor_Text_20CE20: @ 820CE20 .string "I beg your pardon?\n" - .string "You’re looking for a ship?\p" - .string "I’m sorry, the ferry service isn’t\n" + .string "You're looking for a ship?\p" + .string "I'm sorry, the ferry service isn't\n" .string "available at present…$" SlateportCity_Harbor_Text_20CE87: @ 820CE87 @@ -417,14 +417,14 @@ SlateportCity_Harbor_Text_20CE87: @ 820CE87 SlateportCity_Harbor_Text_20CEC1: @ 820CEC1 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" + .string "{PLAYER} doesn't have the TICKET…\p" + .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" SlateportCity_Harbor_Text_20CF1C: @ 820CF1C .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" + .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" SlateportCity_Harbor_Text_20CF71: @ 820CF71 @@ -445,8 +445,8 @@ SlateportCity_Harbor_Text_20CFFA: @ 820CFFA SlateportCity_Harbor_Text_20D01C: @ 820D01C .string "A journey to the bottom of the sea…\n" - .string "I wonder what it’d be like?\p" - .string "I’d love to go deep underwater like\n" + .string "I wonder what it'd be like?\p" + .string "I'd love to go deep underwater like\n" .string "that someday.$" SlateportCity_Harbor_Text_20D08E: @ 820D08E @@ -462,13 +462,13 @@ SlateportCity_Harbor_Text_20D08E: @ 820D08E SlateportCity_Harbor_Text_20D194: @ 820D194 .string "I wanted to go with CAPT. STERN on\n" .string "the ocean floor exploration.\p" - .string "But the sub’s too small for me.\p" - .string "If I squeezed in, there wouldn’t be\n" + .string "But the sub's too small for me.\p" + .string "If I squeezed in, there wouldn't be\n" .string "any room for the CAPTAIN…$" SlateportCity_Harbor_Text_20D232: @ 820D232 .string "CAPT. STERN: Those thugs…\p" - .string "They’re the same lot who tried to rob\n" + .string "They're the same lot who tried to rob\n" .string "the DEVON GOODS at the MUSEUM.$" SlateportCity_Harbor_Text_20D291: @ 820D291 @@ -486,19 +486,19 @@ SlateportCity_Harbor_Text_20D35A: @ 820D35A .string "CAPT. STERN: Why…\p" .string "Why would TEAM AQUA steal my\n" .string "SUBMARINE EXPLORER 1?\p" - .string "They can’t be after the slumbering\n" + .string "They can't be after the slumbering\n" .string "POKéMON at the bottom of the sea…\p" .string "But even if I were to chase them,\n" - .string "I don’t stand a chance against them…$" + .string "I don't stand a chance against them…$" SlateportCity_Harbor_Text_20D42B: @ 820D42B .string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p" .string "Okay… So TEAM AQUA left before you\n" .string "could stop them…\p" - .string "Oh, no, don’t blame yourself.\n" - .string "You’re not responsible for this.\p" + .string "Oh, no, don't blame yourself.\n" + .string "You're not responsible for this.\p" .string "Trying to catch a submarine…\n" - .string "It’s impossible for most people.\p" + .string "It's impossible for most people.\p" .string "You would need a POKéMON that knows\n" .string "how to DIVE…\p" .string "Perhaps if you went out to\n" @@ -508,7 +508,7 @@ SlateportCity_Harbor_Text_20D42B: @ 820D42B SlateportCity_Harbor_Text_20D58A: @ 820D58A .string "CAPT. STERN: Trying to catch a\n" - .string "submarine… It’s impossible.\p" + .string "submarine… It's impossible.\p" .string "You would need a POKéMON that knows\n" .string "how to DIVE…\p" .string "Perhaps if you went out to\n" @@ -519,21 +519,21 @@ SlateportCity_Harbor_Text_20D58A: @ 820D58A SlateportCity_Harbor_Text_20D65C: @ 820D65C .string "CAPT. STERN: Oh, yes.\n" .string "MR. BRINEY came to our SHIPYARD.\p" - .string "It won’t be long now before we finish\n" + .string "It won't be long now before we finish\n" .string "making the ferry!$" SlateportCity_Harbor_Text_20D6CB: @ 820D6CB .string "CAPT. STERN: {PLAYER}{KUN}!\p" .string "We finally finished making the ferry\n" .string "S.S. TIDAL!\p" - .string "We couldn’t have done it without\n" + .string "We couldn't have done it without\n" .string "your friend MR. BRINEY.\p" .string "Please go for a short cruise on it!$" SlateportCity_Harbor_Text_20D76C: @ 820D76C .string "CAPT. STERN: Oh?\n" .string "{PLAYER}{KUN}, that item you have…\p" - .string "That’s a SCANNER! That would sure\n" + .string "That's a SCANNER! That would sure\n" .string "help us on our explorations.\p" .string "{PLAYER}{KUN}, would you trade your\n" .string "SCANNER for something?\p" @@ -542,16 +542,16 @@ SlateportCity_Harbor_Text_20D76C: @ 820D76C SlateportCity_Harbor_Text_20D841: @ 820D841 .string "CAPT. STERN: Are you certain?\n" - .string "It’s useless to you, {PLAYER}{KUN}…\p" + .string "It's useless to you, {PLAYER}{KUN}…\p" .string "Well, okay, then. If you want to trade\n" .string "your SCANNER, let me know.$" SlateportCity_Harbor_Text_20D8BC: @ 820D8BC - .string "CAPT. STERN: So you’ll trade it for\n" + .string "CAPT. STERN: So you'll trade it for\n" .string "my DEEPSEATOOTH?$" SlateportCity_Harbor_Text_20D8F1: @ 820D8F1 - .string "CAPT. STERN: So you’ll trade it for\n" + .string "CAPT. STERN: So you'll trade it for\n" .string "my DEEPSEASCALE?$" SlateportCity_Harbor_Text_20D926: @ 820D926 diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 6b0fff3b3..aaec06a21 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -72,13 +72,13 @@ SlateportCity_House1_EventScript_209B84:: @ 8209B84 end SlateportCity_House1_Text_209B8E: @ 8209B8E - .string "Hi, hi! I’m the NAME RATER!\n" - .string "I’m the fortune-teller of names!\p" + .string "Hi, hi! I'm the NAME RATER!\n" + .string "I'm the fortune-teller of names!\p" .string "I shall be pleased to rate your\n" - .string "POKéMON’s nickname.$" + .string "POKéMON's nickname.$" SlateportCity_House1_Text_209BFF: @ 8209BFF - .string "Which POKéMON’s nickname should\n" + .string "Which POKéMON's nickname should\n" .string "I critique?$" SlateportCity_House1_Text_209C2B: @ 8209C2B @@ -112,7 +112,7 @@ SlateportCity_House1_Text_209DF0: @ 8209DF0 .string "Hmmm… {STR_VAR_1} it is!\p" .string "This is a magnificent nickname!\n" .string "It is impeccably beyond reproach!\p" - .string "You’ll do well to cherish your\n" + .string "You'll do well to cherish your\n" .string "{STR_VAR_1} now and beyond.$" SlateportCity_House1_Text_209E74: @ 8209E74 diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc index 5946b6f43..1661d8fc5 100644 --- a/data/maps/SlateportCity_House2/scripts.inc +++ b/data/maps/SlateportCity_House2/scripts.inc @@ -17,7 +17,7 @@ SlateportCity_House2_Text_20D9C1: @ 820D9C1 .string "do with the stat gains of POKéMON.$" SlateportCity_House2_Text_20DA59: @ 820DA59 - .string "You’re a TRAINER, aren’t you?\p" + .string "You're a TRAINER, aren't you?\p" .string "Since you came to SLATEPORT CITY,\n" .string "you must be going to the BATTLE TENT.$" diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 33bcafc6f..3c777b184 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -248,14 +248,14 @@ SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026 .string "Please enjoy yourself.$" SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D - .string "Oh? I’m sorry, but you don’t seem to\n" + .string "Oh? I'm sorry, but you don't seem to\n" .string "have enough money.$" SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075 - .string "Oh? You’re with that group that\n" + .string "Oh? You're with that group that\n" .string "went in earlier?\p" - .string "You’re the only one who’s late.\n" - .string "You’d better go catch up to them!$" + .string "You're the only one who's late.\n" + .string "You'd better go catch up to them!$" SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8 .string "We, TEAM AQUA, exist for the good\n" @@ -264,7 +264,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8 SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112 .string "We were told to assemble here,\n" .string "so we did, but…\p" - .string "Our BOSS, the linchpin, isn’t here.$" + .string "Our BOSS, the linchpin, isn't here.$" SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165 .string "If I ripped off the stuff here,\n" @@ -275,11 +275,11 @@ SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C .string "nefarious deeds…$" SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4 - .string "If our goons didn’t bungle things\n" - .string "in RUSTBORO, we wouldn’t be here!$" + .string "If our goons didn't bungle things\n" + .string "in RUSTBORO, we wouldn't be here!$" SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218 - .string "I didn’t have Â¥50, so it took a long\n" + .string "I didn't have Â¥50, so it took a long\n" .string "time getting by the receptionist.$" SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F @@ -296,7 +296,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302 .string "The sea is vast without end, and\n" .string "infinitely deep…\p" .string "There must be many POKéMON that\n" - .string "we don’t know about.$" + .string "we don't know about.$" SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369 .string "I want a sea POKéMON.\p" @@ -306,7 +306,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369 SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB .string "Aiyeeeh!\n" .string "What are you doing here?\p" - .string "Me? I’m the TEAM AQUA member\n" + .string "Me? I'm the TEAM AQUA member\n" .string "you thumped before, remember?\l" .string "Back in RUSTURF TUNNEL?\p" .string "Here, take this!\n" @@ -332,10 +332,10 @@ SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547 .string "A red ball is bobbing up and down\n" .string "inside a glass vessel.\p" .string "“This is an experiment simulating a\n" - .string "WATERFALL using the ball’s buoyancy.â€$" + .string "WATERFALL using the ball's buoyancy.â€$" SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA - .string "It’s a sample of soil from the ocean\n" + .string "It's a sample of soil from the ocean\n" .string "floor.\p" .string "“Over many years, the remains of\n" .string "life-forms settle at the bottom of\l" @@ -344,7 +344,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA .string "ancient past is revealed.â€$" SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699 - .string "It’s a sample of beach sand.\p" + .string "It's a sample of beach sand.\p" .string "“Stones from mountains are washed\n" .string "down by rivers where they are\l" .string "chipped and ground down.\p" @@ -379,7 +379,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912 .string "the size of land.â€$" SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 - .string "It’s a fossil with wavy ridges on it.\p" + .string "It's a fossil with wavy ridges on it.\p" .string "“Soil on the ocean floor gets scoured\n" .string "by the tide.\p" .string "“The flowing seawater marks the soil\n" @@ -390,6 +390,6 @@ SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C .string "A strange machine is rotating under\n" .string "a glass dome.\p" - .string "Maybe it’s for measuring the depth\n" + .string "Maybe it's for measuring the depth\n" .string "of something…$" diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index b2a7ed510..040a76396 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -274,23 +274,23 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 end SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D - .string "Yes? If you’re looking for STERN,\n" + .string "Yes? If you're looking for STERN,\n" .string "that would be me.\p" .string "Ah! Those must be the parts I ordered\n" .string "from MR. STONE of DEVON.\p" - .string "Thank you! That’s great!\n" + .string "Thank you! That's great!\n" .string "We can prepare for our expedition now.$" SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40 .string "Hehehe, hold it!\n" - .string "We’ll take those parts!$" + .string "We'll take those parts!$" SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69 .string "CAPT. STERN: Wh-what?\n" .string "Who are you people?$" SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93 - .string "We’re TEAM AQUA!\p" + .string "We're TEAM AQUA!\p" .string "Our BOSS wants those parts!\n" .string "Shut your yap and fork them over!$" @@ -311,9 +311,9 @@ SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66 .string "I lost, too!$" SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A - .string "Now what? If we don’t get the parts,\n" - .string "we’re in for it!\p" - .string "Arrgh, I didn’t count on being meddled\n" + .string "Now what? If we don't get the parts,\n" + .string "we're in for it!\p" + .string "Arrgh, I didn't count on being meddled\n" .string "with by some meddling kid!$" SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2 @@ -324,33 +324,33 @@ SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2 SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059 .string "We are TEAM AQUA,\n" .string "and we love the sea!\p" - .string "And I am TEAM AQUA’s leader,\n" + .string "And I am TEAM AQUA's leader,\n" .string "ARCHIE!\p" .string "What makes you interfere with us?\p" - .string "…No! You can’t be!\n" - .string "You’re not one of TEAM MAGMA?\p" - .string "Wait, that can’t be right.\n" - .string "You’re not dressed for the part.\p" + .string "…No! You can't be!\n" + .string "You're not one of TEAM MAGMA?\p" + .string "Wait, that can't be right.\n" + .string "You're not dressed for the part.\p" .string "… … … … … …\n" .string "… … … … … …\p" .string "POKéMON, people… All life depends on\n" .string "the sea.\p" .string "So, TEAM AQUA is dedicated to\n" .string "the expansion of the sea.\p" - .string "Don’t you agree? What we are doing\n" + .string "Don't you agree? What we are doing\n" .string "is a magnificent undertaking.\p" .string "Ah, fine…\n" - .string "You’re still too young to understand\l" + .string "You're still too young to understand\l" .string "our noble objective.\p" - .string "But, I warn you, don’t even consider\n" + .string "But, I warn you, don't even consider\n" .string "interfering with our plans again.\p" .string "The consequences will cost you\n" .string "dearly!\p" - .string "And don’t you forget it!$" + .string "And don't you forget it!$" SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE - .string "CAPT. STERN: You’re…\n" - .string "Ah, okay, you’re {PLAYER}{KUN}…\p" + .string "CAPT. STERN: You're…\n" + .string "Ah, okay, you're {PLAYER}{KUN}…\p" .string "Anyway, that was a tense situation!\n" .string "Thank you for saving us!\p" .string "Oh, yes, I almost forgot that you\n" @@ -358,10 +358,10 @@ SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C .string "CAPT. STERN: Whoops!\n" - .string "There’s no time to lose!\p" + .string "There's no time to lose!\p" .string "We have to set out on our ocean-floor\n" .string "expedition really soon.\p" - .string "Thanks again, but now I’ve got\n" + .string "Thanks again, but now I've got\n" .string "to go!\p" .string "Feel free to wander around and check\n" .string "out our facilities, though.$" @@ -372,11 +372,11 @@ SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F .string "near DEWFORD TOWN…$" SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495 - .string "Don’t you dare run around inside\n" + .string "Don't you dare run around inside\n" .string "the MUSEUM!$" SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2 - .string "Wow, the submarine’s awesome!\n" + .string "Wow, the submarine's awesome!\n" .string "I want to go for a ride!$" SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9 @@ -404,25 +404,25 @@ SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6 SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7 .string "“MODEL OF HOENN REGIONâ€\p" - .string "It’s a miniature diorama of the\n" + .string "It's a miniature diorama of the\n" .string "HOENN region.\p" .string "Where is LITTLEROOT TOWN on this?$" SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F - .string "It’s a display on the flow of seawater.\p" + .string "It's a display on the flow of seawater.\p" .string "“Near the bottom of the sea, water\n" .string "flows due to differences in such\l" .string "factors as temperature and salinity.â€$" SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1 - .string "It’s a display on the flow of seawater.\p" + .string "It's a display on the flow of seawater.\p" .string "“Toward the surface, seawater flows\n" .string "as currents driven by the winds.â€$" SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F .string "“THE FERRY S.S. TIDAL\p" .string "“A scale replica of the ship under\n" - .string "construction at STERN’S SHIPYARD.â€$" + .string "construction at STERN'S SHIPYARD.â€$" SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B .string "“SUBMARINE EXPLORER 1\p" diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index bbc91609c..db8cc19d7 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -26,9 +26,9 @@ SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3 .string "Want a tip for battling?\p" - .string "I’d say it’s raising different kinds\n" + .string "I'd say it's raising different kinds\n" .string "of POKéMON in a balanced manner.\p" - .string "It’s no good to make just one\n" + .string "It's no good to make just one\n" .string "POKéMON strong.\p" .string "If it has a type disadvantage,\n" .string "it might not stand a chance.$" diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 0f97b0d86..154438ae2 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -289,9 +289,9 @@ SlateportCity_PokemonFanClub_Text_20A233: @ 820A233 .string "to raising POKéMON. No one!\p" .string "Well, let me tell you about\n" .string "POKéMON CONTESTS.\p" - .string "They’re events where one can show off\n" + .string "They're events where one can show off\n" .string "POKéMON for the world to see!\p" - .string "However, they’re held in far-off towns,\n" + .string "However, they're held in far-off towns,\n" .string "so I cannot participate often enough.\p" .string "That is why we gather here to show\n" .string "off our POKéMON, and have others\l" @@ -303,7 +303,7 @@ SlateportCity_PokemonFanClub_Text_20A3EE: @ 820A3EE .string "That, I would like to see.$" SlateportCity_PokemonFanClub_Text_20A445: @ 820A445 - .string "Er-hem! I see you’ve participated in\n" + .string "Er-hem! I see you've participated in\n" .string "a POKéMON CONTEST!\p" .string "Please! Allow me to examine how you\n" .string "have raised your POKéMON.\p" @@ -329,7 +329,7 @@ SlateportCity_PokemonFanClub_Text_20A65F: @ 820A65F .string "I see…$" SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E - .string "Hmmm… It’s not bad, but it’s not\n" + .string "Hmmm… It's not bad, but it's not\n" .string "good, either…\p" .string "You, the TRAINER, must put more\n" .string "effort into raising this POKéMON!\p" @@ -372,13 +372,13 @@ SlateportCity_PokemonFanClub_Text_20A933: @ 820A933 SlateportCity_PokemonFanClub_Text_20A984: @ 820A984 .string "Let a POKéMON hold that YELLOW SCARF.\p" - .string "It will bolster your POKéMON’s\n" + .string "It will bolster your POKéMON's\n" .string "toughness so much more!$" SlateportCity_PokemonFanClub_Text_20A9E1: @ 820A9E1 - .string "I’m sorry, but I’ve nothing else to\n" + .string "I'm sorry, but I've nothing else to\n" .string "give you! None at all!\p" - .string "After all, you’re blessed with the gift\n" + .string "After all, you're blessed with the gift\n" .string "of raising POKéMON without resorting\l" .string "to any items!$" @@ -388,7 +388,7 @@ SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77 .string "POKéMON are very sensitive to\n" .string "the feelings of their TRAINERS.\p" .string "If you treat your POKéMON with love\n" - .string "and care, they’ll love you back.\p" + .string "and care, they'll love you back.\p" .string "When your POKéMON grow to love you,\n" .string "please come show me.$" @@ -401,14 +401,14 @@ SlateportCity_PokemonFanClub_Text_20ABC4: @ 820ABC4 .string "POKéMON are very sensitive to\n" .string "the feelings of their TRAINERS.\p" .string "If you treat your POKéMON with love\n" - .string "and care, they’ll love you back.$" + .string "and care, they'll love you back.$" SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47 .string "If you keep letting a POKéMON faint\n" - .string "in battle, it’ll come to resent it.\p" + .string "in battle, it'll come to resent it.\p" .string "Soon, it will become less trusting\n" .string "of the TRAINER.\p" - .string "In other words, it certainly won’t\n" + .string "In other words, it certainly won't\n" .string "like you very much.$" SlateportCity_PokemonFanClub_Text_20ACF9: @ 820ACF9 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 05e378c7e..82138168c 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -71,18 +71,18 @@ SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 .string "goes over there…\p" .string "Then where does this thing go?\n" .string "And what about that doohickey?\p" - .string "Aaargh! I can’t make heads or tails\n" + .string "Aaargh! I can't make heads or tails\n" .string "of this!$" SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5 .string "Hm?\n" - .string "Hi, I’m DOCK.\p" + .string "Hi, I'm DOCK.\p" .string "CAPT. STERN commissioned me to\n" .string "design a ferry.\p" .string "Oh! That there…\n" .string "Are they DEVON GOODS?\p" .string "But, hmm…\n" - .string "This won’t do…\p" + .string "This won't do…\p" .string "CAPT. STERN went off somewhere.\n" .string "He said he had some work to do.\p" .string "Could I get you to go find CAPT.\n" @@ -96,13 +96,13 @@ SlateportCity_SternsShipyard_1F_Text_2081A5: @ 82081A5 SlateportCity_SternsShipyard_1F_Text_208213: @ 8208213 .string "DOCK: Shipbuilding is an art.\p" - .string "A lot of things can’t be figured out\n" + .string "A lot of things can't be figured out\n" .string "just by calculating.\p" .string "I really could use advice from a veteran\n" .string "who knows the seas…$" SlateportCity_SternsShipyard_1F_Text_2082A8: @ 82082A8 - .string "DOCK: Hi! MR. BRINEY’s joined us to\n" + .string "DOCK: Hi! MR. BRINEY's joined us to\n" .string "lend us his help.\p" .string "Thanks to the veteran sailor, the\n" .string "ferry is steadily coming together.$" @@ -113,22 +113,22 @@ SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323 .string "of technology!\p" .string "But, I get the feeling that we can\n" .string "make something even better.\p" - .string "You know, there’s never an end to\n" - .string "technology’s march.$" + .string "You know, there's never an end to\n" + .string "technology's march.$" SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" - .string "It’s been too long!\p" - .string "Aye, since I met you, this old sea dog’s\n" + .string "It's been too long!\p" + .string "Aye, since I met you, this old sea dog's\n" .string "been feeling frisky!\p" - .string "So I’ve decided to help DOCK make\n" + .string "So I've decided to help DOCK make\n" .string "a ferry.\p" .string "Aye, after all, a ferry would be able\n" .string "to carry a lot of people.\p" .string "But, you know, that DOCK is really\n" .string "something special.\p" .string "With his knack for technology and\n" - .string "my experience, I’m sure that we can\l" + .string "my experience, I'm sure that we can\l" .string "build one great ship, aye!$" SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558 @@ -136,7 +136,7 @@ SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558 .string "the moon sits in the sky…\p" .string "These and other conditions make\n" .string "the sea change its expression.\p" - .string "That’s right!\n" + .string "That's right!\n" .string "The sea is like a living thing!$" SlateportCity_SternsShipyard_1F_Text_2085FF: @ 82085FF diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc index eed3804f8..6fa410dfe 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc @@ -15,7 +15,7 @@ SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650 .string "together a transportation vehicle.$" SlateportCity_SternsShipyard_2F_Text_2086BA: @ 82086BA - .string "Don’t you think it’s strange that\n" + .string "Don't you think it's strange that\n" .string "a ship made of heavy iron floats?\p" .string "It floats because of a principle\n" .string "called buoyancy.$" diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index b3411a9c2..de6ca59db 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1485,10 +1485,10 @@ SootopolisCity_Text_1E6618: @ 81E6618 SootopolisCity_Text_1E6692: @ 81E6692 .string "These giant POKéMON suddenly appeared\n" .string "in the middle of the city!\p" - .string "And, I’ve never seen them before!\p" + .string "And, I've never seen them before!\p" .string "Why are they smashing into each\n" .string "other like that?\p" - .string "Why can’t they be friends, those\n" + .string "Why can't they be friends, those\n" .string "POKéMON?$" SootopolisCity_Text_1E6750: @ 81E6750 @@ -1503,8 +1503,8 @@ SootopolisCity_Text_1E677F: @ 81E677F SootopolisCity_Text_1E67DC: @ 81E67DC .string "I just get this sense somehow that\n" - .string "the two POKéMON aren’t angry.\p" - .string "I think… They probably can’t control\n" + .string "the two POKéMON aren't angry.\p" + .string "I think… They probably can't control\n" .string "their own power…$" SootopolisCity_Text_1E6853: @ 81E6853 @@ -1513,7 +1513,7 @@ SootopolisCity_Text_1E6853: @ 81E6853 .string "POKéMON…$" SootopolisCity_Text_1E68A1: @ 81E68A1 - .string "I… I’ve never been out of this city.\p" + .string "I… I've never been out of this city.\p" .string "I wonder what the world is like on\n" .string "the other side of this round sky?$" @@ -1527,7 +1527,7 @@ SootopolisCity_Text_1E6920: @ 81E6920 SootopolisCity_Text_1E6936: @ 81E6936 .string "Go for it, red POKéMON!\n" - .string "Don’t back off, blue POKéMON!$" + .string "Don't back off, blue POKéMON!$" SootopolisCity_Text_1E696C: @ 81E696C .string "… … … … … …\p" @@ -1537,20 +1537,20 @@ SootopolisCity_Text_1E696C: @ 81E696C SootopolisCity_Text_1E69B8: @ 81E69B8 .string "I was wondering which one would win,\n" .string "the red one or the blue one, but, oh no,\l" - .string "it’s the green one that settles things!\p" + .string "it's the green one that settles things!\p" .string "Talk about a huge turn of events!$" SootopolisCity_Text_1E6A50: @ 81E6A50 - .string "There’s an ancient legend that claims\n" + .string "There's an ancient legend that claims\n" .string "the land and sea were shaped by\l" .string "a colossal battle between POKéMON.\p" - .string "Well, I’m seeing that happen with\n" + .string "Well, I'm seeing that happen with\n" .string "my very own eyes!\p" .string "Whoa! I never expected to be\n" .string "witness to something this huge!$" SootopolisCity_Text_1E6B2A: @ 81E6B2A - .string "There’s an ancient legend that claims\n" + .string "There's an ancient legend that claims\n" .string "the land and sea were shaped by\l" .string "a colossal battle between POKéMON.\p" .string "Well, I saw that happen with\n" @@ -1572,13 +1572,13 @@ SootopolisCity_Text_1E6C7C: @ 81E6C7C .string "SOOTOPOLIS CITY will get wrecked!$" SootopolisCity_Text_1E6CA6: @ 81E6CA6 - .string "SOOTOPOLIS CITY didn’t get wrecked!$" + .string "SOOTOPOLIS CITY didn't get wrecked!$" SootopolisCity_Text_1E6CCA: @ 81E6CCA .string "Hm!\n" - .string "You’ve come all the way to SOOTOPOLIS?\l" - .string "You’re no ordinary tourist.\p" - .string "But I suppose that doesn’t make you\n" + .string "You've come all the way to SOOTOPOLIS?\l" + .string "You're no ordinary tourist.\p" + .string "But I suppose that doesn't make you\n" .string "an extraordinary tourist, either.$" SootopolisCity_Text_1E6D57: @ 81E6D57 @@ -1617,12 +1617,12 @@ SootopolisCity_Text_1E6F90: @ 81E6F90 .string "If you look up at the sky, the lip of\n" .string "the crater is also visible.\l" .string "So, all you see is the sky in a circle.\p" - .string "But that’s what makes the sky above\n" + .string "But that's what makes the sky above\n" .string "SOOTOPOLIS the most beautiful.$" SootopolisCity_Text_1E7078: @ 81E7078 .string "When two POKéMON that gigantic\n" - .string "are fighting that savagely, there’s\l" + .string "are fighting that savagely, there's\l" .string "not much that we can do.$" SootopolisCity_Text_1E70D4: @ 81E70D4 @@ -1634,7 +1634,7 @@ SootopolisCity_Text_1E710B: @ 81E710B .string "the crater of a volcano…\p" .string "And in that ring, stars flicker and\n" .string "blink as if they were alive…\l" - .string "It’s my favorite scenery.$" + .string "It's my favorite scenery.$" SootopolisCity_Text_1E71A1: @ 81E71A1 .string "The weather was clear this morning,\n" @@ -1651,33 +1651,33 @@ SootopolisCity_Text_1E728C: @ 81E728C .string "Oh?\p" .string "It was you who brought that flying\n" .string "POKéMON here?\p" - .string "Well, aren’t you amazing!$" + .string "Well, aren't you amazing!$" SootopolisCity_Text_1E72DB: @ 81E72DB .string "MAXIE: G… GROUDON…\n" - .string "Please! Stop what you’re doing!\p" + .string "Please! Stop what you're doing!\p" .string "I know the extent of your power now!\p" .string "If you keep going, all HOENN, not just\n" .string "SOOTOPOLIS, will be utterly ruined!$" SootopolisCity_Text_1E737E: @ 81E737E .string "MAXIE: So the super-ancient POKéMON\n" - .string "weren’t only GROUDON and KYOGRE…\p" + .string "weren't only GROUDON and KYOGRE…\p" .string "After all our fruitless scheming and\n" - .string "frantic efforts, that one POKéMON’s\l" + .string "frantic efforts, that one POKéMON's\l" .string "simple action puts everything right\l" .string "again as if nothing had happened…\p" .string "Fu…\n" .string "Fuhahaha…$" SootopolisCity_Text_1E7460: @ 81E7460 - .string "ARCHIE: KYOGRE! What’s wrong?!\n" - .string "Look over here! It’s the RED ORB!\l" + .string "ARCHIE: KYOGRE! What's wrong?!\n" + .string "Look over here! It's the RED ORB!\l" .string "Calm down! KYOGRE!\p" .string "… … … … … …\n" .string "… … … … … …\p" - .string "It’s no good!\n" - .string "It’s not responding at all!$" + .string "It's no good!\n" + .string "It's not responding at all!$" SootopolisCity_Text_1E74F6: @ 81E74F6 .string "ARCHIE: KYOGRE and GROUDON both\n" @@ -1698,67 +1698,67 @@ SootopolisCity_Text_1E75CB: @ 81E75CB .string "And now they are smashing each other\n" .string "with their uncontrollable energy…\p" .string "…{PLAYER}{KUN}.\p" - .string "You being here now I’ll take to mean\n" - .string "that you’re prepared to become\l" + .string "You being here now I'll take to mean\n" + .string "that you're prepared to become\l" .string "involved in this crisis.\p" - .string "Well, then, there’s someone that\n" - .string "I’d like you to meet.\p" + .string "Well, then, there's someone that\n" + .string "I'd like you to meet.\p" .string "Come with me, please.$" SootopolisCity_Text_1E7737: @ 81E7737 .string "STEVEN: Listen, {PLAYER}{KUN}.\p" .string "Does seeing GROUDON and KYOGRE make\n" .string "you think POKéMON are to be feared?\p" - .string "But that’s not true.\n" + .string "But that's not true.\n" .string "POKéMON are really more…\p" .string "…Why am I asking you this?\n" .string "You already know.$" SootopolisCity_Text_1E77F0: @ 81E77F0 .string "STEVEN: Okay, here we are!\p" - .string "Inside here you’ll find someone named\n" + .string "Inside here you'll find someone named\n" .string "WALLACE.\p" - .string "I think you have what’s needed to\n" + .string "I think you have what's needed to\n" .string "help him…$" SootopolisCity_Text_1E7866: @ 81E7866 - .string "STEVEN: I think you have what’s\n" + .string "STEVEN: I think you have what's\n" .string "needed to help him…$" SootopolisCity_Text_1E789A: @ 81E789A .string "STEVEN: The SKY PILLAR…\p" - .string "I’ve never been there.\n" + .string "I've never been there.\n" .string "I wonder where it could be?$" SootopolisCity_Text_1E78E5: @ 81E78E5 - .string "STEVEN: So that’s RAYQUAZA…\p" - .string "It’s incredible how the two rampaging\n" + .string "STEVEN: So that's RAYQUAZA…\p" + .string "It's incredible how the two rampaging\n" .string "POKéMON would flee from it in fear…$" SootopolisCity_Text_1E794B: @ 81E794B .string "STEVEN: It looks like both MAXIE and\n" .string "ARCHIE have gone away somewhere.\p" - .string "Perhaps they’ve gone to MT. PYRE to\n" + .string "Perhaps they've gone to MT. PYRE to\n" .string "return those ORBS…$" SootopolisCity_Text_1E79C8: @ 81E79C8 .string "WALLACE: Oh?\n" .string "{PLAYER}{KUN}?\p" - .string "Haven’t you scaled the SKY PILLAR\n" + .string "Haven't you scaled the SKY PILLAR\n" .string "yet?\p" - .string "I’m sure that you can make it to\n" + .string "I'm sure that you can make it to\n" .string "the top of the SKY PILLAR…$" SootopolisCity_Text_1E7A3E: @ 81E7A3E .string "WALLACE: {PLAYER}{KUN}…\p" .string "The leaders of TEAM MAGMA and AQUA,\n" - .string "I don’t think they meant harm.\p" - .string "It wouldn’t hurt to hear what they\n" + .string "I don't think they meant harm.\p" + .string "It wouldn't hurt to hear what they\n" .string "have to say for themselves.$" SootopolisCity_Text_1E7ACF: @ 81E7ACF .string "WALLACE: {PLAYER}{KUN}…\n" - .string "My eyes didn’t deceive me.\p" + .string "My eyes didn't deceive me.\p" .string "Thanks to your help, SOOTOPOLIS…\n" .string "No, all of HOENN was saved.\p" .string "On behalf of the people, I thank you.\p" @@ -1772,13 +1772,13 @@ SootopolisCity_Text_1E7B86: @ 81E7B86 .string "that has learned that HM move can\l" .string "force its way up waterfalls.\p" .string "And where does one get the RAIN BADGE?\n" - .string "You know, don’t you?\p" - .string "That’s right! You have to beat\n" + .string "You know, don't you?\p" + .string "That's right! You have to beat\n" .string "the SOOTOPOLIS GYM LEADER.\p" - .string "When you’re all set to go, step through\n" + .string "When you're all set to go, step through\n" .string "that door.$" SootopolisCity_Text_1E7CBC: @ 81E7CBC - .string "WALLACE: I’m sure that you will be\n" - .string "dazzled by my mentor’s breathtakingly\l" + .string "WALLACE: I'm sure that you will be\n" + .string "dazzled by my mentor's breathtakingly\l" .string "elegant battle style.$" diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index b04243b90..570f936b5 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -190,22 +190,22 @@ SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 end SootopolisCity_Gym_1F_Text_225093: @ 8225093 - .string "Yo! How’s it going, CHAMPION-\n" + .string "Yo! How's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" - .string "SOOTOPOLIS’s GYM LEADER JUAN is\n" + .string "SOOTOPOLIS's GYM LEADER JUAN is\n" .string "a master of WATER-type POKéMON.\p" .string "And, to get to JUAN, an icy floor\n" .string "will hamper your progress…\p" - .string "Listen, I’m sorry, but that’s all the\n" + .string "Listen, I'm sorry, but that's all the\n" .string "advice that I have for you.\p" .string "The rest of the way, you have to\n" .string "go for it yourself!$" SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF - .string "Yow! You’ve beaten even JUAN, who\n" + .string "Yow! You've beaten even JUAN, who\n" .string "was supposedly the best in all HOENN!\p" .string "Okay! Check out your TRAINER CARD.\p" - .string "If you’ve gotten all the BADGES, you’re\n" + .string "If you've gotten all the BADGES, you're\n" .string "set for the POKéMON LEAGUE challenge!$" SootopolisCity_Gym_1F_Text_225268: @ 8225268 @@ -289,7 +289,7 @@ SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA SootopolisCity_Gym_1F_Text_225916: @ 8225916 .string "SOOTOPOLIS CITY POKéMON GYM\p" - .string "JUAN’S CERTIFIED TRAINERS:\n" + .string "JUAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" SootopolisCity_Gym_1F_Text_225950: @ 8225950 diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 33840b427..0f402b930 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -52,7 +52,7 @@ SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A end SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 - .string "I’ll show you the sublime techniques\n" + .string "I'll show you the sublime techniques\n" .string "I learned from our LEADER JUAN!$" SootopolisCity_Gym_B1F_Text_225DB6: @ 8225DB6 @@ -63,12 +63,12 @@ SootopolisCity_Gym_B1F_Text_225DCF: @ 8225DCF .string "the floor tiles.$" SootopolisCity_Gym_B1F_Text_225E04: @ 8225E04 - .string "You came all the way here, but you won’t\n" + .string "You came all the way here, but you won't\n" .string "get to see JUAN.\p" - .string "Not if you lose to me, you won’t!$" + .string "Not if you lose to me, you won't!$" SootopolisCity_Gym_B1F_Text_225E60: @ 8225E60 - .string "You’re strong!\n" + .string "You're strong!\n" .string "I was fooled by your cute looks!$" SootopolisCity_Gym_B1F_Text_225E90: @ 8225E90 @@ -88,7 +88,7 @@ SootopolisCity_Gym_B1F_Text_225F35: @ 8225F35 SootopolisCity_Gym_B1F_Text_225F67: @ 8225F67 .string "The grace you bring to battle is\n" .string "fabulous.\p" - .string "Oh… I’m so fortunate to have found\n" + .string "Oh… I'm so fortunate to have found\n" .string "POKéMON.$" SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE @@ -97,17 +97,17 @@ SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE SootopolisCity_Gym_B1F_Text_225FEB: @ 8225FEB .string "Oh.\n" - .string "You’re strong.$" + .string "You're strong.$" SootopolisCity_Gym_B1F_Text_225FFE: @ 8225FFE - .string "I’ll tell you something good.\p" + .string "I'll tell you something good.\p" .string "If you want to reach JUAN, you\n" .string "need to walk on each floor tile once.$" SootopolisCity_Gym_B1F_Text_226061: @ 8226061 .string "The POKéMON GYM of the highest level\n" .string "in the HOENN region…\p" - .string "That’s the SOOTOPOLIS GYM.$" + .string "That's the SOOTOPOLIS GYM.$" SootopolisCity_Gym_B1F_Text_2260B6: @ 82260B6 .string "What a high level you are!$" @@ -121,14 +121,14 @@ SootopolisCity_Gym_B1F_Text_2260D1: @ 82260D1 SootopolisCity_Gym_B1F_Text_226164: @ 8226164 .string "I train my POKéMON together with\n" .string "JUAN.\p" - .string "Don’t think I’m a pushover.$" + .string "Don't think I'm a pushover.$" SootopolisCity_Gym_B1F_Text_2261A7: @ 82261A7 .string "I was beaten…$" SootopolisCity_Gym_B1F_Text_2261B5: @ 82261B5 .string "I think you have potential.\n" - .string "Why don’t you stay and train with us?$" + .string "Why don't you stay and train with us?$" SootopolisCity_Gym_B1F_Text_2261F7: @ 82261F7 .string "A graceful glide across the ice while\n" @@ -145,7 +145,7 @@ SootopolisCity_Gym_B1F_Text_226286: @ 8226286 .string "with how young or old you are.$" SootopolisCity_Gym_B1F_Text_2262F3: @ 82262F3 - .string "When I’m with my POKéMON, the time\n" + .string "When I'm with my POKéMON, the time\n" .string "flies by before you can say, “Oops!â€$" SootopolisCity_Gym_B1F_Text_22633B: @ 822633B @@ -157,7 +157,7 @@ SootopolisCity_Gym_B1F_Text_226341: @ 8226341 SootopolisCity_Gym_B1F_Text_226388: @ 8226388 .string "I can battle with really rare POKéMON\n" - .string "if you’d like.$" + .string "if you'd like.$" SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD .string "Oh, there now! Did you have a good look\n" @@ -166,7 +166,7 @@ SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD SootopolisCity_Gym_B1F_Text_2263F4: @ 82263F4 .string "I came to this GYM because JUAN\n" .string "praised me for my darling POKéMON.\p" - .string "Oh, if only I’d met JUAN years ago\n" + .string "Oh, if only I'd met JUAN years ago\n" .string "when I was younger…$" SootopolisCity_Gym_B1F_Text_22646E: @ 822646E @@ -178,6 +178,6 @@ SootopolisCity_Gym_B1F_Text_226495: @ 8226495 .string "I went much too easy on you.$" SootopolisCity_Gym_B1F_Text_2264BC: @ 82264BC - .string "You couldn’t lay a finger on JUAN,\n" - .string "I’m sure. Giggle…$" + .string "You couldn't lay a finger on JUAN,\n" + .string "I'm sure. Giggle…$" diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index c23b90bb3..3a41c70eb 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -31,14 +31,14 @@ SootopolisCity_House1_EventScript_22698E:: @ 822698E end SootopolisCity_House1_Text_2269A1: @ 82269A1 - .string "For thirty years I’ve remained in\n" + .string "For thirty years I've remained in\n" .string "SOOTOPOLIS honing my skills.\p" .string "I developed a shattering TM.\n" .string "I bequeath it to you!$" SootopolisCity_House1_Text_226A13: @ 8226A13 - .string "TM31 contains BRICK BREAK! It’s a move\n" - .string "so horrible that I can’t describe it.$" + .string "TM31 contains BRICK BREAK! It's a move\n" + .string "so horrible that I can't describe it.$" SootopolisCity_House1_Text_226A60: @ 8226A60 .string "KECLEON: Puu puhyaah.$" diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index 90c9ab155..ec8ad87ed 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -21,8 +21,8 @@ SootopolisCity_House3_EventScript_226B9B:: @ 8226B9B end SootopolisCity_House3_Text_226BA4: @ 8226BA4 - .string "You’re a POKéMON TRAINER, aren’t you?\p" - .string "SOOTOPOLIS’s JUAN has many fans.\n" + .string "You're a POKéMON TRAINER, aren't you?\p" + .string "SOOTOPOLIS's JUAN has many fans.\n" .string "Even more than his student WALLACE!\p" .string "Do you have any?$" @@ -31,7 +31,7 @@ SootopolisCity_House3_Text_226C20: @ 8226C20 SootopolisCity_House3_Text_226C44: @ 8226C44 .string "Oh, dear…\n" - .string "That’s a little lonesome.\p" + .string "That's a little lonesome.\p" .string "Try working a little harder to get\n" .string "a fan following.$" diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc index d92df9be2..a8aa58548 100644 --- a/data/maps/SootopolisCity_House4/scripts.inc +++ b/data/maps/SootopolisCity_House4/scripts.inc @@ -20,9 +20,9 @@ SootopolisCity_House4_EventScript_226D28:: @ 8226D28 end SootopolisCity_House4_Text_226D3B: @ 8226D3B - .string "Listen up, and I’ll tell you something\n" + .string "Listen up, and I'll tell you something\n" .string "good.\p" - .string "There’s supposed to be an ancient\n" + .string "There's supposed to be an ancient\n" .string "ruin in the sea around here.\p" .string "There could be treasures just waiting\n" .string "to be discovered down there.$" @@ -30,7 +30,7 @@ SootopolisCity_House4_Text_226D3B: @ 8226D3B SootopolisCity_House4_Text_226DEA: @ 8226DEA .string "Ancient treasures…\p" .string "It would be nice if they existed, but\n" - .string "even if they didn’t, it would be so\l" + .string "even if they didn't, it would be so\l" .string "beautiful to take an underwater\l" .string "stroll with my POKéMON.$" diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 3341ad1c1..dbdb1cbae 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -35,9 +35,9 @@ SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD end SootopolisCity_House6_Text_226FC3: @ 8226FC3 - .string "Hello! You’re our first guest in\n" + .string "Hello! You're our first guest in\n" .string "a good while.\p" - .string "You’ve brightened up my day, so I’ll\n" + .string "You've brightened up my day, so I'll\n" .string "give you a big WAILMER DOLL.$" SootopolisCity_House6_Text_227034: @ 8227034 @@ -45,11 +45,11 @@ SootopolisCity_House6_Text_227034: @ 8227034 SootopolisCity_House6_Text_22704A: @ 822704A .string "Oh, you want it, but not right now?\n" - .string "Okay, then I’ll hold it for you.$" + .string "Okay, then I'll hold it for you.$" SootopolisCity_House6_Text_22708F: @ 822708F .string "Are you sure?\n" - .string "You don’t want this DOLL?$" + .string "You don't want this DOLL?$" SootopolisCity_House6_Text_2270B7: @ 82270B7 .string "I love plush DOLLS!$" diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc index e679e5cd5..eac8ef346 100644 --- a/data/maps/SootopolisCity_House7/scripts.inc +++ b/data/maps/SootopolisCity_House7/scripts.inc @@ -14,7 +14,7 @@ SootopolisCity_House7_Text_2270DE: @ 82270DE .string "forced itself up from the depths.\p" .string "Its crater emerged from the sea and\n" .string "became filled with rainwater.\p" - .string "That’s how SOOTOPOLIS CITY came into\n" + .string "That's how SOOTOPOLIS CITY came into\n" .string "being.$" SootopolisCity_House7_Text_227190: @ 8227190 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index 3acf88c12..b8e037ce3 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -115,12 +115,12 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22735B:: @ 822735B SootopolisCity_LotadAndSeedotHouse_Text_227369: @ 8227369 .string "Do you know the POKéMON SEEDOT?\n" - .string "It’s hardly ever seen in SOOTOPOLIS.\p" + .string "It's hardly ever seen in SOOTOPOLIS.\p" .string "Anyway, I love big SEEDOT.\n" .string "The bigger the better.\p" .string "But my younger brother, he says that\n" .string "LOTAD is bigger.\p" - .string "That’s silly.\n" + .string "That's silly.\n" .string "SEEDOT has to be bigger than that!\p" .string "Huh? Do you have a SEEDOT with you?\n" .string "P-p-please, show me!$" @@ -142,32 +142,32 @@ SootopolisCity_LotadAndSeedotHouse_Text_227524: @ 8227524 SootopolisCity_LotadAndSeedotHouse_Text_227544: @ 8227544 .string "{STR_VAR_2} inches, is it?\p" - .string "Hmm… I’ve seen a bigger SEEDOT\n" + .string "Hmm… I've seen a bigger SEEDOT\n" .string "than this one.$" SootopolisCity_LotadAndSeedotHouse_Text_227584: @ 8227584 .string "Oh, now this is quite something…\n" - .string "But it’s not a SEEDOT!$" + .string "But it's not a SEEDOT!$" SootopolisCity_LotadAndSeedotHouse_Text_2275BC: @ 82275BC - .string "You don’t have a big SEEDOT?\n" - .string "That’s too bad…\p" + .string "You don't have a big SEEDOT?\n" + .string "That's too bad…\p" .string "If you get a big SEEDOT, please\n" .string "come show me.$" SootopolisCity_LotadAndSeedotHouse_Text_227617: @ 8227617 .string "The biggest SEEDOT in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch giant!\p" + .string "{STR_VAR_2}'s {STR_VAR_3}-inch giant!\p" .string "A SEEDOT bigger than a LOTAD\n" .string "always wanted!$" SootopolisCity_LotadAndSeedotHouse_Text_227676: @ 8227676 .string "Do you know the POKéMON LOTAD?\n" - .string "It’s rarely seen in SOOTOPOLIS.\p" + .string "It's rarely seen in SOOTOPOLIS.\p" .string "I love, I mean love, big LOTAD!\p" .string "My big brother says that SEEDOT is\n" .string "bigger.\p" - .string "But that’s wrong! Everyone knows that\n" + .string "But that's wrong! Everyone knows that\n" .string "LOTAD is a lot bigger.\p" .string "Hunh? Do you have a LOTAD?\n" .string "P-p-please show me!$" @@ -189,22 +189,22 @@ SootopolisCity_LotadAndSeedotHouse_Text_22780A: @ 822780A SootopolisCity_LotadAndSeedotHouse_Text_22782A: @ 822782A .string "{STR_VAR_2} inches?\p" - .string "Hmm… I’ve seen a bigger LOTAD\n" + .string "Hmm… I've seen a bigger LOTAD\n" .string "than this one here.$" SootopolisCity_LotadAndSeedotHouse_Text_227867: @ 8227867 - .string "Well, isn’t this something!\n" - .string "But it’s no LOTAD!$" + .string "Well, isn't this something!\n" + .string "But it's no LOTAD!$" SootopolisCity_LotadAndSeedotHouse_Text_227896: @ 8227896 - .string "Don’t you have a big LOTAD?\n" + .string "Don't you have a big LOTAD?\n" .string "How disappointing…\p" .string "If you get a big LOTAD, please\n" .string "come show me!$" SootopolisCity_LotadAndSeedotHouse_Text_2278F2: @ 82278F2 .string "The biggest LOTAD in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!\p" + .string "{STR_VAR_2}'s {STR_VAR_3}-inch colossus!\p" .string "A LOTAD bigger than a SEEDOT\n" .string "always wanted!$" diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index b6d713930..6e71ce5e8 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -65,14 +65,14 @@ SootopolisCity_Mart_Text_226816: @ 8226816 SootopolisCity_Mart_Text_22685D: @ 822685D .string "What…\n" .string "What is happening?\p" - .string "I really want to know, but it’s too\n" + .string "I really want to know, but it's too\n" .string "scary to go outside.$" SootopolisCity_Mart_Text_2268AF: @ 82268AF .string "Do you know FULL RESTORE?\p" .string "Full restoration of HP!\n" .string "Eradication of all status problems!\p" - .string "It’s truly an item of your dreams!$" + .string "It's truly an item of your dreams!$" SootopolisCity_Mart_Text_226928: @ 8226928 .string "This weather…\n" diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index f24af7785..a2073d3f7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -182,7 +182,7 @@ SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43 SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46 .string "When I was young, I traveled the world\n" .string "as a POKéMON TRAINER.\p" - .string "Now that I’ve become an old buzzard,\n" + .string "Now that I've become an old buzzard,\n" .string "my only amusement is watching young\l" .string "TRAINERS battle.$" @@ -196,12 +196,12 @@ SootopolisCity_MysteryEventsHouse_1F_Text_227BFC: @ 8227BFC .string "{STR_VAR_1}?$" SootopolisCity_MysteryEventsHouse_1F_Text_227C44: @ 8227C44 - .string "You won’t battle? I’m disappointed\n" - .string "that I can’t see you battle…$" + .string "You won't battle? I'm disappointed\n" + .string "that I can't see you battle…$" SootopolisCity_MysteryEventsHouse_1F_Text_227C84: @ 8227C84 .string "Oh, good, good!\p" - .string "But my house isn’t all that sturdy.\p" + .string "But my house isn't all that sturdy.\p" .string "Could I ask you to keep it down to\n" .string "a 3-on-3 match?$" diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 5c5f63dd3..a4850b9f8 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -50,15 +50,15 @@ SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558 SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562 .string "WALLACE is rumored to be the toughest\n" .string "TRAINER in the whole HOENN region.\p" - .string "This town’s GYM is led by the TRAINER\n" + .string "This town's GYM is led by the TRAINER\n" .string "who taught WALLACE.\p" - .string "But the ELITE FOUR… They’re said to be\n" - .string "even stronger than WALLACE’s mentor.\p" + .string "But the ELITE FOUR… They're said to be\n" + .string "even stronger than WALLACE's mentor.\p" .string "How strong could they be?$" SootopolisCity_PokemonCenter_1F_Text_22664B: @ 822664B .string "Everyone in town has taken refuge\n" - .string "and won’t come out of their homes.\p" + .string "and won't come out of their homes.\p" .string "Even I would rather not venture\n" .string "outside.$" @@ -66,9 +66,9 @@ SootopolisCity_PokemonCenter_1F_Text_2266B9: @ 82266B9 .string "Whenever, wherever, and whatever\n" .string "happens, I will always be friends with\l" .string "POKéMON.\p" - .string "Because it’s fun to be with POKéMON!$" + .string "Because it's fun to be with POKéMON!$" SootopolisCity_PokemonCenter_1F_Text_22672F: @ 822672F - .string "Aren’t POKéMON our friends?\p" + .string "Aren't POKéMON our friends?\p" .string "Why are they going wild this way?$" diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index e85d50a04..c75c22be2 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -318,7 +318,7 @@ TrainerHill_Entrance_Text_268430: @ 8268430 .string "This is the TRAINER HILL where\n" .string "you may enjoy tag battles with many\l" .string "TRAINERS.\p" - .string "Unfortunately, we’re still getting\n" + .string "Unfortunately, we're still getting\n" .string "things ready. Please come back later!$" TrainerHill_Entrance_Text_2684C6: @ 82684C6 @@ -333,12 +333,12 @@ TrainerHill_Entrance_Text_26851C: @ 826851C .string "your game.$" TrainerHill_Entrance_Text_268564: @ 8268564 - .string "Let’s see…\n" + .string "Let's see…\n" .string "The TRAINERS here now are…\p" .string "Up to floor no. {STR_VAR_1}.$" TrainerHill_Entrance_Text_26859E: @ 826859E - .string "Let’s see…\n" + .string "Let's see…\n" .string "The TRAINERS here now are…\p" .string "There appear to be TRAINERS gathered\n" .string "in every room.$" @@ -371,7 +371,7 @@ TrainerHill_Entrance_Text_268712: @ 8268712 .string "the movement can be hectic.\p" .string "To avoid the stampede, we moved\n" .string "the reception counter here.\p" - .string "I’m sorry for the inconvenience.$" + .string "I'm sorry for the inconvenience.$" TrainerHill_Entrance_Text_2687AC: @ 82687AC .string "Thank you for playing!$" @@ -390,7 +390,7 @@ TrainerHill_Entrance_Text_2687C3: @ 82687C3 .string "be awarded.$" TrainerHill_Entrance_Text_26890D: @ 826890D - .string "Oh, I’m sorry, but you appear to have\n" + .string "Oh, I'm sorry, but you appear to have\n" .string "only one POKéMON with you.\p" .string "You will need at least two POKéMON\n" .string "to enter this event.$" @@ -399,7 +399,7 @@ TrainerHill_Roof_Text_268986: @ 8268986 .string "Hm! Hm!\p" .string "You finally came!\n" .string "Yes, you have arrived!\p" - .string "Wait! Don’t say it!\n" + .string "Wait! Don't say it!\n" .string "I know why you came all the way\l" .string "here by yourself!\p" .string "You wanted to see me, the owner\n" @@ -407,7 +407,7 @@ TrainerHill_Roof_Text_268986: @ 8268986 .string "You want to form a tag team with me!\n" .string "Wa-hoo!\p" .string "…Uh?\n" - .string "That’s not it?\p" + .string "That's not it?\p" .string "Anyway, I watched you on your way up.\n" .string "Marvelous battling! Bravo, indeed!$" @@ -417,19 +417,19 @@ TrainerHill_Roof_Text_268AC5: @ 8268AC5 TrainerHill_Roof_Text_268B07: @ 8268B07 .string "Oh, no, full up with things!\n" - .string "You’ll be back later for this!$" + .string "You'll be back later for this!$" TrainerHill_Roof_Text_268B43: @ 8268B43 .string "Oh, hold on here! Did you possibly get\n" .string "here marvelously quickly?\p" - .string "How splendid! You needn’t have\n" + .string "How splendid! You needn't have\n" .string "hurried so to see me!\p" - .string "That is so delightful. I’ll have the Time\n" + .string "That is so delightful. I'll have the Time\n" .string "Board at the reception updated!$" TrainerHill_Roof_Text_268C03: @ 8268C03 .string "But, oh…\n" - .string "You weren’t very quick getting here.$" + .string "You weren't very quick getting here.$" TrainerHill_Roof_Text_268C31: @ 8268C31 .string "Perhaps it would please me more if you\n" @@ -450,14 +450,14 @@ TrainerHill_Entrance_Text_268D47: @ 8268D47 TrainerHill_Entrance_Text_268D5A: @ 8268D5A .string "Who knows what sort of TRAINERS\n" .string "and POKéMON combos are ahead?\p" - .string "All I know is that I’ll knock aside\n" + .string "All I know is that I'll knock aside\n" .string "anyone that stands in my way!$" TrainerHill_Entrance_Text_268DDA: @ 8268DDA .string "I heard tough TRAINERS come to this\n" .string "TRAINER HILL from all over.\p" - .string "I can’t wait to test the waters!\p" - .string "I’ll knock aside anyone that stands\n" + .string "I can't wait to test the waters!\p" + .string "I'll knock aside anyone that stands\n" .string "in my way!$" TrainerHill_Entrance_Text_268E6A: @ 8268E6A @@ -466,9 +466,9 @@ TrainerHill_Entrance_Text_268E6A: @ 8268E6A .string "can reach the top in the least time.$" TrainerHill_Entrance_Text_268EDC: @ 8268EDC - .string "Do you know when they’re opening\n" + .string "Do you know when they're opening\n" .string "this place up?\p" - .string "I’m waiting here to be the first\n" + .string "I'm waiting here to be the first\n" .string "challenger ever!$" TrainerHill_Elevator_Text_268F3E: @ 8268F3E diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 922fcaa77..578881daa 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -71,13 +71,13 @@ VerdanturfTown_Text_1EB5FD: @ 81EB5FD .string "make a big uproar.\p" .string "So they had to stop the big tunnel\n" .string "project.\p" - .string "But there’s one man. He’s trying to dig\n" + .string "But there's one man. He's trying to dig\n" .string "the tunnel by himself!$" VerdanturfTown_Text_1EB6E0: @ 81EB6E0 .string "There was a man who dug a tunnel for\n" .string "a lady he loved.\p" - .string "I don’t really get it, but hey!$" + .string "I don't really get it, but hey!$" VerdanturfTown_Text_1EB736: @ 81EB736 .string "The way the winds blow, volcanic ash\n" @@ -87,7 +87,7 @@ VerdanturfTown_Text_1EB736: @ 81EB736 .string "frail and sickly people.$" VerdanturfTown_Text_1EB7E2: @ 81EB7E2 - .string "My POKéMON and I, we’ve been riding\n" + .string "My POKéMON and I, we've been riding\n" .string "a hot winning streak.\p" .string "So I decided to make my BATTLE TENT\n" .string "debut in this town.$" @@ -95,16 +95,16 @@ VerdanturfTown_Text_1EB7E2: @ 81EB7E2 VerdanturfTown_Text_1EB854: @ 81EB854 .string "Did you see the cave next to the\n" .string "POKéMON MART?\p" - .string "There’s a guy in there who’s trying to\n" + .string "There's a guy in there who's trying to\n" .string "bust up boulders so he can bust out\l" .string "through to the other side.\p" - .string "It’d be great if we could go through…\n" - .string "It’ll make it easy to visit RUSTBORO.$" + .string "It'd be great if we could go through…\n" + .string "It'll make it easy to visit RUSTBORO.$" VerdanturfTown_Text_1EB935: @ 81EB935 .string "That cave next to the POKéMON MART\n" .string "is now a tunnel to the other side.\p" - .string "It’s great--it’s easy to go shop for\n" + .string "It's great--it's easy to go shop for\n" .string "new DEVON products in RUSTBORO now.$" VerdanturfTown_Text_1EB9C4: @ 81EB9C4 @@ -113,7 +113,7 @@ VerdanturfTown_Text_1EB9C4: @ 81EB9C4 .string "sweet fragrance of grass.â€$" VerdanturfTown_Text_1EBA11: @ 81EBA11 - .string "WANDA’S HOUSE$" + .string "WANDA'S HOUSE$" VerdanturfTown_Text_1EBA1F: @ 81EBA1F .string "BATTLE TENT VERDANTURF SITE\n" diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index a4c2e502c..ef577c7f1 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -44,7 +44,7 @@ VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7 .string "Which CONTEST are you entering?\n" .string "Want a piece of advice?\p" .string "In any CONTEST, for example, a CUTE\n" - .string "CONTEST, I don’t think they judge you\l" + .string "CONTEST, I don't think they judge you\l" .string "only on cuteness in the first round.\p" .string "You need to work out ways for raising\n" .string "POKéMON better.$" @@ -53,13 +53,13 @@ VerdanturfTown_BattleTentCorridor_Text_2021C4: @ 82021C4 .string "I raised my POKéMON to be cute.\p" .string "I found out you can put POKéMON in\n" .string "a CONTEST for cuteness!\p" - .string "I’m so glad I raised my POKéMON with\n" + .string "I'm so glad I raised my POKéMON with\n" .string "loving care…$" VerdanturfTown_BattleTentCorridor_Text_202251: @ 8202251 .string "My POKéMON rules!\p" - .string "It’s cool, tough yet beautiful, cute,\n" - .string "and smart. It’s complete!\p" + .string "It's cool, tough yet beautiful, cute,\n" + .string "and smart. It's complete!\p" .string "I may as well go for wins in every\n" .string "single CONTEST.$" diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index bde086dce..ec7ecfb1a 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -383,35 +383,35 @@ VerdanturfTown_BattleTentLobby_EventScript_201BD2:: @ 8201BD2 end VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4 - .string "If it doesn’t like a certain move,\n" + .string "If it doesn't like a certain move,\n" .string "a POKéMON will be reluctant to use it.\p" - .string "It doesn’t matter how strong it is,\n" + .string "It doesn't matter how strong it is,\n" .string "either.\p" .string "For example, a POKéMON with a GENTLE\n" - .string "nature probably won’t enjoy hurting\l" + .string "nature probably won't enjoy hurting\l" .string "its opponents.\p" - .string "If it can’t seem to live up to its\n" - .string "potential, it’s probably failing at\l" + .string "If it can't seem to live up to its\n" + .string "potential, it's probably failing at\l" .string "using a disliked move against its will.$" VerdanturfTown_BattleTentLobby_Text_201D11: @ 8201D11 .string "My big sister is gentle usually.\n" .string "But when she gets angry,\l" - .string "she’s really, really scary!\p" + .string "she's really, really scary!\p" .string "I bet a gentle POKéMON will be scary\n" .string "if it gets angry!$" VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E .string "My feelings toward my POKéMON…\n" .string "The attraction runs deep…\p" - .string "Oh, hi, you didn’t see that, did you?\n" - .string "Well, it doesn’t matter.\p" + .string "Oh, hi, you didn't see that, did you?\n" + .string "Well, it doesn't matter.\p" .string "How would you like this TM for\n" .string "your POKéMON?$" VerdanturfTown_BattleTentLobby_Text_201E43: @ 8201E43 .string "My feelings toward my POKéMON…\n" - .string "I’m sure the attraction is mutual!\p" + .string "I'm sure the attraction is mutual!\p" .string "They battle exactly the way I want\n" .string "them to!$" @@ -425,9 +425,9 @@ VerdanturfTown_BattleTentLobby_Text_201EB1: @ 8201EB1 VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F .string "SCOTT: Hey there, {PLAYER}{KUN}!\n" .string "I thought I might see you here.\p" - .string "A BATTLE TENT’s a place where\n" + .string "A BATTLE TENT's a place where\n" .string "you can meet tough TRAINERS.\p" - .string "It doesn’t matter what the rules are,\n" + .string "It doesn't matter what the rules are,\n" .string "or how battles are waged, either.\p" .string "{PLAYER}{KUN}, I expect you to do\n" .string "the best you can!$" diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc index f677b3aab..01b1e5030 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -64,13 +64,13 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA VerdanturfTown_FriendshipRatersHouse_Text_2030ED: @ 82030ED .string "Let me see your POKéMON.\n" - .string "I’ll check to see how much it likes you.\p" + .string "I'll check to see how much it likes you.\p" .string "Oh.\n" .string "Your POKéMON…$" VerdanturfTown_FriendshipRatersHouse_Text_203141: @ 8203141 .string "It adores you.\n" - .string "It can’t possibly love you any more.\l" + .string "It can't possibly love you any more.\l" .string "I even feel happy seeing it.$" VerdanturfTown_FriendshipRatersHouse_Text_203192: @ 8203192 @@ -82,22 +82,22 @@ VerdanturfTown_FriendshipRatersHouse_Text_2031D1: @ 82031D1 .string "It seems to want to be babied a little.$" VerdanturfTown_FriendshipRatersHouse_Text_203213: @ 8203213 - .string "It’s getting used to you.\n" + .string "It's getting used to you.\n" .string "It seems to believe in you.$" VerdanturfTown_FriendshipRatersHouse_Text_203249: @ 8203249 - .string "It’s not very used to you yet.\n" + .string "It's not very used to you yet.\n" .string "It neither loves nor hates you.$" VerdanturfTown_FriendshipRatersHouse_Text_203288: @ 8203288 - .string "It’s very wary.\n" + .string "It's very wary.\n" .string "It has scary viciousness in its eyes.\l" - .string "It doesn’t like you much at all.$" + .string "It doesn't like you much at all.$" VerdanturfTown_FriendshipRatersHouse_Text_2032DF: @ 82032DF .string "This is a little hard for me to say…\p" .string "Your POKéMON simply detests you.\n" - .string "Doesn’t that make you uncomfortable?$" + .string "Doesn't that make you uncomfortable?$" VerdanturfTown_FriendshipRatersHouse_Text_20334A: @ 820334A .string "PIKACHU: Pika pika!$" diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index cfaf2e021..6457aa626 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -44,12 +44,12 @@ VerdanturfTown_Mart_Text_2025D5: @ 82025D5 .string "For any POKéMON match, X SPECIAL\n" .string "is crucial.\p" .string "It jacks up the power of some moves\n" - .string "even though it’s only for one battle.$" + .string "even though it's only for one battle.$" VerdanturfTown_Mart_Text_20264C: @ 820264C - .string "They don’t seem to sell any winning\n" + .string "They don't seem to sell any winning\n" .string "strategy guides for the BATTLE TENT…\p" - .string "It seems one must rely on one’s\n" + .string "It seems one must rely on one's\n" .string "own wits after all…$" VerdanturfTown_Mart_Text_2026C9: @ 82026C9 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 10a8b6479..da8676aec 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -25,8 +25,8 @@ VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751 end VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A - .string "You can’t consider yourself a real\n" - .string "TRAINER if you don’t have faith\l" + .string "You can't consider yourself a real\n" + .string "TRAINER if you don't have faith\l" .string "in your POKéMON.\p" .string "Only those people who can believe\n" .string "in their battling POKéMON can win\l" @@ -35,7 +35,7 @@ VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A VerdanturfTown_PokemonCenter_1F_Text_20280B: @ 820280B .string "The reason why anyone would visit\n" .string "VERDANTURF…\p" - .string "It’s the BATTLE TENT. It goes without\n" + .string "It's the BATTLE TENT. It goes without\n" .string "saying.\p" .string "Or is there somebody here that you\n" .string "came to see?$" diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index 6c3b90fc3..fea5d3de0 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -91,58 +91,58 @@ VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989 end VerdanturfTown_WandasHouse_Text_202993: @ 8202993 - .string "WALLY: I lost to you, {PLAYER}, but I’m\n" + .string "WALLY: I lost to you, {PLAYER}, but I'm\n" .string "not feeling down anymore.\p" .string "Because I have a new purpose in life.\n" - .string "Together with my RALTS, I’m going\l" + .string "Together with my RALTS, I'm going\l" .string "to challenge POKéMON GYMS and become\l" .string "a great TRAINER.\p" .string "Please watch me, {PLAYER}.\n" - .string "I’m going to be stronger than you.\p" - .string "When I do, I’m going to challenge you\n" + .string "I'm going to be stronger than you.\p" + .string "When I do, I'm going to challenge you\n" .string "to another battle.$" VerdanturfTown_WandasHouse_Text_202ABE: @ 8202ABE .string "WALLY: Please watch me, {PLAYER}.\n" - .string "I’m going to get stronger than you.\p" - .string "When I do, I’m going to challenge you\n" + .string "I'm going to get stronger than you.\p" + .string "When I do, I'm going to challenge you\n" .string "to another battle.$" VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37 .string "UNCLE: Oh! {PLAYER}{KUN}!\n" - .string "WALLY’s next door.\p" - .string "But, boy, there’s something I have to\n" + .string "WALLY's next door.\p" + .string "But, boy, there's something I have to\n" .string "tell you.\p" .string "This natural environment is doing\n" - .string "wonders for WALLY’s health.\p" - .string "Maybe it’s not just the environment.\n" + .string "wonders for WALLY's health.\p" + .string "Maybe it's not just the environment.\n" .string "It could be POKéMON that are giving\l" .string "the boy hope.$" VerdanturfTown_WandasHouse_Text_202C20: @ 8202C20 - .string "WALLY’s gone away…\n" + .string "WALLY's gone away…\n" .string "He slipped off on his own…$" VerdanturfTown_WandasHouse_Text_202C4E: @ 8202C4E .string "UNCLE: Is that right?\n" - .string "WALLY’s gone away that far all by\l" + .string "WALLY's gone away that far all by\l" .string "himself…\p" .string "Well, I have to give him credit--he is\n" - .string "my little brother’s son.$" + .string "my little brother's son.$" VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF .string "WANDA: You are?\n" .string "Oh, right, I get it!\p" - .string "You’re the {PLAYER} who WALLY was\n" + .string "You're the {PLAYER} who WALLY was\n" .string "telling me about.\p" - .string "I’m WALLY’s cousin.\n" + .string "I'm WALLY's cousin.\n" .string "Glad to meet you!\p" - .string "I think WALLY’s become a lot more lively\n" + .string "I think WALLY's become a lot more lively\n" .string "and healthy since he came here.$" VerdanturfTown_WandasHouse_Text_202D91: @ 8202D91 - .string "WANDA: Don’t worry about WALLY.\n" - .string "He’ll be just fine.\p" + .string "WANDA: Don't worry about WALLY.\n" + .string "He'll be just fine.\p" .string "I know my little cousin, and he has\n" .string "POKéMON with him, too.$" @@ -152,17 +152,17 @@ VerdanturfTown_WandasHouse_Text_202E00: @ 8202E00 .string "Happy? You bet I am!$" VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47 - .string "My daughter’s boyfriend is a very\n" + .string "My daughter's boyfriend is a very\n" .string "driven and passionate sort of person.\p" - .string "He’s been digging a tunnel nonstop\n" + .string "He's been digging a tunnel nonstop\n" .string "just so he can see my daughter.\p" - .string "My daughter’s a little concerned,\n" + .string "My daughter's a little concerned,\n" .string "so she goes out to the tunnel a lot.$" VerdanturfTown_WandasHouse_Text_202F19: @ 8202F19 - .string "It’s amazing. My daughter’s boyfriend\n" + .string "It's amazing. My daughter's boyfriend\n" .string "was digging the tunnel by hand!\p" - .string "It’s so incredible!$" + .string "It's so incredible!$" VerdanturfTown_WandasHouse_Text_202F73: @ 8202F73 .string "If anything were to happen to WALLY,\n" diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index abe42e6d6..5b3dabbc9 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -121,13 +121,13 @@ VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF VictoryRoad_1F_Text_235EE6: @ 8235EE6 .string "WALLY: Hi! {PLAYER}!\p" - .string "I bet you’re surprised to see me here!\p" - .string "I made it all the way here, and it’s\n" + .string "I bet you're surprised to see me here!\p" + .string "I made it all the way here, and it's\n" .string "all thanks to you!\p" .string "{PLAYER}, losing to you that time\n" .string "made me stronger!\p" - .string "But I’m not going to lose anymore!\p" - .string "I’m going to win! For the POKéMON who\n" + .string "But I'm not going to lose anymore!\p" + .string "I'm going to win! For the POKéMON who\n" .string "gave me courage and strength!\p" .string "Okay… Here I come!$" @@ -136,13 +136,13 @@ VictoryRoad_1F_Text_235FFC: @ 8235FFC .string "{PLAYER}, you are strong, after all!$" VictoryRoad_1F_Text_236020: @ 8236020 - .string "WALLY: I couldn’t beat you today,\n" - .string "{PLAYER}, but one of these days, I’ll\l" + .string "WALLY: I couldn't beat you today,\n" + .string "{PLAYER}, but one of these days, I'll\l" .string "catch up to you!$" VictoryRoad_1F_Text_236073: @ 8236073 .string "WALLY: Hi! {PLAYER}!\p" - .string "I’ve gotten stronger since that last\n" + .string "I've gotten stronger since that last\n" .string "time! I wanted to show you, {PLAYER}!\p" .string "Okay… Here I come!$" @@ -151,26 +151,26 @@ VictoryRoad_1F_Text_2360DA: @ 82360DA .string "{PLAYER}, you are strong, after all!$" VictoryRoad_1F_Text_2360FE: @ 82360FE - .string "WALLY: I couldn’t beat you this time,\n" + .string "WALLY: I couldn't beat you this time,\n" .string "too… But one of these days, {PLAYER},\l" - .string "I’m going to catch up to you…\p" + .string "I'm going to catch up to you…\p" .string "And challenge the POKéMON LEAGUE!$" VictoryRoad_1F_Text_236184: @ 8236184 - .string "I’ve made it this far a couple times,\n" + .string "I've made it this far a couple times,\n" .string "but the last stretch is so long…$" VictoryRoad_1F_Text_2361CB: @ 82361CB .string "My dream ends here again…$" VictoryRoad_1F_Text_2361E5: @ 82361E5 - .string "You’ve made it this far. Keep the\n" + .string "You've made it this far. Keep the\n" .string "momentum going and become the\l" - .string "CHAMPION! If anyone can, it’s you!$" + .string "CHAMPION! If anyone can, it's you!$" VictoryRoad_1F_Text_236248: @ 8236248 - .string "I didn’t come all this way to lose now.\n" - .string "That possibility doesn’t exist!$" + .string "I didn't come all this way to lose now.\n" + .string "That possibility doesn't exist!$" VictoryRoad_1F_Text_236290: @ 8236290 .string "Impossible…\n" @@ -194,22 +194,22 @@ VictoryRoad_1F_Text_236356: @ 8236356 VictoryRoad_1F_Text_236390: @ 8236390 .string "What is the VICTORY ROAD?\n" - .string "I’ll tell you if you win!$" + .string "I'll tell you if you win!$" VictoryRoad_1F_Text_2363C4: @ 82363C4 .string "Okay!\n" .string "Well done!$" VictoryRoad_1F_Text_2363D5: @ 82363D5 - .string "Getting through here safely--that’s\n" + .string "Getting through here safely--that's\n" .string "the final test for any TRAINER aiming\l" .string "to become the POKéMON CHAMPION.\p" - .string "That’s why it’s called the VICTORY\n" + .string "That's why it's called the VICTORY\n" .string "ROAD.$" VictoryRoad_1F_Text_236468: @ 8236468 .string "I have nothing to say to anyone\n" - .string "that’s come this far. Come on!$" + .string "that's come this far. Come on!$" VictoryRoad_1F_Text_2364A7: @ 82364A7 .string "This is a disgrace…$" diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index d6d2d6861..c2fb918cc 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -27,12 +27,12 @@ VictoryRoad_B1F_EventScript_236541:: @ 8236541 end VictoryRoad_B1F_Text_236558: @ 8236558 - .string "The thought that I’m getting closer to\n" + .string "The thought that I'm getting closer to\n" .string "the POKéMON LEAGUE…\p" - .string "I’m getting stage fright…$" + .string "I'm getting stage fright…$" VictoryRoad_B1F_Text_2365AD: @ 82365AD - .string "I couldn’t do a thing…$" + .string "I couldn't do a thing…$" VictoryRoad_B1F_Text_2365C4: @ 82365C4 .string "The POKéMON LEAGUE became distant\n" @@ -52,14 +52,14 @@ VictoryRoad_B1F_Text_236678: @ 8236678 .string "grows between POKéMON and TRAINERS.$" VictoryRoad_B1F_Text_2366C2: @ 82366C2 - .string "This isn’t the goal. It’s only a place\n" + .string "This isn't the goal. It's only a place\n" .string "on the way to the POKéMON LEAGUE.$" VictoryRoad_B1F_Text_23670B: @ 823670B - .string "That’s the way!$" + .string "That's the way!$" VictoryRoad_B1F_Text_23671B: @ 823671B - .string "You’ll do fine, for sure!\n" + .string "You'll do fine, for sure!\n" .string "Your POKéMON are all eager to go!$" VictoryRoad_B1F_Text_236757: @ 8236757 @@ -67,7 +67,7 @@ VictoryRoad_B1F_Text_236757: @ 8236757 .string "awe inspiring!$" VictoryRoad_B1F_Text_236780: @ 8236780 - .string "I’ve never met anyone like you before.$" + .string "I've never met anyone like you before.$" VictoryRoad_B1F_Text_2367A7: @ 82367A7 .string "Even outside of battle, I sense\n" @@ -76,7 +76,7 @@ VictoryRoad_B1F_Text_2367A7: @ 82367A7 VictoryRoad_B1F_Text_2367FD: @ 82367FD .string "Okay, no need to get your back up!\n" - .string "Relax, let’s take it easy!$" + .string "Relax, let's take it easy!$" VictoryRoad_B1F_Text_23683B: @ 823683B .string "Whoa!\n" @@ -84,8 +84,8 @@ VictoryRoad_B1F_Text_23683B: @ 823683B VictoryRoad_B1F_Text_23684C: @ 823684C .string "Sure, this is VICTORY ROAD.\p" - .string "But it’s not all that different from\n" - .string "the path you’ve taken so far.\p" + .string "But it's not all that different from\n" + .string "the path you've taken so far.\p" .string "Try to enjoy things the rest of\n" .string "the way!$" diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 245440135..732878de3 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -34,7 +34,7 @@ VictoryRoad_B2F_EventScript_236948:: @ 8236948 VictoryRoad_B2F_Text_23695F: @ 823695F .string "I trained together with my whole family,\n" .string "every one of us!\l" - .string "I’m not losing to anyone!$" + .string "I'm not losing to anyone!$" VictoryRoad_B2F_Text_2369B3: @ 82369B3 .string "Better than my family?!\n" @@ -42,12 +42,12 @@ VictoryRoad_B2F_Text_2369B3: @ 82369B3 VictoryRoad_B2F_Text_2369DE: @ 82369DE .string "I was better than everyone in my\n" - .string "family. I’ve never lost before…\p" - .string "I’ve lost my confidence…\n" - .string "Maybe I’ll go home…$" + .string "family. I've never lost before…\p" + .string "I've lost my confidence…\n" + .string "Maybe I'll go home…$" VictoryRoad_B2F_Text_236A4C: @ 8236A4C - .string "I’d heard that there was a tough\n" + .string "I'd heard that there was a tough\n" .string "little kid around. Do they mean you?$" VictoryRoad_B2F_Text_236A92: @ 8236A92 @@ -69,20 +69,20 @@ VictoryRoad_B2F_Text_236B2F: @ 8236B2F .string "Beware of fatigue!$" VictoryRoad_B2F_Text_236B88: @ 8236B88 - .string "You shouldn’t get complacent just\n" + .string "You shouldn't get complacent just\n" .string "because you have a lot of GYM BADGES.\p" - .string "There’s always going to be someone\n" - .string "who’s better than you!$" + .string "There's always going to be someone\n" + .string "who's better than you!$" VictoryRoad_B2F_Text_236C0A: @ 8236C0A - .string "You’re better than me!$" + .string "You're better than me!$" VictoryRoad_B2F_Text_236C21: @ 8236C21 .string "Gaze on your collected BADGES and\n" - .string "remember the TRAINERS you’ve faced.$" + .string "remember the TRAINERS you've faced.$" VictoryRoad_B2F_Text_236C67: @ 8236C67 - .string "I’ve come this far, but the tension’s\n" + .string "I've come this far, but the tension's\n" .string "giving me awful stomach pain…$" VictoryRoad_B2F_Text_236CAB: @ 8236CAB @@ -90,9 +90,9 @@ VictoryRoad_B2F_Text_236CAB: @ 8236CAB .string "It hurts…$" VictoryRoad_B2F_Text_236CBA: @ 8236CBA - .string "I can’t help getting all tense knowing\n" - .string "that I’m nearing the POKéMON LEAGUE.\p" - .string "It’s all I can do to feign calm.$" + .string "I can't help getting all tense knowing\n" + .string "that I'm nearing the POKéMON LEAGUE.\p" + .string "It's all I can do to feign calm.$" VictoryRoad_B2F_Text_236D27: @ 8236D27 .string "The elite among the elite gather in\n" diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 68267a5e3..0105d8815 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -215,7 +215,7 @@ sText_AuroraTicketGot: .string "Thank you for using the MYSTERY\nGIFT System.$" sText_AuroraTicketNoPlace: - .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" + .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" MysteryEventScript_MysticTicket:: @ 867550B setvaddress MysteryEventScript_MysticTicket @@ -269,7 +269,7 @@ sText_MysticTicketGot: .string "Thank you for using the MYSTERY\nGIFT System.$" sText_MysticTicketNoPlace: - .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" + .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" MysteryEventScript_AlteringCave:: @ 86756E3 setvaddress MysteryEventScript_AlteringCave @@ -339,4 +339,4 @@ sText_MysteryGiftOldSeaMap_2: .string "Thank you for using the MYSTERY\nGIFT System.$" sText_MysteryGiftOldSeaMap_3: - .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" + .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" diff --git a/data/pokenav.s b/data/pokenav.s index 12fd4304a..eaa2ea269 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -483,7 +483,7 @@ gUnknown_086203DB:: @ 86203DB .string "body and mind healthy.$" gUnknown_086203F2:: @ 86203F2 - .string "I’m not very good at this.$" + .string "I'm not very good at this.$" gUnknown_0862040D:: @ 862040D .string "Ruin-exploration partners.$" @@ -507,7 +507,7 @@ gUnknown_0862049C:: @ 862049C .string "I travel the world.$" gUnknown_086204B0:: @ 86204B0 - .string "I’m going to try hard!$" + .string "I'm going to try hard!$" gUnknown_086204C7:: @ 86204C7 .string "Good swimmer POKéMON.$" @@ -519,13 +519,13 @@ gUnknown_086204F9:: @ 86204F9 .string "using an inner tube.$" gUnknown_0862050E:: @ 862050E - .string "I don’t know. I’ll try hard.$" + .string "I don't know. I'll try hard.$" gUnknown_0862052B:: @ 862052B .string "WATER POKéMON are buddies.$" gUnknown_08620546:: @ 8620546 - .string "It’s not like I can’t swim.$" + .string "It's not like I can't swim.$" gUnknown_08620562:: @ 8620562 .string "I just like my inner tube.$" @@ -555,7 +555,7 @@ gUnknown_0862062F:: @ 862062F .string "TRAINER!$" gUnknown_08620638:: @ 8620638 - .string "Exploit the foe’s weakness.$" + .string "Exploit the foe's weakness.$" gUnknown_08620654:: @ 8620654 .string "Balance is crucial.$" @@ -570,13 +570,13 @@ gUnknown_08620693:: @ 8620693 .string "Upset the opponent.$" gUnknown_086206A7:: @ 86206A7 - .string "Type doesn’t matter.$" + .string "Type doesn't matter.$" gUnknown_086206BC:: @ 86206BC - .string "I’m a top student at the$" + .string "I'm a top student at the$" gUnknown_086206D5:: @ 86206D5 - .string "TRAINER’S SCHOOL.$" + .string "TRAINER'S SCHOOL.$" gUnknown_086206E7:: @ 86206E7 .string "Slow, steady suffering.$" @@ -588,7 +588,7 @@ gUnknown_08620717:: @ 8620717 .string "I see things that others$" gUnknown_08620730:: @ 8620730 - .string "can’t see...$" + .string "can't see...$" gUnknown_0862073D:: @ 862073D .string "Anything to win.$" @@ -603,7 +603,7 @@ gUnknown_08620779:: @ 8620779 .string "my POKéMON at home.$" gUnknown_0862078D:: @ 862078D - .string "You’ll fall under my spell!$" + .string "You'll fall under my spell!$" gUnknown_086207A9:: @ 86207A9 .string "Mature WATER type.$" @@ -615,7 +615,7 @@ gUnknown_086207D7:: @ 86207D7 .string "the world on a luxury liner.$" gUnknown_086207F4:: @ 86207F4 - .string "I’ll lead you astray.$" + .string "I'll lead you astray.$" gUnknown_0862080A:: @ 862080A .string "Cute, of course.$" @@ -657,10 +657,10 @@ gUnknown_0862091C:: @ 862091C .string "Funky WATER type!$" gUnknown_0862092E:: @ 862092E - .string "If I can’t be out swimming,$" + .string "If I can't be out swimming,$" gUnknown_0862094A:: @ 862094A - .string "I’ll be pumping weights.$" + .string "I'll be pumping weights.$" gUnknown_08620963:: @ 8620963 .string "Grand slam pummeling!$" @@ -699,10 +699,10 @@ gUnknown_08620A66:: @ 8620A66 .string "you and stun you!$" gUnknown_08620A78:: @ 8620A78 - .string "I’ll electrify you!$" + .string "I'll electrify you!$" gUnknown_08620A8C:: @ 8620A8C - .string "They’re ELECTRIC!$" + .string "They're ELECTRIC!$" gUnknown_08620A9E:: @ 8620A9E .string "I want to make people cry$" @@ -720,13 +720,13 @@ gUnknown_08620AFB:: @ 8620AFB .string "When you light a campfire,$" gUnknown_08620B16:: @ 8620B16 - .string "be sure there’s some water.$" + .string "be sure there's some water.$" gUnknown_08620B32:: @ 8620B32 .string "Hang in and be tenacious!$" gUnknown_08620B4C:: @ 8620B4C - .string "I’ll raise any POKéMON.$" + .string "I'll raise any POKéMON.$" gUnknown_08620B64:: @ 8620B64 .string "POKéMON raised in the wild$" @@ -738,10 +738,10 @@ gUnknown_08620B8C:: @ 8620B8C .string "Our love lets us prevail.$" gUnknown_08620BA6:: @ 8620BA6 - .string "We’ve had them for years.$" + .string "We've had them for years.$" gUnknown_08620BC0:: @ 8620BC0 - .string "Married 50 years, we’ve$" + .string "Married 50 years, we've$" gUnknown_08620BD8:: @ 8620BD8 .string "devotedly raised POKéMON.$" @@ -768,7 +768,7 @@ gUnknown_08620C78:: @ 8620C78 .string "I can see through exactly$" gUnknown_08620C92:: @ 8620C92 - .string "what you’re thinking!$" + .string "what you're thinking!$" gUnknown_08620CA8:: @ 8620CA8 .string "Battle at full power.$" @@ -792,7 +792,7 @@ gUnknown_08620D32:: @ 8620D32 .string "We enjoy a spot of tea$" gUnknown_08620D49:: @ 8620D49 - .string "every day. It’s imported.$" + .string "every day. It's imported.$" gUnknown_08620D63:: @ 8620D63 .string "I use my head to battle.$" @@ -825,7 +825,7 @@ gUnknown_08620E39:: @ 8620E39 .string "POKéMON that we both like.$" gUnknown_08620E54:: @ 8620E54 - .string "We’re senior and junior$" + .string "We're senior and junior$" gUnknown_08620E6C:: @ 8620E6C .string "students into POKéMON!$" @@ -849,7 +849,7 @@ gUnknown_08620EF6:: @ 8620EF6 .string "A POKéMON raised with love!$" gUnknown_08620F12:: @ 8620F12 - .string "It’s important to build$" + .string "It's important to build$" gUnknown_08620F2A:: @ 8620F2A .string "trust with your POKéMON.$" @@ -861,7 +861,7 @@ gUnknown_08620F5D:: @ 8620F5D .string "The essence of FIGHTING.$" gUnknown_08620F76:: @ 8620F76 - .string "I’m not ready to give way$" + .string "I'm not ready to give way$" gUnknown_08620F90:: @ 8620F90 .string "to the young yet!$" @@ -885,7 +885,7 @@ gUnknown_0862100A:: @ 862100A .string "I use different types.$" gUnknown_08621021:: @ 8621021 - .string "I’m going to keep working$" + .string "I'm going to keep working$" gUnknown_0862103B:: @ 862103B .string "until I beat a GYM LEADER.$" @@ -897,7 +897,7 @@ gUnknown_0862106A:: @ 862106A .string "WATER POKéMON to battle!$" gUnknown_08621083:: @ 8621083 - .string "I’m the world’s only guy to$" + .string "I'm the world's only guy to$" gUnknown_0862109F:: @ 862109F .string "catch a huge POKéMON!$" @@ -909,7 +909,7 @@ gUnknown_086210CE:: @ 86210CE .string "All hail the WATER type!$" gUnknown_086210E7:: @ 86210E7 - .string "I won’t be beaten by some$" + .string "I won't be beaten by some$" gUnknown_08621101:: @ 8621101 .string "beach bum SWIMMER!$" @@ -945,7 +945,7 @@ gUnknown_086211E4:: @ 86211E4 .string "A fast-running POKéMON!$" gUnknown_086211FC:: @ 86211FC - .string "If you ran and ran, you’d$" + .string "If you ran and ran, you'd$" gUnknown_08621216:: @ 8621216 .string "become one with the wind.$" @@ -969,7 +969,7 @@ gUnknown_08621290:: @ 8621290 .string "The strength of STEEL.$" gUnknown_086212A7:: @ 86212A7 - .string "If you’re sweating, get$" + .string "If you're sweating, get$" gUnknown_086212BF:: @ 86212BF .string "fluids into you regularly.$" @@ -984,22 +984,22 @@ gUnknown_0862130C:: @ 862130C .string "Training POKéMON is good,$" gUnknown_08621326:: @ 8621326 - .string "but don’t neglect yourself.$" + .string "but don't neglect yourself.$" gUnknown_08621342:: @ 8621342 - .string "It’s about POKéMON power!$" + .string "It's about POKéMON power!$" gUnknown_0862135C:: @ 862135C .string "See the power of DRAGONS!$" gUnknown_08621376:: @ 8621376 - .string "I’ll become legendary as the$" + .string "I'll become legendary as the$" gUnknown_08621393:: @ 8621393 .string "strongest one day!$" gUnknown_086213A6:: @ 86213A6 - .string "I’ll show you my technique!$" + .string "I'll show you my technique!$" gUnknown_086213C2:: @ 86213C2 .string "Elegantly wheeling BIRDS.$" @@ -1011,7 +1011,7 @@ gUnknown_086213F8:: @ 86213F8 .string "love to that girl!$" gUnknown_0862140B:: @ 862140B - .string "You’ll suffer from poison!$" + .string "You'll suffer from poison!$" gUnknown_08621426:: @ 8621426 .string "Poisonous POKéMON.$" @@ -1032,16 +1032,16 @@ gUnknown_08621499:: @ 8621499 .string "If my POKéMON lose,$" gUnknown_086214AD:: @ 86214AD - .string "I’ll carry on the fight!$" + .string "I'll carry on the fight!$" gUnknown_086214C6:: @ 86214C6 .string "Go, go, my POKéMON!$" gUnknown_086214DA:: @ 86214DA - .string "I’ll raise anything.$" + .string "I'll raise anything.$" gUnknown_086214EF:: @ 86214EF - .string "UV rays are your skin’s$" + .string "UV rays are your skin's$" gUnknown_08621507:: @ 8621507 .string "enemy. Get protected.$" @@ -1116,7 +1116,7 @@ gUnknown_08621710:: @ 8621710 .string "I want to collect all the$" gUnknown_0862172A:: @ 862172A - .string "world’s rare POKéMON.$" + .string "world's rare POKéMON.$" gUnknown_08621740:: @ 8621740 .string "I count on power.$" @@ -1134,7 +1134,7 @@ gUnknown_08621799:: @ 8621799 .string "Full-on attack!$" gUnknown_086217A9:: @ 86217A9 - .string "Anything. I’ll raise it.$" + .string "Anything. I'll raise it.$" gUnknown_086217C2:: @ 86217C2 .string "I give them {POKEBLOCK}S for$" @@ -1161,7 +1161,7 @@ gUnknown_0862186A:: @ 862186A .string "I like strong POKéMON.$" gUnknown_08621881:: @ 8621881 - .string "I’m training for rescue$" + .string "I'm training for rescue$" gUnknown_08621899:: @ 8621899 .string "work with my POKéMON.$" @@ -1179,7 +1179,7 @@ gUnknown_086218F0:: @ 86218F0 .string "must never be forgiven!$" gUnknown_08621908:: @ 8621908 - .string "I’ll show you some guts!$" + .string "I'll show you some guts!$" gUnknown_08621921:: @ 8621921 .string "Cute POKéMON are my faves!$" @@ -1209,10 +1209,10 @@ gUnknown_086219E3:: @ 86219E3 .string "Hard-bodied POKéMON.$" gUnknown_086219F8:: @ 86219F8 - .string "I’ve been planning a month$" + .string "I've been planning a month$" gUnknown_08621A13:: @ 8621A13 - .string "for today’s hike.$" + .string "for today's hike.$" gUnknown_08621A25:: @ 8621A25 .string "I like it hot!$" @@ -1233,7 +1233,7 @@ gUnknown_08621A88:: @ 8621A88 .string "Lovey-dovey POKéMON!$" gUnknown_08621A9D:: @ 8621A9D - .string "We’re lovey-dovey!$" + .string "We're lovey-dovey!$" gUnknown_08621AB0:: @ 8621AB0 .string "Forever lovey-dovey!$" @@ -1350,19 +1350,19 @@ gUnknown_08621E38:: @ 8621E38 .string "Offense over defense!$" gUnknown_08621E4E:: @ 8621E4E - .string "The DARK side’s beauties.$" + .string "The DARK side's beauties.$" gUnknown_08621E68:: @ 8621E68 .string "They said I was a punk, but$" gUnknown_08621E84:: @ 8621E84 - .string "I’m one of the ELITE FOUR!$" + .string "I'm one of the ELITE FOUR!$" gUnknown_08621E9F:: @ 8621E9F .string "Confuse and confound.$" gUnknown_08621EB5:: @ 8621EB5 - .string "There’s nothing definite.$" + .string "There's nothing definite.$" gUnknown_08621ECF:: @ 8621ECF .string "I wonder how my grandma at$" diff --git a/data/rom_8011DC0.s b/data/rom_8011DC0.s index 2f596606b..f03b036d1 100644 --- a/data/rom_8011DC0.s +++ b/data/rom_8011DC0.s @@ -71,7 +71,7 @@ gText_AwaitingCommunication:: @ 82ED960 .string "{STR_VAR_1}! Awaiting\ncommunication from another player.$" gText_AwaitingLink:: @ 82ED990 - .string "{STR_VAR_1}! Awaiting link!\nPress START when everyone’s ready.$" + .string "{STR_VAR_1}! Awaiting link!\nPress START when everyone's ready.$" .align 2 gJPText_SingleBattle:: @ 82ED9C8 @@ -225,11 +225,11 @@ gUnknown_082EDC9C:: @ 82EDC9C .align 2 gUnknown_082EDCB4:: @ 82EDCB4 - .string "The other TRAINER doesn’t appear\nto be available now…\p$" + .string "The other TRAINER doesn't appear\nto be available now…\p$" .align 2 gUnknown_082EDCEC:: @ 82EDCEC - .string "You can’t transmit with a TRAINER\nwho is too far away.\p$" + .string "You can't transmit with a TRAINER\nwho is too far away.\p$" .align 2 gUnknown_082EDD24:: @ 82EDD24 @@ -263,7 +263,7 @@ gUnknown_082EDDF4:: @ 82EDDF4 .align 2 gUnknown_082EDE0C:: @ 82EDE0C - .string "{STR_VAR_1} OK’d your registration as\na member.$" + .string "{STR_VAR_1} OK'd your registration as\na member.$" .align 2 gUnknown_082EDE34:: @ 82EDE34 @@ -340,7 +340,7 @@ gUnknown_082EDFC4:: @ 82EDFC4 .align 2 gUnknown_082EE004:: @ 82EE004 - .string "Awaiting {STR_VAR_1}’s response about\nthe trade…$" + .string "Awaiting {STR_VAR_1}'s response about\nthe trade…$" .align 2 gUnknown_082EE02C:: @ 82EE02C @@ -474,19 +474,19 @@ gUnknown_082EE598:: @ 82EE598 .align 2 gUnknown_082EE5C0:: @ 82EE5C0 - .string "Oh, hey! We’re in a chat right now.\nWant to join us?$" + .string "Oh, hey! We're in a chat right now.\nWant to join us?$" .align 2 gUnknown_082EE5F8:: @ 82EE5F8 - .string "{STR_VAR_1}: Hey, {PLAYER}!\nWe’re having a chat right now.\lWant to join us?$" + .string "{STR_VAR_1}: Hey, {PLAYER}!\nWe're having a chat right now.\lWant to join us?$" .align 2 gUnknown_082EE638:: @ 82EE638 - .string "Oh, hi! We’re having a chat now.\nWould you like to join us?$" + .string "Oh, hi! We're having a chat now.\nWould you like to join us?$" .align 2 gUnknown_082EE674:: @ 82EE674 - .string "{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe’re having a chat now.\lWould you like to join us?$" + .string "{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe're having a chat now.\lWould you like to join us?$" .align 2 gUnknown_082EE6B8:: @ 82EE6B8 @@ -509,7 +509,7 @@ gUnknown_082EE720:: @ 82EE720 .align 2 gUnknown_082EE754:: @ 82EE754 - .string "Sure thing! As my “Greetings,â€\nhere’s my TRAINER CARD.$" + .string "Sure thing! As my “Greetings,â€\nhere's my TRAINER CARD.$" .align 2 gUnknown_082EE78C:: @ 82EE78C @@ -521,7 +521,7 @@ gUnknown_082EE7C0:: @ 82EE7C0 .align 2 gUnknown_082EE7F8:: @ 82EE7F8 - .string "As my introduction, I’ll show you\nmy TRAINER CARD.$" + .string "As my introduction, I'll show you\nmy TRAINER CARD.$" .align 2 gUnknown_082EE82C:: @ 82EE82C @@ -539,19 +539,19 @@ gUnknown_082EE82C:: @ 82EE82C .align 2 gUnknown_082EE880:: @ 82EE880 - .string "Thanks for waiting!\nLet’s get our battle started!{PAUSE 60}$" + .string "Thanks for waiting!\nLet's get our battle started!{PAUSE 60}$" .align 2 gUnknown_082EE8B8:: @ 82EE880 - .string "All right!\nLet’s chat!{PAUSE 60}$" + .string "All right!\nLet's chat!{PAUSE 60}$" .align 2 gUnknown_082EE8D4:: @ 82EE8D4 - .string "Sorry I made you wait!\nLet’s get started!{PAUSE 60}$" + .string "Sorry I made you wait!\nLet's get started!{PAUSE 60}$" .align 2 gUnknown_082EE904:: @ 82EE904 - .string "Sorry I made you wait!\nLet’s chat.{PAUSE 60}$" + .string "Sorry I made you wait!\nLet's chat.{PAUSE 60}$" .align 2 gUnknown_082EE92C:: @ 82EE92C @@ -582,11 +582,11 @@ gUnknown_082EE984:: @ 82EE984 .align 2 gUnknown_082EE9B4:: @ 82EE9B4 - .string "Sorry! My POKéMON don’t seem to\nbe feeling too well right now.\lLet me battle you another time.\p$" + .string "Sorry! My POKéMON don't seem to\nbe feeling too well right now.\lLet me battle you another time.\p$" .align 2 gUnknown_082EEA14:: @ 82EEA14 - .string "I’m terribly sorry, but my POKéMON\naren’t feeling well…\pLet’s battle another time.\p$" + .string "I'm terribly sorry, but my POKéMON\naren't feeling well…\pLet's battle another time.\p$" .align 2 gUnknown_082EEA68:: @ 82EEA68 @@ -595,11 +595,11 @@ gUnknown_082EEA68:: @ 82EEA68 .align 2 gUnknown_082EEA70:: @ 82EEA70 - .string "Huh? My TRAINER CARD…\nWhere’d it go now?\lSorry! I’ll show you another time!\p$" + .string "Huh? My TRAINER CARD…\nWhere'd it go now?\lSorry! I'll show you another time!\p$" .align 2 gUnknown_082EEAC0:: @ 82EEAC0 - .string "Oh? Now where did I put my\nTRAINER CARD?…\lSorry! I’ll show you later!\p$" + .string "Oh? Now where did I put my\nTRAINER CARD?…\lSorry! I'll show you later!\p$" .align 2 gUnknown_082EEB08:: @ 82EEB08 @@ -612,7 +612,7 @@ gUnknown_082EEB10:: @ 82EEB10 .align 2 gUnknown_082EEB4C:: @ 82EEB4C - .string "If you want to do something with\nme, don’t be shy.\p$" + .string "If you want to do something with\nme, don't be shy.\p$" .align 2 gUnknown_082EEB80:: @ 82EEB80 @@ -646,11 +646,11 @@ gUnknown_082EEC9C:: @ 82EEC9C .align 2 gUnknown_082EECA4:: @ 82EECA4 - .string "Oh, sorry!\nI just can’t right this instant.\lLet’s chat another time.\p$" + .string "Oh, sorry!\nI just can't right this instant.\lLet's chat another time.\p$" .align 2 gUnknown_082EECEC:: @ 82EECEC - .string "Oh, I’m sorry.\nI have too much to do right now.\lLet’s chat some other time.\p$" + .string "Oh, I'm sorry.\nI have too much to do right now.\lLet's chat some other time.\p$" .align 2 gUnknown_082EED3C:: @ 82EED3C @@ -659,11 +659,11 @@ gUnknown_082EED3C:: @ 82EED3C .align 2 gUnknown_082EED44:: @ 82EED3C - .string "Whoa!\nI can tell you’re pretty tough!\p$" + .string "Whoa!\nI can tell you're pretty tough!\p$" .align 2 gUnknown_082EED6C:: @ 82EED6C - .string "You used that move?\nThat’s good strategy!\p$" + .string "You used that move?\nThat's good strategy!\p$" .align 2 gUnknown_082EED98:: @ 82EED98 @@ -675,15 +675,15 @@ gUnknown_082EEDBC:: @ 82EEDBC .align 2 gUnknown_082EEDF4:: @ 82EEDF4 - .string "That POKéMON…\nIt’s been raised really well!\p$" + .string "That POKéMON…\nIt's been raised really well!\p$" .align 2 gUnknown_082EEE24:: @ 82EEE24 - .string "That’s it!\nThis is the right move now!\p$" + .string "That's it!\nThis is the right move now!\p$" .align 2 gUnknown_082EEE4C:: @ 82EEE4C - .string "That’s awesome!\nYou can battle that way?\p$" + .string "That's awesome!\nYou can battle that way?\p$" .align 2 gUnknown_082EEE78:: @ 82EEE78 @@ -706,7 +706,7 @@ gUnknown_082EEECC:: @ 82EEECC .align 2 gUnknown_082EEEF0:: @ 82EEEF0 - .string "Don’t say anything funny anymore!\nI’m sore from laughing!\p$" + .string "Don't say anything funny anymore!\nI'm sore from laughing!\p$" .align 2 gUnknown_082EEF2C:: @ 82EEF2C @@ -714,11 +714,11 @@ gUnknown_082EEF2C:: @ 82EEF2C .align 2 gUnknown_082EEF50:: @ 82EEF50 - .string "Hmhm… What?\nSo is this what you’re saying?\p$" + .string "Hmhm… What?\nSo is this what you're saying?\p$" .align 2 gUnknown_082EEF7C:: @ 82EEF7C - .string "Is that right?\nI didn’t know that.\p$" + .string "Is that right?\nI didn't know that.\p$" .align 2 gUnknown_082EEFA0:: @ 82EEFA0 @@ -726,11 +726,11 @@ gUnknown_082EEFA0:: @ 82EEFA0 .align 2 gUnknown_082EEFBC:: @ 82EEFBC - .string "Yes, that’s exactly it!\nThat’s what I meant.\p$" + .string "Yes, that's exactly it!\nThat's what I meant.\p$" .align 2 gUnknown_082EEFEC:: @ 82EEFEC - .string "In other words…\nYes! That’s right!\p$" + .string "In other words…\nYes! That's right!\p$" .align 2 gUnknown_082EF010:: @ 82EF010 @@ -745,7 +745,7 @@ gUnknown_082EF010:: @ 82EF010 .align 2 gUnknown_082EF030:: @ 82EF030 - .string "I’m just showing my TRAINER CARD\nas my way of greeting.\p$" + .string "I'm just showing my TRAINER CARD\nas my way of greeting.\p$" .align 2 gUnknown_082EF06C:: @ 82EF06C @@ -753,11 +753,11 @@ gUnknown_082EF06C:: @ 82EF06C .align 2 gUnknown_082EF090:: @ 82EF010 - .string "We’re showing each other our\nTRAINER CARDS to get acquainted.\p$" + .string "We're showing each other our\nTRAINER CARDS to get acquainted.\p$" .align 2 gUnknown_082EF0D0:: @ 82EF0D0 - .string "Glad to meet you.\nPlease don’t be a stranger!\p$" + .string "Glad to meet you.\nPlease don't be a stranger!\p$" .align 2 gUnknown_082EF100:: @ 82EF100 @@ -772,11 +772,11 @@ gUnknown_082EF110:: @ 82EF110 .align 2 gUnknown_082EF138:: @ 82EF138 - .string "Finally, a trade got me that\nPOKéMON I’d wanted a long time.\p$" + .string "Finally, a trade got me that\nPOKéMON I'd wanted a long time.\p$" .align 2 gUnknown_082EF178:: @ 82EF178 - .string "I’m trading POKéMON right now.\p$" + .string "I'm trading POKéMON right now.\p$" .align 2 gUnknown_082EF198:: @ 82EF198 @@ -861,19 +861,19 @@ gUnknown_082EF65C:: @ 82EF65C .align 2 gUnknown_082EF6E4:: @ 82EF6E4 - .string "You don’t have a {STR_VAR_2}-type\nPOKéMON that {STR_VAR_1} wants.\p$" + .string "You don't have a {STR_VAR_2}-type\nPOKéMON that {STR_VAR_1} wants.\p$" .align 2 gUnknown_082EF718:: @ 82EF718 - .string "You don’t have an EGG that\n{STR_VAR_1} wants.\p$" + .string "You don't have an EGG that\n{STR_VAR_1} wants.\p$" .align 2 gUnknown_082EF740:: @ 82EF740 - .string "{STR_VAR_1} can’t make a trade for\nyour POKéMON right now.\p$" + .string "{STR_VAR_1} can't make a trade for\nyour POKéMON right now.\p$" .align 2 gUnknown_082EF774:: @ 82EF774 - .string "You can’t make a trade for\n{STR_VAR_1}’s POKéMON right now.\p$" + .string "You can't make a trade for\n{STR_VAR_1}'s POKéMON right now.\p$" .align 2 .4byte gUnknown_082EF740 @@ -1001,7 +1001,7 @@ gUnknown_082EFBC8:: @ 82EFBC8 .align 2 gUnknown_082EFC3C:: @ 82EFC3C - .string "Awaiting {STR_VAR_1}’s response…$" + .string "Awaiting {STR_VAR_1}'s response…$" .align 2 gUnknown_082EFC54:: @ 82EFC54 @@ -1141,23 +1141,23 @@ gUnknown_082EFED4:: @ 82EFED4 .align 2 gUnknown_082EFEEC:: @ 82EFEEC - .string "It’s a NORMAL CARD.$" + .string "It's a NORMAL CARD.$" .align 2 gUnknown_082EFF00:: @ 82EFF00 - .string "It’s a BRONZE CARD!$" + .string "It's a BRONZE CARD!$" .align 2 gUnknown_082EFF14:: @ 82EFF14 - .string "It’s a COPPER CARD!$" + .string "It's a COPPER CARD!$" .align 2 gUnknown_082EFF28:: @ 82EFF28 - .string "It’s a SILVER CARD!$" + .string "It's a SILVER CARD!$" .align 2 gUnknown_082EFF3C:: @ 82EFF3C - .string "It’s a GOLD CARD!$" + .string "It's a GOLD CARD!$" .align 2 gUnknown_082EFF50:: @ 82EFF50 @@ -1168,7 +1168,7 @@ gUnknown_082EFF50:: @ 82EFF50 .4byte gUnknown_082EFF3C gUnknown_082EFF64:: @ 82EFF64 - .string "This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}’s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME: {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p$" + .string "This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME: {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p$" .align 2 gUnknown_082EFFA4:: @ 82EFFA4 @@ -1189,7 +1189,7 @@ gUnknown_082F0018:: @ 82F0018 .align 2 gUnknown_082F0020:: @ 82F0020 - .string "Finished checking {SPECIAL_F7 0x01}’s\nTRAINER CARD.{PAUSE 60}$" + .string "Finished checking {SPECIAL_F7 0x01}'s\nTRAINER CARD.{PAUSE 60}$" .align 2 gUnknown_082F0048:: @ 82F0048 diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index bbb7662ba..4ce7489c2 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -341,75 +341,75 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 step_end gText_082B6EA5:: @ 82B6EA5 - .string "Um, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "Um, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" .string "Snivel… This tension is getting to me…$" gText_082B6EEC:: @ 82B6EEC - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" .string "Here we come!$" gText_082B6F16:: @ 82B6F16 - .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n" + .string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n" .string "Accept my challenge!$" gText_082B6F4C:: @ 82B6F4C - .string "Um… I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…\n" + .string "Um… I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…\n" .string "Do you think someone like me can win?$" gText_082B6F92:: @ 82B6F92 - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" - .string "I’ll let you challenge me!$" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" + .string "I'll let you challenge me!$" gText_082B6FC9:: @ 82B6FC9 - .string "I’m horribly busy, but I also happen\n" - .string "to be {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" + .string "I'm horribly busy, but I also happen\n" + .string "to be {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$" gText_082B700C:: @ 82B700C - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" .string "Glad to meet you!$" gText_082B703A:: @ 82B703A - .string "I serve as {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "I serve as {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" .string "May I begin?$" gText_082B706A:: @ 82B706A - .string "Eek! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" - .string "I’ll do my best!$" + .string "Eek! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" + .string "I'll do my best!$" gText_082B709C:: @ 82B709C - .string "Yeehaw! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" - .string "Put ’em up!$" + .string "Yeehaw! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" + .string "Put 'em up!$" gText_082B70CC:: @ 82B70CC - .string "I’m {STR_VAR_1}’s 1,000th apprentice!\n" - .string "Actually, I’m no. {STR_VAR_2}! Here goes!$" + .string "I'm {STR_VAR_1}'s 1,000th apprentice!\n" + .string "Actually, I'm no. {STR_VAR_2}! Here goes!$" gText_082B710A:: @ 82B710A - .string "Yeah, I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!\n" - .string "Let’s get rockin’ and a-rollin’!$" + .string "Yeah, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n" + .string "Let's get rockin' and a-rollin'!$" gText_082B714D:: @ 82B714D - .string "Yippee-yahoo! I’m what you call\n" - .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + .string "Yippee-yahoo! I'm what you call\n" + .string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" gText_082B7185:: @ 82B7185 - .string "Cough! I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "Cough! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" .string "Good to meet you! Cough!$" gText_082B71C1:: @ 82B71C1 .string "This is nerve-racking…\n" - .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" + .string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" gText_082B71F9:: @ 82B71F9 - .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice,\n" - .string "and that’s no lie.$" + .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice,\n" + .string "and that's no lie.$" gText_082B7229:: @ 82B7229 .string "Are you… {PLAYER}?\n" .string "Oh! Sniff…sob…\p" .string "Oh! S-sorry…\n" - .string "I’m so nervous, I can’t help crying…\p" - .string "I’m {STR_VAR_1}, and I really look up\n" + .string "I'm so nervous, I can't help crying…\p" + .string "I'm {STR_VAR_1}, and I really look up\n" .string "to you, {PLAYER}.\p" .string "I… I had this dream of one day meeting\n" .string "you and asking you about POKéMON.\p" @@ -420,32 +420,32 @@ gText_082B731C:: @ 82B731C .string "Oh… B-but…\n" .string "Snivel… Waaaaaaah!\p" .string "Please!\n" - .string "I’m begging you, please!$" + .string "I'm begging you, please!$" gText_082B735B:: @ 82B735B .string "Oh, really? You will?\n" .string "Awesome! Wicked! Awoooh!\p" - .string "Oh… I’m sorry…\n" - .string "I’m so happy, I’m crying…\p" + .string "Oh… I'm sorry…\n" + .string "I'm so happy, I'm crying…\p" .string "Um… Then please tell me!\n" - .string "It’s about the BATTLE TOWER.\p" + .string "It's about the BATTLE TOWER.\p" .string "Which would be better for me: Level 50\n" .string "or the Open Level?$" gText_082B7423:: @ 82B7423 .string "{STR_VAR_1}?\n" .string "Waaaaah!\p" - .string "Oh! I’m so sorry!\n" - .string "You’ve made me happy by choosing\l" - .string "the level for me, and it’s made me cry…\p" + .string "Oh! I'm so sorry!\n" + .string "You've made me happy by choosing\l" + .string "the level for me, and it's made me cry…\p" .string "Snivel…\n" .string "Thank you so much!\l" .string "Please talk with me again!$" gText_082B74C1:: @ 82B74C1 - .string "Wowee! You’re {PLAYER}, aren’t you?\n" - .string "You’re awesomely strong, aren’t you?\p" - .string "I’m {STR_VAR_1}!\n" + .string "Wowee! You're {PLAYER}, aren't you?\n" + .string "You're awesomely strong, aren't you?\p" + .string "I'm {STR_VAR_1}!\n" .string "I just became a TRAINER!\p" .string "Please, {PLAYER}!\n" .string "Can you be my teacher and tell me\l" @@ -464,8 +464,8 @@ gText_082B75B2:: @ 82B75B2 .string "Which would be perfect for me?$" gText_082B763F:: @ 82B763F - .string "{STR_VAR_1}, huh? That’s true!\n" - .string "I’ll do my best there!\p" + .string "{STR_VAR_1}, huh? That's true!\n" + .string "I'll do my best there!\p" .string "If we meet here again, please teach\n" .string "me something else, teacher!$" @@ -473,9 +473,9 @@ gText_082B76AC:: @ 82B76AC .string "Um… Are you {PLAYER}?\n" .string "My name is {STR_VAR_1}.\p" .string "I want to become a POKéMON TRAINER,\n" - .string "but I don’t know what to do…\p" + .string "but I don't know what to do…\p" .string "So I thought maybe I could ask you for\n" - .string "advice because you’re so famous.\p" + .string "advice because you're so famous.\p" .string "{PLAYER}, could you give me advice?$" gText_082B7772:: @ 82B7772 @@ -486,7 +486,7 @@ gText_082B7772:: @ 82B7772 gText_082B77CE:: @ 82B77CE .string "Thank you!\n" - .string "Here’s my first question right away!\p" + .string "Here's my first question right away!\p" .string "The BATTLE TOWER has two levels,\n" .string "Level 50 and Open Level, right?\p" .string "Which level do you think is more\n" @@ -495,50 +495,50 @@ gText_082B77CE:: @ 82B77CE gText_082B7871:: @ 82B7871 .string "Oh, the {STR_VAR_1} challenge?\n" .string "Understood!\p" - .string "If I have another question, I’ll come\n" + .string "If I have another question, I'll come\n" .string "back here for your advice!$" gText_082B78D4:: @ 82B78D4 - .string "Oh? Huh? You’re…\n" - .string "No, that can’t be true.\p" - .string "There isn’t any way that someone\n" + .string "Oh? Huh? You're…\n" + .string "No, that can't be true.\p" + .string "There isn't any way that someone\n" .string "like me could meet {PLAYER}.\p" .string "…You really are {PLAYER}?\n" - .string "I can’t believe I’m talking to you!\p" + .string "I can't believe I'm talking to you!\p" .string "When something this good happens,\n" .string "only terrible things will happen to me\l" .string "now, I just know it…\p" - .string "…I’m sorry…\n" - .string "I’m… {STR_VAR_1}…\p" - .string "There isn’t anything special about\n" + .string "…I'm sorry…\n" + .string "I'm… {STR_VAR_1}…\p" + .string "There isn't anything special about\n" .string "me that I can be proud of…\p" - .string "I shouldn’t even say anything about\n" - .string "myself because you’ll forget…\p" + .string "I shouldn't even say anything about\n" + .string "myself because you'll forget…\p" .string "I had this dream that if I ever met\n" .string "you, {PLAYER}, that maybe I could ask\l" .string "you for advice as a TRAINER.\p" - .string "But I don’t think you would agree\n" + .string "But I don't think you would agree\n" .string "to that.\p" .string "…Or will you be so kind as to give\n" .string "me advice?$" gText_082B7B1A:: @ 82B7B1A .string "I knew it…\p" - .string "It had to happen because I’m such\n" + .string "It had to happen because I'm such\n" .string "a really boring nobody…\p" .string "But I thought just maybe…\n" - .string "You won’t reconsider, will you?\p" - .string "But I can’t give up just like that.\n" - .string "I’ll ask you while I’m still lucky!\p" + .string "You won't reconsider, will you?\p" + .string "But I can't give up just like that.\n" + .string "I'll ask you while I'm still lucky!\p" .string "Please, will you be so kind as to give\n" .string "me advice?$" gText_082B7C13:: @ 82B7C13 - .string "Really? I can’t believe it!\n" - .string "I can’t believe you’ll advise me!\l" - .string "I… I’m so happy…\p" + .string "Really? I can't believe it!\n" + .string "I can't believe you'll advise me!\l" + .string "I… I'm so happy…\p" .string "What I want to ask you is really\n" - .string "trivial, but I can’t decide…\p" + .string "trivial, but I can't decide…\p" .string "At the BATTLE TOWER, they let you\n" .string "choose Level 50 or Open Level.\p" .string "Which course do you think even I may\n" @@ -548,27 +548,27 @@ gText_082B7D18:: @ 82B7D18 .string "{STR_VAR_1}? Okay!\n" .string "But do you really think someone like\l" .string "me would have a chance?\p" - .string "I’ll do my best, even though I don’t\n" + .string "I'll do my best, even though I don't\n" .string "think it will work.\p" .string "Thank you very much for spending\n" .string "time with someone like me.$" gText_082B7DD4:: @ 82B7DD4 - .string "Oh! You’re {PLAYER}{STRING 5}, aren’t you?\p" - .string "I’ve heard that you’re tough at\n" + .string "Oh! You're {PLAYER}{STRING 5}, aren't you?\p" + .string "I've heard that you're tough at\n" .string "POKéMON!\p" - .string "I’m {STR_VAR_1}!\n" - .string "I’ll be your friend!\p" + .string "I'm {STR_VAR_1}!\n" + .string "I'll be your friend!\p" .string "Did you know?\p" - .string "You can’t win at the BATTLE FRONTIER\n" + .string "You can't win at the BATTLE FRONTIER\n" .string "if all you know is what they teach at\l" - .string "the TRAINER’S SCHOOL.\p" - .string "I’m willing to listen to your advice.\n" - .string "You’ll agree, of course?$" + .string "the TRAINER'S SCHOOL.\p" + .string "I'm willing to listen to your advice.\n" + .string "You'll agree, of course?$" gText_082B7EE5:: @ 82B7EE5 .string "Huh? Why are you refusing me?\n" - .string "It’s me who’s asking you!\l" + .string "It's me who's asking you!\l" .string "You have to reconsider!$" gText_082B7F35:: @ 82B7F35 @@ -583,20 +583,20 @@ gText_082B7FE8:: @ 82B7FE8 .string "Okay, {STR_VAR_1} is suitable for me?\n" .string "Thank you!\p" .string "Knowing that you made the decision,\n" - .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" + .string "{PLAYER}{STRING 5}, I won't be so upset if\l" .string "I lose.\p" - .string "Okay, I’ll look to you for advice again.\n" + .string "Okay, I'll look to you for advice again.\n" .string "Bye!$" gText_082B8087:: @ 82B8087 .string "Oh, hi, there! {PLAYER}{STRING 5}!\n" - .string "I know you because you’re famous!\l" + .string "I know you because you're famous!\l" .string "Call me {STR_VAR_1}! Glad to meet you!\p" - .string "I’m a TRIATHLETE, so I keep myself\n" + .string "I'm a TRIATHLETE, so I keep myself\n" .string "fit even while I raise POKéMON.\p" - .string "I’m also involved with other things\n" + .string "I'm also involved with other things\n" .string "like work, napping, ballroom dancing…\p" - .string "Being this busy, it’s not so easy for\n" + .string "Being this busy, it's not so easy for\n" .string "me to become a decent TRAINER.\p" .string "So, I have a proposition!\p" .string "There must be a reason why we met.\n" @@ -610,9 +610,9 @@ gText_082B822B:: @ 82B822B .string "Honestly, I need your advice!$" gText_082B8286:: @ 82B8286 - .string "Thank you! That’s more like it!\n" - .string "So, let’s start with an easy one!\p" - .string "You know about the BATTLE TOWER’s\n" + .string "Thank you! That's more like it!\n" + .string "So, let's start with an easy one!\p" + .string "You know about the BATTLE TOWER's\n" .string "two courses, right?\l" .string "You know, Level 50 and Open Level.\p" .string "Me being a busy guy, which one should\n" @@ -620,31 +620,31 @@ gText_082B8286:: @ 82B8286 gText_082B8356:: @ 82B8356 .string "{STR_VAR_1}, huh? Okay, gotcha.\n" - .string "I’ll find time somehow and give it a go!\p" - .string "…Whoops, I’d better go to work!\n" + .string "I'll find time somehow and give it a go!\p" + .string "…Whoops, I'd better go to work!\n" .string "Thanks! See you around!$" gText_082B83CE:: @ 82B83CE .string "No way! Uh-uh!\n" .string "Are you maybe the real {PLAYER}?\p" - .string "A-hah! Awesome! I’m {STR_VAR_1},\n" + .string "A-hah! Awesome! I'm {STR_VAR_1},\n" .string "so pleased to meet you!\p" - .string "{PLAYER}, you’re very strong,\n" - .string "aren’t you?\p" - .string "Everyone’s talking about you!\p" + .string "{PLAYER}, you're very strong,\n" + .string "aren't you?\p" + .string "Everyone's talking about you!\p" .string "Oh! I just had this great idea!\n" - .string "I’ll get advice off you, {PLAYER}!\l" - .string "I’m sure it will make me tougher!\p" - .string "Isn’t it a great idea?\n" + .string "I'll get advice off you, {PLAYER}!\l" + .string "I'm sure it will make me tougher!\p" + .string "Isn't it a great idea?\n" .string "Please, I want your advice!$" gText_082B84FC:: @ 82B84FC .string "Ahahaha, you can pretend to be mean,\n" - .string "but you can’t fool me!\l" - .string "You really mean okay, don’t you?$" + .string "but you can't fool me!\l" + .string "You really mean okay, don't you?$" gText_082B8559:: @ 82B8559 - .string "Yay! I knew you’d have a big heart,\n" + .string "Yay! I knew you'd have a big heart,\n" .string "{PLAYER}!\p" .string "What should I ask you first?\n" .string "…Oh, I thought of something!\p" @@ -659,20 +659,20 @@ gText_082B8656:: @ 82B8656 .string "Oh-oh-oh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thank you for a totally cool reply!\p" - .string "I guess that’s about all I wanted\n" + .string "I guess that's about all I wanted\n" .string "to ask you today.\p" - .string "Let’s meet here again, okay?\n" + .string "Let's meet here again, okay?\n" .string "Thanks!$" gText_082B86EA:: @ 82B86EA .string "I beg your pardon, but…\n" .string "Are you {PLAYER}?\p" - .string "I’m {STR_VAR_1}, and I am delighted to\n" + .string "I'm {STR_VAR_1}, and I am delighted to\n" .string "make your acquaintance.\p" .string "I have long been an admirer\n" .string "of yours…\p" .string "… … … … … …\p" - .string "Um… I hope you don’t find this\n" + .string "Um… I hope you don't find this\n" .string "request too much of a burden, but…\p" .string "May I become your apprentice,\n" .string "{PLAYER}?$" @@ -682,13 +682,13 @@ gText_082B87DA:: @ 82B87DA .string "… … … … … …\n" .string "… … … … … …\p" .string "…I must have fainted from shock.\n" - .string "I’m sorry, I must have misheard you.\p" + .string "I'm sorry, I must have misheard you.\p" .string "Please! Please say that you will\n" .string "accept me as your apprentice!$" gText_082B887C:: @ 82B887C - .string "Oh… I’m delighted!\p" - .string "I don’t wish to waste your time,\n" + .string "Oh… I'm delighted!\p" + .string "I don't wish to waste your time,\n" .string "so please advise me on this.\p" .string "I plan to take a BATTLE TOWER\n" .string "challenge soon.\p" @@ -706,10 +706,10 @@ gText_082B8957:: @ 82B8957 gText_082B89C6:: @ 82B89C6 .string "Eek! Eek! {PLAYER}!\n" .string "You spoke to me!\l" - .string "I… I’m overjoyed!\p" + .string "I… I'm overjoyed!\p" .string "Me! My name is {STR_VAR_1}!\n" .string "I just became a TRAINER!\p" - .string "I’m delighted I met you, {PLAYER},\n" + .string "I'm delighted I met you, {PLAYER},\n" .string "the big name in POKéMON circles!\p" .string "Oh-oh-oh, I know!\n" .string "May I ask a huge favor, {PLAYER}?\p" @@ -719,7 +719,7 @@ gText_082B89C6:: @ 82B89C6 gText_082B8ACF:: @ 82B8ACF .string "Waaaah!\n" .string "{PLAYER} turned me down…\l" - .string "It… It’s an invaluable experience!\p" + .string "It… It's an invaluable experience!\p" .string "{PLAYER}, please! I want to hear\n" .string "an affirmative answer this time!\p" .string "I beg you for your guidance!$" @@ -727,26 +727,26 @@ gText_082B8ACF:: @ 82B8ACF gText_082B8B66:: @ 82B8B66 .string "Hieeeeh! {PLAYER} said yes!\n" .string "{PLAYER} said yes!\p" - .string "I won’t be able to sleep tonight…\n" + .string "I won't be able to sleep tonight…\n" .string "Thank you ever so much!\p" - .string "Then, here’s my question!\p" + .string "Then, here's my question!\p" .string "At the BATTLE TOWER, what is right\n" .string "for me, Level 50 or Open Level?$" gText_082B8C20:: @ 82B8C20 .string "{STR_VAR_1}! Perfectly understood!\n" .string "I understand perfectly!\l" - .string "I’m deliriously delighted!\p" - .string "I hope you’ll be willing to teach me\n" + .string "I'm deliriously delighted!\p" + .string "I hope you'll be willing to teach me\n" .string "some more another time.$" gText_082B8CAA:: @ 82B8CAA .string "Whoa! Could you be…\n" .string "Might you be… {PLAYER}{STRING 5}?!\l" .string "That strong and famous TRAINER?\l" - .string "Well, hello, aren’t I just the luckiest!\p" - .string "Hello, the name’s {STR_VAR_1}!\p" - .string "I’ve been on the lookout for\n" + .string "Well, hello, aren't I just the luckiest!\p" + .string "Hello, the name's {STR_VAR_1}!\p" + .string "I've been on the lookout for\n" .string "a POKéMON teacher.\p" .string "And with impeccably good timing,\n" .string "along came you, {PLAYER}{STRING 5}!\p" @@ -755,12 +755,12 @@ gText_082B8CAA:: @ 82B8CAA gText_082B8DD3:: @ 82B8DD3 .string "Gwaaaah!\n" - .string "You’re quite cool and tough…\p" - .string "Don’t be that way, please.\n" - .string "I’m asking you!$" + .string "You're quite cool and tough…\p" + .string "Don't be that way, please.\n" + .string "I'm asking you!$" gText_082B8E24:: @ 82B8E24 - .string "Oh, yeah! That’s a solid reply!\n" + .string "Oh, yeah! That's a solid reply!\n" .string "Excellent, I might add!\p" .string "So how about a first piece of advice\n" .string "on the BATTLE TOWER?\p" @@ -770,26 +770,26 @@ gText_082B8E24:: @ 82B8E24 gText_082B8ED5:: @ 82B8ED5 .string "Uh-huh, {STR_VAR_1} it is!\n" .string "OK, A-OK!\l" - .string "I’ll go show my mettle, like, jam!\p" - .string "All right, I’ll look to you as my mentor!\n" + .string "I'll go show my mettle, like, jam!\p" + .string "All right, I'll look to you as my mentor!\n" .string "Adios!$" gText_082B8F45:: @ 82B8F45 .string "Oh, hey, {PLAYER}{STRING 5}, right?\n" .string "The police were looking for you!\p" .string "… … …\n" - .string "Of course I’m lying!\p" - .string "Me, I’m {STR_VAR_1}. Despite the way\n" - .string "I look, I’m the POKéMON CHAMPION!\l" - .string "…That’s a lie, too!\p" + .string "Of course I'm lying!\p" + .string "Me, I'm {STR_VAR_1}. Despite the way\n" + .string "I look, I'm the POKéMON CHAMPION!\l" + .string "…That's a lie, too!\p" .string "This is no lie, though.\n" - .string "I’m not very good at battling.\p" + .string "I'm not very good at battling.\p" .string "So, how about you becoming my master\n" .string "about all things POKéMON?$" gText_082B905F:: @ 82B905F - .string "If you’re going to act cold like that,\n" - .string "I’ll show you what I’ll do!\p" + .string "If you're going to act cold like that,\n" + .string "I'll show you what I'll do!\p" .string "Waaah! Waaah! Waaah!\n" .string "Hiccup!\p" .string "Hahaha, that was my FAKE TEARS!\p" @@ -798,89 +798,89 @@ gText_082B905F:: @ 82B905F gText_082B910E:: @ 82B910E .string "Yippee!\n" - .string "I’ll buy you a boat for that!\p" - .string "Of course I’m lying again!\n" + .string "I'll buy you a boat for that!\p" + .string "Of course I'm lying again!\n" .string "But… Thank you, master!\p" - .string "You know how there’s Level 50 and\n" + .string "You know how there's Level 50 and\n" .string "Open Level at the BATTLE TOWER?\p" - .string "I’m having trouble deciding which\n" + .string "I'm having trouble deciding which\n" .string "level I should challenge…\p" .string "Can you decide for me, master?$" gText_082B9204:: @ 82B9204 .string "Okay, so {STR_VAR_1} is better!\n" - .string "I’ll go to the other level, then!\p" + .string "I'll go to the other level, then!\p" .string "Just kidding!\n" - .string "I’ll obey your teaching, master!\p" + .string "I'll obey your teaching, master!\p" .string "Thanks, master!\n" - .string "I hope you’ll keep teaching me!$" + .string "I hope you'll keep teaching me!$" gText_082B929C:: @ 82B929C .string "A-H-O-Y!\n" .string "And that spells ahoy, and it means hi!\p" - .string "I’m {STR_VAR_1}, the rappin’ SAILOR\n" + .string "I'm {STR_VAR_1}, the rappin' SAILOR\n" .string "am I!\p" .string "Your turn now, tell me a little about\n" .string "yourself, give it a try!\p" .string "Uh-huh, uh-huh!\n" - .string "{PLAYER}{STRING 5}’s your name,\l" - .string "and POKéMON’s your game!\p" - .string "And you’re at a delicate age\n" - .string "when all the world’s your stage!\p" + .string "{PLAYER}{STRING 5}'s your name,\l" + .string "and POKéMON's your game!\p" + .string "And you're at a delicate age\n" + .string "when all the world's your stage!\p" .string "Anyway, I just want to say,\n" - .string "that you’re the tenth TRAINER\l" - .string "I’ve spoken to today.\p" - .string "Let’s make that a celebration!\n" + .string "that you're the tenth TRAINER\l" + .string "I've spoken to today.\p" + .string "Let's make that a celebration!\n" .string "Become my mentor for commemoration!$" gText_082B9438:: @ 82B9438 .string "But!\n" .string "You have to work with me!\p" - .string "Don’t be such a tease!\n" + .string "Don't be such a tease!\n" .string "Become my mentor, please!$" gText_082B9488:: @ 82B9488 - .string "That’s it!\n" - .string "{PLAYER}, you’ve got the spirit!\p" - .string "So here’s my first question\n" + .string "That's it!\n" + .string "{PLAYER}, you've got the spirit!\p" + .string "So here's my first question\n" .string "that begs your suggestion!\p" - .string "It’s about the BATTLE TOWER,\n" + .string "It's about the BATTLE TOWER,\n" .string "and it hinges on my power!\p" .string "Level 50 and Open Level there be,\n" - .string "which is the one that’s good for me?$" + .string "which is the one that's good for me?$" gText_082B9564:: @ 82B9564 .string "Okay, {STR_VAR_1} it is, you say!\n" - .string "I’ll go and take it on my way!\p" - .string "If it’s advice I ever need,\n" - .string "{PLAYER}, your word I’ll always heed!$" + .string "I'll go and take it on my way!\p" + .string "If it's advice I ever need,\n" + .string "{PLAYER}, your word I'll always heed!$" gText_082B95D8:: @ 82B95D8 - .string "Say, hey, aren’t you {PLAYER}?\n" + .string "Say, hey, aren't you {PLAYER}?\n" .string "What should I do? Talk to you?\l" - .string "Why not? I’m already talking to you!\p" + .string "Why not? I'm already talking to you!\p" .string "{PLAYER}, are you surprised at me?\n" - .string "I’d better tell you who I happen to be!\p" + .string "I'd better tell you who I happen to be!\p" .string "{STR_VAR_1} is what you can call me.\n" .string "The brightest star in guitardom,\l" - .string "that’s me!\p" + .string "that's me!\p" .string "Are you receiving me?\n" .string "You are receiving me!\p" - .string "My luck’s at its best,\n" - .string "I’ll hit you with a request!\p" + .string "My luck's at its best,\n" + .string "I'll hit you with a request!\p" .string "{PLAYER}, let me be your underling!\n" .string "I want you to teach me everything!$" gText_082B9763:: @ 82B9763 - .string "You’re turning me down, then?\n" - .string "I’ll just have to ask you again!\p" + .string "You're turning me down, then?\n" + .string "I'll just have to ask you again!\p" .string "{PLAYER}, I beg to be your underling!\n" .string "I need you to teach me everything!$" gText_082B97E5:: @ 82B97E5 .string "Lucky, yeah, woohoo!\n" .string "Should I pop a question to you?\p" - .string "Since we’re near the BATTLE TOWER,\n" + .string "Since we're near the BATTLE TOWER,\n" .string "how about a question about its power?\p" .string "Of the choices you see,\n" .string "which is the right one for me?$" @@ -889,69 +889,69 @@ gText_082B989A:: @ 82B989A .string "If {STR_VAR_1} is what you suggest,\n" .string "it must be the very best!\p" .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don’t you forget about me.\p" + .string "but don't you forget about me.\p" .string "See you again, my smart friend!$" gText_082B992D:: @ 82B992D .string "Oh, hi! You there!\n" .string "Can I get you to massage my shoulder?\p" - .string "…Yes, there! That’s it!\n" + .string "…Yes, there! That's it!\n" .string "Ouch, ouch! Oooh, that feels great!\p" - .string "My name’s {STR_VAR_1}.\n" - .string "I take karate training, but my body’s\l" + .string "My name's {STR_VAR_1}.\n" + .string "I take karate training, but my body's\l" .string "not built to take the abuse…\p" - .string "I decided I’ll battle POKéMON and\n" + .string "I decided I'll battle POKéMON and\n" .string "toughen myself up.\p" - .string "You’re {PLAYER}{STRING 5}, aren’t you?\n" + .string "You're {PLAYER}{STRING 5}, aren't you?\n" .string "The POKéMON LEAGUE CHAMP?\p" .string "Listen, can I get you to give me\n" .string "advice?$" gText_082B9A84:: @ 82B9A84 .string "Oh, why?\p" - .string "I won’t be a big bother, I promise!\n" + .string "I won't be a big bother, I promise!\n" .string "Please?$" gText_082B9AB9:: @ 82B9AB9 .string "Thank you. Mighty good of you!\n" .string "…Cough! Cough!\p" .string "Oogh, I have to toughen up quick…\p" - .string "I’ll be heading off to the BATTLE TOWER\n" + .string "I'll be heading off to the BATTLE TOWER\n" .string "right away, but what would be better\l" .string "for me? Level 50 or Open Level?$" gText_082B9B76:: @ 82B9B76 - .string "Hm, all right. That’s {STR_VAR_1}.\n" - .string "I’ll go there right away.\p" + .string "Hm, all right. That's {STR_VAR_1}.\n" + .string "I'll go there right away.\p" .string "I hope I can keep hitting you up for\n" - .string "help--after all, you’re my mentor!$" + .string "help--after all, you're my mentor!$" gText_082B9BF2:: @ 82B9BF2 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" - .string "Please, don’t look at me that way.\n" - .string "You’re making me all self-conscious.\p" - .string "I… I’m {STR_VAR_1}.\p" - .string "I’m really embarrassed to say this,\n" + .string "Please, don't look at me that way.\n" + .string "You're making me all self-conscious.\p" + .string "I… I'm {STR_VAR_1}.\p" + .string "I'm really embarrassed to say this,\n" .string "but I explore ancient ruins and such.\p" - .string "I’m even more embarrassed to admit\n" - .string "I’m interested in the BATTLE FRONTIER.\p" + .string "I'm even more embarrassed to admit\n" + .string "I'm interested in the BATTLE FRONTIER.\p" .string "{PLAYER}{STRING 5}, you have a reputation as\n" .string "a tough TRAINER…\p" - .string "It’s hard for me to say this,\n" + .string "It's hard for me to say this,\n" .string "but I want to ask something.\p" .string "Could you become my teacher and\n" .string "give me advice?$" gText_082B9D83:: @ 82B9D83 - .string "Please don’t brush me off like this!\n" - .string "I can’t live with the humiliation.\p" + .string "Please don't brush me off like this!\n" + .string "I can't live with the humiliation.\p" .string "Please become my teacher!\n" .string "I need your advice!$" gText_082B9DF9:: @ 82B9DF9 .string "Th-thank you…\p" - .string "But please don’t look at me like that.\n" + .string "But please don't look at me like that.\n" .string "It makes me all flustered.\p" .string "Please, answer me without looking\n" .string "at my eyes.\p" @@ -960,7 +960,7 @@ gText_082B9DF9:: @ 82B9DF9 gText_082B9EAA:: @ 82B9EAA .string "Oh… Okay!\n" - .string "I’ll try my hand at that.\p" + .string "I'll try my hand at that.\p" .string "I hope I can make a valiant challenge\n" .string "without getting all flustered…\p" .string "Thank you, {PLAYER}{STRING 5}.\n" @@ -973,9 +973,9 @@ gText_082B9F55:: @ 82B9F55 .string "You may call me {STR_VAR_1}.\p" .string "I have been toying with the idea of\n" .string "apprenticing under a strong TRAINER.\p" - .string "So, I must say I’m lucky you came along!\n" + .string "So, I must say I'm lucky you came along!\n" .string "…You really are {PLAYER}{STRING 5}, yes?\p" - .string "No, no, if you are real, it’s fine.\n" + .string "No, no, if you are real, it's fine.\n" .string "I merely want you to recognize me\l" .string "as your apprentice.$" @@ -989,7 +989,7 @@ gText_082BA084:: @ 82BA084 gText_082BA11D:: @ 82BA11D .string "You really are accepting me?\n" - .string "I don’t wish to celebrate prematurely.\p" + .string "I don't wish to celebrate prematurely.\p" .string "If it is true, I apologize.\n" .string "But now, I need your advice.\p" .string "If I were to enter the BATTLE TOWER,\n" @@ -999,7 +999,7 @@ gText_082BA11D:: @ 82BA11D gText_082BA1F3:: @ 82BA1F3 .string "{STR_VAR_1}?\n" .string "Are you certain?\p" - .string "I see. If that’s the case, that’s fine.\n" + .string "I see. If that's the case, that's fine.\n" .string "I thank you for your time.\p" .string "I realize I can annoy, but it delights\n" .string "me that you have accepted me.\p" @@ -1008,38 +1008,38 @@ gText_082BA1F3:: @ 82BA1F3 gText_082BA2A3:: @ 82BA2A3 .string "Sigh… Sob…\n" .string "Oh, {PLAYER}!\p" - .string "I’m all tangled up in a dilemma\n" - .string "that I can’t decide.\p" - .string "I can’t decide what I should make\n" + .string "I'm all tangled up in a dilemma\n" + .string "that I can't decide.\p" + .string "I can't decide what I should make\n" .string "my {STR_VAR_1} hold.\p" .string "Please tell me, {PLAYER}.\n" .string "What item should I make it hold?$" gText_082BA34E:: @ 82BA34E - .string "Oh, really? I shouldn’t make\n" + .string "Oh, really? I shouldn't make\n" .string "my {STR_VAR_1} hold anything?$" gText_082BA380:: @ 82BA380 - .string "Oh, okay! I’m delighted it’s settled!\n" + .string "Oh, okay! I'm delighted it's settled!\n" .string "Awesome! Wicked! Awoooh!\p" .string "Thank you so much!$" gText_082BA3D2:: @ 82BA3D2 - .string "Oh, I’m so glad…\n" + .string "Oh, I'm so glad…\n" .string "I think I have that {STR_VAR_1}, too.\p" - .string "I’m delighted it’s settled!\n" + .string "I'm delighted it's settled!\n" .string "Awesome! Wicked! Awoooh!\p" .string "Thank you so much!$" gText_082BA448:: @ 82BA448 - .string "Waaaah! Please don’t be mean!\p" + .string "Waaaah! Please don't be mean!\p" .string "That item {STR_VAR_1} was already\n" .string "recommended to me before, sob…\p" - .string "Or do you mean I shouldn’t make\n" + .string "Or do you mean I shouldn't make\n" .string "my {STR_VAR_2} hold anything?$" gText_082BA4D3:: @ 82BA4D3 - .string "Yay! It’s {PLAYER}!\n" + .string "Yay! It's {PLAYER}!\n" .string "Great! I wanted to ask you something!\p" .string "Do you make your POKéMON hold items?\n" .string "I want to make mine hold items, but…\p" @@ -1048,33 +1048,33 @@ gText_082BA4D3:: @ 82BA4D3 .string "What do you think?$" gText_082BA58C:: @ 82BA58C - .string "Huh? You mean my {STR_VAR_1} doesn’t\n" + .string "Huh? You mean my {STR_VAR_1} doesn't\n" .string "have to hold anything?$" gText_082BA5BF:: @ 82BA5BF - .string "Oh, I get it! I’ll do that!\n" + .string "Oh, I get it! I'll do that!\n" .string "Thanks for teaching me!$" gText_082BA5F3:: @ 82BA5F3 .string "Oh, wow! One {STR_VAR_1}, huh?\n" - .string "Okay, I’ll do that!\p" + .string "Okay, I'll do that!\p" .string "Thanks for teaching me!$" gText_082BA635:: @ 82BA635 - .string "Oh, uh, no, that’s not what I meant.\n" + .string "Oh, uh, no, that's not what I meant.\n" .string "I want to know about a different item\l" .string "than the ones I already know.\p" - .string "Or do you mean that my POKéMON doesn’t\n" + .string "Or do you mean that my POKéMON doesn't\n" .string "have to hold anything this time?$" gText_082BA6E6:: @ 82BA6E6 .string "{PLAYER}, hello!\n" - .string "It’s about my {STR_VAR_1}…\p" + .string "It's about my {STR_VAR_1}…\p" .string "I want to make it hold a good item.\n" .string "What would be good for it?$" gText_082BA742:: @ 82BA742 - .string "Oh, then my {STR_VAR_1} doesn’t have\n" + .string "Oh, then my {STR_VAR_1} doesn't have\n" .string "to hold anything?$" gText_082BA770:: @ 82BA770 @@ -1084,7 +1084,7 @@ gText_082BA770:: @ 82BA770 gText_082BA78F:: @ 82BA78F .string "Oh, the item {STR_VAR_1}?\n" .string "Understood!\p" - .string "I’ll do my best to find one!\n" + .string "I'll do my best to find one!\n" .string "See you again!$" gText_082BA7D8:: @ 82BA7D8 @@ -1092,17 +1092,17 @@ gText_082BA7D8:: @ 82BA7D8 .string "the {STR_VAR_1} already.\p" .string "I want my POKéMON to hold a different\n" .string "kind of item.\p" - .string "Or do you think {STR_VAR_2} doesn’t\n" + .string "Or do you think {STR_VAR_2} doesn't\n" .string "have to hold anything?$" gText_082BA867:: @ 82BA867 .string "Hello, {PLAYER}…\n" - .string "I’m sorry to disturb you, but I have\l" + .string "I'm sorry to disturb you, but I have\l" .string "something else I wanted to ask you.\p" - .string "I don’t think I’m good enough to win\n" - .string "matches on my own, so I’m thinking of\l" + .string "I don't think I'm good enough to win\n" + .string "matches on my own, so I'm thinking of\l" .string "making my {STR_VAR_1} hold an item.\p" - .string "But I don’t know what would be good.\p" + .string "But I don't know what would be good.\p" .string "{PLAYER}, please, could you decide\n" .string "for me?$" @@ -1112,27 +1112,27 @@ gText_082BA96B:: @ 82BA96B gText_082BA9B7:: @ 82BA9B7 .string "I understand…\n" - .string "You’re saying I shouldn’t rely on items.\l" - .string "I’ll do my best not to!\p" + .string "You're saying I shouldn't rely on items.\l" + .string "I'll do my best not to!\p" .string "Thank you very much!$" gText_082BAA1B:: @ 82BAA1B .string "The item {STR_VAR_1}, okay.\n" - .string "I’m not sure if I can get one…\l" - .string "No! I’ll do my best to get it.\p" + .string "I'm not sure if I can get one…\l" + .string "No! I'll do my best to get it.\p" .string "Thank you very much!$" gText_082BAA81:: @ 82BAA81 .string "Oh, but…\n" - .string "I think I’ve heard about that before…\p" - .string "Is it maybe because I haven’t handled\n" + .string "I think I've heard about that before…\p" + .string "Is it maybe because I haven't handled\n" .string "the item {STR_VAR_1} very well?\p" - .string "Or do you mean I shouldn’t make\n" + .string "Or do you mean I shouldn't make\n" .string "my {STR_VAR_2} hold anything?$" gText_082BAB22:: @ 82BAB22 .string "Oh, {PLAYER}{STRING 5}.\n" - .string "There’s something I wanted to ask you.\p" + .string "There's something I wanted to ask you.\p" .string "You know how you decided which\n" .string "POKéMON I should have for me?\p" .string "But I never asked you what item\n" @@ -1147,20 +1147,20 @@ gText_082BAC43:: @ 82BAC43 .string "the best it can empty-handed?$" gText_082BAC78:: @ 82BAC78 - .string "If you think that’s best, I’ll do that.\p" + .string "If you think that's best, I'll do that.\p" .string "Knowing that you made the decision,\n" - .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" + .string "{PLAYER}{STRING 5}, I won't be so upset if\l" .string "I lose.\p" - .string "Okay, I’ll look to you for advice again.\n" + .string "Okay, I'll look to you for advice again.\n" .string "Bye!$" gText_082BAD17:: @ 82BAD17 .string "The item {STR_VAR_1}, huh?\n" - .string "Not bad. I’ll use it!\p" + .string "Not bad. I'll use it!\p" .string "Knowing that you made the decision,\n" - .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" + .string "{PLAYER}{STRING 5}, I won't be so upset if\l" .string "I lose.\p" - .string "Okay, I’ll look to you for advice again.\n" + .string "Okay, I'll look to you for advice again.\n" .string "Bye!$" gText_082BADB6:: @ 82BADB6 @@ -1172,31 +1172,31 @@ gText_082BADB6:: @ 82BADB6 gText_082BAE36:: @ 82BAE36 .string "Yo, {PLAYER}{STRING 5}!\p" - .string "We’re both busy, but we seem to run\n" + .string "We're both busy, but we seem to run\n" .string "into each other often anyway!\p" .string "Today I have to do some walking,\n" .string "cleaning, and brushing.\p" - .string "I haven’t even had the time to buy\n" + .string "I haven't even had the time to buy\n" .string "my precious {STR_VAR_1} anything.\p" - .string "I don’t have any time, so how about\n" + .string "I don't have any time, so how about\n" .string "giving me advice on what I should make\l" .string "my {STR_VAR_1} hold?$" gText_082BAF4E:: @ 82BAF4E .string "Oh, so me being a busy guy, you say\n" - .string "my {STR_VAR_1} doesn’t need anything?$" + .string "my {STR_VAR_1} doesn't need anything?$" gText_082BAF8F:: @ 82BAF8F .string "Okay, gotcha.\n" - .string "I won’t need any time for that.\p" + .string "I won't need any time for that.\p" .string "Thanks today!\n" .string "See you around!$" gText_082BAFDB:: @ 82BAFDB .string "Okay, gotcha.\n" - .string "I’ll find time somehow and find\l" + .string "I'll find time somehow and find\l" .string "that {STR_VAR_1} you recommended.\p" - .string "I’m glad I met a good mentor in you.\n" + .string "I'm glad I met a good mentor in you.\n" .string "Thanks! See you around!$" gText_082BB05F:: @ 82BB05F @@ -1204,10 +1204,10 @@ gText_082BB05F:: @ 82BB05F .string "that {STR_VAR_1}.\p" .string "Oh, right, I get it.\n" .string "So me being a busy guy, you say\l" - .string "my {STR_VAR_2} doesn’t need anything?$" + .string "my {STR_VAR_2} doesn't need anything?$" gText_082BB0D4:: @ 82BB0D4 - .string "Hiya, {PLAYER}! It’s me!\n" + .string "Hiya, {PLAYER}! It's me!\n" .string "I need to tap your mind again today.\l" .string "Please, I need your advice!\p" .string "Drum roll, please!\n" @@ -1216,42 +1216,42 @@ gText_082BB0D4:: @ 82BB0D4 .string "an item, what should it be?$" gText_082BB18C:: @ 82BB18C - .string "Is that right? My {STR_VAR_1} doesn’t\n" - .string "need to hold an item, you’re saying.$" + .string "Is that right? My {STR_VAR_1} doesn't\n" + .string "need to hold an item, you're saying.$" gText_082BB1CE:: @ 82BB1CE - .string "Okay, that’s what I’ll do!\p" - .string "I guess that’s about all I wanted\n" + .string "Okay, that's what I'll do!\p" + .string "I guess that's about all I wanted\n" .string "to ask you today.\p" - .string "Let’s meet here again, okay?\n" + .string "Let's meet here again, okay?\n" .string "Thanks!$" gText_082BB242:: @ 82BB242 .string "Uh-huh! One {STR_VAR_1}.\n" .string "What a cool choice!\l" - .string "I’ll definitely try that!\p" - .string "I guess that’s about all I wanted\n" + .string "I'll definitely try that!\p" + .string "I guess that's about all I wanted\n" .string "to ask you today.\p" - .string "Let’s meet here again, okay?\n" + .string "Let's meet here again, okay?\n" .string "Thanks!$" gText_082BB2D9:: @ 82BB2D9 - .string "Ahahah! That’s silly!\n" + .string "Ahahah! That's silly!\n" .string "You already told me about that\l" .string "{STR_VAR_1} before!\p" .string "Are you feeling okay, {PLAYER}?\p" - .string "Oh, wait! My {STR_VAR_2} doesn’t\n" - .string "need to hold an item, you’re saying.$" + .string "Oh, wait! My {STR_VAR_2} doesn't\n" + .string "need to hold an item, you're saying.$" gText_082BB370:: @ 82BB370 - .string "Hello, {PLAYER}. I hope you’ve been\n" + .string "Hello, {PLAYER}. I hope you've been\n" .string "keeping well.\p" .string "May I approach you for advice?\p" .string "In a recent battle, my opponent\n" .string "seemed to have given his POKéMON\l" .string "an item to hold.\p" .string "As a result, I was defeated…\p" - .string "I don’t wish to be left behind.\n" + .string "I don't wish to be left behind.\n" .string "I would like to make my {STR_VAR_1}\l" .string "hold an item, too.\p" .string "It would please me if you could decide\n" @@ -1276,35 +1276,35 @@ gText_082BB575:: @ 82BB575 .string "Please take care!$" gText_082BB5E1:: @ 82BB5E1 - .string "You’ve already told me about that,\n" + .string "You've already told me about that,\n" .string "and I already have it.\p" .string "Or are you saying… My POKéMON has\n" .string "no need to hold an item?$" gText_082BB656:: @ 82BB656 .string "Eek! {PLAYER}!\n" - .string "I… I’m overjoyed to see you again!\p" - .string "Oh-oh-oh! There’s something I just\n" + .string "I… I'm overjoyed to see you again!\p" + .string "Oh-oh-oh! There's something I just\n" .string "had to ask you, {PLAYER}!\p" .string "Please decide what my {STR_VAR_1}\n" .string "should be holding!$" gText_082BB6E5:: @ 82BB6E5 - .string "Oh, wow! I didn’t expect that answer!\n" - .string "So, a hold item isn’t necessary?$" + .string "Oh, wow! I didn't expect that answer!\n" + .string "So, a hold item isn't necessary?$" gText_082BB72C:: @ 82BB72C .string "Perfectly understood!\n" - .string "I’ll keep at this without an item!\p" - .string "I hope you’ll be willing to teach me\n" + .string "I'll keep at this without an item!\p" + .string "I hope you'll be willing to teach me\n" .string "some more another time.$" gText_082BB7A2:: @ 82BB7A2 - .string "{STR_VAR_1}! I’ll use that!\p" + .string "{STR_VAR_1}! I'll use that!\p" .string "Um… Could it be, {PLAYER}, you also\n" .string "make your POKéMON hold that item?\p" - .string "I’ll be sure to get it!\n" - .string "I hope you’ll be willing to teach me\l" + .string "I'll be sure to get it!\n" + .string "I hope you'll be willing to teach me\l" .string "some more another time.$" gText_082BB84A:: @ 82BB84A @@ -1312,7 +1312,7 @@ gText_082BB84A:: @ 82BB84A .string "{STR_VAR_1} before, too.\p" .string "Or is it the best thing to hold?\n" .string "Or do you mean that my {STR_VAR_2}\l" - .string "doesn’t need anything to hold?$" + .string "doesn't need anything to hold?$" gText_082BB8CD:: @ 82BB8CD .string "Hola!\n" @@ -1321,23 +1321,23 @@ gText_082BB8CD:: @ 82BB8CD .string "POKéMON tools.\p" .string "What do you think would be good for\n" .string "my {STR_VAR_1} to hold?\p" - .string "Don’t be shy now.\n" - .string "Let’s blurt it out!$" + .string "Don't be shy now.\n" + .string "Let's blurt it out!$" gText_082BB970:: @ 82BB970 - .string "Oh? So, you’re saying my {STR_VAR_1}\n" + .string "Oh? So, you're saying my {STR_VAR_1}\n" .string "can win without holding any item?$" gText_082BB9AE:: @ 82BB9AE .string "Si, bueno!\n" - .string "I’ll give it my best shot, like, slam!\p" + .string "I'll give it my best shot, like, slam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" gText_082BBA05:: @ 82BBA05 - .string "Uh-huh, that’s one {STR_VAR_1}?\n" + .string "Uh-huh, that's one {STR_VAR_1}?\n" .string "Si, bueno!\l" - .string "I’ll go find me one, like, bam!\p" + .string "I'll go find me one, like, bam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" @@ -1345,7 +1345,7 @@ gText_082BBA6C:: @ 82BBA6C .string "No, no! You already told me about\n" .string "that {STR_VAR_1} thing before.\p" .string "Oh, now wait just one minute here…\n" - .string "So, you’re saying my {STR_VAR_2}\l" + .string "So, you're saying my {STR_VAR_2}\l" .string "can win without holding any item?$" gText_082BBB01:: @ 82BBB01 @@ -1353,122 +1353,122 @@ gText_082BBB01:: @ 82BBB01 .string "has happened!\p" .string "I woke up this morning, and my POKéMON\n" .string "had 10 NUGGETS!\p" - .string "Of course I’m lying!\n" + .string "Of course I'm lying!\n" .string "Wahahaha!\p" .string "This is no lie, though.\n" - .string "I’m not very good at thinking about\l" + .string "I'm not very good at thinking about\l" .string "what items POKéMON should hold.\p" .string "So, how about deciding for me what\n" .string "my {STR_VAR_1} should hold, master?$" gText_082BBC1C:: @ 82BBC1C - .string "What’s that mean?\n" - .string "Don’t make it hold anything?$" + .string "What's that mean?\n" + .string "Don't make it hold anything?$" gText_082BBC4B:: @ 82BBC4B - .string "Okay, so it shouldn’t hold anything.\n" - .string "Then, I’d better get something for it!\p" + .string "Okay, so it shouldn't hold anything.\n" + .string "Then, I'd better get something for it!\p" .string "Just kidding!\n" - .string "I’ll obey your teaching, master!\p" + .string "I'll obey your teaching, master!\p" .string "Thanks, master!\n" - .string "I hope you’ll keep teaching me!$" + .string "I hope you'll keep teaching me!$" gText_082BBCF6:: @ 82BBCF6 - .string "Okay, so it’s one {STR_VAR_1}!\n" - .string "I’ll make it hold anything but that!\p" + .string "Okay, so it's one {STR_VAR_1}!\n" + .string "I'll make it hold anything but that!\p" .string "Just kidding!\n" - .string "I’ll obey your teaching, master!\p" + .string "I'll obey your teaching, master!\p" .string "Thanks, master!\n" - .string "I hope you’ll keep teaching me!$" + .string "I hope you'll keep teaching me!$" gText_082BBD90:: @ 82BBD90 .string "Um, you told me about that before,\n" - .string "didn’t you?\p" - .string "Isn’t there something else?\p" - .string "Or do you mean, don’t make\n" + .string "didn't you?\p" + .string "Isn't there something else?\p" + .string "Or do you mean, don't make\n" .string "my {STR_VAR_2} hold anything?$" gText_082BBE0B:: @ 82BBE0B .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" - .string "The rappin’ SAILOR am I!\n" + .string "The rappin' SAILOR am I!\n" .string "I present to you a question\l" - .string "that’s pretty fly!\p" - .string "It’s an item question\n" + .string "that's pretty fly!\p" + .string "It's an item question\n" .string "that begs your suggestion!\p" .string "My {STR_VAR_1} needs an item to hold,\n" .string "What should it be, if I may be bold?$" gText_082BBEE5:: @ 82BBEE5 .string "Is that right?\n" - .string "My {STR_VAR_1} doesn’t need to be\l" + .string "My {STR_VAR_1} doesn't need to be\l" .string "holding anything tight?$" gText_082BBF25:: @ 82BBF25 .string "Okay, I hear you, sure I do!\n" .string "My POKéMON will go empty-handed, too!\p" - .string "If it’s advice I ever need,\n" - .string "{PLAYER}, your word I’ll always heed!$" + .string "If it's advice I ever need,\n" + .string "{PLAYER}, your word I'll always heed!$" gText_082BBFA4:: @ 82BBFA4 .string "Okay, one {STR_VAR_1},\n" - .string "that’s what I’ll use.\l" + .string "that's what I'll use.\l" .string "I was right to make you choose!\p" - .string "If it’s advice I ever need,\n" - .string "{PLAYER}, your word I’ll always heed!$" + .string "If it's advice I ever need,\n" + .string "{PLAYER}, your word I'll always heed!$" gText_082BC024:: @ 82BC024 .string "Okay, one {STR_VAR_1}, you say?\n" .string "You told me that the other day.\l" .string "I need a new idea, a brand new way.\p" .string "Or, what, is that right?\n" - .string "My POKéMON doesn’t need to hold\l" + .string "My POKéMON doesn't need to hold\l" .string "anything tight?$" gText_082BC0C8:: @ 82BC0C8 .string "Say, hey, {PLAYER}!\n" .string "I found you again today!\p" .string "What should I do? Get your advice?\n" - .string "Why not? I’m already talking to you!\p" + .string "Why not? I'm already talking to you!\p" .string "{PLAYER}, are you getting sick of me?\n" - .string "Nah, no way, that can’t be.\p" + .string "Nah, no way, that can't be.\p" .string "Will you hear me out?\n" - .string "I’m looking for advice--that’s what\l" - .string "I’m talking about.\p" - .string "It’s about a hold item for\n" - .string "my {STR_VAR_1} that’d be good.\l" + .string "I'm looking for advice--that's what\l" + .string "I'm talking about.\p" + .string "It's about a hold item for\n" + .string "my {STR_VAR_1} that'd be good.\l" .string "My indecision is making me brood.$" gText_082BC213:: @ 82BC213 .string "My {STR_VAR_1} needs nothing?\n" - .string "Doesn’t need to hold anything?$" + .string "Doesn't need to hold anything?$" gText_082BC247:: @ 82BC247 .string "If holding nothing is the best,\n" - .string "I’ll do as you suggest!\p" + .string "I'll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don’t you forget about me.\p" + .string "but don't you forget about me.\p" .string "See you again, my smart friend!$" gText_082BC2DD:: @ 82BC2DD .string "If holding that {STR_VAR_1} is\n" - .string "the best, I’ll do as you suggest!\p" + .string "the best, I'll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don’t you forget about me.\p" + .string "but don't you forget about me.\p" .string "See you again, my smart friend!$" gText_082BC373:: @ 82BC373 - .string "Haven’t I heard about that\n" + .string "Haven't I heard about that\n" .string "{STR_VAR_1} before?\l" - .string "I’m certain I have, that’s for sure!\p" + .string "I'm certain I have, that's for sure!\p" .string "I need a new something!\n" .string "Or, my {STR_VAR_2} needs nothing?\l" - .string "Doesn’t need to hold anything?$" + .string "Doesn't need to hold anything?$" gText_082BC40E:: @ 82BC40E - .string "Gwah! Ouch! {PLAYER}{STRING 5}, my arm’s broken!\n" - .string "Don’t touch it, please!\p" - .string "I must’ve broken it while I was trying\n" + .string "Gwah! Ouch! {PLAYER}{STRING 5}, my arm's broken!\n" + .string "Don't touch it, please!\p" + .string "I must've broken it while I was trying\n" .string "out different hold items with my posse\l" .string "of POKéMON.\p" .string "So, things being this way,\n" @@ -1479,7 +1479,7 @@ gText_082BC40E:: @ 82BC40E gText_082BC514:: @ 82BC514 .string "Ouch…\p" .string "So your suggestion is my {STR_VAR_1}\n" - .string "doesn’t have to hold anything?$" + .string "doesn't have to hold anything?$" gText_082BC555:: @ 82BC555 .string "Hm, all right. That would be easier\n" @@ -1488,8 +1488,8 @@ gText_082BC555:: @ 82BC555 .string "for help like this.$" gText_082BC5CE:: @ 82BC5CE - .string "Hm, all right. That’s one {STR_VAR_1}.\n" - .string "My POKéMON’s arm is fine, so I’ll make\l" + .string "Hm, all right. That's one {STR_VAR_1}.\n" + .string "My POKéMON's arm is fine, so I'll make\l" .string "it hold that item right away.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" @@ -1501,55 +1501,55 @@ gText_082BC666:: @ 82BC666 .string "even better?\p" .string "Oh, wait a second.\n" .string "So your suggestion is my {STR_VAR_2}\l" - .string "doesn’t have to hold anything?$" + .string "doesn't have to hold anything?$" gText_082BC714:: @ 82BC714 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…\p" - .string "Please, don’t look at me that way.\n" - .string "My POKéMON don’t have anything.\p" - .string "I… I’m really embarrassed about this,\n" + .string "Please, don't look at me that way.\n" + .string "My POKéMON don't have anything.\p" + .string "I… I'm really embarrassed about this,\n" .string "but I really need your advice.\p" - .string "I can’t decide what hold item would\n" + .string "I can't decide what hold item would\n" .string "make my {STR_VAR_1} strong.\p" .string "{PLAYER}{STRING 5}, what do you think would\n" .string "be good?$" gText_082BC808:: @ 82BC808 .string "Oh… Then, you think it would be better\n" - .string "if my {STR_VAR_1} didn’t have an item?$" + .string "if my {STR_VAR_1} didn't have an item?$" gText_082BC84D:: @ 82BC84D .string "Oh… Okay!\n" - .string "I’ll go without an item.\p" + .string "I'll go without an item.\p" .string "This is nerve-racking, though.\n" - .string "Wouldn’t it be too cool?\p" + .string "Wouldn't it be too cool?\p" .string "Thank you, {PLAYER}{STRING 5}.\n" .string "If we meet again, I hope you will be\l" .string "as helpful.$" gText_082BC8EA:: @ 82BC8EA .string "Oh… Okay!\n" - .string "I’ll go with that {STR_VAR_1}.\p" + .string "I'll go with that {STR_VAR_1}.\p" .string "This is nerve-racking, though.\n" - .string "Wouldn’t it be too cool?\p" + .string "Wouldn't it be too cool?\p" .string "Thank you, {PLAYER}{STRING 5}.\n" .string "If we meet again, I hope you will be\l" .string "as helpful.$" gText_082BC984:: @ 82BC984 .string "B-but I already heard about that.\p" - .string "Please don’t brush me off like this!\n" - .string "I can’t live with the humiliation.\p" + .string "Please don't brush me off like this!\n" + .string "I can't live with the humiliation.\p" .string "Oh… Am I jumping to conclusions?\n" .string "Do you think it would be better if\l" - .string "my {STR_VAR_2} didn’t have an item?$" + .string "my {STR_VAR_2} didn't have an item?$" gText_082BCA4D:: @ 82BCA4D .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" - .string "Perhaps you’re a twin?\p" - .string "Oh, no, no, no, don’t worry!\n" + .string "Perhaps you're a twin?\p" + .string "Oh, no, no, no, don't worry!\n" .string "If you really are {PLAYER}, please\l" .string "forget about my rudeness.\p" .string "What I would like is some more of\n" @@ -1559,18 +1559,18 @@ gText_082BCA4D:: @ 82BCA4D .string "What would be worthy of it?$" gText_082BCB75:: @ 82BCB75 - .string "It’s better if it held nothing?\n" + .string "It's better if it held nothing?\n" .string "Are you certain?$" gText_082BCBA6:: @ 82BCBA6 - .string "I see. If that’s the case, that’s fine.\n" + .string "I see. If that's the case, that's fine.\n" .string "I thank you for your time.\p" .string "Let us meet again!$" gText_082BCBFC:: @ 82BCBFC .string "One {STR_VAR_1}?\n" .string "Are you certain?\p" - .string "I see. If that’s the case, that’s fine.\n" + .string "I see. If that's the case, that's fine.\n" .string "I thank you for your time.\p" .string "I do hope my POKéMON will be able to\n" .string "put it to good use.\p" @@ -1581,7 +1581,7 @@ gText_082BCCA4:: @ 82BCCA4 .string "I believe you taught me that before.\p" .string "I would like you to recommend\n" .string "something different this time.\p" - .string "Perhaps you’re suggesting that\n" + .string "Perhaps you're suggesting that\n" .string "my {STR_VAR_2} should hold nothing?\l" .string "Are you certain?$" @@ -1589,9 +1589,9 @@ gText_082BCD68:: @ 82BCD68 .string "Waah, {PLAYER}!\n" .string "I have a dilemma, sob…\p" .string "I want to begin battling other people,\n" - .string "but I don’t know what to do.\p" + .string "but I don't know what to do.\p" .string "How should I line up my POKéMON\n" - .string "so they’ll be at their strongest?\p" + .string "so they'll be at their strongest?\p" .string "Please tell me, {PLAYER}.\n" .string "If you were me, which of these POKéMON\l" .string "would you send out first?$" @@ -1599,25 +1599,25 @@ gText_082BCD68:: @ 82BCD68 gText_082BCE64:: @ 82BCE64 .string "My {STR_VAR_1} should go first?\n" .string "Waaaaah!\p" - .string "Oh! I’m so sorry!\n" - .string "You’ve made me happy by choosing\l" - .string "my first POKéMON, and it’s made me cry…\p" + .string "Oh! I'm so sorry!\n" + .string "You've made me happy by choosing\l" + .string "my first POKéMON, and it's made me cry…\p" .string "Thank you so much!$" gText_082BCEF2:: @ 82BCEF2 - .string "Yay! It’s {PLAYER}!\n" + .string "Yay! It's {PLAYER}!\n" .string "Great! I wanted to ask you something!\p" .string "Um, of my POKéMON, which do you\n" .string "think should go out first?$" gText_082BCF61:: @ 82BCF61 - .string "My {STR_VAR_1}? That’s true.\n" - .string "Okay, I’ll do that!\p" + .string "My {STR_VAR_1}? That's true.\n" + .string "Okay, I'll do that!\p" .string "Thanks for teaching me!$" gText_082BCFA1:: @ 82BCFA1 .string "{PLAYER}, hello!\p" - .string "I think, in a battle, it’s very important\n" + .string "I think, in a battle, it's very important\n" .string "which POKéMON comes out first.\p" .string "Out of the POKéMON that I have,\n" .string "which would be good to send out first?$" @@ -1629,12 +1629,12 @@ gText_082BD03C:: @ 82BD03C gText_082BD06D:: @ 82BD06D .string "Hello, {PLAYER}…\n" - .string "I’m sorry to disturb you again with\l" + .string "I'm sorry to disturb you again with\l" .string "another question.\p" - .string "I have so little confidence, I don’t\n" - .string "know what I’d do without you, {PLAYER}.\p" + .string "I have so little confidence, I don't\n" + .string "know what I'd do without you, {PLAYER}.\p" .string "It may be a waste of time for me to\n" - .string "even worry about it, but I just can’t\l" + .string "even worry about it, but I just can't\l" .string "decide something…\p" .string "Which of my POKéMON should I send\n" .string "out first in a battle?$" @@ -1642,36 +1642,36 @@ gText_082BD06D:: @ 82BD06D gText_082BD18A:: @ 82BD18A .string "My {STR_VAR_1}?\n" .string "Understood!\p" - .string "I can’t believe that you would bother\n" + .string "I can't believe that you would bother\n" .string "to answer my questions so often!\p" - .string "I’m so grateful that you would even\n" + .string "I'm so grateful that you would even\n" .string "speak with me… Thank you!$" gText_082BD222:: @ 82BD222 - .string "Oh, {PLAYER}{STRING 5}! It’s me!\n" - .string "I’m so glad to see you because I have\l" + .string "Oh, {PLAYER}{STRING 5}! It's me!\n" + .string "I'm so glad to see you because I have\l" .string "this little problem.\p" - .string "I can’t decide how my POKéMON should\n" + .string "I can't decide how my POKéMON should\n" .string "be lined up. Could you decide for me?\p" - .string "Oh, you don’t need to decide the whole\n" + .string "Oh, you don't need to decide the whole\n" .string "party right now.\p" .string "How about deciding just the first\n" .string "POKéMON for me?$" gText_082BD325:: @ 82BD325 - .string "My {STR_VAR_1}? That’s great!\p" + .string "My {STR_VAR_1}? That's great!\p" .string "Knowing that you made the decision,\n" - .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" + .string "{PLAYER}{STRING 5}, I won't be so upset if\l" .string "I lose.\p" - .string "Okay, I’ll look to you for advice again.\n" + .string "Okay, I'll look to you for advice again.\n" .string "Bye!$" gText_082BD3B1:: @ 82BD3B1 .string "Hi, my teacher {PLAYER}{STRING 5}!\n" - .string "I’m busy again today!\p" + .string "I'm busy again today!\p" .string "I have to do some cycling, shopping,\n" .string "and humming.\p" - .string "I haven’t even had the time to decide\n" + .string "I haven't even had the time to decide\n" .string "how to line up my POKéMON team.\p" .string "So, how about checking out my team?\n" .string "Which one should go first?$" @@ -1680,14 +1680,14 @@ gText_082BD493:: @ 82BD493 .string "Okay, gotcha.\n" .string "I have enough time at least to put\l" .string "my {STR_VAR_1} at the head of the line!\p" - .string "Whoops, my girlfriend’s waiting!\n" + .string "Whoops, my girlfriend's waiting!\n" .string "Thanks! See you around!$" gText_082BD51C:: @ 82BD51C .string "Yoohoo! Hiya, {PLAYER}!\n" .string "You always walk around looking tough!\p" .string "Listen, I need something from you\n" - .string "again! It’s the usual thing!\p" + .string "again! It's the usual thing!\p" .string "Drum roll, please!\n" .string "The question I have is about my team.\p" .string "Which POKéMON of mine should be first\n" @@ -1697,15 +1697,15 @@ gText_082BD609:: @ 82BD609 .string "Hmhm!\n" .string "My {STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" - .string "I guess that’s about all I wanted\n" + .string "I guess that's about all I wanted\n" .string "to ask you today.\p" - .string "Let’s meet here again, okay?\n" + .string "Let's meet here again, okay?\n" .string "Thanks!$" gText_082BD697:: @ 82BD697 .string "Thank you so much for stopping to\n" .string "chat with me, {PLAYER}.\p" - .string "I know I’m taking advantage of your\n" + .string "I know I'm taking advantage of your\n" .string "kindness, but may I ask for advice?\p" .string "I would like you to decide on the order\n" .string "of my POKéMON team.\p" @@ -1721,22 +1721,22 @@ gText_082BD797:: @ 82BD797 gText_082BD806:: @ 82BD806 .string "Eek! {PLAYER}!\n" - .string "I… I’m overjoyed to see you again!\p" + .string "I… I'm overjoyed to see you again!\p" .string "My POKéMON have become much\n" .string "stronger!\p" - .string "But I don’t always win. It seems to\n" + .string "But I don't always win. It seems to\n" .string "depend on which POKéMON goes first.\p" .string "{PLAYER}, please, I need your help!\p" .string "Please decide which of my POKéMON\n" .string "should go out first!$" gText_082BD8F5:: @ 82BD8F5 - .string "Sigh… I’m overwhelmed with happiness…\p" - .string "It’s like a dream having you decide\n" + .string "Sigh… I'm overwhelmed with happiness…\p" + .string "It's like a dream having you decide\n" .string "for me, {PLAYER}.\p" .string "But perfectly understood!\n" .string "I will go with my {STR_VAR_1} first!\p" - .string "I hope you’ll be willing to teach me\n" + .string "I hope you'll be willing to teach me\n" .string "some more another time.$" gText_082BD9BE:: @ 82BD9BE @@ -1745,57 +1745,57 @@ gText_082BD9BE:: @ 82BD9BE .string "Hit me with your sage advice today!\p" .string "You see, I pulled together a team of\n" .string "three POKéMON. So far so good.\p" - .string "But the team’s battling order’s not\n" + .string "But the team's battling order's not\n" .string "settled yet.\p" .string "This is where you come in, {PLAYER}{STRING 5}!\n" .string "You decide which POKéMON leads off!\p" - .string "Don’t be shy now.\n" - .string "Let’s blurt it out!$" + .string "Don't be shy now.\n" + .string "Let's blurt it out!$" gText_082BDAE1:: @ 82BDAE1 .string "Uh-huh, my {STR_VAR_1} leads off!\n" .string "OK, A-OK!\l" - .string "I’ll reorder the lineup, like, wham!\p" + .string "I'll reorder the lineup, like, wham!\p" .string "All right, thanks, as always!\n" .string "Adios!$" gText_082BDB4E:: @ 82BDB4E .string "{PLAYER}{STRING 5}, listen!\n" - .string "It’s a crisis!\p" + .string "It's a crisis!\p" .string "My POKéMON, all three of them, go into\n" .string "battle at once!\p" - .string "Of course that’s impossible!\n" + .string "Of course that's impossible!\n" .string "Wahahaha!\p" .string "This is no lie, though.\n" - .string "I’m not very good at thinking about\l" + .string "I'm not very good at thinking about\l" .string "how I should line up my POKéMON.\p" .string "So, how about deciding for me which\n" .string "POKéMON should go first, master?$" gText_082BDC6B:: @ 82BDC6B - .string "Okay, so it’s my {STR_VAR_1} you chose?\n" - .string "I’ll let any but that one go first!\p" + .string "Okay, so it's my {STR_VAR_1} you chose?\n" + .string "I'll let any but that one go first!\p" .string "Just kidding!\n" - .string "I’ll obey your teaching, master!\p" + .string "I'll obey your teaching, master!\p" .string "Thanks, master!\n" - .string "I hope you’ll keep teaching me!$" + .string "I hope you'll keep teaching me!$" gText_082BDD0D:: @ 82BDD0D .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" - .string "The rappin’ SAILOR am I!\n" + .string "The rappin' SAILOR am I!\n" .string "I present to you a question\l" - .string "that’s pretty fly!\p" - .string "It’s a team lineup question\n" + .string "that's pretty fly!\p" + .string "It's a team lineup question\n" .string "that begs your suggestion!\p" .string "Out of this lot, which should go first\n" .string "as the first on the spot?$" gText_082BDDEC:: @ 82BDDEC .string "Okay, I hear you, sure I do!\n" - .string "I’ll switch them up, that I’ll do!\p" - .string "If it’s advice I ever need,\n" - .string "{PLAYER}, your word I’ll always heed!$" + .string "I'll switch them up, that I'll do!\p" + .string "If it's advice I ever need,\n" + .string "{PLAYER}, your word I'll always heed!$" gText_082BDE68:: @ 82BDE68 .string "Yahoo, {PLAYER}!\n" @@ -1810,27 +1810,27 @@ gText_082BDE68:: @ 82BDE68 gText_082BDF4D:: @ 82BDF4D .string "My {STR_VAR_1}? Yes!\n" - .string "That’ll do, there’s no distress!\p" + .string "That'll do, there's no distress!\p" .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don’t you forget about me.\p" + .string "but don't you forget about me.\p" .string "See you again, my smart friend!$" gText_082BDFD8:: @ 82BDFD8 .string "…Oof…ooch… {PLAYER}{STRING 5}…\n" - .string "My stomach’s hurting all of a sudden…\p" - .string "…It’s getting better now…\p" - .string "I must’ve worried myself sick racking\n" + .string "My stomach's hurting all of a sudden…\p" + .string "…It's getting better now…\p" + .string "I must've worried myself sick racking\n" .string "my brains on how I should line up\l" .string "my posse of POKéMON.\p" .string "So, things being this way,\n" .string "I need you to decide for me.\p" .string "{PLAYER}{STRING 5}, which of my POKéMON should\n" - .string "go first? So I’d win, I mean.$" + .string "go first? So I'd win, I mean.$" gText_082BE0FD:: @ 82BE0FD .string "Hm, all right.\n" .string "My {STR_VAR_1} goes first.\p" - .string "I’ll fix the lineup like that after\n" + .string "I'll fix the lineup like that after\n" .string "I have my supper.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" @@ -1838,19 +1838,19 @@ gText_082BE0FD:: @ 82BE0FD gText_082BE189:: @ 82BE189 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}?\p" - .string "Please, don’t look at me that way.\n" - .string "You’re making me feel all flustered.\p" + .string "Please, don't look at me that way.\n" + .string "You're making me feel all flustered.\p" .string "Um…\n" .string "I really need your advice.\p" .string "It makes me bashful to say this,\n" .string "but I chose my 3-POKéMON team.\l" - .string "I can’t decide on the order, though.\p" + .string "I can't decide on the order, though.\p" .string "Which POKéMON should I send out first\n" .string "so I at least look capable?$" gText_082BE2A5:: @ 82BE2A5 .string "Oh… Okay!\n" - .string "I’ll lead with my {STR_VAR_1}.\p" + .string "I'll lead with my {STR_VAR_1}.\p" .string "I hope I can do my best without\n" .string "getting all flustered.\p" .string "Thank you, {PLAYER}{STRING 5}.\n" @@ -1860,8 +1860,8 @@ gText_082BE2A5:: @ 82BE2A5 gText_082BE33E:: @ 82BE33E .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" - .string "Perhaps you’re a clever look-alike?\p" - .string "Oh, no, no, no, don’t worry!\n" + .string "Perhaps you're a clever look-alike?\p" + .string "Oh, no, no, no, don't worry!\n" .string "If you really are {PLAYER}, please\l" .string "forget about my rudeness.\p" .string "What I would like is your fine advice.\p" @@ -1871,8 +1871,8 @@ gText_082BE33E:: @ 82BE33E gText_082BE46C:: @ 82BE46C .string "My {STR_VAR_1}…\n" - .string "You aren’t pulling my leg?\p" - .string "I see. If that’s the case, that’s fine.\n" + .string "You aren't pulling my leg?\p" + .string "I see. If that's the case, that's fine.\n" .string "I thank you for your time.\p" .string "I am as you see, but I shall do\n" .string "my best.\p" @@ -1882,40 +1882,40 @@ gText_082BE50D:: @ 82BE50D .string "Snivel…\n" .string "Oh, {PLAYER}!\p" .string "What perfect timing!\n" - .string "There’s something I just can’t decide…\p" - .string "I can’t decide which POKéMON I should\n" + .string "There's something I just can't decide…\p" + .string "I can't decide which POKéMON I should\n" .string "be using.\p" - .string "I can’t decide between the POKéMON\n" + .string "I can't decide between the POKéMON\n" .string "{STR_VAR_1} and {STR_VAR_2}…\p" .string "{PLAYER}, which do you think will give\n" .string "even me a chance at winning?$" gText_082BE5F5:: @ 82BE5F5 .string "Snivel… I… I understand!\n" - .string "Oh! I’m so sorry!\l" - .string "You’ve made me so happy, I’m crying…\p" - .string "I’ll do my best to catch one\n" + .string "Oh! I'm so sorry!\l" + .string "You've made me so happy, I'm crying…\p" + .string "I'll do my best to catch one\n" .string "{STR_VAR_1}!\p" .string "Thank you so much!$" gText_082BE679:: @ 82BE679 - .string "Yay! It’s {PLAYER}!\n" + .string "Yay! It's {PLAYER}!\n" .string "Yay, you came at the right time, too!\l" .string "I need your advice again!\p" - .string "Um, I’m all mixed up--should I use\n" + .string "Um, I'm all mixed up--should I use\n" .string "my {STR_VAR_1} or {STR_VAR_2}…\p" .string "Which do you think I should raise,\n" .string "{PLAYER}?$" gText_082BE71E:: @ 82BE71E .string "Oh, so my {STR_VAR_1} is better!\n" - .string "Okay, I’ll do that!\p" + .string "Okay, I'll do that!\p" .string "Thanks for teaching me!$" gText_082BE762:: @ 82BE762 .string "{PLAYER}, hello!\n" .string "I have a question I wanted to ask.\p" - .string "I’m in a dilemma over whether I should\n" + .string "I'm in a dilemma over whether I should\n" .string "raise one {STR_VAR_1} or {STR_VAR_2}.\p" .string "Which POKéMON do you think will\n" .string "be stronger?$" @@ -1923,22 +1923,22 @@ gText_082BE762:: @ 82BE762 gText_082BE7F8:: @ 82BE7F8 .string "{STR_VAR_1} is your choice?\n" .string "Okay, I got it!\p" - .string "I’ll go catch a strong {STR_VAR_1}\n" + .string "I'll go catch a strong {STR_VAR_1}\n" .string "right away!\p" .string "See you again!$" gText_082BE850:: @ 82BE850 .string "Hello, {PLAYER}…\p" - .string "Um, you’ve probably already forgotten\n" + .string "Um, you've probably already forgotten\n" .string "about someone like me…\p" - .string "…But that doesn’t matter if you\n" + .string "…But that doesn't matter if you\n" .string "could give me advice…\p" - .string "I can’t decide on the one kind of\n" + .string "I can't decide on the one kind of\n" .string "POKéMON I should raise…\p" - .string "I’ve narrowed the field to the POKéMON\n" - .string "{STR_VAR_1} and {STR_VAR_2}, but that’s\l" + .string "I've narrowed the field to the POKéMON\n" + .string "{STR_VAR_1} and {STR_VAR_2}, but that's\l" .string "where I became stuck…\p" - .string "{PLAYER}, you probably don’t want to\n" + .string "{PLAYER}, you probably don't want to\n" .string "bother, but please decide for me.$" gText_082BE99C:: @ 82BE99C @@ -1946,11 +1946,11 @@ gText_082BE99C:: @ 82BE99C .string "attention to me?\p" .string "I will try!\p" .string "But will I even be able to catch one…\n" - .string "No! I’ll do my best!\p" + .string "No! I'll do my best!\p" .string "Thank you!$" gText_082BEA1B:: @ 82BEA1B - .string "Oh, {PLAYER}{STRING 5}! I’m so glad to see you!\n" + .string "Oh, {PLAYER}{STRING 5}! I'm so glad to see you!\n" .string "I was about to go looking for you!\p" .string "Can you decide what kind of POKéMON\n" .string "I should use?\p" @@ -1961,38 +1961,38 @@ gText_082BEA1B:: @ 82BEA1B .string "better?$" gText_082BEAE9:: @ 82BEAE9 - .string "{STR_VAR_1}? That’s great!\p" + .string "{STR_VAR_1}? That's great!\p" .string "Knowing that you made the decision,\n" - .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" + .string "{PLAYER}{STRING 5}, I won't be so upset if\l" .string "I lose.\p" - .string "Okay, I’ll look to you for advice again.\n" + .string "Okay, I'll look to you for advice again.\n" .string "Bye!$" gText_082BEB72:: @ 82BEB72 - .string "If it isn’t {PLAYER}{STRING 5}! How’s it going?\n" - .string "I’m busy again as always!\p" + .string "If it isn't {PLAYER}{STRING 5}! How's it going?\n" + .string "I'm busy again as always!\p" .string "I want to do good with POKéMON, too,\n" - .string "but I haven’t been able to decide\l" + .string "but I haven't been able to decide\l" .string "which POKéMON I should use.\p" .string "You know how {STR_VAR_1} look strong?\n" .string "But {STR_VAR_2} are tough to ignore.\p" .string "{PLAYER}{STRING 5}, give me some of your good\n" - .string "advice! Which one’d be good for me?$" + .string "advice! Which one'd be good for me?$" gText_082BEC8E:: @ 82BEC8E .string "Okay, gotcha.\n" - .string "I’ll find time somehow and catch me\l" + .string "I'll find time somehow and catch me\l" .string "that {STR_VAR_1} you recommended.\p" - .string "I’m glad I met a good mentor in you.\n" + .string "I'm glad I met a good mentor in you.\n" .string "Thanks! See you around!$" gText_082BED16:: @ 82BED16 .string "Oh!\n" - .string "Yay, it’s {PLAYER}!\p" - .string "I didn’t waste any time boasting to\n" + .string "Yay, it's {PLAYER}!\p" + .string "I didn't waste any time boasting to\n" .string "my friends about meeting you!\p" .string "I need to tap your mind again today.\n" - .string "It’s an easy one for you!\p" + .string "It's an easy one for you!\p" .string "Drum roll, please!\n" .string "The question I have is…\p" .string "If I were to raise a POKéMON,\n" @@ -2003,17 +2003,17 @@ gText_082BEE29:: @ 82BEE29 .string "Ahhh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" - .string "I guess that’s about all I wanted\n" + .string "I guess that's about all I wanted\n" .string "to ask you today.\p" - .string "Let’s meet here again, okay?\n" + .string "Let's meet here again, okay?\n" .string "Thanks!$" gText_082BEEB4:: @ 82BEEB4 .string "Oh, is it you, {PLAYER}?\n" - .string "I’m delighted to see you again!\p" + .string "I'm delighted to see you again!\p" .string "Ever since I became your apprentice,\n" .string "my confidence has been blooming.\p" - .string "I think I’m ready to raise a POKéMON\n" + .string "I think I'm ready to raise a POKéMON\n" .string "of my own!\p" .string "{PLAYER}, may I impose on you to choose\n" .string "which POKéMON I should raise?\p" @@ -2030,9 +2030,9 @@ gText_082BEFE2:: @ 82BEFE2 gText_082BF04E:: @ 82BF04E .string "Eek! {PLAYER}! I met you again!\n" - .string "I… I’m overjoyed!\p" + .string "I… I'm overjoyed!\p" .string "Oh-oh-oh, I know!\n" - .string "I shouldn’t pass up this opportunity!\p" + .string "I shouldn't pass up this opportunity!\p" .string "May I ask a huge favor, {PLAYER}?\n" .string "Please choose a POKéMON for me!\p" .string "Please decide which would be better,\n" @@ -2040,35 +2040,35 @@ gText_082BF04E:: @ 82BF04E gText_082BF11D:: @ 82BF11D .string "Wow! You decided for me!\n" - .string "One {STR_VAR_1} is what I’ll raise to\l" + .string "One {STR_VAR_1} is what I'll raise to\l" .string "the best of my ability.\p" - .string "I hope you’ll be willing to teach me\n" + .string "I hope you'll be willing to teach me\n" .string "some more another time.$" gText_082BF1A8:: @ 82BF1A8 .string "Hey, hey!\n" .string "My mentor, {PLAYER}{STRING 5}!\p" - .string "Hello, I’ve been looking for you\n" + .string "Hello, I've been looking for you\n" .string "for some more of your sage advice!\p" .string "Which kind of POKéMON would be right\n" .string "for me, one {STR_VAR_1} or {STR_VAR_2}?\p" - .string "Don’t be shy now.\n" - .string "Let’s blurt it out!$" + .string "Don't be shy now.\n" + .string "Let's blurt it out!$" gText_082BF268:: @ 82BF268 .string "Uh-huh, one {STR_VAR_1} it is!\n" .string "OK, A-OK!\l" - .string "I’ll get one in a BALL, like, cram!\p" + .string "I'll get one in a BALL, like, cram!\p" .string "All right, thanks, as always!\n" .string "Adios!$" gText_082BF2D1:: @ 82BF2D1 .string "{PLAYER}{STRING 5}, listen! Big news!\n" .string "I caught a mirage POKéMON!\p" - .string "Of course I’m lying!\n" + .string "Of course I'm lying!\n" .string "Wahahaha!\p" .string "This is no lie, though.\n" - .string "I’m not very good at catching\l" + .string "I'm not very good at catching\l" .string "POKéMON.\p" .string "So, how about deciding for me which\n" .string "kind of POKéMON I should catch,\l" @@ -2077,17 +2077,17 @@ gText_082BF2D1:: @ 82BF2D1 .string "{STR_VAR_1} or {STR_VAR_2}?$" gText_082BF3CF:: @ 82BF3CF - .string "Okay, so it’s {STR_VAR_1} you chose?\n" - .string "I’ll grab the other kind, then!\p" + .string "Okay, so it's {STR_VAR_1} you chose?\n" + .string "I'll grab the other kind, then!\p" .string "Just kidding!\n" - .string "I’ll obey your teaching, master!\p" + .string "I'll obey your teaching, master!\p" .string "Thanks, master!\n" - .string "I hope you’ll keep teaching me!$" + .string "I hope you'll keep teaching me!$" gText_082BF46A:: @ 82BF46A .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" - .string "The rappin’ SAILOR am I!\n" + .string "The rappin' SAILOR am I!\n" .string "Surely you remember who am I?\p" .string "Today, I have a POKéMON question\n" .string "that begs your suggestion!\p" @@ -2097,33 +2097,33 @@ gText_082BF46A:: @ 82BF46A gText_082BF551:: @ 82BF551 .string "{STR_VAR_1}, you say, hey, hey!\n" - .string "I’ll go get me one right away!\p" - .string "If it’s advice I ever need,\n" - .string "{PLAYER}, your word I’ll always heed!$" + .string "I'll go get me one right away!\p" + .string "If it's advice I ever need,\n" + .string "{PLAYER}, your word I'll always heed!$" gText_082BF5C3:: @ 82BF5C3 - .string "Oh, wow, if it isn’t {PLAYER}!\p" + .string "Oh, wow, if it isn't {PLAYER}!\p" .string "What should I do? Get your advice?\n" - .string "Why not? I’m already talking to you!\p" - .string "It’s been a long time. Let me break\n" - .string "the ice. I’m also looking for advice!\l" + .string "Why not? I'm already talking to you!\p" + .string "It's been a long time. Let me break\n" + .string "the ice. I'm also looking for advice!\l" .string "Are you receiving me?\l" .string "You are receiving me!\p" .string "My POKéMON--which should I use?\n" - .string "It’s either {STR_VAR_1} or {STR_VAR_2}.\l" + .string "It's either {STR_VAR_1} or {STR_VAR_2}.\l" .string "Which do you choose?$" gText_082BF6E5:: @ 82BF6E5 .string "If that {STR_VAR_1} is the best,\n" - .string "I’ll do as you suggest!\p" + .string "I'll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don’t you forget about me.\p" + .string "but don't you forget about me.\p" .string "See you again, my smart friend!$" gText_082BF773:: @ 82BF773 .string "Oh, hi, {PLAYER}{STRING 5}…\n" .string "I have this horrible headache…\p" - .string "I must’ve worried too much about\n" + .string "I must've worried too much about\n" .string "the kind of POKéMON I should raise.\p" .string "So, things being this way,\n" .string "I need you to decide for me.\p" @@ -2133,24 +2133,24 @@ gText_082BF773:: @ 82BF773 gText_082BF869:: @ 82BF869 .string "Hm, one {STR_VAR_1}, all right.\n" - .string "I’ll go look for one when I get better.\p" + .string "I'll go look for one when I get better.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" gText_082BF8DD:: @ 82BF8DD .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" - .string "Please, don’t look at me that way.\n" - .string "I’m getting all flustered…\l" + .string "Please, don't look at me that way.\n" + .string "I'm getting all flustered…\l" .string "I… I need your advice.\p" - .string "I… I’m really embarrassed, but I can’t\n" + .string "I… I'm really embarrassed, but I can't\n" .string "decide which POKéMON to use.\p" .string "If the choices were {STR_VAR_1} or\n" .string "{STR_VAR_2}, which would be better?$" gText_082BF9BA:: @ 82BF9BA .string "Oh… Okay!\n" - .string "I’ll do my best with one {STR_VAR_1}.\p" + .string "I'll do my best with one {STR_VAR_1}.\p" .string "I hope I can do my best without\n" .string "getting all flustered.\p" .string "Thank you, {PLAYER}{STRING 5}.\n" @@ -2160,10 +2160,10 @@ gText_082BF9BA:: @ 82BF9BA gText_082BFA5A:: @ 82BFA5A .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really real?\p" - .string "No, no, if you are real, it’s fine.\n" + .string "No, no, if you are real, it's fine.\n" .string "Incidentally, I would like to obtain\l" .string "your advice.\p" - .string "It’s about the POKéMON I am to use.\p" + .string "It's about the POKéMON I am to use.\p" .string "If the choices are the POKéMON\n" .string "{STR_VAR_1} and {STR_VAR_2}, which is\l" .string "more worthy of me?$" @@ -2171,7 +2171,7 @@ gText_082BFA5A:: @ 82BFA5A gText_082BFB4E:: @ 82BFB4E .string "{STR_VAR_1}?\n" .string "Are you certain?\p" - .string "I see. If that’s the case, that’s fine.\n" + .string "I see. If that's the case, that's fine.\n" .string "I thank you for your time.\p" .string "I do hope it is something even I can\n" .string "handle with aplomb.\p" @@ -2181,7 +2181,7 @@ gText_082BFBF2:: @ 82BFBF2 .string "Waaah! Oh, {PLAYER}!\n" .string "Snivel… Hiccup…\p" .string "I have a dilemma!\n" - .string "I can’t decide on a move for\l" + .string "I can't decide on a move for\l" .string "my {STR_VAR_1}…\p" .string "Please, please, {PLAYER}.\n" .string "Can you decide for me?\p" @@ -2192,9 +2192,9 @@ gText_082BFBF2:: @ 82BFBF2 gText_082BFCAE:: @ 82BFCAE .string "{STR_VAR_1}?\n" .string "Waaaaah!\p" - .string "Oh! I’m so sorry, {PLAYER}!\n" - .string "You’ve made me so happy by deciding\l" - .string "the move, I’m crying…\p" + .string "Oh! I'm so sorry, {PLAYER}!\n" + .string "You've made me so happy by deciding\l" + .string "the move, I'm crying…\p" .string "Snivel…\n" .string "Thank you so much!$" @@ -2205,19 +2205,19 @@ gText_082BFD26:: @ 82BFD26 .string "a cool move.\p" .string "I like either of the moves\n" .string "{STR_VAR_2} or {STR_VAR_3}.\l" - .string "What’s your recommendation?$" + .string "What's your recommendation?$" gText_082BFDB1:: @ 82BFDB1 .string "{STR_VAR_1} is better? I guess so!\n" - .string "Okay, I’ll go with that!\p" + .string "Okay, I'll go with that!\p" .string "If we meet here again, please teach\n" .string "me something else, teacher!$" gText_082BFE24:: @ 82BFE24 .string "{PLAYER}, hello!\n" - .string "It’s about my {STR_VAR_1}, but I’m\l" + .string "It's about my {STR_VAR_1}, but I'm\l" .string "worried about its moves.\p" - .string "You see, it’s the moves {STR_VAR_2}\n" + .string "You see, it's the moves {STR_VAR_2}\n" .string "and {STR_VAR_3}.\p" .string "Which is stronger and better for\n" .string "my {STR_VAR_1}?$" @@ -2225,17 +2225,17 @@ gText_082BFE24:: @ 82BFE24 gText_082BFEAD:: @ 82BFEAD .string "{STR_VAR_1} is your choice?\n" .string "Okay, I got it!\p" - .string "I’ll go teach {STR_VAR_1} to\n" + .string "I'll go teach {STR_VAR_1} to\n" .string "my POKéMON right away!\p" .string "See you again!$" gText_082BFF0A:: @ 82BFF0A .string "Ohhh, {PLAYER}…\n" - .string "I’m hopeless, no, really!\p" - .string "I’ve decided to raise a POKéMON,\n" - .string "but now I can’t even decide what\l" + .string "I'm hopeless, no, really!\p" + .string "I've decided to raise a POKéMON,\n" + .string "but now I can't even decide what\l" .string "move I should let it learn…\p" - .string "I know that it doesn’t mean anything\n" + .string "I know that it doesn't mean anything\n" .string "to you, {PLAYER}.\p" .string "But it means a lot to me…\p" .string "Please, {PLAYER}, could you choose\n" @@ -2247,7 +2247,7 @@ gText_082C0032:: @ 82C0032 .string "I understand!\p" .string "But will it even be willing to learn\n" .string "{STR_VAR_1} for me…\l" - .string "No! I’ll do my best!\p" + .string "No! I'll do my best!\p" .string "Thank you!$" gText_082C0090:: @ 82C0090 @@ -2255,39 +2255,39 @@ gText_082C0090:: @ 82C0090 .string "I was just hoping to see you, too!\p" .string "I was wondering what move would\n" .string "be suitable for my {STR_VAR_1}.\p" - .string "I can’t decide, so can you decide\n" + .string "I can't decide, so can you decide\n" .string "for me instead?\p" .string "For instance… How about the moves\n" .string "{STR_VAR_2} and {STR_VAR_3}?\l" .string "Which one would be better?$" gText_082C016E:: @ 82C016E - .string "{STR_VAR_1}? That’s great!\p" + .string "{STR_VAR_1}? That's great!\p" .string "Knowing that you made the decision,\n" - .string "{PLAYER}{STRING 5}, I won’t be so upset if\l" + .string "{PLAYER}{STRING 5}, I won't be so upset if\l" .string "I lose.\p" - .string "Okay, I’ll look to you for advice again.\n" + .string "Okay, I'll look to you for advice again.\n" .string "Bye!$" gText_082C01F7:: @ 82C01F7 .string "How could things be this busy?\n" - .string "Hey, if it isn’t {PLAYER}{STRING 5}!\l" - .string "How’s it going?\p" - .string "Since I got up this morning, I’ve done\n" + .string "Hey, if it isn't {PLAYER}{STRING 5}!\l" + .string "How's it going?\p" + .string "Since I got up this morning, I've done\n" .string "my jogging, swimming, and cooking!\p" - .string "You wouldn’t believe how busy I am!\p" - .string "I can’t even decide what move\n" + .string "You wouldn't believe how busy I am!\p" + .string "I can't even decide what move\n" .string "my {STR_VAR_1} should learn!\p" .string "{STR_VAR_2} looks good, huh?\n" - .string "But {STR_VAR_3}’s also decent.\p" + .string "But {STR_VAR_3}'s also decent.\p" .string "{PLAYER}{STRING 5}, give me some of your good\n" - .string "advice! Which move’d be good for me?$" + .string "advice! Which move'd be good for me?$" gText_082C034C:: @ 82C034C .string "Okay, gotcha.\n" - .string "I’ll make room in my schedule and\l" + .string "I'll make room in my schedule and\l" .string "teach that move.\p" - .string "I’m glad I met a good mentor in you.\n" + .string "I'm glad I met a good mentor in you.\n" .string "Thanks! See you around!$" gText_082C03CA:: @ 82C03CA @@ -2304,16 +2304,16 @@ gText_082C046E:: @ 82C046E .string "Ahhh!\n" .string "{STR_VAR_1}, you say!\l" .string "Thanks for a most cool answer!\p" - .string "I guess that’s about all I wanted\n" + .string "I guess that's about all I wanted\n" .string "to ask you today.\p" - .string "Let’s meet here again, okay?\n" + .string "Let's meet here again, okay?\n" .string "Thanks!$" gText_082C04F9:: @ 82C04F9 .string "Oh, hello, {PLAYER}.\n" - .string "I trust you’ve been well?\p" + .string "I trust you've been well?\p" .string "I have to seek your advice again.\n" - .string "It’s about my dearest {STR_VAR_1}.\p" + .string "It's about my dearest {STR_VAR_1}.\p" .string "What would be the ideal move for\n" .string "my lovable {STR_VAR_1}?\l" .string "{STR_VAR_2} or {STR_VAR_3}?$" @@ -2327,8 +2327,8 @@ gText_082C0598:: @ 82C0598 gText_082C0602:: @ 82C0602 .string "Eek! {PLAYER}! I met you again!\n" - .string "I… I’m overjoyed!\p" - .string "Whenever I’m in need, you’re always\n" + .string "I… I'm overjoyed!\p" + .string "Whenever I'm in need, you're always\n" .string "there for me, {PLAYER}!\p" .string "Today, I want you to recommend\n" .string "a move for me!\p" @@ -2341,16 +2341,16 @@ gText_082C06D8:: @ 82C06D8 .string "Oh-oh-oh! Thank you!\n" .string "{STR_VAR_1} is it!\l" .string "Perfectly understood!\p" - .string "I hope you’ll be willing to teach me\n" + .string "I hope you'll be willing to teach me\n" .string "some more another time.$" gText_082C074A:: @ 82C074A .string "Hola, {PLAYER}{STRING 5}, bueno!\n" - .string "I’m hoping for some more of\l" + .string "I'm hoping for some more of\l" .string "your sage advice today!\p" .string "What would be the best move for\n" .string "my {STR_VAR_1}?\p" - .string "It should be something that’ll\n" + .string "It should be something that'll\n" .string "let me win just like that!\p" .string "Would it be {STR_VAR_2}?\n" .string "Or {STR_VAR_3}?$" @@ -2358,18 +2358,18 @@ gText_082C074A:: @ 82C074A gText_082C0809:: @ 82C0809 .string "Uh-huh, {STR_VAR_1} it is!\n" .string "Si, bueno!\l" - .string "I’ll get it taught, like, ka-blam!\p" + .string "I'll get it taught, like, ka-blam!\p" .string "All right, thanks, as always!\n" .string "Adios!$" gText_082C086E:: @ 82C086E - .string "{PLAYER}{STRING 5}, it’s completely wild!\p" + .string "{PLAYER}{STRING 5}, it's completely wild!\p" .string "My POKéMON!\n" .string "It learned six moves!\p" - .string "Of course I’m lying!\n" + .string "Of course I'm lying!\n" .string "Wahahaha!\p" .string "This is no lie, though.\n" - .string "I’m not very good at choosing moves\l" + .string "I'm not very good at choosing moves\l" .string "for my POKéMON.\p" .string "So, how about deciding for me which\n" .string "kind of move I should teach?\p" @@ -2377,18 +2377,18 @@ gText_082C086E:: @ 82C086E .string "would go with my {STR_VAR_1} best?$" gText_082C0982:: @ 82C0982 - .string "Okay, so it’s {STR_VAR_1} you chose?\n" - .string "I’ll choose another move, then!\p" + .string "Okay, so it's {STR_VAR_1} you chose?\n" + .string "I'll choose another move, then!\p" .string "Just kidding!\n" - .string "I’ll obey your teaching, master!\p" + .string "I'll obey your teaching, master!\p" .string "Thanks, master!\n" - .string "I hope you’ll keep teaching me!$" + .string "I hope you'll keep teaching me!$" gText_082C0A1D:: @ 82C0A1D .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" - .string "The rappin’ SAILOR am I!\n" - .string "I’m always with it, don’t ask me why.\p" + .string "The rappin' SAILOR am I!\n" + .string "I'm always with it, don't ask me why.\p" .string "Today, I have a move question\n" .string "that begs your suggestion!\p" .string "{STR_VAR_2} and {STR_VAR_3} are\n" @@ -2397,34 +2397,34 @@ gText_082C0A1D:: @ 82C0A1D gText_082C0AFD:: @ 82C0AFD .string "{STR_VAR_1}, you say, hey, hey!\n" - .string "I’ll go teach that right away!\p" - .string "If it’s advice I ever need,\n" - .string "{PLAYER}, your word I’ll always heed!$" + .string "I'll go teach that right away!\p" + .string "If it's advice I ever need,\n" + .string "{PLAYER}, your word I'll always heed!$" gText_082C0B6F:: @ 82C0B6F - .string "Oh, yeahah, if it isn’t {PLAYER}!\p" + .string "Oh, yeahah, if it isn't {PLAYER}!\p" .string "What should I do? Get your advice?\n" - .string "Why not? I’m already talking to you!\p" + .string "Why not? I'm already talking to you!\p" .string "{PLAYER}, are you surprised by me?\n" - .string "I want your advice, can’t you see?\p" + .string "I want your advice, can't you see?\p" .string "Are you receiving me?\n" .string "You are receiving me!\p" .string "My {STR_VAR_1}--what should it use?\n" - .string "It’s {STR_VAR_2} or {STR_VAR_3},\l" + .string "It's {STR_VAR_2} or {STR_VAR_3},\l" .string "what do you choose?$" gText_082C0C7D:: @ 82C0C7D .string "If that {STR_VAR_1} is the best,\n" - .string "I’ll do as you suggest!\p" + .string "I'll do as you suggest!\p" .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don’t you forget about me.\p" + .string "but don't you forget about me.\p" .string "See you again, my smart friend!$" gText_082C0D0B:: @ 82C0D0B .string "Gahack! Gaah! Oh, {PLAYER}{STRING 5}…\n" .string "I have this lousy cold, I do…\p" .string "I want to pick a move for my POKéMON,\n" - .string "but I’m not up to it…\p" + .string "but I'm not up to it…\p" .string "So, things being this way,\n" .string "I need you to decide for me.\p" .string "{PLAYER}{STRING 5}, if I had to choose between\n" @@ -2433,26 +2433,26 @@ gText_082C0D0B:: @ 82C0D0B gText_082C0DFE:: @ 82C0DFE .string "Hm, {STR_VAR_1}, all right. Cough!\n" - .string "I’ll go teach it when I get better.\p" + .string "I'll go teach it when I get better.\p" .string "I hope I can keep hitting you up\n" .string "for help like this.$" gText_082C0E71:: @ 82C0E71 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…?\p" - .string "Please, don’t look at me that way.\n" - .string "I’m getting all flustered…\l" + .string "Please, don't look at me that way.\n" + .string "I'm getting all flustered…\l" .string "I… I need your advice.\p" - .string "I… I’m really embarrassed, but I can’t\n" + .string "I… I'm really embarrassed, but I can't\n" .string "decide what move I should teach\l" .string "my POKéMON.\p" - .string "It’s for my {STR_VAR_1}.\n" + .string "It's for my {STR_VAR_1}.\n" .string "If the choices were {STR_VAR_2} or\l" .string "{STR_VAR_3}, which would be better?$" gText_082C0F6D:: @ 82C0F6D .string "Oh… Okay!\n" - .string "I’ll try that {STR_VAR_1}.\p" + .string "I'll try that {STR_VAR_1}.\p" .string "I hope I can teach that move…\n" .string "This is so nerve-racking…\p" .string "Thank you, {PLAYER}{STRING 5}.\n" @@ -2462,20 +2462,20 @@ gText_082C0F6D:: @ 82C0F6D gText_082C1003:: @ 82C1003 .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really real?\p" - .string "Perhaps you’re one of those popular\n" + .string "Perhaps you're one of those popular\n" .string "mimics?\p" - .string "No, no, if you are real, it’s fine.\n" + .string "No, no, if you are real, it's fine.\n" .string "No need to be upset, I assure you!\p" .string "Incidentally, I would like to obtain\n" .string "your advice.\p" - .string "It’s about my {STR_VAR_1}.\p" + .string "It's about my {STR_VAR_1}.\p" .string "Which move would be better for it to\n" .string "use, {STR_VAR_2} or {STR_VAR_3}?$" gText_082C1122:: @ 82C1122 .string "{STR_VAR_1}?\n" - .string "There’s no question about that?\p" - .string "I see. If that’s the case, that’s fine.\n" + .string "There's no question about that?\p" + .string "I see. If that's the case, that's fine.\n" .string "I thank you for your time.\p" .string "I do hope it is something even\n" .string "my POKéMON can learn.\p" @@ -2486,19 +2486,19 @@ gText_082C11D1:: @ 82C11D1 .string "It is {PLAYER}!\l" .string "Oh! Sniff…sob… Please, listen!\p" .string "I… When I battle, I get so nervous,\n" - .string "I can’t help crying even if I win…\p" + .string "I can't help crying even if I win…\p" .string "I wish I could say something cool\n" .string "when I win…\p" .string "Please, please, {PLAYER}!\n" .string "Could you maybe teach me something\l" - .string "cool to say when I win so I don’t cry?$" + .string "cool to say when I win so I don't cry?$" gText_082C12D5:: @ 82C12D5 .string "{STR_VAR_1}\p" .string "Awesome! Wicked! Awoooh!\n" - .string "It’s really cool!\p" - .string "Oh… I’m sorry…\n" - .string "I’m so happy, I’m crying…\p" + .string "It's really cool!\p" + .string "Oh… I'm sorry…\n" + .string "I'm so happy, I'm crying…\p" .string "Snivel… {PLAYER}!\n" .string "Thank you so much for everything!\p" .string "I will battle the best I can for\n" @@ -2507,7 +2507,7 @@ gText_082C12D5:: @ 82C12D5 .string "Next time… We should battle!$" gText_082C13AB:: @ 82C13AB - .string "Yay! It’s {PLAYER}! Hello!\n" + .string "Yay! It's {PLAYER}! Hello!\n" .string "I wanted to ask you something!\p" .string "I want to say something cool when\n" .string "I win a match.\p" @@ -2517,11 +2517,11 @@ gText_082C13AB:: @ 82C13AB gText_082C1444:: @ 82C1444 .string "{STR_VAR_1}\p" .string "Oh, wow! That is so cool!\n" - .string "Okay, I’ll say that!\p" + .string "Okay, I'll say that!\p" .string "Thanks for teaching me all this time!\n" - .string "I’m going to do the best I can\l" + .string "I'm going to do the best I can\l" .string "wherever I go from now on!\p" - .string "When we meet again, it’ll be for\n" + .string "When we meet again, it'll be for\n" .string "a battle!$" gText_082C1501:: @ 82C1501 @@ -2537,20 +2537,20 @@ gText_082C15B6:: @ 82C15B6 .string "{STR_VAR_1}\p" .string "…Cool!\n" .string "I will use that!\p" - .string "I’m going out to battle all over\n" + .string "I'm going out to battle all over\n" .string "the place.\p" .string "Who knows, I may even get to battle\n" .string "you one day, {PLAYER}.\p" - .string "Next time, let’s meet at a place\n" + .string "Next time, let's meet at a place\n" .string "of battle!$" gText_082C165E:: @ 82C165E .string "Hello, {PLAYER}…\n" - .string "I’m sorry to bug you, but I’m hopeless…\p" + .string "I'm sorry to bug you, but I'm hopeless…\p" .string "Even when…\n" - .string "Even when I win, I don’t have anything\l" + .string "Even when I win, I don't have anything\l" .string "special to say…\p" - .string "I know that it doesn’t mean anything\n" + .string "I know that it doesn't mean anything\n" .string "to you, {PLAYER}.\p" .string "But it means a lot to me…\p" .string "Please, {PLAYER}, what should I say\n" @@ -2558,63 +2558,63 @@ gText_082C165E:: @ 82C165E gText_082C174F:: @ 82C174F .string "{STR_VAR_1}\p" - .string "That’s inspired…\p" + .string "That's inspired…\p" .string "Uh… Is it okay for someone like me\n" .string "to even say that?\p" - .string "No! I’ll do my best!\p" + .string "No! I'll do my best!\p" .string "{PLAYER}, thank you so much for\n" .string "putting up with me for so long…\p" .string "I promise to do my best from now on.\p" - .string "I’m sure you’ll quickly forget about\n" - .string "someone like me, but let’s meet\l" + .string "I'm sure you'll quickly forget about\n" + .string "someone like me, but let's meet\l" .string "somewhere again!$" gText_082C1862:: @ 82C1862 .string "Oh, {PLAYER}{STRING 5}.\n" - .string "There’s something I want you to hear.\p" - .string "I know that I don’t always sound\n" + .string "There's something I want you to hear.\p" + .string "I know that I don't always sound\n" .string "nice or polite…\p" .string "When I win a battle, I think I come\n" .string "across as being arrogant.\p" - .string "I don’t want people to dislike me,\n" + .string "I don't want people to dislike me,\n" .string "so I want to say something nice to\l" .string "someone I beat.\p" - .string "But I can’t think of anything good!\n" + .string "But I can't think of anything good!\n" .string "Could you think something up for me?$" gText_082C19A0:: @ 82C19A0 .string "{STR_VAR_1}\p" .string "Not bad!\n" - .string "Yup, that’s what I’ll go with!\p" - .string "I’m going to hit the road and do what\n" + .string "Yup, that's what I'll go with!\p" + .string "I'm going to hit the road and do what\n" .string "I can with what you taught me in\l" .string "my head and heart.\p" - .string "I’m sorry that I’ve been so pushy\n" + .string "I'm sorry that I've been so pushy\n" .string "with you!\p" .string "Next time, we battle, okay?\n" .string "See you!$" gText_082C1A76:: @ 82C1A76 - .string "Oh, I can’t get over how busy I am!\n" + .string "Oh, I can't get over how busy I am!\n" .string "Oh, hey, I was looking for you, {PLAYER}{STRING 5}.\p" .string "Are you well as usual?\n" - .string "Things haven’t changed for me at all.\p" - .string "I’ve got running, fighting, and mapping\n" + .string "Things haven't changed for me at all.\p" + .string "I've got running, fighting, and mapping\n" .string "to do. Why am I so busy?\p" - .string "But even though I’m busy, it’d be rude\n" + .string "But even though I'm busy, it'd be rude\n" .string "to just turn on my heels and walk away\l" .string "from a win without saying a word.\p" .string "So, what would be a cool saying to\n" - .string "underline my coolness when I’m done\l" + .string "underline my coolness when I'm done\l" .string "and walking away? {PLAYER}{STRING 5}, help me!$" gText_082C1C16:: @ 82C1C16 .string "{STR_VAR_1}\p" .string "Okay, gotcha.\n" .string "I can find time to say that!\p" - .string "Honestly, I’m glad I met a good mentor\n" + .string "Honestly, I'm glad I met a good mentor\n" .string "like you.\p" - .string "I’m going to make time somehow so\n" + .string "I'm going to make time somehow so\n" .string "I can get into battling.\p" .string "Thanks for everything, {PLAYER}{STRING 5}!\n" .string "We have to battle, you and me, one day!$" @@ -2631,23 +2631,23 @@ gText_082C1CF5:: @ 82C1CF5 gText_082C1DC1:: @ 82C1DC1 .string "{STR_VAR_1}\p" - .string "That… That’s fabulous!\n" - .string "It’s dignified and cool! I claim it!\p" - .string "…Listen, I think I’m getting decent\n" + .string "That… That's fabulous!\n" + .string "It's dignified and cool! I claim it!\p" + .string "…Listen, I think I'm getting decent\n" .string "at this, huh?\p" - .string "So, I’m thinking of challenging other\n" + .string "So, I'm thinking of challenging other\n" .string "TRAINERS from now on.\p" .string "{PLAYER}, your advice really helped me.\p" - .string "Maybe one day, there’ll be a time when\n" + .string "Maybe one day, there'll be a time when\n" .string "we battle!\p" .string "Thank you for everything!$" gText_082C1EDC:: @ 82C1EDC .string "Oh, {PLAYER}.\n" - .string "I’m so glad I met you!\p" + .string "I'm so glad I met you!\p" .string "I no longer have any concerns with\n" .string "regard to my POKéMON.\p" - .string "It’s myself that worries me…\p" + .string "It's myself that worries me…\p" .string "Do you know how a TRAINER says\n" .string "a few things upon winning a battle?\p" .string "Definitely, I wish I could do that,\n" @@ -2669,34 +2669,34 @@ gText_082C1FEC:: @ 82C1FEC gText_082C20D1:: @ 82C20D1 .string "Eek! I spotted {PLAYER}!\n" - .string "I… I’m overjoyed to see you!\p" - .string "Oh-oh-oh! There’s something I just\n" + .string "I… I'm overjoyed to see you!\p" + .string "Oh-oh-oh! There's something I just\n" .string "had to ask you!\p" .string "A little while ago, I won a battle.\n" .string "That part was giddying!\p" .string "But it made me so overjoyed that\n" - .string "I choked up and couldn’t say a thing!\p" + .string "I choked up and couldn't say a thing!\p" .string "So now, {PLAYER}, please, I want you to\n" .string "think up an exit line for when I win!$" gText_082C21FF:: @ 82C21FF .string "{STR_VAR_1}\p" .string "Waaaaah!\n" - .string "I’m going to say that?!\l" - .string "I… I’m delirious with joy!\p" + .string "I'm going to say that?!\l" + .string "I… I'm delirious with joy!\p" .string "Th-th-thank you!\n" .string "I have nothing left to regret now!\p" - .string "I’m going to travel now and battle\n" + .string "I'm going to travel now and battle\n" .string "all sorts of people.\p" .string "Everything, I owe it to you, {PLAYER}.\n" .string "Really, really, thank you!\p" - .string "I’ve got to go now, but let’s meet\n" + .string "I've got to go now, but let's meet\n" .string "in battle one day!$" gText_082C231C:: @ 82C231C .string "Hola, bueno!\n" .string "{PLAYER}{STRING 5}!\p" - .string "You know, I’m getting the itch to roam\n" + .string "You know, I'm getting the itch to roam\n" .string "and battle where I may.\p" .string "But before I do, I want your advice\n" .string "once again, please!\p" @@ -2706,61 +2706,61 @@ gText_082C231C:: @ 82C231C gText_082C2407:: @ 82C2407 .string "{STR_VAR_1}\p" - .string "Uh-huh, that’s sweet!\n" + .string "Uh-huh, that's sweet!\n" .string "Si, bueno!\l" - .string "I’ll try saying that, like, ham!\p" - .string "And now, it’s time to say good-bye!\n" + .string "I'll try saying that, like, ham!\p" + .string "And now, it's time to say good-bye!\n" .string "Thanks for all sorts of things!\p" .string "Give me a battle one day, OK?\n" .string "Adios!$" gText_082C24B5:: @ 82C24B5 - .string "{PLAYER}{STRING 5}, there’s big trouble!\p" + .string "{PLAYER}{STRING 5}, there's big trouble!\p" .string "When I win a battle, I brag about it\n" .string "for an hour at least!\p" - .string "Of course I’m lying!\n" + .string "Of course I'm lying!\n" .string "Wahahaha!\p" .string "This is no lie, though.\n" - .string "I’m not very good at chatting.\p" + .string "I'm not very good at chatting.\p" .string "So, how about deciding for me what\n" .string "I should say after winning a battle,\l" .string "master?$" gText_082C25B1:: @ 82C25B1 .string "{STR_VAR_1}\p" - .string "That’s what I should say, huh?\n" - .string "Then, I’ll stay away from that!\p" + .string "That's what I should say, huh?\n" + .string "Then, I'll stay away from that!\p" .string "Just kidding!\n" - .string "I’ll obey your teaching, master!\p" + .string "I'll obey your teaching, master!\p" .string "Thanks for teaching me all this time,\n" .string "master!\p" - .string "I’m finally understanding what being\n" + .string "I'm finally understanding what being\n" .string "a TRAINER is about.\p" - .string "I’m going to go out and win battles\n" + .string "I'm going to go out and win battles\n" .string "against any TRAINER.\p" - .string "Maybe it’ll be you one day, master!\p" - .string "That’s all!\n" + .string "Maybe it'll be you one day, master!\p" + .string "That's all!\n" .string "Farewell, my master!$" gText_082C2707:: @ 82C2707 .string "A-H-O-Y!\n" .string "And that spells ahoy!\p" - .string "The rappin’ SAILOR am I!\n" + .string "The rappin' SAILOR am I!\n" .string "This will be my last question,\l" - .string "don’t you cry!\p" - .string "It’s a saying question\n" + .string "don't you cry!\p" + .string "It's a saying question\n" .string "that begs your suggestion!\p" .string "If I win a match, what can I say\n" .string "in a real cool way?$" gText_082C27D4:: @ 82C27D4 .string "{STR_VAR_1}\p" - .string "Perfect! That’s what I’ll use.\n" + .string "Perfect! That's what I'll use.\n" .string "I was right to make you choose!\p" - .string "And now, I think it’d be best,\n" + .string "And now, I think it'd be best,\n" .string "if I were to fly the nest!\p" .string "Thanks for all you taught me.\n" - .string "I’ll be off on a battle spree!\p" + .string "I'll be off on a battle spree!\p" .string "B-O-N-V-O-Y-A-G-E!\n" .string "And that spells bon voyage,\l" .string "to you this is my homage!$" @@ -2769,12 +2769,12 @@ gText_082C28D6:: @ 82C28D6 .string "Oh, yeah, {PLAYER}!\n" .string "I found you again today!\p" .string "What should I do? Ask you again?\n" - .string "Why not? I’m already asking you!\p" + .string "Why not? I'm already asking you!\p" .string "Anyways, {PLAYER}…\n" .string "Are you receiving me?\l" .string "You are receiving me!\l" .string "I need some more advice for me!\p" - .string "It’s about what I should yell.\n" + .string "It's about what I should yell.\n" .string "Something cool to holler when\l" .string "a battle ends well.\p" .string "Come on, I wanna hear you say it!$" @@ -2782,24 +2782,24 @@ gText_082C28D6:: @ 82C28D6 gText_082C2A0B:: @ 82C2A0B .string "{STR_VAR_1}\p" .string "All right, all right!\n" - .string "I’ll use that because it’s so tight!\p" - .string "I’m out of things to ask you.\n" - .string "Waving bye is all that’s left to do.\p" - .string "But maybe one day we’ll meet, with one\n" + .string "I'll use that because it's so tight!\p" + .string "I'm out of things to ask you.\n" + .string "Waving bye is all that's left to do.\p" + .string "But maybe one day we'll meet, with one\n" .string "destined to go down in defeat.\p" .string "But, it really is time to say farewell.\p" .string "Well, {PLAYER}, I have to roam free,\n" - .string "but don’t you forget about me!\p" + .string "but don't you forget about me!\p" .string "Take care, {PLAYER}!\n" .string "Love ya!$" gText_082C2B50:: @ 82C2B50 - .string "{PLAYER}{STRING 5}, I’m finished…\n" - .string "My nose won’t stop dripping…\p" + .string "{PLAYER}{STRING 5}, I'm finished…\n" + .string "My nose won't stop dripping…\p" .string "I was trying to think up something\n" .string "cool to say when I win a battle.\p" .string "It inspired me so much, it made me cry,\n" - .string "and now my nose won’t stop running…\p" + .string "and now my nose won't stop running…\p" .string "So, things being this way,\n" .string "I need you to decide for me, {PLAYER}{STRING 5}.\p" .string "When I win a battle,\n" @@ -2807,42 +2807,42 @@ gText_082C2B50:: @ 82C2B50 gText_082C2C77:: @ 82C2C77 .string "{STR_VAR_1}\p" - .string "… … …That’s good.\n" - .string "No, it’s awe inspiring!\l" - .string "It’s bringing fresh tears to my eyes!\p" + .string "… … …That's good.\n" + .string "No, it's awe inspiring!\l" + .string "It's bringing fresh tears to my eyes!\p" .string "But in spite of my tears and runny\n" .string "nose, I will use that saying!\p" - .string "I’m plumb out of things to ask you,\n" + .string "I'm plumb out of things to ask you,\n" .string "{PLAYER}{STRING 5}.\p" - .string "From now on, we’re rivals!\n" + .string "From now on, we're rivals!\n" .string "Thanks for everything!$" gText_082C2D67:: @ 82C2D67 .string "Er… Um…\n" .string "{PLAYER}{STRING 5}…\p" - .string "Please, don’t look at me that way.\n" - .string "You’re making me all nervous.\p" + .string "Please, don't look at me that way.\n" + .string "You're making me all nervous.\p" .string "I… I need your advice again.\n" - .string "I’ll make it my last, though…\p" - .string "It’s really embarrassing to ask,\n" + .string "I'll make it my last, though…\p" + .string "It's really embarrassing to ask,\n" .string "but what if I win a battle?\l" .string "What should I say?$" gText_082C2E41:: @ 82C2E41 .string "{STR_VAR_1}\p" .string "Oh… Okay!\n" - .string "I’ll try to say that!\l" + .string "I'll try to say that!\l" .string "I might be too nervous to say it…\p" .string "Thank you, {PLAYER}{STRING 5}.\n" .string "I have to say good-bye now.\p" - .string "I’ll obey all that you’ve taught me,\n" + .string "I'll obey all that you've taught me,\n" .string "{PLAYER}{STRING 5}, and do the best I can.$" gText_082C2EF5:: @ 82C2EF5 .string "Hm? You appear to be {PLAYER}{STRING 5}…\n" .string "But are you really?\l" .string "Perhaps a clever {PLAYER} DOLL?\p" - .string "Oh, no, no, no, don’t worry!\n" + .string "Oh, no, no, no, don't worry!\n" .string "If you really are real, please\l" .string "forget about my rudeness.\p" .string "No need to be so angry. All I wish for\n" @@ -2857,13 +2857,13 @@ gText_082C3023:: @ 82C3023 .string "When I win a match…\p" .string "{STR_VAR_1}\p" .string "…Are you serious?\p" - .string "I see. If you are serious, that’s fine.\n" + .string "I see. If you are serious, that's fine.\n" .string "I thank you for your time.\p" .string "I do hope even I will be able to\n" .string "put that saying to good use.\p" .string "I seem to have run dry on what advice\n" .string "I need.\p" - .string "I do believe it’s high time I bid you\n" + .string "I do believe it's high time I bid you\n" .string "farewell and strike out on my own.\p" .string "Thank you, my mentor!\n" .string "I apologize for my skepticism!$" diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 21ab4256c..f4208afd0 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -193,10 +193,10 @@ Route102_EventScript_2744DD:: @ 82744DD return Route102_Text_2744F0: @ 82744F0 - .string "It’s soft, loamy soil.$" + .string "It's soft, loamy soil.$" Route102_Text_274507: @ 8274507 - .string "It’s soft, loamy soil.\n" + .string "It's soft, loamy soil.\n" .string "Want to plant a BERRY?$" Route102_Text_274535: @ 8274535 @@ -235,13 +235,13 @@ Route102_Text_27461B: @ 827461B Route102_Text_274630: @ 8274630 .string "{PLAYER} put away the {STR_VAR_1}\n" - .string "in the BAG’s BERRIES POCKET.\p" + .string "in the BAG's BERRIES POCKET.\p" .string "The soil returned to its soft and\n" .string "loamy state.$" Route102_Text_27468F: @ 827468F - .string "The BAG’s BERRIES POCKET is full.\p" - .string "The {STR_VAR_1} couldn’t be taken.$" + .string "The BAG's BERRIES POCKET is full.\p" + .string "The {STR_VAR_1} couldn't be taken.$" Route102_Text_2746CB: @ 82746CB .string "{PLAYER} left the {STR_VAR_1}\n" diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c92c14763..f77017830 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1673,7 +1673,7 @@ OldaleTown_PokemonCenter_2F_Text_278027: @ 8278027 OldaleTown_PokemonCenter_2F_Text_278061: @ 8278061 .string "A POKéMON holding the {STR_VAR_1}\n" - .string "BERRY can’t be traded.$" + .string "BERRY can't be traded.$" gText_PleaseWaitForLink:: @ 8278091 .string "Please wait.\n" @@ -1701,7 +1701,7 @@ OldaleTown_PokemonCenter_2F_Text_278197: @ 8278197 .string "Please enter.$" OldaleTown_PokemonCenter_2F_Text_2781A5: @ 82781A5 - .string "I’ll direct you to your room now.$" + .string "I'll direct you to your room now.$" LilycoveCity_ContestLobby_Text_2781C7: @ 82781C7 OldaleTown_PokemonCenter_2F_Text_2781C7: @ 82781C7 @@ -1729,11 +1729,11 @@ OldaleTown_PokemonCenter_2F_Text_2782A8: @ 82782A8 .string "incorrect.$" OldaleTown_PokemonCenter_2F_Text_2782D1: @ 82782D1 - .string "The SINGLE BATTLE Mode can’t be\n" + .string "The SINGLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" OldaleTown_PokemonCenter_2F_Text_278307: @ 8278307 - .string "The DOUBLE BATTLE Mode can’t be\n" + .string "The DOUBLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" OldaleTown_PokemonCenter_2F_Text_27833D: @ 827833D @@ -1758,13 +1758,13 @@ Text_27842E: @ 827842E .string "notice…$" Text_278452: @ 8278452 - .string "Score! Got to look at {STR_VAR_1}’s\n" + .string "Score! Got to look at {STR_VAR_1}'s\n" .string "TRAINER CARD!$" Text_27847B: @ 827847B - .string "Score! Got to look at {STR_VAR_1}’s\n" + .string "Score! Got to look at {STR_VAR_1}'s\n" .string "TRAINER CARD!\p" - .string "It’s a {STR_VAR_2} card!$" + .string "It's a {STR_VAR_2} card!$" SingleBattleColosseum_Text_2784B4: @ 82784B4 .string "Please take your place and start\n" @@ -1785,8 +1785,8 @@ OldaleTown_PokemonCenter_2F_Text_27854C: @ 827854C .string "I hope to see you again!$" OldaleTown_PokemonCenter_2F_Text_278565: @ 8278565 - .string "I’m awfully sorry.\p" - .string "We’re not set up to conduct trades\n" + .string "I'm awfully sorry.\p" + .string "We're not set up to conduct trades\n" .string "with TRAINERS far away in another\l" .string "region yet…$" @@ -1795,7 +1795,7 @@ OldaleTown_PokemonCenter_2F_Text_2785C9: @ 82785C9 OldaleTown_PokemonCenter_2F_Text_2785E9: @ 82785E9 .string "You have at least one POKéMON\n" - .string "that can’t be taken.$" + .string "that can't be taken.$" RecordCorner_Text_27861C: @ 827861C .string "Please take your seat and wait.$" @@ -1808,7 +1808,7 @@ OldaleTown_PokemonCenter_2F_Text_278651: @ 8278651 .string "Sorry, there is a transmission error.\p" .string "You may not mix records with \n" .string "Japanese Ruby or Sapphire games.\p" - .string "Also, you can’t mix records with\n" + .string "Also, you can't mix records with\n" .string "Japanese Emerald and overseas Ruby\l" .string "or Sapphire games at the same time.$" @@ -1843,7 +1843,7 @@ OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831 .string "can be mixed together.$" OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B - .string "A guide to the WIRELESS CLUB’s\n" + .string "A guide to the WIRELESS CLUB's\n" .string "various services.$" OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C @@ -1885,7 +1885,7 @@ OldaleTown_PokemonCenter_1F_Text_278A48: @ 8278A48 MossdeepCity_GameCorner_1F_Text_278A7D: @ 8278A7D .string "I can explain game rules to you,\n" - .string "if you’d like.\p" + .string "if you'd like.\p" .string "Which game should I describe?$" MossdeepCity_GameCorner_1F_Text_278ACB: @ 8278ACB @@ -1903,7 +1903,7 @@ MossdeepCity_GameCorner_1F_Text_278ACB: @ 8278ACB MossdeepCity_GameCorner_1F_Text_278BF1: @ 8278BF1 .string "“DODRIO BERRY-PICKINGâ€\p" - .string "Command DODRIO’s three heads to\n" + .string "Command DODRIO's three heads to\n" .string "catch falling BERRIES.\p" .string "Press right, up, or left on the\n" .string "{PLUS} Control Pad to move the heads.\p" @@ -1924,8 +1924,8 @@ MossdeepCity_GameCorner_1F_Text_278D51: @ 8278D51 .string "All right, come again!$" MossdeepCity_GameCorner_1F_Text_278D68: @ 8278D68 - .string "The Wireless Adapter isn’t connected.\n" - .string "Come back when it’s hooked up!$" + .string "The Wireless Adapter isn't connected.\n" + .string "Come back when it's hooked up!$" MossdeepCity_GameCorner_1F_Text_278DAD: @ 8278DAD .string "All right, which game did you want\n" @@ -1936,15 +1936,15 @@ MossdeepCity_GameCorner_1F_Text_278DD9: @ 8278DD9 .string "enter?$" MossdeepCity_GameCorner_1F_Text_278E00: @ 8278E00 - .string "Okay, you’re all good to go.\n" - .string "Don’t let the others beat you!$" + .string "Okay, you're all good to go.\n" + .string "Don't let the others beat you!$" MossdeepCity_GameCorner_1F_Text_278E3C: @ 8278E3C .string "Are you leaving now?\n" .string "Do come again!$" MossdeepCity_GameCorner_1F_Text_278E60: @ 8278E60 - .string "It doesn’t look like you have any\n" + .string "It doesn't look like you have any\n" .string "POKéMON that you can enter…\p" .string "Would you like me to explain what\n" .string "kinds of POKéMON can enter?$" @@ -1952,11 +1952,11 @@ MossdeepCity_GameCorner_1F_Text_278E60: @ 8278E60 MossdeepCity_GameCorner_1F_Text_278EDC: @ 8278EDC .string "“POKéMON JUMP†is open to POKéMON\n" .string "around 28 inches or less.\p" - .string "What you can’t enter are those\n" - .string "POKéMON that can’t jump.\p" + .string "What you can't enter are those\n" + .string "POKéMON that can't jump.\p" .string "You know, like POKéMON that only\n" .string "swim, burrow, or fly.\p" - .string "That’s all you need to know.$" + .string "That's all you need to know.$" MossdeepCity_GameCorner_1F_Text_278FA4: @ 8278FA4 .string "DODRIO BERRY-PICKING is a game that \n" @@ -2055,7 +2055,7 @@ OldaleTown_PokemonCenter_2F_Text_27964A: @ 827964A .string "My name is TEALA.\p" .string "This must be your first time\n" .string "up here.\p" - .string "I’ll show you how the Wireless\n" + .string "I'll show you how the Wireless\n" .string "Communication System works.\p" .string "First, I need to show you this\n" .string "floor of our POKéMON CENTER.\p" @@ -2065,7 +2065,7 @@ OldaleTown_PokemonCenter_2F_Text_279718: @ 8279718 .string "On the top floor, there are two\n" .string "rooms.\p" .string "First, the room on the left.\n" - .string "It’s the UNION ROOM.\p" + .string "It's the UNION ROOM.\p" .string "You may link up with TRAINERS\n" .string "around you who have also entered\l" .string "the UNION ROOM.\p" @@ -2075,7 +2075,7 @@ OldaleTown_PokemonCenter_2F_Text_279718: @ 8279718 .string "the DIRECT CORNER.\p" .string "You may trade or battle POKéMON\n" .string "with your friends in this room.\p" - .string "If the Wireless Adapter isn’t\n" + .string "If the Wireless Adapter isn't\n" .string "connected, you may still link up\l" .string "using a GBA Game Link cable.\p" .string "If that is the case, you must go\n" @@ -2085,7 +2085,7 @@ OldaleTown_PokemonCenter_2F_Text_279718: @ 8279718 OldaleTown_PokemonCenter_2F_Text_279937: @ 8279937 .string "Hello, {PLAYER}!\p" - .string "It’s me, TEALA, the POKéMON\n" + .string "It's me, TEALA, the POKéMON\n" .string "CENTER 2F attendant.\p" .string "Is there something you needed to\n" .string "ask me about linking?$" @@ -2096,7 +2096,7 @@ OldaleTown_PokemonCenter_2F_Text_2799AA: @ 82799AA .string "On this, the top floor, there are\n" .string "two rooms.\p" .string "First, the room on the left.\n" - .string "It’s the UNION ROOM.\p" + .string "It's the UNION ROOM.\p" .string "You may link up with TRAINERS\n" .string "around you who have also entered\l" .string "the UNION ROOM.\p" @@ -2111,7 +2111,7 @@ OldaleTown_PokemonCenter_2F_Text_2799AA: @ 82799AA .string "or the DIRECT CORNER.\p" .string "In that case, please move closer\n" .string "to your friends.\p" - .string "If the Wireless Adapter isn’t\n" + .string "If the Wireless Adapter isn't\n" .string "connected, you may still link up\l" .string "using a GBA Game Link cable.\p" .string "If that is the case, you must go\n" diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index d522469c6..2b0bfd8aa 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1453,13 +1453,13 @@ LilycoveCity_ContestLobby_Text_27ADA7: @ 827ADA7 .string "Hello!\p" .string "This is the reception counter for\n" .string "POKéMON CONTESTS.\p" - .string "Oh? It appears that you don’t have\n" + .string "Oh? It appears that you don't have\n" .string "a {POKEBLOCK} CASE yet.\p" .string "In that case, we need to provide you\n" .string "with this!$" LilycoveCity_ContestLobby_Text_27AE47: @ 827AE47 - .string "Okay, now that we’ve cleared that\n" + .string "Okay, now that we've cleared that\n" .string "up…\p" .string "Hello!\p" .string "This is the reception counter for\n" @@ -1536,12 +1536,12 @@ LilycoveCity_ContestLobby_Text_27B44A: @ 827B44A .string "Which POKéMON would you like to enter?$" LilycoveCity_ContestLobby_Text_27B471: @ 827B471 - .string "I’m terribly sorry, but your POKéMON\n" + .string "I'm terribly sorry, but your POKéMON\n" .string "is not qualified to compete at this\l" .string "Rank yet…$" LilycoveCity_ContestLobby_Text_27B4C4: @ 827B4C4 - .string "I’m sorry, but an EGG cannot take part\n" + .string "I'm sorry, but an EGG cannot take part\n" .string "in a POKéMON CONTEST.$" LilycoveCity_ContestLobby_Text_27B501: @ 827B501 @@ -1551,7 +1551,7 @@ LilycoveCity_ContestLobby_Text_27B501: @ 827B501 LilycoveCity_ContestLobby_Text_27B547: @ 827B547 .string "Oh, but that RIBBON…\p" .string "Your POKéMON has won this CONTEST\n" - .string "before, hasn’t it?\p" + .string "before, hasn't it?\p" .string "Would you like to enter it in this\n" .string "CONTEST anyway?$" @@ -1579,14 +1579,14 @@ LilycoveCity_ContestLobby_Text_27B6E7: @ 827B6E7 .string "later on.$" LinkContestRoom1_Text_27B711: @ 827B711 - .string "MC: Hello! We’re just getting started\n" + .string "MC: Hello! We're just getting started\n" .string "with a {STR_VAR_3} Rank POKéMON\l" .string "{STR_VAR_2}!\p" .string "The participating TRAINERS and their\n" .string "POKéMON are as follows:$" LinkContestRoom1_Text_27B78F: @ 827B78F - .string "MC: Hello! We’re just getting started\n" + .string "MC: Hello! We're just getting started\n" .string "with a 4-player linked POKéMON\l" .string "{STR_VAR_2}!\p" .string "The participating TRAINERS and their\n" @@ -1594,12 +1594,12 @@ LinkContestRoom1_Text_27B78F: @ 827B78F LinkContestRoom1_Text_27B815: @ 827B815 .string "MC: Entry No. {STR_VAR_2}!\n" - .string "{STR_VAR_1}’s {STR_VAR_3}!$" + .string "{STR_VAR_1}'s {STR_VAR_3}!$" LinkContestRoom1_Text_27B830: @ 827B830 - .string "MC: We’ve just seen the four POKéMON\n" + .string "MC: We've just seen the four POKéMON\n" .string "contestants.\p" - .string "Now it’s time for primary judging!\p" + .string "Now it's time for primary judging!\p" .string "The audience will vote on their\n" .string "favorite POKéMON contestants.\p" .string "Without any further ado, let the\n" @@ -1611,16 +1611,16 @@ LinkContestRoom1_Text_27B8F2: @ 827B8F2 LinkContestRoom1_Text_27B904: @ 827B904 .string "Voting is now complete!\p" .string "While the votes are being tallied,\n" - .string "let’s move on to secondary judging!\p" + .string "let's move on to secondary judging!\p" .string "The second stage of judging is the\n" .string "much anticipated appeal time!\p" .string "May the contestants amaze us with\n" .string "superb appeals of dazzling moves!\p" - .string "Let’s see a little enthusiasm!\n" - .string "Let’s appeal!$" + .string "Let's see a little enthusiasm!\n" + .string "Let's appeal!$" LinkContestRoom1_Text_27BA15: @ 827BA15 - .string "MC: That’s it for judging!$" + .string "MC: That's it for judging!$" LinkContestRoom1_Text_27BA30: @ 827BA30 .string "Thank you all for a most wonderful\n" @@ -1755,7 +1755,7 @@ LilycoveCity_ContestLobby_Text_27C140: @ 827C140 .string "condition to take part in a CONTEST…$" LilycoveCity_ContestLobby_Text_27C186: @ 827C186 - .string "I’m sorry, but an EGG cannot take part\n" + .string "I'm sorry, but an EGG cannot take part\n" .string "in a POKéMON CONTEST.$" LilycoveCity_ContestLobby_Text_27C1C3: @ 827C1C3 @@ -1823,7 +1823,7 @@ LilycoveCity_ContestLobby_Text_27C742: @ 827C742 .string "counter (POKéMON Ruby or Sapphire).$" LilycoveCity_ContestLobby_Text_27C879: @ 827C879 - .string "I’m terribly sorry.\p" + .string "I'm terribly sorry.\p" .string "G-MODE does not function\n" .string "with Wireless Adapters.\p" .string "Please select E-MODE or try\n" @@ -1834,7 +1834,7 @@ LilycoveCity_ContestLobby_Text_27C8FD: @ 827C8FD .string "to enter?$" LinkContestRoom1_Text_27C929: @ 827C929 - .string "MC: Hello! We’re just getting started\n" + .string "MC: Hello! We're just getting started\n" .string "with a 4-player linked POKéMON\l" .string "{STR_VAR_2}!$" @@ -1843,9 +1843,9 @@ LinkContestRoom1_Text_27C972: @ 827C972 .string "POKéMON are as follows:$" LinkContestRoom1_Text_27C9AF: @ 827C9AF - .string "MC: We’ve just seen the four POKéMON\n" + .string "MC: We've just seen the four POKéMON\n" .string "contestants.\p" - .string "Now it’s time for primary judging!$" + .string "Now it's time for primary judging!$" LinkContestRoom1_Text_27CA04: @ 827CA04 .string "The audience will vote on their\n" @@ -1858,7 +1858,7 @@ LinkContestRoom1_Text_27CA42: @ 827CA42 LinkContestRoom1_Text_27CA71: @ 827CA71 .string "Voting is now complete!\p" .string "While the votes are being tallied,\n" - .string "let’s move on to secondary judging!$" + .string "let's move on to secondary judging!$" LinkContestRoom1_Text_27CAD0: @ 827CAD0 .string "The second stage of judging is\n" @@ -1867,5 +1867,5 @@ LinkContestRoom1_Text_27CAD0: @ 827CAD0 .string "superb appeals of dazzling moves!$" LinkContestRoom1_Text_27CB55: @ 827CB55 - .string "Let’s see a little enthusiasm!\n" - .string "Let’s appeal!$" + .string "Let's see a little enthusiasm!\n" + .string "Let's appeal!$" diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 3a2194132..13b68617a 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -298,32 +298,32 @@ EventScript_EggHatch:: @ 8291FC0 end Route117_Text_291FCF: @ 8291FCF - .string "I’m the DAY-CARE MAN.\p" + .string "I'm the DAY-CARE MAN.\p" .string "I help take care of the precious\n" .string "POKéMON of TRAINERS.\p" - .string "If you’d like me to raise your POKéMON,\n" + .string "If you'd like me to raise your POKéMON,\n" .string "have a word with my wife.$" Route117_Text_29205D: @ 829205D - .string "Ah, it’s you!\p" + .string "Ah, it's you!\p" .string "We were raising your POKéMON,\n" .string "and my goodness, were we surprised!\p" .string "Your POKéMON had an EGG!\p" - .string "We don’t know how it got there,\n" + .string "We don't know how it got there,\n" .string "but your POKéMON had it.\p" .string "You do want it, yes?$" Route117_Text_292114: @ 8292114 - .string "Ah, it’s you! Good to see you.\n" - .string "Your {STR_VAR_1}’s doing fine.$" + .string "Ah, it's you! Good to see you.\n" + .string "Your {STR_VAR_1}'s doing fine.$" Route117_Text_292149: @ 8292149 - .string "Well then, I’ll keep it.\n" + .string "Well then, I'll keep it.\n" .string "Thanks!$" Route117_Text_29216A: @ 829216A .string "You have no room for it…\n" - .string "Come back when you’ve made room.$" + .string "Come back when you've made room.$" Route117_Text_2921A4: @ 82921A4 .string "{PLAYER} received the EGG from\n" @@ -335,7 +335,7 @@ Route117_Text_2921CF: @ 82921CF Route117_Text_2921E5: @ 82921E5 .string "By the way, about your {STR_VAR_1},\n" .string "it seemed to be friendly with\l" - .string "{STR_VAR_2}’s {STR_VAR_3}.\p" + .string "{STR_VAR_2}'s {STR_VAR_3}.\p" .string "I may even have seen it receiving\n" .string "a piece of MAIL.$" @@ -344,7 +344,7 @@ Route117_Text_29225A: @ 829225A .string "have a word with my wife.$" Route117_Text_292299: @ 8292299 - .string "Ah, it’s you! Your {STR_VAR_1} and\n" + .string "Ah, it's you! Your {STR_VAR_1} and\n" .string "{STR_VAR_2} are doing fine.$" Route117_Text_2922C6: @ 82922C6 @@ -352,7 +352,7 @@ Route117_Text_2922C6: @ 82922C6 .string "You do want this, yes?$" Route117_PokemonDayCare_Text_2922F4: @ 82922F4 - .string "I’m the DAY-CARE LADY.\p" + .string "I'm the DAY-CARE LADY.\p" .string "We can raise POKéMON for you.\p" .string "Would you like us to raise one?$" @@ -361,7 +361,7 @@ Route117_PokemonDayCare_Text_292349: @ 8292349 .string "you?$" Route117_PokemonDayCare_Text_292370: @ 8292370 - .string "Fine, we’ll raise your {STR_VAR_1}\n" + .string "Fine, we'll raise your {STR_VAR_1}\n" .string "for a while.\p" .string "Come back for it later.$" @@ -377,7 +377,7 @@ Route117_PokemonDayCare_Text_292416: @ 8292416 .string "Come again.$" Route117_PokemonDayCare_Text_292432: @ 8292432 - .string "You don’t have enough money…$" + .string "You don't have enough money…$" Route117_PokemonDayCare_Text_29244F: @ 829244F .string "Will you take back the other one,\n" @@ -388,7 +388,7 @@ Route117_PokemonDayCare_Text_292476: @ 8292476 .string "Come again.$" Route117_PokemonDayCare_Text_292488: @ 8292488 - .string "Ah, it’s you! Good to see you.\n" + .string "Ah, it's you! Good to see you.\n" .string "Your POKéMON can only be doing good!$" Route117_PokemonDayCare_Text_2924CC: @ 82924CC @@ -408,7 +408,7 @@ Route117_PokemonDayCare_Text_292549: @ 8292549 Route117_PokemonDayCare_Text_292575: @ 8292575 .string "Perfect!\n" - .string "Here’s your POKéMON.$" + .string "Here's your POKéMON.$" Route117_PokemonDayCare_Text_292593: @ 8292593 .string "{PLAYER} took back {STR_VAR_1} from\n" @@ -434,6 +434,6 @@ Route117_PokemonDayCare_Text_29266D: @ 829266D .string "Huh?\n" .string "Now, now.\p" .string "If you leave that POKéMON with\n" - .string "me, you’ll be left with just one.\p" + .string "me, you'll be left with just one.\p" .string "You will be better off if you catch\n" .string "some more, I dare say.$" diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 15bb7a7e6..1d3c8dfe5 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -146,7 +146,7 @@ Route111_Text_29083A: @ 829083A .string "Would you like to use ROCK SMASH?$" Route111_Text_29087F: @ 829087F - .string "It’s a rugged rock, but a POKéMON\n" + .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" FieryPath_EventScript_2908BA:: @ 82908BA @@ -206,17 +206,17 @@ FieryPath_EventScript_290929:: @ 8290929 end FieryPath_Text_29092C: @ 829092C - .string "It’s a big boulder, but a POKéMON\n" + .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.\p" .string "Would you like to use STRENGTH?$" FieryPath_Text_29098C: @ 829098C .string "{STR_VAR_1} used STRENGTH!\p" - .string "{STR_VAR_1}’s STRENGTH made it\n" + .string "{STR_VAR_1}'s STRENGTH made it\n" .string "possible to move boulders around!$" FieryPath_Text_2909D6: @ 82909D6 - .string "It’s a big boulder, but a POKéMON\n" + .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.$" FieryPath_Text_290A16: @ 8290A16 @@ -252,7 +252,7 @@ Text_290A8E: @ 8290A8E .string "a mighty roar.$" Text_290AC3: @ 8290AC3 - .string "It’s a large waterfall.\n" + .string "It's a large waterfall.\n" .string "Would you like to use WATERFALL?$" Text_290AFC: @ 8290AFC @@ -333,4 +333,4 @@ EventScript_290CAE:: @ 8290CAE end Text_290CB7: @ 8290CB7 - .string "Looks like there’s nothing here…$" + .string "Looks like there's nothing here…$" diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 52ae750b0..e19453b66 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -93,15 +93,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4 end MauvilleCity_PokemonCenter_1F_Text_28E1B1: @ 828E1B1 - .string "Hi, I’m the TRADER.\n" + .string "Hi, I'm the TRADER.\n" .string "Want to trade decorations with me?$" MauvilleCity_PokemonCenter_1F_Text_28E1E8: @ 828E1E8 .string "Oh…\n" - .string "You’ve left me feeling the blues…$" + .string "You've left me feeling the blues…$" MauvilleCity_PokemonCenter_1F_Text_28E20E: @ 828E20E - .string "But we’ve traded decorations already,\n" + .string "But we've traded decorations already,\n" .string "you and I.$" MauvilleCity_PokemonCenter_1F_Text_28E23F: @ 828E23F @@ -109,7 +109,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E23F: @ 828E23F .string "you want of mine, speak up.$" MauvilleCity_PokemonCenter_1F_Text_28E27F: @ 828E27F - .string "You don’t want anything?\n" + .string "You don't want anything?\n" .string "I feel unwanted…$" MauvilleCity_PokemonCenter_1F_Text_28E2A9: @ 828E2A9 @@ -118,37 +118,37 @@ MauvilleCity_PokemonCenter_1F_Text_28E2A9: @ 828E2A9 .string "Do you want it?$" MauvilleCity_PokemonCenter_1F_Text_28E2E3: @ 828E2E3 - .string "Uh… Wait a second. You don’t have a\n" + .string "Uh… Wait a second. You don't have a\n" .string "single piece of decoration!$" MauvilleCity_PokemonCenter_1F_Text_28E323: @ 828E323 - .string "Okay, pick the decoration that you’ll\n" + .string "Okay, pick the decoration that you'll\n" .string "trade to me.$" MauvilleCity_PokemonCenter_1F_Text_28E356: @ 828E356 - .string "You won’t trade with me?\n" + .string "You won't trade with me?\n" .string "I feel unwanted…$" MauvilleCity_PokemonCenter_1F_Text_28E380: @ 828E380 - .string "You’ve got all the {STR_VAR_2}S that can\n" - .string "be stored. You’ve no room for this.$" + .string "You've got all the {STR_VAR_2}S that can\n" + .string "be stored. You've no room for this.$" MauvilleCity_PokemonCenter_1F_Text_28E3C4: @ 828E3C4 - .string "Okay, so we’ll trade my {STR_VAR_3}\n" + .string "Okay, so we'll trade my {STR_VAR_3}\n" .string "for your {STR_VAR_2}?$" MauvilleCity_PokemonCenter_1F_Text_28E3EC: @ 828E3EC .string "That piece of decoration is in use.\n" - .string "You can’t trade it.$" + .string "You can't trade it.$" MauvilleCity_PokemonCenter_1F_Text_28E424: @ 828E424 - .string "Then we’ll trade!\n" - .string "I’ll send my decoration to your PC.$" + .string "Then we'll trade!\n" + .string "I'll send my decoration to your PC.$" MauvilleCity_PokemonCenter_1F_Text_28E45A: @ 828E45A - .string "Oops! Sorry! That’s a really rare\n" + .string "Oops! Sorry! That's a really rare\n" .string "piece of decoration.\l" - .string "I can’t trade that one away!\p" + .string "I can't trade that one away!\p" .string "Can I interest you in something else?$" MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 @@ -248,14 +248,14 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E5EC:: @ 828E5EC end MauvilleCity_PokemonCenter_1F_Text_28E5F6: @ 828E5F6 - .string "I’m the STORYTELLER.\n" - .string "I’ll tell you tales of legendary\l" + .string "I'm the STORYTELLER.\n" + .string "I'll tell you tales of legendary\l" .string "TRAINERS.\p" .string "Will you hear my tale?$" MauvilleCity_PokemonCenter_1F_Text_28E64D: @ 828E64D .string "Oh…\n" - .string "You’ve left me feeling the blues…$" + .string "You've left me feeling the blues…$" MauvilleCity_PokemonCenter_1F_Text_28E673: @ 828E673 .string "I know of these legends.\n" @@ -268,12 +268,12 @@ MauvilleCity_PokemonCenter_1F_Text_28E6AE: @ 828E6AE .string "of a legendary tale?$" MauvilleCity_PokemonCenter_1F_Text_28E726: @ 828E726 - .string "What’s that?!\n" + .string "What's that?!\n" .string "You… You…\p" .string "{STR_VAR_2}\n" .string "{STR_VAR_1} time(s)?!\p" .string "That is indeed magnificent!\n" - .string "It’s the birth of a new legend!$" + .string "It's the birth of a new legend!$" MauvilleCity_PokemonCenter_1F_Text_28E78A: @ 828E78A .string "It gets me thinking, could there be\n" @@ -291,7 +291,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844 MauvilleCity_PokemonCenter_1F_Text_28E881: @ 828E881 .string "Hmm…\n" - .string "I’m not satisfied…\p" + .string "I'm not satisfied…\p" .string "I wish you would bring me news worthy\n" .string "of being called a legend.$" @@ -367,7 +367,7 @@ MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD .string "named {STR_VAR_3}.\p" .string "This TRAINER got interviewed\n" .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be a TRAINER who’s\n" + .string "{STR_VAR_3} must be a TRAINER who's\n" .string "attracting much attention!$" MauvilleCity_PokemonCenter_1F_Text_28EC60:: @ 828EC60 @@ -507,7 +507,7 @@ MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277 .string "This TRAINER used ROCK SMASH\n" .string "{STR_VAR_1} times!\p" .string "{STR_VAR_3} must be a TRAINER who\n" - .string "can’t leave a stone unsmashed!$" + .string "can't leave a stone unsmashed!$" MauvilleCity_PokemonCenter_1F_Text_28F2FC:: @ 828F2FC .string "The Move-Loving TRAINER$" @@ -674,7 +674,7 @@ MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7 .string "named {STR_VAR_3}.\p" .string "This TRAINER got soaked by rain\n" .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3}’s charisma must even\n" + .string "{STR_VAR_3}'s charisma must even\n" .string "attract rain!$" MauvilleCity_PokemonCenter_1F_Text_28FB1D:: @ 828FB1D @@ -716,8 +716,8 @@ MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98 .string "named {STR_VAR_3}.\p" .string "This TRAINER jumped down ledges\n" .string "{STR_VAR_1} times!\p" - .string "If there’s a ledge to be jumped,\n" - .string "{STR_VAR_3} can’t ignore it!$" + .string "If there's a ledge to be jumped,\n" + .string "{STR_VAR_3} can't ignore it!$" MauvilleCity_PokemonCenter_1F_Text_28FD1D:: @ 828FD1D .string "The Legendary TV Viewer$" @@ -744,7 +744,7 @@ MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE .string "This TRAINER checked the time\n" .string "{STR_VAR_1} times!\p" .string "{STR_VAR_3} must be a punctual TRAINER\n" - .string "who’s conscious of the time.$" + .string "who's conscious of the time.$" MauvilleCity_PokemonCenter_1F_Text_28FE57:: @ 828FE57 .string "The POKéMON LOTTERY Wizard$" @@ -786,7 +786,7 @@ MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D .string "This TRAINER rode the CABLE CAR\n" .string "{STR_VAR_1} times!\p" .string "{STR_VAR_3} must be a busy TRAINER\n" - .string "who’s up and down all the time!$" + .string "who's up and down all the time!$" MauvilleCity_PokemonCenter_1F_Text_290097:: @ 8290097 .string "The Hot Spring-Loving TRAINER$" @@ -876,19 +876,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_29022D:: @ 829022D end MauvilleCity_PokemonCenter_1F_Text_29022F: @ 829022F - .string "I’m GIDDY!\n" + .string "I'm GIDDY!\n" .string "I have a scintillating story for you!\p" .string "Would you like to hear my story?$" MauvilleCity_PokemonCenter_1F_Text_290281: @ 8290281 .string "Oh…\n" - .string "You’ve left me feeling the blues…$" + .string "You've left me feeling the blues…$" MauvilleCity_PokemonCenter_1F_Text_2902A7: @ 82902A7 .string "Also, I was thinking…$" MauvilleCity_PokemonCenter_1F_Text_2902BD: @ 82902BD - .string "That’s about it, I think…\p" + .string "That's about it, I think…\p" .string "We should chat again!\n" .string "Bye-bye!$" @@ -945,12 +945,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_290384:: @ 8290384 end MauvilleCity_PokemonCenter_1F_Text_29038E: @ 829038E - .string "Hi, I’m the BARD.\n" + .string "Hi, I'm the BARD.\n" .string "Would you like to hear my song?$" MauvilleCity_PokemonCenter_1F_Text_2903C0: @ 82903C0 .string "Oh…\n" - .string "You’ve left me feeling the blues…$" + .string "You've left me feeling the blues…$" MauvilleCity_PokemonCenter_1F_Text_2903E6: @ 82903E6 .string "Oh, what a moving song…\n" @@ -959,14 +959,14 @@ MauvilleCity_PokemonCenter_1F_Text_2903E6: @ 82903E6 MauvilleCity_PokemonCenter_1F_Text_290421: @ 8290421 .string "So?\n" .string "How do you like my song?\p" - .string "But I’m none too happy about\n" + .string "But I'm none too happy about\n" .string "the lyrics.\p" .string "How would you like to write some\n" .string "new lyrics for me?$" MauvilleCity_PokemonCenter_1F_Text_29049B: @ 829049B .string "Oh…\n" - .string "You’ve left me feeling the blues…$" + .string "You've left me feeling the blues…$" MauvilleCity_PokemonCenter_1F_Text_2904C1: @ 82904C1 .string "Thank you kindly!\n" @@ -977,26 +977,26 @@ MauvilleCity_PokemonCenter_1F_Text_2904EB: @ 82904EB .string "to go?$" MauvilleCity_PokemonCenter_1F_Text_290514: @ 8290514 - .string "Okay! That’s it, then.\n" - .string "I’ll sing this song for a while.$" + .string "Okay! That's it, then.\n" + .string "I'll sing this song for a while.$" MauvilleCity_PokemonCenter_1F_Text_29054C: @ 829054C .string "Hey, yo! They call me the HIPSTER.\n" - .string "I’ll teach you what’s hip and happening.$" + .string "I'll teach you what's hip and happening.$" MauvilleCity_PokemonCenter_1F_Text_290598: @ 8290598 - .string "But, hey, I taught you what’s hip and\n" + .string "But, hey, I taught you what's hip and\n" .string "happening already.\p" - .string "I’d like to spread the good word to\n" + .string "I'd like to spread the good word to\n" .string "other folks.$" MauvilleCity_PokemonCenter_1F_Text_290602: @ 8290602 .string "But, hey, you already know a lot about\n" - .string "what’s hip and happening.\p" - .string "I’ve got nothing new to teach you!$" + .string "what's hip and happening.\p" + .string "I've got nothing new to teach you!$" MauvilleCity_PokemonCenter_1F_Text_290666: @ 8290666 .string "Hey, have you heard about\n" .string "“{STR_VAR_1}â€?\p" - .string "What’s it mean? Well…\n" + .string "What's it mean? Well…\n" .string "Ask your daddy or mommy, okay?$" diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index cd2885ea5..dde799a4b 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -97,7 +97,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_291686:: @ 8291686 PetalburgCity_PokemonCenter_1F_Text_291687: @ 8291687 .string "Hello there, TRAINER!\n" - .string "You’ve got a wonderful smile, there.\p" + .string "You've got a wonderful smile, there.\p" .string "I have a hobby--collecting the profiles\n" .string "of POKéMON TRAINERS.$" @@ -108,7 +108,7 @@ PetalburgCity_PokemonCenter_1F_Text_2916FF: @ 82916FF PetalburgCity_PokemonCenter_1F_Text_291729: @ 8291729 .string "You make your own profile by putting\n" .string "together four words or phrases.\p" - .string "Here, I’ll show you an example of a\n" + .string "Here, I'll show you an example of a\n" .string "profile using four pieces of text.\p" .string "You can switch those four pieces with\n" .string "other text pieces any which way you\l" @@ -122,11 +122,11 @@ PetalburgCity_PokemonCenter_1F_Text_291729: @ 8291729 .string "pieces to display a list of choices.\p" .string "Then, pick the choice you want.\p" .string "Repeat for the remaining text choices,\n" - .string "and you’ll have your very own profile.$" + .string "and you'll have your very own profile.$" PetalburgCity_PokemonCenter_1F_Text_291969: @ 8291969 .string "Yes! Thank you!\n" - .string "So, let’s see it, then.$" + .string "So, let's see it, then.$" PetalburgCity_PokemonCenter_1F_Text_291991: @ 8291991 .string "Oh, no, really?\p" @@ -134,30 +134,30 @@ PetalburgCity_PokemonCenter_1F_Text_291991: @ 8291991 .string "a wonderful profile…$" PetalburgCity_PokemonCenter_1F_Text_2919DC: @ 82919DC - .string "Oh? You’re not into it right now?\p" + .string "Oh? You're not into it right now?\p" .string "Well, anytime is good by me!$" PetalburgCity_PokemonCenter_1F_Text_291A1B: @ 8291A1B .string "Hello there, TRAINER!\n" - .string "You’ve got a wonderful smile.$" + .string "You've got a wonderful smile.$" PetalburgCity_PokemonCenter_1F_Text_291A4F: @ 8291A4F .string "May I see your new profile?$" PetalburgCity_PokemonCenter_1F_Text_291A6B: @ 8291A6B .string "Yes! Thank you!\p" - .string "I hope it’s even better than the profile\n" + .string "I hope it's even better than the profile\n" .string "you showed me before.$" PetalburgCity_PokemonCenter_1F_Text_291ABA: @ 8291ABA .string "Oh, you like your profile the way it is.\p" - .string "I don’t blame you--it’s a wonderful\n" + .string "I don't blame you--it's a wonderful\n" .string "profile the way it is now.$" PetalburgCity_PokemonCenter_1F_Text_291B22: @ 8291B22 .string "F-fantastic!\p" - .string "Your profile, it’s wonderful!\n" - .string "It really says what you’re about.\p" + .string "Your profile, it's wonderful!\n" + .string "It really says what you're about.\p" .string "Why, anyone hearing this profile would\n" .string "be captivated by you!\p" .string "Thank you!$" @@ -165,5 +165,5 @@ PetalburgCity_PokemonCenter_1F_Text_291B22: @ 8291B22 PetalburgCity_PokemonCenter_1F_Text_291BB7: @ 8291BB7 .string "Oh?\n" .string "You know the secret saying!\p" - .string "That means you’re now a fellow member\n" + .string "That means you're now a fellow member\n" .string "of the MYSTERY EVENT CLUB!$" diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 324944bb1..c1f53aa5d 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -21,41 +21,41 @@ Text_Pblock1_Yes: @ 8292E28 Text_Pblock1_No: @ 8292E33 .string "Oh…\n" - .string "You’ve made this old-timer sad…$" + .string "You've made this old-timer sad…$" Text_Pblock1_KnowHow: @ 8292E57 .string "Do you know how to make a {POKEBLOCK}?$" Text_Pblock1_Start: @ 8292E78 - .string "Let’s get started, then!\p" - .string "Let’s BERRY BLENDER!$" + .string "Let's get started, then!\p" + .string "Let's BERRY BLENDER!$" Text_Pblock1_Explain: @ 8292EA6 .string "Okay, a little explanation, then.\p" - .string "Oh, don’t worry, it’s quite simple.\p" - .string "When the BLENDER’s arrow comes to\n" + .string "Oh, don't worry, it's quite simple.\p" + .string "When the BLENDER's arrow comes to\n" .string "your marker, just press the A Button.\p" - .string "That’s all you have to do.\n" - .string "You’ll see how easy it is when you try.$" + .string "That's all you have to do.\n" + .string "You'll see how easy it is when you try.$" Text_Pblock1_NoBerries: @ 8292F77 .string "Oh?\n" - .string "You don’t have any BERRIES?\p" - .string "If you don’t have any BERRIES,\n" - .string "you can’t make any {POKEBLOCK}S.$" + .string "You don't have any BERRIES?\p" + .string "If you don't have any BERRIES,\n" + .string "you can't make any {POKEBLOCK}S.$" LilycoveCity_ContestLobby_Text_292FD1: @ 8292FD1 - .string "Well, that won’t do at all now, will it?\p" - .string "If you don’t mind leftovers, you can\n" + .string "Well, that won't do at all now, will it?\p" + .string "If you don't mind leftovers, you can\n" .string "have one of my BERRIES.\p" .string "That way, we could make some {POKEBLOCK}S\n" .string "together using the BERRY BLENDER.$" LilycoveCity_ContestLobby_Text_29307D: @ 829307D .string "If I had some BERRIES left over,\n" - .string "I’d gladly give you one…\p" - .string "But, I don’t have any to spare today.\n" - .string "We’ll have to do this another time.$" + .string "I'd gladly give you one…\p" + .string "But, I don't have any to spare today.\n" + .string "We'll have to do this another time.$" Text_Pblock1_FullPokeblock: @ 8293101 .string "But your {POKEBLOCK} CASE is full.\p" @@ -63,15 +63,15 @@ Text_Pblock1_FullPokeblock: @ 8293101 .string "you come see me again.$" Text_Pblock1_NoPokeblock: @ 8293157 - .string "But you don’t have a {POKEBLOCK} CASE.\p" + .string "But you don't have a {POKEBLOCK} CASE.\p" .string "You should get a {POKEBLOCK} CASE and then\n" .string "come see me.$" LilycoveCity_ContestLobby_Text_2931AA: @ 82931AA - .string "Let’s get blending already!$" + .string "Let's get blending already!$" LilycoveCity_ContestLobby_Text_2931C6: @ 82931C6 - .string "I wonder what kind of {POKEBLOCK} I’ll get?\n" + .string "I wonder what kind of {POKEBLOCK} I'll get?\n" .string "This is so exciting!$" LilycoveCity_ContestLobby_Text_293201: @ 8293201 @@ -82,33 +82,33 @@ LilycoveCity_ContestLobby_Text_293237: @ 8293237 .string "Okay!$" LilycoveCity_ContestLobby_Text_29323D: @ 829323D - .string "That’s too bad…\p" - .string "But we’ll always be around whenever\n" + .string "That's too bad…\p" + .string "But we'll always be around whenever\n" .string "you get the urge to blend!$" LilycoveCity_ContestLobby_Text_29328C: @ 829328C .string "Of course, you do know how to\n" - .string "blend {POKEBLOCK}S, don’t you?$" + .string "blend {POKEBLOCK}S, don't you?$" LilycoveCity_ContestLobby_Text_2932C3: @ 82932C3 - .string "Let’s get started, then!\p" - .string "Let’s BERRY BLENDER!$" + .string "Let's get started, then!\p" + .string "Let's BERRY BLENDER!$" LilycoveCity_ContestLobby_Text_2932F1: @ 82932F1 .string "Okay!\n" .string "Let me explain it to you!\p" - .string "When the spinning BLENDER’s arrow\n" + .string "When the spinning BLENDER's arrow\n" .string "reaches your marker, just press\l" .string "the A Button.\p" - .string "That’s all it takes.\n" - .string "Pretty easy, don’t you think?$" + .string "That's all it takes.\n" + .string "Pretty easy, don't you think?$" LilycoveCity_ContestLobby_Text_293394: @ 8293394 .string "Oh, but wait a second here…\n" - .string "You don’t have any BERRIES.\p" - .string "You can’t make any {POKEBLOCK}S without\n" + .string "You don't have any BERRIES.\p" + .string "You can't make any {POKEBLOCK}S without\n" .string "BERRIES…\p" - .string "We’ll always be around whenever you\n" + .string "We'll always be around whenever you\n" .string "get hold of some BERRIES to blend.$" LilycoveCity_ContestLobby_Text_29343E: @ 829343E @@ -119,7 +119,7 @@ LilycoveCity_ContestLobby_Text_29343E: @ 829343E LilycoveCity_ContestLobby_Text_2934A2: @ 82934A2 .string "Oh, but wait a second here…\n" - .string "You don’t have a {POKEBLOCK} CASE.\p" + .string "You don't have a {POKEBLOCK} CASE.\p" .string "You should get a {POKEBLOCK} CASE and\n" .string "then come back.$" @@ -132,32 +132,32 @@ LilycoveCity_ContestLobby_Text_29354E: @ 829354E LilycoveCity_ContestLobby_Text_293558: @ 8293558 .string "Oh, dear me…\p" - .string "You’ve left us in shock!$" + .string "You've left us in shock!$" LilycoveCity_ContestLobby_Text_29357E: @ 829357E .string "Naturally, you know how to make\n" - .string "{POKEBLOCK}S, don’t you?$" + .string "{POKEBLOCK}S, don't you?$" LilycoveCity_ContestLobby_Text_2935B1: @ 82935B1 .string "Okay, dear!\n" - .string "Let’s get started!\p" - .string "Let’s BERRY BLENDER!$" + .string "Let's get started!\p" + .string "Let's BERRY BLENDER!$" LilycoveCity_ContestLobby_Text_2935E5: @ 82935E5 .string "Oh, dear!\p" - .string "Then, I’ll explain it to you nicely.\p" - .string "When the BLENDER’s arrow spins to\n" + .string "Then, I'll explain it to you nicely.\p" + .string "When the BLENDER's arrow spins to\n" .string "your marker, press the A Button.\p" - .string "That’s all it takes.\n" - .string "Isn’t it simple?$" + .string "That's all it takes.\n" + .string "Isn't it simple?$" LilycoveCity_ContestLobby_Text_29367D: @ 829367D - .string "You don’t have any BERRIES,\n" + .string "You don't have any BERRIES,\n" .string "do you?\p" - .string "If you don’t have any BERRIES,\n" - .string "you can’t make any {POKEBLOCK}S.\p" - .string "We’ll always be making {POKEBLOCK}S here,\n" - .string "so let’s make some together when\l" + .string "If you don't have any BERRIES,\n" + .string "you can't make any {POKEBLOCK}S.\p" + .string "We'll always be making {POKEBLOCK}S here,\n" + .string "so let's make some together when\l" .string "you get a BERRY or two.$" LilycoveCity_ContestLobby_Text_293738: @ 8293738 @@ -167,22 +167,22 @@ LilycoveCity_ContestLobby_Text_293738: @ 8293738 .string "and then come back.$" LilycoveCity_ContestLobby_Text_293792: @ 8293792 - .string "You haven’t gotten a {POKEBLOCK} CASE\n" + .string "You haven't gotten a {POKEBLOCK} CASE\n" .string "yet, it looks like.\p" .string "You need to get a {POKEBLOCK} CASE before\n" .string "you come back.$" LilycoveCity_ContestLobby_Text_2937F9: @ 82937F9 - .string "Okay! Today’s going to be the day that\n" + .string "Okay! Today's going to be the day that\n" .string "I set a new BLENDER speed record!$" LilycoveCity_ContestLobby_Text_293842: @ 8293842 .string "Oh, dear!\n" - .string "You look as if you’re good at blending.\l" + .string "You look as if you're good at blending.\l" .string "Would you like to join us?$" LilycoveCity_ContestLobby_Text_29388F: @ 829388F - .string "I’m going to make delicious {POKEBLOCK}S\n" + .string "I'm going to make delicious {POKEBLOCK}S\n" .string "and make my POKéMON cuter.$" Text_PblockLink_Ask: @ 82938CD @@ -207,42 +207,42 @@ Text_PblockLink_3Arrived: @ 82939A5 Text_PblockLink_NoBerries: @ 82939BD .string "You have no BERRIES.\n" - .string "The BERRY BLENDER can’t be used.$" + .string "The BERRY BLENDER can't be used.$" Text_PblockLink_FullPokeblock: @ 82939F3 .string "Your {POKEBLOCK} CASE is full.\n" - .string "The BERRY BLENDER can’t be used.$" + .string "The BERRY BLENDER can't be used.$" Text_PblockLink_NoPokeblock: @ 8293A2D - .string "You don’t have a {POKEBLOCK} CASE.\n" - .string "The BERRY BLENDER can’t be used.$" + .string "You don't have a {POKEBLOCK} CASE.\n" + .string "The BERRY BLENDER can't be used.$" Text_Pblock1_Talk_0: @ 8293A6B .string "I love making {POKEBLOCK}S.\p" .string "I always have some BERRIES with me.$" Text_Pblock1_Talk_1: @ 8293AA5 - .string "If you’d like, we could make some\n" + .string "If you'd like, we could make some\n" .string "{POKEBLOCK}S together using the\l" .string "BERRY BLENDER.$" LilycoveCity_ContestLobby_Text_293AF0: @ 8293AF0 .string "Oh?\n" - .string "You don’t have any BERRIES?\p" - .string "Well, that won’t do at all now, will it?\p" - .string "If you don’t mind leftovers, you can\n" + .string "You don't have any BERRIES?\p" + .string "Well, that won't do at all now, will it?\p" + .string "If you don't mind leftovers, you can\n" .string "have one of my BERRIES.$" LilycoveCity_ContestLobby_Text_293B76: @ 8293B76 - .string "We’ll use it to make {POKEBLOCK}S together\n" + .string "We'll use it to make {POKEBLOCK}S together\n" .string "using the BERRY BLENDER.$" LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4 .string "Oh?\n" - .string "You don’t have any BERRIES?\p" - .string "If I had some left over, I’d gladly\n" + .string "You don't have any BERRIES?\p" + .string "If I had some left over, I'd gladly\n" .string "give you one…\p" - .string "But, I don’t have any to spare today.\n" + .string "But, I don't have any to spare today.\n" .string "Sorry about that.$" EventScript_Pblock1_Ask:: @ 8293C3E diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 84bb3982d..5a5244f1b 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -78,11 +78,11 @@ Text_2A4BF4: @ 82A4BF4 .string "ZONE right now?$" Text_2A4C26: @ 82A4C26 - .string "Ding-dong! Time’s up!\n" + .string "Ding-dong! Time's up!\n" .string "Your SAFARI Game is over.$" Text_2A4C56: @ 82A4C56 - .string "You’ve run out of SAFARI BALLS.\n" + .string "You've run out of SAFARI BALLS.\n" .string "Your SAFARI Game is over.$" Text_2A4C90: @ 82A4C90 @@ -101,11 +101,11 @@ Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12 .string "Welcome to the SAFARI ZONE!\p" .string "Here, you may witness many kinds of\n" .string "POKéMON rarely seen in HOENN.\p" - .string "And, you’ll see them in their wild,\n" + .string "And, you'll see them in their wild,\n" .string "untamed state in natural habitats.\p" - .string "What’s more, we’ve thrown open the\n" + .string "What's more, we've thrown open the\n" .string "gates to POKéMON TRAINERS.\p" - .string "You’re encouraged to catch POKéMON\n" + .string "You're encouraged to catch POKéMON\n" .string "for keeps!\p" .string "Come in and enjoy the SAFARI ZONE!$" @@ -121,7 +121,7 @@ Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1 .string "start with 30 SAFARI BALLS for\l" .string "catching POKéMON.\p" .string "The SAFARI Game is over when you run\n" - .string "out of SAFARI BALLS, or when you’ve\l" + .string "out of SAFARI BALLS, or when you've\l" .string "walked 500 steps.\p" .string "Come in and enjoy the SAFARI ZONE!$" @@ -135,7 +135,7 @@ Route121_SafariZoneEntrance_Text_2A4FD7: @ 82A4FD7 .string "Please play another time!$" Route121_SafariZoneEntrance_Text_2A4FF7: @ 82A4FF7 - .string "You don’t have enough money.\n" + .string "You don't have enough money.\n" .string "Sorry.$" Route121_SafariZoneEntrance_Text_2A501B: @ 82A501B @@ -148,7 +148,7 @@ Route121_SafariZoneEntrance_Text_2A5052: @ 82A5052 .string "{PLAYER} received 30 SAFARI BALLS.$" Route121_SafariZoneEntrance_Text_2A506F: @ 82A506F - .string "We’ll let you know when your game\n" + .string "We'll let you know when your game\n" .string "is over.\p" .string "So, until then, enjoy yourself, please!\n" .string "Off you go on your wild excursion!$" @@ -176,14 +176,14 @@ SafariZone_South_Text_2A521A: @ 82A521A SafariZone_South_Text_2A5248: @ 82A5248 .string "Okay.\p" - .string "I’ll take back your remaining SAFARI\n" + .string "I'll take back your remaining SAFARI\n" .string "BALLS.\p" .string "Thank you for playing.\n" .string "We hope to see you again.$" SafariZone_South_Text_2A52AB: @ 82A52AB .string "Good luck!\p" - .string "If you need anything, don’t hesitate\n" + .string "If you need anything, don't hesitate\n" .string "to tell me, please!$" SafariZone_South_Text_2A52EF: @ 82A52EF @@ -206,16 +206,16 @@ SafariZone_Southwest_Text_2A53B7: @ 82A53B7 SafariZone_Northwest_Text_2A542C: @ 82A542C .string "Gasp… Gasp…\n" .string "I…made it out here…but…\p" - .string "I’m exhausted… I don’t have the\n" + .string "I'm exhausted… I don't have the\n" .string "energy to catch POKéMON…$" SafariZone_North_Text_2A5489: @ 82A5489 - .string "I’m on a mission to find WATER POKéMON\n" - .string "you don’t see in HOENN.\p" + .string "I'm on a mission to find WATER POKéMON\n" + .string "you don't see in HOENN.\p" .string "Do you have any idea where the lake is?$" SafariZone_North_Text_2A54F0: @ 82A54F0 - .string "I’m going to catch a lot of rare POKéMON\n" + .string "I'm going to catch a lot of rare POKéMON\n" .string "here and trade them with my friends!$" SafariZone_South_Text_2A553E: @ 82A553E @@ -234,17 +234,17 @@ SafariZone_Southwest_Text_2A5613: @ 82A5613 .string "REST HOUSE$" SafariZone_RestHouse_Text_2A5639: @ 82A5639 - .string "I don’t have any {POKEBLOCK}S, but I caught\n" + .string "I don't have any {POKEBLOCK}S, but I caught\n" .string "a good number of POKéMON.\p" .string "You can improve your chances of making\n" .string "a catch by getting closer to them\l" .string "before throwing a SAFARI BALL.$" SafariZone_RestHouse_Text_2A56E1: @ 82A56E1 - .string "If you use {POKEBLOCK}S, wild POKéMON won’t\n" + .string "If you use {POKEBLOCK}S, wild POKéMON won't\n" .string "be so quick to run away.\p" - .string "It’s not much use to give {POKEBLOCK}S to\n" - .string "POKéMON that don’t flee easily.$" + .string "It's not much use to give {POKEBLOCK}S to\n" + .string "POKéMON that don't flee easily.$" SafariZone_RestHouse_Text_2A5764: @ 82A5764 .string "If you put a {POKEBLOCK} on the FEEDER,\n" @@ -254,25 +254,25 @@ SafariZone_RestHouse_Text_2A5764: @ 82A5764 SafariZone_South_Text_2A57EE: @ 82A57EE .string "This area is still under construction.\n" - .string "It’s off-limits, sorry!$" + .string "It's off-limits, sorry!$" SafariZone_Southeast_Text_2A582D: @ 82A582D - .string "The SAFARI ZONE’s expansion project\n" + .string "The SAFARI ZONE's expansion project\n" .string "is finished now.\p" .string "We hope you will enjoy the new area.$" SafariZone_South_Text_2A5887: @ 82A5887 .string "This area is still under construction.\n" - .string "It’s off-limits, sorry!$" + .string "It's off-limits, sorry!$" SafariZone_Southeast_Text_2A58C6: @ 82A58C6 - .string "Wow! Whee! I haven’t seen any of\n" + .string "Wow! Whee! I haven't seen any of\n" .string "these POKéMON before!$" SafariZone_Southeast_Text_2A58FD: @ 82A58FD .string "The POKéMON in this area are all\n" .string "new to me.\p" - .string "And I’m allowed to catch these rare\n" + .string "And I'm allowed to catch these rare\n" .string "POKéMON! Too cool!$" SafariZone_Southeast_Text_2A5960: @ 82A5960 @@ -281,7 +281,7 @@ SafariZone_Southeast_Text_2A5960: @ 82A5960 SafariZone_Northeast_Text_2A59A4: @ 82A59A4 .string "I only have a couple SAFARI BALLS left.\p" - .string "I’m having a hard time trying to\n" + .string "I'm having a hard time trying to\n" .string "decide what I should catch.$" SafariZone_Northeast_Text_2A5A09: @ 82A5A09 @@ -290,6 +290,6 @@ SafariZone_Northeast_Text_2A5A09: @ 82A5A09 SafariZone_Northeast_Text_2A5A44: @ 82A5A44 .string "Oh, boo!\n" - .string "I can’t seem to catch anything!\p" - .string "I’ll end up wasting the admission\n" - .string "price if I don’t catch something!$" + .string "I can't seem to catch anything!\p" + .string "I'll end up wasting the admission\n" + .string "price if I don't catch something!$" diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index aa1f4afee..031835c14 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -1,9 +1,9 @@ Route111_Text_2762C9: @ 82762C9 - .string "What’s that?\n" + .string "What's that?\n" .string "What am I doing?\p" - .string "I’m thinking about making my own room\n" + .string "I'm thinking about making my own room\n" .string "here using a POKéMON move.\p" - .string "I know! I’ll give you this TM.\n" + .string "I know! I'll give you this TM.\n" .string "Will you use it to make your own room?$" Route111_Text_27636E: @ 827636E @@ -12,25 +12,25 @@ Route111_Text_27636E: @ 827636E .string "Use SECRET POWER in front of the tree.\n" .string "Some vines should get free and drop\l" .string "down, so you can climb the tree.\p" - .string "You’ll find a lot of space for putting\n" + .string "You'll find a lot of space for putting\n" .string "your favorite things.\p" - .string "It’ll be your own secret room…\n" + .string "It'll be your own secret room…\n" .string "A SECRET BASE!\p" .string "You should make one, too.\p" - .string "Another thing, you don’t always have\n" + .string "Another thing, you don't always have\n" .string "to make your SECRET BASE in a tree.\p" .string "Try using SECRET POWER on rock walls\n" .string "that have small indents in them.\p" - .string "I’m going to look for other places, too.\n" + .string "I'm going to look for other places, too.\n" .string "Okay, bye!$" Route111_Text_27655C: @ 827655C - .string "Oh, you don’t want this?\n" + .string "Oh, you don't want this?\n" .string "If you change your mind, tell me, okay?$" Route111_Text_27659D: @ 827659D - .string "Oh, you don’t have any room for this.\p" - .string "I’ll hold on to it, so come back for it\n" + .string "Oh, you don't have any room for this.\p" + .string "I'll hold on to it, so come back for it\n" .string "another time, okay?$" Route111_EventScript_2765FF:: @ 82765FF diff --git a/data/text/berries.inc b/data/text/berries.inc index f35caca18..489acd4b6 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -1,21 +1,21 @@ PetalburgCity_Gym_Text_2A6D3D: @ 82A6D3D .string "DAD: Hi, {PLAYER}!\p" .string "I just received a very rare BERRY.\n" - .string "I’d like you to have it.$" + .string "I'd like you to have it.$" Route104_Text_2A6D86: @ 82A6D86 .string "If you see BERRIES growing in loamy\n" .string "soil, feel free to take them.\p" .string "But make sure you plant a BERRY in the\n" - .string "same spot. That’s common courtesy.\p" - .string "Here, I’ll share this with you.$" + .string "same spot. That's common courtesy.\p" + .string "Here, I'll share this with you.$" Route104_Text_2A6E32: @ 82A6E32 .string "The way you look, you must be a\n" .string "TRAINER, no?\p" .string "TRAINERS often make POKéMON hold\n" .string "BERRIES.\p" - .string "It’s up to you whether to grow BERRIES\n" + .string "It's up to you whether to grow BERRIES\n" .string "or use them.$" Route111_Text_2A6EBD: @ 82A6EBD @@ -26,18 +26,18 @@ Route111_Text_2A6EBD: @ 82A6EBD .string "You can have it!$" Route111_Text_2A6F3D: @ 82A6F3D - .string "I’m going to try really hard and make\n" + .string "I'm going to try really hard and make\n" .string "BERRIES in different colors.\p" .string "I hope you try hard, too!$" Route111_Text_2A6F9A: @ 82A6F9A - .string "I wonder what color BERRIES I’ll look\n" + .string "I wonder what color BERRIES I'll look\n" .string "for today?$" Route114_Text_2A6FCB: @ 82A6FCB .string "I love using the BERRY CRUSH machine,\n" - .string "so I’m collecting BERRIES.\p" - .string "I’ll share one with you, if you’d like.$" + .string "so I'm collecting BERRIES.\p" + .string "I'll share one with you, if you'd like.$" Route114_Text_2A7034: @ 82A7034 .string "You should try the BERRY CRUSH\n" @@ -46,13 +46,13 @@ Route114_Text_2A7034: @ 82A7034 Route114_Text_2A706E: @ 82A706E .string "Which BERRY should be planted?\n" .string "Should you use or hoard BERRIES?\p" - .string "It’s fun to think about.$" + .string "It's fun to think about.$" Route120_Text_2A70C7: @ 82A70C7 .string "BERRIES grow by soaking up sunlight.\p" .string "We help the BERRIES grow by watering\n" .string "them regularly.\p" - .string "It’s an expression of love, isn’t it?$" + .string "It's an expression of love, isn't it?$" Route120_Text_2A7147: @ 82A7147 .string "Yes, yes.\n" @@ -69,7 +69,7 @@ Route120_Text_2A71D5: @ 82A71D5 .string "I hope you raise it with loving care.$" Route120_Text_2A7217: @ 82A7217 - .string "I’ll get more BERRIES from\n" + .string "I'll get more BERRIES from\n" .string "the BERRY MASTER.$" LilycoveCity_Text_2A7244: @ 82A7244 @@ -81,7 +81,7 @@ LilycoveCity_Text_2A7244: @ 82A7244 LilycoveCity_Text_2A72E3: @ 82A72E3 .string "When it gets right down to it…\p" - .string "It’s because you’re a TRAINER!$" + .string "It's because you're a TRAINER!$" LilycoveCity_Text_2A7321: @ 82A7321 .string "When it gets right down to it…\p" @@ -93,7 +93,7 @@ Route123_BerryMastersHouse_Text_2A7386: @ 82A7386 .string "I dream of filling the world with\n" .string "beautiful flowers, so I raise BERRIES\l" .string "and hand them out to everyone.\p" - .string "You’re deserving of one!$" + .string "You're deserving of one!$" Route123_BerryMastersHouse_Text_2A7428: @ 82A7428 .string "Why be stingy?\n" @@ -105,13 +105,13 @@ Route123_BerryMastersHouse_Text_2A7445: @ 82A7445 .string "Let flowers fill the world!$" Route123_BerryMastersHouse_Text_2A749E: @ 82A749E - .string "I’m done for today.\n" + .string "I'm done for today.\n" .string "Come again another day.\p" .string "Let flowers fill the world!$" Route123_BerryMastersHouse_Text_2A74E6: @ 82A74E6 .string "The way my husband grows BERRIES,\n" - .string "oh, he’s the best in the world.\p" + .string "oh, he's the best in the world.\p" .string "He makes me proud, that he does.\p" .string "Incidentally, child, have you heard\n" .string "a good saying lately?$" @@ -123,7 +123,7 @@ Route123_BerryMastersHouse_Text_2A7583: @ 82A7583 Route123_BerryMastersHouse_Text_2A75D0: @ 82A75D0 .string "Oh! A good saying it is.\n" - .string "You’re quite remarkable.\p" + .string "You're quite remarkable.\p" .string "I want you to have this.$" Route123_BerryMastersHouse_Text_2A761B: @ 82A761B @@ -146,7 +146,7 @@ Route104_PrettyPetalFlowerShop_Text_2A76D9: @ 82A76D9 Route104_PrettyPetalFlowerShop_Text_2A7706: @ 82A7706 .string "Your name is?\p" .string "{PLAYER}{KUN}.\n" - .string "That’s a nice name.\p" + .string "That's a nice name.\p" .string "{PLAYER}{KUN}, would you like to learn about\n" .string "BERRIES?$" @@ -160,36 +160,36 @@ Route104_PrettyPetalFlowerShop_Text_2A775B: @ 82A775B .string "then grow BERRIES again.\p" .string "I want to see the whole wide world\n" .string "filled with beautiful flowers.\l" - .string "That’s my dream.\p" + .string "That's my dream.\p" .string "Please help me, {PLAYER}{KUN}. Plant BERRIES\n" .string "and bring more flowers into the world.$" Route104_PrettyPetalFlowerShop_Text_2A78DF: @ 82A78DF .string "Flowers bring so much happiness to\n" - .string "people, don’t they?$" + .string "people, don't they?$" Route104_PrettyPetalFlowerShop_Text_2A7916: @ 82A7916 .string "Hello!\p" .string "The more attention you give to flowers,\n" .string "the more beautifully they bloom.\p" - .string "You’ll like tending flowers. I’m sure\n" + .string "You'll like tending flowers. I'm sure\n" .string "of it. You can have this.$" Route104_PrettyPetalFlowerShop_Text_2A79A6: @ 82A79A6 .string "While BERRY plants are growing,\n" .string "water them with the WAILMER PAIL.\p" .string "Oh, another thing.\p" - .string "If you don’t pick BERRIES for a while,\n" - .string "they’ll drop off onto the ground.\l" - .string "But they’ll sprout again.\p" - .string "Isn’t that awesome?\n" - .string "It’s like they have the will to live.$" + .string "If you don't pick BERRIES for a while,\n" + .string "they'll drop off onto the ground.\l" + .string "But they'll sprout again.\p" + .string "Isn't that awesome?\n" + .string "It's like they have the will to live.$" Route104_PrettyPetalFlowerShop_Text_2A7A98: @ 82A7A98 - .string "I’m trying to be like my big sisters.\n" - .string "I’m growing flowers, too!\p" + .string "I'm trying to be like my big sisters.\n" + .string "I'm growing flowers, too!\p" .string "Here you go!\n" - .string "It’s for you!$" + .string "It's for you!$" Route104_PrettyPetalFlowerShop_Text_2A7AF3: @ 82A7AF3 .string "You can plant a BERRY and grow it big,\n" @@ -200,13 +200,13 @@ Route104_PrettyPetalFlowerShop_Text_2A7AF3: @ 82A7AF3 .string "I want some candy, too.$" SootopolisCity_Text_2A7BB0: @ 82A7BB0 - .string "Hi, what’s your name?\p" + .string "Hi, what's your name?\p" .string "… … … … … … … … …\n" - .string "Okay. That’s nice!\p" + .string "Okay. That's nice!\p" .string "My name is KIRI.\p" .string "My mommy and daddy named me that so\n" .string "I would grow healthy and warmhearted.\l" - .string "That’s what they wished.\p" + .string "That's what they wished.\p" .string "You can have one of these.$" SootopolisCity_Text_2A7C7C: @ 82A7C7C @@ -219,8 +219,8 @@ SootopolisCity_Text_2A7CB7: @ 82A7CB7 SootopolisCity_Text_2A7CEC: @ 82A7CEC .string "Spring, summer, autumn, and winter.\p" - .string "If you’re born in springtime, do you like\n" - .string "the spring, and if you’re born in the\l" + .string "If you're born in springtime, do you like\n" + .string "the spring, and if you're born in the\l" .string "summer, do you like the summer?$" SootopolisCity_Text_2A7D80: @ 82A7D80 @@ -230,5 +230,5 @@ SootopolisCity_Text_2A7D80: @ 82A7D80 SootopolisCity_Text_2A7DD2: @ 82A7DD2 .string "Oh…\n" - .string "It doesn’t matter…\p" - .string "There’s so much that I want to know…$" + .string "It doesn't matter…\p" + .string "There's so much that I want to know…$" diff --git a/data/text/berry_descriptions.inc b/data/text/berry_descriptions.inc index 8d29ec9b2..e5917ca32 100644 --- a/data/text/berry_descriptions.inc +++ b/data/text/berry_descriptions.inc @@ -5,7 +5,7 @@ gBerryDescriptionPart2_Cheri:: @ 8589B09 .string "The bright red BERRY is very spicy.$" gBerryDescriptionPart1_Chesto:: @ 8589B2D - .string "The BERRY’s thick skin and fruit are$" + .string "The BERRY's thick skin and fruit are$" gBerryDescriptionPart2_Chesto:: @ 8589B52 .string "very tough. It is dry-tasting all over.$" @@ -41,7 +41,7 @@ gBerryDescriptionPart2_Oran:: @ 8589CAE .string "BERRIES grow in half a day.$" gBerryDescriptionPart1_Persim:: @ 8589CCA - .string "Loves sunlight. The BERRY’s color$" + .string "Loves sunlight. The BERRY's color$" gBerryDescriptionPart2_Persim:: @ 8589CEC .string "grows vivid when exposed to the sun.$" @@ -248,7 +248,7 @@ gBerryDescriptionPart1_Starf:: @ 858A5E6 .string "So strong, it was abandoned at the$" gBerryDescriptionPart2_Starf:: @ 858A609 - .string "world’s edge. Considered a mirage.$" + .string "world's edge. Considered a mirage.$" gBerryDescriptionPart1_Enigma:: @ 858A62C .string "A completely enigmatic BERRY.$" diff --git a/data/text/birch_speech.inc b/data/text/birch_speech.inc index 1dfc0242b..abdbc89ef 100644 --- a/data/text/birch_speech.inc +++ b/data/text/birch_speech.inc @@ -19,13 +19,13 @@ gText_Birch_MainSpeech:: @ 82C8A1F .string "at times as cooperative workmates.\p" .string "And sometimes, we band together\n" .string "and battle others like us.\p" - .string "But despite our closeness, we don’t\n" + .string "But despite our closeness, we don't\n" .string "know everything about POKéMON.\p" .string "In fact, there are many, many\n" .string "secrets surrounding POKéMON.\p" .string "To unravel POKéMON mysteries,\n" - .string "I’ve been undertaking research.\l" - .string "That’s what I do.\p" + .string "I've been undertaking research.\l" + .string "That's what I do.\p" .string "$" gText_Birch_AndYouAre:: @ 82C8BD0 @@ -37,14 +37,14 @@ gText_Birch_BoyOrGirl:: @ 82C8BDD gText_Birch_WhatsYourName:: @ 82C8BFF .string "All right.\n" - .string "What’s your name?$" + .string "What's your name?$" gText_Birch_SoItsPlayer:: @ 82C8C1C - .string "So it’s {PLAYER}{KUN}?$" + .string "So it's {PLAYER}{KUN}?$" gText_Birch_YourePlayer:: @ 82C8C2A .string "Ah, okay!\p" - .string "You’re {PLAYER}{KUN} who’s moving to my\n" + .string "You're {PLAYER}{KUN} who's moving to my\n" .string "hometown of LITTLEROOT.\l" .string "I get it now!\p" .string "$" @@ -56,6 +56,6 @@ gText_Birch_AreYouReady:: @ 82C8C7A .string "Take courage, and leap into the\n" .string "world of POKéMON where dreams,\l" .string "adventure, and friendships await!\p" - .string "Well, I’ll be expecting you later.\n" + .string "Well, I'll be expecting you later.\n" .string "Come see me in my POKéMON LAB.\p" .string "$" diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 92b04c95c..737e4b862 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -49,10 +49,10 @@ gContestEffect0FhDescription:: @ 827CE2C .string "Startles all POKéMON that\nhave done their appeals.$" gContestEffect10hDescription:: @ 827CE5F - .string "Shifts the JUDGE’s\nattention from others.$" + .string "Shifts the JUDGE's\nattention from others.$" gContestEffect11hDescription:: @ 827CE89 - .string "Startles the POKéMON that\nhas the JUDGE’s attention.$" + .string "Startles the POKéMON that\nhas the JUDGE's attention.$" gContestEffect12hDescription:: @ 827CEBE .string "Jams the others, and misses\none turn of appeals.$" @@ -103,10 +103,10 @@ gContestEffect21hDescription:: @ 827D16E .string "The appeal works better\nthe later it is performed.$" gContestEffect22hDescription:: @ 827D1A1 - .string "The appeal’s quality varies\ndepending on its timing.$" + .string "The appeal's quality varies\ndepending on its timing.$" gContestEffect23hDescription:: @ 827D1D6 - .string "Works well if it’s the same\ntype as the one before.$" + .string "Works well if it's the same\ntype as the one before.$" gContestEffect24hDescription:: @ 827D20A .string "Works well if different in\ntype than the one before.$" @@ -115,10 +115,10 @@ gContestEffect25hDescription:: @ 827D23F .string "Affected by how well the\nappeal in front goes.$" gContestEffect26hDescription:: @ 827D26E - .string "Ups the user’s condition.\nHelps prevent nervousness.$" + .string "Ups the user's condition.\nHelps prevent nervousness.$" gContestEffect27hDescription:: @ 827D2A3 - .string "The appeal works well if the\nuser’s condition is good.$" + .string "The appeal works well if the\nuser's condition is good.$" gContestEffect28hDescription:: @ 827D2DA .string "The next appeal can be\nmade earlier next turn.$" @@ -127,7 +127,7 @@ gContestEffect29hDescription:: @ 827D309 .string "The next appeal can be\nmade later next turn.$" gContestEffect2AhDescription:: @ 827D336 - .string "Makes the next turn’s order\nmore easily scrambled.$" + .string "Makes the next turn's order\nmore easily scrambled.$" gContestEffect2BhDescription:: @ 827D369 .string "Scrambles the order of\nappeals on the next turn.$" @@ -208,7 +208,7 @@ gText_0827D507:: @ 827D507 gText_0827D531:: @ 827D531 .string "Appeal no. {STR_VAR_1}!\n" - .string "But it can’t participate!$" + .string "But it can't participate!$" gText_0827D55A:: @ 827D55A .string "{STR_VAR_1} appealed with\n" @@ -219,7 +219,7 @@ gText_0827D56F:: @ 827D56F .string "the others.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827D597:: @ 827D597 - .string "We’re all out of\n" + .string "We're all out of\n" .string "Appeal Time!{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827D5C1:: @ 827D5C1 @@ -228,7 +228,7 @@ gText_0827D5C1:: @ 827D5C1 gText_0827D5DC:: @ 827D5DC .string "It followed another\n" - .string "POKéMON’s lead.$" + .string "POKéMON's lead.$" gText_0827D600:: @ 827D600 .string "But it messed up.$" @@ -246,7 +246,7 @@ gText_0827D654:: @ 827D654 .string "past mistakes.$" gText_0827D67E:: @ 827D67E - .string "It can’t make any more\n" + .string "It can't make any more\n" .string "moves.$" gText_0827D69C:: @ 827D69C @@ -273,7 +273,7 @@ gText_0827D743:: @ 827D743 .string "stand out at all…{PAUSE_UNTIL_PRESS}$" gText_0827D764:: @ 827D764 - .string "{STR_VAR_1} didn’t stand\n" + .string "{STR_VAR_1} didn't stand\n" .string "out very much…{PAUSE_UNTIL_PRESS}$" gText_0827D785:: @ 827D785 @@ -289,39 +289,39 @@ gText_0827D7C8:: @ 827D7C8 .string "total attention.{PAUSE_UNTIL_PRESS}$" gText_0827D7E8:: @ 827D7E8 - .string "{STR_VAR_1} hasn’t made\n" + .string "{STR_VAR_1} hasn't made\n" .string "its appeal.{PAUSE_UNTIL_PRESS}$" gText_0827D805:: @ 827D805 .string "Anticipation swelled for\n" - .string "{STR_VAR_1}’s appeal next.$" + .string "{STR_VAR_1}'s appeal next.$" gText_0827D830:: @ 827D830 .string "$" gText_0827D831:: @ 827D831 - .string "The JUDGE ’s views on\n" + .string "The JUDGE 's views on\n" .string "{STR_VAR_1} held firm.$" gText_0827D855:: @ 827D855 - .string "{STR_VAR_1}’s {STR_VAR_3}\n" + .string "{STR_VAR_1}'s {STR_VAR_3}\n" .string "changed perceptions.$" gText_0827D872:: @ 827D872 - .string "{STR_VAR_1}’s appeal\n" + .string "{STR_VAR_1}'s appeal\n" .string "effect wore off.$" gText_0827D88F:: @ 827D88F - .string "The special appeal’s\n" + .string "The special appeal's\n" .string "effect wore off.$" gText_0827D8B5:: @ 827D8B5 - .string "Everyone’s appeals were\n" + .string "Everyone's appeals were\n" .string "made to look the same.$" gText_0827D8E4:: @ 827D8E4 .string "It cheapened\n" - .string "{STR_VAR_2}’s appeal.$" + .string "{STR_VAR_2}'s appeal.$" gText_0827D8FE:: @ 827D8FE .string "It cheapened the appeal\n" @@ -333,7 +333,7 @@ gText_0827D926:: @ 827D926 gText_0827D947:: @ 827D947 .string "It cheapened\n" - .string "{STR_VAR_2}’s appeal.$" + .string "{STR_VAR_2}'s appeal.$" gText_0827D961:: @ 827D961 .string "It severely cheapened\n" @@ -341,14 +341,14 @@ gText_0827D961:: @ 827D961 gText_0827D986:: @ 827D986 .string "Anticipation swelled for\n" - .string "{STR_VAR_1}’s appeal next.$" + .string "{STR_VAR_1}'s appeal next.$" gText_0827D9B1:: @ 827D9B1 .string "It cheapened the appeal\n" .string "of those ahead.$" gText_0827D9D9:: @ 827D9D9 - .string "It cheapened the JUDGE’s\n" + .string "It cheapened the JUDGE's\n" .string "favorite appeal.$" gText_0827DA03:: @ 827DA03 @@ -360,7 +360,7 @@ gText_0827DA31:: @ 827DA31 .string "for being jammed.$" gText_0827DA5B:: @ 827DA5B - .string "It can’t participate in\n" + .string "It can't participate in\n" .string "appeals any more.$" gText_0827DA85:: @ 827DA85 @@ -384,7 +384,7 @@ gText_0827DB1F:: @ 827DB1F .string "even less noticeable.$" gText_0827DB4E:: @ 827DB4E - .string "Everyone’s appeals were\n" + .string "Everyone's appeals were\n" .string "made the same.$" gText_827DB75:: @ 827DB75 @@ -392,7 +392,7 @@ gText_827DB75:: @ 827DB75 .string "of the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DBB0:: @ 827DBB0 - .string "{STR_VAR_1} can’t make an\n" + .string "{STR_VAR_1} can't make an\n" .string "appeal after this.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DBE0:: @ 827DBE0 @@ -460,7 +460,7 @@ gText_827DEA5:: @ 827DEA5 .string "POKéMON before it.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DED9:: @ 827DED9 - .string "{STR_VAR_1}’s appeal did\n" + .string "{STR_VAR_1}'s appeal did\n" .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DF02:: @ 827DF02 @@ -468,55 +468,55 @@ gText_827DF02:: @ 827DF02 .string "preceding POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DF3A:: @ 827DF3A - .string "{STR_VAR_1}’s appeal did\n" + .string "{STR_VAR_1}'s appeal did\n" .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DF63:: @ 827DF63 - .string "{STR_VAR_1}’s appeal did\n" + .string "{STR_VAR_1}'s appeal did\n" .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DF8C:: @ 827DF8C - .string "{STR_VAR_1}’s appeal\n" + .string "{STR_VAR_1}'s appeal\n" .string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DFB8:: @ 827DFB8 - .string "{STR_VAR_1}’s appeal\n" + .string "{STR_VAR_1}'s appeal\n" .string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827DFE2:: @ 827DFE2 - .string "{STR_VAR_1}’s appeal\n" + .string "{STR_VAR_1}'s appeal\n" .string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E00C:: @ 827E00C - .string "{STR_VAR_1}’s appeal was\n" + .string "{STR_VAR_1}'s appeal was\n" .string "a dud.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E02F:: @ 827E02F - .string "{STR_VAR_1}’s appeal did\n" + .string "{STR_VAR_1}'s appeal did\n" .string "not work very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E05F:: @ 827E05F - .string "{STR_VAR_1}’s appeal\n" + .string "{STR_VAR_1}'s appeal\n" .string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E08B:: @ 827E08B - .string "{STR_VAR_1}’s appeal\n" + .string "{STR_VAR_1}'s appeal\n" .string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E0B5:: @ 827E0B5 - .string "{STR_VAR_1}’s appeal\n" + .string "{STR_VAR_1}'s appeal\n" .string "went very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E0DD:: @ 827E0DD - .string "{STR_VAR_1}’s appeal\n" + .string "{STR_VAR_1}'s appeal\n" .string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E107:: @ 827E107 - .string "It’s the same type as the\n" + .string "It's the same type as the\n" .string "POKéMON before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E143:: @ 827E143 - .string "It’s not the same type as\n" + .string "It's not the same type as\n" .string "the one before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E17F:: @ 827E17F @@ -524,15 +524,15 @@ gText_827E17F:: @ 827E17F .string "than the POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E1BB:: @ 827E1BB - .string "It didn’t do as well as the\n" + .string "It didn't do as well as the\n" .string "POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E1F3:: @ 827E1F3 - .string "{STR_VAR_1}’s condition\n" + .string "{STR_VAR_1}'s condition\n" .string "rose above usual.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E220:: @ 827E220 - .string "{STR_VAR_1}’s hot status\n" + .string "{STR_VAR_1}'s hot status\n" .string "made it a great appeal!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" gText_827E254:: @ 827E254 @@ -572,7 +572,7 @@ gText_0827E3EB:: @ 827E3EB .string "avoid seeing it.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E416:: @ 827E416 - .string "{STR_VAR_1} isn’t fazed\n" + .string "{STR_VAR_1} isn't fazed\n" .string "by that sort of thing.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E448:: @ 827E448 @@ -592,11 +592,11 @@ gText_0827E4D5:: @ 827E4D5 .string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E504:: @ 827E504 - .string "{STR_VAR_1} couldn’t help\n" + .string "{STR_VAR_1} couldn't help\n" .string "uttering a cry.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E531:: @ 827E531 - .string "{STR_VAR_1} couldn’t help\n" + .string "{STR_VAR_1} couldn't help\n" .string "leaping up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E55A:: @ 827E55A @@ -622,7 +622,7 @@ gText_0827E638:: @ 827E638 .string "But it was ignored…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E658:: @ 827E658 - .string "But it couldn’t improve\n" + .string "But it couldn't improve\n" .string "its condition…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E68B:: @ 827E68B @@ -638,23 +638,23 @@ gText_0827E6E3:: @ 827E6E3 .string "by repeating an appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E717:: @ 827E717 - .string "{STR_VAR_1}’s {STR_VAR_3}\n" + .string "{STR_VAR_1}'s {STR_VAR_3}\n" .string "went over great.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E73C:: @ 827E73C - .string "{STR_VAR_1}’s {STR_VAR_3}\n" - .string "didn’t go over well here…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" + .string "{STR_VAR_1}'s {STR_VAR_3}\n" + .string "didn't go over well here…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E76A:: @ 827E76A - .string "{STR_VAR_1}’s {STR_VAR_3}\n" + .string "{STR_VAR_1}'s {STR_VAR_3}\n" .string "got the crowd going.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E793:: @ 827E793 - .string "{STR_VAR_1} can’t appeal\n" + .string "{STR_VAR_1} can't appeal\n" .string "next turn…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E7BA:: @ 827E7BA - .string "It attracted the crowd’s\n" + .string "It attracted the crowd's\n" .string "attention.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E7EA:: @ 827E7EA @@ -662,7 +662,7 @@ gText_0827E7EA:: @ 827E7EA .string "watch {STR_VAR_3}.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E817:: @ 827E817 - .string "{STR_VAR_1}’s\n" + .string "{STR_VAR_1}'s\n" .string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" gText_0827E837:: @ 827E837 diff --git a/data/text/easy_chat/easy_chat_group_actions.s b/data/text/easy_chat/easy_chat_group_actions.s index ce9fecfb3..432323e95 100644 --- a/data/text/easy_chat/easy_chat_group_actions.s +++ b/data/text/easy_chat/easy_chat_group_actions.s @@ -134,7 +134,7 @@ gEasyChatWord_Using:: @ 859B174 .string "USING$" gEasyChatWord_Couldnt:: @ 859B17A - .string "COULDN’T$" + .string "COULDN'T$" gEasyChatWord_Capable:: @ 859B183 .string "CAPABLE$" diff --git a/data/text/easy_chat/easy_chat_group_battle.s b/data/text/easy_chat/easy_chat_group_battle.s index 3a07d946e..1f1175980 100644 --- a/data/text/easy_chat/easy_chat_group_battle.s +++ b/data/text/easy_chat/easy_chat_group_battle.s @@ -29,7 +29,7 @@ gEasyChatWord_WhenIWin:: @ 8598B76 .string "WHEN I WIN$" gEasyChatWord_CantWin:: @ 8598B81 - .string "CAN’T WIN$" + .string "CAN'T WIN$" gEasyChatWord_CanWin:: @ 8598B8B .string "CAN WIN$" diff --git a/data/text/easy_chat/easy_chat_group_endings.s b/data/text/easy_chat/easy_chat_group_endings.s index d8c212c79..4d79c9a69 100644 --- a/data/text/easy_chat/easy_chat_group_endings.s +++ b/data/text/easy_chat/easy_chat_group_endings.s @@ -35,10 +35,10 @@ gEasyChatWord_Is:: @ 859A1A0 .string "IS$" gEasyChatWord_IsntItQues:: @ 859A1A3 - .string "ISN’T IT?$" + .string "ISN'T IT?$" gEasyChatWord_Lets:: @ 859A1AD - .string "LET’S$" + .string "LET'S$" gEasyChatWord_Other:: @ 859A1B3 .string "OTHER$" @@ -56,19 +56,19 @@ gEasyChatWord_Those:: @ 859A1C6 .string "THOSE$" gEasyChatWord_Isnt:: @ 859A1CC - .string "ISN’T$" + .string "ISN'T$" gEasyChatWord_Wont:: @ 859A1D2 - .string "WON’T$" + .string "WON'T$" gEasyChatWord_Cant:: @ 859A1D8 - .string "CAN’T$" + .string "CAN'T$" gEasyChatWord_Can:: @ 859A1DE .string "CAN$" gEasyChatWord_Dont:: @ 859A1E2 - .string "DON’T$" + .string "DON'T$" gEasyChatWord_Do:: @ 859A1E8 .string "DO$" @@ -83,16 +83,16 @@ gEasyChatWord_Which:: @ 859A1F5 .string "WHICH$" gEasyChatWord_Wasnt:: @ 859A1FB - .string "WASN’T$" + .string "WASN'T$" gEasyChatWord_Werent:: @ 859A202 - .string "WEREN’T$" + .string "WEREN'T$" gEasyChatWord_Have:: @ 859A20A .string "HAVE$" gEasyChatWord_Havent:: @ 859A20F - .string "HAVEN’T$" + .string "HAVEN'T$" gEasyChatWord_A:: @ 859A217 .string "A$" @@ -179,10 +179,10 @@ gEasyChatWord_Did:: @ 859A28E .string "DID$" gEasyChatWord_Didnt:: @ 859A292 - .string "DIDN’T$" + .string "DIDN'T$" gEasyChatWord_Doesnt:: @ 859A299 - .string "DOESN’T$" + .string "DOESN'T$" gEasyChatWord_Without:: @ 859A2A1 .string "WITHOUT$" diff --git a/data/text/easy_chat/easy_chat_group_greetings.s b/data/text/easy_chat/easy_chat_group_greetings.s index 5f2e6a2f6..98db7acea 100644 --- a/data/text/easy_chat/easy_chat_group_greetings.s +++ b/data/text/easy_chat/easy_chat_group_greetings.s @@ -53,7 +53,7 @@ gEasyChatWord_ThankYou:: @ 859908A .string "THANK YOU$" gEasyChatWord_IveArrived:: @ 8599094 - .string "I’VE ARRIVED$" + .string "I'VE ARRIVED$" gEasyChatWord_Pardon:: @ 85990A1 .string "PARDON$" @@ -80,7 +80,7 @@ gEasyChatWord_HeyQues:: @ 85990DF .string "HEY?$" gEasyChatWord_WhatsUpQues:: @ 85990E4 - .string "WHAT’S UP?$" + .string "WHAT'S UP?$" gEasyChatWord_HuhQues:: @ 85990EF .string "HUH?$" diff --git a/data/text/easy_chat/easy_chat_group_hobbies.s b/data/text/easy_chat/easy_chat_group_hobbies.s index 3a209899e..f3fb02b0b 100644 --- a/data/text/easy_chat/easy_chat_group_hobbies.s +++ b/data/text/easy_chat/easy_chat_group_hobbies.s @@ -17,7 +17,7 @@ gEasyChatWord_Chat:: @ 859B97D .string "CHAT$" gEasyChatWord_ChildsPlay:: @ 859B982 - .string "CHILD’S PLAY$" + .string "CHILD'S PLAY$" gEasyChatWord_Toys:: @ 859B98F .string "TOYS$" diff --git a/data/text/easy_chat/easy_chat_group_misc.s b/data/text/easy_chat/easy_chat_group_misc.s index d9c6e4348..19ca730d5 100644 --- a/data/text/easy_chat/easy_chat_group_misc.s +++ b/data/text/easy_chat/easy_chat_group_misc.s @@ -68,7 +68,7 @@ gEasyChatWord_ThoseWere:: @ 859C141 .string "THOSE WERE$" gEasyChatWord_ThatsItExcl:: @ 859C14C - .string "THAT’S IT!$" + .string "THAT'S IT!$" gEasyChatWord_Am:: @ 859C157 .string "AM$" diff --git a/data/text/easy_chat/easy_chat_group_people.s b/data/text/easy_chat/easy_chat_group_people.s index 5f983da3b..fb74aba91 100644 --- a/data/text/easy_chat/easy_chat_group_people.s +++ b/data/text/easy_chat/easy_chat_group_people.s @@ -17,10 +17,10 @@ gEasyChatWord_Your:: @ 8599361 .string "YOUR$" gEasyChatWord_Youre:: @ 8599366 - .string "YOU’RE$" + .string "YOU'RE$" gEasyChatWord_Youve:: @ 859936D - .string "YOU’VE$" + .string "YOU'VE$" gEasyChatWord_Mother:: @ 8599374 .string "MOTHER$" @@ -89,10 +89,10 @@ gEasyChatWord_His:: @ 85993F7 .string "HIS$" gEasyChatWord_Hes:: @ 85993FB - .string "HE’S$" + .string "HE'S$" gEasyChatWord_Arent:: @ 8599400 - .string "AREN’T$" + .string "AREN'T$" gEasyChatWord_Siblings:: @ 8599407 .string "SIBLINGS$" @@ -125,7 +125,7 @@ gEasyChatWord_IAm:: @ 859943C .string "I AM$" gEasyChatWord_Ive:: @ 8599441 - .string "I’VE$" + .string "I'VE$" gEasyChatWord_Who:: @ 8599446 .string "WHO$" @@ -146,7 +146,7 @@ gEasyChatWord_WhoIs:: @ 8599468 .string "WHO IS$" gEasyChatWord_Its:: @ 859946F - .string "IT’S$" + .string "IT'S$" gEasyChatWord_Lady:: @ 8599474 .string "LADY$" @@ -176,10 +176,10 @@ gEasyChatWord_Their:: @ 85994A8 .string "THEIR$" gEasyChatWord_Theyre:: @ 85994AE - .string "THEY’RE$" + .string "THEY'RE$" gEasyChatWord_Theyve:: @ 85994B6 - .string "THEY’VE$" + .string "THEY'VE$" gEasyChatWord_We:: @ 85994BE .string "WE$" @@ -194,13 +194,13 @@ gEasyChatWord_Our:: @ 85994CC .string "OUR$" gEasyChatWord_WeAre:: @ 85994D0 - .string "WE’RE$" + .string "WE'RE$" gEasyChatWord_Rival:: @ 85994D6 .string "RIVAL$" gEasyChatWord_Weve:: @ 85994DC - .string "WE’VE$" + .string "WE'VE$" gEasyChatWord_Woman:: @ 85994E2 .string "WOMAN$" diff --git a/data/text/easy_chat/easy_chat_group_speech.s b/data/text/easy_chat/easy_chat_group_speech.s index a1b973882..4cfea7eca 100644 --- a/data/text/easy_chat/easy_chat_group_speech.s +++ b/data/text/easy_chat/easy_chat_group_speech.s @@ -86,7 +86,7 @@ gEasyChatWord_Wild:: @ 8599D98 .string "WILD$" gEasyChatWord_Thats:: @ 8599D9D - .string "THAT’S$" + .string "THAT'S$" gEasyChatWord_Just:: @ 8599DA4 .string "JUST$" diff --git a/data/text/eon_ticket.inc b/data/text/eon_ticket.inc index ac4c9dba1..d436f2df1 100644 --- a/data/text/eon_ticket.inc +++ b/data/text/eon_ticket.inc @@ -13,15 +13,15 @@ LilycoveCity_Harbor_Text_2A68D2: @ 82A68D2 LilycoveCity_Harbor_Text_2A68FC: @ 82A68FC .string "Aye, mate, are you the one who brought\n" .string "that mighty odd PASS?\p" - .string "I’ll tell you, you’re trying to reach a\n" + .string "I'll tell you, you're trying to reach a\n" .string "tiny spit of an island far in the south.\p" - .string "There’s no telling what we’ll encounter\n" + .string "There's no telling what we'll encounter\n" .string "once we reach there, aye.\l" .string "That shivers my timbers!\p" .string "All aboard!$" SouthernIsland_Exterior_Text_2A69F1: @ 82A69F1 - .string "Aye, mate, there’s nothing here to\n" + .string "Aye, mate, there's nothing here to\n" .string "see or do on this forgettable island.\p" .string "What say we sail back to LILYCOVE?$" diff --git a/data/text/lottery_corner.inc b/data/text/lottery_corner.inc index 21ae534b2..674fed52e 100644 --- a/data/text/lottery_corner.inc +++ b/data/text/lottery_corner.inc @@ -2,7 +2,7 @@ LilycoveCity_DepartmentStore_1F_Text_2A6390: @ 82A6390 .string "This is the POKéMON LOTTERY CORNER.\p" .string "All shoppers at our DEPARTMENT STORE\n" .string "get to draw a POKéMON LOTO TICKET.\p" - .string "If the LOTO TICKET’s number matches\n" + .string "If the LOTO TICKET's number matches\n" .string "the ID number of any of your POKéMON,\l" .string "you will receive a fabulous gift.\p" .string "Would you like to draw a POKéMON\n" @@ -22,44 +22,44 @@ LilycoveCity_DepartmentStore_1F_Text_2A650B: @ 82A650B .string "The LOTO TICKET number is {STR_VAR_1}.\p" .string "I need to run a check on this number\n" .string "to see if it matches any of your\l" - .string "POKéMON’s ID numbers. Please wait.$" + .string "POKéMON's ID numbers. Please wait.$" LilycoveCity_DepartmentStore_1F_Text_2A6592: @ 82A6592 .string "Congratulations!\p" - .string "The ID number of your team’s\n" + .string "The ID number of your team's\n" .string "{STR_VAR_1} matches your\l" - .string "LOTO TICKET’s number!$" + .string "LOTO TICKET's number!$" LilycoveCity_DepartmentStore_1F_Text_2A65E6: @ 82A65E6 .string "Congratulations!\p" .string "The ID number of your PC-boxed\n" .string "{STR_VAR_1} matches your\l" - .string "LOTO TICKET’s number!$" + .string "LOTO TICKET's number!$" LilycoveCity_DepartmentStore_1F_Text_2A663C: @ 82A663C - .string "I’m sorry.\n" + .string "I'm sorry.\n" .string "None of the numbers matched.$" LilycoveCity_DepartmentStore_1F_Text_2A6664: @ 82A6664 .string "Two digits matched, so you win the\n" .string "third prize!\l" - .string "You’ve won the {STR_VAR_1}!$" + .string "You've won the {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_2A66A7: @ 82A66A7 .string "Three digits matched, so you win the\n" .string "second prize!\l" - .string "You’ve won the {STR_VAR_1}!$" + .string "You've won the {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_2A66ED: @ 82A66ED .string "Four digits matched, so you win the\n" .string "first prize!\l" - .string "You’ve won the {STR_VAR_1}!$" + .string "You've won the {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_2A6731: @ 82A6731 .string "Oh, my goodness, all five digits\n" .string "matched!\p" - .string "You’ve won the jackpot prize!\n" - .string "You’ve won the {STR_VAR_1}!$" + .string "You've won the jackpot prize!\n" + .string "You've won the {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_2A678C: @ 82A678C .string "Oh?\n" @@ -69,8 +69,8 @@ LilycoveCity_DepartmentStore_1F_Text_2A678C: @ 82A678C LilycoveCity_DepartmentStore_1F_Text_2A67E1: @ 82A67E1 .string "{PLAYER}?\n" - .string "Yes, I’ve been expecting you.\p" - .string "This is the prize we’ve been holding\n" + .string "Yes, I've been expecting you.\p" + .string "This is the prize we've been holding\n" .string "for you.$" LilycoveCity_DepartmentStore_1F_Text_2A6831: @ 82A6831 diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index 666c90867..d61f364e9 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -4,20 +4,20 @@ gUnknown_082A5C9C:: @ 82A5C9C .string "POKéDEX is coming along?$" Route101_Text_2A5CEB: @ 82A5CEB - .string "Hm? Oh, you haven’t caught enough\n" + .string "Hm? Oh, you haven't caught enough\n" .string "POKéMON to make it worthwhile.$" gUnknown_082A5D2C:: @ 82A5D2C .string "Hmhm…\p" - .string "So, you’ve seen {STR_VAR_1} POKéMON,\n" - .string "and you’ve caught {STR_VAR_2} POKéMON…$" + .string "So, you've seen {STR_VAR_1} POKéMON,\n" + .string "and you've caught {STR_VAR_2} POKéMON…$" gBirchDexRatingText_LessThan10:: @ 82A5D6C .string "Go into grassy areas more and look\n" .string "for POKéMON more carefully.$" gBirchDexRatingText_LessThan20:: @ 82A5DAB - .string "I guess you’re getting the hang\n" + .string "I guess you're getting the hang\n" .string "of it. But, it gets harder from here.$" gBirchDexRatingText_LessThan30:: @ 82A5DF1 @@ -45,10 +45,10 @@ gBirchDexRatingText_LessThan70:: @ 82A5EF4 gBirchDexRatingText_LessThan80:: @ 82A5F39 .string "This is going to be a fantastic\n" .string "POKéDEX.\l" - .string "That’s the feeling I’m getting.$" + .string "That's the feeling I'm getting.$" gBirchDexRatingText_LessThan90:: @ 82A5F82 - .string "You’ve collected this many…\n" + .string "You've collected this many…\n" .string "Your talent is remarkable!$" gBirchDexRatingText_LessThan100:: @ 82A5FB9 @@ -57,7 +57,7 @@ gBirchDexRatingText_LessThan100:: @ 82A5FB9 .string "can only be caught there.$" gBirchDexRatingText_LessThan110:: @ 82A6018 - .string "You’ve finally reached\n" + .string "You've finally reached\n" .string "the 100-kind mark.\p" .string "This is an impressive POKéDEX!$" @@ -70,7 +70,7 @@ gBirchDexRatingText_LessThan130:: @ 82A609C .string "by trading with others.$" gBirchDexRatingText_LessThan140:: @ 82A60D5 - .string "I’ve heard of POKéMON that evolve\n" + .string "I've heard of POKéMON that evolve\n" .string "when they come to fully love their\l" .string "TRAINERS.$" @@ -82,7 +82,7 @@ gBirchDexRatingText_LessThan150:: @ 82A6124 gBirchDexRatingText_LessThan160:: @ 82A616F .string "On occasion, some POKéMON appear\n" .string "in large numbers like outbreaks.\p" - .string "Don’t miss opportunities like\n" + .string "Don't miss opportunities like\n" .string "those.$" gBirchDexRatingText_LessThan170:: @ 82A61D6 @@ -97,10 +97,10 @@ gBirchDexRatingText_LessThan180:: @ 82A623A gBirchDexRatingText_LessThan190:: @ 82A6287 .string "With a POKéDEX this complete,\n" - .string "you’re a real professional at this!$" + .string "you're a real professional at this!$" gBirchDexRatingText_LessThan200:: @ 82A62C9 - .string "You’re very close to completing\n" + .string "You're very close to completing\n" .string "this POKéDEX.\l" .string "I can feel it in my bones!$" @@ -111,5 +111,5 @@ gBirchDexRatingText_DexCompleted:: @ 82A6312 gUnknown_082A633D:: @ 82A633D .string "Hmhm…\n" .string "On a nationwide basis…\p" - .string "You’ve seen {STR_VAR_1} POKéMON,\n" - .string "and you’ve caught {STR_VAR_2} POKéMON…$" + .string "You've seen {STR_VAR_1} POKéMON,\n" + .string "and you've caught {STR_VAR_2} POKéMON…$" diff --git a/data/text/pokemon_news.inc b/data/text/pokemon_news.inc index 5af4e2994..3cac20c18 100644 --- a/data/text/pokemon_news.inc +++ b/data/text/pokemon_news.inc @@ -1,39 +1,39 @@ gPokeNewsTextSlateport_Upcoming:: @ 0828D0F8 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "SLATEPORT’s most popular kind of guy,\n" + .string "It's time for POKéMON NEWS.\p" + .string "SLATEPORT's most popular kind of guy,\n" .string "the ENERGY GURU, is in the news again!\p" .string "He promises to, “Stupendously go for\n" .string "it in just this many days: {STR_VAR_1}!â€\p" .string "While he refused to elaborate on what\n" .string "he will stupendously go for, the\l" .string "ENERGY GURU advised, “Save up your\l" - .string "money. That’ll be good…â€\p" + .string "money. That'll be good…â€\p" .string "It sounds like a trip to SLATEPORT\n" .string "would be well worth your while that day.\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextSlateport_Ongoing:: @ 0828D2A1 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" + .string "It's time for POKéMON NEWS.\p" + .string "This is the news you've all been\n" .string "waiting for!\p" - .string "SLATEPORT’S ENERGY GURU is going\n" + .string "SLATEPORT'S ENERGY GURU is going\n" .string "for it stupendously in the MARKET!\p" .string "He promises unbeatable bargain\n" .string "prices on CALCIUM and PROTEIN!\p" .string "A trip to SLATEPORT CITY sounds\n" .string "worthwhile. Why not visit and shop\l" - .string "to your heart’s content?\p" - .string "That’s the news on POKéMON NEWS.$" + .string "to your heart's content?\p" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextSlateport_Ending:: @ 0828D3F5 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" + .string "It's time for POKéMON NEWS.\p" + .string "This is the news you've all been\n" .string "waiting for!\p" - .string "SLATEPORT’S ENERGY GURU is going\n" + .string "SLATEPORT'S ENERGY GURU is going\n" .string "for it stupendously in the MARKET!\p" .string "He promises unbeatable bargain\n" .string "prices on CALCIUM and PROTEIN!\p" @@ -41,85 +41,85 @@ gPokeNewsTextSlateport_Ending:: @ 0828D3F5 .string "still has ample merchandise left.\p" .string "Why not visit SLATEPORT CITY for\n" .string "a most enjoyable shopping trip?\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextGameCorner_Upcoming:: @ 0828D571 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s approaching!\n" - .string "It’s finally coming!\p" - .string "The GAME CORNER’s service day will be\n" + .string "It's time for POKéMON NEWS.\p" + .string "It's approaching!\n" + .string "It's finally coming!\p" + .string "The GAME CORNER's service day will be\n" .string "here in just this many days: {STR_VAR_1}!\p" .string "Even those who are usually unlucky\n" .string "may be lucky on this particular day!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextGameCorner_Ongoing:: @ 0828D66F .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s here!\n" - .string "It’s finally arrived!\p" - .string "GAME CORNER’s service day has finally\n" + .string "It's time for POKéMON NEWS.\p" + .string "It's here!\n" + .string "It's finally arrived!\p" + .string "GAME CORNER's service day has finally\n" .string "arrived!\p" .string "Could you be lucky at the SLOTS \n" .string "and ROULETTE?\p" .string "The location is MAUVILLE CITY.\n" .string "This is the place!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextGameCorner_Ending:: @ 0828D768 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s here!\n" - .string "It’s finally arrived!\p" - .string "GAME CORNER’s service day has finally\n" + .string "It's time for POKéMON NEWS.\p" + .string "It's here!\n" + .string "It's finally arrived!\p" + .string "GAME CORNER's service day has finally\n" .string "arrived!\p" .string "Could you be lucky at the SLOTS\n" .string "and ROULETTE?\p" .string "Time is limited and has almost run out.\n" .string "The location is MAUVILLE CITY.\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextLilycove_Upcoming:: @ 0828D875 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "We’ve just received wonderful news\n" + .string "It's time for POKéMON NEWS.\p" + .string "We've just received wonderful news\n" .string "from LILYCOVE DEPARTMENT STORE.\p" - .string "The DEPARTMENT STORE’s clear-out sale\n" + .string "The DEPARTMENT STORE's clear-out sale\n" .string "will be in just this many days: {STR_VAR_1}!\p" .string "That thingamajig or that doodad that\n" - .string "you’ve always wanted could be yours!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "you've always wanted could be yours!\p" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextLilycove_Ongoing:: @ 0828D994 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" + .string "It's time for POKéMON NEWS.\p" + .string "This is the news you've all been\n" .string "waiting for!\p" - .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" + .string "LILYCOVE DEPARTMENT STORE's clear-out\n" .string "sale has finally arrived!\p" .string "All the thingamajigs and doodads that\n" - .string "you’ve always dreamt about…\p" + .string "you've always dreamt about…\p" .string "You may be in for fateful encounters\n" .string "with them all!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextLilycove_Ending:: @ 0828DAC0 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" + .string "It's time for POKéMON NEWS.\p" + .string "This is the news you've all been\n" .string "waiting for!\p" - .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" + .string "LILYCOVE DEPARTMENT STORE's clear-out\n" .string "sale has finally arrived!\p" .string "All the thingamajigs and doodads that\n" - .string "you’ve always dreamt about…\p" + .string "you've always dreamt about…\p" .string "You may be in for fateful encounters\n" .string "with them all!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextBlendMaster_Upcoming:: @ 0828DBEC .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" + .string "It's time for POKéMON NEWS.\p" .string "We have big news for everyone\n" .string "involved in the making of {POKEBLOCK}S.\p" .string "The legendary BLEND MASTER will be\n" @@ -131,11 +131,11 @@ gPokeNewsTextBlendMaster_Upcoming:: @ 0828DBEC .string "Those people who want to make great\n" .string "{POKEBLOCK}S or see the MASTER in action\l" .string "are urged to save their BERRIES.\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextBlendMaster_Ongoing:: @ 0828DD9E .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" + .string "It's time for POKéMON NEWS.\p" .string "We have big news for everyone\n" .string "involved in the making of {POKEBLOCK}S.\p" .string "The legendary BLEND MASTER has\n" @@ -146,12 +146,12 @@ gPokeNewsTextBlendMaster_Ongoing:: @ 0828DD9E .string "Those people who want to make great\n" .string "{POKEBLOCK}S or see the MASTER in action\l" .string "should hurry to LILYCOVE.\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gPokeNewsTextBlendMaster_Ending:: @ 0828DF05 .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s incredible!\n" + .string "It's time for POKéMON NEWS.\p" + .string "It's incredible!\n" .string "Too incredible, even!\p" .string "The BERRY BLENDER is spinning at\n" .string "a dizzying pace!\p" @@ -159,7 +159,7 @@ gPokeNewsTextBlendMaster_Ending:: @ 0828DF05 .string "his reputation!\p" .string "The BLEND MASTER will soon be\n" .string "leaving LILYCOVE.\p" - .string "If you haven’t seen the MASTER in\n" - .string "action, don’t waste this chance!\l" + .string "If you haven't seen the MASTER in\n" + .string "action, don't waste this chance!\l" .string "Head to LILYCOVE right now!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" diff --git a/data/text/roulette.inc b/data/text/roulette.inc index 1973626c4..7f1ab1cec 100644 --- a/data/text/roulette.inc +++ b/data/text/roulette.inc @@ -3,7 +3,7 @@ gUnknown_082A5B12:: @ 82A5B12 .string "is {STR_VAR_1}. Do you want to play?$" gUnknown_082A5B4E:: @ 82A5B4E - .string "You don’t have enough COINS.$" + .string "You don't have enough COINS.$" gUnknown_082A5B6B:: @ 82A5B6B .string "Special rate table right now!$" @@ -13,7 +13,7 @@ gUnknown_082A5B89:: @ 82A5B89 .string "Pad, then press the A Button.$" gUnknown_082A5BCB:: @ 82A5BCB - .string "It’s a hit!$" + .string "It's a hit!$" gUnknown_082A5BD7:: @ 82A5BD7 .string "Jackpot!$" @@ -22,7 +22,7 @@ gUnknown_082A5BE0:: @ 82A5BE0 .string "Nothing doing!$" gUnknown_082A5BEF:: @ 82A5BEF - .string "You’ve won {STR_VAR_1} COINS!$" + .string "You've won {STR_VAR_1} COINS!$" gUnknown_082A5C04:: @ 82A5C04 .string "No COINS left…$" @@ -34,7 +34,7 @@ gUnknown_082A5C21:: @ 82A5C21 .string "The ROULETTE board will be cleared.$" gUnknown_082A5C45:: @ 82A5C45 - .string "You don’t have a COIN CASE.$" + .string "You don't have a COIN CASE.$" gUnknown_082A5C61:: @ 82A5C61 .string "Your COIN CASE is full!\n" diff --git a/data/text/save.inc b/data/text/save.inc index b252d61eb..bef7f3d6b 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -7,7 +7,7 @@ gText_AlreadySavedFile:: @ 82C87D5 gText_SavingDontTurnOff:: @ 82C8810 .string "SAVING…\n" - .string "DON’T TURN OFF THE POWER.$" + .string "DON'T TURN OFF THE POWER.$" gText_PlayerSavedGame:: @ 82C8832 .string "{PLAYER} saved the game.$" @@ -16,7 +16,7 @@ gText_DifferentSaveFile:: @ 82C8845 .string "WARNING!\p" .string "There is a different game file that\n" .string "is already saved.\p" - .string "If you save now, the other file’s\n" + .string "If you save now, the other file's\n" .string "adventure, including items and\l" .string "POKéMON, will be entirely lost.\p" .string "Are you sure you want to save now\n" @@ -29,4 +29,4 @@ gText_SaveError:: @ 82C892A gText_SavingDontTurnOffPower:: @ 82C8959 .string "SAVING…\n" - .string "DON’T TURN OFF THE POWER.$" + .string "DON'T TURN OFF THE POWER.$" diff --git a/data/text/shoal_cave.inc b/data/text/shoal_cave.inc index 345a24149..52ab9fc48 100644 --- a/data/text/shoal_cave.inc +++ b/data/text/shoal_cave.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_Text_2A7F37: @ 82A7F37 .string "a SHELL BELL with them?$" ShoalCave_LowTideEntranceRoom_Text_2A7FAC: @ 82A7FAC - .string "All righty, then! I’ll make you\n" + .string "All righty, then! I'll make you\n" .string "a SHELL BELL right away.\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" @@ -28,9 +28,9 @@ ShoalCave_LowTideEntranceRoom_Text_2A7FAC: @ 82A7FAC ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012 .string "Have a POKéMON hold on to that.\n" - .string "It’ll love it, that’s for certain.\p" - .string "Why, the SHELL BELL’s chime…\n" - .string "It’s simply sublime!\p" + .string "It'll love it, that's for certain.\p" + .string "Why, the SHELL BELL's chime…\n" + .string "It's simply sublime!\p" .string "You can get its ingredients every day,\n" .string "so I can make you more.$" @@ -39,7 +39,7 @@ ShoalCave_LowTideEntranceRoom_Text_2A80C6: @ 82A80C6 .string "I wanted to make a SHELL BELL…$" ShoalCave_LowTideEntranceRoom_Text_2A80F5: @ 82A80F5 - .string "You don’t have space in your BAG\n" + .string "You don't have space in your BAG\n" .string "if I were to make it for you.\p" .string "You should make room and come back\n" .string "for a SHELL BELL.$" @@ -48,8 +48,8 @@ ShoalCave_LowTideInnerRoom_Text_2A8169: @ 82A8169 ShoalCave_LowTideLowerRoom_Text_2A8169: @ 82A8169 ShoalCave_LowTideStairsRoom_Text_2A8169: @ 82A8169 .string "There was some SHOAL SALT here.\n" - .string "But, there’s nothing here now.$" + .string "But, there's nothing here now.$" ShoalCave_LowTideInnerRoom_Text_2A81A8: @ 82A81A8 .string "There was a SHOAL SHELL here.\n" - .string "But, there’s nothing here now.$" + .string "But, there's nothing here now.$" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 45f73a216..a6432006c 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -1,64 +1,64 @@ Route102_Text_294513: @ 8294513 .string "If you have POKéMON with you, then\n" - .string "you’re an official POKéMON TRAINER!\l" - .string "You can’t say no to my challenge!$" + .string "you're an official POKéMON TRAINER!\l" + .string "You can't say no to my challenge!$" Route102_Text_29457C: @ 829457C .string "Arrgh, I lost…\n" .string "I should have trained mine more…$" Route102_Text_2945AC: @ 82945AC - .string "Listen, you. If you’re strong,\n" + .string "Listen, you. If you're strong,\n" .string "you should have told me before!$" Route102_Text_2945EB: @ 82945EB - .string "I’ve been working hard at this since\n" + .string "I've been working hard at this since\n" .string "I saw you before.\p" - .string "I’d like to battle you again, so can\n" + .string "I'd like to battle you again, so can\n" .string "you register me in your POKéNAV?$" Route102_Text_294668: @ 8294668 - .string "I’d like to battle you again, so can\n" + .string "I'd like to battle you again, so can\n" .string "you register me in your POKéNAV?$" Route102_Text_2946AE: @ 82946AE .string "Ever since I lost to you, I desperately\n" .string "trained my POKéMON.\l" - .string "You can’t say no to my challenge!$" + .string "You can't say no to my challenge!$" Route102_Text_29470C: @ 829470C .string "Arrgh, I lost…\n" .string "Is my training method not right?$" Route102_Text_29473C: @ 829473C - .string "If you’re going to get stronger,\n" - .string "I’ll get stronger, too.$" + .string "If you're going to get stronger,\n" + .string "I'll get stronger, too.$" Route102_Text_294775: @ 8294775 .string "Did you just become a TRAINER?\n" - .string "We’re both beginners!$" + .string "We're both beginners!$" Route102_Text_2947AA: @ 82947AA .string "I called you because I thought\n" .string "I could beat you…$" Route102_Text_2947DB: @ 82947DB - .string "I haven’t won once yet…\n" + .string "I haven't won once yet…\n" .string "I wish I would win soon…$" Route102_Text_29480C: @ 829480C .string "Hahah! Our eyes met!\n" - .string "I’ll take you on with my BUG POKéMON!$" + .string "I'll take you on with my BUG POKéMON!$" Route102_Text_294847: @ 8294847 .string "Ow! Down and out!$" Route102_Text_294859: @ 8294859 .string "If you lock eyes with a TRAINER,\n" - .string "you have to challenge! It’s a rule!$" + .string "you have to challenge! It's a rule!$" Route102_Text_29489E: @ 829489E - .string "I’m going to keep winning and aim\n" + .string "I'm going to keep winning and aim\n" .string "to be the best TRAINER.\p" .string "Help me further my career!$" @@ -74,14 +74,14 @@ Route103_Text_29495A: @ 829495A .string "soul-soothing fragrance?$" Route103_Text_29498F: @ 829498F - .string "You weren’t led astray by our aroma…$" + .string "You weren't led astray by our aroma…$" Route103_Text_2949B4: @ 82949B4 .string "Aromatherapy is a form of mental\n" .string "healing that works with fragrances.$" Route103_Text_2949F9: @ 82949F9 - .string "AMY: I’m AMY.\n" + .string "AMY: I'm AMY.\n" .string "And this is my little sister LIV.\l" .string "We battle together!$" @@ -90,13 +90,13 @@ Route103_Text_294A3D: @ 8294A3D Route103_Text_294A52: @ 8294A52 .string "AMY: You have to think about all\n" - .string "kinds of things when you’re battling\l" + .string "kinds of things when you're battling\l" .string "against two TRAINERS.$" Route103_Text_294AAE: @ 8294AAE .string "AMY: Uh-oh, you have only one\n" .string "POKéMON with you.\l" - .string "You can’t battle us like that.$" + .string "You can't battle us like that.$" Route103_Text_294AFD: @ 8294AFD .string "LIV: We battle together as one\n" @@ -111,32 +111,32 @@ Route103_Text_294B40: @ 8294B40 .string "But we still lost…$" Route103_Text_294B8A: @ 8294B8A - .string "LIV: Really, we’re a lot better…\n" - .string "It’s true! We’ll show you next time!$" + .string "LIV: Really, we're a lot better…\n" + .string "It's true! We'll show you next time!$" Route103_Text_294BD0: @ 8294BD0 .string "LIV: If you want to battle us,\n" .string "you have to have two POKéMON!\l" - .string "It’s not fair if you don’t!$" + .string "It's not fair if you don't!$" Route103_Text_294C29: @ 8294C29 - .string "AMY: I’m AMY.\n" + .string "AMY: I'm AMY.\n" .string "And this is my little sister LIV.\l" .string "We battle together!$" Route103_Text_294C6D: @ 8294C6D .string "AMY: Aww, boo!\n" - .string "We couldn’t win again…$" + .string "We couldn't win again…$" Route103_Text_294C93: @ 8294C93 .string "AMY: You have to think about all\n" - .string "kinds of things when you’re battling\l" + .string "kinds of things when you're battling\l" .string "against two TRAINERS.$" Route103_Text_294CEF: @ 8294CEF .string "AMY: Uh-oh, you have only one\n" .string "POKéMON with you.\l" - .string "You can’t battle us like that.$" + .string "You can't battle us like that.$" Route103_Text_294D3E: @ 8294D3E .string "LIV: We battle together as one\n" @@ -154,24 +154,24 @@ Route103_Text_294D89: @ 8294D89 Route103_Text_294DDB: @ 8294DDB .string "LIV: If you want to battle us, you\n" .string "have to have two POKéMON!\l" - .string "It’s not fair if you don’t!$" + .string "It's not fair if you don't!$" Route103_Text_294E34: @ 8294E34 - .string "Gah! My fishing line’s all snarled up!\n" - .string "I’m getting frustrated and mean!\l" - .string "That’s it! Battle me!$" + .string "Gah! My fishing line's all snarled up!\n" + .string "I'm getting frustrated and mean!\l" + .string "That's it! Battle me!$" Route103_Text_294E92: @ 8294E92 .string "Gah! Lost it!\n" - .string "I’m even more annoyed now!$" + .string "I'm even more annoyed now!$" Route103_Text_294EBB: @ 8294EBB - .string "Gah, I’m still boiling mad…\n" + .string "Gah, I'm still boiling mad…\n" .string "Grrrrr…$" Route103_Text_294EDF: @ 8294EDF .string "My POKéMON is delightfully adorable!\n" - .string "Don’t be shy--I’ll show you!$" + .string "Don't be shy--I'll show you!$" Route103_Text_294F21: @ 8294F21 .string "Oh, my gosh!\n" @@ -179,10 +179,10 @@ Route103_Text_294F21: @ 8294F21 Route103_Text_294F42: @ 8294F42 .string "My delightful POKéMON looks darling\n" - .string "even when it’s fainted!$" + .string "even when it's fainted!$" Route103_Text_294F7E: @ 8294F7E - .string "I’ll get you to come out and look in\n" + .string "I'll get you to come out and look in\n" .string "on my delightful POKéMON again!$" Route103_Text_294FC3: @ 8294FC3 @@ -202,28 +202,28 @@ Route103_Text_295063: @ 8295063 .string "You should just swim it!$" Route103_Text_295093: @ 8295093 - .string "Oh, that’s good going!$" + .string "Oh, that's good going!$" Route103_Text_2950AA: @ 82950AA - .string "Oh, I understand where you’re coming\n" + .string "Oh, I understand where you're coming\n" .string "from now.\p" .string "If I had a POKéMON that trusty,\n" - .string "I’d want to SURF on it, too!$" + .string "I'd want to SURF on it, too!$" Route103_Text_295116: @ 8295116 - .string "Watch where you’re going!\n" - .string "We’re going to crash!$" + .string "Watch where you're going!\n" + .string "We're going to crash!$" Route103_Text_295146: @ 8295146 .string "Groan…$" Route103_Text_29514D: @ 829514D - .string "I’m a poor swimmer so I was practicing…\n" + .string "I'm a poor swimmer so I was practicing…\n" .string "Sorry for almost crashing into you.$" Route103_Text_295199: @ 8295199 .string "Whoa!\n" - .string "How’d you get into a space this small?$" + .string "How'd you get into a space this small?$" Route103_Text_2951C6: @ 82951C6 .string "Whoa!\n" @@ -234,7 +234,7 @@ Route103_Text_2951DE: @ 82951DE .string "like this?$" Route103_Text_295206: @ 8295206 - .string "Did my guitar’s wailing draw you in?$" + .string "Did my guitar's wailing draw you in?$" Route103_Text_29522B: @ 829522B .string "My one-man show is ruined…$" @@ -246,7 +246,7 @@ Route103_Text_295246: @ 8295246 .string "Heh, maybe I should turn pro.$" Route104_Text_2952BB: @ 82952BB - .string "GINA: Okay, let’s battle with our\n" + .string "GINA: Okay, let's battle with our\n" .string "POKéMON!$" Route104_Text_2952E6: @ 82952E6 @@ -258,9 +258,9 @@ Route104_Text_2952FE: @ 82952FE Route104_Text_295330: @ 8295330 .string "GINA: Oh? Only one POKéMON?\n" - .string "Then, we don’t battle with you.\p" - .string "If there’s only one POKéMON, it will\n" - .string "be lonesome. That’s not nice.$" + .string "Then, we don't battle with you.\p" + .string "If there's only one POKéMON, it will\n" + .string "be lonesome. That's not nice.$" Route104_Text_2953AF: @ 82953AF .string "MIA: We are twins, so we battle\n" @@ -276,18 +276,18 @@ Route104_Text_29540D: @ 829540D Route104_Text_295449: @ 8295449 .string "MIA: You want to battle with us?\p" - .string "It’s a big no-no if you don’t have two\n" + .string "It's a big no-no if you don't have two\n" .string "POKéMON with you.\l" - .string "We’re too strong for you!$" + .string "We're too strong for you!$" Route104_Text_2954BD: @ 82954BD .string "Why keep it a secret?\n" - .string "I’m the WATER POKéMON expert!\p" + .string "I'm the WATER POKéMON expert!\p" .string "Huh?\n" - .string "You don’t know me?$" + .string "You don't know me?$" Route104_Text_295509: @ 8295509 - .string "I thought I wasn’t too bad, if I may\n" + .string "I thought I wasn't too bad, if I may\n" .string "say so, but I guess not… Bleah…$" Route104_Text_29554E: @ 829554E @@ -300,7 +300,7 @@ Route104_Text_29558A: @ 829558A Route104_Text_2955B4: @ 82955B4 .string "Waah! I got sand in my runners!\n" - .string "They’re all gritty!$" + .string "They're all gritty!$" Route104_Text_2955E8: @ 82955E8 .string "I want to leave my footprints in\n" @@ -309,28 +309,28 @@ Route104_Text_2955E8: @ 82955E8 Route104_Text_29563A: @ 829563A .string "Should I…\n" - .string "Or shouldn’t I?\p" + .string "Or shouldn't I?\p" .string "Okay, sure, I will battle!$" Route104_Text_29566F: @ 829566F - .string "I shouldn’t have battled…$" + .string "I shouldn't have battled…$" Route104_Text_295689: @ 8295689 - .string "If you’re faced with a decision and\n" + .string "If you're faced with a decision and\n" .string "you let someone else choose for you,\l" .string "you will regret it, however things\l" .string "turn out.$" Route104_Text_2956FF: @ 82956FF - .string "You’re strong, but should I register\n" + .string "You're strong, but should I register\n" .string "you in my POKéNAV?\l" - .string "Maybe I shouldn’t…\p" + .string "Maybe I shouldn't…\p" .string "Okay, sure, I will register you!$" Route104_Text_29576B: @ 829576B - .string "You’re strong, but should I register\n" + .string "You're strong, but should I register\n" .string "you in my POKéNAV?\l" - .string "Maybe I shouldn’t…\p" + .string "Maybe I shouldn't…\p" .string "Okay, sure, I will register you!$" Route104_Text_2957D7: @ 82957D7 @@ -346,25 +346,25 @@ Route104_Text_29580C: @ 829580C .string "I am still upset about losing!$" Route104_Text_295870: @ 8295870 - .string "Oh, sure, I’ll accept your challenge.\n" + .string "Oh, sure, I'll accept your challenge.\n" .string "I have a lot of money.$" Route104_Text_2958AD: @ 82958AD - .string "Why couldn’t I win?$" + .string "Why couldn't I win?$" Route104_Text_2958C1: @ 82958C1 - .string "There are some things money can’t buy.\n" - .string "That’s POKéMON…$" + .string "There are some things money can't buy.\n" + .string "That's POKéMON…$" Route104_Text_2958F8: @ 82958F8 .string "Hm?\n" - .string "Ah, you’ve obtained a POKéNAV.\p" + .string "Ah, you've obtained a POKéNAV.\p" .string "I will gladly register you.\n" .string "After all, I have plenty of money.$" Route104_Text_29595A: @ 829595A .string "Hm?\n" - .string "Ah, you’ve obtained a POKéNAV.\p" + .string "Ah, you've obtained a POKéNAV.\p" .string "I will gladly register you.\n" .string "After all, I have plenty of money.$" @@ -374,12 +374,12 @@ Route104_Text_2959BC: @ 82959BC Route104_Text_2959FC: @ 82959FC .string "I lost again?\n" - .string "Why couldn’t I win?$" + .string "Why couldn't I win?$" Route104_Text_295A1E: @ 8295A1E - .string "I’m fabulously wealthy, but I can’t\n" + .string "I'm fabulously wealthy, but I can't\n" .string "seem to win at POKéMON…\p" - .string "It’s so deep, the world of POKéMON…$" + .string "It's so deep, the world of POKéMON…$" Route104_Text_295A7E: @ 8295A7E .string "We must have been fated to meet.\n" @@ -394,13 +394,13 @@ Route104_Text_295AC3: @ 8295AC3 Route104_Text_295B01: @ 8295B01 .string "Hello, we meet again.\p" - .string "We seem to be drawn together. Let’s\n" + .string "We seem to be drawn together. Let's\n" .string "register each other in our POKéNAVS.$" Route104_Text_295B60: @ 8295B60 .string "We should commemorate how we seem\n" .string "to be drawn to each other.\p" - .string "Let’s register each other in our\n" + .string "Let's register each other in our\n" .string "POKéNAVS.$" Route104_Text_295BC8: @ 8295BC8 @@ -424,11 +424,11 @@ Route104_Text_295CC9: @ 8295CC9 .string "What the…$" Route104_Text_295CD3: @ 8295CD3 - .string "Hey, MAGIKARP, you sure don’t live up\n" + .string "Hey, MAGIKARP, you sure don't live up\n" .string "to your name, do you?$" Route105_Text_295D0F: @ 8295D0F - .string "There’s supposed to be a mystical\n" + .string "There's supposed to be a mystical\n" .string "rock around here.\l" .string "Do you know anything about it?$" @@ -459,7 +459,7 @@ Route105_Text_295EB7: @ 8295EB7 Route105_Text_295EEA: @ 8295EEA .string "I lost…\n" - .string "Now I’m feeling blue…$" + .string "Now I'm feeling blue…$" Route105_Text_295F08: @ 8295F08 .string "Why is the sea blue?\p" @@ -468,31 +468,31 @@ Route105_Text_295F08: @ 8295F08 Route105_Text_295F5C: @ 8295F5C .string "My body feels lighter in the water.\n" - .string "It’s as if I’ve gotten slimmer!$" + .string "It's as if I've gotten slimmer!$" Route105_Text_295FA0: @ 8295FA0 - .string "I’m floating…$" + .string "I'm floating…$" Route105_Text_295FAE: @ 8295FAE .string "Your body weight is reduced to just\n" .string "one tenth in the water.\p" .string "That would make me…\n" - .string "Whoops! I’m not telling you my weight!$" + .string "Whoops! I'm not telling you my weight!$" Route105_Text_296025: @ 8296025 .string "The blue, blue sky…\n" .string "The vast sea…\l" - .string "It’s so peaceful…$" + .string "It's so peaceful…$" Route105_Text_296059: @ 8296059 .string "I lost while I was lounging!$" Route105_Text_296076: @ 8296076 - .string "I want to be told I’m relaxing to be\n" + .string "I want to be told I'm relaxing to be\n" .string "with. Giggle.$" Route105_Text_2960A9: @ 82960A9 - .string "I’m convinced that the sea keeps\n" + .string "I'm convinced that the sea keeps\n" .string "secrets from us.$" Route105_Text_2960DB: @ 82960DB @@ -500,31 +500,31 @@ Route105_Text_2960DB: @ 82960DB .string "I am no good at battling…$" Route105_Text_2960FA: @ 82960FA - .string "I’m sure there are many secrets to be\n" - .string "discovered in the world’s seas.\p" + .string "I'm sure there are many secrets to be\n" + .string "discovered in the world's seas.\p" .string "I mean to find them all!$" Route105_Text_296159: @ 8296159 - .string "Huh? I’m so weak, but you’re willing\n" + .string "Huh? I'm so weak, but you're willing\n" .string "to register me in your POKéNAV?$" Route105_Text_29619E: @ 829619E - .string "I’ve told you that I’m weak…\n" + .string "I've told you that I'm weak…\n" .string "Are you sure you want to do this?$" Route105_Text_2961DD: @ 82961DD .string "Yes…\n" - .string "I didn’t think I could win.$" + .string "I didn't think I could win.$" Route105_Text_2961FE: @ 82961FE .string "I may be weak at battling, but my\n" - .string "drive to explore can’t be bested.\p" + .string "drive to explore can't be bested.\p" .string "I will travel the seas all around\n" .string "the world!$" Route105_Text_29626F: @ 829626F - .string "I’m exhausted from swimming.\n" - .string "I’m just not used to it.\p" + .string "I'm exhausted from swimming.\n" + .string "I'm just not used to it.\p" .string "I need a battle for a change of pace!$" Route105_Text_2962CB: @ 82962CB @@ -543,17 +543,17 @@ Route106_Text_29635C: @ 829635C .string "spectacularly!$" Route106_Text_29638C: @ 829638C - .string "Fishing is the greatest whether it’s\n" + .string "Fishing is the greatest whether it's\n" .string "in the sea or a stream.\l" .string "You agree with me, right?$" Route106_Text_2963E3: @ 82963E3 - .string "Fishing’s great, but so is battling.\n" - .string "If you don’t mind, can we meet again?$" + .string "Fishing's great, but so is battling.\n" + .string "If you don't mind, can we meet again?$" Route106_Text_29642E: @ 829642E .string "I caught a bunch of POKéMON fishing.\n" - .string "I’ll show you an impressive battle!$" + .string "I'll show you an impressive battle!$" Route106_Text_296477: @ 8296477 .string "I lost again spectacularly!$" @@ -566,29 +566,29 @@ Route106_Text_2964D4: @ 82964D4 .string "What do people do if they need to go\n" .string "to a washroom?\p" .string "What if my ROD hooks a big one while\n" - .string "I’m in the washroom? I just can’t go…$" + .string "I'm in the washroom? I just can't go…$" Route106_Text_296553: @ 8296553 - .string "I lost because I’m trying to not go\n" + .string "I lost because I'm trying to not go\n" .string "to the washroom…$" Route106_Text_296588: @ 8296588 - .string "Oh, no! I’ve got this feeling I’ll hook\n" + .string "Oh, no! I've got this feeling I'll hook\n" .string "a big one!$" Route106_Text_2965BB: @ 82965BB - .string "Hahahah! I’m a lousy runner, but in\n" - .string "the water you can’t catch me!$" + .string "Hahahah! I'm a lousy runner, but in\n" + .string "the water you can't catch me!$" Route106_Text_2965FD: @ 82965FD .string "I give up!$" Route106_Text_296608: @ 8296608 - .string "I wouldn’t lose in a swim race…$" + .string "I wouldn't lose in a swim race…$" Route106_Text_296628: @ 8296628 - .string "The sea is my backyard. I’m not going\n" - .string "to take it easy because you’re a kid!$" + .string "The sea is my backyard. I'm not going\n" + .string "to take it easy because you're a kid!$" Route106_Text_296674: @ 8296674 .string "Did you take it easy on me by any\n" @@ -596,7 +596,7 @@ Route106_Text_296674: @ 8296674 Route106_Text_29669E: @ 829669E .string "Drifting along with the waves…\n" - .string "I love it! Why don’t you give it a try?$" + .string "I love it! Why don't you give it a try?$" Route107_Text_2966E5: @ 82966E5 .string "Yawn…\p" @@ -605,30 +605,30 @@ Route107_Text_2966E5: @ 82966E5 Route107_Text_29672F: @ 829672F .string "Ahaha, I lost…\n" - .string "I’ll take a snooze, I think…$" + .string "I'll take a snooze, I think…$" Route107_Text_29675B: @ 829675B .string "Floating and being rocked by\n" - .string "the waves--it’s like sleeping in\l" + .string "the waves--it's like sleeping in\l" .string "a plush, comfy bed.$" Route107_Text_2967AD: @ 82967AD .string "The sea is like my backyard.\n" - .string "Let’s battle!$" + .string "Let's battle!$" Route107_Text_2967D8: @ 82967D8 .string "I lost on my home field…\n" - .string "I’m in shock!$" + .string "I'm in shock!$" Route107_Text_2967FF: @ 82967FF .string "I swim the seas with a heart full of\n" .string "dreams…\p" - .string "It’s a song!\n" - .string "Anyways, I’m swimming some more.$" + .string "It's a song!\n" + .string "Anyways, I'm swimming some more.$" Route107_Text_29685A: @ 829685A - .string "You’ve shocked me to the bone!\n" - .string "Well, so you won’t forget me…$" + .string "You've shocked me to the bone!\n" + .string "Well, so you won't forget me…$" Route107_Text_296897: @ 8296897 .string "Swimming in the big, wide sea,\n" @@ -657,14 +657,14 @@ Route107_Text_2969AB: @ 82969AB Route107_Text_2969E4: @ 82969E4 .string "Did you want to battle me?\n" - .string "Sure, I’ll go with you!$" + .string "Sure, I'll go with you!$" Route107_Text_296A17: @ 8296A17 - .string "I wasn’t good enough for you.$" + .string "I wasn't good enough for you.$" Route107_Text_296A35: @ 8296A35 - .string "I think you’re going to keep getting\n" - .string "better. I’ll go for it, too!$" + .string "I think you're going to keep getting\n" + .string "better. I'll go for it, too!$" Route107_Text_296A77: @ 8296A77 .string "LISA: We challenge you as a sister\n" @@ -672,7 +672,7 @@ Route107_Text_296A77: @ 8296A77 Route107_Text_296AA7: @ 8296AA7 .string "LISA: Awesome.\n" - .string "You’re in a different class of tough.$" + .string "You're in a different class of tough.$" Route107_Text_296ADC: @ 8296ADC .string "LISA: Do you have any friends who\n" @@ -689,12 +689,12 @@ Route107_Text_296B57: @ 8296B57 .string "2-on-2!$" Route107_Text_296BB3: @ 8296BB3 - .string "RAY: Wowee, you’re at a higher level\n" + .string "RAY: Wowee, you're at a higher level\n" .string "than us!$" Route107_Text_296BE1: @ 8296BE1 .string "RAY: My sister gave me my POKéMON.\n" - .string "I raised it, and now it’s my important\l" + .string "I raised it, and now it's my important\l" .string "partner!$" Route107_Text_296C34: @ 8296C34 @@ -702,8 +702,8 @@ Route107_Text_296C34: @ 8296C34 .string "go bring some more POKéMON!$" Route107_Text_296C6F: @ 8296C6F - .string "I’m in the middle of a triathlon,\n" - .string "but I’m nowhere near tired!$" + .string "I'm in the middle of a triathlon,\n" + .string "but I'm nowhere near tired!$" Route107_Text_296CAD: @ 8296CAD .string "That exhausted me…$" @@ -714,11 +714,11 @@ Route107_Text_296CC0: @ 8296CC0 .string "Am I going to be okay?$" Route108_Text_296D10: @ 8296D10 - .string "My dream is to swim the world’s seven\n" + .string "My dream is to swim the world's seven\n" .string "seas!$" Route108_Text_296D3C: @ 8296D3C - .string "I won’t be able to swim the seven seas\n" + .string "I won't be able to swim the seven seas\n" .string "like this…$" Route108_Text_296D6E: @ 8296D6E @@ -730,7 +730,7 @@ Route108_Text_296DAF: @ 8296DAF .string "the ABANDONED SHIP, too?$" Route108_Text_296DEA: @ 8296DEA - .string "I’m sinking!\n" + .string "I'm sinking!\n" .string "Glub… Glub…$" Route108_Text_296E03: @ 8296E03 @@ -745,7 +745,7 @@ Route108_Text_296E71: @ 8296E71 .string "Oh, boo!$" Route108_Text_296E7A: @ 8296E7A - .string "Even if it’s a lie, I love being told\n" + .string "Even if it's a lie, I love being told\n" .string "I look great…\l" .string "We girls are so complex…$" @@ -759,7 +759,7 @@ Route108_Text_296EFC: @ 8296EFC Route108_Text_296F2A: @ 8296F2A .string "Work off your stress by swimming!\n" - .string "It’s so healthy!$" + .string "It's so healthy!$" Route108_Text_296F5D: @ 8296F5D .string "I love WATER-type POKéMON.\n" @@ -785,18 +785,18 @@ Route108_Text_297036: @ 8297036 .string "Waaah! Waaah!$" Route108_Text_297059: @ 8297059 - .string "If you’re faced with a challenge,\n" + .string "If you're faced with a challenge,\n" .string "try shouting at the sea!$" Route108_Text_297094: @ 8297094 .string "I take huge pride in my POKéMON.\n" - .string "We’ll show you one speedy battle!$" + .string "We'll show you one speedy battle!$" Route108_Text_2970D7: @ 82970D7 - .string "That wasn’t cute at all.$" + .string "That wasn't cute at all.$" Route108_Text_2970F0: @ 82970F0 - .string "Since I’m at sea like this, I wouldn’t\n" + .string "Since I'm at sea like this, I wouldn't\n" .string "mind putting on a pink, frilly swimsuit…$" Route109_Text_297140: @ 8297140 @@ -823,11 +823,11 @@ Route109_Text_29720F: @ 829720F .string "Cheeks are the most prone to burning!$" Route109_Text_297235: @ 8297235 - .string "I’ve laid anchor in ports around\n" - .string "the world, but SLATEPORT’s the best.$" + .string "I've laid anchor in ports around\n" + .string "the world, but SLATEPORT's the best.$" Route109_Text_29727B: @ 829727B - .string "You’re the best!$" + .string "You're the best!$" Route109_Text_29728C: @ 829728C .string "In the best port was the best\n" @@ -842,39 +842,39 @@ Route109_Text_2972CE: @ 82972CE .string "Urrrrpppp…$" Route109_Text_2972ED: @ 82972ED - .string "I’m usually stronger than this!\n" - .string "I’m just seasick as a dog!\p" - .string "I’m a SAILOR, but…$" + .string "I'm usually stronger than this!\n" + .string "I'm just seasick as a dog!\p" + .string "I'm a SAILOR, but…$" Route109_Text_29733B: @ 829733B - .string "I’m thirsty… I could go for a SODA POP\n" + .string "I'm thirsty… I could go for a SODA POP\n" .string "at the SEASHORE HOUSE…$" Route109_Text_297379: @ 8297379 .string "Groan…$" Route109_Text_297380: @ 8297380 - .string "I’m getting famished… My inner tube\n" + .string "I'm getting famished… My inner tube\n" .string "looks like a giant doughnut…$" Route109_Text_2973C1: @ 82973C1 .string "Will you have another match with me\n" - .string "when I’m not all thirsty?$" + .string "when I'm not all thirsty?$" Route109_Text_2973FF: @ 82973FF - .string "I’m hungry, but I’ve got enough pep in\n" + .string "I'm hungry, but I've got enough pep in\n" .string "me for a battle!$" Route109_Text_297437: @ 8297437 .string "I lost…\n" - .string "It’s because I’m hungry…$" + .string "It's because I'm hungry…$" Route109_Text_297458: @ 8297458 .string "When you eat on a beach, everything\n" .string "seems to taste a little better.$" Route109_Text_29749C: @ 829749C - .string "Doesn’t a beach umbrella look like\n" + .string "Doesn't a beach umbrella look like\n" .string "a giant flower?$" Route109_Text_2974CF: @ 82974CF @@ -886,22 +886,22 @@ Route109_Text_2974D6: @ 82974D6 Route109_Text_297520: @ 8297520 .string "Me?\n" - .string "I’m here every day!$" + .string "I'm here every day!$" Route109_Text_297538: @ 8297538 - .string "I’m not losing to you again!\n" - .string "That’s why I have my inner tube!$" + .string "I'm not losing to you again!\n" + .string "That's why I have my inner tube!$" Route109_Text_297576: @ 8297576 .string "Mommy!$" Route109_Text_29757D: @ 829757D .string "If I have an inner tube, me and my\n" - .string "POKéMON’s cuteness goes way up!$" + .string "POKéMON's cuteness goes way up!$" Route109_Text_2975C0: @ 82975C0 - .string "I can’t swim without my inner tube,\n" - .string "but I won’t lose at POKéMON!$" + .string "I can't swim without my inner tube,\n" + .string "but I won't lose at POKéMON!$" Route109_Text_297601: @ 8297601 .string "Did I lose because I have an inner\n" @@ -909,67 +909,67 @@ Route109_Text_297601: @ 8297601 Route109_Text_29762A: @ 829762A .string "My inner tube is a fashion item.\n" - .string "I can’t be seen without it.$" + .string "I can't be seen without it.$" Route109_Text_297667: @ 8297667 .string "Hi, big TRAINER.\n" .string "Will you battle with me?$" Route109_Text_297691: @ 8297691 - .string "Oh, you’re strong.$" + .string "Oh, you're strong.$" Route109_Text_2976A4: @ 82976A4 .string "How did you get to be so strong?$" Route109_Text_2976C5: @ 82976C5 - .string "Wahahah! This dude’s going to catch\n" + .string "Wahahah! This dude's going to catch\n" .string "himself a big one!$" Route109_Text_2976FC: @ 82976FC .string "This dude just lost one…$" Route109_Text_297715: @ 8297715 - .string "This dude thinks you’re a big one.\n" - .string "No, you’re a big-one-to-be!$" + .string "This dude thinks you're a big one.\n" + .string "No, you're a big-one-to-be!$" Route109_Text_297754: @ 8297754 .string "PAUL: Well, this is a mood-breaker.\p" - .string "I wish you wouldn’t disturb our\n" + .string "I wish you wouldn't disturb our\n" .string "precious time together.$" Route109_Text_2977B0: @ 82977B0 .string "PAUL: Well, I give up.$" Route109_Text_2977C7: @ 82977C7 - .string "PAUL: Well, don’t tell anyone that\n" - .string "we’re here.\l" + .string "PAUL: Well, don't tell anyone that\n" + .string "we're here.\l" .string "This is just our private world of two!$" Route109_Text_29781D: @ 829781D - .string "PAUL: We’re totally, deeply in love.\n" - .string "That’s why we make our POKéMON battle\l" + .string "PAUL: We're totally, deeply in love.\n" + .string "That's why we make our POKéMON battle\l" .string "together.$" Route109_Text_297872: @ 8297872 - .string "MEL: We’re, like, totally in love.\n" + .string "MEL: We're, like, totally in love.\n" .string "Our romance is heating up all of HOENN!$" Route109_Text_2978BD: @ 82978BD - .string "MEL: We lost, and it’s my fault!\n" + .string "MEL: We lost, and it's my fault!\n" .string "PAUL will hate me!$" Route109_Text_2978F1: @ 82978F1 .string "MEL: Um, PAUL, are you angry with me?\n" - .string "Please don’t be angry.$" + .string "Please don't be angry.$" Route109_Text_29792E: @ 829792E - .string "MEL: We’re, like, deeply and truly in love.\n" - .string "That’s why we make our POKéMON\l" + .string "MEL: We're, like, deeply and truly in love.\n" + .string "That's why we make our POKéMON\l" .string "battle together.$" Route109_Text_29798A: @ 829798A .string "Tadaah! See?\n" - .string "My inner tube’s round!$" + .string "My inner tube's round!$" Route109_Text_2979AE: @ 82979AE .string "Oh, oh!\n" @@ -980,12 +980,12 @@ Route109_Text_2979BF: @ 82979BF .string "tube, too…$" Route109_Text_2979EC: @ 82979EC - .string "I can’t swim, so I’m pretending\n" + .string "I can't swim, so I'm pretending\n" .string "to swim.$" Route109_Text_297A15: @ 8297A15 .string "I thought so!\n" - .string "I didn’t think we could win.$" + .string "I didn't think we could win.$" Route109_Text_297A40: @ 8297A40 .string "When I learn how to swim, I think\n" @@ -996,16 +996,16 @@ Route109_Text_297A82: @ 8297A82 .string "of POKéMON is the perfect match!$" Route109_Text_297AC7: @ 8297AC7 - .string "I’m cool even in defeat, hey?$" + .string "I'm cool even in defeat, hey?$" Route109_Text_297AE5: @ 8297AE5 .string "For a guy as macho as me, a port\n" .string "is the perfect setting!\p" - .string "I guess I’ll head for SLATEPORT.$" + .string "I guess I'll head for SLATEPORT.$" Route110_Text_297B3F: @ 8297B3F .string "Whoa! Watch it!\n" - .string "I guess you’re not used to BIKE racing.$" + .string "I guess you're not used to BIKE racing.$" Route110_Text_297B77: @ 8297B77 .string "Whoa!\n" @@ -1024,34 +1024,34 @@ Route110_Text_297C0F: @ 8297C0F .string "Crash and burn!$" Route110_Text_297C1F: @ 8297C1F - .string "Speed alone won’t let me win at POKéMON.\n" + .string "Speed alone won't let me win at POKéMON.\n" .string "I need to reconsider this…$" Route110_Text_297C63: @ 8297C63 - .string "Don’t panic if your BIKE’s going fast!$" + .string "Don't panic if your BIKE's going fast!$" Route110_Text_297C8A: @ 8297C8A - .string "I shouldn’t panic during POKéMON\n" + .string "I shouldn't panic during POKéMON\n" .string "battles…$" Route110_Text_297CB4: @ 8297CB4 - .string "There’s no need to panic or stress.\n" - .string "Take it easy. There’s plenty of time.$" + .string "There's no need to panic or stress.\n" + .string "Take it easy. There's plenty of time.$" Route110_Text_297CFE: @ 8297CFE - .string "I’ll keep chugging on without stressing.\n" - .string "Give me a shout if you’re up to it.$" + .string "I'll keep chugging on without stressing.\n" + .string "Give me a shout if you're up to it.$" Route110_Text_297D4B: @ 8297D4B - .string "Aren’t you going a little too fast?\n" - .string "Take it easy and let’s battle.$" + .string "Aren't you going a little too fast?\n" + .string "Take it easy and let's battle.$" Route110_Text_297D8E: @ 8297D8E - .string "I didn’t panic, but I still lost…$" + .string "I didn't panic, but I still lost…$" Route110_Text_297DB0: @ 8297DB0 - .string "There’s no need to panic or stress.\n" - .string "Take it easy. There’s plenty of time.$" + .string "There's no need to panic or stress.\n" + .string "Take it easy. There's plenty of time.$" Route110_Text_297DFA: @ 8297DFA .string "The triathlon is hard in the extreme.\p" @@ -1062,15 +1062,15 @@ Route110_Text_297E69: @ 8297E69 .string "POKéMON battles are hard, too!$" Route110_Text_297E88: @ 8297E88 - .string "I’m exhausted, so I need a break.\n" - .string "It’s important to get proper rest.$" + .string "I'm exhausted, so I need a break.\n" + .string "It's important to get proper rest.$" Route110_Text_297ECD: @ 8297ECD .string "You know, I like you!\n" - .string "Let’s have a rematch on CYCLING ROAD.$" + .string "Let's have a rematch on CYCLING ROAD.$" Route110_Text_297F09: @ 8297F09 - .string "Isn’t it neat to hold a battle while\n" + .string "Isn't it neat to hold a battle while\n" .string "cycling?$" Route110_Text_297F37: @ 8297F37 @@ -1079,18 +1079,18 @@ Route110_Text_297F37: @ 8297F37 Route110_Text_297F58: @ 8297F58 .string "Were you going after a record?\p" - .string "I’m sorry if I held you up!$" + .string "I'm sorry if I held you up!$" Route110_Text_297F93: @ 8297F93 - .string "I’ve been riding without stopping.\n" + .string "I've been riding without stopping.\n" .string "My thighs are like rocks!$" Route110_Text_297FD0: @ 8297FD0 - .string "I’m worried about muscle cramps…$" + .string "I'm worried about muscle cramps…$" Route110_Text_297FF1: @ 8297FF1 .string "Oh, you have some GYM BADGES?\n" - .string "No wonder you’re so strong!$" + .string "No wonder you're so strong!$" Route110_Text_29802B: @ 829802B .string "I have foreseen your intentions!\n" @@ -1106,7 +1106,7 @@ Route110_Text_29808A: @ 829808A Route110_Text_2980B9: @ 82980B9 .string "Ahahahaha!\n" - .string "I’ll dazzle you with my wonders!$" + .string "I'll dazzle you with my wonders!$" Route110_Text_2980E5: @ 82980E5 .string "I wondrously lost!$" @@ -1114,7 +1114,7 @@ Route110_Text_2980E5: @ 82980E5 Route110_Text_2980F8: @ 82980F8 .string "You managed to win only because it was\n" .string "a wonder! Yes, a wonder!\l" - .string "Don’t think you can win all the time!$" + .string "Don't think you can win all the time!$" Route110_Text_29815E: @ 829815E .string "Could I see your POKéMON?\n" @@ -1125,7 +1125,7 @@ Route110_Text_29818F: @ 829818F .string "my collection…$" Route110_Text_2981B3: @ 82981B3 - .string "When I see a POKéMON that I don’t know,\n" + .string "When I see a POKéMON that I don't know,\n" .string "my passion as a collector is ignited!$" Route110_Text_298201: @ 8298201 @@ -1147,7 +1147,7 @@ Route110_Text_2982A2: @ 82982A2 Route110_Text_2982CC: @ 82982CC .string "Hey!\n" - .string "Don’t sneak up behind me like that!$" + .string "Don't sneak up behind me like that!$" Route110_Text_2982F5: @ 82982F5 .string "I lost!\n" @@ -1162,16 +1162,16 @@ Route110_Text_298349: @ 8298349 .string "off my delightful POKéMON.$" Route110_Text_298389: @ 8298389 - .string "Oh, dear, this won’t do.$" + .string "Oh, dear, this won't do.$" Route110_Text_2983A2: @ 82983A2 .string "Rather than battling, perhaps I should\n" .string "show off my POKéMON at the FAN CLUB.$" Route110_Text_2983EE: @ 82983EE - .string "That wasn’t close to what I could\n" + .string "That wasn't close to what I could\n" .string "do to show off my POKéMON.\p" - .string "I’ll have you as my captive audience\n" + .string "I'll have you as my captive audience\n" .string "as often as possible!$" Route110_Text_298466: @ 8298466 @@ -1179,10 +1179,10 @@ Route110_Text_298466: @ 8298466 .string "off my POKéMON as often as you like!$" Route110_Text_2984AF: @ 82984AF - .string "Oh, dear, this won’t do.$" + .string "Oh, dear, this won't do.$" Route110_Text_2984C8: @ 82984C8 - .string "I don’t think that I could ever stop\n" + .string "I don't think that I could ever stop\n" .string "from showing off my POKéMON.\p" .string "But I like to battle, too!$" @@ -1191,15 +1191,15 @@ Route110_Text_298525: @ 8298525 .string "around here!$" Route110_Text_298559: @ 8298559 - .string "Being cool isn’t enough to win…$" + .string "Being cool isn't enough to win…$" Route110_Text_298579: @ 8298579 - .string "It’s hard to battle with POKéMON you\n" + .string "It's hard to battle with POKéMON you\n" .string "just caught.$" Route110_Text_2985AB: @ 82985AB .string "I fell off CYCLING ROAD…\p" - .string "I’ll get over my embarrassment by\n" + .string "I'll get over my embarrassment by\n" .string "battling with you!$" Route110_Text_2985F9: @ 82985F9 @@ -1211,35 +1211,35 @@ Route110_Text_298612: @ 8298612 .string "This is so humiliating for me!$" Route110_Text_298642: @ 8298642 - .string "Okay! Full-throttle time! If you can’t\n" + .string "Okay! Full-throttle time! If you can't\n" .string "groove, you get left behind!$" Route110_Text_298686: @ 8298686 .string "You got into the groove all right…$" Route110_Text_2986A9: @ 82986A9 - .string "This isn’t going to bring me down!\n" + .string "This isn't going to bring me down!\n" .string "Losing has made me a better man!$" Route110_Text_2986ED: @ 82986ED .string "When cute POKéMON help each other…\n" - .string "You won’t see a more adorable sight!$" + .string "You won't see a more adorable sight!$" Route110_Text_298735: @ 8298735 .string "Have you no compassion or pity?$" Route110_Text_298755: @ 8298755 - .string "Okay, okay, you’ve done the best you\n" + .string "Okay, okay, you've done the best you\n" .string "could, my pretties.$" Route111_Text_29878E: @ 829878E .string "Oh, hey! Those GO-GOGGLES suit you.\n" .string "But I think they look better on me.\p" - .string "Let’s decide who they look better on\n" + .string "Let's decide who they look better on\n" .string "with a battle!$" Route111_Text_29880A: @ 829880A - .string "I couldn’t see what was happening at\n" + .string "I couldn't see what was happening at\n" .string "my sides because of the GO-GOGGLES.$" Route111_Text_298853: @ 8298853 @@ -1248,17 +1248,17 @@ Route111_Text_298853: @ 8298853 .string "That makes me happy!$" Route111_Text_2988A3: @ 82988A3 - .string "I’m having a picnic in the desert.\p" + .string "I'm having a picnic in the desert.\p" .string "You can always find a TRAINER,\n" .string "so I can enjoy a battle here, too!$" Route111_Text_298908: @ 8298908 - .string "Ohhh! You’re mean!$" + .string "Ohhh! You're mean!$" Route111_Text_29891B: @ 829891B - .string "When you’re battling in a sandstorm,\n" - .string "watch out for your POKéMON’s HP.\p" - .string "It can faint if you don’t keep\n" + .string "When you're battling in a sandstorm,\n" + .string "watch out for your POKéMON's HP.\p" + .string "It can faint if you don't keep\n" .string "an eye on it!$" Route111_Text_29898E: @ 829898E @@ -1267,11 +1267,11 @@ Route111_Text_29898E: @ 829898E .string "Right now, nobody can beat me!$" Route111_Text_2989E6: @ 82989E6 - .string "I can’t win on spirit alone…$" + .string "I can't win on spirit alone…$" Route111_Text_298A03: @ 8298A03 - .string "I’m going to be a real hero one day.\n" - .string "I’m going to work harder to make me\l" + .string "I'm going to be a real hero one day.\n" + .string "I'm going to work harder to make me\l" .string "and my POKéMON stronger.$" Route111_Text_298A65: @ 8298A65 @@ -1292,7 +1292,7 @@ Route111_Text_298B08: @ 8298B08 Route111_Text_298B53: @ 8298B53 .string "While I have searched for ruins,\n" - .string "I’ve not searched for strong POKéMON.$" + .string "I've not searched for strong POKéMON.$" Route111_Text_298B9A: @ 8298B9A .string "For thirty years I have searched for\n" @@ -1301,7 +1301,7 @@ Route111_Text_298B9A: @ 8298B9A .string "Which was it now?$" Route111_Text_298C00: @ 8298C00 - .string "I haven’t been searching for any\n" + .string "I haven't been searching for any\n" .string "tough POKéMON.\p" .string "But, for some reason, I sure do like\n" .string "POKéNAVS.$" @@ -1313,19 +1313,19 @@ Route111_Text_298C5F: @ 8298C5F .string "Anyway, am I to be challenged?$" Route111_Text_298CD2: @ 8298CD2 - .string "I’ve found no ruins, nor have I found\n" + .string "I've found no ruins, nor have I found\n" .string "any strong POKéMON…$" Route111_Text_298D0C: @ 8298D0C .string "For thirty years I have searched for\n" .string "ancient ruins!\p" .string "No, wait, was that forty years\n" - .string "I’ve searched?\p" + .string "I've searched?\p" .string "Hmm… It could even be fifty…\n" .string "How long have I been at this?$" Route111_Text_298DA9: @ 8298DA9 - .string "I’m full of pep!\n" + .string "I'm full of pep!\n" .string "And my POKéMON is peppy, too!$" Route111_Text_298DD8: @ 8298DD8 @@ -1333,17 +1333,17 @@ Route111_Text_298DD8: @ 8298DD8 Route111_Text_298DF1: @ 8298DF1 .string "When I see a TRAINER with a lot of pep,\n" - .string "I can’t help looking.$" + .string "I can't help looking.$" Route111_Text_298E2F: @ 8298E2F - .string "I don’t know where you’re going,\n" + .string "I don't know where you're going,\n" .string "but would you like to battle?$" Route111_Text_298E6E: @ 8298E6E - .string "Oh, you’re disgustingly good!$" + .string "Oh, you're disgustingly good!$" Route111_Text_298E8C: @ 8298E8C - .string "I’m thinking that I should go to\n" + .string "I'm thinking that I should go to\n" .string "MT. CHIMNEY, but the view around\l" .string "here is very nice, too.$" @@ -1360,17 +1360,17 @@ Route111_Text_298F26: @ 8298F26 .string "as yourself.$" Route111_Text_298F79: @ 8298F79 - .string "Show me how much you’ve toughened\n" + .string "Show me how much you've toughened\n" .string "your POKéMON.$" Route111_Text_298FA9: @ 8298FA9 - .string "I see, you’ve toughened them\n" + .string "I see, you've toughened them\n" .string "considerably.$" Route111_Text_298FD4: @ 8298FD4 .string "POKéMON and TRAINERS learn much\n" .string "through battling.\p" - .string "What’s important is to never give up\n" + .string "What's important is to never give up\n" .string "even if you lose.$" Route111_Text_29903D: @ 829903D @@ -1380,15 +1380,15 @@ Route111_Text_29903D: @ 829903D .string "behooves you.$" Route111_Text_29909B: @ 829909B - .string "We’re training here to elevate our\n" + .string "We're training here to elevate our\n" .string "game to the next level.\l" .string "Stay and train with us!$" Route111_Text_2990EE: @ 82990EE - .string "Ooh, you’re decent!$" + .string "Ooh, you're decent!$" Route111_Text_299102: @ 8299102 - .string "Since you’re that strong, you should\n" + .string "Since you're that strong, you should\n" .string "aim for the POKéMON LEAGUE.$" Route111_Text_299143: @ 8299143 @@ -1397,7 +1397,7 @@ Route111_Text_299143: @ 8299143 .string "I have to ask you for an engagement.$" Route111_Text_299193: @ 8299193 - .string "They didn’t just look strong,\n" + .string "They didn't just look strong,\n" .string "they are strong!$" Route111_Text_2991C2: @ 82991C2 @@ -1417,7 +1417,7 @@ Route111_Text_29925D: @ 829925D .string "know?$" Route111_Text_2992D6: @ 82992D6 - .string "You’ve taught them good moves!$" + .string "You've taught them good moves!$" Route111_Text_2992F5: @ 82992F5 .string "Maybe I should have stopped my\n" @@ -1425,15 +1425,15 @@ Route111_Text_2992F5: @ 82992F5 .string "learned better moves…$" Route111_Text_29934B: @ 829934B - .string "I shouldn’t have come to a place like\n" + .string "I shouldn't have come to a place like\n" .string "this for a picnic!$" Route111_Text_299384: @ 8299384 .string "Aww!\n" - .string "I really shouldn’t have come!$" + .string "I really shouldn't have come!$" Route111_Text_2993A7: @ 82993A7 - .string "In a sandstorm like this, I can’t set\n" + .string "In a sandstorm like this, I can't set\n" .string "the places for a picnic even with my\l" .string "GO-GOGGLES on…$" @@ -1450,8 +1450,8 @@ Route111_Text_29945F: @ 829945F .string "its shifting sands!$" Route111_Text_299493: @ 8299493 - .string "I’ll give you some of my sandwich\n" - .string "if you’ll lose.$" + .string "I'll give you some of my sandwich\n" + .string "if you'll lose.$" Route111_Text_2994C5: @ 82994C5 .string "Tch! I thought a sandwich would be\n" @@ -1484,10 +1484,10 @@ Route111_Text_299625: @ 8299625 Route111_Text_29964B: @ 829964B .string "My pulse is still racing.\n" - .string "You’re one fabulous TRAINER.$" + .string "You're one fabulous TRAINER.$" Route111_Text_299682: @ 8299682 - .string "When you’re as famished as I am,\n" + .string "When you're as famished as I am,\n" .string "there is no room for pity!$" Route111_Text_2996BE: @ 82996BE @@ -1503,7 +1503,7 @@ Route111_Text_2996FE: @ 82996FE Route111_Text_29973D: @ 829973D .string "Ooh lala!\n" - .string "That’s a lot to take!$" + .string "That's a lot to take!$" Route111_Text_29975D: @ 829975D .string "This road here…\n" @@ -1526,7 +1526,7 @@ Route112_Text_2997DC: @ 82997DC Route112_Text_299815: @ 8299815 .string "My legs are solid from pounding up\n" .string "and down the mountains.\p" - .string "They’re not going to buckle easily,\n" + .string "They're not going to buckle easily,\n" .string "friend!$" Route112_Text_29987C: @ 829987C @@ -1544,11 +1544,11 @@ Route112_Text_29993C: @ 829993C .string "Ow, my legs have cramped up.\n" .string "Can you grab me some bandages from\l" .string "my backpack?\p" - .string "No, that’s my POKéNAV!\n" - .string "Oh, fine, I’ll register you.$" + .string "No, that's my POKéNAV!\n" + .string "Oh, fine, I'll register you.$" Route112_Text_2999BD: @ 82999BD - .string "I’ve been keeping fit by hiking.\n" + .string "I've been keeping fit by hiking.\n" .string "Power, I have in spades!$" Route112_Text_2999F7: @ 82999F7 @@ -1561,26 +1561,26 @@ Route112_Text_299A0F: @ 8299A0F .string "a challenge!$" Route112_Text_299A89: @ 8299A89 - .string "I’m strong.\n" - .string "I won’t cry if I lose.$" + .string "I'm strong.\n" + .string "I won't cry if I lose.$" Route112_Text_299AAC: @ 8299AAC .string "Waaaah!$" Route112_Text_299AB4: @ 8299AB4 - .string "I’m not crying because I miss my mommy!\n" + .string "I'm not crying because I miss my mommy!\n" .string "Snivel…$" Route112_Text_299AE4: @ 8299AE4 - .string "When you’re out on a picnic, why,\n" + .string "When you're out on a picnic, why,\n" .string "you simply have to sing!\l" .string "Come on, sing with me!$" Route112_Text_299B36: @ 8299B36 - .string "Oh, you’re so strong!$" + .string "Oh, you're so strong!$" Route112_Text_299B4C: @ 8299B4C - .string "It doesn’t matter if you’re good or bad\n" + .string "It doesn't matter if you're good or bad\n" .string "at singing or POKéMON.\p" .string "If you have the most fun, you win!$" @@ -1596,22 +1596,22 @@ Route112_Text_299BFB: @ 8299BFB .string "It has a certain flair to it.$" Route112_Text_299C34: @ 8299C34 - .string "Oh, aren’t you an adorable TRAINER!\n" + .string "Oh, aren't you an adorable TRAINER!\n" .string "Please, I need a romantic battle!\l" - .string "I’m somewhat decent!$" + .string "I'm somewhat decent!$" Route112_Text_299C8F: @ 8299C8F .string "Oh, how strong you are!\n" - .string "You’ve given me quite a shock!$" + .string "You've given me quite a shock!$" Route112_Text_299CC6: @ 8299CC6 .string "Are you busy right now?\n" .string "I was thinking that maybe we can have\l" .string "a rematch right now…\l" - .string "But it’s all right if you’re busy.$" + .string "But it's all right if you're busy.$" Route113_Text_299D3C: @ 8299D3C - .string "Can you guess why it’s so cool\n" + .string "Can you guess why it's so cool\n" .string "around here?$" Route113_Text_299D68: @ 8299D68 @@ -1620,18 +1620,18 @@ Route113_Text_299D68: @ 8299D68 Route113_Text_299D7D: @ 8299D7D .string "The volcanic ash blocks the sun,\n" - .string "so it doesn’t get very warm.\p" - .string "That’s good for me--I can’t stand heat!$" + .string "so it doesn't get very warm.\p" + .string "That's good for me--I can't stand heat!$" Route113_Text_299DE3: @ 8299DE3 - .string "The volcano’s eruption is proof that\n" + .string "The volcano's eruption is proof that\n" .string "the earth is alive.$" Route113_Text_299E1C: @ 8299E1C - .string "You’re some kind of strong!$" + .string "You're some kind of strong!$" Route113_Text_299E38: @ 8299E38 - .string "Ouch! Owww! I can’t see!\n" + .string "Ouch! Owww! I can't see!\n" .string "I got ashes in my eyelashes!\p" .string "Get it? Ashes and eyelashes?\p" .string "Okay, that was bad, sorry…$" @@ -1646,23 +1646,23 @@ Route113_Text_299EF9: @ 8299EF9 .string "I am exhausted…$" Route113_Text_299F15: @ 8299F15 - .string "You’re very good at this.\n" - .string "I must say I’m impressed!$" + .string "You're very good at this.\n" + .string "I must say I'm impressed!$" Route113_Text_299F49: @ 8299F49 .string "Here, slide under my parasol.\n" .string "Let me register you in my POKéNAV.$" Route113_Text_299F8A: @ 8299F8A - .string "Oh, hello, hasn’t it been a while?\n" + .string "Oh, hello, hasn't it been a while?\n" .string "May I invite you to battle?$" Route113_Text_299FC9: @ 8299FC9 .string "Oh, how super!$" Route113_Text_299FD8: @ 8299FD8 - .string "You’ve remained very good at this.\n" - .string "I must say I’m impressed!$" + .string "You've remained very good at this.\n" + .string "I must say I'm impressed!$" Route113_Text_29A015: @ 829A015 .string "From out of the ashes I leap! Hiyah!\n" @@ -1696,21 +1696,21 @@ Route113_Text_29A192: @ 829A192 .string "But we still have to battle!$" Route113_Text_29A1C6: @ 829A1C6 - .string "I’ll use my ninjutsu on you…\n" + .string "I'll use my ninjutsu on you…\n" .string "“VOLCANIC ASH SWIRL CLOAKâ€!\p" .string "…What?\n" - .string "It’s already over?$" + .string "It's already over?$" Route113_Text_29A219: @ 829A219 - .string "You know what’s crummy about hiding?\n" - .string "It’s lonely if no one comes along.$" + .string "You know what's crummy about hiding?\n" + .string "It's lonely if no one comes along.$" Route113_Text_29A261: @ 829A261 .string "TORI: Both of us, we collect ashes.\n" .string "We battle POKéMON, too.$" Route113_Text_29A29D: @ 829A29D - .string "TORI: We lost… It’s boring, so I’m going\n" + .string "TORI: We lost… It's boring, so I'm going\n" .string "to get some more ashes.$" Route113_Text_29A2DE: @ 829A2DE @@ -1719,15 +1719,15 @@ Route113_Text_29A2DE: @ 829A2DE Route113_Text_29A31F: @ 829A31F .string "TORI: We want to battle 2-on-2.\n" - .string "If we didn’t, we would lose!$" + .string "If we didn't, we would lose!$" Route113_Text_29A35C: @ 829A35C .string "TIA: Both of us, we collect ashes.\n" .string "We battle POKéMON, too.$" Route113_Text_29A397: @ 829A397 - .string "TIA: We couldn’t win… It’s boring,\n" - .string "so I’m getting some more ashes.$" + .string "TIA: We couldn't win… It's boring,\n" + .string "so I'm getting some more ashes.$" Route113_Text_29A3DA: @ 829A3DA .string "TIA: We have a lot of ashes!\n" @@ -1735,7 +1735,7 @@ Route113_Text_29A3DA: @ 829A3DA Route113_Text_29A419: @ 829A419 .string "TIA: We want to battle 2-on-2.\n" - .string "If we don’t, we won’t win!$" + .string "If we don't, we won't win!$" Route113_Text_29A453: @ 829A453 .string "Pfft, with these wings I can\n" @@ -1745,7 +1745,7 @@ Route113_Text_29A480: @ 829A480 .string "A… What?$" Route113_Text_29A489: @ 829A489 - .string "I don’t know what to say when I get\n" + .string "I don't know what to say when I get\n" .string "beaten so easily…$" Route113_Text_29A4BF: @ 829A4BF @@ -1754,11 +1754,11 @@ Route113_Text_29A4BF: @ 829A4BF Route113_Text_29A508: @ 829A508 .string "This is a dream.\n" - .string "I’m sure of it…$" + .string "I'm sure of it…$" Route113_Text_29A529: @ 829A529 .string "Losing burns me up…\n" - .string "I’m just going to sleep right here!\l" + .string "I'm just going to sleep right here!\l" .string "Zzz!$" Route113_Text_29A566: @ 829A566 @@ -1777,20 +1777,20 @@ Route113_Text_29A5E4: @ 829A5E4 .string "Even though I just caught my POKéMON?$" Route113_Text_29A628: @ 829A628 - .string "Y-you’re all happy to win?\n" - .string "Even though it’s only me?$" + .string "Y-you're all happy to win?\n" + .string "Even though it's only me?$" Route113_Text_29A65D: @ 829A65D .string "Oh, so now you want to say a word to\n" .string "the loser?\p" - .string "Aren’t you just the coolest?\n" + .string "Aren't you just the coolest?\n" .string "Humph!$" Route114_Text_29A6B1: @ 829A6B1 .string "Yodelayhihoo!\p" .string "… …\p" - .string "You’re supposed to shout\n" - .string "“yodelayhihoo†since it doesn’t\l" + .string "You're supposed to shout\n" + .string "“yodelayhihoo†since it doesn't\l" .string "echo here!$" Route114_Text_29A707: @ 829A707 @@ -1802,7 +1802,7 @@ Route114_Text_29A715: @ 829A715 .string "back, “Yodelayhihoo.â€$" Route114_Text_29A777: @ 829A777 - .string "If you’re not prepared, you shouldn’t\n" + .string "If you're not prepared, you shouldn't\n" .string "be up in the mountains!$" Route114_Text_29A7B5: @ 829A7B5 @@ -1813,7 +1813,7 @@ Route114_Text_29A7D4: @ 829A7D4 .string "with blizzards and avalanches.$" Route114_Text_29A818: @ 829A818 - .string "Camping’s fun! You can fish, roast\n" + .string "Camping's fun! You can fish, roast\n" .string "marshmallows, and tell spooky stories!\p" .string "But the best of all are the POKéMON\n" .string "battles!$" @@ -1822,19 +1822,19 @@ Route114_Text_29A88F: @ 829A88F .string "Way too strong!$" Route114_Text_29A89F: @ 829A89F - .string "I think it’s great that I can go\n" + .string "I think it's great that I can go\n" .string "camping with my POKéMON.$" Route114_Text_29A8D9: @ 829A8D9 .string "I need to exercise after a meal.\n" - .string "Let’s have a match!$" + .string "Let's have a match!$" Route114_Text_29A90E: @ 829A90E .string "Oh, no!$" Route114_Text_29A916: @ 829A916 .string "I just had a tasty meal.\n" - .string "I’m getting drowsy…$" + .string "I'm getting drowsy…$" Route114_Text_29A943: @ 829A943 .string "Ufufufufufu…\n" @@ -1844,14 +1844,14 @@ Route114_Text_29A973: @ 829A973 .string "M-My POKéMON…$" Route114_Text_29A981: @ 829A981 - .string "A big body that’s all lumpy and hard,\n" + .string "A big body that's all lumpy and hard,\n" .string "enormous horns, and vicious fangs…\p" .string "Ufufufufu…\n" .string "I wish I had a POKéMON like that…$" Route114_Text_29A9F7: @ 829A9F7 - .string "Don’t forget what you’ve done to me!\n" - .string "I’ll make it so you can’t forget!$" + .string "Don't forget what you've done to me!\n" + .string "I'll make it so you can't forget!$" Route114_Text_29AA3E: @ 829AA3E .string "Ufufufufufu…\n" @@ -1867,7 +1867,7 @@ Route114_Text_29AA94: @ 829AA94 .string "shivery and shaky…$" Route114_Text_29AADB: @ 829AADB - .string "If you’re lighting a campfire,\n" + .string "If you're lighting a campfire,\n" .string "make sure you have water handy.$" Route114_Text_29AB1A: @ 829AB1A @@ -1876,12 +1876,12 @@ Route114_Text_29AB1A: @ 829AB1A Route114_Text_29AB36: @ 829AB36 .string "You really do have to be careful with\n" .string "any sort of fire in a forest.\p" - .string "Don’t ever underestimate the power\n" + .string "Don't ever underestimate the power\n" .string "of fire.$" Route114_Text_29ABA6: @ 829ABA6 .string "You set my spirit on fire.\n" - .string "Let’s register each other!$" + .string "Let's register each other!$" Route114_Text_29ABDC: @ 829ABDC .string "Have you learned to keep water handy\n" @@ -1894,19 +1894,19 @@ Route114_Text_29AC10: @ 829AC10 Route114_Text_29AC43: @ 829AC43 .string "You really do have to be careful with\n" .string "any sort of fire in a forest.\p" - .string "Don’t ever underestimate the power\n" + .string "Don't ever underestimate the power\n" .string "of fire.$" Route114_Text_29ACB3: @ 829ACB3 - .string "If we were fishing, you wouldn’t stand\n" + .string "If we were fishing, you wouldn't stand\n" .string "a chance against me.\l" .string "So, bring on your POKéMON!$" Route114_Text_29AD0A: @ 829AD0A - .string "If we were fishing, I would’ve won…$" + .string "If we were fishing, I would've won…$" Route114_Text_29AD2E: @ 829AD2E - .string "I think I’ll try my luck at landing\n" + .string "I think I'll try my luck at landing\n" .string "a big one at METEOR FALLS.\p" .string "There has to be something in there.\n" .string "I just know it.$" @@ -1914,22 +1914,22 @@ Route114_Text_29AD2E: @ 829AD2E Route114_Text_29ADA1: @ 829ADA1 .string "I like to fish. But I also like to\n" .string "battle!\p" - .string "If anyone challenges me, I’m there,\n" - .string "even if I’m fishing.$" + .string "If anyone challenges me, I'm there,\n" + .string "even if I'm fishing.$" Route114_Text_29AE05: @ 829AE05 - .string "I like to battle, but that doesn’t\n" - .string "mean I’m good at it…$" + .string "I like to battle, but that doesn't\n" + .string "mean I'm good at it…$" Route114_Text_29AE3D: @ 829AE3D - .string "This time I’ll do it!\p" - .string "I always think that, so I can’t walk\n" + .string "This time I'll do it!\p" + .string "I always think that, so I can't walk\n" .string "away from fishing or POKéMON.$" Route114_Text_29AE96: @ 829AE96 .string "TYRA: Well, sure.\n" - .string "I’m in the mood for it.\l" - .string "I’ll teach you a little about POKéMON.$" + .string "I'm in the mood for it.\l" + .string "I'll teach you a little about POKéMON.$" Route114_Text_29AEE7: @ 829AEE7 .string "TYRA: What an amazing battle style!$" @@ -1941,7 +1941,7 @@ Route114_Text_29AF0B: @ 829AF0B Route114_Text_29AF3D: @ 829AF3D .string "TYRA: Giggle…\n" .string "If you want to battle with us, just one\l" - .string "POKéMON isn’t enough!$" + .string "POKéMON isn't enough!$" Route114_Text_29AF89: @ 829AF89 .string "IVY: Who taught you about POKéMON?$" @@ -1968,17 +1968,17 @@ Route114_Text_29B089: @ 829B089 Route114_Text_29B0B5: @ 829B0B5 .string "Okay!\n" - .string "I’ll just fish me a bigger one!$" + .string "I'll just fish me a bigger one!$" Route114_Text_29B0DB: @ 829B0DB .string "Me!\n" - .string "I’m not just a pretty face!$" + .string "I'm not just a pretty face!$" Route114_Text_29B0FB: @ 829B0FB - .string "That wasn’t cute in the least!$" + .string "That wasn't cute in the least!$" Route114_Text_29B11A: @ 829B11A - .string "I don’t want a POKéMON that’s\n" + .string "I don't want a POKéMON that's\n" .string "just cute.\p" .string "I adore cute ones that have a quirk\n" .string "or two!$" @@ -1989,11 +1989,11 @@ Route114_Text_29B16F: @ 829B16F Route114_Text_29B19C: @ 829B19C .string "Oh, I see.\n" - .string "That’s good to know.$" + .string "That's good to know.$" Route114_Text_29B1BC: @ 829B1BC .string "Some POKéMON change so much when\n" - .string "they evolve, it’s startling!$" + .string "they evolve, it's startling!$" Route115_Text_29B1FA: @ 829B1FA .string "Hm…\n" @@ -2001,8 +2001,8 @@ Route115_Text_29B1FA: @ 829B1FA .string "Let me keep you company!$" Route115_Text_29B230: @ 829B230 - .string "You’re much stronger than\n" - .string "I’d imagined!$" + .string "You're much stronger than\n" + .string "I'd imagined!$" Route115_Text_29B258: @ 829B258 .string "There is no such thing as a born genius.\n" @@ -2025,7 +2025,7 @@ Route115_Text_29B372: @ 829B372 Route115_Text_29B385: @ 829B385 .string "All it takes is effort!\p" - .string "I lost because I haven’t put in enough\n" + .string "I lost because I haven't put in enough\n" .string "effort!$" Route115_Text_29B3CC: @ 829B3CC @@ -2050,9 +2050,9 @@ Route115_Text_29B480: @ 829B480 .string "My head is busted!$" Route115_Text_29B49D: @ 829B49D - .string "I’ve been teaching my POKéMON karate.\p" - .string "It looks like they’ll get a lot better\n" - .string "than me. I’m excited about that.$" + .string "I've been teaching my POKéMON karate.\p" + .string "It looks like they'll get a lot better\n" + .string "than me. I'm excited about that.$" Route115_Text_29B50B: @ 829B50B .string "You impress me! Give me a rematch\n" @@ -2069,14 +2069,14 @@ Route115_Text_29B59D: @ 829B59D Route115_Text_29B5B5: @ 829B5B5 .string "My POKéMON will grow stronger!\n" - .string "I’ll redouble my training!$" + .string "I'll redouble my training!$" Route115_Text_29B5EF: @ 829B5EF .string "This beach is my secret training spot!\n" - .string "Don’t come butting in!$" + .string "Don't come butting in!$" Route115_Text_29B62D: @ 829B62D - .string "I haven’t trained enough!$" + .string "I haven't trained enough!$" Route115_Text_29B647: @ 829B647 .string "The sand acts as a cushion to reduce\n" @@ -2084,11 +2084,11 @@ Route115_Text_29B647: @ 829B647 .string "This is the perfect place to train.$" Route115_Text_29B6AB: @ 829B6AB - .string "Okay, fine, you’re free to come here.\n" - .string "In return, I’d like to battle you again.$" + .string "Okay, fine, you're free to come here.\n" + .string "In return, I'd like to battle you again.$" Route115_Text_29B6FA: @ 829B6FA - .string "Okay, let’s get this battle on!$" + .string "Okay, let's get this battle on!$" Route115_Text_29B71A: @ 829B71A .string "I can battle but my POKéMON…$" @@ -2104,14 +2104,14 @@ Route115_Text_29B78F: @ 829B78F Route115_Text_29B7C5: @ 829B7C5 .string "You…\n" - .string "You want my POKéMON, don’t you?$" + .string "You want my POKéMON, don't you?$" Route115_Text_29B7EA: @ 829B7EA .string "I have this rare POKéMON.\n" - .string "It’s enough to keep me satisfied.$" + .string "It's enough to keep me satisfied.$" Route115_Text_29B826: @ 829B826 - .string "I’ll battle while I’m running!\n" + .string "I'll battle while I'm running!\n" .string "Try to keep up with me!$" Route115_Text_29B85D: @ 829B85D @@ -2132,7 +2132,7 @@ Route115_Text_29B8E8: @ 829B8E8 Route115_Text_29B904: @ 829B904 .string "But my POKéMON were ultra,\n" - .string "weren’t they?$" + .string "weren't they?$" Route115_Text_29B92D: @ 829B92D .string "My POKéMON have black belt-level\n" @@ -2142,14 +2142,14 @@ Route115_Text_29B958: @ 829B958 .string "This is too humiliating!$" Route115_Text_29B971: @ 829B971 - .string "I rarely meet anyone who’s better\n" + .string "I rarely meet anyone who's better\n" .string "than me…\p" .string "I get it now!\n" - .string "You’re a GYM LEADER, aren’t you?$" + .string "You're a GYM LEADER, aren't you?$" Route115_Text_29B9CB: @ 829B9CB .string "Our eyes met!\n" - .string "There’s no getting away now!$" + .string "There's no getting away now!$" Route115_Text_29B9F6: @ 829B9F6 .string "Gah!\n" @@ -2160,26 +2160,26 @@ Route115_Text_29BA04: @ 829BA04 .string "I think I will TELEPORT home.$" Route115_Text_29BA2C: @ 829BA2C - .string "You’ve disturbed my meditation…\n" - .string "You’ll be punished for it.$" + .string "You've disturbed my meditation…\n" + .string "You'll be punished for it.$" Route115_Text_29BA67: @ 829BA67 - .string "You’ve broken my concentration!$" + .string "You've broken my concentration!$" Route115_Text_29BA87: @ 829BA87 .string "I was meditating with my POKéMON.\n" - .string "But this place isn’t very peaceful…$" + .string "But this place isn't very peaceful…$" Route116_Text_29BACD: @ 829BACD - .string "If the tunnel doesn’t go through, then\n" - .string "I’ll just go over the top.$" + .string "If the tunnel doesn't go through, then\n" + .string "I'll just go over the top.$" Route116_Text_29BB0F: @ 829BB0F .string "Gasp… Gasp…\n" .string "Losing made me tired…$" Route116_Text_29BB31: @ 829BB31 - .string "It’s no big deal if there’s no tunnel.\n" + .string "It's no big deal if there's no tunnel.\n" .string "To a HIKER, mountains are roads!$" Route116_Text_29BB79: @ 829BB79 @@ -2192,11 +2192,11 @@ Route116_Text_29BB9A: @ 829BB9A Route116_Text_29BBC6: @ 829BBC6 .string "Bandages are signs of toughness!\n" - .string "I’ve got another one!$" + .string "I've got another one!$" Route116_Text_29BBFD: @ 829BBFD .string "My BUG POKéMON are tough!\n" - .string "Let’s battle!$" + .string "Let's battle!$" Route116_Text_29BC25: @ 829BC25 .string "I lost!\n" @@ -2211,69 +2211,69 @@ Route116_Text_29BC7F: @ 829BC7F .string "adorable POKéMON is!$" Route116_Text_29BCB3: @ 829BCB3 - .string "You’re a notch above me…$" + .string "You're a notch above me…$" Route116_Text_29BCCC: @ 829BCCC .string "POKéMON that possess cuteness and\n" - .string "power, that’s ideal, I think.$" + .string "power, that's ideal, I think.$" Route116_Text_29BD0C: @ 829BD0C .string "We learn all sorts of things at the\n" - .string "TRAINER’S SCHOOL.\p" + .string "TRAINER'S SCHOOL.\p" .string "I want to test things out for real!$" Route116_Text_29BD66: @ 829BD66 .string "I slacked off in school…\n" - .string "That’s why I lost.$" + .string "That's why I lost.$" Route116_Text_29BD92: @ 829BD92 - .string "I’ll have to redo some courses at\n" - .string "the TRAINER’S SCHOOL.\l" - .string "If I don’t, ROXANNE will be steamed.$" + .string "I'll have to redo some courses at\n" + .string "the TRAINER'S SCHOOL.\l" + .string "If I don't, ROXANNE will be steamed.$" Route116_Text_29BDEF: @ 829BDEF - .string "I learned at the TRAINER’S SCHOOL\n" + .string "I learned at the TRAINER'S SCHOOL\n" .string "that a POKéNAV can register TRAINERS.\p" - .string "I don’t really get what that means,\n" + .string "I don't really get what that means,\n" .string "so can I just try it?$" Route116_Text_29BE71: @ 829BE71 - .string "I learned at the TRAINER’S SCHOOL\n" + .string "I learned at the TRAINER'S SCHOOL\n" .string "that a POKéNAV can register TRAINERS.\p" - .string "I don’t really get what that means,\n" + .string "I don't really get what that means,\n" .string "so can I just try it?$" Route116_Text_29BEF3: @ 829BEF3 - .string "I’ve been studying seriously at the\n" - .string "TRAINER’S SCHOOL.\l" - .string "I won’t lose like I did last time.$" + .string "I've been studying seriously at the\n" + .string "TRAINER'S SCHOOL.\l" + .string "I won't lose like I did last time.$" Route116_Text_29BF4C: @ 829BF4C .string "Hunh?\n" .string "I studied diligently.$" Route116_Text_29BF68: @ 829BF68 - .string "I’ll have to redo some courses at\n" - .string "the TRAINER’S SCHOOL.\l" - .string "If I don’t, ROXANNE will be steamed.$" + .string "I'll have to redo some courses at\n" + .string "the TRAINER'S SCHOOL.\l" + .string "If I don't, ROXANNE will be steamed.$" Route116_Text_29BFC5: @ 829BFC5 .string "I study at school, and I study on\n" .string "the way home, too!$" Route116_Text_29BFFA: @ 829BFFA - .string "I’m in shock--I lost?$" + .string "I'm in shock--I lost?$" Route116_Text_29C010: @ 829C010 - .string "Awww, I’ll never become an elegant\n" + .string "Awww, I'll never become an elegant\n" .string "TRAINER like ROXANNE this way!$" Route116_Text_29C052: @ 829C052 - .string "Oh, wow! Isn’t that a POKéNAV?\n" + .string "Oh, wow! Isn't that a POKéNAV?\n" .string "I have one, too! Please register me!$" Route116_Text_29C096: @ 829C096 - .string "Oh, wow! Isn’t that a POKéNAV?\n" + .string "Oh, wow! Isn't that a POKéNAV?\n" .string "I have one, too! Please register me!$" Route116_Text_29C0DA: @ 829C0DA @@ -2281,15 +2281,15 @@ Route116_Text_29C0DA: @ 829C0DA .string "You must see my achievements!$" Route116_Text_29C11F: @ 829C11F - .string "I’m in shock.\n" + .string "I'm in shock.\n" .string "I lost again?$" Route116_Text_29C13B: @ 829C13B - .string "You’ve beaten ROXANNE?\n" - .string "I can’t beat you, then. Not yet.$" + .string "You've beaten ROXANNE?\n" + .string "I can't beat you, then. Not yet.$" Route116_Text_29C173: @ 829C173 - .string "Just so you know, I’ve never once been\n" + .string "Just so you know, I've never once been\n" .string "bested by anyone at anything.$" Route116_Text_29C1B8: @ 829C1B8 @@ -2303,21 +2303,21 @@ Route116_Text_29C1EA: @ 829C1EA .string "my wealth has no meaning.$" Route116_Text_29C266: @ 829C266 - .string "When you lay your eyes on my POKéMON’s\n" + .string "When you lay your eyes on my POKéMON's\n" .string "gorgeous fur, their beauty will render\l" .string "you helpless!$" Route116_Text_29C2C2: @ 829C2C2 - .string "Oh, baby, say it isn’t so!$" + .string "Oh, baby, say it isn't so!$" Route116_Text_29C2DD: @ 829C2DD .string "Oh, no, no, no!\n" - .string "You’ve mussed up my POKéMON’s fur!\l" - .string "You’ve ruined my hairdo, too!\l" - .string "I’ll have to call my stylist now!$" + .string "You've mussed up my POKéMON's fur!\l" + .string "You've ruined my hairdo, too!\l" + .string "I'll have to call my stylist now!$" Route116_Text_29C350: @ 829C350 - .string "We’ll rock you hard!$" + .string "We'll rock you hard!$" Route116_Text_29C365: @ 829C365 .string "Aiyiyi!\n" @@ -2325,11 +2325,11 @@ Route116_Text_29C365: @ 829C365 Route116_Text_29C380: @ 829C380 .string "I should try different POKéMON\n" - .string "types, that’s what I ought to do.$" + .string "types, that's what I ought to do.$" Route116_Text_29C3C1: @ 829C3C1 - .string "It’s a dead end up here.\n" - .string "I’m bored, so can we battle?$" + .string "It's a dead end up here.\n" + .string "I'm bored, so can we battle?$" Route116_Text_29C3F7: @ 829C3F7 .string "That was fun even though I lost.$" @@ -2340,23 +2340,23 @@ Route116_Text_29C418: @ 829C418 Route117_Text_29C43F: @ 829C43F .string "Listen, could I get you to battle\n" - .string "the POKéMON I’m raising?$" + .string "the POKéMON I'm raising?$" Route117_Text_29C47A: @ 829C47A - .string "You’ve raised yours superbly…$" + .string "You've raised yours superbly…$" Route117_Text_29C498: @ 829C498 - .string "POKéMON isn’t all about power.\p" - .string "Polishing a unique aspect of one’s\n" + .string "POKéMON isn't all about power.\p" + .string "Polishing a unique aspect of one's\n" .string "character is another way of enjoying\l" .string "POKéMON.$" Route117_Text_29C508: @ 829C508 - .string "I’m going to redouble my training.\n" + .string "I'm going to redouble my training.\n" .string "Would you come look in on us?$" Route117_Text_29C549: @ 829C549 - .string "The POKéMON I’ve been raising are\n" + .string "The POKéMON I've been raising are\n" .string "looking good, just like before.$" Route117_Text_29C58B: @ 829C58B @@ -2379,7 +2379,7 @@ Route117_Text_29C679: @ 829C679 .string "attention to their character traits.$" Route117_Text_29C6BC: @ 829C6BC - .string "I’m glad I met a superb TRAINER in you.\n" + .string "I'm glad I met a superb TRAINER in you.\n" .string "I hope to see you again.$" Route117_Text_29C6FD: @ 829C6FD @@ -2394,8 +2394,8 @@ Route117_Text_29C75A: @ 829C75A .string "of {POKEBLOCK}S, depending on their nature.$" Route117_Text_29C7A5: @ 829C7A5 - .string "I’m in the middle of a triathlon, but,\n" - .string "whatever, let’s have a battle!$" + .string "I'm in the middle of a triathlon, but,\n" + .string "whatever, let's have a battle!$" Route117_Text_29C7EB: @ 829C7EB .string "I ran out of energy!$" @@ -2407,24 +2407,24 @@ Route117_Text_29C800: @ 829C800 Route117_Text_29C846: @ 829C846 .string "POKéMON have to be strong, too?\n" - .string "I’d like you to train me!$" + .string "I'd like you to train me!$" Route117_Text_29C880: @ 829C880 - .string "I’m smack in the middle of a triathlon,\n" - .string "but I’m comfortably ahead.\l" - .string "Let’s make this a quick battle!$" + .string "I'm smack in the middle of a triathlon,\n" + .string "but I'm comfortably ahead.\l" + .string "Let's make this a quick battle!$" Route117_Text_29C8E3: @ 829C8E3 .string "I ran out of energy again!$" Route117_Text_29C8FE: @ 829C8FE .string "I was tops in swimming and cycling,\n" - .string "but I’m not quite that confident with\l" + .string "but I'm not quite that confident with\l" .string "POKéMON yet.$" Route117_Text_29C955: @ 829C955 .string "I do my triathlon training with POKéMON,\n" - .string "so I’m pretty confident about my speed.$" + .string "so I'm pretty confident about my speed.$" Route117_Text_29C9A6: @ 829C9A6 .string "I need to get more practices in,\n" @@ -2433,12 +2433,12 @@ Route117_Text_29C9A6: @ 829C9A6 Route117_Text_29C9D0: @ 829C9D0 .string "Training is meaningful only if you\n" .string "keep it up regularly.\p" - .string "Okay! I’ll resume my training!\n" + .string "Okay! I'll resume my training!\n" .string "Tomorrow!$" Route117_Text_29CA32: @ 829CA32 .string "You appear to be training properly…\n" - .string "If you’d like, I’ll battle you later!$" + .string "If you'd like, I'll battle you later!$" Route117_Text_29CA7C: @ 829CA7C .string "Are you keeping up with your training?\n" @@ -2450,8 +2450,8 @@ Route117_Text_29CACC: @ 829CACC .string "I guess.$" Route117_Text_29CAF6: @ 829CAF6 - .string "I’ll resume training tomorrow.\n" - .string "Let’s battle again sometime!$" + .string "I'll resume training tomorrow.\n" + .string "Let's battle again sometime!$" Route117_Text_29CB32: @ 829CB32 .string "Once a BUG CATCHER!\n" @@ -2467,65 +2467,65 @@ Route117_Text_29CBAD: @ 829CBAD .string "All I did was follow my heart, and now\n" .string "they call me a BUG MANIAC…\p" .string "Still, I am an expert on BUG POKéMON,\n" - .string "so it’s only natural that they call me\l" + .string "so it's only natural that they call me\l" .string "a BUG MANIAC.$" Route117_Text_29CC4A: @ 829CC4A - .string "ANNA: I’m with my pretty junior student\n" + .string "ANNA: I'm with my pretty junior student\n" .string "partner. I have to do good!$" Route117_Text_29CC8E: @ 829CC8E - .string "ANNA: I’m with my pretty junior student\n" + .string "ANNA: I'm with my pretty junior student\n" .string "partner! Let me win!$" Route117_Text_29CCCB: @ 829CCCB .string "ANNA: Your POKéMON have some good\n" .string "combinations.\p" - .string "I’d say you’re second only to us!$" + .string "I'd say you're second only to us!$" Route117_Text_29CD1D: @ 829CD1D - .string "ANNA: We can’t take this lying down!\n" - .string "You will come back, won’t you?$" + .string "ANNA: We can't take this lying down!\n" + .string "You will come back, won't you?$" Route117_Text_29CD61: @ 829CD61 .string "ANNA: If you want to battle us,\n" .string "bring two POKéMON with you.$" Route117_Text_29CD9D: @ 829CD9D - .string "MEG: I’m going to tag up with my super\n" + .string "MEG: I'm going to tag up with my super\n" .string "senior student partner and beat you!$" Route117_Text_29CDE9: @ 829CDE9 .string "MEG: Oh, no!\n" - .string "I’m sorry, ANNA! I let you down…$" + .string "I'm sorry, ANNA! I let you down…$" Route117_Text_29CE17: @ 829CE17 .string "MEG: I dragged ANNA down…\n" - .string "If I didn’t, she would have won!$" + .string "If I didn't, she would have won!$" Route117_Text_29CE52: @ 829CE52 .string "MEG: Do you only have one POKéMON?\n" - .string "We can’t battle with you, then.\p" + .string "We can't battle with you, then.\p" .string "We want to have a 2-on-2 battle.$" Route117_Text_29CEB6: @ 829CEB6 - .string "ANNA: I can’t keep losing in front of\n" + .string "ANNA: I can't keep losing in front of\n" .string "my junior partner, right?$" Route117_Text_29CEF6: @ 829CEF6 - .string "ANNA: I couldn’t get into the groove.$" + .string "ANNA: I couldn't get into the groove.$" Route117_Text_29CF1C: @ 829CF1C .string "ANNA: Your POKéMON have some good\n" .string "combinations.\p" - .string "I’d say you’re second only to us!$" + .string "I'd say you're second only to us!$" Route117_Text_29CF6E: @ 829CF6E .string "ANNA: If you want to battle us,\n" .string "bring two POKéMON with you.$" Route117_Text_29CFAA: @ 829CFAA - .string "MEG: I’m going to tag up with my\n" + .string "MEG: I'm going to tag up with my\n" .string "senior partner and win this time!$" Route117_Text_29CFED: @ 829CFED @@ -2534,19 +2534,19 @@ Route117_Text_29CFED: @ 829CFED Route117_Text_29CFFE: @ 829CFFE .string "MEG: I battled together with my\n" .string "senior partner, but we lost…\p" - .string "That’s so discouraging…$" + .string "That's so discouraging…$" Route117_Text_29D053: @ 829D053 .string "MEG: Do you only have one POKéMON?\n" - .string "We can’t battle with you, then.\p" + .string "We can't battle with you, then.\p" .string "We want to have a 2-on-2 battle.$" Route117_Text_29D0B7: @ 829D0B7 - .string "Isn’t it nice? To battle while looking\n" + .string "Isn't it nice? To battle while looking\n" .string "at pretty flowers?$" Route117_Text_29D0F1: @ 829D0F1 - .string "Oh, that’s quite impressive!$" + .string "Oh, that's quite impressive!$" Route117_Text_29D10E: @ 829D10E .string "It feels wonderful to go for a jog\n" @@ -2565,15 +2565,15 @@ Route117_Text_29D196: @ 829D196 Route117_Text_29D1D1: @ 829D1D1 .string "Concentrate on getting the win.\n" - .string "That’s how I battle!$" + .string "That's how I battle!$" Route117_Text_29D206: @ 829D206 - .string "I don’t waste any time being angry\n" + .string "I don't waste any time being angry\n" .string "over a loss--I would rather train.$" Route117_Text_29D24C: @ 829D24C .string "I think that if you worry about losing,\n" - .string "you’re more likely to lose.$" + .string "you're more likely to lose.$" Route118_Text_29D290: @ 829D290 .string "The aroma of flowers has a magical\n" @@ -2587,10 +2587,10 @@ Route118_Text_29D2FA: @ 829D2FA .string "Flowers, POKéMON…\n" .string "I love whatever smells nice.\p" .string "Stinky things…\n" - .string "I’ll pass.$" + .string "I'll pass.$" Route118_Text_29D343: @ 829D343 - .string "Sniff… That odor--it’s a POKéNAV!\n" + .string "Sniff… That odor--it's a POKéNAV!\n" .string "We must register each other!$" Route118_Text_29D382: @ 829D382 @@ -2599,7 +2599,7 @@ Route118_Text_29D382: @ 829D382 Route118_Text_29D3AA: @ 829D3AA .string "The power of aroma…\n" - .string "It didn’t seem to do much.$" + .string "It didn't seem to do much.$" Route118_Text_29D3D9: @ 829D3D9 .string "If you use a sweet aroma properly,\n" @@ -2607,15 +2607,15 @@ Route118_Text_29D3D9: @ 829D3D9 Route118_Text_29D41D: @ 829D41D .string "BIRD POKéMON that FLY elegantly in\n" - .string "the sky… They’re the best!$" + .string "the sky… They're the best!$" Route118_Text_29D45B: @ 829D45B .string "Urgh…\n" .string "I crashed…$" Route118_Text_29D46C: @ 829D46C - .string "You’ve got great POKéMON.\n" - .string "I’ll have to train mine better.$" + .string "You've got great POKéMON.\n" + .string "I'll have to train mine better.$" Route118_Text_29D4A6: @ 829D4A6 .string "Take flight!\n" @@ -2625,19 +2625,19 @@ Route118_Text_29D4C4: @ 829D4C4 .string "They did take flight…$" Route118_Text_29D4DA: @ 829D4DA - .string "If they’d get stronger, they’d be able\n" + .string "If they'd get stronger, they'd be able\n" .string "to fly more freely…$" Route118_Text_29D515: @ 829D515 - .string "I’m a FISHERMAN, but also a TRAINER.\n" - .string "I’m raising the POKéMON I caught.$" + .string "I'm a FISHERMAN, but also a TRAINER.\n" + .string "I'm raising the POKéMON I caught.$" Route118_Text_29D55C: @ 829D55C .string "I thought I was doing okay in my\n" .string "training…$" Route118_Text_29D587: @ 829D587 - .string "I couldn’t win by training POKéMON\n" + .string "I couldn't win by training POKéMON\n" .string "while I fished…\p" .string "Was I doing things in half measures?$" @@ -2660,7 +2660,7 @@ Route118_Text_29D6CD: @ 829D6CD .string "La-lalala…$" Route118_Text_29D6D8: @ 829D6D8 - .string "An electric guitar doesn’t always\n" + .string "An electric guitar doesn't always\n" .string "have to be noisy…\p" .string "It can be strummed to squeeze out\n" .string "this heart-stirring melody…$" @@ -2689,12 +2689,12 @@ Route118_Text_29D83C: @ 829D83C .string "POKéMON 1, 2, and 3?!$" Route118_Text_29D872: @ 829D872 - .string "Isn’t it cool that I have a POKéMON\n" + .string "Isn't it cool that I have a POKéMON\n" .string "battle team?\p" - .string "You can copy me--I don’t mind!$" + .string "You can copy me--I don't mind!$" Route119_Text_29D8C2: @ 829D8C2 - .string "We’re the MIMIC CIRCLE!\n" + .string "We're the MIMIC CIRCLE!\n" .string "We MIMIC what you do!$" Route119_Text_29D8F0: @ 829D8F0 @@ -2702,16 +2702,16 @@ Route119_Text_29D8F0: @ 829D8F0 .string "I lost!$" Route119_Text_29D902: @ 829D902 - .string "What’s so good about mimicry?\p" + .string "What's so good about mimicry?\p" .string "Fufufu…\n" - .string "You’ll never understand…$" + .string "You'll never understand…$" Route119_Text_29D941: @ 829D941 .string "So, we finally meet!\n" .string "My BUG POKéMON will keep you company!$" Route119_Text_29D97C: @ 829D97C - .string "I wish we’d never met…$" + .string "I wish we'd never met…$" Route119_Text_29D993: @ 829D993 .string "I want to MIMIC you some more.\n" @@ -2725,31 +2725,31 @@ Route119_Text_29DA14: @ 829DA14 .string "But if you win, I lose…$" Route119_Text_29DA2C: @ 829DA2C - .string "I can’t MIMIC you winning the match.\n" - .string "That’s just impossible…\l" - .string "It’s burning me up…$" + .string "I can't MIMIC you winning the match.\n" + .string "That's just impossible…\l" + .string "It's burning me up…$" Route119_Text_29DA7D: @ 829DA7D - .string "Yep, you’ve finally caught me!\n" + .string "Yep, you've finally caught me!\n" .string "Or were you trying to avoid me?$" Route119_Text_29DABC: @ 829DABC .string "Whoop, that was a great match!$" Route119_Text_29DADB: @ 829DADB - .string "We’re the MIMIC CIRCLE!\n" + .string "We're the MIMIC CIRCLE!\n" .string "I hope you enjoyed our performance.$" Route119_Text_29DB17: @ 829DB17 - .string "You don’t know who I am, do you?\p" - .string "But, I also don’t know you.\n" - .string "So, we’ll battle!$" + .string "You don't know who I am, do you?\p" + .string "But, I also don't know you.\n" + .string "So, we'll battle!$" Route119_Text_29DB66: @ 829DB66 - .string "You’re pretty strong!$" + .string "You're pretty strong!$" Route119_Text_29DB7C: @ 829DB7C - .string "Until you go away somewhere, we’ll\n" + .string "Until you go away somewhere, we'll\n" .string "keep on mimicking your every move.$" Route119_Text_29DBC2: @ 829DBC2 @@ -2761,32 +2761,32 @@ Route119_Text_29DC20: @ 829DC20 .string "I give up!$" Route119_Text_29DC2B: @ 829DC2B - .string "Won’t you join our MIMIC CIRCLE?$" + .string "Won't you join our MIMIC CIRCLE?$" Route119_Text_29DC4C: @ 829DC4C .string "Who has the knowledge and\n" .string "the technique for survival?\p" - .string "POKéMON RANGERS, that’s who!$" + .string "POKéMON RANGERS, that's who!$" Route119_Text_29DC9F: @ 829DC9F - .string "I didn’t have enough POKéMON\n" + .string "I didn't have enough POKéMON\n" .string "know-how…$" Route119_Text_29DCC6: @ 829DCC6 .string "To break away from civilization and\n" .string "awaken the wild spirit within!\p" - .string "That’s our vision.$" + .string "That's our vision.$" Route119_Text_29DD1C: @ 829DD1C - .string "I hope you’ll give me a rematch without\n" + .string "I hope you'll give me a rematch without\n" .string "mocking my lack of knowledge.$" Route119_Text_29DD62: @ 829DD62 - .string "I’m going to regain my wild spirit by\n" + .string "I'm going to regain my wild spirit by\n" .string "being together with POKéMON.$" Route119_Text_29DDA5: @ 829DDA5 - .string "You’ve remained strong!$" + .string "You've remained strong!$" Route119_Text_29DDBD: @ 829DDBD .string "Believe in your POKéMON.\n" @@ -2796,30 +2796,30 @@ Route119_Text_29DDBD: @ 829DDBD Route119_Text_29DE0F: @ 829DE0F .string "Oh? Look at you.\p" .string "For someone on an adventure,\n" - .string "you’re traveling awfully light.$" + .string "you're traveling awfully light.$" Route119_Text_29DE5D: @ 829DE5D - .string "Accidents happen when you’re not\n" + .string "Accidents happen when you're not\n" .string "prepared!$" Route119_Text_29DE88: @ 829DE88 - .string "You’re traveling light but you have\n" + .string "You're traveling light but you have\n" .string "everything you need.\p" - .string "You’re on top of things mentally and\n" + .string "You're on top of things mentally and\n" .string "physically, too.$" Route119_Text_29DEF7: @ 829DEF7 .string "Do you have a POKéNAV?\n" - .string "It’s a must-have tool for any TRAINER.\p" + .string "It's a must-have tool for any TRAINER.\p" .string "Oh, you do have one!\n" - .string "Let’s register each other, then!$" + .string "Let's register each other, then!$" Route119_Text_29DF6B: @ 829DF6B - .string "How’s your journey with POKéMON\n" + .string "How's your journey with POKéMON\n" .string "going?$" Route119_Text_29DF92: @ 829DF92 - .string "I’m still missing something…$" + .string "I'm still missing something…$" Route119_Text_29DFAF: @ 829DFAF .string "In the same way that you, as a TRAINER,\n" @@ -2839,7 +2839,7 @@ Route119_Text_29E071: @ 829E071 .string "flying come true!$" Route119_Text_29E0A5: @ 829E0A5 - .string "I’ll show you the true potential of me\n" + .string "I'll show you the true potential of me\n" .string "and my BIRD POKéMON!$" Route119_Text_29E0E1: @ 829E0E1 @@ -2863,11 +2863,11 @@ Route119_Text_29E19D: @ 829E19D .string "That, too, is destiny…$" Route119_Text_29E1F5: @ 829E1F5 - .string "If you’re not on your guard,\n" - .string "you’re in for some pain!$" + .string "If you're not on your guard,\n" + .string "you're in for some pain!$" Route119_Text_29E22B: @ 829E22B - .string "You’re surprisingly good!$" + .string "You're surprisingly good!$" Route119_Text_29E245: @ 829E245 .string "My surprise attack ended in\n" @@ -2888,26 +2888,26 @@ Route119_Text_29E2A3: @ 829E2A3 Route119_Text_29E30D: @ 829E30D .string "You spoke to me…\n" .string "So you want to challenge me!\p" - .string "Sure! I’ll try out the POKéMON I caught\n" + .string "Sure! I'll try out the POKéMON I caught\n" .string "while SURFING!$" Route119_Text_29E372: @ 829E372 - .string "I don’t have a clue about what it\n" + .string "I don't have a clue about what it\n" .string "takes to win.$" Route119_Text_29E3A2: @ 829E3A2 .string "Go for a SURF on my POKéMON…\p" .string "Then fish off its back…\p" - .string "It’s an indescribably luxuriant moment!$" + .string "It's an indescribably luxuriant moment!$" Route119_Text_29E3FF: @ 829E3FF .string "Hit me with a power chord!\n" .string "Victory is mine!\l" - .string "It’s our time to shine, whoa, yeah!$" + .string "It's our time to shine, whoa, yeah!$" Route119_Text_29E44F: @ 829E44F - .string "You showed me who’s the boss!\n" - .string "We’ll have to take the loss, oh, no!$" + .string "You showed me who's the boss!\n" + .string "We'll have to take the loss, oh, no!$" Route119_Text_29E492: @ 829E492 .string "Hit me with another power chord!\n" @@ -2917,15 +2917,15 @@ Route119_Text_29E492: @ 829E492 Route119_Text_29E4DF: @ 829E4DF .string "Hohoho!\n" .string "I like kid TRAINERS!\l" - .string "Let’s have a good one!$" + .string "Let's have a good one!$" Route119_Text_29E513: @ 829E513 - .string "You’re pretty amazing!\n" + .string "You're pretty amazing!\n" .string "Hohoho!$" Route119_Text_29E532: @ 829E532 .string "Hohoho!\n" - .string "I’ll try emulating the pep of kid\l" + .string "I'll try emulating the pep of kid\l" .string "TRAINERS like you!$" Route119_Text_29E56F: @ 829E56F @@ -2934,10 +2934,10 @@ Route119_Text_29E56F: @ 829E56F Route119_Text_29E5B1: @ 829E5B1 .string "Oh, but…\n" - .string "That’s not fair.$" + .string "That's not fair.$" Route119_Text_29E5CB: @ 829E5CB - .string "You’re asking if my parasol is heavy?\n" + .string "You're asking if my parasol is heavy?\n" .string "Your BAG is filled with more junk than\l" .string "I ever carry around.$" @@ -2950,7 +2950,7 @@ Route120_Text_29E665: @ 829E665 Route120_Text_29E67A: @ 829E67A .string "The move FLY is convenient,\n" - .string "don’t you think?\p" + .string "don't you think?\p" .string "While the POKéMON is flying,\n" .string "almost no moves can strike it.$" @@ -2967,7 +2967,7 @@ Route120_Text_29E726: @ 829E726 Route120_Text_29E75D: @ 829E75D .string "You can be counted on to get better.\n" - .string "I’d like to register you in my POKéNAV!$" + .string "I'd like to register you in my POKéNAV!$" Route120_Text_29E7AA: @ 829E7AA .string "A POKéMON that grows steadily is one\n" @@ -2981,25 +2981,25 @@ Route120_Text_29E804: @ 829E804 .string "I have to grow stronger, too.$" Route120_Text_29E843: @ 829E843 - .string "I’ll check your POKéMON and see if\n" - .string "they’re fit for the outdoors.$" + .string "I'll check your POKéMON and see if\n" + .string "they're fit for the outdoors.$" Route120_Text_29E884: @ 829E884 - .string "With POKéMON that strong, you’re in\n" + .string "With POKéMON that strong, you're in\n" .string "no danger of needing rescue!$" Route120_Text_29E8C5: @ 829E8C5 .string "To travel wherever your heart desires\n" .string "with POKéMON…\l" - .string "That’s the joy of being a TRAINER.$" + .string "That's the joy of being a TRAINER.$" Route120_Text_29E91C: @ 829E91C - .string "How’s your physical fitness?\n" - .string "If you’re not fit, you could have a\l" + .string "How's your physical fitness?\n" + .string "If you're not fit, you could have a\l" .string "rough time in critical situations.$" Route120_Text_29E980: @ 829E980 - .string "I’m totally fit, but…$" + .string "I'm totally fit, but…$" Route120_Text_29E996: @ 829E996 .string "Fitness training is in my routine.\n" @@ -3016,7 +3016,7 @@ Route120_Text_29E9FF: @ 829E9FF Route120_Text_29EA08: @ 829EA08 .string "… … … … … …\n" .string "… … … … … …\l" - .string "I’ll try harder…$" + .string "I'll try harder…$" Route120_Text_29EA31: @ 829EA31 .string "… … … … … …\n" @@ -3035,7 +3035,7 @@ Route120_Text_29EA8F: @ 829EA8F Route120_Text_29EAA9: @ 829EAA9 .string "… … … … … …\n" .string "… … … … … …\l" - .string "I’ll try harder…\l" + .string "I'll try harder…\l" .string "For my precious BUG POKéMON…$" Route120_Text_29EAEF: @ 829EAEF @@ -3044,7 +3044,7 @@ Route120_Text_29EAEF: @ 829EAEF .string "TRAINER, learn about them.$" Route120_Text_29EB53: @ 829EB53 - .string "You’re obviously thinking.$" + .string "You're obviously thinking.$" Route120_Text_29EB6E: @ 829EB6E .string "The special abilities of POKéMON\n" @@ -3066,14 +3066,14 @@ Route120_Text_29EC41: @ 829EC41 Route120_Text_29ECA6: @ 829ECA6 .string "Why am I carrying this parasol?\p" - .string "I’ll tell you if you can win against me.$" + .string "I'll tell you if you can win against me.$" Route120_Text_29ECEF: @ 829ECEF - .string "A parasol can’t ward off POKéMON\n" + .string "A parasol can't ward off POKéMON\n" .string "attacks…$" Route120_Text_29ED19: @ 829ED19 - .string "I don’t think strong sunlight is good\n" + .string "I don't think strong sunlight is good\n" .string "for my POKéMON.\l" .string "So I shield them with my parasol.$" @@ -3083,10 +3083,10 @@ Route120_Text_29ED71: @ 829ED71 .string "the picture of beauty will be ruined.$" Route120_Text_29EDD3: @ 829EDD3 - .string "You’ve completely ruined my beauty…$" + .string "You've completely ruined my beauty…$" Route120_Text_29EDF7: @ 829EDF7 - .string "A parasol wouldn’t suit you at all.\p" + .string "A parasol wouldn't suit you at all.\p" .string "Why, something like this would only\n" .string "get in your way.$" @@ -3105,7 +3105,7 @@ Route120_Text_29EED4: @ 829EED4 Route120_Text_29EF08: @ 829EF08 .string "We ninja conceal ourselves under our\n" .string "camouflage cloaks.\l" - .string "I bet you didn’t know where I was!$" + .string "I bet you didn't know where I was!$" Route120_Text_29EF63: @ 829EF63 .string "I lost!\n" @@ -3116,7 +3116,7 @@ Route120_Text_29EF89: @ 829EF89 .string "handmade.$" Route120_Text_29EFB1: @ 829EFB1 - .string "If you don’t pay attention,\n" + .string "If you don't pay attention,\n" .string "you could get hurt!$" Route120_Text_29EFE1: @ 829EFE1 @@ -3125,17 +3125,17 @@ Route120_Text_29EFE1: @ 829EFE1 Route120_Text_29F002: @ 829F002 .string "I wonder… Should I evolve my POKéMON?\n" - .string "They’re cute the way they are, though.$" + .string "They're cute the way they are, though.$" Route120_Text_29F04F: @ 829F04F .string "Your party POKéMON…\n" .string "Do you have different types?$" Route120_Text_29F080: @ 829F080 - .string "I’ve seen your policy in action!$" + .string "I've seen your policy in action!$" Route120_Text_29F0A1: @ 829F0A1 - .string "I think it’s awesome you’re so strong\n" + .string "I think it's awesome you're so strong\n" .string "battling with your favorite POKéMON.$" Route121_Text_29F0EC: @ 829F0EC @@ -3143,16 +3143,16 @@ Route121_Text_29F0EC: @ 829F0EC .string "pretty POKéMON?$" Route121_Text_29F11F: @ 829F11F - .string "This isn’t what I meant!$" + .string "This isn't what I meant!$" Route121_Text_29F138: @ 829F138 - .string "I’m going to a CONTEST in LILYCOVE.\p" + .string "I'm going to a CONTEST in LILYCOVE.\p" .string "My POKéMON should have no problem\n" .string "sweeping the MASTER CLASS.$" Route121_Text_29F199: @ 829F199 .string "With my POKéMON, I have traveled\n" - .string "to the world’s four corners.\p" + .string "to the world's four corners.\p" .string "You might say I have some confidence\n" .string "in my abilities.$" @@ -3169,7 +3169,7 @@ Route121_Text_29F25B: @ 829F25B Route121_Text_29F2A6: @ 829F2A6 .string "With my POKéMON, I have traveled\n" - .string "to the world’s four corners.\p" + .string "to the world's four corners.\p" .string "You might say I have some confidence\n" .string "in my abilities.$" @@ -3194,37 +3194,37 @@ Route121_Text_29F3C6: @ 829F3C6 .string "at work there…$" Route121_Text_29F3FB: @ 829F3FB - .string "KATE: Together, we’re fearless!\n" - .string "We’ll demonstrate how tough we are!$" + .string "KATE: Together, we're fearless!\n" + .string "We'll demonstrate how tough we are!$" Route121_Text_29F43F: @ 829F43F .string "KATE: I blew it in front of my junior\n" .string "student partner…$" Route121_Text_29F476: @ 829F476 - .string "KATE: When someone’s relying on me,\n" + .string "KATE: When someone's relying on me,\n" .string "I get this urge to look cool in front\l" .string "of them…$" Route121_Text_29F4C9: @ 829F4C9 - .string "KATE: If you’ve only got one POKéMON,\n" - .string "we can’t battle with you.\p" + .string "KATE: If you've only got one POKéMON,\n" + .string "we can't battle with you.\p" .string "That would be bullying.$" Route121_Text_29F521: @ 829F521 - .string "JOY: Together, we’re fearless!\n" - .string "We’ll demonstrate how tough we are!$" + .string "JOY: Together, we're fearless!\n" + .string "We'll demonstrate how tough we are!$" Route121_Text_29F564: @ 829F564 .string "JOY: Please forgive me, KATE!$" Route121_Text_29F582: @ 829F582 - .string "JOY: Ehehe, I’ll have to train with KATE,\n" + .string "JOY: Ehehe, I'll have to train with KATE,\n" .string "my senior student partner, again.$" Route121_Text_29F5CE: @ 829F5CE .string "JOY: You need at least two POKéMON\n" - .string "if you’re going to challenge us!$" + .string "if you're going to challenge us!$" Route121_Text_29F612: @ 829F612 .string "Stop! Have a good look at my precious\n" @@ -3232,15 +3232,15 @@ Route121_Text_29F612: @ 829F612 Route121_Text_29F641: @ 829F641 .string "Oh, how dare you!\n" - .string "Don’t take it so seriously!$" + .string "Don't take it so seriously!$" Route121_Text_29F66F: @ 829F66F - .string "Maybe I’ll go catch more POKéMON at\n" + .string "Maybe I'll go catch more POKéMON at\n" .string "the SAFARI.$" Route121_Text_29F69F: @ 829F69F .string "I took it easy on you this time!\n" - .string "It won’t be that way the next time!$" + .string "It won't be that way the next time!$" Route121_Text_29F6E4: @ 829F6E4 .string "My precious POKéMON grew!\n" @@ -3248,74 +3248,74 @@ Route121_Text_29F6E4: @ 829F6E4 Route121_Text_29F710: @ 829F710 .string "Oh, how dare you!\n" - .string "You still won’t take it easy!$" + .string "You still won't take it easy!$" Route121_Text_29F740: @ 829F740 - .string "Maybe I’ll go catch more POKéMON at\n" + .string "Maybe I'll go catch more POKéMON at\n" .string "the SAFARI.$" Route121_Text_29F770: @ 829F770 .string "I have this routine.\n" .string "Defeat five TRAINERS a day.\l" - .string "Guess what? You’re number five!$" + .string "Guess what? You're number five!$" Route121_Text_29F7C1: @ 829F7C1 .string "No!\n" - .string "You’re horrid!$" + .string "You're horrid!$" Route121_Text_29F7D4: @ 829F7D4 - .string "I didn’t expect to lose this easily…\n" - .string "I’ll win next time!$" + .string "I didn't expect to lose this easily…\n" + .string "I'll win next time!$" Route121_Text_29F80D: @ 829F80D .string "That was total humiliation!\n" - .string "I won’t forget you…\l" + .string "I won't forget you…\l" .string "Hand over your POKéNAV!$" Route121_Text_29F855: @ 829F855 .string "I have this new routine.\n" .string "Defeat ten TRAINERS a day.\l" - .string "Guess what? You’re number ten!$" + .string "Guess what? You're number ten!$" Route121_Text_29F8A8: @ 829F8A8 - .string "Wait! That’s nasty!\n" + .string "Wait! That's nasty!\n" .string "I demand a rematch!$" Route121_Text_29F8D0: @ 829F8D0 - .string "An opponent I just can’t beat…\n" + .string "An opponent I just can't beat…\n" .string "Snivel…\l" - .string "I can’t believe this is happening…$" + .string "I can't believe this is happening…$" Route121_Text_29F91A: @ 829F91A - .string "Can’t you see that I have all this\n" + .string "Can't you see that I have all this\n" .string "stuff with me?\p" .string "Despite that, you still insist that\n" .string "we battle?$" Route121_Text_29F97B: @ 829F97B .string "Of course I lost!\n" - .string "I’m holding stuff in both hands!$" + .string "I'm holding stuff in both hands!$" Route121_Text_29F9AE: @ 829F9AE .string "I bought too much stuff at\n" .string "the LILYCOVE DEPT. STORE.\p" - .string "It’s up the road from here.\n" + .string "It's up the road from here.\n" .string "I wish I had a BAG like yours.$" Route121_Text_29FA1E: @ 829FA1E - .string "There’s nothing I love more than\n" - .string "checking out other people’s POKéMON!$" + .string "There's nothing I love more than\n" + .string "checking out other people's POKéMON!$" Route121_Text_29FA64: @ 829FA64 .string "Super awesome!$" Route121_Text_29FA73: @ 829FA73 - .string "They’re great, your POKéMON!\n" + .string "They're great, your POKéMON!\n" .string "How do you raise them?$" Route121_Text_29FAA7: @ 829FAA7 .string "I want everybody to see the POKéMON\n" - .string "I’ve raised!$" + .string "I've raised!$" Route121_Text_29FAD8: @ 829FAD8 .string "Wow!\n" @@ -3323,11 +3323,11 @@ Route121_Text_29FAD8: @ 829FAD8 Route121_Text_29FAEA: @ 829FAEA .string "I raise every POKéMON with the same\n" - .string "love and care--I don’t pick favorites.$" + .string "love and care--I don't pick favorites.$" Route121_Text_29FB35: @ 829FB35 .string "My POKéMON have never tasted defeat!\n" - .string "On their next win, I’m entering them\l" + .string "On their next win, I'm entering them\l" .string "in CONTESTS.$" Route121_Text_29FB8C: @ 829FB8C @@ -3339,7 +3339,7 @@ Route121_Text_29FBA8: @ 829FBA8 Route123_Text_29FBEB: @ 829FBEB .string "Want to determine how strong you are?\n" - .string "I’ll be the test!$" + .string "I'll be the test!$" Route123_Text_29FC23: @ 829FC23 .string "You passed with flying colors!$" @@ -3351,11 +3351,11 @@ Route123_Text_29FC42: @ 829FC42 Route123_Text_29FC6F: @ 829FC6F .string "You seem to have a big collection\n" .string "of GYM BADGES.\p" - .string "Let me see if you’re actually worthy of\n" + .string "Let me see if you're actually worthy of\n" .string "those BADGES!$" Route123_Text_29FCD6: @ 829FCD6 - .string "Oh, you’re worthy, all right!$" + .string "Oh, you're worthy, all right!$" Route123_Text_29FCF4: @ 829FCF4 .string "You did your BADGES proud in that\n" @@ -3370,12 +3370,12 @@ Route123_Text_29FD53: @ 829FD53 .string "I smell the bitter scent of misery…$" Route123_Text_29FD7B: @ 829FD7B - .string "The BERRY MASTER’s garden is filled\n" + .string "The BERRY MASTER's garden is filled\n" .string "with uplifting fragrances.$" Route123_Text_29FDBA: @ 829FDBA .string "Being a psychic is about willpower.\p" - .string "I’ve willed myself not to lose to\n" + .string "I've willed myself not to lose to\n" .string "anyone. That makes me strong!$" Route123_Text_29FE1E: @ 829FE1E @@ -3383,16 +3383,16 @@ Route123_Text_29FE1E: @ 829FE1E Route123_Text_29FE2A: @ 829FE2A .string "Being a psychic is about willpower.\n" - .string "I thought I wouldn’t lose to you…$" + .string "I thought I wouldn't lose to you…$" Route123_Text_29FE70: @ 829FE70 .string "I sense it!\n" .string "You and I shall battle again!\l" - .string "I can’t tell if I’ll win, though…\p" - .string "Let’s see your POKéNAV.$" + .string "I can't tell if I'll win, though…\p" + .string "Let's see your POKéNAV.$" Route123_Text_29FED4: @ 829FED4 - .string "I’ve convinced myself that I won’t\n" + .string "I've convinced myself that I won't\n" .string "lose anymore. That makes me strong!$" Route123_Text_29FF1B: @ 829FF1B @@ -3400,10 +3400,10 @@ Route123_Text_29FF1B: @ 829FF1B Route123_Text_29FF27: @ 829FF27 .string "I should train at MT. PYRE…\n" - .string "I’ll never beat you this way…$" + .string "I'll never beat you this way…$" Route123_Text_29FF61: @ 829FF61 - .string "Don’t be too happy if your POKéMON\n" + .string "Don't be too happy if your POKéMON\n" .string "develop psychic powers.\p" .string "You need to refine those powers to\n" .string "make them really useful.$" @@ -3413,7 +3413,7 @@ Route123_Text_29FFD8: @ 829FFD8 Route123_Text_29FFE5: @ 829FFE5 .string "We all have psychic powers.\n" - .string "We’ve just forgotten how to use them.$" + .string "We've just forgotten how to use them.$" Route123_Text_2A0027: @ 82A0027 .string "I would like to face you again.\n" @@ -3432,7 +3432,7 @@ Route123_Text_2A0099: @ 82A0099 Route123_Text_2A00D6: @ 82A00D6 .string "MIU: Hello, TRAINER. I hope your\n" - .string "POKéMON won’t cry when they lose.$" + .string "POKéMON won't cry when they lose.$" Route123_Text_2A0119: @ 82A0119 .string "MIU: Uh-oh, we lost.$" @@ -3442,23 +3442,23 @@ Route123_Text_2A012E: @ 82A012E .string "strong because you are friends.$" Route123_Text_2A016D: @ 82A016D - .string "MIU: It’s no fun to battle if you\n" - .string "don’t have two POKéMON.$" + .string "MIU: It's no fun to battle if you\n" + .string "don't have two POKéMON.$" Route123_Text_2A01A7: @ 82A01A7 .string "YUKI: Okay!\n" - .string "We’re beating the TRAINER’s POKéMON!$" + .string "We're beating the TRAINER's POKéMON!$" Route123_Text_2A01D8: @ 82A01D8 .string "YUKI: Uh-oh, we lost.$" Route123_Text_2A01EE: @ 82A01EE .string "YUKI: Why are you so strong?\n" - .string "We’ve never lost before.$" + .string "We've never lost before.$" Route123_Text_2A0224: @ 82A0224 - .string "YUKI: It’s no fun to battle if you\n" - .string "don’t have two POKéMON.$" + .string "YUKI: It's no fun to battle if you\n" + .string "don't have two POKéMON.$" Route123_Text_2A025F: @ 82A025F .string "MT. PYRE…\n" @@ -3475,7 +3475,7 @@ Route123_Text_2A02C1: @ 82A02C1 .string "soothes spirits…$" Route123_Text_2A0323: @ 82A0323 - .string "I’ll turn your lights out while\n" + .string "I'll turn your lights out while\n" .string "I rip through this tune!$" Route123_Text_2A035C: @ 82A035C @@ -3483,25 +3483,25 @@ Route123_Text_2A035C: @ 82A035C .string "I was still playing the intro!$" Route123_Text_2A0389: @ 82A0389 - .string "You’re rock steady.\n" - .string "I’d like to write a tune about you.$" + .string "You're rock steady.\n" + .string "I'd like to write a tune about you.$" Route123_Text_2A03C1: @ 82A03C1 .string "The next time, lend your ears to\n" .string "the full tune, will you?$" Route123_Text_2A03FB: @ 82A03FB - .string "Today’s the day I’m going to do it!\n" - .string "I’ll turn out your lights before\l" + .string "Today's the day I'm going to do it!\n" + .string "I'll turn out your lights before\l" .string "I finish singing my song!$" Route123_Text_2A045A: @ 82A045A .string "Hey, hold it!\n" - .string "I haven’t even hit the chorus!$" + .string "I haven't even hit the chorus!$" Route123_Text_2A0487: @ 82A0487 - .string "I thought you’d be so enthralled\n" - .string "by my tune, you’d lose.$" + .string "I thought you'd be so enthralled\n" + .string "by my tune, you'd lose.$" Route123_Text_2A04C0: @ 82A04C0 .string "This is my awesome BUG POKéMON!\n" @@ -3512,7 +3512,7 @@ Route123_Text_2A04FE: @ 82A04FE .string "You meanie!$" Route123_Text_2A0512: @ 82A0512 - .string "Don’t tell my brother I lost.\n" + .string "Don't tell my brother I lost.\n" .string "You have to keep it a secret!$" Route123_Text_2A054E: @ 82A054E @@ -3523,9 +3523,9 @@ Route123_Text_2A0592: @ 82A0592 .string "There goes my confidence…$" Route123_Text_2A05AC: @ 82A05AC - .string "They say that you can’t judge a person\n" + .string "They say that you can't judge a person\n" .string "by their appearance.\p" - .string "But often, their looks don’t lie…$" + .string "But often, their looks don't lie…$" Route123_Text_2A060A: @ 82A060A .string "Hello, child!\n" @@ -3537,13 +3537,13 @@ Route123_Text_2A0631: @ 82A0631 Route123_Text_2A0672: @ 82A0672 .string "Contribute to your allowance?\n" - .string "Wasn’t the prize money enough?$" + .string "Wasn't the prize money enough?$" Route123_Text_2A06AF: @ 82A06AF .string "I have to tell you, BIRD POKéMON\n" .string "are my obsession!\p" .string "Birds are cool!\n" - .string "They’re the best!$" + .string "They're the best!$" Route123_Text_2A0704: @ 82A0704 .string "Even in defeat, BIRD POKéMON are cool!$" @@ -3551,7 +3551,7 @@ Route123_Text_2A0704: @ 82A0704 Route123_Text_2A072B: @ 82A072B .string "I gather BIRD POKéMON feathers that\n" .string "scatter during battles.\p" - .string "I’m going to make a hat with\n" + .string "I'm going to make a hat with\n" .string "BIRD POKéMON feathers.$" Route123_Text_2A079B: @ 82A079B @@ -3563,19 +3563,19 @@ Route123_Text_2A07F0: @ 82A07F0 .string "I kind of like your POKéMON.$" Route123_Text_2A080D: @ 82A080D - .string "Hehe, I’m swiping your battling ideas!\n" - .string "I think they’ll make me better.$" + .string "Hehe, I'm swiping your battling ideas!\n" + .string "I think they'll make me better.$" Route123_Text_2A0854: @ 82A0854 .string "I lay in ambush, and a TRAINER has\n" .string "landed in my trap!$" Route123_Text_2A088A: @ 82A088A - .string "If you don’t lose, how am I supposed\n" + .string "If you don't lose, how am I supposed\n" .string "to have fun playing ninja?$" Route123_Text_2A08CA: @ 82A08CA - .string "I’m going to ambush a weaker-looking\n" + .string "I'm going to ambush a weaker-looking\n" .string "TRAINER next time.$" Route123_Text_2A0902: @ 82A0902 @@ -3583,7 +3583,7 @@ Route123_Text_2A0902: @ 82A0902 .string "My cuteness should be up by a third!$" Route123_Text_2A0943: @ 82A0943 - .string "You’re better than me by about\n" + .string "You're better than me by about\n" .string "five times!$" Route123_Text_2A096E: @ 82A096E @@ -3600,21 +3600,21 @@ Route124_Text_2A0A02: @ 82A0A02 Route124_Text_2A0A20: @ 82A0A20 .string "Many people lose their bearings at sea.\p" - .string "If you’re that sort, you should refer\n" - .string "to the POKéNAV’s MAP.$" + .string "If you're that sort, you should refer\n" + .string "to the POKéNAV's MAP.$" Route124_Text_2A0A84: @ 82A0A84 - .string "Hm! You’re riding a POKéMON instead\n" + .string "Hm! You're riding a POKéMON instead\n" .string "of swimming yourself…\p" .string "I am envious!$" Route124_Text_2A0ACC: @ 82A0ACC .string "Oh!\n" - .string "I can’t…$" + .string "I can't…$" Route124_Text_2A0AD9: @ 82A0AD9 - .string "I’m getting chilled…\n" - .string "I’ve been in the water too long…\p" + .string "I'm getting chilled…\n" + .string "I've been in the water too long…\p" .string "I wish I could ride a POKéMON like you…$" Route124_Text_2A0B37: @ 82A0B37 @@ -3623,7 +3623,7 @@ Route124_Text_2A0B37: @ 82A0B37 Route124_Text_2A0B7C: @ 82A0B7C .string "Oh, darn.\n" - .string "I’ve gone and lost.$" + .string "I've gone and lost.$" Route124_Text_2A0B9A: @ 82A0B9A .string "While swimming, I noticed that some\n" @@ -3632,7 +3632,7 @@ Route124_Text_2A0B9A: @ 82A0B9A .string "of their own.$" Route124_Text_2A0C14: @ 82A0C14 - .string "It’s only on a whim, but maybe I’ll get\n" + .string "It's only on a whim, but maybe I'll get\n" .string "you to register me in your POKéNAV.$" Route124_Text_2A0C60: @ 82A0C60 @@ -3640,15 +3640,15 @@ Route124_Text_2A0C60: @ 82A0C60 .string "TRAINERS challenge you!$" Route124_Text_2A0CA0: @ 82A0CA0 - .string "That’s strange…\n" + .string "That's strange…\n" .string "I lost again…$" Route124_Text_2A0CBE: @ 82A0CBE .string "This has nothing to do with anything,\n" - .string "but maybe I’ll visit the TRICK HOUSE.$" + .string "but maybe I'll visit the TRICK HOUSE.$" Route124_Text_2A0D0A: @ 82A0D0A - .string "I’m growing bored of swimming…\n" + .string "I'm growing bored of swimming…\n" .string "How about a battle?$" Route124_Text_2A0D3D: @ 82A0D3D @@ -3666,37 +3666,37 @@ Route124_Text_2A0DA0: @ 82A0DA0 Route124_Text_2A0DFF: @ 82A0DFF .string "Glub, glub, glub…\n" - .string "I’m sinking…$" + .string "I'm sinking…$" Route124_Text_2A0E1E: @ 82A0E1E .string "I have it on good authority that\n" - .string "there’s a DIVE spot around here.\p" + .string "there's a DIVE spot around here.\p" .string "It gives me the urge to go deep\n" .string "again…$" Route124_Text_2A0E87: @ 82A0E87 .string "LILA: Sigh…\p" - .string "Here I am in the sea, but who’s with me?\n" + .string "Here I am in the sea, but who's with me?\n" .string "My little brother!\p" - .string "Let’s battle so I won’t have to dwell\n" + .string "Let's battle so I won't have to dwell\n" .string "on that!$" Route124_Text_2A0EFE: @ 82A0EFE - .string "LILA: ROY! It’s your fault we lost!\n" - .string "You’re in for it later!$" + .string "LILA: ROY! It's your fault we lost!\n" + .string "You're in for it later!$" Route124_Text_2A0F3A: @ 82A0F3A .string "LILA: Sigh…\p" - .string "If only it wasn’t my little brother\n" + .string "If only it wasn't my little brother\n" .string "next to me, but a nice boyfriend…$" Route124_Text_2A0F8C: @ 82A0F8C - .string "LILA: You’re planning to battle us?\n" + .string "LILA: You're planning to battle us?\n" .string "Not unless you have two POKéMON.$" Route124_Text_2A0FD1: @ 82A0FD1 .string "ROY: My big sister is tough at POKéMON!\p" - .string "Don’t cry when you lose!$" + .string "Don't cry when you lose!$" Route124_Text_2A1012: @ 82A1012 .string "ROY: Uh-oh…\n" @@ -3705,7 +3705,7 @@ Route124_Text_2A1012: @ 82A1012 Route124_Text_2A103E: @ 82A103E .string "ROY: My big sister is really scary\n" .string "when she gets angry.\p" - .string "That’s why she doesn’t have a\n" + .string "That's why she doesn't have a\n" .string "boyfriend.$" Route124_Text_2A109F: @ 82A109F @@ -3718,28 +3718,28 @@ Route124_Text_2A10E5: @ 82A10E5 Route124_Text_2A111E: @ 82A111E .string "LILA: Sigh…\p" - .string "Here I am in the sea, but who’s with me?\n" + .string "Here I am in the sea, but who's with me?\n" .string "My little brother!\p" - .string "Oh, hi, it’s been a while. Let’s battle\n" - .string "so I won’t have to dwell on things!$" + .string "Oh, hi, it's been a while. Let's battle\n" + .string "so I won't have to dwell on things!$" Route124_Text_2A11B2: @ 82A11B2 .string "LILA: ROY!\n" - .string "It’s your fault we lost again!\p" - .string "We’re having a training session later!$" + .string "It's your fault we lost again!\p" + .string "We're having a training session later!$" Route124_Text_2A1203: @ 82A1203 .string "LILA: Sigh…\p" - .string "If I had a nice boyfriend, we’d beat\n" + .string "If I had a nice boyfriend, we'd beat\n" .string "anyone with lovely combinations…$" Route124_Text_2A1255: @ 82A1255 - .string "LILA: You’re planning to battle us?\n" + .string "LILA: You're planning to battle us?\n" .string "Not unless you have two POKéMON.$" Route124_Text_2A129A: @ 82A129A - .string "ROY: If we lose, I’ll catch heck.\n" - .string "I’m going to go totally all out!$" + .string "ROY: If we lose, I'll catch heck.\n" + .string "I'm going to go totally all out!$" Route124_Text_2A12DD: @ 82A12DD .string "ROY: Uh-oh…\n" @@ -3748,7 +3748,7 @@ Route124_Text_2A12DD: @ 82A12DD Route124_Text_2A130F: @ 82A130F .string "ROY: My big sister is really scary\n" .string "when she gets angry.\p" - .string "She’s going to make me train really\n" + .string "She's going to make me train really\n" .string "hard with POKéMON later…$" Route124_Text_2A1384: @ 82A1384 @@ -3758,11 +3758,11 @@ Route124_Text_2A1384: @ 82A1384 Route124_Text_2A13BD: @ 82A13BD .string "Here I am swimming by my lonesome\n" .string "on this wide, beautiful sea.\p" - .string "There’s no other word for it.\n" + .string "There's no other word for it.\n" .string "This is pathetic!$" Route124_Text_2A142C: @ 82A142C - .string "I’m feeling blue.\n" + .string "I'm feeling blue.\n" .string "Blue as the sky…$" Route124_Text_2A144F: @ 82A144F @@ -3770,11 +3770,11 @@ Route124_Text_2A144F: @ 82A144F .string "and invite them on a long swim.$" Route124_Text_2A148E: @ 82A148E - .string "I’m not going to lose to some\n" + .string "I'm not going to lose to some\n" .string "surfer TRAINER.$" Route124_Text_2A14BC: @ 82A14BC - .string "I’ve only got sweat in my eyes!\n" + .string "I've only got sweat in my eyes!\n" .string "I am not crying!$" Route124_Text_2A14ED: @ 82A14ED @@ -3800,15 +3800,15 @@ Route125_Text_2A15C7: @ 82A15C7 .string "I floundered…$" Route125_Text_2A15D5: @ 82A15D5 - .string "I was blown away by HORSEA’s charm,\n" + .string "I was blown away by HORSEA's charm,\n" .string "so I started swimming, too.$" Route125_Text_2A1615: @ 82A1615 - .string "I’m tired of swimming.\n" + .string "I'm tired of swimming.\n" .string "Are you up for a battle with me?$" Route125_Text_2A164D: @ 82A164D - .string "You’re too much!$" + .string "You're too much!$" Route125_Text_2A165E: @ 82A165E .string "Whew…\n" @@ -3822,42 +3822,42 @@ Route125_Text_2A16C5: @ 82A16C5 .string "Lost it…$" Route125_Text_2A16CE: @ 82A16CE - .string "Your power… You’re the real deal.\n" - .string "I’m amazed!$" + .string "Your power… You're the real deal.\n" + .string "I'm amazed!$" Route125_Text_2A16FC: @ 82A16FC - .string "Ahoy! I’m a buff, tough SAILOR!\n" - .string "I’ve braved the world’s seas!$" + .string "Ahoy! I'm a buff, tough SAILOR!\n" + .string "I've braved the world's seas!$" Route125_Text_2A173A: @ 82A173A .string "Gwrroooar!\n" - .string "I couldn’t win!$" + .string "I couldn't win!$" Route125_Text_2A1755: @ 82A1755 .string "The tide ebbs and flows inside the\n" .string "SHOAL CAVE.\p" - .string "By the way, it’s about six hours from\n" + .string "By the way, it's about six hours from\n" .string "high tide to low tide. Did you know?$" Route125_Text_2A17CF: @ 82A17CF .string "Register me in your POKéNAV,\n" - .string "and I’ll tell you something good.$" + .string "and I'll tell you something good.$" Route125_Text_2A180E: @ 82A180E - .string "It’s high time I get my payback\n" - .string "from you! Come on, we’re battling!$" + .string "It's high time I get my payback\n" + .string "from you! Come on, we're battling!$" Route125_Text_2A1851: @ 82A1851 - .string "I couldn’t win!\n" - .string "I flat out couldn’t win!$" + .string "I couldn't win!\n" + .string "I flat out couldn't win!$" Route125_Text_2A187A: @ 82A187A .string "The SHOAL CAVE…\p" - .string "There are places you can and can’t\n" + .string "There are places you can and can't\n" .string "get to depending on the rise and fall\l" .string "of the tide.\p" - .string "By the way, it’s about six hours from\n" - .string "high tide to low tide. Don’t forget!$" + .string "By the way, it's about six hours from\n" + .string "high tide to low tide. Don't forget!$" Route125_Text_2A192B: @ 82A192B .string "KIM: A funny old man lives in the\n" @@ -3869,15 +3869,15 @@ Route125_Text_2A1989: @ 82A1989 Route125_Text_2A19A6: @ 82A19A6 .string "KIM: A funny old man lives in the\n" - .string "SHOAL CAVE, doesn’t he?\p" - .string "Let’s go see him, IRIS!$" + .string "SHOAL CAVE, doesn't he?\p" + .string "Let's go see him, IRIS!$" Route125_Text_2A19F8: @ 82A19F8 .string "KIM: No, no, no! You need two POKéMON,\n" - .string "or it’s just no good!$" + .string "or it's just no good!$" Route125_Text_2A1A35: @ 82A1A35 - .string "IRIS: KIM, can you tell me what we’re\n" + .string "IRIS: KIM, can you tell me what we're\n" .string "looking for out here?$" Route125_Text_2A1A71: @ 82A1A71 @@ -3886,7 +3886,7 @@ Route125_Text_2A1A71: @ 82A1A71 Route125_Text_2A1A92: @ 82A1A92 .string "IRIS: KIM, are we really going into\n" .string "the SHOAL CAVE?\l" - .string "We’ll get all wet.$" + .string "We'll get all wet.$" Route125_Text_2A1AD9: @ 82A1AD9 .string "IRIS: Oh, we could never, ever do\n" @@ -3898,12 +3898,12 @@ Route125_Text_2A1B1A: @ 82A1B1A Route125_Text_2A1B4E: @ 82A1B4E .string "Okay.\n" - .string "I’ll tell you why I’m here.$" + .string "I'll tell you why I'm here.$" Route125_Text_2A1B70: @ 82A1B70 .string "I put a message in a bottle and put\n" .string "it out to sea.\p" - .string "I’m sure that a girl SWIMMER will\n" + .string "I'm sure that a girl SWIMMER will\n" .string "find it!$" Route125_Text_2A1BCE: @ 82A1BCE @@ -3911,7 +3911,7 @@ Route125_Text_2A1BCE: @ 82A1BCE .string "into the sea?$" Route125_Text_2A1BFD: @ 82A1BFD - .string "Oh, you weren’t throwing trash into\n" + .string "Oh, you weren't throwing trash into\n" .string "the sea.$" Route125_Text_2A1C2A: @ 82A1C2A @@ -3940,12 +3940,12 @@ Route126_Text_2A1D63: @ 82A1D63 .string "I was done in?$" Route126_Text_2A1D72: @ 82A1D72 - .string "I can’t find the entrance to\n" + .string "I can't find the entrance to\n" .string "SOOTOPOLIS. Where could it be?$" Route126_Text_2A1DAE: @ 82A1DAE .string "Ufufufufu!\n" - .string "I’m a mermaid!$" + .string "I'm a mermaid!$" Route126_Text_2A1DC8: @ 82A1DC8 .string "My fantasy burst as if it were a bubble!\n" @@ -3968,7 +3968,7 @@ Route126_Text_2A1E70: @ 82A1E70 Route126_Text_2A1EA5: @ 82A1EA5 .string "Check out this sculpted body!\n" - .string "I’m more cut than a BLACK BELT!$" + .string "I'm more cut than a BLACK BELT!$" Route126_Text_2A1EE3: @ 82A1EE3 .string "Whoops! Too strong!\n" @@ -3976,43 +3976,43 @@ Route126_Text_2A1EE3: @ 82A1EE3 Route126_Text_2A1F10: @ 82A1F10 .string "Losing to you stimulated my senses!\n" - .string "I’ll train myself and POKéMON harder!$" + .string "I'll train myself and POKéMON harder!$" Route126_Text_2A1F5A: @ 82A1F5A - .string "Yep, you’re not bad at all!\n" - .string "I’d like to get to know you more!$" + .string "Yep, you're not bad at all!\n" + .string "I'd like to get to know you more!$" Route126_Text_2A1F98: @ 82A1F98 .string "Check out this beautiful body!\n" - .string "I’m more shapely than a SWIMMER!$" + .string "I'm more shapely than a SWIMMER!$" Route126_Text_2A1FD8: @ 82A1FD8 .string "Whoops! Really too strong!\n" .string "Not bad! Not bad at all!$" Route126_Text_2A200C: @ 82A200C - .string "I’m going to train even harder!\n" - .string "You’re a great motivator!\l" + .string "I'm going to train even harder!\n" + .string "You're a great motivator!\l" .string "You have to come back again!$" Route126_Text_2A2063: @ 82A2063 - .string "I couldn’t even swim last year,\n" - .string "but now I’m a decent SWIMMER.\p" - .string "I think I’m capable of anything now.$" + .string "I couldn't even swim last year,\n" + .string "but now I'm a decent SWIMMER.\p" + .string "I think I'm capable of anything now.$" Route126_Text_2A20C6: @ 82A20C6 - .string "Sheesh, getting greedy didn’t do\n" + .string "Sheesh, getting greedy didn't do\n" .string "a thing for me.$" Route126_Text_2A20F7: @ 82A20F7 .string "If you practice at something,\n" .string "you will get better at it.\p" - .string "You’re young--don’t be afraid to\n" + .string "You're young--don't be afraid to\n" .string "try all sorts of things!$" Route126_Text_2A216A: @ 82A216A .string "If seawater gets up your nose,\n" - .string "doesn’t it feel terrible?$" + .string "doesn't it feel terrible?$" Route126_Text_2A21A3: @ 82A21A3 .string "Ack! Why, you…\n" @@ -4020,10 +4020,10 @@ Route126_Text_2A21A3: @ 82A21A3 Route126_Text_2A21B8: @ 82A21B8 .string "Ooh, I choked on some water!\n" - .string "It’s bitter! It’s salty!!$" + .string "It's bitter! It's salty!!$" Route126_Text_2A21EF: @ 82A21EF - .string "I’m throwing my whole heart\n" + .string "I'm throwing my whole heart\n" .string "into this!$" Route126_Text_2A2216: @ 82A2216 @@ -4031,7 +4031,7 @@ Route126_Text_2A2216: @ 82A2216 Route126_Text_2A222A: @ 82A222A .string "I need to cool down now…\n" - .string "I think I’ll go for a dive.$" + .string "I think I'll go for a dive.$" Route127_Text_2A225F: @ 82A225F .string "I can see it in your face.\n" @@ -4053,7 +4053,7 @@ Route127_Text_2A2315: @ 82A2315 .string "I hate losing!$" Route127_Text_2A232C: @ 82A232C - .string "If you have a rival, don’t you get the\n" + .string "If you have a rival, don't you get the\n" .string "feeling that you have to keep getting\l" .string "better?$" @@ -4071,14 +4071,14 @@ Route127_Text_2A240C: @ 82A240C .string "The line remains in the water…$" Route127_Text_2A2450: @ 82A2450 - .string "Whoops! Don’t tell me I snagged\n" + .string "Whoops! Don't tell me I snagged\n" .string "a SURFING POKéMON?$" Route127_Text_2A2483: @ 82A2483 - .string "I can’t keep up!$" + .string "I can't keep up!$" Route127_Text_2A2494: @ 82A2494 - .string "It’d be a handful if I hooked\n" + .string "It'd be a handful if I hooked\n" .string "your tough POKéMON!$" Route127_Text_2A24C6: @ 82A24C6 @@ -4086,11 +4086,11 @@ Route127_Text_2A24C6: @ 82A24C6 .string "a POKéMON fan and a fishing buff!$" Route127_Text_2A250B: @ 82A250B - .string "No! My line’s all tangled!\n" - .string "The party’s over!$" + .string "No! My line's all tangled!\n" + .string "The party's over!$" Route127_Text_2A2538: @ 82A2538 - .string "My fishing line’s doing a dance!\n" + .string "My fishing line's doing a dance!\n" .string "The tangle tango! Hahaha, snarl!$" Route127_Text_2A257A: @ 82A257A @@ -4101,7 +4101,7 @@ Route127_Text_2A25C1: @ 82A25C1 .string "Whew… I give up.$" Route127_Text_2A25D2: @ 82A25D2 - .string "There’re lots of diving spots in\n" + .string "There're lots of diving spots in\n" .string "the sea around here.\p" .string "You can spot them easily from the sky\n" .string "because of their darker color.$" @@ -4139,11 +4139,11 @@ Route127_Text_2A27D0: @ 82A27D0 .string "match.$" Route127_Text_2A27FC: @ 82A27FC - .string "You didn’t give me the chance to\n" + .string "You didn't give me the chance to\n" .string "do any strategizing.$" Route127_Text_2A2832: @ 82A2832 - .string "When I’m surrounded by the blue sea\n" + .string "When I'm surrounded by the blue sea\n" .string "and sky, it feels as if time slows down.$" Route128_Text_2A287F: @ 82A287F @@ -4159,25 +4159,25 @@ Route128_Text_2A28D7: @ 82A28D7 .string "but I will never give up!$" Route128_Text_2A2916: @ 82A2916 - .string "I know I’m not good now, but I think\n" + .string "I know I'm not good now, but I think\n" .string "I can win eventually.\p" .string "Please register me in your POKéNAV.$" Route128_Text_2A2975: @ 82A2975 - .string "I’m still feeling good. I’ll keep on\n" + .string "I'm still feeling good. I'll keep on\n" .string "swimming to EVER GRANDE CITY.$" Route128_Text_2A29B8: @ 82A29B8 - .string "I’ve yet to taste my first victory…$" + .string "I've yet to taste my first victory…$" Route128_Text_2A29DC: @ 82A29DC - .string "I’ll eventually reach EVER GRANDE CITY\n" + .string "I'll eventually reach EVER GRANDE CITY\n" .string "where I can eventually win…$" Route128_Text_2A2A1F: @ 82A2A1F .string "You have to swim, cycle, and then run\n" .string "a marathon in a triathlon.\p" - .string "It’s a grueling race that consists\n" + .string "It's a grueling race that consists\n" .string "of three events.$" Route128_Text_2A2A94: @ 82A2A94 @@ -4185,11 +4185,11 @@ Route128_Text_2A2A94: @ 82A2A94 Route128_Text_2A2AB7: @ 82A2AB7 .string "I have to ride a BIKE next, but…\n" - .string "I’m about to throw in the towel…$" + .string "I'm about to throw in the towel…$" Route128_Text_2A2AF9: @ 82A2AF9 .string "Well, I may as well make the best\n" - .string "of this. I’d like a rematch sometime.$" + .string "of this. I'd like a rematch sometime.$" Route128_Text_2A2B41: @ 82A2B41 .string "A triathlon is long. But I guess the\n" @@ -4205,23 +4205,23 @@ Route128_Text_2A2BDD: @ 82A2BDD .string "challenges on VICTORY ROAD.$" Route128_Text_2A2C1C: @ 82A2C1C - .string "We’ve been working so hard to mount\n" + .string "We've been working so hard to mount\n" .string "a POKéMON LEAGUE challenge…\p" - .string "We can’t afford to lose now!$" + .string "We can't afford to lose now!$" Route128_Text_2A2C79: @ 82A2C79 .string "Oh!\n" .string "How could this happen?!$" Route128_Text_2A2C95: @ 82A2C95 - .string "After all I’ve done to get here,\n" - .string "I won’t give up after one setback.$" + .string "After all I've done to get here,\n" + .string "I won't give up after one setback.$" Route128_Text_2A2CD9: @ 82A2CD9 .string "There is no stronger TRAINER than I!$" Route128_Text_2A2CFE: @ 82A2CFE - .string "This can’t be!$" + .string "This can't be!$" Route128_Text_2A2D0D: @ 82A2D0D .string "There probably is no stronger TRAINER\n" @@ -4233,15 +4233,15 @@ Route128_Text_2A2D3D: @ 82A2D3D .string "the move WATERFALL to crest the falls.$" Route128_Text_2A2DA9: @ 82A2DA9 - .string "I’m crestfallen!$" + .string "I'm crestfallen!$" Route128_Text_2A2DBA: @ 82A2DBA .string "Awww, phooey!\p" .string "My POKéMON knows WATERFALL, but\n" - .string "I don’t have the SOOTOPOLIS GYM BADGE!$" + .string "I don't have the SOOTOPOLIS GYM BADGE!$" Route128_Text_2A2E0F: @ 82A2E0F - .string "You’re looking awfully tough.\n" + .string "You're looking awfully tough.\n" .string "I wonder if I can win?$" Route128_Text_2A2E44: @ 82A2E44 @@ -4259,8 +4259,8 @@ Route128_Text_2A2EC8: @ 82A2EC8 .string "in this area.$" Route128_Text_2A2EFA: @ 82A2EFA - .string "I couldn’t see very well because of\n" - .string "the sun’s glare.$" + .string "I couldn't see very well because of\n" + .string "the sun's glare.$" Route128_Text_2A2F2F: @ 82A2F2F .string "I should go back soon.\n" @@ -4268,25 +4268,25 @@ Route128_Text_2A2F2F: @ 82A2F2F Route129_Text_2A2F66: @ 82A2F66 .string "This is my first triathlon.\n" - .string "I’m all tense and nervous!$" + .string "I'm all tense and nervous!$" Route129_Text_2A2F9D: @ 82A2F9D .string "Wroooaaar!\n" .string "I failed to win!$" Route129_Text_2A2FB9: @ 82A2FB9 - .string "If I’m all tensed up, I won’t be able to\n" + .string "If I'm all tensed up, I won't be able to\n" .string "give it my all.$" Route129_Text_2A2FF2: @ 82A2FF2 - .string "I’m in the middle of a triathlon,\n" - .string "but, sure, why don’t we battle?$" + .string "I'm in the middle of a triathlon,\n" + .string "but, sure, why don't we battle?$" Route129_Text_2A3034: @ 82A3034 - .string "I was sure I’d win!$" + .string "I was sure I'd win!$" Route129_Text_2A3048: @ 82A3048 - .string "Do you know what’s the greatest thing\n" + .string "Do you know what's the greatest thing\n" .string "about triathlons?\p" .string "Testing the limits of your own\n" .string "strength and endurance against\l" @@ -4294,52 +4294,52 @@ Route129_Text_2A3048: @ 82A3048 Route129_Text_2A30CD: @ 82A30CD .string "Say hey, hey!\n" - .string "Let’s get on with it!$" + .string "Let's get on with it!$" Route129_Text_2A30F1: @ 82A30F1 - .string "Beat, I’m beaten.\n" - .string "That’s it, done!$" + .string "Beat, I'm beaten.\n" + .string "That's it, done!$" Route129_Text_2A3114: @ 82A3114 - .string "There’s nothing for a loser.\n" + .string "There's nothing for a loser.\n" .string "Time for me to beat it home.$" Route129_Text_2A314E: @ 82A314E - .string "What’s the hurry?\n" - .string "Let’s take it slow and easy.$" + .string "What's the hurry?\n" + .string "Let's take it slow and easy.$" Route129_Text_2A317D: @ 82A317D .string "Oh, my.\n" .string "I wanted to relax a little more…$" Route129_Text_2A31A6: @ 82A31A6 - .string "Don’t you hate making mistakes when\n" - .string "you’re in a rush?\p" - .string "That’s why I try to take things\n" + .string "Don't you hate making mistakes when\n" + .string "you're in a rush?\p" + .string "That's why I try to take things\n" .string "slowly.$" Route129_Text_2A3204: @ 82A3204 - .string "Surfing isn’t as easy as it seems,\n" - .string "isn’t that right?$" + .string "Surfing isn't as easy as it seems,\n" + .string "isn't that right?$" Route129_Text_2A3239: @ 82A3239 - .string "Winning sure isn’t easy.$" + .string "Winning sure isn't easy.$" Route129_Text_2A3252: @ 82A3252 .string "You have your sights on the POKéMON\n" .string "LEAGUE? Keep at it!$" Route130_Text_2A328A: @ 82A328A - .string "What a surprise! I didn’t expect to\n" + .string "What a surprise! I didn't expect to\n" .string "see a TRAINER out in the sea.\p" .string "I think we should battle!$" Route130_Text_2A32E6: @ 82A32E6 - .string "This kid’s awfully tough…$" + .string "This kid's awfully tough…$" Route130_Text_2A3300: @ 82A3300 .string "Your eyes have that look of someone\n" - .string "who’s experienced harsh challenges\l" + .string "who's experienced harsh challenges\l" .string "and won. It suits you well!$" Route130_Text_2A3363: @ 82A3363 @@ -4353,24 +4353,24 @@ Route130_Text_2A33AC: @ 82A33AC .string "depths beyond belief.$" Route130_Text_2A33F5: @ 82A33F5 - .string "The world’s children dream\n" + .string "The world's children dream\n" .string "of one day becoming\l" .string "the POKéMON CHAMPION.$" Route130_Text_2A343A: @ 82A343A .string "Floating on the open sea like this…\n" - .string "It’s peaceful.$" + .string "It's peaceful.$" Route130_Text_2A346D: @ 82A346D .string "I needed to be a little less peaceful!$" Route130_Text_2A3494: @ 82A3494 .string "Swimming and battling like this…\n" - .string "I’m one happy guy…$" + .string "I'm one happy guy…$" Route131_Text_2A34C8: @ 82A34C8 .string "The sea is teeming with POKéMON.\n" - .string "It’s not easy swimming, I tell you.$" + .string "It's not easy swimming, I tell you.$" Route131_Text_2A350D: @ 82A350D .string "POKéMON raised by TRAINERS are\n" @@ -4378,56 +4378,56 @@ Route131_Text_2A350D: @ 82A350D Route131_Text_2A353D: @ 82A353D .string "Gasp… Gasp…\n" - .string "I’m wiped out…\p" - .string "The going’s easy. It’s the leaving\n" - .string "that’s the hard part.\p" + .string "I'm wiped out…\p" + .string "The going's easy. It's the leaving\n" + .string "that's the hard part.\p" .string "Will I have any energy left to make\n" .string "the return trip?$" Route131_Text_2A35C6: @ 82A35C6 .string "The sea… The sea… The sea…\n" .string "The sea as far as these eyes can see!\l" - .string "I’m sick and tired of the sea!$" + .string "I'm sick and tired of the sea!$" Route131_Text_2A3626: @ 82A3626 .string "Bleah!$" Route131_Text_2A362D: @ 82A362D .string "Bored I am by the sea, but swim I must.\p" - .string "I’m a born swimmer!\n" - .string "That’s what I am.$" + .string "I'm a born swimmer!\n" + .string "That's what I am.$" Route131_Text_2A367B: @ 82A367B .string "Hi, sweetie, wait!\n" .string "We should battle, you and I!$" Route131_Text_2A36AB: @ 82A36AB - .string "You’re tough in spite of the way\n" + .string "You're tough in spite of the way\n" .string "you look!$" Route131_Text_2A36D6: @ 82A36D6 .string "Did you see a guy over there who whines\n" - .string "that he’s bored of the sea?\p" - .string "That’s all talk.\n" - .string "He’s hopelessly in love with the sea!$" + .string "that he's bored of the sea?\p" + .string "That's all talk.\n" + .string "He's hopelessly in love with the sea!$" Route131_Text_2A3751: @ 82A3751 .string "Why do men love bathing suits so much?\p" .string "They all ogle me!$" Route131_Text_2A378A: @ 82A378A - .string "I’m out of my depth!$" + .string "I'm out of my depth!$" Route131_Text_2A379F: @ 82A379F - .string "Maybe it’s not my bathing suit that\n" + .string "Maybe it's not my bathing suit that\n" .string "makes men look. It must be my beauty!$" Route131_Text_2A37E9: @ 82A37E9 - .string "RELI: We’ll work together as siblings\n" + .string "RELI: We'll work together as siblings\n" .string "to take you on!$" Route131_Text_2A381F: @ 82A381F - .string "RELI: We couldn’t win even though we\n" + .string "RELI: We couldn't win even though we\n" .string "worked together…$" Route131_Text_2A3855: @ 82A3855 @@ -4436,29 +4436,29 @@ Route131_Text_2A3855: @ 82A3855 .string "the time they are born.$" Route131_Text_2A38B7: @ 82A38B7 - .string "RELI: You don’t have two POKéMON?\n" - .string "We can’t enjoy a battle, then.$" + .string "RELI: You don't have two POKéMON?\n" + .string "We can't enjoy a battle, then.$" Route131_Text_2A38F8: @ 82A38F8 - .string "IAN: I’m doing my best together with\n" + .string "IAN: I'm doing my best together with\n" .string "my sis!$" Route131_Text_2A3925: @ 82A3925 .string "IAN: I did my best with my sis,\n" - .string "but we still couldn’t win…$" + .string "but we still couldn't win…$" Route131_Text_2A3960: @ 82A3960 .string "IAN: You know how PACIFIDLOG is\n" .string "a floating town?\p" .string "So, wherever there is the sea,\n" - .string "that’s a part of PACIFIDLOG!$" + .string "that's a part of PACIFIDLOG!$" Route131_Text_2A39CD: @ 82A39CD .string "IAN: If you have two POKéMON,\n" - .string "we’ll take you on!$" + .string "we'll take you on!$" Route131_Text_2A39FE: @ 82A39FE - .string "If you can beat me, I’ll give you some\n" + .string "If you can beat me, I'll give you some\n" .string "great information!$" Route131_Text_2A3A38: @ 82A3A38 @@ -4467,8 +4467,8 @@ Route131_Text_2A3A38: @ 82A3A38 Route131_Text_2A3A48: @ 82A3A48 .string "There is an odd place nearby.\n" - .string "There’s a huge tower there.\l" - .string "Why don’t you go take a look?$" + .string "There's a huge tower there.\l" + .string "Why don't you go take a look?$" Route131_Text_2A3AA0: @ 82A3AA0 .string "The people of PACIFIDLOG are\n" @@ -4481,8 +4481,8 @@ Route131_Text_2A3AFC: @ 82A3AFC Route131_Text_2A3B02: @ 82A3B02 .string "Tch! …Oh, wait.\n" - .string "I’m not angry. Honestly!\p" - .string "But, boy, you’re strong!\n" + .string "I'm not angry. Honestly!\p" + .string "But, boy, you're strong!\n" .string "Hahaha!$" Route132_Text_2A3B4C: @ 82A3B4C @@ -4505,11 +4505,11 @@ Route132_Text_2A3C39: @ 82A3C39 .string "Oh, please, no!$" Route132_Text_2A3C49: @ 82A3C49 - .string "If I get swept away, I’ll lose all my\n" + .string "If I get swept away, I'll lose all my\n" .string "sense of place…$" Route132_Text_2A3C7F: @ 82A3C7F - .string "Win or lose, you’ll never know until\n" + .string "Win or lose, you'll never know until\n" .string "you try!$" Route132_Text_2A3CAD: @ 82A3CAD @@ -4517,8 +4517,8 @@ Route132_Text_2A3CAD: @ 82A3CAD .string "I sank in defeat!$" Route132_Text_2A3CC5: @ 82A3CC5 - .string "I never battle when I know I’ll win.\n" - .string "I like to battle at the razor’s edge of\l" + .string "I never battle when I know I'll win.\n" + .string "I like to battle at the razor's edge of\l" .string "victory and defeat!$" Route132_Text_2A3D26: @ 82A3D26 @@ -4531,54 +4531,54 @@ Route132_Text_2A3D6C: @ 82A3D6C Route132_Text_2A3D8B: @ 82A3D8B .string "Urggh…\n" - .string "You’re a POKéMON fanatic, aren’t you?\p" + .string "You're a POKéMON fanatic, aren't you?\p" .string "You must contemplate POKéMON 24 hours\n" - .string "a day, don’t you?$" + .string "a day, don't you?$" Route132_Text_2A3DF0: @ 82A3DF0 - .string "I’m always with my husband,\n" + .string "I'm always with my husband,\n" .string "but I can win even without him.$" Route132_Text_2A3E2C: @ 82A3E2C - .string "Oh, I guess I wasn’t good enough.$" + .string "Oh, I guess I wasn't good enough.$" Route132_Text_2A3E4E: @ 82A3E4E .string "That young man over there looks just\n" .string "like my husband when he was young.\p" - .string "He’s making me blush!$" + .string "He's making me blush!$" Route132_Text_2A3EAC: @ 82A3EAC - .string "Someone’s been watching me intently.\n" + .string "Someone's been watching me intently.\n" .string "Was it you?$" Route132_Text_2A3EDD: @ 82A3EDD .string "Wow!\n" - .string "That’s pretty strong, all right!$" + .string "That's pretty strong, all right!$" Route132_Text_2A3F03: @ 82A3F03 - .string "I can’t shake this feeling that\n" - .string "someone’s watching me.\p" - .string "I can’t concentrate!$" + .string "I can't shake this feeling that\n" + .string "someone's watching me.\p" + .string "I can't concentrate!$" Route132_Text_2A3F4F: @ 82A3F4F .string "Now where could my wife have gone?\n" - .string "I’m always with her.\l" + .string "I'm always with her.\l" .string "I wonder if I can win on my own.$" Route132_Text_2A3FA8: @ 82A3FA8 - .string "Ah, I see that I couldn’t manage\n" + .string "Ah, I see that I couldn't manage\n" .string "to win on my own after all.$" Route132_Text_2A3FE5: @ 82A3FE5 .string "My wife must be looking for me.\n" - .string "I’d best go find her right away.$" + .string "I'd best go find her right away.$" Route132_Text_2A4026: @ 82A4026 .string "I liked training here by myself.\n" - .string "It’s awful that all these people came!$" + .string "It's awful that all these people came!$" Route132_Text_2A406E: @ 82A406E - .string "Okay! I won’t complain about other\n" + .string "Okay! I won't complain about other\n" .string "people being here.$" Route132_Text_2A40A4: @ 82A40A4 @@ -4588,52 +4588,52 @@ Route132_Text_2A40A4: @ 82A40A4 Route133_Text_2A40F0: @ 82A40F0 .string "Did the currents carry you here, too?\n" .string "This must have been fated.\l" - .string "Let’s battle!$" + .string "Let's battle!$" Route133_Text_2A413F: @ 82A413F .string "Strong!\n" .string "Too much so!$" Route133_Text_2A4154: @ 82A4154 - .string "It’s just my luck that a tough TRAINER\n" + .string "It's just my luck that a tough TRAINER\n" .string "like you would drift here…\l" .string "I must be cursed…$" Route133_Text_2A41A8: @ 82A41A8 - .string "I’ve led a life of woe and misery…\n" - .string "I’ve been cast away, and this is where\l" - .string "I’ve drifted…$" + .string "I've led a life of woe and misery…\n" + .string "I've been cast away, and this is where\l" + .string "I've drifted…$" Route133_Text_2A4200: @ 82A4200 .string "Another loss…$" Route133_Text_2A420E: @ 82A420E .string "A life adrift…\n" - .string "I don’t want it anymore!$" + .string "I don't want it anymore!$" Route133_Text_2A4236: @ 82A4236 .string "Welcome!\n" - .string "I’ve been expecting you!$" + .string "I've been expecting you!$" Route133_Text_2A4258: @ 82A4258 .string "No! Please!$" Route133_Text_2A4264: @ 82A4264 .string "A strong child TRAINER…\n" - .string "That’s so annoying!$" + .string "That's so annoying!$" Route133_Text_2A4290: @ 82A4290 .string "I want to win like everyone else, but I\n" - .string "won’t raise POKéMON like everyone else.$" + .string "won't raise POKéMON like everyone else.$" Route133_Text_2A42E0: @ 82A42E0 .string "Darn it!\n" .string "My way is still too slack!$" Route133_Text_2A4304: @ 82A4304 - .string "It’s way more fun to do things the way\n" + .string "It's way more fun to do things the way\n" .string "I want than to be like everybody else.\l" - .string "I mean, that’s obvious!$" + .string "I mean, that's obvious!$" Route133_Text_2A436A: @ 82A436A .string "I came all the way out here with my\n" @@ -4641,15 +4641,15 @@ Route133_Text_2A436A: @ 82A436A Route133_Text_2A439C: @ 82A439C .string "You…\n" - .string "You’re stunningly cool!$" + .string "You're stunningly cool!$" Route133_Text_2A43B9: @ 82A43B9 - .string "I’d like to go back to FORTREE,\n" - .string "but I’ve grown to like this place, too.$" + .string "I'd like to go back to FORTREE,\n" + .string "but I've grown to like this place, too.$" Route133_Text_2A4401: @ 82A4401 .string "I must have battled thousands\n" - .string "of times. I’ve lost count.$" + .string "of times. I've lost count.$" Route133_Text_2A443A: @ 82A443A .string "I may have lost thousands of times,\n" @@ -4661,14 +4661,14 @@ Route133_Text_2A4477: @ 82A4477 Route133_Text_2A44BA: @ 82A44BA .string "Young people are too happy to go with\n" - .string "the flow. They’re without direction.$" + .string "the flow. They're without direction.$" Route133_Text_2A4505: @ 82A4505 .string "You have a firm sense of purpose.$" Route133_Text_2A4527: @ 82A4527 - .string "Don’t let others lead you astray.\n" - .string "Don’t lose direction as you grow older.$" + .string "Don't let others lead you astray.\n" + .string "Don't lose direction as you grow older.$" Route134_Text_2A4571: @ 82A4571 .string "Even those POKéMON that can swim are\n" @@ -4689,12 +4689,12 @@ Route134_Text_2A4643: @ 82A4643 .string "Oopsie!$" Route134_Text_2A464B: @ 82A464B - .string "There’s a collector who’s after\n" + .string "There's a collector who's after\n" .string "the SCALES of LUVDISC.$" Route134_Text_2A4682: @ 82A4682 - .string "Okeydokey! That’s enough rest, gang!\n" - .string "It’s time for a match!$" + .string "Okeydokey! That's enough rest, gang!\n" + .string "It's time for a match!$" Route134_Text_2A46BE: @ 82A46BE .string "Tuckered out again…$" @@ -4704,7 +4704,7 @@ Route134_Text_2A46D2: @ 82A46D2 .string "a long flight…$" Route134_Text_2A4709: @ 82A4709 - .string "You’re a POKéMON TRAINER.\n" + .string "You're a POKéMON TRAINER.\n" .string "No need for words. We battle now.$" Route134_Text_2A4745: @ 82A4745 @@ -4725,7 +4725,7 @@ Route134_Text_2A47E1: @ 82A47E1 Route134_Text_2A47FD: @ 82A47FD .string "We will return for more training at\n" .string "METEOR FALLS.\p" - .string "If you’d like, you should go, too.\n" + .string "If you'd like, you should go, too.\n" .string "It will definitely toughen you up!$" Route134_Text_2A4875: @ 82A4875 @@ -4737,7 +4737,7 @@ Route134_Text_2A489B: @ 82A489B .string "Please, stop! Please!$" Route134_Text_2A48BD: @ 82A48BD - .string "If we can’t SURF, how are we supposed\n" + .string "If we can't SURF, how are we supposed\n" .string "to get home?\p" .string "Actually, I know a fainted POKéMON\n" .string "can still SURF, but it feels wrong.$" @@ -4748,24 +4748,24 @@ Route134_Text_2A4937: @ 82A4937 Route134_Text_2A496B: @ 82A496B .string "I never knew such a technique existed!\n" - .string "You’ve defeated us thoroughly.$" + .string "You've defeated us thoroughly.$" Route134_Text_2A49B1: @ 82A49B1 - .string "I haven’t lost my passion for speed.\n" + .string "I haven't lost my passion for speed.\n" .string "I will try harder.$" Route134_Text_2A49E9: @ 82A49E9 - .string "My POKéMON can’t be taken down\n" + .string "My POKéMON can't be taken down\n" .string "easily!$" Route134_Text_2A4A10: @ 82A4A10 - .string "You’re kidding!\n" + .string "You're kidding!\n" .string "Explain how I lost!$" Route134_Text_2A4A34: @ 82A4A34 .string "Haha!\n" .string "You won, all right!\p" - .string "I’ll work my way back up by taking on\n" + .string "I'll work my way back up by taking on\n" .string "TRAINERS I happen to meet!$" Route134_Text_2A4A8F: @ 82A4A8F @@ -4773,9 +4773,9 @@ Route134_Text_2A4A8F: @ 82A4A8F .string "around here?$" Route134_Text_2A4AC1: @ 82A4AC1 - .string "Now, that’s something!$" + .string "Now, that's something!$" Route134_Text_2A4AD8: @ 82A4AD8 .string "Our boat drifted out to sea.\p" - .string "My buddy’s a timid fellow, so I’m\n" + .string "My buddy's a timid fellow, so I'm\n" .string "worried about him.$" diff --git a/data/text/tv.inc b/data/text/tv.inc index 9e339f8f6..f084ac055 100644 --- a/data/text/tv.inc +++ b/data/text/tv.inc @@ -1,8 +1,8 @@ LilycoveCity_ContestLobby_Text_27EF15: @ 827EF15 .string "Oh, hello! You were in a POKéMON\n" - .string "CONTEST, weren’t you?\l" - .string "It’s easy to tell from your POKéMON.\p" - .string "I’m a reporter. I’m working on a story\n" + .string "CONTEST, weren't you?\l" + .string "It's easy to tell from your POKéMON.\p" + .string "I'm a reporter. I'm working on a story\n" .string "on POKéMON CONTESTS.\p" .string "If I may, would you be willing to answer\n" .string "a few questions?$" @@ -15,24 +15,24 @@ LilycoveCity_ContestLobby_Text_27EFE7: @ 827EFE7 LilycoveCity_ContestLobby_Text_27F03E: @ 827F03E .string "Ah, I see.\n" - .string "That’s a very edifying comment.\p" + .string "That's a very edifying comment.\p" .string "You get a good feel for what\n" .string "the CONTEST was like.\p" - .string "I’ve got one last question.\p" + .string "I've got one last question.\p" .string "When you hear the word “{STR_VAR_2},â€\n" .string "what image do you get?$" LilycoveCity_ContestLobby_Text_27F0EC: @ 827F0EC .string "I see!\p" - .string "So that’s how you imagine the concept\n" + .string "So that's how you imagine the concept\n" .string "of “{STR_VAR_2}†to be.\p" .string "Thank you!\n" - .string "You’ve given me some good ideas.\p" + .string "You've given me some good ideas.\p" .string "I think I can write a good story on\n" .string "POKéMON CONTESTS now.\p" .string "Maybe, just maybe, this story will even\n" .string "make it to television.\l" - .string "I hope you’ll look forward to it!$" + .string "I hope you'll look forward to it!$" LilycoveCity_ContestLobby_Text_27F1EF: @ 827F1EF .string "Oh, too bad…\p" @@ -40,13 +40,13 @@ LilycoveCity_ContestLobby_Text_27F1EF: @ 827F1EF .string "please do share it with me.$" LilycoveCity_ContestLobby_Text_27F23F: @ 827F23F - .string "I’ll be looking forward to your next\n" + .string "I'll be looking forward to your next\n" .string "POKéMON CONTEST.$" gTVBravoTrainerText00:: @ 0827F275 .string "Yeah!\n" - .string "It’s BRAVO TRAINER time!\p" - .string "Today, we’re going to profile a POKéMON\n" + .string "It's BRAVO TRAINER time!\p" + .string "Today, we're going to profile a POKéMON\n" .string "belonging to {STR_VAR_1}.\p" .string "Now, this POKéMON boasts a {STR_VAR_3}\n" .string "Rank in the {STR_VAR_2} Category.$" @@ -68,28 +68,28 @@ gTVBravoTrainerText03:: @ 0827F3E4 .string "Asked about the CONTEST afterwards,\n" .string "{STR_VAR_1} happily replied with a huge\l" .string "grin, “{STR_VAR_2}!â€\p" - .string "Well, sure, {STR_VAR_1}’s POKéMON came in\n" + .string "Well, sure, {STR_VAR_1}'s POKéMON came in\n" .string "number {STR_VAR_3} in the CONTEST.\p" .string "That line perfectly suits {STR_VAR_1}\n" - .string "right now, I’d say!$" + .string "right now, I'd say!$" gTVBravoTrainerText04:: @ 0827F49F .string "Asked about the CONTEST afterwards,\n" .string "{STR_VAR_1} replied with a tinge of\l" .string "bitterness, “{STR_VAR_2}.â€\p" - .string "Well, sure, {STR_VAR_1}’s POKéMON came in\n" + .string "Well, sure, {STR_VAR_1}'s POKéMON came in\n" .string "number {STR_VAR_3} in the CONTEST.\p" - .string "{STR_VAR_1}’s disappointment comes across\n" - .string "loud and clear, I’d say!$" + .string "{STR_VAR_1}'s disappointment comes across\n" + .string "loud and clear, I'd say!$" gTVBravoTrainerText05:: @ 0827F565 - .string "Wouldn’t you also like to know what\n" + .string "Wouldn't you also like to know what\n" .string "{STR_VAR_1} imagines {STR_VAR_2} to be?\p" .string "You bet we did!\n" .string "So we asked, of course!\p" .string "The answer is all perfectly condensed:\n" .string "“{STR_VAR_3}!â€\p" - .string "That’s what the concept of {STR_VAR_2}\n" + .string "That's what the concept of {STR_VAR_2}\n" .string "represents to {STR_VAR_1}!$" gTVBravoTrainerText06:: @ 0827F624 @@ -102,16 +102,16 @@ gTVBravoTrainerText07:: @ 0827F65C .string "Bravo, {STR_VAR_2}!\p" .string "I hope we can count on seeing\n" .string "{STR_VAR_1} scale even greater heights!\p" - .string "That’s all the time we have!\n" + .string "That's all the time we have!\n" .string "Until next time, see you!$" gTVBravoTrainerText08:: @ 0827F6E6 - .string "Introducing the TRAINER’s {STR_VAR_1}!$" + .string "Introducing the TRAINER's {STR_VAR_1}!$" BattleFrontier_BattleTowerLobby_Text_27F704:: @ 0827F704 - .string "Hello! You’re the TRAINER who just had\n" + .string "Hello! You're the TRAINER who just had\n" .string "a battle, right?\p" - .string "I’m gathering interviews with TRAINERS\n" + .string "I'm gathering interviews with TRAINERS\n" .string "all over the place.\p" .string "May I get a few words from you about\n" .string "your impressions on battling?$" @@ -135,7 +135,7 @@ BattleFrontier_BattleTowerLobby_Text_27F8AE:: @ 0827F8AE .string "Well, of course!\p" .string "That unmistakable look of satisfaction\n" .string "on your face…\p" - .string "It’s obvious that you’ve had a great\n" + .string "It's obvious that you've had a great\n" .string "battle.$" BattleFrontier_BattleTowerLobby_Text_27F921:: @ 0827F921 @@ -151,25 +151,25 @@ BattleFrontier_BattleTowerLobby_Text_27F97A:: @ 0827F97A BattleFrontier_BattleTowerLobby_Text_27F9FD:: @ 0827F9FD .string "Oh, that is stunningly cool!\p" - .string "That’s a great line!\n" - .string "I hope you’ll do great next time, too.\p" + .string "That's a great line!\n" + .string "I hope you'll do great next time, too.\p" .string "I hope to see you again!$" BattleFrontier_BattleTowerLobby_Text_27FA6F:: @ 0827FA6F .string "Oh, I see…\p" .string "Still, being the silent type is also\n" - .string "cool, isn’t it?\p" - .string "I hope you’ll give me the opportunity\n" + .string "cool, isn't it?\p" + .string "I hope you'll give me the opportunity\n" .string "to share your thoughts again!$" BattleFrontier_BattleTowerLobby_Text_27FAF3:: @ 0827FAF3 - .string "I’ll be looking forward to your\n" + .string "I'll be looking forward to your\n" .string "next battle!$" gTVBravoTrainerBattleTowerText00:: @ 0827FB20 .string "Yeah!\n" - .string "It’s BRAVO TRAINER time!\p" - .string "Today, we’re going to profile {STR_VAR_1},\n" + .string "It's BRAVO TRAINER time!\p" + .string "Today, we're going to profile {STR_VAR_1},\n" .string "who took the BATTLE TOWER challenge!\p" .string "For the challenge, {STR_VAR_1} entered\n" .string "one wicked {STR_VAR_2}.$" @@ -183,14 +183,14 @@ gTVBravoTrainerBattleTowerText02:: @ 0827FC04 .string "The twosome finally succumbed to\n" .string "{STR_VAR_1} in match number {STR_VAR_2}.\l" .string "Nice try, TRAINER!\p" - .string "But, hey, it’s just bad luck to run into\n" + .string "But, hey, it's just bad luck to run into\n" .string "{STR_VAR_1} so early in the challenge.\p" .string "We asked the TRAINER for impressions\n" .string "on the match with {STR_VAR_1}.$" gTVBravoTrainerBattleTowerText03:: @ 0827FCD1 .string "The twosome won it all by defeating\n" - .string "{STR_VAR_1}’s {STR_VAR_2} thoroughly.\l" + .string "{STR_VAR_1}'s {STR_VAR_2} thoroughly.\l" .string "Bravo, TRAINER!\p" .string "Knocking off even {STR_VAR_1}…\n" .string "It defies belief! Simply astounding!\p" @@ -199,31 +199,31 @@ gTVBravoTrainerBattleTowerText03:: @ 0827FCD1 gTVBravoTrainerBattleTowerText04:: @ 0827FD91 .string "After a string of wins, the pair finally\n" - .string "succumbed to {STR_VAR_1}’s {STR_VAR_2},\l" + .string "succumbed to {STR_VAR_1}'s {STR_VAR_2},\l" .string "their final hurdle.\p" .string "Nice try, TRAINER!\p" .string "Still, you have to give credit.\n" - .string "You don’t see many famous combinations\l" + .string "You don't see many famous combinations\l" .string "like {STR_VAR_1} and {STR_VAR_2}.\p" .string "We asked the TRAINER for impressions\n" .string "on battling the celebrity pair.$" gTVBravoTrainerBattleTowerText05:: @ 0827FE93 .string "This is what the TRAINER had to say:\n" - .string "“I’m satisfied!â€\p" - .string "Now isn’t that a refreshing reply?\n" + .string "“I'm satisfied!â€\p" + .string "Now isn't that a refreshing reply?\n" .string "Bravo, TRAINER!\p" - .string "Isn’t it out-and-out awesome to be\n" + .string "Isn't it out-and-out awesome to be\n" .string "able to battle to full satisfaction?\p" .string "I found out exactly how satisfied\n" .string "when I heard the TRAINER say this:$" gTVBravoTrainerBattleTowerText06:: @ 0827FF89 .string "This is what the TRAINER had to say:\n" - .string "“I’m not satisfied…â€\p" + .string "“I'm not satisfied…â€\p" .string "Our TRAINER was obviously a little down\n" .string "when that was uttered.\p" - .string "Still, it’s not easy to be able to battle\n" + .string "Still, it's not easy to be able to battle\n" .string "with complete satisfaction, am I right?\p" .string "Anyway, I found out how dissatisfied\n" .string "our TRAINER was when I heard this:$" @@ -245,37 +245,37 @@ gTVBravoTrainerBattleTowerText11:: @ 082800B0 gTVBravoTrainerBattleTowerText12:: @ 082800B6 .string "“{STR_VAR_1}.â€\n" - .string "Now isn’t that great?\p" - .string "It really expresses {STR_VAR_2}’s joy,\n" - .string "I’d say.\p" + .string "Now isn't that great?\p" + .string "It really expresses {STR_VAR_2}'s joy,\n" + .string "I'd say.\p" .string "That battle with {STR_VAR_3} at the\n" - .string "end… It really was what you’d call\l" + .string "end… It really was what you'd call\l" .string "“{STR_VAR_1}â€!$" gTVBravoTrainerBattleTowerText13:: @ 0828013D .string "“{STR_VAR_1}.â€\n" - .string "Now isn’t that fitting?\p" + .string "Now isn't that fitting?\p" .string "That battle with {STR_VAR_3} at the\n" - .string "end… You can’t describe it as anything\l" + .string "end… You can't describe it as anything\l" .string "else but “{STR_VAR_1}â€!\p" - .string "{STR_VAR_2}’s disappointment comes across\n" - .string "loud and clear, I’d say!$" + .string "{STR_VAR_2}'s disappointment comes across\n" + .string "loud and clear, I'd say!$" gTVBravoTrainerBattleTowerText14:: @ 082801E6 .string "Bravo, {STR_VAR_1}!\n" .string "Bravo, {STR_VAR_2}!\p" .string "I hope we can count on seeing\n" .string "{STR_VAR_1} scale even greater heights!\p" - .string "That’s all the time we have!\n" + .string "That's all the time we have!\n" .string "Until next time, see you!$" SlateportCity_PokemonFanClub_Text_280270: @ 08280270 .string "Wow!\p" - .string "It’s plain to see that you lavish your\n" + .string "It's plain to see that you lavish your\n" .string "love on your {STR_VAR_1}.\p" - .string "Okay, it’s named {STR_VAR_2}.\p" + .string "Okay, it's named {STR_VAR_2}.\p" .string "Can I ask you a favor?\p" - .string "I’m a TV reporter, and I’m running\n" + .string "I'm a TV reporter, and I'm running\n" .string "a survey on POKéMON.\p" .string "Would you be willing to answer a few\n" .string "simple questions for me?$" @@ -316,15 +316,15 @@ SlateportCity_PokemonFanClub_Text_280523: @ 08280523 .string "Thanks for helping me out.\p" .string "It was fun and enlightening\n" .string "chatting with you.\p" - .string "It’s possible that our interview will\n" + .string "It's possible that our interview will\n" .string "end up on TV. Tune in and check!\p" - .string "Okay, that’s all.\n" + .string "Okay, that's all.\n" .string "Bye-bye!$" SlateportCity_PokemonFanClub_Text_2805E2: @ 082805E2 .string "Oh, okay…\p" .string "Well, if you get the urge to tell me\n" - .string "about POKéMON, I’ll be here!$" + .string "about POKéMON, I'll be here!$" SlateportCity_PokemonFanClub_Text_28062E: @ 0828062E .string "I enjoy this job--you get to learn\n" @@ -334,57 +334,57 @@ SlateportCity_PokemonFanClub_Text_280674: @ 08280674 .string "Hi, you seem to be very close to your\n" .string "{STR_VAR_1}.\p" .string "Do you know what?\n" - .string "I’m a TV reporter.\p" + .string "I'm a TV reporter.\p" .string "I travel around interviewing people\n" .string "about POKéMON.\p" - .string "I’m wondering if you’d be willing to tell\n" + .string "I'm wondering if you'd be willing to tell\n" .string "me a little about your {STR_VAR_1}?$" SlateportCity_PokemonFanClub_Text_28073B: @ 0828073B .string "Wow, thank you!\p" .string "Okay, then, please tell me anything\n" - .string "you’d like about your {STR_VAR_1}.$" + .string "you'd like about your {STR_VAR_1}.$" SlateportCity_PokemonFanClub_Text_280789: @ 08280789 .string "Wow…\n" - .string "That’s an interesting account.\p" + .string "That's an interesting account.\p" .string "You really are tight with {STR_VAR_1},\n" - .string "aren’t you?\p" + .string "aren't you?\p" .string "I get the feeling that your account\n" .string "will make a great TV story.\p" - .string "I promise that I’ll turn this into\n" + .string "I promise that I'll turn this into\n" .string "an entertaining show.\l" .string "Keep your eyes out for it.\p" - .string "Okay, that’s all.\n" + .string "Okay, that's all.\n" .string "Bye-bye!$" gTVFanClubOpinionsText00:: @ 08280886 .string "WE ARE THE POKéMON FAN CLUB!\p" - .string "We’re on the air!\p" + .string "We're on the air!\p" .string "On this program, we get your opinions,\n" .string "and I shout them out on your behalf!\l" - .string "Isn’t it a fantastic program concept?\p" + .string "Isn't it a fantastic program concept?\p" .string "Today, we bring you this report from\n" .string "our reporter, who we sent out to the\l" .string "POKéMON FAN CLUB.\p" - .string "So, just who is today’s featured\n" + .string "So, just who is today's featured\n" .string "POKéMON fan?\p" .string "… … … … … … … …\p" .string "{STR_VAR_1}!\p" - .string "So, let’s hear what {STR_VAR_1} has to\n" + .string "So, let's hear what {STR_VAR_1} has to\n" .string "say about {STR_VAR_3} the {STR_VAR_2}.\p" .string "And, I will shout those words of love\n" .string "out loud on TV!\p" .string "Hoo-hah!\p" - .string "Let’s shout!$" + .string "Let's shout!$" gTVFanClubOpinionsText01:: @ 08280A44 .string "We asked {STR_VAR_1}, “When you first\n" .string "laid eyes on your {STR_VAR_2}, what was\l" .string "your initial thought?â€\p" .string "“{STR_VAR_3}!â€\p" - .string "Yeahah! That’s a mighty fine shout!\p" - .string "Doesn’t it bring back memories of those\n" + .string "Yeahah! That's a mighty fine shout!\p" + .string "Doesn't it bring back memories of those\n" .string "days long gone by?$" gTVFanClubOpinionsText02:: @ 08280AFC @@ -393,54 +393,54 @@ gTVFanClubOpinionsText02:: @ 08280AFC .string "it would be…â€\p" .string "… … … … … … … …\p" .string "“{STR_VAR_3}!â€\p" - .string "Whoah-oh, now that’s an original idea!\p" + .string "Whoah-oh, now that's an original idea!\p" .string "You sure can sense the intensity of\n" .string "feeling the TRAINER has for\l" .string "{STR_VAR_2}.$" gTVFanClubOpinionsText03:: @ 08280BC4 - .string "And let’s see…\n" + .string "And let's see…\n" .string "What was it about that {STR_VAR_2}\l" .string "that so attracted {STR_VAR_1}?\p" .string "… … … … … … … …\p" .string "“{STR_VAR_3}!â€\p" .string "Whoa! Such a spectacular declaration!\p" - .string "The TRAINER’s love for the {STR_VAR_2}\n" + .string "The TRAINER's love for the {STR_VAR_2}\n" .string "comes across loud and clear!$" gTVFanClubOpinionsText04:: @ 08280C7A - .string "Hm? Oh, there’s still more.\n" - .string "Let’s check it out!\p" + .string "Hm? Oh, there's still more.\n" + .string "Let's check it out!\p" .string "Let me see, now…\p" .string "We asked {STR_VAR_1}, “What do POKéMON\n" .string "mean to you?â€\p" .string "… … … … … …\p" .string "“{STR_VAR_3}!â€\p" .string "Bravo!\p" - .string "That’s the best shout I’ve had all day!\p" + .string "That's the best shout I've had all day!\p" .string "“{STR_VAR_3}!â€\p" .string "It makes you want to shout it out loud\n" .string "again and again!\p" - .string "Now that we’ve had a great shout, it’s\n" + .string "Now that we've had a great shout, it's\n" .string "time to say good-bye until next time!\p" - .string "So, let’s all have one last shout!\n" + .string "So, let's all have one last shout!\n" .string "All together now…\p" .string "“{STR_VAR_3}!â€$" gTVFanClubText00:: @ 08280DEE .string "WE ARE THE POKéMON FAN CLUB!\p" - .string "We’re on the air!\p" - .string "Today, we’ll get rolling with the\n" + .string "We're on the air!\p" + .string "Today, we'll get rolling with the\n" .string "POKéMON SURVEY CORNER.\p" .string "Out of all the tales woven by POKéMON\n" .string "and TRAINERS, what startling new drama\l" .string "will grab our attention today?\p" .string "Let me see…\p" .string "This one!\p" - .string "We’ll start with this letter!\p" - .string "It’s a letter from {STR_VAR_1} about a\n" + .string "We'll start with this letter!\p" + .string "It's a letter from {STR_VAR_1} about a\n" .string "beloved {STR_VAR_2}.\p" - .string "Let’s see how passionately our writer\n" + .string "Let's see how passionately our writer\n" .string "can express love for the {STR_VAR_2}!\l" .string "Hmhm…$" @@ -458,7 +458,7 @@ gTVFanClubText03:: @ 08280FA9 gTVFanClubText04:: @ 08280FD5 .string "The bit “{STR_VAR_3},†that really\n" .string "accentuates emotional impact!\p" - .string "It’s a great letter that has real\n" + .string "It's a great letter that has real\n" .string "heartfelt depth!$" gTVFanClubText05:: @ 08281040 @@ -466,15 +466,15 @@ gTVFanClubText05:: @ 08281040 .string "I love how “{STR_VAR_3}†is used!$" gTVFanClubText06:: @ 08281073 - .string "By the way, and it’s not important,\n" + .string "By the way, and it's not important,\n" .string "but “{STR_VAR_3}†is a great saying.\p" - .string "I’ve been using “{STR_VAR_3}†a lot\n" + .string "I've been using “{STR_VAR_3}†a lot\n" .string "in conversations lately.$" gTVFanClubText07:: @ 082810E7 .string "If I had to score this letter,\n" - .string "I’d give it {STR_VAR_3} points.\p" - .string "Next time, I’ll be expecting an even\n" + .string "I'd give it {STR_VAR_3} points.\p" + .string "Next time, I'll be expecting an even\n" .string "better letter, {STR_VAR_1}!\p" .string "A-whoops, will you look at the time?\n" .string "Time to say good-bye until next time!$" @@ -482,16 +482,16 @@ gTVFanClubText07:: @ 082810E7 SlateportCity_OceanicMuseum_1F_Text_2811A0: @ 082811A0 .string "Oh?\n" .string "Do you perhaps like POKéMON?\p" - .string "I’m on assignment with the TV network.\p" - .string "I’m gathering stories on POKéMON and\n" + .string "I'm on assignment with the TV network.\p" + .string "I'm gathering stories on POKéMON and\n" .string "TRAINERS that occurred recently.\p" - .string "If you don’t mind, could you tell me\n" + .string "If you don't mind, could you tell me\n" .string "something about yourself?$" SlateportCity_OceanicMuseum_1F_Text_28126D: @ 0828126D - .string "I’m gathering stories on POKéMON and\n" + .string "I'm gathering stories on POKéMON and\n" .string "TRAINERS that occurred recently.\p" - .string "If you don’t mind, could you tell me\n" + .string "If you don't mind, could you tell me\n" .string "something about yourself?$" SlateportCity_OceanicMuseum_1F_Text_2812F2: @ 082812F2 @@ -508,18 +508,18 @@ SlateportCity_OceanicMuseum_1F_Text_281367: @ 08281367 SlateportCity_OceanicMuseum_1F_Text_2813B9: @ 082813B9 .string "Oh, what an uplifting story!\p" - .string "I’ll be sure to get your story told\n" + .string "I'll be sure to get your story told\n" .string "on television.\p" .string "It should be aired sometime, I think,\n" .string "so please look forward to it.$" SlateportCity_OceanicMuseum_1F_Text_28144D: @ 0828144D .string "Hmmm…\n" - .string "I’ve got a good story for a TV program.\p" - .string "I’d better write it up in a hurry!$" + .string "I've got a good story for a TV program.\p" + .string "I'd better write it up in a hurry!$" gTVRecentHappeningsText00:: @ 0828149E - .string "Hello, it’s time for RECENT HAPPENINGS.\p" + .string "Hello, it's time for RECENT HAPPENINGS.\p" .string "For POKéMON TRAINERS, every day\n" .string "is a storybook tale.\p" .string "What we want to do is to introduce you\n" @@ -527,14 +527,14 @@ gTVRecentHappeningsText00:: @ 0828149E .string "Today, we bring you the story\n" .string "of the TRAINER {STR_VAR_1}.\p" .string "What did {STR_VAR_1} experience recently?\n" - .string "Let’s find out.\p" - .string "Let’s see…$" + .string "Let's find out.\p" + .string "Let's see…$" gTVRecentHappeningsText01:: @ 082815AF - .string "Wasn’t that enlightening?\p" + .string "Wasn't that enlightening?\p" .string "The story gives you a clear idea of what\n" .string "{STR_VAR_1} has experienced recently.\l" - .string "It’s as if we were there as witnesses!$" + .string "It's as if we were there as witnesses!$" gTVRecentHappeningsText02:: @ 08281636 .string "“{STR_VAR_3}.†That\n" @@ -543,7 +543,7 @@ gTVRecentHappeningsText02:: @ 08281636 gTVRecentHappeningsText03:: @ 08281666 .string "“{STR_VAR_3}.â€\n" .string "That gives the tale a sense of place.\l" - .string "It lets us envision the tale’s setting.$" + .string "It lets us envision the tale's setting.$" gTVRecentHappeningsText04:: @ 082816BA .string "The “{STR_VAR_3}â€\n" @@ -552,29 +552,29 @@ gTVRecentHappeningsText04:: @ 082816BA gTVRecentHappeningsText05:: @ 082816EB .string "{STR_VAR_1} has recounted a wonderful\n" .string "tale involving POKéMON.\p" - .string "And now {STR_VAR_1}’s tale is indelibly\n" + .string "And now {STR_VAR_1}'s tale is indelibly\n" .string "etched into your soul, too.\p" - .string "That’s it for today.\n" + .string "That's it for today.\n" .string "Please tune in next time.$" gTVMassOutbreakText00:: @ 0828178A .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "We’ve just received word of a very\n" + .string "It's time for POKéMON NEWS.\p" + .string "We've just received word of a very\n" .string "rare occurrence.\p" .string "There have been reports of a mass\n" .string "outbreak of {STR_VAR_2} in the vicinity\l" .string "of {STR_VAR_1}.\p" - .string "{STR_VAR_2}, as you’re probably aware,\n" - .string "is known as a POKéMON that’s rare\l" + .string "{STR_VAR_2}, as you're probably aware,\n" + .string "is known as a POKéMON that's rare\l" .string "and hard to find.\p" .string "It sounds like a rare opportunity to\n" .string "see the mystifying outbreak of\l" .string "{STR_VAR_2} in the wild.\p" - .string "That’s the news on POKéMON NEWS.$" + .string "That's the news on POKéMON NEWS.$" gTV3CheersForPokeblocksText00:: @ 082818F4 - .string "MC: We hope you’re in good cheer,\n" + .string "MC: We hope you're in good cheer,\n" .string "“3 CHEERS FOR {POKEBLOCK}S†is here!\p" .string "Today, we examine the {POKEBLOCK} blended\n" .string "by {STR_VAR_1} and associates.\p" @@ -590,22 +590,22 @@ gTV3CheersForPokeblocksText01:: @ 082819C7 .string "Thank you so much, {STR_VAR_3}!$" gTV3CheersForPokeblocksText02:: @ 08281A2F - .string "{STR_VAR_1}’s blending performance\n" + .string "{STR_VAR_1}'s blending performance\n" .string "left something to be desired.\p" .string "If this TRAINER could blend better,\n" .string "the {POKEBLOCK} would be much tastier.$" gTV3CheersForPokeblocksText03:: @ 08281AAC .string "GULPIN: Gubi! Gubii!\p" - .string "MC: Hmm… It’s too {STR_VAR_1}.\n" + .string "MC: Hmm… It's too {STR_VAR_1}.\n" .string "GULPIN says it tastes “{STR_VAR_2}!â€\p" - .string "It looks like {STR_VAR_3}’s errors\n" + .string "It looks like {STR_VAR_3}'s errors\n" .string "hurt the blending quality…$" gTV3CheersForPokeblocksText04:: @ 08281B28 - .string "It’s too bad that {STR_VAR_1}’s\n" + .string "It's too bad that {STR_VAR_1}'s\n" .string "leading effort went to waste.\p" - .string "Let’s hope {STR_VAR_2} can turn in\n" + .string "Let's hope {STR_VAR_2} can turn in\n" .string "a better showing next time!$" gTV3CheersForPokeblocksText05:: @ 08281B93 @@ -614,11 +614,11 @@ gTV3CheersForPokeblocksText05:: @ 08281B93 LilycoveCity_PokemonTrainerFanClub_Text_281BCB:: @ 8281BCB .string "Hi, there!\p" - .string "I’m a big fan of {STR_VAR_1}.\n" - .string "What’s your opinion of {STR_VAR_1}?$" + .string "I'm a big fan of {STR_VAR_1}.\n" + .string "What's your opinion of {STR_VAR_1}?$" LilycoveCity_PokemonTrainerFanClub_Text_281C06:: @ 8281C06 - .string "I see, I see. That’s what you think\n" + .string "I see, I see. That's what you think\n" .string "about the TRAINER.$" LilycoveCity_PokemonTrainerFanClub_Text_281C3D:: @ 8281C3D @@ -626,8 +626,8 @@ LilycoveCity_PokemonTrainerFanClub_Text_281C3D:: @ 8281C3D .string "about {STR_VAR_1}?$" LilycoveCity_PokemonTrainerFanClub_Text_281C65:: @ 8281C65 - .string "I’m a big fan of {STR_VAR_1}.\n" - .string "What’s your opinion of {STR_VAR_1}?$" + .string "I'm a big fan of {STR_VAR_1}.\n" + .string "What's your opinion of {STR_VAR_1}?$" LilycoveCity_PokemonTrainerFanClub_Text_281C95:: @ 8281C95 .string "How strong would you rate {STR_VAR_1}\n" @@ -640,17 +640,17 @@ LilycoveCity_PokemonTrainerFanClub_Text_281CCD:: @ 8281CCD LilycoveCity_PokemonTrainerFanClub_Text_281CF5:: @ 8281CF5 .string "Oh, I see!\n" .string "You should meet {STR_VAR_1} sometime.\l" - .string "I’m sure you’ll become a fan, too!$" + .string "I'm sure you'll become a fan, too!$" LilycoveCity_PokemonTrainerFanClub_Text_281D40:: @ 8281D40 .string "I see, I see.\p" .string "Thank you!\n" - .string "That’s very useful to know.\p" - .string "I’ll share this information with other\n" + .string "That's very useful to know.\p" + .string "I'll share this information with other\n" .string "{STR_VAR_1} fans and discuss it.$" LilycoveCity_PokemonTrainerFanClub_Text_281DB4:: @ 8281DB4 - .string "There’s going to be a TV special on\n" + .string "There's going to be a TV special on\n" .string "{STR_VAR_1} very soon.\p" .string "I hope you catch it!$" @@ -670,7 +670,7 @@ gTVTrainerFanClubSpecialText00:: @ 08281DFB .string "What a perceptive opinion!\p" .string "“{STR_VAR_3} {STR_VAR_1}.â€\n" .string "It has such a nice ring to it!\p" - .string "{STR_VAR_2} also scored {STR_VAR_1}’s\n" + .string "{STR_VAR_2} also scored {STR_VAR_1}'s\n" .string "strength from 0 to 100.$" gTVTrainerFanClubSpecialText01:: @ 08281F90 @@ -687,13 +687,13 @@ gTVTrainerFanClubSpecialText02:: @ 08281FFA gTVTrainerFanClubSpecialText03:: @ 08282052 .string "The score was {STR_VAR_3} points!\n" - .string "That’s a rather weak score.\p" + .string "That's a rather weak score.\p" .string "{STR_VAR_2} must consider\n" .string "{STR_VAR_1} to be a mere sidekick.$" gTVTrainerFanClubSpecialText04:: @ 082820B2 .string "The score was {STR_VAR_3} point(s)!\n" - .string "That’s a terrible score.\p" + .string "That's a terrible score.\p" .string "{STR_VAR_2} must consider\n" .string "{STR_VAR_1} to be an underling.$" @@ -701,19 +701,19 @@ gTVTrainerFanClubSpecialText05:: @ 0828210E .string "There you have it, folks!\p" .string "I think we all learned something\n" .string "new about {STR_VAR_1}.\p" - .string "In closing, I’ll leave you with\n" - .string "{STR_VAR_2}’s words.\p" + .string "In closing, I'll leave you with\n" + .string "{STR_VAR_2}'s words.\p" .string "{STR_VAR_3} {STR_VAR_1}!$" gTVNameRaterText00:: @ 0828218A - .string "And now, it’s time for…\n" + .string "And now, it's time for…\n" .string "THE NAME RATER SHOW.\p" - .string "I tell your POKéMON’s fortune from\n" - .string "the nickname you’ve bestowed.\p" + .string "I tell your POKéMON's fortune from\n" + .string "the nickname you've bestowed.\p" .string "Advice is what I have to give, and it is\n" .string "helpful advice that I offer.\p" .string "Today, I shall do a reading of\n" - .string "the nickname {STR_VAR_3} of {STR_VAR_1}’s\l" + .string "the nickname {STR_VAR_3} of {STR_VAR_1}'s\l" .string "POKéMON {STR_VAR_2}.\p" .string "Hmhm…\p" .string "Hmm…\n" @@ -727,14 +727,14 @@ gTVNameRaterText01:: @ 0828229E gTVNameRaterText02:: @ 08282317 .string "A nickname that perfectly complements\n" - .string "{STR_VAR_1}, the TRAINER’s name.\p" + .string "{STR_VAR_1}, the TRAINER's name.\p" .string "It suggests that you will forge a fine\n" .string "partnership with precise timing.$" gTVNameRaterText03:: @ 0828239D .string "A nickname fit for a unique individual\n" .string "of a POKéMON!\p" - .string "If raised properly, this POKéMON’s\n" + .string "If raised properly, this POKéMON's\n" .string "uniqueness will bloom excessively!$" gTVNameRaterText04:: @ 08282418 @@ -764,7 +764,7 @@ gTVNameRaterText07:: @ 082825A1 gTVNameRaterText08:: @ 08282623 .string "An appealing nickname that should make\n" .string "the POKéMON very charming!\p" - .string "I don’t doubt that this POKéMON will be\n" + .string "I don't doubt that this POKéMON will be\n" .string "quite the charmer in POKéMON CONTESTS.$" gTVNameRaterText09:: @ 082826B4 @@ -787,7 +787,7 @@ gTVNameRaterText11:: @ 082827CB .string "“{STR_VAR_3}†is especially wonderful.$" gTVNameRaterText12:: @ 08282849 - .string "Let’s examine other examples of fine\n" + .string "Let's examine other examples of fine\n" .string "nicknames, shall we?$" gTVNameRaterText13:: @ 08282883 @@ -800,7 +800,7 @@ gTVNameRaterText14:: @ 082828E4 .string "quite well.$" gTVNameRaterText15:: @ 08282912 - .string "The POKéMON’s species name of\n" + .string "The POKéMON's species name of\n" .string "{STR_VAR_2} could be used as the basis\l" .string "for making the nickname {STR_VAR_1}{STR_VAR_3}.$" @@ -820,30 +820,30 @@ gTVNameRaterText18:: @ 08282A36 .string "a good nickname.\p" .string "I hope that the TRAINER will continue\n" .string "to treat {STR_VAR_1} with love.\p" - .string "That’s it for today’s show.\n" + .string "That's it for today's show.\n" .string "May we meet again.$" gTVPokemonAnglerText00:: @ 08282ACF .string "{STR_VAR_2} ANGLER\p" - .string "ANNOUNCER: Hello! Today, we’ll get tips\n" + .string "ANNOUNCER: Hello! Today, we'll get tips\n" .string "on fishing for {STR_VAR_2}.\p" .string "GURU, what advice can you give for\n" .string "catching {STR_VAR_2}?\p" .string "GURU: Hm? Catching {STR_VAR_2}?\n" .string "Well, let me tell you, be patient and\l" - .string "wait. That’s the bottom line.\p" + .string "wait. That's the bottom line.\p" .string "Do you see {STR_VAR_1} over there?\n" .string "That TRAINER makes a good example.\p" - .string "That TRAINER’s already had\n" + .string "That TRAINER's already had\n" .string "{STR_VAR_3} POKéMON get away.\p" .string "But there {STR_VAR_1} waits. No giving up.\n" - .string "That’s the law for catching {STR_VAR_2}.\p" + .string "That's the law for catching {STR_VAR_2}.\p" .string "ANNOUNCER: I see…\p" .string "Oh! {STR_VAR_1} has finally landed an\n" .string "elusive {STR_VAR_2}!\p" .string "The TRAINER appears close to tears\n" .string "out of sheer joy!\p" - .string "Seeing that elated look, I’m getting\n" + .string "Seeing that elated look, I'm getting\n" .string "the itch to go fishing, too!\p" .string "Viewers, why not take this as a cue to\n" .string "try some {STR_VAR_2} fishing?\p" @@ -852,7 +852,7 @@ gTVPokemonAnglerText00:: @ 08282ACF gTVPokemonAnglerText01:: @ 08282D7C .string "{STR_VAR_2} ANGLER\p" - .string "ANNOUNCER: Hello! Today, we’ll get tips\n" + .string "ANNOUNCER: Hello! Today, we'll get tips\n" .string "on fishing for {STR_VAR_2}.\p" .string "GURU, what advice can you give for\n" .string "catching {STR_VAR_2}?\p" @@ -861,11 +861,11 @@ gTVPokemonAnglerText01:: @ 08282D7C .string "ROD with vigor!\p" .string "Do you see {STR_VAR_1} over there?\n" .string "See how the ROD is handled?\p" - .string "That TRAINER’s already caught\n" + .string "That TRAINER's already caught\n" .string "{STR_VAR_3} in a row.\p" - .string "ANNOUNCER: It’s incredible!\n" + .string "ANNOUNCER: It's incredible!\n" .string "It looks like a storm…\p" - .string "Seeing technique of that caliber, I’m\n" + .string "Seeing technique of that caliber, I'm\n" .string "getting the itch to go fishing, too.\p" .string "Viewers, why not take this as a cue to\n" .string "try some {STR_VAR_2} fishing?\p" @@ -874,12 +874,12 @@ gTVPokemonAnglerText01:: @ 08282D7C gTVPokemonTodayFailedText00:: @ 08282F9B .string "Hello!\p" - .string "It’s time for POKéMON TODAY!\p" + .string "It's time for POKéMON TODAY!\p" .string "BIG SIS: Hi! Is everyone peachy and\n" .string "perky today?\p" - .string "Today, we’re going to look at {STR_VAR_1}’s\n" + .string "Today, we're going to look at {STR_VAR_1}'s\n" .string "POKéMON {STR_VAR_2}!\p" - .string "BIG BRO: Yeah! That’s what we’re going\n" + .string "BIG BRO: Yeah! That's what we're going\n" .string "to do!$" gTVPokemonTodayFailedText01:: @ 0828304D @@ -890,7 +890,7 @@ gTVPokemonTodayFailedText01:: @ 0828304D .string "BIG SIS: Oh, what did you see?\p" .string "BIG BRO: Well, I had to go on a trip to\n" .string "{STR_VAR_2}.\p" - .string "That’s when I happened to come across\n" + .string "That's when I happened to come across\n" .string "{STR_VAR_1}, who was trying to catch the\l" .string "POKéMON {STR_VAR_3}, but…$" @@ -899,7 +899,7 @@ gTVPokemonTodayFailedText02:: @ 08283135 .string "It ended up wasting this many\n" .string "POKé BALLS: {STR_VAR_2}!\p" .string "You should have seen the expression\n" - .string "of frustration on {STR_VAR_1}’s face when\l" + .string "of frustration on {STR_VAR_1}'s face when\l" .string "the POKéMON took off!$" gTVPokemonTodayFailedText03:: @ 082831DF @@ -908,17 +908,17 @@ gTVPokemonTodayFailedText03:: @ 082831DF .string "It ended up wasting this many\n" .string "POKé BALLS: {STR_VAR_2}!\p" .string "You should have seen the expression\n" - .string "of stunned dismay on {STR_VAR_1}’s face\l" + .string "of stunned dismay on {STR_VAR_1}'s face\l" .string "when the POKéMON fainted!$" gTVPokemonTodayFailedText04:: @ 08283294 .string "BIG SIS: Hey, there!\n" - .string "That’s not nice!\p" - .string "You shouldn’t be laughing at other\n" - .string "people’s misfortune!\p" + .string "That's not nice!\p" + .string "You shouldn't be laughing at other\n" + .string "people's misfortune!\p" .string "Oh, poor {STR_VAR_1}.\n" .string "What a shame!\p" - .string "BIG BRO: That’s true!\n" + .string "BIG BRO: That's true!\n" .string "Sorry for laughing.$" gTVPokemonTodayFailedText05:: @ 08283337 @@ -926,31 +926,31 @@ gTVPokemonTodayFailedText05:: @ 08283337 .string "BIG BRO: Hey!\n" .string "You just laughed, too!\p" .string "BIG SIS: Huh?!\p" - .string "I didn’t laugh!\n" - .string "Honestly, I didn’t!\p" + .string "I didn't laugh!\n" + .string "Honestly, I didn't!\p" .string "Oh, poor {STR_VAR_1}.\n" .string "What a shame!\p" .string "BIG BRO: …$" gTVPokemonTodayFailedText06:: @ 082833C6 - .string "BIG SIS: That’s enough silliness!\n" - .string "Let’s look at today’s POKéMON…\p" + .string "BIG SIS: That's enough silliness!\n" + .string "Let's look at today's POKéMON…\p" .string "Huh?\n" - .string "We’re out of time already?\p" + .string "We're out of time already?\p" .string "Aww!\n" - .string "We couldn’t profile a POKéMON today!\p" + .string "We couldn't profile a POKéMON today!\p" .string "BIG BRO: See you again next time!\p" - .string "BIG SIS: Hey, don’t end the show\n" + .string "BIG SIS: Hey, don't end the show\n" .string "without me!$" gTVPokemonTodaySuccessfulText00:: @ 082834A0 .string "Hello!\p" - .string "It’s time for POKéMON TODAY!\p" + .string "It's time for POKéMON TODAY!\p" .string "BIG SIS: Hi! Is everyone peachy and\n" .string "perky today?\p" - .string "Today, we’re going to look at {STR_VAR_1}’s\n" + .string "Today, we're going to look at {STR_VAR_1}'s\n" .string "POKéMON {STR_VAR_2}!\p" - .string "BIG BRO: Yeah! That’s what we’re going\n" + .string "BIG BRO: Yeah! That's what we're going\n" .string "to do!$" gTVPokemonTodaySuccessfulText01:: @ 08283552 @@ -971,16 +971,16 @@ gTVPokemonTodaySuccessfulText03:: @ 0828361F .string "{STR_VAR_1} and the {STR_VAR_2} together!$" gTVPokemonTodaySuccessfulText04:: @ 08283685 - .string "BIG SIS: Wow! That’s so neat!\p" + .string "BIG SIS: Wow! That's so neat!\p" .string "But you know what they say, a POKéMON\n" .string "that takes a lot of effort to catch\l" .string "earns the love of its TRAINER!$" gTVPokemonTodaySuccessfulText05:: @ 0828370C - .string "BIG SIS: {STR_VAR_1}’s {STR_VAR_2} is a\n" + .string "BIG SIS: {STR_VAR_1}'s {STR_VAR_2} is a\n" .string "memorable POKéMON because it took an\l" .string "invaluable MASTER BALL to catch!\p" - .string "BIG BRO: Wow! That’s mega-awesome!\p" + .string "BIG BRO: Wow! That's mega-awesome!\p" .string "BIG SIS: {STR_VAR_1} must have really\n" .string "wanted that {STR_VAR_2}, for sure!$" @@ -988,18 +988,18 @@ gTVPokemonTodaySuccessfulText06:: @ 082837C2 .string "BIG BRO: Then to give the nickname\n" .string "{STR_VAR_3} to that {STR_VAR_2}…\p" .string "You really get a good idea about\n" - .string "{STR_VAR_1}’s TRAINER sense.\p" + .string "{STR_VAR_1}'s TRAINER sense.\p" .string "BIG SIS: I second that notion!$" gTVPokemonTodaySuccessfulText07:: @ 08283848 - .string "If it were me, I’d give that nickname\n" + .string "If it were me, I'd give that nickname\n" .string "to something like this {STR_VAR_3}!\p" .string "BIG BRO: Whoa! That could be the start\n" .string "of something new!$" gTVPokemonTodaySuccessfulText08:: @ 082838C2 .string "{STR_VAR_2} the {STR_VAR_1}?\n" - .string "Doesn’t that sound perfect?\p" + .string "Doesn't that sound perfect?\p" .string "The letters and everything--they\n" .string "sound just right for the POKéMON\l" .string "{STR_VAR_1}!\p" @@ -1017,7 +1017,7 @@ gTVPokemonTodaySuccessfulText10:: @ 082839EA .string "The next time I catch a POKéMON,\n" .string "I should give it the name {STR_VAR_2}.\p" .string "BIG BRO: Huh? Me, too!\n" - .string "I’ll use the nickname {STR_VAR_2}, too!$" + .string "I'll use the nickname {STR_VAR_2}, too!$" gTVPokemonTodaySuccessfulText11:: @ 08283A5F .string "BIG SIS: Oh, no!\n" @@ -1029,18 +1029,18 @@ gTVPokemonTodaySuccessfulText11:: @ 08283A5F gTVTodaysSmartShopperText00:: @ 08283B05 .string "Hello!\p" - .string "It’s time for TODAY’S SMART SHOPPER.\p" + .string "It's time for TODAY'S SMART SHOPPER.\p" .string "INTERVIEWER: How are you, viewers?\p" - .string "Today we’re visiting a shop\n" + .string "Today we're visiting a shop\n" .string "in {STR_VAR_2}.\p" - .string "Let’s check on what the hot sellers\n" + .string "Let's check on what the hot sellers\n" .string "have been recently.$" gTVTodaysSmartShopperText01:: @ 08283BAF - .string "Let’s interview the clerk to get the\n" + .string "Let's interview the clerk to get the\n" .string "lowdown.\p" - .string "Hi, how’s your business?\p" - .string "CLERK: Oh, we’re doing excellent.\p" + .string "Hi, how's your business?\p" + .string "CLERK: Oh, we're doing excellent.\p" .string "Recently, {STR_VAR_2} has been\n" .string "selling especially strongly.\p" .string "Why, just the other day a TRAINER\n" @@ -1048,7 +1048,7 @@ gTVTodaysSmartShopperText01:: @ 08283BAF gTVTodaysSmartShopperText02:: @ 08283C81 .string "INTERVIEWER: The TRAINER bought\n" - .string "{STR_VAR_3} {STR_VAR_2}S? That’s a haul!\p" + .string "{STR_VAR_3} {STR_VAR_2}S? That's a haul!\p" .string "If I may say so, {STR_VAR_1} must have\n" .string "been stocking up for a long journey\l" .string "to far-off places.\p" @@ -1059,12 +1059,12 @@ gTVTodaysSmartShopperText03:: @ 08283D32 .string "INTERVIEWER: Speaking of the item\n" .string "{STR_VAR_2}, I just bought {STR_VAR_3} of\l" .string "them recently.\p" - .string "After all, {STR_VAR_2}’s a great item!$" + .string "After all, {STR_VAR_2}'s a great item!$" gTVTodaysSmartShopperText04:: @ 08283D99 .string "INTERVIEWER: {STR_VAR_2}?!\n" .string "But {STR_VAR_3} of them?!\p" - .string "I didn’t think there would be anyone\n" + .string "I didn't think there would be anyone\n" .string "buying that many.\p" .string "My goodness, I can only afford one or\n" .string "two at a time…$" @@ -1077,13 +1077,13 @@ gTVTodaysSmartShopperText05:: @ 08283E28 .string "Since then, I only buy strictly what\n" .string "I absolutely need…\p" .string "Oops!\p" - .string "There’s no point talking about me!$" + .string "There's no point talking about me!$" gTVTodaysSmartShopperText06:: @ 08283F01 .string "CLERK: {STR_VAR_1} also bought the item\n" .string "{STR_VAR_2} in bulk, taking {STR_VAR_3}.\p" - .string "INTERVIEWER: Oh, that’s smart.\n" - .string "{STR_VAR_2}’s a very good item, too.$" + .string "INTERVIEWER: Oh, that's smart.\n" + .string "{STR_VAR_2}'s a very good item, too.$" gTVTodaysSmartShopperText07:: @ 08283F72 .string "CLERK: And, the TRAINER also bought\n" @@ -1091,15 +1091,15 @@ gTVTodaysSmartShopperText07:: @ 08283F72 gTVTodaysSmartShopperText08:: @ 08283FA9 .string "CLERK: Plus, it was during a big sale.\n" - .string "That’s smart shopping.$" + .string "That's smart shopping.$" gTVTodaysSmartShopperText09:: @ 08283FE7 .string "INTERVIEWER: Hmm… {STR_VAR_1} sounds like\n" .string "quite the shrewd bargain hunter!\p" - .string "In total, {STR_VAR_1}’s purchases came to…\p" + .string "In total, {STR_VAR_1}'s purchases came to…\p" .string "Â¥{STR_VAR_2}?!\n" .string "What an amazing sum!\p" - .string "Oops! We’re out of time!\n" + .string "Oops! We're out of time!\n" .string "See you on our next broadcast!$" gTVTodaysSmartShopperText10:: @ 0828409E @@ -1107,18 +1107,18 @@ gTVTodaysSmartShopperText10:: @ 0828409E .string "no doubt about it.$" gTVTodaysSmartShopperText11:: @ 082840CE - .string "Let’s interview the clerk to get the\n" + .string "Let's interview the clerk to get the\n" .string "lowdown.\p" - .string "Hi, how’s your business?\p" - .string "CLERK: Oh, we’re doing unbelievable\n" - .string "business. It’s almost overwhelming.\p" + .string "Hi, how's your business?\p" + .string "CLERK: Oh, we're doing unbelievable\n" + .string "business. It's almost overwhelming.\p" .string "Recently, a TRAINER named {STR_VAR_1}\n" .string "bought the item {STR_VAR_2} in bulk.\p" .string "The TRAINER almost cleared out our\n" .string "entire stock of {STR_VAR_2}S.\p" .string "I never dreamt that any customer\n" .string "would ever need so many {STR_VAR_2}S.\l" - .string "It’s just unheard of!\p" + .string "It's just unheard of!\p" .string "INTERVIEWER: So that would be like 100\n" .string "or 200 sold?\p" .string "CLERK: Oh, no, much more than that!\p" @@ -1145,7 +1145,7 @@ gTVWorldOfMastersText00:: @ 082843BA .string "named {STR_VAR_1}.\p" .string "{STR_VAR_1} is famous as a master at\n" .string "catching POKéMON.\p" - .string "{STR_VAR_1}’s quest for POKéMON depends\n" + .string "{STR_VAR_1}'s quest for POKéMON depends\n" .string "entirely on a careful search on foot.\p" .string "On one memorable day, the TRAINER\n" .string "walked some {STR_VAR_2} steps.\p" @@ -1158,42 +1158,42 @@ gTVWorldOfMastersText01:: @ 082844FD .string "the TRAINER and {STR_VAR_1}.$" gTVWorldOfMastersText02:: @ 0828455B - .string "The master caught the day’s last\n" + .string "The master caught the day's last\n" .string "{STR_VAR_3} near {STR_VAR_2}.\p" .string "That POKéMON apparently enjoys\n" .string "a special status as a record holder.\p" .string "Skilled TRAINERS should be encouraged\n" .string "to challenge this fine record.\p" - .string "That’s all for today.\n" + .string "That's all for today.\n" .string "Please tune in next time.$" gTVTodaysRivalTrainerText00:: @ 08284641 - .string "TODAY’S RIVAL TRAINER!\p" + .string "TODAY'S RIVAL TRAINER!\p" .string "Hello, fellow POKéMON TRAINERS!\n" .string "How are we all doing today?\p" .string "Today, like every other day,\n" - .string "we’ll examine one of our rivals!$" + .string "we'll examine one of our rivals!$" gTVTodaysRivalTrainerText07:: @ 082846D2 - .string "Today’s rival TRAINER is {STR_VAR_1},\n" - .string "who’s around {STR_VAR_3} now.\p" + .string "Today's rival TRAINER is {STR_VAR_1},\n" + .string "who's around {STR_VAR_3} now.\p" .string "{STR_VAR_1} has so far registered\n" .string "{STR_VAR_2} POKéMON in the POKéDEX.$" gTVTodaysRivalTrainerText08:: @ 08284738 - .string "Today’s rival TRAINER is {STR_VAR_1},\n" - .string "who’s in a SECRET BASE now.\p" + .string "Today's rival TRAINER is {STR_VAR_1},\n" + .string "who's in a SECRET BASE now.\p" .string "{STR_VAR_1} has so far registered\n" .string "{STR_VAR_2} POKéMON in the POKéDEX.$" gTVTodaysRivalTrainerText09:: @ 082847A5 - .string "Today’s rival TRAINER is {STR_VAR_1}.\p" + .string "Today's rival TRAINER is {STR_VAR_1}.\p" .string "So far, {STR_VAR_1} has registered\n" .string "{STR_VAR_2} POKéMON in the POKéDEX.$" gTVTodaysRivalTrainerText10:: @ 082847F7 - .string "Today’s rival TRAINER is {STR_VAR_1},\n" - .string "who’s on a ferry now.\p" + .string "Today's rival TRAINER is {STR_VAR_1},\n" + .string "who's on a ferry now.\p" .string "{STR_VAR_1} has so far registered\n" .string "{STR_VAR_2} POKéMON in the POKéDEX.$" @@ -1204,15 +1204,15 @@ gTVTodaysRivalTrainerText01:: @ 0828485F .string "have? The number is {STR_VAR_1}!$" gTVTodaysRivalTrainerText02:: @ 0828489A - .string "But our rival hasn’t obtained\n" + .string "But our rival hasn't obtained\n" .string "a single BADGE yet!$" gTVTodaysRivalTrainerText03:: @ 082848CC - .string "Our rival hasn’t obtained a single\n" + .string "Our rival hasn't obtained a single\n" .string "BATTLE FRONTIER Symbol yet.$" gTVTodaysRivalTrainerText04:: @ 0828490B - .string "Let’s see how many BATTLE FRONTIER\n" + .string "Let's see how many BATTLE FRONTIER\n" .string "Symbols our rival has.\p" .string "Gold Symbols: {STR_VAR_1}!\n" .string "Silver Symbols: {STR_VAR_2}!$" @@ -1226,20 +1226,20 @@ gTVTodaysRivalTrainerText06:: @ 082849AE .string "comparison to {STR_VAR_1}?\p" .string "The adventure rolls on!\p" .string "Fellow TRAINERS!\p" - .string "Let’s all keep moving forward\n" + .string "Let's all keep moving forward\n" .string "and ahead of our rivals!$" gTVDewfordTrendWatcherNetworkText00:: @ 08284A3E .string "DEWFORD TREND-WATCHER NETWORK!\p" .string "MC: Wassup?\n" - .string "We’ll keep it real with the latest on\l" - .string "what’s hip and happening in DEWFORD.\p" + .string "We'll keep it real with the latest on\l" + .string "what's hip and happening in DEWFORD.\p" .string "Our guest today is this old cat whose\n" .string "claim to fame is being the authority\l" .string "on all things in DEWFORD.\p" .string "Old man: Glad to be here.\p" - .string "MC: Let’s cut to the chase, right on.\p" - .string "What’s your word on what’s groovin’\n" + .string "MC: Let's cut to the chase, right on.\p" + .string "What's your word on what's groovin'\n" .string "the good folks of DEWFORD?\p" .string "Old man: {STR_VAR_1} {STR_VAR_2}.\p" .string "MC: {STR_VAR_1} {STR_VAR_2},\n" @@ -1249,7 +1249,7 @@ gTVDewfordTrendWatcherNetworkText00:: @ 08284A3E .string "did get popular at all.\p" .string "Would you like to hear about it?\p" .string "MC: Uh, no. What we want to know is\n" - .string "what’s the in thing of the moment…$" + .string "what's the in thing of the moment…$" gTVDewfordTrendWatcherNetworkText01:: @ 08284C55 .string "Old man: {STR_VAR_1} {STR_VAR_2}\n" @@ -1268,9 +1268,9 @@ gTVDewfordTrendWatcherNetworkText03:: @ 08284CE1 .string "I tried teaching everyone the best\n" .string "I could, but…\p" .string "Perhaps the {STR_VAR_1} part just\n" - .string "wasn’t right…\p" + .string "wasn't right…\p" .string "MC: Uh, excuse me, compadre, I need\n" - .string "to hear about what’s in now…$" + .string "to hear about what's in now…$" gTVDewfordTrendWatcherNetworkText04:: @ 08284DB6 .string "Old man: {STR_VAR_3}!\n" @@ -1286,7 +1286,7 @@ gTVDewfordTrendWatcherNetworkText06:: @ 08284E34 .string "MC: …Uh… So, there you have it,\n" .string "all you trendy, hep cats out there!\p" .string "{STR_VAR_1} {STR_VAR_2}…uh…\n" - .string "Didn’t get hip or happening in DEWFORD!\p" + .string "Didn't get hip or happening in DEWFORD!\p" .string "My time is up. Catch you on the fly!\p" .string "Old man: {STR_VAR_1} {STR_VAR_2}!$" @@ -1294,13 +1294,13 @@ gTVHoennTreasureInvestigatorsText00:: @ 08284EDF .string "HOENN TREASURE INVESTIGATORS!\p" .string "Hi, gang!\n" .string "Score any secret items lately?\p" - .string "As always, we’ll examine eyewitness\n" + .string "As always, we'll examine eyewitness\n" .string "reports of secrets from all over!\p" - .string "Let’s start with a letter.\n" + .string "Let's start with a letter.\n" .string "It says, “{STR_VAR_1} discovered!â€$" gTVHoennTreasureInvestigatorsText01:: @ 08284FA1 - .string "Wow, we’d better check this letter\n" + .string "Wow, we'd better check this letter\n" .string "out! Let me read it to you.\p" .string "…Dear INVESTIGATORS,\n" .string "I hope you are well.\p" @@ -1311,11 +1311,11 @@ gTVHoennTreasureInvestigatorsText01:: @ 08284FA1 .string "…Well, good going, {STR_VAR_2}!\p" .string "Viewers, let that motivate you to\n" .string "fire up your ITEMFINDERS and search!\p" - .string "I’ll be waiting for exciting news\n" + .string "I'll be waiting for exciting news\n" .string "from all of you!$" gTVHoennTreasureInvestigatorsText02:: @ 082850F5 - .string "Wow, we’d better check this letter\n" + .string "Wow, we'd better check this letter\n" .string "out! Let me read it to you.\p" .string "…Dear INVESTIGATORS,\n" .string "I hope you are well.\p" @@ -1325,15 +1325,15 @@ gTVHoennTreasureInvestigatorsText02:: @ 082850F5 .string "…Well, good going, {STR_VAR_2}!\p" .string "Viewers, let that motivate you to\n" .string "fire up your ITEMFINDERS and search!\p" - .string "I’ll be waiting for exciting news\n" + .string "I'll be waiting for exciting news\n" .string "from all of you!$" gTVFindThatGamerText00:: @ 08285240 .string "FIND THAT GAMER!\p" .string "Hey, all you gamers!\n" - .string "How’s your {STR_VAR_2} spinning?\p" - .string "Like always, we’ll cast our spotlight\n" - .string "on a rare TRAINER who’s visited the\l" + .string "How's your {STR_VAR_2} spinning?\p" + .string "Like always, we'll cast our spotlight\n" + .string "on a rare TRAINER who's visited the\l" .string "GAME CORNER!\p" .string "Today, our no. 1 gamer is…\n" .string "{STR_VAR_1}!$" @@ -1343,30 +1343,30 @@ gTVFindThatGamerText01:: @ 082852F4 .string "and won a rare {STR_VAR_3} COINS.\p" .string "“When {STR_VAR_1} comes, we need to\n" .string "make sure we have enough COINS.â€\p" - .string "That’s what the GAME CORNER clerks\n" + .string "That's what the GAME CORNER clerks\n" .string "mutter when our gamer is in play!\p" - .string "Viewers, it’s best to watch your COINS\n" + .string "Viewers, it's best to watch your COINS\n" .string "like {STR_VAR_1} if you visit the GAME\l" .string "CORNER and play the {STR_VAR_2} game.\p" .string "This is live from the GAME CORNER--\n" .string "where you can feel the excitement!\p" - .string "That’s all for today!$" + .string "That's all for today!$" gTVFindThatGamerText02:: @ 08285463 .string "{STR_VAR_1} played the {STR_VAR_2} game\n" .string "and lost {STR_VAR_3} COINS.\p" .string "“When {STR_VAR_1} comes, our COIN\n" .string "sales seem to increase.â€\p" - .string "That’s what the GAME CORNER clerks\n" + .string "That's what the GAME CORNER clerks\n" .string "say when our gamer is in play!$" gTVFindThatGamerText03:: @ 08285500 - .string "Viewers, it’s best to watch your COINS\n" + .string "Viewers, it's best to watch your COINS\n" .string "like {STR_VAR_1} if you visit the GAME\l" .string "CORNER and play the {STR_VAR_2} game.\p" .string "This is live from the GAME CORNER--\n" .string "where you can feel the excitement!\p" - .string "That’s all for today!$" + .string "That's all for today!$" gTVBreakingNewsText00:: @ 082855BF .string "BREAKING NEWS TV!$" @@ -1374,7 +1374,7 @@ gTVBreakingNewsText00:: @ 082855BF gTVBreakingNewsText01:: @ 082855D1 .string "Rare {STR_VAR_2} caught by\n" .string "{STR_VAR_1}!\p" - .string "We’re live from the vicinity of\n" + .string "We're live from the vicinity of\n" .string "{STR_VAR_3}!\p" .string "{STR_VAR_1} successfully captured\n" .string "a rare {STR_VAR_2} earlier here!$" @@ -1392,17 +1392,17 @@ gTVBreakingNewsText03:: @ 08285682 gTVBreakingNewsText04:: @ 08285705 .string "In that instant, {STR_VAR_2}\n" - .string "echoed with {STR_VAR_1}’s roars of\l" + .string "echoed with {STR_VAR_1}'s roars of\l" .string "triumphant joy.\p" - .string "I must say I’m a little envious of\n" - .string "{STR_VAR_1}. I’d love to roar, too.\p" + .string "I must say I'm a little envious of\n" + .string "{STR_VAR_1}. I'd love to roar, too.\p" .string "…That ends the live feed from\n" .string "the happy scene!$" gTVBreakingNewsText05:: @ 082857B0 .string "{STR_VAR_1} fails to capture a rare\n" .string "{STR_VAR_2}!\p" - .string "We’re live from the vicinity of\n" + .string "We're live from the vicinity of\n" .string "{STR_VAR_3}!\p" .string "It was here that {STR_VAR_1} failed\n" .string "to capture a rare {STR_VAR_2}!$" @@ -1428,7 +1428,7 @@ gTVBreakingNewsText12:: @ 082858D0 gTVBreakingNewsText08:: @ 0828596F .string "In that instant, {STR_VAR_2}\n" - .string "echoed with {STR_VAR_1}’s shrieks of\l" + .string "echoed with {STR_VAR_1}'s shrieks of\l" .string "frustration…$" gTVBreakingNewsText09:: @ 082859AC @@ -1437,14 +1437,14 @@ gTVBreakingNewsText09:: @ 082859AC .string "The TRAINER had to break off\n" .string "the battle with the rare {STR_VAR_2}.\p" .string "In that instant, {STR_VAR_3}\n" - .string "echoed with {STR_VAR_1}’s shrieks of\l" + .string "echoed with {STR_VAR_1}'s shrieks of\l" .string "frustration…$" gTVBreakingNewsText10:: @ 08285A50 .string "However, the {STR_VAR_2} fled without\n" .string "warning.\p" .string "In that instant, {STR_VAR_3}\n" - .string "echoed with {STR_VAR_1}’s shrieks of\l" + .string "echoed with {STR_VAR_1}'s shrieks of\l" .string "frustration…$" gTVBreakingNewsText11:: @ 08285AB3 @@ -1455,32 +1455,32 @@ gTVBreakingNewsText11:: @ 08285AB3 gTVSecretBaseVisitText00:: @ 08285B27 .string "Hello, folks!\n" - .string "It’s time again for\l" + .string "It's time again for\l" .string "a SECRET BASE VISIT.\p" .string "Today, we visit the SECRET BASE\n" .string "of {STR_VAR_1}.\p" .string "How has {STR_VAR_1} personalized\n" .string "the SECRET BASE?\p" - .string "Let’s find out!\n" + .string "Let's find out!\n" .string "… … … … … …$" gTVSecretBaseVisitText01:: @ 08285BCA .string "Oh!\n" .string "How marvelous!\p" .string "This {STR_VAR_2}…\n" - .string "It’s not what one would expect to\l" + .string "It's not what one would expect to\l" .string "find here!$" gTVSecretBaseVisitText02:: @ 08285C13 .string "Oh!\n" .string "How remarkable!\p" - .string "There isn’t a single piece\n" + .string "There isn't a single piece\n" .string "of furniture or interior goods!\p" - .string "Mere mortals couldn’t hope to\n" + .string "Mere mortals couldn't hope to\n" .string "imitate this bold statement!\p" - .string "It’s simple, but it bursts, yes,\n" + .string "It's simple, but it bursts, yes,\n" .string "bursts with wildness!\p" - .string "My hat’s off to you, {STR_VAR_1}.\n" + .string "My hat's off to you, {STR_VAR_1}.\n" .string "It had to be you!$" gTVSecretBaseVisitText03:: @ 08285CFF @@ -1500,7 +1500,7 @@ gTVSecretBaseVisitText05:: @ 08285DE0 .string "Wheeew!\p" .string "The pairing of the {STR_VAR_2}\n" .string "with the {STR_VAR_3}!\p" - .string "It’s a dream combination if there\n" + .string "It's a dream combination if there\n" .string "ever was one!$" gTVSecretBaseVisitText06:: @ 08285E3B @@ -1512,23 +1512,23 @@ gTVSecretBaseVisitText06:: @ 08285E3B gTVSecretBaseVisitText07:: @ 08285E9D .string "Wheeew!\p" - .string "There’s nothing in place here.\p" + .string "There's nothing in place here.\p" .string "This empty space has an effect on\n" .string "the entire SECRET BASE.$" gTVSecretBaseVisitText08:: @ 08285EFE .string "Oh!\n" .string "Here comes {STR_VAR_1}!\l" - .string "Let’s challenge the TRAINER!\p" + .string "Let's challenge the TRAINER!\p" .string "… … … … … …\n" .string "… … … … … …$" gTVSecretBaseVisitText09:: @ 08285F46 .string "Sigh…\n" - .string "I’ve got to hand it to {STR_VAR_1}.\p" - .string "The TRAINER’s POKéMON were truly\n" - .string "worthy of the CHAMPION’s title.\p" - .string "They gave ample proof of {STR_VAR_1}’s\n" + .string "I've got to hand it to {STR_VAR_1}.\p" + .string "The TRAINER's POKéMON were truly\n" + .string "worthy of the CHAMPION's title.\p" + .string "They gave ample proof of {STR_VAR_1}'s\n" .string "toughness as a TRAINER.\p" .string "That the {STR_VAR_2} knew the move\n" .string "{STR_VAR_3}…\p" @@ -1538,10 +1538,10 @@ gTVSecretBaseVisitText09:: @ 08285F46 gTVSecretBaseVisitText10:: @ 08286049 .string "Aiyeeh!\n" - .string "I’ve got to hand it to {STR_VAR_1}.\p" - .string "The TRAINER’s POKéMON were\n" + .string "I've got to hand it to {STR_VAR_1}.\p" + .string "The TRAINER's POKéMON were\n" .string "monstrously tough!\p" - .string "They gave ample proof of {STR_VAR_1}’s\n" + .string "They gave ample proof of {STR_VAR_1}'s\n" .string "tenacity as a TRAINER.\p" .string "That the {STR_VAR_2} knew the move\n" .string "{STR_VAR_3}…\p" @@ -1551,10 +1551,10 @@ gTVSecretBaseVisitText10:: @ 08286049 gTVSecretBaseVisitText11:: @ 0828613A .string "Wheeew!\n" - .string "I’ve got to hand it to {STR_VAR_1}.\p" - .string "The TRAINER’s POKéMON were clearly\n" + .string "I've got to hand it to {STR_VAR_1}.\p" + .string "The TRAINER's POKéMON were clearly\n" .string "raised in a well-balanced manner.\p" - .string "They gave ample proof of {STR_VAR_1}’s\n" + .string "They gave ample proof of {STR_VAR_1}'s\n" .string "thoughtfulness as a TRAINER.\p" .string "That the {STR_VAR_2} knew the move\n" .string "{STR_VAR_3}…\p" @@ -1564,10 +1564,10 @@ gTVSecretBaseVisitText11:: @ 0828613A gTVSecretBaseVisitText12:: @ 08286248 .string "Well, well!\n" - .string "I’ve got to hand it to {STR_VAR_1}.\p" - .string "The TRAINER’s POKéMON showed\n" + .string "I've got to hand it to {STR_VAR_1}.\p" + .string "The TRAINER's POKéMON showed\n" .string "great promise for future growth.\p" - .string "They represented {STR_VAR_1}’s\n" + .string "They represented {STR_VAR_1}'s\n" .string "hopes and dreams.\p" .string "That the {STR_VAR_2} knew the move\n" .string "{STR_VAR_3}…\p" @@ -1579,27 +1579,27 @@ gTVSecretBaseVisitText13:: @ 08286340 .string "I must say, what a superb SECRET BASE\n" .string "it was!\p" .string "Viewers, if you have the chance,\n" - .string "do visit {STR_VAR_1}’s SECRET BASE.\p" + .string "do visit {STR_VAR_1}'s SECRET BASE.\p" .string "Until next time, I bid you adieu!$" gTVPokemonLotteryWinnerFlashReportText00:: @ 082863CC - .string "It’s exciting!\n" - .string "It’s dramatic!\p" - .string "It’s the POKéMON LOTTERY\n" + .string "It's exciting!\n" + .string "It's dramatic!\p" + .string "It's the POKéMON LOTTERY\n" .string "WINNER FLASH REPORT!\p" - .string "Hello! We’re coming at you live from\n" + .string "Hello! We're coming at you live from\n" .string "the POKéMON LOTTERY CORNER on\l" .string "the ground floor of the LILYCOVE\l" .string "DEPARTMENT STORE!\p" .string "Like it always happens, another\n" .string "lucky TRAINER appeared today!\p" - .string "That TRAINER’s name…\n" + .string "That TRAINER's name…\n" .string "{STR_VAR_1}!\p" .string "{STR_VAR_1} won the {STR_VAR_2} prize\n" .string "and took home the {STR_VAR_3}!\p" .string "{STR_VAR_1}!\n" .string "Congratulations!\p" - .string "Viewers, don’t just watch,\n" + .string "Viewers, don't just watch,\n" .string "get in on the action!\p" .string "All of us at the LILYCOVE DEPARTMENT\n" .string "STORE look forward to your next visit!\p" @@ -1612,20 +1612,20 @@ gTVThePokemonBattleSeminarText00:: @ 08286616 .string "THE POKéMON BATTLE SEMINAR!\p" .string "We examine battles to see what\n" .string "lessons we may learn from others.\p" - .string "Today’s case study is on {STR_VAR_1}’s\n" + .string "Today's case study is on {STR_VAR_1}'s\n" .string "battle.\p" - .string "{STR_VAR_1}’s {STR_VAR_2} was\n" + .string "{STR_VAR_1}'s {STR_VAR_2} was\n" .string "battling one {STR_VAR_3}…$" gTVThePokemonBattleSeminarText01:: @ 082866B6 .string "And it used the move {STR_VAR_3}\n" .string "on the {STR_VAR_2}…\p" .string "Hmm… {STR_VAR_1}!\n" - .string "That’s the wrong thing to do!$" + .string "That's the wrong thing to do!$" gTVThePokemonBattleSeminarText02:: @ 08286700 .string "In addition to the doomed move,\n" - .string "the TRAINER’s {STR_VAR_1} also knew$" + .string "the TRAINER's {STR_VAR_1} also knew$" gTVThePokemonBattleSeminarText03:: @ 0828673B .string "the moves {STR_VAR_1}, {STR_VAR_2},\n" @@ -1652,8 +1652,8 @@ gTVThePokemonBattleSeminarText06:: @ 08286777 gTVTrainerFanClubText00:: @ 08286866 .string "All together now!\n" .string "TRAINER FAN CLUB!\p" - .string "MC: How’s everyone groovin’?\n" - .string "Today, we’ve rounded up the fans of\l" + .string "MC: How's everyone groovin'?\n" + .string "Today, we've rounded up the fans of\l" .string "the hyper-popular TRAINER {STR_VAR_1}!\p" .string "FANS: Wrooooooaaaaah!\p" .string "FANS: {STR_VAR_1}!\p" @@ -1675,45 +1675,45 @@ gTVTrainerFanClubText03:: @ 082869B0 .string "when the going gets tough!$" gTVTrainerFanClubText04:: @ 082869ED - .string "FANS: The TRAINER’s knowledge of\n" + .string "FANS: The TRAINER's knowledge of\n" .string "POKéMON!$" gTVTrainerFanClubText05:: @ 08286A17 - .string "FANS: The TRAINER’s kindness toward\n" + .string "FANS: The TRAINER's kindness toward\n" .string "all POKéMON!$" gTVTrainerFanClubText06:: @ 08286A48 - .string "FANS: The TRAINER’s amazing\n" + .string "FANS: The TRAINER's amazing\n" .string "BIKE-riding techniques!$" gTVTrainerFanClubText07:: @ 08286A7C - .string "FANS: The TRAINER’s impressive\n" + .string "FANS: The TRAINER's impressive\n" .string "item-buying style!$" gTVTrainerFanClubText08:: @ 08286AAE - .string "FANS: The TRAINER’s charming way\n" + .string "FANS: The TRAINER's charming way\n" .string "of nicknaming POKéMON!$" gTVTrainerFanClubText09:: @ 08286AE6 - .string "FANS: The TRAINER’s nifty style of\n" + .string "FANS: The TRAINER's nifty style of\n" .string "decorating a SECRET BASE!$" gTVTrainerFanClubText10:: @ 08286B23 - .string "FANS: The TRAINER’s bold ways of\n" + .string "FANS: The TRAINER's bold ways of\n" .string "using TMs!$" gTVTrainerFanClubText11:: @ 08286B4F - .string "MC: As you’ve just seen, {STR_VAR_1}\n" + .string "MC: As you've just seen, {STR_VAR_1}\n" .string "is hot! Like, too hot to touch, yow!\p" - .string "Among {STR_VAR_1}’s FANS\n" - .string "there’s a special slogan!\p" + .string "Among {STR_VAR_1}'s FANS\n" + .string "there's a special slogan!\p" .string "MC: When I say {STR_VAR_1},\n" .string "you say…\p" .string "FANS: {STR_VAR_2}!\p" .string "FANS: {STR_VAR_3}!\p" .string "FANS: {STR_VAR_2}!\p" .string "FANS: {STR_VAR_3}!\p" - .string "MC: That’s right, when someone says,\n" + .string "MC: That's right, when someone says,\n" .string "“{STR_VAR_1}â€â€¦\p" .string "Come back with, “{STR_VAR_2}\n" .string "{STR_VAR_3}!â€\p" @@ -1730,7 +1730,7 @@ gTVTrainerFanClubText11:: @ 08286B4F .string "FANS: {STR_VAR_3}!\p" .string "MC: Thanks for joining us, all you\n" .string "wild FANS of {STR_VAR_1}!\l" - .string "That’s the show! See you again!\p" + .string "That's the show! See you again!\p" .string "MC: When I say {STR_VAR_1},\n" .string "you say…\p" .string "FANS: {STR_VAR_2}!\p" @@ -1740,13 +1740,13 @@ gTVCutiesText00:: @ 08286D8F .string "SPOT THE CUTIES!\n" .string "POKéMON IN RIBBONS!\p" .string "Hello, my sweet viewers!\p" - .string "I just know you’ll agree, but a POKéMON\n" + .string "I just know you'll agree, but a POKéMON\n" .string "wearing RIBBONS is simply divine!\p" .string "Today, I want to share with you\n" .string "a lovely POKéMON I spotted while\l" .string "out on a stroll in town.\p" - .string "Today’s featured pretty POKéMON\n" - .string "is {STR_VAR_1}’s {STR_VAR_2}.$" + .string "Today's featured pretty POKéMON\n" + .string "is {STR_VAR_1}'s {STR_VAR_2}.$" gTVCutiesText01:: @ 08286E9D .string "The number of RIBBONS that\n" @@ -1757,13 +1757,13 @@ gTVCutiesText01:: @ 08286E9D gTVCutiesText02:: @ 08286EFC .string "{STR_VAR_2} wears an amazing\n" .string "{STR_VAR_3} RIBBONS!\p" - .string "It speaks volumes about {STR_VAR_1}’s\n" + .string "It speaks volumes about {STR_VAR_1}'s\n" .string "commitment to the POKéMON!$" gTVCutiesText03:: @ 08286F54 .string "{STR_VAR_2} wears an incredible\n" .string "{STR_VAR_3} RIBBONS!\p" - .string "It shows you {STR_VAR_1}’s total\n" + .string "It shows you {STR_VAR_1}'s total\n" .string "dedication as a collector!$" gTVCutiesText04:: @ 08286FAA @@ -1879,100 +1879,100 @@ gTVCutiesText15:: @ 08287779 gTVPokemonNewsBattleFrontierText00:: @ 082877DE .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "We’ve got some uplifting news from\n" + .string "It's time for POKéMON NEWS.\p" + .string "We've got some uplifting news from\n" .string "the BATTLE FRONTIER.$" gTVPokemonNewsBattleFrontierText01:: @ 0828783D .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while on\l" - .string "the BATTLE TOWER’s SINGLE BATTLE\l" + .string "the BATTLE TOWER's SINGLE BATTLE\l" .string "ROOM challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText02:: @ 082878B3 .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while on\l" - .string "the BATTLE TOWER’s DOUBLE BATTLE\l" + .string "the BATTLE TOWER's DOUBLE BATTLE\l" .string "ROOM challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText03:: @ 08287929 .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while on\l" - .string "the BATTLE TOWER’s MULTI BATTLE\l" + .string "the BATTLE TOWER's MULTI BATTLE\l" .string "ROOM challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText04:: @ 0828799E .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while on\l" - .string "the BATTLE TOWER’s LINK MULTI BATTLE\l" + .string "the BATTLE TOWER's LINK MULTI BATTLE\l" .string "ROOM challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText05:: @ 08287A18 .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-championship-streak record\l" - .string "competing in the BATTLE DOME’s\l" + .string "competing in the BATTLE DOME's\l" .string "SINGLE BATTLE Tournaments.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText06:: @ 08287A97 .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-championship-streak record\l" - .string "competing in the BATTLE DOME’s\l" + .string "competing in the BATTLE DOME's\l" .string "DOUBLE BATTLE Tournaments.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText07:: @ 08287B16 .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while on\l" - .string "the BATTLE FACTORY’s Battle\l" + .string "the BATTLE FACTORY's Battle\l" .string "Swap Single challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText08:: @ 08287B8E .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while on\l" - .string "the BATTLE FACTORY’s Battle\l" + .string "the BATTLE FACTORY's Battle\l" .string "Swap Double challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText09:: @ 08287C06 .string "The TRAINER {STR_VAR_1} set a new\n" .string "record of clearing {STR_VAR_2} rooms\l" - .string "while on the BATTLE PIKE’s Battle\l" + .string "while on the BATTLE PIKE's Battle\l" .string "Choice challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText10:: @ 08287C7D .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while\l" - .string "competing in the BATTLE ARENA’s\l" + .string "competing in the BATTLE ARENA's\l" .string "Set KO Tournaments.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText11:: @ 08287CF3 .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while on\l" - .string "the BATTLE PALACE’s SINGLE BATTLE\l" + .string "the BATTLE PALACE's SINGLE BATTLE\l" .string "HALL challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText12:: @ 08287D6A .string "The TRAINER {STR_VAR_1} set a new\n" .string "{STR_VAR_2}-win-streak record while on\l" - .string "the BATTLE PALACE’s DOUBLE BATTLE\l" + .string "the BATTLE PALACE's DOUBLE BATTLE\l" .string "HALL challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText13:: @ 08287DE1 .string "The TRAINER {STR_VAR_1} set a new\n" .string "record of clearing {STR_VAR_2} floors\l" - .string "while on the BATTLE PYRAMID’s\l" + .string "while on the BATTLE PYRAMID's\l" .string "Battle Quest challenge.\p" - .string "Here’s to {STR_VAR_1}!$" + .string "Here's to {STR_VAR_1}!$" gTVPokemonNewsBattleFrontierText14:: @ 08287E5B .string "And to the three POKéMON, {STR_VAR_1},\n" @@ -1997,28 +1997,28 @@ gTVPokemonNewsBattleFrontierText17:: @ 08287F39 .string "record-breaking performance!$" gTVPokemonNewsBattleFrontierText18:: @ 08287F77 - .string "Let’s hope for more record-setting\n" + .string "Let's hope for more record-setting\n" .string "feats from {STR_VAR_1} and the loyal\l" .string "POKéMON!\p" - .string "That’s the news on POKéMON NEWS!$" + .string "That's the news on POKéMON NEWS!$" gTVWhatsNo1InHoennTodayText00:: @ 08287FE0 - .string "WHAT’S NO. 1 IN HOENN TODAY?\n" - .string "Yes, it’s that time again!\p" + .string "WHAT'S NO. 1 IN HOENN TODAY?\n" + .string "Yes, it's that time again!\p" .string "Hello, viewers! Are you giving your\n" .string "best at whatever you do?\p" - .string "Let’s have a look at the TRAINER\n" + .string "Let's have a look at the TRAINER\n" .string "who did the very best today!\p" - .string "Today’s no. 1 TRAINER is none other\n" + .string "Today's no. 1 TRAINER is none other\n" .string "than {STR_VAR_1}!$" gTVWhatsNo1InHoennTodayText01:: @ 082880C0 .string "In one day, {STR_VAR_1} spun the SLOTS\n" .string "at the GAME CORNER {STR_VAR_2} times.\p" .string "While playing, {STR_VAR_1} was heard\n" - .string "murmuring, “For me, the reels don’t\l" + .string "murmuring, “For me, the reels don't\l" .string "even move…â€\l" - .string "Isn’t that interesting?$" + .string "Isn't that interesting?$" gTVWhatsNo1InHoennTodayText02:: @ 0828815F .string "In one day, {STR_VAR_1} played\n" @@ -2026,13 +2026,13 @@ gTVWhatsNo1InHoennTodayText02:: @ 0828815F .string "CORNER {STR_VAR_2} times.\p" .string "While playing, {STR_VAR_1} shouted,\n" .string "“Let the balls decide!â€\p" - .string "The TRAINER’s eyes were focused and\n" + .string "The TRAINER's eyes were focused and\n" .string "the face showed concentration.$" gTVWhatsNo1InHoennTodayText03:: @ 0828821A .string "In one day, {STR_VAR_1} battled\n" .string "wild POKéMON {STR_VAR_2} times!\p" - .string "Apparently, {STR_VAR_1}’s POKéMON\n" + .string "Apparently, {STR_VAR_1}'s POKéMON\n" .string "have grown incomparably stronger.\p" .string "They appear eager to battle anywhere,\n" .string "anytime, and anyhow!$" @@ -2048,7 +2048,7 @@ gTVWhatsNo1InHoennTodayText04:: @ 082882BE gTVWhatsNo1InHoennTodayText05:: @ 08288355 .string "In just one day, {STR_VAR_1} planted\n" .string "{STR_VAR_2} BERRIES!\p" - .string "As a result, {STR_VAR_1}’s clothes\n" + .string "As a result, {STR_VAR_1}'s clothes\n" .string "became filthy with dirt.\p" .string "Where the TRAINER planted, countless\n" .string "flowers have burst into bloom.\p" @@ -2058,7 +2058,7 @@ gTVWhatsNo1InHoennTodayText05:: @ 08288355 gTVWhatsNo1InHoennTodayText06:: @ 0828842B .string "In just one day, {STR_VAR_1} picked\n" .string "{STR_VAR_2} BERRIES!\p" - .string "{STR_VAR_1}’s BAG became so filled\n" + .string "{STR_VAR_1}'s BAG became so filled\n" .string "with BERRIES, the TRAINER had trouble\l" .string "walking afterward!$" @@ -2073,9 +2073,9 @@ gTVWhatsNo1InHoennTodayText07:: @ 082884A5 .string "while mulling options.$" gTVWhatsNo1InHoennTodayText08:: @ 0828858B - .string "Well, isn’t that something!\p" + .string "Well, isn't that something!\p" .string "{STR_VAR_1}!\n" - .string "You’re today’s no. 1 TRAINER!\p" + .string "You're today's no. 1 TRAINER!\p" .string "Viewers, take heart from {STR_VAR_1}!\n" .string "You, too, can be no. 1 every day!$" @@ -2083,11 +2083,11 @@ gTVSecretBaseSecretsText00:: @ 08288608 .string "SECRET BASE SECRETS!\p" .string "What do TRAINERS do in the secrecy\n" .string "of SECRET BASES?\p" - .string "Today, we investigate {STR_VAR_1}’s\n" + .string "Today, we investigate {STR_VAR_1}'s\n" .string "SECRET BASE.\p" .string "Oh? It looks like {STR_VAR_2} has come\n" .string "for a visit.\p" - .string "Let’s have a peek!\p" + .string "Let's have a peek!\p" .string "What will {STR_VAR_2} do?$" gTVSecretBaseSecretsText01:: @ 082886C8 @@ -2098,38 +2098,38 @@ gTVSecretBaseSecretsText02:: @ 082886DE gTVSecretBaseSecretsText03:: @ 082886F8 .string "In the end, {STR_VAR_2} took {STR_VAR_3} steps\n" - .string "in {STR_VAR_1}’s SECRET BASE before\l" + .string "in {STR_VAR_1}'s SECRET BASE before\l" .string "leaving.$" gTVSecretBaseSecretsText04:: @ 08288739 .string "Hmm…\p" - .string "It appears as if {STR_VAR_1}’s SECRET\n" + .string "It appears as if {STR_VAR_1}'s SECRET\n" .string "BASE failed to interest {STR_VAR_2}…$" gTVSecretBaseSecretsText05:: @ 08288777 .string "{STR_VAR_2} appears to have enjoyed\n" - .string "{STR_VAR_1}’s SECRET BASE thoroughly.$" + .string "{STR_VAR_1}'s SECRET BASE thoroughly.$" gTVSecretBaseSecretsText06:: @ 082887AF .string "{STR_VAR_2} appears to have become\n" - .string "a huge fan of {STR_VAR_1}’s\l" + .string "a huge fan of {STR_VAR_1}'s\l" .string "SECRET BASE.$" gTVSecretBaseSecretsText07:: @ 082887E9 .string "Viewers may want to check out\n" - .string "{STR_VAR_1}’s SECRET BASE, too.\p" + .string "{STR_VAR_1}'s SECRET BASE, too.\p" .string "Tune in next time as we visit another\n" .string "SECRET BASE! Thanks for joining us!$" gTVSecretBaseSecretsText08:: @ 08288868 .string "The visitor has stopped!\p" - .string "The visitor isn’t moving at all!\p" - .string "Was {STR_VAR_1}’s SECRET BASE\n" + .string "The visitor isn't moving at all!\p" + .string "Was {STR_VAR_1}'s SECRET BASE\n" .string "that unimpressive?$" gTVSecretBaseSecretsText09:: @ 082888CA .string "The visitor has stopped!\p" - .string "The visitor isn’t moving at all!\p" + .string "The visitor isn't moving at all!\p" .string "Is it fatigue?\n" .string "Has the visitor grown weary?$" @@ -2152,7 +2152,7 @@ gTVSecretBaseSecretsText12:: @ 08288A3A .string "The visitor is running around!\p" .string "Oh, my, the visitor is frolicking!\p" .string "The visitor appears surprised by\n" - .string "the TENT’s size!$" + .string "the TENT's size!$" gTVSecretBaseSecretsText13:: @ 08288ACA .string "The visitor is examining\n" @@ -2163,7 +2163,7 @@ gTVSecretBaseSecretsText13:: @ 08288ACA gTVSecretBaseSecretsText14:: @ 08288B1E .string "The visitor is examining\n" .string "a GOLD SHIELD!\p" - .string "The visitor’s eyes appear to be\n" + .string "The visitor's eyes appear to be\n" .string "lit up with wonder!$" gTVSecretBaseSecretsText15:: @ 08288B7A @@ -2176,7 +2176,7 @@ gTVSecretBaseSecretsText16:: @ 08288BC9 .string "a GLASS ORNAMENT!\p" .string "Oh, no!\p" .string "The visitor is touching it!\p" - .string "It’s getting covered with\n" + .string "It's getting covered with\n" .string "fingerprints…$" gTVSecretBaseSecretsText17:: @ 08288C40 @@ -2195,7 +2195,7 @@ gTVSecretBaseSecretsText19:: @ 08288CC8 .string "one {STR_VAR_2}!\p" .string "Look at the visitor smile while\n" .string "holding up the {STR_VAR_2}!\p" - .string "It’s like a TV commercial!$" + .string "It's like a TV commercial!$" gTVSecretBaseSecretsText20:: @ 08288D7F .string "The visitor grabs a cushion and…$" @@ -2212,10 +2212,10 @@ gTVSecretBaseSecretsText22:: @ 08288DDA gTVSecretBaseSecretsText23:: @ 08288E1E .string "The visitor is chatting with\n" .string "{STR_VAR_1}!\p" - .string "It looks like they’re going to\n" + .string "It looks like they're going to\n" .string "have a battle!\p" .string "And…\p" - .string "It’s the visitor!\n" + .string "It's the visitor!\n" .string "The visitor won an away match!\p" .string "The visitor is doing\n" .string "a victory dance!$" @@ -2223,31 +2223,31 @@ gTVSecretBaseSecretsText23:: @ 08288E1E gTVSecretBaseSecretsText24:: @ 08288EC9 .string "The visitor is chatting with\n" .string "{STR_VAR_1}!\p" - .string "It looks like they’re going to\n" + .string "It looks like they're going to\n" .string "have a battle!\p" .string "And…\p" - .string "It’s {STR_VAR_1}!\n" + .string "It's {STR_VAR_1}!\n" .string "The visitor has lost!\p" .string "The visitor looks dejected!$" gTVSecretBaseSecretsText25:: @ 08288F58 .string "The visitor is chatting with\n" .string "{STR_VAR_1}!\p" - .string "It looks like they’re going to\n" + .string "It looks like they're going to\n" .string "have a battle!\p" .string "And…\p" .string "No, the visitor has refused!\p" - .string "There won’t be a battle after all!\p" + .string "There won't be a battle after all!\p" .string "Did the visitor find {STR_VAR_1}\n" .string "unappealing?$" gTVSecretBaseSecretsText26:: @ 08289011 .string "The visitor is staring intently\n" .string "at a poster!\p" - .string "Is the poster to the visitor’s\n" + .string "Is the poster to the visitor's\n" .string "liking?\p" - .string "…But… There’s something disturbing\n" - .string "about the visitor’s stares.$" + .string "…But… There's something disturbing\n" + .string "about the visitor's stares.$" gTVSecretBaseSecretsText27:: @ 082890A4 .string "The visitor stepped on a NOTE MAT!\p" @@ -2257,11 +2257,11 @@ gTVSecretBaseSecretsText27:: @ 082890A4 gTVSecretBaseSecretsText28:: @ 082890F0 .string "The visitor is chatting with\n" .string "{STR_VAR_1}!\p" - .string "It looks like they’re going to\n" + .string "It looks like they're going to\n" .string "have a battle!\p" .string "And…\p" - .string "It’s a draw!\n" - .string "Nothing’s resolved!\p" + .string "It's a draw!\n" + .string "Nothing's resolved!\p" .string "Both TRAINERS appear to be very\n" .string "disappointed!$" @@ -2277,7 +2277,7 @@ gTVSecretBaseSecretsText30:: @ 08289204 .string "a SAND ORNAMENT!\p" .string "Oh!\p" .string "It crumbled!\n" - .string "It’s fallen apart!\p" + .string "It's fallen apart!\p" .string "The visitor looks sheepish\n" .string "and guilty!$" @@ -2305,7 +2305,7 @@ gTVSecretBaseSecretsText34:: @ 082893FF .string "The visitor is looking intently\n" .string "at a FENCE!\p" .string "Has a new idea for a trap popped\n" - .string "into the visitor’s head?$" + .string "into the visitor's head?$" gTVSecretBaseSecretsText35:: @ 08289465 .string "The visitor stepped on\n" @@ -2324,7 +2324,7 @@ gTVSecretBaseSecretsText36:: @ 082894F2 gTVSecretBaseSecretsText37:: @ 08289564 .string "The visitor climbed a STAND!\p" .string "The visitor is looking out across\n" - .string "{STR_VAR_1}’s BASE from high up!\p" + .string "{STR_VAR_1}'s BASE from high up!\p" .string "And…\p" .string "Lets loose a roar!\n" .string "The visitor is roaring!$" @@ -2336,7 +2336,7 @@ gTVSecretBaseSecretsText38:: @ 082895EB gTVSecretBaseSecretsText39:: @ 08289645 .string "The visitor is talking to a DOLL!\p" - .string "…It’s a little creepy…$" + .string "…It's a little creepy…$" gTVSecretBaseSecretsText40:: @ 0828967E .string "The visitor is climbing the ladder\n" @@ -2369,7 +2369,7 @@ gTVSafariFanClubText00:: @ 08289813 .string "Tossing them SAFARI BALLS, are you?\p" .string "You can bet I am here in the SAFARI\n" .string "ZONE chock-full of amazing POKéMON!\p" - .string "Let’s get with it and have a chat with\n" + .string "Let's get with it and have a chat with\n" .string "this good fellow of a SAFARI GUIDE!\p" .string "All right, mate, how are the visiting\n" .string "TRAINERS looking?$" @@ -2386,9 +2386,9 @@ gTVSafariFanClubText02:: @ 0828999D .string "Used {STR_VAR_2} that time, I think.$" gTVSafariFanClubText03:: @ 082899DC - .string "The TRAINER didn’t use a single\n" + .string "The TRAINER didn't use a single\n" .string "{POKEBLOCK}! Not a one!\p" - .string "There’s an expert for you.$" + .string "There's an expert for you.$" gTVSafariFanClubText04:: @ 08289A29 .string "REPORTER: Is that right, then?\p" @@ -2408,7 +2408,7 @@ gTVSafariFanClubText06:: @ 08289B42 .string "GUIDE: No one seems to be doing\n" .string "very well.\p" .string "{STR_VAR_1} had it especially bad.\p" - .string "Why, before, the TRAINER didn’t\n" + .string "Why, before, the TRAINER didn't\n" .string "catch one POKéMON. Not a one!$" gTVSafariFanClubText07:: @ 08289BC5 @@ -2419,7 +2419,7 @@ gTVSafariFanClubText07:: @ 08289BC5 gTVSafariFanClubText08:: @ 08289C3B .string "I think the TRAINER would have better\n" - .string "luck using {POKEBLOCK}S, which weren’t\l" + .string "luck using {POKEBLOCK}S, which weren't\l" .string "used at all that time.$" gTVSafariFanClubText09:: @ 08289C99 @@ -2439,20 +2439,20 @@ gTVSafariFanClubText10:: @ 08289D33 gTVContestLiveUpdatesText00:: @ 08289DD6 .string "“POKéMON CONTEST LIVE UPDATES!â€\p" .string "MC: Thanks for joining us!\p" - .string "We’re live from the just-ended\n" + .string "We're live from the just-ended\n" .string "{STR_VAR_1} site.\p" .string "The hall is still filled with\n" .string "an audience unwilling to leave.\p" .string "Spectator: {STR_VAR_2}!\p" .string "Spectator: {STR_VAR_3}!\p" - .string "MC: As you’ve just heard, the CONTEST\n" + .string "MC: As you've just heard, the CONTEST\n" .string "was won by the POKéMON {STR_VAR_2}\l" .string "of {STR_VAR_3}.\p" .string "Spectator: {STR_VAR_2}!\n" - .string "You’re the best!\p" + .string "You're the best!\p" .string "Spectator: {STR_VAR_3}!\n" .string "Way to go!\p" - .string "MC: Let’s hear what the fans have\n" + .string "MC: Let's hear what the fans have\n" .string "to say about this CONTEST.$" gTVContestLiveUpdatesText01:: @ 08289F53 @@ -2461,7 +2461,7 @@ gTVContestLiveUpdatesText01:: @ 08289F53 .string "That {STR_VAR_2} will keep winning!$" gTVContestLiveUpdatesText02:: @ 08289FB0 - .string "Spectator: The {STR_VAR_2} didn’t do\n" + .string "Spectator: The {STR_VAR_2} didn't do\n" .string "well in the primary judging, but it\l" .string "cleaned up in the secondary judging!\p" .string "It was a miraculous comeback\n" @@ -2472,7 +2472,7 @@ gTVContestLiveUpdatesText03:: @ 0828A047 .string "consistent throughout both primary\l" .string "and secondary judging.\p" .string "{STR_VAR_3} and the {STR_VAR_2},\n" - .string "they’re no ordinary combo!$" + .string "they're no ordinary combo!$" gTVContestLiveUpdatesText04:: @ 0828A0C6 .string "Spectator: In terms of being {STR_VAR_1},\n" @@ -2482,23 +2482,23 @@ gTVContestLiveUpdatesText04:: @ 0828A0C6 gTVContestLiveUpdatesText05:: @ 0828A132 .string "Spectator: When the {STR_VAR_2} got\n" - .string "nervous, I couldn’t stop myself from\l" + .string "nervous, I couldn't stop myself from\l" .string "shouting encouragement.\p" - .string "I’d like to say this to that\n" + .string "I'd like to say this to that\n" .string "{STR_VAR_2}, “Congratulations!â€$" gTVContestLiveUpdatesText06:: @ 0828A1BE - .string "Spectator: That {STR_VAR_2}’s appeal\n" + .string "Spectator: That {STR_VAR_2}'s appeal\n" .string "startled even me!\p" .string "{STR_VAR_2}, you were awesome!$" gTVContestLiveUpdatesText07:: @ 0828A202 - .string "Spectator: That {STR_VAR_2}’s combo\n" + .string "Spectator: That {STR_VAR_2}'s combo\n" .string "appeal was stunning!\p" - .string "It’s shaken me to the core!$" + .string "It's shaken me to the core!$" gTVContestLiveUpdatesText08:: @ 0828A24E - .string "Spectator: The winning {STR_VAR_2}’s\n" + .string "Spectator: The winning {STR_VAR_2}'s\n" .string "appeal got my heart pounding!$" gTVContestLiveUpdatesText09:: @ 0828A288 @@ -2522,56 +2522,56 @@ gTVContestLiveUpdatesText13:: @ 0828A2DA .string "You were tough!$" gTVContestLiveUpdatesText14:: @ 0828A2EE - .string "Spectator: The winning {STR_VAR_2}’s\n" + .string "Spectator: The winning {STR_VAR_2}'s\n" .string "appeal still has my heart pounding!$" gTVContestLiveUpdatesText15:: @ 0828A32E .string "{STR_VAR_2}!\n" - .string "You’re the last word in cool!$" + .string "You're the last word in cool!$" gTVContestLiveUpdatesText16:: @ 0828A350 .string "{STR_VAR_2}!\n" - .string "You’re the most beautiful!$" + .string "You're the most beautiful!$" gTVContestLiveUpdatesText17:: @ 0828A36F .string "{STR_VAR_2}!\n" - .string "You’re simply the cutest!$" + .string "You're simply the cutest!$" gTVContestLiveUpdatesText18:: @ 0828A38D .string "{STR_VAR_2}!\n" - .string "You’re the smartest among the smart!$" + .string "You're the smartest among the smart!$" gTVContestLiveUpdatesText19:: @ 0828A3B6 .string "{STR_VAR_2}!\n" - .string "You’re the toughest of the tough!$" + .string "You're the toughest of the tough!$" gTVContestLiveUpdatesText20:: @ 0828A3DC .string "Spectator: Even when the {STR_VAR_2}\n" .string "took a break from making appeals,\l" - .string "I couldn’t take my eyes off it.\p" - .string "I’m captivated by that {STR_VAR_2}.$" + .string "I couldn't take my eyes off it.\p" + .string "I'm captivated by that {STR_VAR_2}.$" gTVContestLiveUpdatesText21:: @ 0828A455 .string "Spectator: When the {STR_VAR_2} was\n" - .string "startled by another POKéMON’s appeal,\l" + .string "startled by another POKéMON's appeal,\l" .string "I was close to tears.\p" .string "{STR_VAR_2}, you were resilient!\n" .string "Way to go!$" gTVContestLiveUpdatesText22:: @ 0828A4CF .string "Spectator: Oh…\n" - .string "That {STR_VAR_2}’s {STR_VAR_3}!\l" - .string "{STR_VAR_2}’s {STR_VAR_3}!\l" - .string "{STR_VAR_2}’s {STR_VAR_3}!\l" + .string "That {STR_VAR_2}'s {STR_VAR_3}!\l" + .string "{STR_VAR_2}'s {STR_VAR_3}!\l" + .string "{STR_VAR_2}'s {STR_VAR_3}!\l" .string "How could it be so wonderful?$" gTVContestLiveUpdatesText23:: @ 0828A51C .string "MC: Well, there you have it. This place\n" - .string "is full of the {STR_VAR_1}’s fans!\p" + .string "is full of the {STR_VAR_1}'s fans!\p" .string "I should also mention that another\n" - .string "POKéMON, {STR_VAR_2}’s {STR_VAR_3}, \l" + .string "POKéMON, {STR_VAR_2}'s {STR_VAR_3}, \l" .string "caught my eye.\p" - .string "{STR_VAR_2}’s {STR_VAR_3}…$" + .string "{STR_VAR_2}'s {STR_VAR_3}…$" gTVContestLiveUpdatesText24:: @ 0828A5AC .string "It failed to make a single appeal during\n" @@ -2588,7 +2588,7 @@ gTVContestLiveUpdatesText25:: @ 0828A638 gTVContestLiveUpdatesText26:: @ 0828A6CF .string "It failed to take advantage of\n" - .string "the audience’s excitement and make\l" + .string "the audience's excitement and make\l" .string "an appropriate appeal.\p" .string "We hope {STR_VAR_1} will learn how to get\n" .string "a feel for the audience and whip their\l" @@ -2600,7 +2600,7 @@ gTVContestLiveUpdatesText27:: @ 0828A797 .string "judging failed to click.\p" .string "It suffered a humiliating come-from-\n" .string "behind loss.\p" - .string "I’m sure {STR_VAR_1} is studying how to\n" + .string "I'm sure {STR_VAR_1} is studying how to\n" .string "make more effective appeals now.$" gTVContestLiveUpdatesText28:: @ 0828A86D @@ -2611,17 +2611,17 @@ gTVContestLiveUpdatesText28:: @ 0828A86D .string "its appeals to the audience more.$" gTVContestLiveUpdatesText29:: @ 0828A920 - .string "It lost to {STR_VAR_1}’s {STR_VAR_2}\n" + .string "It lost to {STR_VAR_1}'s {STR_VAR_2}\n" .string "by only a small margin.\p" .string "It must be heartbreaking to come\n" .string "so close to victory only to fail.\p" - .string "I wouldn’t be surprised if {STR_VAR_3}\n" + .string "I wouldn't be surprised if {STR_VAR_3}\n" .string "were weeping over this outcome.$" gTVContestLiveUpdatesText30:: @ 0828A9CC .string "It disappointed the JUDGE by\n" .string "repeating the same appeals.\p" - .string "It’s an unforgivable error in any\n" + .string "It's an unforgivable error in any\n" .string "CONTEST, and the POKéMON paid.\p" .string "{STR_VAR_1} should feel guilty for\n" .string "this sorry showing.$" @@ -2634,15 +2634,15 @@ gTVContestLiveUpdatesText31:: @ 0828AA74 .string "and put the knowledge to good use.$" gTVContestLiveUpdatesText32:: @ 0828AB01 - .string "I’d like to end this program with our\n" + .string "I'd like to end this program with our\n" .string "usual farewell to the winners.\p" - .string "This time, it’s {STR_VAR_1} and\n" + .string "This time, it's {STR_VAR_1} and\n" .string "the {STR_VAR_2}!\p" .string "MC: Is everyone ready?\n" .string "All together now!\p" .string "Audience: {STR_VAR_1}! {STR_VAR_2}!\n" .string "Congratulations!\l" - .string "You’re the CONTEST winner!$" + .string "You're the CONTEST winner!$" gTVPokemonBattleUpdateText00:: @ 0828ABCC .string "“POKéMON BATTLE UPDATE!â€\p" @@ -2657,12 +2657,12 @@ gTVPokemonBattleUpdateText01:: @ 0828AC22 .string "{STR_VAR_1}!$" gTVPokemonBattleUpdateText02:: @ 0828AC7E - .string "In the battle, {STR_VAR_1}’s\n" + .string "In the battle, {STR_VAR_1}'s\n" .string "{STR_VAR_2} was a formidable force\l" .string "using {STR_VAR_3}!$" gTVPokemonBattleUpdateText03:: @ 0828ACB6 - .string "{STR_VAR_1}’s {STR_VAR_2} had a weak\n" + .string "{STR_VAR_1}'s {STR_VAR_2} had a weak\n" .string "showing that really hurt.$" gTVPokemonBattleUpdateText04:: @ 0828ACE3 @@ -2677,39 +2677,39 @@ gTVPokemonBattleUpdateText05:: @ 0828AD80 .string "The teams of TRAINERS {STR_VAR_1} and\n" .string "{STR_VAR_2} met in a MULTI BATTLE.\p" .string "This match ended in victory for\n" - .string "{STR_VAR_1}’s team.$" + .string "{STR_VAR_1}'s team.$" gTVPokemonBattleUpdateText06:: @ 0828ADE2 .string "In the battle, the {STR_VAR_2} on\n" - .string "{STR_VAR_1}’s team was a formidable\l" + .string "{STR_VAR_1}'s team was a formidable\l" .string "force using {STR_VAR_3}.$" gTVPokemonBattleUpdateText07:: @ 0828AE26 .string "The weak showing by the {STR_VAR_3}\n" - .string "on {STR_VAR_2}’s team really hurt.\p" - .string "Congratulations on your team’s\n" + .string "on {STR_VAR_2}'s team really hurt.\p" + .string "Congratulations on your team's\n" .string "victory, {STR_VAR_1}!\p" - .string "As for the defeated {STR_VAR_2}’s team,\n" + .string "As for the defeated {STR_VAR_2}'s team,\n" .string "we hope for a better result next time!\p" .string "This concludes this episode of\n" .string "“POKéMON BATTLE UPDATE!â€$" Route111_Text_28AF05: @ 0828AF05 - .string "GABBY: Oh! We’ve just spotted a tough-\n" + .string "GABBY: Oh! We've just spotted a tough-\n" .string "looking TRAINER here of all places!\p" .string "Okay, roll camera!\n" - .string "Let’s get this interview.$" + .string "Let's get this interview.$" Route111_Text_28AF7D: @ 0828AF7D Route118_Text_28AF7D: @ 0828AF7D Route120_Text_28AF7D: @ 0828AF7D - .string "GABBY: Oh! You’re {PLAYER}! Hi!\n" + .string "GABBY: Oh! You're {PLAYER}! Hi!\n" .string "Do you remember us from last time?\p" .string "Can you show us how much stronger\n" - .string "you’ve become? Okay, cue interview!$" + .string "you've become? Okay, cue interview!$" Route111_Text_28B000: @ 0828B000 - .string "GABBY: My eyes didn’t lie!\n" + .string "GABBY: My eyes didn't lie!\n" .string "I did discover an astonishing TRAINER!$" Route111_Text_28B042: @ 0828B042 @@ -2725,7 +2725,7 @@ Route111_Text_28B042: @ 0828B042 Route111_Text_28B137: @ 0828B137 .string "GABBY: “{STR_VAR_1}!â€\p" - .string "Remember? That’s the quote you gave\n" + .string "Remember? That's the quote you gave\n" .string "us as the battle clincher last time.\p" .string "I never, ever forget stuff like that!$" @@ -2736,7 +2736,7 @@ Route111_Text_28B1B3: @ 0828B1B3 .string "Do you want to be interviewed again?$" Route111_Text_28B23D: @ 0828B23D - .string "The last time we battled, didn’t you\n" + .string "The last time we battled, didn't you\n" .string "throw a POKé BALL at us?\p" .string "We were shocked! So we told everyone,\n" .string "just everyone, about it!\p" @@ -2768,23 +2768,23 @@ Route111_Text_28B433: @ 0828B433 Route111_Text_28B4AB: @ 0828B4AB .string "GABBY: Mmm, yeah!\n" - .string "That’s the perfect clincher!\p" + .string "That's the perfect clincher!\p" .string "I get the feeling that this will make\n" .string "a great TV show.\p" - .string "There’s a chance that they’ll air this\n" + .string "There's a chance that they'll air this\n" .string "on TV, so make sure to look for us!\p" .string "Okay!\n" - .string "We’ll be seeing you!$" + .string "We'll be seeing you!$" Route111_Text_28B577: @ 0828B577 .string "GABBY: Oh…\p" - .string "Okay, but don’t give up!\n" - .string "We’ll be keeping an eye out for you!$" + .string "Okay, but don't give up!\n" + .string "We'll be keeping an eye out for you!$" Route111_Text_28B5C0: @ 0828B5C0 Route118_Text_28B5C0: @ 0828B5C0 Route120_Text_28B5C0: @ 0828B5C0 - .string "GABBY: We’ll be keeping an eye out\n" + .string "GABBY: We'll be keeping an eye out\n" .string "for you!$" Route111_Text_28B5EC: @ 0828B5EC @@ -2795,7 +2795,7 @@ Route120_Text_28B5EC: @ 0828B5EC Route111_Text_28B62D: @ 0828B62D .string "GABBY: Wow, you are something!\p" - .string "You’ve gotten a lot stronger--a lot--\n" + .string "You've gotten a lot stronger--a lot--\n" .string "since we last battled.\p" .string "We were right about you when we\n" .string "spotted you as a hot TRAINER.\p" @@ -2812,28 +2812,28 @@ Route120_Text_28B719: @ 0828B719 Route111_Text_28B75C: @ 0828B75C .string "TY: Hey, lookie here! A tough-looking\n" .string "TRAINER here, of all places!\l" - .string "Camera’s rolling!$" + .string "Camera's rolling!$" Route111_Text_28B7B1: @ 0828B7B1 Route118_Text_28B7B1: @ 0828B7B1 Route120_Text_28B7B1: @ 0828B7B1 .string "TY: Hey, lookie here!\n" .string "I remember you!\p" - .string "I’ll get this battle all on this\n" + .string "I'll get this battle all on this\n" .string "here camera!$" Route111_Text_28B805: @ 0828B805 Route118_Text_28B805: @ 0828B805 Route120_Text_28B805: @ 0828B805 - .string "TY: You’re a natural!\n" + .string "TY: You're a natural!\n" .string "Got me some prime footage right here!$" Route111_Text_28B841: @ 0828B841 Route118_Text_28B841: @ 0828B841 Route120_Text_28B841: @ 0828B841 .string "TY: Do you only have the one POKéMON\n" - .string "and that’s it?\p" - .string "If you had more POKéMON, it’d make for\n" + .string "and that's it?\p" + .string "If you had more POKéMON, it'd make for\n" .string "better footage, but…$" Route111_Text_28B8B1: @ 0828B8B1 @@ -2844,21 +2844,21 @@ Route111_Text_28B8F6: @ 0828B8F6 Route118_Text_28B8F6: @ 0828B8F6 Route120_Text_28B8F6: @ 0828B8F6 .string "TY: Yep, I got it all.\n" - .string "That whole battle’s on camera.$" + .string "That whole battle's on camera.$" gTVInSearchOfTrainersText00:: @ 0828B92C .string "IN SEARCH OF TRAINERS…\p" - .string "GABBY: Hi! Today I’m visiting an area\n" + .string "GABBY: Hi! Today I'm visiting an area\n" .string "near {STR_VAR_1}.\p" - .string "We’re trying to spot some up-and-\n" + .string "We're trying to spot some up-and-\n" .string "coming new talent in the field.\p" .string "Today, we turned our lens on the\n" .string "TRAINER {PLAYER}.\p" - .string "There’s something about this TRAINER\n" + .string "There's something about this TRAINER\n" .string "that piqued our interest.$" gTVInSearchOfTrainersText01:: @ 0828BA20 - .string "We’ve battled {PLAYER} before, but we\n" + .string "We've battled {PLAYER} before, but we\n" .string "can attest that the TRAINER has most\l" .string "definitely improved from before.\p" .string "I knew we were onto someone special\n" @@ -2870,12 +2870,12 @@ gTVInSearchOfTrainersText02:: @ 0828BAC8 .string "Well, the fastest way is to battle.\n" .string "And so we began our investigation!\p" .string "… …\p" - .string "That’s how we ended up in battle\n" + .string "That's how we ended up in battle\n" .string "with {PLAYER}.\p" .string "In a dominating performance, we were\n" .string "flattened, rolled up, and tossed aside!\p" .string "{PLAYER} is ruthlessly strong…\p" - .string "Here’s our impressions after having\n" + .string "Here's our impressions after having\n" .string "battled our featured TRAINER.$" gTVInSearchOfTrainersText03:: @ 0828BC18 @@ -2888,7 +2888,7 @@ gTVInSearchOfTrainersText03:: @ 0828BC18 .string "{STR_VAR_2} was the move the TRAINER\n" .string "used last in our battle.\p" .string "The move {STR_VAR_2} is {STR_VAR_1}\n" - .string "and {STR_VAR_3}’s sign of friendship!$" + .string "and {STR_VAR_3}'s sign of friendship!$" gTVInSearchOfTrainersText04:: @ 0828BD20 .string "…I lost confidence in myself as\n" @@ -2896,14 +2896,14 @@ gTVInSearchOfTrainersText04:: @ 0828BD20 .string "We were beaten before we could launch\n" .string "a single attack.\l" .string "Ohhh… Snivel…\p" - .string "In spite of that, {PLAYER}’s battles\n" + .string "In spite of that, {PLAYER}'s battles\n" .string "are worth seeing.\p" .string "I recommend confident TRAINERS to\n" .string "challenge {PLAYER}.$" gTVInSearchOfTrainersText05:: @ 0828BE01 - .string "There’s only one thing to be said.\n" - .string "Don’t you dare throw a POKé BALL during\l" + .string "There's only one thing to be said.\n" + .string "Don't you dare throw a POKé BALL during\l" .string "a TRAINER battle!\p" .string "{PLAYER} is certainly strong, but has\n" .string "no clue about the basic rules.\p" @@ -2913,7 +2913,7 @@ gTVInSearchOfTrainersText05:: @ 0828BE01 gTVInSearchOfTrainersText06:: @ 0828BEEE .string "{PLAYER} is adept at reading the\n" - .string "opponent’s actions.\p" + .string "opponent's actions.\p" .string "The timing of item usage was remarkably\n" .string "effective!$" @@ -2922,21 +2922,21 @@ gTVInSearchOfTrainersText07:: @ 0828BF50 .string "I might even be pretty good.\p" .string "While we did end up losing, we did have\n" .string "a hotly contested battle.\p" - .string "But if you’re struggling against me,\n" + .string "But if you're struggling against me,\n" .string "you have a ways to go, {PLAYER}!$" gTVInSearchOfTrainersText08:: @ 0828C011 .string "After our battle, we asked {PLAYER} for\n" .string "a succinct summary.\p" .string "The TRAINER replied, “{STR_VAR_1}.â€\p" - .string "{PLAYER}’s POKéMON {STR_VAR_2} and\n" + .string "{PLAYER}'s POKéMON {STR_VAR_2} and\n" .string "{STR_VAR_3}…\l" .string "And “{STR_VAR_1}â€â€¦\p" - .string "Mmm! That’s deep! There’s deep\n" + .string "Mmm! That's deep! There's deep\n" .string "significance behind that quote!\p" - .string "It’s no surprise--a good TRAINER has\n" + .string "It's no surprise--a good TRAINER has\n" .string "good things to say.\p" - .string "That’s all for today!\n" + .string "That's all for today!\n" .string "See you again on our next broadcast!$" gTVPokemonContestLiveUpdates2Text00:: @ 0828C137 @@ -2949,7 +2949,7 @@ gTVPokemonContestLiveUpdates2Text00:: @ 0828C137 .string "Spectators: ?!!!!\p" .string "MC: Oh! It looks like the CONTEST\n" .string "participants are headed this way!\p" - .string "I’ll try to get an impromptu interview\n" + .string "I'll try to get an impromptu interview\n" .string "for you folks at home!\p" .string "Spectators: ?!!!!\n" .string "?!!!!$" @@ -2958,16 +2958,16 @@ gTVPokemonContestLiveUpdates2Text01:: @ 0828C28C .string "MC: Excuse me!\n" .string "Thanks for joining us on live TV!\p" .string "May I congratulate you on your win?\p" - .string "What was the key factor in today’s\n" + .string "What was the key factor in today's\n" .string "stunning victory?\p" .string "BEAUTY: We gave it our best effort\n" .string "today, my {STR_VAR_2} and I!\p" - .string "But I’m sure we wouldn’t have made it\n" - .string "if it weren’t for all the help we\l" + .string "But I'm sure we wouldn't have made it\n" + .string "if it weren't for all the help we\l" .string "received leading up to the CONTEST!\p" .string "MC: Do you have a special someone\n" - .string "with whom you’d like to share your joy?\l" - .string "Let’s hear it live!\p" + .string "with whom you'd like to share your joy?\l" + .string "Let's hear it live!\p" .string "BEAUTY: Hey, out there!\p" .string "{STR_VAR_3}! Are you watching?\n" .string "We did it!\l" @@ -2978,19 +2978,19 @@ gTVPokemonContestLiveUpdates2Text02:: @ 0828C45B .string "Thanks for joining us on live TV!\p" .string "You must be disappointed by that turn\n" .string "of events. Do you have any comments?\p" - .string "BEAUTY: It’s heartbreaking…\n" + .string "BEAUTY: It's heartbreaking…\n" .string "My {STR_VAR_2} and I, we did our best…\p" - .string "But I feel like I’ve let down everyone\n" + .string "But I feel like I've let down everyone\n" .string "who has supported us through this.\p" - .string "MC: I hate to say it, but the POKéMON’s\n" + .string "MC: I hate to say it, but the POKéMON's\n" .string "coloration is a little wanting.\p" - .string "BEAUTY: {STR_VAR_3}, I’m so sorry…\n" - .string "I’ll do better next time, I swear…\l" + .string "BEAUTY: {STR_VAR_3}, I'm so sorry…\n" + .string "I'll do better next time, I swear…\l" .string "…Sniff… Waaaaah!\p" .string "Spectators: See that?\n" .string "The poor girl!\p" .string "MC: Uh… Uh-oh…\p" - .string "Uh… That’s all the time we have today!\n" + .string "Uh… That's all the time we have today!\n" .string "Thanks for tuning in!$" gTVPokemonContestLiveUpdates2Text03:: @ 0828C662 @@ -2999,13 +2999,13 @@ gTVPokemonContestLiveUpdates2Text03:: @ 0828C662 .string "How did your CONTEST appearance go?\p" .string "BEAUTY: Nothing went right…\n" .string "For some reason, my {STR_VAR_2}\l" - .string "couldn’t attract any popularity.\p" - .string "MC: I hate to say it, but the POKéMON’s\n" + .string "couldn't attract any popularity.\p" + .string "MC: I hate to say it, but the POKéMON's\n" .string "coloration is a little wanting.\p" .string "BEAUTY: … … … … … …\n" .string "…Sniff… Waaaaah!\p" .string "Spectators: See that?\n" .string "The poor girl!\p" .string "MC: Uh… Uh-oh…\p" - .string "Uh… That’s all the time we have today!\n" + .string "Uh… That's all the time we have today!\n" .string "Thanks for tuning in!$" diff --git a/data/text_input_strings.s b/data/text_input_strings.s index 37d31642b..919b49416 100644 --- a/data/text_input_strings.s +++ b/data/text_input_strings.s @@ -51,7 +51,7 @@ gUnknown_0862B9C7:: @ 862B9C7 .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$" gUnknown_0862B9E0:: @ 862B9E0 - .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}â€{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $" + .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}â€{CLEAR 18}‘{CLEAR 19}'{CLEAR 18} $" gUnknown_0862B9F9:: @ 862B9F9 .string "ABCDE$" diff --git a/data/trade.s b/data/trade.s index d9708d0e6..b96c5adb3 100644 --- a/data/trade.s +++ b/data/trade.s @@ -95,7 +95,7 @@ gText_TheTradeHasBeenCanceled:: @ 832DB76 .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$" gText_YourOnlyPkmnForBattle:: @ 832DB9C - .string "That’s your only\nPOKéMON for battle.$" + .string "That's your only\nPOKéMON for battle.$" gText_WaitingForYourFriend:: @ 832DBC1 .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…$" diff --git a/src/battle_message.c b/src/battle_message.c index 47c4cbe1d..7f54fc26a 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -71,58 +71,58 @@ static const u8 sText_ABoosted[] = _(" a boosted"); static const u8 sText_PkmnGrewToLv[] = _("{B_BUFF1} grew to\nLV. {B_BUFF2}!{UNKNOWN_A}\p"); static const u8 sText_PkmnLearnedMove[] = _("{B_BUFF1} learned\n{B_BUFF2}!{UNKNOWN_A}\p"); static const u8 sText_TryToLearnMove1[] = _("{B_BUFF1} is trying to\nlearn {B_BUFF2}.\p"); -static const u8 sText_TryToLearnMove2[] = _("But, {B_BUFF1} can’t learn\nmore than four moves.\p"); +static const u8 sText_TryToLearnMove2[] = _("But, {B_BUFF1} can't learn\nmore than four moves.\p"); static const u8 sText_TryToLearnMove3[] = _("Delete a move to make\nroom for {B_BUFF2}?"); static const u8 sText_PkmnForgotMove[] = _("{B_BUFF1} forgot\n{B_BUFF2}.\p"); static const u8 sText_StopLearningMove[] = _("{PAUSE 32}Stop learning\n{B_BUFF2}?"); static const u8 sText_DidNotLearnMove[] = _("{B_BUFF1} did not learn\n{B_BUFF2}.\p"); static const u8 sText_UseNextPkmn[] = _("Use next POKéMON?"); -static const u8 sText_AttackMissed[] = _("{B_ATK_NAME_WITH_PREFIX}’s\nattack missed!"); +static const u8 sText_AttackMissed[] = _("{B_ATK_NAME_WITH_PREFIX}'s\nattack missed!"); static const u8 sText_PkmnProtectedItself[] = _("{B_DEF_NAME_WITH_PREFIX}\nprotected itself!"); static const u8 sText_AvoidedDamage[] = _("{B_DEF_NAME_WITH_PREFIX} avoided\ndamage with {B_DEF_ABILITY}!"); static const u8 sText_PkmnMakesGroundMiss[] = _("{B_DEF_NAME_WITH_PREFIX} makes GROUND\nmoves miss with {B_DEF_ABILITY}!"); static const u8 sText_PkmnAvoidedAttack[] = _("{B_DEF_NAME_WITH_PREFIX} avoided\nthe attack!"); -static const u8 sText_ItDoesntAffect[] = _("It doesn’t affect\n{B_DEF_NAME_WITH_PREFIX}…"); +static const u8 sText_ItDoesntAffect[] = _("It doesn't affect\n{B_DEF_NAME_WITH_PREFIX}…"); static const u8 sText_AttackerFainted[] = _("{B_ATK_NAME_WITH_PREFIX}\nfainted!\p"); static const u8 sText_TargetFainted[] = _("{B_DEF_NAME_WITH_PREFIX}\nfainted!\p"); static const u8 sText_PlayerGotMoney[] = _("{B_PLAYER_NAME} got Â¥{B_BUFF1}\nfor winning!\p"); static const u8 sText_PlayerWhiteout[] = _("{B_PLAYER_NAME} is out of\nusable POKéMON!\p"); static const u8 sText_PlayerWhiteout2[] = _("{B_PLAYER_NAME} whited out!{PAUSE_UNTIL_PRESS}"); static const u8 sText_PreventsEscape[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} prevents\nescape with {B_SCR_ACTIVE_ABILITY}!\p"); -static const u8 sText_CantEscape2[] = _("Can’t escape!\p"); -static const u8 sText_AttackerCantEscape[] = _("{B_ATK_NAME_WITH_PREFIX} can’t escape!"); +static const u8 sText_CantEscape2[] = _("Can't escape!\p"); +static const u8 sText_AttackerCantEscape[] = _("{B_ATK_NAME_WITH_PREFIX} can't escape!"); static const u8 sText_HitXTimes[] = _("Hit {B_BUFF1} time(s)!"); static const u8 sText_PkmnFellAsleep[] = _("{B_EFF_NAME_WITH_PREFIX}\nfell asleep!"); -static const u8 sText_PkmnMadeSleep[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nmade {B_EFF_NAME_WITH_PREFIX} sleep!"); +static const u8 sText_PkmnMadeSleep[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nmade {B_EFF_NAME_WITH_PREFIX} sleep!"); static const u8 sText_PkmnAlreadyAsleep[] = _("{B_DEF_NAME_WITH_PREFIX} is\nalready asleep!"); static const u8 sText_PkmnAlreadyAsleep2[] = _("{B_ATK_NAME_WITH_PREFIX} is\nalready asleep!"); -static const u8 sText_PkmnWasntAffected[] = _("{B_DEF_NAME_WITH_PREFIX}\nwasn’t affected!"); +static const u8 sText_PkmnWasntAffected[] = _("{B_DEF_NAME_WITH_PREFIX}\nwasn't affected!"); static const u8 sText_PkmnWasPoisoned[] = _("{B_EFF_NAME_WITH_PREFIX}\nwas poisoned!"); -static const u8 sText_PkmnPoisonedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\npoisoned {B_EFF_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnPoisonedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\npoisoned {B_EFF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnHurtByPoison[] = _("{B_ATK_NAME_WITH_PREFIX} is hurt\nby poison!"); static const u8 sText_PkmnAlreadyPoisoned[] = _("{B_DEF_NAME_WITH_PREFIX} is already\npoisoned."); static const u8 sText_PkmnBadlyPoisoned[] = _("{B_EFF_NAME_WITH_PREFIX} is badly\npoisoned!"); static const u8 sText_PkmnEnergyDrained[] = _("{B_DEF_NAME_WITH_PREFIX} had its\nenergy drained!"); static const u8 sText_PkmnWasBurned[] = _("{B_EFF_NAME_WITH_PREFIX} was burned!"); -static const u8 sText_PkmnBurnedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nburned {B_EFF_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnBurnedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nburned {B_EFF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnHurtByBurn[] = _("{B_ATK_NAME_WITH_PREFIX} is hurt\nby its burn!"); static const u8 sText_PkmnAlreadyHasBurn[] = _("{B_DEF_NAME_WITH_PREFIX} already\nhas a burn."); static const u8 sText_PkmnWasFrozen[] = _("{B_EFF_NAME_WITH_PREFIX} was\nfrozen solid!"); -static const u8 sText_PkmnFrozenBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nfroze {B_EFF_NAME_WITH_PREFIX} solid!"); +static const u8 sText_PkmnFrozenBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nfroze {B_EFF_NAME_WITH_PREFIX} solid!"); static const u8 sText_PkmnIsFrozen[] = _("{B_ATK_NAME_WITH_PREFIX} is\nfrozen solid!"); static const u8 sText_PkmnWasDefrosted[] = _("{B_DEF_NAME_WITH_PREFIX} was\ndefrosted!"); static const u8 sText_PkmnWasDefrosted2[] = _("{B_ATK_NAME_WITH_PREFIX} was\ndefrosted!"); static const u8 sText_PkmnWasDefrostedBy[] = _("{B_ATK_NAME_WITH_PREFIX} was\ndefrosted by {B_CURRENT_MOVE}!"); static const u8 sText_PkmnWasParalyzed[] = _("{B_EFF_NAME_WITH_PREFIX} is paralyzed!\nIt may be unable to move!"); -static const u8 sText_PkmnWasParalyzedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nparalyzed {B_EFF_NAME_WITH_PREFIX}!\lIt may be unable to move!"); -static const u8 sText_PkmnIsParalyzed[] = _("{B_ATK_NAME_WITH_PREFIX} is paralyzed!\nIt can’t move!"); +static const u8 sText_PkmnWasParalyzedBy[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nparalyzed {B_EFF_NAME_WITH_PREFIX}!\lIt may be unable to move!"); +static const u8 sText_PkmnIsParalyzed[] = _("{B_ATK_NAME_WITH_PREFIX} is paralyzed!\nIt can't move!"); static const u8 sText_PkmnIsAlreadyParalyzed[] = _("{B_DEF_NAME_WITH_PREFIX} is\nalready paralyzed!"); static const u8 sText_PkmnHealedParalysis[] = _("{B_DEF_NAME_WITH_PREFIX} was\nhealed of paralysis!"); -static const u8 sText_PkmnDreamEaten[] = _("{B_DEF_NAME_WITH_PREFIX}’s\ndream was eaten!"); -static const u8 sText_StatsWontIncrease[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_BUFF1}\nwon’t go higher!"); -static const u8 sText_StatsWontDecrease[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\nwon’t go lower!"); -static const u8 sText_TeamStoppedWorking[] = _("Your team’s {B_BUFF1}\nstopped working!"); -static const u8 sText_FoeStoppedWorking[] = _("The foe’s {B_BUFF1}\nstopped working!"); +static const u8 sText_PkmnDreamEaten[] = _("{B_DEF_NAME_WITH_PREFIX}'s\ndream was eaten!"); +static const u8 sText_StatsWontIncrease[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\nwon't go higher!"); +static const u8 sText_StatsWontDecrease[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\nwon't go lower!"); +static const u8 sText_TeamStoppedWorking[] = _("Your team's {B_BUFF1}\nstopped working!"); +static const u8 sText_FoeStoppedWorking[] = _("The foe's {B_BUFF1}\nstopped working!"); static const u8 sText_PkmnIsConfused[] = _("{B_ATK_NAME_WITH_PREFIX} is\nconfused!"); static const u8 sText_PkmnHealedConfusion[] = _("{B_ATK_NAME_WITH_PREFIX} snapped\nout of confusion!"); static const u8 sText_PkmnWasConfused[] = _("{B_EFF_NAME_WITH_PREFIX} became\nconfused!"); @@ -134,14 +134,14 @@ static const u8 sText_PkmnBlownAway[] = _("{B_DEF_NAME_WITH_PREFIX} was\nblown a static const u8 sText_PkmnChangedType[] = _("{B_ATK_NAME_WITH_PREFIX} transformed\ninto the {B_BUFF1} type!"); static const u8 sText_PkmnFlinched[] = _("{B_ATK_NAME_WITH_PREFIX} flinched!"); static const u8 sText_PkmnRegainedHealth[] = _("{B_DEF_NAME_WITH_PREFIX} regained\nhealth!"); -static const u8 sText_PkmnHPFull[] = _("{B_DEF_NAME_WITH_PREFIX}’s\nHP is full!"); -static const u8 sText_PkmnRaisedSpDef[] = _("{B_ATK_PREFIX2}’s {B_CURRENT_MOVE}\nraised SP. DEF!"); -static const u8 sText_PkmnRaisedSpDefALittle[] = _("{B_ATK_PREFIX2}’s {B_CURRENT_MOVE}\nraised SP. DEF a little!"); -static const u8 sText_PkmnRaisedDef[] = _("{B_ATK_PREFIX2}’s {B_CURRENT_MOVE}\nraised DEFENSE!"); -static const u8 sText_PkmnRaisedDefALittle[] = _("{B_ATK_PREFIX2}’s {B_CURRENT_MOVE}\nraised DEFENSE a little!"); -static const u8 sText_PkmnCoveredByVeil[] = _("{B_ATK_PREFIX2}’s party is covered\nby a veil!"); -static const u8 sText_PkmnUsedSafeguard[] = _("{B_DEF_NAME_WITH_PREFIX}’s party is protected\nby SAFEGUARD!"); -static const u8 sText_PkmnSafeguardExpired[] = _("{B_ATK_PREFIX3}’s party is no longer\nprotected by SAFEGUARD!"); +static const u8 sText_PkmnHPFull[] = _("{B_DEF_NAME_WITH_PREFIX}'s\nHP is full!"); +static const u8 sText_PkmnRaisedSpDef[] = _("{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\nraised SP. DEF!"); +static const u8 sText_PkmnRaisedSpDefALittle[] = _("{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\nraised SP. DEF a little!"); +static const u8 sText_PkmnRaisedDef[] = _("{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\nraised DEFENSE!"); +static const u8 sText_PkmnRaisedDefALittle[] = _("{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\nraised DEFENSE a little!"); +static const u8 sText_PkmnCoveredByVeil[] = _("{B_ATK_PREFIX2}'s party is covered\nby a veil!"); +static const u8 sText_PkmnUsedSafeguard[] = _("{B_DEF_NAME_WITH_PREFIX}'s party is protected\nby SAFEGUARD!"); +static const u8 sText_PkmnSafeguardExpired[] = _("{B_ATK_PREFIX3}'s party is no longer\nprotected by SAFEGUARD!"); static const u8 sText_PkmnWentToSleep[] = _("{B_ATK_NAME_WITH_PREFIX} went\nto sleep!"); static const u8 sText_PkmnSleptHealthy[] = _("{B_ATK_NAME_WITH_PREFIX} slept and\nbecame healthy!"); static const u8 sText_PkmnWhippedWhirlwind[] = _("{B_ATK_NAME_WITH_PREFIX} whipped\nup a whirlwind!"); @@ -152,7 +152,7 @@ static const u8 sText_PkmnFlewHigh[] = _("{B_ATK_NAME_WITH_PREFIX} flew\nup high static const u8 sText_PkmnDugHole[] = _("{B_ATK_NAME_WITH_PREFIX} dug a hole!"); static const u8 sText_PkmnHidUnderwater[] = _("{B_ATK_NAME_WITH_PREFIX} hid\nunderwater!"); static const u8 sText_PkmnSprangUp[] = _("{B_ATK_NAME_WITH_PREFIX} sprang up!"); -static const u8 sText_PkmnSqueezedByBind[] = _("{B_DEF_NAME_WITH_PREFIX} was squeezed by\n{B_ATK_NAME_WITH_PREFIX}’s BIND!"); +static const u8 sText_PkmnSqueezedByBind[] = _("{B_DEF_NAME_WITH_PREFIX} was squeezed by\n{B_ATK_NAME_WITH_PREFIX}'s BIND!"); static const u8 sText_PkmnTrappedInVortex[] = _("{B_DEF_NAME_WITH_PREFIX} was trapped\nin the vortex!"); static const u8 sText_PkmnTrappedBySandTomb[] = _("{B_DEF_NAME_WITH_PREFIX} was trapped\nby SAND TOMB!"); static const u8 sText_PkmnWrappedBy[] = _("{B_DEF_NAME_WITH_PREFIX} was WRAPPED by\n{B_ATK_NAME_WITH_PREFIX}!"); @@ -167,21 +167,21 @@ static const u8 sText_PkmnHitWithRecoil[] = _("{B_ATK_NAME_WITH_PREFIX} is hit\n static const u8 sText_PkmnProtectedItself2[] = _("{B_ATK_NAME_WITH_PREFIX} protected\nitself!"); static const u8 sText_PkmnBuffetedBySandstorm[] = _("{B_ATK_NAME_WITH_PREFIX} is buffeted\nby the sandstorm!"); static const u8 sText_PkmnPeltedByHail[] = _("{B_ATK_NAME_WITH_PREFIX} is pelted\nby HAIL!"); -static const u8 sText_PkmnsXWoreOff[] = _("{B_ATK_PREFIX1}’s {B_BUFF1}\nwore off!"); +static const u8 sText_PkmnsXWoreOff[] = _("{B_ATK_PREFIX1}'s {B_BUFF1}\nwore off!"); static const u8 sText_PkmnSeeded[] = _("{B_DEF_NAME_WITH_PREFIX} was seeded!"); static const u8 sText_PkmnEvadedAttack[] = _("{B_DEF_NAME_WITH_PREFIX} evaded\nthe attack!"); -static const u8 sText_PkmnSappedByLeechSeed[] = _("{B_ATK_NAME_WITH_PREFIX}’s health is\nsapped by LEECH SEED!"); +static const u8 sText_PkmnSappedByLeechSeed[] = _("{B_ATK_NAME_WITH_PREFIX}'s health is\nsapped by LEECH SEED!"); static const u8 sText_PkmnFastAsleep[] = _("{B_ATK_NAME_WITH_PREFIX} is fast\nasleep."); static const u8 sText_PkmnWokeUp[] = _("{B_ATK_NAME_WITH_PREFIX} woke up!"); -static const u8 sText_PkmnUproarKeptAwake[] = _("But {B_SCR_ACTIVE_NAME_WITH_PREFIX}’s UPROAR\nkept it awake!"); +static const u8 sText_PkmnUproarKeptAwake[] = _("But {B_SCR_ACTIVE_NAME_WITH_PREFIX}'s UPROAR\nkept it awake!"); static const u8 sText_PkmnWokeUpInUproar[] = _("{B_ATK_NAME_WITH_PREFIX} woke up\nin the UPROAR!"); static const u8 sText_PkmnCausedUproar[] = _("{B_ATK_NAME_WITH_PREFIX} caused\nan UPROAR!"); static const u8 sText_PkmnMakingUproar[] = _("{B_ATK_NAME_WITH_PREFIX} is making\nan UPROAR!"); static const u8 sText_PkmnCalmedDown[] = _("{B_ATK_NAME_WITH_PREFIX} calmed down."); -static const u8 sText_PkmnCantSleepInUproar[] = _("But {B_DEF_NAME_WITH_PREFIX} can’t\nsleep in an UPROAR!"); +static const u8 sText_PkmnCantSleepInUproar[] = _("But {B_DEF_NAME_WITH_PREFIX} can't\nsleep in an UPROAR!"); static const u8 sText_PkmnStockpiled[] = _("{B_ATK_NAME_WITH_PREFIX} STOCKPILED\n{B_BUFF1}!"); -static const u8 sText_PkmnCantStockpile[] = _("{B_ATK_NAME_WITH_PREFIX} can’t\nSTOCKPILE any more!"); -static const u8 sText_PkmnCantSleepInUproar2[] = _("But {B_DEF_NAME_WITH_PREFIX} can’t\nsleep in an UPROAR!"); +static const u8 sText_PkmnCantStockpile[] = _("{B_ATK_NAME_WITH_PREFIX} can't\nSTOCKPILE any more!"); +static const u8 sText_PkmnCantSleepInUproar2[] = _("But {B_DEF_NAME_WITH_PREFIX} can't\nsleep in an UPROAR!"); static const u8 sText_UproarKeptPkmnAwake[] = _("But the UPROAR kept\n{B_DEF_NAME_WITH_PREFIX} awake!"); static const u8 sText_PkmnStayedAwakeUsing[] = _("{B_DEF_NAME_WITH_PREFIX} stayed awake\nusing its {B_DEF_ABILITY}!"); static const u8 sText_PkmnStoringEnergy[] = _("{B_ATK_NAME_WITH_PREFIX} is storing\nenergy!"); @@ -193,45 +193,45 @@ static const u8 sText_PkmnTransformedInto[] = _("{B_ATK_NAME_WITH_PREFIX} transf static const u8 sText_PkmnMadeSubstitute[] = _("{B_ATK_NAME_WITH_PREFIX} made\na SUBSTITUTE!"); static const u8 sText_PkmnHasSubstitute[] = _("{B_ATK_NAME_WITH_PREFIX} already\nhas a SUBSTITUTE!"); static const u8 sText_SubstituteDamaged[] = _("The SUBSTITUTE took damage\nfor {B_DEF_NAME_WITH_PREFIX}!\p"); -static const u8 sText_PkmnSubstituteFaded[] = _("{B_DEF_NAME_WITH_PREFIX}’s\nSUBSTITUTE faded!\p"); +static const u8 sText_PkmnSubstituteFaded[] = _("{B_DEF_NAME_WITH_PREFIX}'s\nSUBSTITUTE faded!\p"); static const u8 sText_PkmnMustRecharge[] = _("{B_ATK_NAME_WITH_PREFIX} must\nrecharge!"); -static const u8 sText_PkmnRageBuilding[] = _("{B_DEF_NAME_WITH_PREFIX}’s RAGE\nis building!"); -static const u8 sText_PkmnMoveWasDisabled[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\nwas disabled!"); +static const u8 sText_PkmnRageBuilding[] = _("{B_DEF_NAME_WITH_PREFIX}'s RAGE\nis building!"); +static const u8 sText_PkmnMoveWasDisabled[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\nwas disabled!"); static const u8 sText_PkmnMoveDisabledNoMore[] = _("{B_ATK_NAME_WITH_PREFIX} is disabled\nno more!"); static const u8 sText_PkmnGotEncore[] = _("{B_DEF_NAME_WITH_PREFIX} got\nan ENCORE!"); -static const u8 sText_PkmnEncoreEnded[] = _("{B_ATK_NAME_WITH_PREFIX}’s ENCORE\nended!"); +static const u8 sText_PkmnEncoreEnded[] = _("{B_ATK_NAME_WITH_PREFIX}'s ENCORE\nended!"); static const u8 sText_PkmnTookAim[] = _("{B_ATK_NAME_WITH_PREFIX} took aim\nat {B_DEF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnSketchedMove[] = _("{B_ATK_NAME_WITH_PREFIX} SKETCHED\n{B_BUFF1}!"); static const u8 sText_PkmnTryingToTakeFoe[] = _("{B_ATK_NAME_WITH_PREFIX} is trying\nto take its foe with it!"); static const u8 sText_PkmnTookFoe[] = _("{B_DEF_NAME_WITH_PREFIX} took\n{B_ATK_NAME_WITH_PREFIX} with it!"); -static const u8 sText_PkmnReducedPP[] = _("Reduced {B_DEF_NAME_WITH_PREFIX}’s\n{B_BUFF1} by {B_BUFF2}!"); -static const u8 sText_PkmnStoleItem[] = _("{B_ATK_NAME_WITH_PREFIX} stole\n{B_DEF_NAME_WITH_PREFIX}’s {B_LAST_ITEM}!"); -static const u8 sText_TargetCantEscapeNow[] = _("{B_DEF_NAME_WITH_PREFIX} can’t\nescape now!"); +static const u8 sText_PkmnReducedPP[] = _("Reduced {B_DEF_NAME_WITH_PREFIX}'s\n{B_BUFF1} by {B_BUFF2}!"); +static const u8 sText_PkmnStoleItem[] = _("{B_ATK_NAME_WITH_PREFIX} stole\n{B_DEF_NAME_WITH_PREFIX}'s {B_LAST_ITEM}!"); +static const u8 sText_TargetCantEscapeNow[] = _("{B_DEF_NAME_WITH_PREFIX} can't\nescape now!"); static const u8 sText_PkmnFellIntoNightmare[] = _("{B_DEF_NAME_WITH_PREFIX} fell into\na NIGHTMARE!"); static const u8 sText_PkmnLockedInNightmare[] = _("{B_ATK_NAME_WITH_PREFIX} is locked\nin a NIGHTMARE!"); static const u8 sText_PkmnLaidCurse[] = _("{B_ATK_NAME_WITH_PREFIX} cut its own HP and\nlaid a CURSE on {B_DEF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnAfflictedByCurse[] = _("{B_ATK_NAME_WITH_PREFIX} is afflicted\nby the CURSE!"); -static const u8 sText_SpikesScattered[] = _("SPIKES were scattered all around\nthe opponent’s side!"); +static const u8 sText_SpikesScattered[] = _("SPIKES were scattered all around\nthe opponent's side!"); static const u8 sText_PkmnHurtBySpikes[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is hurt\nby SPIKES!"); static const u8 sText_PkmnIdentified[] = _("{B_ATK_NAME_WITH_PREFIX} identified\n{B_DEF_NAME_WITH_PREFIX}!"); -static const u8 sText_PkmnPerishCountFell[] = _("{B_ATK_NAME_WITH_PREFIX}’s PERISH count\nfell to {B_BUFF1}!"); +static const u8 sText_PkmnPerishCountFell[] = _("{B_ATK_NAME_WITH_PREFIX}'s PERISH count\nfell to {B_BUFF1}!"); static const u8 sText_PkmnBracedItself[] = _("{B_ATK_NAME_WITH_PREFIX} braced\nitself!"); static const u8 sText_PkmnEnduredHit[] = _("{B_DEF_NAME_WITH_PREFIX} ENDURED\nthe hit!"); static const u8 sText_MagnitudeStrength[] = _("MAGNITUDE {B_BUFF1}!"); static const u8 sText_PkmnCutHPMaxedAttack[] = _("{B_ATK_NAME_WITH_PREFIX} cut its own HP\nand maximized ATTACK!"); -static const u8 sText_PkmnCopiedStatChanges[] = _("{B_ATK_NAME_WITH_PREFIX} copied\n{B_DEF_NAME_WITH_PREFIX}’s stat changes!"); -static const u8 sText_PkmnGotFree[] = _("{B_ATK_NAME_WITH_PREFIX} got free of\n{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}!"); +static const u8 sText_PkmnCopiedStatChanges[] = _("{B_ATK_NAME_WITH_PREFIX} copied\n{B_DEF_NAME_WITH_PREFIX}'s stat changes!"); +static const u8 sText_PkmnGotFree[] = _("{B_ATK_NAME_WITH_PREFIX} got free of\n{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}!"); static const u8 sText_PkmnShedLeechSeed[] = _("{B_ATK_NAME_WITH_PREFIX} shed\nLEECH SEED!"); static const u8 sText_PkmnBlewAwaySpikes[] = _("{B_ATK_NAME_WITH_PREFIX} blew away\nSPIKES!"); static const u8 sText_PkmnFledFromBattle[] = _("{B_ATK_NAME_WITH_PREFIX} fled from\nbattle!"); static const u8 sText_PkmnForesawAttack[] = _("{B_ATK_NAME_WITH_PREFIX} foresaw\nan attack!"); static const u8 sText_PkmnTookAttack[] = _("{B_DEF_NAME_WITH_PREFIX} took the\n{B_BUFF1} attack!"); static const u8 sText_PkmnChoseXAsDestiny[] = _("{B_ATK_NAME_WITH_PREFIX} chose\n{B_CURRENT_MOVE} as its destiny!"); -static const u8 sText_PkmnAttack[] = _("{B_BUFF1}’s attack!"); +static const u8 sText_PkmnAttack[] = _("{B_BUFF1}'s attack!"); static const u8 sText_PkmnCenterAttention[] = _("{B_ATK_NAME_WITH_PREFIX} became the\ncenter of attention!"); static const u8 sText_PkmnChargingPower[] = _("{B_ATK_NAME_WITH_PREFIX} began\ncharging power!"); static const u8 sText_NaturePowerTurnedInto[] = _("NATURE POWER turned into\n{B_CURRENT_MOVE}!"); -static const u8 sText_PkmnStatusNormal[] = _("{B_ATK_NAME_WITH_PREFIX}’s status\nreturned to normal!"); +static const u8 sText_PkmnStatusNormal[] = _("{B_ATK_NAME_WITH_PREFIX}'s status\nreturned to normal!"); static const u8 sText_PkmnSubjectedToTorment[] = _("{B_DEF_NAME_WITH_PREFIX} was subjected\nto TORMENT!"); static const u8 sText_PkmnTighteningFocus[] = _("{B_ATK_NAME_WITH_PREFIX} is tightening\nits focus!"); static const u8 sText_PkmnFellForTaunt[] = _("{B_DEF_NAME_WITH_PREFIX} fell for\nthe TAUNT!"); @@ -240,93 +240,93 @@ static const u8 sText_PkmnSwitchedItems[] = _("{B_ATK_NAME_WITH_PREFIX} switched static const u8 sText_PkmnObtainedX[] = _("{B_ATK_NAME_WITH_PREFIX} obtained\n{B_BUFF1}."); static const u8 sText_PkmnObtainedX2[] = _("{B_DEF_NAME_WITH_PREFIX} obtained\n{B_BUFF2}."); static const u8 sText_PkmnObtainedXYObtainedZ[] = _("{B_ATK_NAME_WITH_PREFIX} obtained\n{B_BUFF1}.\p{B_DEF_NAME_WITH_PREFIX} obtained\n{B_BUFF2}."); -static const u8 sText_PkmnCopiedFoe[] = _("{B_ATK_NAME_WITH_PREFIX} copied\n{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}!"); +static const u8 sText_PkmnCopiedFoe[] = _("{B_ATK_NAME_WITH_PREFIX} copied\n{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}!"); static const u8 sText_PkmnMadeWish[] = _("{B_ATK_NAME_WITH_PREFIX} made a WISH!"); -static const u8 sText_PkmnWishCameTrue[] = _("{B_BUFF1}’s WISH\ncame true!"); +static const u8 sText_PkmnWishCameTrue[] = _("{B_BUFF1}'s WISH\ncame true!"); static const u8 sText_PkmnPlantedRoots[] = _("{B_ATK_NAME_WITH_PREFIX} planted its roots!"); static const u8 sText_PkmnAbsorbedNutrients[] = _("{B_ATK_NAME_WITH_PREFIX} absorbed\nnutrients with its roots!"); static const u8 sText_PkmnAnchoredItself[] = _("{B_DEF_NAME_WITH_PREFIX} anchored\nitself with its roots!"); static const u8 sText_PkmnWasMadeDrowsy[] = _("{B_ATK_NAME_WITH_PREFIX} made\n{B_DEF_NAME_WITH_PREFIX} drowsy!"); -static const u8 sText_PkmnKnockedOff[] = _("{B_ATK_NAME_WITH_PREFIX} knocked off\n{B_DEF_NAME_WITH_PREFIX}’s {B_LAST_ITEM}!"); +static const u8 sText_PkmnKnockedOff[] = _("{B_ATK_NAME_WITH_PREFIX} knocked off\n{B_DEF_NAME_WITH_PREFIX}'s {B_LAST_ITEM}!"); static const u8 sText_PkmnSwappedAbilities[] = _("{B_ATK_NAME_WITH_PREFIX} swapped abilities\nwith its opponent!"); -static const u8 sText_PkmnSealedOpponentMove[] = _("{B_ATK_NAME_WITH_PREFIX} sealed the\nopponent’s move(s)!"); +static const u8 sText_PkmnSealedOpponentMove[] = _("{B_ATK_NAME_WITH_PREFIX} sealed the\nopponent's move(s)!"); static const u8 sText_PkmnWantsGrudge[] = _("{B_ATK_NAME_WITH_PREFIX} wants the\nopponent to bear a GRUDGE!"); -static const u8 sText_PkmnLostPPGrudge[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_BUFF1} lost\nall its PP due to the GRUDGE!"); +static const u8 sText_PkmnLostPPGrudge[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} lost\nall its PP due to the GRUDGE!"); static const u8 sText_PkmnShroudedItself[] = _("{B_ATK_NAME_WITH_PREFIX} shrouded\nitself in {B_CURRENT_MOVE}!"); -static const u8 sText_PkmnMoveBounced[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_CURRENT_MOVE}\nwas bounced back by MAGIC COAT!"); +static const u8 sText_PkmnMoveBounced[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE}\nwas bounced back by MAGIC COAT!"); static const u8 sText_PkmnWaitsForTarget[] = _("{B_ATK_NAME_WITH_PREFIX} waits for a target\nto make a move!"); -static const u8 sText_PkmnSnatchedMove[] = _("{B_DEF_NAME_WITH_PREFIX} SNATCHED\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s move!"); -static const u8 sText_ElectricityWeakened[] = _("Electricity’s power was\nweakened!"); -static const u8 sText_FireWeakened[] = _("Fire’s power was\nweakened!"); +static const u8 sText_PkmnSnatchedMove[] = _("{B_DEF_NAME_WITH_PREFIX} SNATCHED\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s move!"); +static const u8 sText_ElectricityWeakened[] = _("Electricity's power was\nweakened!"); +static const u8 sText_FireWeakened[] = _("Fire's power was\nweakened!"); static const u8 sText_XFoundOneY[] = _("{B_ATK_NAME_WITH_PREFIX} found\none {B_LAST_ITEM}!"); static const u8 sText_SoothingAroma[] = _("A soothing aroma wafted\nthrough the area!"); -static const u8 sText_ItemsCantBeUsedNow[] = _("Items can’t be used now.{PAUSE 64}"); +static const u8 sText_ItemsCantBeUsedNow[] = _("Items can't be used now.{PAUSE 64}"); static const u8 sText_ForXCommaYZ[] = _("For {B_SCR_ACTIVE_NAME_WITH_PREFIX},\n{B_LAST_ITEM} {B_BUFF1}"); static const u8 sText_PkmnUsedXToGetPumped[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} used\n{B_LAST_ITEM} to get pumped!"); -static const u8 sText_PkmnLostFocus[] = _("{B_ATK_NAME_WITH_PREFIX} lost its\nfocus and couldn’t move!"); +static const u8 sText_PkmnLostFocus[] = _("{B_ATK_NAME_WITH_PREFIX} lost its\nfocus and couldn't move!"); static const u8 sText_PkmnWasDraggedOut[] = _("{B_DEF_NAME_WITH_PREFIX} was\ndragged out!\p"); static const u8 sText_TheWallShattered[] = _("The wall shattered!"); static const u8 sText_ButNoEffect[] = _("But it had no effect!"); static const u8 sText_PkmnHasNoMovesLeft[] = _("{B_ACTIVE_NAME_WITH_PREFIX} has no\nmoves left!\p"); -static const u8 sText_PkmnMoveIsDisabled[] = _("{B_ACTIVE_NAME_WITH_PREFIX}’s {B_CURRENT_MOVE}\nis disabled!\p"); -static const u8 sText_PkmnCantUseMoveTorment[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can’t use the same\nmove in a row due to the TORMENT!\p"); -static const u8 sText_PkmnCantUseMoveTaunt[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can’t use\n{B_CURRENT_MOVE} after the TAUNT!\p"); -static const u8 sText_PkmnCantUseMoveSealed[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can’t use the\nsealed {B_CURRENT_MOVE}!\p"); -static const u8 sText_PkmnMadeItRain[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nmade it rain!"); -static const u8 sText_PkmnRaisedSpeed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nraised its SPEED!"); +static const u8 sText_PkmnMoveIsDisabled[] = _("{B_ACTIVE_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE}\nis disabled!\p"); +static const u8 sText_PkmnCantUseMoveTorment[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use the same\nmove in a row due to the TORMENT!\p"); +static const u8 sText_PkmnCantUseMoveTaunt[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use\n{B_CURRENT_MOVE} after the TAUNT!\p"); +static const u8 sText_PkmnCantUseMoveSealed[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use the\nsealed {B_CURRENT_MOVE}!\p"); +static const u8 sText_PkmnMadeItRain[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nmade it rain!"); +static const u8 sText_PkmnRaisedSpeed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nraised its SPEED!"); static const u8 sText_PkmnProtectedBy[] = _("{B_DEF_NAME_WITH_PREFIX} was protected\nby {B_DEF_ABILITY}!"); -static const u8 sText_PkmnPreventsUsage[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents {B_ATK_NAME_WITH_PREFIX}\lfrom using {B_CURRENT_MOVE}!"); +static const u8 sText_PkmnPreventsUsage[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents {B_ATK_NAME_WITH_PREFIX}\lfrom using {B_CURRENT_MOVE}!"); static const u8 sText_PkmnRestoredHPUsing[] = _("{B_DEF_NAME_WITH_PREFIX} restored HP\nusing its {B_DEF_ABILITY}!"); -static const u8 sText_PkmnsXMadeYUseless[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} useless!"); -static const u8 sText_PkmnChangedTypeWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nmade it the {B_BUFF1} type!"); -static const u8 sText_PkmnPreventsParalysisWith[] = _("{B_EFF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents paralysis!"); -static const u8 sText_PkmnPreventsRomanceWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents romance!"); -static const u8 sText_PkmnPreventsPoisoningWith[] = _("{B_EFF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents poisoning!"); -static const u8 sText_PkmnPreventsConfusionWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevents confusion!"); -static const u8 sText_PkmnRaisedFirePowerWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nraised its FIRE power!"); +static const u8 sText_PkmnsXMadeYUseless[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} useless!"); +static const u8 sText_PkmnChangedTypeWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nmade it the {B_BUFF1} type!"); +static const u8 sText_PkmnPreventsParalysisWith[] = _("{B_EFF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents paralysis!"); +static const u8 sText_PkmnPreventsRomanceWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents romance!"); +static const u8 sText_PkmnPreventsPoisoningWith[] = _("{B_EFF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents poisoning!"); +static const u8 sText_PkmnPreventsConfusionWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevents confusion!"); +static const u8 sText_PkmnRaisedFirePowerWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nraised its FIRE power!"); static const u8 sText_PkmnAnchorsItselfWith[] = _("{B_DEF_NAME_WITH_PREFIX} anchors\nitself with {B_DEF_ABILITY}!"); -static const u8 sText_PkmnCutsAttackWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\ncuts {B_DEF_NAME_WITH_PREFIX}’s ATTACK!"); -static const u8 sText_PkmnPreventsStatLossWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nprevents stat loss!"); -static const u8 sText_PkmnHurtsWith[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nhurt {B_ATK_NAME_WITH_PREFIX}!"); -static const u8 sText_PkmnTraced[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} TRACED\n{B_BUFF1}’s {B_BUFF2}!"); -static const u8 sText_PkmnsXPreventsBurns[] = _("{B_EFF_NAME_WITH_PREFIX}’s {B_EFF_ABILITY}\nprevents burns!"); -static const u8 sText_PkmnsXBlocksY[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nblocks {B_CURRENT_MOVE}!"); -static const u8 sText_PkmnsXBlocksY2[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nblocks {B_CURRENT_MOVE}!"); -static const u8 sText_PkmnsXRestoredHPALittle2[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_ATK_ABILITY}\nrestored its HP a little!"); -static const u8 sText_PkmnsXWhippedUpSandstorm[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nwhipped up a sandstorm!"); -static const u8 sText_PkmnsXIntensifiedSun[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nintensified the sun’s rays!"); -static const u8 sText_PkmnsXPreventsYLoss[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nprevents {B_BUFF1} loss!"); -static const u8 sText_PkmnsXInfatuatedY[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\ninfatuated {B_ATK_NAME_WITH_PREFIX}!"); -static const u8 sText_PkmnsXMadeYIneffective[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} ineffective!"); -static const u8 sText_PkmnsXCuredYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); +static const u8 sText_PkmnCutsAttackWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncuts {B_DEF_NAME_WITH_PREFIX}'s ATTACK!"); +static const u8 sText_PkmnPreventsStatLossWith[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nprevents stat loss!"); +static const u8 sText_PkmnHurtsWith[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nhurt {B_ATK_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnTraced[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} TRACED\n{B_BUFF1}'s {B_BUFF2}!"); +static const u8 sText_PkmnsXPreventsBurns[] = _("{B_EFF_NAME_WITH_PREFIX}'s {B_EFF_ABILITY}\nprevents burns!"); +static const u8 sText_PkmnsXBlocksY[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nblocks {B_CURRENT_MOVE}!"); +static const u8 sText_PkmnsXBlocksY2[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nblocks {B_CURRENT_MOVE}!"); +static const u8 sText_PkmnsXRestoredHPALittle2[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}\nrestored its HP a little!"); +static const u8 sText_PkmnsXWhippedUpSandstorm[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nwhipped up a sandstorm!"); +static const u8 sText_PkmnsXIntensifiedSun[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nintensified the sun's rays!"); +static const u8 sText_PkmnsXPreventsYLoss[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nprevents {B_BUFF1} loss!"); +static const u8 sText_PkmnsXInfatuatedY[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\ninfatuated {B_ATK_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnsXMadeYIneffective[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nmade {B_CURRENT_MOVE} ineffective!"); +static const u8 sText_PkmnsXCuredYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); static const u8 sText_ItSuckedLiquidOoze[] = _("It sucked up the\nLIQUID OOZE!"); static const u8 sText_PkmnTransformed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} transformed!"); -static const u8 sText_PkmnsXTookAttack[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\ntook the attack!"); -const u8 gText_PkmnsXPreventsSwitching[] = _("{B_BUFF1}’s {B_LAST_ABILITY}\nprevents switching!\p"); -static const u8 sText_PreventedFromWorking[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_DEF_ABILITY}\nprevented {B_SCR_ACTIVE_NAME_WITH_PREFIX}’s\l{B_BUFF1} from working!"); -static const u8 sText_PkmnsXMadeItIneffective[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nmade it ineffective!"); -static const u8 sText_PkmnsXPreventsFlinching[] = _("{B_EFF_NAME_WITH_PREFIX}’s {B_EFF_ABILITY}\nprevents flinching!"); -static const u8 sText_PkmnsXPreventsYsZ[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_ATK_ABILITY}\nprevents {B_DEF_NAME_WITH_PREFIX}’s\l{B_DEF_ABILITY} from working!"); -static const u8 sText_PkmnsXCuredItsYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); -static const u8 sText_PkmnsXHadNoEffectOnY[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_SCR_ACTIVE_ABILITY}\nhad no effect on {B_EFF_NAME_WITH_PREFIX}!"); +static const u8 sText_PkmnsXTookAttack[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\ntook the attack!"); +const u8 gText_PkmnsXPreventsSwitching[] = _("{B_BUFF1}'s {B_LAST_ABILITY}\nprevents switching!\p"); +static const u8 sText_PreventedFromWorking[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\nprevented {B_SCR_ACTIVE_NAME_WITH_PREFIX}'s\l{B_BUFF1} from working!"); +static const u8 sText_PkmnsXMadeItIneffective[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nmade it ineffective!"); +static const u8 sText_PkmnsXPreventsFlinching[] = _("{B_EFF_NAME_WITH_PREFIX}'s {B_EFF_ABILITY}\nprevents flinching!"); +static const u8 sText_PkmnsXPreventsYsZ[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}\nprevents {B_DEF_NAME_WITH_PREFIX}'s\l{B_DEF_ABILITY} from working!"); +static const u8 sText_PkmnsXCuredItsYProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\ncured its {B_BUFF1} problem!"); +static const u8 sText_PkmnsXHadNoEffectOnY[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nhad no effect on {B_EFF_NAME_WITH_PREFIX}!"); static const u8 sText_StatSharply[] = _("sharply "); const u8 gText_StatRose[] = _("rose!"); static const u8 sText_StatHarshly[] = _("harshly "); static const u8 sText_StatFell[] = _("fell!"); -static const u8 sText_PkmnsStatChanged[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_BUFF1}\n{B_BUFF2}"); -const u8 gText_PkmnsStatChanged2[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_PkmnsStatChanged[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +const u8 gText_PkmnsStatChanged2[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); static const u8 sText_UsingXTheYOfZN[] = _("Using {B_LAST_ITEM}, the {B_BUFF1}\nof {B_SCR_ACTIVE_NAME_WITH_PREFIX} {B_BUFF2}"); -static const u8 sText_PkmnsStatChanged3[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_BUFF1}\n{B_BUFF2}"); -static const u8 sText_PkmnsStatChanged4[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\n{B_BUFF2}"); -static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}’s stats won’t\ngo any higher!"); -static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}’s stats won’t\ngo any lower!"); +static const u8 sText_PkmnsStatChanged3[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_PkmnsStatChanged4[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}'s stats won't\ngo any higher!"); +static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}'s stats won't\ngo any lower!"); static const u8 sText_CriticalHit[] = _("A critical hit!"); -static const u8 sText_OneHitKO[] = _("It’s a one-hit KO!"); +static const u8 sText_OneHitKO[] = _("It's a one-hit KO!"); static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); static const u8 sText_AndEllipsis[] = _("And…\p"); -static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can’t be\nforgotten now.\p"); -static const u8 sText_NotVeryEffective[] = _("It’s not very effective…"); -static const u8 sText_SuperEffective[] = _("It’s super effective!"); +static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can't be\nforgotten now.\p"); +static const u8 sText_NotVeryEffective[] = _("It's not very effective…"); +static const u8 sText_SuperEffective[] = _("It's super effective!"); static const u8 sText_GotAwaySafely[] = _("{PLAY_SE 0x0011}Got away safely!\p"); static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE 0x0011}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p"); static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE 0x0011}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p"); @@ -339,9 +339,9 @@ static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); static const u8 sText_WildFled[] = _("{PLAY_SE 0x0011}{B_LINK_OPPONENT1_NAME} fled!"); static const u8 sText_TwoWildFled[] = _("{PLAY_SE 0x0011}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!"); -static const u8 sText_NoRunningFromTrainers[] = _("No! There’s no running\nfrom a TRAINER battle!\p"); -static const u8 sText_CantEscape[] = _("Can’t escape!\p"); -static const u8 sText_DontLeaveBirch[] = _("PROF. BIRCH: Don’t leave me like this!\p"); +static const u8 sText_NoRunningFromTrainers[] = _("No! There's no running\nfrom a TRAINER battle!\p"); +static const u8 sText_CantEscape[] = _("Can't escape!\p"); +static const u8 sText_DontLeaveBirch[] = _("PROF. BIRCH: Don't leave me like this!\p"); static const u8 sText_ButNothingHappened[] = _("But nothing happened!"); static const u8 sText_ButItFailed[] = _("But it failed!"); static const u8 sText_ItHurtConfusion[] = _("It hurt itself in its\nconfusion!"); @@ -369,26 +369,26 @@ static const u8 sText_TooWeakForSubstitute[] = _("It was too weak to make\na SUB static const u8 sText_SharedPain[] = _("The battlers shared\ntheir pain!"); static const u8 sText_BellChimed[] = _("A bell chimed!"); static const u8 sText_FaintInThree[] = _("All affected POKéMON will\nfaint in three turns!"); -static const u8 sText_NoPPLeft[] = _("There’s no PP left for\nthis move!\p"); +static const u8 sText_NoPPLeft[] = _("There's no PP left for\nthis move!\p"); static const u8 sText_ButNoPPLeft[] = _("But there was no PP left\nfor the move!"); static const u8 sText_PkmnIgnoresAsleep[] = _("{B_ATK_NAME_WITH_PREFIX} ignored\norders while asleep!"); static const u8 sText_PkmnIgnoredOrders[] = _("{B_ATK_NAME_WITH_PREFIX} ignored\norders!"); static const u8 sText_PkmnBeganToNap[] = _("{B_ATK_NAME_WITH_PREFIX} began to nap!"); static const u8 sText_PkmnLoafing[] = _("{B_ATK_NAME_WITH_PREFIX} is\nloafing around!"); -static const u8 sText_PkmnWontObey[] = _("{B_ATK_NAME_WITH_PREFIX} won’t\nobey!"); +static const u8 sText_PkmnWontObey[] = _("{B_ATK_NAME_WITH_PREFIX} won't\nobey!"); static const u8 sText_PkmnTurnedAway[] = _("{B_ATK_NAME_WITH_PREFIX} turned away!"); static const u8 sText_PkmnPretendNotNotice[] = _("{B_ATK_NAME_WITH_PREFIX} pretended\nnot to notice!"); static const u8 sText_EnemyAboutToSwitchPkmn[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME} is\nabout to use {B_BUFF2}.\pWill {B_PLAYER_NAME} change\nPOKéMON?"); static const u8 sText_PkmnLearnedMove2[] = _("{B_ATK_NAME_WITH_PREFIX} learned\n{B_BUFF1}!"); static const u8 sText_PlayerDefeatedLinkTrainerTrainer1[] = _("Player defeated\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!\p"); static const u8 sText_CreptCloser[] = _("{B_PLAYER_NAME} crept closer to\n{B_OPPONENT_MON1_NAME}!"); -static const u8 sText_CantGetCloser[] = _("{B_PLAYER_NAME} can’t get any closer!"); +static const u8 sText_CantGetCloser[] = _("{B_PLAYER_NAME} can't get any closer!"); static const u8 sText_PkmnWatchingCarefully[] = _("{B_OPPONENT_MON1_NAME} is watching\ncarefully!"); static const u8 sText_PkmnCuriousAboutX[] = _("{B_OPPONENT_MON1_NAME} is curious about\nthe {B_BUFF1}!"); static const u8 sText_PkmnEnthralledByX[] = _("{B_OPPONENT_MON1_NAME} is enthralled by\nthe {B_BUFF1}!"); static const u8 sText_PkmnIgnoredX[] = _("{B_OPPONENT_MON1_NAME} completely ignored\nthe {B_BUFF1}!"); static const u8 sText_ThrewPokeblockAtPkmn[] = _("{B_PLAYER_NAME} threw a {POKEBLOCK}\nat the {B_OPPONENT_MON1_NAME}!"); -static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE 0x0049}ANNOUNCER: You’re out of\nSAFARI BALLS! Game over!\p"); +static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE 0x0049}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); static const u8 sText_OpponentMon1Appeared[] = _("{B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppeared[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppeared2[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p"); @@ -410,9 +410,9 @@ static const u8 sText_GoTwoPkmn[] = _("Go! {B_PLAYER_MON1_NAME} and\n{B_PLAYER_M static const u8 sText_GoPkmn2[] = _("Go! {B_BUFF1}!"); static const u8 sText_DoItPkmn[] = _("Do it! {B_BUFF1}!"); static const u8 sText_GoForItPkmn[] = _("Go for it, {B_BUFF1}!"); -static const u8 sText_YourFoesWeakGetEmPkmn[] = _("Your foe’s weak!\nGet ’em, {B_BUFF1}!"); +static const u8 sText_YourFoesWeakGetEmPkmn[] = _("Your foe's weak!\nGet 'em, {B_BUFF1}!"); static const u8 sText_LinkPartnerSentOutPkmnGoPkmn[] = _("{B_LINK_PARTNER_NAME} sent out {B_LINK_PLAYER_MON2_NAME}!\nGo! {B_LINK_PLAYER_MON1_NAME}!"); -static const u8 sText_PkmnThatsEnough[] = _("{B_BUFF1}, that’s enough!\nCome back!"); +static const u8 sText_PkmnThatsEnough[] = _("{B_BUFF1}, that's enough!\nCome back!"); static const u8 sText_PkmnComeBack[] = _("{B_BUFF1}, come back!"); static const u8 sText_PkmnOkComeBack[] = _("{B_BUFF1}, OK!\nCome back!"); static const u8 sText_PkmnGoodComeBack[] = _("{B_BUFF1}, good!\nCome back!"); @@ -467,8 +467,8 @@ static const u8 sText_PlayerUsedItem[] = _("{B_PLAYER_NAME} used\n{B_LAST_ITEM}! static const u8 sText_WallyUsedItem[] = _("WALLY used\n{B_LAST_ITEM}!"); static const u8 sText_Trainer1UsedItem[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\nused {B_LAST_ITEM}!"); static const u8 sText_TrainerBlockedBall[] = _("The TRAINER blocked the BALL!"); -static const u8 sText_DontBeAThief[] = _("Don’t be a thief!"); -static const u8 sText_ItDodgedBall[] = _("It dodged the thrown BALL!\nThis POKéMON can’t be caught!"); +static const u8 sText_DontBeAThief[] = _("Don't be a thief!"); +static const u8 sText_ItDodgedBall[] = _("It dodged the thrown BALL!\nThis POKéMON can't be caught!"); static const u8 sText_YouMissedPkmn[] = _("You missed the POKéMON!"); static const u8 sText_PkmnBrokeFree[] = _("Oh, no!\nThe POKéMON broke free!"); static const u8 sText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!"); @@ -478,30 +478,30 @@ static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} wa static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}"); static const u8 sText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_OPPONENT_MON1_NAME}?"); static const u8 sText_PkmnSentToPC[] = _("{B_OPPONENT_MON1_NAME} was sent to\n{B_PC_CREATOR_NAME} PC."); -static const u8 sText_Someones[] = _("someone’s"); -static const u8 sText_Lanettes[] = _("LANETTE’s"); -static const u8 sText_PkmnDataAddedToDex[] = _("{B_OPPONENT_MON1_NAME}’s data was\nadded to the POKéDEX.\p"); +static const u8 sText_Someones[] = _("someone's"); +static const u8 sText_Lanettes[] = _("LANETTE's"); +static const u8 sText_PkmnDataAddedToDex[] = _("{B_OPPONENT_MON1_NAME}'s data was\nadded to the POKéDEX.\p"); static const u8 sText_ItIsRaining[] = _("It is raining."); static const u8 sText_SandstormIsRaging[] = _("A sandstorm is raging."); -static const u8 sText_BoxIsFull[] = _("The BOX is full!\nYou can’t catch any more!\p"); +static const u8 sText_BoxIsFull[] = _("The BOX is full!\nYou can't catch any more!\p"); static const u8 sText_EnigmaBerry[] = _("ENIGMA BERRY"); static const u8 sText_BerrySuffix[] = _(" BERRY"); -static const u8 sText_PkmnsItemCuredParalysis[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\ncured paralysis!"); -static const u8 sText_PkmnsItemCuredPoison[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\ncured poison!"); -static const u8 sText_PkmnsItemHealedBurn[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nhealed its burn!"); -static const u8 sText_PkmnsItemDefrostedIt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\ndefrosted it!"); -static const u8 sText_PkmnsItemWokeIt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nwoke it from its sleep!"); -static const u8 sText_PkmnsItemSnappedOut[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nsnapped it out of confusion!"); -static const u8 sText_PkmnsItemCuredProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\ncured its {B_BUFF1} problem!"); -static const u8 sText_PkmnsItemNormalizedStatus[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nnormalized its status!"); -static const u8 sText_PkmnsItemRestoredHealth[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nrestored health!"); -static const u8 sText_PkmnsItemRestoredPP[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nrestored {B_BUFF1}’s PP!"); -static const u8 sText_PkmnsItemRestoredStatus[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nrestored its status!"); -static const u8 sText_PkmnsItemRestoredHPALittle[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s {B_LAST_ITEM}\nrestored its HP a little!"); +static const u8 sText_PkmnsItemCuredParalysis[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\ncured paralysis!"); +static const u8 sText_PkmnsItemCuredPoison[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\ncured poison!"); +static const u8 sText_PkmnsItemHealedBurn[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nhealed its burn!"); +static const u8 sText_PkmnsItemDefrostedIt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\ndefrosted it!"); +static const u8 sText_PkmnsItemWokeIt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nwoke it from its sleep!"); +static const u8 sText_PkmnsItemSnappedOut[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nsnapped it out of confusion!"); +static const u8 sText_PkmnsItemCuredProblem[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\ncured its {B_BUFF1} problem!"); +static const u8 sText_PkmnsItemNormalizedStatus[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nnormalized its status!"); +static const u8 sText_PkmnsItemRestoredHealth[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nrestored health!"); +static const u8 sText_PkmnsItemRestoredPP[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nrestored {B_BUFF1}'s PP!"); +static const u8 sText_PkmnsItemRestoredStatus[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nrestored its status!"); +static const u8 sText_PkmnsItemRestoredHPALittle[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\nrestored its HP a little!"); static const u8 sText_ItemAllowsOnlyYMove[] = _("{B_LAST_ITEM} allows the\nuse of only {B_CURRENT_MOVE}!\p"); static const u8 sText_PkmnHungOnWithX[] = _("{B_DEF_NAME_WITH_PREFIX} hung on\nusing its {B_LAST_ITEM}!"); const u8 gText_EmptyString3[] = _(""); -static const u8 sText_YouThrowABallNowRight[] = _("You throw a BALL now, right?\nI… I’ll do my best!"); +static const u8 sText_YouThrowABallNowRight[] = _("You throw a BALL now, right?\nI… I'll do my best!"); // early declaration of strings static const u8 sText_PkmnIncapableOfPower[]; @@ -1215,7 +1215,7 @@ const u8 gText_Win[] = _("{HIGHLIGHT TRANSPARENT}Win"); const u8 gText_Loss[] = _("{HIGHLIGHT TRANSPARENT}Loss"); const u8 gText_Draw[] = _("{HIGHLIGHT TRANSPARENT}Draw"); static const u8 sText_SpaceIs[] = _(" is"); -static const u8 sText_ApostropheS[] = _("’s"); +static const u8 sText_ApostropheS[] = _("'s"); static const u8 sATypeMove_Table[][17] = { @@ -1272,7 +1272,7 @@ static const u8 sText_InGamePartnerSentOutZGoN[] = _("{B_PARTNER_CLASS} {B_PARTN static const u8 sText_TwoInGameTrainersDefeated[] = _("{B_TRAINER1_CLASS} {B_TRAINER1_NAME} and\n{B_TRAINER2_CLASS} {B_TRAINER2_NAME}\lwere defeated!\p"); static const u8 sText_Trainer2LoseText[] = _("{B_TRAINER2_LOSE_TEXT}"); static const u8 sText_PkmnIncapableOfPower[] = _("{B_ATK_NAME_WITH_PREFIX} appears incapable\nof using its power!"); -static const u8 sText_GlintAppearsInEye[] = _("A glint appears in\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}’s eyes!"); +static const u8 sText_GlintAppearsInEye[] = _("A glint appears in\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s eyes!"); static const u8 sText_PkmnGettingIntoPosition[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is getting into\nposition!"); static const u8 sText_PkmnBeganGrowlingDeeply[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} began growling deeply!"); static const u8 sText_PkmnEagerForMore[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is eager for more!"); @@ -1284,16 +1284,16 @@ const u16 gStringIds_85CCF0A[] = }; static const u8 sText_RefIfNothingIsDecided[] = _("REFEREE: If nothing is decided in\n3 turns, we will go to judging!"); -static const u8 sText_RefThatsIt[] = _("REFEREE: That’s it! We will now go to\njudging to determine the winner!"); +static const u8 sText_RefThatsIt[] = _("REFEREE: That's it! We will now go to\njudging to determine the winner!"); static const u8 sText_RefJudgeMind[] = _("REFEREE: Judging category 1, Mind!\nThe POKéMON showing the most guts!\p"); static const u8 sText_RefJudgeSkill[] = _("REFEREE: Judging category 2, Skill!\nThe POKéMON using moves the best!\p"); static const u8 sText_RefJudgeBody[] = _("REFEREE: Judging category 3, Body!\nThe POKéMON with the most vitality!\p"); -static const u8 sText_RefJudgement1[] = _("REFEREE: Judgment: {B_BUFF1} to {B_BUFF2}!\nThe winner is {B_PLAYER_NAME}’s {B_PLAYER_MON1_NAME}!\p"); -static const u8 sText_RefJudgement2[] = _("REFEREE: Judgment: {B_BUFF1} to {B_BUFF2}!\nThe winner is {B_TRAINER1_NAME}’s {B_OPPONENT_MON1_NAME}!\p"); +static const u8 sText_RefJudgement1[] = _("REFEREE: Judgment: {B_BUFF1} to {B_BUFF2}!\nThe winner is {B_PLAYER_NAME}'s {B_PLAYER_MON1_NAME}!\p"); +static const u8 sText_RefJudgement2[] = _("REFEREE: Judgment: {B_BUFF1} to {B_BUFF2}!\nThe winner is {B_TRAINER1_NAME}'s {B_OPPONENT_MON1_NAME}!\p"); static const u8 sText_RefJudgement3[] = _("REFEREE: Judgment: 3 to 3!\nWe have a draw!\p"); -static const u8 sText_DefeatedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} defeated the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE’s decision!"); -static const u8 sText_LostToOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} lost to the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE’s decision!"); -static const u8 sText_TiedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} tied the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE’s decision!"); +static const u8 sText_DefeatedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} defeated the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE's decision!"); +static const u8 sText_LostToOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} lost to the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE's decision!"); +static const u8 sText_TiedOpponentByReferee[] = _("{B_PLAYER_MON1_NAME} tied the opponent\n{B_OPPONENT_MON1_NAME} in a REFEREE's decision!"); static const u8 sText_RefCommenceBattle[] = _("REFEREE: {B_PLAYER_MON1_NAME} VS {B_OPPONENT_MON1_NAME}!\nCommence battling!"); const u8 * const gRefereeStringsTable[] = @@ -1317,7 +1317,7 @@ static const u8 sText_Trainer1Fled[] = _( "{PLAY_SE 0x0011}{B_TRAINER1_CLASS} {B static const u8 sText_PlayerLostAgainstTrainer1[] = _("Player lost against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); static const u8 sText_PlayerBattledToDrawTrainer1[] = _("Player battled to a draw against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); const u8 gText_RecordBattleToPass[] = _("Would you like to record your battle\non your FRONTIER PASS?"); -const u8 gText_BattleRecordedOnPass[] = _("{B_PLAYER_NAME}’s battle result was recorded\non the FRONTIER PASS."); +const u8 gText_BattleRecordedOnPass[] = _("{B_PLAYER_NAME}'s battle result was recorded\non the FRONTIER PASS."); static const u8 sText_LinkTrainerWantsToBattlePause[] = _("{B_LINK_OPPONENT1_NAME}\nwants to battle!{PAUSE 49}"); static const u8 sText_TwoLinkTrainersWantToBattlePause[] = _("{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}\nwant to battle!{PAUSE 49}"); diff --git a/src/berry.c b/src/berry.c index 9f08165b8..24ed370c3 100644 --- a/src/berry.c +++ b/src/berry.c @@ -32,7 +32,7 @@ static u16 GetStageDurationByBerryType(u8); //.rodata static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers."); static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy."); -static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY’s thick skin and fruit are"); +static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY's thick skin and fruit are"); static const u8 sBerryDescriptionPart2_Chesto[] = _("very tough. It is dry-tasting all over."); static const u8 sBerryDescriptionPart1_Pecha[] = _("Very sweet and delicious."); static const u8 sBerryDescriptionPart2_Pecha[] = _("Also very tender - handle with care."); @@ -44,7 +44,7 @@ static const u8 sBerryDescriptionPart1_Leppa[] = _("Grows slower than CHERI and static const u8 sBerryDescriptionPart2_Leppa[] = _("The smaller the BERRY, the tastier."); static const u8 sBerryDescriptionPart1_Oran[] = _("A peculiar BERRY with a mix of flavors."); static const u8 sBerryDescriptionPart2_Oran[] = _("BERRIES grow in half a day."); -static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY’s color"); +static const u8 sBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY's color"); static const u8 sBerryDescriptionPart2_Persim[] = _("grows vivid when exposed to the sun."); static const u8 sBerryDescriptionPart1_Lum[] = _("Slow to grow. If raised with loving"); static const u8 sBerryDescriptionPart2_Lum[] = _("care, it may grow two BERRIES."); @@ -113,7 +113,7 @@ static const u8 sBerryDescriptionPart2_Apicot[] = _("what may happen or how it c static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY."); static const u8 sBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy."); static const u8 sBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the"); -static const u8 sBerryDescriptionPart2_Starf[] = _("world’s edge. Considered a mirage."); +static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a mirage."); static const u8 sBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY."); static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars."); diff --git a/src/berry_blender.c b/src/berry_blender.c index 7320e905f..121831e1b 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -260,10 +260,10 @@ static const u8 sText_PressAToStart[] = _("Press the A Button to start."); static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while."); static const u8 sText_CommunicationStandby[] = _("Communication standby…"); static const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?"); -static const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p"); +static const u8 sText_RunOutOfBerriesForBlending[] = _("You've run out of BERRIES for\nblending in the BERRY BLENDER.\p"); static const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p"); static const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER."); -static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p"); +static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("'s {POKEBLOCK} CASE is full.\p"); static const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING"); static const u8 sText_BerryUsed[] = _("BERRY USED"); static const u8 sText_SpaceBerry[] = _(" BERRY"); diff --git a/src/data/items.h b/src/data/items.h index a36a13033..7d7caa289 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3389,7 +3389,7 @@ const struct Item gItems[] = [ITEM_KINGS_ROCK] = { - .name = _("KING’S ROCK"), + .name = _("KING'S ROCK"), .itemId = ITEM_KINGS_ROCK, .price = 100, .holdEffect = HOLD_EFFECT_FLINCH, @@ -6311,7 +6311,7 @@ const struct Item gItems[] = [ITEM_OAKS_PARCEL] = { - .name = _("OAK’S PARCEL"), + .name = _("OAK'S PARCEL"), .itemId = ITEM_OAKS_PARCEL, .price = 0, .holdEffect = HOLD_EFFECT_NONE, diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 565c1acaf..0daf7fc86 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -7,19 +7,19 @@ const u8 gDummyPokedexText[] = _( const u8 gBulbasaurPokedexText[] = _( "BULBASAUR can be seen napping in bright\n" "sunlight. There is a seed on its back.\n" - "By soaking up the sun’s rays, the seed\n" + "By soaking up the sun's rays, the seed\n" "grows progressively larger."); const u8 gIvysaurPokedexText[] = _( - "To support its bulb, IVYSAUR’s legs\n" + "To support its bulb, IVYSAUR's legs\n" "grow sturdy. If it spends more time lying in\n" "the sunlight, the bud will soon bloom into\n" "a large flower."); const u8 gVenusaurPokedexText[] = _( - "VENUSAUR’s flower is said to take on vivid\n" + "VENUSAUR's flower is said to take on vivid\n" "colors if it gets plenty of nutrition and\n" - "sunlight. The flower’s aroma soothes the\n" + "sunlight. The flower's aroma soothes the\n" "emotions of people."); const u8 gCharmanderPokedexText[] = _( @@ -50,7 +50,7 @@ const u8 gWartortlePokedexText[] = _( "Its large tail is covered with rich, thick\n" "fur that deepens in color with age.\n" "The scratches on its shell are evidence\n" - "of this POKéMON’s toughness in battle."); + "of this POKéMON's toughness in battle."); const u8 gBlastoisePokedexText[] = _( "The waterspouts that protrude from its\n" @@ -119,7 +119,7 @@ const u8 gRattataPokedexText[] = _( "It will make its nest anywhere."); const u8 gRaticatePokedexText[] = _( - "A RATICATE’s sturdy fangs grow steadily.\n" + "A RATICATE's sturdy fangs grow steadily.\n" "To keep them ground down, it gnaws on\n" "rocks and logs. It may even chew on the\n" "walls of houses."); @@ -194,7 +194,7 @@ const u8 gNidoranMPokedexText[] = _( "The male NIDORAN has developed muscles\n" "that freely move its ears in any direction.\n" "Even the slightest sound does not escape\n" - "this POKéMON’s notice."); + "this POKéMON's notice."); const u8 gNidorinoPokedexText[] = _( "Its horn is harder than a diamond.\n" @@ -203,7 +203,7 @@ const u8 gNidorinoPokedexText[] = _( "challenges the foe with all its might."); const u8 gNidokingPokedexText[] = _( - "A NIDOKING’s thick tail packs enormously\n" + "A NIDOKING's thick tail packs enormously\n" "destructive power capable of toppling\n" "a metal transmission tower. Once it goes\n" "on a rampage, there is no stopping it."); @@ -222,7 +222,7 @@ const u8 gClefablePokedexText[] = _( const u8 gVulpixPokedexText[] = _( "It can freely control fire, making fiery\n" - "orbs fly like will-o’-the-wisps. Just\n" + "orbs fly like will-o'-the-wisps. Just\n" "before evolution, its six tails grow hot \n" "as if on fire."); @@ -234,7 +234,7 @@ const u8 gNinetalesPokedexText[] = _( const u8 gJigglypuffPokedexText[] = _( "Nothing can avoid falling asleep hearing a\n" - "JIGGLYPUFF’s song. The sound waves of its\n" + "JIGGLYPUFF's song. The sound waves of its\n" "singing voice match the brain waves of\n" "someone in a deep sleep."); @@ -317,7 +317,7 @@ const u8 gMeowthPokedexText[] = _( "shiny coins that glitter with light."); const u8 gPersianPokedexText[] = _( - "A PERSIAN’s six bold whiskers sense air\n" + "A PERSIAN's six bold whiskers sense air\n" "movements to determine what is in its\n" "vicinity. It becomes docile if grabbed\n" "by the whiskers."); @@ -336,7 +336,7 @@ const u8 gGolduckPokedexText[] = _( const u8 gMankeyPokedexText[] = _( "When it starts shaking and its nasal\n" - "breathing turns rough, it’s a sure sign\n" + "breathing turns rough, it's a sure sign\n" "of anger. However, since this happens\n" "instantly, there is no time to flee."); @@ -348,7 +348,7 @@ const u8 gPrimeapePokedexText[] = _( const u8 gGrowlithePokedexText[] = _( "Its superb sense of smell ensures that\n" - "this POKéMON won’t forget any scent,\n" + "this POKéMON won't forget any scent,\n" "no matter what. It uses its sense of smell\n" "to detect the emotions of others."); @@ -359,7 +359,7 @@ const u8 gArcaninePokedexText[] = _( "is its source of power."); const u8 gPoliwagPokedexText[] = _( - "It is possible to see this POKéMON’s spiral\n" + "It is possible to see this POKéMON's spiral\n" "innards right through its thin skin.\n" "However, the skin is also very flexible.\n" "Even sharp fangs bounce right off it."); @@ -390,7 +390,7 @@ const u8 gKadabraPokedexText[] = _( const u8 gAlakazamPokedexText[] = _( "While it has strong psychic abilities and\n" - "high intelligence, an ALAKAZAM’s muscles\n" + "high intelligence, an ALAKAZAM's muscles\n" "are very weak. It uses psychic power to\n" "move its body."); @@ -413,7 +413,7 @@ const u8 gMachampPokedexText[] = _( "a tough opponent."); const u8 gBellsproutPokedexText[] = _( - "A BELLSPROUT’s thin and flexible body lets\n" + "A BELLSPROUT's thin and flexible body lets\n" "it bend and sway to avoid any attack,\n" "however strong it may be. From its mouth,\n" "it leaks a fluid that melts even iron."); @@ -476,11 +476,11 @@ const u8 gSlowpokePokedexText[] = _( "It catches prey by dipping its tail in\n" "water at the side of a river. But it often\n" "forgets what it is doing and spends entire\n" - "days just loafing at water’s edge."); + "days just loafing at water's edge."); const u8 gSlowbroPokedexText[] = _( "Its tail has a SHELLDER firmly attached\n" - "with a bite. As a result, the tail can’t be\n" + "with a bite. As a result, the tail can't be\n" "used for fishing anymore. This forces it\n" "to reluctantly swim and catch prey."); @@ -528,7 +528,7 @@ const u8 gDewgongPokedexText[] = _( const u8 gGrimerPokedexText[] = _( "Born from polluted sludge in the sea,\n" - "GRIMER’s favorite food is anything filthy.\n" + "GRIMER's favorite food is anything filthy.\n" "They feed on wastewater pumped out from\n" "factories."); @@ -551,14 +551,14 @@ const u8 gCloysterPokedexText[] = _( "shell using the same system."); const u8 gGastlyPokedexText[] = _( - "When exposed to a strong wind, a GASTLY’s\n" + "When exposed to a strong wind, a GASTLY's\n" "gaseous body quickly dwindles away.\n" "They cluster under the eaves of houses\n" "to escape the ravages of wind."); const u8 gHaunterPokedexText[] = _( "If a HAUNTER beckons you while it is\n" - "floating in darkness, don’t approach it.\n" + "floating in darkness, don't approach it.\n" "This POKéMON will try to lick you with its\n" "tongue and steal your life away."); @@ -576,13 +576,13 @@ const u8 gOnixPokedexText[] = _( const u8 gDrowzeePokedexText[] = _( "If your nose becomes itchy while you are\n" - "sleeping, it’s a sure sign that a DROWZEE is\n" + "sleeping, it's a sure sign that a DROWZEE is\n" "standing above your pillow and trying to\n" "eat your dream through your nostrils."); const u8 gHypnoPokedexText[] = _( "The arcing movement and glitter of the\n" - "pendulum in a HYPNO’s hand lull the foe\n" + "pendulum in a HYPNO's hand lull the foe\n" "into deep hypnosis. While searching for\n" "prey, it polishes the pendulum."); @@ -617,7 +617,7 @@ const u8 gExeggcutePokedexText[] = _( "appear, it is close to evolution."); const u8 gExeggutorPokedexText[] = _( - "Originally from the tropics, EXEGGUTOR’s\n" + "Originally from the tropics, EXEGGUTOR's\n" "heads grow larger from exposure to strong\n" "sunlight. It is said that when the heads\n" "fall, they group to form an EXEGGCUTE."); @@ -665,9 +665,9 @@ const u8 gWeezingPokedexText[] = _( "from garbage are the ultimate feast."); const u8 gRhyhornPokedexText[] = _( - "Once it starts running, it doesn’t stop.\n" + "Once it starts running, it doesn't stop.\n" "Its tiny brain makes it so stupid that it\n" - "can’t remember why it started running in\n" + "can't remember why it started running in\n" "the first place."); const u8 gRhydonPokedexText[] = _( @@ -691,7 +691,7 @@ const u8 gTangelaPokedexText[] = _( const u8 gKangaskhanPokedexText[] = _( "If you come across a young KANGASKHAN\n" "playing by itself, never try to catch it.\n" - "The baby’s parent is sure to be in the area,\n" + "The baby's parent is sure to be in the area,\n" "and it will become violently enraged."); const u8 gHorseaPokedexText[] = _( @@ -810,12 +810,12 @@ const u8 gVaporeonPokedexText[] = _( const u8 gJolteonPokedexText[] = _( "Its cells generate weak power that is\n" - "amplified by its fur’s static electricity\n" + "amplified by its fur's static electricity\n" "to drop thunderbolts. The bristling fur is\n" "made of electrically charged needles."); const u8 gFlareonPokedexText[] = _( - "FLAREON’s fluffy fur releases heat into\n" + "FLAREON's fluffy fur releases heat into\n" "the air so that its body does not get\n" "excessively hot. Its body temperature can\n" "rise to a maximum of 1,650 degrees F."); @@ -857,7 +857,7 @@ const u8 gAerodactylPokedexText[] = _( "have been the king of the skies."); const u8 gSnorlaxPokedexText[] = _( - "SNORLAX’s typical day consists of nothing\n" + "SNORLAX's typical day consists of nothing\n" "more than eating and sleeping. It is such\n" "a docile POKéMON that there are children\n" "who use its big belly as a place to play."); @@ -917,16 +917,16 @@ const u8 gChikoritaPokedexText[] = _( "atmosphere that becalms the battlers."); const u8 gBayleefPokedexText[] = _( - "A BAYLEEF’s neck is ringed by curled-up\n" + "A BAYLEEF's neck is ringed by curled-up\n" "leaves. Inside each leaf is a small tree\n" "shoot. The fragrance of this shoot\n" "makes people peppy."); const u8 gMeganiumPokedexText[] = _( - "The fragrance of a MEGANIUM’s flower\n" + "The fragrance of a MEGANIUM's flower\n" "soothes and calms emotions. In battle,\n" "it gives off more of its becalming scent\n" - "to blunt the foe’s fighting spirit."); + "to blunt the foe's fighting spirit."); const u8 gCyndaquilPokedexText[] = _( "It flares flames from its back to protect\n" @@ -947,7 +947,7 @@ const u8 gTyphlosionPokedexText[] = _( "blasts that burn everything to cinders."); const u8 gTotodilePokedexText[] = _( - "Despite its small body, TOTODILE’s jaws\n" + "Despite its small body, TOTODILE's jaws\n" "are very powerful. While it may think it is\n" "just playfully nipping, its bite has enough\n" "strength to cause serious injury."); @@ -978,7 +978,7 @@ const u8 gFurretPokedexText[] = _( const u8 gHoothootPokedexText[] = _( "It has an internal organ that senses\n" - "the earth’s rotation. Using this special\n" + "the earth's rotation. Using this special\n" "organ, a HOOTHOOT begins hooting at\n" "precisely the same time every day."); @@ -992,7 +992,7 @@ const u8 gLedybaPokedexText[] = _( "LEDYBA communicate using a fluid that\n" "they secrete from where the legs join the\n" "body. They are said to convey feelings to\n" - "others by altering the fluid’s scent."); + "others by altering the fluid's scent."); const u8 gLedianPokedexText[] = _( "It is said that in lands with clean air,\n" @@ -1022,7 +1022,7 @@ const u8 gChinchouPokedexText[] = _( "When it senses danger, it discharges\n" "positive and negative electricity from its\n" "two antennae. It lives in depths beyond\n" - "sunlight’s reach."); + "sunlight's reach."); const u8 gLanturnPokedexText[] = _( "The light-emitting orbs on its back are\n" @@ -1063,7 +1063,7 @@ const u8 gTogeticPokedexText[] = _( const u8 gNatuPokedexText[] = _( "It runs up short trees that grow on the\n" "savanna to peck at new shoots.\n" - "A NATU’s eyes look as if they are\n" + "A NATU's eyes look as if they are\n" "always observing something."); const u8 gXatuPokedexText[] = _( @@ -1100,7 +1100,7 @@ const u8 gMarillPokedexText[] = _( "Its body is covered with water-repellent\n" "fur. Because of the fur, it can swim\n" "through water at high speed without being\n" - "slowed by the water’s resistance."); + "slowed by the water's resistance."); const u8 gAzumarillPokedexText[] = _( "It lives in water virtually all day long.\n" @@ -1128,7 +1128,7 @@ const u8 gHoppipPokedexText[] = _( const u8 gSkiploomPokedexText[] = _( "It blossoms when the temperature rises\n" - "above 64 degrees F. Because its flower’s\n" + "above 64 degrees F. Because its flower's\n" "blooming changes with the temperature,\n" "it is sometimes used as a thermometer."); @@ -1141,7 +1141,7 @@ const u8 gJumpluffPokedexText[] = _( const u8 gAipomPokedexText[] = _( "Its tail ends with a dexterous, handlike\n" "appendage. However, because it uses the\n" - "tail so much, AIPOM’s real hands have\n" + "tail so much, AIPOM's real hands have\n" "become rather clumsy."); const u8 gSunkernPokedexText[] = _( @@ -1171,7 +1171,7 @@ const u8 gWooperPokedexText[] = _( const u8 gQuagsirePokedexText[] = _( "A QUAGSIRE hunts by leaving its mouth wide\n" "open in water and waiting for its prey to\n" - "blunder in. Because it doesn’t move, it\n" + "blunder in. Because it doesn't move, it\n" "does not get very hungry."); const u8 gEspeonPokedexText[] = _( @@ -1182,7 +1182,7 @@ const u8 gEspeonPokedexText[] = _( const u8 gUmbreonPokedexText[] = _( "UMBREON evolved from exposure to the\n" - "moon’s energy pulses. It lurks in darkness\n" + "moon's energy pulses. It lurks in darkness\n" "and waits for its foes to move. The rings\n" "on its body glow when it leaps to attack."); @@ -1231,7 +1231,7 @@ const u8 gPinecoPokedexText[] = _( const u8 gForretressPokedexText[] = _( "It keeps itself inside its steel shell.\n" "The shell is opened when it is catching\n" - "prey, but it is so quick that the shell’s\n" + "prey, but it is so quick that the shell's\n" "inside cannot be seen."); const u8 gDunsparcePokedexText[] = _( @@ -1249,7 +1249,7 @@ const u8 gGligarPokedexText[] = _( const u8 gSteelixPokedexText[] = _( "STEELIX live even further underground\n" "than ONIX. This POKéMON is known to dig\n" - "toward the earth’s core, reaching a depth\n" + "toward the earth's core, reaching a depth\n" "of over six-tenths of a mile underground."); const u8 gSnubbullPokedexText[] = _( @@ -1316,7 +1316,7 @@ const u8 gMagcargoPokedexText[] = _( "The shell on its back is made of hardened\n" "magma. Tens of thousands of years spent\n" "living in volcanic craters have turned\n" - "MAGCARGO’s bodies into magma."); + "MAGCARGO's bodies into magma."); const u8 gSwinubPokedexText[] = _( "It roots for food by rubbing its snout\n" @@ -1369,7 +1369,7 @@ const u8 gSkarmoryPokedexText[] = _( const u8 gHoundourPokedexText[] = _( "HOUNDOUR communicate with each other\n" "using a variety of cries to corner their\n" - "prey. This POKéMON’s remarkable teamwork\n" + "prey. This POKéMON's remarkable teamwork\n" "is simply unparalleled."); const u8 gHoundoomPokedexText[] = _( @@ -1385,7 +1385,7 @@ const u8 gKingdraPokedexText[] = _( "even ships."); const u8 gPhanpyPokedexText[] = _( - "PHANPY’s big ears serve as broad fans.\n" + "PHANPY's big ears serve as broad fans.\n" "When it becomes hot, it flaps the ears\n" "busily to cool down. Even the young are\n" "very strong."); @@ -1394,7 +1394,7 @@ const u8 gDonphanPokedexText[] = _( "A DONPHAN is so strong it can easily haul\n" "a dump truck. Its hide has toughened to a\n" "rock-hard state. An ordinary sort of\n" - "attack won’t even leave a scratch."); + "attack won't even leave a scratch."); const u8 gPorygon2PokedexText[] = _( "It was created by humans using the power\n" @@ -1403,7 +1403,7 @@ const u8 gPorygon2PokedexText[] = _( "gestures and emotions on its own."); const u8 gStantlerPokedexText[] = _( - "STANTLER’s magnificent antlers were\n" + "STANTLER's magnificent antlers were\n" "once traded at high prices as works of art.\n" "As a result, this POKéMON was hunted\n" "close to extinction."); @@ -1429,8 +1429,8 @@ const u8 gHitmontopPokedexText[] = _( const u8 gSmoochumPokedexText[] = _( "It actively runs about, but also falls\n" "often. Whenever it falls, it will check its\n" - "reflection on a lake’s surface to make\n" - "sure its face hasn’t become dirty."); + "reflection on a lake's surface to make\n" + "sure its face hasn't become dirty."); const u8 gElekidPokedexText[] = _( "If it touches metal and discharges the\n" @@ -1447,7 +1447,7 @@ const u8 gMagbyPokedexText[] = _( const u8 gMiltankPokedexText[] = _( "It gives over five gallons of milk daily.\n" "Its sweet milk is enjoyed by children and\n" - "grown-ups alike. People who can’t drink\n" + "grown-ups alike. People who can't drink\n" "milk turn it into yogurt and eat it instead."); const u8 gBlisseyPokedexText[] = _( @@ -1478,7 +1478,7 @@ const u8 gLarvitarPokedexText[] = _( "A LARVITAR is born deep under the ground.\n" "It must eat its way through the soil above\n" "and reach the surface for it to see its\n" - "parents’ faces."); + "parents' faces."); const u8 gPupitarPokedexText[] = _( "A PUPITAR creates a gas inside its body\n" @@ -1514,10 +1514,10 @@ const u8 gTreeckoPokedexText[] = _( "It makes its nest in a giant tree in the\n" "forest. It ferociously guards against\n" "anything nearing its territory. It is said\n" - "to be the protector of the forest’s trees."); + "to be the protector of the forest's trees."); const u8 gGrovylePokedexText[] = _( - "Leaves grow out of this POKéMON’s body.\n" + "Leaves grow out of this POKéMON's body.\n" "They help obscure a GROVYLE from the eyes\n" "of its enemies while it is in a thickly\n" "overgrown forest."); @@ -1532,7 +1532,7 @@ const u8 gTorchicPokedexText[] = _( "If attacked, it strikes back by spitting\n" "balls of fire it forms in its stomach.\n" "A TORCHIC dislikes darkness because it\n" - "can’t see its surroundings."); + "can't see its surroundings."); const u8 gCombuskenPokedexText[] = _( "It lashes out with 10 kicks per second.\n" @@ -1550,7 +1550,7 @@ const u8 gMudkipPokedexText[] = _( "On land, it can powerfully lift large\n" "boulders by planting its four feet and\n" "heaving. It sleeps by burying itself in soil\n" - "at the water’s edge."); + "at the water's edge."); const u8 gMarshtompPokedexText[] = _( "Its toughened hind legs enable it to stand\n" @@ -1572,7 +1572,7 @@ const u8 gPoochyenaPokedexText[] = _( const u8 gMightyenaPokedexText[] = _( "In the wild, MIGHTYENA live in a pack.\n" - "They never defy their leader’s orders.\n" + "They never defy their leader's orders.\n" "They defeat foes with perfectly\n" "coordinated teamwork."); @@ -1704,7 +1704,7 @@ const u8 gSurskitPokedexText[] = _( const u8 gMasquerainPokedexText[] = _( "It intimidates foes with the large eyelike\n" - "patterns on its antennae. Because it can’t\n" + "patterns on its antennae. Because it can't\n" "fly if its wings get wet, it shelters itself\n" "from rain under large trees and eaves."); @@ -1722,15 +1722,15 @@ const u8 gBreloomPokedexText[] = _( const u8 gSlakothPokedexText[] = _( "It sleeps virtually all day and night long.\n" - "It doesn’t change its nest its entire life,\n" + "It doesn't change its nest its entire life,\n" "but it sometimes travels great distances\n" "by swimming in rivers."); const u8 gVigorothPokedexText[] = _( - "It can’t keep still because its blood boils\n" + "It can't keep still because its blood boils\n" "with energy. It runs through the fields\n" "and mountains all day to calm itself. If it\n" - "doesn’t, it can’t sleep at night."); + "doesn't, it can't sleep at night."); const u8 gSlakingPokedexText[] = _( "Hordes of SLAKING gather around trees\n" @@ -1783,7 +1783,7 @@ const u8 gMakuhitaPokedexText[] = _( const u8 gHariyamaPokedexText[] = _( "It has the habit of challenging others\n" "without hesitation to tests of strength.\n" - "It’s been known to stand on train tracks\n" + "It's been known to stand on train tracks\n" "and stop trains using forearm thrusts."); const u8 gAzurillPokedexText[] = _( @@ -1799,7 +1799,7 @@ const u8 gNosepassPokedexText[] = _( "seasons."); const u8 gSkittyPokedexText[] = _( - "A SKITTY’s adorably cute behavior makes it\n" + "A SKITTY's adorably cute behavior makes it\n" "highly popular. In battle, it makes its tail\n" "puff out. It threatens foes with a sharp\n" "growl."); @@ -1837,7 +1837,7 @@ const u8 gLaironPokedexText[] = _( const u8 gAggronPokedexText[] = _( "Its iron horns grow longer a little at\n" "a time. They are used to determine the\n" - "AGGRON’s age. The gouges in its armor are\n" + "AGGRON's age. The gouges in its armor are\n" "worn with pride as mementos from battles."); const u8 gMedititePokedexText[] = _( @@ -1848,7 +1848,7 @@ const u8 gMedititePokedexText[] = _( const u8 gMedichamPokedexText[] = _( "Through crushingly harsh yoga training, it\n" - "gained the power to foretell its foe’s\n" + "gained the power to foretell its foe's\n" "actions. It battles with elegant, dance-\n" "like movement."); @@ -1895,7 +1895,7 @@ const u8 gRoseliaPokedexText[] = _( "effect of making its foes careless."); const u8 gGulpinPokedexText[] = _( - "This POKéMON’s stomach fluid can even\n" + "This POKéMON's stomach fluid can even\n" "digest scrap iron. In one gulp, it can\n" "swallow something that is as large as\n" "itself."); @@ -1903,7 +1903,7 @@ const u8 gGulpinPokedexText[] = _( const u8 gSwalotPokedexText[] = _( "Its powerful stomach acid is capable of\n" "digesting almost anything. The one thing\n" - "in the whole world a SWALOT can’t digest is\n" + "in the whole world a SWALOT can't digest is\n" "its own stomach."); const u8 gCarvanhaPokedexText[] = _( @@ -1946,11 +1946,11 @@ const u8 gTorkoalPokedexText[] = _( "It battles using energy it gets from\n" "burning coal. When loosing smoke from its\n" "nostrils, it lets off a sound that is\n" - "similar to a locomotive’s horn."); + "similar to a locomotive's horn."); const u8 gSpoinkPokedexText[] = _( "A POKéMON that manipulates psychic power\n" - "at will. It doesn’t stop bouncing even when\n" + "at will. It doesn't stop bouncing even when\n" "it is asleep. It loves eating mushrooms\n" "that grow underground."); @@ -1964,7 +1964,7 @@ const u8 gSpindaPokedexText[] = _( "It is distinguished by a pattern of\n" "spots that is always different. Its\n" "unsteady, tottering walk has the\n" - "effect of fouling its foe’s aim."); + "effect of fouling its foe's aim."); const u8 gTrapinchPokedexText[] = _( "Its big jaws crunch through boulders.\n" @@ -1974,7 +1974,7 @@ const u8 gTrapinchPokedexText[] = _( const u8 gVibravaPokedexText[] = _( "It looses ultrasonic waves by rubbing its\n" - "wings together. Since a VIBRAVA’s wings\n" + "wings together. Since a VIBRAVA's wings\n" "are still in the process of growing, it can\n" "only fly short distances."); @@ -2016,7 +2016,7 @@ const u8 gZangoosePokedexText[] = _( const u8 gSeviperPokedexText[] = _( "SEVIPER and ZANGOOSE are eternal rivals.\n" - "It counters a ZANGOOSE’s dazzling agility\n" + "It counters a ZANGOOSE's dazzling agility\n" "with its swordlike tail, which also oozes\n" "a horrible poison."); @@ -2028,7 +2028,7 @@ const u8 gLunatonePokedexText[] = _( const u8 gSolrockPokedexText[] = _( "Solar energy is the source of this \n" - "POKéMON’s power. On sunny days, groups of\n" + "POKéMON's power. On sunny days, groups of\n" "SOLROCK line up facing the sun and absorb\n" "its light."); @@ -2036,7 +2036,7 @@ const u8 gBarboachPokedexText[] = _( "Its body is covered with a slimy film.\n" "The film acts as a barrier to prevent germs\n" "in muddy water from entering the\n" - "BARBOACH’s body."); + "BARBOACH's body."); const u8 gWhiscashPokedexText[] = _( "Mysteriously, it can foretell earthquakes.\n" @@ -2065,7 +2065,7 @@ const u8 gBaltoyPokedexText[] = _( const u8 gClaydolPokedexText[] = _( "A CLAYDOL sleeps while hovering in midair.\n" "Its arms are separate from its body.\n" - "They are kept floating by the POKéMON’s\n" + "They are kept floating by the POKéMON's\n" "manipulation of psychic power."); const u8 gLileepPokedexText[] = _( @@ -2222,7 +2222,7 @@ const u8 gLuvdiscPokedexText[] = _( "LUVDISC make the branches of CORSOLA\n" "their nests. There is a custom from long\n" "ago of giving a LUVDISC as a gift to\n" - "express one’s feelings of love."); + "express one's feelings of love."); const u8 gBagonPokedexText[] = _( "Although it is small, this POKéMON is very\n" diff --git a/src/data/region_map/region_map_entries.h b/src/data/region_map/region_map_entries.h index 9c7e3f2fc..0c79c04ac 100644 --- a/src/data/region_map/region_map_entries.h +++ b/src/data/region_map/region_map_entries.h @@ -126,7 +126,7 @@ static const u8 sMapName_MtMoon[] = _("MT. MOON"); static const u8 sMapName_SSAnne[] = _("S.S. ANNE"); static const u8 sMapName_UndergroundPath[] = _("UNDERGROUND PATH"); static const u8 sMapName_UndergroundPath2[] = _("UNDERGROUND PATH"); -static const u8 sMapName_DiglettsCave[] = _("DIGLETT’S CAVE"); +static const u8 sMapName_DiglettsCave[] = _("DIGLETT'S CAVE"); static const u8 sMapName_KantoVictoryRoad[] = _("VICTORY ROAD"); static const u8 sMapName_RocketHideout[] = _("ROCKET HIDEOUT"); static const u8 sMapName_SilphCo[] = _("SILPH CO."); diff --git a/src/data/text/abilities.h b/src/data/text/abilities.h index 97c29f9ee..093119726 100644 --- a/src/data/text/abilities.h +++ b/src/data/text/abilities.h @@ -14,14 +14,14 @@ static const u8 sObliviousDescription[] = _("Prevents attraction."); static const u8 sCloudNineDescription[] = _("Negates weather effects."); static const u8 sCompoundEyesDescription[] = _("Raises accuracy."); static const u8 sInsomniaDescription[] = _("Prevents sleep."); -static const u8 sColorChangeDescription[] = _("Changes type to foe’s move."); +static const u8 sColorChangeDescription[] = _("Changes type to foe's move."); static const u8 sImmunityDescription[] = _("Prevents poisoning."); static const u8 sFlashFireDescription[] = _("Powers up if hit by fire."); static const u8 sShieldDustDescription[] = _("Prevents added effects."); static const u8 sOwnTempoDescription[] = _("Prevents confusion."); static const u8 sSuctionCupsDescription[] = _("Firmly anchors the body."); -static const u8 sIntimidateDescription[] = _("Lowers the foe’s ATTACK."); -static const u8 sShadowTagDescription[] = _("Prevents the foe’s escape."); +static const u8 sIntimidateDescription[] = _("Lowers the foe's ATTACK."); +static const u8 sShadowTagDescription[] = _("Prevents the foe's escape."); static const u8 sRoughSkinDescription[] = _("Hurts to touch."); static const u8 sWonderGuardDescription[] = _("“Super effective†hits."); static const u8 sLevitateDescription[] = _("Not hit by GROUND attacks."); @@ -44,7 +44,7 @@ static const u8 sMagnetPullDescription[] = _("Traps STEEL-type POKéMON."); static const u8 sSoundproofDescription[] = _("Avoids sound-based moves."); static const u8 sRainDishDescription[] = _("Slight HP recovery in rain."); static const u8 sSandStreamDescription[] = _("Summons a sandstorm."); -static const u8 sPressureDescription[] = _("Raises foe’s PP usage."); +static const u8 sPressureDescription[] = _("Raises foe's PP usage."); static const u8 sThickFatDescription[] = _("Heat-and-cold protection."); static const u8 sEarlyBirdDescription[] = _("Awakens quickly from sleep."); static const u8 sFlameBodyDescription[] = _("Burns the foe on contact."); diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index ff0b680dd..1812a1d74 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -37,7 +37,7 @@ const u8 gRevivalHerbItemDescription[] = _("A very bitter herb\nthat revives a\n const u8 gEtherItemDescription[] = _("Restores the PP\nof a selected move\nby 10."); const u8 gMaxEtherItemDescription[] = _("Fully restores the\nPP of a selected\nmove."); const u8 gElixirItemDescription[] = _("Restores the PP\nof all moves by 10."); -const u8 gMaxElixirItemDescription[] = _("Fully restores the\nPP of a POKéMON’s\nmoves."); +const u8 gMaxElixirItemDescription[] = _("Fully restores the\nPP of a POKéMON's\nmoves."); const u8 gLavaCookieItemDescription[] = _("A local specialty\nthat heals all\nstatus problems."); const u8 gBlueFluteItemDescription[] = _("A glass flute that\nawakens sleeping\nPOKéMON."); const u8 gYellowFluteItemDescription[] = _("A glass flute that\nsnaps POKéMON\nout of confusion."); @@ -159,7 +159,7 @@ const u8 gExpShareItemDescription[] = _("A hold item that\ngets EXP. points\nfro const u8 gQuickClawItemDescription[] = _("A hold item that\noccasionally allows\nthe first strike."); const u8 gSootheBellItemDescription[] = _("A hold item that\ncalms spirits and\nfosters friendship."); const u8 gMentalHerbItemDescription[] = _("A hold item that\nsnaps POKéMON out\nof infatuation."); -const u8 gChoiceBandItemDescription[] = _("Raises a move’s\npower, but permits\nonly that move."); +const u8 gChoiceBandItemDescription[] = _("Raises a move's\npower, but permits\nonly that move."); const u8 gKingsRockItemDescription[] = _("A hold item that\nmay cause flinching\nwhen the foe is hit."); const u8 gSilverPowderItemDescription[] = _("A hold item that\nraises the power of\nBUG-type moves."); const u8 gAmuletCoinItemDescription[] = _("Doubles money in\nbattle if the\nholder takes part."); @@ -194,11 +194,11 @@ const u8 gSilkScarfItemDescription[] = _("A hold item that\nraises the power of\ const u8 gUpGradeItemDescription[] = _("A peculiar box made\nby SILPH CO."); const u8 gShellBellItemDescription[] = _("A hold item that\nrestores HP upon\nstriking the foe."); const u8 gSeaIncenseItemDescription[] = _("A hold item that\nslightly boosts\nWATER-type moves."); -const u8 gLaxIncenseItemDescription[] = _("A hold item that\nslightly lowers the\nfoe’s accuracy."); -const u8 gLuckyPunchItemDescription[] = _("A hold item that\nraises CHANSEY’s\ncritical-hit rate."); -const u8 gMetalPowderItemDescription[] = _("A hold item that\nraises DITTO’s\nDEFENSE."); -const u8 gThickClubItemDescription[] = _("A hold item that \nraises CUBONE or\nMAROWAK’s ATTACK."); -const u8 gStickItemDescription[] = _("A hold item that\nraises FARFETCH’D’s\ncritical-hit ratio."); +const u8 gLaxIncenseItemDescription[] = _("A hold item that\nslightly lowers the\nfoe's accuracy."); +const u8 gLuckyPunchItemDescription[] = _("A hold item that\nraises CHANSEY's\ncritical-hit rate."); +const u8 gMetalPowderItemDescription[] = _("A hold item that\nraises DITTO's\nDEFENSE."); +const u8 gThickClubItemDescription[] = _("A hold item that \nraises CUBONE or\nMAROWAK's ATTACK."); +const u8 gStickItemDescription[] = _("A hold item that\nraises FARFETCH'D's\ncritical-hit ratio."); const u8 gRedScarfItemDescription[] = _("A hold item that\nraises COOL in\nCONTESTS."); const u8 gBlueScarfItemDescription[] = _("A hold item that\nraises BEAUTY in\nCONTESTS."); const u8 gPinkScarfItemDescription[] = _("A hold item that\nraises CUTE in\nCONTESTS."); @@ -214,7 +214,7 @@ const u8 gSuperRodItemDescription[] = _("The best fishing\nrod for catching\nwil const u8 gSSTicketItemDescription[] = _("The ticket required\nfor sailing on a\nferry."); const u8 gContestPassItemDescription[] = _("The pass required\nfor entering\nPOKéMON CONTESTS."); const u8 gWailmerPailItemDescription[] = _("A tool used for\nwatering BERRIES\nand plants."); -const u8 gDevonGoodsItemDescription[] = _("A package that\ncontains DEVON’s\nmachine parts."); +const u8 gDevonGoodsItemDescription[] = _("A package that\ncontains DEVON's\nmachine parts."); const u8 gSootSackItemDescription[] = _("A sack used to\ngather and hold\nvolcanic ash."); const u8 gBasementKeyItemDescription[] = _("The key for NEW\nMAUVILLE beneath\nMAUVILLE CITY."); const u8 gAcroBikeItemDescription[] = _("A folding bicycle\ncapable of jumps\nand wheelies."); @@ -274,13 +274,13 @@ const u8 gTM36ItemDescription[] = _("Hurls sludge at the\nfoe. It may poison\nth const u8 gTM37ItemDescription[] = _("Causes a sandstorm\nthat hits the foe\nover several turns."); const u8 gTM38ItemDescription[] = _("A powerful fire\nattack that may\nburn the foe."); const u8 gTM39ItemDescription[] = _("Stops the foe from\nmoving with rocks.\nMay lower SPEED."); -const u8 gTM40ItemDescription[] = _("An extremely fast\nattack that can’t\nbe avoided."); +const u8 gTM40ItemDescription[] = _("An extremely fast\nattack that can't\nbe avoided."); const u8 gTM41ItemDescription[] = _("Prevents the foe\nfrom using the same\nmove in a row."); const u8 gTM42ItemDescription[] = _("Raises ATTACK when\npoisoned, burned,\nor paralyzed."); const u8 gTM43ItemDescription[] = _("Adds an effect to\nattack depending\non the location."); const u8 gTM44ItemDescription[] = _("The user sleeps for\n2 turns to restore\nhealth and status."); const u8 gTM45ItemDescription[] = _("Makes it tough to\nattack a foe of the\nopposite gender."); -const u8 gTM46ItemDescription[] = _("While attacking,\nit may steal the\nfoe’s held item."); +const u8 gTM46ItemDescription[] = _("While attacking,\nit may steal the\nfoe's held item."); const u8 gTM47ItemDescription[] = _("Spreads hard-\nedged wings and\nslams into the foe."); const u8 gTM48ItemDescription[] = _("Switches abilities\nwith the foe on the\nturn this is used."); const u8 gTM49ItemDescription[] = _("Steals the effects\nof the move the foe\nis trying to use."); @@ -295,17 +295,17 @@ const u8 gHM06ItemDescription[] = _("A rock-crushingly\ntough attack that\nmay l const u8 gHM07ItemDescription[] = _("Attacks the foe\nwith enough power\nto climb waterfalls."); const u8 gHM08ItemDescription[] = _("Dives underwater\nthe 1st turn, then\nattacks next turn."); // FireRed/LeafGreen key items -const u8 gOaksParcelItemDescription[] = _("A parcel for PROF.\nOAK from a POKéMON\nMART’s clerk."); +const u8 gOaksParcelItemDescription[] = _("A parcel for PROF.\nOAK from a POKéMON\nMART's clerk."); const u8 gPokeFluteItemDescription[] = _("A sweet-sounding\nflute that awakens\nPOKéMON."); -const u8 gSecretKeyItemDescription[] = _("The key to the\nCINNABAR ISLAND\nGYM’s entrance."); +const u8 gSecretKeyItemDescription[] = _("The key to the\nCINNABAR ISLAND\nGYM's entrance."); const u8 gBikeVoucherItemDescription[] = _("A voucher for\nobtaining a bicycle\nfrom the BIKE SHOP."); -const u8 gGoldTeethItemDescription[] = _("Gold dentures lost\nby the SAFARI\nZONE’s WARDEN."); +const u8 gGoldTeethItemDescription[] = _("Gold dentures lost\nby the SAFARI\nZONE's WARDEN."); const u8 gOldAmberItemDescription[] = _("A stone containing\nthe genes of an\nancient POKéMON."); -const u8 gCardKeyItemDescription[] = _("A card-type door\nkey used in SILPH\nCO’s office."); -const u8 gLiftKeyItemDescription[] = _("An elevator key\nused in TEAM\nROCKET’s HIDEOUT."); -const u8 gHelixFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON’s seashell."); -const u8 gDomeFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON’s shell."); -const u8 gSilphScopeItemDescription[] = _("SILPH CO’s scope\nmakes unseeable\nPOKéMON visible."); +const u8 gCardKeyItemDescription[] = _("A card-type door\nkey used in SILPH\nCO's office."); +const u8 gLiftKeyItemDescription[] = _("An elevator key\nused in TEAM\nROCKET's HIDEOUT."); +const u8 gHelixFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON's seashell."); +const u8 gDomeFossilItemDescription[] = _("A piece of an\nancient marine\nPOKéMON's shell."); +const u8 gSilphScopeItemDescription[] = _("SILPH CO's scope\nmakes unseeable\nPOKéMON visible."); const u8 gBicycleItemDescription[] = _("A folding bicycle\nthat is faster than\nthe RUNNING SHOES."); const u8 gTownMapItemDescription[] = _("Can be viewed\nanytime. Shows your\npresent location."); const u8 gVSSeekerItemDescription[] = _("A rechargeable unit\nthat flags battle-\nready TRAINERS."); @@ -322,5 +322,5 @@ const u8 gPowderJarItemDescription[] = _("Stores BERRY\nPOWDER made using\na BER const u8 gRubyItemDescription[] = _("An exquisite, red-\nglowing gem that\nsymbolizes passion."); const u8 gSapphireItemDescription[] = _("A brilliant blue gem\nthat symbolizes\nhonesty."); // Emerald-specific key items -const u8 gMagmaEmblemItemDescription[] = _("A medal-like item in\nthe same shape as\nTEAM MAGMA’s mark."); +const u8 gMagmaEmblemItemDescription[] = _("A medal-like item in\nthe same shape as\nTEAM MAGMA's mark."); const u8 gOldSeaMapItemDescription[] = _("A faded sea chart\nthat shows the way\nto a certain island."); diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index 3642f66b1..fd497a889 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -110,7 +110,7 @@ static const u8 sRollingKickDescription[] = _( "a rapid spin."); static const u8 sSandAttackDescription[] = _( - "Reduces the foe’s accuracy\n" + "Reduces the foe's accuracy\n" "by hurling sand in its face."); static const u8 sHeadbuttDescription[] = _( @@ -155,7 +155,7 @@ static const u8 sDoubleEdgeDescription[] = _( static const u8 sTailWhipDescription[] = _( "Wags the tail to lower the\n" - "foe’s DEFENSE."); + "foe's DEFENSE."); static const u8 sPoisonStingDescription[] = _( "A toxic attack with barbs,\n" @@ -179,7 +179,7 @@ static const u8 sBiteDescription[] = _( static const u8 sGrowlDescription[] = _( "Growls cutely to reduce the\n" - "foe’s ATTACK."); + "foe's ATTACK."); static const u8 sRoarDescription[] = _( "Makes the foe flee to end\n" @@ -199,7 +199,7 @@ static const u8 sSonicBoomDescription[] = _( static const u8 sDisableDescription[] = _( "Psychically disables one of\n" - "the foe’s moves."); + "the foe's moves."); static const u8 sAcidDescription[] = _( "Sprays a hide-melting acid.\n" @@ -275,7 +275,7 @@ static const u8 sCounterDescription[] = _( static const u8 sSeismicTossDescription[] = _( "Inflicts damage identical\n" - "to the user’s level."); + "to the user's level."); static const u8 sStrengthDescription[] = _( "Builds enormous power,\n" @@ -394,7 +394,7 @@ static const u8 sQuickAttackDescription[] = _( "that always strikes first."); static const u8 sRageDescription[] = _( - "Raises the user’s ATTACK\n" + "Raises the user's ATTACK\n" "every time it is hit."); static const u8 sTeleportDescription[] = _( @@ -403,7 +403,7 @@ static const u8 sTeleportDescription[] = _( static const u8 sNightShadeDescription[] = _( "Inflicts damage identical\n" - "to the user’s level."); + "to the user's level."); static const u8 sMimicDescription[] = _( "Copies a move used by the\n" @@ -411,7 +411,7 @@ static const u8 sMimicDescription[] = _( static const u8 sScreechDescription[] = _( "Emits a screech to sharply\n" - "reduce the foe’s DEFENSE."); + "reduce the foe's DEFENSE."); static const u8 sDoubleTeamDescription[] = _( "Creates illusory copies to\n" @@ -419,18 +419,18 @@ static const u8 sDoubleTeamDescription[] = _( static const u8 sRecoverDescription[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 sHardenDescription[] = _( - "Stiffens the body’s \n" + "Stiffens the body's \n" "muscles to raise DEFENSE."); static const u8 sMinimizeDescription[] = _( - "Minimizes the user’s size\n" + "Minimizes the user's size\n" "to raise evasiveness."); static const u8 sSmokescreenDescription[] = _( - "Lowers the foe’s accuracy\n" + "Lowers the foe's accuracy\n" "using smoke, ink, etc."); static const u8 sConfuseRayDescription[] = _( @@ -474,7 +474,7 @@ static const u8 sMetronomeDescription[] = _( "POKéMON move at random."); static const u8 sMirrorMoveDescription[] = _( - "Counters the foe’s attack\n" + "Counters the foe's attack\n" "with the same move."); static const u8 sSelfDestructDescription[] = _( @@ -539,7 +539,7 @@ static const u8 sKinesisDescription[] = _( static const u8 sSoftBoiledDescription[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 sHiJumpKickDescription[] = _( "A jumping knee kick. If it\n" @@ -574,12 +574,12 @@ static const u8 sSkyAttackDescription[] = _( "then strikes the next turn."); static const u8 sTransformDescription[] = _( - "Alters the user’s cells to\n" + "Alters the user's cells to\n" "become a copy of the foe."); static const u8 sBubbleDescription[] = _( "An attack using bubbles.\n" - "May lower the foe’s SPEED."); + "May lower the foe's SPEED."); static const u8 sDizzyPunchDescription[] = _( "A rhythmic punch that may\n" @@ -598,11 +598,11 @@ static const u8 sPsywaveDescription[] = _( "wave of varying intensity."); static const u8 sSplashDescription[] = _( - "It’s just a splash...\n" + "It's just a splash...\n" "Has no effect whatsoever."); static const u8 sAcidArmorDescription[] = _( - "Liquifies the user’s body\n" + "Liquifies the user's body\n" "to sharply raise DEFENSE."); static const u8 sCrabhammerDescription[] = _( @@ -638,8 +638,8 @@ static const u8 sSharpenDescription[] = _( "and raises ATTACK."); static const u8 sConversionDescription[] = _( - "Changes the user’s type\n" - "into a known move’s type."); + "Changes the user's type\n" + "into a known move's type."); static const u8 sTriAttackDescription[] = _( "Fires three types of beams\n" @@ -647,7 +647,7 @@ static const u8 sTriAttackDescription[] = _( static const u8 sSuperFangDescription[] = _( "Attacks with sharp fangs\n" - "and cuts half the foe’s HP."); + "and cuts half the foe's HP."); static const u8 sSlashDescription[] = _( "Slashes with claws, etc. Has\n" @@ -655,14 +655,14 @@ static const u8 sSlashDescription[] = _( static const u8 sSubstituteDescription[] = _( "Creates a decoy using 1/4\n" - "of the user’s maximum HP."); + "of the user's maximum HP."); static const u8 sStruggleDescription[] = _( "Used only if all PP are gone.\n" "Also hurts the user a little."); static const u8 sSketchDescription[] = _( - "Copies the foe’s last move\n" + "Copies the foe's last move\n" "permanently."); static const u8 sTripleKickDescription[] = _( @@ -671,15 +671,15 @@ static const u8 sTripleKickDescription[] = _( static const u8 sThiefDescription[] = _( "While attacking, it may\n" - "steal the foe’s held item."); + "steal the foe's held item."); static const u8 sSpiderWebDescription[] = _( "Ensnares the foe to stop it\n" "from fleeing or switching."); static const u8 sMindReaderDescription[] = _( - "Senses the foe’s action to\n" - "ensure the next move’s hit."); + "Senses the foe's action to\n" + "ensure the next move's hit."); static const u8 sNightmareDescription[] = _( "Inflicts 1/4 damage on a\n" @@ -699,11 +699,11 @@ static const u8 sCurseDescription[] = _( static const u8 sFlailDescription[] = _( "Inflicts more damage when\n" - "the user’s HP is down."); + "the user's HP is down."); static const u8 sConversion2Description[] = _( "Makes the user resistant\n" - "to the last attack’s type."); + "to the last attack's type."); static const u8 sAeroblastDescription[] = _( "Launches a vacuumed blast.\n" @@ -715,11 +715,11 @@ static const u8 sCottonSporeDescription[] = _( static const u8 sReversalDescription[] = _( "Inflicts more damage when\n" - "the user’s HP is down."); + "the user's HP is down."); static const u8 sSpiteDescription[] = _( "Spitefully cuts the PP\n" - "of the foe’s last move."); + "of the foe's last move."); static const u8 sPowderSnowDescription[] = _( "Blasts the foe with a snowy\n" @@ -754,7 +754,7 @@ static const u8 sSludgeBombDescription[] = _( "damage. May also poison."); static const u8 sMudSlapDescription[] = _( - "Hurls mud in the foe’s face\n" + "Hurls mud in the foe's face\n" "to reduce its accuracy."); static const u8 sOctazookaDescription[] = _( @@ -770,7 +770,7 @@ static const u8 sZapCannonDescription[] = _( "paralysis, but inaccurate."); static const u8 sForesightDescription[] = _( - "Negates the foe’s efforts\n" + "Negates the foe's efforts\n" "to heighten evasiveness."); static const u8 sDestinyBondDescription[] = _( @@ -783,7 +783,7 @@ static const u8 sPerishSongDescription[] = _( static const u8 sIcyWindDescription[] = _( "A chilling attack that\n" - "lowers the foe’s SPEED."); + "lowers the foe's SPEED."); static const u8 sDetectDescription[] = _( "Evades attack, but may fail\n" @@ -831,7 +831,7 @@ static const u8 sSwaggerDescription[] = _( static const u8 sMilkDrinkDescription[] = _( "Recovers up to half the\n" - "user’s maximum HP."); + "user's maximum HP."); static const u8 sSparkDescription[] = _( "An electrified tackle that\n" @@ -878,7 +878,7 @@ static const u8 sSafeguardDescription[] = _( "all status problems."); static const u8 sPainSplitDescription[] = _( - "Adds the user and foe’s HP,\n" + "Adds the user and foe's HP,\n" "then shares them equally."); static const u8 sSacredFireDescription[] = _( @@ -927,10 +927,10 @@ static const u8 sIronTailDescription[] = _( static const u8 sMetalClawDescription[] = _( "A claw attack that may\n" - "raise the user’s ATTACK."); + "raise the user's ATTACK."); static const u8 sVitalThrowDescription[] = _( - "Makes the user’s move last,\n" + "Makes the user's move last,\n" "but it never misses."); static const u8 sMorningSunDescription[] = _( @@ -970,11 +970,11 @@ static const u8 sCrunchDescription[] = _( "May lower SP. DEF."); static const u8 sMirrorCoatDescription[] = _( - "Counters the foe’s special\n" + "Counters the foe's special\n" "attack at double the power."); static const u8 sPsychUpDescription[] = _( - "Copies the foe’s effect(s)\n" + "Copies the foe's effect(s)\n" "and gives to the user."); static const u8 sExtremeSpeedDescription[] = _( @@ -987,7 +987,7 @@ static const u8 sAncientPowerDescription[] = _( static const u8 sShadowBallDescription[] = _( "Hurls a black blob that may\n" - "lower the foe’s SP. DEF."); + "lower the foe's SP. DEF."); static const u8 sFutureSightDescription[] = _( "Heightens inner power to\n" @@ -1047,7 +1047,7 @@ static const u8 sWillOWispDescription[] = _( static const u8 sMementoDescription[] = _( "The user faints and lowers\n" - "the foe’s abilities."); + "the foe's abilities."); static const u8 sFacadeDescription[] = _( "Boosts ATTACK when burned,\n" @@ -1079,7 +1079,7 @@ static const u8 sTauntDescription[] = _( static const u8 sHelpingHandDescription[] = _( "Boosts the power of the\n" - "recipient’s moves."); + "recipient's moves."); static const u8 sTrickDescription[] = _( "Tricks the foe into trading\n" @@ -1095,11 +1095,11 @@ static const u8 sWishDescription[] = _( static const u8 sAssistDescription[] = _( "Attacks randomly with one\n" - "of the partner’s moves."); + "of the partner's moves."); static const u8 sIngrainDescription[] = _( "Lays roots that restore HP.\n" - "The user can’t switch out."); + "The user can't switch out."); static const u8 sSuperpowerDescription[] = _( "Boosts strength sharply,\n" @@ -1126,15 +1126,15 @@ static const u8 sYawnDescription[] = _( "then sleeping next turn."); static const u8 sKnockOffDescription[] = _( - "Knocks down the foe’s held\n" + "Knocks down the foe's held\n" "item to prevent its use."); static const u8 sEndeavorDescription[] = _( - "Gains power if the user’s HP\n" - "is lower than the foe’s HP."); + "Gains power if the user's HP\n" + "is lower than the foe's HP."); static const u8 sEruptionDescription[] = _( - "The higher the user’s HP,\n" + "The higher the user's HP,\n" "the more damage caused."); static const u8 sSkillSwapDescription[] = _( @@ -1151,7 +1151,7 @@ static const u8 sRefreshDescription[] = _( static const u8 sGrudgeDescription[] = _( "If the user faints, deletes\n" - "all PP of foe’s last move."); + "all PP of foe's last move."); static const u8 sSnatchDescription[] = _( "Steals the effects of the\n" @@ -1170,7 +1170,7 @@ static const u8 sArmThrustDescription[] = _( "strike the foe 2 to 5 times."); static const u8 sCamouflageDescription[] = _( - "Alters the POKéMON’s type\n" + "Alters the POKéMON's type\n" "depending on the location."); static const u8 sTailGlowDescription[] = _( @@ -1242,7 +1242,7 @@ static const u8 sAstonishDescription[] = _( "the foe into flinching."); static const u8 sWeatherBallDescription[] = _( - "The move’s type and power\n" + "The move's type and power\n" "change with the weather."); static const u8 sAromatherapyDescription[] = _( @@ -1251,7 +1251,7 @@ static const u8 sAromatherapyDescription[] = _( static const u8 sFakeTearsDescription[] = _( "Feigns crying to sharply\n" - "lower the foe’s SP. DEF."); + "lower the foe's SP. DEF."); static const u8 sAirCutterDescription[] = _( "Hacks with razorlike wind.\n" @@ -1262,7 +1262,7 @@ static const u8 sOverheatDescription[] = _( "but sharply lowers SP. ATK."); static const u8 sOdorSleuthDescription[] = _( - "Negates the foe’s efforts\n" + "Negates the foe's efforts\n" "to heighten evasiveness."); static const u8 sRockTombDescription[] = _( @@ -1291,7 +1291,7 @@ static const u8 sCosmicPowerDescription[] = _( static const u8 sWaterSpoutDescription[] = _( "Inflicts more damage if the\n" - "user’s HP is high."); + "user's HP is high."); static const u8 sSignalBeamDescription[] = _( "A strange beam attack that\n" @@ -1334,11 +1334,11 @@ static const u8 sIcicleSpearDescription[] = _( "2 to 5 icicles in a row."); static const u8 sIronDefenseDescription[] = _( - "Hardens the body’s surface\n" + "Hardens the body's surface\n" "to sharply raise DEFENSE."); static const u8 sBlockDescription[] = _( - "Blocks the foe’s way to\n" + "Blocks the foe's way to\n" "prevent escape."); static const u8 sHowlDescription[] = _( diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 840beb22b..25f2c9aa2 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -82,7 +82,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SLOWBRO] = _("SLOWBRO"), [SPECIES_MAGNEMITE] = _("MAGNEMITE"), [SPECIES_MAGNETON] = _("MAGNETON"), - [SPECIES_FARFETCHD] = _("FARFETCH’D"), + [SPECIES_FARFETCHD] = _("FARFETCH'D"), [SPECIES_DODUO] = _("DODUO"), [SPECIES_DODRIO] = _("DODRIO"), [SPECIES_SEEL] = _("SEEL"), diff --git a/src/landmark.c b/src/landmark.c index 4eade159a..ab4add509 100644 --- a/src/landmark.c +++ b/src/landmark.c @@ -17,21 +17,21 @@ struct LandmarkList static const u8 LandmarkName_FlowerShop[] = _("FLOWER SHOP"); static const u8 LandmarkName_PetalburgWoods[] = _("PETALBURG WOODS"); -static const u8 LandmarkName_MrBrineysCottage[] = _("MR. BRINEY’S COTTAGE"); +static const u8 LandmarkName_MrBrineysCottage[] = _("MR. BRINEY'S COTTAGE"); static const u8 LandmarkName_AbandonedShip[] = _("ABANDONED SHIP"); static const u8 LandmarkName_SeashoreHouse[] = _("SEASHORE HOUSE"); static const u8 LandmarkName_SlateportBeach[] = _("SLATEPORT BEACH"); static const u8 LandmarkName_CyclingRoad[] = _("CYCLING ROAD"); static const u8 LandmarkName_NewMauville[] = _("NEW MAUVILLE"); static const u8 LandmarkName_TrickHouse[] = _("TRICK HOUSE"); -static const u8 LandmarkName_OldLadysRestShop[] = _("OLD LADY’S REST STOP"); +static const u8 LandmarkName_OldLadysRestShop[] = _("OLD LADY'S REST STOP"); static const u8 LandmarkName_Desert[] = _("DESERT"); static const u8 LandmarkName_WinstrateFamily[] = _("THE WINSTRATE FAMILY"); static const u8 LandmarkName_CableCar[] = _("CABLE CAR"); static const u8 LandmarkName_GlassWorkshop[] = _("GLASS WORKSHOP"); static const u8 LandmarkName_WeatherInstitute[] = _("WEATHER INSTITUTE"); static const u8 LandmarkName_MeteorFalls[] = _("METEOR FALLS"); -static const u8 LandmarkName_TunnelersRestHouse[] = _("TUNNELER’S RESTHOUSE"); +static const u8 LandmarkName_TunnelersRestHouse[] = _("TUNNELER'S RESTHOUSE"); static const u8 LandmarkName_RusturfTunnel[] = _("RUSTURF TUNNEL"); static const u8 LandmarkName_PokemonDayCare[] = _("POKéMON DAY CARE"); static const u8 LandmarkName_SafariZoneEntrance[] = _("SAFARI ZONE ENTRANCE"); @@ -40,18 +40,18 @@ static const u8 LandmarkName_ShoalCave[] = _("SHOAL CAVE"); static const u8 LandmarkName_SeafloorCavern[] = _("SEAFLOOR CAVERN"); static const u8 LandmarkName_GraniteCave[] = _("GRANITE CAVE"); static const u8 LandmarkName_OceanCurrent[] = _("OCEAN CURRENT"); -static const u8 LandmarkName_LanettesHouse[] = _("LANETTE’S HOUSE"); +static const u8 LandmarkName_LanettesHouse[] = _("LANETTE'S HOUSE"); static const u8 LandmarkName_FieryPath[] = _("FIERY PATH"); static const u8 LandmarkName_JaggedPass[] = _("JAGGED PASS"); static const u8 LandmarkName_SkyPillar[] = _("SKY PILLAR"); -static const u8 LandmarkName_BerryMastersHouse[] = _("BERRY MASTER’S HOUSE"); +static const u8 LandmarkName_BerryMastersHouse[] = _("BERRY MASTER'S HOUSE"); static const u8 LandmarkName_IslandCave[] = _("ISLAND CAVE"); static const u8 LandmarkName_DesertRuins[] = _("DESERT RUINS"); static const u8 LandmarkName_ScorchedSlab[] = _("SCORCHED SLAB"); static const u8 LandmarkName_AncientTomb[] = _("ANCIENT TOMB"); static const u8 LandmarkName_SealedChamber[] = _("SEALED CHAMBER"); -static const u8 LandmarkName_FossilManiacsHouse[] = _("FOSSIL MANIAC’S HOUSE"); -static const u8 LandmarkName_HuntersHouse[] = _("HUNTER’S HOUSE"); +static const u8 LandmarkName_FossilManiacsHouse[] = _("FOSSIL MANIAC'S HOUSE"); +static const u8 LandmarkName_HuntersHouse[] = _("HUNTER'S HOUSE"); static const u8 LandmarkName_MagmaHideout[] = _("MAGMA HIDEOUT"); static const u8 LandmarkName_MirageTower[] = _("MIRAGE TOWER"); static const u8 LandmarkName_AlteringCave[] = _("ALTERING CAVE"); diff --git a/src/mystery_event_msg.c b/src/mystery_event_msg.c index 74261179b..e0e70a218 100644 --- a/src/mystery_event_msg.c +++ b/src/mystery_event_msg.c @@ -10,4 +10,4 @@ const u8 gText_MysteryGiftSentOver[] = _("{STR_VAR_1} was sent over!"); const u8 gText_MysteryGiftFullParty[] = _("Your party is full.\n{STR_VAR_1} could not be sent over."); const u8 gText_MysteryGiftNewTrainer[] = _("A new TRAINER has arrived in\nHOENN."); const u8 gText_MysteryGiftNewAdversaryInBattleTower[] = _("A new adversary has arrived in the\nBATTLE TOWER."); -const u8 gText_MysteryGiftCantBeUsed[] = _("This data can’t be used in\nthis version."); +const u8 gText_MysteryGiftCantBeUsed[] = _("This data can't be used in\nthis version."); diff --git a/src/naming_screen.c b/src/naming_screen.c index 9902df04c..1a9a15d58 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -150,7 +150,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] = DUMMY_WIN_TEMPLATE }; -static const u8 gUnknown_0858BE40[] = __("abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“â€â€˜â€™ "); +static const u8 gUnknown_0858BE40[] = __("abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“â€â€˜' "); static const u8 gUnknown_0858BEA0[] = { 8, 8, 6 }; static const u8 gUnknown_0858BEA3[] = { 0, 12, 24, 56, 68, 80, 92, 123, 0, 12, 24, 56, 68, 80, 92, 123, 0, 22, 44, 66, 88, 110, 0, 0 }; diff --git a/src/strings.c b/src/strings.c index 3cf801c7c..7b3df0eca 100644 --- a/src/strings.c +++ b/src/strings.c @@ -26,8 +26,8 @@ const u8 gText_MainMenuMysteryGift[] = _("MYSTERY GIFT"); const u8 gText_MainMenuMysteryGift2[] = _("MYSTERY GIFT"); const u8 gText_MainMenuMysteryEvents[] = _("MYSTERY EVENTS"); const u8 gText_WirelessNotConnected[] = _("The Wireless Adapter is not\nconnected."); -const u8 gText_MysteryGiftCantUse[] = _("MYSTERY GIFT can’t be used while\nthe Wireless Adapter is attached."); -const u8 gText_MysteryEventsCantUse[] = _("MYSTERY EVENTS can’t be used while\nthe Wireless Adapter is attached."); +const u8 gText_MysteryGiftCantUse[] = _("MYSTERY GIFT can't be used while\nthe Wireless Adapter is attached."); +const u8 gText_MysteryEventsCantUse[] = _("MYSTERY EVENTS can't be used while\nthe Wireless Adapter is attached."); const u8 gUnknown_085E836D[] = _("Updating save file using external\ndata. Please wait."); const u8 gUnknown_085E83A2[] = _("The save file has been updated."); const u8 gText_SaveFileCorrupted[] = _("The save file is corrupted. The\nprevious save file will be loaded."); @@ -97,10 +97,10 @@ const u8 gText_DefaultNameLucy[] = _("LUCY"); const u8 gText_DefaultNameHalie[] = _("HALIE"); const u8 gText_ThisIsAPokemon[] = _("This is what we call a “POKéMON.â€{PAUSE 96}\p"); const u8 gText_5MarksPokemon[] = _("????? POKéMON"); -const u8 gText_UnkHeight[] = _("{CLEAR_TO 0x0C}??’??â€"); +const u8 gText_UnkHeight[] = _("{CLEAR_TO 0x0C}??'??â€"); const u8 gText_UnkWeight[] = _("????.? lbs."); const u8 gUnknown_085E86DC[] = _(" POKéMON"); -const u8 gUnknown_085E86FB[] = _("{CLEAR_TO 0x0C} ’ â€"); +const u8 gUnknown_085E86FB[] = _("{CLEAR_TO 0x0C} ' â€"); const u8 gUnknown_085E8709[] = _(" . lbs."); const u8 gUnknown_085E871A[] = _(""); const u8 gText_CryOf[] = _("CRY OF"); @@ -148,7 +148,7 @@ const u8 gText_DexSearchColorPurple[] = _("PURPLE"); const u8 gText_DexSearchColorGray[] = _("GRAY"); const u8 gText_DexSearchColorWhite[] = _("WHITE"); const u8 gText_DexSearchColorPink[] = _("PINK"); -const u8 gText_DexHoennDescription[] = _("HOENN region’s POKéDEX"); +const u8 gText_DexHoennDescription[] = _("HOENN region's POKéDEX"); const u8 gText_DexNatDescription[] = _("National edition POKéDEX"); const u8 gText_DexSortNumericalDescription[] = _("POKéMON are listed according to their\nnumber."); const u8 gText_DexSortAtoZDescription[] = _("Spotted and owned POKéMON are listed\nalphabetically."); @@ -157,13 +157,13 @@ const u8 gText_DexSortLightestDescription[] = _("Owned POKéMON are listed from const u8 gText_DexSortTallestDescription[] = _("Owned POKéMON are listed from the\ntallest to the smallest."); const u8 ggText_DexSortSmallestDescription[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); const u8 gText_DexEmptyString[] = _(""); -const u8 gText_DexSearchDontSpecify[] = _("DON’T SPECIFY."); +const u8 gText_DexSearchDontSpecify[] = _("DON'T SPECIFY."); const u8 gText_DexSearchTypeNone[] = _("NONE"); const u8 gText_SelectorArrow[] = _("â–¶"); const u8 gUnknown_085E8B3C[] = _(" "); const u8 gText_WelcomeToHOF[] = _("Welcome to the HALL OF FAME!"); -const u8 gUnknown_085E8B5B[] = _("Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH’s POKéDEX rating!\pPROF. BIRCH: Let’s see…\p"); -const u8 gUnknown_085E8BBA[] = _("SAVING…\nDON’T TURN OFF THE POWER."); +const u8 gUnknown_085E8B5B[] = _("Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH's POKéDEX rating!\pPROF. BIRCH: Let's see…\p"); +const u8 gUnknown_085E8BBA[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_HOFCorrupted[] = _("The HALL OF FAME data is corrupted."); const u8 gText_HOFNumber[] = _("HALL OF FAME No. {STR_VAR_1}"); const u8 gText_LeagueChamp[] = _("LEAGUE CHAMPION!\nCONGRATULATIONS!"); @@ -218,24 +218,24 @@ const u8 gUnknown_085E8DA4[] = _(" BERRY"); const u8 gText_Coins[] = _("{STR_VAR_1} COINS"); const u8 gText_CloseBag[] = _("CLOSE BAG"); const u8 gText_Var1IsSelected[] = _("{STR_VAR_1} is\nselected."); -const u8 gText_CantWriteMail[] = _("You can’t write\nMAIL here."); +const u8 gText_CantWriteMail[] = _("You can't write\nMAIL here."); const u8 gText_NoPokemon[] = _("There is no\nPOKéMON."); const u8 gText_MoveVar1Where[] = _("Move the\n{STR_VAR_1}\nwhere?"); -const u8 gText_Var1CantBeHeld[] = _("The {STR_VAR_1} can’t be held."); -const u8 gText_Var1CantBeHeldHere[] = _("The {STR_VAR_1} can’t be held\nhere."); +const u8 gText_Var1CantBeHeld[] = _("The {STR_VAR_1} can't be held."); +const u8 gText_Var1CantBeHeldHere[] = _("The {STR_VAR_1} can't be held\nhere."); const u8 gText_DepositHowManyVar1[] = _("Deposit how many\n{STR_VAR_1}(s)?"); const u8 gText_DepositedVar2Var1s[] = _("Deposited {STR_VAR_2}\n{STR_VAR_1}(s)."); -const u8 gText_NoRoomForItems[] = _("There’s no room to\nstore items."); -const u8 gText_CantStoreImportantItems[] = _("Important items\ncan’t be stored in\nthe PC!"); -const u8 gText_TooImportantToToss[] = _("That’s much too\nimportant to toss\nout!"); +const u8 gText_NoRoomForItems[] = _("There's no room to\nstore items."); +const u8 gText_CantStoreImportantItems[] = _("Important items\ncan't be stored in\nthe PC!"); +const u8 gText_TooImportantToToss[] = _("That's much too\nimportant to toss\nout!"); const u8 gText_TossHowManyVar1s[] = _("Toss out how many\n{STR_VAR_1}(s)?"); const u8 gText_ThrewAwayVar2Var1s[] = _("Threw away {STR_VAR_2}\n{STR_VAR_1}(s)."); const u8 gText_ConfirmTossItems[] = _("Is it okay to\nthrow away {STR_VAR_2}\n{STR_VAR_1}(s)?"); -const u8 gText_DadsAdvice[] = _("DAD’s advice…\n{PLAYER}, there’s a time and place for\leverything!{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantDismountBike[] = _("You can’t dismount your BIKE here.{PAUSE_UNTIL_PRESS}"); -const u8 gText_ItemFinderNearby[] = _("Huh?\nThe ITEMFINDER’s responding!\pThere’s an item buried around here!{PAUSE_UNTIL_PRESS}"); -const u8 gText_ItemFinderOnTop[] = _("Oh!\nThe ITEMFINDER’s shaking wildly!{PAUSE_UNTIL_PRESS}"); -const u8 gText_ItemFinderNothing[] = _("… … … …Nope!\nThere’s no response.{PAUSE_UNTIL_PRESS}"); +const u8 gText_DadsAdvice[] = _("DAD's advice…\n{PLAYER}, there's a time and place for\leverything!{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantDismountBike[] = _("You can't dismount your BIKE here.{PAUSE_UNTIL_PRESS}"); +const u8 gText_ItemFinderNearby[] = _("Huh?\nThe ITEMFINDER's responding!\pThere's an item buried around here!{PAUSE_UNTIL_PRESS}"); +const u8 gText_ItemFinderOnTop[] = _("Oh!\nThe ITEMFINDER's shaking wildly!{PAUSE_UNTIL_PRESS}"); +const u8 gText_ItemFinderNothing[] = _("… … … …Nope!\nThere's no response.{PAUSE_UNTIL_PRESS}"); const u8 gText_CoinCase[] = _("Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}"); const u8 gText_BootedUpTM[] = _("Booted up a TM."); const u8 gText_BootedUpHM[] = _("Booted up an HM."); @@ -343,18 +343,18 @@ const u8 gText_QuitShopping[] = _("Quit shopping."); const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1CertainlyHowMany2[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1AndYouWantedVar2[] = _("{STR_VAR_1}? And you wanted {STR_VAR_2}?\nThat will be Â¥{STR_VAR_3}."); -const u8 gText_Var1IsItThatllBeVar2[] = _("{STR_VAR_1}, is it?\nThat’ll be Â¥{STR_VAR_2}. Do you want it?"); -const u8 gText_YouWantedVar1ThatllBeVar2[] = _("You wanted {STR_VAR_1}?\nThat’ll be Â¥{STR_VAR_2}. Will that be okay?"); +const u8 gText_Var1IsItThatllBeVar2[] = _("{STR_VAR_1}, is it?\nThat'll be Â¥{STR_VAR_2}. Do you want it?"); +const u8 gText_YouWantedVar1ThatllBeVar2[] = _("You wanted {STR_VAR_1}?\nThat'll be Â¥{STR_VAR_2}. Will that be okay?"); const u8 gText_HereYouGoThankYou[] = _("Here you go!\nThank you very much."); -const u8 gText_ThankYouIllSendItHome[] = _("Thank you!\nI’ll send it to your home PC."); -const u8 gText_ThanksIllSendItHome[] = _("Thanks!\nI’ll send it to your PC at home."); -const u8 gText_YouDontHaveMoney[] = _("You don’t have enough money.{PAUSE_UNTIL_PRESS}"); +const u8 gText_ThankYouIllSendItHome[] = _("Thank you!\nI'll send it to your home PC."); +const u8 gText_ThanksIllSendItHome[] = _("Thanks!\nI'll send it to your PC at home."); +const u8 gText_YouDontHaveMoney[] = _("You don't have enough money.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoMoreRoomForThis[] = _("You have no more room for this\nitem.{PAUSE_UNTIL_PRESS}"); const u8 gText_SpaceForVar1Full[] = _("The space for {STR_VAR_1} is full.{PAUSE_UNTIL_PRESS}"); const u8 gText_AnythingElseICanHelp[] = _("Is there anything else I can help\nyou with?"); const u8 gText_CanIHelpWithAnythingElse[] = _("Can I help you with anything else?"); -const u8 gText_ThrowInPremierBall[] = _("I’ll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantBuyKeyItem[] = _("{STR_VAR_2}? Oh, no.\nI can’t buy that.{PAUSE_UNTIL_PRESS}"); +const u8 gText_ThrowInPremierBall[] = _("I'll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantBuyKeyItem[] = _("{STR_VAR_2}? Oh, no.\nI can't buy that.{PAUSE_UNTIL_PRESS}"); const u8 gText_HowManyToSell[] = _("{STR_VAR_2}?\nHow many would you like to sell?"); const u8 gText_ICanPayVar1[] = _("I can pay Â¥{STR_VAR_1}.\nWould that be okay?"); const u8 gText_TurnedOverVar1ForVar2[] = _("Turned over the {STR_VAR_2}\nand received Â¥{STR_VAR_1}."); @@ -372,53 +372,53 @@ const u8 gText_Trade4[] = _("TRADE"); const u8 gText_HP3[] = _("HP"); const u8 gText_SpAtk3[] = _("SP. ATK"); const u8 gText_SpDef3[] = _("SP. DEF"); -const u8 gText_WontHaveEffect[] = _("It won’t have any effect.{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantBeUsedOnPkmn[] = _("This can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnCantSwitchOut[] = _("{STR_VAR_1} can’t be switched\nout!{PAUSE_UNTIL_PRESS}"); +const u8 gText_WontHaveEffect[] = _("It won't have any effect.{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantBeUsedOnPkmn[] = _("This can't be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnCantSwitchOut[] = _("{STR_VAR_1} can't be switched\nout!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAlreadyInBattle[] = _("{STR_VAR_1} is already\nin battle!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAlreadySelected[] = _("{STR_VAR_1} has already been\nselected.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnHasNoEnergy[] = _("{STR_VAR_1} has no energy\nleft to battle!{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantSwitchWithAlly[] = _("You can’t switch {STR_VAR_1}’s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}"); -const u8 gText_EggCantBattle[] = _("An EGG can’t battle!{PAUSE_UNTIL_PRESS}"); -const u8 gText_CantUseUntilNewBadge[] = _("This can’t be used until a new\nBADGE is obtained.{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantSwitchWithAlly[] = _("You can't switch {STR_VAR_1}'s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}"); +const u8 gText_EggCantBattle[] = _("An EGG can't battle!{PAUSE_UNTIL_PRESS}"); +const u8 gText_CantUseUntilNewBadge[] = _("This can't be used until a new\nBADGE is obtained.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoMoreThanVar1Pkmn[] = _("No more than {STR_VAR_1} POKéMON\nmay enter.{PAUSE_UNTIL_PRESS}"); const u8 gText_SendMailToPC[] = _("Send the removed MAIL to\nyour PC?"); const u8 gText_MailSentToPC[] = _("The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PCMailboxFull[] = _("Your PC’s MAILBOX is full.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PCMailboxFull[] = _("Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailMessageWillBeLost[] = _("If the MAIL is removed, the\nmessage will be lost. Okay?"); const u8 gText_RemoveMailBeforeItem[] = _("MAIL must be removed before\nholding an item.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnWasGivenItem[] = _("{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}"); const u8 gText_SwitchPkmnItem[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?"); -const u8 gText_PkmnNotHolding[] = _("{STR_VAR_1} isn’t holding\nanything.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnNotHolding[] = _("{STR_VAR_1} isn't holding\nanything.{PAUSE_UNTIL_PRESS}"); const u8 gText_RecievedItemFromPkmn[] = _("Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailTakenFromPkmn[] = _("MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}"); const u8 gText_SwitchedPkmnItem[] = _("The {STR_VAR_2} was taken and\nreplaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnHoldingItemCantHoldMail[] = _("This POKéMON is holding an\nitem. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailTransferredFromMailbox[] = _("MAIL was transferred from\nthe MAILBOX.{PAUSE_UNTIL_PRESS}"); -const u8 gText_BagFullCouldNotRemoveItem[] = _("The BAG is full. The POKéMON’s\nitem could not be removed.{PAUSE_UNTIL_PRESS}"); +const u8 gText_BagFullCouldNotRemoveItem[] = _("The BAG is full. The POKéMON's\nitem could not be removed.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnLearnedMove3[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); -const u8 gText_PkmnCantLearnMove[] = _("{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can’t be\nlearned.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnCantLearnMove[] = _("{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can't be\nlearned.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnNeedsToReplaceMove[] = _("{STR_VAR_1} wants to learn the\nmove {STR_VAR_2}.\pHowever, {STR_VAR_1} already\nknows four moves.\pShould a move be deleted and\nreplaced with {STR_VAR_2}?"); const u8 gText_StopLearningMove2[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_MoveNotLearned[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gText_WhichMoveToForget[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}"); const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}’s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}'s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnCuredOfPoison[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnCuredOfParalysis[] = _("{STR_VAR_1} was cured of\nparalysis.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnWokeUp2[] = _("{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnBurnHealed[] = _("{STR_VAR_1}’s burn was healed.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnBurnHealed[] = _("{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnThawedOut[] = _("{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}"); const u8 gText_PPWasRestored[] = _("PP was restored.{PAUSE_UNTIL_PRESS}"); const u8 gUnknown_085E9CCA[] = _("{STR_VAR_1} regained health.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnBecameHealthy[] = _("{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}"); -const u8 gText_MovesPPIncreased[] = _("{STR_VAR_1}’s PP increased.{PAUSE_UNTIL_PRESS}"); +const u8 gText_MovesPPIncreased[] = _("{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnElevatedToLvVar2[] = _("{STR_VAR_1} was elevated to\nLv. {STR_VAR_2}."); -const u8 gText_PkmnBaseVar2StatIncreased[] = _("{STR_VAR_1}’s base {STR_VAR_2}\nstat was raised.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnBaseVar2StatIncreased[] = _("{STR_VAR_1}'s base {STR_VAR_2}\nstat was raised.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnFriendlyBaseVar2Fell[] = _("{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} fell!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAdoresBaseVar2Fell[] = _("{STR_VAR_1} adores you!\nThe base {STR_VAR_2} fell!{PAUSE_UNTIL_PRESS}"); -const u8 gText_PkmnFriendlyBaseVar2CantFall[] = _("{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} can’t fall!{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnFriendlyBaseVar2CantFall[] = _("{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} can't fall!{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnSnappedOutOfConfusion[] = _("{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnGotOverInfatuation[] = _("{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}"); const u8 gText_ThrowAwayItem[] = _("Throw away this\n{STR_VAR_1}?"); @@ -430,10 +430,10 @@ const u8 gUnknown_085E9E64[] = _("Teach which POKéMON?"); const u8 gUnknown_085E9E79[] = _("Use on which POKéMON?"); const u8 gUnknown_085E9E8F[] = _("Give to which POKéMON?"); const u8 gUnknown_085E9EA6[] = _("Do what with this {PKMN}?"); -const u8 gUnknown_085E9EBC[] = _("There’s nothing to CUT."); -const u8 gUnknown_085E9ED4[] = _("You can’t SURF here."); -const u8 gUnknown_085E9EE9[] = _("You’re already SURFING."); -const u8 gUnknown_085E9F01[] = _("Can’t use that here."); +const u8 gUnknown_085E9EBC[] = _("There's nothing to CUT."); +const u8 gUnknown_085E9ED4[] = _("You can't SURF here."); +const u8 gUnknown_085E9EE9[] = _("You're already SURFING."); +const u8 gUnknown_085E9F01[] = _("Can't use that here."); const u8 gUnknown_085E9F16[] = _("Restore which move?"); const u8 gUnknown_085E9F2A[] = _("Boost PP of which move?"); const u8 gUnknown_085E9F42[] = _("Do what with an item?"); @@ -441,13 +441,13 @@ const u8 gUnknown_085E9F58[] = _("No POKéMON for battle!"); const u8 gUnknown_085E9F6F[] = _("Choose a POKéMON."); const u8 gUnknown_085E9F81[] = _("Not enough HP…"); const u8 gUnknown_085E9F90[] = _("{STR_VAR_1} POKéMON are needed."); -const u8 gUnknown_085E9FA7[] = _("POKéMON can’t be the same."); +const u8 gUnknown_085E9FA7[] = _("POKéMON can't be the same."); const u8 gUnknown_085E9FC2[] = _("No identical hold items."); const u8 gUnknown_085E9FDB[] = _("The current is much too fast!"); const u8 gUnknown_085E9FF9[] = _("Do what with the MAIL?"); const u8 gUnknown_085EA010[] = _("Choose POKéMON or CANCEL."); const u8 gUnknown_085EA02A[] = _("Choose POKéMON and confirm."); -const u8 gUnknown_085EA046[] = _("Let’s enjoy cycling!"); +const u8 gUnknown_085EA046[] = _("Let's enjoy cycling!"); const u8 gUnknown_085EA05B[] = _("This is in use already."); const u8 gUnknown_085EA073[] = _("{STR_VAR_1} is already holding\none {STR_VAR_2}."); const u8 gUnknown_085EA091[] = _("No use."); @@ -461,9 +461,9 @@ const u8 gUnknown_085EA0BF[] = _("ABLE!"); const u8 gUnknown_085EA0C5[] = _("NOT ABLE!"); const u8 gUnknown_085EA0CF[] = _("LEARNED"); const u8 gUnknown_085EA0D7[] = _("HAVE"); -const u8 gUnknown_085EA0DC[] = _("DON’T HAVE"); +const u8 gUnknown_085EA0DC[] = _("DON'T HAVE"); const u8 gUnknown_085EA0E7[] = _("FOURTH"); -const u8 gText_PkmnCantParticipate[] = _("That POKéMON can’t participate.{PAUSE_UNTIL_PRESS}"); +const u8 gText_PkmnCantParticipate[] = _("That POKéMON can't participate.{PAUSE_UNTIL_PRESS}"); const u8 gText_CancelParticipation[] = _("Cancel participation?"); const u8 gText_CancelBattle[] = _("Cancel the battle?"); const u8 gText_ReturnToWaitingRoom[] = _("Return to the WAITING ROOM?"); @@ -472,14 +472,14 @@ const u8 gText_EscapeFromHere[] = _("Want to escape from here and return\nto {ST const u8 gText_ReturnToHealingSpot[] = _("Want to return to the healing spot\nused last in {STR_VAR_1}?"); const u8 gText_PauseUntilPress[] = _("{PAUSE_UNTIL_PRESS}"); const u8 gJPText_PutVar1IntoSpinner[] = _("{STR_VAR_1}ã‚’ ãã‚‹ãã‚‹ã“ã†ã‹ã‚“ã«\nã ã—㦠よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"); -ALIGNED(4) const u8 gText_OnlyPkmnForBattle[] = _("That’s your only\nPOKéMON for battle."); -ALIGNED(4) const u8 gText_PkmnCantBeTradedNow[] = _("That POKéMON can’t be traded\nnow."); -ALIGNED(4) const u8 gText_EggCantBeTradedNow[] = _("An EGG can’t be traded now."); -ALIGNED(4) const u8 gText_OtherTrainersPkmnCantBeTraded[] = _("The other TRAINER’s POKéMON\ncan’t be traded now."); -ALIGNED(4) const u8 gText_OtherTrainerCantAcceptPkmn[] = _("The other TRAINER can’t accept\nthat POKéMON now."); -ALIGNED(4) const u8 gText_CantTradeWithTrainer[] = _("You can’t trade with that\nTRAINER now."); -ALIGNED(4) const u8 gText_NotPkmnOtherTrainerWants[] = _("That isn’t the type of POKéMON\nthat the other TRAINER wants."); -ALIGNED(4) const u8 gText_ThatIsntAnEgg[] = _("That isn’t an EGG."); +ALIGNED(4) const u8 gText_OnlyPkmnForBattle[] = _("That's your only\nPOKéMON for battle."); +ALIGNED(4) const u8 gText_PkmnCantBeTradedNow[] = _("That POKéMON can't be traded\nnow."); +ALIGNED(4) const u8 gText_EggCantBeTradedNow[] = _("An EGG can't be traded now."); +ALIGNED(4) const u8 gText_OtherTrainersPkmnCantBeTraded[] = _("The other TRAINER's POKéMON\ncan't be traded now."); +ALIGNED(4) const u8 gText_OtherTrainerCantAcceptPkmn[] = _("The other TRAINER can't accept\nthat POKéMON now."); +ALIGNED(4) const u8 gText_CantTradeWithTrainer[] = _("You can't trade with that\nTRAINER now."); +ALIGNED(4) const u8 gText_NotPkmnOtherTrainerWants[] = _("That isn't the type of POKéMON\nthat the other TRAINER wants."); +ALIGNED(4) const u8 gText_ThatIsntAnEgg[] = _("That isn't an EGG."); const u8 gText_Register[] = _("REGISTER"); const u8 gText_Attack3[] = _("ATTACK"); const u8 gText_Defense3[] = _("DEFENSE"); @@ -510,8 +510,8 @@ const u8 gText_Info[] = _("INFO"); const u8 gText_EggWillTakeALongTime[] = _("It looks like this EGG will\ntake a long time to hatch."); const u8 gText_EggWillTakeSomeTime[] = _("What will hatch from this?\nIt will take some time."); const u8 gText_EggWillHatchSoon[] = _("It moves occasionally.\nIt should hatch soon."); -const u8 gText_EggAboutToHatch[] = _("It’s making sounds.\nIt’s about to hatch!"); -const u8 gText_HMMovesCantBeForgotten2[] = _("HM moves can’t be\nforgotten now."); +const u8 gText_EggAboutToHatch[] = _("It's making sounds.\nIt's about to hatch!"); +const u8 gText_HMMovesCantBeForgotten2[] = _("HM moves can't be\nforgotten now."); const u8 gText_XNatureMetAtYZ[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}."); const u8 gText_XNatureHatchedAtYZ[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {LV_2}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}."); const u8 gText_XNatureObtainedInTrade[] = _("{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a trade."); @@ -525,7 +525,7 @@ const u8 gText_PeculiarEggNicePlace[] = _("A peculiar POKéMON EGG\nobtained at const u8 gText_PeculiarEggTrade[] = _("A peculiar POKéMON EGG\nobtained in a trade."); const u8 gText_EggFromHotSprings[] = _("A POKéMON EGG obtained\nat the hot springs."); const u8 gText_EggFromTraveler[] = _("An odd POKéMON EGG\nobtained from a traveler."); -const u8 gText_ApostropheSBase[] = _("’s BASE"); +const u8 gText_ApostropheSBase[] = _("'s BASE"); const u8 gText_OkayToDeleteFromRegistry[] = _("Is it okay to delete {STR_VAR_1}\nfrom the REGISTRY?"); const u8 gText_RegisteredDataDeleted[] = _("The registered data was deleted.{PAUSE_UNTIL_PRESS}"); const u8 gText_NoRegistry[] = _("There is no REGISTRY.{PAUSE_UNTIL_PRESS}"); @@ -550,14 +550,14 @@ const u8 gText_Cushion[] = _("CUSHION"); const u8 gText_Gold[] = _("GOLD"); const u8 gText_Silver[] = _("SILVER"); const u8 gText_PlaceItHere[] = _("Place it here?"); -const u8 gText_CantBePlacedHere[] = _("It can’t be placed here."); +const u8 gText_CantBePlacedHere[] = _("It can't be placed here."); const u8 gText_CancelDecorating[] = _("Cancel decorating?"); const u8 gText_InUseAlready[] = _("This is in use already."); const u8 gText_NoMoreDecorations[] = _("No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}."); const u8 gText_NoMoreDecorations2[] = _("No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}."); -const u8 gUnknown_085EA978[] = _("This can’t be placed here.\nIt must be on a DESK, etc."); -const u8 gText_CantPlaceInRoom[] = _("This decoration can’t be placed in\nyour own room."); -const u8 gText_CantThrowAwayInUse[] = _("This decoration is in use.\nIt can’t be thrown away."); +const u8 gUnknown_085EA978[] = _("This can't be placed here.\nIt must be on a DESK, etc."); +const u8 gText_CantPlaceInRoom[] = _("This decoration can't be placed in\nyour own room."); +const u8 gText_CantThrowAwayInUse[] = _("This decoration is in use.\nIt can't be thrown away."); const u8 gText_DecorationWillBeDiscarded[] = _("This {STR_VAR_1} will be discarded.\nIs that okay?"); const u8 gText_DecorationThrownAway[] = _("The decoration item was thrown away."); const u8 gText_StopPuttingAwayDecorations[] = _("Stop putting away decorations?"); @@ -586,8 +586,8 @@ const u8 gText_WithdrawXItems[] = _("Withdrew {STR_VAR_2}\n{STR_VAR_1}(s)."); const u8 gText_Read[] = _("READ"); const u8 gText_MoveToBag[] = _("MOVE TO BAG"); const u8 gText_Give2[] = _("GIVE"); -const u8 gText_NoMailHere[] = _("There’s no MAIL here.{PAUSE_UNTIL_PRESS}"); -const u8 gText_WhatToDoWithVar1sMail[] = _("What would you like to do with\n{STR_VAR_1}’s MAIL?"); +const u8 gText_NoMailHere[] = _("There's no MAIL here.{PAUSE_UNTIL_PRESS}"); +const u8 gText_WhatToDoWithVar1sMail[] = _("What would you like to do with\n{STR_VAR_1}'s MAIL?"); const u8 gText_MessageWillBeLost[] = _("The message will be lost.\nIs that okay?"); const u8 gText_BagIsFull[] = _("The BAG is full.{PAUSE_UNTIL_PRESS}"); const u8 gText_MailToBagMessageErased[] = _("The MAIL was returned to the BAG\nwith its message erased.{PAUSE_UNTIL_PRESS}"); @@ -606,7 +606,7 @@ const u8 gUnknown_085EAD56[] = _("LILYCOVE"); const u8 gUnknown_085EAD5F[] = _("DEWFORD"); const u8 gUnknown_085EAD67[] = _("ENTER"); const u8 gUnknown_085EAD6D[] = _("INFO"); -const u8 gUnknown_085EAD72[] = _("What’s a CONTEST?"); +const u8 gUnknown_085EAD72[] = _("What's a CONTEST?"); const u8 gUnknown_085EAD84[] = _("Types of CONTESTS"); const u8 gUnknown_085EAD96[] = _("Ranks"); const u8 gUnknown_085EAD9C[] = _("Judging"); @@ -701,9 +701,9 @@ const u8 gText_Key_Items[] = _("KEY ITEMS"); const u8 gText_Poke_Balls[] = _("POKé BALLS"); const u8 gText_TMs_Hms[] = _("TMs & HMs"); const u8 gText_Berries2[] = _("BERRIES"); -const u8 gText_SomeonesPC[] = _("SOMEONE’S PC"); -const u8 gText_LanettesPC[] = _("LANETTE’S PC"); -const u8 gText_PlayersPC[] = _("{PLAYER}’s PC"); +const u8 gText_SomeonesPC[] = _("SOMEONE'S PC"); +const u8 gText_LanettesPC[] = _("LANETTE'S PC"); +const u8 gText_PlayersPC[] = _("{PLAYER}'s PC"); const u8 gText_HallOfFame[] = _("HALL OF FAME"); const u8 gText_LogOff[] = _("LOG OFF"); const u8 gText_Opponent[] = _("OPPONENT"); @@ -745,10 +745,10 @@ const u8 gText_NavelRock[] = _("NAVEL ROCK"); const u8 gUnknown_085EB2E4[] = _("CLAW FOSSIL"); const u8 gUnknown_085EB2F0[] = _("ROOT FOSSIL"); const u8 gUnknown_085EB2FC[] = _("NO"); -const u8 gUnknown_085EB2FF[] = _("I’ll battle now!"); +const u8 gUnknown_085EB2FF[] = _("I'll battle now!"); const u8 gUnknown_085EB310[] = _("I won!"); const u8 gUnknown_085EB317[] = _("I lost!"); -const u8 gUnknown_085EB31F[] = _("I won’t tell."); +const u8 gUnknown_085EB31F[] = _("I won't tell."); const u8 gUnknown_085EB32D[] = _("NORMAL TAG MATCH"); const u8 gUnknown_085EB33E[] = _("VARIETY TAG MATCH"); const u8 gUnknown_085EB350[] = _("UNIQUE TAG MATCH"); @@ -856,7 +856,7 @@ const u8 gText_SlateportCity[] = _("SLATEPORT CITY"); const u8 gText_CaveOfOrigin[] = _("CAVE OF ORIGIN"); const u8 gText_MtPyre[] = _("MT. PYRE"); const u8 gText_SkyPillar[] = _("SKY PILLAR"); -const u8 gText_DontRemember[] = _("Don’t remember"); +const u8 gText_DontRemember[] = _("Don't remember"); const u8 gText_Exit[] = _("EXIT"); const u8 gText_ExitFromBox[] = _("Exit from the BOX?"); const u8 gText_WhatDoYouWantToDo[] = _("What do you want to do?"); @@ -871,11 +871,11 @@ const u8 gText_ReleaseThisPokemon[] = _("Release this POKéMON?"); const u8 gText_PkmnWasReleased[] = _("{SPECIAL_F7 0x00} was released."); const u8 gText_ByeByePkmn[] = _("Bye-bye, {SPECIAL_F7 0x00}!"); const u8 gText_MarkYourPkmn[] = _("Mark your POKéMON."); -const u8 gText_ThatsYourLastPkmn[] = _("That’s your last POKéMON!"); -const u8 gText_YourPartysFull[] = _("Your party’s full!"); -const u8 gText_YoureHoldingAPkmn[] = _("You’re holding a POKéMON!"); +const u8 gText_ThatsYourLastPkmn[] = _("That's your last POKéMON!"); +const u8 gText_YourPartysFull[] = _("Your party's full!"); +const u8 gText_YoureHoldingAPkmn[] = _("You're holding a POKéMON!"); const u8 gText_WhichOneWillYouTake[] = _("Which one will you take?"); -const u8 gText_YouCantReleaseAnEgg[] = _("You can’t release an EGG."); +const u8 gText_YouCantReleaseAnEgg[] = _("You can't release an EGG."); const u8 gText_ContinueBoxOperations[] = _("Continue BOX operations?"); const u8 gText_PkmnCameBack[] = _("{SPECIAL_F7 0x00} came back!"); const u8 gText_WasItWorriedAboutYou[] = _("Was it worried about you?"); @@ -887,7 +887,7 @@ const u8 gText_BagIsFull2[] = _("The BAG is full."); const u8 gText_PutItemInBag[] = _("Put this item in the BAG?"); const u8 gText_ItemIsNowHeld[] = _("{SPECIAL_F7 0x00} is now held."); const u8 gText_ChangedToNewItem[] = _("Changed to {SPECIAL_F7 0x00}."); -const u8 gText_MailCantBeStored[] = _("MAIL can’t be stored!"); +const u8 gText_MailCantBeStored[] = _("MAIL can't be stored!"); const u8 gPCText_Cancel[] = _("CANCEL"); const u8 gPCText_Store[] = _("STORE"); const u8 gPCText_Withdraw[] = _("WITHDRAW"); @@ -961,9 +961,9 @@ const u8 gText_NumberOfBattles[] = _("No. of battles"); const u8 gUnknown_085EBE7D[] = _("DETAIL"); const u8 gUnknown_085EBE84[] = _("CALL"); const u8 gUnknown_085EBE89[] = _("EXIT"); -const u8 gUnknown_085EBE8E[] = _("Can’t call opponent here."); +const u8 gUnknown_085EBE8E[] = _("Can't call opponent here."); const u8 gUnknown_085EBEA8[] = _("STRATEGY"); -const u8 gUnknown_085EBEB1[] = _("TRAINER’S POKéMON"); +const u8 gUnknown_085EBEB1[] = _("TRAINER'S POKéMON"); const u8 gUnknown_085EBEC3[] = _("SELF-INTRODUCTION"); const u8 gUnknown_085EBED5[] = _("{CLEAR 0x80}"); const u8 gUnknown_085EBED9[] = _("{A_BUTTON}ZOOM {B_BUTTON}CANCEL"); @@ -1004,9 +1004,9 @@ const u8 gUnknown_085EC104[] = _("With four phrases,"); const u8 gText_CombineNineWordsOrPhrases[] = _("Combine nine words or phrases"); const u8 gText_AndMakeAMessage2[] = _("and make a message."); const u8 gText_ChangeJustOneWordOrPhrase[] = _("Change just one word or phrase"); -const u8 gText_AndImproveTheBardsSong[] = _("and improve the BARD’s song."); +const u8 gText_AndImproveTheBardsSong[] = _("and improve the BARD's song."); const u8 gText_YourProfile[] = _("Your profile"); -const u8 gText_YourFeelingAtTheBattlesStart[] = _("Your feeling at the battle’s start"); +const u8 gText_YourFeelingAtTheBattlesStart[] = _("Your feeling at the battle's start"); const u8 gText_WhatYouSayIfYouWin[] = _("What you say if you win a battle"); const u8 gText_WhatYouSayIfYouLose[] = _("What you say if you lose a battle"); const u8 gText_TheAnswer[] = _("The answer"); @@ -1020,7 +1020,7 @@ const u8 gText_IsAsShownOkay[] = _("is as shown. Okay?"); const u8 gText_CombineTwoWordsOrPhrases2[] = _("Combine two words or phrases"); const u8 gText_ToTeachHerAGoodSaying[] = _("to teach her a good saying."); const u8 gText_FindWordsWhichFit[] = _("Find words which fit"); -const u8 gText_TheTrainersImage[] = _("the TRAINER’s image."); +const u8 gText_TheTrainersImage[] = _("the TRAINER's image."); const u8 gText_TheImage[] = _("The image:"); const u8 gText_OutOfTheListedChoices[] = _("Out of the listed choices,"); const u8 gText_SelectTheAnswerToTheQuiz[] = _("select the answer to the quiz!"); @@ -1029,21 +1029,21 @@ const u8 gText_PickAWordOrPhraseAnd[] = _("Pick a word or phrase and"); const u8 gText_SetTheQuizAnswer[] = _("set the quiz answer."); const u8 gText_TheAnswerColon[] = _("The answer:"); const u8 gUnknown_085EC387[] = _("The quiz:"); -const u8 gText_ApprenticePhrase[] = _("Apprentice’s phrase:"); +const u8 gText_ApprenticePhrase[] = _("Apprentice's phrase:"); const u8 gText_QuitEditing[] = _("Quit editing?"); const u8 gText_StopGivingPkmnMail[] = _("Stop giving the POKéMON MAIL?"); const u8 gText_AndFillOutTheQuestionnaire[] = _("and fill out the questionnaire."); -const u8 gText_LetsReplyToTheInterview[] = _("Let’s reply to the interview!"); +const u8 gText_LetsReplyToTheInterview[] = _("Let's reply to the interview!"); const u8 gText_AllTextBeingEditedWill[] = _("All the text being edited will"); const u8 gText_BeDeletedThatOkay[] = _("be deleted. Is that okay?"); const u8 gUnknown_085EC449[] = _("Quit editing?"); const u8 gUnknown_085EC457[] = _("The edited text will not be saved."); const u8 gUnknown_085EC47A[] = _("Is that okay?"); const u8 gUnknown_085EC488[] = _("Please enter a phrase or word."); -const u8 gUnknown_085EC4A7[] = _("The entire text can’t be deleted."); +const u8 gUnknown_085EC4A7[] = _("The entire text can't be deleted."); const u8 gText_OnlyOnePhrase[] = _("Only one phrase may be changed."); const u8 gText_OriginalSongWillBeUsed[] = _("The original song will be used."); -const u8 gUnknown_085EC509[] = _("That’s trendy already!"); +const u8 gUnknown_085EC509[] = _("That's trendy already!"); const u8 gText_CombineTwoWordsOrPhrases3[] = _("Combine two words or phrases."); const u8 gUnknown_085EC53E[] = _("Quit giving information?"); const u8 gUnknown_085EC557[] = _("Stop giving the POKéMON MAIL?"); @@ -1051,20 +1051,20 @@ const u8 gUnknown_085EC575[] = _("Create a quiz!"); const u8 gUnknown_085EC584[] = _("Set the answer!"); const u8 gUnknown_085EC594[] = _("Cancel the selection?"); const u8 gText_Profile[] = _("PROFILE"); -const u8 gText_AtTheBattlesStart[] = _("At the battle’s start:"); +const u8 gText_AtTheBattlesStart[] = _("At the battle's start:"); const u8 gText_UponWinningABattle[] = _("Upon winning a battle:"); const u8 gText_UponLosingABattle[] = _("Upon losing a battle:"); -const u8 gText_TheBardsSong[] = _("The BARD’s Song"); -const u8 gText_WhatsHipAndHappening[] = _("What’s hip and happening?"); +const u8 gText_TheBardsSong[] = _("The BARD's Song"); +const u8 gText_WhatsHipAndHappening[] = _("What's hip and happening?"); const u8 gText_Interview[] = _("Interview"); const u8 gText_GoodSaying[] = _("Good saying"); -const u8 gText_FansQuestion[] = _("Fan’s question"); +const u8 gText_FansQuestion[] = _("Fan's question"); const u8 gUnknown_085EC645[] = _("クイズ㮠ã“ãŸãˆã¯ï¼Ÿ"); -const u8 gText_ApprenticesPhrase[] = _("Apprentice’s phrase"); +const u8 gText_ApprenticesPhrase[] = _("Apprentice's phrase"); const u8 gText_Questionnaire[] = _("QUESTIONNAIRE"); const u8 gText_YouCannotQuitHere[] = _("You cannot quit here."); const u8 gText_SectionMustBeCompleted[] = _("This section must be completed."); -const u8 gText_F700sQuiz[] = _("{SPECIAL_F7 0x00}’s quiz"); +const u8 gText_F700sQuiz[] = _("{SPECIAL_F7 0x00}'s quiz"); const u8 gText_Lady[] = _("Lady"); const u8 gText_AfterYouHaveReadTheQuiz[] = _("After you have read the quiz"); const u8 gText_QuestionPressTheAButton[] = _("question, press the A Button."); @@ -1074,7 +1074,7 @@ const u8 gText_ChallengeQuestionMark[] = _("challenge?"); const u8 gText_IsThisQuizOK[] = _("Is this quiz OK?"); const u8 gText_CreateAQuiz[] = _("Create a quiz!"); const u8 gText_SelectTheAnswer[] = _("Select the answer!"); -const u8 gText_LyricsCantBeDeleted[] = _("The lyrics can’t be deleted."); +const u8 gText_LyricsCantBeDeleted[] = _("The lyrics can't be deleted."); const u8 gText_PokemonLeague[] = _("POKéMON LEAGUE"); const u8 gText_PokemonCenter[] = _("POKéMON CENTER"); const u8 gText_GetsAPokeBlockQuestion[] = _(" gets a {POKEBLOCK}?"); @@ -1085,7 +1085,7 @@ const u8 gText_Smartness[] = _("Smartness "); const u8 gText_Toughness[] = _("Toughness "); const u8 gText_WasEnhanced[] = _("was enhanced!"); const u8 gText_NothingChanged[] = _("Nothing changed!"); -const u8 gText_WontEatAnymore[] = _("It won’t eat anymore…"); +const u8 gText_WontEatAnymore[] = _("It won't eat anymore…"); const u8 gText_SaveFailedCheckingBackup[] = _("Save failed. Checking the backup\nmemory… Please wait.\n{COLOR RED}“Time required: about 1 minuteâ€"); const u8 gText_BackupMemoryDamaged[] = _("The backup memory is damaged, or\nthe internal battery has run dry.\nYou can still play, but not save."); const u8 gText_GamePlayCannotBeContinued[] = _("{COLOR RED}“Game play cannot be continued.\nReturning to the title screen…â€"); @@ -1102,7 +1102,7 @@ const u8 gText_PleaseResetTime[] = _("Please reset the time."); const u8 gText_ClockHasBeenReset[] = _("The clock has been reset.\nData will be saved. Please wait."); const u8 gText_SaveCompleted[] = _("Save completed."); const u8 gText_SaveFailed[] = _("Save failed…"); -const u8 gText_NoSaveFileCantSetTime[] = _("There is no save file, so the time\ncan’t be set."); +const u8 gText_NoSaveFileCantSetTime[] = _("There is no save file, so the time\ncan't be set."); const u8 gText_InGameClockUsable[] = _("The in-game clock adjustment system\nis now useable."); const u8 gText_Slots[] = _("SLOTS"); const u8 gText_Roulette[] = _("ROULETTE"); @@ -1162,7 +1162,7 @@ const u8 gText_QuickClaw48BP[] = _("QUICK CLAW{CLEAR_TO 0x5E}48BP"); const u8 gText_MentalHerb48BP[] = _("MENTAL HERB{CLEAR_TO 0x5E}48BP"); const u8 gText_BrightPowder64BP[] = _("BRIGHTPOWDER{CLEAR_TO 0x5E}64BP"); const u8 gText_ChoiceBand64BP[] = _("CHOICE BAND{CLEAR_TO 0x5E}64BP"); -const u8 gText_KingsRock64BP[] = _("KING’S ROCK{CLEAR_TO 0x5E}64BP"); +const u8 gText_KingsRock64BP[] = _("KING'S ROCK{CLEAR_TO 0x5E}64BP"); const u8 gText_FocusBand64BP[] = _("FOCUS BAND{CLEAR_TO 0x5E}64BP"); const u8 gText_ScopeLens64BP[] = _("SCOPE LENS{CLEAR_TO 0x5E}64BP"); const u8 gText_Softboiled16BP[] = _("SOFTBOILED{CLEAR_TO 0x4E}16BP"); @@ -1197,7 +1197,7 @@ const u8 gText_Colon2[] = _(":"); const u8 gUnknown_085ECF91[] = _(" points"); const u8 gText_TrainerCardTime[] = _("TIME"); const u8 gUnknown_085ECF9E[] = _("ゲ-ムãƒã‚¤ãƒ³ãƒˆ"); -const u8 gText_Var1sTrainerCard[] = _("{STR_VAR_1}’s TRAINER CARD"); +const u8 gText_Var1sTrainerCard[] = _("{STR_VAR_1}'s TRAINER CARD"); const u8 gText_HallOfFameDebut[] = _("HALL OF FAME DEBUT "); const u8 gText_LinkBattles[] = _("LINK BATTLES"); const u8 gText_LinkCableBattles[] = _("LINK CABLE BATTLES"); @@ -1237,7 +1237,7 @@ const u8 gText_BDot[] = _("B."); const u8 gText_AnnouncingResults[] = _("Announcing the results!"); const u8 gText_PreliminaryResults[] = _("The preliminary results!"); const u8 gText_Round2Results[] = _("Round 2 results!"); -const u8 gText_Var1sVar2Won[] = _("{STR_VAR_1}’s {STR_VAR_2} won!"); +const u8 gText_Var1sVar2Won[] = _("{STR_VAR_1}'s {STR_VAR_2} won!"); const u8 gText_CommunicationStandby[] = _("Communication standby…"); const u8 gText_ColorDarkGrey[] = _("{COLOR DARK_GREY}"); const u8 gUnknown_085ED222[] = _("{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR6 WHITE DYNAMIC_COLOR5}"); @@ -1264,14 +1264,14 @@ const u8 gText_ExitingChat[] = _("Exiting the chat…"); const u8 gText_LeaderLeftEndingChat[] = _("The LEADER, {SPECIAL_F7 0x00}, has\nleft, ending the chat."); const u8 gText_RegisteredTextChanged[] = _("The registered text has been changed.\nIs it okay to save the game?"); const u8 gText_AlreadySavedFile_Unused[] = _("There is already a saved file.\nIs it okay to overwrite it?"); -const u8 gText_SavingDontTurnOff_Unused[] = _("SAVING…\nDON’T TURN OFF THE POWER."); +const u8 gText_SavingDontTurnOff_Unused[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_PlayerSavedGame_Unused[] = _("{SPECIAL_F7 0x00} saved the game."); const u8 gText_IfLeaderLeavesChatEnds[] = _("If the LEADER leaves, the chat\nwill end. Is that okay?"); const u8 gText_Hello[] = _("HELLO"); const u8 gText_Pokemon2[] = _("POKéMON"); const u8 gText_Trade[] = _("TRADE"); const u8 gText_Battle[] = _("BATTLE"); -const u8 gText_Lets[] = _("LET’S"); +const u8 gText_Lets[] = _("LET'S"); const u8 gText_Ok[] = _("OK!"); const u8 gText_Sorry[] = _("SORRY"); const u8 gText_YayUnkF9F9[] = _("YAY{EMOJI_BIGSMILE}"); @@ -1279,18 +1279,18 @@ const u8 gText_ThankYou[] = _("THANK YOU"); const u8 gText_ByeBye[] = _("BYE-BYE!"); const u8 gMatchCallStevenStrategyText[] = _("Attack the weak points!"); const u8 gMatchCall_StevenTrainersPokemonText[] = _("Ultimate STEEL POKéMON."); -const u8 gMatchCall_StevenSelfIntroductionText_Line1_BeforeMeteorFallsBattle[] = _("I’d climb even waterfalls"); +const u8 gMatchCall_StevenSelfIntroductionText_Line1_BeforeMeteorFallsBattle[] = _("I'd climb even waterfalls"); const u8 gMatchCall_StevenSelfIntroductionText_Line2_BeforeMeteorFallsBattle[] = _("to find a rare stone!"); -const u8 gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle[] = _("I’m the strongest and most"); +const u8 gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle[] = _("I'm the strongest and most"); const u8 gMatchCall_StevenSelfIntroductionText_Line2_AfterMeteorFallsBattle[] = _("energetic after all!"); const u8 gMatchCall_BrendanStrategyText[] = _("Battle with knowledge!"); const u8 gMatchCall_BrendanTrainersPokemonText[] = _("I will use various POKéMON."); -const u8 gMatchCall_BrendanSelfIntroductionText_Line1[] = _("I’ll be a better POKéMON"); +const u8 gMatchCall_BrendanSelfIntroductionText_Line1[] = _("I'll be a better POKéMON"); const u8 gMatchCall_BrendanSelfIntroductionText_Line2[] = _("prof than my father is!"); -const u8 gMatchCall_MayStrategyText[] = _("I’m not so good at battles."); -const u8 gMatchCall_MayTrainersPokemonText[] = _("I’ll use any POKéMON!"); +const u8 gMatchCall_MayStrategyText[] = _("I'm not so good at battles."); +const u8 gMatchCall_MayTrainersPokemonText[] = _("I'll use any POKéMON!"); const u8 gMatchCall_MaySelfIntroductionText_Line1[] = _("My POKéMON and I help"); -const u8 gMatchCall_MaySelfIntroductionText_Line2[] = _("my father’s research."); +const u8 gMatchCall_MaySelfIntroductionText_Line2[] = _("my father's research."); const u8 gText_HatchedFromEgg[] = _("{STR_VAR_1} hatched from the EGG!"); const u8 gText_NickHatchPrompt[] = _("Would you like to nickname the newly\nhatched {STR_VAR_1}?"); ALIGNED(4) const u8 gText_ReadyToBerryCrush[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p"); @@ -1300,7 +1300,7 @@ ALIGNED(4) const u8 gText_RecordingGameResults[] = _("Recording your game result ALIGNED(4) const u8 gText_PlayBerryCrushAgain[] = _("Want to play BERRY CRUSH again?"); ALIGNED(4) const u8 gText_YouHaveNoBerries[] = _("You have no BERRIES.\nThe game will be canceled."); ALIGNED(4) const u8 gText_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled."); -ALIGNED(4) const u8 gText_TimesUpNoGoodPowder[] = _("Time’s up.\pGood BERRY POWDER could not be\nmade…\p"); +ALIGNED(4) const u8 gText_TimesUpNoGoodPowder[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p"); ALIGNED(4) const u8 gText_CommunicationStandby2[] = _("Communication standby…"); ALIGNED(4) const u8 gText_1DotBlueF700[] = _("1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{SPECIAL_F7 0x00}"); ALIGNED(4) const u8 gText_1DotF700[] = _("1. {SPECIAL_F7 0x00}"); @@ -1377,7 +1377,7 @@ const u8 gText_3Colon[] = _("3:"); const u8 gText_4Colon[] = _("4:"); const u8 gText_5Colon[] = _("5:"); const u8 gText_FirstPlacePrize[] = _("The first-place winner gets\nthis {SPECIAL_F7 0x00}!"); -const u8 gText_CantHoldAnyMore[] = _("You can’t hold any more!"); +const u8 gText_CantHoldAnyMore[] = _("You can't hold any more!"); const u8 gText_FilledStorageSpace[] = _("It filled its storage space."); const u8 gText_WantToPlayAgain[] = _("Want to play again?"); const u8 gText_SomeoneDroppedOut[] = _("Somebody dropped out.\nThe link will be canceled."); @@ -1389,13 +1389,13 @@ const u8 gText_PkmnJumpRecords[] = _("POKéMON JUMP RECORDS"); const u8 gText_JumpsInARow[] = _("Jumps in a row:"); const u8 gText_BestScore2[] = _("Best score:"); const u8 gText_ExcellentsInARow[] = _("EXCELLENTS in a row:"); -const u8 gText_AwesomeWonF701F700[] = _("Awesome score! You’ve\nwon {SPECIAL_F7 0x01} {SPECIAL_F7 0x00}!"); +const u8 gText_AwesomeWonF701F700[] = _("Awesome score! You've\nwon {SPECIAL_F7 0x01} {SPECIAL_F7 0x00}!"); const u8 gText_FilledStorageSpace2[] = _("It filled its storage space."); -const u8 gText_CantHoldMore[] = _("You can’t hold any more!"); +const u8 gText_CantHoldMore[] = _("You can't hold any more!"); const u8 gText_WantToPlayAgain2[] = _("Want to play again?"); const u8 gText_SomeoneDroppedOut2[] = _("Somebody dropped out.\nThe link will be canceled."); const u8 gText_CommunicationStandby4[] = _("Communication standby…"); -const u8 gText_LinkContestResults[] = _("{PLAYER}’s Link Contest Results"); +const u8 gText_LinkContestResults[] = _("{PLAYER}'s Link Contest Results"); const u8 gText_1st[] = _("1st"); const u8 gText_2nd[] = _("2nd"); const u8 gText_3rd[] = _("3rd"); @@ -1405,9 +1405,9 @@ const u8 gUnknown_085EDFB7[] = _("POKeMON"); const u8 gJPText_MysteryGift[] = _("ãµã—ãŽãªã‚‚らã„ã‚‚ã®"); const u8 gJPText_DecideStop[] = _("{A_BUTTON}ã‘ã£ã¦ã„ {B_BUTTON}ã‚„ã‚ã‚‹"); const u8 gUnknown_085EDFD6[] = _("カードeリーダー{PLUS}　ã§\nãµã—ãŽãªã‚‚らã„ã‚‚ã®ã‚’　よã¿ã“ã¿ã¾ã™"); -const u8 gUnknown_085EDFF5[] = _("カードeリーダー{PLUS}ã®ã€€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰\n‘ã¤ã†ã—ん’を　ãˆã‚‰ã³"); -const u8 gUnknown_085EE014[] = _("‘ゲームボーイアドãƒãƒ³ã‚¹ã¨ã¤ã†ã—ん’\nを　ã›ã‚“ãŸã　ã—ã¦ãã ã•ã„"); -const u8 gUnknown_085EE035[] = _("カードeリーダー{PLUS}ã®ã€€â€˜ã¤ã†ã—ん’を\nãˆã‚‰ã‚“ã§ã€€Aボタンを　ãŠã—ã¦ãã ã•ã„"); +const u8 gUnknown_085EDFF5[] = _("カードeリーダー{PLUS}ã®ã€€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰\n‘ã¤ã†ã—ã‚“'を　ãˆã‚‰ã³"); +const u8 gUnknown_085EE014[] = _("‘ゲームボーイアドãƒãƒ³ã‚¹ã¨ã¤ã†ã—ã‚“'\nを　ã›ã‚“ãŸã　ã—ã¦ãã ã•ã„"); +const u8 gUnknown_085EE035[] = _("カードeリーダー{PLUS}ã®ã€€â€˜ã¤ã†ã—ã‚“'ã‚’\nãˆã‚‰ã‚“ã§ã€€Aボタンを　ãŠã—ã¦ãã ã•ã„"); const u8 gUnknown_085EE05C[] = _("ã›ã¤ãžããŒã€€ã¾ã¡ãŒã£ã¦ã„ã¾ã™"); const u8 gUnknown_085EE06B[] = _("カードã®ã€€ã‚ˆã¿ã“ã¿ã‚’\nã¡ã‚…ã†ã—　ã—ã¾ã—ãŸ"); const u8 gUnknown_085EE080[] = _("カードeリーダー{PLUS}ã¨\nã¤ã†ã—ん　ã§ãã¾ã›ã‚“"); @@ -1422,19 +1422,19 @@ const u8 gUnknown_085EE12D[] = _("ã‹ãã“ã¿ã€€ã‚¨ãƒ©ãƒ¼ã€€ã§ã™\nデータ const u8 gUnknown_085EE14B[] = _("RED"); const u8 gUnknown_085EE14F[] = _("BLUE"); const u8 gUnknown_085EE154[] = _("---"); -const u8 gText_SingleBattleRoomResults[] = _("{PLAYER}’s Single Battle Room Results"); -const u8 gText_DoubleBattleRoomResults[] = _("{PLAYER}’s Double Battle Room Results"); -const u8 gText_MultiBattleRoomResults[] = _("{PLAYER}’s Multi Battle Room Results"); -const u8 gText_LinkMultiBattleRoomResults[] = _("{PLAYER}’s Link Multi Battle Room Results"); -const u8 gText_SingleBattleTourneyResults[] = _("{PLAYER}’s Single Battle Tourney Results"); -const u8 gText_DoubleBattleTourneyResults[] = _("{PLAYER}’s Double Battle Tourney Results"); -const u8 gText_SingleBattleHallResults[] = _("{PLAYER}’s Single Battle Hall Results"); -const u8 gText_DoubleBattleHallResults[] = _("{PLAYER}’s Double Battle Hall Results"); -const u8 gText_BattleChoiceResults[] = _("{PLAYER}’s Battle Choice Results"); -const u8 gText_SetKOTourneyResults[] = _("{PLAYER}’s Set KO Tourney Results"); -const u8 gText_BattleSwapSingleResults[] = _("{PLAYER}’s Battle Swap Single Results"); -const u8 gText_BattleSwapDoubleResults[] = _("{PLAYER}’s Battle Swap Double Results"); -const u8 gText_BattleQuestResults[] = _("{PLAYER}’s Battle Quest Results"); +const u8 gText_SingleBattleRoomResults[] = _("{PLAYER}'s Single Battle Room Results"); +const u8 gText_DoubleBattleRoomResults[] = _("{PLAYER}'s Double Battle Room Results"); +const u8 gText_MultiBattleRoomResults[] = _("{PLAYER}'s Multi Battle Room Results"); +const u8 gText_LinkMultiBattleRoomResults[] = _("{PLAYER}'s Link Multi Battle Room Results"); +const u8 gText_SingleBattleTourneyResults[] = _("{PLAYER}'s Single Battle Tourney Results"); +const u8 gText_DoubleBattleTourneyResults[] = _("{PLAYER}'s Double Battle Tourney Results"); +const u8 gText_SingleBattleHallResults[] = _("{PLAYER}'s Single Battle Hall Results"); +const u8 gText_DoubleBattleHallResults[] = _("{PLAYER}'s Double Battle Hall Results"); +const u8 gText_BattleChoiceResults[] = _("{PLAYER}'s Battle Choice Results"); +const u8 gText_SetKOTourneyResults[] = _("{PLAYER}'s Set KO Tourney Results"); +const u8 gText_BattleSwapSingleResults[] = _("{PLAYER}'s Battle Swap Single Results"); +const u8 gText_BattleSwapDoubleResults[] = _("{PLAYER}'s Battle Swap Double Results"); +const u8 gText_BattleQuestResults[] = _("{PLAYER}'s Battle Quest Results"); const u8 gText_Lv502[] = _("LV. 50"); const u8 gText_OpenLv[] = _("OPEN LV."); const u8 gText_WinStreak[] = _("Win streak: {STR_VAR_1}"); @@ -1460,7 +1460,7 @@ ALIGNED(4) const u8 gText_FrontierFacilityKOsStreak[] = _("KOs in a row: {STR_VA ALIGNED(4) const u8 gText_FrontierFacilityFloorsCleared[] = _("Floors cleared: {STR_VAR_2}"); ALIGNED(4) const u8 gText_123Dot[][3] = {_("1."), _("2."), _("3.")}; -const u8 gText_SavingDontTurnOff2[] = _("SAVING…\nDON’T TURN OFF THE POWER."); +const u8 gText_SavingDontTurnOff2[] = _("SAVING…\nDON'T TURN OFF THE POWER."); const u8 gText_BlenderMaxSpeedRecord[] = _("BERRY BLENDER\nMAXIMUM SPEED RECORD!"); const u8 gText_234Players[] = _("2 PLAYERS\n3 PLAYERS\n4 PLAYERS"); const u8 gText_YesNo[] = _("YES\nNO"); @@ -1529,7 +1529,7 @@ const u8 gText_Peak[] = _("Peak"); const u8 gText_LinkStandby2[] = _("Link standby…\n… … B Button: Cancel"); const u8 gText_PressAToLoadEvent[] = _("Press the A Button to load event.\n… … B Button: Cancel"); const u8 gText_LoadingEvent[] = _("Loading event…"); -const u8 gText_DontRemoveCableTurnOff[] = _("Don’t remove the Game Link cable.\nDon’t turn off the power."); +const u8 gText_DontRemoveCableTurnOff[] = _("Don't remove the Game Link cable.\nDon't turn off the power."); const u8 gText_EventSafelyLoaded[] = _("The event was safely loaded."); const u8 gText_LoadErrorEndingSession[] = _("Loading error.\nEnding session."); const u8 gUnknown_085EE846[] = _("プレイヤー"); @@ -1541,7 +1541,7 @@ const u8 gUnknown_085EE8DC[] = _("{COLOR RED}{SHADOW LIGHT_RED}ゲ-ムフリ-ク const u8 gUnknown_085EE8EA[] = _("{COLOR RED}{SHADOW LIGHT_RED}"); const u8 gText_Hoenn[] = _("HOENN"); const u8 gText_OhABite[] = _("Oh! A bite!"); -const u8 gText_PokemonOnHook[] = _("A POKéMON’s on the hook!{PAUSE_UNTIL_PRESS}"); +const u8 gText_PokemonOnHook[] = _("A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}"); const u8 gText_NotEvenANibble[] = _("Not even a nibble…{PAUSE_UNTIL_PRESS}"); const u8 gText_ItGotAway[] = _("It got away…{PAUSE_UNTIL_PRESS}"); const u8 gText_XWillBeSentToY[] = _("{STR_VAR_2} will be\nsent to {STR_VAR_1}."); @@ -1587,10 +1587,10 @@ const u8 gText_MixingRecords[] = _("Mixing records…"); const u8 gText_RecordMixingComplete[] = _("Record mixing completed.\nThank you for waiting."); const u8 gText_YourName[] = _("YOUR NAME?"); const u8 gText_BoxName[] = _("BOX NAME?"); -const u8 gText_PkmnsNickname[] = _("{STR_VAR_1}’s nickname?"); +const u8 gText_PkmnsNickname[] = _("{STR_VAR_1}'s nickname?"); const u8 gText_TellHimTheWords[] = _("Tell him the words."); const u8 gText_MoveOkBack[] = _("{DPAD_NONE}MOVE {A_BUTTON}OK {B_BUTTON}BACK"); -const u8 gText_CallCantBeMadeHere[] = _("A call can’t be made from here."); +const u8 gText_CallCantBeMadeHere[] = _("A call can't be made from here."); const u8 gUnknown_085EEB2B[] = _("HANDSOME"); const u8 gUnknown_085EEB34[] = _("VINNY"); const u8 gUnknown_085EEB3A[] = _("MOREME"); @@ -1619,7 +1619,7 @@ const u8 gText_Deselect[] = _("DESELECT"); const u8 gText_TheseThreePkmnOkay[] = _("Are these three POKéMON OK?"); const u8 gText_Yes2[] = _("YES"); const u8 gText_No2[] = _("NO"); -const u8 gText_CantSelectSamePkmn[] = _("Can’t select same {PKMN}."); +const u8 gText_CantSelectSamePkmn[] = _("Can't select same {PKMN}."); const u8 gText_PkmnSwap[] = _("POKéMON SWAP"); const u8 gText_SelectPkmnToSwap[] = _("Select POKéMON to swap."); const u8 gText_SelectPkmnToAccept[] = _("Select POKéMON to accept."); @@ -1670,8 +1670,8 @@ ALIGNED(4) const u8 gText_VarietyOfEventsImportedWireless[] = _("A variety of ev ALIGNED(4) const u8 gText_WonderCardsInPossession[] = _("Read the WONDER CARDS in your\npossession."); ALIGNED(4) const u8 gText_ReadNewsThatArrived[] = _("Read the NEWS that arrived."); ALIGNED(4) const u8 gText_ReturnToTitle[] = _("Return to the title screen."); -ALIGNED(4) const u8 gText_DontHaveCardNewOneInput[] = _("You don’t have a WONDER CARD,\nso a new CARD will be input."); -ALIGNED(4) const u8 gText_DontHaveNewsNewOneInput[] = _("You don’t have any WONDER NEWS,\nso new NEWS will be input."); +ALIGNED(4) const u8 gText_DontHaveCardNewOneInput[] = _("You don't have a WONDER CARD,\nso a new CARD will be input."); +ALIGNED(4) const u8 gText_DontHaveNewsNewOneInput[] = _("You don't have any WONDER NEWS,\nso new NEWS will be input."); ALIGNED(4) const u8 gText_WhereShouldCardBeAccessed[] = _("Where should the WONDER CARD\nbe accessed?"); ALIGNED(4) const u8 gText_WhereShouldNewsBeAccessed[] = _("Where should the WONDER NEWS\nbe accessed?"); ALIGNED(4) const u8 gUnknown_085EEFC0[] = _("Communication standby…\nB Button: Cancel"); @@ -1680,7 +1680,7 @@ ALIGNED(4) const u8 gText_CommunicationCompleted[] = _("Communication completed. ALIGNED(4) const u8 gText_CommunicationError[] = _("Communication error."); ALIGNED(4) const u8 gText_CommunicationCanceled[] = _("Communication has been canceled."); ALIGNED(4) const u8 gText_ThrowAwayWonderCard[] = _("Throw away the WONDER CARD\nand input a new CARD?"); -ALIGNED(4) const u8 gText_HaventReceivedCardsGift[] = _("You haven’t received the CARD’s gift\nyet. Input a new CARD anyway?"); +ALIGNED(4) const u8 gText_HaventReceivedCardsGift[] = _("You haven't received the CARD's gift\nyet. Input a new CARD anyway?"); ALIGNED(4) const u8 gText_WonderCardReceivedFrom[] = _("A WONDER CARD has been received\nfrom {STR_VAR_1}."); ALIGNED(4) const u8 gText_WonderNewsReceivedFrom[] = _("A WONDER NEWS item has been\nreceived from {STR_VAR_1}."); ALIGNED(4) const u8 gText_WonderCardReceived[] = _("A new WONDER CARD has been\nreceived."); @@ -1690,10 +1690,10 @@ ALIGNED(4) const u8 gText_NewTrainerReceived[] = _("A new TRAINER has arrived.") ALIGNED(4) const u8 gText_AlreadyHadCard[] = _("You already had that\nWONDER CARD."); ALIGNED(4) const u8 gText_AlreadyHadNews[] = _("You already had that\nWONDER NEWS item."); ALIGNED(4) const u8 gText_AlreadyHadStamp[] = _("You already had that\nSTAMP."); -ALIGNED(4) const u8 gText_NoMoreRoomForStamps[] = _("There’s no more room for adding\nSTAMPS."); +ALIGNED(4) const u8 gText_NoMoreRoomForStamps[] = _("There's no more room for adding\nSTAMPS."); ALIGNED(4) const u8 gText_RecordUploadedViaWireless[] = _("Your record has been uploaded via\nWIRELESS COMMUNICATION."); -ALIGNED(4) const u8 gText_CantAcceptCardFromTrainer[] = _("You can’t accept a WONDER CARD\nfrom this TRAINER."); -ALIGNED(4) const u8 gText_CantAcceptNewsFromTrainer[] = _("You can’t accept WONDER NEWS\nfrom this TRAINER."); +ALIGNED(4) const u8 gText_CantAcceptCardFromTrainer[] = _("You can't accept a WONDER CARD\nfrom this TRAINER."); +ALIGNED(4) const u8 gText_CantAcceptNewsFromTrainer[] = _("You can't accept WONDER NEWS\nfrom this TRAINER."); ALIGNED(4) const u8 gText_NothingSentOver[] = _("Nothing was sent over…"); ALIGNED(4) const u8 gText_WhatToDoWithCards[] = _("What would you like to do\nwith the WONDER CARDS?"); ALIGNED(4) const u8 gText_WhatToDoWithNews[] = _("What would you like to do\nwith the WONDER NEWS?"); @@ -1707,10 +1707,10 @@ ALIGNED(4) const u8 gText_OtherTrainerHasCard[] = _("The other TRAINER has the s ALIGNED(4) const u8 gText_OtherTrainerHasNews[] = _("The other TRAINER has the same\nWONDER NEWS already."); ALIGNED(4) const u8 gText_OtherTrainerHasStamp[] = _("The other TRAINER has the same\nSTAMP already."); ALIGNED(4) const u8 gText_OtherTrainerCanceled[] = _("The other TRAINER canceled\ncommunication."); -ALIGNED(4) const u8 gText_CantSendGiftToTrainer[] = _("You can’t send a MYSTERY GIFT to\nthis TRAINER."); -ALIGNED(4) const u8 gText_IfThrowAwayCardEventWontHappen[] = _("If you throw away the CARD,\nits event won’t happen. Okay?"); +ALIGNED(4) const u8 gText_CantSendGiftToTrainer[] = _("You can't send a MYSTERY GIFT to\nthis TRAINER."); +ALIGNED(4) const u8 gText_IfThrowAwayCardEventWontHappen[] = _("If you throw away the CARD,\nits event won't happen. Okay?"); ALIGNED(4) const u8 gText_OkayToDiscardNews[] = _("Is it okay to discard this\nNEWS item?"); -ALIGNED(4) const u8 gText_HaventReceivedGiftOkayToDiscard[] = _("You haven’t received the\nGIFT. Is it okay to discard?"); +ALIGNED(4) const u8 gText_HaventReceivedGiftOkayToDiscard[] = _("You haven't received the\nGIFT. Is it okay to discard?"); ALIGNED(4) const u8 gText_DataWillBeSaved[] = _("Data will be saved.\nPlease wait."); ALIGNED(4) const u8 gText_SaveCompletedPressA[] = _("Save completed.\nPlease press the A Button."); ALIGNED(4) const u8 gText_WonderCardThrownAway[] = _("The WONDER CARD was thrown away."); @@ -1718,18 +1718,18 @@ ALIGNED(4) const u8 gText_WonderNewsThrownAway[] = _("The WONDER NEWS was thrown ALIGNED(4) const u8 gText_MysteryGift[] = _("MYSTERY GIFT"); ALIGNED(4) const u8 gText_PickOKExit[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}EXIT"); ALIGNED(4) const u8 gText_PickOKCancel[] = _("{DPAD_UPDOWN}PICK {A_BUTTON}OK {B_BUTTON}CANCEL"); -const u8 gText_PlayersBattleResults[] = _("{PLAYER}’s BATTLE RESULTS"); +const u8 gText_PlayersBattleResults[] = _("{PLAYER}'s BATTLE RESULTS"); const u8 gText_TotalRecordWLD[] = _("TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}"); const u8 gText_WinLoseDraw[] = _("{CLEAR_TO 0x53}WIN{CLEAR_TO 0x80}LOSE{CLEAR_TO 0xB0}DRAW"); const u8 gText_CommunicationStandby5[] = _("Communication standby…"); const u8 gText_QuitTheGame[] = _("Quit the game?"); -const u8 gText_YouveGot9999Coins[] = _("You’ve got 9,999 COINS."); -const u8 gText_YouveRunOutOfCoins[] = _("You’ve run out of COINS.\nGame over!"); -const u8 gText_YouDontHaveThreeCoins[] = _("You don’t have three COINS."); -const u8 gText_ReelTimeHelp[] = _("REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus."); +const u8 gText_YouveGot9999Coins[] = _("You've got 9,999 COINS."); +const u8 gText_YouveRunOutOfCoins[] = _("You've run out of COINS.\nGame over!"); +const u8 gText_YouDontHaveThreeCoins[] = _("You don't have three COINS."); +const u8 gText_ReelTimeHelp[] = _("REEL TIME\nHere's your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus."); const u8 gDaycareText_GetAlongVeryWell[] = _("The two seem to get along\nvery well."); const u8 gDaycareText_GetAlong[] = _("The two seem to get along."); -const u8 gDaycareText_DontLikeOther[] = _("The two don’t seem to like\neach other much."); +const u8 gDaycareText_DontLikeOther[] = _("The two don't seem to like\neach other much."); const u8 gDaycareText_PlayOther[] = _("The two prefer to play with other\nPOKéMON than each other."); const u8 gText_NewLine2[] = _("\n"); const u8 gText_Exit4[] = _("EXIT"); @@ -1744,7 +1744,7 @@ const u8 gUnknown_085EF8BF[] = _("4F"); const u8 gText_TeachWhichMoveToPkmn[] = _("Teach which move to {STR_VAR_1}?"); const u8 gText_TeachX[] = _("Teach {STR_VAR_2}?"); const u8 gText_PkmnLearnedMove4[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!"); -const u8 gText_PkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can’t learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); +const u8 gText_PkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); const u8 gText_StopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_12AndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p"); const u8 gText_PkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}."); @@ -1782,7 +1782,7 @@ const u8 gNormanMatchCallName[] = _("DAD"); const u8 gMomMatchCallName[] = _("MOM"); const u8 gScottMatchCallDesc[] = _("ELUSIVE EYES"); const u8 gScottMatchCallName[] = _("SCOTT"); -const u8 gRoxanneMatchCallDesc[] = _("ROCKIN’ WHIZ"); +const u8 gRoxanneMatchCallDesc[] = _("ROCKIN' WHIZ"); const u8 gBrawlyMatchCallDesc[] = _("THE BIG HIT"); const u8 gWattsonMatchCallDesc[] = _("SWELL SHOCK"); const u8 gFlanneryMatchCallDesc[] = _("PASSION BURN"); -- cgit v1.2.3 From 6068495619364c8e0ccae15ad036a1b5a9eef171 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 7 Dec 2018 23:50:56 +0100 Subject: Document trainer battle scripts (#430) --- asm/macros/event.inc | 2 +- data/event_scripts.s | 1260 +------------------- .../scripts.inc | 2 +- data/scripts/secret_base.inc | 1115 +++++++++++++++++ data/scripts/trainer_battle.inc | 128 ++ data/specials.inc | 4 +- include/battle.h | 4 +- include/battle_setup.h | 2 +- include/constants/battle_setup.h | 2 +- include/event_scripts.h | 6 +- include/trainer_see.h | 2 +- src/battle_main.c | 8 +- src/battle_script_commands.c | 2 +- src/battle_setup.c | 20 +- src/battle_util.c | 4 +- src/daycare.c | 5 +- src/trainer_see.c | 8 +- 17 files changed, 1283 insertions(+), 1291 deletions(-) create mode 100644 data/scripts/secret_base.inc create mode 100644 data/scripts/trainer_battle.inc diff --git a/asm/macros/event.inc b/asm/macros/event.inc index d66992c35..c815f3753 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -668,7 +668,7 @@ .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script - .elseif \type == TRAINER_BATTLE_9 + .elseif \type == TRAINER_BATTLE_PYRAMID .4byte \pointer1 @ text .4byte \pointer2 @ text .elseif \type == TRAINER_BATTLE_SET_TRAINER_A diff --git a/data/event_scripts.s b/data/event_scripts.s index 7d7d1528e..d90dbf584 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -844,144 +844,12 @@ VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F waitstate return -EventScript_271354:: @ 8271354 + EventScript_271354:: @ 8271354 cmdD8 cmdD9 - -EventScript_271356:: @ 8271356 - special SetUpTrainerEncounterMusic - special EndTrainerApproach - waitstate - goto EventScript_ShowTrainerIntroMsg - -EventScript_271362:: @ 8271362 - lock - faceplayer - applymovement VAR_LAST_TALKED, Movement_27143A - waitmovement 0 - specialvar VAR_RESULT, GetTrainerFlag - compare VAR_RESULT, 0 - goto_if 5, EventScript_271389 - special SetUpTrainerEncounterMusic - special sub_80B16D8 - goto EventScript_ShowTrainerIntroMsg - -EventScript_271389:: @ 8271389 - gotopostbattlescript - -EventScript_TryDoDoubleTrainerBattle:: @ 827138A - lock - faceplayer - call EventScript_27142F - specialvar VAR_RESULT, GetTrainerFlag - compare VAR_RESULT, 0 - goto_if 5, EventScript_2713C1 - special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 - goto_if 5, EventScript_NotEnoughMonsForDoubleBattle - special SetUpTrainerEncounterMusic - special sub_80B16D8 - goto EventScript_ShowTrainerIntroMsg - -EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA - special ShowTrainerCantBattleSpeech - waitmessage - waitbuttonpress - release - end - -EventScript_2713C1:: @ 82713C1 - gotopostbattlescript - -EventScript_2713C2:: @ 82713C2 - applymovement VAR_LAST_TALKED, Movement_27143A - waitmovement 0 - special SetUpTrainerEncounterMusic - trainerbattlebegin - gotopostbattlescript - -EventScript_2713D1:: @ 82713D1 - call EventScript_27142F - specialvar VAR_RESULT, IsTrainerReadyForRematch - compare VAR_RESULT, 0 - goto_eq EventScript_2713F7 - special SetUpTrainerEncounterMusic - special sub_80B16D8 - special ShowTrainerIntroSpeech - waitmessage - waitbuttonpress - special BattleSetup_StartRematchBattle - waitstate - releaseall - end - -EventScript_2713F7:: @ 82713F7 - gotopostbattlescript - -EventScript_TryDoDoubleRematchBattle:: @ 82713F8 - specialvar VAR_RESULT, IsTrainerReadyForRematch - compare VAR_RESULT, 0 - goto_eq EventScript_271427 - special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 - goto_if 5, EventScript_NotEnoughMonsForDoubleRematchBattle - special SetUpTrainerEncounterMusic - special sub_80B16D8 - special ShowTrainerIntroSpeech - waitmessage - waitbuttonpress - special BattleSetup_StartRematchBattle - waitstate - releaseall - end - -EventScript_271427:: @ 8271427 - gotopostbattlescript - -EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 8271428 - special ShowTrainerCantBattleSpeech - waitmessage - waitbuttonpress - release - end - -EventScript_27142F:: @ 827142F - applymovement VAR_LAST_TALKED, Movement_27143A - waitmovement 0 - return - -Movement_27143A: @ 827143A - reveal_trainer - step_end - -EventScript_ShowTrainerIntroMsg:: @ 827143C - special ShowTrainerIntroSpeech - waitmessage - waitbuttonpress - special sub_80B45D0 - compare VAR_RESULT, 1 - goto_eq EventScript_271356 - goto EventScript_DoTrainerBattle - -EventScript_DoTrainerBattle:: @ 8271454 - trainerbattlebegin - specialvar VAR_RESULT, GetTrainerBattleMode - compare VAR_RESULT, 0 - goto_eq EventScript_271491 - compare VAR_RESULT, 2 - goto_eq EventScript_271491 - compare VAR_RESULT, 1 - goto_eq EventScript_271491 - compare VAR_RESULT, 6 - goto_eq EventScript_271491 - compare VAR_RESULT, 8 - goto_eq EventScript_271491 - -EventScript_271491:: @ 8271491 - gotobeatenscript - releaseall - end - + + .include "data/scripts/trainer_battle.inc" + Std_MsgboxAutoclose:: @ 8271494 message 0x0 waitmessage @@ -4105,1123 +3973,7 @@ EventScript_GotoTrainerScript:: @ 82742F6 end .include "data/scripts/berry_tree.inc" - -Text_274746: @ 8274746 - .string "If some vines drop down, this tree can\n" - .string "be climbed.$" - -Text_274779: @ 8274779 - .string "If some vines drop down, this tree can\n" - .string "be climbed.\p" - .string "Use the SECRET POWER?$" - -Text_2747C2: @ 82747C2 - .string "A thick vine dropped down!$" - -Text_2747DD: @ 82747DD - .string "If this clump of grass can be moved,\n" - .string "it might be possible to go inside.$" - -Text_274825: @ 8274825 - .string "If this clump of grass can be moved,\n" - .string "it might be possible to go inside.\p" - .string "Use the SECRET POWER?$" - -Text_274883: @ 8274883 - .string "Discovered a small entrance!$" - -SecretBase_RedCave1_Text_2748A0: @ 82748A0 - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Since you're already here, how would\n" - .string "you like to battle?$" - -SecretBase_RedCave1_Text_274939: @ 8274939 - .string "Okay!\n" - .string "Here we come!$" - -SecretBase_RedCave1_Text_27494D: @ 827494D - .string "Hunh?\n" - .string "Oh, you can't now…$" - -SecretBase_RedCave1_Text_274966:: @ 8274966 - .string "Waaargh! You're too strong!\n" - .string "About me losing… Please keep it secret!$" - -SecretBase_RedCave1_Text_2749AA: @ 82749AA - .string "What do you think of my SECRET BASE?\n" - .string "Come visit me again tomorrow.$" - -SecretBase_RedCave1_Text_2749ED: @ 82749ED - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Feel free to hang out!$" - -SecretBase_RedCave1_Text_274A64: @ 8274A64 - .string "There're a lot of places where\n" - .string "you can make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don't you think it's nice?\p" - .string "Oh, would you like to have a battle?$" - -SecretBase_RedCave1_Text_274AFA: @ 8274AFA - .string "Okay, here goes!$" - -SecretBase_RedCave1_Text_274B0B: @ 8274B0B - .string "Oh…\n" - .string "You can't now, okay.$" - -SecretBase_RedCave1_Text_274B24:: @ 8274B24 - .string "Hmmm… It's our loss…\n" - .string "But don't tell anyone!\l" - .string "It's a confidential secret!$" - -SecretBase_RedCave1_Text_274B6C: @ 8274B6C - .string "If you're in this area again,\n" - .string "I hope you'll visit me.$" - -SecretBase_RedCave1_Text_274BA2: @ 8274BA2 - .string "There're a lot of places where you can\n" - .string "make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don't you think it's nice?$" - -SecretBase_RedCave1_Text_274C13: @ 8274C13 - .string "This is a popular spot.\n" - .string "It's always taken.\p" - .string "Oh! Were you thinking about\n" - .string "taking this spot, too?\p" - .string "I'll tell you what, you can have this\n" - .string "spot if you can beat me.$" - -SecretBase_RedCave1_Text_274CB0: @ 8274CB0 - .string "Okay!\n" - .string "I'm going to defend my SECRET BASE!$" - -SecretBase_RedCave1_Text_274CDA: @ 8274CDA - .string "Hunh? Is that right?\n" - .string "You're not interested in this spot?$" - -SecretBase_RedCave1_Text_274D13:: @ 8274D13 - .string "I can't keep going!\n" - .string "I surrender!$" - -SecretBase_RedCave1_Text_274D34: @ 8274D34 - .string "Okay, when I move one day,\n" - .string "this place will be yours!$" - -SecretBase_RedCave1_Text_274D69: @ 8274D69 - .string "This is a popular spot.\n" - .string "It's always taken.\p" - .string "I waited a long time for it to open.\n" - .string "I finally got to use it!$" - -SecretBase_RedCave1_Text_274DD2: @ 8274DD2 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.\p" - .string "Would you like to see how strong I am?$" - -SecretBase_RedCave1_Text_274E41: @ 8274E41 - .string "I'm going to go all out!$" - -SecretBase_RedCave1_Text_274E5A: @ 8274E5A - .string "Oh.\n" - .string "Some other time, then!$" - -SecretBase_RedCave1_Text_274E75:: @ 8274E75 - .string "Hmm… I've still got lots to learn.\n" - .string "I have to study some more.$" - -SecretBase_RedCave1_Text_274EB3: @ 8274EB3 - .string "Thanks for battling with me.\n" - .string "Please come back again tomorrow.$" - -SecretBase_RedCave1_Text_274EF1: @ 8274EF1 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.$" - -SecretBase_RedCave1_Text_274F39: @ 8274F39 - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.\p" - .string "So, how would you like a battle?$" - -SecretBase_RedCave1_Text_274FCA: @ 8274FCA - .string "That's the way!$" - -SecretBase_RedCave1_Text_274FDA: @ 8274FDA - .string "When you're ready, give me a shout!$" - -SecretBase_RedCave1_Text_274FFE:: @ 8274FFE - .string "Aww! Done in!\n" - .string "But it's still fun to battle!$" - -SecretBase_RedCave1_Text_27502A: @ 827502A - .string "Well, anyway, I should go buy some\n" - .string "decorations and furniture.\p" - .string "I want my SECRET BASE to be a place\n" - .string "other people can enjoy.$" - -SecretBase_RedCave1_Text_2750A4: @ 82750A4 - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.$" - -SecretBase_RedCave1_Text_275114: @ 8275114 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.\p" - .string "If you would be so kind, will you battle\n" - .string "with my POKéMON?$" - -SecretBase_RedCave1_Text_2751AF: @ 82751AF - .string "Thank you.\n" - .string "Shall we begin?$" - -SecretBase_RedCave1_Text_2751CA: @ 82751CA - .string "Oh.\n" - .string "How disappointing…$" - -SecretBase_RedCave1_Text_2751E1:: @ 82751E1 - .string "I concede…$" - -SecretBase_RedCave1_Text_2751EC: @ 82751EC - .string "That was all in good fun!\n" - .string "I should go enjoy shopping now.$" - -SecretBase_RedCave1_Text_275226: @ 8275226 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.$" - -SecretBase_RedCave1_Text_275287: @ 8275287 - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?\p" - .string "But since you found me, how about we\n" - .string "have a battle?$" - -SecretBase_RedCave1_Text_275315: @ 8275315 - .string "I'm not going down easily!$" - -SecretBase_RedCave1_Text_275330: @ 8275330 - .string "Oh… Are you maybe tired from searching\n" - .string "for this place?$" - -SecretBase_RedCave1_Text_275367:: @ 8275367 - .string "I went down…$" - -SecretBase_RedCave1_Text_275374: @ 8275374 - .string "Where's your SECRET BASE?\n" - .string "I should go visit you there.$" - -SecretBase_RedCave1_Text_2753AB: @ 82753AB - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?$" - -SecretBase_RedCave1_Text_275405: @ 8275405 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!\p" - .string "In the meantime, want to battle?$" - -SecretBase_RedCave1_Text_2754B2: @ 82754B2 - .string "This is my SECRET BASE.\n" - .string "I can't lose!$" - -SecretBase_RedCave1_Text_2754D8: @ 82754D8 - .string "I'll battle with you anytime.$" - -SecretBase_RedCave1_Text_2754F6:: @ 82754F6 - .string "Huh?\n" - .string "Did I just lose?$" - -SecretBase_RedCave1_Text_27550C: @ 827550C - .string "I won't lose at collecting decorations.\n" - .string "Come visit again!$" - -SecretBase_RedCave1_Text_275546: @ 8275546 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!$" - -SecretBase_RedCave1_Text_2755D2: @ 82755D2 - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "That's what I do.\n" - .string "Want to battle with me?$" - -SecretBase_RedCave1_Text_275679: @ 8275679 - .string "Show me what you're made of!$" - -SecretBase_RedCave1_Text_275696: @ 8275696 - .string "I guess there are times when you're not\n" - .string "into it.$" - -SecretBase_RedCave1_Text_2756C7:: @ 82756C7 - .string "I know exactly what you're made of now.$" - -SecretBase_RedCave1_Text_2756EF: @ 82756EF - .string "We can both become stronger.\n" - .string "Let's keep at it!$" - -SecretBase_RedCave1_Text_27571E: @ 827571E - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "Every day is a great day.$" - -SecretBase_RedCave1_Text_2757B5: @ 82757B5 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?\p" - .string "Want to see my taste in battling?$" - -SecretBase_RedCave1_Text_275884: @ 8275884 - .string "There's no holding back!$" - -SecretBase_RedCave1_Text_27589D: @ 827589D - .string "I'll be happy to demonstrate my style\n" - .string "anytime.$" - -SecretBase_RedCave1_Text_2758CC:: @ 82758CC - .string "You're supremely talented!\n" - .string "Your power seems to be limitless…$" - -SecretBase_RedCave1_Text_275909: @ 8275909 - .string "What did you think of my style?\n" - .string "I'll keep on polishing it!$" - -SecretBase_RedCave1_Text_275944: @ 8275944 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?$" - -EventScript_2759F1:: @ 82759F1 - special sub_80E8C98 - special sub_80E8BC8 - compare VAR_RESULT, 1 - goto_eq EventScript_275BE8 - checkpartymove MOVE_SECRET_POWER - setfieldeffectargument 0, VAR_RESULT - buffermovename 1, MOVE_SECRET_POWER - compare VAR_0x8007, 1 - goto_eq EventScript_275A50 - compare VAR_0x8007, 2 - goto_eq EventScript_275A50 - compare VAR_0x8007, 3 - goto_eq EventScript_275A50 - compare VAR_0x8007, 4 - goto_eq EventScript_275A50 - compare VAR_0x8007, 5 - goto_eq EventScript_275AA9 - compare VAR_0x8007, 6 - goto_eq EventScript_275B02 - end - -EventScript_275A50:: @ 8275A50 - lockall - compare VAR_RESULT, 6 - goto_eq EventScript_275A91 - bufferpartymonnick 0, VAR_RESULT - msgbox gText_23B704, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE - waitstate - goto EventScript_275A9B - end - -EventScript_275A86:: @ 8275A86 - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE - waitstate - goto EventScript_275A9B - end - -EventScript_275A91:: @ 8275A91 - msgbox gText_23B6E0, MSGBOX_DEFAULT - releaseall - end - -EventScript_275A9B:: @ 8275A9B - msgbox gText_23B73E, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275AA9:: @ 8275AA9 - lockall - compare VAR_RESULT, 6 - goto_eq EventScript_275AEA - bufferpartymonnick 0, VAR_RESULT - msgbox Text_274779, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_TREE - waitstate - goto EventScript_275AF4 - end - -EventScript_275ADF:: @ 8275ADF - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_TREE - waitstate - goto EventScript_275AF4 - end - -EventScript_275AEA:: @ 8275AEA - msgbox Text_274746, MSGBOX_DEFAULT - releaseall - end - -EventScript_275AF4:: @ 8275AF4 - msgbox Text_2747C2, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275B02:: @ 8275B02 - lockall - compare VAR_RESULT, 6 - goto_eq EventScript_275B43 - bufferpartymonnick 0, VAR_RESULT - msgbox Text_274825, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT - closemessage - dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB - waitstate - goto EventScript_275B4D - end - -EventScript_275B38:: @ 8275B38 - lockall - dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB - waitstate - goto EventScript_275B4D - end - -EventScript_275B43:: @ 8275B43 - msgbox Text_2747DD, MSGBOX_DEFAULT - releaseall - end - -EventScript_275B4D:: @ 8275B4D - msgbox Text_274883, MSGBOX_DEFAULT - goto EventScript_275B5B - end - -EventScript_275B5B:: @ 8275B5B - closemessage - playse SE_KAIDAN - setvar VAR_0x4097, 0 - setflag FLAG_DECORATION_0 - special sub_80E8E18 - special sub_80E9068 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special sub_80E933C - setvar VAR_0x4089, 1 - waitstate - end - -SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 - applymovement 255, SecretBase_RedCave1_Movement_275BB4 - waitmovement 0 - setvar VAR_0x4097, 1 - msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275BAB - closemessage - playse SE_KAIDAN - special sub_80E9A90 - end - -SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB - closemessage - setflag FLAG_0x060 - special sub_80E91F8 - waitstate - end - -SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 - walk_up - walk_up - step_end - -EventScript_275BB7:: @ 8275BB7 - lockall - setvar VAR_0x4097, 1 - playse SE_KAIDAN - special sub_80E9744 - compare VAR_RESULT, 0 - goto_eq EventScript_275BDB - clearflag FLAG_DECORATION_0 - special sub_80E9068 - setvar VAR_0x4089, 0 - waitstate - end - -EventScript_275BDB:: @ 8275BDB - setflag FLAG_DECORATION_0 - special sub_80E9068 - setvar VAR_0x4089, 0 - waitstate - end - -EventScript_275BE8:: @ 8275BE8 - checkpartymove MOVE_SECRET_POWER - compare VAR_RESULT, 6 - goto_eq EventScript_275C9A - setfieldeffectargument 0, VAR_RESULT - setorcopyvar VAR_0x8004, VAR_RESULT - lockall - special GetSecretBaseNearbyMapName - msgbox Text_276A3D, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq EventScript_275CDE - msgbox Text_2766AA, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq EventScript_275CDE - fadescreenswapbuffers 1 - special sub_80E9B70 - closemessage - fadescreenswapbuffers 0 - msgbox Text_276A95, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq EventScript_275CDE - bufferpartymonnick 0, VAR_0x8004 - buffermovename 1, MOVE_SECRET_POWER - msgbox Route103_Text_290771, MSGBOX_DEFAULT - closemessage - closemessage - compare VAR_0x8007, 1 - goto_eq EventScript_275A86 - compare VAR_0x8007, 2 - goto_eq EventScript_275A86 - compare VAR_0x8007, 3 - goto_eq EventScript_275A86 - compare VAR_0x8007, 4 - goto_eq EventScript_275A86 - compare VAR_0x8007, 5 - goto_eq EventScript_275ADF - compare VAR_0x8007, 6 - goto_eq EventScript_275B38 - releaseall - end - -EventScript_275C9A:: @ 8275C9A - lockall - compare VAR_0x8007, 1 - goto_eq EventScript_275A91 - compare VAR_0x8007, 2 - goto_eq EventScript_275A91 - compare VAR_0x8007, 3 - goto_eq EventScript_275A91 - compare VAR_0x8007, 4 - goto_eq EventScript_275A91 - compare VAR_0x8007, 5 - goto_eq EventScript_275AEA - compare VAR_0x8007, 6 - goto_eq EventScript_275B43 - end - -EventScript_275CDE:: @ 8275CDE - closemessage - releaseall - end - -LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 -LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 -SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 - setflag FLAG_DECORATION_1 - setflag FLAG_DECORATION_2 - setflag FLAG_DECORATION_3 - setflag FLAG_DECORATION_4 - setflag FLAG_DECORATION_5 - setflag FLAG_DECORATION_6 - setflag FLAG_DECORATION_7 - setflag FLAG_DECORATION_8 - setflag FLAG_DECORATION_9 - setflag FLAG_DECORATION_10 - setflag FLAG_DECORATION_11 - setflag FLAG_DECORATION_12 - setflag FLAG_DECORATION_13 - setflag FLAG_DECORATION_14 - return - -EventScript_275D0C:: @ 8275D0C - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special sub_80E933C - setvar VAR_0x4089, 1 - end - -EventScript_275D1F:: @ 8275D1F - setvar VAR_0x8005, 0 - goto EventScript_275D2A - end - -EventScript_275D2A:: @ 8275D2A - special sub_8127E18 - end - -EventScript_275D2E:: @ 8275D2E - setvar VAR_0x8004, 0 - goto EventScript_275D39 - end - -EventScript_275D39:: @ 8275D39 - special sub_8129708 - compare VAR_RESULT, 1 - goto_eq EventScript_275D63 - addvar VAR_0x8004, 1 - compare VAR_0x8005, 0 - goto_eq EventScript_275D39 - removeobject VAR_0x8006 - setflag 0x8005 - goto EventScript_275D39 - end - -EventScript_275D63:: @ 8275D63 - end - -SecretBase_BlueCave1_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave2_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave3_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave4_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave1_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave2_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave3_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave4_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave1_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave2_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave3_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave4_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub1_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub2_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub3_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub4_EventScript_275D64:: @ 8275D64 -SecretBase_Tree1_EventScript_275D64:: @ 8275D64 -SecretBase_Tree2_EventScript_275D64:: @ 8275D64 -SecretBase_Tree3_EventScript_275D64:: @ 8275D64 -SecretBase_Tree4_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 - special sub_80EA354 - compare VAR_0x8004, 0 - goto_eq SecretBase_RedCave1_EventScript_275DD6 - compare VAR_0x8004, 1 - goto_eq SecretBase_RedCave1_EventScript_275E4E - compare VAR_0x8004, 2 - goto_eq SecretBase_RedCave1_EventScript_275EC6 - compare VAR_0x8004, 3 - goto_eq SecretBase_RedCave1_EventScript_275F3E - compare VAR_0x8004, 4 - goto_eq SecretBase_RedCave1_EventScript_275FB6 - compare VAR_0x8004, 5 - goto_eq SecretBase_RedCave1_EventScript_27602E - compare VAR_0x8004, 6 - goto_eq SecretBase_RedCave1_EventScript_2760A6 - compare VAR_0x8004, 7 - goto_eq SecretBase_RedCave1_EventScript_27611E - compare VAR_0x8004, 8 - goto_eq SecretBase_RedCave1_EventScript_276196 - compare VAR_0x8004, 9 - goto_eq SecretBase_RedCave1_EventScript_27620E - end - -SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275E25 - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275E44 - msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275E2F - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275E2F - msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275E25:: @ 8275E25 - msgbox SecretBase_RedCave1_Text_2749ED, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E2F:: @ 8275E2F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27494D, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 - msgbox SecretBase_RedCave1_Text_2749AA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275E9D - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275EBC - msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275EA7 - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275EA7 - msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275E9D:: @ 8275E9D - msgbox SecretBase_RedCave1_Text_274D69, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EA7:: @ 8275EA7 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274CDA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC - msgbox SecretBase_RedCave1_Text_274D34, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275F15 - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275F34 - msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F1F - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F1F - msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275F15:: @ 8275F15 - msgbox SecretBase_RedCave1_Text_2750A4, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F1F:: @ 8275F1F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274FDA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 - msgbox SecretBase_RedCave1_Text_27502A, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275F8D - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275FAC - msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F97 - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F97 - msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_275F8D:: @ 8275F8D - msgbox SecretBase_RedCave1_Text_2753AB, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275F97:: @ 8275F97 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275330, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC - msgbox SecretBase_RedCave1_Text_275374, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_276005 - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276024 - msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_27600F - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_27600F - msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_276005:: @ 8276005 - msgbox SecretBase_RedCave1_Text_27571E, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27600F:: @ 827600F - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275696, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276024:: @ 8276024 - msgbox SecretBase_RedCave1_Text_2756EF, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27602E:: @ 827602E - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27607D - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27609C - msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276087 - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276087 - msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27607D:: @ 827607D - msgbox SecretBase_RedCave1_Text_274BA2, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276087:: @ 8276087 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274B0B, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27609C:: @ 827609C - msgbox SecretBase_RedCave1_Text_274B6C, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_2760F5 - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276114 - msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2760FF - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2760FF - msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_2760F5:: @ 82760F5 - msgbox SecretBase_RedCave1_Text_274EF1, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2760FF:: @ 82760FF - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274E5A, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276114:: @ 8276114 - msgbox SecretBase_RedCave1_Text_274EB3, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27611E:: @ 827611E - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27616D - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27618C - msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276177 - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276177 - msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27616D:: @ 827616D - msgbox SecretBase_RedCave1_Text_275226, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276177:: @ 8276177 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2751CA, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27618C:: @ 827618C - msgbox SecretBase_RedCave1_Text_2751EC, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276196:: @ 8276196 - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_2761E5 - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276204 - msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2761EF - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2761EF - msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_2761E5:: @ 82761E5 - msgbox SecretBase_RedCave1_Text_275546, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_2761EF:: @ 82761EF - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2754D8, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276204:: @ 8276204 - msgbox SecretBase_RedCave1_Text_27550C, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27620E:: @ 827620E - lock - faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27625D - compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27627C - msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276267 - setvar VAR_RESULT, 1 - special sub_80EA30C - call SecretBase_RedCave1_EventScript_27134F - compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276267 - msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 - end - -SecretBase_RedCave1_EventScript_27625D:: @ 827625D - msgbox SecretBase_RedCave1_Text_275944, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276267:: @ 8276267 - special sub_80EB300 - setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27589D, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_27627C:: @ 827627C - msgbox SecretBase_RedCave1_Text_275909, MSGBOX_DEFAULT - release - end - -SecretBase_RedCave1_EventScript_276286:: @ 8276286 - special sub_80EA2E4 - setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE - setvar VAR_0x8005, 0 - special DoSpecialTrainerBattle - waitstate - compare VAR_RESULT, 3 - call_if 1, SecretBase_RedCave1_EventScript_2762BD - compare VAR_RESULT, 1 - call_if 1, SecretBase_RedCave1_EventScript_2762C1 - compare VAR_RESULT, 2 - call_if 1, SecretBase_RedCave1_EventScript_2762C5 - special HealPlayerParty - release - end - -SecretBase_RedCave1_EventScript_2762BD:: @ 82762BD - special sub_80EB438 - return - -SecretBase_RedCave1_EventScript_2762C1:: @ 82762C1 - special sub_80EB368 - return - -SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5 - special sub_80EB3D0 - return - - .include "data/scripts/secret_power_tm.inc" - -Text_2766AA: @ 82766AA - .string "All decorations and furniture in your\n" - .string "SECRET BASE will be returned to your PC.\p" - .string "Is that okay?$" - -Text_276707: @ 8276707 - .string "Do you want to register\n" - .string "{STR_VAR_1}'s SECRET BASE?$" - -Text_276731: @ 8276731 - .string "This data is already registered.\n" - .string "Would you like to delete it?$" - -Text_27676F: @ 827676F - .string "Up to 10 locations can be registered.\p" - .string "Delete a location if you want to\n" - .string "register another location.$" - -Text_2767D1: @ 82767D1 - .string "Registration completed.$" - -Text_2767E9: @ 82767E9 - .string "Data has been unregistered.$" - -Text_276805: @ 8276805 - .string "{PLAYER} booted up the PC.$" - -Text_27681A: @ 827681A - .string "What would you like to do?$" - -Text_276835: @ 8276835 - .string "Once registered, a SECRET BASE will not\n" - .string "disappear unless the other TRAINER\l" - .string "moves it to a different location.\p" - .string "If a SECRET BASE is deleted from the\n" - .string "registered list, another one may take\l" - .string "its place.\p" - .string "Up to ten SECRET BASE locations\n" - .string "may be registered.$" - -Text_27692B: @ 827692B - .string "A shield of {STR_VAR_2} that marks winning\n" - .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" - -Text_276974: @ 8276974 - .string "A realistic toy TV. It could be easily\n" - .string "mistaken for the real thing.$" - -Text_2769B8: @ 82769B8 - .string "A toy TV shaped like a SEEDOT.\n" - .string "It looks ready to roll away on its own…$" - -Text_2769FF: @ 82769FF - .string "A toy TV shaped like a SKITTY.\n" - .string "It looks ready to stroll away…$" - -Text_276A3D: @ 8276A3D - .string "You may only make one SECRET BASE.\p" - .string "Would you like to move from the SECRET\n" - .string "BASE near {STR_VAR_1}?$" - -Text_276A95: @ 8276A95 - .string "Moving completed.\p" - .string "Would you like to use the SECRET POWER?$" - + .include "data/scripts/secret_base.inc" .include "data/scripts/cable_club.inc" .include "data/scripts/contest_hall.inc" .include "data/text/contest_strings.inc" @@ -5493,7 +4245,7 @@ gUnknown_0827EE07:: @ 27EE07 gUnknown_0827EE09:: @ 27EE09 .string "8$" - + .include "data/scripts/tv.inc" .include "data/text/tv.inc" diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index cff9197f8..d6d53bc2f 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -153,7 +153,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F - trainerbattle TRAINER_BATTLE_9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D + trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D setvar VAR_0x8004, 10 special CallBattlePyramidFunction waitmessage diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc new file mode 100644 index 000000000..35a2731a7 --- /dev/null +++ b/data/scripts/secret_base.inc @@ -0,0 +1,1115 @@ +Text_274746: @ 8274746 + .string "If some vines drop down, this tree can\n" + .string "be climbed.$" + +Text_274779: @ 8274779 + .string "If some vines drop down, this tree can\n" + .string "be climbed.\p" + .string "Use the SECRET POWER?$" + +Text_2747C2: @ 82747C2 + .string "A thick vine dropped down!$" + +Text_2747DD: @ 82747DD + .string "If this clump of grass can be moved,\n" + .string "it might be possible to go inside.$" + +Text_274825: @ 8274825 + .string "If this clump of grass can be moved,\n" + .string "it might be possible to go inside.\p" + .string "Use the SECRET POWER?$" + +Text_274883: @ 8274883 + .string "Discovered a small entrance!$" + +SecretBase_RedCave1_Text_2748A0: @ 82748A0 + .string "Have you made a SECRET BASE already?\p" + .string "I went here, there, everywhere before\n" + .string "choosing this place.\p" + .string "Since you're already here, how would\n" + .string "you like to battle?$" + +SecretBase_RedCave1_Text_274939: @ 8274939 + .string "Okay!\n" + .string "Here we come!$" + +SecretBase_RedCave1_Text_27494D: @ 827494D + .string "Hunh?\n" + .string "Oh, you can't now…$" + +SecretBase_RedCave1_Text_274966:: @ 8274966 + .string "Waaargh! You're too strong!\n" + .string "About me losing… Please keep it secret!$" + +SecretBase_RedCave1_Text_2749AA: @ 82749AA + .string "What do you think of my SECRET BASE?\n" + .string "Come visit me again tomorrow.$" + +SecretBase_RedCave1_Text_2749ED: @ 82749ED + .string "Have you made a SECRET BASE already?\p" + .string "I went here, there, everywhere before\n" + .string "choosing this place.\p" + .string "Feel free to hang out!$" + +SecretBase_RedCave1_Text_274A64: @ 8274A64 + .string "There're a lot of places where\n" + .string "you can make a SECRET BASE.\p" + .string "But I like this spot best.\n" + .string "Don't you think it's nice?\p" + .string "Oh, would you like to have a battle?$" + +SecretBase_RedCave1_Text_274AFA: @ 8274AFA + .string "Okay, here goes!$" + +SecretBase_RedCave1_Text_274B0B: @ 8274B0B + .string "Oh…\n" + .string "You can't now, okay.$" + +SecretBase_RedCave1_Text_274B24:: @ 8274B24 + .string "Hmmm… It's our loss…\n" + .string "But don't tell anyone!\l" + .string "It's a confidential secret!$" + +SecretBase_RedCave1_Text_274B6C: @ 8274B6C + .string "If you're in this area again,\n" + .string "I hope you'll visit me.$" + +SecretBase_RedCave1_Text_274BA2: @ 8274BA2 + .string "There're a lot of places where you can\n" + .string "make a SECRET BASE.\p" + .string "But I like this spot best.\n" + .string "Don't you think it's nice?$" + +SecretBase_RedCave1_Text_274C13: @ 8274C13 + .string "This is a popular spot.\n" + .string "It's always taken.\p" + .string "Oh! Were you thinking about\n" + .string "taking this spot, too?\p" + .string "I'll tell you what, you can have this\n" + .string "spot if you can beat me.$" + +SecretBase_RedCave1_Text_274CB0: @ 8274CB0 + .string "Okay!\n" + .string "I'm going to defend my SECRET BASE!$" + +SecretBase_RedCave1_Text_274CDA: @ 8274CDA + .string "Hunh? Is that right?\n" + .string "You're not interested in this spot?$" + +SecretBase_RedCave1_Text_274D13:: @ 8274D13 + .string "I can't keep going!\n" + .string "I surrender!$" + +SecretBase_RedCave1_Text_274D34: @ 8274D34 + .string "Okay, when I move one day,\n" + .string "this place will be yours!$" + +SecretBase_RedCave1_Text_274D69: @ 8274D69 + .string "This is a popular spot.\n" + .string "It's always taken.\p" + .string "I waited a long time for it to open.\n" + .string "I finally got to use it!$" + +SecretBase_RedCave1_Text_274DD2: @ 8274DD2 + .string "Welcome to my POKéMON LAB.\p" + .string "I carry out research on battling in\n" + .string "secrecy.\p" + .string "Would you like to see how strong I am?$" + +SecretBase_RedCave1_Text_274E41: @ 8274E41 + .string "I'm going to go all out!$" + +SecretBase_RedCave1_Text_274E5A: @ 8274E5A + .string "Oh.\n" + .string "Some other time, then!$" + +SecretBase_RedCave1_Text_274E75:: @ 8274E75 + .string "Hmm… I've still got lots to learn.\n" + .string "I have to study some more.$" + +SecretBase_RedCave1_Text_274EB3: @ 8274EB3 + .string "Thanks for battling with me.\n" + .string "Please come back again tomorrow.$" + +SecretBase_RedCave1_Text_274EF1: @ 8274EF1 + .string "Welcome to my POKéMON LAB.\p" + .string "I carry out research on battling in\n" + .string "secrecy.$" + +SecretBase_RedCave1_Text_274F39: @ 8274F39 + .string "A big mansion is nice, but I like this\n" + .string "sort of place more.\p" + .string "I like it because all kinds of people\n" + .string "come visit me.\p" + .string "So, how would you like a battle?$" + +SecretBase_RedCave1_Text_274FCA: @ 8274FCA + .string "That's the way!$" + +SecretBase_RedCave1_Text_274FDA: @ 8274FDA + .string "When you're ready, give me a shout!$" + +SecretBase_RedCave1_Text_274FFE:: @ 8274FFE + .string "Aww! Done in!\n" + .string "But it's still fun to battle!$" + +SecretBase_RedCave1_Text_27502A: @ 827502A + .string "Well, anyway, I should go buy some\n" + .string "decorations and furniture.\p" + .string "I want my SECRET BASE to be a place\n" + .string "other people can enjoy.$" + +SecretBase_RedCave1_Text_2750A4: @ 82750A4 + .string "A big mansion is nice, but I like this\n" + .string "sort of place more.\p" + .string "I like it because all kinds of people\n" + .string "come visit me.$" + +SecretBase_RedCave1_Text_275114: @ 8275114 + .string "I simply adore shopping for decorations\n" + .string "and furniture.\p" + .string "I also love raising POKéMON just\n" + .string "as much.\p" + .string "If you would be so kind, will you battle\n" + .string "with my POKéMON?$" + +SecretBase_RedCave1_Text_2751AF: @ 82751AF + .string "Thank you.\n" + .string "Shall we begin?$" + +SecretBase_RedCave1_Text_2751CA: @ 82751CA + .string "Oh.\n" + .string "How disappointing…$" + +SecretBase_RedCave1_Text_2751E1:: @ 82751E1 + .string "I concede…$" + +SecretBase_RedCave1_Text_2751EC: @ 82751EC + .string "That was all in good fun!\n" + .string "I should go enjoy shopping now.$" + +SecretBase_RedCave1_Text_275226: @ 8275226 + .string "I simply adore shopping for decorations\n" + .string "and furniture.\p" + .string "I also love raising POKéMON just\n" + .string "as much.$" + +SecretBase_RedCave1_Text_275287: @ 8275287 + .string "Some people make their SECRET BASES in\n" + .string "hard-to-find places.\l" + .string "Do they want to just lie low?\p" + .string "But since you found me, how about we\n" + .string "have a battle?$" + +SecretBase_RedCave1_Text_275315: @ 8275315 + .string "I'm not going down easily!$" + +SecretBase_RedCave1_Text_275330: @ 8275330 + .string "Oh… Are you maybe tired from searching\n" + .string "for this place?$" + +SecretBase_RedCave1_Text_275367:: @ 8275367 + .string "I went down…$" + +SecretBase_RedCave1_Text_275374: @ 8275374 + .string "Where's your SECRET BASE?\n" + .string "I should go visit you there.$" + +SecretBase_RedCave1_Text_2753AB: @ 82753AB + .string "Some people make their SECRET BASES in\n" + .string "hard-to-find places.\l" + .string "Do they want to just lie low?$" + +SecretBase_RedCave1_Text_275405: @ 8275405 + .string "People have told me that you can get\n" + .string "decorations in several ways.\p" + .string "We should have a race to see who can\n" + .string "get nicer decorations and furniture!\p" + .string "In the meantime, want to battle?$" + +SecretBase_RedCave1_Text_2754B2: @ 82754B2 + .string "This is my SECRET BASE.\n" + .string "I can't lose!$" + +SecretBase_RedCave1_Text_2754D8: @ 82754D8 + .string "I'll battle with you anytime.$" + +SecretBase_RedCave1_Text_2754F6:: @ 82754F6 + .string "Huh?\n" + .string "Did I just lose?$" + +SecretBase_RedCave1_Text_27550C: @ 827550C + .string "I won't lose at collecting decorations.\n" + .string "Come visit again!$" + +SecretBase_RedCave1_Text_275546: @ 8275546 + .string "People have told me that you can get\n" + .string "decorations in several ways.\p" + .string "We should have a race to see who can\n" + .string "get nicer decorations and furniture!$" + +SecretBase_RedCave1_Text_2755D2: @ 82755D2 + .string "I found a spot I liked, and I did it up\n" + .string "with my favorite decorations.\p" + .string "I raise my favorite POKéMON and grow\n" + .string "stronger with it.\p" + .string "That's what I do.\n" + .string "Want to battle with me?$" + +SecretBase_RedCave1_Text_275679: @ 8275679 + .string "Show me what you're made of!$" + +SecretBase_RedCave1_Text_275696: @ 8275696 + .string "I guess there are times when you're not\n" + .string "into it.$" + +SecretBase_RedCave1_Text_2756C7:: @ 82756C7 + .string "I know exactly what you're made of now.$" + +SecretBase_RedCave1_Text_2756EF: @ 82756EF + .string "We can both become stronger.\n" + .string "Let's keep at it!$" + +SecretBase_RedCave1_Text_27571E: @ 827571E + .string "I found a spot I liked, and I did it up\n" + .string "with my favorite decorations.\p" + .string "I raise my favorite POKéMON and grow\n" + .string "stronger with it.\p" + .string "Every day is a great day.$" + +SecretBase_RedCave1_Text_2757B5: @ 82757B5 + .string "You can learn a lot about the taste\n" + .string "and sense of people by the kinds of\l" + .string "decorations they have, and how they\l" + .string "display them.\p" + .string "What do you think of my taste?\n" + .string "Are you speechless?\p" + .string "Want to see my taste in battling?$" + +SecretBase_RedCave1_Text_275884: @ 8275884 + .string "There's no holding back!$" + +SecretBase_RedCave1_Text_27589D: @ 827589D + .string "I'll be happy to demonstrate my style\n" + .string "anytime.$" + +SecretBase_RedCave1_Text_2758CC:: @ 82758CC + .string "You're supremely talented!\n" + .string "Your power seems to be limitless…$" + +SecretBase_RedCave1_Text_275909: @ 8275909 + .string "What did you think of my style?\n" + .string "I'll keep on polishing it!$" + +SecretBase_RedCave1_Text_275944: @ 8275944 + .string "You can learn a lot about the taste\n" + .string "and sense of people by the kinds of\l" + .string "decorations they have, and how they\l" + .string "display them.\p" + .string "What do you think of my taste?\n" + .string "Are you speechless?$" + +EventScript_2759F1:: @ 82759F1 + special sub_80E8C98 + special sub_80E8BC8 + compare VAR_RESULT, 1 + goto_eq EventScript_275BE8 + checkpartymove MOVE_SECRET_POWER + setfieldeffectargument 0, VAR_RESULT + buffermovename 1, MOVE_SECRET_POWER + compare VAR_0x8007, 1 + goto_eq EventScript_275A50 + compare VAR_0x8007, 2 + goto_eq EventScript_275A50 + compare VAR_0x8007, 3 + goto_eq EventScript_275A50 + compare VAR_0x8007, 4 + goto_eq EventScript_275A50 + compare VAR_0x8007, 5 + goto_eq EventScript_275AA9 + compare VAR_0x8007, 6 + goto_eq EventScript_275B02 + end + +EventScript_275A50:: @ 8275A50 + lockall + compare VAR_RESULT, 6 + goto_eq EventScript_275A91 + bufferpartymonnick 0, VAR_RESULT + msgbox gText_23B704, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq EventScript_275CDE + msgbox Route103_Text_290771, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE + waitstate + goto EventScript_275A9B + end + +EventScript_275A86:: @ 8275A86 + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE + waitstate + goto EventScript_275A9B + end + +EventScript_275A91:: @ 8275A91 + msgbox gText_23B6E0, MSGBOX_DEFAULT + releaseall + end + +EventScript_275A9B:: @ 8275A9B + msgbox gText_23B73E, MSGBOX_DEFAULT + goto EventScript_275B5B + end + +EventScript_275AA9:: @ 8275AA9 + lockall + compare VAR_RESULT, 6 + goto_eq EventScript_275AEA + bufferpartymonnick 0, VAR_RESULT + msgbox Text_274779, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq EventScript_275CDE + msgbox Route103_Text_290771, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_TREE + waitstate + goto EventScript_275AF4 + end + +EventScript_275ADF:: @ 8275ADF + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_TREE + waitstate + goto EventScript_275AF4 + end + +EventScript_275AEA:: @ 8275AEA + msgbox Text_274746, MSGBOX_DEFAULT + releaseall + end + +EventScript_275AF4:: @ 8275AF4 + msgbox Text_2747C2, MSGBOX_DEFAULT + goto EventScript_275B5B + end + +EventScript_275B02:: @ 8275B02 + lockall + compare VAR_RESULT, 6 + goto_eq EventScript_275B43 + bufferpartymonnick 0, VAR_RESULT + msgbox Text_274825, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq EventScript_275CDE + msgbox Route103_Text_290771, MSGBOX_DEFAULT + closemessage + dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB + waitstate + goto EventScript_275B4D + end + +EventScript_275B38:: @ 8275B38 + lockall + dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB + waitstate + goto EventScript_275B4D + end + +EventScript_275B43:: @ 8275B43 + msgbox Text_2747DD, MSGBOX_DEFAULT + releaseall + end + +EventScript_275B4D:: @ 8275B4D + msgbox Text_274883, MSGBOX_DEFAULT + goto EventScript_275B5B + end + +EventScript_275B5B:: @ 8275B5B + closemessage + playse SE_KAIDAN + setvar VAR_0x4097, 0 + setflag FLAG_DECORATION_0 + special sub_80E8E18 + special sub_80E9068 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special sub_80E933C + setvar VAR_0x4089, 1 + waitstate + end + +SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 + applymovement 255, SecretBase_RedCave1_Movement_275BB4 + waitmovement 0 + setvar VAR_0x4097, 1 + msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_275BAB + closemessage + playse SE_KAIDAN + special sub_80E9A90 + end + +SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB + closemessage + setflag FLAG_0x060 + special sub_80E91F8 + waitstate + end + +SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 + walk_up + walk_up + step_end + +EventScript_275BB7:: @ 8275BB7 + lockall + setvar VAR_0x4097, 1 + playse SE_KAIDAN + special sub_80E9744 + compare VAR_RESULT, 0 + goto_eq EventScript_275BDB + clearflag FLAG_DECORATION_0 + special sub_80E9068 + setvar VAR_0x4089, 0 + waitstate + end + +EventScript_275BDB:: @ 8275BDB + setflag FLAG_DECORATION_0 + special sub_80E9068 + setvar VAR_0x4089, 0 + waitstate + end + +EventScript_275BE8:: @ 8275BE8 + checkpartymove MOVE_SECRET_POWER + compare VAR_RESULT, 6 + goto_eq EventScript_275C9A + setfieldeffectargument 0, VAR_RESULT + setorcopyvar VAR_0x8004, VAR_RESULT + lockall + special GetSecretBaseNearbyMapName + msgbox Text_276A3D, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq EventScript_275CDE + msgbox Text_2766AA, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq EventScript_275CDE + fadescreenswapbuffers 1 + special sub_80E9B70 + closemessage + fadescreenswapbuffers 0 + msgbox Text_276A95, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq EventScript_275CDE + bufferpartymonnick 0, VAR_0x8004 + buffermovename 1, MOVE_SECRET_POWER + msgbox Route103_Text_290771, MSGBOX_DEFAULT + closemessage + closemessage + compare VAR_0x8007, 1 + goto_eq EventScript_275A86 + compare VAR_0x8007, 2 + goto_eq EventScript_275A86 + compare VAR_0x8007, 3 + goto_eq EventScript_275A86 + compare VAR_0x8007, 4 + goto_eq EventScript_275A86 + compare VAR_0x8007, 5 + goto_eq EventScript_275ADF + compare VAR_0x8007, 6 + goto_eq EventScript_275B38 + releaseall + end + +EventScript_275C9A:: @ 8275C9A + lockall + compare VAR_0x8007, 1 + goto_eq EventScript_275A91 + compare VAR_0x8007, 2 + goto_eq EventScript_275A91 + compare VAR_0x8007, 3 + goto_eq EventScript_275A91 + compare VAR_0x8007, 4 + goto_eq EventScript_275A91 + compare VAR_0x8007, 5 + goto_eq EventScript_275AEA + compare VAR_0x8007, 6 + goto_eq EventScript_275B43 + end + +EventScript_275CDE:: @ 8275CDE + closemessage + releaseall + end + +LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 +LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 +SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 + setflag FLAG_DECORATION_1 + setflag FLAG_DECORATION_2 + setflag FLAG_DECORATION_3 + setflag FLAG_DECORATION_4 + setflag FLAG_DECORATION_5 + setflag FLAG_DECORATION_6 + setflag FLAG_DECORATION_7 + setflag FLAG_DECORATION_8 + setflag FLAG_DECORATION_9 + setflag FLAG_DECORATION_10 + setflag FLAG_DECORATION_11 + setflag FLAG_DECORATION_12 + setflag FLAG_DECORATION_13 + setflag FLAG_DECORATION_14 + return + +EventScript_275D0C:: @ 8275D0C + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 + special sub_80E933C + setvar VAR_0x4089, 1 + end + +EventScript_275D1F:: @ 8275D1F + setvar VAR_0x8005, 0 + goto EventScript_275D2A + end + +EventScript_275D2A:: @ 8275D2A + special sub_8127E18 + end + +EventScript_275D2E:: @ 8275D2E + setvar VAR_0x8004, 0 + goto EventScript_275D39 + end + +EventScript_275D39:: @ 8275D39 + special sub_8129708 + compare VAR_RESULT, 1 + goto_eq EventScript_275D63 + addvar VAR_0x8004, 1 + compare VAR_0x8005, 0 + goto_eq EventScript_275D39 + removeobject VAR_0x8006 + setflag 0x8005 + goto EventScript_275D39 + end + +EventScript_275D63:: @ 8275D63 + end + +SecretBase_BlueCave1_EventScript_275D64:: @ 8275D64 +SecretBase_BlueCave2_EventScript_275D64:: @ 8275D64 +SecretBase_BlueCave3_EventScript_275D64:: @ 8275D64 +SecretBase_BlueCave4_EventScript_275D64:: @ 8275D64 +SecretBase_BrownCave1_EventScript_275D64:: @ 8275D64 +SecretBase_BrownCave2_EventScript_275D64:: @ 8275D64 +SecretBase_BrownCave3_EventScript_275D64:: @ 8275D64 +SecretBase_BrownCave4_EventScript_275D64:: @ 8275D64 +SecretBase_RedCave1_EventScript_275D64:: @ 8275D64 +SecretBase_RedCave2_EventScript_275D64:: @ 8275D64 +SecretBase_RedCave3_EventScript_275D64:: @ 8275D64 +SecretBase_RedCave4_EventScript_275D64:: @ 8275D64 +SecretBase_Shrub1_EventScript_275D64:: @ 8275D64 +SecretBase_Shrub2_EventScript_275D64:: @ 8275D64 +SecretBase_Shrub3_EventScript_275D64:: @ 8275D64 +SecretBase_Shrub4_EventScript_275D64:: @ 8275D64 +SecretBase_Tree1_EventScript_275D64:: @ 8275D64 +SecretBase_Tree2_EventScript_275D64:: @ 8275D64 +SecretBase_Tree3_EventScript_275D64:: @ 8275D64 +SecretBase_Tree4_EventScript_275D64:: @ 8275D64 +SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64 +SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 +SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 +SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 + special sub_80EA354 + compare VAR_0x8004, 0 + goto_eq SecretBase_RedCave1_EventScript_275DD6 + compare VAR_0x8004, 1 + goto_eq SecretBase_RedCave1_EventScript_275E4E + compare VAR_0x8004, 2 + goto_eq SecretBase_RedCave1_EventScript_275EC6 + compare VAR_0x8004, 3 + goto_eq SecretBase_RedCave1_EventScript_275F3E + compare VAR_0x8004, 4 + goto_eq SecretBase_RedCave1_EventScript_275FB6 + compare VAR_0x8004, 5 + goto_eq SecretBase_RedCave1_EventScript_27602E + compare VAR_0x8004, 6 + goto_eq SecretBase_RedCave1_EventScript_2760A6 + compare VAR_0x8004, 7 + goto_eq SecretBase_RedCave1_EventScript_27611E + compare VAR_0x8004, 8 + goto_eq SecretBase_RedCave1_EventScript_276196 + compare VAR_0x8004, 9 + goto_eq SecretBase_RedCave1_EventScript_27620E + end + +SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_275E25 + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_275E44 + msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_275E2F + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_275E2F + msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_275E25:: @ 8275E25 + msgbox SecretBase_RedCave1_Text_2749ED, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275E2F:: @ 8275E2F + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_27494D, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 + msgbox SecretBase_RedCave1_Text_2749AA, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_275E9D + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_275EBC + msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_275EA7 + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_275EA7 + msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_275E9D:: @ 8275E9D + msgbox SecretBase_RedCave1_Text_274D69, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275EA7:: @ 8275EA7 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_274CDA, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC + msgbox SecretBase_RedCave1_Text_274D34, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_275F15 + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_275F34 + msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_275F1F + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_275F1F + msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_275F15:: @ 8275F15 + msgbox SecretBase_RedCave1_Text_2750A4, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275F1F:: @ 8275F1F + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_274FDA, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 + msgbox SecretBase_RedCave1_Text_27502A, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_275F8D + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_275FAC + msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_275F97 + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_275F97 + msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_275F8D:: @ 8275F8D + msgbox SecretBase_RedCave1_Text_2753AB, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275F97:: @ 8275F97 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_275330, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC + msgbox SecretBase_RedCave1_Text_275374, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_276005 + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_276024 + msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_27600F + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_27600F + msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_276005:: @ 8276005 + msgbox SecretBase_RedCave1_Text_27571E, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27600F:: @ 827600F + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_275696, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276024:: @ 8276024 + msgbox SecretBase_RedCave1_Text_2756EF, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27602E:: @ 827602E + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_27607D + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_27609C + msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_276087 + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_276087 + msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_27607D:: @ 827607D + msgbox SecretBase_RedCave1_Text_274BA2, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276087:: @ 8276087 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_274B0B, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27609C:: @ 827609C + msgbox SecretBase_RedCave1_Text_274B6C, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_2760F5 + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_276114 + msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_2760FF + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_2760FF + msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_2760F5:: @ 82760F5 + msgbox SecretBase_RedCave1_Text_274EF1, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_2760FF:: @ 82760FF + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_274E5A, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276114:: @ 8276114 + msgbox SecretBase_RedCave1_Text_274EB3, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27611E:: @ 827611E + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_27616D + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_27618C + msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_276177 + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_276177 + msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_27616D:: @ 827616D + msgbox SecretBase_RedCave1_Text_275226, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276177:: @ 8276177 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_2751CA, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27618C:: @ 827618C + msgbox SecretBase_RedCave1_Text_2751EC, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276196:: @ 8276196 + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_2761E5 + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_276204 + msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_2761EF + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_2761EF + msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_2761E5:: @ 82761E5 + msgbox SecretBase_RedCave1_Text_275546, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_2761EF:: @ 82761EF + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_2754D8, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276204:: @ 8276204 + msgbox SecretBase_RedCave1_Text_27550C, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27620E:: @ 827620E + lock + faceplayer + checkflag FLAG_SYS_GAME_CLEAR + goto_if 0, SecretBase_RedCave1_EventScript_27625D + compare VAR_RESULT, 1 + goto_eq SecretBase_RedCave1_EventScript_27627C + msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_276267 + setvar VAR_RESULT, 1 + special sub_80EA30C + call SecretBase_RedCave1_EventScript_27134F + compare VAR_RESULT, 0 + goto_eq SecretBase_RedCave1_EventScript_276267 + msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT + goto SecretBase_RedCave1_EventScript_276286 + end + +SecretBase_RedCave1_EventScript_27625D:: @ 827625D + msgbox SecretBase_RedCave1_Text_275944, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276267:: @ 8276267 + special sub_80EB300 + setvar VAR_RESULT, 0 + special sub_80EA30C + msgbox SecretBase_RedCave1_Text_27589D, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_27627C:: @ 827627C + msgbox SecretBase_RedCave1_Text_275909, MSGBOX_DEFAULT + release + end + +SecretBase_RedCave1_EventScript_276286:: @ 8276286 + special sub_80EA2E4 + setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE + setvar VAR_0x8005, 0 + special DoSpecialTrainerBattle + waitstate + compare VAR_RESULT, 3 + call_if 1, SecretBase_RedCave1_EventScript_2762BD + compare VAR_RESULT, 1 + call_if 1, SecretBase_RedCave1_EventScript_2762C1 + compare VAR_RESULT, 2 + call_if 1, SecretBase_RedCave1_EventScript_2762C5 + special HealPlayerParty + release + end + +SecretBase_RedCave1_EventScript_2762BD:: @ 82762BD + special sub_80EB438 + return + +SecretBase_RedCave1_EventScript_2762C1:: @ 82762C1 + special sub_80EB368 + return + +SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5 + special sub_80EB3D0 + return + + .include "data/scripts/secret_power_tm.inc" + +Text_2766AA: @ 82766AA + .string "All decorations and furniture in your\n" + .string "SECRET BASE will be returned to your PC.\p" + .string "Is that okay?$" + +Text_276707: @ 8276707 + .string "Do you want to register\n" + .string "{STR_VAR_1}'s SECRET BASE?$" + +Text_276731: @ 8276731 + .string "This data is already registered.\n" + .string "Would you like to delete it?$" + +Text_27676F: @ 827676F + .string "Up to 10 locations can be registered.\p" + .string "Delete a location if you want to\n" + .string "register another location.$" + +Text_2767D1: @ 82767D1 + .string "Registration completed.$" + +Text_2767E9: @ 82767E9 + .string "Data has been unregistered.$" + +Text_276805: @ 8276805 + .string "{PLAYER} booted up the PC.$" + +Text_27681A: @ 827681A + .string "What would you like to do?$" + +Text_276835: @ 8276835 + .string "Once registered, a SECRET BASE will not\n" + .string "disappear unless the other TRAINER\l" + .string "moves it to a different location.\p" + .string "If a SECRET BASE is deleted from the\n" + .string "registered list, another one may take\l" + .string "its place.\p" + .string "Up to ten SECRET BASE locations\n" + .string "may be registered.$" + +Text_27692B: @ 827692B + .string "A shield of {STR_VAR_2} that marks winning\n" + .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" + +Text_276974: @ 8276974 + .string "A realistic toy TV. It could be easily\n" + .string "mistaken for the real thing.$" + +Text_2769B8: @ 82769B8 + .string "A toy TV shaped like a SEEDOT.\n" + .string "It looks ready to roll away on its own…$" + +Text_2769FF: @ 82769FF + .string "A toy TV shaped like a SKITTY.\n" + .string "It looks ready to stroll away…$" + +Text_276A3D: @ 8276A3D + .string "You may only make one SECRET BASE.\p" + .string "Would you like to move from the SECRET\n" + .string "BASE near {STR_VAR_1}?$" + +Text_276A95: @ 8276A95 + .string "Moving completed.\p" + .string "Would you like to use the SECRET POWER?$" diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc new file mode 100644 index 000000000..61a1afa25 --- /dev/null +++ b/data/scripts/trainer_battle.inc @@ -0,0 +1,128 @@ +EventScript_ShowSecondTrainerIntro:: @ 8271356 + special SetUpTrainerEncounterMusic + special EndTrainerApproach + waitstate + goto EventScript_ShowTrainerIntroMsg + +EventScript_TryDoNormalTrainerBattle:: @ 8271362 + lock + faceplayer + applymovement VAR_LAST_TALKED, Movement_RevealTrainer + waitmovement 0 + specialvar VAR_RESULT, GetTrainerFlag + compare VAR_RESULT, 0 + goto_if 5, EventScript_NoNormalTrainerBattle + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement + goto EventScript_ShowTrainerIntroMsg +EventScript_NoNormalTrainerBattle:: @ 8271389 + gotopostbattlescript + +EventScript_TryDoDoubleTrainerBattle:: @ 827138A + lock + faceplayer + call EventScript_RevealTrainer + specialvar VAR_RESULT, GetTrainerFlag + compare VAR_RESULT, 0 + goto_if 5, EventScript_NoDoubleTrainerBattle + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, 0 + goto_if 5, EventScript_NotEnoughMonsForDoubleBattle + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement + goto EventScript_ShowTrainerIntroMsg +EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA + special ShowTrainerCantBattleSpeech + waitmessage + waitbuttonpress + release + end +EventScript_NoDoubleTrainerBattle:: @ 82713C1 + gotopostbattlescript + +EventScript_DoTainerBattle:: @ 82713C2 + applymovement VAR_LAST_TALKED, Movement_RevealTrainer + waitmovement 0 + special SetUpTrainerEncounterMusic + trainerbattlebegin + gotopostbattlescript + +EventScript_TryDoRematchBattle:: @ 82713D1 + call EventScript_RevealTrainer + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, 0 + goto_eq EventScript_NoRematchTrainerBattle + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement + special ShowTrainerIntroSpeech + waitmessage + waitbuttonpress + special BattleSetup_StartRematchBattle + waitstate + releaseall + end +EventScript_NoRematchTrainerBattle:: @ 82713F7 + gotopostbattlescript + +EventScript_TryDoDoubleRematchBattle:: @ 82713F8 + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, 0 + goto_eq EventScript_NoDoubleRematchTrainerBattle + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, 0 + goto_if 5, EventScript_NotEnoughMonsForDoubleRematchBattle + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement + special ShowTrainerIntroSpeech + waitmessage + waitbuttonpress + special BattleSetup_StartRematchBattle + waitstate + releaseall + end +EventScript_NoDoubleRematchTrainerBattle:: @ 8271427 + gotopostbattlescript +EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 8271428 + special ShowTrainerCantBattleSpeech + waitmessage + waitbuttonpress + release + end + +EventScript_RevealTrainer:: @ 827142F + applymovement VAR_LAST_TALKED, Movement_RevealTrainer + waitmovement 0 + return + +Movement_RevealTrainer: @ 827143A + reveal_trainer + step_end + +EventScript_ShowTrainerIntroMsg:: @ 827143C + special ShowTrainerIntroSpeech + waitmessage + waitbuttonpress + special TryPrepareSecondApproachingTrainer + compare VAR_RESULT, TRUE + goto_eq EventScript_ShowSecondTrainerIntro + goto EventScript_DoTrainerBattle + +EventScript_DoTrainerBattle:: @ 8271454 + trainerbattlebegin + @ Pointless check, possibly used for debugging? + specialvar VAR_RESULT, GetTrainerBattleMode + compare VAR_RESULT, TRAINER_BATTLE_SINGLE + goto_eq EventScript_EndTrainerBattle + compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT + goto_eq EventScript_EndTrainerBattle + compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC + goto_eq EventScript_EndTrainerBattle + compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE + goto_eq EventScript_EndTrainerBattle + compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC + goto_eq EventScript_EndTrainerBattle + +EventScript_EndTrainerBattle:: @ 8271491 + gotobeatenscript + releaseall + end diff --git a/data/specials.inc b/data/specials.inc index a1d9734ca..080f2c042 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -324,7 +324,7 @@ gSpecials:: @ 81DBA64 def_special StartGroudonKyogreBattle def_special BattleSetup_StartLegendaryBattle def_special StartRegiBattle - def_special sub_80B16D8 + def_special SetUpTrainerMovement def_special DoSealedChamberShakingEffect2 def_special FoundBlackGlasses def_special sub_80AC81C @@ -531,7 +531,7 @@ gSpecials:: @ 81DBA64 def_special sub_813B9A0 def_special sub_81B9918 def_special sub_80722E0 - def_special sub_80B45D0 + def_special TryPrepareSecondApproachingTrainer def_special RemoveRecordsWindow def_special sub_8139C10 def_special sub_80B3BC4 diff --git a/include/battle.h b/include/battle.h index c4a0fe9a5..9e67e8ec5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -479,10 +479,10 @@ struct BattleStruct u16 changedItems[MAX_BATTLERS_COUNT]; u8 intimidateBattler; u8 switchInItemsCounter; - u8 field_DA; + u8 arenaTurnCounter; u8 turnSideTracker; u8 fillerDC[0xDF-0xDC]; - u8 field_DF; + u8 givenExpMons; // Bits for enemy party's pokemon that gave exp to player's party. u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte] u16 castformPalette[MAX_BATTLERS_COUNT][16]; u8 field_180; diff --git a/include/battle_setup.h b/include/battle_setup.h index 98c366acd..3b327e3f7 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -38,7 +38,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript); void SetUpTwoTrainersBattle(void); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); -void sub_80B16D8(void); +void SetUpTrainerMovement(void); u8 GetTrainerBattleMode(void); bool8 GetTrainerFlag(void); bool8 HasTrainerBeenFought(u16 trainerId); diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h index 329bfa650..d98e1762f 100644 --- a/include/constants/battle_setup.h +++ b/include/constants/battle_setup.h @@ -10,7 +10,7 @@ #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 #define TRAINER_BATTLE_REMATCH_DOUBLE 7 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8 -#define TRAINER_BATTLE_9 9 +#define TRAINER_BATTLE_PYRAMID 9 #define TRAINER_BATTLE_SET_TRAINER_A 10 #define TRAINER_BATTLE_SET_TRAINER_B 11 #define TRAINER_BATTLE_12 12 diff --git a/include/event_scripts.h b/include/event_scripts.h index 058cec39b..7f69ef3ae 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -10,11 +10,11 @@ extern const u8 EventScript_275D0C[]; extern const u8 EventScript_275D1F[]; extern const u8 EventScript_275D2E[]; extern const u8 EventScript_271354[]; -extern const u8 EventScript_2713C2[]; +extern const u8 EventScript_DoTainerBattle[]; extern const u8 EventScript_TryDoDoubleTrainerBattle[]; -extern const u8 EventScript_271362[]; +extern const u8 EventScript_TryDoNormalTrainerBattle[]; extern const u8 EventScript_TryDoDoubleRematchBattle[]; -extern const u8 EventScript_2713D1[]; +extern const u8 EventScript_TryDoRematchBattle[]; extern const u8 EventScript_SecretPower1[]; extern const u8 EventScript_SecretPower2[]; diff --git a/include/trainer_see.h b/include/trainer_see.h index 43f8b82d2..a9b92d71b 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -19,7 +19,7 @@ extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); void sub_80B4578(struct EventObject *var); void EndTrainerApproach(void); -void sub_80B45D0(void); +void TryPrepareSecondApproachingTrainer(void); u8 FldEff_ExclamationMarkIcon(void); u8 FldEff_QuestionMarkIcon(void); u8 FldEff_HeartIcon(void); diff --git a/src/battle_main.c b/src/battle_main.c index de0becd2a..6d9d90356 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3071,7 +3071,7 @@ static void BattleStartClearSetData(void) *(gBattleStruct->AI_monToSwitchIntoId + i) = PARTY_SIZE; } - gBattleStruct->field_DF = 0; + gBattleStruct->givenExpMons = 0; gBattleStruct->field_92 = 0; gRandomTurnNumber = Random(); @@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void) gBattleResources->flags->flags[gActiveBattler] = 0; gCurrentMove = 0; - gBattleStruct->field_DA = 0xFF; + gBattleStruct->arenaTurnCounter = 0xFF; ClearBattlerMoveHistory(gActiveBattler); ClearBattlerAbilityHistory(gActiveBattler); @@ -3994,7 +3994,7 @@ void BattleTurnPassed(void) if (gBattleResults.battleTurnCounter < 0xFF) { gBattleResults.battleTurnCounter++; - gBattleStruct->field_DA++; + gBattleStruct->arenaTurnCounter++; } for (i = 0; i < gBattlersCount; i++) @@ -4013,7 +4013,7 @@ void BattleTurnPassed(void) if (gBattleTypeFlags & BATTLE_TYPE_PALACE) BattleScriptExecute(BattleScript_82DB881); - else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0) + else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->arenaTurnCounter == 0) BattleScriptExecute(BattleScript_ArenaTurnBeginning); } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6a7ca1725..e627f9d67 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3270,7 +3270,7 @@ static void atk23_getexp(void) else { gBattleScripting.atk23_state++; - gBattleStruct->field_DF |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]]; + gBattleStruct->givenExpMons |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]]; } break; case 1: // calculate experience points to redistribute diff --git a/src/battle_setup.c b/src/battle_setup.c index 4243d2f3f..5377f39b5 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -306,7 +306,7 @@ const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] = {{TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5}, 0x0, 0x1b}, {{TRAINER_SAWYER_1, TRAINER_SAWYER_2, TRAINER_SAWYER_3, TRAINER_SAWYER_4, TRAINER_SAWYER_5}, 0x18, 0xc}, {{TRAINER_KIRA_AND_DAN_1, TRAINER_KIRA_AND_DAN_2, TRAINER_KIRA_AND_DAN_3, TRAINER_KIRA_AND_DAN_4, TRAINER_KIRA_AND_DAN_5}, 0x18, 0x3e}, - {{TRAINER_WALLY_3, 0x292, 0x293, 0x294, 0x294}, 0x18, 0x2b}, + {{TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_WALLY_6}, 0x18, 0x2b}, {{TRAINER_ROXANNE_1, TRAINER_ROXANNE_2, TRAINER_ROXANNE_3, TRAINER_ROXANNE_4, TRAINER_ROXANNE_5}, 0x0, 0x3}, {{TRAINER_BRAWLY_1, TRAINER_BRAWLY_2, TRAINER_BRAWLY_3, TRAINER_BRAWLY_4, TRAINER_BRAWLY_5}, 0x0, 0xb}, {{TRAINER_WATTSON_1, TRAINER_WATTSON_2, TRAINER_WATTSON_3, TRAINER_WATTSON_4, TRAINER_WATTSON_5}, 0x0, 0x2}, @@ -1088,7 +1088,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) { case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT: TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); - return EventScript_2713C2; + return EventScript_DoTainerBattle; case TRAINER_BATTLE_DOUBLE: TrainerBattleLoadArgs(sDoubleBattleParams, data); SetMapVarsToTrainer(); @@ -1103,11 +1103,11 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) { TrainerBattleLoadArgs(sTrainerBContinueScriptBattleParams, data); } - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; case TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC: TrainerBattleLoadArgs(sContinueScriptBattleParams, data); SetMapVarsToTrainer(); - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE: case TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC: TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data); @@ -1122,8 +1122,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sOrdinaryBattleParams, data); SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); - return EventScript_2713D1; - case TRAINER_BATTLE_9: + return EventScript_TryDoRematchBattle; + case TRAINER_BATTLE_PYRAMID: if (gApproachingTrainerId == 0) { TrainerBattleLoadArgs(sOrdinaryBattleParams, data); @@ -1135,7 +1135,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); gTrainerBattleOpponent_B = LocalIdToPyramidTrainerId(gSpecialVar_LastTalked); } - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; case TRAINER_BATTLE_SET_TRAINER_A: TrainerBattleLoadArgs(sOrdinaryBattleParams, data); return NULL; @@ -1154,7 +1154,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); gTrainerBattleOpponent_B = sub_81D6180(gSpecialVar_LastTalked); } - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; default: if (gApproachingTrainerId == 0) { @@ -1165,7 +1165,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) { TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); } - return EventScript_271362; + return EventScript_TryDoNormalTrainerBattle; } } @@ -1197,7 +1197,7 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) return FlagGet(FLAG_TRAINER_FLAG_START + flag); } -void sub_80B16D8(void) +void SetUpTrainerMovement(void) { struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; diff --git a/src/battle_util.c b/src/battle_util.c index 251a545c9..4c9ef75d9 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1192,7 +1192,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) // fall through case 2: if ((gBattleTypeFlags & BATTLE_TYPE_ARENA) - && gBattleStruct->field_DA == 2 + && gBattleStruct->arenaTurnCounter == 2 && gBattleMons[0].hp != 0 && gBattleMons[1].hp != 0) { s32 i; @@ -1238,7 +1238,7 @@ bool8 HandleFaintedMonActions(void) { gBattlerFainted = gBattlerTarget = gBattleStruct->faintedActionsBattlerId; if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0 - && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]]) + && !(gBattleStruct->givenExpMons & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]]) && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId])) { BattleScriptExecute(BattleScript_GiveExp); diff --git a/src/daycare.c b/src/daycare.c index 2356b36f5..21678adc0 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -19,6 +19,7 @@ #include "task.h" #include "window.h" #include "list_menu.h" +#include "overworld.h" #define EGG_MOVES_ARRAY_COUNT 10 #define EGG_LVL_UP_MOVES_ARRAY_COUNT 50 @@ -39,12 +40,8 @@ extern const u8 gDaycareText_PlayOther[]; extern u8 GetCursorSelectionMonId(void); extern u16 ItemIdToBattleMoveId(u16); -extern s32 ListMenuHandleInputGetItemId(u8); -extern void DestroyListMenuTask(u8, u16*, u16*); extern void sub_819746C(u8, bool8); -extern void NewMenuHelpers_DrawStdWindowFrame(u8, bool8); extern void sub_81B9328(void); -extern void CB2_ReturnToField(void); // this file's functions static void ClearDaycareMonMail(struct DayCareMail *mail); diff --git a/src/trainer_see.c b/src/trainer_see.c index d3d450de4..244a7021c 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -630,26 +630,26 @@ static void Task_DestroyTrainerApproachTask(u8 taskId) EnableBothScriptContexts(); } -void sub_80B45D0(void) +void TryPrepareSecondApproachingTrainer(void) { if (gNoOfApproachingTrainers == 2) { if (gApproachingTrainerId == 0) { gApproachingTrainerId++; - gSpecialVar_Result = 1; + gSpecialVar_Result = TRUE; UnfreezeEventObjects(); FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId); } else { gApproachingTrainerId = 0; - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; } } else { - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; } } -- cgit v1.2.3 From 4d307a6f63b13c9a52755bb40842cdf77001dcc2 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sat, 8 Dec 2018 11:33:41 +0800 Subject: Clean some more arrays --- src/battle_script_commands.c | 118 +++++++++++++++++++++---------------------- src/pokemon_animation.c | 2 +- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 59631b78c..26be44f07 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] = static const u8* const sMoveEffectBS_Ptrs[] = { - BattleScript_MoveEffectSleep, // 0 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SLEEP - BattleScript_MoveEffectPoison, // MOVE_EFFECT_POISON - BattleScript_MoveEffectBurn, // MOVE_EFFECT_BURN - BattleScript_MoveEffectFreeze, // MOVE_EFFECT_FREEZE - BattleScript_MoveEffectParalysis, // MOVE_EFFECT_PARALYSIS - BattleScript_MoveEffectToxic, // MOVE_EFFECT_TOXIC - BattleScript_MoveEffectConfusion, // MOVE_EFFECT_CONFUSION - BattleScript_MoveEffectSleep, // MOVE_EFFECT_FLINCH - BattleScript_MoveEffectSleep, // MOVE_EFFECT_TRI_ATTACK - BattleScript_MoveEffectUproar, // MOVE_EFFECT_UPROAR - BattleScript_MoveEffectPayDay, // MOVE_EFFECT_PAYDAY - BattleScript_MoveEffectSleep, // MOVE_EFFECT_CHARGING - BattleScript_MoveEffectWrap, // MOVE_EFFECT_WRAP - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_25 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_PLUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SPD_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_ATK_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_SP_DEF_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ACC_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_EVS_MINUS_1 - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RECHARGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAGE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_STEAL_ITEM - BattleScript_MoveEffectSleep, // MOVE_EFFECT_PREVENT_ESCAPE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_NIGHTMARE - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ALL_STATS_UP - BattleScript_MoveEffectSleep, // MOVE_EFFECT_RAPIDSPIN - BattleScript_MoveEffectSleep, // MOVE_EFFECT_REMOVE_PARALYSIS - BattleScript_MoveEffectSleep, // MOVE_EFFECT_ATK_DEF_DOWN - BattleScript_MoveEffectRecoil, // MOVE_EFFECT_RECOIL_33 + [0] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison, + [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn, + [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze, + [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis, + [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic, + [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion, + [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar, + [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay, + [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap, + [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil, + [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_REMOVE_PARALYSIS] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil, }; static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; @@ -768,26 +768,26 @@ static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / static const u16 sMovesForbiddenToCopy[] = { - MOVE_METRONOME, - MOVE_STRUGGLE, - MOVE_SKETCH, - MOVE_MIMIC, - MIMIC_FORBIDDEN_END, - MOVE_COUNTER, - MOVE_MIRROR_COAT, - MOVE_PROTECT, - MOVE_DETECT, - MOVE_ENDURE, - MOVE_DESTINY_BOND, - MOVE_SLEEP_TALK, - MOVE_THIEF, - MOVE_FOLLOW_ME, - MOVE_SNATCH, - MOVE_HELPING_HAND, - MOVE_COVET, - MOVE_TRICK, - MOVE_FOCUS_PUNCH, - METRONOME_FORBIDDEN_END + MOVE_METRONOME, + MOVE_STRUGGLE, + MOVE_SKETCH, + MOVE_MIMIC, + MIMIC_FORBIDDEN_END, + MOVE_COUNTER, + MOVE_MIRROR_COAT, + MOVE_PROTECT, + MOVE_DETECT, + MOVE_ENDURE, + MOVE_DESTINY_BOND, + MOVE_SLEEP_TALK, + MOVE_THIEF, + MOVE_FOLLOW_ME, + MOVE_SNATCH, + MOVE_HELPING_HAND, + MOVE_COVET, + MOVE_TRICK, + MOVE_FOCUS_PUNCH, + METRONOME_FORBIDDEN_END }; static const u8 sFlailHpScaleToPowerTable[] = diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 6aa7593ca..8c468d9f4 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -810,7 +810,7 @@ static const u8 sBackAnimNatureModTable[] = [NATURE_GENTLE] = 0x02, [NATURE_SASSY] = 0x01, [NATURE_CAREFUL] = 0x02, - 0x01, // NATURE_QUIRKY + [NATURE_QUIRKY] = 0x01, }; static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] = -- cgit v1.2.3 From 907ed3f5f5537d14ed6136daeb81e38c383239c2 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sat, 8 Dec 2018 11:39:35 +0800 Subject: Format pokemon.c --- src/pokemon.c | 1646 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 823 insertions(+), 823 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index 7a7d672f5..eec995050 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1405,836 +1405,836 @@ const s8 gNatureStatTable[][5] = #include "data/pokemon/evolution.h" #include "data/pokemon/level_up_learnset_pointers.h" -// These two tables are zero-based. +// SPECIES_NONE are ignored in the following two tables, so decrement before accessing these arrays to get the right result static const u8 sMonFrontAnimIdsTable[] = { - [SPECIES_BULBASAUR-1] = 0x06, - [SPECIES_IVYSAUR-1] = 0x17, - [SPECIES_VENUSAUR-1] = 0x2f, - [SPECIES_CHARMANDER-1] = 0x52, - [SPECIES_CHARMELEON-1] = 0x25, - [SPECIES_CHARIZARD-1] = 0x10, - [SPECIES_SQUIRTLE-1] = 0x0b, - [SPECIES_WARTORTLE-1] = 0x13, - [SPECIES_BLASTOISE-1] = 0x19, - [SPECIES_CATERPIE-1] = 0x0b, - [SPECIES_METAPOD-1] = 0x0b, - [SPECIES_BUTTERFREE-1] = 0x1d, - [SPECIES_WEEDLE-1] = 0x46, - [SPECIES_KAKUNA-1] = 0x20, - [SPECIES_BEEDRILL-1] = 0x02, - [SPECIES_PIDGEY-1] = 0x47, - [SPECIES_PIDGEOTTO-1] = 0x17, - [SPECIES_PIDGEOT-1] = 0x29, - [SPECIES_RATTATA-1] = 0x43, - [SPECIES_RATICATE-1] = 0x2b, - [SPECIES_SPEAROW-1] = 0x18, - [SPECIES_FEAROW-1] = 0x2b, - [SPECIES_EKANS-1] = 0x16, - [SPECIES_ARBOK-1] = 0x17, - [SPECIES_PIKACHU-1] = 0x2c, - [SPECIES_RAICHU-1] = 0x17, - [SPECIES_SANDSHREW-1] = 0x2d, - [SPECIES_SANDSLASH-1] = 0x17, - [SPECIES_NIDORAN_F-1] = 0x00, - [SPECIES_NIDORINA-1] = 0x17, - [SPECIES_NIDOQUEEN-1] = 0x0f, - [SPECIES_NIDORAN_M-1] = 0x09, - [SPECIES_NIDORINO-1] = 0x13, - [SPECIES_NIDOKING-1] = 0x0f, - [SPECIES_CLEFAIRY-1] = 0x00, - [SPECIES_CLEFABLE-1] = 0x4a, - [SPECIES_VULPIX-1] = 0x17, - [SPECIES_NINETALES-1] = 0x10, - [SPECIES_JIGGLYPUFF-1] = 0x48, - [SPECIES_WIGGLYTUFF-1] = 0x31, - [SPECIES_ZUBAT-1] = 0x00, - [SPECIES_GOLBAT-1] = 0x1d, - [SPECIES_ODDISH-1] = 0x00, - [SPECIES_GLOOM-1] = 0x45, - [SPECIES_VILEPLUME-1] = 0x49, - [SPECIES_PARAS-1] = 0x46, - [SPECIES_PARASECT-1] = 0x0f, - [SPECIES_VENONAT-1] = 0x06, - [SPECIES_VENOMOTH-1] = 0x4b, - [SPECIES_DIGLETT-1] = 0x10, - [SPECIES_DUGTRIO-1] = 0x4c, - [SPECIES_MEOWTH-1] = 0x52, - [SPECIES_PERSIAN-1] = 0x17, - [SPECIES_PSYDUCK-1] = 0x06, - [SPECIES_GOLDUCK-1] = 0x4c, - [SPECIES_MANKEY-1] = 0x32, - [SPECIES_PRIMEAPE-1] = 0x48, - [SPECIES_GROWLITHE-1] = 0x25, - [SPECIES_ARCANINE-1] = 0x02, - [SPECIES_POLIWAG-1] = 0x00, - [SPECIES_POLIWHIRL-1] = 0x32, - [SPECIES_POLIWRATH-1] = 0x19, - [SPECIES_ABRA-1] = 0x31, - [SPECIES_KADABRA-1] = 0x09, - [SPECIES_ALAKAZAM-1] = 0x17, - [SPECIES_MACHOP-1] = 0x00, - [SPECIES_MACHOKE-1] = 0x10, - [SPECIES_MACHAMP-1] = 0x31, - [SPECIES_BELLSPROUT-1] = 0x17, - [SPECIES_WEEPINBELL-1] = 0x0d, - [SPECIES_VICTREEBEL-1] = 0x32, - [SPECIES_TENTACOOL-1] = 0x00, - [SPECIES_TENTACRUEL-1] = 0x00, - [SPECIES_GEODUDE-1] = 0x48, - [SPECIES_GRAVELER-1] = 0x48, - [SPECIES_GOLEM-1] = 0x2f, - [SPECIES_PONYTA-1] = 0x20, - [SPECIES_RAPIDASH-1] = 0x11, - [SPECIES_SLOWPOKE-1] = 0x45, - [SPECIES_SLOWBRO-1] = 0x0b, - [SPECIES_MAGNEMITE-1] = 0x54, - [SPECIES_MAGNETON-1] = 0x2c, - [SPECIES_FARFETCHD-1] = 0x48, - [SPECIES_DODUO-1] = 0x4c, - [SPECIES_DODRIO-1] = 0x41, - [SPECIES_SEEL-1] = 0x0b, - [SPECIES_DEWGONG-1] = 0x45, - [SPECIES_GRIMER-1] = 0x46, - [SPECIES_MUK-1] = 0x30, - [SPECIES_SHELLDER-1] = 0x12, - [SPECIES_CLOYSTER-1] = 0x1d, - [SPECIES_GASTLY-1] = 0x15, - [SPECIES_HAUNTER-1] = 0x35, - [SPECIES_GENGAR-1] = 0x3a, - [SPECIES_ONIX-1] = 0x43, - [SPECIES_DROWZEE-1] = 0x4f, - [SPECIES_HYPNO-1] = 0x09, - [SPECIES_KRABBY-1] = 0x03, - [SPECIES_KINGLER-1] = 0x4b, - [SPECIES_VOLTORB-1] = 0x00, - [SPECIES_ELECTRODE-1] = 0x00, - [SPECIES_EXEGGCUTE-1] = 0x46, - [SPECIES_EXEGGUTOR-1] = 0x32, - [SPECIES_CUBONE-1] = 0x48, - [SPECIES_MAROWAK-1] = 0x05, - [SPECIES_HITMONLEE-1] = 0x16, - [SPECIES_HITMONCHAN-1] = 0x09, - [SPECIES_LICKITUNG-1] = 0x45, - [SPECIES_KOFFING-1] = 0x13, - [SPECIES_WEEZING-1] = 0x04, - [SPECIES_RHYHORN-1] = 0x10, - [SPECIES_RHYDON-1] = 0x13, - [SPECIES_CHANSEY-1] = 0x45, - [SPECIES_TANGELA-1] = 0x48, - [SPECIES_KANGASKHAN-1] = 0x17, - [SPECIES_HORSEA-1] = 0x12, - [SPECIES_SEADRA-1] = 0x04, - [SPECIES_GOLDEEN-1] = 0x0d, - [SPECIES_SEAKING-1] = 0x1c, - [SPECIES_STARYU-1] = 0x4e, - [SPECIES_STARMIE-1] = 0x12, - [SPECIES_MR_MIME-1] = 0x46, - [SPECIES_SCYTHER-1] = 0x02, - [SPECIES_JYNX-1] = 0x17, - [SPECIES_ELECTABUZZ-1] = 0x2c, - [SPECIES_MAGMAR-1] = 0x0f, - [SPECIES_PINSIR-1] = 0x09, - [SPECIES_TAUROS-1] = 0x19, - [SPECIES_MAGIKARP-1] = 0x05, - [SPECIES_GYARADOS-1] = 0x48, - [SPECIES_LAPRAS-1] = 0x17, - [SPECIES_DITTO-1] = 0x01, - [SPECIES_EEVEE-1] = 0x17, - [SPECIES_VAPOREON-1] = 0x17, - [SPECIES_JOLTEON-1] = 0x00, - [SPECIES_FLAREON-1] = 0x17, - [SPECIES_PORYGON-1] = 0x52, - [SPECIES_OMANYTE-1] = 0x51, - [SPECIES_OMASTAR-1] = 0x09, - [SPECIES_KABUTO-1] = 0x1d, - [SPECIES_KABUTOPS-1] = 0x0f, - [SPECIES_AERODACTYL-1] = 0x47, - [SPECIES_SNORLAX-1] = 0x0b, - [SPECIES_ARTICUNO-1] = 0x09, - [SPECIES_ZAPDOS-1] = 0x2c, - [SPECIES_MOLTRES-1] = 0x45, - [SPECIES_DRATINI-1] = 0x00, - [SPECIES_DRAGONAIR-1] = 0x10, - [SPECIES_DRAGONITE-1] = 0x47, - [SPECIES_MEWTWO-1] = 0x09, - [SPECIES_MEW-1] = 0x0d, - [SPECIES_CHIKORITA-1] = 0x00, - [SPECIES_BAYLEEF-1] = 0x00, - [SPECIES_MEGANIUM-1] = 0x17, - [SPECIES_CYNDAQUIL-1] = 0x52, - [SPECIES_QUILAVA-1] = 0x17, - [SPECIES_TYPHLOSION-1] = 0x10, - [SPECIES_TOTODILE-1] = 0x31, - [SPECIES_CROCONAW-1] = 0x0f, - [SPECIES_FERALIGATR-1] = 0x0f, - [SPECIES_SENTRET-1] = 0x00, - [SPECIES_FURRET-1] = 0x32, - [SPECIES_HOOTHOOT-1] = 0x47, - [SPECIES_NOCTOWL-1] = 0x17, - [SPECIES_LEDYBA-1] = 0x52, - [SPECIES_LEDIAN-1] = 0x47, - [SPECIES_SPINARAK-1] = 0x4f, - [SPECIES_ARIADOS-1] = 0x0f, - [SPECIES_CROBAT-1] = 0x00, - [SPECIES_CHINCHOU-1] = 0x45, - [SPECIES_LANTURN-1] = 0x51, - [SPECIES_PICHU-1] = 0x1e, - [SPECIES_CLEFFA-1] = 0x52, - [SPECIES_IGGLYBUFF-1] = 0x0c, - [SPECIES_TOGEPI-1] = 0x0b, - [SPECIES_TOGETIC-1] = 0x00, - [SPECIES_NATU-1] = 0x31, - [SPECIES_XATU-1] = 0x09, - [SPECIES_MAREEP-1] = 0x00, - [SPECIES_FLAAFFY-1] = 0x1e, - [SPECIES_AMPHAROS-1] = 0x2c, - [SPECIES_BELLOSSOM-1] = 0x0b, - [SPECIES_MARILL-1] = 0x00, - [SPECIES_AZUMARILL-1] = 0x4a, - [SPECIES_SUDOWOODO-1] = 0x46, - [SPECIES_POLITOED-1] = 0x32, - [SPECIES_HOPPIP-1] = 0x1c, - [SPECIES_SKIPLOOM-1] = 0x18, - [SPECIES_JUMPLUFF-1] = 0x51, - [SPECIES_AIPOM-1] = 0x32, - [SPECIES_SUNKERN-1] = 0x52, - [SPECIES_SUNFLORA-1] = 0x00, - [SPECIES_YANMA-1] = 0x2b, - [SPECIES_WOOPER-1] = 0x00, - [SPECIES_QUAGSIRE-1] = 0x16, - [SPECIES_ESPEON-1] = 0x09, - [SPECIES_UMBREON-1] = 0x10, - [SPECIES_MURKROW-1] = 0x00, - [SPECIES_SLOWKING-1] = 0x13, - [SPECIES_MISDREAVUS-1] = 0x1c, - [SPECIES_UNOWN-1] = 0x0a, - [SPECIES_WOBBUFFET-1] = 0x30, - [SPECIES_GIRAFARIG-1] = 0x1e, - [SPECIES_PINECO-1] = 0x0b, - [SPECIES_FORRETRESS-1] = 0x10, - [SPECIES_DUNSPARCE-1] = 0x00, - [SPECIES_GLIGAR-1] = 0x13, - [SPECIES_STEELIX-1] = 0x0f, - [SPECIES_SNUBBULL-1] = 0x17, - [SPECIES_GRANBULL-1] = 0x10, - [SPECIES_QWILFISH-1] = 0x3a, - [SPECIES_SCIZOR-1] = 0x02, - [SPECIES_SHUCKLE-1] = 0x0b, - [SPECIES_HERACROSS-1] = 0x41, - [SPECIES_SNEASEL-1] = 0x16, - [SPECIES_TEDDIURSA-1] = 0x17, - [SPECIES_URSARING-1] = 0x10, - [SPECIES_SLUGMA-1] = 0x17, - [SPECIES_MAGCARGO-1] = 0x17, - [SPECIES_SWINUB-1] = 0x00, - [SPECIES_PILOSWINE-1] = 0x0f, - [SPECIES_CORSOLA-1] = 0x03, - [SPECIES_REMORAID-1] = 0x52, - [SPECIES_OCTILLERY-1] = 0x17, - [SPECIES_DELIBIRD-1] = 0x52, - [SPECIES_MANTINE-1] = 0x0d, - [SPECIES_SKARMORY-1] = 0x17, - [SPECIES_HOUNDOUR-1] = 0x17, - [SPECIES_HOUNDOOM-1] = 0x10, - [SPECIES_KINGDRA-1] = 0x42, - [SPECIES_PHANPY-1] = 0x32, - [SPECIES_DONPHAN-1] = 0x19, - [SPECIES_PORYGON2-1] = 0x00, - [SPECIES_STANTLER-1] = 0x00, - [SPECIES_SMEARGLE-1] = 0x31, - [SPECIES_TYROGUE-1] = 0x16, - [SPECIES_HITMONTOP-1] = 0x02, - [SPECIES_SMOOCHUM-1] = 0x09, - [SPECIES_ELEKID-1] = 0x2c, - [SPECIES_MAGBY-1] = 0x00, - [SPECIES_MILTANK-1] = 0x45, - [SPECIES_BLISSEY-1] = 0x00, - [SPECIES_RAIKOU-1] = 0x2c, - [SPECIES_ENTEI-1] = 0x09, - [SPECIES_SUICUNE-1] = 0x10, - [SPECIES_LARVITAR-1] = 0x52, - [SPECIES_PUPITAR-1] = 0x10, - [SPECIES_TYRANITAR-1] = 0x0f, - [SPECIES_LUGIA-1] = 0x3a, - [SPECIES_HO_OH-1] = 0x09, - [SPECIES_CELEBI-1] = 0x18, - [SPECIES_OLD_UNOWN_B-1] = 0x00, - [SPECIES_OLD_UNOWN_C-1] = 0x00, - [SPECIES_OLD_UNOWN_D-1] = 0x00, - [SPECIES_OLD_UNOWN_E-1] = 0x00, - [SPECIES_OLD_UNOWN_F-1] = 0x00, - [SPECIES_OLD_UNOWN_G-1] = 0x00, - [SPECIES_OLD_UNOWN_H-1] = 0x00, - [SPECIES_OLD_UNOWN_I-1] = 0x00, - [SPECIES_OLD_UNOWN_J-1] = 0x00, - [SPECIES_OLD_UNOWN_K-1] = 0x00, - [SPECIES_OLD_UNOWN_L-1] = 0x00, - [SPECIES_OLD_UNOWN_M-1] = 0x00, - [SPECIES_OLD_UNOWN_N-1] = 0x00, - [SPECIES_OLD_UNOWN_O-1] = 0x00, - [SPECIES_OLD_UNOWN_P-1] = 0x00, - [SPECIES_OLD_UNOWN_Q-1] = 0x00, - [SPECIES_OLD_UNOWN_R-1] = 0x00, - [SPECIES_OLD_UNOWN_S-1] = 0x00, - [SPECIES_OLD_UNOWN_T-1] = 0x00, - [SPECIES_OLD_UNOWN_U-1] = 0x00, - [SPECIES_OLD_UNOWN_V-1] = 0x00, - [SPECIES_OLD_UNOWN_W-1] = 0x00, - [SPECIES_OLD_UNOWN_X-1] = 0x00, - [SPECIES_OLD_UNOWN_Y-1] = 0x00, - [SPECIES_OLD_UNOWN_Z-1] = 0x00, - [SPECIES_TREECKO-1] = 0x00, - [SPECIES_GROVYLE-1] = 0x17, - [SPECIES_SCEPTILE-1] = 0x10, - [SPECIES_TORCHIC-1] = 0x16, - [SPECIES_COMBUSKEN-1] = 0x06, - [SPECIES_BLAZIKEN-1] = 0x0f, - [SPECIES_MUDKIP-1] = 0x01, - [SPECIES_MARSHTOMP-1] = 0x04, - [SPECIES_SWAMPERT-1] = 0x1e, - [SPECIES_POOCHYENA-1] = 0x10, - [SPECIES_MIGHTYENA-1] = 0x10, - [SPECIES_ZIGZAGOON-1] = 0x03, - [SPECIES_LINOONE-1] = 0x09, - [SPECIES_WURMPLE-1] = 0x00, - [SPECIES_SILCOON-1] = 0x00, - [SPECIES_BEAUTIFLY-1] = 0x04, - [SPECIES_CASCOON-1] = 0x04, - [SPECIES_DUSTOX-1] = 0x06, - [SPECIES_LOTAD-1] = 0x00, - [SPECIES_LOMBRE-1] = 0x00, - [SPECIES_LUDICOLO-1] = 0x49, - [SPECIES_SEEDOT-1] = 0x05, - [SPECIES_NUZLEAF-1] = 0x00, - [SPECIES_SHIFTRY-1] = 0x02, - [SPECIES_NINCADA-1] = 0x00, - [SPECIES_NINJASK-1] = 0x46, - [SPECIES_SHEDINJA-1] = 0x1c, - [SPECIES_TAILLOW-1] = 0x1e, - [SPECIES_SWELLOW-1] = 0x01, - [SPECIES_SHROOMISH-1] = 0x00, - [SPECIES_BRELOOM-1] = 0x00, - [SPECIES_SPINDA-1] = 0x31, - [SPECIES_WINGULL-1] = 0x1b, - [SPECIES_PELIPPER-1] = 0x1c, - [SPECIES_SURSKIT-1] = 0x00, - [SPECIES_MASQUERAIN-1] = 0x00, - [SPECIES_WAILMER-1] = 0x01, - [SPECIES_WAILORD-1] = 0x1c, - [SPECIES_SKITTY-1] = 0x00, - [SPECIES_DELCATTY-1] = 0x17, - [SPECIES_KECLEON-1] = 0x35, - [SPECIES_BALTOY-1] = 0x1d, - [SPECIES_CLAYDOL-1] = 0x51, - [SPECIES_NOSEPASS-1] = 0x49, - [SPECIES_TORKOAL-1] = 0x17, - [SPECIES_SABLEYE-1] = 0x15, - [SPECIES_BARBOACH-1] = 0x49, - [SPECIES_WHISCASH-1] = 0x49, - [SPECIES_LUVDISC-1] = 0x1d, - [SPECIES_CORPHISH-1] = 0x10, - [SPECIES_CRAWDAUNT-1] = 0x09, - [SPECIES_FEEBAS-1] = 0x49, - [SPECIES_MILOTIC-1] = 0x22, - [SPECIES_CARVANHA-1] = 0x49, - [SPECIES_SHARPEDO-1] = 0x56, - [SPECIES_TRAPINCH-1] = 0x10, - [SPECIES_VIBRAVA-1] = 0x0f, - [SPECIES_FLYGON-1] = 0x4b, - [SPECIES_MAKUHITA-1] = 0x0b, - [SPECIES_HARIYAMA-1] = 0x34, - [SPECIES_ELECTRIKE-1] = 0x00, - [SPECIES_MANECTRIC-1] = 0x00, - [SPECIES_NUMEL-1] = 0x04, - [SPECIES_CAMERUPT-1] = 0x10, - [SPECIES_SPHEAL-1] = 0x53, - [SPECIES_SEALEO-1] = 0x17, - [SPECIES_WALREIN-1] = 0x0f, - [SPECIES_CACNEA-1] = 0x49, - [SPECIES_CACTURNE-1] = 0x04, - [SPECIES_SNORUNT-1] = 0x45, - [SPECIES_GLALIE-1] = 0x0a, - [SPECIES_LUNATONE-1] = 0x0e, - [SPECIES_SOLROCK-1] = 0x08, - [SPECIES_AZURILL-1] = 0x00, - [SPECIES_SPOINK-1] = 0x56, - [SPECIES_GRUMPIG-1] = 0x32, - [SPECIES_PLUSLE-1] = 0x00, - [SPECIES_MINUN-1] = 0x01, - [SPECIES_MAWILE-1] = 0x00, - [SPECIES_MEDITITE-1] = 0x05, - [SPECIES_MEDICHAM-1] = 0x45, - [SPECIES_SWABLU-1] = 0x04, - [SPECIES_ALTARIA-1] = 0x16, - [SPECIES_WYNAUT-1] = 0x32, - [SPECIES_DUSKULL-1] = 0x0a, - [SPECIES_DUSCLOPS-1] = 0x02, - [SPECIES_ROSELIA-1] = 0x45, - [SPECIES_SLAKOTH-1] = 0x45, - [SPECIES_VIGOROTH-1] = 0x31, - [SPECIES_SLAKING-1] = 0x45, - [SPECIES_GULPIN-1] = 0x00, - [SPECIES_SWALOT-1] = 0x45, - [SPECIES_TROPIUS-1] = 0x10, - [SPECIES_WHISMUR-1] = 0x03, - [SPECIES_LOUDRED-1] = 0x49, - [SPECIES_EXPLOUD-1] = 0x19, - [SPECIES_CLAMPERL-1] = 0x12, - [SPECIES_HUNTAIL-1] = 0x09, - [SPECIES_GOREBYSS-1] = 0x1c, - [SPECIES_ABSOL-1] = 0x11, - [SPECIES_SHUPPET-1] = 0x1c, - [SPECIES_BANETTE-1] = 0x0d, - [SPECIES_SEVIPER-1] = 0x17, - [SPECIES_ZANGOOSE-1] = 0x09, - [SPECIES_RELICANTH-1] = 0x1a, - [SPECIES_ARON-1] = 0x45, - [SPECIES_LAIRON-1] = 0x00, - [SPECIES_AGGRON-1] = 0x19, - [SPECIES_CASTFORM-1] = 0x1d, - [SPECIES_VOLBEAT-1] = 0x00, - [SPECIES_ILLUMISE-1] = 0x05, - [SPECIES_LILEEP-1] = 0x17, - [SPECIES_CRADILY-1] = 0x19, - [SPECIES_ANORITH-1] = 0x12, - [SPECIES_ARMALDO-1] = 0x10, - [SPECIES_RALTS-1] = 0x45, - [SPECIES_KIRLIA-1] = 0x00, - [SPECIES_GARDEVOIR-1] = 0x00, - [SPECIES_BAGON-1] = 0x19, - [SPECIES_SHELGON-1] = 0x04, - [SPECIES_SALAMENCE-1] = 0x0f, - [SPECIES_BELDUM-1] = 0x0f, - [SPECIES_METANG-1] = 0x04, - [SPECIES_METAGROSS-1] = 0x10, - [SPECIES_REGIROCK-1] = 0x01, - [SPECIES_REGICE-1] = 0x44, - [SPECIES_REGISTEEL-1] = 0x09, - [SPECIES_KYOGRE-1] = 0x2d, - [SPECIES_GROUDON-1] = 0x10, - [SPECIES_RAYQUAZA-1] = 0x0f, - [SPECIES_LATIAS-1] = 0x2d, - [SPECIES_LATIOS-1] = 0x10, - [SPECIES_JIRACHI-1] = 0x0d, - [SPECIES_DEOXYS-1] = 0x1b, - [SPECIES_CHIMECHO-1] = 0x1d, + [SPECIES_BULBASAUR - 1] = 0x06, + [SPECIES_IVYSAUR - 1] = 0x17, + [SPECIES_VENUSAUR - 1] = 0x2f, + [SPECIES_CHARMANDER - 1] = 0x52, + [SPECIES_CHARMELEON - 1] = 0x25, + [SPECIES_CHARIZARD - 1] = 0x10, + [SPECIES_SQUIRTLE - 1] = 0x0b, + [SPECIES_WARTORTLE - 1] = 0x13, + [SPECIES_BLASTOISE - 1] = 0x19, + [SPECIES_CATERPIE - 1] = 0x0b, + [SPECIES_METAPOD - 1] = 0x0b, + [SPECIES_BUTTERFREE - 1] = 0x1d, + [SPECIES_WEEDLE - 1] = 0x46, + [SPECIES_KAKUNA - 1] = 0x20, + [SPECIES_BEEDRILL - 1] = 0x02, + [SPECIES_PIDGEY - 1] = 0x47, + [SPECIES_PIDGEOTTO - 1] = 0x17, + [SPECIES_PIDGEOT - 1] = 0x29, + [SPECIES_RATTATA - 1] = 0x43, + [SPECIES_RATICATE - 1] = 0x2b, + [SPECIES_SPEAROW - 1] = 0x18, + [SPECIES_FEAROW - 1] = 0x2b, + [SPECIES_EKANS - 1] = 0x16, + [SPECIES_ARBOK - 1] = 0x17, + [SPECIES_PIKACHU - 1] = 0x2c, + [SPECIES_RAICHU - 1] = 0x17, + [SPECIES_SANDSHREW - 1] = 0x2d, + [SPECIES_SANDSLASH - 1] = 0x17, + [SPECIES_NIDORAN_F - 1] = 0x00, + [SPECIES_NIDORINA - 1] = 0x17, + [SPECIES_NIDOQUEEN - 1] = 0x0f, + [SPECIES_NIDORAN_M - 1] = 0x09, + [SPECIES_NIDORINO - 1] = 0x13, + [SPECIES_NIDOKING - 1] = 0x0f, + [SPECIES_CLEFAIRY - 1] = 0x00, + [SPECIES_CLEFABLE - 1] = 0x4a, + [SPECIES_VULPIX - 1] = 0x17, + [SPECIES_NINETALES - 1] = 0x10, + [SPECIES_JIGGLYPUFF - 1] = 0x48, + [SPECIES_WIGGLYTUFF - 1] = 0x31, + [SPECIES_ZUBAT - 1] = 0x00, + [SPECIES_GOLBAT - 1] = 0x1d, + [SPECIES_ODDISH - 1] = 0x00, + [SPECIES_GLOOM - 1] = 0x45, + [SPECIES_VILEPLUME - 1] = 0x49, + [SPECIES_PARAS - 1] = 0x46, + [SPECIES_PARASECT - 1] = 0x0f, + [SPECIES_VENONAT - 1] = 0x06, + [SPECIES_VENOMOTH - 1] = 0x4b, + [SPECIES_DIGLETT - 1] = 0x10, + [SPECIES_DUGTRIO - 1] = 0x4c, + [SPECIES_MEOWTH - 1] = 0x52, + [SPECIES_PERSIAN - 1] = 0x17, + [SPECIES_PSYDUCK - 1] = 0x06, + [SPECIES_GOLDUCK - 1] = 0x4c, + [SPECIES_MANKEY - 1] = 0x32, + [SPECIES_PRIMEAPE - 1] = 0x48, + [SPECIES_GROWLITHE - 1] = 0x25, + [SPECIES_ARCANINE - 1] = 0x02, + [SPECIES_POLIWAG - 1] = 0x00, + [SPECIES_POLIWHIRL - 1] = 0x32, + [SPECIES_POLIWRATH - 1] = 0x19, + [SPECIES_ABRA - 1] = 0x31, + [SPECIES_KADABRA - 1] = 0x09, + [SPECIES_ALAKAZAM - 1] = 0x17, + [SPECIES_MACHOP - 1] = 0x00, + [SPECIES_MACHOKE - 1] = 0x10, + [SPECIES_MACHAMP - 1] = 0x31, + [SPECIES_BELLSPROUT - 1] = 0x17, + [SPECIES_WEEPINBELL - 1] = 0x0d, + [SPECIES_VICTREEBEL - 1] = 0x32, + [SPECIES_TENTACOOL - 1] = 0x00, + [SPECIES_TENTACRUEL - 1] = 0x00, + [SPECIES_GEODUDE - 1] = 0x48, + [SPECIES_GRAVELER - 1] = 0x48, + [SPECIES_GOLEM - 1] = 0x2f, + [SPECIES_PONYTA - 1] = 0x20, + [SPECIES_RAPIDASH - 1] = 0x11, + [SPECIES_SLOWPOKE - 1] = 0x45, + [SPECIES_SLOWBRO - 1] = 0x0b, + [SPECIES_MAGNEMITE - 1] = 0x54, + [SPECIES_MAGNETON - 1] = 0x2c, + [SPECIES_FARFETCHD - 1] = 0x48, + [SPECIES_DODUO - 1] = 0x4c, + [SPECIES_DODRIO - 1] = 0x41, + [SPECIES_SEEL - 1] = 0x0b, + [SPECIES_DEWGONG - 1] = 0x45, + [SPECIES_GRIMER - 1] = 0x46, + [SPECIES_MUK - 1] = 0x30, + [SPECIES_SHELLDER - 1] = 0x12, + [SPECIES_CLOYSTER - 1] = 0x1d, + [SPECIES_GASTLY - 1] = 0x15, + [SPECIES_HAUNTER - 1] = 0x35, + [SPECIES_GENGAR - 1] = 0x3a, + [SPECIES_ONIX - 1] = 0x43, + [SPECIES_DROWZEE - 1] = 0x4f, + [SPECIES_HYPNO - 1] = 0x09, + [SPECIES_KRABBY - 1] = 0x03, + [SPECIES_KINGLER - 1] = 0x4b, + [SPECIES_VOLTORB - 1] = 0x00, + [SPECIES_ELECTRODE - 1] = 0x00, + [SPECIES_EXEGGCUTE - 1] = 0x46, + [SPECIES_EXEGGUTOR - 1] = 0x32, + [SPECIES_CUBONE - 1] = 0x48, + [SPECIES_MAROWAK - 1] = 0x05, + [SPECIES_HITMONLEE - 1] = 0x16, + [SPECIES_HITMONCHAN - 1] = 0x09, + [SPECIES_LICKITUNG - 1] = 0x45, + [SPECIES_KOFFING - 1] = 0x13, + [SPECIES_WEEZING - 1] = 0x04, + [SPECIES_RHYHORN - 1] = 0x10, + [SPECIES_RHYDON - 1] = 0x13, + [SPECIES_CHANSEY - 1] = 0x45, + [SPECIES_TANGELA - 1] = 0x48, + [SPECIES_KANGASKHAN - 1] = 0x17, + [SPECIES_HORSEA - 1] = 0x12, + [SPECIES_SEADRA - 1] = 0x04, + [SPECIES_GOLDEEN - 1] = 0x0d, + [SPECIES_SEAKING - 1] = 0x1c, + [SPECIES_STARYU - 1] = 0x4e, + [SPECIES_STARMIE - 1] = 0x12, + [SPECIES_MR_MIME - 1] = 0x46, + [SPECIES_SCYTHER - 1] = 0x02, + [SPECIES_JYNX - 1] = 0x17, + [SPECIES_ELECTABUZZ - 1] = 0x2c, + [SPECIES_MAGMAR - 1] = 0x0f, + [SPECIES_PINSIR - 1] = 0x09, + [SPECIES_TAUROS - 1] = 0x19, + [SPECIES_MAGIKARP - 1] = 0x05, + [SPECIES_GYARADOS - 1] = 0x48, + [SPECIES_LAPRAS - 1] = 0x17, + [SPECIES_DITTO - 1] = 0x01, + [SPECIES_EEVEE - 1] = 0x17, + [SPECIES_VAPOREON - 1] = 0x17, + [SPECIES_JOLTEON - 1] = 0x00, + [SPECIES_FLAREON - 1] = 0x17, + [SPECIES_PORYGON - 1] = 0x52, + [SPECIES_OMANYTE - 1] = 0x51, + [SPECIES_OMASTAR - 1] = 0x09, + [SPECIES_KABUTO - 1] = 0x1d, + [SPECIES_KABUTOPS - 1] = 0x0f, + [SPECIES_AERODACTYL - 1] = 0x47, + [SPECIES_SNORLAX - 1] = 0x0b, + [SPECIES_ARTICUNO - 1] = 0x09, + [SPECIES_ZAPDOS - 1] = 0x2c, + [SPECIES_MOLTRES - 1] = 0x45, + [SPECIES_DRATINI - 1] = 0x00, + [SPECIES_DRAGONAIR - 1] = 0x10, + [SPECIES_DRAGONITE - 1] = 0x47, + [SPECIES_MEWTWO - 1] = 0x09, + [SPECIES_MEW - 1] = 0x0d, + [SPECIES_CHIKORITA - 1] = 0x00, + [SPECIES_BAYLEEF - 1] = 0x00, + [SPECIES_MEGANIUM - 1] = 0x17, + [SPECIES_CYNDAQUIL - 1] = 0x52, + [SPECIES_QUILAVA - 1] = 0x17, + [SPECIES_TYPHLOSION - 1] = 0x10, + [SPECIES_TOTODILE - 1] = 0x31, + [SPECIES_CROCONAW - 1] = 0x0f, + [SPECIES_FERALIGATR - 1] = 0x0f, + [SPECIES_SENTRET - 1] = 0x00, + [SPECIES_FURRET - 1] = 0x32, + [SPECIES_HOOTHOOT - 1] = 0x47, + [SPECIES_NOCTOWL - 1] = 0x17, + [SPECIES_LEDYBA - 1] = 0x52, + [SPECIES_LEDIAN - 1] = 0x47, + [SPECIES_SPINARAK - 1] = 0x4f, + [SPECIES_ARIADOS - 1] = 0x0f, + [SPECIES_CROBAT - 1] = 0x00, + [SPECIES_CHINCHOU - 1] = 0x45, + [SPECIES_LANTURN - 1] = 0x51, + [SPECIES_PICHU - 1] = 0x1e, + [SPECIES_CLEFFA - 1] = 0x52, + [SPECIES_IGGLYBUFF - 1] = 0x0c, + [SPECIES_TOGEPI - 1] = 0x0b, + [SPECIES_TOGETIC - 1] = 0x00, + [SPECIES_NATU - 1] = 0x31, + [SPECIES_XATU - 1] = 0x09, + [SPECIES_MAREEP - 1] = 0x00, + [SPECIES_FLAAFFY - 1] = 0x1e, + [SPECIES_AMPHAROS - 1] = 0x2c, + [SPECIES_BELLOSSOM - 1] = 0x0b, + [SPECIES_MARILL - 1] = 0x00, + [SPECIES_AZUMARILL - 1] = 0x4a, + [SPECIES_SUDOWOODO - 1] = 0x46, + [SPECIES_POLITOED - 1] = 0x32, + [SPECIES_HOPPIP - 1] = 0x1c, + [SPECIES_SKIPLOOM - 1] = 0x18, + [SPECIES_JUMPLUFF - 1] = 0x51, + [SPECIES_AIPOM - 1] = 0x32, + [SPECIES_SUNKERN - 1] = 0x52, + [SPECIES_SUNFLORA - 1] = 0x00, + [SPECIES_YANMA - 1] = 0x2b, + [SPECIES_WOOPER - 1] = 0x00, + [SPECIES_QUAGSIRE - 1] = 0x16, + [SPECIES_ESPEON - 1] = 0x09, + [SPECIES_UMBREON - 1] = 0x10, + [SPECIES_MURKROW - 1] = 0x00, + [SPECIES_SLOWKING - 1] = 0x13, + [SPECIES_MISDREAVUS - 1] = 0x1c, + [SPECIES_UNOWN - 1] = 0x0a, + [SPECIES_WOBBUFFET - 1] = 0x30, + [SPECIES_GIRAFARIG - 1] = 0x1e, + [SPECIES_PINECO - 1] = 0x0b, + [SPECIES_FORRETRESS - 1] = 0x10, + [SPECIES_DUNSPARCE - 1] = 0x00, + [SPECIES_GLIGAR - 1] = 0x13, + [SPECIES_STEELIX - 1] = 0x0f, + [SPECIES_SNUBBULL - 1] = 0x17, + [SPECIES_GRANBULL - 1] = 0x10, + [SPECIES_QWILFISH - 1] = 0x3a, + [SPECIES_SCIZOR - 1] = 0x02, + [SPECIES_SHUCKLE - 1] = 0x0b, + [SPECIES_HERACROSS - 1] = 0x41, + [SPECIES_SNEASEL - 1] = 0x16, + [SPECIES_TEDDIURSA - 1] = 0x17, + [SPECIES_URSARING - 1] = 0x10, + [SPECIES_SLUGMA - 1] = 0x17, + [SPECIES_MAGCARGO - 1] = 0x17, + [SPECIES_SWINUB - 1] = 0x00, + [SPECIES_PILOSWINE - 1] = 0x0f, + [SPECIES_CORSOLA - 1] = 0x03, + [SPECIES_REMORAID - 1] = 0x52, + [SPECIES_OCTILLERY - 1] = 0x17, + [SPECIES_DELIBIRD - 1] = 0x52, + [SPECIES_MANTINE - 1] = 0x0d, + [SPECIES_SKARMORY - 1] = 0x17, + [SPECIES_HOUNDOUR - 1] = 0x17, + [SPECIES_HOUNDOOM - 1] = 0x10, + [SPECIES_KINGDRA - 1] = 0x42, + [SPECIES_PHANPY - 1] = 0x32, + [SPECIES_DONPHAN - 1] = 0x19, + [SPECIES_PORYGON2 - 1] = 0x00, + [SPECIES_STANTLER - 1] = 0x00, + [SPECIES_SMEARGLE - 1] = 0x31, + [SPECIES_TYROGUE - 1] = 0x16, + [SPECIES_HITMONTOP - 1] = 0x02, + [SPECIES_SMOOCHUM - 1] = 0x09, + [SPECIES_ELEKID - 1] = 0x2c, + [SPECIES_MAGBY - 1] = 0x00, + [SPECIES_MILTANK - 1] = 0x45, + [SPECIES_BLISSEY - 1] = 0x00, + [SPECIES_RAIKOU - 1] = 0x2c, + [SPECIES_ENTEI - 1] = 0x09, + [SPECIES_SUICUNE - 1] = 0x10, + [SPECIES_LARVITAR - 1] = 0x52, + [SPECIES_PUPITAR - 1] = 0x10, + [SPECIES_TYRANITAR - 1] = 0x0f, + [SPECIES_LUGIA - 1] = 0x3a, + [SPECIES_HO_OH - 1] = 0x09, + [SPECIES_CELEBI - 1] = 0x18, + [SPECIES_OLD_UNOWN_B - 1] = 0x00, + [SPECIES_OLD_UNOWN_C - 1] = 0x00, + [SPECIES_OLD_UNOWN_D - 1] = 0x00, + [SPECIES_OLD_UNOWN_E - 1] = 0x00, + [SPECIES_OLD_UNOWN_F - 1] = 0x00, + [SPECIES_OLD_UNOWN_G - 1] = 0x00, + [SPECIES_OLD_UNOWN_H - 1] = 0x00, + [SPECIES_OLD_UNOWN_I - 1] = 0x00, + [SPECIES_OLD_UNOWN_J - 1] = 0x00, + [SPECIES_OLD_UNOWN_K - 1] = 0x00, + [SPECIES_OLD_UNOWN_L - 1] = 0x00, + [SPECIES_OLD_UNOWN_M - 1] = 0x00, + [SPECIES_OLD_UNOWN_N - 1] = 0x00, + [SPECIES_OLD_UNOWN_O - 1] = 0x00, + [SPECIES_OLD_UNOWN_P - 1] = 0x00, + [SPECIES_OLD_UNOWN_Q - 1] = 0x00, + [SPECIES_OLD_UNOWN_R - 1] = 0x00, + [SPECIES_OLD_UNOWN_S - 1] = 0x00, + [SPECIES_OLD_UNOWN_T - 1] = 0x00, + [SPECIES_OLD_UNOWN_U - 1] = 0x00, + [SPECIES_OLD_UNOWN_V - 1] = 0x00, + [SPECIES_OLD_UNOWN_W - 1] = 0x00, + [SPECIES_OLD_UNOWN_X - 1] = 0x00, + [SPECIES_OLD_UNOWN_Y - 1] = 0x00, + [SPECIES_OLD_UNOWN_Z - 1] = 0x00, + [SPECIES_TREECKO - 1] = 0x00, + [SPECIES_GROVYLE - 1] = 0x17, + [SPECIES_SCEPTILE - 1] = 0x10, + [SPECIES_TORCHIC - 1] = 0x16, + [SPECIES_COMBUSKEN - 1] = 0x06, + [SPECIES_BLAZIKEN - 1] = 0x0f, + [SPECIES_MUDKIP - 1] = 0x01, + [SPECIES_MARSHTOMP - 1] = 0x04, + [SPECIES_SWAMPERT - 1] = 0x1e, + [SPECIES_POOCHYENA - 1] = 0x10, + [SPECIES_MIGHTYENA - 1] = 0x10, + [SPECIES_ZIGZAGOON - 1] = 0x03, + [SPECIES_LINOONE - 1] = 0x09, + [SPECIES_WURMPLE - 1] = 0x00, + [SPECIES_SILCOON - 1] = 0x00, + [SPECIES_BEAUTIFLY - 1] = 0x04, + [SPECIES_CASCOON - 1] = 0x04, + [SPECIES_DUSTOX - 1] = 0x06, + [SPECIES_LOTAD - 1] = 0x00, + [SPECIES_LOMBRE - 1] = 0x00, + [SPECIES_LUDICOLO - 1] = 0x49, + [SPECIES_SEEDOT - 1] = 0x05, + [SPECIES_NUZLEAF - 1] = 0x00, + [SPECIES_SHIFTRY - 1] = 0x02, + [SPECIES_NINCADA - 1] = 0x00, + [SPECIES_NINJASK - 1] = 0x46, + [SPECIES_SHEDINJA - 1] = 0x1c, + [SPECIES_TAILLOW - 1] = 0x1e, + [SPECIES_SWELLOW - 1] = 0x01, + [SPECIES_SHROOMISH - 1] = 0x00, + [SPECIES_BRELOOM - 1] = 0x00, + [SPECIES_SPINDA - 1] = 0x31, + [SPECIES_WINGULL - 1] = 0x1b, + [SPECIES_PELIPPER - 1] = 0x1c, + [SPECIES_SURSKIT - 1] = 0x00, + [SPECIES_MASQUERAIN - 1] = 0x00, + [SPECIES_WAILMER - 1] = 0x01, + [SPECIES_WAILORD - 1] = 0x1c, + [SPECIES_SKITTY - 1] = 0x00, + [SPECIES_DELCATTY - 1] = 0x17, + [SPECIES_KECLEON - 1] = 0x35, + [SPECIES_BALTOY - 1] = 0x1d, + [SPECIES_CLAYDOL - 1] = 0x51, + [SPECIES_NOSEPASS - 1] = 0x49, + [SPECIES_TORKOAL - 1] = 0x17, + [SPECIES_SABLEYE - 1] = 0x15, + [SPECIES_BARBOACH - 1] = 0x49, + [SPECIES_WHISCASH - 1] = 0x49, + [SPECIES_LUVDISC - 1] = 0x1d, + [SPECIES_CORPHISH - 1] = 0x10, + [SPECIES_CRAWDAUNT - 1] = 0x09, + [SPECIES_FEEBAS - 1] = 0x49, + [SPECIES_MILOTIC - 1] = 0x22, + [SPECIES_CARVANHA - 1] = 0x49, + [SPECIES_SHARPEDO - 1] = 0x56, + [SPECIES_TRAPINCH - 1] = 0x10, + [SPECIES_VIBRAVA - 1] = 0x0f, + [SPECIES_FLYGON - 1] = 0x4b, + [SPECIES_MAKUHITA - 1] = 0x0b, + [SPECIES_HARIYAMA - 1] = 0x34, + [SPECIES_ELECTRIKE - 1] = 0x00, + [SPECIES_MANECTRIC - 1] = 0x00, + [SPECIES_NUMEL - 1] = 0x04, + [SPECIES_CAMERUPT - 1] = 0x10, + [SPECIES_SPHEAL - 1] = 0x53, + [SPECIES_SEALEO - 1] = 0x17, + [SPECIES_WALREIN - 1] = 0x0f, + [SPECIES_CACNEA - 1] = 0x49, + [SPECIES_CACTURNE - 1] = 0x04, + [SPECIES_SNORUNT - 1] = 0x45, + [SPECIES_GLALIE - 1] = 0x0a, + [SPECIES_LUNATONE - 1] = 0x0e, + [SPECIES_SOLROCK - 1] = 0x08, + [SPECIES_AZURILL - 1] = 0x00, + [SPECIES_SPOINK - 1] = 0x56, + [SPECIES_GRUMPIG - 1] = 0x32, + [SPECIES_PLUSLE - 1] = 0x00, + [SPECIES_MINUN - 1] = 0x01, + [SPECIES_MAWILE - 1] = 0x00, + [SPECIES_MEDITITE - 1] = 0x05, + [SPECIES_MEDICHAM - 1] = 0x45, + [SPECIES_SWABLU - 1] = 0x04, + [SPECIES_ALTARIA - 1] = 0x16, + [SPECIES_WYNAUT - 1] = 0x32, + [SPECIES_DUSKULL - 1] = 0x0a, + [SPECIES_DUSCLOPS - 1] = 0x02, + [SPECIES_ROSELIA - 1] = 0x45, + [SPECIES_SLAKOTH - 1] = 0x45, + [SPECIES_VIGOROTH - 1] = 0x31, + [SPECIES_SLAKING - 1] = 0x45, + [SPECIES_GULPIN - 1] = 0x00, + [SPECIES_SWALOT - 1] = 0x45, + [SPECIES_TROPIUS - 1] = 0x10, + [SPECIES_WHISMUR - 1] = 0x03, + [SPECIES_LOUDRED - 1] = 0x49, + [SPECIES_EXPLOUD - 1] = 0x19, + [SPECIES_CLAMPERL - 1] = 0x12, + [SPECIES_HUNTAIL - 1] = 0x09, + [SPECIES_GOREBYSS - 1] = 0x1c, + [SPECIES_ABSOL - 1] = 0x11, + [SPECIES_SHUPPET - 1] = 0x1c, + [SPECIES_BANETTE - 1] = 0x0d, + [SPECIES_SEVIPER - 1] = 0x17, + [SPECIES_ZANGOOSE - 1] = 0x09, + [SPECIES_RELICANTH - 1] = 0x1a, + [SPECIES_ARON - 1] = 0x45, + [SPECIES_LAIRON - 1] = 0x00, + [SPECIES_AGGRON - 1] = 0x19, + [SPECIES_CASTFORM - 1] = 0x1d, + [SPECIES_VOLBEAT - 1] = 0x00, + [SPECIES_ILLUMISE - 1] = 0x05, + [SPECIES_LILEEP - 1] = 0x17, + [SPECIES_CRADILY - 1] = 0x19, + [SPECIES_ANORITH - 1] = 0x12, + [SPECIES_ARMALDO - 1] = 0x10, + [SPECIES_RALTS - 1] = 0x45, + [SPECIES_KIRLIA - 1] = 0x00, + [SPECIES_GARDEVOIR - 1] = 0x00, + [SPECIES_BAGON - 1] = 0x19, + [SPECIES_SHELGON - 1] = 0x04, + [SPECIES_SALAMENCE - 1] = 0x0f, + [SPECIES_BELDUM - 1] = 0x0f, + [SPECIES_METANG - 1] = 0x04, + [SPECIES_METAGROSS - 1] = 0x10, + [SPECIES_REGIROCK - 1] = 0x01, + [SPECIES_REGICE - 1] = 0x44, + [SPECIES_REGISTEEL - 1] = 0x09, + [SPECIES_KYOGRE - 1] = 0x2d, + [SPECIES_GROUDON - 1] = 0x10, + [SPECIES_RAYQUAZA - 1] = 0x0f, + [SPECIES_LATIAS - 1] = 0x2d, + [SPECIES_LATIOS - 1] = 0x10, + [SPECIES_JIRACHI - 1] = 0x0d, + [SPECIES_DEOXYS - 1] = 0x1b, + [SPECIES_CHIMECHO - 1] = 0x1d, }; static const u8 sMonAnimationDelayTable[] = { - [SPECIES_BULBASAUR-1] = 0x00, - [SPECIES_IVYSAUR-1] = 0x00, - [SPECIES_VENUSAUR-1] = 0x00, - [SPECIES_CHARMANDER-1] = 0x00, - [SPECIES_CHARMELEON-1] = 0x00, - [SPECIES_CHARIZARD-1] = 0x00, - [SPECIES_SQUIRTLE-1] = 0x00, - [SPECIES_WARTORTLE-1] = 0x00, - [SPECIES_BLASTOISE-1] = 0x32, - [SPECIES_CATERPIE-1] = 0x00, - [SPECIES_METAPOD-1] = 0x00, - [SPECIES_BUTTERFREE-1] = 0x00, - [SPECIES_WEEDLE-1] = 0x0a, - [SPECIES_KAKUNA-1] = 0x14, - [SPECIES_BEEDRILL-1] = 0x23, - [SPECIES_PIDGEY-1] = 0x00, - [SPECIES_PIDGEOTTO-1] = 0x19, - [SPECIES_PIDGEOT-1] = 0x00, - [SPECIES_RATTATA-1] = 0x00, - [SPECIES_RATICATE-1] = 0x00, - [SPECIES_SPEAROW-1] = 0x00, - [SPECIES_FEAROW-1] = 0x02, - [SPECIES_EKANS-1] = 0x1e, - [SPECIES_ARBOK-1] = 0x00, - [SPECIES_PIKACHU-1] = 0x00, - [SPECIES_RAICHU-1] = 0x00, - [SPECIES_SANDSHREW-1] = 0x00, - [SPECIES_SANDSLASH-1] = 0x00, - [SPECIES_NIDORAN_F-1] = 0x1c, - [SPECIES_NIDORINA-1] = 0x00, - [SPECIES_NIDOQUEEN-1] = 0x00, - [SPECIES_NIDORAN_M-1] = 0x00, - [SPECIES_NIDORINO-1] = 0x00, - [SPECIES_NIDOKING-1] = 0x19, - [SPECIES_CLEFAIRY-1] = 0x00, - [SPECIES_CLEFABLE-1] = 0x00, - [SPECIES_VULPIX-1] = 0x00, - [SPECIES_NINETALES-1] = 0x00, - [SPECIES_JIGGLYPUFF-1] = 0x00, - [SPECIES_WIGGLYTUFF-1] = 0x00, - [SPECIES_ZUBAT-1] = 0x00, - [SPECIES_GOLBAT-1] = 0x00, - [SPECIES_ODDISH-1] = 0x00, - [SPECIES_GLOOM-1] = 0x00, - [SPECIES_VILEPLUME-1] = 0x00, - [SPECIES_PARAS-1] = 0x0a, - [SPECIES_PARASECT-1] = 0x2d, - [SPECIES_VENONAT-1] = 0x14, - [SPECIES_VENOMOTH-1] = 0x00, - [SPECIES_DIGLETT-1] = 0x19, - [SPECIES_DUGTRIO-1] = 0x23, - [SPECIES_MEOWTH-1] = 0x28, - [SPECIES_PERSIAN-1] = 0x14, - [SPECIES_PSYDUCK-1] = 0x00, - [SPECIES_GOLDUCK-1] = 0x00, - [SPECIES_MANKEY-1] = 0x14, - [SPECIES_PRIMEAPE-1] = 0x00, - [SPECIES_GROWLITHE-1] = 0x1e, - [SPECIES_ARCANINE-1] = 0x28, - [SPECIES_POLIWAG-1] = 0x00, - [SPECIES_POLIWHIRL-1] = 0x05, - [SPECIES_POLIWRATH-1] = 0x00, - [SPECIES_ABRA-1] = 0x00, - [SPECIES_KADABRA-1] = 0x00, - [SPECIES_ALAKAZAM-1] = 0x00, - [SPECIES_MACHOP-1] = 0x00, - [SPECIES_MACHOKE-1] = 0x00, - [SPECIES_MACHAMP-1] = 0x00, - [SPECIES_BELLSPROUT-1] = 0x00, - [SPECIES_WEEPINBELL-1] = 0x03, - [SPECIES_VICTREEBEL-1] = 0x00, - [SPECIES_TENTACOOL-1] = 0x00, - [SPECIES_TENTACRUEL-1] = 0x00, - [SPECIES_GEODUDE-1] = 0x00, - [SPECIES_GRAVELER-1] = 0x00, - [SPECIES_GOLEM-1] = 0x00, - [SPECIES_PONYTA-1] = 0x00, - [SPECIES_RAPIDASH-1] = 0x00, - [SPECIES_SLOWPOKE-1] = 0x00, - [SPECIES_SLOWBRO-1] = 0x00, - [SPECIES_MAGNEMITE-1] = 0x00, - [SPECIES_MAGNETON-1] = 0x00, - [SPECIES_FARFETCHD-1] = 0x00, - [SPECIES_DODUO-1] = 0x00, - [SPECIES_DODRIO-1] = 0x00, - [SPECIES_SEEL-1] = 0x00, - [SPECIES_DEWGONG-1] = 0x00, - [SPECIES_GRIMER-1] = 0x00, - [SPECIES_MUK-1] = 0x2d, - [SPECIES_SHELLDER-1] = 0x14, - [SPECIES_CLOYSTER-1] = 0x00, - [SPECIES_GASTLY-1] = 0x00, - [SPECIES_HAUNTER-1] = 0x17, - [SPECIES_GENGAR-1] = 0x00, - [SPECIES_ONIX-1] = 0x00, - [SPECIES_DROWZEE-1] = 0x30, - [SPECIES_HYPNO-1] = 0x28, - [SPECIES_KRABBY-1] = 0x00, - [SPECIES_KINGLER-1] = 0x00, - [SPECIES_VOLTORB-1] = 0x00, - [SPECIES_ELECTRODE-1] = 0x00, - [SPECIES_EXEGGCUTE-1] = 0x00, - [SPECIES_EXEGGUTOR-1] = 0x00, - [SPECIES_CUBONE-1] = 0x00, - [SPECIES_MAROWAK-1] = 0x00, - [SPECIES_HITMONLEE-1] = 0x00, - [SPECIES_HITMONCHAN-1] = 0x19, - [SPECIES_LICKITUNG-1] = 0x00, - [SPECIES_KOFFING-1] = 0x00, - [SPECIES_WEEZING-1] = 0x00, - [SPECIES_RHYHORN-1] = 0x00, - [SPECIES_RHYDON-1] = 0x00, - [SPECIES_CHANSEY-1] = 0x00, - [SPECIES_TANGELA-1] = 0x00, - [SPECIES_KANGASKHAN-1] = 0x00, - [SPECIES_HORSEA-1] = 0x00, - [SPECIES_SEADRA-1] = 0x00, - [SPECIES_GOLDEEN-1] = 0x00, - [SPECIES_SEAKING-1] = 0x00, - [SPECIES_STARYU-1] = 0x00, - [SPECIES_STARMIE-1] = 0x00, - [SPECIES_MR_MIME-1] = 0x00, - [SPECIES_SCYTHER-1] = 0x0a, - [SPECIES_JYNX-1] = 0x00, - [SPECIES_ELECTABUZZ-1] = 0x00, - [SPECIES_MAGMAR-1] = 0x00, - [SPECIES_PINSIR-1] = 0x00, - [SPECIES_TAUROS-1] = 0x0a, - [SPECIES_MAGIKARP-1] = 0x00, - [SPECIES_GYARADOS-1] = 0x00, - [SPECIES_LAPRAS-1] = 0x00, - [SPECIES_DITTO-1] = 0x00, - [SPECIES_EEVEE-1] = 0x00, - [SPECIES_VAPOREON-1] = 0x00, - [SPECIES_JOLTEON-1] = 0x00, - [SPECIES_FLAREON-1] = 0x00, - [SPECIES_PORYGON-1] = 0x00, - [SPECIES_OMANYTE-1] = 0x00, - [SPECIES_OMASTAR-1] = 0x00, - [SPECIES_KABUTO-1] = 0x00, - [SPECIES_KABUTOPS-1] = 0x00, - [SPECIES_AERODACTYL-1] = 0x00, - [SPECIES_SNORLAX-1] = 0x00, - [SPECIES_ARTICUNO-1] = 0x00, - [SPECIES_ZAPDOS-1] = 0x00, - [SPECIES_MOLTRES-1] = 0x00, - [SPECIES_DRATINI-1] = 0x00, - [SPECIES_DRAGONAIR-1] = 0x00, - [SPECIES_DRAGONITE-1] = 0x00, - [SPECIES_MEWTWO-1] = 0x00, - [SPECIES_MEW-1] = 0x00, - [SPECIES_CHIKORITA-1] = 0x00, - [SPECIES_BAYLEEF-1] = 0x00, - [SPECIES_MEGANIUM-1] = 0x00, - [SPECIES_CYNDAQUIL-1] = 0x00, - [SPECIES_QUILAVA-1] = 0x00, - [SPECIES_TYPHLOSION-1] = 0x14, - [SPECIES_TOTODILE-1] = 0x00, - [SPECIES_CROCONAW-1] = 0x00, - [SPECIES_FERALIGATR-1] = 0x05, - [SPECIES_SENTRET-1] = 0x00, - [SPECIES_FURRET-1] = 0x00, - [SPECIES_HOOTHOOT-1] = 0x00, - [SPECIES_NOCTOWL-1] = 0x00, - [SPECIES_LEDYBA-1] = 0x00, - [SPECIES_LEDIAN-1] = 0x00, - [SPECIES_SPINARAK-1] = 0x00, - [SPECIES_ARIADOS-1] = 0x00, - [SPECIES_CROBAT-1] = 0x00, - [SPECIES_CHINCHOU-1] = 0x00, - [SPECIES_LANTURN-1] = 0x00, - [SPECIES_PICHU-1] = 0x00, - [SPECIES_CLEFFA-1] = 0x00, - [SPECIES_IGGLYBUFF-1] = 0x00, - [SPECIES_TOGEPI-1] = 0x00, - [SPECIES_TOGETIC-1] = 0x00, - [SPECIES_NATU-1] = 0x1e, - [SPECIES_XATU-1] = 0x00, - [SPECIES_MAREEP-1] = 0x32, - [SPECIES_FLAAFFY-1] = 0x00, - [SPECIES_AMPHAROS-1] = 0x0a, - [SPECIES_BELLOSSOM-1] = 0x00, - [SPECIES_MARILL-1] = 0x00, - [SPECIES_AZUMARILL-1] = 0x00, - [SPECIES_SUDOWOODO-1] = 0x00, - [SPECIES_POLITOED-1] = 0x28, - [SPECIES_HOPPIP-1] = 0x00, - [SPECIES_SKIPLOOM-1] = 0x00, - [SPECIES_JUMPLUFF-1] = 0x00, - [SPECIES_AIPOM-1] = 0x00, - [SPECIES_SUNKERN-1] = 0x00, - [SPECIES_SUNFLORA-1] = 0x00, - [SPECIES_YANMA-1] = 0x00, - [SPECIES_WOOPER-1] = 0x00, - [SPECIES_QUAGSIRE-1] = 0x00, - [SPECIES_ESPEON-1] = 0x00, - [SPECIES_UMBREON-1] = 0x00, - [SPECIES_MURKROW-1] = 0x00, - [SPECIES_SLOWKING-1] = 0x00, - [SPECIES_MISDREAVUS-1] = 0x00, - [SPECIES_UNOWN-1] = 0x00, - [SPECIES_WOBBUFFET-1] = 0x00, - [SPECIES_GIRAFARIG-1] = 0x00, - [SPECIES_PINECO-1] = 0x00, - [SPECIES_FORRETRESS-1] = 0x00, - [SPECIES_DUNSPARCE-1] = 0x0a, - [SPECIES_GLIGAR-1] = 0x00, - [SPECIES_STEELIX-1] = 0x2d, - [SPECIES_SNUBBULL-1] = 0x00, - [SPECIES_GRANBULL-1] = 0x00, - [SPECIES_QWILFISH-1] = 0x27, - [SPECIES_SCIZOR-1] = 0x13, - [SPECIES_SHUCKLE-1] = 0x00, - [SPECIES_HERACROSS-1] = 0x00, - [SPECIES_SNEASEL-1] = 0x00, - [SPECIES_TEDDIURSA-1] = 0x00, - [SPECIES_URSARING-1] = 0x00, - [SPECIES_SLUGMA-1] = 0x00, - [SPECIES_MAGCARGO-1] = 0x00, - [SPECIES_SWINUB-1] = 0x00, - [SPECIES_PILOSWINE-1] = 0x00, - [SPECIES_CORSOLA-1] = 0x00, - [SPECIES_REMORAID-1] = 0x00, - [SPECIES_OCTILLERY-1] = 0x14, - [SPECIES_DELIBIRD-1] = 0x00, - [SPECIES_MANTINE-1] = 0x00, - [SPECIES_SKARMORY-1] = 0x00, - [SPECIES_HOUNDOUR-1] = 0x00, - [SPECIES_HOUNDOOM-1] = 0x00, - [SPECIES_KINGDRA-1] = 0x00, - [SPECIES_PHANPY-1] = 0x00, - [SPECIES_DONPHAN-1] = 0x00, - [SPECIES_PORYGON2-1] = 0x00, - [SPECIES_STANTLER-1] = 0x00, - [SPECIES_SMEARGLE-1] = 0x00, - [SPECIES_TYROGUE-1] = 0x00, - [SPECIES_HITMONTOP-1] = 0x00, - [SPECIES_SMOOCHUM-1] = 0x28, - [SPECIES_ELEKID-1] = 0x00, - [SPECIES_MAGBY-1] = 0x00, - [SPECIES_MILTANK-1] = 0x00, - [SPECIES_BLISSEY-1] = 0x00, - [SPECIES_RAIKOU-1] = 0x00, - [SPECIES_ENTEI-1] = 0x00, - [SPECIES_SUICUNE-1] = 0x00, - [SPECIES_LARVITAR-1] = 0x00, - [SPECIES_PUPITAR-1] = 0x00, - [SPECIES_TYRANITAR-1] = 0x0a, - [SPECIES_LUGIA-1] = 0x14, - [SPECIES_HO_OH-1] = 0x00, - [SPECIES_CELEBI-1] = 0x00, - [SPECIES_OLD_UNOWN_B-1] = 0x00, - [SPECIES_OLD_UNOWN_C-1] = 0x00, - [SPECIES_OLD_UNOWN_D-1] = 0x00, - [SPECIES_OLD_UNOWN_E-1] = 0x00, - [SPECIES_OLD_UNOWN_F-1] = 0x00, - [SPECIES_OLD_UNOWN_G-1] = 0x00, - [SPECIES_OLD_UNOWN_H-1] = 0x00, - [SPECIES_OLD_UNOWN_I-1] = 0x00, - [SPECIES_OLD_UNOWN_J-1] = 0x00, - [SPECIES_OLD_UNOWN_K-1] = 0x00, - [SPECIES_OLD_UNOWN_L-1] = 0x00, - [SPECIES_OLD_UNOWN_M-1] = 0x00, - [SPECIES_OLD_UNOWN_N-1] = 0x00, - [SPECIES_OLD_UNOWN_O-1] = 0x00, - [SPECIES_OLD_UNOWN_P-1] = 0x00, - [SPECIES_OLD_UNOWN_Q-1] = 0x00, - [SPECIES_OLD_UNOWN_R-1] = 0x00, - [SPECIES_OLD_UNOWN_S-1] = 0x00, - [SPECIES_OLD_UNOWN_T-1] = 0x00, - [SPECIES_OLD_UNOWN_U-1] = 0x00, - [SPECIES_OLD_UNOWN_V-1] = 0x00, - [SPECIES_OLD_UNOWN_W-1] = 0x00, - [SPECIES_OLD_UNOWN_X-1] = 0x00, - [SPECIES_OLD_UNOWN_Y-1] = 0x00, - [SPECIES_OLD_UNOWN_Z-1] = 0x00, - [SPECIES_TREECKO-1] = 0x00, - [SPECIES_GROVYLE-1] = 0x00, - [SPECIES_SCEPTILE-1] = 0x00, - [SPECIES_TORCHIC-1] = 0x00, - [SPECIES_COMBUSKEN-1] = 0x00, - [SPECIES_BLAZIKEN-1] = 0x00, - [SPECIES_MUDKIP-1] = 0x00, - [SPECIES_MARSHTOMP-1] = 0x00, - [SPECIES_SWAMPERT-1] = 0x00, - [SPECIES_POOCHYENA-1] = 0x00, - [SPECIES_MIGHTYENA-1] = 0x00, - [SPECIES_ZIGZAGOON-1] = 0x00, - [SPECIES_LINOONE-1] = 0x00, - [SPECIES_WURMPLE-1] = 0x00, - [SPECIES_SILCOON-1] = 0x00, - [SPECIES_BEAUTIFLY-1] = 0x00, - [SPECIES_CASCOON-1] = 0x00, - [SPECIES_DUSTOX-1] = 0x00, - [SPECIES_LOTAD-1] = 0x00, - [SPECIES_LOMBRE-1] = 0x00, - [SPECIES_LUDICOLO-1] = 0x00, - [SPECIES_SEEDOT-1] = 0x00, - [SPECIES_NUZLEAF-1] = 0x00, - [SPECIES_SHIFTRY-1] = 0x00, - [SPECIES_NINCADA-1] = 0x00, - [SPECIES_NINJASK-1] = 0x00, - [SPECIES_SHEDINJA-1] = 0x00, - [SPECIES_TAILLOW-1] = 0x00, - [SPECIES_SWELLOW-1] = 0x00, - [SPECIES_SHROOMISH-1] = 0x00, - [SPECIES_BRELOOM-1] = 0x00, - [SPECIES_SPINDA-1] = 0x00, - [SPECIES_WINGULL-1] = 0x00, - [SPECIES_PELIPPER-1] = 0x00, - [SPECIES_SURSKIT-1] = 0x00, - [SPECIES_MASQUERAIN-1] = 0x00, - [SPECIES_WAILMER-1] = 0x00, - [SPECIES_WAILORD-1] = 0x0a, - [SPECIES_SKITTY-1] = 0x00, - [SPECIES_DELCATTY-1] = 0x00, - [SPECIES_KECLEON-1] = 0x1e, - [SPECIES_BALTOY-1] = 0x00, - [SPECIES_CLAYDOL-1] = 0x00, - [SPECIES_NOSEPASS-1] = 0x00, - [SPECIES_TORKOAL-1] = 0x00, - [SPECIES_SABLEYE-1] = 0x00, - [SPECIES_BARBOACH-1] = 0x00, - [SPECIES_WHISCASH-1] = 0x00, - [SPECIES_LUVDISC-1] = 0x00, - [SPECIES_CORPHISH-1] = 0x00, - [SPECIES_CRAWDAUNT-1] = 0x00, - [SPECIES_FEEBAS-1] = 0x00, - [SPECIES_MILOTIC-1] = 0x2d, - [SPECIES_CARVANHA-1] = 0x00, - [SPECIES_SHARPEDO-1] = 0x00, - [SPECIES_TRAPINCH-1] = 0x00, - [SPECIES_VIBRAVA-1] = 0x00, - [SPECIES_FLYGON-1] = 0x00, - [SPECIES_MAKUHITA-1] = 0x00, - [SPECIES_HARIYAMA-1] = 0x00, - [SPECIES_ELECTRIKE-1] = 0x00, - [SPECIES_MANECTRIC-1] = 0x00, - [SPECIES_NUMEL-1] = 0x00, - [SPECIES_CAMERUPT-1] = 0x00, - [SPECIES_SPHEAL-1] = 0x0f, - [SPECIES_SEALEO-1] = 0x00, - [SPECIES_WALREIN-1] = 0x00, - [SPECIES_CACNEA-1] = 0x00, - [SPECIES_CACTURNE-1] = 0x00, - [SPECIES_SNORUNT-1] = 0x14, - [SPECIES_GLALIE-1] = 0x00, - [SPECIES_LUNATONE-1] = 0x00, - [SPECIES_SOLROCK-1] = 0x00, - [SPECIES_AZURILL-1] = 0x00, - [SPECIES_SPOINK-1] = 0x00, - [SPECIES_GRUMPIG-1] = 0x0f, - [SPECIES_PLUSLE-1] = 0x00, - [SPECIES_MINUN-1] = 0x00, - [SPECIES_MAWILE-1] = 0x00, - [SPECIES_MEDITITE-1] = 0x00, - [SPECIES_MEDICHAM-1] = 0x00, - [SPECIES_SWABLU-1] = 0x00, - [SPECIES_ALTARIA-1] = 0x00, - [SPECIES_WYNAUT-1] = 0x0f, - [SPECIES_DUSKULL-1] = 0x00, - [SPECIES_DUSCLOPS-1] = 0x1e, - [SPECIES_ROSELIA-1] = 0x00, - [SPECIES_SLAKOTH-1] = 0x00, - [SPECIES_VIGOROTH-1] = 0x00, - [SPECIES_SLAKING-1] = 0x00, - [SPECIES_GULPIN-1] = 0x00, - [SPECIES_SWALOT-1] = 0x00, - [SPECIES_TROPIUS-1] = 0x00, - [SPECIES_WHISMUR-1] = 0x00, - [SPECIES_LOUDRED-1] = 0x00, - [SPECIES_EXPLOUD-1] = 0x00, - [SPECIES_CLAMPERL-1] = 0x00, - [SPECIES_HUNTAIL-1] = 0x00, - [SPECIES_GOREBYSS-1] = 0x00, - [SPECIES_ABSOL-1] = 0x2d, - [SPECIES_SHUPPET-1] = 0x00, - [SPECIES_BANETTE-1] = 0x00, - [SPECIES_SEVIPER-1] = 0x00, - [SPECIES_ZANGOOSE-1] = 0x00, - [SPECIES_RELICANTH-1] = 0x00, - [SPECIES_ARON-1] = 0x00, - [SPECIES_LAIRON-1] = 0x00, - [SPECIES_AGGRON-1] = 0x00, - [SPECIES_CASTFORM-1] = 0x00, - [SPECIES_VOLBEAT-1] = 0x00, - [SPECIES_ILLUMISE-1] = 0x00, - [SPECIES_LILEEP-1] = 0x00, - [SPECIES_CRADILY-1] = 0x00, - [SPECIES_ANORITH-1] = 0x00, - [SPECIES_ARMALDO-1] = 0x00, - [SPECIES_RALTS-1] = 0x00, - [SPECIES_KIRLIA-1] = 0x00, - [SPECIES_GARDEVOIR-1] = 0x00, - [SPECIES_BAGON-1] = 0x00, - [SPECIES_SHELGON-1] = 0x00, - [SPECIES_SALAMENCE-1] = 0x46, - [SPECIES_BELDUM-1] = 0x00, - [SPECIES_METANG-1] = 0x00, - [SPECIES_METAGROSS-1] = 0x00, - [SPECIES_REGIROCK-1] = 0x00, - [SPECIES_REGICE-1] = 0x00, - [SPECIES_REGISTEEL-1] = 0x00, - [SPECIES_KYOGRE-1] = 0x3c, - [SPECIES_GROUDON-1] = 0x00, - [SPECIES_RAYQUAZA-1] = 0x3c, - [SPECIES_LATIAS-1] = 0x00, - [SPECIES_LATIOS-1] = 0x00, - [SPECIES_JIRACHI-1] = 0x00, - [SPECIES_DEOXYS-1] = 0x00, - [SPECIES_CHIMECHO-1] = 0x00, + [SPECIES_BULBASAUR - 1] = 0x00, + [SPECIES_IVYSAUR - 1] = 0x00, + [SPECIES_VENUSAUR - 1] = 0x00, + [SPECIES_CHARMANDER - 1] = 0x00, + [SPECIES_CHARMELEON - 1] = 0x00, + [SPECIES_CHARIZARD - 1] = 0x00, + [SPECIES_SQUIRTLE - 1] = 0x00, + [SPECIES_WARTORTLE - 1] = 0x00, + [SPECIES_BLASTOISE - 1] = 0x32, + [SPECIES_CATERPIE - 1] = 0x00, + [SPECIES_METAPOD - 1] = 0x00, + [SPECIES_BUTTERFREE - 1] = 0x00, + [SPECIES_WEEDLE - 1] = 0x0a, + [SPECIES_KAKUNA - 1] = 0x14, + [SPECIES_BEEDRILL - 1] = 0x23, + [SPECIES_PIDGEY - 1] = 0x00, + [SPECIES_PIDGEOTTO - 1] = 0x19, + [SPECIES_PIDGEOT - 1] = 0x00, + [SPECIES_RATTATA - 1] = 0x00, + [SPECIES_RATICATE - 1] = 0x00, + [SPECIES_SPEAROW - 1] = 0x00, + [SPECIES_FEAROW - 1] = 0x02, + [SPECIES_EKANS - 1] = 0x1e, + [SPECIES_ARBOK - 1] = 0x00, + [SPECIES_PIKACHU - 1] = 0x00, + [SPECIES_RAICHU - 1] = 0x00, + [SPECIES_SANDSHREW - 1] = 0x00, + [SPECIES_SANDSLASH - 1] = 0x00, + [SPECIES_NIDORAN_F - 1] = 0x1c, + [SPECIES_NIDORINA - 1] = 0x00, + [SPECIES_NIDOQUEEN - 1] = 0x00, + [SPECIES_NIDORAN_M - 1] = 0x00, + [SPECIES_NIDORINO - 1] = 0x00, + [SPECIES_NIDOKING - 1] = 0x19, + [SPECIES_CLEFAIRY - 1] = 0x00, + [SPECIES_CLEFABLE - 1] = 0x00, + [SPECIES_VULPIX - 1] = 0x00, + [SPECIES_NINETALES - 1] = 0x00, + [SPECIES_JIGGLYPUFF - 1] = 0x00, + [SPECIES_WIGGLYTUFF - 1] = 0x00, + [SPECIES_ZUBAT - 1] = 0x00, + [SPECIES_GOLBAT - 1] = 0x00, + [SPECIES_ODDISH - 1] = 0x00, + [SPECIES_GLOOM - 1] = 0x00, + [SPECIES_VILEPLUME - 1] = 0x00, + [SPECIES_PARAS - 1] = 0x0a, + [SPECIES_PARASECT - 1] = 0x2d, + [SPECIES_VENONAT - 1] = 0x14, + [SPECIES_VENOMOTH - 1] = 0x00, + [SPECIES_DIGLETT - 1] = 0x19, + [SPECIES_DUGTRIO - 1] = 0x23, + [SPECIES_MEOWTH - 1] = 0x28, + [SPECIES_PERSIAN - 1] = 0x14, + [SPECIES_PSYDUCK - 1] = 0x00, + [SPECIES_GOLDUCK - 1] = 0x00, + [SPECIES_MANKEY - 1] = 0x14, + [SPECIES_PRIMEAPE - 1] = 0x00, + [SPECIES_GROWLITHE - 1] = 0x1e, + [SPECIES_ARCANINE - 1] = 0x28, + [SPECIES_POLIWAG - 1] = 0x00, + [SPECIES_POLIWHIRL - 1] = 0x05, + [SPECIES_POLIWRATH - 1] = 0x00, + [SPECIES_ABRA - 1] = 0x00, + [SPECIES_KADABRA - 1] = 0x00, + [SPECIES_ALAKAZAM - 1] = 0x00, + [SPECIES_MACHOP - 1] = 0x00, + [SPECIES_MACHOKE - 1] = 0x00, + [SPECIES_MACHAMP - 1] = 0x00, + [SPECIES_BELLSPROUT - 1] = 0x00, + [SPECIES_WEEPINBELL - 1] = 0x03, + [SPECIES_VICTREEBEL - 1] = 0x00, + [SPECIES_TENTACOOL - 1] = 0x00, + [SPECIES_TENTACRUEL - 1] = 0x00, + [SPECIES_GEODUDE - 1] = 0x00, + [SPECIES_GRAVELER - 1] = 0x00, + [SPECIES_GOLEM - 1] = 0x00, + [SPECIES_PONYTA - 1] = 0x00, + [SPECIES_RAPIDASH - 1] = 0x00, + [SPECIES_SLOWPOKE - 1] = 0x00, + [SPECIES_SLOWBRO - 1] = 0x00, + [SPECIES_MAGNEMITE - 1] = 0x00, + [SPECIES_MAGNETON - 1] = 0x00, + [SPECIES_FARFETCHD - 1] = 0x00, + [SPECIES_DODUO - 1] = 0x00, + [SPECIES_DODRIO - 1] = 0x00, + [SPECIES_SEEL - 1] = 0x00, + [SPECIES_DEWGONG - 1] = 0x00, + [SPECIES_GRIMER - 1] = 0x00, + [SPECIES_MUK - 1] = 0x2d, + [SPECIES_SHELLDER - 1] = 0x14, + [SPECIES_CLOYSTER - 1] = 0x00, + [SPECIES_GASTLY - 1] = 0x00, + [SPECIES_HAUNTER - 1] = 0x17, + [SPECIES_GENGAR - 1] = 0x00, + [SPECIES_ONIX - 1] = 0x00, + [SPECIES_DROWZEE - 1] = 0x30, + [SPECIES_HYPNO - 1] = 0x28, + [SPECIES_KRABBY - 1] = 0x00, + [SPECIES_KINGLER - 1] = 0x00, + [SPECIES_VOLTORB - 1] = 0x00, + [SPECIES_ELECTRODE - 1] = 0x00, + [SPECIES_EXEGGCUTE - 1] = 0x00, + [SPECIES_EXEGGUTOR - 1] = 0x00, + [SPECIES_CUBONE - 1] = 0x00, + [SPECIES_MAROWAK - 1] = 0x00, + [SPECIES_HITMONLEE - 1] = 0x00, + [SPECIES_HITMONCHAN - 1] = 0x19, + [SPECIES_LICKITUNG - 1] = 0x00, + [SPECIES_KOFFING - 1] = 0x00, + [SPECIES_WEEZING - 1] = 0x00, + [SPECIES_RHYHORN - 1] = 0x00, + [SPECIES_RHYDON - 1] = 0x00, + [SPECIES_CHANSEY - 1] = 0x00, + [SPECIES_TANGELA - 1] = 0x00, + [SPECIES_KANGASKHAN - 1] = 0x00, + [SPECIES_HORSEA - 1] = 0x00, + [SPECIES_SEADRA - 1] = 0x00, + [SPECIES_GOLDEEN - 1] = 0x00, + [SPECIES_SEAKING - 1] = 0x00, + [SPECIES_STARYU - 1] = 0x00, + [SPECIES_STARMIE - 1] = 0x00, + [SPECIES_MR_MIME - 1] = 0x00, + [SPECIES_SCYTHER - 1] = 0x0a, + [SPECIES_JYNX - 1] = 0x00, + [SPECIES_ELECTABUZZ - 1] = 0x00, + [SPECIES_MAGMAR - 1] = 0x00, + [SPECIES_PINSIR - 1] = 0x00, + [SPECIES_TAUROS - 1] = 0x0a, + [SPECIES_MAGIKARP - 1] = 0x00, + [SPECIES_GYARADOS - 1] = 0x00, + [SPECIES_LAPRAS - 1] = 0x00, + [SPECIES_DITTO - 1] = 0x00, + [SPECIES_EEVEE - 1] = 0x00, + [SPECIES_VAPOREON - 1] = 0x00, + [SPECIES_JOLTEON - 1] = 0x00, + [SPECIES_FLAREON - 1] = 0x00, + [SPECIES_PORYGON - 1] = 0x00, + [SPECIES_OMANYTE - 1] = 0x00, + [SPECIES_OMASTAR - 1] = 0x00, + [SPECIES_KABUTO - 1] = 0x00, + [SPECIES_KABUTOPS - 1] = 0x00, + [SPECIES_AERODACTYL - 1] = 0x00, + [SPECIES_SNORLAX - 1] = 0x00, + [SPECIES_ARTICUNO - 1] = 0x00, + [SPECIES_ZAPDOS - 1] = 0x00, + [SPECIES_MOLTRES - 1] = 0x00, + [SPECIES_DRATINI - 1] = 0x00, + [SPECIES_DRAGONAIR - 1] = 0x00, + [SPECIES_DRAGONITE - 1] = 0x00, + [SPECIES_MEWTWO - 1] = 0x00, + [SPECIES_MEW - 1] = 0x00, + [SPECIES_CHIKORITA - 1] = 0x00, + [SPECIES_BAYLEEF - 1] = 0x00, + [SPECIES_MEGANIUM - 1] = 0x00, + [SPECIES_CYNDAQUIL - 1] = 0x00, + [SPECIES_QUILAVA - 1] = 0x00, + [SPECIES_TYPHLOSION - 1] = 0x14, + [SPECIES_TOTODILE - 1] = 0x00, + [SPECIES_CROCONAW - 1] = 0x00, + [SPECIES_FERALIGATR - 1] = 0x05, + [SPECIES_SENTRET - 1] = 0x00, + [SPECIES_FURRET - 1] = 0x00, + [SPECIES_HOOTHOOT - 1] = 0x00, + [SPECIES_NOCTOWL - 1] = 0x00, + [SPECIES_LEDYBA - 1] = 0x00, + [SPECIES_LEDIAN - 1] = 0x00, + [SPECIES_SPINARAK - 1] = 0x00, + [SPECIES_ARIADOS - 1] = 0x00, + [SPECIES_CROBAT - 1] = 0x00, + [SPECIES_CHINCHOU - 1] = 0x00, + [SPECIES_LANTURN - 1] = 0x00, + [SPECIES_PICHU - 1] = 0x00, + [SPECIES_CLEFFA - 1] = 0x00, + [SPECIES_IGGLYBUFF - 1] = 0x00, + [SPECIES_TOGEPI - 1] = 0x00, + [SPECIES_TOGETIC - 1] = 0x00, + [SPECIES_NATU - 1] = 0x1e, + [SPECIES_XATU - 1] = 0x00, + [SPECIES_MAREEP - 1] = 0x32, + [SPECIES_FLAAFFY - 1] = 0x00, + [SPECIES_AMPHAROS - 1] = 0x0a, + [SPECIES_BELLOSSOM - 1] = 0x00, + [SPECIES_MARILL - 1] = 0x00, + [SPECIES_AZUMARILL - 1] = 0x00, + [SPECIES_SUDOWOODO - 1] = 0x00, + [SPECIES_POLITOED - 1] = 0x28, + [SPECIES_HOPPIP - 1] = 0x00, + [SPECIES_SKIPLOOM - 1] = 0x00, + [SPECIES_JUMPLUFF - 1] = 0x00, + [SPECIES_AIPOM - 1] = 0x00, + [SPECIES_SUNKERN - 1] = 0x00, + [SPECIES_SUNFLORA - 1] = 0x00, + [SPECIES_YANMA - 1] = 0x00, + [SPECIES_WOOPER - 1] = 0x00, + [SPECIES_QUAGSIRE - 1] = 0x00, + [SPECIES_ESPEON - 1] = 0x00, + [SPECIES_UMBREON - 1] = 0x00, + [SPECIES_MURKROW - 1] = 0x00, + [SPECIES_SLOWKING - 1] = 0x00, + [SPECIES_MISDREAVUS - 1] = 0x00, + [SPECIES_UNOWN - 1] = 0x00, + [SPECIES_WOBBUFFET - 1] = 0x00, + [SPECIES_GIRAFARIG - 1] = 0x00, + [SPECIES_PINECO - 1] = 0x00, + [SPECIES_FORRETRESS - 1] = 0x00, + [SPECIES_DUNSPARCE - 1] = 0x0a, + [SPECIES_GLIGAR - 1] = 0x00, + [SPECIES_STEELIX - 1] = 0x2d, + [SPECIES_SNUBBULL - 1] = 0x00, + [SPECIES_GRANBULL - 1] = 0x00, + [SPECIES_QWILFISH - 1] = 0x27, + [SPECIES_SCIZOR - 1] = 0x13, + [SPECIES_SHUCKLE - 1] = 0x00, + [SPECIES_HERACROSS - 1] = 0x00, + [SPECIES_SNEASEL - 1] = 0x00, + [SPECIES_TEDDIURSA - 1] = 0x00, + [SPECIES_URSARING - 1] = 0x00, + [SPECIES_SLUGMA - 1] = 0x00, + [SPECIES_MAGCARGO - 1] = 0x00, + [SPECIES_SWINUB - 1] = 0x00, + [SPECIES_PILOSWINE - 1] = 0x00, + [SPECIES_CORSOLA - 1] = 0x00, + [SPECIES_REMORAID - 1] = 0x00, + [SPECIES_OCTILLERY - 1] = 0x14, + [SPECIES_DELIBIRD - 1] = 0x00, + [SPECIES_MANTINE - 1] = 0x00, + [SPECIES_SKARMORY - 1] = 0x00, + [SPECIES_HOUNDOUR - 1] = 0x00, + [SPECIES_HOUNDOOM - 1] = 0x00, + [SPECIES_KINGDRA - 1] = 0x00, + [SPECIES_PHANPY - 1] = 0x00, + [SPECIES_DONPHAN - 1] = 0x00, + [SPECIES_PORYGON2 - 1] = 0x00, + [SPECIES_STANTLER - 1] = 0x00, + [SPECIES_SMEARGLE - 1] = 0x00, + [SPECIES_TYROGUE - 1] = 0x00, + [SPECIES_HITMONTOP - 1] = 0x00, + [SPECIES_SMOOCHUM - 1] = 0x28, + [SPECIES_ELEKID - 1] = 0x00, + [SPECIES_MAGBY - 1] = 0x00, + [SPECIES_MILTANK - 1] = 0x00, + [SPECIES_BLISSEY - 1] = 0x00, + [SPECIES_RAIKOU - 1] = 0x00, + [SPECIES_ENTEI - 1] = 0x00, + [SPECIES_SUICUNE - 1] = 0x00, + [SPECIES_LARVITAR - 1] = 0x00, + [SPECIES_PUPITAR - 1] = 0x00, + [SPECIES_TYRANITAR - 1] = 0x0a, + [SPECIES_LUGIA - 1] = 0x14, + [SPECIES_HO_OH - 1] = 0x00, + [SPECIES_CELEBI - 1] = 0x00, + [SPECIES_OLD_UNOWN_B - 1] = 0x00, + [SPECIES_OLD_UNOWN_C - 1] = 0x00, + [SPECIES_OLD_UNOWN_D - 1] = 0x00, + [SPECIES_OLD_UNOWN_E - 1] = 0x00, + [SPECIES_OLD_UNOWN_F - 1] = 0x00, + [SPECIES_OLD_UNOWN_G - 1] = 0x00, + [SPECIES_OLD_UNOWN_H - 1] = 0x00, + [SPECIES_OLD_UNOWN_I - 1] = 0x00, + [SPECIES_OLD_UNOWN_J - 1] = 0x00, + [SPECIES_OLD_UNOWN_K - 1] = 0x00, + [SPECIES_OLD_UNOWN_L - 1] = 0x00, + [SPECIES_OLD_UNOWN_M - 1] = 0x00, + [SPECIES_OLD_UNOWN_N - 1] = 0x00, + [SPECIES_OLD_UNOWN_O - 1] = 0x00, + [SPECIES_OLD_UNOWN_P - 1] = 0x00, + [SPECIES_OLD_UNOWN_Q - 1] = 0x00, + [SPECIES_OLD_UNOWN_R - 1] = 0x00, + [SPECIES_OLD_UNOWN_S - 1] = 0x00, + [SPECIES_OLD_UNOWN_T - 1] = 0x00, + [SPECIES_OLD_UNOWN_U - 1] = 0x00, + [SPECIES_OLD_UNOWN_V - 1] = 0x00, + [SPECIES_OLD_UNOWN_W - 1] = 0x00, + [SPECIES_OLD_UNOWN_X - 1] = 0x00, + [SPECIES_OLD_UNOWN_Y - 1] = 0x00, + [SPECIES_OLD_UNOWN_Z - 1] = 0x00, + [SPECIES_TREECKO - 1] = 0x00, + [SPECIES_GROVYLE - 1] = 0x00, + [SPECIES_SCEPTILE - 1] = 0x00, + [SPECIES_TORCHIC - 1] = 0x00, + [SPECIES_COMBUSKEN - 1] = 0x00, + [SPECIES_BLAZIKEN - 1] = 0x00, + [SPECIES_MUDKIP - 1] = 0x00, + [SPECIES_MARSHTOMP - 1] = 0x00, + [SPECIES_SWAMPERT - 1] = 0x00, + [SPECIES_POOCHYENA - 1] = 0x00, + [SPECIES_MIGHTYENA - 1] = 0x00, + [SPECIES_ZIGZAGOON - 1] = 0x00, + [SPECIES_LINOONE - 1] = 0x00, + [SPECIES_WURMPLE - 1] = 0x00, + [SPECIES_SILCOON - 1] = 0x00, + [SPECIES_BEAUTIFLY - 1] = 0x00, + [SPECIES_CASCOON - 1] = 0x00, + [SPECIES_DUSTOX - 1] = 0x00, + [SPECIES_LOTAD - 1] = 0x00, + [SPECIES_LOMBRE - 1] = 0x00, + [SPECIES_LUDICOLO - 1] = 0x00, + [SPECIES_SEEDOT - 1] = 0x00, + [SPECIES_NUZLEAF - 1] = 0x00, + [SPECIES_SHIFTRY - 1] = 0x00, + [SPECIES_NINCADA - 1] = 0x00, + [SPECIES_NINJASK - 1] = 0x00, + [SPECIES_SHEDINJA - 1] = 0x00, + [SPECIES_TAILLOW - 1] = 0x00, + [SPECIES_SWELLOW - 1] = 0x00, + [SPECIES_SHROOMISH - 1] = 0x00, + [SPECIES_BRELOOM - 1] = 0x00, + [SPECIES_SPINDA - 1] = 0x00, + [SPECIES_WINGULL - 1] = 0x00, + [SPECIES_PELIPPER - 1] = 0x00, + [SPECIES_SURSKIT - 1] = 0x00, + [SPECIES_MASQUERAIN - 1] = 0x00, + [SPECIES_WAILMER - 1] = 0x00, + [SPECIES_WAILORD - 1] = 0x0a, + [SPECIES_SKITTY - 1] = 0x00, + [SPECIES_DELCATTY - 1] = 0x00, + [SPECIES_KECLEON - 1] = 0x1e, + [SPECIES_BALTOY - 1] = 0x00, + [SPECIES_CLAYDOL - 1] = 0x00, + [SPECIES_NOSEPASS - 1] = 0x00, + [SPECIES_TORKOAL - 1] = 0x00, + [SPECIES_SABLEYE - 1] = 0x00, + [SPECIES_BARBOACH - 1] = 0x00, + [SPECIES_WHISCASH - 1] = 0x00, + [SPECIES_LUVDISC - 1] = 0x00, + [SPECIES_CORPHISH - 1] = 0x00, + [SPECIES_CRAWDAUNT - 1] = 0x00, + [SPECIES_FEEBAS - 1] = 0x00, + [SPECIES_MILOTIC - 1] = 0x2d, + [SPECIES_CARVANHA - 1] = 0x00, + [SPECIES_SHARPEDO - 1] = 0x00, + [SPECIES_TRAPINCH - 1] = 0x00, + [SPECIES_VIBRAVA - 1] = 0x00, + [SPECIES_FLYGON - 1] = 0x00, + [SPECIES_MAKUHITA - 1] = 0x00, + [SPECIES_HARIYAMA - 1] = 0x00, + [SPECIES_ELECTRIKE - 1] = 0x00, + [SPECIES_MANECTRIC - 1] = 0x00, + [SPECIES_NUMEL - 1] = 0x00, + [SPECIES_CAMERUPT - 1] = 0x00, + [SPECIES_SPHEAL - 1] = 0x0f, + [SPECIES_SEALEO - 1] = 0x00, + [SPECIES_WALREIN - 1] = 0x00, + [SPECIES_CACNEA - 1] = 0x00, + [SPECIES_CACTURNE - 1] = 0x00, + [SPECIES_SNORUNT - 1] = 0x14, + [SPECIES_GLALIE - 1] = 0x00, + [SPECIES_LUNATONE - 1] = 0x00, + [SPECIES_SOLROCK - 1] = 0x00, + [SPECIES_AZURILL - 1] = 0x00, + [SPECIES_SPOINK - 1] = 0x00, + [SPECIES_GRUMPIG - 1] = 0x0f, + [SPECIES_PLUSLE - 1] = 0x00, + [SPECIES_MINUN - 1] = 0x00, + [SPECIES_MAWILE - 1] = 0x00, + [SPECIES_MEDITITE - 1] = 0x00, + [SPECIES_MEDICHAM - 1] = 0x00, + [SPECIES_SWABLU - 1] = 0x00, + [SPECIES_ALTARIA - 1] = 0x00, + [SPECIES_WYNAUT - 1] = 0x0f, + [SPECIES_DUSKULL - 1] = 0x00, + [SPECIES_DUSCLOPS - 1] = 0x1e, + [SPECIES_ROSELIA - 1] = 0x00, + [SPECIES_SLAKOTH - 1] = 0x00, + [SPECIES_VIGOROTH - 1] = 0x00, + [SPECIES_SLAKING - 1] = 0x00, + [SPECIES_GULPIN - 1] = 0x00, + [SPECIES_SWALOT - 1] = 0x00, + [SPECIES_TROPIUS - 1] = 0x00, + [SPECIES_WHISMUR - 1] = 0x00, + [SPECIES_LOUDRED - 1] = 0x00, + [SPECIES_EXPLOUD - 1] = 0x00, + [SPECIES_CLAMPERL - 1] = 0x00, + [SPECIES_HUNTAIL - 1] = 0x00, + [SPECIES_GOREBYSS - 1] = 0x00, + [SPECIES_ABSOL - 1] = 0x2d, + [SPECIES_SHUPPET - 1] = 0x00, + [SPECIES_BANETTE - 1] = 0x00, + [SPECIES_SEVIPER - 1] = 0x00, + [SPECIES_ZANGOOSE - 1] = 0x00, + [SPECIES_RELICANTH - 1] = 0x00, + [SPECIES_ARON - 1] = 0x00, + [SPECIES_LAIRON - 1] = 0x00, + [SPECIES_AGGRON - 1] = 0x00, + [SPECIES_CASTFORM - 1] = 0x00, + [SPECIES_VOLBEAT - 1] = 0x00, + [SPECIES_ILLUMISE - 1] = 0x00, + [SPECIES_LILEEP - 1] = 0x00, + [SPECIES_CRADILY - 1] = 0x00, + [SPECIES_ANORITH - 1] = 0x00, + [SPECIES_ARMALDO - 1] = 0x00, + [SPECIES_RALTS - 1] = 0x00, + [SPECIES_KIRLIA - 1] = 0x00, + [SPECIES_GARDEVOIR - 1] = 0x00, + [SPECIES_BAGON - 1] = 0x00, + [SPECIES_SHELGON - 1] = 0x00, + [SPECIES_SALAMENCE - 1] = 0x46, + [SPECIES_BELDUM - 1] = 0x00, + [SPECIES_METANG - 1] = 0x00, + [SPECIES_METAGROSS - 1] = 0x00, + [SPECIES_REGIROCK - 1] = 0x00, + [SPECIES_REGICE - 1] = 0x00, + [SPECIES_REGISTEEL - 1] = 0x00, + [SPECIES_KYOGRE - 1] = 0x3c, + [SPECIES_GROUDON - 1] = 0x00, + [SPECIES_RAYQUAZA - 1] = 0x3c, + [SPECIES_LATIAS - 1] = 0x00, + [SPECIES_LATIOS - 1] = 0x00, + [SPECIES_JIRACHI - 1] = 0x00, + [SPECIES_DEOXYS - 1] = 0x00, + [SPECIES_CHIMECHO - 1] = 0x00, }; const u8 gUnknown_08329D22[] = {0x03, 0x0c, 0x30, 0xc0}; // Masks for getting PP Up count, also PP Max values -- cgit v1.2.3 From f50faac244dab668b1d7f95dc276615888a5ed55 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sat, 8 Dec 2018 14:10:30 +0800 Subject: Clean more tables --- src/battle_main.c | 50 +-- src/battle_message.c | 738 ++++++++++++++++++------------------- src/data/pokemon/cry_ids.h | 270 +++++++------- src/pokemon_icon.c | 880 ++++++++++++++++++++++----------------------- 4 files changed, 969 insertions(+), 969 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index 0437eaef4..e275eee9e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -507,35 +507,35 @@ const struct TrainerMoney gTrainerMoneyTable[] = static void (* const sTurnActionsFuncsTable[])(void) = { - HandleAction_UseMove, // B_ACTION_USE_MOVE - HandleAction_UseItem, // B_ACTION_USE_ITEM - HandleAction_Switch, // B_ACTION_SWITCH - HandleAction_Run, // B_ACTION_RUN - HandleAction_WatchesCarefully, // B_ACTION_SAFARI_WATCH_CAREFULLY - HandleAction_SafariZoneBallThrow, // B_ACTION_SAFARI_BALL - HandleAction_ThrowPokeblock, // B_ACTION_SAFARI_POKEBLOCK - HandleAction_GoNear, // B_ACTION_SAFARI_GO_NEAR - HandleAction_SafariZoneRun, // B_ACTION_SAFARI_RUN - HandleAction_WallyBallThrow, // B_ACTION_WALLY_THROW - HandleAction_RunBattleScript, // B_ACTION_EXEC_SCRIPT - HandleAction_Action11, // not sure about this one - HandleAction_ActionFinished, // B_ACTION_FINISHED - HandleAction_NothingIsFainted, // B_ACTION_NOTHING_FAINTED + [B_ACTION_USE_MOVE] = HandleAction_UseMove, + [B_ACTION_USE_ITEM] = HandleAction_UseItem, + [B_ACTION_SWITCH] = HandleAction_Switch, + [B_ACTION_RUN] = HandleAction_Run, + [B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully, + [B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow, + [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowPokeblock, + [B_ACTION_SAFARI_GO_NEAR] = HandleAction_GoNear, + [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun, + [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow, + [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript, + [11] = HandleAction_Action11, // not sure about this one + [B_ACTION_FINISHED] = HandleAction_ActionFinished, + [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted, }; static void (* const sEndTurnFuncsTable[])(void) = { - HandleEndTurn_ContinueBattle, // battle outcome 0 - HandleEndTurn_BattleWon, // B_OUTCOME_WON - HandleEndTurn_BattleLost, // B_OUTCOME_LOST - HandleEndTurn_BattleLost, // B_OUTCOME_DREW - HandleEndTurn_RanFromBattle, // B_OUTCOME_RAN - HandleEndTurn_FinishBattle, // B_OUTCOME_PLAYER_TELEPORTED - HandleEndTurn_MonFled, // B_OUTCOME_MON_FLED - HandleEndTurn_FinishBattle, // B_OUTCOME_CAUGHT - HandleEndTurn_FinishBattle, // B_OUTCOME_NO_SAFARI_BALLS - HandleEndTurn_FinishBattle, // B_OUTCOME_FORFEITED - HandleEndTurn_FinishBattle, // B_OUTCOME_MON_TELEPORTED + [0] = HandleEndTurn_ContinueBattle, //B_OUTCOME_NONE? + [B_OUTCOME_WON] = HandleEndTurn_BattleWon, + [B_OUTCOME_LOST] = HandleEndTurn_BattleLost, + [B_OUTCOME_DREW] = HandleEndTurn_BattleLost, + [B_OUTCOME_RAN] = HandleEndTurn_RanFromBattle, + [B_OUTCOME_PLAYER_TELEPORTED] = HandleEndTurn_FinishBattle, + [B_OUTCOME_MON_FLED] = HandleEndTurn_MonFled, + [B_OUTCOME_CAUGHT] = HandleEndTurn_FinishBattle, + [B_OUTCOME_NO_SAFARI_BALLS] = HandleEndTurn_FinishBattle, + [B_OUTCOME_FORFEITED] = HandleEndTurn_FinishBattle, + [B_OUTCOME_MON_TELEPORTED] = HandleEndTurn_FinishBattle, }; const u8 gStatusConditionString_PoisonJpn[8] = _("ã©ã$$$$$"); diff --git a/src/battle_message.c b/src/battle_message.c index 7d74fb3cf..75f9b1da8 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -521,375 +521,375 @@ static const u8 sText_Trainer2LoseText[]; const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] = { - sText_Trainer1LoseText, // 12 - sText_PkmnGainedEXP, // 13 - sText_PkmnGrewToLv, // 14 - sText_PkmnLearnedMove, // 15 - sText_TryToLearnMove1, // 16 - sText_TryToLearnMove2, // 17 - sText_TryToLearnMove3, // 18 - sText_PkmnForgotMove, // 19 - sText_StopLearningMove, // 20 - sText_DidNotLearnMove, // 21 - sText_PkmnLearnedMove2, // 22 - sText_AttackMissed, // 23 - sText_PkmnProtectedItself, // 24 - sText_StatsWontIncrease2, // 25 - sText_AvoidedDamage, // 26 - sText_ItDoesntAffect, // 27 - sText_AttackerFainted, // 28 - sText_TargetFainted, // 29 - sText_PlayerGotMoney, // 30 - sText_PlayerWhiteout, // 31 - sText_PlayerWhiteout2, // 32 - sText_PreventsEscape, // 33 - sText_HitXTimes, // 34 - sText_PkmnFellAsleep, // 35 - sText_PkmnMadeSleep, // 36 - sText_PkmnAlreadyAsleep, // 37 - sText_PkmnAlreadyAsleep2, // 38 - sText_PkmnWasntAffected, // 39 - sText_PkmnWasPoisoned, // 40 - sText_PkmnPoisonedBy, // 41 - sText_PkmnHurtByPoison, // 42 - sText_PkmnAlreadyPoisoned, // 43 - sText_PkmnBadlyPoisoned, // 44 - sText_PkmnEnergyDrained, // 45 - sText_PkmnWasBurned, // 46 - sText_PkmnBurnedBy, // 47 - sText_PkmnHurtByBurn, // 48 - sText_PkmnWasFrozen, // 49 - sText_PkmnFrozenBy, // 50 - sText_PkmnIsFrozen, // 51 - sText_PkmnWasDefrosted, // 52 - sText_PkmnWasDefrosted2, // 53 - sText_PkmnWasDefrostedBy, // 54 - sText_PkmnWasParalyzed, // 55 - sText_PkmnWasParalyzedBy, // 56 - sText_PkmnIsParalyzed, // 57 - sText_PkmnIsAlreadyParalyzed, // 58 - sText_PkmnHealedParalysis, // 59 - sText_PkmnDreamEaten, // 60 - sText_StatsWontIncrease, // 61 - sText_StatsWontDecrease, // 62 - sText_TeamStoppedWorking, // 63 - sText_FoeStoppedWorking, // 64 - sText_PkmnIsConfused, // 65 - sText_PkmnHealedConfusion, // 66 - sText_PkmnWasConfused, // 67 - sText_PkmnAlreadyConfused, // 68 - sText_PkmnFellInLove, // 69 - sText_PkmnInLove, // 70 - sText_PkmnImmobilizedByLove, // 71 - sText_PkmnBlownAway, // 72 - sText_PkmnChangedType, // 73 - sText_PkmnFlinched, // 74 - sText_PkmnRegainedHealth, // 75 - sText_PkmnHPFull, // 76 - sText_PkmnRaisedSpDef, // 77 - sText_PkmnRaisedDef, // 78 - sText_PkmnCoveredByVeil, // 79 - sText_PkmnUsedSafeguard, // 80 - sText_PkmnSafeguardExpired, // 81 - sText_PkmnWentToSleep, // 82 - sText_PkmnSleptHealthy, // 83 - sText_PkmnWhippedWhirlwind, // 84 - sText_PkmnTookSunlight, // 85 - sText_PkmnLoweredHead, // 86 - sText_PkmnIsGlowing, // 87 - sText_PkmnFlewHigh, // 88 - sText_PkmnDugHole, // 89 - sText_PkmnSqueezedByBind, // 90 - sText_PkmnTrappedInVortex, // 91 - sText_PkmnWrappedBy, // 92 - sText_PkmnClamped, // 93 - sText_PkmnHurtBy, // 94 - sText_PkmnFreedFrom, // 95 - sText_PkmnCrashed, // 96 - gText_PkmnShroudedInMist, // 97 - sText_PkmnProtectedByMist, // 98 - gText_PkmnGettingPumped, // 99 - sText_PkmnHitWithRecoil, // 100 - sText_PkmnProtectedItself2, // 101 - sText_PkmnBuffetedBySandstorm, // 102 - sText_PkmnPeltedByHail, // 103 - sText_PkmnSeeded, // 104 - sText_PkmnEvadedAttack, // 105 - sText_PkmnSappedByLeechSeed, // 106 - sText_PkmnFastAsleep, // 107 - sText_PkmnWokeUp, // 108 - sText_PkmnUproarKeptAwake, // 109 - sText_PkmnWokeUpInUproar, // 110 - sText_PkmnCausedUproar, // 111 - sText_PkmnMakingUproar, // 112 - sText_PkmnCalmedDown, // 113 - sText_PkmnCantSleepInUproar, // 114 - sText_PkmnStockpiled, // 115 - sText_PkmnCantStockpile, // 116 - sText_PkmnCantSleepInUproar2, // 117 - sText_UproarKeptPkmnAwake, // 118 - sText_PkmnStayedAwakeUsing, // 119 - sText_PkmnStoringEnergy, // 120 - sText_PkmnUnleashedEnergy, // 121 - sText_PkmnFatigueConfusion, // 122 - sText_PkmnPickedUpItem, // 123 - sText_PkmnUnaffected, // 124 - sText_PkmnTransformedInto, // 125 - sText_PkmnMadeSubstitute, // 126 - sText_PkmnHasSubstitute, // 127 - sText_SubstituteDamaged, // 128 - sText_PkmnSubstituteFaded, // 129 - sText_PkmnMustRecharge, // 130 - sText_PkmnRageBuilding, // 131 - sText_PkmnMoveWasDisabled, // 132 - sText_PkmnMoveIsDisabled, // 133 - sText_PkmnMoveDisabledNoMore, // 134 - sText_PkmnGotEncore, // 135 - sText_PkmnEncoreEnded, // 136 - sText_PkmnTookAim, // 137 - sText_PkmnSketchedMove, // 138 - sText_PkmnTryingToTakeFoe, // 139 - sText_PkmnTookFoe, // 140 - sText_PkmnReducedPP, // 141 - sText_PkmnStoleItem, // 142 - sText_TargetCantEscapeNow, // 143 - sText_PkmnFellIntoNightmare, // 144 - sText_PkmnLockedInNightmare, // 145 - sText_PkmnLaidCurse, // 146 - sText_PkmnAfflictedByCurse, // 147 - sText_SpikesScattered, // 148 - sText_PkmnHurtBySpikes, // 149 - sText_PkmnIdentified, // 150 - sText_PkmnPerishCountFell, // 151 - sText_PkmnBracedItself, // 152 - sText_PkmnEnduredHit, // 153 - sText_MagnitudeStrength, // 154 - sText_PkmnCutHPMaxedAttack, // 155 - sText_PkmnCopiedStatChanges, // 156 - sText_PkmnGotFree, // 157 - sText_PkmnShedLeechSeed, // 158 - sText_PkmnBlewAwaySpikes, // 159 - sText_PkmnFledFromBattle, // 160 - sText_PkmnForesawAttack, // 161 - sText_PkmnTookAttack, // 162 - sText_PkmnAttack, // 163 - sText_PkmnCenterAttention, // 164 - sText_PkmnChargingPower, // 165 - sText_NaturePowerTurnedInto, // 166 - sText_PkmnStatusNormal, // 167 - sText_PkmnHasNoMovesLeft, // 168 - sText_PkmnSubjectedToTorment, // 169 - sText_PkmnCantUseMoveTorment, // 170 - sText_PkmnTighteningFocus, // 171 - sText_PkmnFellForTaunt, // 172 - sText_PkmnCantUseMoveTaunt, // 173 - sText_PkmnReadyToHelp, // 174 - sText_PkmnSwitchedItems, // 175 - sText_PkmnCopiedFoe, // 176 - sText_PkmnMadeWish, // 177 - sText_PkmnWishCameTrue, // 178 - sText_PkmnPlantedRoots, // 179 - sText_PkmnAbsorbedNutrients, // 180 - sText_PkmnAnchoredItself, // 181 - sText_PkmnWasMadeDrowsy, // 182 - sText_PkmnKnockedOff, // 183 - sText_PkmnSwappedAbilities, // 184 - sText_PkmnSealedOpponentMove, // 185 - sText_PkmnCantUseMoveSealed, // 186 - sText_PkmnWantsGrudge, // 187 - sText_PkmnLostPPGrudge, // 188 - sText_PkmnShroudedItself, // 189 - sText_PkmnMoveBounced, // 190 - sText_PkmnWaitsForTarget, // 191 - sText_PkmnSnatchedMove, // 192 - sText_PkmnMadeItRain, // 193 - sText_PkmnRaisedSpeed, // 194 - sText_PkmnProtectedBy, // 195 - sText_PkmnPreventsUsage, // 196 - sText_PkmnRestoredHPUsing, // 197 - sText_PkmnChangedTypeWith, // 198 - sText_PkmnPreventsParalysisWith, // 199 - sText_PkmnPreventsRomanceWith, // 200 - sText_PkmnPreventsPoisoningWith, // 201 - sText_PkmnPreventsConfusionWith, // 202 - sText_PkmnRaisedFirePowerWith, // 203 - sText_PkmnAnchorsItselfWith, // 204 - sText_PkmnCutsAttackWith, // 205 - sText_PkmnPreventsStatLossWith, // 206 - sText_PkmnHurtsWith, // 207 - sText_PkmnTraced, // 208 - sText_StatSharply, // 209 - gText_StatRose, // 210 - sText_StatHarshly, // 211 - sText_StatFell, // 212 - sText_PkmnsStatChanged, // 213 - gText_PkmnsStatChanged2, // 214 - sText_PkmnsStatChanged3, // 215 - sText_PkmnsStatChanged4, // 216 - sText_CriticalHit, // 217 - sText_OneHitKO, // 218 - sText_123Poof, // 219 - sText_AndEllipsis, // 220 - sText_NotVeryEffective, // 221 - sText_SuperEffective, // 222 - sText_GotAwaySafely, // 223 - sText_WildPkmnFled, // 224 - sText_NoRunningFromTrainers, // 225 - sText_CantEscape, // 226 - sText_DontLeaveBirch, // 227 - sText_ButNothingHappened, // 228 - sText_ButItFailed, // 229 - sText_ItHurtConfusion, // 230 - sText_MirrorMoveFailed, // 231 - sText_StartedToRain, // 232 - sText_DownpourStarted, // 233 - sText_RainContinues, // 234 - sText_DownpourContinues, // 235 - sText_RainStopped, // 236 - sText_SandstormBrewed, // 237 - sText_SandstormRages, // 238 - sText_SandstormSubsided, // 239 - sText_SunlightGotBright, // 240 - sText_SunlightStrong, // 241 - sText_SunlightFaded, // 242 - sText_StartedHail, // 243 - sText_HailContinues, // 244 - sText_HailStopped, // 245 - sText_FailedToSpitUp, // 246 - sText_FailedToSwallow, // 247 - sText_WindBecameHeatWave, // 248 - sText_StatChangesGone, // 249 - sText_CoinsScattered, // 250 - sText_TooWeakForSubstitute, // 251 - sText_SharedPain, // 252 - sText_BellChimed, // 253 - sText_FaintInThree, // 254 - sText_NoPPLeft, // 255 - sText_ButNoPPLeft, // 256 - sText_PlayerUsedItem, // 257 - sText_WallyUsedItem, // 258 - sText_TrainerBlockedBall, // 259 - sText_DontBeAThief, // 260 - sText_ItDodgedBall, // 261 - sText_YouMissedPkmn, // 262 - sText_PkmnBrokeFree, // 263 - sText_ItAppearedCaught, // 264 - sText_AarghAlmostHadIt, // 265 - sText_ShootSoClose, // 266 - sText_GotchaPkmnCaught, // 267 - sText_GotchaPkmnCaught2, // 268 - sText_GiveNicknameCaptured, // 269 - sText_PkmnSentToPC, // 270 - sText_PkmnDataAddedToDex, // 271 - sText_ItIsRaining, // 272 - sText_SandstormIsRaging, // 273 - sText_CantEscape2, // 274 - sText_PkmnIgnoresAsleep, // 275 - sText_PkmnIgnoredOrders, // 276 - sText_PkmnBeganToNap, // 277 - sText_PkmnLoafing, // 278 - sText_PkmnWontObey, // 279 - sText_PkmnTurnedAway, // 280 - sText_PkmnPretendNotNotice, // 281 - sText_EnemyAboutToSwitchPkmn, // 282 - sText_CreptCloser, // 283 - sText_CantGetCloser, // 284 - sText_PkmnWatchingCarefully, // 285 - sText_PkmnCuriousAboutX, // 286 - sText_PkmnEnthralledByX, // 287 - sText_PkmnIgnoredX, // 288 - sText_ThrewPokeblockAtPkmn, // 289 - sText_OutOfSafariBalls, // 290 - sText_PkmnsItemCuredParalysis, // 291 - sText_PkmnsItemCuredPoison, // 292 - sText_PkmnsItemHealedBurn, // 293 - sText_PkmnsItemDefrostedIt, // 294 - sText_PkmnsItemWokeIt, // 295 - sText_PkmnsItemSnappedOut, // 296 - sText_PkmnsItemCuredProblem, // 297 - sText_PkmnsItemRestoredHealth, // 298 - sText_PkmnsItemRestoredPP, // 299 - sText_PkmnsItemRestoredStatus, // 300 - sText_PkmnsItemRestoredHPALittle, // 301 - sText_ItemAllowsOnlyYMove, // 302 - sText_PkmnHungOnWithX, // 303 - gText_EmptyString3, // 304 - sText_PkmnsXPreventsBurns, // 305 - sText_PkmnsXBlocksY, // 306 - sText_PkmnsXRestoredHPALittle2, // 307 - sText_PkmnsXWhippedUpSandstorm, // 308 - sText_PkmnsXPreventsYLoss, // 309 - sText_PkmnsXInfatuatedY, // 310 - sText_PkmnsXMadeYIneffective, // 311 - sText_PkmnsXCuredYProblem, // 312 - sText_ItSuckedLiquidOoze, // 313 - sText_PkmnTransformed, // 314 - sText_ElectricityWeakened, // 315 - sText_FireWeakened, // 316 - sText_PkmnHidUnderwater, // 317 - sText_PkmnSprangUp, // 318 - sText_HMMovesCantBeForgotten, // 319 - sText_XFoundOneY, // 320 - sText_PlayerDefeatedLinkTrainerTrainer1, // 321 - sText_SoothingAroma, // 322 - sText_ItemsCantBeUsedNow, // 323 - sText_ForXCommaYZ, // 324 - sText_UsingXTheYOfZN, // 325 - sText_PkmnUsedXToGetPumped, // 326 - sText_PkmnsXMadeYUseless, // 327 - sText_PkmnTrappedBySandTomb, // 328 - sText_EmptyString4, // 329 - sText_ABoosted, // 330 - sText_PkmnsXIntensifiedSun, // 331 - sText_PkmnMakesGroundMiss, // 332 - sText_YouThrowABallNowRight, // 333 - sText_PkmnsXTookAttack, // 334 - sText_PkmnChoseXAsDestiny, // 335 - sText_PkmnLostFocus, // 336 - sText_UseNextPkmn, // 337 - sText_PkmnFledUsingIts, // 338 - sText_PkmnFledUsing, // 339 - sText_PkmnWasDraggedOut, // 340 - sText_PreventedFromWorking, // 341 - sText_PkmnsItemNormalizedStatus, // 342 - sText_Trainer1UsedItem, // 343 - sText_BoxIsFull, // 344 - sText_PkmnAvoidedAttack, // 345 - sText_PkmnsXMadeItIneffective, // 346 - sText_PkmnsXPreventsFlinching, // 347 - sText_PkmnAlreadyHasBurn, // 348 - sText_StatsWontDecrease2, // 349 - sText_PkmnsXBlocksY2, // 350 - sText_PkmnsXWoreOff, // 351 - sText_PkmnRaisedDefALittle, // 352 - sText_PkmnRaisedSpDefALittle, // 353 - sText_TheWallShattered, // 354 - sText_PkmnsXPreventsYsZ, // 355 - sText_PkmnsXCuredItsYProblem, // 356 - sText_AttackerCantEscape, // 357 - sText_PkmnObtainedX, // 358 - sText_PkmnObtainedX2, // 359 - sText_PkmnObtainedXYObtainedZ, // 360 - sText_ButNoEffect, // 361 - sText_PkmnsXHadNoEffectOnY, // 362 - sText_TwoInGameTrainersDefeated, // 363 - sText_Trainer2LoseText, // 364 - sText_PkmnIncapableOfPower, // 365 - sText_GlintAppearsInEye, // 366 - sText_PkmnGettingIntoPosition, // 367 - sText_PkmnBeganGrowlingDeeply, // 368 - sText_PkmnEagerForMore, // 369 - sText_DefeatedOpponentByReferee, // 370 - sText_LostToOpponentByReferee, // 371 - sText_TiedOpponentByReferee, // 372 - sText_QuestionForfeitMatch, // 373 - sText_ForfeitedMatch, // 374 - gText_PkmnTransferredSomeonesPC, // 375 - gText_PkmnTransferredLanettesPC, // 376 - gText_PkmnBoxSomeonesPCFull, // 377 - gText_PkmnBoxLanettesPCFull, // 378 - sText_Trainer1WinText, // 379 - sText_Trainer2WinText, // 380 + [STRINGID_TRAINER1LOSETEXT - 12] = sText_Trainer1LoseText, + [STRINGID_PKMNGAINEDEXP - 12] = sText_PkmnGainedEXP, + [STRINGID_PKMNGREWTOLV - 12] = sText_PkmnGrewToLv, + [STRINGID_PKMNLEARNEDMOVE - 12] = sText_PkmnLearnedMove, + [STRINGID_TRYTOLEARNMOVE1 - 12] = sText_TryToLearnMove1, + [STRINGID_TRYTOLEARNMOVE2 - 12] = sText_TryToLearnMove2, + [STRINGID_TRYTOLEARNMOVE3 - 12] = sText_TryToLearnMove3, + [STRINGID_PKMNFORGOTMOVE - 12] = sText_PkmnForgotMove, + [STRINGID_STOPLEARNINGMOVE - 12] = sText_StopLearningMove, + [STRINGID_DIDNOTLEARNMOVE - 12] = sText_DidNotLearnMove, + [STRINGID_PKMNLEARNEDMOVE2 - 12] = sText_PkmnLearnedMove2, + [STRINGID_ATTACKMISSED - 12] = sText_AttackMissed, + [STRINGID_PKMNPROTECTEDITSELF - 12] = sText_PkmnProtectedItself, + [STRINGID_STATSWONTINCREASE2 - 12] = sText_StatsWontIncrease2, + [STRINGID_AVOIDEDDAMAGE - 12] = sText_AvoidedDamage, + [STRINGID_ITDOESNTAFFECT - 12] = sText_ItDoesntAffect, + [STRINGID_ATTACKERFAINTED - 12] = sText_AttackerFainted, + [STRINGID_TARGETFAINTED - 12] = sText_TargetFainted, + [STRINGID_PLAYERGOTMONEY - 12] = sText_PlayerGotMoney, + [STRINGID_PLAYERWHITEOUT - 12] = sText_PlayerWhiteout, + [STRINGID_PLAYERWHITEOUT2 - 12] = sText_PlayerWhiteout2, + [STRINGID_PREVENTSESCAPE - 12] = sText_PreventsEscape, + [STRINGID_HITXTIMES - 12] = sText_HitXTimes, + [STRINGID_PKMNFELLASLEEP - 12] = sText_PkmnFellAsleep, + [STRINGID_PKMNMADESLEEP - 12] = sText_PkmnMadeSleep, + [STRINGID_PKMNALREADYASLEEP - 12] = sText_PkmnAlreadyAsleep, + [STRINGID_PKMNALREADYASLEEP2 - 12] = sText_PkmnAlreadyAsleep2, + [STRINGID_PKMNWASNTAFFECTED - 12] = sText_PkmnWasntAffected, + [STRINGID_PKMNWASPOISONED - 12] = sText_PkmnWasPoisoned, + [STRINGID_PKMNPOISONEDBY - 12] = sText_PkmnPoisonedBy, + [STRINGID_PKMNHURTBYPOISON - 12] = sText_PkmnHurtByPoison, + [STRINGID_PKMNALREADYPOISONED - 12] = sText_PkmnAlreadyPoisoned, + [STRINGID_PKMNBADLYPOISONED - 12] = sText_PkmnBadlyPoisoned, + [STRINGID_PKMNENERGYDRAINED - 12] = sText_PkmnEnergyDrained, + [STRINGID_PKMNWASBURNED - 12] = sText_PkmnWasBurned, + [STRINGID_PKMNBURNEDBY - 12] = sText_PkmnBurnedBy, + [STRINGID_PKMNHURTBYBURN - 12] = sText_PkmnHurtByBurn, + [STRINGID_PKMNWASFROZEN - 12] = sText_PkmnWasFrozen, + [STRINGID_PKMNFROZENBY - 12] = sText_PkmnFrozenBy, + [STRINGID_PKMNISFROZEN - 12] = sText_PkmnIsFrozen, + [STRINGID_PKMNWASDEFROSTED - 12] = sText_PkmnWasDefrosted, + [STRINGID_PKMNWASDEFROSTED2 - 12] = sText_PkmnWasDefrosted2, + [STRINGID_PKMNWASDEFROSTEDBY - 12] = sText_PkmnWasDefrostedBy, + [STRINGID_PKMNWASPARALYZED - 12] = sText_PkmnWasParalyzed, + [STRINGID_PKMNWASPARALYZEDBY - 12] = sText_PkmnWasParalyzedBy, + [STRINGID_PKMNISPARALYZED - 12] = sText_PkmnIsParalyzed, + [STRINGID_PKMNISALREADYPARALYZED - 12] = sText_PkmnIsAlreadyParalyzed, + [STRINGID_PKMNHEALEDPARALYSIS - 12] = sText_PkmnHealedParalysis, + [STRINGID_PKMNDREAMEATEN - 12] = sText_PkmnDreamEaten, + [STRINGID_STATSWONTINCREASE - 12] = sText_StatsWontIncrease, + [STRINGID_STATSWONTDECREASE - 12] = sText_StatsWontDecrease, + [STRINGID_TEAMSTOPPEDWORKING - 12] = sText_TeamStoppedWorking, + [STRINGID_FOESTOPPEDWORKING - 12] = sText_FoeStoppedWorking, + [STRINGID_PKMNISCONFUSED - 12] = sText_PkmnIsConfused, + [STRINGID_PKMNHEALEDCONFUSION - 12] = sText_PkmnHealedConfusion, + [STRINGID_PKMNWASCONFUSED - 12] = sText_PkmnWasConfused, + [STRINGID_PKMNALREADYCONFUSED - 12] = sText_PkmnAlreadyConfused, + [STRINGID_PKMNFELLINLOVE - 12] = sText_PkmnFellInLove, + [STRINGID_PKMNINLOVE - 12] = sText_PkmnInLove, + [STRINGID_PKMNIMMOBILIZEDBYLOVE - 12] = sText_PkmnImmobilizedByLove, + [STRINGID_PKMNBLOWNAWAY - 12] = sText_PkmnBlownAway, + [STRINGID_PKMNCHANGEDTYPE - 12] = sText_PkmnChangedType, + [STRINGID_PKMNFLINCHED - 12] = sText_PkmnFlinched, + [STRINGID_PKMNREGAINEDHEALTH - 12] = sText_PkmnRegainedHealth, + [STRINGID_PKMNHPFULL - 12] = sText_PkmnHPFull, + [STRINGID_PKMNRAISEDSPDEF - 12] = sText_PkmnRaisedSpDef, + [STRINGID_PKMNRAISEDDEF - 12] = sText_PkmnRaisedDef, + [STRINGID_PKMNCOVEREDBYVEIL - 12] = sText_PkmnCoveredByVeil, + [STRINGID_PKMNUSEDSAFEGUARD - 12] = sText_PkmnUsedSafeguard, + [STRINGID_PKMNSAFEGUARDEXPIRED - 12] = sText_PkmnSafeguardExpired, + [STRINGID_PKMNWENTTOSLEEP - 12] = sText_PkmnWentToSleep, + [STRINGID_PKMNSLEPTHEALTHY - 12] = sText_PkmnSleptHealthy, + [STRINGID_PKMNWHIPPEDWHIRLWIND - 12] = sText_PkmnWhippedWhirlwind, + [STRINGID_PKMNTOOKSUNLIGHT - 12] = sText_PkmnTookSunlight, + [STRINGID_PKMNLOWEREDHEAD - 12] = sText_PkmnLoweredHead, + [STRINGID_PKMNISGLOWING - 12] = sText_PkmnIsGlowing, + [STRINGID_PKMNFLEWHIGH - 12] = sText_PkmnFlewHigh, + [STRINGID_PKMNDUGHOLE - 12] = sText_PkmnDugHole, + [STRINGID_PKMNSQUEEZEDBYBIND - 12] = sText_PkmnSqueezedByBind, + [STRINGID_PKMNTRAPPEDINVORTEX - 12] = sText_PkmnTrappedInVortex, + [STRINGID_PKMNWRAPPEDBY - 12] = sText_PkmnWrappedBy, + [STRINGID_PKMNCLAMPED - 12] = sText_PkmnClamped, + [STRINGID_PKMNHURTBY - 12] = sText_PkmnHurtBy, + [STRINGID_PKMNFREEDFROM - 12] = sText_PkmnFreedFrom, + [STRINGID_PKMNCRASHED - 12] = sText_PkmnCrashed, + [STRINGID_PKMNSHROUDEDINMIST - 12] = gText_PkmnShroudedInMist, + [STRINGID_PKMNPROTECTEDBYMIST - 12] = sText_PkmnProtectedByMist, + [STRINGID_PKMNGETTINGPUMPED - 12] = gText_PkmnGettingPumped, + [STRINGID_PKMNHITWITHRECOIL - 12] = sText_PkmnHitWithRecoil, + [STRINGID_PKMNPROTECTEDITSELF2 - 12] = sText_PkmnProtectedItself2, + [STRINGID_PKMNBUFFETEDBYSANDSTORM - 12] = sText_PkmnBuffetedBySandstorm, + [STRINGID_PKMNPELTEDBYHAIL - 12] = sText_PkmnPeltedByHail, + [STRINGID_PKMNSEEDED - 12] = sText_PkmnSeeded, + [STRINGID_PKMNEVADEDATTACK - 12] = sText_PkmnEvadedAttack, + [STRINGID_PKMNSAPPEDBYLEECHSEED - 12] = sText_PkmnSappedByLeechSeed, + [STRINGID_PKMNFASTASLEEP - 12] = sText_PkmnFastAsleep, + [STRINGID_PKMNWOKEUP - 12] = sText_PkmnWokeUp, + [STRINGID_PKMNUPROARKEPTAWAKE - 12] = sText_PkmnUproarKeptAwake, + [STRINGID_PKMNWOKEUPINUPROAR - 12] = sText_PkmnWokeUpInUproar, + [STRINGID_PKMNCAUSEDUPROAR - 12] = sText_PkmnCausedUproar, + [STRINGID_PKMNMAKINGUPROAR - 12] = sText_PkmnMakingUproar, + [STRINGID_PKMNCALMEDDOWN - 12] = sText_PkmnCalmedDown, + [STRINGID_PKMNCANTSLEEPINUPROAR - 12] = sText_PkmnCantSleepInUproar, + [STRINGID_PKMNSTOCKPILED - 12] = sText_PkmnStockpiled, + [STRINGID_PKMNCANTSTOCKPILE - 12] = sText_PkmnCantStockpile, + [STRINGID_PKMNCANTSLEEPINUPROAR2 - 12] = sText_PkmnCantSleepInUproar2, + [STRINGID_UPROARKEPTPKMNAWAKE - 12] = sText_UproarKeptPkmnAwake, + [STRINGID_PKMNSTAYEDAWAKEUSING - 12] = sText_PkmnStayedAwakeUsing, + [STRINGID_PKMNSTORINGENERGY - 12] = sText_PkmnStoringEnergy, + [STRINGID_PKMNUNLEASHEDENERGY - 12] = sText_PkmnUnleashedEnergy, + [STRINGID_PKMNFATIGUECONFUSION - 12] = sText_PkmnFatigueConfusion, + [STRINGID_PKMNPICKEDUPITEM - 12] = sText_PkmnPickedUpItem, + [STRINGID_PKMNUNAFFECTED - 12] = sText_PkmnUnaffected, + [STRINGID_PKMNTRANSFORMEDINTO - 12] = sText_PkmnTransformedInto, + [STRINGID_PKMNMADESUBSTITUTE - 12] = sText_PkmnMadeSubstitute, + [STRINGID_PKMNHASSUBSTITUTE - 12] = sText_PkmnHasSubstitute, + [STRINGID_SUBSTITUTEDAMAGED - 12] = sText_SubstituteDamaged, + [STRINGID_PKMNSUBSTITUTEFADED - 12] = sText_PkmnSubstituteFaded, + [STRINGID_PKMNMUSTRECHARGE - 12] = sText_PkmnMustRecharge, + [STRINGID_PKMNRAGEBUILDING - 12] = sText_PkmnRageBuilding, + [STRINGID_PKMNMOVEWASDISABLED - 12] = sText_PkmnMoveWasDisabled, + [STRINGID_PKMNMOVEISDISABLED - 12] = sText_PkmnMoveIsDisabled, + [STRINGID_PKMNMOVEDISABLEDNOMORE - 12] = sText_PkmnMoveDisabledNoMore, + [STRINGID_PKMNGOTENCORE - 12] = sText_PkmnGotEncore, + [STRINGID_PKMNENCOREENDED - 12] = sText_PkmnEncoreEnded, + [STRINGID_PKMNTOOKAIM - 12] = sText_PkmnTookAim, + [STRINGID_PKMNSKETCHEDMOVE - 12] = sText_PkmnSketchedMove, + [STRINGID_PKMNTRYINGTOTAKEFOE - 12] = sText_PkmnTryingToTakeFoe, + [STRINGID_PKMNTOOKFOE - 12] = sText_PkmnTookFoe, + [STRINGID_PKMNREDUCEDPP - 12] = sText_PkmnReducedPP, + [STRINGID_PKMNSTOLEITEM - 12] = sText_PkmnStoleItem, + [STRINGID_TARGETCANTESCAPENOW - 12] = sText_TargetCantEscapeNow, + [STRINGID_PKMNFELLINTONIGHTMARE - 12] = sText_PkmnFellIntoNightmare, + [STRINGID_PKMNLOCKEDINNIGHTMARE - 12] = sText_PkmnLockedInNightmare, + [STRINGID_PKMNLAIDCURSE - 12] = sText_PkmnLaidCurse, + [STRINGID_PKMNAFFLICTEDBYCURSE - 12] = sText_PkmnAfflictedByCurse, + [STRINGID_SPIKESSCATTERED - 12] = sText_SpikesScattered, + [STRINGID_PKMNHURTBYSPIKES - 12] = sText_PkmnHurtBySpikes, + [STRINGID_PKMNIDENTIFIED - 12] = sText_PkmnIdentified, + [STRINGID_PKMNPERISHCOUNTFELL - 12] = sText_PkmnPerishCountFell, + [STRINGID_PKMNBRACEDITSELF - 12] = sText_PkmnBracedItself, + [STRINGID_PKMNENDUREDHIT - 12] = sText_PkmnEnduredHit, + [STRINGID_MAGNITUDESTRENGTH - 12] = sText_MagnitudeStrength, + [STRINGID_PKMNCUTHPMAXEDATTACK - 12] = sText_PkmnCutHPMaxedAttack, + [STRINGID_PKMNCOPIEDSTATCHANGES - 12] = sText_PkmnCopiedStatChanges, + [STRINGID_PKMNGOTFREE - 12] = sText_PkmnGotFree, + [STRINGID_PKMNSHEDLEECHSEED - 12] = sText_PkmnShedLeechSeed, + [STRINGID_PKMNBLEWAWAYSPIKES - 12] = sText_PkmnBlewAwaySpikes, + [STRINGID_PKMNFLEDFROMBATTLE - 12] = sText_PkmnFledFromBattle, + [STRINGID_PKMNFORESAWATTACK - 12] = sText_PkmnForesawAttack, + [STRINGID_PKMNTOOKATTACK - 12] = sText_PkmnTookAttack, + [STRINGID_PKMNATTACK - 12] = sText_PkmnAttack, + [STRINGID_PKMNCENTERATTENTION - 12] = sText_PkmnCenterAttention, + [STRINGID_PKMNCHARGINGPOWER - 12] = sText_PkmnChargingPower, + [STRINGID_NATUREPOWERTURNEDINTO - 12] = sText_NaturePowerTurnedInto, + [STRINGID_PKMNSTATUSNORMAL - 12] = sText_PkmnStatusNormal, + [STRINGID_PKMNHASNOMOVESLEFT - 12] = sText_PkmnHasNoMovesLeft, + [STRINGID_PKMNSUBJECTEDTOTORMENT - 12] = sText_PkmnSubjectedToTorment, + [STRINGID_PKMNCANTUSEMOVETORMENT - 12] = sText_PkmnCantUseMoveTorment, + [STRINGID_PKMNTIGHTENINGFOCUS - 12] = sText_PkmnTighteningFocus, + [STRINGID_PKMNFELLFORTAUNT - 12] = sText_PkmnFellForTaunt, + [STRINGID_PKMNCANTUSEMOVETAUNT - 12] = sText_PkmnCantUseMoveTaunt, + [STRINGID_PKMNREADYTOHELP - 12] = sText_PkmnReadyToHelp, + [STRINGID_PKMNSWITCHEDITEMS - 12] = sText_PkmnSwitchedItems, + [STRINGID_PKMNCOPIEDFOE - 12] = sText_PkmnCopiedFoe, + [STRINGID_PKMNMADEWISH - 12] = sText_PkmnMadeWish, + [STRINGID_PKMNWISHCAMETRUE - 12] = sText_PkmnWishCameTrue, + [STRINGID_PKMNPLANTEDROOTS - 12] = sText_PkmnPlantedRoots, + [STRINGID_PKMNABSORBEDNUTRIENTS - 12] = sText_PkmnAbsorbedNutrients, + [STRINGID_PKMNANCHOREDITSELF - 12] = sText_PkmnAnchoredItself, + [STRINGID_PKMNWASMADEDROWSY - 12] = sText_PkmnWasMadeDrowsy, + [STRINGID_PKMNKNOCKEDOFF - 12] = sText_PkmnKnockedOff, + [STRINGID_PKMNSWAPPEDABILITIES - 12] = sText_PkmnSwappedAbilities, + [STRINGID_PKMNSEALEDOPPONENTMOVE - 12] = sText_PkmnSealedOpponentMove, + [STRINGID_PKMNCANTUSEMOVESEALED - 12] = sText_PkmnCantUseMoveSealed, + [STRINGID_PKMNWANTSGRUDGE - 12] = sText_PkmnWantsGrudge, + [STRINGID_PKMNLOSTPPGRUDGE - 12] = sText_PkmnLostPPGrudge, + [STRINGID_PKMNSHROUDEDITSELF - 12] = sText_PkmnShroudedItself, + [STRINGID_PKMNMOVEBOUNCED - 12] = sText_PkmnMoveBounced, + [STRINGID_PKMNWAITSFORTARGET - 12] = sText_PkmnWaitsForTarget, + [STRINGID_PKMNSNATCHEDMOVE - 12] = sText_PkmnSnatchedMove, + [STRINGID_PKMNMADEITRAIN - 12] = sText_PkmnMadeItRain, + [STRINGID_PKMNRAISEDSPEED - 12] = sText_PkmnRaisedSpeed, + [STRINGID_PKMNPROTECTEDBY - 12] = sText_PkmnProtectedBy, + [STRINGID_PKMNPREVENTSUSAGE - 12] = sText_PkmnPreventsUsage, + [STRINGID_PKMNRESTOREDHPUSING - 12] = sText_PkmnRestoredHPUsing, + [STRINGID_PKMNCHANGEDTYPEWITH - 12] = sText_PkmnChangedTypeWith, + [STRINGID_PKMNPREVENTSPARALYSISWITH - 12] = sText_PkmnPreventsParalysisWith, + [STRINGID_PKMNPREVENTSROMANCEWITH - 12] = sText_PkmnPreventsRomanceWith, + [STRINGID_PKMNPREVENTSPOISONINGWITH - 12] = sText_PkmnPreventsPoisoningWith, + [STRINGID_PKMNPREVENTSCONFUSIONWITH - 12] = sText_PkmnPreventsConfusionWith, + [STRINGID_PKMNRAISEDFIREPOWERWITH - 12] = sText_PkmnRaisedFirePowerWith, + [STRINGID_PKMNANCHORSITSELFWITH - 12] = sText_PkmnAnchorsItselfWith, + [STRINGID_PKMNCUTSATTACKWITH - 12] = sText_PkmnCutsAttackWith, + [STRINGID_PKMNPREVENTSSTATLOSSWITH - 12] = sText_PkmnPreventsStatLossWith, + [STRINGID_PKMNHURTSWITH - 12] = sText_PkmnHurtsWith, + [STRINGID_PKMNTRACED - 12] = sText_PkmnTraced, + [STRINGID_STATSHARPLY - 12] = sText_StatSharply, + [STRINGID_STATROSE - 12] = gText_StatRose, + [STRINGID_STATHARSHLY - 12] = sText_StatHarshly, + [STRINGID_STATFELL - 12] = sText_StatFell, + [STRINGID_PKMNSSTATCHANGED - 12] = sText_PkmnsStatChanged, + [STRINGID_PKMNSSTATCHANGED2 - 12] = gText_PkmnsStatChanged2, + [STRINGID_PKMNSSTATCHANGED3 - 12] = sText_PkmnsStatChanged3, + [STRINGID_PKMNSSTATCHANGED4 - 12] = sText_PkmnsStatChanged4, + [STRINGID_CRITICALHIT - 12] = sText_CriticalHit, + [STRINGID_ONEHITKO - 12] = sText_OneHitKO, + [STRINGID_123POOF - 12] = sText_123Poof, + [STRINGID_ANDELLIPSIS - 12] = sText_AndEllipsis, + [STRINGID_NOTVERYEFFECTIVE - 12] = sText_NotVeryEffective, + [STRINGID_SUPEREFFECTIVE - 12] = sText_SuperEffective, + [STRINGID_GOTAWAYSAFELY - 12] = sText_GotAwaySafely, + [STRINGID_WILDPKMNFLED - 12] = sText_WildPkmnFled, + [STRINGID_NORUNNINGFROMTRAINERS - 12] = sText_NoRunningFromTrainers, + [STRINGID_CANTESCAPE - 12] = sText_CantEscape, + [STRINGID_DONTLEAVEBIRCH - 12] = sText_DontLeaveBirch, + [STRINGID_BUTNOTHINGHAPPENED - 12] = sText_ButNothingHappened, + [STRINGID_BUTITFAILED - 12] = sText_ButItFailed, + [STRINGID_ITHURTCONFUSION - 12] = sText_ItHurtConfusion, + [STRINGID_MIRRORMOVEFAILED - 12] = sText_MirrorMoveFailed, + [STRINGID_STARTEDTORAIN - 12] = sText_StartedToRain, + [STRINGID_DOWNPOURSTARTED - 12] = sText_DownpourStarted, + [STRINGID_RAINCONTINUES - 12] = sText_RainContinues, + [STRINGID_DOWNPOURCONTINUES - 12] = sText_DownpourContinues, + [STRINGID_RAINSTOPPED - 12] = sText_RainStopped, + [STRINGID_SANDSTORMBREWED - 12] = sText_SandstormBrewed, + [STRINGID_SANDSTORMRAGES - 12] = sText_SandstormRages, + [STRINGID_SANDSTORMSUBSIDED - 12] = sText_SandstormSubsided, + [STRINGID_SUNLIGHTGOTBRIGHT - 12] = sText_SunlightGotBright, + [STRINGID_SUNLIGHTSTRONG - 12] = sText_SunlightStrong, + [STRINGID_SUNLIGHTFADED - 12] = sText_SunlightFaded, + [STRINGID_STARTEDHAIL - 12] = sText_StartedHail, + [STRINGID_HAILCONTINUES - 12] = sText_HailContinues, + [STRINGID_HAILSTOPPED - 12] = sText_HailStopped, + [STRINGID_FAILEDTOSPITUP - 12] = sText_FailedToSpitUp, + [STRINGID_FAILEDTOSWALLOW - 12] = sText_FailedToSwallow, + [STRINGID_WINDBECAMEHEATWAVE - 12] = sText_WindBecameHeatWave, + [STRINGID_STATCHANGESGONE - 12] = sText_StatChangesGone, + [STRINGID_COINSSCATTERED - 12] = sText_CoinsScattered, + [STRINGID_TOOWEAKFORSUBSTITUTE - 12] = sText_TooWeakForSubstitute, + [STRINGID_SHAREDPAIN - 12] = sText_SharedPain, + [STRINGID_BELLCHIMED - 12] = sText_BellChimed, + [STRINGID_FAINTINTHREE - 12] = sText_FaintInThree, + [STRINGID_NOPPLEFT - 12] = sText_NoPPLeft, + [STRINGID_BUTNOPPLEFT - 12] = sText_ButNoPPLeft, + [STRINGID_PLAYERUSEDITEM - 12] = sText_PlayerUsedItem, + [STRINGID_WALLYUSEDITEM - 12] = sText_WallyUsedItem, + [STRINGID_TRAINERBLOCKEDBALL - 12] = sText_TrainerBlockedBall, + [STRINGID_DONTBEATHIEF - 12] = sText_DontBeAThief, + [STRINGID_ITDODGEDBALL - 12] = sText_ItDodgedBall, + [STRINGID_YOUMISSEDPKMN - 12] = sText_YouMissedPkmn, + [STRINGID_PKMNBROKEFREE - 12] = sText_PkmnBrokeFree, + [STRINGID_ITAPPEAREDCAUGHT - 12] = sText_ItAppearedCaught, + [STRINGID_AARGHALMOSTHADIT - 12] = sText_AarghAlmostHadIt, + [STRINGID_SHOOTSOCLOSE - 12] = sText_ShootSoClose, + [STRINGID_GOTCHAPKMNCAUGHT - 12] = sText_GotchaPkmnCaught, + [STRINGID_GOTCHAPKMNCAUGHT2 - 12] = sText_GotchaPkmnCaught2, + [STRINGID_GIVENICKNAMECAPTURED - 12] = sText_GiveNicknameCaptured, + [STRINGID_PKMNSENTTOPC - 12] = sText_PkmnSentToPC, + [STRINGID_PKMNDATAADDEDTODEX - 12] = sText_PkmnDataAddedToDex, + [STRINGID_ITISRAINING - 12] = sText_ItIsRaining, + [STRINGID_SANDSTORMISRAGING - 12] = sText_SandstormIsRaging, + [STRINGID_CANTESCAPE2 - 12] = sText_CantEscape2, + [STRINGID_PKMNIGNORESASLEEP - 12] = sText_PkmnIgnoresAsleep, + [STRINGID_PKMNIGNOREDORDERS - 12] = sText_PkmnIgnoredOrders, + [STRINGID_PKMNBEGANTONAP - 12] = sText_PkmnBeganToNap, + [STRINGID_PKMNLOAFING - 12] = sText_PkmnLoafing, + [STRINGID_PKMNWONTOBEY - 12] = sText_PkmnWontObey, + [STRINGID_PKMNTURNEDAWAY - 12] = sText_PkmnTurnedAway, + [STRINGID_PKMNPRETENDNOTNOTICE - 12] = sText_PkmnPretendNotNotice, + [STRINGID_ENEMYABOUTTOSWITCHPKMN - 12] = sText_EnemyAboutToSwitchPkmn, + [STRINGID_CREPTCLOSER - 12] = sText_CreptCloser, + [STRINGID_CANTGETCLOSER - 12] = sText_CantGetCloser, + [STRINGID_PKMNWATCHINGCAREFULLY - 12] = sText_PkmnWatchingCarefully, + [STRINGID_PKMNCURIOUSABOUTX - 12] = sText_PkmnCuriousAboutX, + [STRINGID_PKMNENTHRALLEDBYX - 12] = sText_PkmnEnthralledByX, + [STRINGID_PKMNIGNOREDX - 12] = sText_PkmnIgnoredX, + [STRINGID_THREWPOKEBLOCKATPKMN - 12] = sText_ThrewPokeblockAtPkmn, + [STRINGID_OUTOFSAFARIBALLS - 12] = sText_OutOfSafariBalls, + [STRINGID_PKMNSITEMCUREDPARALYSIS - 12] = sText_PkmnsItemCuredParalysis, + [STRINGID_PKMNSITEMCUREDPOISON - 12] = sText_PkmnsItemCuredPoison, + [STRINGID_PKMNSITEMHEALEDBURN - 12] = sText_PkmnsItemHealedBurn, + [STRINGID_PKMNSITEMDEFROSTEDIT - 12] = sText_PkmnsItemDefrostedIt, + [STRINGID_PKMNSITEMWOKEIT - 12] = sText_PkmnsItemWokeIt, + [STRINGID_PKMNSITEMSNAPPEDOUT - 12] = sText_PkmnsItemSnappedOut, + [STRINGID_PKMNSITEMCUREDPROBLEM - 12] = sText_PkmnsItemCuredProblem, + [STRINGID_PKMNSITEMRESTOREDHEALTH - 12] = sText_PkmnsItemRestoredHealth, + [STRINGID_PKMNSITEMRESTOREDPP - 12] = sText_PkmnsItemRestoredPP, + [STRINGID_PKMNSITEMRESTOREDSTATUS - 12] = sText_PkmnsItemRestoredStatus, + [STRINGID_PKMNSITEMRESTOREDHPALITTLE - 12] = sText_PkmnsItemRestoredHPALittle, + [STRINGID_ITEMALLOWSONLYYMOVE - 12] = sText_ItemAllowsOnlyYMove, + [STRINGID_PKMNHUNGONWITHX - 12] = sText_PkmnHungOnWithX, + [STRINGID_EMPTYSTRING3 - 12] = gText_EmptyString3, + [STRINGID_PKMNSXPREVENTSBURNS - 12] = sText_PkmnsXPreventsBurns, + [STRINGID_PKMNSXBLOCKSY - 12] = sText_PkmnsXBlocksY, + [STRINGID_PKMNSXRESTOREDHPALITTLE2 - 12] = sText_PkmnsXRestoredHPALittle2, + [STRINGID_PKMNSXWHIPPEDUPSANDSTORM - 12] = sText_PkmnsXWhippedUpSandstorm, + [STRINGID_PKMNSXPREVENTSYLOSS - 12] = sText_PkmnsXPreventsYLoss, + [STRINGID_PKMNSXINFATUATEDY - 12] = sText_PkmnsXInfatuatedY, + [STRINGID_PKMNSXMADEYINEFFECTIVE - 12] = sText_PkmnsXMadeYIneffective, + [STRINGID_PKMNSXCUREDYPROBLEM - 12] = sText_PkmnsXCuredYProblem, + [STRINGID_ITSUCKEDLIQUIDOOZE - 12] = sText_ItSuckedLiquidOoze, + [STRINGID_PKMNTRANSFORMED - 12] = sText_PkmnTransformed, + [STRINGID_ELECTRICITYWEAKENED - 12] = sText_ElectricityWeakened, + [STRINGID_FIREWEAKENED - 12] = sText_FireWeakened, + [STRINGID_PKMNHIDUNDERWATER - 12] = sText_PkmnHidUnderwater, + [STRINGID_PKMNSPRANGUP - 12] = sText_PkmnSprangUp, + [STRINGID_HMMOVESCANTBEFORGOTTEN - 12] = sText_HMMovesCantBeForgotten, + [STRINGID_XFOUNDONEY - 12] = sText_XFoundOneY, + [STRINGID_PLAYERDEFEATEDTRAINER1 - 12] = sText_PlayerDefeatedLinkTrainerTrainer1, + [STRINGID_SOOTHINGAROMA - 12] = sText_SoothingAroma, + [STRINGID_ITEMSCANTBEUSEDNOW - 12] = sText_ItemsCantBeUsedNow, + [STRINGID_FORXCOMMAYZ - 12] = sText_ForXCommaYZ, + [STRINGID_USINGXTHEYOFZN - 12] = sText_UsingXTheYOfZN, + [STRINGID_PKMNUSEDXTOGETPUMPED - 12] = sText_PkmnUsedXToGetPumped, + [STRINGID_PKMNSXMADEYUSELESS - 12] = sText_PkmnsXMadeYUseless, + [STRINGID_PKMNTRAPPEDBYSANDTOMB - 12] = sText_PkmnTrappedBySandTomb, + [STRINGID_EMPTYSTRING4 - 12] = sText_EmptyString4, + [STRINGID_ABOOSTED - 12] = sText_ABoosted, + [STRINGID_PKMNSXINTENSIFIEDSUN - 12] = sText_PkmnsXIntensifiedSun, + [STRINGID_PKMNMAKESGROUNDMISS - 12] = sText_PkmnMakesGroundMiss, + [STRINGID_YOUTHROWABALLNOWRIGHT - 12] = sText_YouThrowABallNowRight, + [STRINGID_PKMNSXTOOKATTACK - 12] = sText_PkmnsXTookAttack, + [STRINGID_PKMNCHOSEXASDESTINY - 12] = sText_PkmnChoseXAsDestiny, + [STRINGID_PKMNLOSTFOCUS - 12] = sText_PkmnLostFocus, + [STRINGID_USENEXTPKMN - 12] = sText_UseNextPkmn, + [STRINGID_PKMNFLEDUSINGITS - 12] = sText_PkmnFledUsingIts, + [STRINGID_PKMNFLEDUSING - 12] = sText_PkmnFledUsing, + [STRINGID_PKMNWASDRAGGEDOUT - 12] = sText_PkmnWasDraggedOut, + [STRINGID_PREVENTEDFROMWORKING - 12] = sText_PreventedFromWorking, + [STRINGID_PKMNSITEMNORMALIZEDSTATUS - 12] = sText_PkmnsItemNormalizedStatus, + [STRINGID_TRAINER1USEDITEM - 12] = sText_Trainer1UsedItem, + [STRINGID_BOXISFULL - 12] = sText_BoxIsFull, + [STRINGID_PKMNAVOIDEDATTACK - 12] = sText_PkmnAvoidedAttack, + [STRINGID_PKMNSXMADEITINEFFECTIVE - 12] = sText_PkmnsXMadeItIneffective, + [STRINGID_PKMNSXPREVENTSFLINCHING - 12] = sText_PkmnsXPreventsFlinching, + [STRINGID_PKMNALREADYHASBURN - 12] = sText_PkmnAlreadyHasBurn, + [STRINGID_STATSWONTDECREASE2 - 12] = sText_StatsWontDecrease2, + [STRINGID_PKMNSXBLOCKSY2 - 12] = sText_PkmnsXBlocksY2, + [STRINGID_PKMNSXWOREOFF - 12] = sText_PkmnsXWoreOff, + [STRINGID_PKMNRAISEDDEFALITTLE - 12] = sText_PkmnRaisedDefALittle, + [STRINGID_PKMNRAISEDSPDEFALITTLE - 12] = sText_PkmnRaisedSpDefALittle, + [STRINGID_THEWALLSHATTERED - 12] = sText_TheWallShattered, + [STRINGID_PKMNSXPREVENTSYSZ - 12] = sText_PkmnsXPreventsYsZ, + [STRINGID_PKMNSXCUREDITSYPROBLEM - 12] = sText_PkmnsXCuredItsYProblem, + [STRINGID_ATTACKERCANTESCAPE - 12] = sText_AttackerCantEscape, + [STRINGID_PKMNOBTAINEDX - 12] = sText_PkmnObtainedX, + [STRINGID_PKMNOBTAINEDX2 - 12] = sText_PkmnObtainedX2, + [STRINGID_PKMNOBTAINEDXYOBTAINEDZ - 12] = sText_PkmnObtainedXYObtainedZ, + [STRINGID_BUTNOEFFECT - 12] = sText_ButNoEffect, + [STRINGID_PKMNSXHADNOEFFECTONY - 12] = sText_PkmnsXHadNoEffectOnY, + [STRINGID_TWOENEMIESDEFEATED - 12] = sText_TwoInGameTrainersDefeated, + [STRINGID_TRAINER2LOSETEXT - 12] = sText_Trainer2LoseText, + [STRINGID_PKMNINCAPABLEOFPOWER - 12] = sText_PkmnIncapableOfPower, + [STRINGID_GLINTAPPEARSINEYE - 12] = sText_GlintAppearsInEye, + [STRINGID_PKMNGETTINGINTOPOSITION - 12] = sText_PkmnGettingIntoPosition, + [STRINGID_PKMNBEGANGROWLINGDEEPLY - 12] = sText_PkmnBeganGrowlingDeeply, + [STRINGID_PKMNEAGERFORMORE - 12] = sText_PkmnEagerForMore, + [STRINGID_DEFEATEDOPPONENTBYREFEREE - 12] = sText_DefeatedOpponentByReferee, + [STRINGID_LOSTTOOPPONENTBYREFEREE - 12] = sText_LostToOpponentByReferee, + [STRINGID_TIEDOPPONENTBYREFEREE - 12] = sText_TiedOpponentByReferee, + [STRINGID_QUESTIONFORFEITMATCH - 12] = sText_QuestionForfeitMatch, + [STRINGID_FORFEITEDMATCH - 12] = sText_ForfeitedMatch, + [STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = gText_PkmnTransferredSomeonesPC, + [STRINGID_PKMNTRANSFERREDLANETTESPC - 12] = gText_PkmnTransferredLanettesPC, + [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnBoxSomeonesPCFull, + [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnBoxLanettesPCFull, + [STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText, + [STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText, }; const u16 gMissStringIds[] = diff --git a/src/data/pokemon/cry_ids.h b/src/data/pokemon/cry_ids.h index 0c7dd8dad..e53ffd2a8 100644 --- a/src/data/pokemon/cry_ids.h +++ b/src/data/pokemon/cry_ids.h @@ -1,138 +1,138 @@ const u16 gSpeciesIdToCryId[] = { - 273, // TREECKO - 274, // GROVYLE - 275, // SCEPTILE - 270, // TORCHIC - 271, // COMBUSKEN - 272, // BLAZIKEN - 276, // MUDKIP - 277, // MARSHTOMP - 278, // SWAMPERT - 359, // POOCHYENA - 360, // MIGHTYENA - 378, // ZIGZAGOON - 375, // LINOONE - 290, // WURMPLE - 291, // SILCOON - 292, // BEAUTIFLY - 293, // CASCOON - 294, // DUSTOX - 283, // LOTAD - 284, // LOMBRE - 285, // LUDICOLO - 286, // SEEDOT - 287, // NUZLEAF - 288, // SHIFTRY - 301, // NINCADA - 302, // NINJASK - 303, // SHEDINJA - 266, // TAILLOW - 267, // SWELLOW - 374, // SHROOMISH - 373, // BRELOOM - 269, // SPINDA - 280, // WINGULL - 279, // PELIPPER - 310, // SURSKIT - 311, // MASQUERAIN - 377, // WAILMER - 381, // WAILORD - 312, // SKITTY - 313, // DELCATTY - 251, // KECLEON - 329, // BALTOY - 330, // CLAYDOL - 306, // NOSEPASS - 253, // TORKOAL - 362, // SABLEYE - 318, // BARBOACH - 319, // WHISCASH - 368, // LUVDISC - 320, // CORPHISH - 321, // CRAWDAUNT - 333, // FEEBAS - 334, // MILOTIC - 289, // CARVANHA - 260, // SHARPEDO - 324, // TRAPINCH - 325, // VIBRAVA - 326, // FLYGON - 304, // MAKUHITA - 305, // HARIYAMA - 254, // ELECTRIKE - 255, // MANECTRIC - 316, // NUMEL - 317, // CAMERUPT - 338, // SPHEAL - 339, // SEALEO - 340, // WALREIN - 327, // CACNEA - 328, // CACTURNE - 383, // SNORUNT - 307, // GLALIE - 331, // LUNATONE - 332, // SOLROCK - 262, // AZURILL - 322, // SPOINK - 323, // GRUMPIG - 308, // PLUSLE - 309, // MINUN - 363, // MAWILE - 336, // MEDITITE - 337, // MEDICHAM - 263, // SWABLU - 264, // ALTARIA - 258, // WYNAUT - 256, // DUSKULL - 361, // DUSCLOPS - 252, // ROSELIA - 298, // SLAKOTH - 299, // VIGOROTH - 300, // SLAKING - 314, // GULPIN - 315, // SWALOT - 376, // TROPIUS - 382, // WHISMUR - 380, // LOUDRED - 379, // EXPLOUD - 341, // CLAMPERL - 342, // HUNTAIL - 343, // GOREBYSS - 335, // ABSOL - 282, // SHUPPET - 281, // BANETTE - 259, // SEVIPER - 261, // ZANGOOSE - 367, // RELICANTH - 364, // ARON - 365, // LAIRON - 366, // AGGRON - 356, // CASTFORM - 357, // VOLBEAT - 358, // ILLUMISE - 344, // LILEEP - 345, // CRADILY - 346, // ANORITH - 347, // ARMALDO - 295, // RALTS - 296, // KIRLIA - 297, // GARDEVOIR - 351, // BAGON - 352, // SHELGON - 372, // SALAMENCE - 348, // BELDUM - 349, // METANG - 350, // METAGROSS - 353, // REGIROCK - 354, // REGICE - 355, // REGISTEEL - 370, // KYOGRE - 369, // GROUDON - 371, // RAYQUAZA - 257, // LATIAS - 384, // LATIOS - 385, // JIRACHI - 386, // DEOXYS - 387 // CHIMECHO + [SPECIES_TREECKO - 277] = 273, + [SPECIES_GROVYLE - 277] = 274, + [SPECIES_SCEPTILE - 277] = 275, + [SPECIES_TORCHIC - 277] = 270, + [SPECIES_COMBUSKEN - 277] = 271, + [SPECIES_BLAZIKEN - 277] = 272, + [SPECIES_MUDKIP - 277] = 276, + [SPECIES_MARSHTOMP - 277] = 277, + [SPECIES_SWAMPERT - 277] = 278, + [SPECIES_POOCHYENA - 277] = 359, + [SPECIES_MIGHTYENA - 277] = 360, + [SPECIES_ZIGZAGOON - 277] = 378, + [SPECIES_LINOONE - 277] = 375, + [SPECIES_WURMPLE - 277] = 290, + [SPECIES_SILCOON - 277] = 291, + [SPECIES_BEAUTIFLY - 277] = 292, + [SPECIES_CASCOON - 277] = 293, + [SPECIES_DUSTOX - 277] = 294, + [SPECIES_LOTAD - 277] = 283, + [SPECIES_LOMBRE - 277] = 284, + [SPECIES_LUDICOLO - 277] = 285, + [SPECIES_SEEDOT - 277] = 286, + [SPECIES_NUZLEAF - 277] = 287, + [SPECIES_SHIFTRY - 277] = 288, + [SPECIES_NINCADA - 277] = 301, + [SPECIES_NINJASK - 277] = 302, + [SPECIES_SHEDINJA - 277] = 303, + [SPECIES_TAILLOW - 277] = 266, + [SPECIES_SWELLOW - 277] = 267, + [SPECIES_SHROOMISH - 277] = 374, + [SPECIES_BRELOOM - 277] = 373, + [SPECIES_SPINDA - 277] = 269, + [SPECIES_WINGULL - 277] = 280, + [SPECIES_PELIPPER - 277] = 279, + [SPECIES_SURSKIT - 277] = 310, + [SPECIES_MASQUERAIN - 277] = 311, + [SPECIES_WAILMER - 277] = 377, + [SPECIES_WAILORD - 277] = 381, + [SPECIES_SKITTY - 277] = 312, + [SPECIES_DELCATTY - 277] = 313, + [SPECIES_KECLEON - 277] = 251, + [SPECIES_BALTOY - 277] = 329, + [SPECIES_CLAYDOL - 277] = 330, + [SPECIES_NOSEPASS - 277] = 306, + [SPECIES_TORKOAL - 277] = 253, + [SPECIES_SABLEYE - 277] = 362, + [SPECIES_BARBOACH - 277] = 318, + [SPECIES_WHISCASH - 277] = 319, + [SPECIES_LUVDISC - 277] = 368, + [SPECIES_CORPHISH - 277] = 320, + [SPECIES_CRAWDAUNT - 277] = 321, + [SPECIES_FEEBAS - 277] = 333, + [SPECIES_MILOTIC - 277] = 334, + [SPECIES_CARVANHA - 277] = 289, + [SPECIES_SHARPEDO - 277] = 260, + [SPECIES_TRAPINCH - 277] = 324, + [SPECIES_VIBRAVA - 277] = 325, + [SPECIES_FLYGON - 277] = 326, + [SPECIES_MAKUHITA - 277] = 304, + [SPECIES_HARIYAMA - 277] = 305, + [SPECIES_ELECTRIKE - 277] = 254, + [SPECIES_MANECTRIC - 277] = 255, + [SPECIES_NUMEL - 277] = 316, + [SPECIES_CAMERUPT - 277] = 317, + [SPECIES_SPHEAL - 277] = 338, + [SPECIES_SEALEO - 277] = 339, + [SPECIES_WALREIN - 277] = 340, + [SPECIES_CACNEA - 277] = 327, + [SPECIES_CACTURNE - 277] = 328, + [SPECIES_SNORUNT - 277] = 383, + [SPECIES_GLALIE - 277] = 307, + [SPECIES_LUNATONE - 277] = 331, + [SPECIES_SOLROCK - 277] = 332, + [SPECIES_AZURILL - 277] = 262, + [SPECIES_SPOINK - 277] = 322, + [SPECIES_GRUMPIG - 277] = 323, + [SPECIES_PLUSLE - 277] = 308, + [SPECIES_MINUN - 277] = 309, + [SPECIES_MAWILE - 277] = 363, + [SPECIES_MEDITITE - 277] = 336, + [SPECIES_MEDICHAM - 277] = 337, + [SPECIES_SWABLU - 277] = 263, + [SPECIES_ALTARIA - 277] = 264, + [SPECIES_WYNAUT - 277] = 258, + [SPECIES_DUSKULL - 277] = 256, + [SPECIES_DUSCLOPS - 277] = 361, + [SPECIES_ROSELIA - 277] = 252, + [SPECIES_SLAKOTH - 277] = 298, + [SPECIES_VIGOROTH - 277] = 299, + [SPECIES_SLAKING - 277] = 300, + [SPECIES_GULPIN - 277] = 314, + [SPECIES_SWALOT - 277] = 315, + [SPECIES_TROPIUS - 277] = 376, + [SPECIES_WHISMUR - 277] = 382, + [SPECIES_LOUDRED - 277] = 380, + [SPECIES_EXPLOUD - 277] = 379, + [SPECIES_CLAMPERL - 277] = 341, + [SPECIES_HUNTAIL - 277] = 342, + [SPECIES_GOREBYSS - 277] = 343, + [SPECIES_ABSOL - 277] = 335, + [SPECIES_SHUPPET - 277] = 282, + [SPECIES_BANETTE - 277] = 281, + [SPECIES_SEVIPER - 277] = 259, + [SPECIES_ZANGOOSE - 277] = 261, + [SPECIES_RELICANTH - 277] = 367, + [SPECIES_ARON - 277] = 364, + [SPECIES_LAIRON - 277] = 365, + [SPECIES_AGGRON - 277] = 366, + [SPECIES_CASTFORM - 277] = 356, + [SPECIES_VOLBEAT - 277] = 357, + [SPECIES_ILLUMISE - 277] = 358, + [SPECIES_LILEEP - 277] = 344, + [SPECIES_CRADILY - 277] = 345, + [SPECIES_ANORITH - 277] = 346, + [SPECIES_ARMALDO - 277] = 347, + [SPECIES_RALTS - 277] = 295, + [SPECIES_KIRLIA - 277] = 296, + [SPECIES_GARDEVOIR - 277] = 297, + [SPECIES_BAGON - 277] = 351, + [SPECIES_SHELGON - 277] = 352, + [SPECIES_SALAMENCE - 277] = 372, + [SPECIES_BELDUM - 277] = 348, + [SPECIES_METANG - 277] = 349, + [SPECIES_METAGROSS - 277] = 350, + [SPECIES_REGIROCK - 277] = 353, + [SPECIES_REGICE - 277] = 354, + [SPECIES_REGISTEEL - 277] = 355, + [SPECIES_KYOGRE - 277] = 370, + [SPECIES_GROUDON - 277] = 369, + [SPECIES_RAYQUAZA - 277] = 371, + [SPECIES_LATIAS - 277] = 257, + [SPECIES_LATIOS - 277] = 384, + [SPECIES_JIRACHI - 277] = 385, + [SPECIES_DEOXYS - 277] = 386, + [SPECIES_CHIMECHO - 277] = 387, }; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 994cc520e..e1e446007 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -469,446 +469,446 @@ const u8 *const gMonIconTable[] = const u8 gMonIconPaletteIndices[] = { - 0, // ?????????? - 1, // Bulbasaur - 1, // Ivysaur - 1, // Venusaur - 0, // Charmander - 0, // Charmeleon - 0, // Charizard - 0, // Squirtle - 2, // Wartortle - 2, // Blastoise - 1, // Caterpie - 1, // Metapod - 0, // Butterfree - 1, // Weedle - 2, // Kakuna - 2, // Beedrill - 0, // Pidgey - 0, // Pidgeotto - 0, // Pidgeot - 2, // Rattata - 1, // Raticate - 0, // Spearow - 0, // Fearow - 2, // Ekans - 2, // Arbok - 2, // Pikachu - 0, // Raichu - 2, // Sandshrew - 2, // Sandslash - 2, // Nidoran♀ - 2, // Nidorina - 2, // Nidoqueen - 2, // Nidoran♂ - 2, // Nidorino - 2, // Nidoking - 0, // Clefairy - 0, // Clefable - 2, // Vulpix - 1, // Ninetales - 0, // Jigglypuff - 0, // Wigglytuff - 2, // Zubat - 2, // Golbat - 1, // Oddish - 0, // Gloom - 0, // Vileplume - 0, // Paras - 0, // Parasect - 0, // Venonat - 2, // Venomoth - 2, // Diglett - 2, // Dugtrio - 1, // Meowth - 1, // Persian - 1, // Psyduck - 2, // Golduck - 1, // Mankey - 2, // Primeape - 0, // Growlithe - 0, // Arcanine - 0, // Poliwag - 0, // Poliwhirl - 0, // Poliwrath - 2, // Abra - 2, // Kadabra - 2, // Alakazam - 0, // Machop - 2, // Machoke - 0, // Machamp - 1, // Bellsprout - 1, // Weepinbell - 1, // Victreebel - 2, // Tentacool - 2, // Tentacruel - 1, // Geodude - 1, // Graveler - 1, // Golem - 0, // Ponyta - 0, // Rapidash - 0, // Slowpoke - 0, // Slowbro - 0, // Magnemite - 0, // Magneton - 1, // Farfetch'd - 2, // Doduo - 2, // Dodrio - 2, // Seel - 2, // Dewgong - 2, // Grimer - 2, // Muk - 2, // Shellder - 2, // Cloyster - 2, // Gastly - 2, // Haunter - 2, // Gengar - 2, // Onix - 2, // Drowzee - 1, // Hypno - 2, // Krabby - 2, // Kingler - 0, // Voltorb - 0, // Electrode - 0, // Exeggcute - 1, // Exeggutor - 1, // Cubone - 1, // Marowak - 2, // Hitmonlee - 2, // Hitmonchan - 1, // Lickitung - 2, // Koffing - 2, // Weezing - 1, // Rhyhorn - 1, // Rhydon - 0, // Chansey - 0, // Tangela - 1, // Kangaskhan - 0, // Horsea - 0, // Seadra - 0, // Goldeen - 0, // Seaking - 2, // Staryu - 2, // Starmie - 0, // Mr. mime - 1, // Scyther - 2, // Jynx - 1, // Electabuzz - 0, // Magmar - 2, // Pinsir - 2, // Tauros - 0, // Magikarp - 0, // Gyarados - 2, // Lapras - 2, // Ditto - 2, // Eevee - 0, // Vaporeon - 0, // Jolteon - 0, // Flareon - 0, // Porygon - 0, // Omanyte - 0, // Omastar - 2, // Kabuto - 2, // Kabutops - 0, // Aerodactyl - 1, // Snorlax - 0, // Articuno - 0, // Zapdos - 0, // Moltres - 0, // Dratini - 0, // Dragonair - 2, // Dragonite - 2, // Mewtwo - 0, // Mew - 1, // Chikorita - 1, // Bayleef - 1, // Meganium - 1, // Cyndaquil - 1, // Quilava - 1, // Typhlosion - 2, // Totodile - 2, // Croconaw - 2, // Feraligatr - 2, // Sentret - 2, // Furret - 2, // Hoothoot - 2, // Noctowl - 0, // Ledyba - 0, // Ledian - 1, // Spinarak - 0, // Ariados - 2, // Crobat - 2, // Chinchou - 0, // Lanturn - 0, // Pichu - 0, // Cleffa - 1, // Igglybuff - 2, // Togepi - 2, // Togetic - 0, // Natu - 0, // Xatu - 2, // Mareep - 0, // Flaaffy - 0, // Ampharos - 1, // Bellossom - 2, // Marill - 2, // Azumarill - 1, // Sudowoodo - 1, // Politoed - 1, // Hoppip - 1, // Skiploom - 2, // Jumpluff - 2, // Aipom - 1, // Sunkern - 1, // Sunflora - 1, // Yanma - 0, // Wooper - 0, // Quagsire - 2, // Espeon - 2, // Umbreon - 2, // Murkrow - 0, // Slowking - 0, // Misdreavus - 0, // Unown A - 0, // Wobbuffet - 1, // Girafarig - 0, // Pineco - 2, // Forretress - 2, // Dunsparce - 2, // Gligar - 0, // Steelix - 0, // Snubbull - 2, // Granbull - 0, // Qwilfish - 0, // Scizor - 1, // Shuckle - 2, // Heracross - 0, // Sneasel - 0, // Teddiursa - 2, // Ursaring - 0, // Slugma - 0, // Magcargo - 2, // Swinub - 2, // Piloswine - 0, // Corsola - 0, // Remoraid - 0, // Octillery - 0, // Delibird - 2, // Mantine - 0, // Skarmory - 0, // Houndour - 0, // Houndoom - 0, // Kingdra - 0, // Phanpy - 0, // Donphan - 0, // Porygon2 - 2, // Stantler - 1, // Smeargle - 2, // Tyrogue - 2, // Hitmontop - 1, // Smoochum - 1, // Elekid - 1, // Magby - 1, // Miltank - 1, // Blissey - 0, // Raikou - 2, // Entei - 0, // Suicune - 1, // Larvitar - 0, // Pupitar - 1, // Tyranitar - 0, // Lugia - 1, // Ho-Oh - 1, // Celebi - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 0, // ? - 1, // Treecko - 0, // Grovyle - 1, // Sceptile - 0, // Torchic - 0, // Combusken - 0, // Blaziken - 0, // Mudkip - 0, // Marshtomp - 0, // Swampert - 2, // Poochyena - 2, // Mightyena - 2, // Zigzagoon - 2, // Linoone - 0, // Wurmple - 2, // Silcoon - 0, // Beautifly - 2, // Cascoon - 1, // Dustox - 1, // Lotad - 1, // Lombre - 1, // Ludicolo - 1, // Seedot - 1, // Nuzleaf - 0, // Shiftry - 1, // Nincada - 1, // Ninjask - 1, // Shedinja - 2, // Taillow - 2, // Swellow - 1, // Shroomish - 1, // Breloom - 1, // Spinda - 0, // Wingull - 0, // Pelipper - 2, // Surskit - 0, // Masquerain - 2, // Wailmer - 0, // Wailord - 0, // Skitty - 2, // Delcatty - 1, // Kecleon - 1, // Baltoy - 0, // Claydol - 0, // Nosepass - 1, // Torkoal - 2, // Sableye - 0, // Barboach - 0, // Whiscash - 0, // Luvdisc - 0, // Corphish - 0, // Crawdaunt - 2, // Feebas - 0, // Milotic - 0, // Carvanha - 0, // Sharpedo - 1, // Trapinch - 1, // Vibrava - 1, // Flygon - 2, // Makuhita - 1, // Hariyama - 1, // Electrike - 0, // Manectric - 1, // Numel - 0, // Camerupt - 2, // Spheal - 2, // Sealeo - 0, // Walrein - 1, // Cacnea - 1, // Cacturne - 2, // Snorunt - 0, // Glalie - 1, // Lunatone - 0, // Solrock - 2, // Azurill - 0, // Spoink - 2, // Grumpig - 0, // Plusle - 0, // Minun - 2, // Mawile - 0, // Meditite - 0, // Medicham - 0, // Swablu - 0, // Altaria - 0, // Wynaut - 0, // Duskull - 0, // Dusclops - 0, // Roselia - 2, // Slakoth - 2, // Vigoroth - 1, // Slaking - 1, // Gulpin - 2, // Swalot - 1, // Tropius - 0, // Whismur - 2, // Loudred - 2, // Exploud - 0, // Clamperl - 0, // Huntail - 0, // Gorebyss - 0, // Absol - 0, // Shuppet - 0, // Banette - 2, // Seviper - 0, // Zangoose - 1, // Relicanth - 2, // Aron - 2, // Lairon - 2, // Aggron - 0, // Castform - 0, // Volbeat - 2, // Illumise - 2, // Lileep - 0, // Cradily - 0, // Anorith - 0, // Armaldo - 1, // Ralts - 1, // Kirlia - 1, // Gardevoir - 2, // Bagon - 2, // Shelgon - 0, // Salamence - 0, // Beldum - 0, // Metang - 0, // Metagross - 2, // Regirock - 2, // Regice - 2, // Registeel - 2, // Kyogre - 0, // Groudon - 1, // Rayquaza - 0, // Latias - 2, // Latios - 0, // Jirachi - 0, // Deoxys - 0, // Chimecho - 1, // Egg - 0, // Unown B - 0, // Unown C - 0, // Unown D - 0, // Unown E - 0, // Unown F - 0, // Unown G - 0, // Unown H - 0, // Unown I - 0, // Unown J - 0, // Unown K - 0, // Unown L - 0, // Unown M - 0, // Unown N - 0, // Unown O - 0, // Unown P - 0, // Unown Q - 0, // Unown R - 0, // Unown S - 0, // Unown T - 0, // Unown U - 0, // Unown V - 0, // Unown W - 0, // Unown X - 0, // Unown Y - 0, // Unown Z - 0, // Unown Exclamation Mark - 0, // Unown Question Mark + [SPECIES_NONE] = 0, + [SPECIES_BULBASAUR] = 1, + [SPECIES_IVYSAUR] = 1, + [SPECIES_VENUSAUR] = 1, + [SPECIES_CHARMANDER] = 0, + [SPECIES_CHARMELEON] = 0, + [SPECIES_CHARIZARD] = 0, + [SPECIES_SQUIRTLE] = 0, + [SPECIES_WARTORTLE] = 2, + [SPECIES_BLASTOISE] = 2, + [SPECIES_CATERPIE] = 1, + [SPECIES_METAPOD] = 1, + [SPECIES_BUTTERFREE] = 0, + [SPECIES_WEEDLE] = 1, + [SPECIES_KAKUNA] = 2, + [SPECIES_BEEDRILL] = 2, + [SPECIES_PIDGEY] = 0, + [SPECIES_PIDGEOTTO] = 0, + [SPECIES_PIDGEOT] = 0, + [SPECIES_RATTATA] = 2, + [SPECIES_RATICATE] = 1, + [SPECIES_SPEAROW] = 0, + [SPECIES_FEAROW] = 0, + [SPECIES_EKANS] = 2, + [SPECIES_ARBOK] = 2, + [SPECIES_PIKACHU] = 2, + [SPECIES_RAICHU] = 0, + [SPECIES_SANDSHREW] = 2, + [SPECIES_SANDSLASH] = 2, + [SPECIES_NIDORAN_F] = 2, + [SPECIES_NIDORINA] = 2, + [SPECIES_NIDOQUEEN] = 2, + [SPECIES_NIDORAN_M] = 2, + [SPECIES_NIDORINO] = 2, + [SPECIES_NIDOKING] = 2, + [SPECIES_CLEFAIRY] = 0, + [SPECIES_CLEFABLE] = 0, + [SPECIES_VULPIX] = 2, + [SPECIES_NINETALES] = 1, + [SPECIES_JIGGLYPUFF] = 0, + [SPECIES_WIGGLYTUFF] = 0, + [SPECIES_ZUBAT] = 2, + [SPECIES_GOLBAT] = 2, + [SPECIES_ODDISH] = 1, + [SPECIES_GLOOM] = 0, + [SPECIES_VILEPLUME] = 0, + [SPECIES_PARAS] = 0, + [SPECIES_PARASECT] = 0, + [SPECIES_VENONAT] = 0, + [SPECIES_VENOMOTH] = 2, + [SPECIES_DIGLETT] = 2, + [SPECIES_DUGTRIO] = 2, + [SPECIES_MEOWTH] = 1, + [SPECIES_PERSIAN] = 1, + [SPECIES_PSYDUCK] = 1, + [SPECIES_GOLDUCK] = 2, + [SPECIES_MANKEY] = 1, + [SPECIES_PRIMEAPE] = 2, + [SPECIES_GROWLITHE] = 0, + [SPECIES_ARCANINE] = 0, + [SPECIES_POLIWAG] = 0, + [SPECIES_POLIWHIRL] = 0, + [SPECIES_POLIWRATH] = 0, + [SPECIES_ABRA] = 2, + [SPECIES_KADABRA] = 2, + [SPECIES_ALAKAZAM] = 2, + [SPECIES_MACHOP] = 0, + [SPECIES_MACHOKE] = 2, + [SPECIES_MACHAMP] = 0, + [SPECIES_BELLSPROUT] = 1, + [SPECIES_WEEPINBELL] = 1, + [SPECIES_VICTREEBEL] = 1, + [SPECIES_TENTACOOL] = 2, + [SPECIES_TENTACRUEL] = 2, + [SPECIES_GEODUDE] = 1, + [SPECIES_GRAVELER] = 1, + [SPECIES_GOLEM] = 1, + [SPECIES_PONYTA] = 0, + [SPECIES_RAPIDASH] = 0, + [SPECIES_SLOWPOKE] = 0, + [SPECIES_SLOWBRO] = 0, + [SPECIES_MAGNEMITE] = 0, + [SPECIES_MAGNETON] = 0, + [SPECIES_FARFETCHD] = 1, + [SPECIES_DODUO] = 2, + [SPECIES_DODRIO] = 2, + [SPECIES_SEEL] = 2, + [SPECIES_DEWGONG] = 2, + [SPECIES_GRIMER] = 2, + [SPECIES_MUK] = 2, + [SPECIES_SHELLDER] = 2, + [SPECIES_CLOYSTER] = 2, + [SPECIES_GASTLY] = 2, + [SPECIES_HAUNTER] = 2, + [SPECIES_GENGAR] = 2, + [SPECIES_ONIX] = 2, + [SPECIES_DROWZEE] = 2, + [SPECIES_HYPNO] = 1, + [SPECIES_KRABBY] = 2, + [SPECIES_KINGLER] = 2, + [SPECIES_VOLTORB] = 0, + [SPECIES_ELECTRODE] = 0, + [SPECIES_EXEGGCUTE] = 0, + [SPECIES_EXEGGUTOR] = 1, + [SPECIES_CUBONE] = 1, + [SPECIES_MAROWAK] = 1, + [SPECIES_HITMONLEE] = 2, + [SPECIES_HITMONCHAN] = 2, + [SPECIES_LICKITUNG] = 1, + [SPECIES_KOFFING] = 2, + [SPECIES_WEEZING] = 2, + [SPECIES_RHYHORN] = 1, + [SPECIES_RHYDON] = 1, + [SPECIES_CHANSEY] = 0, + [SPECIES_TANGELA] = 0, + [SPECIES_KANGASKHAN] = 1, + [SPECIES_HORSEA] = 0, + [SPECIES_SEADRA] = 0, + [SPECIES_GOLDEEN] = 0, + [SPECIES_SEAKING] = 0, + [SPECIES_STARYU] = 2, + [SPECIES_STARMIE] = 2, + [SPECIES_MR_MIME] = 0, + [SPECIES_SCYTHER] = 1, + [SPECIES_JYNX] = 2, + [SPECIES_ELECTABUZZ] = 1, + [SPECIES_MAGMAR] = 0, + [SPECIES_PINSIR] = 2, + [SPECIES_TAUROS] = 2, + [SPECIES_MAGIKARP] = 0, + [SPECIES_GYARADOS] = 0, + [SPECIES_LAPRAS] = 2, + [SPECIES_DITTO] = 2, + [SPECIES_EEVEE] = 2, + [SPECIES_VAPOREON] = 0, + [SPECIES_JOLTEON] = 0, + [SPECIES_FLAREON] = 0, + [SPECIES_PORYGON] = 0, + [SPECIES_OMANYTE] = 0, + [SPECIES_OMASTAR] = 0, + [SPECIES_KABUTO] = 2, + [SPECIES_KABUTOPS] = 2, + [SPECIES_AERODACTYL] = 0, + [SPECIES_SNORLAX] = 1, + [SPECIES_ARTICUNO] = 0, + [SPECIES_ZAPDOS] = 0, + [SPECIES_MOLTRES] = 0, + [SPECIES_DRATINI] = 0, + [SPECIES_DRAGONAIR] = 0, + [SPECIES_DRAGONITE] = 2, + [SPECIES_MEWTWO] = 2, + [SPECIES_MEW] = 0, + [SPECIES_CHIKORITA] = 1, + [SPECIES_BAYLEEF] = 1, + [SPECIES_MEGANIUM] = 1, + [SPECIES_CYNDAQUIL] = 1, + [SPECIES_QUILAVA] = 1, + [SPECIES_TYPHLOSION] = 1, + [SPECIES_TOTODILE] = 2, + [SPECIES_CROCONAW] = 2, + [SPECIES_FERALIGATR] = 2, + [SPECIES_SENTRET] = 2, + [SPECIES_FURRET] = 2, + [SPECIES_HOOTHOOT] = 2, + [SPECIES_NOCTOWL] = 2, + [SPECIES_LEDYBA] = 0, + [SPECIES_LEDIAN] = 0, + [SPECIES_SPINARAK] = 1, + [SPECIES_ARIADOS] = 0, + [SPECIES_CROBAT] = 2, + [SPECIES_CHINCHOU] = 2, + [SPECIES_LANTURN] = 0, + [SPECIES_PICHU] = 0, + [SPECIES_CLEFFA] = 0, + [SPECIES_IGGLYBUFF] = 1, + [SPECIES_TOGEPI] = 2, + [SPECIES_TOGETIC] = 2, + [SPECIES_NATU] = 0, + [SPECIES_XATU] = 0, + [SPECIES_MAREEP] = 2, + [SPECIES_FLAAFFY] = 0, + [SPECIES_AMPHAROS] = 0, + [SPECIES_BELLOSSOM] = 1, + [SPECIES_MARILL] = 2, + [SPECIES_AZUMARILL] = 2, + [SPECIES_SUDOWOODO] = 1, + [SPECIES_POLITOED] = 1, + [SPECIES_HOPPIP] = 1, + [SPECIES_SKIPLOOM] = 1, + [SPECIES_JUMPLUFF] = 2, + [SPECIES_AIPOM] = 2, + [SPECIES_SUNKERN] = 1, + [SPECIES_SUNFLORA] = 1, + [SPECIES_YANMA] = 1, + [SPECIES_WOOPER] = 0, + [SPECIES_QUAGSIRE] = 0, + [SPECIES_ESPEON] = 2, + [SPECIES_UMBREON] = 2, + [SPECIES_MURKROW] = 2, + [SPECIES_SLOWKING] = 0, + [SPECIES_MISDREAVUS] = 0, + [SPECIES_UNOWN] = 0, + [SPECIES_WOBBUFFET] = 0, + [SPECIES_GIRAFARIG] = 1, + [SPECIES_PINECO] = 0, + [SPECIES_FORRETRESS] = 2, + [SPECIES_DUNSPARCE] = 2, + [SPECIES_GLIGAR] = 2, + [SPECIES_STEELIX] = 0, + [SPECIES_SNUBBULL] = 0, + [SPECIES_GRANBULL] = 2, + [SPECIES_QWILFISH] = 0, + [SPECIES_SCIZOR] = 0, + [SPECIES_SHUCKLE] = 1, + [SPECIES_HERACROSS] = 2, + [SPECIES_SNEASEL] = 0, + [SPECIES_TEDDIURSA] = 0, + [SPECIES_URSARING] = 2, + [SPECIES_SLUGMA] = 0, + [SPECIES_MAGCARGO] = 0, + [SPECIES_SWINUB] = 2, + [SPECIES_PILOSWINE] = 2, + [SPECIES_CORSOLA] = 0, + [SPECIES_REMORAID] = 0, + [SPECIES_OCTILLERY] = 0, + [SPECIES_DELIBIRD] = 0, + [SPECIES_MANTINE] = 2, + [SPECIES_SKARMORY] = 0, + [SPECIES_HOUNDOUR] = 0, + [SPECIES_HOUNDOOM] = 0, + [SPECIES_KINGDRA] = 0, + [SPECIES_PHANPY] = 0, + [SPECIES_DONPHAN] = 0, + [SPECIES_PORYGON2] = 0, + [SPECIES_STANTLER] = 2, + [SPECIES_SMEARGLE] = 1, + [SPECIES_TYROGUE] = 2, + [SPECIES_HITMONTOP] = 2, + [SPECIES_SMOOCHUM] = 1, + [SPECIES_ELEKID] = 1, + [SPECIES_MAGBY] = 1, + [SPECIES_MILTANK] = 1, + [SPECIES_BLISSEY] = 1, + [SPECIES_RAIKOU] = 0, + [SPECIES_ENTEI] = 2, + [SPECIES_SUICUNE] = 0, + [SPECIES_LARVITAR] = 1, + [SPECIES_PUPITAR] = 0, + [SPECIES_TYRANITAR] = 1, + [SPECIES_LUGIA] = 0, + [SPECIES_HO_OH] = 1, + [SPECIES_CELEBI] = 1, + [SPECIES_OLD_UNOWN_B] = 0, + [SPECIES_OLD_UNOWN_C] = 0, + [SPECIES_OLD_UNOWN_D] = 0, + [SPECIES_OLD_UNOWN_E] = 0, + [SPECIES_OLD_UNOWN_F] = 0, + [SPECIES_OLD_UNOWN_G] = 0, + [SPECIES_OLD_UNOWN_H] = 0, + [SPECIES_OLD_UNOWN_I] = 0, + [SPECIES_OLD_UNOWN_J] = 0, + [SPECIES_OLD_UNOWN_K] = 0, + [SPECIES_OLD_UNOWN_L] = 0, + [SPECIES_OLD_UNOWN_M] = 0, + [SPECIES_OLD_UNOWN_N] = 0, + [SPECIES_OLD_UNOWN_O] = 0, + [SPECIES_OLD_UNOWN_P] = 0, + [SPECIES_OLD_UNOWN_Q] = 0, + [SPECIES_OLD_UNOWN_R] = 0, + [SPECIES_OLD_UNOWN_S] = 0, + [SPECIES_OLD_UNOWN_T] = 0, + [SPECIES_OLD_UNOWN_U] = 0, + [SPECIES_OLD_UNOWN_V] = 0, + [SPECIES_OLD_UNOWN_W] = 0, + [SPECIES_OLD_UNOWN_X] = 0, + [SPECIES_OLD_UNOWN_Y] = 0, + [SPECIES_OLD_UNOWN_Z] = 0, + [SPECIES_TREECKO] = 1, + [SPECIES_GROVYLE] = 0, + [SPECIES_SCEPTILE] = 1, + [SPECIES_TORCHIC] = 0, + [SPECIES_COMBUSKEN] = 0, + [SPECIES_BLAZIKEN] = 0, + [SPECIES_MUDKIP] = 0, + [SPECIES_MARSHTOMP] = 0, + [SPECIES_SWAMPERT] = 0, + [SPECIES_POOCHYENA] = 2, + [SPECIES_MIGHTYENA] = 2, + [SPECIES_ZIGZAGOON] = 2, + [SPECIES_LINOONE] = 2, + [SPECIES_WURMPLE] = 0, + [SPECIES_SILCOON] = 2, + [SPECIES_BEAUTIFLY] = 0, + [SPECIES_CASCOON] = 2, + [SPECIES_DUSTOX] = 1, + [SPECIES_LOTAD] = 1, + [SPECIES_LOMBRE] = 1, + [SPECIES_LUDICOLO] = 1, + [SPECIES_SEEDOT] = 1, + [SPECIES_NUZLEAF] = 1, + [SPECIES_SHIFTRY] = 0, + [SPECIES_NINCADA] = 1, + [SPECIES_NINJASK] = 1, + [SPECIES_SHEDINJA] = 1, + [SPECIES_TAILLOW] = 2, + [SPECIES_SWELLOW] = 2, + [SPECIES_SHROOMISH] = 1, + [SPECIES_BRELOOM] = 1, + [SPECIES_SPINDA] = 1, + [SPECIES_WINGULL] = 0, + [SPECIES_PELIPPER] = 0, + [SPECIES_SURSKIT] = 2, + [SPECIES_MASQUERAIN] = 0, + [SPECIES_WAILMER] = 2, + [SPECIES_WAILORD] = 0, + [SPECIES_SKITTY] = 0, + [SPECIES_DELCATTY] = 2, + [SPECIES_KECLEON] = 1, + [SPECIES_BALTOY] = 1, + [SPECIES_CLAYDOL] = 0, + [SPECIES_NOSEPASS] = 0, + [SPECIES_TORKOAL] = 1, + [SPECIES_SABLEYE] = 2, + [SPECIES_BARBOACH] = 0, + [SPECIES_WHISCASH] = 0, + [SPECIES_LUVDISC] = 0, + [SPECIES_CORPHISH] = 0, + [SPECIES_CRAWDAUNT] = 0, + [SPECIES_FEEBAS] = 2, + [SPECIES_MILOTIC] = 0, + [SPECIES_CARVANHA] = 0, + [SPECIES_SHARPEDO] = 0, + [SPECIES_TRAPINCH] = 1, + [SPECIES_VIBRAVA] = 1, + [SPECIES_FLYGON] = 1, + [SPECIES_MAKUHITA] = 2, + [SPECIES_HARIYAMA] = 1, + [SPECIES_ELECTRIKE] = 1, + [SPECIES_MANECTRIC] = 0, + [SPECIES_NUMEL] = 1, + [SPECIES_CAMERUPT] = 0, + [SPECIES_SPHEAL] = 2, + [SPECIES_SEALEO] = 2, + [SPECIES_WALREIN] = 0, + [SPECIES_CACNEA] = 1, + [SPECIES_CACTURNE] = 1, + [SPECIES_SNORUNT] = 2, + [SPECIES_GLALIE] = 0, + [SPECIES_LUNATONE] = 1, + [SPECIES_SOLROCK] = 0, + [SPECIES_AZURILL] = 2, + [SPECIES_SPOINK] = 0, + [SPECIES_GRUMPIG] = 2, + [SPECIES_PLUSLE] = 0, + [SPECIES_MINUN] = 0, + [SPECIES_MAWILE] = 2, + [SPECIES_MEDITITE] = 0, + [SPECIES_MEDICHAM] = 0, + [SPECIES_SWABLU] = 0, + [SPECIES_ALTARIA] = 0, + [SPECIES_WYNAUT] = 0, + [SPECIES_DUSKULL] = 0, + [SPECIES_DUSCLOPS] = 0, + [SPECIES_ROSELIA] = 0, + [SPECIES_SLAKOTH] = 2, + [SPECIES_VIGOROTH] = 2, + [SPECIES_SLAKING] = 1, + [SPECIES_GULPIN] = 1, + [SPECIES_SWALOT] = 2, + [SPECIES_TROPIUS] = 1, + [SPECIES_WHISMUR] = 0, + [SPECIES_LOUDRED] = 2, + [SPECIES_EXPLOUD] = 2, + [SPECIES_CLAMPERL] = 0, + [SPECIES_HUNTAIL] = 0, + [SPECIES_GOREBYSS] = 0, + [SPECIES_ABSOL] = 0, + [SPECIES_SHUPPET] = 0, + [SPECIES_BANETTE] = 0, + [SPECIES_SEVIPER] = 2, + [SPECIES_ZANGOOSE] = 0, + [SPECIES_RELICANTH] = 1, + [SPECIES_ARON] = 2, + [SPECIES_LAIRON] = 2, + [SPECIES_AGGRON] = 2, + [SPECIES_CASTFORM] = 0, + [SPECIES_VOLBEAT] = 0, + [SPECIES_ILLUMISE] = 2, + [SPECIES_LILEEP] = 2, + [SPECIES_CRADILY] = 0, + [SPECIES_ANORITH] = 0, + [SPECIES_ARMALDO] = 0, + [SPECIES_RALTS] = 1, + [SPECIES_KIRLIA] = 1, + [SPECIES_GARDEVOIR] = 1, + [SPECIES_BAGON] = 2, + [SPECIES_SHELGON] = 2, + [SPECIES_SALAMENCE] = 0, + [SPECIES_BELDUM] = 0, + [SPECIES_METANG] = 0, + [SPECIES_METAGROSS] = 0, + [SPECIES_REGIROCK] = 2, + [SPECIES_REGICE] = 2, + [SPECIES_REGISTEEL] = 2, + [SPECIES_KYOGRE] = 2, + [SPECIES_GROUDON] = 0, + [SPECIES_RAYQUAZA] = 1, + [SPECIES_LATIAS] = 0, + [SPECIES_LATIOS] = 2, + [SPECIES_JIRACHI] = 0, + [SPECIES_DEOXYS] = 0, + [SPECIES_CHIMECHO] = 0, + [SPECIES_EGG] = 1, + [SPECIES_UNOWN_B] = 0, + [SPECIES_UNOWN_C] = 0, + [SPECIES_UNOWN_D] = 0, + [SPECIES_UNOWN_E] = 0, + [SPECIES_UNOWN_F] = 0, + [SPECIES_UNOWN_G] = 0, + [SPECIES_UNOWN_H] = 0, + [SPECIES_UNOWN_I] = 0, + [SPECIES_UNOWN_J] = 0, + [SPECIES_UNOWN_K] = 0, + [SPECIES_UNOWN_L] = 0, + [SPECIES_UNOWN_M] = 0, + [SPECIES_UNOWN_N] = 0, + [SPECIES_UNOWN_O] = 0, + [SPECIES_UNOWN_P] = 0, + [SPECIES_UNOWN_Q] = 0, + [SPECIES_UNOWN_R] = 0, + [SPECIES_UNOWN_S] = 0, + [SPECIES_UNOWN_T] = 0, + [SPECIES_UNOWN_U] = 0, + [SPECIES_UNOWN_V] = 0, + [SPECIES_UNOWN_W] = 0, + [SPECIES_UNOWN_X] = 0, + [SPECIES_UNOWN_Y] = 0, + [SPECIES_UNOWN_Z] = 0, + [SPECIES_UNOWN_EMARK] = 0, + [SPECIES_UNOWN_QMARK] = 0, }; const struct SpritePalette gMonIconPaletteTable[] = -- cgit v1.2.3 From 0f82e5caf7461f797c376da8e2ce375ed3947c3d Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sat, 8 Dec 2018 15:15:52 +0530 Subject: Intial commit for decomp fire --- asm/fire.s | 29 ----------------------------- ld_script.txt | 1 + src/fire.c | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/asm/fire.s b/asm/fire.s index cd0339b9b..29c226403 100644 --- a/asm/fire.s +++ b/asm/fire.s @@ -5,35 +5,6 @@ .text - thumb_func_start sub_8108EC8 -sub_8108EC8: @ 8108EC8 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r4, 0x2E] - movs r0, 0x3C - strh r0, [r4, 0x30] - movs r0, 0x9 - strh r0, [r4, 0x32] - movs r0, 0x1E - strh r0, [r4, 0x34] - movs r0, 0xFE - lsls r0, 8 - strh r0, [r4, 0x36] - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r1, =sub_80A634C - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8108EC8 - thumb_func_start sub_8108F08 sub_8108F08: @ 8108F08 push {r4,r5,lr} diff --git a/ld_script.txt b/ld_script.txt index ddafe6ecf..8137574d1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -158,6 +158,7 @@ SECTIONS { asm/battle_anim_effects_1.o(.text); asm/battle_anim_effects_2.o(.text); asm/water.o(.text); + src/fire.o(.text); asm/fire.o(.text); asm/electric.o(.text); asm/ice.o(.text); diff --git a/src/fire.c b/src/fire.c index 02c0db81c..09bdd8d02 100644 --- a/src/fire.c +++ b/src/fire.c @@ -436,3 +436,17 @@ const s8 gUnknown_08595694[16] = { -1, 0, 1, 0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 1, }; + +void sub_8108EC8(struct Sprite *sprite) +{ + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = 0x3C; + sprite->data[2] = 0x9; + sprite->data[3] = 0x1E; + sprite->data[4] = 0xFE00; + + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + + sprite->callback = sub_80A634C; + sprite->callback(sprite); +} \ No newline at end of file -- cgit v1.2.3 From 5630ab2b1ebe6b2ceacbe79aec4f10c2404f5761 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sat, 8 Dec 2018 17:55:17 +0530 Subject: Fully decompile fire --- asm/fire.s | 2368 --------------------------------------------------------- ld_script.txt | 1 - src/fire.c | 915 +++++++++++++++++++++- 3 files changed, 896 insertions(+), 2388 deletions(-) delete mode 100644 asm/fire.s diff --git a/asm/fire.s b/asm/fire.s deleted file mode 100644 index 29c226403..000000000 --- a/asm/fire.s +++ /dev/null @@ -1,2368 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8108F08 -sub_8108F08: @ 8108F08 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimArgs - movs r0, 0 - ldrsh r1, [r5, r0] - adds r0, r4, 0 - bl sub_80A6864 - ldrh r0, [r5, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldrh r0, [r5, 0x8] - strh r0, [r4, 0x2E] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x30] - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x32] - ldr r0, =sub_80A656C - str r0, [r4, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8108F08 - - thumb_func_start sub_8108F4C -sub_8108F4C: @ 8108F4C - push {r4,lr} - adds r4, r0, 0 - bl sub_80A6838 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08108F88 - ldr r2, =gBattleAnimArgs - ldrh r0, [r4, 0x20] - ldrh r1, [r2] - subs r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r2, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldrh r0, [r2, 0x8] - negs r0, r0 - strh r0, [r4, 0x32] - adds r1, r2, 0 - b _08108F9E - .pool -_08108F88: - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x2] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - ldrh r0, [r1, 0x8] - strh r0, [r4, 0x32] -_08108F9E: - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x36] - ldrh r0, [r1, 0xA] - strh r0, [r4, 0x34] - ldr r0, =sub_8109028 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8108F4C - - thumb_func_start sub_8108FBC -sub_8108FBC: @ 8108FBC - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08108FF0 - ldr r2, =gBattleAnimArgs - ldrh r0, [r4, 0x20] - ldrh r1, [r2] - subs r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r2, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldrh r0, [r2, 0x8] - strh r0, [r4, 0x32] - adds r1, r2, 0 - b _08109008 - .pool -_08108FF0: - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x2] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - ldrh r0, [r1, 0x8] - negs r0, r0 - strh r0, [r4, 0x32] -_08109008: - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x36] - ldrh r0, [r1, 0xA] - strh r0, [r4, 0x34] - ldr r0, =sub_8109028 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8108FBC - - thumb_func_start sub_8109028 -sub_8109028: @ 8109028 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x36 - ldrsh r1, [r2, r3] - cmp r0, r1 - bge _0810904E - ldrh r0, [r2, 0x32] - ldrh r1, [r2, 0x24] - adds r0, r1 - strh r0, [r2, 0x24] - ldrh r0, [r2, 0x34] - ldrh r3, [r2, 0x26] - adds r0, r3 - strh r0, [r2, 0x26] -_0810904E: - movs r0, 0x2E - ldrsh r1, [r2, r0] - movs r3, 0x30 - ldrsh r0, [r2, r3] - cmp r1, r0 - bne _08109060 - adds r0, r2, 0 - bl move_anim_8074EE0 -_08109060: - pop {r0} - bx r0 - thumb_func_end sub_8109028 - - thumb_func_start sub_8109064 -sub_8109064: @ 8109064 - push {r4,lr} - adds r4, r0, 0 - bl sub_80A6838 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08109090 - ldr r0, =gBattleAnimArgs - ldrh r1, [r4, 0x20] - ldrh r2, [r0] - subs r1, r2 - strh r1, [r4, 0x20] - b _081090A2 - .pool -_08109090: - ldr r0, =gBattleAnimArgs - ldrh r1, [r0] - ldrh r2, [r4, 0x20] - adds r1, r2 - strh r1, [r4, 0x20] - adds r2, r4, 0 - adds r2, 0x43 - movs r1, 0x8 - strb r1, [r2] -_081090A2: - adds r2, r0, 0 - ldrh r0, [r2, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - movs r1, 0 - strh r0, [r4, 0x22] - ldrh r0, [r2, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r2, 0x6] - strh r0, [r4, 0x30] - ldrh r0, [r2, 0x8] - strh r0, [r4, 0x32] - ldrh r0, [r2, 0xA] - strh r0, [r4, 0x34] - ldrh r0, [r2, 0xC] - strh r0, [r4, 0x36] - strh r1, [r4, 0x38] - ldr r0, =sub_81090D8 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109064 - - thumb_func_start sub_81090D8 -sub_81090D8: @ 81090D8 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08109160 - movs r2, 0x38 - ldrsh r1, [r4, r2] - ldr r0, =0x00002710 - cmp r1, r0 - ble _081090F6 - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1 - strb r0, [r1] -_081090F6: - movs r1, 0x2E - ldrsh r0, [r4, r1] - ldrh r1, [r4, 0x38] - lsls r1, 16 - asrs r1, 24 - ldrh r2, [r4, 0x30] - adds r1, r2 - lsls r1, 16 - asrs r1, 16 - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x2E - ldrsh r0, [r4, r1] - ldrh r1, [r4, 0x38] - lsls r1, 16 - asrs r1, 24 - ldrh r2, [r4, 0x30] - adds r1, r2 - lsls r1, 16 - asrs r1, 16 - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x32] - ldrh r2, [r4, 0x2E] - adds r1, r0, r2 - strh r1, [r4, 0x2E] - ldrh r0, [r4, 0x36] - ldrh r2, [r4, 0x38] - adds r0, r2 - strh r0, [r4, 0x38] - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0xFF - ble _0810914C - ldr r2, =0xffffff00 - b _08109154 - .pool -_0810914C: - cmp r0, 0 - bge _08109158 - movs r2, 0x80 - lsls r2, 1 -_08109154: - adds r0, r1, r2 - strh r0, [r4, 0x2E] -_08109158: - ldrh r0, [r4, 0x34] - subs r0, 0x1 - strh r0, [r4, 0x34] - b _08109166 -_08109160: - adds r0, r4, 0 - bl move_anim_8074EE0 -_08109166: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81090D8 - - thumb_func_start sub_810916C -sub_810916C: @ 810916C - push {lr} - movs r1, 0 - strh r1, [r0, 0x20] - strh r1, [r0, 0x22] - movs r1, 0x3C - strh r1, [r0, 0x2E] - movs r1, 0x8C - strh r1, [r0, 0x32] - movs r1, 0x50 - strh r1, [r0, 0x36] - ldr r1, =StartAnimLinearTranslation - str r1, [r0, 0x1C] - ldr r1, =DestroyAnimSprite - bl StoreSpriteCallbackInData6 - pop {r0} - bx r0 - .pool - thumb_func_end sub_810916C - - thumb_func_start sub_8109198 -sub_8109198: @ 8109198 - push {r4-r6,lr} - adds r6, r0, 0 - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - bl GetBattlerSide - adds r4, r0, 0 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl GetBattlerSide - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - bne _081091DE - movs r0, 0x2 - bl GetBattlerAtPosition - ldrb r1, [r5] - lsls r0, 24 - lsrs r0, 24 - cmp r1, r0 - beq _081091D6 - movs r0, 0x3 - bl GetBattlerAtPosition - ldrb r1, [r5] - lsls r0, 24 - lsrs r0, 24 - cmp r1, r0 - bne _081091DE -_081091D6: - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] -_081091DE: - ldr r1, =sub_80A7938 - str r1, [r6, 0x1C] - adds r0, r6, 0 - bl _call_via_r1 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109198 - - thumb_func_start sub_8109200 -sub_8109200: @ 8109200 - ldr r2, =gBattleAnimArgs - ldrh r1, [r2] - negs r1, r1 - strh r1, [r2] - ldrh r1, [r2, 0x4] - negs r1, r1 - strh r1, [r2, 0x4] - ldr r1, =sub_80A7938 - str r1, [r0, 0x1C] - bx lr - .pool - thumb_func_end sub_8109200 - - thumb_func_start sub_810921C -sub_810921C: @ 810921C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x4] - movs r1, 0 - strh r0, [r4, 0x3C] - strh r1, [r4, 0x2E] - ldr r0, =sub_8109244 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810921C - - thumb_func_start sub_8109244 -sub_8109244: @ 8109244 - push {r4,r5,lr} - adds r5, r0, 0 - bl sub_8109338 - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x12 - bne _0810928E - movs r0, 0x19 - strh r0, [r5, 0x2E] - ldrh r0, [r5, 0x20] - strh r0, [r5, 0x30] - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x22] - strh r0, [r5, 0x34] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - adds r0, r5, 0 - bl InitAnimLinearTranslation - ldr r0, =sub_810929C - str r0, [r5, 0x1C] -_0810928E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109244 - - thumb_func_start sub_810929C -sub_810929C: @ 810929C - push {r4-r6,lr} - adds r6, r0, 0 - bl TranslateAnimLinear - lsls r0, 24 - cmp r0, 0 - beq _081092E4 - movs r4, 0 - strh r4, [r6, 0x2E] - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x20] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x22] - strh r4, [r6, 0x26] - strh r4, [r6, 0x24] - ldr r1, =sub_8109314 - str r1, [r6, 0x1C] - adds r0, r6, 0 - bl _call_via_r1 - b _0810930E - .pool -_081092E4: - movs r1, 0x3C - ldrsh r0, [r6, r1] - movs r1, 0x1C - bl Sin - ldrh r1, [r6, 0x24] - adds r0, r1 - strh r0, [r6, 0x24] - movs r1, 0x3C - ldrsh r0, [r6, r1] - movs r1, 0x1C - bl Cos - ldrh r1, [r6, 0x26] - adds r0, r1 - strh r0, [r6, 0x26] - ldrh r0, [r6, 0x3C] - adds r0, 0x14 - movs r1, 0xFF - ands r0, r1 - strh r0, [r6, 0x3C] -_0810930E: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_810929C - - thumb_func_start sub_8109314 -sub_8109314: @ 8109314 - push {r4,lr} - adds r4, r0, 0 - bl sub_8109338 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - bne _08109330 - adds r0, r4, 0 - bl DestroyAnimSprite -_08109330: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8109314 - - thumb_func_start sub_8109338 -sub_8109338: @ 8109338 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x3C - ldrsh r0, [r4, r1] - movs r1, 0x1C - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x3C - ldrsh r0, [r4, r1] - movs r1, 0x1C - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x3C] - adds r0, 0x14 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x3C] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8109338 - - thumb_func_start sub_8109364 -sub_8109364: @ 8109364 - push {r4,lr} - adds r4, r0, 0 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x2] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x8] - strh r0, [r4, 0x32] - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A653C - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109364 - - thumb_func_start sub_81093A4 -sub_81093A4: @ 81093A4 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x2E] - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =WaitAnimForDuration - str r0, [r4, 0x1C] - ldr r1, =sub_81093E4 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81093A4 - - thumb_func_start sub_81093E4 -sub_81093E4: @ 81093E4 - push {lr} - adds r3, r0, 0 - adds r3, 0x3E - ldrb r2, [r3] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r3] - ldrh r1, [r0, 0x30] - movs r2, 0 - strh r1, [r0, 0x2E] - strh r2, [r0, 0x30] - ldr r1, =sub_810940C - str r1, [r0, 0x1C] - bl _call_via_r1 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81093E4 - - thumb_func_start sub_810940C -sub_810940C: @ 810940C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x30 - ldrsh r0, [r4, r1] - ldrh r1, [r4, 0x32] - lsls r1, 16 - asrs r1, 24 - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - ldrh r1, [r4, 0x32] - lsls r1, 16 - asrs r1, 24 - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x30] - adds r0, 0xA - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x32] - adds r0, 0xD0 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x2E] - subs r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _08109458 - adds r0, r4, 0 - bl DestroyAnimSprite -_08109458: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_810940C - - thumb_func_start sub_8109460 -sub_8109460: @ 8109460 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, =gTasks - adds r4, r0 - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - movs r5, 0 - strh r0, [r4, 0x26] - strh r5, [r4, 0x8] - strh r5, [r4, 0xA] - strh r5, [r4, 0xC] - strh r5, [r4, 0xE] - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x22] - strh r0, [r4, 0x10] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - strh r5, [r4, 0x14] - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl sub_80A7270 - ldr r0, =sub_81094D0 - str r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109460 - - thumb_func_start sub_81094D0 -sub_81094D0: @ 81094D0 - push {r4,r5,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x6 - bls _081094EC - b _081097AA -_081094EC: - lsls r0, 2 - ldr r1, =_08109500 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08109500: - .4byte _0810951C - .4byte _08109542 - .4byte _081095F4 - .4byte _08109654 - .4byte _08109672 - .4byte _08109748 - .4byte _0810979C -_0810951C: - ldrh r1, [r4, 0x26] - lsls r1, 24 - lsrs r1, 24 - movs r3, 0x80 - lsls r3, 1 - movs r0, 0xE0 - str r0, [sp] - movs r0, 0x80 - lsls r0, 2 - str r0, [sp, 0x4] - movs r0, 0x20 - str r0, [sp, 0x8] - adds r0, r4, 0 - adds r2, r3, 0 - bl sub_80A805C - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_08109542: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _0810958A - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08109578 - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x3 - b _08109588 - .pool -_08109578: - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, =0x0000fffd -_08109588: - strh r1, [r0, 0x24] -_0810958A: - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _081095B8 - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _081095B8 - movs r0, 0 - strh r0, [r4, 0xE] - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x22] - adds r1, 0x1 - strh r1, [r0, 0x22] -_081095B8: - adds r0, r4, 0 - bl sub_80A80C8 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - beq _081095C8 - b _081097AA -_081095C8: - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - bl sub_80A7E6C - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r5, [r0, 0x24] - strh r5, [r4, 0xA] - strh r5, [r4, 0xC] - strh r5, [r4, 0xE] - b _08109790 - .pool -_081095F4: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - bgt _08109604 - b _081097AA -_08109604: - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _0810962E - ldrh r1, [r4, 0x26] - lsls r1, 24 - lsrs r1, 24 - movs r3, 0x80 - lsls r3, 2 - movs r0, 0xC0 - lsls r0, 1 - str r0, [sp] - movs r0, 0xF0 - str r0, [sp, 0x4] - movs r0, 0x6 - str r0, [sp, 0x8] - adds r0, r4, 0 - movs r2, 0xE0 - bl sub_80A805C - b _0810964E -_0810962E: - ldrh r1, [r4, 0x26] - lsls r1, 24 - lsrs r1, 24 - movs r3, 0x80 - lsls r3, 2 - movs r0, 0xC0 - lsls r0, 1 - str r0, [sp] - movs r0, 0xC0 - str r0, [sp, 0x4] - movs r0, 0x6 - str r0, [sp, 0x8] - adds r0, r4, 0 - movs r2, 0xE0 - bl sub_80A805C -_0810964E: - movs r0, 0 - strh r0, [r4, 0xA] - b _08109790 -_08109654: - adds r0, r4, 0 - bl sub_80A80C8 - lsls r0, 24 - cmp r0, 0 - beq _08109662 - b _081097AA -_08109662: - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - adds r1, r5, 0 - movs r2, 0x6 - bl sub_81097B4 - b _08109790 -_08109672: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _081096C0 - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _081096AC - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x26] - adds r1, 0x3 - b _081096BE - .pool -_081096AC: - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x26] - subs r1, 0x3 -_081096BE: - strh r1, [r0, 0x26] -_081096C0: - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x18 - ble _081097AA - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _081096FC - ldrh r1, [r4, 0x26] - lsls r1, 24 - lsrs r1, 24 - movs r2, 0xC0 - lsls r2, 1 - movs r0, 0x80 - lsls r0, 1 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0x8 - str r0, [sp, 0x8] - adds r0, r4, 0 - movs r3, 0xF0 - bl sub_80A805C - b _0810971A - .pool -_081096FC: - ldrh r1, [r4, 0x26] - lsls r1, 24 - lsrs r1, 24 - movs r2, 0xC0 - lsls r2, 1 - movs r0, 0x80 - lsls r0, 1 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0x8 - str r0, [sp, 0x8] - adds r0, r4, 0 - movs r3, 0xC0 - bl sub_80A805C -_0810971A: - ldrh r1, [r4, 0xC] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08109738 - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x26] - subs r1, 0x3 - strh r1, [r0, 0x26] -_08109738: - movs r0, 0 - strh r0, [r4, 0xA] - strh r0, [r4, 0xC] - strh r0, [r4, 0xE] - b _08109790 - .pool -_08109748: - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08109764 - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x22] - subs r1, 0x1 - strh r1, [r0, 0x22] -_08109764: - adds r0, r4, 0 - bl sub_80A80C8 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _081097AA - ldr r2, =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r4, 0x10] - strh r1, [r0, 0x22] - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - bl sub_80A7344 - strh r5, [r4, 0xC] -_08109790: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _081097AA - .pool -_0810979C: - movs r1, 0x14 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081097AA - adds r0, r5, 0 - bl DestroyAnimVisualTask -_081097AA: - add sp, 0xC - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81094D0 - - thumb_func_start sub_81097B4 -sub_81097B4: @ 81097B4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r1, 24 - lsrs r7, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - adds r0, r4, 0 - bl sub_8109930 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - ldr r1, =gSprites - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrh r4, [r0, 0x20] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _0810980C - adds r0, r4, 0 - subs r0, 0xC - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0x1 - b _08109816 - .pool -_0810980C: - adds r0, r4, 0 - adds r0, 0x10 - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0xFF -_08109816: - movs r6, 0 - movs r5, 0 - lsls r4, 16 - str r4, [sp, 0x8] - mov r1, r9 - lsls r1, 16 - str r1, [sp, 0x4] - ldr r2, =gUnknown_085955CC - mov r9, r2 - lsls r0, 24 - asrs r0, 24 - str r0, [sp] - mov r3, r8 - lsls r3, 1 - mov r10, r3 -_08109834: - ldr r0, =gUnknown_085955B4 - ldr r2, [sp, 0x8] - asrs r1, r2, 16 - ldr r3, [sp, 0x4] - asrs r2, r3, 16 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _081098B6 - ldr r1, =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r4, r0, r1 - ldrh r2, [r4, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - lsls r0, r5, 2 - adds r0, 0x40 - adds r1, r0 - ldr r3, =0x000003ff - adds r0, r3, 0 - ands r1, r0 - ldr r3, =0xfffffc00 - adds r0, r3, 0 - ands r2, r0 - orrs r2, r1 - strh r2, [r4, 0x4] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x4 - bls _0810987E - movs r5, 0 -_0810987E: - lsls r2, r6, 2 - mov r1, r9 - adds r0, r2, r1 - ldrh r0, [r0] - ldr r3, [sp] - adds r1, r0, 0 - muls r1, r3 - lsls r1, 16 - asrs r1, 16 - ldr r0, =gUnknown_085955CC+2 - adds r2, r0 - movs r3, 0 - ldrsh r2, [r2, r3] - adds r0, r4, 0 - bl sub_8109984 - strh r7, [r4, 0x3A] - mov r0, r8 - strh r0, [r4, 0x3C] - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - add r0, r10 - ldr r1, =gTasks + 0x8 - adds r0, r1 - ldrh r1, [r0] - adds r1, 0x1 - strh r1, [r0] -_081098B6: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x6 - bls _08109834 - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81097B4 - - thumb_func_start sub_81098EC -sub_81098EC: @ 81098EC - push {r4,lr} - adds r4, r0, 0 - bl sub_81099A0 - adds r0, r4, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _08109926 - ldr r3, =gTasks - movs r0, 0x3C - ldrsh r1, [r4, r0] - lsls r1, 1 - movs r0, 0x3A - ldrsh r2, [r4, r0] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0 - adds r3, 0x8 - adds r1, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - adds r0, r4, 0 - bl DestroySprite -_08109926: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81098EC - - thumb_func_start sub_8109930 -sub_8109930: @ 8109930 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrh r2, [r1, 0x26] - ldrh r0, [r1, 0x22] - adds r2, r0 - adds r1, 0x29 - movs r0, 0 - ldrsb r0, [r1, r0] - adds r0, r2 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08109970 - lsls r0, r4, 16 - movs r1, 0x94 - lsls r1, 15 - b _08109976 - .pool -_08109970: - lsls r0, r4, 16 - movs r1, 0xB0 - lsls r1, 14 -_08109976: - adds r0, r1 - lsrs r4, r0, 16 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8109930 - - thumb_func_start sub_8109984 -sub_8109984: @ 8109984 - movs r3, 0 - strh r3, [r0, 0x2E] - strh r3, [r0, 0x30] - ldrh r3, [r0, 0x20] - lsls r3, 3 - strh r3, [r0, 0x32] - ldrh r3, [r0, 0x22] - lsls r3, 3 - strh r3, [r0, 0x34] - lsls r1, 3 - strh r1, [r0, 0x36] - lsls r2, 3 - strh r2, [r0, 0x38] - bx lr - thumb_func_end sub_8109984 - - thumb_func_start sub_81099A0 -sub_81099A0: @ 81099A0 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _081099CA - movs r0, 0 - strh r0, [r2, 0x2E] - ldrh r0, [r2, 0x30] - adds r0, 0x1 - strh r0, [r2, 0x30] - ldrh r0, [r2, 0x30] - adds r1, r0, 0 - muls r1, r0 - adds r0, r1, 0 - ldrh r3, [r2, 0x34] - adds r0, r3 - strh r0, [r2, 0x34] -_081099CA: - ldrh r0, [r2, 0x36] - ldrh r1, [r2, 0x32] - adds r0, r1 - strh r0, [r2, 0x32] - lsls r0, 16 - asrs r0, 19 - strh r0, [r2, 0x20] - ldrh r1, [r2, 0x38] - ldrh r3, [r2, 0x34] - adds r1, r3 - strh r1, [r2, 0x34] - lsls r1, 16 - asrs r3, r1, 19 - strh r3, [r2, 0x22] - adds r0, 0x8 - lsls r0, 16 - movs r1, 0x80 - lsls r1, 17 - cmp r0, r1 - bhi _08109A00 - adds r1, r3, 0 - movs r0, 0x8 - negs r0, r0 - cmp r1, r0 - blt _08109A00 - cmp r1, 0x78 - ble _08109A0C -_08109A00: - adds r0, r2, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] -_08109A0C: - pop {r0} - bx r0 - thumb_func_end sub_81099A0 - - thumb_func_start sub_8109A10 -sub_8109A10: @ 8109A10 - push {r4,r5,lr} - ldr r3, =gBattleAnimArgs - ldrh r1, [r3] - movs r2, 0 - strh r1, [r0, 0x20] - ldrh r1, [r3, 0x2] - strh r1, [r0, 0x22] - strh r2, [r0, 0x2E] - strh r2, [r0, 0x30] - strh r2, [r0, 0x32] - ldrh r1, [r3, 0x4] - strh r1, [r0, 0x3A] - ldrh r1, [r3, 0x6] - strh r1, [r0, 0x3C] - ldrh r4, [r0, 0x4] - lsls r2, r4, 22 - lsrs r2, 22 - movs r5, 0x8 - ldrsh r1, [r3, r5] - lsls r1, 4 - adds r2, r1 - ldr r3, =0x000003ff - adds r1, r3, 0 - ands r2, r1 - ldr r1, =0xfffffc00 - ands r1, r4 - orrs r1, r2 - strh r1, [r0, 0x4] - ldr r1, =sub_8109A64 - str r1, [r0, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109A10 - - thumb_func_start sub_8109A64 -sub_8109A64: @ 8109A64 - push {r4,lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0x1 - beq _08109A96 - cmp r0, 0x1 - bgt _08109A7A - cmp r0, 0 - beq _08109A80 - b _08109AF4 -_08109A7A: - cmp r0, 0x2 - beq _08109AB4 - b _08109AF4 -_08109A80: - ldrh r1, [r2, 0x3A] - movs r3, 0x3A - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _08109A90 - subs r0, r1, 0x1 - strh r0, [r2, 0x3A] - b _08109AF4 -_08109A90: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] -_08109A96: - ldrh r0, [r2, 0x22] - adds r0, 0x8 - strh r0, [r2, 0x22] - lsls r0, 16 - asrs r0, 16 - ldrh r3, [r2, 0x3C] - movs r4, 0x3C - ldrsh r1, [r2, r4] - cmp r0, r1 - blt _08109AF4 - strh r3, [r2, 0x22] - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - b _08109AF4 -_08109AB4: - ldrh r0, [r2, 0x30] - adds r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08109AE0 - movs r0, 0 - strh r0, [r2, 0x30] - ldrh r0, [r2, 0x32] - adds r0, 0x1 - strh r0, [r2, 0x32] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08109ADC - ldr r0, =0x0000fffd - b _08109ADE - .pool -_08109ADC: - movs r0, 0x3 -_08109ADE: - strh r0, [r2, 0x26] -_08109AE0: - ldrh r0, [r2, 0x34] - adds r0, 0x1 - strh r0, [r2, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - ble _08109AF4 - adds r0, r2, 0 - bl DestroyAnimSprite -_08109AF4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8109A64 - - thumb_func_start sub_8109AFC -sub_8109AFC: @ 8109AFC - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _08109B70 - cmp r0, 0x1 - bgt _08109B12 - cmp r0, 0 - beq _08109B18 - b _08109C3E -_08109B12: - cmp r0, 0x2 - beq _08109BCE - b _08109C3E -_08109B18: - adds r0, r5, 0 - movs r1, 0 - bl InitAnimSpritePos - ldr r4, =gBattleAnimArgs - ldrb r1, [r4, 0x4] - adds r0, r5, 0 - bl StartSpriteAnim - ldrh r0, [r4, 0x4] - strh r0, [r5, 0x3C] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08109B48 - movs r0, 0x4 - b _08109B4A - .pool -_08109B48: - ldr r0, =0x0000fffc -_08109B4A: - strh r0, [r5, 0x36] - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8328 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r5, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - b _08109BC6 - .pool -_08109B70: - ldrh r0, [r5, 0x30] - adds r0, 0xC0 - strh r0, [r5, 0x30] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08109B94 - ldrh r0, [r5, 0x30] - lsls r0, 16 - asrs r0, 24 - negs r0, r0 - b _08109B9A - .pool -_08109B94: - ldrh r0, [r5, 0x30] - lsls r0, 16 - asrs r0, 24 -_08109B9A: - strh r0, [r5, 0x26] - movs r2, 0x32 - ldrsh r0, [r5, r2] - movs r2, 0x36 - ldrsh r1, [r5, r2] - bl Sin - strh r0, [r5, 0x24] - ldrh r0, [r5, 0x32] - adds r0, 0x4 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x34] - adds r0, 0x1 - strh r0, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _08109C3E - movs r0, 0 - strh r0, [r5, 0x34] -_08109BC6: - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - b _08109C3E -_08109BCE: - movs r1, 0x32 - ldrsh r0, [r5, r1] - movs r2, 0x36 - ldrsh r1, [r5, r2] - bl Sin - adds r2, r0, 0 - movs r3, 0 - strh r2, [r5, 0x24] - ldrh r0, [r5, 0x32] - adds r0, 0x4 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x34] - adds r0, 0x1 - strh r0, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - bne _08109C3E - ldrh r0, [r5, 0x20] - adds r1, r2, r0 - strh r1, [r5, 0x20] - ldrh r0, [r5, 0x26] - ldrh r2, [r5, 0x22] - adds r0, r2 - strh r0, [r5, 0x22] - strh r3, [r5, 0x26] - strh r3, [r5, 0x24] - movs r0, 0x80 - lsls r0, 1 - strh r0, [r5, 0x2E] - strh r1, [r5, 0x30] - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x22] - strh r0, [r5, 0x34] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - adds r0, r5, 0 - bl sub_80A6FD4 - ldr r0, =sub_8109C4C - str r0, [r5, 0x1C] -_08109C3E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109AFC - - thumb_func_start sub_8109C4C -sub_8109C4C: @ 8109C4C - push {r4,lr} - adds r4, r0, 0 - bl TranslateAnimLinear - lsls r0, 24 - cmp r0, 0 - bne _08109CA4 - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0x10 - bl Sin - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - ldrh r2, [r4, 0x38] - adds r0, r2, 0x4 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x38] - lsls r2, 16 - asrs r2, 16 - cmp r2, 0 - beq _08109C82 - cmp r2, 0xC4 - ble _08109CAA -_08109C82: - lsls r0, 16 - cmp r0, 0 - ble _08109CAA - movs r1, 0x3C - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08109CAA - ldr r0, =gUnknown_02038440 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x90 - bl PlaySE12WithPanning - b _08109CAA - .pool -_08109CA4: - adds r0, r4, 0 - bl DestroyAnimSprite -_08109CAA: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8109C4C - - thumb_func_start sub_8109CB0 -sub_8109CB0: @ 8109CB0 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08109CC8 - ldr r0, =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r4, 0x30] - adds r0, r1, 0x1 - strh r0, [r4, 0x2E] -_08109CC8: - movs r0, 0xC0 - lsls r0, 1 - adds r1, r0, 0 - ldrh r2, [r4, 0x34] - adds r1, r2 - strh r1, [r4, 0x34] - ldrh r0, [r4, 0x36] - adds r0, 0xA0 - strh r0, [r4, 0x36] - movs r2, 0x30 - ldrsh r0, [r4, r2] - lsls r1, 16 - asrs r1, 24 - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - ldrh r1, [r4, 0x36] - lsls r1, 16 - asrs r1, 24 - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x30] - adds r0, 0x7 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x30] - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _08109D64 - ldrh r0, [r4, 0x30] - subs r0, 0x40 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x83 - bls _08109D3C - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8328 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x5] - b _08109D80 - .pool -_08109D3C: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8328 - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - movs r1, 0x3 - ands r0, r1 - lsls r0, 2 - ldrb r2, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0x5] - b _08109D80 - .pool -_08109D64: - ldrh r0, [r4, 0x30] - subs r0, 0x40 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x83 - bls _08109D78 - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1D - b _08109D7E -_08109D78: - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1F -_08109D7E: - strb r0, [r1] -_08109D80: - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x14 - ble _08109DA8 - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_08109DA8: - movs r2, 0x32 - ldrsh r0, [r4, r2] - cmp r0, 0x1E - bne _08109DB6 - adds r0, r4, 0 - bl DestroyAnimSprite -_08109DB6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8109CB0 - - thumb_func_start sub_8109DBC -sub_8109DBC: @ 8109DBC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks - adds r4, r1, r0 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - movs r2, 0x1 - negs r2, r2 - adds r1, r2, 0 - cmp r0, 0 - bne _08109DE2 - movs r1, 0x1 -_08109DE2: - strh r1, [r4, 0x20] - ldr r0, =gBattleAnimTarget - ldrb r1, [r0] - movs r0, 0x2 - eors r0, r1 - bl IsBattlerSpriteVisible - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - strh r0, [r4, 0x22] - movs r0, 0x1 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x24] - movs r0, 0x3 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x26] - ldr r0, =sub_8109E2C - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109DBC - - thumb_func_start sub_8109E2C -sub_8109E2C: @ 8109E2C - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks - adds r2, r0, r1 - movs r0, 0x8 - ldrsh r3, [r2, r0] - cmp r3, 0x1 - beq _08109EF4 - cmp r3, 0x1 - bgt _08109E54 - cmp r3, 0 - beq _08109E62 - b _0810A054 - .pool -_08109E54: - cmp r3, 0x2 - bne _08109E5A - b _08109F7C -_08109E5A: - cmp r3, 0x3 - bne _08109E60 - b _0810A010 -_08109E60: - b _0810A054 -_08109E62: - movs r1, 0x20 - ldrsh r0, [r2, r1] - lsls r0, 1 - ldrh r5, [r2, 0x1C] - adds r0, r5 - strh r0, [r2, 0x1C] - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08109E94 - strh r3, [r2, 0xA] - ldrh r0, [r2, 0xC] - adds r0, 0x1 - strh r0, [r2, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08109E90 - movs r0, 0x2 - b _08109E92 -_08109E90: - ldr r0, =0x0000fffe -_08109E92: - strh r0, [r2, 0x1E] -_08109E94: - movs r1, 0 - strh r1, [r2, 0xE] - movs r7, 0x22 - ldrsh r0, [r2, r7] - cmp r1, r0 - bge _08109ED6 - ldr r4, =gSprites - adds r3, r2, 0 - adds r3, 0x8 -_08109EA6: - movs r1, 0xE - ldrsh r0, [r2, r1] - adds r0, 0xE - lsls r0, 1 - adds r0, r3, r0 - movs r5, 0 - ldrsh r0, [r0, r5] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r2, 0x1E] - ldrh r7, [r2, 0x1C] - adds r0, r7 - strh r0, [r1, 0x24] - ldrh r0, [r2, 0xE] - adds r0, 0x1 - strh r0, [r2, 0xE] - lsls r0, 16 - asrs r0, 16 - movs r5, 0x22 - ldrsh r1, [r2, r5] - cmp r0, r1 - blt _08109EA6 -_08109ED6: - ldrh r0, [r2, 0x1A] - adds r0, 0x1 - strh r0, [r2, 0x1A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - beq _08109EE6 - b _0810A054 -_08109EE6: - movs r0, 0 - strh r0, [r2, 0x1A] - b _0810A000 - .pool -_08109EF4: - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _08109F1C - movs r0, 0 - strh r0, [r2, 0xA] - ldrh r0, [r2, 0xC] - adds r0, 0x1 - strh r0, [r2, 0xC] - ands r0, r3 - lsls r0, 16 - cmp r0, 0 - beq _08109F18 - movs r0, 0x2 - b _08109F1A -_08109F18: - ldr r0, =0x0000fffe -_08109F1A: - strh r0, [r2, 0x1E] -_08109F1C: - movs r1, 0 - strh r1, [r2, 0xE] - movs r7, 0x22 - ldrsh r0, [r2, r7] - cmp r1, r0 - bge _08109F5E - ldr r4, =gSprites - adds r3, r2, 0 - adds r3, 0x8 -_08109F2E: - movs r1, 0xE - ldrsh r0, [r2, r1] - adds r0, 0xE - lsls r0, 1 - adds r0, r3, r0 - movs r5, 0 - ldrsh r0, [r0, r5] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r2, 0x1E] - ldrh r7, [r2, 0x1C] - adds r0, r7 - strh r0, [r1, 0x24] - ldrh r0, [r2, 0xE] - adds r0, 0x1 - strh r0, [r2, 0xE] - lsls r0, 16 - asrs r0, 16 - movs r5, 0x22 - ldrsh r1, [r2, r5] - cmp r0, r1 - blt _08109F2E -_08109F5E: - ldrh r0, [r2, 0x1A] - adds r0, 0x1 - strh r0, [r2, 0x1A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x60 - bne _0810A054 - movs r0, 0 - strh r0, [r2, 0x1A] - b _0810A000 - .pool -_08109F7C: - movs r7, 0x20 - ldrsh r1, [r2, r7] - lsls r1, 1 - ldrh r0, [r2, 0x1C] - subs r0, r1 - strh r0, [r2, 0x1C] - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08109FB0 - movs r0, 0 - strh r0, [r2, 0xA] - ldrh r0, [r2, 0xC] - adds r0, 0x1 - strh r0, [r2, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08109FAC - strh r3, [r2, 0x1E] - b _08109FB0 -_08109FAC: - ldr r0, =0x0000fffe - strh r0, [r2, 0x1E] -_08109FB0: - movs r1, 0 - strh r1, [r2, 0xE] - movs r3, 0x22 - ldrsh r0, [r2, r3] - cmp r1, r0 - bge _08109FF2 - ldr r4, =gSprites - adds r3, r2, 0 - adds r3, 0x8 -_08109FC2: - movs r5, 0xE - ldrsh r0, [r2, r5] - adds r0, 0xE - lsls r0, 1 - adds r0, r3, r0 - movs r7, 0 - ldrsh r0, [r0, r7] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r2, 0x1E] - ldrh r5, [r2, 0x1C] - adds r0, r5 - strh r0, [r1, 0x24] - ldrh r0, [r2, 0xE] - adds r0, 0x1 - strh r0, [r2, 0xE] - lsls r0, 16 - asrs r0, 16 - movs r7, 0x22 - ldrsh r1, [r2, r7] - cmp r0, r1 - blt _08109FC2 -_08109FF2: - ldrh r0, [r2, 0x1A] - adds r0, 0x1 - strh r0, [r2, 0x1A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - bne _0810A054 -_0810A000: - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _0810A054 - .pool -_0810A010: - movs r1, 0 - strh r1, [r2, 0xE] - movs r3, 0x22 - ldrsh r0, [r2, r3] - cmp r1, r0 - bge _0810A04E - ldr r6, =gSprites - adds r3, r2, 0 - adds r3, 0x8 - movs r5, 0 -_0810A024: - movs r7, 0xE - ldrsh r0, [r2, r7] - adds r0, 0xE - lsls r0, 1 - adds r0, r3, r0 - movs r7, 0 - ldrsh r1, [r0, r7] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - strh r5, [r0, 0x24] - ldrh r0, [r2, 0xE] - adds r0, 0x1 - strh r0, [r2, 0xE] - lsls r0, 16 - asrs r0, 16 - movs r7, 0x22 - ldrsh r1, [r2, r7] - cmp r0, r1 - blt _0810A024 -_0810A04E: - adds r0, r4, 0 - bl DestroyAnimVisualTask -_0810A054: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8109E2C - - thumb_func_start AnimTask_BlendBackground -AnimTask_BlendBackground: @ 810A060 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - mov r0, sp - bl sub_80A6B30 - mov r0, sp - ldrb r0, [r0, 0x8] - lsls r0, 4 - ldr r1, =gBattleAnimArgs - ldrb r2, [r1] - ldrh r3, [r1, 0x2] - movs r1, 0x10 - bl BlendPalette - adds r0, r4, 0 - bl DestroyAnimVisualTask - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end AnimTask_BlendBackground - - thumb_func_start sub_810A094 -sub_810A094: @ 810A094 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - mov r9, r1 - ldr r4, =gBattleAnimArgs - mov r8, r4 - cmp r0, 0 - bne _0810A0CA - ldrh r0, [r4] - strh r0, [r2, 0xA] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0xC] - ldrh r0, [r4, 0x4] - strh r0, [r2, 0xE] - ldrh r0, [r4, 0x6] - strh r0, [r2, 0x10] -_0810A0CA: - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - ldr r1, =gBattlerSpriteIds - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - adds r0, r1 - ldrb r6, [r0] - movs r5, 0x10 - ldrsh r0, [r2, r5] - cmp r0, 0 - bne _0810A100 - ldr r4, =gUnknown_08595684 - movs r1, 0x8 - ldrsh r0, [r2, r1] - b _0810A106 - .pool -_0810A100: - ldr r4, =gUnknown_08595694 - movs r3, 0x8 - ldrsh r0, [r2, r3] -_0810A106: - movs r1, 0xA - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - adds r0, r4 - ldrb r5, [r0] - lsls r0, r7, 2 - adds r1, r0, r7 - lsls r1, 3 - add r1, r9 - movs r4, 0xE - ldrsh r1, [r1, r4] - mov r12, r0 - cmp r1, 0x1 - bne _0810A154 - ldr r2, =gSprites - lsls r3, r6, 4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - mov r10, r0 - mov r0, r8 - movs r4, 0x2 - ldrsh r1, [r0, r4] - lsls r0, r5, 24 - asrs r0, 24 - muls r0, r1 - cmp r0, 0 - bge _0810A144 - negs r0, r0 -_0810A144: - mov r5, r10 - strh r0, [r5, 0x26] - b _0810A16E - .pool -_0810A154: - ldr r3, =gSprites - lsls r4, r6, 4 - adds r2, r4, r6 - lsls r2, 2 - adds r2, r3 - lsls r0, r5, 24 - asrs r0, 24 - mov r5, r8 - ldrh r1, [r5, 0x2] - muls r0, r1 - strh r0, [r2, 0x24] - adds r2, r3, 0 - adds r3, r4, 0 -_0810A16E: - mov r1, r12 - adds r0, r1, r7 - lsls r0, 3 - add r0, r9 - movs r4, 0x8 - ldrsh r1, [r0, r4] - movs r5, 0xA - ldrsh r0, [r0, r5] - cmp r1, r0 - bne _0810A194 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - movs r1, 0 - strh r1, [r0, 0x24] - strh r1, [r0, 0x26] - adds r0, r7, 0 - bl DestroyAnimVisualTask -_0810A194: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810A094 - - .align 2, 0 diff --git a/ld_script.txt b/ld_script.txt index 8137574d1..275709806 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -159,7 +159,6 @@ SECTIONS { asm/battle_anim_effects_2.o(.text); asm/water.o(.text); src/fire.o(.text); - asm/fire.o(.text); asm/electric.o(.text); asm/ice.o(.text); src/fight.o(.text); diff --git a/src/fire.c b/src/fire.c index 09bdd8d02..c5db6dbce 100644 --- a/src/fire.c +++ b/src/fire.c @@ -1,24 +1,51 @@ #include "global.h" #include "battle_anim.h" #include "constants/rgb.h" +#include "constants/songs.h" +#include "sound.h" +#include "util.h" +#include "task.h" +#include "trig.h" -extern void sub_8108EC8(struct Sprite *); -extern void sub_8108F08(struct Sprite *); -extern void sub_8108FBC(struct Sprite *); -extern void sub_8108F4C(struct Sprite *); -extern void sub_8109064(struct Sprite *); -extern void sub_810916C(struct Sprite *); +//battle anim +extern void sub_80A7E6C(u8 spriteId); +extern void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); +extern u8 sub_80A80C8(struct Task *task); + +extern void sub_80A653C(struct Sprite *); +static void sub_8108EC8(struct Sprite *); +static void sub_8108F08(struct Sprite *); +static void sub_8108F4C(struct Sprite *); +static void sub_8108FBC(struct Sprite *); +static void sub_8109028(struct Sprite *); +static void sub_8109064(struct Sprite *); +static void sub_81090D8(struct Sprite *); +static void sub_810916C(struct Sprite *); extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *); -extern void sub_8109198(struct Sprite *); -extern void sub_8109200(struct Sprite *); -extern void sub_810921C(struct Sprite *); -extern void sub_8109364(struct Sprite *); -extern void sub_81093A4(struct Sprite *); +static void AnimEmberFlare(struct Sprite *); +static void sub_8109200(struct Sprite *); +static void AnimFireRing(struct Sprite *); +static void AnimFireRingStep1(struct Sprite *); +static void AnimFireRingStep2(struct Sprite *); +static void AnimFireRingStep3(struct Sprite *); +static void UpdateFireRingCircleOffset(struct Sprite *); +static void AnimFireCross(struct Sprite *); +static void sub_81093A4(struct Sprite *); +static void sub_81093E4(struct Sprite *); +static void sub_810940C(struct Sprite *); +static void sub_81094D0(u8 taskId); +static void sub_81097B4(u8 spriteId, u8 taskId, u8 a3); extern void sub_80A8EE4(struct Sprite *); -extern void sub_81098EC(struct Sprite *); -extern void sub_8109A10(struct Sprite *); -extern void sub_8109AFC(struct Sprite *); -extern void sub_8109CB0(struct Sprite *); +static void sub_81098EC(struct Sprite *); +static u16 sub_8109930(u8 spriteId); +static void sub_8109984(struct Sprite *sprite, s16 x, s16 y); +static void sub_81099A0(struct Sprite *); +static void sub_8109A10(struct Sprite *); +static void sub_8109A64(struct Sprite *); +static void sub_8109AFC(struct Sprite *); +static void sub_8109C4C(struct Sprite *); +static void sub_8109CB0(struct Sprite *); +static void sub_8109E2C(u8 taskId); const union AnimCmd gUnknown_08595340[] = { @@ -234,7 +261,7 @@ const struct SpriteTemplate gEmberFlareSpriteTemplate = .anims = gUnknown_085954D0, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8109198, + .callback = AnimEmberFlare, }; const struct SpriteTemplate gUnknown_08595504 = @@ -256,7 +283,7 @@ const struct SpriteTemplate gUnknown_0859551C = .anims = gUnknown_085954D0, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810921C, + .callback = AnimFireRing, }; const union AnimCmd gUnknown_08595534[] = @@ -297,7 +324,7 @@ const struct SpriteTemplate gUnknown_0859556C = .anims = gUnknown_08595540, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8109364, + .callback = AnimFireCross, }; const struct SpriteTemplate gBattleAnimSpriteTemplate_8595584 = @@ -437,7 +464,7 @@ const s8 gUnknown_08595694[16] = -1, 0, 1, 0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 1, }; -void sub_8108EC8(struct Sprite *sprite) +static void sub_8108EC8(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = 0x3C; @@ -449,4 +476,854 @@ void sub_8108EC8(struct Sprite *sprite) sprite->callback = sub_80A634C; sprite->callback(sprite); +} + +static void sub_8108F08(struct Sprite *sprite) +{ + sub_80A6864(sprite, gBattleAnimArgs[0]); + + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[2] = gBattleAnimArgs[3]; + + sprite->callback = sub_80A656C; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +static void sub_8108F4C(struct Sprite *sprite) +{ + sub_80A6838(sprite); + + if (GetBattlerSide(gBattleAnimAttacker)) + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] = -gBattleAnimArgs[4]; + } + else + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[4]; + } + + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[4] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[5]; + + sprite->callback = sub_8109028; +} + +static void sub_8108FBC(struct Sprite *sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker)) + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[4]; + } + else + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] = -gBattleAnimArgs[4]; + } + + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[4] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[5]; + + sprite->callback = sub_8109028; +} + +static void sub_8109028(struct Sprite *sprite) +{ + if (++sprite->data[0] < sprite->data[4]) + { + sprite->pos2.x += sprite->data[2]; + sprite->pos2.y += sprite->data[3]; + } + + if (sprite->data[0] == sprite->data[1]) + move_anim_8074EE0(sprite); +} + +static void sub_8109064(struct Sprite *sprite) +{ + sub_80A6838(sprite); + + if (GetBattlerSide(gBattleAnimAttacker)) + { + sprite->pos1.x -= gBattleAnimArgs[0]; + } + else + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->subpriority = 8; + } + + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = gBattleAnimArgs[4]; + sprite->data[3] = gBattleAnimArgs[5]; + sprite->data[4] = gBattleAnimArgs[6]; + sprite->data[5] = 0; + + sprite->callback = sub_81090D8; +} + +static void sub_81090D8(struct Sprite *sprite) +{ + if (sprite->data[3]) + { + if(sprite->data[5] > 10000) + sprite->subpriority = 1; + + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); + sprite->pos2.y = Cos(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); + + sprite->data[0] += sprite->data[2]; + sprite->data[5] += sprite->data[4]; + + if (sprite->data[0] > 255) + sprite->data[0] -= 256; + else if (sprite->data[0] < 0) + sprite->data[0] += 256; + + sprite->data[3]--; + } + else + { + move_anim_8074EE0(sprite); + } +} + +//sunlight +static void sub_810916C(struct Sprite *sprite) +{ + sprite->pos1.x = 0; + sprite->pos1.y = 0; + sprite->data[0] = 60; + sprite->data[2] = 140; + sprite->data[4] = 80; + sprite->callback = StartAnimLinearTranslation; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +//fire 2 + +// Animates the secondary effect of MOVE_EMBER, where the flames grow and slide +// horizontally a bit. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: target x pixel offset +// arg 3: target y pixel offset +// arg 4: duration +// arg 5: ? (todo: something related to which mon the pixel offsets are based on) +// arg 6: ? (todo: something related to which mon the pixel offsets are based on) +static void AnimEmberFlare(struct Sprite *sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget) + && (gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT) + || gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))) + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + + sprite->callback = sub_80A7938; + sprite->callback(sprite); +} + +static void sub_8109200(struct Sprite *sprite) +{ + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + + sprite->callback = sub_80A7938; +} + +// Animates the a fire sprite in the first-half of the MOVE_FIRE_BLAST +// animation. The fire sprite first moves in a circle around the mon, +// and then it is translated towards the target mon, while still rotating. +// Lastly, it moves in a circle around the target mon. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: initial wave offset +//void AnimFireRing(struct Sprite *sprite) +void AnimFireRing(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 1); + + sprite->data[7] = gBattleAnimArgs[2]; + sprite->data[0] = 0; + + sprite->callback = AnimFireRingStep1; +} + +static void AnimFireRingStep1(struct Sprite *sprite) +{ + UpdateFireRingCircleOffset(sprite); + + if (++sprite->data[0] == 0x12) + { + sprite->data[0] = 0x19; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + + InitAnimLinearTranslation(sprite); + + sprite->callback = AnimFireRingStep2; + } +} + +static void AnimFireRingStep2(struct Sprite *sprite) +{ + if (TranslateAnimLinear(sprite)) + { + sprite->data[0] = 0; + + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->pos2.y = 0; + sprite->pos2.x = 0; + + sprite->callback = AnimFireRingStep3; + sprite->callback(sprite); + } + else + { + sprite->pos2.x += Sin(sprite->data[7], 28); + sprite->pos2.y += Cos(sprite->data[7], 28); + + sprite->data[7] = (sprite->data[7] + 20) & 0xFF; + } +} + +static void AnimFireRingStep3(struct Sprite *sprite) +{ + UpdateFireRingCircleOffset(sprite); + + if (++sprite->data[0] == 0x1F) + DestroyAnimSprite(sprite); +} + +static void UpdateFireRingCircleOffset(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[7], 28); + sprite->pos2.y = Cos(sprite->data[7], 28); + + sprite->data[7] = (sprite->data[7] + 20) & 0xFF; +} + +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: duration +// arg 3: x delta +// arg 4: y delta +// AnimFireCross(struct Sprite *sprite) +static void AnimFireCross(struct Sprite *sprite) +{ + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = gBattleAnimArgs[4]; + + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + + sprite->callback = sub_80A653C; //TranslateSpriteOverDuration +} + +static void sub_81093A4(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 1); + + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[3]; + + sprite->invisible = TRUE; + sprite->callback = WaitAnimForDuration; + + StoreSpriteCallbackInData6(sprite, sub_81093E4); +} + +static void sub_81093E4(struct Sprite *sprite) +{ + sprite->invisible = FALSE; + + sprite->data[0] = sprite->data[1]; + sprite->data[1] = 0; + + sprite->callback = sub_810940C; + sprite->callback(sprite); +} + +static void sub_810940C(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[1], sprite->data[2] >> 8); + sprite->pos2.y = Cos(sprite->data[1], sprite->data[2] >> 8); + + sprite->data[1] = (sprite->data[1] + 10) & 0xFF; + sprite->data[2] += 0xD0; + + if (--sprite->data[0] == -1) + DestroyAnimSprite(sprite); +} + +void sub_8109460(u8 taskId) // initialize animation task for Move_ERUPTION? +{ + struct Task *task = &gTasks[taskId]; + + task->data[15] = GetAnimBattlerSpriteId(0); + + task->data[0] = 0; + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 0; + task->data[4] = gSprites[task->data[15]].pos1.y; + task->data[5] = GetBattlerSide(gBattleAnimAttacker); + task->data[6] = 0; + + sub_80A7270(task->data[15], 0); + + task->func = sub_81094D0; +} + +static void sub_81094D0(u8 taskId) // animate Move_ERUPTION? +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_80A805C(task, task->data[15], 0x100, 0x100, 0xE0, 0x200, 0x20); + + task->data[0]++; + case 1: + if (++task->data[1] > 1) + { + task->data[1] = 0; + + if (++task->data[2] & 0x1) + gSprites[task->data[15]].pos2.x = 3; + else + gSprites[task->data[15]].pos2.x = -3; + } + + if (task->data[5]) + { + if (++task->data[3] > 4) + { + task->data[3] = 0; + gSprites[task->data[15]].pos1.y++; + } + } + + if(!sub_80A80C8(task)) + { + sub_80A7E6C(task->data[15]); + gSprites[task->data[15]].pos2.x = 0; + + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 0; + task->data[0]++; + } + break; + case 2: + if (++task->data[1] > 4) + { + if (task->data[5]) + sub_80A805C(task, task->data[15], 0xE0, 0x200, 0x180, 0xF0, 0x6); + else + sub_80A805C(task, task->data[15], 0xE0, 0x200, 0x180, 0xC0, 0x6); + + task->data[1] = 0; + task->data[0]++; + } + break; + case 3: + if (!sub_80A80C8(task)) + { + sub_81097B4(task->data[15], taskId, 6); + + task->data[0]++; + } + break; + case 4: + if (++task->data[1] > 1) + { + task->data[1] = 0; + + if (++task->data[2] & 1) + gSprites[task->data[15]].pos2.y += 3; + else + gSprites[task->data[15]].pos2.y -= 3; + } + + if (++task->data[3] > 0x18) + { + if (task->data[5]) + sub_80A805C(task, task->data[15], 0x180, 0xF0, 0x100, 0x100, 0x8); + else + sub_80A805C(task, task->data[15], 0x180, 0xC0, 0x100, 0x100, 0x8); + + if (task->data[2] & 1) + gSprites[task->data[15]].pos2.y -= 3; + + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 0; + task->data[0]++; + } + break; + case 5: + if (task->data[5]) + gSprites[task->data[15]].pos1.y--; + + if (!sub_80A80C8(task)) + { + gSprites[task->data[15]].pos1.y = task->data[4]; + sub_80A7344(task->data[15]); + + task->data[2] = 0; + task->data[0]++; + } + break; + case 6: + if (!task->data[6]) + DestroyAnimVisualTask(taskId); + + break; + default: + } +} + +static void sub_81097B4(u8 spriteId, u8 taskId, u8 a3) +{ + u16 i, j; + s8 sign; + + u16 y = sub_8109930(spriteId); + u16 x = gSprites[spriteId].pos1.x; + + if(!GetBattlerSide(gBattleAnimAttacker)) + { + x -= 0xC; + sign = 1; + } + else + { + x += 0x10; + sign = -1; + } + + for (i = 0, j = 0; i <= 6; i++) + { + u8 spriteId = CreateSprite(&gUnknown_085955B4, x, y, 2); + + if (spriteId != 0x40) + { + gSprites[spriteId].oam.tileNum += j * 4 + 0x40; + + if (++j >= 5) + j = 0; + //gHeatedRockCoords + sub_8109984(&gSprites[spriteId], gUnknown_085955CC[i][0] * sign, gUnknown_085955CC[i][1]); + gSprites[spriteId].data[6] = taskId; + gSprites[spriteId].data[7] = a3; + + gTasks[taskId].data[a3]++; + } + } +} + +static void sub_81098EC(struct Sprite *sprite) +{ + sub_81099A0(sprite); + + if (sprite->invisible) + { + gTasks[sprite->data[6]].data[sprite->data[7]]--; + DestroySprite(sprite); + } +} + +static u16 sub_8109930(u8 spriteId) +{ + u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY; + + if (GetBattlerSide(gBattleAnimAttacker) == 0) + { + var1 = ((var1 << 16) + 0x4A0000) >> 16; + } + else + { + var1 = ((var1 << 16) + 0x2C0000) >> 16; + } + + return var1; +} + +static void sub_8109984(struct Sprite *sprite, s16 x, s16 y) +{ + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = (u16)sprite->pos1.x * 8; + sprite->data[3] = (u16)sprite->pos1.y * 8; + sprite->data[4] = x * 8; + sprite->data[5] = y * 8; +} + +static void sub_81099A0(struct Sprite *sprite) +{ + int var1; + if (++sprite->data[0] > 2) + { + sprite->data[0] = 0; + ++sprite->data[1]; + var1 = (u16)sprite->data[1] * (u16)sprite->data[1]; + sprite->data[3] += var1; + } + + sprite->data[2] += sprite->data[4]; + sprite->pos1.x = sprite->data[2] >> 3; + sprite->data[3] += sprite->data[5]; + sprite->pos1.y = sprite->data[3] >> 3; + + if (sprite->pos1.x < -8 || sprite->pos1.x > 0xf8 || sprite->pos1.y < -8 || sprite->pos1.y > 120) + sprite->invisible = TRUE; +} + +static void sub_8109A10(struct Sprite *sprite) +{ + sprite->pos1.x = gBattleAnimArgs[0]; + sprite->pos1.y = gBattleAnimArgs[1]; + + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[6] = gBattleAnimArgs[2]; + sprite->data[7] = gBattleAnimArgs[3]; + + sprite->oam.tileNum += gBattleAnimArgs[4] * 16; + sprite->callback = sub_8109A64; +} + +static void sub_8109A64(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (sprite->data[6] != 0) + { + sprite->data[6]--; + return; + } + + sprite->data[0]++; + // fall through + case 1: + sprite->pos1.y += 8; + if (sprite->pos1.y >= sprite->data[7]) + { + sprite->pos1.y = sprite->data[7]; + sprite->data[0]++; + } + break; + case 2: + if (++sprite->data[1] > 1) + { + sprite->data[1] = 0; + if ((++sprite->data[2] & 1) != 0) + { + sprite->pos2.y = -3; + } + else + { + sprite->pos2.y = 3; + } + } + + if (++sprite->data[3] > 16) + { + DestroyAnimSprite(sprite); + } + break; + } +} + +//wisp orb +static void sub_8109AFC(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + InitAnimSpritePos(sprite, 0); + StartSpriteAnim(sprite, gBattleAnimArgs[2]); + sprite->data[7] = gBattleAnimArgs[2]; + + if (GetBattlerSide(gBattleAnimAttacker) != 0) + { + sprite->data[4] = 4; + } + else + { + sprite->data[4] = -4; + } + + sprite->oam.priority = sub_80A8328(gBattleAnimTarget); + sprite->data[0]++; + break; + case 1: + sprite->data[1] += 192; + if (GetBattlerSide(gBattleAnimAttacker) != 0) + { + sprite->pos2.y = -(sprite->data[1] >> 8); + } + else + { + sprite->pos2.y = sprite->data[1] >> 8; + } + + sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]); + sprite->data[2] = (sprite->data[2] + 4) & 0xFF; + + if (++sprite->data[3] == 1) + { + sprite->data[3] = 0; + sprite->data[0]++; + } + break; + case 2: + sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]); + sprite->data[2] = (sprite->data[2] + 4) & 0xFF; + + if (++sprite->data[3] == 31) + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.y = 0; + sprite->pos2.x = 0; + + sprite->data[0] = 256; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + + sub_80A6FD4(sprite); + sprite->callback = sub_8109C4C; + } + break; + } +} + +static void sub_8109C4C(struct Sprite *sprite) +{ + s16 initialData5; + s16 newData5; + + if (!TranslateAnimLinear(sprite)) + { + sprite->pos2.x += Sin(sprite->data[5], 16); + initialData5 = sprite->data[5]; + sprite->data[5] = (sprite->data[5] + 4) & 0xFF; + newData5 = sprite->data[5]; + + if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0) + { + PlaySE12WithPanning(SE_W172, gUnknown_02038440); + } + } + else + { + DestroyAnimSprite(sprite); + } +} + +//wisp fire +void sub_8109CB0(struct Sprite *sprite) +{ + if (!sprite->data[0]) + { + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[0] += 1; + } + + sprite->data[3] += 0xC0 * 2; + sprite->data[4] += 0xA0; + + sprite->pos2.x = Sin(sprite->data[1], sprite->data[3] >> 8); + sprite->pos2.y = Cos(sprite->data[1], sprite->data[4] >> 8); + + sprite->data[1] = (sprite->data[1] + 7) & 0xFF; + + if (!IsContest()) + { + if (sprite->data[1] < 64 || sprite->data[1] > 195) + sprite->oam.priority = sub_80A8328(gBattleAnimTarget); + else + sprite->oam.priority = sub_80A8328(gBattleAnimTarget) + 1; + } + else + { + if (sprite->data[1] < 64 || sprite->data[1] > 195) + sprite->subpriority = 0x1D; + else + sprite->subpriority = 0x1F; + } + + if (++sprite->data[2] > 0x14) + sprite->invisible ^= 1; + + if (sprite->data[2] == 0x1E) + DestroyAnimSprite(sprite); +} + +void sub_8109DBC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + task->data[12] = !GetBattlerSide(gBattleAnimAttacker) ? 1 : -1; + task->data[13] = IsBattlerSpriteVisible(gBattleAnimTarget ^ 2) + 1; + task->data[14] = GetAnimBattlerSpriteId(1); + task->data[15] = GetAnimBattlerSpriteId(3); + + task->func = sub_8109E2C; +} + +static void sub_8109E2C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[10] += task->data[12] * 2; + if (++task->data[1] >= 2) + { + task->data[1] = 0; + task->data[2]++; + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } + + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 16) + { + task->data[9] = 0; + task->data[0]++; + } + break; + case 1: + if (++task->data[1] >= 5) + { + task->data[1] = 0; + task->data[2]++; + + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } + + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 96) + { + task->data[9] = 0; + task->data[0]++; + } + break; + case 2: + task->data[10] -= task->data[12] * 2; + + if (++task->data[1] >= 2) + { + task->data[1] = 0; + task->data[2]++; + + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } + + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 16) + { + task->data[0]++; + } + break; + case 3: + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = 0; + } + + DestroyAnimVisualTask(taskId); + break; + } +} + +// Used to add a color mask to the battle interface / HUD in Heat Wave. +// arg 0: opacity +// arg 1: color code +void AnimTask_BlendBackground(u8 taskId) +{ + struct UnknownAnimStruct2 unk; + sub_80A6B30(&unk); + BlendPalette(unk.unk8 << 4, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); // u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor + DestroyAnimVisualTask(taskId); +} + +void sub_810A094(u8 taskId) +{ + s8 unk; + u8 spriteId; + + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[1] = gBattleAnimArgs[0]; + gTasks[taskId].data[2] = gBattleAnimArgs[1]; + gTasks[taskId].data[3] = gBattleAnimArgs[2]; + gTasks[taskId].data[4] = gBattleAnimArgs[3]; + } + gTasks[taskId].data[0]++; + + spriteId = gBattlerSpriteIds[gBattleAnimTarget]; + + if (!gTasks[taskId].data[4]) + unk = gUnknown_08595684[gTasks[taskId].data[0] % 10]; + else + unk = gUnknown_08595694[gTasks[taskId].data[0] % 10]; + + if (gTasks[taskId].data[3] == 1) + gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk; + else + gSprites[spriteId].pos2.x = gBattleAnimArgs[1] * unk; + + if (gTasks[taskId].data[0] == gTasks[taskId].data[1]) + { + gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].pos2.y = 0; + DestroyAnimVisualTask(taskId); + } } \ No newline at end of file -- cgit v1.2.3 From f3a25f83cf48868b64c7758e52a03445b55fdea5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 8 Dec 2018 11:56:59 -0600 Subject: Decompile roulette_util.c (#434) --- asm/roulette_util.s | 1431 ---------------------------------------------- include/roulette.h | 34 ++ include/roulette_util.h | 39 +- ld_script.txt | 2 +- src/fldeff_groundshake.c | 14 +- src/roulette_util.c | 700 +++++++++++++++++++++++ 6 files changed, 781 insertions(+), 1439 deletions(-) delete mode 100644 asm/roulette_util.s create mode 100755 include/roulette.h create mode 100755 src/roulette_util.c diff --git a/asm/roulette_util.s b/asm/roulette_util.s deleted file mode 100644 index 61f6f67b1..000000000 --- a/asm/roulette_util.s +++ /dev/null @@ -1,1431 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8151678 -sub_8151678: @ 8151678 - push {lr} - movs r1, 0 - strb r1, [r0] - strh r1, [r0, 0x2] - adds r0, 0x4 - movs r2, 0xC0 - bl memset - pop {r0} - bx r0 - thumb_func_end sub_8151678 - - thumb_func_start sub_815168C -sub_815168C: @ 815168C - push {r4-r7,lr} - adds r3, r0, 0 - lsls r1, 24 - lsrs r6, r1, 24 - cmp r6, 0xF - bhi _081516A8 - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 2 - adds r5, r3, r0 - ldrb r7, [r5, 0x4] - lsrs r0, r7, 7 - cmp r0, 0 - beq _081516AC -_081516A8: - movs r0, 0xFF - b _0815170A -_081516AC: - ldrh r0, [r2] - movs r4, 0 - strh r0, [r5, 0x8] - ldrh r0, [r2, 0x2] - strh r0, [r5, 0xA] - ldrb r0, [r2, 0x4] - strb r0, [r5, 0xC] - ldrb r0, [r2, 0x5] - strb r0, [r5, 0xD] - ldrb r0, [r2, 0x6] - strb r0, [r5, 0xE] - ldrb r3, [r2, 0x7] - lsls r0, r3, 27 - lsrs r0, 27 - ldrb r2, [r5, 0xF] - movs r1, 0x20 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - movs r0, 0x60 - ands r0, r3 - movs r2, 0x61 - negs r2, r2 - ands r1, r2 - orrs r1, r0 - lsls r3, 24 - asrs r3, 31 - lsls r3, 7 - movs r0, 0x7F - ands r1, r0 - orrs r1, r3 - strb r1, [r5, 0xF] - subs r0, 0xFF - ands r0, r7 - movs r2, 0x80 - orrs r0, r2 - strb r0, [r5, 0x4] - strb r4, [r5, 0x6] - strb r4, [r5, 0x5] - lsls r1, 24 - cmp r1, 0 - bge _08151704 - movs r0, 0xFF - b _08151706 -_08151704: - movs r0, 0x1 -_08151706: - strb r0, [r5, 0x7] - adds r0, r6, 0 -_0815170A: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_815168C - - thumb_func_start sub_8151710 -sub_8151710: @ 8151710 - push {r4,lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r4, r1, 0 - cmp r4, 0xF - bhi _0815173C - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r1, r2, r0 - ldrb r0, [r1, 0x4] - lsrs r0, 7 - cmp r0, 0 - beq _0815173C - adds r0, r1, 0x4 - movs r1, 0 - movs r2, 0xC - bl memset - adds r0, r4, 0 - b _0815173E -_0815173C: - movs r0, 0xFF -_0815173E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8151710 - - thumb_func_start sub_8151744 -sub_8151744: @ 8151744 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r5, r0, 0 - movs r0, 0 - mov r12, r0 - ldrb r1, [r5, 0x8] - cmp r12, r1 - bcc _0815175C - b _081518F4 -_0815175C: - movs r7, 0x1F - ldr r0, =0xfffffc1f - mov r10, r0 - movs r1, 0x7D - negs r1, r1 - mov r9, r1 - movs r0, 0x1F - mov r8, r0 -_0815176C: - ldrh r0, [r5, 0x6] - add r0, r12 - lsls r0, 1 - ldr r1, =gPlttBufferFaded - adds r3, r0, r1 - ldr r1, =gPlttBufferUnfaded - adds r6, r0, r1 - ldrb r0, [r5] - lsls r0, 25 - lsrs r0, 25 - cmp r0, 0x1 - beq _08151798 - cmp r0, 0x2 - beq _081517F6 - b _081518E2 - .pool -_08151798: - ldr r0, [r3] - lsls r2, r0, 27 - lsrs r0, r2, 27 - movs r1, 0x3 - ldrsb r1, [r5, r1] - adds r0, r1 - cmp r0, 0x1F - bhi _081517BA - lsrs r0, r2, 27 - adds r0, r1 - ands r0, r7 - ldrb r2, [r3] - movs r1, 0x20 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r3] -_081517BA: - ldr r0, [r3] - lsls r2, r0, 22 - lsrs r0, r2, 27 - movs r1, 0x3 - ldrsb r1, [r5, r1] - adds r0, r1 - cmp r0, 0x1F - bhi _081517DE - lsrs r0, r2, 27 - adds r0, r1 - mov r1, r8 - ands r0, r1 - lsls r0, 5 - ldrh r2, [r3] - mov r1, r10 - ands r1, r2 - orrs r1, r0 - strh r1, [r3] -_081517DE: - ldr r0, [r3] - lsls r2, r0, 17 - lsrs r0, r2, 27 - movs r1, 0x3 - ldrsb r1, [r5, r1] - adds r0, r1 - cmp r0, 0x1F - bls _081517F0 - b _081518E2 -_081517F0: - lsrs r0, r2, 27 - adds r0, r1 - b _081518D4 -_081517F6: - movs r0, 0x3 - ldrsb r0, [r5, r0] - cmp r0, 0 - bge _08151868 - ldr r0, [r3] - lsls r4, r0, 27 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 27 - lsrs r0, 27 - cmp r1, r0 - blt _08151826 - lsrs r0, r4, 27 - adds r0, r2 - ands r0, r7 - ldrb r2, [r3] - movs r1, 0x20 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r3] -_08151826: - ldr r0, [r3] - lsls r4, r0, 22 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 22 - lsrs r0, 27 - cmp r1, r0 - blt _08151850 - lsrs r0, r4, 27 - adds r0, r2 - mov r1, r8 - ands r0, r1 - lsls r0, 5 - ldrh r2, [r3] - mov r1, r10 - ands r1, r2 - orrs r1, r0 - strh r1, [r3] -_08151850: - ldr r0, [r3] - lsls r4, r0, 17 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 17 - lsrs r0, 27 - cmp r1, r0 - blt _081518E2 - b _081518D0 -_08151868: - ldr r0, [r3] - lsls r4, r0, 27 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 27 - lsrs r0, 27 - cmp r1, r0 - bgt _08151890 - lsrs r0, r4, 27 - adds r0, r2 - ands r0, r7 - ldrb r2, [r3] - movs r1, 0x20 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r3] -_08151890: - ldr r0, [r3] - lsls r4, r0, 22 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 22 - lsrs r0, 27 - cmp r1, r0 - bgt _081518BA - lsrs r0, r4, 27 - adds r0, r2 - mov r1, r8 - ands r0, r1 - lsls r0, 5 - ldrh r2, [r3] - mov r1, r10 - ands r1, r2 - orrs r1, r0 - strh r1, [r3] -_081518BA: - ldr r0, [r3] - lsls r4, r0, 17 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 17 - lsrs r0, 27 - cmp r1, r0 - bgt _081518E2 -_081518D0: - lsrs r0, r4, 27 - adds r0, r2 -_081518D4: - ands r0, r7 - lsls r0, 2 - ldrb r2, [r3, 0x1] - mov r1, r9 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0x1] -_081518E2: - mov r0, r12 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - ldrb r0, [r5, 0x8] - cmp r12, r0 - bcs _081518F4 - b _0815176C -_081518F4: - ldrb r1, [r5, 0x2] - adds r0, r1, 0x1 - strb r0, [r5, 0x2] - ldrb r0, [r5, 0xB] - lsls r0, 27 - lsls r1, 24 - asrs r0, 3 - cmp r1, r0 - beq _0815190A - movs r0, 0 - b _0815193E -_0815190A: - movs r0, 0 - strb r0, [r5, 0x2] - movs r0, 0x3 - ldrsb r0, [r5, r0] - negs r0, r0 - strb r0, [r5, 0x3] - ldrb r2, [r5] - movs r1, 0x7F - movs r0, 0x7F - ands r0, r2 - cmp r0, 0x1 - bne _0815192A - lsls r0, r2, 25 - lsrs r0, 25 - adds r0, 0x1 - b _08151930 -_0815192A: - lsls r0, r2, 25 - lsrs r0, 25 - subs r0, 0x1 -_08151930: - ands r0, r1 - movs r1, 0x80 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r5] - movs r0, 0x1 -_0815193E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8151744 - - thumb_func_start sub_815194C -sub_815194C: @ 815194C - push {r4,r5,lr} - adds r3, r0, 0 - movs r2, 0 - ldrb r0, [r3] - lsls r0, 25 - lsrs r0, 25 - cmp r0, 0x1 - beq _08151962 - cmp r0, 0x2 - beq _08151990 - b _081519CA -_08151962: - ldrb r0, [r3, 0x8] - cmp r2, r0 - bcs _08151982 - ldr r4, =gPlttBufferFaded -_0815196A: - ldrh r0, [r3, 0x6] - adds r0, r2 - lsls r0, 1 - adds r0, r4 - ldrh r1, [r3, 0x4] - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - ldrb r0, [r3, 0x8] - cmp r2, r0 - bcc _0815196A -_08151982: - ldrb r2, [r3] - lsls r1, r2, 25 - lsrs r1, 25 - adds r1, 0x1 - b _081519BC - .pool -_08151990: - ldrb r0, [r3, 0x8] - cmp r2, r0 - bcs _081519B4 - ldr r5, =gPlttBufferFaded - ldr r4, =gPlttBufferUnfaded -_0815199A: - ldrh r0, [r3, 0x6] - adds r0, r2 - lsls r0, 1 - adds r1, r0, r5 - adds r0, r4 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - ldrb r0, [r3, 0x8] - cmp r2, r0 - bcc _0815199A -_081519B4: - ldrb r2, [r3] - lsls r1, r2, 25 - lsrs r1, 25 - subs r1, 0x1 -_081519BC: - movs r0, 0x7F - ands r1, r0 - movs r0, 0x80 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_081519CA: - movs r0, 0x1 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_815194C - - thumb_func_start task_tutorial_controls_fadein -task_tutorial_controls_fadein: @ 81519DC - push {r4-r6,lr} - adds r4, r0, 0 - movs r5, 0 - ldrb r0, [r4] - cmp r0, 0 - beq _08151A40 -_081519E8: - ldrh r0, [r4, 0x2] - asrs r0, r5 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08151A36 - lsls r1, r5, 1 - adds r0, r1, r5 - lsls r3, r0, 2 - adds r2, r4, r3 - ldrb r0, [r2, 0x5] - subs r0, 0x1 - strb r0, [r2, 0x5] - lsls r0, 24 - lsrs r0, 24 - adds r6, r1, 0 - cmp r0, 0xFF - bne _08151A36 - ldrh r0, [r2, 0x8] - movs r2, 0x80 - lsls r2, 8 - adds r1, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _08151A24 - adds r0, r3, 0x4 - adds r0, r4, r0 - bl sub_8151744 - b _08151A2C -_08151A24: - adds r0, r3, 0x4 - adds r0, r4, r0 - bl sub_815194C -_08151A2C: - adds r0, r6, r5 - lsls r0, 2 - adds r0, r4, r0 - ldrb r1, [r0, 0xD] - strb r1, [r0, 0x5] -_08151A36: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xF - bls _081519E8 -_08151A40: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end task_tutorial_controls_fadein - - thumb_func_start sub_8151A48 -sub_8151A48: @ 8151A48 - push {r4-r7,lr} - adds r3, r0, 0 - lsls r1, 16 - lsrs r6, r1, 16 - movs r4, 0 - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] - movs r5, 0x1 - movs r7, 0x80 - negs r7, r7 -_08151A5E: - adds r0, r6, 0 - asrs r0, r4 - ands r0, r5 - cmp r0, 0 - beq _08151A8C - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r2, r3, r0 - ldrb r0, [r2, 0x4] - lsrs r0, 7 - cmp r0, 0 - beq _08151A8C - adds r0, r5, 0 - lsls r0, r4 - ldrh r1, [r3, 0x2] - orrs r0, r1 - strh r0, [r3, 0x2] - ldrb r1, [r2, 0x4] - adds r0, r7, 0 - ands r0, r1 - orrs r0, r5 - strb r0, [r2, 0x4] -_08151A8C: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bls _08151A5E - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8151A48 - - thumb_func_start sub_8151A9C -sub_8151A9C: @ 8151A9C - push {r4-r7,lr} - sub sp, 0x4 - adds r6, r0, 0 - lsls r1, 16 - lsrs r7, r1, 16 - movs r5, 0 - movs r3, 0x1 -_08151AAA: - ldrh r0, [r6, 0x2] - asrs r0, r5 - ands r0, r3 - cmp r0, 0 - beq _08151B12 - lsls r0, r5, 1 - adds r0, r5 - lsls r0, 2 - adds r4, r6, r0 - ldrb r0, [r4, 0x4] - lsrs r0, 7 - cmp r0, 0 - beq _08151B12 - adds r0, r7, 0 - asrs r0, r5 - ands r0, r3 - cmp r0, 0 - beq _08151B12 - ldrh r1, [r4, 0xA] - lsls r1, 1 - ldr r0, =gPlttBufferFaded - adds r0, r1, r0 - ldr r2, =gPlttBufferUnfaded - adds r1, r2 - ldrb r2, [r4, 0xC] - lsls r2, 1 - str r3, [sp] - bl memcpy - ldrb r0, [r4, 0x4] - movs r2, 0x80 - negs r2, r2 - adds r1, r2, 0 - ands r0, r1 - strb r0, [r4, 0x4] - movs r0, 0 - strb r0, [r4, 0x6] - strb r0, [r4, 0x5] - ldrb r0, [r4, 0xF] - lsls r0, 24 - ldr r3, [sp] - cmp r0, 0 - bge _08151B10 - movs r0, 0xFF - strb r0, [r4, 0x7] - b _08151B12 - .pool -_08151B10: - strb r3, [r4, 0x7] -_08151B12: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xF - bls _08151AAA - ldr r0, =0x0000ffff - cmp r7, r0 - bne _08151B2C - movs r0, 0 - strb r0, [r6] - b _08151B30 - .pool -_08151B2C: - ldrh r0, [r6, 0x2] - bics r0, r7 -_08151B30: - strh r0, [r6, 0x2] - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8151A9C - - thumb_func_start sub_8151B3C -sub_8151B3C: @ 8151B3C - push {r4,r5,lr} - adds r5, r0, 0 - movs r4, 0 - strh r4, [r5] - adds r0, r5, 0x4 - movs r1, 0 - movs r2, 0xC0 - bl memset -_08151B4E: - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r5, r0 - strb r4, [r0, 0x4] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bls _08151B4E - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8151B3C - - thumb_func_start sub_8151B68 -sub_8151B68: @ 8151B68 - push {r4,r5,lr} - adds r2, r0, 0 - adds r5, r1, 0 - movs r3, 0 - movs r4, 0 - ldrb r0, [r2, 0x5] - lsrs r0, 7 - cmp r0, 0 - bne _08151B7E - adds r4, r2, 0x4 - b _08151B9C -_08151B7E: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0xF - bhi _08151B9C - lsls r0, r3, 1 - adds r0, r3 - lsls r1, r0, 2 - adds r0, r2, r1 - ldrb r0, [r0, 0x5] - lsrs r0, 7 - cmp r0, 0 - bne _08151B7E - adds r0, r1, 0x4 - adds r4, r2, r0 -_08151B9C: - cmp r4, 0 - beq _08151BCA - ldrb r1, [r4, 0x1] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - movs r1, 0x40 - orrs r0, r1 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r4, 0x1] - movs r0, 0 - strb r0, [r4, 0x2] - strb r0, [r4, 0x3] - adds r1, r4, 0x4 - adds r0, r5, 0 - ldm r0!, {r2,r4} - stm r1!, {r2,r4} - adds r0, r3, 0 - b _08151BCC -_08151BCA: - movs r0, 0xFF -_08151BCC: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8151B68 - - thumb_func_start sub_8151BD4 -sub_8151BD4: @ 8151BD4 - push {r4,r5,lr} - adds r4, r0, 0 - ldrb r1, [r4, 0x1] - movs r2, 0x40 - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _08151C16 - ldrb r1, [r4, 0xB] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _08151C16 - ldrh r2, [r4, 0x6] - ldrb r0, [r4, 0x8] - adds r0, r2, r0 - cmp r2, r0 - bge _08151C16 - ldr r5, =gPlttBufferFaded - ldr r3, =gPlttBufferUnfaded -_08151BFC: - lsls r0, r2, 1 - adds r1, r0, r5 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldrh r0, [r4, 0x6] - ldrb r1, [r4, 0x8] - adds r0, r1 - cmp r2, r0 - blt _08151BFC -_08151C16: - adds r0, r4, 0x4 - movs r1, 0 - movs r2, 0x8 - bl memset - ldrb r1, [r4, 0x1] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - subs r1, 0x10 - ands r0, r1 - movs r1, 0x40 - orrs r0, r1 - movs r1, 0x7F - ands r0, r1 - strb r0, [r4, 0x1] - movs r0, 0 - strb r0, [r4, 0x3] - strb r0, [r4, 0x2] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8151BD4 - - thumb_func_start sub_8151C50 -sub_8151C50: @ 8151C50 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r1, 16 - lsrs r4, r1, 16 - lsls r2, 24 - movs r5, 0 - cmp r2, 0 - bne _08151C74 - movs r1, 0xF - ands r1, r4 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, 0x4 - adds r0, r6, r0 - bl sub_8151BD4 - b _08151CA0 -_08151C74: - movs r0, 0x1 - ands r0, r4 - cmp r0, 0 - beq _08151C94 - lsls r0, r5, 1 - adds r0, r5 - lsls r1, r0, 2 - adds r0, r6, r1 - ldrb r0, [r0, 0x5] - lsrs r0, 7 - cmp r0, 0 - beq _08151C94 - adds r0, r1, 0x4 - adds r0, r6, r0 - bl sub_8151BD4 -_08151C94: - lsrs r4, 1 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0xF - bls _08151C74 -_08151CA0: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8151C50 - - thumb_func_start sub_8151CA8 -sub_8151CA8: @ 8151CA8 - push {r4-r7,lr} - adds r5, r0, 0 - lsls r1, 16 - lsrs r4, r1, 16 - lsls r2, 24 - movs r3, 0 - cmp r2, 0 - bne _08151CDC - movs r0, 0xF - adds r3, r0, 0 - ands r3, r4 - lsls r1, r3, 1 - adds r1, r3 - lsls r1, 2 - adds r1, r5, r1 - ldrb r2, [r1, 0x5] - movs r0, 0x41 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x5] - movs r0, 0x1 - lsls r0, r3 - ldrh r1, [r5] - orrs r0, r1 - strh r0, [r5] - b _08151D20 -_08151CDC: - movs r6, 0x1 - movs r7, 0x41 - negs r7, r7 -_08151CE2: - adds r0, r4, 0 - ands r0, r6 - cmp r0, 0 - beq _08151D00 - lsls r0, r3, 1 - adds r0, r3 - lsls r0, 2 - adds r2, r5, r0 - ldrb r1, [r2, 0x5] - lsrs r0, r1, 7 - cmp r0, 0 - beq _08151D00 - lsls r0, r1, 25 - cmp r0, 0 - blt _08151D06 -_08151D00: - lsls r0, r4, 17 - lsrs r4, r0, 16 - b _08151D16 -_08151D06: - adds r0, r7, 0 - ands r0, r1 - strb r0, [r2, 0x5] - adds r0, r6, 0 - lsls r0, r3 - ldrh r1, [r5] - orrs r0, r1 - strh r0, [r5] -_08151D16: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0xF - bls _08151CE2 -_08151D20: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8151CA8 - - thumb_func_start sub_8151D28 -sub_8151D28: @ 8151D28 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r8, r0 - lsls r1, 16 - lsrs r7, r1, 16 - lsls r2, 24 - movs r0, 0 - mov r12, r0 - cmp r2, 0 - bne _08151DB0 - movs r1, 0xF - ands r1, r7 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, 0x4 - mov r1, r8 - adds r3, r1, r0 - ldrb r1, [r3, 0x1] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x80 - bne _08151E3A - ldrb r1, [r3, 0xB] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08151D8E - ldrh r2, [r3, 0x6] - ldrb r0, [r3, 0x8] - adds r0, r2, r0 - cmp r2, r0 - bge _08151D8E - ldr r5, =gPlttBufferFaded - ldr r4, =gPlttBufferUnfaded -_08151D74: - lsls r0, r2, 1 - adds r1, r0, r5 - adds r0, r4 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldrh r0, [r3, 0x6] - ldrb r1, [r3, 0x8] - adds r0, r1 - cmp r2, r0 - blt _08151D74 -_08151D8E: - ldrb r0, [r3, 0x1] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r3, 0x1] - movs r1, 0x1 - mov r2, r12 - lsls r1, r2 - mov r2, r8 - ldrh r0, [r2] - bics r0, r1 - strh r0, [r2] - b _08151E3A - .pool -_08151DB0: - movs r0, 0x1 - mov r9, r0 - movs r1, 0x40 - mov r10, r1 -_08151DB8: - mov r2, r12 - lsls r0, r2, 1 - add r0, r12 - lsls r0, 2 - adds r0, 0x4 - mov r1, r8 - adds r3, r1, r0 - adds r0, r7, 0 - mov r2, r9 - ands r0, r2 - cmp r0, 0 - beq _08151DDA - ldrb r1, [r3, 0x1] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x80 - beq _08151DE4 -_08151DDA: - lsls r0, r7, 17 - lsrs r7, r0, 16 - mov r5, r12 - adds r5, 0x1 - b _08151E30 -_08151DE4: - ldrb r1, [r3, 0xB] - mov r0, r10 - ands r0, r1 - mov r5, r12 - adds r5, 0x1 - cmp r0, 0 - beq _08151E1A - ldrh r2, [r3, 0x6] - ldrb r0, [r3, 0x8] - adds r0, r2, r0 - cmp r2, r0 - bge _08151E1A - ldr r6, =gPlttBufferFaded - ldr r4, =gPlttBufferUnfaded -_08151E00: - lsls r0, r2, 1 - adds r1, r0, r6 - adds r0, r4 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldrh r0, [r3, 0x6] - ldrb r1, [r3, 0x8] - adds r0, r1 - cmp r2, r0 - blt _08151E00 -_08151E1A: - ldrb r1, [r3, 0x1] - mov r0, r10 - orrs r0, r1 - strb r0, [r3, 0x1] - mov r1, r9 - mov r0, r12 - lsls r1, r0 - mov r2, r8 - ldrh r0, [r2] - bics r0, r1 - strh r0, [r2] -_08151E30: - lsls r0, r5, 24 - lsrs r0, 24 - mov r12, r0 - cmp r0, 0xF - bls _08151DB8 -_08151E3A: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8151D28 - - thumb_func_start sub_8151E50 -sub_8151E50: @ 8151E50 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - str r0, [sp] - movs r0, 0 - mov r10, r0 - ldr r1, [sp] - ldrh r0, [r1] - cmp r0, 0 - bne _08151E6C - b _08151FF6 -_08151E6C: - movs r2, 0xF - mov r9, r2 - movs r3, 0x10 - negs r3, r3 - mov r8, r3 - movs r7, 0x1 -_08151E78: - mov r5, r10 - lsls r0, r5, 1 - add r0, r10 - lsls r0, 2 - adds r0, 0x4 - ldr r1, [sp] - adds r4, r1, r0 - ldrb r2, [r4, 0x1] - movs r3, 0xC0 - ands r3, r2 - cmp r3, 0x80 - beq _08151E92 - b _08151FE6 -_08151E92: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _08151EA8 - ldrb r0, [r4, 0xB] - ands r3, r0 - cmp r3, 0 - beq _08151EA8 - b _08151FE6 -_08151EA8: - ldrb r0, [r4, 0x2] - subs r0, 0x1 - strb r0, [r4, 0x2] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08151EB8 - b _08151FE6 -_08151EB8: - ldrb r0, [r4, 0x9] - strb r0, [r4, 0x2] - ldrh r0, [r4, 0x6] - ldrb r1, [r4, 0x8] - lsls r2, 28 - lsrs r2, 28 - ldrh r3, [r4, 0x4] - bl BlendPalette - ldrb r5, [r4, 0xB] - lsls r0, r5, 26 - asrs r0, 30 - cmp r0, 0x1 - beq _08151F16 - cmp r0, 0x1 - bgt _08151EE4 - cmp r0, 0 - beq _08151EEA - b _08151FD0 - .pool -_08151EE4: - cmp r0, 0x2 - beq _08151F92 - b _08151FD0 -_08151EEA: - ldrb r2, [r4, 0x1] - lsls r1, r2, 28 - lsrs r0, r1, 28 - adds r0, 0x1 - mov r3, r9 - ands r0, r3 - mov r6, r8 - adds r3, r6, 0 - ands r3, r2 - orrs r3, r0 - strb r3, [r4, 0x1] - lsrs r1, 28 - lsls r0, r5, 28 - asrs r0, 28 - cmp r1, r0 - bne _08151FD0 - ldrb r0, [r4, 0x3] - adds r0, 0x1 - strb r0, [r4, 0x3] - ands r3, r6 - strb r3, [r4, 0x1] - b _08151FD0 -_08151F16: - ldrb r3, [r4, 0x1] - movs r0, 0x10 - ands r0, r3 - cmp r0, 0 - beq _08151F54 - lsls r0, r3, 28 - lsrs r0, 28 - subs r0, 0x1 - mov r5, r9 - ands r0, r5 - mov r2, r8 - ands r2, r3 - orrs r2, r0 - strb r2, [r4, 0x1] - cmp r0, 0 - bne _08151FD0 - ldrb r0, [r4, 0x3] - adds r0, 0x1 - strb r0, [r4, 0x3] - lsls r0, r2, 27 - lsrs r0, 31 - eors r0, r7 - ands r0, r7 - lsls r0, 4 - movs r3, 0x11 - negs r3, r3 - adds r1, r3, 0 - ands r2, r1 - orrs r2, r0 - strb r2, [r4, 0x1] - b _08151FD0 -_08151F54: - lsls r0, r5, 28 - asrs r0, 28 - subs r0, 0x1 - mov r5, r9 - ands r0, r5 - lsls r2, r3, 28 - lsrs r1, r2, 28 - adds r1, 0x1 - ands r1, r5 - mov r5, r8 - ands r3, r5 - orrs r3, r1 - strb r3, [r4, 0x1] - lsrs r2, 28 - cmp r2, r0 - bne _08151FD0 - ldrb r0, [r4, 0x3] - adds r0, 0x1 - strb r0, [r4, 0x3] - lsls r0, r3, 27 - lsrs r0, 31 - eors r0, r7 - ands r0, r7 - lsls r0, 4 - movs r2, 0x11 - negs r2, r2 - adds r1, r2, 0 - ands r3, r1 - orrs r3, r0 - strb r3, [r4, 0x1] - b _08151FD0 -_08151F92: - ldrb r2, [r4, 0x1] - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - beq _08151FA2 - mov r0, r8 - ands r0, r2 - b _08151FB0 -_08151FA2: - lsls r1, r5, 28 - asrs r1, 28 - mov r3, r9 - ands r1, r3 - mov r0, r8 - ands r0, r2 - orrs r0, r1 -_08151FB0: - strb r0, [r4, 0x1] - ldrb r2, [r4, 0x1] - lsls r0, r2, 27 - lsrs r0, 31 - eors r0, r7 - ands r0, r7 - lsls r0, 4 - movs r5, 0x11 - negs r5, r5 - adds r1, r5, 0 - ands r2, r1 - orrs r2, r0 - strb r2, [r4, 0x1] - ldrb r0, [r4, 0x3] - adds r0, 0x1 - strb r0, [r4, 0x3] -_08151FD0: - ldrb r1, [r4, 0xA] - cmp r1, 0xFF - beq _08151FE6 - ldrb r0, [r4, 0x3] - cmp r0, r1 - bne _08151FE6 - ldrb r1, [r4] - ldr r0, [sp] - movs r2, 0 - bl sub_8151D28 -_08151FE6: - mov r0, r10 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - cmp r0, 0xF - bhi _08151FF6 - b _08151E78 -_08151FF6: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8151E50 - - thumb_func_start sub_8152008 -sub_8152008: @ 8152008 - push {r4-r7,lr} - adds r6, r0, 0 - ldr r0, [sp, 0x14] - ldr r4, [sp, 0x18] - lsls r1, 16 - lsrs r7, r1, 16 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r4, 24 - movs r1, 0 - lsrs r3, 19 - adds r3, r2 - lsls r3, 1 - adds r6, r3 - cmp r1, r4 - bcs _08152052 -_08152030: - lsls r0, r1, 6 - adds r2, r6, r0 - movs r0, 0 - adds r3, r1, 0x1 - cmp r0, r5 - bcs _0815204A -_0815203C: - strh r7, [r2] - adds r2, 0x2 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, r5 - bcc _0815203C -_0815204A: - lsls r0, r3, 24 - lsrs r1, r0, 24 - cmp r1, r4 - bcc _08152030 -_08152052: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8152008 - - thumb_func_start sub_8152058 -sub_8152058: @ 8152058 - push {r4-r7,lr} - adds r7, r0, 0 - ldr r0, [sp, 0x14] - ldr r4, [sp, 0x18] - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r6, r4, 24 - movs r4, 0 - lsrs r3, 19 - adds r3, r2 - lsls r3, 1 - adds r7, r3 - cmp r4, r6 - bcs _081520A2 -_0815207C: - lsls r0, r4, 6 - adds r2, r7, r0 - movs r3, 0 - adds r4, 0x1 - cmp r3, r5 - bcs _0815209A -_08152088: - ldrh r0, [r1] - strh r0, [r2] - adds r1, 0x2 - adds r2, 0x2 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r5 - bcc _08152088 -_0815209A: - lsls r0, r4, 24 - lsrs r4, r0, 24 - cmp r4, r6 - bcc _0815207C -_081520A2: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8152058 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/roulette.h b/include/roulette.h new file mode 100755 index 000000000..71100d0d3 --- /dev/null +++ b/include/roulette.h @@ -0,0 +1,34 @@ +#ifndef GUARD_ROULETTE_H +#define GUARD_ROULETTE_H + +struct UnkStruct1 +{ + u16 var00; + u16 var02; + u8 var04; + u8 var05; + u8 var06; + s8 var07_0:5; + s8 var07_5:2; + s8 var07_7:1; +}; + +struct UnkStruct3 +{ + u8 var00_0:7; + u8 var00_7:1; + u8 var01; + s8 var02; + s8 var03; + struct UnkStruct1 var04; +}; + +struct UnkStruct0 +{ + u8 var00; + u8 var01; + u16 var02; //flag for each UnkStruct3 + struct UnkStruct3 var04[0x10]; +}; + +#endif // GUARD_ROULETTE_H diff --git a/include/roulette_util.h b/include/roulette_util.h index f59c4e44c..964f551fe 100644 --- a/include/roulette_util.h +++ b/include/roulette_util.h @@ -1,17 +1,46 @@ #ifndef GUARD_ROULETTE_UTIL_H #define GUARD_ROULETTE_UTIL_H +struct InnerStruct203CF18_3 +{ + u16 unk0; + u16 unk2; + u8 unk4; + u8 unk5; + u8 unk6; + s8 unk7_0:4; + s8 unk7_4:2; + s8 unk7_6:1; + s8 unk7_7:1; +}; + +struct InnerStruct203CF18_2 +{ + u8 unk0; + u8 unk1_0:4; + u8 unk1_4:1; + s8 unk1_5:1; + s8 unk1_6:1; + u32 unk1_7:1; + u8 unk2; + u8 unk3; + struct InnerStruct203CF18_3 unk4; +}; + // structures struct InnerStruct203CF18 { - u8 filler[0xC4]; + u16 unk0; + struct InnerStruct203CF18_2 unk4[16]; }; -void sub_8151B68(struct InnerStruct203CF18 *, const u8*); +int sub_8151B68(struct InnerStruct203CF18 *, const struct InnerStruct203CF18_3 *); void sub_8151B3C(struct InnerStruct203CF18 *); -void sub_8151CA8(struct InnerStruct203CF18 *, u8, u8); -void sub_8151C50(struct InnerStruct203CF18 *, u8, u8); -void sub_8151D28(struct InnerStruct203CF18 *, u8, u8); +void sub_8151CA8(struct InnerStruct203CF18 *, u16, u8); +void sub_8151C50(struct InnerStruct203CF18 *, u16, u8); +void sub_8151D28(struct InnerStruct203CF18 *, u16, u8); void sub_8151E50(struct InnerStruct203CF18 *); +void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height); +void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height); #endif // GUARD_ROULETTE_UTIL_H diff --git a/ld_script.txt b/ld_script.txt index ddafe6ecf..1e0fc6a0d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -214,7 +214,7 @@ SECTIONS { src/battle_message.o(.text); asm/cable_car.o(.text); src/math_util.o(.text); - asm/roulette_util.o(.text); + src/roulette_util.o(.text); src/rom_81520A8.o(.text); src/save.o(.text); src/mystery_event_script.o(.text); diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c index e9a46bb86..73d72c8b6 100644 --- a/src/fldeff_groundshake.c +++ b/src/fldeff_groundshake.c @@ -32,7 +32,17 @@ static void sub_81BEA20(void); static void sub_81BEAD8(struct Sprite* sprite); // rodata -static const u8 gUnknown_08617E18[] = {0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b}; +const struct InnerStruct203CF18_3 gUnknown_08617E18 = { + .unk0 = 0x433b, + .unk2 = 0x61, + .unk4 = 0x0F, + .unk5 = 0x05, + .unk6 = 0xFF, + .unk7_0 = 0xB, + .unk7_4 = 0x1, + .unk7_6 = 0, + .unk7_7 = 1, +}; static const union AnimCmd gSpriteAnim_8617E20[] = { @@ -131,7 +141,7 @@ void sub_81BE6B8(void) gUnknown_0203CF18 = (struct Struct203CF18 *)AllocZeroed(sizeof(struct Struct203CF18)); sub_8151B3C(&(gUnknown_0203CF18->unk4)); - sub_8151B68(&(gUnknown_0203CF18->unk4), gUnknown_08617E18); + sub_8151B68(&(gUnknown_0203CF18->unk4), &gUnknown_08617E18); sub_8151CA8(&(gUnknown_0203CF18->unk4), 1, 1); gUnknown_0203CF18->taskId = CreateTask(sub_81BE698, 0xFF); } diff --git a/src/roulette_util.c b/src/roulette_util.c new file mode 100755 index 000000000..a197cfa09 --- /dev/null +++ b/src/roulette_util.c @@ -0,0 +1,700 @@ +#include "global.h" +#include "palette.h" +#include "roulette.h" +#include "roulette_util.h" +#include "util.h" + +void sub_8151678(struct UnkStruct0 *r0) +{ + r0->var00 = 0; + r0->var02 = 0; + memset(&r0->var04, 0, sizeof(r0->var04)); +} + +u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) +{ + if (!(r1 < 16) || (r0->var04[r1].var00_7)) + return 0xFF; + + r0->var04[r1].var04.var00 = r2->var00; + r0->var04[r1].var04.var02 = r2->var02; + r0->var04[r1].var04.var04 = r2->var04; + r0->var04[r1].var04.var05 = r2->var05; + r0->var04[r1].var04.var06 = r2->var06; + r0->var04[r1].var04.var07_0 = r2->var07_0; + r0->var04[r1].var04.var07_5 = r2->var07_5; + r0->var04[r1].var04.var07_7 = r2->var07_7; + r0->var04[r1].var00_0 = 0; + r0->var04[r1].var00_7 = 1; + r0->var04[r1].var02 = 0; + r0->var04[r1].var01 = 0; + if (r0->var04[r1].var04.var07_7 < 0) + r0->var04[r1].var03 = 0xFF; + else + r0->var04[r1].var03 = 1; + + return r1; +} + +u8 sub_8151710(struct UnkStruct0 *r0, u8 r1) +{ + if (r1 >= 16) + return 0xFF; + if (!r0->var04[r1].var00_7) + return 0xFF; + + memset(&r0->var04[r1], 0, sizeof(r0->var04[r1])); + return r1; +} + +u8 sub_8151744(struct UnkStruct3 *r0) +{ + u8 i; + u8 returnval; + + for (i = 0; i < r0->var04.var04; i++) + { + struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[r0->var04.var02 + i]; + struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[r0->var04.var02 + i]; + + switch (r0->var00_0) + { + case 1: + if (faded->r + r0->var03 >= 0 && faded->r + r0->var03 < 32) + faded->r += r0->var03; + if (faded->g + r0->var03 >= 0 && faded->g + r0->var03 < 32) + faded->g += r0->var03; + if (faded->b + r0->var03 >= 0 && faded->b + r0->var03 < 32) + faded->b += r0->var03; + break; + case 2: + if (r0->var03 < 0) + { + if (faded->r + r0->var03 >= unfaded->r) + faded->r += r0->var03; + if (faded->g + r0->var03 >= unfaded->g) + faded->g += r0->var03; + if (faded->b + r0->var03 >= unfaded->b) + faded->b += r0->var03; + } + else + { + if (faded->r + r0->var03 <= unfaded->r) + faded->r += r0->var03; + if (faded->g + r0->var03 <= unfaded->g) + faded->g += r0->var03; + if (faded->b + r0->var03 <= unfaded->b) + faded->b += r0->var03; + } + break; + } + } + if ((u32)r0->var02++ != r0->var04.var07_0) + { + returnval = 0; + } + else + { + r0->var02 = 0; + r0->var03 *= -1; + if (r0->var00_0 == 1) + r0->var00_0++; + else + r0->var00_0--; + returnval = 1; + } + return returnval; +} + +u8 sub_815194C(struct UnkStruct3 *r0) +{ + u8 rg2 = 0; + + switch (r0->var00_0) + { + case 1: + for (rg2 = 0; rg2 < r0->var04.var04; rg2++) + gPlttBufferFaded[r0->var04.var02 + rg2] = r0->var04.var00; + r0->var00_0++; + break; + case 2: + for (rg2 = 0; rg2 < r0->var04.var04; rg2++) + gPlttBufferFaded[r0->var04.var02 + rg2] = gPlttBufferUnfaded[r0->var04.var02 + rg2]; + r0->var00_0--; + break; + } + return 1; +} + +void task_tutorial_controls_fadein(struct UnkStruct0 *r0) +{ + u8 i = 0; + + if (r0->var00) + { + for (i = 0; i < 16; i++) + { + if ((r0->var02 >> i) & 1) + { + if (--r0->var04[i].var01 == 0xFF) // if underflow ? + { + if (r0->var04[i].var04.var00 & 0x8000) // PlttData->unused_15 ? + sub_8151744(&r0->var04[i]); + else + sub_815194C(&r0->var04[i]); + + r0->var04[i].var01 = r0->var04[i].var04.var05; + } + } + } + } +} + +void sub_8151A48(struct UnkStruct0 *r0, u16 r1) +{ + u8 i = 0; + + r0->var00++; + for (i = 0; i < 16; i++) + { + if ((r1 >> i) & 1) + { + if (r0->var04[i].var00_7) + { + r0->var02 |= 1 << i; + r0->var04[i].var00_0 = 1; + } + } + } +} + +void sub_8151A9C(struct UnkStruct0 *r0, u16 r1) +{ + u8 i; + + for (i = 0; i < 16; i++) + { + if ((r0->var02 >> i) & 1) + { + if (r0->var04[i].var00_7) + { + if ((r1 >> i) & 1) + { + u32 offset = r0->var04[i].var04.var02; + u16 *faded = &gPlttBufferFaded[offset]; + u16 *unfaded = &gPlttBufferUnfaded[offset]; + memcpy(faded, unfaded, r0->var04[i].var04.var04 * 2); + r0->var04[i].var00_0 = 0; + r0->var04[i].var02 = 0; + r0->var04[i].var01 = 0; + if (r0->var04[i].var04.var07_7 < 0) + r0->var04[i].var03 = 0xFF; + else + r0->var04[i].var03 = 0x1; + } + } + } + } + if (r1 == 0xFFFF) + { + r0->var00 = 0; + r0->var02 = 0; + } + else + { + r0->var02 = r0->var02 & ~r1; + } +} + +void sub_8151B3C(struct InnerStruct203CF18 *arg0) +{ + u8 i = 0; + arg0->unk0 = 0; + memset(&arg0->unk4, 0, sizeof(arg0->unk4)); + for (; i < 16; i++) + { + arg0->unk4[i].unk0 = i; + } +} + +int sub_8151B68(struct InnerStruct203CF18 *arg0, const struct InnerStruct203CF18_3 *arg1) +{ + u8 i = 0; + struct InnerStruct203CF18_2 *r4 = NULL; + + if (!arg0->unk4[0].unk1_7) + { + r4 = &arg0->unk4[0]; + } + else + { + while (++i < 16) + { + if (!arg0->unk4[i].unk1_7) + { + r4 = &arg0->unk4[i]; + break; + } + } + } + + if (r4 == 0) + return 0xFF; + + r4->unk1_0 = 0; + r4->unk1_4 = 0; + r4->unk1_6 = 1; + r4->unk1_7 = 1; + r4->unk2 = 0; + r4->unk3 = 0; + memcpy(&r4->unk4, arg1, sizeof(*arg1)); + return i; +} + +void sub_8151BD4(struct InnerStruct203CF18_2 *arg0) +{ + u16 i; + + if (!arg0->unk1_6 && arg0->unk4.unk7_6) + { + for (i = arg0->unk4.unk2; i < arg0->unk4.unk2 + arg0->unk4.unk4; i++) + gPlttBufferFaded[i] = gPlttBufferUnfaded[i]; + } + + memset(&arg0->unk4, 0, sizeof(arg0->unk4)); + arg0->unk1_0 = 0; + arg0->unk1_4 = 0; + arg0->unk1_5 = 0; + arg0->unk1_6 = 1; + arg0->unk1_7 = 0; + arg0->unk3 = 0; + arg0->unk2 = 0; +} + +void sub_8151C50(struct InnerStruct203CF18 *arg0, u16 arg1, u8 arg2) +{ + u16 i = 0; + + if (!arg2) + { + sub_8151BD4(&arg0->unk4[arg1 & 0xF]); + } + else + { + for (i = 0; i < 16; i++) + { + if ((arg1 & 1) && arg0->unk4[i].unk1_7) + sub_8151BD4(&arg0->unk4[i]); + + arg1 >>= 1; + } + } +} + +// there seems to be a temp var involved inside the first if block +void sub_8151CA8(struct InnerStruct203CF18 *arg0, u16 arg1, u8 arg2) +{ + u8 i = 0; + + if (!arg2) + { + i = arg1 & 0xF; + arg0->unk4[i].unk1_6 = 0; + arg0->unk0 |= 1 << i; + } + else + { + for (i = 0; i < 16; i++) + { + if (!(arg1 & 1) || !arg0->unk4[i].unk1_7 || !arg0->unk4[i].unk1_6) + { + arg1 <<= 1; + } + else + { + arg0->unk4[i].unk1_6 = 0; + arg0->unk0 |= 1 << i; + } + } + } +} + +void sub_8151D28(struct InnerStruct203CF18 *arg0, u16 arg1, u8 arg2) +{ + u16 i; + struct InnerStruct203CF18_2 *var0; + u8 j = 0; + + if (!arg2) + { + var0 = &arg0->unk4[arg1 & 0xF]; + if (!var0->unk1_6 && var0->unk1_7) + { + if (var0->unk4.unk7_6) + { + for (i = var0->unk4.unk2; i < var0->unk4.unk2 + var0->unk4.unk4; i++) + gPlttBufferFaded[i] = gPlttBufferUnfaded[i]; + } + + var0->unk1_6 = 1; + arg0->unk0 &= ~(1 << j); + } + } + else + { + for (j = 0; j < 16; j++) + { + var0 = &arg0->unk4[j]; + if (!(arg1 & 1) || var0->unk1_6 || !var0->unk1_7) + { + arg1 <<= 1; + } + else + { + if (var0->unk4.unk7_6) + { + for (i = var0->unk4.unk2; i < var0->unk4.unk2 + var0->unk4.unk4; i++) + gPlttBufferFaded[i] = gPlttBufferUnfaded[i]; + } + + var0->unk1_6 = 1; + arg0->unk0 &= ~(1 << j); + } + } + } +} + +#ifdef NONMATCHING +void sub_8151E50(struct InnerStruct203CF18 *arg0) +{ + struct InnerStruct203CF18_2 *var0; + u8 i = 0; + + if (arg0->unk0) + { + for (i = 0; i < 16; i++) + { + var0 = &arg0->unk4[i]; + if ((!var0->unk1_6 && var0->unk1_7) && (!gPaletteFade.active || !var0->unk4.unk7_7)) + { + if (--var0->unk2 == 0xFF) + { + var0->unk2 = var0->unk4.unk5; + BlendPalette(var0->unk4.unk2, var0->unk4.unk4, var0->unk1_0, var0->unk4.unk0); + switch (var0->unk4.unk7_4) + { + case 0: + if (var0->unk1_0++ == var0->unk4.unk7_0) + { + var0->unk3++; + var0->unk1_0 = 0; + } + break; + case 1: + if (var0->unk1_4) + { + if (--var0->unk1_0 == 0) + { + var0->unk3++; + var0->unk1_4 ^= 1; + } + } + else + { + if (var0->unk1_0++ == var0->unk4.unk7_0 - 1) + { + var0->unk3++; + var0->unk1_4 ^= 1; + } + } + break; + case 2: + if (var0->unk1_4) + var0->unk1_0 = 0; + else + var0->unk1_0 = var0->unk4.unk7_0; + + var0->unk1_4 ^= 1; + var0->unk3++; + break; + } + + if (var0->unk4.unk6 != 0xFF && var0->unk3 == 0xFF) + sub_8151D28(arg0, var0->unk0, 0); + } + } + } + } +} +#else +NAKED +void sub_8151E50(struct InnerStruct203CF18 *arg0) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + mov r10, r0\n\ + ldr r1, [sp]\n\ + ldrh r0, [r1]\n\ + cmp r0, 0\n\ + bne _08151E6C\n\ + b _08151FF6\n\ +_08151E6C:\n\ + movs r2, 0xF\n\ + mov r9, r2\n\ + movs r3, 0x10\n\ + negs r3, r3\n\ + mov r8, r3\n\ + movs r7, 0x1\n\ +_08151E78:\n\ + mov r5, r10\n\ + lsls r0, r5, 1\n\ + add r0, r10\n\ + lsls r0, 2\n\ + adds r0, 0x4\n\ + ldr r1, [sp]\n\ + adds r4, r1, r0\n\ + ldrb r2, [r4, 0x1]\n\ + movs r3, 0xC0\n\ + ands r3, r2\n\ + cmp r3, 0x80\n\ + beq _08151E92\n\ + b _08151FE6\n\ +_08151E92:\n\ + ldr r0, =gPaletteFade\n\ + ldrb r1, [r0, 0x7]\n\ + adds r0, r3, 0\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _08151EA8\n\ + ldrb r0, [r4, 0xB]\n\ + ands r3, r0\n\ + cmp r3, 0\n\ + beq _08151EA8\n\ + b _08151FE6\n\ +_08151EA8:\n\ + ldrb r0, [r4, 0x2]\n\ + subs r0, 0x1\n\ + strb r0, [r4, 0x2]\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, 0xFF\n\ + beq _08151EB8\n\ + b _08151FE6\n\ +_08151EB8:\n\ + ldrb r0, [r4, 0x9]\n\ + strb r0, [r4, 0x2]\n\ + ldrh r0, [r4, 0x6]\n\ + ldrb r1, [r4, 0x8]\n\ + lsls r2, 28\n\ + lsrs r2, 28\n\ + ldrh r3, [r4, 0x4]\n\ + bl BlendPalette\n\ + ldrb r5, [r4, 0xB]\n\ + lsls r0, r5, 26\n\ + asrs r0, 30\n\ + cmp r0, 0x1\n\ + beq _08151F16\n\ + cmp r0, 0x1\n\ + bgt _08151EE4\n\ + cmp r0, 0\n\ + beq _08151EEA\n\ + b _08151FD0\n\ + .pool\n\ +_08151EE4:\n\ + cmp r0, 0x2\n\ + beq _08151F92\n\ + b _08151FD0\n\ +_08151EEA:\n\ + ldrb r2, [r4, 0x1]\n\ + lsls r1, r2, 28\n\ + lsrs r0, r1, 28\n\ + adds r0, 0x1\n\ + mov r3, r9\n\ + ands r0, r3\n\ + mov r6, r8\n\ + adds r3, r6, 0\n\ + ands r3, r2\n\ + orrs r3, r0\n\ + strb r3, [r4, 0x1]\n\ + lsrs r1, 28\n\ + lsls r0, r5, 28\n\ + asrs r0, 28\n\ + cmp r1, r0\n\ + bne _08151FD0\n\ + ldrb r0, [r4, 0x3]\n\ + adds r0, 0x1\n\ + strb r0, [r4, 0x3]\n\ + ands r3, r6\n\ + strb r3, [r4, 0x1]\n\ + b _08151FD0\n\ +_08151F16:\n\ + ldrb r3, [r4, 0x1]\n\ + movs r0, 0x10\n\ + ands r0, r3\n\ + cmp r0, 0\n\ + beq _08151F54\n\ + lsls r0, r3, 28\n\ + lsrs r0, 28\n\ + subs r0, 0x1\n\ + mov r5, r9\n\ + ands r0, r5\n\ + mov r2, r8\n\ + ands r2, r3\n\ + orrs r2, r0\n\ + strb r2, [r4, 0x1]\n\ + cmp r0, 0\n\ + bne _08151FD0\n\ + ldrb r0, [r4, 0x3]\n\ + adds r0, 0x1\n\ + strb r0, [r4, 0x3]\n\ + lsls r0, r2, 27\n\ + lsrs r0, 31\n\ + eors r0, r7\n\ + ands r0, r7\n\ + lsls r0, 4\n\ + movs r3, 0x11\n\ + negs r3, r3\n\ + adds r1, r3, 0\n\ + ands r2, r1\n\ + orrs r2, r0\n\ + strb r2, [r4, 0x1]\n\ + b _08151FD0\n\ +_08151F54:\n\ + lsls r0, r5, 28\n\ + asrs r0, 28\n\ + subs r0, 0x1\n\ + mov r5, r9\n\ + ands r0, r5\n\ + lsls r2, r3, 28\n\ + lsrs r1, r2, 28\n\ + adds r1, 0x1\n\ + ands r1, r5\n\ + mov r5, r8\n\ + ands r3, r5\n\ + orrs r3, r1\n\ + strb r3, [r4, 0x1]\n\ + lsrs r2, 28\n\ + cmp r2, r0\n\ + bne _08151FD0\n\ + ldrb r0, [r4, 0x3]\n\ + adds r0, 0x1\n\ + strb r0, [r4, 0x3]\n\ + lsls r0, r3, 27\n\ + lsrs r0, 31\n\ + eors r0, r7\n\ + ands r0, r7\n\ + lsls r0, 4\n\ + movs r2, 0x11\n\ + negs r2, r2\n\ + adds r1, r2, 0\n\ + ands r3, r1\n\ + orrs r3, r0\n\ + strb r3, [r4, 0x1]\n\ + b _08151FD0\n\ +_08151F92:\n\ + ldrb r2, [r4, 0x1]\n\ + movs r0, 0x10\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _08151FA2\n\ + mov r0, r8\n\ + ands r0, r2\n\ + b _08151FB0\n\ +_08151FA2:\n\ + lsls r1, r5, 28\n\ + asrs r1, 28\n\ + mov r3, r9\n\ + ands r1, r3\n\ + mov r0, r8\n\ + ands r0, r2\n\ + orrs r0, r1\n\ +_08151FB0:\n\ + strb r0, [r4, 0x1]\n\ + ldrb r2, [r4, 0x1]\n\ + lsls r0, r2, 27\n\ + lsrs r0, 31\n\ + eors r0, r7\n\ + ands r0, r7\n\ + lsls r0, 4\n\ + movs r5, 0x11\n\ + negs r5, r5\n\ + adds r1, r5, 0\n\ + ands r2, r1\n\ + orrs r2, r0\n\ + strb r2, [r4, 0x1]\n\ + ldrb r0, [r4, 0x3]\n\ + adds r0, 0x1\n\ + strb r0, [r4, 0x3]\n\ +_08151FD0:\n\ + ldrb r1, [r4, 0xA]\n\ + cmp r1, 0xFF\n\ + beq _08151FE6\n\ + ldrb r0, [r4, 0x3]\n\ + cmp r0, r1\n\ + bne _08151FE6\n\ + ldrb r1, [r4]\n\ + ldr r0, [sp]\n\ + movs r2, 0\n\ + bl sub_8151D28\n\ +_08151FE6:\n\ + mov r0, r10\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r10, r0\n\ + cmp r0, 0xF\n\ + bhi _08151FF6\n\ + b _08151E78\n\ +_08151FF6:\n\ + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0"); +} +#endif // NONMATCHING + +void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height) +{ + u16 *_dest; + u8 i; + u8 j; + i = 0; + dest = &dest[top * 32 + left]; + for (; i < height; i++) + { + _dest = dest + i * 32; + for (j = 0; j < width; j++) + { + *_dest++ = src; + } + } +} + +void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height) +{ + u16 *_dest; + u16 *_src = src; + u8 i; + u8 j; + i = 0; + dest = &dest[top * 32 + left]; + for (; i < height; i++) + { + _dest = dest + i * 32; + for (j = 0; j < width; j++) + { + *_dest++ = *_src++; + } + } +} -- cgit v1.2.3 From 6babb97182c9210373f50f3a4c66102ae13bd9a4 Mon Sep 17 00:00:00 2001 From: Meowsy <40091248+Meowsy@users.noreply.github.com> Date: Sat, 8 Dec 2018 12:57:19 -0500 Subject: Fix typo "ggText_DexSortSmallestDescription". (#433) Should be "gText_DexSortSmallestDescription". --- include/strings.h | 2 +- src/pokedex.c | 2 +- src/strings.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/strings.h b/include/strings.h index 22d12aa18..e17ea8646 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1034,7 +1034,7 @@ extern const u8 gText_DexSortAtoZDescription[]; extern const u8 gText_DexSortHeaviestDescription[]; extern const u8 gText_DexSortLightestDescription[]; extern const u8 gText_DexSortTallestDescription[]; -extern const u8 ggText_DexSortSmallestDescription[]; +extern const u8 gText_DexSortSmallestDescription[]; extern const u8 gText_DexEmptyString[]; extern const u8 gText_DexSearchDontSpecify[]; extern const u8 gText_DexSearchTypeNone[]; diff --git a/src/pokedex.c b/src/pokedex.c index fa74b073a..d13a87f54 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1083,7 +1083,7 @@ static const struct PokedexOption gDexSortOptions[] = {gText_DexSortHeaviestDescription, gText_DexSortHeaviestTitle}, {gText_DexSortLightestDescription, gText_DexSortLightestTitle}, {gText_DexSortTallestDescription, gText_DexSortTallestTitle}, - {ggText_DexSortSmallestDescription, gText_DexSortSmallestTitle}, + {gText_DexSortSmallestDescription, gText_DexSortSmallestTitle}, {NULL, NULL}, }; diff --git a/src/strings.c b/src/strings.c index 7b3df0eca..3ac6fa36c 100644 --- a/src/strings.c +++ b/src/strings.c @@ -155,7 +155,7 @@ const u8 gText_DexSortAtoZDescription[] = _("Spotted and owned POKéMON are list const u8 gText_DexSortHeaviestDescription[] = _("Owned POKéMON are listed from the\nheaviest to the lightest."); const u8 gText_DexSortLightestDescription[] = _("Owned POKéMON are listed from the\nlightest to the heaviest."); const u8 gText_DexSortTallestDescription[] = _("Owned POKéMON are listed from the\ntallest to the smallest."); -const u8 ggText_DexSortSmallestDescription[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); +const u8 gText_DexSortSmallestDescription[] = _("Owned POKéMON are listed from the\nsmallest to the tallest."); const u8 gText_DexEmptyString[] = _(""); const u8 gText_DexSearchDontSpecify[] = _("DON'T SPECIFY."); const u8 gText_DexSearchTypeNone[] = _("NONE"); -- cgit v1.2.3 From 4c23adb5f53a61d0e7426376aba9a04de5c8f2b3 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 19:05:03 +0100 Subject: Decompile field weather --- asm/cable_car.s | 16 +- asm/field_screen.s | 7820 +------------------------------------------- asm/ice.s | 4 +- data/field_screen.s | 487 --- data/field_screen_2.s | 17 + data/field_weather.s | 103 + include/field_weather.h | 14 +- include/global.h | 2 +- ld_script.txt | 6 + src/battle_transition.c | 4 +- src/battle_util.c | 6 +- src/egg_hatch.c | 4 +- src/field_screen.c | 15 - src/field_weather.c | 1152 +++++++ src/field_weather_effect.c | 2484 ++++++++++++++ src/fldeff_sweetscent.c | 3 +- src/overworld.c | 4 +- src/start_menu.c | 18 +- sym_bss.txt | 2 +- sym_ewram.txt | 12 +- 20 files changed, 3808 insertions(+), 8365 deletions(-) create mode 100644 data/field_screen_2.s create mode 100644 data/field_weather.s delete mode 100644 src/field_screen.c create mode 100644 src/field_weather.c create mode 100644 src/field_weather_effect.c diff --git a/asm/cable_car.s b/asm/cable_car.s index 276b878e2..96bc91a41 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -170,9 +170,9 @@ _0814FDD8: bl FreeAllSpritePalettes bl ResetPaletteFade bl reset_temp_tile_data_buffers - bl sub_80AAFA4 + bl StartWeather movs r4, 0 - ldr r0, =gUnknown_0854C14C + ldr r0, =gWeatherPtr ldr r0, [r0] adds r1, r0, 0 adds r1, 0xF0 @@ -334,7 +334,7 @@ _0814FF98: b _08150224 .pool _0814FFB4: - ldr r0, =gUnknown_0854C14C + ldr r0, =gWeatherPtr ldr r0, [r0] adds r1, r0, 0 adds r1, 0xF0 @@ -649,7 +649,7 @@ c2_8011A1C: @ 8150258 bl sub_80AB130 add r0, sp, 0x4 mov r8, r0 - ldr r0, =gUnknown_0854C14C + ldr r0, =gWeatherPtr ldr r0, [r0] adds r1, r0, 0 adds r1, 0xF0 @@ -831,7 +831,7 @@ _08150422: b _08150542 _0815042E: ldrb r0, [r3, 0x2] - bl weather_set + bl ChangeWeather ldr r1, [r5] movs r0, 0x1 strb r0, [r1, 0x1] @@ -844,7 +844,7 @@ _0815043C: beq _08150448 b _08150542 _08150448: - ldr r0, =gUnknown_0854C14C + ldr r0, =gWeatherPtr ldr r0, [r0] adds r2, r0, 0 adds r2, 0xF0 @@ -881,7 +881,7 @@ _08150478: b _08150542 .pool _08150490: - ldr r0, =gUnknown_0854C14C + ldr r0, =gWeatherPtr ldr r2, [r0] movs r1, 0xDA lsls r1, 3 @@ -1290,7 +1290,7 @@ _081507B6: b _081507E6 .pool _081507DC: - ldr r0, =gUnknown_0854C14C + ldr r0, =gWeatherPtr ldr r4, [r0] ldr r0, =0x000006fc adds r4, r0 diff --git a/asm/field_screen.s b/asm/field_screen.s index 8a97644ac..904a68ba1 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -5,7816 +5,6 @@ .text - thumb_func_start sub_80AAFA4 -@ void sub_80AAFA4() -sub_80AAFA4: @ 80AAFA4 - push {r4-r6,lr} - ldr r0, =sub_80AB1B0 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0 - bne _080AB060 - movs r0, 0x90 - lsls r0, 5 - bl AllocSpritePalette - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r0, =gUnknown_0854C270 - lsls r1, r5, 5 - ldr r2, =gPlttBufferUnfaded + 0x200 - adds r1, r2 - ldr r2, =0x04000008 - bl CpuSet - bl sub_80AB294 - ldr r4, =gUnknown_02038454 - ldr r1, =0x000006d5 - adds r0, r4, r1 - strb r5, [r0] - ldr r0, =0x00001201 - bl AllocSpritePalette - ldr r2, =0x000006d4 - adds r1, r4, r2 - strb r0, [r1] - ldr r1, =0x000006da - adds r0, r4, r1 - strb r6, [r0] - adds r2, 0x4 - adds r0, r4, r2 - strb r6, [r0] - adds r1, 0x4 - adds r0, r4, r1 - strb r6, [r0] - adds r2, 0xC - adds r0, r4, r2 - strb r6, [r0] - adds r1, 0x22 - adds r0, r4, r1 - strb r6, [r0] - adds r2, 0x17 - adds r0, r4, r2 - strb r6, [r0] - adds r1, 0x24 - adds r0, r4, r1 - strb r6, [r0] - adds r2, 0x1B - adds r0, r4, r2 - strb r6, [r0] - subs r1, 0xD - adds r0, r4, r1 - strb r6, [r0] - adds r2, 0x18 - adds r0, r4, r2 - strb r6, [r0] - subs r1, 0x1D - adds r0, r4, r1 - strb r6, [r0] - movs r0, 0x10 - movs r1, 0 - bl sub_80AC124 - movs r2, 0xDA - lsls r2, 3 - adds r0, r4, r2 - strb r6, [r0] - ldr r0, =0x000006c6 - adds r1, r4, r0 - movs r0, 0x3 - strb r0, [r1] - movs r1, 0xD9 - lsls r1, 3 - adds r0, r4, r1 - strb r6, [r0] - adds r2, 0x3 - adds r1, r4, r2 - movs r0, 0x1 - strb r0, [r1] - ldr r0, =sub_80AB160 - movs r1, 0x50 - bl CreateTask - ldr r1, =0x000006c9 - adds r4, r1 - strb r0, [r4] -_080AB060: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AAFA4 - - thumb_func_start weather_set -weather_set: @ 80AB098 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - beq _080AB0AE - cmp r4, 0x5 - beq _080AB0AE - cmp r4, 0xD - beq _080AB0AE - bl play_some_sound -_080AB0AE: - ldr r1, =gUnknown_02038454 - ldr r2, =0x000006d1 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, r4 - beq _080AB0D2 - movs r3, 0xDA - lsls r3, 3 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, r4 - bne _080AB0D2 - ldr r0, =gUnknown_0854C150 - lsls r1, r4, 4 - adds r1, r0 - ldr r0, [r1] - bl _call_via_r0 -_080AB0D2: - ldr r1, =gUnknown_02038454 - ldr r2, =0x000006d3 - adds r0, r1, r2 - movs r2, 0 - strb r2, [r0] - ldr r3, =0x000006d1 - adds r0, r1, r3 - strb r4, [r0] - ldr r0, =0x000006ce - adds r1, r0 - strh r2, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end weather_set - - thumb_func_start sub_80AB104 -sub_80AB104: @ 80AB104 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl play_some_sound - ldr r0, =gUnknown_02038454 - movs r2, 0xDA - lsls r2, 3 - adds r1, r0, r2 - strb r4, [r1] - ldr r1, =0x000006d1 - adds r0, r1 - strb r4, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AB104 - - thumb_func_start sub_80AB130 -sub_80AB130: @ 80AB130 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl play_some_sound - ldr r1, =gUnknown_02038454 - movs r2, 0xDA - lsls r2, 3 - adds r0, r1, r2 - strb r4, [r0] - adds r2, 0x1 - adds r0, r1, r2 - strb r4, [r0] - movs r0, 0xD9 - lsls r0, 3 - adds r1, r0 - movs r0, 0x1 - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AB130 - - thumb_func_start sub_80AB160 -sub_80AB160: @ 80AB160 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r2, =gUnknown_02038454 - movs r1, 0xD9 - lsls r1, 3 - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080AB198 - ldr r1, =gUnknown_0854C150 - movs r3, 0xDA - lsls r3, 3 - adds r0, r2, r3 - ldrb r0, [r0] - lsls r0, 4 - adds r1, 0x8 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_80AB1B0 - str r1, [r0] -_080AB198: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AB160 - - thumb_func_start sub_80AB1B0 -sub_80AB1B0: @ 80AB1B0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r5, =gUnknown_02038454 - movs r0, 0xDA - lsls r0, 3 - adds r6, r5, r0 - ldr r1, =0x000006d1 - adds r7, r5, r1 - ldrb r0, [r6] - ldrb r2, [r7] - cmp r0, r2 - beq _080AB22C - ldr r0, =gUnknown_0854C150 - mov r9, r0 - ldrb r0, [r6] - lsls r0, 4 - mov r1, r9 - adds r1, 0xC - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _080AB23C - ldr r1, =0x000006c6 - adds r1, r5 - mov r8, r1 - ldrb r0, [r1] - cmp r0, 0x2 - beq _080AB23C - ldrb r0, [r7] - lsls r0, 4 - add r0, r9 - ldr r0, [r0] - bl _call_via_r0 - ldr r2, =0x000006c3 - adds r0, r5, r2 - strb r4, [r0] - mov r0, r8 - strb r4, [r0] - ldrb r0, [r7] - strb r0, [r6] - adds r2, 0x10 - adds r1, r5, r2 - movs r0, 0x1 - strb r0, [r1] - b _080AB23C - .pool -_080AB22C: - ldr r0, =gUnknown_0854C150 - ldrb r1, [r6] - lsls r1, 4 - adds r0, 0x4 - adds r1, r0 - ldr r0, [r1] - bl _call_via_r0 -_080AB23C: - ldr r1, =gUnknown_0854C240 - ldr r0, =gUnknown_02038454 - ldr r2, =0x000006c6 - adds r0, r2 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AB1B0 - - thumb_func_start sub_80AB26C -sub_80AB26C: @ 80AB26C - ldr r0, =gUnknown_02038454 - ldr r2, =0x000006c1 - adds r1, r0, r2 - movs r2, 0 - strb r2, [r1] - ldr r1, =0x000006c2 - adds r0, r1 - strb r2, [r0] - bx lr - .pool - thumb_func_end sub_80AB26C - - thumb_func_start nullsub_36 -nullsub_36: @ 80AB28C - bx lr - thumb_func_end nullsub_36 - - thumb_func_start sub_80AB290 -sub_80AB290: @ 80AB290 - movs r0, 0 - bx lr - thumb_func_end sub_80AB290 - - thumb_func_start sub_80AB294 -sub_80AB294: @ 80AB294 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r1, =gUnknown_03000F50 - ldr r0, =gUnknown_0854C250 - str r0, [r1] - movs r0, 0 - mov r12, r0 - ldr r1, =gUnknown_020388B4 - mov r10, r1 -_080AB2AC: - mov r7, r10 - mov r0, r12 - cmp r0, 0 - bne _080AB2B8 - ldr r1, =0xfffffda0 - adds r7, r1 -_080AB2B8: - movs r5, 0 - movs r0, 0x1 - add r0, r12 - mov r9, r0 -_080AB2C0: - lsls r1, r5, 8 - lsls r0, r5, 24 - lsrs r2, r0, 16 - mov r0, r12 - cmp r0, 0 - bne _080AB2E4 - adds r0, r1, 0 - lsls r0, 12 - lsrs r4, r0, 16 - b _080AB2E6 - .pool -_080AB2E4: - movs r4, 0 -_080AB2E6: - movs r3, 0 - adds r1, r5, 0x1 - mov r8, r1 -_080AB2EC: - subs r1, r2, r4 - lsls r1, 16 - lsrs r2, r1, 16 - lsls r0, r3, 5 - adds r0, r7 - adds r0, r5 - lsrs r1, 24 - strb r1, [r0] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x2 - bls _080AB2EC - adds r6, r2, 0 - movs r0, 0xF8 - lsls r0, 5 - subs r0, r2 - cmp r0, 0 - bge _080AB314 - adds r0, 0xF -_080AB314: - lsls r0, 12 - lsrs r4, r0, 16 - cmp r5, 0xB - bhi _080AB35E - cmp r3, 0x12 - bhi _080AB384 -_080AB320: - adds r0, r2, r4 - lsls r0, 16 - lsrs r2, r0, 16 - subs r0, r2, r6 - lsls r0, 16 - asrs r1, r0, 16 - cmp r1, 0 - ble _080AB33C - lsrs r0, 31 - adds r0, r1, r0 - asrs r0, 1 - subs r0, r2, r0 - lsls r0, 16 - lsrs r2, r0, 16 -_080AB33C: - lsls r0, r3, 5 - adds r0, r7 - adds r1, r0, r5 - lsrs r0, r2, 8 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1F - bls _080AB352 - movs r0, 0x1F - strb r0, [r1] -_080AB352: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x12 - bls _080AB320 - b _080AB384 -_080AB35E: - cmp r3, 0x12 - bhi _080AB384 - movs r6, 0x1F -_080AB364: - adds r1, r2, r4 - lsls r1, 16 - lsrs r2, r1, 16 - lsls r0, r3, 5 - adds r0, r7 - adds r0, r5 - lsrs r1, 24 - strb r1, [r0] - cmp r1, 0x1F - bls _080AB37A - strb r6, [r0] -_080AB37A: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x12 - bls _080AB364 -_080AB384: - mov r1, r8 - lsls r0, r1, 16 - lsrs r5, r0, 16 - cmp r5, 0x1F - bls _080AB2C0 - mov r1, r9 - lsls r0, r1, 16 - lsrs r0, 16 - mov r12, r0 - cmp r0, 0x1 - bls _080AB2AC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80AB294 - - thumb_func_start sub_80AB3A8 -sub_80AB3A8: @ 80AB3A8 - push {r4-r7,lr} - ldr r0, =gUnknown_02038454 - ldr r1, =0x000006c6 - adds r2, r0, r1 - ldrb r1, [r2] - adds r3, r0, 0 - cmp r1, 0x2 - beq _080AB42C - movs r7, 0xD8 - lsls r7, 3 - adds r4, r3, r7 - ldr r1, =0x000006c1 - adds r0, r3, r1 - ldrb r7, [r4] - mov r12, r7 - movs r6, 0 - ldrsb r6, [r4, r6] - movs r5, 0 - ldrsb r5, [r0, r5] - cmp r6, r5 - bne _080AB3E4 - movs r0, 0x3 - strb r0, [r2] - b _080AB42C - .pool -_080AB3E4: - ldr r0, =0x000006c3 - adds r2, r3, r0 - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - ldr r7, =0x000006c2 - adds r1, r3, r7 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r1] - cmp r0, r1 - bcc _080AB42C - movs r0, 0 - strb r0, [r2] - mov r0, r12 - cmp r6, r5 - bge _080AB414 - adds r0, 0x1 - b _080AB418 - .pool -_080AB414: - mov r0, r12 - subs r0, 0x1 -_080AB418: - strb r0, [r4] - movs r1, 0xD8 - lsls r1, 3 - adds r0, r3, r1 - movs r2, 0 - ldrsb r2, [r0, r2] - movs r0, 0 - movs r1, 0x20 - bl pal_fade_2 -_080AB42C: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80AB3A8 - - thumb_func_start sub_80AB434 -sub_80AB434: @ 80AB434 - push {lr} - ldr r2, =gUnknown_02038454 - ldr r0, =0x000006cb - adds r1, r2, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _080AB452 - ldr r3, =0x000006ca - adds r1, r2, r3 - movs r0, 0 - strb r0, [r1] -_080AB452: - movs r1, 0xDA - lsls r1, 3 - adds r0, r2, r1 - ldrb r0, [r0] - subs r0, 0x3 - cmp r0, 0xA - bhi _080AB51C - lsls r0, 2 - ldr r1, =_080AB47C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080AB47C: - .4byte _080AB4A8 - .4byte _080AB4A8 - .4byte _080AB4A8 - .4byte _080AB4F4 - .4byte _080AB51C - .4byte _080AB51C - .4byte _080AB51C - .4byte _080AB51C - .4byte _080AB4A8 - .4byte _080AB4D0 - .4byte _080AB4A8 -_080AB4A8: - bl sub_80AB54C - lsls r0, 24 - cmp r0, 0 - bne _080AB53C - ldr r0, =gUnknown_02038454 - movs r2, 0xD8 - lsls r2, 3 - adds r1, r0, r2 - movs r2, 0x3 - strb r2, [r1] - ldr r3, =0x000006c6 - adds r0, r3 - strb r2, [r0] - b _080AB53C - .pool -_080AB4D0: - bl sub_80AB5AC - lsls r0, 24 - cmp r0, 0 - bne _080AB53C - ldr r1, =gUnknown_02038454 - movs r0, 0xD8 - lsls r0, 3 - adds r2, r1, r0 - movs r0, 0xFA - strb r0, [r2] - ldr r2, =0x000006c6 - adds r1, r2 - b _080AB538 - .pool -_080AB4F4: - bl sub_80AB604 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0 - bne _080AB53C - ldr r0, =gUnknown_02038454 - movs r3, 0xD8 - lsls r3, 3 - adds r1, r0, r3 - strb r2, [r1] - ldr r1, =0x000006c6 - adds r0, r1 - movs r1, 0x3 - strb r1, [r0] - b _080AB53C - .pool -_080AB51C: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080AB53C - ldr r3, =0x000006c1 - adds r0, r2, r3 - ldrb r1, [r0] - subs r3, 0x1 - adds r0, r2, r3 - strb r1, [r0] - ldr r0, =0x000006c6 - adds r1, r2, r0 -_080AB538: - movs r0, 0x3 - strb r0, [r1] -_080AB53C: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AB434 - - thumb_func_start sub_80AB54C -sub_80AB54C: @ 80AB54C - push {r4,lr} - sub sp, 0x4 - ldr r2, =gUnknown_02038454 - ldr r0, =0x000006c7 - adds r4, r2, r0 - ldrb r0, [r4] - cmp r0, 0x10 - beq _080AB5A2 - adds r1, r0, 0x1 - strb r1, [r4] - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, 0xF - bhi _080AB594 - movs r3, 0x10 - subs r3, r1 - lsls r3, 24 - lsrs r3, 24 - ldr r1, =0x000006c4 - adds r0, r2, r1 - ldrh r0, [r0] - str r0, [sp] - movs r0, 0 - movs r1, 0x20 - movs r2, 0x3 - bl sub_80AB848 - movs r0, 0x1 - b _080AB5A4 - .pool -_080AB594: - movs r0, 0 - movs r1, 0x20 - movs r2, 0x3 - bl pal_fade_2 - movs r0, 0x10 - strb r0, [r4] -_080AB5A2: - movs r0, 0 -_080AB5A4: - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80AB54C - - thumb_func_start sub_80AB5AC -sub_80AB5AC: @ 80AB5AC - push {r4,lr} - ldr r2, =gUnknown_02038454 - ldr r0, =0x000006c7 - adds r4, r2, r0 - ldrb r0, [r4] - cmp r0, 0x10 - beq _080AB5FC - adds r3, r0, 0x1 - strb r3, [r4] - lsls r0, r3, 24 - lsrs r0, 24 - cmp r0, 0xF - bhi _080AB5EC - movs r0, 0x6 - negs r0, r0 - movs r1, 0x10 - subs r1, r3 - lsls r1, 24 - lsrs r1, 24 - ldr r3, =0x000006c4 - adds r2, r3 - ldrh r2, [r2] - bl sub_80AB990 - movs r0, 0x1 - b _080AB5FE - .pool -_080AB5EC: - movs r2, 0x6 - negs r2, r2 - movs r0, 0 - movs r1, 0x20 - bl pal_fade_2 - movs r0, 0x10 - strb r0, [r4] -_080AB5FC: - movs r0, 0 -_080AB5FE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80AB5AC - - thumb_func_start sub_80AB604 -sub_80AB604: @ 80AB604 - push {lr} - ldr r2, =gUnknown_02038454 - ldr r1, =0x000006c7 - adds r0, r2, r1 - ldrb r1, [r0] - cmp r1, 0x10 - beq _080AB638 - adds r1, 0x1 - strb r1, [r0] - movs r0, 0x10 - subs r0, r1 - lsls r0, 24 - lsrs r0, 24 - ldr r3, =0x000006c4 - adds r1, r2, r3 - ldrh r1, [r1] - bl sub_80ABAB0 - movs r0, 0x1 - b _080AB63A - .pool -_080AB638: - movs r0, 0 -_080AB63A: - pop {r1} - bx r1 - thumb_func_end sub_80AB604 - - thumb_func_start nullsub_94 -nullsub_94: @ 80AB640 - bx lr - thumb_func_end nullsub_94 - - thumb_func_start pal_fade_2 -pal_fade_2: @ 80AB644 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r3, r0, 24 - adds r4, r3, 0 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r2, 24 - asrs r0, r2, 24 - cmp r0, 0 - ble _080AB754 - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - lsls r6, r3, 4 - adds r0, r1, r3 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - cmp r4, r9 - bcc _080AB67C - b _080AB82E -_080AB67C: - ldr r1, [sp] - lsls r0, r1, 24 - asrs r0, 19 - str r0, [sp, 0x4] -_080AB684: - ldr r0, =gUnknown_03000F50 - ldr r0, [r0] - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _080AB6C0 - lsls r1, r6, 1 - ldr r0, =gPlttBufferUnfaded - adds r0, r1, r0 - ldr r2, =gPlttBufferFaded - adds r1, r2 - movs r2, 0x8 - bl CpuFastSet - adds r0, r6, 0 - adds r0, 0x10 - lsls r0, 16 - lsrs r6, r0, 16 - mov r2, r9 - lsls r2, 16 - mov r8, r2 - adds r4, 0x1 - mov r12, r4 - b _080AB73E - .pool -_080AB6C0: - cmp r0, 0x2 - beq _080AB6D4 - adds r1, r4, 0 - subs r1, 0x10 - ldr r2, =gUnknown_02038454 - ldr r3, =0x000006d5 - adds r0, r2, r3 - ldrb r0, [r0] - cmp r1, r0 - bne _080AB6E4 -_080AB6D4: - ldr r0, =gUnknown_020388B4 - b _080AB6EA - .pool -_080AB6E4: - movs r3, 0x80 - lsls r3, 2 - adds r0, r2, r3 -_080AB6EA: - ldr r1, [sp, 0x4] - adds r5, r1, r0 - movs r7, 0 - mov r2, r9 - lsls r2, 16 - mov r8, r2 - adds r4, 0x1 - mov r12, r4 - ldr r3, =gPlttBufferFaded - mov r10, r3 -_080AB6FE: - adds r2, r6, 0 - lsls r0, r2, 1 - ldr r1, =gPlttBufferUnfaded - adds r0, r1 - ldr r1, [r0] - lsls r0, r1, 27 - lsrs r0, 27 - adds r0, r5, r0 - ldrb r4, [r0] - lsls r0, r1, 22 - lsrs r0, 27 - adds r0, r5, r0 - ldrb r3, [r0] - lsls r1, 17 - lsrs r1, 27 - adds r1, r5, r1 - ldrb r1, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - lsls r2, 1 - add r2, r10 - lsls r1, 10 - lsls r3, 5 - orrs r1, r3 - orrs r1, r4 - strh r1, [r2] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0xF - bls _080AB6FE -_080AB73E: - mov r2, r12 - lsls r0, r2, 16 - lsrs r4, r0, 16 - cmp r0, r8 - bcc _080AB684 - b _080AB82E - .pool -_080AB754: - cmp r0, 0 - bge _080AB81C - mvns r0, r0 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - lsls r6, r3, 4 - adds r0, r1, r3 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - adds r4, r3, 0 - cmp r4, r9 - bcs _080AB82E -_080AB770: - ldr r0, =gUnknown_03000F50 - ldr r0, [r0] - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _080AB7AC - lsls r1, r6, 1 - ldr r0, =gPlttBufferUnfaded - adds r0, r1, r0 - ldr r2, =gPlttBufferFaded - adds r1, r2 - movs r2, 0x8 - bl CpuFastSet - adds r0, r6, 0 - adds r0, 0x10 - lsls r0, 16 - lsrs r6, r0, 16 - mov r3, r9 - lsls r3, 16 - mov r8, r3 - adds r4, 0x1 - mov r12, r4 - b _080AB804 - .pool -_080AB7AC: - movs r7, 0 - mov r0, r9 - lsls r0, 16 - mov r8, r0 - adds r4, 0x1 - mov r12, r4 - ldr r1, =gUnknown_0854014C - mov r10, r1 - ldr r2, [sp] - lsls r0, r2, 24 - asrs r5, r0, 11 -_080AB7C2: - lsls r0, r6, 1 - ldr r3, =gPlttBufferFaded - adds r4, r0, r3 - ldr r1, =gPlttBufferUnfaded - adds r0, r1 - ldrh r3, [r0] - lsls r3, 16 - lsrs r0, r3, 17 - movs r1, 0xF - ands r0, r1 - lsrs r1, r3, 18 - movs r2, 0xF0 - ands r1, r2 - orrs r0, r1 - lsrs r3, 19 - movs r2, 0xF0 - lsls r2, 4 - adds r1, r2, 0 - ands r3, r1 - orrs r0, r3 - lsls r0, 1 - adds r0, r5 - add r0, r10 - ldrh r0, [r0] - strh r0, [r4] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0xF - bls _080AB7C2 -_080AB804: - mov r3, r12 - lsls r0, r3, 16 - lsrs r4, r0, 16 - cmp r0, r8 - bcc _080AB770 - b _080AB82E - .pool -_080AB81C: - lsls r1, r4, 5 - ldr r0, =gPlttBufferUnfaded - adds r0, r1, r0 - ldr r2, =gPlttBufferFaded - adds r1, r2 - mov r3, r9 - lsls r2, r3, 3 - bl CpuFastSet -_080AB82E: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end pal_fade_2 - - thumb_func_start sub_80AB848 -sub_80AB848: @ 80AB848 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - ldr r4, [sp, 0x34] - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - lsls r3, 24 - lsrs r3, 24 - mov r8, r3 - mov r1, sp - strh r4, [r1] - ldr r1, [sp] - lsls r3, r1, 27 - lsrs r3, 27 - str r3, [sp, 0x4] - lsls r3, r1, 22 - lsrs r3, 27 - str r3, [sp, 0x8] - lsls r1, 17 - lsrs r1, 27 - str r1, [sp, 0xC] - lsls r6, r0, 4 - mov r3, r10 - adds r1, r3, r0 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - lsls r2, 24 - movs r1, 0xFF - lsls r1, 24 - adds r2, r1 - lsrs r2, 24 - adds r4, r0, 0 - cmp r4, r10 - bcs _080AB974 - lsls r0, r2, 24 - asrs r0, 19 - str r0, [sp, 0x10] -_080AB8A0: - ldr r0, =gUnknown_03000F50 - ldr r0, [r0] - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _080AB8D4 - mov r0, sp - ldrh r3, [r0] - adds r0, r6, 0 - movs r1, 0x10 - mov r2, r8 - bl BlendPalette - adds r0, r6, 0 - adds r0, 0x10 - lsls r0, 16 - lsrs r6, r0, 16 - mov r3, r10 - lsls r3, 16 - mov r9, r3 - adds r4, 0x1 - mov r12, r4 - b _080AB96A - .pool -_080AB8D4: - cmp r0, 0x1 - bne _080AB8E4 - ldr r0, =gUnknown_02038654 - ldr r1, [sp, 0x10] - adds r5, r1, r0 - b _080AB8EA - .pool -_080AB8E4: - ldr r0, =gUnknown_020388B4 - ldr r3, [sp, 0x10] - adds r5, r3, r0 -_080AB8EA: - movs r7, 0 - mov r0, r10 - lsls r0, 16 - mov r9, r0 - adds r4, 0x1 - mov r12, r4 -_080AB8F6: - adds r4, r6, 0 - lsls r0, r4, 1 - ldr r1, =gPlttBufferUnfaded - adds r0, r1 - ldr r1, [r0] - lsls r0, r1, 27 - lsrs r0, 27 - adds r0, r5, r0 - ldrb r3, [r0] - lsls r0, r1, 22 - lsrs r0, 27 - adds r0, r5, r0 - ldrb r2, [r0] - lsls r1, 17 - lsrs r1, 27 - adds r1, r5, r1 - ldrb r1, [r1] - ldr r6, [sp, 0x4] - subs r0, r6, r3 - mov r6, r8 - muls r6, r0 - adds r0, r6, 0 - asrs r0, 4 - adds r3, r0 - lsls r3, 24 - lsrs r3, 24 - ldr r6, [sp, 0x8] - subs r0, r6, r2 - mov r6, r8 - muls r6, r0 - adds r0, r6, 0 - asrs r0, 4 - adds r2, r0 - lsls r2, 24 - ldr r6, [sp, 0xC] - subs r0, r6, r1 - mov r6, r8 - muls r6, r0 - adds r0, r6, 0 - asrs r0, 4 - adds r1, r0 - lsls r1, 24 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - lsls r4, 1 - ldr r0, =gPlttBufferFaded - adds r4, r0 - lsrs r1, 14 - lsrs r2, 19 - orrs r1, r2 - orrs r1, r3 - strh r1, [r4] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0xF - bls _080AB8F6 -_080AB96A: - mov r1, r12 - lsls r0, r1, 16 - lsrs r4, r0, 16 - cmp r0, r9 - bcc _080AB8A0 -_080AB974: - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AB848 - - thumb_func_start sub_80AB990 -sub_80AB990: @ 80AB990 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - lsls r1, 24 - lsrs r6, r1, 24 - mov r1, sp - strh r2, [r1] - lsls r0, 24 - movs r1, 0xFF - lsls r1, 24 - eors r0, r1 - lsrs r0, 24 - str r0, [sp, 0x4] - ldr r0, [sp] - lsls r1, r0, 27 - lsrs r1, 27 - str r1, [sp, 0x8] - lsls r1, r0, 22 - lsrs r1, 27 - str r1, [sp, 0xC] - lsls r0, 17 - lsrs r0, 27 - mov r10, r0 - movs r5, 0 - movs r4, 0 -_080AB9C8: - ldr r0, =gUnknown_03000F50 - ldr r0, [r0] - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _080AB9F4 - mov r0, sp - ldrh r3, [r0] - adds r0, r5, 0 - movs r1, 0x10 - adds r2, r6, 0 - bl BlendPalette - adds r0, r5, 0 - adds r0, 0x10 - lsls r0, 16 - lsrs r5, r0, 16 - adds r4, 0x1 - mov r8, r4 - b _080ABA8A - .pool -_080AB9F4: - movs r0, 0 - mov r12, r0 - ldr r1, [sp, 0x4] - lsls r0, r1, 24 - adds r4, 0x1 - mov r8, r4 - movs r7, 0x1E - asrs r0, 11 - mov r9, r0 -_080ABA06: - adds r4, r5, 0 - lsls r0, r4, 1 - ldr r5, =gPlttBufferUnfaded - adds r0, r5 - ldr r0, [r0] - lsls r2, r0, 27 - lsrs r2, 27 - lsls r1, r0, 22 - lsrs r1, 27 - lsls r0, 17 - lsrs r0, 27 - ands r0, r7 - lsls r0, 7 - ands r1, r7 - lsls r1, 3 - orrs r0, r1 - ands r2, r7 - lsls r0, 1 - orrs r0, r2 - add r0, r9 - ldr r1, =gUnknown_0854014C - adds r0, r1 - ldr r1, [r0] - lsls r3, r1, 27 - lsrs r3, 27 - lsls r2, r1, 22 - lsrs r2, 27 - lsls r1, 17 - lsrs r1, 27 - ldr r5, [sp, 0x8] - subs r0, r5, r3 - muls r0, r6 - asrs r0, 4 - adds r3, r0 - lsls r3, 24 - lsrs r3, 24 - ldr r5, [sp, 0xC] - subs r0, r5, r2 - muls r0, r6 - asrs r0, 4 - adds r2, r0 - lsls r2, 24 - mov r5, r10 - subs r0, r5, r1 - muls r0, r6 - asrs r0, 4 - adds r1, r0 - lsls r1, 24 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - lsls r4, 1 - ldr r0, =gPlttBufferFaded - adds r4, r0 - lsrs r1, 14 - lsrs r2, 19 - orrs r1, r2 - orrs r1, r3 - strh r1, [r4] - mov r0, r12 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r12, r0 - cmp r0, 0xF - bls _080ABA06 -_080ABA8A: - mov r1, r8 - lsls r0, r1, 16 - lsrs r4, r0, 16 - cmp r4, 0x1F - bls _080AB9C8 - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AB990 - - thumb_func_start sub_80ABAB0 -sub_80ABAB0: @ 80ABAB0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r3, r1, 0 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r3, 16 - lsrs r3, 16 - mov r0, sp - strh r3, [r0] - movs r1, 0x80 - lsls r1, 1 - movs r0, 0 - adds r2, r7, 0 - bl BlendPalette - ldr r0, [sp] - lsls r1, r0, 27 - lsrs r1, 27 - str r1, [sp, 0x4] - lsls r1, r0, 22 - lsrs r1, 27 - str r1, [sp, 0x8] - lsls r0, 17 - lsrs r0, 27 - mov r10, r0 - movs r4, 0x10 -_080ABAEC: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80ABC00 - lsls r0, 24 - cmp r0, 0 - beq _080ABB9C - adds r0, r4, 0x1 - lsls r1, r0, 20 - lsrs r1, 16 - mov r12, r1 - lsls r1, r4, 20 - lsrs r6, r1, 16 - mov r9, r0 - cmp r6, r12 - bcs _080ABBB0 - movs r0, 0x1C - mov r8, r0 -_080ABB10: - lsls r5, r6, 1 - ldr r0, =gPlttBufferUnfaded - adds r0, r5, r0 - ldr r2, [r0] - lsls r4, r2, 27 - lsrs r4, 27 - lsls r3, r2, 22 - lsrs r3, 27 - lsls r2, 17 - lsrs r2, 27 - mov r0, r8 - subs r1, r0, r4 - lsls r0, r1, 1 - adds r0, r1 - asrs r0, 2 - adds r4, r0 - lsls r4, 24 - lsrs r4, 24 - movs r1, 0x1F - subs r1, r3 - lsls r0, r1, 1 - adds r0, r1 - asrs r0, 2 - adds r3, r0 - lsls r3, 24 - lsrs r3, 24 - mov r0, r8 - subs r1, r0, r2 - lsls r0, r1, 1 - adds r0, r1 - asrs r0, 2 - adds r2, r0 - lsls r2, 24 - lsrs r2, 24 - ldr r1, [sp, 0x4] - subs r0, r1, r4 - muls r0, r7 - asrs r0, 4 - adds r4, r0 - lsls r4, 24 - lsrs r4, 24 - ldr r1, [sp, 0x8] - subs r0, r1, r3 - muls r0, r7 - asrs r0, 4 - adds r3, r0 - lsls r3, 24 - mov r1, r10 - subs r0, r1, r2 - muls r0, r7 - asrs r0, 4 - adds r2, r0 - lsls r2, 24 - ldr r0, =gPlttBufferFaded - adds r5, r0 - lsrs r2, 14 - lsrs r3, 19 - orrs r2, r3 - orrs r2, r4 - strh r2, [r5] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r12 - bcc _080ABB10 - b _080ABBB0 - .pool -_080ABB9C: - lsls r0, r4, 20 - lsrs r0, 16 - mov r1, sp - ldrh r3, [r1] - movs r1, 0x10 - adds r2, r7, 0 - bl BlendPalette - adds r4, 0x1 - mov r9, r4 -_080ABBB0: - mov r1, r9 - lsls r0, r1, 16 - lsrs r4, r0, 16 - cmp r4, 0x1F - bls _080ABAEC - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80ABAB0 - - thumb_func_start sub_80ABBCC -sub_80ABBCC: @ 80ABBCC - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r3, =gUnknown_02038454 - ldr r0, =0x000006fa - adds r1, r3, r0 - ldrb r0, [r1] - cmp r0, 0x5 - bhi _080ABBEE - ldr r4, =0x000006f4 - adds r0, r3, r4 - ldrb r3, [r1] - adds r0, r3 - strb r2, [r0] - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_080ABBEE: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ABBCC - - thumb_func_start sub_80ABC00 -sub_80ABC00: @ 80ABC00 - push {r4,r5,lr} - lsls r0, 24 - lsrs r3, r0, 24 - movs r1, 0 - ldr r2, =gUnknown_02038454 - ldr r4, =0x000006fa - adds r0, r2, r4 - ldrb r0, [r0] - cmp r1, r0 - bcs _080ABC3E - ldr r5, =0x000006f4 - adds r4, r2, r5 - adds r2, r0, 0 -_080ABC1A: - adds r0, r1, r4 - ldrb r0, [r0] - cmp r0, r3 - bne _080ABC34 - movs r0, 0x1 - b _080ABC40 - .pool -_080ABC34: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r2 - bcc _080ABC1A -_080ABC3E: - movs r0, 0 -_080ABC40: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80ABC00 - - thumb_func_start sub_80ABC48 -sub_80ABC48: @ 80ABC48 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r5, =gUnknown_02038454 - ldr r1, =0x000006c6 - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0x3 - bne _080ABC6E - lsls r2, r4, 24 - asrs r2, 24 - movs r0, 0 - movs r1, 0x20 - bl pal_fade_2 - movs r1, 0xD8 - lsls r1, 3 - adds r0, r5, r1 - strb r4, [r0] -_080ABC6E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ABC48 - - thumb_func_start sub_80ABC7C -sub_80ABC7C: @ 80ABC7C - push {r4-r6,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - lsls r2, 24 - lsrs r6, r2, 24 - ldr r3, =gUnknown_02038454 - ldr r0, =0x000006c6 - adds r2, r3, r0 - ldrb r0, [r2] - cmp r0, 0x3 - bne _080ABCBC - movs r1, 0 - strb r1, [r2] - movs r2, 0xD8 - lsls r2, 3 - adds r0, r3, r2 - strb r4, [r0] - adds r2, 0x1 - adds r0, r3, r2 - strb r5, [r0] - adds r2, 0x2 - adds r0, r3, r2 - strb r1, [r0] - ldr r1, =0x000006c2 - adds r0, r3, r1 - strb r6, [r0] - lsls r0, r4, 24 - asrs r0, 24 - bl sub_80ABC48 -_080ABCBC: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ABC7C - - thumb_func_start FadeScreen -FadeScreen: @ 80ABCD0 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - adds r2, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - cmp r0, 0x1 - beq _080ABD08 - cmp r0, 0x1 - bgt _080ABCEC - cmp r0, 0 - beq _080ABCF6 - b _080ABDE4 -_080ABCEC: - cmp r2, 0x2 - beq _080ABCFC - cmp r2, 0x3 - beq _080ABD0C - b _080ABDE4 -_080ABCF6: - movs r4, 0 - movs r1, 0 - b _080ABD10 -_080ABCFC: - ldr r4, =0x0000ffff - movs r1, 0 - b _080ABD10 - .pool -_080ABD08: - movs r4, 0 - b _080ABD0E -_080ABD0C: - ldr r4, =0x0000ffff -_080ABD0E: - movs r1, 0x1 -_080ABD10: - ldr r0, =gUnknown_02038454 - movs r2, 0xDA - lsls r2, 3 - adds r0, r2 - ldrb r0, [r0] - cmp r0, 0x3 - blt _080ABD38 - cmp r0, 0x6 - ble _080ABD2A - cmp r0, 0xD - bgt _080ABD38 - cmp r0, 0xB - blt _080ABD38 -_080ABD2A: - movs r2, 0x1 - b _080ABD3A - .pool -_080ABD38: - movs r2, 0 -_080ABD3A: - cmp r1, 0 - beq _080ABD7C - cmp r2, 0 - beq _080ABD4E - ldr r0, =gPlttBufferFaded - ldr r1, =gPlttBufferUnfaded - movs r2, 0x80 - lsls r2, 1 - bl CpuFastSet -_080ABD4E: - movs r0, 0x1 - negs r0, r0 - lsls r1, r5, 24 - asrs r1, 24 - str r4, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r0, =gUnknown_02038454 - ldr r3, =0x000006c6 - adds r0, r3 - movs r1, 0x2 - strb r1, [r0] - b _080ABDE4 - .pool -_080ABD7C: - ldr r1, =gUnknown_02038454 - ldr r3, =0x000006c4 - adds r0, r1, r3 - strh r4, [r0] - cmp r2, 0 - beq _080ABDA0 - ldr r0, =0x000006c7 - adds r1, r0 - movs r0, 0 - strb r0, [r1] - b _080ABDB2 - .pool -_080ABDA0: - movs r0, 0x1 - negs r0, r0 - lsls r1, r5, 24 - asrs r1, 24 - str r4, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade -_080ABDB2: - ldr r4, =gUnknown_02038454 - ldr r1, =0x000006c6 - adds r0, r4, r1 - movs r1, 0 - movs r5, 0x1 - strb r5, [r0] - ldr r2, =0x000006ca - adds r0, r4, r2 - strb r5, [r0] - ldr r3, =0x000006cb - adds r0, r4, r3 - strb r1, [r0] - movs r1, 0xE6 - lsls r1, 3 - adds r0, r4, r1 - ldrb r0, [r0] - adds r2, 0x68 - adds r1, r4, r2 - ldrb r1, [r1] - bl sub_80AC124 - movs r3, 0xD9 - lsls r3, 3 - adds r4, r3 - strb r5, [r4] -_080ABDE4: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end FadeScreen - - thumb_func_start IsWeatherNotFadingIn -IsWeatherNotFadingIn: @ 80ABDFC - ldr r0, =gUnknown_02038454 - ldr r1, =0x000006c6 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x1 - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - bx lr - .pool - thumb_func_end IsWeatherNotFadingIn - - thumb_func_start UpdateSpritePaletteWithWeather -@ void UpdateSpritePaletteWithWeather(u8 a1) -UpdateSpritePaletteWithWeather: @ 80ABE18 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 8 - movs r1, 0x80 - lsls r1, 13 - adds r0, r1 - lsrs r4, r0, 16 - ldr r5, =gUnknown_02038454 - ldr r2, =0x000006c6 - adds r0, r5, r2 - ldrb r0, [r0] - adds r1, r5, 0 - cmp r0, 0x1 - beq _080ABE60 - cmp r0, 0x2 - beq _080ABEAC - adds r2, 0xA - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0x6 - beq _080ABEE4 - lsls r0, r4, 24 - lsrs r0, 24 - subs r2, 0x10 - adds r1, r2 - movs r2, 0 - ldrsb r2, [r1, r2] - movs r1, 0x1 - bl pal_fade_2 - b _080ABEF4 - .pool -_080ABE60: - ldr r2, =0x000006ca - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080ABEF4 - adds r2, 0x6 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0x6 - bne _080ABE7C - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80ABBCC -_080ABE7C: - lsls r0, r4, 20 - lsrs r4, r0, 16 - movs r2, 0 - ldr r6, =gPlttBufferFaded - ldr r0, =0x000006c4 - adds r3, r5, r0 -_080ABE88: - adds r0, r4, r2 - lsls r0, 1 - adds r0, r6 - ldrh r1, [r3] - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0xF - bls _080ABE88 - b _080ABEF4 - .pool -_080ABEAC: - lsls r0, r4, 20 - lsrs r4, r0, 16 - lsls r1, r4, 1 - ldr r0, =gPlttBufferFaded - adds r0, r1, r0 - ldr r2, =gPlttBufferUnfaded - adds r1, r2 - movs r2, 0x8 - bl CpuFastSet - ldr r0, =gPaletteFade - ldrh r2, [r0, 0x4] - lsls r2, 21 - lsrs r2, 27 - ldrh r3, [r0, 0x6] - lsls r3, 17 - lsrs r3, 17 - adds r0, r4, 0 - movs r1, 0x10 - bl BlendPalette - b _080ABEF4 - .pool -_080ABEE4: - lsls r0, r4, 20 - lsrs r4, r0, 16 - ldr r3, =0x000073fc - adds r0, r4, 0 - movs r1, 0x10 - movs r2, 0xC - bl BlendPalette -_080ABEF4: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end UpdateSpritePaletteWithWeather - - thumb_func_start ApplyWeatherGammaShiftToPal -ApplyWeatherGammaShiftToPal: @ 80ABF00 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_02038454 - movs r2, 0xD8 - lsls r2, 3 - adds r1, r2 - movs r2, 0 - ldrsb r2, [r1, r2] - movs r1, 0x1 - bl pal_fade_2 - pop {r0} - bx r0 - .pool - thumb_func_end ApplyWeatherGammaShiftToPal - - thumb_func_start sub_80ABF20 -sub_80ABF20: @ 80ABF20 - push {lr} - ldr r1, =gUnknown_02038454 - ldr r2, =0x000006c6 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0x1 - beq _080ABF3C - movs r0, 0 - b _080ABF42 - .pool -_080ABF3C: - ldr r2, =0x000006ca - adds r0, r1, r2 - ldrb r0, [r0] -_080ABF42: - pop {r1} - bx r1 - .pool - thumb_func_end sub_80ABF20 - - thumb_func_start sub_80ABF4C -sub_80ABF4C: @ 80ABF4C - push {r4,lr} - ldr r4, =gUnknown_02038454 - ldr r1, =0x000006d4 - adds r4, r1 - ldrb r1, [r4] - lsls r1, 20 - movs r2, 0x80 - lsls r2, 17 - adds r1, r2 - lsrs r1, 16 - movs r2, 0x20 - bl LoadPalette - ldrb r0, [r4] - bl UpdateSpritePaletteWithWeather - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ABF4C - - thumb_func_start sub_80ABF7C -sub_80ABF7C: @ 80ABF7C - movs r2, 0x20 - strb r2, [r0] - strb r2, [r1] - bx lr - thumb_func_end sub_80ABF7C - - thumb_func_start sub_80ABF84 -sub_80ABF84: @ 80ABF84 - ldr r0, =gUnknown_02038454 - ldr r2, =0x0000074d - adds r1, r0, r2 - movs r2, 0x1 - strb r2, [r1] - ldr r1, =0x0000074e - adds r0, r1 - strb r2, [r0] - bx lr - .pool - thumb_func_end sub_80ABF84 - - thumb_func_start sub_80ABFA4 -sub_80ABFA4: @ 80ABFA4 - push {r4,lr} - ldr r1, =gUnknown_02038454 - ldr r0, =0x0000074d - adds r4, r1, r0 - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r0, 0x1F - bgt _080ABFD8 - ldr r0, =0x0000074e - adds r1, r0 - adds r0, r4, 0 - bl sub_80ABF7C - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r0, 0x1F - bgt _080ABFD8 - movs r0, 0x1 - b _080ABFDA - .pool -_080ABFD8: - movs r0, 0 -_080ABFDA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80ABFA4 - - thumb_func_start sub_80ABFE0 -sub_80ABFE0: @ 80ABFE0 - push {lr} - lsls r0, 24 - asrs r0, 24 - mvns r0, r0 - bl sub_80ABC48 - pop {r0} - bx r0 - thumb_func_end sub_80ABFE0 - - thumb_func_start sub_80ABFF0 -sub_80ABFF0: @ 80ABFF0 - ldr r1, =gUnknown_02038454 - ldr r2, =0x0000073c - adds r0, r1, r2 - movs r2, 0 - strh r2, [r0] - movs r3, 0xE8 - lsls r3, 3 - adds r0, r1, r3 - strh r2, [r0] - adds r3, 0x2 - adds r0, r1, r3 - strh r2, [r0] - ldr r0, =0x0000073e - adds r1, r0 - strh r2, [r1] - bx lr - .pool - thumb_func_end sub_80ABFF0 - - thumb_func_start sub_80AC01C -sub_80AC01C: @ 80AC01C - push {r4-r7,lr} - ldr r5, =gUnknown_02038454 - ldr r0, =0x00000742 - adds r7, r5, r0 - movs r2, 0 - ldrsh r1, [r7, r2] - cmp r1, 0x1 - beq _080AC090 - cmp r1, 0x1 - bgt _080AC040 - cmp r1, 0 - beq _080AC046 - b _080AC118 - .pool -_080AC040: - cmp r1, 0x2 - beq _080AC0E4 - b _080AC118 -_080AC046: - movs r3, 0xE8 - lsls r3, 3 - adds r6, r5, r3 - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _080AC118 - strh r1, [r6] - ldr r0, =0x0000073c - adds r4, r5, r0 - ldrh r0, [r4] - adds r1, r0, 0x1 - strh r1, [r4] - lsls r0, 24 - asrs r0, 24 - bl sub_80ABFE0 - ldrh r1, [r4] - movs r2, 0 - ldrsh r0, [r4, r2] - cmp r0, 0x5 - ble _080AC118 - ldr r3, =0x0000073e - adds r0, r5, r3 - strh r1, [r0] - movs r0, 0x1 - strh r0, [r7] - movs r0, 0x3C - strh r0, [r6] - b _080AC118 - .pool -_080AC090: - movs r0, 0xE8 - lsls r0, 3 - adds r2, r5, r0 - ldrh r0, [r2] - adds r0, 0x3 - movs r1, 0x7F - ands r0, r1 - strh r0, [r2] - ldr r1, =gSineTable - movs r3, 0 - ldrsh r0, [r2, r3] - lsls r0, 1 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - subs r0, 0x1 - asrs r0, 6 - adds r0, 0x2 - ldr r2, =0x0000073c - adds r6, r5, r2 - adds r2, r0, 0 - strh r0, [r6] - ldr r3, =0x0000073e - adds r4, r5, r3 - movs r3, 0 - ldrsh r1, [r4, r3] - cmp r0, r1 - beq _080AC0D0 - lsls r0, r2, 24 - asrs r0, 24 - bl sub_80ABFE0 -_080AC0D0: - ldrh r0, [r6] - strh r0, [r4] - b _080AC118 - .pool -_080AC0E4: - movs r0, 0xE8 - lsls r0, 3 - adds r1, r5, r0 - ldrh r0, [r1] - adds r0, 0x1 - movs r6, 0 - strh r0, [r1] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _080AC118 - strh r6, [r1] - ldr r1, =0x0000073c - adds r4, r5, r1 - ldrh r0, [r4] - subs r0, 0x1 - strh r0, [r4] - lsls r0, 24 - asrs r0, 24 - bl sub_80ABFE0 - movs r2, 0 - ldrsh r0, [r4, r2] - cmp r0, 0x3 - bne _080AC118 - strh r6, [r7] -_080AC118: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC01C - - thumb_func_start sub_80AC124 -sub_80AC124: @ 80AC124 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - ldr r3, =gUnknown_02038454 - movs r4, 0xE6 - lsls r4, 3 - adds r2, r3, r4 - strh r0, [r2] - adds r4, 0x2 - adds r2, r3, r4 - strh r1, [r2] - adds r4, 0x2 - adds r2, r3, r4 - strh r0, [r2] - ldr r2, =0x00000736 - adds r3, r2 - strh r1, [r3] - lsls r1, 8 - orrs r1, r0 - movs r0, 0x52 - bl SetGpuReg - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC124 - - thumb_func_start sub_80AC164 -sub_80AC164: @ 80AC164 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - ldr r3, =gUnknown_02038454 - ldr r5, =0x00000734 - adds r4, r3, r5 - movs r5, 0 - strh r0, [r4] - ldr r4, =0x00000736 - adds r0, r3, r4 - strh r1, [r0] - ldr r1, =0x0000073a - adds r0, r3, r1 - strb r2, [r0] - adds r4, 0x3 - adds r0, r3, r4 - strb r5, [r0] - movs r0, 0xE7 - lsls r0, 3 - adds r3, r0 - strb r5, [r3] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC164 - - thumb_func_start sub_80AC1A8 -sub_80AC1A8: @ 80AC1A8 - push {r4-r6,lr} - ldr r0, =gUnknown_02038454 - movs r1, 0xE6 - lsls r1, 3 - adds r3, r0, r1 - ldr r2, [r3] - ldr r6, =0x00000734 - adds r4, r0, r6 - ldr r1, [r4] - adds r5, r0, 0 - cmp r2, r1 - beq _080AC26C - ldr r0, =0x00000739 - adds r2, r5, r0 - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - ldr r6, =0x0000073a - adds r1, r5, r6 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r1] - cmp r0, r1 - bls _080AC238 - movs r0, 0 - strb r0, [r2] - movs r0, 0xE7 - lsls r0, 3 - adds r1, r5, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080AC210 - ldrh r1, [r3] - adds r2, r1, 0 - ldrh r0, [r4] - cmp r2, r0 - bcs _080AC230 - adds r0, r1, 0x1 - b _080AC236 - .pool -_080AC210: - ldr r1, =0x00000732 - adds r3, r5, r1 - ldr r2, =0x00000736 - adds r0, r5, r2 - ldrh r1, [r3] - adds r2, r1, 0 - ldrh r0, [r0] - cmp r2, r0 - bcs _080AC230 - adds r0, r1, 0x1 - b _080AC236 - .pool -_080AC230: - cmp r2, r0 - bls _080AC238 - subs r0, r1, 0x1 -_080AC236: - strh r0, [r3] -_080AC238: - ldr r6, =0x00000732 - adds r0, r5, r6 - ldrh r1, [r0] - lsls r1, 8 - movs r0, 0xE6 - lsls r0, 3 - adds r4, r5, r0 - ldrh r0, [r4] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - ldr r1, [r4] - ldr r2, =0x00000734 - adds r0, r5, r2 - ldr r0, [r0] - cmp r1, r0 - beq _080AC26C - movs r0, 0 - b _080AC26E - .pool -_080AC26C: - movs r0, 0x1 -_080AC26E: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80AC1A8 - - thumb_func_start sub_80AC274 -sub_80AC274: @ 80AC274 - push {lr} - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - cmp r0, 0x9 - bhi _080AC306 - lsls r0, 2 - ldr r1, =_080AC290 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080AC290: - .4byte _080AC2B8 - .4byte _080AC2C0 - .4byte _080AC2C8 - .4byte _080AC2D0 - .4byte _080AC2D8 - .4byte _080AC2E0 - .4byte _080AC2E8 - .4byte _080AC2F0 - .4byte _080AC2F8 - .4byte _080AC300 -_080AC2B8: - movs r0, 0x1 - bl SetWeather - b _080AC306 -_080AC2C0: - movs r0, 0x2 - bl SetWeather - b _080AC306 -_080AC2C8: - movs r0, 0x3 - bl SetWeather - b _080AC306 -_080AC2D0: - movs r0, 0x4 - bl SetWeather - b _080AC306 -_080AC2D8: - movs r0, 0x5 - bl SetWeather - b _080AC306 -_080AC2E0: - movs r0, 0x6 - bl SetWeather - b _080AC306 -_080AC2E8: - movs r0, 0x9 - bl SetWeather - b _080AC306 -_080AC2F0: - movs r0, 0x7 - bl SetWeather - b _080AC306 -_080AC2F8: - movs r0, 0x8 - bl SetWeather - b _080AC306 -_080AC300: - movs r0, 0xB - bl SetWeather -_080AC306: - pop {r0} - bx r0 - thumb_func_end sub_80AC274 - - thumb_func_start weather_get_current -weather_get_current: @ 80AC30C - ldr r0, =gUnknown_02038454 - movs r1, 0xDA - lsls r1, 3 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end weather_get_current - - thumb_func_start sub_80AC31C -sub_80AC31C: @ 80AC31C - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r1, =gUnknown_02038454 - ldr r3, =0x000006c6 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0x2 - beq _080AC36E - cmp r2, 0x53 - beq _080AC354 - cmp r2, 0x53 - bgt _080AC344 - cmp r2, 0x51 - beq _080AC360 - b _080AC36E - .pool -_080AC344: - cmp r2, 0x55 - bne _080AC36E - ldr r0, =0x000006dd - adds r1, r0 - movs r0, 0 - b _080AC366 - .pool -_080AC354: - ldr r3, =0x000006dd - adds r1, r3 - movs r0, 0x1 - b _080AC366 - .pool -_080AC360: - ldr r0, =0x000006dd - adds r1, r0 - movs r0, 0x2 -_080AC366: - strb r0, [r1] - adds r0, r2, 0 - bl PlaySE -_080AC36E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC31C - - thumb_func_start play_some_sound -play_some_sound: @ 80AC378 - push {lr} - bl IsSpecialSEPlaying - lsls r0, 24 - cmp r0, 0 - beq _080AC3B6 - ldr r0, =gUnknown_02038454 - ldr r1, =0x000006dd - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x1 - beq _080AC3A8 - cmp r0, 0x1 - bgt _080AC3B0 - cmp r0, 0 - bne _080AC3B0 - movs r0, 0x56 - bl PlaySE - b _080AC3B6 - .pool -_080AC3A8: - movs r0, 0x54 - bl PlaySE - b _080AC3B6 -_080AC3B0: - movs r0, 0x52 - bl PlaySE -_080AC3B6: - pop {r0} - bx r0 - thumb_func_end play_some_sound - - thumb_func_start IsWeatherChangeComplete -IsWeatherChangeComplete: @ 80AC3BC - ldr r0, =gUnknown_02038454 - ldr r1, =0x000006d3 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end IsWeatherChangeComplete - - thumb_func_start sub_80AC3D0 -sub_80AC3D0: @ 80AC3D0 - ldr r0, =gUnknown_02038454 - ldr r1, =0x000006c6 - adds r0, r1 - movs r1, 0x2 - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_80AC3D0 - - thumb_func_start sub_80AC3E4 -sub_80AC3E4: @ 80AC3E4 - ldr r0, =gUnknown_02038454 - ldr r1, =0x000006c6 - adds r0, r1 - movs r1, 0x3 - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_80AC3E4 - - thumb_func_start PreservePaletteInWeather -PreservePaletteInWeather: @ 80AC3F8 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gUnknown_0854C250 - ldr r5, =gUnknown_02038BA4 - adds r1, r5, 0 - movs r2, 0x10 - bl CpuSet - adds r4, r5 - movs r0, 0 - strb r0, [r4] - ldr r0, =gUnknown_03000F50 - str r5, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end PreservePaletteInWeather - - thumb_func_start ResetPreservedPalettesInWeather -ResetPreservedPalettesInWeather: @ 80AC428 - ldr r1, =gUnknown_03000F50 - ldr r0, =gUnknown_0854C250 - str r0, [r1] - bx lr - .pool - thumb_func_end ResetPreservedPalettesInWeather - - thumb_func_start sub_80AC438 -sub_80AC438: @ 80AC438 - push {lr} - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r2, =0x000006c1 - adds r1, r0, r2 - movs r2, 0 - strb r2, [r1] - ldr r1, =0x000006c2 - adds r3, r0, r1 - movs r1, 0x14 - strb r1, [r3] - ldr r3, =0x000006d2 - adds r1, r0, r3 - strb r2, [r1] - subs r3, 0x6 - adds r1, r0, r3 - strh r2, [r1] - ldr r1, =0x000006de - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080AC46C - movs r0, 0 - movs r1, 0x10 - bl sub_80AC124 -_080AC46C: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC438 - - thumb_func_start sub_80AC484 -sub_80AC484: @ 80AC484 - push {r4,lr} - bl sub_80AC438 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AC4A4 - adds r4, r1, r2 -_080AC49A: - bl sub_80AC4B4 - ldrb r0, [r4] - cmp r0, 0 - beq _080AC49A -_080AC4A4: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC484 - - thumb_func_start sub_80AC4B4 -sub_80AC4B4: @ 80AC4B4 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r0, =0x000006cc - adds r4, r5, r0 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080AC4E4 - cmp r0, 0x1 - bgt _080AC4D8 - cmp r0, 0 - beq _080AC4DE - b _080AC508 - .pool -_080AC4D8: - cmp r0, 0x2 - beq _080AC4F0 - b _080AC508 -_080AC4DE: - bl sub_80AC594 - b _080AC502 -_080AC4E4: - movs r0, 0xC - movs r1, 0x8 - movs r2, 0x1 - bl sub_80AC164 - b _080AC502 -_080AC4F0: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080AC508 - ldr r0, =0x000006d2 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] -_080AC502: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080AC508: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC4B4 - - thumb_func_start sub_80AC514 -sub_80AC514: @ 80AC514 - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006ce - adds r4, r0, r1 - ldrh r0, [r4] - cmp r0, 0 - beq _080AC534 - cmp r0, 0x1 - beq _080AC540 - movs r0, 0 - b _080AC556 - .pool -_080AC534: - movs r0, 0 - movs r1, 0x10 - movs r2, 0x1 - bl sub_80AC164 - b _080AC54E -_080AC540: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080AC554 - bl sub_80AC660 -_080AC54E: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080AC554: - movs r0, 0x1 -_080AC556: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80AC514 - - thumb_func_start sub_80AC55C -sub_80AC55C: @ 80AC55C - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006c1 - adds r2, r1, r0 - movs r0, 0 - strb r0, [r2] - ldr r0, =0x000006c2 - adds r1, r0 - movs r0, 0x14 - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_80AC55C - - thumb_func_start sub_80AC580 -sub_80AC580: @ 80AC580 - push {lr} - bl sub_80AC55C - pop {r0} - bx r0 - thumb_func_end sub_80AC580 - - thumb_func_start nullsub_95 -nullsub_95: @ 80AC58C - bx lr - thumb_func_end nullsub_95 - - thumb_func_start sub_80AC590 -sub_80AC590: @ 80AC590 - movs r0, 0 - bx lr - thumb_func_end sub_80AC590 - - thumb_func_start sub_80AC594 -sub_80AC594: @ 80AC594 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006de - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x1 - beq _080AC650 - ldr r0, =sCloudSpriteSheet - bl LoadSpriteSheet - ldr r0, =gUnknown_0854C290 - bl sub_80ABF4C - movs r5, 0 -_080AC5B2: - ldr r0, =sCloudSpriteTemplate - movs r1, 0 - movs r2, 0 - movs r3, 0xFF - bl CreateSprite - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x40 - beq _080AC628 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - lsls r2, r5, 2 - movs r0, 0xFA - lsls r0, 1 - adds r1, r0 - adds r1, r2 - lsls r4, r3, 4 - adds r4, r3 - lsls r4, 2 - ldr r0, =gSprites - adds r4, r0 - str r4, [r1] - ldr r0, =gUnknown_0854FB50 - adds r2, r0 - ldrh r0, [r2] - adds r0, 0x7 - lsls r0, 16 - asrs r0, 16 - ldrh r1, [r2, 0x2] - adds r1, 0x7 - lsls r1, 16 - asrs r1, 16 - adds r2, r4, 0 - adds r2, 0x20 - adds r3, r4, 0 - adds r3, 0x22 - bl sub_8093038 - adds r4, 0x3E - ldrb r0, [r4] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r4] - b _080AC63A - .pool -_080AC628: - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - lsls r0, r5, 2 - movs r2, 0xFA - lsls r2, 1 - adds r1, r2 - adds r1, r0 - movs r0, 0 - str r0, [r1] -_080AC63A: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x2 - bls _080AC5B2 - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006de - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] -_080AC650: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC594 - - thumb_func_start sub_80AC660 -sub_80AC660: @ 80AC660 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006de - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080AC6A4 - movs r4, 0 - movs r0, 0xFA - lsls r0, 1 - adds r5, r1, r0 -_080AC678: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080AC686 - bl DestroySprite -_080AC686: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x2 - bls _080AC678 - movs r0, 0x90 - lsls r0, 5 - bl FreeSpriteTilesByTag - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006de - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_080AC6A4: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC660 - - thumb_func_start sub_80AC6B4 -sub_80AC6B4: @ 80AC6B4 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - movs r1, 0x1 - ands r0, r1 - strh r0, [r2, 0x2E] - cmp r0, 0 - beq _080AC6CC - ldrh r0, [r2, 0x20] - subs r0, 0x1 - strh r0, [r2, 0x20] -_080AC6CC: - pop {r0} - bx r0 - thumb_func_end sub_80AC6B4 - - thumb_func_start sub_80AC6D0 -sub_80AC6D0: @ 80AC6D0 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006cc - adds r3, r1, r0 - movs r2, 0 - movs r0, 0 - strh r0, [r3] - ldr r3, =0x000006d2 - adds r0, r1, r3 - strb r2, [r0] - subs r3, 0x11 - adds r0, r1, r3 - strb r2, [r0] - ldr r0, =0x000006c2 - adds r1, r0 - strb r2, [r1] - bx lr - .pool - thumb_func_end sub_80AC6D0 - - thumb_func_start sub_80AC704 -sub_80AC704: @ 80AC704 - push {r4,lr} - bl sub_80AC6D0 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AC724 - adds r4, r1, r2 -_080AC71A: - bl sub_80AC734 - ldrb r0, [r4] - cmp r0, 0 - beq _080AC71A -_080AC724: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC704 - - thumb_func_start sub_80AC734 -sub_80AC734: @ 80AC734 - push {lr} - ldr r1, =gUnknown_0854C14C - ldr r0, [r1] - ldr r2, =0x000006cc - adds r0, r2 - ldrh r0, [r0] - adds r2, r1, 0 - cmp r0, 0x4 - bhi _080AC810 - lsls r0, 2 - ldr r1, =_080AC75C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080AC75C: - .4byte _080AC770 - .4byte _080AC78C - .4byte _080AC7A4 - .4byte _080AC7C0 - .4byte _080AC7D8 -_080AC770: - ldr r1, [r2] - ldr r2, =0x000006c6 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080AC814 - ldr r0, =0x000006cc - adds r1, r0 - b _080AC7F8 - .pool -_080AC78C: - bl sub_80ABF84 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006cc - adds r1, r2 - b _080AC7F8 - .pool -_080AC7A4: - bl sub_80ABFA4 - lsls r0, 24 - cmp r0, 0 - bne _080AC814 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006cc - adds r1, r0 - b _080AC7F8 - .pool -_080AC7C0: - bl sub_80ABFF0 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006cc - adds r1, r2 - b _080AC7F8 - .pool -_080AC7D8: - bl sub_80AC01C - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r1, =0x0000073c - adds r0, r2, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0x6 - bne _080AC814 - ldr r0, =0x000006d2 - adds r1, r2, r0 - movs r0, 0x1 - strb r0, [r1] - ldr r0, =0x000006cc - adds r1, r2, r0 -_080AC7F8: - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080AC814 - .pool -_080AC810: - bl sub_80AC01C -_080AC814: - pop {r0} - bx r0 - thumb_func_end sub_80AC734 - - thumb_func_start sub_80AC818 -sub_80AC818: @ 80AC818 - movs r0, 0 - bx lr - thumb_func_end sub_80AC818 - - thumb_func_start sub_80AC81C -sub_80AC81C: @ 80AC81C - push {lr} - ldr r0, =task50_0807B6D4 - movs r1, 0x50 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC81C - - thumb_func_start task50_0807B6D4 -task50_0807B6D4: @ 80AC830 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bhi _080AC922 - lsls r0, 2 - ldr r1, =_080AC85C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080AC85C: - .4byte _080AC870 - .4byte _080AC89A - .4byte _080AC8C8 - .4byte _080AC8F8 - .4byte _080AC918 -_080AC870: - movs r0, 0 - strh r0, [r4, 0xA] - strh r0, [r4, 0xC] - ldr r0, =0x04000048 - ldrh r0, [r0] - strh r0, [r4, 0xE] - ldr r1, =0x00003f3f - movs r0, 0x48 - bl SetGpuReg - movs r0, 0x50 - movs r1, 0x9E - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080AC89A: - ldrh r0, [r4, 0xA] - adds r0, 0x3 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - ble _080AC8AC - movs r0, 0x10 - strh r0, [r4, 0xA] -_080AC8AC: - ldrh r1, [r4, 0xA] - movs r0, 0x54 - bl SetGpuReg - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0xF - ble _080AC922 - b _080AC910 - .pool -_080AC8C8: - ldrh r0, [r4, 0xC] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - ble _080AC922 - strh r1, [r4, 0xC] - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bgt _080AC8EE - strh r1, [r4, 0xA] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080AC8EE: - ldrh r1, [r4, 0xA] - movs r0, 0x54 - bl SetGpuReg - b _080AC922 -_080AC8F8: - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldrh r1, [r4, 0xE] - movs r0, 0x48 - bl SetGpuReg -_080AC910: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080AC922 -_080AC918: - bl EnableBothScriptContexts - adds r0, r5, 0 - bl DestroyTask -_080AC922: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end task50_0807B6D4 - - thumb_func_start sub_80AC928 -sub_80AC928: @ 80AC928 - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006cc - adds r0, r1, r2 - movs r3, 0 - movs r2, 0 - strh r2, [r0] - ldr r4, =0x000006d2 - adds r0, r1, r4 - strb r3, [r0] - adds r4, 0x4 - adds r0, r1, r4 - strh r2, [r0] - ldr r0, =0x000006db - adds r2, r1, r0 - movs r0, 0x8 - strb r0, [r2] - ldr r2, =0x000006dc - adds r0, r1, r2 - strb r3, [r0] - adds r4, 0x3 - adds r2, r1, r4 - movs r0, 0xA - strb r0, [r2] - ldr r0, =0x000006c1 - adds r2, r1, r0 - movs r0, 0x3 - strb r0, [r2] - ldr r2, =0x000006c2 - adds r1, r2 - movs r0, 0x14 - strb r0, [r1] - movs r0, 0x55 - bl sub_80AC31C - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC928 - - thumb_func_start sub_80AC994 -sub_80AC994: @ 80AC994 - push {r4,lr} - bl sub_80AC928 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AC9B4 - adds r4, r1, r2 -_080AC9AA: - bl sub_80AC9C4 - ldrb r0, [r4] - cmp r0, 0 - beq _080AC9AA -_080AC9B4: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC994 - - thumb_func_start sub_80AC9C4 -sub_80AC9C4: @ 80AC9C4 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r0, =0x000006cc - adds r4, r5, r0 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080AC9F4 - cmp r0, 0x1 - bgt _080AC9E8 - cmp r0, 0 - beq _080AC9EE - b _080ACA18 - .pool -_080AC9E8: - cmp r0, 0x2 - beq _080ACA00 - b _080ACA18 -_080AC9EE: - bl sub_80ACD68 - b _080ACA12 -_080AC9F4: - bl sub_80ACD78 - lsls r0, 24 - cmp r0, 0 - bne _080ACA18 - b _080ACA12 -_080ACA00: - bl sub_80ACEAC - lsls r0, 24 - cmp r0, 0 - bne _080ACA18 - ldr r0, =0x000006d2 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] -_080ACA12: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080ACA18: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AC9C4 - - thumb_func_start sub_80ACA24 -sub_80ACA24: @ 80ACA24 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r1, =0x000006ce - adds r3, r2, r1 - ldrh r1, [r3] - adds r4, r0, 0 - cmp r1, 0 - beq _080ACA48 - cmp r1, 0x1 - beq _080ACA7C - movs r0, 0 - b _080ACAAA - .pool -_080ACA48: - ldr r5, =0x000006d1 - adds r0, r2, r5 - ldrb r0, [r0] - cmp r0, 0x3 - beq _080ACA5A - cmp r0, 0x5 - beq _080ACA5A - cmp r0, 0xD - bne _080ACA70 -_080ACA5A: - ldr r0, [r4] - ldr r1, =0x000006ce - adds r0, r1 - movs r1, 0xFF - strh r1, [r0] - movs r0, 0 - b _080ACAAA - .pool -_080ACA70: - ldr r4, =0x000006d9 - adds r0, r2, r4 - strb r1, [r0] - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r3] -_080ACA7C: - bl sub_80ACEAC - lsls r0, 24 - cmp r0, 0 - bne _080ACAA8 - bl sub_80ACF38 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r5, =0x000006ce - adds r1, r5 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0 - b _080ACAAA - .pool -_080ACAA8: - movs r0, 0x1 -_080ACAAA: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80ACA24 - - thumb_func_start sub_80ACAB0 -sub_80ACAB0: @ 80ACAB0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - movs r1, 0x30 - ldrsh r0, [r7, r1] - cmp r0, 0 - bne _080ACAC4 - ldr r0, =0x00000169 - strh r0, [r7, 0x30] -_080ACAC4: - movs r2, 0x30 - ldrsh r1, [r7, r2] - ldr r0, =0x41c64e6d - muls r0, r1 - ldr r3, =0x00003039 - adds r0, r3 - lsls r0, 1 - lsrs r0, 17 - movs r1, 0x96 - lsls r1, 2 - bl __umodsi3 - movs r1, 0 - mov r8, r1 - strh r0, [r7, 0x30] - ldr r1, =gUnknown_0854FC4C - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r2, =0x000006dc - adds r5, r2 - ldrb r0, [r5] - lsls r0, 2 - adds r0, r1 - ldrh r6, [r0] - movs r3, 0x30 - ldrsh r0, [r7, r3] - movs r1, 0x1E - bl __modsi3 - adds r4, r0, 0 - lsls r4, 16 - asrs r4, 16 - lsls r0, r4, 3 - strh r0, [r7, 0x32] - movs r1, 0x30 - ldrsh r0, [r7, r1] - movs r1, 0x1E - bl __divsi3 - lsls r0, 16 - lsls r4, 7 - strh r4, [r7, 0x32] - asrs r0, 9 - strh r0, [r7, 0x34] - ldr r2, =gUnknown_0854FC44 - ldrb r1, [r5] - lsls r1, 2 - adds r1, r2 - movs r3, 0 - ldrsh r1, [r1, r3] - muls r1, r6 - subs r4, r1 - strh r4, [r7, 0x32] - ldrb r1, [r5] - lsls r1, 2 - adds r2, 0x2 - adds r1, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - muls r1, r6 - subs r0, r1 - strh r0, [r7, 0x34] - adds r0, r7, 0 - movs r1, 0 - bl StartSpriteAnim - mov r3, r8 - strh r3, [r7, 0x36] - adds r2, r7, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - strh r6, [r7, 0x2E] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ACAB0 - - thumb_func_start sub_80ACB84 -sub_80ACB84: @ 80ACB84 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x36 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _080ACC60 - ldr r3, =gUnknown_0854FC44 - ldr r4, =gUnknown_0854C14C - ldr r2, [r4] - ldr r0, =0x000006dc - adds r2, r0 - ldrb r0, [r2] - lsls r0, 2 - adds r0, r3 - ldrh r1, [r0] - ldrh r0, [r5, 0x32] - adds r1, r0 - strh r1, [r5, 0x32] - ldrb r0, [r2] - lsls r0, 2 - adds r3, 0x2 - adds r0, r3 - ldrh r0, [r0] - ldrh r2, [r5, 0x34] - adds r0, r2 - strh r0, [r5, 0x34] - lsls r1, 16 - asrs r1, 20 - strh r1, [r5, 0x20] - lsls r0, 16 - asrs r2, r0, 20 - strh r2, [r5, 0x22] - movs r3, 0x38 - ldrsh r0, [r5, r3] - adds r3, r4, 0 - cmp r0, 0 - beq _080ACC04 - adds r0, r1, 0 - adds r0, 0x8 - lsls r0, 16 - movs r1, 0x80 - lsls r1, 17 - cmp r0, r1 - bhi _080ACC04 - adds r1, r2, 0 - movs r0, 0x10 - negs r0, r0 - cmp r1, r0 - blt _080ACC04 - cmp r1, 0xB0 - bgt _080ACC04 - adds r0, r5, 0 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - b _080ACC0E - .pool -_080ACC04: - adds r0, r5, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 -_080ACC0E: - strb r1, [r0] - adds r4, r0, 0 - ldrh r0, [r5, 0x2E] - subs r0, 0x1 - strh r0, [r5, 0x2E] - lsls r0, 16 - cmp r0, 0 - bne _080ACC80 - ldr r0, [r3] - ldr r1, =0x000006dc - adds r0, r1 - ldrb r1, [r0] - adds r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl StartSpriteAnim - movs r0, 0x1 - strh r0, [r5, 0x36] - ldr r1, =gSpriteCoordOffsetX - ldrh r0, [r5, 0x20] - ldrh r1, [r1] - subs r0, r1 - strh r0, [r5, 0x20] - ldr r1, =gSpriteCoordOffsetY - ldrh r0, [r5, 0x22] - ldrh r1, [r1] - subs r0, r1 - strh r0, [r5, 0x22] - ldrb r0, [r4] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r4] - b _080ACC80 - .pool -_080ACC60: - adds r0, r5, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080ACC80 - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - adds r0, r5, 0 - bl sub_80ACAB0 -_080ACC80: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80ACB84 - - thumb_func_start sub_80ACC88 -sub_80ACC88: @ 80ACC88 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _080ACCA8 - adds r0, r4, 0 - bl sub_80ACAB0 - ldr r0, =sub_80ACB84 - str r0, [r4, 0x1C] - b _080ACCAC - .pool -_080ACCA8: - subs r0, r1, 0x1 - strh r0, [r4, 0x2E] -_080ACCAC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80ACC88 - - thumb_func_start sub_80ACCB4 -sub_80ACCB4: @ 80ACCB4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - lsls r5, r1, 16 - lsrs r5, 16 - ldr r2, =gUnknown_0854FC4C - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006dc - adds r0, r1 - ldrb r0, [r0] - lsls r0, 2 - adds r1, r0, r2 - ldrh r1, [r1] - mov r8, r1 - adds r2, 0x2 - adds r0, r2 - ldrh r4, [r0] - add r4, r8 - adds r0, r5, 0 - adds r1, r4, 0 - bl __divsi3 - lsls r0, 16 - lsrs r6, r0, 16 - adds r0, r5, 0 - adds r1, r4, 0 - bl __modsi3 - lsls r0, 16 - lsrs r4, r0, 16 - subs r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, =0x0000ffff - cmp r6, r0 - beq _080ACD12 - adds r5, r0, 0 -_080ACD02: - adds r0, r7, 0 - bl sub_80ACAB0 - subs r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r5 - bne _080ACD02 -_080ACD12: - cmp r4, r8 - bcs _080ACD48 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =0x0000ffff - cmp r4, r0 - beq _080ACD34 - adds r5, r0, 0 -_080ACD24: - adds r0, r7, 0 - bl sub_80ACB84 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r5 - bne _080ACD24 -_080ACD34: - movs r0, 0 - b _080ACD5C - .pool -_080ACD48: - mov r1, r8 - subs r0, r4, r1 - strh r0, [r7, 0x2E] - adds r2, r7, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x1 -_080ACD5C: - strh r0, [r7, 0x3A] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80ACCB4 - - thumb_func_start sub_80ACD68 -sub_80ACD68: @ 80ACD68 - push {lr} - ldr r0, =gUnknown_0854FC54 - bl LoadSpriteSheet - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ACD68 - - thumb_func_start sub_80ACD78 -sub_80ACD78: @ 80ACD78 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, =gUnknown_0854C14C - ldr r4, [r0] - ldr r0, =0x000006da - adds r2, r4, r0 - ldrb r0, [r2] - cmp r0, 0x18 - bne _080ACD92 - b _080ACE98 -_080ACD92: - ldrb r7, [r2] - ldr r0, =gSpriteTemplate_854FC2C - ldr r2, =gUnknown_0854FB90 - lsls r6, r7, 2 - adds r2, r6, r2 - movs r3, 0 - ldrsh r1, [r2, r3] - movs r3, 0x2 - ldrsh r2, [r2, r3] - movs r3, 0x4E - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x40 - beq _080ACE40 - ldr r3, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r1, r3 - movs r0, 0 - strh r0, [r1, 0x38] - lsls r2, r7, 3 - adds r0, r2, r7 - lsls r0, 4 - adds r0, r7 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - ldr r1, =0x00000257 - mov r10, r6 - mov r9, r3 - mov r12, r4 - mov r8, r2 - cmp r0, r1 - ble _080ACDF6 - adds r2, r1, 0 -_080ACDDE: - adds r0, r4, r5 - lsls r0, 2 - ldr r6, =gSprites - adds r0, r6 - ldr r3, =0xfffffda8 - ldrh r6, [r0, 0x30] - adds r1, r3, r6 - strh r1, [r0, 0x30] - lsls r1, 16 - asrs r1, 16 - cmp r1, r2 - bgt _080ACDDE -_080ACDF6: - mov r0, r12 - adds r4, r0, r5 - lsls r4, 2 - add r4, r9 - adds r0, r4, 0 - bl sub_80ACAB0 - mov r3, r8 - adds r1, r3, r7 - adds r0, r4, 0 - bl sub_80ACCB4 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - add r0, r10 - str r4, [r0] - b _080ACE46 - .pool -_080ACE40: - adds r1, r4, r6 - movs r0, 0 - str r0, [r1] -_080ACE46: - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r6, =0x000006da - adds r1, r2, r6 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x18 - bne _080ACE9C - movs r3, 0 - adds r1, r2, 0 - ldr r5, =sub_80ACB84 - ldr r4, =sub_80ACC88 -_080ACE64: - lsls r0, r3, 2 - adds r0, r1, r0 - ldr r2, [r0] - cmp r2, 0 - beq _080ACE8E - movs r6, 0x3A - ldrsh r0, [r2, r6] - cmp r0, 0 - bne _080ACE8C - str r5, [r2, 0x1C] - b _080ACE8E - .pool -_080ACE8C: - str r4, [r2, 0x1C] -_080ACE8E: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x17 - bls _080ACE64 -_080ACE98: - movs r0, 0 - b _080ACE9E -_080ACE9C: - movs r0, 0x1 -_080ACE9E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80ACD78 - - thumb_func_start sub_80ACEAC -sub_80ACEAC: @ 80ACEAC - push {r4-r7,lr} - ldr r0, =gUnknown_0854C14C - ldr r3, [r0] - movs r0, 0xDB - lsls r0, 3 - adds r4, r3, r0 - ldr r1, =0x000006d9 - adds r5, r3, r1 - ldrb r0, [r4] - ldrb r7, [r5] - cmp r0, r7 - bne _080ACED0 - movs r0, 0 - b _080ACF32 - .pool -_080ACED0: - ldr r0, =0x000006d6 - adds r2, r3, r0 - ldrh r0, [r2] - adds r0, 0x1 - movs r6, 0 - strh r0, [r2] - ldr r7, =0x000006db - adds r1, r3, r7 - lsls r0, 16 - lsrs r0, 16 - ldrb r1, [r1] - cmp r0, r1 - bls _080ACF30 - strh r6, [r2] - ldrb r0, [r4] - adds r1, r0, 0 - ldrb r5, [r5] - cmp r1, r5 - bcs _080ACF10 - adds r0, 0x1 - strb r0, [r4] - lsls r0, r1, 2 - adds r0, r3, r0 - ldr r1, [r0] - movs r0, 0x1 - strh r0, [r1, 0x38] - b _080ACF30 - .pool -_080ACF10: - subs r0, 0x1 - strb r0, [r4] - ldrb r0, [r4] - lsls r0, 2 - adds r0, r3, r0 - ldr r0, [r0] - strh r6, [r0, 0x38] - ldrb r0, [r4] - lsls r0, 2 - adds r0, r3, r0 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] -_080ACF30: - movs r0, 0x1 -_080ACF32: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80ACEAC - - thumb_func_start sub_80ACF38 -sub_80ACF38: @ 80ACF38 - push {r4-r7,lr} - movs r4, 0 - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r3, =0x000006da - adds r1, r2, r3 - adds r7, r0, 0 - ldrb r1, [r1] - cmp r4, r1 - bcs _080ACF6A - adds r5, r2, 0 - adds r6, r5, r3 -_080ACF50: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080ACF5E - bl DestroySprite -_080ACF5E: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldrb r0, [r6] - cmp r4, r0 - bcc _080ACF50 -_080ACF6A: - ldr r0, [r7] - ldr r1, =0x000006da - adds r0, r1 - movs r1, 0 - strb r1, [r0] - ldr r0, =0x00001206 - bl FreeSpriteTilesByTag - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ACF38 - - thumb_func_start sub_80ACF8C -sub_80ACF8C: @ 80ACF8C - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006cc - adds r0, r1, r2 - movs r2, 0 - movs r3, 0 - strh r3, [r0] - ldr r4, =0x000006d2 - adds r0, r1, r4 - strb r2, [r0] - ldr r0, =0x000006c1 - adds r2, r1, r0 - movs r0, 0x3 - strb r0, [r2] - subs r4, 0x10 - adds r2, r1, r4 - movs r0, 0x14 - strb r0, [r2] - ldr r0, =0x000006e5 - adds r2, r1, r0 - movs r0, 0x10 - strb r0, [r2] - movs r2, 0xDC - lsls r2, 3 - adds r1, r2 - strh r3, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ACF8C - - thumb_func_start sub_80ACFDC -sub_80ACFDC: @ 80ACFDC - push {r4-r7,lr} - mov r7, r8 - push {r7} - bl sub_80ACF8C - ldr r2, =gUnknown_0854C14C - ldr r1, [r2] - ldr r3, =0x000006d2 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0 - bne _080AD032 - mov r8, r2 - adds r7, r1, r3 -_080ACFF8: - bl snowflakes_progress2 - movs r4, 0 - mov r1, r8 - ldr r0, [r1] - ldr r3, =0x000006e4 - adds r0, r3 - ldrb r0, [r0] - cmp r4, r0 - bcs _080AD02C - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - adds r6, r5, r3 -_080AD012: - lsls r1, r4, 2 - adds r0, r5, 0 - adds r0, 0x60 - adds r0, r1 - ldr r0, [r0] - bl sub_80AD30C - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldrb r0, [r6] - cmp r4, r0 - bcc _080AD012 -_080AD02C: - ldrb r0, [r7] - cmp r0, 0 - beq _080ACFF8 -_080AD032: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ACFDC - - thumb_func_start snowflakes_progress2 -snowflakes_progress2: @ 80AD048 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r0, =0x000006cc - adds r4, r5, r0 - ldrh r0, [r4] - cmp r0, 0 - bne _080AD070 - bl snowflakes_progress - lsls r0, 24 - cmp r0, 0 - bne _080AD070 - ldr r0, =0x000006d2 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080AD070: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end snowflakes_progress2 - - thumb_func_start sub_80AD084 -sub_80AD084: @ 80AD084 - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r0, =0x000006ce - adds r3, r2, r0 - ldrh r1, [r3] - cmp r1, 0 - beq _080AD0A4 - cmp r1, 0x1 - beq _080AD0B6 - movs r0, 0 - b _080AD0E2 - .pool -_080AD0A4: - ldr r4, =0x000006e5 - adds r0, r2, r4 - strb r1, [r0] - subs r4, 0x5 - adds r0, r2, r4 - strh r1, [r0] - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r3] -_080AD0B6: - bl snowflakes_progress - lsls r0, 24 - cmp r0, 0 - bne _080AD0E0 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006ce - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - movs r0, 0 - b _080AD0E2 - .pool -_080AD0E0: - movs r0, 0x1 -_080AD0E2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80AD084 - - thumb_func_start snowflakes_progress -snowflakes_progress: @ 80AD0E8 - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006e4 - adds r3, r1, r0 - ldr r4, =0x000006e5 - adds r2, r1, r4 - ldrb r0, [r3] - ldrb r4, [r2] - cmp r0, r4 - bne _080AD110 - movs r0, 0 - b _080AD152 - .pool -_080AD110: - movs r0, 0xDC - lsls r0, 3 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x24 - bls _080AD13A - movs r0, 0 - strh r0, [r1] - ldrb r0, [r3] - ldrb r2, [r2] - cmp r0, r2 - bcs _080AD136 - bl snowflake_add - b _080AD13A -_080AD136: - bl snowflake_remove -_080AD13A: - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r2, =0x000006e4 - adds r1, r0, r2 - ldr r4, =0x000006e5 - adds r0, r4 - ldrb r1, [r1] - ldrb r0, [r0] - eors r1, r0 - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 -_080AD152: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end snowflakes_progress - - thumb_func_start snowflake_add -snowflake_add: @ 80AD164 - push {r4-r6,lr} - ldr r0, =gUnknown_0854FC8C - movs r1, 0 - movs r2, 0 - movs r3, 0x4E - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080AD1C8 - ldr r0, =gSprites - lsls r4, r1, 4 - adds r4, r1 - lsls r4, 2 - adds r4, r0 - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r0, =0x000006e4 - adds r6, r5, r0 - ldrb r0, [r6] - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_80AD204 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - ldrb r0, [r6] - adds r1, r0, 0x1 - strb r1, [r6] - lsls r0, 24 - lsrs r0, 22 - adds r5, 0x60 - adds r5, r0 - str r4, [r5] - movs r0, 0x1 - b _080AD1CA - .pool -_080AD1C8: - movs r0, 0 -_080AD1CA: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end snowflake_add - - thumb_func_start snowflake_remove -snowflake_remove: @ 80AD1D0 - push {lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006e4 - adds r2, r1, r0 - ldrb r0, [r2] - cmp r0, 0 - bne _080AD1EC - movs r0, 0 - b _080AD200 - .pool -_080AD1EC: - subs r0, 0x1 - strb r0, [r2] - lsls r0, 24 - lsrs r0, 22 - adds r1, 0x60 - adds r1, r0 - ldr r0, [r1] - bl DestroySprite - movs r0, 0x1 -_080AD200: - pop {r1} - bx r1 - thumb_func_end snowflake_remove - - thumb_func_start sub_80AD204 -sub_80AD204: @ 80AD204 - push {r4-r7,lr} - adds r5, r0, 0 - bl Random - movs r1, 0x36 - ldrsh r2, [r5, r1] - lsls r1, r2, 2 - adds r1, r2 - movs r2, 0x7 - ands r1, r2 - lsls r4, r1, 4 - subs r4, r1 - lsls r4, 1 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1E - bl __umodsi3 - adds r4, r0 - lsls r4, 16 - lsrs r4, 16 - ldr r1, =gSpriteCoordOffsetY - adds r0, r5, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrh r1, [r1] - adds r0, r1 - movs r2, 0x3 - negs r2, r2 - adds r1, r2, 0 - subs r1, r0 - movs r7, 0 - strh r1, [r5, 0x22] - ldr r1, =gSpriteCoordOffsetX - adds r0, r5, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrh r1, [r1] - adds r0, r1 - subs r4, r0 - strh r4, [r5, 0x20] - movs r1, 0x22 - ldrsh r0, [r5, r1] - lsls r0, 7 - strh r0, [r5, 0x2E] - strh r7, [r5, 0x24] - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r6, r0, 0 - movs r4, 0x3 - ands r4, r6 - lsls r0, r4, 2 - adds r0, r4 - adds r0, 0x40 - strh r0, [r5, 0x30] - strh r0, [r5, 0x3C] - movs r1, 0x1 - bics r1, r6 - adds r0, r5, 0 - bl StartSpriteAnim - strh r7, [r5, 0x34] - movs r0, 0x1 - cmp r4, 0 - bne _080AD294 - movs r0, 0x2 -_080AD294: - strh r0, [r5, 0x32] - movs r0, 0x1F - ands r0, r6 - adds r0, 0xD2 - strh r0, [r5, 0x3A] - strh r7, [r5, 0x38] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD204 - - thumb_func_start sub_80AD2B0 -sub_80AD2B0: @ 80AD2B0 - push {r4,lr} - adds r3, r0, 0 - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006e2 - adds r4, r0, r1 - ldrh r0, [r4] - cmp r0, 0x12 - bls _080AD2F6 - adds r2, r3, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, =sub_80AD30C - str r0, [r3, 0x1C] - ldr r1, =gSpriteCoordOffsetY - adds r0, r3, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrh r1, [r1] - adds r0, r1 - movs r1, 0xFA - subs r1, r0 - movs r2, 0 - strh r1, [r3, 0x22] - movs r1, 0x22 - ldrsh r0, [r3, r1] - lsls r0, 7 - strh r0, [r3, 0x2E] - strh r2, [r4] -_080AD2F6: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD2B0 - - thumb_func_start sub_80AD30C -sub_80AD30C: @ 80AD30C - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x30] - ldrh r1, [r4, 0x2E] - adds r0, r1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 23 - strh r0, [r4, 0x22] - ldrh r0, [r4, 0x32] - ldrh r2, [r4, 0x34] - adds r0, r2 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x34] - ldr r1, =gSineTable - movs r3, 0x34 - ldrsh r0, [r4, r3] - lsls r0, 1 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _080AD33E - adds r0, 0x3F -_080AD33E: - asrs r0, 6 - strh r0, [r4, 0x24] - adds r0, r4, 0 - adds r0, 0x28 - movs r5, 0 - ldrsb r5, [r0, r5] - ldrh r0, [r4, 0x20] - adds r0, r5 - ldr r1, =gSpriteCoordOffsetX - ldrh r1, [r1] - adds r3, r1, r0 - ldr r2, =0x000001ff - adds r0, r2, 0 - ands r3, r0 - adds r2, r3, 0 - movs r0, 0x80 - lsls r0, 1 - ands r0, r2 - cmp r0, 0 - beq _080AD370 - ldr r3, =0xffffff00 - adds r0, r3, 0 - orrs r2, r0 - lsls r0, r2, 16 - lsrs r3, r0, 16 -_080AD370: - lsls r0, r3, 16 - asrs r0, 16 - movs r2, 0x3 - negs r2, r2 - cmp r0, r2 - bge _080AD394 - adds r1, r5 - movs r0, 0xF2 - subs r0, r1 - b _080AD39C - .pool -_080AD394: - cmp r0, 0xF2 - ble _080AD39E - adds r0, r1, r5 - subs r0, r2, r0 -_080AD39C: - strh r0, [r4, 0x20] -_080AD39E: - adds r0, r4, 0 - adds r0, 0x29 - movs r3, 0 - ldrsb r3, [r0, r3] - ldrh r0, [r4, 0x22] - adds r0, r3 - ldr r1, =gSpriteCoordOffsetY - ldrh r1, [r1] - adds r2, r1, r0 - movs r0, 0xFF - ands r2, r0 - adds r0, r2, 0 - subs r0, 0xA4 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x6 - bhi _080AD3E0 - adds r1, r3 - movs r0, 0xFA - subs r0, r1 - movs r1, 0 - strh r0, [r4, 0x22] - movs r2, 0x22 - ldrsh r0, [r4, r2] - lsls r0, 7 - strh r0, [r4, 0x2E] - strh r1, [r4, 0x38] - movs r0, 0xDC - strh r0, [r4, 0x3A] - b _080AD40C - .pool -_080AD3E0: - adds r0, r2, 0 - subs r0, 0xF3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x6 - bhi _080AD40C - movs r1, 0 - movs r0, 0xA3 - strh r0, [r4, 0x22] - lsls r0, 7 - strh r0, [r4, 0x2E] - strh r1, [r4, 0x38] - movs r0, 0xDC - strh r0, [r4, 0x3A] - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_80AD2B0 - str r0, [r4, 0x1C] -_080AD40C: - ldrh r0, [r4, 0x38] - adds r0, 0x1 - strh r0, [r4, 0x38] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x3A - ldrsh r1, [r4, r3] - cmp r0, r1 - bne _080AD438 - adds r0, r4, 0 - bl sub_80AD204 - movs r0, 0xFA - strh r0, [r4, 0x22] - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_80AD2B0 - str r0, [r4, 0x1C] -_080AD438: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD30C - - thumb_func_start sub_80AD444 -sub_80AD444: @ 80AD444 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006cc - adds r0, r1, r2 - movs r3, 0 - movs r2, 0 - strh r2, [r0] - ldr r5, =0x000006d2 - adds r4, r1, r5 - strb r3, [r4] - adds r5, 0x4 - adds r0, r1, r5 - strh r2, [r0] - ldr r0, =0x000006db - adds r2, r1, r0 - movs r0, 0x4 - strb r0, [r2] - ldr r2, =0x000006dc - adds r0, r1, r2 - strb r3, [r0] - adds r5, 0x3 - adds r2, r1, r5 - movs r0, 0x10 - strb r0, [r2] - ldr r0, =0x000006c1 - adds r2, r1, r0 - movs r0, 0x3 - strb r0, [r2] - subs r5, 0x17 - adds r2, r1, r5 - movs r0, 0x14 - strb r0, [r2] - strb r3, [r4] - ldr r0, =0x000006ed - adds r1, r0 - strb r3, [r1] - movs r0, 0x51 - bl sub_80AC31C - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD444 - - thumb_func_start sub_80AD4B8 -sub_80AD4B8: @ 80AD4B8 - push {r4,lr} - bl sub_80AD444 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AD4D8 - adds r4, r1, r2 -_080AD4CE: - bl sub_80AD584 - ldrb r0, [r4] - cmp r0, 0 - beq _080AD4CE -_080AD4D8: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD4B8 - - thumb_func_start sub_80AD4E8 -sub_80AD4E8: @ 80AD4E8 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006cc - adds r0, r1, r2 - movs r4, 0 - movs r2, 0 - strh r2, [r0] - ldr r5, =0x000006d2 - adds r3, r1, r5 - strb r4, [r3] - adds r5, 0x4 - adds r0, r1, r5 - strh r2, [r0] - ldr r0, =0x000006db - adds r2, r1, r0 - movs r0, 0x4 - strb r0, [r2] - adds r5, 0x6 - adds r2, r1, r5 - movs r0, 0x1 - strb r0, [r2] - ldr r0, =0x000006d9 - adds r2, r1, r0 - movs r0, 0x18 - strb r0, [r2] - subs r5, 0x1B - adds r2, r1, r5 - movs r0, 0x3 - strb r0, [r2] - ldr r0, =0x000006c2 - adds r1, r0 - movs r0, 0x14 - strb r0, [r1] - strb r4, [r3] - movs r0, 0x53 - bl sub_80AC31C - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD4E8 - - thumb_func_start sub_80AD554 -sub_80AD554: @ 80AD554 - push {r4,lr} - bl sub_80AD4E8 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AD574 - adds r4, r1, r2 -_080AD56A: - bl sub_80AD584 - ldrb r0, [r4] - cmp r0, 0 - beq _080AD56A -_080AD574: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD554 - - thumb_func_start sub_80AD584 -sub_80AD584: @ 80AD584 - push {r4,r5,lr} - bl sub_80AD9F8 - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006cc - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0xE - bls _080AD59A - b _080AD8FA -_080AD59A: - lsls r0, 2 - ldr r1, =_080AD5B0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080AD5B0: - .4byte _080AD5EC - .4byte _080AD608 - .4byte _080AD62C - .4byte _080AD65C - .4byte _080AD680 - .4byte _080AD6B0 - .4byte _080AD6E0 - .4byte _080AD70C - .4byte _080AD72A - .4byte _080AD788 - .4byte _080AD80C - .4byte _080AD834 - .4byte _080AD864 - .4byte _080AD8A8 - .4byte _080AD8DC -_080AD5EC: - bl sub_80ACD68 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006cc - adds r1, r2 - ldrh r0, [r1] - adds r0, 0x1 - b _080AD8F8 - .pool -_080AD608: - bl sub_80ACD78 - lsls r0, 24 - cmp r0, 0 - beq _080AD614 - b _080AD8FA -_080AD614: - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r3, =0x000006cc - adds r1, r3 - ldrh r0, [r1] - adds r0, 0x1 - b _080AD8F8 - .pool -_080AD62C: - bl sub_80ACEAC - lsls r0, 24 - cmp r0, 0 - beq _080AD638 - b _080AD8FA -_080AD638: - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006d2 - adds r2, r1, r0 - movs r0, 0x1 - strb r0, [r2] - ldr r2, =0x000006cc - adds r1, r2 - ldrh r0, [r1] - adds r0, 0x1 - b _080AD8F8 - .pool -_080AD65C: - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r3, =0x000006c6 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0 - bne _080AD66C - b _080AD8FA -_080AD66C: - ldr r0, =0x000006cc - adds r1, r0 - movs r0, 0x6 - b _080AD8F8 - .pool -_080AD680: - ldr r0, =gUnknown_0854C14C - ldr r4, [r0] - ldr r2, =0x000006ea - adds r1, r4, r2 - movs r0, 0x1 - strb r0, [r1] - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r5, 0xB4 - lsls r5, 1 - adds r1, r5, 0 - bl __umodsi3 - adds r0, r5 - ldr r3, =0x000006e6 - adds r1, r4, r3 - strh r0, [r1] - ldr r0, =0x000006cc - adds r4, r0 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080AD6B0: - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r3, =0x000006e6 - adds r1, r2, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - lsls r0, 16 - cmp r0, 0 - beq _080AD6C6 - b _080AD8FA -_080AD6C6: - ldr r0, =0x000006cc - adds r1, r2, r0 - ldrh r0, [r1] - adds r0, 0x1 - b _080AD8F8 - .pool -_080AD6E0: - ldr r0, =gUnknown_0854C14C - ldr r4, [r0] - ldr r1, =0x000006ea - adds r0, r4, r1 - movs r5, 0x1 - strb r5, [r0] - bl Random - lsls r0, 16 - lsrs r0, 16 - ands r0, r5 - ldr r2, =0x000006eb - adds r1, r4, r2 - strb r0, [r1] - b _080AD768 - .pool -_080AD70C: - bl Random - ldr r1, =gUnknown_0854C14C - ldr r2, [r1] - movs r1, 0x1 - ands r1, r0 - adds r1, 0x1 - ldr r3, =0x000006ec - adds r0, r2, r3 - strb r1, [r0] - ldr r0, =0x000006cc - adds r2, r0 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] -_080AD72A: - movs r0, 0x13 - bl sub_80ABC48 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006eb - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AD74E - ldr r3, =0x000006ec - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0x1 - bne _080AD74E - movs r0, 0x14 - bl sub_80AD9BC -_080AD74E: - bl Random - ldr r1, =gUnknown_0854C14C - ldr r4, [r1] - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - adds r0, 0x6 - ldr r2, =0x000006e6 - adds r1, r4, r2 - strh r0, [r1] -_080AD768: - ldr r3, =0x000006cc - adds r4, r3 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080AD8FA - .pool -_080AD788: - ldr r0, =gUnknown_0854C14C - ldr r4, [r0] - ldr r0, =0x000006e6 - adds r5, r4, r0 - ldrh r0, [r5] - subs r0, 0x1 - strh r0, [r5] - lsls r0, 16 - cmp r0, 0 - beq _080AD79E - b _080AD8FA -_080AD79E: - movs r0, 0x3 - bl sub_80ABC48 - ldr r2, =0x000006ea - adds r1, r4, r2 - movs r0, 0x1 - strb r0, [r1] - ldr r3, =0x000006ec - adds r1, r4, r3 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - beq _080AD7E8 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xF - ands r0, r1 - adds r0, 0x3C - strh r0, [r5] - ldr r0, =0x000006cc - adds r1, r4, r0 - movs r0, 0xA - b _080AD8F8 - .pool -_080AD7E8: - ldr r1, =0x000006eb - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080AD800 - ldr r2, =0x000006cc - adds r1, r4, r2 - b _080AD8F6 - .pool -_080AD800: - ldr r3, =0x000006cc - adds r1, r4, r3 - movs r0, 0xB - b _080AD8F8 - .pool -_080AD80C: - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r0, =0x000006e6 - adds r1, r2, r0 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - lsls r0, 16 - cmp r0, 0 - bne _080AD8FA - ldr r3, =0x000006cc - adds r1, r2, r3 - movs r0, 0x8 - b _080AD8F8 - .pool -_080AD834: - bl Random - ldr r1, =gUnknown_0854C14C - ldr r2, [r1] - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xF - ands r0, r1 - adds r0, 0x3C - ldr r3, =0x000006e6 - adds r1, r2, r3 - strh r0, [r1] - ldr r0, =0x000006cc - adds r2, r0 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - b _080AD8FA - .pool -_080AD864: - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r1, =0x000006e6 - adds r4, r5, r1 - ldrh r0, [r4] - subs r0, 0x1 - strh r0, [r4] - lsls r0, 16 - cmp r0, 0 - bne _080AD8FA - movs r0, 0x64 - bl sub_80AD9BC - movs r0, 0x13 - bl sub_80ABC48 - bl Random - movs r1, 0xF - ands r1, r0 - adds r1, 0x1E - strh r1, [r4] - ldr r2, =0x000006cc - adds r1, r5, r2 - ldrh r0, [r1] - adds r0, 0x1 - b _080AD8F8 - .pool -_080AD8A8: - ldr r0, =gUnknown_0854C14C - ldr r4, [r0] - ldr r3, =0x000006e6 - adds r1, r4, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - lsls r0, 16 - cmp r0, 0 - bne _080AD8FA - movs r0, 0x13 - movs r1, 0x3 - movs r2, 0x5 - bl sub_80ABC7C - ldr r0, =0x000006cc - adds r1, r4, r0 - ldrh r0, [r1] - adds r0, 0x1 - b _080AD8F8 - .pool -_080AD8DC: - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r1, =0x000006c6 - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0x3 - bne _080AD8FA - ldr r3, =0x000006ea - adds r1, r2, r3 - movs r0, 0x1 - strb r0, [r1] - ldr r0, =0x000006cc - adds r1, r2, r0 -_080AD8F6: - movs r0, 0x4 -_080AD8F8: - strh r0, [r1] -_080AD8FA: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD584 - - thumb_func_start sub_80AD910 -sub_80AD910: @ 80AD910 - push {r4-r6,lr} - ldr r0, =gUnknown_0854C14C - ldr r6, [r0] - ldr r0, =0x000006ce - adds r5, r6, r0 - ldrh r1, [r5] - cmp r1, 0x1 - beq _080AD946 - cmp r1, 0x1 - bgt _080AD934 - cmp r1, 0 - beq _080AD93A - b _080AD9AC - .pool -_080AD934: - cmp r1, 0x2 - beq _080AD990 - b _080AD9AC -_080AD93A: - ldr r2, =0x000006ea - adds r0, r6, r2 - strb r1, [r0] - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] -_080AD946: - bl sub_80AD584 - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r1, =0x000006ea - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080AD9B4 - subs r1, 0x19 - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0x3 - beq _080AD9AC - cmp r0, 0x5 - beq _080AD9AC - cmp r0, 0xD - beq _080AD9AC - ldr r0, =0x000006d9 - adds r1, r2, r0 - movs r0, 0 - strb r0, [r1] - ldr r0, =0x000006ce - adds r1, r2, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080AD9B4 - .pool -_080AD990: - bl sub_80ACEAC - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _080AD9B4 - bl sub_80ACF38 - ldr r1, =0x000006ed - adds r0, r6, r1 - strb r4, [r0] - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] -_080AD9AC: - movs r0, 0 - b _080AD9B6 - .pool -_080AD9B4: - movs r0, 0x1 -_080AD9B6: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80AD910 - - thumb_func_start sub_80AD9BC -sub_80AD9BC: @ 80AD9BC - push {r4-r6,lr} - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, =gUnknown_0854C14C - ldr r4, [r0] - ldr r0, =0x000006ed - adds r5, r4, r0 - ldrb r0, [r5] - cmp r0, 0 - bne _080AD9EA - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r6, 0 - bl __umodsi3 - movs r2, 0xDD - lsls r2, 3 - adds r1, r4, r2 - strh r0, [r1] - movs r0, 0x1 - strb r0, [r5] -_080AD9EA: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AD9BC - - thumb_func_start sub_80AD9F8 -sub_80AD9F8: @ 80AD9F8 - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006ed - adds r0, r1, r2 - ldrb r4, [r0] - cmp r4, 0x1 - bne _080ADA58 - movs r0, 0xDD - lsls r0, 3 - adds r1, r0 - ldrh r0, [r1] - cmp r0, 0 - bne _080ADA54 - bl IsSEPlaying - lsls r0, 24 - cmp r0, 0 - bne _080ADA58 - bl Random - ands r4, r0 - cmp r4, 0 - beq _080ADA38 - movs r0, 0x57 - bl PlaySE - b _080ADA3E - .pool -_080ADA38: - movs r0, 0x58 - bl PlaySE -_080ADA3E: - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006ed - adds r0, r1 - movs r1, 0 - strb r1, [r0] - b _080ADA58 - .pool -_080ADA54: - subs r0, 0x1 - strh r0, [r1] -_080ADA58: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80AD9F8 - - thumb_func_start sub_80ADA60 -sub_80ADA60: @ 80ADA60 - push {lr} - ldr r0, =gUnknown_0854C14C - ldr r3, [r0] - ldr r0, =0x000006cc - adds r1, r3, r0 - movs r2, 0 - movs r0, 0 - strh r0, [r1] - ldr r1, =0x000006d2 - adds r0, r3, r1 - strb r2, [r0] - subs r1, 0x11 - adds r0, r3, r1 - strb r2, [r0] - ldr r2, =0x000006c2 - adds r1, r3, r2 - movs r0, 0x14 - strb r0, [r1] - ldr r1, =0x000006fb - adds r0, r3, r1 - ldrb r1, [r0] - cmp r1, 0 - bne _080ADAA8 - adds r2, 0x2E - adds r0, r3, r2 - strh r1, [r0] - adds r2, 0x2 - adds r0, r3, r2 - strh r1, [r0] - subs r2, 0x4 - adds r0, r3, r2 - strh r1, [r0] - movs r0, 0 - movs r1, 0x10 - bl sub_80AC124 -_080ADAA8: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADA60 - - thumb_func_start sub_80ADAC0 -sub_80ADAC0: @ 80ADAC0 - push {r4,lr} - bl sub_80ADA60 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080ADAE0 - adds r4, r1, r2 -_080ADAD6: - bl sub_80ADAF0 - ldrb r0, [r4] - cmp r0, 0 - beq _080ADAD6 -_080ADAE0: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADAC0 - - thumb_func_start sub_80ADAF0 -sub_80ADAF0: @ 80ADAF0 - push {r4-r6,lr} - ldr r0, =gUnknown_0854C14C - ldr r6, [r0] - ldr r0, =gSpriteCoordOffsetX - ldr r1, =0x000006f2 - adds r2, r6, r1 - ldrh r0, [r0] - ldrh r1, [r2] - subs r0, r1 - movs r1, 0xFF - ands r0, r1 - ldr r3, =0x000006ee - adds r1, r6, r3 - strh r0, [r1] - movs r0, 0xDE - lsls r0, 3 - adds r1, r6, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3 - bls _080ADB2A - movs r0, 0 - strh r0, [r1] - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] -_080ADB2A: - ldr r1, =0x000006cc - adds r5, r6, r1 - ldrh r4, [r5] - cmp r4, 0 - beq _080ADB50 - cmp r4, 0x1 - beq _080ADB90 - b _080ADBA6 - .pool -_080ADB50: - bl sub_80ADCAC - movs r3, 0xDA - lsls r3, 3 - adds r0, r6, r3 - ldrb r0, [r0] - cmp r0, 0x6 - bne _080ADB6C - movs r0, 0xC - movs r1, 0x8 - movs r2, 0x3 - bl sub_80AC164 - b _080ADB76 -_080ADB6C: - movs r0, 0x4 - movs r1, 0x10 - movs r2, 0 - bl sub_80AC164 -_080ADB76: - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006cc - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080ADBA6 - .pool -_080ADB90: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080ADBA6 - ldr r1, =0x000006d2 - adds r0, r6, r1 - strb r4, [r0] - ldrh r0, [r5] - adds r0, 0x1 - strh r0, [r5] -_080ADBA6: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADAF0 - - thumb_func_start sub_80ADBB0 -sub_80ADBB0: @ 80ADBB0 - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r0, =gSpriteCoordOffsetX - ldr r1, =0x000006f2 - adds r3, r2, r1 - ldrh r0, [r0] - ldrh r1, [r3] - subs r0, r1 - movs r1, 0xFF - ands r0, r1 - ldr r4, =0x000006ee - adds r1, r2, r4 - strh r0, [r1] - movs r0, 0xDE - lsls r0, 3 - adds r1, r2, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3 - bls _080ADBEA - movs r0, 0 - strh r0, [r1] - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r3] -_080ADBEA: - ldr r1, =0x000006ce - adds r4, r2, r1 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080ADC26 - cmp r0, 0x1 - bgt _080ADC14 - cmp r0, 0 - beq _080ADC1A - b _080ADC3E - .pool -_080ADC14: - cmp r0, 0x2 - beq _080ADC32 - b _080ADC3E -_080ADC1A: - movs r0, 0 - movs r1, 0x10 - movs r2, 0x3 - bl sub_80AC164 - b _080ADC36 -_080ADC26: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080ADC42 - b _080ADC36 -_080ADC32: - bl sub_80ADD68 -_080ADC36: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080ADC42 -_080ADC3E: - movs r0, 0 - b _080ADC44 -_080ADC42: - movs r0, 0x1 -_080ADC44: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80ADBB0 - - thumb_func_start sub_80ADC4C -sub_80ADC4C: @ 80ADC4C - push {r4,lr} - adds r3, r0, 0 - ldr r0, =gSpriteCoordOffsetY - ldrb r0, [r0] - strh r0, [r3, 0x26] - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006ee - adds r2, r0, r1 - ldrh r1, [r2] - adds r1, 0x20 - movs r4, 0x2E - ldrsh r0, [r3, r4] - lsls r0, 6 - adds r1, r0 - strh r1, [r3, 0x20] - lsls r1, 16 - ldr r0, =0x010f0000 - cmp r1, r0 - ble _080ADC90 - movs r0, 0xF0 - lsls r0, 1 - adds r1, r0, 0 - ldrh r2, [r2] - adds r1, r2 - movs r4, 0x2E - ldrsh r2, [r3, r4] - movs r0, 0x4 - subs r0, r2 - lsls r0, 6 - subs r1, r0 - ldr r0, =0x000001ff - ands r1, r0 - strh r1, [r3, 0x20] -_080ADC90: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADC4C - - thumb_func_start sub_80ADCAC -sub_80ADCAC: @ 80ADCAC - push {r4,r5,lr} - sub sp, 0x8 - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006fb - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080ADD56 - ldr r0, =gUnknown_0854FD30 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - mov r0, sp - bl LoadSpriteSheet - movs r5, 0 -_080ADCD0: - ldr r0, =gSpriteTemplate_854FD18 - movs r1, 0 - movs r2, 0 - movs r3, 0xFF - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _080ADD34 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - ldr r0, =gSprites - adds r4, r0 - adds r0, r5, 0 - movs r1, 0x5 - bl __umodsi3 - strh r0, [r4, 0x2E] - lsls r0, 16 - lsrs r0, 10 - adds r0, 0x20 - strh r0, [r4, 0x20] - adds r0, r5, 0 - movs r1, 0x5 - bl __udivsi3 - lsls r0, 16 - lsrs r0, 10 - adds r0, 0x20 - strh r0, [r4, 0x22] - ldr r2, =gUnknown_0854C14C - ldr r0, [r2] - lsls r1, r5, 2 - adds r0, 0xA0 - adds r0, r1 - str r4, [r0] - b _080ADD42 - .pool -_080ADD34: - ldr r2, =gUnknown_0854C14C - ldr r1, [r2] - lsls r0, r5, 2 - adds r1, 0xA0 - adds r1, r0 - movs r0, 0 - str r0, [r1] -_080ADD42: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x13 - bls _080ADCD0 - ldr r0, [r2] - ldr r1, =0x000006fb - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] -_080ADD56: - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADCAC - - thumb_func_start sub_80ADD68 -sub_80ADD68: @ 80ADD68 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006fb - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080ADDA8 - movs r4, 0 - adds r5, r1, 0 - adds r5, 0xA0 -_080ADD7E: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080ADD8C - bl DestroySprite -_080ADD8C: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x13 - bls _080ADD7E - ldr r0, =0x00001201 - bl FreeSpriteTilesByTag - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006fb - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_080ADDA8: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADD68 - - thumb_func_start sub_80ADDBC -sub_80ADDBC: @ 80ADDBC - push {lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006cc - adds r2, r1, r0 - movs r3, 0 - movs r0, 0 - strh r0, [r2] - ldr r2, =0x000006d2 - adds r0, r1, r2 - strb r3, [r0] - subs r2, 0x11 - adds r0, r1, r2 - strb r3, [r0] - ldr r3, =0x000006c2 - adds r0, r1, r3 - movs r2, 0x14 - strb r2, [r0] - adds r3, 0x3C - adds r0, r1, r3 - strh r2, [r0] - movs r0, 0xE0 - lsls r0, 3 - adds r1, r0 - ldrb r0, [r1] - cmp r0, 0 - bne _080ADE04 - movs r0, 0 - movs r1, 0x10 - bl sub_80AC124 - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x52 - bl SetGpuReg -_080ADE04: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADDBC - - thumb_func_start sub_80ADE18 -sub_80ADE18: @ 80ADE18 - push {r4,lr} - bl sub_80ADDBC - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080ADE38 - adds r4, r1, r2 -_080ADE2E: - bl sub_80ADE48 - ldrb r0, [r4] - cmp r0, 0 - beq _080ADE2E -_080ADE38: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADE18 - - thumb_func_start sub_80ADE48 -sub_80ADE48: @ 80ADE48 - push {r4,r5,lr} - ldr r2, =gUnknown_0854C14C - ldr r1, [r2] - ldr r0, =gSpriteCoordOffsetX - ldrh r0, [r0] - ldr r3, =0x000001ff - ands r3, r0 - ldr r0, =0x000006fc - adds r1, r0 - strh r3, [r1] - cmp r3, 0xEF - bls _080ADE74 - adds r4, r1, 0 - adds r1, r3, 0 -_080ADE64: - adds r3, r1, 0 - subs r3, 0xF0 - adds r1, r3, 0 - lsls r0, r3, 16 - lsrs r0, 16 - cmp r0, 0xEF - bhi _080ADE64 - strh r3, [r4] -_080ADE74: - ldr r5, [r2] - ldr r1, =0x000006cc - adds r4, r5, r1 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080ADEAC - cmp r0, 0x1 - bgt _080ADEA0 - cmp r0, 0 - beq _080ADEA6 - b _080ADEE8 - .pool -_080ADEA0: - cmp r0, 0x2 - beq _080ADEC8 - b _080ADEE8 -_080ADEA6: - bl sub_80ADF5C - b _080ADEDA -_080ADEAC: - movs r1, 0xE0 - lsls r1, 3 - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080ADEBC - bl sub_80ADF6C -_080ADEBC: - movs r0, 0x10 - movs r1, 0 - movs r2, 0x1 - bl sub_80AC164 - b _080ADEDA -_080ADEC8: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080ADEEC - ldr r0, =0x000006d2 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] -_080ADEDA: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080ADEEC - .pool -_080ADEE8: - bl sub_80AC1A8 -_080ADEEC: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80ADE48 - - thumb_func_start sub_80ADEF4 -sub_80ADEF4: @ 80ADEF4 - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006ce - adds r4, r0, r1 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080ADF2A - cmp r0, 0x1 - bgt _080ADF18 - cmp r0, 0 - beq _080ADF1E - b _080ADF4E - .pool -_080ADF18: - cmp r0, 0x2 - beq _080ADF40 - b _080ADF4E -_080ADF1E: - movs r0, 0 - movs r1, 0x10 - movs r2, 0x1 - bl sub_80AC164 - b _080ADF38 -_080ADF2A: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080ADF52 - bl sub_80AE014 -_080ADF38: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080ADF52 -_080ADF40: - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080ADF4E: - movs r0, 0 - b _080ADF54 -_080ADF52: - movs r0, 0x1 -_080ADF54: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80ADEF4 - - thumb_func_start sub_80ADF5C -sub_80ADF5C: @ 80ADF5C - push {lr} - ldr r0, =gUnknown_0854FD38 - bl LoadSpriteSheet - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADF5C - - thumb_func_start sub_80ADF6C -sub_80ADF6C: @ 80ADF6C - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - movs r1, 0xE0 - lsls r1, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080AE008 - movs r5, 0 -_080ADF80: - ldr r0, =gSpriteTemplate_854FD58 - movs r1, 0 - movs r2, 0 - movs r3, 0x4E - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _080ADFE4 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - ldr r0, =gSprites - adds r4, r0 - movs r0, 0 - strh r0, [r4, 0x30] - adds r0, r5, 0 - movs r1, 0x5 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x32] - adds r0, r5, 0 - movs r1, 0x5 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x34] - movs r1, 0x34 - ldrsh r0, [r4, r1] - lsls r0, 6 - adds r0, 0x20 - strh r0, [r4, 0x2E] - ldr r2, =gUnknown_0854C14C - ldr r0, [r2] - lsls r1, r5, 2 - adds r0, 0xF0 - adds r0, r1 - str r4, [r0] - b _080ADFF2 - .pool -_080ADFE4: - ldr r2, =gUnknown_0854C14C - ldr r1, [r2] - lsls r0, r5, 2 - adds r1, 0xF0 - adds r1, r0 - movs r0, 0 - str r0, [r1] -_080ADFF2: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x13 - bls _080ADF80 - ldr r0, [r2] - movs r1, 0xE0 - lsls r1, 3 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] -_080AE008: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80ADF6C - - thumb_func_start sub_80AE014 -sub_80AE014: @ 80AE014 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - movs r2, 0xE0 - lsls r2, 3 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080AE058 - movs r4, 0 - adds r5, r1, 0 - adds r5, 0xF0 -_080AE02C: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080AE03A - bl DestroySprite -_080AE03A: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x13 - bls _080AE02C - ldr r0, =0x00001202 - bl FreeSpriteTilesByTag - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - movs r1, 0xE0 - lsls r1, 3 - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_080AE058: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE014 - - thumb_func_start sub_80AE068 -sub_80AE068: @ 80AE068 - push {r4,lr} - adds r3, r0, 0 - ldrh r0, [r3, 0x30] - adds r0, 0x1 - strh r0, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _080AE084 - movs r0, 0 - strh r0, [r3, 0x30] - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] -_080AE084: - ldr r1, =gSpriteCoordOffsetY - ldrh r0, [r3, 0x2E] - ldrh r1, [r1] - adds r0, r1 - strh r0, [r3, 0x22] - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006fc - adds r2, r0, r1 - ldrh r1, [r2] - adds r1, 0x20 - movs r4, 0x32 - ldrsh r0, [r3, r4] - lsls r0, 6 - adds r1, r0 - strh r1, [r3, 0x20] - lsls r1, 16 - ldr r0, =0x010f0000 - cmp r1, r0 - ble _080AE0C8 - movs r0, 0xF0 - lsls r0, 1 - adds r1, r0, 0 - ldrh r2, [r2] - adds r1, r2 - movs r4, 0x32 - ldrsh r2, [r3, r4] - movs r0, 0x4 - subs r0, r2 - lsls r0, 6 - subs r1, r0 - ldr r0, =0x000001ff - ands r1, r0 - strh r1, [r3, 0x20] -_080AE0C8: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE068 - - thumb_func_start sub_80AE0E4 -sub_80AE0E4: @ 80AE0E4 - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r3, [r0] - ldr r1, =0x000006cc - adds r0, r3, r1 - movs r1, 0 - movs r2, 0 - strh r2, [r0] - ldr r4, =0x000006d2 - adds r0, r3, r4 - strb r1, [r0] - subs r4, 0x11 - adds r0, r3, r4 - strb r1, [r0] - ldr r0, =0x000006c2 - adds r1, r3, r0 - movs r0, 0x14 - strb r0, [r1] - movs r1, 0xDE - lsls r1, 3 - adds r0, r3, r1 - strh r2, [r0] - adds r4, 0x31 - adds r1, r3, r4 - movs r0, 0x1 - strh r0, [r1] - ldr r1, =0x00000724 - adds r0, r3, r1 - ldrb r2, [r0] - cmp r2, 0 - bne _080AE14E - adds r4, 0x2A - adds r0, r3, r4 - strh r2, [r0] - subs r1, 0x6 - adds r0, r3, r1 - strh r2, [r0] - adds r4, 0x4 - adds r0, r3, r4 - strh r2, [r0] - adds r1, 0x4 - adds r0, r3, r1 - strh r2, [r0] - subs r4, 0x8 - adds r0, r3, r4 - strh r2, [r0] - subs r1, 0x8 - adds r0, r3, r1 - strh r2, [r0] - movs r0, 0 - movs r1, 0x10 - bl sub_80AC124 -_080AE14E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE0E4 - - thumb_func_start sub_80AE168 -sub_80AE168: @ 80AE168 - push {r4,lr} - bl sub_80AE0E4 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AE188 - adds r4, r1, r2 -_080AE17E: - bl sub_80AE198 - ldrb r0, [r4] - cmp r0, 0 - beq _080AE17E -_080AE188: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE168 - - thumb_func_start sub_80AE198 -sub_80AE198: @ 80AE198 - push {r4,r5,lr} - bl sub_80AE25C - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r0, =0x000006cc - adds r4, r5, r0 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080AE1CC - cmp r0, 0x1 - bgt _080AE1C0 - cmp r0, 0 - beq _080AE1C6 - b _080AE1F0 - .pool -_080AE1C0: - cmp r0, 0x2 - beq _080AE1D8 - b _080AE1F0 -_080AE1C6: - bl sub_80AE2F0 - b _080AE1EA -_080AE1CC: - movs r0, 0xC - movs r1, 0x8 - movs r2, 0x8 - bl sub_80AC164 - b _080AE1EA -_080AE1D8: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080AE1F0 - ldr r0, =0x000006d2 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] -_080AE1EA: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080AE1F0: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE198 - - thumb_func_start sub_80AE1FC -sub_80AE1FC: @ 80AE1FC - push {r4,lr} - bl sub_80AE25C - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006ce - adds r4, r0, r1 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080AE236 - cmp r0, 0x1 - bgt _080AE224 - cmp r0, 0 - beq _080AE22A - b _080AE24E - .pool -_080AE224: - cmp r0, 0x2 - beq _080AE242 - b _080AE24E -_080AE22A: - movs r0, 0 - movs r1, 0x10 - movs r2, 0x1 - bl sub_80AC164 - b _080AE246 -_080AE236: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080AE252 - b _080AE246 -_080AE242: - bl sub_80AE3A8 -_080AE246: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080AE252 -_080AE24E: - movs r0, 0 - b _080AE254 -_080AE252: - movs r0, 0x1 -_080AE254: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80AE1FC - - thumb_func_start sub_80AE25C -sub_80AE25C: @ 80AE25C - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r3, [r0] - ldr r0, =0x0000071c - adds r2, r3, r0 - ldrh r0, [r2] - adds r0, 0x1 - movs r5, 0 - strh r0, [r2] - ldr r1, =0x0000ffff - adds r4, r1, 0 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bls _080AE288 - movs r0, 0xE4 - lsls r0, 3 - adds r1, r3, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - strh r5, [r2] -_080AE288: - ldr r1, =0x0000071e - adds r2, r3, r1 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ands r0, r4 - cmp r0, 0x4 - bls _080AE2A4 - ldr r0, =0x00000722 - adds r1, r3, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - strh r5, [r2] -_080AE2A4: - ldr r0, =gSpriteCoordOffsetX - movs r2, 0xE4 - lsls r2, 3 - adds r1, r3, r2 - ldrh r0, [r0] - ldrh r1, [r1] - subs r0, r1 - movs r1, 0xFF - ands r0, r1 - subs r2, 0x8 - adds r1, r3, r2 - strh r0, [r1] - ldr r1, =gSpriteCoordOffsetY - adds r2, 0xA - adds r0, r3, r2 - ldrh r0, [r0] - ldrh r1, [r1] - adds r0, r1 - subs r2, 0x8 - adds r1, r3, r2 - strh r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE25C - - thumb_func_start sub_80AE2F0 -sub_80AE2F0: @ 80AE2F0 - push {r4-r6,lr} - sub sp, 0x8 - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x00000724 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080AE396 - ldr r0, =gUnknown_0854FD70 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - mov r0, sp - bl LoadSpriteSheet - movs r6, 0 -_080AE314: - adds r0, r6, 0 - movs r1, 0x5 - bl __udivsi3 - adds r5, r0, 0 - lsls r2, r5, 22 - asrs r2, 16 - ldr r0, =gSpriteTemplate_854FD8C - movs r1, 0 - movs r3, 0xFF - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _080AE370 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - ldr r0, =gSprites - adds r4, r0 - adds r0, r6, 0 - movs r1, 0x5 - bl __umodsi3 - strh r0, [r4, 0x2E] - strh r5, [r4, 0x30] - ldr r2, =gUnknown_0854C14C - ldr r0, [r2] - lsls r1, r6, 2 - movs r3, 0xA0 - lsls r3, 1 - adds r0, r3 - adds r0, r1 - str r4, [r0] - b _080AE382 - .pool -_080AE370: - ldr r2, =gUnknown_0854C14C - ldr r1, [r2] - lsls r0, r6, 2 - movs r3, 0xA0 - lsls r3, 1 - adds r1, r3 - adds r1, r0 - movs r0, 0 - str r0, [r1] -_080AE382: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x13 - bls _080AE314 - ldr r0, [r2] - ldr r1, =0x00000724 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] -_080AE396: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE2F0 - - thumb_func_start sub_80AE3A8 -sub_80AE3A8: @ 80AE3A8 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x00000724 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080AE3EA - movs r4, 0 - movs r0, 0xA0 - lsls r0, 1 - adds r5, r1, r0 -_080AE3C0: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080AE3CE - bl DestroySprite -_080AE3CE: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x13 - bls _080AE3C0 - ldr r0, =0x00001203 - bl FreeSpriteTilesByTag - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x00000724 - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_080AE3EA: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE3A8 - - thumb_func_start sub_80AE3FC -sub_80AE3FC: @ 80AE3FC - push {r4,lr} - adds r3, r0, 0 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x0000071a - adds r0, r1, r2 - ldrh r0, [r0] - strh r0, [r3, 0x26] - movs r4, 0xE3 - lsls r4, 3 - adds r2, r1, r4 - ldrh r1, [r2] - adds r1, 0x20 - movs r4, 0x2E - ldrsh r0, [r3, r4] - lsls r0, 6 - adds r1, r0 - strh r1, [r3, 0x20] - lsls r1, 16 - ldr r0, =0x010f0000 - cmp r1, r0 - ble _080AE444 - movs r0, 0xF0 - lsls r0, 1 - adds r1, r0, 0 - ldrh r2, [r2] - adds r1, r2 - movs r4, 0x2E - ldrsh r2, [r3, r4] - movs r0, 0x4 - subs r0, r2 - lsls r0, 6 - subs r1, r0 - ldr r0, =0x000001ff - ands r1, r0 - strh r1, [r3, 0x20] -_080AE444: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE3FC - - thumb_func_start sub_80AE45C -sub_80AE45C: @ 80AE45C - push {r4,lr} - ldr r0, =gUnknown_0854C14C - ldr r3, [r0] - ldr r0, =0x000006cc - adds r1, r3, r0 - movs r2, 0 - movs r0, 0 - strh r0, [r1] - ldr r1, =0x000006d2 - adds r0, r3, r1 - strb r2, [r0] - ldr r4, =0x000006c1 - adds r0, r3, r4 - strb r2, [r0] - ldr r0, =0x000006c2 - adds r1, r3, r0 - movs r0, 0x14 - strb r0, [r1] - ldr r1, =0x00000716 - adds r0, r3, r1 - ldrb r2, [r0] - cmp r2, 0 - bne _080AE4B8 - adds r4, 0x43 - adds r1, r3, r4 - adds r4, 0x4 - adds r0, r3, r4 - str r2, [r0] - str r2, [r1] - ldr r0, =0x00000712 - adds r1, r3, r0 - movs r0, 0x8 - strh r0, [r1] - adds r4, 0xC - adds r0, r3, r4 - strh r2, [r0] - ldrh r2, [r1] - cmp r2, 0x5F - bls _080AE4B0 - movs r0, 0x80 - subs r0, r2 - strh r0, [r1] -_080AE4B0: - movs r0, 0 - movs r1, 0x10 - bl sub_80AC124 -_080AE4B8: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE45C - - thumb_func_start sub_80AE4DC -sub_80AE4DC: @ 80AE4DC - push {r4,lr} - bl sub_80AE45C - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AE4FC - adds r4, r1, r2 -_080AE4F2: - bl sub_80AE50C - ldrb r0, [r4] - cmp r0, 0 - beq _080AE4F2 -_080AE4FC: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE4DC - - thumb_func_start sub_80AE50C -sub_80AE50C: @ 80AE50C - push {r4,r5,lr} - bl sub_80AE624 - bl sub_80AE5EC - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r0, =0x00000712 - adds r1, r5, r0 - ldrh r0, [r1] - cmp r0, 0x5F - bls _080AE528 - movs r0, 0x20 - strh r0, [r1] -_080AE528: - ldr r0, =0x000006cc - adds r4, r5, r0 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080AE558 - cmp r0, 0x1 - bgt _080AE548 - cmp r0, 0 - beq _080AE54E - b _080AE57C - .pool -_080AE548: - cmp r0, 0x2 - beq _080AE564 - b _080AE57C -_080AE54E: - bl sub_80AE738 - bl sub_80AE7F8 - b _080AE576 -_080AE558: - movs r0, 0x10 - movs r1, 0 - movs r2, 0 - bl sub_80AC164 - b _080AE576 -_080AE564: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080AE57C - ldr r0, =0x000006d2 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] -_080AE576: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080AE57C: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE50C - - thumb_func_start sub_80AE588 -sub_80AE588: @ 80AE588 - push {r4,lr} - bl sub_80AE624 - bl sub_80AE5EC - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x000006ce - adds r4, r0, r1 - ldrh r0, [r4] - cmp r0, 0x1 - beq _080AE5C6 - cmp r0, 0x1 - bgt _080AE5B4 - cmp r0, 0 - beq _080AE5BA - b _080AE5DE - .pool -_080AE5B4: - cmp r0, 0x2 - beq _080AE5D2 - b _080AE5DE -_080AE5BA: - movs r0, 0 - movs r1, 0x10 - movs r2, 0 - bl sub_80AC164 - b _080AE5D6 -_080AE5C6: - bl sub_80AC1A8 - lsls r0, 24 - cmp r0, 0 - beq _080AE5E2 - b _080AE5D6 -_080AE5D2: - bl sub_80AE6A4 -_080AE5D6: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080AE5E2 -_080AE5DE: - movs r0, 0 - b _080AE5E4 -_080AE5E2: - movs r0, 0x1 -_080AE5E4: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80AE588 - - thumb_func_start sub_80AE5EC -sub_80AE5EC: @ 80AE5EC - push {lr} - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r0, =0x00000714 - adds r3, r2, r0 - ldrh r0, [r3] - adds r1, r0, 0x1 - strh r1, [r3] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x4 - bls _080AE612 - ldr r1, =0x00000712 - adds r0, r2, r1 - ldrh r1, [r0] - adds r1, 0x1 - movs r2, 0 - strh r1, [r0] - strh r2, [r3] -_080AE612: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE5EC - - thumb_func_start sub_80AE624 -sub_80AE624: @ 80AE624 - push {r4-r6,lr} - ldr r0, =gUnknown_0854C14C - ldr r2, [r0] - ldr r0, =0x00000704 - adds r4, r2, r0 - ldr r6, =gSineTable - ldr r1, =0x00000712 - adds r5, r2, r1 - ldrh r0, [r5] - lsls r0, 1 - adds r0, r6 - movs r3, 0 - ldrsh r1, [r0, r3] - lsls r1, 2 - ldr r0, [r4] - subs r0, r1 - str r0, [r4] - movs r0, 0xE1 - lsls r0, 3 - adds r3, r2, r0 - ldrh r0, [r5] - lsls r0, 1 - adds r0, r6 - movs r5, 0 - ldrsh r1, [r0, r5] - ldr r0, [r3] - subs r0, r1 - str r0, [r3] - ldr r1, =gSpriteCoordOffsetX - ldr r0, [r4] - lsrs r0, 8 - ldrh r1, [r1] - adds r0, r1 - movs r1, 0xFF - ands r0, r1 - ldr r4, =0x0000070e - adds r1, r2, r4 - strh r0, [r1] - ldr r1, =gSpriteCoordOffsetY - ldr r0, [r3] - lsrs r0, 8 - ldrh r1, [r1] - adds r0, r1 - movs r5, 0xE2 - lsls r5, 3 - adds r2, r5 - strh r0, [r2] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE624 - - thumb_func_start sub_80AE6A4 -sub_80AE6A4: @ 80AE6A4 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x00000716 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080AE6E6 - movs r4, 0 - movs r0, 0xC8 - lsls r0, 1 - adds r5, r1, r0 -_080AE6BC: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080AE6CA - bl DestroySprite -_080AE6CA: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x13 - bls _080AE6BC - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x00000716 - adds r0, r1 - movs r1, 0 - strb r1, [r0] - ldr r0, =0x00001204 - bl FreeSpriteTilesByTag -_080AE6E6: - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x00000717 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080AE720 - movs r4, 0 - movs r0, 0xF0 - lsls r0, 1 - adds r5, r1, r0 -_080AE6FC: - lsls r0, r4, 2 - adds r0, r5, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080AE70A - bl DestroySprite -_080AE70A: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x4 - bls _080AE6FC - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x00000717 - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_080AE720: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE6A4 - - thumb_func_start sub_80AE738 -sub_80AE738: @ 80AE738 - push {r4-r7,lr} - sub sp, 0x4 - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x00000716 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080AE7E6 - ldr r0, =gUnknown_0854FDDC - bl LoadSpriteSheet - ldr r0, =gUnknown_0854C2B0 - bl sub_80ABF4C - movs r7, 0 -_080AE758: - adds r0, r7, 0 - movs r1, 0x5 - bl __udivsi3 - adds r6, r0, 0 - lsls r2, r6, 22 - asrs r2, 16 - ldr r0, =gSpriteTemplate_854FDC4 - movs r1, 0 - movs r3, 0x1 - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080AE7C0 - ldr r2, =gUnknown_0854C14C - ldr r5, [r2] - lsls r0, r7, 2 - movs r3, 0xC8 - lsls r3, 1 - adds r5, r3 - adds r5, r0 - lsls r4, r1, 4 - adds r4, r1 - lsls r4, 2 - ldr r0, =gSprites - adds r4, r0 - str r4, [r5] - adds r0, r7, 0 - movs r1, 0x5 - str r2, [sp] - bl __umodsi3 - strh r0, [r4, 0x2E] - ldr r0, [r5] - strh r6, [r0, 0x30] - ldr r2, [sp] - b _080AE7D2 - .pool -_080AE7C0: - ldr r2, =gUnknown_0854C14C - ldr r1, [r2] - lsls r0, r7, 2 - movs r3, 0xC8 - lsls r3, 1 - adds r1, r3 - adds r1, r0 - movs r0, 0 - str r0, [r1] -_080AE7D2: - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x13 - bls _080AE758 - ldr r0, [r2] - ldr r1, =0x00000716 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] -_080AE7E6: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE738 - - thumb_func_start sub_80AE7F8 -sub_80AE7F8: @ 80AE7F8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, =gUnknown_0854C14C - ldr r0, [r4] - ldr r1, =0x00000717 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080AE8E4 - movs r7, 0 - mov r9, r4 - movs r2, 0 - mov r10, r2 -_080AE818: - lsls r0, r7, 1 - mov r8, r0 - adds r6, r0, r7 - lsls r5, r6, 4 - adds r1, r5, 0 - adds r1, 0x18 - lsls r1, 16 - asrs r1, 16 - ldr r0, =gSpriteTemplate_854FDC4 - movs r2, 0xD0 - movs r3, 0x1 - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080AE8BC - mov r2, r9 - ldr r4, [r2] - lsls r0, r7, 2 - movs r2, 0xF0 - lsls r2, 1 - adds r4, r2 - adds r4, r0 - lsls r2, r1, 4 - adds r2, r1 - lsls r2, 2 - ldr r0, =gSprites - adds r2, r0 - str r2, [r4] - ldrb r1, [r2, 0x3] - movs r0, 0x3F - ands r0, r1 - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0x3] - ldr r1, [r4] - adds r0, r6, r5 - strh r0, [r1, 0x30] - ldr r1, [r4] - movs r0, 0x8 - strh r0, [r1, 0x2E] - ldr r0, [r4] - mov r1, r10 - strh r1, [r0, 0x32] - ldr r1, [r4] - ldr r0, =0x00006730 - strh r0, [r1, 0x36] - ldr r1, [r4] - ldr r0, =gUnknown_0854FDE4 - add r0, r8 - ldrh r0, [r0] - strh r0, [r1, 0x34] - ldr r0, [r4] - movs r1, 0x1 - bl StartSpriteAnim - ldr r0, [r4] - movs r1, 0 - movs r2, 0x2 - movs r3, 0 - bl CalcCenterToCornerVec - ldr r1, [r4] - ldr r0, =sub_80AE958 - str r0, [r1, 0x1C] - b _080AE8CE - .pool -_080AE8BC: - mov r2, r9 - ldr r0, [r2] - lsls r1, r7, 2 - movs r2, 0xF0 - lsls r2, 1 - adds r0, r2 - adds r0, r1 - mov r1, r10 - str r1, [r0] -_080AE8CE: - mov r2, r9 - ldr r0, [r2] - ldr r1, =0x00000717 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x4 - bls _080AE818 -_080AE8E4: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE7F8 - - thumb_func_start sub_80AE8F8 -sub_80AE8F8: @ 80AE8F8 - push {r4,lr} - adds r3, r0, 0 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - movs r2, 0xE2 - lsls r2, 3 - adds r0, r1, r2 - ldrh r0, [r0] - strh r0, [r3, 0x26] - ldr r4, =0x0000070e - adds r2, r1, r4 - ldrh r1, [r2] - adds r1, 0x20 - movs r4, 0x2E - ldrsh r0, [r3, r4] - lsls r0, 6 - adds r1, r0 - strh r1, [r3, 0x20] - lsls r1, 16 - ldr r0, =0x010f0000 - cmp r1, r0 - ble _080AE940 - movs r0, 0xF0 - lsls r0, 1 - adds r1, r0, 0 - ldrh r2, [r2] - adds r1, r2 - movs r4, 0x2E - ldrsh r2, [r3, r4] - movs r0, 0x4 - subs r0, r2 - lsls r0, 6 - subs r1, r0 - ldr r0, =0x000001ff - ands r1, r0 - strh r1, [r3, 0x20] -_080AE940: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE8F8 - - thumb_func_start sub_80AE958 -sub_80AE958: @ 80AE958 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x34] - subs r0, 0x1 - strh r0, [r2, 0x34] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080AE972 - ldr r0, =sub_80AE97C - str r0, [r2, 0x1C] -_080AE972: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE958 - - thumb_func_start sub_80AE97C -sub_80AE97C: @ 80AE97C - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x22] - subs r0, 0x1 - strh r0, [r5, 0x22] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x30 - negs r1, r1 - cmp r0, r1 - bge _080AE99A - movs r0, 0xD0 - strh r0, [r5, 0x22] - movs r0, 0x4 - strh r0, [r5, 0x2E] -_080AE99A: - movs r0, 0x2E - ldrsh r4, [r5, r0] - ldr r3, =gSineTable - movs r2, 0x30 - ldrsh r1, [r5, r2] - lsls r0, r1, 1 - adds r0, r3 - movs r2, 0 - ldrsh r0, [r0, r2] - adds r2, r4, 0 - muls r2, r0 - adds r1, 0x40 - lsls r1, 1 - adds r1, r3 - movs r3, 0 - ldrsh r0, [r1, r3] - muls r0, r4 - lsrs r2, 8 - strh r2, [r5, 0x24] - lsrs r0, 8 - strh r0, [r5, 0x26] - ldrh r0, [r5, 0x30] - adds r0, 0xA - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x30] - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _080AE9E6 - movs r0, 0 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] -_080AE9E6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AE97C - - thumb_func_start sub_80AE9F0 -sub_80AE9F0: @ 80AE9F0 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x000006cc - adds r2, r1, r0 - movs r0, 0 - strh r0, [r2] - ldr r0, =0x000006c1 - adds r2, r1, r0 - movs r0, 0x3 - strb r0, [r2] - ldr r0, =0x000006c2 - adds r1, r0 - movs r0, 0x14 - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_80AE9F0 - - thumb_func_start sub_80AEA20 -sub_80AEA20: @ 80AEA20 - push {lr} - bl sub_80AE9F0 - pop {r0} - bx r0 - thumb_func_end sub_80AEA20 - - thumb_func_start nullsub_96 -nullsub_96: @ 80AEA2C - bx lr - thumb_func_end nullsub_96 - - thumb_func_start sub_80AEA30 -sub_80AEA30: @ 80AEA30 - movs r0, 0 - bx lr - thumb_func_end sub_80AEA30 - - thumb_func_start sub_80AEA34 -sub_80AEA34: @ 80AEA34 - push {r4,r5,lr} - bl sub_80ADA60 - ldr r0, =gUnknown_0854C14C - ldr r4, [r0] - ldr r1, =0x0000072e - adds r0, r4, r1 - ldrb r5, [r0] - cmp r5, 0 - bne _080AEA6C - ldr r0, =gUnknown_0854FDF8 - bl LoadSpriteSheet - movs r2, 0xE5 - lsls r2, 3 - adds r0, r4, r2 - strh r5, [r0] - ldr r0, =gUnknown_0854FDF0 - ldrb r1, [r0] - subs r2, 0x2 - adds r0, r4, r2 - strh r1, [r0] - ldr r1, =0x0000072a - adds r0, r4, r1 - strh r5, [r0] - adds r2, 0x6 - adds r0, r4, r2 - strh r5, [r0] -_080AEA6C: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AEA34 - - thumb_func_start sub_80AEA88 -sub_80AEA88: @ 80AEA88 - push {r4,lr} - bl sub_80AEA34 - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r2, =0x000006d2 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080AEAA8 - adds r4, r1, r2 -_080AEA9E: - bl sub_80AEAB8 - ldrb r0, [r4] - cmp r0, 0 - beq _080AEA9E -_080AEAA8: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AEA88 - - thumb_func_start sub_80AEAB8 -sub_80AEAB8: @ 80AEAB8 - push {r4-r7,lr} - bl sub_80ADAF0 - ldr r0, =gUnknown_0854C14C - ldr r5, [r0] - ldr r0, =0x00000726 - adds r4, r5, r0 - ldrh r0, [r4] - adds r0, 0x1 - movs r6, 0 - strh r0, [r4] - ldr r1, =0x0000ffff - adds r7, r1, 0 - ldr r2, =gUnknown_0854FDF0 - movs r1, 0xE5 - lsls r1, 3 - adds r3, r5, r1 - ldrh r1, [r3] - adds r1, r2 - lsls r0, 16 - lsrs r0, 16 - ldrb r1, [r1] - cmp r0, r1 - bls _080AEB10 - strh r6, [r4] - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r3] - ands r0, r7 - cmp r0, 0x7 - bls _080AEAF8 - strh r6, [r3] -_080AEAF8: - ldr r0, =0x0000072a - adds r4, r5, r0 - ldrh r0, [r4] - bl sub_80AEB48 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - ands r0, r7 - cmp r0, 0xC - bls _080AEB10 - strh r6, [r4] -_080AEB10: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AEAB8 - - thumb_func_start sub_80AEB2C -sub_80AEB2C: @ 80AEB2C - push {lr} - bl sub_80ADBB0 - lsls r0, 24 - cmp r0, 0 - beq _080AEB3C - movs r0, 0x1 - b _080AEB42 -_080AEB3C: - bl sub_80AEBD0 - movs r0, 0 -_080AEB42: - pop {r1} - bx r1 - thumb_func_end sub_80AEB2C - - thumb_func_start sub_80AEB48 -sub_80AEB48: @ 80AEB48 - push {r4,lr} - lsls r0, 16 - ldr r1, =gUnknown_0854FE00 - lsrs r0, 14 - adds r3, r0, r1 - adds r1, 0x2 - adds r0, r1 - ldr r1, =gSpriteCoordOffsetY - ldrh r2, [r0] - ldrh r0, [r1] - subs r2, r0 - ldr r0, =gSpriteTemplate_854FE44 - movs r4, 0 - ldrsh r1, [r3, r4] - lsls r2, 16 - asrs r2, 16 - movs r3, 0 - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _080AEBB0 - ldr r0, =gSprites - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1, 0x5] - adds r3, r1, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r2, 0x2 - orrs r0, r2 - strb r0, [r3] - movs r0, 0 - strh r0, [r1, 0x2E] - strh r0, [r1, 0x30] - strh r0, [r1, 0x32] - ldr r0, =gUnknown_0854C14C - ldr r1, [r0] - ldr r0, =0x0000072c - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080AEBB0: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AEB48 - - thumb_func_start sub_80AEBD0 -sub_80AEBD0: @ 80AEBD0 - push {r4,r5,lr} - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x0000072c - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0 - beq _080AEC1A - movs r4, 0 - ldr r5, =gSprites -_080AEBE4: - lsls r0, r4, 4 - adds r0, r4 - lsls r2, r0, 2 - adds r0, r5, 0 - adds r0, 0x14 - adds r0, r2, r0 - ldr r1, [r0] - ldr r0, =gSpriteTemplate_854FE44 - cmp r1, r0 - bne _080AEBFE - adds r0, r2, r5 - bl DestroySprite -_080AEBFE: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x3F - bls _080AEBE4 - ldr r0, =0x00001205 - bl FreeSpriteTilesByTag - ldr r0, =gUnknown_0854C14C - ldr r0, [r0] - ldr r1, =0x0000072c - adds r0, r1 - movs r1, 0 - strh r1, [r0] -_080AEC1A: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AEBD0 - - thumb_func_start sub_80AEC34 -sub_80AEC34: @ 80AEC34 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x2E] - movs r2, 0 - adds r0, 0x2 - strh r0, [r1, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _080AEC74 - strh r2, [r1, 0x2E] - movs r3, 0x30 - ldrsh r0, [r1, r3] - cmp r0, 0 - bne _080AEC66 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _080AEC74 - movs r0, 0x1 - strh r0, [r1, 0x30] - b _080AEC74 -_080AEC66: - ldrh r0, [r1, 0x24] - subs r0, 0x1 - strh r0, [r1, 0x24] - lsls r0, 16 - cmp r0, 0 - bgt _080AEC74 - strh r2, [r1, 0x30] -_080AEC74: - ldrh r0, [r1, 0x22] - subs r0, 0x3 - strh r0, [r1, 0x22] - ldrh r0, [r1, 0x32] - adds r0, 0x1 - strh r0, [r1, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x77 - ble _080AEC8E - adds r0, r1, 0 - bl DestroySprite -_080AEC8E: - pop {r0} - bx r0 - thumb_func_end sub_80AEC34 - - thumb_func_start sub_80AEC94 -sub_80AEC94: @ 80AEC94 - ldr r2, =gUnknown_02038BC4 - strb r0, [r2] - ldr r0, =gUnknown_02038BC6 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_80AEC94 - - thumb_func_start sub_80AECA8 -sub_80AECA8: @ 80AECA8 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r4, r1, r0 - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080AECCC - cmp r0, 0x1 - beq _080AECF8 - b _080AED1C - .pool -_080AECCC: - ldrh r0, [r4, 0x1E] - subs r1, r0, 0x1 - strh r1, [r4, 0x1E] - lsls r0, 16 - cmp r0, 0 - bgt _080AED1C - ldrb r0, [r4, 0x2] - bl weather_set - ldr r1, =gUnknown_02038BC4 - ldrh r0, [r4, 0x2] - strb r0, [r1] - movs r1, 0x96 - lsls r1, 2 - adds r0, r1, 0 - strh r0, [r4, 0x1E] - ldrh r0, [r4] - adds r0, 0x1 - b _080AED1A - .pool -_080AECF8: - ldrh r0, [r4, 0x1E] - subs r1, r0, 0x1 - strh r1, [r4, 0x1E] - lsls r0, 16 - cmp r0, 0 - bgt _080AED1C - ldrb r0, [r4, 0x4] - bl weather_set - ldr r1, =gUnknown_02038BC4 - ldrh r0, [r4, 0x4] - strb r0, [r1] - movs r1, 0x96 - lsls r1, 2 - adds r0, r1, 0 - strh r0, [r4, 0x1E] - movs r0, 0 -_080AED1A: - strh r0, [r4] -_080AED1C: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AECA8 - - thumb_func_start bag_add_task0_by_acit -bag_add_task0_by_acit: @ 80AED28 - push {lr} - ldr r0, =sub_80AECA8 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r1, r0 - movs r2, 0x96 - lsls r2, 2 - adds r0, r2, 0 - strh r0, [r1, 0x1E] - ldr r3, =gUnknown_02038BC4 - ldrb r2, [r3] - cmp r2, 0xD - bne _080AED60 - movs r0, 0xC - b _080AED66 - .pool -_080AED60: - cmp r2, 0xC - bne _080AED6C - movs r0, 0xD -_080AED66: - strh r0, [r1, 0x2] - strh r2, [r1, 0x4] - b _080AED78 -_080AED6C: - movs r0, 0xD - strb r0, [r3] - movs r0, 0xC - strh r0, [r1, 0x2] - movs r0, 0xD - strh r0, [r1, 0x4] -_080AED78: - pop {r0} - bx r0 - thumb_func_end bag_add_task0_by_acit - - thumb_func_start SetSav1Weather -SetSav1Weather: @ 80AED7C - push {r4,r5,lr} - ldr r4, =gSaveBlock1Ptr - ldr r1, [r4] - adds r1, 0x2E - ldrb r5, [r1] - lsls r0, 24 - lsrs r0, 24 - bl sub_80AEEE8 - ldr r1, [r4] - adds r1, 0x2E - strb r0, [r1] - ldr r0, [r4] - adds r0, 0x2E - ldrb r0, [r0] - adds r1, r5, 0 - bl sub_80AEFDC - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end SetSav1Weather - - thumb_func_start GetSav1Weather -GetSav1Weather: @ 80AEDAC - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - adds r0, 0x2E - ldrb r0, [r0] - bx lr - .pool - thumb_func_end GetSav1Weather - - thumb_func_start SetSav1WeatherFromCurrMapHeader -SetSav1WeatherFromCurrMapHeader: @ 80AEDBC - push {r4,r5,lr} - ldr r4, =gSaveBlock1Ptr - ldr r0, [r4] - adds r0, 0x2E - ldrb r5, [r0] - ldr r0, =gMapHeader - ldrb r0, [r0, 0x16] - bl sub_80AEEE8 - ldr r1, [r4] - adds r1, 0x2E - strb r0, [r1] - ldr r0, [r4] - adds r0, 0x2E - ldrb r0, [r0] - adds r1, r5, 0 - bl sub_80AEFDC - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end SetSav1WeatherFromCurrMapHeader - - thumb_func_start SetWeather -SetWeather: @ 80AEDF0 - push {lr} - bl SetSav1Weather - bl GetSav1Weather - lsls r0, 24 - lsrs r0, 24 - bl weather_set - pop {r0} - bx r0 - thumb_func_end SetWeather - - thumb_func_start sub_80AEE08 -sub_80AEE08: @ 80AEE08 - push {lr} - bl SetSav1Weather - bl GetSav1Weather - lsls r0, 24 - lsrs r0, 24 - bl sub_80AB104 - pop {r0} - bx r0 - thumb_func_end sub_80AEE08 - - thumb_func_start DoCurrentWeather -DoCurrentWeather: @ 80AEE20 - push {r4,r5,lr} - bl GetSav1Weather - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bne _080AEE4C - ldr r0, =sub_80AECA8 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - bne _080AEE3E - bl bag_add_task0_by_acit -_080AEE3E: - ldr r0, =gUnknown_02038BC4 - ldrb r4, [r0] - b _080AEE6E - .pool -_080AEE4C: - ldr r5, =sub_80AECA8 - adds r0, r5, 0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _080AEE68 - adds r0, r5, 0 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_080AEE68: - ldr r1, =gUnknown_02038BC4 - movs r0, 0xD - strb r0, [r1] -_080AEE6E: - adds r0, r4, 0 - bl weather_set - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end DoCurrentWeather - - thumb_func_start sub_80AEE84 -sub_80AEE84: @ 80AEE84 - push {r4,r5,lr} - bl GetSav1Weather - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bne _080AEEB0 - ldr r0, =sub_80AECA8 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - bne _080AEEA2 - bl bag_add_task0_by_acit -_080AEEA2: - ldr r0, =gUnknown_02038BC4 - ldrb r4, [r0] - b _080AEED2 - .pool -_080AEEB0: - ldr r5, =sub_80AECA8 - adds r0, r5, 0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _080AEECC - adds r0, r5, 0 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_080AEECC: - ldr r1, =gUnknown_02038BC4 - movs r0, 0xD - strb r0, [r1] -_080AEED2: - adds r0, r4, 0 - bl sub_80AB104 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AEE84 - - thumb_func_start sub_80AEEE8 -sub_80AEEE8: @ 80AEEE8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x15 - bhi _080AEFB4 - lsls r0, 2 - ldr r1, =_080AEF00 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080AEF00: - .4byte _080AEFB4 - .4byte _080AEF58 - .4byte _080AEF5C - .4byte _080AEF60 - .4byte _080AEF64 - .4byte _080AEF68 - .4byte _080AEF6C - .4byte _080AEF70 - .4byte _080AEF74 - .4byte _080AEF78 - .4byte _080AEF7C - .4byte _080AEF80 - .4byte _080AEF84 - .4byte _080AEF88 - .4byte _080AEF8C - .4byte _080AEF90 - .4byte _080AEFB4 - .4byte _080AEFB4 - .4byte _080AEFB4 - .4byte _080AEFB4 - .4byte _080AEF94 - .4byte _080AEF9C -_080AEF58: - movs r0, 0x1 - b _080AEFB6 -_080AEF5C: - movs r0, 0x2 - b _080AEFB6 -_080AEF60: - movs r0, 0x3 - b _080AEFB6 -_080AEF64: - movs r0, 0x4 - b _080AEFB6 -_080AEF68: - movs r0, 0x5 - b _080AEFB6 -_080AEF6C: - movs r0, 0x6 - b _080AEFB6 -_080AEF70: - movs r0, 0x7 - b _080AEFB6 -_080AEF74: - movs r0, 0x8 - b _080AEFB6 -_080AEF78: - movs r0, 0x9 - b _080AEFB6 -_080AEF7C: - movs r0, 0xA - b _080AEFB6 -_080AEF80: - movs r0, 0xB - b _080AEFB6 -_080AEF84: - movs r0, 0xC - b _080AEFB6 -_080AEF88: - movs r0, 0xD - b _080AEFB6 -_080AEF8C: - movs r0, 0xE - b _080AEFB6 -_080AEF90: - movs r0, 0xF - b _080AEFB6 -_080AEF94: - ldr r1, =gUnknown_0854FE5C - b _080AEF9E - .pool -_080AEF9C: - ldr r1, =gUnknown_0854FE60 -_080AEF9E: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - adds r0, 0x2F - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - b _080AEFB6 - .pool -_080AEFB4: - movs r0, 0 -_080AEFB6: - pop {r1} - bx r1 - thumb_func_end sub_80AEEE8 - - thumb_func_start UpdateWeatherPerDay -UpdateWeatherPerDay: @ 80AEFBC - lsls r0, 16 - ldr r1, =gSaveBlock1Ptr - ldr r2, [r1] - adds r2, 0x2F - lsrs r0, 16 - ldrb r1, [r2] - adds r0, r1 - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 10 - ands r1, r0 - lsrs r1, 16 - strb r1, [r2] - bx lr - .pool - thumb_func_end UpdateWeatherPerDay - - thumb_func_start sub_80AEFDC -sub_80AEFDC: @ 80AEFDC - push {lr} - lsls r0, 24 - lsls r1, 24 - lsrs r2, r0, 24 - cmp r0, r1 - beq _080AEFF6 - cmp r2, 0x3 - beq _080AEFF0 - cmp r2, 0x5 - bne _080AEFF6 -_080AEFF0: - movs r0, 0x28 - bl IncrementGameStat -_080AEFF6: - pop {r0} - bx r0 - thumb_func_end sub_80AEFDC thumb_func_start palette_bg_faded_fill_white palette_bg_faded_fill_white: @ 80AEFFC @@ -8722,7 +912,7 @@ sub_80AF734: @ 80AF734 bl ScriptContext2_Enable bl music_something bl sub_80AF0B4 - bl play_some_sound + bl PlayRainSoundEffect movs r0, 0x9 bl PlaySE ldr r0, =gFieldCallback @@ -8742,7 +932,7 @@ sp13E_warp_to_last_warp: @ 80AF76C bl ScriptContext2_Enable bl music_something bl sub_80AF0B4 - bl play_some_sound + bl PlayRainSoundEffect ldr r0, =gFieldCallback ldr r1, =mapldr_default str r1, [r0] @@ -8762,7 +952,7 @@ sub_80AF79C: @ 80AF79C movs r0, 0x3 movs r1, 0x8 bl FadeScreen - bl play_some_sound + bl PlayRainSoundEffect ldr r0, =gFieldCallback ldr r1, =sub_80AF3B0 str r1, [r0] @@ -9253,7 +1443,7 @@ _080AFBCE: _080AFBD4: bl music_something bl sub_80AF0B4 - bl play_some_sound + bl PlayRainSoundEffect movs r0, 0 strh r0, [r5, 0x8] ldr r0, =sub_80AFA0C @@ -9325,7 +1515,7 @@ sub_80AFC60: @ 80AFC60 bl ScriptContext2_Enable bl music_something bl sub_80AF0B4 - bl play_some_sound + bl PlayRainSoundEffect movs r0, 0x9 bl PlaySE ldr r0, =gFieldCallback diff --git a/asm/ice.s b/asm/ice.s index 37142e535..3202213b4 100644 --- a/asm/ice.s +++ b/asm/ice.s @@ -1368,7 +1368,7 @@ _0810C0E2: mov r0, sp movs r2, 0 bl sub_80A6D60 - ldr r0, =gUnknown_0854C270 + ldr r0, =gUnknown_083970E8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -1650,7 +1650,7 @@ _0810C366: mov r0, sp movs r2, 0 bl sub_80A6D60 - ldr r0, =gUnknown_0854C270 + ldr r0, =gUnknown_083970E8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 diff --git a/data/field_screen.s b/data/field_screen.s index 968e2e7f3..508e86c63 100644 --- a/data/field_screen.s +++ b/data/field_screen.s @@ -3,490 +3,3 @@ .section .rodata - .align 2 -gUnknown_0854014C:: @ 854014C - .incbin "graphics/misc/sunny_day/0.gbapal" - .incbin "graphics/misc/sunny_day/1.gbapal" - .incbin "graphics/misc/sunny_day/2.gbapal" - .incbin "graphics/misc/sunny_day/3.gbapal" - .incbin "graphics/misc/sunny_day/4.gbapal" - .incbin "graphics/misc/sunny_day/5.gbapal" - .incbin "graphics/misc/sunny_day/6.gbapal" - .incbin "graphics/misc/sunny_day/7.gbapal" - .incbin "graphics/misc/sunny_day/8.gbapal" - .incbin "graphics/misc/sunny_day/9.gbapal" - .incbin "graphics/misc/sunny_day/10.gbapal" - .incbin "graphics/misc/sunny_day/11.gbapal" - .incbin "graphics/misc/sunny_day/12.gbapal" - .incbin "graphics/misc/sunny_day/13.gbapal" - .incbin "graphics/misc/sunny_day/14.gbapal" - .incbin "graphics/misc/sunny_day/15.gbapal" - .incbin "graphics/misc/sunny_day/16.gbapal" - .incbin "graphics/misc/sunny_day/17.gbapal" - .incbin "graphics/misc/sunny_day/18.gbapal" - .incbin "graphics/misc/sunny_day/19.gbapal" - .incbin "graphics/misc/sunny_day/20.gbapal" - .incbin "graphics/misc/sunny_day/21.gbapal" - .incbin "graphics/misc/sunny_day/22.gbapal" - .incbin "graphics/misc/sunny_day/23.gbapal" - .incbin "graphics/misc/sunny_day/24.gbapal" - .incbin "graphics/misc/sunny_day/25.gbapal" - .incbin "graphics/misc/sunny_day/26.gbapal" - .incbin "graphics/misc/sunny_day/27.gbapal" - .incbin "graphics/misc/sunny_day/28.gbapal" - .incbin "graphics/misc/sunny_day/29.gbapal" - .incbin "graphics/misc/sunny_day/30.gbapal" - .incbin "graphics/misc/sunny_day/31.gbapal" - .incbin "graphics/misc/sunny_day/32.gbapal" - .incbin "graphics/misc/sunny_day/33.gbapal" - .incbin "graphics/misc/sunny_day/34.gbapal" - .incbin "graphics/misc/sunny_day/35.gbapal" - .incbin "graphics/misc/sunny_day/36.gbapal" - .incbin "graphics/misc/sunny_day/37.gbapal" - .incbin "graphics/misc/sunny_day/38.gbapal" - .incbin "graphics/misc/sunny_day/39.gbapal" - .incbin "graphics/misc/sunny_day/40.gbapal" - .incbin "graphics/misc/sunny_day/41.gbapal" - .incbin "graphics/misc/sunny_day/42.gbapal" - .incbin "graphics/misc/sunny_day/43.gbapal" - .incbin "graphics/misc/sunny_day/44.gbapal" - .incbin "graphics/misc/sunny_day/45.gbapal" - .incbin "graphics/misc/sunny_day/46.gbapal" - .incbin "graphics/misc/sunny_day/47.gbapal" - .incbin "graphics/misc/sunny_day/48.gbapal" - .incbin "graphics/misc/sunny_day/49.gbapal" - .incbin "graphics/misc/sunny_day/50.gbapal" - .incbin "graphics/misc/sunny_day/51.gbapal" - .incbin "graphics/misc/sunny_day/52.gbapal" - .incbin "graphics/misc/sunny_day/53.gbapal" - .incbin "graphics/misc/sunny_day/54.gbapal" - .incbin "graphics/misc/sunny_day/55.gbapal" - .incbin "graphics/misc/sunny_day/56.gbapal" - .incbin "graphics/misc/sunny_day/57.gbapal" - .incbin "graphics/misc/sunny_day/58.gbapal" - .incbin "graphics/misc/sunny_day/59.gbapal" - .incbin "graphics/misc/sunny_day/60.gbapal" - .incbin "graphics/misc/sunny_day/61.gbapal" - .incbin "graphics/misc/sunny_day/62.gbapal" - .incbin "graphics/misc/sunny_day/63.gbapal" - .incbin "graphics/misc/sunny_day/64.gbapal" - .incbin "graphics/misc/sunny_day/65.gbapal" - .incbin "graphics/misc/sunny_day/66.gbapal" - .incbin "graphics/misc/sunny_day/67.gbapal" - .incbin "graphics/misc/sunny_day/68.gbapal" - .incbin "graphics/misc/sunny_day/69.gbapal" - .incbin "graphics/misc/sunny_day/70.gbapal" - .incbin "graphics/misc/sunny_day/71.gbapal" - .incbin "graphics/misc/sunny_day/72.gbapal" - .incbin "graphics/misc/sunny_day/73.gbapal" - .incbin "graphics/misc/sunny_day/74.gbapal" - .incbin "graphics/misc/sunny_day/75.gbapal" - .incbin "graphics/misc/sunny_day/76.gbapal" - .incbin "graphics/misc/sunny_day/77.gbapal" - .incbin "graphics/misc/sunny_day/78.gbapal" - .incbin "graphics/misc/sunny_day/79.gbapal" - .incbin "graphics/misc/sunny_day/80.gbapal" - .incbin "graphics/misc/sunny_day/81.gbapal" - .incbin "graphics/misc/sunny_day/82.gbapal" - .incbin "graphics/misc/sunny_day/83.gbapal" - .incbin "graphics/misc/sunny_day/84.gbapal" - .incbin "graphics/misc/sunny_day/85.gbapal" - .incbin "graphics/misc/sunny_day/86.gbapal" - .incbin "graphics/misc/sunny_day/87.gbapal" - .incbin "graphics/misc/sunny_day/88.gbapal" - .incbin "graphics/misc/sunny_day/89.gbapal" - .incbin "graphics/misc/sunny_day/90.gbapal" - .incbin "graphics/misc/sunny_day/91.gbapal" - .incbin "graphics/misc/sunny_day/92.gbapal" - .incbin "graphics/misc/sunny_day/93.gbapal" - .incbin "graphics/misc/sunny_day/94.gbapal" - .incbin "graphics/misc/sunny_day/95.gbapal" - - .align 2 -gUnknown_0854C14C:: @ 854C14C - .4byte gUnknown_02038454 - - .align 2 -gUnknown_0854C150:: @ 854C150 - .4byte sub_80AB26C - .4byte nullsub_36 - .4byte sub_80AB26C - .4byte sub_80AB290 - .4byte sub_80AC438 - .4byte sub_80AC4B4 - .4byte sub_80AC484 - .4byte sub_80AC514 - .4byte sub_80AC55C - .4byte nullsub_95 - .4byte sub_80AC580 - .4byte sub_80AC590 - .4byte sub_80AC928 - .4byte sub_80AC9C4 - .4byte sub_80AC994 - .4byte sub_80ACA24 - .4byte sub_80ACF8C - .4byte snowflakes_progress2 - .4byte sub_80ACFDC - .4byte sub_80AD084 - .4byte sub_80AD444 - .4byte sub_80AD584 - .4byte sub_80AD4B8 - .4byte sub_80AD910 - .4byte sub_80ADA60 - .4byte sub_80ADAF0 - .4byte sub_80ADAC0 - .4byte sub_80ADBB0 - .4byte sub_80ADDBC - .4byte sub_80ADE48 - .4byte sub_80ADE18 - .4byte sub_80ADEF4 - .4byte sub_80AE45C - .4byte sub_80AE50C - .4byte sub_80AE4DC - .4byte sub_80AE588 - .4byte sub_80AE0E4 - .4byte sub_80AE198 - .4byte sub_80AE168 - .4byte sub_80AE1FC - .4byte sub_80ADA60 - .4byte sub_80ADAF0 - .4byte sub_80ADAC0 - .4byte sub_80ADBB0 - .4byte sub_80AE9F0 - .4byte nullsub_96 - .4byte sub_80AEA20 - .4byte sub_80AEA30 - .4byte sub_80AC6D0 - .4byte sub_80AC734 - .4byte sub_80AC704 - .4byte sub_80AC818 - .4byte sub_80AD4E8 - .4byte sub_80AD584 - .4byte sub_80AD554 - .4byte sub_80AD910 - .4byte sub_80AEA34 - .4byte sub_80AEAB8 - .4byte sub_80AEA88 - .4byte sub_80AEB2C - - .align 2 -gUnknown_0854C240:: @ 854C240 - .4byte sub_80AB3A8 - .4byte sub_80AB434 - .4byte nullsub_94 - .4byte nullsub_94 - - .align 2 -gUnknown_0854C250:: @ 854C250 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01 - - .align 2 -gUnknown_0854C270:: @ 854C270 - .incbin "graphics/weather/0.gbapal" - - .align 2 -gUnknown_0854C290:: @ 854C290 - .incbin "graphics/weather/1.gbapal" - - .align 2 -gUnknown_0854C2B0:: @ 854C2B0 - .incbin "graphics/weather/2.gbapal" - - .align 2 -gWeatherFog2Tiles:: @ 854C2D0 - .incbin "graphics/weather/fog2.4bpp" - - .align 2 -gWeatherFog1Tiles:: @ 854CAD0 - .incbin "graphics/weather/fog1.4bpp" - - .align 2 -gWeatherCloudTiles:: @ 854D2D0 - .incbin "graphics/weather/cloud.4bpp" - - .align 2 -gWeatherSnow1Tiles:: @ 854DAD0 - .incbin "graphics/weather/snow0.4bpp" - - .align 2 -gWeatherSnow2Tiles:: @ 854DAF0 - .incbin "graphics/weather/snow1.4bpp" - - .align 2 -gWeatherBubbleTiles:: @ 854DB10 - .incbin "graphics/weather/bubble.4bpp" - - .align 2 -gWeatherAshTiles:: @ 854DB50 - .incbin "graphics/weather/ash.4bpp" - - .align 2 -gWeatherRainTiles:: @ 854EB50 - .incbin "graphics/weather/rain.4bpp" - - .align 2 -gWeatherSandstormTiles:: @ 854F150 - .incbin "graphics/weather/sandstorm.4bpp" - - .align 1 -gUnknown_0854FB50:: @ 854FB50 - .2byte 0x0000, 0x0042, 0x0005, 0x0049, 0x000a, 0x004e - - .align 2 -sCloudSpriteSheet:: @ 854FB5C - obj_tiles gWeatherCloudTiles, 0x0800, 0x1200 - - .align 2 -gOamData_854FB64:: @ 854FB64 - .2byte 0x0400, 0xc000, 0x0c00, 0x0000 - - .align 2 -gSpriteAnim_854FB6C:: @ 854FB6C - .2byte 0x0000, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_854FB74:: @ 854FB74 - .4byte gSpriteAnim_854FB6C - - .align 2 -sCloudSpriteTemplate:: @ 854FB78 - spr_template 0x1200, 0x1201, gOamData_854FB64, gSpriteAnimTable_854FB74, NULL, gDummySpriteAffineAnimTable, sub_80AC6B4 - - .align 2 -gUnknown_0854FB90:: @ 854FB90 - .2byte 0x0000, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0040, 0x0090, 0x00e0, 0x0090, 0x0080, 0x0020, 0x0020, 0x0020, 0x00c0, 0x0020, 0x0060 - .2byte 0x0048, 0x0080, 0x0048, 0x0020, 0x0048, 0x00c0, 0x00d8, 0x0060, 0x00d8, 0x0000, 0x0068, 0x00a0, 0x0068, 0x0040, 0x0068, 0x00e0 - .2byte 0x0090, 0x0000, 0x0090, 0x00a0, 0x0090, 0x0040, 0x0020, 0x00e0, 0x0020, 0x0080, 0x0048, 0x0020, 0x0048, 0x00c0, 0x0030, 0x0060 - - .align 2 -gOamData_854FBF0:: @ 854FBF0 - .2byte 0x8000, 0x8000, 0x2400, 0x0000 - - .align 2 -gSpriteAnim_854FBF8:: @ 854FBF8 - .2byte 0x0000, 0x0010, 0xfffe, 0x0000 - - .align 2 -gSpriteAnim_854FC00:: @ 854FC00 - .2byte 0x0008, 0x0003, 0x0020, 0x0002, 0x0028, 0x0002, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_854FC10:: @ 854FC10 - .2byte 0x0008, 0x0003, 0x0010, 0x0003, 0x0018, 0x0004, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_854FC20:: @ 854FC20 - .4byte gSpriteAnim_854FBF8 - .4byte gSpriteAnim_854FC00 - .4byte gSpriteAnim_854FC10 - - .align 2 -gSpriteTemplate_854FC2C:: @ 854FC2C - spr_template 0x1206, 0x1200, gOamData_854FBF0, gSpriteAnimTable_854FC20, NULL, gDummySpriteAffineAnimTable, sub_80ACB84 - - .align 1 -gUnknown_0854FC44:: @ 854FC44 - .2byte 0xff98, 0x00d0, 0xff60, 0x0140 - - .align 1 -gUnknown_0854FC4C:: @ 854FC4C - .2byte 0x0012, 0x0007, 0x000c, 0x000a - - .align 2 -gUnknown_0854FC54:: @ 854FC54 - obj_tiles gWeatherRainTiles, 0x0600, 0x1206 - - .align 2 -gOamData_854FC5C:: @ 854FC5C - .2byte 0x0000, 0x0000, 0x0400, 0x0000 - - .align 2 -gUnknown_0854FC64:: @ 854FC64 - obj_frame_tiles gWeatherSnow1Tiles, 0x0020 - obj_frame_tiles gWeatherSnow2Tiles, 0x0020 - - .align 2 -gSpriteAnim_854FC74:: @ 854FC74 - .2byte 0x0000, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_854FC7C:: @ 854FC7C - .2byte 0x0001, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_854FC84:: @ 854FC84 - .4byte gSpriteAnim_854FC74 - .4byte gSpriteAnim_854FC7C - - .align 2 -gUnknown_0854FC8C:: @ 854FC8C - spr_template 0xffff, 0x1200, gOamData_854FC5C, gSpriteAnimTable_854FC84, gUnknown_0854FC64, gDummySpriteAffineAnimTable, sub_80AD30C - - .align 2 -gUnknown_0854FCA4:: @ 854FCA4 - .2byte 0x0000, 0x0006, 0x0006, 0x000c, 0x0012, 0x002a, 0x012c, 0x012c - - .align 2 -gOamData_854FCB4:: @ 854FCB4 - .2byte 0x0400, 0xc000, 0x0800, 0x0000 - - .align 2 -gSpriteAnim_854FCBC:: @ 854FCBC - .2byte 0x0000, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_854FCC4:: @ 854FCC4 - .2byte 0x0020, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_854FCCC:: @ 854FCCC - .2byte 0x0040, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_854FCD4:: @ 854FCD4 - .2byte 0x0060, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_854FCDC:: @ 854FCDC - .2byte 0x0080, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_854FCE4:: @ 854FCE4 - .2byte 0x00a0, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_854FCEC:: @ 854FCEC - .4byte gSpriteAnim_854FCBC - .4byte gSpriteAnim_854FCC4 - .4byte gSpriteAnim_854FCCC - .4byte gSpriteAnim_854FCD4 - .4byte gSpriteAnim_854FCDC - .4byte gSpriteAnim_854FCE4 - - .align 2 -gSpriteAffineAnim_854FD04:: @ 854FD04 - .2byte 0x0200, 0x0200, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnimTable_854FD14:: @ 854FD14 - .4byte gSpriteAffineAnim_854FD04 - - .align 2 -gSpriteTemplate_854FD18:: @ 854FD18 - spr_template 0x1201, 0x1200, gOamData_854FCB4, gSpriteAnimTable_854FCEC, NULL, gSpriteAffineAnimTable_854FD14, sub_80ADC4C - - .align 2 -gUnknown_0854FD30:: @ 854FD30 - obj_tiles gWeatherFog1Tiles, 0x0800, 0x1201 - - .align 2 -gUnknown_0854FD38:: @ 854FD38 - obj_tiles gWeatherAshTiles, 0x1000, 0x1202 - - .align 2 -gOamData_854FD40:: @ 854FD40 - .2byte 0x0400, 0xc000, 0xf400, 0x0000 - - .align 2 -gSpriteAnim_854FD48:: @ 854FD48 - .2byte 0x0000, 0x003c, 0x0040, 0x003c, 0xfffe, 0x0000 - - .align 2 -gSpriteAnimTable_854FD54:: @ 854FD54 - .4byte gSpriteAnim_854FD48 - - .align 2 -gSpriteTemplate_854FD58:: @ 854FD58 - spr_template 0x1202, 0x1200, gOamData_854FD40, gSpriteAnimTable_854FD54, NULL, gDummySpriteAffineAnimTable, sub_80AE068 - - .align 2 -gUnknown_0854FD70:: @ 854FD70 - obj_tiles gWeatherFog2Tiles, 0x0800, 0x1203 - - .align 2 -gOamData_854FD78:: @ 854FD78 - .2byte 0x0400, 0xc000, 0x0800, 0x0000 - - .align 2 -gSpriteAnim_854FD80:: @ 854FD80 - .2byte 0x0000, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_854FD88:: @ 854FD88 - .4byte gSpriteAnim_854FD80 - - .align 2 -gSpriteTemplate_854FD8C:: @ 854FD8C - spr_template 0x1203, 0x1200, gOamData_854FD78, gSpriteAnimTable_854FD88, NULL, gDummySpriteAffineAnimTable, sub_80AE3FC - - .align 2 -gOamData_854FDA4:: @ 854FDA4 - .2byte 0x0400, 0xc000, 0x0400, 0x0000 - - .align 2 -gSpriteAnim_854FDAC:: @ 854FDAC - .2byte 0x0000, 0x0003, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_854FDB4:: @ 854FDB4 - .2byte 0x0040, 0x0003, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_854FDBC:: @ 854FDBC - .4byte gSpriteAnim_854FDAC - .4byte gSpriteAnim_854FDB4 - - .align 2 -gSpriteTemplate_854FDC4:: @ 854FDC4 - spr_template 0x1204, 0x1201, gOamData_854FDA4, gSpriteAnimTable_854FDBC, NULL, gDummySpriteAffineAnimTable, sub_80AE8F8 - - .align 2 -gUnknown_0854FDDC:: @ 854FDDC - obj_tiles gWeatherSandstormTiles, 0x0a00, 0x1204 - - .align 1 -gUnknown_0854FDE4:: @ 854FDE4 - .2byte 0x0000, 0x0078, 0x0050, 0x00a0, 0x0028, 0x0000 - -gUnknown_0854FDF0:: @ 854FDF0 - .byte 0x28, 0x5a, 0x3c, 0x5a, 0x02, 0x3c, 0x28, 0x1e - - .align 2 -gUnknown_0854FDF8:: @ 854FDF8 - obj_tiles gWeatherBubbleTiles, 0x0040, 0x1205 - - .align 1 -gUnknown_0854FE00:: @ 854FE00 - .2byte 0x0078, 0x00a0, 0x0178, 0x00a0, 0x0028, 0x008c, 0x0128, 0x008c, 0x00b4, 0x0082, 0x01b4, 0x0082, 0x003c, 0x00a0, 0x01b4, 0x00a0 - .2byte 0x00dc, 0x00b4, 0x01dc, 0x00b4, 0x000a, 0x005a, 0x010a, 0x005a, 0x0100, 0x00a0 - - .align 2 -gSpriteAnim_854FE34:: @ 854FE34 - .2byte 0x0000, 0x0010, 0x0001, 0x0010, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_854FE40:: @ 854FE40 - .4byte gSpriteAnim_854FE34 - - .align 2 -gSpriteTemplate_854FE44:: @ 854FE44 - spr_template 0x1205, 0x1200, gUnknown_08524904, gSpriteAnimTable_854FE40, NULL, gDummySpriteAffineAnimTable, sub_80AEC34 - -gUnknown_0854FE5C:: @ 854FE5C - .byte 0x02, 0x03, 0x05, 0x03 - -gUnknown_0854FE60:: @ 854FE60 - .byte 0x02, 0x02, 0x03, 0x02 - - .align 1 -gUnknown_0854FE64:: @ 854FE64 - .2byte 0x00c8, 0x0048, 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0000, 0x0000 - - .align 2 -gMaxFlashLevel:: @ 854FE78 - .4byte 0x00000008 - - .align 2 -gUnknown_0854FE7C:: @ 854FE7C - .4byte 0x04000040, 0xa2600001, 0x00000001 - diff --git a/data/field_screen_2.s b/data/field_screen_2.s new file mode 100644 index 000000000..105018014 --- /dev/null +++ b/data/field_screen_2.s @@ -0,0 +1,17 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 1 +gUnknown_0854FE64:: @ 854FE64 + .2byte 0x00c8, 0x0048, 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0000, 0x0000 + + .align 2 +gMaxFlashLevel:: @ 854FE78 + .4byte 0x00000008 + + .align 2 +gUnknown_0854FE7C:: @ 854FE7C + .4byte 0x04000040, 0xa2600001, 0x00000001 + diff --git a/data/field_weather.s b/data/field_weather.s new file mode 100644 index 000000000..2121ecf23 --- /dev/null +++ b/data/field_weather.s @@ -0,0 +1,103 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_0854014C:: @ 854014C + .incbin "graphics/misc/sunny_day/0.gbapal" + .incbin "graphics/misc/sunny_day/1.gbapal" + .incbin "graphics/misc/sunny_day/2.gbapal" + .incbin "graphics/misc/sunny_day/3.gbapal" + .incbin "graphics/misc/sunny_day/4.gbapal" + .incbin "graphics/misc/sunny_day/5.gbapal" + .incbin "graphics/misc/sunny_day/6.gbapal" + .incbin "graphics/misc/sunny_day/7.gbapal" + .incbin "graphics/misc/sunny_day/8.gbapal" + .incbin "graphics/misc/sunny_day/9.gbapal" + .incbin "graphics/misc/sunny_day/10.gbapal" + .incbin "graphics/misc/sunny_day/11.gbapal" + .incbin "graphics/misc/sunny_day/12.gbapal" + .incbin "graphics/misc/sunny_day/13.gbapal" + .incbin "graphics/misc/sunny_day/14.gbapal" + .incbin "graphics/misc/sunny_day/15.gbapal" + .incbin "graphics/misc/sunny_day/16.gbapal" + .incbin "graphics/misc/sunny_day/17.gbapal" + .incbin "graphics/misc/sunny_day/18.gbapal" + .incbin "graphics/misc/sunny_day/19.gbapal" + .incbin "graphics/misc/sunny_day/20.gbapal" + .incbin "graphics/misc/sunny_day/21.gbapal" + .incbin "graphics/misc/sunny_day/22.gbapal" + .incbin "graphics/misc/sunny_day/23.gbapal" + .incbin "graphics/misc/sunny_day/24.gbapal" + .incbin "graphics/misc/sunny_day/25.gbapal" + .incbin "graphics/misc/sunny_day/26.gbapal" + .incbin "graphics/misc/sunny_day/27.gbapal" + .incbin "graphics/misc/sunny_day/28.gbapal" + .incbin "graphics/misc/sunny_day/29.gbapal" + .incbin "graphics/misc/sunny_day/30.gbapal" + .incbin "graphics/misc/sunny_day/31.gbapal" + .incbin "graphics/misc/sunny_day/32.gbapal" + .incbin "graphics/misc/sunny_day/33.gbapal" + .incbin "graphics/misc/sunny_day/34.gbapal" + .incbin "graphics/misc/sunny_day/35.gbapal" + .incbin "graphics/misc/sunny_day/36.gbapal" + .incbin "graphics/misc/sunny_day/37.gbapal" + .incbin "graphics/misc/sunny_day/38.gbapal" + .incbin "graphics/misc/sunny_day/39.gbapal" + .incbin "graphics/misc/sunny_day/40.gbapal" + .incbin "graphics/misc/sunny_day/41.gbapal" + .incbin "graphics/misc/sunny_day/42.gbapal" + .incbin "graphics/misc/sunny_day/43.gbapal" + .incbin "graphics/misc/sunny_day/44.gbapal" + .incbin "graphics/misc/sunny_day/45.gbapal" + .incbin "graphics/misc/sunny_day/46.gbapal" + .incbin "graphics/misc/sunny_day/47.gbapal" + .incbin "graphics/misc/sunny_day/48.gbapal" + .incbin "graphics/misc/sunny_day/49.gbapal" + .incbin "graphics/misc/sunny_day/50.gbapal" + .incbin "graphics/misc/sunny_day/51.gbapal" + .incbin "graphics/misc/sunny_day/52.gbapal" + .incbin "graphics/misc/sunny_day/53.gbapal" + .incbin "graphics/misc/sunny_day/54.gbapal" + .incbin "graphics/misc/sunny_day/55.gbapal" + .incbin "graphics/misc/sunny_day/56.gbapal" + .incbin "graphics/misc/sunny_day/57.gbapal" + .incbin "graphics/misc/sunny_day/58.gbapal" + .incbin "graphics/misc/sunny_day/59.gbapal" + .incbin "graphics/misc/sunny_day/60.gbapal" + .incbin "graphics/misc/sunny_day/61.gbapal" + .incbin "graphics/misc/sunny_day/62.gbapal" + .incbin "graphics/misc/sunny_day/63.gbapal" + .incbin "graphics/misc/sunny_day/64.gbapal" + .incbin "graphics/misc/sunny_day/65.gbapal" + .incbin "graphics/misc/sunny_day/66.gbapal" + .incbin "graphics/misc/sunny_day/67.gbapal" + .incbin "graphics/misc/sunny_day/68.gbapal" + .incbin "graphics/misc/sunny_day/69.gbapal" + .incbin "graphics/misc/sunny_day/70.gbapal" + .incbin "graphics/misc/sunny_day/71.gbapal" + .incbin "graphics/misc/sunny_day/72.gbapal" + .incbin "graphics/misc/sunny_day/73.gbapal" + .incbin "graphics/misc/sunny_day/74.gbapal" + .incbin "graphics/misc/sunny_day/75.gbapal" + .incbin "graphics/misc/sunny_day/76.gbapal" + .incbin "graphics/misc/sunny_day/77.gbapal" + .incbin "graphics/misc/sunny_day/78.gbapal" + .incbin "graphics/misc/sunny_day/79.gbapal" + .incbin "graphics/misc/sunny_day/80.gbapal" + .incbin "graphics/misc/sunny_day/81.gbapal" + .incbin "graphics/misc/sunny_day/82.gbapal" + .incbin "graphics/misc/sunny_day/83.gbapal" + .incbin "graphics/misc/sunny_day/84.gbapal" + .incbin "graphics/misc/sunny_day/85.gbapal" + .incbin "graphics/misc/sunny_day/86.gbapal" + .incbin "graphics/misc/sunny_day/87.gbapal" + .incbin "graphics/misc/sunny_day/88.gbapal" + .incbin "graphics/misc/sunny_day/89.gbapal" + .incbin "graphics/misc/sunny_day/90.gbapal" + .incbin "graphics/misc/sunny_day/91.gbapal" + .incbin "graphics/misc/sunny_day/92.gbapal" + .incbin "graphics/misc/sunny_day/93.gbapal" + .incbin "graphics/misc/sunny_day/94.gbapal" + .incbin "graphics/misc/sunny_day/95.gbapal" diff --git a/include/field_weather.h b/include/field_weather.h index a48361b8a..d4bc85afd 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -4,7 +4,8 @@ #include "sprite.h" // Controls how the weather should be changing the screen palettes. -enum { +enum +{ WEATHER_PAL_STATE_CHANGING_WEATHER, WEATHER_PAL_STATE_SCREEN_FADING_IN, WEATHER_PAL_STATE_SCREEN_FADING_OUT, @@ -38,11 +39,11 @@ struct Weather u8 gammaStepDelay; u8 gammaStepFrameCounter; u16 fadeDestColor; - u8 palProcessingState; - u8 fadeScreenCounter; - bool8 readyForInit; - u8 taskId; - u8 unknown_6CA; + /*0x6C6*/ u8 palProcessingState; + /*0x6C7*/ u8 fadeScreenCounter; + /*0x6C8*/ bool8 readyForInit; + /*0x6C9*/ u8 taskId; + /*0x6CA*/ u8 unknown_6CA; u8 unknown_6CB; u16 initStep; u16 finishStep; @@ -168,6 +169,7 @@ void ResetDroughtWeatherPaletteLoading(void); bool8 LoadDroughtWeatherPalettes(void); u8 GetCurrentWeather(void); void LoadCustomWeatherSpritePalette(const u16 *palette); +void SetWeatherScreenFadeOut(void); extern struct Weather gWeather; diff --git a/include/global.h b/include/global.h index cc8df049f..83eb93eec 100644 --- a/include/global.h +++ b/include/global.h @@ -881,7 +881,7 @@ struct SaveBlock1 /*0x24*/ struct WarpData warp4; /*0x2C*/ u16 savedMusic; /*0x2E*/ u8 weather; - /*0x2F*/ u8 filler_2F; + /*0x2F*/ u8 weatherCycleStage; /*0x30*/ u8 flashLevel; /*0x32*/ u16 mapLayoutId; /*0x34*/ u16 mapView[0x100]; diff --git a/ld_script.txt b/ld_script.txt index ddafe6ecf..7fe0e5f47 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -113,6 +113,8 @@ SECTIONS { src/reshow_battle_screen.o(.text); src/battle_anim_80A9C70.o(.text); src/title_screen.o(.text); + src/field_weather.o(.text); + src/field_weather_effect.o(.text); asm/field_screen.o(.text); src/battle_setup.o(.text); src/cable_club.o(.text); @@ -444,7 +446,11 @@ SECTIONS { data/battle_anim_80A9C70.o(.rodata); src/battle_anim_80A9C70.o(.rodata); src/title_screen.o(.rodata); + data/field_weather.o(.rodata); + src/field_weather.o(.rodata); data/field_screen.o(.rodata); + src/field_weather_effect.o(.rodata); + data/field_screen_2.o(.rodata); src/battle_setup.o(.rodata); src/cable_club.o(.rodata); src/trainer_see.o(.rodata); diff --git a/src/battle_transition.c b/src/battle_transition.c index 94b9e78f9..aa8877148 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -59,7 +59,7 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); extern const struct OamData gEventObjectBaseOam_32x32; -extern void sub_80AC3D0(void); +extern void SetWeatherScreenFadeOut(void); // this file's functions static void LaunchBattleTransitionTask(u8 transitionId); @@ -981,7 +981,7 @@ static void Task_BattleTransitionMain(u8 taskId) static bool8 Transition_Phase1(struct Task *task) { - sub_80AC3D0(); + SetWeatherScreenFadeOut(); CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); if (sPhase1_Tasks[task->tTransitionId] != NULL) { diff --git a/src/battle_util.c b/src/battle_util.c index 4c9ef75d9..94aaea66c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -23,7 +23,7 @@ #include "link.h" #include "berry.h" -extern u8 weather_get_current(void); +extern u8 GetCurrentWeather(void); // rom const data static const u16 sSoundMovesTable[] = @@ -1827,7 +1827,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA case ABILITYEFFECT_SWITCH_IN_WEATHER: if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) { - switch (weather_get_current()) + switch (GetCurrentWeather()) { case 3: case 5: @@ -1862,7 +1862,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } if (effect) { - gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current(); + gBattleCommunication[MULTISTRING_CHOOSER] = GetCurrentWeather(); BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts); } break; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 4b7ee9a61..28386528a 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -60,7 +60,7 @@ extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_NickHatchPrompt[]; -extern void play_some_sound(void); +extern void PlayRainSoundEffect(void); extern u16 sub_80D22D0(void); extern u8 CountPartyAliveNonEggMonsExcept(u8); @@ -581,7 +581,7 @@ static void Task_EggHatchPlayBGM(u8 taskID) if (gTasks[taskID].data[0] == 0) { StopMapMusic(); - play_some_sound(); + PlayRainSoundEffect(); } if (gTasks[taskID].data[0] == 1) PlayBGM(MUS_ME_SHINKA); diff --git a/src/field_screen.c b/src/field_screen.c deleted file mode 100644 index 2d33d237f..000000000 --- a/src/field_screen.c +++ /dev/null @@ -1,15 +0,0 @@ - -// Includes -#include "global.h" - -// Static type declarations - -// Static RAM declarations -IWRAM_DATA u8 *gUnknown_03000F50; -IWRAM_DATA u32 filler_03000f54; - -// Static ROM declarations - -// .rodata - -// .text diff --git a/src/field_weather.c b/src/field_weather.c new file mode 100644 index 000000000..0be584d51 --- /dev/null +++ b/src/field_weather.c @@ -0,0 +1,1152 @@ +#include "global.h" +#include "constants/songs.h" +#include "constants/weather.h" +#include "constants/rgb.h" +#include "util.h" +#include "event_object_movement.h" +#include "field_weather.h" +#include "main.h" +#include "menu.h" +#include "palette.h" +#include "random.h" +#include "script.h" +#include "start_menu.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "trig.h" +#include "gpu_regs.h" + +#define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) + +enum +{ + GAMMA_NONE, + GAMMA_NORMAL, + GAMMA_ALT, +}; + +struct RGBColor +{ + u16 r:5; + u16 g:5; + u16 b:5; +}; + +struct WeatherPaletteData +{ + u16 gammaShiftColors[8][0x1000]; // 0x1000 is the number of bytes that make up all palettes. +}; + +struct WeatherCallbacks +{ + void (*initVars)(void); + void (*main)(void); + void (*initAll)(void); + bool8 (*finish)(void); +}; + +// This file's functions. +/*static*/ bool8 LightenSpritePaletteInFog(u8); +/*static*/ void BuildGammaShiftTables(void); +/*static*/ void UpdateWeatherGammaShift(void); +/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex); +/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor); +/*static*/ void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor); +/*static*/ void ApplyFogBlend(u8 blendCoeff, u16 blendColor); +/*static*/ bool8 FadeInScreen_RainShowShade(void); +/*static*/ bool8 FadeInScreen_Drought(void); +/*static*/ bool8 FadeInScreen_Fog1(void); +/*static*/ void FadeInScreenWithWeather(void); +/*static*/ void DoNothing(void); +void None_Init(void); +void None_Main(void); +bool8 None_Finish(void); +void Clouds_InitVars(void); +void Clouds_Main(void); +void Clouds_InitAll(void); +bool8 Clouds_Finish(void); +void Weather2_InitVars(void); +void Weather2_Main(void); +void Weather2_InitAll(void); +bool8 Weather2_Finish(void); +void LightRain_InitVars(void); +void LightRain_Main(void); +void LightRain_InitAll(void); +bool8 LightRain_Finish(void); +void Snow_InitVars(void); +void Snow_Main(void); +void Snow_InitAll(void); +bool8 Snow_Finish(void); +void MedRain_InitVars(void); +void Rain_Main(void); +void MedRain_InitAll(void); +bool8 Rain_Finish(void); +void Fog1_InitVars(void); +void Fog1_Main(void); +void Fog1_InitAll(void); +bool8 Fog1_Finish(void); +void Ash_InitVars(void); +void Ash_Main(void); +void Ash_InitAll(void); +bool8 Ash_Finish(void); +void Sandstorm_InitVars(void); +void Sandstorm_Main(void); +void Sandstorm_InitAll(void); +bool8 Sandstorm_Finish(void); +void Fog2_InitVars(void); +void Fog2_Main(void); +void Fog2_InitAll(void); +bool8 Fog2_Finish(void); +void Fog1_InitVars(void); +void Fog1_Main(void); +void Fog1_InitAll(void); +bool8 Fog1_Finish(void); +void Shade_InitVars(void); +void Shade_Main(void); +void Shade_InitAll(void); +bool8 Shade_Finish(void); +void Drought_InitVars(void); +void Drought_Main(void); +void Drought_InitAll(void); +bool8 Drought_Finish(void); +void HeavyRain_InitVars(void); +void Rain_Main(void); +void HeavyRain_InitAll(void); +bool8 Rain_Finish(void); +void Bubbles_InitVars(void); +void Bubbles_Main(void); +void Bubbles_InitAll(void); +bool8 Bubbles_Finish(void); + +// Const rom data + +// This is a pointer to gWeather. All code in this file accesses gWeather directly, +// while code in other field weather files accesses gWeather through this pointer. +// This is likely the result of compiler optimization, since using the pointer in +// this file produces the same result as accessing gWeather directly. +struct Weather *const gWeatherPtr = &gWeather; + +/*static*/ const struct WeatherCallbacks sWeatherFuncs[] = +{ + {None_Init, None_Main, None_Init, None_Finish}, + {Clouds_InitVars, Clouds_Main, Clouds_InitAll, Clouds_Finish}, + {Weather2_InitVars, Weather2_Main, Weather2_InitAll, Weather2_Finish}, + {LightRain_InitVars, LightRain_Main, LightRain_InitAll, LightRain_Finish}, + {Snow_InitVars, Snow_Main, Snow_InitAll, Snow_Finish}, + {MedRain_InitVars, Rain_Main, MedRain_InitAll, Rain_Finish}, + {Fog1_InitVars, Fog1_Main, Fog1_InitAll, Fog1_Finish}, + {Ash_InitVars, Ash_Main, Ash_InitAll, Ash_Finish}, + {Sandstorm_InitVars, Sandstorm_Main, Sandstorm_InitAll, Sandstorm_Finish}, + {Fog2_InitVars, Fog2_Main, Fog2_InitAll, Fog2_Finish}, + {Fog1_InitVars, Fog1_Main, Fog1_InitAll, Fog1_Finish}, + {Shade_InitVars, Shade_Main, Shade_InitAll, Shade_Finish}, + {Drought_InitVars, Drought_Main, Drought_InitAll, Drought_Finish}, + {HeavyRain_InitVars, Rain_Main, HeavyRain_InitAll, Rain_Finish}, + {Bubbles_InitVars, Bubbles_Main, Bubbles_InitAll, Bubbles_Finish}, +}; + +void (*const gWeatherPalStateFuncs[])(void) = +{ + UpdateWeatherGammaShift, // WEATHER_PAL_STATE_CHANGING_WEATHER + FadeInScreenWithWeather, // WEATHER_PAL_STATE_SCREEN_FADING_IN + DoNothing, // WEATHER_PAL_STATE_SCREEN_FADING_OUT + DoNothing, // WEATHER_PAL_STATE_IDLE +}; + +// This table specifies which of the gamma shift tables should be +// applied to each of the background and sprite palettes. +/*static*/ const u8 sBasePaletteGammaTypes[32] = +{ + // background palettes + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NONE, + GAMMA_NONE, + // sprite palettes + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, +}; + + +// EWRAM +EWRAM_DATA struct Weather gWeather = {0}; +EWRAM_DATA u8 gFieldEffectPaletteGammaTypes[32] = {0}; + +// IWRAM bss +IWRAM_DATA const u8 *sPaletteGammaTypes; +IWRAM_DATA u32 filler_03000f54; + +// const +extern const u16 gUnknown_083970E8[]; +extern const u16 gUnknown_0854014C[][4096]; + +// code +void StartWeather(void) +{ + if (!FuncIsActiveTask(Task_WeatherMain)) + { + u8 index = AllocSpritePalette(0x1200); + CpuCopy32(gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32); + BuildGammaShiftTables(); + gWeather.altGammaSpritePalIndex = index; + gWeather.weatherPicSpritePalIndex = AllocSpritePalette(0x1201); + gWeather.rainSpriteCount = 0; + gWeather.unknown_6D8 = 0; + gWeather.cloudSpritesCreated = 0; + gWeather.snowflakeSpriteCount = 0; + gWeather.ashSpritesCreated = 0; + gWeather.fog1SpritesCreated = 0; + gWeather.fog2SpritesCreated = 0; + gWeather.sandstormSprites1Created = 0; + gWeather.sandstormSprites2Created = 0; + gWeather.unknown_72E = 0; + gWeather.lightenedFogSpritePalsCount = 0; + Weather_SetBlendCoeffs(16, 0); + gWeather.currWeather = 0; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeather.readyForInit = FALSE; + gWeather.weatherChangeComplete = TRUE; + gWeather.taskId = CreateTask(Task_WeatherInit, 80); + } +} + +void ChangeWeather(u8 weather) +{ + if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY) + { + PlayRainSoundEffect(); + } + + if (gWeather.nextWeather != weather && gWeather.currWeather == weather) + { + sWeatherFuncs[weather].initVars(); + } + + gWeather.weatherChangeComplete = FALSE; + gWeather.nextWeather = weather; + gWeather.finishStep = 0; +} + +void sub_80AB104(u8 weather) +{ + PlayRainSoundEffect(); + gWeather.currWeather = weather; + gWeather.nextWeather = weather; +} + +void sub_80AB130(u8 weather) +{ + PlayRainSoundEffect(); + gWeather.currWeather = weather; + gWeather.nextWeather = weather; + gWeather.readyForInit = TRUE; +} + +void Task_WeatherInit(u8 taskId) +{ + // Waits until it's ok to initialize weather. + // When the screen fades in, this is set to TRUE. + if (gWeather.readyForInit) + { + sWeatherFuncs[gWeather.currWeather].initAll(); + gTasks[taskId].func = Task_WeatherMain; + } +} + +void Task_WeatherMain(u8 taskId) +{ + if (gWeather.currWeather != gWeather.nextWeather) + { + if (!sWeatherFuncs[gWeather.currWeather].finish() && gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + { + // Finished cleaning up previous weather. Now transition to next weather. + sWeatherFuncs[gWeather.nextWeather].initVars(); + gWeather.gammaStepFrameCounter = 0; + gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; + gWeather.currWeather = gWeather.nextWeather; + gWeather.weatherChangeComplete = TRUE; + } + } + else + { + sWeatherFuncs[gWeather.currWeather].main(); + } + + gWeatherPalStateFuncs[gWeather.palProcessingState](); +} + +void None_Init(void) +{ + gWeather.gammaTargetIndex = 0; + gWeather.gammaStepDelay = 0; +} + +void None_Main(void) +{ +} + +u8 None_Finish(void) +{ + return 0; +} + +// Builds two tables that contain gamma shifts for palette colors. +// It's unclear why the two tables aren't declared as const arrays, since +// this function always builds the same two tables. +/*static*/ void BuildGammaShiftTables(void) +{ + u16 v0; + u8 (*v1)[32]; + u16 v2; + u16 v4; + u16 v5; + u16 v6; + u16 v9; + u32 v10; + u16 v11; + s16 dunno; + + sPaletteGammaTypes = sBasePaletteGammaTypes; + for (v0 = 0; v0 <= 1; v0++) + { + if (v0 == 0) + v1 = gWeather.gammaShifts; + else + v1 = gWeather.altGammaShifts; + + for (v2 = 0; v2 < 32; v2++) + { + v4 = v2 << 8; + if (v0 == 0) + v5 = (v2 << 8) / 16; + else + v5 = 0; + for (v6 = 0; v6 <= 2; v6++) + { + v4 = (v4 - v5); + v1[v6][v2] = v4 >> 8; + } + v9 = v4; + v10 = 0x1f00 - v4; + if ((0x1f00 - v4) < 0) + { + v10 += 0xf; + } + v11 = v10 >> 4; + if (v2 < 12) + { + for (; v6 < 19; v6++) + { + v4 += v11; + dunno = v4 - v9; + if (dunno > 0) + v4 -= (dunno + ((u16)dunno >> 15)) >> 1; + v1[v6][v2] = v4 >> 8; + if (v1[v6][v2] > 0x1f) + v1[v6][v2] = 0x1f; + } + } + else + { + for (; v6 < 19; v6++) + { + v4 += v11; + v1[v6][v2] = v4 >> 8; + if (v1[v6][v2] > 0x1f) + v1[v6][v2] = 0x1f; + } + } + } + } +} + +// When the weather is changing, it gradually updates the palettes +// towards the desired gamma shift. +/*static*/ void UpdateWeatherGammaShift(void) +{ + if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + { + if (gWeather.gammaIndex == gWeather.gammaTargetIndex) + { + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + else + { + if (++gWeather.gammaStepFrameCounter >= gWeather.gammaStepDelay) + { + gWeather.gammaStepFrameCounter = 0; + if (gWeather.gammaIndex < gWeather.gammaTargetIndex) + gWeather.gammaIndex++; + else + gWeather.gammaIndex--; + + ApplyGammaShift(0, 32, gWeather.gammaIndex); + } + } + } +} + +/*static*/ void FadeInScreenWithWeather(void) +{ + if (++gWeather.unknown_6CB > 1) + gWeather.unknown_6CA = 0; + + switch (gWeather.currWeather) + { + case WEATHER_RAIN_LIGHT: + case WEATHER_RAIN_MED: + case WEATHER_RAIN_HEAVY: + case WEATHER_SNOW: + case WEATHER_SHADE: + if (FadeInScreen_RainShowShade() == FALSE) + { + gWeather.gammaIndex = 3; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + break; + case WEATHER_DROUGHT: + if (FadeInScreen_Drought() == FALSE) + { + gWeather.gammaIndex = -6; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + break; + case WEATHER_FOG_1: + if (FadeInScreen_Fog1() == FALSE) + { + gWeather.gammaIndex = 0; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + break; + case WEATHER_ASH: + case WEATHER_SANDSTORM: + case WEATHER_FOG_2: + case WEATHER_FOG_3: + default: + if (!gPaletteFade.active) + { + gWeather.gammaIndex = gWeather.gammaTargetIndex; + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + } + break; + } +} + +bool8 FadeInScreen_RainShowShade(void) +{ + if (gWeather.fadeScreenCounter == 16) + return FALSE; + + if (++gWeather.fadeScreenCounter >= 16) + { + ApplyGammaShift(0, 32, 3); + gWeather.fadeScreenCounter = 16; + return FALSE; + } + + ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + return TRUE; +} + +bool8 FadeInScreen_Drought(void) +{ + if (gWeather.fadeScreenCounter == 16) + return FALSE; + + if (++gWeather.fadeScreenCounter >= 16) + { + ApplyGammaShift(0, 32, -6); + gWeather.fadeScreenCounter = 16; + return FALSE; + } + + ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + return TRUE; +} + +bool8 FadeInScreen_Fog1(void) +{ + if (gWeather.fadeScreenCounter == 16) + return FALSE; + + gWeather.fadeScreenCounter++; + ApplyFogBlend(16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + return TRUE; +} + +/*static*/ void DoNothing(void) +{ } + +/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) +{ + u16 curPalIndex; + u16 palOffset; + u8 *gammaTable; + u16 i; + + if (gammaIndex > 0) + { + gammaIndex--; + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + curPalIndex = startPalIndex; + + // Loop through the speficied palette range and apply necessary gamma shifts to the colors. + while (curPalIndex < numPalettes) + { + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) + { + // No palette change. + CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16)); + palOffset += 16; + } + else + { + u8 r, g, b; + + if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeather.altGammaSpritePalIndex) + gammaTable = gWeather.altGammaShifts[gammaIndex]; + else + gammaTable = gWeather.gammaShifts[gammaIndex]; + + for (i = 0; i < 16; i++) + { + // Apply gamma shift to the original color. + struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + r = gammaTable[baseColor.r]; + g = gammaTable[baseColor.g]; + b = gammaTable[baseColor.b]; + gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r; + } + } + + curPalIndex++; + } + } + else if (gammaIndex < 0) + { + // A negative gammIndex value means that the blending will come from the special Drought weather's palette tables. + gammaIndex = -gammaIndex - 1; + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + curPalIndex = startPalIndex; + + while (curPalIndex < numPalettes) + { + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) + { + // No palette change. + CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16)); + palOffset += 16; + } + else + { + for (i = 0; i < 16; i++) + { + gPlttBufferFaded[palOffset] = gUnknown_0854014C[gammaIndex][MACRO1(gPlttBufferUnfaded[palOffset])]; + palOffset++; + } + } + + curPalIndex++; + } + } + else + { + // No palette blending. + CpuFastCopy(gPlttBufferUnfaded + startPalIndex * 16, gPlttBufferFaded + startPalIndex * 16, numPalettes * 16 * sizeof(u16)); + } +} + +/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) +{ + u16 palOffset; + u16 curPalIndex; + u16 i; + struct RGBColor color = *(struct RGBColor *)&blendColor; + u8 rBlend = color.r; + u8 gBlend = color.g; + u8 bBlend = color.b; + + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + gammaIndex--; + curPalIndex = startPalIndex; + + while (curPalIndex < numPalettes) + { + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) + { + // No gamma shift. Simply blend the colors. + BlendPalette(palOffset, 16, blendCoeff, blendColor); + palOffset += 16; + } + else + { + u8 *gammaTable; + + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NORMAL) + gammaTable = gWeather.gammaShifts[gammaIndex]; + else + gammaTable = gWeather.altGammaShifts[gammaIndex]; + + for (i = 0; i < 16; i++) + { + struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + u8 r = gammaTable[baseColor.r]; + u8 g = gammaTable[baseColor.g]; + u8 b = gammaTable[baseColor.b]; + + // Apply gamma shift and target blend color to the original color. + r += ((rBlend - r) * blendCoeff) >> 4; + g += ((gBlend - g) * blendCoeff) >> 4; + b += ((bBlend - b) * blendCoeff) >> 4; + gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r; + } + } + + curPalIndex++; + } +} + +void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor) +{ + struct RGBColor color; + u8 rBlend; + u8 gBlend; + u8 bBlend; + u16 curPalIndex; + u16 palOffset; + u16 i; + + gammaIndex = -gammaIndex - 1; + color = *(struct RGBColor *)&blendColor; + rBlend = color.r; + gBlend = color.g; + bBlend = color.b; + palOffset = 0; + for (curPalIndex = 0; curPalIndex < 32; curPalIndex++) + { + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) + { + // No gamma shift. Simply blend the colors. + BlendPalette(palOffset, 16, blendCoeff, blendColor); + palOffset += 16; + } + else + { + for (i = 0; i < 16; i++) + { + u32 offset; + struct RGBColor color1; + struct RGBColor color2; + u8 r1, g1, b1; + u8 r2, g2, b2; + + color1 = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + r1 = color1.r; + g1 = color1.g; + b1 = color1.b; + + offset = ((b1 & 0x1E) << 7) | ((g1 & 0x1E) << 3) | ((r1 & 0x1E) >> 1); + color2 = *(struct RGBColor *)&gUnknown_0854014C[gammaIndex][offset]; + r2 = color2.r; + g2 = color2.g; + b2 = color2.b; + + r2 += ((rBlend - r2) * blendCoeff) >> 4; + g2 += ((gBlend - g2) * blendCoeff) >> 4; + b2 += ((bBlend - b2) * blendCoeff) >> 4; + + gPlttBufferFaded[palOffset++] = (b2 << 10) | (g2 << 5) | r2; + } + } + } +} + +void ApplyFogBlend(u8 blendCoeff, u16 blendColor) +{ + struct RGBColor color; + u8 rBlend; + u8 gBlend; + u8 bBlend; + u16 curPalIndex; + + BlendPalette(0, 256, blendCoeff, blendColor); + color = *(struct RGBColor *)&blendColor; + rBlend = color.r; + gBlend = color.g; + bBlend = color.b; + + for (curPalIndex = 16; curPalIndex < 32; curPalIndex++) + { + if (LightenSpritePaletteInFog(curPalIndex)) + { + u16 palEnd = (curPalIndex + 1) * 16; + u16 palOffset = curPalIndex * 16; + + while (palOffset < palEnd) + { + struct RGBColor color = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + u8 r = color.r; + u8 g = color.g; + u8 b = color.b; + + r += ((28 - r) * 3) >> 2; + g += ((31 - g) * 3) >> 2; + b += ((28 - b) * 3) >> 2; + + r += ((rBlend - r) * blendCoeff) >> 4; + g += ((gBlend - g) * blendCoeff) >> 4; + b += ((bBlend - b) * blendCoeff) >> 4; + + gPlttBufferFaded[palOffset] = (b << 10) | (g << 5) | r; + palOffset++; + } + } + else + { + BlendPalette(curPalIndex * 16, 16, blendCoeff, blendColor); + } + } +} + +/*static*/ void MarkFogSpritePalToLighten(u8 paletteIndex) +{ + if (gWeather.lightenedFogSpritePalsCount < 6) + { + gWeather.lightenedFogSpritePals[gWeather.lightenedFogSpritePalsCount] = paletteIndex; + gWeather.lightenedFogSpritePalsCount++; + } +} + +/*static*/ bool8 LightenSpritePaletteInFog(u8 paletteIndex) +{ + u16 i; + + for (i = 0; i < gWeather.lightenedFogSpritePalsCount; i++) + { + if (gWeather.lightenedFogSpritePals[i] == paletteIndex) + return TRUE; + } + + return FALSE; +} + +void sub_80ABC48(s8 gammaIndex) +{ + if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE) + { + ApplyGammaShift(0, 32, gammaIndex); + gWeather.gammaIndex = gammaIndex; + } +} + +void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay) +{ + if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE) + { + gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; + gWeather.gammaIndex = gammaIndex; + gWeather.gammaTargetIndex = gammaTargetIndex; + gWeather.gammaStepFrameCounter = 0; + gWeather.gammaStepDelay = gammaStepDelay; + sub_80ABC48(gammaIndex); + } +} + +void FadeScreen(u8 mode, s8 delay) +{ + u32 fadeColor; + bool8 fadeOut; + bool8 useWeatherPal; + + switch (mode) + { + case FADE_FROM_BLACK: + fadeColor = 0; + fadeOut = FALSE; + break; + case FADE_FROM_WHITE: + fadeColor = 0xFFFF; + fadeOut = FALSE; + break; + case FADE_TO_BLACK: + fadeColor = 0; + fadeOut = TRUE; + break; + case FADE_TO_WHITE: + fadeColor = 0xFFFF; + fadeOut = TRUE; + break; + default: + return; + } + + switch (gWeather.currWeather) + { + case WEATHER_RAIN_LIGHT: + case WEATHER_RAIN_MED: + case WEATHER_RAIN_HEAVY: + case WEATHER_SNOW: + case WEATHER_FOG_1: + case WEATHER_SHADE: + case WEATHER_DROUGHT: + useWeatherPal = TRUE; + break; + default: + useWeatherPal = FALSE; + break; + } + + if (fadeOut) + { + if (useWeatherPal) + CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); + + BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor); + gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; + } + else + { + gWeather.fadeDestColor = fadeColor; + if (useWeatherPal) + gWeather.fadeScreenCounter = 0; + else + BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor); + + gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN; + gWeather.unknown_6CA = 1; + gWeather.unknown_6CB = 0; + Weather_SetBlendCoeffs(gWeather.currBlendEVA, gWeather.currBlendEVB); + gWeather.readyForInit = TRUE; + } +} + +bool8 IsWeatherNotFadingIn(void) +{ + return (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN); +} + +void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) +{ + u16 paletteIndex = 16 + spritePaletteIndex; + u16 i; + + switch (gWeather.palProcessingState) + { + case WEATHER_PAL_STATE_SCREEN_FADING_IN: + if (gWeather.unknown_6CA != 0) + { + if (gWeather.currWeather == WEATHER_FOG_1) + MarkFogSpritePalToLighten(paletteIndex); + paletteIndex *= 16; + for (i = 0; i < 16; i++) + gPlttBufferFaded[paletteIndex + i] = gWeather.fadeDestColor; + } + break; + case WEATHER_PAL_STATE_SCREEN_FADING_OUT: + paletteIndex *= 16; + CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, 32); + BlendPalette(paletteIndex, 16, gPaletteFade.y, gPaletteFade.blendColor); + break; + // WEATHER_PAL_STATE_CHANGING_WEATHER + // WEATHER_PAL_STATE_CHANGING_IDLE + default: + if (gWeather.currWeather != WEATHER_FOG_1) + { + ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex); + } + else + { + paletteIndex *= 16; + BlendPalette(paletteIndex, 16, 12, RGB(28, 31, 28)); + } + break; + } +} + +void ApplyWeatherGammaShiftToPal(u8 paletteIndex) +{ + ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex); +} + +u8 sub_80ABF20(void) +{ + if (gWeather.palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN) + return gWeather.unknown_6CA; + else + return 0; +} + +void LoadCustomWeatherSpritePalette(const u16 *palette) +{ + LoadPalette(palette, 0x100 + gWeather.weatherPicSpritePalIndex * 16, 32); + UpdateSpritePaletteWithWeather(gWeather.weatherPicSpritePalIndex); +} + +void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1) +{ + *gammaIndexPtr = 0x20; + *a1 = 0x20; +} + +void ResetDroughtWeatherPaletteLoading(void) +{ + gWeather.loadDroughtPalsIndex = 1; + gWeather.loadDroughtPalsOffset = 1; +} + +bool8 LoadDroughtWeatherPalettes(void) +{ + if (gWeather.loadDroughtPalsIndex < 32) + { + LoadDroughtWeatherPalette(&gWeather.loadDroughtPalsIndex, &gWeather.loadDroughtPalsOffset); + if (gWeather.loadDroughtPalsIndex < 32) + return TRUE; + } + return FALSE; +} + +void sub_80ABFE0(s8 gammaIndex) +{ + sub_80ABC48(-gammaIndex - 1); +} + +void sub_80ABFF0(void) +{ + gWeather.unknown_73C = 0; + gWeather.unknown_740 = 0; + gWeather.unknown_742 = 0; + gWeather.unknown_73E = 0; +} + +void sub_80AC01C(void) +{ + switch (gWeather.unknown_742) + { + case 0: + if (++gWeather.unknown_740 > 5) + { + gWeather.unknown_740 = 0; + sub_80ABFE0(gWeather.unknown_73C++); + if (gWeather.unknown_73C > 5) + { + gWeather.unknown_73E = gWeather.unknown_73C; + gWeather.unknown_742 = 1; + gWeather.unknown_740 = 0x3C; + } + } + break; + case 1: + gWeather.unknown_740 = (gWeather.unknown_740 + 3) & 0x7F; + gWeather.unknown_73C = ((gSineTable[gWeather.unknown_740] - 1) >> 6) + 2; + if (gWeather.unknown_73C != gWeather.unknown_73E) + sub_80ABFE0(gWeather.unknown_73C); + gWeather.unknown_73E = gWeather.unknown_73C; + break; + case 2: + if (++gWeather.unknown_740 > 5) + { + gWeather.unknown_740 = 0; + sub_80ABFE0(--gWeather.unknown_73C); + if (gWeather.unknown_73C == 3) + gWeather.unknown_742 = 0; + } + break; + } +} + +void Weather_SetBlendCoeffs(u8 eva, u8 evb) +{ + gWeather.currBlendEVA = eva; + gWeather.currBlendEVB = evb; + gWeather.targetBlendEVA = eva; + gWeather.targetBlendEVB = evb; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(eva, evb)); +} + +void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay) +{ + gWeather.targetBlendEVA = eva; + gWeather.targetBlendEVB = evb; + gWeather.blendDelay = delay; + gWeather.blendFrameCounter = 0; + gWeather.blendUpdateCounter = 0; +} + +bool8 Weather_UpdateBlend(void) +{ + if (gWeather.currBlendEVA == gWeather.targetBlendEVA + && gWeather.currBlendEVB == gWeather.targetBlendEVB) + return TRUE; + + if (++gWeather.blendFrameCounter > gWeather.blendDelay) + { + gWeather.blendFrameCounter = 0; + gWeather.blendUpdateCounter++; + + // Update currBlendEVA and currBlendEVB on alternate frames + if (gWeather.blendUpdateCounter & 1) + { + if (gWeather.currBlendEVA < gWeather.targetBlendEVA) + gWeather.currBlendEVA++; + else if (gWeather.currBlendEVA > gWeather.targetBlendEVA) + gWeather.currBlendEVA--; + } + else + { + if (gWeather.currBlendEVB < gWeather.targetBlendEVB) + gWeather.currBlendEVB++; + else if (gWeather.currBlendEVB > gWeather.targetBlendEVB) + gWeather.currBlendEVB--; + } + } + + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gWeather.currBlendEVA, gWeather.currBlendEVB)); + + if (gWeather.currBlendEVA == gWeather.targetBlendEVA + && gWeather.currBlendEVB == gWeather.targetBlendEVB) + return TRUE; + + return FALSE; +} + +void sub_80AC274(u8 a) +{ + switch (a) + { + case 1: + SetWeather(WEATHER_CLOUDS); + break; + case 2: + SetWeather(WEATHER_SUNNY); + break; + case 3: + SetWeather(WEATHER_RAIN_LIGHT); + break; + case 4: + SetWeather(WEATHER_SNOW); + break; + case 5: + SetWeather(WEATHER_RAIN_MED); + break; + case 6: + SetWeather(WEATHER_FOG_1); + break; + case 7: + SetWeather(WEATHER_FOG_2); + break; + case 8: + SetWeather(WEATHER_ASH); + break; + case 9: + SetWeather(WEATHER_SANDSTORM); + break; + case 10: + SetWeather(WEATHER_SHADE); + break; + } +} + +u8 GetCurrentWeather(void) +{ + return gWeather.currWeather; +} + +void SetRainStrengthFromSoundEffect(u16 soundEffect) +{ + if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + { + switch (soundEffect) + { + case SE_T_KOAME: + gWeather.rainStrength = 0; + break; + case SE_T_OOAME: + gWeather.rainStrength = 1; + break; + case SE_T_AME: + gWeather.rainStrength = 2; + break; + default: + return; + } + + PlaySE(soundEffect); + } +} + +void PlayRainSoundEffect(void) +{ + if (IsSpecialSEPlaying()) + { + switch (gWeather.rainStrength) + { + case 0: + PlaySE(SE_T_KOAME_E); + break; + case 1: + PlaySE(SE_T_OOAME_E); + break; + case 2: + default: + PlaySE(SE_T_AME_E); + break; + } + } +} + +u8 IsWeatherChangeComplete(void) +{ + return gWeather.weatherChangeComplete; +} + +void SetWeatherScreenFadeOut(void) +{ + gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; +} + +void sub_80AC3E4(void) +{ + gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; +} + +void PreservePaletteInWeather(u8 preservedPalIndex) +{ + CpuCopy16(sBasePaletteGammaTypes, gFieldEffectPaletteGammaTypes, 32); + gFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE; + sPaletteGammaTypes = gFieldEffectPaletteGammaTypes; +} + +void ResetPreservedPalettesInWeather(void) +{ + sPaletteGammaTypes = sBasePaletteGammaTypes; +} diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c new file mode 100644 index 000000000..ad3e80cfa --- /dev/null +++ b/src/field_weather_effect.c @@ -0,0 +1,2484 @@ +#include "global.h" +#include "event_object_movement.h" +#include "field_weather.h" +#include "overworld.h" +#include "random.h" +#include "script.h" +#include "constants/weather.h" +#include "constants/songs.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "trig.h" +#include "gpu_regs.h" + +const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); +const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal"); +const u16 gUnknown_0854C2B0[] = INCBIN_U16("graphics/weather/2.gbapal"); +const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp"); +const u8 gWeatherFog1Tiles[] = INCBIN_U8("graphics/weather/fog1.4bpp"); +const u8 gWeatherCloudTiles[] = INCBIN_U8("graphics/weather/cloud.4bpp"); +const u8 gWeatherSnow1Tiles[] = INCBIN_U8("graphics/weather/snow0.4bpp"); +const u8 gWeatherSnow2Tiles[] = INCBIN_U8("graphics/weather/snow1.4bpp"); +const u8 gWeatherBubbleTiles[] = INCBIN_U8("graphics/weather/bubble.4bpp"); +const u8 gWeatherAshTiles[] = INCBIN_U8("graphics/weather/ash.4bpp"); +const u8 gWeatherRainTiles[] = INCBIN_U8("graphics/weather/rain.4bpp"); +const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp"); + +/*static*/ const struct Coords16 gUnknown_0854FB50[] = +{ + { 0, 66}, + { 5, 73}, + {10, 78}, +}; + +/*static*/ const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200}; + +/*static*/ const struct OamData gOamData_839A9DC = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 3, + .paletteNum = 0, + .affineParam = 0, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839A9E4[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd *const gSpriteAnimTable_839A9EC[] = +{ + gSpriteAnim_839A9E4, +}; + +void sub_80AC6B4(struct Sprite *); +/*static*/ const struct SpriteTemplate sCloudSpriteTemplate = +{ + .tileTag = 4608, + .paletteTag = 4609, + .oam = &gOamData_839A9DC, + .anims = gSpriteAnimTable_839A9EC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80AC6B4, +}; + +extern void sub_80ABC48(s8 gammaIndex); +extern void sub_80ABFF0(void); +extern void sub_80AC01C(void); +extern void Weather_SetTargetBlendCoeffs(u8 a, u8 b, int c); +extern bool8 Weather_UpdateBlend(void); +extern void SetRainStrengthFromSoundEffect(u16 sndEff); +extern void sub_80ABC7C(u8 a, u8 b, u8 c); +extern void sub_80AB104(u8); + +//------------------------------------------------------------------------------ +// Clouds +//------------------------------------------------------------------------------ + +void Clouds_InitVars(void) +{ + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->initStep = 0; + if (gWeatherPtr->cloudSpritesCreated == FALSE) + Weather_SetBlendCoeffs(0, 16); +} + +void Clouds_Main(void); + +void Clouds_InitAll(void) +{ + Clouds_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Clouds_Main(); +} + +void CreateCloudSprites(void); + +void Clouds_Main(void) +{ + switch (gWeatherPtr->initStep) + { + case 0: + CreateCloudSprites(); + gWeatherPtr->initStep++; + break; + case 1: + Weather_SetTargetBlendCoeffs(12, 8, 1); + gWeatherPtr->initStep++; + break; + case 2: + if (Weather_UpdateBlend()) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } + break; + } +} + +void sub_807E0A0(void); + +bool8 Clouds_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 1); + gWeatherPtr->finishStep++; + return TRUE; + case 1: + if (Weather_UpdateBlend()) + { + sub_807E0A0(); + gWeatherPtr->finishStep++; + } + return TRUE; + } + return FALSE; +} + +//------------------------------------------------------------------------------ +// Weather 2 +//------------------------------------------------------------------------------ + +void Weather2_InitVars(void) +{ + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; +} + +void Weather2_InitAll(void) +{ + Weather2_InitVars(); +} + +void Weather2_Main(void) +{ +} + +int Weather2_Finish(void) +{ + return 0; +} + +void CreateCloudSprites(void) +{ + u16 i; + + if (gWeatherPtr->cloudSpritesCreated == TRUE) + return; + LoadSpriteSheet(&sCloudSpriteSheet); + LoadCustomWeatherSpritePalette(gUnknown_0854C290); + for (i = 0; i < 3; i++) + { + u8 spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF); + + if (spriteId != 64) + { + struct Sprite *sprite; + + gWeatherPtr->sprites.s1.cloudSprites[i] = &gSprites[spriteId]; + sprite = gWeatherPtr->sprites.s1.cloudSprites[i]; + sub_8093038(gUnknown_0854FB50[i].x + 7, gUnknown_0854FB50[i].y + 7, &sprite->pos1.x, &sprite->pos1.y); + sprite->coordOffsetEnabled = TRUE; + } + else + { + gWeatherPtr->sprites.s1.cloudSprites[i] = NULL; + } + } + gWeatherPtr->cloudSpritesCreated = TRUE; +} + +void sub_807E0A0(void) +{ + u16 i; + + if (gWeatherPtr->cloudSpritesCreated == FALSE) + return; + for (i = 0; i < 3; i++) + { + if (gWeatherPtr->sprites.s1.cloudSprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s1.cloudSprites[i]); + } + FreeSpriteTilesByTag(0x1200); + gWeatherPtr->cloudSpritesCreated = FALSE; +} + +void sub_80AC6B4(struct Sprite *sprite) +{ + sprite->data[0] = (sprite->data[0] + 1) & 1; + if (sprite->data[0] != 0) + sprite->pos1.x--; +} + +//------------------------------------------------------------------------------ +// Drought +//------------------------------------------------------------------------------ + +void Drought_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 0; +} + +void Drought_Main(void); + +void Drought_InitAll(void) +{ + Drought_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Drought_Main(); +} + +void Drought_Main(void) +{ + switch (gWeatherPtr->initStep) + { + case 0: + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_CHANGING_WEATHER) + gWeatherPtr->initStep++; + break; + case 1: + ResetDroughtWeatherPaletteLoading(); + gWeatherPtr->initStep++; + break; + case 2: + if (LoadDroughtWeatherPalettes() == FALSE) + gWeatherPtr->initStep++; + break; + case 3: + sub_80ABFF0(); + gWeatherPtr->initStep++; + break; + case 4: + sub_80AC01C(); + if (gWeatherPtr->unknown_73C == 6) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } + break; + default: + sub_80AC01C(); + break; + } +} + +int Drought_Finish(void) +{ + return 0; +} + +void task50_0807B6D4(u8); + +void sub_80AC81C(void) +{ + CreateTask(task50_0807B6D4, 0x50); +} + +#define tState data[0] +#define tBlendY data[1] +#define tBlendDelay data[2] +#define tWinRange data[3] + +void task50_0807B6D4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->tState) + { + case 0: + task->tBlendY = 0; + task->tBlendDelay = 0; + task->tWinRange = REG_WININ; + SetGpuReg(REG_OFFSET_WININ, WIN_RANGE(63, 63)); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_EFFECT_LIGHTEN); + SetGpuReg(REG_OFFSET_BLDY, 0); + task->tState++; + // fall through + case 1: + task->tBlendY += 3; + if (task->tBlendY > 16) + task->tBlendY = 16; + SetGpuReg(REG_OFFSET_BLDY, task->tBlendY); + if (task->tBlendY >= 16) + task->tState++; + break; + case 2: + task->tBlendDelay++; + if (task->tBlendDelay > 9) + { + task->tBlendDelay = 0; + task->tBlendY--; + if (task->tBlendY <= 0) + { + task->tBlendY = 0; + task->tState++; + } + SetGpuReg(REG_OFFSET_BLDY, task->tBlendY); + } + break; + case 3: + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); + SetGpuReg(REG_OFFSET_WININ, task->tWinRange); + task->tState++; + break; + case 4: + EnableBothScriptContexts(); + DestroyTask(taskId); + break; + } +} + +#undef tState +#undef tBlendY +#undef tBlendDelay +#undef tWinRange + +//------------------------------------------------------------------------------ +// Light Rain +//------------------------------------------------------------------------------ + +void LightRain_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->unknown_6D6 = 0; + gWeatherPtr->unknown_6DB = 8; + gWeatherPtr->unknown_6DC = 0; + gWeatherPtr->unknown_6D9 = 10; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; + SetRainStrengthFromSoundEffect(SE_T_KOAME); +} + +void LightRain_Main(void); + +void LightRain_InitAll(void) +{ + LightRain_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + LightRain_Main(); +} + +void LoadRainSpriteSheet(void); +u8 CreateRainSprite(void); +u8 sub_807E8E8(void); + +void LightRain_Main(void) +{ + switch (gWeatherPtr->initStep) + { + case 0: + LoadRainSpriteSheet(); + gWeatherPtr->initStep++; + break; + case 1: + if (CreateRainSprite() == 0) + gWeatherPtr->initStep++; + break; + case 2: + if (sub_807E8E8() == FALSE) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } + break; + } +} + +void DestroyRainSprites(void); + +bool8 LightRain_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT + || gWeatherPtr->nextWeather == WEATHER_RAIN_MED + || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY) + { + gWeatherPtr->finishStep = 0xFF; + return FALSE; + } + else + { + gWeatherPtr->unknown_6D9 = 0; + gWeatherPtr->finishStep++; + } + // fall through + case 1: + if (sub_807E8E8() == FALSE) + { + DestroyRainSprites(); + gWeatherPtr->finishStep++; + return FALSE; + } + return TRUE; + } + return FALSE; +} + +// defined below +extern const s16 gUnknown_0839AABC[][2]; +extern const u16 gUnknown_0839AAC4[][2]; + +void sub_807E4EC(struct Sprite *sprite) +{ + u32 randVal; + u16 r6; + s32 r4; + s32 r0; + + if (sprite->data[1] == 0) + sprite->data[1] = 361; + randVal = sprite->data[1] * 1103515245 + 12345; + sprite->data[1] = ((randVal & 0x7FFF0000) >> 16) % 600; + + r6 = gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][0]; + + r4 = sprite->data[1] % 30; + sprite->data[2] = r4 * 8; // useless assignment + + r0 = sprite->data[1] / 30; + sprite->data[3] = r0 * 8; // useless assignment + + sprite->data[2] = r4; + sprite->data[2] <<= 7; + + sprite->data[3] = r0; + sprite->data[3] <<= 7; + + sprite->data[2] -= gUnknown_0839AABC[gWeatherPtr->unknown_6DC][0] * r6; + sprite->data[3] -= gUnknown_0839AABC[gWeatherPtr->unknown_6DC][1] * r6; + + StartSpriteAnim(sprite, 0); + sprite->data[4] = 0; + sprite->coordOffsetEnabled = FALSE; + sprite->data[0] = r6; +} + +void sub_807E5C0(struct Sprite *sprite) +{ + if (sprite->data[4] == 0) + { + sprite->data[2] += gUnknown_0839AABC[gWeatherPtr->unknown_6DC][0]; + sprite->data[3] += gUnknown_0839AABC[gWeatherPtr->unknown_6DC][1]; + sprite->pos1.x = sprite->data[2] >> 4; + sprite->pos1.y = sprite->data[3] >> 4; + + if (sprite->data[5] != 0 + && (sprite->pos1.x >= -8 && sprite->pos1.x <= 248) + && sprite->pos1.y >= -16 && sprite->pos1.y <= 176) + sprite->invisible = FALSE; + else + sprite->invisible = TRUE; + + sprite->data[0]--; + if (sprite->data[0] == 0) + { + StartSpriteAnim(sprite, gWeatherPtr->unknown_6DC + 1); + sprite->data[4] = 1; + sprite->pos1.x -= gSpriteCoordOffsetX; + sprite->pos1.y -= gSpriteCoordOffsetY; + sprite->coordOffsetEnabled = TRUE; + } + } + else if (sprite->animEnded) + { + sprite->invisible = TRUE; + sub_807E4EC(sprite); + } +} + +void sub_807E6C4(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + sub_807E4EC(sprite); + sprite->callback = sub_807E5C0; + } + else + { + sprite->data[0]--; + } +} + +void sub_807E6F0(struct Sprite *sprite, u16 b) +{ + u16 r8 = gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][0]; + u16 r6 = b / (gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][1] + r8); + u16 r4 = b % (gUnknown_0839AAC4[gWeatherPtr->unknown_6DC][1] + r8); + + while (--r6 != 0xFFFF) + sub_807E4EC(sprite); + if (r4 < r8) + { + while (--r4 != 0xFFFF) + sub_807E5C0(sprite); + sprite->data[6] = 0; + } + else + { + sprite->data[0] = r4 - r8; + sprite->invisible = TRUE; + sprite->data[6] = 1; + } +} + +extern const struct SpriteSheet sRainSpriteSheet; // defined below + +void LoadRainSpriteSheet(void) +{ + LoadSpriteSheet(&sRainSpriteSheet); +} + +/*static*/ const struct Coords16 sRainSpriteCoords[] = +{ + { 0, 0}, + { 0, 160}, + { 0, 64}, + {144, 224}, + {144, 128}, + { 32, 32}, + { 32, 192}, + { 32, 96}, + { 72, 128}, + { 72, 32}, + { 72, 192}, + {216, 96}, + {216, 0}, + {104, 160}, + {104, 64}, + {104, 224}, + {144, 0}, + {144, 160}, + {144, 64}, + { 32, 224}, + { 32, 128}, + { 72, 32}, + { 72, 192}, + { 48, 96}, +}; + +/*static*/ const struct OamData gOamData_839AA68 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 1, + .paletteNum = 2, + .affineParam = 0, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AA70[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AA78[] = +{ + ANIMCMD_FRAME(8, 3), + ANIMCMD_FRAME(32, 2), + ANIMCMD_FRAME(40, 2), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AA88[] = +{ + ANIMCMD_FRAME(8, 3), + ANIMCMD_FRAME(16, 3), + ANIMCMD_FRAME(24, 4), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd *const gSpriteAnimTable_839AA98[] = +{ + gSpriteAnim_839AA70, + gSpriteAnim_839AA78, + gSpriteAnim_839AA88, +}; + +/*static*/ const struct SpriteTemplate sRainSpriteTemplate = +{ + .tileTag = 4614, + .paletteTag = 4608, + .oam = &gOamData_839AA68, + .anims = gSpriteAnimTable_839AA98, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807E5C0, +}; + + +const s16 gUnknown_0839AABC[][2] = +{ + {-104, 208}, + {-160, 320}, +}; + +const u16 gUnknown_0839AAC4[][2] = +{ + {18, 7}, + {12, 10}, +}; + +/*static*/ const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206}; + +/*static*/ const struct OamData gOamData_839AAD4 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +/*static*/ const struct SpriteFrameImage gSpriteImageTable_839AADC[] = +{ + {gWeatherSnow1Tiles, sizeof(gWeatherSnow1Tiles)}, + {gWeatherSnow2Tiles, sizeof(gWeatherSnow2Tiles)}, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AAEC[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AAF4[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd *const gSpriteAnimTable_839AAFC[] = +{ + gSpriteAnim_839AAEC, + gSpriteAnim_839AAF4, +}; + +void sub_807ED48(struct Sprite *); +/*static*/ const struct SpriteTemplate sSnowflakeSpriteTemplate = +{ + .tileTag = 0xFFFF, + .paletteTag = 4608, + .oam = &gOamData_839AAD4, + .anims = gSpriteAnimTable_839AAFC, + .images = gSpriteImageTable_839AADC, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807ED48, +}; + +// unused data +/*static*/ const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300}; + +/*static*/ const struct OamData gOamData_839AB2C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB34[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB3C[] = +{ + ANIMCMD_FRAME(32, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB44[] = +{ + ANIMCMD_FRAME(64, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB4C[] = +{ + ANIMCMD_FRAME(96, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB54[] = +{ + ANIMCMD_FRAME(128, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd gSpriteAnim_839AB5C[] = +{ + ANIMCMD_FRAME(160, 16), + ANIMCMD_END, +}; + +/*static*/ const union AnimCmd *const gSpriteAnimTable_839AB64[] = +{ + gSpriteAnim_839AB34, + gSpriteAnim_839AB3C, + gSpriteAnim_839AB44, + gSpriteAnim_839AB4C, + gSpriteAnim_839AB54, + gSpriteAnim_839AB5C, +}; + +/*static*/ const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] = +{ + AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), + AFFINEANIMCMD_END, +}; + +/*static*/ const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] = +{ + gSpriteAffineAnim_839AB7C, +}; + +/*static*/ void Fog1SpriteCallback(struct Sprite *); +/*static*/ const struct SpriteTemplate sFog1SpriteTemplate = +{ + .tileTag = 4609, + .paletteTag = 4608, + .oam = &gOamData_839AB2C, + .anims = gSpriteAnimTable_839AB64, + .images = NULL, + .affineAnims = gSpriteAffineAnimTable_839AB8C, + .callback = Fog1SpriteCallback, +}; + +bool8 CreateRainSprite(void) +{ + u8 spriteNum; + u8 spriteId; + + if (gWeatherPtr->rainSpriteCount == 24) + return FALSE; + + spriteNum = gWeatherPtr->rainSpriteCount; + spriteId = CreateSpriteAtEnd(&sRainSpriteTemplate, + sRainSpriteCoords[spriteNum].x, sRainSpriteCoords[spriteNum].y, 78); + if (spriteId != 64) + { + gSprites[spriteId].data[5] = 0; + gSprites[spriteId].data[1] = spriteNum * 145; + while (gSprites[spriteId].data[1] >= 600) + gSprites[spriteId].data[1] -= 600; + sub_807E4EC(&gSprites[spriteId]); + sub_807E6F0(&gSprites[spriteId], spriteNum * 9); + gSprites[spriteId].invisible = TRUE; + gWeatherPtr->sprites.s1.rainSprites[spriteNum] = &gSprites[spriteId]; + } + else + { + gWeatherPtr->sprites.s1.rainSprites[spriteNum] = NULL; + } + + if (++gWeatherPtr->rainSpriteCount == 24) + { + u16 i; + + for (i = 0; i < 24; i++) + { + if (gWeatherPtr->sprites.s1.rainSprites[i] != NULL) + { + if (gWeatherPtr->sprites.s1.rainSprites[i]->data[6] == 0) + gWeatherPtr->sprites.s1.rainSprites[i]->callback = sub_807E5C0; + else + gWeatherPtr->sprites.s1.rainSprites[i]->callback = sub_807E6C4; + } + } + return FALSE; + } + return TRUE; +} + +bool8 sub_807E8E8(void) +{ + if (gWeatherPtr->unknown_6D8 == gWeatherPtr->unknown_6D9) + return FALSE; + + if (++gWeatherPtr->unknown_6D6 > gWeatherPtr->unknown_6DB) + { + gWeatherPtr->unknown_6D6 = 0; + if (gWeatherPtr->unknown_6D8 < gWeatherPtr->unknown_6D9) + { + gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8++]->data[5] = 1; + } + else + { + gWeatherPtr->unknown_6D8--; + gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8]->data[5] = 0; + gWeatherPtr->sprites.s1.rainSprites[gWeatherPtr->unknown_6D8]->invisible = TRUE; + } + } + return TRUE; +} + +void DestroyRainSprites(void) +{ + u16 i; + + for (i = 0; i < gWeatherPtr->rainSpriteCount; i++) + { + if (gWeatherPtr->sprites.s1.rainSprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s1.rainSprites[i]); + } + gWeatherPtr->rainSpriteCount = 0; + FreeSpriteTilesByTag(0x1206); +} + +//------------------------------------------------------------------------------ +// Snow +//------------------------------------------------------------------------------ + +void Snow_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->unknown_6E5 = 16; + gWeatherPtr->unknown_6E0 = 0; +} + +void Snow_Main(void); +void sub_807ED48(struct Sprite *); + +void Snow_InitAll(void) +{ + Snow_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + { + u16 i; + + Snow_Main(); + for (i = 0; i < gWeatherPtr->snowflakeSpriteCount; i++) + { + sub_807ED48(gWeatherPtr->sprites.s1.snowflakeSprites[i]); + } + } +} + +u8 snowflakes_progress(void); + +void Snow_Main(void) +{ + if (gWeatherPtr->initStep == 0 && snowflakes_progress() == FALSE) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } +} + +bool8 Snow_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + gWeatherPtr->unknown_6E5 = 0; + gWeatherPtr->unknown_6E0 = 0; + gWeatherPtr->finishStep++; + // fall through + case 1: + if (snowflakes_progress() == FALSE) + { + gWeatherPtr->finishStep++; + return FALSE; + } + return TRUE; + } + return FALSE; +} + +bool8 CreateSnowflakeSprite(void); +bool8 RemoveSnowflakeSprite(void); + +bool8 snowflakes_progress(void) +{ + if (gWeatherPtr->snowflakeSpriteCount == gWeatherPtr->unknown_6E5) + return FALSE; + + gWeatherPtr->unknown_6E0++; + if (gWeatherPtr->unknown_6E0 > 36) + { + gWeatherPtr->unknown_6E0 = 0; + if (gWeatherPtr->snowflakeSpriteCount < gWeatherPtr->unknown_6E5) + CreateSnowflakeSprite(); + else + RemoveSnowflakeSprite(); + } + return (gWeatherPtr->snowflakeSpriteCount != gWeatherPtr->unknown_6E5); +} + +void sub_807EC40(struct Sprite *); + +bool8 CreateSnowflakeSprite(void) +{ + u8 spriteId = CreateSpriteAtEnd(&sSnowflakeSpriteTemplate, 0, 0, 78); + + if (spriteId == 64) + return FALSE; + gSprites[spriteId].data[4] = gWeatherPtr->snowflakeSpriteCount; + sub_807EC40(&gSprites[spriteId]); + gSprites[spriteId].coordOffsetEnabled = TRUE; + gWeatherPtr->sprites.s1.snowflakeSprites[gWeatherPtr->snowflakeSpriteCount++] = &gSprites[spriteId]; + return TRUE; +} + +bool8 RemoveSnowflakeSprite(void) +{ + if (gWeatherPtr->snowflakeSpriteCount != 0) + { + DestroySprite(gWeatherPtr->sprites.s1.snowflakeSprites[--gWeatherPtr->snowflakeSpriteCount]); + return TRUE; + } + return FALSE; +} + +void sub_807EC40(struct Sprite *sprite) +{ + u16 r4 = ((sprite->data[4] * 5) & 7) * 30 + (Random() % 30); + u16 r6; + + sprite->pos1.y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->pos1.x = r4 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + sprite->data[0] = sprite->pos1.y * 128; + sprite->pos2.x = 0; + r6 = Random(); + sprite->data[1] = (r6 & 3) * 5 + 64; + sprite->data[7] = (r6 & 3) * 5 + 64; + StartSpriteAnim(sprite, (r6 & 1) ? 0 : 1); + sprite->data[3] = 0; + sprite->data[2] = ((r6 & 3) == 0) ? 2 : 1; + sprite->data[6] = (r6 & 0x1F) + 210; + sprite->data[5] = 0; +} + +void sub_807ECEC(struct Sprite *sprite) +{ + if (gWeatherPtr->unknown_6E2 > 18) + { + sprite->invisible = FALSE; + sprite->callback = sub_807ED48; + sprite->pos1.y = 0xFA - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->data[0] = sprite->pos1.y * 128; + gWeatherPtr->unknown_6E2 = 0; + } +} + +void sub_807ED48(struct Sprite *sprite) +{ + s16 r3; + s16 r2; + + sprite->data[0] += sprite->data[1]; + sprite->pos1.y = sprite->data[0] >> 7; + sprite->data[3] = (sprite->data[3] + sprite->data[2]) & 0xFF; + sprite->pos2.x = gSineTable[sprite->data[3]] / 64; + + r3 = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF; + if (r3 & 0x100) + r3 = -0x100 | r3; // hmm... what is this? + if (r3 < -3) + sprite->pos1.x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + else if (r3 > 242) + sprite->pos1.x = -3 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + + r2 = (sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY) & 0xFF; + if (r2 > 163 && r2 < 171) + { + sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->data[0] = sprite->pos1.y * 128; + sprite->data[5] = 0; + sprite->data[6] = 220; + } + else if (r2 > 242 && r2 < 250) + { + sprite->pos1.y = 163; + sprite->data[0] = sprite->pos1.y * 128; + sprite->data[5] = 0; + sprite->data[6] = 220; + sprite->invisible = TRUE; + sprite->callback = sub_807ECEC; + } + + sprite->data[5]++; + if (sprite->data[5] == sprite->data[6]) + { + sub_807EC40(sprite); + sprite->pos1.y = 250; + sprite->invisible = TRUE; + sprite->callback = sub_807ECEC; + } +} + +//------------------------------------------------------------------------------ +// Medium Rain +//------------------------------------------------------------------------------ + +void MedRain_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->unknown_6D6 = 0; + gWeatherPtr->unknown_6DB = 4; + gWeatherPtr->unknown_6DC = 0; + gWeatherPtr->unknown_6D9 = 16; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment + gWeatherPtr->unknown_6ED = 0; + SetRainStrengthFromSoundEffect(SE_T_AME); +} + +void Rain_Main(void); + +void MedRain_InitAll(void) +{ + MedRain_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Rain_Main(); +} + +//------------------------------------------------------------------------------ +// Heavy Rain +//------------------------------------------------------------------------------ + +void HeavyRain_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->unknown_6D6 = 0; + gWeatherPtr->unknown_6DB = 4; + gWeatherPtr->unknown_6DC = 1; + gWeatherPtr->unknown_6D9 = 24; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment + SetRainStrengthFromSoundEffect(SE_T_OOAME); +} + +void HeavyRain_InitAll(void) +{ + HeavyRain_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Rain_Main(); +} + +void UpdateThunderSound(void); +void SetThunderCounter(u16); + +void Rain_Main(void) +{ + UpdateThunderSound(); + switch (gWeatherPtr->initStep) + { + case 0: + LoadRainSpriteSheet(); + gWeatherPtr->initStep++; + break; + case 1: + if (CreateRainSprite()) + break; + gWeatherPtr->initStep++; + break; + case 2: + if (sub_807E8E8()) + break; + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + break; + case 3: + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_CHANGING_WEATHER) + break; + gWeatherPtr->initStep = 6; + break; + case 4: + gWeatherPtr->unknown_6EA = 1; + gWeatherPtr->unknown_6E6 = (Random() % 360) + 360; + gWeatherPtr->initStep++; + // fall through + case 5: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + gWeatherPtr->initStep++; + break; + case 6: + gWeatherPtr->unknown_6EA = 1; + gWeatherPtr->unknown_6EB = Random() % 2; + gWeatherPtr->initStep++; + break; + case 7: + gWeatherPtr->unknown_6EC = (Random() & 1) + 1; + gWeatherPtr->initStep++; + // fall through + case 8: + sub_80ABC48(19); + if (gWeatherPtr->unknown_6EB == 0 && gWeatherPtr->unknown_6EC == 1) + SetThunderCounter(20); + gWeatherPtr->unknown_6E6 = (Random() % 3) + 6; + gWeatherPtr->initStep++; + break; + case 9: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + sub_80ABC48(3); + gWeatherPtr->unknown_6EA = 1; + if (--gWeatherPtr->unknown_6EC != 0) + { + gWeatherPtr->unknown_6E6 = (Random() % 16) + 60; + gWeatherPtr->initStep = 10; + } + else if (gWeatherPtr->unknown_6EB == 0) + { + gWeatherPtr->initStep = 4; + } + else + { + gWeatherPtr->initStep = 11; + } + break; + case 10: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + gWeatherPtr->initStep = 8; + break; + case 11: + gWeatherPtr->unknown_6E6 = (Random() % 16) + 60; + gWeatherPtr->initStep++; + break; + case 12: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + SetThunderCounter(100); + sub_80ABC48(19); + // Why use "% 16" everywhere else and "& 0xF" here. So dumb. + gWeatherPtr->unknown_6E6 = (Random() & 0xF) + 30; + gWeatherPtr->initStep++; + break; + case 13: + if (--gWeatherPtr->unknown_6E6 != 0) + break; + sub_80ABC7C(19, 3, 5); + gWeatherPtr->initStep++; + break; + case 14: + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_IDLE) + break; + gWeatherPtr->unknown_6EA = 1; + gWeatherPtr->initStep = 4; + break; + } +} + +bool8 Rain_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + gWeatherPtr->unknown_6EA = 0; + gWeatherPtr->finishStep++; + // fall through + case 1: + Rain_Main(); + if (gWeatherPtr->unknown_6EA != 0) + { + if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT + || gWeatherPtr->nextWeather == WEATHER_RAIN_MED + || gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY) + return FALSE; + gWeatherPtr->unknown_6D9 = 0; + gWeatherPtr->finishStep++; + } + break; + case 2: + if (sub_807E8E8()) + break; + DestroyRainSprites(); + gWeatherPtr->unknown_6ED = 0; + gWeatherPtr->finishStep++; + return FALSE; + default: + return FALSE; + } + return TRUE; +} + +void SetThunderCounter(u16 max) +{ + if (gWeatherPtr->unknown_6ED == 0) + { + gWeatherPtr->thunderCounter = Random() % max; + gWeatherPtr->unknown_6ED = 1; + } +} + +void UpdateThunderSound(void) +{ + if (gWeatherPtr->unknown_6ED == 1) + { + if (gWeatherPtr->thunderCounter == 0) + { + if (IsSEPlaying()) + return; + if (Random() & 1) + PlaySE(SE_T_KAMI); + else + PlaySE(SE_T_KAMI2); + gWeatherPtr->unknown_6ED = 0; + } + else + { + gWeatherPtr->thunderCounter--; + } + } +} + +//------------------------------------------------------------------------------ +// Fog 1 +//------------------------------------------------------------------------------ + +void Fog1_Main(void); +/*static*/ void CreateFog1Sprites(void); +/*static*/ void DestroyFog1Sprites(void); + +void Fog1_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + if (gWeatherPtr->fog1SpritesCreated == 0) + { + gWeatherPtr->unknown_6F0 = 0; + gWeatherPtr->unknown_6F2 = 0; + gWeatherPtr->fog1ScrollPosX = 0; + Weather_SetBlendCoeffs(0, 16); + } +} + +void Fog1_InitAll(void) +{ + Fog1_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Fog1_Main(); +} + +void Fog1_Main(void) +{ + gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->unknown_6F2) & 0xFF; + if (++gWeatherPtr->unknown_6F0 > 3) + { + gWeatherPtr->unknown_6F0 = 0; + gWeatherPtr->unknown_6F2++; + } + switch (gWeatherPtr->initStep) + { + case 0: + CreateFog1Sprites(); + if (gWeatherPtr->currWeather == WEATHER_FOG_1) + Weather_SetTargetBlendCoeffs(12, 8, 3); + else + Weather_SetTargetBlendCoeffs(4, 16, 0); + gWeatherPtr->initStep++; + break; + case 1: + if (Weather_UpdateBlend()) + { + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + } + break; + } +} + +bool8 Fog1_Finish(void) +{ + gWeatherPtr->fog1ScrollPosX = (gSpriteCoordOffsetX - gWeatherPtr->unknown_6F2) & 0xFF; + if (++gWeatherPtr->unknown_6F0 > 3) + { + gWeatherPtr->unknown_6F0 = 0; + gWeatherPtr->unknown_6F2++; + } + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 3); + gWeatherPtr->finishStep++; + break; + case 1: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->finishStep++; + break; + case 2: + DestroyFog1Sprites(); + gWeatherPtr->finishStep++; + break; + default: + return FALSE; + } + return TRUE; +} + +#define sprColumn data[0] + +/*static*/ void Fog1SpriteCallback(struct Sprite *sprite) +{ + sprite->pos2.y = (u8)gSpriteCoordOffsetY; + sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->sprColumn * 64; + if (sprite->pos1.x > 0x10F) + { + sprite->pos1.x = 480 + gWeatherPtr->fog1ScrollPosX - (4 - sprite->sprColumn) * 64; + sprite->pos1.x &= 0x1FF; + } +} + +/*static*/ void CreateFog1Sprites(void) +{ + u16 i; + + if (!gWeatherPtr->fog1SpritesCreated) + { + struct SpriteSheet fog1SpriteSheet = {gWeatherFog1Tiles, sizeof(gWeatherFog1Tiles), 0x1201}; + + LoadSpriteSheet(&fog1SpriteSheet); + for (i = 0; i < 20; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sFog1SpriteTemplate, 0, 0, 0xFF); + + if (spriteId != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[spriteId]; + + sprite->sprColumn = i % 5; + sprite->pos1.x = (i % 5) * 64 + 32; + sprite->pos1.y = (i / 5) * 64 + 32; + gWeatherPtr->sprites.s2.fog1Sprites[i] = sprite; + } + else + { + gWeatherPtr->sprites.s2.fog1Sprites[i] = NULL; + } + } + gWeatherPtr->fog1SpritesCreated = TRUE; + } +} + +#undef sprColumn + +/*static*/ void DestroyFog1Sprites(void) +{ + u16 i; + + if (gWeatherPtr->fog1SpritesCreated) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.fog1Sprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.fog1Sprites[i]); + } + FreeSpriteTilesByTag(0x1201); + gWeatherPtr->fog1SpritesCreated = 0; + } +} + +//------------------------------------------------------------------------------ +// Volcanic ash +//------------------------------------------------------------------------------ + +void Ash_Main(void); +void LoadAshSpriteSheet(void); +void CreateAshSprites(void); +void DestroyAshSprites(void); + +void Ash_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = FALSE; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->unknown_6FE = 20; + if (!gWeatherPtr->ashSpritesCreated) + { + Weather_SetBlendCoeffs(0, 16); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(64, 63)); // Those aren't even valid coefficients! + } +} + +void Ash_InitAll(void) +{ + Ash_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Ash_Main(); +} + +void Ash_Main(void) +{ + gWeatherPtr->unknown_6FC = gSpriteCoordOffsetX & 0x1FF; + while (gWeatherPtr->unknown_6FC > 0xEF) + gWeatherPtr->unknown_6FC -= 0xF0; + switch (gWeatherPtr->initStep) + { + case 0: + LoadAshSpriteSheet(); + gWeatherPtr->initStep++; + break; + case 1: + if (!gWeatherPtr->ashSpritesCreated) + CreateAshSprites(); + Weather_SetTargetBlendCoeffs(16, 0, 1); + gWeatherPtr->initStep++; + break; + case 2: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + break; + default: + Weather_UpdateBlend(); + break; + } +} + +bool8 Ash_Finish(void) +{ + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 1); + gWeatherPtr->finishStep++; + break; + case 1: + if (!Weather_UpdateBlend()) + break; + DestroyAshSprites(); + gWeatherPtr->finishStep++; + break; + case 2: + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + gWeatherPtr->finishStep++; + return FALSE; + default: + return FALSE; + } + return TRUE; +} + +/*static*/ const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202}; + +void LoadAshSpriteSheet(void) +{ + LoadSpriteSheet(&sAshSpriteSheet); +} + +const struct OamData gOamData_839ABB8 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 15, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_839ABC0[] = +{ + ANIMCMD_FRAME(0, 60), + ANIMCMD_FRAME(64, 60), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gSpriteAnimTable_839ABCC[] = +{ + gSpriteAnim_839ABC0, +}; + +void sub_807FAA8(struct Sprite *); +/*static*/ const struct SpriteTemplate sAshSpriteTemplate = +{ + .tileTag = 4610, + .paletteTag = 4608, + .oam = &gOamData_839ABB8, + .anims = gSpriteAnimTable_839ABCC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_807FAA8, +}; + +void CreateAshSprites(void) +{ + u8 i; + + if (!gWeatherPtr->ashSpritesCreated) + { + for (i = 0; i < 20; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sAshSpriteTemplate, 0, 0, 0x4E); + + if (spriteId != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[spriteId]; + + sprite->data[1] = 0; + sprite->data[2] = (u8)(i % 5); + sprite->data[3] = (u8)(i / 5); + sprite->data[0] = sprite->data[3] * 64 + 32; + gWeatherPtr->sprites.s2.ashSprites[i] = sprite; + } + else + { + gWeatherPtr->sprites.s2.ashSprites[i] = NULL; + } + } + gWeatherPtr->ashSpritesCreated = TRUE; + } +} + +void DestroyAshSprites(void) +{ + u16 i; + + if (gWeatherPtr->ashSpritesCreated) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.ashSprites[i]); + } + FreeSpriteTilesByTag(0x1202); + gWeatherPtr->ashSpritesCreated = FALSE; + } +} + +void sub_807FAA8(struct Sprite *sprite) +{ + sprite->data[1]++; + if (sprite->data[1] > 5) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + sprite->pos1.y = gSpriteCoordOffsetY + sprite->data[0]; + sprite->pos1.x = gWeatherPtr->unknown_6FC + 32 + sprite->data[2] * 64; + if (sprite->pos1.x > 271) + { + sprite->pos1.x = gWeatherPtr->unknown_6FC + 0x1E0 - (4 - sprite->data[2]) * 64; + sprite->pos1.x &= 0x1FF; + } +} + +//------------------------------------------------------------------------------ +// Fog 2 +//------------------------------------------------------------------------------ + +void Fog2_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = 0; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + gWeatherPtr->unknown_6F0 = 0; + gWeatherPtr->unknown_6F2 = 1; + if (gWeatherPtr->fog2SpritesCreated == 0) + { + gWeatherPtr->unknown_71C = 0; + gWeatherPtr->unknown_71E = 0; + gWeatherPtr->unknown_720 = 0; + gWeatherPtr->unknown_722 = 0; + gWeatherPtr->unknown_718 = 0; + gWeatherPtr->unknown_71A = 0; + Weather_SetBlendCoeffs(0, 16); + } +} + +void Fog2_Main(void); + +void Fog2_InitAll(void) +{ + Fog2_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Fog2_Main(); +} + +void sub_807FC9C(void); +void CreateFog2Sprites(void); + +void Fog2_Main(void) +{ + sub_807FC9C(); + switch (gWeatherPtr->initStep) + { + case 0: + CreateFog2Sprites(); + gWeatherPtr->initStep++; + break; + case 1: + Weather_SetTargetBlendCoeffs(12, 8, 8); + gWeatherPtr->initStep++; + break; + case 2: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + break; + } +} + +void DestroyFog2Sprites(void); + +bool8 Fog2_Finish(void) +{ + sub_807FC9C(); + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 1); + gWeatherPtr->finishStep++; + break; + case 1: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->finishStep++; + break; + case 2: + DestroyFog2Sprites(); + gWeatherPtr->finishStep++; + break; + default: + return FALSE; + } + return TRUE; +} + +void sub_807FC9C(void) +{ + if (++gWeatherPtr->unknown_71C > 2) + { + gWeatherPtr->unknown_720++; + gWeatherPtr->unknown_71C = 0; + } + + if (++gWeatherPtr->unknown_71E > 4) + { + gWeatherPtr->unknown_722++; + gWeatherPtr->unknown_71E = 0; + } + + gWeatherPtr->unknown_718 = (gSpriteCoordOffsetX - gWeatherPtr->unknown_720) & 0xFF; + gWeatherPtr->unknown_71A = gSpriteCoordOffsetY + gWeatherPtr->unknown_722; +} + +extern const struct SpriteTemplate sFog2SpriteTemplate; // defined below + +void CreateFog2Sprites(void) +{ + u16 i; + + if (!gWeatherPtr->fog2SpritesCreated) + { + struct SpriteSheet fog2SpriteSheet = {gWeatherFog2Tiles, sizeof(gWeatherFog2Tiles), 0x1203}; + + LoadSpriteSheet(&fog2SpriteSheet); + for (i = 0; i < 20; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sFog2SpriteTemplate, 0, (i / 5) * 64, 0xFF); + + if (spriteId != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[spriteId]; + + sprite->data[0] = i % 5; + sprite->data[1] = i / 5; + gWeatherPtr->sprites.s2.fog2Sprites[i] = sprite; + } + else + { + gWeatherPtr->sprites.s2.fog2Sprites[i] = NULL; + } + } + gWeatherPtr->fog2SpritesCreated = TRUE; + } +} + +const struct OamData gOamData_839ABF0 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_839ABF8[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_839AC00[] = +{ + gSpriteAnim_839ABF8, +}; + +void Fog2SpriteCallback(struct Sprite *); +const struct SpriteTemplate sFog2SpriteTemplate = +{ + .tileTag = 4611, + .paletteTag = 4608, + .oam = &gOamData_839ABF0, + .anims = gSpriteAnimTable_839AC00, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = Fog2SpriteCallback, +}; + +void DestroyFog2Sprites(void) +{ + u16 i; + + if (gWeatherPtr->fog2SpritesCreated) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.fog2Sprites[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.fog2Sprites[i]); + } + FreeSpriteTilesByTag(0x1203); + gWeatherPtr->fog2SpritesCreated = FALSE; + } +} + +void Fog2SpriteCallback(struct Sprite *sprite) +{ + sprite->pos2.y = gWeatherPtr->unknown_71A; + sprite->pos1.x = gWeatherPtr->unknown_718 + 32 + sprite->data[0] * 64; + if (sprite->pos1.x > 271) + { + sprite->pos1.x = gWeatherPtr->unknown_718 + 0x1E0 - (4 - sprite->data[0]) * 64; + sprite->pos1.x &= 0x1FF; + } +} + +//------------------------------------------------------------------------------ +// Sandstorm +//------------------------------------------------------------------------------ + +void Sandstorm_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->weatherGfxLoaded = 0; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; + if (gWeatherPtr->sandstormSprites1Created == 0) + { + gWeatherPtr->unknown_704 = gWeatherPtr->unknown_708 = 0; + gWeatherPtr->unknown_712 = 8; + gWeatherPtr->unknown_714 = 0; + // Dead code. How does the compiler not optimize this out? + if (gWeatherPtr->unknown_712 > 0x5F) + gWeatherPtr->unknown_712 = 0x80 - gWeatherPtr->unknown_712; + Weather_SetBlendCoeffs(0, 16); + } +} + +void Sandstorm_Main(void); + +void Sandstorm_InitAll(void) +{ + Sandstorm_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Sandstorm_Main(); +} + +void sub_808002C(void); +void sub_8080064(void); +void CreateSandstormSprites_1(void); +void CreateSandstormSprites_2(void); + +void Sandstorm_Main(void) +{ + sub_8080064(); + sub_808002C(); + if (gWeatherPtr->unknown_712 > 0x5F) + gWeatherPtr->unknown_712 = 32; + switch (gWeatherPtr->initStep) + { + case 0: + CreateSandstormSprites_1(); + CreateSandstormSprites_2(); + gWeatherPtr->initStep++; + break; + case 1: + Weather_SetTargetBlendCoeffs(16, 0, 0); + gWeatherPtr->initStep++; + break; + case 2: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->weatherGfxLoaded = TRUE; + gWeatherPtr->initStep++; + break; + } +} + +void sub_80800E4(void); + +bool8 Sandstorm_Finish(void) +{ + sub_8080064(); + sub_808002C(); + switch (gWeatherPtr->finishStep) + { + case 0: + Weather_SetTargetBlendCoeffs(0, 16, 0); + gWeatherPtr->finishStep++; + break; + case 1: + if (!Weather_UpdateBlend()) + break; + gWeatherPtr->finishStep++; + break; + case 2: + sub_80800E4(); + gWeatherPtr->finishStep++; + break; + default: + return FALSE; + } + return TRUE; +} + +void sub_808002C(void) +{ + if (gWeatherPtr->unknown_714++ > 4) + { + gWeatherPtr->unknown_712++; + gWeatherPtr->unknown_714 = 0; + } +} + +void sub_8080064(void) +{ + gWeatherPtr->unknown_704 -= gSineTable[gWeatherPtr->unknown_712] * 4; + gWeatherPtr->unknown_708 -= gSineTable[gWeatherPtr->unknown_712]; + gWeatherPtr->unknown_70E = (gSpriteCoordOffsetX + (gWeatherPtr->unknown_704 >> 8)) & 0xFF; + gWeatherPtr->unknown_710 = gSpriteCoordOffsetY + (gWeatherPtr->unknown_708 >> 8); +} + +void sub_80800E4(void) +{ + u16 i; + + if (gWeatherPtr->sandstormSprites1Created) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.sandstormSprites1[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites1[i]); + } + gWeatherPtr->sandstormSprites1Created = FALSE; + FreeSpriteTilesByTag(0x1204); + } + + if (gWeatherPtr->sandstormSprites2Created) + { + for (i = 0; i < 5; i++) + { + if (gWeatherPtr->sprites.s2.sandstormSprites2[i] != NULL) + DestroySprite(gWeatherPtr->sprites.s2.sandstormSprites2[i]); + } + gWeatherPtr->sandstormSprites2Created = FALSE; + } +} + +const struct OamData gOamData_839AC1C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_839AC24[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_839AC2C[] = +{ + ANIMCMD_FRAME(64, 3), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_839AC34[] = +{ + gSpriteAnim_839AC24, + gSpriteAnim_839AC2C, +}; + +void SandstormSpriteCallback1(struct Sprite *); +const struct SpriteTemplate sSandstormSpriteTemplate = +{ + .tileTag = 4612, + .paletteTag = 4609, + .oam = &gOamData_839AC1C, + .anims = gSpriteAnimTable_839AC34, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SandstormSpriteCallback1, +}; + +/*static*/ const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204}; + +void CreateSandstormSprites_1(void) +{ + u16 i; + + if (!gWeatherPtr->sandstormSprites1Created) + { + LoadSpriteSheet(&sSandstormSpriteSheet); + LoadCustomWeatherSpritePalette(gUnknown_0854C2B0); + for (i = 0; i < 20; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, 0, (i / 5) * 64, 1); + + if (spriteId != MAX_SPRITES) + { + gWeatherPtr->sprites.s2.sandstormSprites1[i] = &gSprites[spriteId]; + gWeatherPtr->sprites.s2.sandstormSprites1[i]->data[0] = i % 5; + gWeatherPtr->sprites.s2.sandstormSprites1[i]->data[1] = i / 5; + } + else + { + gWeatherPtr->sprites.s2.sandstormSprites1[i] = NULL; + } + } + gWeatherPtr->sandstormSprites1Created = TRUE; + } +} + +const u16 gUnknown_0839AC5C[] = {0, 120, 80, 160, 40, 0}; + +void SandstormSpriteCallback2(struct Sprite *); + +void CreateSandstormSprites_2(void) +{ + u16 i; + + if (!gWeatherPtr->sandstormSprites2Created) + { + for (i = 0; i < 5; i++) + { + u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 0x18, 0xD0, 1); + + if (spriteId != MAX_SPRITES) + { + gWeatherPtr->sprites.s2.sandstormSprites2[i] = &gSprites[spriteId]; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->oam.size = 2; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[1] = i * 51; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[0] = 8; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[2] = 0; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[4] = 0x6730; + gWeatherPtr->sprites.s2.sandstormSprites2[i]->data[3] = gUnknown_0839AC5C[i]; + StartSpriteAnim(gWeatherPtr->sprites.s2.sandstormSprites2[i], 1); + CalcCenterToCornerVec(gWeatherPtr->sprites.s2.sandstormSprites2[i], 0, 2, 0); + gWeatherPtr->sprites.s2.sandstormSprites2[i]->callback = SandstormSpriteCallback2; + } + else + { + gWeatherPtr->sprites.s2.sandstormSprites2[i] = NULL; + } + gWeatherPtr->sandstormSprites2Created = TRUE; + } + } +} + +void SandstormSpriteCallback1(struct Sprite *sprite) +{ + sprite->pos2.y = gWeatherPtr->unknown_710; + sprite->pos1.x = gWeatherPtr->unknown_70E + 32 + sprite->data[0] * 64; + if (sprite->pos1.x > 271) + { + sprite->pos1.x = gWeatherPtr->unknown_70E + 0x1E0 - (4 - sprite->data[0]) * 64; + sprite->pos1.x &= 0x1FF; + } +} + +void SandstormSpriteCallback3(struct Sprite *); + +void SandstormSpriteCallback2(struct Sprite *sprite) +{ + if (--sprite->data[3] == -1) + sprite->callback = SandstormSpriteCallback3; +} + +void SandstormSpriteCallback3(struct Sprite *sprite) +{ + u32 x; + u32 y; + + if (--sprite->pos1.y < -48) + { + sprite->pos1.y = 208; + sprite->data[0] = 4; + } + x = sprite->data[0] * gSineTable[sprite->data[1]]; + y = sprite->data[0] * gSineTable[sprite->data[1] + 64]; + sprite->pos2.x = x >> 8; + sprite->pos2.y = y >> 8; + sprite->data[1] = (sprite->data[1] + 10) & 0xFF; + if (++sprite->data[2] > 8) + { + sprite->data[2] = 0; + sprite->data[0]++; + } +} + +//------------------------------------------------------------------------------ +// Shade +//------------------------------------------------------------------------------ + +void Shade_InitVars(void) +{ + gWeatherPtr->initStep = 0; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; +} + +void Shade_InitAll(void) +{ + Shade_InitVars(); +} + +void Shade_Main(void) +{ +} + +bool8 Shade_Finish(void) +{ + return FALSE; +} + +//------------------------------------------------------------------------------ +// Weather 14 +//------------------------------------------------------------------------------ + +const u8 gUnknown_0839AC68[] = {40, 90, 60, 90, 2, 60, 40, 30}; + +const struct SpriteSheet gWeatherBubbleSpriteSheet = {gWeatherBubbleTiles, sizeof(gWeatherBubbleTiles), 0x1205}; + +void Bubbles_InitVars(void) +{ + Fog1_InitVars(); + if (gWeatherPtr->unknown_72E == 0) + { + LoadSpriteSheet(&gWeatherBubbleSpriteSheet); + gWeatherPtr->unknown_728 = 0; + gWeatherPtr->unknown_726 = gUnknown_0839AC68[0]; + gWeatherPtr->unknown_72A = 0; + gWeatherPtr->unknown_72C = 0; + } +} + +void Bubbles_Main(void); + +void Bubbles_InitAll(void) +{ + Bubbles_InitVars(); + while (gWeatherPtr->weatherGfxLoaded == FALSE) + Bubbles_Main(); +} + +void sub_8080588(u16); + +void Bubbles_Main(void) +{ + Fog1_Main(); + if (++gWeatherPtr->unknown_726 > gUnknown_0839AC68[gWeatherPtr->unknown_728]) + { + gWeatherPtr->unknown_726 = 0; + if (++gWeatherPtr->unknown_728 > 7) + gWeatherPtr->unknown_728 = 0; + sub_8080588(gWeatherPtr->unknown_72A); + if (++gWeatherPtr->unknown_72A > 12) + gWeatherPtr->unknown_72A = 0; + } +} + +void sub_8080610(void); + +bool8 Bubbles_Finish(void) +{ + if (!Fog1_Finish()) + { + sub_8080610(); + return FALSE; + } + return TRUE; +} + +const s16 gUnknown_0839AC78[][2] = +{ + {120, 160}, + {376, 160}, + { 40, 140}, + {296, 140}, + {180, 130}, + {436, 130}, + { 60, 160}, + {436, 160}, + {220, 180}, + {476, 180}, + { 10, 90}, + {266, 90}, + {256, 160}, +}; + +const union AnimCmd gSpriteAnim_839ACAC[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_839ACB8[] = +{ + gSpriteAnim_839ACAC, +}; + +extern const struct OamData gUnknown_08524904; + +void unc_0807DAB4(struct Sprite *); +const struct SpriteTemplate gSpriteTemplate_839ACBC = +{ + .tileTag = 4613, + .paletteTag = 4608, + .oam = &gUnknown_08524904, + .anims = gSpriteAnimTable_839ACB8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = unc_0807DAB4, +}; + +void sub_8080588(u16 a) +{ + s16 x = gUnknown_0839AC78[a][0]; + s16 y = gUnknown_0839AC78[a][1] - gSpriteCoordOffsetY; + u8 spriteId = CreateSpriteAtEnd( + &gSpriteTemplate_839ACBC, + x, + y, + 0); + + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 1; + gSprites[spriteId].coordOffsetEnabled = TRUE; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = 0; + gSprites[spriteId].data[2] = 0; + gWeatherPtr->unknown_72C++; + } +} + +void sub_8080610(void) +{ + u16 i; + + if (gWeatherPtr->unknown_72C != 0) + { + for (i = 0; i < 64; i++) + { + if (gSprites[i].template == &gSpriteTemplate_839ACBC) + DestroySprite(&gSprites[i]); + } + FreeSpriteTilesByTag(0x1205); + gWeatherPtr->unknown_72C = 0; + } +} + +void unc_0807DAB4(struct Sprite *sprite) +{ + ++sprite->data[0]; + if (++sprite->data[0] > 8) // double increment + { + sprite->data[0] = 0; + if (sprite->data[1] == 0) + { + if (++sprite->pos2.x > 4) + sprite->data[1] = 1; + } + else + { + if (--sprite->pos2.x <= 0) + sprite->data[1] = 0; + } + } + sprite->pos1.y -= 3; + if (++sprite->data[2] > 0x77) + DestroySprite(sprite); +} + +// New Emerald functions. +extern u8 gUnknown_02038BC4; +extern u16 gUnknown_02038BC6; +void sub_80AEC94(u32 a0, u32 a1) +{ + gUnknown_02038BC4 = a0; + gUnknown_02038BC6 = a1; +} + +void sub_80AECA8(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + if (data[15]-- <= 0) + { + ChangeWeather(data[1]); + gUnknown_02038BC4 = data[1]; + data[15] = 600; + data[0]++; + } + break; + case 1: + if (data[15]-- <= 0) + { + ChangeWeather(data[2]); + gUnknown_02038BC4 = data[2]; + data[15] = 600; + data[0] = 0; + } + break; + } +} + +void sub_80AED28(void) +{ + u8 taskId = CreateTask(sub_80AECA8, 0); + s16 *data = gTasks[taskId].data; + + data[15] = 600; + if (gUnknown_02038BC4 == 13) + { + data[1] = 12; + data[2] = 13; + } + else if (gUnknown_02038BC4 == 12) + { + data[1] = 13; + data[2] = 12; + } + else + { + gUnknown_02038BC4 = 13; + data[1] = 12; + data[2] = 13; + } +} + +//------------------------------------------------------------------------------ + +/*static*/ u8 TranslateWeatherNum(u8); +/*static*/ void UpdateRainCounter(u8, u8); + +void SetSav1Weather(u32 weather) +{ + u8 oldWeather = gSaveBlock1Ptr->weather; + gSaveBlock1Ptr->weather = TranslateWeatherNum(weather); + UpdateRainCounter(gSaveBlock1Ptr->weather, oldWeather); +} + +u8 GetSav1Weather(void) +{ + return gSaveBlock1Ptr->weather; +} + +void SetSav1WeatherFromCurrMapHeader(void) +{ + u8 oldWeather = gSaveBlock1Ptr->weather; + gSaveBlock1Ptr->weather = TranslateWeatherNum(gMapHeader.weather); + UpdateRainCounter(gSaveBlock1Ptr->weather, oldWeather); +} + +void SetWeather(u32 weather) +{ + SetSav1Weather(weather); + ChangeWeather(GetSav1Weather()); +} + +void SetWeather_Unused(u32 weather) +{ + SetSav1Weather(weather); + sub_80AB104(GetSav1Weather()); +} + +void DoCurrentWeather(void) +{ + u8 weather = GetSav1Weather(); + + if (weather == 15) + { + if (!FuncIsActiveTask(sub_80AECA8)) + sub_80AED28(); + weather = gUnknown_02038BC4; + } + else + { + if (FuncIsActiveTask(sub_80AECA8)) + DestroyTask(FindTaskIdByFunc(sub_80AECA8)); + gUnknown_02038BC4 = 13; + } + ChangeWeather(weather); +} + +void sub_80AEE84(void) +{ + u8 weather = GetSav1Weather(); + + if (weather == 15) + { + if (!FuncIsActiveTask(sub_80AECA8)) + sub_80AED28(); + weather = gUnknown_02038BC4; + } + else + { + if (FuncIsActiveTask(sub_80AECA8)) + DestroyTask(FindTaskIdByFunc(sub_80AECA8)); + gUnknown_02038BC4 = 13; + } + sub_80AB104(weather); +} + +/*static*/ const u8 sWeatherCycleRoute119[] = +{ + WEATHER_SUNNY, + WEATHER_RAIN_LIGHT, + WEATHER_RAIN_MED, + WEATHER_RAIN_LIGHT, +}; +/*static*/ const u8 sWeatherCycleRoute123[] = +{ + WEATHER_SUNNY, + WEATHER_SUNNY, + WEATHER_RAIN_LIGHT, + WEATHER_SUNNY, +}; + +/*static*/ u8 TranslateWeatherNum(u8 weather) +{ + switch (weather) + { + case WEATHER_NONE: return WEATHER_NONE; + case WEATHER_CLOUDS: return WEATHER_CLOUDS; + case WEATHER_SUNNY: return WEATHER_SUNNY; + case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT; + case WEATHER_SNOW: return WEATHER_SNOW; + case WEATHER_RAIN_MED: return WEATHER_RAIN_MED; + case WEATHER_FOG_1: return WEATHER_FOG_1; + case WEATHER_ASH: return WEATHER_ASH; + case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; + case WEATHER_FOG_2: return WEATHER_FOG_2; + case WEATHER_FOG_3: return WEATHER_FOG_3; + case WEATHER_SHADE: return WEATHER_SHADE; + case WEATHER_DROUGHT: return WEATHER_DROUGHT; + case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; + case WEATHER_BUBBLES: return WEATHER_BUBBLES; + case 15: return 15; + case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; + case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; + default: return WEATHER_NONE; + } +} + +void UpdateWeatherPerDay(u16 increment) +{ + u16 weatherStage = gSaveBlock1Ptr->weatherCycleStage + increment; + weatherStage %= 4; + gSaveBlock1Ptr->weatherCycleStage = weatherStage; +} + +/*static*/ void UpdateRainCounter(u8 newWeather, u8 oldWeather) +{ + if (newWeather != oldWeather + && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED)) + IncrementGameStat(GAME_STAT_GOT_RAINED_ON); +} diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 9951fe581..bc62ac2af 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -4,6 +4,7 @@ #include "field_effect.h" #include "field_player_avatar.h" #include "field_screen.h" +#include "field_weather.h" #include "palette.h" #include "party_menu.h" #include "rom6.h" @@ -40,7 +41,7 @@ bool8 FldEff_SweetScent(void) { u8 taskId; - sub_80AC3D0(); + SetWeatherScreenFadeOut(); taskId = oei_task_add(); gTasks[taskId].data[8] = (u32)StartSweetScentFieldEffect >> 16; gTasks[taskId].data[9] = (u32)StartSweetScentFieldEffect; diff --git a/src/overworld.c b/src/overworld.c index 3193ec0d3..470e27ffc 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -148,7 +148,7 @@ extern void ResetAllPicSprites(void); extern void FieldEffectActiveListClear(void); extern void SetUpFieldTasks(void); extern void sub_81BE6B8(void); -extern void sub_80AAFA4(void); +extern void StartWeather(void); extern void ShowStartMenu(void); extern void sub_80AEE84(void); extern void mapldr_default(void); @@ -2160,7 +2160,7 @@ static void sub_8086988(u32 a1) InitEventObjectPalettes(1); FieldEffectActiveListClear(); - sub_80AAFA4(); + StartWeather(); sub_80AEE84(); if (!a1) SetUpFieldTasks(); diff --git a/src/start_menu.c b/src/start_menu.c index 079f05be0..0e52f05fb 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -88,7 +88,7 @@ extern void sub_80AF688(void); extern void var_800D_set_xB(void); extern void sub_808B864(void); extern void CB2_Pokedex(void); -extern void play_some_sound(void); +extern void PlayRainSoundEffect(void); extern void CB2_PartyMenuFromStartMenu(void); extern void CB2_PokeNav(void); extern void sub_80C4DDC(void (*)(void)); @@ -621,7 +621,7 @@ static bool8 StartMenuPokedexCallback(void) if (!gPaletteFade.active) { IncrementGameStat(GAME_STAT_CHECKED_POKEDEX); - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_Pokedex); @@ -636,7 +636,7 @@ static bool8 StartMenuPokemonCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_PartyMenuFromStartMenu); // Display party menu @@ -651,7 +651,7 @@ static bool8 StartMenuBagCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_BagMenuFromStartMenu); // Display bag menu @@ -666,7 +666,7 @@ static bool8 StartMenuPokeNavCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_PokeNav); // Display PokeNav @@ -681,7 +681,7 @@ static bool8 StartMenuPlayerNameCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); @@ -720,7 +720,7 @@ static bool8 StartMenuOptionCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_InitOptionMenu); // Display option menu @@ -753,7 +753,7 @@ static bool8 StartMenuLinkModePlayerNameCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); overworld_free_bg_tilemaps(); TrainerCard_ShowLinkCard(gUnknown_03005DB4, CB2_ReturnToFieldWithOpenMenu); @@ -782,7 +782,7 @@ static bool8 StartMenuBattlePyramidBagCallback(void) { if (!gPaletteFade.active) { - play_some_sound(); + PlayRainSoundEffect(); RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_PyramidBagMenuFromStartMenu); diff --git a/sym_bss.txt b/sym_bss.txt index d006e1364..a40d3751d 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -21,7 +21,7 @@ .include "src/tileset_anims.o" .include "src/palette.o" .include "src/sound.o" - .include "src/field_screen.o" + .include "src/field_weather.o" .include "src/field_effect.o" .include "src/pokemon_storage_system.o" .include "src/fldeff_cut.o" diff --git a/sym_ewram.txt b/sym_ewram.txt index 19146b72d..8d8a6c177 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -154,17 +154,7 @@ gUnknown_020375C0: @ 20375C0 .include "src/battle_anim_80A5C6C.o" .space 0xC -gUnknown_02038454: @ 2038454 - .space 0x200 - -gUnknown_02038654: @ 2038654 - .space 0x260 - -gUnknown_020388B4: @ 20388B4 - .space 0x2F0 - -gUnknown_02038BA4: @ 2038BA4 - .space 0x20 + .include "src/field_weather.o" gUnknown_02038BC4: @ 2038BC4 .space 0x2 -- cgit v1.2.3 From 2dfbe75b05cd6ec6e686d5e58de9a0a58e5af408 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sat, 8 Dec 2018 23:52:52 +0530 Subject: Shift externs to header file --- include/battle_anim.h | 6 ++++++ src/fire.c | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/battle_anim.h b/include/battle_anim.h index c3601bbd9..8d73ea9b3 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -3,6 +3,7 @@ #include "battle.h" #include "constants/battle_anim.h" +#include "task.h" enum { @@ -124,6 +125,11 @@ void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); void sub_80A6CC0(u32, const void*, u32); void sub_80A6DAC(bool8); void sub_80A634C(struct Sprite *); +void sub_80A653C(struct Sprite *); +void sub_80A7E6C(u8 spriteId); +void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); +u8 sub_80A80C8(struct Task *task); +void sub_80A8EE4(struct Sprite *); enum { diff --git a/src/fire.c b/src/fire.c index c5db6dbce..c054f154e 100644 --- a/src/fire.c +++ b/src/fire.c @@ -7,12 +7,6 @@ #include "task.h" #include "trig.h" -//battle anim -extern void sub_80A7E6C(u8 spriteId); -extern void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); -extern u8 sub_80A80C8(struct Task *task); - -extern void sub_80A653C(struct Sprite *); static void sub_8108EC8(struct Sprite *); static void sub_8108F08(struct Sprite *); static void sub_8108F4C(struct Sprite *); @@ -21,7 +15,6 @@ static void sub_8109028(struct Sprite *); static void sub_8109064(struct Sprite *); static void sub_81090D8(struct Sprite *); static void sub_810916C(struct Sprite *); -extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *); static void AnimEmberFlare(struct Sprite *); static void sub_8109200(struct Sprite *); static void AnimFireRing(struct Sprite *); @@ -35,7 +28,6 @@ static void sub_81093E4(struct Sprite *); static void sub_810940C(struct Sprite *); static void sub_81094D0(u8 taskId); static void sub_81097B4(u8 spriteId, u8 taskId, u8 a3); -extern void sub_80A8EE4(struct Sprite *); static void sub_81098EC(struct Sprite *); static u16 sub_8109930(u8 spriteId); static void sub_8109984(struct Sprite *sprite, s16 x, s16 y); -- cgit v1.2.3 From 5caca7a4d628dec45a5a9326db024aa1c4ffd98f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 19:43:21 +0100 Subject: Clean up field weather --- data/field_screen.s | 5 - include/constants/weather.h | 1 + include/field_screen.h | 6 - include/field_weather.h | 142 ++++++++---- ld_script.txt | 1 - src/battle_util.c | 14 +- src/clock.c | 2 +- src/field_weather.c | 513 ++++++++++++++++++++------------------------ src/field_weather_effect.c | 165 +++++++------- sym_ewram.txt | 8 +- 10 files changed, 412 insertions(+), 445 deletions(-) delete mode 100644 data/field_screen.s diff --git a/data/field_screen.s b/data/field_screen.s deleted file mode 100644 index 508e86c63..000000000 --- a/data/field_screen.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - diff --git a/include/constants/weather.h b/include/constants/weather.h index 953cc2753..d0a81c34c 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -16,6 +16,7 @@ #define WEATHER_DROUGHT 12 #define WEATHER_RAIN_HEAVY 13 #define WEATHER_BUBBLES 14 +#define WEATHER_15 15 #define WEATHER_ROUTE119_CYCLE 20 #define WEATHER_ROUTE123_CYCLE 21 diff --git a/include/field_screen.h b/include/field_screen.h index 021d2b9e9..f8598bea6 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -7,15 +7,9 @@ // Exported ROM declarations void pal_fill_black(void); -bool8 IsWeatherNotFadingIn(void); void sub_80AF168(void); void sub_80AF2B4(u8 taskId); -void UpdateWeatherPerDay(u16 days); -void sub_80AC3D0(void); -void sub_80AC3E4(void); -void PreservePaletteInWeather(u8); void sub_80AF128(void); -void sub_80AB104(u8); void sub_80AF80C(u8); void sub_80AF828(void); void sub_80AF838(void); diff --git a/include/field_weather.h b/include/field_weather.h index d4bc85afd..c032183e1 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -12,6 +12,15 @@ enum WEATHER_PAL_STATE_IDLE, }; +// For the FadeScreen function. +enum +{ + FADE_FROM_BLACK, + FADE_TO_BLACK, + FADE_FROM_WHITE, + FADE_TO_WHITE, +}; + struct Weather { union @@ -122,58 +131,103 @@ struct Weather u8 loadDroughtPalsOffset; }; +// field_weather.c +extern struct Weather gWeather; +extern struct Weather *const gWeatherPtr; + void StartWeather(void); void ChangeWeather(u8 weather); -void sub_807C988(u8 effect); -void sub_807C9B4(u8 effect); -void Task_WeatherInit(u8); -void Task_WeatherMain(u8); -void sub_807CAE8(void); -void nullsub_38(void); -void SetWeatherScreenFadeOut(void); - -enum -{ - FADE_FROM_BLACK, - FADE_TO_BLACK, - FADE_FROM_WHITE, - FADE_TO_WHITE, -}; - -void FadeScreen(u8, s8); -// ... -void UpdateSpritePaletteWithWeather(u8 tag); -void ApplyWeatherGammaShiftToPal(u8); -// ... -void Weather_SetBlendCoeffs(u8, u8); -// ... -void PlayRainSoundEffect(void); -// ... -void SetSav1Weather(u32); -u8 GetSav1Weather(void); -void sub_80AEDBC(void); - -void SetSav1WeatherFromCurrMapHeader(void); -// ... -void DoCurrentWeather(void); -void sub_8080750(void); - +void sub_80AB104(u8 weather); +void sub_80AB130(u8 weather); +void sub_80ABC48(s8 gammaIndex); +void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay); +void FadeScreen(u8 mode, s8 delay); bool8 IsWeatherNotFadingIn(void); -bool8 IsWeatherChangeComplete(void); -void SetWeather(u32); -void UpdateWeatherPerDay(u16); -void PreservePaletteInWeather(u8 index); -void ResetPreservedPalettesInWeather(void); -extern void ResetDroughtWeatherPaletteLoading(void); +void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex); +void ApplyWeatherGammaShiftToPal(u8 paletteIndex); +u8 sub_80ABF20(void); +void LoadCustomWeatherSpritePalette(const u16 *palette); void ResetDroughtWeatherPaletteLoading(void); bool8 LoadDroughtWeatherPalettes(void); +void sub_80ABFE0(s8 gammaIndex); +void sub_80ABFF0(void); +void sub_80AC01C(void); +void Weather_SetBlendCoeffs(u8 eva, u8 evb); +void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay); +bool8 Weather_UpdateBlend(void); +void sub_80AC274(u8 a); u8 GetCurrentWeather(void); -void LoadCustomWeatherSpritePalette(const u16 *palette); +void SetRainStrengthFromSoundEffect(u16 soundEffect); +void PlayRainSoundEffect(void); +u8 IsWeatherChangeComplete(void); void SetWeatherScreenFadeOut(void); +void sub_80AC3E4(void); +void PreservePaletteInWeather(u8 preservedPalIndex); +void ResetPreservedPalettesInWeather(void); +// field_weather_effect.c +void Clouds_InitVars(void); +void Clouds_Main(void); +void Clouds_InitAll(void); +bool8 Clouds_Finish(void); +void Weather2_InitVars(void); +void Weather2_Main(void); +void Weather2_InitAll(void); +bool8 Weather2_Finish(void); +void LightRain_InitVars(void); +void LightRain_Main(void); +void LightRain_InitAll(void); +bool8 LightRain_Finish(void); +void Snow_InitVars(void); +void Snow_Main(void); +void Snow_InitAll(void); +bool8 Snow_Finish(void); +void MedRain_InitVars(void); +void Rain_Main(void); +void MedRain_InitAll(void); +bool8 Rain_Finish(void); +void Fog1_InitVars(void); +void Fog1_Main(void); +void Fog1_InitAll(void); +bool8 Fog1_Finish(void); +void Ash_InitVars(void); +void Ash_Main(void); +void Ash_InitAll(void); +bool8 Ash_Finish(void); +void Sandstorm_InitVars(void); +void Sandstorm_Main(void); +void Sandstorm_InitAll(void); +bool8 Sandstorm_Finish(void); +void Fog2_InitVars(void); +void Fog2_Main(void); +void Fog2_InitAll(void); +bool8 Fog2_Finish(void); +void Fog1_InitVars(void); +void Fog1_Main(void); +void Fog1_InitAll(void); +bool8 Fog1_Finish(void); +void Shade_InitVars(void); +void Shade_Main(void); +void Shade_InitAll(void); +bool8 Shade_Finish(void); +void Drought_InitVars(void); +void Drought_Main(void); +void Drought_InitAll(void); +bool8 Drought_Finish(void); +void HeavyRain_InitVars(void); +void Rain_Main(void); +void HeavyRain_InitAll(void); +bool8 Rain_Finish(void); +void Bubbles_InitVars(void); +void Bubbles_Main(void); +void Bubbles_InitAll(void); +bool8 Bubbles_Finish(void); -extern struct Weather gWeather; - -extern struct Weather *const gWeatherPtr; +u8 GetSav1Weather(void); +void SetSav1Weather(u32 weather); +void SetSav1WeatherFromCurrMapHeader(void); +void SetWeather(u32 weather); +void DoCurrentWeather(void); +void UpdateWeatherPerDay(u16 increment); #endif // GUARD_WEATHER_H diff --git a/ld_script.txt b/ld_script.txt index 7fe0e5f47..e74ff6f6f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -448,7 +448,6 @@ SECTIONS { src/title_screen.o(.rodata); data/field_weather.o(.rodata); src/field_weather.o(.rodata); - data/field_screen.o(.rodata); src/field_weather_effect.o(.rodata); data/field_screen_2.o(.rodata); src/battle_setup.o(.rodata); diff --git a/src/battle_util.c b/src/battle_util.c index 94aaea66c..2ddd4f550 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -17,13 +17,13 @@ #include "string_util.h" #include "battle_message.h" #include "constants/battle_string_ids.h" +#include "constants/weather.h" #include "battle_ai_script_commands.h" #include "battle_controllers.h" #include "event_data.h" #include "link.h" #include "berry.h" - -extern u8 GetCurrentWeather(void); +#include "field_weather.h" // rom const data static const u16 sSoundMovesTable[] = @@ -1829,9 +1829,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA { switch (GetCurrentWeather()) { - case 3: - case 5: - case 13: + case WEATHER_RAIN_LIGHT: + case WEATHER_RAIN_MED: + case WEATHER_RAIN_HEAVY: if (!(gBattleWeather & WEATHER_RAIN_ANY)) { gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); @@ -1840,7 +1840,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA effect++; } break; - case 8: + case WEATHER_SANDSTORM: if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) { gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); @@ -1849,7 +1849,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA effect++; } break; - case 12: + case WEATHER_DROUGHT: if (!(gBattleWeather & WEATHER_SUN_ANY)) { gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); diff --git a/src/clock.c b/src/clock.c index 91eb5f16d..aea6c2088 100644 --- a/src/clock.c +++ b/src/clock.c @@ -5,7 +5,7 @@ #include "lottery_corner.h" #include "dewford_trend.h" #include "tv.h" -#include "field_screen.h" +#include "field_weather.h" #include "berry.h" #include "main.h" #include "overworld.h" diff --git a/src/field_weather.c b/src/field_weather.c index 0be584d51..be3396c63 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -47,87 +47,41 @@ struct WeatherCallbacks }; // This file's functions. -/*static*/ bool8 LightenSpritePaletteInFog(u8); -/*static*/ void BuildGammaShiftTables(void); -/*static*/ void UpdateWeatherGammaShift(void); -/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex); -/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor); -/*static*/ void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor); -/*static*/ void ApplyFogBlend(u8 blendCoeff, u16 blendColor); -/*static*/ bool8 FadeInScreen_RainShowShade(void); -/*static*/ bool8 FadeInScreen_Drought(void); -/*static*/ bool8 FadeInScreen_Fog1(void); -/*static*/ void FadeInScreenWithWeather(void); -/*static*/ void DoNothing(void); -void None_Init(void); -void None_Main(void); -bool8 None_Finish(void); -void Clouds_InitVars(void); -void Clouds_Main(void); -void Clouds_InitAll(void); -bool8 Clouds_Finish(void); -void Weather2_InitVars(void); -void Weather2_Main(void); -void Weather2_InitAll(void); -bool8 Weather2_Finish(void); -void LightRain_InitVars(void); -void LightRain_Main(void); -void LightRain_InitAll(void); -bool8 LightRain_Finish(void); -void Snow_InitVars(void); -void Snow_Main(void); -void Snow_InitAll(void); -bool8 Snow_Finish(void); -void MedRain_InitVars(void); -void Rain_Main(void); -void MedRain_InitAll(void); -bool8 Rain_Finish(void); -void Fog1_InitVars(void); -void Fog1_Main(void); -void Fog1_InitAll(void); -bool8 Fog1_Finish(void); -void Ash_InitVars(void); -void Ash_Main(void); -void Ash_InitAll(void); -bool8 Ash_Finish(void); -void Sandstorm_InitVars(void); -void Sandstorm_Main(void); -void Sandstorm_InitAll(void); -bool8 Sandstorm_Finish(void); -void Fog2_InitVars(void); -void Fog2_Main(void); -void Fog2_InitAll(void); -bool8 Fog2_Finish(void); -void Fog1_InitVars(void); -void Fog1_Main(void); -void Fog1_InitAll(void); -bool8 Fog1_Finish(void); -void Shade_InitVars(void); -void Shade_Main(void); -void Shade_InitAll(void); -bool8 Shade_Finish(void); -void Drought_InitVars(void); -void Drought_Main(void); -void Drought_InitAll(void); -bool8 Drought_Finish(void); -void HeavyRain_InitVars(void); -void Rain_Main(void); -void HeavyRain_InitAll(void); -bool8 Rain_Finish(void); -void Bubbles_InitVars(void); -void Bubbles_Main(void); -void Bubbles_InitAll(void); -bool8 Bubbles_Finish(void); - -// Const rom data - -// This is a pointer to gWeather. All code in this file accesses gWeather directly, +static bool8 LightenSpritePaletteInFog(u8); +static void BuildGammaShiftTables(void); +static void UpdateWeatherGammaShift(void); +static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex); +static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor); +static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor); +static void ApplyFogBlend(u8 blendCoeff, u16 blendColor); +static bool8 FadeInScreen_RainShowShade(void); +static bool8 FadeInScreen_Drought(void); +static bool8 FadeInScreen_Fog1(void); +static void FadeInScreenWithWeather(void); +static void DoNothing(void); +static void Task_WeatherInit(u8 taskId); +static void Task_WeatherMain(u8 taskId); +static void None_Init(void); +static void None_Main(void); +static u8 None_Finish(void); + +// EWRAM +EWRAM_DATA struct Weather gWeather = {0}; +EWRAM_DATA static u8 sFieldEffectPaletteGammaTypes[32] = {0}; + +// IWRAM bss +IWRAM_DATA static const u8 *sPaletteGammaTypes; + +// CONST +extern const u16 gUnknown_0854014C[][4096]; + +// This is a pointer to gWeatherPtr. All code in this file accesses gWeather directly, // while code in other field weather files accesses gWeather through this pointer. // This is likely the result of compiler optimization, since using the pointer in // this file produces the same result as accessing gWeather directly. struct Weather *const gWeatherPtr = &gWeather; -/*static*/ const struct WeatherCallbacks sWeatherFuncs[] = +static const struct WeatherCallbacks sWeatherFuncs[] = { {None_Init, None_Main, None_Init, None_Finish}, {Clouds_InitVars, Clouds_Main, Clouds_InitAll, Clouds_Finish}, @@ -156,7 +110,7 @@ void (*const gWeatherPalStateFuncs[])(void) = // This table specifies which of the gamma shift tables should be // applied to each of the background and sprite palettes. -/*static*/ const u8 sBasePaletteGammaTypes[32] = +static const u8 sBasePaletteGammaTypes[32] = { // background palettes GAMMA_NORMAL, @@ -194,18 +148,7 @@ void (*const gWeatherPalStateFuncs[])(void) = GAMMA_NORMAL, }; - -// EWRAM -EWRAM_DATA struct Weather gWeather = {0}; -EWRAM_DATA u8 gFieldEffectPaletteGammaTypes[32] = {0}; - -// IWRAM bss -IWRAM_DATA const u8 *sPaletteGammaTypes; -IWRAM_DATA u32 filler_03000f54; - -// const -extern const u16 gUnknown_083970E8[]; -extern const u16 gUnknown_0854014C[][4096]; +const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); // code void StartWeather(void) @@ -215,25 +158,25 @@ void StartWeather(void) u8 index = AllocSpritePalette(0x1200); CpuCopy32(gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32); BuildGammaShiftTables(); - gWeather.altGammaSpritePalIndex = index; - gWeather.weatherPicSpritePalIndex = AllocSpritePalette(0x1201); - gWeather.rainSpriteCount = 0; - gWeather.unknown_6D8 = 0; - gWeather.cloudSpritesCreated = 0; - gWeather.snowflakeSpriteCount = 0; - gWeather.ashSpritesCreated = 0; - gWeather.fog1SpritesCreated = 0; - gWeather.fog2SpritesCreated = 0; - gWeather.sandstormSprites1Created = 0; - gWeather.sandstormSprites2Created = 0; - gWeather.unknown_72E = 0; - gWeather.lightenedFogSpritePalsCount = 0; + gWeatherPtr->altGammaSpritePalIndex = index; + gWeatherPtr->weatherPicSpritePalIndex = AllocSpritePalette(0x1201); + gWeatherPtr->rainSpriteCount = 0; + gWeatherPtr->unknown_6D8 = 0; + gWeatherPtr->cloudSpritesCreated = 0; + gWeatherPtr->snowflakeSpriteCount = 0; + gWeatherPtr->ashSpritesCreated = 0; + gWeatherPtr->fog1SpritesCreated = 0; + gWeatherPtr->fog2SpritesCreated = 0; + gWeatherPtr->sandstormSprites1Created = 0; + gWeatherPtr->sandstormSprites2Created = 0; + gWeatherPtr->unknown_72E = 0; + gWeatherPtr->lightenedFogSpritePalsCount = 0; Weather_SetBlendCoeffs(16, 0); - gWeather.currWeather = 0; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; - gWeather.readyForInit = FALSE; - gWeather.weatherChangeComplete = TRUE; - gWeather.taskId = CreateTask(Task_WeatherInit, 80); + gWeatherPtr->currWeather = 0; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->readyForInit = FALSE; + gWeatherPtr->weatherChangeComplete = TRUE; + gWeatherPtr->taskId = CreateTask(Task_WeatherInit, 80); } } @@ -244,75 +187,75 @@ void ChangeWeather(u8 weather) PlayRainSoundEffect(); } - if (gWeather.nextWeather != weather && gWeather.currWeather == weather) + if (gWeatherPtr->nextWeather != weather && gWeatherPtr->currWeather == weather) { sWeatherFuncs[weather].initVars(); } - gWeather.weatherChangeComplete = FALSE; - gWeather.nextWeather = weather; - gWeather.finishStep = 0; + gWeatherPtr->weatherChangeComplete = FALSE; + gWeatherPtr->nextWeather = weather; + gWeatherPtr->finishStep = 0; } void sub_80AB104(u8 weather) { PlayRainSoundEffect(); - gWeather.currWeather = weather; - gWeather.nextWeather = weather; + gWeatherPtr->currWeather = weather; + gWeatherPtr->nextWeather = weather; } void sub_80AB130(u8 weather) { PlayRainSoundEffect(); - gWeather.currWeather = weather; - gWeather.nextWeather = weather; - gWeather.readyForInit = TRUE; + gWeatherPtr->currWeather = weather; + gWeatherPtr->nextWeather = weather; + gWeatherPtr->readyForInit = TRUE; } -void Task_WeatherInit(u8 taskId) +static void Task_WeatherInit(u8 taskId) { // Waits until it's ok to initialize weather. // When the screen fades in, this is set to TRUE. - if (gWeather.readyForInit) + if (gWeatherPtr->readyForInit) { - sWeatherFuncs[gWeather.currWeather].initAll(); + sWeatherFuncs[gWeatherPtr->currWeather].initAll(); gTasks[taskId].func = Task_WeatherMain; } } -void Task_WeatherMain(u8 taskId) +static void Task_WeatherMain(u8 taskId) { - if (gWeather.currWeather != gWeather.nextWeather) + if (gWeatherPtr->currWeather != gWeatherPtr->nextWeather) { - if (!sWeatherFuncs[gWeather.currWeather].finish() && gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + if (!sWeatherFuncs[gWeatherPtr->currWeather].finish() && gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) { // Finished cleaning up previous weather. Now transition to next weather. - sWeatherFuncs[gWeather.nextWeather].initVars(); - gWeather.gammaStepFrameCounter = 0; - gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; - gWeather.currWeather = gWeather.nextWeather; - gWeather.weatherChangeComplete = TRUE; + sWeatherFuncs[gWeatherPtr->nextWeather].initVars(); + gWeatherPtr->gammaStepFrameCounter = 0; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; + gWeatherPtr->currWeather = gWeatherPtr->nextWeather; + gWeatherPtr->weatherChangeComplete = TRUE; } } else { - sWeatherFuncs[gWeather.currWeather].main(); + sWeatherFuncs[gWeatherPtr->currWeather].main(); } - gWeatherPalStateFuncs[gWeather.palProcessingState](); + gWeatherPalStateFuncs[gWeatherPtr->palProcessingState](); } -void None_Init(void) +static void None_Init(void) { - gWeather.gammaTargetIndex = 0; - gWeather.gammaStepDelay = 0; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 0; } -void None_Main(void) +static void None_Main(void) { } -u8 None_Finish(void) +static u8 None_Finish(void) { return 0; } @@ -320,7 +263,7 @@ u8 None_Finish(void) // Builds two tables that contain gamma shifts for palette colors. // It's unclear why the two tables aren't declared as const arrays, since // this function always builds the same two tables. -/*static*/ void BuildGammaShiftTables(void) +static void BuildGammaShiftTables(void) { u16 v0; u8 (*v1)[32]; @@ -337,9 +280,9 @@ u8 None_Finish(void) for (v0 = 0; v0 <= 1; v0++) { if (v0 == 0) - v1 = gWeather.gammaShifts; + v1 = gWeatherPtr->gammaShifts; else - v1 = gWeather.altGammaShifts; + v1 = gWeatherPtr->altGammaShifts; for (v2 = 0; v2 < 32; v2++) { @@ -389,36 +332,36 @@ u8 None_Finish(void) // When the weather is changing, it gradually updates the palettes // towards the desired gamma shift. -/*static*/ void UpdateWeatherGammaShift(void) +static void UpdateWeatherGammaShift(void) { - if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) { - if (gWeather.gammaIndex == gWeather.gammaTargetIndex) + if (gWeatherPtr->gammaIndex == gWeatherPtr->gammaTargetIndex) { - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } else { - if (++gWeather.gammaStepFrameCounter >= gWeather.gammaStepDelay) + if (++gWeatherPtr->gammaStepFrameCounter >= gWeatherPtr->gammaStepDelay) { - gWeather.gammaStepFrameCounter = 0; - if (gWeather.gammaIndex < gWeather.gammaTargetIndex) - gWeather.gammaIndex++; + gWeatherPtr->gammaStepFrameCounter = 0; + if (gWeatherPtr->gammaIndex < gWeatherPtr->gammaTargetIndex) + gWeatherPtr->gammaIndex++; else - gWeather.gammaIndex--; + gWeatherPtr->gammaIndex--; - ApplyGammaShift(0, 32, gWeather.gammaIndex); + ApplyGammaShift(0, 32, gWeatherPtr->gammaIndex); } } } } -/*static*/ void FadeInScreenWithWeather(void) +static void FadeInScreenWithWeather(void) { - if (++gWeather.unknown_6CB > 1) - gWeather.unknown_6CA = 0; + if (++gWeatherPtr->unknown_6CB > 1) + gWeatherPtr->unknown_6CA = 0; - switch (gWeather.currWeather) + switch (gWeatherPtr->currWeather) { case WEATHER_RAIN_LIGHT: case WEATHER_RAIN_MED: @@ -427,22 +370,22 @@ u8 None_Finish(void) case WEATHER_SHADE: if (FadeInScreen_RainShowShade() == FALSE) { - gWeather.gammaIndex = 3; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->gammaIndex = 3; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_DROUGHT: if (FadeInScreen_Drought() == FALSE) { - gWeather.gammaIndex = -6; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->gammaIndex = -6; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_FOG_1: if (FadeInScreen_Fog1() == FALSE) { - gWeather.gammaIndex = 0; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->gammaIndex = 0; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_ASH: @@ -452,59 +395,59 @@ u8 None_Finish(void) default: if (!gPaletteFade.active) { - gWeather.gammaIndex = gWeather.gammaTargetIndex; - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->gammaIndex = gWeatherPtr->gammaTargetIndex; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; } } -bool8 FadeInScreen_RainShowShade(void) +static bool8 FadeInScreen_RainShowShade(void) { - if (gWeather.fadeScreenCounter == 16) + if (gWeatherPtr->fadeScreenCounter == 16) return FALSE; - if (++gWeather.fadeScreenCounter >= 16) + if (++gWeatherPtr->fadeScreenCounter >= 16) { ApplyGammaShift(0, 32, 3); - gWeather.fadeScreenCounter = 16; + gWeatherPtr->fadeScreenCounter = 16; return FALSE; } - ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); return TRUE; } -bool8 FadeInScreen_Drought(void) +static bool8 FadeInScreen_Drought(void) { - if (gWeather.fadeScreenCounter == 16) + if (gWeatherPtr->fadeScreenCounter == 16) return FALSE; - if (++gWeather.fadeScreenCounter >= 16) + if (++gWeatherPtr->fadeScreenCounter >= 16) { ApplyGammaShift(0, 32, -6); - gWeather.fadeScreenCounter = 16; + gWeatherPtr->fadeScreenCounter = 16; return FALSE; } - ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); return TRUE; } -bool8 FadeInScreen_Fog1(void) +static bool8 FadeInScreen_Fog1(void) { - if (gWeather.fadeScreenCounter == 16) + if (gWeatherPtr->fadeScreenCounter == 16) return FALSE; - gWeather.fadeScreenCounter++; - ApplyFogBlend(16 - gWeather.fadeScreenCounter, gWeather.fadeDestColor); + gWeatherPtr->fadeScreenCounter++; + ApplyFogBlend(16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); return TRUE; } -/*static*/ void DoNothing(void) +static void DoNothing(void) { } -/*static*/ void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) +static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) { u16 curPalIndex; u16 palOffset; @@ -531,10 +474,10 @@ bool8 FadeInScreen_Fog1(void) { u8 r, g, b; - if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeather.altGammaSpritePalIndex) - gammaTable = gWeather.altGammaShifts[gammaIndex]; + if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeatherPtr->altGammaSpritePalIndex) + gammaTable = gWeatherPtr->altGammaShifts[gammaIndex]; else - gammaTable = gWeather.gammaShifts[gammaIndex]; + gammaTable = gWeatherPtr->gammaShifts[gammaIndex]; for (i = 0; i < 16; i++) { @@ -585,7 +528,7 @@ bool8 FadeInScreen_Fog1(void) } } -/*static*/ void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) +static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) { u16 palOffset; u16 curPalIndex; @@ -613,9 +556,9 @@ bool8 FadeInScreen_Fog1(void) u8 *gammaTable; if (sPaletteGammaTypes[curPalIndex] == GAMMA_NORMAL) - gammaTable = gWeather.gammaShifts[gammaIndex]; + gammaTable = gWeatherPtr->gammaShifts[gammaIndex]; else - gammaTable = gWeather.altGammaShifts[gammaIndex]; + gammaTable = gWeatherPtr->altGammaShifts[gammaIndex]; for (i = 0; i < 16; i++) { @@ -636,7 +579,7 @@ bool8 FadeInScreen_Fog1(void) } } -void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor) +static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor) { struct RGBColor color; u8 rBlend; @@ -691,7 +634,7 @@ void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColo } } -void ApplyFogBlend(u8 blendCoeff, u16 blendColor) +static void ApplyFogBlend(u8 blendCoeff, u16 blendColor) { struct RGBColor color; u8 rBlend; @@ -738,22 +681,22 @@ void ApplyFogBlend(u8 blendCoeff, u16 blendColor) } } -/*static*/ void MarkFogSpritePalToLighten(u8 paletteIndex) +static void MarkFogSpritePalToLighten(u8 paletteIndex) { - if (gWeather.lightenedFogSpritePalsCount < 6) + if (gWeatherPtr->lightenedFogSpritePalsCount < 6) { - gWeather.lightenedFogSpritePals[gWeather.lightenedFogSpritePalsCount] = paletteIndex; - gWeather.lightenedFogSpritePalsCount++; + gWeatherPtr->lightenedFogSpritePals[gWeatherPtr->lightenedFogSpritePalsCount] = paletteIndex; + gWeatherPtr->lightenedFogSpritePalsCount++; } } -/*static*/ bool8 LightenSpritePaletteInFog(u8 paletteIndex) +static bool8 LightenSpritePaletteInFog(u8 paletteIndex) { u16 i; - for (i = 0; i < gWeather.lightenedFogSpritePalsCount; i++) + for (i = 0; i < gWeatherPtr->lightenedFogSpritePalsCount; i++) { - if (gWeather.lightenedFogSpritePals[i] == paletteIndex) + if (gWeatherPtr->lightenedFogSpritePals[i] == paletteIndex) return TRUE; } @@ -762,22 +705,22 @@ void ApplyFogBlend(u8 blendCoeff, u16 blendColor) void sub_80ABC48(s8 gammaIndex) { - if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE) + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE) { ApplyGammaShift(0, 32, gammaIndex); - gWeather.gammaIndex = gammaIndex; + gWeatherPtr->gammaIndex = gammaIndex; } } void sub_80ABC7C(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay) { - if (gWeather.palProcessingState == WEATHER_PAL_STATE_IDLE) + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE) { - gWeather.palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; - gWeather.gammaIndex = gammaIndex; - gWeather.gammaTargetIndex = gammaTargetIndex; - gWeather.gammaStepFrameCounter = 0; - gWeather.gammaStepDelay = gammaStepDelay; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; + gWeatherPtr->gammaIndex = gammaIndex; + gWeatherPtr->gammaTargetIndex = gammaTargetIndex; + gWeatherPtr->gammaStepFrameCounter = 0; + gWeatherPtr->gammaStepDelay = gammaStepDelay; sub_80ABC48(gammaIndex); } } @@ -810,7 +753,7 @@ void FadeScreen(u8 mode, s8 delay) return; } - switch (gWeather.currWeather) + switch (gWeatherPtr->currWeather) { case WEATHER_RAIN_LIGHT: case WEATHER_RAIN_MED: @@ -832,27 +775,27 @@ void FadeScreen(u8 mode, s8 delay) CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor); - gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; } else { - gWeather.fadeDestColor = fadeColor; + gWeatherPtr->fadeDestColor = fadeColor; if (useWeatherPal) - gWeather.fadeScreenCounter = 0; + gWeatherPtr->fadeScreenCounter = 0; else BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor); - gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN; - gWeather.unknown_6CA = 1; - gWeather.unknown_6CB = 0; - Weather_SetBlendCoeffs(gWeather.currBlendEVA, gWeather.currBlendEVB); - gWeather.readyForInit = TRUE; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN; + gWeatherPtr->unknown_6CA = 1; + gWeatherPtr->unknown_6CB = 0; + Weather_SetBlendCoeffs(gWeatherPtr->currBlendEVA, gWeatherPtr->currBlendEVB); + gWeatherPtr->readyForInit = TRUE; } } bool8 IsWeatherNotFadingIn(void) { - return (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN); + return (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN); } void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) @@ -860,16 +803,16 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) u16 paletteIndex = 16 + spritePaletteIndex; u16 i; - switch (gWeather.palProcessingState) + switch (gWeatherPtr->palProcessingState) { case WEATHER_PAL_STATE_SCREEN_FADING_IN: - if (gWeather.unknown_6CA != 0) + if (gWeatherPtr->unknown_6CA != 0) { - if (gWeather.currWeather == WEATHER_FOG_1) + if (gWeatherPtr->currWeather == WEATHER_FOG_1) MarkFogSpritePalToLighten(paletteIndex); paletteIndex *= 16; for (i = 0; i < 16; i++) - gPlttBufferFaded[paletteIndex + i] = gWeather.fadeDestColor; + gPlttBufferFaded[paletteIndex + i] = gWeatherPtr->fadeDestColor; } break; case WEATHER_PAL_STATE_SCREEN_FADING_OUT: @@ -880,9 +823,9 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) // WEATHER_PAL_STATE_CHANGING_WEATHER // WEATHER_PAL_STATE_CHANGING_IDLE default: - if (gWeather.currWeather != WEATHER_FOG_1) + if (gWeatherPtr->currWeather != WEATHER_FOG_1) { - ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex); + ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex); } else { @@ -895,24 +838,24 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) void ApplyWeatherGammaShiftToPal(u8 paletteIndex) { - ApplyGammaShift(paletteIndex, 1, gWeather.gammaIndex); + ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex); } u8 sub_80ABF20(void) { - if (gWeather.palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN) - return gWeather.unknown_6CA; + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN) + return gWeatherPtr->unknown_6CA; else return 0; } void LoadCustomWeatherSpritePalette(const u16 *palette) { - LoadPalette(palette, 0x100 + gWeather.weatherPicSpritePalIndex * 16, 32); - UpdateSpritePaletteWithWeather(gWeather.weatherPicSpritePalIndex); + LoadPalette(palette, 0x100 + gWeatherPtr->weatherPicSpritePalIndex * 16, 32); + UpdateSpritePaletteWithWeather(gWeatherPtr->weatherPicSpritePalIndex); } -void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1) +static void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1) { *gammaIndexPtr = 0x20; *a1 = 0x20; @@ -920,16 +863,16 @@ void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *a1) void ResetDroughtWeatherPaletteLoading(void) { - gWeather.loadDroughtPalsIndex = 1; - gWeather.loadDroughtPalsOffset = 1; + gWeatherPtr->loadDroughtPalsIndex = 1; + gWeatherPtr->loadDroughtPalsOffset = 1; } bool8 LoadDroughtWeatherPalettes(void) { - if (gWeather.loadDroughtPalsIndex < 32) + if (gWeatherPtr->loadDroughtPalsIndex < 32) { - LoadDroughtWeatherPalette(&gWeather.loadDroughtPalsIndex, &gWeather.loadDroughtPalsOffset); - if (gWeather.loadDroughtPalsIndex < 32) + LoadDroughtWeatherPalette(&gWeatherPtr->loadDroughtPalsIndex, &gWeatherPtr->loadDroughtPalsOffset); + if (gWeatherPtr->loadDroughtPalsIndex < 32) return TRUE; } return FALSE; @@ -942,43 +885,43 @@ void sub_80ABFE0(s8 gammaIndex) void sub_80ABFF0(void) { - gWeather.unknown_73C = 0; - gWeather.unknown_740 = 0; - gWeather.unknown_742 = 0; - gWeather.unknown_73E = 0; + gWeatherPtr->unknown_73C = 0; + gWeatherPtr->unknown_740 = 0; + gWeatherPtr->unknown_742 = 0; + gWeatherPtr->unknown_73E = 0; } void sub_80AC01C(void) { - switch (gWeather.unknown_742) + switch (gWeatherPtr->unknown_742) { case 0: - if (++gWeather.unknown_740 > 5) + if (++gWeatherPtr->unknown_740 > 5) { - gWeather.unknown_740 = 0; - sub_80ABFE0(gWeather.unknown_73C++); - if (gWeather.unknown_73C > 5) + gWeatherPtr->unknown_740 = 0; + sub_80ABFE0(gWeatherPtr->unknown_73C++); + if (gWeatherPtr->unknown_73C > 5) { - gWeather.unknown_73E = gWeather.unknown_73C; - gWeather.unknown_742 = 1; - gWeather.unknown_740 = 0x3C; + gWeatherPtr->unknown_73E = gWeatherPtr->unknown_73C; + gWeatherPtr->unknown_742 = 1; + gWeatherPtr->unknown_740 = 0x3C; } } break; case 1: - gWeather.unknown_740 = (gWeather.unknown_740 + 3) & 0x7F; - gWeather.unknown_73C = ((gSineTable[gWeather.unknown_740] - 1) >> 6) + 2; - if (gWeather.unknown_73C != gWeather.unknown_73E) - sub_80ABFE0(gWeather.unknown_73C); - gWeather.unknown_73E = gWeather.unknown_73C; + gWeatherPtr->unknown_740 = (gWeatherPtr->unknown_740 + 3) & 0x7F; + gWeatherPtr->unknown_73C = ((gSineTable[gWeatherPtr->unknown_740] - 1) >> 6) + 2; + if (gWeatherPtr->unknown_73C != gWeatherPtr->unknown_73E) + sub_80ABFE0(gWeatherPtr->unknown_73C); + gWeatherPtr->unknown_73E = gWeatherPtr->unknown_73C; break; case 2: - if (++gWeather.unknown_740 > 5) + if (++gWeatherPtr->unknown_740 > 5) { - gWeather.unknown_740 = 0; - sub_80ABFE0(--gWeather.unknown_73C); - if (gWeather.unknown_73C == 3) - gWeather.unknown_742 = 0; + gWeatherPtr->unknown_740 = 0; + sub_80ABFE0(--gWeatherPtr->unknown_73C); + if (gWeatherPtr->unknown_73C == 3) + gWeatherPtr->unknown_742 = 0; } break; } @@ -986,54 +929,54 @@ void sub_80AC01C(void) void Weather_SetBlendCoeffs(u8 eva, u8 evb) { - gWeather.currBlendEVA = eva; - gWeather.currBlendEVB = evb; - gWeather.targetBlendEVA = eva; - gWeather.targetBlendEVB = evb; + gWeatherPtr->currBlendEVA = eva; + gWeatherPtr->currBlendEVB = evb; + gWeatherPtr->targetBlendEVA = eva; + gWeatherPtr->targetBlendEVB = evb; SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(eva, evb)); } void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay) { - gWeather.targetBlendEVA = eva; - gWeather.targetBlendEVB = evb; - gWeather.blendDelay = delay; - gWeather.blendFrameCounter = 0; - gWeather.blendUpdateCounter = 0; + gWeatherPtr->targetBlendEVA = eva; + gWeatherPtr->targetBlendEVB = evb; + gWeatherPtr->blendDelay = delay; + gWeatherPtr->blendFrameCounter = 0; + gWeatherPtr->blendUpdateCounter = 0; } bool8 Weather_UpdateBlend(void) { - if (gWeather.currBlendEVA == gWeather.targetBlendEVA - && gWeather.currBlendEVB == gWeather.targetBlendEVB) + if (gWeatherPtr->currBlendEVA == gWeatherPtr->targetBlendEVA + && gWeatherPtr->currBlendEVB == gWeatherPtr->targetBlendEVB) return TRUE; - if (++gWeather.blendFrameCounter > gWeather.blendDelay) + if (++gWeatherPtr->blendFrameCounter > gWeatherPtr->blendDelay) { - gWeather.blendFrameCounter = 0; - gWeather.blendUpdateCounter++; + gWeatherPtr->blendFrameCounter = 0; + gWeatherPtr->blendUpdateCounter++; // Update currBlendEVA and currBlendEVB on alternate frames - if (gWeather.blendUpdateCounter & 1) + if (gWeatherPtr->blendUpdateCounter & 1) { - if (gWeather.currBlendEVA < gWeather.targetBlendEVA) - gWeather.currBlendEVA++; - else if (gWeather.currBlendEVA > gWeather.targetBlendEVA) - gWeather.currBlendEVA--; + if (gWeatherPtr->currBlendEVA < gWeatherPtr->targetBlendEVA) + gWeatherPtr->currBlendEVA++; + else if (gWeatherPtr->currBlendEVA > gWeatherPtr->targetBlendEVA) + gWeatherPtr->currBlendEVA--; } else { - if (gWeather.currBlendEVB < gWeather.targetBlendEVB) - gWeather.currBlendEVB++; - else if (gWeather.currBlendEVB > gWeather.targetBlendEVB) - gWeather.currBlendEVB--; + if (gWeatherPtr->currBlendEVB < gWeatherPtr->targetBlendEVB) + gWeatherPtr->currBlendEVB++; + else if (gWeatherPtr->currBlendEVB > gWeatherPtr->targetBlendEVB) + gWeatherPtr->currBlendEVB--; } } - SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gWeather.currBlendEVA, gWeather.currBlendEVB)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gWeatherPtr->currBlendEVA, gWeatherPtr->currBlendEVB)); - if (gWeather.currBlendEVA == gWeather.targetBlendEVA - && gWeather.currBlendEVB == gWeather.targetBlendEVB) + if (gWeatherPtr->currBlendEVA == gWeatherPtr->targetBlendEVA + && gWeatherPtr->currBlendEVB == gWeatherPtr->targetBlendEVB) return TRUE; return FALSE; @@ -1078,23 +1021,23 @@ void sub_80AC274(u8 a) u8 GetCurrentWeather(void) { - return gWeather.currWeather; + return gWeatherPtr->currWeather; } void SetRainStrengthFromSoundEffect(u16 soundEffect) { - if (gWeather.palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) { switch (soundEffect) { case SE_T_KOAME: - gWeather.rainStrength = 0; + gWeatherPtr->rainStrength = 0; break; case SE_T_OOAME: - gWeather.rainStrength = 1; + gWeatherPtr->rainStrength = 1; break; case SE_T_AME: - gWeather.rainStrength = 2; + gWeatherPtr->rainStrength = 2; break; default: return; @@ -1108,7 +1051,7 @@ void PlayRainSoundEffect(void) { if (IsSpecialSEPlaying()) { - switch (gWeather.rainStrength) + switch (gWeatherPtr->rainStrength) { case 0: PlaySE(SE_T_KOAME_E); @@ -1126,24 +1069,24 @@ void PlayRainSoundEffect(void) u8 IsWeatherChangeComplete(void) { - return gWeather.weatherChangeComplete; + return gWeatherPtr->weatherChangeComplete; } void SetWeatherScreenFadeOut(void) { - gWeather.palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; } void sub_80AC3E4(void) { - gWeather.palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } void PreservePaletteInWeather(u8 preservedPalIndex) { - CpuCopy16(sBasePaletteGammaTypes, gFieldEffectPaletteGammaTypes, 32); - gFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE; - sPaletteGammaTypes = gFieldEffectPaletteGammaTypes; + CpuCopy16(sBasePaletteGammaTypes, sFieldEffectPaletteGammaTypes, 32); + sFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE; + sPaletteGammaTypes = sFieldEffectPaletteGammaTypes; } void ResetPreservedPalettesInWeather(void) diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index ad3e80cfa..88ebb1936 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -12,7 +12,14 @@ #include "trig.h" #include "gpu_regs.h" -const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); +// This file's functions. +void sub_80AC6B4(struct Sprite *); + +// EWRAM +EWRAM_DATA static u8 gUnknown_02038BC4 = 0; +EWRAM_DATA static u16 gUnknown_02038BC6 = 0; + +// CONST const u16 gUnknown_0854C290[] = INCBIN_U16("graphics/weather/1.gbapal"); const u16 gUnknown_0854C2B0[] = INCBIN_U16("graphics/weather/2.gbapal"); const u8 gWeatherFog2Tiles[] = INCBIN_U8("graphics/weather/fog2.4bpp"); @@ -25,16 +32,16 @@ const u8 gWeatherAshTiles[] = INCBIN_U8("graphics/weather/ash.4bpp"); const u8 gWeatherRainTiles[] = INCBIN_U8("graphics/weather/rain.4bpp"); const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp"); -/*static*/ const struct Coords16 gUnknown_0854FB50[] = +static const struct Coords16 gUnknown_0854FB50[] = { { 0, 66}, { 5, 73}, {10, 78}, }; -/*static*/ const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200}; +static const struct SpriteSheet sCloudSpriteSheet = {gWeatherCloudTiles, sizeof(gWeatherCloudTiles), 0x1200}; -/*static*/ const struct OamData gOamData_839A9DC = +static const struct OamData gOamData_839A9DC = { .y = 0, .affineMode = 0, @@ -51,19 +58,18 @@ const u8 gWeatherSandstormTiles[] = INCBIN_U8("graphics/weather/sandstorm.4bpp") .affineParam = 0, }; -/*static*/ const union AnimCmd gSpriteAnim_839A9E4[] = +static const union AnimCmd gSpriteAnim_839A9E4[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd *const gSpriteAnimTable_839A9EC[] = +static const union AnimCmd *const gSpriteAnimTable_839A9EC[] = { gSpriteAnim_839A9E4, }; -void sub_80AC6B4(struct Sprite *); -/*static*/ const struct SpriteTemplate sCloudSpriteTemplate = +static const struct SpriteTemplate sCloudSpriteTemplate = { .tileTag = 4608, .paletteTag = 4609, @@ -74,15 +80,6 @@ void sub_80AC6B4(struct Sprite *); .callback = sub_80AC6B4, }; -extern void sub_80ABC48(s8 gammaIndex); -extern void sub_80ABFF0(void); -extern void sub_80AC01C(void); -extern void Weather_SetTargetBlendCoeffs(u8 a, u8 b, int c); -extern bool8 Weather_UpdateBlend(void); -extern void SetRainStrengthFromSoundEffect(u16 sndEff); -extern void sub_80ABC7C(u8 a, u8 b, u8 c); -extern void sub_80AB104(u8); - //------------------------------------------------------------------------------ // Clouds //------------------------------------------------------------------------------ @@ -97,8 +94,6 @@ void Clouds_InitVars(void) Weather_SetBlendCoeffs(0, 16); } -void Clouds_Main(void); - void Clouds_InitAll(void) { Clouds_InitVars(); @@ -170,7 +165,7 @@ void Weather2_Main(void) { } -int Weather2_Finish(void) +bool8 Weather2_Finish(void) { return 0; } @@ -238,8 +233,6 @@ void Drought_InitVars(void) gWeatherPtr->gammaStepDelay = 0; } -void Drought_Main(void); - void Drought_InitAll(void) { Drought_InitVars(); @@ -281,7 +274,7 @@ void Drought_Main(void) } } -int Drought_Finish(void) +bool8 Drought_Finish(void) { return 0; } @@ -370,8 +363,6 @@ void LightRain_InitVars(void) SetRainStrengthFromSoundEffect(SE_T_KOAME); } -void LightRain_Main(void); - void LightRain_InitAll(void) { LightRain_InitVars(); @@ -551,7 +542,7 @@ void LoadRainSpriteSheet(void) LoadSpriteSheet(&sRainSpriteSheet); } -/*static*/ const struct Coords16 sRainSpriteCoords[] = +static const struct Coords16 sRainSpriteCoords[] = { { 0, 0}, { 0, 160}, @@ -579,7 +570,7 @@ void LoadRainSpriteSheet(void) { 48, 96}, }; -/*static*/ const struct OamData gOamData_839AA68 = +static const struct OamData gOamData_839AA68 = { .y = 0, .affineMode = 0, @@ -596,13 +587,13 @@ void LoadRainSpriteSheet(void) .affineParam = 0, }; -/*static*/ const union AnimCmd gSpriteAnim_839AA70[] = +static const union AnimCmd gSpriteAnim_839AA70[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_JUMP(0), }; -/*static*/ const union AnimCmd gSpriteAnim_839AA78[] = +static const union AnimCmd gSpriteAnim_839AA78[] = { ANIMCMD_FRAME(8, 3), ANIMCMD_FRAME(32, 2), @@ -610,7 +601,7 @@ void LoadRainSpriteSheet(void) ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AA88[] = +static const union AnimCmd gSpriteAnim_839AA88[] = { ANIMCMD_FRAME(8, 3), ANIMCMD_FRAME(16, 3), @@ -618,14 +609,14 @@ void LoadRainSpriteSheet(void) ANIMCMD_END, }; -/*static*/ const union AnimCmd *const gSpriteAnimTable_839AA98[] = +static const union AnimCmd *const gSpriteAnimTable_839AA98[] = { gSpriteAnim_839AA70, gSpriteAnim_839AA78, gSpriteAnim_839AA88, }; -/*static*/ const struct SpriteTemplate sRainSpriteTemplate = +static const struct SpriteTemplate sRainSpriteTemplate = { .tileTag = 4614, .paletteTag = 4608, @@ -636,7 +627,6 @@ void LoadRainSpriteSheet(void) .callback = sub_807E5C0, }; - const s16 gUnknown_0839AABC[][2] = { {-104, 208}, @@ -649,9 +639,9 @@ const u16 gUnknown_0839AAC4[][2] = {12, 10}, }; -/*static*/ const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206}; +static const struct SpriteSheet sRainSpriteSheet = {gWeatherRainTiles, sizeof(gWeatherRainTiles), 0x1206}; -/*static*/ const struct OamData gOamData_839AAD4 = +static const struct OamData gOamData_839AAD4 = { .y = 0, .affineMode = 0, @@ -668,32 +658,32 @@ const u16 gUnknown_0839AAC4[][2] = .affineParam = 0, }; -/*static*/ const struct SpriteFrameImage gSpriteImageTable_839AADC[] = +static const struct SpriteFrameImage gSpriteImageTable_839AADC[] = { {gWeatherSnow1Tiles, sizeof(gWeatherSnow1Tiles)}, {gWeatherSnow2Tiles, sizeof(gWeatherSnow2Tiles)}, }; -/*static*/ const union AnimCmd gSpriteAnim_839AAEC[] = +static const union AnimCmd gSpriteAnim_839AAEC[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AAF4[] = +static const union AnimCmd gSpriteAnim_839AAF4[] = { ANIMCMD_FRAME(1, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd *const gSpriteAnimTable_839AAFC[] = +static const union AnimCmd *const gSpriteAnimTable_839AAFC[] = { gSpriteAnim_839AAEC, gSpriteAnim_839AAF4, }; void sub_807ED48(struct Sprite *); -/*static*/ const struct SpriteTemplate sSnowflakeSpriteTemplate = +static const struct SpriteTemplate sSnowflakeSpriteTemplate = { .tileTag = 0xFFFF, .paletteTag = 4608, @@ -705,9 +695,9 @@ void sub_807ED48(struct Sprite *); }; // unused data -/*static*/ const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300}; +static const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300}; -/*static*/ const struct OamData gOamData_839AB2C = +static const struct OamData gOamData_839AB2C = { .y = 0, .affineMode = 0, @@ -724,43 +714,43 @@ void sub_807ED48(struct Sprite *); .affineParam = 0, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB34[] = +static const union AnimCmd gSpriteAnim_839AB34[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB3C[] = +static const union AnimCmd gSpriteAnim_839AB3C[] = { ANIMCMD_FRAME(32, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB44[] = +static const union AnimCmd gSpriteAnim_839AB44[] = { ANIMCMD_FRAME(64, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB4C[] = +static const union AnimCmd gSpriteAnim_839AB4C[] = { ANIMCMD_FRAME(96, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB54[] = +static const union AnimCmd gSpriteAnim_839AB54[] = { ANIMCMD_FRAME(128, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd gSpriteAnim_839AB5C[] = +static const union AnimCmd gSpriteAnim_839AB5C[] = { ANIMCMD_FRAME(160, 16), ANIMCMD_END, }; -/*static*/ const union AnimCmd *const gSpriteAnimTable_839AB64[] = +static const union AnimCmd *const gSpriteAnimTable_839AB64[] = { gSpriteAnim_839AB34, gSpriteAnim_839AB3C, @@ -770,19 +760,19 @@ void sub_807ED48(struct Sprite *); gSpriteAnim_839AB5C, }; -/*static*/ const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] = +static const union AffineAnimCmd gSpriteAffineAnim_839AB7C[] = { AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), AFFINEANIMCMD_END, }; -/*static*/ const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] = +static const union AffineAnimCmd *const gSpriteAffineAnimTable_839AB8C[] = { gSpriteAffineAnim_839AB7C, }; -/*static*/ void Fog1SpriteCallback(struct Sprite *); -/*static*/ const struct SpriteTemplate sFog1SpriteTemplate = +static void Fog1SpriteCallback(struct Sprite *); +static const struct SpriteTemplate sFog1SpriteTemplate = { .tileTag = 4609, .paletteTag = 4608, @@ -1286,8 +1276,8 @@ void UpdateThunderSound(void) //------------------------------------------------------------------------------ void Fog1_Main(void); -/*static*/ void CreateFog1Sprites(void); -/*static*/ void DestroyFog1Sprites(void); +static void CreateFog1Sprites(void); +static void DestroyFog1Sprites(void); void Fog1_InitVars(void) { @@ -1370,7 +1360,7 @@ bool8 Fog1_Finish(void) #define sprColumn data[0] -/*static*/ void Fog1SpriteCallback(struct Sprite *sprite) +static void Fog1SpriteCallback(struct Sprite *sprite) { sprite->pos2.y = (u8)gSpriteCoordOffsetY; sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->sprColumn * 64; @@ -1381,7 +1371,7 @@ bool8 Fog1_Finish(void) } } -/*static*/ void CreateFog1Sprites(void) +static void CreateFog1Sprites(void) { u16 i; @@ -1414,7 +1404,7 @@ bool8 Fog1_Finish(void) #undef sprColumn -/*static*/ void DestroyFog1Sprites(void) +static void DestroyFog1Sprites(void) { u16 i; @@ -1513,7 +1503,7 @@ bool8 Ash_Finish(void) return TRUE; } -/*static*/ const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202}; +static const struct SpriteSheet sAshSpriteSheet = {gWeatherAshTiles, sizeof(gWeatherAshTiles), 0x1202}; void LoadAshSpriteSheet(void) { @@ -1550,7 +1540,7 @@ const union AnimCmd *const gSpriteAnimTable_839ABCC[] = }; void sub_807FAA8(struct Sprite *); -/*static*/ const struct SpriteTemplate sAshSpriteTemplate = +static const struct SpriteTemplate sAshSpriteTemplate = { .tileTag = 4610, .paletteTag = 4608, @@ -2003,7 +1993,7 @@ const struct SpriteTemplate sSandstormSpriteTemplate = .callback = SandstormSpriteCallback1, }; -/*static*/ const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204}; +static const struct SpriteSheet sSandstormSpriteSheet = {gWeatherSandstormTiles, sizeof(gWeatherSandstormTiles), 0x1204}; void CreateSandstormSprites_1(void) { @@ -2294,16 +2284,15 @@ void unc_0807DAB4(struct Sprite *sprite) DestroySprite(sprite); } -// New Emerald functions. -extern u8 gUnknown_02038BC4; -extern u16 gUnknown_02038BC6; -void sub_80AEC94(u32 a0, u32 a1) +//------------------------------------------------------------------------------ + +static void sub_80AEC94(u32 a0, u32 a1) { gUnknown_02038BC4 = a0; gUnknown_02038BC6 = a1; } -void sub_80AECA8(u8 taskId) +static void sub_80AECA8(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -2330,34 +2319,32 @@ void sub_80AECA8(u8 taskId) } } -void sub_80AED28(void) +static void sub_80AED28(void) { u8 taskId = CreateTask(sub_80AECA8, 0); s16 *data = gTasks[taskId].data; data[15] = 600; - if (gUnknown_02038BC4 == 13) + if (gUnknown_02038BC4 == WEATHER_RAIN_HEAVY) { - data[1] = 12; - data[2] = 13; + data[1] = WEATHER_DROUGHT; + data[2] = WEATHER_RAIN_HEAVY; } - else if (gUnknown_02038BC4 == 12) + else if (gUnknown_02038BC4 == WEATHER_DROUGHT) { - data[1] = 13; - data[2] = 12; + data[1] = WEATHER_RAIN_HEAVY; + data[2] = WEATHER_DROUGHT; } else { - gUnknown_02038BC4 = 13; - data[1] = 12; - data[2] = 13; + gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; + data[1] = WEATHER_DROUGHT; + data[2] = WEATHER_RAIN_HEAVY; } } -//------------------------------------------------------------------------------ - -/*static*/ u8 TranslateWeatherNum(u8); -/*static*/ void UpdateRainCounter(u8, u8); +static u8 TranslateWeatherNum(u8); +static void UpdateRainCounter(u8, u8); void SetSav1Weather(u32 weather) { @@ -2394,7 +2381,7 @@ void DoCurrentWeather(void) { u8 weather = GetSav1Weather(); - if (weather == 15) + if (weather == WEATHER_15) { if (!FuncIsActiveTask(sub_80AECA8)) sub_80AED28(); @@ -2404,7 +2391,7 @@ void DoCurrentWeather(void) { if (FuncIsActiveTask(sub_80AECA8)) DestroyTask(FindTaskIdByFunc(sub_80AECA8)); - gUnknown_02038BC4 = 13; + gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; } ChangeWeather(weather); } @@ -2413,7 +2400,7 @@ void sub_80AEE84(void) { u8 weather = GetSav1Weather(); - if (weather == 15) + if (weather == WEATHER_15) { if (!FuncIsActiveTask(sub_80AECA8)) sub_80AED28(); @@ -2423,19 +2410,19 @@ void sub_80AEE84(void) { if (FuncIsActiveTask(sub_80AECA8)) DestroyTask(FindTaskIdByFunc(sub_80AECA8)); - gUnknown_02038BC4 = 13; + gUnknown_02038BC4 = WEATHER_RAIN_HEAVY; } sub_80AB104(weather); } -/*static*/ const u8 sWeatherCycleRoute119[] = +static const u8 sWeatherCycleRoute119[] = { WEATHER_SUNNY, WEATHER_RAIN_LIGHT, WEATHER_RAIN_MED, WEATHER_RAIN_LIGHT, }; -/*static*/ const u8 sWeatherCycleRoute123[] = +static const u8 sWeatherCycleRoute123[] = { WEATHER_SUNNY, WEATHER_SUNNY, @@ -2443,7 +2430,7 @@ void sub_80AEE84(void) WEATHER_SUNNY, }; -/*static*/ u8 TranslateWeatherNum(u8 weather) +static u8 TranslateWeatherNum(u8 weather) { switch (weather) { @@ -2462,7 +2449,7 @@ void sub_80AEE84(void) case WEATHER_DROUGHT: return WEATHER_DROUGHT; case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; case WEATHER_BUBBLES: return WEATHER_BUBBLES; - case 15: return 15; + case WEATHER_15: return WEATHER_15; case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; default: return WEATHER_NONE; @@ -2476,7 +2463,7 @@ void UpdateWeatherPerDay(u16 increment) gSaveBlock1Ptr->weatherCycleStage = weatherStage; } -/*static*/ void UpdateRainCounter(u8 newWeather, u8 oldWeather) +static void UpdateRainCounter(u8 newWeather, u8 oldWeather) { if (newWeather != oldWeather && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED)) diff --git a/sym_ewram.txt b/sym_ewram.txt index 8d8a6c177..63e07b2fc 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -155,13 +155,7 @@ gUnknown_020375C0: @ 20375C0 .space 0xC .include "src/field_weather.o" - -gUnknown_02038BC4: @ 2038BC4 - .space 0x2 - -gUnknown_02038BC6: @ 2038BC6 - .space 0x2 - + .include "src/field_weather_effect.o" .include "src/battle_setup.o" .include "src/trainer_see.o" .include "src/wild_encounter.o" -- cgit v1.2.3 From 58c4cec9462cef154e75d12181ebe6d42c0f3e9e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 21:42:36 +0100 Subject: decompile field screen --- asm/field_screen.s | 2699 -------------------------------------------- data/field_screen_2.s | 17 - include/menu.h | 1 + include/overworld.h | 2 +- ld_script.txt | 3 +- src/field_effect.c | 24 +- src/field_fadetransition.c | 1258 +++++++++++++++++++++ src/fldeff_flash.c | 4 +- src/overworld.c | 6 +- 9 files changed, 1279 insertions(+), 2735 deletions(-) delete mode 100644 asm/field_screen.s delete mode 100644 data/field_screen_2.s create mode 100644 src/field_fadetransition.c diff --git a/asm/field_screen.s b/asm/field_screen.s deleted file mode 100644 index 904a68ba1..000000000 --- a/asm/field_screen.s +++ /dev/null @@ -1,2699 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start palette_bg_faded_fill_white -palette_bg_faded_fill_white: @ 80AEFFC - push {lr} - sub sp, 0x4 - ldr r0, =0x7fff7fff - str r0, [sp] - ldr r1, =gPlttBufferFaded - ldr r2, =0x01000100 - mov r0, sp - bl CpuFastSet - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end palette_bg_faded_fill_white - - thumb_func_start palette_bg_faded_fill_black -palette_bg_faded_fill_black: @ 80AF020 - push {lr} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r1, =gPlttBufferFaded - ldr r2, =0x01000100 - mov r0, sp - bl CpuFastSet - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end palette_bg_faded_fill_black - - thumb_func_start pal_fill_for_maplights -pal_fill_for_maplights: @ 80AF040 - push {r4,lr} - bl GetLastUsedWarpMapType - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl Overworld_GetMapTypeOfSaveblockLocation - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl fade_type_for_given_maplight_pair - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _080AF06A - cmp r0, 0x1 - beq _080AF078 - b _080AF084 -_080AF06A: - bl palette_bg_faded_fill_black - movs r0, 0 - movs r1, 0 - bl FadeScreen - b _080AF084 -_080AF078: - bl palette_bg_faded_fill_white - movs r0, 0x2 - movs r1, 0 - bl FadeScreen -_080AF084: - pop {r4} - pop {r0} - bx r0 - thumb_func_end pal_fill_for_maplights - - thumb_func_start sub_80AF08C -sub_80AF08C: @ 80AF08C - push {lr} - bl palette_bg_faded_fill_white - movs r0, 0x2 - movs r1, 0x8 - bl FadeScreen - pop {r0} - bx r0 - thumb_func_end sub_80AF08C - - thumb_func_start pal_fill_black -pal_fill_black: @ 80AF0A0 - push {lr} - bl palette_bg_faded_fill_black - movs r0, 0 - movs r1, 0 - bl FadeScreen - pop {r0} - bx r0 - thumb_func_end pal_fill_black - - thumb_func_start sub_80AF0B4 -sub_80AF0B4: @ 80AF0B4 - push {r4,lr} - bl Overworld_GetMapTypeOfSaveblockLocation - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl GetDestinationWarpMapHeader - ldrb r1, [r0, 0x17] - adds r0, r4, 0 - bl sub_8137360 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _080AF0DA - cmp r0, 0x1 - beq _080AF0E4 - b _080AF0EC -_080AF0DA: - movs r0, 0x1 - movs r1, 0 - bl FadeScreen - b _080AF0EC -_080AF0E4: - movs r0, 0x3 - movs r1, 0 - bl FadeScreen -_080AF0EC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80AF0B4 - - thumb_func_start sub_80AF0F4 -sub_80AF0F4: @ 80AF0F4 - push {lr} - lsls r0, 24 - movs r1, 0 - cmp r0, 0 - bne _080AF100 - movs r1, 0x1 -_080AF100: - adds r0, r1, 0 - bl sub_808C0A8 - pop {r0} - bx r0 - thumb_func_end sub_80AF0F4 - - thumb_func_start task0A_nop_for_a_while -task0A_nop_for_a_while: @ 80AF10C - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_80AF71C - cmp r0, 0x1 - bne _080AF120 - adds r0, r4, 0 - bl DestroyTask -_080AF120: - pop {r4} - pop {r0} - bx r0 - thumb_func_end task0A_nop_for_a_while - - thumb_func_start sub_80AF128 -sub_80AF128: @ 80AF128 - push {lr} - bl ScriptContext2_Enable - bl Overworld_PlaySpecialMapMusic - bl pal_fill_black - ldr r0, =task0A_nop_for_a_while - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF128 - - thumb_func_start task0A_asap_script_env_2_enable_and_set_ctx_running -task0A_asap_script_env_2_enable_and_set_ctx_running: @ 80AF148 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_80AF71C - cmp r0, 0x1 - bne _080AF160 - adds r0, r4, 0 - bl DestroyTask - bl EnableBothScriptContexts -_080AF160: - pop {r4} - pop {r0} - bx r0 - thumb_func_end task0A_asap_script_env_2_enable_and_set_ctx_running - - thumb_func_start sub_80AF168 -sub_80AF168: @ 80AF168 - push {lr} - bl ScriptContext2_Enable - bl Overworld_PlaySpecialMapMusic - bl pal_fill_black - ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF168 - - thumb_func_start sub_80AF188 -sub_80AF188: @ 80AF188 - push {lr} - bl ScriptContext2_Enable - bl pal_fill_black - ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF188 - - thumb_func_start task_mpl_807DD60 -task_mpl_807DD60: @ 80AF1A4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r2, =gTasks - adds r4, r0, r2 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080AF1DE - cmp r0, 0x1 - bgt _080AF1CC - cmp r0, 0 - beq _080AF1D2 - b _080AF20E - .pool -_080AF1CC: - cmp r0, 0x2 - beq _080AF1FC - b _080AF20E -_080AF1D2: - bl sub_80B3050 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0xA] - b _080AF1F4 -_080AF1DE: - movs r1, 0xA - ldrsh r0, [r4, r1] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrb r0, [r1, 0x4] - cmp r0, 0x1 - beq _080AF20E - bl pal_fill_for_maplights -_080AF1F4: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080AF20E -_080AF1FC: - bl sub_80AF71C - cmp r0, 0x1 - bne _080AF20E - bl ScriptContext2_Disable - adds r0, r5, 0 - bl DestroyTask -_080AF20E: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end task_mpl_807DD60 - - thumb_func_start sub_80AF214 -sub_80AF214: @ 80AF214 - push {lr} - bl ScriptContext2_Enable - bl Overworld_PlaySpecialMapMusic - bl palette_bg_faded_fill_black - ldr r0, =task_mpl_807DD60 - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF214 - - thumb_func_start sub_80AF234 -sub_80AF234: @ 80AF234 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080AF268 - cmp r0, 0x1 - bgt _080AF25C - cmp r0, 0 - beq _080AF262 - b _080AF2AE - .pool -_080AF25C: - cmp r0, 0x2 - beq _080AF298 - b _080AF2AE -_080AF262: - bl sub_800ADF8 - b _080AF290 -_080AF268: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - bne _080AF28C - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - movs r1, 0xE1 - lsls r1, 19 - cmp r0, r1 - ble _080AF2AE - movs r0, 0xC0 - lsls r0, 7 - bl sub_8011170 - b _080AF2AE -_080AF28C: - bl pal_fill_for_maplights -_080AF290: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080AF2AE -_080AF298: - bl sub_80AF71C - cmp r0, 0x1 - bne _080AF2AE - bl sub_8009F18 - bl ScriptContext2_Disable - adds r0, r5, 0 - bl DestroyTask -_080AF2AE: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80AF234 - - thumb_func_start sub_80AF2B4 -sub_80AF2B4: @ 80AF2B4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080AF2E8 - cmp r0, 0x1 - bgt _080AF2DC - cmp r0, 0 - beq _080AF2E2 - b _080AF30C - .pool -_080AF2DC: - cmp r0, 0x2 - beq _080AF2FA - b _080AF30C -_080AF2E2: - bl sub_800ADF8 - b _080AF2F2 -_080AF2E8: - bl sub_800A520 - lsls r0, 24 - cmp r0, 0 - beq _080AF30C -_080AF2F2: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080AF30C -_080AF2FA: - bl sub_8009F18 - bl sub_8086C2C - bl ScriptContext2_Disable - adds r0, r5, 0 - bl DestroyTask -_080AF30C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80AF2B4 - - thumb_func_start sub_80AF314 -sub_80AF314: @ 80AF314 - push {lr} - bl ScriptContext2_Enable - bl Overworld_PlaySpecialMapMusic - bl palette_bg_faded_fill_black - ldr r0, =sub_80AF234 - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF314 - - thumb_func_start sub_80AF334 -sub_80AF334: @ 80AF334 - push {r4,lr} - sub sp, 0x4 - mov r4, sp - adds r4, 0x2 - mov r0, sp - adds r1, r4, 0 - bl PlayerGetDestCoords - mov r0, sp - movs r1, 0 - ldrsh r0, [r0, r1] - movs r2, 0 - ldrsh r1, [r4, r2] - bl MapGridGetMetatileBehaviorAt - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl MetatileBehavior_IsDoor - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080AF36C - ldr r1, =sub_80AF438 - b _080AF37E - .pool -_080AF36C: - adds r0, r4, 0 - bl MetatileBehavior_IsNonAnimDoor - lsls r0, 24 - lsrs r0, 24 - ldr r1, =task_map_chg_seq_0807E2CC - cmp r0, 0x1 - bne _080AF37E - ldr r1, =task_map_chg_seq_0807E20C -_080AF37E: - adds r0, r1, 0 - movs r1, 0xA - bl CreateTask - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF334 - - thumb_func_start mapldr_default -mapldr_default: @ 80AF398 - push {lr} - bl Overworld_PlaySpecialMapMusic - bl pal_fill_for_maplights - bl sub_80AF334 - bl ScriptContext2_Enable - pop {r0} - bx r0 - thumb_func_end mapldr_default - - thumb_func_start sub_80AF3B0 -sub_80AF3B0: @ 80AF3B0 - push {lr} - bl Overworld_PlaySpecialMapMusic - bl sub_80AF08C - bl sub_80AF334 - bl ScriptContext2_Enable - pop {r0} - bx r0 - thumb_func_end sub_80AF3B0 - - thumb_func_start sub_80AF3C8 -sub_80AF3C8: @ 80AF3C8 - push {lr} - bl sub_81D6534 - cmp r0, 0 - bne _080AF3D6 - bl Overworld_PlaySpecialMapMusic -_080AF3D6: - bl pal_fill_black - bl sub_80AF334 - bl ScriptContext2_Enable - pop {r0} - bx r0 - thumb_func_end sub_80AF3C8 - - thumb_func_start sub_80AF3E8 -sub_80AF3E8: @ 80AF3E8 - push {lr} - bl Overworld_PlaySpecialMapMusic - bl pal_fill_for_maplights - movs r0, 0x2E - bl PlaySE - ldr r0, =task0A_mpl_807E31C - movs r1, 0xA - bl CreateTask - bl ScriptContext2_Enable - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF3E8 - - thumb_func_start sub_80AF40C -sub_80AF40C: @ 80AF40C - push {lr} - bl Overworld_PlaySpecialMapMusic - bl pal_fill_for_maplights - movs r0, 0x2E - bl PlaySE - ldr r0, =task_map_chg_seq_0807E2CC - movs r1, 0xA - bl CreateTask - bl ScriptContext2_Enable - movs r0, 0xE - bl sub_8085540 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF40C - - thumb_func_start sub_80AF438 -sub_80AF438: @ 80AF438 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks - adds r5, r0, r1 - adds r6, r5, 0 - adds r6, 0xC - adds r7, r5, 0 - adds r7, 0xE - movs r2, 0x8 - ldrsh r0, [r5, r2] - adds r2, r1, 0 - cmp r0, 0x4 - bhi _080AF54A - lsls r0, 2 - ldr r1, =_080AF46C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080AF46C: - .4byte _080AF480 - .4byte _080AF4A4 - .4byte _080AF4DC - .4byte _080AF520 - .4byte _080AF540 -_080AF480: - movs r0, 0 - bl sub_80AF0F4 - bl FreezeEventObjects - adds r0, r6, 0 - adds r1, r7, 0 - bl PlayerGetDestCoords - movs r1, 0 - ldrsh r0, [r6, r1] - movs r2, 0 - ldrsh r1, [r7, r2] - bl FieldSetDoorOpened - movs r0, 0x1 - strh r0, [r5, 0x8] - b _080AF54A -_080AF4A4: - bl sub_80AF71C - cmp r0, 0 - beq _080AF54A - movs r0, 0x1 - bl sub_80AF0F4 - movs r0, 0xFF - movs r1, 0 - movs r2, 0 - bl GetEventObjectIdByLocalIdAndMap - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, =gEventObjects - adds r0, r1 - movs r1, 0x8 - bl EventObjectSetHeldMovement - movs r0, 0x2 - strh r0, [r5, 0x8] - b _080AF54A - .pool -_080AF4DC: - bl walkrun_is_standing_still - lsls r0, 24 - cmp r0, 0 - beq _080AF54A - movs r1, 0 - ldrsh r0, [r6, r1] - movs r2, 0 - ldrsh r1, [r7, r2] - bl FieldAnimateDoorClose - lsls r0, 24 - asrs r0, 24 - strh r0, [r5, 0xA] - movs r0, 0xFF - movs r1, 0 - movs r2, 0 - bl GetEventObjectIdByLocalIdAndMap - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, =gEventObjects - adds r0, r1 - bl EventObjectClearHeldMovementIfFinished - movs r0, 0x3 - strh r0, [r5, 0x8] - b _080AF54A - .pool -_080AF520: - movs r1, 0xA - ldrsh r0, [r5, r1] - cmp r0, 0 - blt _080AF536 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrb r0, [r1, 0x4] - cmp r0, 0x1 - beq _080AF54A -_080AF536: - bl UnfreezeEventObjects - movs r0, 0x4 - strh r0, [r5, 0x8] - b _080AF54A -_080AF540: - bl ScriptContext2_Disable - adds r0, r4, 0 - bl DestroyTask -_080AF54A: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80AF438 - - thumb_func_start task_map_chg_seq_0807E20C -task_map_chg_seq_0807E20C: @ 80AF550 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks - adds r5, r0, r1 - adds r6, r5, 0 - adds r6, 0xC - adds r7, r5, 0 - adds r7, 0xE - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _080AF5A2 - cmp r0, 0x1 - bgt _080AF580 - cmp r0, 0 - beq _080AF58A - b _080AF60A - .pool -_080AF580: - cmp r0, 0x2 - beq _080AF5EC - cmp r0, 0x3 - beq _080AF600 - b _080AF60A -_080AF58A: - movs r0, 0 - bl sub_80AF0F4 - bl FreezeEventObjects - adds r0, r6, 0 - adds r1, r7, 0 - bl PlayerGetDestCoords - movs r0, 0x1 - strh r0, [r5, 0x8] - b _080AF60A -_080AF5A2: - bl sub_80AF71C - cmp r0, 0 - beq _080AF60A - movs r0, 0x1 - bl sub_80AF0F4 - movs r0, 0xFF - movs r1, 0 - movs r2, 0 - bl GetEventObjectIdByLocalIdAndMap - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 3 - adds r4, r0 - lsls r4, 2 - ldr r0, =gEventObjects - adds r4, r0 - bl GetPlayerFacingDirection - lsls r0, 24 - lsrs r0, 24 - bl GetWalkNormalMovementAction - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl EventObjectSetHeldMovement - movs r0, 0x2 - strh r0, [r5, 0x8] - b _080AF60A - .pool -_080AF5EC: - bl walkrun_is_standing_still - lsls r0, 24 - cmp r0, 0 - beq _080AF60A - bl UnfreezeEventObjects - movs r0, 0x3 - strh r0, [r5, 0x8] - b _080AF60A -_080AF600: - bl ScriptContext2_Disable - adds r0, r4, 0 - bl DestroyTask -_080AF60A: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end task_map_chg_seq_0807E20C - - thumb_func_start task_map_chg_seq_0807E2CC -task_map_chg_seq_0807E2CC: @ 80AF610 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080AF634 - cmp r0, 0x1 - beq _080AF644 - b _080AF65A - .pool -_080AF634: - bl FreezeEventObjects - bl ScriptContext2_Enable - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080AF65A -_080AF644: - bl sub_80AF71C - cmp r0, 0 - beq _080AF65A - bl UnfreezeEventObjects - bl ScriptContext2_Disable - adds r0, r5, 0 - bl DestroyTask -_080AF65A: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end task_map_chg_seq_0807E2CC - - thumb_func_start sub_80AF660 -sub_80AF660: @ 80AF660 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_80AF71C - cmp r0, 0x1 - bne _080AF67C - adds r0, r4, 0 - bl DestroyTask - ldr r0, =sub_809FA34 - movs r1, 0x50 - bl CreateTask -_080AF67C: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF660 - - thumb_func_start sub_80AF688 -sub_80AF688: @ 80AF688 - push {lr} - bl pal_fill_black - ldr r0, =sub_80AF660 - movs r1, 0x50 - bl CreateTask - bl ScriptContext2_Enable - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF688 - - thumb_func_start sub_80AF6A4 -sub_80AF6A4: @ 80AF6A4 - push {lr} - bl sub_809FA18 - movs r0, 0 - pop {r1} - bx r1 - thumb_func_end sub_80AF6A4 - - thumb_func_start task_mpl_807E3C8 -task_mpl_807E3C8: @ 80AF6B0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_80AF71C - cmp r0, 0x1 - bne _080AF6CC - bl ScriptContext2_Disable - adds r0, r4, 0 - bl DestroyTask - bl ScriptUnfreezeEventObjects -_080AF6CC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end task_mpl_807E3C8 - - thumb_func_start sub_80AF6D4 -sub_80AF6D4: @ 80AF6D4 - push {lr} - bl ScriptContext2_Enable - bl pal_fill_black - ldr r0, =task_mpl_807E3C8 - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF6D4 - - thumb_func_start sub_80AF6F0 -sub_80AF6F0: @ 80AF6F0 - push {lr} - bl ScriptContext2_Enable - bl Overworld_PlaySpecialMapMusic - bl pal_fill_black - ldr r0, =task_mpl_807E3C8 - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF6F0 - - thumb_func_start sub_80AF710 -sub_80AF710: @ 80AF710 - ldr r0, =gPaletteFade - ldrb r0, [r0, 0x7] - lsrs r0, 7 - bx lr - .pool - thumb_func_end sub_80AF710 - - thumb_func_start sub_80AF71C -sub_80AF71C: @ 80AF71C - push {lr} - bl IsWeatherNotFadingIn - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080AF72E - movs r0, 0 - b _080AF730 -_080AF72E: - movs r0, 0x1 -_080AF730: - pop {r1} - bx r1 - thumb_func_end sub_80AF71C - - thumb_func_start sub_80AF734 -sub_80AF734: @ 80AF734 - push {lr} - bl ScriptContext2_Enable - bl music_something - bl sub_80AF0B4 - bl PlayRainSoundEffect - movs r0, 0x9 - bl PlaySE - ldr r0, =gFieldCallback - ldr r1, =mapldr_default - str r1, [r0] - ldr r0, =sub_80AFA0C - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF734 - - thumb_func_start sp13E_warp_to_last_warp -sp13E_warp_to_last_warp: @ 80AF76C - push {lr} - bl ScriptContext2_Enable - bl music_something - bl sub_80AF0B4 - bl PlayRainSoundEffect - ldr r0, =gFieldCallback - ldr r1, =mapldr_default - str r1, [r0] - ldr r0, =sub_80AFA0C - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sp13E_warp_to_last_warp - - thumb_func_start sub_80AF79C -sub_80AF79C: @ 80AF79C - push {lr} - bl ScriptContext2_Enable - bl music_something - movs r0, 0x3 - movs r1, 0x8 - bl FadeScreen - bl PlayRainSoundEffect - ldr r0, =gFieldCallback - ldr r1, =sub_80AF3B0 - str r1, [r0] - ldr r0, =sub_80AFA0C - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF79C - - thumb_func_start sub_80AF7D0 -sub_80AF7D0: @ 80AF7D0 - push {lr} - bl ScriptContext2_Enable - ldr r0, =gFieldCallback - ldr r1, =mapldr_default - str r1, [r0] - ldr r0, =sub_80AFA88 - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF7D0 - - thumb_func_start sp13F_fall_to_last_warp -sp13F_fall_to_last_warp: @ 80AF7F4 - push {lr} - bl sp13E_warp_to_last_warp - ldr r1, =gFieldCallback - ldr r0, =sub_80B6B68 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sp13F_fall_to_last_warp - - thumb_func_start sub_80AF80C -sub_80AF80C: @ 80AF80C - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl ScriptContext2_Enable - adds r0, r4, 0 - movs r1, 0xA - bl sub_80B6E4C - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80AF80C - - thumb_func_start sub_80AF828 -sub_80AF828: @ 80AF828 - push {lr} - bl ScriptContext2_Enable - movs r0, 0xA - bl sub_80B75D8 - pop {r0} - bx r0 - thumb_func_end sub_80AF828 - - thumb_func_start sub_80AF838 -sub_80AF838: @ 80AF838 - push {lr} - bl ScriptContext2_Enable - movs r0, 0xA - bl sub_80B7A74 - pop {r0} - bx r0 - thumb_func_end sub_80AF838 - - thumb_func_start sub_80AF848 -sub_80AF848: @ 80AF848 - push {lr} - bl ScriptContext2_Enable - bl music_something - bl sub_80AF0B4 - movs r0, 0x2D - bl PlaySE - ldr r0, =sub_80AFA0C - movs r1, 0xA - bl CreateTask - ldr r1, =gFieldCallback - ldr r0, =sub_80AF3E8 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF848 - - thumb_func_start sub_80AF87C -sub_80AF87C: @ 80AF87C - push {lr} - movs r0, 0x1 - bl sub_8085540 - bl ScriptContext2_Enable - bl SaveEventObjects - bl music_something - bl sub_80AF0B4 - movs r0, 0x2D - bl PlaySE - ldr r0, =sub_80AFA0C - movs r1, 0xA - bl CreateTask - ldr r1, =gFieldCallback - ldr r0, =sub_80AF40C - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF87C - - thumb_func_start sub_80AF8B8 -sub_80AF8B8: @ 80AF8B8 - push {lr} - bl ScriptContext2_Enable - bl sub_80AF0B4 - ldr r0, =sub_80AFA0C - movs r1, 0xA - bl CreateTask - ldr r1, =gFieldCallback - ldr r0, =sub_80FB768 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF8B8 - - thumb_func_start sub_80AF8E0 -sub_80AF8E0: @ 80AF8E0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080AF914 - cmp r0, 0x1 - bgt _080AF908 - cmp r0, 0 - beq _080AF90E - b _080AF93E - .pool -_080AF908: - cmp r0, 0x2 - beq _080AF92E - b _080AF93E -_080AF90E: - bl ScriptContext2_Enable - b _080AF926 -_080AF914: - bl sub_80AF710 - cmp r0, 0 - bne _080AF93E - bl BGMusicStopped - lsls r0, 24 - cmp r0, 0 - beq _080AF93E -_080AF926: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080AF93E -_080AF92E: - bl WarpIntoMap - ldr r0, =sub_8086074 - bl SetMainCallback2 - adds r0, r5, 0 - bl DestroyTask -_080AF93E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF8E0 - - thumb_func_start sub_80AF948 -sub_80AF948: @ 80AF948 - push {lr} - bl ScriptContext2_Enable - bl music_something - bl sub_80AF0B4 - movs r0, 0x9 - bl PlaySE - ldr r0, =sub_80AF8E0 - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF948 - - thumb_func_start sub_80AF96C -sub_80AF96C: @ 80AF96C - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080AF9B2 - cmp r0, 0x1 - bgt _080AF994 - cmp r0, 0 - beq _080AF99A - b _080AF9E8 - .pool -_080AF994: - cmp r0, 0x2 - beq _080AF9D0 - b _080AF9E8 -_080AF99A: - bl ClearLinkCallback_2 - movs r0, 0x1 - movs r1, 0 - bl FadeScreen - bl music_something - movs r0, 0x9 - bl PlaySE - b _080AF9C8 -_080AF9B2: - bl sub_80AF710 - cmp r0, 0 - bne _080AF9E8 - bl BGMusicStopped - lsls r0, 24 - cmp r0, 0 - beq _080AF9E8 - bl sub_800AC34 -_080AF9C8: - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080AF9E8 -_080AF9D0: - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _080AF9E8 - bl WarpIntoMap - ldr r0, =CB2_LoadMap - bl SetMainCallback2 - adds r0, r5, 0 - bl DestroyTask -_080AF9E8: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF96C - - thumb_func_start sub_80AF9F8 -sub_80AF9F8: @ 80AF9F8 - push {lr} - ldr r0, =sub_80AF96C - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AF9F8 - - thumb_func_start sub_80AFA0C -sub_80AFA0C: @ 80AFA0C - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r0, 0x8 - ldrsh r5, [r4, r0] - cmp r5, 0x1 - beq _080AFA44 - cmp r5, 0x1 - bgt _080AFA34 - cmp r5, 0 - beq _080AFA3A - b _080AFA7C - .pool -_080AFA34: - cmp r5, 0x2 - beq _080AFA6C - b _080AFA7C -_080AFA3A: - bl FreezeEventObjects - bl ScriptContext2_Enable - b _080AFA64 -_080AFA44: - bl sub_80AF710 - cmp r0, 0 - bne _080AFA7C - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080AFA5A - bl sub_81BE72C - strh r5, [r4, 0xA] -_080AFA5A: - bl BGMusicStopped - lsls r0, 24 - cmp r0, 0 - beq _080AFA7C -_080AFA64: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080AFA7C -_080AFA6C: - bl WarpIntoMap - ldr r0, =CB2_LoadMap - bl SetMainCallback2 - adds r0, r6, 0 - bl DestroyTask -_080AFA7C: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AFA0C - - thumb_func_start sub_80AFA88 -sub_80AFA88: @ 80AFA88 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks - adds r5, r1, r0 - adds r4, r5, 0 - adds r4, 0xC - adds r6, r5, 0 - adds r6, 0xE - movs r2, 0x8 - ldrsh r1, [r5, r2] - adds r2, r0, 0 - cmp r1, 0x4 - bls _080AFAAC - b _080AFBE8 -_080AFAAC: - lsls r0, r1, 2 - ldr r1, =_080AFAC0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080AFAC0: - .4byte _080AFAD4 - .4byte _080AFB10 - .4byte _080AFB6C - .4byte _080AFBB8 - .4byte _080AFBD4 -_080AFAD4: - bl FreezeEventObjects - adds r0, r4, 0 - adds r1, r6, 0 - bl PlayerGetDestCoords - movs r1, 0 - ldrsh r0, [r4, r1] - movs r2, 0 - ldrsh r1, [r6, r2] - subs r1, 0x1 - bl GetDoorSoundEffect - lsls r0, 16 - lsrs r0, 16 - bl PlaySE - movs r1, 0 - ldrsh r0, [r4, r1] - movs r2, 0 - ldrsh r1, [r6, r2] - subs r1, 0x1 - bl FieldAnimateDoorOpen - lsls r0, 24 - asrs r0, 24 - strh r0, [r5, 0xA] - movs r0, 0x1 - strh r0, [r5, 0x8] - b _080AFBE8 -_080AFB10: - movs r1, 0xA - ldrsh r0, [r5, r1] - cmp r0, 0 - blt _080AFB26 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrb r0, [r1, 0x4] - cmp r0, 0x1 - beq _080AFBE8 -_080AFB26: - movs r0, 0xFF - movs r1, 0 - movs r2, 0 - bl GetEventObjectIdByLocalIdAndMap - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r4, =gEventObjects - adds r0, r4 - bl EventObjectClearHeldMovementIfActive - movs r0, 0xFF - movs r1, 0 - movs r2, 0 - bl GetEventObjectIdByLocalIdAndMap - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x9 - bl EventObjectSetHeldMovement - movs r0, 0x2 - strh r0, [r5, 0x8] - b _080AFBE8 - .pool -_080AFB6C: - bl walkrun_is_standing_still - lsls r0, 24 - cmp r0, 0 - beq _080AFBE8 - movs r2, 0 - ldrsh r0, [r4, r2] - movs r2, 0 - ldrsh r1, [r6, r2] - subs r1, 0x1 - bl FieldAnimateDoorClose - lsls r0, 24 - asrs r0, 24 - strh r0, [r5, 0xA] - movs r0, 0xFF - movs r1, 0 - movs r2, 0 - bl GetEventObjectIdByLocalIdAndMap - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, =gEventObjects - adds r0, r1 - bl EventObjectClearHeldMovementIfFinished - movs r0, 0 - bl sub_80AF0F4 - movs r0, 0x3 - strh r0, [r5, 0x8] - b _080AFBE8 - .pool -_080AFBB8: - movs r1, 0xA - ldrsh r0, [r5, r1] - cmp r0, 0 - blt _080AFBCE - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrb r0, [r1, 0x4] - cmp r0, 0x1 - beq _080AFBE8 -_080AFBCE: - movs r0, 0x4 - strh r0, [r5, 0x8] - b _080AFBE8 -_080AFBD4: - bl music_something - bl sub_80AF0B4 - bl PlayRainSoundEffect - movs r0, 0 - strh r0, [r5, 0x8] - ldr r0, =sub_80AFA0C - str r0, [r5] -_080AFBE8: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AFA88 - - thumb_func_start task0A_fade_n_map_maybe -task0A_fade_n_map_maybe: @ 80AFBF4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080AFC2C - cmp r0, 0x1 - bgt _080AFC1C - cmp r0, 0 - beq _080AFC22 - b _080AFC56 - .pool -_080AFC1C: - cmp r0, 0x2 - beq _080AFC46 - b _080AFC56 -_080AFC22: - bl FreezeEventObjects - bl ScriptContext2_Enable - b _080AFC3E -_080AFC2C: - bl sub_80AF710 - cmp r0, 0 - bne _080AFC56 - bl BGMusicStopped - lsls r0, 24 - cmp r0, 0 - beq _080AFC56 -_080AFC3E: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080AFC56 -_080AFC46: - bl WarpIntoMap - ldr r0, =sub_8086024 - bl SetMainCallback2 - adds r0, r5, 0 - bl DestroyTask -_080AFC56: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end task0A_fade_n_map_maybe - - thumb_func_start sub_80AFC60 -sub_80AFC60: @ 80AFC60 - push {lr} - bl ScriptContext2_Enable - bl music_something - bl sub_80AF0B4 - bl PlayRainSoundEffect - movs r0, 0x9 - bl PlaySE - ldr r0, =gFieldCallback - ldr r1, =sub_80AF3C8 - str r1, [r0] - ldr r0, =task0A_fade_n_map_maybe - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AFC60 - - thumb_func_start sub_80AFC98 -sub_80AFC98: @ 80AFC98 - push {lr} - cmp r1, 0xA0 - bhi _080AFCC0 - cmp r2, 0 - bge _080AFCA4 - movs r2, 0 -_080AFCA4: - cmp r2, 0xFF - ble _080AFCAA - movs r2, 0xFF -_080AFCAA: - cmp r3, 0 - bge _080AFCB0 - movs r3, 0 -_080AFCB0: - cmp r3, 0xFF - ble _080AFCB6 - movs r3, 0xFF -_080AFCB6: - lsls r1, 1 - adds r1, r0 - lsls r0, r2, 8 - orrs r0, r3 - strh r0, [r1] -_080AFCC0: - pop {r0} - bx r0 - thumb_func_end sub_80AFC98 - - thumb_func_start sub_80AFCC4 -sub_80AFCC4: @ 80AFCC4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - str r0, [sp] - mov r10, r1 - mov r9, r2 - adds r6, r3, 0 - mov r8, r6 - movs r7, 0 - cmp r6, 0 - blt _080AFD40 -_080AFCE0: - mov r0, r9 - subs r1, r0, r7 - mov r0, r10 - subs r4, r0, r6 - adds r5, r0, r6 - ldr r0, [sp] - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80AFC98 - mov r0, r9 - adds r1, r0, r7 - ldr r0, [sp] - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80AFC98 - mov r0, r9 - subs r1, r0, r6 - mov r0, r10 - subs r4, r0, r7 - adds r5, r0, r7 - ldr r0, [sp] - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80AFC98 - mov r0, r9 - adds r1, r0, r6 - ldr r0, [sp] - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80AFC98 - mov r1, r8 - adds r1, 0x1 - lsls r0, r7, 1 - subs r1, r0 - mov r8, r1 - adds r7, 0x1 - cmp r1, 0 - bge _080AFD3C - subs r1, r6, 0x1 - lsls r0, r1, 1 - add r8, r0 - adds r6, r1, 0 -_080AFD3C: - cmp r6, r7 - bge _080AFCE0 -_080AFD40: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80AFCC4 - - thumb_func_start sub_80AFD50 -sub_80AFD50: @ 80AFD50 - push {lr} - cmp r1, 0xA0 - bhi _080AFD78 - cmp r2, 0 - bge _080AFD5C - movs r2, 0 -_080AFD5C: - cmp r2, 0xF0 - ble _080AFD62 - movs r2, 0xF0 -_080AFD62: - cmp r3, 0 - bge _080AFD68 - movs r3, 0 -_080AFD68: - cmp r3, 0xF0 - ble _080AFD6E - movs r3, 0xF0 -_080AFD6E: - lsls r1, 1 - adds r1, r0 - lsls r0, r2, 8 - orrs r0, r3 - strh r0, [r1] -_080AFD78: - pop {r0} - bx r0 - thumb_func_end sub_80AFD50 - - thumb_func_start sub_80AFD7C -sub_80AFD7C: @ 80AFD7C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - str r0, [sp] - mov r10, r1 - mov r9, r2 - adds r6, r3, 0 - mov r8, r6 - movs r7, 0 - cmp r6, 0 - blt _080AFDF8 -_080AFD98: - mov r0, r9 - subs r1, r0, r7 - mov r0, r10 - subs r4, r0, r6 - adds r5, r0, r6 - ldr r0, [sp] - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80AFD50 - mov r0, r9 - adds r1, r0, r7 - ldr r0, [sp] - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80AFD50 - mov r0, r9 - subs r1, r0, r6 - mov r0, r10 - subs r4, r0, r7 - adds r5, r0, r7 - ldr r0, [sp] - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80AFD50 - mov r0, r9 - adds r1, r0, r6 - ldr r0, [sp] - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_80AFD50 - mov r1, r8 - adds r1, 0x1 - lsls r0, r7, 1 - subs r1, r0 - mov r8, r1 - adds r7, 0x1 - cmp r1, 0 - bge _080AFDF4 - subs r1, r6, 0x1 - lsls r0, r1, 1 - add r8, r0 - adds r6, r1, 0 -_080AFDF4: - cmp r6, r7 - bge _080AFD98 -_080AFDF8: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80AFD7C - - thumb_func_start sub_80AFE08 -sub_80AFE08: @ 80AFE08 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080AFE64 - cmp r0, 0x1 - bgt _080AFE30 - cmp r0, 0 - beq _080AFE36 - b _080AFEC6 - .pool -_080AFE30: - cmp r0, 0x2 - beq _080AFEBC - b _080AFEC6 -_080AFE36: - ldr r0, =gScanlineEffect - ldrb r1, [r0, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - ldr r1, =gScanlineEffectRegBuffers - adds r0, r1 - movs r2, 0x2 - ldrsh r1, [r4, r2] - movs r3, 0x4 - ldrsh r2, [r4, r3] - movs r5, 0x6 - ldrsh r3, [r4, r5] - bl sub_80AFCC4 - movs r0, 0x1 - strh r0, [r4] - b _080AFEC6 - .pool -_080AFE64: - ldr r0, =gScanlineEffect - ldrb r1, [r0, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - ldr r1, =gScanlineEffectRegBuffers - adds r0, r1 - movs r6, 0x2 - ldrsh r1, [r4, r6] - movs r3, 0x4 - ldrsh r2, [r4, r3] - movs r6, 0x6 - ldrsh r3, [r4, r6] - bl sub_80AFCC4 - movs r0, 0 - strh r0, [r4] - ldrh r0, [r4, 0xA] - ldrh r1, [r4, 0x6] - adds r0, r1 - strh r0, [r4, 0x6] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x8 - ldrsh r1, [r4, r2] - cmp r0, r1 - ble _080AFEC6 - movs r3, 0xC - ldrsh r0, [r4, r3] - cmp r0, 0x1 - bne _080AFEB4 - bl ScanlineEffect_Stop - movs r0, 0x2 - strh r0, [r4] - b _080AFEC6 - .pool -_080AFEB4: - adds r0, r5, 0 - bl DestroyTask - b _080AFEC6 -_080AFEBC: - bl ScanlineEffect_Clear - adds r0, r5, 0 - bl DestroyTask -_080AFEC6: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80AFE08 - - thumb_func_start sub_80AFECC -sub_80AFECC: @ 80AFECC - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080AFF28 - cmp r0, 0x1 - bgt _080AFEF4 - cmp r0, 0 - beq _080AFEFA - b _080AFF8A - .pool -_080AFEF4: - cmp r0, 0x2 - beq _080AFF80 - b _080AFF8A -_080AFEFA: - ldr r0, =gScanlineEffect - ldrb r1, [r0, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - ldr r1, =gScanlineEffectRegBuffers - adds r0, r1 - movs r2, 0x2 - ldrsh r1, [r4, r2] - movs r3, 0x4 - ldrsh r2, [r4, r3] - movs r5, 0x6 - ldrsh r3, [r4, r5] - bl sub_80AFD7C - movs r0, 0x1 - strh r0, [r4] - b _080AFF8A - .pool -_080AFF28: - ldr r0, =gScanlineEffect - ldrb r1, [r0, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - ldr r1, =gScanlineEffectRegBuffers - adds r0, r1 - movs r6, 0x2 - ldrsh r1, [r4, r6] - movs r3, 0x4 - ldrsh r2, [r4, r3] - movs r6, 0x6 - ldrsh r3, [r4, r6] - bl sub_80AFD7C - movs r0, 0 - strh r0, [r4] - ldrh r0, [r4, 0xA] - ldrh r1, [r4, 0x6] - adds r0, r1 - strh r0, [r4, 0x6] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x8 - ldrsh r1, [r4, r2] - cmp r0, r1 - ble _080AFF8A - movs r3, 0xC - ldrsh r0, [r4, r3] - cmp r0, 0x1 - bne _080AFF78 - bl ScanlineEffect_Stop - movs r0, 0x2 - strh r0, [r4] - b _080AFF8A - .pool -_080AFF78: - adds r0, r5, 0 - bl DestroyTask - b _080AFF8A -_080AFF80: - bl ScanlineEffect_Clear - adds r0, r5, 0 - bl DestroyTask -_080AFF8A: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80AFECC - - thumb_func_start sub_80AFF90 -sub_80AFF90: @ 80AFF90 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =sub_80AFE08 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - bne _080AFFAC - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask -_080AFFAC: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AFF90 - - thumb_func_start sub_80AFFB8 -sub_80AFFB8: @ 80AFFB8 - push {r4,lr} - ldr r4, =sub_80AFF90 - adds r0, r4, 0 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - bne _080AFFD0 - adds r0, r4, 0 - movs r1, 0x50 - bl CreateTask -_080AFFD0: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80AFFB8 - - thumb_func_start sub_80AFFDC -sub_80AFFDC: @ 80AFFDC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r8, r0 - mov r9, r1 - adds r5, r2, 0 - adds r4, r3, 0 - ldr r6, [sp, 0x1C] - ldr r0, [sp, 0x20] - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, =sub_80AFE08 - movs r1, 0x50 - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r1, r0, r1 - strh r5, [r1, 0x6] - strh r4, [r1, 0x8] - mov r0, r8 - strh r0, [r1, 0x2] - mov r0, r9 - strh r0, [r1, 0x4] - strh r6, [r1, 0xC] - cmp r5, r4 - bge _080B0028 - strh r7, [r1, 0xA] - b _080B002C - .pool -_080B0028: - negs r0, r7 - strh r0, [r1, 0xA] -_080B002C: - adds r0, r2, 0 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80AFFDC - - thumb_func_start sub_80B003C -sub_80B003C: @ 80B003C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r8, r0 - mov r9, r1 - adds r5, r2, 0 - adds r4, r3, 0 - ldr r6, [sp, 0x1C] - ldr r0, [sp, 0x20] - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, =sub_80AFECC - movs r1, 0x50 - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r1, r0, r1 - strh r5, [r1, 0x6] - strh r4, [r1, 0x8] - mov r0, r8 - strh r0, [r1, 0x2] - mov r0, r9 - strh r0, [r1, 0x4] - strh r6, [r1, 0xC] - cmp r5, r4 - bge _080B0088 - strh r7, [r1, 0xA] - b _080B008C - .pool -_080B0088: - negs r0, r7 - strh r0, [r1, 0xA] -_080B008C: - adds r0, r2, 0 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80B003C - - thumb_func_start sub_80B009C -sub_80B009C: @ 80B009C - push {r4,r5,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - bl Overworld_GetFlashLevel - lsls r0, 24 - lsrs r0, 24 - movs r5, 0 - cmp r4, 0 - bne _080B00B6 - movs r5, 0x1 -_080B00B6: - ldr r1, =gUnknown_0854FE64 - lsls r0, 1 - adds r0, r1 - ldrh r2, [r0] - lsls r0, r4, 1 - adds r0, r1 - ldrh r3, [r0] - str r5, [sp] - movs r0, 0x1 - str r0, [sp, 0x4] - movs r0, 0x78 - movs r1, 0x50 - bl sub_80AFFDC - bl sub_80AFFB8 - bl ScriptContext2_Enable - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B009C - - thumb_func_start sub_80B00E8 -sub_80B00E8: @ 80B00E8 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _080B0116 - ldr r4, =gScanlineEffectRegBuffers - ldr r1, =gUnknown_0854FE64 - lsls r0, 1 - adds r0, r1 - ldrh r3, [r0] - adds r0, r4, 0 - movs r1, 0x78 - movs r2, 0x50 - bl sub_80AFCC4 - movs r0, 0xF0 - lsls r0, 3 - adds r1, r4, r0 - movs r2, 0xF0 - lsls r2, 1 - adds r0, r4, 0 - bl CpuFastSet -_080B0116: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B00E8 - - thumb_func_start door_upload_tiles -door_upload_tiles: @ 80B0124 - push {r4,lr} - ldr r4, =gScanlineEffectRegBuffers - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000e68 - adds r0, r1 - ldrb r3, [r0] - adds r0, r4, 0 - movs r1, 0x78 - movs r2, 0x50 - bl sub_80AFCC4 - movs r0, 0xF0 - lsls r0, 3 - adds r1, r4, r0 - movs r2, 0xF0 - lsls r2, 1 - adds r0, r4, 0 - bl CpuFastSet - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end door_upload_tiles - - thumb_func_start task0A_mpl_807E31C -task0A_mpl_807E31C: @ 80B0160 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080B0184 - cmp r0, 0x1 - beq _080B0198 - b _080B01B6 - .pool -_080B0184: - bl FreezeEventObjects - bl ScriptContext2_Enable - bl sub_808D194 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080B01B6 -_080B0198: - bl sub_80AF71C - cmp r0, 0 - beq _080B01B6 - bl sub_808D1B4 - cmp r0, 0x1 - beq _080B01B6 - bl UnfreezeEventObjects - bl ScriptContext2_Disable - adds r0, r5, 0 - bl DestroyTask -_080B01B6: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end task0A_mpl_807E31C - - thumb_func_start sub_80B01BC -sub_80B01BC: @ 80B01BC - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080B0202 - cmp r0, 0x1 - bgt _080B01E4 - cmp r0, 0 - beq _080B01EE - b _080B023A - .pool -_080B01E4: - cmp r0, 0x2 - beq _080B0210 - cmp r0, 0x3 - beq _080B022A - b _080B023A -_080B01EE: - bl FreezeEventObjects - bl ScriptContext2_Enable - movs r0, 0x2D - bl PlaySE - bl sub_808D1C8 - b _080B0222 -_080B0202: - bl sub_808D1E8 - cmp r0, 0 - bne _080B023A - bl sub_80AF0B4 - b _080B0222 -_080B0210: - bl sub_80AF710 - cmp r0, 0 - bne _080B023A - bl BGMusicStopped - lsls r0, 24 - cmp r0, 0 - beq _080B023A -_080B0222: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080B023A -_080B022A: - bl WarpIntoMap - ldr r0, =CB2_LoadMap - bl SetMainCallback2 - adds r0, r5, 0 - bl DestroyTask -_080B023A: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B01BC - - thumb_func_start sub_80B0244 -sub_80B0244: @ 80B0244 - push {lr} - bl ScriptContext2_Enable - ldr r0, =sub_80AFA0C - movs r1, 0xA - bl CreateTask - ldr r1, =gFieldCallback - ldr r0, =sub_80AF3E8 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B0244 - - thumb_func_start sub_80B0268 -sub_80B0268: @ 80B0268 - push {lr} - bl ScriptContext2_Enable - ldr r0, =gFieldCallback - ldr r1, =mapldr_default - str r1, [r0] - ldr r0, =sub_80B01BC - movs r1, 0xA - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B0268 - - thumb_func_start sub_80B028C -sub_80B028C: @ 80B028C - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - cmp r0, 0 - bne _080B029A - movs r1, 0x1F - b _080B02A0 -_080B029A: - movs r0, 0xF8 - lsls r0, 7 - adds r1, r0, 0 -_080B02A0: - mov r0, sp - strh r1, [r0] - movs r5, 0 - movs r4, 0xF0 - lsls r4, 16 -_080B02AA: - lsrs r1, r4, 16 - mov r0, sp - movs r2, 0x2 - bl LoadPalette - movs r0, 0x80 - lsls r0, 9 - adds r4, r0 - adds r5, 0x1 - cmp r5, 0xF - ble _080B02AA - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80B028C - - thumb_func_start sub_80B02C8 -sub_80B02C8: @ 80B02C8 - push {r4,r5,lr} - lsls r0, 16 - ldr r2, =0x04000052 - ldrh r1, [r2] - lsls r1, 24 - lsrs r5, r1, 24 - ldrh r1, [r2] - lsrs r4, r1, 8 - cmp r0, 0 - beq _080B02EC - cmp r5, 0 - beq _080B02F6 - subs r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - b _080B02F6 - .pool -_080B02EC: - cmp r4, 0xF - bhi _080B02F6 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_080B02F6: - lsls r1, r4, 8 - orrs r1, r5 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - cmp r5, 0 - bne _080B0310 - cmp r4, 0x10 - bne _080B0310 - movs r0, 0x1 - b _080B0312 -_080B0310: - movs r0, 0 -_080B0312: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80B02C8 - - thumb_func_start sub_80B0318 -sub_80B0318: @ 80B0318 - push {r4,r5,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r5, r0, r1 - movs r1, 0 - ldrsh r0, [r5, r1] - cmp r0, 0x7 - bls _080B0334 - b _080B052C -_080B0334: - lsls r0, 2 - ldr r1, =_080B0348 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080B0348: - .4byte _080B0368 - .4byte _080B0424 - .4byte _080B0450 - .4byte _080B046C - .4byte _080B0482 - .4byte _080B04F2 - .4byte _080B04AC - .4byte _080B04BA -_080B0368: - movs r0, 0x80 - lsls r0, 19 - ldrh r0, [r0] - strh r0, [r5, 0xC] - ldr r0, =0x04000050 - ldrh r0, [r0] - strh r0, [r5, 0xE] - ldr r0, =0x04000052 - ldrh r0, [r0] - strh r0, [r5, 0x10] - ldr r0, =0x04000048 - ldrh r0, [r0] - strh r0, [r5, 0x12] - ldr r0, =0x0400004a - ldrh r0, [r0] - strh r0, [r5, 0x14] - movs r1, 0x80 - lsls r1, 7 - movs r0, 0 - bl ClearGpuRegBits - ldr r0, =gUnknown_82EC7CC - ldrh r1, [r0] - movs r0, 0x50 - bl SetGpuRegBits - ldr r1, =0x0000070c - movs r0, 0x52 - bl SetGpuReg - movs r0, 0x48 - movs r1, 0x3F - bl SetGpuReg - movs r0, 0x4A - movs r1, 0x1E - bl SetGpuReg - movs r0, 0x14 - str r0, [sp] - movs r0, 0xF - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0x1E - bl sub_8199C30 - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - ldr r4, =gScanlineEffectRegBuffers - movs r2, 0x4 - ldrsh r1, [r5, r2] - movs r0, 0x6 - ldrsh r2, [r5, r0] - adds r0, r4, 0 - movs r3, 0x1 - bl sub_80AFD7C - movs r2, 0xF0 - lsls r2, 3 - adds r1, r4, r2 - movs r2, 0xF0 - lsls r2, 1 - adds r0, r4, 0 - bl CpuFastSet - ldr r2, =gUnknown_0854FE7C - ldr r0, [r2] - ldr r1, [r2, 0x4] - ldr r2, [r2, 0x8] - bl ScanlineEffect_SetParams - movs r0, 0x1 - strh r0, [r5] - b _080B052C - .pool -_080B0424: - movs r0, 0 - movs r1, 0x11 - movs r2, 0 - movs r3, 0x1 - bl sub_8199DF0 - ldrb r0, [r5, 0x2] - bl sub_80B028C - movs r1, 0x4 - ldrsh r0, [r5, r1] - movs r2, 0x6 - ldrsh r1, [r5, r2] - movs r2, 0x1 - str r2, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - movs r3, 0xA0 - bl sub_80B003C - strh r4, [r5] - b _080B052C -_080B0450: - ldr r0, =sub_80AFECC - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - bne _080B052C - bl EnableBothScriptContexts - movs r0, 0x3 - strh r0, [r5] - b _080B052C - .pool -_080B046C: - bl InstallCameraPanAheadCallback - movs r0, 0 - bl SetCameraPanningCallback - movs r0, 0 - strh r0, [r5, 0xA] - movs r0, 0x4 - strh r0, [r5, 0x8] - strh r0, [r5] - b _080B052C -_080B0482: - ldrh r0, [r5, 0x8] - subs r0, 0x1 - strh r0, [r5, 0x8] - lsls r0, 16 - cmp r0, 0 - bne _080B052C - movs r0, 0x4 - strh r0, [r5, 0x8] - ldrh r0, [r5, 0xA] - movs r1, 0x1 - eors r0, r1 - strh r0, [r5, 0xA] - movs r1, 0x4 - negs r1, r1 - cmp r0, 0 - beq _080B04A4 - movs r1, 0x4 -_080B04A4: - movs r0, 0 - bl SetCameraPanning - b _080B052C -_080B04AC: - bl InstallCameraPanAheadCallback - movs r0, 0x8 - strh r0, [r5, 0x8] - movs r0, 0x7 - strh r0, [r5] - b _080B052C -_080B04BA: - ldrh r0, [r5, 0x8] - subs r0, 0x1 - strh r0, [r5, 0x8] - lsls r0, 16 - cmp r0, 0 - bne _080B052C - movs r0, 0x8 - strh r0, [r5, 0x8] - ldrh r0, [r5, 0xA] - movs r1, 0x1 - eors r0, r1 - strh r0, [r5, 0xA] - ldrh r0, [r5, 0xA] - bl sub_80B02C8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080B052C - movs r0, 0x5 - strh r0, [r5] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0x1 - bl sub_8199DF0 - b _080B052C -_080B04F2: - movs r0, 0x40 - movs r1, 0xFF - bl SetGpuReg - ldrh r1, [r5, 0xC] - movs r0, 0 - bl SetGpuReg - ldrh r1, [r5, 0xE] - movs r0, 0x50 - bl SetGpuReg - ldrh r1, [r5, 0x10] - movs r0, 0x52 - bl SetGpuReg - ldrh r1, [r5, 0x12] - movs r0, 0x48 - bl SetGpuReg - ldrh r1, [r5, 0x14] - movs r0, 0x4A - bl SetGpuReg - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask -_080B052C: - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80B0318 - - thumb_func_start sub_80B0534 -sub_80B0534: @ 80B0534 - push {lr} - ldr r0, =sub_80B0318 - movs r1, 0x50 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r1, r0 - ldr r0, =gSpecialVar_Result - ldrh r0, [r0] - cmp r0, 0 - bne _080B0568 - strh r0, [r1, 0x2] - movs r0, 0x68 - b _080B0580 - .pool -_080B0568: - cmp r0, 0x1 - bne _080B0572 - strh r0, [r1, 0x2] - movs r0, 0x88 - b _080B0580 -_080B0572: - cmp r0, 0x2 - bne _080B057A - movs r0, 0 - b _080B057C -_080B057A: - movs r0, 0x1 -_080B057C: - strh r0, [r1, 0x2] - movs r0, 0x78 -_080B0580: - strh r0, [r1, 0x4] - movs r0, 0x50 - strh r0, [r1, 0x6] - pop {r0} - bx r0 - thumb_func_end sub_80B0534 - - thumb_func_start sub_80B058C -sub_80B058C: @ 80B058C - push {lr} - ldr r0, =sub_80B0318 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0x6 - strh r0, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B058C - - thumb_func_start sub_80B05B4 -sub_80B05B4: @ 80B05B4 - push {lr} - bl Overworld_FadeOutMapMusic - ldr r0, =task50_0807F0C8 - movs r1, 0x50 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B05B4 - - thumb_func_start task50_0807F0C8 -task50_0807F0C8: @ 80B05CC - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl BGMusicStopped - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080B05E8 - adds r0, r4, 0 - bl DestroyTask - bl EnableBothScriptContexts -_080B05E8: - pop {r4} - pop {r0} - bx r0 - thumb_func_end task50_0807F0C8 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/field_screen_2.s b/data/field_screen_2.s deleted file mode 100644 index 105018014..000000000 --- a/data/field_screen_2.s +++ /dev/null @@ -1,17 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_0854FE64:: @ 854FE64 - .2byte 0x00c8, 0x0048, 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0000, 0x0000 - - .align 2 -gMaxFlashLevel:: @ 854FE78 - .4byte 0x00000008 - - .align 2 -gUnknown_0854FE7C:: @ 854FE7C - .4byte 0x04000040, 0xa2600001, 0x00000001 - diff --git a/include/menu.h b/include/menu.h index eb525efe9..894dfd78e 100644 --- a/include/menu.h +++ b/include/menu.h @@ -36,6 +36,7 @@ u32 GetPlayerTextSpeed(void); u8 GetPlayerTextSpeedDelay(void); void sub_81978B0(u16 arg0); void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16)); +void sub_8199DF0(u32 bg, u8 a1, int a2, int a3); void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str); void sub_8198070(u8 windowId, bool8 copyToVram); void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); diff --git a/include/overworld.h b/include/overworld.h index 60d9d5133..1f53662b3 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -91,7 +91,7 @@ void Overworld_ClearSavedMusic(void); void Overworld_ChangeMusicToDefault(void); void Overworld_ChangeMusicTo(u16 newMusic); u8 GetMapMusicFadeoutSpeed(void); -void music_something(void); +void TryFadeOutOldMapMusic(void); bool8 BGMusicStopped(void); void Overworld_FadeOutMapMusic(void); void UpdateAmbientCry(s16 *state, u16 *delayCounter); diff --git a/ld_script.txt b/ld_script.txt index e74ff6f6f..b97a7fb04 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -115,6 +115,7 @@ SECTIONS { src/title_screen.o(.text); src/field_weather.o(.text); src/field_weather_effect.o(.text); + src/field_fadetransition.o(.text); asm/field_screen.o(.text); src/battle_setup.o(.text); src/cable_club.o(.text); @@ -449,7 +450,7 @@ SECTIONS { data/field_weather.o(.rodata); src/field_weather.o(.rodata); src/field_weather_effect.o(.rodata); - data/field_screen_2.o(.rodata); + src/field_fadetransition.o(.rodata); src/battle_setup.o(.rodata); src/cable_club.o(.rodata); src/trainer_see.o(.rodata); diff --git a/src/field_effect.c b/src/field_effect.c index 935501130..6bfa4facf 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -244,7 +244,7 @@ extern void pal_fill_for_maplights(void); extern void sub_80E1558(u8); extern void sub_80E1570(void); extern bool8 sub_80E1584(void); -extern void sub_80AF0B4(void); +extern void WarpFadeScreen(void); // .rodata const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); @@ -1593,8 +1593,8 @@ static void sub_80B7004(struct Task *task) static void sub_80B7050(void) { - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); } static void sub_80B7060(void) @@ -1943,8 +1943,8 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) { - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); task->data[0]++; return FALSE; } @@ -2099,8 +2099,8 @@ static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, str { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); task->data[0]++; } return FALSE; @@ -2161,8 +2161,8 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; if (task->data[14] != 0 && (--task->data[14]) == 0) { - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); } eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) @@ -2314,8 +2314,8 @@ static void TeleportFieldEffectTask3(struct Task *task) if (task->data[4] >= 0xa8) { task->data[0]++; - music_something(); - sub_80AF0B4(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); } } @@ -3123,7 +3123,7 @@ static void sub_80B9474(struct Task *task) { if (sub_80B9508(task->data[1])) { - sub_80AF0B4(); + WarpFadeScreen(); task->data[0]++; } } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c new file mode 100644 index 000000000..2d8a6c303 --- /dev/null +++ b/src/field_fadetransition.c @@ -0,0 +1,1258 @@ +#include "global.h" +#include "cable_club.h" +#include "event_data.h" +#include "fieldmap.h" +#include "field_camera.h" +#include "field_door.h" +#include "field_effect.h" +#include "field_fadetransition.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "field_special_scene.h" +#include "field_weather.h" +// #include "fldeff_flash.h" +#include "gpu_regs.h" +#include "link.h" +#include "link_rfu.h" +#include "load_save.h" +#include "main.h" +#include "menu.h" +#include "event_obj_lock.h" +#include "metatile_behavior.h" +#include "palette.h" +#include "overworld.h" +#include "scanline_effect.h" +#include "script.h" +#include "sound.h" +#include "start_menu.h" +#include "task.h" +#include "text.h" +#include "constants/event_object_movement_constants.h" +#include "constants/songs.h" +#include "constants/rgb.h" + +extern bool32 sub_81D6534(void); +extern bool8 walkrun_is_standing_still(void); +extern void ScriptUnfreezeEventObjects(void); +extern void sub_81BE72C(void); +extern void sub_80FB768(void); +extern void sub_808D194(void); +extern void sub_808D1C8(void); +extern bool32 sub_808D1B4(void); +extern bool32 sub_808D1E8(void); + +extern const u16 gUnknown_82EC7CC[]; + +void sub_8080B9C(u8); +void task_map_chg_seq_0807E20C(u8); +void task_map_chg_seq_0807E2CC(u8); +void task0A_fade_n_map_maybe(u8); +void sub_808115C(u8); +void palette_bg_faded_fill_white(void); +u8 GetMapPairFadeToType(u8, u8); +u8 GetMapPairFadeFromType(u8, u8); +void sub_808C0A8(u8); +void sub_80AF438(u8); +bool32 sub_80AF71C(void); +void task0A_mpl_807E31C(u8 taskId); +void sub_80AFA0C(u8 taskId); +void sub_80AFA88(u8 taskId); +void sub_80B6B68(void); +void sub_80B6E4C(u8, u8); +void sub_80B75D8(u8); +void sub_80B7A74(u8); +/*static*/ void task50_0807F0C8(u8); + +const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; +const s32 gMaxFlashLevel = 8; + +const struct ScanlineEffectParams sFlashEffectParams = +{ + (void *)REG_ADDR_WIN0H, + ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, + 1 +}; + +void palette_bg_faded_fill_white(void) +{ + CpuFastFill16(RGB_WHITE, gPlttBufferFaded, PLTT_SIZE); +} + +void palette_bg_faded_fill_black(void) +{ + CpuFastFill16(RGB_BLACK, gPlttBufferFaded, PLTT_SIZE); +} + +void pal_fill_for_maplights(void) +{ + u8 previousMapType = GetLastUsedWarpMapType(); + switch (GetMapPairFadeFromType(previousMapType, Overworld_GetMapTypeOfSaveblockLocation())) + { + case 0: + palette_bg_faded_fill_black(); + FadeScreen(FADE_FROM_BLACK, 0); + break; + case 1: + palette_bg_faded_fill_white(); + FadeScreen(FADE_FROM_WHITE, 0); + } +} + +void sub_80AF08C(void) +{ + palette_bg_faded_fill_white(); + FadeScreen(FADE_FROM_WHITE, 8); +} + +void pal_fill_black(void) +{ + palette_bg_faded_fill_black(); + FadeScreen(FADE_FROM_BLACK, 0); +} + +void WarpFadeScreen(void) +{ + u8 currentMapType = Overworld_GetMapTypeOfSaveblockLocation(); + switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType)) + { + case 0: + FadeScreen(FADE_TO_BLACK, 0); + break; + case 1: + FadeScreen(FADE_TO_WHITE, 0); + } +} + +void sub_80AF0F4(u8 arg) +{ + sub_808C0A8(!arg); +} + +void task0A_nop_for_a_while(u8 taskId) +{ + if (sub_80AF71C() == TRUE) + DestroyTask(taskId); +} + +void sub_80AF128(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task0A_nop_for_a_while, 10); +} + +void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID) +{ + if (sub_80AF71C() == TRUE) + { + DestroyTask(taskID); + EnableBothScriptContexts(); + } +} + +void sub_80AF168(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +void sub_80AF188(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +void task_mpl_807DD60(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[1] = sub_80B3050(); + task->data[0]++; + break; + case 1: + if (gTasks[task->data[1]].isActive != TRUE) + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_80AF71C() == TRUE) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF214(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(task_mpl_807DD60, 10); +} + +void sub_80AF234(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_800ADF8(); + task->data[0]++; + break; + case 1: + if (!sub_800A520()) + { + if (++task->data[1] > 1800) + sub_8011170(0x6000); + } + else + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_80AF71C() == TRUE) + { + sub_8009F18(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF2B4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_800ADF8(); + task->data[0]++; + break; + case 1: + if (sub_800A520()) + { + task->data[0]++; + } + break; + case 2: + sub_8009F18(); + sub_8086C2C(); + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +void sub_80AF314(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(sub_80AF234, 10); +} + +void sub_80AF334(void) +{ + s16 x, y; + u8 behavior; + TaskFunc func; + + PlayerGetDestCoords(&x, &y); + behavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsDoor(behavior) == TRUE) + func = sub_80AF438; + else if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE) + func = task_map_chg_seq_0807E20C; + else + func = task_map_chg_seq_0807E2CC; + CreateTask(func, 10); +} + +void mapldr_default(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3B0(void) +{ + Overworld_PlaySpecialMapMusic(); + sub_80AF08C(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3C8(void) +{ + if (!sub_81D6534()) + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3E8(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + PlaySE(SE_TK_WARPOUT); + CreateTask(task0A_mpl_807E31C, 10); + ScriptContext2_Enable(); +} + +void sub_80AF40C(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + PlaySE(SE_TK_WARPOUT); + CreateTask(task_map_chg_seq_0807E2CC, 10); + ScriptContext2_Enable(); + sub_8085540(0xE); +} + +void sub_80AF438(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_80AF0F4(0); + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + FieldSetDoorOpened(*x, *y); + task->data[0] = 1; + break; + case 1: + if (sub_80AF71C()) + { + u8 eventObjId; + sub_80AF0F4(1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + u8 eventObjId; + task->data[1] = FieldAnimateDoorClose(*x, *y); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + UnfreezeEventObjects(); + task->data[0] = 4; + } + break; + case 4: + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +void task_map_chg_seq_0807E20C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_80AF0F4(0); + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + task->data[0] = 1; + break; + case 1: + if (sub_80AF71C()) + { + u8 eventObjId; + sub_80AF0F4(1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + UnfreezeEventObjects(); + task->data[0] = 3; + } + break; + case 3: + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +void task_map_chg_seq_0807E2CC(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_80AF71C()) + { + UnfreezeEventObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF660(u8 taskId) +{ + if (sub_80AF71C() == TRUE) + { + DestroyTask(taskId); + CreateTask(sub_809FA34, 80); + } +} + +void sub_80AF688(void) +{ + pal_fill_black(); + CreateTask(sub_80AF660, 0x50); + ScriptContext2_Enable(); +} + +bool32 sub_80AF6A4(void) +{ + sub_809FA18(); + return FALSE; +} + +void task_mpl_807E3C8(u8 taskId) +{ + if (sub_80AF71C() == 1) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + ScriptUnfreezeEventObjects(); + } +} + +void sub_80AF6D4(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(task_mpl_807E3C8, 10); +} + +void sub_80AF6F0(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task_mpl_807E3C8, 10); +} + +bool32 PaletteFadeActive(void) +{ + return gPaletteFade.active; +} + +bool32 sub_80AF71C(void) +{ + if (IsWeatherNotFadingIn() == TRUE) + return TRUE; + else + return FALSE; +} + +void sub_80AF734(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA0C, 10); +} + +void sp13E_warp_to_last_warp(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA0C, 10); +} + +void sub_80AF79C(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + FadeScreen(FADE_TO_WHITE, 8); + PlayRainSoundEffect(); + gFieldCallback = sub_80AF3B0; + CreateTask(sub_80AFA0C, 10); +} + +void sub_80AF7D0(void) +{ + ScriptContext2_Enable(); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA88, 10); +} + +void sp13F_fall_to_last_warp(void) +{ + sp13E_warp_to_last_warp(); + gFieldCallback = sub_80B6B68; +} + +void sub_80AF80C(u8 metatileBehavior) +{ + ScriptContext2_Enable(); + sub_80B6E4C(metatileBehavior, 10); +} + +void sub_80AF828(void) +{ + ScriptContext2_Enable(); + sub_80B75D8(10); +} + +void sub_80AF838(void) +{ + ScriptContext2_Enable(); + sub_80B7A74(10); +} + +void sub_80AF848(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_TK_WARPIN); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF3E8; +} + +void sub_80AF87C(void) +{ + sub_8085540(1); + ScriptContext2_Enable(); + SaveEventObjects(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_TK_WARPIN); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF40C; +} + +void sub_80AF8B8(void) +{ + ScriptContext2_Enable(); + WarpFadeScreen(); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80FB768; +} + +void sub_80AF8E0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + task->data[0]++; + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8086074); + DestroyTask(taskId); + break; + } +} + +void sub_80AF948(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_KAIDAN); + CreateTask(sub_80AF8E0, 10); +} + +void sub_80AF96C(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + ClearLinkCallback_2(); + FadeScreen(FADE_TO_BLACK, 0); + TryFadeOutOldMapMusic(); + PlaySE(SE_KAIDAN); + data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + { + sub_800AC34(); + data[0]++; + } + break; + case 2: + if (!gReceivedRemoteLinkPlayers) + { + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF9F8(void) +{ + CreateTask(sub_80AF96C, 10); +} + +void sub_80AFA0C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive()) + { + if (task->data[1] == 0) + { + sub_81BE72C(); + task->data[1] = 1; + } + if (BGMusicStopped()) + task->data[0]++; + } + break; + case 2: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +void sub_80AFA88(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + PlaySE(GetDoorSoundEffect(*x, *y - 1)); + task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); + task->data[0] = 1; + break; + case 1: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + u8 eventObjId; + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + u8 eventObjId; + task->data[1] = FieldAnimateDoorClose(*x, *y - 1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + sub_80AF0F4(0); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + task->data[0] = 4; + } + break; + case 4: + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + task->data[0] = 0; + task->func = sub_80AFA0C; + break; + } +} + +void task0A_fade_n_map_maybe(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + { + task->data[0]++; + } + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8086024); + DestroyTask(taskId); + break; + } +} + +void sub_80AFC60(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = sub_80AF3C8; + CreateTask(task0A_fade_n_map_maybe, 10); +} + +/*static*/ void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +{ + if (y <= 160) + { + if (left < 0) + left = 0; + if (left > 255) + left = 255; + if (right < 0) + right = 0; + if (right > 255) + right = 255; + dest[y] = (left << 8) | right; + } +} + +/*static*/ void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +{ + s32 r = radius; + s32 v2 = radius; + s32 v3 = 0; + while (r >= v3) + { + SetFlashScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetFlashScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetFlashScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetFlashScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + v2 -= (v3 * 2) - 1; + v3++; + if (v2 < 0) + { + v2 += 2 * (r - 1); + r--; + } + } +} + +/*static*/ void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +{ + if (y <= 160) + { + if (left < 0) + left = 0; + if (left > 240) + left = 240; + if (right < 0) + right = 0; + if (right > 240) + right = 240; + dest[y] = (left << 8) | right; + } +} + +/*static*/ void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +{ + s32 r = radius; + s32 v2 = radius; + s32 v3 = 0; + while (r >= v3) + { + SetFlash2ScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + v2 -= (v3 * 2) - 1; + v3++; + if (v2 < 0) + { + v2 += 2 * (r - 1); + r--; + } + } +} + +#define tFlashCenterX data[1] +#define tFlashCenterY data[2] +#define tCurFlashRadius data[3] +#define tDestFlashRadius data[4] +#define tFlashRadiusDelta data[5] +#define tClearScanlineEffect data[6] + +/*static*/ void UpdateFlashLevelEffect(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 1; + break; + case 1: + SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 0; + tCurFlashRadius += tFlashRadiusDelta; + if (tCurFlashRadius > tDestFlashRadius) + { + if (tClearScanlineEffect == 1) + { + ScanlineEffect_Stop(); + data[0] = 2; + } + else + { + DestroyTask(taskId); + } + } + break; + case 2: + ScanlineEffect_Clear(); + DestroyTask(taskId); + break; + } +} + +/*static*/ void UpdateFlash2LevelEffect(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 1; + break; + case 1: + SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 0; + tCurFlashRadius += tFlashRadiusDelta; + if (tCurFlashRadius > tDestFlashRadius) + { + if (tClearScanlineEffect == 1) + { + ScanlineEffect_Stop(); + data[0] = 2; + } + else + { + DestroyTask(taskId); + } + } + break; + case 2: + ScanlineEffect_Clear(); + DestroyTask(taskId); + break; + } +} + +/*static*/ void sub_80AFF90(u8 taskId) +{ + if (!FuncIsActiveTask(UpdateFlashLevelEffect)) + { + EnableBothScriptContexts(); + DestroyTask(taskId); + } +} + +/*static*/ void sub_80AFFB8(void) +{ + if (!FuncIsActiveTask(sub_80AFF90)) + CreateTask(sub_80AFF90, 80); +} + +/*static*/ u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +{ + u8 taskId = CreateTask(UpdateFlashLevelEffect, 80); + s16 *data = gTasks[taskId].data; + + tCurFlashRadius = initialFlashRadius; + tDestFlashRadius = destFlashRadius; + tFlashCenterX = centerX; + tFlashCenterY = centerY; + tClearScanlineEffect = clearScanlineEffect; + + if (initialFlashRadius < destFlashRadius) + tFlashRadiusDelta = delta; + else + tFlashRadiusDelta = -delta; + + return taskId; +} + +/*static*/ u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +{ + u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80); + s16 *data = gTasks[taskId].data; + + tCurFlashRadius = initialFlashRadius; + tDestFlashRadius = destFlashRadius; + tFlashCenterX = centerX; + tFlashCenterY = centerY; + tClearScanlineEffect = clearScanlineEffect; + + if (initialFlashRadius < destFlashRadius) + tFlashRadiusDelta = delta; + else + tFlashRadiusDelta = -delta; + + return taskId; +} + +#undef tCurFlashRadius +#undef tDestFlashRadius +#undef tFlashRadiusDelta +#undef tClearScanlineEffect + +void sub_80B009C(u8 flashLevel) +{ + u8 curFlashLevel = Overworld_GetFlashLevel(); + u8 value = 0; + if (!flashLevel) + value = 1; + sub_80AFFDC(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); + sub_80AFFB8(); + ScriptContext2_Enable(); +} + +void WriteFlashScanlineEffectBuffer(u8 flashLevel) +{ + if (flashLevel) + { + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, sFlashLevelPixelRadii[flashLevel]); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + } +} + +void door_upload_tiles(void) +{ + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.field_E68); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); +} + +void task0A_mpl_807E31C(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + sub_808D194(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_80AF71C() && sub_808D1B4() != TRUE) + { + UnfreezeEventObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80B01BC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + PlaySE(SE_TK_WARPIN); + sub_808D1C8(); + task->data[0]++; + break; + case 1: + if (!sub_808D1E8()) + { + WarpFadeScreen(); + task->data[0]++; + } + break; + case 2: + if (!PaletteFadeActive() && BGMusicStopped()) + task->data[0]++; + break; + case 3: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +void sub_80B0244(void) +{ + ScriptContext2_Enable(); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF3E8; +} + +void sub_80B0268(void) +{ + ScriptContext2_Enable(); + gFieldCallback = mapldr_default; + CreateTask(sub_80B01BC, 10); +} + +/*static*/ void sub_80B028C(u8 a1) +{ + int i; + u16 color[1]; + + if (!a1) + color[0] = 0x1F; + else + color[0] = 0x7C00; + + for (i = 0; i < 16; i++) + { + LoadPalette(color, 0xF0 + i, 2); + } +} + +/*static*/ bool8 sub_80B02C8(u16 a1) +{ + u8 lo = REG_BLDALPHA & 0xFF; + u8 hi = REG_BLDALPHA >> 8; + + if (a1) + { + if (lo) + { + lo--; + } + } + else + { + if (hi < 0x10) + { + hi++; + } + } + + SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); + + if (lo == 0 && hi == 0x10) + return TRUE; + else + return FALSE; +} + +/*static*/ void sub_80B0318(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + data[6] = REG_DISPCNT; + data[7] = REG_BLDCNT; + data[8] = REG_BLDALPHA; + data[9] = REG_WININ; + data[10] = REG_WINOUT; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); + SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); + SetGpuReg(REG_OFFSET_BLDALPHA, 1804); + SetGpuReg(REG_OFFSET_WININ, 63); + SetGpuReg(REG_OFFSET_WINOUT, 30); + sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); + schedule_bg_copy_tilemap_to_vram(0); + SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + ScanlineEffect_SetParams(sFlashEffectParams); + data[0] = 1; + break; + case 1: + sub_8199DF0(0, 17, 0, 1); + sub_80B028C(data[1]); + sub_80B003C(data[2], data[3], 1, 160, 1, 2); + data[0] = 2; + break; + case 2: + if (!FuncIsActiveTask(UpdateFlash2LevelEffect)) + { + EnableBothScriptContexts(); + data[0] = 3; + } + break; + case 3: + InstallCameraPanAheadCallback(); + SetCameraPanningCallback(NULL); + data[5] = 0; + data[4] = 4; + data[0] = 4; + break; + case 4: + data[4]--; + if (!data[4]) + { + s32 panning; + data[4] = 4; + data[5] ^= 1; + if (data[5]) + panning = 4; + else + panning = -4; + SetCameraPanning(0, panning); + } + break; + case 6: + InstallCameraPanAheadCallback(); + data[4] = 8; + data[0] = 7; + break; + case 7: + data[4]--; + if (!data[4]) + { + data[4] = 8; + data[5] ^= 1; + if (sub_80B02C8(data[5]) == TRUE) + { + data[0] = 5; + sub_8199DF0(0, 0, 0, 1); + } + } + break; + case 5: + SetGpuReg(REG_OFFSET_WIN0H, 255); + SetGpuReg(REG_OFFSET_DISPCNT, data[6]); + SetGpuReg(REG_OFFSET_BLDCNT, data[7]); + SetGpuReg(REG_OFFSET_BLDALPHA, data[8]); + SetGpuReg(REG_OFFSET_WININ, data[9]); + SetGpuReg(REG_OFFSET_WINOUT, data[10]); + EnableBothScriptContexts(); + DestroyTask(taskId); + break; + } +} + +void sub_80B0534(void) +{ + u8 taskId = CreateTask(sub_80B0318, 80); + s16 *data = gTasks[taskId].data; + + if (gSpecialVar_Result == 0) + { + data[1] = 0; + data[2] = 104; + } + else if (gSpecialVar_Result == 1) + { + data[1] = 1; + data[2] = 136; + } + else if (gSpecialVar_Result == 2) + { + data[1] = 0; + data[2] = 120; + } + else + { + data[1] = 1; + data[2] = 120; + } + + data[3] = 80; +} + +void sub_80B058C(void) +{ + u8 taskId = FindTaskIdByFunc(sub_80B0318); + gTasks[taskId].data[0] = 6; +} + +void sub_80B05B4(void) +{ + Overworld_FadeOutMapMusic(); + CreateTask(task50_0807F0C8, 80); +} + +/*static*/ void task50_0807F0C8(u8 taskId) +{ + if (BGMusicStopped() == TRUE) + { + DestroyTask(taskId); + EnableBothScriptContexts(); + } +} diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 9771232f2..8862caa9f 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -170,7 +170,7 @@ static bool8 sub_8137304(void) return FALSE; } -bool8 sub_8137360(u8 a1, u8 a2) +bool8 GetMapPairFadeToType(u8 a1, u8 a2) { u8 i; u8 v0 = a1; @@ -187,7 +187,7 @@ bool8 sub_8137360(u8 a1, u8 a2) return FALSE; } -bool8 fade_type_for_given_maplight_pair(u8 a1, u8 a2) +bool8 GetMapPairFadeFromType(u8 a1, u8 a2) { u8 i; u8 v0 = a1; diff --git a/src/overworld.c b/src/overworld.c index 470e27ffc..a60ac9a54 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -129,7 +129,7 @@ extern void sub_80A0A38(void); extern void trainer_hill_map_load_related(void); extern void sub_8087D74(void); extern void battle_pyramid_map_load_related(u8); -extern void sub_80B00E8(u8); +extern void WriteFlashScanlineEffectBuffer(u8); extern void sub_80E9238(u8); extern void sub_81AA2F8(void); extern void sub_8195E10(void); @@ -1241,7 +1241,7 @@ u8 GetMapMusicFadeoutSpeed(void) return 4; } -void music_something(void) +void TryFadeOutOldMapMusic(void) { u16 currentMusic = GetCurrentMapMusic(); u16 warpMusic = GetWarpDestinationMusic(); @@ -1819,7 +1819,7 @@ static void InitCurrentFlashLevelScanlineEffect(void) } else if ((flashLevel = Overworld_GetFlashLevel())) { - sub_80B00E8(flashLevel); + WriteFlashScanlineEffectBuffer(flashLevel); ScanlineEffect_SetParams(sFlashEffectParams); } } -- cgit v1.2.3 From 4ec14b3d431f61309e33ca58c7702678bd25ae7a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 22:05:11 +0100 Subject: Finish field screen --- include/field_fadetransition.h | 12 - include/field_screen.h | 18 - include/field_screen_effect.h | 38 +- ld_script.txt | 4 +- src/decoration.c | 2 +- src/egg_hatch.c | 2 +- src/field_control_avatar.c | 3 +- src/field_effect.c | 2 +- src/field_fadetransition.c | 1258 --------------------------------------- src/field_screen_effect.c | 1261 ++++++++++++++++++++++++++++++++++++++++ src/field_specials.c | 2 +- src/item_use.c | 2 +- src/learn_move.c | 34 +- src/overworld.c | 7 +- src/player_pc.c | 3 +- src/pokemon_storage_system.c | 2 +- src/record_mixing.c | 2 +- src/rom_8011DC0.c | 2 +- src/scrcmd.c | 1 - src/secret_base.c | 4 +- src/shop.c | 2 +- 21 files changed, 1332 insertions(+), 1329 deletions(-) delete mode 100644 include/field_fadetransition.h delete mode 100644 include/field_screen.h delete mode 100644 src/field_fadetransition.c create mode 100644 src/field_screen_effect.c diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h deleted file mode 100644 index 7c2d16a24..000000000 --- a/include/field_fadetransition.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef GUARD_FIELD_FADETRANSITION_H -#define GUARD_FIELD_FADETRANSITION_H - -void sub_80AF734(void); -void sp13E_warp_to_last_warp(void); -void sub_80AF7D0(void); -void sp13F_fall_to_last_warp(void); - -void sub_80AF848(void); -void sub_80AF87C(void); - -#endif // GUARD_FIELD_FADETRANSITION_H diff --git a/include/field_screen.h b/include/field_screen.h deleted file mode 100644 index f8598bea6..000000000 --- a/include/field_screen.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef GUARD_FIELD_SCREEN_H -#define GUARD_FIELD_SCREEN_H - -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations -void pal_fill_black(void); -void sub_80AF168(void); -void sub_80AF2B4(u8 taskId); -void sub_80AF128(void); -void sub_80AF80C(u8); -void sub_80AF828(void); -void sub_80AF838(void); -void sub_80B0268(void); - -#endif //GUARD_FIELD_SCREEN_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index ef81c2f9e..f3ac2e866 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -1,8 +1,44 @@ #ifndef GUARD_FIELD_SCREEN_EFFECT_H #define GUARD_FIELD_SCREEN_EFFECT_H +void pal_fill_for_maplights(void); +void pal_fill_black(void); +void WarpFadeScreen(void); +void sub_80AF128(void); +void sub_80AF168(void); +void sub_80AF188(void); +void sub_80AF214(void); +void sub_80AF2B4(u8 taskId); +void sub_80AF314(void); +void mapldr_default(void); +void sub_80AF3B0(void); +void sub_80AF3C8(void); +void sub_80AF3E8(void); +void sub_80AF40C(void); +void sub_80AF688(void); +bool8 sub_80AF6A4(void); +void sub_80AF6D4(void); +void sub_80AF6F0(void); +void sub_80AF734(void); +void sp13E_warp_to_last_warp(void); void sub_80AF79C(void); -void sub_80B009C(u8); +void sub_80AF7D0(void); +void sp13F_fall_to_last_warp(void); +void sub_80AF80C(u8 metatileBehavior); +void sub_80AF828(void); +void sub_80AF838(void); +void sub_80AF848(void); +void sub_80AF87C(void); +void sub_80AF8B8(void); +void sub_80AF948(void); +void sub_80AF9F8(void); +void sub_80AFC60(void); +void sub_80B009C(u8 flashLevel); +void door_upload_tiles(void); void sub_80B0244(void); +void sub_80B0268(void); +void sub_80B0534(void); +void sub_80B058C(void); +void sub_80B05B4(void); #endif // GUARD_FIELD_SCREEN_EFFECT_H diff --git a/ld_script.txt b/ld_script.txt index b97a7fb04..ef41a20fc 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -115,7 +115,7 @@ SECTIONS { src/title_screen.o(.text); src/field_weather.o(.text); src/field_weather_effect.o(.text); - src/field_fadetransition.o(.text); + src/field_screen_effect.o(.text); asm/field_screen.o(.text); src/battle_setup.o(.text); src/cable_club.o(.text); @@ -450,7 +450,7 @@ SECTIONS { data/field_weather.o(.rodata); src/field_weather.o(.rodata); src/field_weather_effect.o(.rodata); - src/field_fadetransition.o(.rodata); + src/field_screen_effect.o(.rodata); src/battle_setup.o(.rodata); src/cable_club.o(.rodata); src/trainer_see.o(.rodata); diff --git a/src/decoration.c b/src/decoration.c index eb85b4f5c..4e3e0a2d3 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -16,7 +16,7 @@ #include "field_weather.h" #include "field_player_avatar.h" #include "field_camera.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "event_object_movement.h" #include "list_menu.h" #include "menu_helpers.h" diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 28386528a..a8238253e 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -30,7 +30,7 @@ #include "field_weather.h" #include "international_string_util.h" #include "naming_screen.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "battle.h" // to get rid of later struct EggHatchData diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index c52f5190f..829d72c34 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -8,10 +8,9 @@ #include "event_scripts.h" #include "fieldmap.h" #include "field_control_avatar.h" -#include "field_fadetransition.h" #include "field_player_avatar.h" #include "field_poison.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_specials.h" #include "fldeff_80F9BCC.h" #include "item_menu.h" diff --git a/src/field_effect.c b/src/field_effect.c index 6bfa4facf..58f4f03df 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -6,7 +6,7 @@ #include "field_effect.h" #include "field_effect_helpers.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "fieldmap.h" #include "fldeff_groundshake.h" diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c deleted file mode 100644 index 2d8a6c303..000000000 --- a/src/field_fadetransition.c +++ /dev/null @@ -1,1258 +0,0 @@ -#include "global.h" -#include "cable_club.h" -#include "event_data.h" -#include "fieldmap.h" -#include "field_camera.h" -#include "field_door.h" -#include "field_effect.h" -#include "field_fadetransition.h" -#include "event_object_movement.h" -#include "field_player_avatar.h" -#include "field_special_scene.h" -#include "field_weather.h" -// #include "fldeff_flash.h" -#include "gpu_regs.h" -#include "link.h" -#include "link_rfu.h" -#include "load_save.h" -#include "main.h" -#include "menu.h" -#include "event_obj_lock.h" -#include "metatile_behavior.h" -#include "palette.h" -#include "overworld.h" -#include "scanline_effect.h" -#include "script.h" -#include "sound.h" -#include "start_menu.h" -#include "task.h" -#include "text.h" -#include "constants/event_object_movement_constants.h" -#include "constants/songs.h" -#include "constants/rgb.h" - -extern bool32 sub_81D6534(void); -extern bool8 walkrun_is_standing_still(void); -extern void ScriptUnfreezeEventObjects(void); -extern void sub_81BE72C(void); -extern void sub_80FB768(void); -extern void sub_808D194(void); -extern void sub_808D1C8(void); -extern bool32 sub_808D1B4(void); -extern bool32 sub_808D1E8(void); - -extern const u16 gUnknown_82EC7CC[]; - -void sub_8080B9C(u8); -void task_map_chg_seq_0807E20C(u8); -void task_map_chg_seq_0807E2CC(u8); -void task0A_fade_n_map_maybe(u8); -void sub_808115C(u8); -void palette_bg_faded_fill_white(void); -u8 GetMapPairFadeToType(u8, u8); -u8 GetMapPairFadeFromType(u8, u8); -void sub_808C0A8(u8); -void sub_80AF438(u8); -bool32 sub_80AF71C(void); -void task0A_mpl_807E31C(u8 taskId); -void sub_80AFA0C(u8 taskId); -void sub_80AFA88(u8 taskId); -void sub_80B6B68(void); -void sub_80B6E4C(u8, u8); -void sub_80B75D8(u8); -void sub_80B7A74(u8); -/*static*/ void task50_0807F0C8(u8); - -const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; -const s32 gMaxFlashLevel = 8; - -const struct ScanlineEffectParams sFlashEffectParams = -{ - (void *)REG_ADDR_WIN0H, - ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, - 1 -}; - -void palette_bg_faded_fill_white(void) -{ - CpuFastFill16(RGB_WHITE, gPlttBufferFaded, PLTT_SIZE); -} - -void palette_bg_faded_fill_black(void) -{ - CpuFastFill16(RGB_BLACK, gPlttBufferFaded, PLTT_SIZE); -} - -void pal_fill_for_maplights(void) -{ - u8 previousMapType = GetLastUsedWarpMapType(); - switch (GetMapPairFadeFromType(previousMapType, Overworld_GetMapTypeOfSaveblockLocation())) - { - case 0: - palette_bg_faded_fill_black(); - FadeScreen(FADE_FROM_BLACK, 0); - break; - case 1: - palette_bg_faded_fill_white(); - FadeScreen(FADE_FROM_WHITE, 0); - } -} - -void sub_80AF08C(void) -{ - palette_bg_faded_fill_white(); - FadeScreen(FADE_FROM_WHITE, 8); -} - -void pal_fill_black(void) -{ - palette_bg_faded_fill_black(); - FadeScreen(FADE_FROM_BLACK, 0); -} - -void WarpFadeScreen(void) -{ - u8 currentMapType = Overworld_GetMapTypeOfSaveblockLocation(); - switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType)) - { - case 0: - FadeScreen(FADE_TO_BLACK, 0); - break; - case 1: - FadeScreen(FADE_TO_WHITE, 0); - } -} - -void sub_80AF0F4(u8 arg) -{ - sub_808C0A8(!arg); -} - -void task0A_nop_for_a_while(u8 taskId) -{ - if (sub_80AF71C() == TRUE) - DestroyTask(taskId); -} - -void sub_80AF128(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - pal_fill_black(); - CreateTask(task0A_nop_for_a_while, 10); -} - -void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID) -{ - if (sub_80AF71C() == TRUE) - { - DestroyTask(taskID); - EnableBothScriptContexts(); - } -} - -void sub_80AF168(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - pal_fill_black(); - CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); -} - -void sub_80AF188(void) -{ - ScriptContext2_Enable(); - pal_fill_black(); - CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); -} - -void task_mpl_807DD60(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - task->data[1] = sub_80B3050(); - task->data[0]++; - break; - case 1: - if (gTasks[task->data[1]].isActive != TRUE) - { - pal_fill_for_maplights(); - task->data[0]++; - } - break; - case 2: - if (sub_80AF71C() == TRUE) - { - ScriptContext2_Disable(); - DestroyTask(taskId); - } - break; - } -} - -void sub_80AF214(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - palette_bg_faded_fill_black(); - CreateTask(task_mpl_807DD60, 10); -} - -void sub_80AF234(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - sub_800ADF8(); - task->data[0]++; - break; - case 1: - if (!sub_800A520()) - { - if (++task->data[1] > 1800) - sub_8011170(0x6000); - } - else - { - pal_fill_for_maplights(); - task->data[0]++; - } - break; - case 2: - if (sub_80AF71C() == TRUE) - { - sub_8009F18(); - ScriptContext2_Disable(); - DestroyTask(taskId); - } - break; - } -} - -void sub_80AF2B4(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - sub_800ADF8(); - task->data[0]++; - break; - case 1: - if (sub_800A520()) - { - task->data[0]++; - } - break; - case 2: - sub_8009F18(); - sub_8086C2C(); - ScriptContext2_Disable(); - DestroyTask(taskId); - break; - } -} - -void sub_80AF314(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - palette_bg_faded_fill_black(); - CreateTask(sub_80AF234, 10); -} - -void sub_80AF334(void) -{ - s16 x, y; - u8 behavior; - TaskFunc func; - - PlayerGetDestCoords(&x, &y); - behavior = MapGridGetMetatileBehaviorAt(x, y); - if (MetatileBehavior_IsDoor(behavior) == TRUE) - func = sub_80AF438; - else if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE) - func = task_map_chg_seq_0807E20C; - else - func = task_map_chg_seq_0807E2CC; - CreateTask(func, 10); -} - -void mapldr_default(void) -{ - Overworld_PlaySpecialMapMusic(); - pal_fill_for_maplights(); - sub_80AF334(); - ScriptContext2_Enable(); -} - -void sub_80AF3B0(void) -{ - Overworld_PlaySpecialMapMusic(); - sub_80AF08C(); - sub_80AF334(); - ScriptContext2_Enable(); -} - -void sub_80AF3C8(void) -{ - if (!sub_81D6534()) - Overworld_PlaySpecialMapMusic(); - pal_fill_black(); - sub_80AF334(); - ScriptContext2_Enable(); -} - -void sub_80AF3E8(void) -{ - Overworld_PlaySpecialMapMusic(); - pal_fill_for_maplights(); - PlaySE(SE_TK_WARPOUT); - CreateTask(task0A_mpl_807E31C, 10); - ScriptContext2_Enable(); -} - -void sub_80AF40C(void) -{ - Overworld_PlaySpecialMapMusic(); - pal_fill_for_maplights(); - PlaySE(SE_TK_WARPOUT); - CreateTask(task_map_chg_seq_0807E2CC, 10); - ScriptContext2_Enable(); - sub_8085540(0xE); -} - -void sub_80AF438(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - s16 *x = &task->data[2]; - s16 *y = &task->data[3]; - - switch (task->data[0]) - { - case 0: - sub_80AF0F4(0); - FreezeEventObjects(); - PlayerGetDestCoords(x, y); - FieldSetDoorOpened(*x, *y); - task->data[0] = 1; - break; - case 1: - if (sub_80AF71C()) - { - u8 eventObjId; - sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); - task->data[0] = 2; - } - break; - case 2: - if (walkrun_is_standing_still()) - { - u8 eventObjId; - task->data[1] = FieldAnimateDoorClose(*x, *y); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); - task->data[0] = 3; - } - break; - case 3: - if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) - { - UnfreezeEventObjects(); - task->data[0] = 4; - } - break; - case 4: - ScriptContext2_Disable(); - DestroyTask(taskId); - break; - } -} - -void task_map_chg_seq_0807E20C(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - s16 *x = &task->data[2]; - s16 *y = &task->data[3]; - - switch (task->data[0]) - { - case 0: - sub_80AF0F4(0); - FreezeEventObjects(); - PlayerGetDestCoords(x, y); - task->data[0] = 1; - break; - case 1: - if (sub_80AF71C()) - { - u8 eventObjId; - sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); - task->data[0] = 2; - } - break; - case 2: - if (walkrun_is_standing_still()) - { - UnfreezeEventObjects(); - task->data[0] = 3; - } - break; - case 3: - ScriptContext2_Disable(); - DestroyTask(taskId); - break; - } -} - -void task_map_chg_seq_0807E2CC(u8 taskId) -{ - switch (gTasks[taskId].data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - gTasks[taskId].data[0]++; - break; - case 1: - if (sub_80AF71C()) - { - UnfreezeEventObjects(); - ScriptContext2_Disable(); - DestroyTask(taskId); - } - break; - } -} - -void sub_80AF660(u8 taskId) -{ - if (sub_80AF71C() == TRUE) - { - DestroyTask(taskId); - CreateTask(sub_809FA34, 80); - } -} - -void sub_80AF688(void) -{ - pal_fill_black(); - CreateTask(sub_80AF660, 0x50); - ScriptContext2_Enable(); -} - -bool32 sub_80AF6A4(void) -{ - sub_809FA18(); - return FALSE; -} - -void task_mpl_807E3C8(u8 taskId) -{ - if (sub_80AF71C() == 1) - { - ScriptContext2_Disable(); - DestroyTask(taskId); - ScriptUnfreezeEventObjects(); - } -} - -void sub_80AF6D4(void) -{ - ScriptContext2_Enable(); - pal_fill_black(); - CreateTask(task_mpl_807E3C8, 10); -} - -void sub_80AF6F0(void) -{ - ScriptContext2_Enable(); - Overworld_PlaySpecialMapMusic(); - pal_fill_black(); - CreateTask(task_mpl_807E3C8, 10); -} - -bool32 PaletteFadeActive(void) -{ - return gPaletteFade.active; -} - -bool32 sub_80AF71C(void) -{ - if (IsWeatherNotFadingIn() == TRUE) - return TRUE; - else - return FALSE; -} - -void sub_80AF734(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlayRainSoundEffect(); - PlaySE(SE_KAIDAN); - gFieldCallback = mapldr_default; - CreateTask(sub_80AFA0C, 10); -} - -void sp13E_warp_to_last_warp(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlayRainSoundEffect(); - gFieldCallback = mapldr_default; - CreateTask(sub_80AFA0C, 10); -} - -void sub_80AF79C(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - FadeScreen(FADE_TO_WHITE, 8); - PlayRainSoundEffect(); - gFieldCallback = sub_80AF3B0; - CreateTask(sub_80AFA0C, 10); -} - -void sub_80AF7D0(void) -{ - ScriptContext2_Enable(); - gFieldCallback = mapldr_default; - CreateTask(sub_80AFA88, 10); -} - -void sp13F_fall_to_last_warp(void) -{ - sp13E_warp_to_last_warp(); - gFieldCallback = sub_80B6B68; -} - -void sub_80AF80C(u8 metatileBehavior) -{ - ScriptContext2_Enable(); - sub_80B6E4C(metatileBehavior, 10); -} - -void sub_80AF828(void) -{ - ScriptContext2_Enable(); - sub_80B75D8(10); -} - -void sub_80AF838(void) -{ - ScriptContext2_Enable(); - sub_80B7A74(10); -} - -void sub_80AF848(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlaySE(SE_TK_WARPIN); - CreateTask(sub_80AFA0C, 10); - gFieldCallback = sub_80AF3E8; -} - -void sub_80AF87C(void) -{ - sub_8085540(1); - ScriptContext2_Enable(); - SaveEventObjects(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlaySE(SE_TK_WARPIN); - CreateTask(sub_80AFA0C, 10); - gFieldCallback = sub_80AF40C; -} - -void sub_80AF8B8(void) -{ - ScriptContext2_Enable(); - WarpFadeScreen(); - CreateTask(sub_80AFA0C, 10); - gFieldCallback = sub_80FB768; -} - -void sub_80AF8E0(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - ScriptContext2_Enable(); - task->data[0]++; - break; - case 1: - if (!PaletteFadeActive() && BGMusicStopped()) - task->data[0]++; - break; - case 2: - WarpIntoMap(); - SetMainCallback2(sub_8086074); - DestroyTask(taskId); - break; - } -} - -void sub_80AF948(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlaySE(SE_KAIDAN); - CreateTask(sub_80AF8E0, 10); -} - -void sub_80AF96C(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - ClearLinkCallback_2(); - FadeScreen(FADE_TO_BLACK, 0); - TryFadeOutOldMapMusic(); - PlaySE(SE_KAIDAN); - data[0]++; - break; - case 1: - if (!PaletteFadeActive() && BGMusicStopped()) - { - sub_800AC34(); - data[0]++; - } - break; - case 2: - if (!gReceivedRemoteLinkPlayers) - { - WarpIntoMap(); - SetMainCallback2(CB2_LoadMap); - DestroyTask(taskId); - } - break; - } -} - -void sub_80AF9F8(void) -{ - CreateTask(sub_80AF96C, 10); -} - -void sub_80AFA0C(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - task->data[0]++; - break; - case 1: - if (!PaletteFadeActive()) - { - if (task->data[1] == 0) - { - sub_81BE72C(); - task->data[1] = 1; - } - if (BGMusicStopped()) - task->data[0]++; - } - break; - case 2: - WarpIntoMap(); - SetMainCallback2(CB2_LoadMap); - DestroyTask(taskId); - break; - } -} - -void sub_80AFA88(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - s16 *x = &task->data[2]; - s16 *y = &task->data[3]; - - switch (task->data[0]) - { - case 0: - FreezeEventObjects(); - PlayerGetDestCoords(x, y); - PlaySE(GetDoorSoundEffect(*x, *y - 1)); - task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); - task->data[0] = 1; - break; - case 1: - if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) - { - u8 eventObjId; - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); - task->data[0] = 2; - } - break; - case 2: - if (walkrun_is_standing_still()) - { - u8 eventObjId; - task->data[1] = FieldAnimateDoorClose(*x, *y - 1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); - sub_80AF0F4(0); - task->data[0] = 3; - } - break; - case 3: - if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) - { - task->data[0] = 4; - } - break; - case 4: - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlayRainSoundEffect(); - task->data[0] = 0; - task->func = sub_80AFA0C; - break; - } -} - -void task0A_fade_n_map_maybe(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - task->data[0]++; - break; - case 1: - if (!PaletteFadeActive() && BGMusicStopped()) - { - task->data[0]++; - } - break; - case 2: - WarpIntoMap(); - SetMainCallback2(sub_8086024); - DestroyTask(taskId); - break; - } -} - -void sub_80AFC60(void) -{ - ScriptContext2_Enable(); - TryFadeOutOldMapMusic(); - WarpFadeScreen(); - PlayRainSoundEffect(); - PlaySE(SE_KAIDAN); - gFieldCallback = sub_80AF3C8; - CreateTask(task0A_fade_n_map_maybe, 10); -} - -/*static*/ void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) -{ - if (y <= 160) - { - if (left < 0) - left = 0; - if (left > 255) - left = 255; - if (right < 0) - right = 0; - if (right > 255) - right = 255; - dest[y] = (left << 8) | right; - } -} - -/*static*/ void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) -{ - s32 r = radius; - s32 v2 = radius; - s32 v3 = 0; - while (r >= v3) - { - SetFlashScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); - SetFlashScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); - SetFlashScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); - SetFlashScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); - v2 -= (v3 * 2) - 1; - v3++; - if (v2 < 0) - { - v2 += 2 * (r - 1); - r--; - } - } -} - -/*static*/ void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) -{ - if (y <= 160) - { - if (left < 0) - left = 0; - if (left > 240) - left = 240; - if (right < 0) - right = 0; - if (right > 240) - right = 240; - dest[y] = (left << 8) | right; - } -} - -/*static*/ void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) -{ - s32 r = radius; - s32 v2 = radius; - s32 v3 = 0; - while (r >= v3) - { - SetFlash2ScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); - v2 -= (v3 * 2) - 1; - v3++; - if (v2 < 0) - { - v2 += 2 * (r - 1); - r--; - } - } -} - -#define tFlashCenterX data[1] -#define tFlashCenterY data[2] -#define tCurFlashRadius data[3] -#define tDestFlashRadius data[4] -#define tFlashRadiusDelta data[5] -#define tClearScanlineEffect data[6] - -/*static*/ void UpdateFlashLevelEffect(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 1; - break; - case 1: - SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 0; - tCurFlashRadius += tFlashRadiusDelta; - if (tCurFlashRadius > tDestFlashRadius) - { - if (tClearScanlineEffect == 1) - { - ScanlineEffect_Stop(); - data[0] = 2; - } - else - { - DestroyTask(taskId); - } - } - break; - case 2: - ScanlineEffect_Clear(); - DestroyTask(taskId); - break; - } -} - -/*static*/ void UpdateFlash2LevelEffect(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 1; - break; - case 1: - SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 0; - tCurFlashRadius += tFlashRadiusDelta; - if (tCurFlashRadius > tDestFlashRadius) - { - if (tClearScanlineEffect == 1) - { - ScanlineEffect_Stop(); - data[0] = 2; - } - else - { - DestroyTask(taskId); - } - } - break; - case 2: - ScanlineEffect_Clear(); - DestroyTask(taskId); - break; - } -} - -/*static*/ void sub_80AFF90(u8 taskId) -{ - if (!FuncIsActiveTask(UpdateFlashLevelEffect)) - { - EnableBothScriptContexts(); - DestroyTask(taskId); - } -} - -/*static*/ void sub_80AFFB8(void) -{ - if (!FuncIsActiveTask(sub_80AFF90)) - CreateTask(sub_80AFF90, 80); -} - -/*static*/ u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) -{ - u8 taskId = CreateTask(UpdateFlashLevelEffect, 80); - s16 *data = gTasks[taskId].data; - - tCurFlashRadius = initialFlashRadius; - tDestFlashRadius = destFlashRadius; - tFlashCenterX = centerX; - tFlashCenterY = centerY; - tClearScanlineEffect = clearScanlineEffect; - - if (initialFlashRadius < destFlashRadius) - tFlashRadiusDelta = delta; - else - tFlashRadiusDelta = -delta; - - return taskId; -} - -/*static*/ u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) -{ - u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80); - s16 *data = gTasks[taskId].data; - - tCurFlashRadius = initialFlashRadius; - tDestFlashRadius = destFlashRadius; - tFlashCenterX = centerX; - tFlashCenterY = centerY; - tClearScanlineEffect = clearScanlineEffect; - - if (initialFlashRadius < destFlashRadius) - tFlashRadiusDelta = delta; - else - tFlashRadiusDelta = -delta; - - return taskId; -} - -#undef tCurFlashRadius -#undef tDestFlashRadius -#undef tFlashRadiusDelta -#undef tClearScanlineEffect - -void sub_80B009C(u8 flashLevel) -{ - u8 curFlashLevel = Overworld_GetFlashLevel(); - u8 value = 0; - if (!flashLevel) - value = 1; - sub_80AFFDC(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); - sub_80AFFB8(); - ScriptContext2_Enable(); -} - -void WriteFlashScanlineEffectBuffer(u8 flashLevel) -{ - if (flashLevel) - { - SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, sFlashLevelPixelRadii[flashLevel]); - CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); - } -} - -void door_upload_tiles(void) -{ - SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.field_E68); - CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); -} - -void task0A_mpl_807E31C(u8 taskId) -{ - switch (gTasks[taskId].data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - sub_808D194(); - gTasks[taskId].data[0]++; - break; - case 1: - if (sub_80AF71C() && sub_808D1B4() != TRUE) - { - UnfreezeEventObjects(); - ScriptContext2_Disable(); - DestroyTask(taskId); - } - break; - } -} - -void sub_80B01BC(u8 taskId) -{ - struct Task *task = &gTasks[taskId]; - - switch (task->data[0]) - { - case 0: - FreezeEventObjects(); - ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); - sub_808D1C8(); - task->data[0]++; - break; - case 1: - if (!sub_808D1E8()) - { - WarpFadeScreen(); - task->data[0]++; - } - break; - case 2: - if (!PaletteFadeActive() && BGMusicStopped()) - task->data[0]++; - break; - case 3: - WarpIntoMap(); - SetMainCallback2(CB2_LoadMap); - DestroyTask(taskId); - break; - } -} - -void sub_80B0244(void) -{ - ScriptContext2_Enable(); - CreateTask(sub_80AFA0C, 10); - gFieldCallback = sub_80AF3E8; -} - -void sub_80B0268(void) -{ - ScriptContext2_Enable(); - gFieldCallback = mapldr_default; - CreateTask(sub_80B01BC, 10); -} - -/*static*/ void sub_80B028C(u8 a1) -{ - int i; - u16 color[1]; - - if (!a1) - color[0] = 0x1F; - else - color[0] = 0x7C00; - - for (i = 0; i < 16; i++) - { - LoadPalette(color, 0xF0 + i, 2); - } -} - -/*static*/ bool8 sub_80B02C8(u16 a1) -{ - u8 lo = REG_BLDALPHA & 0xFF; - u8 hi = REG_BLDALPHA >> 8; - - if (a1) - { - if (lo) - { - lo--; - } - } - else - { - if (hi < 0x10) - { - hi++; - } - } - - SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); - - if (lo == 0 && hi == 0x10) - return TRUE; - else - return FALSE; -} - -/*static*/ void sub_80B0318(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - data[6] = REG_DISPCNT; - data[7] = REG_BLDCNT; - data[8] = REG_BLDALPHA; - data[9] = REG_WININ; - data[10] = REG_WINOUT; - ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); - SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); - SetGpuReg(REG_OFFSET_BLDALPHA, 1804); - SetGpuReg(REG_OFFSET_WININ, 63); - SetGpuReg(REG_OFFSET_WINOUT, 30); - sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); - schedule_bg_copy_tilemap_to_vram(0); - SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); - CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); - ScanlineEffect_SetParams(sFlashEffectParams); - data[0] = 1; - break; - case 1: - sub_8199DF0(0, 17, 0, 1); - sub_80B028C(data[1]); - sub_80B003C(data[2], data[3], 1, 160, 1, 2); - data[0] = 2; - break; - case 2: - if (!FuncIsActiveTask(UpdateFlash2LevelEffect)) - { - EnableBothScriptContexts(); - data[0] = 3; - } - break; - case 3: - InstallCameraPanAheadCallback(); - SetCameraPanningCallback(NULL); - data[5] = 0; - data[4] = 4; - data[0] = 4; - break; - case 4: - data[4]--; - if (!data[4]) - { - s32 panning; - data[4] = 4; - data[5] ^= 1; - if (data[5]) - panning = 4; - else - panning = -4; - SetCameraPanning(0, panning); - } - break; - case 6: - InstallCameraPanAheadCallback(); - data[4] = 8; - data[0] = 7; - break; - case 7: - data[4]--; - if (!data[4]) - { - data[4] = 8; - data[5] ^= 1; - if (sub_80B02C8(data[5]) == TRUE) - { - data[0] = 5; - sub_8199DF0(0, 0, 0, 1); - } - } - break; - case 5: - SetGpuReg(REG_OFFSET_WIN0H, 255); - SetGpuReg(REG_OFFSET_DISPCNT, data[6]); - SetGpuReg(REG_OFFSET_BLDCNT, data[7]); - SetGpuReg(REG_OFFSET_BLDALPHA, data[8]); - SetGpuReg(REG_OFFSET_WININ, data[9]); - SetGpuReg(REG_OFFSET_WINOUT, data[10]); - EnableBothScriptContexts(); - DestroyTask(taskId); - break; - } -} - -void sub_80B0534(void) -{ - u8 taskId = CreateTask(sub_80B0318, 80); - s16 *data = gTasks[taskId].data; - - if (gSpecialVar_Result == 0) - { - data[1] = 0; - data[2] = 104; - } - else if (gSpecialVar_Result == 1) - { - data[1] = 1; - data[2] = 136; - } - else if (gSpecialVar_Result == 2) - { - data[1] = 0; - data[2] = 120; - } - else - { - data[1] = 1; - data[2] = 120; - } - - data[3] = 80; -} - -void sub_80B058C(void) -{ - u8 taskId = FindTaskIdByFunc(sub_80B0318); - gTasks[taskId].data[0] = 6; -} - -void sub_80B05B4(void) -{ - Overworld_FadeOutMapMusic(); - CreateTask(task50_0807F0C8, 80); -} - -/*static*/ void task50_0807F0C8(u8 taskId) -{ - if (BGMusicStopped() == TRUE) - { - DestroyTask(taskId); - EnableBothScriptContexts(); - } -} diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c new file mode 100644 index 000000000..0de86d4f4 --- /dev/null +++ b/src/field_screen_effect.c @@ -0,0 +1,1261 @@ +#include "global.h" +#include "cable_club.h" +#include "event_data.h" +#include "fieldmap.h" +#include "field_camera.h" +#include "field_door.h" +#include "field_effect.h" +#include "event_object_movement.h" +#include "field_player_avatar.h" +#include "field_screen_effect.h" +#include "field_special_scene.h" +#include "field_weather.h" +// #include "fldeff_flash.h" +#include "gpu_regs.h" +#include "link.h" +#include "link_rfu.h" +#include "load_save.h" +#include "main.h" +#include "menu.h" +#include "event_obj_lock.h" +#include "metatile_behavior.h" +#include "palette.h" +#include "overworld.h" +#include "scanline_effect.h" +#include "script.h" +#include "sound.h" +#include "start_menu.h" +#include "task.h" +#include "text.h" +#include "constants/event_object_movement_constants.h" +#include "constants/songs.h" +#include "constants/rgb.h" + +extern bool32 sub_81D6534(void); +extern bool8 walkrun_is_standing_still(void); +extern void ScriptUnfreezeEventObjects(void); +extern void sub_81BE72C(void); +extern void sub_80FB768(void); +extern void sub_808D194(void); +extern void sub_808D1C8(void); +extern bool32 sub_808D1B4(void); +extern bool32 sub_808D1E8(void); +extern void sub_80B6B68(void); +extern void sub_80B6E4C(u8, u8); +extern void sub_80B75D8(u8); +extern void sub_80B7A74(u8); +extern void sub_808C0A8(u8); +extern u8 GetMapPairFadeToType(u8, u8); +extern u8 GetMapPairFadeFromType(u8, u8); + +extern const u16 gUnknown_82EC7CC[]; + +// This file's functions. +static void sub_8080B9C(u8); +static void task_map_chg_seq_0807E20C(u8); +static void task_map_chg_seq_0807E2CC(u8); +static void task0A_fade_n_map_maybe(u8); +static void sub_808115C(u8); +static void palette_bg_faded_fill_white(void); +static void sub_80AF438(u8); +static bool32 sub_80AF71C(void); +static void task0A_mpl_807E31C(u8 taskId); +static void sub_80AFA0C(u8 taskId); +static void sub_80AFA88(u8 taskId); +static void task50_0807F0C8(u8); + +// const +const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; +const s32 gMaxFlashLevel = 8; + +const struct ScanlineEffectParams sFlashEffectParams = +{ + (void *)REG_ADDR_WIN0H, + ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, + 1 +}; + +// code +static void palette_bg_faded_fill_white(void) +{ + CpuFastFill16(RGB_WHITE, gPlttBufferFaded, PLTT_SIZE); +} + +static void palette_bg_faded_fill_black(void) +{ + CpuFastFill16(RGB_BLACK, gPlttBufferFaded, PLTT_SIZE); +} + +void pal_fill_for_maplights(void) +{ + u8 previousMapType = GetLastUsedWarpMapType(); + switch (GetMapPairFadeFromType(previousMapType, Overworld_GetMapTypeOfSaveblockLocation())) + { + case 0: + palette_bg_faded_fill_black(); + FadeScreen(FADE_FROM_BLACK, 0); + break; + case 1: + palette_bg_faded_fill_white(); + FadeScreen(FADE_FROM_WHITE, 0); + } +} + +static void sub_80AF08C(void) +{ + palette_bg_faded_fill_white(); + FadeScreen(FADE_FROM_WHITE, 8); +} + +void pal_fill_black(void) +{ + palette_bg_faded_fill_black(); + FadeScreen(FADE_FROM_BLACK, 0); +} + +void WarpFadeScreen(void) +{ + u8 currentMapType = Overworld_GetMapTypeOfSaveblockLocation(); + switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType)) + { + case 0: + FadeScreen(FADE_TO_BLACK, 0); + break; + case 1: + FadeScreen(FADE_TO_WHITE, 0); + } +} + +static void sub_80AF0F4(u8 arg) +{ + sub_808C0A8(!arg); +} + +static void task0A_nop_for_a_while(u8 taskId) +{ + if (sub_80AF71C() == TRUE) + DestroyTask(taskId); +} + +void sub_80AF128(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task0A_nop_for_a_while, 10); +} + +static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID) +{ + if (sub_80AF71C() == TRUE) + { + DestroyTask(taskID); + EnableBothScriptContexts(); + } +} + +void sub_80AF168(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +void sub_80AF188(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); +} + +static void task_mpl_807DD60(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[1] = sub_80B3050(); + task->data[0]++; + break; + case 1: + if (gTasks[task->data[1]].isActive != TRUE) + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_80AF71C() == TRUE) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF214(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(task_mpl_807DD60, 10); +} + +static void sub_80AF234(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_800ADF8(); + task->data[0]++; + break; + case 1: + if (!sub_800A520()) + { + if (++task->data[1] > 1800) + sub_8011170(0x6000); + } + else + { + pal_fill_for_maplights(); + task->data[0]++; + } + break; + case 2: + if (sub_80AF71C() == TRUE) + { + sub_8009F18(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF2B4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sub_800ADF8(); + task->data[0]++; + break; + case 1: + if (sub_800A520()) + { + task->data[0]++; + } + break; + case 2: + sub_8009F18(); + sub_8086C2C(); + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +void sub_80AF314(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + palette_bg_faded_fill_black(); + CreateTask(sub_80AF234, 10); +} + +static void sub_80AF334(void) +{ + s16 x, y; + u8 behavior; + TaskFunc func; + + PlayerGetDestCoords(&x, &y); + behavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsDoor(behavior) == TRUE) + func = sub_80AF438; + else if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE) + func = task_map_chg_seq_0807E20C; + else + func = task_map_chg_seq_0807E2CC; + CreateTask(func, 10); +} + +void mapldr_default(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3B0(void) +{ + Overworld_PlaySpecialMapMusic(); + sub_80AF08C(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3C8(void) +{ + if (!sub_81D6534()) + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + sub_80AF334(); + ScriptContext2_Enable(); +} + +void sub_80AF3E8(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + PlaySE(SE_TK_WARPOUT); + CreateTask(task0A_mpl_807E31C, 10); + ScriptContext2_Enable(); +} + +void sub_80AF40C(void) +{ + Overworld_PlaySpecialMapMusic(); + pal_fill_for_maplights(); + PlaySE(SE_TK_WARPOUT); + CreateTask(task_map_chg_seq_0807E2CC, 10); + ScriptContext2_Enable(); + sub_8085540(0xE); +} + +static void sub_80AF438(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_80AF0F4(0); + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + FieldSetDoorOpened(*x, *y); + task->data[0] = 1; + break; + case 1: + if (sub_80AF71C()) + { + u8 eventObjId; + sub_80AF0F4(1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + u8 eventObjId; + task->data[1] = FieldAnimateDoorClose(*x, *y); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + UnfreezeEventObjects(); + task->data[0] = 4; + } + break; + case 4: + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +static void task_map_chg_seq_0807E20C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + sub_80AF0F4(0); + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + task->data[0] = 1; + break; + case 1: + if (sub_80AF71C()) + { + u8 eventObjId; + sub_80AF0F4(1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + UnfreezeEventObjects(); + task->data[0] = 3; + } + break; + case 3: + ScriptContext2_Disable(); + DestroyTask(taskId); + break; + } +} + +static void task_map_chg_seq_0807E2CC(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_80AF71C()) + { + UnfreezeEventObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +static void sub_80AF660(u8 taskId) +{ + if (sub_80AF71C() == TRUE) + { + DestroyTask(taskId); + CreateTask(sub_809FA34, 80); + } +} + +void sub_80AF688(void) +{ + pal_fill_black(); + CreateTask(sub_80AF660, 0x50); + ScriptContext2_Enable(); +} + +bool8 sub_80AF6A4(void) +{ + sub_809FA18(); + return FALSE; +} + +static void task_mpl_807E3C8(u8 taskId) +{ + if (sub_80AF71C() == 1) + { + ScriptContext2_Disable(); + DestroyTask(taskId); + ScriptUnfreezeEventObjects(); + } +} + +void sub_80AF6D4(void) +{ + ScriptContext2_Enable(); + pal_fill_black(); + CreateTask(task_mpl_807E3C8, 10); +} + +void sub_80AF6F0(void) +{ + ScriptContext2_Enable(); + Overworld_PlaySpecialMapMusic(); + pal_fill_black(); + CreateTask(task_mpl_807E3C8, 10); +} + +static bool32 PaletteFadeActive(void) +{ + return gPaletteFade.active; +} + +static bool32 sub_80AF71C(void) +{ + if (IsWeatherNotFadingIn() == TRUE) + return TRUE; + else + return FALSE; +} + +void sub_80AF734(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA0C, 10); +} + +void sp13E_warp_to_last_warp(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA0C, 10); +} + +void sub_80AF79C(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + FadeScreen(FADE_TO_WHITE, 8); + PlayRainSoundEffect(); + gFieldCallback = sub_80AF3B0; + CreateTask(sub_80AFA0C, 10); +} + +void sub_80AF7D0(void) +{ + ScriptContext2_Enable(); + gFieldCallback = mapldr_default; + CreateTask(sub_80AFA88, 10); +} + +void sp13F_fall_to_last_warp(void) +{ + sp13E_warp_to_last_warp(); + gFieldCallback = sub_80B6B68; +} + +void sub_80AF80C(u8 metatileBehavior) +{ + ScriptContext2_Enable(); + sub_80B6E4C(metatileBehavior, 10); +} + +void sub_80AF828(void) +{ + ScriptContext2_Enable(); + sub_80B75D8(10); +} + +void sub_80AF838(void) +{ + ScriptContext2_Enable(); + sub_80B7A74(10); +} + +void sub_80AF848(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_TK_WARPIN); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF3E8; +} + +void sub_80AF87C(void) +{ + sub_8085540(1); + ScriptContext2_Enable(); + SaveEventObjects(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_TK_WARPIN); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF40C; +} + +void sub_80AF8B8(void) +{ + ScriptContext2_Enable(); + WarpFadeScreen(); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80FB768; +} + +static void sub_80AF8E0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + task->data[0]++; + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8086074); + DestroyTask(taskId); + break; + } +} + +void sub_80AF948(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlaySE(SE_KAIDAN); + CreateTask(sub_80AF8E0, 10); +} + +static void sub_80AF96C(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + ClearLinkCallback_2(); + FadeScreen(FADE_TO_BLACK, 0); + TryFadeOutOldMapMusic(); + PlaySE(SE_KAIDAN); + data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + { + sub_800AC34(); + data[0]++; + } + break; + case 2: + if (!gReceivedRemoteLinkPlayers) + { + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + } + break; + } +} + +void sub_80AF9F8(void) +{ + CreateTask(sub_80AF96C, 10); +} + +static void sub_80AFA0C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive()) + { + if (task->data[1] == 0) + { + sub_81BE72C(); + task->data[1] = 1; + } + if (BGMusicStopped()) + task->data[0]++; + } + break; + case 2: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +static void sub_80AFA88(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + s16 *x = &task->data[2]; + s16 *y = &task->data[3]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + PlayerGetDestCoords(x, y); + PlaySE(GetDoorSoundEffect(*x, *y - 1)); + task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); + task->data[0] = 1; + break; + case 1: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + u8 eventObjId; + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + task->data[0] = 2; + } + break; + case 2: + if (walkrun_is_standing_still()) + { + u8 eventObjId; + task->data[1] = FieldAnimateDoorClose(*x, *y - 1); + eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + sub_80AF0F4(0); + task->data[0] = 3; + } + break; + case 3: + if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) + { + task->data[0] = 4; + } + break; + case 4: + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + task->data[0] = 0; + task->func = sub_80AFA0C; + break; + } +} + +static void task0A_fade_n_map_maybe(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + task->data[0]++; + break; + case 1: + if (!PaletteFadeActive() && BGMusicStopped()) + { + task->data[0]++; + } + break; + case 2: + WarpIntoMap(); + SetMainCallback2(sub_8086024); + DestroyTask(taskId); + break; + } +} + +void sub_80AFC60(void) +{ + ScriptContext2_Enable(); + TryFadeOutOldMapMusic(); + WarpFadeScreen(); + PlayRainSoundEffect(); + PlaySE(SE_KAIDAN); + gFieldCallback = sub_80AF3C8; + CreateTask(task0A_fade_n_map_maybe, 10); +} + +static void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +{ + if (y <= 160) + { + if (left < 0) + left = 0; + if (left > 255) + left = 255; + if (right < 0) + right = 0; + if (right > 255) + right = 255; + dest[y] = (left << 8) | right; + } +} + +static void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +{ + s32 r = radius; + s32 v2 = radius; + s32 v3 = 0; + while (r >= v3) + { + SetFlashScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetFlashScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetFlashScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetFlashScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + v2 -= (v3 * 2) - 1; + v3++; + if (v2 < 0) + { + v2 += 2 * (r - 1); + r--; + } + } +} + +static void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +{ + if (y <= 160) + { + if (left < 0) + left = 0; + if (left > 240) + left = 240; + if (right < 0) + right = 0; + if (right > 240) + right = 240; + dest[y] = (left << 8) | right; + } +} + +static void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +{ + s32 r = radius; + s32 v2 = radius; + s32 v3 = 0; + while (r >= v3) + { + SetFlash2ScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetFlash2ScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + v2 -= (v3 * 2) - 1; + v3++; + if (v2 < 0) + { + v2 += 2 * (r - 1); + r--; + } + } +} + +#define tFlashCenterX data[1] +#define tFlashCenterY data[2] +#define tCurFlashRadius data[3] +#define tDestFlashRadius data[4] +#define tFlashRadiusDelta data[5] +#define tClearScanlineEffect data[6] + +static void UpdateFlashLevelEffect(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 1; + break; + case 1: + SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 0; + tCurFlashRadius += tFlashRadiusDelta; + if (tCurFlashRadius > tDestFlashRadius) + { + if (tClearScanlineEffect == 1) + { + ScanlineEffect_Stop(); + data[0] = 2; + } + else + { + DestroyTask(taskId); + } + } + break; + case 2: + ScanlineEffect_Clear(); + DestroyTask(taskId); + break; + } +} + +static void UpdateFlash2LevelEffect(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 1; + break; + case 1: + SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + data[0] = 0; + tCurFlashRadius += tFlashRadiusDelta; + if (tCurFlashRadius > tDestFlashRadius) + { + if (tClearScanlineEffect == 1) + { + ScanlineEffect_Stop(); + data[0] = 2; + } + else + { + DestroyTask(taskId); + } + } + break; + case 2: + ScanlineEffect_Clear(); + DestroyTask(taskId); + break; + } +} + +static void sub_80AFF90(u8 taskId) +{ + if (!FuncIsActiveTask(UpdateFlashLevelEffect)) + { + EnableBothScriptContexts(); + DestroyTask(taskId); + } +} + +static void sub_80AFFB8(void) +{ + if (!FuncIsActiveTask(sub_80AFF90)) + CreateTask(sub_80AFF90, 80); +} + +static u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +{ + u8 taskId = CreateTask(UpdateFlashLevelEffect, 80); + s16 *data = gTasks[taskId].data; + + tCurFlashRadius = initialFlashRadius; + tDestFlashRadius = destFlashRadius; + tFlashCenterX = centerX; + tFlashCenterY = centerY; + tClearScanlineEffect = clearScanlineEffect; + + if (initialFlashRadius < destFlashRadius) + tFlashRadiusDelta = delta; + else + tFlashRadiusDelta = -delta; + + return taskId; +} + +static u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +{ + u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80); + s16 *data = gTasks[taskId].data; + + tCurFlashRadius = initialFlashRadius; + tDestFlashRadius = destFlashRadius; + tFlashCenterX = centerX; + tFlashCenterY = centerY; + tClearScanlineEffect = clearScanlineEffect; + + if (initialFlashRadius < destFlashRadius) + tFlashRadiusDelta = delta; + else + tFlashRadiusDelta = -delta; + + return taskId; +} + +#undef tCurFlashRadius +#undef tDestFlashRadius +#undef tFlashRadiusDelta +#undef tClearScanlineEffect + +void sub_80B009C(u8 flashLevel) +{ + u8 curFlashLevel = Overworld_GetFlashLevel(); + u8 value = 0; + if (!flashLevel) + value = 1; + sub_80AFFDC(120, 80, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); + sub_80AFFB8(); + ScriptContext2_Enable(); +} + +void WriteFlashScanlineEffectBuffer(u8 flashLevel) +{ + if (flashLevel) + { + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, sFlashLevelPixelRadii[flashLevel]); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + } +} + +void door_upload_tiles(void) +{ + SetFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], 120, 80, gSaveBlock2Ptr->frontier.field_E68); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); +} + +static void task0A_mpl_807E31C(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + sub_808D194(); + gTasks[taskId].data[0]++; + break; + case 1: + if (sub_80AF71C() && sub_808D1B4() != TRUE) + { + UnfreezeEventObjects(); + ScriptContext2_Disable(); + DestroyTask(taskId); + } + break; + } +} + +static void sub_80B01BC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + FreezeEventObjects(); + ScriptContext2_Enable(); + PlaySE(SE_TK_WARPIN); + sub_808D1C8(); + task->data[0]++; + break; + case 1: + if (!sub_808D1E8()) + { + WarpFadeScreen(); + task->data[0]++; + } + break; + case 2: + if (!PaletteFadeActive() && BGMusicStopped()) + task->data[0]++; + break; + case 3: + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); + DestroyTask(taskId); + break; + } +} + +void sub_80B0244(void) +{ + ScriptContext2_Enable(); + CreateTask(sub_80AFA0C, 10); + gFieldCallback = sub_80AF3E8; +} + +void sub_80B0268(void) +{ + ScriptContext2_Enable(); + gFieldCallback = mapldr_default; + CreateTask(sub_80B01BC, 10); +} + +static void sub_80B028C(u8 a1) +{ + int i; + u16 color[1]; + + if (!a1) + color[0] = 0x1F; + else + color[0] = 0x7C00; + + for (i = 0; i < 16; i++) + { + LoadPalette(color, 0xF0 + i, 2); + } +} + +static bool8 sub_80B02C8(u16 a1) +{ + u8 lo = REG_BLDALPHA & 0xFF; + u8 hi = REG_BLDALPHA >> 8; + + if (a1) + { + if (lo) + { + lo--; + } + } + else + { + if (hi < 0x10) + { + hi++; + } + } + + SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); + + if (lo == 0 && hi == 0x10) + return TRUE; + else + return FALSE; +} + +static void sub_80B0318(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + data[6] = REG_DISPCNT; + data[7] = REG_BLDCNT; + data[8] = REG_BLDALPHA; + data[9] = REG_WININ; + data[10] = REG_WINOUT; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); + SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); + SetGpuReg(REG_OFFSET_BLDALPHA, 1804); + SetGpuReg(REG_OFFSET_WININ, 63); + SetGpuReg(REG_OFFSET_WINOUT, 30); + sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); + schedule_bg_copy_tilemap_to_vram(0); + SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + ScanlineEffect_SetParams(sFlashEffectParams); + data[0] = 1; + break; + case 1: + sub_8199DF0(0, 17, 0, 1); + sub_80B028C(data[1]); + sub_80B003C(data[2], data[3], 1, 160, 1, 2); + data[0] = 2; + break; + case 2: + if (!FuncIsActiveTask(UpdateFlash2LevelEffect)) + { + EnableBothScriptContexts(); + data[0] = 3; + } + break; + case 3: + InstallCameraPanAheadCallback(); + SetCameraPanningCallback(NULL); + data[5] = 0; + data[4] = 4; + data[0] = 4; + break; + case 4: + data[4]--; + if (!data[4]) + { + s32 panning; + data[4] = 4; + data[5] ^= 1; + if (data[5]) + panning = 4; + else + panning = -4; + SetCameraPanning(0, panning); + } + break; + case 6: + InstallCameraPanAheadCallback(); + data[4] = 8; + data[0] = 7; + break; + case 7: + data[4]--; + if (!data[4]) + { + data[4] = 8; + data[5] ^= 1; + if (sub_80B02C8(data[5]) == TRUE) + { + data[0] = 5; + sub_8199DF0(0, 0, 0, 1); + } + } + break; + case 5: + SetGpuReg(REG_OFFSET_WIN0H, 255); + SetGpuReg(REG_OFFSET_DISPCNT, data[6]); + SetGpuReg(REG_OFFSET_BLDCNT, data[7]); + SetGpuReg(REG_OFFSET_BLDALPHA, data[8]); + SetGpuReg(REG_OFFSET_WININ, data[9]); + SetGpuReg(REG_OFFSET_WINOUT, data[10]); + EnableBothScriptContexts(); + DestroyTask(taskId); + break; + } +} + +void sub_80B0534(void) +{ + u8 taskId = CreateTask(sub_80B0318, 80); + s16 *data = gTasks[taskId].data; + + if (gSpecialVar_Result == 0) + { + data[1] = 0; + data[2] = 104; + } + else if (gSpecialVar_Result == 1) + { + data[1] = 1; + data[2] = 136; + } + else if (gSpecialVar_Result == 2) + { + data[1] = 0; + data[2] = 120; + } + else + { + data[1] = 1; + data[2] = 120; + } + + data[3] = 80; +} + +void sub_80B058C(void) +{ + u8 taskId = FindTaskIdByFunc(sub_80B0318); + gTasks[taskId].data[0] = 6; +} + +void sub_80B05B4(void) +{ + Overworld_FadeOutMapMusic(); + CreateTask(task50_0807F0C8, 80); +} + +static void task50_0807F0C8(u8 taskId) +{ + if (BGMusicStopped() == TRUE) + { + DestroyTask(taskId); + EnableBothScriptContexts(); + } +} diff --git a/src/field_specials.c b/src/field_specials.c index 4da751b27..0842555b9 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -12,7 +12,7 @@ #include "field_effect.h" #include "field_message_box.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_specials.h" #include "field_weather.h" #include "international_string_util.h" diff --git a/src/item_use.c b/src/item_use.c index 4ab9f6e23..8399a1861 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -10,7 +10,7 @@ #include "fieldmap.h" #include "event_object_movement.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "item.h" #include "item_menu.h" diff --git a/src/learn_move.c b/src/learn_move.c index 7717a5193..38e081a38 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -5,7 +5,7 @@ #include "contest_effect.h" #include "data2.h" #include "event_data.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "gpu_regs.h" #include "learn_move.h" #include "list_menu.h" @@ -52,7 +52,7 @@ static EWRAM_DATA struct { const u16 gUnknown_085CE9F8[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal"); const u8 gUnknown_085CEA18[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp"); -const struct OamData gUnknown_085CEB98 = +const struct OamData gUnknown_085CEB98 = { .y = 0, .affineMode = 0, @@ -69,7 +69,7 @@ const struct OamData gUnknown_085CEB98 = .affineParam = 0, }; -const struct OamData gUnknown_085CEBA0 = +const struct OamData gUnknown_085CEBA0 = { .y = 0, .affineMode = 0, @@ -86,7 +86,7 @@ const struct OamData gUnknown_085CEBA0 = .affineParam = 0, }; -const struct OamData gUnknown_085CEBA8 = +const struct OamData gUnknown_085CEBA8 = { .y = 0, .affineMode = 0, @@ -103,20 +103,20 @@ const struct OamData gUnknown_085CEBA8 = .affineParam = 0, }; -const struct SpriteSheet gUnknown_085CEBB0 = +const struct SpriteSheet gUnknown_085CEBB0 = { .data = gUnknown_085CEA18, .size = 0x180, .tag = 5525 }; -const struct SpritePalette gUnknown_085CEBB8 = +const struct SpritePalette gUnknown_085CEBB8 = { .data = gUnknown_085CE9F8, .tag = 5526 }; -const struct ScrollArrowsTemplate gUnknown_085CEBC0 = +const struct ScrollArrowsTemplate gUnknown_085CEBC0 = { .firstArrowType = 0, .firstX = 27, @@ -131,7 +131,7 @@ const struct ScrollArrowsTemplate gUnknown_085CEBC0 = .palNum = 0, }; -const struct ScrollArrowsTemplate gUnknown_085CEBD0 = +const struct ScrollArrowsTemplate gUnknown_085CEBD0 = { .firstArrowType = 2, .firstX = 192, @@ -146,31 +146,31 @@ const struct ScrollArrowsTemplate gUnknown_085CEBD0 = .palNum = 0, }; -const union AnimCmd gUnknown_085CEBE0[] = +const union AnimCmd gUnknown_085CEBE0[] = { ANIMCMD_FRAME(8, 5, FALSE, FALSE), ANIMCMD_END }; -const union AnimCmd gUnknown_085CEBE8[] = +const union AnimCmd gUnknown_085CEBE8[] = { ANIMCMD_FRAME(9, 5, FALSE, FALSE), ANIMCMD_END }; -const union AnimCmd gUnknown_085CEBF0[] = +const union AnimCmd gUnknown_085CEBF0[] = { ANIMCMD_FRAME(10, 5, FALSE, FALSE), ANIMCMD_END }; -const union AnimCmd gUnknown_085CEBF8[] = +const union AnimCmd gUnknown_085CEBF8[] = { ANIMCMD_FRAME(11, 5, FALSE, FALSE), ANIMCMD_END }; -const union AnimCmd *const gUnknown_085CEC00[] = +const union AnimCmd *const gUnknown_085CEC00[] = { gUnknown_085CEBE0, gUnknown_085CEBE8, @@ -178,7 +178,7 @@ const union AnimCmd *const gUnknown_085CEC00[] = gUnknown_085CEBF8, }; -const struct SpriteTemplate gUnknown_085CEC10 = +const struct SpriteTemplate gUnknown_085CEC10 = { .tileTag = 5525, .paletteTag = 5526, @@ -707,7 +707,7 @@ static void CreateHearts(void) sLearnMoveStruct->scrollArrowTaskId2 = -1; sLearnMoveStruct->scrollArrowTaskId1 = -1; AddScrollArrows(); - + for (i = 0; i < 8; i++) { sLearnMoveStruct->spriteIds[i] = CreateSprite(&gUnknown_085CEC10, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0); @@ -791,7 +791,7 @@ void ShowHideHearts(s32 item) else { numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10); - + if (numHearts == 0xFF) { numHearts = 0; @@ -811,7 +811,7 @@ void ShowHideHearts(s32 item) } numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10); - + if (numHearts == 0xFF) { numHearts = 0; diff --git a/src/overworld.c b/src/overworld.c index a60ac9a54..8d8675487 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -4,18 +4,17 @@ #include "battle_setup.h" #include "berry.h" #include "bg.h" -// #include "cable_club.h" +#include "cable_club.h" #include "clock.h" #include "event_data.h" #include "field_camera.h" #include "field_control_avatar.h" #include "field_effect.h" -#include "field_fadetransition.h" #include "event_object_movement.h" #include "field_message_box.h" #include "field_player_avatar.h" #include "field_screen_effect.h" -// #include "field_special_scene.h" +#include "field_special_scene.h" #include "field_specials.h" #include "field_tasks.h" #include "field_weather.h" @@ -38,7 +37,7 @@ #include "play_time.h" #include "random.h" #include "roamer.h" -// #include "rotating_gate.h" +#include "rotating_gate.h" #include "safari_zone.h" #include "save.h" #include "save_location.h" diff --git a/src/player_pc.c b/src/player_pc.c index 59ba36350..864c13acd 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -3,9 +3,8 @@ #include "bg.h" #include "decoration.h" #include "event_scripts.h" -#include "field_fadetransition.h" #include "event_object_movement.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "international_string_util.h" #include "item.h" diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 465b97da2..ad56b1678 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1,7 +1,7 @@ #include "global.h" #include "bg.h" #include "event_data.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "gpu_regs.h" #include "international_string_util.h" diff --git a/src/record_mixing.c b/src/record_mixing.c index df4a1a720..a497f9cd8 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -22,7 +22,7 @@ #include "constants/songs.h" #include "menu.h" #include "overworld.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "fldeff_80F9BCC.h" #include "script.h" #include "event_data.h" diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index a197598de..af4e031dc 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -32,7 +32,7 @@ #include "decompress.h" #include "start_menu.h" #include "data2.h" -#include "field_screen.h" +#include "field_screen_effect.h" extern void HealPlayerParty(void); diff --git a/src/scrcmd.c b/src/scrcmd.c index 310387337..579f804e2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -13,7 +13,6 @@ #include "event_data.h" #include "field_door.h" #include "field_effect.h" -#include "field_fadetransition.h" #include "event_object_movement.h" #include "field_message_box.h" #include "field_player_avatar.h" diff --git a/src/secret_base.c b/src/secret_base.c index 8436d8520..84d70061e 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1,5 +1,3 @@ - -// Includes #include "global.h" #include "constants/bg_event_constants.h" #include "constants/decorations.h" @@ -19,7 +17,7 @@ #include "fieldmap.h" #include "field_camera.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "event_object_movement.h" #include "field_effect.h" diff --git a/src/shop.c b/src/shop.c index a0eddee01..9b78878bd 100755 --- a/src/shop.c +++ b/src/shop.c @@ -6,7 +6,7 @@ #include "decoration_inventory.h" #include "event_object_movement.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "fieldmap.h" #include "gpu_regs.h" -- cgit v1.2.3 From 4d2f1bad7f5f4ed9170420724ecad61f24e61755 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 22:12:44 +0100 Subject: fix header --- src/fldeff_sweetscent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index bc62ac2af..cd8fa400d 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -3,7 +3,7 @@ #include "event_scripts.h" #include "field_effect.h" #include "field_player_avatar.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_weather.h" #include "palette.h" #include "party_menu.h" -- cgit v1.2.3 From 606fb71392651dac4f5f8773c4117f35de7b087e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 8 Dec 2018 22:17:49 +0100 Subject: Fix ld script --- ld_script.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ld_script.txt b/ld_script.txt index d5e6efc4f..ce19c25e0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -116,7 +116,6 @@ SECTIONS { src/field_weather.o(.text); src/field_weather_effect.o(.text); src/field_screen_effect.o(.text); - asm/field_screen.o(.text); src/battle_setup.o(.text); src/cable_club.o(.text); src/trainer_see.o(.text); -- cgit v1.2.3 From cceb8ac3314c9ba5a48d0b69bc39c41080335119 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Sun, 9 Dec 2018 11:32:58 +0800 Subject: Remove trailing whitespace --- src/battle_ai_script_commands.c | 2 +- src/battle_main.c | 2 +- src/battle_pyramid.c | 4 ++-- src/pokemon_icon.c | 2 +- src/rotating_gate.c | 2 +- src/wallclock.c | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 687d81419..a88189870 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -464,7 +464,7 @@ static u8 ChooseMoveOrAction_Doubles(void) if (i == sBattler_AI || gBattleMons[i].hp == 0) { actionOrMoveIndex[i] = 0xFF; - bestMovePointsForTarget[i] = -1 ; + bestMovePointsForTarget[i] = -1; } else { diff --git a/src/battle_main.c b/src/battle_main.c index e275eee9e..9b7f58023 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5594,7 +5594,7 @@ bool8 TryRunFromBattle(u8 battler) if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN) { - gLastUsedItem = gBattleMons[battler].item ; + gLastUsedItem = gBattleMons[battler].item; gProtectStructs[battler].fleeFlag = 1; effect++; } diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index f27af2615..6cc09d713 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1458,7 +1458,7 @@ static u16 sub_81A9F90(u8 count) do { trainerId = sub_8162548(challengeNum + 1, battleNum); - for (i = 0 ; i < count; i++) + for (i = 0; i < count; i++) { if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) break; @@ -1470,7 +1470,7 @@ static u16 sub_81A9F90(u8 count) do { trainerId = sub_8162548(challengeNum, battleNum); - for (i = 0 ; i < count; i++) + for (i = 0; i < count; i++) { if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId) break; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index e1e446007..c24c8a898 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1211,7 +1211,7 @@ void sub_80D304C(u16 offset) if(offset <= 0xA0) { monIconPalettePtr = gMonIconPaletteTable; - for(i = 5; i >= 0 ; i--) + for(i = 5; i >= 0; i--) { LoadPalette(monIconPalettePtr->data, offset, 0x20); offset += 0x10; diff --git a/src/rotating_gate.c b/src/rotating_gate.c index f617321af..3513f092e 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -871,7 +871,7 @@ static s32 RotatingGate_CanRotate(u8 gateId, s32 rotationDirection) y = gRotatingGate_PuzzleConfig[gateId].y + 7; // Loop through the gate's "arms" clockwise (north, south, east, west) - for (i = GATE_ARM_NORTH ; i <= GATE_ARM_WEST; i++) + for (i = GATE_ARM_NORTH; i <= GATE_ARM_WEST; i++) { // Ensure that no part of the arm collides with the map for (j = 0; j < GATE_ARM_MAX_LENGTH; j++) diff --git a/src/wallclock.c b/src/wallclock.c index e2e03ecba..5c8d920e7 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -890,13 +890,13 @@ static u16 CalcNewMinHandAngle(u16 angle, u8 direction, u8 speed) { case MVMT_BACKWARD: if (angle) - angle -= delta ; + angle -= delta; else - angle = 360 - delta ; + angle = 360 - delta; break; case MVMT_FORWARD: - if (angle < 360 - delta ) - angle += delta ; + if (angle < 360 - delta) + angle += delta; else angle = 0; break; -- cgit v1.2.3 From f8838491f6c46df771c5414f8b6da781294300b7 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sun, 9 Dec 2018 13:44:07 +0530 Subject: Initial commit for ghost --- asm/ghost.s | 803 ----------------------------------- include/battle_anim.h | 1 + ld_script.txt | 1 + src/ghost.c | 1126 ++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 1123 insertions(+), 808 deletions(-) diff --git a/asm/ghost.s b/asm/ghost.s index 5a0991468..4afba4c9e 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -5,809 +5,6 @@ .text - thumb_func_start sub_811160C -sub_811160C: @ 811160C - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x30] - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_80A6FD4 - ldr r0, =sub_8111674 - str r0, [r4, 0x1C] - movs r0, 0x10 - strh r0, [r4, 0x3A] - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - ldrh r1, [r4, 0x3A] - movs r0, 0x52 - bl SetGpuReg - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811160C - - thumb_func_start sub_8111674 -sub_8111674: @ 8111674 - push {r4,lr} - adds r4, r0, 0 - bl sub_8111764 - adds r0, r4, 0 - bl TranslateAnimLinear - lsls r0, 24 - cmp r0, 0 - beq _08111694 - ldr r0, =sub_81116E8 - str r0, [r4, 0x1C] - b _081116DE - .pool -_08111694: - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0xA - bl Sin - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0xF - bl Cos - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - ldrh r2, [r4, 0x38] - adds r0, r2, 0x5 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x38] - lsls r2, 16 - asrs r2, 16 - cmp r2, 0 - beq _081116CC - cmp r2, 0xC4 - ble _081116DE -_081116CC: - lsls r0, 16 - cmp r0, 0 - ble _081116DE - ldr r0, =gUnknown_02038440 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0xC4 - bl PlaySE12WithPanning -_081116DE: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8111674 - - thumb_func_start sub_81116E8 -sub_81116E8: @ 81116E8 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x1 - strh r0, [r4, 0x2E] - adds r0, r4, 0 - bl TranslateAnimLinear - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0xA - bl Sin - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0xF - bl Cos - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - ldrh r2, [r4, 0x38] - adds r0, r2, 0x5 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x38] - lsls r2, 16 - asrs r2, 16 - cmp r2, 0 - beq _0811172E - cmp r2, 0xC4 - ble _0811173A -_0811172E: - lsls r0, 16 - cmp r0, 0 - ble _0811173A - movs r0, 0xC4 - bl PlaySE -_0811173A: - movs r1, 0x3A - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08111758 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_80A67F4 - str r0, [r4, 0x1C] - b _0811175E - .pool -_08111758: - adds r0, r4, 0 - bl sub_8111764 -_0811175E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81116E8 - - thumb_func_start sub_8111764 -sub_8111764: @ 8111764 - push {r4,lr} - adds r4, r0, 0 - ldrh r2, [r4, 0x3A] - movs r1, 0x3A - ldrsh r0, [r4, r1] - cmp r0, 0xFF - ble _08111788 - adds r0, r2, 0x1 - strh r0, [r4, 0x3A] - lsls r0, 16 - ldr r1, =0x010d0000 - cmp r0, r1 - bne _081117EE - movs r0, 0 - b _081117EC - .pool -_08111788: - ldrh r1, [r4, 0x3C] - adds r3, r1, 0x1 - strh r3, [r4, 0x3C] - movs r0, 0xFF - ands r0, r1 - cmp r0, 0 - bne _081117EE - ldr r1, =0xffffff00 - ands r1, r3 - strh r1, [r4, 0x3C] - movs r0, 0x80 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _081117B0 - adds r0, r2, 0x1 - b _081117B2 - .pool -_081117B0: - subs r0, r2, 0x1 -_081117B2: - strh r0, [r4, 0x3A] - ldrh r0, [r4, 0x3A] - movs r1, 0x10 - subs r1, r0 - lsls r1, 8 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r2, 0x3A - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _081117D4 - cmp r0, 0x10 - bne _081117E0 -_081117D4: - ldrh r0, [r4, 0x3C] - movs r2, 0x80 - lsls r2, 1 - adds r1, r2, 0 - eors r0, r1 - strh r0, [r4, 0x3C] -_081117E0: - movs r1, 0x3A - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081117EE - movs r0, 0x80 - lsls r0, 1 -_081117EC: - strh r0, [r4, 0x3A] -_081117EE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8111764 - - thumb_func_start sub_81117F4 -sub_81117F4: @ 81117F4 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_80A6980 - ldr r1, =sub_8111814 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81117F4 - - thumb_func_start sub_8111814 -sub_8111814: @ 8111814 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x20 - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x8 - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x2E] - subs r0, 0x41 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x82 - bhi _08111848 - ldrb r0, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r0 - movs r0, 0x8 - b _08111852 -_08111848: - ldrb r0, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r0 - movs r0, 0x4 -_08111852: - orrs r1, r0 - strb r1, [r4, 0x5] - ldrh r0, [r4, 0x2E] - adds r0, 0x13 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x32] - adds r0, 0x50 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x3C] - adds r0, 0x1 - strh r0, [r4, 0x3C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3D - bne _08111884 - adds r0, r4, 0 - bl DestroyAnimSprite -_08111884: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8111814 - - thumb_func_start sub_811188C -sub_811188C: @ 811188C - push {r4,r5,lr} - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 5 - movs r0, 0x52 - bl SetGpuReg - movs r0, 0 - bl GetAnimBattlerSpriteId - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - movs r1, 0x1 - bl sub_80A7270 - adds r0, r4, 0 - movs r1, 0x80 - movs r2, 0x80 - movs r3, 0 - bl obj_id_set_rotscale - ldr r1, =gSprites - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - movs r2, 0 - movs r1, 0x80 - strh r1, [r0, 0x8] - ldr r1, =gBattleAnimArgs - ldrh r1, [r1] - strh r1, [r0, 0xA] - strh r2, [r0, 0xC] - movs r1, 0x10 - strh r1, [r0, 0xE] - ldr r1, =sub_8111914 - str r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811188C - - thumb_func_start sub_8111914 -sub_8111914: @ 8111914 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r0, [r4, 0x1C] - adds r0, 0x1 - strh r0, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - bne _0811195C - movs r0, 0 - strh r0, [r4, 0x1C] - ldrh r1, [r4, 0xC] - adds r1, 0x1 - strh r1, [r4, 0xC] - ldrh r0, [r4, 0xE] - subs r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 8 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0x9 - bne _0811195C - ldr r0, =sub_811196C - str r0, [r4] -_0811195C: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8111914 - - thumb_func_start sub_811196C -sub_811196C: @ 811196C - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r1, [r4, 0xA] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _08111994 - subs r0, r1, 0x1 - strh r0, [r4, 0xA] - b _081119D8 - .pool -_08111994: - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r1, r0, 24 - ldrh r0, [r4, 0x8] - adds r0, 0x8 - strh r0, [r4, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xFF - bgt _081119BC - movs r0, 0x8 - ldrsh r2, [r4, r0] - adds r0, r1, 0 - adds r1, r2, 0 - movs r3, 0 - bl obj_id_set_rotscale - b _081119D8 -_081119BC: - adds r0, r1, 0 - bl sub_80A7344 - adds r0, r5, 0 - bl DestroyAnimVisualTask - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg -_081119D8: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_811196C - - thumb_func_start sub_81119E0 -sub_81119E0: @ 81119E0 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x4 - adds r4, r0, 0 - ldrh r5, [r4, 0x20] - ldrh r6, [r4, 0x22] - ldr r0, =gBattleAnimAttacker - mov r8, r0 - ldrb r0, [r0] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - mov r9, r1 - strh r0, [r4, 0x20] - mov r1, r8 - ldrb r0, [r1] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - mov r1, r9 - strh r1, [r4, 0x2E] - ldr r2, =gBattleAnimArgs - ldrh r1, [r2] - strh r1, [r4, 0x30] - ldrh r1, [r2, 0x2] - strh r1, [r4, 0x32] - ldrh r1, [r2, 0x4] - strh r1, [r4, 0x34] - ldrh r1, [r4, 0x20] - lsls r1, 4 - strh r1, [r4, 0x36] - lsls r0, 4 - strh r0, [r4, 0x38] - lsls r5, 16 - asrs r5, 16 - movs r1, 0x20 - ldrsh r0, [r4, r1] - subs r5, r0 - lsls r5, 4 - movs r0, 0 - ldrsh r1, [r2, r0] - lsls r1, 1 - adds r0, r5, 0 - str r2, [sp] - bl __divsi3 - strh r0, [r4, 0x3A] - lsls r6, 16 - asrs r6, 16 - movs r1, 0x22 - ldrsh r0, [r4, r1] - subs r6, r0 - lsls r6, 4 - ldr r2, [sp] - movs r0, 0 - ldrsh r1, [r2, r0] - lsls r1, 1 - adds r0, r6, 0 - bl __divsi3 - strh r0, [r4, 0x3C] - ldr r0, =sub_8111A88 - str r0, [r4, 0x1C] - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81119E0 - - thumb_func_start sub_8111A88 -sub_8111A88: @ 8111A88 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _08111AD2 - cmp r0, 0x1 - bgt _08111A9E - cmp r0, 0 - beq _08111AA8 - b _08111B96 -_08111A9E: - cmp r0, 0x2 - beq _08111B3C - cmp r0, 0x3 - beq _08111B90 - b _08111B96 -_08111AA8: - ldrh r0, [r5, 0x3A] - ldrh r2, [r5, 0x36] - adds r0, r2 - strh r0, [r5, 0x36] - ldrh r1, [r5, 0x3C] - ldrh r2, [r5, 0x38] - adds r1, r2 - strh r1, [r5, 0x38] - lsls r0, 16 - asrs r0, 20 - strh r0, [r5, 0x20] - lsls r1, 16 - asrs r1, 20 - strh r1, [r5, 0x22] - ldrh r0, [r5, 0x30] - subs r0, 0x1 - strh r0, [r5, 0x30] - lsls r0, 16 - cmp r0, 0 - bgt _08111B96 - b _08111B82 -_08111AD2: - ldrh r0, [r5, 0x32] - subs r0, 0x1 - strh r0, [r5, 0x32] - lsls r0, 16 - cmp r0, 0 - bgt _08111B96 - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x30] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x20] - lsls r0, 4 - strh r0, [r5, 0x36] - ldrh r0, [r5, 0x22] - lsls r0, 4 - strh r0, [r5, 0x38] - movs r1, 0x30 - ldrsh r0, [r5, r1] - movs r2, 0x20 - ldrsh r1, [r5, r2] - subs r0, r1 - lsls r0, 4 - movs r2, 0x34 - ldrsh r1, [r5, r2] - bl __divsi3 - strh r0, [r5, 0x3A] - movs r1, 0x32 - ldrsh r0, [r5, r1] - movs r2, 0x22 - ldrsh r1, [r5, r2] - subs r0, r1 - lsls r0, 4 - movs r2, 0x34 - ldrsh r1, [r5, r2] - bl __divsi3 - strh r0, [r5, 0x3C] - b _08111B82 - .pool -_08111B3C: - ldrh r0, [r5, 0x3A] - ldrh r1, [r5, 0x36] - adds r0, r1 - strh r0, [r5, 0x36] - ldrh r1, [r5, 0x3C] - ldrh r2, [r5, 0x38] - adds r1, r2 - strh r1, [r5, 0x38] - lsls r0, 16 - asrs r0, 20 - strh r0, [r5, 0x20] - lsls r1, 16 - asrs r1, 20 - strh r1, [r5, 0x22] - ldrh r0, [r5, 0x34] - subs r0, 0x1 - strh r0, [r5, 0x34] - lsls r0, 16 - cmp r0, 0 - bgt _08111B96 - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] -_08111B82: - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - b _08111B96 - .pool -_08111B90: - adds r0, r5, 0 - bl move_anim_8074EE0 -_08111B96: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8111A88 - - thumb_func_start sub_8111B9C -sub_8111B9C: @ 8111B9C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_80A6980 - ldr r0, =sub_8111BB4 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8111B9C - - thumb_func_start sub_8111BB4 -sub_8111BB4: @ 8111BB4 - push {r4-r6,lr} - adds r3, r0, 0 - movs r5, 0 - movs r6, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _08111C4A - adds r1, r3, 0 - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x4 - ands r0, r2 - adds r4, r1, 0 - cmp r0, 0 - bne _08111BDE - movs r0, 0x4 - orrs r0, r2 - strb r0, [r4] -_08111BDE: - movs r1, 0x2E - ldrsh r0, [r3, r1] - cmp r0, 0 - beq _08111BEE - cmp r0, 0x1 - beq _08111BF8 - movs r6, 0x1 - b _08111C02 -_08111BEE: - movs r1, 0x30 - ldrsh r0, [r3, r1] - cmp r0, 0x2 - bne _08111C02 - b _08111C06 -_08111BF8: - movs r1, 0x30 - ldrsh r0, [r3, r1] - cmp r0, 0x4 - bne _08111C02 - movs r5, 0x1 -_08111C02: - cmp r5, 0 - beq _08111C38 -_08111C06: - ldrb r2, [r4] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4] - ldrh r0, [r3, 0x32] - adds r0, 0x1 - movs r1, 0 - strh r0, [r3, 0x32] - strh r1, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _08111C4A - strh r1, [r3, 0x32] - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - b _08111C4A -_08111C38: - cmp r6, 0 - beq _08111C44 - adds r0, r3, 0 - bl DestroyAnimSprite - b _08111C4A -_08111C44: - ldrh r0, [r3, 0x30] - adds r0, 0x1 - strh r0, [r3, 0x30] -_08111C4A: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8111BB4 - thumb_func_start sub_8111C50 sub_8111C50: @ 8111C50 push {r4-r6,lr} diff --git a/include/battle_anim.h b/include/battle_anim.h index 8d73ea9b3..fa4058c1b 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -130,6 +130,7 @@ void sub_80A7E6C(u8 spriteId); void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); u8 sub_80A80C8(struct Task *task); void sub_80A8EE4(struct Sprite *); +void sub_80A67F4(struct Sprite *); enum { diff --git a/ld_script.txt b/ld_script.txt index f78c1ae52..83e2fa385 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -167,6 +167,7 @@ SECTIONS { asm/psychic.o(.text); src/bug.o(.text); src/rock.o(.text); + src/ghost.o(.text); asm/ghost.o(.text); src/dragon.o(.text); asm/dark.o(.text); diff --git a/src/ghost.c b/src/ghost.c index ce57df7e8..526e4e519 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -1,11 +1,23 @@ #include "global.h" #include "battle_anim.h" +#include "gpu_regs.h" #include "constants/rgb.h" +#include "constants/songs.h" +#include "sound.h" +#include "trig.h" -extern void sub_811160C(struct Sprite *); -extern void sub_81117F4(struct Sprite *); -extern void sub_81119E0(struct Sprite *); -extern void sub_8111B9C(struct Sprite *); +static void sub_811160C(struct Sprite *); +static void sub_8111674(struct Sprite *); +static void sub_81116E8(struct Sprite *); +static void sub_8111764(struct Sprite *); +static void sub_81117F4(struct Sprite *); +static void sub_8111814(struct Sprite *); +static void sub_8111914(u8 taskId); +static void sub_811196C(u8 taskId); +static void InitAnimShadowBall(struct Sprite *); +static void AnimShadowBallStep(struct Sprite *); +static void sub_8111B9C(struct Sprite *); +static void sub_8111BB4(struct Sprite *); extern void sub_8112264(struct Sprite *); extern void sub_81129F0(struct Sprite *); extern void sub_8112B78(struct Sprite *); @@ -65,7 +77,7 @@ const struct SpriteTemplate gUnknown_08596D58 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08596D54, - .callback = sub_81119E0, + .callback = InitAnimShadowBall, }; const union AnimCmd gUnknown_08596D70[] = @@ -184,3 +196,1107 @@ const struct SpriteTemplate gUnknown_08596E48 = .affineAnims = gDummySpriteAffineAnimTable, .callback = sub_8112F60, }; + +static void sub_811160C(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sub_80A6FD4(sprite); + sprite->callback = sub_8111674; + sprite->data[6] = 16; + SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); + SetGpuReg(REG_OFFSET_BLDALPHA, sprite->data[6]); +} + +static void sub_8111674(struct Sprite *sprite) +{ + s16 r0; + s16 r2; + sub_8111764(sprite); + if (TranslateAnimLinear(sprite)) + { + sprite->callback = sub_81116E8; + return; + } + + sprite->pos2.x += Sin(sprite->data[5], 10); + sprite->pos2.y += Cos(sprite->data[5], 15); + r2 = sprite->data[5]; + sprite->data[5] = (sprite->data[5] + 5) & 0xFF; + r0 = sprite->data[5]; + if (r2 != 0 && r2 <= 196) + return; + if (r0 <= 0) + return; + PlaySE12WithPanning(SE_W109, gUnknown_02038440); +} + +static void sub_81116E8(struct Sprite *sprite) +{ + s16 r2; + s16 r0; + sprite->data[0] = 1; + TranslateAnimLinear(sprite); + sprite->pos2.x += Sin(sprite->data[5], 10); + sprite->pos2.y += Cos(sprite->data[5], 15); + + r2 = sprite->data[5]; + sprite->data[5] = (sprite->data[5] + 5) & 0xFF; + r0 = sprite->data[5]; + + if (r2 == 0 || r2 > 196) + { + if (r0 > 0) + PlaySE(SE_W109); + } + + if (sprite->data[6] == 0) + { + sprite->invisible = TRUE; + sprite->callback = sub_80A67F4; + } + else + sub_8111764(sprite); +} + +static void sub_8111764(struct Sprite *sprite) +{ + + s16 r0; + if (sprite->data[6] > 0xFF) + { + if (++sprite->data[6] == 0x10d) + sprite->data[6] = 0; + return; + } + + r0 = sprite->data[7]; + sprite->data[7]++; + + if ((r0 & 0xFF) == 0) + { + sprite->data[7] &= 0xff00; + if ((sprite->data[7] & 0x100) != 0) + sprite->data[6]++; + else + sprite->data[6]--; + + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[6], 16 - sprite->data[6])); + if (sprite->data[6] == 0 || sprite->data[6] == 16) + sprite->data[7] ^= 0x100; + if (sprite->data[6] == 0) + sprite->data[6] = 0x100; + } +} + +static void sub_81117F4(struct Sprite *sprite) +{ + sub_80A6980(sprite, TRUE); + sprite->callback = sub_8111814; + sprite->callback(sprite); +} + +static void sub_8111814(struct Sprite *sprite) +{ + u16 temp1; + sprite->pos2.x = Sin(sprite->data[0], 32); + sprite->pos2.y = Cos(sprite->data[0], 8); + temp1 = sprite->data[0] - 65; + if (temp1 <= 130) + sprite->oam.priority = 2; + else + sprite->oam.priority = 1; + sprite->data[0] = (sprite->data[0] + 19) & 0xFF; + sprite->data[2] += 80; + sprite->pos2.y += sprite->data[2] >> 8; + sprite->data[7] += 1; + if (sprite->data[7] == 61) + DestroyAnimSprite(sprite); +} + +void sub_811188C(u8 taskId) +{ + u8 spriteId; + SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); + SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000); + spriteId = GetAnimBattlerSpriteId(0); + sub_80A7270(spriteId, 1); + obj_id_set_rotscale(spriteId, 128, 128, 0); + gSprites[spriteId].invisible = FALSE; + gTasks[taskId].data[0] = 128; + gTasks[taskId].data[1] = *gBattleAnimArgs; + gTasks[taskId].data[2] = 0; + gTasks[taskId].data[3] = 16; + gTasks[taskId].func = sub_8111914; +} + +static void sub_8111914(u8 taskId) +{ + gTasks[taskId].data[10] += 1; + if (gTasks[taskId].data[10] == 3) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[2] += 1; + gTasks[taskId].data[3] -= 1; + SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskId].data[3] << 8 | gTasks[taskId].data[2]); + if (gTasks[taskId].data[2] != 9) + return; + + gTasks[taskId].func = sub_811196C; + } +} + +static void sub_811196C(u8 taskId) +{ + u8 spriteId; + if (gTasks[taskId].data[1] > 0) + { + gTasks[taskId].data[1] -= 1; + return; + } + + spriteId = GetAnimBattlerSpriteId(0); + gTasks[taskId].data[0] += 8; + if (gTasks[taskId].data[0] <= 0xFF) + { + obj_id_set_rotscale(spriteId, gTasks[taskId].data[0], gTasks[taskId].data[0], 0); + } + else + { + sub_80A7344(spriteId); + DestroyAnimVisualTask(taskId); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + } +} + +// Spins a sprite towards the target, pausing in the middle. +// Used in Shadow Ball. +// arg 0: duration step 1 (attacker -> center) +// arg 1: duration step 2 (spin center) +// arg 2: duration step 3 (center -> target) +static void InitAnimShadowBall(struct Sprite *sprite) +{ + u16 r5, r6; + r5 = sprite->pos1.x; + r6 = sprite->pos1.y; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->data[0] = 0; + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[3] = gBattleAnimArgs[2]; + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + sprite->data[6] = (((s16)r5 - sprite->pos1.x) << 4) / (gBattleAnimArgs[0] << 1); + sprite->data[7] = (((s16)r6 - sprite->pos1.y) << 4) / (gBattleAnimArgs[0] << 1); + sprite->callback = AnimShadowBallStep; +} + +static void AnimShadowBallStep(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + sprite->data[1] -= 1; + if (sprite->data[1] > 0) + break; + sprite->data[0] += 1; + break; + case 1: + sprite->data[2] -= 1; + if (sprite->data[2] > 0) + break; + sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + sprite->data[6] = ((sprite->data[1] - sprite->pos1.x) << 4) / sprite->data[3]; + sprite->data[7] = ((sprite->data[2] - sprite->pos1.y) << 4) / sprite->data[3]; + sprite->data[0] += 1; + break; + case 2: + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + sprite->data[3] -= 1; + if (sprite->data[3] > 0) + break; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->data[0] += 1; + break; + case 3: + move_anim_8074EE0(sprite); + break; + } +} + +static void sub_8111B9C(struct Sprite *sprite) +{ + sub_80A6980(sprite, TRUE); + sprite->callback = sub_8111BB4; +} + +static void sub_8111BB4(struct Sprite *sprite) { + + s8 r5 = FALSE; + bool8 r6 = FALSE; + if(sprite->animEnded) + { + if(!(sprite->invisible)) + sprite->invisible=TRUE; + switch(sprite->data[0]) + { + case 0: + if((sprite->data[1]) != 2) + break; + goto loc_08111C06; + case 1: + if((sprite->data[1]) == 4) + r5 = TRUE; + break; + default: + r6 = TRUE; + } + if(r5) + { + loc_08111C06: + sprite->invisible ^= 1; + sprite->data[2]++; + sprite->data[1] = 0; + if(sprite->data[2] == 5) + { + sprite->data[2] = 0; + sprite->data[0]++; + } + } + else if(r6) + DestroyAnimSprite(sprite); + else + sprite->data[1]++; + } +} + +/* + +void sub_80DE1B0(u8 taskId) +{ + struct Task *task; + + task = &gTasks[taskId]; + task->data[0] = duplicate_obj_of_side_rel2move_in_transparent_mode(1); + if (task->data[0] < 0) + { + DestroyAnimVisualTask(taskId); + return; + } + task->data[1] = 0; + task->data[2] = 15; + task->data[3] = 2; + task->data[4] = 0; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + gSprites[task->data[0]].data[0] = 80; + if (GetBattlerSide(gAnimBankTarget) == 0) + { + gSprites[task->data[0]].data[1] = -144; + gSprites[task->data[0]].data[2] = 112; + } + else + { + gSprites[task->data[0]].data[1] = 144; + gSprites[task->data[0]].data[2] = -112; + } + gSprites[task->data[0]].data[3] = 0; + gSprites[task->data[0]].data[4] = 0; + StoreSpriteCallbackInData(&gSprites[task->data[0]], SpriteCallbackDummy); + gSprites[task->data[0]].callback = sub_8078394; + task->func = sub_80DE2DC; +} + +static void sub_80DE2DC(u8 taskId) +{ + struct Task *task; + + task = &gTasks[taskId]; + switch (task->data[4]) + { + case 0: + task->data[1] += 1; + task->data[5] = task->data[1] & 3; + if (task->data[5] == 1) + if (task->data[2] > 0) + task->data[2] -= 1; + if (task->data[5] == 3) + if (task->data[3] <= 15) + task->data[3] += 1; + REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + if (task->data[3] != 16 || task->data[2] != 0) + break; + if (task->data[1] <= 80) + break; + obj_delete_but_dont_free_vram(&gSprites[task->data[0]]); + task->data[4] = 1; + break; + case 1: + if (++task->data[6] <= 1) + break; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + task->data[4] += 1; + break; + case 2: + DestroyAnimVisualTask(taskId); + } +} + +void sub_80DE3AC(u8 taskId) +{ + struct Task *task; + + task = &gTasks[taskId]; + task->data[15] = 0; + task->func = sub_80DE3D4; + task->func(taskId); +} + +static void sub_80DE3D4(u8 taskId) +{ + s16 startLine; + struct Task *task = &gTasks[taskId]; + u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + + switch (task->data[15]) + { + case 0: + task->data[14] = AllocSpritePalette(0x2771); + if (task->data[14] == 0xFF) + { + DestroyAnimVisualTask(taskId); + } + else + { + task->data[0] = duplicate_obj_of_side_rel2move_in_transparent_mode(1); + if (task->data[0] < 0) + { + FreeSpritePaletteByTag(0x2771); + DestroyAnimVisualTask(taskId); + } + else + { + gSprites[task->data[0]].oam.paletteNum = task->data[14]; + gSprites[task->data[0]].oam.objMode = ST_OAM_OBJ_NORMAL; + gSprites[task->data[0]].oam.priority = 3; + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = 16; + task->data[13] = GetAnimBattlerSpriteId(1); + task->data[4] = (gSprites[task->data[13]].oam.paletteNum + 16) * 16; + if (position == 1) + REG_DISPCNT &= 0xFDFF; + else + REG_DISPCNT &= 0xFBFF; + + task->data[15]++; + } + } + break; + case 1: + task->data[14] = (task->data[14] + 16) * 16; + CpuSet(&gPlttBufferUnfaded[task->data[4]], &gPlttBufferFaded[task->data[14]], 0x4000008); + BlendPalette(task->data[4], 16, 10, RGB(13, 0, 15)); + task->data[15]++; + break; + case 2: + startLine = gSprites[task->data[13]].pos1.y + gSprites[task->data[13]].pos2.y - 32; + if (startLine < 0) + startLine = 0; + + if (position == 1) + task->data[10] = ScanlineEffect_InitWave(startLine, startLine + 64, 2, 6, 0, 4, 1); + else + task->data[10] = ScanlineEffect_InitWave(startLine, startLine + 64, 2, 6, 0, 8, 1); + + task->data[15]++; + break; + case 3: + if (position == 1) + REG_BLDCNT = 0x3F42; + else + REG_BLDCNT = 0x3F44; + + REG_BLDALPHA = 0x1000; + task->data[15]++; + break; + case 4: + if (position == 1) + REG_DISPCNT |= DISPCNT_BG1_ON; + else + REG_DISPCNT |= DISPCNT_BG2_ON; + + task->func = sub_80DE61C; + task->data[15]++; + break; + default: + task->data[15]++; + break; + } +} + +static void sub_80DE61C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + task->data[1]++; + task->data[5] = task->data[1] & 1; + if (task->data[5] == 0) + task->data[2] = gSineTable[task->data[1]] / 18; + + if (task->data[5] == 1) + task->data[3] = 16 - (gSineTable[task->data[1]] / 18); + + REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + if (task->data[1] == 128) + { + task->data[15] = 0; + task->func = sub_80DE6B0; + task->func(taskId); + } +} + +static void sub_80DE6B0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + + switch (task->data[15]) + { + case 0: + gScanlineEffect.state = 3; + task->data[14] = GetAnimBattlerSpriteId(1); + if (position == 1) + REG_DISPCNT &= 0xFDFF; + else + REG_DISPCNT &= 0xFBFF; + break; + case 1: + BlendPalette(task->data[4], 16, 0, RGB(13, 0, 15)); + break; + case 2: + gSprites[task->data[14]].invisible = 1; + obj_delete_but_dont_free_vram(&gSprites[task->data[0]]); + FreeSpritePaletteByTag(0x2771); + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + if (position == 1) + REG_DISPCNT |= DISPCNT_BG1_ON; + else + REG_DISPCNT |= DISPCNT_BG2_ON; + + DestroyAnimVisualTask(taskId); + break; + } + + task->data[15]++; +} + +static void sub_80DE7B8(struct Sprite *sprite) +{ + s16 battler1X, battler1Y; + s16 battler2X, battler2Y; + s16 yDiff; + + if (gBattleAnimArgs[0] == 0) + { + battler1X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + battler1Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; + battler2X = GetBattlerSpriteCoord(gAnimBankTarget, 0); + battler2Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; + } + else + { + battler1X = GetBattlerSpriteCoord(gAnimBankTarget, 0); + battler1Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; + battler2X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); + battler2Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; + } + + yDiff = battler2Y - battler1Y; + sprite->data[0] = battler1X * 16; + sprite->data[1] = battler1Y * 16; + sprite->data[2] = ((battler2X - battler1X) * 16) / gBattleAnimArgs[1]; + sprite->data[3] = (yDiff * 16) / gBattleAnimArgs[1]; + sprite->data[4] = gBattleAnimArgs[1]; + sprite->data[5] = battler2X; + sprite->data[6] = battler2Y; + sprite->data[7] = sprite->data[4] / 2; + sprite->oam.priority = 2; + sprite->pos1.x = battler1X; + sprite->pos1.y = battler1Y; + sprite->callback = sub_80DE8D8; + sprite->invisible = 1; +} + +static void sub_80DE8D8(struct Sprite *sprite) +{ + if (sprite->data[4]) + { + sprite->data[0] += sprite->data[2]; + sprite->data[1] += sprite->data[3]; + sprite->pos1.x = sprite->data[0] >> 4; + sprite->pos1.y = sprite->data[1] >> 4; + if (--sprite->data[4] == 0) + sprite->data[0] = 0; + } +} + +void sub_80DE918(u8 taskId) +{ + struct Task *task; + s16 battler; + u8 spriteId; + s16 baseX, baseY; + s16 x, y; + + task = &gTasks[taskId]; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x1000; + task->data[5] = 0; + task->data[6] = 0; + task->data[7] = 0; + task->data[8] = 0; + task->data[9] = 16; + task->data[10] = gBattleAnimArgs[0]; + + baseX = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + baseY = sub_807A100(gAnimBankAttacker, 3); + if (!IsContest()) + { + for (battler = 0; battler < 4; battler++) + { + if (battler != gAnimBankAttacker + && battler != (gAnimBankAttacker ^ 2) + && IsAnimBankSpriteVisible(battler)) + { + spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); + if (spriteId != MAX_SPRITES) + { + x = GetBattlerSpriteCoord(battler, 2); + y = sub_807A100(battler, 3); + gSprites[spriteId].data[0] = baseX << 4; + gSprites[spriteId].data[1] = baseY << 4; + gSprites[spriteId].data[2] = ((x - baseX) << 4) / gBattleAnimArgs[1]; + gSprites[spriteId].data[3] = ((y - baseY) << 4) / gBattleAnimArgs[1]; + gSprites[spriteId].data[4] = gBattleAnimArgs[1]; + gSprites[spriteId].data[5] = x; + gSprites[spriteId].data[6] = y; + gSprites[spriteId].callback = sub_80DE8D8; + + task->data[task->data[12] + 13] = spriteId; + task->data[12]++; + } + } + } + } + else + { + spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); + if (spriteId != MAX_SPRITES) + { + x = 48; + y = 40; + gSprites[spriteId].data[0] = baseX << 4; + gSprites[spriteId].data[1] = baseY << 4; + gSprites[spriteId].data[2] = ((x - baseX) << 4) / gBattleAnimArgs[1]; + gSprites[spriteId].data[3] = ((y - baseY) << 4) / gBattleAnimArgs[1]; + gSprites[spriteId].data[4] = gBattleAnimArgs[1]; + gSprites[spriteId].data[5] = x; + gSprites[spriteId].data[6] = y; + gSprites[spriteId].callback = sub_80DE8D8; + + task->data[13] = spriteId; + task->data[12] = 1; + } + } + + task->func = sub_80DEB38; +} + +static void sub_80DEB38(u8 taskId) +{ + u16 i; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (task->data[6] == 0) + { + if (++task->data[5] > 1) + { + task->data[5] = 0; + task->data[7]++; + if (task->data[7] & 1) + { + if (task->data[8] < 16) + task->data[8]++; + } + else + { + if (task->data[9]) + task->data[9]--; + } + + REG_BLDALPHA = (task->data[9] << 8) | task->data[8]; + if (task->data[7] >= 24) + { + task->data[7] = 0; + task->data[6] = 1; + } + } + } + + if (task->data[10]) + task->data[10]--; + else if (task->data[6]) + task->data[0]++; + break; + case 1: + if (++task->data[5] > 1) + { + task->data[5] = 0; + task->data[7]++; + if (task->data[7] & 1) + { + if (task->data[8]) + task->data[8]--; + } + else + { + if (task->data[9] < 16) + task->data[9]++; + } + + REG_BLDALPHA = (task->data[9] << 8) | task->data[8]; + if (task->data[8] == 0 && task->data[9] == 16) + { + for (i = 0; i < task->data[12]; i++) + DestroySprite(&gSprites[task->data[i + 13]]); + + task->data[0]++; + } + } + break; + case 2: + if (++task->data[5] > 0) + task->data[0]++; + break; + case 3: + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_80DECB0(u8 taskId) +{ + s16 startX, startY; + s16 leftDistance, topDistance, bottomDistance, rightDistance; + + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F1F; + REG_BLDCNT = 0xC8; + REG_BLDY = 0x10; + + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER || IsContest()) + startX = 40; + else + startX = 200; + + gBattle_WIN0H = (startX << 8) | startX; + startY = 40; + gBattle_WIN0V = (startY << 8) | startY; + + leftDistance = startX; + rightDistance = 240 - startX; + topDistance = startY; + bottomDistance = 72; + gTasks[taskId].data[1] = leftDistance; + gTasks[taskId].data[2] = rightDistance; + gTasks[taskId].data[3] = topDistance; + gTasks[taskId].data[4] = bottomDistance; + gTasks[taskId].data[5] = startX; + gTasks[taskId].data[6] = startY; + gTasks[taskId].func = sub_80DED60; +} + +static void sub_80DED60(u8 taskId) +{ + s16 step; + s16 leftDistance, rightDistance, topDistance, bottomDistance; + s16 startX, startY; + u16 left, right, top, bottom; + u16 selectedPalettes; + + step = gTasks[taskId].data[0]; + gTasks[taskId].data[0]++; + leftDistance = gTasks[taskId].data[1]; + rightDistance = gTasks[taskId].data[2]; + topDistance = gTasks[taskId].data[3]; + bottomDistance = gTasks[taskId].data[4]; + startX = gTasks[taskId].data[5]; + startY = gTasks[taskId].data[6]; + + if (step < 16) + { + left = startX - (leftDistance * 0.0625) * step; + right = startX + (rightDistance * 0.0625) * step; + top = startY - (topDistance * 0.0625) * step; + bottom = startY + (bottomDistance * 0.0625) * step; + } + else + { + left = 0; + right = 240; + top = 0; + bottom = 112; + selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0); + BeginNormalPaletteFade(selectedPalettes, 0, 16, 16, RGB(0, 0, 0)); + gTasks[taskId].func = sub_80DEEE8; + } + + gBattle_WIN0H = (left << 8) | right; + gBattle_WIN0V = (top << 8) | bottom; +} + +static void sub_80DEEE8(u8 taskId) +{ + if (!gPaletteFade.active) + { + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3F; + REG_BLDCNT = 0; + REG_BLDY = 0; + DestroyAnimVisualTask(taskId); + } +} + +static void sub_80DEF3C(struct Sprite *sprite) +{ + s16 xDelta; + s16 xDelta2; + + InitAnimSpritePos(sprite, 1); + if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + { + xDelta = 24; + xDelta2 = -2; + sprite->oam.matrixNum = 8; + } + else + { + xDelta = -24; + xDelta2 = 2; + } + + sprite->pos1.x += xDelta; + sprite->data[1] = xDelta2; + sprite->data[0] = 60; + sprite->callback = sub_80DEF98; +} + +static void sub_80DEF98(struct Sprite *sprite) +{ + u16 var0; + + if (sprite->data[0] > 0) + { + sprite->data[0]--; + } + else + { + sprite->pos2.x += sprite->data[1]; + var0 = sprite->pos2.x + 7; + if (var0 > 14) + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos2.x = 0; + sprite->oam.tileNum += 8; + if (++sprite->data[2] == 3) + { + sprite->data[0] = 30; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData(sprite, sub_80DF018); + } + else + { + sprite->data[0] = 40; + } + } + } +} + +static void sub_80DF018(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x0010; + sprite->data[0]++; + sprite->data[1] = 0; + sprite->data[2] = 0; + } + else if (sprite->data[1] < 2) + { + sprite->data[1]++; + } + else + { + sprite->data[1] = 0; + sprite->data[2]++; + REG_BLDALPHA = (16 - sprite->data[2]) | (sprite->data[2] << 8); + if (sprite->data[2] == 16) + { + sprite->invisible = 1; + sprite->callback = sub_80DF090; + } + } +} + +static void sub_80DF090(struct Sprite *sprite) +{ + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + DestroyAnimSprite(sprite); +} + +static void sub_80DF0B8(struct Sprite *sprite) +{ + u16 coeffB; + u16 coeffA; + + sprite->pos2.x = Sin(sprite->data[0], 12); + if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + sprite->pos2.x = -sprite->pos2.x; + + sprite->data[0] = (sprite->data[0] + 6) & 0xFF; + sprite->data[1] += 0x100; + sprite->pos2.y = -(sprite->data[1] >> 8); + + sprite->data[7]++; + if (sprite->data[7] == 1) + { + sprite->data[6] = 0x050B; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = sprite->data[6]; + } + else if (sprite->data[7] > 30) + { + sprite->data[2]++; + coeffB = sprite->data[6] >> 8; + coeffA = sprite->data[6] & 0xFF; + + if (++coeffB > 16) + coeffB = 16; + if (--(s16)coeffA < 0) + coeffA = 0; + + REG_BLDALPHA = (coeffB << 8) | coeffA; + sprite->data[6] = (coeffB << 8) | coeffA; + if (coeffB == 16 && coeffA == 0) + { + sprite->invisible = 1; + sprite->callback = sub_80DF18C; + } + } +} + +static void sub_80DF18C(struct Sprite *sprite) +{ + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimSprite(sprite); +} + +void sub_80DF1A4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + task->data[0] = 0; + task->data[1] = 16; + task->data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); + task->data[10] = sub_8077FC0(gAnimBankAttacker); + task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8; + task->data[7] = 0; + task->data[5] = sub_8079ED4(gAnimBankAttacker); + task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2; + task->data[3] = 0; + task->data[4] = 16; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x1000; + task->data[8] = 0; + task->func = sub_80DF24C; +} + +static void sub_80DF24C(u8 taskId) +{ + u16 i; + u8 spriteId; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + for (i = 0; i < 6; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_83DAF80, task->data[9], task->data[10], task->data[6]); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER; + + gSprites[spriteId].data[2] = (i * 42) & 0xFF; + gSprites[spriteId].data[3] = task->data[11]; + gSprites[spriteId].data[5] = i * 6; + task->data[7]++; + } + } + + task->data[0]++; + break; + case 1: + if (++task->data[1] & 1) + { + if (task->data[3] < 14) + task->data[3]++; + } + else + { + if (task->data[4] > 4) + task->data[4]--; + } + + if (task->data[3] == 14 && task->data[4] == 4) + { + task->data[1] = 0; + task->data[0]++; + } + + REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + break; + case 2: + if (++task->data[1] > 30) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 3: + if (++task->data[1] & 1) + { + if (task->data[3] > 0) + task->data[3]--; + } + else + { + if (task->data[4] < 16) + task->data[4]++; + } + + if (task->data[3] == 0 && task->data[4] == 16) + { + task->data[8] = 1; + task->data[0]++; + } + + REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + break; + case 4: + if (task->data[7] == 0) + task->data[0]++; + break; + case 5: + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimVisualTask(taskId); + break; + } +} + +static void sub_80DF3D8(struct Sprite *sprite) +{ + u16 index; + + if (sprite->data[1] == 0) + sprite->data[2] += 2; + else + sprite->data[2] -= 2; + + sprite->data[2] &= 0xFF; + sprite->pos2.x = Sin(sprite->data[2], sprite->data[3]); + + index = sprite->data[2] - 65; + if (index < 127) + sprite->oam.priority = gTasks[sprite->data[0]].data[5] + 1; + else + sprite->oam.priority = gTasks[sprite->data[0]].data[5]; + + sprite->data[5]++; + sprite->data[6] = (sprite->data[5] * 8) & 0xFF; + sprite->pos2.y = Sin(sprite->data[6], 7); + if (gTasks[sprite->data[0]].data[8]) + { + gTasks[sprite->data[0]].data[7]--; + DestroySprite(sprite); + } +} + +static void sub_80DF49C(struct Sprite *sprite) +{ + sprite->invisible = 1; + sprite->data[5] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[0] = 128; + sprite->data[1] = 10; + sprite->data[2] = gBattleAnimArgs[0]; + sprite->data[3] = gBattleAnimArgs[1]; + sprite->callback = sub_80DF4F4; + + gSprites[sprite->data[5]].pos1.y += 8; +} + +static void sub_80DF4F4(struct Sprite *sprite) +{ + if (sprite->data[3]) + { + sprite->data[3]--; + gSprites[sprite->data[5]].pos2.x = Sin(sprite->data[0], sprite->data[1]); + gSprites[sprite->data[5]].pos2.y = Cos(sprite->data[0], sprite->data[1]); + sprite->data[0] += sprite->data[2]; + if (sprite->data[0] > 255) + sprite->data[0] -= 256; + } + else + { + gSprites[sprite->data[5]].pos2.x = 0; + gSprites[sprite->data[5]].pos2.y = 0; + gSprites[sprite->data[5]].pos1.y -= 8; + sprite->callback = move_anim_8074EE0; + } +}*/ + -- cgit v1.2.3 From c46499b05c81f1d1a872a33ce5b2fd9a20964dc7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 9 Dec 2018 12:16:01 +0100 Subject: field screen review changes --- ld_script.txt | 4 ++-- src/field_screen_effect.c | 12 ++++++------ src/field_weather.c | 38 +++++++++++++++++++------------------- src/field_weather_effect.c | 10 +++++----- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ld_script.txt b/ld_script.txt index 8a50d087c..b1daf9521 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -448,8 +448,8 @@ SECTIONS { src/title_screen.o(.rodata); data/field_weather.o(.rodata); src/field_weather.o(.rodata); - src/field_weather_effect.o(.rodata); - src/field_screen_effect.o(.rodata); + src/field_weather_effect.o(.rodata); + src/field_screen_effect.o(.rodata); src/battle_setup.o(.rodata); src/cable_club.o(.rodata); src/trainer_see.o(.rodata); diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 0de86d4f4..b0572b393 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -1083,9 +1083,9 @@ static void sub_80B028C(u8 a1) u16 color[1]; if (!a1) - color[0] = 0x1F; + color[0] = RGB_RED; else - color[0] = 0x7C00; + color[0] = RGB_BLUE; for (i = 0; i < 16; i++) { @@ -1113,7 +1113,7 @@ static bool8 sub_80B02C8(u16 a1) } } - SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(lo, hi)); if (lo == 0 && hi == 0x10) return TRUE; @@ -1135,9 +1135,9 @@ static void sub_80B0318(u8 taskId) data[10] = REG_WINOUT; ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); - SetGpuReg(REG_OFFSET_BLDALPHA, 1804); - SetGpuReg(REG_OFFSET_WININ, 63); - SetGpuReg(REG_OFFSET_WINOUT, 30); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(12, 7)); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ); sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); schedule_bg_copy_tilemap_to_vram(0); SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); diff --git a/src/field_weather.c b/src/field_weather.c index be3396c63..f0615dabf 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -75,7 +75,7 @@ IWRAM_DATA static const u8 *sPaletteGammaTypes; // CONST extern const u16 gUnknown_0854014C[][4096]; -// This is a pointer to gWeatherPtr. All code in this file accesses gWeather directly, +// This is a pointer to gWeather. All code in this file accesses gWeather directly, // while code in other field weather files accesses gWeather through this pointer. // This is likely the result of compiler optimization, since using the pointer in // this file produces the same result as accessing gWeather directly. @@ -266,11 +266,11 @@ static u8 None_Finish(void) static void BuildGammaShiftTables(void) { u16 v0; - u8 (*v1)[32]; + u8 (*gammaTable)[32]; u16 v2; u16 v4; u16 v5; - u16 v6; + u16 gammaIndex; u16 v9; u32 v10; u16 v11; @@ -280,9 +280,9 @@ static void BuildGammaShiftTables(void) for (v0 = 0; v0 <= 1; v0++) { if (v0 == 0) - v1 = gWeatherPtr->gammaShifts; + gammaTable = gWeatherPtr->gammaShifts; else - v1 = gWeatherPtr->altGammaShifts; + gammaTable = gWeatherPtr->altGammaShifts; for (v2 = 0; v2 < 32; v2++) { @@ -291,10 +291,10 @@ static void BuildGammaShiftTables(void) v5 = (v2 << 8) / 16; else v5 = 0; - for (v6 = 0; v6 <= 2; v6++) + for (gammaIndex = 0; gammaIndex <= 2; gammaIndex++) { v4 = (v4 - v5); - v1[v6][v2] = v4 >> 8; + gammaTable[gammaIndex][v2] = v4 >> 8; } v9 = v4; v10 = 0x1f00 - v4; @@ -305,25 +305,25 @@ static void BuildGammaShiftTables(void) v11 = v10 >> 4; if (v2 < 12) { - for (; v6 < 19; v6++) + for (; gammaIndex < 19; gammaIndex++) { v4 += v11; dunno = v4 - v9; if (dunno > 0) v4 -= (dunno + ((u16)dunno >> 15)) >> 1; - v1[v6][v2] = v4 >> 8; - if (v1[v6][v2] > 0x1f) - v1[v6][v2] = 0x1f; + gammaTable[gammaIndex][v2] = v4 >> 8; + if (gammaTable[gammaIndex][v2] > 0x1f) + gammaTable[gammaIndex][v2] = 0x1f; } } else { - for (; v6 < 19; v6++) + for (; gammaIndex < 19; gammaIndex++) { v4 += v11; - v1[v6][v2] = v4 >> 8; - if (v1[v6][v2] > 0x1f) - v1[v6][v2] = 0x1f; + gammaTable[gammaIndex][v2] = v4 >> 8; + if (gammaTable[gammaIndex][v2] > 0x1f) + gammaTable[gammaIndex][v2] = 0x1f; } } } @@ -734,19 +734,19 @@ void FadeScreen(u8 mode, s8 delay) switch (mode) { case FADE_FROM_BLACK: - fadeColor = 0; + fadeColor = RGB_BLACK; fadeOut = FALSE; break; case FADE_FROM_WHITE: - fadeColor = 0xFFFF; + fadeColor = RGB_WHITEALPHA; fadeOut = FALSE; break; case FADE_TO_BLACK: - fadeColor = 0; + fadeColor = RGB_BLACK; fadeOut = TRUE; break; case FADE_TO_WHITE: - fadeColor = 0xFFFF; + fadeColor = RGB_WHITEALPHA; fadeOut = TRUE; break; default: diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 88ebb1936..2ec51a722 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -182,7 +182,7 @@ void CreateCloudSprites(void) { u8 spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { struct Sprite *sprite; @@ -794,7 +794,7 @@ bool8 CreateRainSprite(void) spriteNum = gWeatherPtr->rainSpriteCount; spriteId = CreateSpriteAtEnd(&sRainSpriteTemplate, sRainSpriteCoords[spriteNum].x, sRainSpriteCoords[spriteNum].y, 78); - if (spriteId != 64) + if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[5] = 0; gSprites[spriteId].data[1] = spriteNum * 145; @@ -953,7 +953,7 @@ bool8 CreateSnowflakeSprite(void) { u8 spriteId = CreateSpriteAtEnd(&sSnowflakeSpriteTemplate, 0, 0, 78); - if (spriteId == 64) + if (spriteId == MAX_SPRITES) return FALSE; gSprites[spriteId].data[4] = gWeatherPtr->snowflakeSpriteCount; sub_807EC40(&gSprites[spriteId]); @@ -1015,7 +1015,7 @@ void sub_807ED48(struct Sprite *sprite) r3 = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF; if (r3 & 0x100) - r3 = -0x100 | r3; // hmm... what is this? + r3 |= -0x100; // hmm... what is this? if (r3 < -3) sprite->pos1.x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); else if (r3 > 242) @@ -2034,7 +2034,7 @@ void CreateSandstormSprites_2(void) { for (i = 0; i < 5; i++) { - u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 0x18, 0xD0, 1); + u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, i * 48 + 24, 208, 1); if (spriteId != MAX_SPRITES) { -- cgit v1.2.3 From 4233ae50c38c44923bdd0d31ae99de0903ac86cf Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sun, 9 Dec 2018 18:38:15 +0530 Subject: Finish decompile ghost --- asm/ghost.s | 2448 --------------------------------------------------------- ld_script.txt | 1 - src/ghost.c | 307 ++++---- 3 files changed, 166 insertions(+), 2590 deletions(-) delete mode 100644 asm/ghost.s diff --git a/asm/ghost.s b/asm/ghost.s deleted file mode 100644 index 4afba4c9e..000000000 --- a/asm/ghost.s +++ /dev/null @@ -1,2448 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8111C50 -sub_8111C50: @ 8111C50 - push {r4-r6,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks - adds r5, r0, r1 - movs r0, 0x1 - bl duplicate_obj_of_side_rel2move_in_transparent_mode - movs r6, 0 - movs r1, 0 - strh r0, [r5, 0x8] - lsls r0, 16 - cmp r0, 0 - bge _08111C80 - adds r0, r4, 0 - bl DestroyAnimVisualTask - b _08111D5C - .pool -_08111C80: - strh r1, [r5, 0xA] - movs r0, 0xF - strh r0, [r5, 0xC] - movs r0, 0x2 - strh r0, [r5, 0xE] - strh r1, [r5, 0x10] - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - ldrh r1, [r5, 0xE] - lsls r1, 8 - ldrh r0, [r5, 0xC] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - ldr r4, =gSprites - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x50 - strh r1, [r0, 0x2E] - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08111CF4 - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldr r1, =0x0000ff70 - strh r1, [r0, 0x30] - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x70 - b _08111D12 - .pool -_08111CF4: - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x90 - strh r1, [r0, 0x30] - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldr r1, =0x0000ff90 -_08111D12: - strh r1, [r0, 0x32] - ldr r4, =gSprites - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r2, 0 - strh r2, [r0, 0x34] - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - strh r2, [r0, 0x36] - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldr r1, =SpriteCallbackDummy - bl StoreSpriteCallbackInData6 - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r4, 0x1C - adds r0, r4 - ldr r1, =sub_80A656C - str r1, [r0] - ldr r0, =sub_8111D78 - str r0, [r5] -_08111D5C: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8111C50 - - thumb_func_start sub_8111D78 -sub_8111D78: @ 8111D78 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x10 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _08111E1C - cmp r0, 0x1 - bgt _08111DA0 - cmp r0, 0 - beq _08111DA6 - b _08111E48 - .pool -_08111DA0: - cmp r0, 0x2 - beq _08111E42 - b _08111E48 -_08111DA6: - ldrh r1, [r4, 0xA] - adds r1, 0x1 - strh r1, [r4, 0xA] - movs r0, 0x3 - ands r0, r1 - strh r0, [r4, 0x12] - cmp r0, 0x1 - bne _08111DC4 - ldrh r1, [r4, 0xC] - movs r2, 0xC - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _08111DC4 - subs r0, r1, 0x1 - strh r0, [r4, 0xC] -_08111DC4: - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0x3 - bne _08111DDA - ldrh r1, [r4, 0xE] - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _08111DDA - adds r0, r1, 0x1 - strh r0, [r4, 0xE] -_08111DDA: - ldrh r1, [r4, 0xE] - lsls r1, 8 - ldrh r0, [r4, 0xC] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - ldr r1, [r4, 0xC] - movs r0, 0x80 - lsls r0, 13 - cmp r1, r0 - bne _08111E48 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0x50 - ble _08111E48 - movs r2, 0x8 - ldrsh r1, [r4, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl obj_delete_but_dont_free_vram - movs r0, 0x1 - strh r0, [r4, 0x10] - b _08111E48 - .pool -_08111E1C: - ldrh r0, [r4, 0x14] - adds r0, 0x1 - strh r0, [r4, 0x14] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08111E48 - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - ldrh r0, [r4, 0x10] - adds r0, 0x1 - strh r0, [r4, 0x10] - b _08111E48 -_08111E42: - adds r0, r2, 0 - bl DestroyAnimVisualTask -_08111E48: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8111D78 - - thumb_func_start sub_8111E50 -sub_8111E50: @ 8111E50 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r2, =gTasks - adds r1, r2 - movs r2, 0 - strh r2, [r1, 0x26] - ldr r2, =sub_8111E78 - str r2, [r1] - bl _call_via_r2 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8111E50 - - thumb_func_start sub_8111E78 -sub_8111E78: @ 8111E78 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks - adds r5, r0, r1 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8364 - lsls r0, 24 - lsrs r6, r0, 24 - movs r1, 0x26 - ldrsh r0, [r5, r1] - cmp r0, 0x4 - bls _08111EA4 - b _081120C6 -_08111EA4: - lsls r0, 2 - ldr r1, =_08111EBC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08111EBC: - .4byte _08111ED0 - .4byte _08111FD0 - .4byte _08112014 - .4byte _0811207C - .4byte _081120A8 -_08111ED0: - ldr r7, =0x00002771 - adds r0, r7, 0 - bl AllocSpritePalette - lsls r0, 24 - lsrs r0, 24 - movs r2, 0 - mov r8, r2 - strh r0, [r5, 0x24] - cmp r0, 0xFF - beq _08111EFE - cmp r0, 0xF - beq _08111EFE - movs r0, 0x1 - bl duplicate_obj_of_side_rel2move_in_transparent_mode - strh r0, [r5, 0x8] - lsls r0, 16 - cmp r0, 0 - bge _08111F0C - adds r0, r7, 0 - bl FreeSpritePaletteByTag -_08111EFE: - adds r0, r4, 0 - bl DestroyAnimVisualTask - b _081120CC - .pool -_08111F0C: - ldr r4, =gSprites - movs r1, 0x8 - ldrsh r0, [r5, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrh r2, [r5, 0x24] - lsls r2, 4 - ldrb r3, [r1, 0x5] - movs r0, 0xF - ands r0, r3 - orrs r0, r2 - strb r0, [r1, 0x5] - movs r2, 0x8 - ldrsh r0, [r5, r2] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrb r2, [r1, 0x1] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x1] - movs r0, 0x8 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r1, [r0, 0x5] - movs r2, 0xC - orrs r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x8 - ldrsh r0, [r5, r1] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r4 - ldr r0, =gBattleSpritesDataPtr - ldr r1, [r0] - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - lsls r1, 31 - adds r2, 0x3E - lsrs r1, 31 - lsls r1, 2 - ldrb r3, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] - mov r2, r8 - strh r2, [r5, 0xA] - strh r2, [r5, 0xC] - movs r0, 0x10 - strh r0, [r5, 0xE] - movs r0, 0x1 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - movs r0, 0x22 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x5] - lsrs r0, 4 - adds r0, 0x10 - lsls r0, 4 - strh r0, [r5, 0x10] - cmp r6, 0x1 - bne _08111FC4 - movs r1, 0x80 - lsls r1, 2 - b _08111FC8 - .pool -_08111FC4: - movs r1, 0x80 - lsls r1, 3 -_08111FC8: - movs r0, 0 - bl ClearGpuRegBits - b _081120C6 -_08111FD0: - movs r1, 0x24 - ldrsh r0, [r5, r1] - adds r0, 0x10 - lsls r0, 4 - strh r0, [r5, 0x24] - movs r2, 0x10 - ldrsh r0, [r5, r2] - lsls r0, 1 - ldr r1, =gPlttBufferUnfaded - adds r0, r1 - movs r2, 0x24 - ldrsh r1, [r5, r2] - lsls r1, 1 - ldr r2, =gPlttBufferFaded - adds r1, r2 - ldr r2, =0x04000008 - bl CpuSet - ldrh r0, [r5, 0x10] - ldr r3, =0x00003c0d - movs r1, 0x10 - movs r2, 0xA - bl BlendPalette - b _081120C6 - .pool -_08112014: - ldr r2, =gSprites - movs r0, 0x22 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x26] - ldrh r0, [r0, 0x22] - adds r1, r0 - subs r1, 0x20 - lsls r1, 16 - lsrs r2, r1, 16 - cmp r1, 0 - bge _08112034 - movs r2, 0 -_08112034: - cmp r6, 0x1 - bne _08112054 - lsls r0, r2, 24 - lsrs r0, 24 - adds r1, r2, 0 - adds r1, 0x40 - lsls r1, 24 - lsrs r1, 24 - movs r2, 0 - str r2, [sp] - movs r2, 0x4 - str r2, [sp, 0x4] - str r6, [sp, 0x8] - b _0811206C - .pool -_08112054: - lsls r0, r2, 24 - lsrs r0, 24 - adds r1, r2, 0 - adds r1, 0x40 - lsls r1, 24 - lsrs r1, 24 - movs r2, 0 - str r2, [sp] - movs r2, 0x8 - str r2, [sp, 0x4] - movs r2, 0x1 - str r2, [sp, 0x8] -_0811206C: - movs r2, 0x2 - movs r3, 0x6 - bl ScanlineEffect_InitWave - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x1C] - b _081120C6 -_0811207C: - cmp r6, 0x1 - bne _08112090 - ldr r1, =0x00003f42 - movs r0, 0x50 - bl SetGpuReg - b _08112098 - .pool -_08112090: - ldr r1, =0x00003f44 - movs r0, 0x50 - bl SetGpuReg -_08112098: - movs r1, 0x80 - lsls r1, 5 - movs r0, 0x52 - bl SetGpuReg - b _081120C6 - .pool -_081120A8: - cmp r6, 0x1 - bne _081120B8 - movs r1, 0x80 - lsls r1, 2 - movs r0, 0 - bl SetGpuRegBits - b _081120C2 -_081120B8: - movs r1, 0x80 - lsls r1, 3 - movs r0, 0 - bl SetGpuRegBits -_081120C2: - ldr r0, =sub_81120DC - str r0, [r5] -_081120C6: - ldrh r0, [r5, 0x26] - adds r0, 0x1 - strh r0, [r5, 0x26] -_081120CC: - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8111E78 - - thumb_func_start sub_81120DC -sub_81120DC: @ 81120DC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - ldrh r1, [r4, 0xA] - adds r1, 0x1 - strh r1, [r4, 0xA] - movs r0, 0x1 - ands r0, r1 - strh r0, [r4, 0x12] - cmp r0, 0 - bne _08112114 - ldr r1, =gSineTable - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 1 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - movs r1, 0x12 - bl __divsi3 - strh r0, [r4, 0xC] -_08112114: - movs r2, 0x12 - ldrsh r0, [r4, r2] - cmp r0, 0x1 - bne _08112136 - ldr r1, =gSineTable - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 1 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - movs r1, 0x12 - bl __divsi3 - movs r1, 0x10 - subs r1, r0 - strh r1, [r4, 0xE] -_08112136: - ldrh r1, [r4, 0xE] - lsls r1, 8 - ldrh r0, [r4, 0xC] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0x80 - bne _0811215E - movs r0, 0 - strh r0, [r4, 0x26] - ldr r1, =sub_8112170 - str r1, [r4] - adds r0, r5, 0 - bl _call_via_r1 -_0811215E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81120DC - - thumb_func_start sub_8112170 -sub_8112170: @ 8112170 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8364 - lsls r0, 24 - lsrs r6, r0, 24 - movs r1, 0x26 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _081121DC - cmp r0, 0x1 - bgt _081121A8 - cmp r0, 0 - beq _081121AE - b _08112258 - .pool -_081121A8: - cmp r0, 0x2 - beq _081121F0 - b _08112258 -_081121AE: - ldr r1, =gScanlineEffect - movs r0, 0x3 - strb r0, [r1, 0x15] - movs r0, 0x1 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x24] - cmp r6, 0x1 - bne _081121D0 - movs r1, 0x80 - lsls r1, 2 - b _081121D4 - .pool -_081121D0: - movs r1, 0x80 - lsls r1, 3 -_081121D4: - movs r0, 0 - bl ClearGpuRegBits - b _08112258 -_081121DC: - ldrh r0, [r4, 0x10] - ldr r3, =0x00003c0d - movs r1, 0x10 - movs r2, 0 - bl BlendPalette - b _08112258 - .pool -_081121F0: - ldr r3, =gSprites - movs r0, 0x24 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - movs r0, 0x8 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - bl obj_delete_but_dont_free_vram - ldr r0, =0x00002771 - bl FreeSpritePaletteByTag - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - cmp r6, 0x1 - bne _08112248 - movs r1, 0x80 - lsls r1, 2 - movs r0, 0 - bl SetGpuRegBits - b _08112252 - .pool -_08112248: - movs r1, 0x80 - lsls r1, 3 - movs r0, 0 - bl SetGpuRegBits -_08112252: - adds r0, r5, 0 - bl DestroyAnimVisualTask -_08112258: - ldrh r0, [r4, 0x26] - adds r0, 0x1 - strh r0, [r4, 0x26] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8112170 - - thumb_func_start sub_8112264 -sub_8112264: @ 8112264 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r7, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _081122AC - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r6, r0, 24 - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 8 - movs r2, 0xE0 - lsls r2, 13 - adds r0, r2 - lsrs r5, r0, 16 - ldr r4, =gBattleAnimTarget - b _081122D0 - .pool -_081122AC: - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r6, r0, 24 - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 8 - movs r2, 0xE0 - lsls r2, 13 - adds r0, r2 - lsrs r5, r0, 16 - ldr r4, =gBattleAnimAttacker -_081122D0: - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 8 - movs r1, 0xE0 - lsls r1, 13 - adds r0, r1 - lsrs r0, 16 - mov r9, r0 - mov r8, r5 - mov r2, r9 - subs r4, r2, r5 - lsls r4, 16 - lsrs r4, 16 - lsls r0, r6, 4 - strh r0, [r7, 0x2E] - lsls r0, r5, 4 - strh r0, [r7, 0x30] - mov r1, r10 - subs r0, r1, r6 - lsls r0, 4 - ldr r5, =gBattleAnimArgs - movs r2, 0x2 - ldrsh r1, [r5, r2] - bl __divsi3 - strh r0, [r7, 0x32] - lsls r4, 16 - asrs r4, 12 - movs r0, 0x2 - ldrsh r1, [r5, r0] - adds r0, r4, 0 - bl __divsi3 - strh r0, [r7, 0x34] - ldrh r0, [r5, 0x2] - strh r0, [r7, 0x36] - mov r1, r10 - strh r1, [r7, 0x38] - mov r2, r9 - strh r2, [r7, 0x3A] - movs r1, 0x36 - ldrsh r0, [r7, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - strh r0, [r7, 0x3C] - ldrb r1, [r7, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r7, 0x5] - strh r6, [r7, 0x20] - mov r2, r8 - strh r2, [r7, 0x22] - ldr r0, =sub_8112384 - str r0, [r7, 0x1C] - adds r2, r7, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112264 - - thumb_func_start sub_8112384 -sub_8112384: @ 8112384 - push {r4,lr} - adds r2, r0, 0 - ldrh r3, [r2, 0x36] - movs r1, 0x36 - ldrsh r0, [r2, r1] - cmp r0, 0 - beq _081123BC - ldrh r0, [r2, 0x32] - ldrh r4, [r2, 0x2E] - adds r0, r4 - strh r0, [r2, 0x2E] - ldrh r1, [r2, 0x34] - ldrh r4, [r2, 0x30] - adds r1, r4 - strh r1, [r2, 0x30] - lsls r0, 16 - asrs r0, 20 - strh r0, [r2, 0x20] - lsls r1, 16 - asrs r1, 20 - strh r1, [r2, 0x22] - subs r0, r3, 0x1 - strh r0, [r2, 0x36] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bne _081123BC - strh r0, [r2, 0x2E] -_081123BC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8112384 - - thumb_func_start sub_81123C4 -sub_81123C4: @ 81123C4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks - adds r1, r0 - str r1, [sp] - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 5 - movs r0, 0x52 - bl SetGpuReg - movs r0, 0 - ldr r1, [sp] - strh r0, [r1, 0x12] - strh r0, [r1, 0x14] - strh r0, [r1, 0x16] - strh r0, [r1, 0x18] - movs r0, 0x10 - strh r0, [r1, 0x1A] - ldr r2, =gBattleAnimArgs - ldrh r0, [r2] - strh r0, [r1, 0x1C] - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x4] - ldrb r0, [r4] - movs r1, 0x3 - bl sub_80A861C - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x8] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _08112434 - b _08112530 -_08112434: - movs r4, 0 -_08112436: - lsls r1, r4, 16 - asrs r3, r1, 16 - ldr r0, =gBattleAnimAttacker - ldrb r2, [r0] - str r1, [sp, 0x10] - cmp r3, r2 - beq _08112502 - movs r0, 0x2 - eors r2, r0 - cmp r3, r2 - beq _08112502 - lsls r0, r4, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl IsBattlerSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _08112502 - ldr r6, [sp, 0x4] - ldr r3, [sp, 0x8] - lsls r0, r3, 16 - asrs r7, r0, 16 - ldr r0, =gUnknown_08596DB8 - adds r1, r6, 0 - adds r2, r7, 0 - movs r3, 0x37 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - cmp r0, 0x40 - beq _08112502 - adds r0, r4, 0 - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - adds r0, r4, 0 - movs r1, 0x3 - bl sub_80A861C - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - mov r0, r8 - lsls r5, r0, 4 - add r5, r8 - lsls r5, 2 - ldr r1, =gSprites - adds r4, r5, r1 - lsls r0, r6, 4 - strh r0, [r4, 0x2E] - lsls r0, r7, 4 - strh r0, [r4, 0x30] - mov r2, r10 - subs r0, r2, r6 - lsls r0, 4 - ldr r3, =gBattleAnimArgs - movs r2, 0x2 - ldrsh r1, [r3, r2] - bl __divsi3 - strh r0, [r4, 0x32] - mov r3, r9 - lsls r0, r3, 16 - asrs r0, 16 - subs r0, r7 - lsls r0, 4 - ldr r2, =gBattleAnimArgs - movs r3, 0x2 - ldrsh r1, [r2, r3] - bl __divsi3 - strh r0, [r4, 0x34] - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x2] - strh r0, [r4, 0x36] - mov r2, r10 - strh r2, [r4, 0x38] - mov r3, r9 - strh r3, [r4, 0x3A] - ldr r0, =gSprites + 0x1C - adds r5, r0 - ldr r0, =sub_8112384 - str r0, [r5] - ldr r2, [sp] - movs r3, 0x20 - ldrsh r1, [r2, r3] - adds r1, 0xD - lsls r1, 1 - adds r0, r2, 0 - adds r0, 0x8 - adds r0, r1 - mov r1, r8 - strh r1, [r0] - ldrh r0, [r2, 0x20] - adds r0, 0x1 - strh r0, [r2, 0x20] -_08112502: - ldr r2, [sp, 0x10] - movs r3, 0x80 - lsls r3, 9 - adds r0, r2, r3 - lsrs r4, r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _08112436 - b _081125B4 - .pool -_08112530: - ldr r0, =gUnknown_08596DB8 - ldr r7, [sp, 0x4] - ldr r2, [sp, 0x8] - lsls r1, r2, 16 - asrs r1, 16 - str r1, [sp, 0xC] - adds r1, r7, 0 - ldr r2, [sp, 0xC] - movs r3, 0x37 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - cmp r0, 0x40 - beq _081125B4 - movs r3, 0x30 - mov r10, r3 - movs r0, 0x28 - mov r9, r0 - ldr r6, =gSprites - mov r1, r8 - lsls r5, r1, 4 - add r5, r8 - lsls r5, 2 - adds r4, r5, r6 - lsls r0, r7, 4 - strh r0, [r4, 0x2E] - ldr r2, [sp, 0xC] - lsls r0, r2, 4 - strh r0, [r4, 0x30] - subs r0, r3, r7 - lsls r0, 4 - ldr r3, =gBattleAnimArgs - movs r2, 0x2 - ldrsh r1, [r3, r2] - bl __divsi3 - strh r0, [r4, 0x32] - mov r3, r9 - ldr r1, [sp, 0xC] - subs r0, r3, r1 - lsls r0, 4 - ldr r2, =gBattleAnimArgs - movs r3, 0x2 - ldrsh r1, [r2, r3] - bl __divsi3 - strh r0, [r4, 0x34] - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x2] - strh r0, [r4, 0x36] - mov r2, r10 - strh r2, [r4, 0x38] - mov r3, r9 - strh r3, [r4, 0x3A] - adds r6, 0x1C - adds r5, r6 - ldr r0, =sub_8112384 - str r0, [r5] - mov r1, r8 - ldr r0, [sp] - strh r1, [r0, 0x22] - movs r0, 0x1 - ldr r2, [sp] - strh r0, [r2, 0x20] -_081125B4: - ldr r0, =sub_81125E0 - ldr r3, [sp] - str r0, [r3] - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81123C4 - - thumb_func_start sub_81125E0 -sub_81125E0: @ 81125E0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r0, 0x8 - ldrsh r1, [r4, r0] - cmp r1, 0x1 - beq _08112696 - cmp r1, 0x1 - bgt _08112608 - cmp r1, 0 - beq _08112616 - b _08112752 - .pool -_08112608: - cmp r1, 0x2 - bne _0811260E - b _08112728 -_0811260E: - cmp r1, 0x3 - bne _08112614 - b _0811273C -_08112614: - b _08112752 -_08112616: - movs r2, 0x14 - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _0811267C - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _0811267C - strh r1, [r4, 0x12] - ldrh r0, [r4, 0x16] - adds r0, 0x1 - strh r0, [r4, 0x16] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0811264C - ldrh r1, [r4, 0x18] - movs r2, 0x18 - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _0811265A - adds r0, r1, 0x1 - strh r0, [r4, 0x18] - b _0811265A -_0811264C: - ldrh r1, [r4, 0x1A] - movs r2, 0x1A - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _0811265A - subs r0, r1, 0x1 - strh r0, [r4, 0x1A] -_0811265A: - ldrh r1, [r4, 0x1A] - lsls r1, 8 - ldrh r0, [r4, 0x18] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0x16 - ldrsh r0, [r4, r1] - cmp r0, 0x17 - ble _0811267C - movs r0, 0 - strh r0, [r4, 0x16] - movs r0, 0x1 - strh r0, [r4, 0x14] -_0811267C: - ldrh r1, [r4, 0x1C] - movs r2, 0x1C - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _0811268C - subs r0, r1, 0x1 - strh r0, [r4, 0x1C] - b _08112752 -_0811268C: - movs r1, 0x14 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08112752 - b _08112734 -_08112696: - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08112752 - movs r0, 0 - strh r0, [r4, 0x12] - ldrh r0, [r4, 0x16] - adds r0, 0x1 - strh r0, [r4, 0x16] - ands r0, r1 - lsls r0, 16 - cmp r0, 0 - beq _081126C6 - ldrh r1, [r4, 0x18] - movs r2, 0x18 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _081126D4 - subs r0, r1, 0x1 - strh r0, [r4, 0x18] - b _081126D4 -_081126C6: - ldrh r1, [r4, 0x1A] - movs r2, 0x1A - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _081126D4 - adds r0, r1, 0x1 - strh r0, [r4, 0x1A] -_081126D4: - ldrh r1, [r4, 0x1A] - lsls r1, 8 - ldrh r0, [r4, 0x18] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - ldr r1, [r4, 0x18] - movs r0, 0x80 - lsls r0, 13 - cmp r1, r0 - bne _08112752 - movs r5, 0 - b _08112718 -_081126F4: - adds r1, r5, 0 - adds r1, 0xD - lsls r1, 1 - adds r0, r4, 0 - adds r0, 0x8 - adds r0, r1 - movs r2, 0 - ldrsh r1, [r0, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08112718: - movs r1, 0x20 - ldrsh r0, [r4, r1] - cmp r5, r0 - blt _081126F4 - b _08112734 - .pool -_08112728: - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] - lsls r0, 16 - cmp r0, 0 - ble _08112752 -_08112734: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _08112752 -_0811273C: - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - adds r0, r5, 0 - bl DestroyAnimVisualTask -_08112752: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81125E0 - - thumb_func_start sub_8112758 -sub_8112758: @ 8112758 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, =gBattle_WIN0H - movs r1, 0 - strh r1, [r0] - ldr r0, =gBattle_WIN0V - strh r1, [r0] - ldr r1, =0x00003f3f - movs r0, 0x48 - bl SetGpuReg - ldr r1, =0x00003f1f - movs r0, 0x4A - bl SetGpuReg - movs r0, 0x50 - movs r1, 0xC8 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0x10 - bl SetGpuReg - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _081127A0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _081127B8 -_081127A0: - movs r6, 0x28 - b _081127BA - .pool -_081127B8: - movs r6, 0xC8 -_081127BA: - ldr r1, =gBattle_WIN0H - lsls r3, r6, 16 - asrs r2, r3, 16 - lsls r0, r2, 8 - orrs r0, r2 - strh r0, [r1] - ldr r1, =gBattle_WIN0V - movs r5, 0x28 - ldr r0, =0x00002828 - strh r0, [r1] - lsrs r3, 16 - movs r1, 0xF0 - subs r1, r2 - movs r4, 0x48 - ldr r2, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r2 - strh r3, [r0, 0xA] - strh r1, [r0, 0xC] - strh r5, [r0, 0xE] - strh r4, [r0, 0x10] - strh r6, [r0, 0x12] - strh r5, [r0, 0x14] - ldr r1, =sub_811280C - str r1, [r0] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112758 - - thumb_func_start sub_811280C -sub_811280C: @ 811280C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _0811292C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r1, [r4, 0x8] - adds r0, r1, 0x1 - strh r0, [r4, 0x8] - ldrh r5, [r4, 0xA] - ldrh r7, [r4, 0xC] - ldrh r0, [r4, 0xE] - mov r10, r0 - ldrh r2, [r4, 0x10] - str r2, [sp, 0xC] - ldrh r0, [r4, 0x12] - ldrh r2, [r4, 0x14] - mov r8, r2 - lsls r1, 16 - asrs r6, r1, 16 - cmp r6, 0xF - ble _08112848 - b _08112938 -_08112848: - lsls r0, 16 - asrs r0, 16 - bl __floatsidf - str r0, [sp, 0x10] - str r1, [sp, 0x14] - lsls r0, r5, 16 - asrs r0, 16 - bl __floatsidf - ldr r2, _08112930 @ =0x3FB00000 - ldr r3, _08112934 @ =0x00000000 - bl __muldf3 - adds r5, r1, 0 - adds r4, r0, 0 - adds r0, r6, 0 - bl __floatsidf - str r0, [sp, 0x18] - str r1, [sp, 0x1C] - adds r1, r5, 0 - adds r0, r4, 0 - ldr r2, [sp, 0x18] - ldr r3, [sp, 0x1C] - bl __muldf3 - adds r3, r1, 0 - adds r2, r0, 0 - ldr r0, [sp, 0x10] - ldr r1, [sp, 0x14] - bl __subdf3 - bl __fixunsdfsi - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - lsls r0, r7, 16 - asrs r0, 16 - bl __floatsidf - ldr r2, _08112930 @ =0x3FB00000 - ldr r3, _08112934 @ =0x00000000 - bl __muldf3 - ldr r2, [sp, 0x18] - ldr r3, [sp, 0x1C] - bl __muldf3 - adds r3, r1, 0 - adds r2, r0, 0 - ldr r0, [sp, 0x10] - ldr r1, [sp, 0x14] - bl __adddf3 - bl __fixunsdfsi - lsls r0, 16 - lsrs r7, r0, 16 - mov r1, r8 - lsls r0, r1, 16 - asrs r0, 16 - bl __floatsidf - adds r5, r1, 0 - adds r4, r0, 0 - mov r2, r10 - lsls r0, r2, 16 - asrs r0, 16 - bl __floatsidf - ldr r2, _08112930 @ =0x3FB00000 - ldr r3, _08112934 @ =0x00000000 - bl __muldf3 - ldr r2, [sp, 0x18] - ldr r3, [sp, 0x1C] - bl __muldf3 - adds r3, r1, 0 - adds r2, r0, 0 - adds r1, r5, 0 - adds r0, r4, 0 - bl __subdf3 - bl __fixunsdfsi - lsls r0, 16 - lsrs r6, r0, 16 - ldr r1, [sp, 0xC] - lsls r0, r1, 16 - asrs r0, 16 - bl __floatsidf - ldr r2, _08112930 @ =0x3FB00000 - ldr r3, _08112934 @ =0x00000000 - bl __muldf3 - ldr r2, [sp, 0x18] - ldr r3, [sp, 0x1C] - bl __muldf3 - adds r3, r1, 0 - adds r2, r0, 0 - adds r1, r5, 0 - adds r0, r4, 0 - bl __adddf3 - bl __fixunsdfsi - lsls r0, 16 - lsrs r5, r0, 16 - b _08112966 - .align 2, 0 -_0811292C: - .4byte gTasks -_08112930: - .4byte 0x3FB00000 -_08112934: - .4byte 0x00000000 -_08112938: - movs r2, 0 - mov r9, r2 - movs r7, 0xF0 - movs r6, 0 - movs r5, 0x70 - str r6, [sp] - str r6, [sp, 0x4] - str r6, [sp, 0x8] - movs r0, 0x1 - movs r1, 0 - movs r3, 0 - bl sub_80A75AC - lsls r0, 16 - lsrs r0, 16 - str r6, [sp] - movs r1, 0 - movs r2, 0x10 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r0, _08112988 @=sub_8112994 - str r0, [r4] -_08112966: - ldr r1, _0811298C @=gBattle_WIN0H - mov r2, r9 - lsls r0, r2, 8 - orrs r7, r0 - strh r7, [r1] - ldr r1, _08112990 @=gBattle_WIN0V - lsls r0, r6, 8 - orrs r5, r0 - strh r5, [r1] - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08112988: - .4byte sub_8112994 -_0811298C: - .4byte gBattle_WIN0H -_08112990: - .4byte gBattle_WIN0V - thumb_func_end sub_811280C - - thumb_func_start sub_8112994 -sub_8112994: @ 8112994 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _081129DA - ldr r0, =gBattle_WIN0H - strh r1, [r0] - ldr r0, =gBattle_WIN0V - strh r1, [r0] - ldr r4, =0x00003f3f - movs r0, 0x48 - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x4A - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - adds r0, r5, 0 - bl DestroyAnimVisualTask -_081129DA: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112994 - - thumb_func_start sub_81129F0 -sub_81129F0: @ 81129F0 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08112A24 - movs r2, 0x18 - ldr r3, =0x0000fffe - ldrb r0, [r4, 0x3] - movs r1, 0x3F - negs r1, r1 - ands r1, r0 - movs r0, 0x10 - orrs r1, r0 - strb r1, [r4, 0x3] - b _08112A28 - .pool -_08112A24: - ldr r2, =0x0000ffe8 - movs r3, 0x2 -_08112A28: - lsls r0, r2, 16 - asrs r0, 16 - ldrh r1, [r4, 0x20] - adds r0, r1 - strh r0, [r4, 0x20] - strh r3, [r4, 0x30] - movs r0, 0x3C - strh r0, [r4, 0x2E] - ldr r0, =sub_8112A4C - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81129F0 - - thumb_func_start sub_8112A4C -sub_8112A4C: @ 8112A4C - push {r4,lr} - adds r3, r0, 0 - ldrh r1, [r3, 0x2E] - movs r2, 0x2E - ldrsh r0, [r3, r2] - cmp r0, 0 - ble _08112A5E - subs r0, r1, 0x1 - b _08112AC2 -_08112A5E: - ldrh r0, [r3, 0x30] - ldrh r4, [r3, 0x24] - adds r1, r0, r4 - strh r1, [r3, 0x24] - adds r0, r1, 0x7 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xE - bls _08112AC4 - ldrh r0, [r3, 0x20] - adds r0, r1 - strh r0, [r3, 0x20] - movs r0, 0 - strh r0, [r3, 0x24] - ldrh r2, [r3, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - adds r1, 0x8 - ldr r4, =0x000003ff - adds r0, r4, 0 - ands r1, r0 - ldr r0, =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - ldrh r0, [r3, 0x32] - adds r0, 0x1 - strh r0, [r3, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - bne _08112AC0 - movs r0, 0x1E - strh r0, [r3, 0x2E] - ldr r0, =WaitAnimForDuration - str r0, [r3, 0x1C] - ldr r1, =sub_8112ACC - adds r0, r3, 0 - bl StoreSpriteCallbackInData6 - b _08112AC4 - .pool -_08112AC0: - movs r0, 0x28 -_08112AC2: - strh r0, [r3, 0x2E] -_08112AC4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8112A4C - - thumb_func_start sub_8112ACC -sub_8112ACC: @ 8112ACC - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x2E - ldrsh r5, [r4, r0] - cmp r5, 0 - bne _08112AF6 - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0x10 - bl SetGpuReg - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - strh r5, [r4, 0x30] - strh r5, [r4, 0x32] - b _08112B3A -_08112AF6: - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0x1 - bgt _08112B06 - adds r0, r1, 0x1 - strh r0, [r4, 0x30] - b _08112B3A -_08112B06: - movs r0, 0 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - movs r1, 0x10 - subs r1, r0 - lsls r0, 8 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0x10 - bne _08112B3A - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_8112B44 - str r0, [r4, 0x1C] -_08112B3A: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112ACC - - thumb_func_start sub_8112B44 -sub_8112B44: @ 8112B44 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - ldr r0, =gBattle_WIN0H - movs r1, 0 - strh r1, [r0] - ldr r0, =gBattle_WIN0V - strh r1, [r0] - adds r0, r4, 0 - bl DestroyAnimSprite - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112B44 - - thumb_func_start sub_8112B78 -sub_8112B78: @ 8112B78 - push {r4-r7,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - movs r1, 0xC - bl Sin - strh r0, [r5, 0x24] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08112B9C - ldrh r0, [r5, 0x24] - negs r0, r0 - strh r0, [r5, 0x24] -_08112B9C: - ldrh r0, [r5, 0x2E] - adds r0, 0x6 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x2E] - movs r1, 0x80 - lsls r1, 1 - adds r0, r1, 0 - ldrh r1, [r5, 0x30] - adds r0, r1 - strh r0, [r5, 0x30] - lsls r0, 16 - asrs r0, 24 - negs r0, r0 - strh r0, [r5, 0x26] - ldrh r0, [r5, 0x3C] - adds r0, 0x1 - strh r0, [r5, 0x3C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _08112BE8 - ldr r0, =0x0000050b - strh r0, [r5, 0x3A] - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - ldrh r1, [r5, 0x3A] - movs r0, 0x52 - bl SetGpuReg - b _08112C40 - .pool -_08112BE8: - cmp r0, 0x1E - ble _08112C40 - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - ldrh r1, [r5, 0x3A] - lsls r0, r1, 16 - asrs r0, 24 - lsls r0, 16 - movs r6, 0xFF - ands r6, r1 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r7, r0, 16 - cmp r7, 0x10 - bls _08112C0C - movs r7, 0x10 -_08112C0C: - subs r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r0, 0 - bge _08112C18 - movs r6, 0 -_08112C18: - lsls r4, r7, 8 - orrs r4, r6 - lsls r1, r4, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - strh r4, [r5, 0x3A] - cmp r7, 0x10 - bne _08112C40 - cmp r6, 0 - bne _08112C40 - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_8112C4C - str r0, [r5, 0x1C] -_08112C40: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112B78 - - thumb_func_start sub_8112C4C -sub_8112C4C: @ 8112C4C - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - adds r0, r4, 0 - bl DestroyAnimSprite - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8112C4C - - thumb_func_start sub_8112C6C -sub_8112C6C: @ 8112C6C - push {r4-r6,lr} - mov r6, r8 - push {r6} - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, =gTasks - adds r4, r0 - movs r6, 0 - strh r6, [r4, 0x8] - movs r0, 0x10 - mov r8, r0 - mov r0, r8 - strh r0, [r4, 0xA] - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x1A] - ldrb r0, [r5] - bl GetBattlerYCoordWithElevation - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x1C] - ldrb r0, [r5] - movs r1, 0x1 - bl sub_80A861C - lsls r0, 16 - asrs r1, r0, 16 - lsrs r0, 31 - adds r1, r0 - asrs r1, 1 - adds r1, 0x8 - strh r1, [r4, 0x1E] - strh r6, [r4, 0x16] - ldrb r0, [r5] - bl sub_80A8328 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x12] - ldrb r0, [r5] - bl sub_80A82E4 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x2 - strh r0, [r4, 0x14] - strh r6, [r4, 0xE] - mov r0, r8 - strh r0, [r4, 0x10] - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 5 - movs r0, 0x52 - bl SetGpuReg - strh r6, [r4, 0x18] - ldr r0, =sub_8112D10 - str r0, [r4] - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112C6C - - thumb_func_start sub_8112D10 -sub_8112D10: @ 8112D10 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x5 - bls _08112D2A - b _08112E96 -_08112D2A: - lsls r0, 2 - ldr r1, =_08112D3C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08112D3C: - .4byte _08112D54 - .4byte _08112DC4 - .4byte _08112E06 - .4byte _08112E1A - .4byte _08112E70 - .4byte _08112E80 -_08112D54: - movs r6, 0 -_08112D56: - movs r2, 0x1A - ldrsh r1, [r4, r2] - movs r0, 0x1C - ldrsh r2, [r4, r0] - ldrb r3, [r4, 0x14] - ldr r0, =gUnknown_08596E30 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _08112DAA - ldr r1, =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r5, r0, r1 - strh r7, [r5, 0x2E] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - movs r1, 0 - lsls r0, 24 - cmp r0, 0 - bne _08112D8C - movs r1, 0x1 -_08112D8C: - strh r1, [r5, 0x30] - movs r0, 0x2A - muls r0, r6 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x32] - ldrh r0, [r4, 0x1E] - strh r0, [r5, 0x34] - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 1 - strh r0, [r5, 0x38] - ldrh r0, [r4, 0x16] - adds r0, 0x1 - strh r0, [r4, 0x16] -_08112DAA: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x5 - bls _08112D56 - b _08112E78 - .pool -_08112DC4: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08112DE2 - ldrh r1, [r4, 0xE] - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r0, 0xD - bgt _08112DF0 - adds r0, r1, 0x1 - strh r0, [r4, 0xE] - b _08112DF0 -_08112DE2: - ldrh r1, [r4, 0x10] - movs r2, 0x10 - ldrsh r0, [r4, r2] - cmp r0, 0x4 - ble _08112DF0 - subs r0, r1, 0x1 - strh r0, [r4, 0x10] -_08112DF0: - movs r1, 0xE - ldrsh r0, [r4, r1] - ldrh r2, [r4, 0xE] - ldrh r1, [r4, 0x10] - cmp r0, 0xE - bne _08112E60 - cmp r1, 0x4 - bne _08112E60 - movs r0, 0 - strh r0, [r4, 0xA] - b _08112E5A -_08112E06: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1E - ble _08112E96 - movs r0, 0 - strh r0, [r4, 0xA] - b _08112E78 -_08112E1A: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08112E38 - ldrh r1, [r4, 0xE] - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _08112E46 - subs r0, r1, 0x1 - strh r0, [r4, 0xE] - b _08112E46 -_08112E38: - ldrh r1, [r4, 0x10] - movs r2, 0x10 - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _08112E46 - adds r0, r1, 0x1 - strh r0, [r4, 0x10] -_08112E46: - movs r1, 0xE - ldrsh r0, [r4, r1] - ldrh r2, [r4, 0xE] - ldrh r1, [r4, 0x10] - cmp r0, 0 - bne _08112E60 - cmp r1, 0x10 - bne _08112E60 - movs r0, 0x1 - strh r0, [r4, 0x18] -_08112E5A: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_08112E60: - lsls r1, 8 - orrs r1, r2 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - b _08112E96 -_08112E70: - movs r2, 0x16 - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08112E96 -_08112E78: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _08112E96 -_08112E80: - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - adds r0, r7, 0 - bl DestroyAnimVisualTask -_08112E96: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8112D10 - - thumb_func_start sub_8112E9C -sub_8112E9C: @ 8112E9C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x30 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08112EAE - ldrh r0, [r4, 0x32] - adds r0, 0x2 - b _08112EB2 -_08112EAE: - ldrh r0, [r4, 0x32] - subs r0, 0x2 -_08112EB2: - strh r0, [r4, 0x32] - ldrh r1, [r4, 0x32] - movs r0, 0xFF - ands r0, r1 - strh r0, [r4, 0x32] - movs r2, 0x32 - ldrsh r0, [r4, r2] - movs r2, 0x34 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x32] - subs r0, 0x41 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7E - bhi _08112EF4 - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrh r1, [r0, 0x12] - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - b _08112F08 - .pool -_08112EF4: - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r2, 0x3 - ldrb r1, [r0, 0x12] - ands r1, r2 -_08112F08: - lsls r1, 2 - ldrb r2, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x5] - ldrh r0, [r4, 0x38] - adds r0, 0x1 - strh r0, [r4, 0x38] - movs r1, 0x38 - ldrsh r0, [r4, r1] - lsls r0, 3 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x3A] - movs r2, 0x3A - ldrsh r0, [r4, r2] - movs r1, 0x7 - bl Sin - strh r0, [r4, 0x26] - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r1, r0, r2 - movs r2, 0x18 - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _08112F56 - ldrh r0, [r1, 0x16] - subs r0, 0x1 - strh r0, [r1, 0x16] - adds r0, r4, 0 - bl DestroySprite -_08112F56: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112E9C - - thumb_func_start sub_8112F60 -sub_8112F60: @ 8112F60 - adds r3, r0, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r3] - ldr r2, =gBattlerSpriteIds - ldr r1, =gBattleAnimAttacker - ldrb r1, [r1] - adds r1, r2 - ldrb r1, [r1] - strh r1, [r0, 0x38] - movs r1, 0x80 - strh r1, [r0, 0x2E] - movs r1, 0xA - strh r1, [r0, 0x30] - ldr r2, =gBattleAnimArgs - ldrh r1, [r2] - strh r1, [r0, 0x32] - ldrh r1, [r2, 0x2] - strh r1, [r0, 0x34] - ldr r1, =sub_8112FB8 - str r1, [r0, 0x1C] - ldr r2, =gSprites - movs r3, 0x38 - ldrsh r1, [r0, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x22] - adds r1, 0x8 - strh r1, [r0, 0x22] - bx lr - .pool - thumb_func_end sub_8112F60 - - thumb_func_start sub_8112FB8 -sub_8112FB8: @ 8112FB8 - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x34] - movs r1, 0x34 - ldrsh r3, [r5, r1] - cmp r3, 0 - beq _08113020 - subs r0, 0x1 - strh r0, [r5, 0x34] - movs r2, 0x2E - ldrsh r0, [r5, r2] - movs r2, 0x30 - ldrsh r1, [r5, r2] - bl Sin - ldr r4, =gSprites - movs r1, 0x38 - ldrsh r2, [r5, r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r4 - strh r0, [r1, 0x24] - movs r2, 0x2E - ldrsh r0, [r5, r2] - movs r2, 0x30 - ldrsh r1, [r5, r2] - bl Cos - movs r1, 0x38 - ldrsh r2, [r5, r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r4 - strh r0, [r1, 0x26] - ldrh r0, [r5, 0x32] - ldrh r2, [r5, 0x2E] - adds r1, r0, r2 - strh r1, [r5, 0x2E] - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0xFF - ble _08113054 - ldr r2, =0xffffff00 - adds r0, r1, r2 - strh r0, [r5, 0x2E] - b _08113054 - .pool -_08113020: - ldr r2, =gSprites - movs r0, 0x38 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x24] - movs r0, 0x38 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x26] - movs r0, 0x38 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x22] - subs r1, 0x8 - strh r1, [r0, 0x22] - ldr r0, =move_anim_8074EE0 - str r0, [r5, 0x1C] -_08113054: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8112FB8 - - .align 2, 0 diff --git a/ld_script.txt b/ld_script.txt index 58c940522..bf05b91a0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -168,7 +168,6 @@ SECTIONS { src/bug.o(.text); src/rock.o(.text); src/ghost.o(.text); - asm/ghost.o(.text); src/dragon.o(.text); asm/dark.o(.text); src/ground.o(.text); diff --git a/src/ghost.c b/src/ghost.c index 526e4e519..0464d1491 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -1,10 +1,14 @@ #include "global.h" +#include "battle.h" #include "battle_anim.h" #include "gpu_regs.h" +#include "palette.h" #include "constants/rgb.h" +#include "scanline_effect.h" #include "constants/songs.h" #include "sound.h" #include "trig.h" +#include "util.h" static void sub_811160C(struct Sprite *); static void sub_8111674(struct Sprite *); @@ -18,11 +22,25 @@ static void InitAnimShadowBall(struct Sprite *); static void AnimShadowBallStep(struct Sprite *); static void sub_8111B9C(struct Sprite *); static void sub_8111BB4(struct Sprite *); -extern void sub_8112264(struct Sprite *); -extern void sub_81129F0(struct Sprite *); -extern void sub_8112B78(struct Sprite *); -extern void sub_8112E9C(struct Sprite *); -extern void sub_8112F60(struct Sprite *); +static void sub_8111D78(u8 taskId); +static void sub_8111E78(u8 taskId); +static void sub_81120DC(u8 taskId); +static void sub_8112170(u8 taskId); +static void sub_8112264(struct Sprite *); +static void sub_8112384(struct Sprite *); +static void sub_81125E0(u8 taskId); +static void sub_811280C(u8 taskId); +static void sub_8112994(u8 taskId); +static void sub_81129F0(struct Sprite *); +static void sub_8112A4C(struct Sprite *); +static void sub_8112ACC(struct Sprite *); +static void sub_8112B44(struct Sprite *); +static void sub_8112B78(struct Sprite *); +static void sub_8112C4C(struct Sprite *); +static void sub_8112D10(u8 taskId); +static void sub_8112E9C(struct Sprite *); +static void sub_8112F60(struct Sprite *); +static void sub_8112FB8(struct Sprite *); const union AffineAnimCmd gUnknown_08596CF8[] = { @@ -208,7 +226,7 @@ static void sub_811160C(struct Sprite *sprite) sub_80A6FD4(sprite); sprite->callback = sub_8111674; sprite->data[6] = 16; - SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); SetGpuReg(REG_OFFSET_BLDALPHA, sprite->data[6]); } @@ -321,8 +339,8 @@ static void sub_8111814(struct Sprite *sprite) void sub_811188C(u8 taskId) { u8 spriteId; - SetGpuReg(REG_OFFSET_BLDCNT, 0x3F40); - SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000); + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0x10)); spriteId = GetAnimBattlerSpriteId(0); sub_80A7270(spriteId, 1); obj_id_set_rotscale(spriteId, 128, 128, 0); @@ -342,7 +360,7 @@ static void sub_8111914(u8 taskId) gTasks[taskId].data[10] = 0; gTasks[taskId].data[2] += 1; gTasks[taskId].data[3] -= 1; - SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskId].data[3] << 8 | gTasks[taskId].data[2]); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[2], gTasks[taskId].data[3])); if (gTasks[taskId].data[2] != 9) return; @@ -487,9 +505,7 @@ static void sub_8111BB4(struct Sprite *sprite) { } } -/* - -void sub_80DE1B0(u8 taskId) +void sub_8111C50(u8 taskId) { struct Task *task; @@ -504,10 +520,10 @@ void sub_80DE1B0(u8 taskId) task->data[2] = 15; task->data[3] = 2; task->data[4] = 0; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[2], task->data[3])); gSprites[task->data[0]].data[0] = 80; - if (GetBattlerSide(gAnimBankTarget) == 0) + if (GetBattlerSide(gBattleAnimTarget) == 0) { gSprites[task->data[0]].data[1] = -144; gSprites[task->data[0]].data[2] = 112; @@ -519,12 +535,12 @@ void sub_80DE1B0(u8 taskId) } gSprites[task->data[0]].data[3] = 0; gSprites[task->data[0]].data[4] = 0; - StoreSpriteCallbackInData(&gSprites[task->data[0]], SpriteCallbackDummy); - gSprites[task->data[0]].callback = sub_8078394; - task->func = sub_80DE2DC; + StoreSpriteCallbackInData6(&gSprites[task->data[0]], SpriteCallbackDummy); + gSprites[task->data[0]].callback = sub_80A656C; + task->func = sub_8111D78; } -static void sub_80DE2DC(u8 taskId) +static void sub_8111D78(u8 taskId) { struct Task *task; @@ -540,7 +556,7 @@ static void sub_80DE2DC(u8 taskId) if (task->data[5] == 3) if (task->data[3] <= 15) task->data[3] += 1; - REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[2], task->data[3])); if (task->data[3] != 16 || task->data[2] != 0) break; if (task->data[1] <= 80) @@ -551,8 +567,8 @@ static void sub_80DE2DC(u8 taskId) case 1: if (++task->data[6] <= 1) break; - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); task->data[4] += 1; break; case 2: @@ -560,27 +576,27 @@ static void sub_80DE2DC(u8 taskId) } } -void sub_80DE3AC(u8 taskId) +void sub_8111E50(u8 taskId) { struct Task *task; task = &gTasks[taskId]; task->data[15] = 0; - task->func = sub_80DE3D4; + task->func = sub_8111E78; task->func(taskId); } -static void sub_80DE3D4(u8 taskId) +static void sub_8111E78(u8 taskId) { s16 startLine; struct Task *task = &gTasks[taskId]; - u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + u8 position = sub_80A8364(gBattleAnimTarget); switch (task->data[15]) { case 0: task->data[14] = AllocSpritePalette(0x2771); - if (task->data[14] == 0xFF) + if (task->data[14] == 0xFF || task->data[14] == 0xF) { DestroyAnimVisualTask(taskId); } @@ -594,19 +610,25 @@ static void sub_80DE3D4(u8 taskId) } else { + s16 mask2; gSprites[task->data[0]].oam.paletteNum = task->data[14]; gSprites[task->data[0]].oam.objMode = ST_OAM_OBJ_NORMAL; gSprites[task->data[0]].oam.priority = 3; + gSprites[task->data[0]].invisible = (gBattleSpritesDataPtr->battlerData[gBattleAnimTarget].invisible); task->data[1] = 0; task->data[2] = 0; task->data[3] = 16; task->data[13] = GetAnimBattlerSpriteId(1); task->data[4] = (gSprites[task->data[13]].oam.paletteNum + 16) * 16; - if (position == 1) - REG_DISPCNT &= 0xFDFF; - else - REG_DISPCNT &= 0xFBFF; - + if (position == 1) { + u16 mask = DISPCNT_BG1_ON; + mask2 = mask; + } + else { + u16 mask = DISPCNT_BG2_ON; + mask2 = mask; + } + ClearGpuRegBits(REG_OFFSET_DISPCNT, mask2); task->data[15]++; } } @@ -631,20 +653,20 @@ static void sub_80DE3D4(u8 taskId) break; case 3: if (position == 1) - REG_BLDCNT = 0x3F42; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG1)); else - REG_BLDCNT = 0x3F44; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG2)); - REG_BLDALPHA = 0x1000; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0x10)); task->data[15]++; break; case 4: if (position == 1) - REG_DISPCNT |= DISPCNT_BG1_ON; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else - REG_DISPCNT |= DISPCNT_BG2_ON; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); - task->func = sub_80DE61C; + task->func = sub_81120DC; task->data[15]++; break; default: @@ -653,7 +675,7 @@ static void sub_80DE3D4(u8 taskId) } } -static void sub_80DE61C(u8 taskId) +static void sub_81120DC(u8 taskId) { struct Task *task = &gTasks[taskId]; task->data[1]++; @@ -664,19 +686,19 @@ static void sub_80DE61C(u8 taskId) if (task->data[5] == 1) task->data[3] = 16 - (gSineTable[task->data[1]] / 18); - REG_BLDALPHA = (task->data[3] << 8) | task->data[2]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[2], task->data[3])); if (task->data[1] == 128) { task->data[15] = 0; - task->func = sub_80DE6B0; + task->func = sub_8112170; task->func(taskId); } } -static void sub_80DE6B0(u8 taskId) +static void sub_8112170(u8 taskId) { struct Task *task = &gTasks[taskId]; - u8 position = GetBattlerPosition_permutated(gAnimBankTarget); + u8 position = sub_80A8364(gBattleAnimTarget); switch (task->data[15]) { @@ -684,9 +706,9 @@ static void sub_80DE6B0(u8 taskId) gScanlineEffect.state = 3; task->data[14] = GetAnimBattlerSpriteId(1); if (position == 1) - REG_DISPCNT &= 0xFDFF; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else - REG_DISPCNT &= 0xFBFF; + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); break; case 1: BlendPalette(task->data[4], 16, 0, RGB(13, 0, 15)); @@ -695,12 +717,12 @@ static void sub_80DE6B0(u8 taskId) gSprites[task->data[14]].invisible = 1; obj_delete_but_dont_free_vram(&gSprites[task->data[0]]); FreeSpritePaletteByTag(0x2771); - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); if (position == 1) - REG_DISPCNT |= DISPCNT_BG1_ON; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else - REG_DISPCNT |= DISPCNT_BG2_ON; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); DestroyAnimVisualTask(taskId); break; @@ -709,7 +731,7 @@ static void sub_80DE6B0(u8 taskId) task->data[15]++; } -static void sub_80DE7B8(struct Sprite *sprite) +static void sub_8112264(struct Sprite *sprite) { s16 battler1X, battler1Y; s16 battler2X, battler2Y; @@ -717,17 +739,17 @@ static void sub_80DE7B8(struct Sprite *sprite) if (gBattleAnimArgs[0] == 0) { - battler1X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - battler1Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; - battler2X = GetBattlerSpriteCoord(gAnimBankTarget, 0); - battler2Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; + battler1X = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + battler1Y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 28; + battler2X = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + battler2Y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 28; } else { - battler1X = GetBattlerSpriteCoord(gAnimBankTarget, 0); - battler1Y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 28; - battler2X = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - battler2Y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 28; + battler1X = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + battler1Y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 28; + battler2X = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + battler2Y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 28; } yDiff = battler2Y - battler1Y; @@ -742,11 +764,11 @@ static void sub_80DE7B8(struct Sprite *sprite) sprite->oam.priority = 2; sprite->pos1.x = battler1X; sprite->pos1.y = battler1Y; - sprite->callback = sub_80DE8D8; + sprite->callback = sub_8112384; sprite->invisible = 1; } -static void sub_80DE8D8(struct Sprite *sprite) +static void sub_8112384(struct Sprite *sprite) { if (sprite->data[4]) { @@ -759,7 +781,7 @@ static void sub_80DE8D8(struct Sprite *sprite) } } -void sub_80DE918(u8 taskId) +void sub_81123C4(u8 taskId) { struct Task *task; s16 battler; @@ -768,8 +790,8 @@ void sub_80DE918(u8 taskId) s16 x, y; task = &gTasks[taskId]; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = 0x1000; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0x10)); task->data[5] = 0; task->data[6] = 0; task->data[7] = 0; @@ -777,21 +799,21 @@ void sub_80DE918(u8 taskId) task->data[9] = 16; task->data[10] = gBattleAnimArgs[0]; - baseX = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - baseY = sub_807A100(gAnimBankAttacker, 3); + baseX = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + baseY = sub_80A861C(gBattleAnimAttacker, 3); if (!IsContest()) { for (battler = 0; battler < 4; battler++) { - if (battler != gAnimBankAttacker - && battler != (gAnimBankAttacker ^ 2) - && IsAnimBankSpriteVisible(battler)) + if (battler != gBattleAnimAttacker + && battler != (gBattleAnimAttacker ^ 2) + && IsBattlerSpriteVisible(battler)) { - spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); + spriteId = CreateSprite(&gUnknown_08596DB8, baseX, baseY, 55); if (spriteId != MAX_SPRITES) { x = GetBattlerSpriteCoord(battler, 2); - y = sub_807A100(battler, 3); + y = sub_80A861C(battler, 3); gSprites[spriteId].data[0] = baseX << 4; gSprites[spriteId].data[1] = baseY << 4; gSprites[spriteId].data[2] = ((x - baseX) << 4) / gBattleAnimArgs[1]; @@ -799,7 +821,7 @@ void sub_80DE918(u8 taskId) gSprites[spriteId].data[4] = gBattleAnimArgs[1]; gSprites[spriteId].data[5] = x; gSprites[spriteId].data[6] = y; - gSprites[spriteId].callback = sub_80DE8D8; + gSprites[spriteId].callback = sub_8112384; task->data[task->data[12] + 13] = spriteId; task->data[12]++; @@ -809,7 +831,7 @@ void sub_80DE918(u8 taskId) } else { - spriteId = CreateSprite(&gSpriteTemplate_83DAF08, baseX, baseY, 55); + spriteId = CreateSprite(&gUnknown_08596DB8, baseX, baseY, 55); if (spriteId != MAX_SPRITES) { x = 48; @@ -821,17 +843,17 @@ void sub_80DE918(u8 taskId) gSprites[spriteId].data[4] = gBattleAnimArgs[1]; gSprites[spriteId].data[5] = x; gSprites[spriteId].data[6] = y; - gSprites[spriteId].callback = sub_80DE8D8; + gSprites[spriteId].callback = sub_8112384; task->data[13] = spriteId; task->data[12] = 1; } } - task->func = sub_80DEB38; + task->func = sub_81125E0; } -static void sub_80DEB38(u8 taskId) +static void sub_81125E0(u8 taskId) { u16 i; struct Task *task = &gTasks[taskId]; @@ -856,7 +878,7 @@ static void sub_80DEB38(u8 taskId) task->data[9]--; } - REG_BLDALPHA = (task->data[9] << 8) | task->data[8]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[8], task->data[9])); if (task->data[7] >= 24) { task->data[7] = 0; @@ -886,7 +908,7 @@ static void sub_80DEB38(u8 taskId) task->data[9]++; } - REG_BLDALPHA = (task->data[9] << 8) | task->data[8]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[8], task->data[9])); if (task->data[8] == 0 && task->data[9] == 16) { for (i = 0; i < task->data[12]; i++) @@ -901,26 +923,28 @@ static void sub_80DEB38(u8 taskId) task->data[0]++; break; case 3: - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyAnimVisualTask(taskId); break; } } -void sub_80DECB0(u8 taskId) +void sub_8112758(u8 taskId) { s16 startX, startY; s16 leftDistance, topDistance, bottomDistance, rightDistance; gBattle_WIN0H = 0; gBattle_WIN0V = 0; - REG_WININ = 0x3F3F; - REG_WINOUT = 0x3F1F; - REG_BLDCNT = 0xC8; - REG_BLDY = 0x10; - - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER || IsContest()) + SetGpuReg(REG_OFFSET_WININ, ((WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR) | + (WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR))); + SetGpuReg(REG_OFFSET_WINOUT, ((WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ) | + (WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR))); + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_DARKEN)); + SetGpuReg(REG_OFFSET_BLDY, 0x10); + + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest()) startX = 40; else startX = 200; @@ -939,10 +963,10 @@ void sub_80DECB0(u8 taskId) gTasks[taskId].data[4] = bottomDistance; gTasks[taskId].data[5] = startX; gTasks[taskId].data[6] = startY; - gTasks[taskId].func = sub_80DED60; + gTasks[taskId].func = sub_811280C; } -static void sub_80DED60(u8 taskId) +static void sub_811280C(u8 taskId) { s16 step; s16 leftDistance, rightDistance, topDistance, bottomDistance; @@ -972,36 +996,38 @@ static void sub_80DED60(u8 taskId) right = 240; top = 0; bottom = 112; - selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0); + selectedPalettes = sub_80A75AC(1, 0, 0, 0, 0, 0, 0); BeginNormalPaletteFade(selectedPalettes, 0, 16, 16, RGB(0, 0, 0)); - gTasks[taskId].func = sub_80DEEE8; + gTasks[taskId].func = sub_8112994; } gBattle_WIN0H = (left << 8) | right; gBattle_WIN0V = (top << 8) | bottom; } -static void sub_80DEEE8(u8 taskId) +static void sub_8112994(u8 taskId) { if (!gPaletteFade.active) { gBattle_WIN0H = 0; gBattle_WIN0V = 0; - REG_WININ = 0x3F3F; - REG_WINOUT = 0x3F3F; - REG_BLDCNT = 0; - REG_BLDY = 0; + SetGpuReg(REG_OFFSET_WININ, ((WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR) | + (WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR))); + SetGpuReg(REG_OFFSET_WINOUT, ((WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR) | + (WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR))); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); DestroyAnimVisualTask(taskId); } } -static void sub_80DEF3C(struct Sprite *sprite) +static void sub_81129F0(struct Sprite *sprite) { s16 xDelta; s16 xDelta2; InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { xDelta = 24; xDelta2 = -2; @@ -1016,10 +1042,10 @@ static void sub_80DEF3C(struct Sprite *sprite) sprite->pos1.x += xDelta; sprite->data[1] = xDelta2; sprite->data[0] = 60; - sprite->callback = sub_80DEF98; + sprite->callback = sub_8112A4C; } -static void sub_80DEF98(struct Sprite *sprite) +static void sub_8112A4C(struct Sprite *sprite) { u16 var0; @@ -1040,7 +1066,7 @@ static void sub_80DEF98(struct Sprite *sprite) { sprite->data[0] = 30; sprite->callback = WaitAnimForDuration; - StoreSpriteCallbackInData(sprite, sub_80DF018); + StoreSpriteCallbackInData6(sprite, sub_8112ACC); } else { @@ -1050,12 +1076,12 @@ static void sub_80DEF98(struct Sprite *sprite) } } -static void sub_80DF018(struct Sprite *sprite) +static void sub_8112ACC(struct Sprite *sprite) { if (sprite->data[0] == 0) { - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = 0x0010; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0x10, 0)); sprite->data[0]++; sprite->data[1] = 0; sprite->data[2] = 0; @@ -1068,31 +1094,31 @@ static void sub_80DF018(struct Sprite *sprite) { sprite->data[1] = 0; sprite->data[2]++; - REG_BLDALPHA = (16 - sprite->data[2]) | (sprite->data[2] << 8); + SetGpuReg(REG_OFFSET_BLDALPHA, (16 - sprite->data[2]) | (sprite->data[2] << 8)); if (sprite->data[2] == 16) { sprite->invisible = 1; - sprite->callback = sub_80DF090; + sprite->callback = sub_8112B44; } } } -static void sub_80DF090(struct Sprite *sprite) +static void sub_8112B44(struct Sprite *sprite) { - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); gBattle_WIN0H = 0; gBattle_WIN0V = 0; DestroyAnimSprite(sprite); } -static void sub_80DF0B8(struct Sprite *sprite) +static void sub_8112B78(struct Sprite *sprite) { u16 coeffB; u16 coeffA; sprite->pos2.x = Sin(sprite->data[0], 12); - if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos2.x = -sprite->pos2.x; sprite->data[0] = (sprite->data[0] + 6) & 0xFF; @@ -1103,8 +1129,8 @@ static void sub_80DF0B8(struct Sprite *sprite) if (sprite->data[7] == 1) { sprite->data[6] = 0x050B; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = sprite->data[6]; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, sprite->data[6]); } else if (sprite->data[7] > 30) { @@ -1117,44 +1143,44 @@ static void sub_80DF0B8(struct Sprite *sprite) if (--(s16)coeffA < 0) coeffA = 0; - REG_BLDALPHA = (coeffB << 8) | coeffA; - sprite->data[6] = (coeffB << 8) | coeffA; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(coeffA, coeffB)); + sprite->data[6] = BLDALPHA_BLEND(coeffA, coeffB); if (coeffB == 16 && coeffA == 0) { sprite->invisible = 1; - sprite->callback = sub_80DF18C; + sprite->callback = sub_8112C4C; } } } -static void sub_80DF18C(struct Sprite *sprite) +static void sub_8112C4C(struct Sprite *sprite) { - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyAnimSprite(sprite); } -void sub_80DF1A4(u8 taskId) +void sub_8112C6C(u8 taskId) { struct Task *task = &gTasks[taskId]; task->data[0] = 0; task->data[1] = 16; - task->data[9] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); - task->data[10] = sub_8077FC0(gAnimBankAttacker); - task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8; + task->data[9] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + task->data[10] = GetBattlerYCoordWithElevation(gBattleAnimAttacker); + task->data[11] = (sub_80A861C(gBattleAnimAttacker, 1) / 2) + 8; task->data[7] = 0; - task->data[5] = sub_8079ED4(gAnimBankAttacker); - task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2; + task->data[5] = sub_80A8328(gBattleAnimAttacker); + task->data[6] = sub_80A82E4(gBattleAnimAttacker) - 2; task->data[3] = 0; task->data[4] = 16; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = 0x1000; + SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0x10)); task->data[8] = 0; - task->func = sub_80DF24C; + task->func = sub_8112D10; } -static void sub_80DF24C(u8 taskId) +static void sub_8112D10(u8 taskId) { u16 i; u8 spriteId; @@ -1165,11 +1191,11 @@ static void sub_80DF24C(u8 taskId) case 0: for (i = 0; i < 6; i++) { - spriteId = CreateSprite(&gSpriteTemplate_83DAF80, task->data[9], task->data[10], task->data[6]); + spriteId = CreateSprite(&gUnknown_08596E30, task->data[9], task->data[10], task->data[6]); if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[0] = taskId; - gSprites[spriteId].data[1] = GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER; + gSprites[spriteId].data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER; gSprites[spriteId].data[2] = (i * 42) & 0xFF; gSprites[spriteId].data[3] = task->data[11]; @@ -1198,7 +1224,7 @@ static void sub_80DF24C(u8 taskId) task->data[0]++; } - REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[3], task->data[4])); break; case 2: if (++task->data[1] > 30) @@ -1225,21 +1251,21 @@ static void sub_80DF24C(u8 taskId) task->data[0]++; } - REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[3], task->data[4])); break; case 4: if (task->data[7] == 0) task->data[0]++; break; case 5: - REG_BLDCNT = 0; - REG_BLDALPHA = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyAnimVisualTask(taskId); break; } } -static void sub_80DF3D8(struct Sprite *sprite) +static void sub_8112E9C(struct Sprite *sprite) { u16 index; @@ -1267,20 +1293,20 @@ static void sub_80DF3D8(struct Sprite *sprite) } } -static void sub_80DF49C(struct Sprite *sprite) +static void sub_8112F60(struct Sprite *sprite) { sprite->invisible = 1; - sprite->data[5] = gBankSpriteIds[gAnimBankAttacker]; + sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[0] = 128; sprite->data[1] = 10; sprite->data[2] = gBattleAnimArgs[0]; sprite->data[3] = gBattleAnimArgs[1]; - sprite->callback = sub_80DF4F4; + sprite->callback = sub_8112FB8; gSprites[sprite->data[5]].pos1.y += 8; } -static void sub_80DF4F4(struct Sprite *sprite) +static void sub_8112FB8(struct Sprite *sprite) { if (sprite->data[3]) { @@ -1298,5 +1324,4 @@ static void sub_80DF4F4(struct Sprite *sprite) gSprites[sprite->data[5]].pos1.y -= 8; sprite->callback = move_anim_8074EE0; } -}*/ - +} -- cgit v1.2.3 From a7722a0b936132527ff0bf8fd8213ab0bbd25e44 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 9 Dec 2018 13:41:52 -0600 Subject: Decompile cable_car.c (#438) --- asm/cable_car.s | 2882 ----------------------- data/cable_car.s | 106 - data/maps/MtChimney_CableCarStation/scripts.inc | 2 +- data/maps/Route112_CableCarStation/scripts.inc | 2 +- data/specials.inc | 2 +- include/global.h | 8 + include/graphics.h | 8 + ld_script.txt | 4 +- src/cable_car.c | 1006 ++++++++ src/overworld.c | 1 - sym_ewram.txt | 23 +- 11 files changed, 1028 insertions(+), 3016 deletions(-) delete mode 100644 asm/cable_car.s delete mode 100644 data/cable_car.s create mode 100755 src/cable_car.c diff --git a/asm/cable_car.s b/asm/cable_car.s deleted file mode 100644 index 96bc91a41..000000000 --- a/asm/cable_car.s +++ /dev/null @@ -1,2882 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_814FC70 -sub_814FC70: @ 814FC70 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0814FC8E - ldr r0, =sub_814FCC8 - bl SetMainCallback2 - adds r0, r4, 0 - bl DestroyTask -_0814FC8E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814FC70 - - thumb_func_start sub_814FC9C -sub_814FC9C: @ 814FC9C - push {lr} - sub sp, 0x4 - bl ScriptContext2_Enable - ldr r0, =sub_814FC70 - movs r1, 0x1 - bl CreateTask - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_814FC9C - - thumb_func_start sub_814FCC8 -sub_814FCC8: @ 814FCC8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x18 - movs r4, 0 - str r4, [sp, 0x14] - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r0, r1, r2 - ldrb r0, [r0] - adds r6, r1, 0 - cmp r0, 0x9 - bhi _0814FD20 - lsls r0, 2 - ldr r1, =_0814FCF8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0814FCF8: - .4byte _0814FD20 - .4byte _0814FDD8 - .4byte _0814FE90 - .4byte _0814FF50 - .4byte _0814FF7C - .4byte _0814FF98 - .4byte _0814FFF8 - .4byte _08150090 - .4byte _08150190 - .4byte _081501C8 -_0814FD20: - movs r0, 0 - bl SetVBlankCallback - movs r0, 0 - bl sub_8150B6C - bl ScanlineEffect_Stop - movs r3, 0xC0 - lsls r3, 19 - movs r4, 0xC0 - lsls r4, 9 - add r0, sp, 0x10 - mov r9, r0 - add r2, sp, 0xC - movs r6, 0 - ldr r1, =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r7, =0x81000800 - movs r0, 0x81 - lsls r0, 24 - mov r8, r0 -_0814FD4E: - strh r6, [r2] - add r0, sp, 0xC - str r0, [r1] - str r3, [r1, 0x4] - str r7, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r3, r5 - subs r4, r5 - cmp r4, r5 - bhi _0814FD4E - strh r6, [r2] - add r2, sp, 0xC - str r2, [r1] - str r3, [r1, 0x4] - lsrs r0, r4, 1 - mov r3, r8 - orrs r0, r3 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 19 - movs r3, 0x80 - lsls r3, 3 - movs r4, 0 - str r4, [sp, 0x10] - ldr r2, =0x040000d4 - mov r1, r9 - str r1, [r2] - str r0, [r2, 0x4] - lsrs r0, r3, 2 - movs r1, 0x85 - lsls r1, 24 - orrs r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r1, 0xA0 - lsls r1, 19 - add r0, sp, 0xC - strh r4, [r0] - str r0, [r2] - str r1, [r2, 0x4] - lsrs r3, 1 - movs r0, 0x81 - lsls r0, 24 - orrs r3, r0 - str r3, [r2, 0x8] - ldr r0, [r2, 0x8] - ldr r4, =gUnknown_0203ABAC - ldr r0, =0x00004110 - bl AllocZeroed - str r0, [r4] - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_0814FDD8: - bl ResetSpriteData - bl ResetTasks - bl FreeAllSpritePalettes - bl ResetPaletteFade - bl reset_temp_tile_data_buffers - bl StartWeather - movs r4, 0 - ldr r0, =gWeatherPtr - ldr r0, [r0] - adds r1, r0, 0 - adds r1, 0xF0 - movs r2, 0 -_0814FDFC: - lsls r0, r4, 2 - adds r0, r1, r0 - str r2, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _0814FDFC - bl InitMapMusic - bl ResetMapMusic - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_085CD66C - movs r0, 0 - movs r2, 0x4 - bl InitBgsFromTemplates - ldr r4, =gUnknown_0203ABAC - ldr r1, [r4] - adds r1, 0xFC - movs r0, 0 - bl SetBgTilemapBuffer - ldr r1, [r4] - ldr r3, =0x000010fc - adds r1, r3 - movs r0, 0x1 - bl SetBgTilemapBuffer - ldr r1, [r4] - ldr r0, =0x000020fc - adds r1, r0 - movs r0, 0x2 - bl SetBgTilemapBuffer - ldr r1, [r4] - ldr r2, =0x000030fc - adds r1, r2 - movs r0, 0x3 - bl SetBgTilemapBuffer - ldr r2, =gSpriteCoordOffsetX - ldr r1, =gSpriteCoordOffsetY - movs r0, 0 - strh r0, [r1] - strh r0, [r2] - ldr r1, =gMain - movs r3, 0x87 - lsls r3, 3 - adds r1, r3 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_0814FE90: - movs r4, 0 - add r5, sp, 0x14 - ldr r6, =gUnknown_085CDB54 -_0814FE96: - lsls r0, r4, 3 - adds r0, r6 - bl LoadCompressedObjectPic - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _0814FE96 - ldr r0, =gUnknown_085CDB74 - bl LoadSpritePalettes - ldr r0, =gCableCarMtChimneyTilemap - adds r1, r5, 0 - bl malloc_and_decompress - ldr r4, =gUnknown_0203ABAC - ldr r1, [r4] - ldr r2, =0x000040fc - adds r1, r2 - str r0, [r1] - ldr r0, =gCableCarTreeTilemap - adds r1, r5, 0 - bl malloc_and_decompress - ldr r1, [r4] - movs r3, 0x82 - lsls r3, 7 - adds r1, r3 - str r0, [r1] - ldr r0, =gCableCarMountainTilemap - adds r1, r5, 0 - bl malloc_and_decompress - ldr r1, [r4] - ldr r2, =0x00004104 - adds r1, r2 - str r0, [r1] - ldr r0, =gCableCarPylonStemTilemap - adds r1, r5, 0 - bl malloc_and_decompress - ldr r1, [r4] - ldr r3, =0x0000410c - adds r2, r1, r3 - str r0, [r2] - ldr r0, =0x00004108 - adds r1, r0 - ldr r0, =gCableCarPylonHookTilemapEntries - str r0, [r1] - ldr r1, =gUnknown_08DBA5B8 - movs r0, 0 - str r0, [sp] - movs r2, 0 - movs r3, 0 - bl decompress_and_copy_tile_data_to_vram - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_0814FF50: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - cmp r0, 0 - beq _0814FF5C - b _08150226 -_0814FF5C: - ldr r0, =gUnknown_08DBA518 - movs r1, 0 - movs r2, 0x80 - bl LoadPalette - ldr r1, =gMain - movs r3, 0x87 - lsls r3, 3 - adds r1, r3 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_0814FF7C: - bl sub_8150D28 - bl RunTasks - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_0814FF98: - ldr r0, =gUnknown_0203ABAC - ldr r0, [r0] - ldrb r0, [r0, 0x2] - cmp r0, 0x7 - bne _0814FFB4 - movs r2, 0x87 - lsls r2, 3 - adds r1, r6, r2 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_0814FFB4: - ldr r0, =gWeatherPtr - ldr r0, [r0] - adds r1, r0, 0 - adds r1, 0xF0 - ldr r0, [r1] - cmp r0, 0 - bne _0814FFC4 - b _08150226 -_0814FFC4: - movs r4, 0 - adds r3, r1, 0 - movs r5, 0xD - negs r5, r5 -_0814FFCC: - lsls r0, r4, 2 - adds r0, r3, r0 - ldr r2, [r0] - cmp r2, 0 - beq _0814FFDE - ldrb r1, [r2, 0x5] - adds r0, r5, 0 - ands r0, r1 - strb r0, [r2, 0x5] -_0814FFDE: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _0814FFCC - movs r3, 0x87 - lsls r3, 3 - adds r1, r6, r3 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_0814FFF8: - ldr r6, =gUnknown_0203ABAC - ldr r0, [r6] - movs r1, 0x82 - lsls r1, 7 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x20 - str r0, [sp] - movs r0, 0xF - str r0, [sp, 0x4] - movs r5, 0x11 - str r5, [sp, 0x8] - movs r0, 0x1 - movs r2, 0 - movs r3, 0x11 - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r0, [r6] - ldr r2, =0x00004104 - adds r0, r2 - ldr r1, [r0] - movs r0, 0x1E - str r0, [sp] - movs r3, 0x14 - mov r8, r3 - str r3, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r0, [r6] - ldr r1, =0x00004108 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x5 - str r0, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x3 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r0, [r6] - ldr r2, =0x0000410c - adds r0, r2 - ldr r1, [r0] - str r4, [sp] - mov r3, r8 - str r3, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x3 - movs r2, 0 - movs r3, 0x2 - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_08150090: - ldr r0, =gSpecialVar_0x8004 - ldrb r0, [r0] - bl sub_81514C8 - ldr r1, =gUnknown_0203ABAC - mov r9, r1 - ldr r0, [r1] - ldr r2, =0x000040fc - mov r8, r2 - add r0, r8 - ldr r1, [r0] - adds r1, 0x90 - movs r6, 0xC - str r6, [sp] - movs r5, 0x3 - str r5, [sp, 0x4] - movs r4, 0x11 - str r4, [sp, 0x8] - movs r0, 0 - movs r2, 0 - movs r3, 0xE - bl CopyToBgTilemapBufferRect_ChangePalette - mov r3, r9 - ldr r0, [r3] - add r0, r8 - ldr r1, [r0] - adds r1, 0xD8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r2, 0xC - movs r3, 0x11 - bl CopyToBgTilemapBufferRect_ChangePalette - mov r1, r9 - ldr r0, [r1] - add r0, r8 - ldr r1, [r0] - movs r2, 0x90 - lsls r2, 1 - adds r1, r2 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r2, 0x18 - movs r3, 0x14 - bl CopyToBgTilemapBufferRect_ChangePalette - mov r3, r9 - ldr r0, [r3] - add r0, r8 - ldr r1, [r0] - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r2, 0 - movs r3, 0x11 - bl CopyToBgTilemapBufferRect_ChangePalette - mov r1, r9 - ldr r0, [r1] - add r0, r8 - ldr r1, [r0] - adds r1, 0x48 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r2, 0 - movs r3, 0x14 - bl CopyToBgTilemapBufferRect_ChangePalette - mov r2, r9 - ldr r0, [r2] - add r0, r8 - ldr r1, [r0] - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r2, 0xC - movs r3, 0x14 - bl CopyToBgTilemapBufferRect_ChangePalette - mov r3, r9 - ldr r0, [r3] - add r0, r8 - ldr r1, [r0] - adds r1, 0x48 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r2, 0xC - movs r3, 0x17 - bl CopyToBgTilemapBufferRect_ChangePalette - mov r1, r9 - ldr r0, [r1] - add r0, r8 - ldr r1, [r0] - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r2, 0x18 - movs r3, 0x17 - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_08150190: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r1, 0x3 - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r0, =0x000001a9 - movs r1, 0x1 - bl FadeInNewBGM - movs r0, 0x1 - bl sub_8150B6C - ldr r1, =gMain - movs r3, 0x87 - lsls r3, 3 - adds r1, r3 - ldrb r0, [r1] - adds r0, 0x1 - b _08150224 - .pool -_081501C8: - ldr r3, =0x04000208 - ldrh r2, [r3] - movs r0, 0 - strh r0, [r3] - ldr r4, =0x04000200 - ldrh r0, [r4] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r4] - strh r2, [r3] - ldr r0, =sub_8150800 - bl SetVBlankCallback - ldr r0, =mainloop - bl SetMainCallback2 - ldr r0, =sub_81503E4 - movs r1, 0 - bl CreateTask - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08150218 - ldr r0, =sub_8150550 - b _0815021A - .pool -_08150218: - ldr r0, =sub_8150664 -_0815021A: - movs r1, 0x1 - bl CreateTask - ldr r1, =gUnknown_0203ABAC - ldr r1, [r1] -_08150224: - strb r0, [r1] -_08150226: - add sp, 0x18 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_814FCC8 - - thumb_func_start mainloop -mainloop: @ 815023C - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - bl MapMusicMain - pop {r0} - bx r0 - thumb_func_end mainloop - - thumb_func_start c2_8011A1C -c2_8011A1C: @ 8150258 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r4, 0 - movs r0, 0 - bl HideBg - movs r0, 0x1 - bl HideBg - movs r0, 0x2 - bl HideBg - movs r0, 0x3 - bl HideBg - movs r0, 0 - bl sub_8150B6C - ldr r0, =gSpriteCoordOffsetX - strh r4, [r0] - movs r0, 0 - bl sub_80AB130 - add r0, sp, 0x4 - mov r8, r0 - ldr r0, =gWeatherPtr - ldr r0, [r0] - adds r1, r0, 0 - adds r1, 0xF0 - movs r2, 0 -_08150298: - lsls r0, r4, 2 - adds r0, r1, r0 - str r2, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _08150298 - bl ResetTasks - bl ResetSpriteData - bl ResetPaletteFade - movs r0, 0 - bl UnsetBgTilemapBuffer - movs r0, 0x1 - bl UnsetBgTilemapBuffer - movs r0, 0x2 - bl UnsetBgTilemapBuffer - movs r0, 0x3 - bl UnsetBgTilemapBuffer - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r6, =gUnknown_0203ABAC - ldr r0, [r6] - ldr r2, =0x00004108 - adds r1, r0, r2 - movs r5, 0 - str r5, [r1] - ldr r4, =0x0000410c - adds r0, r4 - ldr r0, [r0] - bl Free - ldr r0, [r6] - adds r4, r0, r4 - str r5, [r4] - ldr r4, =0x00004104 - adds r0, r4 - ldr r0, [r0] - bl Free - ldr r0, [r6] - adds r4, r0, r4 - str r5, [r4] - movs r4, 0x82 - lsls r4, 7 - adds r0, r4 - ldr r0, [r0] - bl Free - ldr r0, [r6] - adds r4, r0, r4 - str r5, [r4] - ldr r4, =0x000040fc - adds r0, r4 - ldr r0, [r0] - bl Free - ldr r0, [r6] - adds r4, r0, r4 - str r5, [r4] - bl Free - str r5, [r6] - movs r2, 0xC0 - lsls r2, 19 - movs r3, 0xC0 - lsls r3, 9 - mov r4, sp - movs r6, 0 - ldr r1, =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r7, =0x81000800 - movs r0, 0x81 - lsls r0, 24 - mov r12, r0 -_08150340: - strh r6, [r4] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - str r7, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r2, r5 - subs r3, r5 - cmp r3, r5 - bhi _08150340 - strh r6, [r4] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - lsrs r0, r3, 1 - mov r2, r12 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 19 - movs r3, 0x80 - lsls r3, 3 - movs r4, 0 - str r4, [sp, 0x4] - ldr r2, =0x040000d4 - mov r1, r8 - str r1, [r2] - str r0, [r2, 0x4] - lsrs r0, r3, 2 - movs r1, 0x85 - lsls r1, 24 - orrs r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r1, 0xA0 - lsls r1, 19 - mov r0, sp - strh r4, [r0] - str r0, [r2] - str r1, [r2, 0x4] - lsrs r3, 1 - movs r0, 0x81 - lsls r0, 24 - orrs r3, r0 - str r3, [r2, 0x8] - ldr r0, [r2, 0x8] - bl WarpIntoMap - ldr r0, =gFieldCallback - str r4, [r0] - ldr r0, =CB2_LoadMap - bl SetMainCallback2 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end c2_8011A1C - - thumb_func_start sub_81503E4 -sub_81503E4: @ 81503E4 - push {r4-r7,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r6, r0, 24 - movs r4, 0 - ldr r5, =gUnknown_0203ABAC - ldr r3, [r5] - ldrh r0, [r3, 0x6] - adds r0, 0x1 - strh r0, [r3, 0x6] - ldrb r2, [r3, 0x1] - adds r7, r5, 0 - cmp r2, 0x2 - beq _081504EA - cmp r2, 0x2 - bgt _08150414 - cmp r2, 0 - beq _08150422 - cmp r2, 0x1 - beq _0815043C - b _08150542 - .pool -_08150414: - cmp r2, 0x3 - bne _0815041A - b _08150510 -_0815041A: - cmp r2, 0xFF - bne _08150420 - b _08150528 -_08150420: - b _08150542 -_08150422: - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r3, 0x4] - cmp r0, r1 - beq _0815042E - b _08150542 -_0815042E: - ldrb r0, [r3, 0x2] - bl ChangeWeather - ldr r1, [r5] - movs r0, 0x1 - strb r0, [r1, 0x1] - b _08150542 -_0815043C: - ldrb r0, [r3, 0x2] - cmp r0, 0x2 - beq _08150490 - cmp r0, 0x7 - beq _08150448 - b _08150542 -_08150448: - ldr r0, =gWeatherPtr - ldr r0, [r0] - adds r2, r0, 0 - adds r2, 0xF0 - ldr r0, [r2] - cmp r0, 0 - beq _08150542 - ldrb r1, [r0, 0x5] - movs r0, 0xC - ands r0, r1 - cmp r0, 0 - beq _08150542 - adds r3, r2, 0 - movs r5, 0xD - negs r5, r5 -_08150466: - lsls r0, r4, 2 - adds r0, r3, r0 - ldr r2, [r0] - cmp r2, 0 - beq _08150478 - ldrb r1, [r2, 0x5] - adds r0, r5, 0 - ands r0, r1 - strb r0, [r2, 0x5] -_08150478: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _08150466 - ldr r1, [r7] - movs r0, 0x2 - strb r0, [r1, 0x1] - b _08150542 - .pool -_08150490: - ldr r0, =gWeatherPtr - ldr r2, [r0] - movs r1, 0xDA - lsls r1, 3 - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0x2 - bne _081504A8 - strb r0, [r3, 0x1] - b _08150542 - .pool -_081504A8: - ldrh r1, [r3, 0x6] - ldrh r0, [r3, 0x4] - adds r0, 0x8 - cmp r1, r0 - blt _08150542 - adds r6, r2, 0 - adds r6, 0xF0 - movs r5, 0x1 - movs r7, 0x5 - negs r7, r7 -_081504BC: - lsls r0, r4, 2 - adds r0, r6, r0 - ldr r0, [r0] - cmp r0, 0 - beq _081504DE - adds r3, r0, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r1, r2, 29 - lsrs r1, 31 - eors r1, r5 - ands r1, r5 - lsls r1, 2 - adds r0, r7, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_081504DE: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _081504BC - b _08150542 -_081504EA: - lsls r1, r0, 16 - ldr r0, =0x023a0000 - cmp r1, r0 - bne _08150542 - movs r0, 0x3 - strb r0, [r3, 0x1] - subs r0, 0x4 - str r4, [sp] - movs r1, 0x3 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - movs r0, 0x4 - bl FadeOutBGM - b _08150542 - .pool -_08150510: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08150542 - movs r0, 0xFF - strb r0, [r3, 0x1] - b _08150542 - .pool -_08150528: - movs r0, 0 - bl SetVBlankCallback - adds r0, r6, 0 - bl DestroyTask - ldr r0, [r5] - ldrb r0, [r0] - bl DestroyTask - ldr r0, =c2_8011A1C - bl SetMainCallback2 -_08150542: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81503E4 - - thumb_func_start sub_8150550 -sub_8150550: @ 8150550 - push {r4-r6,lr} - sub sp, 0xC - ldr r6, =gUnknown_0203ABAC - ldr r1, [r6] - ldrb r0, [r1, 0x1] - cmp r0, 0xFF - beq _08150630 - ldrb r0, [r1, 0x14] - subs r0, 0x1 - strb r0, [r1, 0x14] - ldr r1, [r6] - ldrh r0, [r1, 0x6] - movs r3, 0x1 - ands r0, r3 - cmp r0, 0 - bne _08150576 - ldrb r0, [r1, 0x15] - subs r0, 0x1 - strb r0, [r1, 0x15] -_08150576: - ldr r2, [r6] - ldrh r0, [r2, 0x6] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - bne _08150590 - ldrb r0, [r2, 0xC] - subs r0, 0x1 - strb r0, [r2, 0xC] - ldr r1, [r6] - ldrb r0, [r1, 0xD] - subs r0, 0x1 - strb r0, [r1, 0xD] -_08150590: - ldr r0, [r6] - ldrb r1, [r0, 0x14] - cmp r1, 0x20 - beq _081505DC - cmp r1, 0x20 - bgt _081505A8 - cmp r1, 0x10 - beq _081505F4 - b _08150630 - .pool -_081505A8: - cmp r1, 0x28 - beq _081505CA - cmp r1, 0xAF - bne _08150630 - movs r0, 0x2 - str r0, [sp] - movs r0, 0xA - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0x16 - bl FillBgTilemapBufferRect - b _08150630 -_081505CA: - movs r0, 0x2 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0x3 - movs r1, 0 - movs r2, 0x3 - b _081505EC -_081505DC: - str r3, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0x3 - movs r1, 0 - movs r2, 0x2 -_081505EC: - movs r3, 0 - bl FillBgTilemapBufferRect - b _08150630 -_081505F4: - ldr r1, =0x00004108 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x5 - str r0, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - movs r5, 0x11 - str r5, [sp, 0x8] - movs r0, 0x3 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r0, [r6] - ldr r1, =0x0000410c - adds r0, r1 - ldr r1, [r0] - str r4, [sp] - movs r0, 0x1E - str r0, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x3 - movs r2, 0 - movs r3, 0x2 - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r1, [r6] - movs r0, 0x40 - strb r0, [r1, 0x15] -_08150630: - bl sub_815115C - ldr r3, =gSpriteCoordOffsetX - movs r0, 0 - ldrsh r2, [r3, r0] - adds r1, r2, 0x1 - adds r0, r1, 0 - cmp r1, 0 - bge _08150646 - adds r0, r2, 0 - adds r0, 0x80 -_08150646: - asrs r0, 7 - lsls r0, 7 - subs r0, r1, r0 - strh r0, [r3] - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8150550 - - thumb_func_start sub_8150664 -sub_8150664: @ 8150664 - push {r4-r7,lr} - sub sp, 0xC - ldr r7, =gUnknown_0203ABAC - ldr r1, [r7] - ldrb r0, [r1, 0x1] - cmp r0, 0xFF - bne _08150674 - b _081507B6 -_08150674: - ldrb r0, [r1, 0x14] - adds r0, 0x1 - strb r0, [r1, 0x14] - ldr r1, [r7] - ldrh r0, [r1, 0x6] - movs r6, 0x1 - ands r0, r6 - cmp r0, 0 - bne _0815068C - ldrb r0, [r1, 0x15] - adds r0, 0x1 - strb r0, [r1, 0x15] -_0815068C: - ldr r2, [r7] - ldrh r0, [r2, 0x6] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - bne _081506A6 - ldrb r0, [r2, 0xC] - adds r0, 0x1 - strb r0, [r2, 0xC] - ldr r1, [r7] - ldrb r0, [r1, 0xD] - adds r0, 0x1 - strb r0, [r1, 0xD] -_081506A6: - ldr r0, [r7] - ldrb r1, [r0, 0x14] - cmp r1, 0x20 - beq _0815071A - cmp r1, 0x20 - bgt _081506BC - cmp r1, 0x10 - beq _081506E8 - b _081507B6 - .pool -_081506BC: - cmp r1, 0x28 - beq _08150784 - cmp r1, 0xB0 - bne _081507B6 - ldr r1, =0x0000410c - adds r0, r1 - ldr r1, [r0] - movs r0, 0x2 - str r0, [sp] - movs r0, 0x1E - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0x3 - movs r2, 0 - movs r3, 0x2 - bl CopyToBgTilemapBufferRect_ChangePalette - b _081507B6 - .pool -_081506E8: - movs r0, 0x3 - str r0, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - movs r5, 0x11 - str r5, [sp, 0x8] - movs r1, 0 - movs r2, 0x2 - movs r3, 0 - bl FillBgTilemapBufferRect - str r4, [sp] - movs r0, 0xA - str r0, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - movs r3, 0x16 - bl FillBgTilemapBufferRect - ldr r1, [r7] - movs r0, 0xC0 - strb r0, [r1, 0x15] - b _081507B6 -_0815071A: - ldr r5, =0x00004108 - adds r0, r5 - ldr r0, [r0] - ldrh r1, [r0, 0x4] - str r6, [sp] - str r6, [sp, 0x4] - movs r4, 0x11 - str r4, [sp, 0x8] - movs r0, 0x3 - movs r2, 0x2 - movs r3, 0 - bl FillBgTilemapBufferRect - ldr r0, [r7] - adds r0, r5 - ldr r0, [r0] - ldrh r1, [r0, 0x6] - str r6, [sp] - str r6, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x3 - movs r2, 0x3 - movs r3, 0 - bl FillBgTilemapBufferRect - ldr r0, [r7] - adds r0, r5 - ldr r0, [r0] - ldrh r1, [r0, 0xE] - str r6, [sp] - str r6, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x3 - movs r2, 0x2 - movs r3, 0x1 - bl FillBgTilemapBufferRect - ldr r0, [r7] - adds r0, r5 - ldr r0, [r0] - ldrh r1, [r0, 0x10] - str r6, [sp] - str r6, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x3 - movs r2, 0x3 - movs r3, 0x1 - bl FillBgTilemapBufferRect - b _081507B6 - .pool -_08150784: - ldr r5, =0x00004108 - adds r0, r5 - ldr r0, [r0] - ldrh r1, [r0, 0x8] - str r6, [sp] - str r6, [sp, 0x4] - movs r4, 0x11 - str r4, [sp, 0x8] - movs r0, 0x3 - movs r2, 0x4 - movs r3, 0 - bl FillBgTilemapBufferRect - ldr r0, [r7] - adds r0, r5 - ldr r0, [r0] - ldrh r1, [r0, 0x12] - str r6, [sp] - str r6, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x3 - movs r2, 0x4 - movs r3, 0x1 - bl FillBgTilemapBufferRect -_081507B6: - bl sub_81511B8 - ldr r0, =gUnknown_0203ABAC - ldr r1, [r0] - ldrh r0, [r1, 0x6] - ldrh r1, [r1, 0x4] - cmp r0, r1 - bcs _081507DC - ldr r4, =gSpriteCoordOffsetX - movs r1, 0 - ldrsh r0, [r4, r1] - b _081507E6 - .pool -_081507DC: - ldr r0, =gWeatherPtr - ldr r4, [r0] - ldr r0, =0x000006fc - adds r4, r0 - ldrh r0, [r4] -_081507E6: - adds r0, 0xF7 - movs r1, 0xF8 - bl __modsi3 - strh r0, [r4] - add sp, 0xC - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8150664 - - thumb_func_start sub_8150800 -sub_8150800: @ 8150800 - push {r4,lr} - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x3 - bl CopyBgTilemapBufferToVram - ldr r4, =gUnknown_0203ABAC - ldr r0, [r4] - ldrb r1, [r0, 0x14] - movs r0, 0x1C - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0x15] - movs r0, 0x1E - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0xC] - movs r0, 0x14 - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0xD] - movs r0, 0x16 - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0x8] - movs r0, 0x10 - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0x9] - movs r0, 0x12 - bl SetGpuReg - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8150800 - - thumb_func_start nullsub_58 -nullsub_58: @ 8150864 - bx lr - thumb_func_end nullsub_58 - - thumb_func_start sub_8150868 -sub_8150868: @ 8150868 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, =gUnknown_0203ABAC - ldr r6, [r0] - ldrb r0, [r6, 0x1] - cmp r0, 0xFF - beq _08150934 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _081508E4 - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08150892 - ldr r1, =0x47800000 - bl __addsf3 -_08150892: - ldr r1, =0x3e0f5c29 - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x2E] - subs r1, r0 - strh r1, [r5, 0x20] - movs r1, 0x6 - ldrsh r4, [r6, r1] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _081508BA - ldr r1, =0x47800000 - bl __addsf3 -_081508BA: - ldr r1, =0x3d89374c - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x30] - subs r1, r0 - strh r1, [r5, 0x22] - b _08150934 - .pool -_081508E4: - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _081508F8 - ldr r1, =0x47800000 - bl __addsf3 -_081508F8: - ldr r1, =0x3e0f5c29 - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x2E] - adds r0, r1 - strh r0, [r5, 0x20] - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08150920 - ldr r1, =0x47800000 - bl __addsf3 -_08150920: - ldr r1, =0x3d89374c - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x30] - adds r0, r1 - strh r0, [r5, 0x22] -_08150934: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8150868 - - thumb_func_start sub_8150948 -sub_8150948: @ 8150948 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, =gUnknown_0203ABAC - ldr r6, [r0] - ldrb r0, [r6, 0x1] - cmp r0, 0xFF - bne _08150958 - b _08150A60 -_08150958: - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _081509C8 - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08150974 - ldr r1, =0x47800000 - bl __addsf3 -_08150974: - ldr r1, =0x3e0f5c29 - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x2E] - subs r1, r0 - strh r1, [r5, 0x20] - movs r1, 0x6 - ldrsh r4, [r6, r1] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _0815099C - ldr r1, =0x47800000 - bl __addsf3 -_0815099C: - ldr r1, =0x3d89374c - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x30] - subs r1, r0 - strh r1, [r5, 0x22] - b _08150A18 - .pool -_081509C8: - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _081509DC - ldr r1, =0x47800000 - bl __addsf3 -_081509DC: - ldr r1, =0x3e0f5c29 - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x2E] - adds r0, r1 - strh r0, [r5, 0x20] - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08150A04 - ldr r1, =0x47800000 - bl __addsf3 -_08150A04: - ldr r1, =0x3d89374c - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x30] - adds r0, r1 - strh r0, [r5, 0x22] -_08150A18: - movs r0, 0x32 - ldrsh r2, [r5, r0] - cmp r2, 0 - bne _08150A48 - movs r0, 0x11 - strh r0, [r5, 0x26] - ldrh r0, [r5, 0x34] - adds r1, r0, 0x1 - strh r1, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - ble _08150A60 - strh r2, [r5, 0x34] - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - b _08150A60 - .pool -_08150A48: - movs r2, 0 - movs r0, 0x10 - strh r0, [r5, 0x26] - ldrh r0, [r5, 0x34] - adds r1, r0, 0x1 - strh r1, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - ble _08150A60 - strh r2, [r5, 0x34] - strh r2, [r5, 0x32] -_08150A60: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8150948 - - thumb_func_start sub_8150A68 -sub_8150A68: @ 8150A68 - push {lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0 - bne _08150A98 - adds r0, r2, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 1 - ldrh r3, [r2, 0x20] - adds r0, r3 - strh r0, [r2, 0x20] - ldrh r1, [r2, 0x22] - adds r1, 0x10 - adds r0, r2, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - strh r0, [r2, 0x22] -_08150A98: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x32 - ldrsh r1, [r2, r3] - cmp r0, r1 - blt _08150AEE - movs r0, 0x30 - ldrsh r1, [r2, r0] - cmp r1, 0 - beq _08150AB8 - cmp r1, 0x1 - beq _08150AC2 - b _08150AE0 -_08150AB8: - ldrh r0, [r2, 0x20] - adds r0, 0x1 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x2E] - b _08150AD2 -_08150AC2: - ldrh r0, [r2, 0x2E] - ands r0, r1 - cmp r0, 0 - beq _08150AE0 - ldrh r0, [r2, 0x20] - adds r0, 0x1 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x20] -_08150AD2: - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08150AE0 - ldrh r0, [r2, 0x22] - adds r0, 0x1 - strh r0, [r2, 0x22] -_08150AE0: - movs r1, 0x22 - ldrsh r0, [r2, r1] - cmp r0, 0xA0 - ble _08150AEE - adds r0, r2, 0 - bl DestroySprite -_08150AEE: - pop {r0} - bx r0 - thumb_func_end sub_8150A68 - - thumb_func_start sub_8150AF4 -sub_8150AF4: @ 8150AF4 - push {lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0 - bne _08150B12 - ldrh r1, [r2, 0x22] - adds r1, 0x10 - adds r0, r2, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - strh r0, [r2, 0x22] -_08150B12: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x32 - ldrsh r1, [r2, r3] - cmp r0, r1 - blt _08150B68 - movs r0, 0x30 - ldrsh r1, [r2, r0] - cmp r1, 0 - beq _08150B32 - cmp r1, 0x1 - beq _08150B3C - b _08150B5A -_08150B32: - ldrh r0, [r2, 0x20] - subs r0, 0x1 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x2E] - b _08150B4C -_08150B3C: - ldrh r0, [r2, 0x2E] - ands r0, r1 - cmp r0, 0 - beq _08150B5A - ldrh r0, [r2, 0x20] - subs r0, 0x1 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x20] -_08150B4C: - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08150B5A - ldrh r0, [r2, 0x22] - subs r0, 0x1 - strh r0, [r2, 0x22] -_08150B5A: - movs r1, 0x22 - ldrsh r0, [r2, r1] - cmp r0, 0x4F - bgt _08150B68 - adds r0, r2, 0 - bl DestroySprite -_08150B68: - pop {r0} - bx r0 - thumb_func_end sub_8150AF4 - - thumb_func_start sub_8150B6C -sub_8150B6C: @ 8150B6C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _08150B7A - cmp r0, 0x1 - beq _08150C1C -_08150B7A: - movs r0, 0x48 - movs r1, 0 - bl SetGpuReg - movs r0, 0x4A - movs r1, 0 - bl SetGpuReg - movs r0, 0x40 - movs r1, 0 - bl SetGpuReg - movs r0, 0x42 - movs r1, 0 - bl SetGpuReg - movs r0, 0x44 - movs r1, 0 - bl SetGpuReg - movs r0, 0x46 - movs r1, 0 - bl SetGpuReg - movs r0, 0 - movs r1, 0 - bl SetGpuReg - movs r0, 0xE - movs r1, 0 - bl SetGpuReg - movs r0, 0xC - movs r1, 0 - bl SetGpuReg - movs r0, 0xA - movs r1, 0 - bl SetGpuReg - movs r0, 0x8 - movs r1, 0 - bl SetGpuReg - movs r0, 0x1C - movs r1, 0 - bl SetGpuReg - movs r0, 0x1E - movs r1, 0 - bl SetGpuReg - movs r0, 0x18 - movs r1, 0 - bl SetGpuReg - movs r0, 0x1A - movs r1, 0 - bl SetGpuReg - movs r0, 0x14 - movs r1, 0 - bl SetGpuReg - movs r0, 0x16 - movs r1, 0 - bl SetGpuReg - movs r0, 0x10 - movs r1, 0 - bl SetGpuReg - movs r0, 0x12 - movs r1, 0 - bl SetGpuReg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - b _08150D1C -_08150C1C: - movs r0, 0x48 - movs r1, 0 - bl SetGpuReg - movs r0, 0x4A - movs r1, 0 - bl SetGpuReg - movs r0, 0x40 - movs r1, 0 - bl SetGpuReg - movs r0, 0x42 - movs r1, 0 - bl SetGpuReg - movs r0, 0x44 - movs r1, 0 - bl SetGpuReg - movs r0, 0x46 - movs r1, 0 - bl SetGpuReg - ldr r0, =gSpecialVar_0x8004 - ldrh r3, [r0] - cmp r3, 0 - bne _08150C74 - ldr r1, =gUnknown_0203ABAC - ldr r2, [r1] - movs r0, 0xB0 - strb r0, [r2, 0x14] - ldr r2, [r1] - movs r0, 0x10 - strb r0, [r2, 0x15] - ldr r0, [r1] - strb r3, [r0, 0xC] - ldr r2, [r1] - movs r0, 0x50 - b _08150C8C - .pool -_08150C74: - ldr r1, =gUnknown_0203ABAC - ldr r2, [r1] - movs r3, 0 - movs r0, 0x60 - strb r0, [r2, 0x14] - ldr r2, [r1] - movs r0, 0xE8 - strb r0, [r2, 0x15] - ldr r0, [r1] - strb r3, [r0, 0xC] - ldr r2, [r1] - movs r0, 0x4 -_08150C8C: - strb r0, [r2, 0xD] - ldr r0, [r1] - strb r3, [r0, 0x9] - ldr r0, [r1] - strb r3, [r0, 0x9] - adds r4, r1, 0 - ldr r0, [r4] - ldrb r1, [r0, 0x14] - movs r0, 0x1C - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0x15] - movs r0, 0x1E - bl SetGpuReg - movs r0, 0x18 - movs r1, 0 - bl SetGpuReg - movs r0, 0x1A - movs r1, 0 - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0xC] - movs r0, 0x14 - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0xD] - movs r0, 0x16 - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0x8] - movs r0, 0x10 - bl SetGpuReg - ldr r0, [r4] - ldrb r1, [r0, 0x9] - movs r0, 0x12 - bl SetGpuReg - movs r1, 0x82 - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - movs r0, 0 - bl ShowBg - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - movs r0, 0x3 - bl ShowBg - movs r1, 0xFC - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg -_08150D1C: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8150B6C - - thumb_func_start sub_8150D28 -sub_8150D28: @ 8150D28 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x28 - ldr r1, =gCableCarPlayerGraphicsIDs - add r0, sp, 0xC - movs r2, 0x2 - bl memcpy - bl Random - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - add r6, sp, 0x10 - ldr r1, =gMtChimneyHikerGraphicsIDs - adds r0, r6, 0 - movs r2, 0x4 - bl memcpy - add r5, sp, 0x14 - ldr r1, =gMtChimneyHikerCoords - adds r0, r5, 0 - movs r2, 0x8 - bl memcpy - add r4, sp, 0x1C - ldr r1, =gMtChimneyHikerMovementDelayTable - adds r0, r4, 0 - movs r2, 0x4 - bl memcpy - ldr r0, =gUnknown_085CDBF8 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x20] - str r1, [sp, 0x24] - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - mov r8, r6 - mov r10, r5 - cmp r0, 0 - beq _08150D86 - cmp r0, 0x1 - beq _08150E68 -_08150D86: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - add r0, sp - adds r0, 0xC - ldrb r0, [r0] - ldr r1, =sub_8150948 - movs r2, 0x66 - str r2, [sp] - movs r2, 0xC8 - movs r3, 0x49 - bl AddPseudoEventObject - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _08150DD0 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - movs r2, 0x8 - orrs r0, r2 - strb r0, [r1, 0x5] - movs r0, 0x8 - strh r0, [r1, 0x24] - movs r0, 0x10 - strh r0, [r1, 0x26] - movs r0, 0xC8 - strh r0, [r1, 0x2E] - movs r0, 0x49 - strh r0, [r1, 0x30] -_08150DD0: - ldr r4, =gSpriteTemplate_85CDB9C - adds r0, r4, 0 - movs r1, 0xB0 - movs r2, 0x2B - movs r3, 0x67 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - ldr r5, =gSprites - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x20 - strh r1, [r0, 0x26] - strh r1, [r0, 0x24] - movs r1, 0xB0 - strh r1, [r0, 0x2E] - movs r1, 0x2B - strh r1, [r0, 0x30] - adds r4, 0x18 - adds r0, r4, 0 - movs r1, 0xC8 - movs r2, 0x63 - movs r3, 0x65 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x8 - strh r1, [r0, 0x24] - movs r1, 0x4 - strh r1, [r0, 0x26] - movs r1, 0xC8 - strh r1, [r0, 0x2E] - movs r1, 0x63 - strh r1, [r0, 0x30] - ldr r2, =gUnknown_0203ABAC - ldr r1, [r2] - movs r0, 0x7 - strb r0, [r1, 0x2] - ldr r1, [r2] - movs r0, 0xAF - lsls r0, 1 - strh r0, [r1, 0x4] - movs r0, 0x2 - bl sub_80AB130 - b _08150F3A - .pool -_08150E68: - ldr r7, =gUnknown_0203ABAC - ldr r0, [r7] - ldr r1, =0x000040fc - adds r0, r1 - ldr r1, [r0] - adds r1, 0x48 - movs r0, 0xC - str r0, [sp] - movs r0, 0x3 - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0 - movs r2, 0x18 - movs r3, 0x1A - bl CopyToBgTilemapBufferRect_ChangePalette - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - add r0, sp - adds r0, 0xC - ldrb r0, [r0] - ldr r1, =sub_8150948 - movs r2, 0x66 - str r2, [sp] - movs r2, 0x80 - movs r3, 0x27 - bl AddPseudoEventObject - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _08150ED4 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - movs r2, 0x8 - orrs r0, r2 - strb r0, [r1, 0x5] - movs r0, 0x8 - strh r0, [r1, 0x24] - movs r0, 0x10 - strh r0, [r1, 0x26] - movs r0, 0x80 - strh r0, [r1, 0x2E] - movs r0, 0x27 - strh r0, [r1, 0x30] -_08150ED4: - ldr r4, =gSpriteTemplate_85CDB9C - adds r0, r4, 0 - movs r1, 0x68 - movs r2, 0x9 - movs r3, 0x67 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - ldr r5, =gSprites - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x20 - strh r1, [r0, 0x26] - strh r1, [r0, 0x24] - movs r1, 0x68 - strh r1, [r0, 0x2E] - movs r1, 0x9 - strh r1, [r0, 0x30] - adds r4, 0x18 - adds r0, r4, 0 - movs r1, 0x80 - movs r2, 0x41 - movs r3, 0x65 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x8 - strh r1, [r0, 0x24] - movs r1, 0x4 - strh r1, [r0, 0x26] - movs r1, 0x80 - strh r1, [r0, 0x2E] - movs r1, 0x41 - strh r1, [r0, 0x30] - ldr r1, [r7] - movs r0, 0x2 - strb r0, [r1, 0x2] - ldr r1, [r7] - ldr r0, =0x00000109 - strh r0, [r1, 0x4] - movs r0, 0x7 - bl sub_80AB130 -_08150F3A: - movs r4, 0 - ldr r5, =gSprites -_08150F3E: - lsls r1, r4, 20 - movs r2, 0xC0 - lsls r2, 15 - adds r1, r2 - asrs r1, 16 - lsls r2, r4, 19 - ldr r3, =0xfff80000 - adds r2, r3 - asrs r2, 16 - ldr r0, =gSpriteTemplate_85CDBCC - movs r3, 0x68 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x8 - strh r1, [r0, 0x24] - strh r1, [r0, 0x26] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x8 - bls _08150F3E - movs r0, 0x3F - mov r4, r9 - ands r0, r4 - cmp r0, 0 - bne _08151074 - mov r0, r9 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - add r0, r8 - ldrb r0, [r0] - ldr r5, =gSpecialVar_0x8004 - ldrh r4, [r5] - lsls r4, 2 - add r1, sp, 0x20 - adds r1, r4, r1 - ldr r1, [r1] - mov r3, r10 - adds r2, r3, r4 - movs r3, 0 - ldrsh r2, [r2, r3] - mov r3, sp - adds r3, 0x16 - adds r3, r4 - movs r4, 0 - ldrsh r3, [r3, r4] - movs r4, 0x6A - str r4, [sp] - bl AddPseudoEventObject - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _08151074 - ldr r1, =gSprites - lsls r2, r6, 4 - adds r0, r2, r6 - lsls r0, 2 - adds r4, r0, r1 - ldrb r1, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r4, 0x5] - adds r0, r4, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - negs r0, r0 - strh r0, [r4, 0x24] - adds r0, r4, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - negs r0, r0 - strh r0, [r4, 0x26] - ldrh r0, [r5] - mov r8, r2 - cmp r0, 0 - bne _08151036 - movs r7, 0x1 - mov r5, r9 - ands r5, r7 - cmp r5, 0 - beq _08151030 - adds r0, r4, 0 - movs r1, 0x6 - b _08151044 - .pool -_08151030: - adds r0, r4, 0 - movs r1, 0x7 - b _08151056 -_08151036: - movs r7, 0x1 - mov r5, r9 - ands r5, r7 - cmp r5, 0 - beq _08151052 - adds r0, r4, 0 - movs r1, 0x7 -_08151044: - bl StartSpriteAnim - strh r7, [r4, 0x30] - ldrh r0, [r4, 0x22] - adds r0, 0x2 - strh r0, [r4, 0x22] - b _0815105C -_08151052: - adds r0, r4, 0 - movs r1, 0x6 -_08151056: - bl StartSpriteAnim - strh r5, [r4, 0x30] -_0815105C: - ldr r0, =gSprites - mov r2, r8 - adds r1, r2, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x3 - mov r3, r9 - ands r0, r3 - add r0, sp - adds r0, 0x1C - ldrb r0, [r0] - strh r0, [r1, 0x32] -_08151074: - add sp, 0x28 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8150D28 - - thumb_func_start sub_8151088 -sub_8151088: @ 8151088 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - movs r3, 0 - mov r9, r3 - ldr r2, =gUnknown_0203ABAC - ldr r0, [r2] - ldrb r1, [r0, 0x1B] - adds r1, 0x2 - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 26 - lsrs r0, 24 - mov r12, r0 -_081510AA: - movs r7, 0 - lsls r0, r3, 1 - adds r1, r3, 0x3 - adds r2, r3, 0x6 - adds r4, r3, 0x1 - str r4, [sp, 0x4] - adds r0, r3 - lsls r0, 3 - str r0, [sp] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - mov r10, r0 - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 3 - mov r8, r0 -_081510CC: - ldr r0, =gUnknown_0203ABAC - ldr r6, [r0] - lsls r3, r7, 1 - ldr r1, [sp] - adds r2, r3, r1 - adds r4, r6, 0 - adds r4, 0x22 - adds r2, r4, r2 - mov r1, r12 - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - ldr r0, =0x000040fc - adds r5, r6, r0 - ldr r0, [r5] - lsls r1, 1 - adds r1, r0 - ldrh r0, [r1] - strh r0, [r2] - mov r1, r10 - adds r2, r3, r1 - adds r2, r4, r2 - str r2, [sp, 0x8] - ldr r0, [r5] - mov r2, r9 - lsls r1, r2, 1 - adds r0, r1, r0 - ldrh r0, [r0] - ldr r2, [sp, 0x8] - strh r0, [r2] - add r3, r8 - adds r4, r3 - ldr r0, [r5] - adds r1, r0 - adds r1, 0x48 - ldrh r0, [r1] - strh r0, [r4] - mov r0, r9 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0xB - bls _081510CC - ldr r4, [sp, 0x4] - lsls r0, r4, 24 - lsrs r3, r0, 24 - cmp r3, 0x2 - bls _081510AA - ldrb r0, [r6, 0x1B] - adds r0, 0x1 - movs r1, 0x3 - bl __modsi3 - strb r0, [r6, 0x1B] - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8151088 - - thumb_func_start sub_815115C -sub_815115C: @ 815115C - push {r4,r5,lr} - ldr r5, =gUnknown_0203ABAC - ldr r4, [r5] - ldrb r0, [r4, 0x1C] - adds r0, 0x1 - movs r1, 0x60 - bl __modsi3 - strb r0, [r4, 0x1C] - ldr r1, [r5] - ldrb r0, [r1, 0x1F] - ldrb r2, [r1, 0x1D] - subs r0, r2 - strb r0, [r1, 0x8] - ldr r2, [r5] - adds r0, r2, 0 - adds r0, 0x20 - ldrb r0, [r0] - ldrb r1, [r2, 0x1E] - subs r0, r1 - strb r0, [r2, 0x9] - ldr r1, [r5] - ldrb r0, [r1, 0x1D] - adds r0, 0x1 - strb r0, [r1, 0x1D] - ldr r2, [r5] - ldrb r0, [r2, 0x1D] - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _081511A0 - ldrb r0, [r2, 0x1E] - adds r0, 0x1 - strb r0, [r2, 0x1E] -_081511A0: - ldr r0, [r5] - ldrb r0, [r0, 0x1D] - cmp r0, 0x10 - bls _081511AC - bl sub_8151214 -_081511AC: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_815115C - - thumb_func_start sub_81511B8 -sub_81511B8: @ 81511B8 - push {r4,r5,lr} - ldr r5, =gUnknown_0203ABAC - ldr r4, [r5] - ldrb r0, [r4, 0x1C] - adds r0, 0x1 - movs r1, 0x60 - bl __modsi3 - strb r0, [r4, 0x1C] - ldr r1, [r5] - ldrb r0, [r1, 0x1D] - ldrb r2, [r1, 0x1F] - adds r0, r2 - strb r0, [r1, 0x8] - ldr r1, [r5] - adds r2, r1, 0 - adds r2, 0x20 - ldrb r0, [r1, 0x1E] - ldrb r2, [r2] - adds r0, r2 - strb r0, [r1, 0x9] - ldr r1, [r5] - ldrb r0, [r1, 0x1D] - adds r0, 0x1 - strb r0, [r1, 0x1D] - ldr r2, [r5] - ldrb r0, [r2, 0x1D] - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _081511FC - ldrb r0, [r2, 0x1E] - adds r0, 0x1 - strb r0, [r2, 0x1E] -_081511FC: - ldr r0, [r5] - ldrb r0, [r0, 0x1D] - cmp r0, 0x10 - bls _08151208 - bl sub_8151388 -_08151208: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81511B8 - - thumb_func_start sub_8151214 -sub_8151214: @ 8151214 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - movs r7, 0 - ldr r3, =gUnknown_0203ABAC - ldr r0, [r3] - strb r7, [r0, 0x1E] - strb r7, [r0, 0x1D] - ldr r1, [r3] - ldrb r0, [r1, 0x8] - strb r0, [r1, 0x1F] - ldr r0, [r3] - ldrb r1, [r0, 0x9] - adds r0, 0x20 - strb r1, [r0] - ldr r4, [r3] - ldrb r1, [r4, 0x19] - adds r2, r1, 0 - adds r2, 0x1E - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r4, 0x19] - ldr r1, [r3] - ldrb r0, [r1, 0x18] - subs r0, 0x2 - strb r0, [r1, 0x18] - ldr r4, =gUnknown_0203ABB2 - ldr r0, [r3] - ldrb r1, [r0, 0x1A] - adds r2, r1, 0 - adds r2, 0x17 - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r4] - ldr r6, =gUnknown_0203ABB0 - mov r9, r3 - ldr r0, =gUnknown_0203ABB1 - mov r8, r0 -_0815126E: - mov r1, r9 - ldr r2, [r1] - ldrb r0, [r2, 0x19] - strb r0, [r6] - ldr r0, =gUnknown_0203ABB2 - ldrb r0, [r0] - adds r1, r0, r7 - adds r0, r1, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r1, r0 - mov r1, r8 - strb r0, [r1] - ldrb r1, [r2, 0x18] - lsls r1, 1 - lsls r0, r7, 1 - adds r0, r7 - lsls r5, r0, 3 - adds r1, r5 - adds r0, r2, 0 - adds r0, 0x22 - adds r0, r1 - ldrh r1, [r0] - ldrb r2, [r6] - mov r0, r8 - ldrb r3, [r0] - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - movs r0, 0x11 - mov r10, r0 - str r0, [sp, 0x8] - movs r0, 0 - bl FillBgTilemapBufferRect - ldrb r1, [r6] - adds r2, r1, 0x1 - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r6] - mov r0, r9 - ldr r1, [r0] - ldrb r0, [r1, 0x18] - adds r0, 0x1 - lsls r0, 1 - adds r0, r5 - adds r1, 0x22 - adds r1, r0 - ldrh r1, [r1] - ldrb r2, [r6] - mov r0, r8 - ldrb r3, [r0] - str r4, [sp] - str r4, [sp, 0x4] - mov r0, r10 - str r0, [sp, 0x8] - movs r0, 0 - bl FillBgTilemapBufferRect - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x8 - bls _0815126E - ldr r5, =gUnknown_0203ABB0 - ldr r4, =gUnknown_0203ABAC - ldr r0, [r4] - ldrb r1, [r0, 0x19] - adds r2, r1, 0 - adds r2, 0x1E - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r5] - ldrb r2, [r5] - movs r0, 0x2 - str r0, [sp] - movs r6, 0x20 - str r6, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - movs r0, 0 - movs r1, 0 - movs r3, 0 - bl FillBgTilemapBufferRect - ldr r1, [r4] - ldrb r0, [r1, 0x18] - cmp r0, 0 - bne _08151368 - ldrb r2, [r1, 0x1A] - adds r3, r2, 0 - adds r3, 0x1D - adds r0, r3, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r3, r0 - strb r0, [r1, 0x1A] - ldr r1, [r4] - movs r0, 0xC - strb r0, [r1, 0x18] - bl sub_8151088 - ldr r0, [r4] - ldrb r1, [r0, 0x1A] - adds r2, r1, 0x1 - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r5] - ldrb r3, [r5] - str r6, [sp] - movs r0, 0x9 - str r0, [sp, 0x4] - mov r1, r10 - str r1, [sp, 0x8] - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl FillBgTilemapBufferRect -_08151368: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8151214 - - thumb_func_start sub_8151388 -sub_8151388: @ 8151388 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - movs r7, 0 - ldr r2, =gUnknown_0203ABAC - ldr r0, [r2] - strb r7, [r0, 0x1E] - strb r7, [r0, 0x1D] - ldr r1, [r2] - ldrb r0, [r1, 0x8] - strb r0, [r1, 0x1F] - ldr r0, [r2] - ldrb r1, [r0, 0x9] - adds r0, 0x20 - strb r1, [r0] - ldr r4, [r2] - ldrb r1, [r4, 0x19] - adds r3, r1, 0x2 - adds r0, r3, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r3, r0 - strb r0, [r4, 0x19] - ldr r1, [r2] - ldrb r0, [r1, 0x18] - adds r0, 0x2 - strb r0, [r1, 0x18] - ldr r1, =gUnknown_0203ABB5 - ldr r0, [r2] - ldrb r0, [r0, 0x1A] - strb r0, [r1] - ldr r6, =gUnknown_0203ABB3 - mov r10, r2 - ldr r0, =gUnknown_0203ABB4 - mov r9, r0 -_081513D4: - mov r1, r10 - ldr r2, [r1] - ldrb r0, [r2, 0x19] - strb r0, [r6] - ldr r0, =gUnknown_0203ABB5 - ldrb r0, [r0] - adds r1, r0, r7 - adds r0, r1, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r1, r0 - mov r1, r9 - strb r0, [r1] - ldrb r1, [r2, 0x18] - lsls r1, 1 - lsls r0, r7, 1 - adds r0, r7 - lsls r5, r0, 3 - adds r1, r5 - adds r0, r2, 0 - adds r0, 0x22 - adds r0, r1 - ldrh r1, [r0] - ldrb r2, [r6] - mov r0, r9 - ldrb r3, [r0] - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - movs r0, 0x11 - mov r8, r0 - str r0, [sp, 0x8] - movs r0, 0 - bl FillBgTilemapBufferRect - ldrb r1, [r6] - adds r2, r1, 0x1 - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r6] - mov r0, r10 - ldr r1, [r0] - ldrb r0, [r1, 0x18] - adds r0, 0x1 - lsls r0, 1 - adds r0, r5 - adds r1, 0x22 - adds r1, r0 - ldrh r1, [r1] - ldrb r2, [r6] - mov r0, r9 - ldrb r3, [r0] - str r4, [sp] - str r4, [sp, 0x4] - mov r0, r8 - str r0, [sp, 0x8] - movs r0, 0 - bl FillBgTilemapBufferRect - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x8 - bls _081513D4 - ldr r4, =gUnknown_0203ABB4 - ldr r5, =gUnknown_0203ABAC - ldr r3, [r5] - ldrb r1, [r3, 0x1A] - adds r2, r1, 0 - adds r2, 0x17 - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r4] - ldrb r2, [r3, 0x19] - ldrb r3, [r4] - movs r0, 0x2 - str r0, [sp] - movs r0, 0x9 - str r0, [sp, 0x4] - mov r1, r8 - str r1, [sp, 0x8] - movs r0, 0 - movs r1, 0 - bl FillBgTilemapBufferRect - ldr r1, [r5] - ldrb r0, [r1, 0x18] - cmp r0, 0xA - bne _081514A6 - ldrb r2, [r1, 0x1A] - adds r3, r2, 0x3 - adds r0, r3, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r3, r0 - strb r0, [r1, 0x1A] - ldr r1, [r5] - movs r0, 0xFE - strb r0, [r1, 0x18] - bl sub_8151088 -_081514A6: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8151388 - - thumb_func_start sub_81514C8 -sub_81514C8: @ 81514C8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _081514D6 - cmp r0, 0x1 - beq _08151500 -_081514D6: - ldr r1, =gUnknown_0203ABAC - ldr r2, [r1] - movs r3, 0 - movs r0, 0x2 - strb r0, [r2, 0x1B] - ldr r0, [r1] - strb r3, [r0, 0x19] - ldr r2, [r1] - movs r0, 0x14 - strb r0, [r2, 0x1A] - ldr r1, [r1] - movs r0, 0xC - strb r0, [r1, 0x18] - bl sub_8151088 - bl sub_8151214 - b _08151522 - .pool -_08151500: - ldr r1, =gUnknown_0203ABAC - ldr r2, [r1] - movs r0, 0x2 - strb r0, [r2, 0x1B] - ldr r2, [r1] - movs r0, 0x1C - strb r0, [r2, 0x19] - ldr r2, [r1] - movs r0, 0x14 - strb r0, [r2, 0x1A] - ldr r1, [r1] - movs r0, 0x4 - strb r0, [r1, 0x18] - bl sub_8151088 - bl sub_8151388 -_08151522: - ldr r0, =gUnknown_0203ABAC - ldr r1, [r0] - movs r0, 0 - strb r0, [r1, 0x1C] - pop {r0} - bx r0 - .pool - thumb_func_end sub_81514C8 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/cable_car.s b/data/cable_car.s deleted file mode 100644 index c141e593c..000000000 --- a/data/cable_car.s +++ /dev/null @@ -1,106 +0,0 @@ -#include "constants/event_objects.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085CD66C:: @ 85CD66C - .4byte 0x000011c0, 0x000021d1, 0x000031e2, 0x000001f3 - - .align 2 -gCableCarMtChimneyTilemap:: @ 85CD67C - .incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz" - - .align 2 -gCableCarTreeTilemap:: @ 85CD7D4 - .incbin "graphics/misc/cable_car_tree_map.bin.lz" - - .align 2 -gCableCarMountainTilemap:: @ 85CD958 - .incbin "graphics/misc/cable_car_mountain_map.bin.lz" - - .align 2 -gCableCarPylonHookTilemapEntries:: @ 85CDB1C - .2byte 0x3000 - .2byte 0x3001 - .2byte 0x3002 - .2byte 0x3003 - .2byte 0x3004 - .2byte 0x3005 - .2byte 0x3006 - .2byte 0x3007 - .2byte 0x3008 - .2byte 0x3009 - - .align 2 -gCableCarPylonStemTilemap:: @ 85CDB30 - .incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz" - - .align 2 -gUnknown_085CDB54:: @ 85CDB54 - obj_tiles gCableCar_Gfx, 0x800, 1 - obj_tiles gCableCarDoor_Gfx, 0x40, 2 - obj_tiles gCableCarCord_Gfx, 0x80, 3 - null_obj_tiles - - .align 2 -gUnknown_085CDB74:: @ 85CDB74 - obj_pal gCableCar_Pal, 1 - null_obj_pal - - .align 2 -gOamData_85CDB84:: @ 85CDB84 - .2byte 0x0300 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_85CDB8C:: @ 85CDB8C - .2byte 0x4300 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_85CDB94:: @ 85CDB94 - .2byte 0x0300 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gSpriteTemplate_85CDB9C:: @ 85CDB9C - spr_template 1, 1, gOamData_85CDB84, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8150868 - - .align 2 -gSpriteTemplate_85CDBB4:: @ 85CDBB4 - spr_template 2, 1, gOamData_85CDB8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8150868 - - .align 2 -gSpriteTemplate_85CDBCC:: @ 85CDBCC - spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58 - -gCableCarPlayerGraphicsIDs:: @ 85CDBE4 - .byte EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - .byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - -gMtChimneyHikerGraphicsIDs:: @ 85CDBE6 - .byte EVENT_OBJ_GFX_HIKER - .byte EVENT_OBJ_GFX_CAMPER - .byte EVENT_OBJ_GFX_PICNICKER - .byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used - - .align 1 -gMtChimneyHikerCoords:: @ 85CDBEA - .2byte 0, 80 - .2byte 240, 146 - -gMtChimneyHikerMovementDelayTable:: @ 85CDBF2 - .byte 0 - .byte 60 - .byte 120 - .byte 170 - - .align 2 -gUnknown_085CDBF8:: @ 85CDBF8 - .4byte sub_8150A68 - .4byte sub_8150AF4 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 2544e6729..89fc9fd38 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C setvar VAR_0x40A3, 2 incrementgamestat 48 special CableCarWarp - special sub_814FC9C + special CableCar waitstate release end diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 905e9e9ea..a7d3e8c7a 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 setvar VAR_0x40A3, 1 incrementgamestat 48 special CableCarWarp - special sub_814FC9C + special CableCar waitstate release end diff --git a/data/specials.inc b/data/specials.inc index 080f2c042..8ee70c306 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -163,7 +163,7 @@ gSpecials:: @ 81DBA64 def_special GetRivalSonDaughterString def_special SetFlagInVar def_special CableCarWarp - def_special sub_814FC9C + def_special CableCar def_special Overworld_PlaySpecialMapMusic def_special StartWallClock def_special Special_ViewWallClock diff --git a/include/global.h b/include/global.h index 83eb93eec..33a31bf4d 100644 --- a/include/global.h +++ b/include/global.h @@ -79,6 +79,14 @@ #define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) #define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) +#define S16TOPOSFLOAT(val) \ +({ \ + s16 v = (val); \ + float f = (float)v; \ + if(v < 0) f += 65536.0f; \ + f; \ +}) + // Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen. // In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen. // In Gen 4 only, migrated Pokemon with Diamond, Pearl, or Platinum's ID show as "----------". diff --git a/include/graphics.h b/include/graphics.h index b51926b8d..e2889ed86 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4740,4 +4740,12 @@ extern const u32 gUnknown_08D8D58C[]; extern const u32 gPokedexAreaScreenAreaUnknown_Gfx[]; extern const u16 gPokedexAreaScreenAreaUnknown_Pal[]; +// Cable Car +extern const u32 gUnknown_08DBA5B8[]; +extern const u16 gUnknown_08DBA518[]; +extern const u32 gCableCar_Gfx[]; +extern const u32 gCableCarDoor_Gfx[]; +extern const u32 gCableCarCord_Gfx[]; +extern const u16 gCableCar_Pal[]; + #endif //GUARD_GRAPHICS_H diff --git a/ld_script.txt b/ld_script.txt index ecd3822cb..87964b70d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -214,7 +214,7 @@ SECTIONS { src/battle_transition.o(.text); src/battle_controller_link_partner.o(.text); src/battle_message.o(.text); - asm/cable_car.o(.text); + src/cable_car.o(.text); src/math_util.o(.text); src/roulette_util.o(.text); src/rom_81520A8.o(.text); @@ -533,7 +533,7 @@ SECTIONS { src/battle_transition.o(.rodata); src/battle_controller_link_partner.o(.rodata); src/battle_message.o(.rodata); - data/cable_car.o(.rodata); + src/cable_car.o(.rodata); src/save.o(.rodata); src/field_effect_helpers.o(.rodata); data/field_effect_helpers.o(.rodata); diff --git a/src/cable_car.c b/src/cable_car.c new file mode 100755 index 000000000..00606c905 --- /dev/null +++ b/src/cable_car.c @@ -0,0 +1,1006 @@ +#include "global.h" +#include "bg.h" +#include "decompress.h" +#include "event_data.h" +#include "event_object_movement.h" +#include "field_weather.h" +#include "gpu_regs.h" +#include "graphics.h" +#include "alloc.h" +#include "main.h" +#include "menu.h" +#include "overworld.h" +#include "palette.h" +#include "random.h" +#include "scanline_effect.h" +#include "script.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "constants/event_objects.h" +#include "constants/rgb.h" +#include "constants/songs.h" +#include "constants/weather.h" + +struct CableCar +{ + u8 taskId; + u8 state; + u8 weather; + u16 unk4; + u16 timer; + u8 bg0HorizontalOffset; + u8 bg0VerticalOffset; + u8 fillerA[0x2]; + u8 bg1HorizontalOffset; + u8 bg1VerticalOffset; + u8 fillerE[0x6]; + u8 bg3HorizontalOffset; + u8 bg3VerticalOffset; + u8 filler16[0x2]; + u8 unk18; + u8 unk19; + u8 unk1A; + u8 unk1B; + u8 unk1C; + u8 unk1D; + u8 unk1E; + u8 unk1F; + u8 unk20; + u16 unk22[9][12]; + u8 fillerFA[0x2]; + /*0x00FC*/ u16 bgTilemapBuffers[4][0x800]; + /*0x40FC*/ u16 *mtChimneyTilemap; + /*0x4100*/ u16 *treeTilemap; + /*0x4104*/ u16 *mountainTilemap; + /*0x4108*/ const u16 *pylonHookTilemapEntries; + /*0x410C*/ u8 *pylonStemTilemap; +}; + +static EWRAM_DATA struct CableCar *sCableCar = NULL; +EWRAM_DATA u8 gUnknown_0203ABB0 = 0; +EWRAM_DATA u8 gUnknown_0203ABB1 = 0; +EWRAM_DATA u8 gUnknown_0203ABB2 = 0; +EWRAM_DATA u8 gUnknown_0203ABB3 = 0; +EWRAM_DATA u8 gUnknown_0203ABB4 = 0; +EWRAM_DATA u8 gUnknown_0203ABB5 = 0; + +static void CableCarMainCallback_Setup(void); +static void sub_8150B6C(u8); +static void LoadCableCarSprites(void); +static void sub_81514C8(u8); +static void sub_81503E4(u8); +static void sub_8150550(u8); +static void sub_8150664(u8); +static void CableCarVblankCallback(void); +static void CableCarMainCallback_Run(void); +static void sub_815115C(void); +static void sub_81511B8(void); +static void sub_8150868(struct Sprite *); +static void nullsub_58(struct Sprite *); +static void sub_8151214(void); +static void sub_8151388(void); + +const struct BgTemplate gCableCarBgTemplates[4] = { + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 28, + .screenSize = 0, + .paletteMode = 0, + .priority = 1, + .baseTile = 0 + }, + { + .bg = 1, + .charBaseIndex = 0, + .mapBaseIndex = 29, + .screenSize = 0, + .paletteMode = 0, + .priority = 2, + .baseTile = 0 + }, + { + .bg = 2, + .charBaseIndex = 0, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 3, + .baseTile = 0 + }, + { + .bg = 3, + .charBaseIndex = 0, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0 + }, +}; + +const u8 gCableCarMtChimneyTilemap[] = INCBIN_U8("graphics/misc/cable_car_mt_chimney_map.bin.lz"); +const u8 gCableCarTreeTilemap[] = INCBIN_U8("graphics/misc/cable_car_tree_map.bin.lz"); +const u8 gCableCarMountainTilemap[] = INCBIN_U8("graphics/misc/cable_car_mountain_map.bin.lz"); + +const u16 gCableCarPylonHookTilemapEntries[] = { + 0x3000, + 0x3001, + 0x3002, + 0x3003, + 0x3004, + 0x3005, + 0x3006, + 0x3007, + 0x3008, + 0x3009, +}; + +const u8 gCableCarPylonStemTilemap[] = INCBIN_U8("graphics/misc/cable_car_pylon_stem_map.bin.lz"); + +const struct CompressedSpriteSheet gUnknown_085CDB54[] = { + { gCableCar_Gfx, 0x800, 1 }, + { gCableCarDoor_Gfx, 0x40, 2 }, + { gCableCarCord_Gfx, 0x80, 3 }, + { }, +}; + +const struct SpritePalette gUnknown_085CDB74[] = { + { gCableCar_Pal, 1 }, + { } +}; + +const struct OamData gOamData_85CDB84 = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .size = 3, + .priority = 2 +}; + +const struct OamData gOamData_85CDB8C = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .shape = ST_OAM_H_RECTANGLE, + .priority = 2 +}; + +const struct OamData gOamData_85CDB94 = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .size = 1, + .priority = 2 +}; + +const struct SpriteTemplate gSpriteTemplate_85CDB9C[] = +{ + { + .tileTag = 1, + .paletteTag = 1, + .oam = &gOamData_85CDB84, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8150868, + }, + { + .tileTag = 2, + .paletteTag = 1, + .oam = &gOamData_85CDB8C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8150868, + }, +}; + +const struct SpriteTemplate gSpriteTemplate_85CDBCC = { + .tileTag = 3, + .paletteTag = 1, + .oam = &gOamData_85CDB94, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = nullsub_58, +}; + +static void CableCarTask1(u8 taskId) +{ + if (!gPaletteFade.active) + { + SetMainCallback2(CableCarMainCallback_Setup); + DestroyTask(taskId); + } +} + +void CableCar(void) +{ + ScriptContext2_Enable(); + CreateTask(CableCarTask1, 1); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); +} + +static void CableCarMainCallback_Setup(void) +{ + u16 imebak; + u8 i = 0; + int sizeOut = 0; + + switch (gMain.state) + { + case 0: + default: + SetVBlankCallback(NULL); + sub_8150B6C(0); + ScanlineEffect_Stop(); + DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); + DmaFill32Defvars(3, 0, (void *)OAM, OAM_SIZE); + DmaFill16Defvars(3, 0, (void *)PLTT, PLTT_SIZE); + sCableCar = AllocZeroed(sizeof(*sCableCar)); + gMain.state++; + break; + case 1: + ResetSpriteData(); + ResetTasks(); + FreeAllSpritePalettes(); + ResetPaletteFade(); + reset_temp_tile_data_buffers(); + StartWeather(); + for (i = 0; i < 20; i++) + gWeatherPtr->sprites.s2.ashSprites[i] = NULL; + + InitMapMusic(); + ResetMapMusic(); + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, gCableCarBgTemplates, ARRAY_COUNT(gCableCarBgTemplates)); + SetBgTilemapBuffer(0, sCableCar->bgTilemapBuffers[0]); + SetBgTilemapBuffer(1, sCableCar->bgTilemapBuffers[1]); + SetBgTilemapBuffer(2, sCableCar->bgTilemapBuffers[2]); + SetBgTilemapBuffer(3, sCableCar->bgTilemapBuffers[3]); + gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0; + gMain.state++; + break; + case 2: + for (i = 0; i < 3; i++) + LoadCompressedObjectPic(&gUnknown_085CDB54[i]); + + LoadSpritePalettes(gUnknown_085CDB74); + sCableCar->mtChimneyTilemap = malloc_and_decompress(gCableCarMtChimneyTilemap, &sizeOut); + sCableCar->treeTilemap = malloc_and_decompress(gCableCarTreeTilemap, &sizeOut); + sCableCar->mountainTilemap = malloc_and_decompress(gCableCarMountainTilemap, &sizeOut); + sCableCar->pylonStemTilemap = malloc_and_decompress(gCableCarPylonStemTilemap, &sizeOut); + sCableCar->pylonHookTilemapEntries = gCableCarPylonHookTilemapEntries; + decompress_and_copy_tile_data_to_vram(0, gUnknown_08DBA5B8, 0, 0, 0); + gMain.state++; + break; + case 3: + if (!free_temp_tile_data_buffers_if_possible()) + { + LoadPalette(gUnknown_08DBA518, 0, 0x80); + gMain.state++; + } + break; + case 4: + LoadCableCarSprites(); + RunTasks(); + gMain.state++; + break; + case 5: + if (sCableCar->weather == WEATHER_ASH) + { + gMain.state++; + } + else if (gWeatherPtr->sprites.s2.ashSprites[0]) + { + for (i = 0; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.ashSprites[i]) + gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0; + } + + gMain.state++; + } + break; + case 6: + CopyToBgTilemapBufferRect_ChangePalette(1, sCableCar->treeTilemap, 0, 17, 32, 15, 17); + CopyToBgTilemapBufferRect_ChangePalette(2, sCableCar->mountainTilemap, 0, 0, 30, 20, 17); + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonHookTilemapEntries, 0, 0, 5, 2, 17); + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonStemTilemap, 0, 2, 2, 20, 17); + gMain.state++; + break; + case 7: + sub_81514C8(gSpecialVar_0x8004); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x48, 0, 14, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x6C, 12, 17, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x90, 24, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 0, 17, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 0, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 12, 20, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 12, 23, 12, 3, 17); + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x0, 24, 23, 12, 3, 17); + gMain.state++; + break; + case 8: + BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0)); + FadeInNewBGM(MUS_ROPEWAY, 1); + sub_8150B6C(1); + gMain.state++; + break; + case 9: + imebak = REG_IME; + REG_IME = 0; + REG_IE |= INTR_FLAG_VBLANK; + REG_IME = imebak; + SetVBlankCallback(CableCarVblankCallback); + SetMainCallback2(CableCarMainCallback_Run); + CreateTask(sub_81503E4, 0); + if (gSpecialVar_0x8004 == 0) + sCableCar->taskId = CreateTask(sub_8150550, 1); + else + sCableCar->taskId = CreateTask(sub_8150664, 1); + break; + } +} + +static void CableCarMainCallback_Run(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); + MapMusicMain(); +} + +static void CleanupCableCar(void) +{ + u8 i = 0; + + HideBg(0); + HideBg(1); + HideBg(2); + HideBg(3); + sub_8150B6C(0); + gSpriteCoordOffsetX = 0; + sub_80AB130(WEATHER_NONE); + for (i = 0; i < 20; i++) + gWeatherPtr->sprites.s2.ashSprites[i] = NULL; + + ResetTasks(); + ResetSpriteData(); + ResetPaletteFade(); + UnsetBgTilemapBuffer(0); + UnsetBgTilemapBuffer(1); + UnsetBgTilemapBuffer(2); + UnsetBgTilemapBuffer(3); + ResetBgsAndClearDma3BusyFlags(0); + sCableCar->pylonHookTilemapEntries = NULL; + FREE_AND_SET_NULL(sCableCar->pylonStemTilemap); + FREE_AND_SET_NULL(sCableCar->mountainTilemap); + FREE_AND_SET_NULL(sCableCar->treeTilemap); + FREE_AND_SET_NULL(sCableCar->mtChimneyTilemap); + FREE_AND_SET_NULL(sCableCar); + DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); + DmaFill32Defvars(3, 0, (void *)OAM, OAM_SIZE); + DmaFill16Defvars(3, 0, (void *)PLTT, PLTT_SIZE); + WarpIntoMap(); + gFieldCallback = NULL; + SetMainCallback2(CB2_LoadMap); +} + +static void sub_81503E4(u8 taskId) +{ + u8 i = 0; + + sCableCar->timer++; + switch (sCableCar->state) + { + case 0: + if (sCableCar->timer == sCableCar->unk4) + { + ChangeWeather(sCableCar->weather); + sCableCar->state = 1; + } + break; + case 1: + switch (sCableCar->weather) + { + case WEATHER_ASH: + if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0) + { + for (; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) + { + gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0; + } + } + sCableCar->state = 2; + } + break; + case WEATHER_SUNNY: + if (gWeatherPtr->currWeather == WEATHER_SUNNY) + { + sCableCar->state = 2; + } + else if (sCableCar->timer >= sCableCar->unk4 + 8) + { + for (; i < 20; i++) + { + if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) + { + gWeatherPtr->sprites.s2.ashSprites[i]->invisible ^= TRUE; + } + } + } + break; + } + break; + case 2: + if (sCableCar->timer == 570) + { + sCableCar->state = 3; + BeginNormalPaletteFade(0xFFFFFFFF, 3, 0, 16, RGB(0, 0, 0)); + FadeOutBGM(4); + } + break; + case 3: + if (!gPaletteFade.active) + { + sCableCar->state = 0xFF; + } + break; + case 0xFF: + SetVBlankCallback(NULL); + DestroyTask(taskId); + DestroyTask(sCableCar->taskId); + SetMainCallback2(CleanupCableCar); + break; + } +} + +static void sub_8150550(u8 taskId) +{ + if (sCableCar->state != 0xFF) + { + sCableCar->bg3HorizontalOffset--; + if ((sCableCar->timer % 2) == 0) + sCableCar->bg3VerticalOffset--; + + if ((sCableCar->timer % 8) == 0) + { + sCableCar->bg1HorizontalOffset--; + sCableCar->bg1VerticalOffset--; + } + + switch (sCableCar->bg3HorizontalOffset) + { + case 175: + FillBgTilemapBufferRect(3, 0, 0, 22, 2, 10, 17); + break; + case 40: + FillBgTilemapBufferRect(3, 0, 3, 0, 2, 2, 17); + break; + case 32: + FillBgTilemapBufferRect(3, 0, 2, 0, 1, 2, 17); + break; + case 16: + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonHookTilemapEntries, 0, 0, 5, 2, 17); + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonStemTilemap, 0, 2, 2, 30, 17); + sCableCar->bg3VerticalOffset = 64; + break; + } + } + + sub_815115C(); + gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 1) % 128; +} + +static void sub_8150664(u8 taskId) +{ + if (sCableCar->state != 0xFF) + { + sCableCar->bg3HorizontalOffset++; + if ((sCableCar->timer % 2) == 0) + sCableCar->bg3VerticalOffset++; + + if ((sCableCar->timer % 8) == 0) + { + sCableCar->bg1HorizontalOffset++; + sCableCar->bg1VerticalOffset++; + } + + switch (sCableCar->bg3HorizontalOffset) + { + case 176: + CopyToBgTilemapBufferRect_ChangePalette(3, sCableCar->pylonStemTilemap, 0, 2, 2, 30, 17); + break; + case 16: + FillBgTilemapBufferRect(3, 0, 2, 0, 3, 2, 17); + FillBgTilemapBufferRect(3, 0, 0, 22, 2, 10, 17); + sCableCar->bg3VerticalOffset = 192; + break; + case 32: + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[2], 2, 0, 1, 1, 17); + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[3], 3, 0, 1, 1, 17); + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[7], 2, 1, 1, 1, 17); + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[8], 3, 1, 1, 1, 17); + break; + case 40: + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[4], 4, 0, 1, 1, 17); + FillBgTilemapBufferRect(3, sCableCar->pylonHookTilemapEntries[9], 4, 1, 1, 1, 17); + break; + } + } + + sub_81511B8(); + if (sCableCar->timer < sCableCar->unk4) + gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248; + else + gWeatherPtr->unknown_6FC = (gWeatherPtr->unknown_6FC + 247) % 248; +} + +static void CableCarVblankCallback(void) +{ + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(3); + SetGpuReg(REG_OFFSET_BG3HOFS, sCableCar->bg3HorizontalOffset); + SetGpuReg(REG_OFFSET_BG3VOFS, sCableCar->bg3VerticalOffset); + SetGpuReg(REG_OFFSET_BG1HOFS, sCableCar->bg1HorizontalOffset); + SetGpuReg(REG_OFFSET_BG1VOFS, sCableCar->bg1VerticalOffset); + SetGpuReg(REG_OFFSET_BG0HOFS, sCableCar->bg0HorizontalOffset); + SetGpuReg(REG_OFFSET_BG0VOFS, sCableCar->bg0VerticalOffset); + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +static void nullsub_58(struct Sprite *sprite) +{ +} + +static void sub_8150868(struct Sprite *sprite) +{ + if (sCableCar->state != 0xFF) + { + if (gSpecialVar_0x8004 == 0) + { + sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + } + else + { + sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + } + } +} + +void sub_8150948(struct Sprite *sprite) +{ + if (sCableCar->state != 255) + { + if (!gSpecialVar_0x8004) + { + sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + } + else + { + sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer)); + sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer)); + } + + switch (sprite->data[2]) + { + case 0: + sprite->pos2.y = 17; + if (sprite->data[3] ++ > 9) + { + sprite->data[3] = 0; + sprite->data[2] ++; + } + break; + default: + sprite->pos2.y = 16; + if (sprite->data[3] ++ > 9) + { + sprite->data[3] = 0; + sprite->data[2] = 0; + } + break; + } + } +} + +static void sub_8150A68(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + sprite->pos1.x += 2 * sprite->centerToCornerVecX; + sprite->pos1.y += 16 + sprite->centerToCornerVecY; + } + + if (++sprite->data[0] >= sprite->data[2]) + { + switch (sprite->data[1]) + { + case 0: + sprite->pos1.x++; + if ((sprite->data[0] % 4) == 0) + sprite->pos1.y++; + break; + case 1: + if ((sprite->data[0] % 2) != 0) + { + sprite->pos1.x++; + if ((sprite->pos1.x % 4) == 0) + sprite->pos1.y++; + } + break; + } + + if (sprite->pos1.y > 160) + DestroySprite(sprite); + } +} + +static void sub_8150AF4(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + sprite->pos1.y += 16 + sprite->centerToCornerVecY; + + if (++sprite->data[0] >= sprite->data[2]) + { + switch (sprite->data[1]) + { + case 0: + sprite->pos1.x--; + if ((sprite->data[0] % 4) == 0) + sprite->pos1.y--; + break; + case 1: + if ((sprite->data[0] % 2) != 0) + { + sprite->pos1.x--; + if ((sprite->pos1.x % 4) == 0) + sprite->pos1.y--; + } + break; + } + + if (sprite->pos1.y < 80) + DestroySprite(sprite); + } +} + +static void sub_8150B6C(bool8 which) +{ + switch (which) + { + case FALSE: + default: + SetGpuReg(REG_OFFSET_WININ, 0); + SetGpuReg(REG_OFFSET_WINOUT, 0); + SetGpuReg(REG_OFFSET_WIN0H, 0); + SetGpuReg(REG_OFFSET_WIN1H, 0); + SetGpuReg(REG_OFFSET_WIN0V, 0); + SetGpuReg(REG_OFFSET_WIN1V, 0); + SetGpuReg(REG_OFFSET_DISPCNT, 0); + SetGpuReg(REG_OFFSET_BG3CNT, 0); + SetGpuReg(REG_OFFSET_BG2CNT, 0); + SetGpuReg(REG_OFFSET_BG1CNT, 0); + SetGpuReg(REG_OFFSET_BG0CNT, 0); + SetGpuReg(REG_OFFSET_BG3HOFS, 0); + SetGpuReg(REG_OFFSET_BG3VOFS, 0); + SetGpuReg(REG_OFFSET_BG2HOFS, 0); + SetGpuReg(REG_OFFSET_BG2VOFS, 0); + SetGpuReg(REG_OFFSET_BG1HOFS, 0); + SetGpuReg(REG_OFFSET_BG1VOFS, 0); + SetGpuReg(REG_OFFSET_BG0HOFS, 0); + SetGpuReg(REG_OFFSET_BG0VOFS, 0); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + break; + case TRUE: + SetGpuReg(REG_OFFSET_WININ, 0); + SetGpuReg(REG_OFFSET_WINOUT, 0); + SetGpuReg(REG_OFFSET_WIN0H, 0); + SetGpuReg(REG_OFFSET_WIN1H, 0); + SetGpuReg(REG_OFFSET_WIN0V, 0); + SetGpuReg(REG_OFFSET_WIN1V, 0); + if (gSpecialVar_0x8004 == 0) + { + sCableCar->bg3HorizontalOffset = 176; + sCableCar->bg3VerticalOffset = 16; + sCableCar->bg1HorizontalOffset = 0; + sCableCar->bg1VerticalOffset = 80; + sCableCar->bg0VerticalOffset = 0; + sCableCar->bg0VerticalOffset = 0; + } + else + { + sCableCar->bg3HorizontalOffset = 96; + sCableCar->bg3VerticalOffset = 232; + sCableCar->bg1HorizontalOffset = 0; + sCableCar->bg1VerticalOffset = 4; + sCableCar->bg0VerticalOffset = 0; + sCableCar->bg0VerticalOffset = 0; + } + + SetGpuReg(REG_OFFSET_BG3HOFS, sCableCar->bg3HorizontalOffset); + SetGpuReg(REG_OFFSET_BG3VOFS, sCableCar->bg3VerticalOffset); + SetGpuReg(REG_OFFSET_BG2HOFS, 0); + SetGpuReg(REG_OFFSET_BG2VOFS, 0); + SetGpuReg(REG_OFFSET_BG1HOFS, sCableCar->bg1HorizontalOffset); + SetGpuReg(REG_OFFSET_BG1VOFS, sCableCar->bg1VerticalOffset); + SetGpuReg(REG_OFFSET_BG0HOFS, sCableCar->bg0HorizontalOffset); + SetGpuReg(REG_OFFSET_BG0VOFS, sCableCar->bg0VerticalOffset); + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + ShowBg(0); + ShowBg(1); + ShowBg(2); + ShowBg(3); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL); + break; + } +} + +static void LoadCableCarSprites(void) +{ + u8 spriteId; + u8 i; + + u8 playerGraphicsIds[2] = { + EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, + EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + }; + u16 rval = Random(); + u8 hikerGraphicsIds[4] = { + EVENT_OBJ_GFX_HIKER, + EVENT_OBJ_GFX_CAMPER, + EVENT_OBJ_GFX_PICNICKER, + EVENT_OBJ_GFX_ZIGZAGOON_1 + }; + s16 hikerCoords[2][2] = { + { 0, 80 }, + { 240, 146 } + }; + u8 hikerMovementDelayTable[4] = { + 0, + 60, + 120, + 170 + }; + void (*callbacks[2])(struct Sprite *) = { + sub_8150A68, + sub_8150AF4 + }; + + switch (gSpecialVar_0x8004) + { + case 0: + default: + spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 16; + gSprites[spriteId].data[0] = 0xc8; + gSprites[spriteId].data[1] = 0x49; + } + spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[0], 176, 43, 0x67); + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 32; + gSprites[spriteId].data[0] = 176; + gSprites[spriteId].data[1] = 43; + spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[1], 200, 99, 0x65); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 4; + gSprites[spriteId].data[0] = 200; + gSprites[spriteId].data[1] = 99; + sCableCar->weather = WEATHER_ASH; + sCableCar->unk4 = 0x15e; + sub_80AB130(WEATHER_SUNNY); + break; + case 1: + CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); + spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 16; + gSprites[spriteId].data[0] = 0x80; + gSprites[spriteId].data[1] = 0x27; + } + spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[0], 104, 9, 0x67); + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20; + gSprites[spriteId].data[0] = 104; + gSprites[spriteId].data[1] = 9; + spriteId = CreateSprite(&gSpriteTemplate_85CDB9C[1], 128, 65, 0x65); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 4; + gSprites[spriteId].data[0] = 0x80; + gSprites[spriteId].data[1] = 0x41; + sCableCar->weather = WEATHER_SUNNY; + sCableCar->unk4 = 0x109; + sub_80AB130(WEATHER_ASH); + break; + } + for (i = 0; i < 9; i++) + { + spriteId = CreateSprite(&gSpriteTemplate_85CDBCC, 16 * i + 96, 8 * i - 8, 0x68); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 8; + } + if ((rval % 64) == 0) + { + spriteId = AddPseudoEventObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = -gSprites[spriteId].centerToCornerVecX; + gSprites[spriteId].pos2.y = -gSprites[spriteId].centerToCornerVecY; + if (gSpecialVar_0x8004 == 0) + { + if (rval % 2) + { + StartSpriteAnim(&gSprites[spriteId], 6); + gSprites[spriteId].data[1] = 1; + gSprites[spriteId].pos1.y += 2; + } + else + { + StartSpriteAnim(&gSprites[spriteId], 7); + gSprites[spriteId].data[1] = 0; + } + } + else + { + if (rval % 2) + { + StartSpriteAnim(&gSprites[spriteId], 7); + gSprites[spriteId].data[1] = 1; + gSprites[spriteId].pos1.y += 2; + } + else + { + StartSpriteAnim(&gSprites[spriteId], 6); + gSprites[spriteId].data[1] = 0; + } + } + gSprites[spriteId].data[2] = hikerMovementDelayTable[rval % 4]; + } + } +} + +void sub_8151088(void) +{ + u8 i; + u8 j; + u8 k; + u8 offset; + + for (i = 0, k = 0, offset = 0x24 * (sCableCar->unk1B + 2); i < 3; i++) + { + for (j = 0; j < 12; j++) + { + sCableCar->unk22[i][j] = sCableCar->mtChimneyTilemap[offset++]; + sCableCar->unk22[i + 3][j] = sCableCar->mtChimneyTilemap[k]; + sCableCar->unk22[i + 6][j] = (sCableCar->mtChimneyTilemap + 0x24)[k]; + k++; + } + } + + sCableCar->unk1B = (sCableCar->unk1B + 1) % 3; +} + +static void sub_815115C(void) +{ + sCableCar->unk1C = (sCableCar->unk1C + 1) % 0x60; + sCableCar->bg0HorizontalOffset = sCableCar->unk1F - sCableCar->unk1D; + sCableCar->bg0VerticalOffset = sCableCar->unk20 - sCableCar->unk1E; + sCableCar->unk1D++; + if ((sCableCar->unk1D % 4) == 0) + sCableCar->unk1E++; + + if (sCableCar->unk1D > 16) + sub_8151214(); +} + +static void sub_81511B8(void) +{ + sCableCar->unk1C = (sCableCar->unk1C + 1) % 0x60; + sCableCar->bg0HorizontalOffset = sCableCar->unk1F + sCableCar->unk1D; + sCableCar->bg0VerticalOffset = sCableCar->unk20 + sCableCar->unk1E; + sCableCar->unk1D++; + if ((sCableCar->unk1D % 4) == 0) + sCableCar->unk1E++; + + if (sCableCar->unk1D > 16) + sub_8151388(); +} + +static void sub_8151214(void) +{ + u8 i = 0; + + sCableCar->unk1D = sCableCar->unk1E = 0; + sCableCar->unk1F = sCableCar->bg0HorizontalOffset; + sCableCar->unk20 = sCableCar->bg0VerticalOffset; + sCableCar->unk19 = (sCableCar->unk19 + 30) % 32; + sCableCar->unk18 -= 2; + gUnknown_0203ABB2 = (sCableCar->unk1A + 23) % 32; + for (i = 0; i < 9; i++) + { + gUnknown_0203ABB0 = sCableCar->unk19; + gUnknown_0203ABB1 = (gUnknown_0203ABB2 + i) % 32; + FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18], gUnknown_0203ABB0, gUnknown_0203ABB1, 1, 1, 17); + gUnknown_0203ABB0 = (gUnknown_0203ABB0 + 1) % 32; + FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18 + 1], gUnknown_0203ABB0, gUnknown_0203ABB1, 1, 1, 17); + } + + gUnknown_0203ABB0 = (sCableCar->unk19 + 30) % 32; + FillBgTilemapBufferRect(0, 0, gUnknown_0203ABB0, 0, 2, 32, 17); + if (sCableCar->unk18 == 0) + { + sCableCar->unk1A = (sCableCar->unk1A + 29) % 32; + sCableCar->unk18 = 12; + sub_8151088(); + gUnknown_0203ABB0 = (sCableCar->unk1A + 1) % 32; + FillBgTilemapBufferRect(0, 0, 0, gUnknown_0203ABB0, 32, 9, 17); + } +} + +static void sub_8151388(void) +{ + u8 i = 0; + + sCableCar->unk1D = sCableCar->unk1E = 0; + sCableCar->unk1F = sCableCar->bg0HorizontalOffset; + sCableCar->unk20 = sCableCar->bg0VerticalOffset; + sCableCar->unk19 = (sCableCar->unk19 + 2) % 32; + sCableCar->unk18 += 2; + gUnknown_0203ABB5 = sCableCar->unk1A; + for (i = 0; i < 9; i++) + { + gUnknown_0203ABB3 = sCableCar->unk19; + gUnknown_0203ABB4 = (gUnknown_0203ABB5 + i) % 32; + FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18], gUnknown_0203ABB3, gUnknown_0203ABB4, 1, 1, 17); + gUnknown_0203ABB3 = (gUnknown_0203ABB3 + 1) % 32; + FillBgTilemapBufferRect(0, sCableCar->unk22[i][sCableCar->unk18 + 1], gUnknown_0203ABB3, gUnknown_0203ABB4, 1, 1, 17); + } + + gUnknown_0203ABB4 = (sCableCar->unk1A + 23) % 32; + FillBgTilemapBufferRect(0, 0, sCableCar->unk19, gUnknown_0203ABB4, 2, 9, 17); + if (sCableCar->unk18 == 10) + { + sCableCar->unk1A = (sCableCar->unk1A + 3) % 32; + sCableCar->unk18 = 0xfe; + sub_8151088(); + } +} + +static void sub_81514C8(u8 arg0) +{ + switch (arg0) + { + case 0: + default: + sCableCar->unk1B = 2; + sCableCar->unk19 = 0; + sCableCar->unk1A = 20; + sCableCar->unk18 = 12; + sub_8151088(); + sub_8151214(); + break; + case 1: + sCableCar->unk1B = 2; + sCableCar->unk19 = 28; + sCableCar->unk1A = 20; + sCableCar->unk18 = 4; + sub_8151088(); + sub_8151388(); + break; + } + + sCableCar->unk1C = 0; +} diff --git a/src/overworld.c b/src/overworld.c index 417c52a9e..6998c9d98 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -147,7 +147,6 @@ extern void ResetAllPicSprites(void); extern void FieldEffectActiveListClear(void); extern void SetUpFieldTasks(void); extern void sub_81BE6B8(void); -extern void StartWeather(void); extern void ShowStartMenu(void); extern void sub_80AEE84(void); extern void mapldr_default(void); diff --git a/sym_ewram.txt b/sym_ewram.txt index 9d6d77a9a..b413f287d 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -334,28 +334,7 @@ gUnknown_0203AB8C: @ 203AB8C .include "src/coins.o" .include "src/battle_transition.o" .include "src/battle_message.o" - -gUnknown_0203ABAC: @ 203ABAC - .space 0x4 - -gUnknown_0203ABB0: @ 203ABB0 - .space 0x1 - -gUnknown_0203ABB1: @ 203ABB1 - .space 0x1 - -gUnknown_0203ABB2: @ 203ABB2 - .space 0x1 - -gUnknown_0203ABB3: @ 203ABB3 - .space 0x1 - -gUnknown_0203ABB4: @ 203ABB4 - .space 0x1 - -gUnknown_0203ABB5: @ 203ABB5 - .space 0x3 - + .include "src/cable_car.o" .include "src/rom_81520A8.o" .include "src/save.o" .include "src/mystery_event_script.o" -- cgit v1.2.3 From 62384e7a6129acc3ffff866840ba663a308756c1 Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 9 Dec 2018 22:57:46 -0500 Subject: use facility class constants --- include/constants/trainers.h | 162 ++++++++++++++-------------- src/battle_tower.c | 250 +++++++++++++++++++++---------------------- 2 files changed, 206 insertions(+), 206 deletions(-) diff --git a/include/constants/trainers.h b/include/constants/trainers.h index a0bda381a..2a6c306b4 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -117,90 +117,90 @@ #define TRAINER_BACK_PIC_WALLY 6 #define TRAINER_BACK_PIC_STEVEN 7 -#define FACILITY_CLASS_HIKER 0x0 -#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 -#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 -#define FACILITY_CLASS_COOLTRAINER_M 0x3 -#define FACILITY_CLASS_BIRD_KEEPER 0x4 -#define FACILITY_CLASS_COLLECTOR 0x5 -#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 -#define FACILITY_CLASS_SWIMMER_M 0x7 -#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 -#define FACILITY_CLASS_EXPERT_M 0x9 -#define FACILITY_CLASS_BLACK_BELT 0xa -#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb -#define FACILITY_CLASS_HEX_MANIAC 0xc -#define FACILITY_CLASS_AROMA_LADY 0xd -#define FACILITY_CLASS_RUIN_MANIAC 0xe -#define FACILITY_CLASS_INTERVIEWER 0xf -#define FACILITY_CLASS_TUBER_F 0x10 -#define FACILITY_CLASS_TUBER_M 0x11 -#define FACILITY_CLASS_COOLTRAINER_F 0x12 -#define FACILITY_CLASS_LADY 0x13 -#define FACILITY_CLASS_BEAUTY 0x14 -#define FACILITY_CLASS_RICH_BOY 0x15 -#define FACILITY_CLASS_EXPERT_F 0x16 -#define FACILITY_CLASS_POKEMANIAC 0x17 -#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 -#define FACILITY_CLASS_GUITARIST 0x19 -#define FACILITY_CLASS_KINDLER 0x1a -#define FACILITY_CLASS_CAMPER 0x1b -#define FACILITY_CLASS_PICNICKER 0x1c -#define FACILITY_CLASS_BUG_MANIAC 0x1d -#define FACILITY_CLASS_PSYCHIC_M 0x1e -#define FACILITY_CLASS_PSYCHIC_F 0x1f -#define FACILITY_CLASS_GENTLEMAN 0x20 -#define FACILITY_CLASS_ELITE_FOUR_SIDNEY 0x21 -#define FACILITY_CLASS_ELITE_FOUR_PHOEBE 0x22 -#define FACILITY_CLASS_LEADER_ROXANNE 0x23 -#define FACILITY_CLASS_LEADER_BRAWLY 0x24 -#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 -#define FACILITY_CLASS_SCHOOL_KID_M 0x26 -#define FACILITY_CLASS_SCHOOL_KID_F 0x27 -#define FACILITY_CLASS_SR_AND_JR 0x28 -#define FACILITY_CLASS_POKEFAN_M 0x29 -#define FACILITY_CLASS_POKEFAN_F 0x2a -#define FACILITY_CLASS_YOUNGSTER 0x2b -#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c -#define FACILITY_CLASS_FISHERMAN 0x2d -#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e -#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f -#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 -#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 +#define FACILITY_CLASS_HIKER 0x0 +#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 +#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 +#define FACILITY_CLASS_COOLTRAINER_M 0x3 +#define FACILITY_CLASS_BIRD_KEEPER 0x4 +#define FACILITY_CLASS_COLLECTOR 0x5 +#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 +#define FACILITY_CLASS_SWIMMER_M 0x7 +#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 +#define FACILITY_CLASS_EXPERT_M 0x9 +#define FACILITY_CLASS_BLACK_BELT 0xa +#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb +#define FACILITY_CLASS_HEX_MANIAC 0xc +#define FACILITY_CLASS_AROMA_LADY 0xd +#define FACILITY_CLASS_RUIN_MANIAC 0xe +#define FACILITY_CLASS_INTERVIEWER 0xf +#define FACILITY_CLASS_TUBER_F 0x10 +#define FACILITY_CLASS_TUBER_M 0x11 +#define FACILITY_CLASS_COOLTRAINER_F 0x12 +#define FACILITY_CLASS_LADY 0x13 +#define FACILITY_CLASS_BEAUTY 0x14 +#define FACILITY_CLASS_RICH_BOY 0x15 +#define FACILITY_CLASS_EXPERT_F 0x16 +#define FACILITY_CLASS_POKEMANIAC 0x17 +#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 +#define FACILITY_CLASS_GUITARIST 0x19 +#define FACILITY_CLASS_KINDLER 0x1a +#define FACILITY_CLASS_CAMPER 0x1b +#define FACILITY_CLASS_PICNICKER 0x1c +#define FACILITY_CLASS_BUG_MANIAC 0x1d +#define FACILITY_CLASS_PSYCHIC_M 0x1e +#define FACILITY_CLASS_PSYCHIC_F 0x1f +#define FACILITY_CLASS_GENTLEMAN 0x20 +#define FACILITY_CLASS_ELITE_FOUR_SIDNEY 0x21 +#define FACILITY_CLASS_ELITE_FOUR_PHOEBE 0x22 +#define FACILITY_CLASS_LEADER_ROXANNE 0x23 +#define FACILITY_CLASS_LEADER_BRAWLY 0x24 +#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 +#define FACILITY_CLASS_SCHOOL_KID_M 0x26 +#define FACILITY_CLASS_SCHOOL_KID_F 0x27 +#define FACILITY_CLASS_SR_AND_JR 0x28 +#define FACILITY_CLASS_POKEFAN_M 0x29 +#define FACILITY_CLASS_POKEFAN_F 0x2a +#define FACILITY_CLASS_YOUNGSTER 0x2b +#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c +#define FACILITY_CLASS_FISHERMAN 0x2d +#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e +#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f +#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 #define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 #define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 -#define FACILITY_CLASS_DRAGON_TAMER 0x34 -#define FACILITY_CLASS_NINJA_BOY 0x35 -#define FACILITY_CLASS_BATTLE_GIRL 0x36 -#define FACILITY_CLASS_PARASOL_LADY 0x37 -#define FACILITY_CLASS_SWIMMER_F 0x38 -#define FACILITY_CLASS_TWINS 0x39 -#define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_WALLY 0x3b -#define FACILITY_CLASS_BRENDAN 0x3c -#define FACILITY_CLASS_BRENDAN_2 0x3d -#define FACILITY_CLASS_BRENDAN_3 0x3e -#define FACILITY_CLASS_MAY 0x3f -#define FACILITY_CLASS_MAY_2 0x40 -#define FACILITY_CLASS_MAY_3 0x41 -#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 -#define FACILITY_CLASS_BUG_CATCHER 0x43 -#define FACILITY_CLASS_PKMN_RANGER_M 0x44 -#define FACILITY_CLASS_PKMN_RANGER_F 0x45 -#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 -#define FACILITY_CLASS_LASS 0x47 -#define FACILITY_CLASS_YOUNG_COUPLE 0x48 -#define FACILITY_CLASS_OLD_COUPLE 0x49 -#define FACILITY_CLASS_SIS_AND_BRO 0x4a -#define FACILITY_CLASS_STEVEN 0x4b -#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c -#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d -#define FACILITY_CLASS_RED 0x4e -#define FACILITY_CLASS_LEAF 0x4f -#define FACILITY_CLASS_RS_BRENDAN 0x50 -#define FACILITY_CLASS_RS_MAY 0x51 +#define FACILITY_CLASS_DRAGON_TAMER 0x34 +#define FACILITY_CLASS_NINJA_BOY 0x35 +#define FACILITY_CLASS_BATTLE_GIRL 0x36 +#define FACILITY_CLASS_PARASOL_LADY 0x37 +#define FACILITY_CLASS_SWIMMER_F 0x38 +#define FACILITY_CLASS_TWINS 0x39 +#define FACILITY_CLASS_SAILOR 0x3a +#define FACILITY_CLASS_WALLY 0x3b +#define FACILITY_CLASS_BRENDAN 0x3c +#define FACILITY_CLASS_BRENDAN_2 0x3d +#define FACILITY_CLASS_BRENDAN_3 0x3e +#define FACILITY_CLASS_MAY 0x3f +#define FACILITY_CLASS_MAY_2 0x40 +#define FACILITY_CLASS_MAY_3 0x41 +#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 +#define FACILITY_CLASS_BUG_CATCHER 0x43 +#define FACILITY_CLASS_PKMN_RANGER_M 0x44 +#define FACILITY_CLASS_PKMN_RANGER_F 0x45 +#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 +#define FACILITY_CLASS_LASS 0x47 +#define FACILITY_CLASS_YOUNG_COUPLE 0x48 +#define FACILITY_CLASS_OLD_COUPLE 0x49 +#define FACILITY_CLASS_SIS_AND_BRO 0x4a +#define FACILITY_CLASS_STEVEN 0x4b +#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c +#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d +#define FACILITY_CLASS_RED 0x4e +#define FACILITY_CLASS_LEAF 0x4f +#define FACILITY_CLASS_RS_BRENDAN 0x50 +#define FACILITY_CLASS_RS_MAY 0x51 -#define FACILITY_CLASSES_COUNT 0x52 +#define FACILITY_CLASSES_COUNT 0x52 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 diff --git a/src/battle_tower.c b/src/battle_tower.c index 08009faab..cb128b532 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -265,81 +265,81 @@ const u8 gTowerFemaleTrainerGfxIds[20] = static const u8 sRubyFacilityClassToEmerald[][2] = { - {0x00, 0x0b}, - {0x01, 0x01}, - {0x02, 0x06}, - {0x03, 0x0d}, - {0x04, 0x0e}, - {0x05, 0x0f}, - {0x06, 0x10}, - {0x07, 0x11}, - {0x08, 0x03}, - {0x09, 0x12}, - {0x0a, 0x0c}, - {0x0b, 0x13}, - {0x0c, 0x14}, - {0x0d, 0x15}, - {0x0e, 0x17}, - {0x0f, 0x07}, - {0x10, 0x0a}, - {0x11, 0x19}, - {0x12, 0x1a}, - {0x13, 0x1b}, - {0x14, 0x1d}, - {0x15, 0x1e}, - {0x16, 0x1f}, - {0x17, 0x20}, - {0x18, 0x21}, - {0x19, 0x22}, - {0x1a, 0x23}, - {0x1b, 0x24}, - {0x1c, 0x25}, - {0x1d, 0x26}, - {0x1e, 0x27}, - {0x1f, 0x28}, - {0x20, 0x29}, - {0x21, 0x2a}, - {0x22, 0x09}, - {0x23, 0x16}, - {0x24, 0x2b}, - {0x25, 0x2c}, - {0x26, 0x2d}, - {0x27, 0x2e}, - {0x28, 0x2f}, - {0x29, 0x30}, - {0x2a, 0x31}, - {0x2b, 0x32}, - {0x2c, 0x33}, - {0x2d, 0x34}, - {0x2e, 0x04}, - {0x2f, 0x35}, - {0x30, 0x36}, - {0x31, 0x37}, - {0x32, 0x38}, - {0x33, 0x1c}, - {0x34, 0x39}, - {0x35, 0x3a}, - {0x38, 0x05}, - {0x39, 0x3b}, - {0x3a, 0x3c}, - {0x3b, 0x3d}, - {0x3c, 0x3e}, - {0x3d, 0x3f}, - {0x3e, 0x40}, - {0x3f, 0x41}, - {0x40, 0x42}, - {0x41, 0x02}, - {0x42, 0x44}, - {0x43, 0x45}, - {0x44, 0x46}, - {0x45, 0x08}, - {0x46, 0x18}, - {0x47, 0x47}, - {0x48, 0x43}, - {0x49, 0x00}, - {0x4a, 0x48}, - {0x4b, 0x49}, - {0x4c, 0x4a}, + {0x00, FACILITY_CLASS_AQUA_LEADER_ARCHIE}, + {0x01, FACILITY_CLASS_AQUA_GRUNT_M}, + {0x02, FACILITY_CLASS_AQUA_GRUNT_F}, + {0x03, FACILITY_CLASS_AROMA_LADY}, + {0x04, FACILITY_CLASS_RUIN_MANIAC}, + {0x05, FACILITY_CLASS_INTERVIEWER}, + {0x06, FACILITY_CLASS_TUBER_F}, + {0x07, FACILITY_CLASS_TUBER_M}, + {0x08, FACILITY_CLASS_COOLTRAINER_M}, + {0x09, FACILITY_CLASS_COOLTRAINER_F}, + {0x0a, FACILITY_CLASS_HEX_MANIAC}, + {0x0b, FACILITY_CLASS_LADY}, + {0x0c, FACILITY_CLASS_BEAUTY}, + {0x0d, FACILITY_CLASS_RICH_BOY}, + {0x0e, FACILITY_CLASS_POKEMANIAC}, + {0x0f, FACILITY_CLASS_SWIMMER_M}, + {0x10, FACILITY_CLASS_BLACK_BELT}, + {0x11, FACILITY_CLASS_GUITARIST}, + {0x12, FACILITY_CLASS_KINDLER}, + {0x13, FACILITY_CLASS_CAMPER}, + {0x14, FACILITY_CLASS_BUG_MANIAC}, + {0x15, FACILITY_CLASS_PSYCHIC_M}, + {0x16, FACILITY_CLASS_PSYCHIC_F}, + {0x17, FACILITY_CLASS_GENTLEMAN}, + {0x18, FACILITY_CLASS_ELITE_FOUR_SIDNEY}, + {0x19, FACILITY_CLASS_ELITE_FOUR_PHOEBE}, + {0x1a, FACILITY_CLASS_LEADER_ROXANNE}, + {0x1b, FACILITY_CLASS_LEADER_BRAWLY}, + {0x1c, FACILITY_CLASS_LEADER_TATE_AND_LIZA}, + {0x1d, FACILITY_CLASS_SCHOOL_KID_M}, + {0x1e, FACILITY_CLASS_SCHOOL_KID_F}, + {0x1f, FACILITY_CLASS_SR_AND_JR}, + {0x20, FACILITY_CLASS_POKEFAN_M}, + {0x21, FACILITY_CLASS_POKEFAN_F}, + {0x22, FACILITY_CLASS_EXPERT_M}, + {0x23, FACILITY_CLASS_EXPERT_F}, + {0x24, FACILITY_CLASS_YOUNGSTER}, + {0x25, FACILITY_CLASS_CHAMPION_WALLACE}, + {0x26, FACILITY_CLASS_FISHERMAN}, + {0x27, FACILITY_CLASS_CYCLING_TRIATHLETE_M}, + {0x28, FACILITY_CLASS_CYCLING_TRIATHLETE_F}, + {0x29, FACILITY_CLASS_RUNNING_TRIATHLETE_M}, + {0x2a, FACILITY_CLASS_RUNNING_TRIATHLETE_F}, + {0x2b, FACILITY_CLASS_SWIMMING_TRIATHLETE_M}, + {0x2c, FACILITY_CLASS_SWIMMING_TRIATHLETE_F}, + {0x2d, FACILITY_CLASS_DRAGON_TAMER}, + {0x2e, FACILITY_CLASS_BIRD_KEEPER}, + {0x2f, FACILITY_CLASS_NINJA_BOY}, + {0x30, FACILITY_CLASS_BATTLE_GIRL}, + {0x31, FACILITY_CLASS_PARASOL_LADY}, + {0x32, FACILITY_CLASS_SWIMMER_F}, + {0x33, FACILITY_CLASS_PICNICKER}, + {0x34, FACILITY_CLASS_TWINS}, + {0x35, FACILITY_CLASS_SAILOR}, + {0x38, FACILITY_CLASS_COLLECTOR}, + {0x39, FACILITY_CLASS_WALLY}, + {0x3a, FACILITY_CLASS_BRENDAN}, + {0x3b, FACILITY_CLASS_BRENDAN_2}, + {0x3c, FACILITY_CLASS_BRENDAN_3}, + {0x3d, FACILITY_CLASS_MAY}, + {0x3e, FACILITY_CLASS_MAY_2}, + {0x3f, FACILITY_CLASS_MAY_3}, + {0x40, FACILITY_CLASS_PKMN_BREEDER_M}, + {0x41, FACILITY_CLASS_POKEMON_BREEDER_F}, + {0x42, FACILITY_CLASS_PKMN_RANGER_M}, + {0x43, FACILITY_CLASS_PKMN_RANGER_F}, + {0x44, FACILITY_CLASS_MAGMA_LEADER_MAXIE}, + {0x45, FACILITY_CLASS_MAGMA_GRUNT_M}, + {0x46, FACILITY_CLASS_MAGMA_GRUNT_F}, + {0x47, FACILITY_CLASS_LASS}, + {0x48, FACILITY_CLASS_BUG_CATCHER}, + {0x49, FACILITY_CLASS_HIKER}, + {0x4a, FACILITY_CLASS_YOUNG_COUPLE}, + {0x4b, FACILITY_CLASS_OLD_COUPLE}, + {0x4c, FACILITY_CLASS_SIS_AND_BRO}, }; static const u8 *const gUnknown_085DCFD8[] = @@ -942,56 +942,56 @@ struct const u8 *const *strings; } const gUnknown_085DD500[] = { - {0x00000047, gUnknown_085DD118}, - {0x0000002b, gUnknown_085DD12C}, - {0x00000000, gUnknown_085DD140}, - {0x00000014, gUnknown_085DD154}, - {0x0000002d, gUnknown_085DD168}, - {0x00000013, gUnknown_085DD17C}, - {0x0000002f, gUnknown_085DD190}, - {0x00000043, gUnknown_085DD1A4}, - {0x00000026, gUnknown_085DD1B8}, - {0x00000015, gUnknown_085DD1CC}, - {0x0000000a, gUnknown_085DD1E0}, - {0x00000010, gUnknown_085DD1F4}, - {0x0000000c, gUnknown_085DD208}, - {0x00000042, gUnknown_085DD21C}, - {0x00000031, gUnknown_085DD230}, - {0x00000030, gUnknown_085DD244}, - {0x00000036, gUnknown_085DD258}, - {0x0000002e, gUnknown_085DD26C}, - {0x00000011, gUnknown_085DD280}, - {0x00000019, gUnknown_085DD294}, - {0x00000020, gUnknown_085DD2A8}, - {0x00000029, gUnknown_085DD2BC}, - {0x00000009, gUnknown_085DD2D0}, - {0x00000016, gUnknown_085DD2E4}, - {0x00000034, gUnknown_085DD2F8}, - {0x00000004, gUnknown_085DD30C}, - {0x00000035, gUnknown_085DD320}, - {0x00000037, gUnknown_085DD334}, - {0x0000001d, gUnknown_085DD348}, - {0x0000003a, gUnknown_085DD35C}, - {0x00000005, gUnknown_085DD370}, - {0x00000044, gUnknown_085DD384}, - {0x00000045, gUnknown_085DD398}, - {0x0000000d, gUnknown_085DD3AC}, - {0x0000000e, gUnknown_085DD3C0}, - {0x00000003, gUnknown_085DD3D4}, - {0x00000012, gUnknown_085DD3E8}, - {0x00000017, gUnknown_085DD3FC}, - {0x0000001a, gUnknown_085DD410}, - {0x0000001b, gUnknown_085DD424}, - {0x0000001c, gUnknown_085DD438}, - {0x0000001e, gUnknown_085DD44C}, - {0x0000001f, gUnknown_085DD460}, - {0x00000027, gUnknown_085DD474}, - {0x00000002, gUnknown_085DD488}, - {0x0000002a, gUnknown_085DD49C}, - {0x00000038, gUnknown_085DD4B0}, - {0x00000032, gUnknown_085DD4C4}, - {0x00000033, gUnknown_085DD4D8}, - {0x00000007, gUnknown_085DD4EC} + {FACILITY_CLASS_LASS, gUnknown_085DD118}, + {FACILITY_CLASS_YOUNGSTER, gUnknown_085DD12C}, + {FACILITY_CLASS_HIKER, gUnknown_085DD140}, + {FACILITY_CLASS_BEAUTY, gUnknown_085DD154}, + {FACILITY_CLASS_FISHERMAN, gUnknown_085DD168}, + {FACILITY_CLASS_LADY, gUnknown_085DD17C}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_F, gUnknown_085DD190}, + {FACILITY_CLASS_BUG_CATCHER, gUnknown_085DD1A4}, + {FACILITY_CLASS_SCHOOL_KID_M, gUnknown_085DD1B8}, + {FACILITY_CLASS_RICH_BOY, gUnknown_085DD1CC}, + {FACILITY_CLASS_BLACK_BELT, gUnknown_085DD1E0}, + {FACILITY_CLASS_TUBER_F, gUnknown_085DD1F4}, + {FACILITY_CLASS_HEX_MANIAC, gUnknown_085DD208}, + {FACILITY_CLASS_PKMN_BREEDER_M, gUnknown_085DD21C}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_F, gUnknown_085DD230}, + {FACILITY_CLASS_RUNNING_TRIATHLETE_M, gUnknown_085DD244}, + {FACILITY_CLASS_BATTLE_GIRL, gUnknown_085DD258}, + {FACILITY_CLASS_CYCLING_TRIATHLETE_M, gUnknown_085DD26C}, + {FACILITY_CLASS_TUBER_M, gUnknown_085DD280}, + {FACILITY_CLASS_GUITARIST, gUnknown_085DD294}, + {FACILITY_CLASS_GENTLEMAN, gUnknown_085DD2A8}, + {FACILITY_CLASS_POKEFAN_M, gUnknown_085DD2BC}, + {FACILITY_CLASS_EXPERT_M, gUnknown_085DD2D0}, + {FACILITY_CLASS_EXPERT_F, gUnknown_085DD2E4}, + {FACILITY_CLASS_DRAGON_TAMER, gUnknown_085DD2F8}, + {FACILITY_CLASS_BIRD_KEEPER, gUnknown_085DD30C}, + {FACILITY_CLASS_NINJA_BOY, gUnknown_085DD320}, + {FACILITY_CLASS_PARASOL_LADY, gUnknown_085DD334}, + {FACILITY_CLASS_BUG_MANIAC, gUnknown_085DD348}, + {FACILITY_CLASS_SAILOR, gUnknown_085DD35C}, + {FACILITY_CLASS_COLLECTOR, gUnknown_085DD370}, + {FACILITY_CLASS_PKMN_RANGER_M, gUnknown_085DD384}, + {FACILITY_CLASS_PKMN_RANGER_F, gUnknown_085DD398}, + {FACILITY_CLASS_AROMA_LADY, gUnknown_085DD3AC}, + {FACILITY_CLASS_RUIN_MANIAC, gUnknown_085DD3C0}, + {FACILITY_CLASS_COOLTRAINER_M, gUnknown_085DD3D4}, + {FACILITY_CLASS_COOLTRAINER_F, gUnknown_085DD3E8}, + {FACILITY_CLASS_POKEMANIAC, gUnknown_085DD3FC}, + {FACILITY_CLASS_KINDLER, gUnknown_085DD410}, + {FACILITY_CLASS_CAMPER, gUnknown_085DD424}, + {FACILITY_CLASS_PICNICKER, gUnknown_085DD438}, + {FACILITY_CLASS_PSYCHIC_M, gUnknown_085DD44C}, + {FACILITY_CLASS_PSYCHIC_F, gUnknown_085DD460}, + {FACILITY_CLASS_SCHOOL_KID_F, gUnknown_085DD474}, + {FACILITY_CLASS_POKEMON_BREEDER_F, gUnknown_085DD488}, + {FACILITY_CLASS_POKEFAN_F, gUnknown_085DD49C}, + {FACILITY_CLASS_SWIMMER_F, gUnknown_085DD4B0}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_M, gUnknown_085DD4C4}, + {FACILITY_CLASS_SWIMMING_TRIATHLETE_F, gUnknown_085DD4D8}, + {FACILITY_CLASS_SWIMMER_M, gUnknown_085DD4EC} }; static const u8 *const *const gUnknown_085DD690[] = -- cgit v1.2.3 From e143804af010b52d5723be3b583435e71e99f07f Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 04:32:00 -0500 Subject: Document pocket magic numbers. --- include/item_menu.h | 8 +++-- src/item_menu.c | 86 ++++++++++++++++++++++++++--------------------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/include/item_menu.h b/include/item_menu.h index 649eb934c..e8fc4c398 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -1,6 +1,8 @@ #ifndef GUARD_item_menu_H #define GUARD_item_menu_H +#include "item.h" + // Exported type declarations struct BagStruct { @@ -8,8 +10,8 @@ struct BagStruct u8 location; u8 pocket; u16 unk6; - u16 cursorPosition[5]; - u16 scrollPosition[5]; + u16 cursorPosition[POCKETS_COUNT]; + u16 scrollPosition[POCKETS_COUNT]; }; extern struct BagStruct gUnknown_0203CE58; @@ -36,7 +38,7 @@ struct UnkBagStruct u8 unk825; u8 filler[2]; u8 unk828; - u8 unk829[5]; + u8 unk829[POCKETS_COUNT]; u8 unk82E[6]; s16 unk834; u8 filler4[0xE]; diff --git a/src/item_menu.c b/src/item_menu.c index 1744a1bfa..a7d101651 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -432,8 +432,8 @@ struct ListBuffer2 { struct TempWallyStruct { struct ItemSlot bagPocket_Items[30]; struct ItemSlot bagPocket_PokeBalls[16]; - u16 cursorPosition[5]; - u16 scrollPosition[5]; + u16 cursorPosition[POCKETS_COUNT]; + u16 scrollPosition[POCKETS_COUNT]; u8 filler[0x2]; u16 pocket; }; @@ -455,60 +455,60 @@ extern const u16 gUnknown_0860F074[]; void ResetBagScrollPositions(void) { - gUnknown_0203CE58.pocket = 0; + gUnknown_0203CE58.pocket = ITEMS_POCKET; memset(gUnknown_0203CE58.cursorPosition, 0, 10); memset(gUnknown_0203CE58.scrollPosition, 0, 10); } void CB2_BagMenuFromStartMenu(void) { - GoToBagMenu(0, 5, CB2_ReturnToFieldWithOpenMenu); + GoToBagMenu(0, POCKETS_COUNT, CB2_ReturnToFieldWithOpenMenu); } void sub_81AABB0(void) { if (!InBattlePyramid()) - GoToBagMenu(1, 5, SetCB2ToReshowScreenAfterMenu2); + GoToBagMenu(1, POCKETS_COUNT, SetCB2ToReshowScreenAfterMenu2); else sub_81C4F98(1, SetCB2ToReshowScreenAfterMenu2); } void CB2_ChooseBerry(void) { - GoToBagMenu(4, 3, CB2_ReturnToFieldContinueScript); + GoToBagMenu(4, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); } void sub_81AABF0(void(*callback)(void)) { - GoToBagMenu(5, 3, callback); + GoToBagMenu(5, BERRIES_POCKET, callback); } void CB2_GoToSellMenu(void) { - GoToBagMenu(3, 5, CB2_ExitSellMenu); + GoToBagMenu(3, POCKETS_COUNT, CB2_ExitSellMenu); } void sub_81AAC14(void) { - GoToBagMenu(6, 5, sub_816B31C); + GoToBagMenu(6, POCKETS_COUNT, sub_816B31C); } void sub_81AAC28(void) { - GoToBagMenu(9, 5, bag_menu_leave_maybe_3); + GoToBagMenu(9, POCKETS_COUNT, bag_menu_leave_maybe_3); gSpecialVar_0x8005 = 0; gSpecialVar_Result = 0; } void sub_81AAC50(void) { - GoToBagMenu(7, 5, bag_menu_leave_maybe_2); + GoToBagMenu(7, POCKETS_COUNT, bag_menu_leave_maybe_2); gSpecialVar_Result = 0; } void sub_81AAC70(void) { - GoToBagMenu(8, 5, bag_menu_leave_maybe); + GoToBagMenu(8, POCKETS_COUNT, bag_menu_leave_maybe); gSpecialVar_Result = 0; } @@ -526,9 +526,9 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) gUnknown_0203CE58.location = bagMenuType; if (postExitMenuMainCallback2) gUnknown_0203CE58.bagCallback = postExitMenuMainCallback2; - if (pocketId <= 4) + if (pocketId <= POCKETS_COUNT - 1) gUnknown_0203CE58.pocket = pocketId; - temp = gUnknown_0203CE58.location - 4; + temp = gUnknown_0203CE58.location - (POCKETS_COUNT - 1); if (temp <= 1) gUnknown_0203CE54->unk81B = 1; gUnknown_0203CE54->unk0 = 0; @@ -788,7 +788,7 @@ void get_name(s8 *dest, u16 itemId) { switch (gUnknown_0203CE58.pocket) { - case 2: + case TMHM_POCKET: StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]); if (itemId >= ITEM_HM01) { @@ -801,7 +801,7 @@ void get_name(s8 *dest, u16 itemId) StringExpandPlaceholders(dest, gText_UnkF908Var1Clear7Var2); } break; - case 3: + case BERRIES_POCKET: ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_CHERI_BERRY + 1, 2, 2); CopyItemName(itemId, gStringVar2); StringExpandPlaceholders(dest, gText_UnkF908Var1Clear7Var2); @@ -851,14 +851,14 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a) itemQuantity = BagGetQuantityByPocketPosition(gUnknown_0203CE58.pocket + 1, item_index_in_pocket); if (itemId >= ITEM_HM01 && itemId <= ITEM_HM08) BlitBitmapToWindow(rboxId, gBagMenuHMIcon_Gfx, 8, a - 1, 16, 16); - if (gUnknown_0203CE58.pocket == 3) + if (gUnknown_0203CE58.pocket == BERRIES_POCKET) { ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 3); StringExpandPlaceholders(gStringVar4, gText_xVar1); offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77); bag_menu_print(rboxId, 7, gStringVar4, offset, a, 0, 0, -1, 0); } - else if (gUnknown_0203CE58.pocket != 4 && (unique = ItemId_GetImportance(itemId)) == FALSE) + else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && (unique = ItemId_GetImportance(itemId)) == FALSE) { ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 2); StringExpandPlaceholders(gStringVar4, gText_xVar1); @@ -973,8 +973,8 @@ void sub_81AB9A8(u8 pocketId) struct BagPocket *pocket = &gBagPockets[pocketId]; switch (pocketId) { - case 2: - case 3: + case TMHM_POCKET: + case BERRIES_POCKET: SortBerriesOrTMHMs(pocket); break; default: @@ -995,7 +995,7 @@ void sub_81AB9A8(u8 pocketId) void sub_81ABA6C(void) { u8 i; - for (i = 0; i < 5; i++) + for (i = 0; i < POCKETS_COUNT; i++) sub_81AB9A8(i); } @@ -1007,14 +1007,14 @@ void sub_81ABA88(u8 a) void sub_81ABAC4(void) { u8 i; - for (i = 0; i < 5; i++) + for (i = 0; i < POCKETS_COUNT; i++) sub_81ABA88(i); } void sub_81ABAE0(void) { u8 i; - for (i = 0; i < 5; i++) + for (i = 0; i < POCKETS_COUNT; i++) sub_8122298(&gUnknown_0203CE58.scrollPosition[i], &gUnknown_0203CE58.cursorPosition[i], gUnknown_0203CE54->unk82E[i], gUnknown_0203CE54->unk829[i], 8); } @@ -1055,7 +1055,7 @@ void sub_81ABC3C(u8 a) void sub_81ABC54(u8 a, s16 b) { - u8 r3 = (gUnknown_0203CE58.pocket == 3) ? 3 : 2; + u8 r3 = (gUnknown_0203CE58.pocket == BERRIES_POCKET) ? 3 : 2; ConvertIntToDecimalStringN(gStringVar1, b, 2, r3); StringExpandPlaceholders(gStringVar4, gText_xVar1); AddTextPrinterParameterized(a, 1, gStringVar4, GetStringCenterAlignXOffset(1, gStringVar4, 0x28), 2, 0, 0); @@ -1063,7 +1063,7 @@ void sub_81ABC54(u8 a, s16 b) void sub_81ABCC0(int a, int b, int c) { - u8 r3 = (gUnknown_0203CE58.pocket == 3) ? 3 : 2; + u8 r3 = (gUnknown_0203CE58.pocket == BERRIES_POCKET) ? 3 : 2; ConvertIntToDecimalStringN(gStringVar1, b, 2, r3); StringExpandPlaceholders(gStringVar4, gText_xVar1); AddTextPrinterParameterized(a, 1, gStringVar4, 0, 1, -1, 0); @@ -1164,10 +1164,10 @@ u8 GetSwitchBagPocketDirection(void) void ChangeBagPocketId(u8 *bagPocketId, s8 deltaBagPocketId) { - if (deltaBagPocketId == 1 && *bagPocketId == 4) + if (deltaBagPocketId == 1 && *bagPocketId == POCKETS_COUNT - 1) *bagPocketId = 0; else if (deltaBagPocketId == -1 && *bagPocketId == 0) - *bagPocketId = 4; + *bagPocketId = POCKETS_COUNT - 1; else *bagPocketId += deltaBagPocketId; } @@ -1444,7 +1444,7 @@ void sub_81AC644(u8 unused) default: if (sub_81221AC() == TRUE || InUnionRoom() == TRUE) { - if (gUnknown_0203CE58.pocket == 4 || !sub_8122148(gSpecialVar_ItemId)) + if (gUnknown_0203CE58.pocket == KEYITEMS_POCKET || !sub_8122148(gSpecialVar_ItemId)) { gUnknown_0203CE54->unk820 = &gUnknown_08614046; gUnknown_0203CE54->unk828 = 1; @@ -1459,14 +1459,14 @@ void sub_81AC644(u8 unused) { switch (gUnknown_0203CE58.pocket) { - case 0: + case ITEMS_POCKET: gUnknown_0203CE54->unk820 = &gUnknown_0203CE54->unk824; gUnknown_0203CE54->unk828 = 4; memcpy(&gUnknown_0203CE54->unk824, &gUnknown_0861402C, 4); if (ItemIsMail(gSpecialVar_ItemId) == TRUE) gUnknown_0203CE54->unk824 = 6; break; - case 4: + case KEYITEMS_POCKET: gUnknown_0203CE54->unk820 = &gUnknown_0203CE54->unk824; gUnknown_0203CE54->unk828 = 4; memcpy(&gUnknown_0203CE54->unk824, &gUnknown_08614030, 4); @@ -1478,22 +1478,22 @@ void sub_81AC644(u8 unused) gUnknown_0203CE54->unk824 = 7; } break; - case 1: + case BALLS_POCKET: gUnknown_0203CE54->unk820 = gUnknown_08614034; gUnknown_0203CE54->unk828 = 4; break; - case 2: + case TMHM_POCKET: gUnknown_0203CE54->unk820 = gUnknown_08614038; gUnknown_0203CE54->unk828 = 4; break; - case 3: + case BERRIES_POCKET: gUnknown_0203CE54->unk820 = gUnknown_0861403C; gUnknown_0203CE54->unk828 = 6; break; } } } - if (gUnknown_0203CE58.pocket == 2) + if (gUnknown_0203CE58.pocket == TMHM_POCKET) { ClearWindowTilemap(1); PrintTMHMMoveData(gSpecialVar_ItemId); @@ -1624,17 +1624,17 @@ bool8 sub_81ACDFC(s8 a) void bag_menu_remove_some_window(void) { if (gUnknown_0203CE54->unk828 == 1) - bag_menu_remove_window(0); + bag_menu_remove_window(0); else if (gUnknown_0203CE54->unk828 == 2) { - bag_menu_remove_window(1); + bag_menu_remove_window(1); } else if (gUnknown_0203CE54->unk828 == 4) { - bag_menu_remove_window(2); + bag_menu_remove_window(2); } else - bag_menu_remove_window(3); + bag_menu_remove_window(3); } void ItemMenu_UseOutOfBattle(u8 taskId) @@ -1648,7 +1648,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId) { FillWindowPixelBuffer(1, 0); schedule_bg_copy_tilemap_to_vram(0); - if (gUnknown_0203CE58.pocket != 3) + if (gUnknown_0203CE58.pocket != BERRIES_POCKET) ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); else sub_80FDD10(taskId); @@ -1842,7 +1842,7 @@ void ItemMenu_UseInBattle(u8 taskId) void bag_menu_mail_related(void) { - GoToBagMenu(12, 5, NULL); + GoToBagMenu(12, POCKETS_COUNT, NULL); } void item_menu_type_2(u8 taskId) @@ -1857,7 +1857,7 @@ void item_menu_type_2(u8 taskId) StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeldHere); DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD350); } - else if (gUnknown_0203CE58.pocket != 4 && !ItemId_GetImportance(gSpecialVar_ItemId)) + else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) { unknown_ItemMenu_Confirm(taskId); } @@ -1871,7 +1871,7 @@ void item_menu_type_b(u8 taskId) { if (ItemIsMail(gSpecialVar_ItemId) == TRUE) DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350); - else if (gUnknown_0203CE58.pocket != 4 && !ItemId_GetImportance(gSpecialVar_ItemId)) + else if (gUnknown_0203CE58.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId)) gTasks[taskId].func = unknown_ItemMenu_Confirm; else bag_menu_print_cant_be_held_msg(taskId); @@ -2157,7 +2157,7 @@ void DoWallyTutorialBagMenu(void) PrepareBagForWallyTutorial(); AddBagItem(ITEM_POTION, 1); AddBagItem(ITEM_POKE_BALL, 1); - GoToBagMenu(10, 0, SetCB2ToReshowScreenAfterMenu2); + GoToBagMenu(10, ITEMS_POCKET, SetCB2ToReshowScreenAfterMenu2); } void Task_WallyTutorialBagMenu(u8 taskId) -- cgit v1.2.3 From 2187dbb10af7ef22600ef7cbb818235556f60050 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 10 Dec 2018 10:17:03 -0500 Subject: remove explicit array lengths from battle_tower.c --- src/battle_tower.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/battle_tower.c b/src/battle_tower.c index cb128b532..c6ec643da 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -147,7 +147,7 @@ const u16 gBattleFrontierHeldItems[] = #include "data/battle_frontier/battle_frontier_trainers.h" #include "data/battle_frontier/battle_frontier_mons.h" -const u8 gTowerMaleFacilityClasses[30] = +const u8 gTowerMaleFacilityClasses[] = { FACILITY_CLASS_RUIN_MANIAC, FACILITY_CLASS_TUBER_M, @@ -181,7 +181,7 @@ const u8 gTowerMaleFacilityClasses[30] = FACILITY_CLASS_HIKER }; -const u8 gTowerFemaleFacilityClasses[20] = +const u8 gTowerFemaleFacilityClasses[] = { FACILITY_CLASS_AROMA_LADY, FACILITY_CLASS_TUBER_F, @@ -205,7 +205,7 @@ const u8 gTowerFemaleFacilityClasses[20] = FACILITY_CLASS_LASS }; -const u8 gTowerMaleTrainerGfxIds[30] = +const u8 gTowerMaleTrainerGfxIds[] = { EVENT_OBJ_GFX_HIKER, EVENT_OBJ_GFX_TUBER_M, @@ -239,7 +239,7 @@ const u8 gTowerMaleTrainerGfxIds[30] = EVENT_OBJ_GFX_HIKER }; -const u8 gTowerFemaleTrainerGfxIds[20] = +const u8 gTowerFemaleTrainerGfxIds[] = { EVENT_OBJ_GFX_WOMAN_2, EVENT_OBJ_GFX_TUBER_F, -- cgit v1.2.3 From c8cad8a3897cbcc5034dc4566f1d4d7b335ea722 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 10 Dec 2018 10:33:51 -0500 Subject: re-add explicit array sizes --- src/battle_tower.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/battle_tower.c b/src/battle_tower.c index c6ec643da..cb128b532 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -147,7 +147,7 @@ const u16 gBattleFrontierHeldItems[] = #include "data/battle_frontier/battle_frontier_trainers.h" #include "data/battle_frontier/battle_frontier_mons.h" -const u8 gTowerMaleFacilityClasses[] = +const u8 gTowerMaleFacilityClasses[30] = { FACILITY_CLASS_RUIN_MANIAC, FACILITY_CLASS_TUBER_M, @@ -181,7 +181,7 @@ const u8 gTowerMaleFacilityClasses[] = FACILITY_CLASS_HIKER }; -const u8 gTowerFemaleFacilityClasses[] = +const u8 gTowerFemaleFacilityClasses[20] = { FACILITY_CLASS_AROMA_LADY, FACILITY_CLASS_TUBER_F, @@ -205,7 +205,7 @@ const u8 gTowerFemaleFacilityClasses[] = FACILITY_CLASS_LASS }; -const u8 gTowerMaleTrainerGfxIds[] = +const u8 gTowerMaleTrainerGfxIds[30] = { EVENT_OBJ_GFX_HIKER, EVENT_OBJ_GFX_TUBER_M, @@ -239,7 +239,7 @@ const u8 gTowerMaleTrainerGfxIds[] = EVENT_OBJ_GFX_HIKER }; -const u8 gTowerFemaleTrainerGfxIds[] = +const u8 gTowerFemaleTrainerGfxIds[20] = { EVENT_OBJ_GFX_WOMAN_2, EVENT_OBJ_GFX_TUBER_F, -- cgit v1.2.3 From 0aa41ad6472a095864dc97649ae18bbd261383bb Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 11:38:27 -0500 Subject: Fix whitespace to be consistent. --- src/strings.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/strings.c b/src/strings.c index 7b3df0eca..7b0178fa1 100644 --- a/src/strings.c +++ b/src/strings.c @@ -255,25 +255,25 @@ const u8 gText_ThePC[] = _("the PC"); const u8 *const gReturnToXStringsTable[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheShop, - gText_TheField, - gText_TheField, - gText_ThePC, - gText_TheField, - gText_TheField, - gText_TheField, - gText_TheBattle, - gText_ThePC + gText_TheBattle, + gText_ThePokemonList, + gText_TheShop, + gText_TheField, + gText_TheField, + gText_ThePC, + gText_TheField, + gText_TheField, + gText_TheField, + gText_TheBattle, + gText_ThePC }; const u8 *const gReturnToXStringsTable2[] = { gText_TheField, - gText_TheBattle, - gText_ThePokemonList, - gText_TheField + gText_TheBattle, + gText_ThePokemonList, + gText_TheField }; const u8 gText_ReturnToVar1[] = _("Return to\n{STR_VAR_1}."); @@ -286,10 +286,10 @@ const u8 gText_KeyItemsPocket[] = _("KEY ITEMS"); const u8 *const gPocketNamesStringsTable[] = { gText_ItemsPocket, - gText_PokeBallsPocket, - gText_TMHMPocket, - gText_BerriesPocket, - gText_KeyItemsPocket + gText_PokeBallsPocket, + gText_TMHMPocket, + gText_BerriesPocket, + gText_KeyItemsPocket }; const u8 gText_UnkF908Var1Clear7Var2[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}"); -- cgit v1.2.3 From 2f008e866b2d0541e864e3c2c14c5b4437720fe4 Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 11:39:57 -0500 Subject: Document return locations. --- include/item_menu.h | 14 ++++++++++++++ src/item_menu.c | 26 +++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/include/item_menu.h b/include/item_menu.h index e8fc4c398..4631382cb 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -3,6 +3,20 @@ #include "item.h" +#define RETURN_LOCATION_FIELD 0 +#define RETURN_LOCATION_BATTLE 1 +#define RETURN_LOCATION_POKEMON_LIST 2 +#define RETURN_LOCATION_SHOP 3 +#define RETURN_LOCATION_FIELD_2 4 +#define RETURN_LOCATION_FIELD_3 5 +#define RETURN_LOCATION_PC 6 +#define RETURN_LOCATION_FIELD_4 7 +#define RETURN_LOCATION_FIELD_5 8 +#define RETURN_LOCATION_FIELD_6 9 +#define RETURN_LOCATION_BATTLE_2 10 +#define RETURN_LOCATION_PC_2 11 +#define RETURN_LOCATION_UNCHANGED 12 + // Exported type declarations struct BagStruct { diff --git a/src/item_menu.c b/src/item_menu.c index a7d101651..bc2bfb3b7 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -462,53 +462,53 @@ void ResetBagScrollPositions(void) void CB2_BagMenuFromStartMenu(void) { - GoToBagMenu(0, POCKETS_COUNT, CB2_ReturnToFieldWithOpenMenu); + GoToBagMenu(RETURN_LOCATION_FIELD, POCKETS_COUNT, CB2_ReturnToFieldWithOpenMenu); } void sub_81AABB0(void) { if (!InBattlePyramid()) - GoToBagMenu(1, POCKETS_COUNT, SetCB2ToReshowScreenAfterMenu2); + GoToBagMenu(RETURN_LOCATION_BATTLE, POCKETS_COUNT, SetCB2ToReshowScreenAfterMenu2); else sub_81C4F98(1, SetCB2ToReshowScreenAfterMenu2); } void CB2_ChooseBerry(void) { - GoToBagMenu(4, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); + GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript); } void sub_81AABF0(void(*callback)(void)) { - GoToBagMenu(5, BERRIES_POCKET, callback); + GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback); } void CB2_GoToSellMenu(void) { - GoToBagMenu(3, POCKETS_COUNT, CB2_ExitSellMenu); + GoToBagMenu(RETURN_LOCATION_SHOP, POCKETS_COUNT, CB2_ExitSellMenu); } void sub_81AAC14(void) { - GoToBagMenu(6, POCKETS_COUNT, sub_816B31C); + GoToBagMenu(RETURN_LOCATION_PC, POCKETS_COUNT, sub_816B31C); } void sub_81AAC28(void) { - GoToBagMenu(9, POCKETS_COUNT, bag_menu_leave_maybe_3); + GoToBagMenu(RETURN_LOCATION_FIELD_6, POCKETS_COUNT, bag_menu_leave_maybe_3); gSpecialVar_0x8005 = 0; gSpecialVar_Result = 0; } void sub_81AAC50(void) { - GoToBagMenu(7, POCKETS_COUNT, bag_menu_leave_maybe_2); + GoToBagMenu(RETURN_LOCATION_FIELD_4, POCKETS_COUNT, bag_menu_leave_maybe_2); gSpecialVar_Result = 0; } void sub_81AAC70(void) { - GoToBagMenu(8, POCKETS_COUNT, bag_menu_leave_maybe); + GoToBagMenu(RETURN_LOCATION_FIELD_5, POCKETS_COUNT, bag_menu_leave_maybe); gSpecialVar_Result = 0; } @@ -522,11 +522,11 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) } else { - if (bagMenuType != 12) + if (bagMenuType != RETURN_LOCATION_UNCHANGED) gUnknown_0203CE58.location = bagMenuType; if (postExitMenuMainCallback2) gUnknown_0203CE58.bagCallback = postExitMenuMainCallback2; - if (pocketId <= POCKETS_COUNT - 1) + if (pocketId < POCKETS_COUNT) gUnknown_0203CE58.pocket = pocketId; temp = gUnknown_0203CE58.location - (POCKETS_COUNT - 1); if (temp <= 1) @@ -1842,7 +1842,7 @@ void ItemMenu_UseInBattle(u8 taskId) void bag_menu_mail_related(void) { - GoToBagMenu(12, POCKETS_COUNT, NULL); + GoToBagMenu(RETURN_LOCATION_UNCHANGED, POCKETS_COUNT, NULL); } void item_menu_type_2(u8 taskId) @@ -2157,7 +2157,7 @@ void DoWallyTutorialBagMenu(void) PrepareBagForWallyTutorial(); AddBagItem(ITEM_POTION, 1); AddBagItem(ITEM_POKE_BALL, 1); - GoToBagMenu(10, ITEMS_POCKET, SetCB2ToReshowScreenAfterMenu2); + GoToBagMenu(RETURN_LOCATION_BATTLE_2, ITEMS_POCKET, SetCB2ToReshowScreenAfterMenu2); } void Task_WallyTutorialBagMenu(u8 taskId) -- cgit v1.2.3 From 68017b531a47bce7c125eea617a701a89013c983 Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 15:49:33 -0500 Subject: Rename UnknownPokemonStruct to BattleTowerPokemon. --- include/battle_tower.h | 2 +- include/global.h | 6 +++--- include/pokemon.h | 6 +++--- src/battle_tower.c | 2 +- src/pokemon.c | 6 +++--- src/record_mixing.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/battle_tower.h b/include/battle_tower.h index e361b9742..bd8e80fc1 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -9,7 +9,7 @@ struct RSBattleTowerRecord /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; /*0x10*/ u16 greeting[6]; - /*0x1C*/ struct UnknownPokemonStruct party[3]; + /*0x1C*/ struct BattleTowerPokemon party[3]; /*0xA0*/ u32 checksum; }; diff --git a/include/global.h b/include/global.h index 33a31bf4d..97625c890 100644 --- a/include/global.h +++ b/include/global.h @@ -301,7 +301,7 @@ struct Apprentice u32 checksum; }; -struct UnknownPokemonStruct +struct BattleTowerPokemon { u16 species; u16 heldItem; @@ -338,7 +338,7 @@ struct EmeraldBattleTowerRecord /*0x10*/ u16 greeting[6]; /*0x1C*/ u16 speechWon[6]; /*0x28*/ u16 speechLost[6]; - /*0x34*/ struct UnknownPokemonStruct party[4]; + /*0x34*/ struct BattleTowerPokemon party[4]; /*0xE4*/ u8 language; /*0xE8*/ u32 checksum; }; @@ -353,7 +353,7 @@ struct BattleTowerEReaderTrainer /*0x10*/ u16 greeting[6]; /*0x1C*/ u16 farewellPlayerLost[6]; /*0x28*/ u16 farewellPlayerWon[6]; - /*0x34*/ struct UnknownPokemonStruct party[3]; + /*0x34*/ struct BattleTowerPokemon party[3]; /*0xB8*/ u32 checksum; }; diff --git a/include/pokemon.h b/include/pokemon.h index 5d7f7f2ae..1d9fbf0ee 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -460,11 +460,11 @@ void CreateMaleMon(struct Pokemon *mon, u16 species, u8 level); void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality); void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u32 otId); void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread); -void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src); -void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50); +void sub_806819C(struct Pokemon *mon, struct BattleTowerPokemon *src); +void sub_8068338(struct Pokemon *mon, struct BattleTowerPokemon *src, bool8 lvl50); void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId); void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId); -void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest); +void sub_80686FC(struct Pokemon *mon, struct BattleTowerPokemon *dest); void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId); bool8 sub_80688F8(u8 caseId, u8 battlerId); void SetDeoxysStats(void); diff --git a/src/battle_tower.c b/src/battle_tower.c index cb128b532..4a9e0dbc4 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -3245,7 +3245,7 @@ static void FillPartnerParty(u16 trainerId) for (i = 0; i < 2; i++) { struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId]; - struct UnknownPokemonStruct monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]]; + struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]]; StringCopy(trainerName, record->name); if (record->language == LANGUAGE_JAPANESE) { diff --git a/src/pokemon.c b/src/pokemon.c index eec995050..46fe7b0d0 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2755,7 +2755,7 @@ void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedI CalculateMonStats(mon); } -void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src) +void sub_806819C(struct Pokemon *mon, struct BattleTowerPokemon *src) { s32 i; u8 nickname[30]; @@ -2809,7 +2809,7 @@ void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src) CalculateMonStats(mon); } -void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50) +void sub_8068338(struct Pokemon *mon, struct BattleTowerPokemon *src, bool8 lvl50) { s32 i; u8 nickname[30]; @@ -2937,7 +2937,7 @@ void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, CalculateMonStats(mon); } -void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest) +void sub_80686FC(struct Pokemon *mon, struct BattleTowerPokemon *dest) { s32 i; u16 heldItem; diff --git a/src/record_mixing.c b/src/record_mixing.c index d37883e4d..6d5d49265 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -647,7 +647,7 @@ static void ReceiveOldManData(OldMan *oldMan, size_t recordSize, u8 which) static void ReceiveBattleTowerData(void *battleTowerRecord, size_t recordSize, u8 which) { struct EmeraldBattleTowerRecord *dest; - struct UnknownPokemonStruct *btPokemon; + struct BattleTowerPokemon *btPokemon; u32 mixIndices[4]; s32 i; @@ -1866,7 +1866,7 @@ static void SanitizeEmeraldBattleTowerRecord(struct EmeraldBattleTowerRecord *ds for (i = 0; i < 4; i++) { - struct UnknownPokemonStruct *towerMon = &dst->party[i]; + struct BattleTowerPokemon *towerMon = &dst->party[i]; if (towerMon->species != 0) StripExtCtrlCodes(towerMon->nickname); } -- cgit v1.2.3 From d3e32ab287edbfb5575e4821a8f75a7de891867b Mon Sep 17 00:00:00 2001 From: Meowsy Date: Mon, 10 Dec 2018 15:50:10 -0500 Subject: Rename Mauville Man text. --- data/event_scripts.s | 16 ++++++++-------- include/event_scripts.h | 16 ++++++++-------- src/mauville_old_man.c | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index d90dbf584..5bd8825ad 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4651,35 +4651,35 @@ gOtherText_DontYouAgree:: @ 8294301 .string "\n" .string "Don't you agree?$" -gUnknown_08294313:: @ 8294313 +gMauvilleManText_ISoWantToGoOnAVacation:: @ 8294313 .string "I so want to go on a vacation.\n" .string "Would you happen to know a nice place?$" -gUnknown_08294359:: @ 8294359 +gMauvilleManText_IBoughtCrayonsWith120Colors:: @ 8294359 .string "I bought crayons with 120 colors!\n" .string "Don't you think that's nice?$" -gUnknown_08294398:: @ 8294398 +gMauvilleManText_WouldntItBeNiceIfWeCouldFloat:: @ 8294398 .string "Wouldn't it be nice if we could float\n" .string "away on a cloud of bubbles?$" -gUnknown_082943DA:: @ 82943DA +gMauvilleManText_WhenYouWriteOnASandyBeach:: @ 82943DA .string "When you write on a sandy beach,\n" .string "they wash away. It makes me sad.$" -gUnknown_0829441C:: @ 829441C +gMauvilleManText_WhatsTheBottomOfTheSeaLike:: @ 829441C .string "What's the bottom of the sea like?\n" .string "Just once I would so love to go!$" -gUnknown_08294460:: @ 8294460 +gMauvilleManText_WhenYouSeeTheSettingSunDoesIt:: @ 8294460 .string "When you see the setting sun, does it\n" .string "make you want to go home?$" -gUnknown_082944A0:: @ 82944A0 +gMauvilleManText_LyingBackInTheGreenGrass:: @ 82944A0 .string "Lying back in the green grass…\n" .string "Oh, it's so, so nice!$" -gUnknown_082944D5:: @ 82944D5 +gMauvilleManText_SecretBasesAreSoWonderful:: @ 82944D5 .string "SECRET BASES are so wonderful!\n" .string "Can't you feel the excitement?$" diff --git a/include/event_scripts.h b/include/event_scripts.h index 7f69ef3ae..2661494d3 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -405,14 +405,14 @@ extern const u8 gText_SoDesirable[]; extern const u8 gText_SoExciting[]; extern const u8 gText_SoAmusing[]; extern const u8 gText_SoMagical[]; -extern const u8 gUnknown_08294313[]; -extern const u8 gUnknown_08294359[]; -extern const u8 gUnknown_08294398[]; -extern const u8 gUnknown_082943DA[]; -extern const u8 gUnknown_0829441C[]; -extern const u8 gUnknown_08294460[]; -extern const u8 gUnknown_082944A0[]; -extern const u8 gUnknown_082944D5[]; +extern const u8 gMauvilleManText_ISoWantToGoOnAVacation[]; +extern const u8 gMauvilleManText_IBoughtCrayonsWith120Colors[]; +extern const u8 gMauvilleManText_WouldntItBeNiceIfWeCouldFloat[]; +extern const u8 gMauvilleManText_WhenYouWriteOnASandyBeach[]; +extern const u8 gMauvilleManText_WhatsTheBottomOfTheSeaLike[]; +extern const u8 gMauvilleManText_WhenYouSeeTheSettingSunDoesIt[]; +extern const u8 gMauvilleManText_LyingBackInTheGreenGrass[]; +extern const u8 gMauvilleManText_SecretBasesAreSoWonderful[]; extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E930[]; diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 110ec068e..930f1f35b 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -62,14 +62,14 @@ static const u8 * const sGiddyAdjectives[] = { }; static const u8 * const sGiddyQuestions[] = { - gUnknown_08294313, - gUnknown_08294359, - gUnknown_08294398, - gUnknown_082943DA, - gUnknown_0829441C, - gUnknown_08294460, - gUnknown_082944A0, - gUnknown_082944D5 + gMauvilleManText_ISoWantToGoOnAVacation, + gMauvilleManText_IBoughtCrayonsWith120Colors, + gMauvilleManText_WouldntItBeNiceIfWeCouldFloat, + gMauvilleManText_WhenYouWriteOnASandyBeach, + gMauvilleManText_WhatsTheBottomOfTheSeaLike, + gMauvilleManText_WhenYouSeeTheSettingSunDoesIt, + gMauvilleManText_LyingBackInTheGreenGrass, + gMauvilleManText_SecretBasesAreSoWonderful }; static void SetupBard(void) -- cgit v1.2.3 From 170b6ef44992f4b7decb31451a3756b6bd4e2d46 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 12 Dec 2018 23:18:25 -0600 Subject: Decompile battle_intro.c (#444) --- asm/battle_intro.s | 2035 --------------------------------------- data/data2c.s | 5 +- include/battle_anim.h | 12 +- include/gba/types.h | 4 +- ld_script.txt | 2 +- src/battle_anim_utility_funcs.c | 8 +- src/battle_intro.c | 746 +++++++++++++- src/battle_main.c | 4 +- src/easy_chat.c | 3 + sym_ewram.txt | 15 +- 10 files changed, 754 insertions(+), 2080 deletions(-) delete mode 100644 asm/battle_intro.s diff --git a/asm/battle_intro.s b/asm/battle_intro.s deleted file mode 100644 index 04a0301ce..000000000 --- a/asm/battle_intro.s +++ /dev/null @@ -1,2035 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start SetAnimBgAttribute -SetAnimBgAttribute: @ 811802C - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - lsls r2, 24 - lsrs r4, r2, 24 - cmp r6, 0x3 - bls _08118040 - b _08118132 -_08118040: - ldr r0, =gUnknown_0859741A - adds r0, r6, r0 - ldrb r0, [r0] - bl GetGpuReg - ldr r1, =gUnknown_0203A114 - strh r0, [r1] - cmp r5, 0x6 - bhi _08118124 - lsls r0, r5, 2 - ldr r1, =_08118068 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08118068: - .4byte _08118084 - .4byte _08118098 - .4byte _081180B0 - .4byte _081180C8 - .4byte _081180E0 - .4byte _081180FC - .4byte _08118110 -_08118084: - ldr r2, =gUnknown_0203A114 - lsls r3, r4, 6 - ldrb r1, [r2, 0x1] - movs r0, 0x3F - ands r0, r1 - orrs r0, r3 - strb r0, [r2, 0x1] - b _08118124 - .pool -_08118098: - ldr r3, =gUnknown_0203A114 - movs r0, 0x1 - adds r1, r4, 0 - ands r1, r0 - lsls r1, 5 - ldrb r2, [r3, 0x1] - movs r0, 0x21 - negs r0, r0 - b _0811811E - .pool -_081180B0: - ldr r3, =gUnknown_0203A114 - movs r0, 0x1 - adds r1, r4, 0 - ands r1, r0 - lsls r1, 6 - ldrb r2, [r3] - movs r0, 0x41 - negs r0, r0 - b _081180EE - .pool -_081180C8: - ldr r3, =gUnknown_0203A114 - movs r0, 0x3 - adds r1, r4, 0 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r3] - movs r0, 0xD - negs r0, r0 - b _081180EE - .pool -_081180E0: - ldr r3, =gUnknown_0203A114 - movs r0, 0x3 - adds r1, r4, 0 - ands r1, r0 - ldrb r2, [r3] - movs r0, 0x4 - negs r0, r0 -_081180EE: - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - b _08118124 - .pool -_081180FC: - ldr r2, =gUnknown_0203A114 - lsls r3, r4, 7 - ldrb r1, [r2] - movs r0, 0x7F - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - b _08118124 - .pool -_08118110: - ldr r3, =gUnknown_0203A114 - movs r0, 0x1F - adds r1, r4, 0 - ands r1, r0 - ldrb r2, [r3, 0x1] - movs r0, 0x20 - negs r0, r0 -_0811811E: - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x1] -_08118124: - ldr r0, =gUnknown_0859741A - adds r0, r6, r0 - ldrb r0, [r0] - ldr r1, =gUnknown_0203A114 - ldrh r1, [r1] - bl SetGpuReg -_08118132: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end SetAnimBgAttribute - - thumb_func_start GetAnimBgAttribute -GetAnimBgAttribute: @ 8118140 - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r2, r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - cmp r2, 0x3 - bhi _081181C8 - ldr r0, =gUnknown_0859741E - adds r0, r2, r0 - ldrb r0, [r0] - bl GetGpuReg - mov r1, sp - strh r0, [r1] - cmp r4, 0x6 - bhi _081181C8 - lsls r0, r4, 2 - ldr r1, =_08118174 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08118174: - .4byte _08118190 - .4byte _08118198 - .4byte _081181A0 - .4byte _081181A8 - .4byte _081181B0 - .4byte _081181B8 - .4byte _081181C0 -_08118190: - ldr r0, [sp] - lsls r0, 16 - lsrs r0, 30 - b _081181CA -_08118198: - ldr r0, [sp] - lsls r0, 18 - lsrs r0, 31 - b _081181CA -_081181A0: - ldr r0, [sp] - lsls r0, 25 - lsrs r0, 31 - b _081181CA -_081181A8: - ldr r0, [sp] - lsls r0, 28 - lsrs r0, 30 - b _081181CA -_081181B0: - ldr r0, [sp] - lsls r0, 30 - lsrs r0, 30 - b _081181CA -_081181B8: - ldr r0, [sp] - lsls r0, 24 - lsrs r0, 31 - b _081181CA -_081181C0: - ldr r0, [sp] - lsls r0, 19 - lsrs r0, 27 - b _081181CA -_081181C8: - movs r0, 0 -_081181CA: - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end GetAnimBgAttribute - - thumb_func_start HandleIntroSlide -HandleIntroSlide: @ 81181D4 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r2, =gBattleTypeFlags - ldr r0, [r2] - movs r1, 0x80 - lsls r1, 15 - ands r0, r1 - cmp r0, 0 - beq _08118208 - ldr r0, =gPartnerTrainerId - ldrh r1, [r0] - ldr r0, =0x00000c03 - cmp r1, r0 - beq _08118208 - ldr r0, =sub_8118D68 - b _08118258 - .pool -_08118208: - ldr r2, [r2] - movs r0, 0x2 - ands r0, r2 - cmp r0, 0 - beq _0811821C - ldr r0, =task00_battle_intro_wireless - b _08118258 - .pool -_0811821C: - ldr r0, =0x003f0100 - ands r0, r2 - cmp r0, 0 - beq _08118230 - ldr r0, =task_battle_intro_anim - b _08118258 - .pool -_08118230: - movs r0, 0x80 - lsls r0, 5 - ands r2, r0 - cmp r2, 0 - beq _08118250 - ldr r0, =gGameVersion - ldrb r0, [r0] - cmp r0, 0x2 - beq _08118250 - movs r4, 0x3 - ldr r0, =task00_battle_intro_80BC6C8 - b _08118258 - .pool -_08118250: - ldr r1, =gUnknown_08597424 - lsls r0, r4, 2 - adds r0, r1 - ldr r0, [r0] -_08118258: - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - movs r0, 0 - strh r0, [r1, 0x8] - strh r4, [r1, 0xA] - strh r0, [r1, 0xC] - strh r0, [r1, 0xE] - strh r0, [r1, 0x10] - strh r0, [r1, 0x12] - strh r0, [r1, 0x14] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end HandleIntroSlide - - thumb_func_start sub_811828C -sub_811828C: @ 811828C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - ldr r0, =gBattle_BG1_X - movs r1, 0 - strh r1, [r0] - ldr r0, =gBattle_BG1_Y - strh r1, [r0] - ldr r0, =gBattle_BG2_X - strh r1, [r0] - ldr r0, =gBattle_BG2_Y - strh r1, [r0] - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldr r4, =0x00003f3f - movs r0, 0x48 - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x4A - adds r1, r4, 0 - bl SetGpuReg - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_811828C - - thumb_func_start task_battle_intro_80BC47C -task_battle_intro_80BC47C: @ 81182EC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x6 - strh r0, [r1] - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - mov r8, r1 - cmp r0, 0x4 - bls _08118318 - b _0811852A -_08118318: - lsls r0, 2 - ldr r1, =_08118330 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08118330: - .4byte _08118344 - .4byte _08118374 - .4byte _0811839C - .4byte _081183E4 - .4byte _08118524 -_08118344: - ldr r0, =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08118360 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - add r0, r8 - movs r1, 0x10 - b _0811836A - .pool -_08118360: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - add r0, r8 - movs r1, 0x1 -_0811836A: - strh r1, [r0, 0xC] - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _0811852A -_08118374: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - mov r3, r8 - adds r1, r0, r3 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _0811838C - b _0811852A -_0811838C: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0x48 - movs r1, 0x3F - bl SetGpuReg - b _0811852A -_0811839C: - ldr r1, =gBattle_WIN0V - ldrh r0, [r1] - subs r0, 0xFF - strh r0, [r1] - movs r1, 0xFF - lsls r1, 8 - ands r0, r1 - movs r1, 0xC0 - lsls r1, 6 - cmp r0, r1 - beq _081183B4 - b _0811852A -_081183B4: - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - add r1, r8 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - movs r0, 0x20 - strh r0, [r1, 0xE] - ldr r2, =gIntroSlideFlags - ldrh r1, [r2] - ldr r0, =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _0811852A - .pool -_081183E4: - lsls r0, r4, 2 - adds r1, r0, r4 - lsls r1, 3 - mov r5, r8 - adds r2, r1, r5 - ldrh r3, [r2, 0xE] - movs r5, 0xE - ldrsh r1, [r2, r5] - mov r12, r0 - cmp r1, 0 - beq _08118400 - subs r0, r3, 0x1 - strh r0, [r2, 0xE] - b _0811842E -_08118400: - movs r1, 0xA - ldrsh r0, [r2, r1] - cmp r0, 0x1 - bne _08118420 - ldr r2, =gBattle_BG1_Y - ldrh r1, [r2] - ldr r0, =0x0000ffb0 - cmp r1, r0 - beq _0811842E - subs r0, r1, 0x2 - b _0811842C - .pool -_08118420: - ldr r2, =gBattle_BG1_Y - ldrh r1, [r2] - ldr r0, =0x0000ffc8 - cmp r1, r0 - beq _0811842E - subs r0, r1, 0x1 -_0811842C: - strh r0, [r2] -_0811842E: - ldr r2, =gBattle_WIN0V - ldrh r1, [r2] - movs r0, 0xFF - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _08118442 - ldr r3, =0xfffffc04 - adds r0, r1, r3 - strh r0, [r2] -_08118442: - mov r5, r12 - adds r0, r5, r4 - lsls r0, 3 - mov r2, r8 - adds r1, r0, r2 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _0811845A - subs r0, r2, 0x2 - strh r0, [r1, 0xC] -_0811845A: - movs r3, 0 - ldr r5, =gScanlineEffect - mov r9, r5 - ldr r7, =gScanlineEffectRegBuffers - mov r6, r9 - adds r5, r1, 0 -_08118466: - lsls r2, r3, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - ldrh r0, [r5, 0xC] - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x4F - ble _08118466 - cmp r3, 0x9F - bgt _081184AA - ldr r7, =gScanlineEffectRegBuffers - ldr r6, =gScanlineEffect - ldr r1, =gTasks - mov r2, r12 - adds r0, r2, r4 - lsls r0, 3 - adds r5, r0, r1 -_08118490: - lsls r2, r3, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - ldrh r0, [r5, 0xC] - negs r0, r0 - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x9F - ble _08118490 -_081184AA: - mov r3, r12 - adds r0, r3, r4 - lsls r0, 3 - mov r5, r8 - adds r1, r0, r5 - movs r0, 0xC - ldrsh r2, [r1, r0] - cmp r2, 0 - bne _0811852A - movs r0, 0x3 - mov r3, r9 - strb r0, [r3, 0x15] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - str r2, [sp] - ldr r1, =0x0600e000 - ldr r2, =0x05000200 - mov r0, sp - bl CpuSet - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r0, 0x2 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r1, 0x9C - lsls r1, 8 - movs r0, 0xA - bl SetGpuReg - movs r1, 0xBC - lsls r1, 7 - movs r0, 0xC - bl SetGpuReg - b _0811852A - .pool -_08118524: - adds r0, r4, 0 - bl sub_811828C -_0811852A: - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end task_battle_intro_80BC47C - - thumb_func_start task00_battle_intro_80BC6C8 -task00_battle_intro_80BC6C8: @ 8118538 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - movs r2, 0xA - ldrsh r0, [r0, r2] - adds r2, r1, 0 - cmp r0, 0x3 - beq _08118578 - cmp r0, 0x3 - bgt _08118568 - cmp r0, 0x2 - beq _0811856C - b _08118580 - .pool -_08118568: - cmp r0, 0x4 - bne _08118580 -_0811856C: - ldr r1, =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x8 - b _0811857E - .pool -_08118578: - ldr r1, =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x6 -_0811857E: - strh r0, [r1] -_08118580: - lsls r0, r5, 2 - adds r1, r0, r5 - lsls r1, 3 - adds r4, r1, r2 - movs r3, 0xA - ldrsh r1, [r4, r3] - adds r6, r0, 0 - cmp r1, 0x4 - bne _081185E4 - ldr r7, =gBattle_BG1_Y - ldrh r0, [r4, 0x14] - bl Cos2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _081185A6 - ldr r1, =0x000001ff - adds r0, r1 -_081185A6: - asrs r0, 9 - subs r0, 0x8 - strh r0, [r7] - ldrh r1, [r4, 0x14] - movs r2, 0x14 - ldrsh r0, [r4, r2] - cmp r0, 0xB3 - bgt _081185C8 - adds r0, r1, 0x4 - b _081185CA - .pool -_081185C8: - adds r0, r1, 0x6 -_081185CA: - strh r0, [r4, 0x14] - ldr r2, =gTasks - adds r0, r6, r5 - lsls r0, 3 - adds r3, r0, r2 - movs r0, 0x14 - ldrsh r1, [r3, r0] - movs r0, 0xB4 - lsls r0, 1 - cmp r1, r0 - bne _081185E4 - movs r0, 0 - strh r0, [r3, 0x14] -_081185E4: - adds r0, r6, r5 - lsls r0, 3 - adds r0, r2 - movs r1, 0x8 - ldrsh r0, [r0, r1] - cmp r0, 0x4 - bls _081185F4 - b _0811881A -_081185F4: - lsls r0, 2 - ldr r1, =_08118608 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08118608: - .4byte _0811861C - .4byte _0811864C - .4byte _08118678 - .4byte _081186C8 - .4byte _08118814 -_0811861C: - ldr r1, =gTasks - adds r0, r6, r5 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x10 - strh r3, [r2, 0x10] - ldr r0, =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08118640 - strh r3, [r2, 0xC] - b _08118644 - .pool -_08118640: - movs r0, 0x1 - strh r0, [r2, 0xC] -_08118644: - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _0811881A -_0811864C: - ldr r0, =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _08118662 - b _0811881A -_08118662: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0x48 - movs r1, 0x3F - bl SetGpuReg - b _0811881A - .pool -_08118678: - ldr r1, =gBattle_WIN0V - ldrh r0, [r1] - subs r0, 0xFF - strh r0, [r1] - movs r1, 0xFF - lsls r1, 8 - ands r0, r1 - movs r1, 0xC0 - lsls r1, 6 - cmp r0, r1 - beq _08118690 - b _0811881A -_08118690: - ldr r0, =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - movs r0, 0x20 - strh r0, [r1, 0xE] - movs r0, 0x1 - strh r0, [r1, 0x12] - ldr r2, =gIntroSlideFlags - ldrh r1, [r2] - ldr r0, =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _0811881A - .pool -_081186C8: - ldr r0, =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r1, r0 - ldrh r2, [r1, 0xE] - movs r3, 0xE - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _08118708 - subs r0, r2, 0x1 - strh r0, [r1, 0xE] - lsls r0, 16 - cmp r0, 0 - bne _08118728 - ldr r1, =0x00001842 - movs r0, 0x50 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0xF - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - b _08118728 - .pool -_08118708: - ldrh r2, [r1, 0x10] - movs r0, 0x1F - ands r0, r2 - cmp r0, 0 - beq _08118728 - ldrh r0, [r1, 0x12] - subs r0, 0x1 - strh r0, [r1, 0x12] - lsls r0, 16 - cmp r0, 0 - bne _08118728 - adds r0, r2, 0 - adds r0, 0xFF - strh r0, [r1, 0x10] - movs r0, 0x4 - strh r0, [r1, 0x12] -_08118728: - ldr r2, =gBattle_WIN0V - ldrh r1, [r2] - movs r0, 0xFF - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _0811873C - ldr r3, =0xfffffc04 - adds r0, r1, r3 - strh r0, [r2] -_0811873C: - ldr r0, =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r1, r0 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _08118752 - subs r0, r2, 0x2 - strh r0, [r1, 0xC] -_08118752: - movs r3, 0 - ldr r0, =gScanlineEffect - mov r8, r0 - ldr r2, =gScanlineEffectRegBuffers - mov r12, r2 - mov r7, r8 - adds r4, r1, 0 -_08118760: - lsls r2, r3, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r12 - ldrh r0, [r4, 0xC] - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x4F - ble _08118760 - cmp r3, 0x9F - bgt _081187A4 - ldr r0, =gScanlineEffectRegBuffers - mov r12, r0 - ldr r7, =gScanlineEffect - ldr r1, =gTasks - adds r0, r6, r5 - lsls r0, 3 - adds r4, r0, r1 -_0811878A: - lsls r2, r3, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r12 - ldrh r0, [r4, 0xC] - negs r0, r0 - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x9F - ble _0811878A -_081187A4: - ldr r1, =gTasks - adds r0, r6, r5 - lsls r0, 3 - adds r1, r0, r1 - movs r3, 0xC - ldrsh r2, [r1, r3] - cmp r2, 0 - bne _0811881A - movs r0, 0x3 - mov r3, r8 - strb r0, [r3, 0x15] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - str r2, [sp] - ldr r1, =0x0600e000 - ldr r2, =0x05000200 - mov r0, sp - bl CpuSet - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r0, 0x2 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r1, 0x9C - lsls r1, 8 - movs r0, 0xA - bl SetGpuReg - movs r1, 0xBC - lsls r1, 7 - movs r0, 0xC - bl SetGpuReg - b _0811881A - .pool -_08118814: - adds r0, r5, 0 - bl sub_811828C -_0811881A: - ldr r0, =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r1, r0 - movs r2, 0x8 - ldrsh r0, [r1, r2] - cmp r0, 0x4 - beq _08118832 - ldrh r1, [r1, 0x10] - movs r0, 0x52 - bl SetGpuReg -_08118832: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end task00_battle_intro_80BC6C8 - - thumb_func_start task_battle_intro_anim -task_battle_intro_anim: @ 8118844 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x8 - strh r0, [r1] - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - adds r4, r1, 0 - cmp r0, 0x4 - bls _0811886E - b _08118A96 -_0811886E: - lsls r0, 2 - ldr r1, =_08118884 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08118884: - .4byte _08118898 - .4byte _081188F0 - .4byte _0811891C - .4byte _0811896C - .4byte _08118A90 -_08118898: - ldr r1, =0x00001842 - movs r0, 0x50 - bl SetGpuReg - ldr r4, =0x00000808 - movs r0, 0x52 - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r2, r0, r1 - strh r4, [r2, 0x10] - ldr r0, =gBattleTypeFlags - ldr r0, [r0] - ldr r1, =0x02000002 - ands r0, r1 - cmp r0, 0 - beq _081188E4 - movs r0, 0x10 - b _081188E6 - .pool -_081188E4: - movs r0, 0x1 -_081188E6: - strh r0, [r2, 0xC] - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _08118A96 -_081188F0: - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _08118908 - b _08118A96 -_08118908: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0x48 - movs r1, 0x3F - bl SetGpuReg - b _08118A96 - .pool -_0811891C: - ldr r1, =gBattle_WIN0V - ldrh r0, [r1] - subs r0, 0xFF - strh r0, [r1] - movs r1, 0xFF - lsls r1, 8 - ands r0, r1 - movs r1, 0xC0 - lsls r1, 6 - cmp r0, r1 - beq _08118934 - b _08118A96 -_08118934: - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - movs r0, 0x20 - strh r0, [r1, 0xE] - movs r0, 0x1 - strh r0, [r1, 0x12] - ldr r2, =gIntroSlideFlags - ldrh r1, [r2] - ldr r0, =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _08118A96 - .pool -_0811896C: - lsls r0, r5, 2 - adds r1, r0, r5 - lsls r1, 3 - adds r2, r1, r4 - ldrh r3, [r2, 0xE] - movs r6, 0xE - ldrsh r1, [r2, r6] - mov r12, r0 - cmp r1, 0 - beq _08118986 - subs r0, r3, 0x1 - strh r0, [r2, 0xE] - b _081189A6 -_08118986: - ldrh r1, [r2, 0x10] - movs r0, 0xF - ands r0, r1 - cmp r0, 0 - beq _081189A6 - ldrh r0, [r2, 0x12] - subs r0, 0x1 - strh r0, [r2, 0x12] - lsls r0, 16 - cmp r0, 0 - bne _081189A6 - adds r0, r1, 0 - adds r0, 0xFF - strh r0, [r2, 0x10] - movs r0, 0x6 - strh r0, [r2, 0x12] -_081189A6: - ldr r2, =gBattle_WIN0V - ldrh r1, [r2] - movs r0, 0xFF - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _081189BA - ldr r3, =0xfffffc04 - adds r0, r1, r3 - strh r0, [r2] -_081189BA: - mov r6, r12 - adds r0, r6, r5 - lsls r0, 3 - adds r1, r0, r4 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _081189D0 - subs r0, r2, 0x2 - strh r0, [r1, 0xC] -_081189D0: - movs r3, 0 - ldr r6, =gScanlineEffect - mov r8, r6 - ldr r7, =gScanlineEffectRegBuffers - adds r4, r1, 0 -_081189DA: - lsls r2, r3, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - ldrh r0, [r4, 0xC] - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x4F - ble _081189DA - cmp r3, 0x9F - bgt _08118A1E - ldr r7, =gScanlineEffectRegBuffers - ldr r6, =gScanlineEffect - ldr r1, =gTasks - mov r2, r12 - adds r0, r2, r5 - lsls r0, 3 - adds r4, r0, r1 -_08118A04: - lsls r2, r3, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - ldrh r0, [r4, 0xC] - negs r0, r0 - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x9F - ble _08118A04 -_08118A1E: - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r1, r0, r1 - movs r3, 0xC - ldrsh r2, [r1, r3] - cmp r2, 0 - bne _08118A96 - movs r0, 0x3 - mov r6, r8 - strb r0, [r6, 0x15] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - str r2, [sp] - ldr r1, =0x0600e000 - ldr r2, =0x05000200 - mov r0, sp - bl CpuSet - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r0, 0x2 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r1, 0x9C - lsls r1, 8 - movs r0, 0xA - bl SetGpuReg - movs r1, 0xBC - lsls r1, 7 - movs r0, 0xC - bl SetGpuReg - b _08118A96 - .pool -_08118A90: - adds r0, r5, 0 - bl sub_811828C -_08118A96: - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - movs r2, 0x8 - ldrsh r0, [r1, r2] - cmp r0, 0x4 - beq _08118AB0 - ldrh r1, [r1, 0x10] - movs r0, 0x52 - bl SetGpuReg -_08118AB0: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end task_battle_intro_anim - - thumb_func_start task00_battle_intro_wireless -task00_battle_intro_wireless: @ 8118AC0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r7, r0, r1 - movs r1, 0x8 - ldrsh r0, [r7, r1] - cmp r0, 0x1 - ble _08118B36 - movs r2, 0x10 - ldrsh r0, [r7, r2] - cmp r0, 0 - bne _08118B36 - ldr r2, =gBattle_BG1_X - ldrh r1, [r2] - movs r0, 0x80 - lsls r0, 8 - ands r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0 - bne _08118AFE - cmp r1, 0x4F - bhi _08118B18 -_08118AFE: - adds r0, r1, 0x3 - strh r0, [r2] - ldr r1, =gBattle_BG2_X - ldrh r0, [r1] - subs r0, 0x3 - strh r0, [r1] - b _08118B36 - .pool -_08118B18: - str r5, [sp] - ldr r1, =0x0600e000 - ldr r4, =0x05000200 - mov r0, sp - adds r2, r4, 0 - bl CpuSet - str r5, [sp, 0x4] - add r0, sp, 0x4 - ldr r1, =0x0600f000 - adds r2, r4, 0 - bl CpuSet - movs r0, 0x1 - strh r0, [r7, 0x10] -_08118B36: - ldr r0, =gTasks - lsls r2, r6, 2 - adds r1, r2, r6 - lsls r1, 3 - adds r1, r0 - movs r3, 0x8 - ldrsh r1, [r1, r3] - mov r9, r0 - adds r5, r2, 0 - cmp r1, 0x4 - bls _08118B4E - b _08118D5A -_08118B4E: - lsls r0, r1, 2 - ldr r1, =_08118B6C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08118B6C: - .4byte _08118B80 - .4byte _08118B92 - .4byte _08118C38 - .4byte _08118C7C - .4byte _08118D54 -_08118B80: - adds r0, r5, r6 - lsls r0, 3 - add r0, r9 - movs r1, 0x20 - strh r1, [r0, 0xC] - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _08118D5A -_08118B92: - adds r0, r5, r6 - lsls r0, 3 - mov r2, r9 - adds r1, r0, r2 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _08118BA8 - b _08118D5A -_08118BA8: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - ldr r4, =gSprites - ldr r5, =gBattleStruct - ldr r0, [r5] - adds r0, 0x7D - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrb r3, [r1, 0x1] - movs r2, 0xD - negs r2, r2 - adds r0, r2, 0 - ands r0, r3 - movs r3, 0x8 - mov r9, r3 - mov r3, r9 - orrs r0, r3 - strb r0, [r1, 0x1] - ldr r3, [r5] - adds r0, r3, 0 - adds r0, 0x7D - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - movs r1, 0x1C - adds r1, r4 - mov r8, r1 - add r0, r8 - ldr r6, =sub_8038B74 - str r6, [r0] - adds r3, 0x7E - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r1, [r0, 0x1] - ands r2, r1 - mov r3, r9 - orrs r2, r3 - strb r2, [r0, 0x1] - ldr r0, [r5] - adds r0, 0x7E - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - str r6, [r0] - movs r0, 0x48 - movs r1, 0x3F - bl SetGpuReg - ldr r1, =0x00003f06 - movs r0, 0x4A - bl SetGpuReg - b _08118D5A - .pool -_08118C38: - ldr r1, =gBattle_WIN0V - ldrh r0, [r1] - subs r0, 0xFF - strh r0, [r1] - movs r1, 0xFF - lsls r1, 8 - ands r0, r1 - movs r1, 0xC0 - lsls r1, 6 - cmp r0, r1 - beq _08118C50 - b _08118D5A -_08118C50: - adds r1, r5, r6 - lsls r1, 3 - add r1, r9 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - movs r0, 0x20 - strh r0, [r1, 0xE] - ldr r2, =gIntroSlideFlags - ldrh r1, [r2] - ldr r0, =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _08118D5A - .pool -_08118C7C: - ldr r2, =gBattle_WIN0V - ldrh r1, [r2] - movs r0, 0xFF - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _08118C90 - ldr r3, =0xfffffc04 - adds r0, r1, r3 - strh r0, [r2] -_08118C90: - adds r0, r5, r6 - lsls r0, 3 - mov r2, r9 - adds r1, r0, r2 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _08118CA6 - subs r0, r2, 0x2 - strh r0, [r1, 0xC] -_08118CA6: - movs r3, 0 - ldr r0, =gScanlineEffect - mov r12, r0 - ldr r2, =gScanlineEffectRegBuffers - mov r8, r2 - mov r7, r12 - adds r4, r1, 0 -_08118CB4: - lsls r2, r3, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r8 - ldrh r0, [r4, 0xC] - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x4F - ble _08118CB4 - cmp r3, 0x9F - bgt _08118CF8 - ldr r0, =gScanlineEffectRegBuffers - mov r8, r0 - ldr r7, =gScanlineEffect - ldr r1, =gTasks - adds r0, r5, r6 - lsls r0, 3 - adds r4, r0, r1 -_08118CDE: - lsls r2, r3, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r8 - ldrh r0, [r4, 0xC] - negs r0, r0 - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x9F - ble _08118CDE -_08118CF8: - adds r0, r5, r6 - lsls r0, 3 - mov r2, r9 - adds r1, r0, r2 - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - bne _08118D5A - movs r0, 0x3 - mov r2, r12 - strb r0, [r2, 0x15] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r0, 0x2 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r1, 0x9C - lsls r1, 8 - movs r0, 0xA - bl SetGpuReg - movs r1, 0xBC - lsls r1, 7 - movs r0, 0xC - bl SetGpuReg - b _08118D5A - .pool -_08118D54: - adds r0, r6, 0 - bl sub_811828C -_08118D5A: - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end task00_battle_intro_wireless - - thumb_func_start sub_8118D68 -sub_8118D68: @ 8118D68 - push {r4-r6,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - adds r6, r1, 0 - cmp r0, 0x5 - bls _08118D86 - b _08118FB2 -_08118D86: - lsls r0, 2 - ldr r1, =_08118D98 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08118D98: - .4byte _08118DB0 - .4byte _08118DBE - .4byte _08118E4C - .4byte _08118EA8 - .4byte _08118F00 - .4byte _08118FAC -_08118DB0: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r6 - movs r1, 0x1 - strh r1, [r0, 0xC] - b _08118F84 -_08118DBE: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r1, r0, r6 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _08118DD4 - b _08118FB2 -_08118DD4: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - ldr r1, =0x00005c0a - movs r0, 0xA - bl SetGpuReg - ldr r1, =0x00005e0a - movs r0, 0xC - bl SetGpuReg - movs r0, 0 - bl GetGpuReg - adds r1, r0, 0 - ldr r2, =0x0000f040 - adds r0, r2, 0 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0 - bl SetGpuReg - movs r1, 0xF8 - lsls r1, 6 - movs r0, 0x48 - bl SetGpuReg - ldr r1, =0x00003f3f - movs r0, 0x4A - bl SetGpuReg - ldr r1, =gBattle_BG0_Y - ldr r2, =0x0000ffd0 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, =gBattle_BG1_X - movs r0, 0xF0 - strh r0, [r1] - ldr r1, =gBattle_BG2_X - subs r2, 0xC0 - adds r0, r2, 0 - strh r0, [r1] - b _08118FB2 - .pool -_08118E4C: - ldr r2, =gBattle_WIN0V - ldrh r3, [r2] - movs r1, 0x80 - lsls r1, 1 - adds r0, r1, 0 - adds r1, r3, r0 - strh r1, [r2] - movs r5, 0xFF - lsls r5, 8 - ands r1, r5 - lsls r0, 16 - lsrs r0, 16 - cmp r1, r0 - beq _08118E6E - adds r0, r3, 0 - adds r0, 0xFF - strh r0, [r2] -_08118E6E: - ldrh r0, [r2] - adds r1, r5, 0 - ands r1, r0 - movs r0, 0x80 - lsls r0, 6 - cmp r1, r0 - beq _08118E7E - b _08118FB2 -_08118E7E: - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r6 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - ldr r2, =gIntroSlideFlags - ldrh r1, [r2] - ldr r0, =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _08118FB2 - .pool -_08118EA8: - ldr r3, =gBattle_WIN0V - ldrh r2, [r3] - movs r0, 0xFF - lsls r0, 8 - ands r0, r2 - movs r1, 0x98 - lsls r1, 7 - cmp r0, r1 - beq _08118EC2 - movs r1, 0xFF - lsls r1, 2 - adds r0, r2, r1 - strh r0, [r3] -_08118EC2: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r3, r0, r6 - ldrh r1, [r3, 0xC] - movs r2, 0xC - ldrsh r0, [r3, r2] - cmp r0, 0 - beq _08118ED8 - subs r0, r1, 0x2 - strh r0, [r3, 0xC] -_08118ED8: - ldr r1, =gBattle_BG1_X - ldrh r0, [r3, 0xC] - strh r0, [r1] - ldr r2, =gBattle_BG2_X - negs r1, r0 - strh r1, [r2] - lsls r0, 16 - cmp r0, 0 - bne _08118FB2 - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] - b _08118FB2 - .pool -_08118F00: - ldr r1, =gBattle_BG0_Y - ldrh r0, [r1] - adds r3, r0, 0x2 - strh r3, [r1] - ldr r1, =gBattle_BG2_Y - ldrh r0, [r1] - adds r0, 0x2 - strh r0, [r1] - ldr r5, =gBattle_WIN0V - ldrh r2, [r5] - movs r0, 0xFF - lsls r0, 8 - ands r0, r2 - movs r1, 0xA0 - lsls r1, 7 - cmp r0, r1 - beq _08118F28 - adds r0, r2, 0 - adds r0, 0xFF - strh r0, [r5] -_08118F28: - lsls r0, r3, 16 - lsrs r0, 16 - cmp r0, 0 - bne _08118FB2 - str r0, [sp] - ldr r1, =0x0600e000 - ldr r2, =0x05000800 - mov r0, sp - bl CpuSet - movs r0, 0 - bl GetGpuReg - ldr r1, =0x0000bfff - ands r1, r0 - movs r0, 0 - bl SetGpuReg - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r0, 0x2 - movs r1, 0x1 - movs r2, 0 - bl SetBgAttribute - movs r1, 0x9C - lsls r1, 8 - movs r0, 0xA - bl SetGpuReg - movs r1, 0xBC - lsls r1, 7 - movs r0, 0xC - bl SetGpuReg - ldr r1, =gScanlineEffect - movs r0, 0x3 - strb r0, [r1, 0x15] - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 -_08118F84: - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _08118FB2 - .pool -_08118FAC: - adds r0, r4, 0 - bl sub_811828C -_08118FB2: - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8118D68 - - thumb_func_start sub_8118FBC -sub_8118FBC: @ 8118FBC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - str r0, [sp] - adds r6, r2, 0 - adds r4, r3, 0 - ldr r0, [sp, 0x24] - ldr r7, [sp, 0x28] - ldr r2, [sp, 0x2C] - mov r9, r2 - ldr r5, [sp, 0x30] - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - lsls r6, 24 - lsrs r6, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - lsls r5, 16 - lsrs r5, 16 - adds r0, r4, 0 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gMonSpritesGfxPtr - ldr r2, [r1] - lsls r4, 2 - adds r2, 0x4 - adds r2, r4 - ldr r1, =gBattleMonForms - adds r0, r1 - ldrb r1, [r0] - lsls r1, 11 - ldr r0, [r2] - adds r0, r1 - movs r2, 0x80 - lsls r2, 3 - adds r1, r7, 0 - bl CpuSet - ldr r1, [sp] - lsls r0, r1, 24 - lsrs r0, 24 - movs r2, 0x80 - lsls r2, 5 - adds r1, r7, 0 - adds r3, r5, 0 - bl LoadBgTiles - adds r0, r6, 0 - adds r0, 0x8 - cmp r6, r0 - bge _08119068 - mov r12, r0 - mov r2, r8 - lsls r7, r2, 1 -_0811903A: - mov r1, r8 - adds r2, r1, 0 - adds r2, 0x8 - adds r4, r6, 0x1 - cmp r1, r2 - bge _08119062 - mov r0, r10 - lsls r3, r0, 12 - lsls r0, r6, 6 - add r0, r9 - adds r6, r7, r0 - subs r1, r2, r1 -_08119052: - adds r0, r5, 0 - orrs r0, r3 - strh r0, [r6] - adds r5, 0x1 - adds r6, 0x2 - subs r1, 0x1 - cmp r1, 0 - bne _08119052 -_08119062: - adds r6, r4, 0 - cmp r6, r12 - blt _0811903A -_08119068: - ldr r1, [sp] - lsls r0, r1, 24 - lsrs r0, 24 - movs r2, 0x80 - lsls r2, 4 - mov r1, r9 - movs r3, 0 - bl LoadBgTilemap - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8118FBC - - thumb_func_start sub_8119094 -sub_8119094: @ 8119094 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - ldr r4, [sp, 0x24] - ldr r5, [sp, 0x28] - mov r8, r5 - ldr r5, [sp, 0x2C] - ldr r6, [sp, 0x30] - mov r9, r6 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - lsls r1, 24 - lsls r2, 24 - lsls r3, 24 - lsls r4, 24 - lsrs r4, 24 - mov r10, r4 - mov r7, r8 - lsls r7, 16 - lsrs r6, r7, 16 - lsls r5, 24 - lsrs r5, 24 - mov r0, r9 - lsls r0, 24 - mov r9, r0 - ldr r4, =0x040000d4 - ldr r0, =gMonSpritesGfxPtr - ldr r0, [r0] - lsrs r2, 22 - adds r0, 0x4 - adds r0, r2 - lsrs r3, 13 - ldr r0, [r0] - adds r0, r3 - str r0, [r4] - movs r0, 0xC0 - lsls r0, 19 - adds r6, r0 - str r6, [r4, 0x4] - ldr r0, =0x80000400 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - adds r2, r7, 0 - lsrs r2, 21 - mov r6, r9 - lsrs r6, 15 - subs r4, r2, r6 - lsrs r0, r1, 24 - adds r1, r0, 0 - adds r1, 0x8 - cmp r0, r1 - bge _08119148 - mov r9, r1 - mov r7, r12 - lsls r7, 1 - mov r8, r7 - lsls r5, 11 - str r5, [sp] -_08119110: - mov r2, r12 - adds r3, r2, 0 - adds r3, 0x8 - adds r5, r0, 0x1 - cmp r2, r3 - bge _08119142 - mov r1, r10 - lsls r6, r1, 12 - lsls r0, 6 - movs r7, 0xC0 - lsls r7, 19 - adds r0, r7 - ldr r1, [sp] - adds r0, r1, r0 - mov r7, r8 - adds r1, r7, r0 - subs r2, r3, r2 -_08119132: - adds r0, r4, 0 - orrs r0, r6 - strh r0, [r1] - adds r4, 0x1 - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _08119132 -_08119142: - adds r0, r5, 0 - cmp r0, r9 - blt _08119110 -_08119148: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8119094 - - .align 2, 0 @ Don't pad with nop. diff --git a/data/data2c.s b/data/data2c.s index 1946f5bdb..5bfea56ae 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -9,10 +9,13 @@ .section .rodata .align 2 -gUnknown_0831AC70:: @ 831AC70 +gBattleIntroSlideScanlineEffectParams:: @ 831AC70 .4byte REG_BG3HOFS .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 .4byte 1 + + .align 2 +gUnknown_0831AC7C:: @ 831AC7C .4byte REG_BG3HOFS .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 .4byte 1 diff --git a/include/battle_anim.h b/include/battle_anim.h index fa4058c1b..541c165e7 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -9,11 +9,11 @@ enum { BG_ANIM_SCREEN_SIZE, BG_ANIM_AREA_OVERFLOW_MODE, - BG_ANIM2, + BG_ANIM_MOSAIC, BG_ANIM_CHAR_BASE_BLOCK, BG_ANIM_PRIORITY, - BG_ANIM_5, - BG_ANIM_6 + BG_ANIM_PALETTES_MODE, + BG_ANIM_SCREEN_BASE_BLOCK, }; struct UnknownAnimStruct2 @@ -67,11 +67,11 @@ s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); void sub_80A4720(u16 a, u16 *b, u32 c, u8 d); void sub_80A477C(bool8); -// battle_anim_80FE840.s +// battle_intro.s void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); -void sub_8118FBC(u8 arg0, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, void *arg5, u16 *arg6, u16 arg7); +void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *arg5, u16 *arg6, u16 arg7); void HandleIntroSlide(u8 terrainId); -u32 GetAnimBgAttribute(u8 bgId, u8 attributeId); +int GetAnimBgAttribute(u8 bgId, u8 attributeId); // battle_anim_80A5C6C.s void sub_80A6450(struct Sprite *sprite); diff --git a/include/gba/types.h b/include/gba/types.h index a7dbf3e03..fff48d437 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -32,7 +32,9 @@ struct BgCnt { u16 priority:2; u16 charBaseBlock:2; - u16 dummy:4; + u16 dummy:2; + u16 mosaic:1; + u16 palettes:1; u16 screenBaseBlock:5; u16 areaOverflowMode:1; u16 screenSize:2; diff --git a/ld_script.txt b/ld_script.txt index 0dbff7996..80c614471 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -175,7 +175,7 @@ SECTIONS { src/ground.o(.text); src/normal.o(.text); src/battle_anim_utility_funcs.o(.text); - asm/battle_intro.o(.text); + src/battle_intro.o(.text); src/bike.o(.text); src/easy_chat.o(.text); asm/easy_chat.o(.text); diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index c3d0fe90f..85ff692b3 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -40,10 +40,10 @@ static void sub_8117FD0(u8); const u16 gUnknown_08597418 = RGB(31, 31, 31); -// no clue what these are... -// possibly some register offsets -const u8 gUnknown_0859741A[] = {0x08, 0x0a, 0x0c, 0x0e}; -const u8 gUnknown_0859741E[] = {0x08, 0x0a, 0x0c, 0x0e}; +// These belong in battle_intro.c, but there putting them there causes 2 bytes of alignment padding +// between the two .rodata segments. Perhaps battle_intro.c actually belongs in this file, too. +const u8 gUnknown_0859741A[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT}; +const u8 gUnknown_0859741E[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT}; void sub_8116620(u8 taskId) { diff --git a/src/battle_intro.c b/src/battle_intro.c index 0ccc7e828..91e7c8ea0 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -1,21 +1,733 @@ #include "global.h" +#include "battle.h" +#include "battle_anim.h" +#include "battle_main.h" +#include "battle_setup.h" +#include "bg.h" +#include "gpu_regs.h" +#include "main.h" +#include "scanline_effect.h" #include "task.h" +#include "trig.h" +#include "constants/trainers.h" -extern void task_battle_intro_80BC47C(u8); -extern void task00_battle_intro_80BC6C8(u8); -extern void task_battle_intro_80BC47C(u8); -extern void task_battle_intro_anim(u8); - -const TaskFunc gUnknown_08597424[] = -{ - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task00_battle_intro_80BC6C8, - task00_battle_intro_80BC6C8, - task00_battle_intro_80BC6C8, - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task_battle_intro_anim, - task_battle_intro_anim, +static EWRAM_DATA u16 sBgCnt = 0; + +extern const u8 gUnknown_0859741A[]; +extern const u8 gUnknown_0859741E[]; + +static void BattleIntroSlide1(u8); +static void BattleIntroSlide2(u8); +static void BattleIntroSlide3(u8); +static void BattleIntroSlideLink(u8); +static void BattleIntroSlidePartner(u8); + +static const TaskFunc sBattleIntroSlideFuncs[] = +{ + BattleIntroSlide1, // BATTLE_TERRAIN_GRASS + BattleIntroSlide1, // BATTLE_TERRAIN_LONG_GRASS + BattleIntroSlide2, // BATTLE_TERRAIN_SAND + BattleIntroSlide2, // BATTLE_TERRAIN_UNDERWATER + BattleIntroSlide2, // BATTLE_TERRAIN_WATER + BattleIntroSlide1, // BATTLE_TERRAIN_POND + BattleIntroSlide1, // BATTLE_TERRAIN_MOUNTAIN + BattleIntroSlide1, // BATTLE_TERRAIN_CAVE + BattleIntroSlide3, // BATTLE_TERRAIN_BUILDING + BattleIntroSlide3, // BATTLE_TERRAIN_PLAIN }; + +void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value) +{ + if (bgId < 4) + { + sBgCnt = GetGpuReg(gUnknown_0859741A[bgId]); + switch (attributeId) + { + case BG_ANIM_SCREEN_SIZE: + ((struct BgCnt *)&sBgCnt)->screenSize = value; + break; + case BG_ANIM_AREA_OVERFLOW_MODE: + ((struct BgCnt *)&sBgCnt)->areaOverflowMode = value; + break; + case BG_ANIM_MOSAIC: + ((struct BgCnt *)&sBgCnt)->mosaic = value; + break; + case BG_ANIM_CHAR_BASE_BLOCK: + ((struct BgCnt *)&sBgCnt)->charBaseBlock = value; + break; + case BG_ANIM_PRIORITY: + ((struct BgCnt *)&sBgCnt)->priority = value; + break; + case BG_ANIM_PALETTES_MODE: + ((struct BgCnt *)&sBgCnt)->palettes = value; + break; + case BG_ANIM_SCREEN_BASE_BLOCK: + ((struct BgCnt *)&sBgCnt)->screenBaseBlock = value; + break; + } + + SetGpuReg(gUnknown_0859741A[bgId], sBgCnt); + } +} + +int GetAnimBgAttribute(u8 bgId, u8 attributeId) +{ + u16 bgCnt; + + if (bgId < 4) + { + bgCnt = GetGpuReg(gUnknown_0859741E[bgId]); + switch (attributeId) + { + case BG_ANIM_SCREEN_SIZE: + return ((struct BgCnt *)&bgCnt)->screenSize; + case BG_ANIM_AREA_OVERFLOW_MODE: + return ((struct BgCnt *)&bgCnt)->areaOverflowMode; + case BG_ANIM_MOSAIC: + return ((struct BgCnt *)&bgCnt)->mosaic; + case BG_ANIM_CHAR_BASE_BLOCK: + return ((struct BgCnt *)&bgCnt)->charBaseBlock; + case BG_ANIM_PRIORITY: + return ((struct BgCnt *)&bgCnt)->priority; + case BG_ANIM_PALETTES_MODE: + return ((struct BgCnt *)&bgCnt)->palettes; + case BG_ANIM_SCREEN_BASE_BLOCK: + return ((struct BgCnt *)&bgCnt)->screenBaseBlock; + } + } + + return 0; +} + +void HandleIntroSlide(u8 terrain) +{ + u8 taskId; + + if ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) && gPartnerTrainerId != TRAINER_STEVEN_PARTNER) + { + taskId = CreateTask(BattleIntroSlidePartner, 0); + } + else if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + taskId = CreateTask(BattleIntroSlideLink, 0); + } + else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) + { + taskId = CreateTask(BattleIntroSlide3, 0); + } + else if ((gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) && gGameVersion != VERSION_RUBY) + { + terrain = BATTLE_TERRAIN_UNDERWATER; + taskId = CreateTask(BattleIntroSlide2, 0); + } + else + { + taskId = CreateTask(sBattleIntroSlideFuncs[terrain], 0); + } + + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = terrain; + gTasks[taskId].data[2] = 0; + gTasks[taskId].data[3] = 0; + gTasks[taskId].data[4] = 0; + gTasks[taskId].data[5] = 0; + gTasks[taskId].data[6] = 0; +} + +void sub_811828C(u8 taskId) +{ + DestroyTask(taskId); + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR); +} + +static void BattleIntroSlide1(u8 taskId) +{ + int i; + + gBattle_BG1_X += 6; + switch (gTasks[taskId].data[0]) + { + case 0: + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + } + break; + case 2: + gBattle_WIN0V -= 0xFF; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3]) + { + gTasks[taskId].data[3]--; + } + else + { + if (gTasks[taskId].data[1] == 1) + { + if (gBattle_BG1_Y != 0xFFB0) + gBattle_BG1_Y -= 2; + } + else + { + if (gBattle_BG1_Y != 0xFFC8) + gBattle_BG1_Y -= 1; + } + } + + if (gBattle_WIN0V & 0xFF00) + gBattle_WIN0V -= 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + // Scanline settings have already been set in CB2_InitBattleInternal() + for (i = 0; i < 80; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + + for (; i < 160; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (!gTasks[taskId].data[2]) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE); + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + } + break; + case 4: + sub_811828C(taskId); + break; + } +} + +static void BattleIntroSlide2(u8 taskId) +{ + int i; + + switch (gTasks[taskId].data[1]) + { + case 2: + case 4: + gBattle_BG1_X += 8; + break; + case 3: + gBattle_BG1_X += 6; + break; + } + + if (gTasks[taskId].data[1] == 4) + { + u16 *bg1Y = &gBattle_BG1_Y; + int cos = Cos2(gTasks[taskId].data[6]); + if (cos < 0) + cos += 0x1FF; + *bg1Y = (cos >> 9) - 8; + + if (gTasks[taskId].data[6] < 180) + gTasks[taskId].data[6] += 4; + else + gTasks[taskId].data[6] += 6; + + if (gTasks[taskId].data[6] == 360) + gTasks[taskId].data[6] = 0; + } + + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[4] = 16; + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + } + break; + case 2: + gBattle_WIN0V -= 0xFF; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gTasks[taskId].data[5] = 1; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3]) + { + if (--gTasks[taskId].data[3] == 0) + { + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(15, 0)); + SetGpuReg(REG_OFFSET_BLDY, 0); + } + } + else + { + if ((gTasks[taskId].data[4] & 0x1F) && --gTasks[taskId].data[5] == 0) + { + gTasks[taskId].data[4] += 0xFF; + gTasks[taskId].data[5] = 4; + } + } + + if (gBattle_WIN0V & 0xFF00) + gBattle_WIN0V -= 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + // Scanline settings have already been set in CB2_InitBattleInternal() + for (i = 0; i < 80; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + + for (; i < 160; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (!gTasks[taskId].data[2]) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE); + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + } + break; + case 4: + sub_811828C(taskId); + break; + } + + if (gTasks[taskId].data[0] != 4) + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[4], 0)); +} + +static void BattleIntroSlide3(u8 taskId) +{ + int i; + + gBattle_BG1_X += 8; + switch (gTasks[taskId].data[0]) + { + case 0: + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 8)); + SetGpuReg(REG_OFFSET_BLDY, 0); + gTasks[taskId].data[4] = BLDALPHA_BLEND(8, 8); + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + } + break; + case 2: + gBattle_WIN0V -= 0xFF; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gTasks[taskId].data[5] = 1; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3]) + { + gTasks[taskId].data[3]--; + } + else + { + if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0) + { + gTasks[taskId].data[4] += 0xFF; + gTasks[taskId].data[5] = 6; + } + } + + if (gBattle_WIN0V & 0xFF00) + gBattle_WIN0V -= 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + // Scanline settings have already been set in CB2_InitBattleInternal() + for (i = 0; i < 80; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + + for (; i < 160; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (!gTasks[taskId].data[2]) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE); + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + } + break; + case 4: + sub_811828C(taskId); + break; + } + + if (gTasks[taskId].data[0] != 4) + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[4], 0)); +} + +static void BattleIntroSlideLink(u8 taskId) +{ + int i; + + if (gTasks[taskId].data[0] > 1 && !gTasks[taskId].data[4]) + { + u16 var0 = gBattle_BG1_X & 0x8000; + if (var0 || gBattle_BG1_X < 80) + { + gBattle_BG1_X += 3; + gBattle_BG2_X -= 3; + } + else + { + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE); + CpuFill32(0, (void *)BG_SCREEN_ADDR(30), BG_SCREEN_SIZE); + gTasks[taskId].data[4] = 1; + } + } + + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[2] = 32; + gTasks[taskId].data[0]++; + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + gSprites[gBattleStruct->field_7D].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[gBattleStruct->field_7D].callback = sub_8038B74; + gSprites[gBattleStruct->field_7E].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[gBattleStruct->field_7E].callback = sub_8038B74; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2); + } + break; + case 2: + gBattle_WIN0V -= 0xFF; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if (gBattle_WIN0V & 0xFF00) + gBattle_WIN0V -= 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + // Scanline settings have already been set in CB2_InitBattleInternal() + for (i = 0; i < 80; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + + for (; i < 160; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (!gTasks[taskId].data[2]) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + } + break; + case 4: + sub_811828C(taskId); + break; + } +} + +static void BattleIntroSlidePartner(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + break; + case 1: + if (--gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT512x256); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_OBJWIN_ON); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_BG3 | WININ_WIN1_OBJ | WININ_WIN1_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR); + gBattle_BG0_Y = -48; + gBattle_BG1_X = 240; + gBattle_BG2_X = -240; + } + break; + case 2: + gBattle_WIN0V += 0x100; + if ((gBattle_WIN0V & 0xFF00) != 0x100) + gBattle_WIN0V--; + + if ((gBattle_WIN0V & 0xFF00) == 0x2000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gIntroSlideFlags &= ~1; + } + break; + case 3: + if ((gBattle_WIN0V & 0xFF00) != 0x4C00) + gBattle_WIN0V += 0x3FC; + + if (gTasks[taskId].data[2]) + gTasks[taskId].data[2] -= 2; + + gBattle_BG1_X = gTasks[taskId].data[2]; + gBattle_BG2_X = -gTasks[taskId].data[2]; + if (!gTasks[taskId].data[2]) + gTasks[taskId].data[0]++; + break; + case 4: + gBattle_BG0_Y += 2; + gBattle_BG2_Y += 2; + if ((gBattle_WIN0V & 0xFF00) != 0x5000) + gBattle_WIN0V += 0xFF; + + if (!gBattle_BG0_Y) + { + CpuFill32(0, (void *)BG_SCREEN_ADDR(28), BG_SCREEN_SIZE * 4); + SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) & ~DISPCNT_WIN1_ON); + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT256x512); + SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(30) | BGCNT_TXT512x256); + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + } + break; + case 5: + sub_811828C(taskId); + break; + } +} + +void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *arg5, u16 *arg6, u16 tilesOffset) +{ + int i, j; + u8 battler = GetBattlerAtPosition(battlerPosition); + int offset = tilesOffset; + CpuCopy16(gMonSpritesGfxPtr->sprites[battlerPosition] + BG_SCREEN_SIZE * gBattleMonForms[battler], arg5, BG_SCREEN_SIZE); + LoadBgTiles(bgId, arg5, 0x1000, tilesOffset); + for (i = arg2; i < arg2 + 8; i++) + { + for (j = arg1; j < arg1 + 8; j++) + { + arg6[i * 32 + j] = offset | (arg4 << 12); + offset++; + } + } + + LoadBgTilemap(bgId, arg6, BG_SCREEN_SIZE, 0); +} + +#ifdef NONMATCHING +void unref_sub_8119094(u8 arg0, u8 arg1, u8 battlerPosition, u8 arg3, u8 arg4, u16 arg5, u8 arg6, u8 arg7) +{ + int i, j; + int offset; + DmaCopy16(3, gMonSpritesGfxPtr->sprites[battlerPosition] + BG_SCREEN_SIZE * arg3, (void *)BG_SCREEN_ADDR(0) + arg5, BG_SCREEN_SIZE); + offset = (arg5 >> 5) - (arg7 << 9); + for (i = arg1; i < arg1 + 8; i++) + { + for (j = arg0; j < arg0 + 8; j++) + { + ((u16 *)BG_VRAM)[i * 32 + j + (arg6 * 0x400) + arg0] = offset | (arg4 << 12); + offset++; + } + } +} +#else +NAKED +void unref_sub_8119094(u8 arg0, u8 arg1, u8 battlerPosition, u8 arg3, u8 arg4, u16 arg5, u8 arg6, u8 arg7) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + ldr r4, [sp, 0x24]\n\ + ldr r5, [sp, 0x28]\n\ + mov r8, r5\n\ + ldr r5, [sp, 0x2C]\n\ + ldr r6, [sp, 0x30]\n\ + mov r9, r6\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r12, r0\n\ + lsls r1, 24\n\ + lsls r2, 24\n\ + lsls r3, 24\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + mov r10, r4\n\ + mov r7, r8\n\ + lsls r7, 16\n\ + lsrs r6, r7, 16\n\ + lsls r5, 24\n\ + lsrs r5, 24\n\ + mov r0, r9\n\ + lsls r0, 24\n\ + mov r9, r0\n\ + ldr r4, =0x040000d4\n\ + ldr r0, =gMonSpritesGfxPtr\n\ + ldr r0, [r0]\n\ + lsrs r2, 22\n\ + adds r0, 0x4\n\ + adds r0, r2\n\ + lsrs r3, 13\n\ + ldr r0, [r0]\n\ + adds r0, r3\n\ + str r0, [r4]\n\ + movs r0, 0xC0\n\ + lsls r0, 19\n\ + adds r6, r0\n\ + str r6, [r4, 0x4]\n\ + ldr r0, =0x80000400\n\ + str r0, [r4, 0x8]\n\ + ldr r0, [r4, 0x8]\n\ + adds r2, r7, 0\n\ + lsrs r2, 21\n\ + mov r6, r9\n\ + lsrs r6, 15\n\ + subs r4, r2, r6\n\ + lsrs r0, r1, 24\n\ + adds r1, r0, 0\n\ + adds r1, 0x8\n\ + cmp r0, r1\n\ + bge _08119148\n\ + mov r9, r1\n\ + mov r7, r12\n\ + lsls r7, 1\n\ + mov r8, r7\n\ + lsls r5, 11\n\ + str r5, [sp]\n\ +_08119110:\n\ + mov r2, r12\n\ + adds r3, r2, 0\n\ + adds r3, 0x8\n\ + adds r5, r0, 0x1\n\ + cmp r2, r3\n\ + bge _08119142\n\ + mov r1, r10\n\ + lsls r6, r1, 12\n\ + lsls r0, 6\n\ + movs r7, 0xC0\n\ + lsls r7, 19\n\ + adds r0, r7\n\ + ldr r1, [sp]\n\ + adds r0, r1, r0\n\ + mov r7, r8\n\ + adds r1, r7, r0\n\ + subs r2, r3, r2\n\ +_08119132:\n\ + adds r0, r4, 0\n\ + orrs r0, r6\n\ + strh r0, [r1]\n\ + adds r4, 0x1\n\ + adds r1, 0x2\n\ + subs r2, 0x1\n\ + cmp r2, 0\n\ + bne _08119132\n\ +_08119142:\n\ + adds r0, r5, 0\n\ + cmp r0, r9\n\ + blt _08119110\n\ +_08119148:\n\ + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool"); +} +#endif diff --git a/src/battle_main.c b/src/battle_main.c index 9b7f58023..fb2e5105a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -81,7 +81,7 @@ extern const u8 *const gBattlescriptsForBallThrow[]; extern const u8 *const gBattlescriptsForRunningByItem[]; extern const u8 *const gBattlescriptsForUsingItem[]; extern const u8 *const gBattlescriptsForSafariActions[]; -extern const struct ScanlineEffectParams gUnknown_0831AC70; +extern const struct ScanlineEffectParams gBattleIntroSlideScanlineEffectParams; // strings extern const u8 gText_LinkStandby3[]; @@ -633,7 +633,7 @@ static void CB2_InitBattleInternal(void) gScanlineEffectRegBuffers[1][i] = 0xFF10; } - ScanlineEffect_SetParams(gUnknown_0831AC70); + ScanlineEffect_SetParams(gBattleIntroSlideScanlineEffectParams); } ResetPaletteFade(); diff --git a/src/easy_chat.c b/src/easy_chat.c index 25ef069e4..c4bc02e42 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -51,6 +51,9 @@ EWRAM_DATA struct u16 ecWordBuffer[9]; } *gUnknown_0203A118 = NULL; +EWRAM_DATA void *gUnknown_0203A11C = 0; +EWRAM_DATA void *gUnknown_0203A120 = 0; + // Static ROM declarations static void sub_811A2C0(u8); diff --git a/sym_ewram.txt b/sym_ewram.txt index b413f287d..4f77532b2 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -292,19 +292,8 @@ gUnknown_0203A100: @ 203A100 .space 0x10 .include "src/battle_anim_utility_funcs.o" - -gUnknown_0203A114: @ 203A114 - .space 0x4 - -gUnknown_0203A118: @ 203A118 - .space 0x4 - -gUnknown_0203A11C: @ 203A11C - .space 0x4 - -gUnknown_0203A120: @ 203A120 - .space 0x4 - + .include "src/battle_intro.o" + .include "src/easy_chat.o" .include "src/mon_markings.o" .include "src/mauville_old_man.o" .include "src/mail.o" -- cgit v1.2.3 From 2c6849bee81f2c05cbf0df1f88c6d5460e7b1e2d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 13 Dec 2018 21:33:54 -0600 Subject: Decompile battle_anim_8170478.c (#445) --- asm/battle_anim_8170478.s | 5832 ----------------------------------- common_syms/battle_anim_8170478.txt | 3 + data/battle_anim_8170478.s | 157 - include/battle.h | 3 +- include/battle_anim.h | 8 +- include/global.h | 6 + include/graphics.h | 6 + ld_script.txt | 4 +- src/battle_anim.c | 2 - src/battle_anim_8170478.c | 2267 ++++++++++++++ src/battle_intro.c | 7 +- src/pokeball.c | 12 +- src/pokemon.c | 12 - sym_common.txt | 11 +- 14 files changed, 2299 insertions(+), 6031 deletions(-) delete mode 100644 asm/battle_anim_8170478.s create mode 100755 common_syms/battle_anim_8170478.txt delete mode 100644 data/battle_anim_8170478.s create mode 100755 src/battle_anim_8170478.c diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s deleted file mode 100644 index c0881e682..000000000 --- a/asm/battle_anim_8170478.s +++ /dev/null @@ -1,5832 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8170478 -sub_8170478: @ 8170478 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x10] - ldr r0, =gBattleAnimAttacker - ldrb r4, [r0] - ldr r0, =gBattle_WIN0H - movs r1, 0 - strh r1, [r0] - ldr r0, =gBattle_WIN0V - strh r1, [r0] - ldr r1, =0x00003f3f - movs r0, 0x48 - bl SetGpuReg - ldr r1, =0x00003f3d - movs r0, 0x4A - bl SetGpuReg - movs r1, 0x80 - lsls r1, 8 - movs r0, 0 - bl SetGpuRegBits - ldr r1, =0x00003f42 - movs r0, 0x50 - bl SetGpuReg - movs r1, 0x80 - lsls r1, 5 - movs r0, 0x52 - bl SetGpuReg - movs r0, 0x1 - movs r1, 0x4 - movs r2, 0 - bl SetAnimBgAttribute - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl SetAnimBgAttribute - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0x1 - bl SetAnimBgAttribute - movs r0, 0x1 - movs r1, 0x3 - movs r2, 0x1 - bl SetAnimBgAttribute - ldr r0, =gHealthboxSpriteIds - adds r4, r0 - ldrb r0, [r4] - ldr r1, =gSprites - mov r9, r1 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - add r4, r9 - ldrb r7, [r4, 0x6] - ldrh r6, [r4, 0x38] - lsls r6, 24 - lsrs r6, 24 - ldr r0, =SpriteCallbackDummy - bl CreateInvisibleSpriteWithCallback - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x14] - ldr r0, =SpriteCallbackDummy - bl CreateInvisibleSpriteWithCallback - mov r10, r0 - mov r2, r10 - lsls r2, 24 - lsrs r2, 24 - mov r10, r2 - ldrb r1, [r4, 0x5] - movs r3, 0xD - negs r3, r3 - adds r0, r3, 0 - ands r0, r1 - movs r1, 0x4 - mov r8, r1 - mov r2, r8 - orrs r0, r2 - strb r0, [r4, 0x5] - lsls r5, r7, 4 - adds r5, r7 - lsls r5, 2 - add r5, r9 - ldrb r1, [r5, 0x5] - adds r0, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - add r1, r9 - ldrb r2, [r1, 0x5] - adds r0, r3, 0 - ands r0, r2 - mov r2, r8 - orrs r0, r2 - strb r0, [r1, 0x5] - ldr r0, [sp, 0x14] - lsls r6, r0, 4 - adds r6, r0 - lsls r6, 2 - mov r1, r9 - adds r7, r6, r1 - adds r0, r7, 0 - adds r1, r4, 0 - movs r2, 0x44 - str r3, [sp, 0x18] - bl memcpy - mov r2, r10 - lsls r4, r2, 4 - add r4, r10 - lsls r4, 2 - adds r0, r4, 0 - add r0, r9 - mov r8, r0 - adds r1, r5, 0 - movs r2, 0x44 - bl memcpy - ldrb r1, [r7, 0x1] - ldr r3, [sp, 0x18] - adds r0, r3, 0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r7, 0x1] - mov r2, r8 - ldrb r0, [r2, 0x1] - ands r3, r0 - orrs r3, r1 - strb r3, [r2, 0x1] - movs r0, 0x1C - add r9, r0 - add r6, r9 - ldr r1, =SpriteCallbackDummy - str r1, [r6] - add r4, r9 - str r1, [r4] - mov r0, sp - bl sub_80A6B30 - mov r0, sp - ldrb r0, [r0, 0x9] - ldr r1, =gUnknown_08C2EA9C - bl sub_80A6D48 - mov r0, sp - ldrb r0, [r0, 0x9] - ldr r1, =gUnknown_08C2EA50 - mov r2, sp - ldrh r2, [r2, 0xA] - bl sub_80A6CC0 - ldr r0, =gUnknown_08C2DDA4 - mov r1, sp - ldrb r1, [r1, 0x8] - lsls r1, 4 - movs r2, 0x20 - bl LoadCompressedPalette - ldr r1, =gBattle_BG1_X - ldrh r0, [r7, 0x20] - negs r0, r0 - adds r0, 0x20 - strh r0, [r1] - ldr r1, =gBattle_BG1_Y - ldrh r0, [r7, 0x22] - negs r0, r0 - subs r0, 0x20 - strh r0, [r1] - ldr r1, =gTasks - ldr r2, [sp, 0x10] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - movs r1, 0xA0 - lsls r1, 2 - strh r1, [r0, 0xA] - mov r1, sp - ldrh r1, [r1, 0x14] - strh r1, [r0, 0x8] - mov r2, r10 - strh r2, [r0, 0xC] - ldr r1, =sub_8170660 - str r1, [r0] - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170478 - - thumb_func_start sub_8170660 -sub_8170660: @ 8170660 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - mov r8, r0 - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r5, r0, r1 - ldrh r1, [r5, 0xA] - ldrh r0, [r5, 0x22] - adds r1, r0 - movs r3, 0 - strh r1, [r5, 0x22] - ldr r2, =gBattle_BG1_Y - lsls r0, r1, 16 - lsrs r0, 24 - ldrh r4, [r2] - adds r0, r4 - strh r0, [r2] - movs r0, 0xFF - ands r1, r0 - strh r1, [r5, 0x22] - movs r1, 0x26 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _081706F0 - cmp r0, 0x1 - bgt _081706B4 - cmp r0, 0 - beq _081706BA - b _08170814 - .pool -_081706B4: - cmp r0, 0x2 - beq _08170708 - b _08170814 -_081706BA: - ldrh r0, [r5, 0x1E] - adds r1, r0, 0x1 - strh r1, [r5, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bgt _081706CA - b _08170814 -_081706CA: - strh r3, [r5, 0x1E] - ldrh r1, [r5, 0x20] - adds r1, 0x1 - strh r1, [r5, 0x20] - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r2, 0x20 - ldrsh r0, [r5, r2] - cmp r0, 0x8 - beq _081706EE - b _08170814 -_081706EE: - b _08170700 -_081706F0: - ldrh r0, [r5, 0x1C] - adds r0, 0x1 - strh r0, [r5, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1E - beq _08170700 - b _08170814 -_08170700: - ldrh r0, [r5, 0x26] - adds r0, 0x1 - strh r0, [r5, 0x26] - b _08170814 -_08170708: - ldrh r0, [r5, 0x1E] - adds r1, r0, 0x1 - strh r1, [r5, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08170814 - strh r3, [r5, 0x1E] - ldrh r1, [r5, 0x20] - subs r1, 0x1 - strh r1, [r5, 0x20] - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r0, 0x20 - ldrsh r4, [r5, r0] - cmp r4, 0 - bne _08170814 - movs r0, 0 - bl sub_80A477C - ldr r0, =gBattle_WIN0H - strh r4, [r0] - ldr r0, =gBattle_WIN0V - strh r4, [r0] - ldr r4, =0x00003f3f - movs r0, 0x48 - adds r1, r4, 0 - bl SetGpuReg - movs r0, 0x4A - adds r1, r4, 0 - bl SetGpuReg - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _0817076C - movs r0, 0x1 - movs r1, 0x3 - movs r2, 0 - bl SetAnimBgAttribute -_0817076C: - movs r0, 0 - bl GetGpuReg - adds r1, r0, 0 - movs r2, 0x80 - lsls r2, 8 - adds r0, r2, 0 - eors r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0 - bl SetGpuReg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r4, 0x8 - ldrsh r1, [r5, r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r6, =gSprites - adds r0, r6 - bl DestroySprite - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - bl DestroySprite - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - bl SetAnimBgAttribute - ldr r0, =gHealthboxSpriteIds - add r0, r8 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - ldrb r2, [r1, 0x6] - mov r8, r2 - ldrh r4, [r1, 0x38] - lsls r4, 24 - lsrs r4, 24 - ldrb r3, [r1, 0x5] - movs r2, 0xD - negs r2, r2 - adds r0, r2, 0 - ands r0, r3 - movs r5, 0x4 - orrs r0, r5 - strb r0, [r1, 0x5] - mov r0, r8 - lsls r1, r0, 4 - add r1, r8 - lsls r1, 2 - adds r1, r6 - ldrb r3, [r1, 0x5] - adds r0, r2, 0 - ands r0, r3 - orrs r0, r5 - strb r0, [r1, 0x5] - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r6 - ldrb r1, [r0, 0x5] - ands r2, r1 - orrs r2, r5 - strb r2, [r0, 0x5] - adds r0, r7, 0 - bl DestroyAnimVisualTask -_08170814: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170660 - - thumb_func_start sub_8170834 -sub_8170834: @ 8170834 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r9, r0 - adds r7, r1, 0 - lsls r2, 24 - lsrs r2, 24 - ldr r0, =gHealthboxSpriteIds - adds r2, r0 - ldrb r0, [r2] - lsls r5, r0, 4 - adds r5, r0 - lsls r5, 2 - ldr r0, =gSprites - adds r5, r0 - ldrb r1, [r5, 0x6] - mov r10, r1 - ldrh r4, [r5, 0x38] - lsls r4, 24 - lsrs r4, 24 - ldr r0, =0x0000d709 - bl AllocSpritePalette - mov r2, r9 - strb r0, [r2] - ldr r0, =0x0000d70a - bl AllocSpritePalette - strb r0, [r7] - ldrb r0, [r5, 0x5] - lsrs r0, 4 - lsls r0, 4 - movs r1, 0x80 - lsls r1, 1 - adds r3, r1, 0 - orrs r0, r3 - lsls r6, r4, 4 - adds r6, r4 - lsls r6, 2 - ldr r2, =gSprites - adds r6, r2 - ldrb r4, [r6, 0x5] - lsrs r4, 4 - lsls r4, 4 - orrs r4, r3 - lsls r0, 1 - ldr r1, =gPlttBufferUnfaded - mov r8, r1 - add r0, r8 - mov r2, r9 - ldrb r1, [r2] - lsls r1, 4 - adds r1, r3, r1 - movs r2, 0x20 - str r3, [sp] - bl LoadPalette - lsls r4, 1 - add r4, r8 - ldrb r0, [r7] - lsls r0, 4 - ldr r3, [sp] - adds r3, r0 - adds r0, r4, 0 - adds r1, r3, 0 - movs r2, 0x20 - bl LoadPalette - mov r0, r9 - ldrb r1, [r0] - lsls r1, 4 - ldrb r2, [r5, 0x5] - movs r3, 0xF - adds r0, r3, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - mov r2, r10 - lsls r1, r2, 4 - add r1, r10 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - mov r0, r9 - ldrb r2, [r0] - lsls r2, 4 - ldrb r4, [r1, 0x5] - adds r0, r3, 0 - ands r0, r4 - orrs r0, r2 - strb r0, [r1, 0x5] - ldrb r0, [r7] - lsls r0, 4 - ldrb r1, [r6, 0x5] - ands r3, r1 - orrs r3, r0 - strb r3, [r6, 0x5] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170834 - - thumb_func_start sub_8170920 -sub_8170920: @ 8170920 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - mov r1, sp - adds r1, 0x1 - ldr r0, =gBattleAnimAttacker - ldrb r2, [r0] - mov r0, sp - bl sub_8170834 - adds r0, r4, 0 - bl DestroyAnimVisualTask - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170920 - - thumb_func_start sub_817094C -sub_817094C: @ 817094C - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gHealthboxSpriteIds - adds r0, r1 - ldrb r0, [r0] - ldr r1, =gSprites - mov r8, r1 - lsls r5, r0, 4 - adds r5, r0 - lsls r5, 2 - add r5, r8 - ldrb r0, [r5, 0x6] - mov r9, r0 - ldrh r6, [r5, 0x38] - lsls r6, 24 - lsrs r6, 24 - ldr r0, =0x0000d709 - bl FreeSpritePaletteByTag - ldr r0, =0x0000d70a - bl FreeSpritePaletteByTag - ldr r0, =0x0000d6ff - bl IndexOfSpritePaletteTag - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =0x0000d704 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsls r4, 4 - ldrb r2, [r5, 0x5] - movs r3, 0xF - adds r1, r3, 0 - ands r1, r2 - orrs r1, r4 - strb r1, [r5, 0x5] - mov r1, r9 - lsls r2, r1, 4 - add r2, r9 - lsls r2, 2 - add r2, r8 - ldrb r5, [r2, 0x5] - adds r1, r3, 0 - ands r1, r5 - orrs r1, r4 - strb r1, [r2, 0x5] - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - add r1, r8 - lsrs r0, 20 - ldrb r2, [r1, 0x5] - ands r3, r2 - orrs r3, r0 - strb r3, [r1, 0x5] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817094C - - thumb_func_start sub_81709EC -sub_81709EC: @ 81709EC - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl sub_817094C - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81709EC - - thumb_func_start sub_8170A0C -sub_8170A0C: @ 8170A0C - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r2, =gBattleAnimArgs - ldrh r0, [r2] - strh r0, [r1, 0x1C] - ldrh r0, [r2, 0x2] - strh r0, [r1, 0x1E] - ldr r0, =sub_8170A38 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_8170A0C - - thumb_func_start sub_8170A38 -sub_8170A38: @ 8170A38 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - movs r6, 0 - adds r1, r0, 0x1 - strh r1, [r4, 0x8] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x1E - ldrsh r1, [r4, r2] - cmp r0, r1 - blt _08170AF8 - strh r6, [r4, 0x8] - ldr r0, =0x0000d709 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r2, r0, 24 - movs r3, 0x1C - ldrsh r0, [r4, r3] - movs r1, 0x2 - cmp r0, 0 - bne _08170A76 - movs r1, 0x6 -_08170A76: - movs r3, 0xA - ldrsh r0, [r4, r3] - cmp r0, 0 - beq _08170A8C - cmp r0, 0x1 - beq _08170AC8 - b _08170AF8 - .pool -_08170A8C: - ldrh r0, [r4, 0xC] - adds r0, 0x2 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - ble _08170A9E - movs r0, 0x10 - strh r0, [r4, 0xC] -_08170A9E: - lsls r0, r2, 4 - movs r2, 0x80 - lsls r2, 1 - adds r0, r2 - orrs r0, r1 - ldrb r2, [r4, 0xC] - ldr r3, =0x00007f74 - movs r1, 0x1 - bl BlendPalette - movs r3, 0xC - ldrsh r0, [r4, r3] - cmp r0, 0x10 - bne _08170AF8 - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - b _08170AF8 - .pool -_08170AC8: - ldrh r0, [r4, 0xC] - subs r0, 0x2 - strh r0, [r4, 0xC] - lsls r0, 16 - cmp r0, 0 - bge _08170AD6 - strh r6, [r4, 0xC] -_08170AD6: - lsls r0, r2, 4 - movs r2, 0x80 - lsls r2, 1 - adds r0, r2 - orrs r0, r1 - ldrb r2, [r4, 0xC] - ldr r3, =0x00007f74 - movs r1, 0x1 - bl BlendPalette - movs r3, 0xC - ldrsh r0, [r4, r3] - cmp r0, 0 - bne _08170AF8 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_08170AF8: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170A38 - - thumb_func_start sub_8170B04 -sub_8170B04: @ 8170B04 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, =gBattlerSpriteIds - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - adds r0, r1 - ldrb r5, [r0] - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _08170B52 - cmp r0, 0x1 - bgt _08170B3C - cmp r0, 0 - beq _08170B42 - b _08170BA4 - .pool -_08170B3C: - cmp r0, 0x2 - beq _08170B84 - b _08170BA4 -_08170B42: - adds r0, r5, 0 - movs r1, 0 - bl sub_80A7270 - movs r0, 0x80 - lsls r0, 1 - strh r0, [r4, 0x1C] - b _08170B76 -_08170B52: - ldrh r0, [r4, 0x1C] - adds r0, 0x30 - strh r0, [r4, 0x1C] - movs r0, 0x1C - ldrsh r2, [r4, r0] - adds r0, r5, 0 - adds r1, r2, 0 - movs r3, 0 - bl obj_id_set_rotscale - adds r0, r5, 0 - bl sub_80A7E6C - movs r0, 0x1C - ldrsh r1, [r4, r0] - ldr r0, =0x000002cf - cmp r1, r0 - ble _08170BA4 -_08170B76: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _08170BA4 - .pool -_08170B84: - adds r0, r5, 0 - bl sub_80A7344 - ldr r1, =gSprites - lsls r0, r5, 4 - adds r0, r5 - lsls r0, 2 - adds r0, r1 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - adds r0, r6, 0 - bl DestroyAnimVisualTask -_08170BA4: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170B04 - - thumb_func_start sub_8170BB0 -sub_8170BB0: @ 8170BB0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0xC - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gBattlerSpriteIds - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - adds r1, r0, r1 - ldrb r1, [r1] - mov r9, r1 - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08170BF8 - ldr r1, =gBattlerPartyIndexes - ldrb r0, [r4] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - b _08170C08 - .pool -_08170BF8: - ldr r1, =gBattlerPartyIndexes - ldrb r0, [r4] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gEnemyParty -_08170C08: - adds r0, r1 - movs r1, 0x26 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - bl ItemIdToBallId - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r2, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r6, r0, r2 - movs r0, 0x8 - ldrsh r7, [r6, r0] - cmp r7, 0 - beq _08170C44 - cmp r7, 0x1 - beq _08170CC4 - b _08170CEE - .pool -_08170C44: - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - movs r1, 0 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldrb r0, [r5] - movs r1, 0x1 - bl GetBattlerSpriteCoord - adds r1, r0, 0 - lsls r1, 24 - ldr r2, =gSprites - mov r3, r9 - lsls r0, r3, 4 - add r0, r9 - lsls r0, 2 - adds r0, r2 - ldrb r2, [r0, 0x5] - lsls r2, 28 - lsrs r2, 30 - adds r0, 0x43 - ldrb r3, [r0] - movs r0, 0x80 - lsls r0, 22 - adds r1, r0 - lsrs r1, 24 - mov r0, r8 - str r0, [sp] - adds r0, r4, 0 - bl LaunchBallStarsTask - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x1C] - str r7, [sp] - str r7, [sp, 0x4] - str r7, [sp, 0x8] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80A75AC - adds r2, r0, 0 - ldrb r1, [r5] - movs r0, 0 - mov r3, r8 - bl LaunchBallFadeMonTask - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x1E] - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] - b _08170CEE - .pool -_08170CC4: - movs r1, 0x1C - ldrsh r0, [r6, r1] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrb r0, [r1, 0x4] - cmp r0, 0 - bne _08170CEE - movs r3, 0x1E - ldrsh r0, [r6, r3] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrb r0, [r1, 0x4] - cmp r0, 0 - bne _08170CEE - adds r0, r5, 0 - bl DestroyAnimVisualTask -_08170CEE: - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8170BB0 - - thumb_func_start sub_8170CFC -sub_8170CFC: @ 8170CFC - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gLastUsedItem - ldrh r0, [r0] - bl ItemIdToBallId - lsls r0, 24 - lsrs r0, 24 - bl LoadBallGfx - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170CFC - - thumb_func_start sub_8170D24 -sub_8170D24: @ 8170D24 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gLastUsedItem - ldrh r0, [r0] - bl ItemIdToBallId - lsls r0, 24 - lsrs r0, 24 - bl FreeBallGfx - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170D24 - - thumb_func_start AnimTask_IsBallBlockedByTrainer -AnimTask_IsBallBlockedByTrainer: @ 8170D4C - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r0, [r0, 0x8] - ldrb r0, [r0, 0x8] - cmp r0, 0x5 - bne _08170D70 - ldr r1, =gBattleAnimArgs - ldr r0, =0x0000ffff - b _08170D74 - .pool -_08170D70: - ldr r1, =gBattleAnimArgs - movs r0, 0 -_08170D74: - strh r0, [r1, 0xE] - adds r0, r2, 0 - bl DestroyAnimVisualTask - pop {r0} - bx r0 - .pool - thumb_func_end AnimTask_IsBallBlockedByTrainer - - thumb_func_start ItemIdToBallId -ItemIdToBallId: @ 8170D84 - push {lr} - lsls r0, 16 - lsrs r0, 16 - subs r0, 0x1 - cmp r0, 0xB - bhi _08170DFC - lsls r0, 2 - ldr r1, =_08170DA0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08170DA0: - .4byte _08170DD0 - .4byte _08170DD4 - .4byte _08170DD8 - .4byte _08170DFC - .4byte _08170DDC - .4byte _08170DE0 - .4byte _08170DE4 - .4byte _08170DE8 - .4byte _08170DEC - .4byte _08170DF0 - .4byte _08170DF4 - .4byte _08170DF8 -_08170DD0: - movs r0, 0x4 - b _08170DFE -_08170DD4: - movs r0, 0x3 - b _08170DFE -_08170DD8: - movs r0, 0x1 - b _08170DFE -_08170DDC: - movs r0, 0x2 - b _08170DFE -_08170DE0: - movs r0, 0x5 - b _08170DFE -_08170DE4: - movs r0, 0x6 - b _08170DFE -_08170DE8: - movs r0, 0x7 - b _08170DFE -_08170DEC: - movs r0, 0x8 - b _08170DFE -_08170DF0: - movs r0, 0x9 - b _08170DFE -_08170DF4: - movs r0, 0xA - b _08170DFE -_08170DF8: - movs r0, 0xB - b _08170DFE -_08170DFC: - movs r0, 0 -_08170DFE: - pop {r1} - bx r1 - thumb_func_end ItemIdToBallId - - thumb_func_start sub_8170E04 -sub_8170E04: @ 8170E04 - push {r4-r6,lr} - mov r6, r10 - mov r5, r9 - mov r4, r8 - push {r4-r6} - mov r10, r0 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldr r0, =gLastUsedItem - ldrh r0, [r0] - bl ItemIdToBallId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - ldr r1, =gBallSpriteTemplates - adds r0, r1 - movs r1, 0x20 - movs r2, 0x50 - movs r3, 0x1D - bl CreateSprite - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r1, =gSprites - mov r9, r1 - lsls r4, r5, 4 - adds r4, r5 - lsls r4, 2 - adds r6, r4, r1 - movs r0, 0x22 - strh r0, [r6, 0x2E] - ldr r2, =gBattleAnimTarget - mov r8, r2 - ldrb r0, [r2] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x30] - mov r1, r8 - ldrb r0, [r1] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x10 - strh r0, [r6, 0x32] - mov r0, r9 - adds r0, 0x1C - adds r4, r0 - ldr r0, =sub_8171104 - str r0, [r4] - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r3, [r0, 0x8] - ldr r1, =gBattlerSpriteIds - mov r2, r8 - ldrb r0, [r2] - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r9 - adds r0, 0x3E - ldrb r1, [r0] - lsls r1, 29 - lsrs r1, 31 - lsls r1, 1 - ldrb r2, [r3, 0x9] - movs r0, 0x3 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x9] - ldr r1, =gTasks - mov r2, r10 - lsls r0, r2, 2 - add r0, r10 - lsls r0, 3 - adds r0, r1 - strh r5, [r0, 0x8] - ldr r1, =sub_8170EF0 - str r1, [r0] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170E04 - - thumb_func_start sub_8170EF0 -sub_8170EF0: @ 8170EF0 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r1, =gTasks - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 3 - adds r0, r1 - ldrb r1, [r0, 0x8] - ldr r2, =gSprites - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x2E] - ldr r0, =0x0000ffff - cmp r1, r0 - bne _08170F1A - adds r0, r3, 0 - bl DestroyAnimVisualTask -_08170F1A: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170EF0 - - thumb_func_start sub_8170F2C -sub_8170F2C: @ 8170F2C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 2 - ands r0, r1 - cmp r0, 0 - beq _08170F50 - movs r6, 0x20 - movs r5, 0xB - b _08170F54 - .pool -_08170F50: - movs r6, 0x17 - movs r5, 0x5 -_08170F54: - ldr r0, =gLastUsedItem - ldrh r0, [r0] - bl ItemIdToBallId - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - bl sub_80A82E4 - adds r3, r0, 0 - adds r3, 0x1 - lsls r3, 24 - lsrs r3, 24 - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 3 - ldr r1, =gBallSpriteTemplates - adds r0, r1 - adds r1, r6, 0 - adds r1, 0x20 - movs r2, 0x50 - orrs r5, r2 - adds r2, r5, 0 - bl CreateSprite - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r0, =gSprites - mov r9, r0 - lsls r4, r5, 4 - adds r4, r5 - lsls r4, 2 - adds r6, r4, r0 - movs r0, 0x22 - strh r0, [r6, 0x2E] - ldr r1, =gBattleAnimTarget - mov r8, r1 - ldrb r0, [r1] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x30] - mov r1, r8 - ldrb r0, [r1] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x10 - strh r0, [r6, 0x32] - movs r0, 0x1C - add r9, r0 - add r4, r9 - ldr r0, =SpriteCallbackDummy - str r0, [r4] - movs r0, 0 - bl GetBattlerAtPosition - ldr r1, =gBattlerSpriteIds - lsls r0, 24 - lsrs r0, 24 - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r9 - ldr r1, =sub_8039E84 - str r1, [r0] - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - strh r5, [r0, 0x8] - ldr r1, =sub_8171030 - str r1, [r0] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8170F2C - - thumb_func_start sub_8171030 -sub_8171030: @ 8171030 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r6, =gSprites - movs r0, 0 - bl GetBattlerAtPosition - ldr r1, =gBattlerSpriteIds - lsls r0, 24 - lsrs r0, 24 - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x2B - ldrb r0, [r0] - cmp r0, 0x1 - bne _0817108A - movs r0, 0x3D - movs r1, 0 - bl PlaySE12WithPanning - ldr r0, =gTasks - lsls r4, r5, 2 - adds r4, r5 - lsls r4, 3 - adds r4, r0 - movs r0, 0x8 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r6, 0 - adds r1, 0x1C - adds r0, r1 - ldr r1, =sub_8171104 - str r1, [r0] - ldr r0, =sub_81710A8 - movs r1, 0xA - bl CreateTask - ldr r0, =sub_8170EF0 - str r0, [r4] -_0817108A: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171030 - - thumb_func_start sub_81710A8 -sub_81710A8: @ 81710A8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r6, =gSprites - movs r0, 0 - bl GetBattlerAtPosition - ldr r4, =gBattlerSpriteIds - lsls r0, 24 - lsrs r0, 24 - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3F - ldrb r0, [r0] - lsls r0, 27 - cmp r0, 0 - bge _081710F4 - movs r0, 0 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - movs r1, 0 - bl StartSpriteAnim - adds r0, r5, 0 - bl DestroyTask -_081710F4: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81710A8 - - thumb_func_start sub_8171104 -sub_8171104: @ 8171104 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x30] - ldrh r2, [r4, 0x32] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x30] - strh r1, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - strh r2, [r4, 0x36] - ldr r0, =0x0000ffd8 - strh r0, [r4, 0x38] - adds r0, r4, 0 - bl InitAnimArcTranslation - ldr r0, =sub_8171134 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171104 - - thumb_func_start sub_8171134 -sub_8171134: @ 8171134 - push {r4,r5,lr} - sub sp, 0x4 - adds r4, r0, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - beq _081711D2 - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r0, [r0, 0x8] - ldrb r0, [r0, 0x8] - cmp r0, 0x5 - bne _08171160 - ldr r0, =sub_8171CAC - str r0, [r4, 0x1C] - b _081711D2 - .pool -_08171160: - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAnim - ldrh r0, [r4, 0x24] - ldrh r1, [r4, 0x20] - adds r0, r1 - movs r1, 0 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x26] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - strh r1, [r4, 0x24] - strh r1, [r4, 0x26] - adds r1, r4, 0 - adds r1, 0x2E - movs r2, 0 - adds r0, r4, 0 - adds r0, 0x3C -_08171188: - strh r2, [r0] - subs r0, 0x2 - cmp r0, r1 - bge _08171188 - movs r0, 0 - strh r0, [r4, 0x38] - ldr r0, =sub_81711E8 - str r0, [r4, 0x1C] - ldr r0, =gLastUsedItem - ldrh r0, [r0] - bl ItemIdToBallId - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xB - bgt _081711D2 - cmp r5, 0 - blt _081711D2 - ldrh r0, [r4, 0x20] - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x22] - subs r1, 0x5 - lsls r1, 24 - lsrs r1, 24 - str r5, [sp] - movs r2, 0x1 - movs r3, 0x1C - bl LaunchBallStarsTask - ldr r0, =gBattleAnimTarget - ldrb r1, [r0] - movs r0, 0 - movs r2, 0xE - adds r3, r5, 0 - bl LaunchBallFadeMonTask -_081711D2: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171134 - - thumb_func_start sub_81711E8 -sub_81711E8: @ 81711E8 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x38] - adds r0, 0x1 - strh r0, [r4, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - bne _08171224 - ldr r0, =TaskDummy - movs r1, 0x32 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x38] - ldr r0, =sub_8171240 - str r0, [r4, 0x1C] - ldr r2, =gSprites - ldr r1, =gBattlerSpriteIds - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0 - strh r1, [r0, 0x30] -_08171224: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81711E8 - - thumb_func_start sub_8171240 -sub_8171240: @ 8171240 - push {r4-r7,lr} - adds r7, r0, 0 - ldr r1, =gBattlerSpriteIds - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - adds r0, r1 - ldrb r4, [r0] - ldrh r0, [r7, 0x38] - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r5, r0, r1 - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xB - bne _08171272 - movs r0, 0x3C - bl PlaySE -_08171272: - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _081712E8 - cmp r0, 0x1 - bgt _08171290 - cmp r0, 0 - beq _08171296 - b _08171354 - .pool -_08171290: - cmp r0, 0x2 - beq _0817132C - b _08171354 -_08171296: - adds r0, r4, 0 - movs r1, 0 - bl sub_80A7270 - movs r0, 0x80 - lsls r0, 1 - strh r0, [r5, 0x1C] - ldr r1, =gUnknown_030062DC - movs r0, 0x1C - str r0, [r1] - ldr r2, =gUnknown_030062E4 - ldr r1, =gSprites - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrh r1, [r0, 0x26] - ldrh r0, [r0, 0x22] - adds r1, r0 - ldrh r0, [r7, 0x26] - ldrh r7, [r7, 0x22] - adds r0, r7 - subs r1, r0 - strh r1, [r2] - ldr r4, =gUnknown_030062E0 - ldrh r0, [r2] - lsls r0, 8 - movs r1, 0x1C - bl __udivsi3 - strh r0, [r4] - strh r0, [r5, 0xC] - b _08171346 - .pool -_081712E8: - ldrh r0, [r5, 0x1C] - adds r0, 0x20 - strh r0, [r5, 0x1C] - movs r0, 0x1C - ldrsh r2, [r5, r0] - adds r0, r4, 0 - adds r1, r2, 0 - movs r3, 0 - bl obj_id_set_rotscale - ldrh r0, [r5, 0xC] - ldrh r1, [r5, 0xE] - adds r0, r1 - strh r0, [r5, 0xE] - ldr r0, =gSprites - lsls r1, r4, 4 - adds r1, r4 - lsls r1, 2 - adds r1, r0 - movs r2, 0xE - ldrsh r0, [r5, r2] - negs r0, r0 - asrs r0, 8 - strh r0, [r1, 0x26] - movs r0, 0x1C - ldrsh r1, [r5, r0] - ldr r0, =0x0000047f - cmp r1, r0 - ble _0817137C - b _08171346 - .pool -_0817132C: - adds r0, r4, 0 - bl sub_80A7344 - ldr r1, =gSprites - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] -_08171346: - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - b _0817137C - .pool -_08171354: - ldr r0, =gTasks - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 3 - adds r1, r0 - movs r2, 0xA - ldrsh r0, [r1, r2] - cmp r0, 0xA - ble _0817137C - adds r0, r6, 0 - bl DestroyTask - adds r0, r7, 0 - movs r1, 0x2 - bl StartSpriteAnim - movs r0, 0 - strh r0, [r7, 0x38] - ldr r0, =sub_817138C - str r0, [r7, 0x1C] -_0817137C: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171240 - - thumb_func_start sub_817138C -sub_817138C: @ 817138C - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _081713C6 - movs r1, 0 - strh r1, [r4, 0x34] - movs r0, 0x28 - strh r0, [r4, 0x36] - strh r1, [r4, 0x38] - movs r0, 0 - movs r1, 0x28 - bl Cos - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - movs r0, 0x36 - ldrsh r1, [r4, r0] - movs r0, 0 - bl Cos - negs r0, r0 - strh r0, [r4, 0x26] - ldr r0, =sub_81713D0 - str r0, [r4, 0x1C] -_081713C6: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817138C - - thumb_func_start sub_81713D0 -sub_81713D0: @ 81713D0 - push {r4,r5,lr} - adds r4, r0, 0 - movs r5, 0 - ldrh r0, [r4, 0x34] - movs r1, 0xFF - ands r1, r0 - cmp r1, 0 - beq _081713E6 - cmp r1, 0x1 - beq _0817145A - b _08171486 -_081713E6: - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r2, 0x36 - ldrsh r1, [r4, r2] - bl Cos - negs r0, r0 - strh r0, [r4, 0x26] - ldrh r1, [r4, 0x38] - adds r1, 0x4 - ldrh r2, [r4, 0x34] - lsls r0, r2, 16 - asrs r0, 24 - adds r1, r0 - strh r1, [r4, 0x38] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x3F - ble _08171486 - ldrh r0, [r4, 0x36] - subs r0, 0xA - strh r0, [r4, 0x36] - ldr r1, =0x00000101 - adds r0, r2, r1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 24 - cmp r0, 0x4 - bne _08171422 - movs r5, 0x1 -_08171422: - cmp r0, 0x2 - beq _08171442 - cmp r0, 0x2 - bgt _08171434 - cmp r0, 0x1 - beq _0817143A - b _08171452 - .pool -_08171434: - cmp r0, 0x3 - beq _0817144A - b _08171452 -_0817143A: - movs r0, 0x38 - bl PlaySE - b _08171486 -_08171442: - movs r0, 0x39 - bl PlaySE - b _08171486 -_0817144A: - movs r0, 0x3A - bl PlaySE - b _08171486 -_08171452: - movs r0, 0x3B - bl PlaySE - b _08171486 -_0817145A: - movs r2, 0x38 - ldrsh r0, [r4, r2] - movs r2, 0x36 - ldrsh r1, [r4, r2] - bl Cos - negs r0, r0 - strh r0, [r4, 0x26] - ldrh r1, [r4, 0x38] - subs r1, 0x4 - ldrh r2, [r4, 0x34] - lsls r0, r2, 16 - asrs r0, 24 - subs r1, r0 - strh r1, [r4, 0x38] - lsls r1, 16 - cmp r1, 0 - bgt _08171486 - strh r5, [r4, 0x38] - ldr r0, =0xffffff00 - ands r0, r2 - strh r0, [r4, 0x34] -_08171486: - cmp r5, 0 - beq _081714CA - movs r5, 0 - strh r5, [r4, 0x34] - movs r0, 0x40 - movs r1, 0x28 - bl Cos - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - strh r5, [r4, 0x26] - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r0, [r0, 0x8] - ldrb r0, [r0, 0x8] - cmp r0, 0 - bne _081714C0 - strh r5, [r4, 0x38] - ldr r0, =sub_81717B4 - str r0, [r4, 0x1C] - b _081714CA - .pool -_081714C0: - ldr r0, =sub_81714D4 - str r0, [r4, 0x1C] - movs r0, 0x1 - strh r0, [r4, 0x36] - strh r5, [r4, 0x38] -_081714CA: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81713D0 - - thumb_func_start sub_81714D4 -sub_81714D4: @ 81714D4 - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x34] - adds r0, 0x1 - movs r5, 0 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - bne _08171510 - strh r5, [r4, 0x34] - adds r2, r4, 0 - adds r2, 0x2C - ldrb r0, [r2] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r0, [r0, 0x8] - strh r5, [r0, 0xC] - ldr r0, =sub_8171520 - str r0, [r4, 0x1C] - movs r0, 0x17 - bl PlaySE -_08171510: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81714D4 - - thumb_func_start sub_8171520 -sub_8171520: @ 8171520 - push {r4-r6,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x34] - movs r1, 0xFF - ands r1, r0 - cmp r1, 0x6 - bls _08171530 - b _08171768 -_08171530: - lsls r0, r1, 2 - ldr r1, =_08171540 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08171540: - .4byte _0817155C - .4byte _081715AE - .4byte _081715F4 - .4byte _08171654 - .4byte _081716A4 - .4byte _08171708 - .4byte _08171768 -_0817155C: - ldr r1, =gBattleSpritesDataPtr - ldr r5, [r1] - ldr r2, [r5, 0x8] - ldrh r3, [r2, 0xC] - movs r6, 0xC - ldrsh r0, [r2, r6] - adds r6, r1, 0 - cmp r0, 0xFF - ble _08171584 - ldrh r0, [r4, 0x36] - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - ldr r1, [r5, 0x8] - ldrb r0, [r1, 0xC] - strh r0, [r1, 0xC] - b _0817158A - .pool -_08171584: - adds r0, r3, 0 - adds r0, 0xB0 - strh r0, [r2, 0xC] -_0817158A: - ldrh r0, [r4, 0x38] - adds r0, 0x1 - movs r3, 0 - strh r0, [r4, 0x38] - adds r2, r4, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2] - ldrh r0, [r4, 0x38] - adds r0, 0x7 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xE - bhi _081715AC - b _081717AE -_081715AC: - b _08171644 -_081715AE: - ldrh r0, [r4, 0x38] - adds r0, 0x1 - strh r0, [r4, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _08171660 - movs r0, 0 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x36] - negs r0, r0 - strh r0, [r4, 0x36] - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - adds r2, r4, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2] - movs r6, 0x36 - ldrsh r0, [r4, r6] - cmp r0, 0 - bge _081715EA - adds r0, r4, 0 - movs r1, 0x2 - bl ChangeSpriteAffineAnim - b _081717AE -_081715EA: - adds r0, r4, 0 - movs r1, 0x1 - bl ChangeSpriteAffineAnim - b _081717AE -_081715F4: - ldr r1, =gBattleSpritesDataPtr - ldr r5, [r1] - ldr r2, [r5, 0x8] - ldrh r3, [r2, 0xC] - movs r6, 0xC - ldrsh r0, [r2, r6] - adds r6, r1, 0 - cmp r0, 0xFF - ble _0817161C - ldrh r0, [r4, 0x36] - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - ldr r1, [r5, 0x8] - ldrb r0, [r1, 0xC] - strh r0, [r1, 0xC] - b _08171622 - .pool -_0817161C: - adds r0, r3, 0 - adds r0, 0xB0 - strh r0, [r2, 0xC] -_08171622: - ldrh r0, [r4, 0x38] - adds r0, 0x1 - movs r3, 0 - strh r0, [r4, 0x38] - adds r2, r4, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2] - ldrh r0, [r4, 0x38] - adds r0, 0xC - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x18 - bhi _08171644 - b _081717AE -_08171644: - ldr r0, [r6] - ldr r0, [r0, 0x8] - strh r3, [r0, 0xC] - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - strh r3, [r4, 0x38] - b _081717AE -_08171654: - ldrh r0, [r4, 0x38] - adds r1, r0, 0x1 - strh r1, [r4, 0x38] - lsls r0, 16 - cmp r0, 0 - bge _0817166E -_08171660: - adds r0, r4, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - b _081717AE -_0817166E: - movs r0, 0 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x36] - negs r0, r0 - strh r0, [r4, 0x36] - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - adds r2, r4, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2] - movs r6, 0x36 - ldrsh r0, [r4, r6] - cmp r0, 0 - bge _0817169C - adds r0, r4, 0 - movs r1, 0x2 - bl ChangeSpriteAffineAnim - b _081716A4 -_0817169C: - adds r0, r4, 0 - movs r1, 0x1 - bl ChangeSpriteAffineAnim -_081716A4: - ldr r1, =gBattleSpritesDataPtr - ldr r5, [r1] - ldr r2, [r5, 0x8] - ldrh r3, [r2, 0xC] - movs r6, 0xC - ldrsh r0, [r2, r6] - adds r6, r1, 0 - cmp r0, 0xFF - ble _081716CC - ldrh r0, [r4, 0x36] - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - ldr r1, [r5, 0x8] - ldrb r0, [r1, 0xC] - strh r0, [r1, 0xC] - b _081716D2 - .pool -_081716CC: - adds r0, r3, 0 - adds r0, 0xB0 - strh r0, [r2, 0xC] -_081716D2: - ldrh r0, [r4, 0x38] - adds r0, 0x1 - movs r3, 0 - strh r0, [r4, 0x38] - adds r2, r4, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2] - ldrh r0, [r4, 0x38] - adds r0, 0x4 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x8 - bls _081717AE - ldr r0, [r6] - ldr r0, [r0, 0x8] - strh r3, [r0, 0xC] - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - strh r3, [r4, 0x38] - ldrh r0, [r4, 0x36] - negs r0, r0 - strh r0, [r4, 0x36] - b _081717AE -_08171708: - movs r6, 0x80 - lsls r6, 1 - adds r0, r6, 0 - ldrh r1, [r4, 0x34] - adds r0, r1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r1, r0, 24 - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r0, [r0, 0x8] - ldrb r0, [r0, 0x8] - cmp r1, r0 - bne _08171740 - adds r2, r4, 0 - adds r2, 0x2C - ldrb r0, [r2] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_81717B4 - str r0, [r4, 0x1C] - b _081717AE - .pool -_08171740: - cmp r0, 0x4 - bne _08171754 - cmp r1, 0x3 - bne _08171754 - ldr r0, =sub_81717D8 - str r0, [r4, 0x1C] - b _0817175A - .pool -_08171754: - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] -_0817175A: - adds r2, r4, 0 - adds r2, 0x2C - ldrb r0, [r2] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - b _081717AE -_08171768: - ldrh r0, [r4, 0x38] - adds r0, 0x1 - strh r0, [r4, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - bne _081717AE - movs r0, 0 - strh r0, [r4, 0x38] - ldrh r1, [r4, 0x34] - ldr r0, =0xffffff00 - ands r0, r1 - strh r0, [r4, 0x34] - adds r0, r4, 0 - movs r1, 0x3 - bl StartSpriteAffineAnim - movs r6, 0x36 - ldrsh r0, [r4, r6] - cmp r0, 0 - bge _081717A0 - adds r0, r4, 0 - movs r1, 0x2 - bl StartSpriteAffineAnim - b _081717A8 - .pool -_081717A0: - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim -_081717A8: - movs r0, 0x17 - bl PlaySE -_081717AE: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8171520 - - thumb_func_start sub_81717B4 -sub_81717B4: @ 81717B4 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x38] - adds r0, 0x1 - strh r0, [r1, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - bne _081717CE - movs r0, 0 - strh r0, [r1, 0x38] - ldr r0, =sub_8171AE4 - str r0, [r1, 0x1C] -_081717CE: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81717B4 - - thumb_func_start sub_81717D8 -sub_81717D8: @ 81717D8 - adds r3, r0, 0 - adds r3, 0x2C - ldrb r1, [r3] - movs r2, 0x40 - orrs r1, r2 - strb r1, [r3] - ldr r1, =sub_81717F8 - str r1, [r0, 0x1C] - movs r1, 0 - strh r1, [r0, 0x34] - strh r1, [r0, 0x36] - strh r1, [r0, 0x38] - bx lr - .pool - thumb_func_end sub_81717D8 - - thumb_func_start sub_81717F8 -sub_81717F8: @ 81717F8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r6, r0, 0 - ldr r7, =gBattleAnimTarget - ldrh r0, [r6, 0x36] - adds r0, 0x1 - movs r1, 0 - mov r8, r1 - strh r0, [r6, 0x36] - lsls r0, 16 - asrs r1, r0, 16 - cmp r1, 0x28 - bne _0817183C - movs r0, 0xFE - bl PlaySE - ldrb r1, [r6, 0x5] - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 9 - lsls r0, r1 - movs r1, 0x6 - movs r2, 0 - bl BlendPalettes - adds r0, r6, 0 - bl sub_81719EC - b _081718BC - .pool -_0817183C: - cmp r1, 0x3C - bne _0817185A - ldrb r1, [r6, 0x5] - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 9 - lsls r0, r1 - mov r1, r8 - str r1, [sp] - movs r1, 0x2 - movs r2, 0x6 - movs r3, 0 - bl BeginNormalPaletteFade - b _081718BC -_0817185A: - cmp r1, 0x5F - bne _08171880 - ldr r0, =gDoingBattleAnim - movs r1, 0 - strb r1, [r0] - movs r0, 0x1 - bl UpdateOamPriorityInAllHealthboxes - bl m4aMPlayAllStop - ldr r0, =0x00000213 - bl PlaySE - b _081718BC - .pool -_08171880: - ldr r0, =0x0000013b - cmp r1, r0 - bne _081718BC - ldr r5, =gSprites - ldr r4, =gBattlerSpriteIds - ldrb r0, [r7] - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldrb r0, [r7] - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - bl DestroySprite - mov r0, r8 - strh r0, [r6, 0x2E] - ldr r0, =sub_81718D8 - str r0, [r6, 0x1C] -_081718BC: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81717F8 - - thumb_func_start sub_81718D8 -sub_81718D8: @ 81718D8 - push {r4,r5,lr} - sub sp, 0x4 - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _08171944 - cmp r0, 0x1 - bgt _081718F0 - cmp r0, 0 - beq _081718F6 - b _0817198A -_081718F0: - cmp r0, 0x2 - beq _08171976 - b _0817198A -_081718F6: - strh r0, [r4, 0x30] - strh r0, [r4, 0x32] - ldrb r1, [r4, 0x1] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - strb r0, [r4, 0x1] - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0x10 - bl SetGpuReg - ldr r0, [r4, 0x14] - ldrh r0, [r0, 0x2] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x10 - movs r1, 0x1 - lsls r1, r0 - ldr r0, =0x00007fff - str r0, [sp] - adds r0, r1, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _08171982 - .pool -_08171944: - ldrh r0, [r4, 0x30] - adds r1, r0, 0x1 - strh r1, [r4, 0x30] - lsls r0, 16 - cmp r0, 0 - ble _081719B0 - movs r0, 0 - strh r0, [r4, 0x30] - ldrh r2, [r4, 0x32] - adds r2, 0x1 - strh r2, [r4, 0x32] - lsls r1, r2, 8 - movs r0, 0x10 - subs r0, r2 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0x10 - bne _081719B0 - b _08171982 -_08171976: - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] -_08171982: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _081719B0 -_0817198A: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _081719B0 - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - strh r5, [r4, 0x2E] - ldr r0, =sub_81719C0 - str r0, [r4, 0x1C] -_081719B0: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81718D8 - - thumb_func_start sub_81719C0 -sub_81719C0: @ 81719C0 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _081719D8 - ldr r0, =0x0000ffff - strh r0, [r4, 0x2E] - b _081719E4 - .pool -_081719D8: - adds r0, r4, 0 - bl FreeSpriteOamMatrix - adds r0, r4, 0 - bl DestroySprite -_081719E4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81719C0 - - thumb_func_start sub_81719EC -sub_81719EC: @ 81719EC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r6, r0, 0 - adds r1, r6, 0 - adds r1, 0x43 - ldrb r0, [r1] - cmp r0, 0 - beq _08171A0C - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - b _08171A14 -_08171A0C: - movs r0, 0 - mov r8, r0 - movs r0, 0x1 - strb r0, [r1] -_08171A14: - movs r0, 0x4 - bl sub_8171D60 - movs r7, 0 - ldr r2, =gSprites - mov r9, r2 - movs r0, 0x1C - add r0, r9 - mov r10, r0 -_08171A26: - movs r2, 0x20 - ldrsh r1, [r6, r2] - movs r0, 0x22 - ldrsh r2, [r6, r0] - ldr r0, =gUnknown_085E5250 - mov r3, r8 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _08171A82 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - mov r2, r9 - adds r5, r4, r2 - movs r0, 0x18 - strh r0, [r5, 0x2E] - ldr r0, =gUnknown_085E5088 - lsls r1, r7, 2 - adds r1, r0 - movs r0, 0 - ldrsb r0, [r1, r0] - ldrh r2, [r6, 0x20] - adds r0, r2 - strh r0, [r5, 0x32] - movs r0, 0x1 - ldrsb r0, [r1, r0] - ldrh r2, [r6, 0x22] - adds r0, r2 - strh r0, [r5, 0x36] - movs r0, 0x2 - ldrsb r0, [r1, r0] - strh r0, [r5, 0x38] - adds r0, r5, 0 - bl InitAnimArcTranslation - add r4, r10 - ldr r0, =sub_8171AAC - str r0, [r4] - ldr r0, =gUnknown_085E51B4 - ldrb r1, [r0, 0x4] - adds r0, r5, 0 - bl StartSpriteAnim -_08171A82: - adds r7, 0x1 - cmp r7, 0x2 - bls _08171A26 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81719EC - - thumb_func_start sub_8171AAC -sub_8171AAC: @ 8171AAC - push {r4,lr} - adds r4, r0, 0 - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsrs r1, r2, 2 - movs r0, 0x1 - eors r1, r0 - ands r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - adds r0, r4, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - beq _08171ADC - adds r0, r4, 0 - bl DestroySprite -_08171ADC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8171AAC - - thumb_func_start sub_8171AE4 -sub_8171AE4: @ 8171AE4 - push {r4-r6,lr} - sub sp, 0x4 - adds r4, r0, 0 - movs r1, 0x1 - bl StartSpriteAnim - adds r0, r4, 0 - movs r1, 0 - bl StartSpriteAffineAnim - ldr r0, =sub_8171BAC - str r0, [r4, 0x1C] - ldr r0, =gLastUsedItem - ldrh r0, [r0] - bl ItemIdToBallId - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xB - bgt _08171B36 - cmp r5, 0 - blt _08171B36 - ldrh r0, [r4, 0x20] - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x22] - subs r1, 0x5 - lsls r1, 24 - lsrs r1, 24 - str r5, [sp] - movs r2, 0x1 - movs r3, 0x1C - bl LaunchBallStarsTask - ldr r0, =gBattleAnimTarget - ldrb r1, [r0] - movs r0, 0x1 - movs r2, 0xE - adds r3, r5, 0 - bl LaunchBallFadeMonTask -_08171B36: - ldr r6, =gSprites - ldr r5, =gBattlerSpriteIds - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - adds r0, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - ldrb r0, [r4] - adds r0, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - movs r1, 0x1 - bl StartSpriteAffineAnim - ldrb r0, [r4] - adds r0, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - bl AnimateSprite - ldrb r0, [r4] - adds r0, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - movs r1, 0x80 - lsls r1, 5 - strh r1, [r0, 0x30] - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171AE4 - - thumb_func_start sub_8171BAC -sub_8171BAC: @ 8171BAC - push {r4-r7,lr} - adds r7, r0, 0 - movs r5, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _08171BCA - adds r2, r7, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] -_08171BCA: - ldr r4, =gSprites - ldr r3, =gBattlerSpriteIds - ldr r2, =gBattleAnimTarget - ldrb r0, [r2] - adds r0, r3 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r0, r4 - adds r0, r1, 0 - adds r0, 0x3F - ldrb r0, [r0] - lsls r0, 26 - cmp r0, 0 - bge _08171C04 - adds r0, r1, 0 - movs r1, 0 - bl StartSpriteAffineAnim - movs r5, 0x1 - b _08171C24 - .pool -_08171C04: - ldr r6, =0xfffffee0 - adds r0, r6, 0 - ldrh r6, [r1, 0x30] - adds r0, r6 - strh r0, [r1, 0x30] - ldrb r0, [r2] - adds r0, r3 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 24 - strh r0, [r1, 0x26] -_08171C24: - adds r0, r7, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _08171C8A - cmp r5, 0 - beq _08171C8A - ldr r4, =gSprites - ldr r3, =gBattlerSpriteIds - ldr r2, =gBattleAnimTarget - ldrb r0, [r2] - adds r0, r3 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r6, 0 - movs r5, 0 - strh r5, [r0, 0x26] - ldrb r0, [r2] - adds r0, r3 - ldrb r0, [r0] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r4 - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r0, [r0, 0x8] - ldrb r1, [r0, 0x9] - lsls r1, 30 - adds r2, 0x3E - lsrs r1, 31 - lsls r1, 2 - ldrb r3, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] - strh r5, [r7, 0x2E] - ldr r0, =sub_81719C0 - str r0, [r7, 0x1C] - ldr r0, =gDoingBattleAnim - strb r6, [r0] - movs r0, 0x1 - bl UpdateOamPriorityInAllHealthboxes -_08171C8A: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171BAC - - thumb_func_start sub_8171CAC -sub_8171CAC: @ 8171CAC - push {r4,lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x24] - ldrh r1, [r2, 0x20] - adds r0, r1 - movs r1, 0 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x26] - ldrh r3, [r2, 0x22] - adds r0, r3 - strh r0, [r2, 0x22] - strh r1, [r2, 0x26] - strh r1, [r2, 0x24] - ldr r4, =sub_8171CE8 - movs r3, 0 - movs r1, 0x5 - adds r0, r2, 0 - adds r0, 0x38 -_08171CD0: - strh r3, [r0] - subs r0, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _08171CD0 - str r4, [r2, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171CAC - - thumb_func_start sub_8171CE8 -sub_8171CE8: @ 8171CE8 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x80 - lsls r0, 4 - adds r2, r0, 0 - ldrh r1, [r4, 0x2E] - adds r2, r1 - movs r0, 0xD0 - lsls r0, 3 - adds r3, r0, 0 - ldrh r1, [r4, 0x30] - adds r3, r1 - lsls r1, r3, 16 - asrs r1, 24 - ldrh r0, [r4, 0x24] - subs r0, r1 - strh r0, [r4, 0x24] - lsls r0, r2, 16 - asrs r0, 24 - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - movs r0, 0xFF - ands r2, r0 - strh r2, [r4, 0x2E] - ands r3, r0 - strh r3, [r4, 0x30] - movs r2, 0x22 - ldrsh r0, [r4, r2] - movs r2, 0x26 - ldrsh r1, [r4, r2] - adds r0, r1 - cmp r0, 0xA0 - bgt _08171D3E - movs r1, 0x20 - ldrsh r0, [r4, r1] - movs r2, 0x24 - ldrsh r1, [r4, r2] - adds r0, r1 - movs r1, 0x8 - negs r1, r1 - cmp r0, r1 - bge _08171D52 -_08171D3E: - movs r0, 0 - strh r0, [r4, 0x2E] - ldr r0, =sub_81719C0 - str r0, [r4, 0x1C] - ldr r1, =gDoingBattleAnim - movs r0, 0 - strb r0, [r1] - movs r0, 0x1 - bl UpdateOamPriorityInAllHealthboxes -_08171D52: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171CE8 - - thumb_func_start sub_8171D60 -sub_8171D60: @ 8171D60 - push {r4,r5,lr} - lsls r0, 24 - ldr r1, =gUnknown_085E5094 - lsrs r5, r0, 21 - adds r4, r5, r1 - ldrh r0, [r4, 0x6] - bl GetSpriteTileStartByTag - lsls r0, 16 - ldr r1, =0xffff0000 - cmp r0, r1 - bne _08171D86 - adds r0, r4, 0 - bl LoadCompressedObjectPicUsingHeap - ldr r0, =gUnknown_085E50F4 - adds r0, r5, r0 - bl LoadCompressedObjectPaletteUsingHeap -_08171D86: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171D60 - - thumb_func_start LaunchBallStarsTask -LaunchBallStarsTask: @ 8171D98 - push {r4-r6,lr} - mov r6, r10 - mov r5, r9 - mov r4, r8 - push {r4-r6} - adds r6, r0, 0 - mov r8, r1 - mov r9, r2 - mov r10, r3 - ldr r5, [sp, 0x1C] - lsls r6, 24 - lsrs r6, 24 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - mov r1, r9 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - mov r0, r10 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - lsls r5, 24 - lsrs r5, 24 - adds r0, r5, 0 - bl sub_8171D60 - ldr r1, =gUnknown_085E51C0 - lsls r0, r5, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x5 - bl CreateTask - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - strh r6, [r0, 0xA] - mov r1, r8 - strh r1, [r0, 0xC] - mov r1, r9 - strh r1, [r0, 0xE] - mov r1, r10 - strh r1, [r0, 0x10] - strh r5, [r0, 0x26] - movs r0, 0xF - bl PlaySE - adds r0, r4, 0 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end LaunchBallStarsTask - - thumb_func_start sub_8171E20 -sub_8171E20: @ 8171E20 - push {lr} - ldr r0, =gMain - ldr r1, =0x00000439 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08171E3E - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r1, [r0, 0x8] - ldrb r0, [r1, 0xA] - adds r0, 0x1 - strb r0, [r1, 0xA] -_08171E3E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171E20 - - thumb_func_start sub_8171E50 -sub_8171E50: @ 8171E50 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r1, =gTasks - lsls r0, 2 - add r0, r8 - lsls r0, 3 - adds r6, r0, r1 - ldrh r0, [r6, 0x26] - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - movs r2, 0x8 - ldrsh r0, [r6, r2] - adds r2, r1, 0 - cmp r0, 0xF - bgt _08171F48 - ldrb r1, [r6, 0xA] - ldrb r2, [r6, 0xC] - ldrb r4, [r6, 0xE] - mov r9, r4 - ldrb r3, [r6, 0x10] - ldr r4, [sp] - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 3 - ldr r4, =gUnknown_085E51F0 - adds r0, r4 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - cmp r0, 0x40 - beq _08171EEC - bl sub_8171E20 - mov r0, r10 - lsls r4, r0, 4 - add r4, r10 - lsls r4, 2 - ldr r5, =gSprites - adds r7, r4, r5 - ldr r0, =gUnknown_085E51B4 - ldr r1, [sp] - adds r0, r1, r0 - ldrb r1, [r0] - adds r0, r7, 0 - bl StartSpriteAnim - adds r5, 0x1C - adds r4, r5 - ldr r0, =sub_8171F68 - str r0, [r4] - movs r0, 0x3 - mov r2, r9 - ands r2, r0 - lsls r2, 2 - ldrb r1, [r7, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - orrs r0, r2 - strb r0, [r7, 0x5] - ldrb r0, [r6, 0x8] - cmp r0, 0x7 - bls _08171EE8 - subs r0, 0x8 - lsls r0, 24 - lsrs r0, 24 -_08171EE8: - lsls r0, 5 - strh r0, [r7, 0x2E] -_08171EEC: - ldr r0, =gTasks - mov r4, r8 - lsls r1, r4, 2 - add r1, r8 - lsls r1, 3 - adds r1, r0 - movs r2, 0x8 - ldrsh r1, [r1, r2] - adds r2, r0, 0 - cmp r1, 0xF - bne _08171F48 - ldr r0, =gMain - ldr r4, =0x00000439 - adds r0, r4 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08171F22 - ldr r0, =gSprites - mov r2, r10 - lsls r1, r2, 4 - add r1, r10 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_08171F22: - mov r0, r8 - bl DestroyTask - b _08171F58 - .pool -_08171F48: - mov r4, r8 - lsls r0, r4, 2 - add r0, r8 - lsls r0, 3 - adds r0, r2 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] -_08171F58: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8171E50 - - thumb_func_start sub_8171F68 -sub_8171F68: @ 8171F68 - push {lr} - adds r1, r0, 0 - ldrh r2, [r1, 0x30] - movs r3, 0x30 - ldrsh r0, [r1, r3] - cmp r0, 0 - bne _08171F80 - ldr r0, =sub_8171F88 - str r0, [r1, 0x1C] - b _08171F84 - .pool -_08171F80: - subs r0, r2, 0x1 - strh r0, [r1, 0x30] -_08171F84: - pop {r0} - bx r0 - thumb_func_end sub_8171F68 - - thumb_func_start sub_8171F88 -sub_8171F88: @ 8171F88 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r2, 0x30 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r2, 0x30 - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x30] - adds r0, 0x2 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x32 - bne _08171FBC - adds r0, r4, 0 - bl sub_8172944 -_08171FBC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8171F88 - - thumb_func_start sub_8171FC4 -sub_8171FC4: @ 8171FC4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r0, =gTasks - mov r2, r9 - lsls r1, r2, 2 - add r1, r9 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x26] - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldrb r3, [r1, 0xA] - str r3, [sp] - ldrb r0, [r1, 0xC] - str r0, [sp, 0x4] - ldrb r2, [r1, 0xE] - str r2, [sp, 0x8] - ldrb r1, [r1, 0x10] - str r1, [sp, 0xC] - movs r7, 0 - ldr r3, =gSprites - mov r10, r3 - mov r1, r8 - lsls r0, r1, 1 - add r0, r8 - lsls r0, 3 - str r0, [sp, 0x10] -_0817200A: - ldr r0, =gUnknown_085E51F0 - ldr r2, [sp, 0x10] - adds r0, r2, r0 - ldr r1, [sp] - ldr r2, [sp, 0x4] - ldr r3, [sp, 0xC] - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _0817206A - bl sub_8171E20 - lsls r4, r6, 4 - adds r4, r6 - lsls r4, 2 - mov r3, r10 - adds r5, r4, r3 - ldr r0, =gUnknown_085E51B4 - add r0, r8 - ldrb r1, [r0] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r0, =gSprites + 0x1C - adds r4, r0 - ldr r0, =sub_8172508 - str r0, [r4] - movs r0, 0x3 - ldr r2, [sp, 0x8] - ands r2, r0 - lsls r2, 2 - ldrb r0, [r5, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] - lsls r0, r7, 5 - strh r0, [r5, 0x2E] - movs r0, 0xA - strh r0, [r5, 0x36] - movs r0, 0x2 - strh r0, [r5, 0x38] - movs r0, 0x1 - strh r0, [r5, 0x3A] -_0817206A: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x7 - bls _0817200A - ldr r0, =gMain - ldr r1, =0x00000439 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08172092 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_08172092: - mov r0, r9 - bl DestroyTask - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8171FC4 - - thumb_func_start sub_81720C8 -sub_81720C8: @ 81720C8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r0, =gTasks - mov r2, r9 - lsls r1, r2, 2 - add r1, r9 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x26] - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldrb r3, [r1, 0xA] - str r3, [sp] - ldrb r0, [r1, 0xC] - str r0, [sp, 0x4] - ldrb r2, [r1, 0xE] - str r2, [sp, 0x8] - ldrb r1, [r1, 0x10] - str r1, [sp, 0xC] - movs r7, 0 - ldr r3, =gSprites - mov r10, r3 - mov r1, r8 - lsls r0, r1, 1 - add r0, r8 - lsls r0, 3 - str r0, [sp, 0x10] -_0817210E: - ldr r0, =gUnknown_085E51F0 - ldr r2, [sp, 0x10] - adds r0, r2, r0 - ldr r1, [sp] - ldr r2, [sp, 0x4] - ldr r3, [sp, 0xC] - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _0817216E - bl sub_8171E20 - lsls r4, r6, 4 - adds r4, r6 - lsls r4, 2 - mov r3, r10 - adds r5, r4, r3 - ldr r0, =gUnknown_085E51B4 - add r0, r8 - ldrb r1, [r0] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r0, =gSprites + 0x1C - adds r4, r0 - ldr r0, =sub_8172508 - str r0, [r4] - movs r0, 0x3 - ldr r2, [sp, 0x8] - ands r2, r0 - lsls r2, 2 - ldrb r0, [r5, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] - lsls r0, r7, 5 - strh r0, [r5, 0x2E] - movs r0, 0xA - strh r0, [r5, 0x36] - movs r0, 0x1 - strh r0, [r5, 0x38] - movs r0, 0x2 - strh r0, [r5, 0x3A] -_0817216E: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x7 - bls _0817210E - ldr r0, =gMain - ldr r1, =0x00000439 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08172196 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_08172196: - mov r0, r9 - bl DestroyTask - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81720C8 - - thumb_func_start sub_81721CC -sub_81721CC: @ 81721CC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r1, =gTasks - lsls r0, 2 - add r0, r9 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x26] - lsls r1, 24 - lsrs r1, 24 - ldrb r2, [r0, 0xA] - str r2, [sp] - ldrb r3, [r0, 0xC] - str r3, [sp, 0x4] - ldrb r2, [r0, 0xE] - str r2, [sp, 0x8] - ldrb r0, [r0, 0x10] - str r0, [sp, 0xC] - movs r7, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - str r0, [sp, 0x10] - ldr r3, =gSprites - mov r8, r3 - ldr r0, =gUnknown_085E51B4 - adds r1, r0 - mov r10, r1 -_08172212: - ldr r0, =gUnknown_085E51F0 - ldr r1, [sp, 0x10] - adds r0, r1, r0 - ldr r1, [sp] - ldr r2, [sp, 0x4] - ldr r3, [sp, 0xC] - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _0817226E - bl sub_8171E20 - lsls r4, r6, 4 - adds r4, r6 - lsls r4, 2 - mov r2, r8 - adds r5, r4, r2 - mov r3, r10 - ldrb r1, [r3] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r0, =gSprites + 0x1C - adds r4, r0 - ldr r0, =sub_8172508 - str r0, [r4] - movs r0, 0x3 - ldr r2, [sp, 0x8] - ands r2, r0 - lsls r2, 2 - ldrb r0, [r5, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] - lsls r0, r7, 5 - strh r0, [r5, 0x2E] - movs r0, 0x4 - strh r0, [r5, 0x36] - movs r0, 0x1 - strh r0, [r5, 0x38] - strh r0, [r5, 0x3A] -_0817226E: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x7 - bls _08172212 - ldr r0, =gMain - ldr r1, =0x00000439 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08172296 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_08172296: - mov r0, r9 - bl DestroyTask - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81721CC - - thumb_func_start sub_81722CC -sub_81722CC: @ 81722CC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r0, =gTasks - mov r2, r9 - lsls r1, r2, 2 - add r1, r9 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x26] - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldrb r3, [r1, 0xA] - str r3, [sp] - ldrb r0, [r1, 0xC] - str r0, [sp, 0x4] - ldrb r2, [r1, 0xE] - str r2, [sp, 0x8] - ldrb r1, [r1, 0x10] - str r1, [sp, 0xC] - movs r7, 0 - ldr r3, =gSprites - mov r10, r3 - mov r1, r8 - lsls r0, r1, 1 - add r0, r8 - lsls r0, 3 - str r0, [sp, 0x10] -_08172312: - ldr r0, =gUnknown_085E51F0 - ldr r2, [sp, 0x10] - adds r0, r2, r0 - ldr r1, [sp] - ldr r2, [sp, 0x4] - ldr r3, [sp, 0xC] - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _08172376 - bl sub_8171E20 - lsls r4, r6, 4 - adds r4, r6 - lsls r4, 2 - mov r3, r10 - adds r5, r4, r3 - ldr r0, =gUnknown_085E51B4 - add r0, r8 - ldrb r1, [r0] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r0, =gSprites + 0x1C - adds r4, r0 - ldr r0, =sub_8172508 - str r0, [r4] - movs r0, 0x3 - ldr r2, [sp, 0x8] - ands r2, r0 - lsls r2, 2 - ldrb r0, [r5, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] - lsls r0, r7, 1 - adds r0, r7 - lsls r0, 3 - adds r0, r7 - strh r0, [r5, 0x2E] - movs r0, 0x5 - strh r0, [r5, 0x36] - movs r0, 0x1 - strh r0, [r5, 0x38] - strh r0, [r5, 0x3A] -_08172376: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x9 - bls _08172312 - ldr r0, =gMain - ldr r1, =0x00000439 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _0817239E - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_0817239E: - mov r0, r9 - bl DestroyTask - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81722CC - - thumb_func_start sub_81723D4 -sub_81723D4: @ 81723D4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r1, =gTasks - lsls r2, r0, 2 - adds r0, r2, r0 - lsls r0, 3 - adds r3, r0, r1 - ldrh r1, [r3, 0x16] - movs r4, 0x16 - ldrsh r0, [r3, r4] - cmp r0, 0 - beq _08172404 - subs r0, r1, 0x1 - strh r0, [r3, 0x16] - b _081724D6 - .pool -_08172404: - ldrh r0, [r3, 0x26] - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r3, 0xA] - str r1, [sp] - ldrb r4, [r3, 0xC] - str r4, [sp, 0x4] - ldrb r1, [r3, 0xE] - str r1, [sp, 0x8] - ldrb r3, [r3, 0x10] - str r3, [sp, 0xC] - movs r7, 0 - str r2, [sp, 0x14] - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 3 - str r1, [sp, 0x10] - ldr r3, =gSprites - mov r9, r3 - ldr r1, =gUnknown_085E51B4 - adds r0, r1 - mov r10, r0 -_08172430: - ldr r0, =gUnknown_085E51F0 - ldr r4, [sp, 0x10] - adds r0, r4, r0 - ldr r1, [sp] - ldr r2, [sp, 0x4] - ldr r3, [sp, 0xC] - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _0817248C - bl sub_8171E20 - lsls r4, r6, 4 - adds r4, r6 - lsls r4, 2 - mov r0, r9 - adds r5, r4, r0 - mov r3, r10 - ldrb r1, [r3] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r0, =gSprites + 0x1C - adds r4, r0 - ldr r0, =sub_8172508 - str r0, [r4] - movs r0, 0x3 - ldr r2, [sp, 0x8] - ands r2, r0 - lsls r2, 2 - ldrb r0, [r5, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] - lsls r0, r7, 5 - strh r0, [r5, 0x2E] - movs r0, 0x8 - strh r0, [r5, 0x36] - movs r0, 0x2 - strh r0, [r5, 0x38] - strh r0, [r5, 0x3A] -_0817248C: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x7 - bls _08172430 - ldr r0, =gTasks - ldr r1, [sp, 0x14] - add r1, r8 - lsls r1, 3 - adds r1, r0 - movs r0, 0x8 - strh r0, [r1, 0x16] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - lsls r0, 16 - asrs r2, r0, 16 - cmp r2, 0x2 - bne _081724D6 - ldr r0, =gMain - ldr r4, =0x00000439 - adds r0, r4 - ldrb r1, [r0] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _081724D0 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_081724D0: - mov r0, r8 - bl DestroyTask -_081724D6: - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81723D4 - - thumb_func_start sub_8172508 -sub_8172508: @ 8172508 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r2, 0x30 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r2, 0x32 - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x36] - ldrh r1, [r4, 0x2E] - adds r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x38] - ldrh r2, [r4, 0x30] - adds r0, r2 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x3A] - ldrh r1, [r4, 0x32] - adds r0, r1 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x33 - bne _08172558 - adds r0, r4, 0 - bl sub_8172944 -_08172558: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8172508 - - thumb_func_start sub_8172560 -sub_8172560: @ 8172560 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r1, =gTasks - lsls r0, 2 - add r0, r9 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x26] - lsls r1, 24 - lsrs r1, 24 - ldrb r2, [r0, 0xA] - str r2, [sp] - ldrb r3, [r0, 0xC] - str r3, [sp, 0x4] - ldrb r2, [r0, 0xE] - str r2, [sp, 0x8] - ldrb r0, [r0, 0x10] - str r0, [sp, 0xC] - movs r7, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - str r0, [sp, 0x10] - ldr r3, =gSprites - mov r8, r3 - ldr r0, =gUnknown_085E51B4 - adds r1, r0 - mov r10, r1 -_081725A6: - ldr r0, =gUnknown_085E51F0 - ldr r1, [sp, 0x10] - adds r0, r1, r0 - ldr r1, [sp] - ldr r2, [sp, 0x4] - ldr r3, [sp, 0xC] - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _081725FE - bl sub_8171E20 - lsls r4, r6, 4 - adds r4, r6 - lsls r4, 2 - mov r2, r8 - adds r5, r4, r2 - mov r3, r10 - ldrb r1, [r3] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r0, =gSprites + 0x1C - adds r4, r0 - ldr r0, =sub_817265C - str r0, [r4] - movs r0, 0x3 - ldr r2, [sp, 0x8] - ands r2, r0 - lsls r2, 2 - ldrb r0, [r5, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 2 - adds r0, r7 - strh r0, [r5, 0x2E] -_081725FE: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0xB - bls _081725A6 - ldr r0, =gMain - ldr r1, =0x00000439 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08172626 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_08172626: - mov r0, r9 - bl DestroyTask - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172560 - - thumb_func_start sub_817265C -sub_817265C: @ 817265C - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - movs r2, 0x30 - ldrsh r1, [r5, r2] - bl Sin - strh r0, [r5, 0x24] - movs r0, 0x2E - ldrsh r4, [r5, r0] - movs r2, 0x32 - ldrsh r1, [r5, r2] - adds r0, r4, 0 - bl Sin - adds r1, r0, 0 - lsls r1, 16 - asrs r1, 16 - adds r0, r4, 0 - bl Cos - strh r0, [r5, 0x26] - ldrh r0, [r5, 0x2E] - adds r0, 0x6 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x2E] - ldrh r0, [r5, 0x30] - adds r0, 0x1 - strh r0, [r5, 0x30] - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x34] - adds r0, 0x1 - strh r0, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x33 - bne _081726B4 - adds r0, r5, 0 - bl sub_8172944 -_081726B4: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_817265C - - thumb_func_start sub_81726BC -sub_81726BC: @ 81726BC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - ldr r0, =gTasks - ldr r2, [sp] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x26] - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldrb r3, [r1, 0xA] - str r3, [sp, 0x4] - ldrb r0, [r1, 0xC] - str r0, [sp, 0x8] - ldrb r2, [r1, 0xE] - str r2, [sp, 0xC] - ldrb r1, [r1, 0x10] - str r1, [sp, 0x10] - movs r3, 0 - mov r8, r3 - mov r1, r9 - lsls r0, r1, 1 - add r0, r9 - lsls r0, 3 - str r0, [sp, 0x14] -_08172700: - movs r7, 0 - movs r2, 0x1 - add r2, r8 - mov r10, r2 -_08172708: - ldr r0, =gUnknown_085E51F0 - ldr r3, [sp, 0x14] - adds r0, r3, r0 - ldr r1, [sp, 0x4] - ldr r2, [sp, 0x8] - ldr r3, [sp, 0x10] - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _08172790 - bl sub_8171E20 - lsls r4, r6, 4 - adds r4, r6 - lsls r4, 2 - ldr r0, =gSprites - adds r5, r4, r0 - ldr r0, =gUnknown_085E51B4 - add r0, r9 - ldrb r1, [r0] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r1, =gSprites + 0x1C - adds r4, r1 - ldr r0, =sub_8172508 - str r0, [r4] - movs r0, 0x3 - ldr r1, [sp, 0xC] - ands r1, r0 - lsls r1, 2 - ldrb r0, [r5, 0x5] - movs r3, 0xD - negs r3, r3 - adds r2, r3, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] - lsls r0, r7, 5 - strh r0, [r5, 0x2E] - movs r0, 0x8 - strh r0, [r5, 0x36] - mov r0, r8 - cmp r0, 0 - bne _08172788 - movs r0, 0x2 - strh r0, [r5, 0x38] - movs r0, 0x1 - b _0817278E - .pool -_08172788: - movs r0, 0x1 - strh r0, [r5, 0x38] - movs r0, 0x2 -_0817278E: - strh r0, [r5, 0x3A] -_08172790: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x7 - bls _08172708 - mov r1, r10 - lsls r0, r1, 24 - lsrs r0, 24 - mov r8, r0 - cmp r0, 0x1 - bls _08172700 - ldr r0, =gMain - ldr r2, =0x00000439 - adds r0, r2 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _081727C4 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_081727C4: - ldr r0, [sp] - bl DestroyTask - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81726BC - - thumb_func_start sub_81727E8 -sub_81727E8: @ 81727E8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r1, =gTasks - lsls r0, 2 - add r0, r9 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x26] - lsls r1, 24 - lsrs r1, 24 - ldrb r2, [r0, 0xA] - str r2, [sp] - ldrb r3, [r0, 0xC] - str r3, [sp, 0x4] - ldrb r2, [r0, 0xE] - str r2, [sp, 0x8] - ldrb r0, [r0, 0x10] - str r0, [sp, 0xC] - movs r7, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - str r0, [sp, 0x10] - ldr r3, =gSprites - mov r8, r3 - ldr r0, =gUnknown_085E51B4 - adds r1, r0 - mov r10, r1 -_0817282E: - ldr r0, =gUnknown_085E51F0 - ldr r1, [sp, 0x10] - adds r0, r1, r0 - ldr r1, [sp] - ldr r2, [sp, 0x4] - ldr r3, [sp, 0xC] - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _08172880 - bl sub_8171E20 - lsls r4, r6, 4 - adds r4, r6 - lsls r4, 2 - mov r2, r8 - adds r5, r4, r2 - mov r3, r10 - ldrb r1, [r3] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r0, =gSprites + 0x1C - adds r4, r0 - ldr r0, =sub_81728E0 - str r0, [r4] - movs r0, 0x3 - ldr r2, [sp, 0x8] - ands r2, r0 - lsls r2, 2 - ldrb r0, [r5, 0x5] - movs r3, 0xD - negs r3, r3 - adds r1, r3, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] - lsls r0, r7, 5 - strh r0, [r5, 0x2E] -_08172880: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x7 - bls _0817282E - ldr r0, =gMain - ldr r1, =0x00000439 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _081728A8 - ldr r0, =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x1 - strh r0, [r1, 0x3C] -_081728A8: - mov r0, r9 - bl DestroyTask - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81727E8 - - thumb_func_start sub_81728E0 -sub_81728E0: @ 81728E0 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - movs r2, 0x30 - ldrsh r1, [r5, r2] - bl Sin - strh r0, [r5, 0x24] - movs r0, 0x2E - ldrsh r4, [r5, r0] - ldrh r1, [r5, 0x2E] - movs r0, 0x3F - ands r0, r1 - movs r2, 0x32 - ldrsh r1, [r5, r2] - bl Sin - adds r1, r0, 0 - lsls r1, 16 - asrs r1, 16 - adds r0, r4, 0 - bl Cos - strh r0, [r5, 0x26] - ldrh r0, [r5, 0x2E] - adds r0, 0xA - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x2E] - ldrh r0, [r5, 0x30] - adds r0, 0x1 - strh r0, [r5, 0x30] - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x34] - adds r0, 0x1 - strh r0, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x33 - bne _0817293C - adds r0, r5, 0 - bl sub_8172944 -_0817293C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81728E0 - - thumb_func_start sub_8172944 -sub_8172944: @ 8172944 - push {r4-r7,lr} - adds r7, r0, 0 - ldr r0, =gMain - ldr r1, =0x00000439 - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08172970 - movs r1, 0x3C - ldrsh r0, [r7, r1] - cmp r0, 0x1 - bne _081729CA - adds r0, r7, 0 - bl DestroySpriteAndFreeResources - b _081729E2 - .pool -_08172970: - ldr r2, =gBattleSpritesDataPtr - ldr r0, [r2] - ldr r1, [r0, 0x8] - ldrb r0, [r1, 0xA] - subs r0, 0x1 - strb r0, [r1, 0xA] - ldr r0, [r2] - ldr r0, [r0, 0x8] - ldrb r0, [r0, 0xA] - cmp r0, 0 - bne _081729DC - movs r4, 0 - ldr r5, =gUnknown_085E51C0 - b _08172998 - .pool -_08172994: - adds r5, 0x4 - adds r4, 0x1 -_08172998: - cmp r4, 0xB - bgt _081729AA - ldr r0, [r5] - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08172994 -_081729AA: - cmp r4, 0xC - bne _081729CA - movs r6, 0 - ldr r5, =gUnknown_085E5094 - ldr r4, =gUnknown_085E50F4 -_081729B4: - ldrh r0, [r5, 0x6] - bl FreeSpriteTilesByTag - ldrh r0, [r4, 0x4] - bl FreeSpritePaletteByTag - adds r5, 0x8 - adds r4, 0x8 - adds r6, 0x1 - cmp r6, 0xB - ble _081729B4 -_081729CA: - adds r0, r7, 0 - bl DestroySprite - b _081729E2 - .pool -_081729DC: - adds r0, r7, 0 - bl DestroySprite -_081729E2: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8172944 - - thumb_func_start LaunchBallFadeMonTask -LaunchBallFadeMonTask: @ 81729E8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - adds r4, r0, 0 - mov r9, r2 - lsls r4, 24 - lsrs r4, 24 - lsls r1, 24 - lsrs r6, r1, 24 - lsls r3, 24 - lsrs r7, r3, 24 - ldr r0, =sub_8172AB0 - movs r1, 0x5 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r1, =gTasks - lsls r0, 2 - add r0, r8 - lsls r0, 3 - adds r5, r0, r1 - strh r7, [r5, 0x26] - strh r6, [r5, 0xE] - mov r0, r9 - strh r0, [r5, 0x1C] - mov r1, r9 - lsrs r0, r1, 16 - strh r0, [r5, 0x1E] - cmp r4, 0 - bne _08172A58 - lsls r0, r6, 20 - movs r2, 0x80 - lsls r2, 17 - adds r0, r2 - lsrs r0, 16 - ldr r2, =gUnknown_085E5310 - lsls r1, r7, 1 - adds r1, r2 - ldrh r3, [r1] - movs r1, 0x10 - movs r2, 0 - bl BlendPalette - movs r0, 0x1 - strh r0, [r5, 0xA] - b _08172A7E - .pool -_08172A58: - lsls r0, r6, 20 - movs r1, 0x80 - lsls r1, 17 - adds r0, r1 - lsrs r0, 16 - ldr r2, =gUnknown_085E5310 - lsls r1, r7, 1 - adds r1, r2 - ldrh r3, [r1] - movs r1, 0x10 - movs r2, 0x10 - bl BlendPalette - movs r0, 0x10 - strh r0, [r5, 0x8] - ldr r0, =0x0000ffff - strh r0, [r5, 0xA] - ldr r0, =sub_8172B40 - str r0, [r5] -_08172A7E: - ldr r0, =0x00007fff - str r0, [sp] - mov r0, r9 - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - mov r0, r8 - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end LaunchBallFadeMonTask - - thumb_func_start sub_8172AB0 -sub_8172AB0: @ 8172AB0 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r1, r0, 24 - movs r2, 0xC - ldrsh r0, [r4, r2] - cmp r0, 0x10 - bgt _08172B08 - movs r2, 0xE - ldrsh r0, [r4, r2] - lsls r0, 20 - movs r2, 0x80 - lsls r2, 17 - adds r0, r2 - lsrs r0, 16 - ldrb r2, [r4, 0x8] - ldr r3, =gUnknown_085E5310 - lsls r1, 1 - adds r1, r3 - ldrh r3, [r1] - movs r1, 0x10 - bl BlendPalette - ldrh r0, [r4, 0xA] - ldrh r1, [r4, 0x8] - adds r0, r1 - strh r0, [r4, 0x8] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - b _08172B30 - .pool -_08172B08: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08172B30 - ldrh r0, [r4, 0x1C] - ldrh r1, [r4, 0x1E] - lsls r1, 16 - orrs r0, r1 - ldr r1, =0x00007fff - str r1, [sp] - movs r1, 0 - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - adds r0, r5, 0 - bl DestroyTask -_08172B30: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172AB0 - - thumb_func_start sub_8172B40 -sub_8172B40: @ 8172B40 - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08172B78 - ldr r0, =gTasks - lsls r4, r2, 2 - adds r4, r2 - lsls r4, 3 - adds r4, r0 - ldrh r0, [r4, 0x1C] - ldrh r1, [r4, 0x1E] - lsls r1, 16 - orrs r0, r1 - ldr r1, =0x00007fff - str r1, [sp] - movs r1, 0 - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r0, =sub_8172B90 - str r0, [r4] -_08172B78: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172B40 - - thumb_func_start sub_8172B90 -sub_8172B90: @ 8172B90 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r1, r0, 24 - movs r3, 0xC - ldrsh r0, [r4, r3] - cmp r0, 0x10 - bgt _08172BE4 - movs r2, 0xE - ldrsh r0, [r4, r2] - lsls r0, 20 - movs r3, 0x80 - lsls r3, 17 - adds r0, r3 - lsrs r0, 16 - ldrb r2, [r4, 0x8] - ldr r3, =gUnknown_085E5310 - lsls r1, 1 - adds r1, r3 - ldrh r3, [r1] - movs r1, 0x10 - bl BlendPalette - ldrh r0, [r4, 0xA] - ldrh r1, [r4, 0x8] - adds r0, r1 - strh r0, [r4, 0x8] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - b _08172BEA - .pool -_08172BE4: - adds r0, r2, 0 - bl DestroyTask -_08172BEA: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8172B90 - - thumb_func_start sub_8172BF0 -sub_8172BF0: @ 8172BF0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - movs r0, 0 - mov r8, r0 - ldr r0, =gBattlerSpriteIds - ldr r3, =gBattleAnimAttacker - ldrb r2, [r3] - adds r0, r2, r0 - ldrb r6, [r0] - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r5, r0, r1 - movs r1, 0x1C - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _08172CC8 - cmp r0, 0x1 - bgt _08172C30 - cmp r0, 0 - beq _08172C36 - b _08172D8A - .pool -_08172C30: - cmp r0, 0x2 - beq _08172CDA - b _08172D8A -_08172C36: - ldr r0, =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r5, 0x1E] - movs r2, 0xA0 - lsls r2, 3 - adds r0, r2, 0 - ldrh r4, [r5, 0x8] - adds r0, r4 - strh r0, [r5, 0x8] - ldrb r0, [r3] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08172C78 - ldr r2, =gSprites - lsls r3, r6, 4 - adds r1, r3, r6 - lsls r1, 2 - adds r1, r2 - ldrh r0, [r5, 0x8] - lsls r0, 16 - asrs r0, 24 - ldrh r4, [r1, 0x24] - adds r0, r4 - strh r0, [r1, 0x24] - adds r4, r3, 0 - b _08172C90 - .pool -_08172C78: - ldr r3, =gSprites - lsls r4, r6, 4 - adds r2, r4, r6 - lsls r2, 2 - adds r2, r3 - ldrh r1, [r5, 0x8] - lsls r1, 16 - asrs r1, 24 - ldrh r0, [r2, 0x24] - subs r0, r1 - strh r0, [r2, 0x24] - adds r2, r3, 0 -_08172C90: - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r3, r0, r1 - ldrb r0, [r3, 0x8] - strh r0, [r3, 0x8] - adds r0, r4, r6 - lsls r0, 2 - adds r0, r2 - movs r2, 0x20 - ldrsh r1, [r0, r2] - movs r4, 0x24 - ldrsh r0, [r0, r4] - adds r1, r0 - adds r1, 0x20 - movs r0, 0x98 - lsls r0, 1 - cmp r1, r0 - bls _08172D8A - ldrh r0, [r3, 0x1C] - adds r0, 0x1 - strh r0, [r3, 0x1C] - b _08172D8A - .pool -_08172CC8: - ldrb r1, [r5, 0x1E] - adds r0, r2, 0 - adds r2, r6, 0 - bl LoadBattleMonGfxAndAnimate - ldrh r0, [r5, 0x1C] - adds r0, 0x1 - strh r0, [r5, 0x1C] - b _08172D8A -_08172CDA: - movs r1, 0xA0 - lsls r1, 3 - adds r0, r1, 0 - ldrh r2, [r5, 0x8] - adds r0, r2 - strh r0, [r5, 0x8] - ldrb r0, [r3] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08172D10 - ldr r0, =gSprites - lsls r3, r6, 4 - adds r2, r3, r6 - lsls r2, 2 - adds r2, r0 - ldrh r1, [r5, 0x8] - lsls r1, 16 - asrs r1, 24 - ldrh r0, [r2, 0x24] - subs r0, r1 - strh r0, [r2, 0x24] - adds r4, r3, 0 - b _08172D28 - .pool -_08172D10: - ldr r0, =gSprites - lsls r2, r6, 4 - adds r1, r2, r6 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r5, 0x8] - lsls r0, 16 - asrs r0, 24 - ldrh r3, [r1, 0x24] - adds r0, r3 - strh r0, [r1, 0x24] - adds r4, r2, 0 -_08172D28: - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - ldrb r1, [r0, 0x8] - strh r1, [r0, 0x8] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0 - beq _08172D68 - ldr r0, =gSprites - adds r1, r4, r6 - lsls r1, 2 - adds r1, r0 - movs r4, 0x24 - ldrsh r0, [r1, r4] - cmp r0, 0 - bgt _08172D7E - movs r0, 0 - strh r0, [r1, 0x24] - b _08172D84 - .pool -_08172D68: - ldr r0, =gSprites - adds r1, r4, r6 - lsls r1, 2 - adds r1, r0 - movs r3, 0x24 - ldrsh r0, [r1, r3] - cmp r0, 0 - blt _08172D7E - strh r2, [r1, 0x24] - movs r4, 0x1 - mov r8, r4 -_08172D7E: - mov r0, r8 - cmp r0, 0 - beq _08172D8A -_08172D84: - adds r0, r7, 0 - bl DestroyAnimVisualTask -_08172D8A: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172BF0 - - thumb_func_start sub_8172D98 -sub_8172D98: @ 8172D98 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x26 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _08172E14 - cmp r0, 0x1 - bgt _08172DC0 - cmp r0, 0 - beq _08172DC6 - b _08172E84 - .pool -_08172DC0: - cmp r0, 0x2 - beq _08172E4E - b _08172E84 -_08172DC6: - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl sub_80A8364 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08172DE8 - ldr r1, =0x00003f42 - movs r0, 0x50 - bl SetGpuReg - b _08172DF0 - .pool -_08172DE8: - ldr r1, =0x00003f44 - movs r0, 0x50 - bl SetGpuReg -_08172DF0: - movs r0, 0x52 - movs r1, 0x10 - bl SetGpuReg - ldr r0, =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x26] - adds r0, 0x1 - strh r0, [r1, 0x26] - b _08172E84 - .pool -_08172E14: - ldrh r0, [r4, 0xA] - adds r1, r0, 0x1 - strh r1, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08172E84 - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r2, [r4, 0x8] - adds r2, 0x1 - strh r2, [r4, 0x8] - lsls r1, r2, 8 - movs r0, 0x10 - subs r0, r2 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x10 - bne _08172E84 - ldrh r0, [r4, 0x26] - adds r0, 0x1 - strh r0, [r4, 0x26] - b _08172E84 -_08172E4E: - ldr r1, =gBattlerSpriteIds - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - adds r0, r1 - ldrb r1, [r0] - ldr r2, =gSprites - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x4] - lsls r1, 22 - lsrs r1, 17 - ldr r0, =0x06010000 - adds r1, r0 - movs r2, 0x80 - lsls r2, 4 - movs r0, 0 - movs r3, 0x1 - bl RequestDma3Fill - ldrb r0, [r4] - bl ClearBehindSubstituteBit - adds r0, r5, 0 - bl DestroyAnimVisualTask -_08172E84: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172D98 - - thumb_func_start sub_8172E9C -sub_8172E9C: @ 8172E9C - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, =gBattleAnimArgs - ldr r1, =gBattleSpritesDataPtr - ldr r2, [r1] - ldr r1, =gBattleAnimAttacker - ldrb r1, [r1] - ldr r2, [r2] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - lsls r1, 29 - lsrs r1, 31 - strh r1, [r3, 0xE] - bl DestroyAnimVisualTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172E9C - - thumb_func_start sub_8172ED0 -sub_8172ED0: @ 8172ED0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gBattleAnimTarget - ldr r1, =gEffectBattler - ldrb r1, [r1] - strb r1, [r2] - bl DestroyAnimVisualTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172ED0 - - thumb_func_start sub_8172EF0 -sub_8172EF0: @ 8172EF0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r1, 0 - lsls r0, 24 - lsrs r6, r0, 24 - movs r0, 0 - mov r8, r0 - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r1, [r0, 0x4] - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - adds r0, r4, 0 - movs r1, 0x1 - bl GetMonData - adds r5, r0, 0 - adds r0, r4, 0 - movs r1, 0 - bl GetMonData - adds r4, r0, 0 - adds r0, r6, 0 - bl IsBattlerSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _08172FC8 - lsrs r0, r5, 16 - ldr r7, =0x0000ffff - ands r5, r7 - eors r0, r5 - lsrs r1, r4, 16 - eors r0, r1 - ands r4, r7 - eors r0, r4 - cmp r0, 0x7 - bhi _08172F4E - movs r0, 0x1 - mov r8, r0 -_08172F4E: - mov r0, r8 - cmp r0, 0 - beq _08172FC8 - ldr r0, =0x000027f9 - bl GetSpriteTileStartByTag - lsls r0, 16 - lsrs r0, 16 - cmp r0, r7 - bne _08172F6E - ldr r0, =gBattleAnimPicTable + 0x748 - bl LoadCompressedObjectPicUsingHeap - ldr r0, =gBattleAnimPaletteTable + 0x748 - bl LoadCompressedObjectPaletteUsingHeap -_08172F6E: - ldr r5, =sub_8172FEC - adds r0, r5, 0 - movs r1, 0xA - bl CreateTask - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r3, =gTasks - lsls r2, r4, 2 - adds r2, r4 - lsls r2, 3 - adds r2, r3 - movs r4, 0 - strh r6, [r2, 0x8] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r3 - strh r6, [r1, 0x8] - strh r4, [r2, 0xA] - movs r0, 0x1 - strh r0, [r1, 0xA] - b _08172FDE - .pool -_08172FC8: - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r1, [r0, 0x4] - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x1] - movs r2, 0x1 - orrs r1, r2 - strb r1, [r0, 0x1] -_08172FDE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172EF0 - - thumb_func_start sub_8172FEC -sub_8172FEC: @ 8172FEC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r4, r0, r1 - ldrh r1, [r4, 0x22] - movs r2, 0x22 - ldrsh r0, [r4, r2] - cmp r0, 0x3B - bgt _08173018 - adds r0, r1, 0x1 - strh r0, [r4, 0x22] - b _08173190 - .pool -_08173018: - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r0, [r0, 0x8] - ldrb r0, [r0, 0xA] - cmp r0, 0 - beq _08173026 - b _08173190 -_08173026: - ldrh r0, [r4, 0x1C] - adds r1, r0, 0x1 - strh r1, [r4, 0x1C] - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 10 - ands r1, r0 - cmp r1, 0 - beq _0817303A - b _08173190 -_0817303A: - ldrb r0, [r4, 0x8] - mov r8, r0 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r5, r0, 24 - mov r0, r8 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r2, r0, 24 - movs r1, 0x1E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08173074 - ldr r0, =gUnknown_085CE388 - adds r1, r5, 0 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r5, r0, 24 - b _081730D6 - .pool -_08173074: - cmp r0, 0 - blt _081730A8 - cmp r0, 0x3 - bgt _081730A8 - ldr r0, =gUnknown_085CE3A0 - adds r1, r5, 0 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gSprites - lsls r2, r5, 4 - adds r2, r5 - lsls r2, 2 - adds r2, r0 - ldrh r3, [r2, 0x4] - lsls r1, r3, 22 - lsrs r1, 22 - adds r1, 0x4 - b _081730C8 - .pool -_081730A8: - ldr r0, =gUnknown_085CE3A0 - adds r1, r5, 0 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gSprites - lsls r2, r5, 4 - adds r2, r5 - lsls r2, 2 - adds r2, r0 - ldrh r3, [r2, 0x4] - lsls r1, r3, 22 - lsrs r1, 22 - adds r1, 0x5 -_081730C8: - ldr r4, =0x000003ff - adds r0, r4, 0 - ands r1, r0 - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r1 - strh r0, [r2, 0x4] -_081730D6: - ldr r2, =gTasks - lsls r1, r7, 2 - adds r0, r1, r7 - lsls r0, 3 - adds r6, r0, r2 - movs r2, 0xA - ldrsh r0, [r6, r2] - mov r9, r1 - cmp r0, 0 - bne _08173118 - ldr r1, =gSprites - lsls r2, r5, 4 - adds r0, r2, r5 - lsls r0, 2 - adds r1, 0x1C - adds r0, r1 - ldr r1, =sub_81731FC - str r1, [r0] - adds r4, r2, 0 - b _08173160 - .pool -_08173118: - ldr r3, =gSprites - lsls r4, r5, 4 - adds r1, r4, r5 - lsls r1, 2 - adds r0, r3, 0 - adds r0, 0x1C - adds r0, r1, r0 - ldr r2, =sub_8173250 - str r2, [r0] - adds r1, r3 - ldr r0, =0x0000ffe0 - strh r0, [r1, 0x24] - movs r0, 0x20 - strh r0, [r1, 0x26] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - movs r1, 0x1E - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _08173160 - mov r0, r8 - bl GetBattlerSide - lsls r0, 24 - movs r1, 0x3F - cmp r0, 0 - bne _08173156 - movs r1, 0xC0 -_08173156: - lsls r1, 24 - asrs r1, 24 - movs r0, 0x66 - bl PlaySE12WithPanning -_08173160: - ldr r1, =gSprites - adds r0, r4, r5 - lsls r0, 2 - adds r0, r1 - strh r7, [r0, 0x2E] - ldr r1, =gTasks - mov r2, r9 - adds r0, r2, r7 - lsls r0, 3 - adds r1, r0, r1 - ldrh r0, [r1, 0x1E] - adds r0, 0x1 - strh r0, [r1, 0x1E] - cmp r5, 0x40 - beq _08173184 - ldrh r0, [r1, 0x20] - adds r0, 0x1 - strh r0, [r1, 0x20] -_08173184: - movs r4, 0x1E - ldrsh r0, [r1, r4] - cmp r0, 0x5 - bne _08173190 - ldr r0, =sub_81731B0 - str r0, [r1] -_08173190: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8172FEC - - thumb_func_start sub_81731B0 -sub_81731B0: @ 81731B0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r3, r0, 0 - ldr r1, =gTasks - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 3 - adds r1, r0, r1 - movs r2, 0x20 - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _081731F0 - movs r2, 0xA - ldrsh r0, [r1, r2] - cmp r0, 0x1 - bne _081731EA - ldrb r1, [r1, 0x8] - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r2, [r0, 0x4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r0, 0x1] - movs r2, 0x1 - orrs r1, r2 - strb r1, [r0, 0x1] -_081731EA: - adds r0, r3, 0 - bl DestroyTask -_081731F0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81731B0 - - thumb_func_start sub_81731FC -sub_81731FC: @ 81731FC - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x18 - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x18 - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x30] - adds r0, 0xC - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xFF - ble _08173246 - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrh r1, [r0, 0x20] - subs r1, 0x1 - strh r1, [r0, 0x20] - adds r0, r4, 0 - bl FreeSpriteOamMatrix - adds r0, r4, 0 - bl DestroySprite -_08173246: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81731FC - - thumb_func_start sub_8173250 -sub_8173250: @ 8173250 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0x3 - bgt _08173264 - adds r0, r1, 0x1 - strh r0, [r4, 0x30] - b _081732A6 -_08173264: - adds r2, r4, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldrh r1, [r4, 0x24] - adds r1, 0x5 - strh r1, [r4, 0x24] - ldrh r0, [r4, 0x26] - subs r0, 0x5 - strh r0, [r4, 0x26] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x20 - ble _081732A6 - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrh r1, [r0, 0x20] - subs r1, 0x1 - strh r1, [r0, 0x20] - adds r0, r4, 0 - bl FreeSpriteOamMatrix - adds r0, r4, 0 - bl DestroySprite -_081732A6: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8173250 - - thumb_func_start sub_81732B0 -sub_81732B0: @ 81732B0 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gBattleAnimPicTable + 0x868 - bl LoadCompressedObjectPicUsingHeap - ldr r0, =gBattleAnimPaletteTable + 0x868 - bl LoadCompressedObjectPaletteUsingHeap - ldr r0, =0x0000281d - bl IndexOfSpritePaletteTag - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81732B0 - - thumb_func_start sub_81732E4 -sub_81732E4: @ 81732E4 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, =0x0000281d - adds r0, r5, 0 - bl FreeSpriteTilesByTag - adds r0, r5, 0 - bl FreeSpritePaletteByTag - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81732E4 - - thumb_func_start sub_817330C -sub_817330C: @ 817330C - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0 - bl InitAnimSpritePos - movs r0, 0x1E - strh r0, [r4, 0x2E] - movs r0, 0x1 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r5, =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r5, 0x4] - adds r0, r1 - strh r0, [r4, 0x32] - movs r0, 0x1 - bl GetBattlerAtPosition - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r5, [r5, 0x6] - adds r0, r5 - strh r0, [r4, 0x36] - ldr r0, =0x0000ffe0 - strh r0, [r4, 0x38] - adds r0, r4, 0 - bl InitAnimArcTranslation - ldr r2, =gSprites - ldr r1, =gBattlerSpriteIds - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, =sub_8039E84 - str r1, [r0] - ldr r0, =sub_817339C - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817330C - - thumb_func_start sub_817339C -sub_817339C: @ 817339C - push {lr} - adds r3, r0, 0 - ldr r2, =gSprites - ldr r1, =gBattlerSpriteIds - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x2B - ldrb r0, [r0] - cmp r0, 0x1 - bne _081733C0 - ldr r0, =sub_81733D4 - str r0, [r3, 0x1C] -_081733C0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_817339C - - thumb_func_start sub_81733D4 -sub_81733D4: @ 81733D4 - push {r4,lr} - adds r4, r0, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - beq _081733F6 - movs r0, 0 - strh r0, [r4, 0x2E] - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_8173400 - str r0, [r4, 0x1C] -_081733F6: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81733D4 - - thumb_func_start sub_8173400 -sub_8173400: @ 8173400 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gSprites - ldr r3, =gBattlerSpriteIds - ldr r2, =gBattleAnimAttacker - ldrb r0, [r2] - adds r0, r3 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3F - ldrb r0, [r0] - lsls r0, 27 - cmp r0, 0 - bge _08173448 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - cmp r0, 0 - ble _08173448 - ldrb r0, [r2] - adds r0, r3 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - movs r1, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl DestroyAnimSprite -_08173448: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8173400 - - thumb_func_start sub_817345C -sub_817345C: @ 817345C - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _08173478 - cmp r0, 0x1 - beq _0817348C - b _081734A0 - .pool -_08173478: - movs r0, 0 - bl GetBattlerAtPosition - ldr r1, =gBattleAnimAttacker - strb r0, [r1] - movs r0, 0x1 - b _08173498 - .pool -_0817348C: - movs r0, 0x1 - bl GetBattlerAtPosition - ldr r1, =gBattleAnimAttacker - strb r0, [r1] - movs r0, 0 -_08173498: - bl GetBattlerAtPosition - ldr r1, =gBattleAnimTarget - strb r0, [r1] -_081734A0: - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817345C - - thumb_func_start AnimTask_GetTrappedMoveAnimId -AnimTask_GetTrappedMoveAnimId: @ 81734B4 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gBattleSpritesDataPtr - ldr r0, [r0] - ldr r0, [r0, 0x8] - ldrh r1, [r0] - cmp r1, 0x53 - bne _081734D4 - ldr r1, =gBattleAnimArgs - movs r0, 0x1 - b _0817350C - .pool -_081734D4: - cmp r1, 0xFA - bne _081734E4 - ldr r1, =gBattleAnimArgs - movs r0, 0x2 - b _0817350C - .pool -_081734E4: - cmp r1, 0x80 - bne _081734F4 - ldr r1, =gBattleAnimArgs - movs r0, 0x3 - b _0817350C - .pool -_081734F4: - movs r0, 0xA4 - lsls r0, 1 - cmp r1, r0 - bne _08173508 - ldr r1, =gBattleAnimArgs - movs r0, 0x4 - b _0817350C - .pool -_08173508: - ldr r1, =gBattleAnimArgs - movs r0, 0 -_0817350C: - strh r0, [r1] - adds r0, r2, 0 - bl DestroyAnimVisualTask - pop {r0} - bx r0 - .pool - thumb_func_end AnimTask_GetTrappedMoveAnimId - - thumb_func_start sub_817351C -sub_817351C: @ 817351C - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, =gBattleAnimAttacker - ldr r1, =gBattleSpritesDataPtr - ldr r2, [r1] - ldr r1, [r2, 0x8] - ldrh r1, [r1] - strb r1, [r3] - ldr r3, =gBattleAnimTarget - ldr r1, [r2, 0x8] - ldrh r1, [r1] - lsrs r1, 8 - strb r1, [r3] - bl DestroyAnimVisualTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_817351C - - .align 2, 0 @ Don't pad with nop. diff --git a/common_syms/battle_anim_8170478.txt b/common_syms/battle_anim_8170478.txt new file mode 100755 index 000000000..2fc194df7 --- /dev/null +++ b/common_syms/battle_anim_8170478.txt @@ -0,0 +1,3 @@ +gUnknown_030062DC +gUnknown_030062E0 +gUnknown_030062E4 diff --git a/data/battle_anim_8170478.s b/data/battle_anim_8170478.s deleted file mode 100644 index 74bdce846..000000000 --- a/data/battle_anim_8170478.s +++ /dev/null @@ -1,157 +0,0 @@ -#include "constants/battle_anim.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085E5088:: @ 85E5088 - .byte 0x0a, 0x02, 0xfd, 0x00, 0x0f, 0x00, 0xfc, 0x00 - .byte 0xf6, 0x02, 0xfc, 0x00 - - .align 2 -gUnknown_085E5094:: @ 85E5094 - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ec - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ed - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ee - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ef - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f0 - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f1 - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f2 - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f3 - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f4 - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f5 - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f6 - obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f7 - - .align 2 -gUnknown_085E50F4:: @ 85E50F4 - obj_pal gBattleAnimSpritePalette_136, 0xd6ec - obj_pal gBattleAnimSpritePalette_136, 0xd6ed - obj_pal gBattleAnimSpritePalette_136, 0xd6ee - obj_pal gBattleAnimSpritePalette_136, 0xd6ef - obj_pal gBattleAnimSpritePalette_136, 0xd6f0 - obj_pal gBattleAnimSpritePalette_136, 0xd6f1 - obj_pal gBattleAnimSpritePalette_136, 0xd6f2 - obj_pal gBattleAnimSpritePalette_136, 0xd6f3 - obj_pal gBattleAnimSpritePalette_136, 0xd6f4 - obj_pal gBattleAnimSpritePalette_136, 0xd6f5 - obj_pal gBattleAnimSpritePalette_136, 0xd6f6 - obj_pal gBattleAnimSpritePalette_136, 0xd6f7 - - .align 2 -gUnknown_085E5154:: @ 85E5154 - .2byte 0x0000, 0x0001, 0x0001, 0x0001 - .2byte 0x0002, 0x0001, 0x0000, 0x0041 - .2byte 0x0002, 0x0001, 0x0001, 0x0001 - .2byte 0xfffe, 0x0000 - - .align 2 -gUnknown_085E5170:: @ 85E5170 - .2byte 0x0003, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085E5178:: @ 85E5178 - .2byte 0x0004, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085E5180:: @ 85E5180 - .2byte 0x0005, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085E5188:: @ 85E5188 - .2byte 0x0006, 0x0004, 0x0007, 0x0004 - .2byte 0xfffe, 0x0000 - - .align 2 -gUnknown_085E5194:: @ 85E5194 - .2byte 0x0007, 0x0004, 0xffff, 0x0000 - - .align 2 -gUnknown_085E519C:: @ 85E519C - .4byte gUnknown_085E5154 - .4byte gUnknown_085E5170 - .4byte gUnknown_085E5178 - .4byte gUnknown_085E5180 - .4byte gUnknown_085E5188 - .4byte gUnknown_085E5194 - - .align 2 -gUnknown_085E51B4:: @ 85E51B4 - .byte 0x00, 0x00, 0x00, 0x05, 0x01, 0x02, 0x02, 0x03 - .byte 0x05, 0x05, 0x04, 0x04 - - .align 2 -gUnknown_085E51C0:: @ 85E51C0 - .4byte sub_8171E50 - .4byte sub_81723D4 - .4byte sub_81721CC - .4byte sub_81722CC - .4byte sub_81726BC - .4byte sub_81721CC - .4byte sub_81720C8 - .4byte sub_81722CC - .4byte sub_8172560 - .4byte sub_8171FC4 - .4byte sub_81723D4 - .4byte sub_81727E8 - - .align 2 -gUnknown_085E51F0:: @ 85E51F0 - spr_template 0xd6ec, 0xd6ec, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6ed, 0xd6ed, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6ee, 0xd6ee, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6ef, 0xd6ef, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_085E5250:: @ 85E5250 - spr_template 0xd6f0, 0xd6f0, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6f1, 0xd6f1, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6f2, 0xd6f2, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6f3, 0xd6f3, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6f4, 0xd6f4, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6f5, 0xd6f5, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6f6, 0xd6f6, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 - spr_template 0xd6f7, 0xd6f7, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_085E5310:: @ 85E5310 - .2byte 0x7adf, 0x7af0, 0x53d7, 0x3fff, 0x7297, 0x67f5, 0x7b2c, 0x2b7e - .2byte 0x431f, 0x7bdd, 0x2a3f, 0x293f, 0x0000, 0x0201, 0x0403, 0x0101 - .2byte 0x0100, 0x0503, 0x0506, 0x0004 - - .align 2 -gBattleAnimSpriteTemplate_85E5338:: @ 85E5338 - spr_template ANIM_TAG_UNUSED_RED_BRICK, ANIM_TAG_UNUSED_RED_BRICK, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C - - .align 2 -gUnknown_085E5350:: @ 8535350 - .2byte 0x0040, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_085E5358:: @ 8535358 - .4byte gUnknown_085E5350 - - .align 2 - spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C - diff --git a/include/battle.h b/include/battle.h index 9e67e8ec5..c06bdaad5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -599,8 +599,7 @@ struct BattleAnimationInfo u8 field_9_x80:1; u8 field_A; u8 field_B; - u8 field_C; - u8 field_D; + s16 field_C; u8 field_E; u8 field_F; }; diff --git a/include/battle_anim.h b/include/battle_anim.h index 541c165e7..fffdabe06 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -131,6 +131,7 @@ void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a u8 sub_80A80C8(struct Task *task); void sub_80A8EE4(struct Sprite *); void sub_80A67F4(struct Sprite *); +void sub_80A6D48(u32 bgId, const void *src); enum { @@ -168,8 +169,8 @@ void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); // battle_anim_8170478.s u8 ItemIdToBallId(u16 itemId); -u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId); -u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); +u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); +u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, u8 ballId); // battle_anim_utility_funcs.s void sub_8116EB4(u8); @@ -223,4 +224,7 @@ extern const struct OamData gUnknown_0852493C; extern const struct OamData gUnknown_08524A5C; extern const struct OamData gUnknown_08524A74; +extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; +extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; + #endif // GUARD_BATTLE_ANIM_H diff --git a/include/global.h b/include/global.h index 33a31bf4d..58b338f9e 100644 --- a/include/global.h +++ b/include/global.h @@ -61,6 +61,12 @@ #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b)) +// Extracts the upper 16 bits of a 32-bit number +#define HIHALF(n) (((n) & 0xFFFF0000) >> 16) + +// Extracts the lower 16 bits of a 32-bit number +#define LOHALF(n) ((n) & 0xFFFF) + // There are many quirks in the source code which have overarching behavioral differences from // a number of other files. For example, diploma.c seems to declare rodata before each use while // other files declare out of order and must be at the beginning. There are also a number of diff --git a/include/graphics.h b/include/graphics.h index e2889ed86..33a26068b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4233,6 +4233,7 @@ extern const u32 gBattleAnimSpriteSheet_132[]; extern const u32 gBattleAnimSpriteSheet_133[]; extern const u32 gBattleAnimSpriteSheet_134[]; extern const u32 gBattleAnimSpriteSheet_135[]; +extern const u32 gBattleAnimSpriteSheet_Particles[]; extern const u32 gBattleAnimSpriteSheet_136[]; extern const u32 gBattleAnimSpriteSheet_137[]; extern const u32 gBattleAnimSpriteSheet_138[]; @@ -4748,4 +4749,9 @@ extern const u32 gCableCarDoor_Gfx[]; extern const u32 gCableCarCord_Gfx[]; extern const u16 gCableCar_Pal[]; +// Battle Anim +extern const u32 gUnknown_08C2DDA4[]; +extern const u32 gUnknown_08C2EA50[]; +extern const u32 gUnknown_08C2EA9C[]; + #endif //GUARD_GRAPHICS_H diff --git a/ld_script.txt b/ld_script.txt index 80c614471..1413941f1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -238,7 +238,7 @@ SECTIONS { src/intro.o(.text); src/reset_save_heap.o(.text); src/field_region_map.o(.text); - asm/battle_anim_8170478.o(.text); + src/battle_anim_8170478.o(.text); src/hall_of_fame.o(.text); src/credits.o(.text); src/lottery_corner.o(.text); @@ -549,7 +549,7 @@ SECTIONS { src/player_pc.o(.rodata); src/intro.o(.rodata); src/field_region_map.o(.rodata); - data/battle_anim_8170478.o(.rodata); + src/battle_anim_8170478.o(.rodata); src/hall_of_fame.o(.rodata); src/credits.o(.rodata); src/lottery_corner.o(.rodata); diff --git a/src/battle_anim.c b/src/battle_anim.c index 95c6f7b3c..5e62c0957 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -26,8 +26,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern const u16 gMovesWithQuietBGM[]; extern const u8 *const gBattleAnims_Moves[]; -extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; -extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; extern const struct BattleAnimBackground gBattleAnimBackgroundTable[]; // this file's functions diff --git a/src/battle_anim_8170478.c b/src/battle_anim_8170478.c new file mode 100755 index 000000000..6c91ff934 --- /dev/null +++ b/src/battle_anim_8170478.c @@ -0,0 +1,2267 @@ +#include "global.h" +#include "battle.h" +#include "battle_anim.h" +#include "battle_controllers.h" +#include "battle_interface.h" +#include "decompress.h" +#include "dma3.h" +#include "gpu_regs.h" +#include "graphics.h" +#include "m4a.h" +#include "main.h" +#include "palette.h" +#include "pokeball.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "trig.h" +#include "util.h" +#include "constants/rgb.h" +#include "constants/items.h" +#include "constants/songs.h" + +// iwram +int gUnknown_030062DC; +u16 gUnknown_030062E0; +u16 gUnknown_030062E4; + +static void sub_8170660(u8); +static void sub_8170A38(u8); +static void sub_8170EF0(u8); +static void sub_8171104(struct Sprite *); +static void sub_8171030(u8); +static void sub_81710A8(u8); +static void sub_8171134(struct Sprite *); +static void sub_8171CAC(struct Sprite *); +static void sub_81711E8(struct Sprite *); +static void sub_8171240(struct Sprite *); +static void sub_817138C(struct Sprite *); +static void sub_81713D0(struct Sprite *); +static void sub_81717B4(struct Sprite *); +static void sub_81714D4(struct Sprite *); +static void sub_8171520(struct Sprite *); +static void sub_81717D8(struct Sprite *); +static void sub_8171AE4(struct Sprite *); +static void sub_81717F8(struct Sprite *); +static void sub_81719EC(struct Sprite *); +static void sub_81718D8(struct Sprite *); +static void sub_81719C0(struct Sprite *); +static void sub_8171D60(u8); +static void sub_8171AAC(struct Sprite *); +static void sub_8171BAC(struct Sprite *); +static void sub_8171CE8(struct Sprite *); +static void PokeBallOpenParticleAnimation_Step1(struct Sprite *); +static void PokeBallOpenParticleAnimation_Step2(struct Sprite *); +static void DestroyBallOpenAnimationParticle(struct Sprite *); +static void FanOutBallOpenParticles_Step1(struct Sprite *); +static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *); +static void PremierBallOpenParticleAnimation_Step1(struct Sprite *); +static void sub_8172AB0(u8); +static void sub_8172B40(u8); +static void sub_8172B90(u8); +static void sub_8172FEC(u8); +static void sub_81731FC(struct Sprite *); +static void sub_8173250(struct Sprite *); +static void sub_81731B0(u8); +static void sub_817339C(struct Sprite *); +static void sub_81733D4(struct Sprite *); +static void sub_8173400(struct Sprite *); +static void PokeBallOpenParticleAnimation(u8); +static void GreatBallOpenParticleAnimation(u8); +static void SafariBallOpenParticleAnimation(u8); +static void UltraBallOpenParticleAnimation(u8); +static void MasterBallOpenParticleAnimation(u8); +static void DiveBallOpenParticleAnimation(u8); +static void RepeatBallOpenParticleAnimation(u8); +static void TimerBallOpenParticleAnimation(u8); +static void PremierBallOpenParticleAnimation(u8); +static void sub_817330C(struct Sprite *); + +struct BallCaptureSuccessStarData +{ + s8 xOffset; + s8 yOffset; + s8 unk2; +}; + +static const struct BallCaptureSuccessStarData sBallCaptureSuccessStarData[] = +{ + { + .xOffset = 10, + .yOffset = 2, + .unk2 = -3, + }, + { + .xOffset = 15, + .yOffset = 0, + .unk2 = -4, + }, + { + .xOffset = -10, + .yOffset = 2, + .unk2 = -4, + }, +}; + +const struct CompressedSpriteSheet gBallOpenParticleSpritesheets[] = +{ + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EC}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6ED}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EE}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6EF}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F0}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F1}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F2}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F3}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F4}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F5}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F6}, + {gBattleAnimSpriteSheet_Particles, 0x100, 0xD6F7}, +}; + +const struct CompressedSpritePalette gBallOpenParticlePalettes[] = +{ + {gBattleAnimSpritePalette_136, 0xD6EC}, + {gBattleAnimSpritePalette_136, 0xD6ED}, + {gBattleAnimSpritePalette_136, 0xD6EE}, + {gBattleAnimSpritePalette_136, 0xD6EF}, + {gBattleAnimSpritePalette_136, 0xD6F0}, + {gBattleAnimSpritePalette_136, 0xD6F1}, + {gBattleAnimSpritePalette_136, 0xD6F2}, + {gBattleAnimSpritePalette_136, 0xD6F3}, + {gBattleAnimSpritePalette_136, 0xD6F4}, + {gBattleAnimSpritePalette_136, 0xD6F5}, + {gBattleAnimSpritePalette_136, 0xD6F6}, + {gBattleAnimSpritePalette_136, 0xD6F7}, +}; + +const union AnimCmd gUnknown_085E5154[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(0, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gUnknown_085E5170[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085E5178[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085E5180[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085E5188[] = +{ + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gUnknown_085E5194[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_085E519C[] = +{ + gUnknown_085E5154, + gUnknown_085E5170, + gUnknown_085E5178, + gUnknown_085E5180, + gUnknown_085E5188, + gUnknown_085E5194, +}; + +const u8 gBallOpenParticleAnimNums[] = +{ + 0, + 0, + 0, + 5, + 1, + 2, + 2, + 3, + 5, + 5, + 4, + 4, +}; + +const TaskFunc gBallOpenParticleAnimationFuncs[] = +{ + PokeBallOpenParticleAnimation, + GreatBallOpenParticleAnimation, + SafariBallOpenParticleAnimation, + UltraBallOpenParticleAnimation, + MasterBallOpenParticleAnimation, + SafariBallOpenParticleAnimation, + DiveBallOpenParticleAnimation, + UltraBallOpenParticleAnimation, + RepeatBallOpenParticleAnimation, + TimerBallOpenParticleAnimation, + GreatBallOpenParticleAnimation, + PremierBallOpenParticleAnimation, +}; + +const struct SpriteTemplate gUnknown_085E51F0[] = +{ + { + .tileTag = 55020, + .paletteTag = 55020, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55021, + .paletteTag = 55021, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55022, + .paletteTag = 55022, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55023, + .paletteTag = 55023, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55024, + .paletteTag = 55024, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55025, + .paletteTag = 55025, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55026, + .paletteTag = 55026, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55027, + .paletteTag = 55027, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55028, + .paletteTag = 55028, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55029, + .paletteTag = 55029, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55030, + .paletteTag = 55030, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = 55031, + .paletteTag = 55031, + .oam = &gUnknown_08524904, + .anims = gUnknown_085E519C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, +}; + +const u16 gUnknown_085E5310[] = +{ + RGB(31, 22, 30), + RGB(16, 23, 30), + RGB(23, 30, 20), + RGB(31, 31, 15), + RGB(23, 20, 28), + RGB(21, 31, 25), + RGB(12, 25, 30), + RGB(30, 27, 10), + RGB(31, 24, 16), + RGB(29, 30, 30), + RGB(31, 17, 10), + RGB(31, 9, 10), + RGB(0, 0, 0), + RGB(1, 16, 0), + RGB(3, 0, 1), + RGB(1, 8, 0), + RGB(0, 8, 0), + RGB(3, 8, 1), + RGB(6, 8, 1), + RGB(4, 0, 0), +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_85E5338 = +{ + .tileTag = ANIM_TAG_UNUSED_RED_BRICK, + .paletteTag = ANIM_TAG_UNUSED_RED_BRICK, + .oam = &gUnknown_0852490C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_817330C, +}; + +const union AnimCmd gUnknown_085E5350[] = +{ + ANIMCMD_FRAME(64, 1), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_085E5358[] = { + gUnknown_085E5350, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_085E535C = +{ + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, + .oam = &gUnknown_08524914, + .anims = gUnknown_085E5358, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_817330C, +}; + +extern const struct SpriteTemplate gUnknown_085CE388; +extern const struct SpriteTemplate gUnknown_085CE3A0; + +void unref_sub_8170478(u8 taskId) +{ + struct UnknownAnimStruct2 unknownStruct; + u8 healthBoxSpriteId; + u8 battler; + u8 spriteId1, spriteId2, spriteId3, spriteId4; + + battler = gBattleAnimAttacker; + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR); + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJWIN_ON); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); + SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 0); + SetAnimBgAttribute(1, BG_ANIM_SCREEN_SIZE, 0); + SetAnimBgAttribute(1, BG_ANIM_AREA_OVERFLOW_MODE, 1); + SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1); + + healthBoxSpriteId = gHealthboxSpriteIds[battler]; + spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam; + spriteId2 = gSprites[healthBoxSpriteId].data[5]; + spriteId3 = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); + spriteId4 = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); + gSprites[healthBoxSpriteId].oam.priority = 1; + gSprites[spriteId1].oam.priority = 1; + gSprites[spriteId2].oam.priority = 1; + gSprites[spriteId3] = gSprites[healthBoxSpriteId]; + gSprites[spriteId4] = gSprites[spriteId1]; + gSprites[spriteId3].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[spriteId4].oam.objMode = ST_OAM_OBJ_WINDOW; + gSprites[spriteId3].callback = SpriteCallbackDummy; + gSprites[spriteId4].callback = SpriteCallbackDummy; + + sub_80A6B30(&unknownStruct); + sub_80A6D48(unknownStruct.bgId, gUnknown_08C2EA9C); + sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2EA50, unknownStruct.tilesOffset); + LoadCompressedPalette(gUnknown_08C2DDA4, unknownStruct.unk8 << 4, 32); + + gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32; + gBattle_BG1_Y = -gSprites[spriteId3].pos1.y - 32; + gTasks[taskId].data[1] = 640; + gTasks[taskId].data[0] = spriteId3; + gTasks[taskId].data[2] = spriteId4; + gTasks[taskId].func = sub_8170660; +} + +static void sub_8170660(u8 taskId) +{ + u8 spriteId1, spriteId2; + u8 battler; + + battler = gBattleAnimAttacker; + gTasks[taskId].data[13] += gTasks[taskId].data[1]; + gBattle_BG1_Y += (u16)gTasks[taskId].data[13] >> 8; + gTasks[taskId].data[13] &= 0xFF; + + switch (gTasks[taskId].data[15]) + { + case 0: + if (gTasks[taskId].data[11]++ > 1) + { + gTasks[taskId].data[11] = 0; + gTasks[taskId].data[12]++; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[12], 16 - gTasks[taskId].data[12])); + if (gTasks[taskId].data[12] == 8) + gTasks[taskId].data[15]++; + } + break; + case 1: + if (++gTasks[taskId].data[10] == 30) + gTasks[taskId].data[15]++; + break; + case 2: + if (gTasks[taskId].data[11]++ > 1) + { + gTasks[taskId].data[11] = 0; + gTasks[taskId].data[12]--; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[12], 16 - gTasks[taskId].data[12])); + if (gTasks[taskId].data[12] == 0) + { + sub_80A477C(0); + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR); + if (!IsContest()) + SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); + + SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) ^ DISPCNT_OBJWIN_ON); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0)); + DestroySprite(&gSprites[gTasks[taskId].data[0]]); + DestroySprite(&gSprites[gTasks[taskId].data[2]]); + SetAnimBgAttribute(1, BG_ANIM_AREA_OVERFLOW_MODE, 0); + spriteId1 = gSprites[gHealthboxSpriteIds[battler]].oam.affineParam; + spriteId2 = gSprites[gHealthboxSpriteIds[battler]].data[5]; + gSprites[gHealthboxSpriteIds[battler]].oam.priority = 1; + gSprites[spriteId1].oam.priority = 1; + gSprites[spriteId2].oam.priority = 1; + DestroyAnimVisualTask(taskId); + } + } + break; + } +} + +static void sub_8170834(u8 *paletteId1, u8 *paletteId2, u8 battler) +{ + u8 healthBoxSpriteId; + u8 spriteId1, spriteId2; + u16 offset1, offset2; + + healthBoxSpriteId = gHealthboxSpriteIds[battler]; + spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam; + spriteId2 = gSprites[healthBoxSpriteId].data[5]; + *paletteId1 = AllocSpritePalette(0xD709); + *paletteId2 = AllocSpritePalette(0xD70A); + + offset1 = (gSprites[healthBoxSpriteId].oam.paletteNum * 16) + 0x100; + offset2 = (gSprites[spriteId2].oam.paletteNum * 16) + 0x100; + LoadPalette(&gPlttBufferUnfaded[offset1], *paletteId1 * 16 + 0x100, 0x20); + LoadPalette(&gPlttBufferUnfaded[offset2], *paletteId2 * 16 + 0x100, 0x20); + + gSprites[healthBoxSpriteId].oam.paletteNum = *paletteId1; + gSprites[spriteId1].oam.paletteNum = *paletteId1; + gSprites[spriteId2].oam.paletteNum = *paletteId2; +} + +void sub_8170920(u8 taskId) +{ + u8 paletteId1, paletteId2; + sub_8170834(&paletteId1, &paletteId2, gBattleAnimAttacker); + DestroyAnimVisualTask(taskId); +} + +static void sub_817094C(u8 battler) +{ + u8 healthBoxSpriteId; + u8 spriteId1, spriteId2; + u8 paletteId1, paletteId2; + + healthBoxSpriteId = gHealthboxSpriteIds[battler]; + spriteId1 = gSprites[healthBoxSpriteId].oam.affineParam; + spriteId2 = gSprites[healthBoxSpriteId].data[5]; + + FreeSpritePaletteByTag(0xD709); + FreeSpritePaletteByTag(0xD70A); + paletteId1 = IndexOfSpritePaletteTag(0xD6FF); + paletteId2 = IndexOfSpritePaletteTag(0xD704); + gSprites[healthBoxSpriteId].oam.paletteNum = paletteId1; + gSprites[spriteId1].oam.paletteNum = paletteId1; + gSprites[spriteId2].oam.paletteNum = paletteId2; +} + +void sub_81709EC(u8 taskId) +{ + sub_817094C(gBattleAnimAttacker); + DestroyAnimVisualTask(taskId); +} + +void sub_8170A0C(u8 taskId) +{ + gTasks[taskId].data[10] = gBattleAnimArgs[0]; + gTasks[taskId].data[11] = gBattleAnimArgs[1]; + gTasks[taskId].func = sub_8170A38; +} + +static void sub_8170A38(u8 taskId) +{ + u8 paletteNum; + int paletteOffset, colorOffset; + + gTasks[taskId].data[0]++; + if (gTasks[taskId].data[0]++ >= gTasks[taskId].data[11]) + { + gTasks[taskId].data[0] = 0; + paletteNum = IndexOfSpritePaletteTag(0xD709); + colorOffset = gTasks[taskId].data[10] == 0 ? 6 : 2; + switch (gTasks[taskId].data[1]) + { + case 0: + gTasks[taskId].data[2] += 2; + if (gTasks[taskId].data[2] > 16) + gTasks[taskId].data[2] = 16; + + paletteOffset = paletteNum * 16 + 0x100; + BlendPalette(paletteOffset + colorOffset, 1, gTasks[taskId].data[2], RGB(20, 27, 31)); + if (gTasks[taskId].data[2] == 16) + gTasks[taskId].data[1]++; + break; + case 1: + gTasks[taskId].data[2] -= 2; + if (gTasks[taskId].data[2] < 0) + gTasks[taskId].data[2] = 0; + + paletteOffset = paletteNum * 16 + 0x100; + BlendPalette(paletteOffset + colorOffset, 1, gTasks[taskId].data[2], RGB(20, 27, 31)); + if (gTasks[taskId].data[2] == 0) + DestroyAnimVisualTask(taskId); + break; + } + } +} + +void sub_8170B04(u8 taskId) +{ + u8 spriteId; + + spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; + switch (gTasks[taskId].data[0]) + { + case 0: + sub_80A7270(spriteId, 0); + gTasks[taskId].data[10] = 0x100; + gTasks[taskId].data[0]++; + break; + case 1: + gTasks[taskId].data[10] += 0x30; + obj_id_set_rotscale(spriteId, gTasks[taskId].data[10], gTasks[taskId].data[10], 0); + sub_80A7E6C(spriteId); + if (gTasks[taskId].data[10] >= 0x2D0) + gTasks[taskId].data[0]++; + break; + case 2: + sub_80A7344(spriteId); + gSprites[spriteId].invisible = 1; + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_8170BB0(u8 taskId) +{ + u8 spriteId; + u16 ball; + u8 ballId; + u8 x, y; + u8 priority, subpriority; + u32 selectedPalettes; + + spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_POKEBALL); + else + ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_POKEBALL); + + ballId = ItemIdToBallId(ball); + switch (gTasks[taskId].data[0]) + { + case 0: + x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + priority = gSprites[spriteId].oam.priority; + subpriority = gSprites[spriteId].subpriority; + gTasks[taskId].data[10] = AnimateBallOpenParticles(x, y + 32, priority, subpriority, ballId); + selectedPalettes = sub_80A75AC(1, 0, 0, 0, 0, 0, 0); + gTasks[taskId].data[11] = LaunchBallFadeMonTask(0, gBattleAnimAttacker, selectedPalettes, ballId); + gTasks[taskId].data[0]++; + break; + case 1: + if (!gTasks[gTasks[taskId].data[10]].isActive && !gTasks[gTasks[taskId].data[11]].isActive) + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_8170CFC(u8 taskId) +{ + u8 ballId = ItemIdToBallId(gLastUsedItem); + LoadBallGfx(ballId); + DestroyAnimVisualTask(taskId); +} + +void sub_8170D24(u8 taskId) +{ + u8 ballId = ItemIdToBallId(gLastUsedItem); + FreeBallGfx(ballId); + DestroyAnimVisualTask(taskId); +} + +void AnimTask_IsBallBlockedByTrainer(u8 taskId) +{ + if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_TRAINER_BLOCK) + gBattleAnimArgs[7] = -1; + else + gBattleAnimArgs[7] = 0; + + DestroyAnimVisualTask(taskId); +} + +u8 ItemIdToBallId(u16 ballItem) +{ + switch (ballItem) + { + case ITEM_MASTER_BALL: + return 4; + case ITEM_ULTRA_BALL: + return 3; + case ITEM_GREAT_BALL: + return 1; + case ITEM_SAFARI_BALL: + return 2; + case ITEM_NET_BALL: + return 5; + case ITEM_DIVE_BALL: + return 6; + case ITEM_NEST_BALL: + return 7; + case ITEM_REPEAT_BALL: + return 8; + case ITEM_TIMER_BALL: + return 9; + case ITEM_LUXURY_BALL: + return 10; + case ITEM_PREMIER_BALL: + return 11; + case ITEM_POKE_BALL: + default: + return 0; + } +} + +void sub_8170E04(u8 taskId) +{ + u8 ballId; + u8 spriteId; + + ballId = ItemIdToBallId(gLastUsedItem); + spriteId = CreateSprite(&gBallSpriteTemplates[ballId], 32, 80, 29); + gSprites[spriteId].data[0] = 34; + gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) - 16; + gSprites[spriteId].callback = sub_8171104; + gBattleSpritesDataPtr->animationData->field_9_x2 = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible; + gTasks[taskId].data[0] = spriteId; + gTasks[taskId].func = sub_8170EF0; +} + +static void sub_8170EF0(u8 taskId) +{ + u8 spriteId = gTasks[taskId].data[0]; + if ((u16)gSprites[spriteId].data[0] == 0xFFFF) + DestroyAnimVisualTask(taskId); +} + +void sub_8170F2C(u8 taskId) +{ + int x, y; + u8 ballId; + u8 subpriority; + u8 spriteId; + + if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL) + { + x = 32; + y = 11; + } + else + { + x = 23; + y = 5; + } + + ballId = ItemIdToBallId(gLastUsedItem); + subpriority = sub_80A82E4(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) + 1; + spriteId = CreateSprite(&gBallSpriteTemplates[ballId], x + 32, y | 80, subpriority); + gSprites[spriteId].data[0] = 34; + gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) - 16; + gSprites[spriteId].callback = SpriteCallbackDummy; + gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].callback = sub_8039E84; + gTasks[taskId].data[0] = spriteId; + gTasks[taskId].func = sub_8171030; +} + +static void sub_8171030(u8 taskId) +{ + if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animCmdIndex == 1) + { + PlaySE12WithPanning(SE_NAGERU, 0); + gSprites[gTasks[taskId].data[0]].callback = sub_8171104; + CreateTask(sub_81710A8, 10); + gTasks[taskId].func = sub_8170EF0; + } +} + +static void sub_81710A8(u8 taskId) +{ + if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animEnded) + { + StartSpriteAnim(&gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]], 0); + DestroyTask(taskId); + } +} + +static void sub_8171104(struct Sprite *sprite) +{ + u16 temp = sprite->data[1]; + u16 temp2 = sprite->data[2]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = temp; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = temp2; + sprite->data[5] = -40; + InitAnimArcTranslation(sprite); + sprite->callback = sub_8171134; +} + +static void sub_8171134(struct Sprite *sprite) +{ + int i; + u8 ballId; + int ballId2; // extra var needed to match + + if (TranslateAnimArc(sprite)) + { + if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_TRAINER_BLOCK) + { + sprite->callback = sub_8171CAC; + } + else + { + StartSpriteAnim(sprite, 1); + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + + for (i = 0; i < 8; i++) + sprite->data[i] = 0; + + sprite->data[5] = 0; + sprite->callback = sub_81711E8; + ballId = ItemIdToBallId(gLastUsedItem); + ballId2 = ballId; + if (ballId2 > 11) + return; + if (ballId2 < 0) + return; + + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId); + LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId); + } + } +} + +static void sub_81711E8(struct Sprite *sprite) +{ + if (++sprite->data[5] == 10) + { + sprite->data[5] = CreateTask(TaskDummy, 50); + sprite->callback = sub_8171240; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] = 0; + } +} + +static void sub_8171240(struct Sprite *sprite) +{ + u8 spriteId; + u8 taskId; + + spriteId = gBattlerSpriteIds[gBattleAnimTarget]; + taskId = sprite->data[5]; + + if (++gTasks[taskId].data[1] == 11) + PlaySE(SE_SUIKOMU); + + switch (gTasks[taskId].data[0]) + { + case 0: + sub_80A7270(spriteId, 0); + gTasks[taskId].data[10] = 256; + gUnknown_030062DC = 28; + gUnknown_030062E4 = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y); + gUnknown_030062E0 = (u32)(gUnknown_030062E4 * 256) / 28; + gTasks[taskId].data[2] = gUnknown_030062E0; + gTasks[taskId].data[0]++; + break; + case 1: + gTasks[taskId].data[10] += 0x20; + obj_id_set_rotscale(spriteId, gTasks[taskId].data[10], gTasks[taskId].data[10], 0); + gTasks[taskId].data[3] += gTasks[taskId].data[2]; + gSprites[spriteId].pos2.y = -gTasks[taskId].data[3] >> 8; + if (gTasks[taskId].data[10] >= 0x480) + gTasks[taskId].data[0]++; + break; + case 2: + sub_80A7344(spriteId); + gSprites[spriteId].invisible = 1; + gTasks[taskId].data[0]++; + break; + default: + if (gTasks[taskId].data[1] > 10) + { + DestroyTask(taskId); + StartSpriteAnim(sprite, 2); + sprite->data[5] = 0; + sprite->callback = sub_817138C; + } + break; + } +} + +static void sub_817138C(struct Sprite *sprite) +{ + int angle; + + if (sprite->animEnded) + { + sprite->data[3] = 0; + sprite->data[4] = 40; + sprite->data[5] = 0; + angle = 0; + sprite->pos1.y += Cos(angle, 40); + sprite->pos2.y = -Cos(angle, sprite->data[4]); + sprite->callback = sub_81713D0; + } +} + +static void sub_81713D0(struct Sprite *sprite) +{ + bool8 lastBounce; + int bounceCount; + + lastBounce = 0; + + switch (sprite->data[3] & 0xFF) + { + case 0: + sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->data[5] += (sprite->data[3] >> 8) + 4; + if (sprite->data[5] >= 64) + { + sprite->data[4] -= 10; + sprite->data[3] += 257; + + bounceCount = sprite->data[3] >> 8; + if (bounceCount == 4) + lastBounce = 1; + + // Play a different sound effect for each pokeball bounce. + switch (bounceCount) + { + case 1: + PlaySE(SE_KON); + break; + case 2: + PlaySE(SE_KON2); + break; + case 3: + PlaySE(SE_KON3); + break; + default: + PlaySE(SE_KON4); + break; + } + } + break; + case 1: + sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->data[5] -= (sprite->data[3] >> 8) + 4; + if (sprite->data[5] <= 0) + { + sprite->data[5] = 0; + sprite->data[3] &= -0x100; + } + break; + } + + if (lastBounce) + { + sprite->data[3] = 0; + sprite->pos1.y += Cos(64, 40); + sprite->pos2.y = 0; + if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_NO_SHAKES) + { + sprite->data[5] = 0; + sprite->callback = sub_81717B4; + } + else + { + sprite->callback = sub_81714D4; + sprite->data[4] = 1; + sprite->data[5] = 0; + } + } +} + +static void sub_81714D4(struct Sprite *sprite) +{ + if (++sprite->data[3] == 31) + { + sprite->data[3] = 0; + sprite->affineAnimPaused = 1; + StartSpriteAffineAnim(sprite, 1); + gBattleSpritesDataPtr->animationData->field_C = 0; + sprite->callback = sub_8171520; + PlaySE(SE_BOWA); + } +} + +static void sub_8171520(struct Sprite *sprite) +{ + s8 state; + u16 var0; + + switch (sprite->data[3] & 0xFF) + { + case 0: + if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + { + sprite->pos2.x += sprite->data[4]; + gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + } + else + { + gBattleSpritesDataPtr->animationData->field_C += 0xB0; + } + + sprite->data[5]++; + sprite->affineAnimPaused = 0; + var0 = sprite->data[5] + 7; + if (var0 > 14) + { + gBattleSpritesDataPtr->animationData->field_C = 0; + sprite->data[3]++; + sprite->data[5] = 0; + } + break; + case 1: + if (++sprite->data[5] == 1) + { + sprite->data[5] = 0; + sprite->data[4] = -sprite->data[4]; + sprite->data[3]++; + sprite->affineAnimPaused = 0; + if (sprite->data[4] < 0) + ChangeSpriteAffineAnim(sprite, 2); + else + ChangeSpriteAffineAnim(sprite, 1); + } + else + { + sprite->affineAnimPaused = 1; + } + break; + case 2: + if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + { + sprite->pos2.x += sprite->data[4]; + gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + } + else + { + gBattleSpritesDataPtr->animationData->field_C += 0xB0; + } + + sprite->data[5]++; + sprite->affineAnimPaused = 0; + var0 = sprite->data[5] + 12; + if (var0 > 24) + { + gBattleSpritesDataPtr->animationData->field_C = 0; + sprite->data[3]++; + sprite->data[5] = 0; + } + break; + case 3: + if (sprite->data[5]++ < 0) + { + sprite->affineAnimPaused = 1; + break; + } + + sprite->data[5] = 0; + sprite->data[4] = -sprite->data[4]; + sprite->data[3]++; + sprite->affineAnimPaused = 0; + if (sprite->data[4] < 0) + ChangeSpriteAffineAnim(sprite, 2); + else + ChangeSpriteAffineAnim(sprite, 1); + // fall through + case 4: + if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + { + sprite->pos2.x += sprite->data[4]; + gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + } + else + { + gBattleSpritesDataPtr->animationData->field_C += 0xB0; + } + + sprite->data[5]++; + sprite->affineAnimPaused = 0; + var0 = sprite->data[5] + 4; + if (var0 > 8) + { + gBattleSpritesDataPtr->animationData->field_C = 0; + sprite->data[3]++; + sprite->data[5] = 0; + sprite->data[4] = -sprite->data[4]; + } + break; + case 5: + sprite->data[3] += 0x100; + state = sprite->data[3] >> 8; + if (state == gBattleSpritesDataPtr->animationData->ballThrowCaseId) + { + sprite->affineAnimPaused = 1; + sprite->callback = sub_81717B4; + } + else + { + if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_3_SHAKES_SUCCESS && state == 3) + { + sprite->callback = sub_81717D8; + sprite->affineAnimPaused = 1; + } + else + { + sprite->data[3]++; + sprite->affineAnimPaused = 1; + } + } + break; + case 6: + default: + if (++sprite->data[5] == 31) + { + sprite->data[5] = 0; + sprite->data[3] &= -0x100; + StartSpriteAffineAnim(sprite, 3); + if (sprite->data[4] < 0) + StartSpriteAffineAnim(sprite, 2); + else + StartSpriteAffineAnim(sprite, 1); + + PlaySE(SE_BOWA); + } + break; + } +} + +static void sub_81717B4(struct Sprite *sprite) +{ + if (++sprite->data[5] == 31) + { + sprite->data[5] = 0; + sprite->callback = sub_8171AE4; + } +} + +static void sub_81717D8(struct Sprite *sprite) +{ + sprite->animPaused = 1; + sprite->callback = sub_81717F8; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[5] = 0; +} + +static void sub_81717F8(struct Sprite *sprite) +{ + u8 *battler = &gBattleAnimTarget; + + sprite->data[4]++; + if (sprite->data[4] == 40) + { + PlaySE(SE_RG_GETTING); + BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB(0, 0, 0)); + sub_81719EC(sprite); + } + else if (sprite->data[4] == 60) + { + BeginNormalPaletteFade(0x10000 << sprite->oam.paletteNum, 2, 6, 0, RGB(0, 0, 0)); + } + else if (sprite->data[4] == 95) + { + gDoingBattleAnim = 0; + UpdateOamPriorityInAllHealthboxes(1); + m4aMPlayAllStop(); + PlaySE(MUS_RG_FAN6); + } + else if (sprite->data[4] == 315) + { + FreeOamMatrix(gSprites[gBattlerSpriteIds[*battler]].oam.matrixNum); + DestroySprite(&gSprites[gBattlerSpriteIds[*battler]]); + sprite->data[0] = 0; + sprite->callback = sub_81718D8; + } +} + +static void sub_81718D8(struct Sprite *sprite) +{ + u8 paletteIndex; + + switch (sprite->data[0]) + { + case 0: + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->oam.objMode = ST_OAM_OBJ_BLEND; + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0)); + paletteIndex = IndexOfSpritePaletteTag(sprite->template->paletteTag); + BeginNormalPaletteFade(1 << (paletteIndex + 0x10), 0, 0, 16, RGB(31, 31, 31)); + sprite->data[0]++; + break; + case 1: + if (sprite->data[1]++ > 0) + { + sprite->data[1] = 0; + sprite->data[2]++; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - sprite->data[2], sprite->data[2])); + if (sprite->data[2] == 16) + sprite->data[0]++; + } + break; + case 2: + sprite->invisible = 1; + sprite->data[0]++; + break; + default: + if (!gPaletteFade.active) + { + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + sprite->data[0] = 0; + sprite->callback = sub_81719C0; + } + break; + } +} + +static void sub_81719C0(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + sprite->data[0] = -1; + } + else + { + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); + } +} + +static void sub_81719EC(struct Sprite *sprite) +{ + u32 i; + u8 subpriority; + + if (sprite->subpriority) + { + subpriority = sprite->subpriority - 1; + } + else + { + subpriority = 0; + sprite->subpriority = 1; + } + + sub_8171D60(4); + for (i = 0; i < 3; i++) + { + u8 spriteId = CreateSprite(&gUnknown_085E51F0[4], sprite->pos1.x, sprite->pos1.y, subpriority); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].data[0] = 24; + gSprites[spriteId].data[2] = sprite->pos1.x + sBallCaptureSuccessStarData[i].xOffset; + gSprites[spriteId].data[4] = sprite->pos1.y + sBallCaptureSuccessStarData[i].yOffset; + gSprites[spriteId].data[5] = sBallCaptureSuccessStarData[i].unk2; + InitAnimArcTranslation(&gSprites[spriteId]); + gSprites[spriteId].callback = sub_8171AAC; + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[4]); + } + } +} + +static void sub_8171AAC(struct Sprite *sprite) +{ + sprite->invisible = !sprite->invisible; + if (TranslateAnimArc(sprite)) + DestroySprite(sprite); +} + +// fakematching. I think the return type of ItemIdToBallId() +// is wrong because of the weird required casting. +static void sub_8171AE4(struct Sprite *sprite) +{ + u8 ballId; + int ballId2; // extra var needed to match + + StartSpriteAnim(sprite, 1); + StartSpriteAffineAnim(sprite, 0); + sprite->callback = sub_8171BAC; + + ballId = ItemIdToBallId(gLastUsedItem); + ballId2 = ballId; + if (ballId2 > 11) + goto LABEL; + if (ballId2 < 0) + goto LABEL; + + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId); + LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId); + + LABEL: + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = 0; + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 1); + AnimateSprite(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]]); + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] = 0x1000; +} + +static void sub_8171BAC(struct Sprite *sprite) +{ + int next = FALSE; + + if (sprite->animEnded) + sprite->invisible = 1; + + if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded) + { + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 0); + next = TRUE; + } + else + { + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] -= 288; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8; + } + + if (sprite->animEnded && next) + { + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = 0; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = gBattleSpritesDataPtr->animationData->field_9_x2; + sprite->data[0] = 0; + sprite->callback = sub_81719C0; + gDoingBattleAnim = 0; + UpdateOamPriorityInAllHealthboxes(1); + } +} + +static void sub_8171CAC(struct Sprite *sprite) +{ + int i; + + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.y = 0; + sprite->pos2.x = 0; + for (i = 0; i < 6; i++) + sprite->data[i] = 0; + + sprite->callback = sub_8171CE8; +} + +static void sub_8171CE8(struct Sprite *sprite) +{ + s16 var0 = sprite->data[0] + 0x800; + s16 var1 = sprite->data[1] + 0x680; + sprite->pos2.x -= var1 >> 8; + sprite->pos2.y += var0 >> 8; + sprite->data[0] = (sprite->data[0] + 0x800) & 0xFF; + sprite->data[1] = (sprite->data[1] + 0x680) & 0xFF; + + if (sprite->pos1.y + sprite->pos2.y > 160 + || sprite->pos1.x + sprite->pos2.x < -8) + { + sprite->data[0] = 0; + sprite->callback = sub_81719C0; + gDoingBattleAnim = 0; + UpdateOamPriorityInAllHealthboxes(1); + } +} + +static void sub_8171D60(u8 ballId) +{ + u8 taskId; + + if (GetSpriteTileStartByTag(gBallOpenParticleSpritesheets[ballId].tag) == 0xFFFF) + { + LoadCompressedObjectPicUsingHeap(&gBallOpenParticleSpritesheets[ballId]); + LoadCompressedObjectPaletteUsingHeap(&gBallOpenParticlePalettes[ballId]); + } +} + +u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId) +{ + u8 taskId; + + sub_8171D60(ballId); + taskId = CreateTask(gBallOpenParticleAnimationFuncs[ballId], 5); + gTasks[taskId].data[1] = x; + gTasks[taskId].data[2] = y; + gTasks[taskId].data[3] = priority; + gTasks[taskId].data[4] = subpriority; + gTasks[taskId].data[15] = ballId; + PlaySE(SE_BOWA2); + + return taskId; +} + +void sub_8171E20(void) +{ + if (gMain.inBattle) + gBattleSpritesDataPtr->animationData->field_A++; +} + +static void PokeBallOpenParticleAnimation(u8 taskId) +{ + u8 spriteId; + u8 x, y; + u8 priority, subpriority; + u8 ballId; + u8 var0; + + ballId = gTasks[taskId].data[15]; + if (gTasks[taskId].data[0] < 16) + { + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = PokeBallOpenParticleAnimation_Step1; + gSprites[spriteId].oam.priority = priority; + + var0 = (u8)gTasks[taskId].data[0]; + if (var0 >= 8) + var0 -= 8; + + gSprites[spriteId].data[0] = var0 * 32; + } + + if (gTasks[taskId].data[0] == 15) + { + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); + return; + } + } + + gTasks[taskId].data[0]++; +} + +static void PokeBallOpenParticleAnimation_Step1(struct Sprite *sprite) +{ + if (sprite->data[1] == 0) + sprite->callback = PokeBallOpenParticleAnimation_Step2; + else + sprite->data[1]--; +} + +static void PokeBallOpenParticleAnimation_Step2(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]); + sprite->data[1] += 2; + if (sprite->data[1] == 50) + DestroyBallOpenAnimationParticle(sprite); +} + +static void TimerBallOpenParticleAnimation(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballId; + u8 spriteId; + + ballId = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 10; + gSprites[spriteId].data[5] = 2; + gSprites[spriteId].data[6] = 1; + } + } + + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); +} + +static void DiveBallOpenParticleAnimation(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballId; + u8 spriteId; + + ballId = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 10; + gSprites[spriteId].data[5] = 1; + gSprites[spriteId].data[6] = 2; + } + } + + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); +} + +// Also used for Net Ball +static void SafariBallOpenParticleAnimation(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballId; + u8 spriteId; + + ballId = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 4; + gSprites[spriteId].data[5] = 1; + gSprites[spriteId].data[6] = 1; + } + } + + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); +} + +// Also used for Nest Ball +static void UltraBallOpenParticleAnimation(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballId; + u8 spriteId; + + ballId = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 10; i++) + { + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 25; + gSprites[spriteId].data[4] = 5; + gSprites[spriteId].data[5] = 1; + gSprites[spriteId].data[6] = 1; + } + } + + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); +} + +// Also used for Luxury Ball +static void GreatBallOpenParticleAnimation(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballId; + u8 spriteId; + + if (gTasks[taskId].data[7]) + { + gTasks[taskId].data[7]--; + } + else + { + ballId = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 8; + gSprites[spriteId].data[5] = 2; + gSprites[spriteId].data[6] = 2; + } + } + + gTasks[taskId].data[7] = 8; + if (++gTasks[taskId].data[0] == 2) + { + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); + } + } +} + +static void FanOutBallOpenParticles_Step1(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], sprite->data[2]); + sprite->data[0] = (sprite->data[0] + sprite->data[4]) & 0xFF; + sprite->data[1] += sprite->data[5]; + sprite->data[2] += sprite->data[6]; + if (++sprite->data[3] == 51) + DestroyBallOpenAnimationParticle(sprite); +} + +static void RepeatBallOpenParticleAnimation(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballId; + u8 spriteId; + + ballId = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 12; i++) + { + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = RepeatBallOpenParticleAnimation_Step1; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 21; + } + } + + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); +} + +static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0], sprite->data[2])); + sprite->data[0] = (sprite->data[0] + 6) & 0xFF; + sprite->data[1]++; + sprite->data[2]++; + if (++sprite->data[3] == 51) + DestroyBallOpenAnimationParticle(sprite); +} + +static void MasterBallOpenParticleAnimation(u8 taskId) +{ + u8 i, j; + u8 x, y, priority, subpriority, ballId; + u8 spriteId; + + ballId = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (j = 0; j < 2; j++) + { + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + gSprites[spriteId].data[4] = 8; + + if (j == 0) + { + gSprites[spriteId].data[5] = 2; + gSprites[spriteId].data[6] = 1; + } + else + { + gSprites[spriteId].data[5] = 1; + gSprites[spriteId].data[6] = 2; + } + } + } + } + + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); +} + +static void PremierBallOpenParticleAnimation(u8 taskId) +{ + u8 i; + u8 x, y, priority, subpriority, ballId; + u8 spriteId; + + ballId = gTasks[taskId].data[15]; + x = gTasks[taskId].data[1]; + y = gTasks[taskId].data[2]; + priority = gTasks[taskId].data[3]; + subpriority = gTasks[taskId].data[4]; + + for (i = 0; i < 8; i++) + { + spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + sub_8171E20(); + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + gSprites[spriteId].callback = PremierBallOpenParticleAnimation_Step1; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = i * 32; + } + } + + if (!gMain.inBattle) + gSprites[spriteId].data[7] = 1; + + DestroyTask(taskId); +} + +static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0] & 0x3F, sprite->data[2])); + sprite->data[0] = (sprite->data[0] + 10) & 0xFF; + sprite->data[1]++; + sprite->data[2]++; + if (++sprite->data[3] == 51) + DestroyBallOpenAnimationParticle(sprite); +} + +static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) +{ + int i, j; + int temp; + + if (!gMain.inBattle) + { + temp = sprite->data[7]; // temp var needed to match + if (temp == 1) + DestroySpriteAndFreeResources(sprite); + else + DestroySprite(sprite); + } + else + { + gBattleSpritesDataPtr->animationData->field_A--; + if (gBattleSpritesDataPtr->animationData->field_A == 0) + { + for (i = 0; i < 12; i++) + { + if (FuncIsActiveTask(gBallOpenParticleAnimationFuncs[i]) == TRUE) + break; + } + + if (i == 12) + { + for (j = 0; j < 12; j++) + { + FreeSpriteTilesByTag(gBallOpenParticleSpritesheets[j].tag); + FreeSpritePaletteByTag(gBallOpenParticlePalettes[j].tag); + } + } + + DestroySprite(sprite); + } + else + { + DestroySprite(sprite); + } + } +} + +u8 LaunchBallFadeMonTask(u8 unfadeLater, u8 battler, u32 selectedPalettes, u8 ballId) +{ + u8 taskId; + + taskId = CreateTask(sub_8172AB0, 5); + gTasks[taskId].data[15] = ballId; + gTasks[taskId].data[3] = battler; + gTasks[taskId].data[10] = selectedPalettes; + gTasks[taskId].data[11] = selectedPalettes >> 16; + + if (!unfadeLater) + { + BlendPalette(battler * 16 + 0x100, 16, 0, gUnknown_085E5310[ballId]); + gTasks[taskId].data[1] = 1; + } + else + { + BlendPalette(battler * 16 + 0x100, 16, 16, gUnknown_085E5310[ballId]); + gTasks[taskId].data[0] = 16; + gTasks[taskId].data[1] = -1; + gTasks[taskId].func = sub_8172B40; + } + + BeginNormalPaletteFade(selectedPalettes, 0, 0, 16, RGB(31, 31, 31)); + return taskId; +} + +static void sub_8172AB0(u8 taskId) +{ + u8 ballId = gTasks[taskId].data[15]; + + if (gTasks[taskId].data[2] <= 16) + { + BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gUnknown_085E5310[ballId]); + gTasks[taskId].data[0] += gTasks[taskId].data[1]; + gTasks[taskId].data[2]++; + } + else if (!gPaletteFade.active) + { + u32 selectedPalettes = (u16)gTasks[taskId].data[10] | ((u16)gTasks[taskId].data[11] << 16); + BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB(31, 31, 31)); + DestroyTask(taskId); + } +} + +static void sub_8172B40(u8 taskId) +{ + if (!gPaletteFade.active) + { + u32 selectedPalettes = (u16)gTasks[taskId].data[10] | ((u16)gTasks[taskId].data[11] << 16); + BeginNormalPaletteFade(selectedPalettes, 0, 16, 0, RGB(31, 31, 31)); + gTasks[taskId].func = sub_8172B90; + } +} + +static void sub_8172B90(u8 taskId) +{ + u8 ballId = gTasks[taskId].data[15]; + + if (gTasks[taskId].data[2] <= 16) + { + BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gUnknown_085E5310[ballId]); + gTasks[taskId].data[0] += gTasks[taskId].data[1]; + gTasks[taskId].data[2]++; + } + else + { + DestroyTask(taskId); + } +} + +void sub_8172BF0(u8 taskId) +{ + u8 spriteId; + u32 x; + u32 done; + + done = FALSE; + spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; + switch (gTasks[taskId].data[10]) + { + case 0: + gTasks[taskId].data[11] = gBattleAnimArgs[0]; + gTasks[taskId].data[0] += 0x500; + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8; + else + gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8; + + gTasks[taskId].data[0] &= 0xFF; + x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x + 32; + if (x > 304) + gTasks[taskId].data[10]++; + break; + case 1: + LoadBattleMonGfxAndAnimate(gBattleAnimAttacker, gTasks[taskId].data[11], spriteId); + gTasks[taskId].data[10]++; + break; + case 2: + gTasks[taskId].data[0] += 0x500; + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8; + else + gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8; + + gTasks[taskId].data[0] &= 0xFF; + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + { + if (gSprites[spriteId].pos2.x <= 0) + { + gSprites[spriteId].pos2.x = 0; + // done = FALSE; // fakematching--can't get the tail merge correct + goto DONE; + } + } + else + { + if (gSprites[spriteId].pos2.x >= 0) + { + gSprites[spriteId].pos2.x = 0; + done = TRUE; + } + } + + if (done) + { + DONE: + DestroyAnimVisualTask(taskId); + } + break; + } +} + +void sub_8172D98(u8 taskId) +{ + u8 spriteId; + + switch (gTasks[taskId].data[15]) + { + case 0: + if (sub_80A8364(gBattleAnimAttacker) == B_POSITION_OPPONENT_LEFT) + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); + else + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); + + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 0)); + gTasks[taskId].data[15]++; + break; + case 1: + if (gTasks[taskId].data[1]++ > 1) + { + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[0]++; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - gTasks[taskId].data[0], gTasks[taskId].data[0])); + if (gTasks[taskId].data[0] == 16) + gTasks[taskId].data[15]++; + } + break; + case 2: + spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; + RequestDma3Fill(0, (void *)OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * TILE_SIZE_4BPP, 0x800, 1); + ClearBehindSubstituteBit(gBattleAnimAttacker); + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_8172E9C(u8 taskId) +{ + gBattleAnimArgs[7] = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].behindSubstitute; + DestroyAnimVisualTask(taskId); +} + +void sub_8172ED0(u8 taskId) +{ + gBattleAnimTarget = gEffectBattler; + DestroyAnimVisualTask(taskId); +} + +void sub_8172EF0(u8 battler, struct Pokemon *mon) +{ + int isShiny; + u32 otId, personality; + u32 shinyValue; + u8 taskId1, taskId2; + + isShiny = 0; + gBattleSpritesDataPtr->healthBoxesData[battler].flag_x80 = 1; + otId = GetMonData(mon, MON_DATA_OT_ID); + personality = GetMonData(mon, MON_DATA_PERSONALITY); + + if (IsBattlerSpriteVisible(battler)) + { + shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality); + if (shinyValue < 8) + isShiny = TRUE; + + if (isShiny) + { + if (GetSpriteTileStartByTag(0x27F9) == 0xFFFF) + { + LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[233]); + LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[233]); + } + + taskId1 = CreateTask(sub_8172FEC, 10); + taskId2 = CreateTask(sub_8172FEC, 10); + gTasks[taskId1].data[0] = battler; + gTasks[taskId2].data[0] = battler; + gTasks[taskId1].data[1] = 0; + gTasks[taskId2].data[1] = 1; + return; + } + } + + gBattleSpritesDataPtr->healthBoxesData[battler].field_1_x1 = 1; +} + +static void sub_8172FEC(u8 taskId) +{ + u8 battler; + u8 x, y; + u8 spriteId; + u16 counter; + s16 state; + u8 pan; + + if (gTasks[taskId].data[13] < 60) + { + gTasks[taskId].data[13]++; + return; + } + + if (gBattleSpritesDataPtr->animationData->field_A) + return; + + counter = gTasks[taskId].data[10]++; + if (counter & 3) + return; + + battler = gTasks[taskId].data[0]; + x = GetBattlerSpriteCoord(battler, 0); + y = GetBattlerSpriteCoord(battler, 1); + state = gTasks[taskId].data[11]; + if (state == 0) + { + spriteId = CreateSprite(&gUnknown_085CE388, x, y, 5); + } + else if (state >= 0 && gTasks[taskId].data[11] < 4) + { + spriteId = CreateSprite(&gUnknown_085CE3A0, x, y, 5); + gSprites[spriteId].oam.tileNum += 4; + } + else + { + spriteId = CreateSprite(&gUnknown_085CE3A0, x, y, 5); + gSprites[spriteId].oam.tileNum += 5; + } + + if (gTasks[taskId].data[1] == 0) + { + gSprites[spriteId].callback = sub_81731FC; + } + else + { + gSprites[spriteId].callback = sub_8173250; + gSprites[spriteId].pos2.x = -32; + gSprites[spriteId].pos2.y = 32; + gSprites[spriteId].invisible = 1; + if (gTasks[taskId].data[11] == 0) + { + if (GetBattlerSide(battler) == B_SIDE_PLAYER) + pan = 192; + else + pan = 63; + + PlaySE12WithPanning(SE_REAPOKE, pan); + } + } + + gSprites[spriteId].data[0] = taskId; + gTasks[taskId].data[11]++; + if (spriteId != MAX_SPRITES) + gTasks[taskId].data[12]++; + + if (gTasks[taskId].data[11] == 5) + gTasks[taskId].func = sub_81731B0; +} + +static void sub_81731B0(u8 taskId) +{ + u8 battler; + + if (gTasks[taskId].data[12] == 0) + { + if (gTasks[taskId].data[1] == 1) + { + battler = gTasks[taskId].data[0]; + gBattleSpritesDataPtr->healthBoxesData[battler].field_1_x1 = 1; + } + + DestroyTask(taskId); + } +} + +static void sub_81731FC(struct Sprite *sprite) +{ + sprite->pos2.x = Sin(sprite->data[1], 24); + sprite->pos2.y = Cos(sprite->data[1], 24); + sprite->data[1] += 12; + if (sprite->data[1] > 0xFF) + { + gTasks[sprite->data[0]].data[12]--; + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); + } +} + +static void sub_8173250(struct Sprite *sprite) +{ + if (sprite->data[1] < 4) + { + sprite->data[1]++; + } + else + { + sprite->invisible = 0; + sprite->pos2.x += 5; + sprite->pos2.y -= 5; + if (sprite->pos2.x > 32) + { + gTasks[sprite->data[0]].data[12]--; + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); + } + } +} + +void sub_81732B0(u8 taskId) +{ + u8 paletteIndex; + + LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[269]); + LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[269]); + paletteIndex = IndexOfSpritePaletteTag(0x281D); // unused + DestroyAnimVisualTask(taskId); +} + +void sub_81732E4(u8 taskId) +{ + FreeSpriteTilesByTag(0x281D); + FreeSpritePaletteByTag(0x281D); + DestroyAnimVisualTask(taskId); +} + +static void sub_817330C(struct Sprite *sprite) +{ + InitAnimSpritePos(sprite, 0); + sprite->data[0] = 30; + sprite->data[2] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 1) + gBattleAnimArgs[3]; + sprite->data[5] = -32; + InitAnimArcTranslation(sprite); + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].callback = sub_8039E84; + sprite->callback = sub_817339C; +} + +static void sub_817339C(struct Sprite *sprite) +{ + if (gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].animCmdIndex == 1) + sprite->callback = sub_81733D4; +} + +static void sub_81733D4(struct Sprite *sprite) +{ + if (TranslateAnimArc(sprite)) + { + sprite->data[0] = 0; + sprite->invisible = 1; + sprite->callback = sub_8173400; + } +} + +static void sub_8173400(struct Sprite *sprite) +{ + if (gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].animEnded) + { + if (++sprite->data[0] > 0) + { + StartSpriteAnim(&gSprites[gBattlerSpriteIds[gBattleAnimAttacker]], 0); + DestroyAnimSprite(sprite); + } + } +} + +void sub_817345C(u8 taskId) +{ + switch (gBattleAnimArgs[0]) + { + case 0: + gBattleAnimAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + gBattleAnimTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + break; + case 1: + gBattleAnimAttacker = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + gBattleAnimTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + break; + } + + DestroyAnimVisualTask(taskId); +} + +void AnimTask_GetTrappedMoveAnimId(u8 taskId) +{ + if (gBattleSpritesDataPtr->animationData->animArg == 83) + gBattleAnimArgs[0] = 1; + else if (gBattleSpritesDataPtr->animationData->animArg == 250) + gBattleAnimArgs[0] = 2; + else if (gBattleSpritesDataPtr->animationData->animArg == 128) + gBattleAnimArgs[0] = 3; + else if (gBattleSpritesDataPtr->animationData->animArg == 328) + gBattleAnimArgs[0] = 4; + else + gBattleAnimArgs[0] = 0; + + DestroyAnimVisualTask(taskId); +} + +void sub_817351C(u8 taskId) +{ + gBattleAnimAttacker = gBattleSpritesDataPtr->animationData->animArg; + gBattleAnimTarget = gBattleSpritesDataPtr->animationData->animArg >> 8; + DestroyAnimVisualTask(taskId); +} diff --git a/src/battle_intro.c b/src/battle_intro.c index 91e7c8ea0..736e35a87 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -250,12 +250,7 @@ static void BattleIntroSlide2(u8 taskId) if (gTasks[taskId].data[1] == 4) { - u16 *bg1Y = &gBattle_BG1_Y; - int cos = Cos2(gTasks[taskId].data[6]); - if (cos < 0) - cos += 0x1FF; - *bg1Y = (cos >> 9) - 8; - + gBattle_BG1_Y = Cos2(gTasks[taskId].data[6]) / 512 - 8; if (gTasks[taskId].data[6] < 180) gTasks[taskId].data[6] += 4; else diff --git a/src/pokeball.c b/src/pokeball.c index ad839e6af..82d2f2cea 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -426,7 +426,7 @@ static void SpriteCB_TestBallThrow(struct Sprite *sprite) sprite->pos2.y = 0; sprite->data[5] = 0; ballId = ItemIdToBallId(GetBattlerPokeballItemId(opponentBattler)); - LaunchBallStarsTask(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId); + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId); sprite->data[0] = LaunchBallFadeMonTask(FALSE, opponentBattler, 14, ballId); sprite->sBattler = opponentBattler; sprite->data[7] = noOfShakes; @@ -737,7 +737,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) StartSpriteAnim(sprite, 1); ballId = ItemIdToBallId(GetBattlerPokeballItemId(battlerId)); - LaunchBallStarsTask(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId); + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId); sprite->data[0] = LaunchBallFadeMonTask(1, sprite->sBattler, 14, ballId); sprite->callback = HandleBallAnimEnd; @@ -985,9 +985,9 @@ static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite) #undef sBattler -static u8 LaunchBallStarsTaskForPokeball(u8 x, u8 y, u8 kindOfStars, u8 d) +static u8 AnimateBallOpenParticlesForPokeball(u8 x, u8 y, u8 kindOfStars, u8 d) { - return LaunchBallStarsTask(x, y, kindOfStars, d, BALL_POKE); + return AnimateBallOpenParticles(x, y, kindOfStars, d, BALL_POKE); } static u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 battlerId, u32 arg2) @@ -1036,7 +1036,7 @@ static void sub_8076524(struct Sprite *sprite) r5 = 0; StartSpriteAnim(sprite, 1); - LaunchBallStarsTaskForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r5); + AnimateBallOpenParticlesForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r5); sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, battlerId, r4); sprite->callback = sub_80765E0; gSprites[r7].invisible = FALSE; @@ -1129,7 +1129,7 @@ static void sub_80767D4(struct Sprite *sprite) r6 = 0; StartSpriteAnim(sprite, 1); - LaunchBallStarsTaskForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r6); + AnimateBallOpenParticlesForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r6); sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, r8, r5); sprite->callback = sub_807687C; StartSpriteAffineAnim(&gSprites[r7], 2); diff --git a/src/pokemon.c b/src/pokemon.c index eec995050..22b92870c 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -45,12 +45,6 @@ struct SpeciesItem u16 item; }; -// Extracts the upper 16 bits of a 32-bit number -#define HIHALF(n) (((n) & 0xFFFF0000) >> 16) - -// Extracts the lower 16 bits of a 32-bit number -#define LOHALF(n) ((n) & 0xFFFF) - extern const struct OamData gUnknown_0831ACB0; extern const struct OamData gUnknown_0831ACA8; extern const struct SpriteFrameImage gUnknown_082FF3A8[]; @@ -6707,12 +6701,6 @@ const u32 *GetMonFrontSpritePal(struct Pokemon *mon) return GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality); } -// Extracts the upper 16 bits of a 32-bit number -#define HIHALF(n) (((n) & 0xFFFF0000) >> 16) - -// Extracts the lower 16 bits of a 32-bit number -#define LOHALF(n) ((n) & 0xFFFF) - const u32 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality) { u32 shinyValue; diff --git a/sym_common.txt b/sym_common.txt index e8d1654c0..bb84ec06e 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -77,16 +77,7 @@ gDexCryScreenState: @ 30061EC .include "save.o" .include "battle_tower.o" .include "intro.o" - -gUnknown_030062DC: @ 30062DC - .space 0x4 - -gUnknown_030062E0: @ 30062E0 - .space 0x4 - -gUnknown_030062E4: @ 30062E4 - .space 0x4 - + .include "battle_anim_8170478.o" .include "battle_factory_screen.o" .include "apprentice.o" -- cgit v1.2.3 From 2fa0555ed582a108e628da7a787de346a614c15c Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sat, 15 Dec 2018 18:08:13 +0000 Subject: Document some of item_menu.c --- include/item_menu.h | 19 +++--- src/item.c | 2 +- src/item_menu.c | 172 +++++++++++++++++++++++++------------------------- src/item_menu_icons.c | 32 +++++----- src/item_use.c | 13 ++-- 5 files changed, 119 insertions(+), 119 deletions(-) diff --git a/include/item_menu.h b/include/item_menu.h index 4631382cb..ce439e282 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -32,10 +32,10 @@ extern struct BagStruct gUnknown_0203CE58; struct UnkBagStruct { - void (*unk0)(void); - u8 unk4[0x800]; - u8 unk804[12]; - u8 unk810[7]; + void (*mainCallback2)(void); + u8 tilemapBuffer[0x800]; + u8 spriteId[12]; + u8 windowPointers[7]; u8 unk817; u8 unk818; u8 unk819; @@ -43,7 +43,7 @@ struct UnkBagStruct u8 unk81B:4; u8 unk81B_1:2; u8 unk81B_3:1; - u8 unk81B_2:1; + u8 hideCloseBagText:1; u8 filler3[2]; u8 unk81E; u8 unk81F; @@ -52,11 +52,11 @@ struct UnkBagStruct u8 unk825; u8 filler[2]; u8 unk828; - u8 unk829[POCKETS_COUNT]; - u8 unk82E[6]; + u8 numItemStacks[POCKETS_COUNT]; + u8 numShownItems[6]; s16 unk834; u8 filler4[0xE]; - u8 unk844[32][32]; + u8 pocketNameBuffer[32][32]; u8 filler2[4]; }; @@ -71,9 +71,10 @@ void sub_81AAC14(void); void sub_81AAC50(void); void sub_81AAC70(void); void sub_81AAC28(void); +void SetInitialScrollAndCursorPositions(u8 pocketId); void bag_menu_mail_related(void); void CB2_BagMenuFromStartMenu(void); -u8 sub_81ABB2C(u8 pocketId); +u8 GetItemListPosition(u8 pocketId); bool8 UseRegisteredKeyItemOnField(void); void CB2_GoToSellMenu(void); diff --git a/src/item.c b/src/item.c index 6a1f1955a..71c2dc0f7 100644 --- a/src/item.c +++ b/src/item.c @@ -543,7 +543,7 @@ bool8 RemoveBagItem(u16 itemId, u16 count) VarSet(VAR_0x40ED, itemId); } - var = sub_81ABB2C(pocket); + var = GetItemListPosition(pocket); if (itemPocket->capacity > var && itemPocket->itemSlots[var].itemId == itemId) { diff --git a/src/item_menu.c b/src/item_menu.c index 40d09a8a1..32c42ac31 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -57,7 +57,7 @@ bool8 load_bag_menu_graphics(void); void setup_bag_menu_textboxes(void); void allocate_bag_item_list_buffers(void); void load_bag_item_list_buffers(u8); -void bag_menu_print_pocket_names(u8*, u8*); +void bag_menu_print_pocket_names(const u8*, const u8*); void bag_menu_copy_pocket_name_to_window(u32); void bag_menu_draw_pocket_indicator_square(u8, u8); void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void); @@ -69,7 +69,6 @@ void Task_BagMenu(u8); void get_name(s8*, u16); u16 ItemIdToBattleMoveId(u16); u16 BagGetItemIdByPocketPosition(u8, u16); -void AddBagItemIconSprite(u16, u8); void bag_menu_print_description_box_text(int); void bag_menu_print_cursor(u8, u8); void bag_menu_print(u8, u8, const u8*, u8, u8, u8, u8, u8, u8); @@ -121,7 +120,7 @@ void bag_menu_leave_maybe_3(void); void bag_menu_leave_maybe_2(void); void bag_menu_leave_maybe(void); void sub_81ABA6C(void); -void sub_81ABAC4(void); +static void SetPocketListPositions(void); void sub_81ABAE0(void); u8 sub_81AB1F0(u8); void sub_81AC23C(u8); @@ -151,7 +150,7 @@ void sub_81AD6FC(u8 taskId); // .rodata -const struct BgTemplate gUnknown_08613F90[3] = +static const struct BgTemplate sBgTemplates_ItemMenu[3] = { { .bg = 0, @@ -182,7 +181,7 @@ const struct BgTemplate gUnknown_08613F90[3] = }, }; -const struct ListMenuTemplate gUnknown_08613F9C = +static const struct ListMenuTemplate sItemListMenu = { .items = NULL, .moveCursorFunc = bag_menu_change_item_callback, @@ -258,7 +257,8 @@ const struct ScrollArrowsTemplate gUnknown_08614094 = {SCROLL_ARROW_LEFT, 0x1C, const u8 gUnknown_086140A4[] = INCBIN_U8("graphics/interface/select_button.4bpp"); -const u8 gUnknown_08614164[][3] = { +static const u8 sFontColorTable[][3] = { +// bgColor, textColor, shadowColor {0, 1, 3}, {0, 1, 4}, {0, 3, 6}, @@ -268,7 +268,7 @@ const u8 gUnknown_08614164[][3] = { const struct WindowTemplate gUnknown_08614174[] = { - { + { // Item names .bg = 0, .tilemapLeft = 14, .tilemapTop = 2, @@ -277,7 +277,7 @@ const struct WindowTemplate gUnknown_08614174[] = .paletteNum = 1, .baseBlock = 0x27, }, - { + { // Description .bg = 0, .tilemapLeft = 0, .tilemapTop = 13, @@ -286,7 +286,7 @@ const struct WindowTemplate gUnknown_08614174[] = .paletteNum = 1, .baseBlock = 0x117, }, - { + { // Pocket name .bg = 0, .tilemapLeft = 4, .tilemapTop = 1, @@ -295,7 +295,7 @@ const struct WindowTemplate gUnknown_08614174[] = .paletteNum = 1, .baseBlock = 0x1A1, }, - { + { // TM/HM info icons .bg = 0, .tilemapLeft = 1, .tilemapTop = 13, @@ -304,7 +304,7 @@ const struct WindowTemplate gUnknown_08614174[] = .paletteNum = 12, .baseBlock = 0x16B, }, - { + {// TM/HM info .bg = 0, .tilemapLeft = 7, .tilemapTop = 13, @@ -313,7 +313,7 @@ const struct WindowTemplate gUnknown_08614174[] = .paletteNum = 12, .baseBlock = 0x189, }, - { + { // Field message box .bg = 1, .tilemapLeft = 2, .tilemapTop = 15, @@ -440,16 +440,14 @@ struct TempWallyStruct { EWRAM_DATA struct UnkBagStruct *gUnknown_0203CE54 = 0; EWRAM_DATA struct BagStruct gUnknown_0203CE58 = {0}; -EWRAM_DATA struct ListBuffer1 *gUnknown_0203CE74 = 0; -EWRAM_DATA struct ListBuffer2 *gUnknown_0203CE78 = 0; +static EWRAM_DATA struct ListBuffer1 *sListBuffer1 = 0; +static EWRAM_DATA struct ListBuffer2 *sListBuffer2 = 0; EWRAM_DATA u16 gSpecialVar_ItemId = 0; -EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0; +static EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0; -extern u8 *gPocketNamesStringsTable[]; -extern struct ListMenuTemplate gUnknown_08613F9C; +extern u8 *const gPocketNamesStringsTable[]; extern const u8 gMoveNames[][0xD]; extern u8* gReturnToXStringsTable[]; -extern u32 gUnknown_0203CE5E[]; extern const u8 EventScript_2736B3[]; extern const u16 gUnknown_0860F074[]; @@ -531,12 +529,12 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2) temp = gUnknown_0203CE58.location - (POCKETS_COUNT - 1); if (temp <= 1) gUnknown_0203CE54->unk81B = 1; - gUnknown_0203CE54->unk0 = 0; + gUnknown_0203CE54->mainCallback2 = 0; gUnknown_0203CE54->unk81A = 0xFF; gUnknown_0203CE54->unk81E = -1; gUnknown_0203CE54->unk81F = -1; - memset(gUnknown_0203CE54->unk804, 0xFF, sizeof(gUnknown_0203CE54->unk804)); - memset(gUnknown_0203CE54->unk810, 0xFF, 10); + memset(gUnknown_0203CE54->spriteId, 0xFF, sizeof(gUnknown_0203CE54->spriteId)); + memset(gUnknown_0203CE54->windowPointers, 0xFF, 10); SetMainCallback2(CB2_Bag); } } @@ -615,7 +613,7 @@ bool8 setup_bag_menu(void) break; case 10: sub_81ABA6C(); - sub_81ABAC4(); + SetPocketListPositions(); sub_81ABAE0(); gMain.state++; break; @@ -677,10 +675,10 @@ bool8 setup_bag_menu(void) void bag_menu_init_bgs(void) { ResetVramOamAndBgCntRegs(); - memset(gUnknown_0203CE54->unk4, 0, 0x800); + memset(gUnknown_0203CE54->tilemapBuffer, 0, 0x800); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_08613F90, 3); - SetBgTilemapBuffer(2, gUnknown_0203CE54->unk4); + InitBgsFromTemplates(0, sBgTemplates_ItemMenu, 3); + SetBgTilemapBuffer(2, gUnknown_0203CE54->tilemapBuffer); ResetAllBgsCoordinates(); schedule_bg_copy_tilemap_to_vram(2); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); @@ -702,7 +700,7 @@ bool8 load_bag_menu_graphics(void) case 1: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - LZDecompressWram(gUnknown_08D9A88C, gUnknown_0203CE54->unk4); + LZDecompressWram(gUnknown_08D9A88C, gUnknown_0203CE54->tilemapBuffer); gUnknown_0203CE54->unk834++; } break; @@ -744,8 +742,8 @@ u8 sub_81AB1F0(u8 a) void allocate_bag_item_list_buffers(void) { - gUnknown_0203CE74 = Alloc(sizeof(struct ListBuffer1)); - gUnknown_0203CE78 = Alloc(sizeof(struct ListBuffer2)); + sListBuffer1 = Alloc(sizeof(struct ListBuffer1)); + sListBuffer2 = Alloc(sizeof(struct ListBuffer2)); } void load_bag_item_list_buffers(u8 pocketId) @@ -754,34 +752,34 @@ void load_bag_item_list_buffers(u8 pocketId) struct BagPocket *pocket = &gBagPockets[pocketId]; struct ListMenuItem *subBuffer; - if (!gUnknown_0203CE54->unk81B_2) + if (!gUnknown_0203CE54->hideCloseBagText) { - for (i = 0; i < gUnknown_0203CE54->unk829[pocketId] - 1; i++) + for (i = 0; i < gUnknown_0203CE54->numItemStacks[pocketId] - 1; i++) { - get_name(gUnknown_0203CE78->name[i], pocket->itemSlots[i].itemId); - subBuffer = gUnknown_0203CE74->subBuffers; - subBuffer[i].name = gUnknown_0203CE78->name[i]; + get_name(sListBuffer2->name[i], pocket->itemSlots[i].itemId); + subBuffer = sListBuffer1->subBuffers; + subBuffer[i].name = sListBuffer2->name[i]; subBuffer[i].id = i; } - StringCopy(gUnknown_0203CE78->name[i], gText_CloseBag); - subBuffer = gUnknown_0203CE74->subBuffers; - subBuffer[i].name = gUnknown_0203CE78->name[i]; + StringCopy(sListBuffer2->name[i], gText_CloseBag); + subBuffer = sListBuffer1->subBuffers; + subBuffer[i].name = sListBuffer2->name[i]; subBuffer[i].id = -2; } else { - for (i = 0; i < gUnknown_0203CE54->unk829[pocketId]; i++) + for (i = 0; i < gUnknown_0203CE54->numItemStacks[pocketId]; i++) { - get_name(gUnknown_0203CE78->name[i], pocket->itemSlots[i].itemId); - subBuffer = gUnknown_0203CE74->subBuffers; - subBuffer[i].name = gUnknown_0203CE78->name[i]; + get_name(sListBuffer2->name[i], pocket->itemSlots[i].itemId); + subBuffer = sListBuffer1->subBuffers; + subBuffer[i].name = sListBuffer2->name[i]; subBuffer[i].id = i; } } - gMultiuseListMenuTemplate = gUnknown_08613F9C; - gMultiuseListMenuTemplate.totalItems = gUnknown_0203CE54->unk829[pocketId]; - gMultiuseListMenuTemplate.items = gUnknown_0203CE74->subBuffers; - gMultiuseListMenuTemplate.maxShowed = gUnknown_0203CE54->unk82E[pocketId]; + gMultiuseListMenuTemplate = sItemListMenu; + gMultiuseListMenuTemplate.totalItems = gUnknown_0203CE54->numItemStacks[pocketId]; + gMultiuseListMenuTemplate.items = sListBuffer1->subBuffers; + gMultiuseListMenuTemplate.maxShowed = gUnknown_0203CE54->numShownItems[pocketId]; } void get_name(s8 *dest, u16 itemId) @@ -907,7 +905,7 @@ void bag_menu_print_cursor(u8 a, u8 b) void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void) { if (gUnknown_0203CE54->unk81E == 0xFF) - gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); + gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->numItemStacks[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->numShownItems[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]); } void sub_81AB824(void) @@ -937,8 +935,8 @@ void sub_81AB89C(void) void free_bag_item_list_buffers(void) { - Free(gUnknown_0203CE78); - Free(gUnknown_0203CE74); + Free(sListBuffer2); + Free(sListBuffer1); FreeAllWindowBuffers(); Free(gUnknown_0203CE54); } @@ -955,8 +953,8 @@ void task_close_bag_menu_2(u8 taskId) if (!gPaletteFade.active) { DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); - if (gUnknown_0203CE54->unk0 != 0) - SetMainCallback2(gUnknown_0203CE54->unk0); + if (gUnknown_0203CE54->mainCallback2 != 0) + SetMainCallback2(gUnknown_0203CE54->mainCallback2); else SetMainCallback2(gUnknown_0203CE58.bagCallback); sub_81AB824(); @@ -981,15 +979,17 @@ void sub_81AB9A8(u8 pocketId) CompactItemsInBagPocket(pocket); break; } - gUnknown_0203CE54->unk829[pocketId] = 0; + gUnknown_0203CE54->numItemStacks[pocketId] = 0; for (i = 0; i < pocket->capacity && pocket->itemSlots[i].itemId; i++) - gUnknown_0203CE54->unk829[pocketId]++; - if (!gUnknown_0203CE54->unk81B_2) - gUnknown_0203CE54->unk829[pocketId]++; - if (gUnknown_0203CE54->unk829[pocketId] > 8) - gUnknown_0203CE54->unk82E[pocketId] = 8; + gUnknown_0203CE54->numItemStacks[pocketId]++; + + if (!gUnknown_0203CE54->hideCloseBagText) + gUnknown_0203CE54->numItemStacks[pocketId]++; + + if (gUnknown_0203CE54->numItemStacks[pocketId] > 8) + gUnknown_0203CE54->numShownItems[pocketId] = 8; else - gUnknown_0203CE54->unk82E[pocketId] = gUnknown_0203CE54->unk829[pocketId]; + gUnknown_0203CE54->numShownItems[pocketId] = gUnknown_0203CE54->numItemStacks[pocketId]; } void sub_81ABA6C(void) @@ -999,26 +999,26 @@ void sub_81ABA6C(void) sub_81AB9A8(i); } -void sub_81ABA88(u8 a) +void SetInitialScrollAndCursorPositions(u8 pocketId) { - sub_812225C(&gUnknown_0203CE58.scrollPosition[a], &gUnknown_0203CE58.cursorPosition[a], gUnknown_0203CE54->unk82E[a], gUnknown_0203CE54->unk829[a]); + sub_812225C(&gUnknown_0203CE58.scrollPosition[pocketId], &gUnknown_0203CE58.cursorPosition[pocketId], gUnknown_0203CE54->numShownItems[pocketId], gUnknown_0203CE54->numItemStacks[pocketId]); } -void sub_81ABAC4(void) +static void SetPocketListPositions(void) { u8 i; for (i = 0; i < POCKETS_COUNT; i++) - sub_81ABA88(i); + SetInitialScrollAndCursorPositions(i); } void sub_81ABAE0(void) { u8 i; for (i = 0; i < POCKETS_COUNT; i++) - sub_8122298(&gUnknown_0203CE58.scrollPosition[i], &gUnknown_0203CE58.cursorPosition[i], gUnknown_0203CE54->unk82E[i], gUnknown_0203CE54->unk829[i], 8); + sub_8122298(&gUnknown_0203CE58.scrollPosition[i], &gUnknown_0203CE58.cursorPosition[i], gUnknown_0203CE54->numShownItems[i], gUnknown_0203CE54->numItemStacks[i], 8); } -u8 sub_81ABB2C(u8 pocketId) +u8 GetItemListPosition(u8 pocketId) { return gUnknown_0203CE58.scrollPosition[pocketId] + gUnknown_0203CE58.cursorPosition[pocketId]; } @@ -1041,7 +1041,7 @@ void bag_menu_inits_lists_menu(u8 taskId) bag_menu_RemoveBagItem_message_window(4); DestroyListMenuTask(data[0], scrollPos, cursorPos); sub_81AB9A8(gUnknown_0203CE58.pocket); - sub_81ABA88(gUnknown_0203CE58.pocket); + SetInitialScrollAndCursorPositions(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); schedule_bg_copy_tilemap_to_vram(0); @@ -1092,7 +1092,7 @@ void Task_BagMenu(u8 taskId) if (sub_81AC2C0() == 1) { ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos); - if ((*scrollPos + *cursorPos) != gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - 1) + if ((*scrollPos + *cursorPos) != gUnknown_0203CE54->numItemStacks[gUnknown_0203CE58.pocket] - 1) { PlaySE(SE_SELECT); bag_menu_swap_items(taskId); @@ -1102,13 +1102,13 @@ void Task_BagMenu(u8 taskId) } else { - int r4 = ListMenuHandleInputGetItemId(data[0]); + int listPosition = ListMenuHandleInputGetItemId(data[0]); ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos); - switch (r4) + switch (listPosition) { - case -1: + case LIST_NOTHING_CHOSEN: break; - case -2: + case LIST_B_PRESSED: if (gUnknown_0203CE58.location == 5) { PlaySE(SE_HAZURE); @@ -1118,13 +1118,13 @@ void Task_BagMenu(u8 taskId) gSpecialVar_ItemId = select; gTasks[taskId].func = unknown_ItemMenu_Confirm; break; - default: + default: // A_BUTTON PlaySE(SE_SELECT); sub_81AB824(); bag_menu_print_cursor_(data[0], 2); - data[1] = r4; - data[2] = BagGetQuantityByPocketPosition(gUnknown_0203CE58.pocket + 1, r4); - gSpecialVar_ItemId = BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, r4); + data[1] = listPosition; + data[2] = BagGetQuantityByPocketPosition(gUnknown_0203CE58.pocket + 1, listPosition); + gSpecialVar_ItemId = BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, listPosition); gUnknown_08614054[gUnknown_0203CE58.location](taskId); break; } @@ -1186,7 +1186,7 @@ void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3) ClearWindowTilemap(1); DestroyListMenuTask(data[0], &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket], &gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket]); schedule_bg_copy_tilemap_to_vram(0); - gSprites[gUnknown_0203CE54->unk804[2 + (gUnknown_0203CE54->unk81B_1 ^ 1)]].invisible = TRUE; + gSprites[gUnknown_0203CE54->spriteId[2 + (gUnknown_0203CE54->unk81B_1 ^ 1)]].invisible = TRUE; sub_81AB824(); } pocketId = gUnknown_0203CE58.pocket; @@ -1744,7 +1744,7 @@ void Task_ActuallyToss(u8 taskId) RemoveBagItem(gSpecialVar_ItemId, data[8]); DestroyListMenuTask(data[0], scrollPos, cursorPos); sub_81AB9A8(gUnknown_0203CE58.pocket); - sub_81ABA88(gUnknown_0203CE58.pocket); + SetInitialScrollAndCursorPositions(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); schedule_bg_copy_tilemap_to_vram(0); @@ -1782,7 +1782,7 @@ void ItemMenu_Give(u8 taskId) bag_menu_print_there_is_no_pokemon(taskId); else { - gUnknown_0203CE54->unk0 = sub_81B7F60; + gUnknown_0203CE54->mainCallback2 = sub_81B7F60; unknown_ItemMenu_Confirm(taskId); } } @@ -1815,7 +1815,7 @@ void sub_81AD350(u8 taskId) void ItemMenu_CheckTag(u8 taskId) { - gUnknown_0203CE54->unk0 = DoBerryTagScreen; + gUnknown_0203CE54->mainCallback2 = DoBerryTagScreen; unknown_ItemMenu_Confirm(taskId); } @@ -2012,7 +2012,7 @@ void sub_81AD8C8(u8 taskId) AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]); DestroyListMenuTask(data[0], scrollPos, cursorPos); sub_81AB9A8(gUnknown_0203CE58.pocket); - sub_81ABA88(gUnknown_0203CE58.pocket); + SetInitialScrollAndCursorPositions(gUnknown_0203CE58.pocket); load_bag_item_list_buffers(gUnknown_0203CE58.pocket); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos); bag_menu_print_cursor_(data[0], 2); @@ -2235,7 +2235,7 @@ void bag_menu_leave_maybe(void) SetMainCallback2(CB2_ReturnToField); } -void bag_menu_print_pocket_names(u8 *pocketName1, u8 *pocketName2) +void bag_menu_print_pocket_names(const u8 *pocketName1, const u8 *pocketName2) { struct WindowTemplate window = {0, 0, 0, 0, 0, 0, 0}; u16 windowId; @@ -2252,7 +2252,7 @@ void bag_menu_print_pocket_names(u8 *pocketName1, u8 *pocketName2) offset = GetStringCenterAlignXOffset(1, pocketName2, 0x40); bag_menu_print(windowId, 1, pocketName2, offset + 0x40, 1, 0, 0, -1, 1); } - CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gUnknown_0203CE54->unk844, 0x400); + CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gUnknown_0203CE54->pocketNameBuffer, 0x400); RemoveWindow(windowId); } @@ -2263,7 +2263,7 @@ void bag_menu_copy_pocket_name_to_window(u32 a) int b; if (a > 8) a = 8; - r4 = &gUnknown_0203CE54->unk844; + r4 = &gUnknown_0203CE54->pocketNameBuffer; windowAttribute = (u8*)GetWindowAttribute(2, WINDOW_TILE_DATA); CpuCopy32(r4[0][a], windowAttribute, 0x100); b = a + 16; @@ -2292,17 +2292,17 @@ void setup_bag_menu_textboxes(void) void bag_menu_print(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 h) { - AddTextPrinterParameterized4(windowId, fontId, left, top, letterSpacing, lineSpacing, gUnknown_08614164[h], speed, str); + AddTextPrinterParameterized4(windowId, fontId, left, top, letterSpacing, lineSpacing, sFontColorTable[h], speed, str); } u8 sub_81AE124(u8 a) { - return gUnknown_0203CE54->unk810[a]; + return gUnknown_0203CE54->windowPointers[a]; } u8 bag_menu_add_window(u8 a) { - u8 *ptr = &gUnknown_0203CE54->unk810[a]; + u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; if (*ptr == 0xFF) { *ptr = AddWindow(&gUnknown_086141AC[a]); @@ -2314,7 +2314,7 @@ u8 bag_menu_add_window(u8 a) void bag_menu_remove_window(u8 a) { - u8 *ptr = &gUnknown_0203CE54->unk810[a]; + u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; if (*ptr != 0xFF) { sub_8198070(*ptr, 0); @@ -2327,7 +2327,7 @@ void bag_menu_remove_window(u8 a) u8 AddItemMessageWindow(u8 a) { - u8 *ptr = &gUnknown_0203CE54->unk810[a]; + u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; if (*ptr == 0xFF) *ptr = AddWindow(&gUnknown_086141AC[a]); return *ptr; @@ -2335,7 +2335,7 @@ u8 AddItemMessageWindow(u8 a) void bag_menu_RemoveBagItem_message_window(u8 a) { - u8 *ptr = &gUnknown_0203CE54->unk810[a]; + u8 *ptr = &gUnknown_0203CE54->windowPointers[a]; if (*ptr != 0xFF) { sub_8197DF8(*ptr, 0); diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 85b42b9b3..894574ec9 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -1,14 +1,14 @@ #include "global.h" -#include "sprite.h" +#include "berry.h" #include "decompress.h" +#include "graphics.h" +#include "item.h" #include "item_menu.h" #include "item_icon.h" #include "item_menu_icons.h" -#include "window.h" #include "menu_helpers.h" -#include "berry.h" -#include "graphics.h" -#include "item.h" +#include "sprite.h" +#include "window.h" #include "constants/items.h" struct CompressedTilesPal @@ -199,7 +199,7 @@ static const struct SpritePalette gUnknown_0857FBA8 = gUnknown_0857F564, 101 }; -static const struct SpriteTemplate gUnknown_0857FBB0 = +static const struct SpriteTemplate gSpriteTemplate_RotatingBall = { .tileTag = 101, .paletteTag = 101, @@ -409,7 +409,7 @@ static const struct SpriteTemplate gUnknown_0857FE10 = // code void RemoveBagSprite(u8 id) { - u8 *spriteId = &gUnknown_0203CE54->unk804[id]; + u8 *spriteId = &gUnknown_0203CE54->spriteId[id]; if (*spriteId != 0xFF) { FreeSpriteTilesByTag(id + 100); @@ -422,14 +422,14 @@ void RemoveBagSprite(u8 id) void AddBagVisualSprite(u8 bagPocketId) { - u8 *spriteId = &gUnknown_0203CE54->unk804[0]; + u8 *spriteId = &gUnknown_0203CE54->spriteId[0]; *spriteId = CreateSprite(&gUnknown_0857FB4C, 68, 66, 0); SetBagVisualPocketId(bagPocketId, FALSE); } void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets) { - struct Sprite *sprite = &gSprites[gUnknown_0203CE54->unk804[0]]; + struct Sprite *sprite = &gSprites[gUnknown_0203CE54->spriteId[0]]; if (isSwitchingPockets) { sprite->pos2.y = -5; @@ -458,7 +458,7 @@ static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite) void ShakeBagVisual(void) { - struct Sprite *sprite = &gSprites[gUnknown_0203CE54->unk804[0]]; + struct Sprite *sprite = &gSprites[gUnknown_0203CE54->spriteId[0]]; if (sprite->affineAnimEnded) { StartSpriteAffineAnim(sprite, 1); @@ -477,10 +477,10 @@ static void SpriteCB_ShakeBagVisual(struct Sprite *sprite) void AddSwitchPocketRotatingBallSprite(s16 rotationDirection) { - u8 *spriteId = &gUnknown_0203CE54->unk804[1]; + u8 *spriteId = &gUnknown_0203CE54->spriteId[1]; LoadSpriteSheet(&gUnknown_0857FBA0); LoadSpritePalette(&gUnknown_0857FBA8); - *spriteId = CreateSprite(&gUnknown_0857FBB0, 16, 16, 0); + *spriteId = CreateSprite(&gSpriteTemplate_RotatingBall, 16, 16, 0); gSprites[*spriteId].data[0] = rotationDirection; } @@ -515,7 +515,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite) void AddBagItemIconSprite(u16 itemId, u8 id) { - u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2]; + u8 *spriteId = &gUnknown_0203CE54->spriteId[id + 2]; if (*spriteId == 0xFF) { u8 iconSpriteId; @@ -539,17 +539,17 @@ void RemoveBagItemIconSprite(u8 id) void sub_80D4FAC(void) { - sub_8122344(&gUnknown_0203CE54->unk804[4], 8); + sub_8122344(&gUnknown_0203CE54->spriteId[4], 8); } void sub_80D4FC8(u8 arg0) { - sub_81223FC(&gUnknown_0203CE54->unk804[4], 8, arg0); + sub_81223FC(&gUnknown_0203CE54->spriteId[4], 8, arg0); } void sub_80D4FEC(u8 arg0) { - sub_8122448(&gUnknown_0203CE54->unk804[4], 136, 120, (arg0 + 1) * 16); + sub_8122448(&gUnknown_0203CE54->spriteId[4], 136, 120, (arg0 + 1) * 16); } static void sub_80D5018(void *mem0, void *mem1) diff --git a/src/item_use.c b/src/item_use.c index 8399a1861..474b16ae1 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -57,7 +57,6 @@ extern void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*); extern void sub_81C5924(void); extern void sub_81C59BC(void); extern void sub_81AB9A8(u8); -extern void sub_81ABA88(u8); extern void StartEscapeRopeFieldEffect(void); extern u8* sub_806CF78(u16); extern void sub_81B89F0(void); @@ -128,7 +127,7 @@ void SetUpItemUseCallback(u8 taskId) type = ItemId_GetType(gSpecialVar_ItemId) - 1; if (!InBattlePyramid()) { - gUnknown_0203CE54->unk0 = gUnknown_085920D8[type]; + gUnknown_0203CE54->mainCallback2 = gUnknown_085920D8[type]; unknown_ItemMenu_Confirm(taskId); } else @@ -212,7 +211,7 @@ void sub_80FD254(void) void ItemUseOutOfBattle_Mail(u8 taskId) { - gUnknown_0203CE54->unk0 = sub_80FD254; + gUnknown_0203CE54->mainCallback2 = sub_80FD254; unknown_ItemMenu_Confirm(taskId); } @@ -608,7 +607,7 @@ void ItemUseOutOfBattle_PokeblockCase(u8 taskId) } else if (gTasks[taskId].data[3] != TRUE) { - gUnknown_0203CE54->unk0 = sub_80FDBEC; + gUnknown_0203CE54->mainCallback2 = sub_80FDBEC; unknown_ItemMenu_Confirm(taskId); } else @@ -670,7 +669,7 @@ void sub_80FDD10(u8 taskId) { gUnknown_0203A0F4 = sub_80FDD74; gFieldCallback = MapPostLoadHook_UseItem; - gUnknown_0203CE54->unk0 = CB2_ReturnToField; + gUnknown_0203CE54->mainCallback2 = CB2_ReturnToField; unknown_ItemMenu_Confirm(taskId); } else @@ -812,7 +811,7 @@ void sub_80FE058(void) if (!InBattlePyramid()) { sub_81AB9A8(ItemId_GetPocket(gSpecialVar_ItemId)); - sub_81ABA88(ItemId_GetPocket(gSpecialVar_ItemId)); + SetInitialScrollAndCursorPositions(ItemId_GetPocket(gSpecialVar_ItemId)); } else { @@ -993,7 +992,7 @@ void sub_80FE54C(u8 taskId) { if (!InBattlePyramid()) { - gUnknown_0203CE54->unk0 = sub_81B89F0; + gUnknown_0203CE54->mainCallback2 = sub_81B89F0; unknown_ItemMenu_Confirm(taskId); } else -- cgit v1.2.3 From 1ca3656d74faf8565e0f61b31a1cd3ab22a44706 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 15 Dec 2018 13:07:07 -0600 Subject: Decompile contest_painting.c (#447) --- asm/contest_painting.s | 1197 ------------- asm/contest_painting_effects.s | 3331 ++++++++++++++++++++++++++++++++++++ asm/cute_sketch.s | 3331 ------------------------------------ data/contest_painting.s | 106 -- data/contest_painting_effects.s | 308 ++++ data/cute_sketch.s | 308 ---- include/contest.h | 1 + include/contest_painting.h | 13 +- include/contest_painting_effects.h | 28 + include/strings.h | 1 + ld_script.txt | 7 +- src/battle_anim_8170478.c | 64 +- src/contest_painting.c | 711 +++++++- src/script_pokemon_util_80F87D8.c | 2 +- sym_common.txt | 2 +- 15 files changed, 4423 insertions(+), 4987 deletions(-) delete mode 100644 asm/contest_painting.s create mode 100644 asm/contest_painting_effects.s delete mode 100644 asm/cute_sketch.s delete mode 100644 data/contest_painting.s create mode 100644 data/contest_painting_effects.s delete mode 100644 data/cute_sketch.s create mode 100755 include/contest_painting_effects.h diff --git a/asm/contest_painting.s b/asm/contest_painting.s deleted file mode 100644 index f7c146e3e..000000000 --- a/asm/contest_painting.s +++ /dev/null @@ -1,1197 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_812FDA8 -sub_812FDA8: @ 812FDA8 - push {r4-r7,lr} - ldr r3, =gUnknown_02039F5D - ldr r4, =gUnknown_02039F5C - ldr r1, =gSaveBlock1Ptr - ldr r2, [r1] - subs r0, 0x1 - lsls r1, r0, 5 - adds r2, r1 - ldr r1, =gUnknown_02039F3C - ldr r5, =0x00002e90 - adds r2, r5 - ldm r2!, {r5-r7} - stm r1!, {r5-r7} - ldm r2!, {r5-r7} - stm r1!, {r5-r7} - ldm r2!, {r6,r7} - stm r1!, {r6,r7} - strb r0, [r3] - movs r0, 0 - strb r0, [r4] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_812FDA8 - - thumb_func_start sub_812FDEC -sub_812FDEC: @ 812FDEC - push {lr} - bl sub_812FE58 - pop {r0} - bx r0 - thumb_func_end sub_812FDEC - - thumb_func_start sub_812FDF8 -sub_812FDF8: @ 812FDF8 - push {lr} - bl sub_812FFC8 - bl RunTextPrinters - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_812FDF8 - - thumb_func_start sub_812FE0C -sub_812FE0C: @ 812FE0C - push {r4,r5,lr} - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 - ldr r4, =gUnknown_030061C4 - ldr r0, [r4] - bl Free - movs r5, 0 - str r5, [r4] - ldr r4, =gUnknown_03006190 - ldr r0, [r4] - bl Free - str r5, [r4] - ldr r0, =gUnknown_030011F7 - ldrb r0, [r0] - bl RemoveWindow - movs r0, 0x1 - bl GetBgTilemapBuffer - bl Free - bl FreeMonSpritesGfx - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_812FE0C - - thumb_func_start sub_812FE58 -sub_812FE58: @ 812FE58 - push {r4-r7,lr} - sub sp, 0x4 - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r0, r1, r2 - ldrb r0, [r0] - adds r4, r1, 0 - cmp r0, 0x4 - bls _0812FE6E - b _0812FFA0 -_0812FE6E: - lsls r0, 2 - ldr r1, =_0812FE80 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0812FE80: - .4byte _0812FE94 - .4byte _0812FEC8 - .4byte _0812FF14 - .4byte _0812FF2A - .4byte _0812FF54 -_0812FE94: - bl ScanlineEffect_Stop - movs r0, 0 - bl SetVBlankCallback - bl AllocateMonSpritesGfx - ldr r1, =gUnknown_030061C0 - ldr r0, =gUnknown_02039F3C - str r0, [r1] - movs r0, 0x1 - bl sub_8130238 - bl sub_81301EC - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _0812FF3E - .pool -_0812FEC8: - bl ResetPaletteFade - movs r2, 0xC0 - lsls r2, 19 - movs r3, 0xC0 - lsls r3, 9 - movs r5, 0 - ldr r1, =0x040000d4 - movs r4, 0x80 - lsls r4, 5 - ldr r6, =0x85000400 - movs r7, 0x85 - lsls r7, 24 -_0812FEE2: - str r5, [sp] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - str r6, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r2, r4 - subs r3, r4 - cmp r3, r4 - bhi _0812FEE2 - str r5, [sp] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - lsrs r0, r3, 2 - orrs r0, r7 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - bl ResetSpriteData - b _0812FF36 - .pool -_0812FF14: - ldrh r0, [r4, 0x20] - bl SeedRng - bl InitKeys - bl sub_8130098 - movs r0, 0x87 - lsls r0, 3 - adds r1, r4, r0 - b _0812FF3E -_0812FF2A: - ldr r0, =gUnknown_02039F5D - ldrb r0, [r0] - ldr r1, =gUnknown_02039F5C - ldrb r1, [r1] - bl sub_8130884 -_0812FF36: - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 -_0812FF3E: - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _0812FFA0 - .pool -_0812FF54: - ldr r0, =gUnknown_02039F5D - ldrb r0, [r0] - ldr r1, =gUnknown_02039F5C - ldrb r1, [r1] - bl sub_813010C - ldr r0, =gUnknown_085B0838 - movs r1, 0 - movs r2, 0x2 - bl LoadPalette - movs r1, 0xA0 - lsls r1, 19 - movs r4, 0 - str r4, [sp] - ldr r0, =0x040000d4 - mov r2, sp - str r2, [r0] - str r1, [r0, 0x4] - ldr r1, =0x85000100 - str r1, [r0, 0x8] - ldr r0, [r0, 0x8] - movs r0, 0x2 - bl BeginFastPaletteFade - ldr r0, =sub_81302D0 - bl SetVBlankCallback - ldr r0, =gUnknown_030011F0 - strb r4, [r0] - movs r1, 0x9A - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - ldr r0, =sub_812FDF8 - bl SetMainCallback2 -_0812FFA0: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_812FE58 - - thumb_func_start sub_812FFC8 -sub_812FFC8: @ 812FFC8 - push {lr} - sub sp, 0x4 - ldr r3, =gUnknown_030011F0 - ldrb r1, [r3] - cmp r1, 0x1 - beq _0813001C - cmp r1, 0x1 - bgt _0812FFE4 - cmp r1, 0 - beq _0812FFEA - b _08130082 - .pool -_0812FFE4: - cmp r1, 0x2 - beq _0813005C - b _08130082 -_0812FFEA: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0812FFFA - movs r0, 0x1 - strb r0, [r3] -_0812FFFA: - ldr r0, =gUnknown_030011F6 - ldrb r0, [r0] - cmp r0, 0 - beq _08130082 - ldr r1, =gUnknown_030011F4 - ldrh r0, [r1] - cmp r0, 0 - beq _08130082 - subs r0, 0x1 - b _08130080 - .pool -_0813001C: - ldr r0, =gMain - ldrh r2, [r0, 0x2E] - ands r1, r2 - cmp r1, 0 - bne _0813002E - movs r0, 0x2 - ands r0, r2 - cmp r0, 0 - beq _08130040 -_0813002E: - movs r0, 0x2 - strb r0, [r3] - subs r0, 0x3 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade -_08130040: - ldr r0, =gUnknown_030011F6 - ldrb r0, [r0] - cmp r0, 0 - beq _08130082 - ldr r1, =gUnknown_030011F4 - movs r0, 0 - b _08130080 - .pool -_0813005C: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0813006E - ldr r0, =sub_812FE0C - bl SetMainCallback2 -_0813006E: - ldr r0, =gUnknown_030011F6 - ldrb r0, [r0] - cmp r0, 0 - beq _08130082 - ldr r1, =gUnknown_030011F4 - ldrh r0, [r1] - cmp r0, 0x1D - bhi _08130082 - adds r0, 0x1 -_08130080: - strh r0, [r1] -_08130082: - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_812FFC8 - - thumb_func_start sub_8130098 -sub_8130098: @ 8130098 - push {r4,lr} - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_085B07E8 - movs r0, 0 - movs r2, 0x1 - bl InitBgsFromTemplates - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x80 - lsls r0, 4 - bl AllocZeroed - adds r1, r0, 0 - movs r0, 0x1 - bl SetBgTilemapBuffer - ldr r4, =gUnknown_030011F7 - ldr r0, =gUnknown_085B07EC - bl AddWindow - strb r0, [r4] - bl DeactivateAllTextPrinters - ldrb r0, [r4] - movs r1, 0 - bl FillWindowPixelBuffer - ldrb r0, [r4] - bl PutWindowTilemap - ldrb r0, [r4] - movs r1, 0x3 - bl CopyWindowToVram - movs r0, 0x1 - bl ShowBg - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8130098 - - thumb_func_start sub_813010C -sub_813010C: @ 813010C - push {r4-r6,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - cmp r1, 0x1 - beq _081301D4 - ldr r6, =gUnknown_030061C0 - ldr r1, [r6] - ldrb r5, [r1, 0xA] - cmp r0, 0x7 - bhi _08130190 - ldr r4, =gStringVar1 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_818E868 - ldr r1, =gText_Space - adds r0, r4, 0 - bl StringAppend - ldr r1, =gContestRankTextPointers - ldr r0, [r6] - ldrb r0, [r0, 0x1E] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl StringAppend - ldr r4, =gStringVar2 - ldr r1, [r6] - adds r1, 0x16 - adds r0, r4, 0 - bl StringCopy - adds r0, r4, 0 - bl sub_81DB5AC - ldr r0, =gStringVar3 - ldr r1, [r6] - adds r1, 0xB - bl StringCopy - ldr r0, =gStringVar4 - ldr r1, =gUnknown_0827EA0C - bl StringExpandPlaceholders - b _081301A6 - .pool -_08130190: - ldr r0, =gStringVar1 - adds r1, 0xB - bl StringCopy - ldr r0, =gStringVar4 - ldr r2, =gContestPaintingDescriptionPointers - lsls r1, r5, 2 - adds r1, r2 - ldr r1, [r1] - bl StringExpandPlaceholders -_081301A6: - ldr r4, =gStringVar4 - movs r0, 0x1 - adds r1, r4, 0 - movs r2, 0xD0 - bl GetStringCenterAlignXOffset - adds r3, r0, 0 - ldr r0, =gUnknown_030011F7 - ldrb r0, [r0] - lsls r3, 24 - lsrs r3, 24 - movs r1, 0x1 - str r1, [sp] - movs r1, 0 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x1 - adds r2, r4, 0 - bl AddTextPrinterParameterized - movs r0, 0x1 - bl CopyBgTilemapBufferToVram -_081301D4: - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813010C - - thumb_func_start sub_81301EC -sub_81301EC: @ 81301EC - push {lr} - movs r0, 0 - movs r1, 0 - bl SetGpuReg - ldr r2, =0x04000200 - ldrh r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r2] - ldr r1, =0x00000c42 - movs r0, 0x8 - bl SetGpuReg - ldr r1, =0x00000a45 - movs r0, 0xA - bl SetGpuReg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - pop {r0} - bx r0 - .pool - thumb_func_end sub_81301EC - - thumb_func_start sub_8130238 -sub_8130238: @ 8130238 - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _0813025C - ldr r0, =gUnknown_030011F6 - strb r1, [r0] - ldr r0, =gUnknown_030011F2 - strh r1, [r0] - ldr r0, =gUnknown_030011F4 - strh r1, [r0] - b _0813026E - .pool -_0813025C: - ldr r1, =gUnknown_030011F6 - movs r0, 0x1 - strb r0, [r1] - ldr r1, =gUnknown_030011F2 - movs r0, 0xF - strh r0, [r1] - ldr r1, =gUnknown_030011F4 - movs r0, 0x1E - strh r0, [r1] -_0813026E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8130238 - - thumb_func_start sub_8130280 -sub_8130280: @ 8130280 - push {lr} - ldr r0, =gUnknown_030011F6 - ldrb r0, [r0] - cmp r0, 0 - bne _08130298 - movs r0, 0x4C - movs r1, 0 - bl SetGpuReg - b _081302C0 - .pool -_08130298: - ldr r1, =0x00000a45 - movs r0, 0xA - bl SetGpuReg - ldr r1, =gUnknown_030011F2 - ldr r0, =gUnknown_030011F4 - ldrh r0, [r0] - lsrs r0, 1 - strh r0, [r1] - lsls r1, r0, 12 - lsls r2, r0, 8 - orrs r1, r2 - lsls r2, r0, 4 - orrs r1, r2 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x4C - bl SetGpuReg -_081302C0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8130280 - - thumb_func_start sub_81302D0 -sub_81302D0: @ 81302D0 - push {lr} - bl sub_8130280 - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_81302D0 - - thumb_func_start sub_81302E8 -sub_81302E8: @ 81302E8 - push {r4-r7,lr} - adds r4, r1, 0 - lsls r0, 16 - lsrs r5, r0, 16 - lsls r4, 24 - lsrs r4, 24 - ldr r6, =gUnknown_030061C0 - ldr r0, [r6] - ldr r1, [r0, 0x4] - ldr r2, [r0] - adds r0, r5, 0 - bl GetFrontSpritePalFromSpeciesAndPersonality - ldr r7, =gUnknown_030061C4 - ldr r1, [r7] - bl LZDecompressVram - cmp r4, 0 - bne _08130348 - lsls r0, r5, 3 - ldr r1, =gMonFrontPicTable - adds r0, r1 - ldr r4, =gMonSpritesGfxPtr - ldr r1, [r4] - ldr r1, [r1, 0x8] - ldr r2, [r6] - ldr r3, [r2] - adds r2, r5, 0 - bl HandleLoadSpecialPokePic_DontHandleDeoxys - ldr r0, [r4] - ldr r0, [r0, 0x8] - ldr r1, [r7] - ldr r2, =gUnknown_03006190 - ldr r2, [r2] - bl sub_8130380 - b _0813036C - .pool -_08130348: - lsls r0, r5, 3 - ldr r1, =gMonBackPicTable - adds r0, r1 - ldr r4, =gMonSpritesGfxPtr - ldr r1, [r4] - ldr r1, [r1, 0x4] - ldr r2, [r6] - ldr r3, [r2] - adds r2, r5, 0 - bl HandleLoadSpecialPokePic_DontHandleDeoxys - ldr r0, [r4] - ldr r0, [r0, 0x4] - ldr r1, [r7] - ldr r2, =gUnknown_03006190 - ldr r2, [r2] - bl sub_8130380 -_0813036C: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81302E8 - - thumb_func_start sub_8130380 -sub_8130380: @ 8130380 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - mov r10, r0 - mov r9, r1 - str r2, [sp] - movs r0, 0 -_08130394: - movs r3, 0 - adds r1, r0, 0x1 - str r1, [sp, 0x4] - lsls r0, 3 - str r0, [sp, 0x8] -_0813039E: - movs r1, 0 - adds r2, r3, 0x1 - mov r8, r2 - ldr r7, [sp, 0x8] - adds r0, r7, r3 - lsls r0, 5 - mov r12, r0 - lsls r4, r3, 3 -_081303AE: - movs r3, 0 - lsls r0, r1, 2 - adds r6, r1, 0x1 - mov r2, r12 - adds r5, r2, r0 - ldr r7, [sp, 0x8] - adds r0, r7, r1 - lsls r0, 7 - ldr r1, [sp] - adds r2, r0, r1 -_081303C2: - lsrs r0, r3, 1 - adds r0, r5, r0 - add r0, r10 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r3 - cmp r0, 0 - beq _081303D6 - lsrs r1, 4 - b _081303DA -_081303D6: - movs r0, 0xF - ands r1, r0 -_081303DA: - cmp r1, 0 - bne _081303EC - adds r0, r4, r3 - lsls r0, 1 - adds r0, r2 - movs r7, 0x80 - lsls r7, 8 - adds r1, r7, 0 - b _081303F8 -_081303EC: - adds r0, r4, r3 - lsls r0, 1 - adds r0, r2 - lsls r1, 1 - add r1, r9 - ldrh r1, [r1] -_081303F8: - strh r1, [r0] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x7 - bls _081303C2 - lsls r0, r6, 16 - lsrs r1, r0, 16 - cmp r1, 0x7 - bls _081303AE - mov r1, r8 - lsls r0, r1, 16 - lsrs r3, r0, 16 - cmp r3, 0x7 - bls _0813039E - ldr r2, [sp, 0x4] - lsls r0, r2, 16 - lsrs r0, 16 - cmp r0, 0x7 - bls _08130394 - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8130380 - - thumb_func_start sub_8130430 -sub_8130430: @ 8130430 - push {r4-r7,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gUnknown_085A989C - movs r2, 0x80 - lsls r2, 1 - movs r1, 0 - bl LoadPalette - cmp r4, 0x1 - beq _0813044E - b _081305A4 -_0813044E: - ldr r0, =gUnknown_030061C0 - ldr r0, [r0] - ldrb r0, [r0, 0xA] - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _0813050C - lsls r0, 2 - ldr r1, =_08130478 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08130478: - .4byte _0813048C - .4byte _081304A4 - .4byte _081304BC - .4byte _081304D4 - .4byte _081304F8 -_0813048C: - ldr r0, =gUnknown_085A9A9C - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AE974 - b _081304E0 - .pool -_081304A4: - ldr r0, =gUnknown_085AAB20 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AEE80 - b _081304E0 - .pool -_081304BC: - ldr r0, =gUnknown_085AB750 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AF38C - b _081304E0 - .pool -_081304D4: - ldr r0, =gUnknown_085AC288 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AF898 -_081304E0: - ldr r1, =gUnknown_03006190 - ldr r1, [r1] - bl RLUnCompWram - b _0813050C - .pool -_081304F8: - ldr r0, =gUnknown_085AD240 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AFDA4 - ldr r1, =gUnknown_03006190 - ldr r1, [r1] - bl RLUnCompWram -_0813050C: - movs r1, 0 - ldr r5, =0x06006000 - ldr r0, =0x00001015 - adds r4, r0, 0 -_08130514: - movs r3, 0 - lsls r2, r1, 5 -_08130518: - adds r0, r2, r3 - lsls r0, 1 - adds r0, r5 - strh r4, [r0] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x1F - bls _08130518 - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x13 - bls _08130514 - movs r1, 0 - ldr r0, =0x0600608c - mov r12, r0 - ldr r7, =gUnknown_03006190 -_0813053C: - movs r3, 0 - adds r6, r1, 0x1 - lsls r5, r1, 5 - lsls r4, r1, 6 -_08130544: - adds r2, r5, r3 - lsls r2, 1 - add r2, r12 - ldr r0, [r7] - adds r0, r4, r0 - lsls r1, r3, 1 - adds r0, r1 - adds r0, 0x8C - ldrh r0, [r0] - strh r0, [r2] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x11 - bls _08130544 - lsls r0, r6, 24 - lsrs r1, r0, 24 - cmp r1, 0x9 - bls _0813053C - movs r3, 0 - ldr r4, =0x0600608e - ldr r2, =gUnknown_03006190 -_08130570: - lsls r1, r3, 1 - adds r1, r4 - ldr r0, [r2] - adds r0, 0x8E - ldrh r0, [r0] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0xF - bls _08130570 - b _08130676 - .pool -_081305A4: - cmp r5, 0x7 - bhi _081305C0 - ldr r0, =gUnknown_085AE370 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085B02B0 - b _08130650 - .pool -_081305C0: - ldr r0, =gUnknown_030061C0 - ldr r0, [r0] - ldrb r0, [r0, 0xA] - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bhi _08130676 - lsls r0, 2 - ldr r1, =_081305E8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081305E8: - .4byte _081305FC - .4byte _08130614 - .4byte _0813062C - .4byte _08130644 - .4byte _08130664 -_081305FC: - ldr r0, =gUnknown_085A9A9C - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AE974 - b _08130650 - .pool -_08130614: - ldr r0, =gUnknown_085AAB20 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AEE80 - b _08130650 - .pool -_0813062C: - ldr r0, =gUnknown_085AB750 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AF38C - b _08130650 - .pool -_08130644: - ldr r0, =gUnknown_085AC288 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AF898 -_08130650: - ldr r1, =0x06006000 - bl RLUnCompVram - b _08130676 - .pool -_08130664: - ldr r0, =gUnknown_085AD240 - movs r1, 0xC0 - lsls r1, 19 - bl RLUnCompVram - ldr r0, =gUnknown_085AFDA4 - ldr r1, =0x06006000 - bl RLUnCompVram -_08130676: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8130430 - - thumb_func_start sub_8130688 -sub_8130688: @ 8130688 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, =gMain - ldr r1, =gUnknown_085B0830 - ldr r2, [r1, 0x4] - ldr r1, [r1] - str r1, [r3, 0x38] - str r2, [r3, 0x3C] - ldrh r2, [r3, 0x3C] - ldr r1, =0xfffffc00 - ands r1, r2 - strh r1, [r3, 0x3C] - ldrh r1, [r3, 0x3A] - ldr r0, =0xfffffe00 - ands r0, r1 - movs r1, 0x58 - orrs r0, r1 - strh r0, [r3, 0x3A] - adds r1, r3, 0 - adds r1, 0x38 - movs r0, 0x18 - strb r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8130688 - - thumb_func_start sub_81306CC -sub_81306CC: @ 81306CC - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x7 - bhi _081306E4 - ldr r0, =gUnknown_030061C0 - ldr r0, [r0] - ldrb r0, [r0, 0xA] - b _081306F4 - .pool -_081306E4: - ldr r0, =gUnknown_030061C0 - ldr r0, [r0] - ldrb r0, [r0, 0xA] - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 -_081306F4: - cmp r0, 0x4 - bhi _08130732 - lsls r0, 2 - ldr r1, =_0813070C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813070C: - .4byte _08130720 - .4byte _08130724 - .4byte _08130728 - .4byte _0813072C - .4byte _08130730 -_08130720: - movs r0, 0x9 - b _08130732 -_08130724: - movs r0, 0xD - b _08130732 -_08130728: - movs r0, 0x2 - b _08130732 -_0813072C: - movs r0, 0x24 - b _08130732 -_08130730: - movs r0, 0x6 -_08130732: - pop {r1} - bx r1 - thumb_func_end sub_81306CC - - thumb_func_start sub_8130738 -sub_8130738: @ 8130738 - push {r4,lr} - ldr r4, =gUnknown_030061C4 - movs r0, 0x80 - lsls r0, 2 - bl AllocZeroed - str r0, [r4] - ldr r4, =gUnknown_03006190 - movs r0, 0x80 - lsls r0, 6 - bl AllocZeroed - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8130738 - - thumb_func_start sub_8130760 -sub_8130760: @ 8130760 - push {r4,lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r1, =gUnknown_030061A0 - ldr r0, =gUnknown_03006190 - ldr r0, [r0] - str r0, [r1, 0x4] - ldr r0, =gUnknown_030061C4 - ldr r0, [r0] - str r0, [r1, 0x8] - movs r2, 0 - strb r2, [r1, 0x18] - ldr r0, =gUnknown_030061C0 - ldr r0, [r0] - ldrb r0, [r0] - strb r0, [r1, 0x1F] - strb r2, [r1, 0x19] - strb r2, [r1, 0x1A] - movs r0, 0x40 - strb r0, [r1, 0x1B] - strb r0, [r1, 0x1C] - strb r0, [r1, 0x1D] - strb r0, [r1, 0x1E] - subs r0, r3, 0x2 - adds r4, r1, 0 - cmp r0, 0x22 - bhi _08130844 - lsls r0, 2 - ldr r1, =_081307B4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081307B4: - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130840 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130844 - .4byte _08130840 -_08130840: - movs r0, 0x3 - b _08130846 -_08130844: - movs r0, 0x1 -_08130846: - strh r0, [r4, 0x14] - movs r0, 0x2 - strh r0, [r4, 0x16] - strb r3, [r4] - ldr r0, =0x06010000 - str r0, [r4, 0x10] - adds r0, r4, 0 - bl sub_8124F2C - adds r0, r4, 0 - bl sub_81261A4 - adds r0, r4, 0 - bl sub_8126058 - ldr r0, =gUnknown_030061C4 - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 1 - movs r2, 0x80 - lsls r2, 2 - bl LoadPalette - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8130760 - - thumb_func_start sub_8130884 -sub_8130884: @ 8130884 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - bl sub_8130738 - ldr r0, =gUnknown_030061C0 - ldr r0, [r0] - ldrh r0, [r0, 0x8] - movs r1, 0 - bl sub_81302E8 - adds r0, r4, 0 - bl sub_81306CC - lsls r0, 24 - lsrs r0, 24 - bl sub_8130760 - adds r0, r4, 0 - bl sub_8130688 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8130430 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8130884 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/contest_painting_effects.s b/asm/contest_painting_effects.s new file mode 100644 index 000000000..36ef184b9 --- /dev/null +++ b/asm/contest_painting_effects.s @@ -0,0 +1,3331 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_8124F2C +sub_8124F2C: @ 8124F2C + push {lr} + ldr r2, =gUnknown_03006168 + ldr r1, [r0, 0x4] + str r1, [r2] + ldr r2, =gUnknown_0300617C + ldrb r1, [r0, 0x1F] + strb r1, [r2] + ldr r2, =gUnknown_03006164 + ldrb r1, [r0, 0x19] + strb r1, [r2] + ldr r2, =gUnknown_03006178 + ldrb r1, [r0, 0x1A] + strb r1, [r2] + ldr r2, =gUnknown_03006174 + ldrb r1, [r0, 0x1B] + strb r1, [r2] + ldr r2, =gUnknown_0300616C + ldrb r1, [r0, 0x1C] + strb r1, [r2] + ldr r2, =gUnknown_03006180 + ldrb r1, [r0, 0x1D] + strb r1, [r2] + ldr r2, =gUnknown_03006170 + ldrb r1, [r0, 0x1E] + strb r1, [r2] + ldrb r0, [r0] + subs r0, 0x2 + cmp r0, 0x22 + bls _08124F68 + b _081250B4 +_08124F68: + lsls r0, 2 + ldr r1, =_08124F98 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_08124F98: + .4byte _08125024 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _08125084 + .4byte _081250B4 + .4byte _0812502A + .4byte _08125030 + .4byte _08125044 + .4byte _08125056 + .4byte _081250B4 + .4byte _0812506C + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _081250B4 + .4byte _08125072 + .4byte _08125050 + .4byte _08125078 + .4byte _0812507E + .4byte _081250B4 + .4byte _081250B4 + .4byte _08125090 +_08125024: + bl sub_8125230 + b _081250B4 +_0812502A: + bl sub_81252E8 + b _081250B4 +_08125030: + bl sub_81254E0 + ldr r0, =gUnknown_0300617C + ldrb r0, [r0] + bl sub_81253A4 + b _081250B4 + .pool +_08125044: + bl sub_81254E0 + bl sub_8125630 + bl sub_8125448 +_08125050: + bl sub_8125630 + b _081250B4 +_08125056: + bl sub_81254E0 + bl sub_81257F8 + bl sub_81257F8 + bl sub_81258A0 + bl sub_8125448 + b _081250B4 +_0812506C: + bl sub_81256C8 + b _081250B4 +_08125072: + bl sub_81254E0 + b _081250B4 +_08125078: + bl sub_81257F8 + b _081250B4 +_0812507E: + bl sub_81258A0 + b _081250B4 +_08125084: + bl sub_8125250 + movs r0, 0x3 + bl sub_81250B8 + b _081250B4 +_08125090: + bl sub_81254E0 + bl sub_81257F8 + bl sub_81258A0 + bl sub_8125448 + bl sub_81252E8 + bl sub_81252E8 + movs r0, 0x2 + bl sub_81250B8 + movs r0, 0x4 + bl sub_8125170 +_081250B4: + pop {r0} + bx r0 + thumb_func_end sub_8124F2C + + thumb_func_start sub_81250B8 +sub_81250B8: @ 81250B8 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + lsls r0, 24 + lsrs r7, r0, 24 + movs r2, 0 + ldr r0, =gUnknown_0300616C + mov r8, r0 + ldrb r0, [r0] + cmp r2, r0 + bcs _0812514A + ldr r1, =gUnknown_03006174 + mov r12, r1 + ldr r3, =gUnknown_03006180 + mov r10, r3 + ldr r0, =gUnknown_03006164 + mov r9, r0 +_081250DE: + ldr r1, =gUnknown_03006178 + ldrb r0, [r1] + adds r0, r2 + mov r3, r10 + ldrb r1, [r3] + muls r0, r1 + lsls r0, 1 + ldr r3, =gUnknown_03006168 + ldr r1, [r3] + adds r1, r0 + mov r3, r9 + ldrb r0, [r3] + lsls r0, 1 + adds r3, r1, r0 + movs r4, 0 + adds r5, r2, 0x1 + mov r0, r12 + ldrb r0, [r0] + cmp r4, r0 + bcs _0812513E + movs r6, 0x80 + lsls r6, 8 +_0812510A: + ldrh r1, [r3] + adds r0, r6, 0 + ands r0, r1 + cmp r0, 0 + bne _0812512E + movs r0, 0x1F + ands r0, r1 + adds r0, r7 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x1F + bls _08125124 + movs r2, 0x1F +_08125124: + lsls r0, r2, 10 + lsls r1, r2, 5 + orrs r0, r1 + orrs r0, r2 + strh r0, [r3] +_0812512E: + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + adds r3, 0x2 + mov r1, r12 + ldrb r1, [r1] + cmp r4, r1 + bcc _0812510A +_0812513E: + lsls r0, r5, 24 + lsrs r2, r0, 24 + mov r3, r8 + ldrb r3, [r3] + cmp r2, r3 + bcc _081250DE +_0812514A: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81250B8 + + thumb_func_start sub_8125170 +sub_8125170: @ 8125170 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _08125208 + ldr r1, =gUnknown_03006174 + mov r10, r1 +_0812518E: + ldr r3, =gUnknown_03006178 + ldrb r0, [r3] + adds r0, r2 + ldr r3, =gUnknown_03006180 + ldrb r1, [r3] + muls r0, r1 + lsls r0, 1 + ldr r3, =gUnknown_03006168 + ldr r1, [r3] + adds r1, r0 + ldr r3, =gUnknown_03006164 + ldrb r0, [r3] + lsls r0, 1 + adds r3, r1, r0 + movs r5, 0 + adds r7, r2, 0x1 + mov r0, r10 + ldrb r0, [r0] + cmp r5, r0 + bcs _081251FC + movs r1, 0x80 + lsls r1, 8 + mov r9, r1 + movs r0, 0x1F + mov r12, r0 + mov r1, r8 + subs r6, r0, r1 +_081251C4: + ldrh r1, [r3] + mov r0, r9 + ands r0, r1 + cmp r0, 0 + bne _081251EC + movs r4, 0x1F + mov r2, r12 + ands r2, r1 + cmp r2, r6 + ble _081251E2 + mov r1, r8 + lsrs r0, r1, 1 + subs r0, r4, r0 + lsls r0, 24 + lsrs r2, r0, 24 +_081251E2: + lsls r0, r2, 10 + lsls r1, r2, 5 + orrs r0, r1 + orrs r0, r2 + strh r0, [r3] +_081251EC: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r3, 0x2 + mov r0, r10 + ldrb r0, [r0] + cmp r5, r0 + bcc _081251C4 +_081251FC: + lsls r0, r7, 24 + lsrs r2, r0, 24 + ldr r1, =gUnknown_0300616C + ldrb r1, [r1] + cmp r2, r1 + bcc _0812518E +_08125208: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8125170 + + thumb_func_start sub_8125230 +sub_8125230: @ 8125230 + push {r4,r5,lr} + movs r4, 0 + ldr r5, =0x00000c7f +_08125236: + lsls r0, r4, 16 + lsrs r0, 16 + bl sub_8125954 + adds r4, 0x1 + cmp r4, r5 + bls _08125236 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8125230 + + thumb_func_start sub_8125250 +sub_8125250: @ 8125250 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x4 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _081252C2 + ldr r0, =gUnknown_03006168 + mov r8, r0 + ldr r3, =gUnknown_03006174 +_08125268: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r4, r8 + ldr r1, [r4] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r5, 0 + adds r6, r2, 0x1 + ldrb r0, [r3] + cmp r5, r0 + bcs _081252B6 + movs r0, 0x80 + lsls r0, 8 + adds r7, r0, 0 +_08125294: + ldrh r0, [r4] + ands r0, r7 + cmp r0, 0 + bne _081252A8 + adds r0, r4, 0 + str r3, [sp] + bl sub_8125B28 + strh r0, [r4] + ldr r3, [sp] +_081252A8: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r4, 0x2 + ldrb r0, [r3] + cmp r5, r0 + bcc _08125294 +_081252B6: + lsls r0, r6, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _08125268 +_081252C2: + add sp, 0x4 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8125250 + + thumb_func_start sub_81252E8 +sub_81252E8: @ 81252E8 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x8 + movs r2, 0 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r2, r0 + bcs _0812537E + ldr r0, =gUnknown_03006168 + mov r8, r0 + ldr r3, =gUnknown_03006180 +_08125300: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + ldrb r0, [r3] + muls r0, r1 + lsls r0, 1 + mov r4, r8 + ldr r1, [r4] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + adds r0, r2 + lsls r0, 1 + adds r4, r1, r0 + ldrh r1, [r4] + mov r0, sp + strh r1, [r0] + movs r5, 0x1 + ldrb r0, [r3] + lsls r0, 1 + adds r4, r0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + subs r0, 0x1 + adds r7, r2, 0x1 + cmp r5, r0 + bge _08125372 + ldr r6, =gUnknown_03006180 +_08125336: + ldrh r0, [r4] + movs r2, 0x80 + lsls r2, 8 + adds r1, r2, 0 + ands r0, r1 + cmp r0, 0 + bne _0812535C + ldrb r2, [r6] + lsls r2, 1 + adds r2, r4, r2 + mov r0, sp + adds r1, r4, 0 + str r3, [sp, 0x4] + bl sub_8125E18 + strh r0, [r4] + mov r1, sp + strh r0, [r1] + ldr r3, [sp, 0x4] +_0812535C: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + ldrb r0, [r6] + lsls r0, 1 + adds r4, r0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + subs r0, 0x1 + cmp r5, r0 + blt _08125336 +_08125372: + lsls r0, r7, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r2, r0 + bcc _08125300 +_0812537E: + add sp, 0x8 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81252E8 + + thumb_func_start sub_81253A4 +sub_81253A4: @ 81253A4 + push {r4-r7,lr} + mov r7, r9 + mov r6, r8 + push {r6,r7} + sub sp, 0x4 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _08125420 + ldr r0, =gUnknown_03006168 + mov r9, r0 + ldr r3, =gUnknown_03006174 +_081253C4: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r4, r9 + ldr r1, [r4] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r5, 0 + adds r6, r2, 0x1 + ldrb r0, [r3] + cmp r5, r0 + bcs _08125414 + movs r0, 0x80 + lsls r0, 8 + adds r7, r0, 0 +_081253F0: + ldrh r0, [r4] + ands r0, r7 + cmp r0, 0 + bne _08125406 + adds r0, r4, 0 + mov r1, r8 + str r3, [sp] + bl sub_8125B5C + strh r0, [r4] + ldr r3, [sp] +_08125406: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r4, 0x2 + ldrb r0, [r3] + cmp r5, r0 + bcc _081253F0 +_08125414: + lsls r0, r6, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _081253C4 +_08125420: + add sp, 0x4 + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81253A4 + + thumb_func_start sub_8125448 +sub_8125448: @ 8125448 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x4 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _081254BA + ldr r0, =gUnknown_03006168 + mov r8, r0 + ldr r3, =gUnknown_03006174 +_08125460: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r4, r8 + ldr r1, [r4] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r5, 0 + adds r6, r2, 0x1 + ldrb r0, [r3] + cmp r5, r0 + bcs _081254AE + movs r0, 0x80 + lsls r0, 8 + adds r7, r0, 0 +_0812548C: + ldrh r0, [r4] + ands r0, r7 + cmp r0, 0 + bne _081254A0 + adds r0, r4, 0 + str r3, [sp] + bl sub_8125C68 + strh r0, [r4] + ldr r3, [sp] +_081254A0: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r4, 0x2 + ldrb r0, [r3] + cmp r5, r0 + bcc _0812548C +_081254AE: + lsls r0, r6, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _08125460 +_081254BA: + add sp, 0x4 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8125448 + + thumb_func_start sub_81254E0 +sub_81254E0: @ 81254E0 + push {r4-r7,lr} + mov r7, r9 + mov r6, r8 + push {r6,r7} + movs r7, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r7, r0 + bcs _0812556C + ldr r0, =gUnknown_03006168 + mov r8, r0 +_081254F6: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r7 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r2, r8 + ldr r1, [r2] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r5, r1, r0 + adds r4, r5, 0x2 + adds r0, r5, 0 + adds r1, r4, 0 + bl sub_8125C98 + strh r0, [r5] + movs r6, 0x1 + adds r5, r4, 0 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + subs r0, 0x1 + adds r7, 0x1 + cmp r6, r0 + bge _08125556 +_0812552E: + adds r4, r5, 0x2 + adds r0, r5, 0 + adds r1, r4, 0 + bl sub_8125C98 + strh r0, [r5] + subs r1, r5, 0x2 + adds r0, r5, 0 + bl sub_8125C98 + strh r0, [r5] + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 + adds r5, r4, 0 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + subs r0, 0x1 + cmp r6, r0 + blt _0812552E +_08125556: + subs r1, r5, 0x2 + adds r0, r5, 0 + bl sub_8125C98 + strh r0, [r5] + lsls r0, r7, 24 + lsrs r7, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r7, r0 + bcc _081254F6 +_0812556C: + movs r6, 0 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r6, r0 + bcs _0812560C + ldr r3, =gUnknown_03006168 + mov r9, r3 + ldr r0, =gUnknown_03006180 + mov r8, r0 +_0812557E: + ldr r0, =gUnknown_03006178 + ldrb r0, [r0] + mov r2, r8 + ldrb r1, [r2] + muls r0, r1 + lsls r0, 1 + mov r3, r9 + ldr r2, [r3] + adds r2, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + adds r0, r6 + lsls r0, 1 + adds r5, r2, r0 + lsls r1, 1 + adds r1, r5, r1 + adds r0, r5, 0 + bl sub_8125C98 + strh r0, [r5] + movs r7, 0x1 + mov r1, r8 + ldrb r0, [r1] + lsls r0, 1 + adds r5, r0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + subs r0, 0x1 + adds r6, 0x1 + cmp r7, r0 + bge _081255F0 + ldr r4, =gUnknown_03006180 +_081255BE: + ldrb r1, [r4] + lsls r1, 1 + adds r1, r5, r1 + adds r0, r5, 0 + bl sub_8125C98 + strh r0, [r5] + ldrb r1, [r4] + lsls r1, 1 + subs r1, r5, r1 + adds r0, r5, 0 + bl sub_8125C98 + strh r0, [r5] + adds r0, r7, 0x1 + lsls r0, 24 + lsrs r7, r0, 24 + ldrb r0, [r4] + lsls r0, 1 + adds r5, r0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + subs r0, 0x1 + cmp r7, r0 + blt _081255BE +_081255F0: + mov r2, r8 + ldrb r1, [r2] + lsls r1, 1 + subs r1, r5, r1 + adds r0, r5, 0 + bl sub_8125C98 + strh r0, [r5] + lsls r0, r6, 24 + lsrs r6, r0, 24 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r6, r0 + bcc _0812557E +_0812560C: + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81254E0 + + thumb_func_start sub_8125630 +sub_8125630: @ 8125630 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x4 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _081256A2 + ldr r0, =gUnknown_03006168 + mov r8, r0 + ldr r3, =gUnknown_03006174 +_08125648: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r4, r8 + ldr r1, [r4] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r5, 0 + adds r6, r2, 0x1 + ldrb r0, [r3] + cmp r5, r0 + bcs _08125696 + movs r0, 0x80 + lsls r0, 8 + adds r7, r0, 0 +_08125674: + ldrh r0, [r4] + ands r0, r7 + cmp r0, 0 + bne _08125688 + adds r0, r4, 0 + str r3, [sp] + bl sub_8125CC8 + strh r0, [r4] + ldr r3, [sp] +_08125688: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r4, 0x2 + ldrb r0, [r3] + cmp r5, r0 + bcc _08125674 +_08125696: + lsls r0, r6, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _08125648 +_081256A2: + add sp, 0x4 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8125630 + + thumb_func_start sub_81256C8 +sub_81256C8: @ 81256C8 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x8 + ldr r0, =gUnknown_03006168 + ldr r4, [r0] + movs r6, 0 + movs r0, 0x80 + lsls r0, 8 + adds r5, r0, 0 +_081256E0: + movs r7, 0 +_081256E2: + ldrh r0, [r4] + ands r0, r5 + cmp r0, 0 + bne _081256F2 + adds r0, r4, 0 + bl sub_8125CC8 + strh r0, [r4] +_081256F2: + adds r0, r7, 0x1 + lsls r0, 24 + lsrs r7, r0, 24 + adds r4, 0x2 + cmp r7, 0x3F + bls _081256E2 + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 + cmp r6, 0x3F + bls _081256E0 + movs r7, 0 + ldr r1, =gUnknown_03006168 + mov r10, r1 + mov r3, sp + movs r2, 0x80 + lsls r2, 8 + mov r9, r2 +_08125716: + lsls r0, r7, 1 + mov r2, r10 + ldr r1, [r2] + adds r4, r1, r0 + ldrh r1, [r4] + strh r1, [r3] + mov r1, r9 + strh r1, [r4] + movs r6, 0x1 + adds r4, 0x80 + adds r5, r0, 0 +_0812572C: + ldrh r0, [r4] + movs r2, 0x80 + lsls r2, 8 + ands r0, r2 + cmp r0, 0 + bne _0812574C + adds r2, r4, 0 + adds r2, 0x80 + mov r0, sp + adds r1, r4, 0 + str r3, [sp, 0x4] + bl sub_8125F38 + strh r0, [r4] + ldr r3, [sp, 0x4] + strh r0, [r3] +_0812574C: + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 + adds r4, 0x80 + cmp r6, 0x3E + bls _0812572C + mov r0, r9 + strh r0, [r4] + mov r1, r10 + ldr r0, [r1] + adds r4, r0, r5 + ldrh r0, [r4] + strh r0, [r3] + mov r2, r9 + strh r2, [r4] + movs r6, 0x1 + adds r4, 0x80 + movs r0, 0x80 + lsls r0, 8 + mov r8, r0 +_08125774: + ldrh r0, [r4] + mov r1, r8 + ands r0, r1 + adds r5, r4, 0 + adds r5, 0x80 + cmp r0, 0 + bne _08125794 + mov r0, sp + adds r1, r4, 0 + adds r2, r5, 0 + str r3, [sp, 0x4] + bl sub_8125F38 + strh r0, [r4] + ldr r3, [sp, 0x4] + strh r0, [r3] +_08125794: + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 + adds r4, r5, 0 + cmp r6, 0x3E + bls _08125774 + mov r2, r9 + strh r2, [r4] + adds r0, r7, 0x1 + lsls r0, 24 + lsrs r7, r0, 24 + cmp r7, 0x3F + bls _08125716 + ldr r0, =gUnknown_03006168 + ldr r4, [r0] + movs r6, 0 + movs r0, 0x80 + lsls r0, 8 + mov r8, r0 +_081257BA: + movs r7, 0 + adds r5, r6, 0x1 +_081257BE: + ldrh r0, [r4] + mov r1, r8 + ands r0, r1 + cmp r0, 0 + bne _081257D0 + adds r0, r4, 0 + bl sub_8125CC8 + strh r0, [r4] +_081257D0: + adds r0, r7, 0x1 + lsls r0, 24 + lsrs r7, r0, 24 + adds r4, 0x2 + cmp r7, 0x3F + bls _081257BE + lsls r0, r5, 24 + lsrs r6, r0, 24 + cmp r6, 0x3F + bls _081257BA + add sp, 0x8 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81256C8 + + thumb_func_start sub_81257F8 +sub_81257F8: @ 81257F8 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x4 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _0812587A + ldr r0, =gUnknown_03006168 + mov r8, r0 +_0812580E: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r3, r8 + ldr r1, [r3] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + ldrh r1, [r4] + mov r0, sp + strh r1, [r0] + movs r5, 0x1 + adds r4, 0x2 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + subs r0, 0x1 + adds r6, r2, 0x1 + cmp r5, r0 + bge _0812586E + movs r0, 0x80 + lsls r0, 8 + adds r7, r0, 0 +_08125846: + ldrh r0, [r4] + ands r0, r7 + cmp r0, 0 + bne _0812585C + mov r0, sp + adds r1, r4, 0 + bl sub_8125CF4 + strh r0, [r4] + mov r1, sp + strh r0, [r1] +_0812585C: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r4, 0x2 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + subs r0, 0x1 + cmp r5, r0 + blt _08125846 +_0812586E: + lsls r0, r6, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _0812580E +_0812587A: + add sp, 0x4 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81257F8 + + thumb_func_start sub_81258A0 +sub_81258A0: @ 81258A0 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x8 + movs r2, 0 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r2, r0 + bcs _0812592E + ldr r0, =gUnknown_03006168 + mov r8, r0 + ldr r7, =gUnknown_03006180 +_081258B8: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + ldrb r0, [r7] + muls r0, r1 + lsls r0, 1 + mov r3, r8 + ldr r1, [r3] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + adds r0, r2 + lsls r0, 1 + adds r4, r1, r0 + ldrh r1, [r4] + mov r0, sp + strh r1, [r0] + movs r5, 0x1 + ldrb r0, [r7] + lsls r0, 1 + adds r4, r0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + subs r0, 0x1 + adds r6, r2, 0x1 + cmp r5, r0 + bge _08125922 + movs r0, 0x80 + lsls r0, 8 + adds r2, r0, 0 +_081258F2: + ldrh r0, [r4] + ands r0, r2 + cmp r0, 0 + bne _0812590C + mov r0, sp + adds r1, r4, 0 + str r2, [sp, 0x4] + bl sub_8125CF4 + strh r0, [r4] + mov r1, sp + strh r0, [r1] + ldr r2, [sp, 0x4] +_0812590C: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + ldrb r0, [r7] + lsls r0, 1 + adds r4, r0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + subs r0, 0x1 + cmp r5, r0 + blt _081258F2 +_08125922: + lsls r0, r6, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r2, r0 + bcc _081258B8 +_0812592E: + add sp, 0x8 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81258A0 + + thumb_func_start sub_8125954 +sub_8125954: @ 8125954 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x20 + lsls r0, 16 + lsrs r0, 16 + mov r10, r0 + mov r2, sp + ldr r3, =gUnknown_085A1F94 + lsls r1, r0, 1 + add r1, r10 + adds r0, r1, r3 + ldrb r0, [r0] + strb r0, [r2] + adds r0, r3, 0x1 + adds r0, r1, r0 + ldrb r0, [r0] + strb r0, [r2, 0x1] + mov r5, sp + adds r0, r3, 0x2 + adds r1, r0 + ldrb r4, [r1] + lsls r2, r4, 24 + lsrs r1, r2, 27 + movs r0, 0x7 + ands r1, r0 + strh r1, [r5, 0x2] + lsrs r2, 25 + mov r9, r2 + movs r0, 0x3 + ands r2, r0 + mov r9, r2 + movs r5, 0x1 + ands r5, r4 + movs r4, 0x1 + mov r8, r4 + cmp r8, r1 + bcs _08125A06 + mov r3, sp +_081259A6: + cmp r5, 0 + bne _081259C4 + mov r0, r8 + lsls r2, r0, 2 + mov r4, sp + adds r1, r4, r2 + ldrb r0, [r3] + mov r4, r8 + subs r0, r4 + strb r0, [r1] + ldrb r0, [r3, 0x1] + add r0, r8 + b _081259D6 + .pool +_081259C4: + mov r0, r8 + lsls r2, r0, 2 + mov r4, sp + adds r1, r4, r2 + ldrb r0, [r3] + adds r0, 0x1 + strb r0, [r1] + ldrb r0, [r3, 0x1] + subs r0, 0x1 +_081259D6: + strb r0, [r1, 0x1] + add r2, sp + ldrb r0, [r2] + cmp r0, 0x3F + bhi _081259E6 + ldrb r0, [r2, 0x1] + cmp r0, 0x3F + bls _081259EE +_081259E6: + mov r0, r8 + subs r0, 0x1 + strh r0, [r3, 0x2] + b _08125A06 +_081259EE: + ldrh r0, [r3, 0x2] + mov r1, r8 + subs r0, r1 + strh r0, [r2, 0x2] + mov r0, r8 + adds r0, 0x1 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + ldrh r0, [r3, 0x2] + cmp r8, r0 + bcc _081259A6 +_08125A06: + movs r2, 0 + mov r8, r2 + mov r0, sp + ldrh r0, [r0, 0x2] + cmp r8, r0 + bcc _08125A14 + b _08125B16 +_08125A14: + movs r3, 0x1F +_08125A16: + ldr r1, =gUnknown_03006168 + mov r4, r8 + lsls r0, r4, 2 + mov r2, sp + adds r6, r2, r0 + ldrb r0, [r6, 0x1] + lsls r0, 7 + ldr r1, [r1] + adds r1, r0 + ldrb r0, [r6] + lsls r0, 1 + adds r2, r1, r0 + ldrh r1, [r2] + movs r4, 0x80 + lsls r4, 8 + adds r0, r4, 0 + ands r0, r1 + cmp r0, 0 + bne _08125B02 + movs r7, 0x1F + ands r7, r1 + lsls r0, r1, 16 + lsrs r5, r0, 21 + ands r5, r3 + lsrs r4, r0, 26 + ands r4, r3 + mov r0, r9 + cmp r0, 0 + blt _08125AF8 + cmp r0, 0x1 + ble _08125A78 + cmp r0, 0x3 + bgt _08125AF8 + ldrh r0, [r6, 0x2] + adds r1, r7, r0 + lsls r1, 16 + lsrs r7, r1, 16 + adds r1, r5, r0 + lsls r1, 16 + lsrs r5, r1, 16 + adds r0, r4, r0 + lsls r0, 16 + lsrs r4, r0, 16 + cmp r7, 0x1F + bls _08125AEC + movs r7, 0x1F + b _08125AEC + .pool +_08125A78: + mov r1, r10 + lsls r0, r1, 1 + add r0, r10 + ldr r1, =gUnknown_085A1F94 + adds r1, 0x2 + adds r0, r1 + ldrb r0, [r0] + lsrs r0, 3 + movs r1, 0x7 + ands r0, r1 + movs r1, 0x3 + str r2, [sp, 0x18] + str r3, [sp, 0x1C] + bl __umodsi3 + lsls r0, 24 + lsrs r0, 24 + ldr r2, [sp, 0x18] + ldr r3, [sp, 0x1C] + cmp r0, 0x1 + beq _08125AC8 + cmp r0, 0x1 + bgt _08125AB0 + cmp r0, 0 + beq _08125AB6 + b _08125AF8 + .pool +_08125AB0: + cmp r0, 0x2 + beq _08125ADA + b _08125AF8 +_08125AB6: + ldrh r0, [r6, 0x2] + cmp r7, r0 + bcc _08125AC4 + subs r0, r7, r0 + lsls r0, 16 + lsrs r7, r0, 16 + b _08125AF8 +_08125AC4: + movs r7, 0 + b _08125AF8 +_08125AC8: + ldrh r0, [r6, 0x2] + cmp r5, r0 + bcc _08125AD6 + subs r0, r5, r0 + lsls r0, 16 + lsrs r5, r0, 16 + b _08125AF8 +_08125AD6: + movs r5, 0 + b _08125AF8 +_08125ADA: + ldrh r0, [r6, 0x2] + cmp r4, r0 + bcc _08125AE8 + subs r0, r4, r0 + lsls r0, 16 + lsrs r4, r0, 16 + b _08125AF8 +_08125AE8: + movs r4, 0 + b _08125AF8 +_08125AEC: + cmp r5, 0x1F + bls _08125AF2 + movs r5, 0x1F +_08125AF2: + cmp r4, 0x1F + bls _08125AF8 + movs r4, 0x1F +_08125AF8: + lsls r0, r4, 10 + lsls r1, r5, 5 + orrs r0, r1 + orrs r7, r0 + strh r7, [r2] +_08125B02: + mov r0, r8 + adds r0, 0x1 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + mov r0, sp + ldrh r0, [r0, 0x2] + cmp r8, r0 + bcs _08125B16 + b _08125A16 +_08125B16: + add sp, 0x20 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_8125954 + + thumb_func_start sub_8125B28 +sub_8125B28: @ 8125B28 + ldrh r2, [r0] + movs r0, 0x1F + adds r1, r2, 0 + ands r1, r0 + asrs r3, r2, 5 + ands r3, r0 + asrs r2, 10 + ands r2, r0 + movs r0, 0x4C + muls r1, r0 + movs r0, 0x97 + muls r0, r3 + adds r1, r0 + lsls r0, r2, 3 + subs r0, r2 + lsls r0, 2 + adds r0, r2 + adds r1, r0 + asrs r1, 8 + lsls r0, r1, 10 + lsls r2, r1, 5 + orrs r0, r2 + orrs r0, r1 + lsls r0, 16 + lsrs r0, 16 + bx lr + thumb_func_end sub_8125B28 + + thumb_func_start sub_8125B5C +sub_8125B5C: @ 8125B5C + push {r4,lr} + lsls r1, 24 + lsrs r4, r1, 24 + ldrh r0, [r0] + movs r2, 0x1F + movs r1, 0x1F + ands r1, r0 + lsls r0, 16 + lsrs r3, r0, 21 + ands r3, r2 + lsrs r0, 26 + ands r0, r2 + cmp r1, 0x10 + bhi _08125B8C + cmp r3, 0x10 + bhi _08125B8C + cmp r0, 0x10 + bhi _08125B8C + adds r0, r4, 0 + bl sub_8125B98 + lsls r0, 16 + lsrs r0, 16 + b _08125B8E +_08125B8C: + ldr r0, =0x00007fff +_08125B8E: + pop {r4} + pop {r1} + bx r1 + .pool + thumb_func_end sub_8125B5C + + thumb_func_start sub_8125B98 +sub_8125B98: @ 8125B98 + push {r4-r7,lr} + mov r7, r8 + push {r7} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + movs r0, 0 + mov r8, r0 + movs r6, 0 + movs r7, 0 + adds r0, r4, 0 + movs r1, 0x6 + bl __udivsi3 + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x3 + bl __umodsi3 + lsls r0, 24 + lsrs r5, r0, 24 + adds r0, r4, 0 + movs r1, 0x6 + bl __umodsi3 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x5 + bhi _08125C50 + lsls r0, 2 + ldr r1, =_08125BE0 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_08125BE0: + .4byte _08125BF8 + .4byte _08125C08 + .4byte _08125C18 + .4byte _08125C26 + .4byte _08125C34 + .4byte _08125C42 +_08125BF8: + movs r0, 0x15 + subs r0, r5 + lsls r0, 16 + lsrs r6, r0, 16 + adds r7, r6, 0 + movs r1, 0 + mov r8, r1 + b _08125C50 +_08125C08: + movs r7, 0 + movs r0, 0x15 + subs r0, r5 + lsls r0, 16 + lsrs r0, 16 + mov r8, r0 + mov r6, r8 + b _08125C50 +_08125C18: + movs r0, 0x15 + subs r0, r5 + lsls r0, 16 + lsrs r7, r0, 16 + movs r6, 0 + mov r8, r7 + b _08125C50 +_08125C26: + movs r7, 0 + movs r6, 0 + movs r0, 0x17 + subs r0, r5 + lsls r0, 16 + lsrs r0, 16 + b _08125C4E +_08125C34: + movs r0, 0x17 + subs r0, r5 + lsls r0, 16 + lsrs r7, r0, 16 + movs r6, 0 + mov r8, r6 + b _08125C50 +_08125C42: + movs r7, 0 + movs r0, 0x17 + subs r0, r5 + lsls r0, 16 + lsrs r6, r0, 16 + movs r0, 0 +_08125C4E: + mov r8, r0 +_08125C50: + lsls r0, r7, 10 + lsls r1, r6, 5 + orrs r0, r1 + mov r1, r8 + orrs r1, r0 + lsls r0, r1, 16 + lsrs r0, 16 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_8125B98 + + thumb_func_start sub_8125C68 +sub_8125C68: @ 8125C68 + push {lr} + ldrh r0, [r0] + movs r2, 0x1F + movs r1, 0x1F + ands r1, r0 + lsls r0, 16 + lsrs r3, r0, 21 + ands r3, r2 + lsrs r0, 26 + ands r0, r2 + cmp r1, 0x10 + bhi _08125C8C + cmp r3, 0x10 + bhi _08125C8C + cmp r0, 0x10 + bhi _08125C8C + movs r0, 0 + b _08125C8E +_08125C8C: + ldr r0, =0x00007fff +_08125C8E: + pop {r1} + bx r1 + .pool + thumb_func_end sub_8125C68 + + thumb_func_start sub_8125C98 +sub_8125C98: @ 8125C98 + push {r4,lr} + adds r4, r0, 0 + ldrh r3, [r4] + cmp r3, 0 + beq _08125CC0 + movs r2, 0x80 + lsls r2, 8 + adds r0, r2, 0 + ands r0, r3 + cmp r0, 0 + beq _08125CB2 + adds r0, r2, 0 + b _08125CC2 +_08125CB2: + ldrh r1, [r1] + adds r0, r2, 0 + ands r0, r1 + cmp r0, 0 + bne _08125CC0 + ldrh r0, [r4] + b _08125CC2 +_08125CC0: + movs r0, 0 +_08125CC2: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_8125C98 + + thumb_func_start sub_8125CC8 +sub_8125CC8: @ 8125CC8 + push {r4,lr} + ldrh r1, [r0] + movs r0, 0x1F + movs r3, 0x1F + ands r3, r1 + lsls r1, 16 + lsrs r2, r1, 21 + lsrs r1, 26 + subs r3, r0, r3 + adds r4, r0, 0 + bics r4, r2 + adds r2, r4, 0 + bics r0, r1 + lsls r0, 10 + lsls r2, 5 + orrs r0, r2 + orrs r0, r3 + lsls r0, 16 + lsrs r0, 16 + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_8125CC8 + + thumb_func_start sub_8125CF4 +sub_8125CF4: @ 8125CF4 + push {r4-r7,lr} + sub sp, 0x14 + adds r7, r1, 0 + ldrh r4, [r0] + ldrh r5, [r7] + lsls r6, r4, 16 + lsls r0, r5, 16 + mov r12, r0 + cmp r4, r5 + beq _08125D66 + mov r2, sp + movs r3, 0x1F + movs r1, 0x1F + adds r0, r1, 0 + ands r0, r4 + strh r0, [r2] + lsrs r0, r6, 21 + ands r0, r3 + strh r0, [r2, 0x2] + lsrs r0, r6, 26 + ands r0, r3 + strh r0, [r2, 0x4] + mov r0, sp + ands r1, r5 + strh r1, [r0, 0x6] + mov r1, sp + mov r2, r12 + lsrs r0, r2, 21 + ands r0, r3 + strh r0, [r1, 0x8] + lsrs r0, r2, 26 + ands r0, r3 + strh r0, [r1, 0xA] + mov r0, sp + ldrh r0, [r0] + cmp r0, 0x19 + bls _08125D4E + mov r0, sp + ldrh r0, [r0, 0x2] + cmp r0, 0x19 + bls _08125D4E + mov r0, sp + ldrh r0, [r0, 0x4] + cmp r0, 0x19 + bhi _08125D66 +_08125D4E: + mov r0, sp + ldrh r0, [r0, 0x6] + cmp r0, 0x19 + bls _08125D6A + mov r0, sp + ldrh r0, [r0, 0x8] + cmp r0, 0x19 + bls _08125D6A + mov r0, sp + ldrh r0, [r0, 0xA] + cmp r0, 0x19 + bls _08125D6A +_08125D66: + ldrh r0, [r7] + b _08125E10 +_08125D6A: + movs r4, 0 + add r6, sp, 0xC + mov r7, sp + adds r7, 0x6 + adds r5, r6, 0 +_08125D74: + lsls r2, r4, 1 + mov r1, sp + adds r0, r1, r2 + adds r1, r7, r2 + ldrh r3, [r0] + ldrh r0, [r1] + cmp r3, r0 + bls _08125D8A + adds r1, r5, r2 + subs r0, r3, r0 + b _08125D8E +_08125D8A: + adds r1, r5, r2 + subs r0, r3 +_08125D8E: + strh r0, [r1] + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x2 + bls _08125D74 + adds r1, r6, 0 + ldrh r0, [r1, 0x2] + ldrh r3, [r1] + cmp r3, r0 + bcc _08125DB4 + ldrh r2, [r1, 0x4] + cmp r3, r2 + bcc _08125DAE + adds r2, r3, 0 + b _08125DC8 +_08125DAE: + cmp r0, r2 + bcs _08125DBA + b _08125DC2 +_08125DB4: + ldrh r2, [r1, 0x4] + cmp r0, r2 + bcc _08125DBE +_08125DBA: + ldrh r2, [r1, 0x2] + b _08125DC8 +_08125DBE: + cmp r2, r3 + bcc _08125DC6 +_08125DC2: + ldrh r2, [r1, 0x4] + b _08125DC8 +_08125DC6: + ldrh r2, [r6] +_08125DC8: + mov r0, sp + ldrh r1, [r0, 0x6] + lsrs r0, r2, 1 + movs r6, 0x1F + subs r6, r0 + adds r0, r1, 0 + muls r0, r6 + movs r1, 0x1F + bl __divsi3 + adds r5, r0, 0 + lsls r5, 16 + lsrs r5, 16 + mov r0, sp + ldrh r0, [r0, 0x8] + muls r0, r6 + movs r1, 0x1F + bl __divsi3 + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + mov r0, sp + ldrh r0, [r0, 0xA] + muls r0, r6 + movs r1, 0x1F + bl __divsi3 + lsls r0, 16 + lsrs r0, 6 + lsls r4, 5 + orrs r0, r4 + orrs r5, r0 + lsls r5, 16 + lsrs r5, 16 + adds r0, r5, 0 +_08125E10: + add sp, 0x14 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_8125CF4 + + thumb_func_start sub_8125E18 +sub_8125E18: @ 8125E18 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x8 + adds r3, r0, 0 + mov r10, r1 + str r2, [sp] + ldrh r1, [r3] + mov r0, r10 + ldrh r0, [r0] + cmp r1, r0 + bne _08125E40 + ldrh r0, [r2] + cmp r0, r1 + bne _08125E40 + mov r1, r10 + ldrh r0, [r1] + b _08125F28 +_08125E40: + mov r2, r10 + ldrh r0, [r2] + movs r1, 0x1F + mov r9, r1 + movs r4, 0x1F + adds r5, r4, 0 + ands r5, r0 + lsls r0, 16 + lsrs r2, r0, 21 + mov r1, r9 + ands r1, r2 + mov r8, r1 + lsrs r0, 26 + mov r2, r9 + ands r2, r0 + str r2, [sp, 0x4] + ldrh r2, [r3] + adds r0, r4, 0 + ands r0, r2 + lsls r2, 16 + lsrs r1, r2, 21 + mov r3, r9 + ands r1, r3 + adds r0, r1 + lsrs r2, 26 + ands r2, r3 + adds r0, r2 + movs r1, 0x3 + bl __divsi3 + lsls r0, 16 + lsrs r7, r0, 16 + mov r1, r8 + adds r0, r5, r1 + ldr r2, [sp, 0x4] + adds r0, r2 + movs r1, 0x3 + bl __divsi3 + lsls r0, 16 + lsrs r6, r0, 16 + ldr r3, [sp] + ldrh r1, [r3] + ands r4, r1 + lsls r1, 16 + lsrs r0, r1, 21 + mov r2, r9 + ands r0, r2 + adds r4, r0 + lsrs r1, 26 + ands r1, r2 + adds r4, r1 + adds r0, r4, 0 + movs r1, 0x3 + bl __divsi3 + lsls r0, 16 + lsrs r1, r0, 16 + cmp r7, r6 + bne _08125EC2 + cmp r1, r6 + bne _08125EC2 + mov r3, r10 + ldrh r0, [r3] + b _08125F28 +_08125EC2: + cmp r7, r6 + bls _08125ECA + subs r0, r7, r6 + b _08125ECC +_08125ECA: + subs r0, r6, r7 +_08125ECC: + lsls r0, 16 + lsrs r2, r0, 16 + cmp r1, r6 + bls _08125ED8 + subs r0, r1, r6 + b _08125EDA +_08125ED8: + subs r0, r6, r1 +_08125EDA: + lsls r0, 16 + lsrs r0, 16 + cmp r2, r0 + bcc _08125EE4 + adds r0, r2, 0 +_08125EE4: + lsrs r0, 1 + movs r4, 0x1F + subs r4, r0 + lsls r4, 16 + lsrs r4, 16 + adds r0, r5, 0 + muls r0, r4 + movs r1, 0x1F + bl __divsi3 + lsls r0, 16 + lsrs r5, r0, 16 + mov r0, r8 + muls r0, r4 + movs r1, 0x1F + bl __divsi3 + lsls r0, 16 + lsrs r0, 16 + mov r8, r0 + ldr r1, [sp, 0x4] + adds r0, r1, 0 + muls r0, r4 + movs r1, 0x1F + bl __divsi3 + lsls r0, 16 + lsrs r0, 6 + mov r2, r8 + lsls r1, r2, 5 + orrs r0, r1 + orrs r5, r0 + lsls r0, r5, 16 + lsrs r0, 16 +_08125F28: + add sp, 0x8 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_8125E18 + + thumb_func_start sub_8125F38 +sub_8125F38: @ 8125F38 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x8 + adds r3, r0, 0 + mov r10, r1 + str r2, [sp] + ldrh r1, [r3] + mov r0, r10 + ldrh r0, [r0] + cmp r1, r0 + bne _08125F60 + ldrh r0, [r2] + cmp r0, r1 + bne _08125F60 + mov r1, r10 + ldrh r0, [r1] + b _08126046 +_08125F60: + mov r2, r10 + ldrh r0, [r2] + movs r1, 0x1F + mov r9, r1 + movs r4, 0x1F + adds r5, r4, 0 + ands r5, r0 + lsls r0, 16 + lsrs r2, r0, 21 + mov r1, r9 + ands r1, r2 + mov r8, r1 + lsrs r0, 26 + mov r2, r9 + ands r2, r0 + str r2, [sp, 0x4] + ldrh r2, [r3] + adds r0, r4, 0 + ands r0, r2 + lsls r2, 16 + lsrs r1, r2, 21 + mov r3, r9 + ands r1, r3 + adds r0, r1 + lsrs r2, 26 + ands r2, r3 + adds r0, r2 + movs r1, 0x3 + bl __divsi3 + lsls r0, 16 + lsrs r7, r0, 16 + mov r1, r8 + adds r0, r5, r1 + ldr r2, [sp, 0x4] + adds r0, r2 + movs r1, 0x3 + bl __divsi3 + lsls r0, 16 + lsrs r6, r0, 16 + ldr r3, [sp] + ldrh r1, [r3] + ands r4, r1 + lsls r1, 16 + lsrs r0, r1, 21 + mov r2, r9 + ands r0, r2 + adds r4, r0 + lsrs r1, 26 + ands r1, r2 + adds r4, r1 + adds r0, r4, 0 + movs r1, 0x3 + bl __divsi3 + lsls r0, 16 + lsrs r1, r0, 16 + cmp r7, r6 + bne _08125FE2 + cmp r1, r6 + bne _08125FE2 + mov r3, r10 + ldrh r0, [r3] + b _08126046 +_08125FE2: + cmp r7, r6 + bls _08125FEA + subs r0, r7, r6 + b _08125FEC +_08125FEA: + subs r0, r6, r7 +_08125FEC: + lsls r0, 16 + lsrs r2, r0, 16 + cmp r1, r6 + bls _08125FF8 + subs r0, r1, r6 + b _08125FFA +_08125FF8: + subs r0, r6, r1 +_08125FFA: + lsls r0, 16 + lsrs r0, 16 + cmp r2, r0 + bcc _08126004 + adds r0, r2, 0 +_08126004: + movs r4, 0x1F + subs r4, r0 + lsls r4, 16 + lsrs r4, 16 + adds r0, r5, 0 + muls r0, r4 + movs r1, 0x1F + bl __divsi3 + lsls r0, 16 + lsrs r5, r0, 16 + mov r0, r8 + muls r0, r4 + movs r1, 0x1F + bl __divsi3 + lsls r0, 16 + lsrs r0, 16 + mov r8, r0 + ldr r1, [sp, 0x4] + adds r0, r1, 0 + muls r0, r4 + movs r1, 0x1F + bl __divsi3 + lsls r0, 16 + lsrs r0, 6 + mov r2, r8 + lsls r1, r2, 5 + orrs r0, r1 + orrs r5, r0 + lsls r0, r5, 16 + lsrs r0, 16 +_08126046: + add sp, 0x8 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_8125F38 + + thumb_func_start sub_8126058 +sub_8126058: @ 8126058 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0xC + ldrb r1, [r0, 0x1D] + lsrs r5, r1, 3 + ldrb r1, [r0, 0x1E] + lsrs r1, 3 + str r1, [sp, 0x8] + ldr r1, [r0, 0x4] + str r1, [sp] + ldr r2, [r0, 0x10] + str r2, [sp, 0x4] + ldrh r0, [r0, 0x16] + cmp r0, 0x2 + bne _08126108 + movs r1, 0 + ldr r0, [sp, 0x8] + cmp r1, r0 + bcc _08126086 + b _08126194 +_08126086: + movs r0, 0 + adds r2, r1, 0x1 + mov r10, r2 + cmp r0, r5 + bcs _081260FA + adds r2, r1, 0 + muls r2, r5 + mov r9, r2 + lsls r1, 3 + mov r8, r1 +_0812609A: + movs r4, 0 + lsls r6, r0, 4 + adds r7, r0, 0x1 + add r0, r9 + lsls r0, 6 + ldr r1, [sp, 0x4] + adds r1, r0 + mov r12, r1 +_081260AA: + lsls r0, r4, 3 + mov r2, r12 + adds r3, r2, r0 + mov r1, r8 + adds r0, r1, r4 + lsls r0, 3 + muls r0, r5 + lsls r0, 1 + ldr r2, [sp] + adds r0, r2, r0 + adds r2, r0, r6 + ldrh r0, [r2, 0x2] + lsls r0, 8 + ldrh r1, [r2] + orrs r0, r1 + strh r0, [r3] + ldrh r0, [r2, 0x6] + lsls r0, 8 + ldrh r1, [r2, 0x4] + orrs r0, r1 + strh r0, [r3, 0x2] + ldrh r0, [r2, 0xA] + lsls r0, 8 + ldrh r1, [r2, 0x8] + orrs r0, r1 + strh r0, [r3, 0x4] + ldrh r0, [r2, 0xE] + lsls r0, 8 + ldrh r1, [r2, 0xC] + orrs r0, r1 + strh r0, [r3, 0x6] + adds r0, r4, 0x1 + lsls r0, 16 + lsrs r4, r0, 16 + cmp r4, 0x7 + bls _081260AA + lsls r0, r7, 16 + lsrs r0, 16 + cmp r0, r5 + bcc _0812609A +_081260FA: + mov r1, r10 + lsls r0, r1, 16 + lsrs r1, r0, 16 + ldr r2, [sp, 0x8] + cmp r1, r2 + bcc _08126086 + b _08126194 +_08126108: + movs r1, 0 + ldr r0, [sp, 0x8] + cmp r1, r0 + bcs _08126194 +_08126110: + movs r0, 0 + adds r2, r1, 0x1 + mov r10, r2 + cmp r0, r5 + bcs _08126188 + adds r2, r1, 0 + muls r2, r5 + mov r9, r2 + lsls r1, 3 + mov r8, r1 +_08126124: + movs r4, 0 + lsls r6, r0, 4 + adds r7, r0, 0x1 + add r0, r9 + lsls r0, 5 + ldr r1, [sp, 0x4] + adds r1, r0 + mov r12, r1 +_08126134: + lsls r0, r4, 2 + mov r2, r12 + adds r3, r2, r0 + mov r1, r8 + adds r0, r1, r4 + lsls r0, 3 + muls r0, r5 + lsls r0, 1 + ldr r2, [sp] + adds r0, r2, r0 + adds r2, r0, r6 + ldrh r1, [r2, 0x2] + lsls r1, 4 + ldrh r0, [r2] + orrs r1, r0 + ldrh r0, [r2, 0x4] + lsls r0, 8 + orrs r1, r0 + ldrh r0, [r2, 0x6] + lsls r0, 12 + orrs r1, r0 + strh r1, [r3] + ldrh r1, [r2, 0xA] + lsls r1, 4 + ldrh r0, [r2, 0x8] + orrs r1, r0 + ldrh r0, [r2, 0xC] + lsls r0, 8 + orrs r1, r0 + ldrh r0, [r2, 0xE] + lsls r0, 12 + orrs r1, r0 + strh r1, [r3, 0x2] + adds r0, r4, 0x1 + lsls r0, 16 + lsrs r4, r0, 16 + cmp r4, 0x7 + bls _08126134 + lsls r0, r7, 16 + lsrs r0, 16 + cmp r0, r5 + bcc _08126124 +_08126188: + mov r1, r10 + lsls r0, r1, 16 + lsrs r1, r0, 16 + ldr r2, [sp, 0x8] + cmp r1, r2 + bcc _08126110 +_08126194: + add sp, 0xC + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_8126058 + + thumb_func_start sub_81261A4 +sub_81261A4: @ 81261A4 + push {lr} + ldr r2, =gUnknown_03006188 + ldrb r1, [r0, 0x18] + lsls r1, 4 + strh r1, [r2] + ldr r3, =gUnknown_03006184 + ldrh r2, [r2] + lsls r2, 1 + ldr r1, [r0, 0x8] + adds r1, r2 + str r1, [r3] + ldr r2, =gUnknown_03006168 + ldr r1, [r0, 0x4] + str r1, [r2] + ldr r2, =gUnknown_03006164 + ldrb r1, [r0, 0x19] + strb r1, [r2] + ldr r2, =gUnknown_03006178 + ldrb r1, [r0, 0x1A] + strb r1, [r2] + ldr r2, =gUnknown_03006174 + ldrb r1, [r0, 0x1B] + strb r1, [r2] + ldr r2, =gUnknown_0300616C + ldrb r1, [r0, 0x1C] + strb r1, [r2] + ldr r2, =gUnknown_03006180 + ldrb r1, [r0, 0x1D] + strb r1, [r2] + ldr r2, =gUnknown_03006170 + ldrb r1, [r0, 0x1E] + strb r1, [r2] + ldrh r0, [r0, 0x14] + cmp r0, 0x5 + bhi _0812626A + lsls r0, 2 + ldr r1, =_0812621C + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_0812621C: + .4byte _08126234 + .4byte _0812623C + .4byte _08126244 + .4byte _0812624E + .4byte _08126258 + .4byte _08126262 +_08126234: + movs r0, 0 + bl sub_81263A4 + b _0812626A +_0812623C: + movs r0, 0x1 + bl sub_81263A4 + b _0812626A +_08126244: + bl sub_8126270 + bl sub_8126714 + b _0812626A +_0812624E: + bl sub_8126370 + bl sub_8126664 + b _0812626A +_08126258: + bl sub_8126334 + bl sub_81265B4 + b _0812626A +_08126262: + bl sub_8126318 + bl sub_81264FC +_0812626A: + pop {r0} + bx r0 + thumb_func_end sub_81261A4 + + thumb_func_start sub_8126270 +sub_8126270: @ 8126270 + ldr r2, =gUnknown_03006184 + ldr r1, [r2] + movs r0, 0 + strh r0, [r1] + ldr r0, [r2] + ldr r2, =0x000018c6 + adds r1, r2, 0 + strh r1, [r0, 0x2] + ldr r2, =0x000077bd + adds r1, r2, 0 + strh r1, [r0, 0x4] + ldr r2, =0x00002d6b + adds r1, r2, 0 + strh r1, [r0, 0x6] + ldr r2, =0x000018dd + adds r1, r2, 0 + strh r1, [r0, 0x8] + ldr r2, =0x00001ba6 + adds r1, r2, 0 + strh r1, [r0, 0xA] + ldr r2, =0x000074c6 + adds r1, r2, 0 + strh r1, [r0, 0xC] + ldr r2, =0x00001bbd + adds r1, r2, 0 + strh r1, [r0, 0xE] + ldr r2, =0x000074dd + adds r1, r2, 0 + strh r1, [r0, 0x10] + ldr r2, =0x000077a6 + adds r1, r2, 0 + strh r1, [r0, 0x12] + ldr r2, =0x0000197d + adds r1, r2, 0 + strh r1, [r0, 0x14] + ldr r2, =0x00001bab + adds r1, r2, 0 + strh r1, [r0, 0x16] + ldr r2, =0x00007566 + adds r1, r2, 0 + strh r1, [r0, 0x18] + ldr r2, =0x00002cdd + adds r1, r2, 0 + strh r1, [r0, 0x1A] + ldr r2, =0x00002fa6 + adds r1, r2, 0 + strh r1, [r0, 0x1C] + ldr r2, =0x000074cb + adds r1, r2, 0 + strh r1, [r0, 0x1E] + bx lr + .pool + thumb_func_end sub_8126270 + + thumb_func_start sub_8126318 +sub_8126318: @ 8126318 + ldr r2, =gUnknown_03006184 + ldr r0, [r2] + movs r1, 0 + strh r1, [r0] + ldr r2, [r2] + strh r1, [r2, 0x2] + ldr r1, =0x00007fff + adds r0, r1, 0 + strh r0, [r2, 0x4] + bx lr + .pool + thumb_func_end sub_8126318 + + thumb_func_start sub_8126334 +sub_8126334: @ 8126334 + push {r4,r5,lr} + ldr r1, =gUnknown_03006184 + ldr r0, [r1] + movs r2, 0 + strh r2, [r0] + ldr r0, [r1] + strh r2, [r0, 0x2] + movs r4, 0 + adds r5, r1, 0 +_08126346: + ldr r0, [r5] + lsls r2, r4, 1 + adds r2, r0 + adds r0, r4, 0x2 + lsls r3, r0, 1 + lsls r1, r0, 11 + lsls r0, 6 + orrs r1, r0 + orrs r1, r3 + strh r1, [r2, 0x4] + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0xD + bls _08126346 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8126334 + + thumb_func_start sub_8126370 +sub_8126370: @ 8126370 + push {r4,lr} + ldr r2, =gUnknown_03006184 + ldr r1, [r2] + movs r0, 0 + strh r0, [r1] + movs r3, 0 + adds r4, r2, 0 +_0812637E: + ldr r0, [r4] + lsls r2, r3, 1 + adds r2, r0 + lsls r0, r3, 10 + lsls r1, r3, 5 + orrs r0, r1 + orrs r0, r3 + strh r0, [r2, 0x2] + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + cmp r3, 0x1F + bls _0812637E + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8126370 + + thumb_func_start sub_81263A4 +sub_81263A4: @ 81263A4 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + lsls r0, 24 + movs r1, 0xDF + mov r9, r1 + cmp r0, 0 + bne _081263BC + movs r2, 0xFF + mov r9, r2 +_081263BC: + movs r6, 0 + ldr r3, =gUnknown_03006184 + mov r12, r3 + mov r0, r9 + lsls r4, r0, 1 + ldr r5, =gUnknown_0300616C + cmp r6, r9 + bcs _081263E0 + movs r2, 0 +_081263CE: + ldr r0, [r3] + lsls r1, r6, 1 + adds r1, r0 + strh r2, [r1] + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 + cmp r6, r9 + bcc _081263CE +_081263E0: + mov r1, r12 + ldr r0, [r1] + adds r0, r4, r0 + ldr r2, =0x00003def + adds r1, r2, 0 + strh r1, [r0] + movs r3, 0 + ldrb r5, [r5] + cmp r3, r5 + bcs _081264E4 +_081263F4: + ldr r2, =gUnknown_03006168 + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r3 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + ldr r1, [r2] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r6, 0 + ldr r0, =gUnknown_03006174 + adds r2, r0, 0 + adds r3, 0x1 + mov r10, r3 + ldrb r3, [r2] + cmp r6, r3 + bcs _081264D6 + ldr r0, =gUnknown_03006188 + mov r8, r0 +_08126424: + ldrh r0, [r4] + movs r3, 0x80 + lsls r3, 8 + adds r1, r3, 0 + ands r0, r1 + cmp r0, 0 + beq _08126464 + mov r1, r8 + ldrh r0, [r1] + strh r0, [r4] + adds r6, 0x1 + adds r7, r4, 0x2 + b _081264CA + .pool +_08126464: + adds r0, r4, 0 + bl sub_81267C4 + lsls r0, 16 + lsrs r5, r0, 16 + movs r3, 0x1 + adds r6, 0x1 + adds r7, r4, 0x2 + cmp r3, r9 + bcs _081264C0 + ldr r0, =gUnknown_03006184 + ldr r2, [r0] + ldrh r1, [r2, 0x2] + mov r12, r0 + cmp r1, 0 + bne _08126494 + strh r5, [r2, 0x2] + mov r2, r8 + ldrh r0, [r2] + adds r0, 0x1 + b _081264BE + .pool +_08126494: + mov r2, r12 + ldr r1, [r2] + lsls r0, r3, 1 + adds r0, r1 + ldrh r0, [r0] + cmp r0, r5 + beq _081264B8 + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + cmp r3, r9 + bcs _081264C0 + lsls r0, r3, 1 + adds r1, r0, r1 + ldrh r0, [r1] + cmp r0, 0 + bne _08126494 + strh r5, [r1] +_081264B8: + mov r1, r8 + ldrh r0, [r1] + adds r0, r3 +_081264BE: + strh r0, [r4] +_081264C0: + ldr r2, =gUnknown_03006174 + cmp r3, r9 + bne _081264CA + mov r3, r9 + strh r3, [r4] +_081264CA: + lsls r0, r6, 24 + lsrs r6, r0, 24 + adds r4, r7, 0 + ldrb r0, [r2] + cmp r6, r0 + bcc _08126424 +_081264D6: + mov r1, r10 + lsls r0, r1, 24 + lsrs r3, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r3, r0 + bcc _081263F4 +_081264E4: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81263A4 + + thumb_func_start sub_81264FC +sub_81264FC: @ 81264FC + push {r4-r7,lr} + mov r7, r8 + push {r7} + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _081265A0 + ldr r0, =gUnknown_03006168 + mov r8, r0 +_08126510: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r3, r8 + ldr r1, [r3] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r6, 0 + ldr r0, =gUnknown_03006174 + adds r3, r0, 0 + adds r7, r2, 0x1 + ldrb r0, [r3] + cmp r6, r0 + bcs _08126594 + ldr r5, =gUnknown_03006188 +_0812653C: + ldrh r0, [r4] + movs r2, 0x80 + lsls r2, 8 + adds r1, r2, 0 + ands r0, r1 + cmp r0, 0 + beq _0812656C + ldrh r0, [r5] + strh r0, [r4] + b _08126586 + .pool +_0812656C: + adds r0, r4, 0 + bl sub_8125C68 + lsls r0, 16 + cmp r0, 0 + bne _0812657E + ldrh r0, [r5] + adds r0, 0x1 + b _08126582 +_0812657E: + ldrh r0, [r5] + adds r0, 0x2 +_08126582: + strh r0, [r4] + ldr r3, =gUnknown_03006174 +_08126586: + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 + adds r4, 0x2 + ldrb r0, [r3] + cmp r6, r0 + bcc _0812653C +_08126594: + lsls r0, r7, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _08126510 +_081265A0: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81264FC + + thumb_func_start sub_81265B4 +sub_81265B4: @ 81265B4 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x4 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _08126650 + ldr r0, =gUnknown_03006168 + mov r8, r0 +_081265CA: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r3, r8 + ldr r1, [r3] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r5, 0 + ldr r0, =gUnknown_03006174 + adds r7, r2, 0x1 + ldrb r0, [r0] + cmp r5, r0 + bcs _08126644 + ldr r6, =gUnknown_03006188 + movs r0, 0x80 + lsls r0, 8 + adds r2, r0, 0 +_081265FA: + ldrh r0, [r4] + ands r0, r2 + cmp r0, 0 + beq _08126624 + ldrh r0, [r6] + strh r0, [r4] + b _08126634 + .pool +_08126624: + adds r0, r4, 0 + str r2, [sp] + bl sub_8126908 + ldrh r1, [r6] + adds r0, r1 + strh r0, [r4] + ldr r2, [sp] +_08126634: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r4, 0x2 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r5, r0 + bcc _081265FA +_08126644: + lsls r0, r7, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _081265CA +_08126650: + add sp, 0x4 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81265B4 + + thumb_func_start sub_8126664 +sub_8126664: @ 8126664 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x4 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _08126700 + ldr r0, =gUnknown_03006168 + mov r8, r0 +_0812667A: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r3, r8 + ldr r1, [r3] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r5, 0 + ldr r0, =gUnknown_03006174 + adds r7, r2, 0x1 + ldrb r0, [r0] + cmp r5, r0 + bcs _081266F4 + ldr r6, =gUnknown_03006188 + movs r0, 0x80 + lsls r0, 8 + adds r2, r0, 0 +_081266AA: + ldrh r0, [r4] + ands r0, r2 + cmp r0, 0 + beq _081266D4 + ldrh r0, [r6] + strh r0, [r4] + b _081266E4 + .pool +_081266D4: + adds r0, r4, 0 + str r2, [sp] + bl sub_812693C + ldrh r1, [r6] + adds r0, r1 + strh r0, [r4] + ldr r2, [sp] +_081266E4: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r4, 0x2 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r5, r0 + bcc _081266AA +_081266F4: + lsls r0, r7, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _0812667A +_08126700: + add sp, 0x4 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8126664 + + thumb_func_start sub_8126714 +sub_8126714: @ 8126714 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x4 + movs r2, 0 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcs _081267B0 + ldr r0, =gUnknown_03006168 + mov r8, r0 +_0812672A: + ldr r0, =gUnknown_03006178 + ldrb r1, [r0] + adds r1, r2 + ldr r0, =gUnknown_03006180 + ldrb r0, [r0] + muls r0, r1 + lsls r0, 1 + mov r3, r8 + ldr r1, [r3] + adds r1, r0 + ldr r0, =gUnknown_03006164 + ldrb r0, [r0] + lsls r0, 1 + adds r4, r1, r0 + movs r5, 0 + ldr r0, =gUnknown_03006174 + adds r7, r2, 0x1 + ldrb r0, [r0] + cmp r5, r0 + bcs _081267A4 + ldr r6, =gUnknown_03006188 + movs r0, 0x80 + lsls r0, 8 + adds r2, r0, 0 +_0812675A: + ldrh r0, [r4] + ands r0, r2 + cmp r0, 0 + beq _08126784 + ldrh r0, [r6] + strh r0, [r4] + b _08126794 + .pool +_08126784: + adds r0, r4, 0 + str r2, [sp] + bl sub_8126838 + ldrh r1, [r6] + adds r0, r1 + strh r0, [r4] + ldr r2, [sp] +_08126794: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + adds r4, 0x2 + ldr r0, =gUnknown_03006174 + ldrb r0, [r0] + cmp r5, r0 + bcc _0812675A +_081267A4: + lsls r0, r7, 24 + lsrs r2, r0, 24 + ldr r0, =gUnknown_0300616C + ldrb r0, [r0] + cmp r2, r0 + bcc _0812672A +_081267B0: + add sp, 0x4 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8126714 + + thumb_func_start sub_81267C4 +sub_81267C4: @ 81267C4 + push {r4,lr} + ldrh r0, [r0] + movs r1, 0x1F + movs r4, 0x1F + ands r4, r0 + lsls r0, 16 + lsrs r3, r0, 21 + ands r3, r1 + lsrs r2, r0, 26 + ands r2, r1 + movs r1, 0x3 + adds r0, r4, 0 + ands r0, r1 + cmp r0, 0 + beq _081267E8 + movs r0, 0x1C + ands r0, r4 + adds r4, r0, 0x4 +_081267E8: + adds r0, r3, 0 + ands r0, r1 + cmp r0, 0 + beq _081267F6 + movs r0, 0x1C + ands r0, r3 + adds r3, r0, 0x4 +_081267F6: + adds r0, r2, 0 + ands r0, r1 + cmp r0, 0 + beq _08126804 + movs r0, 0x1C + ands r0, r2 + adds r2, r0, 0x4 +_08126804: + cmp r4, 0x5 + bhi _0812680A + movs r4, 0x6 +_0812680A: + cmp r4, 0x1E + bls _08126810 + movs r4, 0x1E +_08126810: + cmp r3, 0x5 + bhi _08126816 + movs r3, 0x6 +_08126816: + cmp r3, 0x1E + bls _0812681C + movs r3, 0x1E +_0812681C: + cmp r2, 0x5 + bhi _08126822 + movs r2, 0x6 +_08126822: + cmp r2, 0x1E + bls _08126828 + movs r2, 0x1E +_08126828: + lsls r0, r2, 10 + lsls r1, r3, 5 + orrs r0, r1 + orrs r4, r0 + adds r0, r4, 0 + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_81267C4 + + thumb_func_start sub_8126838 +sub_8126838: @ 8126838 + push {lr} + ldrh r0, [r0] + movs r1, 0x1F + movs r3, 0x1F + ands r3, r0 + lsls r0, 16 + lsrs r2, r0, 21 + ands r2, r1 + lsrs r0, 26 + ands r0, r1 + cmp r3, 0xB + bhi _0812685C + cmp r2, 0xA + bhi _0812685C + cmp r0, 0xA + bhi _0812685C + movs r0, 0x1 + b _08126902 +_0812685C: + cmp r3, 0x13 + bls _08126880 + cmp r2, 0x13 + bls _08126868 + cmp r0, 0x13 + bhi _0812688C +_08126868: + cmp r3, 0x13 + bls _08126880 + cmp r2, 0x13 + bls _08126876 + cmp r0, 0xE + bhi _0812688C + b _081268C4 +_08126876: + cmp r0, 0x13 + bls _08126880 + cmp r2, 0xE + bhi _0812688C + b _081268A0 +_08126880: + cmp r2, 0x13 + bls _08126890 + cmp r0, 0x13 + bls _08126890 + cmp r3, 0xE + bls _081268E8 +_0812688C: + movs r0, 0x2 + b _08126902 +_08126890: + cmp r3, 0x13 + bls _081268B4 + cmp r2, 0xB + bls _081268A8 + cmp r0, 0xB + bls _081268A4 + cmp r2, r0 + bcs _081268C4 +_081268A0: + movs r0, 0x8 + b _08126902 +_081268A4: + movs r0, 0xA + b _08126902 +_081268A8: + cmp r0, 0xB + bls _081268B0 + movs r0, 0xD + b _08126902 +_081268B0: + movs r0, 0x4 + b _08126902 +_081268B4: + cmp r2, 0x13 + bls _081268D8 + cmp r3, 0xB + bls _081268CC + cmp r0, 0xB + bls _081268C8 + cmp r3, r0 + bcc _081268E8 +_081268C4: + movs r0, 0x7 + b _08126902 +_081268C8: + movs r0, 0xB + b _08126902 +_081268CC: + cmp r0, 0xB + bls _081268D4 + movs r0, 0xE + b _08126902 +_081268D4: + movs r0, 0x5 + b _08126902 +_081268D8: + cmp r0, 0x13 + bls _08126900 + cmp r3, 0xB + bls _081268EC + cmp r2, 0xB + bls _081268F4 + cmp r3, r2 + bcs _081268A0 +_081268E8: + movs r0, 0x9 + b _08126902 +_081268EC: + cmp r2, 0xB + bls _081268F4 + movs r0, 0xC + b _08126902 +_081268F4: + cmp r0, 0xB + bls _081268FC + movs r0, 0xF + b _08126902 +_081268FC: + movs r0, 0x6 + b _08126902 +_08126900: + movs r0, 0x3 +_08126902: + pop {r1} + bx r1 + thumb_func_end sub_8126838 + + thumb_func_start sub_8126908 +sub_8126908: @ 8126908 + push {lr} + ldrh r1, [r0] + movs r3, 0x1F + movs r0, 0x1F + ands r0, r1 + lsls r1, 16 + lsrs r2, r1, 21 + ands r2, r3 + lsrs r1, 26 + ands r1, r3 + adds r0, r2 + adds r0, r1 + movs r1, 0x3 + bl __divsi3 + movs r1, 0x1E + ands r0, r1 + lsls r0, 16 + cmp r0, 0 + beq _08126934 + lsrs r0, 17 + b _08126936 +_08126934: + movs r0, 0x1 +_08126936: + pop {r1} + bx r1 + thumb_func_end sub_8126908 + + thumb_func_start sub_812693C +sub_812693C: @ 812693C + push {lr} + ldrh r1, [r0] + movs r3, 0x1F + movs r0, 0x1F + ands r0, r1 + lsls r1, 16 + lsrs r2, r1, 21 + ands r2, r3 + lsrs r1, 26 + ands r1, r3 + adds r0, r2 + adds r0, r1 + movs r1, 0x3 + bl __divsi3 + lsls r0, 16 + movs r1, 0x80 + lsls r1, 9 + adds r0, r1 + lsrs r0, 16 + pop {r1} + bx r1 + thumb_func_end sub_812693C + + .align 2, 0 @ Don't pad with nop. diff --git a/asm/cute_sketch.s b/asm/cute_sketch.s deleted file mode 100644 index 36ef184b9..000000000 --- a/asm/cute_sketch.s +++ /dev/null @@ -1,3331 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8124F2C -sub_8124F2C: @ 8124F2C - push {lr} - ldr r2, =gUnknown_03006168 - ldr r1, [r0, 0x4] - str r1, [r2] - ldr r2, =gUnknown_0300617C - ldrb r1, [r0, 0x1F] - strb r1, [r2] - ldr r2, =gUnknown_03006164 - ldrb r1, [r0, 0x19] - strb r1, [r2] - ldr r2, =gUnknown_03006178 - ldrb r1, [r0, 0x1A] - strb r1, [r2] - ldr r2, =gUnknown_03006174 - ldrb r1, [r0, 0x1B] - strb r1, [r2] - ldr r2, =gUnknown_0300616C - ldrb r1, [r0, 0x1C] - strb r1, [r2] - ldr r2, =gUnknown_03006180 - ldrb r1, [r0, 0x1D] - strb r1, [r2] - ldr r2, =gUnknown_03006170 - ldrb r1, [r0, 0x1E] - strb r1, [r2] - ldrb r0, [r0] - subs r0, 0x2 - cmp r0, 0x22 - bls _08124F68 - b _081250B4 -_08124F68: - lsls r0, 2 - ldr r1, =_08124F98 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08124F98: - .4byte _08125024 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _08125084 - .4byte _081250B4 - .4byte _0812502A - .4byte _08125030 - .4byte _08125044 - .4byte _08125056 - .4byte _081250B4 - .4byte _0812506C - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _081250B4 - .4byte _08125072 - .4byte _08125050 - .4byte _08125078 - .4byte _0812507E - .4byte _081250B4 - .4byte _081250B4 - .4byte _08125090 -_08125024: - bl sub_8125230 - b _081250B4 -_0812502A: - bl sub_81252E8 - b _081250B4 -_08125030: - bl sub_81254E0 - ldr r0, =gUnknown_0300617C - ldrb r0, [r0] - bl sub_81253A4 - b _081250B4 - .pool -_08125044: - bl sub_81254E0 - bl sub_8125630 - bl sub_8125448 -_08125050: - bl sub_8125630 - b _081250B4 -_08125056: - bl sub_81254E0 - bl sub_81257F8 - bl sub_81257F8 - bl sub_81258A0 - bl sub_8125448 - b _081250B4 -_0812506C: - bl sub_81256C8 - b _081250B4 -_08125072: - bl sub_81254E0 - b _081250B4 -_08125078: - bl sub_81257F8 - b _081250B4 -_0812507E: - bl sub_81258A0 - b _081250B4 -_08125084: - bl sub_8125250 - movs r0, 0x3 - bl sub_81250B8 - b _081250B4 -_08125090: - bl sub_81254E0 - bl sub_81257F8 - bl sub_81258A0 - bl sub_8125448 - bl sub_81252E8 - bl sub_81252E8 - movs r0, 0x2 - bl sub_81250B8 - movs r0, 0x4 - bl sub_8125170 -_081250B4: - pop {r0} - bx r0 - thumb_func_end sub_8124F2C - - thumb_func_start sub_81250B8 -sub_81250B8: @ 81250B8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r7, r0, 24 - movs r2, 0 - ldr r0, =gUnknown_0300616C - mov r8, r0 - ldrb r0, [r0] - cmp r2, r0 - bcs _0812514A - ldr r1, =gUnknown_03006174 - mov r12, r1 - ldr r3, =gUnknown_03006180 - mov r10, r3 - ldr r0, =gUnknown_03006164 - mov r9, r0 -_081250DE: - ldr r1, =gUnknown_03006178 - ldrb r0, [r1] - adds r0, r2 - mov r3, r10 - ldrb r1, [r3] - muls r0, r1 - lsls r0, 1 - ldr r3, =gUnknown_03006168 - ldr r1, [r3] - adds r1, r0 - mov r3, r9 - ldrb r0, [r3] - lsls r0, 1 - adds r3, r1, r0 - movs r4, 0 - adds r5, r2, 0x1 - mov r0, r12 - ldrb r0, [r0] - cmp r4, r0 - bcs _0812513E - movs r6, 0x80 - lsls r6, 8 -_0812510A: - ldrh r1, [r3] - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - bne _0812512E - movs r0, 0x1F - ands r0, r1 - adds r0, r7 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x1F - bls _08125124 - movs r2, 0x1F -_08125124: - lsls r0, r2, 10 - lsls r1, r2, 5 - orrs r0, r1 - orrs r0, r2 - strh r0, [r3] -_0812512E: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - adds r3, 0x2 - mov r1, r12 - ldrb r1, [r1] - cmp r4, r1 - bcc _0812510A -_0812513E: - lsls r0, r5, 24 - lsrs r2, r0, 24 - mov r3, r8 - ldrb r3, [r3] - cmp r2, r3 - bcc _081250DE -_0812514A: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81250B8 - - thumb_func_start sub_8125170 -sub_8125170: @ 8125170 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _08125208 - ldr r1, =gUnknown_03006174 - mov r10, r1 -_0812518E: - ldr r3, =gUnknown_03006178 - ldrb r0, [r3] - adds r0, r2 - ldr r3, =gUnknown_03006180 - ldrb r1, [r3] - muls r0, r1 - lsls r0, 1 - ldr r3, =gUnknown_03006168 - ldr r1, [r3] - adds r1, r0 - ldr r3, =gUnknown_03006164 - ldrb r0, [r3] - lsls r0, 1 - adds r3, r1, r0 - movs r5, 0 - adds r7, r2, 0x1 - mov r0, r10 - ldrb r0, [r0] - cmp r5, r0 - bcs _081251FC - movs r1, 0x80 - lsls r1, 8 - mov r9, r1 - movs r0, 0x1F - mov r12, r0 - mov r1, r8 - subs r6, r0, r1 -_081251C4: - ldrh r1, [r3] - mov r0, r9 - ands r0, r1 - cmp r0, 0 - bne _081251EC - movs r4, 0x1F - mov r2, r12 - ands r2, r1 - cmp r2, r6 - ble _081251E2 - mov r1, r8 - lsrs r0, r1, 1 - subs r0, r4, r0 - lsls r0, 24 - lsrs r2, r0, 24 -_081251E2: - lsls r0, r2, 10 - lsls r1, r2, 5 - orrs r0, r1 - orrs r0, r2 - strh r0, [r3] -_081251EC: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r3, 0x2 - mov r0, r10 - ldrb r0, [r0] - cmp r5, r0 - bcc _081251C4 -_081251FC: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r1, =gUnknown_0300616C - ldrb r1, [r1] - cmp r2, r1 - bcc _0812518E -_08125208: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8125170 - - thumb_func_start sub_8125230 -sub_8125230: @ 8125230 - push {r4,r5,lr} - movs r4, 0 - ldr r5, =0x00000c7f -_08125236: - lsls r0, r4, 16 - lsrs r0, 16 - bl sub_8125954 - adds r4, 0x1 - cmp r4, r5 - bls _08125236 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8125230 - - thumb_func_start sub_8125250 -sub_8125250: @ 8125250 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _081252C2 - ldr r0, =gUnknown_03006168 - mov r8, r0 - ldr r3, =gUnknown_03006174 -_08125268: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _081252B6 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_08125294: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _081252A8 - adds r0, r4, 0 - str r3, [sp] - bl sub_8125B28 - strh r0, [r4] - ldr r3, [sp] -_081252A8: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _08125294 -_081252B6: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _08125268 -_081252C2: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8125250 - - thumb_func_start sub_81252E8 -sub_81252E8: @ 81252E8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r2, 0 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r2, r0 - bcs _0812537E - ldr r0, =gUnknown_03006168 - mov r8, r0 - ldr r3, =gUnknown_03006180 -_08125300: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - ldrb r0, [r3] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - adds r0, r2 - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - ldrb r0, [r3] - lsls r0, 1 - adds r4, r0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - subs r0, 0x1 - adds r7, r2, 0x1 - cmp r5, r0 - bge _08125372 - ldr r6, =gUnknown_03006180 -_08125336: - ldrh r0, [r4] - movs r2, 0x80 - lsls r2, 8 - adds r1, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _0812535C - ldrb r2, [r6] - lsls r2, 1 - adds r2, r4, r2 - mov r0, sp - adds r1, r4, 0 - str r3, [sp, 0x4] - bl sub_8125E18 - strh r0, [r4] - mov r1, sp - strh r0, [r1] - ldr r3, [sp, 0x4] -_0812535C: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldrb r0, [r6] - lsls r0, 1 - adds r4, r0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _08125336 -_08125372: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r2, r0 - bcc _08125300 -_0812537E: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81252E8 - - thumb_func_start sub_81253A4 -sub_81253A4: @ 81253A4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _08125420 - ldr r0, =gUnknown_03006168 - mov r9, r0 - ldr r3, =gUnknown_03006174 -_081253C4: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r9 - ldr r1, [r4] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _08125414 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_081253F0: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _08125406 - adds r0, r4, 0 - mov r1, r8 - str r3, [sp] - bl sub_8125B5C - strh r0, [r4] - ldr r3, [sp] -_08125406: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _081253F0 -_08125414: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _081253C4 -_08125420: - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81253A4 - - thumb_func_start sub_8125448 -sub_8125448: @ 8125448 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _081254BA - ldr r0, =gUnknown_03006168 - mov r8, r0 - ldr r3, =gUnknown_03006174 -_08125460: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _081254AE - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_0812548C: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _081254A0 - adds r0, r4, 0 - str r3, [sp] - bl sub_8125C68 - strh r0, [r4] - ldr r3, [sp] -_081254A0: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _0812548C -_081254AE: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _08125460 -_081254BA: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8125448 - - thumb_func_start sub_81254E0 -sub_81254E0: @ 81254E0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r7, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r7, r0 - bcs _0812556C - ldr r0, =gUnknown_03006168 - mov r8, r0 -_081254F6: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r7 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r2, r8 - ldr r1, [r2] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r5, r1, r0 - adds r4, r5, 0x2 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_8125C98 - strh r0, [r5] - movs r6, 0x1 - adds r5, r4, 0 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - subs r0, 0x1 - adds r7, 0x1 - cmp r6, r0 - bge _08125556 -_0812552E: - adds r4, r5, 0x2 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_8125C98 - strh r0, [r5] - subs r1, r5, 0x2 - adds r0, r5, 0 - bl sub_8125C98 - strh r0, [r5] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r5, r4, 0 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - subs r0, 0x1 - cmp r6, r0 - blt _0812552E -_08125556: - subs r1, r5, 0x2 - adds r0, r5, 0 - bl sub_8125C98 - strh r0, [r5] - lsls r0, r7, 24 - lsrs r7, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r7, r0 - bcc _081254F6 -_0812556C: - movs r6, 0 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r6, r0 - bcs _0812560C - ldr r3, =gUnknown_03006168 - mov r9, r3 - ldr r0, =gUnknown_03006180 - mov r8, r0 -_0812557E: - ldr r0, =gUnknown_03006178 - ldrb r0, [r0] - mov r2, r8 - ldrb r1, [r2] - muls r0, r1 - lsls r0, 1 - mov r3, r9 - ldr r2, [r3] - adds r2, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - adds r0, r6 - lsls r0, 1 - adds r5, r2, r0 - lsls r1, 1 - adds r1, r5, r1 - adds r0, r5, 0 - bl sub_8125C98 - strh r0, [r5] - movs r7, 0x1 - mov r1, r8 - ldrb r0, [r1] - lsls r0, 1 - adds r5, r0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - subs r0, 0x1 - adds r6, 0x1 - cmp r7, r0 - bge _081255F0 - ldr r4, =gUnknown_03006180 -_081255BE: - ldrb r1, [r4] - lsls r1, 1 - adds r1, r5, r1 - adds r0, r5, 0 - bl sub_8125C98 - strh r0, [r5] - ldrb r1, [r4] - lsls r1, 1 - subs r1, r5, r1 - adds r0, r5, 0 - bl sub_8125C98 - strh r0, [r5] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - ldrb r0, [r4] - lsls r0, 1 - adds r5, r0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - subs r0, 0x1 - cmp r7, r0 - blt _081255BE -_081255F0: - mov r2, r8 - ldrb r1, [r2] - lsls r1, 1 - subs r1, r5, r1 - adds r0, r5, 0 - bl sub_8125C98 - strh r0, [r5] - lsls r0, r6, 24 - lsrs r6, r0, 24 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r6, r0 - bcc _0812557E -_0812560C: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81254E0 - - thumb_func_start sub_8125630 -sub_8125630: @ 8125630 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _081256A2 - ldr r0, =gUnknown_03006168 - mov r8, r0 - ldr r3, =gUnknown_03006174 -_08125648: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _08125696 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_08125674: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _08125688 - adds r0, r4, 0 - str r3, [sp] - bl sub_8125CC8 - strh r0, [r4] - ldr r3, [sp] -_08125688: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _08125674 -_08125696: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _08125648 -_081256A2: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8125630 - - thumb_func_start sub_81256C8 -sub_81256C8: @ 81256C8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - ldr r0, =gUnknown_03006168 - ldr r4, [r0] - movs r6, 0 - movs r0, 0x80 - lsls r0, 8 - adds r5, r0, 0 -_081256E0: - movs r7, 0 -_081256E2: - ldrh r0, [r4] - ands r0, r5 - cmp r0, 0 - bne _081256F2 - adds r0, r4, 0 - bl sub_8125CC8 - strh r0, [r4] -_081256F2: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - adds r4, 0x2 - cmp r7, 0x3F - bls _081256E2 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3F - bls _081256E0 - movs r7, 0 - ldr r1, =gUnknown_03006168 - mov r10, r1 - mov r3, sp - movs r2, 0x80 - lsls r2, 8 - mov r9, r2 -_08125716: - lsls r0, r7, 1 - mov r2, r10 - ldr r1, [r2] - adds r4, r1, r0 - ldrh r1, [r4] - strh r1, [r3] - mov r1, r9 - strh r1, [r4] - movs r6, 0x1 - adds r4, 0x80 - adds r5, r0, 0 -_0812572C: - ldrh r0, [r4] - movs r2, 0x80 - lsls r2, 8 - ands r0, r2 - cmp r0, 0 - bne _0812574C - adds r2, r4, 0 - adds r2, 0x80 - mov r0, sp - adds r1, r4, 0 - str r3, [sp, 0x4] - bl sub_8125F38 - strh r0, [r4] - ldr r3, [sp, 0x4] - strh r0, [r3] -_0812574C: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, 0x80 - cmp r6, 0x3E - bls _0812572C - mov r0, r9 - strh r0, [r4] - mov r1, r10 - ldr r0, [r1] - adds r4, r0, r5 - ldrh r0, [r4] - strh r0, [r3] - mov r2, r9 - strh r2, [r4] - movs r6, 0x1 - adds r4, 0x80 - movs r0, 0x80 - lsls r0, 8 - mov r8, r0 -_08125774: - ldrh r0, [r4] - mov r1, r8 - ands r0, r1 - adds r5, r4, 0 - adds r5, 0x80 - cmp r0, 0 - bne _08125794 - mov r0, sp - adds r1, r4, 0 - adds r2, r5, 0 - str r3, [sp, 0x4] - bl sub_8125F38 - strh r0, [r4] - ldr r3, [sp, 0x4] - strh r0, [r3] -_08125794: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, r5, 0 - cmp r6, 0x3E - bls _08125774 - mov r2, r9 - strh r2, [r4] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x3F - bls _08125716 - ldr r0, =gUnknown_03006168 - ldr r4, [r0] - movs r6, 0 - movs r0, 0x80 - lsls r0, 8 - mov r8, r0 -_081257BA: - movs r7, 0 - adds r5, r6, 0x1 -_081257BE: - ldrh r0, [r4] - mov r1, r8 - ands r0, r1 - cmp r0, 0 - bne _081257D0 - adds r0, r4, 0 - bl sub_8125CC8 - strh r0, [r4] -_081257D0: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - adds r4, 0x2 - cmp r7, 0x3F - bls _081257BE - lsls r0, r5, 24 - lsrs r6, r0, 24 - cmp r6, 0x3F - bls _081257BA - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81256C8 - - thumb_func_start sub_81257F8 -sub_81257F8: @ 81257F8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _0812587A - ldr r0, =gUnknown_03006168 - mov r8, r0 -_0812580E: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - adds r4, 0x2 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - subs r0, 0x1 - adds r6, r2, 0x1 - cmp r5, r0 - bge _0812586E - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_08125846: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _0812585C - mov r0, sp - adds r1, r4, 0 - bl sub_8125CF4 - strh r0, [r4] - mov r1, sp - strh r0, [r1] -_0812585C: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _08125846 -_0812586E: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _0812580E -_0812587A: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81257F8 - - thumb_func_start sub_81258A0 -sub_81258A0: @ 81258A0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r2, 0 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r2, r0 - bcs _0812592E - ldr r0, =gUnknown_03006168 - mov r8, r0 - ldr r7, =gUnknown_03006180 -_081258B8: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - ldrb r0, [r7] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - adds r0, r2 - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - ldrb r0, [r7] - lsls r0, 1 - adds r4, r0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - subs r0, 0x1 - adds r6, r2, 0x1 - cmp r5, r0 - bge _08125922 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_081258F2: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - bne _0812590C - mov r0, sp - adds r1, r4, 0 - str r2, [sp, 0x4] - bl sub_8125CF4 - strh r0, [r4] - mov r1, sp - strh r0, [r1] - ldr r2, [sp, 0x4] -_0812590C: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldrb r0, [r7] - lsls r0, 1 - adds r4, r0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _081258F2 -_08125922: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r2, r0 - bcc _081258B8 -_0812592E: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81258A0 - - thumb_func_start sub_8125954 -sub_8125954: @ 8125954 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - mov r2, sp - ldr r3, =gUnknown_085A1F94 - lsls r1, r0, 1 - add r1, r10 - adds r0, r1, r3 - ldrb r0, [r0] - strb r0, [r2] - adds r0, r3, 0x1 - adds r0, r1, r0 - ldrb r0, [r0] - strb r0, [r2, 0x1] - mov r5, sp - adds r0, r3, 0x2 - adds r1, r0 - ldrb r4, [r1] - lsls r2, r4, 24 - lsrs r1, r2, 27 - movs r0, 0x7 - ands r1, r0 - strh r1, [r5, 0x2] - lsrs r2, 25 - mov r9, r2 - movs r0, 0x3 - ands r2, r0 - mov r9, r2 - movs r5, 0x1 - ands r5, r4 - movs r4, 0x1 - mov r8, r4 - cmp r8, r1 - bcs _08125A06 - mov r3, sp -_081259A6: - cmp r5, 0 - bne _081259C4 - mov r0, r8 - lsls r2, r0, 2 - mov r4, sp - adds r1, r4, r2 - ldrb r0, [r3] - mov r4, r8 - subs r0, r4 - strb r0, [r1] - ldrb r0, [r3, 0x1] - add r0, r8 - b _081259D6 - .pool -_081259C4: - mov r0, r8 - lsls r2, r0, 2 - mov r4, sp - adds r1, r4, r2 - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r1] - ldrb r0, [r3, 0x1] - subs r0, 0x1 -_081259D6: - strb r0, [r1, 0x1] - add r2, sp - ldrb r0, [r2] - cmp r0, 0x3F - bhi _081259E6 - ldrb r0, [r2, 0x1] - cmp r0, 0x3F - bls _081259EE -_081259E6: - mov r0, r8 - subs r0, 0x1 - strh r0, [r3, 0x2] - b _08125A06 -_081259EE: - ldrh r0, [r3, 0x2] - mov r1, r8 - subs r0, r1 - strh r0, [r2, 0x2] - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldrh r0, [r3, 0x2] - cmp r8, r0 - bcc _081259A6 -_08125A06: - movs r2, 0 - mov r8, r2 - mov r0, sp - ldrh r0, [r0, 0x2] - cmp r8, r0 - bcc _08125A14 - b _08125B16 -_08125A14: - movs r3, 0x1F -_08125A16: - ldr r1, =gUnknown_03006168 - mov r4, r8 - lsls r0, r4, 2 - mov r2, sp - adds r6, r2, r0 - ldrb r0, [r6, 0x1] - lsls r0, 7 - ldr r1, [r1] - adds r1, r0 - ldrb r0, [r6] - lsls r0, 1 - adds r2, r1, r0 - ldrh r1, [r2] - movs r4, 0x80 - lsls r4, 8 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - bne _08125B02 - movs r7, 0x1F - ands r7, r1 - lsls r0, r1, 16 - lsrs r5, r0, 21 - ands r5, r3 - lsrs r4, r0, 26 - ands r4, r3 - mov r0, r9 - cmp r0, 0 - blt _08125AF8 - cmp r0, 0x1 - ble _08125A78 - cmp r0, 0x3 - bgt _08125AF8 - ldrh r0, [r6, 0x2] - adds r1, r7, r0 - lsls r1, 16 - lsrs r7, r1, 16 - adds r1, r5, r0 - lsls r1, 16 - lsrs r5, r1, 16 - adds r0, r4, r0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r7, 0x1F - bls _08125AEC - movs r7, 0x1F - b _08125AEC - .pool -_08125A78: - mov r1, r10 - lsls r0, r1, 1 - add r0, r10 - ldr r1, =gUnknown_085A1F94 - adds r1, 0x2 - adds r0, r1 - ldrb r0, [r0] - lsrs r0, 3 - movs r1, 0x7 - ands r0, r1 - movs r1, 0x3 - str r2, [sp, 0x18] - str r3, [sp, 0x1C] - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - ldr r2, [sp, 0x18] - ldr r3, [sp, 0x1C] - cmp r0, 0x1 - beq _08125AC8 - cmp r0, 0x1 - bgt _08125AB0 - cmp r0, 0 - beq _08125AB6 - b _08125AF8 - .pool -_08125AB0: - cmp r0, 0x2 - beq _08125ADA - b _08125AF8 -_08125AB6: - ldrh r0, [r6, 0x2] - cmp r7, r0 - bcc _08125AC4 - subs r0, r7, r0 - lsls r0, 16 - lsrs r7, r0, 16 - b _08125AF8 -_08125AC4: - movs r7, 0 - b _08125AF8 -_08125AC8: - ldrh r0, [r6, 0x2] - cmp r5, r0 - bcc _08125AD6 - subs r0, r5, r0 - lsls r0, 16 - lsrs r5, r0, 16 - b _08125AF8 -_08125AD6: - movs r5, 0 - b _08125AF8 -_08125ADA: - ldrh r0, [r6, 0x2] - cmp r4, r0 - bcc _08125AE8 - subs r0, r4, r0 - lsls r0, 16 - lsrs r4, r0, 16 - b _08125AF8 -_08125AE8: - movs r4, 0 - b _08125AF8 -_08125AEC: - cmp r5, 0x1F - bls _08125AF2 - movs r5, 0x1F -_08125AF2: - cmp r4, 0x1F - bls _08125AF8 - movs r4, 0x1F -_08125AF8: - lsls r0, r4, 10 - lsls r1, r5, 5 - orrs r0, r1 - orrs r7, r0 - strh r7, [r2] -_08125B02: - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - mov r0, sp - ldrh r0, [r0, 0x2] - cmp r8, r0 - bcs _08125B16 - b _08125A16 -_08125B16: - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8125954 - - thumb_func_start sub_8125B28 -sub_8125B28: @ 8125B28 - ldrh r2, [r0] - movs r0, 0x1F - adds r1, r2, 0 - ands r1, r0 - asrs r3, r2, 5 - ands r3, r0 - asrs r2, 10 - ands r2, r0 - movs r0, 0x4C - muls r1, r0 - movs r0, 0x97 - muls r0, r3 - adds r1, r0 - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r2 - adds r1, r0 - asrs r1, 8 - lsls r0, r1, 10 - lsls r2, r1, 5 - orrs r0, r2 - orrs r0, r1 - lsls r0, 16 - lsrs r0, 16 - bx lr - thumb_func_end sub_8125B28 - - thumb_func_start sub_8125B5C -sub_8125B5C: @ 8125B5C - push {r4,lr} - lsls r1, 24 - lsrs r4, r1, 24 - ldrh r0, [r0] - movs r2, 0x1F - movs r1, 0x1F - ands r1, r0 - lsls r0, 16 - lsrs r3, r0, 21 - ands r3, r2 - lsrs r0, 26 - ands r0, r2 - cmp r1, 0x10 - bhi _08125B8C - cmp r3, 0x10 - bhi _08125B8C - cmp r0, 0x10 - bhi _08125B8C - adds r0, r4, 0 - bl sub_8125B98 - lsls r0, 16 - lsrs r0, 16 - b _08125B8E -_08125B8C: - ldr r0, =0x00007fff -_08125B8E: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8125B5C - - thumb_func_start sub_8125B98 -sub_8125B98: @ 8125B98 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - mov r8, r0 - movs r6, 0 - movs r7, 0 - adds r0, r4, 0 - movs r1, 0x6 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r4, 0 - movs r1, 0x6 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - bhi _08125C50 - lsls r0, 2 - ldr r1, =_08125BE0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08125BE0: - .4byte _08125BF8 - .4byte _08125C08 - .4byte _08125C18 - .4byte _08125C26 - .4byte _08125C34 - .4byte _08125C42 -_08125BF8: - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r6, r0, 16 - adds r7, r6, 0 - movs r1, 0 - mov r8, r1 - b _08125C50 -_08125C08: - movs r7, 0 - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - mov r6, r8 - b _08125C50 -_08125C18: - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r7, r0, 16 - movs r6, 0 - mov r8, r7 - b _08125C50 -_08125C26: - movs r7, 0 - movs r6, 0 - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r0, 16 - b _08125C4E -_08125C34: - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r7, r0, 16 - movs r6, 0 - mov r8, r6 - b _08125C50 -_08125C42: - movs r7, 0 - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r6, r0, 16 - movs r0, 0 -_08125C4E: - mov r8, r0 -_08125C50: - lsls r0, r7, 10 - lsls r1, r6, 5 - orrs r0, r1 - mov r1, r8 - orrs r1, r0 - lsls r0, r1, 16 - lsrs r0, 16 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8125B98 - - thumb_func_start sub_8125C68 -sub_8125C68: @ 8125C68 - push {lr} - ldrh r0, [r0] - movs r2, 0x1F - movs r1, 0x1F - ands r1, r0 - lsls r0, 16 - lsrs r3, r0, 21 - ands r3, r2 - lsrs r0, 26 - ands r0, r2 - cmp r1, 0x10 - bhi _08125C8C - cmp r3, 0x10 - bhi _08125C8C - cmp r0, 0x10 - bhi _08125C8C - movs r0, 0 - b _08125C8E -_08125C8C: - ldr r0, =0x00007fff -_08125C8E: - pop {r1} - bx r1 - .pool - thumb_func_end sub_8125C68 - - thumb_func_start sub_8125C98 -sub_8125C98: @ 8125C98 - push {r4,lr} - adds r4, r0, 0 - ldrh r3, [r4] - cmp r3, 0 - beq _08125CC0 - movs r2, 0x80 - lsls r2, 8 - adds r0, r2, 0 - ands r0, r3 - cmp r0, 0 - beq _08125CB2 - adds r0, r2, 0 - b _08125CC2 -_08125CB2: - ldrh r1, [r1] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _08125CC0 - ldrh r0, [r4] - b _08125CC2 -_08125CC0: - movs r0, 0 -_08125CC2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8125C98 - - thumb_func_start sub_8125CC8 -sub_8125CC8: @ 8125CC8 - push {r4,lr} - ldrh r1, [r0] - movs r0, 0x1F - movs r3, 0x1F - ands r3, r1 - lsls r1, 16 - lsrs r2, r1, 21 - lsrs r1, 26 - subs r3, r0, r3 - adds r4, r0, 0 - bics r4, r2 - adds r2, r4, 0 - bics r0, r1 - lsls r0, 10 - lsls r2, 5 - orrs r0, r2 - orrs r0, r3 - lsls r0, 16 - lsrs r0, 16 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8125CC8 - - thumb_func_start sub_8125CF4 -sub_8125CF4: @ 8125CF4 - push {r4-r7,lr} - sub sp, 0x14 - adds r7, r1, 0 - ldrh r4, [r0] - ldrh r5, [r7] - lsls r6, r4, 16 - lsls r0, r5, 16 - mov r12, r0 - cmp r4, r5 - beq _08125D66 - mov r2, sp - movs r3, 0x1F - movs r1, 0x1F - adds r0, r1, 0 - ands r0, r4 - strh r0, [r2] - lsrs r0, r6, 21 - ands r0, r3 - strh r0, [r2, 0x2] - lsrs r0, r6, 26 - ands r0, r3 - strh r0, [r2, 0x4] - mov r0, sp - ands r1, r5 - strh r1, [r0, 0x6] - mov r1, sp - mov r2, r12 - lsrs r0, r2, 21 - ands r0, r3 - strh r0, [r1, 0x8] - lsrs r0, r2, 26 - ands r0, r3 - strh r0, [r1, 0xA] - mov r0, sp - ldrh r0, [r0] - cmp r0, 0x19 - bls _08125D4E - mov r0, sp - ldrh r0, [r0, 0x2] - cmp r0, 0x19 - bls _08125D4E - mov r0, sp - ldrh r0, [r0, 0x4] - cmp r0, 0x19 - bhi _08125D66 -_08125D4E: - mov r0, sp - ldrh r0, [r0, 0x6] - cmp r0, 0x19 - bls _08125D6A - mov r0, sp - ldrh r0, [r0, 0x8] - cmp r0, 0x19 - bls _08125D6A - mov r0, sp - ldrh r0, [r0, 0xA] - cmp r0, 0x19 - bls _08125D6A -_08125D66: - ldrh r0, [r7] - b _08125E10 -_08125D6A: - movs r4, 0 - add r6, sp, 0xC - mov r7, sp - adds r7, 0x6 - adds r5, r6, 0 -_08125D74: - lsls r2, r4, 1 - mov r1, sp - adds r0, r1, r2 - adds r1, r7, r2 - ldrh r3, [r0] - ldrh r0, [r1] - cmp r3, r0 - bls _08125D8A - adds r1, r5, r2 - subs r0, r3, r0 - b _08125D8E -_08125D8A: - adds r1, r5, r2 - subs r0, r3 -_08125D8E: - strh r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _08125D74 - adds r1, r6, 0 - ldrh r0, [r1, 0x2] - ldrh r3, [r1] - cmp r3, r0 - bcc _08125DB4 - ldrh r2, [r1, 0x4] - cmp r3, r2 - bcc _08125DAE - adds r2, r3, 0 - b _08125DC8 -_08125DAE: - cmp r0, r2 - bcs _08125DBA - b _08125DC2 -_08125DB4: - ldrh r2, [r1, 0x4] - cmp r0, r2 - bcc _08125DBE -_08125DBA: - ldrh r2, [r1, 0x2] - b _08125DC8 -_08125DBE: - cmp r2, r3 - bcc _08125DC6 -_08125DC2: - ldrh r2, [r1, 0x4] - b _08125DC8 -_08125DC6: - ldrh r2, [r6] -_08125DC8: - mov r0, sp - ldrh r1, [r0, 0x6] - lsrs r0, r2, 1 - movs r6, 0x1F - subs r6, r0 - adds r0, r1, 0 - muls r0, r6 - movs r1, 0x1F - bl __divsi3 - adds r5, r0, 0 - lsls r5, 16 - lsrs r5, 16 - mov r0, sp - ldrh r0, [r0, 0x8] - muls r0, r6 - movs r1, 0x1F - bl __divsi3 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, sp - ldrh r0, [r0, 0xA] - muls r0, r6 - movs r1, 0x1F - bl __divsi3 - lsls r0, 16 - lsrs r0, 6 - lsls r4, 5 - orrs r0, r4 - orrs r5, r0 - lsls r5, 16 - lsrs r5, 16 - adds r0, r5, 0 -_08125E10: - add sp, 0x14 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8125CF4 - - thumb_func_start sub_8125E18 -sub_8125E18: @ 8125E18 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - adds r3, r0, 0 - mov r10, r1 - str r2, [sp] - ldrh r1, [r3] - mov r0, r10 - ldrh r0, [r0] - cmp r1, r0 - bne _08125E40 - ldrh r0, [r2] - cmp r0, r1 - bne _08125E40 - mov r1, r10 - ldrh r0, [r1] - b _08125F28 -_08125E40: - mov r2, r10 - ldrh r0, [r2] - movs r1, 0x1F - mov r9, r1 - movs r4, 0x1F - adds r5, r4, 0 - ands r5, r0 - lsls r0, 16 - lsrs r2, r0, 21 - mov r1, r9 - ands r1, r2 - mov r8, r1 - lsrs r0, 26 - mov r2, r9 - ands r2, r0 - str r2, [sp, 0x4] - ldrh r2, [r3] - adds r0, r4, 0 - ands r0, r2 - lsls r2, 16 - lsrs r1, r2, 21 - mov r3, r9 - ands r1, r3 - adds r0, r1 - lsrs r2, 26 - ands r2, r3 - adds r0, r2 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r7, r0, 16 - mov r1, r8 - adds r0, r5, r1 - ldr r2, [sp, 0x4] - adds r0, r2 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r3, [sp] - ldrh r1, [r3] - ands r4, r1 - lsls r1, 16 - lsrs r0, r1, 21 - mov r2, r9 - ands r0, r2 - adds r4, r0 - lsrs r1, 26 - ands r1, r2 - adds r4, r1 - adds r0, r4, 0 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r7, r6 - bne _08125EC2 - cmp r1, r6 - bne _08125EC2 - mov r3, r10 - ldrh r0, [r3] - b _08125F28 -_08125EC2: - cmp r7, r6 - bls _08125ECA - subs r0, r7, r6 - b _08125ECC -_08125ECA: - subs r0, r6, r7 -_08125ECC: - lsls r0, 16 - lsrs r2, r0, 16 - cmp r1, r6 - bls _08125ED8 - subs r0, r1, r6 - b _08125EDA -_08125ED8: - subs r0, r6, r1 -_08125EDA: - lsls r0, 16 - lsrs r0, 16 - cmp r2, r0 - bcc _08125EE4 - adds r0, r2, 0 -_08125EE4: - lsrs r0, 1 - movs r4, 0x1F - subs r4, r0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r5, 0 - muls r0, r4 - movs r1, 0x1F - bl __divsi3 - lsls r0, 16 - lsrs r5, r0, 16 - mov r0, r8 - muls r0, r4 - movs r1, 0x1F - bl __divsi3 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - ldr r1, [sp, 0x4] - adds r0, r1, 0 - muls r0, r4 - movs r1, 0x1F - bl __divsi3 - lsls r0, 16 - lsrs r0, 6 - mov r2, r8 - lsls r1, r2, 5 - orrs r0, r1 - orrs r5, r0 - lsls r0, r5, 16 - lsrs r0, 16 -_08125F28: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8125E18 - - thumb_func_start sub_8125F38 -sub_8125F38: @ 8125F38 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - adds r3, r0, 0 - mov r10, r1 - str r2, [sp] - ldrh r1, [r3] - mov r0, r10 - ldrh r0, [r0] - cmp r1, r0 - bne _08125F60 - ldrh r0, [r2] - cmp r0, r1 - bne _08125F60 - mov r1, r10 - ldrh r0, [r1] - b _08126046 -_08125F60: - mov r2, r10 - ldrh r0, [r2] - movs r1, 0x1F - mov r9, r1 - movs r4, 0x1F - adds r5, r4, 0 - ands r5, r0 - lsls r0, 16 - lsrs r2, r0, 21 - mov r1, r9 - ands r1, r2 - mov r8, r1 - lsrs r0, 26 - mov r2, r9 - ands r2, r0 - str r2, [sp, 0x4] - ldrh r2, [r3] - adds r0, r4, 0 - ands r0, r2 - lsls r2, 16 - lsrs r1, r2, 21 - mov r3, r9 - ands r1, r3 - adds r0, r1 - lsrs r2, 26 - ands r2, r3 - adds r0, r2 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r7, r0, 16 - mov r1, r8 - adds r0, r5, r1 - ldr r2, [sp, 0x4] - adds r0, r2 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r3, [sp] - ldrh r1, [r3] - ands r4, r1 - lsls r1, 16 - lsrs r0, r1, 21 - mov r2, r9 - ands r0, r2 - adds r4, r0 - lsrs r1, 26 - ands r1, r2 - adds r4, r1 - adds r0, r4, 0 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r7, r6 - bne _08125FE2 - cmp r1, r6 - bne _08125FE2 - mov r3, r10 - ldrh r0, [r3] - b _08126046 -_08125FE2: - cmp r7, r6 - bls _08125FEA - subs r0, r7, r6 - b _08125FEC -_08125FEA: - subs r0, r6, r7 -_08125FEC: - lsls r0, 16 - lsrs r2, r0, 16 - cmp r1, r6 - bls _08125FF8 - subs r0, r1, r6 - b _08125FFA -_08125FF8: - subs r0, r6, r1 -_08125FFA: - lsls r0, 16 - lsrs r0, 16 - cmp r2, r0 - bcc _08126004 - adds r0, r2, 0 -_08126004: - movs r4, 0x1F - subs r4, r0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r5, 0 - muls r0, r4 - movs r1, 0x1F - bl __divsi3 - lsls r0, 16 - lsrs r5, r0, 16 - mov r0, r8 - muls r0, r4 - movs r1, 0x1F - bl __divsi3 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - ldr r1, [sp, 0x4] - adds r0, r1, 0 - muls r0, r4 - movs r1, 0x1F - bl __divsi3 - lsls r0, 16 - lsrs r0, 6 - mov r2, r8 - lsls r1, r2, 5 - orrs r0, r1 - orrs r5, r0 - lsls r0, r5, 16 - lsrs r0, 16 -_08126046: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8125F38 - - thumb_func_start sub_8126058 -sub_8126058: @ 8126058 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - ldrb r1, [r0, 0x1D] - lsrs r5, r1, 3 - ldrb r1, [r0, 0x1E] - lsrs r1, 3 - str r1, [sp, 0x8] - ldr r1, [r0, 0x4] - str r1, [sp] - ldr r2, [r0, 0x10] - str r2, [sp, 0x4] - ldrh r0, [r0, 0x16] - cmp r0, 0x2 - bne _08126108 - movs r1, 0 - ldr r0, [sp, 0x8] - cmp r1, r0 - bcc _08126086 - b _08126194 -_08126086: - movs r0, 0 - adds r2, r1, 0x1 - mov r10, r2 - cmp r0, r5 - bcs _081260FA - adds r2, r1, 0 - muls r2, r5 - mov r9, r2 - lsls r1, 3 - mov r8, r1 -_0812609A: - movs r4, 0 - lsls r6, r0, 4 - adds r7, r0, 0x1 - add r0, r9 - lsls r0, 6 - ldr r1, [sp, 0x4] - adds r1, r0 - mov r12, r1 -_081260AA: - lsls r0, r4, 3 - mov r2, r12 - adds r3, r2, r0 - mov r1, r8 - adds r0, r1, r4 - lsls r0, 3 - muls r0, r5 - lsls r0, 1 - ldr r2, [sp] - adds r0, r2, r0 - adds r2, r0, r6 - ldrh r0, [r2, 0x2] - lsls r0, 8 - ldrh r1, [r2] - orrs r0, r1 - strh r0, [r3] - ldrh r0, [r2, 0x6] - lsls r0, 8 - ldrh r1, [r2, 0x4] - orrs r0, r1 - strh r0, [r3, 0x2] - ldrh r0, [r2, 0xA] - lsls r0, 8 - ldrh r1, [r2, 0x8] - orrs r0, r1 - strh r0, [r3, 0x4] - ldrh r0, [r2, 0xE] - lsls r0, 8 - ldrh r1, [r2, 0xC] - orrs r0, r1 - strh r0, [r3, 0x6] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x7 - bls _081260AA - lsls r0, r7, 16 - lsrs r0, 16 - cmp r0, r5 - bcc _0812609A -_081260FA: - mov r1, r10 - lsls r0, r1, 16 - lsrs r1, r0, 16 - ldr r2, [sp, 0x8] - cmp r1, r2 - bcc _08126086 - b _08126194 -_08126108: - movs r1, 0 - ldr r0, [sp, 0x8] - cmp r1, r0 - bcs _08126194 -_08126110: - movs r0, 0 - adds r2, r1, 0x1 - mov r10, r2 - cmp r0, r5 - bcs _08126188 - adds r2, r1, 0 - muls r2, r5 - mov r9, r2 - lsls r1, 3 - mov r8, r1 -_08126124: - movs r4, 0 - lsls r6, r0, 4 - adds r7, r0, 0x1 - add r0, r9 - lsls r0, 5 - ldr r1, [sp, 0x4] - adds r1, r0 - mov r12, r1 -_08126134: - lsls r0, r4, 2 - mov r2, r12 - adds r3, r2, r0 - mov r1, r8 - adds r0, r1, r4 - lsls r0, 3 - muls r0, r5 - lsls r0, 1 - ldr r2, [sp] - adds r0, r2, r0 - adds r2, r0, r6 - ldrh r1, [r2, 0x2] - lsls r1, 4 - ldrh r0, [r2] - orrs r1, r0 - ldrh r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrh r0, [r2, 0x6] - lsls r0, 12 - orrs r1, r0 - strh r1, [r3] - ldrh r1, [r2, 0xA] - lsls r1, 4 - ldrh r0, [r2, 0x8] - orrs r1, r0 - ldrh r0, [r2, 0xC] - lsls r0, 8 - orrs r1, r0 - ldrh r0, [r2, 0xE] - lsls r0, 12 - orrs r1, r0 - strh r1, [r3, 0x2] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x7 - bls _08126134 - lsls r0, r7, 16 - lsrs r0, 16 - cmp r0, r5 - bcc _08126124 -_08126188: - mov r1, r10 - lsls r0, r1, 16 - lsrs r1, r0, 16 - ldr r2, [sp, 0x8] - cmp r1, r2 - bcc _08126110 -_08126194: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8126058 - - thumb_func_start sub_81261A4 -sub_81261A4: @ 81261A4 - push {lr} - ldr r2, =gUnknown_03006188 - ldrb r1, [r0, 0x18] - lsls r1, 4 - strh r1, [r2] - ldr r3, =gUnknown_03006184 - ldrh r2, [r2] - lsls r2, 1 - ldr r1, [r0, 0x8] - adds r1, r2 - str r1, [r3] - ldr r2, =gUnknown_03006168 - ldr r1, [r0, 0x4] - str r1, [r2] - ldr r2, =gUnknown_03006164 - ldrb r1, [r0, 0x19] - strb r1, [r2] - ldr r2, =gUnknown_03006178 - ldrb r1, [r0, 0x1A] - strb r1, [r2] - ldr r2, =gUnknown_03006174 - ldrb r1, [r0, 0x1B] - strb r1, [r2] - ldr r2, =gUnknown_0300616C - ldrb r1, [r0, 0x1C] - strb r1, [r2] - ldr r2, =gUnknown_03006180 - ldrb r1, [r0, 0x1D] - strb r1, [r2] - ldr r2, =gUnknown_03006170 - ldrb r1, [r0, 0x1E] - strb r1, [r2] - ldrh r0, [r0, 0x14] - cmp r0, 0x5 - bhi _0812626A - lsls r0, 2 - ldr r1, =_0812621C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0812621C: - .4byte _08126234 - .4byte _0812623C - .4byte _08126244 - .4byte _0812624E - .4byte _08126258 - .4byte _08126262 -_08126234: - movs r0, 0 - bl sub_81263A4 - b _0812626A -_0812623C: - movs r0, 0x1 - bl sub_81263A4 - b _0812626A -_08126244: - bl sub_8126270 - bl sub_8126714 - b _0812626A -_0812624E: - bl sub_8126370 - bl sub_8126664 - b _0812626A -_08126258: - bl sub_8126334 - bl sub_81265B4 - b _0812626A -_08126262: - bl sub_8126318 - bl sub_81264FC -_0812626A: - pop {r0} - bx r0 - thumb_func_end sub_81261A4 - - thumb_func_start sub_8126270 -sub_8126270: @ 8126270 - ldr r2, =gUnknown_03006184 - ldr r1, [r2] - movs r0, 0 - strh r0, [r1] - ldr r0, [r2] - ldr r2, =0x000018c6 - adds r1, r2, 0 - strh r1, [r0, 0x2] - ldr r2, =0x000077bd - adds r1, r2, 0 - strh r1, [r0, 0x4] - ldr r2, =0x00002d6b - adds r1, r2, 0 - strh r1, [r0, 0x6] - ldr r2, =0x000018dd - adds r1, r2, 0 - strh r1, [r0, 0x8] - ldr r2, =0x00001ba6 - adds r1, r2, 0 - strh r1, [r0, 0xA] - ldr r2, =0x000074c6 - adds r1, r2, 0 - strh r1, [r0, 0xC] - ldr r2, =0x00001bbd - adds r1, r2, 0 - strh r1, [r0, 0xE] - ldr r2, =0x000074dd - adds r1, r2, 0 - strh r1, [r0, 0x10] - ldr r2, =0x000077a6 - adds r1, r2, 0 - strh r1, [r0, 0x12] - ldr r2, =0x0000197d - adds r1, r2, 0 - strh r1, [r0, 0x14] - ldr r2, =0x00001bab - adds r1, r2, 0 - strh r1, [r0, 0x16] - ldr r2, =0x00007566 - adds r1, r2, 0 - strh r1, [r0, 0x18] - ldr r2, =0x00002cdd - adds r1, r2, 0 - strh r1, [r0, 0x1A] - ldr r2, =0x00002fa6 - adds r1, r2, 0 - strh r1, [r0, 0x1C] - ldr r2, =0x000074cb - adds r1, r2, 0 - strh r1, [r0, 0x1E] - bx lr - .pool - thumb_func_end sub_8126270 - - thumb_func_start sub_8126318 -sub_8126318: @ 8126318 - ldr r2, =gUnknown_03006184 - ldr r0, [r2] - movs r1, 0 - strh r1, [r0] - ldr r2, [r2] - strh r1, [r2, 0x2] - ldr r1, =0x00007fff - adds r0, r1, 0 - strh r0, [r2, 0x4] - bx lr - .pool - thumb_func_end sub_8126318 - - thumb_func_start sub_8126334 -sub_8126334: @ 8126334 - push {r4,r5,lr} - ldr r1, =gUnknown_03006184 - ldr r0, [r1] - movs r2, 0 - strh r2, [r0] - ldr r0, [r1] - strh r2, [r0, 0x2] - movs r4, 0 - adds r5, r1, 0 -_08126346: - ldr r0, [r5] - lsls r2, r4, 1 - adds r2, r0 - adds r0, r4, 0x2 - lsls r3, r0, 1 - lsls r1, r0, 11 - lsls r0, 6 - orrs r1, r0 - orrs r1, r3 - strh r1, [r2, 0x4] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xD - bls _08126346 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8126334 - - thumb_func_start sub_8126370 -sub_8126370: @ 8126370 - push {r4,lr} - ldr r2, =gUnknown_03006184 - ldr r1, [r2] - movs r0, 0 - strh r0, [r1] - movs r3, 0 - adds r4, r2, 0 -_0812637E: - ldr r0, [r4] - lsls r2, r3, 1 - adds r2, r0 - lsls r0, r3, 10 - lsls r1, r3, 5 - orrs r0, r1 - orrs r0, r3 - strh r0, [r2, 0x2] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x1F - bls _0812637E - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8126370 - - thumb_func_start sub_81263A4 -sub_81263A4: @ 81263A4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - movs r1, 0xDF - mov r9, r1 - cmp r0, 0 - bne _081263BC - movs r2, 0xFF - mov r9, r2 -_081263BC: - movs r6, 0 - ldr r3, =gUnknown_03006184 - mov r12, r3 - mov r0, r9 - lsls r4, r0, 1 - ldr r5, =gUnknown_0300616C - cmp r6, r9 - bcs _081263E0 - movs r2, 0 -_081263CE: - ldr r0, [r3] - lsls r1, r6, 1 - adds r1, r0 - strh r2, [r1] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, r9 - bcc _081263CE -_081263E0: - mov r1, r12 - ldr r0, [r1] - adds r0, r4, r0 - ldr r2, =0x00003def - adds r1, r2, 0 - strh r1, [r0] - movs r3, 0 - ldrb r5, [r5] - cmp r3, r5 - bcs _081264E4 -_081263F4: - ldr r2, =gUnknown_03006168 - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r3 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - ldr r1, [r2] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r6, 0 - ldr r0, =gUnknown_03006174 - adds r2, r0, 0 - adds r3, 0x1 - mov r10, r3 - ldrb r3, [r2] - cmp r6, r3 - bcs _081264D6 - ldr r0, =gUnknown_03006188 - mov r8, r0 -_08126424: - ldrh r0, [r4] - movs r3, 0x80 - lsls r3, 8 - adds r1, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _08126464 - mov r1, r8 - ldrh r0, [r1] - strh r0, [r4] - adds r6, 0x1 - adds r7, r4, 0x2 - b _081264CA - .pool -_08126464: - adds r0, r4, 0 - bl sub_81267C4 - lsls r0, 16 - lsrs r5, r0, 16 - movs r3, 0x1 - adds r6, 0x1 - adds r7, r4, 0x2 - cmp r3, r9 - bcs _081264C0 - ldr r0, =gUnknown_03006184 - ldr r2, [r0] - ldrh r1, [r2, 0x2] - mov r12, r0 - cmp r1, 0 - bne _08126494 - strh r5, [r2, 0x2] - mov r2, r8 - ldrh r0, [r2] - adds r0, 0x1 - b _081264BE - .pool -_08126494: - mov r2, r12 - ldr r1, [r2] - lsls r0, r3, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r5 - beq _081264B8 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r9 - bcs _081264C0 - lsls r0, r3, 1 - adds r1, r0, r1 - ldrh r0, [r1] - cmp r0, 0 - bne _08126494 - strh r5, [r1] -_081264B8: - mov r1, r8 - ldrh r0, [r1] - adds r0, r3 -_081264BE: - strh r0, [r4] -_081264C0: - ldr r2, =gUnknown_03006174 - cmp r3, r9 - bne _081264CA - mov r3, r9 - strh r3, [r4] -_081264CA: - lsls r0, r6, 24 - lsrs r6, r0, 24 - adds r4, r7, 0 - ldrb r0, [r2] - cmp r6, r0 - bcc _08126424 -_081264D6: - mov r1, r10 - lsls r0, r1, 24 - lsrs r3, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r3, r0 - bcc _081263F4 -_081264E4: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81263A4 - - thumb_func_start sub_81264FC -sub_81264FC: @ 81264FC - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _081265A0 - ldr r0, =gUnknown_03006168 - mov r8, r0 -_08126510: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r6, 0 - ldr r0, =gUnknown_03006174 - adds r3, r0, 0 - adds r7, r2, 0x1 - ldrb r0, [r3] - cmp r6, r0 - bcs _08126594 - ldr r5, =gUnknown_03006188 -_0812653C: - ldrh r0, [r4] - movs r2, 0x80 - lsls r2, 8 - adds r1, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _0812656C - ldrh r0, [r5] - strh r0, [r4] - b _08126586 - .pool -_0812656C: - adds r0, r4, 0 - bl sub_8125C68 - lsls r0, 16 - cmp r0, 0 - bne _0812657E - ldrh r0, [r5] - adds r0, 0x1 - b _08126582 -_0812657E: - ldrh r0, [r5] - adds r0, 0x2 -_08126582: - strh r0, [r4] - ldr r3, =gUnknown_03006174 -_08126586: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r6, r0 - bcc _0812653C -_08126594: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _08126510 -_081265A0: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81264FC - - thumb_func_start sub_81265B4 -sub_81265B4: @ 81265B4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _08126650 - ldr r0, =gUnknown_03006168 - mov r8, r0 -_081265CA: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - ldr r0, =gUnknown_03006174 - adds r7, r2, 0x1 - ldrb r0, [r0] - cmp r5, r0 - bcs _08126644 - ldr r6, =gUnknown_03006188 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_081265FA: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - beq _08126624 - ldrh r0, [r6] - strh r0, [r4] - b _08126634 - .pool -_08126624: - adds r0, r4, 0 - str r2, [sp] - bl sub_8126908 - ldrh r1, [r6] - adds r0, r1 - strh r0, [r4] - ldr r2, [sp] -_08126634: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r5, r0 - bcc _081265FA -_08126644: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _081265CA -_08126650: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81265B4 - - thumb_func_start sub_8126664 -sub_8126664: @ 8126664 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _08126700 - ldr r0, =gUnknown_03006168 - mov r8, r0 -_0812667A: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - ldr r0, =gUnknown_03006174 - adds r7, r2, 0x1 - ldrb r0, [r0] - cmp r5, r0 - bcs _081266F4 - ldr r6, =gUnknown_03006188 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_081266AA: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - beq _081266D4 - ldrh r0, [r6] - strh r0, [r4] - b _081266E4 - .pool -_081266D4: - adds r0, r4, 0 - str r2, [sp] - bl sub_812693C - ldrh r1, [r6] - adds r0, r1 - strh r0, [r4] - ldr r2, [sp] -_081266E4: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r5, r0 - bcc _081266AA -_081266F4: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _0812667A -_08126700: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8126664 - - thumb_func_start sub_8126714 -sub_8126714: @ 8126714 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcs _081267B0 - ldr r0, =gUnknown_03006168 - mov r8, r0 -_0812672A: - ldr r0, =gUnknown_03006178 - ldrb r1, [r0] - adds r1, r2 - ldr r0, =gUnknown_03006180 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, =gUnknown_03006164 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - ldr r0, =gUnknown_03006174 - adds r7, r2, 0x1 - ldrb r0, [r0] - cmp r5, r0 - bcs _081267A4 - ldr r6, =gUnknown_03006188 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_0812675A: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - beq _08126784 - ldrh r0, [r6] - strh r0, [r4] - b _08126794 - .pool -_08126784: - adds r0, r4, 0 - str r2, [sp] - bl sub_8126838 - ldrh r1, [r6] - adds r0, r1 - strh r0, [r4] - ldr r2, [sp] -_08126794: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, =gUnknown_03006174 - ldrb r0, [r0] - cmp r5, r0 - bcc _0812675A -_081267A4: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, =gUnknown_0300616C - ldrb r0, [r0] - cmp r2, r0 - bcc _0812672A -_081267B0: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8126714 - - thumb_func_start sub_81267C4 -sub_81267C4: @ 81267C4 - push {r4,lr} - ldrh r0, [r0] - movs r1, 0x1F - movs r4, 0x1F - ands r4, r0 - lsls r0, 16 - lsrs r3, r0, 21 - ands r3, r1 - lsrs r2, r0, 26 - ands r2, r1 - movs r1, 0x3 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - beq _081267E8 - movs r0, 0x1C - ands r0, r4 - adds r4, r0, 0x4 -_081267E8: - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - beq _081267F6 - movs r0, 0x1C - ands r0, r3 - adds r3, r0, 0x4 -_081267F6: - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _08126804 - movs r0, 0x1C - ands r0, r2 - adds r2, r0, 0x4 -_08126804: - cmp r4, 0x5 - bhi _0812680A - movs r4, 0x6 -_0812680A: - cmp r4, 0x1E - bls _08126810 - movs r4, 0x1E -_08126810: - cmp r3, 0x5 - bhi _08126816 - movs r3, 0x6 -_08126816: - cmp r3, 0x1E - bls _0812681C - movs r3, 0x1E -_0812681C: - cmp r2, 0x5 - bhi _08126822 - movs r2, 0x6 -_08126822: - cmp r2, 0x1E - bls _08126828 - movs r2, 0x1E -_08126828: - lsls r0, r2, 10 - lsls r1, r3, 5 - orrs r0, r1 - orrs r4, r0 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81267C4 - - thumb_func_start sub_8126838 -sub_8126838: @ 8126838 - push {lr} - ldrh r0, [r0] - movs r1, 0x1F - movs r3, 0x1F - ands r3, r0 - lsls r0, 16 - lsrs r2, r0, 21 - ands r2, r1 - lsrs r0, 26 - ands r0, r1 - cmp r3, 0xB - bhi _0812685C - cmp r2, 0xA - bhi _0812685C - cmp r0, 0xA - bhi _0812685C - movs r0, 0x1 - b _08126902 -_0812685C: - cmp r3, 0x13 - bls _08126880 - cmp r2, 0x13 - bls _08126868 - cmp r0, 0x13 - bhi _0812688C -_08126868: - cmp r3, 0x13 - bls _08126880 - cmp r2, 0x13 - bls _08126876 - cmp r0, 0xE - bhi _0812688C - b _081268C4 -_08126876: - cmp r0, 0x13 - bls _08126880 - cmp r2, 0xE - bhi _0812688C - b _081268A0 -_08126880: - cmp r2, 0x13 - bls _08126890 - cmp r0, 0x13 - bls _08126890 - cmp r3, 0xE - bls _081268E8 -_0812688C: - movs r0, 0x2 - b _08126902 -_08126890: - cmp r3, 0x13 - bls _081268B4 - cmp r2, 0xB - bls _081268A8 - cmp r0, 0xB - bls _081268A4 - cmp r2, r0 - bcs _081268C4 -_081268A0: - movs r0, 0x8 - b _08126902 -_081268A4: - movs r0, 0xA - b _08126902 -_081268A8: - cmp r0, 0xB - bls _081268B0 - movs r0, 0xD - b _08126902 -_081268B0: - movs r0, 0x4 - b _08126902 -_081268B4: - cmp r2, 0x13 - bls _081268D8 - cmp r3, 0xB - bls _081268CC - cmp r0, 0xB - bls _081268C8 - cmp r3, r0 - bcc _081268E8 -_081268C4: - movs r0, 0x7 - b _08126902 -_081268C8: - movs r0, 0xB - b _08126902 -_081268CC: - cmp r0, 0xB - bls _081268D4 - movs r0, 0xE - b _08126902 -_081268D4: - movs r0, 0x5 - b _08126902 -_081268D8: - cmp r0, 0x13 - bls _08126900 - cmp r3, 0xB - bls _081268EC - cmp r2, 0xB - bls _081268F4 - cmp r3, r2 - bcs _081268A0 -_081268E8: - movs r0, 0x9 - b _08126902 -_081268EC: - cmp r2, 0xB - bls _081268F4 - movs r0, 0xC - b _08126902 -_081268F4: - cmp r0, 0xB - bls _081268FC - movs r0, 0xF - b _08126902 -_081268FC: - movs r0, 0x6 - b _08126902 -_08126900: - movs r0, 0x3 -_08126902: - pop {r1} - bx r1 - thumb_func_end sub_8126838 - - thumb_func_start sub_8126908 -sub_8126908: @ 8126908 - push {lr} - ldrh r1, [r0] - movs r3, 0x1F - movs r0, 0x1F - ands r0, r1 - lsls r1, 16 - lsrs r2, r1, 21 - ands r2, r3 - lsrs r1, 26 - ands r1, r3 - adds r0, r2 - adds r0, r1 - movs r1, 0x3 - bl __divsi3 - movs r1, 0x1E - ands r0, r1 - lsls r0, 16 - cmp r0, 0 - beq _08126934 - lsrs r0, 17 - b _08126936 -_08126934: - movs r0, 0x1 -_08126936: - pop {r1} - bx r1 - thumb_func_end sub_8126908 - - thumb_func_start sub_812693C -sub_812693C: @ 812693C - push {lr} - ldrh r1, [r0] - movs r3, 0x1F - movs r0, 0x1F - ands r0, r1 - lsls r1, 16 - lsrs r2, r1, 21 - ands r2, r3 - lsrs r1, 26 - ands r1, r3 - adds r0, r2 - adds r0, r1 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_812693C - - .align 2, 0 @ Don't pad with nop. diff --git a/data/contest_painting.s b/data/contest_painting.s deleted file mode 100644 index 42d76f9bc..000000000 --- a/data/contest_painting.s +++ /dev/null @@ -1,106 +0,0 @@ -@ the third big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085A989C:: @ 85A989C - .incbin "graphics/picture_frame/bg.gbapal" - - .align 2 -gUnknown_085A9A9C:: @ 85A9A9C - .incbin "graphics/picture_frame/frame0.4bpp.rl" - - .align 2 -gUnknown_085AAB20:: @ 85AAB20 - .incbin "graphics/picture_frame/frame1.4bpp.rl" - - .align 2 -gUnknown_085AB750:: @ 85AB750 - .incbin "graphics/picture_frame/frame2.4bpp.rl" - - .align 2 -gUnknown_085AC288:: @ 85AC288 - .incbin "graphics/picture_frame/frame3.4bpp.rl" - - .align 2 -gUnknown_085AD240:: @ 85AD240 - .incbin "graphics/picture_frame/frame4.4bpp.rl" - - .align 2 -gUnknown_085AE370:: @ 85AE370 - .incbin "graphics/picture_frame/frame5.4bpp.rl" - - .align 2 -gUnknown_085AE974:: @ 85AE974 - .incbin "graphics/picture_frame/frame0_map.bin.rl" - - .align 2 -gUnknown_085AEE80:: @ 85AEE80 - .incbin "graphics/picture_frame/frame1_map.bin.rl" - - .align 2 -gUnknown_085AF38C:: @ 85AF38C - .incbin "graphics/picture_frame/frame2_map.bin.rl" - - .align 2 -gUnknown_085AF898:: @ 85AF898 - .incbin "graphics/picture_frame/frame3_map.bin.rl" - - .align 2 -gUnknown_085AFDA4:: @ 85AFDA4 - .incbin "graphics/picture_frame/frame4_map.bin.rl" - - .align 2 -gUnknown_085B02B0:: @ 85B02B0 - .incbin "graphics/picture_frame/frame5_map.bin.rl" - - .align 2 -gUnknown_085B07C0:: @ 85B07C0 - .4byte gContestCoolness - .4byte gContestBeauty - .4byte gContestCuteness - .4byte gContestSmartness - .4byte gContestToughness - - .align 2 -gContestRankTextPointers:: @ 85B07D4 - .4byte gContestRankNormal - .4byte gContestRankSuper - .4byte gContestRankHyper - .4byte gContestRankMaster - .4byte gContestLink - - .align 2 -gUnknown_085B07E8:: @ 85B07E8 - .4byte 0x000010a5 - - .align 2 -gUnknown_085B07EC:: @ 85B07EC - window_template 0x01, 0x02, 0x0e, 0x1a, 0x04, 0x0f, 0x0001 - - .align 2 -gContestPaintingDescriptionPointers:: @ 85B07F4 - .4byte gContestPaintingCool1 - .4byte gContestPaintingCool2 - .4byte gContestPaintingCool3 - .4byte gContestPaintingBeauty1 - .4byte gContestPaintingBeauty2 - .4byte gContestPaintingBeauty3 - .4byte gContestPaintingCute1 - .4byte gContestPaintingCute2 - .4byte gContestPaintingCute3 - .4byte gContestPaintingSmart1 - .4byte gContestPaintingSmart2 - .4byte gContestPaintingSmart3 - .4byte gContestPaintingTough1 - .4byte gContestPaintingTough2 - .4byte gContestPaintingTough3 - -gUnknown_085B0830:: @ 85B0830 - .4byte 0xc0003000, 0x00000000 - -gUnknown_085B0838:: @ 85B0838 - .2byte 0x0000, 0x0000 diff --git a/data/contest_painting_effects.s b/data/contest_painting_effects.s new file mode 100644 index 000000000..d14b51a51 --- /dev/null +++ b/data/contest_painting_effects.s @@ -0,0 +1,308 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_085A1F94:: @ 85A1F94 + .byte 0x00, 0x1d, 0x1c, 0x0e, 0x1e, 0x1b, 0x00, 0x01, 0x32, 0x2e, 0x1e, 0x37, 0x0a, 0x22, 0x1f, 0x05, 0x26, 0x2e, 0x12, 0x17, 0x1e, 0x1a, 0x03, 0x11, 0x05, 0x11, 0x18, 0x05, 0x27, 0x2f, 0x1a, 0x3f + .byte 0x12, 0x22, 0x3f, 0x16, 0x2b, 0x2f, 0x2e, 0x11, 0x02, 0x2d, 0x23, 0x0d, 0x28, 0x17, 0x0c, 0x19, 0x2f, 0x0e, 0x13, 0x30, 0x18, 0x20, 0x2d, 0x28, 0x22, 0x01, 0x03, 0x19, 0x0e, 0x2a, 0x2b, 0x22 + .byte 0x15, 0x25, 0x22, 0x0a, 0x26, 0x39, 0x06, 0x23, 0x16, 0x07, 0x2f, 0x22, 0x3a, 0x1b, 0x3b, 0x36, 0x35, 0x0a, 0x2b, 0x24, 0x36, 0x09, 0x12, 0x1c, 0x2f, 0x23, 0x2e, 0x38, 0x2c, 0x05, 0x2a, 0x20 + .byte 0x07, 0x14, 0x32, 0x31, 0x08, 0x17, 0x1a, 0x24, 0x2d, 0x22, 0x0a, 0x16, 0x1b, 0x26, 0x2b, 0x29, 0x16, 0x11, 0x35, 0x08, 0x14, 0x1e, 0x08, 0x14, 0x05, 0x31, 0x14, 0x38, 0x31, 0x17, 0x34, 0x33 + .byte 0x12, 0x11, 0x09, 0x1f, 0x28, 0x3d, 0x32, 0x35, 0x03, 0x1e, 0x3c, 0x2b, 0x2e, 0x10, 0x01, 0x17, 0x03, 0x3e, 0x22, 0x17, 0x18, 0x34, 0x08, 0x29, 0x19, 0x03, 0x24, 0x28, 0x3d, 0x33, 0x2f, 0x31 + .byte 0x24, 0x19, 0x1b, 0x18, 0x26, 0x07, 0x0d, 0x25, 0x2d, 0x3f, 0x12, 0x2f, 0x15, 0x25, 0x29, 0x0f, 0x12, 0x07, 0x2c, 0x12, 0x2c, 0x0b, 0x26, 0x12, 0x1a, 0x16, 0x00, 0x0b, 0x2f, 0x16, 0x35, 0x24 + .byte 0x1f, 0x1c, 0x22, 0x29, 0x33, 0x27, 0x3b, 0x30, 0x17, 0x11, 0x06, 0x35, 0x3e, 0x31, 0x2f, 0x11, 0x3a, 0x25, 0x2a, 0x02, 0x19, 0x33, 0x18, 0x35, 0x2a, 0x20, 0x21, 0x2e, 0x32, 0x1b, 0x3b, 0x1f + .byte 0x23, 0x39, 0x29, 0x2a, 0x2e, 0x31, 0x29, 0x2a, 0x0e, 0x2d, 0x2d, 0x00, 0x1f, 0x38, 0x28, 0x1b, 0x14, 0x3b, 0x2b, 0x2e, 0x04, 0x26, 0x36, 0x30, 0x11, 0x3b, 0x21, 0x2d, 0x2b, 0x3f, 0x1b, 0x20 + .byte 0x13, 0x31, 0x33, 0x0c, 0x30, 0x22, 0x2b, 0x2b, 0x16, 0x02, 0x1e, 0x1c, 0x12, 0x1c, 0x0f, 0x3c, 0x36, 0x38, 0x10, 0x2d, 0x18, 0x2f, 0x2d, 0x35, 0x3b, 0x11, 0x37, 0x31, 0x13, 0x13, 0x3d, 0x2f + .byte 0x1e, 0x2c, 0x33, 0x2e, 0x37, 0x12, 0x3c, 0x1f, 0x33, 0x32, 0x2a, 0x27, 0x0d, 0x3b, 0x1c, 0x35, 0x2a, 0x27, 0x09, 0x3d, 0x27, 0x12, 0x0b, 0x18, 0x0c, 0x15, 0x1d, 0x20, 0x01, 0x1c, 0x08, 0x3b + .byte 0x1c, 0x12, 0x37, 0x33, 0x15, 0x03, 0x2c, 0x2a, 0x3b, 0x31, 0x0f, 0x04, 0x35, 0x08, 0x17, 0x33, 0x38, 0x3d, 0x2a, 0x2f, 0x35, 0x16, 0x10, 0x35, 0x16, 0x23, 0x13, 0x2c, 0x2f, 0x06, 0x20, 0x27 + .byte 0x3a, 0x24, 0x00, 0x1c, 0x2a, 0x03, 0x39, 0x1d, 0x28, 0x07, 0x1a, 0x20, 0x0a, 0x37, 0x07, 0x35, 0x2d, 0x15, 0x2f, 0x2c, 0x10, 0x2c, 0x23, 0x3f, 0x29, 0x14, 0x2a, 0x21, 0x36, 0x34, 0x1a, 0x2c + .byte 0x1c, 0x3d, 0x33, 0x38, 0x2b, 0x22, 0x35, 0x28, 0x1f, 0x3d, 0x0f, 0x1c, 0x1e, 0x3e, 0x1b, 0x0c, 0x3e, 0x1f, 0x2b, 0x31, 0x2c, 0x32, 0x39, 0x11, 0x05, 0x09, 0x11, 0x04, 0x38, 0x2a, 0x32, 0x00 + .byte 0x16, 0x13, 0x0b, 0x31, 0x34, 0x2a, 0x13, 0x2c, 0x22, 0x21, 0x39, 0x2f, 0x15, 0x37, 0x28, 0x1e, 0x07, 0x3b, 0x2d, 0x11, 0x03, 0x28, 0x2d, 0x30, 0x1e, 0x31, 0x11, 0x11, 0x23, 0x01, 0x1e, 0x3d + .byte 0x31, 0x34, 0x1c, 0x02, 0x34, 0x21, 0x0e, 0x25, 0x3d, 0x07, 0x17, 0x33, 0x15, 0x10, 0x29, 0x32, 0x32, 0x18, 0x1f, 0x30, 0x2d, 0x3b, 0x30, 0x27, 0x3e, 0x16, 0x31, 0x15, 0x12, 0x30, 0x25, 0x17 + .byte 0x33, 0x06, 0x34, 0x00, 0x29, 0x18, 0x3c, 0x03, 0x12, 0x2c, 0x0c, 0x11, 0x09, 0x30, 0x30, 0x10, 0x0e, 0x11, 0x27, 0x16, 0x1b, 0x0c, 0x3b, 0x2e, 0x2b, 0x33, 0x1e, 0x13, 0x2d, 0x2d, 0x11, 0x24 + .byte 0x29, 0x34, 0x3e, 0x2b, 0x24, 0x1e, 0x21, 0x27, 0x1a, 0x2d, 0x04, 0x39, 0x16, 0x3e, 0x33, 0x26, 0x1b, 0x2e, 0x25, 0x0c, 0x06, 0x19, 0x25, 0x19, 0x18, 0x1d, 0x33, 0x33, 0x1d, 0x28, 0x2d, 0x1c + .byte 0x10, 0x2a, 0x1f, 0x35, 0x1e, 0x34, 0x02, 0x10, 0x2b, 0x3a, 0x14, 0x0d, 0x0b, 0x15, 0x0c, 0x2c, 0x10, 0x37, 0x3a, 0x19, 0x06, 0x13, 0x17, 0x24, 0x10, 0x25, 0x24, 0x04, 0x1e, 0x00, 0x35, 0x34 + .byte 0x3a, 0x00, 0x37, 0x3c, 0x07, 0x1a, 0x2b, 0x28, 0x36, 0x34, 0x39, 0x2f, 0x28, 0x09, 0x1f, 0x38, 0x31, 0x30, 0x16, 0x25, 0x31, 0x18, 0x28, 0x31, 0x18, 0x0c, 0x22, 0x06, 0x39, 0x2d, 0x3d, 0x20 + .byte 0x24, 0x2e, 0x27, 0x21, 0x3e, 0x18, 0x18, 0x15, 0x3c, 0x24, 0x06, 0x1b, 0x26, 0x15, 0x0e, 0x22, 0x0a, 0x0d, 0x1f, 0x18, 0x16, 0x34, 0x10, 0x28, 0x21, 0x20, 0x11, 0x11, 0x36, 0x32, 0x15, 0x3b + .byte 0x2e, 0x24, 0x1f, 0x2d, 0x12, 0x36, 0x2e, 0x20, 0x0b, 0x17, 0x33, 0x26, 0x03, 0x1f, 0x08, 0x19, 0x31, 0x2a, 0x18, 0x25, 0x35, 0x2d, 0x2d, 0x30, 0x38, 0x18, 0x1c, 0x25, 0x14, 0x1c, 0x22, 0x28 + .byte 0x08, 0x23, 0x21, 0x26, 0x1e, 0x30, 0x19, 0x0f, 0x15, 0x10, 0x2f, 0x22, 0x12, 0x02, 0x25, 0x3c, 0x01, 0x1d, 0x0e, 0x14, 0x18, 0x0d, 0x18, 0x17, 0x22, 0x0b, 0x31, 0x13, 0x34, 0x21, 0x0f, 0x2d + .byte 0x36, 0x39, 0x1f, 0x25, 0x18, 0x10, 0x1f, 0x2d, 0x20, 0x20, 0x19, 0x0b, 0x31, 0x33, 0x13, 0x14, 0x2e, 0x11, 0x21, 0x2d, 0x0a, 0x37, 0x07, 0x15, 0x1b, 0x32, 0x04, 0x32, 0x06, 0x18, 0x1b, 0x13 + .byte 0x24, 0x12, 0x36, 0x22, 0x16, 0x1d, 0x29, 0x1c, 0x35, 0x17, 0x21, 0x36, 0x17, 0x2b, 0x35, 0x32, 0x19, 0x2a, 0x0f, 0x2e, 0x10, 0x00, 0x34, 0x02, 0x0e, 0x28, 0x31, 0x32, 0x32, 0x3b, 0x05, 0x20 + .byte 0x36, 0x26, 0x12, 0x34, 0x06, 0x34, 0x1e, 0x31, 0x32, 0x35, 0x05, 0x34, 0x1e, 0x13, 0x15, 0x15, 0x14, 0x2c, 0x29, 0x1c, 0x18, 0x24, 0x24, 0x12, 0x22, 0x29, 0x18, 0x34, 0x36, 0x30, 0x1e, 0x01 + .byte 0x23, 0x0c, 0x3c, 0x24, 0x0a, 0x3d, 0x16, 0x27, 0x1e, 0x23, 0x15, 0x02, 0x12, 0x11, 0x19, 0x2a, 0x1d, 0x31, 0x15, 0x03, 0x3b, 0x2a, 0x21, 0x19, 0x2c, 0x0a, 0x23, 0x11, 0x25, 0x11, 0x1a, 0x1a + .byte 0x0a, 0x34, 0x3b, 0x0b, 0x33, 0x21, 0x0b, 0x37, 0x01, 0x31, 0x28, 0x35, 0x1d, 0x27, 0x2c, 0x30, 0x31, 0x2e, 0x39, 0x2d, 0x30, 0x05, 0x2c, 0x12, 0x2a, 0x2b, 0x39, 0x22, 0x20, 0x15, 0x34, 0x1c + .byte 0x1c, 0x01, 0x15, 0x20, 0x16, 0x22, 0x13, 0x04, 0x18, 0x1e, 0x13, 0x10, 0x25, 0x33, 0x15, 0x39, 0x03, 0x31, 0x3f, 0x36, 0x18, 0x14, 0x23, 0x10, 0x2f, 0x1e, 0x1f, 0x1f, 0x17, 0x2c, 0x02, 0x16 + .byte 0x31, 0x20, 0x18, 0x30, 0x2e, 0x18, 0x37, 0x3b, 0x0e, 0x30, 0x10, 0x39, 0x24, 0x26, 0x39, 0x1e, 0x30, 0x26, 0x2e, 0x12, 0x01, 0x14, 0x37, 0x2a, 0x2e, 0x21, 0x06, 0x1d, 0x2a, 0x16, 0x32, 0x09 + .byte 0x38, 0x1c, 0x07, 0x22, 0x17, 0x3b, 0x2d, 0x15, 0x07, 0x1e, 0x2e, 0x1b, 0x2e, 0x1d, 0x04, 0x09, 0x30, 0x30, 0x2d, 0x37, 0x2d, 0x34, 0x24, 0x18, 0x24, 0x25, 0x0e, 0x2d, 0x26, 0x23, 0x0a, 0x16 + .byte 0x12, 0x2d, 0x11, 0x21, 0x28, 0x2e, 0x0f, 0x01, 0x21, 0x01, 0x31, 0x12, 0x3f, 0x1b, 0x1e, 0x21, 0x25, 0x2b, 0x26, 0x18, 0x13, 0x15, 0x2d, 0x34, 0x23, 0x21, 0x36, 0x0e, 0x2e, 0x1c, 0x14, 0x22 + .byte 0x1c, 0x2c, 0x0b, 0x28, 0x1a, 0x18, 0x21, 0x21, 0x07, 0x1a, 0x24, 0x26, 0x29, 0x2b, 0x0a, 0x34, 0x3e, 0x27, 0x33, 0x12, 0x34, 0x1b, 0x1f, 0x01, 0x2a, 0x2e, 0x06, 0x23, 0x2f, 0x1f, 0x14, 0x18 + .byte 0x06, 0x26, 0x31, 0x1f, 0x2b, 0x22, 0x26, 0x2e, 0x1e, 0x15, 0x16, 0x20, 0x22, 0x28, 0x15, 0x37, 0x12, 0x25, 0x04, 0x2c, 0x1f, 0x04, 0x2e, 0x0c, 0x13, 0x18, 0x07, 0x0b, 0x36, 0x1d, 0x1c, 0x2a + .byte 0x30, 0x22, 0x1c, 0x2e, 0x12, 0x2f, 0x2b, 0x21, 0x1e, 0x16, 0x38, 0x30, 0x04, 0x02, 0x16, 0x05, 0x14, 0x20, 0x38, 0x3c, 0x33, 0x21, 0x1b, 0x2f, 0x14, 0x2a, 0x27, 0x38, 0x14, 0x1b, 0x2b, 0x1f + .byte 0x2b, 0x29, 0x2b, 0x25, 0x27, 0x36, 0x21, 0x11, 0x22, 0x1b, 0x29, 0x03, 0x1b, 0x18, 0x24, 0x28, 0x21, 0x2d, 0x36, 0x3c, 0x2c, 0x24, 0x33, 0x17, 0x1f, 0x2a, 0x3a, 0x21, 0x0a, 0x23, 0x37, 0x00 + .byte 0x0b, 0x21, 0x11, 0x38, 0x19, 0x0f, 0x0e, 0x1c, 0x1f, 0x0f, 0x37, 0x3c, 0x10, 0x37, 0x38, 0x31, 0x35, 0x07, 0x15, 0x28, 0x1e, 0x2e, 0x19, 0x26, 0x10, 0x33, 0x3d, 0x35, 0x2f, 0x3a, 0x04, 0x34 + .byte 0x0d, 0x18, 0x1a, 0x01, 0x2d, 0x15, 0x3d, 0x1a, 0x17, 0x17, 0x3f, 0x32, 0x0b, 0x21, 0x11, 0x1e, 0x26, 0x2b, 0x0d, 0x19, 0x24, 0x2e, 0x04, 0x1b, 0x1b, 0x33, 0x20, 0x15, 0x21, 0x1d, 0x1f, 0x04 + .byte 0x21, 0x0f, 0x12, 0x1f, 0x2d, 0x2a, 0x32, 0x03, 0x37, 0x1f, 0x35, 0x07, 0x27, 0x24, 0x1f, 0x31, 0x2f, 0x30, 0x15, 0x06, 0x00, 0x24, 0x0b, 0x22, 0x1a, 0x0c, 0x3b, 0x29, 0x14, 0x1a, 0x17, 0x37 + .byte 0x20, 0x25, 0x3f, 0x26, 0x37, 0x3a, 0x3e, 0x10, 0x22, 0x04, 0x11, 0x28, 0x12, 0x1c, 0x03, 0x2e, 0x2e, 0x0e, 0x38, 0x28, 0x01, 0x29, 0x22, 0x1e, 0x33, 0x19, 0x06, 0x21, 0x27, 0x33, 0x19, 0x1a + .byte 0x02, 0x05, 0x17, 0x11, 0x11, 0x2c, 0x1f, 0x26, 0x1e, 0x39, 0x1f, 0x28, 0x2e, 0x2f, 0x12, 0x22, 0x34, 0x13, 0x3b, 0x26, 0x2f, 0x34, 0x00, 0x14, 0x10, 0x31, 0x11, 0x1d, 0x2d, 0x2a, 0x08, 0x08 + .byte 0x37, 0x15, 0x18, 0x34, 0x04, 0x2b, 0x24, 0x2f, 0x1e, 0x27, 0x22, 0x2a, 0x24, 0x07, 0x14, 0x25, 0x01, 0x27, 0x19, 0x29, 0x0a, 0x29, 0x3d, 0x1c, 0x2f, 0x0d, 0x1f, 0x1c, 0x24, 0x3d, 0x32, 0x36 + .byte 0x1d, 0x24, 0x14, 0x21, 0x16, 0x1a, 0x0d, 0x29, 0x3f, 0x2b, 0x2a, 0x1a, 0x3e, 0x35, 0x11, 0x28, 0x18, 0x32, 0x05, 0x15, 0x21, 0x2e, 0x34, 0x2d, 0x14, 0x2a, 0x3c, 0x08, 0x37, 0x3f, 0x34, 0x1e + .byte 0x27, 0x24, 0x1c, 0x16, 0x16, 0x33, 0x29, 0x3b, 0x19, 0x36, 0x2f, 0x1c, 0x03, 0x25, 0x2c, 0x0b, 0x16, 0x36, 0x1c, 0x1d, 0x1b, 0x2c, 0x27, 0x1b, 0x0b, 0x1f, 0x2b, 0x08, 0x10, 0x27, 0x3f, 0x25 + .byte 0x2f, 0x33, 0x13, 0x1f, 0x04, 0x31, 0x37, 0x0e, 0x2f, 0x12, 0x08, 0x23, 0x20, 0x3a, 0x1a, 0x1e, 0x2f, 0x0b, 0x1f, 0x1e, 0x20, 0x19, 0x23, 0x3b, 0x14, 0x25, 0x00, 0x27, 0x14, 0x04, 0x25, 0x36 + .byte 0x1a, 0x2b, 0x27, 0x21, 0x15, 0x28, 0x13, 0x2c, 0x0e, 0x3c, 0x35, 0x0c, 0x2d, 0x2b, 0x37, 0x16, 0x15, 0x29, 0x15, 0x1d, 0x17, 0x34, 0x36, 0x09, 0x0a, 0x31, 0x37, 0x22, 0x28, 0x17, 0x2b, 0x35 + .byte 0x14, 0x2b, 0x12, 0x08, 0x13, 0x1f, 0x31, 0x13, 0x28, 0x06, 0x07, 0x35, 0x23, 0x3a, 0x29, 0x0f, 0x24, 0x2e, 0x07, 0x35, 0x26, 0x0e, 0x12, 0x15, 0x23, 0x33, 0x2c, 0x0e, 0x21, 0x26, 0x1c, 0x12 + .byte 0x25, 0x23, 0x1d, 0x2f, 0x04, 0x35, 0x33, 0x16, 0x01, 0x24, 0x3d, 0x2c, 0x2e, 0x35, 0x0a, 0x25, 0x11, 0x13, 0x25, 0x1b, 0x1b, 0x15, 0x15, 0x39, 0x10, 0x0b, 0x35, 0x24, 0x3a, 0x27, 0x30, 0x2e + .byte 0x2f, 0x15, 0x10, 0x1f, 0x35, 0x1b, 0x28, 0x35, 0x26, 0x30, 0x37, 0x34, 0x37, 0x2b, 0x0f, 0x30, 0x29, 0x2e, 0x3f, 0x2b, 0x38, 0x34, 0x2b, 0x2b, 0x2f, 0x25, 0x0d, 0x28, 0x2a, 0x33, 0x18, 0x10 + .byte 0x21, 0x12, 0x11, 0x1f, 0x22, 0x34, 0x11, 0x25, 0x23, 0x21, 0x3f, 0x11, 0x26, 0x27, 0x25, 0x28, 0x36, 0x12, 0x15, 0x26, 0x32, 0x11, 0x18, 0x24, 0x32, 0x25, 0x37, 0x27, 0x3a, 0x33, 0x35, 0x07 + .byte 0x1c, 0x1a, 0x0e, 0x2a, 0x1e, 0x2f, 0x1f, 0x00, 0x2e, 0x21, 0x1b, 0x3c, 0x14, 0x2f, 0x3a, 0x2f, 0x3e, 0x38, 0x15, 0x1a, 0x13, 0x2f, 0x29, 0x0d, 0x2f, 0x37, 0x17, 0x18, 0x30, 0x1c, 0x35, 0x15 + .byte 0x34, 0x14, 0x28, 0x11, 0x2c, 0x2c, 0x25, 0x2a, 0x20, 0x3f, 0x28, 0x0c, 0x34, 0x1b, 0x30, 0x2e, 0x25, 0x37, 0x1c, 0x24, 0x1f, 0x25, 0x26, 0x0c, 0x19, 0x34, 0x18, 0x10, 0x35, 0x0a, 0x13, 0x11 + .byte 0x25, 0x13, 0x20, 0x13, 0x19, 0x11, 0x20, 0x28, 0x1d, 0x3e, 0x30, 0x1b, 0x23, 0x24, 0x21, 0x0d, 0x23, 0x23, 0x1d, 0x28, 0x2e, 0x2d, 0x12, 0x1f, 0x0e, 0x2e, 0x2b, 0x0b, 0x31, 0x32, 0x24, 0x3c + .byte 0x2c, 0x13, 0x3c, 0x12, 0x28, 0x16, 0x2a, 0x05, 0x0c, 0x32, 0x39, 0x0b, 0x32, 0x21, 0x04, 0x14, 0x10, 0x31, 0x32, 0x12, 0x1f, 0x23, 0x39, 0x2e, 0x2e, 0x22, 0x3d, 0x27, 0x0c, 0x1e, 0x18, 0x25 + .byte 0x00, 0x17, 0x06, 0x31, 0x14, 0x13, 0x21, 0x1a, 0x14, 0x20, 0x35, 0x0a, 0x3b, 0x25, 0x33, 0x08, 0x28, 0x3d, 0x02, 0x33, 0x23, 0x00, 0x13, 0x22, 0x21, 0x28, 0x30, 0x14, 0x2e, 0x14, 0x32, 0x36 + .byte 0x39, 0x23, 0x1e, 0x1c, 0x11, 0x30, 0x37, 0x16, 0x30, 0x15, 0x31, 0x1f, 0x34, 0x28, 0x2c, 0x35, 0x05, 0x29, 0x37, 0x33, 0x2a, 0x1c, 0x17, 0x2e, 0x10, 0x06, 0x16, 0x32, 0x1f, 0x2f, 0x00, 0x29 + .byte 0x1e, 0x04, 0x01, 0x16, 0x3b, 0x23, 0x1e, 0x1b, 0x34, 0x2a, 0x30, 0x11, 0x2b, 0x03, 0x00, 0x1f, 0x1d, 0x37, 0x1a, 0x3a, 0x18, 0x25, 0x1c, 0x16, 0x2c, 0x04, 0x3f, 0x33, 0x26, 0x23, 0x2d, 0x15 + .byte 0x2c, 0x27, 0x02, 0x35, 0x27, 0x07, 0x35, 0x33, 0x1a, 0x0c, 0x10, 0x28, 0x26, 0x2c, 0x2f, 0x36, 0x16, 0x37, 0x0b, 0x27, 0x1b, 0x3d, 0x18, 0x27, 0x1f, 0x20, 0x2b, 0x2a, 0x33, 0x0b, 0x0f, 0x20 + .byte 0x35, 0x3c, 0x2f, 0x33, 0x21, 0x15, 0x2d, 0x26, 0x34, 0x1f, 0x1a, 0x21, 0x2f, 0x2c, 0x2a, 0x1a, 0x32, 0x1a, 0x3b, 0x3f, 0x21, 0x13, 0x3f, 0x13, 0x0f, 0x24, 0x22, 0x14, 0x1b, 0x10, 0x21, 0x06 + .byte 0x28, 0x25, 0x34, 0x10, 0x2e, 0x0e, 0x14, 0x3c, 0x3e, 0x25, 0x16, 0x06, 0x30, 0x0b, 0x04, 0x1f, 0x3e, 0x02, 0x24, 0x0c, 0x17, 0x25, 0x2b, 0x3c, 0x2d, 0x15, 0x36, 0x33, 0x18, 0x23, 0x2a, 0x1d + .byte 0x10, 0x2a, 0x35, 0x17, 0x28, 0x00, 0x37, 0x24, 0x0a, 0x3b, 0x15, 0x1d, 0x0b, 0x1f, 0x3c, 0x31, 0x25, 0x1d, 0x0f, 0x1d, 0x20, 0x13, 0x34, 0x11, 0x2b, 0x2e, 0x23, 0x0c, 0x2e, 0x24, 0x02, 0x14 + .byte 0x31, 0x16, 0x19, 0x0e, 0x23, 0x35, 0x1a, 0x10, 0x16, 0x14, 0x04, 0x19, 0x2d, 0x27, 0x37, 0x33, 0x02, 0x31, 0x02, 0x04, 0x16, 0x0d, 0x22, 0x25, 0x25, 0x00, 0x16, 0x2a, 0x3f, 0x26, 0x20, 0x0c + .byte 0x12, 0x2f, 0x2e, 0x35, 0x1b, 0x0d, 0x22, 0x1e, 0x01, 0x34, 0x05, 0x22, 0x21, 0x34, 0x2a, 0x32, 0x0b, 0x09, 0x1d, 0x3f, 0x32, 0x2f, 0x3d, 0x18, 0x2d, 0x0b, 0x38, 0x36, 0x39, 0x17, 0x28, 0x34 + .byte 0x04, 0x24, 0x36, 0x0e, 0x2a, 0x38, 0x01, 0x14, 0x3c, 0x24, 0x22, 0x21, 0x03, 0x18, 0x32, 0x2f, 0x12, 0x29, 0x24, 0x31, 0x0a, 0x3b, 0x12, 0x1a, 0x1c, 0x20, 0x30, 0x31, 0x1b, 0x1a, 0x21, 0x10 + .byte 0x05, 0x29, 0x10, 0x26, 0x2d, 0x13, 0x16, 0x0c, 0x1d, 0x2b, 0x06, 0x1b, 0x06, 0x12, 0x14, 0x38, 0x0f, 0x35, 0x23, 0x3a, 0x2c, 0x00, 0x19, 0x33, 0x29, 0x14, 0x2d, 0x2a, 0x21, 0x29, 0x14, 0x31 + .byte 0x14, 0x1a, 0x06, 0x1e, 0x18, 0x1b, 0x28, 0x3b, 0x16, 0x29, 0x15, 0x1e, 0x12, 0x34, 0x0a, 0x14, 0x1b, 0x05, 0x27, 0x0b, 0x01, 0x26, 0x2a, 0x22, 0x35, 0x21, 0x20, 0x18, 0x20, 0x37, 0x17, 0x14 + .byte 0x1f, 0x11, 0x1d, 0x11, 0x25, 0x24, 0x2b, 0x2f, 0x07, 0x3f, 0x1f, 0x2c, 0x25, 0x25, 0x2a, 0x29, 0x18, 0x11, 0x24, 0x28, 0x31, 0x2c, 0x2a, 0x39, 0x0b, 0x26, 0x28, 0x10, 0x26, 0x22, 0x06, 0x16 + .byte 0x09, 0x2c, 0x13, 0x34, 0x19, 0x15, 0x3a, 0x12, 0x21, 0x1d, 0x38, 0x23, 0x12, 0x25, 0x24, 0x21, 0x30, 0x12, 0x37, 0x1a, 0x12, 0x24, 0x3b, 0x25, 0x32, 0x15, 0x23, 0x0d, 0x1a, 0x10, 0x16, 0x2e + .byte 0x26, 0x1d, 0x14, 0x16, 0x3e, 0x2e, 0x1f, 0x0a, 0x16, 0x10, 0x1d, 0x30, 0x2b, 0x04, 0x3a, 0x19, 0x08, 0x2d, 0x2e, 0x28, 0x1e, 0x33, 0x0a, 0x12, 0x2e, 0x0d, 0x03, 0x2f, 0x26, 0x3a, 0x1e, 0x35 + .byte 0x3b, 0x2a, 0x03, 0x1a, 0x18, 0x3f, 0x0b, 0x27, 0x04, 0x05, 0x34, 0x36, 0x0b, 0x27, 0x3b, 0x17, 0x11, 0x0d, 0x27, 0x26, 0x2c, 0x1f, 0x20, 0x26, 0x10, 0x20, 0x25, 0x23, 0x2d, 0x37, 0x09, 0x13 + .byte 0x14, 0x17, 0x2d, 0x2e, 0x3d, 0x23, 0x1d, 0x1a, 0x1f, 0x21, 0x33, 0x2e, 0x28, 0x17, 0x13, 0x26, 0x3c, 0x36, 0x14, 0x1a, 0x33, 0x32, 0x20, 0x2b, 0x19, 0x3e, 0x20, 0x0c, 0x02, 0x2d, 0x3c, 0x3c + .byte 0x2a, 0x30, 0x30, 0x28, 0x25, 0x3f, 0x1e, 0x03, 0x17, 0x1e, 0x35, 0x11, 0x1c, 0x1b, 0x14, 0x2a, 0x28, 0x3a, 0x23, 0x0e, 0x1f, 0x12, 0x36, 0x21, 0x20, 0x07, 0x3b, 0x10, 0x23, 0x19, 0x34, 0x0d + .byte 0x2e, 0x18, 0x3f, 0x20, 0x25, 0x3e, 0x3b, 0x15, 0x0b, 0x2e, 0x12, 0x37, 0x0b, 0x23, 0x3d, 0x32, 0x1f, 0x16, 0x03, 0x27, 0x14, 0x0c, 0x21, 0x18, 0x03, 0x30, 0x3e, 0x21, 0x13, 0x0f, 0x00, 0x32 + .byte 0x3f, 0x23, 0x16, 0x0e, 0x31, 0x1d, 0x18, 0x1c, 0x1d, 0x30, 0x0e, 0x1e, 0x21, 0x20, 0x23, 0x3f, 0x0c, 0x1e, 0x14, 0x33, 0x22, 0x22, 0x21, 0x15, 0x36, 0x05, 0x1e, 0x1d, 0x31, 0x14, 0x20, 0x11 + .byte 0x37, 0x0d, 0x33, 0x19, 0x25, 0x05, 0x36, 0x1e, 0x31, 0x20, 0x35, 0x3a, 0x2f, 0x32, 0x2f, 0x30, 0x14, 0x23, 0x2d, 0x35, 0x1e, 0x29, 0x05, 0x05, 0x1b, 0x09, 0x1f, 0x26, 0x2f, 0x0b, 0x15, 0x15 + .byte 0x11, 0x13, 0x29, 0x1b, 0x18, 0x1c, 0x13, 0x35, 0x34, 0x31, 0x23, 0x27, 0x3f, 0x2f, 0x09, 0x30, 0x19, 0x23, 0x12, 0x34, 0x02, 0x2a, 0x21, 0x09, 0x3c, 0x1d, 0x0c, 0x02, 0x10, 0x22, 0x05, 0x17 + .byte 0x22, 0x08, 0x1b, 0x0a, 0x0f, 0x15, 0x02, 0x11, 0x13, 0x01, 0x21, 0x22, 0x16, 0x39, 0x33, 0x24, 0x38, 0x34, 0x0f, 0x1e, 0x2b, 0x2b, 0x15, 0x15, 0x20, 0x22, 0x2e, 0x3a, 0x3f, 0x31, 0x1a, 0x27 + .byte 0x2b, 0x29, 0x34, 0x14, 0x16, 0x39, 0x2f, 0x13, 0x3e, 0x16, 0x36, 0x21, 0x30, 0x00, 0x24, 0x2b, 0x24, 0x21, 0x30, 0x15, 0x31, 0x13, 0x10, 0x37, 0x24, 0x08, 0x07, 0x23, 0x21, 0x09, 0x25, 0x05 + .byte 0x3c, 0x32, 0x19, 0x03, 0x25, 0x0f, 0x29, 0x2b, 0x16, 0x07, 0x13, 0x3e, 0x3d, 0x25, 0x36, 0x0b, 0x28, 0x2e, 0x2b, 0x16, 0x0c, 0x31, 0x11, 0x30, 0x13, 0x2d, 0x26, 0x3e, 0x37, 0x29, 0x2f, 0x2e + .byte 0x15, 0x3d, 0x17, 0x1c, 0x2e, 0x21, 0x33, 0x2f, 0x10, 0x0d, 0x05, 0x1d, 0x1c, 0x1a, 0x12, 0x0e, 0x18, 0x37, 0x1b, 0x11, 0x14, 0x06, 0x14, 0x21, 0x31, 0x0e, 0x27, 0x1a, 0x03, 0x10, 0x00, 0x34 + .byte 0x31, 0x3f, 0x0b, 0x1d, 0x0f, 0x12, 0x1f, 0x1a, 0x15, 0x10, 0x0f, 0x00, 0x24, 0x3e, 0x0a, 0x2a, 0x30, 0x2b, 0x24, 0x26, 0x31, 0x10, 0x2d, 0x2f, 0x2f, 0x3f, 0x0c, 0x13, 0x12, 0x0b, 0x16, 0x15 + .byte 0x07, 0x1f, 0x28, 0x10, 0x32, 0x0f, 0x17, 0x15, 0x0b, 0x27, 0x33, 0x34, 0x1d, 0x10, 0x1c, 0x3a, 0x12, 0x2c, 0x27, 0x37, 0x0a, 0x1a, 0x32, 0x05, 0x1f, 0x21, 0x24, 0x0d, 0x1f, 0x1c, 0x17, 0x24 + .byte 0x2f, 0x3b, 0x32, 0x3b, 0x25, 0x10, 0x03, 0x2f, 0x21, 0x0c, 0x10, 0x23, 0x0e, 0x3a, 0x2c, 0x33, 0x03, 0x2c, 0x12, 0x06, 0x1c, 0x2a, 0x37, 0x30, 0x3f, 0x01, 0x1e, 0x35, 0x16, 0x37, 0x2c, 0x32 + .byte 0x35, 0x05, 0x11, 0x22, 0x29, 0x09, 0x20, 0x2b, 0x0d, 0x1f, 0x18, 0x0d, 0x20, 0x23, 0x39, 0x16, 0x0f, 0x3a, 0x18, 0x21, 0x35, 0x2b, 0x36, 0x26, 0x2b, 0x23, 0x05, 0x2f, 0x1b, 0x08, 0x17, 0x3e + .byte 0x09, 0x16, 0x2d, 0x3a, 0x37, 0x15, 0x35, 0x35, 0x29, 0x0a, 0x12, 0x02, 0x39, 0x1f, 0x14, 0x34, 0x33, 0x17, 0x1d, 0x18, 0x16, 0x1d, 0x1a, 0x01, 0x39, 0x22, 0x1e, 0x27, 0x36, 0x32, 0x14, 0x26 + .byte 0x0a, 0x39, 0x36, 0x1f, 0x0d, 0x1e, 0x0b, 0x0a, 0x19, 0x35, 0x1d, 0x34, 0x03, 0x12, 0x16, 0x0c, 0x13, 0x2e, 0x0c, 0x34, 0x1e, 0x10, 0x14, 0x1e, 0x23, 0x32, 0x27, 0x02, 0x10, 0x29, 0x35, 0x18 + .byte 0x33, 0x33, 0x1d, 0x1a, 0x3c, 0x15, 0x23, 0x3e, 0x3f, 0x22, 0x2a, 0x02, 0x2c, 0x28, 0x0a, 0x2f, 0x1a, 0x06, 0x35, 0x3c, 0x17, 0x2b, 0x03, 0x12, 0x17, 0x2f, 0x0a, 0x26, 0x12, 0x38, 0x11, 0x36 + .byte 0x1b, 0x23, 0x01, 0x39, 0x35, 0x19, 0x19, 0x17, 0x09, 0x28, 0x22, 0x1e, 0x27, 0x2c, 0x35, 0x33, 0x2c, 0x27, 0x25, 0x31, 0x06, 0x31, 0x2d, 0x1a, 0x39, 0x28, 0x2d, 0x04, 0x1e, 0x24, 0x3e, 0x1c + .byte 0x3c, 0x30, 0x1b, 0x3f, 0x3e, 0x37, 0x22, 0x36, 0x11, 0x00, 0x01, 0x1c, 0x12, 0x1a, 0x10, 0x12, 0x1e, 0x2c, 0x1f, 0x12, 0x2a, 0x2f, 0x06, 0x19, 0x35, 0x1a, 0x18, 0x3b, 0x09, 0x36, 0x34, 0x1d + .byte 0x13, 0x02, 0x07, 0x10, 0x20, 0x2f, 0x1d, 0x0b, 0x03, 0x33, 0x1c, 0x16, 0x31, 0x05, 0x13, 0x1b, 0x29, 0x06, 0x13, 0x30, 0x2d, 0x36, 0x2a, 0x2d, 0x2c, 0x19, 0x34, 0x1c, 0x0f, 0x15, 0x12, 0x36 + .byte 0x15, 0x2c, 0x3a, 0x06, 0x1c, 0x12, 0x1d, 0x26, 0x03, 0x38, 0x1d, 0x01, 0x01, 0x2d, 0x17, 0x2e, 0x10, 0x14, 0x17, 0x1c, 0x34, 0x0f, 0x28, 0x09, 0x37, 0x1b, 0x28, 0x1d, 0x26, 0x29, 0x2d, 0x36 + .byte 0x1e, 0x17, 0x28, 0x15, 0x0f, 0x1c, 0x20, 0x2d, 0x10, 0x27, 0x16, 0x2e, 0x14, 0x09, 0x12, 0x3b, 0x3d, 0x21, 0x25, 0x1a, 0x2c, 0x00, 0x22, 0x36, 0x0d, 0x30, 0x10, 0x17, 0x19, 0x1b, 0x00, 0x3b + .byte 0x21, 0x2a, 0x28, 0x34, 0x2d, 0x0f, 0x16, 0x0a, 0x30, 0x28, 0x06, 0x00, 0x25, 0x31, 0x2e, 0x2a, 0x14, 0x33, 0x28, 0x36, 0x10, 0x2e, 0x05, 0x2e, 0x19, 0x19, 0x1a, 0x15, 0x2c, 0x14, 0x17, 0x37 + .byte 0x0f, 0x13, 0x32, 0x17, 0x1b, 0x39, 0x18, 0x32, 0x2e, 0x32, 0x1e, 0x24, 0x1d, 0x31, 0x12, 0x1d, 0x2b, 0x14, 0x0c, 0x27, 0x36, 0x2e, 0x32, 0x06, 0x0a, 0x1a, 0x28, 0x28, 0x20, 0x3a, 0x3a, 0x17 + .byte 0x08, 0x27, 0x36, 0x18, 0x1a, 0x10, 0x1e, 0x26, 0x1b, 0x1f, 0x33, 0x1f, 0x21, 0x17, 0x2f, 0x01, 0x08, 0x20, 0x35, 0x03, 0x19, 0x3b, 0x02, 0x20, 0x02, 0x2d, 0x23, 0x0e, 0x17, 0x32, 0x31, 0x29 + .byte 0x11, 0x22, 0x17, 0x22, 0x3a, 0x2c, 0x23, 0x34, 0x20, 0x18, 0x00, 0x3a, 0x22, 0x25, 0x33, 0x21, 0x33, 0x04, 0x27, 0x04, 0x18, 0x32, 0x2c, 0x0c, 0x2f, 0x28, 0x14, 0x2c, 0x3f, 0x30, 0x2b, 0x30 + .byte 0x21, 0x1d, 0x01, 0x25, 0x32, 0x05, 0x23, 0x34, 0x24, 0x10, 0x30, 0x3d, 0x14, 0x1b, 0x3f, 0x38, 0x2f, 0x22, 0x1b, 0x32, 0x25, 0x07, 0x37, 0x0a, 0x0c, 0x1d, 0x03, 0x1e, 0x1a, 0x0f, 0x3c, 0x12 + .byte 0x11, 0x18, 0x1d, 0x00, 0x35, 0x2f, 0x32, 0x18, 0x14, 0x23, 0x30, 0x1b, 0x11, 0x3d, 0x12, 0x1a, 0x16, 0x35, 0x28, 0x05, 0x24, 0x17, 0x3d, 0x37, 0x2e, 0x09, 0x2e, 0x18, 0x1d, 0x17, 0x20, 0x1f + .byte 0x18, 0x23, 0x2c, 0x2f, 0x20, 0x3f, 0x16, 0x3f, 0x29, 0x2e, 0x23, 0x3b, 0x29, 0x18, 0x39, 0x13, 0x1e, 0x32, 0x35, 0x14, 0x1d, 0x2a, 0x35, 0x01, 0x1d, 0x3e, 0x3b, 0x1e, 0x22, 0x1e, 0x16, 0x18 + .byte 0x22, 0x12, 0x3e, 0x29, 0x33, 0x2f, 0x14, 0x19, 0x3b, 0x07, 0x15, 0x06, 0x3d, 0x29, 0x35, 0x37, 0x23, 0x34, 0x1d, 0x2d, 0x18, 0x12, 0x1b, 0x0b, 0x13, 0x24, 0x13, 0x38, 0x1c, 0x1f, 0x0b, 0x1b + .byte 0x13, 0x21, 0x1c, 0x06, 0x39, 0x32, 0x37, 0x3d, 0x26, 0x29, 0x26, 0x15, 0x3c, 0x33, 0x27, 0x00, 0x01, 0x2e, 0x15, 0x18, 0x31, 0x0d, 0x2c, 0x13, 0x27, 0x3b, 0x20, 0x2d, 0x01, 0x26, 0x23, 0x15 + .byte 0x30, 0x24, 0x00, 0x17, 0x37, 0x3f, 0x33, 0x25, 0x24, 0x31, 0x06, 0x3b, 0x37, 0x03, 0x18, 0x1a, 0x2c, 0x34, 0x14, 0x1d, 0x36, 0x18, 0x3a, 0x04, 0x23, 0x12, 0x26, 0x15, 0x2b, 0x19, 0x1a, 0x29 + .byte 0x2c, 0x36, 0x01, 0x19, 0x1d, 0x2f, 0x06, 0x2b, 0x0c, 0x12, 0x26, 0x36, 0x32, 0x1d, 0x0d, 0x12, 0x28, 0x03, 0x28, 0x13, 0x29, 0x06, 0x17, 0x03, 0x38, 0x21, 0x30, 0x2c, 0x10, 0x22, 0x00, 0x28 + .byte 0x24, 0x3b, 0x1c, 0x20, 0x3e, 0x13, 0x02, 0x0c, 0x19, 0x29, 0x2c, 0x1a, 0x39, 0x30, 0x22, 0x2a, 0x1f, 0x22, 0x14, 0x34, 0x2c, 0x14, 0x25, 0x1b, 0x06, 0x3b, 0x15, 0x06, 0x1c, 0x13, 0x15, 0x03 + .byte 0x18, 0x1e, 0x2a, 0x1b, 0x17, 0x25, 0x2f, 0x1c, 0x29, 0x2e, 0x02, 0x32, 0x1e, 0x1d, 0x28, 0x35, 0x36, 0x03, 0x34, 0x16, 0x3d, 0x2a, 0x12, 0x0d, 0x13, 0x1d, 0x2d, 0x21, 0x32, 0x17, 0x2e, 0x1a + .byte 0x15, 0x26, 0x22, 0x2f, 0x15, 0x3c, 0x0e, 0x20, 0x2f, 0x27, 0x13, 0x04, 0x09, 0x32, 0x1e, 0x01, 0x34, 0x06, 0x16, 0x1e, 0x2e, 0x1b, 0x1c, 0x28, 0x13, 0x2a, 0x30, 0x34, 0x12, 0x12, 0x32, 0x18 + .byte 0x1d, 0x1d, 0x35, 0x07, 0x1c, 0x16, 0x2d, 0x3d, 0x35, 0x1c, 0x1b, 0x24, 0x21, 0x2d, 0x1e, 0x10, 0x09, 0x14, 0x3d, 0x11, 0x12, 0x25, 0x02, 0x26, 0x23, 0x02, 0x19, 0x19, 0x05, 0x14, 0x0b, 0x21 + .byte 0x1a, 0x09, 0x02, 0x2c, 0x18, 0x28, 0x2d, 0x1e, 0x10, 0x12, 0x2e, 0x18, 0x2e, 0x1f, 0x02, 0x2c, 0x14, 0x17, 0x24, 0x39, 0x08, 0x32, 0x16, 0x14, 0x22, 0x16, 0x28, 0x21, 0x11, 0x10, 0x2c, 0x23 + .byte 0x36, 0x2b, 0x39, 0x21, 0x26, 0x0e, 0x06, 0x2d, 0x3c, 0x3e, 0x26, 0x2a, 0x1b, 0x1f, 0x00, 0x3c, 0x33, 0x35, 0x3f, 0x14, 0x00, 0x0b, 0x10, 0x34, 0x3c, 0x17, 0x2d, 0x07, 0x1f, 0x24, 0x39, 0x27 + .byte 0x16, 0x00, 0x1d, 0x33, 0x2b, 0x1e, 0x0f, 0x08, 0x31, 0x3a, 0x09, 0x13, 0x0c, 0x21, 0x1c, 0x2a, 0x17, 0x34, 0x29, 0x27, 0x10, 0x37, 0x1b, 0x18, 0x15, 0x08, 0x2f, 0x1f, 0x16, 0x12, 0x1f, 0x28 + .byte 0x34, 0x1c, 0x20, 0x22, 0x12, 0x01, 0x12, 0x21, 0x31, 0x10, 0x22, 0x26, 0x1e, 0x01, 0x3d, 0x11, 0x1e, 0x27, 0x25, 0x3d, 0x30, 0x24, 0x1d, 0x11, 0x22, 0x36, 0x30, 0x16, 0x1f, 0x3e, 0x2a, 0x3c + .byte 0x27, 0x1b, 0x1f, 0x29, 0x10, 0x1e, 0x05, 0x2a, 0x0a, 0x10, 0x14, 0x1f, 0x00, 0x2e, 0x0b, 0x3b, 0x18, 0x0a, 0x39, 0x30, 0x37, 0x0b, 0x1f, 0x1d, 0x0a, 0x29, 0x3e, 0x1c, 0x33, 0x13, 0x2e, 0x28 + .byte 0x27, 0x1b, 0x1e, 0x1d, 0x02, 0x1c, 0x01, 0x25, 0x14, 0x3a, 0x10, 0x1c, 0x12, 0x05, 0x2a, 0x30, 0x20, 0x26, 0x2f, 0x2e, 0x2e, 0x03, 0x07, 0x24, 0x36, 0x04, 0x2b, 0x11, 0x25, 0x2d, 0x28, 0x0e + .byte 0x2e, 0x0f, 0x1d, 0x15, 0x1c, 0x28, 0x30, 0x1f, 0x23, 0x26, 0x36, 0x12, 0x37, 0x3a, 0x31, 0x10, 0x2c, 0x2c, 0x2f, 0x1a, 0x0d, 0x15, 0x3f, 0x3c, 0x32, 0x35, 0x1c, 0x16, 0x33, 0x16, 0x28, 0x1d + .byte 0x3f, 0x21, 0x2c, 0x3e, 0x2b, 0x24, 0x23, 0x2f, 0x32, 0x15, 0x2a, 0x1b, 0x10, 0x35, 0x18, 0x37, 0x10, 0x3b, 0x1e, 0x11, 0x2b, 0x16, 0x24, 0x1d, 0x16, 0x26, 0x3c, 0x2d, 0x11, 0x15, 0x28, 0x28 + .byte 0x27, 0x27, 0x27, 0x3b, 0x3a, 0x16, 0x1a, 0x0c, 0x1a, 0x15, 0x08, 0x25, 0x0b, 0x10, 0x22, 0x1a, 0x3e, 0x17, 0x28, 0x1f, 0x1e, 0x01, 0x1e, 0x1e, 0x1c, 0x2f, 0x10, 0x25, 0x0b, 0x34, 0x3e, 0x0c + .byte 0x1a, 0x1b, 0x10, 0x2a, 0x0f, 0x14, 0x17, 0x0f, 0x3f, 0x17, 0x03, 0x15, 0x1f, 0x02, 0x36, 0x17, 0x15, 0x1d, 0x18, 0x08, 0x36, 0x10, 0x14, 0x0d, 0x2b, 0x0a, 0x05, 0x1d, 0x26, 0x12, 0x1e, 0x3e + .byte 0x18, 0x19, 0x36, 0x18, 0x37, 0x17, 0x39, 0x2e, 0x0d, 0x04, 0x19, 0x16, 0x22, 0x15, 0x3e, 0x26, 0x1f, 0x00, 0x06, 0x17, 0x33, 0x22, 0x1d, 0x2b, 0x39, 0x2b, 0x3e, 0x31, 0x1c, 0x22, 0x3f, 0x13 + .byte 0x30, 0x1c, 0x31, 0x07, 0x2b, 0x14, 0x32, 0x35, 0x1e, 0x02, 0x07, 0x20, 0x0f, 0x3b, 0x11, 0x20, 0x07, 0x12, 0x2a, 0x30, 0x1d, 0x28, 0x38, 0x36, 0x20, 0x01, 0x17, 0x15, 0x20, 0x21, 0x3a, 0x1b + .byte 0x1e, 0x38, 0x12, 0x24, 0x03, 0x3e, 0x1f, 0x29, 0x1d, 0x13, 0x20, 0x27, 0x19, 0x12, 0x25, 0x20, 0x32, 0x33, 0x2b, 0x3f, 0x05, 0x31, 0x35, 0x3c, 0x2d, 0x2d, 0x02, 0x2e, 0x10, 0x2a, 0x16, 0x17 + .byte 0x08, 0x31, 0x17, 0x2e, 0x2b, 0x30, 0x1e, 0x15, 0x31, 0x15, 0x26, 0x08, 0x10, 0x33, 0x15, 0x01, 0x27, 0x12, 0x07, 0x2f, 0x29, 0x27, 0x34, 0x3f, 0x08, 0x31, 0x1c, 0x20, 0x1a, 0x33, 0x0c, 0x13 + .byte 0x18, 0x31, 0x24, 0x37, 0x2d, 0x2e, 0x21, 0x18, 0x24, 0x3a, 0x27, 0x31, 0x35, 0x3e, 0x30, 0x3a, 0x14, 0x33, 0x0f, 0x1a, 0x2d, 0x30, 0x2e, 0x11, 0x1a, 0x31, 0x1d, 0x17, 0x3c, 0x18, 0x33, 0x31 + .byte 0x23, 0x1d, 0x39, 0x2d, 0x10, 0x1d, 0x2f, 0x24, 0x15, 0x1c, 0x25, 0x01, 0x2b, 0x22, 0x16, 0x2e, 0x1b, 0x25, 0x35, 0x37, 0x10, 0x26, 0x39, 0x01, 0x36, 0x17, 0x2b, 0x14, 0x09, 0x16, 0x17, 0x20 + .byte 0x28, 0x23, 0x26, 0x3a, 0x26, 0x27, 0x2a, 0x24, 0x36, 0x02, 0x2c, 0x29, 0x30, 0x35, 0x36, 0x01, 0x1f, 0x28, 0x3b, 0x1d, 0x23, 0x1e, 0x2d, 0x11, 0x1e, 0x2c, 0x2f, 0x32, 0x19, 0x3f, 0x26, 0x31 + .byte 0x38, 0x1e, 0x17, 0x05, 0x18, 0x2e, 0x00, 0x2e, 0x12, 0x34, 0x3f, 0x34, 0x16, 0x10, 0x29, 0x20, 0x3d, 0x36, 0x2f, 0x16, 0x25, 0x12, 0x17, 0x10, 0x21, 0x37, 0x35, 0x25, 0x37, 0x2d, 0x01, 0x08 + .byte 0x27, 0x03, 0x1f, 0x29, 0x0d, 0x2a, 0x16, 0x3a, 0x3f, 0x33, 0x2b, 0x19, 0x1d, 0x2a, 0x1f, 0x29, 0x28, 0x2c, 0x10, 0x28, 0x30, 0x10, 0x39, 0x14, 0x1b, 0x00, 0x18, 0x21, 0x28, 0x0c, 0x37, 0x11 + .byte 0x10, 0x11, 0x3c, 0x33, 0x32, 0x33, 0x36, 0x1a, 0x36, 0x00, 0x1c, 0x31, 0x1b, 0x1d, 0x38, 0x1d, 0x10, 0x3c, 0x39, 0x27, 0x3a, 0x3f, 0x14, 0x19, 0x12, 0x14, 0x0d, 0x1f, 0x18, 0x00, 0x25, 0x18 + .byte 0x28, 0x1c, 0x32, 0x27, 0x03, 0x1a, 0x26, 0x2d, 0x2a, 0x29, 0x28, 0x27, 0x0a, 0x2a, 0x18, 0x0a, 0x1a, 0x30, 0x20, 0x1a, 0x2e, 0x06, 0x0b, 0x1d, 0x0f, 0x0c, 0x1c, 0x35, 0x28, 0x1c, 0x3d, 0x16 + .byte 0x23, 0x21, 0x1c, 0x31, 0x14, 0x1c, 0x2e, 0x22, 0x32, 0x35, 0x09, 0x29, 0x30, 0x20, 0x1a, 0x10, 0x31, 0x3f, 0x2c, 0x0a, 0x3d, 0x37, 0x0b, 0x2e, 0x2d, 0x1f, 0x22, 0x31, 0x06, 0x07, 0x29, 0x22 + .byte 0x17, 0x2d, 0x30, 0x11, 0x18, 0x0c, 0x19, 0x15, 0x07, 0x0a, 0x34, 0x18, 0x29, 0x27, 0x33, 0x0c, 0x30, 0x03, 0x1a, 0x37, 0x06, 0x01, 0x2d, 0x0f, 0x3b, 0x2b, 0x11, 0x1f, 0x37, 0x2b, 0x21, 0x36 + .byte 0x3f, 0x23, 0x17, 0x17, 0x07, 0x2b, 0x2b, 0x0e, 0x30, 0x11, 0x39, 0x1d, 0x29, 0x03, 0x33, 0x30, 0x03, 0x2f, 0x3c, 0x20, 0x26, 0x03, 0x22, 0x14, 0x3a, 0x28, 0x35, 0x01, 0x28, 0x2b, 0x3e, 0x15 + .byte 0x18, 0x30, 0x07, 0x17, 0x3b, 0x2c, 0x30, 0x15, 0x07, 0x2c, 0x17, 0x27, 0x1d, 0x3f, 0x1e, 0x33, 0x0d, 0x17, 0x10, 0x15, 0x0e, 0x30, 0x09, 0x05, 0x30, 0x2d, 0x20, 0x15, 0x3c, 0x3d, 0x30, 0x0c + .byte 0x17, 0x1c, 0x1a, 0x0d, 0x25, 0x2b, 0x2b, 0x2a, 0x02, 0x16, 0x2d, 0x17, 0x31, 0x17, 0x00, 0x08, 0x13, 0x37, 0x35, 0x21, 0x1e, 0x1c, 0x1f, 0x2b, 0x32, 0x1c, 0x10, 0x2a, 0x16, 0x3a, 0x33, 0x31 + .byte 0x17, 0x2b, 0x2a, 0x0c, 0x3d, 0x11, 0x28, 0x0a, 0x30, 0x23, 0x0a, 0x26, 0x0a, 0x14, 0x24, 0x0b, 0x0f, 0x30, 0x1b, 0x1e, 0x29, 0x02, 0x35, 0x28, 0x3b, 0x02, 0x14, 0x00, 0x0f, 0x35, 0x1c, 0x3c + .byte 0x2e, 0x28, 0x38, 0x19, 0x1b, 0x11, 0x12, 0x09, 0x16, 0x10, 0x2e, 0x0d, 0x20, 0x3d, 0x04, 0x32, 0x16, 0x2c, 0x25, 0x02, 0x3d, 0x18, 0x0b, 0x13, 0x1c, 0x22, 0x2a, 0x1c, 0x20, 0x27, 0x22, 0x05 + .byte 0x26, 0x22, 0x12, 0x1d, 0x2c, 0x08, 0x05, 0x2e, 0x3f, 0x1c, 0x17, 0x24, 0x0d, 0x33, 0x36, 0x08, 0x24, 0x10, 0x22, 0x29, 0x1c, 0x0a, 0x11, 0x25, 0x0f, 0x10, 0x24, 0x38, 0x2f, 0x25, 0x32, 0x1e + .byte 0x06, 0x2a, 0x29, 0x3e, 0x3a, 0x28, 0x34, 0x17, 0x33, 0x18, 0x33, 0x17, 0x07, 0x14, 0x1f, 0x11, 0x17, 0x20, 0x13, 0x0e, 0x14, 0x3b, 0x1c, 0x12, 0x2a, 0x13, 0x37, 0x2a, 0x35, 0x32, 0x30, 0x02 + .byte 0x25, 0x00, 0x07, 0x1f, 0x0c, 0x04, 0x2c, 0x37, 0x37, 0x30, 0x25, 0x12, 0x25, 0x12, 0x22, 0x21, 0x22, 0x35, 0x33, 0x07, 0x20, 0x2d, 0x27, 0x0e, 0x30, 0x34, 0x19, 0x1a, 0x0a, 0x3c, 0x25, 0x07 + .byte 0x1d, 0x2b, 0x31, 0x3a, 0x12, 0x1a, 0x3d, 0x37, 0x16, 0x15, 0x16, 0x39, 0x13, 0x15, 0x2d, 0x03, 0x2e, 0x06, 0x39, 0x2c, 0x16, 0x00, 0x13, 0x35, 0x2a, 0x35, 0x24, 0x01, 0x18, 0x24, 0x37, 0x28 + .byte 0x25, 0x1b, 0x34, 0x25, 0x19, 0x17, 0x27, 0x2f, 0x1b, 0x27, 0x0d, 0x10, 0x36, 0x3c, 0x30, 0x3c, 0x33, 0x23, 0x3e, 0x27, 0x1e, 0x25, 0x2d, 0x29, 0x1f, 0x12, 0x21, 0x37, 0x32, 0x1f, 0x11, 0x21 + .byte 0x35, 0x30, 0x0c, 0x19, 0x25, 0x3d, 0x26, 0x17, 0x02, 0x1d, 0x14, 0x2e, 0x11, 0x38, 0x13, 0x30, 0x0a, 0x2b, 0x20, 0x1e, 0x10, 0x15, 0x37, 0x30, 0x2e, 0x1e, 0x04, 0x2c, 0x14, 0x34, 0x19, 0x08 + .byte 0x14, 0x18, 0x0e, 0x1c, 0x30, 0x1a, 0x2e, 0x1b, 0x1f, 0x39, 0x31, 0x0c, 0x1c, 0x28, 0x3e, 0x33, 0x23, 0x0f, 0x13, 0x16, 0x25, 0x39, 0x2f, 0x14, 0x1b, 0x1a, 0x28, 0x3e, 0x21, 0x2d, 0x19, 0x11 + .byte 0x0c, 0x34, 0x32, 0x39, 0x31, 0x19, 0x1a, 0x08, 0x34, 0x09, 0x2f, 0x11, 0x30, 0x04, 0x1c, 0x02, 0x3b, 0x1b, 0x33, 0x21, 0x33, 0x38, 0x02, 0x1a, 0x31, 0x38, 0x32, 0x1f, 0x1d, 0x16, 0x17, 0x10 + .byte 0x1b, 0x32, 0x20, 0x17, 0x00, 0x33, 0x12, 0x21, 0x0f, 0x27, 0x14, 0x19, 0x27, 0x24, 0x2c, 0x37, 0x25, 0x05, 0x2f, 0x3d, 0x25, 0x11, 0x12, 0x30, 0x1a, 0x16, 0x03, 0x1a, 0x14, 0x09, 0x13, 0x02 + .byte 0x23, 0x22, 0x01, 0x3c, 0x10, 0x3f, 0x2d, 0x23, 0x31, 0x3f, 0x23, 0x17, 0x00, 0x33, 0x3f, 0x0f, 0x2f, 0x26, 0x07, 0x15, 0x21, 0x2b, 0x2a, 0x38, 0x39, 0x1e, 0x09, 0x25, 0x2b, 0x3b, 0x30, 0x25 + .byte 0x12, 0x2d, 0x13, 0x32, 0x19, 0x28, 0x24, 0x1c, 0x2d, 0x35, 0x32, 0x26, 0x0d, 0x23, 0x1e, 0x1d, 0x07, 0x21, 0x0b, 0x34, 0x17, 0x2d, 0x32, 0x32, 0x3a, 0x3c, 0x35, 0x1a, 0x10, 0x33, 0x1a, 0x07 + .byte 0x22, 0x3b, 0x1b, 0x2a, 0x33, 0x1f, 0x26, 0x0e, 0x35, 0x1a, 0x3b, 0x0a, 0x1c, 0x11, 0x07, 0x11, 0x0d, 0x3c, 0x2d, 0x1e, 0x37, 0x29, 0x11, 0x05, 0x12, 0x15, 0x2f, 0x1c, 0x24, 0x31, 0x16, 0x2b + .byte 0x21, 0x1b, 0x23, 0x10, 0x31, 0x02, 0x14, 0x29, 0x26, 0x20, 0x16, 0x10, 0x17, 0x10, 0x0b, 0x0f, 0x33, 0x01, 0x2e, 0x14, 0x21, 0x0e, 0x37, 0x1a, 0x1d, 0x2f, 0x1e, 0x30, 0x24, 0x04, 0x14, 0x2d + .byte 0x11, 0x00, 0x30, 0x08, 0x2a, 0x1d, 0x1d, 0x22, 0x21, 0x24, 0x2c, 0x37, 0x24, 0x11, 0x12, 0x04, 0x2e, 0x28, 0x1d, 0x18, 0x23, 0x3c, 0x16, 0x16, 0x10, 0x17, 0x31, 0x20, 0x21, 0x12, 0x33, 0x3e + .byte 0x34, 0x06, 0x13, 0x13, 0x17, 0x38, 0x2b, 0x14, 0x0d, 0x15, 0x24, 0x3b, 0x2b, 0x34, 0x3b, 0x1e, 0x18, 0x07, 0x34, 0x37, 0x1d, 0x1f, 0x0b, 0x29, 0x20, 0x12, 0x1e, 0x1d, 0x1a, 0x24, 0x24, 0x3d + .byte 0x28, 0x24, 0x0b, 0x12, 0x33, 0x1b, 0x3a, 0x22, 0x14, 0x13, 0x2a, 0x31, 0x38, 0x15, 0x37, 0x2b, 0x2e, 0x19, 0x1e, 0x2c, 0x3f, 0x1b, 0x2a, 0x33, 0x1f, 0x33, 0x3f, 0x15, 0x29, 0x01, 0x1e, 0x18 + .byte 0x1f, 0x22, 0x19, 0x33, 0x3c, 0x34, 0x1e, 0x12, 0x22, 0x0d, 0x37, 0x2c, 0x0f, 0x08, 0x31, 0x2e, 0x09, 0x36, 0x01, 0x05, 0x1e, 0x1c, 0x04, 0x1e, 0x0c, 0x01, 0x1c, 0x29, 0x28, 0x2f, 0x39, 0x2d + .byte 0x14, 0x09, 0x22, 0x36, 0x04, 0x37, 0x37, 0x2d, 0x2f, 0x35, 0x24, 0x23, 0x1b, 0x08, 0x20, 0x32, 0x20, 0x1f, 0x34, 0x02, 0x31, 0x19, 0x18, 0x13, 0x36, 0x06, 0x2b, 0x1e, 0x0e, 0x1b, 0x10, 0x2f + .byte 0x0e, 0x1c, 0x11, 0x38, 0x13, 0x01, 0x37, 0x19, 0x14, 0x11, 0x26, 0x31, 0x3d, 0x33, 0x1d, 0x1b, 0x34, 0x25, 0x31, 0x2f, 0x11, 0x0a, 0x2f, 0x39, 0x17, 0x1b, 0x05, 0x0e, 0x13, 0x29, 0x25, 0x22 + .byte 0x15, 0x0d, 0x20, 0x2b, 0x27, 0x21, 0x3e, 0x24, 0x27, 0x2a, 0x2b, 0x16, 0x24, 0x3d, 0x15, 0x15, 0x30, 0x31, 0x0f, 0x33, 0x24, 0x06, 0x16, 0x13, 0x06, 0x31, 0x10, 0x2e, 0x3f, 0x10, 0x05, 0x0d + .byte 0x2f, 0x3c, 0x1f, 0x19, 0x12, 0x13, 0x24, 0x0f, 0x33, 0x36, 0x15, 0x3b, 0x33, 0x03, 0x0f, 0x2a, 0x3b, 0x3c, 0x2c, 0x36, 0x09, 0x29, 0x11, 0x3b, 0x27, 0x28, 0x2b, 0x31, 0x1a, 0x0e, 0x2f, 0x39 + .byte 0x2c, 0x31, 0x0e, 0x3c, 0x35, 0x2c, 0x24, 0x33, 0x3d, 0x11, 0x2b, 0x07, 0x3c, 0x37, 0x14, 0x18, 0x13, 0x1d, 0x3f, 0x2e, 0x30, 0x12, 0x25, 0x26, 0x1d, 0x11, 0x07, 0x11, 0x1e, 0x34, 0x01, 0x11 + .byte 0x0b, 0x39, 0x21, 0x29, 0x02, 0x29, 0x15, 0x10, 0x1a, 0x30, 0x1f, 0x35, 0x3c, 0x2b, 0x2a, 0x30, 0x3b, 0x36, 0x20, 0x1a, 0x23, 0x32, 0x24, 0x2b, 0x15, 0x20, 0x1c, 0x25, 0x3d, 0x36, 0x2d, 0x14 + .byte 0x31, 0x18, 0x23, 0x17, 0x18, 0x05, 0x13, 0x34, 0x30, 0x37, 0x0e, 0x39, 0x23, 0x1d, 0x1f, 0x17, 0x01, 0x15, 0x2f, 0x0b, 0x3e, 0x1b, 0x0d, 0x19, 0x2e, 0x31, 0x38, 0x1c, 0x15, 0x34, 0x15, 0x13 + .byte 0x19, 0x29, 0x19, 0x14, 0x27, 0x15, 0x18, 0x23, 0x29, 0x0c, 0x27, 0x2d, 0x0e, 0x17, 0x34, 0x18, 0x10, 0x3b, 0x1e, 0x29, 0x34, 0x2c, 0x22, 0x31, 0x08, 0x13, 0x1d, 0x18, 0x1a, 0x1c, 0x0b, 0x2a + .byte 0x19, 0x1e, 0x1a, 0x23, 0x27, 0x17, 0x3b, 0x0e, 0x37, 0x19, 0x2b, 0x16, 0x2f, 0x08, 0x21, 0x37, 0x02, 0x20, 0x0b, 0x32, 0x30, 0x16, 0x05, 0x30, 0x13, 0x05, 0x1a, 0x07, 0x39, 0x19, 0x0c, 0x3b + .byte 0x2a, 0x15, 0x05, 0x30, 0x30, 0x05, 0x19, 0x13, 0x00, 0x12, 0x27, 0x16, 0x2a, 0x0f, 0x28, 0x27, 0x0c, 0x23, 0x2f, 0x39, 0x28, 0x2a, 0x24, 0x25, 0x1f, 0x18, 0x29, 0x14, 0x16, 0x05, 0x1a, 0x35 + .byte 0x2f, 0x26, 0x0a, 0x3a, 0x29, 0x34, 0x2c, 0x36, 0x2e, 0x3a, 0x15, 0x1a, 0x0a, 0x2d, 0x16, 0x14, 0x2e, 0x35, 0x28, 0x2a, 0x35, 0x0f, 0x11, 0x11, 0x32, 0x19, 0x20, 0x1a, 0x28, 0x17, 0x1a, 0x28 + .byte 0x16, 0x33, 0x25, 0x13, 0x2c, 0x29, 0x09, 0x16, 0x33, 0x1d, 0x27, 0x26, 0x15, 0x0c, 0x2f, 0x22, 0x1c, 0x19, 0x29, 0x33, 0x10, 0x2d, 0x11, 0x1b, 0x16, 0x19, 0x2e, 0x0d, 0x0c, 0x28, 0x37, 0x3a + .byte 0x34, 0x2a, 0x1d, 0x37, 0x30, 0x0a, 0x36, 0x24, 0x39, 0x1b, 0x39, 0x0a, 0x32, 0x11, 0x03, 0x2d, 0x32, 0x1d, 0x30, 0x38, 0x1e, 0x27, 0x2e, 0x17, 0x18, 0x16, 0x17, 0x2a, 0x36, 0x3b, 0x31, 0x17 + .byte 0x04, 0x19, 0x3a, 0x25, 0x2d, 0x00, 0x36, 0x27, 0x25, 0x12, 0x33, 0x06, 0x0a, 0x14, 0x11, 0x05, 0x2f, 0x03, 0x35, 0x2f, 0x0b, 0x34, 0x29, 0x00, 0x31, 0x13, 0x27, 0x0f, 0x1c, 0x1d, 0x06, 0x2d + .byte 0x1c, 0x30, 0x27, 0x2f, 0x2a, 0x27, 0x16, 0x20, 0x31, 0x33, 0x2b, 0x2b, 0x05, 0x30, 0x36, 0x29, 0x23, 0x35, 0x10, 0x16, 0x2f, 0x2d, 0x20, 0x29, 0x37, 0x13, 0x24, 0x2d, 0x0e, 0x25, 0x08, 0x0a + .byte 0x18, 0x0f, 0x03, 0x1b, 0x31, 0x0c, 0x37, 0x1e, 0x34, 0x31, 0x1b, 0x0e, 0x25, 0x1a, 0x07, 0x34, 0x0d, 0x3c, 0x33, 0x00, 0x3a, 0x36, 0x04, 0x27, 0x12, 0x23, 0x18, 0x24, 0x0d, 0x0b, 0x18, 0x31 + .byte 0x32, 0x37, 0x00, 0x0d, 0x21, 0x32, 0x10, 0x12, 0x26, 0x0d, 0x19, 0x29, 0x24, 0x2b, 0x3d, 0x21, 0x1f, 0x1e, 0x1b, 0x28, 0x0d, 0x12, 0x28, 0x35, 0x1e, 0x23, 0x0a, 0x2e, 0x22, 0x27, 0x27, 0x35 + .byte 0x01, 0x0e, 0x20, 0x31, 0x39, 0x29, 0x3b, 0x24, 0x36, 0x14, 0x10, 0x33, 0x18, 0x2c, 0x26, 0x04, 0x2d, 0x15, 0x1a, 0x11, 0x37, 0x0f, 0x0b, 0x14, 0x0e, 0x2c, 0x2c, 0x21, 0x17, 0x2c, 0x16, 0x21 + .byte 0x35, 0x3e, 0x10, 0x10, 0x0a, 0x05, 0x1e, 0x3b, 0x09, 0x13, 0x26, 0x18, 0x1e, 0x23, 0x0c, 0x1a, 0x33, 0x37, 0x1f, 0x09, 0x12, 0x35, 0x3d, 0x0d, 0x15, 0x36, 0x06, 0x24, 0x33, 0x30, 0x29, 0x3b + .byte 0x0f, 0x28, 0x34, 0x2a, 0x2c, 0x02, 0x12, 0x35, 0x09, 0x22, 0x31, 0x3b, 0x31, 0x1c, 0x33, 0x22, 0x27, 0x3d, 0x34, 0x15, 0x14, 0x22, 0x28, 0x28, 0x10, 0x1e, 0x21, 0x31, 0x10, 0x2d, 0x16, 0x21 + .byte 0x1e, 0x05, 0x33, 0x0f, 0x30, 0x31, 0x0e, 0x1a, 0x35, 0x38, 0x2e, 0x28, 0x26, 0x37, 0x1e, 0x2b, 0x13, 0x33, 0x1f, 0x1e, 0x37, 0x0a, 0x28, 0x24, 0x32, 0x1c, 0x1a, 0x1f, 0x3f, 0x19, 0x39, 0x39 + .byte 0x29, 0x2c, 0x1b, 0x14, 0x15, 0x2a, 0x17, 0x32, 0x0f, 0x21, 0x30, 0x21, 0x18, 0x23, 0x2a, 0x27, 0x3d, 0x07, 0x10, 0x0b, 0x3f, 0x2f, 0x31, 0x02, 0x2e, 0x08, 0x39, 0x2f, 0x3f, 0x20, 0x18, 0x2d + .byte 0x34, 0x11, 0x2e, 0x34, 0x10, 0x26, 0x12, 0x23, 0x25, 0x0a, 0x37, 0x34, 0x09, 0x25, 0x0a, 0x3e, 0x16, 0x1a, 0x17, 0x11, 0x38, 0x1c, 0x20, 0x11, 0x21, 0x26, 0x05, 0x0f, 0x18, 0x26, 0x2b, 0x32 + .byte 0x0a, 0x0c, 0x16, 0x03, 0x29, 0x1d, 0x29, 0x3b, 0x23, 0x16, 0x1b, 0x29, 0x07, 0x09, 0x17, 0x17, 0x2c, 0x1c, 0x35, 0x33, 0x30, 0x17, 0x12, 0x1e, 0x3d, 0x1a, 0x2b, 0x21, 0x1d, 0x10, 0x0a, 0x08 + .byte 0x17, 0x14, 0x3c, 0x36, 0x28, 0x36, 0x36, 0x3b, 0x20, 0x1b, 0x13, 0x22, 0x1d, 0x13, 0x3a, 0x15, 0x02, 0x23, 0x2c, 0x3e, 0x19, 0x14, 0x39, 0x3c, 0x1a, 0x10, 0x08, 0x1e, 0x0a, 0x13, 0x29, 0x3f + .byte 0x38, 0x2c, 0x07, 0x23, 0x1f, 0x19, 0x2a, 0x24, 0x14, 0x3c, 0x1f, 0x0d, 0x04, 0x37, 0x1a, 0x2f, 0x28, 0x2a, 0x1d, 0x1e, 0x11, 0x37, 0x29, 0x28, 0x27, 0x12, 0x0d, 0x00, 0x26, 0x0a, 0x3c, 0x26 + .byte 0x1f, 0x1c, 0x33, 0x04, 0x3a, 0x2c, 0x24, 0x3d, 0x2b, 0x26, 0x31, 0x2f, 0x13, 0x1c, 0x21, 0x3e, 0x12, 0x23, 0x36, 0x0a, 0x1a, 0x2d, 0x1e, 0x19, 0x05, 0x1f, 0x1b, 0x1e, 0x0a, 0x1f, 0x20, 0x08 + .byte 0x24, 0x2c, 0x0c, 0x33, 0x1d, 0x1f, 0x11, 0x0e, 0x12, 0x10, 0x27, 0x12, 0x19, 0x2a, 0x13, 0x31, 0x1c, 0x04, 0x30, 0x1a, 0x38, 0x1f, 0x2c, 0x35, 0x25, 0x07, 0x0b, 0x33, 0x2d, 0x02, 0x1a, 0x2a + .byte 0x35, 0x35, 0x16, 0x2f, 0x14, 0x11, 0x31, 0x33, 0x2c, 0x31, 0x1e, 0x3c, 0x3a, 0x27, 0x3c, 0x2b, 0x12, 0x27, 0x1d, 0x12, 0x36, 0x2c, 0x2b, 0x25, 0x3b, 0x35, 0x12, 0x3d, 0x27, 0x13, 0x23, 0x19 + .byte 0x33, 0x2c, 0x26, 0x09, 0x3c, 0x12, 0x15, 0x1a, 0x23, 0x21, 0x07, 0x1a, 0x22, 0x25, 0x20, 0x19, 0x1b, 0x2c, 0x3a, 0x19, 0x35, 0x05, 0x26, 0x1d, 0x23, 0x22, 0x25, 0x0e, 0x1e, 0x11, 0x13, 0x30 + .byte 0x12, 0x2c, 0x22, 0x25, 0x0a, 0x1d, 0x18, 0x23, 0x3e, 0x1d, 0x02, 0x28, 0x25, 0x21, 0x0e, 0x20, 0x21, 0x22, 0x37, 0x18, 0x33, 0x27, 0x23, 0x23, 0x31, 0x24, 0x1a, 0x1a, 0x3e, 0x25, 0x24, 0x24 + .byte 0x01, 0x18, 0x34, 0x10, 0x22, 0x07, 0x00, 0x37, 0x06, 0x20, 0x20, 0x3a, 0x02, 0x2b, 0x07, 0x2c, 0x2c, 0x09, 0x2f, 0x2a, 0x01, 0x32, 0x2c, 0x00, 0x35, 0x13, 0x2b, 0x3c, 0x1f, 0x36, 0x37, 0x1e + .byte 0x20, 0x35, 0x1d, 0x0c, 0x07, 0x33, 0x16, 0x08, 0x12, 0x3f, 0x36, 0x11, 0x0b, 0x1f, 0x2d, 0x21, 0x20, 0x33, 0x17, 0x1a, 0x2e, 0x16, 0x01, 0x2f, 0x2f, 0x1c, 0x34, 0x29, 0x31, 0x2e, 0x3b, 0x38 + .byte 0x31, 0x0d, 0x16, 0x12, 0x07, 0x29, 0x24, 0x33, 0x3c, 0x34, 0x3e, 0x1e, 0x18, 0x30, 0x02, 0x34, 0x2a, 0x34, 0x1b, 0x2e, 0x23, 0x18, 0x34, 0x00, 0x1f, 0x20, 0x0e, 0x28, 0x15, 0x33, 0x37, 0x27 + .byte 0x35, 0x23, 0x37, 0x3e, 0x11, 0x32, 0x2e, 0x36, 0x3a, 0x02, 0x2b, 0x00, 0x36, 0x1d, 0x13, 0x29, 0x16, 0x08, 0x2b, 0x37, 0x08, 0x02, 0x27, 0x32, 0x2d, 0x34, 0x30, 0x36, 0x29, 0x2e, 0x10, 0x12 + .byte 0x3c, 0x2e, 0x2a, 0x04, 0x33, 0x30, 0x3f, 0x01, 0x22, 0x37, 0x14, 0x1d, 0x27, 0x00, 0x2f, 0x0c, 0x39, 0x26, 0x27, 0x04, 0x21, 0x19, 0x08, 0x1d, 0x01, 0x04, 0x1e, 0x27, 0x1b, 0x2b, 0x31, 0x17 + .byte 0x1f, 0x07, 0x01, 0x2d, 0x2e, 0x3b, 0x1f, 0x34, 0x24, 0x31, 0x32, 0x2b, 0x24, 0x0e, 0x07, 0x1e, 0x0f, 0x33, 0x10, 0x16, 0x21, 0x32, 0x39, 0x02, 0x1a, 0x33, 0x3d, 0x22, 0x0c, 0x25, 0x1a, 0x29 + .byte 0x29, 0x28, 0x3a, 0x32, 0x26, 0x0b, 0x13, 0x22, 0x1f, 0x0f, 0x1c, 0x04, 0x2c, 0x20, 0x39, 0x1a, 0x1b, 0x1a, 0x2a, 0x1f, 0x24, 0x13, 0x1a, 0x31, 0x3b, 0x33, 0x39, 0x23, 0x28, 0x31, 0x07, 0x31 + .byte 0x1f, 0x10, 0x20, 0x29, 0x17, 0x32, 0x26, 0x3b, 0x2d, 0x02, 0x3c, 0x1c, 0x0e, 0x00, 0x20, 0x14, 0x3e, 0x37, 0x01, 0x0f, 0x2d, 0x06, 0x12, 0x27, 0x30, 0x13, 0x19, 0x00, 0x33, 0x2a, 0x0c, 0x07 + .byte 0x27, 0x11, 0x3a, 0x1c, 0x15, 0x0a, 0x13, 0x1f, 0x0d, 0x2a, 0x37, 0x07, 0x2a, 0x34, 0x35, 0x34, 0x28, 0x16, 0x27, 0x06, 0x02, 0x36, 0x09, 0x23, 0x30, 0x14, 0x02, 0x28, 0x39, 0x32, 0x34, 0x24 + .byte 0x35, 0x12, 0x12, 0x22, 0x26, 0x09, 0x07, 0x33, 0x0f, 0x3e, 0x1e, 0x00, 0x3c, 0x33, 0x10, 0x37, 0x14, 0x3a, 0x03, 0x25, 0x2d, 0x1e, 0x24, 0x36, 0x36, 0x26, 0x1f, 0x3c, 0x1a, 0x37, 0x33, 0x25 + .byte 0x23, 0x13, 0x1f, 0x33, 0x0d, 0x13, 0x25, 0x30, 0x1e, 0x17, 0x03, 0x18, 0x18, 0x18, 0x14, 0x30, 0x07, 0x22, 0x3e, 0x33, 0x21, 0x14, 0x37, 0x16, 0x16, 0x00, 0x12, 0x2c, 0x12, 0x2f, 0x25, 0x3f + .byte 0x1e, 0x24, 0x19, 0x16, 0x16, 0x0f, 0x35, 0x2d, 0x10, 0x11, 0x24, 0x2a, 0x28, 0x19, 0x25, 0x2e, 0x0c, 0x16, 0x1f, 0x38, 0x21, 0x36, 0x3d, 0x1a, 0x2f, 0x3b, 0x32, 0x12, 0x36, 0x13, 0x29, 0x0e + .byte 0x30, 0x31, 0x19, 0x07, 0x2f, 0x25, 0x23, 0x28, 0x20, 0x08, 0x29, 0x2a, 0x00, 0x30, 0x30, 0x38, 0x23, 0x1e, 0x0f, 0x1f, 0x3b, 0x1b, 0x30, 0x3a, 0x37, 0x2f, 0x39, 0x37, 0x35, 0x39, 0x2d, 0x2f + .byte 0x1f, 0x2e, 0x1e, 0x1a, 0x2b, 0x1e, 0x14, 0x17, 0x20, 0x2f, 0x03, 0x11, 0x1d, 0x00, 0x30, 0x17, 0x2b, 0x1d, 0x35, 0x28, 0x25, 0x3b, 0x0f, 0x11, 0x09, 0x04, 0x2e, 0x23, 0x11, 0x1e, 0x13, 0x37 + .byte 0x1e, 0x37, 0x37, 0x1e, 0x07, 0x01, 0x32, 0x14, 0x06, 0x32, 0x11, 0x0c, 0x2e, 0x36, 0x2e, 0x24, 0x15, 0x2a, 0x1c, 0x22, 0x15, 0x34, 0x2c, 0x1e, 0x35, 0x22, 0x27, 0x33, 0x19, 0x3f, 0x2d, 0x21 + .byte 0x33, 0x15, 0x26, 0x1a, 0x11, 0x16, 0x3e, 0x12, 0x2b, 0x24, 0x15, 0x3c, 0x0f, 0x2d, 0x31, 0x15, 0x36, 0x3f, 0x24, 0x1d, 0x25, 0x01, 0x37, 0x33, 0x16, 0x1a, 0x1f, 0x0e, 0x10, 0x2f, 0x0b, 0x12 + .byte 0x2a, 0x1a, 0x25, 0x17, 0x0a, 0x35, 0x09, 0x28, 0x35, 0x02, 0x13, 0x36, 0x34, 0x2f, 0x17, 0x03, 0x04, 0x31, 0x3e, 0x26, 0x11, 0x35, 0x33, 0x31, 0x22, 0x17, 0x23, 0x1d, 0x05, 0x2b, 0x2e, 0x27 + .byte 0x20, 0x03, 0x2b, 0x1d, 0x01, 0x19, 0x1e, 0x0e, 0x05, 0x18, 0x16, 0x25, 0x17, 0x02, 0x28, 0x18, 0x19, 0x0b, 0x24, 0x3e, 0x35, 0x16, 0x2e, 0x29, 0x25, 0x3e, 0x38, 0x1e, 0x3a, 0x2f, 0x12, 0x14 + .byte 0x17, 0x2d, 0x11, 0x12, 0x30, 0x15, 0x31, 0x18, 0x08, 0x0b, 0x29, 0x2d, 0x00, 0x33, 0x2c, 0x06, 0x1a, 0x14, 0x1c, 0x2e, 0x04, 0x08, 0x12, 0x1b, 0x2b, 0x2d, 0x2a, 0x37, 0x33, 0x10, 0x27, 0x2c + .byte 0x1d, 0x0e, 0x34, 0x20, 0x02, 0x12, 0x1e, 0x1a, 0x2e, 0x07, 0x0b, 0x10, 0x36, 0x1e, 0x33, 0x2b, 0x28, 0x1b, 0x31, 0x25, 0x1f, 0x38, 0x3a, 0x2f, 0x39, 0x30, 0x2f, 0x12, 0x09, 0x14, 0x0e, 0x08 + .byte 0x19, 0x00, 0x0d, 0x2c, 0x1b, 0x0e, 0x34, 0x11, 0x25, 0x15, 0x0c, 0x2d, 0x26, 0x36, 0x2c, 0x16, 0x31, 0x31, 0x2c, 0x03, 0x1a, 0x16, 0x1c, 0x32, 0x14, 0x0a, 0x3e, 0x36, 0x33, 0x1b, 0x27, 0x1f + .byte 0x32, 0x18, 0x33, 0x26, 0x33, 0x1a, 0x13, 0x1a, 0x0f, 0x34, 0x1c, 0x35, 0x2c, 0x2f, 0x38, 0x03, 0x18, 0x15, 0x0f, 0x27, 0x31, 0x29, 0x20, 0x28, 0x0e, 0x28, 0x31, 0x2c, 0x2e, 0x15, 0x19, 0x1b + .byte 0x10, 0x03, 0x2f, 0x2e, 0x2a, 0x32, 0x2a, 0x27, 0x1b, 0x36, 0x04, 0x1e, 0x3b, 0x04, 0x21, 0x07, 0x2f, 0x19, 0x27, 0x1d, 0x1d, 0x3c, 0x3d, 0x2e, 0x25, 0x08, 0x32, 0x3b, 0x34, 0x2a, 0x0c, 0x10 + .byte 0x13, 0x25, 0x35, 0x1a, 0x2f, 0x19, 0x28, 0x17, 0x00, 0x2b, 0x0a, 0x1c, 0x17, 0x0a, 0x11, 0x1b, 0x35, 0x13, 0x37, 0x29, 0x1c, 0x28, 0x0c, 0x31, 0x35, 0x3c, 0x10, 0x1a, 0x1b, 0x3a, 0x2d, 0x3a + .byte 0x1c, 0x18, 0x22, 0x10, 0x2d, 0x1c, 0x3c, 0x12, 0x17, 0x18, 0x2a, 0x0b, 0x2b, 0x2f, 0x2d, 0x04, 0x2e, 0x3c, 0x13, 0x23, 0x01, 0x1c, 0x2e, 0x14, 0x16, 0x22, 0x0c, 0x24, 0x13, 0x35, 0x37, 0x34 + .byte 0x1b, 0x30, 0x1e, 0x3a, 0x1c, 0x20, 0x06, 0x06, 0x36, 0x09, 0x15, 0x1a, 0x1b, 0x1a, 0x27, 0x0f, 0x33, 0x35, 0x37, 0x06, 0x23, 0x3a, 0x12, 0x1d, 0x00, 0x16, 0x29, 0x0e, 0x1d, 0x35, 0x3f, 0x38 + .byte 0x16, 0x2a, 0x3c, 0x34, 0x13, 0x32, 0x10, 0x17, 0x2c, 0x37, 0x29, 0x2a, 0x1e, 0x35, 0x2f, 0x2d, 0x3c, 0x2a, 0x11, 0x28, 0x13, 0x21, 0x19, 0x1e, 0x34, 0x0c, 0x06, 0x2d, 0x09, 0x04, 0x1c, 0x1d + .byte 0x2f, 0x26, 0x39, 0x07, 0x16, 0x14, 0x04, 0x2d, 0x3a, 0x2f, 0x2e, 0x29, 0x15, 0x35, 0x24, 0x02, 0x36, 0x3f, 0x02, 0x1a, 0x0f, 0x18, 0x24, 0x16, 0x1d, 0x19, 0x14, 0x16, 0x10, 0x29, 0x1b, 0x13 + .byte 0x15, 0x0e, 0x19, 0x3a, 0x2e, 0x2b, 0x08, 0x30, 0x15, 0x35, 0x16, 0x30, 0x2e, 0x18, 0x35, 0x3b, 0x0b, 0x1c, 0x3a, 0x18, 0x13, 0x29, 0x13, 0x1e, 0x20, 0x13, 0x27, 0x04, 0x1d, 0x34, 0x00, 0x38 + .byte 0x19, 0x08, 0x39, 0x32, 0x20, 0x10, 0x26, 0x08, 0x02, 0x28, 0x3f, 0x0f, 0x16, 0x30, 0x1f, 0x19, 0x20, 0x2d, 0x10, 0x38, 0x17, 0x1c, 0x18, 0x31, 0x27, 0x33, 0x38, 0x30, 0x16, 0x33, 0x23, 0x00 + .byte 0x01, 0x36, 0x0d, 0x02, 0x23, 0x39, 0x04, 0x1f, 0x0e, 0x30, 0x24, 0x06, 0x01, 0x2c, 0x34, 0x33, 0x35, 0x16, 0x34, 0x2e, 0x32, 0x16, 0x24, 0x26, 0x39, 0x34, 0x1f, 0x3c, 0x1d, 0x28, 0x1d, 0x37 + .byte 0x17, 0x15, 0x2b, 0x27, 0x39, 0x30, 0x0b, 0x1b, 0x18, 0x35, 0x20, 0x2d, 0x0b, 0x35, 0x1c, 0x03, 0x0e, 0x21, 0x06, 0x0c, 0x20, 0x02, 0x18, 0x34, 0x1e, 0x36, 0x2d, 0x16, 0x0c, 0x19, 0x25, 0x09 + .byte 0x2c, 0x37, 0x05, 0x2e, 0x2e, 0x2b, 0x2c, 0x24, 0x1a, 0x14, 0x27, 0x04, 0x10, 0x32, 0x38, 0x33, 0x37, 0x15, 0x35, 0x11, 0x3f, 0x1d, 0x23, 0x23, 0x1f, 0x29, 0x3f, 0x1d, 0x1a, 0x3c, 0x2b, 0x1b + .byte 0x2c, 0x2c, 0x38, 0x3b, 0x36, 0x04, 0x13, 0x33, 0x2c, 0x14, 0x12, 0x1a, 0x09, 0x1b, 0x36, 0x11, 0x24, 0x3a, 0x3f, 0x11, 0x01, 0x0e, 0x2b, 0x3b, 0x03, 0x2a, 0x08, 0x0d, 0x2b, 0x2b, 0x13, 0x27 + .byte 0x3a, 0x3c, 0x1c, 0x3a, 0x15, 0x2a, 0x24, 0x00, 0x17, 0x3e, 0x0a, 0x15, 0x0c, 0x29, 0x2d, 0x1f, 0x15, 0x30, 0x35, 0x18, 0x19, 0x3d, 0x37, 0x37, 0x12, 0x38, 0x1b, 0x3b, 0x02, 0x20, 0x08, 0x21 + .byte 0x19, 0x2e, 0x36, 0x1d, 0x15, 0x3d, 0x24, 0x22, 0x0c, 0x27, 0x36, 0x3f, 0x33, 0x33, 0x12, 0x11, 0x1a, 0x19, 0x1f, 0x2b, 0x24, 0x12, 0x11, 0x2a, 0x18, 0x25, 0x32, 0x2a, 0x2c, 0x1a, 0x12, 0x26 + .byte 0x06, 0x10, 0x11, 0x29, 0x33, 0x2c, 0x09, 0x14, 0x2b, 0x12, 0x2b, 0x1d, 0x03, 0x24, 0x00, 0x12, 0x15, 0x22, 0x3d, 0x26, 0x15, 0x37, 0x1a, 0x0f, 0x12, 0x37, 0x24, 0x01, 0x18, 0x2a, 0x17, 0x13 + .byte 0x14, 0x3b, 0x29, 0x2a, 0x19, 0x32, 0x2d, 0x17, 0x17, 0x0b, 0x2c, 0x33, 0x07, 0x2d, 0x34, 0x07, 0x38, 0x1d, 0x1f, 0x36, 0x22, 0x11, 0x0a, 0x17, 0x14, 0x11, 0x13, 0x2a, 0x17, 0x25, 0x01, 0x3a + .byte 0x1c, 0x26, 0x27, 0x30, 0x2d, 0x3b, 0x35, 0x3a, 0x30, 0x34, 0x06, 0x3a, 0x1c, 0x2d, 0x05, 0x13, 0x21, 0x32, 0x12, 0x3e, 0x1e, 0x2c, 0x3a, 0x3f, 0x2d, 0x20, 0x2a, 0x34, 0x26, 0x03, 0x1a, 0x19 + .byte 0x27, 0x2e, 0x31, 0x04, 0x26, 0x2a, 0x3f, 0x30, 0x25, 0x23, 0x2a, 0x08, 0x08, 0x35, 0x2c, 0x30, 0x1e, 0x08, 0x05, 0x18, 0x06, 0x09, 0x2d, 0x19, 0x00, 0x27, 0x0d, 0x10, 0x19, 0x1c, 0x00, 0x13 + .byte 0x3d, 0x0b, 0x24, 0x2e, 0x1f, 0x16, 0x3d, 0x18, 0x34, 0x12, 0x1e, 0x15, 0x15, 0x39, 0x25, 0x33, 0x0f, 0x17, 0x1a, 0x1c, 0x1b, 0x37, 0x29, 0x1b, 0x3b, 0x38, 0x12, 0x1d, 0x22, 0x34, 0x26, 0x0a + .byte 0x31, 0x16, 0x2d, 0x13, 0x0d, 0x20, 0x27, 0x24, 0x1d, 0x16, 0x2e, 0x2b, 0x18, 0x16, 0x2a, 0x1b, 0x24, 0x17, 0x36, 0x02, 0x05, 0x2b, 0x37, 0x1a, 0x17, 0x11, 0x3d, 0x2c, 0x1e, 0x2f, 0x22, 0x2c + .byte 0x29, 0x1a, 0x2f, 0x04, 0x25, 0x36, 0x0c, 0x35, 0x30, 0x3e, 0x12, 0x11, 0x30, 0x37, 0x12, 0x21, 0x2e, 0x21, 0x30, 0x17, 0x2c, 0x3d, 0x24, 0x11, 0x23, 0x14, 0x1a, 0x32, 0x17, 0x39, 0x27, 0x18 + .byte 0x0f, 0x24, 0x19, 0x00, 0x3d, 0x37, 0x2c, 0x3c, 0x1c, 0x0b, 0x39, 0x23, 0x0e, 0x04, 0x1f, 0x1c, 0x31, 0x14, 0x00, 0x04, 0x15, 0x26, 0x2a, 0x2a, 0x20, 0x25, 0x2a, 0x0b, 0x3c, 0x33, 0x11, 0x0b + .byte 0x2e, 0x37, 0x22, 0x2e, 0x0e, 0x22, 0x26, 0x18, 0x2d, 0x27, 0x06, 0x0c, 0x1c, 0x26, 0x18, 0x2f, 0x3a, 0x01, 0x2a, 0x2f, 0x31, 0x34, 0x1f, 0x34, 0x1a, 0x31, 0x05, 0x10, 0x2e, 0x17, 0x34, 0x18 + .byte 0x22, 0x23, 0x23, 0x21, 0x32, 0x07, 0x08, 0x22, 0x26, 0x1c, 0x22, 0x31, 0x12, 0x2f, 0x08, 0x1f, 0x10, 0x27, 0x15, 0x2a, 0x1f, 0x0b, 0x26, 0x2f, 0x14, 0x35, 0x24, 0x1f, 0x26, 0x3b, 0x23, 0x33 + .byte 0x20, 0x3e, 0x2d, 0x17, 0x0c, 0x15, 0x13, 0x39, 0x1a, 0x30, 0x14, 0x25, 0x09, 0x07, 0x17, 0x38, 0x38, 0x1f, 0x29, 0x24, 0x27, 0x17, 0x27, 0x28, 0x1b, 0x12, 0x2a, 0x2b, 0x3d, 0x2d, 0x19, 0x34 + .byte 0x1c, 0x01, 0x1d, 0x10, 0x08, 0x39, 0x11, 0x0e, 0x36, 0x1b, 0x26, 0x13, 0x10, 0x16, 0x28, 0x1e, 0x3c, 0x28, 0x17, 0x3e, 0x39, 0x34, 0x0a, 0x03, 0x2e, 0x37, 0x1a, 0x13, 0x2b, 0x33, 0x26, 0x13 + .byte 0x2c, 0x21, 0x25, 0x14, 0x10, 0x16, 0x0b, 0x35, 0x1d, 0x35, 0x33, 0x21, 0x08, 0x33, 0x28, 0x21, 0x1a, 0x12, 0x0c, 0x1b, 0x36, 0x2a, 0x19, 0x2c, 0x2b, 0x23, 0x01, 0x0f, 0x26, 0x17, 0x0c, 0x18 + .byte 0x09, 0x0f, 0x11, 0x2b, 0x24, 0x1c, 0x09, 0x09, 0x15, 0x36, 0x08, 0x13, 0x20, 0x39, 0x21, 0x00, 0x3a, 0x1f, 0x2b, 0x36, 0x31, 0x02, 0x37, 0x13, 0x04, 0x34, 0x35, 0x37, 0x3d, 0x1a, 0x17, 0x3d + .byte 0x13, 0x2b, 0x36, 0x2f, 0x13, 0x1e, 0x13, 0x3e, 0x11, 0x33, 0x27, 0x3a, 0x2d, 0x1e, 0x31, 0x1a, 0x03, 0x03, 0x2d, 0x25, 0x37, 0x1f, 0x11, 0x01, 0x22, 0x1c, 0x12, 0x17, 0x30, 0x3a, 0x30, 0x17 + .byte 0x1d, 0x29, 0x0e, 0x13, 0x27, 0x1a, 0x2e, 0x24, 0x2d, 0x00, 0x1c, 0x17, 0x28, 0x1d, 0x09, 0x1f, 0x2e, 0x1a, 0x2d, 0x26, 0x0a, 0x13, 0x32, 0x3e, 0x00, 0x27, 0x0b, 0x3b, 0x30, 0x08, 0x3a, 0x2d + .byte 0x22, 0x12, 0x1e, 0x34, 0x1d, 0x2b, 0x26, 0x22, 0x35, 0x17, 0x2c, 0x17, 0x29, 0x13, 0x2d, 0x2d, 0x10, 0x10, 0x20, 0x31, 0x23, 0x1e, 0x33, 0x18, 0x33, 0x06, 0x2d, 0x26, 0x14, 0x27, 0x22, 0x1d + .byte 0x2a, 0x2d, 0x06, 0x18, 0x07, 0x09, 0x2e, 0x21, 0x15, 0x2e, 0x21, 0x38, 0x23, 0x35, 0x0b, 0x34, 0x24, 0x0b, 0x22, 0x1e, 0x01, 0x17, 0x0b, 0x24, 0x11, 0x17, 0x07, 0x20, 0x14, 0x25, 0x32, 0x1a + .byte 0x0e, 0x2f, 0x35, 0x17, 0x1f, 0x0c, 0x08, 0x21, 0x30, 0x35, 0x1f, 0x0c, 0x0b, 0x20, 0x04, 0x10, 0x11, 0x35, 0x11, 0x1e, 0x33, 0x3d, 0x16, 0x1e, 0x2b, 0x1d, 0x1a, 0x19, 0x10, 0x04, 0x06, 0x22 + .byte 0x03, 0x3d, 0x24, 0x2a, 0x0e, 0x35, 0x03, 0x3e, 0x17, 0x0b, 0x18, 0x36, 0x3d, 0x0d, 0x26, 0x35, 0x12, 0x20, 0x1f, 0x0d, 0x16, 0x23, 0x32, 0x1a, 0x00, 0x3d, 0x26, 0x30, 0x19, 0x36, 0x12, 0x0e + .byte 0x23, 0x01, 0x23, 0x28, 0x3b, 0x31, 0x11, 0x2d, 0x1c, 0x36, 0x2a, 0x05, 0x16, 0x14, 0x0e, 0x30, 0x3a, 0x37, 0x19, 0x1f, 0x30, 0x25, 0x10, 0x26, 0x2f, 0x22, 0x11, 0x1f, 0x2e, 0x2b, 0x1e, 0x16 + .byte 0x16, 0x21, 0x32, 0x18, 0x35, 0x23, 0x32, 0x1a, 0x3d, 0x0d, 0x19, 0x39, 0x09, 0x23, 0x30, 0x2e, 0x24, 0x1e, 0x0f, 0x24, 0x09, 0x21, 0x31, 0x05, 0x03, 0x11, 0x05, 0x22, 0x2a, 0x03, 0x07, 0x37 + .byte 0x04, 0x08, 0x13, 0x05, 0x10, 0x34, 0x37, 0x14, 0x29, 0x0a, 0x24, 0x32, 0x34, 0x1e, 0x1b, 0x12, 0x17, 0x2e, 0x01, 0x02, 0x13, 0x0a, 0x0c, 0x11, 0x02, 0x14, 0x13, 0x0d, 0x25, 0x23, 0x00, 0x07 + .byte 0x1a, 0x1c, 0x28, 0x35, 0x08, 0x0e, 0x2c, 0x1b, 0x3c, 0x15, 0x1c, 0x19, 0x1d, 0x32, 0x13, 0x1a, 0x1c, 0x00, 0x37, 0x22, 0x1b, 0x35, 0x39, 0x3e, 0x14, 0x32, 0x06, 0x31, 0x17, 0x05, 0x2b, 0x01 + .byte 0x0f, 0x20, 0x1e, 0x0f, 0x34, 0x18, 0x03, 0x1f, 0x2b, 0x00, 0x14, 0x15, 0x3a, 0x30, 0x25, 0x30, 0x21, 0x0b, 0x00, 0x37, 0x24, 0x37, 0x1d, 0x29, 0x21, 0x16, 0x24, 0x0f, 0x2c, 0x3e, 0x15, 0x36 + .byte 0x3c, 0x2d, 0x23, 0x3d, 0x3c, 0x17, 0x1a, 0x1c, 0x13, 0x0a, 0x29, 0x22, 0x25, 0x3f, 0x26, 0x3b, 0x39, 0x2f, 0x1d, 0x08, 0x16, 0x0b, 0x19, 0x14, 0x12, 0x01, 0x2c, 0x35, 0x11, 0x2a, 0x02, 0x00 + .byte 0x13, 0x39, 0x2a, 0x35, 0x07, 0x1a, 0x11, 0x24, 0x0e, 0x1e, 0x0e, 0x2c, 0x15, 0x08, 0x31, 0x1b, 0x21, 0x1d, 0x26, 0x1d, 0x1c, 0x2a, 0x1d, 0x24, 0x13, 0x01, 0x00, 0x18, 0x28, 0x2a, 0x37, 0x15 + .byte 0x0f, 0x13, 0x10, 0x32, 0x36, 0x22, 0x13, 0x31, 0x13, 0x05, 0x1e, 0x17, 0x35, 0x35, 0x3b, 0x0e, 0x24, 0x35, 0x3a, 0x1d, 0x1b, 0x36, 0x1b, 0x03, 0x1d, 0x24, 0x0f, 0x16, 0x30, 0x2d, 0x09, 0x25 + .byte 0x05, 0x21, 0x13, 0x0a, 0x27, 0x36, 0x04, 0x0d, 0x1c, 0x06, 0x3e, 0x21, 0x2a, 0x27, 0x33, 0x28, 0x0e, 0x15, 0x0b, 0x17, 0x1d, 0x1d, 0x32, 0x2d, 0x08, 0x3d, 0x29, 0x21, 0x32, 0x17, 0x33, 0x31 + .byte 0x22, 0x0e, 0x03, 0x21, 0x0d, 0x0b, 0x16, 0x3e, 0x2a, 0x2e, 0x19, 0x36, 0x2a, 0x0d, 0x00, 0x14, 0x22, 0x07, 0x36, 0x0a, 0x09, 0x15, 0x14, 0x10, 0x22, 0x07, 0x16, 0x2c, 0x36, 0x13, 0x15, 0x09 + .byte 0x2f, 0x1b, 0x20, 0x3b, 0x2e, 0x3a, 0x3a, 0x16, 0x0d, 0x15, 0x2a, 0x39, 0x13, 0x2b, 0x0b, 0x01, 0x2a, 0x13, 0x17, 0x1e, 0x08, 0x17, 0x1e, 0x0c, 0x0f, 0x34, 0x1f, 0x31, 0x12, 0x07, 0x3a, 0x1d + .byte 0x35, 0x1e, 0x12, 0x24, 0x2c, 0x15, 0x0e, 0x21, 0x19, 0x34, 0x3b, 0x33, 0x19, 0x0f, 0x28, 0x10, 0x2f, 0x2e, 0x23, 0x27, 0x31, 0x39, 0x2e, 0x18, 0x3c, 0x3f, 0x24, 0x07, 0x23, 0x30, 0x28, 0x13 + .byte 0x35, 0x13, 0x0a, 0x10, 0x35, 0x19, 0x33, 0x23, 0x28, 0x29, 0x13, 0x2f, 0x1a, 0x3a, 0x19, 0x14, 0x37, 0x36, 0x26, 0x20, 0x3b, 0x15, 0x37, 0x39, 0x10, 0x3c, 0x21, 0x34, 0x1c, 0x38, 0x30, 0x15 + .byte 0x07, 0x26, 0x27, 0x21, 0x19, 0x18, 0x11, 0x23, 0x30, 0x28, 0x37, 0x32, 0x2d, 0x1f, 0x2c, 0x3f, 0x30, 0x1d, 0x2f, 0x26, 0x01, 0x11, 0x1c, 0x3b, 0x0f, 0x12, 0x2a, 0x17, 0x27, 0x05, 0x00, 0x1b + .byte 0x25, 0x1c, 0x32, 0x04, 0x22, 0x2d, 0x10, 0x0f, 0x25, 0x0d, 0x39, 0x30, 0x0b, 0x2e, 0x27, 0x2d, 0x34, 0x15, 0x3e, 0x30, 0x36, 0x16, 0x26, 0x2a, 0x05, 0x3f, 0x2b, 0x20, 0x3b, 0x2e, 0x3b, 0x1c + .byte 0x2f, 0x01, 0x18, 0x16, 0x16, 0x3d, 0x10, 0x0a, 0x1f, 0x18, 0x17, 0x0f, 0x22, 0x06, 0x13, 0x11, 0x38, 0x21, 0x17, 0x17, 0x0a, 0x37, 0x1c, 0x19, 0x30, 0x16, 0x38, 0x31, 0x30, 0x10, 0x36, 0x31 + .byte 0x2f, 0x26, 0x3c, 0x1b, 0x23, 0x33, 0x2f, 0x19, 0x16, 0x35, 0x25, 0x3a, 0x18, 0x1f, 0x37, 0x01, 0x1e, 0x0d, 0x18, 0x12, 0x1f, 0x1c, 0x1b, 0x07, 0x34, 0x2d, 0x0b, 0x3f, 0x33, 0x1e, 0x34, 0x1d + .byte 0x2c, 0x13, 0x2c, 0x20, 0x20, 0x13, 0x20, 0x0f, 0x31, 0x08, 0x0f, 0x24, 0x18, 0x3d, 0x1c, 0x36, 0x34, 0x27, 0x33, 0x2a, 0x25, 0x2d, 0x30, 0x26, 0x3d, 0x37, 0x26, 0x25, 0x11, 0x11, 0x03, 0x05 + .byte 0x18, 0x10, 0x04, 0x29, 0x07, 0x2e, 0x36, 0x2a, 0x29, 0x15, 0x3a, 0x0e, 0x33, 0x2a, 0x06, 0x29, 0x3d, 0x01, 0x29, 0x27, 0x0e, 0x16, 0x1d, 0x28, 0x1b, 0x10, 0x33, 0x2b, 0x0c, 0x14, 0x1d, 0x15 + .byte 0x3f, 0x25, 0x37, 0x23, 0x1e, 0x04, 0x2c, 0x1c, 0x15, 0x34, 0x2a, 0x09, 0x2f, 0x15, 0x02, 0x3f, 0x14, 0x19, 0x2c, 0x33, 0x39, 0x32, 0x20, 0x2a, 0x18, 0x32, 0x17, 0x23, 0x21, 0x0b, 0x2d, 0x25 + .byte 0x24, 0x3a, 0x2d, 0x31, 0x3f, 0x34, 0x18, 0x19, 0x24, 0x1e, 0x15, 0x1a, 0x17, 0x33, 0x2b, 0x23, 0x09, 0x26, 0x1b, 0x0d, 0x15, 0x36, 0x26, 0x28, 0x3a, 0x1c, 0x14, 0x0c, 0x3e, 0x10, 0x18, 0x06 + .byte 0x35, 0x37, 0x26, 0x36, 0x21, 0x26, 0x17, 0x3d, 0x1c, 0x2c, 0x16, 0x25, 0x1d, 0x1e, 0x0b, 0x1e, 0x1d, 0x0d, 0x32, 0x08, 0x1f, 0x1b, 0x12, 0x1c, 0x12, 0x20, 0x2a, 0x28, 0x06, 0x3b, 0x35, 0x39 + .byte 0x0e, 0x1e, 0x31, 0x30, 0x28, 0x02, 0x21, 0x14, 0x06, 0x1e, 0x29, 0x16, 0x09, 0x1c, 0x27, 0x32, 0x2d, 0x39, 0x03, 0x27, 0x29, 0x09, 0x1e, 0x1b, 0x11, 0x1c, 0x28, 0x3a, 0x2c, 0x03, 0x03, 0x18 + .byte 0x23, 0x09, 0x2f, 0x30, 0x17, 0x23, 0x0f, 0x25, 0x33, 0x06, 0x24, 0x37, 0x22, 0x09, 0x33, 0x2c, 0x09, 0x2a, 0x0c, 0x12, 0x2a, 0x28, 0x20, 0x10, 0x15, 0x29, 0x33, 0x0f, 0x1a, 0x13, 0x13, 0x18 + .byte 0x36, 0x2e, 0x16, 0x13, 0x3c, 0x1a, 0x15, 0x3a, 0x11, 0x32, 0x02, 0x0a, 0x2c, 0x19, 0x39, 0x11, 0x31, 0x3e, 0x1d, 0x32, 0x14, 0x32, 0x12, 0x2e, 0x34, 0x3e, 0x36, 0x23, 0x37, 0x3e, 0x15, 0x15 + .byte 0x35, 0x34, 0x01, 0x3a, 0x2c, 0x26, 0x25, 0x22, 0x01, 0x2b, 0x37, 0x1c, 0x3d, 0x33, 0x3e, 0x10, 0x1c, 0x26, 0x33, 0x19, 0x05, 0x19, 0x17, 0x12, 0x38, 0x1c, 0x15, 0x3c, 0x32, 0x3f, 0x0f, 0x37 + .byte 0x02, 0x39, 0x32, 0x13, 0x00, 0x1d, 0x1d, 0x2c, 0x10, 0x39, 0x13, 0x31, 0x0f, 0x37, 0x19, 0x09, 0x0d, 0x2a, 0x20, 0x2f, 0x32, 0x3b, 0x34, 0x22, 0x26, 0x14, 0x10, 0x24, 0x3d, 0x22, 0x0b, 0x31 + .byte 0x23, 0x2f, 0x2d, 0x2a, 0x30, 0x04, 0x35, 0x19, 0x20, 0x2a, 0x16, 0x36, 0x37, 0x14, 0x28, 0x37, 0x11, 0x0b, 0x27, 0x1d, 0x06, 0x29, 0x35, 0x16, 0x2e, 0x24, 0x2e, 0x29, 0x36, 0x14, 0x2a, 0x21 + .byte 0x0c, 0x1f, 0x3f, 0x39, 0x19, 0x27, 0x10, 0x2a, 0x1e, 0x12, 0x34, 0x10, 0x24, 0x34, 0x1d, 0x13, 0x1d, 0x17, 0x16, 0x37, 0x27, 0x1b, 0x27, 0x07, 0x24, 0x21, 0x37, 0x21, 0x11, 0x37, 0x28, 0x24 + .byte 0x19, 0x02, 0x1c, 0x14, 0x12, 0x1d, 0x1b, 0x24, 0x2e, 0x2e, 0x3a, 0x15, 0x37, 0x34, 0x21, 0x33, 0x2d, 0x29, 0x2f, 0x1e, 0x34, 0x29, 0x3c, 0x12, 0x05, 0x15, 0x20, 0x05, 0x3e, 0x19, 0x18, 0x0b + .byte 0x30, 0x2f, 0x02, 0x27, 0x14, 0x1c, 0x34, 0x12, 0x20, 0x30, 0x2b, 0x22, 0x1b, 0x06, 0x31, 0x28, 0x15, 0x2d, 0x12, 0x01, 0x0e, 0x13, 0x13, 0x0c, 0x28, 0x07, 0x2a, 0x14, 0x1d, 0x36, 0x14, 0x15 + .byte 0x2b, 0x26, 0x03, 0x25, 0x15, 0x3e, 0x3b, 0x20, 0x35, 0x0c, 0x25, 0x2b, 0x16, 0x35, 0x1e, 0x31, 0x2c, 0x06, 0x03, 0x29, 0x24, 0x07, 0x1f, 0x32, 0x2f, 0x19, 0x25, 0x21, 0x31, 0x22, 0x26, 0x1d + .byte 0x00, 0x1b, 0x18, 0x2a, 0x24, 0x31, 0x20, 0x06, 0x2f, 0x1e, 0x32, 0x26, 0x32, 0x39, 0x12, 0x20, 0x01, 0x19, 0x0f, 0x15, 0x15, 0x27, 0x10, 0x2e, 0x09, 0x25, 0x19, 0x29, 0x37, 0x30, 0x13, 0x1c + .byte 0x1d, 0x29, 0x2d, 0x26, 0x02, 0x1a, 0x16, 0x1d, 0x2b, 0x1c, 0x18, 0x04, 0x34, 0x28, 0x2a, 0x21, 0x15, 0x1b, 0x2e, 0x16, 0x01, 0x10, 0x05, 0x09, 0x14, 0x22, 0x03, 0x22, 0x02, 0x1b, 0x34, 0x29 + .byte 0x2a, 0x23, 0x26, 0x36, 0x13, 0x23, 0x3d, 0x1a, 0x1d, 0x10, 0x24, 0x25, 0x2b, 0x37, 0x19, 0x24, 0x26, 0x28, 0x13, 0x16, 0x17, 0x14, 0x19, 0x0b, 0x2f, 0x25, 0x37, 0x34, 0x37, 0x39, 0x21, 0x1b + .byte 0x0f, 0x3d, 0x2d, 0x0d, 0x10, 0x20, 0x05, 0x0b, 0x2d, 0x01, 0x12, 0x24, 0x18, 0x3d, 0x32, 0x09, 0x21, 0x26, 0x1a, 0x0e, 0x1f, 0x30, 0x06, 0x1f, 0x0b, 0x3c, 0x29, 0x07, 0x3e, 0x27, 0x13, 0x1e + .byte 0x1a, 0x13, 0x07, 0x23, 0x10, 0x34, 0x1e, 0x32, 0x17, 0x23, 0x35, 0x16, 0x31, 0x32, 0x2e, 0x1b, 0x28, 0x0e, 0x22, 0x14, 0x3a, 0x23, 0x22, 0x03, 0x29, 0x2a, 0x10, 0x20, 0x3e, 0x3c, 0x27, 0x16 + .byte 0x20, 0x12, 0x3f, 0x24, 0x31, 0x0d, 0x2e, 0x32, 0x2f, 0x17, 0x2d, 0x36, 0x3b, 0x17, 0x24, 0x23, 0x18, 0x37, 0x1d, 0x13, 0x17, 0x3a, 0x1a, 0x0a, 0x3d, 0x1e, 0x05, 0x12, 0x16, 0x33, 0x32, 0x25 + .byte 0x1d, 0x1f, 0x29, 0x34, 0x2c, 0x26, 0x20, 0x29, 0x35, 0x0e, 0x32, 0x17, 0x01, 0x39, 0x2d, 0x27, 0x24, 0x23, 0x28, 0x3f, 0x18, 0x39, 0x38, 0x25, 0x23, 0x11, 0x11, 0x19, 0x2c, 0x29, 0x30, 0x08 + .byte 0x28, 0x25, 0x27, 0x1d, 0x17, 0x25, 0x21, 0x09, 0x3d, 0x16, 0x1b, 0x0f, 0x2c, 0x1b, 0x12, 0x22, 0x28, 0x3e, 0x26, 0x34, 0x10, 0x1b, 0x02, 0x34, 0x15, 0x1a, 0x29, 0x19, 0x29, 0x11, 0x31, 0x12 + .byte 0x27, 0x17, 0x27, 0x27, 0x2f, 0x34, 0x27, 0x24, 0x03, 0x19, 0x36, 0x17, 0x1d, 0x33, 0x19, 0x25, 0x1a, 0x2b, 0x39, 0x13, 0x3b, 0x33, 0x1d, 0x27, 0x31, 0x34, 0x28, 0x33, 0x37, 0x09, 0x30, 0x1b + .byte 0x03, 0x3a, 0x27, 0x19, 0x11, 0x1f, 0x0b, 0x1a, 0x34, 0x3d, 0x2a, 0x15, 0x04, 0x24, 0x36, 0x30, 0x23, 0x30, 0x0f, 0x22, 0x1b, 0x3d, 0x3d, 0x24, 0x29, 0x1d, 0x12, 0x16, 0x19, 0x2e, 0x03, 0x12 + .byte 0x17, 0x18, 0x25, 0x33, 0x2f, 0x23, 0x1a, 0x1a, 0x35, 0x27, 0x21, 0x26, 0x19, 0x1b, 0x30, 0x18, 0x2b, 0x22, 0x2d, 0x2c, 0x1a, 0x34, 0x3e, 0x12, 0x19, 0x28, 0x27, 0x15, 0x1b, 0x11, 0x12, 0x17 + .byte 0x15, 0x10, 0x34, 0x37, 0x25, 0x12, 0x3f, 0x15, 0x31, 0x0d, 0x37, 0x3e, 0x2a, 0x2d, 0x0f, 0x24, 0x24, 0x3c, 0x3f, 0x1f, 0x1d, 0x34, 0x17, 0x1a, 0x23, 0x1f, 0x37, 0x0f, 0x10, 0x32, 0x34, 0x35 + .byte 0x19, 0x05, 0x22, 0x33, 0x16, 0x34, 0x1e, 0x14, 0x1e, 0x08, 0x13, 0x29, 0x3a, 0x37, 0x30, 0x1d, 0x36, 0x15, 0x29, 0x2e, 0x1d, 0x32, 0x2e, 0x23, 0x35, 0x17, 0x1c, 0x36, 0x1d, 0x13, 0x23, 0x34 + .byte 0x34, 0x24, 0x1a, 0x37, 0x2f, 0x26, 0x2e, 0x1e, 0x17, 0x1a, 0x1f, 0x15, 0x1f, 0x2b, 0x1f, 0x19, 0x0a, 0x33, 0x1a, 0x35, 0x31, 0x24, 0x2d, 0x17, 0x2c, 0x0c, 0x21, 0x36, 0x2c, 0x35, 0x35, 0x1b + .byte 0x03, 0x27, 0x01, 0x0d, 0x1d, 0x1c, 0x0e, 0x11, 0x11, 0x2b, 0x10, 0x25, 0x3b, 0x20, 0x1f, 0x17, 0x19, 0x20, 0x08, 0x36, 0x13, 0x38, 0x19, 0x1b, 0x2b, 0x24, 0x0b, 0x1f, 0x29, 0x27, 0x15, 0x2c + .byte 0x37, 0x39, 0x10, 0x3a, 0x15, 0x2e, 0x2f, 0x11, 0x36, 0x24, 0x04, 0x20, 0x3b, 0x2a, 0x35, 0x27, 0x35, 0x34, 0x0d, 0x1b, 0x20, 0x10, 0x22, 0x37, 0x1f, 0x38, 0x27, 0x31, 0x0f, 0x28, 0x28, 0x25 + .byte 0x15, 0x00, 0x1d, 0x25, 0x31, 0x28, 0x28, 0x0b, 0x3a, 0x1d, 0x2d, 0x13, 0x1b, 0x03, 0x37, 0x2e, 0x1d, 0x28, 0x19, 0x08, 0x2d, 0x22, 0x27, 0x39, 0x32, 0x3f, 0x2f, 0x1d, 0x33, 0x34, 0x28, 0x18 + .byte 0x08, 0x31, 0x23, 0x1f, 0x13, 0x0d, 0x2c, 0x23, 0x3a, 0x2d, 0x1a, 0x02, 0x25, 0x13, 0x20, 0x36, 0x34, 0x12, 0x2b, 0x2d, 0x35, 0x35, 0x34, 0x23, 0x20, 0x21, 0x3a, 0x19, 0x1b, 0x1f, 0x2b, 0x19 + .byte 0x35, 0x0e, 0x19, 0x26, 0x24, 0x37, 0x18, 0x08, 0x10, 0x0c, 0x16, 0x2d, 0x1f, 0x34, 0x21, 0x05, 0x38, 0x19, 0x14, 0x21, 0x24, 0x11, 0x31, 0x14, 0x3e, 0x38, 0x29, 0x3f, 0x08, 0x25, 0x2a, 0x1f + .byte 0x25, 0x25, 0x06, 0x28, 0x0b, 0x1e, 0x14, 0x1a, 0x38, 0x22, 0x24, 0x18, 0x29, 0x1a, 0x11, 0x20, 0x3b, 0x3a, 0x1e, 0x1c, 0x26, 0x1a, 0x05, 0x32, 0x19, 0x39, 0x2a, 0x31, 0x09, 0x07, 0x25, 0x05 + .byte 0x3e, 0x16, 0x34, 0x26, 0x14, 0x1b, 0x32, 0x26, 0x05, 0x08, 0x37, 0x0f, 0x03, 0x20, 0x2a, 0x39, 0x31, 0x08, 0x01, 0x1e, 0x1d, 0x23, 0x31, 0x28, 0x1b, 0x28, 0x1e, 0x37, 0x14, 0x13, 0x0e, 0x28 + .byte 0x2a, 0x3b, 0x37, 0x2f, 0x1c, 0x28, 0x30, 0x30, 0x1a, 0x36, 0x1f, 0x16, 0x3e, 0x0d, 0x15, 0x2e, 0x16, 0x18, 0x15, 0x37, 0x20, 0x2a, 0x33, 0x30, 0x2b, 0x0e, 0x25, 0x18, 0x20, 0x16, 0x02, 0x19 + .byte 0x25, 0x0a, 0x2e, 0x30, 0x16, 0x03, 0x11, 0x04, 0x27, 0x25, 0x1b, 0x1c, 0x21, 0x29, 0x04, 0x27, 0x3d, 0x20, 0x1e, 0x28, 0x33, 0x31, 0x1e, 0x39, 0x10, 0x31, 0x29, 0x1e, 0x06, 0x25, 0x28, 0x19 + .byte 0x3b, 0x12, 0x0b, 0x1b, 0x1c, 0x3e, 0x37, 0x20, 0x0a, 0x37, 0x33, 0x02, 0x2c, 0x25, 0x15, 0x18, 0x14, 0x3b, 0x20, 0x1c, 0x22, 0x3b, 0x1c, 0x24, 0x34, 0x35, 0x0f, 0x2f, 0x31, 0x3b, 0x17, 0x35 + .byte 0x30, 0x39, 0x37, 0x0d, 0x15, 0x11, 0x10, 0x03, 0x1e, 0x1a, 0x39, 0x33, 0x2f, 0x2e, 0x28, 0x1c, 0x28, 0x36, 0x28, 0x18, 0x1f, 0x15, 0x01, 0x30, 0x3e, 0x32, 0x28, 0x34, 0x2f, 0x23, 0x07, 0x0c + .byte 0x36, 0x28, 0x2c, 0x34, 0x2a, 0x0c, 0x1f, 0x3f, 0x20, 0x13, 0x2b, 0x17, 0x27, 0x28, 0x29, 0x2a, 0x3c, 0x13, 0x36, 0x26, 0x2d, 0x2a, 0x0a, 0x06, 0x1e, 0x20, 0x04, 0x1a, 0x02, 0x07, 0x35, 0x0e + .byte 0x18, 0x30, 0x00, 0x34, 0x34, 0x2f, 0x14, 0x37, 0x21, 0x30, 0x1f, 0x15, 0x37, 0x1b, 0x3a, 0x0b, 0x32, 0x22, 0x22, 0x21, 0x1b, 0x35, 0x23, 0x0d, 0x03, 0x1c, 0x23, 0x3b, 0x13, 0x0e, 0x1d, 0x1f + .byte 0x1d, 0x3f, 0x2e, 0x39, 0x27, 0x2e, 0x0f, 0x38, 0x20, 0x31, 0x3c, 0x35, 0x0b, 0x0f, 0x2e, 0x06, 0x06, 0x28, 0x25, 0x39, 0x23, 0x0a, 0x32, 0x15, 0x0f, 0x1d, 0x25, 0x0c, 0x0d, 0x34, 0x12, 0x2e + .byte 0x21, 0x36, 0x18, 0x1f, 0x1f, 0x34, 0x1b, 0x05, 0x3a, 0x36, 0x2b, 0x01, 0x17, 0x0e, 0x16, 0x2b, 0x0e, 0x0b, 0x26, 0x0d, 0x2d, 0x10, 0x21, 0x11, 0x27, 0x3d, 0x13, 0x32, 0x15, 0x25, 0x2a, 0x1b + .byte 0x2d, 0x35, 0x2c, 0x2b, 0x26, 0x26, 0x1f, 0x20, 0x22, 0x2b, 0x12, 0x3f, 0x3d, 0x27, 0x30, 0x0a, 0x36, 0x35, 0x1f, 0x17, 0x21, 0x08, 0x29, 0x1d, 0x20, 0x33, 0x34, 0x11, 0x16, 0x05, 0x38, 0x2d + diff --git a/data/cute_sketch.s b/data/cute_sketch.s deleted file mode 100644 index d14b51a51..000000000 --- a/data/cute_sketch.s +++ /dev/null @@ -1,308 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_085A1F94:: @ 85A1F94 - .byte 0x00, 0x1d, 0x1c, 0x0e, 0x1e, 0x1b, 0x00, 0x01, 0x32, 0x2e, 0x1e, 0x37, 0x0a, 0x22, 0x1f, 0x05, 0x26, 0x2e, 0x12, 0x17, 0x1e, 0x1a, 0x03, 0x11, 0x05, 0x11, 0x18, 0x05, 0x27, 0x2f, 0x1a, 0x3f - .byte 0x12, 0x22, 0x3f, 0x16, 0x2b, 0x2f, 0x2e, 0x11, 0x02, 0x2d, 0x23, 0x0d, 0x28, 0x17, 0x0c, 0x19, 0x2f, 0x0e, 0x13, 0x30, 0x18, 0x20, 0x2d, 0x28, 0x22, 0x01, 0x03, 0x19, 0x0e, 0x2a, 0x2b, 0x22 - .byte 0x15, 0x25, 0x22, 0x0a, 0x26, 0x39, 0x06, 0x23, 0x16, 0x07, 0x2f, 0x22, 0x3a, 0x1b, 0x3b, 0x36, 0x35, 0x0a, 0x2b, 0x24, 0x36, 0x09, 0x12, 0x1c, 0x2f, 0x23, 0x2e, 0x38, 0x2c, 0x05, 0x2a, 0x20 - .byte 0x07, 0x14, 0x32, 0x31, 0x08, 0x17, 0x1a, 0x24, 0x2d, 0x22, 0x0a, 0x16, 0x1b, 0x26, 0x2b, 0x29, 0x16, 0x11, 0x35, 0x08, 0x14, 0x1e, 0x08, 0x14, 0x05, 0x31, 0x14, 0x38, 0x31, 0x17, 0x34, 0x33 - .byte 0x12, 0x11, 0x09, 0x1f, 0x28, 0x3d, 0x32, 0x35, 0x03, 0x1e, 0x3c, 0x2b, 0x2e, 0x10, 0x01, 0x17, 0x03, 0x3e, 0x22, 0x17, 0x18, 0x34, 0x08, 0x29, 0x19, 0x03, 0x24, 0x28, 0x3d, 0x33, 0x2f, 0x31 - .byte 0x24, 0x19, 0x1b, 0x18, 0x26, 0x07, 0x0d, 0x25, 0x2d, 0x3f, 0x12, 0x2f, 0x15, 0x25, 0x29, 0x0f, 0x12, 0x07, 0x2c, 0x12, 0x2c, 0x0b, 0x26, 0x12, 0x1a, 0x16, 0x00, 0x0b, 0x2f, 0x16, 0x35, 0x24 - .byte 0x1f, 0x1c, 0x22, 0x29, 0x33, 0x27, 0x3b, 0x30, 0x17, 0x11, 0x06, 0x35, 0x3e, 0x31, 0x2f, 0x11, 0x3a, 0x25, 0x2a, 0x02, 0x19, 0x33, 0x18, 0x35, 0x2a, 0x20, 0x21, 0x2e, 0x32, 0x1b, 0x3b, 0x1f - .byte 0x23, 0x39, 0x29, 0x2a, 0x2e, 0x31, 0x29, 0x2a, 0x0e, 0x2d, 0x2d, 0x00, 0x1f, 0x38, 0x28, 0x1b, 0x14, 0x3b, 0x2b, 0x2e, 0x04, 0x26, 0x36, 0x30, 0x11, 0x3b, 0x21, 0x2d, 0x2b, 0x3f, 0x1b, 0x20 - .byte 0x13, 0x31, 0x33, 0x0c, 0x30, 0x22, 0x2b, 0x2b, 0x16, 0x02, 0x1e, 0x1c, 0x12, 0x1c, 0x0f, 0x3c, 0x36, 0x38, 0x10, 0x2d, 0x18, 0x2f, 0x2d, 0x35, 0x3b, 0x11, 0x37, 0x31, 0x13, 0x13, 0x3d, 0x2f - .byte 0x1e, 0x2c, 0x33, 0x2e, 0x37, 0x12, 0x3c, 0x1f, 0x33, 0x32, 0x2a, 0x27, 0x0d, 0x3b, 0x1c, 0x35, 0x2a, 0x27, 0x09, 0x3d, 0x27, 0x12, 0x0b, 0x18, 0x0c, 0x15, 0x1d, 0x20, 0x01, 0x1c, 0x08, 0x3b - .byte 0x1c, 0x12, 0x37, 0x33, 0x15, 0x03, 0x2c, 0x2a, 0x3b, 0x31, 0x0f, 0x04, 0x35, 0x08, 0x17, 0x33, 0x38, 0x3d, 0x2a, 0x2f, 0x35, 0x16, 0x10, 0x35, 0x16, 0x23, 0x13, 0x2c, 0x2f, 0x06, 0x20, 0x27 - .byte 0x3a, 0x24, 0x00, 0x1c, 0x2a, 0x03, 0x39, 0x1d, 0x28, 0x07, 0x1a, 0x20, 0x0a, 0x37, 0x07, 0x35, 0x2d, 0x15, 0x2f, 0x2c, 0x10, 0x2c, 0x23, 0x3f, 0x29, 0x14, 0x2a, 0x21, 0x36, 0x34, 0x1a, 0x2c - .byte 0x1c, 0x3d, 0x33, 0x38, 0x2b, 0x22, 0x35, 0x28, 0x1f, 0x3d, 0x0f, 0x1c, 0x1e, 0x3e, 0x1b, 0x0c, 0x3e, 0x1f, 0x2b, 0x31, 0x2c, 0x32, 0x39, 0x11, 0x05, 0x09, 0x11, 0x04, 0x38, 0x2a, 0x32, 0x00 - .byte 0x16, 0x13, 0x0b, 0x31, 0x34, 0x2a, 0x13, 0x2c, 0x22, 0x21, 0x39, 0x2f, 0x15, 0x37, 0x28, 0x1e, 0x07, 0x3b, 0x2d, 0x11, 0x03, 0x28, 0x2d, 0x30, 0x1e, 0x31, 0x11, 0x11, 0x23, 0x01, 0x1e, 0x3d - .byte 0x31, 0x34, 0x1c, 0x02, 0x34, 0x21, 0x0e, 0x25, 0x3d, 0x07, 0x17, 0x33, 0x15, 0x10, 0x29, 0x32, 0x32, 0x18, 0x1f, 0x30, 0x2d, 0x3b, 0x30, 0x27, 0x3e, 0x16, 0x31, 0x15, 0x12, 0x30, 0x25, 0x17 - .byte 0x33, 0x06, 0x34, 0x00, 0x29, 0x18, 0x3c, 0x03, 0x12, 0x2c, 0x0c, 0x11, 0x09, 0x30, 0x30, 0x10, 0x0e, 0x11, 0x27, 0x16, 0x1b, 0x0c, 0x3b, 0x2e, 0x2b, 0x33, 0x1e, 0x13, 0x2d, 0x2d, 0x11, 0x24 - .byte 0x29, 0x34, 0x3e, 0x2b, 0x24, 0x1e, 0x21, 0x27, 0x1a, 0x2d, 0x04, 0x39, 0x16, 0x3e, 0x33, 0x26, 0x1b, 0x2e, 0x25, 0x0c, 0x06, 0x19, 0x25, 0x19, 0x18, 0x1d, 0x33, 0x33, 0x1d, 0x28, 0x2d, 0x1c - .byte 0x10, 0x2a, 0x1f, 0x35, 0x1e, 0x34, 0x02, 0x10, 0x2b, 0x3a, 0x14, 0x0d, 0x0b, 0x15, 0x0c, 0x2c, 0x10, 0x37, 0x3a, 0x19, 0x06, 0x13, 0x17, 0x24, 0x10, 0x25, 0x24, 0x04, 0x1e, 0x00, 0x35, 0x34 - .byte 0x3a, 0x00, 0x37, 0x3c, 0x07, 0x1a, 0x2b, 0x28, 0x36, 0x34, 0x39, 0x2f, 0x28, 0x09, 0x1f, 0x38, 0x31, 0x30, 0x16, 0x25, 0x31, 0x18, 0x28, 0x31, 0x18, 0x0c, 0x22, 0x06, 0x39, 0x2d, 0x3d, 0x20 - .byte 0x24, 0x2e, 0x27, 0x21, 0x3e, 0x18, 0x18, 0x15, 0x3c, 0x24, 0x06, 0x1b, 0x26, 0x15, 0x0e, 0x22, 0x0a, 0x0d, 0x1f, 0x18, 0x16, 0x34, 0x10, 0x28, 0x21, 0x20, 0x11, 0x11, 0x36, 0x32, 0x15, 0x3b - .byte 0x2e, 0x24, 0x1f, 0x2d, 0x12, 0x36, 0x2e, 0x20, 0x0b, 0x17, 0x33, 0x26, 0x03, 0x1f, 0x08, 0x19, 0x31, 0x2a, 0x18, 0x25, 0x35, 0x2d, 0x2d, 0x30, 0x38, 0x18, 0x1c, 0x25, 0x14, 0x1c, 0x22, 0x28 - .byte 0x08, 0x23, 0x21, 0x26, 0x1e, 0x30, 0x19, 0x0f, 0x15, 0x10, 0x2f, 0x22, 0x12, 0x02, 0x25, 0x3c, 0x01, 0x1d, 0x0e, 0x14, 0x18, 0x0d, 0x18, 0x17, 0x22, 0x0b, 0x31, 0x13, 0x34, 0x21, 0x0f, 0x2d - .byte 0x36, 0x39, 0x1f, 0x25, 0x18, 0x10, 0x1f, 0x2d, 0x20, 0x20, 0x19, 0x0b, 0x31, 0x33, 0x13, 0x14, 0x2e, 0x11, 0x21, 0x2d, 0x0a, 0x37, 0x07, 0x15, 0x1b, 0x32, 0x04, 0x32, 0x06, 0x18, 0x1b, 0x13 - .byte 0x24, 0x12, 0x36, 0x22, 0x16, 0x1d, 0x29, 0x1c, 0x35, 0x17, 0x21, 0x36, 0x17, 0x2b, 0x35, 0x32, 0x19, 0x2a, 0x0f, 0x2e, 0x10, 0x00, 0x34, 0x02, 0x0e, 0x28, 0x31, 0x32, 0x32, 0x3b, 0x05, 0x20 - .byte 0x36, 0x26, 0x12, 0x34, 0x06, 0x34, 0x1e, 0x31, 0x32, 0x35, 0x05, 0x34, 0x1e, 0x13, 0x15, 0x15, 0x14, 0x2c, 0x29, 0x1c, 0x18, 0x24, 0x24, 0x12, 0x22, 0x29, 0x18, 0x34, 0x36, 0x30, 0x1e, 0x01 - .byte 0x23, 0x0c, 0x3c, 0x24, 0x0a, 0x3d, 0x16, 0x27, 0x1e, 0x23, 0x15, 0x02, 0x12, 0x11, 0x19, 0x2a, 0x1d, 0x31, 0x15, 0x03, 0x3b, 0x2a, 0x21, 0x19, 0x2c, 0x0a, 0x23, 0x11, 0x25, 0x11, 0x1a, 0x1a - .byte 0x0a, 0x34, 0x3b, 0x0b, 0x33, 0x21, 0x0b, 0x37, 0x01, 0x31, 0x28, 0x35, 0x1d, 0x27, 0x2c, 0x30, 0x31, 0x2e, 0x39, 0x2d, 0x30, 0x05, 0x2c, 0x12, 0x2a, 0x2b, 0x39, 0x22, 0x20, 0x15, 0x34, 0x1c - .byte 0x1c, 0x01, 0x15, 0x20, 0x16, 0x22, 0x13, 0x04, 0x18, 0x1e, 0x13, 0x10, 0x25, 0x33, 0x15, 0x39, 0x03, 0x31, 0x3f, 0x36, 0x18, 0x14, 0x23, 0x10, 0x2f, 0x1e, 0x1f, 0x1f, 0x17, 0x2c, 0x02, 0x16 - .byte 0x31, 0x20, 0x18, 0x30, 0x2e, 0x18, 0x37, 0x3b, 0x0e, 0x30, 0x10, 0x39, 0x24, 0x26, 0x39, 0x1e, 0x30, 0x26, 0x2e, 0x12, 0x01, 0x14, 0x37, 0x2a, 0x2e, 0x21, 0x06, 0x1d, 0x2a, 0x16, 0x32, 0x09 - .byte 0x38, 0x1c, 0x07, 0x22, 0x17, 0x3b, 0x2d, 0x15, 0x07, 0x1e, 0x2e, 0x1b, 0x2e, 0x1d, 0x04, 0x09, 0x30, 0x30, 0x2d, 0x37, 0x2d, 0x34, 0x24, 0x18, 0x24, 0x25, 0x0e, 0x2d, 0x26, 0x23, 0x0a, 0x16 - .byte 0x12, 0x2d, 0x11, 0x21, 0x28, 0x2e, 0x0f, 0x01, 0x21, 0x01, 0x31, 0x12, 0x3f, 0x1b, 0x1e, 0x21, 0x25, 0x2b, 0x26, 0x18, 0x13, 0x15, 0x2d, 0x34, 0x23, 0x21, 0x36, 0x0e, 0x2e, 0x1c, 0x14, 0x22 - .byte 0x1c, 0x2c, 0x0b, 0x28, 0x1a, 0x18, 0x21, 0x21, 0x07, 0x1a, 0x24, 0x26, 0x29, 0x2b, 0x0a, 0x34, 0x3e, 0x27, 0x33, 0x12, 0x34, 0x1b, 0x1f, 0x01, 0x2a, 0x2e, 0x06, 0x23, 0x2f, 0x1f, 0x14, 0x18 - .byte 0x06, 0x26, 0x31, 0x1f, 0x2b, 0x22, 0x26, 0x2e, 0x1e, 0x15, 0x16, 0x20, 0x22, 0x28, 0x15, 0x37, 0x12, 0x25, 0x04, 0x2c, 0x1f, 0x04, 0x2e, 0x0c, 0x13, 0x18, 0x07, 0x0b, 0x36, 0x1d, 0x1c, 0x2a - .byte 0x30, 0x22, 0x1c, 0x2e, 0x12, 0x2f, 0x2b, 0x21, 0x1e, 0x16, 0x38, 0x30, 0x04, 0x02, 0x16, 0x05, 0x14, 0x20, 0x38, 0x3c, 0x33, 0x21, 0x1b, 0x2f, 0x14, 0x2a, 0x27, 0x38, 0x14, 0x1b, 0x2b, 0x1f - .byte 0x2b, 0x29, 0x2b, 0x25, 0x27, 0x36, 0x21, 0x11, 0x22, 0x1b, 0x29, 0x03, 0x1b, 0x18, 0x24, 0x28, 0x21, 0x2d, 0x36, 0x3c, 0x2c, 0x24, 0x33, 0x17, 0x1f, 0x2a, 0x3a, 0x21, 0x0a, 0x23, 0x37, 0x00 - .byte 0x0b, 0x21, 0x11, 0x38, 0x19, 0x0f, 0x0e, 0x1c, 0x1f, 0x0f, 0x37, 0x3c, 0x10, 0x37, 0x38, 0x31, 0x35, 0x07, 0x15, 0x28, 0x1e, 0x2e, 0x19, 0x26, 0x10, 0x33, 0x3d, 0x35, 0x2f, 0x3a, 0x04, 0x34 - .byte 0x0d, 0x18, 0x1a, 0x01, 0x2d, 0x15, 0x3d, 0x1a, 0x17, 0x17, 0x3f, 0x32, 0x0b, 0x21, 0x11, 0x1e, 0x26, 0x2b, 0x0d, 0x19, 0x24, 0x2e, 0x04, 0x1b, 0x1b, 0x33, 0x20, 0x15, 0x21, 0x1d, 0x1f, 0x04 - .byte 0x21, 0x0f, 0x12, 0x1f, 0x2d, 0x2a, 0x32, 0x03, 0x37, 0x1f, 0x35, 0x07, 0x27, 0x24, 0x1f, 0x31, 0x2f, 0x30, 0x15, 0x06, 0x00, 0x24, 0x0b, 0x22, 0x1a, 0x0c, 0x3b, 0x29, 0x14, 0x1a, 0x17, 0x37 - .byte 0x20, 0x25, 0x3f, 0x26, 0x37, 0x3a, 0x3e, 0x10, 0x22, 0x04, 0x11, 0x28, 0x12, 0x1c, 0x03, 0x2e, 0x2e, 0x0e, 0x38, 0x28, 0x01, 0x29, 0x22, 0x1e, 0x33, 0x19, 0x06, 0x21, 0x27, 0x33, 0x19, 0x1a - .byte 0x02, 0x05, 0x17, 0x11, 0x11, 0x2c, 0x1f, 0x26, 0x1e, 0x39, 0x1f, 0x28, 0x2e, 0x2f, 0x12, 0x22, 0x34, 0x13, 0x3b, 0x26, 0x2f, 0x34, 0x00, 0x14, 0x10, 0x31, 0x11, 0x1d, 0x2d, 0x2a, 0x08, 0x08 - .byte 0x37, 0x15, 0x18, 0x34, 0x04, 0x2b, 0x24, 0x2f, 0x1e, 0x27, 0x22, 0x2a, 0x24, 0x07, 0x14, 0x25, 0x01, 0x27, 0x19, 0x29, 0x0a, 0x29, 0x3d, 0x1c, 0x2f, 0x0d, 0x1f, 0x1c, 0x24, 0x3d, 0x32, 0x36 - .byte 0x1d, 0x24, 0x14, 0x21, 0x16, 0x1a, 0x0d, 0x29, 0x3f, 0x2b, 0x2a, 0x1a, 0x3e, 0x35, 0x11, 0x28, 0x18, 0x32, 0x05, 0x15, 0x21, 0x2e, 0x34, 0x2d, 0x14, 0x2a, 0x3c, 0x08, 0x37, 0x3f, 0x34, 0x1e - .byte 0x27, 0x24, 0x1c, 0x16, 0x16, 0x33, 0x29, 0x3b, 0x19, 0x36, 0x2f, 0x1c, 0x03, 0x25, 0x2c, 0x0b, 0x16, 0x36, 0x1c, 0x1d, 0x1b, 0x2c, 0x27, 0x1b, 0x0b, 0x1f, 0x2b, 0x08, 0x10, 0x27, 0x3f, 0x25 - .byte 0x2f, 0x33, 0x13, 0x1f, 0x04, 0x31, 0x37, 0x0e, 0x2f, 0x12, 0x08, 0x23, 0x20, 0x3a, 0x1a, 0x1e, 0x2f, 0x0b, 0x1f, 0x1e, 0x20, 0x19, 0x23, 0x3b, 0x14, 0x25, 0x00, 0x27, 0x14, 0x04, 0x25, 0x36 - .byte 0x1a, 0x2b, 0x27, 0x21, 0x15, 0x28, 0x13, 0x2c, 0x0e, 0x3c, 0x35, 0x0c, 0x2d, 0x2b, 0x37, 0x16, 0x15, 0x29, 0x15, 0x1d, 0x17, 0x34, 0x36, 0x09, 0x0a, 0x31, 0x37, 0x22, 0x28, 0x17, 0x2b, 0x35 - .byte 0x14, 0x2b, 0x12, 0x08, 0x13, 0x1f, 0x31, 0x13, 0x28, 0x06, 0x07, 0x35, 0x23, 0x3a, 0x29, 0x0f, 0x24, 0x2e, 0x07, 0x35, 0x26, 0x0e, 0x12, 0x15, 0x23, 0x33, 0x2c, 0x0e, 0x21, 0x26, 0x1c, 0x12 - .byte 0x25, 0x23, 0x1d, 0x2f, 0x04, 0x35, 0x33, 0x16, 0x01, 0x24, 0x3d, 0x2c, 0x2e, 0x35, 0x0a, 0x25, 0x11, 0x13, 0x25, 0x1b, 0x1b, 0x15, 0x15, 0x39, 0x10, 0x0b, 0x35, 0x24, 0x3a, 0x27, 0x30, 0x2e - .byte 0x2f, 0x15, 0x10, 0x1f, 0x35, 0x1b, 0x28, 0x35, 0x26, 0x30, 0x37, 0x34, 0x37, 0x2b, 0x0f, 0x30, 0x29, 0x2e, 0x3f, 0x2b, 0x38, 0x34, 0x2b, 0x2b, 0x2f, 0x25, 0x0d, 0x28, 0x2a, 0x33, 0x18, 0x10 - .byte 0x21, 0x12, 0x11, 0x1f, 0x22, 0x34, 0x11, 0x25, 0x23, 0x21, 0x3f, 0x11, 0x26, 0x27, 0x25, 0x28, 0x36, 0x12, 0x15, 0x26, 0x32, 0x11, 0x18, 0x24, 0x32, 0x25, 0x37, 0x27, 0x3a, 0x33, 0x35, 0x07 - .byte 0x1c, 0x1a, 0x0e, 0x2a, 0x1e, 0x2f, 0x1f, 0x00, 0x2e, 0x21, 0x1b, 0x3c, 0x14, 0x2f, 0x3a, 0x2f, 0x3e, 0x38, 0x15, 0x1a, 0x13, 0x2f, 0x29, 0x0d, 0x2f, 0x37, 0x17, 0x18, 0x30, 0x1c, 0x35, 0x15 - .byte 0x34, 0x14, 0x28, 0x11, 0x2c, 0x2c, 0x25, 0x2a, 0x20, 0x3f, 0x28, 0x0c, 0x34, 0x1b, 0x30, 0x2e, 0x25, 0x37, 0x1c, 0x24, 0x1f, 0x25, 0x26, 0x0c, 0x19, 0x34, 0x18, 0x10, 0x35, 0x0a, 0x13, 0x11 - .byte 0x25, 0x13, 0x20, 0x13, 0x19, 0x11, 0x20, 0x28, 0x1d, 0x3e, 0x30, 0x1b, 0x23, 0x24, 0x21, 0x0d, 0x23, 0x23, 0x1d, 0x28, 0x2e, 0x2d, 0x12, 0x1f, 0x0e, 0x2e, 0x2b, 0x0b, 0x31, 0x32, 0x24, 0x3c - .byte 0x2c, 0x13, 0x3c, 0x12, 0x28, 0x16, 0x2a, 0x05, 0x0c, 0x32, 0x39, 0x0b, 0x32, 0x21, 0x04, 0x14, 0x10, 0x31, 0x32, 0x12, 0x1f, 0x23, 0x39, 0x2e, 0x2e, 0x22, 0x3d, 0x27, 0x0c, 0x1e, 0x18, 0x25 - .byte 0x00, 0x17, 0x06, 0x31, 0x14, 0x13, 0x21, 0x1a, 0x14, 0x20, 0x35, 0x0a, 0x3b, 0x25, 0x33, 0x08, 0x28, 0x3d, 0x02, 0x33, 0x23, 0x00, 0x13, 0x22, 0x21, 0x28, 0x30, 0x14, 0x2e, 0x14, 0x32, 0x36 - .byte 0x39, 0x23, 0x1e, 0x1c, 0x11, 0x30, 0x37, 0x16, 0x30, 0x15, 0x31, 0x1f, 0x34, 0x28, 0x2c, 0x35, 0x05, 0x29, 0x37, 0x33, 0x2a, 0x1c, 0x17, 0x2e, 0x10, 0x06, 0x16, 0x32, 0x1f, 0x2f, 0x00, 0x29 - .byte 0x1e, 0x04, 0x01, 0x16, 0x3b, 0x23, 0x1e, 0x1b, 0x34, 0x2a, 0x30, 0x11, 0x2b, 0x03, 0x00, 0x1f, 0x1d, 0x37, 0x1a, 0x3a, 0x18, 0x25, 0x1c, 0x16, 0x2c, 0x04, 0x3f, 0x33, 0x26, 0x23, 0x2d, 0x15 - .byte 0x2c, 0x27, 0x02, 0x35, 0x27, 0x07, 0x35, 0x33, 0x1a, 0x0c, 0x10, 0x28, 0x26, 0x2c, 0x2f, 0x36, 0x16, 0x37, 0x0b, 0x27, 0x1b, 0x3d, 0x18, 0x27, 0x1f, 0x20, 0x2b, 0x2a, 0x33, 0x0b, 0x0f, 0x20 - .byte 0x35, 0x3c, 0x2f, 0x33, 0x21, 0x15, 0x2d, 0x26, 0x34, 0x1f, 0x1a, 0x21, 0x2f, 0x2c, 0x2a, 0x1a, 0x32, 0x1a, 0x3b, 0x3f, 0x21, 0x13, 0x3f, 0x13, 0x0f, 0x24, 0x22, 0x14, 0x1b, 0x10, 0x21, 0x06 - .byte 0x28, 0x25, 0x34, 0x10, 0x2e, 0x0e, 0x14, 0x3c, 0x3e, 0x25, 0x16, 0x06, 0x30, 0x0b, 0x04, 0x1f, 0x3e, 0x02, 0x24, 0x0c, 0x17, 0x25, 0x2b, 0x3c, 0x2d, 0x15, 0x36, 0x33, 0x18, 0x23, 0x2a, 0x1d - .byte 0x10, 0x2a, 0x35, 0x17, 0x28, 0x00, 0x37, 0x24, 0x0a, 0x3b, 0x15, 0x1d, 0x0b, 0x1f, 0x3c, 0x31, 0x25, 0x1d, 0x0f, 0x1d, 0x20, 0x13, 0x34, 0x11, 0x2b, 0x2e, 0x23, 0x0c, 0x2e, 0x24, 0x02, 0x14 - .byte 0x31, 0x16, 0x19, 0x0e, 0x23, 0x35, 0x1a, 0x10, 0x16, 0x14, 0x04, 0x19, 0x2d, 0x27, 0x37, 0x33, 0x02, 0x31, 0x02, 0x04, 0x16, 0x0d, 0x22, 0x25, 0x25, 0x00, 0x16, 0x2a, 0x3f, 0x26, 0x20, 0x0c - .byte 0x12, 0x2f, 0x2e, 0x35, 0x1b, 0x0d, 0x22, 0x1e, 0x01, 0x34, 0x05, 0x22, 0x21, 0x34, 0x2a, 0x32, 0x0b, 0x09, 0x1d, 0x3f, 0x32, 0x2f, 0x3d, 0x18, 0x2d, 0x0b, 0x38, 0x36, 0x39, 0x17, 0x28, 0x34 - .byte 0x04, 0x24, 0x36, 0x0e, 0x2a, 0x38, 0x01, 0x14, 0x3c, 0x24, 0x22, 0x21, 0x03, 0x18, 0x32, 0x2f, 0x12, 0x29, 0x24, 0x31, 0x0a, 0x3b, 0x12, 0x1a, 0x1c, 0x20, 0x30, 0x31, 0x1b, 0x1a, 0x21, 0x10 - .byte 0x05, 0x29, 0x10, 0x26, 0x2d, 0x13, 0x16, 0x0c, 0x1d, 0x2b, 0x06, 0x1b, 0x06, 0x12, 0x14, 0x38, 0x0f, 0x35, 0x23, 0x3a, 0x2c, 0x00, 0x19, 0x33, 0x29, 0x14, 0x2d, 0x2a, 0x21, 0x29, 0x14, 0x31 - .byte 0x14, 0x1a, 0x06, 0x1e, 0x18, 0x1b, 0x28, 0x3b, 0x16, 0x29, 0x15, 0x1e, 0x12, 0x34, 0x0a, 0x14, 0x1b, 0x05, 0x27, 0x0b, 0x01, 0x26, 0x2a, 0x22, 0x35, 0x21, 0x20, 0x18, 0x20, 0x37, 0x17, 0x14 - .byte 0x1f, 0x11, 0x1d, 0x11, 0x25, 0x24, 0x2b, 0x2f, 0x07, 0x3f, 0x1f, 0x2c, 0x25, 0x25, 0x2a, 0x29, 0x18, 0x11, 0x24, 0x28, 0x31, 0x2c, 0x2a, 0x39, 0x0b, 0x26, 0x28, 0x10, 0x26, 0x22, 0x06, 0x16 - .byte 0x09, 0x2c, 0x13, 0x34, 0x19, 0x15, 0x3a, 0x12, 0x21, 0x1d, 0x38, 0x23, 0x12, 0x25, 0x24, 0x21, 0x30, 0x12, 0x37, 0x1a, 0x12, 0x24, 0x3b, 0x25, 0x32, 0x15, 0x23, 0x0d, 0x1a, 0x10, 0x16, 0x2e - .byte 0x26, 0x1d, 0x14, 0x16, 0x3e, 0x2e, 0x1f, 0x0a, 0x16, 0x10, 0x1d, 0x30, 0x2b, 0x04, 0x3a, 0x19, 0x08, 0x2d, 0x2e, 0x28, 0x1e, 0x33, 0x0a, 0x12, 0x2e, 0x0d, 0x03, 0x2f, 0x26, 0x3a, 0x1e, 0x35 - .byte 0x3b, 0x2a, 0x03, 0x1a, 0x18, 0x3f, 0x0b, 0x27, 0x04, 0x05, 0x34, 0x36, 0x0b, 0x27, 0x3b, 0x17, 0x11, 0x0d, 0x27, 0x26, 0x2c, 0x1f, 0x20, 0x26, 0x10, 0x20, 0x25, 0x23, 0x2d, 0x37, 0x09, 0x13 - .byte 0x14, 0x17, 0x2d, 0x2e, 0x3d, 0x23, 0x1d, 0x1a, 0x1f, 0x21, 0x33, 0x2e, 0x28, 0x17, 0x13, 0x26, 0x3c, 0x36, 0x14, 0x1a, 0x33, 0x32, 0x20, 0x2b, 0x19, 0x3e, 0x20, 0x0c, 0x02, 0x2d, 0x3c, 0x3c - .byte 0x2a, 0x30, 0x30, 0x28, 0x25, 0x3f, 0x1e, 0x03, 0x17, 0x1e, 0x35, 0x11, 0x1c, 0x1b, 0x14, 0x2a, 0x28, 0x3a, 0x23, 0x0e, 0x1f, 0x12, 0x36, 0x21, 0x20, 0x07, 0x3b, 0x10, 0x23, 0x19, 0x34, 0x0d - .byte 0x2e, 0x18, 0x3f, 0x20, 0x25, 0x3e, 0x3b, 0x15, 0x0b, 0x2e, 0x12, 0x37, 0x0b, 0x23, 0x3d, 0x32, 0x1f, 0x16, 0x03, 0x27, 0x14, 0x0c, 0x21, 0x18, 0x03, 0x30, 0x3e, 0x21, 0x13, 0x0f, 0x00, 0x32 - .byte 0x3f, 0x23, 0x16, 0x0e, 0x31, 0x1d, 0x18, 0x1c, 0x1d, 0x30, 0x0e, 0x1e, 0x21, 0x20, 0x23, 0x3f, 0x0c, 0x1e, 0x14, 0x33, 0x22, 0x22, 0x21, 0x15, 0x36, 0x05, 0x1e, 0x1d, 0x31, 0x14, 0x20, 0x11 - .byte 0x37, 0x0d, 0x33, 0x19, 0x25, 0x05, 0x36, 0x1e, 0x31, 0x20, 0x35, 0x3a, 0x2f, 0x32, 0x2f, 0x30, 0x14, 0x23, 0x2d, 0x35, 0x1e, 0x29, 0x05, 0x05, 0x1b, 0x09, 0x1f, 0x26, 0x2f, 0x0b, 0x15, 0x15 - .byte 0x11, 0x13, 0x29, 0x1b, 0x18, 0x1c, 0x13, 0x35, 0x34, 0x31, 0x23, 0x27, 0x3f, 0x2f, 0x09, 0x30, 0x19, 0x23, 0x12, 0x34, 0x02, 0x2a, 0x21, 0x09, 0x3c, 0x1d, 0x0c, 0x02, 0x10, 0x22, 0x05, 0x17 - .byte 0x22, 0x08, 0x1b, 0x0a, 0x0f, 0x15, 0x02, 0x11, 0x13, 0x01, 0x21, 0x22, 0x16, 0x39, 0x33, 0x24, 0x38, 0x34, 0x0f, 0x1e, 0x2b, 0x2b, 0x15, 0x15, 0x20, 0x22, 0x2e, 0x3a, 0x3f, 0x31, 0x1a, 0x27 - .byte 0x2b, 0x29, 0x34, 0x14, 0x16, 0x39, 0x2f, 0x13, 0x3e, 0x16, 0x36, 0x21, 0x30, 0x00, 0x24, 0x2b, 0x24, 0x21, 0x30, 0x15, 0x31, 0x13, 0x10, 0x37, 0x24, 0x08, 0x07, 0x23, 0x21, 0x09, 0x25, 0x05 - .byte 0x3c, 0x32, 0x19, 0x03, 0x25, 0x0f, 0x29, 0x2b, 0x16, 0x07, 0x13, 0x3e, 0x3d, 0x25, 0x36, 0x0b, 0x28, 0x2e, 0x2b, 0x16, 0x0c, 0x31, 0x11, 0x30, 0x13, 0x2d, 0x26, 0x3e, 0x37, 0x29, 0x2f, 0x2e - .byte 0x15, 0x3d, 0x17, 0x1c, 0x2e, 0x21, 0x33, 0x2f, 0x10, 0x0d, 0x05, 0x1d, 0x1c, 0x1a, 0x12, 0x0e, 0x18, 0x37, 0x1b, 0x11, 0x14, 0x06, 0x14, 0x21, 0x31, 0x0e, 0x27, 0x1a, 0x03, 0x10, 0x00, 0x34 - .byte 0x31, 0x3f, 0x0b, 0x1d, 0x0f, 0x12, 0x1f, 0x1a, 0x15, 0x10, 0x0f, 0x00, 0x24, 0x3e, 0x0a, 0x2a, 0x30, 0x2b, 0x24, 0x26, 0x31, 0x10, 0x2d, 0x2f, 0x2f, 0x3f, 0x0c, 0x13, 0x12, 0x0b, 0x16, 0x15 - .byte 0x07, 0x1f, 0x28, 0x10, 0x32, 0x0f, 0x17, 0x15, 0x0b, 0x27, 0x33, 0x34, 0x1d, 0x10, 0x1c, 0x3a, 0x12, 0x2c, 0x27, 0x37, 0x0a, 0x1a, 0x32, 0x05, 0x1f, 0x21, 0x24, 0x0d, 0x1f, 0x1c, 0x17, 0x24 - .byte 0x2f, 0x3b, 0x32, 0x3b, 0x25, 0x10, 0x03, 0x2f, 0x21, 0x0c, 0x10, 0x23, 0x0e, 0x3a, 0x2c, 0x33, 0x03, 0x2c, 0x12, 0x06, 0x1c, 0x2a, 0x37, 0x30, 0x3f, 0x01, 0x1e, 0x35, 0x16, 0x37, 0x2c, 0x32 - .byte 0x35, 0x05, 0x11, 0x22, 0x29, 0x09, 0x20, 0x2b, 0x0d, 0x1f, 0x18, 0x0d, 0x20, 0x23, 0x39, 0x16, 0x0f, 0x3a, 0x18, 0x21, 0x35, 0x2b, 0x36, 0x26, 0x2b, 0x23, 0x05, 0x2f, 0x1b, 0x08, 0x17, 0x3e - .byte 0x09, 0x16, 0x2d, 0x3a, 0x37, 0x15, 0x35, 0x35, 0x29, 0x0a, 0x12, 0x02, 0x39, 0x1f, 0x14, 0x34, 0x33, 0x17, 0x1d, 0x18, 0x16, 0x1d, 0x1a, 0x01, 0x39, 0x22, 0x1e, 0x27, 0x36, 0x32, 0x14, 0x26 - .byte 0x0a, 0x39, 0x36, 0x1f, 0x0d, 0x1e, 0x0b, 0x0a, 0x19, 0x35, 0x1d, 0x34, 0x03, 0x12, 0x16, 0x0c, 0x13, 0x2e, 0x0c, 0x34, 0x1e, 0x10, 0x14, 0x1e, 0x23, 0x32, 0x27, 0x02, 0x10, 0x29, 0x35, 0x18 - .byte 0x33, 0x33, 0x1d, 0x1a, 0x3c, 0x15, 0x23, 0x3e, 0x3f, 0x22, 0x2a, 0x02, 0x2c, 0x28, 0x0a, 0x2f, 0x1a, 0x06, 0x35, 0x3c, 0x17, 0x2b, 0x03, 0x12, 0x17, 0x2f, 0x0a, 0x26, 0x12, 0x38, 0x11, 0x36 - .byte 0x1b, 0x23, 0x01, 0x39, 0x35, 0x19, 0x19, 0x17, 0x09, 0x28, 0x22, 0x1e, 0x27, 0x2c, 0x35, 0x33, 0x2c, 0x27, 0x25, 0x31, 0x06, 0x31, 0x2d, 0x1a, 0x39, 0x28, 0x2d, 0x04, 0x1e, 0x24, 0x3e, 0x1c - .byte 0x3c, 0x30, 0x1b, 0x3f, 0x3e, 0x37, 0x22, 0x36, 0x11, 0x00, 0x01, 0x1c, 0x12, 0x1a, 0x10, 0x12, 0x1e, 0x2c, 0x1f, 0x12, 0x2a, 0x2f, 0x06, 0x19, 0x35, 0x1a, 0x18, 0x3b, 0x09, 0x36, 0x34, 0x1d - .byte 0x13, 0x02, 0x07, 0x10, 0x20, 0x2f, 0x1d, 0x0b, 0x03, 0x33, 0x1c, 0x16, 0x31, 0x05, 0x13, 0x1b, 0x29, 0x06, 0x13, 0x30, 0x2d, 0x36, 0x2a, 0x2d, 0x2c, 0x19, 0x34, 0x1c, 0x0f, 0x15, 0x12, 0x36 - .byte 0x15, 0x2c, 0x3a, 0x06, 0x1c, 0x12, 0x1d, 0x26, 0x03, 0x38, 0x1d, 0x01, 0x01, 0x2d, 0x17, 0x2e, 0x10, 0x14, 0x17, 0x1c, 0x34, 0x0f, 0x28, 0x09, 0x37, 0x1b, 0x28, 0x1d, 0x26, 0x29, 0x2d, 0x36 - .byte 0x1e, 0x17, 0x28, 0x15, 0x0f, 0x1c, 0x20, 0x2d, 0x10, 0x27, 0x16, 0x2e, 0x14, 0x09, 0x12, 0x3b, 0x3d, 0x21, 0x25, 0x1a, 0x2c, 0x00, 0x22, 0x36, 0x0d, 0x30, 0x10, 0x17, 0x19, 0x1b, 0x00, 0x3b - .byte 0x21, 0x2a, 0x28, 0x34, 0x2d, 0x0f, 0x16, 0x0a, 0x30, 0x28, 0x06, 0x00, 0x25, 0x31, 0x2e, 0x2a, 0x14, 0x33, 0x28, 0x36, 0x10, 0x2e, 0x05, 0x2e, 0x19, 0x19, 0x1a, 0x15, 0x2c, 0x14, 0x17, 0x37 - .byte 0x0f, 0x13, 0x32, 0x17, 0x1b, 0x39, 0x18, 0x32, 0x2e, 0x32, 0x1e, 0x24, 0x1d, 0x31, 0x12, 0x1d, 0x2b, 0x14, 0x0c, 0x27, 0x36, 0x2e, 0x32, 0x06, 0x0a, 0x1a, 0x28, 0x28, 0x20, 0x3a, 0x3a, 0x17 - .byte 0x08, 0x27, 0x36, 0x18, 0x1a, 0x10, 0x1e, 0x26, 0x1b, 0x1f, 0x33, 0x1f, 0x21, 0x17, 0x2f, 0x01, 0x08, 0x20, 0x35, 0x03, 0x19, 0x3b, 0x02, 0x20, 0x02, 0x2d, 0x23, 0x0e, 0x17, 0x32, 0x31, 0x29 - .byte 0x11, 0x22, 0x17, 0x22, 0x3a, 0x2c, 0x23, 0x34, 0x20, 0x18, 0x00, 0x3a, 0x22, 0x25, 0x33, 0x21, 0x33, 0x04, 0x27, 0x04, 0x18, 0x32, 0x2c, 0x0c, 0x2f, 0x28, 0x14, 0x2c, 0x3f, 0x30, 0x2b, 0x30 - .byte 0x21, 0x1d, 0x01, 0x25, 0x32, 0x05, 0x23, 0x34, 0x24, 0x10, 0x30, 0x3d, 0x14, 0x1b, 0x3f, 0x38, 0x2f, 0x22, 0x1b, 0x32, 0x25, 0x07, 0x37, 0x0a, 0x0c, 0x1d, 0x03, 0x1e, 0x1a, 0x0f, 0x3c, 0x12 - .byte 0x11, 0x18, 0x1d, 0x00, 0x35, 0x2f, 0x32, 0x18, 0x14, 0x23, 0x30, 0x1b, 0x11, 0x3d, 0x12, 0x1a, 0x16, 0x35, 0x28, 0x05, 0x24, 0x17, 0x3d, 0x37, 0x2e, 0x09, 0x2e, 0x18, 0x1d, 0x17, 0x20, 0x1f - .byte 0x18, 0x23, 0x2c, 0x2f, 0x20, 0x3f, 0x16, 0x3f, 0x29, 0x2e, 0x23, 0x3b, 0x29, 0x18, 0x39, 0x13, 0x1e, 0x32, 0x35, 0x14, 0x1d, 0x2a, 0x35, 0x01, 0x1d, 0x3e, 0x3b, 0x1e, 0x22, 0x1e, 0x16, 0x18 - .byte 0x22, 0x12, 0x3e, 0x29, 0x33, 0x2f, 0x14, 0x19, 0x3b, 0x07, 0x15, 0x06, 0x3d, 0x29, 0x35, 0x37, 0x23, 0x34, 0x1d, 0x2d, 0x18, 0x12, 0x1b, 0x0b, 0x13, 0x24, 0x13, 0x38, 0x1c, 0x1f, 0x0b, 0x1b - .byte 0x13, 0x21, 0x1c, 0x06, 0x39, 0x32, 0x37, 0x3d, 0x26, 0x29, 0x26, 0x15, 0x3c, 0x33, 0x27, 0x00, 0x01, 0x2e, 0x15, 0x18, 0x31, 0x0d, 0x2c, 0x13, 0x27, 0x3b, 0x20, 0x2d, 0x01, 0x26, 0x23, 0x15 - .byte 0x30, 0x24, 0x00, 0x17, 0x37, 0x3f, 0x33, 0x25, 0x24, 0x31, 0x06, 0x3b, 0x37, 0x03, 0x18, 0x1a, 0x2c, 0x34, 0x14, 0x1d, 0x36, 0x18, 0x3a, 0x04, 0x23, 0x12, 0x26, 0x15, 0x2b, 0x19, 0x1a, 0x29 - .byte 0x2c, 0x36, 0x01, 0x19, 0x1d, 0x2f, 0x06, 0x2b, 0x0c, 0x12, 0x26, 0x36, 0x32, 0x1d, 0x0d, 0x12, 0x28, 0x03, 0x28, 0x13, 0x29, 0x06, 0x17, 0x03, 0x38, 0x21, 0x30, 0x2c, 0x10, 0x22, 0x00, 0x28 - .byte 0x24, 0x3b, 0x1c, 0x20, 0x3e, 0x13, 0x02, 0x0c, 0x19, 0x29, 0x2c, 0x1a, 0x39, 0x30, 0x22, 0x2a, 0x1f, 0x22, 0x14, 0x34, 0x2c, 0x14, 0x25, 0x1b, 0x06, 0x3b, 0x15, 0x06, 0x1c, 0x13, 0x15, 0x03 - .byte 0x18, 0x1e, 0x2a, 0x1b, 0x17, 0x25, 0x2f, 0x1c, 0x29, 0x2e, 0x02, 0x32, 0x1e, 0x1d, 0x28, 0x35, 0x36, 0x03, 0x34, 0x16, 0x3d, 0x2a, 0x12, 0x0d, 0x13, 0x1d, 0x2d, 0x21, 0x32, 0x17, 0x2e, 0x1a - .byte 0x15, 0x26, 0x22, 0x2f, 0x15, 0x3c, 0x0e, 0x20, 0x2f, 0x27, 0x13, 0x04, 0x09, 0x32, 0x1e, 0x01, 0x34, 0x06, 0x16, 0x1e, 0x2e, 0x1b, 0x1c, 0x28, 0x13, 0x2a, 0x30, 0x34, 0x12, 0x12, 0x32, 0x18 - .byte 0x1d, 0x1d, 0x35, 0x07, 0x1c, 0x16, 0x2d, 0x3d, 0x35, 0x1c, 0x1b, 0x24, 0x21, 0x2d, 0x1e, 0x10, 0x09, 0x14, 0x3d, 0x11, 0x12, 0x25, 0x02, 0x26, 0x23, 0x02, 0x19, 0x19, 0x05, 0x14, 0x0b, 0x21 - .byte 0x1a, 0x09, 0x02, 0x2c, 0x18, 0x28, 0x2d, 0x1e, 0x10, 0x12, 0x2e, 0x18, 0x2e, 0x1f, 0x02, 0x2c, 0x14, 0x17, 0x24, 0x39, 0x08, 0x32, 0x16, 0x14, 0x22, 0x16, 0x28, 0x21, 0x11, 0x10, 0x2c, 0x23 - .byte 0x36, 0x2b, 0x39, 0x21, 0x26, 0x0e, 0x06, 0x2d, 0x3c, 0x3e, 0x26, 0x2a, 0x1b, 0x1f, 0x00, 0x3c, 0x33, 0x35, 0x3f, 0x14, 0x00, 0x0b, 0x10, 0x34, 0x3c, 0x17, 0x2d, 0x07, 0x1f, 0x24, 0x39, 0x27 - .byte 0x16, 0x00, 0x1d, 0x33, 0x2b, 0x1e, 0x0f, 0x08, 0x31, 0x3a, 0x09, 0x13, 0x0c, 0x21, 0x1c, 0x2a, 0x17, 0x34, 0x29, 0x27, 0x10, 0x37, 0x1b, 0x18, 0x15, 0x08, 0x2f, 0x1f, 0x16, 0x12, 0x1f, 0x28 - .byte 0x34, 0x1c, 0x20, 0x22, 0x12, 0x01, 0x12, 0x21, 0x31, 0x10, 0x22, 0x26, 0x1e, 0x01, 0x3d, 0x11, 0x1e, 0x27, 0x25, 0x3d, 0x30, 0x24, 0x1d, 0x11, 0x22, 0x36, 0x30, 0x16, 0x1f, 0x3e, 0x2a, 0x3c - .byte 0x27, 0x1b, 0x1f, 0x29, 0x10, 0x1e, 0x05, 0x2a, 0x0a, 0x10, 0x14, 0x1f, 0x00, 0x2e, 0x0b, 0x3b, 0x18, 0x0a, 0x39, 0x30, 0x37, 0x0b, 0x1f, 0x1d, 0x0a, 0x29, 0x3e, 0x1c, 0x33, 0x13, 0x2e, 0x28 - .byte 0x27, 0x1b, 0x1e, 0x1d, 0x02, 0x1c, 0x01, 0x25, 0x14, 0x3a, 0x10, 0x1c, 0x12, 0x05, 0x2a, 0x30, 0x20, 0x26, 0x2f, 0x2e, 0x2e, 0x03, 0x07, 0x24, 0x36, 0x04, 0x2b, 0x11, 0x25, 0x2d, 0x28, 0x0e - .byte 0x2e, 0x0f, 0x1d, 0x15, 0x1c, 0x28, 0x30, 0x1f, 0x23, 0x26, 0x36, 0x12, 0x37, 0x3a, 0x31, 0x10, 0x2c, 0x2c, 0x2f, 0x1a, 0x0d, 0x15, 0x3f, 0x3c, 0x32, 0x35, 0x1c, 0x16, 0x33, 0x16, 0x28, 0x1d - .byte 0x3f, 0x21, 0x2c, 0x3e, 0x2b, 0x24, 0x23, 0x2f, 0x32, 0x15, 0x2a, 0x1b, 0x10, 0x35, 0x18, 0x37, 0x10, 0x3b, 0x1e, 0x11, 0x2b, 0x16, 0x24, 0x1d, 0x16, 0x26, 0x3c, 0x2d, 0x11, 0x15, 0x28, 0x28 - .byte 0x27, 0x27, 0x27, 0x3b, 0x3a, 0x16, 0x1a, 0x0c, 0x1a, 0x15, 0x08, 0x25, 0x0b, 0x10, 0x22, 0x1a, 0x3e, 0x17, 0x28, 0x1f, 0x1e, 0x01, 0x1e, 0x1e, 0x1c, 0x2f, 0x10, 0x25, 0x0b, 0x34, 0x3e, 0x0c - .byte 0x1a, 0x1b, 0x10, 0x2a, 0x0f, 0x14, 0x17, 0x0f, 0x3f, 0x17, 0x03, 0x15, 0x1f, 0x02, 0x36, 0x17, 0x15, 0x1d, 0x18, 0x08, 0x36, 0x10, 0x14, 0x0d, 0x2b, 0x0a, 0x05, 0x1d, 0x26, 0x12, 0x1e, 0x3e - .byte 0x18, 0x19, 0x36, 0x18, 0x37, 0x17, 0x39, 0x2e, 0x0d, 0x04, 0x19, 0x16, 0x22, 0x15, 0x3e, 0x26, 0x1f, 0x00, 0x06, 0x17, 0x33, 0x22, 0x1d, 0x2b, 0x39, 0x2b, 0x3e, 0x31, 0x1c, 0x22, 0x3f, 0x13 - .byte 0x30, 0x1c, 0x31, 0x07, 0x2b, 0x14, 0x32, 0x35, 0x1e, 0x02, 0x07, 0x20, 0x0f, 0x3b, 0x11, 0x20, 0x07, 0x12, 0x2a, 0x30, 0x1d, 0x28, 0x38, 0x36, 0x20, 0x01, 0x17, 0x15, 0x20, 0x21, 0x3a, 0x1b - .byte 0x1e, 0x38, 0x12, 0x24, 0x03, 0x3e, 0x1f, 0x29, 0x1d, 0x13, 0x20, 0x27, 0x19, 0x12, 0x25, 0x20, 0x32, 0x33, 0x2b, 0x3f, 0x05, 0x31, 0x35, 0x3c, 0x2d, 0x2d, 0x02, 0x2e, 0x10, 0x2a, 0x16, 0x17 - .byte 0x08, 0x31, 0x17, 0x2e, 0x2b, 0x30, 0x1e, 0x15, 0x31, 0x15, 0x26, 0x08, 0x10, 0x33, 0x15, 0x01, 0x27, 0x12, 0x07, 0x2f, 0x29, 0x27, 0x34, 0x3f, 0x08, 0x31, 0x1c, 0x20, 0x1a, 0x33, 0x0c, 0x13 - .byte 0x18, 0x31, 0x24, 0x37, 0x2d, 0x2e, 0x21, 0x18, 0x24, 0x3a, 0x27, 0x31, 0x35, 0x3e, 0x30, 0x3a, 0x14, 0x33, 0x0f, 0x1a, 0x2d, 0x30, 0x2e, 0x11, 0x1a, 0x31, 0x1d, 0x17, 0x3c, 0x18, 0x33, 0x31 - .byte 0x23, 0x1d, 0x39, 0x2d, 0x10, 0x1d, 0x2f, 0x24, 0x15, 0x1c, 0x25, 0x01, 0x2b, 0x22, 0x16, 0x2e, 0x1b, 0x25, 0x35, 0x37, 0x10, 0x26, 0x39, 0x01, 0x36, 0x17, 0x2b, 0x14, 0x09, 0x16, 0x17, 0x20 - .byte 0x28, 0x23, 0x26, 0x3a, 0x26, 0x27, 0x2a, 0x24, 0x36, 0x02, 0x2c, 0x29, 0x30, 0x35, 0x36, 0x01, 0x1f, 0x28, 0x3b, 0x1d, 0x23, 0x1e, 0x2d, 0x11, 0x1e, 0x2c, 0x2f, 0x32, 0x19, 0x3f, 0x26, 0x31 - .byte 0x38, 0x1e, 0x17, 0x05, 0x18, 0x2e, 0x00, 0x2e, 0x12, 0x34, 0x3f, 0x34, 0x16, 0x10, 0x29, 0x20, 0x3d, 0x36, 0x2f, 0x16, 0x25, 0x12, 0x17, 0x10, 0x21, 0x37, 0x35, 0x25, 0x37, 0x2d, 0x01, 0x08 - .byte 0x27, 0x03, 0x1f, 0x29, 0x0d, 0x2a, 0x16, 0x3a, 0x3f, 0x33, 0x2b, 0x19, 0x1d, 0x2a, 0x1f, 0x29, 0x28, 0x2c, 0x10, 0x28, 0x30, 0x10, 0x39, 0x14, 0x1b, 0x00, 0x18, 0x21, 0x28, 0x0c, 0x37, 0x11 - .byte 0x10, 0x11, 0x3c, 0x33, 0x32, 0x33, 0x36, 0x1a, 0x36, 0x00, 0x1c, 0x31, 0x1b, 0x1d, 0x38, 0x1d, 0x10, 0x3c, 0x39, 0x27, 0x3a, 0x3f, 0x14, 0x19, 0x12, 0x14, 0x0d, 0x1f, 0x18, 0x00, 0x25, 0x18 - .byte 0x28, 0x1c, 0x32, 0x27, 0x03, 0x1a, 0x26, 0x2d, 0x2a, 0x29, 0x28, 0x27, 0x0a, 0x2a, 0x18, 0x0a, 0x1a, 0x30, 0x20, 0x1a, 0x2e, 0x06, 0x0b, 0x1d, 0x0f, 0x0c, 0x1c, 0x35, 0x28, 0x1c, 0x3d, 0x16 - .byte 0x23, 0x21, 0x1c, 0x31, 0x14, 0x1c, 0x2e, 0x22, 0x32, 0x35, 0x09, 0x29, 0x30, 0x20, 0x1a, 0x10, 0x31, 0x3f, 0x2c, 0x0a, 0x3d, 0x37, 0x0b, 0x2e, 0x2d, 0x1f, 0x22, 0x31, 0x06, 0x07, 0x29, 0x22 - .byte 0x17, 0x2d, 0x30, 0x11, 0x18, 0x0c, 0x19, 0x15, 0x07, 0x0a, 0x34, 0x18, 0x29, 0x27, 0x33, 0x0c, 0x30, 0x03, 0x1a, 0x37, 0x06, 0x01, 0x2d, 0x0f, 0x3b, 0x2b, 0x11, 0x1f, 0x37, 0x2b, 0x21, 0x36 - .byte 0x3f, 0x23, 0x17, 0x17, 0x07, 0x2b, 0x2b, 0x0e, 0x30, 0x11, 0x39, 0x1d, 0x29, 0x03, 0x33, 0x30, 0x03, 0x2f, 0x3c, 0x20, 0x26, 0x03, 0x22, 0x14, 0x3a, 0x28, 0x35, 0x01, 0x28, 0x2b, 0x3e, 0x15 - .byte 0x18, 0x30, 0x07, 0x17, 0x3b, 0x2c, 0x30, 0x15, 0x07, 0x2c, 0x17, 0x27, 0x1d, 0x3f, 0x1e, 0x33, 0x0d, 0x17, 0x10, 0x15, 0x0e, 0x30, 0x09, 0x05, 0x30, 0x2d, 0x20, 0x15, 0x3c, 0x3d, 0x30, 0x0c - .byte 0x17, 0x1c, 0x1a, 0x0d, 0x25, 0x2b, 0x2b, 0x2a, 0x02, 0x16, 0x2d, 0x17, 0x31, 0x17, 0x00, 0x08, 0x13, 0x37, 0x35, 0x21, 0x1e, 0x1c, 0x1f, 0x2b, 0x32, 0x1c, 0x10, 0x2a, 0x16, 0x3a, 0x33, 0x31 - .byte 0x17, 0x2b, 0x2a, 0x0c, 0x3d, 0x11, 0x28, 0x0a, 0x30, 0x23, 0x0a, 0x26, 0x0a, 0x14, 0x24, 0x0b, 0x0f, 0x30, 0x1b, 0x1e, 0x29, 0x02, 0x35, 0x28, 0x3b, 0x02, 0x14, 0x00, 0x0f, 0x35, 0x1c, 0x3c - .byte 0x2e, 0x28, 0x38, 0x19, 0x1b, 0x11, 0x12, 0x09, 0x16, 0x10, 0x2e, 0x0d, 0x20, 0x3d, 0x04, 0x32, 0x16, 0x2c, 0x25, 0x02, 0x3d, 0x18, 0x0b, 0x13, 0x1c, 0x22, 0x2a, 0x1c, 0x20, 0x27, 0x22, 0x05 - .byte 0x26, 0x22, 0x12, 0x1d, 0x2c, 0x08, 0x05, 0x2e, 0x3f, 0x1c, 0x17, 0x24, 0x0d, 0x33, 0x36, 0x08, 0x24, 0x10, 0x22, 0x29, 0x1c, 0x0a, 0x11, 0x25, 0x0f, 0x10, 0x24, 0x38, 0x2f, 0x25, 0x32, 0x1e - .byte 0x06, 0x2a, 0x29, 0x3e, 0x3a, 0x28, 0x34, 0x17, 0x33, 0x18, 0x33, 0x17, 0x07, 0x14, 0x1f, 0x11, 0x17, 0x20, 0x13, 0x0e, 0x14, 0x3b, 0x1c, 0x12, 0x2a, 0x13, 0x37, 0x2a, 0x35, 0x32, 0x30, 0x02 - .byte 0x25, 0x00, 0x07, 0x1f, 0x0c, 0x04, 0x2c, 0x37, 0x37, 0x30, 0x25, 0x12, 0x25, 0x12, 0x22, 0x21, 0x22, 0x35, 0x33, 0x07, 0x20, 0x2d, 0x27, 0x0e, 0x30, 0x34, 0x19, 0x1a, 0x0a, 0x3c, 0x25, 0x07 - .byte 0x1d, 0x2b, 0x31, 0x3a, 0x12, 0x1a, 0x3d, 0x37, 0x16, 0x15, 0x16, 0x39, 0x13, 0x15, 0x2d, 0x03, 0x2e, 0x06, 0x39, 0x2c, 0x16, 0x00, 0x13, 0x35, 0x2a, 0x35, 0x24, 0x01, 0x18, 0x24, 0x37, 0x28 - .byte 0x25, 0x1b, 0x34, 0x25, 0x19, 0x17, 0x27, 0x2f, 0x1b, 0x27, 0x0d, 0x10, 0x36, 0x3c, 0x30, 0x3c, 0x33, 0x23, 0x3e, 0x27, 0x1e, 0x25, 0x2d, 0x29, 0x1f, 0x12, 0x21, 0x37, 0x32, 0x1f, 0x11, 0x21 - .byte 0x35, 0x30, 0x0c, 0x19, 0x25, 0x3d, 0x26, 0x17, 0x02, 0x1d, 0x14, 0x2e, 0x11, 0x38, 0x13, 0x30, 0x0a, 0x2b, 0x20, 0x1e, 0x10, 0x15, 0x37, 0x30, 0x2e, 0x1e, 0x04, 0x2c, 0x14, 0x34, 0x19, 0x08 - .byte 0x14, 0x18, 0x0e, 0x1c, 0x30, 0x1a, 0x2e, 0x1b, 0x1f, 0x39, 0x31, 0x0c, 0x1c, 0x28, 0x3e, 0x33, 0x23, 0x0f, 0x13, 0x16, 0x25, 0x39, 0x2f, 0x14, 0x1b, 0x1a, 0x28, 0x3e, 0x21, 0x2d, 0x19, 0x11 - .byte 0x0c, 0x34, 0x32, 0x39, 0x31, 0x19, 0x1a, 0x08, 0x34, 0x09, 0x2f, 0x11, 0x30, 0x04, 0x1c, 0x02, 0x3b, 0x1b, 0x33, 0x21, 0x33, 0x38, 0x02, 0x1a, 0x31, 0x38, 0x32, 0x1f, 0x1d, 0x16, 0x17, 0x10 - .byte 0x1b, 0x32, 0x20, 0x17, 0x00, 0x33, 0x12, 0x21, 0x0f, 0x27, 0x14, 0x19, 0x27, 0x24, 0x2c, 0x37, 0x25, 0x05, 0x2f, 0x3d, 0x25, 0x11, 0x12, 0x30, 0x1a, 0x16, 0x03, 0x1a, 0x14, 0x09, 0x13, 0x02 - .byte 0x23, 0x22, 0x01, 0x3c, 0x10, 0x3f, 0x2d, 0x23, 0x31, 0x3f, 0x23, 0x17, 0x00, 0x33, 0x3f, 0x0f, 0x2f, 0x26, 0x07, 0x15, 0x21, 0x2b, 0x2a, 0x38, 0x39, 0x1e, 0x09, 0x25, 0x2b, 0x3b, 0x30, 0x25 - .byte 0x12, 0x2d, 0x13, 0x32, 0x19, 0x28, 0x24, 0x1c, 0x2d, 0x35, 0x32, 0x26, 0x0d, 0x23, 0x1e, 0x1d, 0x07, 0x21, 0x0b, 0x34, 0x17, 0x2d, 0x32, 0x32, 0x3a, 0x3c, 0x35, 0x1a, 0x10, 0x33, 0x1a, 0x07 - .byte 0x22, 0x3b, 0x1b, 0x2a, 0x33, 0x1f, 0x26, 0x0e, 0x35, 0x1a, 0x3b, 0x0a, 0x1c, 0x11, 0x07, 0x11, 0x0d, 0x3c, 0x2d, 0x1e, 0x37, 0x29, 0x11, 0x05, 0x12, 0x15, 0x2f, 0x1c, 0x24, 0x31, 0x16, 0x2b - .byte 0x21, 0x1b, 0x23, 0x10, 0x31, 0x02, 0x14, 0x29, 0x26, 0x20, 0x16, 0x10, 0x17, 0x10, 0x0b, 0x0f, 0x33, 0x01, 0x2e, 0x14, 0x21, 0x0e, 0x37, 0x1a, 0x1d, 0x2f, 0x1e, 0x30, 0x24, 0x04, 0x14, 0x2d - .byte 0x11, 0x00, 0x30, 0x08, 0x2a, 0x1d, 0x1d, 0x22, 0x21, 0x24, 0x2c, 0x37, 0x24, 0x11, 0x12, 0x04, 0x2e, 0x28, 0x1d, 0x18, 0x23, 0x3c, 0x16, 0x16, 0x10, 0x17, 0x31, 0x20, 0x21, 0x12, 0x33, 0x3e - .byte 0x34, 0x06, 0x13, 0x13, 0x17, 0x38, 0x2b, 0x14, 0x0d, 0x15, 0x24, 0x3b, 0x2b, 0x34, 0x3b, 0x1e, 0x18, 0x07, 0x34, 0x37, 0x1d, 0x1f, 0x0b, 0x29, 0x20, 0x12, 0x1e, 0x1d, 0x1a, 0x24, 0x24, 0x3d - .byte 0x28, 0x24, 0x0b, 0x12, 0x33, 0x1b, 0x3a, 0x22, 0x14, 0x13, 0x2a, 0x31, 0x38, 0x15, 0x37, 0x2b, 0x2e, 0x19, 0x1e, 0x2c, 0x3f, 0x1b, 0x2a, 0x33, 0x1f, 0x33, 0x3f, 0x15, 0x29, 0x01, 0x1e, 0x18 - .byte 0x1f, 0x22, 0x19, 0x33, 0x3c, 0x34, 0x1e, 0x12, 0x22, 0x0d, 0x37, 0x2c, 0x0f, 0x08, 0x31, 0x2e, 0x09, 0x36, 0x01, 0x05, 0x1e, 0x1c, 0x04, 0x1e, 0x0c, 0x01, 0x1c, 0x29, 0x28, 0x2f, 0x39, 0x2d - .byte 0x14, 0x09, 0x22, 0x36, 0x04, 0x37, 0x37, 0x2d, 0x2f, 0x35, 0x24, 0x23, 0x1b, 0x08, 0x20, 0x32, 0x20, 0x1f, 0x34, 0x02, 0x31, 0x19, 0x18, 0x13, 0x36, 0x06, 0x2b, 0x1e, 0x0e, 0x1b, 0x10, 0x2f - .byte 0x0e, 0x1c, 0x11, 0x38, 0x13, 0x01, 0x37, 0x19, 0x14, 0x11, 0x26, 0x31, 0x3d, 0x33, 0x1d, 0x1b, 0x34, 0x25, 0x31, 0x2f, 0x11, 0x0a, 0x2f, 0x39, 0x17, 0x1b, 0x05, 0x0e, 0x13, 0x29, 0x25, 0x22 - .byte 0x15, 0x0d, 0x20, 0x2b, 0x27, 0x21, 0x3e, 0x24, 0x27, 0x2a, 0x2b, 0x16, 0x24, 0x3d, 0x15, 0x15, 0x30, 0x31, 0x0f, 0x33, 0x24, 0x06, 0x16, 0x13, 0x06, 0x31, 0x10, 0x2e, 0x3f, 0x10, 0x05, 0x0d - .byte 0x2f, 0x3c, 0x1f, 0x19, 0x12, 0x13, 0x24, 0x0f, 0x33, 0x36, 0x15, 0x3b, 0x33, 0x03, 0x0f, 0x2a, 0x3b, 0x3c, 0x2c, 0x36, 0x09, 0x29, 0x11, 0x3b, 0x27, 0x28, 0x2b, 0x31, 0x1a, 0x0e, 0x2f, 0x39 - .byte 0x2c, 0x31, 0x0e, 0x3c, 0x35, 0x2c, 0x24, 0x33, 0x3d, 0x11, 0x2b, 0x07, 0x3c, 0x37, 0x14, 0x18, 0x13, 0x1d, 0x3f, 0x2e, 0x30, 0x12, 0x25, 0x26, 0x1d, 0x11, 0x07, 0x11, 0x1e, 0x34, 0x01, 0x11 - .byte 0x0b, 0x39, 0x21, 0x29, 0x02, 0x29, 0x15, 0x10, 0x1a, 0x30, 0x1f, 0x35, 0x3c, 0x2b, 0x2a, 0x30, 0x3b, 0x36, 0x20, 0x1a, 0x23, 0x32, 0x24, 0x2b, 0x15, 0x20, 0x1c, 0x25, 0x3d, 0x36, 0x2d, 0x14 - .byte 0x31, 0x18, 0x23, 0x17, 0x18, 0x05, 0x13, 0x34, 0x30, 0x37, 0x0e, 0x39, 0x23, 0x1d, 0x1f, 0x17, 0x01, 0x15, 0x2f, 0x0b, 0x3e, 0x1b, 0x0d, 0x19, 0x2e, 0x31, 0x38, 0x1c, 0x15, 0x34, 0x15, 0x13 - .byte 0x19, 0x29, 0x19, 0x14, 0x27, 0x15, 0x18, 0x23, 0x29, 0x0c, 0x27, 0x2d, 0x0e, 0x17, 0x34, 0x18, 0x10, 0x3b, 0x1e, 0x29, 0x34, 0x2c, 0x22, 0x31, 0x08, 0x13, 0x1d, 0x18, 0x1a, 0x1c, 0x0b, 0x2a - .byte 0x19, 0x1e, 0x1a, 0x23, 0x27, 0x17, 0x3b, 0x0e, 0x37, 0x19, 0x2b, 0x16, 0x2f, 0x08, 0x21, 0x37, 0x02, 0x20, 0x0b, 0x32, 0x30, 0x16, 0x05, 0x30, 0x13, 0x05, 0x1a, 0x07, 0x39, 0x19, 0x0c, 0x3b - .byte 0x2a, 0x15, 0x05, 0x30, 0x30, 0x05, 0x19, 0x13, 0x00, 0x12, 0x27, 0x16, 0x2a, 0x0f, 0x28, 0x27, 0x0c, 0x23, 0x2f, 0x39, 0x28, 0x2a, 0x24, 0x25, 0x1f, 0x18, 0x29, 0x14, 0x16, 0x05, 0x1a, 0x35 - .byte 0x2f, 0x26, 0x0a, 0x3a, 0x29, 0x34, 0x2c, 0x36, 0x2e, 0x3a, 0x15, 0x1a, 0x0a, 0x2d, 0x16, 0x14, 0x2e, 0x35, 0x28, 0x2a, 0x35, 0x0f, 0x11, 0x11, 0x32, 0x19, 0x20, 0x1a, 0x28, 0x17, 0x1a, 0x28 - .byte 0x16, 0x33, 0x25, 0x13, 0x2c, 0x29, 0x09, 0x16, 0x33, 0x1d, 0x27, 0x26, 0x15, 0x0c, 0x2f, 0x22, 0x1c, 0x19, 0x29, 0x33, 0x10, 0x2d, 0x11, 0x1b, 0x16, 0x19, 0x2e, 0x0d, 0x0c, 0x28, 0x37, 0x3a - .byte 0x34, 0x2a, 0x1d, 0x37, 0x30, 0x0a, 0x36, 0x24, 0x39, 0x1b, 0x39, 0x0a, 0x32, 0x11, 0x03, 0x2d, 0x32, 0x1d, 0x30, 0x38, 0x1e, 0x27, 0x2e, 0x17, 0x18, 0x16, 0x17, 0x2a, 0x36, 0x3b, 0x31, 0x17 - .byte 0x04, 0x19, 0x3a, 0x25, 0x2d, 0x00, 0x36, 0x27, 0x25, 0x12, 0x33, 0x06, 0x0a, 0x14, 0x11, 0x05, 0x2f, 0x03, 0x35, 0x2f, 0x0b, 0x34, 0x29, 0x00, 0x31, 0x13, 0x27, 0x0f, 0x1c, 0x1d, 0x06, 0x2d - .byte 0x1c, 0x30, 0x27, 0x2f, 0x2a, 0x27, 0x16, 0x20, 0x31, 0x33, 0x2b, 0x2b, 0x05, 0x30, 0x36, 0x29, 0x23, 0x35, 0x10, 0x16, 0x2f, 0x2d, 0x20, 0x29, 0x37, 0x13, 0x24, 0x2d, 0x0e, 0x25, 0x08, 0x0a - .byte 0x18, 0x0f, 0x03, 0x1b, 0x31, 0x0c, 0x37, 0x1e, 0x34, 0x31, 0x1b, 0x0e, 0x25, 0x1a, 0x07, 0x34, 0x0d, 0x3c, 0x33, 0x00, 0x3a, 0x36, 0x04, 0x27, 0x12, 0x23, 0x18, 0x24, 0x0d, 0x0b, 0x18, 0x31 - .byte 0x32, 0x37, 0x00, 0x0d, 0x21, 0x32, 0x10, 0x12, 0x26, 0x0d, 0x19, 0x29, 0x24, 0x2b, 0x3d, 0x21, 0x1f, 0x1e, 0x1b, 0x28, 0x0d, 0x12, 0x28, 0x35, 0x1e, 0x23, 0x0a, 0x2e, 0x22, 0x27, 0x27, 0x35 - .byte 0x01, 0x0e, 0x20, 0x31, 0x39, 0x29, 0x3b, 0x24, 0x36, 0x14, 0x10, 0x33, 0x18, 0x2c, 0x26, 0x04, 0x2d, 0x15, 0x1a, 0x11, 0x37, 0x0f, 0x0b, 0x14, 0x0e, 0x2c, 0x2c, 0x21, 0x17, 0x2c, 0x16, 0x21 - .byte 0x35, 0x3e, 0x10, 0x10, 0x0a, 0x05, 0x1e, 0x3b, 0x09, 0x13, 0x26, 0x18, 0x1e, 0x23, 0x0c, 0x1a, 0x33, 0x37, 0x1f, 0x09, 0x12, 0x35, 0x3d, 0x0d, 0x15, 0x36, 0x06, 0x24, 0x33, 0x30, 0x29, 0x3b - .byte 0x0f, 0x28, 0x34, 0x2a, 0x2c, 0x02, 0x12, 0x35, 0x09, 0x22, 0x31, 0x3b, 0x31, 0x1c, 0x33, 0x22, 0x27, 0x3d, 0x34, 0x15, 0x14, 0x22, 0x28, 0x28, 0x10, 0x1e, 0x21, 0x31, 0x10, 0x2d, 0x16, 0x21 - .byte 0x1e, 0x05, 0x33, 0x0f, 0x30, 0x31, 0x0e, 0x1a, 0x35, 0x38, 0x2e, 0x28, 0x26, 0x37, 0x1e, 0x2b, 0x13, 0x33, 0x1f, 0x1e, 0x37, 0x0a, 0x28, 0x24, 0x32, 0x1c, 0x1a, 0x1f, 0x3f, 0x19, 0x39, 0x39 - .byte 0x29, 0x2c, 0x1b, 0x14, 0x15, 0x2a, 0x17, 0x32, 0x0f, 0x21, 0x30, 0x21, 0x18, 0x23, 0x2a, 0x27, 0x3d, 0x07, 0x10, 0x0b, 0x3f, 0x2f, 0x31, 0x02, 0x2e, 0x08, 0x39, 0x2f, 0x3f, 0x20, 0x18, 0x2d - .byte 0x34, 0x11, 0x2e, 0x34, 0x10, 0x26, 0x12, 0x23, 0x25, 0x0a, 0x37, 0x34, 0x09, 0x25, 0x0a, 0x3e, 0x16, 0x1a, 0x17, 0x11, 0x38, 0x1c, 0x20, 0x11, 0x21, 0x26, 0x05, 0x0f, 0x18, 0x26, 0x2b, 0x32 - .byte 0x0a, 0x0c, 0x16, 0x03, 0x29, 0x1d, 0x29, 0x3b, 0x23, 0x16, 0x1b, 0x29, 0x07, 0x09, 0x17, 0x17, 0x2c, 0x1c, 0x35, 0x33, 0x30, 0x17, 0x12, 0x1e, 0x3d, 0x1a, 0x2b, 0x21, 0x1d, 0x10, 0x0a, 0x08 - .byte 0x17, 0x14, 0x3c, 0x36, 0x28, 0x36, 0x36, 0x3b, 0x20, 0x1b, 0x13, 0x22, 0x1d, 0x13, 0x3a, 0x15, 0x02, 0x23, 0x2c, 0x3e, 0x19, 0x14, 0x39, 0x3c, 0x1a, 0x10, 0x08, 0x1e, 0x0a, 0x13, 0x29, 0x3f - .byte 0x38, 0x2c, 0x07, 0x23, 0x1f, 0x19, 0x2a, 0x24, 0x14, 0x3c, 0x1f, 0x0d, 0x04, 0x37, 0x1a, 0x2f, 0x28, 0x2a, 0x1d, 0x1e, 0x11, 0x37, 0x29, 0x28, 0x27, 0x12, 0x0d, 0x00, 0x26, 0x0a, 0x3c, 0x26 - .byte 0x1f, 0x1c, 0x33, 0x04, 0x3a, 0x2c, 0x24, 0x3d, 0x2b, 0x26, 0x31, 0x2f, 0x13, 0x1c, 0x21, 0x3e, 0x12, 0x23, 0x36, 0x0a, 0x1a, 0x2d, 0x1e, 0x19, 0x05, 0x1f, 0x1b, 0x1e, 0x0a, 0x1f, 0x20, 0x08 - .byte 0x24, 0x2c, 0x0c, 0x33, 0x1d, 0x1f, 0x11, 0x0e, 0x12, 0x10, 0x27, 0x12, 0x19, 0x2a, 0x13, 0x31, 0x1c, 0x04, 0x30, 0x1a, 0x38, 0x1f, 0x2c, 0x35, 0x25, 0x07, 0x0b, 0x33, 0x2d, 0x02, 0x1a, 0x2a - .byte 0x35, 0x35, 0x16, 0x2f, 0x14, 0x11, 0x31, 0x33, 0x2c, 0x31, 0x1e, 0x3c, 0x3a, 0x27, 0x3c, 0x2b, 0x12, 0x27, 0x1d, 0x12, 0x36, 0x2c, 0x2b, 0x25, 0x3b, 0x35, 0x12, 0x3d, 0x27, 0x13, 0x23, 0x19 - .byte 0x33, 0x2c, 0x26, 0x09, 0x3c, 0x12, 0x15, 0x1a, 0x23, 0x21, 0x07, 0x1a, 0x22, 0x25, 0x20, 0x19, 0x1b, 0x2c, 0x3a, 0x19, 0x35, 0x05, 0x26, 0x1d, 0x23, 0x22, 0x25, 0x0e, 0x1e, 0x11, 0x13, 0x30 - .byte 0x12, 0x2c, 0x22, 0x25, 0x0a, 0x1d, 0x18, 0x23, 0x3e, 0x1d, 0x02, 0x28, 0x25, 0x21, 0x0e, 0x20, 0x21, 0x22, 0x37, 0x18, 0x33, 0x27, 0x23, 0x23, 0x31, 0x24, 0x1a, 0x1a, 0x3e, 0x25, 0x24, 0x24 - .byte 0x01, 0x18, 0x34, 0x10, 0x22, 0x07, 0x00, 0x37, 0x06, 0x20, 0x20, 0x3a, 0x02, 0x2b, 0x07, 0x2c, 0x2c, 0x09, 0x2f, 0x2a, 0x01, 0x32, 0x2c, 0x00, 0x35, 0x13, 0x2b, 0x3c, 0x1f, 0x36, 0x37, 0x1e - .byte 0x20, 0x35, 0x1d, 0x0c, 0x07, 0x33, 0x16, 0x08, 0x12, 0x3f, 0x36, 0x11, 0x0b, 0x1f, 0x2d, 0x21, 0x20, 0x33, 0x17, 0x1a, 0x2e, 0x16, 0x01, 0x2f, 0x2f, 0x1c, 0x34, 0x29, 0x31, 0x2e, 0x3b, 0x38 - .byte 0x31, 0x0d, 0x16, 0x12, 0x07, 0x29, 0x24, 0x33, 0x3c, 0x34, 0x3e, 0x1e, 0x18, 0x30, 0x02, 0x34, 0x2a, 0x34, 0x1b, 0x2e, 0x23, 0x18, 0x34, 0x00, 0x1f, 0x20, 0x0e, 0x28, 0x15, 0x33, 0x37, 0x27 - .byte 0x35, 0x23, 0x37, 0x3e, 0x11, 0x32, 0x2e, 0x36, 0x3a, 0x02, 0x2b, 0x00, 0x36, 0x1d, 0x13, 0x29, 0x16, 0x08, 0x2b, 0x37, 0x08, 0x02, 0x27, 0x32, 0x2d, 0x34, 0x30, 0x36, 0x29, 0x2e, 0x10, 0x12 - .byte 0x3c, 0x2e, 0x2a, 0x04, 0x33, 0x30, 0x3f, 0x01, 0x22, 0x37, 0x14, 0x1d, 0x27, 0x00, 0x2f, 0x0c, 0x39, 0x26, 0x27, 0x04, 0x21, 0x19, 0x08, 0x1d, 0x01, 0x04, 0x1e, 0x27, 0x1b, 0x2b, 0x31, 0x17 - .byte 0x1f, 0x07, 0x01, 0x2d, 0x2e, 0x3b, 0x1f, 0x34, 0x24, 0x31, 0x32, 0x2b, 0x24, 0x0e, 0x07, 0x1e, 0x0f, 0x33, 0x10, 0x16, 0x21, 0x32, 0x39, 0x02, 0x1a, 0x33, 0x3d, 0x22, 0x0c, 0x25, 0x1a, 0x29 - .byte 0x29, 0x28, 0x3a, 0x32, 0x26, 0x0b, 0x13, 0x22, 0x1f, 0x0f, 0x1c, 0x04, 0x2c, 0x20, 0x39, 0x1a, 0x1b, 0x1a, 0x2a, 0x1f, 0x24, 0x13, 0x1a, 0x31, 0x3b, 0x33, 0x39, 0x23, 0x28, 0x31, 0x07, 0x31 - .byte 0x1f, 0x10, 0x20, 0x29, 0x17, 0x32, 0x26, 0x3b, 0x2d, 0x02, 0x3c, 0x1c, 0x0e, 0x00, 0x20, 0x14, 0x3e, 0x37, 0x01, 0x0f, 0x2d, 0x06, 0x12, 0x27, 0x30, 0x13, 0x19, 0x00, 0x33, 0x2a, 0x0c, 0x07 - .byte 0x27, 0x11, 0x3a, 0x1c, 0x15, 0x0a, 0x13, 0x1f, 0x0d, 0x2a, 0x37, 0x07, 0x2a, 0x34, 0x35, 0x34, 0x28, 0x16, 0x27, 0x06, 0x02, 0x36, 0x09, 0x23, 0x30, 0x14, 0x02, 0x28, 0x39, 0x32, 0x34, 0x24 - .byte 0x35, 0x12, 0x12, 0x22, 0x26, 0x09, 0x07, 0x33, 0x0f, 0x3e, 0x1e, 0x00, 0x3c, 0x33, 0x10, 0x37, 0x14, 0x3a, 0x03, 0x25, 0x2d, 0x1e, 0x24, 0x36, 0x36, 0x26, 0x1f, 0x3c, 0x1a, 0x37, 0x33, 0x25 - .byte 0x23, 0x13, 0x1f, 0x33, 0x0d, 0x13, 0x25, 0x30, 0x1e, 0x17, 0x03, 0x18, 0x18, 0x18, 0x14, 0x30, 0x07, 0x22, 0x3e, 0x33, 0x21, 0x14, 0x37, 0x16, 0x16, 0x00, 0x12, 0x2c, 0x12, 0x2f, 0x25, 0x3f - .byte 0x1e, 0x24, 0x19, 0x16, 0x16, 0x0f, 0x35, 0x2d, 0x10, 0x11, 0x24, 0x2a, 0x28, 0x19, 0x25, 0x2e, 0x0c, 0x16, 0x1f, 0x38, 0x21, 0x36, 0x3d, 0x1a, 0x2f, 0x3b, 0x32, 0x12, 0x36, 0x13, 0x29, 0x0e - .byte 0x30, 0x31, 0x19, 0x07, 0x2f, 0x25, 0x23, 0x28, 0x20, 0x08, 0x29, 0x2a, 0x00, 0x30, 0x30, 0x38, 0x23, 0x1e, 0x0f, 0x1f, 0x3b, 0x1b, 0x30, 0x3a, 0x37, 0x2f, 0x39, 0x37, 0x35, 0x39, 0x2d, 0x2f - .byte 0x1f, 0x2e, 0x1e, 0x1a, 0x2b, 0x1e, 0x14, 0x17, 0x20, 0x2f, 0x03, 0x11, 0x1d, 0x00, 0x30, 0x17, 0x2b, 0x1d, 0x35, 0x28, 0x25, 0x3b, 0x0f, 0x11, 0x09, 0x04, 0x2e, 0x23, 0x11, 0x1e, 0x13, 0x37 - .byte 0x1e, 0x37, 0x37, 0x1e, 0x07, 0x01, 0x32, 0x14, 0x06, 0x32, 0x11, 0x0c, 0x2e, 0x36, 0x2e, 0x24, 0x15, 0x2a, 0x1c, 0x22, 0x15, 0x34, 0x2c, 0x1e, 0x35, 0x22, 0x27, 0x33, 0x19, 0x3f, 0x2d, 0x21 - .byte 0x33, 0x15, 0x26, 0x1a, 0x11, 0x16, 0x3e, 0x12, 0x2b, 0x24, 0x15, 0x3c, 0x0f, 0x2d, 0x31, 0x15, 0x36, 0x3f, 0x24, 0x1d, 0x25, 0x01, 0x37, 0x33, 0x16, 0x1a, 0x1f, 0x0e, 0x10, 0x2f, 0x0b, 0x12 - .byte 0x2a, 0x1a, 0x25, 0x17, 0x0a, 0x35, 0x09, 0x28, 0x35, 0x02, 0x13, 0x36, 0x34, 0x2f, 0x17, 0x03, 0x04, 0x31, 0x3e, 0x26, 0x11, 0x35, 0x33, 0x31, 0x22, 0x17, 0x23, 0x1d, 0x05, 0x2b, 0x2e, 0x27 - .byte 0x20, 0x03, 0x2b, 0x1d, 0x01, 0x19, 0x1e, 0x0e, 0x05, 0x18, 0x16, 0x25, 0x17, 0x02, 0x28, 0x18, 0x19, 0x0b, 0x24, 0x3e, 0x35, 0x16, 0x2e, 0x29, 0x25, 0x3e, 0x38, 0x1e, 0x3a, 0x2f, 0x12, 0x14 - .byte 0x17, 0x2d, 0x11, 0x12, 0x30, 0x15, 0x31, 0x18, 0x08, 0x0b, 0x29, 0x2d, 0x00, 0x33, 0x2c, 0x06, 0x1a, 0x14, 0x1c, 0x2e, 0x04, 0x08, 0x12, 0x1b, 0x2b, 0x2d, 0x2a, 0x37, 0x33, 0x10, 0x27, 0x2c - .byte 0x1d, 0x0e, 0x34, 0x20, 0x02, 0x12, 0x1e, 0x1a, 0x2e, 0x07, 0x0b, 0x10, 0x36, 0x1e, 0x33, 0x2b, 0x28, 0x1b, 0x31, 0x25, 0x1f, 0x38, 0x3a, 0x2f, 0x39, 0x30, 0x2f, 0x12, 0x09, 0x14, 0x0e, 0x08 - .byte 0x19, 0x00, 0x0d, 0x2c, 0x1b, 0x0e, 0x34, 0x11, 0x25, 0x15, 0x0c, 0x2d, 0x26, 0x36, 0x2c, 0x16, 0x31, 0x31, 0x2c, 0x03, 0x1a, 0x16, 0x1c, 0x32, 0x14, 0x0a, 0x3e, 0x36, 0x33, 0x1b, 0x27, 0x1f - .byte 0x32, 0x18, 0x33, 0x26, 0x33, 0x1a, 0x13, 0x1a, 0x0f, 0x34, 0x1c, 0x35, 0x2c, 0x2f, 0x38, 0x03, 0x18, 0x15, 0x0f, 0x27, 0x31, 0x29, 0x20, 0x28, 0x0e, 0x28, 0x31, 0x2c, 0x2e, 0x15, 0x19, 0x1b - .byte 0x10, 0x03, 0x2f, 0x2e, 0x2a, 0x32, 0x2a, 0x27, 0x1b, 0x36, 0x04, 0x1e, 0x3b, 0x04, 0x21, 0x07, 0x2f, 0x19, 0x27, 0x1d, 0x1d, 0x3c, 0x3d, 0x2e, 0x25, 0x08, 0x32, 0x3b, 0x34, 0x2a, 0x0c, 0x10 - .byte 0x13, 0x25, 0x35, 0x1a, 0x2f, 0x19, 0x28, 0x17, 0x00, 0x2b, 0x0a, 0x1c, 0x17, 0x0a, 0x11, 0x1b, 0x35, 0x13, 0x37, 0x29, 0x1c, 0x28, 0x0c, 0x31, 0x35, 0x3c, 0x10, 0x1a, 0x1b, 0x3a, 0x2d, 0x3a - .byte 0x1c, 0x18, 0x22, 0x10, 0x2d, 0x1c, 0x3c, 0x12, 0x17, 0x18, 0x2a, 0x0b, 0x2b, 0x2f, 0x2d, 0x04, 0x2e, 0x3c, 0x13, 0x23, 0x01, 0x1c, 0x2e, 0x14, 0x16, 0x22, 0x0c, 0x24, 0x13, 0x35, 0x37, 0x34 - .byte 0x1b, 0x30, 0x1e, 0x3a, 0x1c, 0x20, 0x06, 0x06, 0x36, 0x09, 0x15, 0x1a, 0x1b, 0x1a, 0x27, 0x0f, 0x33, 0x35, 0x37, 0x06, 0x23, 0x3a, 0x12, 0x1d, 0x00, 0x16, 0x29, 0x0e, 0x1d, 0x35, 0x3f, 0x38 - .byte 0x16, 0x2a, 0x3c, 0x34, 0x13, 0x32, 0x10, 0x17, 0x2c, 0x37, 0x29, 0x2a, 0x1e, 0x35, 0x2f, 0x2d, 0x3c, 0x2a, 0x11, 0x28, 0x13, 0x21, 0x19, 0x1e, 0x34, 0x0c, 0x06, 0x2d, 0x09, 0x04, 0x1c, 0x1d - .byte 0x2f, 0x26, 0x39, 0x07, 0x16, 0x14, 0x04, 0x2d, 0x3a, 0x2f, 0x2e, 0x29, 0x15, 0x35, 0x24, 0x02, 0x36, 0x3f, 0x02, 0x1a, 0x0f, 0x18, 0x24, 0x16, 0x1d, 0x19, 0x14, 0x16, 0x10, 0x29, 0x1b, 0x13 - .byte 0x15, 0x0e, 0x19, 0x3a, 0x2e, 0x2b, 0x08, 0x30, 0x15, 0x35, 0x16, 0x30, 0x2e, 0x18, 0x35, 0x3b, 0x0b, 0x1c, 0x3a, 0x18, 0x13, 0x29, 0x13, 0x1e, 0x20, 0x13, 0x27, 0x04, 0x1d, 0x34, 0x00, 0x38 - .byte 0x19, 0x08, 0x39, 0x32, 0x20, 0x10, 0x26, 0x08, 0x02, 0x28, 0x3f, 0x0f, 0x16, 0x30, 0x1f, 0x19, 0x20, 0x2d, 0x10, 0x38, 0x17, 0x1c, 0x18, 0x31, 0x27, 0x33, 0x38, 0x30, 0x16, 0x33, 0x23, 0x00 - .byte 0x01, 0x36, 0x0d, 0x02, 0x23, 0x39, 0x04, 0x1f, 0x0e, 0x30, 0x24, 0x06, 0x01, 0x2c, 0x34, 0x33, 0x35, 0x16, 0x34, 0x2e, 0x32, 0x16, 0x24, 0x26, 0x39, 0x34, 0x1f, 0x3c, 0x1d, 0x28, 0x1d, 0x37 - .byte 0x17, 0x15, 0x2b, 0x27, 0x39, 0x30, 0x0b, 0x1b, 0x18, 0x35, 0x20, 0x2d, 0x0b, 0x35, 0x1c, 0x03, 0x0e, 0x21, 0x06, 0x0c, 0x20, 0x02, 0x18, 0x34, 0x1e, 0x36, 0x2d, 0x16, 0x0c, 0x19, 0x25, 0x09 - .byte 0x2c, 0x37, 0x05, 0x2e, 0x2e, 0x2b, 0x2c, 0x24, 0x1a, 0x14, 0x27, 0x04, 0x10, 0x32, 0x38, 0x33, 0x37, 0x15, 0x35, 0x11, 0x3f, 0x1d, 0x23, 0x23, 0x1f, 0x29, 0x3f, 0x1d, 0x1a, 0x3c, 0x2b, 0x1b - .byte 0x2c, 0x2c, 0x38, 0x3b, 0x36, 0x04, 0x13, 0x33, 0x2c, 0x14, 0x12, 0x1a, 0x09, 0x1b, 0x36, 0x11, 0x24, 0x3a, 0x3f, 0x11, 0x01, 0x0e, 0x2b, 0x3b, 0x03, 0x2a, 0x08, 0x0d, 0x2b, 0x2b, 0x13, 0x27 - .byte 0x3a, 0x3c, 0x1c, 0x3a, 0x15, 0x2a, 0x24, 0x00, 0x17, 0x3e, 0x0a, 0x15, 0x0c, 0x29, 0x2d, 0x1f, 0x15, 0x30, 0x35, 0x18, 0x19, 0x3d, 0x37, 0x37, 0x12, 0x38, 0x1b, 0x3b, 0x02, 0x20, 0x08, 0x21 - .byte 0x19, 0x2e, 0x36, 0x1d, 0x15, 0x3d, 0x24, 0x22, 0x0c, 0x27, 0x36, 0x3f, 0x33, 0x33, 0x12, 0x11, 0x1a, 0x19, 0x1f, 0x2b, 0x24, 0x12, 0x11, 0x2a, 0x18, 0x25, 0x32, 0x2a, 0x2c, 0x1a, 0x12, 0x26 - .byte 0x06, 0x10, 0x11, 0x29, 0x33, 0x2c, 0x09, 0x14, 0x2b, 0x12, 0x2b, 0x1d, 0x03, 0x24, 0x00, 0x12, 0x15, 0x22, 0x3d, 0x26, 0x15, 0x37, 0x1a, 0x0f, 0x12, 0x37, 0x24, 0x01, 0x18, 0x2a, 0x17, 0x13 - .byte 0x14, 0x3b, 0x29, 0x2a, 0x19, 0x32, 0x2d, 0x17, 0x17, 0x0b, 0x2c, 0x33, 0x07, 0x2d, 0x34, 0x07, 0x38, 0x1d, 0x1f, 0x36, 0x22, 0x11, 0x0a, 0x17, 0x14, 0x11, 0x13, 0x2a, 0x17, 0x25, 0x01, 0x3a - .byte 0x1c, 0x26, 0x27, 0x30, 0x2d, 0x3b, 0x35, 0x3a, 0x30, 0x34, 0x06, 0x3a, 0x1c, 0x2d, 0x05, 0x13, 0x21, 0x32, 0x12, 0x3e, 0x1e, 0x2c, 0x3a, 0x3f, 0x2d, 0x20, 0x2a, 0x34, 0x26, 0x03, 0x1a, 0x19 - .byte 0x27, 0x2e, 0x31, 0x04, 0x26, 0x2a, 0x3f, 0x30, 0x25, 0x23, 0x2a, 0x08, 0x08, 0x35, 0x2c, 0x30, 0x1e, 0x08, 0x05, 0x18, 0x06, 0x09, 0x2d, 0x19, 0x00, 0x27, 0x0d, 0x10, 0x19, 0x1c, 0x00, 0x13 - .byte 0x3d, 0x0b, 0x24, 0x2e, 0x1f, 0x16, 0x3d, 0x18, 0x34, 0x12, 0x1e, 0x15, 0x15, 0x39, 0x25, 0x33, 0x0f, 0x17, 0x1a, 0x1c, 0x1b, 0x37, 0x29, 0x1b, 0x3b, 0x38, 0x12, 0x1d, 0x22, 0x34, 0x26, 0x0a - .byte 0x31, 0x16, 0x2d, 0x13, 0x0d, 0x20, 0x27, 0x24, 0x1d, 0x16, 0x2e, 0x2b, 0x18, 0x16, 0x2a, 0x1b, 0x24, 0x17, 0x36, 0x02, 0x05, 0x2b, 0x37, 0x1a, 0x17, 0x11, 0x3d, 0x2c, 0x1e, 0x2f, 0x22, 0x2c - .byte 0x29, 0x1a, 0x2f, 0x04, 0x25, 0x36, 0x0c, 0x35, 0x30, 0x3e, 0x12, 0x11, 0x30, 0x37, 0x12, 0x21, 0x2e, 0x21, 0x30, 0x17, 0x2c, 0x3d, 0x24, 0x11, 0x23, 0x14, 0x1a, 0x32, 0x17, 0x39, 0x27, 0x18 - .byte 0x0f, 0x24, 0x19, 0x00, 0x3d, 0x37, 0x2c, 0x3c, 0x1c, 0x0b, 0x39, 0x23, 0x0e, 0x04, 0x1f, 0x1c, 0x31, 0x14, 0x00, 0x04, 0x15, 0x26, 0x2a, 0x2a, 0x20, 0x25, 0x2a, 0x0b, 0x3c, 0x33, 0x11, 0x0b - .byte 0x2e, 0x37, 0x22, 0x2e, 0x0e, 0x22, 0x26, 0x18, 0x2d, 0x27, 0x06, 0x0c, 0x1c, 0x26, 0x18, 0x2f, 0x3a, 0x01, 0x2a, 0x2f, 0x31, 0x34, 0x1f, 0x34, 0x1a, 0x31, 0x05, 0x10, 0x2e, 0x17, 0x34, 0x18 - .byte 0x22, 0x23, 0x23, 0x21, 0x32, 0x07, 0x08, 0x22, 0x26, 0x1c, 0x22, 0x31, 0x12, 0x2f, 0x08, 0x1f, 0x10, 0x27, 0x15, 0x2a, 0x1f, 0x0b, 0x26, 0x2f, 0x14, 0x35, 0x24, 0x1f, 0x26, 0x3b, 0x23, 0x33 - .byte 0x20, 0x3e, 0x2d, 0x17, 0x0c, 0x15, 0x13, 0x39, 0x1a, 0x30, 0x14, 0x25, 0x09, 0x07, 0x17, 0x38, 0x38, 0x1f, 0x29, 0x24, 0x27, 0x17, 0x27, 0x28, 0x1b, 0x12, 0x2a, 0x2b, 0x3d, 0x2d, 0x19, 0x34 - .byte 0x1c, 0x01, 0x1d, 0x10, 0x08, 0x39, 0x11, 0x0e, 0x36, 0x1b, 0x26, 0x13, 0x10, 0x16, 0x28, 0x1e, 0x3c, 0x28, 0x17, 0x3e, 0x39, 0x34, 0x0a, 0x03, 0x2e, 0x37, 0x1a, 0x13, 0x2b, 0x33, 0x26, 0x13 - .byte 0x2c, 0x21, 0x25, 0x14, 0x10, 0x16, 0x0b, 0x35, 0x1d, 0x35, 0x33, 0x21, 0x08, 0x33, 0x28, 0x21, 0x1a, 0x12, 0x0c, 0x1b, 0x36, 0x2a, 0x19, 0x2c, 0x2b, 0x23, 0x01, 0x0f, 0x26, 0x17, 0x0c, 0x18 - .byte 0x09, 0x0f, 0x11, 0x2b, 0x24, 0x1c, 0x09, 0x09, 0x15, 0x36, 0x08, 0x13, 0x20, 0x39, 0x21, 0x00, 0x3a, 0x1f, 0x2b, 0x36, 0x31, 0x02, 0x37, 0x13, 0x04, 0x34, 0x35, 0x37, 0x3d, 0x1a, 0x17, 0x3d - .byte 0x13, 0x2b, 0x36, 0x2f, 0x13, 0x1e, 0x13, 0x3e, 0x11, 0x33, 0x27, 0x3a, 0x2d, 0x1e, 0x31, 0x1a, 0x03, 0x03, 0x2d, 0x25, 0x37, 0x1f, 0x11, 0x01, 0x22, 0x1c, 0x12, 0x17, 0x30, 0x3a, 0x30, 0x17 - .byte 0x1d, 0x29, 0x0e, 0x13, 0x27, 0x1a, 0x2e, 0x24, 0x2d, 0x00, 0x1c, 0x17, 0x28, 0x1d, 0x09, 0x1f, 0x2e, 0x1a, 0x2d, 0x26, 0x0a, 0x13, 0x32, 0x3e, 0x00, 0x27, 0x0b, 0x3b, 0x30, 0x08, 0x3a, 0x2d - .byte 0x22, 0x12, 0x1e, 0x34, 0x1d, 0x2b, 0x26, 0x22, 0x35, 0x17, 0x2c, 0x17, 0x29, 0x13, 0x2d, 0x2d, 0x10, 0x10, 0x20, 0x31, 0x23, 0x1e, 0x33, 0x18, 0x33, 0x06, 0x2d, 0x26, 0x14, 0x27, 0x22, 0x1d - .byte 0x2a, 0x2d, 0x06, 0x18, 0x07, 0x09, 0x2e, 0x21, 0x15, 0x2e, 0x21, 0x38, 0x23, 0x35, 0x0b, 0x34, 0x24, 0x0b, 0x22, 0x1e, 0x01, 0x17, 0x0b, 0x24, 0x11, 0x17, 0x07, 0x20, 0x14, 0x25, 0x32, 0x1a - .byte 0x0e, 0x2f, 0x35, 0x17, 0x1f, 0x0c, 0x08, 0x21, 0x30, 0x35, 0x1f, 0x0c, 0x0b, 0x20, 0x04, 0x10, 0x11, 0x35, 0x11, 0x1e, 0x33, 0x3d, 0x16, 0x1e, 0x2b, 0x1d, 0x1a, 0x19, 0x10, 0x04, 0x06, 0x22 - .byte 0x03, 0x3d, 0x24, 0x2a, 0x0e, 0x35, 0x03, 0x3e, 0x17, 0x0b, 0x18, 0x36, 0x3d, 0x0d, 0x26, 0x35, 0x12, 0x20, 0x1f, 0x0d, 0x16, 0x23, 0x32, 0x1a, 0x00, 0x3d, 0x26, 0x30, 0x19, 0x36, 0x12, 0x0e - .byte 0x23, 0x01, 0x23, 0x28, 0x3b, 0x31, 0x11, 0x2d, 0x1c, 0x36, 0x2a, 0x05, 0x16, 0x14, 0x0e, 0x30, 0x3a, 0x37, 0x19, 0x1f, 0x30, 0x25, 0x10, 0x26, 0x2f, 0x22, 0x11, 0x1f, 0x2e, 0x2b, 0x1e, 0x16 - .byte 0x16, 0x21, 0x32, 0x18, 0x35, 0x23, 0x32, 0x1a, 0x3d, 0x0d, 0x19, 0x39, 0x09, 0x23, 0x30, 0x2e, 0x24, 0x1e, 0x0f, 0x24, 0x09, 0x21, 0x31, 0x05, 0x03, 0x11, 0x05, 0x22, 0x2a, 0x03, 0x07, 0x37 - .byte 0x04, 0x08, 0x13, 0x05, 0x10, 0x34, 0x37, 0x14, 0x29, 0x0a, 0x24, 0x32, 0x34, 0x1e, 0x1b, 0x12, 0x17, 0x2e, 0x01, 0x02, 0x13, 0x0a, 0x0c, 0x11, 0x02, 0x14, 0x13, 0x0d, 0x25, 0x23, 0x00, 0x07 - .byte 0x1a, 0x1c, 0x28, 0x35, 0x08, 0x0e, 0x2c, 0x1b, 0x3c, 0x15, 0x1c, 0x19, 0x1d, 0x32, 0x13, 0x1a, 0x1c, 0x00, 0x37, 0x22, 0x1b, 0x35, 0x39, 0x3e, 0x14, 0x32, 0x06, 0x31, 0x17, 0x05, 0x2b, 0x01 - .byte 0x0f, 0x20, 0x1e, 0x0f, 0x34, 0x18, 0x03, 0x1f, 0x2b, 0x00, 0x14, 0x15, 0x3a, 0x30, 0x25, 0x30, 0x21, 0x0b, 0x00, 0x37, 0x24, 0x37, 0x1d, 0x29, 0x21, 0x16, 0x24, 0x0f, 0x2c, 0x3e, 0x15, 0x36 - .byte 0x3c, 0x2d, 0x23, 0x3d, 0x3c, 0x17, 0x1a, 0x1c, 0x13, 0x0a, 0x29, 0x22, 0x25, 0x3f, 0x26, 0x3b, 0x39, 0x2f, 0x1d, 0x08, 0x16, 0x0b, 0x19, 0x14, 0x12, 0x01, 0x2c, 0x35, 0x11, 0x2a, 0x02, 0x00 - .byte 0x13, 0x39, 0x2a, 0x35, 0x07, 0x1a, 0x11, 0x24, 0x0e, 0x1e, 0x0e, 0x2c, 0x15, 0x08, 0x31, 0x1b, 0x21, 0x1d, 0x26, 0x1d, 0x1c, 0x2a, 0x1d, 0x24, 0x13, 0x01, 0x00, 0x18, 0x28, 0x2a, 0x37, 0x15 - .byte 0x0f, 0x13, 0x10, 0x32, 0x36, 0x22, 0x13, 0x31, 0x13, 0x05, 0x1e, 0x17, 0x35, 0x35, 0x3b, 0x0e, 0x24, 0x35, 0x3a, 0x1d, 0x1b, 0x36, 0x1b, 0x03, 0x1d, 0x24, 0x0f, 0x16, 0x30, 0x2d, 0x09, 0x25 - .byte 0x05, 0x21, 0x13, 0x0a, 0x27, 0x36, 0x04, 0x0d, 0x1c, 0x06, 0x3e, 0x21, 0x2a, 0x27, 0x33, 0x28, 0x0e, 0x15, 0x0b, 0x17, 0x1d, 0x1d, 0x32, 0x2d, 0x08, 0x3d, 0x29, 0x21, 0x32, 0x17, 0x33, 0x31 - .byte 0x22, 0x0e, 0x03, 0x21, 0x0d, 0x0b, 0x16, 0x3e, 0x2a, 0x2e, 0x19, 0x36, 0x2a, 0x0d, 0x00, 0x14, 0x22, 0x07, 0x36, 0x0a, 0x09, 0x15, 0x14, 0x10, 0x22, 0x07, 0x16, 0x2c, 0x36, 0x13, 0x15, 0x09 - .byte 0x2f, 0x1b, 0x20, 0x3b, 0x2e, 0x3a, 0x3a, 0x16, 0x0d, 0x15, 0x2a, 0x39, 0x13, 0x2b, 0x0b, 0x01, 0x2a, 0x13, 0x17, 0x1e, 0x08, 0x17, 0x1e, 0x0c, 0x0f, 0x34, 0x1f, 0x31, 0x12, 0x07, 0x3a, 0x1d - .byte 0x35, 0x1e, 0x12, 0x24, 0x2c, 0x15, 0x0e, 0x21, 0x19, 0x34, 0x3b, 0x33, 0x19, 0x0f, 0x28, 0x10, 0x2f, 0x2e, 0x23, 0x27, 0x31, 0x39, 0x2e, 0x18, 0x3c, 0x3f, 0x24, 0x07, 0x23, 0x30, 0x28, 0x13 - .byte 0x35, 0x13, 0x0a, 0x10, 0x35, 0x19, 0x33, 0x23, 0x28, 0x29, 0x13, 0x2f, 0x1a, 0x3a, 0x19, 0x14, 0x37, 0x36, 0x26, 0x20, 0x3b, 0x15, 0x37, 0x39, 0x10, 0x3c, 0x21, 0x34, 0x1c, 0x38, 0x30, 0x15 - .byte 0x07, 0x26, 0x27, 0x21, 0x19, 0x18, 0x11, 0x23, 0x30, 0x28, 0x37, 0x32, 0x2d, 0x1f, 0x2c, 0x3f, 0x30, 0x1d, 0x2f, 0x26, 0x01, 0x11, 0x1c, 0x3b, 0x0f, 0x12, 0x2a, 0x17, 0x27, 0x05, 0x00, 0x1b - .byte 0x25, 0x1c, 0x32, 0x04, 0x22, 0x2d, 0x10, 0x0f, 0x25, 0x0d, 0x39, 0x30, 0x0b, 0x2e, 0x27, 0x2d, 0x34, 0x15, 0x3e, 0x30, 0x36, 0x16, 0x26, 0x2a, 0x05, 0x3f, 0x2b, 0x20, 0x3b, 0x2e, 0x3b, 0x1c - .byte 0x2f, 0x01, 0x18, 0x16, 0x16, 0x3d, 0x10, 0x0a, 0x1f, 0x18, 0x17, 0x0f, 0x22, 0x06, 0x13, 0x11, 0x38, 0x21, 0x17, 0x17, 0x0a, 0x37, 0x1c, 0x19, 0x30, 0x16, 0x38, 0x31, 0x30, 0x10, 0x36, 0x31 - .byte 0x2f, 0x26, 0x3c, 0x1b, 0x23, 0x33, 0x2f, 0x19, 0x16, 0x35, 0x25, 0x3a, 0x18, 0x1f, 0x37, 0x01, 0x1e, 0x0d, 0x18, 0x12, 0x1f, 0x1c, 0x1b, 0x07, 0x34, 0x2d, 0x0b, 0x3f, 0x33, 0x1e, 0x34, 0x1d - .byte 0x2c, 0x13, 0x2c, 0x20, 0x20, 0x13, 0x20, 0x0f, 0x31, 0x08, 0x0f, 0x24, 0x18, 0x3d, 0x1c, 0x36, 0x34, 0x27, 0x33, 0x2a, 0x25, 0x2d, 0x30, 0x26, 0x3d, 0x37, 0x26, 0x25, 0x11, 0x11, 0x03, 0x05 - .byte 0x18, 0x10, 0x04, 0x29, 0x07, 0x2e, 0x36, 0x2a, 0x29, 0x15, 0x3a, 0x0e, 0x33, 0x2a, 0x06, 0x29, 0x3d, 0x01, 0x29, 0x27, 0x0e, 0x16, 0x1d, 0x28, 0x1b, 0x10, 0x33, 0x2b, 0x0c, 0x14, 0x1d, 0x15 - .byte 0x3f, 0x25, 0x37, 0x23, 0x1e, 0x04, 0x2c, 0x1c, 0x15, 0x34, 0x2a, 0x09, 0x2f, 0x15, 0x02, 0x3f, 0x14, 0x19, 0x2c, 0x33, 0x39, 0x32, 0x20, 0x2a, 0x18, 0x32, 0x17, 0x23, 0x21, 0x0b, 0x2d, 0x25 - .byte 0x24, 0x3a, 0x2d, 0x31, 0x3f, 0x34, 0x18, 0x19, 0x24, 0x1e, 0x15, 0x1a, 0x17, 0x33, 0x2b, 0x23, 0x09, 0x26, 0x1b, 0x0d, 0x15, 0x36, 0x26, 0x28, 0x3a, 0x1c, 0x14, 0x0c, 0x3e, 0x10, 0x18, 0x06 - .byte 0x35, 0x37, 0x26, 0x36, 0x21, 0x26, 0x17, 0x3d, 0x1c, 0x2c, 0x16, 0x25, 0x1d, 0x1e, 0x0b, 0x1e, 0x1d, 0x0d, 0x32, 0x08, 0x1f, 0x1b, 0x12, 0x1c, 0x12, 0x20, 0x2a, 0x28, 0x06, 0x3b, 0x35, 0x39 - .byte 0x0e, 0x1e, 0x31, 0x30, 0x28, 0x02, 0x21, 0x14, 0x06, 0x1e, 0x29, 0x16, 0x09, 0x1c, 0x27, 0x32, 0x2d, 0x39, 0x03, 0x27, 0x29, 0x09, 0x1e, 0x1b, 0x11, 0x1c, 0x28, 0x3a, 0x2c, 0x03, 0x03, 0x18 - .byte 0x23, 0x09, 0x2f, 0x30, 0x17, 0x23, 0x0f, 0x25, 0x33, 0x06, 0x24, 0x37, 0x22, 0x09, 0x33, 0x2c, 0x09, 0x2a, 0x0c, 0x12, 0x2a, 0x28, 0x20, 0x10, 0x15, 0x29, 0x33, 0x0f, 0x1a, 0x13, 0x13, 0x18 - .byte 0x36, 0x2e, 0x16, 0x13, 0x3c, 0x1a, 0x15, 0x3a, 0x11, 0x32, 0x02, 0x0a, 0x2c, 0x19, 0x39, 0x11, 0x31, 0x3e, 0x1d, 0x32, 0x14, 0x32, 0x12, 0x2e, 0x34, 0x3e, 0x36, 0x23, 0x37, 0x3e, 0x15, 0x15 - .byte 0x35, 0x34, 0x01, 0x3a, 0x2c, 0x26, 0x25, 0x22, 0x01, 0x2b, 0x37, 0x1c, 0x3d, 0x33, 0x3e, 0x10, 0x1c, 0x26, 0x33, 0x19, 0x05, 0x19, 0x17, 0x12, 0x38, 0x1c, 0x15, 0x3c, 0x32, 0x3f, 0x0f, 0x37 - .byte 0x02, 0x39, 0x32, 0x13, 0x00, 0x1d, 0x1d, 0x2c, 0x10, 0x39, 0x13, 0x31, 0x0f, 0x37, 0x19, 0x09, 0x0d, 0x2a, 0x20, 0x2f, 0x32, 0x3b, 0x34, 0x22, 0x26, 0x14, 0x10, 0x24, 0x3d, 0x22, 0x0b, 0x31 - .byte 0x23, 0x2f, 0x2d, 0x2a, 0x30, 0x04, 0x35, 0x19, 0x20, 0x2a, 0x16, 0x36, 0x37, 0x14, 0x28, 0x37, 0x11, 0x0b, 0x27, 0x1d, 0x06, 0x29, 0x35, 0x16, 0x2e, 0x24, 0x2e, 0x29, 0x36, 0x14, 0x2a, 0x21 - .byte 0x0c, 0x1f, 0x3f, 0x39, 0x19, 0x27, 0x10, 0x2a, 0x1e, 0x12, 0x34, 0x10, 0x24, 0x34, 0x1d, 0x13, 0x1d, 0x17, 0x16, 0x37, 0x27, 0x1b, 0x27, 0x07, 0x24, 0x21, 0x37, 0x21, 0x11, 0x37, 0x28, 0x24 - .byte 0x19, 0x02, 0x1c, 0x14, 0x12, 0x1d, 0x1b, 0x24, 0x2e, 0x2e, 0x3a, 0x15, 0x37, 0x34, 0x21, 0x33, 0x2d, 0x29, 0x2f, 0x1e, 0x34, 0x29, 0x3c, 0x12, 0x05, 0x15, 0x20, 0x05, 0x3e, 0x19, 0x18, 0x0b - .byte 0x30, 0x2f, 0x02, 0x27, 0x14, 0x1c, 0x34, 0x12, 0x20, 0x30, 0x2b, 0x22, 0x1b, 0x06, 0x31, 0x28, 0x15, 0x2d, 0x12, 0x01, 0x0e, 0x13, 0x13, 0x0c, 0x28, 0x07, 0x2a, 0x14, 0x1d, 0x36, 0x14, 0x15 - .byte 0x2b, 0x26, 0x03, 0x25, 0x15, 0x3e, 0x3b, 0x20, 0x35, 0x0c, 0x25, 0x2b, 0x16, 0x35, 0x1e, 0x31, 0x2c, 0x06, 0x03, 0x29, 0x24, 0x07, 0x1f, 0x32, 0x2f, 0x19, 0x25, 0x21, 0x31, 0x22, 0x26, 0x1d - .byte 0x00, 0x1b, 0x18, 0x2a, 0x24, 0x31, 0x20, 0x06, 0x2f, 0x1e, 0x32, 0x26, 0x32, 0x39, 0x12, 0x20, 0x01, 0x19, 0x0f, 0x15, 0x15, 0x27, 0x10, 0x2e, 0x09, 0x25, 0x19, 0x29, 0x37, 0x30, 0x13, 0x1c - .byte 0x1d, 0x29, 0x2d, 0x26, 0x02, 0x1a, 0x16, 0x1d, 0x2b, 0x1c, 0x18, 0x04, 0x34, 0x28, 0x2a, 0x21, 0x15, 0x1b, 0x2e, 0x16, 0x01, 0x10, 0x05, 0x09, 0x14, 0x22, 0x03, 0x22, 0x02, 0x1b, 0x34, 0x29 - .byte 0x2a, 0x23, 0x26, 0x36, 0x13, 0x23, 0x3d, 0x1a, 0x1d, 0x10, 0x24, 0x25, 0x2b, 0x37, 0x19, 0x24, 0x26, 0x28, 0x13, 0x16, 0x17, 0x14, 0x19, 0x0b, 0x2f, 0x25, 0x37, 0x34, 0x37, 0x39, 0x21, 0x1b - .byte 0x0f, 0x3d, 0x2d, 0x0d, 0x10, 0x20, 0x05, 0x0b, 0x2d, 0x01, 0x12, 0x24, 0x18, 0x3d, 0x32, 0x09, 0x21, 0x26, 0x1a, 0x0e, 0x1f, 0x30, 0x06, 0x1f, 0x0b, 0x3c, 0x29, 0x07, 0x3e, 0x27, 0x13, 0x1e - .byte 0x1a, 0x13, 0x07, 0x23, 0x10, 0x34, 0x1e, 0x32, 0x17, 0x23, 0x35, 0x16, 0x31, 0x32, 0x2e, 0x1b, 0x28, 0x0e, 0x22, 0x14, 0x3a, 0x23, 0x22, 0x03, 0x29, 0x2a, 0x10, 0x20, 0x3e, 0x3c, 0x27, 0x16 - .byte 0x20, 0x12, 0x3f, 0x24, 0x31, 0x0d, 0x2e, 0x32, 0x2f, 0x17, 0x2d, 0x36, 0x3b, 0x17, 0x24, 0x23, 0x18, 0x37, 0x1d, 0x13, 0x17, 0x3a, 0x1a, 0x0a, 0x3d, 0x1e, 0x05, 0x12, 0x16, 0x33, 0x32, 0x25 - .byte 0x1d, 0x1f, 0x29, 0x34, 0x2c, 0x26, 0x20, 0x29, 0x35, 0x0e, 0x32, 0x17, 0x01, 0x39, 0x2d, 0x27, 0x24, 0x23, 0x28, 0x3f, 0x18, 0x39, 0x38, 0x25, 0x23, 0x11, 0x11, 0x19, 0x2c, 0x29, 0x30, 0x08 - .byte 0x28, 0x25, 0x27, 0x1d, 0x17, 0x25, 0x21, 0x09, 0x3d, 0x16, 0x1b, 0x0f, 0x2c, 0x1b, 0x12, 0x22, 0x28, 0x3e, 0x26, 0x34, 0x10, 0x1b, 0x02, 0x34, 0x15, 0x1a, 0x29, 0x19, 0x29, 0x11, 0x31, 0x12 - .byte 0x27, 0x17, 0x27, 0x27, 0x2f, 0x34, 0x27, 0x24, 0x03, 0x19, 0x36, 0x17, 0x1d, 0x33, 0x19, 0x25, 0x1a, 0x2b, 0x39, 0x13, 0x3b, 0x33, 0x1d, 0x27, 0x31, 0x34, 0x28, 0x33, 0x37, 0x09, 0x30, 0x1b - .byte 0x03, 0x3a, 0x27, 0x19, 0x11, 0x1f, 0x0b, 0x1a, 0x34, 0x3d, 0x2a, 0x15, 0x04, 0x24, 0x36, 0x30, 0x23, 0x30, 0x0f, 0x22, 0x1b, 0x3d, 0x3d, 0x24, 0x29, 0x1d, 0x12, 0x16, 0x19, 0x2e, 0x03, 0x12 - .byte 0x17, 0x18, 0x25, 0x33, 0x2f, 0x23, 0x1a, 0x1a, 0x35, 0x27, 0x21, 0x26, 0x19, 0x1b, 0x30, 0x18, 0x2b, 0x22, 0x2d, 0x2c, 0x1a, 0x34, 0x3e, 0x12, 0x19, 0x28, 0x27, 0x15, 0x1b, 0x11, 0x12, 0x17 - .byte 0x15, 0x10, 0x34, 0x37, 0x25, 0x12, 0x3f, 0x15, 0x31, 0x0d, 0x37, 0x3e, 0x2a, 0x2d, 0x0f, 0x24, 0x24, 0x3c, 0x3f, 0x1f, 0x1d, 0x34, 0x17, 0x1a, 0x23, 0x1f, 0x37, 0x0f, 0x10, 0x32, 0x34, 0x35 - .byte 0x19, 0x05, 0x22, 0x33, 0x16, 0x34, 0x1e, 0x14, 0x1e, 0x08, 0x13, 0x29, 0x3a, 0x37, 0x30, 0x1d, 0x36, 0x15, 0x29, 0x2e, 0x1d, 0x32, 0x2e, 0x23, 0x35, 0x17, 0x1c, 0x36, 0x1d, 0x13, 0x23, 0x34 - .byte 0x34, 0x24, 0x1a, 0x37, 0x2f, 0x26, 0x2e, 0x1e, 0x17, 0x1a, 0x1f, 0x15, 0x1f, 0x2b, 0x1f, 0x19, 0x0a, 0x33, 0x1a, 0x35, 0x31, 0x24, 0x2d, 0x17, 0x2c, 0x0c, 0x21, 0x36, 0x2c, 0x35, 0x35, 0x1b - .byte 0x03, 0x27, 0x01, 0x0d, 0x1d, 0x1c, 0x0e, 0x11, 0x11, 0x2b, 0x10, 0x25, 0x3b, 0x20, 0x1f, 0x17, 0x19, 0x20, 0x08, 0x36, 0x13, 0x38, 0x19, 0x1b, 0x2b, 0x24, 0x0b, 0x1f, 0x29, 0x27, 0x15, 0x2c - .byte 0x37, 0x39, 0x10, 0x3a, 0x15, 0x2e, 0x2f, 0x11, 0x36, 0x24, 0x04, 0x20, 0x3b, 0x2a, 0x35, 0x27, 0x35, 0x34, 0x0d, 0x1b, 0x20, 0x10, 0x22, 0x37, 0x1f, 0x38, 0x27, 0x31, 0x0f, 0x28, 0x28, 0x25 - .byte 0x15, 0x00, 0x1d, 0x25, 0x31, 0x28, 0x28, 0x0b, 0x3a, 0x1d, 0x2d, 0x13, 0x1b, 0x03, 0x37, 0x2e, 0x1d, 0x28, 0x19, 0x08, 0x2d, 0x22, 0x27, 0x39, 0x32, 0x3f, 0x2f, 0x1d, 0x33, 0x34, 0x28, 0x18 - .byte 0x08, 0x31, 0x23, 0x1f, 0x13, 0x0d, 0x2c, 0x23, 0x3a, 0x2d, 0x1a, 0x02, 0x25, 0x13, 0x20, 0x36, 0x34, 0x12, 0x2b, 0x2d, 0x35, 0x35, 0x34, 0x23, 0x20, 0x21, 0x3a, 0x19, 0x1b, 0x1f, 0x2b, 0x19 - .byte 0x35, 0x0e, 0x19, 0x26, 0x24, 0x37, 0x18, 0x08, 0x10, 0x0c, 0x16, 0x2d, 0x1f, 0x34, 0x21, 0x05, 0x38, 0x19, 0x14, 0x21, 0x24, 0x11, 0x31, 0x14, 0x3e, 0x38, 0x29, 0x3f, 0x08, 0x25, 0x2a, 0x1f - .byte 0x25, 0x25, 0x06, 0x28, 0x0b, 0x1e, 0x14, 0x1a, 0x38, 0x22, 0x24, 0x18, 0x29, 0x1a, 0x11, 0x20, 0x3b, 0x3a, 0x1e, 0x1c, 0x26, 0x1a, 0x05, 0x32, 0x19, 0x39, 0x2a, 0x31, 0x09, 0x07, 0x25, 0x05 - .byte 0x3e, 0x16, 0x34, 0x26, 0x14, 0x1b, 0x32, 0x26, 0x05, 0x08, 0x37, 0x0f, 0x03, 0x20, 0x2a, 0x39, 0x31, 0x08, 0x01, 0x1e, 0x1d, 0x23, 0x31, 0x28, 0x1b, 0x28, 0x1e, 0x37, 0x14, 0x13, 0x0e, 0x28 - .byte 0x2a, 0x3b, 0x37, 0x2f, 0x1c, 0x28, 0x30, 0x30, 0x1a, 0x36, 0x1f, 0x16, 0x3e, 0x0d, 0x15, 0x2e, 0x16, 0x18, 0x15, 0x37, 0x20, 0x2a, 0x33, 0x30, 0x2b, 0x0e, 0x25, 0x18, 0x20, 0x16, 0x02, 0x19 - .byte 0x25, 0x0a, 0x2e, 0x30, 0x16, 0x03, 0x11, 0x04, 0x27, 0x25, 0x1b, 0x1c, 0x21, 0x29, 0x04, 0x27, 0x3d, 0x20, 0x1e, 0x28, 0x33, 0x31, 0x1e, 0x39, 0x10, 0x31, 0x29, 0x1e, 0x06, 0x25, 0x28, 0x19 - .byte 0x3b, 0x12, 0x0b, 0x1b, 0x1c, 0x3e, 0x37, 0x20, 0x0a, 0x37, 0x33, 0x02, 0x2c, 0x25, 0x15, 0x18, 0x14, 0x3b, 0x20, 0x1c, 0x22, 0x3b, 0x1c, 0x24, 0x34, 0x35, 0x0f, 0x2f, 0x31, 0x3b, 0x17, 0x35 - .byte 0x30, 0x39, 0x37, 0x0d, 0x15, 0x11, 0x10, 0x03, 0x1e, 0x1a, 0x39, 0x33, 0x2f, 0x2e, 0x28, 0x1c, 0x28, 0x36, 0x28, 0x18, 0x1f, 0x15, 0x01, 0x30, 0x3e, 0x32, 0x28, 0x34, 0x2f, 0x23, 0x07, 0x0c - .byte 0x36, 0x28, 0x2c, 0x34, 0x2a, 0x0c, 0x1f, 0x3f, 0x20, 0x13, 0x2b, 0x17, 0x27, 0x28, 0x29, 0x2a, 0x3c, 0x13, 0x36, 0x26, 0x2d, 0x2a, 0x0a, 0x06, 0x1e, 0x20, 0x04, 0x1a, 0x02, 0x07, 0x35, 0x0e - .byte 0x18, 0x30, 0x00, 0x34, 0x34, 0x2f, 0x14, 0x37, 0x21, 0x30, 0x1f, 0x15, 0x37, 0x1b, 0x3a, 0x0b, 0x32, 0x22, 0x22, 0x21, 0x1b, 0x35, 0x23, 0x0d, 0x03, 0x1c, 0x23, 0x3b, 0x13, 0x0e, 0x1d, 0x1f - .byte 0x1d, 0x3f, 0x2e, 0x39, 0x27, 0x2e, 0x0f, 0x38, 0x20, 0x31, 0x3c, 0x35, 0x0b, 0x0f, 0x2e, 0x06, 0x06, 0x28, 0x25, 0x39, 0x23, 0x0a, 0x32, 0x15, 0x0f, 0x1d, 0x25, 0x0c, 0x0d, 0x34, 0x12, 0x2e - .byte 0x21, 0x36, 0x18, 0x1f, 0x1f, 0x34, 0x1b, 0x05, 0x3a, 0x36, 0x2b, 0x01, 0x17, 0x0e, 0x16, 0x2b, 0x0e, 0x0b, 0x26, 0x0d, 0x2d, 0x10, 0x21, 0x11, 0x27, 0x3d, 0x13, 0x32, 0x15, 0x25, 0x2a, 0x1b - .byte 0x2d, 0x35, 0x2c, 0x2b, 0x26, 0x26, 0x1f, 0x20, 0x22, 0x2b, 0x12, 0x3f, 0x3d, 0x27, 0x30, 0x0a, 0x36, 0x35, 0x1f, 0x17, 0x21, 0x08, 0x29, 0x1d, 0x20, 0x33, 0x34, 0x11, 0x16, 0x05, 0x38, 0x2d - diff --git a/include/contest.h b/include/contest.h index 8790d7371..c205737ee 100644 --- a/include/contest.h +++ b/include/contest.h @@ -231,6 +231,7 @@ extern u8 gContestPlayerMonIndex; extern s16 gUnknown_02039F08[4]; extern s16 gContestMonConditions[4]; extern u8 gIsLinkContest; +extern struct ContestWinner gUnknown_02039F3C; struct Shared18000 { diff --git a/include/contest_painting.h b/include/contest_painting.h index 67a845d62..c633c50cc 100644 --- a/include/contest_painting.h +++ b/include/contest_painting.h @@ -1,7 +1,16 @@ #ifndef GUARD_CONTESTPAINTING_H #define GUARD_CONTESTPAINTING_H -void sub_812FDA8(u32); -void sub_812FDEC(void); +enum +{ + CONTESTRESULT_COOL = 9, + CONTESTRESULT_BEAUTY = 13, + CONTESTRESULT_CUTE = 2, + CONTESTRESULT_SMART = 36, + CONTESTRESULT_TOUGH = 6, +}; + +void sub_812FDA8(int); +void CB2_ContestPainting(void); #endif diff --git a/include/contest_painting_effects.h b/include/contest_painting_effects.h new file mode 100755 index 000000000..3b6964666 --- /dev/null +++ b/include/contest_painting_effects.h @@ -0,0 +1,28 @@ +#ifndef GUARD_CONTEST_PAINTING_EFFECTS_H +#define GUARD_CONTEST_PAINTING_EFFECTS_H + +struct Unk030061A0 +{ + u8 var_0; + u8 pad1[3]; + u16 (*var_4)[][32]; + u16 *var_8; + u8 pad0C[4]; + u32 var_10; + u16 var_14; + u16 var_16; + u8 var_18; + u8 var_19; + u8 var_1A; + u8 var_1B; + u8 var_1C; + u8 var_1D; + u8 var_1E; + u8 var_1F; +}; + +void sub_8124F2C(struct Unk030061A0 *); +void sub_81261A4(struct Unk030061A0 *); +void sub_8126058(struct Unk030061A0 *); + +#endif diff --git a/include/strings.h b/include/strings.h index f0df4bdec..c780a80b4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1226,6 +1226,7 @@ extern const u8 gText_SpaceAndSpace[]; extern const u8 gText_CommaSpace[]; extern const u8 gText_NewLine[]; extern const u8 gText_ScrollTextUp[]; +extern const u8 gText_Space[]; extern const u8 gText_Space2[]; extern const u8 gText_Are[]; extern const u8 gText_Are2[]; diff --git a/ld_script.txt b/ld_script.txt index 1413941f1..68aa8463c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -186,11 +186,10 @@ SECTIONS { src/dewford_trend.o(.text); src/heal_location.o(.text); src/region_map.o(.text); - asm/cute_sketch.o(.text); + asm/contest_painting_effects.o(.text); src/decoration.o(.text); src/slot_machine.o(.text); src/contest_painting.o(.text); - asm/contest_painting.o(.text); src/battle_ai_script_commands.o(.text); src/trader.o(.text); src/starter_choose.o(.text); @@ -511,11 +510,11 @@ SECTIONS { src/menu_helpers.o(.rodata); src/heal_location.o(.rodata); src/region_map.o(.rodata); - data/cute_sketch.o(.rodata); + data/contest_painting_effects.o(.rodata); src/decoration.o(.rodata); src/slot_machine.o(.rodata); data/slot_machine.o(.rodata); - data/contest_painting.o(.rodata); + src/contest_painting.o(.rodata); src/battle_ai_script_commands.o(.rodata); src/trader.o(.rodata); src/starter_choose.o(.rodata); diff --git a/src/battle_anim_8170478.c b/src/battle_anim_8170478.c index 6c91ff934..94f2c95b5 100755 --- a/src/battle_anim_8170478.c +++ b/src/battle_anim_8170478.c @@ -79,9 +79,9 @@ static void sub_817330C(struct Sprite *); struct BallCaptureSuccessStarData { - s8 xOffset; - s8 yOffset; - s8 unk2; + s8 xOffset; + s8 yOffset; + s8 unk2; }; static const struct BallCaptureSuccessStarData sBallCaptureSuccessStarData[] = @@ -478,7 +478,7 @@ static void sub_8170660(u8 taskId) SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR | WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR); if (!IsContest()) - SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); + SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0); SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) ^ DISPCNT_OBJWIN_ON); SetGpuReg(REG_OFFSET_BLDCNT, 0); @@ -522,9 +522,9 @@ static void sub_8170834(u8 *paletteId1, u8 *paletteId2, u8 battler) void sub_8170920(u8 taskId) { - u8 paletteId1, paletteId2; - sub_8170834(&paletteId1, &paletteId2, gBattleAnimAttacker); - DestroyAnimVisualTask(taskId); + u8 paletteId1, paletteId2; + sub_8170834(&paletteId1, &paletteId2, gBattleAnimAttacker); + DestroyAnimVisualTask(taskId); } static void sub_817094C(u8 battler) @@ -548,8 +548,8 @@ static void sub_817094C(u8 battler) void sub_81709EC(u8 taskId) { - sub_817094C(gBattleAnimAttacker); - DestroyAnimVisualTask(taskId); + sub_817094C(gBattleAnimAttacker); + DestroyAnimVisualTask(taskId); } void sub_8170A0C(u8 taskId) @@ -1162,13 +1162,13 @@ static void sub_81717F8(struct Sprite *sprite) sprite->data[4]++; if (sprite->data[4] == 40) { - PlaySE(SE_RG_GETTING); - BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB(0, 0, 0)); - sub_81719EC(sprite); + PlaySE(SE_RG_GETTING); + BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB(0, 0, 0)); + sub_81719EC(sprite); } else if (sprite->data[4] == 60) { - BeginNormalPaletteFade(0x10000 << sprite->oam.paletteNum, 2, 6, 0, RGB(0, 0, 0)); + BeginNormalPaletteFade(0x10000 << sprite->oam.paletteNum, 2, 6, 0, RGB(0, 0, 0)); } else if (sprite->data[4] == 95) { @@ -1243,41 +1243,41 @@ static void sub_81719C0(struct Sprite *sprite) static void sub_81719EC(struct Sprite *sprite) { - u32 i; - u8 subpriority; + u32 i; + u8 subpriority; if (sprite->subpriority) { - subpriority = sprite->subpriority - 1; + subpriority = sprite->subpriority - 1; } else { - subpriority = 0; - sprite->subpriority = 1; + subpriority = 0; + sprite->subpriority = 1; } sub_8171D60(4); for (i = 0; i < 3; i++) { - u8 spriteId = CreateSprite(&gUnknown_085E51F0[4], sprite->pos1.x, sprite->pos1.y, subpriority); - if (spriteId != MAX_SPRITES) - { - gSprites[spriteId].data[0] = 24; - gSprites[spriteId].data[2] = sprite->pos1.x + sBallCaptureSuccessStarData[i].xOffset; - gSprites[spriteId].data[4] = sprite->pos1.y + sBallCaptureSuccessStarData[i].yOffset; - gSprites[spriteId].data[5] = sBallCaptureSuccessStarData[i].unk2; - InitAnimArcTranslation(&gSprites[spriteId]); - gSprites[spriteId].callback = sub_8171AAC; - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[4]); - } + u8 spriteId = CreateSprite(&gUnknown_085E51F0[4], sprite->pos1.x, sprite->pos1.y, subpriority); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].data[0] = 24; + gSprites[spriteId].data[2] = sprite->pos1.x + sBallCaptureSuccessStarData[i].xOffset; + gSprites[spriteId].data[4] = sprite->pos1.y + sBallCaptureSuccessStarData[i].yOffset; + gSprites[spriteId].data[5] = sBallCaptureSuccessStarData[i].unk2; + InitAnimArcTranslation(&gSprites[spriteId]); + gSprites[spriteId].callback = sub_8171AAC; + StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[4]); + } } } static void sub_8171AAC(struct Sprite *sprite) { - sprite->invisible = !sprite->invisible; - if (TranslateAnimArc(sprite)) - DestroySprite(sprite); + sprite->invisible = !sprite->invisible; + if (TranslateAnimArc(sprite)) + DestroySprite(sprite); } // fakematching. I think the return type of ItemIdToBallId() diff --git a/src/contest_painting.c b/src/contest_painting.c index 7950b7cac..b1b189c09 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -1,8 +1,709 @@ #include "global.h" +#include "alloc.h" +#include "battle.h" +#include "bg.h" +#include "contest.h" +#include "contest_painting.h" +#include "contest_painting_effects.h" +#include "battle_gfx_sfx_util.h" +#include "decompress.h" +#include "gpu_regs.h" +#include "international_string_util.h" +#include "main.h" +#include "lilycove_lady.h" +#include "palette.h" +#include "random.h" +#include "scanline_effect.h" +#include "string_util.h" +#include "strings.h" +#include "text.h" +#include "window.h" +#include "constants/rgb.h" + +extern u8 gUnknown_02039F5C; +extern u8 gUnknown_02039F5D; + +extern u16 (*gUnknown_03006190)[][32]; +extern struct ContestWinner *gUnknown_030061C0; +extern u16 *gContestPaintingMonPalette; +extern struct Unk030061A0 gUnknown_030061A0; // IWRAM bss -IWRAM_DATA u8 gUnknown_030011F0; -IWRAM_DATA u16 gUnknown_030011F2; -IWRAM_DATA u16 gUnknown_030011F4; -IWRAM_DATA u8 gUnknown_030011F6; -IWRAM_DATA u8 gUnknown_030011F7; +IWRAM_DATA u8 gContestPaintingState; +IWRAM_DATA u16 gContestPaintingMosaicVal; +IWRAM_DATA u16 gContestPaintingFadeCounter; +IWRAM_DATA bool8 gUnknown_030011F6; +IWRAM_DATA u8 gContestPaintingWindowId; + +static void ShowContestPainting(void); +static void HoldContestPainting(void); +static void InitContestPaintingWindow(void); +static void InitContestPaintingBg(void); +static void InitContestPaintingVars(bool8); +static void sub_8130884(u8, u8); +static void PrintContestPaintingCaption(u8, u8); +static void VBlankCB_ContestPainting(void); +static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64]); + +extern const u8 gUnknown_0827EA0C[]; +extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +extern const struct CompressedSpriteSheet gMonBackPicTable[]; +extern const u8 gContestCoolness[]; +extern const u8 gContestBeauty[]; +extern const u8 gContestCuteness[]; +extern const u8 gContestSmartness[]; +extern const u8 gContestToughness[]; +extern const u8 gContestRankNormal[]; +extern const u8 gContestRankSuper[]; +extern const u8 gContestRankHyper[]; +extern const u8 gContestRankMaster[]; +extern const u8 gContestLink[]; +extern const u8 gContestPaintingCool1[]; +extern const u8 gContestPaintingCool2[]; +extern const u8 gContestPaintingCool3[]; +extern const u8 gContestPaintingBeauty1[]; +extern const u8 gContestPaintingBeauty2[]; +extern const u8 gContestPaintingBeauty3[]; +extern const u8 gContestPaintingCute1[]; +extern const u8 gContestPaintingCute2[]; +extern const u8 gContestPaintingCute3[]; +extern const u8 gContestPaintingSmart1[]; +extern const u8 gContestPaintingSmart2[]; +extern const u8 gContestPaintingSmart3[]; +extern const u8 gContestPaintingTough1[]; +extern const u8 gContestPaintingTough2[]; +extern const u8 gContestPaintingTough3[]; + +const u16 gPictureFramePalettes[] = INCBIN_U16("graphics/picture_frame/bg.gbapal"); +const u8 gPictureFrameTiles_0[] = INCBIN_U8("graphics/picture_frame/frame0.4bpp.rl"); +const u8 gPictureFrameTiles_1[] = INCBIN_U8("graphics/picture_frame/frame1.4bpp.rl"); +const u8 gPictureFrameTiles_2[] = INCBIN_U8("graphics/picture_frame/frame2.4bpp.rl"); +const u8 gPictureFrameTiles_3[] = INCBIN_U8("graphics/picture_frame/frame3.4bpp.rl"); +const u8 gPictureFrameTiles_4[] = INCBIN_U8("graphics/picture_frame/frame4.4bpp.rl"); +const u8 gPictureFrameTiles_5[] = INCBIN_U8("graphics/picture_frame/frame5.4bpp.rl"); +const u8 gPictureFrameTilemap_0[] = INCBIN_U8("graphics/picture_frame/frame0_map.bin.rl"); +const u8 gPictureFrameTilemap_1[] = INCBIN_U8("graphics/picture_frame/frame1_map.bin.rl"); +const u8 gPictureFrameTilemap_2[] = INCBIN_U8("graphics/picture_frame/frame2_map.bin.rl"); +const u8 gPictureFrameTilemap_3[] = INCBIN_U8("graphics/picture_frame/frame3_map.bin.rl"); +const u8 gPictureFrameTilemap_4[] = INCBIN_U8("graphics/picture_frame/frame4_map.bin.rl"); +const u8 gPictureFrameTilemap_5[] = INCBIN_U8("graphics/picture_frame/frame5_map.bin.rl"); + +const u8 *const gUnknown_085B07C0[] = +{ + gContestCoolness, + gContestBeauty, + gContestCuteness, + gContestSmartness, + gContestToughness, +}; + +const u8 *const gContestRankTextPointers[] = +{ + gContestRankNormal, + gContestRankSuper, + gContestRankHyper, + gContestRankMaster, + gContestLink, +}; + +const struct BgTemplate gUnknown_085B07E8[] = +{ + { + .bg = 1, + .charBaseIndex = 1, + .mapBaseIndex = 10, + .screenSize = 0, + .paletteMode = 0, + .priority = 1, + .baseTile = 0, + }, +}; + +const struct WindowTemplate gUnknown_085B07EC = +{ + .bg = 1, + .tilemapLeft = 2, + .tilemapTop = 14, + .width = 26, + .height = 4, + .paletteNum = 15, + .baseBlock = 1, +}; + +const u8 *const gContestPaintingDescriptionPointers[] = +{ + gContestPaintingCool1, + gContestPaintingCool2, + gContestPaintingCool3, + gContestPaintingBeauty1, + gContestPaintingBeauty2, + gContestPaintingBeauty3, + gContestPaintingCute1, + gContestPaintingCute2, + gContestPaintingCute3, + gContestPaintingSmart1, + gContestPaintingSmart2, + gContestPaintingSmart3, + gContestPaintingTough1, + gContestPaintingTough2, + gContestPaintingTough3, +}; + +const struct OamData gUnknown_085B0830 = +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 1, + .bpp = ST_OAM_8BPP, + .shape = ST_OAM_SQUARE, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +const u16 gUnknown_085B0838[] = {RGB(0, 0, 0), RGB(0, 0, 0)}; + +void sub_812FDA8(int contestWinner) +{ + // probably fakematching + u8 *ptr1 = &gUnknown_02039F5D; + u8 *ptr2 = &gUnknown_02039F5C; + gUnknown_02039F3C = gSaveBlock1Ptr->contestWinners[contestWinner - 1]; + *ptr1 = contestWinner - 1; + *ptr2 = 0; +} + +void CB2_ContestPainting(void) +{ + ShowContestPainting(); +} + +static void CB2_HoldContestPainting(void) +{ + HoldContestPainting(); + RunTextPrinters(); + UpdatePaletteFade(); +} + +static void CB2_QuitContestPainting(void) +{ + SetMainCallback2(gMain.savedCallback); + FREE_AND_SET_NULL(gContestPaintingMonPalette); + FREE_AND_SET_NULL(gUnknown_03006190); + RemoveWindow(gContestPaintingWindowId); + Free(GetBgTilemapBuffer(1)); + FreeMonSpritesGfx(); +} + +static void ShowContestPainting(void) +{ + switch (gMain.state) + { + case 0: + ScanlineEffect_Stop(); + SetVBlankCallback(NULL); + AllocateMonSpritesGfx(); + gUnknown_030061C0 = &gUnknown_02039F3C; + InitContestPaintingVars(1); + InitContestPaintingBg(); + gMain.state++; + break; + case 1: + ResetPaletteFade(); + DmaFillLarge32(3, 0, (void *)BG_VRAM, 0x18000, 0x1000); + ResetSpriteData(); + gMain.state++; + break; + case 2: + SeedRng(gMain.vblankCounter1); + InitKeys(); + InitContestPaintingWindow(); + gMain.state++; + break; + case 3: + sub_8130884(gUnknown_02039F5D, gUnknown_02039F5C); + gMain.state++; + break; + case 4: + PrintContestPaintingCaption(gUnknown_02039F5D, gUnknown_02039F5C); + LoadPalette(gUnknown_085B0838, 0, 1 * 2); + DmaClear32(3, PLTT, PLTT_SIZE); + BeginFastPaletteFade(2); + SetVBlankCallback(VBlankCB_ContestPainting); + gContestPaintingState = 0; + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON); + SetMainCallback2(CB2_HoldContestPainting); + break; + } +} + +static void HoldContestPainting(void) +{ + switch (gContestPaintingState) + { + case 0: + if (!gPaletteFade.active) + gContestPaintingState = 1; + if (gUnknown_030011F6 && gContestPaintingFadeCounter) + gContestPaintingFadeCounter--; + break; + case 1: + if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) + { + u8 two = 2; //needed to make the asm match + gContestPaintingState = two; + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); + } + + if (gUnknown_030011F6) + gContestPaintingFadeCounter = 0; + break; + case 2: + if (!gPaletteFade.active) + SetMainCallback2(CB2_QuitContestPainting); + if (gUnknown_030011F6 && gContestPaintingFadeCounter < 30) + gContestPaintingFadeCounter++; + break; + } +} + +static void InitContestPaintingWindow(void) +{ + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, gUnknown_085B07E8, ARRAY_COUNT(gUnknown_085B07E8)); + ChangeBgX(1, 0, 0); + ChangeBgY(1, 0, 0); + SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE)); + gContestPaintingWindowId = AddWindow(&gUnknown_085B07EC); + DeactivateAllTextPrinters(); + FillWindowPixelBuffer(gContestPaintingWindowId, 0); + PutWindowTilemap(gContestPaintingWindowId); + CopyWindowToVram(gContestPaintingWindowId, 3); + ShowBg(1); +} + +static void PrintContestPaintingCaption(u8 contestType, u8 arg1) +{ + int x; + u8 category; + + if (arg1 == TRUE) + return; + + category = gUnknown_030061C0->contestCategory; + if (contestType < 8) + { + sub_818E868(gStringVar1, category); + StringAppend(gStringVar1, gText_Space); + StringAppend(gStringVar1, gContestRankTextPointers[gUnknown_030061C0->contestRank]); + StringCopy(gStringVar2, gUnknown_030061C0->trainerName); + sub_81DB5AC(gStringVar2); + StringCopy(gStringVar3, gUnknown_030061C0->monName); + StringExpandPlaceholders(gStringVar4, gUnknown_0827EA0C); + } + else + { + StringCopy(gStringVar1, gUnknown_030061C0->monName); + StringExpandPlaceholders(gStringVar4, gContestPaintingDescriptionPointers[category]); + } + + x = GetStringCenterAlignXOffset(1, gStringVar4, 208); + AddTextPrinterParameterized(gContestPaintingWindowId, 1, gStringVar4, x, 1, 0, 0); + CopyBgTilemapBufferToVram(1); +} + +static void InitContestPaintingBg(void) +{ + SetGpuReg(REG_OFFSET_DISPCNT, 0); + REG_IE |= INTR_FLAG_VBLANK; + SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(12) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256); + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(10) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); +} + +static void InitContestPaintingVars(bool8 arg0) +{ + if (arg0 == FALSE) + { + gUnknown_030011F6 = FALSE; + gContestPaintingMosaicVal = 0; + gContestPaintingFadeCounter = 0; + } + else + { + gUnknown_030011F6 = TRUE; + gContestPaintingMosaicVal = 15; + gContestPaintingFadeCounter = 30; + } +} + +static void UpdateContestPaitingMosaicEffect(void) +{ + if (!gUnknown_030011F6) + { + SetGpuReg(REG_OFFSET_MOSAIC, 0); + } + else + { + SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(10) | BGCNT_MOSAIC | BGCNT_16COLOR | BGCNT_TXT256x256); + gContestPaintingMosaicVal = gContestPaintingFadeCounter / 2; + SetGpuReg(REG_OFFSET_MOSAIC, (gContestPaintingMosaicVal << 12) | (gContestPaintingMosaicVal << 8) | (gContestPaintingMosaicVal << 4) | (gContestPaintingMosaicVal << 0)); + } +} + +static void VBlankCB_ContestPainting(void) +{ + UpdateContestPaitingMosaicEffect(); + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +void sub_81302E8(u16 species, u8 arg1) +{ + const void *pal = GetFrontSpritePalFromSpeciesAndPersonality(species, gUnknown_030061C0->trainerId, gUnknown_030061C0->personality); + LZDecompressVram(pal, gContestPaintingMonPalette); + if (!arg1) + { + HandleLoadSpecialPokePic_DontHandleDeoxys( + &gMonFrontPicTable[species], + gMonSpritesGfxPtr->sprites[1], + species, + gUnknown_030061C0->personality); + sub_8130380(gMonSpritesGfxPtr->sprites[1], gContestPaintingMonPalette, (void *)gUnknown_03006190); + } + else + { + HandleLoadSpecialPokePic_DontHandleDeoxys( + &gMonBackPicTable[species], + gMonSpritesGfxPtr->sprites[0], + species, + gUnknown_030061C0->personality); + sub_8130380(gMonSpritesGfxPtr->sprites[0], gContestPaintingMonPalette, (void *)gUnknown_03006190); + } +} + +#ifdef NONMATCHING +// functionally equivalent. +static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64]) +{ + u16 tileY, tileX, pixelY, pixelX; + u8 colorIndex; + + for (tileY = 0; tileY < 8; tileY++) + { + for (tileX = 0; tileX < 8; tileX++) + { + for (pixelY = 0; pixelY < 8; pixelY++) + { + for (pixelX = 0; pixelX < 8; pixelX++) + { + int offset = 32 * (8 * tileY + tileX) + (pixelY * 4 + pixelX / 2); + colorIndex = spritePixels[offset]; + if (pixelX & 1) + colorIndex >>= 4; + else + colorIndex &= 0xF; + + if (colorIndex == 0) // transparent pixel + (*destColorBuffer)[8 * tileY + pixelY][tileX * 8 + pixelX] = 0x8000; + else + (*destColorBuffer)[8 * tileY + pixelY][tileX * 8 + pixelX] = palette[colorIndex]; + } + } + } + } +} +#else +NAKED +static void sub_8130380(u8 *spritePixels, u16 *palette, u16 (*destColorBuffer)[64][64]) +{ + asm_unified("\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0xC\n\ + mov r10, r0\n\ + mov r9, r1\n\ + str r2, [sp]\n\ + movs r0, 0\n\ +_08130394:\n\ + movs r3, 0\n\ + adds r1, r0, 0x1\n\ + str r1, [sp, 0x4]\n\ + lsls r0, 3\n\ + str r0, [sp, 0x8]\n\ +_0813039E:\n\ + movs r1, 0\n\ + adds r2, r3, 0x1\n\ + mov r8, r2\n\ + ldr r7, [sp, 0x8]\n\ + adds r0, r7, r3\n\ + lsls r0, 5\n\ + mov r12, r0\n\ + lsls r4, r3, 3\n\ +_081303AE:\n\ + movs r3, 0\n\ + lsls r0, r1, 2\n\ + adds r6, r1, 0x1\n\ + mov r2, r12\n\ + adds r5, r2, r0\n\ + ldr r7, [sp, 0x8]\n\ + adds r0, r7, r1\n\ + lsls r0, 7\n\ + ldr r1, [sp]\n\ + adds r2, r0, r1\n\ +_081303C2:\n\ + lsrs r0, r3, 1\n\ + adds r0, r5, r0\n\ + add r0, r10\n\ + ldrb r1, [r0]\n\ + movs r0, 0x1\n\ + ands r0, r3\n\ + cmp r0, 0\n\ + beq _081303D6\n\ + lsrs r1, 4\n\ + b _081303DA\n\ +_081303D6:\n\ + movs r0, 0xF\n\ + ands r1, r0\n\ +_081303DA:\n\ + cmp r1, 0\n\ + bne _081303EC\n\ + adds r0, r4, r3\n\ + lsls r0, 1\n\ + adds r0, r2\n\ + movs r7, 0x80\n\ + lsls r7, 8\n\ + adds r1, r7, 0\n\ + b _081303F8\n\ +_081303EC:\n\ + adds r0, r4, r3\n\ + lsls r0, 1\n\ + adds r0, r2\n\ + lsls r1, 1\n\ + add r1, r9\n\ + ldrh r1, [r1]\n\ +_081303F8:\n\ + strh r1, [r0]\n\ + adds r0, r3, 0x1\n\ + lsls r0, 16\n\ + lsrs r3, r0, 16\n\ + cmp r3, 0x7\n\ + bls _081303C2\n\ + lsls r0, r6, 16\n\ + lsrs r1, r0, 16\n\ + cmp r1, 0x7\n\ + bls _081303AE\n\ + mov r1, r8\n\ + lsls r0, r1, 16\n\ + lsrs r3, r0, 16\n\ + cmp r3, 0x7\n\ + bls _0813039E\n\ + ldr r2, [sp, 0x4]\n\ + lsls r0, r2, 16\n\ + lsrs r0, 16\n\ + cmp r0, 0x7\n\ + bls _08130394\n\ + add sp, 0xC\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0"); +} +#endif + +static void sub_8130430(u8 arg0, u8 arg1) +{ + u8 x, y; + + LoadPalette(gPictureFramePalettes, 0, 0x100); + if (arg1 == 1) + { + switch (gUnknown_030061C0->contestCategory / 3) + { + case CONTEST_CATEGORY_COOL: + RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM); + RLUnCompWram(gPictureFrameTilemap_0, gUnknown_03006190); + break; + case CONTEST_CATEGORY_BEAUTY: + RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM); + RLUnCompWram(gPictureFrameTilemap_1, gUnknown_03006190); + break; + case CONTEST_CATEGORY_CUTE: + RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM); + RLUnCompWram(gPictureFrameTilemap_2, gUnknown_03006190); + break; + case CONTEST_CATEGORY_SMART: + RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM); + RLUnCompWram(gPictureFrameTilemap_3, gUnknown_03006190); + break; + case CONTEST_CATEGORY_TOUGH: + RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM); + RLUnCompWram(gPictureFrameTilemap_4, gUnknown_03006190); + break; + } + +#define VRAM_PICTURE_DATA(x, y) (((u16 *)(VRAM + 0x6000))[(y) * 32 + (x)]) + + // Set the background + for (y = 0; y < 20; y++) + { + for (x = 0; x < 32; x++) + VRAM_PICTURE_DATA(x, y) = 0x1015; + } + + // Copy the image frame + for (y = 0; y < 10; y++) + { + for (x = 0; x < 18; x++) + VRAM_PICTURE_DATA(x + 6, y + 2) = (*gUnknown_03006190)[y + 2][x + 6]; + } + + // Re-set the entire top row to the first top frame part + for (x = 0; x < 16; x++) + VRAM_PICTURE_DATA(x + 7, 2) = (*gUnknown_03006190)[2][7]; + +#undef VRAM_PICTURE_DATA + } + else if (arg0 < 8) + { + RLUnCompVram(gPictureFrameTiles_5, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_5, (void *)(VRAM + 0x6000)); + } + else + { + switch (gUnknown_030061C0->contestCategory / 3) + { + case CONTEST_CATEGORY_COOL: + RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_0, (void *)(VRAM + 0x6000)); + break; + case CONTEST_CATEGORY_BEAUTY: + RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_1, (void *)(VRAM + 0x6000)); + break; + case CONTEST_CATEGORY_CUTE: + RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_2, (void *)(VRAM + 0x6000)); + break; + case CONTEST_CATEGORY_SMART: + RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_3, (void *)(VRAM + 0x6000)); + break; + case CONTEST_CATEGORY_TOUGH: + RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM); + RLUnCompVram(gPictureFrameTilemap_4, (void *)(VRAM + 0x6000)); + break; + } + } +} + +static void sub_8130688(u8 arg0) +{ + //Some hacks just to get the asm to match +#ifndef NONMATCHING + asm(""::"r"(arg0)); +#endif + + gMain.oamBuffer[0] = gUnknown_085B0830; + gMain.oamBuffer[0].tileNum = 0; + +#ifndef NONMATCHING + if (arg0) arg0 = gMain.oamBuffer[0].tileNum; +#endif + + gMain.oamBuffer[0].x = 88; + gMain.oamBuffer[0].y = 24; +} + +static u8 sub_81306CC(u8 arg0) +{ + u8 contestCategory; + + if (arg0 < 8) + contestCategory = gUnknown_030061C0->contestCategory; + else + contestCategory = gUnknown_030061C0->contestCategory / 3; + + switch (contestCategory) + { + case CONTEST_CATEGORY_COOL: + return CONTESTRESULT_COOL; + case CONTEST_CATEGORY_BEAUTY: + return CONTESTRESULT_BEAUTY; + case CONTEST_CATEGORY_CUTE: + return CONTESTRESULT_CUTE; + case CONTEST_CATEGORY_SMART: + return CONTESTRESULT_SMART; + case CONTEST_CATEGORY_TOUGH: + return CONTESTRESULT_TOUGH; + } + + return contestCategory; +} + +static void sub_8130738(void) +{ + gContestPaintingMonPalette = AllocZeroed(0x200); + gUnknown_03006190 = AllocZeroed(0x2000); +} + +static void sub_8130760(u8 contestResult) +{ + gUnknown_030061A0.var_4 = gUnknown_03006190; + gUnknown_030061A0.var_8 = gContestPaintingMonPalette; + gUnknown_030061A0.var_18 = 0; + gUnknown_030061A0.var_1F = gUnknown_030061C0->personality % 256; + gUnknown_030061A0.var_19 = 0; + gUnknown_030061A0.var_1A = 0; + gUnknown_030061A0.var_1B = 64; + gUnknown_030061A0.var_1C = 64; + gUnknown_030061A0.var_1D = 64; + gUnknown_030061A0.var_1E = 64; + + switch (contestResult) + { + case CONTESTRESULT_SMART: + case CONTESTRESULT_TOUGH: + gUnknown_030061A0.var_14 = 3; + break; + case CONTESTRESULT_COOL: + case CONTESTRESULT_BEAUTY: + case CONTESTRESULT_CUTE: + default: + gUnknown_030061A0.var_14 = 1; + break; + } + + gUnknown_030061A0.var_16 = 2; + gUnknown_030061A0.var_0 = contestResult; + gUnknown_030061A0.var_10 = 0x6010000; + + sub_8124F2C(&gUnknown_030061A0); + sub_81261A4(&gUnknown_030061A0); + sub_8126058(&gUnknown_030061A0); + + LoadPalette(gContestPaintingMonPalette, 0x100, 0x200); +} + +static void sub_8130884(u8 arg0, u8 arg1) +{ + sub_8130738(); + sub_81302E8(gUnknown_030061C0->species, 0); + sub_8130760(sub_81306CC(arg0)); + sub_8130688(arg0); + sub_8130430(arg0, arg1); +} diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 7fc61f953..f2d5b5cb6 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -220,7 +220,7 @@ static void ShowContestWinnerCleanup(void) void ShowContestWinner(void) { - SetMainCallback2(sub_812FDEC); + SetMainCallback2(CB2_ContestPainting); gMain.savedCallback = ShowContestWinnerCleanup; } diff --git a/sym_common.txt b/sym_common.txt index bb84ec06e..3a7d698fd 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -63,7 +63,7 @@ gUnknown_030061A0: @ 30061A0 gUnknown_030061C0: @ 30061C0 .space 0x4 -gUnknown_030061C4: @ 30061C4 +gContestPaintingMonPalette: @ 30061C4 .space 0xC .include "field_specials.o" -- cgit v1.2.3 From bc11a4a9f4233ce5795f5181729862b26d899f60 Mon Sep 17 00:00:00 2001 From: Meowsy Date: Sat, 15 Dec 2018 15:12:28 -0500 Subject: Document various things relating to the Pokedex. --- asm/trade.s | 16 ++-- include/global.h | 2 +- include/pokedex.h | 11 ++- include/pokemon.h | 2 +- src/birch_pc.c | 12 +-- src/credits.c | 10 +-- src/event_data.c | 3 +- src/pokedex.c | 164 ++++++++++++++++++-------------------- src/pokemon.c | 18 ++--- src/script_pokemon_util_80F87D8.c | 4 +- src/tv.c | 4 +- 11 files changed, 125 insertions(+), 121 deletions(-) diff --git a/asm/trade.s b/asm/trade.s index 341aa0869..a583e4319 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -3590,7 +3590,7 @@ _08079138: cmp r0, 0 bne _08079158 adds r0, r4, 0 - bl sub_806E3F8 + bl IsSpeciesInHoennDex cmp r0, 0 bne _08079164 _08079158: @@ -6160,7 +6160,7 @@ _0807A62E: _0807A64C: lsls r0, r1, 16 lsrs r0, 16 - bl sub_806E3F8 + bl IsSpeciesInHoennDex cmp r0, 0 bne _0807A65C movs r0, 0x2 @@ -6200,7 +6200,7 @@ _0807A65C: _0807A6A0: lsls r0, r1, 16 lsrs r0, 16 - bl sub_806E3F8 + bl IsSpeciesInHoennDex cmp r0, 0 beq _0807A6D2 _0807A6AC: @@ -6471,7 +6471,7 @@ _0807A87C: b _0807A8C0 _0807A88E: adds r0, r7, 0 - bl sub_806E3F8 + bl IsSpeciesInHoennDex cmp r0, 0 bne _0807A89C _0807A898: @@ -6479,7 +6479,7 @@ _0807A898: b _0807A8C0 _0807A89C: mov r0, r8 - bl sub_806E3F8 + bl IsSpeciesInHoennDex cmp r0, 0 bne _0807A8AA movs r0, 0x5 @@ -6489,7 +6489,7 @@ _0807A8AA: cmp r0, 0 bne _0807A8BE adds r0, r7, 0 - bl sub_806E3F8 + bl IsSpeciesInHoennDex cmp r0, 0 bne _0807A8BE movs r0, 0x7 @@ -6533,7 +6533,7 @@ sub_807A8D0: @ 807A8D0 b _0807A910 _0807A900: adds r0, r6, 0 - bl sub_806E3F8 + bl IsSpeciesInHoennDex cmp r0, 0 bne _0807A90E _0807A90A: @@ -6645,7 +6645,7 @@ _0807A9B4: mov r1, sp adds r4, r1, r0 ldrh r0, [r4] - bl sub_806E3F8 + bl IsSpeciesInHoennDex cmp r0, 0 bne _0807A9E0 movs r0, 0x2 diff --git a/include/global.h b/include/global.h index 33a31bf4d..8395d5943 100644 --- a/include/global.h +++ b/include/global.h @@ -230,7 +230,7 @@ struct Time struct Pokedex { /*0x00*/ u8 order; - /*0x01*/ u8 unknown1; + /*0x01*/ u8 mode; /*0x02*/ u8 nationalMagic; // must equal 0xDA in order to have National mode /*0x03*/ u8 unknown2; /*0x04*/ u32 unownPersonality; // set when you first see Unown diff --git a/include/pokedex.h b/include/pokedex.h index 3f90e9508..b6d323fd3 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -4,6 +4,15 @@ extern u8 gUnknown_030060B0; extern void (*gUnknown_030060B4)(void); +#define HOENN_DEX_COUNT 202 +#define NATIONAL_DEX_COUNT 386 + +enum +{ + DEX_MODE_HOENN, + DEX_MODE_NATIONAL +}; + enum { FLAG_GET_SEEN, @@ -31,6 +40,6 @@ u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality); s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); -u16 sub_80C0E9C(u16, s16, s16, u16); +u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); #endif // GUARD_POKEDEX_H diff --git a/include/pokemon.h b/include/pokemon.h index 5d7f7f2ae..9b8f1d03f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -566,7 +566,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves); u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves); u8 GetNumberOfRelearnableMoves(struct Pokemon *mon); u16 SpeciesToPokedexNum(u16 species); -bool32 sub_806E3F8(u16 species); +bool32 IsSpeciesInHoennDex(u16 species); void ClearBattleMonForms(void); u16 GetBattleBGM(void); void PlayBattleBGM(void); diff --git a/src/birch_pc.c b/src/birch_pc.c index 3148832be..5080de410 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -66,19 +66,19 @@ const u8 *GetPokedexRatingText(u16 count) return gBirchDexRatingText_LessThan200; if (count == 200) { - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1) - || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // Jirachi or Deoxys is not counted towards the dex completion. If either of these flags are enabled, it means the actual count is less than 200. + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT) + || GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) // Jirachi or Deoxys is not counted towards the dex completion. If either of these flags are enabled, it means the actual count is less than 200. return gBirchDexRatingText_LessThan200; return gBirchDexRatingText_DexCompleted; } - if (count == 201) + if (count == HOENN_DEX_COUNT - 1) { - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), 1) - && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), 1)) // If both of these flags are enabled, it means the actual count is less than 200. + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT) + && GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT)) // If both of these flags are enabled, it means the actual count is less than 200. return gBirchDexRatingText_LessThan200; return gBirchDexRatingText_DexCompleted; } - if (count == 202) + if (count == HOENN_DEX_COUNT) return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, even though the hoenn dex count is 210. return gBirchDexRatingText_LessThan10; } diff --git a/src/credits.c b/src/credits.c index 02b01c072..c8a097e49 100644 --- a/src/credits.c +++ b/src/credits.c @@ -135,7 +135,7 @@ struct Unk201C000 u16 unk90; u16 unk92; u16 unk94; - u16 unk96[386]; + u16 unk96[NATIONAL_DEX_COUNT]; u16 unk39A; u16 unk39C[7]; }; @@ -2259,7 +2259,7 @@ static u8 sub_8177224(u16 species, s16 x, s16 y, u16 position) u8 spriteId; u8 spriteId2; - spriteId = sub_80C0E9C(species, x, y, position); + spriteId = CreateMonSpriteFromNationalDexNumber(species, x, y, position); gSprites[spriteId].oam.priority = 1; gSprites[spriteId].data[1] = position + 1; gSprites[spriteId].invisible = TRUE; @@ -2297,16 +2297,16 @@ static void sub_8177388(void) u16 dexNum; u16 j; - for (dexNum = 1, j = 0; dexNum < 386; dexNum++) + for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++) { - if (GetSetPokedexFlag(dexNum, 1)) + if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT)) { gUnknown_0203BCE8->unk96[j] = dexNum; j++; } } - for (dexNum = j; dexNum < 386; dexNum++) + for (dexNum = j; dexNum < NATIONAL_DEX_COUNT; dexNum++) gUnknown_0203BCE8->unk96[dexNum] = 0; gUnknown_0203BCE8->unk39A = j; diff --git a/src/event_data.c b/src/event_data.c index 8a998fe26..f6a1cde78 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -1,5 +1,6 @@ #include "global.h" #include "event_data.h" +#include "pokedex.h" #define TEMP_FLAGS_SIZE 0x4 #define TEMP_UPPER_FLAGS_SIZE 0x8 @@ -67,7 +68,7 @@ void EnableNationalPokedex(void) gSaveBlock2Ptr->pokedex.nationalMagic = 0xDA; *nationalDexVar = 0x302; FlagSet(FLAG_SYS_NATIONAL_DEX); - gSaveBlock2Ptr->pokedex.unknown1 = 1; + gSaveBlock2Ptr->pokedex.mode = DEX_MODE_NATIONAL; gSaveBlock2Ptr->pokedex.order = 0; sub_80BB358(); } diff --git a/src/pokedex.c b/src/pokedex.c index e6198fd4f..fe9066e4c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -75,9 +75,6 @@ struct UnknownStruct4 u8 unk9; }; -#define HOENN_DEX_COUNT 202 -#define NATIONAL_DEX_COUNT 386 - extern struct MusicPlayerInfo gMPlayInfo_BGM; struct PokedexListItem @@ -130,12 +127,6 @@ struct PokedexView u8 unk65C[8]; }; -enum -{ - DEX_MODE_HOENN, - DEX_MODE_NATIONAL -}; - enum { AREA_SCREEN, @@ -176,7 +167,7 @@ u16 sub_80BD69C(u16, u16); void sub_80BD8D0(void); bool8 sub_80BD930(void); u8 sub_80BDA40(void); -u16 sub_80BDA8C(u16); +u16 GetPokemonSpriteToDisplay(u16); u32 sub_80BDACC(u16, s16, s16); static void CreateInterfaceSprites(u8); void sub_80BE470(struct Sprite *sprite); @@ -1237,7 +1228,7 @@ void ResetPokedex(void) gUnknown_02039B50 = 0; gUnknown_02039B52 = 64; gUnknown_030060B0 = 0; - gSaveBlock2Ptr->pokedex.unknown1 = 0; + gSaveBlock2Ptr->pokedex.mode = DEX_MODE_HOENN; gSaveBlock2Ptr->pokedex.order = 0; gSaveBlock2Ptr->pokedex.nationalMagic = 0; gSaveBlock2Ptr->pokedex.unknown2 = 0; @@ -1289,7 +1280,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView) pokedexView->unk618 = 0; pokedexView->seenCount = 0; pokedexView->ownCount = 0; - for (i = 0; i <= 3; i++) + for (i = 0; i < 4; i++) pokedexView->unk61E[i] |= 0xFFFF; pokedexView->unk628 = 0; pokedexView->unk62A = 0; @@ -1348,7 +1339,7 @@ void CB2_Pokedex(void) sPokedexView = AllocZeroed(sizeof(struct PokedexView)); ResetPokedexView(sPokedexView); CreateTask(sub_80BB78C, 0); - sPokedexView->dexMode = gSaveBlock2Ptr->pokedex.unknown1; + sPokedexView->dexMode = gSaveBlock2Ptr->pokedex.mode; if (!IsNationalPokedexEnabled()) sPokedexView->dexMode = DEX_MODE_HOENN; sPokedexView->dexOrder = gSaveBlock2Ptr->pokedex.order; @@ -1571,9 +1562,9 @@ void sub_80BBDE8(u8 taskId) { if (!gPaletteFade.active) { - gSaveBlock2Ptr->pokedex.unknown1 = sPokedexView->dexMode; + gSaveBlock2Ptr->pokedex.mode = sPokedexView->dexMode; if (!IsNationalPokedexEnabled()) - gSaveBlock2Ptr->pokedex.unknown1 = DEX_MODE_HOENN; + gSaveBlock2Ptr->pokedex.mode = DEX_MODE_HOENN; gSaveBlock2Ptr->pokedex.order = sPokedexView->dexOrder; sub_80BDA40(); sub_80BC890(); @@ -1898,6 +1889,9 @@ void sub_80BC890(void) void sub_80BC8D4(u8 dexMode, u8 sortMode) { u16 vars[3]; //I have no idea why three regular variables are stored in an array, but whatever. +#define temp_dexCount vars[0] +#define temp_notNationalDex vars[1] +#define temp_dexNum vars[2] s16 i; sPokedexView->pokemonListCount = 0; @@ -1906,19 +1900,19 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) { default: case DEX_MODE_HOENN: - vars[0] = HOENN_DEX_COUNT; - vars[1] = 1; + temp_dexCount = HOENN_DEX_COUNT; + temp_notNationalDex = TRUE; break; case DEX_MODE_NATIONAL: if (IsNationalPokedexEnabled()) { - vars[0] = NATIONAL_DEX_COUNT; - vars[1] = 0; + temp_dexCount = NATIONAL_DEX_COUNT; + temp_notNationalDex = FALSE; } else { - vars[0] = HOENN_DEX_COUNT; - vars[1] = 1; + temp_dexCount = HOENN_DEX_COUNT; + temp_notNationalDex = TRUE; } break; } @@ -1926,14 +1920,14 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) switch (sortMode) { case 0: - if (vars[1]) + if (temp_notNationalDex) { - for (i = 0; i < vars[0]; i++) + for (i = 0; i < temp_dexCount; i++) { - vars[2] = HoennToNationalOrder(i + 1); - sPokedexView->pokedexList[i].dexNum = vars[2]; - sPokedexView->pokedexList[i].seen = GetSetPokedexFlag(vars[2], 0); - sPokedexView->pokedexList[i].owned = GetSetPokedexFlag(vars[2], 1); + temp_dexNum = HoennToNationalOrder(i + 1); + sPokedexView->pokedexList[i].dexNum = temp_dexNum; + sPokedexView->pokedexList[i].seen = GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN); + sPokedexView->pokedexList[i].owned = GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT); if (sPokedexView->pokedexList[i].seen) sPokedexView->pokemonListCount = i + 1; } @@ -1944,17 +1938,17 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) s16 r5; r10 = r5 = i = 0; - for (i = 0; i < vars[0]; i++) + for (i = 0; i < temp_dexCount; i++) { - vars[2] = i + 1; - if (GetSetPokedexFlag(vars[2], 0)) + temp_dexNum = i + 1; + if (GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN)) r10 = 1; if (r10) { asm(""); //Needed to match for some reason - sPokedexView->pokedexList[r5].dexNum = vars[2]; - sPokedexView->pokedexList[r5].seen = GetSetPokedexFlag(vars[2], 0); - sPokedexView->pokedexList[r5].owned = GetSetPokedexFlag(vars[2], 1); + sPokedexView->pokedexList[r5].dexNum = temp_dexNum; + sPokedexView->pokedexList[r5].seen = GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN); + sPokedexView->pokedexList[r5].owned = GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT); if (sPokedexView->pokedexList[r5].seen) sPokedexView->pokemonListCount = r5 + 1; r5++; @@ -1965,13 +1959,13 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) case 1: for (i = 0; i < POKEMON_SLOTS_NUMBER - 1; i++) { - vars[2] = gPokedexOrder_Alphabetical[i]; + temp_dexNum = gPokedexOrder_Alphabetical[i]; - if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 0)) + if (NationalToHoennOrder(temp_dexNum) <= temp_dexCount && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN)) { - sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = GetSetPokedexFlag(vars[2], 1); + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT); sPokedexView->pokemonListCount++; } } @@ -1979,13 +1973,13 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) case 2: for (i = NATIONAL_DEX_COUNT - 1; i >= 0; i--) { - vars[2] = gPokedexOrder_Weight[i]; + temp_dexNum = gPokedexOrder_Weight[i]; - if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1)) + if (NationalToHoennOrder(temp_dexNum) <= temp_dexCount && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) { - sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE; sPokedexView->pokemonListCount++; } } @@ -1993,27 +1987,27 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) case 3: for (i = 0; i < NATIONAL_DEX_COUNT; i++) { - vars[2] = gPokedexOrder_Weight[i]; + temp_dexNum = gPokedexOrder_Weight[i]; - if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1)) + if (NationalToHoennOrder(temp_dexNum) <= temp_dexCount && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) { - sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE; sPokedexView->pokemonListCount++; } } break; case 4: - for (i = NATIONAL_DEX_COUNT - 1; i >=0; i--) + for (i = NATIONAL_DEX_COUNT - 1; i >= 0; i--) { - vars[2] = gPokedexOrder_Height[i]; + temp_dexNum = gPokedexOrder_Height[i]; - if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1)) + if (NationalToHoennOrder(temp_dexNum) <= temp_dexCount && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) { - sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE; sPokedexView->pokemonListCount++; } } @@ -2021,13 +2015,13 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) case 5: for (i = 0; i < NATIONAL_DEX_COUNT; i++) { - vars[2] = gPokedexOrder_Height[i]; + temp_dexNum = gPokedexOrder_Height[i]; - if (NationalToHoennOrder(vars[2]) <= vars[0] && GetSetPokedexFlag(vars[2], 1)) + if (NationalToHoennOrder(temp_dexNum) <= temp_dexCount && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) { - sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = vars[2]; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = 1; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = 1; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE; sPokedexView->pokemonListCount++; } } @@ -2037,8 +2031,8 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) for (i = sPokedexView->pokemonListCount; i < NATIONAL_DEX_COUNT; i++) { sPokedexView->pokedexList[i].dexNum |= 0xFFFF; - sPokedexView->pokedexList[i].seen = 0; - sPokedexView->pokedexList[i].owned = 0; + sPokedexView->pokedexList[i].seen = FALSE; + sPokedexView->pokedexList[i].owned = FALSE; } } @@ -2192,7 +2186,7 @@ static void CreateInitialPokemonSprites(u16 selectedMon, u16 b) sPokedexView->unk61E[i] = 0xFFFF; sPokedexView->selectedMonSpriteId = 0xFFFF; - unk = sub_80BDA8C(selectedMon - 1); + unk = GetPokemonSpriteToDisplay(selectedMon - 1); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); @@ -2200,7 +2194,7 @@ static void CreateInitialPokemonSprites(u16 selectedMon, u16 b) gSprites[spriteId].data[5] = -32; } - unk = sub_80BDA8C(selectedMon); + unk = GetPokemonSpriteToDisplay(selectedMon); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); @@ -2208,7 +2202,7 @@ static void CreateInitialPokemonSprites(u16 selectedMon, u16 b) gSprites[spriteId].data[5] = 0; } - unk = sub_80BDA8C(selectedMon + 1); + unk = GetPokemonSpriteToDisplay(selectedMon + 1); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); @@ -2274,7 +2268,7 @@ static void CreateNewPokemonSprite(u8 direction, u16 selectedMon) switch (direction) { case 1: // up - unk = sub_80BDA8C(selectedMon - 1); + unk = GetPokemonSpriteToDisplay(selectedMon - 1); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); @@ -2287,7 +2281,7 @@ static void CreateNewPokemonSprite(u8 direction, u16 selectedMon) sPokedexView->unk630 = 15; break; case 2: // down - unk = sub_80BDA8C(selectedMon + 1); + unk = GetPokemonSpriteToDisplay(selectedMon + 1); if (unk != 0xFFFF) { spriteId = sub_80BDACC(unk, 0x60, 0x50); @@ -2449,12 +2443,12 @@ u8 sub_80BDA40(void) return FALSE; } -u16 sub_80BDA8C(u16 a1) +u16 GetPokemonSpriteToDisplay(u16 species) { - if (a1 >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[a1].dexNum == 0xFFFF) + if (species >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[species].dexNum == 0xFFFF) return 0xFFFF; - else if (sPokedexView->pokedexList[a1].seen) - return sPokedexView->pokedexList[a1].dexNum; + else if (sPokedexView->pokedexList[species].seen) + return sPokedexView->pokedexList[species].dexNum; else return 0; } @@ -2467,7 +2461,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y) { if (sPokedexView->unk61E[i] == 0xFFFF) { - u8 spriteId = sub_80C0E9C(num, x, y, i); + u8 spriteId = CreateMonSpriteFromNationalDexNumber(num, x, y, i); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.priority = 3; @@ -2963,7 +2957,7 @@ void sub_80BEA24(u8 taskId) case 5: if (gTasks[taskId].data[1] == 0) { - gTasks[taskId].data[4] = (u16)sub_80C0E9C(sPokedexListItem->dexNum, 0x30, 0x38, 0); + gTasks[taskId].data[4] = (u16)CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 0x30, 0x38, 0); gSprites[gTasks[taskId].data[4]].oam.priority = 0; } gMain.state++; @@ -3251,7 +3245,7 @@ void sub_80BF250(u8 taskId) gMain.state++; break; case 5: - gTasks[taskId].data[4] = sub_80C0E9C(sPokedexListItem->dexNum, 48, 56, 0); + gTasks[taskId].data[4] = CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 48, 56, 0); gSprites[gTasks[taskId].data[4]].oam.priority = 0; gDexCryScreenState = 0; gMain.state++; @@ -3459,7 +3453,7 @@ void sub_80BF82C(u8 taskId) gMain.state++; break; case 6: - spriteId = sub_80C0E9C(sPokedexListItem->dexNum, 88, 56, 1); + spriteId = CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 88, 56, 1); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 2; gSprites[spriteId].oam.priority = 0; @@ -3790,7 +3784,7 @@ void sub_80BFE38(u8 taskId) gTasks[taskId].data[0]++; break; case 4: - spriteId = sub_80C0E9C(dexNum, 0x30, 0x38, 0); + spriteId = CreateMonSpriteFromNationalDexNumber(dexNum, 0x30, 0x38, 0); gSprites[spriteId].oam.priority = 0; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); SetVBlankCallback(gUnknown_030060B4); @@ -4348,7 +4342,7 @@ u16 GetHoennPokedexCount(u8 caseID) u16 count = 0; u16 i; - for (i = 0; i < 202; i++) + for (i = 0; i < HOENN_DEX_COUNT; i++) { switch (caseID) { @@ -4417,17 +4411,17 @@ u16 sub_80C0944(void) for (i = 0; i < 150; i++) { - if (GetSetPokedexFlag(i + 1, 1) == 0) + if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT) == FALSE) return 0; } for (i = 151; i < 248; i++) { - if (GetSetPokedexFlag(i + 1, 1) == 0) + if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT) == FALSE) return 0; } for (i = 251; i < 384; i++) { - if (GetSetPokedexFlag(i + 1, 1) == 0) + if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT) == FALSE) return 0; } return 1; @@ -4643,10 +4637,10 @@ u32 sub_80C0E68(u16 a) } } -u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot) +u16 CreateMonSpriteFromNationalDexNumber(u16 nationalNum, s16 x, s16 y, u16 paletteSlot) { - num = NationalPokedexNumToSpecies(num); - return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF); + nationalNum = NationalPokedexNumToSpecies(nationalNum); + return CreateMonPicSprite_HandleDeoxys(nationalNum, 8, sub_80C0E68(nationalNum), TRUE, x, y, paletteSlot, 0xFFFF); } u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot) @@ -4980,10 +4974,10 @@ void sub_80C170C(u8 taskId) sPokedexView->unk62A = 0x40; gUnknown_02039B50 = 0; sPokedexView->unk610 = 0; - gSaveBlock2Ptr->pokedex.unknown1 = sub_80C2318(taskId, 5); + gSaveBlock2Ptr->pokedex.mode = sub_80C2318(taskId, 5); if (!IsNationalPokedexEnabled()) - gSaveBlock2Ptr->pokedex.unknown1 = 0; - sPokedexView->unk614 = gSaveBlock2Ptr->pokedex.unknown1; + gSaveBlock2Ptr->pokedex.mode = DEX_MODE_HOENN; + sPokedexView->unk614 = gSaveBlock2Ptr->pokedex.mode; gSaveBlock2Ptr->pokedex.order = sub_80C2318(taskId, 4); sPokedexView->unk618 = gSaveBlock2Ptr->pokedex.order; PlaySE(SE_PC_OFF); diff --git a/src/pokemon.c b/src/pokemon.c index eec995050..8e32479a1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5864,10 +5864,10 @@ u16 HoennPokedexNumToSpecies(u16 hoennNum) species = 0; - while (species < 411 && gSpeciesToHoennPokedexNum[species] != hoennNum) + while (species < (NUM_SPECIES - 1) && gSpeciesToHoennPokedexNum[species] != hoennNum) species++; - if (species == 411) + if (species == NUM_SPECIES - 1) return 0; return species + 1; @@ -5882,10 +5882,10 @@ u16 NationalPokedexNumToSpecies(u16 nationalNum) species = 0; - while (species < 411 && gSpeciesToNationalPokedexNum[species] != nationalNum) + while (species < (NUM_SPECIES - 1) && gSpeciesToNationalPokedexNum[species] != nationalNum) species++; - if (species == 411) + if (species == NUM_SPECIES - 1) return 0; return species + 1; @@ -5900,10 +5900,10 @@ u16 NationalToHoennOrder(u16 nationalNum) hoennNum = 0; - while (hoennNum < 411 && gHoennToNationalOrder[hoennNum] != nationalNum) + while (hoennNum < (NUM_SPECIES - 1) && gHoennToNationalOrder[hoennNum] != nationalNum) hoennNum++; - if (hoennNum == 411) + if (hoennNum == NUM_SPECIES - 1) return 0; return hoennNum + 1; @@ -6584,15 +6584,15 @@ u16 SpeciesToPokedexNum(u16 species) else { species = SpeciesToHoennPokedexNum(species); - if (species <= 202) + if (species <= HOENN_DEX_COUNT) return species; return 0xFFFF; } } -bool32 sub_806E3F8(u16 species) +bool32 IsSpeciesInHoennDex(u16 species) { - if (SpeciesToHoennPokedexNum(species) > 202) + if (SpeciesToHoennPokedexNum(species) > HOENN_DEX_COUNT) return FALSE; else return TRUE; diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 7fc61f953..9b7269f00 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -563,8 +563,8 @@ u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 u { case 0: case 1: - GetSetPokedexFlag(nationalDexNum, 2); - GetSetPokedexFlag(nationalDexNum, 3); + GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN); + GetSetPokedexFlag(nationalDexNum, FLAG_SET_CAUGHT); break; } return sentToPc; diff --git a/src/tv.c b/src/tv.c index f77e93cb7..1072ba049 100644 --- a/src/tv.c +++ b/src/tv.c @@ -3229,7 +3229,7 @@ u16 TV_GetSomeOtherSpeciesAlreadySeenByPlayer(u16 passedSpecies) species = (Random() % (NUM_SPECIES - 1)) + 1; initSpecies = species; - while (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), 0) != 1 || species == passedSpecies) + while (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN) != TRUE || species == passedSpecies) { if (species == 1) { @@ -4376,7 +4376,7 @@ void SetTvShowInactive(u8 showIdx) static void sub_80F0B24(u16 species, u8 showIdx) { - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), 0) == 0) + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN) == FALSE) { gSaveBlock1Ptr->tvShows[showIdx].common.active = FALSE; } -- cgit v1.2.3 From 8f168add219e5bd86c6115c79c41e8ac973c61ac Mon Sep 17 00:00:00 2001 From: Meowsy Date: Sat, 15 Dec 2018 15:25:45 -0500 Subject: Remove incorrect comment. --- src/birch_pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/birch_pc.c b/src/birch_pc.c index 5080de410..5179b1920 100644 --- a/src/birch_pc.c +++ b/src/birch_pc.c @@ -79,7 +79,7 @@ const u8 *GetPokedexRatingText(u16 count) return gBirchDexRatingText_DexCompleted; } if (count == HOENN_DEX_COUNT) - return gBirchDexRatingText_DexCompleted; // Hoenn dex is considered complete, even though the hoenn dex count is 210. + return gBirchDexRatingText_DexCompleted; return gBirchDexRatingText_LessThan10; } -- cgit v1.2.3 From 83c3f136551bc79bfffb4630469cc79c9f06951c Mon Sep 17 00:00:00 2001 From: Meowsy Date: Sat, 15 Dec 2018 15:26:07 -0500 Subject: Prettify line. --- src/tv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tv.c b/src/tv.c index 1072ba049..0d6e12279 100644 --- a/src/tv.c +++ b/src/tv.c @@ -4376,7 +4376,7 @@ void SetTvShowInactive(u8 showIdx) static void sub_80F0B24(u16 species, u8 showIdx) { - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN) == FALSE) + if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN)) { gSaveBlock1Ptr->tvShows[showIdx].common.active = FALSE; } -- cgit v1.2.3 From 3d8cecb66238a5597e3675f81ec072e650afdf5c Mon Sep 17 00:00:00 2001 From: Meowsy Date: Sat, 15 Dec 2018 18:32:50 -0500 Subject: Use correct term. --- src/credits.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/credits.c b/src/credits.c index c8a097e49..67ab97481 100644 --- a/src/credits.c +++ b/src/credits.c @@ -2254,12 +2254,12 @@ static void sub_8177050(struct Sprite *sprite) } } -static u8 sub_8177224(u16 species, s16 x, s16 y, u16 position) +static u8 sub_8177224(u16 nationalDexNum, s16 x, s16 y, u16 position) { u8 spriteId; u8 spriteId2; - spriteId = CreateMonSpriteFromNationalDexNumber(species, x, y, position); + spriteId = CreateMonSpriteFromNationalDexNumber(nationalDexNum, x, y, position); gSprites[spriteId].oam.priority = 1; gSprites[spriteId].data[1] = position + 1; gSprites[spriteId].invisible = TRUE; -- cgit v1.2.3 From 6ed8e4d6eda271653daa7e2ab13ccf0ae752c9cd Mon Sep 17 00:00:00 2001 From: Meowsy Date: Sat, 15 Dec 2018 18:34:06 -0500 Subject: Rename temp_notNationalDex to temp_isHoennDex. Don't use hexadecimal format for x and y args. --- src/pokedex.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index fe9066e4c..f6d46f5d3 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1889,9 +1889,9 @@ void sub_80BC890(void) void sub_80BC8D4(u8 dexMode, u8 sortMode) { u16 vars[3]; //I have no idea why three regular variables are stored in an array, but whatever. -#define temp_dexCount vars[0] -#define temp_notNationalDex vars[1] -#define temp_dexNum vars[2] +#define temp_dexCount vars[0] +#define temp_isHoennDex vars[1] +#define temp_dexNum vars[2] s16 i; sPokedexView->pokemonListCount = 0; @@ -1901,18 +1901,18 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) default: case DEX_MODE_HOENN: temp_dexCount = HOENN_DEX_COUNT; - temp_notNationalDex = TRUE; + temp_isHoennDex = TRUE; break; case DEX_MODE_NATIONAL: if (IsNationalPokedexEnabled()) { temp_dexCount = NATIONAL_DEX_COUNT; - temp_notNationalDex = FALSE; + temp_isHoennDex = FALSE; } else { temp_dexCount = HOENN_DEX_COUNT; - temp_notNationalDex = TRUE; + temp_isHoennDex = TRUE; } break; } @@ -1920,7 +1920,7 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode) switch (sortMode) { case 0: - if (temp_notNationalDex) + if (temp_isHoennDex) { for (i = 0; i < temp_dexCount; i++) { @@ -2957,7 +2957,7 @@ void sub_80BEA24(u8 taskId) case 5: if (gTasks[taskId].data[1] == 0) { - gTasks[taskId].data[4] = (u16)CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 0x30, 0x38, 0); + gTasks[taskId].data[4] = (u16)CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 48, 56, 0); gSprites[gTasks[taskId].data[4]].oam.priority = 0; } gMain.state++; @@ -3784,7 +3784,7 @@ void sub_80BFE38(u8 taskId) gTasks[taskId].data[0]++; break; case 4: - spriteId = CreateMonSpriteFromNationalDexNumber(dexNum, 0x30, 0x38, 0); + spriteId = CreateMonSpriteFromNationalDexNumber(dexNum, 48, 56, 0); gSprites[spriteId].oam.priority = 0; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); SetVBlankCallback(gUnknown_030060B4); -- cgit v1.2.3 From 1d09216e4b776ed03daa83c66fd6600bc43f8d25 Mon Sep 17 00:00:00 2001 From: Meowsy Date: Sat, 15 Dec 2018 18:39:48 -0500 Subject: Simplify comparisons. --- src/pokedex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index f6d46f5d3..ef8905bb6 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -4411,17 +4411,17 @@ u16 sub_80C0944(void) for (i = 0; i < 150; i++) { - if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT) == FALSE) + if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT)) return 0; } for (i = 151; i < 248; i++) { - if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT) == FALSE) + if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT)) return 0; } for (i = 251; i < 384; i++) { - if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT) == FALSE) + if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT)) return 0; } return 1; -- cgit v1.2.3 From 9c5fa4a787daa8200e32c69c207fedaa0bc58c76 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 16 Dec 2018 08:28:09 -0600 Subject: Fix typo in UpdateContestPaintingMosaicEffect() --- src/contest_painting.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/contest_painting.c b/src/contest_painting.c index b1b189c09..9de3d733d 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -344,7 +344,7 @@ static void InitContestPaintingVars(bool8 arg0) } } -static void UpdateContestPaitingMosaicEffect(void) +static void UpdateContestPaintingMosaicEffect(void) { if (!gUnknown_030011F6) { @@ -360,7 +360,7 @@ static void UpdateContestPaitingMosaicEffect(void) static void VBlankCB_ContestPainting(void) { - UpdateContestPaitingMosaicEffect(); + UpdateContestPaintingMosaicEffect(); LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); -- cgit v1.2.3 From d1e6e705ccf05f93933ae4494b1d388550d81d26 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 16 Dec 2018 11:35:10 -0600 Subject: Decompile battle_anim_effects_1.c --- asm/battle_anim_effects_1.s | 9550 ------------------------------------------- include/battle_anim.h | 6 + include/battle_interface.h | 2 + ld_script.txt | 4 +- src/battle_anim_80A5C6C.c | 9 +- src/battle_anim_80D51AC.c | 8 +- src/battle_anim_effects_1.c | 5520 +++++++++++++++++++++++++ src/effects_1.c | 2093 ---------- src/fire.c | 2 +- sym_ewram.txt | 3 +- 10 files changed, 5540 insertions(+), 11657 deletions(-) delete mode 100644 asm/battle_anim_effects_1.s create mode 100644 src/battle_anim_effects_1.c delete mode 100644 src/effects_1.c diff --git a/asm/battle_anim_effects_1.s b/asm/battle_anim_effects_1.s deleted file mode 100644 index 910b09b8c..000000000 --- a/asm/battle_anim_effects_1.s +++ /dev/null @@ -1,9550 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80FE840 -sub_80FE840: @ 80FE840 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimArgs - ldrh r0, [r5] - ldrh r1, [r4, 0x20] - adds r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r5, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x30] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _080FE87C - ldrh r0, [r5, 0x8] - negs r0, r0 - b _080FE87E - .pool -_080FE87C: - ldrh r0, [r5, 0x8] -_080FE87E: - strh r0, [r4, 0x34] - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0xA] - strh r0, [r4, 0x36] - ldr r0, =sub_80FE898 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FE840 - - thumb_func_start sub_80FE898 -sub_80FE898: @ 80FE898 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _080FE8D4 - subs r0, r1, 0x1 - strh r0, [r4, 0x2E] - ldrh r1, [r4, 0x32] - lsls r0, r1, 16 - asrs r0, 24 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x30] - adds r1, r0 - strh r1, [r4, 0x32] - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r2, 0x34 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x36] - ldrh r1, [r4, 0x38] - adds r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - b _080FE8DA -_080FE8D4: - adds r0, r4, 0 - bl DestroyAnimSprite -_080FE8DA: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FE898 - - thumb_func_start sub_80FE8E0 -sub_80FE8E0: @ 80FE8E0 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x4] - strh r0, [r4, 0x2E] - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x32] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x36] - ldr r0, =StartAnimLinearTranslation - str r0, [r4, 0x1C] - ldr r1, =move_anim_8074EE0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FE8E0 - - thumb_func_start sub_80FE930 -sub_80FE930: @ 80FE930 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r5, =gBattleAnimArgs - ldrb r1, [r5, 0x6] - adds r0, r4, 0 - bl StartSpriteAnim - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2E] - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x32] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x36] - ldr r0, =StartAnimLinearTranslation - str r0, [r4, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FE930 - - thumb_func_start sub_80FE988 -sub_80FE988: @ 80FE988 - push {r4-r6,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r6, =gBattleAnimArgs - ldrh r0, [r6, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x30] - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl InitAnimLinearTranslation - ldrh r0, [r6, 0x6] - strh r0, [r4, 0x38] - ldr r1, =sub_80FE9E4 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FE988 - - thumb_func_start sub_80FE9E4 -sub_80FE9E4: @ 80FE9E4 - push {r4,lr} - adds r4, r0, 0 - bl TranslateAnimLinear - lsls r0, 24 - cmp r0, 0 - beq _080FE9FA - adds r0, r4, 0 - bl DestroySprite - b _080FEA4E -_080FE9FA: - movs r1, 0x38 - ldrsh r0, [r4, r1] - cmp r0, 0x7F - ble _080FEA14 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A82E4 - adds r0, 0x1 - b _080FEA1E - .pool -_080FEA14: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A82E4 - adds r0, 0x6 -_080FEA1E: - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0x5 - bl Sin - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0xE - bl Cos - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x38] - adds r0, 0xF - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] -_080FEA4E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FE9E4 - - thumb_func_start sub_80FEA58 -sub_80FEA58: @ 80FEA58 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r6, r0, 0 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r5, r0, r1 - ldrh r0, [r5, 0x8] - subs r0, 0x1 - movs r2, 0 - strh r0, [r5, 0x8] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080FEAB2 - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - movs r0, 0x6 - strh r0, [r5, 0x8] - ldr r1, =gBattleAnimArgs - movs r0, 0xF - strh r0, [r1] - strh r2, [r1, 0x2] - movs r0, 0x50 - strh r0, [r1, 0x4] - strh r2, [r1, 0x6] - ldr r4, =gUnknown_08592210 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A82E4 - adds r3, r0, 0 - adds r3, 0x1 - lsls r3, 24 - lsrs r3, 24 - adds r0, r4, 0 - movs r1, 0 - movs r2, 0 - bl CreateSpriteAndAnimate -_080FEAB2: - movs r1, 0xA - ldrsh r0, [r5, r1] - cmp r0, 0xF - bne _080FEAC0 - adds r0, r6, 0 - bl DestroyAnimVisualTask -_080FEAC0: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FEA58 - - thumb_func_start sub_80FEAD8 -sub_80FEAD8: @ 80FEAD8 - push {r4-r6,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_80A6980 - ldr r6, =gBattleAnimArgs - ldrh r0, [r6, 0x6] - strh r0, [r4, 0x2E] - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x32] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x36] - ldrh r0, [r6, 0x4] - strh r0, [r4, 0x38] - adds r0, r4, 0 - bl InitAnimArcTranslation - ldr r0, =sub_80FEB28 - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FEAD8 - - thumb_func_start sub_80FEB28 -sub_80FEB28: @ 80FEB28 - push {r4,lr} - adds r4, r0, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - beq _080FEB3C - adds r0, r4, 0 - bl DestroyAnimSprite -_080FEB3C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FEB28 - - thumb_func_start sub_80FEB44 -sub_80FEB44: @ 80FEB44 - push {r4,r5,lr} - adds r5, r0, 0 - bl Random2 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x7 - ands r1, r0 - adds r0, r5, 0 - bl StartSpriteAnim - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _080FEB90 - ldrh r0, [r5, 0x20] - subs r0, 0x14 - b _080FEB94 - .pool -_080FEB90: - ldrh r0, [r5, 0x20] - adds r0, 0x14 -_080FEB94: - strh r0, [r5, 0x20] - bl Random2 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1F - ands r0, r1 - adds r0, 0x40 - strh r0, [r5, 0x2E] - ldrh r0, [r5, 0x20] - strh r0, [r5, 0x30] - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x22] - strh r0, [r5, 0x34] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - adds r0, r5, 0 - bl sub_80A7160 - bl Random2 - movs r1, 0xFF - ands r1, r0 - strh r1, [r5, 0x38] - adds r0, r5, 0 - adds r0, 0x43 - ldrb r0, [r0] - strh r0, [r5, 0x3A] - ldr r1, =sub_80FEBFC - str r1, [r5, 0x1C] - adds r0, r5, 0 - bl _call_via_r1 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FEB44 - - thumb_func_start sub_80FEBFC -sub_80FEBFC: @ 80FEBFC - push {r4,lr} - adds r4, r0, 0 - bl sub_80A70E8 - lsls r0, 24 - cmp r0, 0 - beq _080FEC12 - adds r0, r4, 0 - bl DestroyAnimSprite - b _080FEC42 -_080FEC12: - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0xC - bl Cos - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - movs r1, 0x38 - ldrsh r0, [r4, r1] - cmp r0, 0x7E - bgt _080FEC2E - ldrh r0, [r4, 0x3A] - b _080FEC32 -_080FEC2E: - ldrh r0, [r4, 0x3A] - adds r0, 0x1 -_080FEC32: - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - ldrh r0, [r4, 0x38] - adds r0, 0x18 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] -_080FEC42: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FEBFC - - thumb_func_start sub_80FEC48 -sub_80FEC48: @ 80FEC48 - push {r4-r6,lr} - adds r6, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _080FEC68 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] -_080FEC68: - ldr r4, =gBattleAnimArgs - ldrh r0, [r4, 0x8] - strh r0, [r6, 0x2E] - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x4] - adds r0, r1 - strh r0, [r6, 0x32] - ldrb r0, [r5] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x6] - adds r0, r1 - strh r0, [r6, 0x36] - ldrh r0, [r4, 0xA] - strh r0, [r6, 0x38] - adds r0, r6, 0 - bl InitAnimArcTranslation - ldr r0, =sub_80FECB8 - str r0, [r6, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FEC48 - - thumb_func_start sub_80FECB8 -sub_80FECB8: @ 80FECB8 - push {r4,lr} - adds r4, r0, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - beq _080FECE2 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - movs r0, 0xA - strh r0, [r4, 0x2E] - ldr r0, =WaitAnimForDuration - str r0, [r4, 0x1C] - ldr r1, =sub_80FECF0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 -_080FECE2: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FECB8 - - thumb_func_start sub_80FECF0 -sub_80FECF0: @ 80FECF0 - push {r4,lr} - adds r4, r0, 0 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAnim - movs r0, 0x3C - strh r0, [r4, 0x2E] - ldr r0, =WaitAnimForDuration - str r0, [r4, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FECF0 - - thumb_func_start sub_80FED28 -sub_80FED28: @ 80FED28 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl sub_80A6980 - ldr r5, =gBattleAnimArgs - ldrb r1, [r5, 0x8] - adds r0, r4, 0 - bl StartSpriteAnim - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - bne _080FED52 - ldrb r0, [r4, 0x1] - movs r1, 0xD - negs r1, r1 - ands r1, r0 - movs r0, 0x4 - orrs r1, r0 - strb r1, [r4, 0x1] -_080FED52: - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x2E] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x30] - ldr r1, =sub_80FED74 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FED28 - - thumb_func_start sub_80FED74 -sub_80FED74: @ 80FED74 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x20 - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x3 - negs r1, r1 - bl Cos - ldrh r1, [r4, 0x32] - adds r1, 0x18 - strh r1, [r4, 0x32] - lsls r1, 16 - asrs r1, 24 - adds r0, r1 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x30] - subs r0, 0x40 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7F - bhi _080FEDC8 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8328 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - b _080FEDEC - .pool -_080FEDC8: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8328 - adds r0, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _080FEDDC - movs r2, 0x3 -_080FEDDC: - movs r0, 0x3 - ands r2, r0 - lsls r2, 2 - ldrb r1, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - orrs r0, r2 -_080FEDEC: - strb r0, [r4, 0x5] - ldrh r0, [r4, 0x30] - adds r0, 0x2 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x2E] - subs r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080FEE10 - adds r0, r4, 0 - bl DestroyAnimSprite -_080FEE10: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FED74 - - thumb_func_start sub_80FEE1C -sub_80FEE1C: @ 80FEE1C - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080FEE36 - bl IsDoubleBattle - lsls r0, 24 - cmp r0, 0 - bne _080FEE3E -_080FEE36: - adds r0, r4, 0 - bl DestroyAnimVisualTask - b _080FEE70 -_080FEE3E: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8364 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080FEE60 - movs r0, 0x2 - movs r1, 0x4 - movs r2, 0x3 - bl SetAnimBgAttribute - b _080FEE6A - .pool -_080FEE60: - movs r0, 0x1 - movs r1, 0x4 - movs r2, 0x1 - bl SetAnimBgAttribute -_080FEE6A: - adds r0, r4, 0 - bl DestroyAnimVisualTask -_080FEE70: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FEE1C - - thumb_func_start sub_80FEE78 -sub_80FEE78: @ 80FEE78 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0 - bl InitAnimSpritePos - ldr r5, =gBattleAnimArgs - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x30] - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r5, [r5, 0x4] - adds r0, r5 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl InitAnimLinearTranslation - movs r0, 0x40 - strh r0, [r4, 0x38] - ldr r1, =sub_80FEECC - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FEE78 - - thumb_func_start sub_80FEECC -sub_80FEECC: @ 80FEECC - push {r4,lr} - adds r4, r0, 0 - bl TranslateAnimLinear - lsls r0, 24 - cmp r0, 0 - bne _080FEF38 - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0x20 - bl Sin - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0x5 - negs r1, r1 - bl Cos - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x38] - subs r0, 0x40 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7F - bhi _080FEF18 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl sub_80A82E4 - subs r0, 0x1 - b _080FEF22 - .pool -_080FEF18: - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl sub_80A82E4 - adds r0, 0x1 -_080FEF22: - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - ldrh r0, [r4, 0x38] - adds r0, 0x5 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - b _080FEF3E - .pool -_080FEF38: - adds r0, r4, 0 - bl DestroyAnimSprite -_080FEF3E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FEECC - - thumb_func_start sub_80FEF44 -sub_80FEF44: @ 80FEF44 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r5, =gBattleAnimArgs - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x30] - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r5, [r5, 0x4] - adds r0, r5 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl InitAnimLinearTranslation - movs r0, 0x40 - strh r0, [r4, 0x38] - ldr r1, =sub_80FEF98 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FEF44 - - thumb_func_start sub_80FEF98 -sub_80FEF98: @ 80FEF98 - push {r4,lr} - adds r4, r0, 0 - bl TranslateAnimLinear - lsls r0, 24 - cmp r0, 0 - bne _080FEFF0 - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0x8 - bl Sin - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - ldrh r1, [r4, 0x38] - adds r0, r1, 0 - subs r0, 0x3B - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x4 - bls _080FEFD0 - adds r0, r1, 0 - subs r0, 0xBB - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x4 - bhi _080FEFE4 -_080FEFD0: - ldrb r2, [r4, 0x3] - lsls r1, r2, 26 - lsrs r1, 27 - movs r0, 0x8 - eors r1, r0 - lsls r1, 1 - subs r0, 0x47 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x3] -_080FEFE4: - ldrh r0, [r4, 0x38] - adds r0, 0x5 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - b _080FEFF6 -_080FEFF0: - adds r0, r4, 0 - bl DestroyAnimSprite -_080FEFF6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FEF98 - - thumb_func_start sub_80FEFFC -sub_80FEFFC: @ 80FEFFC - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x20] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x2] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x32] - ldr r0, =sub_80FF044 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FEFFC - - thumb_func_start sub_80FF044 -sub_80FF044: @ 80FF044 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x32] - movs r2, 0x32 - ldrsh r3, [r1, r2] - cmp r3, 0 - bne _080FF078 - ldrh r0, [r1, 0x30] - movs r2, 0x1 - ands r2, r0 - cmp r2, 0 - beq _080FF066 - movs r0, 0x80 - strh r0, [r1, 0x2E] - strh r3, [r1, 0x30] - strh r3, [r1, 0x32] - b _080FF06C -_080FF066: - strh r2, [r1, 0x2E] - strh r2, [r1, 0x30] - strh r2, [r1, 0x32] -_080FF06C: - ldr r0, =sub_80FF090 - str r0, [r1, 0x1C] - b _080FF08C - .pool -_080FF078: - subs r0, 0x1 - strh r0, [r1, 0x32] - ldrh r0, [r1, 0x2E] - ldrh r2, [r1, 0x20] - adds r0, r2 - strh r0, [r1, 0x20] - ldrh r0, [r1, 0x30] - ldrh r2, [r1, 0x22] - adds r0, r2 - strh r0, [r1, 0x22] -_080FF08C: - pop {r0} - bx r0 - thumb_func_end sub_80FF044 - - thumb_func_start sub_80FF090 -sub_80FF090: @ 80FF090 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _080FF0B4 - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x19 - bl Sin - negs r0, r0 - b _080FF0BE - .pool -_080FF0B4: - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x19 - bl Sin -_080FF0BE: - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x2E] - adds r0, 0x2 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080FF0DE - ldrh r0, [r4, 0x26] - adds r0, 0x1 - strh r0, [r4, 0x26] -_080FF0DE: - movs r1, 0x30 - ldrsh r0, [r4, r1] - cmp r0, 0x50 - ble _080FF0EC - adds r0, r4, 0 - bl DestroyAnimSprite -_080FF0EC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FF090 - - thumb_func_start sub_80FF0F4 -sub_80FF0F4: @ 80FF0F4 - push {r4-r6,lr} - adds r5, r0, 0 - movs r1, 0x1 - bl InitAnimSpritePos - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _080FF114 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] -_080FF114: - ldr r6, =gBattleAnimArgs - ldrh r0, [r6, 0x8] - strh r0, [r5, 0x2E] - movs r1, 0xC - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _080FF154 - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r6, 0x4] - adds r0, r1 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r6, [r6, 0x6] - adds r0, r6 - b _080FF174 - .pool -_080FF154: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - adds r2, r5, 0 - adds r2, 0x32 - adds r3, r5, 0 - adds r3, 0x36 - movs r1, 0x1 - bl SetAverageBattlerPositions - ldrh r0, [r6, 0x4] - ldrh r1, [r5, 0x32] - adds r0, r1 - strh r0, [r5, 0x32] - ldrh r0, [r6, 0x6] - ldrh r1, [r5, 0x36] - adds r0, r1 -_080FF174: - strh r0, [r5, 0x36] - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0xA] - strh r0, [r5, 0x38] - adds r0, r5, 0 - bl InitAnimArcTranslation - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - adds r4, r0, 0 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl GetBattlerSide - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - bne _080FF1AC - movs r0, 0x1 - b _080FF1AE - .pool -_080FF1AC: - movs r0, 0 -_080FF1AE: - strh r0, [r5, 0x2E] - ldr r0, =sub_80FF1C0 - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF0F4 - - thumb_func_start sub_80FF1C0 -sub_80FF1C0: @ 80FF1C0 - push {r4-r7,lr} - adds r6, r0, 0 - movs r7, 0 - ldrh r5, [r6, 0x2E] - ldrh r4, [r6, 0x3C] - movs r0, 0x1 - strh r0, [r6, 0x2E] - adds r0, r6, 0 - bl TranslateAnimArc - ldrh r0, [r6, 0x3C] - strh r5, [r6, 0x2E] - lsls r4, 16 - asrs r4, 16 - cmp r4, 0xC8 - ble _080FF1F2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x37 - bgt _080FF1F2 - ldrh r0, [r6, 0x6] - cmp r0, 0 - bne _080FF1F8 - adds r0, 0x1 - strh r0, [r6, 0x6] -_080FF1F2: - ldrh r0, [r6, 0x6] - cmp r0, 0 - beq _080FF22A -_080FF1F8: - movs r1, 0x2E - ldrsh r0, [r6, r1] - cmp r0, 0 - beq _080FF22A - adds r3, r6, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - ldrh r0, [r6, 0x6] - adds r0, 0x1 - strh r0, [r6, 0x6] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1E - bne _080FF22A - movs r7, 0x1 -_080FF22A: - movs r2, 0x20 - ldrsh r0, [r6, r2] - movs r2, 0x24 - ldrsh r1, [r6, r2] - adds r0, r1 - adds r0, 0x10 - movs r1, 0x88 - lsls r1, 1 - cmp r0, r1 - bhi _080FF254 - movs r0, 0x22 - ldrsh r1, [r6, r0] - movs r2, 0x26 - ldrsh r0, [r6, r2] - adds r1, r0 - cmp r1, 0xA0 - bgt _080FF254 - movs r0, 0x10 - negs r0, r0 - cmp r1, r0 - bge _080FF256 -_080FF254: - movs r7, 0x1 -_080FF256: - cmp r7, 0 - beq _080FF260 - adds r0, r6, 0 - bl DestroyAnimSprite -_080FF260: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80FF1C0 - - thumb_func_start AnimMoveTwisterParticle -AnimMoveTwisterParticle: @ 80FF268 - push {r4,lr} - adds r4, r0, 0 - bl IsDoubleBattle - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080FF28A - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - adds r2, r4, 0 - adds r2, 0x20 - adds r3, r4, 0 - adds r3, 0x22 - movs r1, 0x1 - bl SetAverageBattlerPositions -_080FF28A: - ldrh r0, [r4, 0x22] - adds r0, 0x20 - strh r0, [r4, 0x22] - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x2] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x32] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x34] - ldrh r0, [r1, 0x8] - strh r0, [r4, 0x36] - ldr r0, =sub_80FF2BC - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end AnimMoveTwisterParticle - - thumb_func_start sub_80FF2BC -sub_80FF2BC: @ 80FF2BC - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0xFF - bne _080FF2D2 - ldrh r0, [r4, 0x22] - subs r0, 0x2 - strh r0, [r4, 0x22] - b _080FF2E0 -_080FF2D2: - cmp r0, 0 - ble _080FF2E0 - ldrh r0, [r4, 0x22] - subs r0, 0x2 - strh r0, [r4, 0x22] - subs r0, r1, 0x2 - strh r0, [r4, 0x30] -_080FF2E0: - ldrh r3, [r4, 0x32] - ldrh r5, [r4, 0x38] - adds r2, r3, r5 - strh r2, [r4, 0x38] - movs r0, 0x2E - ldrsh r1, [r4, r0] - movs r5, 0x36 - ldrsh r0, [r4, r5] - cmp r1, r0 - bge _080FF2F8 - adds r0, r2, r3 - strh r0, [r4, 0x38] -_080FF2F8: - ldrh r1, [r4, 0x38] - movs r0, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r2, 0x34 - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x24] - movs r5, 0x38 - ldrsh r0, [r4, r5] - movs r1, 0x5 - bl Sin - strh r0, [r4, 0x26] - movs r1, 0x38 - ldrsh r0, [r4, r1] - cmp r0, 0x7F - bgt _080FF338 - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8328 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - b _080FF346 - .pool -_080FF338: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl sub_80A8328 - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 -_080FF346: - movs r1, 0x3 - ands r0, r1 - lsls r0, 2 - ldrb r2, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0x5] - ldrh r0, [r4, 0x2E] - subs r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - cmp r0, 0 - bne _080FF36A - adds r0, r4, 0 - bl DestroyAnimSprite -_080FF36A: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF2BC - - thumb_func_start sub_80FF374 -sub_80FF374: @ 80FF374 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0 - bl sub_80A6980 - adds r2, r5, 0 - adds r2, 0x2C - ldrb r0, [r2] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - ldr r4, =gBattleAnimArgs - ldrb r1, [r4, 0x4] - adds r0, r5, 0 - bl StartSpriteAffineAnim - ldrh r0, [r4, 0x4] - strh r0, [r5, 0x3A] - ldrh r0, [r4, 0x6] - strh r0, [r5, 0x3C] - ldr r0, =sub_80FF3B0 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF374 - - thumb_func_start sub_80FF3B0 -sub_80FF3B0: @ 80FF3B0 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimArgs - ldrh r1, [r0, 0xE] - ldr r0, =0x0000ffff - cmp r1, r0 - bne _080FF3DA - adds r2, r4, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2] - movs r0, 0x1 - bl GetAnimBattlerSpriteId - movs r0, 0x80 - lsls r0, 1 - strh r0, [r4, 0x2E] - ldr r0, =sub_80FF3EC - str r0, [r4, 0x1C] -_080FF3DA: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF3B0 - - thumb_func_start sub_80FF3EC -sub_80FF3EC: @ 80FF3EC - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x1 - bl GetAnimBattlerSpriteId - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080FF404 - ldrh r0, [r4, 0x2E] - adds r0, 0xB - b _080FF408 -_080FF404: - ldrh r0, [r4, 0x2E] - subs r0, 0xB -_080FF408: - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _080FF424 - movs r0, 0 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x32] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0x32] -_080FF424: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080FF452 - ldrh r0, [r4, 0x3C] - subs r0, 0x1 - strh r0, [r4, 0x3C] - lsls r0, 16 - cmp r0, 0 - ble _080FF44C - ldrh r1, [r4, 0x3A] - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl StartSpriteAffineAnim - b _080FF452 -_080FF44C: - adds r0, r4, 0 - bl DestroyAnimSprite -_080FF452: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FF3EC - - thumb_func_start sub_80FF458 -sub_80FF458: @ 80FF458 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x1 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, =gSprites - mov r10, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - mov r2, r10 - adds r7, r0, r2 - adds r0, r7, 0 - adds r0, 0x3E - ldrb r0, [r0] - lsls r0, 29 - cmp r0, 0 - bge _080FF498 - adds r0, r4, 0 - bl DestroyAnimVisualTask - b _080FF51C - .pool -_080FF498: - adds r0, r1, 0 - movs r1, 0x1 - bl sub_80A7270 - ldr r0, =gTasks - lsls r6, r4, 2 - adds r6, r4 - lsls r6, 3 - adds r6, r0 - ldrb r0, [r7, 0x5] - lsls r0, 28 - lsrs r0, 30 - strh r0, [r6, 0x24] - ldr r0, =gBattleAnimTarget - mov r9, r0 - ldrb r0, [r0] - bl sub_80A8328 - movs r1, 0x3 - mov r8, r1 - mov r1, r8 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r7, 0x5] - movs r5, 0xD - negs r5, r5 - adds r0, r5, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r7, 0x5] - movs r0, 0x3 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r1, r0, 24 - lsls r4, r1, 4 - adds r4, r1 - lsls r4, 2 - add r4, r10 - ldrb r0, [r4, 0x5] - lsls r0, 28 - lsrs r0, 30 - strh r0, [r6, 0x26] - mov r2, r9 - ldrb r1, [r2] - movs r0, 0x2 - eors r0, r1 - bl sub_80A8328 - mov r1, r8 - ands r1, r0 - lsls r1, 2 - ldrb r0, [r4, 0x5] - ands r5, r0 - orrs r5, r1 - strb r5, [r4, 0x5] - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - strh r0, [r6, 0x8] - ldrh r0, [r1, 0x2] - strh r0, [r6, 0xA] - movs r0, 0x80 - lsls r0, 1 - strh r0, [r6, 0x1E] - ldr r0, =sub_80FF53C - str r0, [r6] -_080FF51C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF458 - - thumb_func_start sub_80FF53C -sub_80FF53C: @ 80FF53C - push {r4-r6,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - adds r6, r0, 0 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r4, r0, r1 - ldrh r1, [r4, 0x8] - ldrh r0, [r4, 0x1C] - adds r1, r0 - strh r1, [r4, 0x1C] - ldr r2, =gSprites - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r5, r0, r2 - lsls r1, 16 - asrs r1, 24 - strh r1, [r5, 0x24] - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _080FF586 - ldrh r0, [r5, 0x24] - negs r0, r0 - strh r0, [r5, 0x24] -_080FF586: - ldrh r0, [r4, 0x1E] - adds r0, 0x10 - strh r0, [r4, 0x1E] - movs r0, 0x1E - ldrsh r2, [r4, r0] - adds r0, r6, 0 - adds r1, r2, 0 - movs r3, 0 - bl obj_id_set_rotscale - adds r0, r6, 0 - bl sub_80A7E6C - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bne _080FF5B4 - strh r0, [r4, 0x8] - ldr r0, =sub_80FF5CC - str r0, [r4] -_080FF5B4: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF53C - - thumb_func_start sub_80FF5CC -sub_80FF5CC: @ 80FF5CC - push {r4-r7,lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, =gBattleAnimArgs - ldrh r1, [r0, 0xE] - ldr r0, =0x0000ffff - cmp r1, r0 - bne _080FF660 - ldr r0, =gTasks - lsls r2, r3, 2 - adds r1, r2, r3 - lsls r1, 3 - adds r7, r1, r0 - movs r1, 0x8 - ldrsh r5, [r7, r1] - adds r4, r0, 0 - cmp r5, 0 - bne _080FF674 - movs r0, 0x1 - bl GetAnimBattlerSpriteId - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl sub_80A7344 - ldr r6, =gSprites - lsls r1, r4, 4 - adds r1, r4 - lsls r1, 2 - adds r1, r6 - strh r5, [r1, 0x24] - strh r5, [r1, 0x26] - movs r5, 0x3 - ldrh r2, [r7, 0x24] - ands r2, r5 - lsls r2, 2 - ldrb r3, [r1, 0x5] - movs r4, 0xD - negs r4, r4 - adds r0, r4, 0 - ands r0, r3 - orrs r0, r2 - strb r0, [r1, 0x5] - movs r0, 0x3 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - ldrh r0, [r7, 0x26] - ands r0, r5 - lsls r0, 2 - ldrb r2, [r1, 0x5] - ands r4, r2 - orrs r4, r0 - strb r4, [r1, 0x5] - ldrh r0, [r7, 0x8] - adds r0, 0x1 - strh r0, [r7, 0x8] - b _080FF68E - .pool -_080FF660: - ldr r1, =gTasks - lsls r2, r3, 2 - adds r0, r2, r3 - lsls r0, 3 - adds r0, r1 - movs r4, 0x8 - ldrsh r0, [r0, r4] - adds r4, r1, 0 - cmp r0, 0 - beq _080FF68E -_080FF674: - adds r1, r2, r3 - lsls r1, 3 - adds r1, r4 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - bne _080FF68E - adds r0, r3, 0 - bl DestroyAnimVisualTask -_080FF68E: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF5CC - - thumb_func_start sub_80FF698 -sub_80FF698: @ 80FF698 - push {r4-r6,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _080FF6AA - cmp r0, 0x1 - beq _080FF704 - b _080FF756 -_080FF6AA: - ldr r6, =gBattleAnimTarget - ldrb r0, [r6] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _080FF6C2 - ldr r1, =gBattleAnimArgs - movs r2, 0 - ldrsh r0, [r1, r2] - negs r0, r0 - strh r0, [r1] -_080FF6C2: - ldrb r0, [r6] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r4, =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4] - adds r0, r1 - strh r0, [r5, 0x20] - ldrb r0, [r6] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r4, [r4, 0x2] - adds r0, r4 - strh r0, [r5, 0x22] - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - b _080FF756 - .pool -_080FF704: - adds r2, r5, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - adds r0, r5, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080FF756 - adds r0, r5, 0 - movs r1, 0x1 - bl ChangeSpriteAffineAnim - movs r0, 0x19 - strh r0, [r5, 0x2E] - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - ldr r0, =sub_80A70C0 - str r0, [r5, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 -_080FF756: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF698 - - thumb_func_start sub_80FF768 -sub_80FF768: @ 80FF768 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _080FF7D4 - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldr r4, =gBattleAnimArgs - ldrh r0, [r4] - strh r0, [r5, 0x24] - ldrh r0, [r4, 0x2] - strh r0, [r5, 0x26] - ldrb r0, [r4, 0x4] - adds r0, 0x1E - adds r1, r5, 0 - adds r1, 0x43 - strb r0, [r1] - ldrb r1, [r4, 0x6] - adds r0, r5, 0 - bl StartSpriteAnim - ldrh r0, [r4, 0x8] - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - movs r2, 0x22 - ldrsh r0, [r5, r2] - movs r2, 0x26 - ldrsh r1, [r5, r2] - adds r0, r1 - cmp r0, 0x78 - ble _080FF7D4 - ldrh r0, [r5, 0x22] - adds r1, r0, 0 - subs r1, 0x78 - ldrh r2, [r5, 0x26] - adds r0, r2 - adds r1, r0 - strh r1, [r5, 0x22] -_080FF7D4: - ldr r0, =sub_80FF8DC - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF768 - - thumb_func_start sub_80FF7EC -sub_80FF7EC: @ 80FF7EC - push {r4-r6,lr} - mov r6, r10 - mov r5, r9 - mov r4, r8 - push {r4-r6} - sub sp, 0x4 - mov r9, r0 - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - mov r8, r0 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r6, =gBattleAnimTarget - ldrb r0, [r6] - movs r1, 0x2 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldrb r0, [r6] - movs r1, 0x3 - bl GetBattlerSpriteCoord - adds r2, r0, 0 - lsls r2, 24 - subs r4, r5 - lsls r4, 16 - lsrs r2, 24 - mov r1, r8 - subs r2, r1 - lsls r2, 16 - lsrs r2, 16 - lsrs r3, r4, 16 - mov r10, r3 - asrs r4, 16 - ldr r6, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r6, r1] - muls r0, r4 - movs r1, 0x64 - str r2, [sp] - bl __divsi3 - adds r5, r0 - mov r3, r9 - strh r5, [r3, 0x20] - ldr r2, [sp] - lsls r0, r2, 16 - asrs r0, 16 - movs r3, 0 - ldrsh r1, [r6, r3] - muls r0, r1 - movs r1, 0x64 - bl __divsi3 - add r8, r0 - mov r1, r8 - mov r0, r9 - strh r1, [r0, 0x22] - ldrh r0, [r6, 0x2] - mov r3, r9 - strh r0, [r3, 0x24] - ldrh r0, [r6, 0x4] - strh r0, [r3, 0x26] - ldrb r0, [r6, 0x6] - adds r0, 0x1E - mov r1, r9 - adds r1, 0x43 - strb r0, [r1] - ldrb r1, [r6, 0x8] - mov r0, r9 - bl StartSpriteAnim - ldrh r0, [r6, 0xA] - mov r1, r9 - strh r0, [r1, 0x32] - ldr r0, =sub_80FF8DC - str r0, [r1, 0x1C] - ldr r1, =gUnknown_0203A0F8 - mov r3, r9 - ldrh r0, [r3, 0x20] - strh r0, [r1] - ldrh r0, [r3, 0x22] - strh r0, [r1, 0x2] - mov r0, r10 - strh r0, [r1, 0x4] - ldr r2, [sp] - strh r2, [r1, 0x6] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF7EC - - thumb_func_start sub_80FF8DC -sub_80FF8DC: @ 80FF8DC - push {lr} - adds r3, r0, 0 - ldrh r1, [r3, 0x2E] - adds r1, 0x1 - strh r1, [r3, 0x2E] - lsls r1, 16 - asrs r1, 16 - movs r2, 0x32 - ldrsh r0, [r3, r2] - subs r0, 0xA - cmp r1, r0 - ble _080FF91C - movs r0, 0x2E - ldrsh r1, [r3, r0] - lsrs r0, r1, 31 - adds r0, r1, r0 - asrs r0, 1 - lsls r0, 1 - subs r1, r0 - movs r2, 0x3E - adds r2, r3 - mov r12, r2 - movs r0, 0x1 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] -_080FF91C: - movs r2, 0x2E - ldrsh r1, [r3, r2] - movs r2, 0x32 - ldrsh r0, [r3, r2] - cmp r1, r0 - ble _080FF92E - adds r0, r3, 0 - bl DestroyAnimSprite -_080FF92E: - pop {r0} - bx r0 - thumb_func_end sub_80FF8DC - - thumb_func_start sub_80FF934 -sub_80FF934: @ 80FF934 - push {r4-r6,lr} - adds r6, r0, 0 - movs r1, 0x2E - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _080FF974 - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r4, =gBattleAnimArgs - lsrs r0, 24 - ldrh r2, [r4] - adds r0, r2 - strh r0, [r6, 0x20] - ldrb r0, [r5] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x2] - adds r0, r1 - strh r0, [r6, 0x22] - ldrh r0, [r4, 0x4] - strh r0, [r6, 0x30] - ldrh r0, [r4, 0x6] - strh r0, [r6, 0x32] - ldrh r0, [r4, 0x8] - strh r0, [r6, 0x34] -_080FF974: - ldrh r0, [r6, 0x2E] - adds r0, 0x1 - strh r0, [r6, 0x2E] - ldrh r1, [r6, 0x30] - muls r0, r1 - strh r0, [r6, 0x24] - movs r2, 0x2E - ldrsh r1, [r6, r2] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - movs r1, 0xFF - ands r0, r1 - movs r2, 0x32 - ldrsh r1, [r6, r2] - bl Sin - strh r0, [r6, 0x26] - movs r0, 0x2E - ldrsh r1, [r6, r0] - movs r2, 0x34 - ldrsh r0, [r6, r2] - cmp r1, r0 - ble _080FF9AA - adds r0, r6, 0 - bl DestroyAnimSprite -_080FF9AA: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FF934 - - thumb_func_start sub_80FF9B8 -sub_80FF9B8: @ 80FF9B8 - push {r4,r5,lr} - movs r2, 0x20 - ldrsh r4, [r0, r2] - lsls r4, 8 - movs r3, 0x22 - ldrsh r2, [r0, r3] - orrs r4, r2 - movs r5, 0x3A - ldrsh r2, [r0, r5] - lsls r2, 8 - movs r5, 0x3C - ldrsh r3, [r0, r5] - orrs r2, r3 - lsls r1, 8 - strh r4, [r0, 0x38] - strh r2, [r0, 0x3A] - strh r1, [r0, 0x3C] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80FF9B8 - - thumb_func_start sub_80FF9E0 -sub_80FF9E0: @ 80FF9E0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r8, r0 - ldrh r0, [r0, 0x38] - lsrs r1, r0, 8 - mov r10, r1 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - mov r1, r8 - ldrh r0, [r1, 0x3A] - lsrs r2, r0, 8 - lsls r0, 24 - lsrs r4, r0, 24 - ldrh r1, [r1, 0x3C] - lsls r0, r1, 16 - asrs r0, 24 - lsls r0, 16 - lsrs r6, r0, 16 - movs r3, 0xFF - ands r3, r1 - cmp r2, 0 - bne _080FFA1A - movs r2, 0x20 - negs r2, r2 - b _080FFA22 -_080FFA1A: - cmp r2, 0xFF - bne _080FFA22 - movs r2, 0x88 - lsls r2, 1 -_080FFA22: - mov r0, r9 - subs r4, r0 - lsls r4, 16 - lsrs r4, 16 - mov r1, r10 - subs r0, r2, r1 - lsls r5, r3, 16 - asrs r5, 16 - muls r0, r5 - lsls r1, r6, 16 - asrs r7, r1, 16 - adds r1, r7, 0 - bl __divsi3 - adds r6, r0, 0 - lsls r4, 16 - asrs r4, 16 - adds r0, r4, 0 - muls r0, r5 - adds r1, r7, 0 - bl __divsi3 - add r6, r10 - mov r1, r8 - strh r6, [r1, 0x20] - add r0, r9 - strh r0, [r1, 0x22] - adds r5, 0x1 - lsls r5, 16 - lsrs r3, r5, 16 - asrs r5, 16 - cmp r5, r7 - beq _080FFA74 - lsls r1, r7, 8 - lsls r0, r3, 16 - asrs r0, 16 - orrs r0, r1 - mov r1, r8 - strh r0, [r1, 0x3C] - movs r0, 0 - b _080FFA76 -_080FFA74: - movs r0, 0x1 -_080FFA76: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80FF9E0 - - thumb_func_start sub_80FFA84 -sub_80FFA84: @ 80FFA84 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0xA - bne _080FFA98 - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim -_080FFA98: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x32 - ble _080FFAAC - adds r0, r4, 0 - bl DestroyAnimSprite -_080FFAAC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FFA84 - - thumb_func_start sub_80FFAB4 -sub_80FFAB4: @ 80FFAB4 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x34 - ldrsh r0, [r4, r1] - lsls r0, 7 - movs r2, 0x36 - ldrsh r1, [r4, r2] - bl __divsi3 - ldrh r1, [r4, 0x2E] - adds r1, r0 - movs r5, 0 - strh r1, [r4, 0x2E] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x7F - ble _080FFADE - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - strh r5, [r4, 0x2E] -_080FFADE: - ldrh r0, [r4, 0x2E] - adds r0, 0x80 - lsls r0, 16 - asrs r0, 16 - movs r1, 0x30 - ldrsh r2, [r4, r1] - lsls r2, 3 - movs r1, 0x1E - subs r1, r2 - lsls r1, 16 - asrs r1, 16 - bl Sin - strh r0, [r4, 0x26] - adds r0, r4, 0 - bl sub_80FF9E0 - lsls r0, 24 - cmp r0, 0 - beq _080FFB0E - strh r5, [r4, 0x26] - strh r5, [r4, 0x2E] - ldr r0, =sub_80FFA84 - str r0, [r4, 0x1C] -_080FFB0E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FFAB4 - - thumb_func_start sub_80FFB18 -sub_80FFB18: @ 80FFB18 - push {r4-r6,lr} - adds r5, r0, 0 - movs r1, 0 - bl InitAnimSpritePos - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r6, r0, 24 - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gBattleAnimAttacker - ldrb r1, [r0] - movs r0, 0x2 - eors r0, r1 - ldrb r4, [r4] - cmp r0, r4 - bne _080FFB68 - strh r6, [r5, 0x3A] - adds r0, r2, 0 - adds r0, 0xA - strh r0, [r5, 0x3C] - adds r0, r5, 0 - movs r1, 0x3C - bl sub_80FF9B8 - movs r0, 0x1 - b _080FFB7A - .pool -_080FFB68: - strh r6, [r5, 0x3A] - adds r0, r2, 0 - adds r0, 0xA - strh r0, [r5, 0x3C] - adds r0, r5, 0 - movs r1, 0x3C - bl sub_80FF9B8 - movs r0, 0x3 -_080FFB7A: - strh r0, [r5, 0x34] - movs r0, 0x3C - strh r0, [r5, 0x36] - ldr r0, =sub_80FFAB4 - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FFB18 - - thumb_func_start sub_80FFB90 -sub_80FFB90: @ 80FFB90 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x34 - ldrsh r0, [r4, r1] - lsls r0, 7 - movs r2, 0x36 - ldrsh r1, [r4, r2] - bl __divsi3 - ldrh r1, [r4, 0x2E] - adds r1, r0 - movs r5, 0 - strh r1, [r4, 0x2E] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x7F - ble _080FFBBA - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - strh r5, [r4, 0x2E] -_080FFBBA: - ldrh r0, [r4, 0x2E] - adds r0, 0x80 - lsls r0, 16 - asrs r0, 16 - movs r1, 0x30 - ldrsh r2, [r4, r1] - lsls r2, 3 - movs r1, 0x1E - subs r1, r2 - lsls r1, 16 - asrs r1, 16 - bl Sin - strh r0, [r4, 0x26] - adds r0, r4, 0 - bl sub_80FF9E0 - lsls r0, 24 - cmp r0, 0 - beq _080FFBEC - strh r5, [r4, 0x26] - strh r5, [r4, 0x2E] - adds r0, r4, 0 - bl DestroyAnimSprite -_080FFBEC: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80FFB90 - - thumb_func_start sub_80FFBF4 -sub_80FFBF4: @ 80FFBF4 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r6, r0, 24 - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _080FFC38 - strh r0, [r5, 0x3A] - adds r0, r6, 0 - adds r0, 0xA - strh r0, [r5, 0x3C] - adds r0, r5, 0 - movs r1, 0x28 - bl sub_80FF9B8 - movs r0, 0x3 - strh r0, [r5, 0x34] - movs r0, 0x3C - strh r0, [r5, 0x36] - ldr r0, =sub_80FFAB4 - b _080FFC62 - .pool -_080FFC38: - movs r0, 0xFF - strh r0, [r5, 0x3A] - adds r0, r6, 0 - adds r0, 0xA - strh r0, [r5, 0x3C] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080FFC50 - movs r0, 0 - strh r0, [r5, 0x3A] -_080FFC50: - adds r0, r5, 0 - movs r1, 0x28 - bl sub_80FF9B8 - movs r0, 0x3 - strh r0, [r5, 0x34] - movs r0, 0x3C - strh r0, [r5, 0x36] - ldr r0, =sub_80FFB90 -_080FFC62: - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FFBF4 - - thumb_func_start sub_80FFC70 -sub_80FFC70: @ 80FFC70 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080FFC8A - adds r0, r4, 0 - movs r1, 0 - bl sub_80A6980 - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x4] - strh r0, [r4, 0x30] -_080FFC8A: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - ldrh r1, [r4, 0x30] - muls r0, r1 - strh r0, [r4, 0x26] - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080FFCAA - adds r0, r4, 0 - bl DestroyAnimSprite -_080FFCAA: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FFC70 - - thumb_func_start sub_80FFCB4 -sub_80FFCB4: @ 80FFCB4 - push {r4-r6,lr} - adds r5, r0, 0 - movs r1, 0 - bl sub_80A6980 - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r6, r0, 24 - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gBattleAnimTarget - ldrb r1, [r0] - movs r0, 0x2 - eors r0, r1 - ldrb r4, [r4] - cmp r0, r4 - bne _080FFD04 - strh r6, [r5, 0x3A] - adds r0, r2, 0 - adds r0, 0xA - strh r0, [r5, 0x3C] - adds r0, r5, 0 - movs r1, 0x3C - bl sub_80FF9B8 - movs r0, 0x1 - b _080FFD16 - .pool -_080FFD04: - strh r6, [r5, 0x3A] - adds r0, r2, 0 - adds r0, 0xA - strh r0, [r5, 0x3C] - adds r0, r5, 0 - movs r1, 0x3C - bl sub_80FF9B8 - movs r0, 0x3 -_080FFD16: - strh r0, [r5, 0x34] - movs r0, 0x3C - strh r0, [r5, 0x36] - ldr r0, =sub_80FFD2C - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FFCB4 - - thumb_func_start sub_80FFD2C -sub_80FFD2C: @ 80FFD2C - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x34 - ldrsh r0, [r4, r1] - lsls r0, 7 - movs r2, 0x36 - ldrsh r1, [r4, r2] - bl __divsi3 - ldrh r1, [r4, 0x2E] - adds r1, r0 - movs r5, 0 - strh r1, [r4, 0x2E] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x7F - ble _080FFD56 - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - strh r5, [r4, 0x2E] -_080FFD56: - ldrh r0, [r4, 0x2E] - adds r0, 0x80 - lsls r0, 16 - asrs r0, 16 - movs r1, 0x30 - ldrsh r2, [r4, r1] - lsls r2, 3 - movs r1, 0x1E - subs r1, r2 - lsls r1, 16 - asrs r1, 16 - bl Sin - strh r0, [r4, 0x26] - lsls r0, 16 - cmp r0, 0 - bne _080FFD8A - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x7D - bl PlaySE12WithPanning -_080FFD8A: - adds r0, r4, 0 - bl sub_80FF9E0 - lsls r0, 24 - cmp r0, 0 - beq _080FFDB2 - strh r5, [r4, 0x26] - strh r5, [r4, 0x2E] - ldr r0, =sub_80FFA84 - str r0, [r4, 0x1C] - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0x7D - bl PlaySE12WithPanning -_080FFDB2: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FFD2C - - thumb_func_start sub_80FFDBC -sub_80FFDBC: @ 80FFDBC - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080FFE50 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080FFDE4 - ldr r0, =gBattleAnimArgs - ldrh r1, [r0, 0x2] - strh r1, [r4, 0x30] - movs r1, 0x78 - strh r1, [r4, 0x20] - adds r5, r0, 0 - b _080FFE06 - .pool -_080FFDE4: - ldr r0, =gBattleAnimArgs - movs r1, 0x2 - ldrsh r3, [r0, r1] - adds r1, r3, 0 - subs r1, 0x20 - adds r2, r1, 0 - adds r5, r0, 0 - cmp r1, 0 - bge _080FFDFA - adds r2, r3, 0 - adds r2, 0xDF -_080FFDFA: - asrs r0, r2, 8 - lsls r0, 8 - subs r0, r1, r0 - strh r0, [r4, 0x30] - movs r0, 0x46 - strh r0, [r4, 0x20] -_080FFE06: - ldrh r0, [r5] - strh r0, [r4, 0x22] - strh r0, [r4, 0x32] - movs r0, 0x14 - strh r0, [r4, 0x36] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x3C - bl Cos - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x14 - bl Sin - strh r0, [r4, 0x26] - ldr r0, =sub_80FFE58 - str r0, [r4, 0x1C] - ldrh r0, [r4, 0x30] - subs r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xBE - bhi _080FFE48 - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1F - b _080FFE4E - .pool -_080FFE48: - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1D -_080FFE4E: - strb r0, [r1] -_080FFE50: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80FFDBC - - thumb_func_start sub_80FFE58 -sub_80FFE58: @ 80FFE58 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080FFE6A - cmp r0, 0x1 - beq _080FFE9A - b _080FFEBA -_080FFE6A: - ldrh r5, [r4, 0x32] - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0x4E - ble _080FFE82 - movs r0, 0x1 - strh r0, [r4, 0x34] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim - b _080FFEBA -_080FFE82: - movs r1, 0x36 - ldrsh r0, [r4, r1] - movs r1, 0xA - bl __divsi3 - adds r0, r5, r0 - strh r0, [r4, 0x32] - ldrh r1, [r4, 0x36] - adds r1, 0x3 - strh r1, [r4, 0x36] - strh r0, [r4, 0x22] - b _080FFEBA -_080FFE9A: - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080FFEBA - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080FFEBA - movs r0, 0 - strh r0, [r4, 0x2E] - strh r0, [r4, 0x32] - ldr r0, =sub_80FFEC4 - str r0, [r4, 0x1C] -_080FFEBA: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FFE58 - - thumb_func_start sub_80FFEC4 -sub_80FFEC4: @ 80FFEC4 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r5, =gUnknown_08592700 - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 1 - adds r3, r0, r1 - adds r0, r5, 0x1 - adds r0, r3, r0 - ldrh r2, [r4, 0x32] - movs r6, 0x32 - ldrsh r1, [r4, r6] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080FFF10 - adds r0, r5, 0x2 - adds r0, r3, r0 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x7F - bne _080FFEFC - movs r0, 0 - strh r0, [r4, 0x2E] - ldr r0, =sub_80FFF7C - str r0, [r4, 0x1C] -_080FFEFC: - movs r0, 0 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _080FFF76 - .pool -_080FFF10: - adds r0, r2, 0x1 - strh r0, [r4, 0x32] - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 1 - adds r0, r1 - adds r1, r0, r5 - movs r2, 0 - ldrsb r2, [r1, r2] - adds r1, r5, 0x2 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - muls r0, r2 - ldrh r1, [r4, 0x30] - adds r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x30] - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080FFF5E - ldrh r0, [r4, 0x30] - subs r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xBE - bhi _080FFF56 - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1F - b _080FFF5C -_080FFF56: - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1D -_080FFF5C: - strb r0, [r1] -_080FFF5E: - movs r6, 0x30 - ldrsh r0, [r4, r6] - movs r1, 0x3C - bl Cos - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x14 - bl Sin - strh r0, [r4, 0x26] -_080FFF76: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80FFEC4 - - thumb_func_start sub_80FFF7C -sub_80FFF7C: @ 80FFF7C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x14 - ble _080FFF8E - adds r0, r4, 0 - bl DestroyAnimSprite -_080FFF8E: - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsrs r0, r1, 31 - adds r0, r1, r0 - asrs r0, 1 - lsls r0, 1 - subs r1, r0 - adds r3, r4, 0 - adds r3, 0x3E - movs r0, 0x1 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r3] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80FFF7C - - thumb_func_start sub_80FFFC0 -sub_80FFFC0: @ 80FFFC0 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r6, r0, 0 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, =gTasks - adds r5, r0, r1 - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - bl sub_80A82E4 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - strh r0, [r5, 0x10] - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x14] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x16] - ldrb r0, [r4] - movs r1, 0x1 - bl sub_80A861C - strh r0, [r5, 0x1C] - ldrb r0, [r4] - movs r1, 0 - bl sub_80A861C - strh r0, [r5, 0x1E] - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - movs r2, 0x1 - negs r2, r2 - adds r1, r2, 0 - cmp r0, 0x1 - bne _08100028 - movs r1, 0x1 -_08100028: - strh r1, [r5, 0x12] - movs r3, 0x12 - ldrsh r0, [r5, r3] - lsls r0, 6 - movs r1, 0x38 - subs r1, r0 - strh r1, [r5, 0x1A] - ldrh r0, [r5, 0x16] - subs r0, r1 - ldrh r1, [r5, 0x14] - adds r0, r1 - strh r0, [r5, 0x18] - ldr r0, =gUnknown_08592778 - movs r2, 0x18 - ldrsh r1, [r5, r2] - movs r3, 0x1A - ldrsh r2, [r5, r3] - ldrb r3, [r5, 0x10] - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0xC] - cmp r0, 0x40 - bne _08100060 - adds r0, r6, 0 - bl DestroyAnimVisualTask -_08100060: - ldr r4, =gSprites - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0xA - strh r1, [r0, 0x2E] - movs r2, 0xC - ldrsh r1, [r5, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r5, 0x18] - strh r1, [r0, 0x30] - movs r3, 0xC - ldrsh r0, [r5, r3] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r4 - movs r1, 0x1C - ldrsh r0, [r5, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r5, r3] - muls r1, r0 - ldrh r0, [r5, 0x14] - subs r0, r1 - strh r0, [r2, 0x32] - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r5, 0x1A] - strh r1, [r0, 0x34] - movs r1, 0xC - ldrsh r0, [r5, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - movs r2, 0x1E - ldrsh r0, [r5, r2] - lsrs r2, r0, 31 - adds r0, r2 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r2, [r5, r3] - muls r0, r2 - ldrh r2, [r5, 0x16] - adds r0, r2 - strh r0, [r1, 0x36] - movs r3, 0xC - ldrsh r1, [r5, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl sub_8100504 - movs r1, 0xC - ldrsh r2, [r5, r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r4 - strh r0, [r1, 0x38] - movs r2, 0xC - ldrsh r1, [r5, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl InitAnimArcTranslation - ldr r0, =sub_8100128 - str r0, [r5] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80FFFC0 - - thumb_func_start sub_8100128 -sub_8100128: @ 8100128 - push {r4-r6,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, =gTasks - adds r6, r0, r1 - movs r0, 0xC - ldrsh r1, [r6, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r5, [r6, r1] - cmp r5, 0x7 - bne _08100150 - b _08100380 -_08100150: - cmp r5, 0x7 - bgt _0810019E - cmp r5, 0x3 - bne _0810015A - b _08100272 -_0810015A: - cmp r5, 0x3 - bgt _08100174 - cmp r5, 0x1 - beq _08100204 - cmp r5, 0x1 - bgt _08100254 - cmp r5, 0 - beq _081001E6 - b _081004FC - .pool -_08100174: - cmp r5, 0x5 - bne _0810017A - b _081002E8 -_0810017A: - cmp r5, 0x5 - ble _08100180 - b _08100362 -_08100180: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_8100524 - adds r0, r4, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - bne _08100196 - b _081004FC -_08100196: - movs r0, 0x5 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _081004FA -_0810019E: - cmp r5, 0xB - bne _081001A4 - b _08100464 -_081001A4: - cmp r5, 0xB - bgt _081001D2 - cmp r5, 0x9 - bne _081001AE - b _081003D2 -_081001AE: - cmp r5, 0x9 - ble _081001B4 - b _08100448 -_081001B4: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_8100524 - adds r0, r4, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - bne _081001CA - b _081004FC -_081001CA: - movs r0, 0x9 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _081004FA -_081001D2: - cmp r5, 0xD - bne _081001D8 - b _081004D6 -_081001D8: - cmp r5, 0xD - bge _081001DE - b _081004B6 -_081001DE: - cmp r5, 0xFF - bne _081001E4 - b _081004E6 -_081001E4: - b _081004FC -_081001E6: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_8100524 - adds r0, r4, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - bne _081001FC - b _081004FC -_081001FC: - movs r0, 0x1 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _081004FA -_08100204: - ldrh r2, [r4, 0x24] - ldrh r3, [r4, 0x20] - adds r2, r3 - movs r0, 0 - strh r2, [r4, 0x20] - ldrh r1, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r1, r3 - strh r1, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r2, [r4, 0x30] - ldrh r0, [r6, 0x14] - strh r0, [r4, 0x32] - strh r1, [r4, 0x34] - ldrh r0, [r6, 0x16] - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_8100504 - strh r0, [r4, 0x38] - ldrh r0, [r6, 0x10] - adds r0, 0x2 - strh r0, [r6, 0x10] - strh r5, [r6, 0xE] - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl InitAnimArcTranslation - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _081004FA -_08100254: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_8100524 - adds r0, r4, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - bne _0810026A - b _081004FC -_0810026A: - movs r0, 0x3 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _081004FA -_08100272: - ldrh r1, [r4, 0x24] - ldrh r0, [r4, 0x20] - adds r1, r0 - movs r0, 0 - strh r1, [r4, 0x20] - ldrh r2, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r2, r3 - strh r2, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r1, [r4, 0x30] - movs r1, 0x1C - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r6, r3] - muls r1, r0 - ldrh r0, [r6, 0x14] - subs r0, r1 - strh r0, [r4, 0x32] - strh r2, [r4, 0x34] - movs r1, 0x1E - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r2, 0x12 - ldrsh r1, [r6, r2] - muls r1, r0 - ldrh r0, [r6, 0x16] - subs r0, r1 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_8100504 - strh r0, [r4, 0x38] - movs r0, 0x2 - strh r0, [r6, 0xE] - ldrh r0, [r6, 0x10] - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl InitAnimArcTranslation - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _081004FA -_081002E8: - ldrh r1, [r4, 0x24] - ldrh r3, [r4, 0x20] - adds r1, r3 - movs r0, 0 - strh r1, [r4, 0x20] - ldrh r2, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r2, r3 - strh r2, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r1, [r4, 0x30] - movs r1, 0x1C - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r6, r3] - muls r0, r1 - ldrh r1, [r6, 0x14] - adds r0, r1 - strh r0, [r4, 0x32] - strh r2, [r4, 0x34] - movs r2, 0x1E - ldrsh r0, [r6, r2] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r6, r3] - muls r0, r1 - ldrh r1, [r6, 0x16] - adds r0, r1 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_8100504 - strh r0, [r4, 0x38] - ldrh r1, [r6, 0x10] - subs r1, 0x2 - strh r1, [r6, 0x10] - movs r0, 0x3 - strh r0, [r6, 0xE] - adds r0, r4, 0 - adds r0, 0x43 - strb r1, [r0] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl InitAnimArcTranslation - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _081004FA -_08100362: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_8100524 - adds r0, r4, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - bne _08100378 - b _081004FC -_08100378: - movs r0, 0x7 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _081004FA -_08100380: - ldrh r2, [r4, 0x24] - ldrh r3, [r4, 0x20] - adds r2, r3 - movs r0, 0 - strh r2, [r4, 0x20] - ldrh r1, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r1, r3 - strh r1, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r2, [r4, 0x30] - ldrh r0, [r6, 0x14] - strh r0, [r4, 0x32] - strh r1, [r4, 0x34] - ldrh r0, [r6, 0x16] - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_8100504 - strh r0, [r4, 0x38] - ldrh r1, [r6, 0x10] - adds r1, 0x2 - strh r1, [r6, 0x10] - movs r0, 0x4 - strh r0, [r6, 0xE] - adds r0, r4, 0 - adds r0, 0x43 - strb r1, [r0] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl InitAnimArcTranslation - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _081004FA -_081003D2: - ldrh r1, [r4, 0x24] - ldrh r0, [r4, 0x20] - adds r1, r0 - movs r0, 0 - strh r1, [r4, 0x20] - ldrh r2, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r2, r3 - strh r2, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r1, [r4, 0x30] - movs r1, 0x1C - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r6, r3] - muls r1, r0 - ldrh r0, [r6, 0x14] - subs r0, r1 - strh r0, [r4, 0x32] - strh r2, [r4, 0x34] - movs r1, 0x1E - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r2, 0x12 - ldrsh r1, [r6, r2] - muls r0, r1 - ldrh r3, [r6, 0x16] - adds r0, r3 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_8100504 - strh r0, [r4, 0x38] - movs r0, 0x5 - strh r0, [r6, 0xE] - ldrh r0, [r6, 0x10] - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl InitAnimArcTranslation - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _081004FA -_08100448: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_8100524 - adds r0, r4, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - beq _081004FC - movs r0, 0xB - strh r0, [r6, 0x26] - movs r0, 0xFF - b _081004FA -_08100464: - ldrh r2, [r4, 0x24] - ldrh r0, [r4, 0x20] - adds r2, r0 - movs r0, 0 - strh r2, [r4, 0x20] - ldrh r1, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r1, r3 - strh r1, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r2, [r4, 0x30] - ldrh r0, [r6, 0x18] - strh r0, [r4, 0x32] - strh r1, [r4, 0x34] - ldrh r0, [r6, 0x1A] - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_8100504 - strh r0, [r4, 0x38] - ldrh r1, [r6, 0x10] - subs r1, 0x2 - strh r1, [r6, 0x10] - movs r0, 0x6 - strh r0, [r6, 0xE] - adds r0, r4, 0 - adds r0, 0x43 - strb r1, [r0] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl InitAnimArcTranslation - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _081004FA -_081004B6: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_8100524 - adds r0, r4, 0 - bl TranslateAnimArc - lsls r0, 24 - cmp r0, 0 - beq _081004FC - adds r0, r4, 0 - bl DestroySprite - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _081004FA -_081004D6: - movs r1, 0x20 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _081004FC - adds r0, r2, 0 - bl DestroyAnimVisualTask - b _081004FC -_081004E6: - ldrh r0, [r6, 0xA] - adds r0, 0x1 - strh r0, [r6, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _081004FC - movs r0, 0 - strh r0, [r6, 0xA] - ldrh r0, [r6, 0x26] -_081004FA: - strh r0, [r6, 0x8] -_081004FC: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8100128 - - thumb_func_start sub_8100504 -sub_8100504: @ 8100504 - push {lr} - movs r2, 0x8 - movs r3, 0x36 - ldrsh r1, [r0, r3] - movs r3, 0x22 - ldrsh r0, [r0, r3] - cmp r1, r0 - bge _0810051A - negs r0, r2 - lsls r0, 16 - lsrs r2, r0, 16 -_0810051A: - lsls r0, r2, 16 - asrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_8100504 - - thumb_func_start sub_8100524 -sub_8100524: @ 8100524 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - lsls r1, 24 - lsrs r7, r1, 24 - ldrh r0, [r6, 0x24] - adds r0, 0x1 - strh r0, [r6, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _081005BA - movs r0, 0 - strh r0, [r6, 0x24] - ldr r0, =gSprites - mov r8, r0 - movs r2, 0xC - ldrsh r1, [r6, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - ldrh r1, [r0, 0x24] - ldrh r2, [r0, 0x20] - adds r1, r2 - ldrh r2, [r0, 0x26] - ldrh r0, [r0, 0x22] - adds r2, r0 - ldr r0, =gUnknown_08592778 - lsls r1, 16 - asrs r1, 16 - lsls r2, 16 - asrs r2, 16 - ldrb r3, [r6, 0x10] - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _081005BA - lsls r5, r0, 4 - adds r5, r0 - lsls r5, 2 - mov r0, r8 - adds r4, r5, r0 - strh r7, [r4, 0x3A] - movs r0, 0xC - strh r0, [r4, 0x3C] - ldr r0, =gTasks - lsls r1, r7, 2 - adds r1, r7 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x20] - adds r0, 0x1 - strh r0, [r1, 0x20] - ldrh r2, [r6, 0x22] - movs r0, 0x1 - ands r0, r2 - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x22] - adds r0, 0x1 - strh r0, [r1, 0x22] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - ldrh r0, [r6, 0x10] - adds r4, 0x43 - strb r0, [r4] - mov r0, r8 - adds r0, 0x1C - adds r5, r0 - ldr r0, =sub_81005D4 - str r0, [r5] -_081005BA: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100524 - - thumb_func_start sub_81005D4 -sub_81005D4: @ 81005D4 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08100636 - movs r0, 0 - strh r0, [r4, 0x2E] - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _08100636 - ldr r3, =gTasks - movs r0, 0x3C - ldrsh r1, [r4, r0] - lsls r1, 1 - movs r0, 0x3A - ldrsh r2, [r4, r0] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0 - adds r3, 0x8 - adds r1, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - adds r0, r4, 0 - bl DestroySprite -_08100636: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81005D4 - - thumb_func_start sub_8100640 -sub_8100640: @ 8100640 - push {r4-r7,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0xC - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0810065C - ldr r0, =gBattleAnimAttacker - b _0810065E - .pool -_0810065C: - ldr r0, =gBattleAnimTarget -_0810065E: - ldrb r6, [r0] - adds r0, r6, 0 - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08100688 - movs r0, 0 - strh r0, [r4, 0x36] - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x32] - ldr r0, =0x0000fff0 - b _08100698 - .pool -_08100688: - movs r0, 0x1 - strh r0, [r4, 0x36] - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x6] - negs r0, r0 - strh r0, [r4, 0x32] - movs r0, 0x80 - lsls r0, 1 -_08100698: - strh r0, [r4, 0x20] - adds r7, r1, 0 - adds r5, r7, 0 - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x30] - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r5, 0x8] - strh r0, [r4, 0x34] - movs r1, 0xA - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _081006CE - cmp r0, 0x1 - bgt _081006C0 - cmp r0, 0 - beq _081006CA - b _08100738 - .pool -_081006C0: - cmp r0, 0x2 - beq _081006D4 - cmp r0, 0x3 - beq _08100700 - b _08100738 -_081006CA: - ldrh r0, [r5] - b _081006E4 -_081006CE: - ldrh r0, [r5] - strh r0, [r4, 0x22] - b _0810071A -_081006D4: - adds r0, r6, 0 - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r5, [r5] - adds r0, r5 -_081006E4: - strh r0, [r4, 0x22] - adds r0, r6, 0 - bl sub_80A8328 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x5] - b _08100738 -_08100700: - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r7, [r7] - adds r0, r7 - strh r0, [r4, 0x22] - movs r0, 0x1 - bl GetAnimBattlerSpriteId -_0810071A: - adds r0, r6, 0 - bl sub_80A8328 - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - movs r1, 0x3 - ands r0, r1 - lsls r0, 2 - ldrb r2, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0x5] -_08100738: - ldr r0, =sub_810074C - str r0, [r4, 0x1C] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100640 - - thumb_func_start sub_810074C -sub_810074C: @ 810074C - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x3C - ldrsh r3, [r4, r0] - ldrh r0, [r4, 0x3C] - adds r0, 0x1 - strh r0, [r4, 0x3C] - movs r1, 0x30 - ldrsh r2, [r4, r1] - ldr r1, =gSineTable - movs r5, 0x2E - ldrsh r0, [r4, r5] - lsls r0, 1 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - muls r0, r2 - asrs r0, 8 - strh r0, [r4, 0x26] - movs r2, 0x32 - ldrsh r0, [r4, r2] - muls r0, r3 - strh r0, [r4, 0x24] - movs r5, 0x34 - ldrsh r0, [r4, r5] - muls r0, r3 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2E] - movs r1, 0x36 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081007A4 - movs r2, 0x24 - ldrsh r0, [r4, r2] - movs r5, 0x20 - ldrsh r1, [r4, r5] - adds r0, r1 - cmp r0, 0xF7 - ble _081007BC - b _081007B6 - .pool -_081007A4: - movs r1, 0x24 - ldrsh r0, [r4, r1] - movs r2, 0x20 - ldrsh r1, [r4, r2] - adds r0, r1 - movs r1, 0x10 - negs r1, r1 - cmp r0, r1 - bgt _081007BC -_081007B6: - adds r0, r4, 0 - bl move_anim_8074EE0 -_081007BC: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_810074C - - thumb_func_start sub_81007C4 -sub_81007C4: @ 81007C4 - push {r4-r7,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, =gTasks - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _081007E8 - cmp r0, 0x1 - beq _0810081C - b _08100876 - .pool -_081007E8: - ldr r0, =0x0000274f - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 20 - movs r2, 0x80 - lsls r2, 1 - adds r4, r2, 0 - adds r0, r4 - strh r0, [r5, 0x18] - ldr r0, =0x000027b0 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 20 - adds r0, r4 - strh r0, [r5, 0x20] - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - b _08100876 - .pool -_0810081C: - ldrh r0, [r5, 0x1A] - adds r0, 0x1 - movs r7, 0 - strh r0, [r5, 0x1A] - lsls r0, 16 - cmp r0, 0 - blt _08100876 - strh r7, [r5, 0x1A] - ldrh r0, [r5, 0x18] - ldrb r2, [r5, 0x1C] - ldr r4, =gUnknown_08592878 - movs r3, 0x1E - ldrsh r1, [r5, r3] - lsls r1, 1 - adds r1, r4 - ldrh r3, [r1] - movs r1, 0x10 - bl BlendPalette - ldrh r0, [r5, 0x20] - ldrb r2, [r5, 0x1C] - movs r3, 0x1E - ldrsh r1, [r5, r3] - lsls r1, 1 - adds r1, r4 - ldrh r3, [r1] - movs r1, 0x10 - bl BlendPalette - ldrh r0, [r5, 0x1C] - adds r0, 0x1 - strh r0, [r5, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x11 - bne _08100876 - strh r7, [r5, 0x1C] - ldrh r0, [r5, 0x1E] - adds r0, 0x1 - strh r0, [r5, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7 - bne _08100876 - strh r7, [r5, 0x1E] -_08100876: - ldr r0, =gBattleAnimArgs - movs r2, 0xE - ldrsh r1, [r0, r2] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _0810088A - adds r0, r6, 0 - bl DestroyAnimVisualTask -_0810088A: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81007C4 - - thumb_func_start sub_8100898 -sub_8100898: @ 8100898 - push {r4-r7,lr} - sub sp, 0x4 - adds r6, r0, 0 - ldr r1, =gBattleAnimArgs - movs r2, 0x8 - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _081008B4 - adds r0, r6, 0 - bl DestroyAnimSprite - b _0810098E - .pool -_081008B4: - movs r3, 0 - ldrsh r0, [r1, r3] - cmp r0, 0 - bne _081008C4 - ldr r4, =gBattleAnimAttacker - b _081008C6 - .pool -_081008C4: - ldr r4, =gBattleAnimTarget -_081008C6: - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r5, r0, 24 - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gBattleAnimArgs - ldrh r1, [r0, 0x8] - strh r1, [r6, 0x2E] - movs r3, 0x2 - ldrsh r1, [r0, r3] - adds r7, r0, 0 - cmp r1, 0 - bne _08100908 - ldrh r0, [r7, 0x4] - adds r0, r5 - strh r0, [r6, 0x20] - ldrh r0, [r7, 0x6] - adds r0, r2 - strh r0, [r6, 0x22] - strh r5, [r6, 0x38] - strh r2, [r6, 0x3A] - b _08100918 - .pool -_08100908: - strh r5, [r6, 0x20] - strh r2, [r6, 0x22] - ldrh r0, [r7, 0x4] - adds r0, r5 - strh r0, [r6, 0x38] - ldrh r0, [r7, 0x6] - adds r0, r2 - strh r0, [r6, 0x3A] -_08100918: - ldrh r4, [r6, 0x20] - lsls r0, r4, 4 - strh r0, [r6, 0x30] - ldrh r5, [r6, 0x22] - lsls r0, r5, 4 - strh r0, [r6, 0x32] - movs r1, 0x38 - ldrsh r0, [r6, r1] - movs r2, 0x20 - ldrsh r1, [r6, r2] - subs r0, r1 - lsls r0, 4 - movs r3, 0x8 - ldrsh r1, [r7, r3] - bl __divsi3 - strh r0, [r6, 0x34] - movs r1, 0x3A - ldrsh r0, [r6, r1] - movs r2, 0x22 - ldrsh r1, [r6, r2] - subs r0, r1 - lsls r0, 4 - movs r3, 0x8 - ldrsh r1, [r7, r3] - bl __divsi3 - strh r0, [r6, 0x36] - ldrh r0, [r6, 0x38] - subs r0, r4 - lsls r0, 16 - asrs r0, 16 - ldrh r1, [r6, 0x3A] - subs r1, r5 - lsls r1, 16 - asrs r1, 16 - bl ArcTan2Neg - lsls r0, 16 - lsrs r4, r0, 16 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _0810097A - ldr r1, =0xffff8000 - adds r0, r4, r1 - lsls r0, 16 - lsrs r4, r0, 16 -_0810097A: - movs r3, 0x80 - lsls r3, 1 - str r4, [sp] - adds r0, r6, 0 - movs r1, 0 - adds r2, r3, 0 - bl sub_80A73E0 - ldr r0, =sub_81009A0 - str r0, [r6, 0x1C] -_0810098E: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100898 - - thumb_func_start sub_81009A0 -sub_81009A0: @ 81009A0 - push {r4,lr} - adds r2, r0, 0 - ldrh r3, [r2, 0x2E] - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0 - beq _081009D0 - ldrh r0, [r2, 0x34] - ldrh r4, [r2, 0x30] - adds r0, r4 - strh r0, [r2, 0x30] - ldrh r1, [r2, 0x36] - ldrh r4, [r2, 0x32] - adds r1, r4 - strh r1, [r2, 0x32] - lsls r0, 16 - asrs r0, 20 - strh r0, [r2, 0x20] - lsls r1, 16 - asrs r1, 20 - strh r1, [r2, 0x22] - subs r0, r3, 0x1 - strh r0, [r2, 0x2E] - b _081009D6 -_081009D0: - adds r0, r2, 0 - bl move_anim_8074EE0 -_081009D6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81009A0 - - thumb_func_start sub_81009DC -sub_81009DC: @ 81009DC - push {lr} - adds r2, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _081009F2 - adds r0, r2, 0 - bl DestroyAnimSprite -_081009F2: - pop {r0} - bx r0 - thumb_func_end sub_81009DC - - thumb_func_start sub_81009F8 -sub_81009F8: @ 81009F8 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08100A20 - ldr r2, =gBattleAnimArgs - ldrh r0, [r4, 0x20] - ldrh r1, [r2] - subs r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r2, 0x2] - b _08100A2C - .pool -_08100A20: - ldr r0, =gBattleAnimArgs - ldrh r1, [r0] - ldrh r2, [r4, 0x20] - adds r1, r2 - strh r1, [r4, 0x20] - ldrh r0, [r0, 0x2] -_08100A2C: - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldr r0, =sub_80A67D8 - str r0, [r4, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81009F8 - - thumb_func_start sub_8100A50 -sub_8100A50: @ 8100A50 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08100A6A - adds r0, r5, 0 - movs r1, 0x1 - bl StartSpriteAnim -_08100A6A: - ldr r0, =sub_81009DC - str r0, [r5, 0x1C] - ldr r4, =gBattleAnimArgs - movs r0, 0 - ldrsh r1, [r4, r0] - adds r0, r5, 0 - bl sub_80A6864 - ldrh r0, [r4, 0x2] - ldrh r1, [r5, 0x22] - adds r0, r1 - strh r0, [r5, 0x22] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100A50 - - thumb_func_start sub_8100A94 -sub_8100A94: @ 8100A94 - push {r4,lr} - adds r4, r0, 0 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x2] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x8] - strh r0, [r4, 0x34] - ldrh r0, [r1, 0xA] - strh r0, [r4, 0x38] - ldrb r1, [r1, 0xC] - adds r0, r4, 0 - bl StartSpriteAffineAnim - ldr r1, =move_anim_8074EE0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A66DC - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100A94 - - thumb_func_start sub_8100AE0 -sub_8100AE0: @ 8100AE0 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08100B14 - ldrh r0, [r5, 0x22] - adds r0, 0x8 - strh r0, [r5, 0x22] -_08100B14: - ldr r0, =sub_8100CCC - str r0, [r5, 0x1C] - ldr r0, =gBattleAnimArgs - movs r2, 0x4 - ldrsh r1, [r0, r2] - adds r3, r0, 0 - cmp r1, 0 - bne _08100B3C - ldrh r0, [r3] - ldrh r1, [r5, 0x20] - adds r0, r1 - strh r0, [r5, 0x20] - b _08100B50 - .pool -_08100B3C: - ldrh r0, [r5, 0x20] - ldrh r1, [r3] - subs r0, r1 - strh r0, [r5, 0x20] - adds r2, r5, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] -_08100B50: - ldrh r0, [r3, 0x2] - ldrh r2, [r5, 0x22] - adds r0, r2 - strh r0, [r5, 0x22] - ldr r1, =0xfffffc00 - adds r0, r1, 0 - ldrh r2, [r5, 0x30] - adds r1, r0, r2 - strh r1, [r5, 0x30] - movs r2, 0x80 - lsls r2, 3 - adds r0, r2, 0 - ldrh r2, [r5, 0x32] - adds r0, r2 - strh r0, [r5, 0x32] - ldrh r0, [r3, 0x4] - strh r0, [r5, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _08100B7E - negs r0, r1 - strh r0, [r5, 0x30] -_08100B7E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100AE0 - - thumb_func_start sub_8100B88 -sub_8100B88: @ 8100B88 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0x6 - ldrsh r0, [r0, r1] - cmp r0, 0x1 - beq _08100BA8 - cmp r0, 0x1 - ble _08100C24 - cmp r0, 0x2 - beq _08100BC8 - b _08100C24 - .pool -_08100BA8: - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r4, 0x2 - eors r0, r4 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r7, r0, 24 - ldrb r0, [r5] - eors r4, r0 - adds r0, r4, 0 - b _08100C34 - .pool -_08100BC8: - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r7, r0, 24 - ldrb r0, [r5] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r4, r0, 24 - ldrb r0, [r5] - movs r2, 0x2 - mov r8, r2 - mov r1, r8 - eors r0, r1 - bl IsBattlerSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _08100C3E - ldrb r0, [r5] - mov r2, r8 - eors r0, r2 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, r7 - lsrs r7, r0, 1 - ldrb r0, [r5] - mov r1, r8 - eors r0, r1 - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, r4 - lsrs r4, r0, 1 - b _08100C3E - .pool -_08100C24: - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r7, r0, 24 - ldrb r0, [r4] -_08100C34: - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r4, r0, 24 -_08100C3E: - strh r7, [r6, 0x20] - strh r4, [r6, 0x22] - ldr r0, =gBattleAnimTarget - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08100C56 - ldrh r0, [r6, 0x22] - adds r0, 0x8 - strh r0, [r6, 0x22] -_08100C56: - ldr r0, =sub_8100CCC - str r0, [r6, 0x1C] - ldr r0, =gBattleAnimArgs - movs r2, 0x4 - ldrsh r1, [r0, r2] - adds r3, r0, 0 - cmp r1, 0 - bne _08100C7C - ldrh r0, [r3] - ldrh r1, [r6, 0x20] - adds r0, r1 - strh r0, [r6, 0x20] - b _08100C90 - .pool -_08100C7C: - ldrh r0, [r6, 0x20] - ldrh r1, [r3] - subs r0, r1 - strh r0, [r6, 0x20] - adds r2, r6, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] -_08100C90: - ldrh r0, [r3, 0x2] - ldrh r2, [r6, 0x22] - adds r0, r2 - strh r0, [r6, 0x22] - ldr r1, =0xfffffc00 - adds r0, r1, 0 - ldrh r2, [r6, 0x30] - adds r1, r0, r2 - strh r1, [r6, 0x30] - movs r2, 0x80 - lsls r2, 3 - adds r0, r2, 0 - ldrh r2, [r6, 0x32] - adds r0, r2 - strh r0, [r6, 0x32] - ldrh r0, [r3, 0x4] - strh r0, [r6, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _08100CBE - negs r0, r1 - strh r0, [r6, 0x30] -_08100CBE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100B88 - - thumb_func_start sub_8100CCC -sub_8100CCC: @ 8100CCC - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x30] - ldrh r2, [r4, 0x34] - adds r0, r1, r2 - strh r0, [r4, 0x34] - ldrh r0, [r4, 0x32] - ldrh r2, [r4, 0x36] - adds r0, r2 - strh r0, [r4, 0x36] - movs r2, 0x38 - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08100CEE - adds r0, r1, 0 - adds r0, 0x18 - b _08100CF2 -_08100CEE: - adds r0, r1, 0 - subs r0, 0x18 -_08100CF2: - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x32] - subs r0, 0x18 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 24 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x36] - lsls r0, 16 - asrs r0, 24 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x14 - bne _08100D28 - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - movs r0, 0x3 - strh r0, [r4, 0x2E] - ldr r0, =WaitAnimForDuration - str r0, [r4, 0x1C] -_08100D28: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100CCC - - thumb_func_start sub_8100D38 -sub_8100D38: @ 8100D38 - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r1, [r5, 0x32] - movs r2, 0x32 - ldrsh r0, [r5, r2] - cmp r0, 0x1 - ble _08100DDC - ldrh r1, [r5, 0x34] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08100D94 - adds r3, r5, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r2, 0x5 - negs r2, r2 - adds r0, r2, 0 - ands r0, r1 - strb r0, [r3] - ldr r4, =gSprites - movs r0, 0x2E - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r3, [r0] - adds r1, r2, 0 - ands r1, r3 - strb r1, [r0] - movs r0, 0x30 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r1, [r0] - ands r2, r1 - strb r2, [r0] - b _08100DCA - .pool -_08100D94: - adds r1, r5, 0 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - ldr r3, =gSprites - movs r0, 0x2E - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r2 - strb r1, [r0] - movs r0, 0x30 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r2 - strb r1, [r0] -_08100DCA: - movs r0, 0 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x34] - adds r0, 0x1 - strh r0, [r5, 0x34] - b _08100DE0 - .pool -_08100DDC: - adds r0, r1, 0x1 - strh r0, [r5, 0x32] -_08100DE0: - movs r1, 0x34 - ldrsh r0, [r5, r1] - cmp r0, 0xA - bne _08100E10 - movs r2, 0x2E - ldrsh r1, [r5, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r4, =gSprites - adds r0, r4 - bl DestroySprite - movs r0, 0x30 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl DestroySprite - adds r0, r5, 0 - bl DestroyAnimSprite -_08100E10: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100D38 - - thumb_func_start sub_8100E1C -sub_8100E1C: @ 8100E1C - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, =gBattleAnimArgs - ldrh r0, [r4, 0x4] - strh r0, [r5, 0x2E] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08100E44 - ldrh r0, [r5, 0x20] - ldrh r1, [r4] - subs r0, r1 - b _08100E4A - .pool -_08100E44: - ldrh r0, [r4] - ldrh r1, [r5, 0x20] - adds r0, r1 -_08100E4A: - strh r0, [r5, 0x20] - ldr r4, =gBattleAnimArgs - ldrb r1, [r4, 0xA] - adds r0, r5, 0 - bl StartSpriteAnim - ldrh r0, [r4, 0x6] - negs r0, r0 - strh r0, [r5, 0x30] - ldrh r0, [r4, 0x2] - ldrh r1, [r5, 0x22] - adds r0, r1 - strh r0, [r5, 0x22] - ldrh r0, [r4, 0x8] - strh r0, [r5, 0x34] - ldr r1, =sub_8100E80 - str r1, [r5, 0x1C] - adds r0, r5, 0 - bl _call_via_r1 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100E1C - - thumb_func_start sub_8100E80 -sub_8100E80: @ 8100E80 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x64 - bl Cos - strh r0, [r4, 0x24] - movs r2, 0x2E - ldrsh r0, [r4, r2] - movs r1, 0x14 - bl Sin - strh r0, [r4, 0x26] - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x7F - bgt _08100EAC - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0 - b _08100EB2 -_08100EAC: - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0xE -_08100EB2: - strb r0, [r1] - ldrh r0, [r4, 0x30] - ldrh r2, [r4, 0x2E] - adds r0, r2 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x38] - adds r0, 0x82 - strh r0, [r4, 0x38] - lsls r0, 16 - asrs r0, 24 - ldrh r1, [r4, 0x26] - adds r0, r1 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x34 - ldrsh r1, [r4, r2] - cmp r0, r1 - bne _08100EE8 - adds r0, r4, 0 - bl DestroyAnimSprite -_08100EE8: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8100E80 - - thumb_func_start sub_8100EF0 -sub_8100EF0: @ 8100EF0 - push {r4-r6,lr} - adds r5, r0, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _08100F06 - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0x2] - adds r0, 0x8 - strh r0, [r1, 0x2] -_08100F06: - ldr r6, =gBattleAnimAttacker - ldrb r0, [r6] - movs r1, 0 - bl GetBattlerSpriteCoord2 - lsls r0, 24 - ldr r4, =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4] - adds r0, r1 - strh r0, [r5, 0x20] - ldrb r0, [r6] - movs r1, 0x1 - bl GetBattlerSpriteCoord2 - lsls r0, 24 - lsrs r0, 24 - ldrh r4, [r4, 0x2] - adds r0, r4 - strh r0, [r5, 0x22] - ldrb r0, [r6] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08100F44 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _08100F6C -_08100F44: - ldrb r0, [r6] - bl sub_80A8328 - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - movs r1, 0x3 - ands r0, r1 - lsls r0, 2 - ldrb r2, [r5, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r5, 0x5] - b _08100F84 - .pool -_08100F6C: - ldrb r0, [r6] - bl sub_80A8328 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r5, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r5, 0x5] -_08100F84: - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x4] - strh r0, [r5, 0x2E] - ldr r0, =0x00002828 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 20 - movs r1, 0x80 - lsls r1, 1 - adds r0, r1 - strh r0, [r5, 0x32] - movs r4, 0x10 - movs r0, 0x10 - strh r0, [r5, 0x3C] - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - ldrh r0, [r5, 0x3C] - lsls r1, r0, 8 - subs r4, r0 - orrs r1, r4 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - ldr r0, =sub_8100FD4 - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100EF0 - - thumb_func_start sub_8100FD4 -sub_8100FD4: @ 8100FD4 - push {r4-r6,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x38] - adds r0, 0x60 - strh r0, [r4, 0x38] - lsls r0, 16 - asrs r0, 24 - negs r0, r0 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08101032 - movs r0, 0 - strh r0, [r4, 0x30] - ldr r1, =gPlttBufferFaded - movs r2, 0x32 - ldrsh r0, [r4, r2] - adds r0, 0x1 - lsls r0, 1 - adds r0, r1 - ldrh r5, [r0] - movs r2, 0 - adds r6, r1, 0 - adds r3, r6, 0 -_0810100C: - movs r1, 0x32 - ldrsh r0, [r4, r1] - adds r2, 0x1 - adds r0, r2 - lsls r1, r0, 1 - adds r1, r3 - adds r0, 0x1 - lsls r0, 1 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r1] - cmp r2, 0x5 - ble _0810100C - movs r2, 0x32 - ldrsh r0, [r4, r2] - adds r0, 0x7 - lsls r0, 1 - adds r0, r6 - strh r5, [r0] -_08101032: - ldrh r2, [r4, 0x3C] - movs r1, 0x3C - ldrsh r0, [r4, r1] - cmp r0, 0x6 - ble _0810106C - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - ble _08101080 - ldrh r0, [r4, 0x3A] - adds r0, 0x1 - strh r0, [r4, 0x3A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _0810106C - movs r0, 0 - strh r0, [r4, 0x3A] - subs r2, 0x1 - strh r2, [r4, 0x3C] - lsls r1, r2, 8 - movs r0, 0x10 - subs r0, r2 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg -_0810106C: - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _08101080 - subs r0, r1, 0x1 - strh r0, [r4, 0x2E] - b _081010C2 - .pool -_08101080: - ldrh r0, [r4, 0x3A] - adds r0, 0x1 - strh r0, [r4, 0x3A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _081010C2 - movs r0, 0 - strh r0, [r4, 0x3A] - ldrh r2, [r4, 0x3C] - adds r2, 0x1 - strh r2, [r4, 0x3C] - lsls r1, r2, 8 - movs r0, 0x10 - subs r0, r2 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0x3C - ldrsh r0, [r4, r1] - cmp r0, 0x10 - bne _081010C2 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, =sub_80A67F4 - str r0, [r4, 0x1C] -_081010C2: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8100FD4 - - thumb_func_start sub_81010CC -sub_81010CC: @ 81010CC - push {r4-r6,lr} - adds r4, r0, 0 - ldr r6, =gBattleAnimTarget - ldrb r0, [r6] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - movs r5, 0 - strh r0, [r4, 0x20] - ldrb r0, [r6] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldr r1, =0x0000ffe8 - adds r0, r1 - strh r0, [r4, 0x22] - strh r5, [r4, 0x2E] - strh r5, [r4, 0x30] - strh r5, [r4, 0x32] - strh r5, [r4, 0x34] - strh r5, [r4, 0x36] - strh r5, [r4, 0x3A] - movs r0, 0x10 - strh r0, [r4, 0x3C] - movs r1, 0xFD - lsls r1, 6 - movs r0, 0x50 - bl SetGpuReg - ldrh r1, [r4, 0x3C] - lsls r1, 8 - ldrh r0, [r4, 0x3A] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - ldr r0, =sub_8101138 - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81010CC - - thumb_func_start sub_8101138 -sub_8101138: @ 8101138 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bls _08101146 - b _08101290 -_08101146: - lsls r0, 2 - ldr r1, =_08101154 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08101154: - .4byte _08101168 - .4byte _081011CC - .4byte _081011E8 - .4byte _08101266 - .4byte _0810127A -_08101168: - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - cmp r0, 0 - bgt _08101176 - b _08101290 -_08101176: - movs r0, 0 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08101198 - ldrh r1, [r4, 0x3A] - movs r2, 0x3A - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _081011A6 - adds r0, r1, 0x1 - strh r0, [r4, 0x3A] - b _081011A6 -_08101198: - ldrh r1, [r4, 0x3C] - movs r2, 0x3C - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _081011A6 - subs r0, r1, 0x1 - strh r0, [r4, 0x3C] -_081011A6: - ldrh r1, [r4, 0x3C] - lsls r1, 8 - ldrh r0, [r4, 0x3A] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0x3A - ldrsh r0, [r4, r1] - cmp r0, 0x10 - bne _08101290 - movs r2, 0x3C - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08101290 - strh r0, [r4, 0x30] - b _08101272 -_081011CC: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _08101290 - movs r0, 0 - strh r0, [r4, 0x30] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim - b _08101272 -_081011E8: - adds r0, r4, 0 - movs r1, 0x10 - movs r2, 0x4 - bl sub_8101298 - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _0810120A - movs r0, 0 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x22] - adds r0, 0x1 - strh r0, [r4, 0x22] -_0810120A: - ldrh r0, [r4, 0x32] - adds r1, r0, 0x1 - strh r1, [r4, 0x32] - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x1D - ble _08101290 - movs r0, 0x1 - ands r1, r0 - cmp r1, 0 - beq _08101230 - ldrh r1, [r4, 0x3A] - movs r2, 0x3A - ldrsh r0, [r4, r2] - cmp r0, 0 - ble _0810123E - subs r0, r1, 0x1 - strh r0, [r4, 0x3A] - b _0810123E -_08101230: - ldrh r1, [r4, 0x3C] - movs r2, 0x3C - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _0810123E - adds r0, r1, 0x1 - strh r0, [r4, 0x3C] -_0810123E: - ldrh r1, [r4, 0x3C] - lsls r1, 8 - ldrh r0, [r4, 0x3A] - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r0, 0x3A - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _08101290 - movs r2, 0x3C - ldrsh r0, [r4, r2] - cmp r0, 0x10 - bne _08101290 - strh r1, [r4, 0x30] - strh r1, [r4, 0x32] - b _08101272 -_08101266: - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] -_08101272: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _08101290 -_0810127A: - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - adds r0, r4, 0 - bl DestroyAnimSprite -_08101290: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8101138 - - thumb_func_start sub_8101298 -sub_8101298: @ 8101298 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0xB - bgt _081012AA - ldrh r0, [r4, 0x36] - adds r0, 0x2 - strh r0, [r4, 0x36] -_081012AA: - ldrh r5, [r4, 0x34] - adds r0, r5, 0 - subs r0, 0x12 - lsls r0, 16 - lsrs r0, 16 - adds r1, r5, 0 - cmp r0, 0x17 - bhi _081012C0 - ldrh r0, [r4, 0x36] - subs r0, 0x2 - strh r0, [r4, 0x36] -_081012C0: - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x2F - ble _081012CE - ldrh r0, [r4, 0x36] - adds r0, 0x2 - strh r0, [r4, 0x36] -_081012CE: - movs r1, 0x36 - ldrsh r0, [r4, r1] - movs r1, 0x9 - bl __divsi3 - strh r0, [r4, 0x24] - movs r1, 0x36 - ldrsh r0, [r4, r1] - movs r1, 0xE - bl __divsi3 - strh r0, [r4, 0x26] - lsls r0, 16 - cmp r0, 0 - bge _081012F4 - movs r1, 0x26 - ldrsh r0, [r4, r1] - negs r0, r0 - strh r0, [r4, 0x26] -_081012F4: - adds r0, r5, 0x1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3B - ble _08101304 - movs r0, 0 - strh r0, [r4, 0x34] -_08101304: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8101298 - - thumb_func_start sub_810130C -sub_810130C: @ 810130C - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _08101320 - adds r0, r4, 0 - bl sub_80A6838 -_08101320: - movs r0, 0 - ldrsh r1, [r5, r0] - adds r0, r4, 0 - bl sub_80A6864 - ldrh r0, [r5, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldrh r0, [r5, 0xA] - strh r0, [r4, 0x2E] - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x30] - ldrh r0, [r5, 0x8] - strh r0, [r4, 0x32] - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A656C - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810130C - - thumb_func_start sub_810135C -sub_810135C: @ 810135C - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08101378 - ldr r0, =gBattleAnimAttacker - b _0810137A - .pool -_08101378: - ldr r0, =gBattleAnimTarget -_0810137A: - ldrb r6, [r0] - bl IsDoubleBattle - lsls r0, 24 - cmp r0, 0 - beq _081013C4 - movs r1, 0x2 - adds r0, r6, 0 - eors r0, r1 - bl IsBattlerSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _081013C4 - ldr r4, =gBattleAnimArgs - ldrb r1, [r4, 0xC] - adds r2, r5, 0 - adds r2, 0x20 - adds r3, r5, 0 - adds r3, 0x22 - adds r0, r6, 0 - bl SetAverageBattlerPositions - movs r2, 0 - ldrsh r1, [r4, r2] - adds r0, r5, 0 - bl sub_80A6864 - ldrh r0, [r4, 0x2] - ldrh r1, [r5, 0x22] - adds r0, r1 - strh r0, [r5, 0x22] - b _08101414 - .pool -_081013C4: - ldr r4, =gBattleAnimArgs - movs r2, 0xC - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _081013E8 - adds r0, r6, 0 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - adds r0, r6, 0 - movs r1, 0x1 - b _081013FA - .pool -_081013E8: - adds r0, r6, 0 - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - adds r0, r6, 0 - movs r1, 0x3 -_081013FA: - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r4, [r4, 0x2] - adds r0, r4 - strh r0, [r5, 0x22] - ldr r0, =gBattleAnimArgs - movs r2, 0 - ldrsh r1, [r0, r2] - adds r0, r5, 0 - bl sub_80A6864 -_08101414: - ldr r1, =gBattleAnimArgs - ldrh r0, [r1, 0xA] - strh r0, [r5, 0x2E] - ldrh r0, [r1, 0x6] - strh r0, [r5, 0x30] - ldrh r0, [r1, 0x8] - strh r0, [r5, 0x32] - ldr r1, =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A656C - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810135C - - thumb_func_start sub_8101440 -sub_8101440: @ 8101440 - push {r4,lr} - adds r4, r0, 0 - bl sub_80A6838 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08101474 - ldr r0, =gBattleAnimArgs - ldrh r1, [r0] - ldrh r2, [r4, 0x20] - adds r1, r2 - strh r1, [r4, 0x20] - ldrh r0, [r0, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - b _0810148E - .pool -_08101474: - ldr r2, =gBattleAnimArgs - ldrh r0, [r4, 0x20] - ldrh r1, [r2] - subs r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r2, 0x2] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAnim -_0810148E: - ldr r0, =sub_81014A0 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101440 - - thumb_func_start sub_81014A0 -sub_81014A0: @ 81014A0 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1E - ble _081014D8 - movs r0, 0x2E - ldrsh r1, [r4, r0] - movs r0, 0x1E - subs r0, r1 - movs r1, 0x3 - bl __divsi3 - strh r0, [r4, 0x26] - movs r1, 0x30 - ldrsh r0, [r4, r1] - lsls r0, 18 - asrs r0, 16 - movs r1, 0x3 - bl Sin - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] -_081014D8: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _081014EC - adds r0, r4, 0 - bl DestroyAnimSprite -_081014EC: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81014A0 - - thumb_func_start sub_81014F4 -sub_81014F4: @ 81014F4 - push {r4,lr} - adds r4, r0, 0 - bl sub_80A6838 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _0810152C - ldr r1, =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - movs r0, 0x1 - strh r0, [r4, 0x34] - b _0810154A - .pool -_0810152C: - ldr r2, =gBattleAnimArgs - ldrh r0, [r4, 0x20] - ldrh r1, [r2] - subs r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r2, 0x2] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - ldr r0, =0x0000ffff - strh r0, [r4, 0x34] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim -_0810154A: - ldr r0, =sub_8101560 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81014F4 - - thumb_func_start sub_8101560 -sub_8101560: @ 8101560 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x28 - bl __divsi3 - negs r0, r0 - strh r0, [r4, 0x26] - movs r2, 0x36 - ldrsh r0, [r4, r2] - movs r1, 0xA - bl __divsi3 - strh r0, [r4, 0x24] - movs r1, 0x34 - ldrsh r0, [r4, r1] - lsls r0, 1 - ldrh r2, [r4, 0x36] - adds r0, r2 - strh r0, [r4, 0x36] - ldrh r0, [r4, 0x30] - ldrh r2, [r4, 0x2E] - adds r1, r0, r2 - strh r1, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3C - ble _081015A4 - adds r0, r4, 0 - bl move_anim_8074EE0 -_081015A4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8101560 - - thumb_func_start sub_81015AC -sub_81015AC: @ 81015AC - push {lr} - ldrh r1, [r0, 0x20] - subs r1, 0x20 - strh r1, [r0, 0x20] - ldrh r1, [r0, 0x22] - subs r1, 0x20 - strh r1, [r0, 0x22] - movs r1, 0x14 - strh r1, [r0, 0x2E] - ldr r1, =WaitAnimForDuration - str r1, [r0, 0x1C] - ldr r1, =sub_81015D4 - bl StoreSpriteCallbackInData6 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81015AC - - thumb_func_start sub_81015D4 -sub_81015D4: @ 81015D4 - push {r4-r6,lr} - adds r5, r0, 0 - ldrh r6, [r5, 0x38] - movs r1, 0x1 - adds r0, r1, 0 - ands r0, r6 - cmp r0, 0 - beq _081015EA - cmp r0, 0x1 - beq _08101604 - b _0810166A -_081015EA: - strh r1, [r5, 0x2E] - ldr r0, =WaitAnimForDuration - str r0, [r5, 0x1C] - ldr r1, =sub_81015D4 - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - b _0810166A - .pool -_08101604: - ldrh r3, [r5, 0x24] - ldrh r0, [r5, 0x20] - adds r3, r0 - movs r0, 0 - strh r3, [r5, 0x20] - ldrh r4, [r5, 0x26] - ldrh r1, [r5, 0x22] - adds r4, r1 - strh r4, [r5, 0x22] - strh r0, [r5, 0x26] - strh r0, [r5, 0x24] - movs r0, 0x8 - strh r0, [r5, 0x2E] - ldr r2, =gUnknown_08592CD0 - lsls r0, r6, 16 - asrs r0, 24 - lsls r0, 1 - adds r1, r0, r2 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - adds r3, r1 - strh r3, [r5, 0x32] - adds r2, 0x1 - adds r0, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r4, r0 - strh r4, [r5, 0x36] - ldr r0, =StartAnimLinearTranslation - str r0, [r5, 0x1C] - ldr r1, =sub_8101684 - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - movs r1, 0x80 - lsls r1, 1 - adds r0, r1, 0 - ldrh r1, [r5, 0x38] - adds r0, r1 - strh r0, [r5, 0x38] - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0xD2 - bl PlaySE12WithPanning -_0810166A: - ldrh r0, [r5, 0x38] - movs r1, 0x1 - eors r0, r1 - strh r0, [r5, 0x38] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81015D4 - - thumb_func_start sub_8101684 -sub_8101684: @ 8101684 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x38] - lsls r0, 16 - asrs r0, 24 - cmp r0, 0x4 - bne _081016AC - movs r0, 0xA - strh r0, [r2, 0x2E] - ldr r0, =WaitAnimForDuration - str r0, [r2, 0x1C] - ldr r1, =sub_81016B8 - adds r0, r2, 0 - bl StoreSpriteCallbackInData6 - b _081016B0 - .pool -_081016AC: - ldr r0, =sub_81015D4 - str r0, [r2, 0x1C] -_081016B0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101684 - - thumb_func_start sub_81016B8 -sub_81016B8: @ 81016B8 - push {r4-r7,lr} - adds r5, r0, 0 - ldrh r1, [r5, 0x6] - cmp r1, 0 - bne _081016E0 - movs r0, 0x3 - strh r0, [r5, 0x2E] - strh r1, [r5, 0x30] - strh r1, [r5, 0x32] - ldr r0, =WaitAnimForDuration - str r0, [r5, 0x1C] - ldr r1, =sub_8101774 - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - b _08101760 - .pool -_081016E0: - ldrh r0, [r5, 0x6] - cmp r0, 0x2 - beq _08101700 - cmp r0, 0x2 - bgt _081016F0 - cmp r0, 0x1 - beq _081016F6 - b _08101714 -_081016F0: - cmp r0, 0x3 - beq _08101708 - b _08101714 -_081016F6: - ldr r6, =0x0000fff8 - adds r7, r6, 0 - b _08101718 - .pool -_08101700: - ldr r7, =0x0000fff8 - b _08101716 - .pool -_08101708: - movs r7, 0x8 - ldr r6, =0x0000fff8 - b _08101718 - .pool -_08101714: - movs r7, 0x8 -_08101716: - movs r6, 0x8 -_08101718: - ldrh r0, [r5, 0x24] - ldrh r1, [r5, 0x20] - adds r0, r1 - movs r1, 0 - strh r0, [r5, 0x20] - ldrh r0, [r5, 0x26] - ldrh r2, [r5, 0x22] - adds r0, r2 - strh r0, [r5, 0x22] - strh r1, [r5, 0x26] - strh r1, [r5, 0x24] - movs r0, 0x6 - strh r0, [r5, 0x2E] - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, r7 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, r6 - strh r0, [r5, 0x36] - ldr r0, =StartAnimLinearTranslation - str r0, [r5, 0x1C] - ldr r1, =sub_8101820 - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 -_08101760: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81016B8 - - thumb_func_start sub_8101774 -sub_8101774: @ 8101774 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08101794 - ldrh r0, [r4, 0x30] - adds r0, 0x3 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - ble _081017A4 - movs r0, 0x10 - b _081017A2 -_08101794: - ldrh r0, [r4, 0x30] - subs r0, 0x3 - strh r0, [r4, 0x30] - lsls r0, 16 - cmp r0, 0 - bge _081017A4 - movs r0, 0 -_081017A2: - strh r0, [r4, 0x30] -_081017A4: - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0x1 - movs r3, 0x1 - bl sub_80A75AC - ldrh r1, [r4, 0x30] - lsls r1, 24 - lsrs r1, 24 - ldr r2, =0x00007fff - bl BlendPalettes - movs r3, 0x30 - ldrsh r0, [r4, r3] - cmp r0, 0x10 - bne _0810180C - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - ldrb r1, [r4, 0x5] - lsrs r1, 4 - lsls r0, r1, 5 - ldr r2, =gPlttBufferUnfaded + 0x210 - adds r0, r2 - lsls r1, 4 - ldr r3, =0x00000101 - adds r2, r3, 0 - orrs r1, r2 - movs r2, 0x4 - bl LoadPalette - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0xC0 - bl PlaySE12WithPanning - b _08101814 - .pool -_0810180C: - cmp r0, 0 - bne _08101814 - ldr r0, =sub_8101820 - str r0, [r4, 0x1C] -_08101814: - add sp, 0xC - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101774 - - thumb_func_start sub_8101820 -sub_8101820: @ 8101820 - push {lr} - adds r2, r0, 0 - ldr r0, =gBattleAnimArgs - ldrh r1, [r0, 0xE] - ldr r0, =0x0000ffff - cmp r1, r0 - bne _08101838 - movs r0, 0 - strh r0, [r2, 0x30] - strh r0, [r2, 0x2E] - ldr r0, =sub_8101848 - str r0, [r2, 0x1C] -_08101838: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101820 - - thumb_func_start sub_8101848 -sub_8101848: @ 8101848 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _0810187C - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_0810187C: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - movs r1, 0x30 - ldrsh r0, [r4, r1] - cmp r0, 0x8 - bne _08101890 - adds r0, r4, 0 - bl DestroyAnimSprite -_08101890: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8101848 - - thumb_func_start sub_8101898 -sub_8101898: @ 8101898 - push {r4,lr} - adds r3, r0, 0 - ldr r0, =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r3, 0x6] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _081018BC - ldrh r0, [r3, 0x20] - subs r0, 0x18 - strh r0, [r3, 0x20] - ldrh r0, [r3, 0x22] - subs r0, 0x18 - strh r0, [r3, 0x22] - b _0810190E - .pool -_081018BC: - cmp r0, 0x2 - bne _081018D8 - ldrh r0, [r3, 0x20] - subs r0, 0x18 - strh r0, [r3, 0x20] - ldrh r0, [r3, 0x22] - adds r0, 0x18 - strh r0, [r3, 0x22] - ldrb r1, [r3, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r1 - movs r1, 0x20 - b _0810190A -_081018D8: - cmp r0, 0x3 - bne _081018F4 - ldrh r0, [r3, 0x20] - adds r0, 0x18 - strh r0, [r3, 0x20] - ldrh r0, [r3, 0x22] - subs r0, 0x18 - strh r0, [r3, 0x22] - ldrb r1, [r3, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r1 - movs r1, 0x10 - b _0810190A -_081018F4: - ldrh r0, [r3, 0x20] - adds r0, 0x18 - strh r0, [r3, 0x20] - ldrh r0, [r3, 0x22] - adds r0, 0x18 - strh r0, [r3, 0x22] - ldrb r1, [r3, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r1 - movs r1, 0x30 -_0810190A: - orrs r0, r1 - strb r0, [r3, 0x3] -_0810190E: - ldrh r2, [r3, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - adds r1, 0x10 - ldr r4, =0x000003ff - adds r0, r4, 0 - ands r1, r0 - ldr r0, =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - ldr r1, =sub_81015AC - str r1, [r3, 0x1C] - adds r0, r3, 0 - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101898 - - thumb_func_start sub_8101940 -sub_8101940: @ 8101940 - push {lr} - adds r3, r0, 0 - adds r2, r3, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - movs r0, 0 - strh r0, [r3, 0x2E] - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0x1 - beq _0810197C - cmp r0, 0x1 - bgt _0810196C - cmp r0, 0 - beq _08101972 - b _0810198C - .pool -_0810196C: - cmp r0, 0x2 - beq _08101984 - b _0810198C -_08101972: - ldr r0, =sub_8101998 - b _0810198E - .pool -_0810197C: - ldr r0, =sub_8101A74 - b _0810198E - .pool -_08101984: - ldr r0, =sub_8101AC4 - b _0810198E - .pool -_0810198C: - ldr r0, =sub_8101B84 -_0810198E: - str r0, [r3, 0x1C] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101940 - - thumb_func_start sub_8101998 -sub_8101998: @ 8101998 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x6 - strh r0, [r4, 0x2E] - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - bl GetBattlerSide - lsls r0, 24 - movs r2, 0x2 - negs r2, r2 - adds r1, r2, 0 - cmp r0, 0 - beq _081019B6 - movs r1, 0x2 -_081019B6: - strh r1, [r4, 0x30] - movs r0, 0 - strh r0, [r4, 0x32] - ldr r1, =gBattlerSpriteIds - ldrb r0, [r5] - adds r0, r1 - ldrb r0, [r0] - strh r0, [r4, 0x34] - ldr r1, =sub_81019E8 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A6630 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101998 - - thumb_func_start sub_81019E8 -sub_81019E8: @ 81019E8 - push {r4-r6,lr} - adds r5, r0, 0 - movs r0, 0x2E - ldrsh r6, [r5, r0] - cmp r6, 0 - bne _08101A24 - ldr r1, =gBattlerSpriteIds - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - adds r0, r1 - ldrb r0, [r0] - strh r0, [r5, 0x34] - movs r1, 0 - bl sub_80A7270 - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x3A] - ldr r2, =0xfffffd00 - adds r1, r2, 0 - cmp r0, 0 - beq _08101A20 - movs r0, 0xC0 - lsls r0, 2 - adds r1, r0, 0 -_08101A20: - strh r1, [r5, 0x36] - strh r6, [r5, 0x38] -_08101A24: - ldrh r0, [r5, 0x36] - ldrh r1, [r5, 0x38] - adds r0, r1 - strh r0, [r5, 0x38] - ldrh r0, [r5, 0x34] - lsls r0, 24 - lsrs r0, 24 - movs r2, 0x80 - lsls r2, 1 - ldrh r3, [r5, 0x38] - adds r1, r2, 0 - bl obj_id_set_rotscale - ldrh r0, [r5, 0x34] - lsls r0, 24 - lsrs r0, 24 - bl sub_80A73A0 - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _08101A5E - movs r0, 0 - strh r0, [r5, 0x2E] - ldr r0, =sub_8101B84 - str r0, [r5, 0x1C] -_08101A5E: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81019E8 - - thumb_func_start sub_8101A74 -sub_8101A74: @ 8101A74 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x4 - strh r0, [r4, 0x2E] - ldr r5, =gBattleAnimAttacker - ldrb r0, [r5] - bl GetBattlerSide - lsls r0, 24 - movs r1, 0x3 - cmp r0, 0 - beq _08101A92 - movs r0, 0x3 - negs r0, r0 - adds r1, r0, 0 -_08101A92: - strh r1, [r4, 0x30] - movs r0, 0 - strh r0, [r4, 0x32] - ldr r1, =gBattlerSpriteIds - ldrb r0, [r5] - adds r0, r1 - ldrb r0, [r0] - strh r0, [r4, 0x34] - ldr r1, =sub_8101B84 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A6630 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101A74 - - thumb_func_start sub_8101AC4 -sub_8101AC4: @ 8101AC4 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _08101ADE - movs r0, 0 - strh r0, [r1, 0x2E] - ldr r0, =sub_8101AE8 - str r0, [r1, 0x1C] -_08101ADE: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101AC4 - - thumb_func_start sub_8101AE8 -sub_8101AE8: @ 8101AE8 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _08101B38 - ldr r1, =gBattlerSpriteIds - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - adds r0, r1 - ldrb r0, [r0] - strh r0, [r5, 0x34] - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x3A] - ldrb r0, [r4] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - beq _08101B2C - movs r0, 0xFC - lsls r0, 8 - strh r0, [r5, 0x36] - movs r0, 0xC0 - lsls r0, 4 - b _08101B36 - .pool -_08101B2C: - movs r0, 0x80 - lsls r0, 3 - strh r0, [r5, 0x36] - movs r0, 0xF4 - lsls r0, 8 -_08101B36: - strh r0, [r5, 0x38] -_08101B38: - ldrh r0, [r5, 0x36] - ldrh r1, [r5, 0x38] - adds r0, r1 - strh r0, [r5, 0x38] - ldrh r0, [r5, 0x34] - lsls r0, 24 - lsrs r0, 24 - movs r2, 0x80 - lsls r2, 1 - ldrh r3, [r5, 0x38] - adds r1, r2, 0 - bl obj_id_set_rotscale - ldrh r0, [r5, 0x34] - lsls r0, 24 - lsrs r0, 24 - bl sub_80A73A0 - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _08101B78 - ldrh r0, [r5, 0x34] - lsls r0, 24 - lsrs r0, 24 - bl sub_80A7344 - ldr r0, =sub_8101B84 - str r0, [r5, 0x1C] -_08101B78: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101AE8 - - thumb_func_start sub_8101B84 -sub_8101B84: @ 8101B84 - push {lr} - bl DestroyAnimSprite - pop {r0} - bx r0 - thumb_func_end sub_8101B84 - - thumb_func_start sub_8101B90 -sub_8101B90: @ 8101B90 - movs r1, 0 - strh r1, [r0, 0x2E] - ldr r1, =sub_8101BA0 - str r1, [r0, 0x1C] - bx lr - .pool - thumb_func_end sub_8101B90 - - thumb_func_start sub_8101BA0 -sub_8101BA0: @ 8101BA0 - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x2E - ldrsh r5, [r4, r0] - cmp r5, 0x1 - beq _08101BFA - cmp r5, 0x1 - bgt _08101BB6 - cmp r5, 0 - beq _08101BBC - b _08101C8E -_08101BB6: - cmp r5, 0x2 - beq _08101C4C - b _08101C8E -_08101BBC: - strh r5, [r4, 0x30] - ldr r1, =gBattlerSpriteIds - ldr r2, =gBattleAnimAttacker - ldrb r0, [r2] - adds r0, r1 - ldrb r0, [r0] - strh r0, [r4, 0x32] - ldrb r0, [r2] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x34] - ldr r2, =0xfffffe00 - adds r1, r2, 0 - cmp r0, 0 - beq _08101BE4 - movs r0, 0x80 - lsls r0, 2 - adds r1, r0, 0 -_08101BE4: - strh r1, [r4, 0x36] - strh r5, [r4, 0x38] - ldrh r0, [r4, 0x32] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl sub_80A7270 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] -_08101BFA: - ldrh r0, [r4, 0x36] - ldrh r1, [r4, 0x38] - adds r0, r1 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x32] - lsls r0, 24 - lsrs r0, 24 - movs r2, 0x80 - lsls r2, 1 - ldrh r3, [r4, 0x38] - adds r1, r2, 0 - bl obj_id_set_rotscale - ldrh r0, [r4, 0x32] - lsls r0, 24 - lsrs r0, 24 - bl sub_80A73A0 - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _08101C8E - movs r0, 0 - strh r0, [r4, 0x30] - movs r2, 0x36 - ldrsh r0, [r4, r2] - negs r0, r0 - strh r0, [r4, 0x36] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _08101C8E - .pool -_08101C4C: - ldrh r0, [r4, 0x36] - ldrh r1, [r4, 0x38] - adds r0, r1 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x32] - lsls r0, 24 - lsrs r0, 24 - movs r2, 0x80 - lsls r2, 1 - ldrh r3, [r4, 0x38] - adds r1, r2, 0 - bl obj_id_set_rotscale - ldrh r0, [r4, 0x32] - lsls r0, 24 - lsrs r0, 24 - bl sub_80A73A0 - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _08101C8E - ldrh r0, [r4, 0x32] - lsls r0, 24 - lsrs r0, 24 - bl sub_80A7344 - adds r0, r4, 0 - bl DestroyAnimSprite -_08101C8E: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8101BA0 - - thumb_func_start sub_8101C94 -sub_8101C94: @ 8101C94 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r5, r0, r1 - ldr r1, =gBattlerSpriteIds - ldr r2, =gBattleAnimAttacker - ldrb r0, [r2] - adds r0, r1 - ldrb r0, [r0] - movs r4, 0 - strh r0, [r5, 0x8] - ldrb r0, [r2] - bl GetBattlerSide - lsls r0, 24 - lsrs r2, r0, 24 - strh r2, [r5, 0xA] - strh r4, [r5, 0xC] - ldr r0, =gBattleAnimArgs - movs r3, 0 - ldrsh r1, [r0, r3] - cmp r1, 0 - beq _08101CE8 - cmp r1, 0x1 - beq _08101D04 - adds r0, r6, 0 - bl DestroyAnimVisualTask - b _08101D22 - .pool -_08101CE8: - strh r1, [r5, 0xC] - movs r0, 0x8 - strh r0, [r5, 0xE] - strh r1, [r5, 0x10] - movs r0, 0x3 - strh r0, [r5, 0x12] - cmp r2, 0 - bne _08101CFC - negs r0, r0 - strh r0, [r5, 0x12] -_08101CFC: - ldr r0, =sub_8101D2C - b _08101D20 - .pool -_08101D04: - movs r0, 0x8 - strh r0, [r5, 0xE] - movs r0, 0xC0 - lsls r0, 3 - strh r0, [r5, 0x10] - movs r1, 0xC0 - strh r1, [r5, 0x12] - cmp r2, 0 - bne _08101D1E - negs r0, r0 - strh r0, [r5, 0x10] - negs r0, r1 - strh r0, [r5, 0x12] -_08101D1E: - ldr r0, =sub_8101EEC -_08101D20: - str r0, [r5] -_08101D22: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101C94 - - thumb_func_start sub_8101D2C -sub_8101D2C: @ 8101D2C - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bls _08101D46 - b _08101EE6 -_08101D46: - lsls r0, 2 - ldr r1, =_08101D58 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08101D58: - .4byte _08101D6C - .4byte _08101D9E - .4byte _08101DF8 - .4byte _08101E70 - .4byte _08101EB4 -_08101D6C: - movs r2, 0xE - ldrsh r1, [r4, r2] - cmp r1, 0 - beq _08101D7C - ldrh r2, [r4, 0x12] - ldrh r3, [r4, 0x10] - adds r2, r3 - b _08101EC2 -_08101D7C: - movs r0, 0x8 - strh r0, [r4, 0xE] - strh r1, [r4, 0x10] - movs r1, 0xA - ldrsh r0, [r4, r1] - movs r1, 0xC0 - cmp r0, 0 - bne _08101D92 - movs r2, 0xC0 - negs r2, r2 - adds r1, r2, 0 -_08101D92: - strh r1, [r4, 0x12] - ldrb r0, [r4, 0x8] - movs r1, 0 - bl sub_80A7270 - b _08101EA8 -_08101D9E: - movs r3, 0xE - ldrsh r0, [r4, r3] - cmp r0, 0 - beq _08101DC4 - ldrh r0, [r4, 0x12] - ldrh r1, [r4, 0x10] - adds r0, r1 - strh r0, [r4, 0x10] - ldrb r0, [r4, 0x8] - movs r2, 0x80 - lsls r2, 1 - ldrh r3, [r4, 0x10] - adds r1, r2, 0 - bl obj_id_set_rotscale - ldrb r0, [r4, 0x8] - bl sub_80A73A0 - b _08101ED4 -_08101DC4: - movs r0, 0x8 - strh r0, [r4, 0xE] - ldr r2, =gSprites - movs r3, 0x8 - ldrsh r1, [r4, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x24] - strh r0, [r4, 0x10] - movs r1, 0xA - ldrsh r0, [r4, r1] - movs r2, 0x2 - negs r2, r2 - adds r1, r2, 0 - cmp r0, 0 - bne _08101DEA - movs r1, 0x2 -_08101DEA: - strh r1, [r4, 0x12] - movs r0, 0x1 - strh r0, [r4, 0x14] - b _08101EA8 - .pool -_08101DF8: - ldrh r2, [r4, 0xE] - movs r3, 0xE - ldrsh r0, [r4, r3] - cmp r0, 0 - beq _08101E54 - ldrh r1, [r4, 0x14] - movs r3, 0x14 - ldrsh r0, [r4, r3] - cmp r0, 0 - beq _08101E12 - subs r0, r1, 0x1 - strh r0, [r4, 0x14] - b _08101EE6 -_08101E12: - movs r0, 0x1 - ands r0, r2 - cmp r0, 0 - beq _08101E34 - ldr r2, =gSprites - movs r0, 0x8 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r4, 0x12] - ldrh r2, [r4, 0x10] - adds r1, r2 - b _08101E48 - .pool -_08101E34: - ldr r2, =gSprites - movs r3, 0x8 - ldrsh r1, [r4, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r4, 0x10] - ldrh r2, [r4, 0x12] - subs r1, r2 -_08101E48: - strh r1, [r0, 0x24] - movs r0, 0x1 - strh r0, [r4, 0x14] - b _08101ED4 - .pool -_08101E54: - ldr r2, =gSprites - movs r0, 0x8 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r4, 0x10] - strh r1, [r0, 0x24] - movs r0, 0xC - strh r0, [r4, 0xE] - b _08101EA8 - .pool -_08101E70: - ldrh r1, [r4, 0xE] - movs r2, 0xE - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _08101E80 - subs r0, r1, 0x1 - strh r0, [r4, 0xE] - b _08101EE6 -_08101E80: - movs r0, 0x3 - strh r0, [r4, 0xE] - ldr r2, =gSprites - movs r3, 0x8 - ldrsh r1, [r4, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x24] - strh r0, [r4, 0x10] - movs r1, 0xA - ldrsh r0, [r4, r1] - movs r2, 0x8 - negs r2, r2 - adds r1, r2, 0 - cmp r0, 0 - bne _08101EA6 - movs r1, 0x8 -_08101EA6: - strh r1, [r4, 0x12] -_08101EA8: - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - b _08101EE6 - .pool -_08101EB4: - movs r3, 0xE - ldrsh r0, [r4, r3] - cmp r0, 0 - beq _08101EE0 - ldrh r2, [r4, 0x12] - ldrh r0, [r4, 0x10] - adds r2, r0 -_08101EC2: - strh r2, [r4, 0x10] - ldr r3, =gSprites - movs r0, 0x8 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - strh r2, [r0, 0x24] -_08101ED4: - ldrh r0, [r4, 0xE] - subs r0, 0x1 - strh r0, [r4, 0xE] - b _08101EE6 - .pool -_08101EE0: - adds r0, r2, 0 - bl DestroyAnimVisualTask -_08101EE6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8101D2C - - thumb_func_start sub_8101EEC -sub_8101EEC: @ 8101EEC - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r1, 0xE - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08101F2C - ldrh r0, [r4, 0x10] - ldrh r1, [r4, 0x12] - subs r0, r1 - strh r0, [r4, 0x10] - ldrb r0, [r4, 0x8] - movs r2, 0x80 - lsls r2, 1 - ldrh r3, [r4, 0x10] - adds r1, r2, 0 - bl obj_id_set_rotscale - ldrb r0, [r4, 0x8] - bl sub_80A73A0 - ldrh r0, [r4, 0xE] - subs r0, 0x1 - strh r0, [r4, 0xE] - b _08101F38 - .pool -_08101F2C: - ldrb r0, [r4, 0x8] - bl sub_80A7344 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_08101F38: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8101EEC - - thumb_func_start sub_8101F40 -sub_8101F40: @ 8101F40 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _08101F5C - ldr r4, =gBattleAnimAttacker - b _08101F5E - .pool -_08101F5C: - ldr r4, =gBattleAnimTarget -_08101F5E: - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r6, 0x2] - adds r0, r1 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r6, [r6, 0x4] - adds r0, r6 - strh r0, [r5, 0x22] - movs r0, 0 - strh r0, [r5, 0x2E] - strh r0, [r5, 0x30] - ldr r1, =sub_810208C - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67D8 - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101F40 - - thumb_func_start sub_8101FA8 -sub_8101FA8: @ 8101FA8 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldr r1, =0x0000ffd0 - adds r0, r1 - strh r0, [r4, 0x20] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - ldr r1, =sub_8102044 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67D8 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101FA8 - - thumb_func_start sub_8101FF0 -sub_8101FF0: @ 8101FF0 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r5, =gBattleAnimTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gBattleAnimArgs - ldr r2, =0x0000ffd0 - adds r0, r2 - ldrh r1, [r1] - adds r0, r1 - movs r6, 0 - strh r0, [r4, 0x20] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x22] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAnim - strh r6, [r4, 0x2E] - strh r6, [r4, 0x30] - ldr r0, =sub_810208C - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8101FF0 - - thumb_func_start sub_8102044 -sub_8102044: @ 8102044 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _0810206E - movs r0, 0xC - strh r0, [r4, 0x2E] - movs r0, 0x8 - strh r0, [r4, 0x30] - movs r0, 0 - strh r0, [r4, 0x32] - ldr r1, =sub_810207C - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A653C - str r0, [r4, 0x1C] -_0810206E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102044 - - thumb_func_start sub_810207C -sub_810207C: @ 810207C - movs r1, 0 - strh r1, [r0, 0x2E] - strh r1, [r0, 0x30] - ldr r1, =sub_810208C - str r1, [r0, 0x1C] - bx lr - .pool - thumb_func_end sub_810207C - - thumb_func_start sub_810208C -sub_810208C: @ 810208C - push {lr} - adds r3, r0, 0 - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _081020D4 - movs r0, 0 - strh r0, [r3, 0x2E] - movs r0, 0x3E - adds r0, r3 - mov r12, r0 - ldrb r2, [r0] - lsrs r1, r2, 2 - movs r0, 0x1 - eors r1, r0 - ands r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldrh r0, [r3, 0x30] - adds r0, 0x1 - strh r0, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _081020D4 - adds r0, r3, 0 - bl DestroyAnimSprite -_081020D4: - pop {r0} - bx r0 - thumb_func_end sub_810208C - - thumb_func_start sub_81020D8 -sub_81020D8: @ 81020D8 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _081020F4 - ldr r4, =gBattleAnimAttacker - b _081020F6 - .pool -_081020F4: - ldr r4, =gBattleAnimTarget -_081020F6: - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r6, 0x2] - adds r0, r1 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r6, [r6, 0x4] - adds r0, r6 - strh r0, [r5, 0x22] - movs r0, 0 - strh r0, [r5, 0x2E] - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x6] - strh r0, [r5, 0x30] - ldr r0, =sub_810213C - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81020D8 - - thumb_func_start sub_810213C -sub_810213C: @ 810213C - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x30 - ldrsh r1, [r2, r3] - cmp r0, r1 - ble _0810215C - movs r0, 0 - strh r0, [r2, 0x2E] - ldrh r0, [r2, 0x22] - subs r0, 0x1 - strh r0, [r2, 0x22] -_0810215C: - ldrh r0, [r2, 0x22] - ldrh r1, [r2, 0x2E] - subs r0, r1 - strh r0, [r2, 0x22] - adds r0, r2, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _08102178 - adds r0, r2, 0 - bl DestroyAnimSprite -_08102178: - pop {r0} - bx r0 - thumb_func_end sub_810213C - - thumb_func_start sub_810217C -sub_810217C: @ 810217C - push {r4-r6,lr} - adds r4, r0, 0 - ldr r6, =gBattleAnimAttacker - ldrb r0, [r6] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - movs r5, 0 - strh r0, [r4, 0x20] - ldrb r0, [r6] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - subs r0, 0xC - strh r0, [r4, 0x22] - strh r5, [r4, 0x2E] - movs r0, 0x2 - strh r0, [r4, 0x30] - strh r5, [r4, 0x32] - strh r5, [r4, 0x34] - strh r5, [r4, 0x36] - subs r0, 0x42 - bl BattleAnimAdjustPanning - lsls r0, 24 - asrs r0, 24 - strh r0, [r4, 0x38] - ldr r0, =sub_81021CC - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810217C - - thumb_func_start sub_81021CC -sub_81021CC: @ 81021CC - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x30 - ldrsh r1, [r4, r2] - cmp r0, r1 - blt _08102238 - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsrs r1, r2, 2 - movs r0, 0x1 - eors r1, r0 - ands r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - movs r1, 0x4 - ands r0, r1 - cmp r0, 0 - bne _0810221E - ldrh r0, [r4, 0x36] - adds r0, 0x1 - strh r0, [r4, 0x36] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _0810221E - ldrh r1, [r4, 0x38] - lsls r1, 24 - asrs r1, 24 - movs r0, 0xC2 - bl PlaySE12WithPanning -_0810221E: - movs r1, 0 - strh r1, [r4, 0x2E] - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08102238 - strh r1, [r4, 0x32] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] -_08102238: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _08102262 - movs r1, 0x30 - ldrsh r0, [r4, r1] - cmp r0, 0x10 - ble _08102262 - adds r0, r4, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _08102262 - adds r0, r4, 0 - bl DestroyAnimSprite -_08102262: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81021CC - - thumb_func_start sub_8102268 -sub_8102268: @ 8102268 - push {r4-r6,lr} - adds r6, r0, 0 - movs r1, 0x2E - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _081022B2 - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r5, =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r5] - adds r0, r1 - strh r0, [r6, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r5, [r5, 0x2] - adds r0, r5 - strh r0, [r6, 0x22] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _081022AC - ldrh r0, [r6, 0x22] - adds r0, 0xA - strh r0, [r6, 0x22] -_081022AC: - ldrh r0, [r6, 0x2E] - adds r0, 0x1 - strh r0, [r6, 0x2E] -_081022B2: - ldr r0, =gBattleAnimArgs - ldrh r1, [r0, 0xE] - ldr r0, =0x0000ffff - cmp r1, r0 - bne _081022C2 - adds r0, r6, 0 - bl DestroyAnimSprite -_081022C2: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102268 - - thumb_func_start sub_81022D4 -sub_81022D4: @ 81022D4 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _08102300 - ldr r1, =gBattleAnimArgs - ldr r0, =0x0000ffff - strh r0, [r1, 0xE] - b _0810233E - .pool -_08102300: - cmp r0, 0x2 - bne _0810230C - adds r0, r2, 0 - bl DestroyAnimVisualTask - b _08102344 -_0810230C: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - bne _08102344 - movs r0, 0 - strh r0, [r4, 0x8] - ldrh r2, [r4, 0xA] - adds r2, 0x1 - strh r2, [r4, 0xA] - lsls r1, r2, 8 - movs r0, 0x10 - subs r0, r2 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0x10 - bne _08102344 -_0810233E: - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] -_08102344: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81022D4 - - thumb_func_start sub_810234C -sub_810234C: @ 810234C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0 - bl sub_80A6980 - adds r2, r4, 0 - adds r2, 0x2C - ldrb r0, [r2] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r2] - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x4] - strh r0, [r4, 0x2E] - ldr r0, =sub_810237C - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810234C - - thumb_func_start sub_810237C -sub_810237C: @ 810237C - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r1, [r5, 0x2E] - movs r2, 0x2E - ldrsh r0, [r5, r2] - cmp r0, 0 - beq _08102390 - subs r0, r1, 0x1 - strh r0, [r5, 0x2E] - b _081023CC -_08102390: - adds r2, r5, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - movs r0, 0x1E - strh r0, [r5, 0x2E] - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - ldr r0, =StartAnimLinearTranslation - str r0, [r5, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 -_081023CC: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_810237C - - thumb_func_start sub_81023E0 -sub_81023E0: @ 81023E0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - bne _08102428 - movs r0, 0 - strh r0, [r4, 0x8] - ldrh r1, [r4, 0xA] - adds r1, 0x1 - strh r1, [r4, 0xA] - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0x10 - bne _08102428 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_08102428: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81023E0 - - thumb_func_start sub_8102434 -sub_8102434: @ 8102434 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - movs r4, 0 - ldr r0, =gBattlersCount - ldrb r0, [r0] - cmp r4, r0 - bcs _08102490 - ldr r6, =gBattleAnimArgs - ldr r5, =gHealthboxSpriteIds -_08102448: - movs r1, 0 - ldrsh r0, [r6, r1] - cmp r0, 0x1 - bne _08102464 - adds r0, r4, 0 - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _08102464 - adds r0, r4, r5 - ldrb r0, [r0] - bl SetHealthboxSpriteInvisible -_08102464: - movs r1, 0x2 - ldrsh r0, [r6, r1] - cmp r0, 0x1 - bne _08102482 - adds r0, r4, 0 - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08102482 - adds r0, r4, r5 - ldrb r0, [r0] - bl SetHealthboxSpriteInvisible -_08102482: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gBattlersCount - ldrb r0, [r0] - cmp r4, r0 - bcc _08102448 -_08102490: - adds r0, r7, 0 - bl DestroyAnimVisualTask - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102434 - - thumb_func_start sub_81024A8 -sub_81024A8: @ 81024A8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - b _081024C2 -_081024B2: - ldr r0, =gHealthboxSpriteIds - adds r0, r4, r0 - ldrb r0, [r0] - bl SetHealthboxSpriteVisible - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_081024C2: - ldr r0, =gBattlersCount - ldrb r0, [r0] - cmp r4, r0 - bcc _081024B2 - adds r0, r5, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81024A8 - - thumb_func_start sub_81024E0 -sub_81024E0: @ 81024E0 - push {r4,lr} - adds r4, r0, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _081024F6 - movs r0, 0x30 - strh r0, [r4, 0x20] - movs r0, 0x28 - b _081024FE -_081024F6: - ldr r0, =gBattleAnimArgs - ldrh r1, [r0] - strh r1, [r4, 0x20] - ldrh r0, [r0, 0x2] -_081024FE: - strh r0, [r4, 0x22] - ldrb r1, [r4, 0x1] - movs r0, 0x3F - ands r0, r1 - strb r0, [r4, 0x1] - ldrb r0, [r4, 0x3] - movs r1, 0xC0 - orrs r0, r1 - strb r0, [r4, 0x3] - movs r0, 0 - strh r0, [r4, 0x2E] - ldr r0, =sub_8102528 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81024E0 - - thumb_func_start sub_8102528 -sub_8102528: @ 8102528 - push {lr} - adds r1, r0, 0 - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _0810253A - adds r0, r1, 0 - bl DestroyAnimSprite -_0810253A: - pop {r0} - bx r0 - thumb_func_end sub_8102528 - - thumb_func_start sub_8102540 -sub_8102540: @ 8102540 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r2, =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r2] - adds r0, r1 - movs r1, 0 - strh r0, [r4, 0x20] - ldrh r0, [r2, 0x2] - strh r0, [r4, 0x22] - strh r1, [r4, 0x2E] - strh r1, [r4, 0x30] - strh r1, [r4, 0x32] - strh r1, [r4, 0x34] - movs r0, 0x1 - strh r0, [r4, 0x36] - ldr r0, =sub_8102584 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102540 - - thumb_func_start sub_8102584 -sub_8102584: @ 8102584 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x30] - adds r0, 0x1 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _081025AE - movs r0, 0 - strh r0, [r1, 0x30] - ldrh r2, [r1, 0x32] - movs r3, 0x32 - ldrsh r0, [r1, r3] - cmp r0, 0x77 - bgt _081025AE - ldrh r0, [r1, 0x22] - adds r0, 0x1 - strh r0, [r1, 0x22] - adds r0, r2, 0x1 - strh r0, [r1, 0x32] -_081025AE: - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _081025BC - adds r0, r1, 0 - bl DestroyAnimSprite -_081025BC: - pop {r0} - bx r0 - thumb_func_end sub_8102584 - - thumb_func_start sub_81025C0 -sub_81025C0: @ 81025C0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - lsls r0, 24 - lsrs r7, r0, 24 - movs r4, 0 - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80A75AC - mov r8, r0 - ldr r0, =0x0000ffff - mov r1, r8 - ands r1, r0 - mov r8, r1 - ldr r0, =gTasks - mov r9, r0 - lsls r5, r7, 2 - adds r5, r7 - lsls r5, 3 - adds r6, r5, r0 - strh r4, [r6, 0x8] - strh r4, [r6, 0xA] - strh r4, [r6, 0xC] - strh r1, [r6, 0xE] - strh r4, [r6, 0x10] - strh r4, [r6, 0x12] - strh r4, [r6, 0x14] - movs r0, 0xD - strh r0, [r6, 0x16] - movs r0, 0xE - strh r0, [r6, 0x18] - movs r0, 0xF - strh r0, [r6, 0x1A] - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0x1 - movs r3, 0x1 - bl sub_80A76C4 - mov r10, r0 - mov r1, r8 - orrs r1, r0 - mov r8, r1 - movs r0, 0x8 - add r9, r0 - add r5, r9 - adds r0, r5, 0 - adds r0, 0x1C - adds r5, 0x1E - adds r1, r5, 0 - mov r2, r8 - bl sub_80A8048 - ldr r0, =0x000027d2 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - movs r4, 0x80 - lsls r4, 9 - adds r1, r4, 0 - lsls r1, r0 - mov r0, r10 - orrs r0, r1 - mov r10, r0 - ldr r0, =0x000027d3 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0 - mov r1, r10 - orrs r4, r1 - ldr r0, =0x00007fbb - str r0, [sp] - adds r0, r4, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r1, =sub_81026A8 - str r1, [r6] - adds r0, r7, 0 - bl _call_via_r1 - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81025C0 - - thumb_func_start sub_81026A8 -sub_81026A8: @ 81026A8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r0, 0x8 - ldrsh r1, [r4, r0] - cmp r1, 0x1 - beq _08102794 - cmp r1, 0x1 - bgt _081026D4 - cmp r1, 0 - beq _081026E2 - b _08102832 - .pool -_081026D4: - cmp r1, 0x2 - bne _081026DA - b _081027EC -_081026DA: - cmp r1, 0x3 - bne _081026E0 - b _08102820 -_081026E0: - b _08102832 -_081026E2: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bgt _081026F0 - b _08102832 -_081026F0: - strh r1, [r4, 0xA] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF - bgt _0810273C - ldrh r0, [r4, 0x16] - ldrh r1, [r4, 0x10] - adds r0, r1 - strh r0, [r4, 0x10] - ldrh r2, [r4, 0x18] - ldrh r3, [r4, 0x12] - adds r2, r3 - strh r2, [r4, 0x12] - ldrh r1, [r4, 0x1A] - ldrh r5, [r4, 0x14] - adds r1, r5 - strh r1, [r4, 0x14] - lsls r0, 16 - asrs r0, 19 - lsls r0, 16 - lsrs r0, 16 - lsls r2, 16 - asrs r2, 19 - lsls r2, 16 - lsls r1, 16 - asrs r1, 19 - lsls r1, 16 - lsrs r2, 11 - orrs r0, r2 - lsrs r1, 6 - orrs r0, r1 - lsls r0, 16 - lsrs r0, 16 - mov r12, r0 - b _08102746 -_0810273C: - ldr r7, =0x00007fbb - mov r12, r7 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_08102746: - movs r2, 0x1 - movs r3, 0 - movs r1, 0 -_0810274C: - movs r5, 0xE - ldrsh r0, [r4, r5] - ands r0, r2 - lsls r5, r2, 17 - adds r6, r3, 0 - adds r6, 0x10 - adds r1, 0x1 - mov r8, r1 - cmp r0, 0 - beq _08102778 - movs r1, 0x1 - ldr r2, =gPlttBufferFaded -_08102764: - adds r0, r3, r1 - lsls r0, 1 - adds r0, r2 - mov r7, r12 - strh r7, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0xF - bls _08102764 -_08102778: - lsrs r2, r5, 16 - lsls r0, r6, 16 - lsrs r3, r0, 16 - mov r1, r8 - lsls r0, r1, 16 - lsrs r1, r0, 16 - cmp r1, 0xF - bls _0810274C - b _08102832 - .pool -_08102794: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08102832 - movs r2, 0 - ldr r3, =gSprites - movs r5, 0x14 - adds r5, r3 - mov r12, r5 - ldr r7, =gUnknown_08592EBC - mov r8, r7 - ldr r6, =gBattleAnimSpriteTemplate_8592EEC - movs r5, 0x1 -_081027B2: - lsls r0, r2, 4 - adds r0, r2 - lsls r1, r0, 2 - mov r7, r12 - adds r0, r1, r7 - ldr r0, [r0] - cmp r0, r8 - beq _081027C6 - cmp r0, r6 - bne _081027CA -_081027C6: - adds r0, r1, r3 - strh r5, [r0, 0x2E] -_081027CA: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3F - bls _081027B2 - movs r0, 0 - strh r0, [r4, 0xA] - b _08102814 - .pool -_081027EC: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1E - ble _08102832 - movs r1, 0x24 - ldrsh r0, [r4, r1] - movs r2, 0x26 - ldrsh r1, [r4, r2] - bl sub_80A8050 - ldr r1, =0x00007fbb - str r1, [sp] - movs r1, 0 - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade -_08102814: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _08102832 - .pool -_08102820: - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08102832 - adds r0, r2, 0 - bl DestroyAnimVisualTask -_08102832: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81026A8 - - thumb_func_start sub_8102844 -sub_8102844: @ 8102844 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r6, r1] - cmp r0, 0x1 - bgt _08102856 - movs r0, 0x2 - strh r0, [r6, 0x4] -_08102856: - movs r1, 0x4 - ldrsh r0, [r6, r1] - cmp r0, 0x7F - ble _08102862 - movs r0, 0x7F - strh r0, [r6, 0x4] -_08102862: - movs r0, 0 - strh r0, [r5, 0x2E] - ldrh r0, [r6, 0x4] - strh r0, [r5, 0x30] - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r6] - adds r0, r1 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r6, [r6, 0x2] - adds r0, r6 - strh r0, [r5, 0x22] - ldrh r1, [r5, 0x20] - strh r1, [r5, 0x3A] - strh r0, [r5, 0x3C] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _081028D4 - ldrb r1, [r5, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r1 - movs r1, 0x10 - orrs r0, r1 - strb r0, [r5, 0x3] - ldrh r0, [r5, 0x20] - adds r0, 0x28 - strh r0, [r5, 0x20] - ldrh r4, [r5, 0x22] - adds r4, 0x14 - strh r4, [r5, 0x22] - lsls r0, 7 - strh r0, [r5, 0x32] - movs r0, 0x30 - ldrsh r1, [r5, r0] - ldr r0, =0xffffec00 - b _081028FA - .pool -_081028D4: - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _0810291C - ldrh r0, [r5, 0x20] - subs r0, 0x28 - strh r0, [r5, 0x20] - ldrh r4, [r5, 0x22] - adds r4, 0x14 - strh r4, [r5, 0x22] - lsls r0, 7 - strh r0, [r5, 0x32] - movs r0, 0x30 - ldrsh r1, [r5, r0] - movs r0, 0xA0 - lsls r0, 5 -_081028FA: - bl __divsi3 - strh r0, [r5, 0x34] - lsls r4, 7 - strh r4, [r5, 0x36] - movs r0, 0x30 - ldrsh r1, [r5, r0] - ldr r0, =0xfffff600 - bl __divsi3 - strh r0, [r5, 0x38] - b _08102958 - .pool -_0810291C: - ldrh r0, [r5, 0x20] - adds r0, 0x28 - strh r0, [r5, 0x20] - ldrh r4, [r5, 0x22] - subs r4, 0x14 - strh r4, [r5, 0x22] - lsls r0, 7 - strh r0, [r5, 0x32] - movs r0, 0x30 - ldrsh r1, [r5, r0] - ldr r0, =0xffffec00 - bl __divsi3 - strh r0, [r5, 0x34] - lsls r4, 7 - strh r4, [r5, 0x36] - movs r0, 0x30 - ldrsh r1, [r5, r0] - movs r0, 0xA0 - lsls r0, 4 - bl __divsi3 - strh r0, [r5, 0x38] - ldrb r1, [r5, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r1 - movs r1, 0x30 - orrs r0, r1 - strb r0, [r5, 0x3] -_08102958: - ldr r0, =sub_810296C - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102844 - - thumb_func_start sub_810296C -sub_810296C: @ 810296C - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x34] - ldrh r1, [r2, 0x32] - adds r0, r1 - strh r0, [r2, 0x32] - ldrh r1, [r2, 0x38] - ldrh r3, [r2, 0x36] - adds r1, r3 - strh r1, [r2, 0x36] - lsls r0, 16 - asrs r0, 23 - strh r0, [r2, 0x20] - lsls r1, 16 - asrs r1, 23 - strh r1, [r2, 0x22] - ldrh r0, [r2, 0x30] - subs r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _081029A2 - ldrh r0, [r2, 0x3A] - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x3C] - strh r0, [r2, 0x22] -_081029A2: - movs r1, 0x30 - ldrsh r0, [r2, r1] - cmp r0, 0 - bne _081029B0 - adds r0, r2, 0 - bl DestroyAnimSprite -_081029B0: - pop {r0} - bx r0 - thumb_func_end sub_810296C - - thumb_func_start sub_81029B4 -sub_81029B4: @ 81029B4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r0, 2 - add r0, r8 - lsls r0, 3 - ldr r1, =gTasks - adds r6, r0, r1 - movs r0, 0 - bl GetAnimBattlerSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x8] - ldr r0, =0x00002771 - bl AllocSpritePalette - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0xA] - movs r1, 0xA - ldrsh r0, [r6, r1] - lsls r0, 20 - movs r1, 0x80 - lsls r1, 17 - adds r0, r1 - lsrs r3, r0, 16 - ldr r2, =gSprites - movs r0, 0x8 - ldrsh r1, [r6, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x5] - lsrs r0, 4 - adds r0, 0x10 - lsls r4, r0, 4 - movs r5, 0x1 - ldr r2, =gPlttBufferUnfaded -_08102A0C: - adds r1, r3, r5 - lsls r1, 1 - adds r1, r2 - adds r0, r4, r5 - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0xF - bls _08102A0C - adds r0, r3, 0 - movs r1, 0x10 - movs r2, 0xB - movs r3, 0 - bl BlendPalette - movs r0, 0 - strh r0, [r6, 0xE] - movs r5, 0 - ldr r7, =gSprites - movs r1, 0x1C - adds r1, r7 - mov r9, r1 - b _08102A88 - .pool -_08102A54: - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r4, r2, r7 - ldrb r1, [r6, 0xA] - lsls r1, 4 - ldrb r3, [r4, 0x5] - movs r0, 0xF - ands r0, r3 - orrs r0, r1 - strb r0, [r4, 0x5] - movs r0, 0 - strh r0, [r4, 0x2E] - lsls r0, r5, 7 - strh r0, [r4, 0x30] - mov r0, r8 - strh r0, [r4, 0x32] - add r2, r9 - ldr r0, =sub_8102B3C - str r0, [r2] - ldrh r0, [r6, 0xE] - adds r0, 0x1 - strh r0, [r6, 0xE] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08102A88: - cmp r5, 0x1 - bhi _08102A9A - movs r0, 0 - bl duplicate_obj_of_side_rel2move_in_transparent_mode - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08102A54 -_08102A9A: - ldr r0, =sub_8102AE0 - str r0, [r6] - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl sub_80A8364 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08102AC8 - movs r1, 0x80 - lsls r1, 2 - movs r0, 0 - bl ClearGpuRegBits - b _08102AD2 - .pool -_08102AC8: - movs r1, 0x80 - lsls r1, 3 - movs r0, 0 - bl ClearGpuRegBits -_08102AD2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81029B4 - - thumb_func_start sub_8102AE0 -sub_8102AE0: @ 8102AE0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks - adds r0, r1 - movs r1, 0xE - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08102B32 - ldr r0, =gBattleAnimAttacker - ldrb r0, [r0] - bl sub_80A8364 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08102B1C - movs r1, 0x80 - lsls r1, 2 - movs r0, 0 - bl SetGpuRegBits - b _08102B26 - .pool -_08102B1C: - movs r1, 0x80 - lsls r1, 3 - movs r0, 0 - bl SetGpuRegBits -_08102B26: - ldr r0, =0x00002771 - bl FreeSpritePaletteByTag - adds r0, r4, 0 - bl DestroyAnimVisualTask -_08102B32: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102AE0 - - thumb_func_start sub_8102B3C -sub_8102B3C: @ 8102B3C - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x34] - adds r0, 0x1 - strh r0, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08102B58 - movs r0, 0 - strh r0, [r5, 0x34] - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] -_08102B58: - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0x40 - ble _08102B80 - ldr r2, =gTasks - movs r0, 0x32 - ldrsh r1, [r5, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrh r1, [r0, 0xE] - subs r1, 0x1 - strh r1, [r0, 0xE] - adds r0, r5, 0 - bl obj_delete_but_dont_free_vram - b _08102BC2 - .pool -_08102B80: - ldr r4, =gSineTable - movs r1, 0x2E - ldrsh r0, [r5, r1] - lsls r0, 1 - adds r0, r4 - movs r2, 0 - ldrsh r0, [r0, r2] - movs r1, 0x6 - bl __divsi3 - strh r0, [r5, 0x36] - movs r1, 0x2E - ldrsh r0, [r5, r1] - lsls r0, 1 - adds r0, r4 - movs r2, 0 - ldrsh r0, [r0, r2] - movs r1, 0xD - bl __divsi3 - strh r0, [r5, 0x38] - ldrh r1, [r5, 0x30] - adds r1, r0 - movs r0, 0xFF - ands r1, r0 - strh r1, [r5, 0x30] - movs r1, 0x30 - ldrsh r0, [r5, r1] - movs r2, 0x36 - ldrsh r1, [r5, r2] - bl Sin - strh r0, [r5, 0x24] -_08102BC2: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102B3C - - thumb_func_start sub_8102BCC -sub_8102BCC: @ 8102BCC - push {r4,lr} - adds r4, r0, 0 - ldr r1, =DestroyAnimSprite - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67D8 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102BCC - - thumb_func_start sub_8102BE8 -sub_8102BE8: @ 8102BE8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r4, =gUnknown_08593020 - ldrh r0, [r4] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0xFF - beq _08102C2C - lsls r0, r3, 20 - movs r1, 0x80 - lsls r1, 17 - adds r0, r1 - lsrs r3, r0, 16 - movs r2, 0x1 - ldr r5, =gPlttBufferFaded -_08102C14: - adds r1, r3, r2 - lsls r1, 1 - adds r1, r5 - lsls r0, r2, 1 - adds r0, r4 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _08102C14 -_08102C2C: - movs r4, 0x1 - ldr r0, =gUnknown_08593020 - mov r8, r0 -_08102C32: - lsls r0, r4, 1 - adds r0, r4 - lsls r5, r0, 2 - mov r1, r8 - adds r0, r5, r1 - ldrh r0, [r0] - bl AllocSpritePalette - lsls r0, 24 - lsrs r3, r0, 24 - adds r4, 0x1 - mov r12, r4 - cmp r3, 0xFF - beq _08102C7A - lsls r0, r3, 20 - movs r1, 0x80 - lsls r1, 17 - adds r0, r1 - lsrs r3, r0, 16 - movs r2, 0x1 - ldr r7, =gPlttBufferFaded - ldr r6, =gUnknown_08593020 - adds r4, r5, 0 -_08102C60: - adds r1, r3, r2 - lsls r1, 1 - adds r1, r7 - lsls r0, r2, 1 - adds r0, r4 - adds r0, r6 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _08102C60 -_08102C7A: - mov r1, r12 - lsls r0, r1, 16 - lsrs r4, r0, 16 - cmp r4, 0x3 - bls _08102C32 - mov r0, r9 - bl DestroyAnimVisualTask - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102BE8 - - thumb_func_start sub_8102CA0 -sub_8102CA0: @ 8102CA0 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0x1 - ldr r6, =gUnknown_08593020 -_08102CAA: - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r6 - ldrh r0, [r0] - bl FreeSpritePaletteByTag - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x3 - bls _08102CAA - adds r0, r5, 0 - bl DestroyAnimVisualTask - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102CA0 - - thumb_func_start sub_8102CD4 -sub_8102CD4: @ 8102CD4 - push {r4-r6,lr} - sub sp, 0x4 - adds r5, r0, 0 - bl sub_80A6838 - ldr r4, =gBattleAnimArgs - ldrb r1, [r4] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r2, =gUnknown_08593020 - movs r0, 0x2 - ldrsh r1, [r4, r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08102D10 - lsls r2, r0, 4 - ldrb r1, [r5, 0x5] - movs r0, 0xF - ands r0, r1 - orrs r0, r2 - strb r0, [r5, 0x5] -_08102D10: - ldrh r0, [r4, 0x2] - movs r1, 0 - strh r0, [r5, 0x30] - strh r1, [r5, 0x32] - ldrh r0, [r4, 0x4] - strh r0, [r5, 0x34] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _08102D34 - movs r6, 0x30 - movs r3, 0x28 - b _08102D4E - .pool -_08102D34: - ldr r4, =gBattleAnimTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r6, r0, 24 - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r3, r0, 24 -_08102D4E: - ldrh r0, [r5, 0x20] - lsls r1, r0, 4 - strh r1, [r5, 0x36] - ldrh r1, [r5, 0x22] - lsls r2, r1, 4 - strh r2, [r5, 0x38] - subs r0, r6, r0 - lsls r0, 16 - asrs r0, 16 - subs r1, r3, r1 - lsls r1, 16 - asrs r1, 16 - adds r2, r5, 0 - adds r2, 0x3A - adds r3, r5, 0 - adds r3, 0x3C - movs r4, 0x28 - str r4, [sp] - bl sub_8102D8C - ldr r0, =sub_8102DE4 - str r0, [r5, 0x1C] - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102CD4 - - thumb_func_start sub_8102D8C -sub_8102D8C: @ 8102D8C - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r2, 0 - mov r8, r3 - ldr r2, [sp, 0x18] - lsls r1, 16 - lsrs r6, r1, 16 - lsls r2, 24 - lsrs r1, r2, 24 - lsls r0, 16 - asrs r2, r0, 16 - cmp r2, 0 - bge _08102DAE - lsls r0, r1, 24 - negs r0, r0 - lsrs r1, r0, 24 -_08102DAE: - lsls r5, r2, 8 - lsls r1, 24 - asrs r1, 24 - adds r0, r5, 0 - bl __divsi3 - adds r4, r0, 0 - cmp r4, 0 - bne _08102DC2 - movs r4, 0x1 -_08102DC2: - adds r0, r5, 0 - adds r1, r4, 0 - bl __divsi3 - strh r0, [r7] - lsls r0, r6, 16 - asrs r0, 8 - adds r1, r4, 0 - bl __divsi3 - mov r1, r8 - strh r0, [r1] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8102D8C - - thumb_func_start sub_8102DE4 -sub_8102DE4: @ 8102DE4 - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - movs r5, 0 - strh r0, [r4, 0x2E] - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r1, r0, r1 - adds r0, r1, 0 - cmp r1, 0 - bge _08102E00 - adds r0, 0xFF -_08102E00: - asrs r0, 8 - lsls r0, 8 - subs r0, r1, r0 - ldrh r1, [r4, 0x3A] - ldrh r2, [r4, 0x36] - adds r1, r2 - strh r1, [r4, 0x36] - ldrh r2, [r4, 0x3C] - ldrh r3, [r4, 0x38] - adds r2, r3 - strh r2, [r4, 0x38] - lsls r1, 16 - asrs r1, 20 - strh r1, [r4, 0x20] - lsls r2, 16 - asrs r2, 20 - strh r2, [r4, 0x22] - lsls r0, 16 - asrs r0, 16 - movs r1, 0xF - bl Sin - strh r0, [r4, 0x26] - ldrh r2, [r4, 0x22] - ldrh r0, [r4, 0x20] - adds r0, 0x10 - lsls r0, 16 - movs r1, 0x88 - lsls r1, 17 - cmp r0, r1 - bhi _08102E4E - lsls r0, r2, 16 - asrs r1, r0, 16 - movs r0, 0x10 - negs r0, r0 - cmp r1, r0 - blt _08102E4E - cmp r1, 0x80 - ble _08102E56 -_08102E4E: - adds r0, r4, 0 - bl move_anim_8074EE0 - b _08102EA6 -_08102E56: - movs r0, 0x34 - ldrsh r1, [r4, r0] - cmp r1, 0 - beq _08102EA6 - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, r1 - ble _08102EA6 - strh r5, [r4, 0x32] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _08102E7E - strh r5, [r4, 0x30] -_08102E7E: - ldr r2, =gUnknown_08593020 - movs r3, 0x30 - ldrsh r1, [r4, r3] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08102EA6 - lsls r2, r0, 4 - ldrb r1, [r4, 0x5] - movs r0, 0xF - ands r0, r1 - orrs r0, r2 - strb r0, [r4, 0x5] -_08102EA6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102DE4 - - thumb_func_start sub_8102EB0 -sub_8102EB0: @ 8102EB0 - push {r4-r7,lr} - adds r6, r0, 0 - ldr r7, =gBattleAnimAttacker - ldrb r0, [r7] - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08102ECE - ldr r1, =gBattleAnimArgs - movs r2, 0x2 - ldrsh r0, [r1, r2] - negs r0, r0 - strh r0, [r1, 0x2] -_08102ECE: - ldrb r0, [r7] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - ldr r4, =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4, 0x2] - adds r0, r1 - movs r5, 0 - strh r0, [r6, 0x20] - ldrb r0, [r7] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - ldrh r2, [r4, 0x4] - adds r0, r2 - strh r0, [r6, 0x22] - ldrb r1, [r4] - adds r0, r6, 0 - bl StartSpriteAnim - strh r5, [r6, 0x32] - strh r5, [r6, 0x34] - ldrh r0, [r6, 0x20] - lsls r0, 4 - strh r0, [r6, 0x36] - ldrh r0, [r6, 0x22] - lsls r0, 4 - strh r0, [r6, 0x38] - movs r1, 0x2 - ldrsh r0, [r4, r1] - lsls r0, 4 - movs r1, 0x5 - bl __divsi3 - strh r0, [r6, 0x3A] - movs r2, 0x4 - ldrsh r0, [r4, r2] - lsls r0, 7 - movs r1, 0x5 - bl __divsi3 - strh r0, [r6, 0x3C] - ldr r0, =sub_8102F40 - str r0, [r6, 0x1C] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102EB0 - - thumb_func_start sub_8102F40 -sub_8102F40: @ 8102F40 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x3A] - ldrh r1, [r4, 0x36] - adds r0, r1 - strh r0, [r4, 0x36] - ldrh r1, [r4, 0x3C] - ldrh r2, [r4, 0x38] - adds r1, r2 - strh r1, [r4, 0x38] - lsls r0, 16 - asrs r0, 20 - strh r0, [r4, 0x20] - lsls r1, 16 - asrs r1, 20 - strh r1, [r4, 0x22] - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x5 - ble _08102F9E - movs r2, 0x34 - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _08102F9E - ldrh r0, [r4, 0x32] - adds r0, 0x10 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x32] - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r1, 0x12 - bl Cos - strh r0, [r4, 0x24] - movs r2, 0x32 - ldrsh r0, [r4, r2] - movs r1, 0x12 - bl Sin - strh r0, [r4, 0x26] - movs r1, 0x32 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08102F9E - movs r0, 0x1 - strh r0, [r4, 0x34] -_08102F9E: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x30 - bne _08102FB2 - adds r0, r4, 0 - bl move_anim_8074EE0 -_08102FB2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8102F40 - - thumb_func_start sub_8102FB8 -sub_8102FB8: @ 8102FB8 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0x1 - bne _08102FDC - ldrb r0, [r5, 0x3] - movs r1, 0x3F - negs r1, r1 - ands r1, r0 - movs r0, 0x10 - orrs r1, r0 - strb r1, [r5, 0x3] - movs r6, 0x10 - b _08102FDE - .pool -_08102FDC: - ldr r6, =0x0000fff0 -_08102FDE: - ldr r4, =gBattleAnimAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, r6 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x8 - strh r0, [r5, 0x22] - movs r0, 0x8 - strh r0, [r5, 0x2E] - ldr r0, =WaitAnimForDuration - str r0, [r5, 0x1C] - ldr r1, =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8102FB8 - - thumb_func_start sub_8103028 -sub_8103028: @ 8103028 - push {r4,r5,lr} - adds r4, r0, 0 - bl sub_80A6838 - ldrh r0, [r4, 0x22] - adds r0, 0x8 - strh r0, [r4, 0x22] - ldr r5, =gBattleAnimArgs - ldrb r1, [r5, 0x2] - adds r0, r4, 0 - bl StartSpriteAnim - ldr r2, =gUnknown_08593020 - movs r0, 0x4 - ldrsh r1, [r5, r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08103068 - lsls r2, r0, 4 - ldrb r1, [r4, 0x5] - movs r0, 0xF - ands r0, r1 - orrs r0, r2 - strb r0, [r4, 0x5] -_08103068: - movs r1, 0 - ldrsh r0, [r5, r1] - movs r2, 0x20 - cmp r0, 0 - bne _08103074 - ldr r2, =0x0000ffe0 -_08103074: - movs r0, 0x28 - strh r0, [r4, 0x2E] - ldrh r1, [r4, 0x20] - strh r1, [r4, 0x30] - lsls r0, r2, 16 - asrs r0, 16 - adds r0, r1 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - subs r0, 0x28 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl InitAnimLinearTranslation - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x38] - ldr r0, =sub_81030B0 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8103028 - - thumb_func_start sub_81030B0 -sub_81030B0: @ 81030B0 - push {r4,lr} - adds r4, r0, 0 - bl TranslateAnimLinear - lsls r0, 24 - cmp r0, 0 - bne _08103100 - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0x8 - bl Sin - lsls r0, 16 - lsrs r1, r0, 16 - ldrh r2, [r4, 0x24] - movs r3, 0x24 - ldrsh r0, [r4, r3] - cmp r0, 0 - bge _081030DC - lsls r0, r1, 16 - negs r0, r0 - lsrs r1, r0, 16 -_081030DC: - lsls r0, r1, 16 - asrs r0, 16 - adds r0, r2 - strh r0, [r4, 0x24] - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r1, 0x4 - bl Sin - ldrh r3, [r4, 0x26] - adds r0, r3 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x38] - adds r0, 0x8 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - b _08103106 -_08103100: - adds r0, r4, 0 - bl DestroyAnimSprite -_08103106: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81030B0 - - thumb_func_start sub_810310C -sub_810310C: @ 810310C - push {r4-r6,lr} - adds r6, r1, 0 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r5, 0 - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _0810312C - adds r0, r5, 0 - movs r1, 0x5 - bl sub_80A861C - adds r0, 0x8 - b _08103136 -_0810312C: - adds r0, r5, 0 - movs r1, 0x4 - bl sub_80A861C - subs r0, 0x8 -_08103136: - strh r0, [r6, 0x20] - adds r0, r5, 0 - movs r1, 0x3 - bl GetBattlerSpriteCoord - adds r4, r0, 0 - adds r0, r5, 0 - movs r1, 0 - bl sub_80A861C - lsls r4, 24 - lsrs r4, 24 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08103158 - adds r0, 0x3 -_08103158: - asrs r0, 2 - subs r0, r4, r0 - strh r0, [r6, 0x22] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_810310C - - thumb_func_start sub_8103164 -sub_8103164: @ 8103164 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08103180 - ldr r0, =gBattleAnimAttacker - b _08103182 - .pool -_08103180: - ldr r0, =gBattleAnimTarget -_08103182: - ldrb r4, [r0] - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_810310C - adds r0, r4, 0 - bl GetBattlerSide - lsls r0, 24 - lsrs r0, 24 - negs r1, r0 - orrs r1, r0 - lsrs r1, 31 - ldr r0, =gBattleAnimArgs - ldrh r0, [r0, 0x2] - strh r0, [r5, 0x2E] - adds r0, r1, 0x2 - strh r0, [r5, 0x30] - adds r0, r5, 0 - bl StartSpriteAnim - ldr r1, =sub_81031D0 - adds r0, r5, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67D8 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8103164 - - thumb_func_start sub_81031D0 -sub_81031D0: @ 81031D0 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - subs r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - cmp r0, 0 - bne _081031F8 - ldr r1, =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldrh r1, [r4, 0x30] - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl StartSpriteAnim - ldr r0, =sub_80A67D8 - str r0, [r4, 0x1C] -_081031F8: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81031D0 - - thumb_func_start sub_8103208 -sub_8103208: @ 8103208 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08103224 - ldr r0, =gBattleAnimAttacker - b _08103226 - .pool -_08103224: - ldr r0, =gBattleAnimTarget -_08103226: - ldrb r0, [r0] - adds r1, r4, 0 - bl sub_810310C - movs r0, 0 - strh r0, [r4, 0x2E] - ldr r1, =sub_8103250 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67BC - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8103208 - - thumb_func_start sub_8103250 -sub_8103250: @ 8103250 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - ble _08103276 - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim - ldr r1, =move_anim_8074EE0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67BC - str r0, [r4, 0x1C] -_08103276: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8103250 - - thumb_func_start sub_8103284 -sub_8103284: @ 8103284 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _081032A0 - ldr r0, =gBattleAnimAttacker - b _081032A2 - .pool -_081032A0: - ldr r0, =gBattleAnimTarget -_081032A2: - ldrb r5, [r0] - adds r0, r5, 0 - movs r1, 0 - bl GetBattlerSpriteCoord - lsls r0, 24 - lsrs r0, 24 - movs r6, 0 - strh r0, [r4, 0x20] - adds r0, r5, 0 - movs r1, 0x2 - bl sub_80A861C - strh r0, [r4, 0x22] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - bgt _081032CA - movs r0, 0xA - strh r0, [r4, 0x22] -_081032CA: - movs r0, 0x1 - strh r0, [r4, 0x2E] - strh r6, [r4, 0x30] - adds r1, r4, 0 - adds r1, 0x43 - ldrb r0, [r1] - strh r0, [r4, 0x32] - ldrb r0, [r1] - adds r0, 0x4 - strh r0, [r4, 0x34] - strh r6, [r4, 0x36] - ldr r1, =sub_8103300 - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67BC - str r0, [r4, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8103284 - - thumb_func_start sub_8103300 -sub_8103300: @ 8103300 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x36] - adds r0, 0x1 - strh r0, [r1, 0x36] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xC - ble _08103316 - ldr r0, =sub_8103320 - str r0, [r1, 0x1C] -_08103316: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8103300 - - thumb_func_start sub_8103320 -sub_8103320: @ 8103320 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x30] - adds r1, r0, 0x4 - strh r1, [r2, 0x30] - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0xFE - ble _08103352 - ldrh r0, [r2, 0x2E] - subs r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bne _0810334C - strh r0, [r2, 0x24] - ldr r0, =sub_8103250 - str r0, [r2, 0x1C] - b _08103388 - .pool -_0810334C: - movs r0, 0xFF - ands r1, r0 - strh r1, [r2, 0x30] -_08103352: - movs r1, 0x30 - ldrsh r0, [r2, r1] - cmp r0, 0x4F - ble _08103362 - ldrh r0, [r2, 0x34] - adds r1, r2, 0 - adds r1, 0x43 - strb r0, [r1] -_08103362: - movs r3, 0x30 - ldrsh r0, [r2, r3] - cmp r0, 0x9F - ble _08103372 - ldrh r0, [r2, 0x32] - adds r1, r2, 0 - adds r1, 0x43 - strb r0, [r1] -_08103372: - ldr r1, =gSineTable - movs r3, 0x30 - ldrsh r0, [r2, r3] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 19 - asrs r1, r0, 1 - adds r0, r1 - strh r0, [r2, 0x24] -_08103388: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8103320 - - thumb_func_start sub_8103390 -sub_8103390: @ 8103390 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _081033AC - ldr r0, =gBattleAnimAttacker - b _081033AE - .pool -_081033AC: - ldr r0, =gBattleAnimTarget -_081033AE: - ldrb r4, [r0] - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_810310C - adds r0, r4, 0 - bl GetBattlerSide - lsls r0, 24 - cmp r0, 0 - bne _081033D4 - adds r0, r5, 0 - movs r1, 0 - bl StartSpriteAnim - movs r0, 0x2 - b _081033DE - .pool -_081033D4: - adds r0, r5, 0 - movs r1, 0x1 - bl StartSpriteAnim - movs r0, 0x3 -_081033DE: - strh r0, [r5, 0x2E] - ldr r0, =sub_81033F0 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8103390 - - thumb_func_start sub_81033F0 -sub_81033F0: @ 81033F0 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - ble _0810341E - movs r0, 0 - strh r0, [r4, 0x30] - ldrh r1, [r4, 0x2E] - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl StartSpriteAnim - ldr r1, =sub_810342C - adds r0, r4, 0 - bl StoreSpriteCallbackInData6 - ldr r0, =sub_80A67D8 - str r0, [r4, 0x1C] -_0810341E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81033F0 - - thumb_func_start sub_810342C -sub_810342C: @ 810342C - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x30] - adds r0, 0x1 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _08103444 - adds r0, r1, 0 - bl DestroyAnimSprite -_08103444: - pop {r0} - bx r0 - thumb_func_end sub_810342C - - .align 2, 0 diff --git a/include/battle_anim.h b/include/battle_anim.h index fffdabe06..e0c1b2b08 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -132,6 +132,12 @@ u8 sub_80A80C8(struct Task *task); void sub_80A8EE4(struct Sprite *); void sub_80A67F4(struct Sprite *); void sub_80A6D48(u32 bgId, const void *src); +void sub_80A7160(struct Sprite *sprite); +bool8 sub_80A70E8(struct Sprite *sprite); +void sub_80A70C0(struct Sprite *sprite); +void TranslateMonBGUntil(struct Sprite *sprite); +void TranslateSpriteOverDuration(struct Sprite *sprite); +void sub_80A77C8(struct Sprite *sprite); enum { diff --git a/include/battle_interface.h b/include/battle_interface.h index 66a7f9828..3145939d0 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_INTERFACE_H #define GUARD_BATTLE_INTERFACE_H +#include "battle_controllers.h" + enum { HP_CURRENT, diff --git a/ld_script.txt b/ld_script.txt index 68aa8463c..2f1f1369a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -157,7 +157,7 @@ SECTIONS { src/safari_zone.o(.text); asm/contest_link_80FC4F4.o(.text); src/item_use.o(.text); - asm/battle_anim_effects_1.o(.text); + src/battle_anim_effects_1.o(.text); asm/battle_anim_effects_2.o(.text); asm/water.o(.text); src/fire.o(.text); @@ -483,7 +483,7 @@ SECTIONS { src/field_special_scene.o(.rodata); src/rotating_gate.o(.rodata); src/item_use.o(.rodata); - src/effects_1.o(.rodata); + src/battle_anim_effects_1.o(.rodata); src/effects_2.o(.rodata); src/water.o(.rodata); src/fire.o(.rodata); diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index 8ba1a8222..9adbdd779 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -35,7 +35,6 @@ extern const union AffineAnimCmd *gUnknown_082FF6C0[]; // This file's functions. void sub_80A64EC(struct Sprite *sprite); -void sub_80A653C(struct Sprite *sprite); void sub_80A6FB4(struct Sprite *sprite); void sub_80A7144(struct Sprite *sprite); void sub_80A791C(struct Sprite *sprite); @@ -539,7 +538,7 @@ void WaitAnimForDuration(struct Sprite *sprite) void sub_80A64D0(struct Sprite *sprite) { sub_80A64EC(sprite); - sprite->callback = sub_80A653C; + sprite->callback = TranslateSpriteOverDuration; sprite->callback(sprite); } @@ -557,7 +556,7 @@ void sub_80A64EC(struct Sprite *sprite) sprite->data[1] = old; } -void sub_80A653C(struct Sprite *sprite) +void TranslateSpriteOverDuration(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -613,7 +612,7 @@ void sub_80A65EC(struct Sprite *sprite) sprite->callback = sub_80A64D0; } -void sub_80A6630(struct Sprite *sprite) +void TranslateMonBGUntil(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -627,7 +626,7 @@ void sub_80A6630(struct Sprite *sprite) } } -// Same as sub_80A6630, but it operates on sub-pixel values +// Same as TranslateMonBGUntil, but it operates on sub-pixel values // to handle slower translations. void sub_80A6680(struct Sprite *sprite) { diff --git a/src/battle_anim_80D51AC.c b/src/battle_anim_80D51AC.c index bfd0635f6..51be7bbe9 100644 --- a/src/battle_anim_80D51AC.c +++ b/src/battle_anim_80D51AC.c @@ -441,14 +441,14 @@ static void DoHorizontalLunge(struct Sprite *sprite) sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[4] = gBattleAnimArgs[0]; StoreSpriteCallbackInData6(sprite, ReverseHorizontalLungeDirection); - sprite->callback = sub_80A6630; + sprite->callback = TranslateMonBGUntil; } static void ReverseHorizontalLungeDirection(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[1] = -sprite->data[1]; - sprite->callback = sub_80A6630; + sprite->callback = TranslateMonBGUntil; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } @@ -468,14 +468,14 @@ static void DoVerticalDip(struct Sprite *sprite) sprite->data[3] = spriteId; sprite->data[4] = gBattleAnimArgs[0]; StoreSpriteCallbackInData6(sprite, ReverseVerticalDipDirection); - sprite->callback = sub_80A6630; + sprite->callback = TranslateMonBGUntil; } static void ReverseVerticalDipDirection(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[2] = -sprite->data[2]; - sprite->callback = sub_80A6630; + sprite->callback = TranslateMonBGUntil; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c new file mode 100644 index 000000000..0f56c05d8 --- /dev/null +++ b/src/battle_anim_effects_1.c @@ -0,0 +1,5520 @@ +#include "global.h" +#include "battle_anim.h" +#include "battle_interface.h" +#include "gpu_regs.h" +#include "palette.h" +#include "random.h" +#include "sound.h" +#include "trig.h" +#include "util.h" +#include "constants/rgb.h" +#include "constants/songs.h" + +EWRAM_DATA s16 gUnknown_0203A0F8[4] = {0}; + +void AnimMovePowderParticle(struct Sprite *); +void sub_80FE8E0(struct Sprite *); +void sub_80FE930(struct Sprite *); +void sub_80FE988(struct Sprite *); +void sub_80FEAD8(struct Sprite *); +void sub_80FEB44(struct Sprite *); +void sub_80FED28(struct Sprite *); +void sub_80FEE78(struct Sprite *); +void sub_80FEF44(struct Sprite *); +void sub_80FEFFC(struct Sprite *); +void AnimLeechSeed(struct Sprite *); +void AnimTranslateLinearSingleSineWave(struct Sprite *); +void AnimMoveTwisterParticle(struct Sprite *); +void sub_80FF374(struct Sprite *); +void sub_80FF698(struct Sprite *); +void sub_80FF768(struct Sprite *); +void sub_80FF7EC(struct Sprite *); +void sub_80FF934(struct Sprite *); +void sub_80FFB18(struct Sprite *); +void sub_80FFBF4(struct Sprite *); +void sub_80FFC70(struct Sprite *); +void sub_80FFCB4(struct Sprite *); +void sub_80FFDBC(struct Sprite *); +void sub_8100640(struct Sprite *); +void sub_8100898(struct Sprite *); +void sub_81009F8(struct Sprite *); +void sub_8100A50(struct Sprite *); +void sub_8100A94(struct Sprite *); +void AnimCuttingSlice(struct Sprite *); +void sub_8100B88(struct Sprite *); +void sub_8100E1C(struct Sprite *); +void sub_8100EF0(struct Sprite *); +void sub_81010CC(struct Sprite *); +void sub_810130C(struct Sprite *); +void sub_810135C(struct Sprite *); +void sub_8101440(struct Sprite *); +void sub_81014F4(struct Sprite *); +void sub_81015AC(struct Sprite *); +void sub_8101898(struct Sprite *); +void sub_8101940(struct Sprite *); +void sub_8101B90(struct Sprite *); +void sub_8101F40(struct Sprite *); +void sub_8101FA8(struct Sprite *); +void sub_8101FF0(struct Sprite *); +void sub_81020D8(struct Sprite *); +void sub_810217C(struct Sprite *); +void sub_8102268(struct Sprite *); +void sub_810234C(struct Sprite *); +void sub_81024E0(struct Sprite *); +void sub_8102540(struct Sprite *); +void sub_8102844(struct Sprite *); +void sub_8102BCC(struct Sprite *); +void sub_8102CD4(struct Sprite *); +void sub_8102EB0(struct Sprite *); +void sub_8102FB8(struct Sprite *); +void sub_8103028(struct Sprite *); +void sub_8103164(struct Sprite *); +void sub_8103208(struct Sprite *); +void sub_8103284(struct Sprite *); +void sub_8103390(struct Sprite *); +static void AnimMovePowderParticleStep(struct Sprite *); +static void sub_80FE9E4(struct Sprite *); +static void sub_80FEB28(struct Sprite *); +static void sub_80FEBFC(struct Sprite *); +static void AnimLeechSeedStep(struct Sprite *); +static void AnimLeechSeedSprouts(struct Sprite *); +static void sub_80FED74(struct Sprite *); +static void sub_80FEECC(struct Sprite *); +static void sub_80FEF98(struct Sprite *); +static void sub_80FF044(struct Sprite *); +static void sub_80FF090(struct Sprite *); +static void AnimTranslateLinearSingleSineWaveStep(struct Sprite *); +static void AnimMoveTwisterParticleStep(struct Sprite *); +static void sub_80FF3B0(struct Sprite *); +static void sub_80FF3EC(struct Sprite *); +static void sub_80FF53C(u8); +static void sub_80FF5CC(u8); +static void sub_80FFD2C(struct Sprite *); +static void sub_80FF8DC(struct Sprite *); +static void sub_80FFE58(struct Sprite *); +static void sub_80FFEC4(struct Sprite *); +static void sub_80FFF7C(struct Sprite *); +static void sub_8100128(u8); +static s16 sub_8100504(struct Sprite *); +static void sub_8100524(struct Task *, u8); +static void sub_80CC408(struct Sprite *); +static void sub_810074C(struct Sprite *); +static void sub_81009A0(struct Sprite *); +static void AnimSliceStep(struct Sprite *); +static void sub_8100E80(struct Sprite *); +static void sub_8100FD4(struct Sprite *); +static void sub_8101138(struct Sprite *); +static void sub_8101298(struct Sprite *, int, int); +static void sub_81014A0(struct Sprite *); +static void sub_8101560(struct Sprite *); +static void sub_81015D4(struct Sprite *); +static void sub_8101684(struct Sprite *); +static void sub_81016B8(struct Sprite *); +static void sub_8101774(struct Sprite *); +static void sub_8101820(struct Sprite *); +static void sub_8101848(struct Sprite *); +static void sub_8101998(struct Sprite *); +static void sub_81019E8(struct Sprite *); +static void sub_8101A74(struct Sprite *); +static void sub_8101AC4(struct Sprite *); +static void sub_8101B84(struct Sprite *); +static void sub_8101AE8(struct Sprite *); +static void sub_8101BA0(struct Sprite *); +static void sub_8101D2C(u8); +static void sub_8101EEC(u8); +static void sub_8102044(struct Sprite *); +static void sub_810207C(struct Sprite *); +static void sub_810208C(struct Sprite *); +static void sub_810213C(struct Sprite *); +static void sub_81021CC(struct Sprite *); +static void sub_810237C(struct Sprite *); +static void sub_8102528(struct Sprite *); +static void sub_8102584(struct Sprite *); +static void sub_810296C(struct Sprite *); +static void sub_8102AE0(u8); +static void sub_8102B3C(struct Sprite *); +static void sub_8102D8C(s16, s16, s16 *, s16 *, s8); +static void sub_8102DE4(struct Sprite *); +static void sub_8102F40(struct Sprite *); +static void sub_81030B0(struct Sprite *); +static void sub_81031D0(struct Sprite *); +static void sub_8103250(struct Sprite *); +static void sub_8103300(struct Sprite *); +static void sub_8103320(struct Sprite *); +static void sub_81033F0(struct Sprite *); +static void sub_810342C(struct Sprite *); + +const union AnimCmd gUnknown_085920F0[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(2, 5), + ANIMCMD_FRAME(4, 5), + ANIMCMD_FRAME(6, 5), + ANIMCMD_FRAME(8, 5), + ANIMCMD_FRAME(10, 5), + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(14, 5), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gUnknown_08592114[] = +{ + gUnknown_085920F0, +}; + +const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = +{ + .tileTag = ANIM_TAG_SLEEP_POWDER, + .paletteTag = ANIM_TAG_SLEEP_POWDER, + .oam = &gUnknown_08524944, + .anims = gUnknown_08592114, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimMovePowderParticle, +}; + +const struct SpriteTemplate gStunSporeParticleSpriteTemplate = +{ + .tileTag = ANIM_TAG_STUN_SPORE, + .paletteTag = ANIM_TAG_STUN_SPORE, + .oam = &gUnknown_08524944, + .anims = gUnknown_08592114, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimMovePowderParticle, +}; + +const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = +{ + .tileTag = ANIM_TAG_POISON_POWDER, + .paletteTag = ANIM_TAG_POISON_POWDER, + .oam = &gUnknown_08524944, + .anims = gUnknown_08592114, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimMovePowderParticle, +}; + +const union AnimCmd gUnknown_08592160[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592168[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592170[] = +{ + ANIMCMD_FRAME(2, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592178[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592180[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592188[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592190[] = +{ + ANIMCMD_FRAME(6, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592198[] = +{ + ANIMCMD_FRAME(7, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085921A0[] = +{ + ANIMCMD_FRAME(8, 1), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_085921A8[] = +{ + gUnknown_08592160, + gUnknown_08592168, + gUnknown_08592170, + gUnknown_08592178, + gUnknown_08592180, + gUnknown_08592188, + gUnknown_08592190, +}; + +const union AnimCmd *const gUnknown_085921C4[] = +{ + gUnknown_08592198, +}; + +const union AnimCmd *const gUnknown_085921C8[] = +{ + gUnknown_085921A0, +}; + +const union AffineAnimCmd gUnknown_085921CC[] = { + AFFINEANIMCMD_FRAME(-5, -5, 0, 1), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd *const gUnknown_085921DC[] = { + gUnknown_085921CC, +}; + +const struct SpriteTemplate gUnknown_085921E0 = +{ + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, + .oam = &gUnknown_08524A8C, + .anims = gUnknown_085921C8, + .images = NULL, + .affineAnims = gUnknown_085921DC, + .callback = sub_80FE8E0, +}; + +const struct SpriteTemplate gUnknown_085921F8 = +{ + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, + .oam = &gUnknown_08524904, + .anims = gUnknown_085921A8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FE930, +}; + +const struct SpriteTemplate gUnknown_08592210 = +{ + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, + .oam = &gUnknown_08524904, + .anims = gUnknown_085921C4, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FE988, +}; + +const union AffineAnimCmd gUnknown_08592228[] = { + AFFINEANIMCMD_FRAME(320, 320, 0, 0), + AFFINEANIMCMD_FRAME(-14, -14, 0, 1), + AFFINEANIMCMD_JUMP(1), +}; + +const union AffineAnimCmd *const gUnknown_08592240[] = { + gUnknown_08592228, +}; + +const struct SpriteTemplate gUnknown_08592244 = +{ + .tileTag = ANIM_TAG_GRAY_ORB, + .paletteTag = ANIM_TAG_GRAY_ORB, + .oam = &gUnknown_085249C4, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_08592240, + .callback = sub_80FE8E0, +}; + +const union AffineAnimCmd gUnknown_0859225C[] = { + AFFINEANIMCMD_FRAME(-5, -5, 0, 1), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd *const gUnknown_0859226C[] = { + gUnknown_0859225C, +}; + +const struct SpriteTemplate gUnknown_08592270 = +{ + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, + .oam = &gUnknown_08524A8C, + .anims = gUnknown_085921C8, + .images = NULL, + .affineAnims = gUnknown_0859226C, + .callback = sub_80FEAD8, +}; + +const struct SpriteTemplate gUnknown_08592288 = +{ + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, + .oam = &gUnknown_08524904, + .anims = gUnknown_085921A8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FEB44, +}; + +const union AnimCmd gUnknown_085922A0[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085922A8[] = +{ + ANIMCMD_FRAME(4, 7), + ANIMCMD_FRAME(8, 7), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gUnknown_085922B4[] = +{ + gUnknown_085922A0, + gUnknown_085922A8, +}; + +const struct SpriteTemplate gLeechSeedSpriteTemplate = +{ + .tileTag = ANIM_TAG_SEED, + .paletteTag = ANIM_TAG_SEED, + .oam = &gUnknown_0852490C, + .anims = gUnknown_085922B4, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimLeechSeed, +}; + +const union AnimCmd gUnknown_085922D4[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085922DC[] = +{ + ANIMCMD_FRAME(4, 7), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_085922E4[] = +{ + gUnknown_085922D4, + gUnknown_085922DC, +}; + +const struct SpriteTemplate gUnknown_085922EC = +{ + .tileTag = ANIM_TAG_SPORE, + .paletteTag = ANIM_TAG_SPORE, + .oam = &gUnknown_0852490C, + .anims = gUnknown_085922E4, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FED28, +}; + +const union AnimCmd gUnknown_08592304[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_0859230C[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592314[] = +{ + gUnknown_08592304, +}; + +const union AnimCmd *const gUnknown_08592318[] = +{ + gUnknown_0859230C, +}; + +const struct SpriteTemplate gUnknown_0859231C = +{ + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, + .oam = &gUnknown_0852490C, + .anims = gUnknown_08592314, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FEE78, +}; + +const struct SpriteTemplate gUnknown_08592334 = +{ + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, + .oam = &gUnknown_08524904, + .anims = gUnknown_08592318, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FEF44, +}; + +const union AnimCmd gUnknown_0859234C[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(4, 5), + ANIMCMD_FRAME(8, 5), + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(20, 5), + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(8, 5), + ANIMCMD_FRAME(4, 5), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gUnknown_08592378[] = +{ + ANIMCMD_FRAME(24, 5), + ANIMCMD_FRAME(28, 5), + ANIMCMD_FRAME(32, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592388[] = +{ + gUnknown_0859234C, + gUnknown_08592378, +}; + +const struct SpriteTemplate gUnknown_08592390 = +{ + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, + .oam = &gUnknown_0852490C, + .anims = gUnknown_08592388, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FEFFC, +}; + +const struct SpriteTemplate gUnknown_085923A8 = +{ + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, + .oam = &gUnknown_0852490C, + .anims = gUnknown_08592388, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimMoveTwisterParticle, +}; + +const union AnimCmd gUnknown_085923C0[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(0, 3, .hFlip = TRUE), + ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE), + ANIMCMD_FRAME(0, 3, .vFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gUnknown_085923D4[] = +{ + gUnknown_085923C0, +}; + +const struct SpriteTemplate gUnknown_085923D8 = +{ + .tileTag = ANIM_TAG_RAZOR_LEAF, + .paletteTag = ANIM_TAG_RAZOR_LEAF, + .oam = &gUnknown_08524934, + .anims = gUnknown_085923D4, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimTranslateLinearSingleSineWave, +}; + +const union AffineAnimCmd gUnknown_085923F0[] = { + AFFINEANIMCMD_FRAME(0, 0, 0, 1), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd *const gUnknown_08592400[] = { + gUnknown_085923F0, +}; + +const struct SpriteTemplate gSwiftStarSpriteTemplate = +{ + .tileTag = ANIM_TAG_YELLOW_STAR, + .paletteTag = ANIM_TAG_YELLOW_STAR, + .oam = &gUnknown_08524974, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_08592400, + .callback = AnimTranslateLinearSingleSineWave, +}; + +const union AnimCmd gUnknown_0859241C[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(32, 4), + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(96, 4), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592430[] = +{ + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_FRAME(32, 4, .hFlip = TRUE), + ANIMCMD_FRAME(64, 4, .hFlip = TRUE), + ANIMCMD_FRAME(96, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592444[] = +{ + gUnknown_0859241C, + gUnknown_08592430, +}; + +const union AffineAnimCmd gUnknown_0859244C[] = { + AFFINEANIMCMD_FRAME(256, 256, 0, 0), + AFFINEANIMCMD_FRAME(-11, 0, 0, 6), + AFFINEANIMCMD_FRAME(11, 0, 0, 6), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_0859246C[] = { + AFFINEANIMCMD_FRAME(-256, 256, 0, 0), + AFFINEANIMCMD_FRAME(11, 0, 0, 6), + AFFINEANIMCMD_FRAME(-11, 0, 0, 6), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gUnknown_0859248C[] = { + gUnknown_0859244C, + gUnknown_0859246C, +}; + +const struct SpriteTemplate gUnknown_08592494 = +{ + .tileTag = ANIM_TAG_TENDRILS, + .paletteTag = ANIM_TAG_TENDRILS, + .oam = &gUnknown_0852499C, + .anims = gUnknown_08592444, + .images = NULL, + .affineAnims = gUnknown_0859248C, + .callback = sub_80FF374, +}; + +const union AffineAnimCmd gUnknown_085924AC[] = { + AFFINEANIMCMD_FRAME(0, 0, 0, 0), + AFFINEANIMCMD_FRAME(48, 48, 0, 14), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_085924C4[] = { + AFFINEANIMCMD_FRAME(-16, -16, 0, 1), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd *const gUnknown_085924D4[] = { + gUnknown_085924AC, + gUnknown_085924C4, +}; + +const struct SpriteTemplate gUnknown_085924DC = +{ + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, + .oam = &gUnknown_085249CC, + .anims = gUnknown_085921C8, + .images = NULL, + .affineAnims = gUnknown_085924D4, + .callback = sub_80FF698, +}; + +const union AnimCmd gUnknown_085924F4[] = +{ + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(16, 7), + ANIMCMD_FRAME(32, 7), + ANIMCMD_FRAME(48, 7), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592508[] = +{ + ANIMCMD_FRAME(0, 7, .hFlip = TRUE), + ANIMCMD_FRAME(16, 7, .hFlip = TRUE), + ANIMCMD_FRAME(32, 7, .hFlip = TRUE), + ANIMCMD_FRAME(48, 7, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_0859251C[] = +{ + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(16, 7), + ANIMCMD_FRAME(32, 7), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_0859252C[] = +{ + ANIMCMD_FRAME(0, 7, .hFlip = TRUE), + ANIMCMD_FRAME(16, 7, .hFlip = TRUE), + ANIMCMD_FRAME(32, 7, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_0859253C[] = +{ + gUnknown_085924F4, + gUnknown_08592508, + gUnknown_0859251C, + gUnknown_0859252C, +}; + +const struct SpriteTemplate gUnknown_0859254C = +{ + .tileTag = ANIM_TAG_ROOTS, + .paletteTag = ANIM_TAG_ROOTS, + .oam = &gUnknown_08524914, + .anims = gUnknown_0859253C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FF768, +}; + +const struct SpriteTemplate gUnknown_08592564 = +{ + .tileTag = ANIM_TAG_ROOTS, + .paletteTag = ANIM_TAG_ROOTS, + .oam = &gUnknown_08524914, + .anims = gUnknown_0859253C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FF7EC, +}; + +const union AnimCmd gUnknown_0859257C[] = +{ + ANIMCMD_FRAME(3, 3), + ANIMCMD_FRAME(0, 5), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gUnknown_08592588[] = +{ + gUnknown_0859257C, +}; + +const struct SpriteTemplate gUnknown_0859258C = +{ + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, + .oam = &gUnknown_08524904, + .anims = gUnknown_08592588, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FF934, +}; + +const union AnimCmd gUnknown_085925A4[] = +{ + ANIMCMD_FRAME(0, 30), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_085925AC[] = +{ + gUnknown_085925A4, +}; + +const union AffineAnimCmd gUnknown_085925B0[] = { + AFFINEANIMCMD_FRAME(0, 0, -4, 10), + AFFINEANIMCMD_FRAME(0, 0, 4, 20), + AFFINEANIMCMD_FRAME(0, 0, -4, 10), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_085925D0[] = { + AFFINEANIMCMD_FRAME(0, 0, -1, 2), + AFFINEANIMCMD_FRAME(0, 0, 1, 4), + AFFINEANIMCMD_FRAME(0, 0, -1, 4), + AFFINEANIMCMD_FRAME(0, 0, 1, 4), + AFFINEANIMCMD_FRAME(0, 0, -1, 4), + AFFINEANIMCMD_FRAME(0, 0, 1, 2), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gUnknown_08592608[] = { + gUnknown_085925B0, + gUnknown_085925D0, +}; + +const struct SpriteTemplate gUnknown_08592610 = +{ + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, + .oam = &gUnknown_08524974, + .anims = gUnknown_085925AC, + .images = NULL, + .affineAnims = gUnknown_08592608, + .callback = sub_80FFB18, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_8592628 = +{ + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, + .oam = &gUnknown_08524974, + .anims = gUnknown_085925AC, + .images = NULL, + .affineAnims = gUnknown_08592608, + .callback = sub_80FFBF4, +}; + +const union AnimCmd gUnknown_08592640[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(12, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592654[] = +{ + gUnknown_08592640, +}; + +const struct SpriteTemplate gUnknown_08592658 = +{ + .tileTag = ANIM_TAG_GREEN_SPARKLE, + .paletteTag = ANIM_TAG_GREEN_SPARKLE, + .oam = &gUnknown_0852490C, + .anims = gUnknown_08592654, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80FFC70, +}; + +const struct SpriteTemplate gUnknown_08592670 = +{ + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, + .oam = &gUnknown_08524974, + .anims = gUnknown_085925AC, + .images = NULL, + .affineAnims = gUnknown_08592608, + .callback = sub_80FFCB4, +}; + +const union AffineAnimCmd gUnknown_08592688[] = { + AFFINEANIMCMD_FRAME(0, 0, 0, 3), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_08592698[] = { + AFFINEANIMCMD_FRAME(0, -10, 0, 3), + AFFINEANIMCMD_FRAME(0, -6, 0, 3), + AFFINEANIMCMD_FRAME(0, -2, 0, 3), + AFFINEANIMCMD_FRAME(0, 0, 0, 3), + AFFINEANIMCMD_FRAME(0, 2, 0, 3), + AFFINEANIMCMD_FRAME(0, 6, 0, 3), + AFFINEANIMCMD_FRAME(0, 10, 0, 3), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gUnknown_085926D8[] = { + gUnknown_08592688, + gUnknown_08592698, + gUnknown_085925B0, + gUnknown_085925D0, +}; + +const struct SpriteTemplate gUnknown_085926E8 = +{ + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, + .oam = &gUnknown_08524974, + .anims = gUnknown_085925AC, + .images = NULL, + .affineAnims = gUnknown_085926D8, + .callback = sub_80FFDBC, +}; + +const s8 gUnknown_08592700[][3] = +{ + {5, 24, 1}, + {0, 4, 0}, + {8, 16, -1}, + {0, 2, 0}, + {8, 16, 1}, + {0, 2, 0}, + {8, 16, 1}, + {0, 2, 0}, + {8, 16, 1}, + {0, 16, 0}, + {0, 0, 127}, +}; + +const union AnimCmd gUnknown_08592724[] = +{ + ANIMCMD_FRAME(28, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_0859272C[] = +{ + ANIMCMD_FRAME(32, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592734[] = +{ + ANIMCMD_FRAME(20, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_0859273C[] = +{ + ANIMCMD_FRAME(28, 1, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592744[] = +{ + ANIMCMD_FRAME(16, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_0859274C[] = +{ + ANIMCMD_FRAME(16, 1, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592754[] = +{ + ANIMCMD_FRAME(28, 1), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_0859275C[] = +{ + gUnknown_08592724, + gUnknown_0859272C, + gUnknown_08592734, + gUnknown_0859273C, + gUnknown_08592744, + gUnknown_0859274C, + gUnknown_08592754, +}; + +const struct SpriteTemplate gUnknown_08592778 = +{ + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, + .oam = &gUnknown_0852490C, + .anims = gUnknown_0859275C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +const union AffineAnimCmd gUnknown_08592790[] = { + AFFINEANIMCMD_FRAME(256, 256, 0, 0), + AFFINEANIMCMD_FRAME(0, 0, 4, 1), + AFFINEANIMCMD_JUMP(1), +}; + +const union AffineAnimCmd *const gUnknown_085927A8[] = { + gUnknown_08592790, +}; + +const struct SpriteTemplate gUnknown_085927AC = +{ + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, + .oam = &gUnknown_08524904, + .anims = gUnknown_08592318, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8100640, +}; + +const struct SpriteTemplate gUnknown_085927C4 = +{ + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, + .oam = &gUnknown_0852496C, + .anims = gUnknown_08592314, + .images = NULL, + .affineAnims = gUnknown_085927A8, + .callback = sub_8100640, +}; + +const union AffineAnimCmd gUnknown_085927DC[] = { + AFFINEANIMCMD_FRAME(256, 256, 0, 0), + AFFINEANIMCMD_FRAME(0, 0, -10, 1), + AFFINEANIMCMD_JUMP(1), +}; + +const union AffineAnimCmd gUnknown_085927F4[] = { + AFFINEANIMCMD_FRAME(192, 192, 0, 0), + AFFINEANIMCMD_FRAME(0, 0, -12, 1), + AFFINEANIMCMD_JUMP(1), +}; + +const union AffineAnimCmd gUnknown_0859280C[] = { + AFFINEANIMCMD_FRAME(143, 143, 0, 0), + AFFINEANIMCMD_FRAME(0, 0, -15, 1), + AFFINEANIMCMD_JUMP(1), +}; + +const union AffineAnimCmd *const gUnknown_08592824[] = { + gUnknown_085927DC, +}; + +const union AffineAnimCmd *const gUnknown_08592828[] = { + gUnknown_085927F4, +}; + +const union AffineAnimCmd *const gUnknown_0859282C[] = { + gUnknown_0859280C, +}; + +const struct SpriteTemplate gUnknown_08592830 = +{ + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, + .oam = &gUnknown_0852496C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_08592824, + .callback = sub_8100640, +}; + +const struct SpriteTemplate gUnknown_08592848 = +{ + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, + .oam = &gUnknown_0852496C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_08592828, + .callback = sub_8100640, +}; + +const struct SpriteTemplate gUnknown_08592860 = +{ + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, + .oam = &gUnknown_0852496C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_0859282C, + .callback = sub_8100640, +}; + +const u16 gMagicalLeafBlendColors[] = +{ + RGB(31, 0, 0), + RGB(31, 19, 0), + RGB(31, 31, 0), + RGB(0, 31, 0), + RGB(5, 14, 31), + RGB(22, 10, 31), + RGB(22, 21, 31), +}; + +const struct SpriteTemplate gUnknown_08592888 = +{ + .tileTag = ANIM_TAG_GREEN_SPIKE, + .paletteTag = ANIM_TAG_GREEN_SPIKE, + .oam = &gUnknown_0852496C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8100898, +}; + +const union AnimCmd gUnknown_085928A0[] = +{ + ANIMCMD_FRAME(64, 3), + ANIMCMD_FRAME(80, 3), + ANIMCMD_FRAME(96, 3), + ANIMCMD_FRAME(112, 6), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085928B4[] = +{ + ANIMCMD_FRAME(64, 3, .hFlip = TRUE), + ANIMCMD_FRAME(80, 3, .hFlip = TRUE), + ANIMCMD_FRAME(96, 3, .hFlip = TRUE), + ANIMCMD_FRAME(112, 6, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_085928C8[] = +{ + gUnknown_085928A0, + gUnknown_085928B4, +}; + +const struct SpriteTemplate gUnknown_085928D0 = +{ + .tileTag = ANIM_TAG_SLAM_HIT, + .paletteTag = ANIM_TAG_SLAM_HIT, + .oam = &gUnknown_08524914, + .anims = gUnknown_085928C8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8100A50, +}; + +const struct SpriteTemplate gUnknown_085928E8 = +{ + .tileTag = ANIM_TAG_WHIP_HIT, + .paletteTag = ANIM_TAG_WHIP_HIT, + .oam = &gUnknown_08524914, + .anims = gUnknown_085928C8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8100A50, +}; + +const union AnimCmd gUnknown_08592900[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_FRAME(32, 4), + ANIMCMD_FRAME(48, 4), + ANIMCMD_FRAME(64, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592918[] = +{ + gUnknown_08592900, +}; + +const struct SpriteTemplate gUnknown_0859291C = +{ + .tileTag = ANIM_TAG_UNUSED_HIT, + .paletteTag = ANIM_TAG_UNUSED_HIT, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592918, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_81009F8, +}; + +const struct SpriteTemplate gUnknown_08592934 = +{ + .tileTag = ANIM_TAG_UNUSED_HIT_2, + .paletteTag = ANIM_TAG_UNUSED_HIT_2, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592918, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_81009F8, +}; + +const union AffineAnimCmd gUnknown_0859294C[] = { + AFFINEANIMCMD_FRAME(256, 256, 0, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_0859295C[] = { + AFFINEANIMCMD_FRAME(256, 256, 32, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_0859296C[] = { + AFFINEANIMCMD_FRAME(256, 256, 64, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_0859297C[] = { + AFFINEANIMCMD_FRAME(256, 256, 96, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_0859298C[] = { + AFFINEANIMCMD_FRAME(256, 256, -128, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_0859299C[] = { + AFFINEANIMCMD_FRAME(256, 256, -96, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_085929AC[] = { + AFFINEANIMCMD_FRAME(256, 256, -64, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_085929BC[] = { + AFFINEANIMCMD_FRAME(256, 256, -32, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gUnknown_085929CC[] = { + gUnknown_0859294C, + gUnknown_0859295C, + gUnknown_0859296C, + gUnknown_0859297C, + gUnknown_0859298C, + gUnknown_0859299C, + gUnknown_085929AC, + gUnknown_085929BC, +}; + +const struct SpriteTemplate gUnknown_085929EC = +{ + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, + .oam = &gUnknown_08524974, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_085929CC, + .callback = sub_8100A94, +}; + +const union AnimCmd gUnknown_08592A04[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(32, 5), + ANIMCMD_FRAME(48, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592A18[] = +{ + gUnknown_08592A04, +}; + +const struct SpriteTemplate gCuttingSliceSpriteTemplate = +{ + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, + .oam = &gUnknown_08524A34, + .anims = gUnknown_08592A18, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = AnimCuttingSlice, +}; + +const struct SpriteTemplate gUnknown_08592A34 = +{ + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, + .oam = &gUnknown_08524A34, + .anims = gUnknown_08592A18, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8100B88, +}; + +const union AnimCmd gUnknown_08592A4C[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A54[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A5C[] = +{ + ANIMCMD_FRAME(8, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A64[] = +{ + ANIMCMD_FRAME(12, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A6C[] = +{ + ANIMCMD_FRAME(16, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A74[] = +{ + ANIMCMD_FRAME(20, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A7C[] = +{ + ANIMCMD_FRAME(0, 1, .vFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A84[] = +{ + ANIMCMD_FRAME(4, 1, .vFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A8C[] = +{ + ANIMCMD_FRAME(8, 1, .vFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592A94[] = +{ + ANIMCMD_FRAME(12, 1, .vFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592A9C[] = +{ + gUnknown_08592A4C, + gUnknown_08592A54, + gUnknown_08592A5C, + gUnknown_08592A64, + gUnknown_08592A6C, + gUnknown_08592A74, + gUnknown_08592A7C, + gUnknown_08592A84, + gUnknown_08592A8C, + gUnknown_08592A94, +}; + +const struct SpriteTemplate gUnknown_08592AC4 = +{ + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, + .oam = &gUnknown_0852490C, + .anims = gUnknown_08592A9C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8100E1C, +}; + +const struct SpriteTemplate gUnknown_08592ADC = +{ + .tileTag = ANIM_TAG_PROTECT, + .paletteTag = ANIM_TAG_PROTECT, + .oam = &gUnknown_08524A3C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8100EF0, +}; + +const union AffineAnimCmd gUnknown_08592AF4[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_08592B04[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 12), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 6), + AFFINEANIMCMD_FRAME(0x0, 0x0, -2, 24), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 6), + AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 12), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd *const gUnknown_08592B34[] = +{ + gUnknown_08592AF4, + gUnknown_08592B04, +}; + +const struct SpriteTemplate gUnknown_08592B3C = +{ + .tileTag = ANIM_TAG_MILK_BOTTLE, + .paletteTag = ANIM_TAG_MILK_BOTTLE, + .oam = &gUnknown_08524A94, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_08592B34, + .callback = sub_81010CC, +}; + +const union AnimCmd gUnknown_08592B54[] = +{ + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(16, 7), + ANIMCMD_FRAME(32, 7), + ANIMCMD_FRAME(48, 7), + ANIMCMD_FRAME(64, 7), + ANIMCMD_FRAME(80, 7), + ANIMCMD_FRAME(96, 7), + ANIMCMD_FRAME(112, 7), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gUnknown_08592B78[] = +{ + gUnknown_08592B54, +}; + +const struct SpriteTemplate gUnknown_08592B7C = +{ + .tileTag = ANIM_TAG_SPARKLE_2, + .paletteTag = ANIM_TAG_SPARKLE_2, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592B78, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_810130C, +}; + +const struct SpriteTemplate gUnknown_08592B94 = +{ + .tileTag = ANIM_TAG_SPARKLE_2, + .paletteTag = ANIM_TAG_SPARKLE_2, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592B78, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_810135C, +}; + +const union AnimCmd gUnknown_08592BAC[] = +{ + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(4, 10), + ANIMCMD_FRAME(8, 10), + ANIMCMD_FRAME(12, 10), + ANIMCMD_FRAME(16, 26), + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(20, 5), + ANIMCMD_FRAME(24, 15), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592BD0[] = +{ + ANIMCMD_FRAME(0, 10, .hFlip = TRUE), + ANIMCMD_FRAME(4, 10, .hFlip = TRUE), + ANIMCMD_FRAME(8, 10, .hFlip = TRUE), + ANIMCMD_FRAME(12, 10, .hFlip = TRUE), + ANIMCMD_FRAME(16, 26, .hFlip = TRUE), + ANIMCMD_FRAME(16, 5, .hFlip = TRUE), + ANIMCMD_FRAME(20, 5, .hFlip = TRUE), + ANIMCMD_FRAME(24, 15, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592BF4[] = +{ + gUnknown_08592BAC, + gUnknown_08592BD0, +}; + +const struct SpriteTemplate gUnknown_08592BFC = +{ + .tileTag = ANIM_TAG_UNUSED_BUBBLE_BURST, + .paletteTag = ANIM_TAG_UNUSED_BUBBLE_BURST, + .oam = &gUnknown_0852490C, + .anims = gUnknown_08592BF4, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8101440, +}; + +const union AnimCmd gUnknown_08592C14[] = +{ + ANIMCMD_FRAME(0, 40), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592C1C[] = +{ + gUnknown_08592C14, +}; + +const union AffineAnimCmd gUnknown_08592C20[] = +{ + AFFINEANIMCMD_FRAME(0x14, 0x14, -30, 0), + AFFINEANIMCMD_FRAME(0x8, 0x8, 1, 24), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_08592C20_2[] = +{ + AFFINEANIMCMD_LOOP(0), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24), + AFFINEANIMCMD_LOOP(10), +}; + +const union AffineAnimCmd gUnknown_08592C50[] = +{ + AFFINEANIMCMD_FRAME(0x14, 0x14, 30, 0), + AFFINEANIMCMD_FRAME(0x8, 0x8, -1, 24), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_08592C50_2[] = +{ + AFFINEANIMCMD_LOOP(0), + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 24), + AFFINEANIMCMD_LOOP(10), +}; + +const union AffineAnimCmd *const gUnknown_08592C80[] = +{ + gUnknown_08592C20, + gUnknown_08592C50, +}; + +const struct SpriteTemplate gUnknown_08592C88 = +{ + .tileTag = ANIM_TAG_LETTER_Z, + .paletteTag = ANIM_TAG_LETTER_Z, + .oam = &gUnknown_08524974, + .anims = gUnknown_08592C1C, + .images = NULL, + .affineAnims = gUnknown_08592C80, + .callback = sub_81014F4, +}; + +const struct SpriteTemplate gUnknown_08592CA0 = +{ + .tileTag = ANIM_TAG_LOCK_ON, + .paletteTag = ANIM_TAG_LOCK_ON, + .oam = &gUnknown_08524914, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_81015AC, +}; + +const struct SpriteTemplate gUnknown_08592CB8 = +{ + .tileTag = ANIM_TAG_LOCK_ON, + .paletteTag = ANIM_TAG_LOCK_ON, + .oam = &gUnknown_0852490C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8101898, +}; + +const s8 gUnknown_08592CD0[][2] = +{ + { 64, 64}, + { 0, -64}, + {-64, 64}, + { 32, -32}, +}; + +const struct SpriteTemplate gUnknown_08592CD8 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8101940, +}; + +const struct SpriteTemplate gUnknown_08592CF0 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8101B90, +}; + +const union AnimCmd gUnknown_08592D08[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_FRAME(32, 4), + ANIMCMD_FRAME(48, 4), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592D1C[] = +{ + ANIMCMD_FRAME(48, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592D24[] = +{ + gUnknown_08592D08, + gUnknown_08592D1C, +}; + +const struct SpriteTemplate gUnknown_08592D2C = +{ + .tileTag = ANIM_TAG_SLASH, + .paletteTag = ANIM_TAG_SLASH, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592D24, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8101F40, +}; + +const struct SpriteTemplate gUnknown_08592D44 = +{ + .tileTag = ANIM_TAG_SLASH_2, + .paletteTag = ANIM_TAG_SLASH_2, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592D24, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8101FA8, +}; + +const struct SpriteTemplate gUnknown_08592D5C = +{ + .tileTag = ANIM_TAG_SLASH_2, + .paletteTag = ANIM_TAG_SLASH_2, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592D24, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8101FF0, +}; + +const union AnimCmd gUnknown_08592D74[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(8, 12), + ANIMCMD_FRAME(16, 4), + ANIMCMD_FRAME(24, 4), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592D88[] = +{ + gUnknown_08592D74, +}; + +const struct SpriteTemplate gUnknown_08592D8C = +{ + .tileTag = ANIM_TAG_FOCUS_ENERGY, + .paletteTag = ANIM_TAG_FOCUS_ENERGY, + .oam = &gUnknown_08524954, + .anims = gUnknown_08592D88, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_81020D8, +}; + +const union AnimCmd gUnknown_08592DA4[] = +{ + ANIMCMD_FRAME(0, 18), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(16, 18), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(16, 6), + ANIMCMD_FRAME(32, 18), + ANIMCMD_FRAME(16, 6), + ANIMCMD_FRAME(32, 6), + ANIMCMD_FRAME(48, 18), + ANIMCMD_FRAME(32, 6), + ANIMCMD_FRAME(48, 6), + ANIMCMD_FRAME(64, 18), + ANIMCMD_FRAME(48, 6), + ANIMCMD_FRAME(64, 54), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592DE0[] = +{ + gUnknown_08592DA4, +}; + +const struct SpriteTemplate gUnknown_08592DE4 = +{ + .tileTag = ANIM_TAG_SPHERE_TO_CUBE, + .paletteTag = ANIM_TAG_SPHERE_TO_CUBE, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592DE0, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_810217C, +}; + +const struct SpriteTemplate gUnknown_08592DFC = +{ + .tileTag = ANIM_TAG_BLACK_BALL, + .paletteTag = ANIM_TAG_BLACK_BALL, + .oam = &gUnknown_08524904, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = TranslateAnimSpriteToTargetMonLocation, +}; + +const union AnimCmd gUnknown_08592E14[] = +{ + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(16, 3), + ANIMCMD_FRAME(32, 3), + ANIMCMD_FRAME(48, 3), + ANIMCMD_FRAME(64, 3), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592E2C[] = +{ + gUnknown_08592E14, +}; + +const struct SpriteTemplate gUnknown_08592E30 = +{ + .tileTag = ANIM_TAG_GRAY_SMOKE, + .paletteTag = ANIM_TAG_GRAY_SMOKE, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592E2C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A77C8, +}; + +const union AnimCmd gUnknown_08592E48[] = +{ + ANIMCMD_FRAME(3, 5), + ANIMCMD_FRAME(2, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592E5C[] = +{ + gUnknown_08592E48, +}; + +const union AffineAnimCmd gUnknown_08592E60[] = +{ + AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gUnknown_08592E70[] = +{ + gUnknown_08592E60, +}; + +const struct SpriteTemplate gUnknown_08592E74 = +{ + .tileTag = ANIM_TAG_CONVERSION, + .paletteTag = ANIM_TAG_CONVERSION, + .oam = &gUnknown_08524AE4, + .anims = gUnknown_08592E5C, + .images = NULL, + .affineAnims = gUnknown_08592E70, + .callback = sub_8102268, +}; + +const union AnimCmd gUnknown_08592E8C[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(2, 5), + ANIMCMD_FRAME(3, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592EA0[] = +{ + gUnknown_08592E8C, +}; + +const struct SpriteTemplate gUnknown_08592EA4 = +{ + .tileTag = ANIM_TAG_CONVERSION, + .paletteTag = ANIM_TAG_CONVERSION, + .oam = &gUnknown_08524AE4, + .anims = gUnknown_08592EA0, + .images = NULL, + .affineAnims = gUnknown_08592E70, + .callback = sub_810234C, +}; + +const struct SpriteTemplate gUnknown_08592EBC = +{ + .tileTag = ANIM_TAG_MOON, + .paletteTag = ANIM_TAG_MOON, + .oam = &gUnknown_08524A3C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_81024E0, +}; + +const union AnimCmd gUnknown_08592ED4[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(8, 8), + ANIMCMD_FRAME(12, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gUnknown_08592EE8[] = +{ + gUnknown_08592ED4, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_8592EEC = +{ + .tileTag = ANIM_TAG_GREEN_SPARKLE, + .paletteTag = ANIM_TAG_GREEN_SPARKLE, + .oam = &gUnknown_0852490C, + .anims = gUnknown_08592EE8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8102540, +}; + +const union AnimCmd gUnknown_08592F04[] = +{ + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(16, 2), + ANIMCMD_FRAME(32, 2), + ANIMCMD_FRAME(48, 3), + ANIMCMD_FRAME(64, 5), + ANIMCMD_FRAME(80, 3), + ANIMCMD_FRAME(96, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592F28[] = +{ + gUnknown_08592F04, +}; + +const struct SpriteTemplate gUnknown_08592F2C = +{ + .tileTag = ANIM_TAG_BLUE_STAR, + .paletteTag = ANIM_TAG_BLUE_STAR, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592F28, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A77C8, +}; + +const struct SpriteTemplate gUnknown_08592F44 = +{ + .tileTag = ANIM_TAG_HORN_HIT, + .paletteTag = ANIM_TAG_HORN_HIT, + .oam = &gUnknown_08524914, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8102844, +}; + +const union AnimCmd gUnknown_08592F5C[] = +{ + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(16, 2), + ANIMCMD_FRAME(32, 2), + ANIMCMD_FRAME(48, 2), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592F70[] = +{ + gUnknown_08592F5C, +}; + +const struct SpriteTemplate gUnknown_08592F74 = +{ + .tileTag = ANIM_TAG_FANG_ATTACK, + .paletteTag = ANIM_TAG_FANG_ATTACK, + .oam = &gUnknown_08524914, + .anims = gUnknown_08592F70, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8102BCC, +}; + +const union AnimCmd gUnknown_08592F8C[] = +{ + ANIMCMD_FRAME(0, 10), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592F94[] = +{ + ANIMCMD_FRAME(4, 10), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592F9C[] = +{ + ANIMCMD_FRAME(8, 41), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592FA4[] = +{ + ANIMCMD_FRAME(12, 10), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592FAC[] = +{ + ANIMCMD_FRAME(16, 10), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592FB4[] = +{ + ANIMCMD_FRAME(20, 10), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592FBC[] = +{ + ANIMCMD_FRAME(0, 10, .vFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_08592FC4[] = +{ + ANIMCMD_FRAME(4, 10, .vFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08592FCC[] = +{ + gUnknown_08592F8C, + gUnknown_08592F94, + gUnknown_08592F9C, + gUnknown_08592FA4, + gUnknown_08592FAC, + gUnknown_08592FB4, + gUnknown_08592FBC, + gUnknown_08592FC4, +}; + +const union AffineAnimCmd gUnknown_08592FEC[] = +{ + AFFINEANIMCMD_FRAME(0xC, 0xC, 0, 16), + AFFINEANIMCMD_FRAME(0xFFF4, 0xFFF4, 0, 16), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd *const gUnknown_08593004[] = +{ + gUnknown_08592FEC, +}; + +const struct SpriteTemplate gUnknown_08593008 = +{ + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, + .oam = &gUnknown_085249CC, + .anims = gUnknown_08592FCC, + .images = NULL, + .affineAnims = gUnknown_08593004, + .callback = sub_8102CD4, +}; + +const u16 gUnknown_08593020[][6] = +{ + {ANIM_TAG_MUSIC_NOTES, RGB(31, 31, 31), RGB(31, 26, 28), RGB(31, 22, 26), RGB(31, 17, 24), RGB(31, 13, 22)}, + {ANIM_TAG_BENT_SPOON, RGB(31, 31, 31), RGB(25, 31, 26), RGB(20, 31, 21), RGB(15, 31, 16), RGB(10, 31, 12)}, + {ANIM_TAG_SPHERE_TO_CUBE, RGB(31, 31, 31), RGB(31, 31, 24), RGB(31, 31, 17), RGB(31, 31, 10), RGB(31, 31, 3)}, + {ANIM_TAG_LARGE_FRESH_EGG, RGB(31, 31, 31), RGB(26, 28, 31), RGB(21, 26, 31), RGB(16, 24, 31), RGB(12, 22, 31)}, +}; + +const struct SpriteTemplate gUnknown_08593050 = +{ + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, + .oam = &gUnknown_085249CC, + .anims = gUnknown_08592FCC, + .images = NULL, + .affineAnims = gUnknown_08593004, + .callback = sub_8102EB0, +}; + +const struct SpriteTemplate gUnknown_08593068 = +{ + .tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE, + .paletteTag = ANIM_TAG_PURPLE_HAND_OUTLINE, + .oam = &gUnknown_08524914, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8102FB8, +}; + +const union AffineAnimCmd gUnknown_08593080[] = +{ + AFFINEANIMCMD_FRAME(0xA0, 0xA0, 0, 0), + AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 1), + AFFINEANIMCMD_JUMP(1), +}; + +const union AffineAnimCmd *const gUnknown_08593098[] = +{ + gUnknown_08593080, +}; + +const struct SpriteTemplate gUnknown_0859309C = +{ + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, + .oam = &gUnknown_085249CC, + .anims = gUnknown_08592FCC, + .images = NULL, + .affineAnims = gUnknown_08593098, + .callback = sub_8103028, +}; + +const union AnimCmd gUnknown_085930B4[] = +{ + ANIMCMD_FRAME(0, 2, .hFlip = TRUE), + ANIMCMD_FRAME(16, 2, .hFlip = TRUE), + ANIMCMD_FRAME(32, 2, .hFlip = TRUE), + ANIMCMD_FRAME(48, 2, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085930C8[] = +{ + ANIMCMD_FRAME(48, 2, .hFlip = TRUE), + ANIMCMD_FRAME(32, 2, .hFlip = TRUE), + ANIMCMD_FRAME(16, 2, .hFlip = TRUE), + ANIMCMD_FRAME(0, 2, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085930DC[] = +{ + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(16, 2), + ANIMCMD_FRAME(32, 2), + ANIMCMD_FRAME(48, 2), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085930F0[] = +{ + ANIMCMD_FRAME(48, 2), + ANIMCMD_FRAME(32, 2), + ANIMCMD_FRAME(16, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_08593104[] = +{ + gUnknown_085930B4, + gUnknown_085930DC, + gUnknown_085930C8, + gUnknown_085930F0, +}; + +const struct SpriteTemplate gUnknown_08593114 = +{ + .tileTag = ANIM_TAG_THOUGHT_BUBBLE, + .paletteTag = ANIM_TAG_THOUGHT_BUBBLE, + .oam = &gUnknown_08524914, + .anims = gUnknown_08593104, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8103164, +}; + +const union AffineAnimCmd gUnknown_0859312C[] = +{ + AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), + AFFINEANIMCMD_FRAME(0x1E, 0x1E, 0, 8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_08593144[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 4, 11), + AFFINEANIMCMD_FRAME(0x0, 0x0, -4, 11), + AFFINEANIMCMD_LOOP(2), + AFFINEANIMCMD_FRAME(0xFFE2, 0xFFE2, 0, 8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gUnknown_08593144_2[] = +{ + AFFINEANIMCMD_FRAME(16, 16, 0, 0), + AFFINEANIMCMD_FRAME(30, 30, 0, 8), + AFFINEANIMCMD_FRAME(0, 0, 0, 16), + AFFINEANIMCMD_LOOP(0), + AFFINEANIMCMD_FRAME(0, 0, 4, 11), + AFFINEANIMCMD_FRAME(0, 0, -4, 11), + AFFINEANIMCMD_LOOP(2), + AFFINEANIMCMD_FRAME(-30, -30, 0, 8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd *const gUnknown_085931B4[] = +{ + gUnknown_0859312C, + gUnknown_08593144, +}; + +const struct SpriteTemplate gUnknown_085931BC = +{ + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, + .oam = &gUnknown_085249D4, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_085931B4, + .callback = sub_8103208, +}; + +const struct SpriteTemplate gUnknown_085931D4 = +{ + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, + .oam = &gUnknown_08524974, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gUnknown_085931B4, + .callback = sub_8103284, +}; + +const union AnimCmd gUnknown_085931EC[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085931F4[] = +{ + ANIMCMD_FRAME(0, 1, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_085931FC[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_FRAME(32, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_FRAME(32, 4), + ANIMCMD_END, +}; + +const union AnimCmd gUnknown_0859321C[] = +{ + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_FRAME(16, 4, .hFlip = TRUE), + ANIMCMD_FRAME(32, 4, .hFlip = TRUE), + ANIMCMD_FRAME(16, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_FRAME(16, 4, .hFlip = TRUE), + ANIMCMD_FRAME(32, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd *const gUnknown_0859323C[] = +{ + gUnknown_085931EC, + gUnknown_085931F4, + gUnknown_085931FC, + gUnknown_0859321C, +}; + +const struct SpriteTemplate gUnknown_0859324C = +{ + .tileTag = ANIM_TAG_FINGER_2, + .paletteTag = ANIM_TAG_FINGER_2, + .oam = &gUnknown_08524914, + .anims = gUnknown_0859323C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8103390, +}; + +// Animates the falling particles that horizontally wave back and forth. +// Used by Sleep Powder, Stun Spore, and Poison Powder. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: total duration in frames +// arg 3: vertical movement speed (sub-pixel value) +// arg 4: wave amplitude +// arg 5: wave speed +void AnimMovePowderParticle(struct Sprite* sprite) +{ + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + + if (GetBattlerSide(gBattleAnimAttacker)) + { + sprite->data[3] = -gBattleAnimArgs[4]; + } + else + { + sprite->data[3] = gBattleAnimArgs[4]; + } + + sprite->data[4] = gBattleAnimArgs[5]; + sprite->callback = AnimMovePowderParticleStep; +} + +static void AnimMovePowderParticleStep(struct Sprite* sprite) +{ + if (sprite->data[0] > 0) + { + sprite->data[0]--; + sprite->pos2.y = sprite->data[2] >> 8; + sprite->data[2] += sprite->data[1]; + sprite->pos2.x = Sin(sprite->data[5], sprite->data[3]); + sprite->data[5] = (sprite->data[5] + sprite->data[4]) & 0xFF; + } + else + { + DestroyAnimSprite(sprite); + } +} + +void sub_80FE8E0(struct Sprite* sprite) +{ + InitAnimSpritePos(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->callback = StartAnimLinearTranslation; + StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); +} + +void sub_80FE930(struct Sprite* sprite) +{ + InitAnimSpritePos(sprite, 1); + StartSpriteAnim(sprite, gBattleAnimArgs[3]); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->callback = StartAnimLinearTranslation; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +void sub_80FE988(struct Sprite* sprite) +{ + InitAnimSpritePos(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + InitAnimLinearTranslation(sprite); + sprite->data[5] = gBattleAnimArgs[3]; + sprite->callback = sub_80FE9E4; + sprite->callback(sprite); +} + +static void sub_80FE9E4(struct Sprite* sprite) +{ + if (TranslateAnimLinear(sprite)) + { + DestroySprite(sprite); + } + else + { + if (sprite->data[5] > 0x7F) + sprite->subpriority = sub_80A82E4(gBattleAnimTarget) + 1; + else + sprite->subpriority = sub_80A82E4(gBattleAnimTarget) + 6; + + sprite->pos2.x += Sin(sprite->data[5], 5); + sprite->pos2.y += Cos(sprite->data[5], 14); + sprite->data[5] = (sprite->data[5] + 15) & 0xFF; + } +} + +void sub_80FEA58(u8 taskId) +{ + gTasks[taskId].data[0]--; + if (gTasks[taskId].data[0] == -1) + { + gTasks[taskId].data[1]++; + gTasks[taskId].data[0] = 6; + gBattleAnimArgs[0] = 15; + gBattleAnimArgs[1] = 0; + gBattleAnimArgs[2] = 80; + gBattleAnimArgs[3] = 0; + CreateSpriteAndAnimate(&gUnknown_08592210, 0, 0, sub_80A82E4(gBattleAnimTarget) + 1); + } + + if (gTasks[taskId].data[1] == 15) + DestroyAnimVisualTask(taskId); +} + +void sub_80FEAD8(struct Sprite* sprite) +{ + sub_80A6980(sprite, TRUE); + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->data[5] = gBattleAnimArgs[2]; + InitAnimArcTranslation(sprite); + sprite->callback = sub_80FEB28; +} + +static void sub_80FEB28(struct Sprite* sprite) +{ + if (TranslateAnimArc(sprite)) + DestroyAnimSprite(sprite); +} + +void sub_80FEB44(struct Sprite* sprite) +{ + u16 a = Random2(); + u16 b; + + StartSpriteAnim(sprite, a & 7); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + if (GetBattlerSide(gBattleAnimAttacker)) + { + sprite->pos1.x -= 20; + } + else + { + sprite->pos1.x += 20; + } + + b = Random2(); + sprite->data[0] = (b & 31) + 64; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sub_80A7160(sprite); + sprite->data[5] = Random2() & 0xFF; + sprite->data[6] = sprite->subpriority; + sprite->callback = sub_80FEBFC; + sprite->callback(sprite); +} + +static void sub_80FEBFC(struct Sprite* sprite) +{ + if (sub_80A70E8(sprite)) + { + DestroyAnimSprite(sprite); + } + else + { + sprite->pos2.y += Cos(sprite->data[5], 12); + if (sprite->data[5] < 0x7F) + sprite->subpriority = sprite->data[6]; + else + sprite->subpriority = sprite->data[6] + 1; + + sprite->data[5] = (sprite->data[5] + 24) & 0xFF; + } +} + +// seed (sprouts a sapling from a seed.) +// Used by Leech Seed. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: target x pixel offset +// arg 3: target y pixel offset +// arg 4: duration +// arg 5: wave amplitude +void AnimLeechSeed(struct Sprite* sprite) +{ + InitAnimSpritePos(sprite, 1); + if (GetBattlerSide(gBattleAnimAttacker)) + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; + sprite->data[5] = gBattleAnimArgs[5]; + InitAnimArcTranslation(sprite); + sprite->callback = AnimLeechSeedStep; +} + +static void AnimLeechSeedStep(struct Sprite* sprite) +{ + if (TranslateAnimArc(sprite)) + { + sprite->invisible = 1; + sprite->data[0] = 10; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData6(sprite, AnimLeechSeedSprouts); + } +} + +static void AnimLeechSeedSprouts(struct Sprite* sprite) +{ + sprite->invisible = 0; + StartSpriteAnim(sprite, 1); + sprite->data[0] = 60; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +void sub_80FED28(struct Sprite* sprite) +{ + sub_80A6980(sprite, TRUE); + StartSpriteAnim(sprite, gBattleAnimArgs[4]); + if (gBattleAnimArgs[4] == 1) + sprite->oam.objMode = ST_OAM_OBJ_BLEND; + + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[1] = gBattleAnimArgs[2]; + sprite->callback = sub_80FED74; + sprite->callback(sprite); +} + +static void sub_80FED74(struct Sprite* sprite) +{ + sprite->pos2.x = Sin(sprite->data[1], 32); + sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8); + if ((u16)(sprite->data[1] - 0x40) < 0x80) + { + sprite->oam.priority = (sub_80A8328(gBattleAnimTarget) & 3); + } + else + { + u8 priority = sub_80A8328(gBattleAnimTarget) + 1; + if (priority > 3) + priority = 3; + + sprite->oam.priority = priority; + } + + sprite->data[1] = (sprite->data[1] + 2) & 0xFF; + if (--sprite->data[0] == -1) + DestroyAnimSprite(sprite); +} + +void sub_80FEE1C(u8 taskId) +{ + if (IsContest() || !IsDoubleBattle()) + { + DestroyAnimVisualTask(taskId); + } + else + { + if (sub_80A8364(gBattleAnimTarget) == 1) + SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 3); + else + SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1); + + DestroyAnimVisualTask(taskId); + } +} + +void sub_80FEE78(struct Sprite* sprite) +{ + InitAnimSpritePos(sprite, 0); + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; + InitAnimLinearTranslation(sprite); + sprite->data[5] = 0x40; + sprite->callback = sub_80FEECC; + sprite->callback(sprite); +} + +static void sub_80FEECC(struct Sprite* sprite) +{ + if (!TranslateAnimLinear(sprite)) + { + sprite->pos2.x += Sin(sprite->data[5], 32); + sprite->pos2.y += Cos(sprite->data[5], -5); + if ((u16)(sprite->data[5] - 0x40) < 0x80) + sprite->subpriority = sub_80A82E4(gBattleAnimAttacker) - 1; + else + sprite->subpriority = sub_80A82E4(gBattleAnimAttacker) + 1; + + sprite->data[5] = (sprite->data[5] + 5) & 0xFF; + } + else + { + DestroyAnimSprite(sprite); + } +} + +void sub_80FEF44(struct Sprite* sprite) +{ + InitAnimSpritePos(sprite, 1); + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; + InitAnimLinearTranslation(sprite); + sprite->data[5] = 0x40; + sprite->callback = sub_80FEF98; + sprite->callback(sprite); +} + +static void sub_80FEF98(struct Sprite* sprite) +{ + if (!TranslateAnimLinear(sprite)) + { + sprite->pos2.x += Sin(sprite->data[5], 8); + if ((u16)(sprite->data[5] - 59) < 5 || (u16)(sprite->data[5] - 187) < 5) + sprite->oam.matrixNum ^= 0x8; + + sprite->data[5] = (sprite->data[5] + 5) & 0xFF; + } + else + { + DestroyAnimSprite(sprite); + } +} + +void sub_80FEFFC(struct Sprite* sprite) +{ + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[2]; + sprite->callback = sub_80FF044; +} + +static void sub_80FF044(struct Sprite* sprite) +{ + if (!sprite->data[2]) + { + if (sprite->data[1] & 1) + { + sprite->data[0] = 0x80; + sprite->data[1] = 0; + sprite->data[2] = 0; + } + else + { + sprite->data[0] = sprite->data[1] & 1; + sprite->data[1] = sprite->data[1] & 1; + sprite->data[2] = sprite->data[1] & 1; + } + sprite->callback = sub_80FF090; + } + else + { + sprite->data[2]--; + sprite->pos1.x += sprite->data[0]; + sprite->pos1.y += sprite->data[1]; + } +} + +static void sub_80FF090(struct Sprite* sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker)) + sprite->pos2.x = -Sin(sprite->data[0], 25); + else + sprite->pos2.x = Sin(sprite->data[0], 25); + + sprite->data[0] = (sprite->data[0] + 2) & 0xFF; + sprite->data[1]++; + if (!(sprite->data[1] & 1)) + sprite->pos2.y++; + + if (sprite->data[1] > 80) + DestroyAnimSprite(sprite); +} + +// Animates a sprite that moves linearly from one location to another, with a +// single-cycle sine wave added to the y position along the way. +// Used by Razor Leaf and Magical Leaf. +// arg 0: initial x offset +// arg 1: initial y offset +// arg 2: target x offset +// arg 3: target y offset +// arg 4: translation duration +// arg 5: wave amplitude +// arg 6: target between double battle opponents (boolean) +void AnimTranslateLinearSingleSineWave(struct Sprite* sprite) +{ + InitAnimSpritePos(sprite, 1); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + + sprite->data[0] = gBattleAnimArgs[4]; + if (!gBattleAnimArgs[6]) + { + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; + } + else + { + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]); + sprite->data[2] += gBattleAnimArgs[2]; + sprite->data[4] += gBattleAnimArgs[3]; + } + + sprite->data[5] = gBattleAnimArgs[5]; + InitAnimArcTranslation(sprite); + if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) + sprite->data[0] = 1; + else + sprite->data[0] = 0; + + sprite->callback = AnimTranslateLinearSingleSineWaveStep; +} + +static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite) +{ + bool8 destroy = FALSE; + s16 a = sprite->data[0]; + s16 b = sprite->data[7]; + s16 r0; + + sprite->data[0] = 1; + TranslateAnimArc(sprite); + r0 = sprite->data[7]; + sprite->data[0] = a; + if (b > 200 && r0 < 56 && sprite->oam.affineParam == 0) + sprite->oam.affineParam++; + + if (sprite->oam.affineParam && sprite->data[0]) + { + sprite->invisible ^= 1; + sprite->oam.affineParam++; + if (sprite->oam.affineParam == 30) + destroy = TRUE; + } + + if (sprite->pos1.x + sprite->pos2.x > 256 + || sprite->pos1.x + sprite->pos2.x < -16 + || sprite->pos1.y + sprite->pos2.y > 160 + || sprite->pos1.y + sprite->pos2.y < -16) + destroy = TRUE; + + if (destroy) + DestroyAnimSprite(sprite); +} + +// Animates particles in the Twister move animation. +// arg 0: duration +// arg 1: total y delta (the particles rise upward) +// arg 2: wave period (higher means faster wave) +// arg 3: wave amplitude +// arg 4: speedup frame (particles move faster at the end of the animation) +void AnimMoveTwisterParticle(struct Sprite* sprite) +{ + if (IsDoubleBattle() == TRUE) + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y); + + sprite->pos1.y += 32; + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[2]; + sprite->data[3] = gBattleAnimArgs[3]; + sprite->data[4] = gBattleAnimArgs[4]; + sprite->callback = AnimMoveTwisterParticleStep; +} + +static void AnimMoveTwisterParticleStep(struct Sprite* sprite) +{ + if (sprite->data[1] == 0xFF) + { + sprite->pos1.y -= 2; + } + else if (sprite->data[1] > 0) + { + sprite->pos1.y -= 2; + sprite->data[1] -= 2; + } + + sprite->data[5] += sprite->data[2]; + if (sprite->data[0] < sprite->data[4]) + sprite->data[5] += sprite->data[2]; + + sprite->data[5] &= 0xFF; + sprite->pos2.x = Cos(sprite->data[5], sprite->data[3]); + sprite->pos2.y = Sin(sprite->data[5], 5); + if (sprite->data[5] < 0x80) + sprite->oam.priority = sub_80A8328(gBattleAnimTarget) - 1; + else + sprite->oam.priority = sub_80A8328(gBattleAnimTarget) + 1; + + if (--sprite->data[0] == 0) + DestroyAnimSprite(sprite); +} + +void sub_80FF374(struct Sprite* sprite) +{ + sub_80A6980(sprite, FALSE); + sprite->affineAnimPaused = 1; + StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]); + sprite->data[6] = gBattleAnimArgs[2]; + sprite->data[7] = gBattleAnimArgs[3]; + sprite->callback = sub_80FF3B0; +} + +static void sub_80FF3B0(struct Sprite* sprite) +{ + if ((u16)gBattleAnimArgs[7] == 0xFFFF) + { + sprite->affineAnimPaused = 0; + GetAnimBattlerSpriteId(1); + sprite->data[0] = 0x100; + sprite->callback = sub_80FF3EC; + } +} + +static void sub_80FF3EC(struct Sprite* sprite) +{ + GetAnimBattlerSpriteId(1); + if (!sprite->data[2]) + sprite->data[0] += 11; + else + sprite->data[0] -= 11; + + if (++sprite->data[1] == 6) + { + sprite->data[1] = 0; + sprite->data[2] ^= 1; + } + + if (sprite->affineAnimEnded) + { + if (--sprite->data[7] > 0) + StartSpriteAffineAnim(sprite, sprite->data[6]); + else + DestroyAnimSprite(sprite); + } +} + +void sub_80FF458(u8 taskId) +{ + u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); + if (gSprites[spriteId].invisible) + { + DestroyAnimVisualTask(taskId); + } + else + { + sub_80A7270(spriteId, 1); + gTasks[taskId].data[14] = gSprites[spriteId].oam.priority; + gSprites[spriteId].oam.priority = sub_80A8328(gBattleAnimTarget); + spriteId = GetAnimBattlerSpriteId(ANIM_DEF_PARTNER); + gTasks[taskId].data[15] = gSprites[spriteId].oam.priority; + gSprites[spriteId].oam.priority = sub_80A8328(BATTLE_PARTNER(gBattleAnimTarget)); + gTasks[taskId].data[0] = gBattleAnimArgs[0]; + gTasks[taskId].data[1] = gBattleAnimArgs[1]; + gTasks[taskId].data[11] = 256; + gTasks[taskId].func = sub_80FF53C; + } +} + +static void sub_80FF53C(u8 taskId) +{ + u8 spriteId = GetAnimBattlerSpriteId(1); + gTasks[taskId].data[10] += gTasks[taskId].data[0]; + gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8; + if (GetBattlerSide(gBattleAnimTarget)) + gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; + + gTasks[taskId].data[11] += 16; + obj_id_set_rotscale(spriteId, gTasks[taskId].data[11], gTasks[taskId].data[11], 0); + sub_80A7E6C(spriteId); + if (--gTasks[taskId].data[1] == 0) + { + gTasks[taskId].data[0] = 0; + gTasks[taskId].func = sub_80FF5CC; + } +} + +static void sub_80FF5CC(u8 taskId) +{ + if ((u16)gBattleAnimArgs[7] == 0xFFFF) + { + if (gTasks[taskId].data[0] == 0) + { + u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); + sub_80A7344(spriteId); + gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].oam.priority = gTasks[taskId].data[14]; + spriteId = GetAnimBattlerSpriteId(ANIM_DEF_PARTNER); + gSprites[spriteId].oam.priority = gTasks[taskId].data[15]; + gTasks[taskId].data[0]++; + return; + } + } + else + { + if (gTasks[taskId].data[0] == 0) + return; + } + + gTasks[taskId].data[0]++; + if (gTasks[taskId].data[0] == 3) + DestroyAnimVisualTask(taskId); +} + +void sub_80FF698(struct Sprite* sprite) +{ + switch (sprite->data[0]) + { + case 0: + { + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + gBattleAnimArgs[0] *= -1; + + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; + sprite->invisible = 1; + sprite->data[0]++; + break; + } + case 1: + { + sprite->invisible = 0; + if (sprite->affineAnimEnded) + { + ChangeSpriteAffineAnim(sprite, 1); + sprite->data[0] = 25; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->callback = sub_80A70C0; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + break; + } + } + } +} + +void sub_80FF768(struct Sprite* sprite) +{ + if (!sprite->data[0]) + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->pos2.x = gBattleAnimArgs[0]; + sprite->pos2.y = gBattleAnimArgs[1]; + sprite->subpriority = gBattleAnimArgs[2] + 30; + StartSpriteAnim(sprite, gBattleAnimArgs[3]); + sprite->data[2] = gBattleAnimArgs[4]; + sprite->data[0]++; + if (sprite->pos1.y + sprite->pos2.y > 120) + sprite->pos1.y += sprite->pos2.y + sprite->pos1.y - 120; + } + sprite->callback = sub_80FF8DC; +} + +void sub_80FF7EC(struct Sprite *sprite) +{ + s16 p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + s16 p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + s16 e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + s16 e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + + e1 -= p1; + e2 -= p2; + sprite->pos1.x = p1 + e1 * gBattleAnimArgs[0] / 100; + sprite->pos1.y = p2 + e2 * gBattleAnimArgs[0] / 100; + sprite->pos2.x = gBattleAnimArgs[1]; + sprite->pos2.y = gBattleAnimArgs[2]; + sprite->subpriority = gBattleAnimArgs[3] + 30; + StartSpriteAnim(sprite, gBattleAnimArgs[4]); + sprite->data[2] = gBattleAnimArgs[5]; + sprite->callback = sub_80FF8DC; + gUnknown_0203A0F8[0] = sprite->pos1.x; + gUnknown_0203A0F8[1] = sprite->pos1.y; + gUnknown_0203A0F8[2] = e1; + gUnknown_0203A0F8[3] = e2; +} + +static void sub_80FF8DC(struct Sprite* sprite) +{ + if (++sprite->data[0] > (sprite->data[2] - 10)) + sprite->invisible = sprite->data[0] % 2; + + if (sprite->data[0] > sprite->data[2]) + DestroyAnimSprite(sprite); +} + +void sub_80FF934(struct Sprite* sprite) +{ + if (!sprite->data[0]) + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[2] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[4]; + } + + sprite->data[0]++; + sprite->pos2.x = sprite->data[1] * sprite->data[0]; + sprite->pos2.y = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]); + if (sprite->data[0] > sprite->data[3]) + DestroyAnimSprite(sprite); +} + +void sub_80FF9B8(struct Sprite* sprite, s16 c) +{ + s32 a = (sprite->pos1.x * 256) | sprite->pos1.y; + s32 b = (sprite->data[6] * 256) | sprite->data[7]; + c *= 256; + sprite->data[5] = a; + sprite->data[6] = b; + sprite->data[7] = c; +} + +bool8 sub_80FF9E0(struct Sprite* sprite) +{ + u16 r10 = (u8)(sprite->data[5] >> 8); + u16 r9 = (u8)sprite->data[5]; + s32 r2 = (u8)(sprite->data[6] >> 8); + s32 r4 = (u8)sprite->data[6]; + s16 r6 = sprite->data[7] >> 8; + s16 r3 = sprite->data[7] & 0xFF; + s16 r4_2; + s16 r0; + s32 var1; + s32 var2; + + if (r2 == 0) + r2 = -32; + else if (r2 == 255) + r2 = 272; + + r4_2 = r4 - r9; + r0 = r2 - r10; + var1 = r0 * r3 / r6; + var2 = r4_2 * r3 / r6; + sprite->pos1.x = var1 + r10; + sprite->pos1.y = var2 + r9; + if (++r3 == r6) + return TRUE; + + sprite->data[7] = (r6 << 8) | r3; + return FALSE; +} + +void sub_80FFA84(struct Sprite* sprite) +{ + if (sprite->data[0] == 10) + StartSpriteAffineAnim(sprite, 1); + + sprite->data[0]++; + if (sprite->data[0] > 50) + DestroyAnimSprite(sprite); +} + +static void sub_80FFAB4(struct Sprite* sprite) +{ + sprite->data[0] += sprite->data[3] * 128 / sprite->data[4]; + if (sprite->data[0] >= 128) + { + sprite->data[1]++; + sprite->data[0] = 0; + } + + sprite->pos2.y = Sin(sprite->data[0] + 128, 30 - sprite->data[1] * 8); + if (sub_80FF9E0(sprite)) + { + sprite->pos2.y = 0; + sprite->data[0] = 0; + sprite->callback = sub_80FFA84; + } +} + +void sub_80FFB18(struct Sprite* sprite) +{ + s16 e1; + s16 e2; + InitAnimSpritePos(sprite, 0); + e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if (BATTLE_PARTNER(gBattleAnimAttacker) == gBattleAnimTarget) + { + sprite->data[6] = e1; + sprite->data[7] = e2 + 10; + sub_80FF9B8(sprite, 60); + sprite->data[3] = 1; + } + else + { + sprite->data[6] = e1; + sprite->data[7] = e2 + 10; + sub_80FF9B8(sprite, 60); + sprite->data[3] = 3; + } + + sprite->data[4] = 60; + sprite->callback = sub_80FFAB4; +} + +static void sub_80FFB90(struct Sprite* sprite) +{ + int zero; + sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); + zero = 0; + if (sprite->data[0] > 0x7F) + { + sprite->data[1]++; + sprite->data[0] = zero; + } + + sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); + if (sub_80FF9E0(sprite)) + { + sprite->pos2.y = zero; + sprite->data[0] = zero; + DestroyAnimSprite(sprite); + } +} + +void sub_80FFBF4(struct Sprite* sprite) +{ + s16 e = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + { + sprite->data[6] = 0; + sprite->data[7] = e + 10; + sub_80FF9B8(sprite, 40); + sprite->data[3] = 3; + sprite->data[4] = 0x3C; + sprite->callback = sub_80FFAB4; + } + else + { + sprite->data[6] = 255; + sprite->data[7] = e + 10; + if (IsContest()) + sprite->data[6] = 0; + + sub_80FF9B8(sprite, 40); + sprite->data[3] = 3; + sprite->data[4] = 0x3C; + sprite->callback = sub_80FFB90; + } +} + +void sub_80FFC70(struct Sprite* sprite) +{ + if (sprite->data[0] == 0) + { + sub_80A6980(sprite, FALSE); + sprite->data[1] = gBattleAnimArgs[2]; + } + + sprite->data[0]++; + sprite->pos2.y = sprite->data[1] * sprite->data[0]; + if (sprite->animEnded) + DestroyAnimSprite(sprite); +} + +void sub_80FFCB4(struct Sprite* sprite) +{ + s16 p1; + s16 p2; + sub_80A6980(sprite, FALSE); + p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + if (BATTLE_PARTNER(gBattleAnimTarget) == gBattleAnimAttacker) + { + sprite->data[6] = p1; + sprite->data[7] = p2 + 10; + sub_80FF9B8(sprite, 60); + sprite->data[3] = 1; + } + else + { + sprite->data[6] = p1; + sprite->data[7] = p2 + 10; + sub_80FF9B8(sprite, 60); + sprite->data[3] = 3; + } + + sprite->data[4] = 60; + sprite->callback = sub_80FFD2C; +} + +static void sub_80FFD2C(struct Sprite* sprite) +{ + int zero; + sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); + zero = 0; + if (sprite->data[0] > 127) + { + sprite->data[1]++; + sprite->data[0] = zero; + } + + sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); + if (sprite->pos2.y == 0) + PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(63)); + + if (sub_80FF9E0(sprite)) + { + sprite->pos2.y = 0; + sprite->data[0] = 0; + sprite->callback = sub_80FFA84; + PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); + } +} + +void sub_80FFDBC(struct Sprite* sprite) +{ + int a; + int b; + + if (!sprite->data[0]) + { + if (!IsContest()) + { + sprite->data[1] = gBattleAnimArgs[1]; + sprite->pos1.x = 120; + } + else + { + a = gBattleAnimArgs[1] - 32; + if (a < 0) + b = gBattleAnimArgs[1] + 0xDF; + else + b = a; + + sprite->data[1] = a - ((b >> 8) << 8); + sprite->pos1.x = 70; + } + + sprite->pos1.y = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[0]; + sprite->data[4] = 20; + sprite->pos2.x = Cos(sprite->data[1], 60); + sprite->pos2.y = Sin(sprite->data[1], 20); + sprite->callback = sub_80FFE58; + if (sprite->data[1] > 0 && sprite->data[1] < 192) + sprite->subpriority = 31; + else + sprite->subpriority = 29; + } +} + +static void sub_80FFE58(struct Sprite* sprite) +{ + switch (sprite->data[3]) + { + case 0: + if (sprite->data[2] > 78) + { + sprite->data[3] = 1; + StartSpriteAffineAnim(sprite, 1); + break; + } + else + { + sprite->data[2] += sprite->data[4] / 10; + sprite->data[4] += 3; + sprite->pos1.y = sprite->data[2]; + break; + } + break; + case 1: + if (sprite->data[3] && sprite->affineAnimEnded) + { + sprite->data[0] = 0; + sprite->data[2] = 0; + sprite->callback = sub_80FFEC4; + } + break; + } +} + +static void sub_80FFEC4(struct Sprite* sprite) +{ + if (sprite->data[2] == gUnknown_08592700[sprite->data[0]][1]) + { + if (gUnknown_08592700[sprite->data[0]][2] == 127) + { + sprite->data[0] = 0; + sprite->callback = sub_80FFF7C; + } + + sprite->data[2] = 0; + sprite->data[0]++; + } + else + { + sprite->data[2]++; + sprite->data[1] = (gUnknown_08592700[sprite->data[0]][0] * gUnknown_08592700[sprite->data[0]][2] + sprite->data[1]) & 0xFF; + if (!IsContest()) + { + if ((u16)(sprite->data[1] - 1) < 191) + sprite->subpriority = 31; + else + sprite->subpriority = 29; + } + + sprite->pos2.x = Cos(sprite->data[1], 60); + sprite->pos2.y = Sin(sprite->data[1], 20); + } +} + +static void sub_80FFF7C(struct Sprite* sprite) +{ + if (sprite->data[0] > 20) + DestroyAnimSprite(sprite); + + sprite->invisible = sprite->data[0] % 2; + sprite->data[0]++; +} + +void sub_80FFFC0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + task->data[4] = sub_80A82E4(gBattleAnimTarget) - 1; + task->data[6] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + task->data[10] = sub_80A861C(gBattleAnimTarget, 1); + task->data[11] = sub_80A861C(gBattleAnimTarget, 0); + task->data[5] = (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) ? 1 : -1; + task->data[9] = 56 - (task->data[5] * 64); + task->data[8] = task->data[7] - task->data[9] + task->data[6]; + task->data[2] = CreateSprite(&gUnknown_08592778, task->data[8], task->data[9], task->data[4]); + if (task->data[2] == MAX_SPRITES) + DestroyAnimVisualTask(taskId); + + gSprites[task->data[2]].data[0] = 10; + gSprites[task->data[2]].data[1] = task->data[8]; + gSprites[task->data[2]].data[2] = task->data[6] - (task->data[10] / 2 + 10) * task->data[5]; + gSprites[task->data[2]].data[3] = task->data[9]; + gSprites[task->data[2]].data[4] = task->data[7] + (task->data[11] / 2 + 10) * task->data[5]; + gSprites[task->data[2]].data[5] = sub_8100504(&gSprites[task->data[2]]); + InitAnimArcTranslation(&gSprites[task->data[2]]); + task->func = sub_8100128; +} + +static void sub_8100128(u8 taskId) +{ + struct Task* task = &gTasks[taskId]; + struct Sprite* sprite = &gSprites[task->data[2]]; + int a = task->data[0]; + switch (a) + { + case 4: + sub_8100524(task, taskId); + if (TranslateAnimArc(sprite)) + { + task->data[15] = 5; + task->data[0] = 0xFF; + } + break; + case 8: + sub_8100524(task, taskId); + if (TranslateAnimArc(sprite)) + { + task->data[15] = 9; + task->data[0] = 0xFF; + } + break; + case 0: + sub_8100524(task, taskId); + if (TranslateAnimArc(sprite)) + { + task->data[15] = 1; + task->data[0] = 0xFF; + } + break; + case 1: + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7]; + sprite->data[5] = sub_8100504(sprite); + task->data[4] += 2; + task->data[3] = a; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + InitAnimArcTranslation(sprite); + task->data[0]++; + break; + case 2: + sub_8100524(task, taskId); + if (TranslateAnimArc(sprite)) + { + task->data[15] = 3; + task->data[0] = 0xFF; + } + break; + case 3: + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7] - ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data[5] = sub_8100504(sprite); + task->data[3] = 2; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + InitAnimArcTranslation(sprite); + task->data[0]++; + break; + case 5: + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6] + ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data[5] = sub_8100504(sprite); + task->data[4] -= 2; + task->data[3] = 3; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + InitAnimArcTranslation(sprite); + task->data[0]++; + break; + case 6: + sub_8100524(task, taskId); + if (TranslateAnimArc(sprite)) + { + task->data[15] = 7; + task->data[0] = 0xFF; + } + break; + case 7: + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7]; + sprite->data[5] = sub_8100504(sprite); + task->data[4] += 2; + task->data[3] = 4; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + InitAnimArcTranslation(sprite); + task->data[0]++; + break; + case 9: + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data[5] = sub_8100504(sprite); + task->data[3] = 5; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + InitAnimArcTranslation(sprite); + task->data[0]++; + break; + case 10: + sub_8100524(task, taskId); + if (TranslateAnimArc(sprite)) + { + task->data[15] = 11; + task->data[0] = 0xFF; + } + break; + case 11: + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[8]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[9]; + sprite->data[5] = sub_8100504(sprite); + task->data[4] -= 2; + task->data[3] = 6; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + InitAnimArcTranslation(sprite); + task->data[0]++; + break; + } + case 12: + sub_8100524(task, taskId); + if (TranslateAnimArc(sprite)) + { + DestroySprite(sprite); + task->data[0]++; + } + break; + case 13: + if (task->data[12] == 0) + DestroyAnimVisualTask(taskId); + break; + case 0xFF: + if (++task->data[1] > 5) + { + task->data[1] = 0; + task->data[0] = task->data[15]; + } + break; + } +} + +static s16 sub_8100504(struct Sprite* sprite) +{ + s16 var = 8; + if (sprite->data[4] < sprite->pos1.y) + var = -var; + + return var; +} + +static void sub_8100524(struct Task* task, u8 taskId) +{ + task->data[14]++; + if (task->data[14] > 0) + { + u8 spriteId; + s16 spriteX; + s16 spriteY; + task->data[14] = 0; + spriteX = gSprites[task->data[2]].pos1.x + gSprites[task->data[2]].pos2.x; + spriteY = gSprites[task->data[2]].pos1.y + gSprites[task->data[2]].pos2.y; + spriteId = CreateSprite(&gUnknown_08592778, spriteX, spriteY, task->data[4]); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].data[6] = taskId; + gSprites[spriteId].data[7] = 12; + gTasks[taskId].data[12]++; + gSprites[spriteId].data[0] = task->data[13] & 1; + gTasks[taskId].data[13]++; + StartSpriteAnim(&gSprites[spriteId], task->data[3]); + gSprites[spriteId].subpriority = task->data[4]; + gSprites[spriteId].callback = sub_80CC408; + } + } +} + +static void sub_80CC408(struct Sprite* sprite) +{ + sprite->data[0]++; + if (sprite->data[0] > 1) + { + sprite->data[0] = 0; + sprite->invisible ^= 1; + sprite->data[1]++; + if (sprite->data[1] > 8) + { + gTasks[sprite->data[6]].data[sprite->data[7]]--; + DestroySprite(sprite); + } + } +} + +void sub_8100640(struct Sprite* sprite) +{ + u8 battler; + if (!gBattleAnimArgs[6]) + battler = gBattleAnimAttacker; + else + battler = gBattleAnimTarget; + + if (GetBattlerSide(battler) != 0) + { + sprite->data[4] = 0; + sprite->data[2] = gBattleAnimArgs[3]; + sprite->pos1.x = 0xFFF0; + } + else + { + sprite->data[4] = 1; + sprite->data[2] = -gBattleAnimArgs[3]; + sprite->pos1.x = 0x100; + } + + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[3] = gBattleAnimArgs[4]; + switch (gBattleAnimArgs[5]) + { + case 0: + sprite->pos1.y = gBattleAnimArgs[0]; + sprite->oam.priority = sub_80A8328(battler); + break; + case 1: + sprite->pos1.y = gBattleAnimArgs[0]; + sprite->oam.priority = sub_80A8328(battler) + 1; + break; + case 2: + sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[0]; + sprite->oam.priority = sub_80A8328(battler); + break; + case 3: + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0]; + GetAnimBattlerSpriteId(ANIM_TARGET); + sprite->oam.priority = sub_80A8328(battler) + 1; + break; + } + + sprite->callback = sub_810074C; +} + +static void sub_810074C(struct Sprite* sprite) +{ + int a = sprite->data[7]; + sprite->data[7]++; + sprite->pos2.y = (sprite->data[1] * gSineTable[sprite->data[0]]) >> 8; + sprite->pos2.x = sprite->data[2] * a; + sprite->data[0] = (sprite->data[3] * a) & 0xFF; + if (!sprite->data[4]) + { + if (sprite->pos2.x + sprite->pos1.x <= 0xF7) + return; + } + else + { + if (sprite->pos2.x + sprite->pos1.x > -16) + return; + } + + move_anim_8074EE0(sprite); +} + +void sub_81007C4(u8 taskId) +{ + struct Task* task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + task->data[8] = IndexOfSpritePaletteTag(ANIM_TAG_LEAF) * 16 + 256; + task->data[12] = IndexOfSpritePaletteTag(ANIM_TAG_RAZOR_LEAF) * 16 + 256; + task->data[0]++; + break; + case 1: + if (++task->data[9] >= 0) + { + task->data[9] = 0; + BlendPalette(task->data[8], 16, task->data[10], gMagicalLeafBlendColors[task->data[11]]); + BlendPalette(task->data[12], 16, task->data[10], gMagicalLeafBlendColors[task->data[11]]); + if (++task->data[10] == 17) + { + task->data[10] = 0; + if (++task->data[11] == 7) + task->data[11] = 0; + } + } + break; + } + + if (gBattleAnimArgs[7] == -1) + DestroyAnimVisualTask(taskId); +} + +void sub_8100898(struct Sprite* sprite) +{ + u8 a; + u8 b; + u16 c; + u16 x; + u16 y; + + if (gBattleAnimArgs[4] == 0) + { + DestroyAnimSprite(sprite); + } + else + { + if (gBattleAnimArgs[0] == 0) + { + a = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + b = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + } + else + { + a = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + b = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + } + + sprite->data[0] = gBattleAnimArgs[4]; + if (gBattleAnimArgs[1] == 0) + { + sprite->pos1.x = gBattleAnimArgs[2] + a; + sprite->pos1.y = gBattleAnimArgs[3] + b; + sprite->data[5] = a; + sprite->data[6] = b; + } + else + { + sprite->pos1.x = a; + sprite->pos1.y = b; + sprite->data[5] = gBattleAnimArgs[2] + a; + sprite->data[6] = gBattleAnimArgs[3] + b; + } + + x = sprite->pos1.x; + sprite->data[1] = x * 16; + y = sprite->pos1.y; + sprite->data[2] = y * 16; + sprite->data[3] = (sprite->data[5] - sprite->pos1.x) * 16 / gBattleAnimArgs[4]; + sprite->data[4] = (sprite->data[6] - sprite->pos1.y) * 16 / gBattleAnimArgs[4]; + c = ArcTan2Neg(sprite->data[5] - x, sprite->data[6] - y); + if (IsContest()) + c -= 0x8000; + + sub_80A73E0(sprite, 0, 0x100, 0x100, c); + sprite->callback = sub_81009A0; + } +} + +static void sub_81009A0(struct Sprite* sprite) +{ + if (sprite->data[0]) + { + sprite->data[1] += sprite->data[3]; + sprite->data[2] += sprite->data[4]; + sprite->pos1.x = sprite->data[1] >> 4 ; + sprite->pos1.y = sprite->data[2] >> 4 ; + sprite->data[0]--; + } + else + { + move_anim_8074EE0(sprite); + } +} + +static void sub_81009DC(struct Sprite* sprite) +{ + if (sprite->animEnded) + DestroyAnimSprite(sprite); +} + +void sub_81009F8(struct Sprite* sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker) != 0) + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + } + else + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + } + + sprite->callback = sub_80A67D8; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +void sub_8100A50(struct Sprite* sprite) +{ + if (GetBattlerSide(gBattleAnimAttacker) == 0) + StartSpriteAnim(sprite, 1); + + sprite->callback = sub_81009DC; + sub_80A6864(sprite, gBattleAnimArgs[0]); + sprite->pos1.y += gBattleAnimArgs[1]; +} + +void sub_8100A94(struct Sprite* sprite) +{ + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[4]; + sprite->data[5] = gBattleAnimArgs[5]; + StartSpriteAffineAnim(sprite, gBattleAnimArgs[6]); + StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + sprite->callback = sub_80A66DC; +} + +// Moves the sprite in a diagonally slashing motion across the target mon. +// Used by moves such as MOVE_CUT and MOVE_AERIAL_ACE. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: slice direction; 0 = right-to-left, 1 = left-to-right +void AnimCuttingSlice(struct Sprite* sprite) +{ + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + sprite->pos1.y += 8; + + sprite->callback = AnimSliceStep; + if (gBattleAnimArgs[2] == 0) + { + sprite->pos1.x += gBattleAnimArgs[0]; + } + else + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->hFlip = 1; + } + + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[1] -= 0x400; + sprite->data[2] += 0x400; + sprite->data[5] = gBattleAnimArgs[2]; + if (sprite->data[5] == 1) + sprite->data[1] = -sprite->data[1]; +} + +void sub_8100B88(struct Sprite* sprite) +{ + u8 a; + u8 b; + switch (gBattleAnimArgs[3]) + { + case 1: + a = GetBattlerSpriteCoord(BATTLE_PARTNER(gBattleAnimTarget), 0); + b = GetBattlerSpriteCoord(BATTLE_PARTNER(gBattleAnimTarget), 1); + break; + case 2: + a = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + b = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimTarget))) + { + a = (GetBattlerSpriteCoord(BATTLE_PARTNER(gBattleAnimTarget), 0) + a) / 2; + b = (GetBattlerSpriteCoord(BATTLE_PARTNER(gBattleAnimTarget), 1) + b) / 2; + } + break; + case 0: + default: + a = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + b = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + break; + } + + sprite->pos1.x = a; + sprite->pos1.y = b; + if (GetBattlerSide(gBattleAnimTarget) == 0) + sprite->pos1.y += 8; + + sprite->callback = AnimSliceStep; + if (gBattleAnimArgs[2] == 0) + { + sprite->pos1.x += gBattleAnimArgs[0]; + } + else + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->hFlip = 1; + } + + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[1] -= 0x400; + sprite->data[2] += 0x400; + sprite->data[5] = gBattleAnimArgs[2]; + if (sprite->data[5] == 1) + sprite->data[1] = -sprite->data[1]; +} + +static void AnimSliceStep(struct Sprite* sprite) +{ + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + if (sprite->data[5] == 0) + sprite->data[1] += 0x18; + else + sprite->data[1] -= 0x18; + + sprite->data[2] -= 0x18; + sprite->pos2.x = sprite->data[3] >> 8; + sprite->pos2.y = sprite->data[4] >> 8; + sprite->data[0]++; + if (sprite->data[0] == 20) + { + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + sprite->data[0] = 3; + sprite->callback = WaitAnimForDuration; + } +} + +void unref_sub_8100D38(struct Sprite* sprite) +{ + if (sprite->data[2] > 1) + { + if (sprite->data[3] & 1) + { + sprite->invisible = 0; + gSprites[sprite->data[0]].invisible = 0; + gSprites[sprite->data[1]].invisible = 0; + } + else + { + sprite->invisible = 1; + gSprites[sprite->data[0]].invisible = 1; + gSprites[sprite->data[1]].invisible = 1; + } + + sprite->data[2] = 0; + sprite->data[3]++; + } + else + { + sprite->data[2]++; + } + + if (sprite->data[3] == 10) + { + DestroySprite(&gSprites[sprite->data[0]]); + DestroySprite(&gSprites[sprite->data[1]]); + DestroyAnimSprite(sprite); + } +} + +void sub_8100E1C(struct Sprite* sprite) +{ + sprite->data[0] = gBattleAnimArgs[2]; + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + sprite->pos1.x -= gBattleAnimArgs[0]; + else + sprite->pos1.x += gBattleAnimArgs[0]; + + StartSpriteAnim(sprite, gBattleAnimArgs[5]); + sprite->data[1] = -gBattleAnimArgs[3]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[3] = gBattleAnimArgs[4]; + sprite->callback = sub_8100E80; + sprite->callback(sprite); +} + +static void sub_8100E80(struct Sprite* sprite) +{ + sprite->pos2.x = Cos(sprite->data[0], 100); + sprite->pos2.y = Sin(sprite->data[0], 20); + if (sprite->data[0] < 128) + sprite->subpriority = 0; + else + sprite->subpriority = 14; + + sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; + sprite->data[5] += 0x82; + sprite->pos2.y += sprite->data[5] >> 8; + sprite->data[2]++; + if (sprite->data[2] == sprite->data[3]) + DestroyAnimSprite(sprite); +} + +void sub_8100EF0(struct Sprite* sprite) +{ + if (IsContest()) + gBattleAnimArgs[1] += 8; + + sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || IsContest()) + sprite->oam.priority = sub_80A8328(gBattleAnimAttacker) + 1; + else + sprite->oam.priority = sub_80A8328(gBattleAnimAttacker); + + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = (IndexOfSpritePaletteTag(ANIM_TAG_PROTECT) << 4) + 0x100; + sprite->data[7] = 16; + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - sprite->data[7], sprite->data[7])); + sprite->callback = sub_8100FD4; +} + +static void sub_8100FD4(struct Sprite *sprite) +{ + int a; + int i; + sprite->data[5] += 96; + sprite->pos2.x = -(sprite->data[5] >> 8); + if (++sprite->data[1] > 1) + { + sprite->data[1] = 0; + a = gPlttBufferFaded[sprite->data[2] + 1]; + i = 0; + do + { + gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]; + } while (i < 6); + + gPlttBufferFaded[sprite->data[2] + 7] = a; + } + + if (sprite->data[7] > 6 && sprite->data[0] >0 && ++sprite->data[6] > 1) + { + sprite->data[6] = 0; + sprite->data[7] -= 1; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - sprite->data[7], sprite->data[7])); + } + + if (sprite->data[0] > 0) + { + sprite->data[0] -= 1; + } + else if (++sprite->data[6] > 1) + { + sprite->data[6] = 0; + sprite->data[7]++; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - sprite->data[7], sprite->data[7])); + if (sprite->data[7] == 16) + { + sprite->invisible = 1; + sprite->callback = sub_80A67F4; + } + } +} + +void sub_81010CC(struct Sprite* sprite) +{ + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 0xFFE8; + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[6] = 0; + sprite->data[7] = 16; + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[6], sprite->data[7])); + sprite->callback = sub_8101138; +} + +static void sub_8101138(struct Sprite* sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (++sprite->data[2] > 0) + { + sprite->data[2] = 0; + if (((++sprite->data[1]) & 1) != 0) + { + if (sprite->data[6] <= 15) + sprite->data[6]++; + } + else if (sprite->data[7] > 0) + sprite->data[7]--; + + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[6], sprite->data[7])); + if (sprite->data[6] == 16 && sprite->data[7] == 0) + { + sprite->data[1] = 0; + sprite->data[0]++; + } + } + break; + case 1: + if (++sprite->data[1] > 8) + { + sprite->data[1] = 0; + StartSpriteAffineAnim(sprite, 1); + sprite->data[0]++; + } + break; + case 2: + sub_8101298(sprite, 16, 4); + if (++sprite->data[1] > 2) + { + sprite->data[1] = 0; + sprite->pos1.y++; + } + + if (++sprite->data[2] <= 29) + break; + + if (sprite->data[2] & 1) + { + if (sprite->data[6] > 0) + sprite->data[6]--; + } + else if (sprite->data[7] <= 15) + { + sprite->data[7]++; + } + + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[6], sprite->data[7])); + if (sprite->data[6] == 0 && sprite->data[7] == 16) + { + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[0]++; + } + break; + case 3: + sprite->invisible = 1; + sprite->data[0]++; + break; + case 4: + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0)); + DestroyAnimSprite(sprite); + break; + } +} + +static void sub_8101298(struct Sprite* sprite, int unk1, int unk2) +{ + if (sprite->data[3] <= 11) + sprite->data[4] += 2; + + if ((u16)(sprite->data[3] - 0x12) <= 0x17) + sprite->data[4] -= 2; + + if ((sprite->data[3]) > 0x2F) + sprite->data[4] += 2; + + sprite->pos2.x = sprite->data[4] / 9; + sprite->pos2.y = sprite->data[4] / 14; + if (sprite->pos2.y < 0) + sprite->pos2.y *= -1; + + sprite->data[3]++; + if (sprite->data[3] > 0x3B) + sprite->data[3] = 0; +} + +void sub_810130C(struct Sprite* sprite) +{ + if (!gBattleAnimArgs[2]) + sub_80A6838(sprite); + + sub_80A6864(sprite, gBattleAnimArgs[0]); + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[5]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = gBattleAnimArgs[4]; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + sprite->callback = sub_80A656C; +} + +void sub_810135C(struct Sprite* sprite) +{ + u8 battler; + if (!gBattleAnimArgs[2]) + battler = gBattleAnimAttacker; + else + battler = gBattleAnimTarget; + + if (IsDoubleBattle() && IsBattlerSpriteVisible(BATTLE_PARTNER(battler))) + { + SetAverageBattlerPositions(battler, gBattleAnimArgs[6], &sprite->pos1.x, &sprite->pos1.y); + sub_80A6864(sprite, gBattleAnimArgs[0]); + sprite->pos1.y += gBattleAnimArgs[1]; + } + else + { + if (!gBattleAnimArgs[6]) + { + sprite->pos1.x = GetBattlerSpriteCoord(battler, 0); + sprite->pos1.y = GetBattlerSpriteCoord(battler, 1) + gBattleAnimArgs[1]; + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(battler, 2); + sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[1]; + } + + sub_80A6864(sprite, gBattleAnimArgs[0]); + } + + sprite->data[0] = gBattleAnimArgs[5]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = gBattleAnimArgs[4]; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + sprite->callback = sub_80A656C; +} + +void sub_8101440(struct Sprite* sprite) +{ + sub_80A6838(sprite); + if (GetBattlerSide(gBattleAnimAttacker) == 0) + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + } + else + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + StartSpriteAnim(sprite, 1); + } + + sprite->callback = sub_81014A0; +} + +static void sub_81014A0(struct Sprite* sprite) +{ + if (++sprite->data[0] > 30) + { + sprite->pos2.y = (30 - sprite->data[0]) / 3; + sprite->pos2.x = Sin(sprite->data[1] * 4, 3); + sprite->data[1]++; + } + + if (sprite->animEnded) + DestroyAnimSprite(sprite); +} + +void sub_81014F4(struct Sprite* sprite) +{ + sub_80A6838(sprite); + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[3] = 1; + } + else + { + sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[3] = 0xFFFF; + StartSpriteAffineAnim(sprite, 1); + } + + sprite->callback = sub_8101560; +} + +static void sub_8101560(struct Sprite* sprite) +{ + sprite->pos2.y = -(sprite->data[0] / 0x28); + sprite->pos2.x = sprite->data[4] / 10; + sprite->data[4] += sprite->data[3] * 2; + sprite->data[0] += sprite->data[1]; + if (++sprite->data[1] > 60) + move_anim_8074EE0(sprite); +} + +void sub_81015AC(struct Sprite* sprite) +{ + sprite->pos1.x -= 32; + sprite->pos1.y -= 32; + sprite->data[0] = 20; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData6(sprite, sub_81015D4); +} + +static void sub_81015D4(struct Sprite* sprite) +{ + switch (sprite->data[5] & 1) + { + case 0: + sprite->data[0] = 1; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData6(sprite, sub_81015D4); + break; + case 1: + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.y = 0; + sprite->pos2.x = 0; + sprite->data[0] = 8; + sprite->data[2] = sprite->pos1.x + gUnknown_08592CD0[sprite->data[5] >> 8][0]; + sprite->data[4] = sprite->pos1.y + gUnknown_08592CD0[sprite->data[5] >> 8][1]; + sprite->callback = StartAnimLinearTranslation; + StoreSpriteCallbackInData6(sprite, sub_8101684); + sprite->data[5] += 0x100; + PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(63)); + break; + } + + sprite->data[5] ^= 1; +} + +static void sub_8101684(struct Sprite* sprite) +{ + if ((sprite->data[5] >> 8) == 4) + { + sprite->data[0] = 10; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData6(sprite, sub_81016B8); + } + else + { + sprite->callback = sub_81015D4; + } +} + +static void sub_81016B8(struct Sprite* sprite) +{ + s16 a; + s16 b; + if (sprite->oam.affineParam == 0) + { + sprite->data[0] = 3; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData6(sprite, sub_8101774); + } + else + { + switch (sprite->oam.affineParam) + { + case 1: + a = -8; + b = -8; + break; + case 2: + a = -8; + b = 8; + break; + case 3: + a = 8; + b = -8; + break; + default: + a = 8; + b = 8; + break; + } + + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.y = 0; + sprite->pos2.x = 0; + sprite->data[0] = 6; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + a; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + b; + sprite->callback = StartAnimLinearTranslation; + StoreSpriteCallbackInData6(sprite, sub_8101820); + } +} + +static void sub_8101774(struct Sprite* sprite) +{ + if (sprite->data[2] == 0) + { + if ((sprite->data[1] += 3) > 16) + sprite->data[1] = 16; + } + else if ((sprite->data[1] -= 3) < 0) + { + sprite->data[1] = 0; + } + + BlendPalettes(sub_80A75AC(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB(31, 31, 31)); + if (sprite->data[1] == 16) + { + int pal; + sprite->data[2]++; + pal = sprite->oam.paletteNum; + LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4); + PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63)); + } + else if (sprite->data[1] == 0) + { + sprite->callback = sub_8101820; + } +} + +static void sub_8101820(struct Sprite* sprite) +{ + if ((u16)gBattleAnimArgs[7] == 0xFFFF) + { + sprite->data[1] = 0; + sprite->data[0] = 0; + sprite->callback = sub_8101848; + } +} + +static void sub_8101848(struct Sprite* sprite) +{ + if (sprite->data[0] % 3 == 0) + { + sprite->data[1]++; + sprite->invisible ^= 1; + } + + sprite->data[0]++; + if (sprite->data[1] == 8) + DestroyAnimSprite(sprite); +} + +void sub_8101898(struct Sprite* sprite) +{ + sprite->oam.affineParam = gBattleAnimArgs[0]; + if ((s16)sprite->oam.affineParam == 1) + { + sprite->pos1.x -= 0x18; + sprite->pos1.y -= 0x18; + } + else if ((s16)sprite->oam.affineParam == 2) + { + sprite->pos1.x -= 0x18; + sprite->pos1.y += 0x18; + sprite->oam.matrixNum = 16; + } + else if ((s16)sprite->oam.affineParam == 3) + { + sprite->pos1.x += 0x18; + sprite->pos1.y -= 0x18; + sprite->oam.matrixNum = 8; + } + else + { + sprite->pos1.x += 0x18; + sprite->pos1.y += 0x18; + sprite->oam.matrixNum = 24; + } + + sprite->oam.tileNum = (sprite->oam.tileNum + 16); + sprite->callback = sub_81015AC; + sprite->callback(sprite); +} + +void sub_8101940(struct Sprite* sprite) +{ + sprite->invisible = 1; + sprite->data[0] = 0; + switch (gBattleAnimArgs[0]) + { + case 0: + sprite->callback = sub_8101998; + break; + case 1: + sprite->callback = sub_8101A74; + break; + case 2: + sprite->callback = sub_8101AC4; + break; + default: + sprite->callback = sub_8101B84; + break; + } +} + +static void sub_8101998(struct Sprite* sprite) +{ + sprite->data[0] = 6; + sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2; + sprite->data[2] = 0; + sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; + StoreSpriteCallbackInData6(sprite, sub_81019E8); + sprite->callback = TranslateMonBGUntil; +} + +static void sub_81019E8(struct Sprite* sprite) +{ + if (sprite->data[0] == 0) + { + sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; + sub_80A7270(sprite->data[3], 0); + sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : 0xFFFFFD00; + sprite->data[5] = 0; + } + + sprite->data[5] += sprite->data[4]; + obj_id_set_rotscale(sprite->data[3], 0x100, 0x100, sprite->data[5]); + sub_80A73A0(sprite->data[3]); + if (++sprite->data[0] > 3) + { + sprite->data[0] = 0; + sprite->callback = sub_8101B84; + } +} + +static void sub_8101A74(struct Sprite* sprite) +{ + sprite->data[0] = 4; + sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3; + sprite->data[2] = 0; + sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; + StoreSpriteCallbackInData6(sprite, sub_8101B84); + sprite->callback = TranslateMonBGUntil; +} + +static void sub_8101AC4(struct Sprite* sprite) +{ + if (++sprite->data[0] > 8) + { + sprite->data[0] = 0; + sprite->callback = sub_8101AE8; + } +} + +static void sub_8101AE8(struct Sprite* sprite) +{ + if (sprite->data[0] == 0) + { + sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; + sprite->data[6] = GetBattlerSide(gBattleAnimAttacker); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + { + sprite->data[4] = 0xFC00; + sprite->data[5] = 0xC00; + } + else + { + sprite->data[4] = 0x400; + sprite->data[5] = 0xF400; + } + } + + sprite->data[5] += sprite->data[4]; + obj_id_set_rotscale(sprite->data[3], 0x100, 0x100, sprite->data[5]); + sub_80A73A0(sprite->data[3]); + if (++sprite->data[0] > 2) + { + sub_80A7344(sprite->data[3]); + sprite->callback = sub_8101B84; + } +} + +static void sub_8101B84(struct Sprite* sprite) +{ + DestroyAnimSprite(sprite); +} + +void sub_8101B90(struct Sprite *sprite) +{ + sprite->data[0] = 0; + sprite->callback = sub_8101BA0; +} + +static void sub_8101BA0(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->data[1] = 0; + sprite->data[2] = gBattlerSpriteIds[gBattleAnimAttacker]; + sprite->data[3] = GetBattlerSide(gBattleAnimAttacker); + sprite->data[4] = (sprite->data[3] != B_SIDE_PLAYER) ? 0x200 : -0x200; + sprite->data[5] = 0; + sub_80A7270(sprite->data[2], 0); + sprite->data[0]++; + // fall through + case 1: + sprite->data[5] += sprite->data[4]; + obj_id_set_rotscale(sprite->data[2], 0x100, 0x100, sprite->data[5]); + sub_80A73A0(sprite->data[2]); + if (++sprite->data[1] > 3) + { + sprite->data[1] = 0; + sprite->data[4] *= -1; + sprite->data[0]++; + } + break; + case 2: + sprite->data[5] += sprite->data[4]; + obj_id_set_rotscale(sprite->data[2], 0x100, 0x100, sprite->data[5]); + sub_80A73A0(sprite->data[2]); + if (++sprite->data[1] > 3) + { + sub_80A7344(sprite->data[2]); + DestroyAnimSprite(sprite); + } + break; + } +} + +void sub_8101C94(u8 taskId) +{ + u8 a; + + gTasks[taskId].data[0] = gBattlerSpriteIds[gBattleAnimAttacker]; + a = GetBattlerSide(gBattleAnimAttacker); + gTasks[taskId].data[1] = a; + gTasks[taskId].data[2] = 0; + switch (gBattleAnimArgs[0]) + { + default: + DestroyAnimVisualTask(taskId); + break; + case 0: + gTasks[taskId].data[2] = 0; + gTasks[taskId].data[3] = 8; + gTasks[taskId].data[4] = 0; + gTasks[taskId].data[5] = 3; + if (a == 0) + gTasks[taskId].data[5] *= -1; + + gTasks[taskId].func = sub_8101D2C; + break; + case 1: + gTasks[taskId].data[3] = 8; + gTasks[taskId].data[4] = 0x600; + gTasks[taskId].data[5] = 0xC0; + if (a == 0) + { + gTasks[taskId].data[4] = -gTasks[taskId].data[4]; + gTasks[taskId].data[5] = -gTasks[taskId].data[5]; + } + + gTasks[taskId].func = sub_8101EEC; + break; + } +} + +static void sub_8101D2C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + switch (task->data[2]) + { + case 0: + if (task->data[3]) + { + task->data[4] += task->data[5]; + gSprites[task->data[0]].pos2.x = task->data[4]; + task->data[3]--; + } + else + { + task->data[3] = 8; + task->data[4] = 0; + task->data[5] = (task->data[1] == 0) ? -0xC0 : 0xC0; + sub_80A7270(task->data[0], 0); + task->data[2]++; + } + break; + case 1: + if (task->data[3]) + { + task->data[4] += task->data[5]; + obj_id_set_rotscale(task->data[0], 0x100, 0x100, task->data[4]); + sub_80A73A0(task->data[0]); + task->data[3]--; + } + else + { + task->data[3] = 8; + task->data[4] = gSprites[task->data[0]].pos2.x; + task->data[5] = (task->data[1] == 0) ? 0x2 : -0x2; + task->data[6] = 1; + task->data[2]++; + } + break; + case 2: + if (task->data[3]) + { + if (task->data[6]) + { + task->data[6]--; + } + else + { + if (task->data[3] & 1) + gSprites[task->data[0]].pos2.x = task->data[4] + task->data[5]; + else + gSprites[task->data[0]].pos2.x = task->data[4] - task->data[5]; + + task->data[6] = 1; + task->data[3]--; + } + } + else + { + gSprites[task->data[0]].pos2.x = task->data[4]; + task->data[3] = 12; + task->data[2]++; + } + break; + case 3: + if (task->data[3]) + { + task->data[3]--; + } + else + { + task->data[3] = 3; + task->data[4] = gSprites[task->data[0]].pos2.x; + task->data[5] = (task->data[1] == 0) ? 8 : -8; + task->data[2]++; + } + break; + case 4: + if (task->data[3]) + { + task->data[4] += task->data[5]; + gSprites[task->data[0]].pos2.x = task->data[4]; + task->data[3]--; + } + else + { + DestroyAnimVisualTask(taskId); + } + break; + } +} + +static void sub_8101EEC(u8 taskId) +{ + struct Task* task = &gTasks[taskId]; + if (task->data[3]) + { + task->data[4] -= task->data[5]; + obj_id_set_rotscale(task->data[0], 0x100, 0x100, task->data[4]); + sub_80A73A0(task->data[0]); + task->data[3]--; + } + else + { + sub_80A7344(task->data[0]); + DestroyAnimVisualTask(taskId); + } +} + +void sub_8101F40(struct Sprite* sprite) +{ + if (gBattleAnimArgs[0] == 0) + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2]; + } + + sprite->data[0] = 0; + sprite->data[1] = 0; + StoreSpriteCallbackInData6(sprite, sub_810208C); + sprite->callback = sub_80A67D8; +} + +void sub_8101FA8(struct Sprite* sprite) +{ + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + StoreSpriteCallbackInData6(sprite, sub_8102044); + sprite->callback = sub_80A67D8; +} + +void sub_8101FF0(struct Sprite* sprite) +{ + sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + StartSpriteAnim(sprite, 1); + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->callback = sub_810208C; +} + +static void sub_8102044(struct Sprite* sprite) +{ + if (++sprite->data[0] > 8) + { + sprite->data[0] = 12; + sprite->data[1] = 8; + sprite->data[2] = 0; + StoreSpriteCallbackInData6(sprite, sub_810207C); + sprite->callback = TranslateSpriteOverDuration; + } +} + +static void sub_810207C(struct Sprite* sprite) +{ + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->callback = sub_810208C; +} + +static void sub_810208C(struct Sprite* sprite) +{ + if (++sprite->data[0] > 1) + { + sprite->data[0] = 0; + sprite->invisible = !sprite->invisible; + if (++sprite->data[1] > 8) + DestroyAnimSprite(sprite); + } +} + +void sub_81020D8(struct Sprite* sprite) +{ + if (gBattleAnimArgs[0] == 0) + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2]; + } + else + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2]; + } + + sprite->data[0] = 0; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->callback = sub_810213C; +} + +static void sub_810213C(struct Sprite* sprite) +{ + if (++sprite->data[0] > sprite->data[1]) + { + sprite->data[0] = 0; + sprite->pos1.y--; + } + + sprite->pos1.y -= sprite->data[0]; + if (sprite->animEnded) + DestroyAnimSprite(sprite); +} + +void sub_810217C(struct Sprite* sprite) +{ + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - 12; + sprite->data[0] = 0; + sprite->data[1] = 2; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[5] = BattleAnimAdjustPanning(-64); + sprite->callback = sub_81021CC; +} + +static void sub_81021CC(struct Sprite* sprite) +{ + if (++sprite->data[0] >= sprite->data[1]) + { + sprite->invisible = !sprite->invisible; + if (!sprite->invisible) + { + sprite->data[4]++; + if (!(sprite->data[4] & 1)) + PlaySE12WithPanning(SE_W207B, sprite->data[5]); + } + + sprite->data[0] = 0; + if (++sprite->data[2] > 1) + { + sprite->data[2] = 0; + sprite->data[1]++; + } + } + + if (sprite->animEnded && sprite->data[1] > 16 && sprite->invisible) + DestroyAnimSprite(sprite); +} + +void sub_8102268(struct Sprite* sprite) +{ + if (sprite->data[0] == 0) + { + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; + if (IsContest()) + sprite->pos1.y += 10; + + sprite->data[0]++; + } + + if ((u16)gBattleAnimArgs[7] == 0xFFFF) + DestroyAnimSprite(sprite); +} + +void sub_81022D4(u8 taskId) +{ + if (gTasks[taskId].data[2] == 1) + { + gBattleAnimArgs[7] = 0xFFFF; + gTasks[taskId].data[2]++; + } + else if (gTasks[taskId].data[2] == 2) + { + DestroyAnimVisualTask(taskId); + } + else + { + if (++gTasks[taskId].data[0] == 4) + { + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1]++; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - gTasks[taskId].data[1], gTasks[taskId].data[1])); + if (gTasks[taskId].data[1] == 16) + gTasks[taskId].data[2]++; + } + } +} + +void sub_810234C(struct Sprite* sprite) +{ + sub_80A6980(sprite, FALSE); + sprite->animPaused = 1; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->callback = sub_810237C; +} + +static void sub_810237C(struct Sprite* sprite) +{ + if (sprite->data[0]) + { + sprite->data[0]--; + } + else + { + sprite->animPaused = 0; + sprite->data[0] = 30; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->callback = StartAnimLinearTranslation; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + } +} + +void sub_81023E0(u8 taskId) +{ + if (++gTasks[taskId].data[0] == 4) + { + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1]++; + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1])); + if (gTasks[taskId].data[1] == 16) + DestroyAnimVisualTask(taskId); + } +} + +void unref_sub_8102434(u8 taskId) +{ + u8 i; + for (i = 0; i < gBattlersCount; i++) + { + if (gBattleAnimArgs[0] == 1 && GetBattlerSide(i) == B_SIDE_PLAYER) + SetHealthboxSpriteInvisible(gHealthboxSpriteIds[i]); + + if (gBattleAnimArgs[1] == 1 && GetBattlerSide(i) == B_SIDE_OPPONENT) + SetHealthboxSpriteInvisible(gHealthboxSpriteIds[i]); + } + + DestroyAnimVisualTask(taskId); +} + +void unref_sub_81024A8(u8 taskId) +{ + u8 i; + for (i = 0; i < gBattlersCount; i++) + SetHealthboxSpriteVisible(gHealthboxSpriteIds[i]); + + DestroyAnimVisualTask(taskId); +} + +void sub_81024E0(struct Sprite* sprite) +{ + if (IsContest()) + { + sprite->pos1.x = 48; + sprite->pos1.y = 40; + } + else + { + sprite->pos1.x = gBattleAnimArgs[0]; + sprite->pos1.y = gBattleAnimArgs[1]; + } + + sprite->oam.shape = 0; + sprite->oam.size = 3; + sprite->data[0] = 0; + sprite->callback = sub_8102528; +} + +static void sub_8102528(struct Sprite* sprite) +{ + if (sprite->data[0]) + DestroyAnimSprite(sprite); +} + +void sub_8102540(struct Sprite* sprite) +{ + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = gBattleAnimArgs[1]; + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 1; + sprite->callback = sub_8102584; +} + +static void sub_8102584(struct Sprite* sprite) +{ + if (++sprite->data[1] > 1) + { + sprite->data[1] = 0; + if (sprite->data[2] < 120) + { + sprite->pos1.y++; + sprite->data[2]++; + } + } + + if (sprite->data[0]) + DestroyAnimSprite(sprite); +} + +void sub_81026A8(u8); + + +void sub_81025C0(u8 taskId) +{ + int a = sub_80A75AC(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; + int b; + int c; + int d; + + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[2] = 0; + gTasks[taskId].data[3] = a; + gTasks[taskId].data[4] = 0; + gTasks[taskId].data[5] = 0; + gTasks[taskId].data[6] = 0; + gTasks[taskId].data[7] = 13; + gTasks[taskId].data[8] = 14; + gTasks[taskId].data[9] = 15; + b = sub_80A76C4(1, 1, 1, 1); + c = a | b; + sub_80A8048(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c); + b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON)); + d = IndexOfSpritePaletteTag(ANIM_TAG_GREEN_SPARKLE); + BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31)); + gTasks[taskId].func = sub_81026A8; + gTasks[taskId].func(taskId); +} + +void sub_81026A8(u8 taskId) +{ + struct Task* task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + if (++task->data[1] > 0) + { + u16 color; + u16 bitmask; + u16 r3; + u16 i; + u16 j; + task->data[1] = 0; + if (++task->data[2] <= 15) + { + u16 red; + u16 green; + u16 blue; + task->data[4] += task->data[7]; + task->data[5] += task->data[8]; + task->data[6] += task->data[9]; + red = task->data[4] >> 3; + green = task->data[5] >> 3; + blue = task->data[6] >> 3; + color = RGB(red, green, blue); + } + else + { + color = RGB(27, 29, 31); + task->data[0]++; + } + + bitmask = 1; + r3 = 0; + for (i = 0; i <= 15; i++) + { + if (task->data[3] & bitmask) + { + for (j = 1; j <= 15; j++) + { + gPlttBufferFaded[r3 + j] = color; + } + } + + bitmask <<= 1; + r3 += 16; + } + } + break; + case 1: + if (!gPaletteFade.active) + { + u8 spriteId; + for (spriteId = 0; spriteId < MAX_SPRITES; spriteId++) + { + if (gSprites[spriteId].template == &gUnknown_08592EBC || gSprites[spriteId].template == &gBattleAnimSpriteTemplate_8592EEC) + gSprites[spriteId].data[0] = 1; + } + + task->data[1] = 0; + task->data[0]++; + } + break; + case 2: + if (++task->data[1] > 30) + { + BeginNormalPaletteFade((u32)sub_80A8050(task->data[14], task->data[15]), 0, 16, 0, RGB(27, 29, 31)); + task->data[0]++; + } + break; + case 3: + if (!gPaletteFade.active) + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_8102844(struct Sprite* sprite) +{ + if (gBattleAnimArgs[2] < 2) + gBattleAnimArgs[2] = 2; + + if (gBattleAnimArgs[2] > 0x7F) + gBattleAnimArgs[2] = 0x7F; + + sprite->data[0] = 0; + sprite->data[1] = gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; + sprite->data[6] = sprite->pos1.x; + sprite->data[7] = sprite->pos1.y; + if (IsContest()) + { + sprite->oam.matrixNum = 8; + sprite->pos1.x += 40; + sprite->pos1.y += 20; + sprite->data[2] = sprite->pos1.x << 7; + sprite->data[3] = -0x1400 / sprite->data[1]; + sprite->data[4] = sprite->pos1.y << 7; + sprite->data[5] = -0xA00 / sprite->data[1]; + } + else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + { + sprite->pos1.x -= 40; + sprite->pos1.y += 20; + sprite->data[2] = sprite->pos1.x << 7; + sprite->data[3] = 0x1400 / sprite->data[1]; + sprite->data[4] = sprite->pos1.y << 7; + sprite->data[5] = -0xA00 / sprite->data[1]; + } + else + { + sprite->pos1.x += 40; + sprite->pos1.y -= 20; + sprite->data[2] = sprite->pos1.x << 7; + sprite->data[3] = -0x1400 / sprite->data[1]; + sprite->data[4] = sprite->pos1.y << 7; + sprite->data[5] = 0xA00 / sprite->data[1]; + sprite->oam.matrixNum = 24; + } + + sprite->callback = sub_810296C; +} + +static void sub_810296C(struct Sprite* sprite) +{ + sprite->data[2] += sprite->data[3]; + sprite->data[4] += sprite->data[5]; + sprite->pos1.x = sprite->data[2] >> 7; + sprite->pos1.y = sprite->data[4] >> 7; + if (--sprite->data[1] == 1) + { + sprite->pos1.x = sprite->data[6]; + sprite->pos1.y = sprite->data[7]; + } + + if (sprite->data[1] == 0) + DestroyAnimSprite(sprite); +} + +void sub_81029B4(u8 taskId) +{ + u16 i; + int obj; + u16 r3; + u16 r4; + struct Task* task = &gTasks[taskId]; + task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER); + task->data[1] = AllocSpritePalette(ANIM_TAG_BENT_SPOON); + r3 = (task->data[1] * 16) + 0x100; + r4 = (gSprites[task->data[0]].oam.paletteNum + 16) << 4; + for (i = 1; i < 16; i++) + gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i]; + + BlendPalette(r3, 16, 11, RGB(0, 0, 0)); + task->data[3] = 0; + i = 0; + while (i < 2 && (obj = duplicate_obj_of_side_rel2move_in_transparent_mode(0)) >= 0) + { + gSprites[obj].oam.paletteNum = task->data[1]; + gSprites[obj].data[0] = 0; + gSprites[obj].data[1] = i << 7; + gSprites[obj].data[2] = taskId; + gSprites[obj].callback = sub_8102B3C; + task->data[3]++; + i++; + } + + task->func = sub_8102AE0; + if (sub_80A8364(gBattleAnimAttacker) == 1) + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); + else + ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); +} + +static void sub_8102AE0(u8 taskId) +{ + struct Task* task = &gTasks[taskId]; + if (!task->data[3]) + { + if (sub_80A8364(gBattleAnimAttacker) == 1) + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); + else + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); + + FreeSpritePaletteByTag(ANIM_TAG_BENT_SPOON); + DestroyAnimVisualTask(taskId); + } +} + +static void sub_8102B3C(struct Sprite* sprite) +{ + if (++sprite->data[3] > 1) + { + sprite->data[3] = 0; + sprite->data[0]++; + } + + if (sprite->data[0] > 64) + { + gTasks[sprite->data[2]].data[3]--; + obj_delete_but_dont_free_vram(sprite); + } + else + { + sprite->data[4] = gSineTable[sprite->data[0]] / 6; + sprite->data[5] = gSineTable[sprite->data[0]] / 13; + sprite->data[1] = (sprite->data[1] + sprite->data[5]) & 0xFF; + sprite->pos2.x = Sin(sprite->data[1], sprite->data[4]); + } +} + +void sub_8102BCC(struct Sprite* sprite) +{ + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + sprite->callback = sub_80A67D8; +} + +void sub_8102BE8(u8 taskId) +{ + u16 i; + u16 j; + u16 index; + + index = IndexOfSpritePaletteTag(gUnknown_08593020[0][0]); + if (index != 0xFF) + { + index = (index << 4) + 0x100; + for (i = 1; i < ARRAY_COUNT(gUnknown_08593020[0]); i++) + gPlttBufferFaded[index + i] = gUnknown_08593020[0][i]; + } + + for (j = 1; j < ARRAY_COUNT(gUnknown_08593020); j++) + { + index = AllocSpritePalette(gUnknown_08593020[j][0]); + if (index != 0xFF) + { + index = (index << 4) + 0x100; + for (i = 1; i < ARRAY_COUNT(gUnknown_08593020[0]); i++) + gPlttBufferFaded[index + i] = gUnknown_08593020[j][i]; + } + } + DestroyAnimVisualTask(taskId); +} + +// clears the rainbow effect for musical notes. +void sub_8102CA0(u8 taskId) +{ + u16 i; + for (i = 1; i < ARRAY_COUNT(gUnknown_08593020); i++) + FreeSpritePaletteByTag(gUnknown_08593020[i][0]); + + DestroyAnimVisualTask(taskId); +} + +void sub_8102CD4(struct Sprite* sprite) +{ + u8 index; + u8 a; + u8 b; + sub_80A6838(sprite); + StartSpriteAnim(sprite, gBattleAnimArgs[0]); + if ((index = IndexOfSpritePaletteTag(gUnknown_08593020[gBattleAnimArgs[1]][0])) != 0xFF) + sprite->oam.paletteNum = index; + + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = 0; + sprite->data[3] = gBattleAnimArgs[2]; + if (IsContest()) + { + a = 48; + b = 40; + } + else + { + a = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + b = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + } + + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + sub_8102D8C(a - sprite->pos1.x, b - sprite->pos1.y, &sprite->data[6], &sprite->data[7], 40); + sprite->callback = sub_8102DE4; +} + +static void sub_8102D8C(s16 a, s16 b, s16* c, s16* d, s8 e) +{ + int f; + int g; + if (a < 0) + e = -e; + + f = a << 8; + g = f / e; + if (g == 0) + g = 1; + + *c = f / g; + *d = (b << 8) / g; +} + +static void sub_8102DE4(struct Sprite* sprite) +{ + int b; + s16 a; + int c; + u8 index; + sprite->data[0]++; + b = sprite->data[0] * 5 - ((sprite->data[0] * 5 / 256) << 8); + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + sprite->pos2.y = Sin(b, 15); + a = (u16)sprite->pos1.y; + c = (u16)sprite->pos1.x; + + if ((u32)((c + 16) << 16) > (0x110) << 16 || a < -16 || a > 0x80) + { + move_anim_8074EE0(sprite); + } + else + { + if (sprite->data[3] && ++sprite->data[2] > sprite->data[3]) + { + sprite->data[2] = 0; + if (++sprite->data[1] > 3) + sprite->data[1] = 0; + + index = IndexOfSpritePaletteTag(gUnknown_08593020[sprite->data[1]][0]); + if (index != 0xFF) + sprite->oam.paletteNum = index; + } + } +} + +void sub_8102EB0(struct Sprite* sprite) +{ + int a; + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + { + a = gBattleAnimArgs[1]; + (u16)gBattleAnimArgs[1] = -a; + } + + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; + StartSpriteAnim(sprite, gBattleAnimArgs[0]); + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + sprite->data[6] = (gBattleAnimArgs[1] << 4) / 5; + sprite->data[7] = (gBattleAnimArgs[2] << 7) / 5; + sprite->callback = sub_8102F40; +} + +static void sub_8102F40(struct Sprite* sprite) +{ + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + if (sprite->data[0] > 5 && sprite->data[3] == 0) + { + sprite->data[2] = (sprite->data[2] + 16) & 0xFF; + sprite->pos2.x = Cos(sprite->data[2], 18); + sprite->pos2.y = Sin(sprite->data[2], 18); + if (sprite->data[2] == 0) + sprite->data[3] = 1; + } + + if (++sprite->data[0] == 48) + move_anim_8074EE0(sprite); +} + +void sub_8102FB8(struct Sprite* sprite) +{ + s16 a; + if (gBattleAnimArgs[0] == 1) + { + sprite->oam.matrixNum = 8; + a = 16; + } + else + { + a = -16; + } + + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + a; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 8; + sprite->data[0] = 8; + sprite->callback = WaitAnimForDuration; + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); +} + +void sub_8103028(struct Sprite* sprite) +{ + s16 xDiff; + u8 index; + sub_80A6838(sprite); + sprite->pos1.y += 8; + StartSpriteAnim(sprite, gBattleAnimArgs[1]); + index = IndexOfSpritePaletteTag(gUnknown_08593020[gBattleAnimArgs[2]][0]); + if (index != 0xFF) + sprite->oam.paletteNum = index; + + xDiff = (gBattleAnimArgs[0] == 0) ? -32 : 32; + sprite->data[0] = 40; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = xDiff + sprite->data[1]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sprite->data[3] - 40; + InitAnimLinearTranslation(sprite); + sprite->data[5] = gBattleAnimArgs[3]; + sprite->callback = sub_81030B0; +} + +static void sub_81030B0(struct Sprite* sprite) +{ + if (TranslateAnimLinear(sprite) == 0) + { + s16 xDiff; + xDiff = Sin(sprite->data[5], 8); + if (sprite->pos2.x < 0) + xDiff = -xDiff; + + sprite->pos2.x += xDiff; + sprite->pos2.y += Sin(sprite->data[5], 4); + sprite->data[5] = (sprite->data[5] + 8) & 0xFF; + } + else + { + DestroyAnimSprite(sprite); + } +} + +void sub_810310C(u8 battler, struct Sprite* sprite) +{ + if (GetBattlerSide(battler) == B_SIDE_PLAYER) + sprite->pos1.x = sub_80A861C(battler, 5) + 8; + else + sprite->pos1.x = sub_80A861C(battler, 4) - 8; + + sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) - (s16)sub_80A861C(battler, 0) / 4; +} + +void sub_8103164(struct Sprite* sprite) +{ + u8 a; + u8 battler; + if (gBattleAnimArgs[0] == 0) + battler = gBattleAnimAttacker; + else + battler = gBattleAnimTarget; + + sub_810310C(battler, sprite); + a = (GetBattlerSide(battler) == B_SIDE_PLAYER) ? 0 : 1; + sprite->data[0] = gBattleAnimArgs[1]; + sprite->data[1] = a + 2; + StartSpriteAnim(sprite, a); + StoreSpriteCallbackInData6(sprite, sub_81031D0); + sprite->callback = sub_80A67D8; +} + +static void sub_81031D0(struct Sprite* sprite) +{ + if (--sprite->data[0] == 0) + { + StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); + StartSpriteAnim(sprite, sprite->data[1]); + sprite->callback = sub_80A67D8; + } +} + +void sub_8103208(struct Sprite* sprite) +{ + u8 battler; + if (gBattleAnimArgs[0] == 0) + battler = gBattleAnimAttacker; + else + battler = gBattleAnimTarget; + + sub_810310C(battler, sprite); + sprite->data[0] = 0; + StoreSpriteCallbackInData6(sprite, sub_8103250); + sprite->callback = sub_80A67BC; +} + +static void sub_8103250(struct Sprite* sprite) +{ + if (++sprite->data[0] > 16) + { + StartSpriteAffineAnim(sprite, 1); + StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + sprite->callback = sub_80A67BC; + } +} + +void sub_8103284(struct Sprite* sprite) +{ + u8 battler; + if (gBattleAnimArgs[0] == 0) + battler = gBattleAnimAttacker; + else + battler = gBattleAnimTarget; + + sprite->pos1.x = GetBattlerSpriteCoord(battler, 0); + sprite->pos1.y = sub_80A861C(battler, 2); + if (sprite->pos1.y <= 9) + sprite->pos1.y = 10; + + sprite->data[0] = 1; + sprite->data[1] = 0; + sprite->data[2] = sprite->subpriority; + sprite->data[3] = sprite->subpriority + 4; + sprite->data[4] = 0; + StoreSpriteCallbackInData6(sprite, sub_8103300); + sprite->callback = sub_80A67BC; +} + +static void sub_8103300(struct Sprite* sprite) +{ + if (++sprite->data[4] > 12) + sprite->callback = sub_8103320; +} + +static void sub_8103320(struct Sprite* sprite) +{ + s16 temp; + s16 temp2; + sprite->data[1] += 4; + if (sprite->data[1] > 254) + { + if (--sprite->data[0] == 0) + { + sprite->pos2.x = 0; + sprite->callback = sub_8103250; + return; + } + else + { + sprite->data[1] &= 0xFF; + } + } + + if (sprite->data[1] > 0x4F) + sprite->subpriority = sprite->data[3]; + + if (sprite->data[1] > 0x9F) + sprite->subpriority = sprite->data[2]; + + temp = gSineTable[sprite->data[1]]; + sprite->pos2.x = (temp2 = temp >> 3) + (temp2 >> 1); +} + +void sub_8103390(struct Sprite* sprite) +{ + u8 bank; + if (gBattleAnimArgs[0] == 0) + bank = gBattleAnimAttacker; + else + bank = gBattleAnimTarget; + + sub_810310C(bank, sprite); + if (GetBattlerSide(bank) == B_SIDE_PLAYER) + { + StartSpriteAnim(sprite, 0); + sprite->data[0] = 2; + } + else + { + StartSpriteAnim(sprite, 1); + sprite->data[0] = 3; + } + + sprite->callback = sub_81033F0; +} + +static void sub_81033F0(struct Sprite* sprite) +{ + if (++sprite->data[1] > 10) + { + sprite->data[1] = 0; + StartSpriteAnim(sprite, sprite->data[0]); + StoreSpriteCallbackInData6(sprite, sub_810342C); + sprite->callback = sub_80A67D8; + } +} + +static void sub_810342C(struct Sprite* sprite) +{ + if (++sprite->data[1] > 5) + DestroyAnimSprite(sprite); +} diff --git a/src/effects_1.c b/src/effects_1.c deleted file mode 100644 index a8687bc38..000000000 --- a/src/effects_1.c +++ /dev/null @@ -1,2093 +0,0 @@ -#include "global.h" -#include "battle_anim.h" -#include "constants/rgb.h" - -extern void sub_80FE840(struct Sprite *); -extern void sub_80FE8E0(struct Sprite *); -extern void sub_80FE930(struct Sprite *); -extern void sub_80FE988(struct Sprite *); -extern void sub_80FEAD8(struct Sprite *); -extern void sub_80FEB44(struct Sprite *); -extern void sub_80FEC48(struct Sprite *); -extern void sub_80FED28(struct Sprite *); -extern void sub_80FEE78(struct Sprite *); -extern void sub_80FEF44(struct Sprite *); -extern void sub_80FEFFC(struct Sprite *); -extern void AnimMoveTwisterParticle(struct Sprite *); -extern void sub_80FF0F4(struct Sprite *); -extern void sub_80FF374(struct Sprite *); -extern void sub_80FF698(struct Sprite *); -extern void sub_80FF768(struct Sprite *); -extern void sub_80FF7EC(struct Sprite *); -extern void sub_80FF934(struct Sprite *); -extern void sub_80FFB18(struct Sprite *); -extern void sub_80FFBF4(struct Sprite *); -extern void sub_80FFC70(struct Sprite *); -extern void sub_80FFCB4(struct Sprite *); -extern void sub_80FFDBC(struct Sprite *); -extern void sub_8100640(struct Sprite *); -extern void sub_8100898(struct Sprite *); -extern void sub_8100A50(struct Sprite *); -extern void sub_81009F8(struct Sprite *); -extern void sub_8100A94(struct Sprite *); -extern void sub_8100AE0(struct Sprite *); -extern void sub_8100B88(struct Sprite *); -extern void sub_8100E1C(struct Sprite *); -extern void sub_8100EF0(struct Sprite *); -extern void sub_81010CC(struct Sprite *); -extern void sub_810130C(struct Sprite *); -extern void sub_810135C(struct Sprite *); -extern void sub_8101440(struct Sprite *); -extern void sub_81014F4(struct Sprite *); -extern void sub_81015AC(struct Sprite *); -extern void sub_8101898(struct Sprite *); -extern void sub_8101940(struct Sprite *); -extern void sub_8101B90(struct Sprite *); -extern void sub_8101F40(struct Sprite *); -extern void sub_8101FA8(struct Sprite *); -extern void sub_8101FF0(struct Sprite *); -extern void sub_81020D8(struct Sprite *); -extern void sub_810217C(struct Sprite *); -extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); -extern void sub_80A77C8(struct Sprite *); -extern void sub_8102268(struct Sprite *); -extern void sub_810234C(struct Sprite *); -extern void sub_81024E0(struct Sprite *); -extern void sub_8102540(struct Sprite *); -extern void sub_80A77C8(struct Sprite *); -extern void sub_8102844(struct Sprite *); -extern void sub_8102BCC(struct Sprite *); -extern void sub_8102CD4(struct Sprite *); -extern void sub_8102EB0(struct Sprite *); -extern void sub_8102FB8(struct Sprite *); -extern void sub_8103028(struct Sprite *); -extern void sub_8103164(struct Sprite *); -extern void sub_8103208(struct Sprite *); -extern void sub_8103284(struct Sprite *); -extern void sub_8103390(struct Sprite *); - -const union AnimCmd gUnknown_085920F0[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(2, 5), - ANIMCMD_FRAME(4, 5), - ANIMCMD_FRAME(6, 5), - ANIMCMD_FRAME(8, 5), - ANIMCMD_FRAME(10, 5), - ANIMCMD_FRAME(12, 5), - ANIMCMD_FRAME(14, 5), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gUnknown_08592114[] = -{ - gUnknown_085920F0, -}; - -const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = -{ - .tileTag = ANIM_TAG_SLEEP_POWDER, - .paletteTag = ANIM_TAG_SLEEP_POWDER, - .oam = &gUnknown_08524944, - .anims = gUnknown_08592114, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FE840, -}; - -const struct SpriteTemplate gStunSporeParticleSpriteTemplate = -{ - .tileTag = ANIM_TAG_STUN_SPORE, - .paletteTag = ANIM_TAG_STUN_SPORE, - .oam = &gUnknown_08524944, - .anims = gUnknown_08592114, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FE840, -}; - -const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = -{ - .tileTag = ANIM_TAG_POISON_POWDER, - .paletteTag = ANIM_TAG_POISON_POWDER, - .oam = &gUnknown_08524944, - .anims = gUnknown_08592114, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FE840, -}; - -const union AnimCmd gUnknown_08592160[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592168[] = -{ - ANIMCMD_FRAME(1, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592170[] = -{ - ANIMCMD_FRAME(2, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592178[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592180[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592188[] = -{ - ANIMCMD_FRAME(5, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592190[] = -{ - ANIMCMD_FRAME(6, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592198[] = -{ - ANIMCMD_FRAME(7, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085921A0[] = -{ - ANIMCMD_FRAME(8, 1), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_085921A8[] = -{ - gUnknown_08592160, - gUnknown_08592168, - gUnknown_08592170, - gUnknown_08592178, - gUnknown_08592180, - gUnknown_08592188, - gUnknown_08592190, -}; - -const union AnimCmd *const gUnknown_085921C4[] = -{ - gUnknown_08592198, -}; - -const union AnimCmd *const gUnknown_085921C8[] = -{ - gUnknown_085921A0, -}; - -const union AffineAnimCmd gUnknown_085921CC[] = { - AFFINEANIMCMD_FRAME(-5, -5, 0, 1), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd *const gUnknown_085921DC[] = { - gUnknown_085921CC, -}; - -const struct SpriteTemplate gUnknown_085921E0 = -{ - .tileTag = ANIM_TAG_ORBS, - .paletteTag = ANIM_TAG_ORBS, - .oam = &gUnknown_08524A8C, - .anims = gUnknown_085921C8, - .images = NULL, - .affineAnims = gUnknown_085921DC, - .callback = sub_80FE8E0, -}; - -const struct SpriteTemplate gUnknown_085921F8 = -{ - .tileTag = ANIM_TAG_ORBS, - .paletteTag = ANIM_TAG_ORBS, - .oam = &gUnknown_08524904, - .anims = gUnknown_085921A8, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FE930, -}; - -const struct SpriteTemplate gUnknown_08592210 = -{ - .tileTag = ANIM_TAG_ORBS, - .paletteTag = ANIM_TAG_ORBS, - .oam = &gUnknown_08524904, - .anims = gUnknown_085921C4, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FE988, -}; - -const union AffineAnimCmd gUnknown_08592228[] = { - AFFINEANIMCMD_FRAME(320, 320, 0, 0), - AFFINEANIMCMD_FRAME(-14, -14, 0, 1), - AFFINEANIMCMD_JUMP(1), -}; - -const union AffineAnimCmd *const gUnknown_08592240[] = { - gUnknown_08592228, -}; - -const struct SpriteTemplate gUnknown_08592244 = -{ - .tileTag = ANIM_TAG_GRAY_ORB, - .paletteTag = ANIM_TAG_GRAY_ORB, - .oam = &gUnknown_085249C4, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_08592240, - .callback = sub_80FE8E0, -}; - -const union AffineAnimCmd gUnknown_0859225C[] = { - AFFINEANIMCMD_FRAME(-5, -5, 0, 1), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd *const gUnknown_0859226C[] = { - gUnknown_0859225C, -}; - -const struct SpriteTemplate gUnknown_08592270 = -{ - .tileTag = ANIM_TAG_ORBS, - .paletteTag = ANIM_TAG_ORBS, - .oam = &gUnknown_08524A8C, - .anims = gUnknown_085921C8, - .images = NULL, - .affineAnims = gUnknown_0859226C, - .callback = sub_80FEAD8, -}; - -const struct SpriteTemplate gUnknown_08592288 = -{ - .tileTag = ANIM_TAG_ORBS, - .paletteTag = ANIM_TAG_ORBS, - .oam = &gUnknown_08524904, - .anims = gUnknown_085921A8, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEB44, -}; - -const union AnimCmd gUnknown_085922A0[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085922A8[] = -{ - ANIMCMD_FRAME(4, 7), - ANIMCMD_FRAME(8, 7), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gUnknown_085922B4[] = -{ - gUnknown_085922A0, - gUnknown_085922A8, -}; - -const struct SpriteTemplate gLeechSeedSpriteTemplate = -{ - .tileTag = ANIM_TAG_SEED, - .paletteTag = ANIM_TAG_SEED, - .oam = &gUnknown_0852490C, - .anims = gUnknown_085922B4, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEC48, -}; - -const union AnimCmd gUnknown_085922D4[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085922DC[] = -{ - ANIMCMD_FRAME(4, 7), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_085922E4[] = -{ - gUnknown_085922D4, - gUnknown_085922DC, -}; - -const struct SpriteTemplate gUnknown_085922EC = -{ - .tileTag = ANIM_TAG_SPORE, - .paletteTag = ANIM_TAG_SPORE, - .oam = &gUnknown_0852490C, - .anims = gUnknown_085922E4, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FED28, -}; - -const union AnimCmd gUnknown_08592304[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_0859230C[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592314[] = -{ - gUnknown_08592304, -}; - -const union AnimCmd *const gUnknown_08592318[] = -{ - gUnknown_0859230C, -}; - -const struct SpriteTemplate gUnknown_0859231C = -{ - .tileTag = ANIM_TAG_FLOWER, - .paletteTag = ANIM_TAG_FLOWER, - .oam = &gUnknown_0852490C, - .anims = gUnknown_08592314, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEE78, -}; - -const struct SpriteTemplate gUnknown_08592334 = -{ - .tileTag = ANIM_TAG_FLOWER, - .paletteTag = ANIM_TAG_FLOWER, - .oam = &gUnknown_08524904, - .anims = gUnknown_08592318, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEF44, -}; - -const union AnimCmd gUnknown_0859234C[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(4, 5), - ANIMCMD_FRAME(8, 5), - ANIMCMD_FRAME(12, 5), - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(20, 5), - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(12, 5), - ANIMCMD_FRAME(8, 5), - ANIMCMD_FRAME(4, 5), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gUnknown_08592378[] = -{ - ANIMCMD_FRAME(24, 5), - ANIMCMD_FRAME(28, 5), - ANIMCMD_FRAME(32, 5), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592388[] = -{ - gUnknown_0859234C, - gUnknown_08592378, -}; - -const struct SpriteTemplate gUnknown_08592390 = -{ - .tileTag = ANIM_TAG_LEAF, - .paletteTag = ANIM_TAG_LEAF, - .oam = &gUnknown_0852490C, - .anims = gUnknown_08592388, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEFFC, -}; - -const struct SpriteTemplate gUnknown_085923A8 = -{ - .tileTag = ANIM_TAG_LEAF, - .paletteTag = ANIM_TAG_LEAF, - .oam = &gUnknown_0852490C, - .anims = gUnknown_08592388, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = AnimMoveTwisterParticle, -}; - -const union AnimCmd gUnknown_085923C0[] = -{ - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(0, 3, .hFlip = TRUE), - ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE), - ANIMCMD_FRAME(0, 3, .vFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gUnknown_085923D4[] = -{ - gUnknown_085923C0, -}; - -const struct SpriteTemplate gUnknown_085923D8 = -{ - .tileTag = ANIM_TAG_RAZOR_LEAF, - .paletteTag = ANIM_TAG_RAZOR_LEAF, - .oam = &gUnknown_08524934, - .anims = gUnknown_085923D4, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FF0F4, -}; - -const union AffineAnimCmd gUnknown_085923F0[] = { - AFFINEANIMCMD_FRAME(0, 0, 0, 1), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd *const gUnknown_08592400[] = { - gUnknown_085923F0, -}; - -const struct SpriteTemplate gSwiftStarSpriteTemplate = -{ - .tileTag = ANIM_TAG_YELLOW_STAR, - .paletteTag = ANIM_TAG_YELLOW_STAR, - .oam = &gUnknown_08524974, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_08592400, - .callback = sub_80FF0F4, -}; - -const union AnimCmd gUnknown_0859241C[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(32, 4), - ANIMCMD_FRAME(64, 4), - ANIMCMD_FRAME(96, 4), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592430[] = -{ - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_FRAME(32, 4, .hFlip = TRUE), - ANIMCMD_FRAME(64, 4, .hFlip = TRUE), - ANIMCMD_FRAME(96, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592444[] = -{ - gUnknown_0859241C, - gUnknown_08592430, -}; - -const union AffineAnimCmd gUnknown_0859244C[] = { - AFFINEANIMCMD_FRAME(256, 256, 0, 0), - AFFINEANIMCMD_FRAME(-11, 0, 0, 6), - AFFINEANIMCMD_FRAME(11, 0, 0, 6), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_0859246C[] = { - AFFINEANIMCMD_FRAME(-256, 256, 0, 0), - AFFINEANIMCMD_FRAME(11, 0, 0, 6), - AFFINEANIMCMD_FRAME(-11, 0, 0, 6), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd *const gUnknown_0859248C[] = { - gUnknown_0859244C, - gUnknown_0859246C, -}; - -const struct SpriteTemplate gUnknown_08592494 = -{ - .tileTag = ANIM_TAG_TENDRILS, - .paletteTag = ANIM_TAG_TENDRILS, - .oam = &gUnknown_0852499C, - .anims = gUnknown_08592444, - .images = NULL, - .affineAnims = gUnknown_0859248C, - .callback = sub_80FF374, -}; - -const union AffineAnimCmd gUnknown_085924AC[] = { - AFFINEANIMCMD_FRAME(0, 0, 0, 0), - AFFINEANIMCMD_FRAME(48, 48, 0, 14), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_085924C4[] = { - AFFINEANIMCMD_FRAME(-16, -16, 0, 1), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd *const gUnknown_085924D4[] = { - gUnknown_085924AC, - gUnknown_085924C4, -}; - -const struct SpriteTemplate gUnknown_085924DC = -{ - .tileTag = ANIM_TAG_ORBS, - .paletteTag = ANIM_TAG_ORBS, - .oam = &gUnknown_085249CC, - .anims = gUnknown_085921C8, - .images = NULL, - .affineAnims = gUnknown_085924D4, - .callback = sub_80FF698, -}; - -const union AnimCmd gUnknown_085924F4[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(16, 7), - ANIMCMD_FRAME(32, 7), - ANIMCMD_FRAME(48, 7), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592508[] = -{ - ANIMCMD_FRAME(0, 7, .hFlip = TRUE), - ANIMCMD_FRAME(16, 7, .hFlip = TRUE), - ANIMCMD_FRAME(32, 7, .hFlip = TRUE), - ANIMCMD_FRAME(48, 7, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_0859251C[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(16, 7), - ANIMCMD_FRAME(32, 7), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_0859252C[] = -{ - ANIMCMD_FRAME(0, 7, .hFlip = TRUE), - ANIMCMD_FRAME(16, 7, .hFlip = TRUE), - ANIMCMD_FRAME(32, 7, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_0859253C[] = -{ - gUnknown_085924F4, - gUnknown_08592508, - gUnknown_0859251C, - gUnknown_0859252C, -}; - -const struct SpriteTemplate gUnknown_0859254C = -{ - .tileTag = ANIM_TAG_ROOTS, - .paletteTag = ANIM_TAG_ROOTS, - .oam = &gUnknown_08524914, - .anims = gUnknown_0859253C, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FF768, -}; - -const struct SpriteTemplate gUnknown_08592564 = -{ - .tileTag = ANIM_TAG_ROOTS, - .paletteTag = ANIM_TAG_ROOTS, - .oam = &gUnknown_08524914, - .anims = gUnknown_0859253C, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FF7EC, -}; - -const union AnimCmd gUnknown_0859257C[] = -{ - ANIMCMD_FRAME(3, 3), - ANIMCMD_FRAME(0, 5), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gUnknown_08592588[] = -{ - gUnknown_0859257C, -}; - -const struct SpriteTemplate gUnknown_0859258C = -{ - .tileTag = ANIM_TAG_ORBS, - .paletteTag = ANIM_TAG_ORBS, - .oam = &gUnknown_08524904, - .anims = gUnknown_08592588, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FF934, -}; - -const union AnimCmd gUnknown_085925A4[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_085925AC[] = -{ - gUnknown_085925A4, -}; - -const union AffineAnimCmd gUnknown_085925B0[] = { - AFFINEANIMCMD_FRAME(0, 0, -4, 10), - AFFINEANIMCMD_FRAME(0, 0, 4, 20), - AFFINEANIMCMD_FRAME(0, 0, -4, 10), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_085925D0[] = { - AFFINEANIMCMD_FRAME(0, 0, -1, 2), - AFFINEANIMCMD_FRAME(0, 0, 1, 4), - AFFINEANIMCMD_FRAME(0, 0, -1, 4), - AFFINEANIMCMD_FRAME(0, 0, 1, 4), - AFFINEANIMCMD_FRAME(0, 0, -1, 4), - AFFINEANIMCMD_FRAME(0, 0, 1, 2), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd *const gUnknown_08592608[] = { - gUnknown_085925B0, - gUnknown_085925D0, -}; - -const struct SpriteTemplate gUnknown_08592610 = -{ - .tileTag = ANIM_TAG_ITEM_BAG, - .paletteTag = ANIM_TAG_ITEM_BAG, - .oam = &gUnknown_08524974, - .anims = gUnknown_085925AC, - .images = NULL, - .affineAnims = gUnknown_08592608, - .callback = sub_80FFB18, -}; - -const struct SpriteTemplate gBattleAnimSpriteTemplate_8592628 = -{ - .tileTag = ANIM_TAG_ITEM_BAG, - .paletteTag = ANIM_TAG_ITEM_BAG, - .oam = &gUnknown_08524974, - .anims = gUnknown_085925AC, - .images = NULL, - .affineAnims = gUnknown_08592608, - .callback = sub_80FFBF4, -}; - -const union AnimCmd gUnknown_08592640[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(12, 4), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592654[] = -{ - gUnknown_08592640, -}; - -const struct SpriteTemplate gUnknown_08592658 = -{ - .tileTag = ANIM_TAG_GREEN_SPARKLE, - .paletteTag = ANIM_TAG_GREEN_SPARKLE, - .oam = &gUnknown_0852490C, - .anims = gUnknown_08592654, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FFC70, -}; - -const struct SpriteTemplate gUnknown_08592670 = -{ - .tileTag = ANIM_TAG_ITEM_BAG, - .paletteTag = ANIM_TAG_ITEM_BAG, - .oam = &gUnknown_08524974, - .anims = gUnknown_085925AC, - .images = NULL, - .affineAnims = gUnknown_08592608, - .callback = sub_80FFCB4, -}; - -const union AffineAnimCmd gUnknown_08592688[] = { - AFFINEANIMCMD_FRAME(0, 0, 0, 3), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_08592698[] = { - AFFINEANIMCMD_FRAME(0, -10, 0, 3), - AFFINEANIMCMD_FRAME(0, -6, 0, 3), - AFFINEANIMCMD_FRAME(0, -2, 0, 3), - AFFINEANIMCMD_FRAME(0, 0, 0, 3), - AFFINEANIMCMD_FRAME(0, 2, 0, 3), - AFFINEANIMCMD_FRAME(0, 6, 0, 3), - AFFINEANIMCMD_FRAME(0, 10, 0, 3), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd *const gUnknown_085926D8[] = { - gUnknown_08592688, - gUnknown_08592698, - gUnknown_085925B0, - gUnknown_085925D0, -}; - -const struct SpriteTemplate gUnknown_085926E8 = -{ - .tileTag = ANIM_TAG_ITEM_BAG, - .paletteTag = ANIM_TAG_ITEM_BAG, - .oam = &gUnknown_08524974, - .anims = gUnknown_085925AC, - .images = NULL, - .affineAnims = gUnknown_085926D8, - .callback = sub_80FFDBC, -}; - -const s8 gUnknown_08592700[][3] = -{ - {5, 24, 1}, - {0, 4, 0}, - {8, 16, -1}, - {0, 2, 0}, - {8, 16, 1}, - {0, 2, 0}, - {8, 16, 1}, - {0, 2, 0}, - {8, 16, 1}, - {0, 16, 0}, - {0, 0, 127}, -}; - -const union AnimCmd gUnknown_08592724[] = -{ - ANIMCMD_FRAME(28, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_0859272C[] = -{ - ANIMCMD_FRAME(32, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592734[] = -{ - ANIMCMD_FRAME(20, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_0859273C[] = -{ - ANIMCMD_FRAME(28, 1, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592744[] = -{ - ANIMCMD_FRAME(16, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_0859274C[] = -{ - ANIMCMD_FRAME(16, 1, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592754[] = -{ - ANIMCMD_FRAME(28, 1), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_0859275C[] = -{ - gUnknown_08592724, - gUnknown_0859272C, - gUnknown_08592734, - gUnknown_0859273C, - gUnknown_08592744, - gUnknown_0859274C, - gUnknown_08592754, -}; - -const struct SpriteTemplate gUnknown_08592778 = -{ - .tileTag = ANIM_TAG_LEAF, - .paletteTag = ANIM_TAG_LEAF, - .oam = &gUnknown_0852490C, - .anims = gUnknown_0859275C, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, -}; - -const union AffineAnimCmd gUnknown_08592790[] = { - AFFINEANIMCMD_FRAME(256, 256, 0, 0), - AFFINEANIMCMD_FRAME(0, 0, 4, 1), - AFFINEANIMCMD_JUMP(1), -}; - -const union AffineAnimCmd *const gUnknown_085927A8[] = { - gUnknown_08592790, -}; - -const struct SpriteTemplate gUnknown_085927AC = -{ - .tileTag = ANIM_TAG_FLOWER, - .paletteTag = ANIM_TAG_FLOWER, - .oam = &gUnknown_08524904, - .anims = gUnknown_08592318, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100640, -}; - -const struct SpriteTemplate gUnknown_085927C4 = -{ - .tileTag = ANIM_TAG_FLOWER, - .paletteTag = ANIM_TAG_FLOWER, - .oam = &gUnknown_0852496C, - .anims = gUnknown_08592314, - .images = NULL, - .affineAnims = gUnknown_085927A8, - .callback = sub_8100640, -}; - -const union AffineAnimCmd gUnknown_085927DC[] = { - AFFINEANIMCMD_FRAME(256, 256, 0, 0), - AFFINEANIMCMD_FRAME(0, 0, -10, 1), - AFFINEANIMCMD_JUMP(1), -}; - -const union AffineAnimCmd gUnknown_085927F4[] = { - AFFINEANIMCMD_FRAME(192, 192, 0, 0), - AFFINEANIMCMD_FRAME(0, 0, -12, 1), - AFFINEANIMCMD_JUMP(1), -}; - -const union AffineAnimCmd gUnknown_0859280C[] = { - AFFINEANIMCMD_FRAME(143, 143, 0, 0), - AFFINEANIMCMD_FRAME(0, 0, -15, 1), - AFFINEANIMCMD_JUMP(1), -}; - -const union AffineAnimCmd *const gUnknown_08592824[] = { - gUnknown_085927DC, -}; - -const union AffineAnimCmd *const gUnknown_08592828[] = { - gUnknown_085927F4, -}; - -const union AffineAnimCmd *const gUnknown_0859282C[] = { - gUnknown_0859280C, -}; - -const struct SpriteTemplate gUnknown_08592830 = -{ - .tileTag = ANIM_TAG_SPARKLE_6, - .paletteTag = ANIM_TAG_SPARKLE_6, - .oam = &gUnknown_0852496C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_08592824, - .callback = sub_8100640, -}; - -const struct SpriteTemplate gUnknown_08592848 = -{ - .tileTag = ANIM_TAG_SPARKLE_6, - .paletteTag = ANIM_TAG_SPARKLE_6, - .oam = &gUnknown_0852496C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_08592828, - .callback = sub_8100640, -}; - -const struct SpriteTemplate gUnknown_08592860 = -{ - .tileTag = ANIM_TAG_SPARKLE_6, - .paletteTag = ANIM_TAG_SPARKLE_6, - .oam = &gUnknown_0852496C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_0859282C, - .callback = sub_8100640, -}; - -// sMagicalLeafBlendColors -const u16 gUnknown_08592878[] = -{ - RGB(31, 0, 0), - RGB(31, 19, 0), - RGB(31, 31, 0), - RGB(0, 31, 0), - RGB(5, 14, 31), - RGB(22, 10, 31), - RGB(22, 21, 31), -}; - -const struct SpriteTemplate gUnknown_08592888 = -{ - .tileTag = ANIM_TAG_GREEN_SPIKE, - .paletteTag = ANIM_TAG_GREEN_SPIKE, - .oam = &gUnknown_0852496C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100898, -}; - -const union AnimCmd gUnknown_085928A0[] = -{ - ANIMCMD_FRAME(64, 3), - ANIMCMD_FRAME(80, 3), - ANIMCMD_FRAME(96, 3), - ANIMCMD_FRAME(112, 6), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085928B4[] = -{ - ANIMCMD_FRAME(64, 3, .hFlip = TRUE), - ANIMCMD_FRAME(80, 3, .hFlip = TRUE), - ANIMCMD_FRAME(96, 3, .hFlip = TRUE), - ANIMCMD_FRAME(112, 6, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_085928C8[] = -{ - gUnknown_085928A0, - gUnknown_085928B4, -}; - -const struct SpriteTemplate gUnknown_085928D0 = -{ - .tileTag = ANIM_TAG_SLAM_HIT, - .paletteTag = ANIM_TAG_SLAM_HIT, - .oam = &gUnknown_08524914, - .anims = gUnknown_085928C8, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100A50, -}; - -const struct SpriteTemplate gUnknown_085928E8 = -{ - .tileTag = ANIM_TAG_WHIP_HIT, - .paletteTag = ANIM_TAG_WHIP_HIT, - .oam = &gUnknown_08524914, - .anims = gUnknown_085928C8, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100A50, -}; - -const union AnimCmd gUnknown_08592900[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_FRAME(32, 4), - ANIMCMD_FRAME(48, 4), - ANIMCMD_FRAME(64, 5), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592918[] = -{ - gUnknown_08592900, -}; - -const struct SpriteTemplate gUnknown_0859291C = -{ - .tileTag = ANIM_TAG_UNUSED_HIT, - .paletteTag = ANIM_TAG_UNUSED_HIT, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592918, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81009F8, -}; - -const struct SpriteTemplate gUnknown_08592934 = -{ - .tileTag = ANIM_TAG_UNUSED_HIT_2, - .paletteTag = ANIM_TAG_UNUSED_HIT_2, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592918, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81009F8, -}; - -const union AffineAnimCmd gUnknown_0859294C[] = { - AFFINEANIMCMD_FRAME(256, 256, 0, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_0859295C[] = { - AFFINEANIMCMD_FRAME(256, 256, 32, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_0859296C[] = { - AFFINEANIMCMD_FRAME(256, 256, 64, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_0859297C[] = { - AFFINEANIMCMD_FRAME(256, 256, 96, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_0859298C[] = { - AFFINEANIMCMD_FRAME(256, 256, -128, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_0859299C[] = { - AFFINEANIMCMD_FRAME(256, 256, -96, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_085929AC[] = { - AFFINEANIMCMD_FRAME(256, 256, -64, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_085929BC[] = { - AFFINEANIMCMD_FRAME(256, 256, -32, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd *const gUnknown_085929CC[] = { - gUnknown_0859294C, - gUnknown_0859295C, - gUnknown_0859296C, - gUnknown_0859297C, - gUnknown_0859298C, - gUnknown_0859299C, - gUnknown_085929AC, - gUnknown_085929BC, -}; - -const struct SpriteTemplate gUnknown_085929EC = -{ - .tileTag = ANIM_TAG_HANDS_AND_FEET, - .paletteTag = ANIM_TAG_HANDS_AND_FEET, - .oam = &gUnknown_08524974, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_085929CC, - .callback = sub_8100A94, -}; - -const union AnimCmd gUnknown_08592A04[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(32, 5), - ANIMCMD_FRAME(48, 5), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592A18[] = -{ - gUnknown_08592A04, -}; - -const struct SpriteTemplate gCuttingSliceSpriteTemplate = -{ - .tileTag = ANIM_TAG_CUT, - .paletteTag = ANIM_TAG_CUT, - .oam = &gUnknown_08524A34, - .anims = gUnknown_08592A18, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100AE0, -}; - -const struct SpriteTemplate gUnknown_08592A34 = -{ - .tileTag = ANIM_TAG_CUT, - .paletteTag = ANIM_TAG_CUT, - .oam = &gUnknown_08524A34, - .anims = gUnknown_08592A18, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100B88, -}; - -const union AnimCmd gUnknown_08592A4C[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A54[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A5C[] = -{ - ANIMCMD_FRAME(8, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A64[] = -{ - ANIMCMD_FRAME(12, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A6C[] = -{ - ANIMCMD_FRAME(16, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A74[] = -{ - ANIMCMD_FRAME(20, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A7C[] = -{ - ANIMCMD_FRAME(0, 1, .vFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A84[] = -{ - ANIMCMD_FRAME(4, 1, .vFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A8C[] = -{ - ANIMCMD_FRAME(8, 1, .vFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592A94[] = -{ - ANIMCMD_FRAME(12, 1, .vFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592A9C[] = -{ - gUnknown_08592A4C, - gUnknown_08592A54, - gUnknown_08592A5C, - gUnknown_08592A64, - gUnknown_08592A6C, - gUnknown_08592A74, - gUnknown_08592A7C, - gUnknown_08592A84, - gUnknown_08592A8C, - gUnknown_08592A94, -}; - -const struct SpriteTemplate gUnknown_08592AC4 = -{ - .tileTag = ANIM_TAG_MUSIC_NOTES, - .paletteTag = ANIM_TAG_MUSIC_NOTES, - .oam = &gUnknown_0852490C, - .anims = gUnknown_08592A9C, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100E1C, -}; - -const struct SpriteTemplate gUnknown_08592ADC = -{ - .tileTag = ANIM_TAG_PROTECT, - .paletteTag = ANIM_TAG_PROTECT, - .oam = &gUnknown_08524A3C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100EF0, -}; - -const union AffineAnimCmd gUnknown_08592AF4[] = -{ - AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_08592B04[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 12), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 6), - AFFINEANIMCMD_FRAME(0x0, 0x0, -2, 24), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 6), - AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 12), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd *const gUnknown_08592B34[] = -{ - gUnknown_08592AF4, - gUnknown_08592B04, -}; - -const struct SpriteTemplate gUnknown_08592B3C = -{ - .tileTag = ANIM_TAG_MILK_BOTTLE, - .paletteTag = ANIM_TAG_MILK_BOTTLE, - .oam = &gUnknown_08524A94, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_08592B34, - .callback = sub_81010CC, -}; - -const union AnimCmd gUnknown_08592B54[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(16, 7), - ANIMCMD_FRAME(32, 7), - ANIMCMD_FRAME(48, 7), - ANIMCMD_FRAME(64, 7), - ANIMCMD_FRAME(80, 7), - ANIMCMD_FRAME(96, 7), - ANIMCMD_FRAME(112, 7), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gUnknown_08592B78[] = -{ - gUnknown_08592B54, -}; - -const struct SpriteTemplate gUnknown_08592B7C = -{ - .tileTag = ANIM_TAG_SPARKLE_2, - .paletteTag = ANIM_TAG_SPARKLE_2, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592B78, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810130C, -}; - -const struct SpriteTemplate gUnknown_08592B94 = -{ - .tileTag = ANIM_TAG_SPARKLE_2, - .paletteTag = ANIM_TAG_SPARKLE_2, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592B78, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810135C, -}; - -const union AnimCmd gUnknown_08592BAC[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(4, 10), - ANIMCMD_FRAME(8, 10), - ANIMCMD_FRAME(12, 10), - ANIMCMD_FRAME(16, 26), - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(20, 5), - ANIMCMD_FRAME(24, 15), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592BD0[] = -{ - ANIMCMD_FRAME(0, 10, .hFlip = TRUE), - ANIMCMD_FRAME(4, 10, .hFlip = TRUE), - ANIMCMD_FRAME(8, 10, .hFlip = TRUE), - ANIMCMD_FRAME(12, 10, .hFlip = TRUE), - ANIMCMD_FRAME(16, 26, .hFlip = TRUE), - ANIMCMD_FRAME(16, 5, .hFlip = TRUE), - ANIMCMD_FRAME(20, 5, .hFlip = TRUE), - ANIMCMD_FRAME(24, 15, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592BF4[] = -{ - gUnknown_08592BAC, - gUnknown_08592BD0, -}; - -const struct SpriteTemplate gUnknown_08592BFC = -{ - .tileTag = ANIM_TAG_UNUSED_BUBBLE_BURST, - .paletteTag = ANIM_TAG_UNUSED_BUBBLE_BURST, - .oam = &gUnknown_0852490C, - .anims = gUnknown_08592BF4, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101440, -}; - -const union AnimCmd gUnknown_08592C14[] = -{ - ANIMCMD_FRAME(0, 40), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592C1C[] = -{ - gUnknown_08592C14, -}; - -const union AffineAnimCmd gUnknown_08592C20[] = -{ - AFFINEANIMCMD_FRAME(0x14, 0x14, -30, 0), - AFFINEANIMCMD_FRAME(0x8, 0x8, 1, 24), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_08592C20_2[] = -{ - AFFINEANIMCMD_LOOP(0), - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24), - AFFINEANIMCMD_LOOP(10), -}; - -const union AffineAnimCmd gUnknown_08592C50[] = -{ - AFFINEANIMCMD_FRAME(0x14, 0x14, 30, 0), - AFFINEANIMCMD_FRAME(0x8, 0x8, -1, 24), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_08592C50_2[] = -{ - AFFINEANIMCMD_LOOP(0), - AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 24), - AFFINEANIMCMD_LOOP(10), -}; - -const union AffineAnimCmd *const gUnknown_08592C80[] = -{ - gUnknown_08592C20, - gUnknown_08592C50, -}; - -const struct SpriteTemplate gUnknown_08592C88 = -{ - .tileTag = ANIM_TAG_LETTER_Z, - .paletteTag = ANIM_TAG_LETTER_Z, - .oam = &gUnknown_08524974, - .anims = gUnknown_08592C1C, - .images = NULL, - .affineAnims = gUnknown_08592C80, - .callback = sub_81014F4, -}; - -const struct SpriteTemplate gUnknown_08592CA0 = -{ - .tileTag = ANIM_TAG_LOCK_ON, - .paletteTag = ANIM_TAG_LOCK_ON, - .oam = &gUnknown_08524914, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81015AC, -}; - -const struct SpriteTemplate gUnknown_08592CB8 = -{ - .tileTag = ANIM_TAG_LOCK_ON, - .paletteTag = ANIM_TAG_LOCK_ON, - .oam = &gUnknown_0852490C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101898, -}; - -const s8 gUnknown_08592CD0[][2] = -{ - { 64, 64}, - { 0, -64}, - {-64, 64}, - { 32, -32}, -}; - -const struct SpriteTemplate gUnknown_08592CD8 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101940, -}; - -const struct SpriteTemplate gUnknown_08592CF0 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101B90, -}; - -const union AnimCmd gUnknown_08592D08[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_FRAME(32, 4), - ANIMCMD_FRAME(48, 4), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592D1C[] = -{ - ANIMCMD_FRAME(48, 4), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592D24[] = -{ - gUnknown_08592D08, - gUnknown_08592D1C, -}; - -const struct SpriteTemplate gUnknown_08592D2C = -{ - .tileTag = ANIM_TAG_SLASH, - .paletteTag = ANIM_TAG_SLASH, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592D24, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101F40, -}; - -const struct SpriteTemplate gUnknown_08592D44 = -{ - .tileTag = ANIM_TAG_SLASH_2, - .paletteTag = ANIM_TAG_SLASH_2, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592D24, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101FA8, -}; - -const struct SpriteTemplate gUnknown_08592D5C = -{ - .tileTag = ANIM_TAG_SLASH_2, - .paletteTag = ANIM_TAG_SLASH_2, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592D24, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101FF0, -}; - -const union AnimCmd gUnknown_08592D74[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(8, 12), - ANIMCMD_FRAME(16, 4), - ANIMCMD_FRAME(24, 4), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592D88[] = -{ - gUnknown_08592D74, -}; - -const struct SpriteTemplate gUnknown_08592D8C = -{ - .tileTag = ANIM_TAG_FOCUS_ENERGY, - .paletteTag = ANIM_TAG_FOCUS_ENERGY, - .oam = &gUnknown_08524954, - .anims = gUnknown_08592D88, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81020D8, -}; - -const union AnimCmd gUnknown_08592DA4[] = -{ - ANIMCMD_FRAME(0, 18), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(16, 18), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(16, 6), - ANIMCMD_FRAME(32, 18), - ANIMCMD_FRAME(16, 6), - ANIMCMD_FRAME(32, 6), - ANIMCMD_FRAME(48, 18), - ANIMCMD_FRAME(32, 6), - ANIMCMD_FRAME(48, 6), - ANIMCMD_FRAME(64, 18), - ANIMCMD_FRAME(48, 6), - ANIMCMD_FRAME(64, 54), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592DE0[] = -{ - gUnknown_08592DA4, -}; - -const struct SpriteTemplate gUnknown_08592DE4 = -{ - .tileTag = ANIM_TAG_SPHERE_TO_CUBE, - .paletteTag = ANIM_TAG_SPHERE_TO_CUBE, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592DE0, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810217C, -}; - -const struct SpriteTemplate gUnknown_08592DFC = -{ - .tileTag = ANIM_TAG_BLACK_BALL, - .paletteTag = ANIM_TAG_BLACK_BALL, - .oam = &gUnknown_08524904, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = TranslateAnimSpriteToTargetMonLocation, -}; - -const union AnimCmd gUnknown_08592E14[] = -{ - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(16, 3), - ANIMCMD_FRAME(32, 3), - ANIMCMD_FRAME(48, 3), - ANIMCMD_FRAME(64, 3), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592E2C[] = -{ - gUnknown_08592E14, -}; - -const struct SpriteTemplate gUnknown_08592E30 = -{ - .tileTag = ANIM_TAG_GRAY_SMOKE, - .paletteTag = ANIM_TAG_GRAY_SMOKE, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592E2C, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, -}; - -const union AnimCmd gUnknown_08592E48[] = -{ - ANIMCMD_FRAME(3, 5), - ANIMCMD_FRAME(2, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592E5C[] = -{ - gUnknown_08592E48, -}; - -const union AffineAnimCmd gUnknown_08592E60[] = -{ - AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd *const gUnknown_08592E70[] = -{ - gUnknown_08592E60, -}; - -const struct SpriteTemplate gUnknown_08592E74 = -{ - .tileTag = ANIM_TAG_CONVERSION, - .paletteTag = ANIM_TAG_CONVERSION, - .oam = &gUnknown_08524AE4, - .anims = gUnknown_08592E5C, - .images = NULL, - .affineAnims = gUnknown_08592E70, - .callback = sub_8102268, -}; - -const union AnimCmd gUnknown_08592E8C[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(2, 5), - ANIMCMD_FRAME(3, 5), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592EA0[] = -{ - gUnknown_08592E8C, -}; - -const struct SpriteTemplate gUnknown_08592EA4 = -{ - .tileTag = ANIM_TAG_CONVERSION, - .paletteTag = ANIM_TAG_CONVERSION, - .oam = &gUnknown_08524AE4, - .anims = gUnknown_08592EA0, - .images = NULL, - .affineAnims = gUnknown_08592E70, - .callback = sub_810234C, -}; - -const struct SpriteTemplate gUnknown_08592EBC = -{ - .tileTag = ANIM_TAG_MOON, - .paletteTag = ANIM_TAG_MOON, - .oam = &gUnknown_08524A3C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81024E0, -}; - -const union AnimCmd gUnknown_08592ED4[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(8, 8), - ANIMCMD_FRAME(12, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gUnknown_08592EE8[] = -{ - gUnknown_08592ED4, -}; - -const struct SpriteTemplate gBattleAnimSpriteTemplate_8592EEC = -{ - .tileTag = ANIM_TAG_GREEN_SPARKLE, - .paletteTag = ANIM_TAG_GREEN_SPARKLE, - .oam = &gUnknown_0852490C, - .anims = gUnknown_08592EE8, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8102540, -}; - -const union AnimCmd gUnknown_08592F04[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(16, 2), - ANIMCMD_FRAME(32, 2), - ANIMCMD_FRAME(48, 3), - ANIMCMD_FRAME(64, 5), - ANIMCMD_FRAME(80, 3), - ANIMCMD_FRAME(96, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592F28[] = -{ - gUnknown_08592F04, -}; - -const struct SpriteTemplate gUnknown_08592F2C = -{ - .tileTag = ANIM_TAG_BLUE_STAR, - .paletteTag = ANIM_TAG_BLUE_STAR, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592F28, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, -}; - -const struct SpriteTemplate gUnknown_08592F44 = -{ - .tileTag = ANIM_TAG_HORN_HIT, - .paletteTag = ANIM_TAG_HORN_HIT, - .oam = &gUnknown_08524914, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8102844, -}; - -const union AnimCmd gUnknown_08592F5C[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(16, 2), - ANIMCMD_FRAME(32, 2), - ANIMCMD_FRAME(48, 2), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592F70[] = -{ - gUnknown_08592F5C, -}; - -const struct SpriteTemplate gUnknown_08592F74 = -{ - .tileTag = ANIM_TAG_FANG_ATTACK, - .paletteTag = ANIM_TAG_FANG_ATTACK, - .oam = &gUnknown_08524914, - .anims = gUnknown_08592F70, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8102BCC, -}; - -const union AnimCmd gUnknown_08592F8C[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592F94[] = -{ - ANIMCMD_FRAME(4, 10), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592F9C[] = -{ - ANIMCMD_FRAME(8, 41), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592FA4[] = -{ - ANIMCMD_FRAME(12, 10), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592FAC[] = -{ - ANIMCMD_FRAME(16, 10), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592FB4[] = -{ - ANIMCMD_FRAME(20, 10), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592FBC[] = -{ - ANIMCMD_FRAME(0, 10, .vFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_08592FC4[] = -{ - ANIMCMD_FRAME(4, 10, .vFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08592FCC[] = -{ - gUnknown_08592F8C, - gUnknown_08592F94, - gUnknown_08592F9C, - gUnknown_08592FA4, - gUnknown_08592FAC, - gUnknown_08592FB4, - gUnknown_08592FBC, - gUnknown_08592FC4, -}; - -const union AffineAnimCmd gUnknown_08592FEC[] = -{ - AFFINEANIMCMD_FRAME(0xC, 0xC, 0, 16), - AFFINEANIMCMD_FRAME(0xFFF4, 0xFFF4, 0, 16), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd *const gUnknown_08593004[] = -{ - gUnknown_08592FEC, -}; - -const struct SpriteTemplate gUnknown_08593008 = -{ - .tileTag = ANIM_TAG_MUSIC_NOTES, - .paletteTag = ANIM_TAG_MUSIC_NOTES, - .oam = &gUnknown_085249CC, - .anims = gUnknown_08592FCC, - .images = NULL, - .affineAnims = gUnknown_08593004, - .callback = sub_8102CD4, -}; - -const u16 gUnknown_08593020[][6] = -{ - {10072, RGB(31, 31, 31), RGB(31, 26, 28), RGB(31, 22, 26), RGB(31, 17, 24), RGB(31, 13, 22)}, - {10097, RGB(31, 31, 31), RGB(25, 31, 26), RGB(20, 31, 21), RGB(15, 31, 16), RGB(10, 31, 12)}, - {10185, RGB(31, 31, 31), RGB(31, 31, 24), RGB(31, 31, 17), RGB(31, 31, 10), RGB(31, 31, 3)}, - {10175, RGB(31, 31, 31), RGB(26, 28, 31), RGB(21, 26, 31), RGB(16, 24, 31), RGB(12, 22, 31)}, -}; - -const struct SpriteTemplate gUnknown_08593050 = -{ - .tileTag = ANIM_TAG_MUSIC_NOTES, - .paletteTag = ANIM_TAG_MUSIC_NOTES, - .oam = &gUnknown_085249CC, - .anims = gUnknown_08592FCC, - .images = NULL, - .affineAnims = gUnknown_08593004, - .callback = sub_8102EB0, -}; - -const struct SpriteTemplate gUnknown_08593068 = -{ - .tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE, - .paletteTag = ANIM_TAG_PURPLE_HAND_OUTLINE, - .oam = &gUnknown_08524914, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8102FB8, -}; - -const union AffineAnimCmd gUnknown_08593080[] = -{ - AFFINEANIMCMD_FRAME(0xA0, 0xA0, 0, 0), - AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 1), - AFFINEANIMCMD_JUMP(1), -}; - -const union AffineAnimCmd *const gUnknown_08593098[] = -{ - gUnknown_08593080, -}; - -const struct SpriteTemplate gUnknown_0859309C = -{ - .tileTag = ANIM_TAG_MUSIC_NOTES, - .paletteTag = ANIM_TAG_MUSIC_NOTES, - .oam = &gUnknown_085249CC, - .anims = gUnknown_08592FCC, - .images = NULL, - .affineAnims = gUnknown_08593098, - .callback = sub_8103028, -}; - -const union AnimCmd gUnknown_085930B4[] = -{ - ANIMCMD_FRAME(0, 2, .hFlip = TRUE), - ANIMCMD_FRAME(16, 2, .hFlip = TRUE), - ANIMCMD_FRAME(32, 2, .hFlip = TRUE), - ANIMCMD_FRAME(48, 2, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085930C8[] = -{ - ANIMCMD_FRAME(48, 2, .hFlip = TRUE), - ANIMCMD_FRAME(32, 2, .hFlip = TRUE), - ANIMCMD_FRAME(16, 2, .hFlip = TRUE), - ANIMCMD_FRAME(0, 2, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085930DC[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(16, 2), - ANIMCMD_FRAME(32, 2), - ANIMCMD_FRAME(48, 2), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085930F0[] = -{ - ANIMCMD_FRAME(48, 2), - ANIMCMD_FRAME(32, 2), - ANIMCMD_FRAME(16, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_08593104[] = -{ - gUnknown_085930B4, - gUnknown_085930DC, - gUnknown_085930C8, - gUnknown_085930F0, -}; - -const struct SpriteTemplate gUnknown_08593114 = -{ - .tileTag = ANIM_TAG_THOUGHT_BUBBLE, - .paletteTag = ANIM_TAG_THOUGHT_BUBBLE, - .oam = &gUnknown_08524914, - .anims = gUnknown_08593104, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8103164, -}; - -const union AffineAnimCmd gUnknown_0859312C[] = -{ - AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), - AFFINEANIMCMD_FRAME(0x1E, 0x1E, 0, 8), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_08593144[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, 4, 11), - AFFINEANIMCMD_FRAME(0x0, 0x0, -4, 11), - AFFINEANIMCMD_LOOP(2), - AFFINEANIMCMD_FRAME(0xFFE2, 0xFFE2, 0, 8), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gUnknown_08593144_2[] = -{ - AFFINEANIMCMD_FRAME(16, 16, 0, 0), - AFFINEANIMCMD_FRAME(30, 30, 0, 8), - AFFINEANIMCMD_FRAME(0, 0, 0, 16), - AFFINEANIMCMD_LOOP(0), - AFFINEANIMCMD_FRAME(0, 0, 4, 11), - AFFINEANIMCMD_FRAME(0, 0, -4, 11), - AFFINEANIMCMD_LOOP(2), - AFFINEANIMCMD_FRAME(-30, -30, 0, 8), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd *const gUnknown_085931B4[] = -{ - gUnknown_0859312C, - gUnknown_08593144, -}; - -const struct SpriteTemplate gUnknown_085931BC = -{ - .tileTag = ANIM_TAG_FINGER, - .paletteTag = ANIM_TAG_FINGER, - .oam = &gUnknown_085249D4, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_085931B4, - .callback = sub_8103208, -}; - -const struct SpriteTemplate gUnknown_085931D4 = -{ - .tileTag = ANIM_TAG_FINGER, - .paletteTag = ANIM_TAG_FINGER, - .oam = &gUnknown_08524974, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gUnknown_085931B4, - .callback = sub_8103284, -}; - -const union AnimCmd gUnknown_085931EC[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085931F4[] = -{ - ANIMCMD_FRAME(0, 1, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_085931FC[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_FRAME(32, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_FRAME(32, 4), - ANIMCMD_END, -}; - -const union AnimCmd gUnknown_0859321C[] = -{ - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_FRAME(16, 4, .hFlip = TRUE), - ANIMCMD_FRAME(32, 4, .hFlip = TRUE), - ANIMCMD_FRAME(16, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_FRAME(16, 4, .hFlip = TRUE), - ANIMCMD_FRAME(32, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd *const gUnknown_0859323C[] = -{ - gUnknown_085931EC, - gUnknown_085931F4, - gUnknown_085931FC, - gUnknown_0859321C, -}; - -const struct SpriteTemplate gUnknown_0859324C = -{ - .tileTag = ANIM_TAG_FINGER_2, - .paletteTag = ANIM_TAG_FINGER_2, - .oam = &gUnknown_08524914, - .anims = gUnknown_0859323C, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8103390, -}; diff --git a/src/fire.c b/src/fire.c index c054f154e..44ae9d320 100644 --- a/src/fire.c +++ b/src/fire.c @@ -726,7 +726,7 @@ static void AnimFireCross(struct Sprite *sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = sub_80A653C; //TranslateSpriteOverDuration + sprite->callback = TranslateSpriteOverDuration; } static void sub_81093A4(struct Sprite *sprite) diff --git a/sym_ewram.txt b/sym_ewram.txt index 4f77532b2..f386e9da1 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -285,8 +285,7 @@ gUnknown_0203A034: @ 203A034 gUnknown_0203A0F4: @ 203A0F4 .space 0x4 -gUnknown_0203A0F8: @ 203A0F8 - .space 0x8 + .include "src/battle_anim_effects_1.o" gUnknown_0203A100: @ 203A100 .space 0x10 -- cgit v1.2.3 From f801eed3a84862d88af0d5e43c6b6754e36001f2 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 19 Dec 2018 20:52:41 -0500 Subject: clean fldeff file --- src/fldeff_80F9BCC.c | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/src/fldeff_80F9BCC.c b/src/fldeff_80F9BCC.c index ba5a14d80..26258f536 100644 --- a/src/fldeff_80F9BCC.c +++ b/src/fldeff_80F9BCC.c @@ -320,7 +320,6 @@ static const struct SpriteTemplate gUnknown_0858E880 = .callback = SpriteCallbackDummy, }; -// TODO: name these functions and arguments void sub_80F9BCC(u16 a0, u16 a1, u8 a2) { sub_80F9C44(sub_80F9C90, a0, a1, a2); @@ -369,26 +368,25 @@ void sub_80F9C44(void (*taskfunc) (u8), u16 a1, u16 a2, u8 a3) #ifdef NONMATCHING void sub_80F9C90(u8 taskId) { - // struct Task *task = &gTasks[taskId]; switch(task->data[0]) { - case 0:// correct + case 0: task->data[3] = 0x78; task->data[4] = 0x78; task->data[5] = 0x50; task->data[6] = 0x51; SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); - SetGpuReg(REG_OFFSET_WIN0H, task->data[3] << 8 | task->data[4]); - SetGpuReg(REG_OFFSET_WIN0H, task->data[5] << 8 | task->data[6]); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4])); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[5], task->data[6])); SetGpuReg(REG_OFFSET_WININ, 0x3F); SetGpuReg(REG_OFFSET_WINOUT, 0); break; - case 1:// correct + case 1: task->data[7] = GetGpuReg(REG_OFFSET_BLDCNT); task->data[8] = GetGpuReg(REG_OFFSET_BLDY); @@ -398,26 +396,20 @@ void sub_80F9C90(u8 taskId) break; case 2: - //r5 = 0 somewhere in here task->data[3] -= task->data[1]; task->data[4] += task->data[1]; - if (task->data[3] <= 0 || task->data[4] > 0xEF) + if (task->data[3] < 1 || task->data[4] > 0xEF) { - // - task->data[3] = 0;// r5 + task->data[3] = 0; task->data[4] = 0xF0; SetGpuReg(REG_OFFSET_BLDY, 0); SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]); - //BlendPalettes(0xFFFF, 0, 0); - BlendPalettes(-1, 0, 0);// 0xFFFFFFFF ? - *gPlttBufferFaded = 0;// r5 + BlendPalettes(0xFFFFFFFF, 0, 0); + gPlttBufferFaded[0] = 0; } - //SetGpuReg(REG_OFFSET_WIN0H, task->data[3] << 8 | task->data[4]); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4])); - //break; - // can I ternary this? NO stupid if (task->data[3] != 0) return; break; @@ -425,27 +417,22 @@ void sub_80F9C90(u8 taskId) task->data[5] -= task->data[2]; task->data[6] += task->data[2]; - if (task->data[5] <= 0 || task->data[2] > 0x9F) + if (task->data[5] < 1 || task->data[2] > 0x9F) { - // task->data[5] = 0; task->data[6] = 0xA0; ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); } - //SetGpuReg(REG_OFFSET_WIN0V, task->data[5] << 8 | task->data[6]); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6])); if (task->data[5] != 0) return; break; - //break; - default: SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]); DestroyTask(taskId); return; } - // task->data[0] += 1; } #else @@ -657,7 +644,7 @@ void sub_80F9DFC(u8 taskId) task->data[5] += task->data[2]; task->data[6] -= task->data[2]; - if (task->data[5] > 0x4F || task->data[6] <= 0x51) + if (task->data[5] > 0x4F || task->data[6] < 0x52) { task->data[5] = 0x50; task->data[6] = 0x51; @@ -673,7 +660,7 @@ void sub_80F9DFC(u8 taskId) task->data[3] += task->data[1]; task->data[4] -= task->data[1]; - if (task->data[3] > 0x77 || task->data[4] <= 0x78) + if (task->data[3] > 0x77 || task->data[4] < 0x79) { task->data[3] = 0x78; task->data[4] = 0x78; @@ -1387,27 +1374,19 @@ void GetShieldToyTVDecorationInfo(void) } #ifdef NONMATCHING -// bool8 sub_80FADE4(u16 arg0, u8 arg1) { - // if (CurrentMapIsSecretBase()) { - // return TRUE; if (arg1 == 0) { - // if ((u16)(arg0 + 0xfffffd7b) <= 1 || (arg0 == 0x237)) return TRUE; - //if (arg0 == 0x237) - //else return FALSE; } else { - // if (arg0 == 0x28d || arg0 == 0x23f) return TRUE; - //return FALSE; } } return FALSE; -- cgit v1.2.3